diff options
-rw-r--r-- | www/ap2-auth-mellon/Makefile | 4 | ||||
-rw-r--r-- | www/ap2-auth-mellon/distinfo | 9 | ||||
-rw-r--r-- | www/ap2-auth-mellon/patches/patch-ab | 49 |
3 files changed, 6 insertions, 56 deletions
diff --git a/www/ap2-auth-mellon/Makefile b/www/ap2-auth-mellon/Makefile index 1beea0009e4..fae5f20e8e6 100644 --- a/www/ap2-auth-mellon/Makefile +++ b/www/ap2-auth-mellon/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.3 2009/06/06 10:27:30 manu Exp $ +# $NetBSD: Makefile,v 1.4 2009/06/15 19:45:14 manu Exp $ # PKGNAME= ${APACHE_PKG_PREFIX}-${DISTNAME:S/mod_//:S/_/-/} -DISTNAME= mod_auth_mellon-0.2.1 +DISTNAME= mod_auth_mellon-0.2.2 CATEGORIES= www security MASTER_SITES= http://modmellon.googlecode.com/files/ diff --git a/www/ap2-auth-mellon/distinfo b/www/ap2-auth-mellon/distinfo index dce082de806..132a42af3d4 100644 --- a/www/ap2-auth-mellon/distinfo +++ b/www/ap2-auth-mellon/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.2 2009/06/06 10:27:30 manu Exp $ +$NetBSD: distinfo,v 1.3 2009/06/15 19:45:14 manu Exp $ -SHA1 (mod_auth_mellon-0.2.1.tar.gz) = 5d11289aa4c44d235f4fd599cf215b46a37efb09 -RMD160 (mod_auth_mellon-0.2.1.tar.gz) = 6f6e62abb3e5ff4b251e5bd5363aab22b817efe2 -Size (mod_auth_mellon-0.2.1.tar.gz) = 81619 bytes -SHA1 (patch-ab) = 65c0706feb5e9875d1eaf55a15f3b47cc59d4842 +SHA1 (mod_auth_mellon-0.2.2.tar.gz) = 7a6078a126d4c924484a59cff0215099e73cbbc4 +RMD160 (mod_auth_mellon-0.2.2.tar.gz) = 042461aabaa72afada0bcde3b9acb9fe00706fc1 +Size (mod_auth_mellon-0.2.2.tar.gz) = 82930 bytes diff --git a/www/ap2-auth-mellon/patches/patch-ab b/www/ap2-auth-mellon/patches/patch-ab deleted file mode 100644 index 37cb40f736c..00000000000 --- a/www/ap2-auth-mellon/patches/patch-ab +++ /dev/null @@ -1,49 +0,0 @@ -$NetBSD: patch-ab,v 1.1 2009/06/06 10:27:31 manu Exp $ -diff -r -U4 auth_mellon_handler.c.orig auth_mellon_handler.c ---- auth_mellon_handler.c.orig 2009-06-05 22:07:17.000000000 +0200 -+++ auth_mellon_handler.c 2009-06-06 11:59:24.000000000 +0200 -@@ -82,9 +82,29 @@ - am_dir_cfg_rec *cfg = am_get_dir_cfg(r); - char *url = am_get_endpoint_url(r); - char *cert = ""; - -- if (cfg->sp_cert_file) -+ if (cfg->sp_cert_file) { -+ char *sp_cert_file; -+ char *cp; -+ const char *begin = "-----BEGIN CERTIFICATE-----"; -+ const char *end = "-----END CERTIFICATE-----"; -+ -+ /* -+ * Try to remove leading and trailing garbage, as it can -+ * wreak havoc XML parser if it contains [<>&] -+ */ -+ sp_cert_file = apr_pstrdup(p, cfg->sp_cert_file); -+ -+ cp = strstr(sp_cert_file, begin); -+ if (cp != NULL) -+ sp_cert_file = cp; -+ -+ cp = strstr(sp_cert_file, end); -+ if (cp != NULL) -+ *(cp + strlen(end)) = '\0'; -+ -+ - cert = apr_psprintf(p, - "<KeyDescriptor use=\"signing\">" - "<ds:KeyInfo xmlns:ds=\"http://www.w3.org/2000/09/xmldsig#\">" - "<ds:X509Data>" -@@ -98,10 +118,11 @@ - "<ds:X509Certificate>%s</ds:X509Certificate>" - "</ds:X509Data>" - "</ds:KeyInfo>" - "</KeyDescriptor>", -- cfg->sp_cert_file, -- cfg->sp_cert_file); -+ sp_cert_file, -+ sp_cert_file); -+ } - - return apr_psprintf(p, - "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>" - "<EntityDescriptor " |