Attachment 47095 Details for Bug 72203 – file.diff

[patch] file.diff

file.diff (text/plain), 10.66 KB, created by Oliver Eikemeier on 2004-09-30 17:20:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Oliver Eikemeier

Created: 2004-09-30 17:20:13 UTC

Size: 10.66 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/ncvs/ports/security/clamav/Makefile,v
>retrieving revision 1.39
>diff -u -u -r1.39 Makefile
>--- Makefile	8 Aug 2004 14:05:38 -0000	1.39
>+++ Makefile	29 Sep 2004 18:09:41 -0000
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	clamav
>-PORTVERSION=	${DISTVERSION:S/-rc//g:S/-/./g}
>+PORTVERSION=	${DISTVERSION:C/([a-z])[a-z]*/.\1/g:S/-/./g}
> CATEGORIES=	security
> MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
> MASTER_SITE_SUBDIR=	clamav
>@@ -23,7 +23,7 @@
> 		arc:${PORTSDIR}/archivers/arc \
> 		unzip:${PORTSDIR}/archivers/unzip
> 
>-DISTVERSION=	0.75.1
>+DISTVERSION=	0.80rc3
> 
> OPTIONS=	MILTER "Compile the milter interface" off
> USE_REINPLACE=	yes
>@@ -49,7 +49,7 @@
> CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" \
> 		LDFLAGS="${LDFLAGS}"
> MAN1=		clamscan.1 freshclam.1 sigtool.1 clamdscan.1
>-MAN5=		clamav.conf.5 freshclam.conf.5
>+MAN5=		clamd.conf.5 freshclam.conf.5
> MAN8=		clamd.8 clamav-milter.8
> 
> CONFLICTS=	clamav-devel-[0-9]*
>@@ -67,16 +67,15 @@
> 		-e 's|%%CLAMAV_MILTER_SOCKET%%|${CLAMAV_MILTER_SOCKET}|g'
> 
> SED_CONF=	-E -e 's|^\#?(Example)$$|\#\1|' \
>-		-e 's|^\#?(LogFile) .*$$|\1 /var/log/clamav/clamd.log|' \
>-		-e 's|^\#?(PidFile) .*$$|\1 /var/run/clamav/clamd.pid|' \
>+		-e 's|^\#?((Update)?LogFile) .*/([a-z]+\.log)$$|\1 /var/log/clamav/\3|' \
>+		-e 's|^\#?(PidFile) .*/([a-z]+\.pid)$$|\1 /var/run/clamav/\2|' \
> 		-e 's|^\#?(LocalSocket) .*$$|\1 ${CLAMAV_CLAMD_SOCKET}|' \
> 		-e 's|^\#?(User) .*$$|\1 ${CLAMAVUSER}|' \
> 		-e 's|^\#?(AllowSupplementaryGroups)$$|\1|' \
> 		-e 's|^\#?(ScanMail)$$|\1|' \
>-		-e 's|^\#?(Checks)$$|\#\1|' \
>+		-e 's|^\#?(NotifyClamd)$$|\1|' \
> 		-e 's|^\#?(DatabaseDirectory) .*$$|\1 ${DATADIR}|' \
> 		-e 's|^\#?(DatabaseOwner) .*$$|\1 ${CLAMAVUSER}|' \
>-		-e 's|^\#?(UpdateLogFile) .*$$|\1 /var/log/clamav/freshclam.log|' \
> 		-e 's|^\#?(FixStaleSocket)$$|\1|'
> 
> PLIST_SUB+=	CLAMAVUSER=${CLAMAVUSER} \
>@@ -111,7 +110,7 @@
> 		${WRKSRC}/Makefile.in
> 
> post-build:
>-	@${REINPLACE_CMD} ${SED_CONF} ${BUILD_WRKSRC}/etc/clamav.conf
>+	@${REINPLACE_CMD} ${SED_CONF} ${BUILD_WRKSRC}/etc/clamd.conf
> 	@${REINPLACE_CMD} ${SED_CONF} ${BUILD_WRKSRC}/etc/freshclam.conf
> 	@${SED} ${SED_SCRIPT} ${PKGDIR}/pkg-install >${PKGINSTALL}
> 	@${SED} ${SED_SCRIPT} ${PKGDIR}/pkg-deinstall >${PKGDEINSTALL}
>@@ -134,7 +133,7 @@
> 	@${INSTALL_SCRIPT} ${WRKDIR}/clamav-freshclam.sh \
> 		${RC_DIR}/clamav-freshclam${RC_SUFX}
> 	@${CHOWN} -R ${CLAMAVUSER}:${CLAMAVGROUP} ${DATADIR}
>-.for c in clamav freshclam
>+.for c in clamd freshclam
> 	@[ -f ${PREFIX}/etc/${c}.conf ] || \
> 		${CP} ${PREFIX}/etc/${c}.conf.default ${PREFIX}/etc/${c}.conf
> .endfor
>Index: distinfo
>===================================================================
>RCS file: /home/ncvs/ports/security/clamav/distinfo,v
>retrieving revision 1.13
>diff -u -u -r1.13 distinfo
>--- distinfo	8 Aug 2004 14:05:38 -0000	1.13
>+++ distinfo	29 Sep 2004 16:54:12 -0000
>@@ -1,2 +1,2 @@
>-MD5 (clamav-0.75.1.tar.gz) = 2c85b7957eba9fd9e9ff8c2537ae006f
>-SIZE (clamav-0.75.1.tar.gz) = 2777319
>+MD5 (clamav-0.80rc3.tar.gz) = 359d5bc28bdde382f01c308608b70b0b
>+SIZE (clamav-0.80rc3.tar.gz) = 2625409
>Index: pkg-install
>===================================================================
>RCS file: /home/ncvs/ports/security/clamav/pkg-install,v
>retrieving revision 1.7
>diff -u -u -r1.7 pkg-install
>--- pkg-install	30 May 2004 08:01:22 -0000	1.7
>+++ pkg-install	29 Sep 2004 18:36:42 -0000
>@@ -48,11 +48,23 @@
> 		chown "$CLAMAVUSER:$CLAMAVGROUP" "$CLAMLOG" || exit 1
> 	fi
> 
>-	if [ ! -d "${DATADIR}" ]; then
>+	if [ ! -d "$DATADIR" ]; then
> 		mkdir -p "$DATADIR" || exit 1
> 		chown "$CLAMAVUSER:$CLAMAVGROUP" "$DATADIR" || exit 1
> 	fi
> 
>+	if [ -f "$PREFIX/etc/clamav.conf" ]; then
>+		echo
>+		echo "**************** WARNING ****************"
>+		echo "*                                       *"
>+		echo "*  The configuration file has changed:  *"
>+		echo "* Please edit $PREFIX/etc/clamd.conf *"
>+		echo "* and remove $PREFIX/etc/clamav.conf *"
>+		echo "*                                       *"
>+		echo "**************** WARNING ****************"
>+		echo
>+	fi
>+
> fi
> 
> exit 0
>Index: pkg-plist
>===================================================================
>RCS file: /home/ncvs/ports/security/clamav/pkg-plist,v
>retrieving revision 1.14
>diff -u -u -r1.14 pkg-plist
>--- pkg-plist	15 Jun 2004 10:04:48 -0000	1.14
>+++ pkg-plist	29 Sep 2004 17:02:03 -0000
>@@ -16,9 +16,9 @@
> lib/libclamav.so
> lib/libclamav.a
> libdata/pkgconfig/libclamav.pc
>-@unexec if cmp -s %D/etc/clamav.conf %D/etc/clamav.conf.default; then rm -f %D/etc/clamav.conf; fi
>-etc/clamav.conf.default
>-@exec [ -f %B/clamav.conf ] || cp %B/%f %B/clamav.conf
>+@unexec if cmp -s %D/etc/clamd.conf %D/etc/clamd.conf.default; then rm -f %D/etc/clamd.conf; fi
>+etc/clamd.conf.default
>+@exec [ -f %B/clamd.conf ] || cp %B/%f %B/clamd.conf
> @unexec if cmp -s %D/etc/freshclam.conf %D/etc/freshclam.conf.default; then rm -f %D/etc/freshclam.conf; fi
> etc/freshclam.conf.default
> @exec [ -f %B/freshclam.conf ] || cp %B/%f %B/freshclam.conf
>Index: files/clamav-clamd.sh
>===================================================================
>RCS file: /home/ncvs/ports/security/clamav/files/clamav-clamd.sh,v
>retrieving revision 1.3
>diff -u -u -r1.3 clamav-clamd.sh
>--- files/clamav-clamd.sh	19 Apr 2004 15:21:33 -0000	1.3
>+++ files/clamav-clamd.sh	29 Sep 2004 18:13:35 -0000
>@@ -24,20 +24,12 @@
> command=%%PREFIX%%/sbin/clamd
> pidfile=/var/run/clamav/clamd.pid
> required_dirs=%%DATADIR%%
>-required_files=%%PREFIX%%/etc/clamav.conf
>+required_files=%%PREFIX%%/etc/clamd.conf
> 
>-stop_postcmd=stop_postcmd
>+# read settings, set default values
>+load_rc_config "$name"
>+: ${clamav_clamd_enable="NO"}
>+: ${clamav_clamd_flags=""}
>+: ${clamav_clamd_socket="%%CLAMAV_CLAMD_SOCKET%%"}
> 
>-stop_postcmd()
>-{
>-  rm -f $pidfile
>-}
>-
>-# set defaults
>-
>-clamav_clamd_enable=${clamav_clamd_enable:-"NO"}
>-clamav_clamd_flags=${clamav_clamd_flags:-""}
>-clamav_clamd_socket=${clamav_clamd_socket:-"%%CLAMAV_CLAMD_SOCKET%%"}
>-
>-load_rc_config $name
> run_rc_command "$1"
>Index: files/clamav-freshclam.sh
>===================================================================
>RCS file: /home/ncvs/ports/security/clamav/files/clamav-freshclam.sh,v
>retrieving revision 1.3
>diff -u -u -r1.3 clamav-freshclam.sh
>--- files/clamav-freshclam.sh	15 Jun 2004 10:04:48 -0000	1.3
>+++ files/clamav-freshclam.sh	29 Sep 2004 18:14:38 -0000
>@@ -9,7 +9,7 @@
> # KEYWORD: FreeBSD shutdown
> 
> #
>-# Add the following lines to /etc/rc.conf to enable freshclam daemon:
>+# Add the following lines to /etc/rc.conf to enable the freshclam daemon:
> #
> #clamav_freshclam_enable="YES"
> #
>@@ -22,16 +22,14 @@
> rcvar=`set_rcvar`
> 
> command=%%PREFIX%%/bin/freshclam
>+pidfile=/var/run/clamav/freshclam.pid
>+command_args="--daemon"
> required_dirs=%%DATADIR%%
> required_files=%%PREFIX%%/etc/freshclam.conf
> 
>-# set defaults
>+# read settings, set default values
>+load_rc_config "$name"
>+: ${clamav_freshclam_enable="NO"}
>+: ${clamav_freshclam_flags=""}
> 
>-clamav_freshclam_enable=${clamav_freshclam_enable:-"NO"}
>-clamav_freshclam_flags=${clamav_freshclam_flags:-"--pid=/var/run/clamav/freshclam.pid --daemon-notify=%%PREFIX%%/etc/clamav.conf"}
>-
>-load_rc_config $name
>-
>-# add --daemon to any given arguments
>-clamav_freshclam_flags="${clamav_freshclam_flags} --daemon"
> run_rc_command "$1"
>Index: files/clamav-milter.sh
>===================================================================
>RCS file: /home/ncvs/ports/security/clamav/files/clamav-milter.sh,v
>retrieving revision 1.2
>diff -u -u -r1.2 clamav-milter.sh
>--- files/clamav-milter.sh	30 Jan 2004 15:19:22 -0000	1.2
>+++ files/clamav-milter.sh	29 Sep 2004 17:29:12 -0000
>@@ -23,7 +23,7 @@
> 
> command=%%PREFIX%%/sbin/clamav-milter
> required_dirs=%%DATADIR%%
>-required_files=%%PREFIX%%/etc/clamav.conf
>+required_files=%%PREFIX%%/etc/clamd.conf
> 
> start_precmd=start_precmd
> 
>@@ -33,16 +33,13 @@
> 		warn "Stale socket $clamav_milter_socket removed."
> 		rm "$clamav_milter_socket"
> 	fi
>+	rc_flags="${flags:-$clamav_milter_flags} $clamav_milter_socket"
> }
> 
>-# set defaults
>-
>-clamav_milter_enable=${clamav_milter_enable:-"NO"}
>-clamav_milter_socket=${clamav_milter_socket:-"%%CLAMAV_MILTER_SOCKET%%"}
>-clamav_milter_flags=${clamav_milter_flags:-"--postmaster-only --local --outgoing --max-children=50"}
>-
>+# read settings, set default values
> load_rc_config $name
>+: ${clamav_milter_enable="NO"}
>+: ${clamav_milter_socket="%%CLAMAV_MILTER_SOCKET%%"}
>+: ${clamav_milter_flags="--postmaster-only --local --outgoing --max-children=50"}
> 
>-# add socket to any given argument
>-clamav_milter_flags="${clamav_milter_flags} ${clamav_milter_socket}"
> run_rc_command "$1"
>Index: files/patch-configure
>===================================================================
>RCS file: /home/ncvs/ports/security/clamav/files/patch-configure,v
>retrieving revision 1.2
>diff -u -u -r1.2 patch-configure
>--- files/patch-configure	1 Apr 2004 16:36:29 -0000	1.2
>+++ files/patch-configure	29 Sep 2004 16:59:30 -0000
>@@ -1,15 +1,15 @@
>---- configure.orig	Mon Mar 15 21:04:49 2004
>-+++ configure	Thu Apr  1 14:56:36 2004
>-@@ -9329,7 +9329,7 @@
>+--- configure.orig	Wed Sep 29 18:58:49 2004
>++++ configure	Wed Sep 29 18:59:29 2004
>+@@ -11271,7 +11271,7 @@
>  
>  
>  
>--if test ! -r "$cfg_dir/clamav.conf"; then
>+-if test ! -r "$cfg_dir/clamd.conf"; then
> +if true; then
>-   INSTALL_CLAMAV_CONF_TRUE=
>-   INSTALL_CLAMAV_CONF_FALSE='#'
>+   INSTALL_CLAMD_CONF_TRUE=
>+   INSTALL_CLAMD_CONF_FALSE='#'
>  else
>-@@ -9339,7 +9339,7 @@
>+@@ -11281,7 +11281,7 @@
>  
>  
>  
>Index: files/patch-etc::Makefile.in
>===================================================================
>RCS file: /home/ncvs/ports/security/clamav/files/patch-etc::Makefile.in,v
>retrieving revision 1.2
>diff -u -u -r1.2 patch-etc::Makefile.in
>--- files/patch-etc::Makefile.in	4 Jun 2004 12:51:29 -0000	1.2
>+++ files/patch-etc::Makefile.in	29 Sep 2004 17:00:44 -0000
>@@ -1,12 +1,12 @@
>---- etc/Makefile.in.orig	Thu Feb 19 14:17:02 2004
>-+++ etc/Makefile.in	Thu Feb 19 14:17:36 2004
>-@@ -248,8 +248,8 @@
>+--- etc/Makefile.in.orig	Wed Sep 29 19:00:15 2004
>++++ etc/Makefile.in	Wed Sep 29 19:00:43 2004
>+@@ -339,8 +339,8 @@
>  
>  install:
>  	$(mkinstalldirs) $(DESTDIR)$(CFGINST)
>--@INSTALL_CLAMAV_CONF_TRUE@	@$(INSTALL_DATA) $(srcdir)/clamav.conf $(DESTDIR)$(CFGINST)
>+-@INSTALL_CLAMD_CONF_TRUE@	@$(INSTALL_DATA) $(srcdir)/clamd.conf $(DESTDIR)$(CFGINST)
> -@INSTALL_FRESHCLAM_CONF_TRUE@	@$(INSTALL_DATA) $(srcdir)/freshclam.conf $(DESTDIR)$(CFGINST)
>-+@INSTALL_CLAMAV_CONF_TRUE@	@$(INSTALL_DATA) $(srcdir)/clamav.conf $(DESTDIR)$(CFGINST)/clamav.conf.default
>++@INSTALL_CLAMD_CONF_TRUE@	@$(INSTALL_DATA) $(srcdir)/clamd.conf $(DESTDIR)$(CFGINST)/clamd.conf.default
> +@INSTALL_FRESHCLAM_CONF_TRUE@	@$(INSTALL_DATA) $(srcdir)/freshclam.conf $(DESTDIR)$(CFGINST)/freshclam.conf.default
>  # Tell versions [3.59,3.63) of GNU make to not export all variables.
>  # Otherwise a system limit (for SysV at least) may be exceeded.

Actions: View | Diff

Attachments on bug 72203: 47095