[opensaml2] 01/01: Refresh our patches
Ferenc Wágner
wferi at moszumanska.debian.org
Thu Nov 16 15:26:33 UTC 2017
This is an automated email from the git hooks/post-receive script.
wferi pushed a commit to branch debian/master
in repository opensaml2.
commit 0795c42f39e1f2daf4caf6b5c0b8e0a647a3dab1
Author: Ferenc Wágner <wferi at debian.org>
Date: Thu Nov 16 16:26:20 2017 +0100
Refresh our patches
---
debian/patches/Disable-forcing-of-libtool-silent.patch | 2 +-
debian/patches/Enable-the-dot-feature-of-Doxygen.patch | 2 +-
debian/patches/Localize-Boost-and-pthread-library-flags.patch | 6 +++---
debian/patches/Make-pkgconfigdir-configurable.patch | 2 +-
.../Make-pkgxmldir-configurable-and-export-it-via-pkg-co.patch | 2 +-
.../patches/Propagate-requirements-into-our-pkg-config-file.patch | 2 +-
debian/patches/Remove-.pl-extension-of-cxxtestgen.patch | 2 +-
debian/patches/Use-pkg-config-for-Xerces.patch | 4 ++--
debian/patches/Use-pkg-config-for-log4shib-log4cpp.patch | 6 +++---
debian/patches/Use-pkg-config-for-xmlsec.patch | 4 ++--
debian/patches/Use-pkg-config-for-xmltooling.patch | 6 +++---
debian/patches/Use-pkg-config-for-zlib-and-openssl.patch | 6 +++---
debian/patches/We-don-t-use-OpenSSL-directly.patch | 4 ++--
13 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/debian/patches/Disable-forcing-of-libtool-silent.patch b/debian/patches/Disable-forcing-of-libtool-silent.patch
index 40440de..3da138e 100644
--- a/debian/patches/Disable-forcing-of-libtool-silent.patch
+++ b/debian/patches/Disable-forcing-of-libtool-silent.patch
@@ -9,7 +9,7 @@ Subject: Disable forcing of libtool --silent
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
-index 0de178e..29eff67 100644
+index f9ea7da..f168036 100644
--- a/configure.ac
+++ b/configure.ac
@@ -313,7 +313,8 @@ AM_CONDITIONAL(BUILD_UNITTEST,test -f ${CXXTEST})
diff --git a/debian/patches/Enable-the-dot-feature-of-Doxygen.patch b/debian/patches/Enable-the-dot-feature-of-Doxygen.patch
index c3487a6..847b2ad 100644
--- a/debian/patches/Enable-the-dot-feature-of-Doxygen.patch
+++ b/debian/patches/Enable-the-dot-feature-of-Doxygen.patch
@@ -7,7 +7,7 @@ Subject: Enable the dot feature of Doxygen
1 file changed, 1 insertion(+)
diff --git a/configure.ac b/configure.ac
-index 082063f..2bed1cd 100644
+index a8fa21d..1f7dea2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,6 +10,7 @@ PKG_INSTALLDIR
diff --git a/debian/patches/Localize-Boost-and-pthread-library-flags.patch b/debian/patches/Localize-Boost-and-pthread-library-flags.patch
index 1ee294f..2f6557b 100644
--- a/debian/patches/Localize-Boost-and-pthread-library-flags.patch
+++ b/debian/patches/Localize-Boost-and-pthread-library-flags.patch
@@ -8,7 +8,7 @@ Subject: Localize Boost and pthread library flags
2 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/configure.ac b/configure.ac
-index 916f6f3..16be5c8 100644
+index 296da12..7ff1277 100644
--- a/configure.ac
+++ b/configure.ac
@@ -71,15 +71,9 @@ AC_HEADER_DIRENT
@@ -39,12 +39,12 @@ index 916f6f3..16be5c8 100644
AX_PKG_CHECK_MODULES([log4shib],,[log4shib],
[AC_DEFINE([OPENSAML_LOG4SHIB],[1],[Define to 1 if log4shib library is used.])],
diff --git a/saml/Makefile.am b/saml/Makefile.am
-index ff03803..9a137c2 100644
+index 56f71df..7d92a62 100644
--- a/saml/Makefile.am
+++ b/saml/Makefile.am
@@ -194,9 +194,12 @@ libsaml_la_SOURCES = \
# http://sources.redhat.com/autobook/autobook/autobook_91.html
- libsaml_la_LDFLAGS = -version-info 9:0:0
+ libsaml_la_LDFLAGS = -version-info 9:1:0
libsaml_la_CPPFLAGS = \
+ $(BOOST_CPPFLAGS) \
+ $(PTHREAD_CFLAGS) \
diff --git a/debian/patches/Make-pkgconfigdir-configurable.patch b/debian/patches/Make-pkgconfigdir-configurable.patch
index 1d2c3ae..a6cd24f 100644
--- a/debian/patches/Make-pkgconfigdir-configurable.patch
+++ b/debian/patches/Make-pkgconfigdir-configurable.patch
@@ -21,7 +21,7 @@ index 6376ee9..801f48e 100644
GENFILES = @PACKAGE_NAME at .spec
diff --git a/configure.ac b/configure.ac
-index 077a18c..b51cce1 100644
+index 44e3f8a..8437ed2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,6 +6,7 @@ AC_CONFIG_MACRO_DIR(m4)
diff --git a/debian/patches/Make-pkgxmldir-configurable-and-export-it-via-pkg-co.patch b/debian/patches/Make-pkgxmldir-configurable-and-export-it-via-pkg-co.patch
index f360a4d..b1f0ef8 100644
--- a/debian/patches/Make-pkgxmldir-configurable-and-export-it-via-pkg-co.patch
+++ b/debian/patches/Make-pkgxmldir-configurable-and-export-it-via-pkg-co.patch
@@ -9,7 +9,7 @@ Subject: Make pkgxmldir configurable and export it via pkg-config
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
-index b51cce1..9115b80 100644
+index 8437ed2..41198d8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -139,5 +139,11 @@ AM_CONDITIONAL(BUILD_UNITTEST,test -f ${CXXTEST})
diff --git a/debian/patches/Propagate-requirements-into-our-pkg-config-file.patch b/debian/patches/Propagate-requirements-into-our-pkg-config-file.patch
index 0e24726..0fba20c 100644
--- a/debian/patches/Propagate-requirements-into-our-pkg-config-file.patch
+++ b/debian/patches/Propagate-requirements-into-our-pkg-config-file.patch
@@ -31,7 +31,7 @@ index baa476e..6376ee9 100644
if DX_COND_doc
diff --git a/configure.ac b/configure.ac
-index f248b0f..916f6f3 100644
+index 6bc734b..296da12 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,7 +31,7 @@ else
diff --git a/debian/patches/Remove-.pl-extension-of-cxxtestgen.patch b/debian/patches/Remove-.pl-extension-of-cxxtestgen.patch
index 32dd7b5..9443f83 100644
--- a/debian/patches/Remove-.pl-extension-of-cxxtestgen.patch
+++ b/debian/patches/Remove-.pl-extension-of-cxxtestgen.patch
@@ -7,7 +7,7 @@ Subject: Remove .pl extension of cxxtestgen
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
-index 9115b80..082063f 100644
+index 41198d8..a8fa21d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -120,7 +120,7 @@ AX_PKG_CHECK_MODULES([xmltooling],,[xmltooling >= 1.4])
diff --git a/debian/patches/Use-pkg-config-for-Xerces.patch b/debian/patches/Use-pkg-config-for-Xerces.patch
index 929ac25..617942c 100644
--- a/debian/patches/Use-pkg-config-for-Xerces.patch
+++ b/debian/patches/Use-pkg-config-for-Xerces.patch
@@ -14,7 +14,7 @@ Subject: Use pkg-config for Xerces
create mode 100644 m4/ax_save_flags.m4
diff --git a/configure.ac b/configure.ac
-index cc32f7e..a608fd4 100644
+index 0631642..c9e72e8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -97,31 +97,11 @@ AX_PKG_CHECK_MODULES([log4shib],,[log4shib],
@@ -199,7 +199,7 @@ index 0000000..39f45be
+ [_AX_SAVE_ONE_FLAG([$1],FLAG)])
+])
diff --git a/saml/Makefile.am b/saml/Makefile.am
-index 11ca189..4bf10b1 100644
+index c542a83..0d7c40a 100644
--- a/saml/Makefile.am
+++ b/saml/Makefile.am
@@ -197,11 +197,13 @@ libsaml_la_CPPFLAGS = \
diff --git a/debian/patches/Use-pkg-config-for-log4shib-log4cpp.patch b/debian/patches/Use-pkg-config-for-log4shib-log4cpp.patch
index d6fc996..6e4b064 100644
--- a/debian/patches/Use-pkg-config-for-log4shib-log4cpp.patch
+++ b/debian/patches/Use-pkg-config-for-log4shib-log4cpp.patch
@@ -9,7 +9,7 @@ Subject: Use pkg-config for log4shib/log4cpp
3 files changed, 12 insertions(+), 49 deletions(-)
diff --git a/configure.ac b/configure.ac
-index 29eff67..bba1f29 100644
+index f168036..7829860 100644
--- a/configure.ac
+++ b/configure.ac
@@ -160,55 +160,10 @@ BOOST_SMART_PTR
@@ -73,13 +73,13 @@ index 29eff67..bba1f29 100644
# Xerces settings
AC_ARG_WITH(xerces,
diff --git a/saml/Makefile.am b/saml/Makefile.am
-index 9c82971..c09b573 100644
+index d4c59cd..3321e0c 100644
--- a/saml/Makefile.am
+++ b/saml/Makefile.am
@@ -193,6 +193,10 @@ libsaml_la_SOURCES = \
# this is different from the project version
# http://sources.redhat.com/autobook/autobook/autobook_91.html
- libsaml_la_LDFLAGS = -version-info 9:0:0
+ libsaml_la_LDFLAGS = -version-info 9:1:0
+libsaml_la_CPPFLAGS = \
+ $(log4shib_CFLAGS) $(log4cpp_CFLAGS)
+libsaml_la_LIBADD = \
diff --git a/debian/patches/Use-pkg-config-for-xmlsec.patch b/debian/patches/Use-pkg-config-for-xmlsec.patch
index ef7ccfd..e5c150e 100644
--- a/debian/patches/Use-pkg-config-for-xmlsec.patch
+++ b/debian/patches/Use-pkg-config-for-xmlsec.patch
@@ -9,7 +9,7 @@ Subject: Use pkg-config for xmlsec
3 files changed, 5 insertions(+), 24 deletions(-)
diff --git a/configure.ac b/configure.ac
-index a608fd4..077a18c 100644
+index c9e72e8..44e3f8a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -113,30 +113,7 @@ AC_COMPILE_IFELSE(
@@ -45,7 +45,7 @@ index a608fd4..077a18c 100644
AX_PKG_CHECK_MODULES([xmltooling],,[xmltooling >= 1.4])
PKG_CHECK_VAR([DX_INCLUDE], [xmltooling], [includedir])
diff --git a/saml/Makefile.am b/saml/Makefile.am
-index 4bf10b1..10da0b6 100644
+index 0d7c40a..fd39d56 100644
--- a/saml/Makefile.am
+++ b/saml/Makefile.am
@@ -198,12 +198,14 @@ libsaml_la_CPPFLAGS = \
diff --git a/debian/patches/Use-pkg-config-for-xmltooling.patch b/debian/patches/Use-pkg-config-for-xmltooling.patch
index 4132dce..b59d685 100644
--- a/debian/patches/Use-pkg-config-for-xmltooling.patch
+++ b/debian/patches/Use-pkg-config-for-xmltooling.patch
@@ -10,7 +10,7 @@ Subject: Use pkg-config for xmltooling
4 files changed, 10 insertions(+), 26 deletions(-)
diff --git a/configure.ac b/configure.ac
-index bba1f29..f248b0f 100644
+index 7829860..6bc734b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,6 @@ DX_XML_FEATURE(OFF)
@@ -62,12 +62,12 @@ index bba1f29..f248b0f 100644
dnl LIBTOOL="$LIBTOOL --silent"
diff --git a/saml/Makefile.am b/saml/Makefile.am
-index c09b573..ff03803 100644
+index 3321e0c..56f71df 100644
--- a/saml/Makefile.am
+++ b/saml/Makefile.am
@@ -194,8 +194,10 @@ libsaml_la_SOURCES = \
# http://sources.redhat.com/autobook/autobook/autobook_91.html
- libsaml_la_LDFLAGS = -version-info 9:0:0
+ libsaml_la_LDFLAGS = -version-info 9:1:0
libsaml_la_CPPFLAGS = \
+ $(xmltooling_CFLAGS) \
$(log4shib_CFLAGS) $(log4cpp_CFLAGS)
diff --git a/debian/patches/Use-pkg-config-for-zlib-and-openssl.patch b/debian/patches/Use-pkg-config-for-zlib-and-openssl.patch
index a27d933..e949788 100644
--- a/debian/patches/Use-pkg-config-for-zlib-and-openssl.patch
+++ b/debian/patches/Use-pkg-config-for-zlib-and-openssl.patch
@@ -8,7 +8,7 @@ Subject: Use pkg-config for zlib and openssl
2 files changed, 6 insertions(+), 59 deletions(-)
diff --git a/configure.ac b/configure.ac
-index 16be5c8..803bed1 100644
+index 7ff1277..4cddbd4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -76,67 +76,10 @@ ACX_PTHREAD(
@@ -82,10 +82,10 @@ index 16be5c8..803bed1 100644
AC_LANG([C++])
diff --git a/saml/Makefile.am b/saml/Makefile.am
-index 9a137c2..77a63c5 100644
+index 7d92a62..3385f91 100644
--- a/saml/Makefile.am
+++ b/saml/Makefile.am
-@@ -196,10 +196,14 @@ libsaml_la_LDFLAGS = -version-info 9:0:0
+@@ -196,10 +196,14 @@ libsaml_la_LDFLAGS = -version-info 9:1:0
libsaml_la_CPPFLAGS = \
$(BOOST_CPPFLAGS) \
$(PTHREAD_CFLAGS) \
diff --git a/debian/patches/We-don-t-use-OpenSSL-directly.patch b/debian/patches/We-don-t-use-OpenSSL-directly.patch
index 961bda6..c66d851 100644
--- a/debian/patches/We-don-t-use-OpenSSL-directly.patch
+++ b/debian/patches/We-don-t-use-OpenSSL-directly.patch
@@ -8,7 +8,7 @@ Subject: We don't use OpenSSL directly
2 files changed, 5 deletions(-)
diff --git a/configure.ac b/configure.ac
-index 803bed1..cc32f7e 100644
+index 4cddbd4..0631642 100644
--- a/configure.ac
+++ b/configure.ac
@@ -78,9 +78,6 @@ ACX_PTHREAD(
@@ -22,7 +22,7 @@ index 803bed1..cc32f7e 100644
# C++ requirements
diff --git a/saml/Makefile.am b/saml/Makefile.am
-index 77a63c5..11ca189 100644
+index 3385f91..c542a83 100644
--- a/saml/Makefile.am
+++ b/saml/Makefile.am
@@ -197,13 +197,11 @@ libsaml_la_CPPFLAGS = \
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-shibboleth/opensaml2.git
More information about the Pkg-shibboleth-devel
mailing list