[opensaml2] 01/02: Merge branch 'debian/stretch' into debian/jessie-backports

[Etienne Dysli Metref]

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

edm-guest pushed a commit to branch debian/jessie-backports
in repository opensaml2.

commit 30342305bc704db2cad273b86a3ae1064895fb6c
Merge: 2863fc3 e43d546
Author: Etienne Dysli Metref <etienne.dysli-metref at switch.ch>
Date:   Thu Nov 16 12:46:14 2017 +0100

    Merge branch 'debian/stretch' into debian/jessie-backports
    
    Conflicts:
    - debian/gbp.conf
    
    Gbp-Dch: Ignore

 debian/changelog                                   |  7 +++
 .../Security-fix-from-V2.6.1-CPPOST-105.patch      | 53 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 61 insertions(+)

diff --cc debian/changelog
index 6dbf9d1,5420324..04424b6
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,10 +1,21 @@@
+ opensaml2 (2.6.0-4+deb9u1) stretch-security; urgency=high
+ 
+   * [9e2c41f] New patch: Security fix from V2.6.1 (CPPOST-105)
+     Thanks to Scott Cantor
+ 
+  -- Ferenc Wágner <wferi at debian.org>  Tue, 14 Nov 2017 22:23:58 +0100
+ 
 +opensaml2 (2.6.0-4~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +  * [2268d5d] Add myself to uploaders
 +  * [b58aca5] Force usage of backported dependencies
 +    - log4shib (1.0.9-3)
 +    - xml-security-c (1.7.3-3)
 +    - xmltooling (1.6.0-3)
 +
 + -- Etienne Dysli Metref <etienne.dysli-metref at switch.ch>  Thu, 29 Sep 2016 17:38:36 +0200
 +
  opensaml2 (2.6.0-4) unstable; urgency=medium
  
    * [848c048] Export pkgxmldir (the correct name) via pkg-config.

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