Control: tag -1 patch On Sun, Apr 01, 2012 at 09:15:51PM +0000, a...@debian.org wrote: > your package libapache2-mod-authnz-external is provding an Apache2 web server > module. > We're upgrading Apache to the new upstream version 2.4 [1] (tracked > as transition bug #661958). This requires all modules to be rebuilt > due to ABI changes.
Here's a patch for the packaging parts of this change, assuming an upgrade to the new upstream version 3.3.1 (I've filtered out the upstream changes from this diff). Please review. (I notice that this package hasn't had a maintainer upload for four years, including an NMU in 2011, so I might NMU this soon unless told otherwise.) diff -Nru libapache2-mod-authnz-external-3.2.4/debian/changelog libapache2-mod-authnz-external-3.3.1/debian/changelog --- libapache2-mod-authnz-external-3.2.4/debian/changelog 2013-07-09 17:48:39.000000000 +0100 +++ libapache2-mod-authnz-external-3.3.1/debian/changelog 2013-07-09 17:25:44.000000000 +0100 @@ -1,3 +1,12 @@ +libapache2-mod-authnz-external (3.3.1-0.1) UNRELEASED; urgency=low + + * Non-maintainer upload. + * New upstream release, suitable for Apache 2.4. + * Port packaging to Apache 2.4 (closes: #666815). + * Update debian/watch. + + -- Colin Watson <cjwat...@debian.org> Tue, 09 Jul 2013 17:24:15 +0100 + libapache2-mod-authnz-external (3.2.4-2.1) unstable; urgency=high * Non-maintainer upload by the security team diff -Nru libapache2-mod-authnz-external-3.2.4/debian/control libapache2-mod-authnz-external-3.3.1/debian/control --- libapache2-mod-authnz-external-3.2.4/debian/control 2013-07-09 17:48:39.000000000 +0100 +++ libapache2-mod-authnz-external-3.3.1/debian/control 2013-07-09 17:13:40.000000000 +0100 @@ -2,13 +2,13 @@ Section: web Priority: optional Maintainer: Hai Zaar <haiz...@haizaar.com> -Build-Depends: debhelper (>= 7), apache2-threaded-dev (>= 2.2.0) +Build-Depends: debhelper (>= 7), dh-apache2, apache2-dev (>= 2.2.0) Standards-Version: 3.8.2 Homepage: http://code.google.com/p/mod-auth-external Package: libapache2-mod-authnz-external Architecture: any -Depends: ${shlibs:Depends}, apache2.2-common +Depends: ${shlibs:Depends}, ${misc:Depends} Recommends: pwauth Description: authenticate Apache against external authentication services Mod_Auth_External can be used to quickly construct secure, reliable diff -Nru libapache2-mod-authnz-external-3.2.4/debian/libapache2-mod-authnz-external.apache2 libapache2-mod-authnz-external-3.3.1/debian/libapache2-mod-authnz-external.apache2 --- libapache2-mod-authnz-external-3.2.4/debian/libapache2-mod-authnz-external.apache2 1970-01-01 01:00:00.000000000 +0100 +++ libapache2-mod-authnz-external-3.3.1/debian/libapache2-mod-authnz-external.apache2 2013-07-09 17:14:08.000000000 +0100 @@ -0,0 +1,2 @@ +mod .libs/mod_authnz_external.so +mod debian/authnz_external.load diff -Nru libapache2-mod-authnz-external-3.2.4/debian/libapache2-mod-authnz-external.dirs libapache2-mod-authnz-external-3.3.1/debian/libapache2-mod-authnz-external.dirs --- libapache2-mod-authnz-external-3.2.4/debian/libapache2-mod-authnz-external.dirs 2013-07-09 17:48:39.000000000 +0100 +++ libapache2-mod-authnz-external-3.3.1/debian/libapache2-mod-authnz-external.dirs 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -usr/lib/apache2/modules -etc/apache2/mods-available diff -Nru libapache2-mod-authnz-external-3.2.4/debian/libapache2-mod-authnz-external.install libapache2-mod-authnz-external-3.3.1/debian/libapache2-mod-authnz-external.install --- libapache2-mod-authnz-external-3.2.4/debian/libapache2-mod-authnz-external.install 2013-07-09 17:48:39.000000000 +0100 +++ libapache2-mod-authnz-external-3.3.1/debian/libapache2-mod-authnz-external.install 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -.libs/mod_authnz_external.so usr/lib/apache2/modules -debian/authnz_external.load etc/apache2/mods-available diff -Nru libapache2-mod-authnz-external-3.2.4/debian/patches/conn-rec-remote-ip.patch libapache2-mod-authnz-external-3.3.1/debian/patches/conn-rec-remote-ip.patch --- libapache2-mod-authnz-external-3.2.4/debian/patches/conn-rec-remote-ip.patch 1970-01-01 01:00:00.000000000 +0100 +++ libapache2-mod-authnz-external-3.3.1/debian/patches/conn-rec-remote-ip.patch 2013-07-09 17:35:49.000000000 +0100 @@ -0,0 +1,20 @@ +Description: Handle conn_rec->remote_ip split in Apache 2.4 +Author: Colin Watson <cjwat...@debian.org> +Forwarded: http://code.google.com/p/mod-auth-external/issues/detail?id=8 +Last-Update: 2013-07-09 + +Index: b/mod_authnz_external.c +=================================================================== +--- a/mod_authnz_external.c ++++ b/mod_authnz_external.c +@@ -443,8 +443,8 @@ + if (remote_host != NULL) + child_env[i++]= apr_pstrcat(p, ENV_HOST"=", remote_host,NULL); + +- if (c->remote_ip) +- child_env[i++]= apr_pstrcat(p, ENV_IP"=", c->remote_ip, NULL); ++ if (r->useragent_ip) ++ child_env[i++]= apr_pstrcat(p, ENV_IP"=", r->useragent_ip, NULL); + + if (r->uri) + child_env[i++]= apr_pstrcat(p, ENV_URI"=", r->uri, NULL); diff -Nru libapache2-mod-authnz-external-3.2.4/debian/patches/series libapache2-mod-authnz-external-3.3.1/debian/patches/series --- libapache2-mod-authnz-external-3.2.4/debian/patches/series 1970-01-01 01:00:00.000000000 +0100 +++ libapache2-mod-authnz-external-3.3.1/debian/patches/series 2013-07-09 17:29:28.000000000 +0100 @@ -0,0 +1 @@ +conn-rec-remote-ip.patch diff -Nru libapache2-mod-authnz-external-3.2.4/debian/rules libapache2-mod-authnz-external-3.3.1/debian/rules --- libapache2-mod-authnz-external-3.2.4/debian/rules 2013-07-09 17:48:39.000000000 +0100 +++ libapache2-mod-authnz-external-3.3.1/debian/rules 2013-07-09 17:14:32.000000000 +0100 @@ -49,6 +49,7 @@ dh_installdocs dh_installexamples dh_install + dh_apache2 # dh_installmenu # dh_installdebconf # dh_installlogrotate diff -Nru libapache2-mod-authnz-external-3.2.4/debian/source/format libapache2-mod-authnz-external-3.3.1/debian/source/format --- libapache2-mod-authnz-external-3.2.4/debian/source/format 1970-01-01 01:00:00.000000000 +0100 +++ libapache2-mod-authnz-external-3.3.1/debian/source/format 2013-07-09 17:28:58.000000000 +0100 @@ -0,0 +1 @@ +3.0 (quilt) diff -Nru libapache2-mod-authnz-external-3.2.4/debian/watch libapache2-mod-authnz-external-3.3.1/debian/watch --- libapache2-mod-authnz-external-3.2.4/debian/watch 2013-07-09 17:48:39.000000000 +0100 +++ libapache2-mod-authnz-external-3.3.1/debian/watch 2013-07-09 17:22:03.000000000 +0100 @@ -9,7 +9,7 @@ # Uncomment to examine a Webpage # <Webpage URL> <string match> #http://www.example.com/downloads.php #PACKAGE#-(.*)\.tar\.gz -http://code.google.com/p/mod-auth-external/downloads/list http://mod-auth-external.googlecode.com/files/mod_authnz_external-(.*)\.tar\.gz +http://code.google.com/p/mod-auth-external/downloads/list?can=1 .*/mod_authnz_external-(\d[\d.]*)\.tar\.gz # Uncomment to examine a Webserver directory #http://www.example.com/pub/#PACKAGE#-(.*)\.tar\.gz Thanks, -- Colin Watson [cjwat...@ubuntu.com] -- To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
