Attachment #144289 for bug #191464

Lines 7-13 Link Here

(-)Makefile (-75 / +21 lines)
7	CATEGORIES= www perl5	7	CATEGORIES= www perl5
8	MASTER_SITES= http://ftp.icdevgroup.org/interchange/5.6/tar/	8	MASTER_SITES= http://ftp.icdevgroup.org/interchange/5.6/tar/
9		9
10	MAINTAINER= loader@freebsdmall.com	10	MAINTAINER= ports@FreeBSD.org
11	COMMENT= RedHat's database-enabled e-commerce server	11	COMMENT= RedHat's database-enabled e-commerce server
12		12
13	RUN_DEPENDS= p5-Safe-Hole>=0.10:${PORTSDIR}/security/p5-Safe-Hole \	13	RUN_DEPENDS= p5-Safe-Hole>=0.10:${PORTSDIR}/security/p5-Safe-Hole \
Lines 17-30 Link Here
17	p5-Digest-SHA1>=2.11:${PORTSDIR}/security/p5-Digest-SHA1	17	p5-Digest-SHA1>=2.11:${PORTSDIR}/security/p5-Digest-SHA1
18	BUILD_DEPENDS:= ${RUN_DEPENDS}	18	BUILD_DEPENDS:= ${RUN_DEPENDS}
19		19
20	USES= perl5	20	USES= perl5 tar:bzip2
21	USE_PERL5= configure
22	USE_BZIP2= yes
23		21
24	OPTIONS_DEFINE= MYSQL PGSQL	22	USERS= interch
		23	GROUPS= interch
		24
		25	OPTIONS_DEFINE= MYSQL PGSQL
25	OPTIONS_DEFAULT= MYSQL	26	OPTIONS_DEFAULT= MYSQL
26		27
27	NO_STAGE= yes
28	.include <bsd.port.options.mk>	28	.include <bsd.port.options.mk>
29		29
30	USE_RC_SUBR= interchange	30	USE_RC_SUBR= interchange
Lines 39-118 Link Here
39		39
40	ARCH_PERL= ${SITE_PERL}/${PERL_ARCH}	40	ARCH_PERL= ${SITE_PERL}/${PERL_ARCH}
41		41
42	MAN1= compile_link.1 \	42	CONFIGURE_SCRIPT= Makefile.PL
43	config_prog.1 \	43	CONFIGURE_ARGS+= CC="${CC}" CCFLAGS="${CFLAGS}" PREFIX="${PREFIX}/interchange"
44	configdump.1 \	44	CONFIGURE_ARGS+= INSTALLPRIVLIB="${PREFIX}/${SITE_PERL_REL}/"
45	crontab.1 \	45	CONFIGURE_ARGS+= INSTALLARCHLIB="${PREFIX}/interchange/"
46	expire.1 \	46	CONFIGURE_ARGS+= INSTALLMAN1DIR="${PREFIX}/man/man1/"
47	expireall.1 \	47	CONFIGURE_ARGS+= INSTALLMAN3DIR="${PREFIX}/man/man3/"
48	findtags.1 \	48	CONFIGURE_ARGS+= INSTALLBIN="${PREFIX}/bin/"
49	ic_mod_perl.1 \	49	CONFIGURE_ARGS+= INSTALLSCRIPT="${PREFIX}/bin/"
50	interchange.1 \
51	localize.1 \
52	makecat.1 \
53	offline.1 \
54	restart.1 \
55	update.1
56
57	MAN3= Vend::Accounting::SQL_Ledger.3 \
58	Vend::Cart.3 \
59	Vend::CounterFile.3 \
60	Vend::Form.3 \
61	Vend::Interpolate.3 \
62	Vend::Options::Matrix.3 \
63	Vend::Options::Old48.3 \
64	Vend::Options::Simple.3 \
65	Vend::Parser.3 \
66	Vend::Payment::AuthorizeNet.3 \
67	Vend::Payment::BoA.3 \
68	Vend::Payment::BusinessOnlinePayment.3 \
69	Vend::Payment::CyberCash.3 \
70	Vend::Payment::ECHO.3 \
71	Vend::Payment::EFSNet.3 \
72	Vend::Payment::Ezic.3 \
73	Vend::Payment::Getitcard.3 \
74	Vend::Payment::ICS.3 \
75	Vend::Payment::Linkpoint.3 \
76	Vend::Payment::MCVE.3 \
77	Vend::Payment::NetBilling.3 \
78	Vend::Payment::Protx2.3 \
79	Vend::Payment::PRI.3 \
80	Vend::Payment::PSiGate.3 \
81	Vend::Payment::Sage.3 \
82	Vend::Payment::Signio.3 \
83	Vend::Payment::Skipjack.3 \
84	Vend::Payment::TCLink.3 \
85	Vend::Payment::TestPayment.3 \
86	Vend::Payment::iTransact.3 \
87	Vend::SOAP::Transport.3 \
88	Vend::SQL_Parser.3 \
89	Vend::Ship.3 \
90	Vend::Ship::Postal.3 \
91	Vend::Ship::QueryUPS.3 \
92	Vend::Table::Editor.3 \
93	Vend::UserControl.3 \
94	Vend::UserDB.3
95
96	MAKE_ARGS+= NOCPANINSTALL=1 \
97	INSTALLARCHLIB=${PREFIX}/interchange/ \
98	INSTALLPRIVLIB=${PREFIX}/interchange/lib/ \
99	INSTALLMAN1DIR=${PREFIX}/man/man1
100
101	CONFIGURE_ARGS+= force=1	50	CONFIGURE_ARGS+= force=1
102		51
103	post-patch:	52	do-configure:
104	@${REINPLACE_CMD} -e "s:You are now ready to cd to \$$realdir:You are now ready to cd to ${PREFIX}:g" ${WRKSRC}/Makefile.PL	53	@cd ${CONFIGURE_WRKSRC} && \
		54	${SETENV} ${CONFIGURE_ENV} \
		55	${PERL5} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}
105		56
106	pre-configure:
107	@PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/pkg-install ${PKGNAME} PRE-INSTALL
108
109	pre-install:	57	pre-install:
110	@${MKDIR} ${PREFIX}/interchange	58	@${MKDIR} ${STAGEDIR}${PREFIX}/interchange/
		59	@${MKDIR} ${STAGEDIR}/var/run/interchange/
111		60
112	post-install:	61	post-install:
113	.for i in compile_link config_prog configdump expire expireall interchange localize makecat offline restart update	62	@${RM} -fr ${STAGEDIR}${PREFIX}/interchange/auto/
114	@${REINPLACE_CMD} -i "" -e "s:${PREFIX}:${PREFIX}/interchange:g; s:${PREFIX}/interchange/bin: ${PREFIX}/bin:g" ${PREFIX}/bin/${i}
115	.endfor
116	@PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/pkg-install ${PKGNAME} POST-INSTALL
117		63
118	.include <bsd.port.mk>	64	.include <bsd.port.mk>




--- ./Makefile.PL.orig	2008-11-10 06:46:45.000000000 +0000
+++ ./Makefile.PL	2014-06-29 18:54:00.000000000 +0000
@@ -330,7 +330,8 @@
 				qq{Interchange cannot be run as root. Which user should run Interchange? },
 				($uid || 'interch'),
 			);
-			my $name = getpwnam($uid);
+			# my $name = getpwnam($uid);
+			my $name = 95;
 			if(! $name) {
 				my $ans = my_prompt("User name $uid doesn't exist. Use anyway? ", 'n');
 				last GETUID if $ans =~ /^\s*y/i;
@@ -537,8 +538,10 @@
 				or die "Can't open uid file: $!\n";
 			my $uid = <UID>;
 			close UID;
-			$MV::Default{INTERCHANGE_UID} = getpwnam($uid);
-			$MV::Default{INTERCHANGE_GID} = getgrnam($uid);
+			# $MV::Default{INTERCHANGE_UID} = getpwnam($uid);
+			# $MV::Default{INTERCHANGE_GID} = getgrnam($uid);
+			$MV::Default{INTERCHANGE_UID} = 95;
+			$MV::Default{INTERCHANGE_GID} = 95;
 			for(@chown_files) {
 				chown	$MV::Default{INTERCHANGE_UID},
 						$MV::Default{INTERCHANGE_GID},
@@ -685,7 +688,7 @@
 		else {
 		print <<EOF;
 
-You are now ready to cd to $realdir and run 'bin/makecat'
+You are now ready to cd to $ENV{PREFIX} and run 'bin/makecat'
 to set up your first catalog.
 
 EOF
@@ -738,7 +741,7 @@
 		next unless $MV::Default{$_};
 		push @args, "$_=$MV::Default{$_}";
 	}
-	push @args, 'final=$(INSTALLARCHLIB)';
+	push @args, 'final=$(DESTDIR)$(INSTALLARCHLIB)';
 
 	my $argstring = join " ", @args;
 




GID=${UID}

case $2 in
PRE-INSTALL)
	USER=interch
	GROUP=${USER}
	UID=95
	GID=${UID}

	if pw group show "${GROUP}" 2>/dev/null; then
                echo "You already have a group \"${GROUP}\", so I will use it."
        else
                if pw groupadd ${GROUP} -g ${GID}; then
                        echo "Added group \"${GROUP}\"."
                else
                        echo "Adding group \"${GROUP}\" failed..."
                        exit 1
                fi
        fi

	if pw user show "${USER}" 2>/dev/null; then
                echo "You already have a user \"${USER}\", so I will use it."
        else
                if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
                        -d "${PKG_PREFIX}/interchange" \
			-s /bin/sh -c "Interchange user"
                then
                        echo "Added user \"${USER}\"."
                else
                        echo "Adding user \"${USER}\" failed..."
                        exit 1
                fi
        fi
        ;;
POST-INSTALL)
	/usr/bin/install -d -m 755 -o ${USER} -g ${GROUP} /var/run/interchange
	/usr/sbin/chown -R ${USER}:${GROUP} ${PKG_PREFIX}/interchange




bin/offline
bin/restart
bin/update
interchange/_allow_threads
interchange/_session_storable
interchange/_uid
interchange/catalog_after.cfg

interchange/code/Widget/value.widget
interchange/code/Widget/yesno.widget
interchange/code/Widget/ynzero.widget
interchange/error.log
interchange/etc/.empty
interchange/etc/jobs/db/export
interchange/etc/jobs/maintenance/logrotate

%%SITE_PERL%%/auto/Vend/Tags/autosplit.ix
%%SITE_PERL%%/hints.pl
%%SITE_PERL%%/install_lsb.pl
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Interchange/.packlist
%%SITE_PERL%%/relocate.pl
man/man1/compile_link.1.gz
man/man1/config_prog.1.gz
man/man1/configdump.1.gz
man/man1/crontab.1.gz
man/man1/expire.1.gz
man/man1/expireall.1.gz
man/man1/findtags.1.gz
man/man1/ic_mod_perl.1.gz
man/man1/interchange.1.gz
man/man1/localize.1.gz
man/man1/makecat.1.gz
man/man1/offline.1.gz
man/man1/restart.1.gz
man/man1/update.1.gz
man/man3/Vend::UserDB.3.gz
man/man3/Vend::Parser.3.gz
man/man3/Vend::Payment::CyberCash.3.gz
man/man3/Vend::CounterFile.3.gz
man/man3/Vend::Table::Editor.3.gz
man/man3/Vend::Payment::TestPayment.3.gz
man/man3/Vend::Payment::TCLink.3.gz
man/man3/Vend::UserControl.3.gz
man/man3/Vend::SOAP::Transport.3.gz
man/man3/Vend::Payment::Ezic.3.gz
man/man3/Vend::Payment::iTransact.3.gz
man/man3/Vend::Options::Matrix.3.gz
man/man3/Vend::Payment::ECHO.3.gz
man/man3/Vend::Payment::ICS.3.gz
man/man3/Vend::Ship.3.gz
man/man3/Vend::Payment::BusinessOnlinePayment.3.gz
man/man3/Vend::Payment::Sage.3.gz
man/man3/Vend::Payment::MCVE.3.gz
man/man3/Vend::Accounting::SQL_Ledger.3.gz
man/man3/Vend::Interpolate.3.gz
man/man3/Vend::Payment::PSiGate.3.gz
man/man3/Vend::Payment::AuthorizeNet.3.gz
man/man3/Vend::Payment::NetBilling.3.gz
man/man3/Vend::Payment::PRI.3.gz
man/man3/Vend::Payment::Protx2.3.gz
man/man3/Vend::Cart.3.gz
man/man3/Vend::Payment::Getitcard.3.gz
man/man3/Vend::Payment::EFSNet.3.gz
man/man3/Vend::Payment::BoA.3.gz
man/man3/Vend::Form.3.gz
man/man3/Vend::Payment::Skipjack.3.gz
man/man3/Vend::Options::Simple.3.gz
man/man3/Vend::Options::Old48.3.gz
man/man3/Vend::Ship::QueryUPS.3.gz
man/man3/Vend::SQL_Parser.3.gz
man/man3/Vend::Ship::Postal.3.gz
man/man3/Vend::Payment::Signio.3.gz
man/man3/Vend::Payment::Linkpoint.3.gz
@dirrm %%SITE_PERL%%/Vend/Table
@dirrm %%SITE_PERL%%/Vend/Ship
@dirrm %%SITE_PERL%%/Vend/SOAP

@dirrm %%SITE_PERL%%/auto/Vend/Tags
@dirrm %%SITE_PERL%%/auto/Vend/SOAP
@dirrm %%SITE_PERL%%/auto/Vend
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Interchange
@dirrm interchange/standard/variables
@dirrm interchange/standard/upload
@dirrm interchange/standard/templates/regions

Return to bug 191464

Line 0 Link Here

(-)files/patch-Makefile.PL (+43 lines)
	1	--- ./Makefile.PL.orig 2008-11-10 06:46:45.000000000 +0000
	2	+++ ./Makefile.PL 2014-06-29 18:54:00.000000000 +0000
	3	@@ -330,7 +330,8 @@
	4	qq{Interchange cannot be run as root. Which user should run Interchange? },
	5	($uid \|\| 'interch'),
	6	);
	7	- my $name = getpwnam($uid);
	8	+ # my $name = getpwnam($uid);
	9	+ my $name = 95;
	10	if(! $name) {
	11	my $ans = my_prompt("User name $uid doesn't exist. Use anyway? ", 'n');
	12	last GETUID if $ans =~ /^\s*y/i;
	13	@@ -537,8 +538,10 @@
	14	or die "Can't open uid file: $!\n";
	15	my $uid = <UID>;
	16	close UID;
	17	- $MV::Default{INTERCHANGE_UID} = getpwnam($uid);
	18	- $MV::Default{INTERCHANGE_GID} = getgrnam($uid);
	19	+ # $MV::Default{INTERCHANGE_UID} = getpwnam($uid);
	20	+ # $MV::Default{INTERCHANGE_GID} = getgrnam($uid);
	21	+ $MV::Default{INTERCHANGE_UID} = 95;
	22	+ $MV::Default{INTERCHANGE_GID} = 95;
	23	for(@chown_files) {
	24	chown $MV::Default{INTERCHANGE_UID},
	25	$MV::Default{INTERCHANGE_GID},
	26	@@ -685,7 +688,7 @@
	27	else {
	28	print <<EOF;
	29
	30	-You are now ready to cd to $realdir and run 'bin/makecat'
	31	+You are now ready to cd to $ENV{PREFIX} and run 'bin/makecat'
	32	to set up your first catalog.
	33
	34	EOF
	35	@@ -738,7 +741,7 @@
	36	next unless $MV::Default{$_};
	37	push @args, "$_=$MV::Default{$_}";
	38	}
	39	- push @args, 'final=$(INSTALLARCHLIB)';
	40	+ push @args, 'final=$(DESTDIR)$(INSTALLARCHLIB)';
	41
	42	my $argstring = join " ", @args;
	43

Lines 9-45 Link Here

(-)pkg-install (-31 lines)
9	GID=${UID}	9	GID=${UID}
10		10
11	case $2 in	11	case $2 in
12	PRE-INSTALL)
13	USER=interch
14	GROUP=${USER}
15	UID=95
16	GID=${UID}
17
18	if pw group show "${GROUP}" 2>/dev/null; then
19	echo "You already have a group \"${GROUP}\", so I will use it."
20	else
21	if pw groupadd ${GROUP} -g ${GID}; then
22	echo "Added group \"${GROUP}\"."
23	else
24	echo "Adding group \"${GROUP}\" failed..."
25	exit 1
26	fi
27	fi
28
29	if pw user show "${USER}" 2>/dev/null; then
30	echo "You already have a user \"${USER}\", so I will use it."
31	else
32	if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
33	-d "${PKG_PREFIX}/interchange" \
34	-s /bin/sh -c "Interchange user"
35	then
36	echo "Added user \"${USER}\"."
37	else
38	echo "Adding user \"${USER}\" failed..."
39	exit 1
40	fi
41	fi
42	;;
43	POST-INSTALL)	12	POST-INSTALL)
44	/usr/bin/install -d -m 755 -o ${USER} -g ${GROUP} /var/run/interchange	13	/usr/bin/install -d -m 755 -o ${USER} -g ${GROUP} /var/run/interchange
45	/usr/sbin/chown -R ${USER}:${GROUP} ${PKG_PREFIX}/interchange	14	/usr/sbin/chown -R ${USER}:${GROUP} ${PKG_PREFIX}/interchange

Lines 12-17 Link Here

(-)pkg-plist (-3 / +54 lines)
12	bin/offline	12	bin/offline
13	bin/restart	13	bin/restart
14	bin/update	14	bin/update
		15	interchange/_allow_threads
15	interchange/_session_storable	16	interchange/_session_storable
16	interchange/_uid	17	interchange/_uid
17	interchange/catalog_after.cfg	18	interchange/catalog_after.cfg
Lines 349-355 Link Here
349	interchange/code/Widget/value.widget	350	interchange/code/Widget/value.widget
350	interchange/code/Widget/yesno.widget	351	interchange/code/Widget/yesno.widget
351	interchange/code/Widget/ynzero.widget	352	interchange/code/Widget/ynzero.widget
352	@unexec if [ `cat %D/interchange/error.log \| wc -l` -le 1 ]; then rm -f %D/interchange/error.log; fi	353	interchange/error.log
353	interchange/etc/.empty	354	interchange/etc/.empty
354	interchange/etc/jobs/db/export	355	interchange/etc/jobs/db/export
355	interchange/etc/jobs/maintenance/logrotate	356	interchange/etc/jobs/maintenance/logrotate
Lines 1724-1731 Link Here
1724	%%SITE_PERL%%/auto/Vend/Tags/autosplit.ix	1725	%%SITE_PERL%%/auto/Vend/Tags/autosplit.ix
1725	%%SITE_PERL%%/hints.pl	1726	%%SITE_PERL%%/hints.pl
1726	%%SITE_PERL%%/install_lsb.pl	1727	%%SITE_PERL%%/install_lsb.pl
1727	%%SITE_PERL%%/%%PERL_ARCH%%/auto/Interchange/.packlist
1728	%%SITE_PERL%%/relocate.pl	1728	%%SITE_PERL%%/relocate.pl
		1729	man/man1/compile_link.1.gz
		1730	man/man1/config_prog.1.gz
		1731	man/man1/configdump.1.gz
		1732	man/man1/crontab.1.gz
		1733	man/man1/expire.1.gz
		1734	man/man1/expireall.1.gz
		1735	man/man1/findtags.1.gz
		1736	man/man1/ic_mod_perl.1.gz
		1737	man/man1/interchange.1.gz
		1738	man/man1/localize.1.gz
		1739	man/man1/makecat.1.gz
		1740	man/man1/offline.1.gz
		1741	man/man1/restart.1.gz
		1742	man/man1/update.1.gz
		1743	man/man3/Vend::UserDB.3.gz
		1744	man/man3/Vend::Parser.3.gz
		1745	man/man3/Vend::Payment::CyberCash.3.gz
		1746	man/man3/Vend::CounterFile.3.gz
		1747	man/man3/Vend::Table::Editor.3.gz
		1748	man/man3/Vend::Payment::TestPayment.3.gz
		1749	man/man3/Vend::Payment::TCLink.3.gz
		1750	man/man3/Vend::UserControl.3.gz
		1751	man/man3/Vend::SOAP::Transport.3.gz
		1752	man/man3/Vend::Payment::Ezic.3.gz
		1753	man/man3/Vend::Payment::iTransact.3.gz
		1754	man/man3/Vend::Options::Matrix.3.gz
		1755	man/man3/Vend::Payment::ECHO.3.gz
		1756	man/man3/Vend::Payment::ICS.3.gz
		1757	man/man3/Vend::Ship.3.gz
		1758	man/man3/Vend::Payment::BusinessOnlinePayment.3.gz
		1759	man/man3/Vend::Payment::Sage.3.gz
		1760	man/man3/Vend::Payment::MCVE.3.gz
		1761	man/man3/Vend::Accounting::SQL_Ledger.3.gz
		1762	man/man3/Vend::Interpolate.3.gz
		1763	man/man3/Vend::Payment::PSiGate.3.gz
		1764	man/man3/Vend::Payment::AuthorizeNet.3.gz
		1765	man/man3/Vend::Payment::NetBilling.3.gz
		1766	man/man3/Vend::Payment::PRI.3.gz
		1767	man/man3/Vend::Payment::Protx2.3.gz
		1768	man/man3/Vend::Cart.3.gz
		1769	man/man3/Vend::Payment::Getitcard.3.gz
		1770	man/man3/Vend::Payment::EFSNet.3.gz
		1771	man/man3/Vend::Payment::BoA.3.gz
		1772	man/man3/Vend::Form.3.gz
		1773	man/man3/Vend::Payment::Skipjack.3.gz
		1774	man/man3/Vend::Options::Simple.3.gz
		1775	man/man3/Vend::Options::Old48.3.gz
		1776	man/man3/Vend::Ship::QueryUPS.3.gz
		1777	man/man3/Vend::SQL_Parser.3.gz
		1778	man/man3/Vend::Ship::Postal.3.gz
		1779	man/man3/Vend::Payment::Signio.3.gz
		1780	man/man3/Vend::Payment::Linkpoint.3.gz
1729	@dirrm %%SITE_PERL%%/Vend/Table	1781	@dirrm %%SITE_PERL%%/Vend/Table
1730	@dirrm %%SITE_PERL%%/Vend/Ship	1782	@dirrm %%SITE_PERL%%/Vend/Ship
1731	@dirrm %%SITE_PERL%%/Vend/SOAP	1783	@dirrm %%SITE_PERL%%/Vend/SOAP
Lines 1736-1742 Link Here
1736	@dirrm %%SITE_PERL%%/auto/Vend/Tags	1788	@dirrm %%SITE_PERL%%/auto/Vend/Tags
1737	@dirrm %%SITE_PERL%%/auto/Vend/SOAP	1789	@dirrm %%SITE_PERL%%/auto/Vend/SOAP
1738	@dirrm %%SITE_PERL%%/auto/Vend	1790	@dirrm %%SITE_PERL%%/auto/Vend
1739	@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Interchange
1740	@dirrm interchange/standard/variables	1791	@dirrm interchange/standard/variables
1741	@dirrm interchange/standard/upload	1792	@dirrm interchange/standard/upload
1742	@dirrm interchange/standard/templates/regions	1793	@dirrm interchange/standard/templates/regions