Attachment #144428 for bug #191635

View | Details | Raw Unified | Return to bug 191635
Collapse All | Expand All

Lines 2-8 Link Here

(-)assp.new/Makefile (-29 / +29 lines)
2	# $FreeBSD: head/mail/assp/Makefile 356803 2014-06-06 15:26:41Z ak $	2	# $FreeBSD: head/mail/assp/Makefile 356803 2014-06-06 15:26:41Z ak $
3		3
4	PORTNAME= assp	4	PORTNAME= assp
5	PORTVERSION= 1.9.9.13257	5	PORTVERSION= 1.9.9.14158
6	PORTEPOCH= 1	6	PORTEPOCH= 1
7	CATEGORIES= mail	7	CATEGORIES= mail
8	MASTER_SITES= http://www.ringofsaturn.com/distfiles/	8	MASTER_SITES= http://www.ringofsaturn.com/distfiles/
Lines 11-22 Link Here
11	MAINTAINER= rnejdl@ringofsaturn.com	11	MAINTAINER= rnejdl@ringofsaturn.com
12	COMMENT= Anti-Spam SMTP Proxy	12	COMMENT= Anti-Spam SMTP Proxy
13		13
14	USES= perl5 zip	14	RUN_DEPENDS= p5-Net-DNS>=0.68:${PORTSDIR}/dns/p5-Net-DNS \
		15	p5-libwww>=6.04:${PORTSDIR}/www/p5-libwww \
		16	p5-HTML-Parser>=3.69:${PORTSDIR}/www/p5-HTML-Parser
		17
		18	USES= perl5 zip:infozip
15	NO_BUILD= yes	19	NO_BUILD= yes
16	USE_PERL5= run	20	USE_PERL5= run
17		21
18	MAN8= assp.8 assplog.8
19
20	ASSP_USER= assp	22	ASSP_USER= assp
21	ASSP_GROUP= assp	23	ASSP_GROUP= assp
22	USERS= ${ASSP_USER}	24	USERS= ${ASSP_USER}
Lines 24-32 Link Here
24	ASSP_HOME= /var/db/assp	26	ASSP_HOME= /var/db/assp
25	ASSP_LOG= /var/log/assp	27	ASSP_LOG= /var/log/assp
26		28
27	PLIST_SUB= ASSP_HOME="${ASSP_HOME}" ASSP_LOG="${ASSP_LOG}"	29	PLIST_SUB= ASSP_HOME="${ASSP_HOME}" ASSP_LOG="${ASSP_LOG}" \
		30	ASSP_USER="${ASSP_USER}" ASSP_GROUP="${ASSP_GROUP}"
28		31
29	SUB_FILES= 510.assp assp.8 assplog.8 assplog.pl pkg-install	32	SUB_FILES= 510.assp assp.8 assplog.8 assplog.pl
30	SUB_LIST= ASSP_USER="${ASSP_USER}" ASSP_GROUP="${ASSP_GROUP}" \	33	SUB_LIST= ASSP_USER="${ASSP_USER}" ASSP_GROUP="${ASSP_GROUP}" \
31	ASSP_HOME="${ASSP_HOME}" ASSP_LOG="${ASSP_LOG}" \	34	ASSP_HOME="${ASSP_HOME}" ASSP_LOG="${ASSP_LOG}" \
32	DATADIR="${DATADIR}" PERL="${PERL}"	35	DATADIR="${DATADIR}" PERL="${PERL}"
Lines 53-66 Link Here
53		56
54	OPTIONS_DEFAULT= EMVALID SPF SRS SEND FBACKW CLAMAV DNSBL MATCHRE SENDERB MIMEMOD SSL IPV6	57	OPTIONS_DEFAULT= EMVALID SPF SRS SEND FBACKW CLAMAV DNSBL MATCHRE SENDERB MIMEMOD SSL IPV6
55		58
56	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/ASSP_1.9.9_13227_install/${PORTNAME:tu}	59	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/ASSP_1.9.9_14158_install/${PORTNAME:tu}
57		60
58	NO_STAGE= yes	61	.include <bsd.port.options.mk>
59	.include <bsd.port.pre.mk>
60
61	RUN_DEPENDS+= p5-Net-DNS>=0.68:${PORTSDIR}/dns/p5-Net-DNS \
62	p5-libwww>=6.04:${PORTSDIR}/www/p5-libwww \
63	p5-HTML-Parser>=3.69:${PORTSDIR}/www/p5-HTML-Parser
64		62
65	.if ${PORT_OPTIONS:MEMVALID}	63	.if ${PORT_OPTIONS:MEMVALID}
66	RUN_DEPENDS+= p5-Email-Valid>=0.190:${PORTSDIR}/mail/p5-Email-Valid	64	RUN_DEPENDS+= p5-Email-Valid>=0.190:${PORTSDIR}/mail/p5-Email-Valid
Lines 99-104 Link Here
99		97
100	.if ${PORT_OPTIONS:MMYSQL}	98	.if ${PORT_OPTIONS:MMYSQL}
101	RUN_DEPENDS+= p5-Tie-DBI>=1.05:${PORTSDIR}/databases/p5-Tie-DBI	99	RUN_DEPENDS+= p5-Tie-DBI>=1.05:${PORTSDIR}/databases/p5-Tie-DBI
		100	RUN_DEPENDS+= p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql
102	.endif	101	.endif
103		102
104	.if ${PORT_OPTIONS:MMATCHRE}	103	.if ${PORT_OPTIONS:MMATCHRE}
Lines 127-154 Link Here
127	@${REINPLACE_CMD} -e 's\|/usr/bin/perl\|${PERL}\|' ${WRKSRC}/*.pl	126	@${REINPLACE_CMD} -e 's\|/usr/bin/perl\|${PERL}\|' ${WRKSRC}/*.pl
128		127
129	do-install:	128	do-install:
130	${MKDIR} ${DATADIR}	129	${MKDIR} ${STAGEDIR}${DATADIR}/images \
131	${INSTALL_SCRIPT} ${WRKSRC}/assp.pl ${DATADIR}	130	${STAGEDIR}${DATADIR}/logs ${STAGEDIR}${DATADIR}/reports
132	${INSTALL_SCRIPT} ${WRKSRC}/rebuildspamdb.pl ${DATADIR}	131	${INSTALL_SCRIPT} ${WRKSRC}/assp.pl ${STAGEDIR}${DATADIR}
133	${INSTALL_SCRIPT} ${WRKSRC}/stat.pl ${DATADIR}	132	(cd ${STAGEDIR} && ${LN} -sf ${DATADIR}/assp.pl ${STAGEDIR}${PREFIX}/sbin/assp)
		133	${INSTALL_SCRIPT} ${WRKSRC}/rebuildspamdb.pl ${STAGEDIR}${DATADIR}
		134	${INSTALL_SCRIPT} ${WRKSRC}/stat.pl ${STAGEDIR}${DATADIR}
134		135
135	( cd ${WRKSRC} && ${COPYTREE_SHARE} "files images reports" \	136	( cd ${WRKSRC} && ${COPYTREE_SHARE} "files images reports" \
136	${DATADIR}/ "! -name '.orig' ! -name '.bak'" )	137	${STAGEDIR}${DATADIR}/ "! -name '.orig' ! -name '.bak'" )
137		138
138	${INSTALL_SCRIPT} ${WRKDIR}/assplog.pl ${PREFIX}/sbin/assplog	139	${INSTALL_SCRIPT} ${WRKDIR}/assplog.pl ${STAGEDIR}${PREFIX}/sbin/assplog
139		140
140	${INSTALL_MAN} ${WRKDIR}/assp.8 ${MAN8PREFIX}/man/man8	141	${INSTALL_MAN} ${WRKDIR}/assp.8 ${STAGEDIR}${MAN8PREFIX}/man/man8
141	${INSTALL_MAN} ${WRKDIR}/assplog.8 ${MAN8PREFIX}/man/man8	142	${INSTALL_MAN} ${WRKDIR}/assplog.8 ${STAGEDIR}${MAN8PREFIX}/man/man8
		143	${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/daily
		144	${INSTALL_SCRIPT} ${WRKDIR}/510.assp ${STAGEDIR}${PREFIX}/etc/periodic/daily/
		145	${MKDIR} ${STAGEDIR}${ASSP_HOME}
		146	${MKDIR} ${STAGEDIR}${ASSP_LOG}
142		147
143	${MKDIR} ${PREFIX}/etc/periodic/daily
144	${INSTALL_SCRIPT} ${WRKDIR}/510.assp ${PREFIX}/etc/periodic/daily/
145		148
146	.if ${PORT_OPTIONS:MDOCS}	149	.if ${PORT_OPTIONS:MDOCS}
147	${MKDIR} ${DOCSDIR}	150	${MKDIR} ${STAGEDIR}${DOCSDIR}
148	${INSTALL_DATA} ${WRKSRC}/docs/*.htm ${DOCSDIR}	151	${INSTALL_DATA} ${WRKSRC}/docs/*.htm ${STAGEDIR}${DOCSDIR}
149	.endif	152	.endif
150		153
151	post-install:	154	.include <bsd.port.mk>
152	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
153
154	.include <bsd.port.post.mk>

Lines 1-2 Link Here

(-)assp.new/distinfo (-2 / +3 lines)
1	SHA256 (ASSP_1.9.9.13257_Install.zip) = 657106e254baf1a9da182ed89c0d8a1b342110b0f01686cc7582e6b9e2f19a1c	1	SHA256 (ASSP_1.9.9.14158_Install.zip) = 1237a965ca3475a5cdabf786d470d295ce70ff030307d903b979b8c7ac80e186
2	SIZE (ASSP_1.9.9.13257_Install.zip) = 1741147	2	SIZE (ASSP_1.9.9.14158_Install.zip) = 1347031
		3




--- assp.pl.orig	2014-07-02 16:55:36.000000000 -0500
+++ assp.pl	2014-07-02 16:56:22.000000000 -0500
@@ -2767,11 +2767,11 @@
  'Set the characterset/codepage for the maillog output to your local needs. Best on non Windows systems is "utf8" if available or "System Default" - no conversion. On Windows systems set it to your local codepage or UTF-8 (chcp 65001). To display nonASCII characters in the subject line and maillog files names setup decodeMIME2UTF8 .'],
 ['decodeMIME2UTF8','Decode MIME Words To UTF-8',1,\&checkbox,'1','(.*)',undef,'If selected, ASSP decodes MIME encoded words to UTF8. This enables support for national languages to be used in Bombs , Scripts , Spamdb , Logging. If not selected, only US-ASCII characters will be used for this functions. This requires an installed Email::MIME module in PERL.'],
 ['AsAService','Run ASSP as a Windows Service',0,\&checkbox,'','(.*)',undef,'In Windows NT/2000/XP/2003 ASSP can be installed as a service. This setting tells ASSP that this has been done -- it does not install the Windows service for you. Installing ASSP as a service requires several steps which are detailed in the <a href="http://apps.sourceforge.net/mediawiki/assp/index.php?title=Win32">Quick Start for Win32</a> doku page.<br /> Information about the Win32::Daemon module which which is necessary can be found here: <a href="http://www.roth.net/perl/Daemon/">The Official Win32::Daemon Home Page</a><br /><span class="negative"> requires ASSP restart</span>'],
-['AsADaemon','Run ASSP as a Daemon',0,\&checkbox,'','(.*)',undef,'In Linux/BSD/Unix/OSX fork and exit. Similar to the command "perl assp.pl &amp;", but better.<br />
+['AsADaemon','Run ASSP as a Daemon',0,\&checkbox,'1','(.*)',undef,'In Linux/BSD/Unix/OSX fork and exit. Similar to the command "perl assp.pl &amp;", but better.<br />
   <span class="negative"> Changing this requires a restart of ASSP.</span>'],
  If "externaly controlled" is selected, ASSP simply ends and you have to restart assp from your daemon or watchdog script<br />
  If "run AutoRestartCmd on restart and wait" is selected, assp starts the OS command defined in AutoRestartCmd - assp will <b>NOT !</b> automaticaly terminate - the started command has to terminate/kill and to (re)start assp - like "service assp restart"!<br />
  If "run AutoRestartCmd on restart and exit" is selected, assp starts the OS command defined in AutoRestartCmd and terminates immediatly!<br />
   <span class="negative"> requires ASSP restart</span>',undef,undef,'msg007440','msg007441'],
-['runAsUser','Run as UID',20,\&textinput,'','(\S*)',undef,'The *nix user name to assume after startup (*nix only).<p><small><i>Examples:</i> assp, nobody</small></p>
+['runAsUser','Run as UID',20,\&textinput,'assp','(\S*)',undef,'The *nix user name to assume after startup (*nix only).<p><small><i>Examples:</i> assp, nobody</small></p>
   <span class="negative"> Changing this requires a restart of ASSP.</span>'],




#!/bin/sh
# $FreeBSD: head/mail/assp/files/pkg-install.in 340719 2014-01-22 15:52:06Z mat $

if [ "${2}" = "POST-INSTALL" ]; then
    ASSP_USER=%%ASSP_USER%%
    ASSP_GROUP=%%ASSP_GROUP%%
    ASSP_HOME=%%ASSP_HOME%%
    ASSP_LOG=%%ASSP_LOG%%
    DATADIR=${PKG_PREFIX}/share/assp

    chmod -R 755 ${DATADIR}/files
    chown -R ${ASSP_USER}:${ASSP_GROUP} ${DATADIR}/files

    ln -sf ${DATADIR}/assp.pl ${PKG_PREFIX}/sbin/assp

    install -d -m 750 -o ${ASSP_USER} -g ${ASSP_GROUP} ${ASSP_LOG}
    install -d -m 700 -o ${ASSP_USER} -g ${ASSP_GROUP} ${ASSP_HOME}

    ln -sf ${DATADIR}/files ${ASSP_HOME}
    ln -sf ${DATADIR}/images ${ASSP_HOME}
    ln -sf ${DATADIR}/reports ${ASSP_HOME}
    ln -sf ${DATADIR}/rebuildspamdb.pl ${ASSP_HOME}
    ln -sf ${ASSP_LOG} ${ASSP_HOME}/logs

fi




sbin/assp
sbin/assplog
%%DATADIR%%/assp.pl
@owner %%ASSP_USER%%
@group %%ASSP_GROUP%%
%%DATADIR%%/files/URIBLCCTLDS.txt
%%DATADIR%%/files/blackaddresses.txt
%%DATADIR%%/files/blackdomains.txt
%%DATADIR%%/files/blackre.txt
%%DATADIR%%/files/blacksenderbase.txt
%%DATADIR%%/files/blockreportlist.txt
%%DATADIR%%/files/bombdatare.txt
%%DATADIR%%/files/bombheaderre.txt

%%DATADIR%%/files/deny.txt
%%DATADIR%%/files/denyalways.txt
%%DATADIR%%/files/dnsbls.txt
%%DATADIR%%/files/dnsrws.txt
%%DATADIR%%/files/droplist.txt
%%DATADIR%%/files/groups.txt
%%DATADIR%%/files/invalidhelo.txt
%%DATADIR%%/files/invalidptr.txt
%%DATADIR%%/files/ipnp.txt
%%DATADIR%%/files/ipnpexclude.txt
%%DATADIR%%/files/noblocking.txt
%%DATADIR%%/files/nodelay.txt
%%DATADIR%%/files/nodelayhelosre.txt

%%DATADIR%%/files/preheaderre.txt
%%DATADIR%%/files/rcptreplrules.txt
%%DATADIR%%/files/redre.txt
%%DATADIR%%/files/samesubjectskip.txt
%%DATADIR%%/files/strictspf.txt
%%DATADIR%%/files/subjectre.txt
%%DATADIR%%/files/suspiciousre.txt
%%DATADIR%%/files/suspiciousvirus.txt
%%DATADIR%%/files/tlds-alpha-by-domain.txt
%%DATADIR%%/files/uriblwhite.txt
%%DATADIR%%/files/uriblserviceprovider.txt
%%DATADIR%%/files/uriblwhite.txt
%%DATADIR%%/files/validhelo.txt
%%DATADIR%%/files/validptr.txt
%%DATADIR%%/files/whiteptr.txt
%%DATADIR%%/files/whitesenderbase.txt
@owner
@group
%%DATADIR%%/images/assp.css
%%DATADIR%%/images/blockreport.css
%%DATADIR%%/images/blockreport.gif

%%DATADIR%%/reports/notspamreport.txt
%%DATADIR%%/reports/npremovereport.txt
%%DATADIR%%/reports/npreport.txt
%%DATADIR%%/reports/persblackreport.txt
%%DATADIR%%/reports/redremovereport.txt
%%DATADIR%%/reports/redreport.txt
%%DATADIR%%/reports/slremovereport.txt

%%PORTDOCS%%%%DOCSDIR%%/Legacy - ASSP Documentation.htm
%%PORTDOCS%%%%DOCSDIR%%/Regular Expression Tutorial.htm
%%PORTDOCS%%@dirrm %%DOCSDIR%%
man/man8/assp.8.gz
man/man8/assplog.8.gz
@dirrmtry %%DATADIR%%/reports
@dirrmtry %%DATADIR%%/logs
@dirrmtry %%DATADIR%%/images
@dirrmtry %%DATADIR%%/files
@dirrmtry %%DATADIR%%
@dirrmtry etc/periodic/daily
@dirrmtry etc/periodic
@exec ln -sf %D/%%DATADIR%%/files %%ASSP_HOME%%/
@unexec rm -f %%ASSP_HOME%%/reports
@unexec rm -f %%ASSP_HOME%%/images
@unexec rm -f %%ASSP_HOME%%/files
@exec ln -sf %D/%%DATADIR%%/images %%ASSP_HOME%%/
@unexec rm -f %%ASSP_HOME%%/images
@exec ln -sf %D/%%DATADIR%%/rebuildspamdb.pl %%ASSP_HOME%%/
@unexec rm -f %%ASSP_HOME%%/rebuildspamdb.pl
@exec ln -sf %D/%%DATADIR%%/reports %%ASSP_HOME%%/
@unexec rm -f %%ASSP_HOME%%/reports
@exec ln -sf %%ASSP_LOG%% %%ASSP_HOME%%/logs
@unexec rm -f %%ASSP_HOME%%/logs
@cwd /
@owner %%ASSP_USER%%
@group %%ASSP_GROUP%%
@mode 750
@dirrmtry %%ASSP_LOG%%
@dirrmtry %%ASSP_HOME%%
@unexec if [ -d %%ASSP_HOME%% ]; then echo "If you are deinstalling ASSP completely, remove the %%ASSP_HOME%% directory."; fi
@unexec rmdir %%ASSP_LOG%% 2>/dev/null || true
@unexec if [ -d %%ASSP_LOG%% ]; then echo "If you are deinstalling ASSP completely, remove the %%ASSP_LOG%% directory."; fi
@unexec echo "If you are deinstalling ASSP completely, delete the ASSP user and group."

Return to bug 191635

Lines 1-16 Link Here

(-)assp.new/files/patch-assp.pl (-10 / +6 lines)
1	--- assp.pl.orig 2013-08-12 14:12:11.000000000 -0500	1	--- assp.pl.orig 2014-07-02 16:55:36.000000000 -0500
2	+++ assp.pl 2013-08-12 14:15:10.000000000 -0500	2	+++ assp.pl 2014-07-02 16:56:22.000000000 -0500
3	@@ -2758,15 +2758,15 @@	3	@@ -2767,11 +2767,11 @@
4	'Set the characterset/codepage for the maillog output to your local needs. Best on non Windows systems is "utf8" if available or "System Default" - no conversion. On Windows systems set it to your local codepage or UTF-8 (chcp 65001). To display nonASCII characters in the subject line and maillog files names setup decodeMIME2UTF8 .'],	4	'Set the characterset/codepage for the maillog output to your local needs. Best on non Windows systems is "utf8" if available or "System Default" - no conversion. On Windows systems set it to your local codepage or UTF-8 (chcp 65001). To display nonASCII characters in the subject line and maillog files names setup decodeMIME2UTF8 .'],
5	['decodeMIME2UTF8','Decode MIME Words To UTF-8',1,\&checkbox,'1','(.*)',undef,'If selected, ASSP decodes MIME encoded words to UTF8. This enables support for national languages to be used in Bombs , Scripts , Spamdb , Logging. If not selected, only US-ASCII characters will be used for this functions. This requires an installed Email::MIME module in PERL.'],	5	['decodeMIME2UTF8','Decode MIME Words To UTF-8',1,\&checkbox,'1','(.*)',undef,'If selected, ASSP decodes MIME encoded words to UTF8. This enables support for national languages to be used in Bombs , Scripts , Spamdb , Logging. If not selected, only US-ASCII characters will be used for this functions. This requires an installed Email::MIME module in PERL.'],
6	['AsAService','Run ASSP as a Windows Service',0,\&checkbox,'','(.*)',undef,'In Windows NT/2000/XP/2003 ASSP can be installed as a service. This setting tells ASSP that this has been done -- it does not install the Windows service for you. Installing ASSP as a service requires several steps which are detailed in the <a href="http://apps.sourceforge.net/mediawiki/assp/index.php?title=Win32">Quick Start for Win32</a> doku page.<br /> Information about the Win32::Daemon module which which is necessary can be found here: <a href="http://www.roth.net/perl/Daemon/">The Official Win32::Daemon Home Page</a><br /><span class="negative"> requires ASSP restart</span>'],	6	['AsAService','Run ASSP as a Windows Service',0,\&checkbox,'','(.*)',undef,'In Windows NT/2000/XP/2003 ASSP can be installed as a service. This setting tells ASSP that this has been done -- it does not install the Windows service for you. Installing ASSP as a service requires several steps which are detailed in the <a href="http://apps.sourceforge.net/mediawiki/assp/index.php?title=Win32">Quick Start for Win32</a> doku page.<br /> Information about the Win32::Daemon module which which is necessary can be found here: <a href="http://www.roth.net/perl/Daemon/">The Official Win32::Daemon Home Page</a><br /><span class="negative"> requires ASSP restart</span>'],
7	-['AsADaemon','Run ASSP as a Daemon','0:No\|1:Yes - externaly controlled\|2:Yes - run AutoRestartCmd on restart and wait\|3:Yes - run AutoRestartCmd on restart and exit',\&listbox,'0','(.*)',undef,'In Linux/BSD/Unix/OSX fork and close file handles. <br />	7	-['AsADaemon','Run ASSP as a Daemon',0,\&checkbox,'','(.*)',undef,'In Linux/BSD/Unix/OSX fork and exit. Similar to the command "perl assp.pl &", but better.<br />
8	+['AsADaemon','Run ASSP as a Daemon','0:No\|1:Yes - externaly controlled\|2:Yes - run AutoRestartCmd on restart and wait\|3:Yes - run AutoRestartCmd on restart and exit',\&listbox,'1','(.*)',undef,'In Linux/BSD/Unix/OSX fork and close file handles. <br />	8	+['AsADaemon','Run ASSP as a Daemon',0,\&checkbox,'1','(.*)',undef,'In Linux/BSD/Unix/OSX fork and exit. Similar to the command "perl assp.pl &", but better.<br />
9	Similar to the command "perl assp.pl &", but better.<br />	9	<span class="negative"> Changing this requires a restart of ASSP.</span>'],
10	If "externaly controlled" is selected, ASSP simply ends and you have to restart assp from your daemon or watchdog script<br />
11	If "run AutoRestartCmd on restart and wait" is selected, assp starts the OS command defined in AutoRestartCmd - assp will <b>NOT !</b> automaticaly terminate - the started command has to terminate/kill and to (re)start assp - like "service assp restart"!<br />
12	If "run AutoRestartCmd on restart and exit" is selected, assp starts the OS command defined in AutoRestartCmd and terminates immediatly!<br />
13	<span class="negative"> requires ASSP restart</span>',undef,undef,'msg007440','msg007441'],
14	-['runAsUser','Run as UID',20,\&textinput,'','(\S)',undef,'The nix user name to assume after startup (*nix only).<p><small><i>Examples:</i> assp, nobody</small></p>	10	-['runAsUser','Run as UID',20,\&textinput,'','(\S)',undef,'The nix user name to assume after startup (*nix only).<p><small><i>Examples:</i> assp, nobody</small></p>
15	+['runAsUser','Run as UID',20,\&textinput,'assp','(\S)',undef,'The nix user name to assume after startup (*nix only).<p><small><i>Examples:</i> assp, nobody</small></p>	11	+['runAsUser','Run as UID',20,\&textinput,'assp','(\S)',undef,'The nix user name to assume after startup (*nix only).<p><small><i>Examples:</i> assp, nobody</small></p>
16	<span class="negative"> Changing this requires a restart of ASSP.</span>'],	12	<span class="negative"> Changing this requires a restart of ASSP.</span>'],

Lines 1-25 Link Here

(-)assp.new/files/pkg-install.in (-25 lines)
1	#!/bin/sh
2	# $FreeBSD: head/mail/assp/files/pkg-install.in 340719 2014-01-22 15:52:06Z mat $
3
4	if [ "${2}" = "POST-INSTALL" ]; then
5	ASSP_USER=%%ASSP_USER%%
6	ASSP_GROUP=%%ASSP_GROUP%%
7	ASSP_HOME=%%ASSP_HOME%%
8	ASSP_LOG=%%ASSP_LOG%%
9	DATADIR=${PKG_PREFIX}/share/assp
10
11	chmod -R 755 ${DATADIR}/files
12	chown -R ${ASSP_USER}:${ASSP_GROUP} ${DATADIR}/files
13
14	ln -sf ${DATADIR}/assp.pl ${PKG_PREFIX}/sbin/assp
15
16	install -d -m 750 -o ${ASSP_USER} -g ${ASSP_GROUP} ${ASSP_LOG}
17	install -d -m 700 -o ${ASSP_USER} -g ${ASSP_GROUP} ${ASSP_HOME}
18
19	ln -sf ${DATADIR}/files ${ASSP_HOME}
20	ln -sf ${DATADIR}/images ${ASSP_HOME}
21	ln -sf ${DATADIR}/reports ${ASSP_HOME}
22	ln -sf ${DATADIR}/rebuildspamdb.pl ${ASSP_HOME}
23	ln -sf ${ASSP_LOG} ${ASSP_HOME}/logs
24
25	fi

Lines 2-11 Link Here

(-)assp.new/pkg-plist (-11 / +34 lines)
2	sbin/assp	2	sbin/assp
3	sbin/assplog	3	sbin/assplog
4	%%DATADIR%%/assp.pl	4	%%DATADIR%%/assp.pl
		5	@owner %%ASSP_USER%%
		6	@group %%ASSP_GROUP%%
5	%%DATADIR%%/files/URIBLCCTLDS.txt	7	%%DATADIR%%/files/URIBLCCTLDS.txt
6	%%DATADIR%%/files/blackaddresses.txt	8	%%DATADIR%%/files/blackaddresses.txt
7	%%DATADIR%%/files/blackdomains.txt	9	%%DATADIR%%/files/blackdomains.txt
8	%%DATADIR%%/files/blackre.txt	10	%%DATADIR%%/files/blackre.txt
		11	%%DATADIR%%/files/blacksenderbase.txt
9	%%DATADIR%%/files/blockreportlist.txt	12	%%DATADIR%%/files/blockreportlist.txt
10	%%DATADIR%%/files/bombdatare.txt	13	%%DATADIR%%/files/bombdatare.txt
11	%%DATADIR%%/files/bombheaderre.txt	14	%%DATADIR%%/files/bombheaderre.txt
Lines 17-27 Link Here
17	%%DATADIR%%/files/deny.txt	20	%%DATADIR%%/files/deny.txt
18	%%DATADIR%%/files/denyalways.txt	21	%%DATADIR%%/files/denyalways.txt
19	%%DATADIR%%/files/dnsbls.txt	22	%%DATADIR%%/files/dnsbls.txt
		23	%%DATADIR%%/files/dnsrws.txt
20	%%DATADIR%%/files/droplist.txt	24	%%DATADIR%%/files/droplist.txt
21	%%DATADIR%%/files/groups.txt	25	%%DATADIR%%/files/groups.txt
22	%%DATADIR%%/files/invalidhelo.txt	26	%%DATADIR%%/files/invalidhelo.txt
23	%%DATADIR%%/files/invalidptr.txt	27	%%DATADIR%%/files/invalidptr.txt
24	%%DATADIR%%/files/ipnp.txt	28	%%DATADIR%%/files/ipnp.txt
		29	%%DATADIR%%/files/ipnpexclude.txt
25	%%DATADIR%%/files/noblocking.txt	30	%%DATADIR%%/files/noblocking.txt
26	%%DATADIR%%/files/nodelay.txt	31	%%DATADIR%%/files/nodelay.txt
27	%%DATADIR%%/files/nodelayhelosre.txt	32	%%DATADIR%%/files/nodelayhelosre.txt
Lines 34-49 Link Here
34	%%DATADIR%%/files/preheaderre.txt	39	%%DATADIR%%/files/preheaderre.txt
35	%%DATADIR%%/files/rcptreplrules.txt	40	%%DATADIR%%/files/rcptreplrules.txt
36	%%DATADIR%%/files/redre.txt	41	%%DATADIR%%/files/redre.txt
		42	%%DATADIR%%/files/samesubjectskip.txt
37	%%DATADIR%%/files/strictspf.txt	43	%%DATADIR%%/files/strictspf.txt
38	%%DATADIR%%/files/subjectre.txt	44	%%DATADIR%%/files/subjectre.txt
39	%%DATADIR%%/files/suspiciousre.txt	45	%%DATADIR%%/files/suspiciousre.txt
40	%%DATADIR%%/files/suspiciousvirus.txt	46	%%DATADIR%%/files/suspiciousvirus.txt
41	%%DATADIR%%/files/tlds-alpha-by-domain.txt	47	%%DATADIR%%/files/tlds-alpha-by-domain.txt
42	%%DATADIR%%/files/uriblwhite.txt
43	%%DATADIR%%/files/uriblserviceprovider.txt	48	%%DATADIR%%/files/uriblserviceprovider.txt
		49	%%DATADIR%%/files/uriblwhite.txt
		50	%%DATADIR%%/files/validhelo.txt
44	%%DATADIR%%/files/validptr.txt	51	%%DATADIR%%/files/validptr.txt
45	%%DATADIR%%/files/whiteptr.txt	52	%%DATADIR%%/files/whiteptr.txt
46	%%DATADIR%%/files/whiteorg.txt	53	%%DATADIR%%/files/whitesenderbase.txt
		54	@owner
		55	@group
47	%%DATADIR%%/images/assp.css	56	%%DATADIR%%/images/assp.css
48	%%DATADIR%%/images/blockreport.css	57	%%DATADIR%%/images/blockreport.css
49	%%DATADIR%%/images/blockreport.gif	58	%%DATADIR%%/images/blockreport.gif
Lines 77-82 Link Here
77	%%DATADIR%%/reports/notspamreport.txt	86	%%DATADIR%%/reports/notspamreport.txt
78	%%DATADIR%%/reports/npremovereport.txt	87	%%DATADIR%%/reports/npremovereport.txt
79	%%DATADIR%%/reports/npreport.txt	88	%%DATADIR%%/reports/npreport.txt
		89	%%DATADIR%%/reports/persblackreport.txt
80	%%DATADIR%%/reports/redremovereport.txt	90	%%DATADIR%%/reports/redremovereport.txt
81	%%DATADIR%%/reports/redreport.txt	91	%%DATADIR%%/reports/redreport.txt
82	%%DATADIR%%/reports/slremovereport.txt	92	%%DATADIR%%/reports/slremovereport.txt
Lines 89-106 Link Here
89	%%PORTDOCS%%%%DOCSDIR%%/Legacy - ASSP Documentation.htm	99	%%PORTDOCS%%%%DOCSDIR%%/Legacy - ASSP Documentation.htm
90	%%PORTDOCS%%%%DOCSDIR%%/Regular Expression Tutorial.htm	100	%%PORTDOCS%%%%DOCSDIR%%/Regular Expression Tutorial.htm
91	%%PORTDOCS%%@dirrm %%DOCSDIR%%	101	%%PORTDOCS%%@dirrm %%DOCSDIR%%
92	@dirrm %%DATADIR%%/reports	102	man/man8/assp.8.gz
93	@dirrm %%DATADIR%%/images	103	man/man8/assplog.8.gz
94	@dirrm %%DATADIR%%/files	104	@dirrmtry %%DATADIR%%/reports
95	@dirrm %%DATADIR%%	105	@dirrmtry %%DATADIR%%/logs
		106	@dirrmtry %%DATADIR%%/images
		107	@dirrmtry %%DATADIR%%/files
		108	@dirrmtry %%DATADIR%%
96	@dirrmtry etc/periodic/daily	109	@dirrmtry etc/periodic/daily
97	@dirrmtry etc/periodic	110	@dirrmtry etc/periodic
98	@unexec rm -f %%ASSP_HOME%%/logs	111	@exec ln -sf %D/%%DATADIR%%/files %%ASSP_HOME%%/
99	@unexec rm -f %%ASSP_HOME%%/reports
100	@unexec rm -f %%ASSP_HOME%%/images
101	@unexec rm -f %%ASSP_HOME%%/files	112	@unexec rm -f %%ASSP_HOME%%/files
102	@unexec rmdir %%ASSP_HOME%% 2>/dev/null \|\| true	113	@exec ln -sf %D/%%DATADIR%%/images %%ASSP_HOME%%/
		114	@unexec rm -f %%ASSP_HOME%%/images
		115	@exec ln -sf %D/%%DATADIR%%/rebuildspamdb.pl %%ASSP_HOME%%/
		116	@unexec rm -f %%ASSP_HOME%%/rebuildspamdb.pl
		117	@exec ln -sf %D/%%DATADIR%%/reports %%ASSP_HOME%%/
		118	@unexec rm -f %%ASSP_HOME%%/reports
		119	@exec ln -sf %%ASSP_LOG%% %%ASSP_HOME%%/logs
		120	@unexec rm -f %%ASSP_HOME%%/logs
		121	@cwd /
		122	@owner %%ASSP_USER%%
		123	@group %%ASSP_GROUP%%
		124	@mode 750
		125	@dirrmtry %%ASSP_LOG%%
		126	@dirrmtry %%ASSP_HOME%%
103	@unexec if [ -d %%ASSP_HOME%% ]; then echo "If you are deinstalling ASSP completely, remove the %%ASSP_HOME%% directory."; fi	127	@unexec if [ -d %%ASSP_HOME%% ]; then echo "If you are deinstalling ASSP completely, remove the %%ASSP_HOME%% directory."; fi
104	@unexec rmdir %%ASSP_LOG%% 2>/dev/null \|\| true
105	@unexec if [ -d %%ASSP_LOG%% ]; then echo "If you are deinstalling ASSP completely, remove the %%ASSP_LOG%% directory."; fi	128	@unexec if [ -d %%ASSP_LOG%% ]; then echo "If you are deinstalling ASSP completely, remove the %%ASSP_LOG%% directory."; fi
106	@unexec echo "If you are deinstalling ASSP completely, delete the ASSP user and group."	129	@unexec echo "If you are deinstalling ASSP completely, delete the ASSP user and group."