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

[Etienne Dysli Metref]

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

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

commit 2c1d17d6f5f874e700740fe6b4d14757b151a362
Merge: dfd94b7 a3979c2
Author: Etienne Dysli Metref <etienne.dysli-metref at switch.ch>
Date:   Fri Nov 17 10:58:52 2017 +0100

    Merge branch 'debian/jessie-backports' into debian/wheezy-backports-sloppy
    
    Conflicts:
    - debian/patches/series
    
    Gbp-Dch: Ignore

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

diff --cc debian/changelog
index 28bc39c,974e27f..a2bc717
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,20 -1,16 +1,33 @@@
+ opensaml2 (2.6.0-4+deb9u1~bpo8+1) jessie-backports; urgency=high
+ 
+   * Rebuild for jessie-backports.
+ 
+  -- Etienne Dysli Metref <etienne.dysli-metref at switch.ch>  Thu, 16 Nov 2017 12:48:20 +0100
+ 
+ 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~bpo7+1) wheezy-backports-sloppy; urgency=medium
 +
 +  [ Etienne Dysli Metref ]
 +  * Rebuild for wheezy-backports-sloppy.
 +  * [759d492] New patch Provide-PKG_INSTALLDIR-and-PKG_CHECK_VAR-macros-to-build-.patch.
 +    Provide the two macros PKG_INSTALLDIR and PKG_CHECK_VAR which
 +    pkg-config < 0.27 does not have, in order to build for wheezy.
 +  * [b30ce9d] New patch Delete-unit-tests-that-use-the-network-wheezy-only.patch.
 +    Since the version of cxxtest in wheezy (4.0) does not support skipping
 +    tests, delete networked tests because they cannot pass in Debian's
 +    build environment where networking is disabled.
 +
 +  [ Ferenc Wágner ]
 +  * [c27e68f] AM_TESTS_ENVIRONMENT does not work in wheezy
 +
 + -- Ferenc Wágner <wferi at debian.org>  Thu, 27 Oct 2016 15:21:05 +0200
 +
  opensaml2 (2.6.0-4~bpo8+1) jessie-backports; urgency=medium
  
    * Rebuild for jessie-backports.
diff --cc debian/patches/series
index 5e3b291,997b428..3021b24
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -19,5 -19,4 +19,6 @@@ Refactor-test-source-generation.patc
  Derive-correct-test-data-paths-from-srcdir.patch
  Enable-skipping-tests-which-require-network-access.patch
  Enable-the-dot-feature-of-Doxygen.patch
 +Provide-PKG_INSTALLDIR-and-PKG_CHECK_VAR-macros-to-build-.patch
 +Delete-unit-tests-that-use-the-network-wheezy-only.patch
+ from-upstream/Security-fix-from-V2.6.1-CPPOST-105.patch

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