[Pkg-squid-devel] Team maintaining Squid packages

Amos Jeffries squid3 at treenet.co.nz
Sat Feb 1 11:21:15 UTC 2014 

On 17/01/2014 10:11 a.m., Luigi Gangitano wrote:
> 
> Il giorno 16/gen/2014, alle ore 15:59, Mathieu Parent (Debian) <sathieu at debian.org> ha scritto:
> 
>>> Also, 3.4 series is around the corner from going stable. Excepting
>>> surprises that should happen in the next 10-15 days.
>>
>> Yes. 3.4.2 has been released (and there is also 3.3.11 if we want to
>> be conservative).
>>
>> I also want to upload a backported version to stable once >= 3.3.11 is
>> in testing.
> 
> Since jessie is still far in the future I’d go for 3.4 as soon as possible so we can get more feedback.

Since I have not heard anything indicating either of you are picking
this up I have take a few hours today to update the existing packaging
for the new version.

Please find attached a patch against the debian/ directory of the
3.3.8-1.1 NMU package currently in unstable which updates it to build
for the 3.4.2 upstream tarball.

As mentioned partially in the changelog entry :

 - 3.4.2 version bump closes a "please update" bug report

 - I removed the now obsolete --enable-underscores build option
   (old enhancement bug closes)

 - removed obsolete perl patch. The 3.4 series uses autoconf macro rules
to detect perl instead of the broken bash scripts.

 - refreshed the remaining patches to fix quilt FTBS from line fuzz.

 - added --disable-arch-native CPU-specific performance optimizations
  since I expect the binaries will be run on different CPUs.

 - added version-specific dependency on libecap 0.2.0-1 package

 - moved the watch file to map the 3.4 version URL's


I also took a look at updating the standards version to 3.9.5 to make
lintian happy. But was not sure about the new 10.7.3 details regarding
configuration files, or 12.2 details about install-info.
 The other changes listed in the upgrading checklist from 3.9.4 appear
not relevant.


NP: this one makes no attempt at any of the 2.7 transition changes which
we still have to do.

Amos

-------------- next part --------------
diff -urN debian-3.3.8-1.1/changelog debian-3.4-ayj/changelog
--- debian-3.3.8-1.1/changelog	2013-11-24 09:05:12.000000000 +1300
+++ debian-3.4-ayj/changelog	2014-02-01 23:58:54.000000000 +1300
@@ -1,3 +1,18 @@
+squid3 (3.4.2-1) unstable; urgency=low
+
+  * New upstream release (Closes #737008)
+
+  * debian/control
+    - libecap API support is specific to version 0.2.0
+
+  * debian/watch
+    - updated watch pattern for upstream major series
+
+  * debian/rules
+    - Remove obsolete --enable-underscores (Closes #693905)
+
+ -- Amos Jeffries <squid3 at treenet.co.nz>  Sat, 02 Feb 2014 21:49:33 +1200
+
 squid3 (3.3.8-1.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff -urN debian-3.3.8-1.1/control debian-3.4-ayj/control
--- debian-3.3.8-1.1/control	2013-07-22 10:08:07.000000000 +1200
+++ debian-3.4-ayj/control	2014-02-01 23:59:00.000000000 +1300
@@ -4,7 +4,7 @@
 Maintainer: Luigi Gangitano <luigi at debian.org>
 Homepage: http://www.squid-cache.org
 Standards-Version: 3.9.4
-Build-Depends: libldap2-dev, libpam0g-dev, libdb-dev, cdbs, libsasl2-dev, debhelper (>=5), libcppunit-dev, libkrb5-dev, comerr-dev, libcap2-dev [linux-any], libecap2-dev, libexpat1-dev, libxml2-dev, autotools-dev, libltdl-dev, dpkg-dev (>= 1.16.1~), pkg-config, libnetfilter-conntrack-dev [linux-any]
+Build-Depends: libldap2-dev, libpam0g-dev, libdb-dev, cdbs, libsasl2-dev, debhelper (>=5), libcppunit-dev, libkrb5-dev, comerr-dev, libcap2-dev [linux-any], libecap2-dev (= 0.2.0-1), libexpat1-dev, libxml2-dev, autotools-dev, libltdl-dev, dpkg-dev (>= 1.16.1~), pkg-config, libnetfilter-conntrack-dev [linux-any]
 
 Package: squid3
 Architecture: any
diff -urN debian-3.3.8-1.1/patches/01-cf.data.debian.patch debian-3.4-ayj/patches/01-cf.data.debian.patch
--- debian-3.3.8-1.1/patches/01-cf.data.debian.patch	2013-07-22 05:23:44.000000000 +1200
+++ debian-3.4-ayj/patches/01-cf.data.debian.patch	2014-02-01 20:47:09.000000000 +1300
@@ -1,8 +1,11 @@
 Author: Luigi Gangitano <luigi at debian.org>
 Description: Default configuration file for debian
---- a/src/cf.data.pre
-+++ b/src/cf.data.pre
-@@ -327,7 +327,7 @@
+=== modified file 'src/cf.data.pre'
+Index: squid-3.4.2/src/cf.data.pre
+===================================================================
+--- squid-3.4.2.orig/src/cf.data.pre	2013-12-31 00:33:27.000000000 +1300
++++ squid-3.4.2/src/cf.data.pre	2014-02-01 20:43:33.000000000 +1300
+@@ -349,7 +349,7 @@
  	If you want to use the traditional NCSA proxy authentication, set
  	this line to something like
  
@@ -11,7 +14,7 @@
  
  	"utf8" on|off
  	HTTP uses iso-latin-1 as character set, while some authentication
-@@ -400,7 +400,7 @@
+@@ -433,7 +433,7 @@
  	If you want to use a digest authenticator, set this line to
  	something like
  
@@ -20,8 +23,8 @@
  
  	"utf8" on|off
  	HTTP uses iso-latin-1 as character set, while some authentication
-@@ -477,6 +477,9 @@
- 	of type proxy_auth.  By default, the NTLM authenticator_program
+@@ -510,6 +510,9 @@
+ 	of type proxy_auth.  By default, the NTLM authenticator program
  	is not used.
  
 +	NOTE: In Debian the ntlm_auth program is distributed in the winbindd package
@@ -30,7 +33,7 @@
  	auth_param ntlm program /usr/bin/ntlm_auth
  
  	"children" numberofchildren [startup=N] [idle=N]
-@@ -518,6 +521,9 @@
+@@ -551,6 +554,9 @@
  	The only supported program for this role is the ntlm_auth
  	program distributed as part of Samba, version 4 or later.
  
@@ -40,7 +43,7 @@
  	auth_param negotiate program /usr/bin/ntlm_auth --helper-protocol=gss-spnego
  
  	"children" numberofchildren [startup=N] [idle=N]
-@@ -1009,11 +1015,11 @@
+@@ -1144,11 +1150,11 @@
  # Example rule allowing access from your local networks.
  # Adapt to list your (internal) IP networks from where browsing
  # should be allowed
@@ -57,7 +60,7 @@
  
  acl SSL_ports port 443
  acl Safe_ports port 80		# http
-@@ -1194,7 +1200,7 @@
+@@ -1349,7 +1355,7 @@
  # Example rule allowing access from your local networks.
  # Adapt localnet in the ACL section to list your (internal) IP networks
  # from where browsing should be allowed
@@ -66,7 +69,7 @@
  http_access allow localhost
  
  # And finally deny all other access to this proxy
-@@ -3889,7 +3895,7 @@
+@@ -4147,7 +4153,7 @@
  
  NAME: logfile_rotate
  TYPE: int
@@ -75,7 +78,7 @@
  LOC: Config.Log.rotateNumber
  DOC_START
  	Specifies the number of logfile rotations to make when you
-@@ -3908,6 +3914,9 @@
+@@ -4166,6 +4172,9 @@
  
  	Note, from Squid-3.1 this option is only a default for cache.log,
  	that log can be rotated separately by using debug_options.
@@ -85,7 +88,7 @@
  DOC_END
  
  NAME: emulate_httpd_log
-@@ -7982,8 +7991,8 @@
+@@ -8458,8 +8467,8 @@
  
  	WARNING:
  	  This option will restrict the situations under which IPv6
diff -urN debian-3.3.8-1.1/patches/02-makefile-defaults.patch debian-3.4-ayj/patches/02-makefile-defaults.patch
--- debian-3.3.8-1.1/patches/02-makefile-defaults.patch	2013-04-21 06:43:56.000000000 +1200
+++ debian-3.4-ayj/patches/02-makefile-defaults.patch	2014-02-01 20:54:13.000000000 +1300
@@ -1,8 +1,21 @@
 Author: Luigi Gangitano <luigi at debian.org>
 Description: Change default file locations for debian
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -2802,7 +2802,7 @@
+diff -ur a/src/Makefile.am squid-3.4.2/src/Makefile.am
+--- a/src/Makefile.am	2013-12-31 00:33:27.000000000 +1300
++++ b/src/Makefile.am	2014-02-01 20:53:04.000000000 +1300
+@@ -921,7 +921,7 @@
+ DEFAULT_PREFIX		= $(prefix)
+ DEFAULT_CONFIG_DIR	= $(sysconfdir)
+ DEFAULT_CONFIG_FILE	= $(DEFAULT_CONFIG_DIR)/squid.conf
+-DEFAULT_MIME_TABLE	= $(DEFAULT_CONFIG_DIR)/mime.conf
++DEFAULT_MIME_TABLE	= $(datadir)/mime.conf
+ DEFAULT_DNSSERVER	= $(libexecdir)/`echo dnsserver | sed '$(transform);s/$$/$(EXEEXT)/'`
+ DEFAULT_SSL_CRTD	= $(libexecdir)/`echo ssl_crtd  | sed '$(transform);s/$$/$(EXEEXT)/'`
+ DEFAULT_LOG_PREFIX	= $(DEFAULT_LOG_DIR)
+diff -ur a/src/Makefile.in squid-3.4.2/src/Makefile.in
+--- a/src/Makefile.in	2013-12-31 00:34:02.000000000 +1300
++++ b/src/Makefile.in	2014-02-01 20:53:12.000000000 +1300
+@@ -2822,7 +2822,7 @@
  DEFAULT_PREFIX = $(prefix)
  DEFAULT_CONFIG_DIR = $(sysconfdir)
  DEFAULT_CONFIG_FILE = $(DEFAULT_CONFIG_DIR)/squid.conf
diff -urN debian-3.3.8-1.1/patches/15-cachemgr-default-config.patch debian-3.4-ayj/patches/15-cachemgr-default-config.patch
--- debian-3.3.8-1.1/patches/15-cachemgr-default-config.patch	2013-04-21 06:44:53.000000000 +1200
+++ debian-3.4-ayj/patches/15-cachemgr-default-config.patch	2014-02-01 20:29:31.000000000 +1300
@@ -1,7 +1,8 @@
 Author: Luigi Gangitano <luigi at debian.org>
 Description: Fix path for cachemgr.cgi default configuration file
---- a/tools/Makefile.am
-+++ b/tools/Makefile.am
+=== modified file 'tools/Makefile.am'
+--- a/tools/Makefile.am	2010-12-06 14:06:06 +0000
++++ b/tools/Makefile.am	2013-05-18 13:15:39 +0000
 @@ -68,7 +68,7 @@
  
  ## ##### cachemgr.cgi  #####
@@ -19,9 +20,10 @@
  	$(INSTALL_DATA) $(srcdir)/cachemgr.conf $(DESTDIR)$(DEFAULT_CACHEMGR_CONFIG).default
  	@if test -f $(DESTDIR)$(DEFAULT_CACHEMGR_CONFIG) ; then \
  	        echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_CACHEMGR_CONFIG)" ; \
---- a/tools/Makefile.in
-+++ b/tools/Makefile.in
-@@ -434,7 +434,7 @@
+
+--- a/tools/Makefile.in	2013-05-19 01:11:10.000000000 +1200
++++ b/tools/Makefile.in	2013-05-19 01:15:39.000000000 +1200
+@@ -510,7 +510,7 @@
  	test_tools.cc \
  	time.cc
  
@@ -30,7 +32,7 @@
  cachemgr__CGIEXT__SOURCES = cachemgr.cc \
  	stub_debug.cc \
  	test_tools.cc \
-@@ -1237,6 +1237,7 @@
+@@ -1334,6 +1334,7 @@
  	$(SUBSTITUTE) < $(srcdir)/cachemgr.cgi.8.in > $@
  
  install-data-local:
diff -urN debian-3.3.8-1.1/patches/17-pod2man-check.patch debian-3.4-ayj/patches/17-pod2man-check.patch
--- debian-3.3.8-1.1/patches/17-pod2man-check.patch	2013-10-26 10:18:18.000000000 +1300
+++ debian-3.4-ayj/patches/17-pod2man-check.patch	1970-01-01 12:00:00.000000000 +1200
@@ -1,40 +0,0 @@
-Description: fix check for perl and pod2man
- At least under Perl 5.18, the current version fails with
- | pod2man: unable to format
- | configure: FOO ... found but cannot be built
-Origin: vendor
-Bug-Debian: http://bugs.debian.org/725599
-Forwarded: no
-Author: gregor herrmann <gregoa at debian.org>
-Last-Update: 2013-10-25
-
---- a/helpers/basic_auth/DB/config.test
-+++ b/helpers/basic_auth/DB/config.test
-@@ -2,6 +2,6 @@
- 
- ## Test: do we have perl to build the helper scripts?
- ## Test: do we have pod2man to build the manual?
--perl --version >/dev/null && echo | pod2man >/dev/null
-+command -v perl >/dev/null && command -v pod2man >/dev/null
- 
- exit $?
---- a/helpers/external_acl/SQL_session/config.test
-+++ b/helpers/external_acl/SQL_session/config.test
-@@ -2,6 +2,6 @@
- 
- ## Test: do we have perl to build the helper scripts?
- ## Test: do we have pod2man to build the manual?
--perl --version >/dev/null && echo | pod2man >/dev/null
-+command -v perl >/dev/null && command -v pod2man >/dev/null
- 
- exit $?
---- a/helpers/log_daemon/DB/config.test
-+++ b/helpers/log_daemon/DB/config.test
-@@ -2,6 +2,6 @@
- 
- ## Test: do we have perl to build the helper scripts?
- ## Test: do we have pod2man to build the manual?
--perl --version >/dev/null && echo | pod2man >/dev/null
-+command -v perl >/dev/null && command -v pod2man >/dev/null
- 
- exit $?
diff -urN debian-3.3.8-1.1/patches/series debian-3.4-ayj/patches/series
--- debian-3.3.8-1.1/patches/series	2013-10-26 10:07:04.000000000 +1300
+++ debian-3.4-ayj/patches/series	2014-02-01 14:38:31.000000000 +1300
@@ -2,4 +2,3 @@
 02-makefile-defaults.patch
 15-cachemgr-default-config.patch
 16-ipc-statedir.patch
-17-pod2man-check.patch
diff -urN debian-3.3.8-1.1/rules debian-3.4-ayj/rules
--- debian-3.3.8-1.1/rules	2013-07-22 10:08:47.000000000 +1200
+++ debian-3.4-ayj/rules	2014-02-01 23:58:48.000000000 +1300
@@ -18,12 +18,12 @@
 		--sysconfdir=/etc/squid3 \
 		--mandir=/usr/share/man \
 		--enable-inline \
+		--disable-arch-native \
 		--enable-async-io=8 \
 		--enable-storeio="ufs,aufs,diskd,rock" \
 		--enable-removal-policies="lru,heap" \
 		--enable-delay-pools \
 		--enable-cache-digests \
-		--enable-underscores \
 		--enable-icap-client \
 		--enable-follow-x-forwarded-for \
 		--enable-auth-basic="DB,fake,getpwnam,LDAP,MSNT,MSNT-multi-domain,NCSA,NIS,PAM,POP3,RADIUS,SASL,SMB" \
diff -urN debian-3.3.8-1.1/watch debian-3.4-ayj/watch
--- debian-3.3.8-1.1/watch	2013-05-07 03:40:15.000000000 +1200
+++ debian-3.4-ayj/watch	2014-02-01 23:17:29.000000000 +1300
@@ -1,2 +1,2 @@
 version=3
-http://www.squid-cache.org/Versions/v3/3.3/squid-([\.\d]+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
+http://www.squid-cache.org/Versions/v3/3.4/squid-([\.\d]+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))

More information about the Pkg-squid-devel mailing list