Attachment #48467 for bug #74172

Lines 7-13 Link Here

(-)clamav/Makefile (-5 / +8 lines)
7		7
8	PORTNAME= clamav	8	PORTNAME= clamav
9	PORTVERSION= ${DISTVERSION:C/([a-z])[a-z]*/.\1/g:S/-/./g}	9	PORTVERSION= ${DISTVERSION:C/([a-z])[a-z]*/.\1/g:S/-/./g}
10	PORTREVISION= 1	10	PORTREVISION= 2
11	CATEGORIES= security	11	CATEGORIES= security
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}	12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
13	MASTER_SITE_SUBDIR= clamav	13	MASTER_SITE_SUBDIR= clamav
Lines 39-45 Link Here
39		39
40	PORTDOCS= NEWS ChangeLog html	40	PORTDOCS= NEWS ChangeLog html
41		41
42	CONFIGURE_ARGS= --with-dbdir=${DATADIR} \	42	DBDIR= /var/db/clamav
		43	PLIST_SUB+= DBDIR=${DBDIR}
		44
		45	CONFIGURE_ARGS= --with-dbdir=${DBDIR} \
43	--disable-clamuko \	46	--disable-clamuko \
44	--disable-clamav \	47	--disable-clamav \
45	--enable-bigstack \	48	--enable-bigstack \
Lines 64-70 Link Here
64	CLAMAV_MILTER_SOCKET?= /var/run/clamav/clmilter.sock	67	CLAMAV_MILTER_SOCKET?= /var/run/clamav/clmilter.sock
65		68
66	SED_SCRIPT= -e 's\|%%PREFIX%%\|${PREFIX}\|g' \	69	SED_SCRIPT= -e 's\|%%PREFIX%%\|${PREFIX}\|g' \
67	-e 's\|%%DATADIR%%\|${DATADIR}\|g' \	70	-e 's\|%%DBDIR%%\|${DBDIR}\|g' \
68	-e 's\|%%CLAMAVUSER%%\|${CLAMAVUSER}\|g' \	71	-e 's\|%%CLAMAVUSER%%\|${CLAMAVUSER}\|g' \
69	-e 's\|%%CLAMAVGROUP%%\|${CLAMAVGROUP}\|g' \	72	-e 's\|%%CLAMAVGROUP%%\|${CLAMAVGROUP}\|g' \
70	-e 's\|%%CLAMAV_CLAMD_SOCKET%%\|${CLAMAV_CLAMD_SOCKET}\|g' \	73	-e 's\|%%CLAMAV_CLAMD_SOCKET%%\|${CLAMAV_CLAMD_SOCKET}\|g' \
Lines 78-84 Link Here
78	-e 's\|^\#?(AllowSupplementaryGroups)$$\|\1\|' \	81	-e 's\|^\#?(AllowSupplementaryGroups)$$\|\1\|' \
79	-e 's\|^\#?(ScanMail)$$\|\1\|' \	82	-e 's\|^\#?(ScanMail)$$\|\1\|' \
80	-e 's\|^\#?(NotifyClamd)$$\|\1\|' \	83	-e 's\|^\#?(NotifyClamd)$$\|\1\|' \
81	-e 's\|^\#?(DatabaseDirectory) .*$$\|\1 ${DATADIR}\|' \	84	-e 's\|^\#?(DatabaseDirectory) .*$$\|\1 ${DBDIR}\|' \
82	-e 's\|^\#?(DatabaseOwner) .*$$\|\1 ${CLAMAVUSER}\|' \	85	-e 's\|^\#?(DatabaseOwner) .*$$\|\1 ${CLAMAVUSER}\|' \
83	-e 's\|^\#?(FixStaleSocket)$$\|\1\|'	86	-e 's\|^\#?(FixStaleSocket)$$\|\1\|'
84		87
Lines 149-155 Link Here
149	${DESTDIR}${RC_DIR}/clamav-clamd${RC_SUFX}	152	${DESTDIR}${RC_DIR}/clamav-clamd${RC_SUFX}
150	@${INSTALL_SCRIPT} ${WRKDIR}/clamav-freshclam.sh \	153	@${INSTALL_SCRIPT} ${WRKDIR}/clamav-freshclam.sh \
151	${DESTDIR}${RC_DIR}/clamav-freshclam${RC_SUFX}	154	${DESTDIR}${RC_DIR}/clamav-freshclam${RC_SUFX}
152	@${CHOWN} -R ${CLAMAVUSER}:${CLAMAVGROUP} ${DESTDIR}${DATADIR}	155	@${CHOWN} -R ${CLAMAVUSER}:${CLAMAVGROUP} ${DESTDIR}${DBDIR}
153	.for c in clamd freshclam	156	.for c in clamd freshclam
154	@[ -f ${DESTDIR}${PREFIX}/etc/${c}.conf ] \|\| \	157	@[ -f ${DESTDIR}${PREFIX}/etc/${c}.conf ] \|\| \
155	${CP} ${DESTDIR}${PREFIX}/etc/${c}.conf.default ${DESTDIR}${PREFIX}/etc/${c}.conf	158	${CP} ${DESTDIR}${PREFIX}/etc/${c}.conf.default ${DESTDIR}${PREFIX}/etc/${c}.conf

Lines 23-29 Link Here

(-)clamav/files/clamav-clamd.sh (-1 / +1 lines)
23		23
24	command=%%PREFIX%%/sbin/clamd	24	command=%%PREFIX%%/sbin/clamd
25	pidfile=/var/run/clamav/clamd.pid	25	pidfile=/var/run/clamav/clamd.pid
26	required_dirs=%%DATADIR%%	26	required_dirs=%%DBDIR%%
27	required_files=%%PREFIX%%/etc/clamd.conf	27	required_files=%%PREFIX%%/etc/clamd.conf
28		28
29	# read settings, set default values	29	# read settings, set default values

Lines 24-30 Link Here

(-)clamav/files/clamav-freshclam.sh (-1 / +1 lines)
24	command=%%PREFIX%%/bin/freshclam	24	command=%%PREFIX%%/bin/freshclam
25	pidfile=/var/run/clamav/freshclam.pid	25	pidfile=/var/run/clamav/freshclam.pid
26	command_args="--daemon"	26	command_args="--daemon"
27	required_dirs=%%DATADIR%%	27	required_dirs=%%DBDIR%%
28	required_files=%%PREFIX%%/etc/freshclam.conf	28	required_files=%%PREFIX%%/etc/freshclam.conf
29		29
30	# read settings, set default values	30	# read settings, set default values

Lines 22-28 Link Here

(-)clamav/files/clamav-milter.sh (-1 / +1 lines)
22	rcvar=`set_rcvar`	22	rcvar=`set_rcvar`
23		23
24	command=%%PREFIX%%/sbin/clamav-milter	24	command=%%PREFIX%%/sbin/clamav-milter
25	required_dirs=%%DATADIR%%	25	required_dirs=%%DBDIR%%
26	required_files=%%PREFIX%%/etc/clamd.conf	26	required_files=%%PREFIX%%/etc/clamd.conf
27		27
28	start_precmd=start_precmd	28	start_precmd=start_precmd





CLAMRUN=$DESTDIR/var/run/clamav
CLAMLOG=$DESTDIR/var/log/clamav
DBDIR=$DESTDIR%%DBDIR%%

if [ "$2" = "PRE-INSTALL" ]; then


		chown "$CLAMAVUSER:$CLAMAVGROUP" "$CLAMLOG" || exit 1
	fi

	if [ ! -d "$DBDIR" ]; then
		mkdir -p "$DBDIR" || exit 1
		chown "$CLAMAVUSER:$CLAMAVGROUP" "$DBDIR" || exit 1
	fi

	if [ -f "$DESTDIR$PREFIX/etc/clamav.conf" ]; then

Lines 22-29 Link Here

(-)clamav/pkg-plist (-3 / +3 lines)
22	@unexec if cmp -s %D/etc/freshclam.conf %D/etc/freshclam.conf.default; then rm -f %D/etc/freshclam.conf; fi	22	@unexec if cmp -s %D/etc/freshclam.conf %D/etc/freshclam.conf.default; then rm -f %D/etc/freshclam.conf; fi
23	etc/freshclam.conf.default	23	etc/freshclam.conf.default
24	@exec [ -f %B/freshclam.conf ] \|\| cp %B/%f %B/freshclam.conf	24	@exec [ -f %B/freshclam.conf ] \|\| cp %B/%f %B/freshclam.conf
25	@unexec [ -s %D/%%DATADIR%%/daily.cvd ] \|\| rm -f %D/%%DATADIR%%/daily.cvd \|\| true	25	@unexec [ ! -f %%DBDIR%%/daily.cvd ] \|\| rm -f %%DBDIR%%/daily.cvd \|\| true
26	@unexec [ -s %D/%%DATADIR%%/main.cvd ] \|\| rm -f %D/%%DATADIR%%/main.cvd \|\| true	26	@unexec [ ! -f %%DBDIR%%/main.cvd ] \|\| rm -f %%DBDIR%%/main.cvd \|\| true
27	@dirrm %%DATADIR%%	27	@unexec rmdir %%DBDIR%%
28	@unexec rmdir /var/run/clamav 2>/dev/null \|\| true	28	@unexec rmdir /var/run/clamav 2>/dev/null \|\| true
29	@unexec rmdir /var/log/clamav 2>/dev/null \|\| true	29	@unexec rmdir /var/log/clamav 2>/dev/null \|\| true

Return to bug 74172

Lines 11-17 Link Here

(-)clamav/pkg-install (-4 / +4 lines)
11		11
12	CLAMRUN=$DESTDIR/var/run/clamav	12	CLAMRUN=$DESTDIR/var/run/clamav
13	CLAMLOG=$DESTDIR/var/log/clamav	13	CLAMLOG=$DESTDIR/var/log/clamav
14	DATADIR=$DESTDIR%%DATADIR%%	14	DBDIR=$DESTDIR%%DBDIR%%
15		15
16	if [ "$2" = "PRE-INSTALL" ]; then	16	if [ "$2" = "PRE-INSTALL" ]; then
17		17
Lines 49-57 Link Here
49	chown "$CLAMAVUSER:$CLAMAVGROUP" "$CLAMLOG" \|\| exit 1	49	chown "$CLAMAVUSER:$CLAMAVGROUP" "$CLAMLOG" \|\| exit 1
50	fi	50	fi
51		51
52	if [ ! -d "$DATADIR" ]; then	52	if [ ! -d "$DBDIR" ]; then
53	mkdir -p "$DATADIR" \|\| exit 1	53	mkdir -p "$DBDIR" \|\| exit 1
54	chown "$CLAMAVUSER:$CLAMAVGROUP" "$DATADIR" \|\| exit 1	54	chown "$CLAMAVUSER:$CLAMAVGROUP" "$DBDIR" \|\| exit 1
55	fi	55	fi
56		56
57	if [ -f "$DESTDIR$PREFIX/etc/clamav.conf" ]; then	57	if [ -f "$DESTDIR$PREFIX/etc/clamav.conf" ]; then