Date: Wed, 11 Aug 2004 22:30:25 GMT From: Marcus Grando <marcus@corp.grupos.com.br> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/70135: [patch] Update securiy/clamav-devel to 20040807 Message-ID: <200408112230.i7BMUP51084210@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/70135; it has been noted by GNATS. From: Marcus Grando <marcus@corp.grupos.com.br> To: Volker Stolz <vs@freebsd.org> Cc: freebsd-gnats-submit@freebsd.org, rob@debank.tv Subject: Re: ports/70135: [patch] Update securiy/clamav-devel to 20040807 Date: Wed, 11 Aug 2004 19:21:40 -0300 This patch correct this issues. Old "patch-configure.in" don't work. The check freebsd version is based on this patch: http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/68924 Regards ----------- diff -ruN clamav-devel.old/Makefile clamav-devel/Makefile --- clamav-devel.old/Makefile Sun Jul 4 08:02:30 2004 +++ clamav-devel/Makefile Wed Aug 11 18:32:33 2004 @@ -6,7 +6,7 @@ # PORTNAME= clamav -PORTVERSION= 20040701 +PORTVERSION= 20040809 CATEGORIES= security MASTER_SITES= http://clamav.sourceforge.net/snapshot/ PKGNAMESUFFIX= -devel @@ -29,7 +29,7 @@ GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} USE_AUTOCONF_VER=259 -USE_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 INSTALLS_SHLIB= yes USE_RC_SUBR= yes diff -ruN clamav-devel.old/distinfo clamav-devel/distinfo --- clamav-devel.old/distinfo Sun Jul 4 08:02:30 2004 +++ clamav-devel/distinfo Wed Aug 11 16:56:11 2004 @@ -1,2 +1,2 @@ -MD5 (clamav-devel-20040701.tar.gz) = ed79ebff018bbd9664e3de1e09946ac9 -SIZE (clamav-devel-20040701.tar.gz) = 1577535 +MD5 (clamav-devel-20040809.tar.gz) = f20433d18c9ded8d5feb8f9fe090af80 +SIZE (clamav-devel-20040809.tar.gz) = 1645837 diff -ruN clamav-devel.old/files/patch-configure.in clamav-devel/files/patch-configure.in --- clamav-devel.old/files/patch-configure.in Mon Mar 1 07:35:30 2004 +++ clamav-devel/files/patch-configure.in Wed Aug 11 19:04:30 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 -------------- Volker Stolz wrote: > Explicitely links with -lc_r: doesn't build on 4.10: > > cc -DSENDMAIL_BIN=\"/usr/sbin/sendmail\" -O -pipe -g > -I/usr/local/include -o .libs/clamav-milter cfgparser.o getopt.o > memory.o clamav-milter.o -L/usr/local/lib > ../libclamav/.libs/libclamav.so -lcipher -lz -lbz2 -lgmp -lmilter -lc_r > -lwrap -Wl,--rpath -Wl,/usr/local/lib > /usr/lib/libc.so: warning: this program uses gets(), which is unsafe. > /usr/lib/libc.so: warning: mktemp() possibly used unsafely; consider > using mkstemp() > /usr/lib/libc.so: warning: tmpnam() possibly used unsafely; consider > using mkstemp() > /usr/lib/libc.so: warning: this program uses f_prealloc(), which is not > recommended. > /usr/lib/libc.so: warning: tempnam() possibly used unsafely; consider > using mkstemp() > clamav-milter.o: In function `clamfi_gethostbyname': > /usr/ports/security/clamav-devel/work/clamav-devel-20040807/clamav-milter/clamav-milter.c:3251: > undefined reference to `gethostbyname_r' > > You must use PTHREAD_CFLAGS/LIBS unstead of -lc_r. But what's worse, > 4.X doesn't have > gethostbyname_r() at all! > > Volker > -- Marcus Grando Grupos Internet S/A marcus(at)corp.grupos.com.br
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200408112230.i7BMUP51084210>