From 6523fcc26279bcc3d398c7bef68a4a968c874d6e Mon Sep 17 00:00:00 2001 From: adam Date: Tue, 3 Sep 2013 13:38:08 +0000 Subject: Changes 0.2.4: Bug fix: The URL in connect requests is not retrieved correctly inside url_check service --- www/c-icap-modules/Makefile | 4 ++-- www/c-icap-modules/distinfo | 12 ++++++------ www/c-icap-modules/patches/patch-configure | 19 ++++++++++--------- .../patches/patch-services_url_check_Makefile.in | 21 +-------------------- 4 files changed, 19 insertions(+), 37 deletions(-) (limited to 'www/c-icap-modules') diff --git a/www/c-icap-modules/Makefile b/www/c-icap-modules/Makefile index 866a68884df..c1f93af63cf 100644 --- a/www/c-icap-modules/Makefile +++ b/www/c-icap-modules/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.4 2012/10/28 06:30:11 asau Exp $ +# $NetBSD: Makefile,v 1.5 2013/09/03 13:38:08 adam Exp $ -DISTNAME= c_icap_modules-0.2.1 +DISTNAME= c_icap_modules-0.2.4 PKGNAME= ${DISTNAME:S/_/-/g} CATEGORIES= www MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=c-icap/} diff --git a/www/c-icap-modules/distinfo b/www/c-icap-modules/distinfo index 42fea39fa46..7b66997c244 100644 --- a/www/c-icap-modules/distinfo +++ b/www/c-icap-modules/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.3 2012/07/29 10:11:18 adam Exp $ +$NetBSD: distinfo,v 1.4 2013/09/03 13:38:08 adam Exp $ -SHA1 (c_icap_modules-0.2.1.tar.gz) = a8a6b4efabfc11b8eff955bbdf8c67b6fadff649 -RMD160 (c_icap_modules-0.2.1.tar.gz) = c735e9a27f540f9d03d11f4d7cb4be502dcf6250 -Size (c_icap_modules-0.2.1.tar.gz) = 348245 bytes -SHA1 (patch-configure) = a666aa9b4b6b62c48899c0b5a659ef1cfc7d0d6a -SHA1 (patch-services_url_check_Makefile.in) = 600105b3cce752ebc3d21b66638e454d98ac2d45 +SHA1 (c_icap_modules-0.2.4.tar.gz) = d563cdec9138366a2c044f2b452b3aa046fcaa5f +RMD160 (c_icap_modules-0.2.4.tar.gz) = 920cdf846dbb998a3da69d0e8a4c967276f7094b +Size (c_icap_modules-0.2.4.tar.gz) = 373120 bytes +SHA1 (patch-configure) = f38098a56ae58ae89a5850dad176b539cf034836 +SHA1 (patch-services_url_check_Makefile.in) = 23a0660bf8060ade81f4d9654220a4ae0795811e SHA1 (patch-services_virus_scan_Makefile.in) = 8a1ce7d863757f8851a06d621a1163d7a605b893 diff --git a/www/c-icap-modules/patches/patch-configure b/www/c-icap-modules/patches/patch-configure index 55d52bbaf67..3c7b7812bae 100644 --- a/www/c-icap-modules/patches/patch-configure +++ b/www/c-icap-modules/patches/patch-configure @@ -1,29 +1,30 @@ -$NetBSD: patch-configure,v 1.2 2012/07/29 10:11:18 adam Exp $ +$NetBSD: patch-configure,v 1.3 2013/09/03 13:38:08 adam Exp $ Detect Berkeley DB. ---- configure.orig 2011-05-05 13:16:38.000000000 +0000 +--- configure.orig 2012-12-30 18:10:40.000000000 +0000 +++ configure -@@ -11318,11 +11318,11 @@ rm -f core conftest.err conftest.$ac_obj - # Save old CFLAGS/LDFLAGS +@@ -12169,12 +12169,11 @@ rm -f core conftest.err conftest.$ac_obj OLDCFLAGS=$CFLAGS OLDLDFLAGS=$LDFLAGS -- for DBVER in 49 48 47 46 45 44 43 42; do + OLDLIBS=$LIBS +- LIBS="-ldb $OLDLIBS" +- for DBVER in 54 53 52 51 50 49 48 47 46 45 44 43 42; do + for DBVER in 4 5 6; do if test -d $libdbpath/include/db$DBVER; then echo -n "checking for Berleley DB under $libdbpath/include/db$DBVER and $libdbpath/lib/db$DBVER... " CFLAGS="-I$libdbpath/include/db$DBVER $OLDCFLAGS" -- LDFLAGS="-L$libdbpath/lib/db$DBVER -ldb $OLDLDFLAGS" +- LDFLAGS="-L$libdbpath/lib/db$DBVER $OLDLDFLAGS" + LDFLAGS="-L$libdbpath/lib -ldb$DBVER $OLDLDFLAGS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -@@ -11336,7 +11336,7 @@ rm -f core conftest.err conftest.$ac_obj +@@ -12188,7 +12187,7 @@ rm -f core conftest.err conftest.$ac_obj _ACEOF if ac_fn_c_try_link "$LINENO"; then : -- echo yes;BDB_ADD_LDFLAG="-L$libdbpath/lib/db$DBVER -ldb"; BDB_ADD_FLAG="-I$libdbpath/include/db$DBVER";libdb="yes"; -+ echo yes;BDB_ADD_LDFLAG="-L$libdbpath/lib -ldb$DBVER"; BDB_ADD_FLAG="-I$libdbpath/include/db$DBVER";libdb="yes"; +- echo yes;BDB_ADD_LDADD="-L$libdbpath/lib/db$DBVER -ldb"; BDB_ADD_FLAG="-I$libdbpath/include/db$DBVER";libdb="yes"; ++ echo yes;BDB_ADD_LDADD="-L$libdbpath/lib -ldb$DBVER"; BDB_ADD_FLAG="-I$libdbpath/include/db$DBVER";libdb="yes"; else libdb="no"; echo "no"; diff --git a/www/c-icap-modules/patches/patch-services_url_check_Makefile.in b/www/c-icap-modules/patches/patch-services_url_check_Makefile.in index 208b3fa057a..f3d40b80b39 100644 --- a/www/c-icap-modules/patches/patch-services_url_check_Makefile.in +++ b/www/c-icap-modules/patches/patch-services_url_check_Makefile.in @@ -1,28 +1,9 @@ -$NetBSD: patch-services_url_check_Makefile.in,v 1.2 2012/07/29 10:11:18 adam Exp $ +$NetBSD: patch-services_url_check_Makefile.in,v 1.3 2013/09/03 13:38:08 adam Exp $ -Remove unwanted linker flag Handle configuration files --- services/url_check/Makefile.in.orig 2011-05-05 13:19:55.000000000 +0000 +++ services/url_check/Makefile.in -@@ -35,7 +35,7 @@ PRE_UNINSTALL = : - POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ --@USEBDB_TRUE@am__append_1 = @BDB_ADD_LDFLAG@ -ldb -+@USEBDB_TRUE@am__append_1 = @BDB_ADD_LDFLAG@ - @USEBDB_TRUE@am__append_2 = @BDB_ADD_FLAG@ - @USEBDB_TRUE@am__append_3 = sguardDB.c - @USEBDB_TRUE@bin_PROGRAMS = c-icap-mods-sguardDB$(EXEEXT) -@@ -263,7 +263,7 @@ SUFFIXES = .8.in .8 - man_MANS = $(manpages) - TMPLS = templates/en/DENY - @USEBDB_TRUE@c_icap_mods_sguardDB_SOURCES = sguardDB.c --@USEBDB_TRUE@c_icap_mods_sguardDB_LDADD = @UTILITIES_LIBADD@ @BDB_ADD_LDFLAG@ -ldb -+@USEBDB_TRUE@c_icap_mods_sguardDB_LDADD = @UTILITIES_LIBADD@ @BDB_ADD_LDFLAG@ - @USEBDB_TRUE@c_icap_mods_sguardDB_CFLAGS = @BDB_ADD_FLAG@ -DBUILD_SGUARD_TOOL - EXTRA_DIST = sguardDB.h url_check_body.h makefile.w32 srv_url_check.def srv_url_check.conf $(TMPLS) $(manpages_src) - all: all-am @@ -720,8 +720,7 @@ uninstall-man: uninstall-man8 $(do_subst) < $< > $@ -- cgit v1.2.3