control: tags -1 +patch Hi,
Just adding libtool-bin would solve this FTBFS. I'll upload it with other fixes to delayed-10 queue. -- Regards, Hideki Yamane henrich @ debian.or.jp/org http://wiki.debian.org/HidekiYamane
diff -Nru 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 2015-07-25 11:43:16.000000000 +0900 +++ libapache-mod-fastcgi-2.4.7~0910052141/debian/changelog 2015-07-25 11:39:20.000000000 +0900 @@ -1,3 +1,18 @@ +libapache-mod-fastcgi (2.4.7~0910052141-1.2) unstable; urgency=medium + + * Non-maintainer upload. + * debian/control + - add libtool-bin to solve FTBFS (Closes: #793189) + - drop dpatch + * add debian/source/fomrat as 3.0 (quilt) + * debian/patches + - convert dpatches to quilt and remove it. + * debian/rules + - drop dpatch + * add missing debian/compat file + + -- Hideki Yamane <henr...@debian.org> Sat, 25 Jul 2015 11:34:35 +0900 + libapache-mod-fastcgi (2.4.7~0910052141-1.1) unstable; urgency=low * Non-maintainer upload. diff -Nru libapache-mod-fastcgi-2.4.7~0910052141/debian/compat libapache-mod-fastcgi-2.4.7~0910052141/debian/compat --- libapache-mod-fastcgi-2.4.7~0910052141/debian/compat 1970-01-01 09:00:00.000000000 +0900 +++ libapache-mod-fastcgi-2.4.7~0910052141/debian/compat 2015-07-25 11:39:01.000000000 +0900 @@ -0,0 +1 @@ +5 diff -Nru 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 2015-07-25 11:43:16.000000000 +0900 +++ libapache-mod-fastcgi-2.4.7~0910052141/debian/control 2015-07-25 11:37:03.000000000 +0900 @@ -3,7 +3,7 @@ Priority: optional Maintainer: Tatsuki Sugiura <s...@nemui.org> Standards-Version: 3.9.1 -Build-Depends: debhelper (>> 5.0.0), cdbs, dh-apache2, apache2-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), libtool, libapr1-dev, pkg-config, libtool-bin, Uploaders: Taku YASUI <t...@debian.or.jp> Homepage: http://www.fastcgi.com/ diff -Nru 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 2015-07-25 11:43:16.000000000 +0900 +++ libapache-mod-fastcgi-2.4.7~0910052141/debian/patches/00list 1970-01-01 09:00:00.000000000 +0900 @@ -1,5 +0,0 @@ -#apache2-segv-on-load.dpatch # fixed -#apache2.2-authn.dpatch # fixed -#apache2.2-compat.dpatch # fixed -doc-misc-typo-fix.dpatch -apache2.4-compat.dpatch diff -Nru libapache-mod-fastcgi-2.4.7~0910052141/debian/patches/apache2-segv-on-load.dpatch libapache-mod-fastcgi-2.4.7~0910052141/debian/patches/apache2-segv-on-load.dpatch --- libapache-mod-fastcgi-2.4.7~0910052141/debian/patches/apache2-segv-on-load.dpatch 2015-07-25 11:43:16.000000000 +0900 +++ libapache-mod-fastcgi-2.4.7~0910052141/debian/patches/apache2-segv-on-load.dpatch 1970-01-01 09:00:00.000000000 +0900 @@ -1,30 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## apache2-segv-on-load.dpatch by <s...@nemui.org> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: See the URL for details. -## DP: http://www.fastcgi.com/archives/fastcgi-developers/2005-April/003673.html - -@DPATCH@ -diff -urNad libapache-mod-fastcgi~/mod_fastcgi.c libapache-mod-fastcgi/mod_fastcgi.c ---- libapache-mod-fastcgi~/mod_fastcgi.c 2005-08-06 14:09:11.000000000 +0900 -+++ libapache-mod-fastcgi/mod_fastcgi.c 2006-10-06 20:52:46.368480801 +0900 -@@ -2850,10 +2850,15 @@ - - get_request_identity(r, &uid, &gid); - -- if (fcgi_util_fs_get_by_id(r->filename, uid, gid)) -+ /* Only try this if r->filename is not NULL, -+ * otherwise Apache 2 crashes with SIGSEGV... */ -+ if (r->filename) - { -- r->handler = FASTCGI_HANDLER_NAME; -- return OK; -+ if (fcgi_util_fs_get_by_id(r->filename, uid, gid)) -+ { -+ r->handler = FASTCGI_HANDLER_NAME; -+ return OK; -+ } - } - - return DECLINED; diff -Nru libapache-mod-fastcgi-2.4.7~0910052141/debian/patches/apache2.2-authn.dpatch libapache-mod-fastcgi-2.4.7~0910052141/debian/patches/apache2.2-authn.dpatch --- libapache-mod-fastcgi-2.4.7~0910052141/debian/patches/apache2.2-authn.dpatch 2015-07-25 11:43:16.000000000 +0900 +++ libapache-mod-fastcgi-2.4.7~0910052141/debian/patches/apache2.2-authn.dpatch 1970-01-01 09:00:00.000000000 +0900 @@ -1,114 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## apache2.2-authn.dpatch by <s...@nemui.org> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: mod_fastcgi works as AUTHN provider for apache 2.2 -## - -@DPATCH@ -diff -urNad libapache-mod-fastcgi~/mod_fastcgi.c libapache-mod-fastcgi/mod_fastcgi.c ---- libapache-mod-fastcgi~/mod_fastcgi.c 2006-10-06 21:55:39.000000000 +0900 -+++ libapache-mod-fastcgi/mod_fastcgi.c 2007-08-25 16:51:25.000000000 +0900 -@@ -82,6 +82,10 @@ - - #include "unixd.h" - -+#ifdef APACHE22 -+#include "mod_auth.h" -+#endif -+ - #endif - #endif - -@@ -2657,10 +2661,15 @@ - r->status_line = NULL; - } - -+#ifdef APACHE22 -+static authn_status check_user_authentication(request_rec *r, const char *user, const char *password) -+{ -+#else /* !APACHE22 */ - static int check_user_authentication(request_rec *r) - { -- int res, authenticated = 0; - const char *password; -+#endif -+ int res, authenticated = 0; - fcgi_request *fr; - const fcgi_dir_config * const dir_config = - (const fcgi_dir_config *)ap_get_module_config(r->per_dir_config, &fastcgi_module); -@@ -2668,9 +2677,11 @@ - if (dir_config->authenticator == NULL) - return DECLINED; - -- /* Get the user password */ -+#ifndef APACHE22 -+ /* Get the user password */ - if ((res = ap_get_basic_auth_pw(r, &password)) != OK) - return res; -+#endif /* APACHE22 */ - - res = create_fcgi_request(r, dir_config->authenticator, &fr); - if (res) -@@ -2704,6 +2715,20 @@ - goto AuthenticationFailed; - } - -+#ifdef APACHE22 -+ if (authenticated) -+ return AUTH_GRANTED; -+ -+AuthenticationFailed: -+ /* @@@ Probably should support custom_responses */ -+ ap_note_basic_auth_failure(r); -+ ap_log_rerror(FCGI_LOG_ERR_NOERRNO, r, -+ "FastCGI: authentication failed for user \"%s\": %s", -+ r->user, r->uri); -+ -+ return (res == OK) ? AUTH_DENIED : AUTH_GRANTED; -+ -+#else /* !APACHE22 */ - if (authenticated) - return OK; - -@@ -2722,6 +2747,7 @@ - #endif - - return (res == OK) ? HTTP_UNAUTHORIZED : res; -+#endif /* !APACHE22 */ - } - - static int check_user_authorization(request_rec *r) -@@ -2913,16 +2939,31 @@ - - #ifdef APACHE2 - -+#ifdef APACHE22 -+static const authn_provider authn_fastcgi_provider = -+{ -+ &check_user_authentication, -+ NULL, -+}; -+#endif /* APACHE22 */ -+ -+ - static void register_hooks(apr_pool_t * p) - { - /* ap_hook_pre_config(x_pre_config, NULL, NULL, APR_HOOK_MIDDLE); */ - ap_hook_post_config(init_module, NULL, NULL, APR_HOOK_MIDDLE); - ap_hook_child_init(fcgi_child_init, NULL, NULL, APR_HOOK_MIDDLE); - ap_hook_handler(content_handler, NULL, NULL, APR_HOOK_MIDDLE); -- ap_hook_check_user_id(check_user_authentication, NULL, NULL, APR_HOOK_MIDDLE); - ap_hook_access_checker(check_access, NULL, NULL, APR_HOOK_MIDDLE); - ap_hook_auth_checker(check_user_authorization, NULL, NULL, APR_HOOK_MIDDLE); - ap_hook_fixups(fixups, NULL, NULL, APR_HOOK_MIDDLE); -+#ifdef APACHE22 -+ ap_register_provider(p, AUTHN_PROVIDER_GROUP, "fastcgi", "0", -+ &authn_fastcgi_provider); -+#else -+ ap_hook_check_user_id(check_user_authentication, NULL, NULL, APR_HOOK_MIDDLE); -+#endif -+ - } - - module AP_MODULE_DECLARE_DATA fastcgi_module = diff -Nru libapache-mod-fastcgi-2.4.7~0910052141/debian/patches/apache2.2-compat.dpatch libapache-mod-fastcgi-2.4.7~0910052141/debian/patches/apache2.2-compat.dpatch --- libapache-mod-fastcgi-2.4.7~0910052141/debian/patches/apache2.2-compat.dpatch 2015-07-25 11:43:16.000000000 +0900 +++ libapache-mod-fastcgi-2.4.7~0910052141/debian/patches/apache2.2-compat.dpatch 1970-01-01 09:00:00.000000000 +0900 @@ -1,60 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## apache2.2-compat.dpatch by daniel.smertnig at gmail.com -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: compat for Apache 2.2 -## downlowded from: http://www.fastcgi.com/archives/fastcgi-developers/2005-December/004060.html -## - -@DPATCH@ -diff -ruN mod_fastcgi-2.4.2/fcgi.h mod_fastcgi-2.4.2-ap22/fcgi.h ---- mod_fastcgi-2.4.2/fcgi.h 2003-02-04 00:07:37.000000000 +0100 -+++ mod_fastcgi-2.4.2-ap22/fcgi.h 2005-12-07 21:05:55.000000000 +0100 -@@ -73,6 +73,36 @@ - #define ap_reset_timeout(a) - #define ap_unblock_alarms() - -+/* starting with apache 2.2 the backward-compatibility defines for -+ * 1.3 APIs are not available anymore. Define them ourselves here. -+ */ -+#ifndef ap_copy_table -+ -+#define ap_copy_table apr_table_copy -+#define ap_cpystrn apr_cpystrn -+#define ap_destroy_pool apr_pool_destroy -+#define ap_isspace apr_isspace -+#define ap_make_array apr_array_make -+#define ap_make_table apr_table_make -+#define ap_null_cleanup apr_pool_cleanup_null -+#define ap_palloc apr_palloc -+#define ap_pcalloc apr_pcalloc -+#define ap_psprintf apr_psprintf -+#define ap_pstrcat apr_pstrcat -+#define ap_pstrdup apr_pstrdup -+#define ap_pstrndup apr_pstrndup -+#define ap_push_array apr_array_push -+#define ap_register_cleanup apr_pool_cleanup_register -+#define ap_snprintf apr_snprintf -+#define ap_table_add apr_table_add -+#define ap_table_do apr_table_do -+#define ap_table_get apr_table_get -+#define ap_table_set apr_table_set -+#define ap_table_setn apr_table_setn -+#define ap_table_unset apr_table_unset -+ -+#endif /* defined(ap_copy_table) */ -+ - #if (defined(HAVE_WRITEV) && !HAVE_WRITEV && !defined(NO_WRITEV)) || defined WIN32 - #define NO_WRITEV - #endif -diff -ruN mod_fastcgi-2.4.2/Makefile.AP2 mod_fastcgi-2.4.2-ap22/Makefile.AP2 ---- mod_fastcgi-2.4.2/Makefile.AP2 2002-07-29 03:36:34.000000000 +0200 -+++ mod_fastcgi-2.4.2-ap22/Makefile.AP2 2005-12-07 20:27:50.000000000 +0100 -@@ -20,8 +20,6 @@ - - all: local-shared-build - --install: install-modules -- - clean: - -rm -f *.o *.lo *.slo *.la diff -Nru libapache-mod-fastcgi-2.4.7~0910052141/debian/patches/apache2.4-compat.diff libapache-mod-fastcgi-2.4.7~0910052141/debian/patches/apache2.4-compat.diff --- libapache-mod-fastcgi-2.4.7~0910052141/debian/patches/apache2.4-compat.diff 1970-01-01 09:00:00.000000000 +0900 +++ libapache-mod-fastcgi-2.4.7~0910052141/debian/patches/apache2.4-compat.diff 2015-07-25 11:35:52.000000000 +0900 @@ -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. + */ diff -Nru libapache-mod-fastcgi-2.4.7~0910052141/debian/patches/apache2.4-compat.dpatch libapache-mod-fastcgi-2.4.7~0910052141/debian/patches/apache2.4-compat.dpatch --- libapache-mod-fastcgi-2.4.7~0910052141/debian/patches/apache2.4-compat.dpatch 2015-07-25 11:43:16.000000000 +0900 +++ libapache-mod-fastcgi-2.4.7~0910052141/debian/patches/apache2.4-compat.dpatch 1970-01-01 09:00:00.000000000 +0900 @@ -1,118 +0,0 @@ -#! /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. - */ diff -Nru libapache-mod-fastcgi-2.4.7~0910052141/debian/patches/doc-misc-typo-fix.diff libapache-mod-fastcgi-2.4.7~0910052141/debian/patches/doc-misc-typo-fix.diff --- libapache-mod-fastcgi-2.4.7~0910052141/debian/patches/doc-misc-typo-fix.diff 1970-01-01 09:00:00.000000000 +0900 +++ libapache-mod-fastcgi-2.4.7~0910052141/debian/patches/doc-misc-typo-fix.diff 2015-07-25 11:35:52.000000000 +0900 @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## by Troestler Christophe <christophe.troest...@umh.ac.be> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: fix for document dead link +## DP: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=288270 + +@DPATCH@ +--- libapache-mod-fastcgi-2.4.6.orig/docs/mod_fastcgi.html ++++ libapache-mod-fastcgi-2.4.6/docs/mod_fastcgi.html +@@ -67,7 +67,7 @@ + </P> + <P> + FastCGI applications under <CODE>mod_fastcgi</CODE> are defined as one of three types: static, dynamic, or +- external. They're configured using the <A HREF="#fastcgiserver">FastCgiServer</A>, <A HREF= ++ external. They're configured using the <A HREF="#FastCgiServer">FastCgiServer</A>, <A HREF= + "#FastCgiConfig">FastCgiConfig</A>, and <A HREF="#FastCgiExternalServer">FastCgiExternalServer</A> <A HREF= + "#directives">directives</A> respectively. Any URI that Apache identifies as a FastCGI application and + which hasn't been explicitly configured using a <A HREF="#fastcgiserver">FastCgiServer</A> or <A HREF= diff -Nru libapache-mod-fastcgi-2.4.7~0910052141/debian/patches/doc-misc-typo-fix.dpatch libapache-mod-fastcgi-2.4.7~0910052141/debian/patches/doc-misc-typo-fix.dpatch --- libapache-mod-fastcgi-2.4.7~0910052141/debian/patches/doc-misc-typo-fix.dpatch 2015-07-25 11:43:16.000000000 +0900 +++ libapache-mod-fastcgi-2.4.7~0910052141/debian/patches/doc-misc-typo-fix.dpatch 1970-01-01 09:00:00.000000000 +0900 @@ -1,19 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## by Troestler Christophe <christophe.troest...@umh.ac.be> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: fix for document dead link -## DP: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=288270 - -@DPATCH@ ---- libapache-mod-fastcgi-2.4.6.orig/docs/mod_fastcgi.html -+++ libapache-mod-fastcgi-2.4.6/docs/mod_fastcgi.html -@@ -67,7 +67,7 @@ - </P> - <P> - FastCGI applications under <CODE>mod_fastcgi</CODE> are defined as one of three types: static, dynamic, or -- external. They're configured using the <A HREF="#fastcgiserver">FastCgiServer</A>, <A HREF= -+ external. They're configured using the <A HREF="#FastCgiServer">FastCgiServer</A>, <A HREF= - "#FastCgiConfig">FastCgiConfig</A>, and <A HREF="#FastCgiExternalServer">FastCgiExternalServer</A> <A HREF= - "#directives">directives</A> respectively. Any URI that Apache identifies as a FastCGI application and - which hasn't been explicitly configured using a <A HREF="#fastcgiserver">FastCgiServer</A> or <A HREF= diff -Nru libapache-mod-fastcgi-2.4.7~0910052141/debian/patches/series libapache-mod-fastcgi-2.4.7~0910052141/debian/patches/series --- libapache-mod-fastcgi-2.4.7~0910052141/debian/patches/series 1970-01-01 09:00:00.000000000 +0900 +++ libapache-mod-fastcgi-2.4.7~0910052141/debian/patches/series 2015-07-25 11:35:52.000000000 +0900 @@ -0,0 +1,2 @@ +doc-misc-typo-fix.diff +apache2.4-compat.diff diff -Nru 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 2015-07-25 11:43:16.000000000 +0900 +++ libapache-mod-fastcgi-2.4.7~0910052141/debian/rules 2015-07-25 11:38:09.000000000 +0900 @@ -3,7 +3,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/langcore.mk include /usr/share/cdbs/1/class/makefile-vars.mk -include /usr/share/cdbs/1/rules/dpatch.mk APACHE2_VERSION=`dpkg -s apache2-prefork-dev apache2-threaded-dev 2>/dev/null |grep Version: | awk '{print $$2}'` diff -Nru libapache-mod-fastcgi-2.4.7~0910052141/debian/source/format libapache-mod-fastcgi-2.4.7~0910052141/debian/source/format --- libapache-mod-fastcgi-2.4.7~0910052141/debian/source/format 1970-01-01 09:00:00.000000000 +0900 +++ libapache-mod-fastcgi-2.4.7~0910052141/debian/source/format 2015-07-25 11:37:53.000000000 +0900 @@ -0,0 +1 @@ +3.0 (quilt)
