ports/71168: Unbreak security/clamav-devel
Rob Evers
rob at debank.tv
Mon Aug 30 22:00:44 UTC 2004
>Number: 71168
>Category: ports
>Synopsis: Unbreak security/clamav-devel
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Mon Aug 30 22:00:43 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: Rob Evers
>Release: FreeBSD 5.2-CURRENT i386
>Organization:
>Environment:
System: FreeBSD flappie.debank.tv 5.2-CURRENT FreeBSD 5.2-CURRENT #1: Sun Feb 29 20:35:15 CET 2004 rob at flappie.debank.tv:/usr/obj/usr/src/sys/FLAPPIE i386
>Description:
Unbreak security/clamav-devel:
Fix explicit linking with -lc_r
Fix fetching
Update to 20040826 snapshot
Patch by Marcus Grando (marcus at corp.grupos.com.br)
Obsoletes ports/70135 and ports/68924
>How-To-Repeat:
>Fix:
--- clamav-devel.patch begins here ---
diff -ruN clamav-devel.orig/Makefile clamav-devel/Makefile
--- clamav-devel.orig/Makefile Mon Aug 30 20:23:03 2004
+++ clamav-devel/Makefile Mon Aug 30 20:26:51 2004
@@ -6,9 +6,9 @@
#
PORTNAME= clamav
-PORTVERSION= 20040701
+PORTVERSION= 20040826
CATEGORIES= security
-MASTER_SITES= http://clamav.sourceforge.net/snapshot/
+MASTER_SITES= http://www.clamav.net/snapshot/
PKGNAMESUFFIX= -devel
DISTNAME= ${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
@@ -29,7 +29,8 @@
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
USE_AUTOCONF_VER=259
-USE_LIBTOOL_VER=13
+USE_AUTOMAKE_VER=18
+USE_LIBTOOL_VER=15
INSTALLS_SHLIB= yes
USE_RC_SUBR= yes
diff -ruN clamav-devel.orig/distinfo clamav-devel/distinfo
--- clamav-devel.orig/distinfo Mon Aug 30 20:23:03 2004
+++ clamav-devel/distinfo Mon Aug 30 20:27:09 2004
@@ -1,2 +1,2 @@
-MD5 (clamav-devel-20040701.tar.gz) = ed79ebff018bbd9664e3de1e09946ac9
-SIZE (clamav-devel-20040701.tar.gz) = 1577535
+MD5 (clamav-devel-20040826.tar.gz) = c739f4d138863a27ce57976e6bb67deb
+SIZE (clamav-devel-20040826.tar.gz) = 1660493
diff -ruN clamav-devel.orig/files/patch-configure.in clamav-devel/files/patch-configure.in
--- clamav-devel.orig/files/patch-configure.in Mon Aug 30 20:23:03 2004
+++ clamav-devel/files/patch-configure.in Mon Aug 30 23:07:51 2004
@@ -1,61 +1,67 @@
---- 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
+--- configure.in.orig Wed Jul 28 21:50:07 2004
++++ configure.in Wed Aug 11 19:03:36 2004
+@@ -247,10 +247,37 @@
+ ;;
+ freebsd*)
+ if test "$have_pthreads" = "yes"; then
+- LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -pthread -lc_r"
+- CLAMD_LIBS="$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])
+ if test "$want_clamuko" = "yes"; then
+@@ -476,6 +503,8 @@
+
+ dnl Check for gethostbyname_r and number of its arguments
+ dnl Code from libwww/configure.in
++AC_CHECK_FUNC(gethostbyname_r)
++if test $ac_cv_func_gethostbyname_r = 'yes'; then
+ AC_MSG_CHECKING(for gethostbyname_r)
+ if test -z "$ac_cv_gethostbyname_args"; then
+ AC_TRY_COMPILE(
+@@ -531,6 +560,13 @@
+ AC_DEFINE(HAVE_GETHOSTBYNAME_R_6,1,[gethostbyname_r takes 6 arguments])
+ fi
+ AC_MSG_RESULT([yes, and it takes $ac_cv_gethostbyname_args arguments])
++fi
++else
++dnl Check for gethostbyname()
++AC_CHECK_FUNC(gethostbyname)
++if test $ac_cv_func_gethostbyname = 'no'; then
++ AC_MSG_ERROR(***** fail on check gethostbyname())
++fi
+ fi
+
+ dnl Check for clamav in /etc/passwd
--- clamav-devel.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list