Fix pkglint complainsdiff -r1.36 -r1.37 pkgsrc/www/ap2-auth-mellon/Makefile
(manu)
@@ -1,21 +1,21 @@ | @@ -1,21 +1,21 @@ | |||
1 | # $NetBSD: Makefile,v 1.36 2016/10/18 15:13:41 manu Exp $ | 1 | # $NetBSD: Makefile,v 1.37 2016/10/27 12:53:13 manu Exp $ | |
2 | # | 2 | # | |
3 | 3 | |||
4 | DISTNAME= mod_auth_mellon-0.12.0 | 4 | DISTNAME= mod_auth_mellon-0.12.0 | |
5 | PKGNAME= ${APACHE_PKG_PREFIX}-${DISTNAME:S/mod_//:S/_/-/g} | 5 | PKGNAME= ${APACHE_PKG_PREFIX}-${DISTNAME:S/mod_//:S/_/-/g} | |
6 | PKGREVISION= 3 | 6 | PKGREVISION= 3 | |
7 | CATEGORIES= www security | 7 | CATEGORIES= www security | |
8 | MASTER_SITES= https://github.com/UNINETT/mod_auth_mellon/releases/download/v${DISTNAME:C/.*-//}/ | 8 | MASTER_SITES= ${MASTER_SITE_GITHUB:=UNINETT/}/mod_auth_mellon/releases/download/v${DISTNAME:C/.*-//}/ | |
9 | 9 | |||
10 | MAINTAINER= manu@NetBSD.org | 10 | MAINTAINER= manu@NetBSD.org | |
11 | HOMEPAGE= https://github.com/UNINETT/mod_auth_mellon | 11 | HOMEPAGE= https://github.com/UNINETT/mod_auth_mellon | |
12 | COMMENT= SAML 2.0 authentication for Apache | 12 | COMMENT= SAML 2.0 authentication for Apache | |
13 | LICENSE= gnu-gpl-v2 # or later | 13 | LICENSE= gnu-gpl-v2 # or later | |
14 | 14 | |||
15 | GNU_CONFIGURE= YES | 15 | GNU_CONFIGURE= YES | |
16 | USE_LIBTOOL= YES | 16 | USE_LIBTOOL= YES | |
17 | USE_TOOLS+= pkg-config | 17 | USE_TOOLS+= pkg-config | |
18 | 18 | |||
19 | APACHE_MODULE= YES | 19 | APACHE_MODULE= YES | |
20 | PKG_APACHE_ACCEPTED= apache22 apache24 | 20 | PKG_APACHE_ACCEPTED= apache22 apache24 | |
21 | .include "../../mk/apache.mk" | 21 | .include "../../mk/apache.mk" |
@@ -1,7 +1,7 @@ | @@ -1,7 +1,7 @@ | |||
1 | $NetBSD: distinfo,v 1.16 2016/10/18 15:13:41 manu Exp $ | 1 | $NetBSD: distinfo,v 1.17 2016/10/27 12:53:13 manu Exp $ | |
2 | 2 | |||
3 | SHA1 (mod_auth_mellon-0.12.0.tar.gz) = 3d5cd4137154a7c848d8f3121e6497b88dc5f23e | 3 | SHA1 (mod_auth_mellon-0.12.0.tar.gz) = 3d5cd4137154a7c848d8f3121e6497b88dc5f23e | |
4 | RMD160 (mod_auth_mellon-0.12.0.tar.gz) = 7ef278de6f4d0f0669d99c113706dc63d64f6fbc | 4 | RMD160 (mod_auth_mellon-0.12.0.tar.gz) = 7ef278de6f4d0f0669d99c113706dc63d64f6fbc | |
5 | Size (mod_auth_mellon-0.12.0.tar.gz) = 136754 bytes | 5 | Size (mod_auth_mellon-0.12.0.tar.gz) = 136754 bytes | |
6 | SHA1 (patch-0274) = e523b560f8220352090db686a32a5f81f6579fda | 6 | SHA1 (patch-0274) = b5dfdd4b944c3d2c3bf47cfb97869aa57c32ea68 | |
7 | SHA1 (patch-0347) = d14d5a20d05fae3962e5168a0b23ab55835452ca | 7 | SHA1 (patch-0347) = d14d5a20d05fae3962e5168a0b23ab55835452ca |
@@ -1,13 +1,15 @@ | @@ -1,13 +1,15 @@ | |||
1 | $NetBSD: patch-0274,v 1.2 2016/10/27 12:53:13 manu Exp $ | |||
2 | ||||
1 | From fe0eb56e29f89513b2dcf3c222fa3a2e8a09383f Mon Sep 17 00:00:00 2001 | 3 | From fe0eb56e29f89513b2dcf3c222fa3a2e8a09383f Mon Sep 17 00:00:00 2001 | |
2 | From: Olav Morken <olav.morken@uninett.no> | 4 | From: Olav Morken <olav.morken@uninett.no> | |
3 | Date: Mon, 14 Mar 2016 09:47:48 +0100 | 5 | Date: Mon, 14 Mar 2016 09:47:48 +0100 | |
4 | Subject: [PATCH 274/274] Return 500 Internal Server Error if probe discovery | 6 | Subject: [PATCH 274/274] Return 500 Internal Server Error if probe discovery | |
5 | fails. | 7 | fails. | |
6 | 8 | |||
7 | If we don't, we can end up sending an authentication request to an IdP | 9 | If we don't, we can end up sending an authentication request to an IdP | |
8 | that is not in the MellonProbeDiscoveryIdP list, which is probably not | 10 | that is not in the MellonProbeDiscoveryIdP list, which is probably not | |
9 | what the user wants. | 11 | what the user wants. | |
10 | 12 | |||
11 | Patch by Emmanuel Dreyfus. | 13 | Patch by Emmanuel Dreyfus. | |
12 | --- | 14 | --- | |
13 | README | 3 +++ | 15 | README | 3 +++ |
@@ -1,13 +1,15 @@ | @@ -1,13 +1,15 @@ | |||
1 | $NetBSD: patch-0347,v 1.2 2016/10/27 12:53:13 manu Exp $ | |||
2 | ||||
1 | From 78fe67641918016a6108e325be351156999109c9 Mon Sep 17 00:00:00 2001 | 3 | From 78fe67641918016a6108e325be351156999109c9 Mon Sep 17 00:00:00 2001 | |
2 | From: Emmanuel Dreyfus <manu@netbsd.org> | 4 | From: Emmanuel Dreyfus <manu@netbsd.org> | |
3 | Date: Tue, 18 Oct 2016 01:42:53 +0200 | 5 | Date: Tue, 18 Oct 2016 01:42:53 +0200 | |
4 | Subject: [PATCH] Do not redirect unauthenticated AJAX request to the IdP | 6 | Subject: [PATCH] Do not redirect unauthenticated AJAX request to the IdP | |
5 | 7 | |||
6 | When MellonEnable is "auth" and we get an unauthenticated AJAX | 8 | When MellonEnable is "auth" and we get an unauthenticated AJAX | |
7 | request (identified by the X-Request-With: XMLHttpRequest HTTP | 9 | request (identified by the X-Request-With: XMLHttpRequest HTTP | |
8 | header), fail with HTTP code 403 Forbidden instead of redirecting | 10 | header), fail with HTTP code 403 Forbidden instead of redirecting | |
9 | to the IdP. This saves resources, as the client has no opportunity | 11 | to the IdP. This saves resources, as the client has no opportunity | |
10 | to interract with the user to complete authentification. | 12 | to interract with the user to complete authentification. | |
11 | --- | 13 | --- | |
12 | README | 6 ++++++ | 14 | README | 6 ++++++ | |
13 | auth_mellon_handler.c | 14 ++++++++++++++ | 15 | auth_mellon_handler.c | 14 ++++++++++++++ |