Control: tag -1 patch pending Dear maintainer,
I've prepared an NMU for libapache-mod-fastcgi (versioned as 2.4.7~0910052141-1.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Apologies for the rush; but I gather that the release team is trying to get Apache 2.4 into testing this weekend, and there's been no sign of activity on this bug. Regards, -- Colin Watson [cjwat...@debian.org]
reverted: --- libapache-mod-fastcgi-2.4.7~0910052141/debian/fastcgi.conf2 +++ libapache-mod-fastcgi-2.4.7~0910052141.orig/debian/fastcgi.conf2 @@ -1,5 +0,0 @@ -<IfModule mod_fastcgi.c> - AddHandler fastcgi-script .fcgi - #FastCgiWrapper /usr/lib/apache2/suexec - FastCgiIpcDir /var/lib/apache2/fastcgi -</IfModule> diff -u libapache-mod-fastcgi-2.4.7~0910052141/debian/rules libapache-mod-fastcgi-2.4.7~0910052141/debian/rules --- libapache-mod-fastcgi-2.4.7~0910052141/debian/rules +++ libapache-mod-fastcgi-2.4.7~0910052141/debian/rules @@ -25,14 +25,7 @@ $(DEB_MAKE_INVOKE) -C $(DEB_BUILDDIR_$(cdbs_curpkg)) $(AP2_MAKE_DEFS) -f Makefile.AP2 install/libapache2-mod-fastcgi:: - mkdir -p $(DEB_DESTDIR_$(cdbs_curpkg))/usr/lib/apache2/modules - install -m 644 $(DEB_BUILDDIR_$(cdbs_curpkg))/.libs/mod_fastcgi.so \ - $(DEB_DESTDIR_$(cdbs_curpkg))/usr/lib/apache2/modules - mkdir -p $(DEB_DESTDIR_$(cdbs_curpkg))/etc/apache2/mods-available - install -m 644 debian/fastcgi.load \ - $(DEB_DESTDIR_$(cdbs_curpkg))/etc/apache2/mods-available - install -m 644 debian/fastcgi.conf2 \ - $(DEB_DESTDIR_$(cdbs_curpkg))/etc/apache2/mods-available/fastcgi.conf + dh_apache2 --conditional=fcgid_not_enabled mkdir -p $(DEB_DESTDIR_$(cdbs_curpkg))/var/lib/apache2/fastcgi chown www-data:www-data $(DEB_DESTDIR_$(cdbs_curpkg))/var/lib/apache2/fastcgi chmod 755 $(DEB_DESTDIR_$(cdbs_curpkg))/var/lib/apache2/fastcgi diff -u libapache-mod-fastcgi-2.4.7~0910052141/debian/libapache2-mod-fastcgi.postinst libapache-mod-fastcgi-2.4.7~0910052141/debian/libapache2-mod-fastcgi.postinst --- libapache-mod-fastcgi-2.4.7~0910052141/debian/libapache2-mod-fastcgi.postinst +++ libapache-mod-fastcgi-2.4.7~0910052141/debian/libapache2-mod-fastcgi.postinst @@ -5,40 +5,9 @@ set -e -# summary of how this script can be called: -# * <postinst> `configure' <most-recently-configured-version> -# * <old-postinst> `abort-upgrade' <new version> -# * <conflictor's-postinst> `abort-remove' `in-favour' <package> -# <new-version> -# * <deconfigured's-postinst> `abort-deconfigure' `in-favour' -# <failed-install-package> <version> `removing' -# <conflicting-package> <version> -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package -# -# quoting from the policy: -# Any necessary prompting should almost always be confined to the -# post-installation script, and should be protected with a conditional -# so that unnecessary prompting doesn't happen if a package's -# installation fails and the `postinst' is called with `abort-upgrade', -# `abort-remove' or `abort-deconfigure'. - -case "$1" in - configure) - test ! -e /etc/apache2/mods-enabled/fcgid.load \ - -a ! -e /etc/apache2/mods-enabled/fastcgi.load \ - && a2enmod fastcgi - ;; - - abort-upgrade|abort-remove|abort-deconfigure) - - ;; - - *) - echo "postinst called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac +fcgid_not_enabled () { + ! a2query -q -m fcgid +} # dh_installdeb will replace this with shell code automatically # generated by other debhelper scripts. @@ -49,2 +17,0 @@ - - diff -u libapache-mod-fastcgi-2.4.7~0910052141/debian/control libapache-mod-fastcgi-2.4.7~0910052141/debian/control --- libapache-mod-fastcgi-2.4.7~0910052141/debian/control +++ libapache-mod-fastcgi-2.4.7~0910052141/debian/control @@ -3,13 +3,13 @@ Priority: optional Maintainer: Tatsuki Sugiura <s...@nemui.org> Standards-Version: 3.9.1 -Build-Depends: debhelper (>> 5.0.0), cdbs, apache2-threaded-dev (>= 2.2.4) | apache2-prefork-dev (>= 2.2.4), dpatch (>= 2.0.0), libtool, libapr1-dev, pkg-config +Build-Depends: debhelper (>> 5.0.0), cdbs, dh-apache2, apache2-dev (>= 2.2.4), dpatch (>= 2.0.0), libtool, libapr1-dev, pkg-config Uploaders: Taku YASUI <t...@debian.or.jp> Homepage: http://www.fastcgi.com/ Package: libapache2-mod-fastcgi Architecture: any -Depends: apache2.2-common (>= 2.2.4), ${shlibs:Depends}, ${misc:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Description: Apache 2 FastCGI module for long-running CGI scripts This is a FastCGI module for the Apache 2.x web server. FastCGI is an open standard for communicating between a web server and a long-running diff -u libapache-mod-fastcgi-2.4.7~0910052141/debian/changelog libapache-mod-fastcgi-2.4.7~0910052141/debian/changelog --- libapache-mod-fastcgi-2.4.7~0910052141/debian/changelog +++ libapache-mod-fastcgi-2.4.7~0910052141/debian/changelog @@ -1,3 +1,11 @@ +libapache-mod-fastcgi (2.4.7~0910052141-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Port to Apache 2.4 (closes: #666839). + * Drop some more vestiges of Apache 1 support. + + -- Colin Watson <cjwat...@debian.org> Thu, 11 Jul 2013 14:10:25 +0100 + libapache-mod-fastcgi (2.4.7~0910052141-1) unstable; urgency=low * New upstream release diff -u libapache-mod-fastcgi-2.4.7~0910052141/debian/libapache2-mod-fastcgi.prerm libapache-mod-fastcgi-2.4.7~0910052141/debian/libapache2-mod-fastcgi.prerm --- libapache-mod-fastcgi-2.4.7~0910052141/debian/libapache2-mod-fastcgi.prerm +++ libapache-mod-fastcgi-2.4.7~0910052141/debian/libapache2-mod-fastcgi.prerm @@ -1,37 +1,14 @@ #! /bin/sh -# postrm script for libapache-mod-fastcgi +# prerm script for libapache-mod-fastcgi # # see: dh_installdeb(1) set -e -# summary of how this script can be called: -# * <postrm> `remove' -# * <postrm> `purge' -# * <old-postrm> `upgrade' <new-version> -# * <new-postrm> `failed-upgrade' <old-version> -# * <new-postrm> `abort-install' -# * <new-postrm> `abort-install' <old-version> -# * <new-postrm> `abort-upgrade' <old-version> -# * <disappearer's-postrm> `disappear' <r>overwrit>r> <new-version> -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - - -case "$1" in - remove) - test -e /etc/apache2/mods-enabled/fastcgi.load && a2dismod fastcgi - ;; - purge|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) - - - ;; - - *) - echo "postrm called with unknown argument \`$1'" >&2 - exit 1 - -esac +fcgid_not_enabled () { + # no-op check in prerm + : +} # dh_installdeb will replace this with shell code automatically # generated by other debhelper scripts. diff -u libapache-mod-fastcgi-2.4.7~0910052141/debian/patches/00list libapache-mod-fastcgi-2.4.7~0910052141/debian/patches/00list --- libapache-mod-fastcgi-2.4.7~0910052141/debian/patches/00list +++ libapache-mod-fastcgi-2.4.7~0910052141/debian/patches/00list @@ -4,0 +5 @@ +apache2.4-compat.dpatch only in patch2: unchanged: --- libapache-mod-fastcgi-2.4.7~0910052141.orig/debian/libapache2-mod-fastcgi.apache2 +++ libapache-mod-fastcgi-2.4.7~0910052141/debian/libapache2-mod-fastcgi.apache2 @@ -0,0 +1,3 @@ +mod build-tmp/20/.libs/mod_fastcgi.so +mod debian/fastcgi.load +mod debian/fastcgi.conf only in patch2: unchanged: --- libapache-mod-fastcgi-2.4.7~0910052141.orig/debian/libapache2-mod-fastcgi.postrm +++ libapache-mod-fastcgi-2.4.7~0910052141/debian/libapache2-mod-fastcgi.postrm @@ -0,0 +1,18 @@ +#! /bin/sh +# postrm script for libapache-mod-fastcgi +# +# see: dh_installdeb(1) + +set -e + +fcgid_not_enabled () { + # no-op check in postrm + : +} + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 only in patch2: unchanged: --- libapache-mod-fastcgi-2.4.7~0910052141.orig/debian/fastcgi.conf +++ libapache-mod-fastcgi-2.4.7~0910052141/debian/fastcgi.conf @@ -0,0 +1,5 @@ +<IfModule mod_fastcgi.c> + AddHandler fastcgi-script .fcgi + #FastCgiWrapper /usr/lib/apache2/suexec + FastCgiIpcDir /var/lib/apache2/fastcgi +</IfModule> only in patch2: unchanged: --- libapache-mod-fastcgi-2.4.7~0910052141.orig/debian/patches/apache2.4-compat.dpatch +++ libapache-mod-fastcgi-2.4.7~0910052141/debian/patches/apache2.4-compat.dpatch @@ -0,0 +1,118 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## apache2.4-compat.dpatch by Colin Watson <cjwat...@ubuntu.com> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Make compatible with Apache 2.4. + +@DPATCH@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' libapache-mod-fastcgi-2.4.7~0910052141~/fcgi.h libapache-mod-fastcgi-2.4.7~0910052141/fcgi.h +--- libapache-mod-fastcgi-2.4.7~0910052141~/fcgi.h 2008-09-22 11:36:06.000000000 +0100 ++++ libapache-mod-fastcgi-2.4.7~0910052141/fcgi.h 2013-07-11 14:03:48.000000000 +0100 +@@ -57,10 +57,14 @@ + #define XtOffsetOf APR_OFFSETOF + #define ap_select select + +-#define ap_user_id unixd_config.user_id +-#define ap_group_id unixd_config.group_id +-#define ap_user_name unixd_config.user_name +-#define ap_suexec_enabled unixd_config.suexec_enabled ++#if MODULE_MAGIC_NUMBER < 20081212 ++#define ap_unixd_config unixd_config ++#endif ++ ++#define ap_user_id ap_unixd_config.user_id ++#define ap_group_id ap_unixd_config.group_id ++#define ap_user_name ap_unixd_config.user_name ++#define ap_suexec_enabled ap_unixd_config.suexec_enabled + + #ifndef S_ISDIR + #define S_ISDIR(m) (((m)&(S_IFMT)) == (S_IFDIR)) +@@ -354,42 +358,42 @@ + #ifdef APACHE2 + + #ifdef WIN32 +-#define FCGI_LOG_EMERG __FILE__,__LINE__,APLOG_EMERG,APR_FROM_OS_ERROR(GetLastError()) +-#define FCGI_LOG_ALERT __FILE__,__LINE__,APLOG_ALERT,APR_FROM_OS_ERROR(GetLastError()) +-#define FCGI_LOG_CRIT __FILE__,__LINE__,APLOG_CRIT,APR_FROM_OS_ERROR(GetLastError()) +-#define FCGI_LOG_ERR __FILE__,__LINE__,APLOG_ERR,APR_FROM_OS_ERROR(GetLastError()) +-#define FCGI_LOG_WARN __FILE__,__LINE__,APLOG_WARNING,APR_FROM_OS_ERROR(GetLastError()) +-#define FCGI_LOG_NOTICE __FILE__,__LINE__,APLOG_NOTICE,APR_FROM_OS_ERROR(GetLastError()) +-#define FCGI_LOG_INFO __FILE__,__LINE__,APLOG_INFO,APR_FROM_OS_ERROR(GetLastError()) +-#define FCGI_LOG_DEBUG __FILE__,__LINE__,APLOG_DEBUG,APR_FROM_OS_ERROR(GetLastError()) ++#define FCGI_LOG_EMERG APLOG_MARK,APLOG_EMERG,APR_FROM_OS_ERROR(GetLastError()) ++#define FCGI_LOG_ALERT APLOG_MARK,APLOG_ALERT,APR_FROM_OS_ERROR(GetLastError()) ++#define FCGI_LOG_CRIT APLOG_MARK,APLOG_CRIT,APR_FROM_OS_ERROR(GetLastError()) ++#define FCGI_LOG_ERR APLOG_MARK,APLOG_ERR,APR_FROM_OS_ERROR(GetLastError()) ++#define FCGI_LOG_WARN APLOG_MARK,APLOG_WARNING,APR_FROM_OS_ERROR(GetLastError()) ++#define FCGI_LOG_NOTICE APLOG_MARK,APLOG_NOTICE,APR_FROM_OS_ERROR(GetLastError()) ++#define FCGI_LOG_INFO APLOG_MARK,APLOG_INFO,APR_FROM_OS_ERROR(GetLastError()) ++#define FCGI_LOG_DEBUG APLOG_MARK,APLOG_DEBUG,APR_FROM_OS_ERROR(GetLastError()) + #else /* !WIN32 */ +-#define FCGI_LOG_EMERG __FILE__,__LINE__,APLOG_EMERG,APR_FROM_OS_ERROR(errno) +-#define FCGI_LOG_ALERT __FILE__,__LINE__,APLOG_ALERT,APR_FROM_OS_ERROR(errno) +-#define FCGI_LOG_CRIT __FILE__,__LINE__,APLOG_CRIT,APR_FROM_OS_ERROR(errno) +-#define FCGI_LOG_ERR __FILE__,__LINE__,APLOG_ERR,APR_FROM_OS_ERROR(errno) +-#define FCGI_LOG_WARN __FILE__,__LINE__,APLOG_WARNING,APR_FROM_OS_ERROR(errno) +-#define FCGI_LOG_NOTICE __FILE__,__LINE__,APLOG_NOTICE,APR_FROM_OS_ERROR(errno) +-#define FCGI_LOG_INFO __FILE__,__LINE__,APLOG_INFO,APR_FROM_OS_ERROR(errno) +-#define FCGI_LOG_DEBUG __FILE__,__LINE__,APLOG_DEBUG,APR_FROM_OS_ERROR(errno) ++#define FCGI_LOG_EMERG APLOG_MARK,APLOG_EMERG,APR_FROM_OS_ERROR(errno) ++#define FCGI_LOG_ALERT APLOG_MARK,APLOG_ALERT,APR_FROM_OS_ERROR(errno) ++#define FCGI_LOG_CRIT APLOG_MARK,APLOG_CRIT,APR_FROM_OS_ERROR(errno) ++#define FCGI_LOG_ERR APLOG_MARK,APLOG_ERR,APR_FROM_OS_ERROR(errno) ++#define FCGI_LOG_WARN APLOG_MARK,APLOG_WARNING,APR_FROM_OS_ERROR(errno) ++#define FCGI_LOG_NOTICE APLOG_MARK,APLOG_NOTICE,APR_FROM_OS_ERROR(errno) ++#define FCGI_LOG_INFO APLOG_MARK,APLOG_INFO,APR_FROM_OS_ERROR(errno) ++#define FCGI_LOG_DEBUG APLOG_MARK,APLOG_DEBUG,APR_FROM_OS_ERROR(errno) + #endif + +-#define FCGI_LOG_EMERG_ERRNO __FILE__,__LINE__,APLOG_EMERG,APR_FROM_OS_ERROR(errno) +-#define FCGI_LOG_ALERT_ERRNO __FILE__,__LINE__,APLOG_ALERT,APR_FROM_OS_ERROR(errno) +-#define FCGI_LOG_CRIT_ERRNO __FILE__,__LINE__,APLOG_CRIT,APR_FROM_OS_ERROR(errno) +-#define FCGI_LOG_ERR_ERRNO __FILE__,__LINE__,APLOG_ERR,APR_FROM_OS_ERROR(errno) +-#define FCGI_LOG_WARN_ERRNO __FILE__,__LINE__,APLOG_WARNING,APR_FROM_OS_ERROR(errno) +-#define FCGI_LOG_NOTICE_ERRNO __FILE__,__LINE__,APLOG_NOTICE,APR_FROM_OS_ERROR(errno) +-#define FCGI_LOG_INFO_ERRNO __FILE__,__LINE__,APLOG_INFO,APR_FROM_OS_ERROR(errno) +-#define FCGI_LOG_DEBUG_ERRNO __FILE__,__LINE__,APLOG_DEBUG,APR_FROM_OS_ERROR(errno) ++#define FCGI_LOG_EMERG_ERRNO APLOG_MARK,APLOG_EMERG,APR_FROM_OS_ERROR(errno) ++#define FCGI_LOG_ALERT_ERRNO APLOG_MARK,APLOG_ALERT,APR_FROM_OS_ERROR(errno) ++#define FCGI_LOG_CRIT_ERRNO APLOG_MARK,APLOG_CRIT,APR_FROM_OS_ERROR(errno) ++#define FCGI_LOG_ERR_ERRNO APLOG_MARK,APLOG_ERR,APR_FROM_OS_ERROR(errno) ++#define FCGI_LOG_WARN_ERRNO APLOG_MARK,APLOG_WARNING,APR_FROM_OS_ERROR(errno) ++#define FCGI_LOG_NOTICE_ERRNO APLOG_MARK,APLOG_NOTICE,APR_FROM_OS_ERROR(errno) ++#define FCGI_LOG_INFO_ERRNO APLOG_MARK,APLOG_INFO,APR_FROM_OS_ERROR(errno) ++#define FCGI_LOG_DEBUG_ERRNO APLOG_MARK,APLOG_DEBUG,APR_FROM_OS_ERROR(errno) + +-#define FCGI_LOG_EMERG_NOERRNO __FILE__,__LINE__,APLOG_EMERG,0 +-#define FCGI_LOG_ALERT_NOERRNO __FILE__,__LINE__,APLOG_ALERT,0 +-#define FCGI_LOG_CRIT_NOERRNO __FILE__,__LINE__,APLOG_CRIT,0 +-#define FCGI_LOG_ERR_NOERRNO __FILE__,__LINE__,APLOG_ERR,0 +-#define FCGI_LOG_WARN_NOERRNO __FILE__,__LINE__,APLOG_WARNING,0 +-#define FCGI_LOG_NOTICE_NOERRNO __FILE__,__LINE__,APLOG_NOTICE,0 +-#define FCGI_LOG_INFO_NOERRNO __FILE__,__LINE__,APLOG_INFO,0 +-#define FCGI_LOG_DEBUG_NOERRNO __FILE__,__LINE__,APLOG_DEBUG,0 ++#define FCGI_LOG_EMERG_NOERRNO APLOG_MARK,APLOG_EMERG,0 ++#define FCGI_LOG_ALERT_NOERRNO APLOG_MARK,APLOG_ALERT,0 ++#define FCGI_LOG_CRIT_NOERRNO APLOG_MARK,APLOG_CRIT,0 ++#define FCGI_LOG_ERR_NOERRNO APLOG_MARK,APLOG_ERR,0 ++#define FCGI_LOG_WARN_NOERRNO APLOG_MARK,APLOG_WARNING,0 ++#define FCGI_LOG_NOTICE_NOERRNO APLOG_MARK,APLOG_NOTICE,0 ++#define FCGI_LOG_INFO_NOERRNO APLOG_MARK,APLOG_INFO,0 ++#define FCGI_LOG_DEBUG_NOERRNO APLOG_MARK,APLOG_DEBUG,0 + + #else /* !APACHE2 */ + +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' libapache-mod-fastcgi-2.4.7~0910052141~/mod_fastcgi.c libapache-mod-fastcgi-2.4.7~0910052141/mod_fastcgi.c +--- libapache-mod-fastcgi-2.4.7~0910052141~/mod_fastcgi.c 2008-11-09 14:31:03.000000000 +0000 ++++ libapache-mod-fastcgi-2.4.7~0910052141/mod_fastcgi.c 2013-07-11 14:04:08.842780018 +0100 +@@ -153,6 +153,10 @@ + u_int dynamic_idle_timeout = FCGI_DEFAULT_IDLE_TIMEOUT; + int dynamicMinServerLife = FCGI_DEFAULT_MIN_SERVER_LIFE; + ++#ifdef APLOG_USE_MODULE ++APLOG_USE_MODULE(fastcgi); ++#endif ++ + /******************************************************************************* + * Construct a message and write it to the pm_pipe. + */
