[shibboleth-sp2] 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 shibboleth-sp2.

commit 44bf0600d0c6fd022109b6bdfccbdea5619ec83b
Merge: 365b24e 9b90983
Author: Etienne Dysli Metref <etienne.dysli-metref at switch.ch>
Date:   Thu Nov 16 14: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-SSPCPP-763.patch      | 46 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 54 insertions(+)

diff --cc debian/changelog
index 143e348,fdb6112..b42c8bc
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,16 @@@
+ shibboleth-sp2 (2.6.0+dfsg1-4+deb9u1) stretch-security; urgency=high
+ 
+   * [bf25c5f] New patch: Security fix from V2.6.1 (SSPCPP-763)
+     Thanks to Scott Cantor
+ 
+  -- Ferenc Wágner <wferi at debian.org>  Tue, 14 Nov 2017 22:53:37 +0100
+ 
 +shibboleth-sp2 (2.6.0+dfsg1-4~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Etienne Dysli Metref <etienne.dysli-metref at switch.ch>  Fri, 06 Jan 2017 09:38:46 +0100
 +
  shibboleth-sp2 (2.6.0+dfsg1-4) unstable; urgency=medium
  
    [ Ferenc Wágner ]

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