[shibboleth-sp2] 09/12: Remove two upstreamed patches, update the rest

[Ferenc Wágner]

This is an automated email from the git hooks/post-receive script.

wferi-guest pushed a commit to branch debian/master
in repository shibboleth-sp2.

commit 469e9f20fb251ee238b14c29085efcad3aee8175
Author: Ferenc Wágner <wferi at niif.hu>
Date:   Fri Mar 11 13:30:49 2016 +0100

    Remove two upstreamed patches, update the rest
---
 debian/patches/Avoid-libtool-silent-flag.patch      |  2 +-
 debian/patches/Fix-typo-acccepted-accepted.patch    | 21 ---------------------
 debian/patches/Fix-typo-paremeter-parameter.patch   | 21 ---------------------
 .../patches/Remove-WSTrust-schema-references.patch  |  2 +-
 ...or-libsystemd-instead-of-libsystemd-daemon.patch |  2 +-
 debian/patches/series                               |  2 --
 6 files changed, 3 insertions(+), 47 deletions(-)

diff --git a/debian/patches/Avoid-libtool-silent-flag.patch b/debian/patches/Avoid-libtool-silent-flag.patch
index ed6ce0f..ae70f8c 100644
--- a/debian/patches/Avoid-libtool-silent-flag.patch
+++ b/debian/patches/Avoid-libtool-silent-flag.patch
@@ -10,7 +10,7 @@ to the libtool flags in configure.ac.
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/configure.ac b/configure.ac
-index 44598d5..08037d6 100644
+index d9b563e..e498307 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -1376,6 +1376,7 @@ if test -n "$APXS24_CC" && test "$APXS24_CC" != "$CC" ; then
diff --git a/debian/patches/Fix-typo-acccepted-accepted.patch b/debian/patches/Fix-typo-acccepted-accepted.patch
deleted file mode 100644
index 0b42d74..0000000
--- a/debian/patches/Fix-typo-acccepted-accepted.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: =?utf-8?q?Ferenc_W=C3=A1gner?= <wferi at niif.hu>
-Date: Sun, 24 Jan 2016 19:00:57 +0100
-Subject: Fix typo: acccepted -> accepted
-
----
- apache/mod_shib.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/apache/mod_shib.cpp b/apache/mod_shib.cpp
-index 5652713..9bd6c18 100644
---- a/apache/mod_shib.cpp
-+++ b/apache/mod_shib.cpp
-@@ -1168,7 +1168,7 @@ bool htAccessControl::checkAttribute(const SPRequest& request, const Attribute*
-             auto_arrayptr<XMLCh> trans(fromUTF8(v->c_str()));
-             if (re->matches(trans.get())) {
-                 if (request.isPriorityEnabled(SPRequest::SPDebug))
--                    request.log(SPRequest::SPDebug, string("htaccess: expecting regexp ") + toMatch + ", got " + *v + ": acccepted");
-+                    request.log(SPRequest::SPDebug, string("htaccess: expecting regexp ") + toMatch + ", got " + *v + ": accepted");
-                 return true;
-             }
-         }
diff --git a/debian/patches/Fix-typo-paremeter-parameter.patch b/debian/patches/Fix-typo-paremeter-parameter.patch
deleted file mode 100644
index 83f4381..0000000
--- a/debian/patches/Fix-typo-paremeter-parameter.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: =?utf-8?q?Ferenc_W=C3=A1gner?= <wferi at niif.hu>
-Date: Sun, 24 Jan 2016 19:01:52 +0100
-Subject: Fix typo: paremeter -> parameter
-
----
- adfs/adfs.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/adfs/adfs.cpp b/adfs/adfs.cpp
-index 7e6d20d..c74912f 100644
---- a/adfs/adfs.cpp
-+++ b/adfs/adfs.cpp
-@@ -1030,7 +1030,7 @@ pair<bool,long> ADFSLogout::run(SPRequest& request, bool isHandler) const
-         if (!strcmp(param, "wsignin1.0"))
-             return m_login.run(request, isHandler);
-         else if (strcmp(param, "wsignout1.0") && strcmp(param, "wsignoutcleanup1.0"))
--            throw FatalProfileException("Unsupported WS-Federation action paremeter ($1).", params(1, param));
-+            throw FatalProfileException("Unsupported WS-Federation action parameter ($1).", params(1, param));
-     }
-     else if (strcmp(request.getMethod(),"GET") || !request.getParameter("notifying"))
-         throw FatalProfileException("Unsupported request to ADFS protocol endpoint.");
diff --git a/debian/patches/Remove-WSTrust-schema-references.patch b/debian/patches/Remove-WSTrust-schema-references.patch
index 6e4645f..391237a 100644
--- a/debian/patches/Remove-WSTrust-schema-references.patch
+++ b/debian/patches/Remove-WSTrust-schema-references.patch
@@ -11,7 +11,7 @@ Remove the references to it in the build system and schema catalog.
  2 files changed, 3 insertions(+), 2 deletions(-)
 
 diff --git a/schemas/Makefile.am b/schemas/Makefile.am
-index f8c246f..4ed2cd8 100644
+index 05bbace..c9ef7b7 100644
 --- a/schemas/Makefile.am
 +++ b/schemas/Makefile.am
 @@ -13,8 +13,7 @@ schemafiles = \
diff --git a/debian/patches/Search-for-libsystemd-instead-of-libsystemd-daemon.patch b/debian/patches/Search-for-libsystemd-instead-of-libsystemd-daemon.patch
index 3fa693a..dae6ca1 100644
--- a/debian/patches/Search-for-libsystemd-instead-of-libsystemd-daemon.patch
+++ b/debian/patches/Search-for-libsystemd-instead-of-libsystemd-daemon.patch
@@ -9,7 +9,7 @@ version 209.
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 08037d6..c4d79dd 100644
+index e498307..611cf2e 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -446,12 +446,12 @@ AC_MSG_CHECKING(whether to build with systemd)
diff --git a/debian/patches/series b/debian/patches/series
index 88e21c1..1143b4d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,7 +3,5 @@ keygen-improvements-for-Debian.patch
 Avoid-libtool-silent-flag.patch
 Remove-WSTrust-schema-references.patch
 Debianize-the-systemd-service-file-of-shibd.patch
-Fix-typo-acccepted-accepted.patch
-Fix-typo-paremeter-parameter.patch
 Search-for-libsystemd-instead-of-libsystemd-daemon.patch
 Add-Documentation-key-to-shibd-service-file.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-shibboleth/shibboleth-sp2.git