aboutsummaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authormbr <mbr@FreeBSD.org>2004-03-01 18:35:30 +0800
committermbr <mbr@FreeBSD.org>2004-03-01 18:35:30 +0800
commit628b50b3d3f16b50c36f93ecb8594a2c7c555266 (patch)
treed0b5fbdab57cefebf7ac8e9582b1802ce75f89f9 /security
parent225e6b81ce3c8cbd2d1024ffb5538c332048488a (diff)
downloadfreebsd-ports-gnome-628b50b3d3f16b50c36f93ecb8594a2c7c555266.tar.gz
freebsd-ports-gnome-628b50b3d3f16b50c36f93ecb8594a2c7c555266.tar.zst
freebsd-ports-gnome-628b50b3d3f16b50c36f93ecb8594a2c7c555266.zip
Upgrade to 20040229 snapshot.
Submitted by: Rob Evers <rob@debank.tv> (maintainer)
Diffstat (limited to 'security')
-rw-r--r--security/clamav-devel/Makefile16
-rw-r--r--security/clamav-devel/distinfo4
-rw-r--r--security/clamav-devel/files/patch-configure26
-rw-r--r--security/clamav-devel/files/patch-configure.in61
-rw-r--r--security/clamav-devel/files/patch-database_Makefile.in15
-rw-r--r--security/clamav-devel/pkg-plist1
6 files changed, 71 insertions, 52 deletions
diff --git a/security/clamav-devel/Makefile b/security/clamav-devel/Makefile
index ad7fdabc5736..856e475448af 100644
--- a/security/clamav-devel/Makefile
+++ b/security/clamav-devel/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= clamav
-PORTVERSION= 20040210
-PORTREVISION= 1
+PORTVERSION= 20040229
CATEGORIES= security
MASTER_SITES= http://clamav.sourceforge.net/snapshot/
PKGNAMESUFFIX= -devel
@@ -29,13 +28,15 @@ USE_REINPLACE= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+USE_AUTOCONF= yes
+WANT_AUTOCONF_VER=257
USE_LIBTOOL= yes
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --with-dbdir=${DATADIR} \
--disable-clamav --enable-bigstack
CFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
MAN1= clamscan.1 freshclam.1 sigtool.1 clamdscan.1
@@ -90,6 +91,10 @@ LDFLAGS+= -lcipher
.endif
.if defined(WITH_MILTER)
+.if exists(${LOCALBASE}/lib/libmilter.a)
+CPPFLAGS+= -I${LOCALBASE}/include
+CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
+.endif
CONFIGURE_ARGS+= --enable-milter
PLIST_SUB+= CLAMAV-MILTER:=""
.else
@@ -97,11 +102,6 @@ PLIST_SUB+= CLAMAV-MILTER:="@comment "
.endif
post-patch:
-.if ${OSVERSION} >= 502102
- @${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
-.else
- @${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
-.endif
@${REINPLACE_CMD} -e 's|/usr/lib/sendmail|/usr/sbin/sendmail|g' \
-e 's|<malloc.h>|<stdlib.h>|' \
${WRKSRC}/clamav-milter/clamav-milter.c
diff --git a/security/clamav-devel/distinfo b/security/clamav-devel/distinfo
index 447b79b3969f..394a5728d18b 100644
--- a/security/clamav-devel/distinfo
+++ b/security/clamav-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (clamav-devel-20040210.tar.gz) = 07d8e5f2c57ab6a0e2e35deb81b5f357
-SIZE (clamav-devel-20040210.tar.gz) = 1182377
+MD5 (clamav-devel-20040229.tar.gz) = 296d8ba38815a09ff14decf3840d3be5
+SIZE (clamav-devel-20040229.tar.gz) = 1210185
diff --git a/security/clamav-devel/files/patch-configure b/security/clamav-devel/files/patch-configure
deleted file mode 100644
index c2d83239eecd..000000000000
--- a/security/clamav-devel/files/patch-configure
+++ /dev/null
@@ -1,26 +0,0 @@
---- 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 --git a/security/clamav-devel/files/patch-configure.in b/security/clamav-devel/files/patch-configure.in
new file mode 100644
index 000000000000..5604d944491b
--- /dev/null
+++ b/security/clamav-devel/files/patch-configure.in
@@ -0,0 +1,61 @@
+--- clamav-devel.orig/files/patch-configure.in Thu Jan 1 01:00:00 1970
++++ clamav-devel/files/patch-configure.in Sun Feb 29 20:35:49 2004
+@@ -0,0 +1,58 @@
++--- configure.in.orig Mon Feb 23 18:24:52 2004
+++++ configure.in Wed Feb 25 17:39:15 2004
++@@ -199,9 +199,9 @@
++ AC_SUBST(CFGDIR)
++ AC_DEFINE_UNQUOTED(CONFDIR,"$cfg_dir",[where to look for the config file])
++
++-dnl Do not overwrite the current config file
++-AM_CONDITIONAL(INSTALL_CLAMAV_CONF, test ! -r "$cfg_dir/clamav.conf")
++-AM_CONDITIONAL(INSTALL_FRESHCLAM_CONF, test ! -r "$cfg_dir/freshclam.conf")
+++dnl Do not install config files
+++AM_CONDITIONAL(INSTALL_CLAMAV_CONF, test 0 = 1 )
+++AM_CONDITIONAL(INSTALL_FRESHCLAM_CONF, test 0 = 1 )
++
++ if test "$test_urandom" = "yes"
++ then
++@@ -294,10 +294,38 @@
++ ;;
++ freebsd*)
++ if test "$have_pthreads" = "yes"; then
++- LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -pthread -lc_r"
++- CLAMD_LIBS="-pthread -lc_r"
++- CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -pthread -lc_r"
++- TH_SAFE="-thread-safe"
+++ if test -n "$with_os_version"; then
+++ OSVERSION="$with_os_version"
+++ else
+++ OSVERSION=`/sbin/sysctl -n kern.osreldate`
+++ fi
+++ if test -z "$PTHREAD_CFLAGS"; then
+++ if test "$OSVERSION" -lt "502102"; then
+++ PTHREAD_CFLAGS="-D_THREAD_SAFE"
+++ else
+++ unset PTHREAD_CFLAGS
+++ fi
+++ fi
+++ if test -z "$PTHREAD_LIBS"; then
+++ if test "$OSVERSION" -lt "502102"; then
+++ PTHREAD_LIBS="-lc_r"
+++ fi
+++ if test "$OSVERSION" -lt "500016"; then
+++ PTHREAD_LIBS="-pthread"
+++ fi
+++ if test "$OSVERSION" -ge "502102"; then
+++ PTHREAD_LIBS="-lpthread"
+++ fi
+++ fi
+++
+++ if test "$OSVERSION" -lt "500016"; then
+++ PTHREAD_LIBS="$PTHREAD_LIBS -lc_r"
+++ fi
+++
+++ LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS $PTHREAD_LIBS"
+++ CLAMD_LIBS="$PTHREAD_LIBS"
+++ CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS $PTHREAD_LIBS"
+++ TH_SAFE="-thread-safe $PTHREAD_CFLAGS"
++ AC_DEFINE(CL_THREAD_SAFE,1,[thread safe])
++ AC_DEFINE(_REENTRANT,1,[thread safe])
++ fi
diff --git a/security/clamav-devel/files/patch-database_Makefile.in b/security/clamav-devel/files/patch-database_Makefile.in
deleted file mode 100644
index ff745761e284..000000000000
--- a/security/clamav-devel/files/patch-database_Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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 --git a/security/clamav-devel/pkg-plist b/security/clamav-devel/pkg-plist
index 6db1d4fdfe32..6913f9152a7a 100644
--- a/security/clamav-devel/pkg-plist
+++ b/security/clamav-devel/pkg-plist
@@ -22,7 +22,6 @@ etc/freshclam.conf.default
@exec [ -f %B/freshclam.conf ] || cp %B/%f %B/freshclam.conf
@owner %%CLAMAVUSER%%
@group %%CLAMAVGROUP%%
-%%DATADIR%%/mirrors.txt
@exec chown %%CLAMAVUSER%%:%%CLAMAVGROUP%% %B
@unexec [ -s %D/%%DATADIR%%/main.cvd ] || rm -f %D/%%DATADIR%%/main.cvd
@unexec [ -s %D/%%DATADIR%%/daily.cvd ] || rm -f %D/%%DATADIR%%/daily.cvd