diff -Nru log4shib-1.0.9/debian/changelog log4shib-1.0.9/debian/changelog --- log4shib-1.0.9/debian/changelog 2016-01-16 22:58:52.000000000 +0000 +++ log4shib-1.0.9/debian/changelog 2016-08-02 09:56:23.000000000 +0000 @@ -1,3 +1,21 @@ +log4shib (1.0.9-3) unstable; urgency=medium + + * [41cb8de] Build only the documentation for indep builds (Closes: #814435) + * [9c92c67] Enable parallel builds + * [a659bd6] Use secure HTTPS transport in the Vcs-* fields + * [1446f60] Update Standards-Version to 3.9.8 (no changes needed) + * [0628729] Fix the build flag leak by an upstreamable patch + * [b20a1a1] New patch Fix-Doxygen-formatting-issues.patch + * [8df8e66] New patch Remove-obsolete-MAX_DOT_GRAPH_-WIDTH-HEIGHT- + Doxygen-.patch + * [d69ed62] New patch Drop-superfluous-scope-to-help-Doxygen-find-the- + decl.patch + * [04c8101] Remove the unneded files instead of ignoring them + * [fbc0beb] New patch socket-and-gethostbyname-are-often-provided-by- + libc.patch + + -- Ferenc Wágner Tue, 02 Aug 2016 11:56:23 +0200 + log4shib (1.0.9-2) unstable; urgency=medium * [5b21418] Use a wildcard to match the multiarch part of the file path diff -Nru log4shib-1.0.9/debian/control log4shib-1.0.9/debian/control --- log4shib-1.0.9/debian/control 2016-01-16 22:58:52.000000000 +0000 +++ log4shib-1.0.9/debian/control 2016-08-02 09:20:31.000000000 +0000 @@ -12,10 +12,10 @@ Build-Depends-Indep: doxygen, graphviz, -Standards-Version: 3.9.6 +Standards-Version: 3.9.8 Homepage: https://wiki.shibboleth.net/confluence/display/OpenSAML/log4shib -Vcs-Git: git://anonscm.debian.org/pkg-shibboleth/log4shib.git -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-shibboleth/log4shib.git +Vcs-Git: https://anonscm.debian.org/git/pkg-shibboleth/log4shib.git +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-shibboleth/log4shib.git Package: liblog4shib1v5 Architecture: any diff -Nru log4shib-1.0.9/debian/patches/Detach-upstream-debian-directory-from-the-build-syst.patch log4shib-1.0.9/debian/patches/Detach-upstream-debian-directory-from-the-build-syst.patch --- log4shib-1.0.9/debian/patches/Detach-upstream-debian-directory-from-the-build-syst.patch 2016-01-16 22:58:52.000000000 +0000 +++ log4shib-1.0.9/debian/patches/Detach-upstream-debian-directory-from-the-build-syst.patch 2016-07-04 12:50:20.000000000 +0000 @@ -3,8 +3,8 @@ Subject: Detach upstream debian directory from the build system --- - Makefile.am | 4 ++-- - configure.ac | 1 - + Makefile.am | 4 ++-- + configure.ac | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am diff -Nru log4shib-1.0.9/debian/patches/Don-t-leak-the-build-flags-into-the-pkg-config-file.patch log4shib-1.0.9/debian/patches/Don-t-leak-the-build-flags-into-the-pkg-config-file.patch --- log4shib-1.0.9/debian/patches/Don-t-leak-the-build-flags-into-the-pkg-config-file.patch 1970-01-01 00:00:00.000000000 +0000 +++ log4shib-1.0.9/debian/patches/Don-t-leak-the-build-flags-into-the-pkg-config-file.patch 2016-07-04 12:50:20.000000000 +0000 @@ -0,0 +1,20 @@ +From: =?utf-8?q?Ferenc_W=C3=A1gner?= +Date: Sun, 3 Apr 2016 21:48:15 +0200 +Subject: Don't leak the build flags into the pkg-config file + +--- + configure.ac | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 1b873c0..c0f84fc 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -140,7 +140,6 @@ BB_ENABLE_DOXYGEN + #BB_CHECK_OMNITHREADS + #BB_CHECK_PTHREADS + +-LOG4SHIB_CFLAGS="$CXXFLAGS" + LOG4SHIB_LIBS="-llog4shib" + LOG4SHIB_LIBDEPS="$LIBS" + LOG4SHIB_VERSION="$VERSION" diff -Nru log4shib-1.0.9/debian/patches/Drop-superfluous-scope-to-help-Doxygen-find-the-decl.patch log4shib-1.0.9/debian/patches/Drop-superfluous-scope-to-help-Doxygen-find-the-decl.patch --- log4shib-1.0.9/debian/patches/Drop-superfluous-scope-to-help-Doxygen-find-the-decl.patch 1970-01-01 00:00:00.000000000 +0000 +++ log4shib-1.0.9/debian/patches/Drop-superfluous-scope-to-help-Doxygen-find-the-decl.patch 2016-08-02 09:09:47.000000000 +0000 @@ -0,0 +1,21 @@ +From: =?utf-8?q?Ferenc_W=C3=A1gner?= +Date: Tue, 12 Apr 2016 14:17:24 +0200 +Subject: Drop superfluous scope to help Doxygen find the declaration + +--- + src/Category.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Category.cpp b/src/Category.cpp +index b6dd3d2..0eb083b 100644 +--- a/src/Category.cpp ++++ b/src/Category.cpp +@@ -201,7 +201,7 @@ namespace log4shib { + + /* assume lock is held */ + bool Category::ownsAppender(Appender* appender, +- Category::OwnsAppenderMap::iterator& i2) throw() { ++ OwnsAppenderMap::iterator& i2) throw() { + bool owned = false; + + if (NULL != appender) { diff -Nru log4shib-1.0.9/debian/patches/Fix-Doxygen-formatting-issues.patch log4shib-1.0.9/debian/patches/Fix-Doxygen-formatting-issues.patch --- log4shib-1.0.9/debian/patches/Fix-Doxygen-formatting-issues.patch 1970-01-01 00:00:00.000000000 +0000 +++ log4shib-1.0.9/debian/patches/Fix-Doxygen-formatting-issues.patch 2016-08-02 09:08:15.000000000 +0000 @@ -0,0 +1,76 @@ +From: =?utf-8?q?Ferenc_W=C3=A1gner?= +Date: Mon, 11 Apr 2016 18:29:24 +0200 +Subject: Fix Doxygen formatting issues + +--- + include/log4shib/PatternLayout.hh | 52 +++++++++++++++++++-------------------- + 1 file changed, 25 insertions(+), 27 deletions(-) + +diff --git a/include/log4shib/PatternLayout.hh b/include/log4shib/PatternLayout.hh +index a1bb956..4428edc 100644 +--- a/include/log4shib/PatternLayout.hh ++++ b/include/log4shib/PatternLayout.hh +@@ -48,38 +48,36 @@ namespace log4shib { + PatternLayout(); + virtual ~PatternLayout(); + +- // NOTE: All double percentage signs ('%%') followed by a character +- // in the following comments should actually be a single char. +- // The doubles are included so that doxygen will print them correctly. + /** +- * Formats the LoggingEvent in the style set by +- * the setConversionPattern call. By default, set +- * to "%%m%%n" ++ Formats the LoggingEvent in the style set by ++ the setConversionPattern call. By default, set ++ to "%m%n" + **/ + virtual std::string format(const LoggingEvent& event); + + /** +- * Sets the format of log lines handled by this +- * PatternLayout. By default, set to "%%m%%n".
+- * Format characters are as follows:
+- *
  • %% - a single percent sign
    • +- *
  • %%c - the category
    • +- *
  • %%d - the date\n +- * Date format: The date format character may be followed by a date format +- * specifier enclosed between braces. For example, %%d{%%H:%%M:%%S,%%l} or %%d{%%d %%m %%Y %%H:%%M:%%S,%%l}. +- * If no date format specifier is given then the following format is used: +- * "Wed Jan 02 02:03:55 1980". The date format specifier admits the same syntax +- * as the ANSI C function strftime, with 1 addition. The addition is the specifier +- * %%l for milliseconds, padded with zeros to make 3 digits.
    • +- *
  • %%m - the message
    • +- *
  • %%n - the platform specific line separator
    • +- *
  • %%p - the priority
    • +- *
  • %%r - milliseconds since this layout was created.
    • +- *
  • %%R - seconds since Jan 1, 1970
    • +- *
  • %%u - clock ticks since process start
    • +- *
  • %%x - the NDC
    • +- * @param conversionPattern the conversion pattern +- * @exception ConfigureFailure if the pattern is invalid ++ Sets the format of log lines handled by this ++ PatternLayout. By default, set to "%m%n". ++ Format characters are as follows: ++ - %% - a single percent sign ++ - %%c - the category ++ - %%d - the date\n ++ Date format: The date format character may be followed by a date format ++ specifier enclosed between braces. For example, %%d{%%H:%%M:%%S,%%l} or %%d{%%d %%m %%Y %%H:%%M:%%S,%%l}. ++ If no date format specifier is given then the following format is used: ++ "Wed Jan 02 02:03:55 1980". The date format specifier admits the same syntax ++ as the ANSI C function strftime, with 1 addition. The addition is the specifier ++ %%l for milliseconds, padded with zeros to make 3 digits. ++ - %%m - the message ++ - %%n - the platform specific line separator ++ - %%p - the priority ++ - %%r - milliseconds since this layout was created ++ - %%R - seconds since Jan 1, 1970 ++ - %%u - clock ticks since process start ++ - %%x - the NDC ++ ++ @param conversionPattern the conversion pattern ++ @exception ConfigureFailure if the pattern is invalid + **/ + virtual void setConversionPattern(const std::string& conversionPattern) + throw(ConfigureFailure); diff -Nru log4shib-1.0.9/debian/patches/Remove-obsolete-MAX_DOT_GRAPH_-WIDTH-HEIGHT-Doxygen-.patch log4shib-1.0.9/debian/patches/Remove-obsolete-MAX_DOT_GRAPH_-WIDTH-HEIGHT-Doxygen-.patch --- log4shib-1.0.9/debian/patches/Remove-obsolete-MAX_DOT_GRAPH_-WIDTH-HEIGHT-Doxygen-.patch 1970-01-01 00:00:00.000000000 +0000 +++ log4shib-1.0.9/debian/patches/Remove-obsolete-MAX_DOT_GRAPH_-WIDTH-HEIGHT-Doxygen-.patch 2016-08-02 09:09:47.000000000 +0000 @@ -0,0 +1,19 @@ +From: =?utf-8?q?Ferenc_W=C3=A1gner?= +Date: Tue, 12 Apr 2016 13:34:50 +0200 +Subject: Remove obsolete MAX_DOT_GRAPH_{WIDTH,HEIGHT} Doxygen options + +--- + doc/Doxyfile.in | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in +index 924c09a..33fd1fa 100644 +--- a/doc/Doxyfile.in ++++ b/doc/Doxyfile.in +@@ -62,6 +62,4 @@ COLLABORATION_GRAPH = YES + INCLUDE_GRAPH = YES + INCLUDED_BY_GRAPH = YES + GRAPHICAL_HIERARCHY = YES +-MAX_DOT_GRAPH_WIDTH = 1024 +-MAX_DOT_GRAPH_HEIGHT = 1024 + GENERATE_LEGEND = YES diff -Nru log4shib-1.0.9/debian/patches/series log4shib-1.0.9/debian/patches/series --- log4shib-1.0.9/debian/patches/series 2016-01-16 22:58:52.000000000 +0000 +++ log4shib-1.0.9/debian/patches/series 2016-08-02 09:52:03.000000000 +0000 @@ -1 +1,6 @@ Detach-upstream-debian-directory-from-the-build-syst.patch +Don-t-leak-the-build-flags-into-the-pkg-config-file.patch +Fix-Doxygen-formatting-issues.patch +Remove-obsolete-MAX_DOT_GRAPH_-WIDTH-HEIGHT-Doxygen-.patch +Drop-superfluous-scope-to-help-Doxygen-find-the-decl.patch +socket-and-gethostbyname-are-often-provided-by-libc.patch diff -Nru log4shib-1.0.9/debian/patches/socket-and-gethostbyname-are-often-provided-by-libc.patch log4shib-1.0.9/debian/patches/socket-and-gethostbyname-are-often-provided-by-libc.patch --- log4shib-1.0.9/debian/patches/socket-and-gethostbyname-are-often-provided-by-libc.patch 1970-01-01 00:00:00.000000000 +0000 +++ log4shib-1.0.9/debian/patches/socket-and-gethostbyname-are-often-provided-by-libc.patch 2016-08-02 09:12:56.000000000 +0000 @@ -0,0 +1,23 @@ +From: =?utf-8?q?Ferenc_W=C3=A1gner?= +Date: Mon, 4 Jul 2016 08:07:36 +0200 +Subject: socket() and gethostbyname() are often provided by libc + +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 5968628..572bc3e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -102,8 +102,8 @@ AC_CHECK_FUNCS([syslog gettimeofday ftime localtime_r gmtime_r]) + # ---------------------------------------------------------------------------- + + # for RemoteSyslogAppender +-AC_CHECK_LIB(socket,socket, LIBS="-lsocket $LIBS",,) +-AC_CHECK_LIB(nsl,gethostbyname, LIBS="-lnsl $LIBS",,) ++AC_SEARCH_LIBS([socket],[socket],,[AC_MSG_ERROR([cannot find socket() function])]) ++AC_SEARCH_LIBS([gethostbyname],[nsl],,[AC_MSG_ERROR([cannot find gethostbyname() function])]) + + # checks for pthreads + AX_PTHREAD([enable_threads="pthread"],[enable_threads="no"]) diff -Nru log4shib-1.0.9/debian/rules log4shib-1.0.9/debian/rules --- log4shib-1.0.9/debian/rules 2016-01-16 22:58:52.000000000 +0000 +++ log4shib-1.0.9/debian/rules 2016-08-02 09:53:01.000000000 +0000 @@ -1,15 +1,11 @@ #!/usr/bin/make -f -VERSION := $(shell dpkg-parsechangelog | grep ^Version: | cut -d' ' -f2 \ - | cut -d- -f1) - # Enable compiler hardening flags. export DEB_BUILD_MAINT_OPTIONS = hardening=+all # Force linking with -lpthread, working around a bug in libtool that drops -# the linkage because it uses -nostdlib. See #468555. Add --as-needed to -# drop a few unnecessary dependencies. -export DEB_LDFLAGS_MAINT_APPEND = -lpthread -Wl,--as-needed +# the linkage because it uses -nostdlib. See #468555. +export DEB_LDFLAGS_MAINT_APPEND = -lpthread ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) DEBUG = --enable-debug @@ -18,21 +14,26 @@ endif override_dh_auto_configure: - dh_auto_configure -- --disable-static $(DEBUG) log4shib_cflags=' ' -# avoid leaking build flags into the pkg-config file + dh_auto_configure -- --disable-static $(DEBUG) -override_dh_install-arch: - pod2man --release=$(VERSION) --section=1 --center=log4shib \ - debian/log4shib-config.pod debian/log4shib-config.1 - rm debian/tmp/usr/lib/*/liblog4shib.la - dh_install -Xman3 --fail-missing +override_dh_auto_build-indep: + $(MAKE) docs -override_dh_install-indep: - find debian/tmp/usr/share/doc/log4shib-*/api/html -name "*.md5" -delete - dh_install -Xman3 --fail-missing +# the test target would build the software +override_dh_auto_test-indep: -override_dh_autoreconf: - dh_autoreconf --as-needed +override_dh_auto_install-indep: + $(MAKE) -C doc DESTDIR=$(CURDIR)/debian/tmp install + +APIDOCS=debian/tmp/usr/share/doc/log4shib-*/api/html +override_dh_install: + pod2man --release='$(word 3,$(shell ./config.status --version))' \ + --section=1 --center=log4shib \ + debian/log4shib-config.pod debian/log4shib-config.1 + rm -f debian/tmp/usr/lib/*/liblog4shib.la + rm -rf debian/tmp/usr/share/man/man3 + if [ -d $(APIDOCS) ]; then find $(APIDOCS) -name "*.md5" -delete; fi + dh_install --fail-missing %: - dh $@ --with autoreconf + dh $@ --parallel --with autoreconf