diff options
author | Alin Năstac <mrness@gentoo.org> | 2009-04-25 11:42:36 +0000 |
---|---|---|
committer | Alin Năstac <mrness@gentoo.org> | 2009-04-25 11:42:36 +0000 |
commit | 2a7e04bdfa45ed72dededc899c7fe098301e3d8f (patch) | |
tree | 35897ce57a4292a51bf8d45596d4b96ac5e66440 /net-proxy | |
parent | Bump to newer beta release, this also fixes the gconf-check, see bug (diff) | |
download | historical-2a7e04bdfa45ed72dededc899c7fe098301e3d8f.tar.gz historical-2a7e04bdfa45ed72dededc899c7fe098301e3d8f.tar.bz2 historical-2a7e04bdfa45ed72dededc899c7fe098301e3d8f.zip |
Fix assertion failure (#267109). Fix gcc-4.3 and cross compilation issues (#266581).
Package-Manager: portage-2.1.6.7/cvs/Linux x86_64
Diffstat (limited to 'net-proxy')
-rw-r--r-- | net-proxy/squid/ChangeLog | 11 | ||||
-rw-r--r-- | net-proxy/squid/Manifest | 13 | ||||
-rw-r--r-- | net-proxy/squid/files/squid-3.0.14-cross-compile.patch | 38 | ||||
-rw-r--r-- | net-proxy/squid/files/squid-3.0.14-gcc43.patch | 39 | ||||
-rw-r--r-- | net-proxy/squid/files/squid-3.0.14-max-forwards.patch | 12 | ||||
-rw-r--r-- | net-proxy/squid/squid-3.0.14-r1.ebuild (renamed from net-proxy/squid/squid-2.7.6.ebuild) | 67 |
6 files changed, 142 insertions, 38 deletions
diff --git a/net-proxy/squid/ChangeLog b/net-proxy/squid/ChangeLog index 0ebdc4ba69f1..51547d307b25 100644 --- a/net-proxy/squid/ChangeLog +++ b/net-proxy/squid/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for net-proxy/squid # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.241 2009/04/22 20:19:01 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.242 2009/04/25 11:42:35 mrness Exp $ + +*squid-3.0.14-r1 (25 Apr 2009) + + 25 Apr 2009; Alin Năstac <mrness@gentoo.org> + +files/squid-3.0.14-cross-compile.patch, +files/squid-3.0.14-gcc43.patch, + +files/squid-3.0.14-max-forwards.patch, -squid-2.7.6.ebuild, + +squid-3.0.14-r1.ebuild: + Fix assertion failure (#267109). Fix gcc-4.3 and cross compilation issues + (#266581). 22 Apr 2009; Markus Meier <maekke@gentoo.org> squid-2.7.6-r1: amd64 stable, bug #263777 diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest index 6b1a0da945b0..8f1e8269ca3f 100644 --- a/net-proxy/squid/Manifest +++ b/net-proxy/squid/Manifest @@ -7,8 +7,11 @@ AUX squid-3.0.13-adapted-zph.patch 6838 RMD160 5a8728e93498ce03fdcbc1926c63271d5 AUX squid-3.0.13-gentoo.patch 13095 RMD160 5184e54faef48bf5ed8c93d92761e39be8885739 SHA1 f671c6aa4a051b9f454afc08769bafedc3c92f2e SHA256 2209444bdd0149404a77478f8d445cc7a0b4e012a25557dbf8a2e3659b0883d9 AUX squid-3.0.13-heimdal.patch 780 RMD160 4cf5b9494a0537bdd0f886b46e7f0685d0e428be SHA1 71b99ceed606c3e41db9f0f78a8d993d8e35a407 SHA256 a51da87baf57bf251c0c401a29b296a89ffa391f5da6e821bbe15a309dd76537 AUX squid-3.0.14-adapted-zph.patch 6838 RMD160 ec057b12e243301e734dc4296690919e08a33731 SHA1 d8d4c604ea5b0adba50f83f43ec17fff58ca7fdd SHA256 5bace554b163c67c4084fcfb4e3f5ecca8cf447f6f5a5992c790ccb191b35369 +AUX squid-3.0.14-cross-compile.patch 1234 RMD160 24c77750020a9ae61bb64f7e92215c183f28f156 SHA1 6dd2a77f9c2d1f17cc0420200a5b18485d105638 SHA256 32108a3856c219b0ce2af066333bd58b7a2932748474ec48d25cf4bc72f629f8 +AUX squid-3.0.14-gcc43.patch 901 RMD160 6ac1b123a79a205f5b2834c472ae02a8db325eb4 SHA1 d3f8b99b0db48a9411c001296dc9c7e3401fb32b SHA256 47caa6fb8d93353fcb63d0ec970dad46cf4863230b8afdb0992ca6d34fe051d2 AUX squid-3.0.14-gentoo.patch 13095 RMD160 3fb7fb0cfa72ce0f5c25a534731df841564b92d7 SHA1 bb16e7df13eca291dc44bc48f369d1d06d24739d SHA256 db037b0b00e7cb982e487b45cda9918f080c87a68d8f51650968dfdf7cc4404d AUX squid-3.0.14-heimdal.patch 780 RMD160 5f8727ac2033c742a373b03baf32d3e53fc13cb0 SHA1 e85bcd323c349cd85d06ca548316228d06eac6ae SHA256 2c7fcf12d94161dfe6aa441d0f85f435940c78467f3c148b0c8b04369700f6e0 +AUX squid-3.0.14-max-forwards.patch 684 RMD160 d8e778f65d448db06aff418c31cc294ef3f48121 SHA1 dedeea6d72de7ffa21b458650a1ccdbb62d5e14e SHA256 a05236fc23340df65841eb678f0b3c47526e31a2c32c4aedf564951110c2e4ea AUX squid.confd 541 RMD160 e248f8fdc3ce732267614652f17bd88472e62b76 SHA1 995df246caffb2a74be2df3072d7ff5fbd024a9d SHA256 982d829f3862c5543af82acd4f7bb123ebe3e9d1c5eff0911f5345262811f2e1 AUX squid.cron 143 RMD160 0706a7ad04691b9a93a2897c319008440483ba11 SHA1 6138db0eccb7320e707b8d60c2970ef684e29336 SHA256 4c9e2afe5b0bba583ce896233ea1f9262beeb1b6cf51b4adb48d5f5c03933b2f AUX squid.initd 2202 RMD160 bdfe34d7d4f0ab5270d2773914d6eb254b030505 SHA1 0092d4259b22c29871b78b0656f836784ec7c09d SHA256 627f30e789949a6881da1b8227cc57ff782159cf5d6c99b1ec4163cfa38636eb @@ -19,15 +22,15 @@ DIST squid-2.7.STABLE6.tar.gz 1786189 RMD160 ca59583e9d938c3184a306984f034553f76 DIST squid-3.0.STABLE13.tar.gz 2454967 RMD160 8da76671013bf4100cbc4c2976e228f81323344e SHA1 6f0f1079a027c64a9f95b7b6c9bdd943af28a42e SHA256 8764fe16c8873bcc5c0c7e5f97b22e70dec186d1182ca4803ec94761bac750e1 DIST squid-3.0.STABLE14.tar.gz 2456387 RMD160 eebdf3083e8018ded08861e72ee46cb32ba33ef6 SHA1 c073feeb3b94972523756f8f69cd1df09f3918a9 SHA256 9e5f8f5456e98d82dc4c5fcbcf50745a36b9860fc553cf2719f02d423e535712 EBUILD squid-2.7.6-r1.ebuild 6035 RMD160 d8e122044369f95f0bc78c4a55f3dee7856ed19b SHA1 207ab5cf19baf09ee564130043297caf342e0bdc SHA256 843fb7102323f83948856c8395d62affbf41dfdf2d7e0cef4828202f8f6d04c2 -EBUILD squid-2.7.6.ebuild 6024 RMD160 6928eeaadbfe70e27e02ecc4d483f4298481d79f SHA1 1974c9c464f44d1212b9309164947e3cab70acf1 SHA256 a7cb544e969f7f01e864748ab869b9734c44272005f83b69408466f1a08efccb EBUILD squid-3.0.13.ebuild 6457 RMD160 ef239cf007b62f5e2da1428abe517b8523fc8cc5 SHA1 83e77c0ea9aa4b67bcac615aa64437658b569aa1 SHA256 ae88c34eaa2e3a4c90fe62b701af80fde5619decbbf75df8461e3602b2f12f84 +EBUILD squid-3.0.14-r1.ebuild 6507 RMD160 311175a0fedbb372323b36bcde6bb4895ebb1fbc SHA1 9dbd0f709046c7e17055a4e9d0eea57c1a39a91b SHA256 16140e31e21f9ec319792ae4ae0637384e0c8752209546f603d68b92d85a0718 EBUILD squid-3.0.14.ebuild 6372 RMD160 3ab628eb06cf23bfc84670e70e32bf6945687847 SHA1 dcbe958c5d77b334b855d69a17478e1437e84057 SHA256 d306bfbf8f583c027859462e1e46d814b6fafc81bd4d355005be2c2f5dffec33 -MISC ChangeLog 52977 RMD160 d2f7ce6f6c987fd0f944130289dbf03bd78ea3d4 SHA1 06c70c9f53b89c33a0cffb281b6e79dc44074734 SHA256 00e9c4d34a37931b99a6150f1f70034630bad4fb2654d69c247ea1d5426daacc +MISC ChangeLog 53313 RMD160 ed5570d87b7e43d8f8c16d34c2ac904f80ce7814 SHA1 e197f321f9bc5a4b8844083ae4a0ce994ab69224 SHA256 fa2c012cd70accab6ac5d48e8e9551dfebb1df0e330c477cd38005458e5bff0c MISC metadata.xml 815 RMD160 ef81660620d9fa0746bc415a7e6e6cf8a5500b98 SHA1 7a420824358267ae8c85256da092d1fba8727dcd SHA256 943b6f547b43197636ac4ec29ad23423770ec621cdb1b495306d95ab14da09ba -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.10 (GNU/Linux) -iEYEARECAAYFAknve9IACgkQkKaRLQcq0GLYeACgtp7jmdwilTCcVeIVkkBpbpx1 -CeoAoKYFv+BtjgU8lr8c80kAIKj5tRap -=kvRR +iEYEARECAAYFAkny9zUACgkQts85UDFmaOWxUwCfZfrfmkxeNcWgeL0kJu6Nb8PJ +omMAniCzvkUuN7WLeUyPEZRHE0VV6NI6 +=E4St -----END PGP SIGNATURE----- diff --git a/net-proxy/squid/files/squid-3.0.14-cross-compile.patch b/net-proxy/squid/files/squid-3.0.14-cross-compile.patch new file mode 100644 index 000000000000..77d96c7d23ee --- /dev/null +++ b/net-proxy/squid/files/squid-3.0.14-cross-compile.patch @@ -0,0 +1,38 @@ +diff -Nru squid-3.0.STABLE14.orig/configure.in squid-3.0.STABLE14/configure.in +--- squid-3.0.STABLE14.orig/configure.in 2009-04-25 11:24:10.000000000 +0000 ++++ squid-3.0.STABLE14/configure.in 2009-04-25 11:31:02.000000000 +0000 +@@ -1820,6 +1820,10 @@ + ;; + esac + ++dnl Define HOSTCXX ++HOSTCXX="$build-g++" ++AC_SUBST(HOSTCXX) ++ + dnl Check for programs + AC_PROG_CPP + AC_PROG_INSTALL +diff -Nru squid-3.0.STABLE14.orig/src/Makefile.am squid-3.0.STABLE14/src/Makefile.am +--- squid-3.0.STABLE14.orig/src/Makefile.am 2009-04-25 11:24:10.000000000 +0000 ++++ squid-3.0.STABLE14/src/Makefile.am 2009-04-25 11:31:02.000000000 +0000 +@@ -1007,6 +1007,8 @@ + + DEFS = @DEFS@ -DDEFAULT_CONFIG_FILE=\"$(DEFAULT_CONFIG_FILE)\" + ++HOSTCXX ?= @HOSTCXX@ ++ + $(OBJS): $(top_srcdir)/include/version.h ../include/autoconf.h + + snmp_core.o snmp_agent.o: ../snmplib/libsnmp.a $(top_srcdir)/include/cache_snmp.h +@@ -1030,6 +1032,11 @@ + squid.conf.default: cf_parser.h + true + ++cf_gen$(EXEEXT): $(cf_gen_SOURCES) $(cf_gen_DEPENDENCIES) ++ $(HOSTCXX) -o $@ $(srcdir)/cf_gen.cc \ ++ $(top_srcdir)/lib/util.c $(top_srcdir)/lib/assert.c \ ++ -DNDEBUG -DBUILD_HOST_TOOL ${INCLUDES} ++ + cf_parser.h: cf.data cf_gen$(EXEEXT) + ./cf_gen cf.data $(srcdir)/cf.data.depend + diff --git a/net-proxy/squid/files/squid-3.0.14-gcc43.patch b/net-proxy/squid/files/squid-3.0.14-gcc43.patch new file mode 100644 index 000000000000..cc2a843201c5 --- /dev/null +++ b/net-proxy/squid/files/squid-3.0.14-gcc43.patch @@ -0,0 +1,39 @@ +diff -Nru squid-3.0.STABLE14.orig/lib/util.c squid-3.0.STABLE14/lib/util.c +--- squid-3.0.STABLE14.orig/lib/util.c 2009-04-11 08:35:38.000000000 +0000 ++++ squid-3.0.STABLE14/lib/util.c 2009-04-25 11:28:40.000000000 +0000 +@@ -755,7 +755,7 @@ + + PROF_stop(xstrdup); + +- return p; ++ return (char *)p; + } + + /* +@@ -765,7 +765,7 @@ + xstrndup(const char *s, size_t n) + { + size_t sz; +- void *p; ++ char *p; + PROF_start(xstrndup); + assert(s != NULL); + assert(n); +@@ -774,7 +774,7 @@ + if (sz > n) + sz = n; + +- p = xstrncpy(xmalloc(sz), s, sz); ++ p = xstrncpy((char *)xmalloc(sz), s, sz); + + PROF_stop(xstrndup); + +@@ -923,7 +923,7 @@ + xint64toa(int64_t num) + { + static char buf[24]; /* 2^64 = 18446744073709551616 */ +- snprintf(buf, sizeof(buf), "%" PRId64, num); ++ snprintf(buf, sizeof(buf), "%" PRId64, (long long int)num); + return buf; + } + diff --git a/net-proxy/squid/files/squid-3.0.14-max-forwards.patch b/net-proxy/squid/files/squid-3.0.14-max-forwards.patch new file mode 100644 index 000000000000..52b274f81b29 --- /dev/null +++ b/net-proxy/squid/files/squid-3.0.14-max-forwards.patch @@ -0,0 +1,12 @@ +diff -Nru squid-3.0.STABLE14.orig/src/HttpHeader.cc squid-3.0.STABLE14/src/HttpHeader.cc +--- squid-3.0.STABLE14.orig/src/HttpHeader.cc 2009-04-11 08:35:40.000000000 +0000 ++++ squid-3.0.STABLE14/src/HttpHeader.cc 2009-04-25 11:34:00.000000000 +0000 +@@ -106,7 +106,7 @@ + {"Last-Modified", HDR_LAST_MODIFIED, ftDate_1123}, + {"Link", HDR_LINK, ftStr}, + {"Location", HDR_LOCATION, ftStr}, +- {"Max-Forwards", HDR_MAX_FORWARDS, ftInt}, ++ {"Max-Forwards", HDR_MAX_FORWARDS, ftInt64}, + {"Mime-Version", HDR_MIME_VERSION, ftStr}, /* for now */ + {"Pragma", HDR_PRAGMA, ftStr}, + {"Proxy-Authenticate", HDR_PROXY_AUTHENTICATE, ftStr}, diff --git a/net-proxy/squid/squid-2.7.6.ebuild b/net-proxy/squid/squid-3.0.14-r1.ebuild index ff6d382f4d5c..bf7370afd111 100644 --- a/net-proxy/squid/squid-2.7.6.ebuild +++ b/net-proxy/squid/squid-3.0.14-r1.ebuild @@ -1,27 +1,29 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-2.7.6.ebuild,v 1.7 2009/02/25 20:39:16 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.0.14-r1.ebuild,v 1.1 2009/04/25 11:42:35 mrness Exp $ +EAPI="2" WANT_AUTOCONF="latest" WANT_AUTOMAKE="latest" inherit eutils pam toolchain-funcs autotools linux-info -#lame archive versioning scheme.. +# lame archive versioning scheme.. S_PMV="${PV%%.*}" S_PV="${PV%.*}" S_PL="${PV##*.}" -S_PL="${S_PL/_rc/-RC}" S_PP="${PN}-${S_PV}.STABLE${S_PL}" +RESTRICT="test" # check if test works in next bump + DESCRIPTION="A full-featured web proxy cache" HOMEPAGE="http://www.squid-cache.org/" SRC_URI="http://www.squid-cache.org/Versions/v${S_PMV}/${S_PV}/${S_PP}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd" -IUSE="pam ldap samba sasl kerberos nis ssl snmp selinux logrotate \ +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="pam ldap samba sasl kerberos nis radius ssl snmp selinux icap-client logrotate \ mysql postgres sqlite \ zero-penalty-hit \ pf-transparent ipf-transparent kqueue \ @@ -45,31 +47,37 @@ RDEPEND="${DEPEND} S="${WORKDIR}/${S_PP}" pkg_setup() { - if use zero-penalty-hit; then - ewarn "This version supports natively IP TOS/Priority mangling," - ewarn "but it does not support zph_preserve_miss_tos." - ewarn "If you need that, please use squid-3.0.6-r2 or higher." + if grep -qs '^[[:space:]]*cache_dir[[:space:]]\+coss' "${ROOT}"etc/squid/squid.conf; then + eerror "coss store IO has been disabled by upstream due to stability issues!" + eerror "If you want to install this version, switch the store type to something else" + eerror "before attempting to install this version again." + + die "/etc/squid/squid.conf: cache_dir use a disabled store type" fi + enewgroup squid 31 enewuser squid 31 -1 /var/cache/squid squid } -src_unpack() { - unpack ${A} || die "unpack failed" - - cd "${S}" || die "source dir not found" +src_prepare() { epatch "${FILESDIR}"/${P}-gentoo.patch + epatch "${FILESDIR}"/${P}-max-forwards.patch + epatch "${FILESDIR}"/${P}-gcc43.patch + epatch "${FILESDIR}"/${P}-cross-compile.patch + use zero-penalty-hit && epatch "${FILESDIR}"/${P}-adapted-zph.patch has_version app-crypt/mit-krb5 || epatch "${FILESDIR}"/${P}-heimdal.patch + eautoreconf } -src_compile() { +src_configure() { local basic_modules="getpwnam,NCSA,MSNT" use samba && basic_modules="SMB,multi-domain-NTLM,${basic_modules}" use ldap && basic_modules="LDAP,${basic_modules}" use pam && basic_modules="PAM,${basic_modules}" use sasl && basic_modules="SASL,${basic_modules}" use nis && ! use elibc_uclibc && basic_modules="YP,${basic_modules}" + use radius && basic_modules="squid_radius_auth,${basic_modules}" if use mysql || use postgres || use sqlite ; then basic_modules="DB,${basic_modules}" fi @@ -86,14 +94,9 @@ src_compile() { local myconf="" - # Support for uclibc #61175 - if use elibc_uclibc; then - myconf="${myconf} --enable-storeio=ufs,diskd,aufs,null" - myconf="${myconf} --disable-async-io" - else - myconf="${myconf} --enable-storeio=ufs,diskd,coss,aufs,null" - myconf="${myconf} --enable-async-io" - fi + # coss support has been disabled + # If it is re-enabled again, make sure you don't enable it for elibc_uclibc (#61175) + myconf="${myconf} --enable-storeio=ufs,diskd,aufs,null" if use kernel_linux; then myconf="${myconf} --enable-linux-netfilter @@ -114,34 +117,29 @@ src_compile() { --libexecdir=/usr/libexec/squid \ --localstatedir=/var \ --datadir=/usr/share/squid \ - --enable-auth="basic,digest,ntlm" \ + --with-default-user=squid \ + --enable-auth="basic,digest,negotiate,ntlm" \ --enable-removal-policies="lru,heap" \ --enable-digest-auth-helpers="password" \ --enable-basic-auth-helpers="${basic_modules}" \ --enable-external-acl-helpers="${ext_helpers}" \ --enable-ntlm-auth-helpers="${ntlm_helpers}" \ --enable-negotiate-auth-helpers="${negotiate_helpers}" \ - --enable-ident-lookups \ --enable-useragent-log \ --enable-cache-digests \ --enable-delay-pools \ --enable-referer-log \ --enable-arp-acl \ - --with-pthreads \ --with-large-files \ - --enable-htcp \ - --enable-carp \ - --enable-follow-x-forwarded-for \ - --with-maxfd=8192 \ + --with-filedescriptors=8192 \ $(use_enable snmp) \ $(use_enable ssl) \ + $(use_enable icap-client) \ ${myconf} || die "econf failed" - - emake || die "emake failed" } src_install() { - make DESTDIR="${D}" install || die "make install failed" + emake DESTDIR="${D}" install || die "emake install failed" # need suid root for looking into /etc/shadow fowners root:squid /usr/libexec/squid/ncsa_auth @@ -189,4 +187,9 @@ pkg_postinst() { echo ewarn "Squid can be configured to run in transparent mode like this:" ewarn " ${HILITE}http_port internal-addr:3128 transparent${NORMAL}" + if use zero-penalty-hit; then + echo + ewarn "In order for zph_preserve_miss_tos to work, you will have to alter your kernel" + ewarn "with the patch that can be found on http://zph.bratcheda.org site." + fi } |