[cpp-log4shib] 04/11: Drop our patches (everything went upstream)
Scott Cantor
cantor.2 at osu.edu
Tue Oct 19 16:15:04 UTC 2021
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to annotated tag debian/2.0.0-1
in repository cpp-log4shib.
View the commit online:
http://git.shibboleth.net/view/?p=cpp-log4shib.git;a=commit;h=9e39ece71917cb36315fc94a23b9d7f6a1451565
commit 9e39ece71917cb36315fc94a23b9d7f6a1451565
Author: Ferenc Wágner <wferi at debian.org>
AuthorDate: Mon Jun 25 12:39:03 2018 +0200
Drop our patches (everything went upstream)
---
...ream-debian-directory-from-the-build-syst.patch | 37 -----------
...-the-build-flags-into-the-pkg-config-file.patch | 20 ------
...luous-scope-to-help-Doxygen-find-the-decl.patch | 21 ------
debian/patches/Fix-Doxygen-formatting-issues.patch | 76 ----------------------
...lete-MAX_DOT_GRAPH_-WIDTH-HEIGHT-Doxygen-.patch | 19 ------
debian/patches/series | 6 --
...-gethostbyname-are-often-provided-by-libc.patch | 23 -------
7 files changed, 202 deletions(-)
diff --git a/debian/patches/Detach-upstream-debian-directory-from-the-build-syst.patch b/debian/patches/Detach-upstream-debian-directory-from-the-build-syst.patch
deleted file mode 100644
index 52b6b8a..0000000
--- a/debian/patches/Detach-upstream-debian-directory-from-the-build-syst.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From: =?utf-8?q?Ferenc_W=C3=A1gner?= <wferi at niif.hu>
-Date: Thu, 14 Jan 2016 14:15:50 +0100
-Subject: Detach upstream debian directory from the build system
-
----
- Makefile.am | 4 ++--
- configure.ac | 1 -
- 2 files changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index c17f815..818159c 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -2,9 +2,9 @@ AUTOMAKE_OPTIONS = foreign
- ACLOCAL_AMFLAGS = -I m4
-
- if DOC
--SUBDIRS = debian msvc6 msvc8 msvc9 msvc10 config src include tests doc
-+SUBDIRS = msvc6 msvc8 msvc9 msvc10 config src include tests doc
- else
--SUBDIRS = debian msvc6 msvc8 msvc9 msvc10 config src include tests
-+SUBDIRS = msvc6 msvc8 msvc9 msvc10 config src include tests
- endif
-
- DIST_SUBDIRS = debian msvc6 msvc8 msvc9 msvc10 openvms config src include doc tests
-diff --git a/configure.ac b/configure.ac
-index ca7521d..1b873c0 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -168,7 +168,6 @@ include/Makefile
- include/log4shib/Makefile
- include/log4shib/threading/Makefile
- tests/Makefile
--debian/Makefile
- msvc6/Makefile
- msvc6/log4shib/Makefile
- msvc6/log4shibDLL/Makefile
diff --git a/debian/patches/Don-t-leak-the-build-flags-into-the-pkg-config-file.patch b/debian/patches/Don-t-leak-the-build-flags-into-the-pkg-config-file.patch
deleted file mode 100644
index 26e4dbc..0000000
--- a/debian/patches/Don-t-leak-the-build-flags-into-the-pkg-config-file.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: =?utf-8?q?Ferenc_W=C3=A1gner?= <wferi at niif.hu>
-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 --git a/debian/patches/Drop-superfluous-scope-to-help-Doxygen-find-the-decl.patch b/debian/patches/Drop-superfluous-scope-to-help-Doxygen-find-the-decl.patch
deleted file mode 100644
index 8a2702e..0000000
--- a/debian/patches/Drop-superfluous-scope-to-help-Doxygen-find-the-decl.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: =?utf-8?q?Ferenc_W=C3=A1gner?= <wferi at niif.hu>
-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 --git a/debian/patches/Fix-Doxygen-formatting-issues.patch b/debian/patches/Fix-Doxygen-formatting-issues.patch
deleted file mode 100644
index a04802f..0000000
--- a/debian/patches/Fix-Doxygen-formatting-issues.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From: =?utf-8?q?Ferenc_W=C3=A1gner?= <wferi at niif.hu>
-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".<br>
-- * Format characters are as follows:<br>
-- * <li><b>%%</b> - a single percent sign</li>
-- * <li><b>%%c</b> - the category</li>
-- * <li><b>%%d</b> - 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.</li>
-- * <li><b>%%m</b> - the message</li>
-- * <li><b>%%n</b> - the platform specific line separator</li>
-- * <li><b>%%p</b> - the priority</li>
-- * <li><b>%%r</b> - milliseconds since this layout was created.</li>
-- * <li><b>%%R</b> - seconds since Jan 1, 1970</li>
-- * <li><b>%%u</b> - clock ticks since process start</li>
-- * <li><b>%%x</b> - the NDC</li>
-- * @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:
-+ - <b>%%</b> - a single percent sign
-+ - <b>%%c</b> - the category
-+ - <b>%%d</b> - 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.
-+ - <b>%%m</b> - the message
-+ - <b>%%n</b> - the platform specific line separator
-+ - <b>%%p</b> - the priority
-+ - <b>%%r</b> - milliseconds since this layout was created
-+ - <b>%%R</b> - seconds since Jan 1, 1970
-+ - <b>%%u</b> - clock ticks since process start
-+ - <b>%%x</b> - the NDC
-+
-+ @param conversionPattern the conversion pattern
-+ @exception ConfigureFailure if the pattern is invalid
- **/
- virtual void setConversionPattern(const std::string& conversionPattern)
- throw(ConfigureFailure);
diff --git a/debian/patches/Remove-obsolete-MAX_DOT_GRAPH_-WIDTH-HEIGHT-Doxygen-.patch b/debian/patches/Remove-obsolete-MAX_DOT_GRAPH_-WIDTH-HEIGHT-Doxygen-.patch
deleted file mode 100644
index 8d839c7..0000000
--- a/debian/patches/Remove-obsolete-MAX_DOT_GRAPH_-WIDTH-HEIGHT-Doxygen-.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From: =?utf-8?q?Ferenc_W=C3=A1gner?= <wferi at niif.hu>
-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 --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index e9ecfc1..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,6 +0,0 @@
-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 --git a/debian/patches/socket-and-gethostbyname-are-often-provided-by-libc.patch b/debian/patches/socket-and-gethostbyname-are-often-provided-by-libc.patch
deleted file mode 100644
index fbf58e3..0000000
--- a/debian/patches/socket-and-gethostbyname-are-often-provided-by-libc.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: =?utf-8?q?Ferenc_W=C3=A1gner?= <wferi at niif.hu>
-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 c0f84fc..9030aa8 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"])
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list