diff -Nru libapache2-mod-auth-openid-0.7/debian/README.Debian libapache2-mod-auth-openid-0.7/debian/README.Debian --- libapache2-mod-auth-openid-0.7/debian/README.Debian 2012-05-31 19:32:22.000000000 +0000 +++ libapache2-mod-auth-openid-0.7/debian/README.Debian 2013-07-10 03:46:55.000000000 +0000 @@ -3,7 +3,7 @@ You can enable this module using a2enmod: - # a2enmod authopenid + # a2enmod auth_openid Following is excerpt from Webpage: -------------------- @@ -89,4 +89,4 @@ -------------------- - -- NIIBE Yutaka , Thu, 25 Feb 2010 13:09:10 +0900 + -- NIIBE Yutaka , Wed, 10 Jul 2013 03:46:55 +0000 diff -Nru libapache2-mod-auth-openid-0.7/debian/auth_openid.load libapache2-mod-auth-openid-0.7/debian/auth_openid.load --- libapache2-mod-auth-openid-0.7/debian/auth_openid.load 1970-01-01 00:00:00.000000000 +0000 +++ libapache2-mod-auth-openid-0.7/debian/auth_openid.load 2013-07-10 04:57:56.000000000 +0000 @@ -0,0 +1 @@ +LoadModule auth_openid_module /usr/lib/apache2/modules/mod_auth_openid.so diff -Nru libapache2-mod-auth-openid-0.7/debian/authopenid.load libapache2-mod-auth-openid-0.7/debian/authopenid.load --- libapache2-mod-auth-openid-0.7/debian/authopenid.load 2008-07-07 03:04:46.000000000 +0000 +++ libapache2-mod-auth-openid-0.7/debian/authopenid.load 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -LoadModule authopenid_module /usr/lib/apache2/modules/mod_auth_openid.so diff -Nru libapache2-mod-auth-openid-0.7/debian/changelog libapache2-mod-auth-openid-0.7/debian/changelog --- libapache2-mod-auth-openid-0.7/debian/changelog 2012-05-31 21:35:06.000000000 +0000 +++ libapache2-mod-auth-openid-0.7/debian/changelog 2013-07-10 05:18:00.000000000 +0000 @@ -1,3 +1,23 @@ +libapache2-mod-auth-openid (0.7-1) unstable; urgency=low + + * debian/rules (override_dh_auto_clean, override_dh_auto_configure): New + for config.{sub,guess}. + * debian/compat: Require 9. + * debian/control (Build-Depends): Require debhelper >=9, apache2-dev, + and apache2-bin. + (Standards-Version): Confirms to 3.9.4. + * debian/patches/01-destdir-0.5.diff: Rename + * debian/patches/02-apache2.4_log-0.7.diff: New (Closes: #666860). + * debian/patches/03-apache2.4_auth-0.7.diff: New. + * debian/patches/04-module_name-0.7.diff: New. + * debian/patches/{05-empty_string-0.7.diff, + 06-permit_cookieless-0.7.diff}: New. Thanks to Daniel Kahn Gillmor. + * debian/auth_openid.load: Fix module name. + * debian/README.Debian: Follow the fix of module name (Closes: #697858). + * Incorporate NMUs. + + -- NIIBE Yutaka Tue, 09 Jul 2013 07:51:14 +0000 + libapache2-mod-auth-openid (0.7-0.1) unstable; urgency=low * NMU diff -Nru libapache2-mod-auth-openid-0.7/debian/clean libapache2-mod-auth-openid-0.7/debian/clean --- libapache2-mod-auth-openid-0.7/debian/clean 2012-03-02 16:01:20.000000000 +0000 +++ libapache2-mod-auth-openid-0.7/debian/clean 2013-07-10 03:53:37.000000000 +0000 @@ -1 +1 @@ -mod_auth_openid.la +src/mod_auth_openid.la diff -Nru libapache2-mod-auth-openid-0.7/debian/compat libapache2-mod-auth-openid-0.7/debian/compat --- libapache2-mod-auth-openid-0.7/debian/compat 2010-02-25 03:58:38.000000000 +0000 +++ libapache2-mod-auth-openid-0.7/debian/compat 2013-07-09 07:51:41.000000000 +0000 @@ -1 +1 @@ -7 +9 diff -Nru libapache2-mod-auth-openid-0.7/debian/control libapache2-mod-auth-openid-0.7/debian/control --- libapache2-mod-auth-openid-0.7/debian/control 2012-05-31 19:27:40.000000000 +0000 +++ libapache2-mod-auth-openid-0.7/debian/control 2013-07-10 03:34:52.000000000 +0000 @@ -2,13 +2,13 @@ Section: httpd Priority: extra Maintainer: NIIBE Yutaka -Build-Depends: quilt (>= 0.46-7~), debhelper (>= 7), autotools-dev, apache2-threaded-dev (>= 2.2.3), apache2-mpm-worker (>= 2.2.3), libopkele-dev (>= 2.0.4), pkg-config, automake, libtool -Standards-Version: 3.9.3 +Build-Depends: quilt (>= 0.46-7~), debhelper (>= 9), autotools-dev, apache2-dev , libopkele-dev (>= 2.0.4), pkg-config, automake, libtool, apache2-bin +Standards-Version: 3.9.4 Homepage: http://findingscience.com/mod_auth_openid/ Package: libapache2-mod-auth-openid Architecture: any -Depends: apache2.2-common (>= 2.2.3-2), ${shlibs:Depends}, ${misc:Depends} +Depends: apache2-api-20120211, ${shlibs:Depends}, ${misc:Depends} Description: OpenID authentication module for Apache2 mod_auth_openid is an authentication module for Apache2. It handles the functions of an OpenID consumer as specified in the diff -Nru libapache2-mod-auth-openid-0.7/debian/install libapache2-mod-auth-openid-0.7/debian/install --- libapache2-mod-auth-openid-0.7/debian/install 2012-03-02 16:05:53.000000000 +0000 +++ libapache2-mod-auth-openid-0.7/debian/install 2013-07-10 04:31:35.000000000 +0000 @@ -1 +1 @@ -debian/authopenid.load etc/apache2/mods-available +debian/auth_openid.load etc/apache2/mods-available diff -Nru libapache2-mod-auth-openid-0.7/debian/patches/01-destdir-0.5.diff libapache2-mod-auth-openid-0.7/debian/patches/01-destdir-0.5.diff --- libapache2-mod-auth-openid-0.7/debian/patches/01-destdir-0.5.diff 1970-01-01 00:00:00.000000000 +0000 +++ libapache2-mod-auth-openid-0.7/debian/patches/01-destdir-0.5.diff 2013-07-10 01:16:50.000000000 +0000 @@ -0,0 +1,40 @@ +Description: Add DESTDIR support +Author: NIIBE Yutaka +Last-Update: 2013-07-10 + +Index: libapache2-mod-auth-openid-0.7/src/Makefile.am +=================================================================== +--- libapache2-mod-auth-openid-0.7.orig/src/Makefile.am 2013-07-10 01:16:00.737026201 +0000 ++++ libapache2-mod-auth-openid-0.7/src/Makefile.am 2013-07-10 01:16:00.681026226 +0000 +@@ -25,8 +25,9 @@ + endif + + install-exec-local: +- ${APXS} -i -a -n 'authopenid' mod_auth_openid.la ++ ${APXS} -i -S LIBEXECDIR=${DESTDIR}/usr/lib/apache2/modules -n 'authopenid' mod_auth_openid.la + + mod_auth_openid.la: libmodauthopenid.la +- ${APXS} -c -o $@ $< ${APACHE_CFLAGS} ${OPKELE_CFLAGS} ${OPKELE_LIBS} \ +- ${SQLITE3_CFLAGS} ${PCRE_LIBS} ${CURL_LIBS} ++ ${APXS} -c -o $@ $< -lstdc++ \ ++ ${APACHE_CFLAGS} ${OPKELE_CFLAGS} ${OPKELE_LIBS} \ ++ ${SQLITE3_CFLAGS} ${PCRE_LIBS} ${CURL_LIBS} -lapr-1 -laprutil-1 +Index: libapache2-mod-auth-openid-0.7/src/Makefile.in +=================================================================== +--- libapache2-mod-auth-openid-0.7.orig/src/Makefile.in 2013-07-10 01:16:00.737026201 +0000 ++++ libapache2-mod-auth-openid-0.7/src/Makefile.in 2013-07-10 01:16:00.685026223 +0000 +@@ -565,11 +565,11 @@ + + + install-exec-local: +- ${APXS} -i -a -n 'authopenid' mod_auth_openid.la ++ ${APXS} -i -S LIBEXECDIR=${DESTDIR}/usr/lib/apache2/modules -n 'authopenid' mod_auth_openid.la + + mod_auth_openid.la: libmodauthopenid.la +- ${APXS} -c -o $@ $< ${APACHE_CFLAGS} ${OPKELE_CFLAGS} ${OPKELE_LIBS} \ +- ${SQLITE3_CFLAGS} ${PCRE_LIBS} ${CURL_LIBS} ++ ${APXS} -c -o $@ $< -lstdc++ ${APACHE_CFLAGS} ${OPKELE_CFLAGS} ${OPKELE_LIBS} \ ++ ${SQLITE3_CFLAGS} ${PCRE_LIBS} ${CURL_LIBS} -lapr-1 -laprutil-1 + + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. diff -Nru libapache2-mod-auth-openid-0.7/debian/patches/02-apache2.4_log-0.7.diff libapache2-mod-auth-openid-0.7/debian/patches/02-apache2.4_log-0.7.diff --- libapache2-mod-auth-openid-0.7/debian/patches/02-apache2.4_log-0.7.diff 1970-01-01 00:00:00.000000000 +0000 +++ libapache2-mod-auth-openid-0.7/debian/patches/02-apache2.4_log-0.7.diff 2013-07-10 04:29:15.000000000 +0000 @@ -0,0 +1,20 @@ +Description: Add APLOG_USE_MODULE for Apache 2.4 + This fix is wrong and being overriden by 04-module_name-0.7.diff. +Author: upstream +Last-Update: 2013-07-10 + +Index: libapache2-mod-auth-openid-0.7/src/mod_auth_openid.h +=================================================================== +--- libapache2-mod-auth-openid-0.7.orig/src/mod_auth_openid.h 2013-07-10 02:55:59.787667569 +0000 ++++ libapache2-mod-auth-openid-0.7/src/mod_auth_openid.h 2013-07-10 02:55:59.731667574 +0000 +@@ -42,6 +42,10 @@ + #include "apr_general.h" + #include "apr_time.h" + ++#ifdef APLOG_USE_MODULE ++APLOG_USE_MODULE(authopenid_module); ++#endif ++ + /* other general lib includes */ + #include + #include diff -Nru libapache2-mod-auth-openid-0.7/debian/patches/03-apache2.4_auth-0.7.diff libapache2-mod-auth-openid-0.7/debian/patches/03-apache2.4_auth-0.7.diff --- libapache2-mod-auth-openid-0.7/debian/patches/03-apache2.4_auth-0.7.diff 1970-01-01 00:00:00.000000000 +0000 +++ libapache2-mod-auth-openid-0.7/debian/patches/03-apache2.4_auth-0.7.diff 2013-07-10 03:16:32.000000000 +0000 @@ -0,0 +1,127 @@ +Description: Follow Apache 2.4 API for authentication and authorization +Author: NIIBE Yutaka +Last-Update: 2013-07-10 + +Index: libapache2-mod-auth-openid-0.7/src/mod_auth_openid.cpp +=================================================================== +--- libapache2-mod-auth-openid-0.7.orig/src/mod_auth_openid.cpp 2013-07-10 03:09:44.000000000 +0000 ++++ libapache2-mod-auth-openid-0.7/src/mod_auth_openid.cpp 2013-07-10 03:16:25.891664117 +0000 +@@ -571,7 +571,7 @@ + + // if we're not enabled for this location/dir, decline doing anything + const char *current_auth = ap_auth_type(r); +- if (!current_auth || strcasecmp(current_auth, "openid")) ++ if (!current_auth || strcasecmp(current_auth, "OpenID")) + return DECLINED; + + // make a record of our being called +@@ -608,51 +608,59 @@ + } + } + +-static int mod_authopenid_check_user_access(request_rec *r) { +- modauthopenid_config *s_cfg; +- s_cfg = (modauthopenid_config *) ap_get_module_config(r->per_dir_config, &authopenid_module); +- char *user = r->user; +- int m = r->method_number; +- int required_user = 0; +- register int x; ++static authz_status ++mod_authopenid_validuser_check_authorization(request_rec *r, ++ const char *require_args, ++ const void *parsed_require_line) ++{ ++ if (!r->user) ++ return AUTHZ_DENIED_NO_USER; ++ ++ return AUTHZ_GRANTED; ++} ++ ++static authz_status ++mod_authopenid_user_check_authorization(request_rec *r, ++ const char *require_args, ++ const void *parsed_require_line) ++{ + const char *t, *w; +- const apr_array_header_t *reqs_arr = ap_requires(r); +- require_line *reqs; + +- if (!reqs_arr) +- return DECLINED; +- +- reqs = (require_line *)reqs_arr->elts; +- for (x = 0; x < reqs_arr->nelts; x++) { +- if (!(reqs[x].method_mask & (AP_METHOD_BIT << m))) +- continue; +- +- t = reqs[x].requirement; +- w = ap_getword_white(r->pool, &t); +- if (!strcasecmp(w, "valid-user")) +- return OK; +- +- if (!strcasecmp(w, "user")) { +- required_user = 1; +- while (t[0]) { +- w = ap_getword_conf(r->pool, &t); +- if (!strcmp(user, w)) +- return OK; +- } +- } +- } ++ if (!r->user) ++ return AUTHZ_DENIED_NO_USER; + +- if (!required_user) +- return DECLINED; ++ t = require_args; ++ while ((w = ap_getword_conf(r->pool, &t)) && w[0]) ++ if (!strcmp(r->user, w)) ++ return AUTHZ_GRANTED; + +- APERR(r, "Access to %s failed: user '%s' invalid", r->uri, user); +- ap_note_auth_failure(r); +- return HTTP_UNAUTHORIZED; ++ APERR(r, "Access to %s failed: user '%s' invalid", r->uri, r->user); ++ return AUTHZ_DENIED; + } + ++static const authz_provider mod_authopenid_authz_user_provider = ++{ ++ &mod_authopenid_user_check_authorization, ++ NULL, ++}; ++ ++static const authz_provider mod_authopenid_authz_validuser_provider = ++{ ++ &mod_authopenid_validuser_check_authorization, ++ NULL, ++}; ++ + static void mod_authopenid_register_hooks (apr_pool_t *p) { +- ap_hook_check_user_id(mod_authopenid_method_handler, NULL, NULL, APR_HOOK_MIDDLE); +- ap_hook_auth_checker(mod_authopenid_check_user_access, NULL, NULL, APR_HOOK_MIDDLE); ++ ap_hook_check_authn(mod_authopenid_method_handler, NULL, NULL, ++ APR_HOOK_MIDDLE, AP_AUTH_INTERNAL_PER_CONF); ++ ap_register_auth_provider(p, AUTHZ_PROVIDER_GROUP, "user", ++ AUTHN_PROVIDER_VERSION, ++ &mod_authopenid_authz_user_provider, ++ AP_AUTH_INTERNAL_PER_CONF); ++ ap_register_auth_provider(p, AUTHZ_PROVIDER_GROUP, "valid-user", ++ AUTHN_PROVIDER_VERSION, ++ &mod_authopenid_authz_validuser_provider, ++ AP_AUTH_INTERNAL_PER_CONF); + } + + //module AP_MODULE_DECLARE_DATA +Index: libapache2-mod-auth-openid-0.7/src/mod_auth_openid.h +=================================================================== +--- libapache2-mod-auth-openid-0.7.orig/src/mod_auth_openid.h 2013-07-10 03:09:48.000000000 +0000 ++++ libapache2-mod-auth-openid-0.7/src/mod_auth_openid.h 2013-07-10 03:09:48.000000000 +0000 +@@ -38,6 +38,7 @@ + #include "ap_config.h" + #include "http_log.h" + #include "mod_ssl.h" ++#include "mod_auth.h" + #include "apr.h" + #include "apr_general.h" + #include "apr_time.h" diff -Nru libapache2-mod-auth-openid-0.7/debian/patches/04-module_name-0.7.diff libapache2-mod-auth-openid-0.7/debian/patches/04-module_name-0.7.diff --- libapache2-mod-auth-openid-0.7/debian/patches/04-module_name-0.7.diff 1970-01-01 00:00:00.000000000 +0000 +++ libapache2-mod-auth-openid-0.7/debian/patches/04-module_name-0.7.diff 2013-07-10 04:28:00.000000000 +0000 @@ -0,0 +1,56 @@ +Description: Module name change to match path name of .so +Author: NIIBE Yutaka +Last-Update: 2013-07-10 + +Index: libapache2-mod-auth-openid-0.7/src/mod_auth_openid.cpp +=================================================================== +--- libapache2-mod-auth-openid-0.7.orig/src/mod_auth_openid.cpp 2013-07-10 04:14:59.379797198 +0000 ++++ libapache2-mod-auth-openid-0.7/src/mod_auth_openid.cpp 2013-07-10 04:24:14.084197661 +0000 +@@ -26,12 +26,13 @@ + */ + + #include "mod_auth_openid.h" ++static int * const aplog_module_index = &(auth_openid_module.module_index); + + #define APDEBUG(r, msg, ...) ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, msg, __VA_ARGS__); + #define APWARN(r, msg, ...) ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, msg, __VA_ARGS__); + #define APERR(r, msg, ...) ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, msg, __VA_ARGS__); + +-extern "C" module AP_MODULE_DECLARE_DATA authopenid_module; ++extern "C" module AP_MODULE_DECLARE_DATA auth_openid_module; + + typedef struct { + const char *db_location; +@@ -567,7 +568,7 @@ + + static int mod_authopenid_method_handler(request_rec *r) { + modauthopenid_config *s_cfg; +- s_cfg = (modauthopenid_config *) ap_get_module_config(r->per_dir_config, &authopenid_module); ++ s_cfg = (modauthopenid_config *) ap_get_module_config(r->per_dir_config, &auth_openid_module); + + // if we're not enabled for this location/dir, decline doing anything + const char *current_auth = ap_auth_type(r); +@@ -664,7 +665,7 @@ + } + + //module AP_MODULE_DECLARE_DATA +-module AP_MODULE_DECLARE_DATA authopenid_module = { ++module AP_MODULE_DECLARE_DATA auth_openid_module = { + STANDARD20_MODULE_STUFF, + create_modauthopenid_config, + NULL, // config merge function - default is to override +Index: libapache2-mod-auth-openid-0.7/src/mod_auth_openid.h +=================================================================== +--- libapache2-mod-auth-openid-0.7.orig/src/mod_auth_openid.h 2013-07-10 04:14:59.379797198 +0000 ++++ libapache2-mod-auth-openid-0.7/src/mod_auth_openid.h 2013-07-10 04:22:50.336141216 +0000 +@@ -43,9 +43,7 @@ + #include "apr_general.h" + #include "apr_time.h" + +-#ifdef APLOG_USE_MODULE +-APLOG_USE_MODULE(authopenid_module); +-#endif ++extern "C" module AP_MODULE_DECLARE_DATA auth_openid_module; + + /* other general lib includes */ + #include diff -Nru libapache2-mod-auth-openid-0.7/debian/patches/05-empty_string-0.7.diff libapache2-mod-auth-openid-0.7/debian/patches/05-empty_string-0.7.diff --- libapache2-mod-auth-openid-0.7/debian/patches/05-empty_string-0.7.diff 1970-01-01 00:00:00.000000000 +0000 +++ libapache2-mod-auth-openid-0.7/debian/patches/05-empty_string-0.7.diff 2013-07-10 05:16:29.000000000 +0000 @@ -0,0 +1,26 @@ +Description: Fix empty string bug of str_replace. +Author: upstream +Forwarded: https://lists.butterfat.net/pipermail/mod-auth-openid/2012-October/000121.html +Bug-Debian: http://bugs.debian.org/690113 +Reviewed-By: NIIBE Yutaka +Last-Update: 2013-07-10 + +Index: libapache2-mod-auth-openid-0.7/src/moid_utils.cpp +=================================================================== +--- libapache2-mod-auth-openid-0.7.orig/src/moid_utils.cpp 2013-07-10 05:09:17.908566043 +0000 ++++ libapache2-mod-auth-openid-0.7/src/moid_utils.cpp 2013-07-10 05:09:17.856566040 +0000 +@@ -96,9 +96,11 @@ + string str_replace(string needle, string replacement, string haystack) { + vector v = explode(haystack, needle); + string r = ""; +- for(vector::size_type i=0; i < v.size()-1; i++) +- r += v[i] + replacement; +- r += v[v.size()-1]; ++ if(v.size()) { ++ for(vector::size_type i=0; i < v.size()-1; i++) ++ r += v[i] + replacement; ++ r += v[v.size()-1]; ++ } + return r; + }; + diff -Nru libapache2-mod-auth-openid-0.7/debian/patches/06-permit_cookieless-0.7.diff libapache2-mod-auth-openid-0.7/debian/patches/06-permit_cookieless-0.7.diff --- libapache2-mod-auth-openid-0.7/debian/patches/06-permit_cookieless-0.7.diff 1970-01-01 00:00:00.000000000 +0000 +++ libapache2-mod-auth-openid-0.7/debian/patches/06-permit_cookieless-0.7.diff 2013-07-10 05:16:44.000000000 +0000 @@ -0,0 +1,29 @@ +Description: Permit cookieless authentication. +Author: upstream +Forwarded: https://lists.butterfat.net/pipermail/mod-auth-openid/2012-October/000122.html +Bug-Debian: http://bugs.debian.org/693923 +Reviewed-By: NIIBE Yutaka +Last-Update: 2013-07-10 + +Index: libapache2-mod-auth-openid-0.7/src/mod_auth_openid.cpp +=================================================================== +--- libapache2-mod-auth-openid-0.7.orig/src/mod_auth_openid.cpp 2013-07-10 05:16:41.700605967 +0000 ++++ libapache2-mod-auth-openid-0.7/src/mod_auth_openid.cpp 2013-07-10 05:16:41.644605963 +0000 +@@ -320,7 +320,7 @@ + }; + + static bool has_valid_session(request_rec *r, modauthopenid_config *s_cfg) { +- // test for valid session - if so, return DECLINED ++ // test for valid session + std::string session_id = ""; + modauthopenid::get_session_id(r, std::string(s_cfg->cookie_name), session_id); + if(session_id != "" && s_cfg->use_cookie) { +@@ -558,7 +558,7 @@ + // if we're not setting cookie - don't redirect, just show page + APDEBUG(r, "Setting REMOTE_USER to %s", remote_user.c_str()); + r->user = apr_pstrdup(r->pool, remote_user.c_str()); +- return DECLINED; ++ return OK; + } catch(opkele::exception &e) { + APERR(r, "Error in authentication: %s", e.what()); + consumer.close(); diff -Nru libapache2-mod-auth-openid-0.7/debian/patches/destdir-0.5.diff libapache2-mod-auth-openid-0.7/debian/patches/destdir-0.5.diff --- libapache2-mod-auth-openid-0.7/debian/patches/destdir-0.5.diff 2012-05-31 21:34:34.000000000 +0000 +++ libapache2-mod-auth-openid-0.7/debian/patches/destdir-0.5.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,37 +0,0 @@ -Description: Upstream changes by gniibe - This patch has been created by gniibe for 0.3 and applied to 0.5 too. -Author: NIIBE Yutaka -Last-Update: 2010-02-25 - ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -25,8 +25,9 @@ - endif - - install-exec-local: -- ${APXS} -i -a -n 'authopenid' mod_auth_openid.la -+ ${APXS} -i -S LIBEXECDIR=${DESTDIR}/usr/lib/apache2/modules -n 'authopenid' mod_auth_openid.la - - mod_auth_openid.la: libmodauthopenid.la -- ${APXS} -c -o $@ $< ${APACHE_CFLAGS} ${OPKELE_CFLAGS} ${OPKELE_LIBS} \ -- ${SQLITE3_CFLAGS} ${PCRE_LIBS} ${CURL_LIBS} -+ ${APXS} -c -o $@ $< -lstdc++ \ -+ ${APACHE_CFLAGS} ${OPKELE_CFLAGS} ${OPKELE_LIBS} \ -+ ${SQLITE3_CFLAGS} ${PCRE_LIBS} ${CURL_LIBS} -lapr-1 -laprutil-1 ---- a/src/Makefile.in -+++ b/src/Makefile.in -@@ -565,11 +565,11 @@ - - - install-exec-local: -- ${APXS} -i -a -n 'authopenid' mod_auth_openid.la -+ ${APXS} -i -S LIBEXECDIR=${DESTDIR}/usr/lib/apache2/modules -n 'authopenid' mod_auth_openid.la - - mod_auth_openid.la: libmodauthopenid.la -- ${APXS} -c -o $@ $< ${APACHE_CFLAGS} ${OPKELE_CFLAGS} ${OPKELE_LIBS} \ -- ${SQLITE3_CFLAGS} ${PCRE_LIBS} ${CURL_LIBS} -+ ${APXS} -c -o $@ $< -lstdc++ ${APACHE_CFLAGS} ${OPKELE_CFLAGS} ${OPKELE_LIBS} \ -+ ${SQLITE3_CFLAGS} ${PCRE_LIBS} ${CURL_LIBS} -lapr-1 -laprutil-1 - - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. diff -Nru libapache2-mod-auth-openid-0.7/debian/patches/series libapache2-mod-auth-openid-0.7/debian/patches/series --- libapache2-mod-auth-openid-0.7/debian/patches/series 2012-03-02 15:52:18.000000000 +0000 +++ libapache2-mod-auth-openid-0.7/debian/patches/series 2013-07-10 05:16:39.000000000 +0000 @@ -1 +1,6 @@ -destdir-0.5.diff +01-destdir-0.5.diff +02-apache2.4_log-0.7.diff +03-apache2.4_auth-0.7.diff +04-module_name-0.7.diff +05-empty_string-0.7.diff +06-permit_cookieless-0.7.diff diff -Nru libapache2-mod-auth-openid-0.7/debian/rules libapache2-mod-auth-openid-0.7/debian/rules --- libapache2-mod-auth-openid-0.7/debian/rules 2012-05-31 19:52:03.000000000 +0000 +++ libapache2-mod-auth-openid-0.7/debian/rules 2013-07-10 02:58:45.000000000 +0000 @@ -1,7 +1,16 @@ #!/usr/bin/make -f -# -*- makefile -*- +# -*- makefile-gmake -*- # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 %: - dh --with quilt $@ + dh $@ --with quilt + +override_dh_auto_clean: + dh_auto_clean + rm -f config.sub config.guess + +override_dh_auto_configure: + ln -sf /usr/share/misc/config.sub . + ln -sf /usr/share/misc/config.guess . + dh_auto_configure