diff -u squid3-3.1.10/debian/control squid3-3.1.10/debian/control --- squid3-3.1.10/debian/control +++ squid3-3.1.10/debian/control @@ -1,7 +1,8 @@ Source: squid3 Section: web Priority: optional -Maintainer: Luigi Gangitano +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Luigi Gangitano Homepage: http://www.squid-cache.org Standards-Version: 3.9.1 Build-Depends: libldap2-dev, libpam0g-dev, libdb-dev, dpatch (>= 2.0.9), cdbs, libsasl2-dev, debhelper (>=5), libcppunit-dev, libkrb5-dev, comerr-dev, libcap2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libexpat1-dev, libxml2-dev, autotools-dev, libltdl-dev diff -u squid3-3.1.10/debian/changelog squid3-3.1.10/debian/changelog --- squid3-3.1.10/debian/changelog +++ squid3-3.1.10/debian/changelog @@ -1,3 +1,13 @@ +squid3 (3.1.10-1ubuntu1) natty; urgency=low + + * Merge from debian unstable. (LP: #719283) Remaining changes: + - debian/patches/18-fix-ftbfs-binutils-gold.dpatch: Add library linker into + LIBS instead to LDFLAGS to fixing FTBFS binutils-gold. + * Drop Ubuntu configuration for ufw which landed in Debian and sync it: + - debian/squid3.ufw.profile. + + -- Mahyuddin Susanto Tue, 15 Feb 2011 18:46:13 +0700 + squid3 (3.1.10-1) unstable; urgency=low * New upstream release (Closes: #609881) @@ -18,6 +28,15 @@ -- Luigi Gangitano Fri, 21 Jan 2011 18:43:56 +0100 +squid3 (3.1.6-1.2ubuntu1) natty; urgency=low + + * Merge from debian unstable. (LP: #717654) Remaining changes: + - debian/squid3.ufw.profile: Provide ufw profile + * debian/patches/18-fix-ftbfs-binutils-gold.dpatch: Add sasl2 and kerberos + library in LDADD to fix FTBFS binutils-gold with --as-needed. (LP: #717653) + + -- Mahyuddin Susanto Sun, 13 Feb 2011 00:43:10 +0700 + squid3 (3.1.6-1.2) unstable; urgency=low * Non-maintainer upload. @@ -26,6 +45,13 @@ -- Ben Hutchings Sat, 30 Oct 2010 17:00:55 +0200 +squid3 (3.1.6-1.1ubuntu1) maverick; urgency=low + + * Merge with Debian unstable, Ubuntu remaining changes: + - Provide ufw profile. + + -- Alessio Treglia Mon, 20 Sep 2010 15:53:45 +0200 + squid3 (3.1.6-1.1) unstable; urgency=high * Non-maintainer upload by the security team @@ -34,6 +60,13 @@ -- Steffen Joeris Mon, 13 Sep 2010 17:07:51 +1000 +squid3 (3.1.6-1ubuntu1) maverick; urgency=low + + * Merge with Debian unstable, remaining changes: + - Provide ufw profile. + + -- Alessio Treglia Tue, 10 Aug 2010 17:28:42 +0200 + squid3 (3.1.6-1) unstable; urgency=low * New upstream release @@ -49,6 +82,12 @@ -- Luigi Gangitano Mon, 09 Aug 2010 00:59:26 +0200 +squid3 (3.1.5-2ubuntu1) maverick; urgency=low + + * Adding ufw profile (LP: #589830) + + -- Clint Byrum Tue, 20 Jul 2010 08:23:27 -0700 + squid3 (3.1.5-2) unstable; urgency=low * debian/control diff -u squid3-3.1.10/debian/patches/00list squid3-3.1.10/debian/patches/00list --- squid3-3.1.10/debian/patches/00list +++ squid3-3.1.10/debian/patches/00list @@ -3,0 +4,2 @@ + +18-fix-ftbfs-binutils-gold.dpatch only in patch2: unchanged: --- squid3-3.1.10.orig/debian/patches/18-fix-ftbfs-binutils-gold.dpatch +++ squid3-3.1.10/debian/patches/18-fix-ftbfs-binutils-gold.dpatch @@ -0,0 +1,47 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## Description: use autoconf LIBS instead of LDFLAGS for library linkage +## Origin: http://bazaar.launchpad.net/~squid/squid/3.1/revision/10231 +## Bug-Ubuntu: https://launchpad.net/bugs/717653 +## Bug-Debian: http://bugs.debian.org/613153 +## Bug: http://bugs.squid-cache.org/show_bug.cgi?id=3151 + +@DPATCH@ +diff -urNad squid3-3.1.10-1ubuntu1~/helpers/negotiate_auth/squid_kerb_auth/configure.ac squid3-3.1.10-1ubuntu1/helpers/negotiate_auth/squid_kerb_auth/configure.ac +--- squid3-3.1.10-1ubuntu1~/helpers/negotiate_auth/squid_kerb_auth/configure.ac 2010-12-22 12:46:56.000000000 +0700 ++++ squid3-3.1.10-1ubuntu1/helpers/negotiate_auth/squid_kerb_auth/configure.ac 2011-02-15 17:58:13.058699643 +0700 +@@ -93,7 +93,7 @@ + else + ac_gssapi_libs=`krb5-config --libs gssapi 2>/dev/null` + if test "x$ac_gssapi_libs" != "x" ; then +- LDFLAGS="$LDFLAGS $ac_gssapi_libs" ++ LIBS="$LIBS $ac_gssapi_libs" + else + for lib in $ac_gss_libs; do + AC_CHECK_LIB($lib,main) +@@ -117,7 +117,7 @@ + fi + ac_gssapi_libs=`krb5-config --libs gssapi 2>/dev/null` + if test "x$ac_gssapi_libs" != "x" ; then +- LDFLAGS="$LDFLAGS $ac_gssapi_libs" ++ LIBS="$LIBS $ac_gssapi_libs" + else + for lib in $ac_gss_libs; do + AC_CHECK_LIB($lib,main) +@@ -171,7 +171,7 @@ + ac_libdir=`echo $ac_gssapi_libs | sed -e 's/.*-L//' | sed -e 's/ .*//'` + LDFLAGS="$LDFLAGS $w_flag$ac_libdir$w_flag_2" + fi +- LDFLAGS="$LDFLAGS $ac_gssapi_libs" ++ LIBS="$LIBS $ac_gssapi_libs" + else + for lib in $ac_gss_libs; do + AC_CHECK_LIB($lib,main) +@@ -200,7 +200,7 @@ + ac_libdir=`echo $ac_gssapi_libs | sed -e 's/.*-L//' | sed -e 's/ .*//'` + LDFLAGS="$LDFLAGS $w_flag$ac_libdir$w_flag_2" + fi +- LDFLAGS="$LDFLAGS $ac_gssapi_libs" ++ LIBS="$LIBS $ac_gssapi_libs" + else + for lib in $ac_gss_libs; do + AC_CHECK_LIB($lib,main)