From d940e33cb81c1258399959979c2a93131aa4f964 Mon Sep 17 00:00:00 2001 From: Tom Wijsman Date: Sat, 12 Oct 2013 14:10:09 +0000 Subject: Fix linking with libclamav when cross compiling, patch by Bertrand Jacquin whom reported bug #472782. Package-Manager: portage-HEAD/cvs/Linux x86_64 Manifest-Sign-Key: 0x6D34E57D --- net-proxy/havp/ChangeLog | 7 ++- net-proxy/havp/Manifest | 29 ++++------ .../files/havp-0.92a-r1-pkg-config-libclamav.patch | 66 ++++++++++++++++++++++ net-proxy/havp/havp-0.92a-r1.ebuild | 4 +- 4 files changed, 87 insertions(+), 19 deletions(-) create mode 100644 net-proxy/havp/files/havp-0.92a-r1-pkg-config-libclamav.patch (limited to 'net-proxy') diff --git a/net-proxy/havp/ChangeLog b/net-proxy/havp/ChangeLog index a0835ea37b05..7c2162d4ed73 100644 --- a/net-proxy/havp/ChangeLog +++ b/net-proxy/havp/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-proxy/havp # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/havp/ChangeLog,v 1.43 2013/04/04 19:46:57 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-proxy/havp/ChangeLog,v 1.44 2013/10/12 14:10:05 tomwij Exp $ + + 12 Oct 2013; Tom Wijsman + +files/havp-0.92a-r1-pkg-config-libclamav.patch, havp-0.92a-r1.ebuild: + Fix linking with libclamav when cross compiling, patch by Bertrand Jacquin + whom reported bug #472782. 04 Apr 2013; Agostino Sarubbo havp-0.92a-r1.ebuild: Stable for x86, wrt bug #464474 diff --git a/net-proxy/havp/Manifest b/net-proxy/havp/Manifest index 1c3f08f6ddf0..a84076c18da9 100644 --- a/net-proxy/havp/Manifest +++ b/net-proxy/havp/Manifest @@ -1,27 +1,22 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 +Hash: SHA256 +AUX havp-0.92a-r1-pkg-config-libclamav.patch 1479 SHA256 2ce8013f62ee0c86724f5c6d72466dd7ba1ef17a1cd177c529cdb7a3266a37ee SHA512 b8466fb18e81a09da0a77a676526e13a65c55abe3aca465ebd058fb1ccbb94398e1b9d146b4c9049424e44ade073ea2b5af29234ccd15a153fe5cf3445aa14d4 WHIRLPOOL 143437ace33b0452126885d7b01fda451a7cdd185db6ce58ff4fe11b99a44789b9bddb7ff65c150924fa733bc76140e9c3364236005462c5e43bb36699e3ea26 AUX havp-0.92a-run.patch 1084 SHA256 b5cfb56dd3324b5a931cb22b9b108c3b094120c7ebecd801fd16a0e0bf6ed490 SHA512 e8e213b635984ef67a81917fc33eb086d31400b009e657da0dc96bc4fc46659dd41ede9a4a809d7221a949564e38fbb613e649b45fb9555bc4989548eac993e6 WHIRLPOOL a1d6bcca6562f71fc4518fabf115accf37645f8450f66455dbaf4edd5abe885c88f009dfaef5bbaeb93f51ce2591b9afe8de6aeb04d5ef740a7c5764283b89ff AUX havp.initd 1522 SHA256 ba97f868fa44fe3e7c9873906e6fb249797cc873e8a5a0d6fbbdabd8ff532ccc SHA512 38fc2c208880ffe481b9ca2d14a74294de77bbec37049645e2cf4542c6275773dabe4367a4f24c3786aa9c42ad4c693458cd5ed47ede3cc2d2a5966b3b0df954 WHIRLPOOL eaa4e960a44becfc37dffb49e743e1e8ac4afd8e79a1e7a1f04dd5ef503ebdfa9565a60375e824777c4c7b9445e44090cae33ecf01027c4d25ff59ec29fdfa82 DIST havp-0.92a.tar.gz 121987 SHA256 0dec86390b5738184aa7155af0c66dd00a97476fcd7377bcec8f1f0bf50f0e9a SHA512 3eb742519795a7d10520bdc1c78af0d3bf580a56e14f90bff9f519607a4e82cbf704372bd6da2fc05fcd436d580f4c226874d8df7770d22e2160b5d01afb9c62 WHIRLPOOL 9459d3bab10ed5a6b9053b72795f1e3729765665804fd01f5bae64170510a4427212357ff987cfbb4e93c9770702bb23d18d37dbfdfbc37958f16ff6890178f2 -EBUILD havp-0.92a-r1.ebuild 1847 SHA256 f7955aa553c2aff0102d519f42deb93f2927bd051944be6bb404ac58e188b8ca SHA512 b29a045fd4a9cd98737cb1f0c4604c5b74751e1d938b79debc480a86c81352d200bec737853fc077742e68a68d285677c37844bdb723e5db790e61abe6faeae8 WHIRLPOOL 5dfeffedfa190b1d5940278051a903921ab8619d6744a08ec53f890982406363f8f5ce394fe964bc1fdf3c6a77ff40cdc2813b9fcefaa4f26306054ff0de7cff +EBUILD havp-0.92a-r1.ebuild 1906 SHA256 785e1c45868bd61d78b672a335684e23dca269c573990d60dc85909e07cdad77 SHA512 512657d3eb2582f42fea068db0f41f9aae93844c6f97da84c11a314e7adc6b86ddba57bca4c054555b9ff5ed2063dde83741b0fe9d0d38c77829e8fcd82d8f69 WHIRLPOOL 090a2b9169f8211c3141149e5ca3e2a526a6c43d4fac1a2c36b9d8794a7c704e60625863c9bfdb620dccc3250f61674982a96e0eeeb62c6c04cbee98a2ac6a0d EBUILD havp-0.92a.ebuild 1717 SHA256 2db5040d3612626b6b1933bd7c991b8776dce8a15b3b314e8faa371a03fcf2d4 SHA512 69f81036195a6110924af20aaa5460cdcb4d2fbe4dfe0f4f5fac3d90d789d831fb1b22a88f46f1e6f8afe643f55ab9530b5545b97e6ee34551e2b4287b9732da WHIRLPOOL 90affb60a98244c9103ef461032d980fc7d4dd67b58bb55a9a250e9220491f970cb573e7c9c691bd20c014b1afda4cd0df1c6a2134c00fd82fb8d064709446a2 -MISC ChangeLog 6378 SHA256 eff8b4a0b5a81120333f3f2d8882829ec9968dd1a1e40529e40bbcb492ad9180 SHA512 62136464a762afc3987b8d057bde1e3cfd557499132af529624068789c6cc3e4798ed699bf49985f4d704ff5c2c71e50ec73fc8ae2b847155820e52e533e6d62 WHIRLPOOL e54322a11348f653379250004b81433aa0618c340954f1039b7b9869bf1e76f71f071b539094fee31a08cca3e4023744583d938e684615c2faaf10decfce4442 +MISC ChangeLog 6608 SHA256 a725d10c8cc9376dd3d54ee30bac4b8b5ac1467341061cb8d426f1e41675a51b SHA512 2425c294e5f9f2665613e7fe5c47fcce6ea7e18398fade1a58fc533807d5d58c602192b8f941fdd13f966738f5669785841d06431c91d74c2ebcaf8f68d285f2 WHIRLPOOL e44d6b1707dc4cf7c02aae3c3fcc6061675211099109044078069b02d94644f35493a83de83a163805b85852f94ba34f467633a01c36aa8526c429a8a190f4cc MISC metadata.xml 309 SHA256 26c5dece4fe203c9ae4847405314a340fb86058060c9536a92dd7471f4f03d0d SHA512 9e3b8d9d19b20e646025ff490179b60cae73364c5e1cb33c404d8d201f893c9969e4c9d10cf709c5d03b5ff8f916ddd16bebc41c9f58a13383c642c16c3c66c1 WHIRLPOOL 08358cbc5f3f0edfce777c71819e5631e4cf0162474f96da28883972c1c55ef41d8a737ca74b4b5b6574d8b33bf70fc43c3542a00cdd4a7a48c6fe19723428d0 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.19 (GNU/Linux) +Version: GnuPG v2.0.22 (GNU/Linux) -iQIcBAEBCgAGBQJRXdiyAAoJELp701BxlEWfJQ4P/2SjgOWc0Ar95bjioMf1pVAC -c5HL28YWHJCV2pc3a86WhStrQ8aIHxs5k4Kgh1xjMB3k65w/Z2LrzxBY2YBK07k7 -Qb9u2bS53AiF+/HLxYZ1wNlD5CYsHUtX3dFOKL04BYxA92ALWI98oKI8eWuS0C8i -xKu483wZ7YS6i45bmFOCrnPA7kKPqx7VgwJG12iaH4qrHE0kM/WfFIfN4fz4W+nm -WyLDzjDf28MIxB2UvK76/K+HMb5/285fOON/cnjKuwIpDu16AcbUi6q4voHfZiBu -WLcWWs1FmkKqLQ+Sfo0fMOC25JoBy9Boh/xrDKzattNggSHH+YNXxIS6CfSLQpg5 -2lfUXGtQZca673hNZBlh/abtl2T08gilOSJ8e/gG5sxTFH3tQjbbKxqQUMWwYX2a -+8lgI6tdpCdy85FTRkoVpcK9VhNq+Nl4v8jUCaNg6csmfzrpDbzKO4llts4lu3QP -SocyCNhZjeCRNyBvVvK0hKsFYNO4Mbx95sjMatm9HQMBrKomG6X9mhvahIb8NZyf -kBMTKUaIpltlx20F0Ed45yse6+JqyQxwmoj17047suirzpGaW6s5Q/WyBmqY6w01 -CdAXgu5vysViHMYrb6o7B66vGOwRH0II02rJ0Ap0ut7G0q/Grkmo6Mr49AAedS3k -v3qd6Z9SoBcU4ptknglU -=RSZm +iQEcBAEBCAAGBQJSWVbtAAoJEJWyH81tNOV9WPgH/0xrF+1ON+iggypgPzaAAdef +1iVYJFLcsTXIEOpjvyIT4nnV+nzznz7a/B+tjmnq5iEC36dfL4XoMIIFMhQNALm9 +alPjWWegC/iMeJKeFR7YrJ9gDNX5KhpNwR2v67+eaCVG4UtK7AyvmuYpUuiY6cbM +J/ckrQ06NC+CeVoDGsbbS7abLUID9mr96IXaFR4k1f1CyHtJt48qupH6KmbSquXj +v69YKoGyVWyQtnmXEHflK25rDnYU0AUltagtzXatw0wD37W4RVidrESDoH+UFsbN +pp+laWPxj2IqTkkXlG3aE4b1wKJzFYMYgV/HXXLAiZ3bbDGmP46BTEiDyyU3wS0= +=CXMi -----END PGP SIGNATURE----- diff --git a/net-proxy/havp/files/havp-0.92a-r1-pkg-config-libclamav.patch b/net-proxy/havp/files/havp-0.92a-r1-pkg-config-libclamav.patch new file mode 100644 index 000000000000..ea761f7e3476 --- /dev/null +++ b/net-proxy/havp/files/havp-0.92a-r1-pkg-config-libclamav.patch @@ -0,0 +1,66 @@ +--- a/configure.in ++++ b/configure.in +@@ -5,6 +5,7 @@ + unset CDPATH + + AC_PROG_CXX ++PKG_PROG_PKG_CONFIG + + AC_PREFIX_DEFAULT(/usr/local) + +@@ -83,48 +84,15 @@ + AC_DEFINE(SSLTUNNEL) + fi + +-AC_MSG_CHECKING(for ClamAV scanner library) +- + if test "$enable_clamav" = "yes" + then +- clamprefix="`clamav-config --prefix 2>/dev/null`" +- clamversion="`clamav-config --version 2>/dev/null`" +- +- if test "x$clamprefix" = "x" +- then +- AC_MSG_RESULT([clamav-config not found]) +- +- echo "" +- echo " Error finding ClamAV installation!" +- echo " Add ClamAV binaries path to PATH and run configure again." +- echo "" +- echo " To disable ClamAV library support, use --disable-clamav." +- echo "" +- +- exit 1 +- fi +- +- for cl in `clamav-config --cflags 2>/dev/null`; do +- if test "x`echo $cl | perl -ne 'print if (/^-I/)' 2>/dev/null`" != "x" +- then +- CFLAGS="$CFLAGS $cl" +- fi +- done +- +- for cl in `clamav-config --libs 2>/dev/null`; do +- if test "x`echo $cl | perl -ne 'print if (/(^-L|thread|c_r)/)' 2>/dev/null`" != "x" +- then +- LDFLAGS="$LDFLAGS $cl" +- fi +- done +- LDFLAGS="$LDFLAGS -lclamav" +- +- SCANNEROBJECTS="clamlibscanner.o" +- AC_DEFINE(USECLAMLIB) +- +- AC_MSG_RESULT([found $clamversion in $clamprefix]) +-else +- AC_MSG_RESULT([disabled :-(]) ++ PKG_CHECK_MODULES(clamav, libclamav, ++ [CFLAGS="$clamav_CFLAGS $CFLAGS" ++ LDFLAGS="$clamav_LIBS $LDFLAGS" ++ ++ SCANNEROBJECTS="clamlibscanner.o" ++ AC_DEFINE(USECLAMLIB) ++ ]) + fi + + AC_MSG_CHECKING(for Trend Micro scanner) diff --git a/net-proxy/havp/havp-0.92a-r1.ebuild b/net-proxy/havp/havp-0.92a-r1.ebuild index bba31ba66bec..d4a530d3d6d4 100644 --- a/net-proxy/havp/havp-0.92a-r1.ebuild +++ b/net-proxy/havp/havp-0.92a-r1.ebuild @@ -1,8 +1,9 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/havp/havp-0.92a-r1.ebuild,v 1.3 2013/04/04 19:46:57 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-proxy/havp/havp-0.92a-r1.ebuild,v 1.4 2013/10/12 14:10:05 tomwij Exp $ EAPI=4 + inherit autotools eutils toolchain-funcs user DESCRIPTION="HTTP AntiVirus Proxy" @@ -24,6 +25,7 @@ pkg_setup() { src_prepare() { epatch "${FILESDIR}"/${PN}-0.92a-run.patch + epatch "${FILESDIR}"/${PF}-pkg-config-libclamav.patch sed -i configure.in -e '/^CFLAGS=/d' || die eautoreconf } -- cgit v1.2.3-65-gdbad