On Sat, Jul 06, 2013 at 07:30:52PM +0200, Arno Töll wrote: > could you please tell me how is the state of your module being ported to > Apache 2.4? Your module has reverse dependencies preventing a migration > of Apache 2.4 to Testing without your module being fixed.
Here's a patch. Please review. Note the careful positioning of dh_apache2 in debian/rules; in this case it must be called after dh_install. diff -Nru axis2c-1.6.0/debian/changelog axis2c-1.6.0/debian/changelog --- axis2c-1.6.0/debian/changelog 2012-05-23 16:45:48.000000000 +0100 +++ axis2c-1.6.0/debian/changelog 2013-07-09 13:24:10.000000000 +0100 @@ -1,3 +1,10 @@ +axis2c (1.6.0-5.2) UNRELEASED; urgency=low + + * Non-maintainer upload. + * Port to Apache 2.4 (closes: #666862). + + -- Colin Watson <cjwat...@debian.org> Tue, 09 Jul 2013 13:23:32 +0100 + axis2c (1.6.0-5.1) unstable; urgency=low * Non maintainer upload. diff -Nru axis2c-1.6.0/debian/control axis2c-1.6.0/debian/control --- axis2c-1.6.0/debian/control 2012-04-02 22:58:25.000000000 +0100 +++ axis2c-1.6.0/debian/control 2013-07-09 14:35:16.000000000 +0100 @@ -8,7 +8,7 @@ Thierry Carrez <thierry.car...@ubuntu.com>, Soren Hansen <so...@ubuntu.com>, Steffen Moeller <moel...@debian.org> -Build-Depends: cdbs, debhelper (>= 7), autotools-dev, libapr1-dev, apache2-threaded-dev, zlib1g-dev, libssl-dev, quilt +Build-Depends: cdbs, debhelper (>= 7), autotools-dev, libapr1-dev, dh-apache2, apache2-dev, zlib1g-dev, libssl-dev, quilt Standards-Version: 3.9.2 DM-Upload-Allowed: yes Homepage: http://ws.apache.org/axis2/c/ @@ -116,7 +116,7 @@ Package: libapache2-mod-axis2c Architecture: any Section: web -Depends: apache2.2-common, ${shlibs:Depends}, ${misc:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Description: Apache web services engine - apache module Apache Axis2/C is a Web services engine implemented in the C programming language. It is based on the extensible and flexible diff -Nru axis2c-1.6.0/debian/libapache2-mod-axis2c.apache2 axis2c-1.6.0/debian/libapache2-mod-axis2c.apache2 --- axis2c-1.6.0/debian/libapache2-mod-axis2c.apache2 1970-01-01 01:00:00.000000000 +0100 +++ axis2c-1.6.0/debian/libapache2-mod-axis2c.apache2 2013-07-09 18:32:16.000000000 +0100 @@ -0,0 +1,2 @@ +mod debian/axis2c.load +mod debian/axis2c.conf diff -Nru axis2c-1.6.0/debian/libapache2-mod-axis2c.dirs axis2c-1.6.0/debian/libapache2-mod-axis2c.dirs --- axis2c-1.6.0/debian/libapache2-mod-axis2c.dirs 2012-03-21 15:48:33.000000000 +0000 +++ axis2c-1.6.0/debian/libapache2-mod-axis2c.dirs 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -usr/lib/apache2/modules \ No newline at end of file diff -Nru axis2c-1.6.0/debian/libapache2-mod-axis2c.install axis2c-1.6.0/debian/libapache2-mod-axis2c.install --- axis2c-1.6.0/debian/libapache2-mod-axis2c.install 2012-03-21 15:48:33.000000000 +0000 +++ axis2c-1.6.0/debian/libapache2-mod-axis2c.install 2013-07-09 16:38:54.000000000 +0100 @@ -1,3 +1,2 @@ debian/tmp/usr/lib/axis2/modules usr/lib/apache2/ debian/tmp/usr/lib/axis2/lib/libmod_axis2.so* usr/lib/apache2/modules -debian/axis2c.* etc/apache2/mods-available diff -Nru axis2c-1.6.0/debian/patches/conn-rec-remote-ip.patch axis2c-1.6.0/debian/patches/conn-rec-remote-ip.patch --- axis2c-1.6.0/debian/patches/conn-rec-remote-ip.patch 1970-01-01 01:00:00.000000000 +0100 +++ axis2c-1.6.0/debian/patches/conn-rec-remote-ip.patch 2013-07-09 13:27:22.000000000 +0100 @@ -0,0 +1,32 @@ +Description: Handle conn_rec->remote_ip split in Apache 2.4 +Author: Colin Watson <cjwat...@debian.org> +Forwarded: no +Last-Update: 2013-07-09 + +Index: b/src/core/transport/http/server/apache2/apache2_worker.c +=================================================================== +--- a/src/core/transport/http/server/apache2/apache2_worker.c ++++ b/src/core/transport/http/server/apache2/apache2_worker.c +@@ -39,6 +39,13 @@ + + #define READ_SIZE 2048 + ++#if AP_SERVER_MAJORVERSION_NUMBER > 2 || \ ++ (AP_SERVER_MAJORVERSION_NUMBER == 2 && AP_SERVER_MINORVERSION_NUMBER >= 4) ++#define CLIENT_IP(conn) ((conn)->client_ip) ++#else ++#define CLIENT_IP(conn) ((conn)->remote_ip) ++#endif ++ + static axis2_status_t apache2_worker_send_mtom_message( + request_rec *request, + const axutil_env_t * env, +@@ -280,7 +287,7 @@ + AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "Client HTTP version %s", + http_version); + +- peer_ip = request->connection->remote_ip; ++ peer_ip = CLIENT_IP(request->connection); + + if (peer_ip) + { diff -Nru axis2c-1.6.0/debian/patches/series axis2c-1.6.0/debian/patches/series --- axis2c-1.6.0/debian/patches/series 2012-05-23 16:45:37.000000000 +0100 +++ axis2c-1.6.0/debian/patches/series 2013-07-09 13:24:30.000000000 +0100 @@ -8,3 +8,4 @@ 09-fix-gcc-4.6.patch 10-use-chdir-retval.diff ftbfs-gcc-4.7.diff +conn-rec-remote-ip.patch diff -Nru axis2c-1.6.0/debian/rules axis2c-1.6.0/debian/rules --- axis2c-1.6.0/debian/rules 2012-03-21 15:48:33.000000000 +0000 +++ axis2c-1.6.0/debian/rules 2013-07-09 16:38:37.000000000 +0100 @@ -24,6 +24,9 @@ sed -i -e "s/\(libdir=.*\)axis2/\1apache2/g" -e "/dependency_libs/ s/'.*'/''/" debian/$(cdbs_curpkg)/usr/lib/apache2/modules/addressing/libaxis2_mod_addr.la sed -i -e "s/\(libdir=.*\)axis2/\1apache2/g" -e "/dependency_libs/ s/'.*'/''/" debian/$(cdbs_curpkg)/usr/lib/apache2/modules/logging/libaxis2_mod_log.la +binary-post-install/libapache2-mod-axis2c:: + dh_apache2 -p$(cdbs_curpkg) + clean:: find . -name Makefile -print0 | xargs -0 rm || /bin/true chmod 755 tools/codegen/javatool/WSDL2C.sh 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
