Attachment 39794 Details for Bug 62653 – clamav-devel.patch

[patch] clamav-devel.patch

clamav-devel.patch (text/plain), 5.65 KB, created by rob on 2004-02-10 17:50:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: rob

Created: 2004-02-10 17:50:18 UTC

Size: 5.65 KB

patch

obsolete

>diff -ruN clamav-devel.orig/Makefile clamav-devel/Makefile
>--- clamav-devel.orig/Makefile	Mon Feb  9 14:04:16 2004
>+++ clamav-devel/Makefile	Tue Feb 10 18:05:12 2004
>@@ -6,8 +6,7 @@
> #
> 
> PORTNAME=	clamav
>-PORTVERSION=	20040129
>-PORTREVISION=	1
>+PORTVERSION=	20040210
> CATEGORIES=	security
> MASTER_SITES=	http://clamav.sourceforge.net/snapshot/
> PKGNAMESUFFIX=	-devel
>@@ -24,7 +23,7 @@
> 		arc:${PORTSDIR}/archivers/arc \
> 		unzip:${PORTSDIR}/archivers/unzip
> 
>-#OPTIONS=	MILTER "Compile the milter interface" off
>+OPTIONS=	MILTER "Compile the milter interface" off
> USE_REINPLACE=	yes
> USE_GMAKE=	yes
> GNU_CONFIGURE=	yes
>@@ -100,12 +99,6 @@
> 		-e 's|<malloc.h>|<stdlib.h>|' \
> 		${WRKSRC}/clamav-milter/clamav-milter.c
> 
>-pre-configure:
>-	@${REINPLACE_CMD} -e 's|clamav.conf|&.default|' \
>-		-e 's|freshclam.conf|&.default|' \
>-		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} \
>-		${CONFIGURE_WRKSRC}/etc/Makefile.in
>-
> post-build:
> 	@${SED} ${SED_CONF} ${BUILD_WRKSRC}/etc/clamav.conf \
> 		> ${BUILD_WRKSRC}/etc/clamav.conf.default
>@@ -129,14 +122,19 @@
> 	@[ -f ${PREFIX}/etc/clamav.conf ] || \
> 		${CP} ${BUILD_WRKSRC}/etc/clamav.conf.default \
> 			${PREFIX}/etc/clamav.conf
>+	@[ -f ${PREFIX}/etc/clamav.conf.default ] || \
>+		${CP} ${BUILD_WRKSRC}/etc/clamav.conf.default \
>+			${PREFIX}/etc/clamav.conf.default
> 	@[ -f ${PREFIX}/etc/freshclam.conf ] || \
> 		${CP} ${BUILD_WRKSRC}/etc/freshclam.conf.default \
> 			${PREFIX}/etc/freshclam.conf
>+	@[ -f ${PREFIX}/etc/freshclam.conf.default ] || \
>+		${CP} ${BUILD_WRKSRC}/etc/freshclam.conf.default \
>+			${PREFIX}/etc/freshclam.conf.default
> 	@${CHOWN} -R ${CLAMAVUSER}:${CLAMAVGROUP} ${DATADIR}
> 	@${INSTALL_SCRIPT} ${WRKDIR}/clamav-clamd.sh \
> 		${RC_DIR}/clamav-clamd${RC_SUFX}
> 	@${INSTALL_SCRIPT} ${WRKDIR}/freshclam.sh ${RC_DIR}/freshclam${RC_SUFX}
>-	@${SH} ${PKGINSTALL} ${PREFIX} POST-INSTALL
> .if defined(WITH_MILTER)
> 	@${INSTALL_SCRIPT} ${WRKDIR}/clamav-milter.sh \
> 		${RC_DIR}/clamav-milter${RC_SUFX}
>diff -ruN clamav-devel.orig/distinfo clamav-devel/distinfo
>--- clamav-devel.orig/distinfo	Mon Feb  9 14:04:16 2004
>+++ clamav-devel/distinfo	Tue Feb 10 17:17:34 2004
>@@ -1 +1,2 @@
>-MD5 (clamav-devel-20040129.tar.gz) = 8c0a73c2b832195b83edc163079285a4
>+MD5 (clamav-devel-20040210.tar.gz) = 07d8e5f2c57ab6a0e2e35deb81b5f357
>+SIZE (clamav-devel-20040210.tar.gz) = 1182377
>diff -ruN clamav-devel.orig/files/patch-configure clamav-devel/files/patch-configure
>--- clamav-devel.orig/files/patch-configure	Thu Jan  1 01:00:00 1970
>+++ clamav-devel/files/patch-configure	Tue Feb 10 17:44:46 2004
>@@ -0,0 +1,26 @@
>+--- configure.bak	Fri Feb  6 14:46:08 2004
>++++ configure	Tue Feb 10 17:44:13 2004
>+@@ -9316,23 +9316,12 @@
>+ 
>+ 
>+ 
>+-if test ! -r "$cfg_dir/clamav.conf"; then
>+-  INSTALL_CLAMAV_CONF_TRUE=
>+-  INSTALL_CLAMAV_CONF_FALSE='#'
>+-else
>+   INSTALL_CLAMAV_CONF_TRUE='#'
>+   INSTALL_CLAMAV_CONF_FALSE=
>+-fi
>+ 
>+ 
>+-
>+-if test ! -r "$cfg_dir/freshclam.conf"; then
>+-  INSTALL_FRESHCLAM_CONF_TRUE=
>+-  INSTALL_FRESHCLAM_CONF_FALSE='#'
>+-else
>+   INSTALL_FRESHCLAM_CONF_TRUE='#'
>+   INSTALL_FRESHCLAM_CONF_FALSE=
>+-fi
>+ 
>+ 
>+ if test "$test_urandom" = "yes"
>diff -ruN clamav-devel.orig/files/patch-database_Makefile.in clamav-devel/files/patch-database_Makefile.in
>--- clamav-devel.orig/files/patch-database_Makefile.in	Thu Jan  1 01:00:00 1970
>+++ clamav-devel/files/patch-database_Makefile.in	Tue Feb 10 17:20:21 2004
>@@ -0,0 +1,15 @@
>+--- database/Makefile.in.orig	Tue Feb 10 17:19:06 2004
>++++ database/Makefile.in	Tue Feb 10 17:19:38 2004
>+@@ -248,9 +248,9 @@
>+ 
>+ install:
>+ 	$(mkinstalldirs) $(DESTDIR)$(DBINST)
>+-	test -f $(DESTDIR)$(DBINST)/main.cvd || @$(INSTALL_DATA) main.cvd $(DESTDIR)$(DBINST)
>+-	test -f $(DESTDIR)$(DBINST)/daily.cvd || @$(INSTALL_DATA) daily.cvd $(DESTDIR)$(DBINST)
>+-	test -f $(DESTDIR)$(DBINST)/mirrors.txt || @$(INSTALL_DATA) mirrors.txt $(DESTDIR)$(DBINST)
>++	test -f $(DESTDIR)$(DBINST)/main.cvd || $(INSTALL_DATA) main.cvd $(DESTDIR)$(DBINST)
>++	test -f $(DESTDIR)$(DBINST)/daily.cvd || $(INSTALL_DATA) daily.cvd $(DESTDIR)$(DBINST)
>++	test -f $(DESTDIR)$(DBINST)/mirrors.txt || $(INSTALL_DATA) mirrors.txt $(DESTDIR)$(DBINST)
>+ 	test -f $(DESTDIR)$(DBINST)/viruses.db && rm -f $(DESTDIR)$(DBINST)/viruses.db || true
>+ 	test -f $(DESTDIR)$(DBINST)/viruses.db2 && rm -f $(DESTDIR)$(DBINST)/viruses.db2 || true
>+ 	@if test `id -u` -eq 0 && test -n "${CLAMAVUSER}" && test -n "${CLAMAVGROUP}"; then \
>diff -ruN clamav-devel.orig/pkg-deinstall clamav-devel/pkg-deinstall
>--- clamav-devel.orig/pkg-deinstall	Mon Feb  9 14:04:16 2004
>+++ clamav-devel/pkg-deinstall	Tue Feb 10 17:52:42 2004
>@@ -3,5 +3,5 @@
> fi
> echo "----------------------------------------------------------"
> echo "  If you really want to remove this package, please remove"
>-echo " the clamav-user and clean out log files "
>+echo " the clamav-user and clean out log files and database"
> echo "----------------------------------------------------------"
>diff -ruN clamav-devel.orig/pkg-install clamav-devel/pkg-install
>--- clamav-devel.orig/pkg-install	Mon Feb  9 14:04:16 2004
>+++ clamav-devel/pkg-install	Tue Feb 10 17:53:38 2004
>@@ -43,9 +43,4 @@
> chown "${CLAMAVUSER}:${CLAMAVGROUP}" "${CLAMLOG}"
> fi
> 
>-if [ "$2" = "POST-INSTALL" ]; then
>-	echo "===> Updating virus definitions..."
>-	freshclam
>-fi
>-
> exit 0
>diff -ruN clamav-devel.orig/pkg-plist clamav-devel/pkg-plist
>--- clamav-devel.orig/pkg-plist	Mon Feb  9 14:04:16 2004
>+++ clamav-devel/pkg-plist	Tue Feb 10 17:54:36 2004
>@@ -23,10 +23,7 @@
> @owner %%CLAMAVUSER%%
> @group %%CLAMAVGROUP%%
> %%DATADIR%%/mirrors.txt
>-%%DATADIR%%/main.cvd
>-%%DATADIR%%/daily.cvd
> @exec chown %%CLAMAVUSER%%:%%CLAMAVGROUP%% %B
>-@dirrm %%DATADIR%%
> @unexec rmdir /var/run/clamav 2>/dev/null || true
> @unexec rmdir /var/log/clamav 2>/dev/null || true
> %%PORTDOCS%%@dirrm %%DOCSDIR%%-devel

Actions: View | Diff

Attachments on bug 62653: 39794