Control: tags 811183 patch
Control: tags 863771 patch
Control: tags 929062 patch
Hi!
We needed an updated version of this package, so I went ahead and did
that, and various other cleanups and fixes. Attached is the patch
series for these changes.
I've left the alioth stuff alone, as I'm not sure where you'd like to
migrate to, if at all. And because I'm not really a fan of packaging
repos with non packaging-only layouts.
The other remaining issue I found is that binutils' strip removes the
relro program header, which means that security feature might get
disabled. I'll report another bug and mark as affecting this package.
Thanks,
Guillem
From 7b08ac0a56db8c3ef2d52a8fa77021d27f8d464b Mon Sep 17 00:00:00 2001
From: Guillem Jover <gjo...@sipwise.com>
Date: Thu, 19 Sep 2019 00:01:03 +0200
Subject: [PATCH 01/16] Switch to automatically generated debug packages
---
debian/changelog | 6 ++++++
debian/control | 15 ---------------
debian/rules | 2 +-
3 files changed, 7 insertions(+), 16 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index fa2b138..c94971c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+log4cplus (1.1.2-3.3) UNRELEASED; urgency=medium
+
+ * Switch to automatically generated debug packages.
+
+ -- Guillem Jover <gjo...@sipwise.com> Fri, 13 Sep 2019 23:31:35 +0200
+
log4cplus (1.1.2-3.2) unstable; urgency=medium
* Non-maintainer upload.
diff --git a/debian/control b/debian/control
index ca8f6db..ab349b7 100644
--- a/debian/control
+++ b/debian/control
@@ -28,18 +28,3 @@ Description: C++ logging API modeled after the Java log4j API - development libr
.
This package contains the header files and static library for
developers.
-
-Package: liblog4cplus-dbg
-Section: debug
-Priority: extra
-Architecture: any
-Depends: ${misc:Depends}, liblog4cplus-1.1-9 (= ${binary:Version})
-Description: C++ logging API modeled after the Java log4j API - debug library
- log4cplus is a simple to use C++ logging API providing thread-safe,
- flexible, and arbitrarily granular control over log management and
- configuration. It is modeled after the Java log4j API.
- .
- This package is provided primarily to provide a backtrace with names
- in a debugger, this makes it somewhat easier to interpret core
- dumps. Most people will not need this package.
-
diff --git a/debian/rules b/debian/rules
index f0625f0..0a1b5ed 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@ export DEB_CXXFLAGS_MAINT_APPEND := --std=c++11
dh $@ --with autoreconf
override_dh_strip:
- dh_strip --dbg-package=liblog4cplus-dbg
+ dh_strip --dbgsym-migration='liblog4cplus-dbg (<< 1.1.2-3.3~)'
override_dh_install:
sed -i "/dependency_libs/ s/'.*'/''/" `find . -name '*.la'`
--
2.23.0.359.gb967887aa5
From 07f51113c670e8ab0225ed565452c4f139669e77 Mon Sep 17 00:00:00 2001
From: Guillem Jover <gjo...@sipwise.com>
Date: Thu, 19 Sep 2019 00:01:18 +0200
Subject: [PATCH 02/16] Wrap and sort debian control files (with -sat)
---
debian/changelog | 1 +
debian/control | 19 +++++++++++++++----
debian/liblog4cplus-dev.install | 2 +-
3 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index c94971c..ad642a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
log4cplus (1.1.2-3.3) UNRELEASED; urgency=medium
* Switch to automatically generated debug packages.
+ * Wrap and sort debian control files (with -sat).
-- Guillem Jover <gjo...@sipwise.com> Fri, 13 Sep 2019 23:31:35 +0200
diff --git a/debian/control b/debian/control
index ab349b7..4288b5a 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,15 @@ Source: log4cplus
Section: libs
Priority: extra
Maintainer: Andrew Pollock <apoll...@debian.org>
-Uploaders: Daigo Moriwaki <da...@debian.org>, Eric Kom <eric...@kom.za.net>
-Build-Depends: debhelper (>= 9), dh-autoreconf, libtool, automake, doxygen
+Uploaders:
+ Daigo Moriwaki <da...@debian.org>,
+ Eric Kom <eric...@kom.za.net>,
+Build-Depends:
+ automake,
+ debhelper (>= 9),
+ dh-autoreconf,
+ doxygen,
+ libtool,
Standards-Version: 3.9.6
Homepage: http://log4cplus.sourceforge.net
Vcs-Browser: http://git.debian.org/?p=collab-maint/log4cplus.git;a=summary
@@ -11,7 +18,9 @@ Vcs-Git: git://git.debian.org/collab-maint/log4cplus.git
Package: liblog4cplus-1.1-9
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
Description: C++ logging API modeled after the Java log4j API - shared library
log4cplus is a simple to use C++ logging API providing thread-safe,
flexible, and arbitrarily granular control over log management and
@@ -20,7 +29,9 @@ Description: C++ logging API modeled after the Java log4j API - shared library
Package: liblog4cplus-dev
Architecture: any
Section: libdevel
-Depends: liblog4cplus-1.1-9 (= ${binary:Version}), ${misc:Depends}
+Depends:
+ ${misc:Depends},
+ liblog4cplus-1.1-9 (= ${binary:Version}),
Description: C++ logging API modeled after the Java log4j API - development library
log4cplus is a simple to use C++ logging API providing thread-safe,
flexible, and arbitrarily granular control over log management and
diff --git a/debian/liblog4cplus-dev.install b/debian/liblog4cplus-dev.install
index e1b5c3d..810dd95 100644
--- a/debian/liblog4cplus-dev.install
+++ b/debian/liblog4cplus-dev.install
@@ -1,4 +1,4 @@
-usr/lib/*/liblog4cplus.so
usr/include/log4cplus/*
usr/lib/*/liblog4cplus.a
usr/lib/*/liblog4cplus.la
+usr/lib/*/liblog4cplus.so
--
2.23.0.359.gb967887aa5
From 6b9ecf9795a8f16a300e39b661ae8bd608e811ae Mon Sep 17 00:00:00 2001
From: Guillem Jover <gjo...@sipwise.com>
Date: Thu, 19 Sep 2019 00:01:22 +0200
Subject: [PATCH 03/16] Remove Daigo Moriwaki from Uploaders field
Thanks for the past work!
Closes: #863771
---
debian/changelog | 2 ++
debian/control | 1 -
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index ad642a8..a72b896 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ log4cplus (1.1.2-3.3) UNRELEASED; urgency=medium
* Switch to automatically generated debug packages.
* Wrap and sort debian control files (with -sat).
+ * Remove Daigo Moriwaki from Uploaders field, thanks for the past work!
+ (Closes: #863771)
-- Guillem Jover <gjo...@sipwise.com> Fri, 13 Sep 2019 23:31:35 +0200
diff --git a/debian/control b/debian/control
index 4288b5a..39c2563 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,6 @@ Section: libs
Priority: extra
Maintainer: Andrew Pollock <apoll...@debian.org>
Uploaders:
- Daigo Moriwaki <da...@debian.org>,
Eric Kom <eric...@kom.za.net>,
Build-Depends:
automake,
--
2.23.0.359.gb967887aa5
From 711532153a40d429fc366376cd6c04012d1745f9 Mon Sep 17 00:00:00 2001
From: Guillem Jover <gjo...@sipwise.com>
Date: Thu, 19 Sep 2019 00:01:24 +0200
Subject: [PATCH 04/16] Update debian/watch file
- Switch to format 4.
- Switch to https:// download URL.
- Enable OpenPGP signature checks.
- Add upstream signing key.
- Update regex to fetch .xz based tarballs, and the correct version part.
- Add version (debian) and script (uupdate) fields.
---
debian/changelog | 8 ++++++++
debian/upstream/signing-key.asc | 26 ++++++++++++++++++++++++++
debian/watch | 12 +++---------
3 files changed, 37 insertions(+), 9 deletions(-)
create mode 100644 debian/upstream/signing-key.asc
diff --git a/debian/changelog b/debian/changelog
index a72b896..42981d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,14 @@ log4cplus (1.1.2-3.3) UNRELEASED; urgency=medium
* Wrap and sort debian control files (with -sat).
* Remove Daigo Moriwaki from Uploaders field, thanks for the past work!
(Closes: #863771)
+ * Update debian/watch file:
+ - Switch to format 4.
+ - Switch to https:// download URL.
+ - Remove redundant comments.
+ - Enable OpenPGP signature checks.
+ - Add upstream signing key.
+ - Update regex to fetch .xz based tarballs, and the correct version part.
+ - Add version (debian) and script (uupdate) fields.
-- Guillem Jover <gjo...@sipwise.com> Fri, 13 Sep 2019 23:31:35 +0200
diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc
new file mode 100644
index 0000000..88f6c86
--- /dev/null
+++ b/debian/upstream/signing-key.asc
@@ -0,0 +1,26 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mDMEWf3f1RYJKwYBBAHaRw8BAQdA+8IStMkkgNpf51nGCCVfGgaiznOp+xPcQtrf
+gfGLS9K0JFbDoWNsYXYgSGFpc21hbiA8dmhhaXNtYW5AZ21haWwuY29tPoisBBMW
+CABUAhsDBQsJCAcCBhUICQoLAgQWAgMBAh4BAheAAhkBFiEE5AYpL30Iu7AIRhMU
+BLidUd/lohUFAl06FI4YGGhrcHM6Ly9rZXlzLm9wZW5wZ3Aub3JnAAoJEAS4nVHf
+5aIV808A/1l7d86hIkuruaSD6xfzPIA/Ek/qiGKRGA+zU8qUb5dYAP9sVhbw9SvJ
+wcsDuIJGeXrFVi8yx6S+Y8H0CPIUR0teB7QsVsOhY2xhdiBIYWlzbWFuIDx3aWx4
+QHVzZXJzLnNvdXJjZWZvcmdlLm5ldD6IqQQTFggAUQIbAwULCQgHAgYVCAkKCwIE
+FgIDAQIeAQIXgBYhBOQGKS99CLuwCEYTFAS4nVHf5aIVBQJdOhScGBhoa3BzOi8v
+a2V5cy5vcGVucGdwLm9yZwAKCRAEuJ1R3+WiFbnxAP9nsjdMG6BF3tIwis2im4Yl
+UDjVEJ+bpfgr3UqMIk415AEA5lPhPPRBE9dyPYWWuL6J/vVpxCKieIlb0gRcnWXh
+5w24MwRccRF2FgkrBgEEAdpHDwEBB0BzaFf4Pw0yyyZh6bH6Cqk2o0hHMqJututv
+iHMlhL8F7Yj1BBgWCAAmFiEE5AYpL30Iu7AIRhMUBLidUd/lohUFAlxxEXYCGwIF
+CQHhM4AAgQkQBLidUd/lohV2IAQZFggAHRYhBIktJrnlK52GrKtMpnpY2TcE1csG
+BQJccRF2AAoJEHpY2TcE1csG/t0A/RfE4W7rDckXGpwBTS9IXRwvPyNVrDXw+hKB
+ZBmGTj57AQCQpSmaHphzIaR5gUJdzii8CcCBi9x7Rk9fjtv3PCFaDfEiAQCA4D38
+xm24wLWQ6GbW1bDYKngvrN+aRdGjguj2ObFf2AEAnMa4cyQSIBVKMBghBGOKPAdN
+/kGZ5r+K/aqCxZVZFAO4cwRccRG8EgUrgQQAIgMDBD4m0Cir/FdwUAJmdHZvMZHn
+SFUN4JdFVRY9kl3MnAg4v568+eOVZ40ezPUZ857Xn27qOq+Y1fTPuLhj0r7hepRY
+gB+WS+LQCuT9VLrD+SsZhBzfAotvMTCsY9Znm2HVMwMBCQmIfgQYFggAJhYhBOQG
+KS99CLuwCEYTFAS4nVHf5aIVBQJccRG8AhsMBQkB4TOAAAoJEAS4nVHf5aIVppcA
+/jD0qXONYoyWSah6x5wZs0fWLpzjzFEqEOB34MxybkmeAQCsdjAtn47WMWM0enS5
+hwoN25zsvqVACdmiztSYKRnCDg==
+=1SkD
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/debian/watch b/debian/watch
index 5c95f94..04c2200 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,9 +1,3 @@
-# you can run the "uscan" command to check for upstream updates and more.
-# See uscan(1) for format
-
-# Compulsory line, this is a version 3 file
-version=3
-
-# A South African Mirror, one of the sourceforge mirrors.
-#http://tenet.dl.sourceforge.net/project/log4cplus/log4cplus-stable/(\d+\.\d+\.\d+)/log4cplus-(\d+\.\d+\.\d+)\.tar\.bz2 debian uupdate
-http://sf.net/log4cplus/log4cplus-(.+)\.tar\.bz2
+version=4
+opts=pgpsigurlmangle=s/$/.sig/ \
+https://sf.net/log4cplus/log4cplus-([0-9]+\..+)\.tar\.(?:gz|xz|bz2) debian uupdate
--
2.23.0.359.gb967887aa5
From 1f1230b830ddea12be0afea8b523fd120e534882 Mon Sep 17 00:00:00 2001
From: Guillem Jover <gjo...@sipwise.com>
Date: Thu, 19 Sep 2019 00:01:27 +0200
Subject: [PATCH 05/16] New upstream release 2.0.4
- Enable static linking explicitly, now disabled by default upstream.
- Add tests/atconfig to debian/clean.
Closes: #929062
---
debian/changelog | 5 ++++-
debian/clean | 1 +
debian/control | 4 ++--
debian/liblog4cplus-1.1-9.install | 1 -
debian/liblog4cplus-2.0-3.install | 1 +
debian/rules | 7 +++++--
6 files changed, 13 insertions(+), 6 deletions(-)
create mode 100644 debian/clean
delete mode 100644 debian/liblog4cplus-1.1-9.install
create mode 100644 debian/liblog4cplus-2.0-3.install
diff --git a/debian/changelog b/debian/changelog
index 42981d7..c4aafda 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
-log4cplus (1.1.2-3.3) UNRELEASED; urgency=medium
+log4cplus (2.0.4-0.1) UNRELEASED; urgency=medium
+ * New upstream release. (Closes: #929062)
+ - Enable static linking explicitly, now disabled by default upstream.
+ - Add tests/atconfig to debian/clean.
* Switch to automatically generated debug packages.
* Wrap and sort debian control files (with -sat).
* Remove Daigo Moriwaki from Uploaders field, thanks for the past work!
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..8138dfa
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1 @@
+tests/atconfig
diff --git a/debian/control b/debian/control
index 39c2563..e35d0e3 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Homepage: http://log4cplus.sourceforge.net
Vcs-Browser: http://git.debian.org/?p=collab-maint/log4cplus.git;a=summary
Vcs-Git: git://git.debian.org/collab-maint/log4cplus.git
-Package: liblog4cplus-1.1-9
+Package: liblog4cplus-2.0-3
Architecture: any
Depends:
${misc:Depends},
@@ -30,7 +30,7 @@ Architecture: any
Section: libdevel
Depends:
${misc:Depends},
- liblog4cplus-1.1-9 (= ${binary:Version}),
+ liblog4cplus-2.0-3 (= ${binary:Version}),
Description: C++ logging API modeled after the Java log4j API - development library
log4cplus is a simple to use C++ logging API providing thread-safe,
flexible, and arbitrarily granular control over log management and
diff --git a/debian/liblog4cplus-1.1-9.install b/debian/liblog4cplus-1.1-9.install
deleted file mode 100644
index 7efebcf..0000000
--- a/debian/liblog4cplus-1.1-9.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/liblog4cplus-1.1.so.*
diff --git a/debian/liblog4cplus-2.0-3.install b/debian/liblog4cplus-2.0-3.install
new file mode 100644
index 0000000..6f4e421
--- /dev/null
+++ b/debian/liblog4cplus-2.0-3.install
@@ -0,0 +1 @@
+usr/lib/*/liblog4cplus-2.0.so.*
diff --git a/debian/rules b/debian/rules
index 0a1b5ed..254fe80 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,9 @@ export DEB_CXXFLAGS_MAINT_APPEND := --std=c++11
%:
dh $@ --with autoreconf
+override_dh_auto_configure:
+ dh_auto_configure -- --enable-static
+
override_dh_strip:
dh_strip --dbgsym-migration='liblog4cplus-dbg (<< 1.1.2-3.3~)'
@@ -14,5 +17,5 @@ override_dh_install:
override_dh_link:
dh_link -pliblog4cplus-dev \
- usr/lib/$(DEB_HOST_MULTIARCH)/liblog4cplus-1.1.so.9.0.0 \
- usr/lib/$(DEB_HOST_MULTIARCH)/liblog4cplus-1.1.so
+ usr/lib/$(DEB_HOST_MULTIARCH)/liblog4cplus-2.0.so.3.4.4 \
+ usr/lib/$(DEB_HOST_MULTIARCH)/liblog4cplus-2.0.so
--
2.23.0.359.gb967887aa5
From 94a520f475b060922eca639fa1aaf441672662de Mon Sep 17 00:00:00 2001
From: Guillem Jover <gjo...@sipwise.com>
Date: Thu, 19 Sep 2019 00:01:28 +0200
Subject: [PATCH 06/16] Update debian/copyright
- Switch to machine readable format 1.0.
- Correct license information to list Apache-2.0 instead of Apache-1.1.
- Update copyright holders and years.
---
debian/changelog | 4 +
debian/copyright | 199 ++++++++++++++++++++---------------------------
2 files changed, 87 insertions(+), 116 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index c4aafda..2a53745 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,10 @@ log4cplus (2.0.4-0.1) UNRELEASED; urgency=medium
- Add upstream signing key.
- Update regex to fetch .xz based tarballs, and the correct version part.
- Add version (debian) and script (uupdate) fields.
+ * Update debian/copyright:
+ - Switch to machine readable format 1.0.
+ - Correct license information to list Apache-2.0 instead of Apache-1.1.
+ - Update copyright holders and years.
-- Guillem Jover <gjo...@sipwise.com> Fri, 13 Sep 2019 23:31:35 +0200
diff --git a/debian/copyright b/debian/copyright
index 9739e4e..7e1004d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,118 +1,85 @@
-This work was packaged for Debian by:
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Source: http://sourceforge.net/projects/log4cplus/files/
- Daigo Moriwaki <da...@debian.org> on Fri, 16 Apr 2010 17:46:34 +0900
- Eric Kom <eric...@kom.za.net> also hacked on it a bit
- Andrew Pollock <apoll...@debian.org> cleaned up their work and got it over the line
-
-It was downloaded from:
-
- http://sourceforge.net/projects/log4cplus/files/
-
-Upstream Authors:
-
- Tad E. Smith <tcsm...@users.sourceforge.net>
- Michael CATANZARITI
- Steighton Haley <baldheaded...@users.sourceforge.net>
- Eduardo Francos <gu...@users.sourceforge.net>
- Vaclav Haisman <w...@users.sourceforge.net>
-
-Copyright:
-
- Copyright (C) Tad E. Smith All rights reserved.
- Copyright (C) Michael CATANZARITI All rights reserved.
- Copyright (C) Odalio SARL. All rights reserved.
- Copyright (C) 1999-2009 Contributors to log4cplus project.
- Copyright (C) 1999 The Apache Software Foundation. All rights reserved.
-
-License:
-
-Log4j license
-=============
-
-/*
- * ============================================================================
- * The Apache Software License, Version 1.1
- * ============================================================================
- *
- * Copyright (C) 1999 The Apache Software Foundation. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modifica-
- * tion, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * 3. The end-user documentation included with the redistribution, if any, must
- * include the following acknowledgment: "This product includes software
- * developed by the Apache Software Foundation (http://www.apache.org/)."
- * Alternately, this acknowledgment may appear in the software itself, if
- * and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "log4j" and "Apache Software Foundation" must not be used to
- * endorse or promote products derived from this software without prior
- * written permission. For written permission, please contact
- * apa...@apache.org.
- *
- * 5. Products derived from this software may not be called "Apache", nor may
- * "Apache" appear in their name, without prior written permission of the
- * Apache Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
- * DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * on behalf of the Apache Software Foundation. For more information on the
- * Apache Software Foundation, please see <http://www.apache.org/>.
+Files:
*
- */
-
-
-Log4cplus license
-=================
-
-/*
- * Copyright (C) 1999-2009 Contributors to log4cplus project.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modifica-
- * tion, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
- * DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-The Debian packaging is:
-
- Copyright (C) 2010 Daigo Moriwaki <da...@debian.org>
- Copyright (C) 2011 Andrew Pollock <apoll...@debian.org>
-
-and is licensed under the GPL version 3,
-see "/usr/share/common-licenses/GPL-3".
+Copyright:
+ Copyright © 1999 The Apache Software Foundation. All rights reserved.
+ Copyright © 1999-2009 Contributors to log4cplus project.
+ Copyright © 1999-2017 Tad E. Smith
+ Copyright © 2003-2017 Christopher R. Bailey
+ Copyright © 2003-2017 Michael CATANZARITI
+ Copyright © 2003-2017 Odalio SARL
+ Copyright © 2009-2018 Vaclav Haisman. All rights reserved.
+ Copyright © 2010-2017 Vaclav Zeman. All rights reserved.
+ Copyright © 2010-2019 Two Blue Cubes Ltd. All rights reserved.
+ Copyright © 2011-2017 Jens Rehsack & Tad E. Smithç
+ Copyright © 2012, 2015 Martin Moene. All rights reserved.
+ Copyright © 2012-2015 Jakob Progsch
+ Copyright © 2012-2017 Siva Chandran P
+ Copyright © 2018 Jens Rehsack. All rights reserved
+License: Apache-2.0 or BSD-2-clause
+
+Files:
+ debian/*
+Copyright:
+ Copyright © 2010 Daigo Moriwaki <da...@debian.org>
+ Copyright © 2011 Andrew Pollock <apoll...@debian.org>
+License: GPL-3+
+
+License: BSD-2-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ .
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ .
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in
+ the documentation and/or other materials provided with the
+ distribution.
+ .
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
+ INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
+ DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+License: Apache-2.0
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ .
+ http://www.apache.org/licenses/LICENSE-2.0
+ .
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+Comment:
+ On Debian systems, the complete text of the Apache License version 2 can
+ be found in '/usr/share/common-licenses/Apache-2.0'.
+
+License: GPL-3+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+Comment:
+ On Debian systems, the complete text of the GNU General Public License
+ can be found in ‘/usr/share/common-licenses/GPL-3’.
--
2.23.0.359.gb967887aa5
From b05056b2cadcb53170d2affc9ece6c90cd86dd1c Mon Sep 17 00:00:00 2001
From: Guillem Jover <gjo...@sipwise.com>
Date: Thu, 19 Sep 2019 00:01:30 +0200
Subject: [PATCH 07/16] Switch to https:// URLs from http:// where possible
---
debian/changelog | 1 +
debian/control | 2 +-
debian/copyright | 6 +++---
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 2a53745..9bf4126 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,7 @@ log4cplus (2.0.4-0.1) UNRELEASED; urgency=medium
- Switch to machine readable format 1.0.
- Correct license information to list Apache-2.0 instead of Apache-1.1.
- Update copyright holders and years.
+ * Switch to https:// URLs from http:// where possible.
-- Guillem Jover <gjo...@sipwise.com> Fri, 13 Sep 2019 23:31:35 +0200
diff --git a/debian/control b/debian/control
index e35d0e3..7c33fa5 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends:
doxygen,
libtool,
Standards-Version: 3.9.6
-Homepage: http://log4cplus.sourceforge.net
+Homepage: https://log4cplus.sourceforge.net
Vcs-Browser: http://git.debian.org/?p=collab-maint/log4cplus.git;a=summary
Vcs-Git: git://git.debian.org/collab-maint/log4cplus.git
diff --git a/debian/copyright b/debian/copyright
index 7e1004d..cb4c729 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,5 +1,5 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Source: http://sourceforge.net/projects/log4cplus/files/
+Source: https://sourceforge.net/projects/log4cplus/files/
Files:
*
@@ -56,7 +56,7 @@ License: Apache-2.0
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
.
- http://www.apache.org/licenses/LICENSE-2.0
+ https://www.apache.org/licenses/LICENSE-2.0
.
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
@@ -79,7 +79,7 @@ License: GPL-3+
GNU General Public License for more details.
.
You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
+ along with this program. If not, see <https://www.gnu.org/licenses/>.
Comment:
On Debian systems, the complete text of the GNU General Public License
can be found in ‘/usr/share/common-licenses/GPL-3’.
--
2.23.0.359.gb967887aa5
From 4a4a6f51c274a333e54be0b51dadfaebaa1df52f Mon Sep 17 00:00:00 2001
From: Guillem Jover <gjo...@sipwise.com>
Date: Thu, 19 Sep 2019 00:01:33 +0200
Subject: [PATCH 08/16] Switch from obsolete extra Priority to optional
---
debian/changelog | 1 +
debian/control | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 9bf4126..493a267 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,7 @@ log4cplus (2.0.4-0.1) UNRELEASED; urgency=medium
- Correct license information to list Apache-2.0 instead of Apache-1.1.
- Update copyright holders and years.
* Switch to https:// URLs from http:// where possible.
+ * Switch from obsolete extra Priority to optional.
-- Guillem Jover <gjo...@sipwise.com> Fri, 13 Sep 2019 23:31:35 +0200
diff --git a/debian/control b/debian/control
index 7c33fa5..2d0c303 100644
--- a/debian/control
+++ b/debian/control
@@ -1,6 +1,6 @@
Source: log4cplus
Section: libs
-Priority: extra
+Priority: optional
Maintainer: Andrew Pollock <apoll...@debian.org>
Uploaders:
Eric Kom <eric...@kom.za.net>,
--
2.23.0.359.gb967887aa5
From aed317da04413e8d0f34985a066565b6ac8a157b Mon Sep 17 00:00:00 2001
From: Guillem Jover <gjo...@sipwise.com>
Date: Thu, 19 Sep 2019 00:01:35 +0200
Subject: [PATCH 09/16] Switch to debhelper-compat level 12 in Build-Depends
from debian/compat
- Remove dh-autoreconf from Build-Depends and from dh arguments.
---
debian/changelog | 2 ++
debian/compat | 1 -
debian/control | 3 +--
debian/rules | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
delete mode 100644 debian/compat
diff --git a/debian/changelog b/debian/changelog
index 493a267..11881b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,8 @@ log4cplus (2.0.4-0.1) UNRELEASED; urgency=medium
- Update copyright holders and years.
* Switch to https:// URLs from http:// where possible.
* Switch from obsolete extra Priority to optional.
+ * Switch to debhelper-compat level 12 in Build-Depends from debian/compat.
+ - Remove dh-autoreconf from Build-Depends and from dh arguments.
-- Guillem Jover <gjo...@sipwise.com> Fri, 13 Sep 2019 23:31:35 +0200
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index ec63514..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-9
diff --git a/debian/control b/debian/control
index 2d0c303..0af3dc4 100644
--- a/debian/control
+++ b/debian/control
@@ -6,8 +6,7 @@ Uploaders:
Eric Kom <eric...@kom.za.net>,
Build-Depends:
automake,
- debhelper (>= 9),
- dh-autoreconf,
+ debhelper-compat (= 12),
doxygen,
libtool,
Standards-Version: 3.9.6
diff --git a/debian/rules b/debian/rules
index 254fe80..9e1058c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
export DEB_CXXFLAGS_MAINT_APPEND := --std=c++11
%:
- dh $@ --with autoreconf
+ dh $@
override_dh_auto_configure:
dh_auto_configure -- --enable-static
--
2.23.0.359.gb967887aa5
From 918393bbbd8928c15bdf0d4029c2dc29bf88235c Mon Sep 17 00:00:00 2001
From: Guillem Jover <gjo...@sipwise.com>
Date: Thu, 19 Sep 2019 00:01:38 +0200
Subject: [PATCH 10/16] =?UTF-8?q?Mark=20library=20and=20development=20pack?=
=?UTF-8?q?ages=20as=20=C2=ABMulti-Arch:=20same=C2=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Closes: #811183
---
debian/changelog | 2 ++
debian/control | 2 ++
2 files changed, 4 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 11881b4..fc04ba1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,8 @@ log4cplus (2.0.4-0.1) UNRELEASED; urgency=medium
* Switch from obsolete extra Priority to optional.
* Switch to debhelper-compat level 12 in Build-Depends from debian/compat.
- Remove dh-autoreconf from Build-Depends and from dh arguments.
+ * Mark library and development packages as «Multi-Arch: same».
+ (Closes: #811183)
-- Guillem Jover <gjo...@sipwise.com> Fri, 13 Sep 2019 23:31:35 +0200
diff --git a/debian/control b/debian/control
index 0af3dc4..e792c6b 100644
--- a/debian/control
+++ b/debian/control
@@ -16,6 +16,7 @@ Vcs-Git: git://git.debian.org/collab-maint/log4cplus.git
Package: liblog4cplus-2.0-3
Architecture: any
+Multi-Arch: same
Depends:
${misc:Depends},
${shlibs:Depends},
@@ -26,6 +27,7 @@ Description: C++ logging API modeled after the Java log4j API - shared library
Package: liblog4cplus-dev
Architecture: any
+Multi-Arch: same
Section: libdevel
Depends:
${misc:Depends},
--
2.23.0.359.gb967887aa5
From a2482903d2a481bcfb0e8f52c542ab57d8250c98 Mon Sep 17 00:00:00 2001
From: Guillem Jover <gjo...@sipwise.com>
Date: Thu, 19 Sep 2019 00:01:40 +0200
Subject: [PATCH 11/16] Stop installing *.la files
---
debian/changelog | 1 +
debian/liblog4cplus-dev.install | 1 -
debian/rules | 4 ----
3 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index fc04ba1..8efd8b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,7 @@ log4cplus (2.0.4-0.1) UNRELEASED; urgency=medium
- Remove dh-autoreconf from Build-Depends and from dh arguments.
* Mark library and development packages as «Multi-Arch: same».
(Closes: #811183)
+ * Stop installing *.la files.
-- Guillem Jover <gjo...@sipwise.com> Fri, 13 Sep 2019 23:31:35 +0200
diff --git a/debian/liblog4cplus-dev.install b/debian/liblog4cplus-dev.install
index 810dd95..3862940 100644
--- a/debian/liblog4cplus-dev.install
+++ b/debian/liblog4cplus-dev.install
@@ -1,4 +1,3 @@
usr/include/log4cplus/*
usr/lib/*/liblog4cplus.a
-usr/lib/*/liblog4cplus.la
usr/lib/*/liblog4cplus.so
diff --git a/debian/rules b/debian/rules
index 9e1058c..af0b4b0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,10 +11,6 @@ override_dh_auto_configure:
override_dh_strip:
dh_strip --dbgsym-migration='liblog4cplus-dbg (<< 1.1.2-3.3~)'
-override_dh_install:
- sed -i "/dependency_libs/ s/'.*'/''/" `find . -name '*.la'`
- dh_install
-
override_dh_link:
dh_link -pliblog4cplus-dev \
usr/lib/$(DEB_HOST_MULTIARCH)/liblog4cplus-2.0.so.3.4.4 \
--
2.23.0.359.gb967887aa5
From 3618cfc1deab90a6d0a2c146af3a4a84427425df Mon Sep 17 00:00:00 2001
From: Guillem Jover <gjo...@sipwise.com>
Date: Thu, 19 Sep 2019 00:01:42 +0200
Subject: [PATCH 12/16] Install pkgconfig file
---
debian/changelog | 1 +
debian/liblog4cplus-dev.install | 1 +
2 files changed, 2 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 8efd8b8..e138bbf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,7 @@ log4cplus (2.0.4-0.1) UNRELEASED; urgency=medium
* Mark library and development packages as «Multi-Arch: same».
(Closes: #811183)
* Stop installing *.la files.
+ * Install pkgconfig file.
-- Guillem Jover <gjo...@sipwise.com> Fri, 13 Sep 2019 23:31:35 +0200
diff --git a/debian/liblog4cplus-dev.install b/debian/liblog4cplus-dev.install
index 3862940..c683d2d 100644
--- a/debian/liblog4cplus-dev.install
+++ b/debian/liblog4cplus-dev.install
@@ -1,3 +1,4 @@
usr/include/log4cplus/*
+usr/lib/*/pkgconfig/*
usr/lib/*/liblog4cplus.a
usr/lib/*/liblog4cplus.so
--
2.23.0.359.gb967887aa5
From 30bc8103d0e7d576de8354184beb8f2eb15c1774 Mon Sep 17 00:00:00 2001
From: Guillem Jover <gjo...@sipwise.com>
Date: Thu, 19 Sep 2019 00:01:45 +0200
Subject: [PATCH 13/16] Remove debian/docs, as the contents are irrelevant
---
debian/changelog | 1 +
debian/docs | 3 ---
2 files changed, 1 insertion(+), 3 deletions(-)
delete mode 100644 debian/docs
diff --git a/debian/changelog b/debian/changelog
index e138bbf..eb060ce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,6 +27,7 @@ log4cplus (2.0.4-0.1) UNRELEASED; urgency=medium
(Closes: #811183)
* Stop installing *.la files.
* Install pkgconfig file.
+ * Remove debian/docs, as the contents are irrelevant.
-- Guillem Jover <gjo...@sipwise.com> Fri, 13 Sep 2019 23:31:35 +0200
diff --git a/debian/docs b/debian/docs
deleted file mode 100644
index 5b6f9c6..0000000
--- a/debian/docs
+++ /dev/null
@@ -1,3 +0,0 @@
-CMakeLists.txt
-NEWS
-README
--
2.23.0.359.gb967887aa5
From c6628b51ebb9add2410e70c8de7603f24d688f1c Mon Sep 17 00:00:00 2001
From: Guillem Jover <gjo...@sipwise.com>
Date: Thu, 19 Sep 2019 00:01:47 +0200
Subject: [PATCH 14/16] Enable all hardening features
Although relro gets disabled due to an apparent bug in binutils strip.
Closes: #761133
---
debian/changelog | 2 ++
debian/rules | 1 +
2 files changed, 3 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index eb060ce..a09d4ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,8 @@ log4cplus (2.0.4-0.1) UNRELEASED; urgency=medium
* Stop installing *.la files.
* Install pkgconfig file.
* Remove debian/docs, as the contents are irrelevant.
+ * Enable all hardening features, although relro gets disabled due to
+ an apparent bug in binutils strip. (Closes: #761133)
-- Guillem Jover <gjo...@sipwise.com> Fri, 13 Sep 2019 23:31:35 +0200
diff --git a/debian/rules b/debian/rules
index af0b4b0..f9f4115 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,7 @@
#!/usr/bin/make -f
export DEB_CXXFLAGS_MAINT_APPEND := --std=c++11
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
%:
dh $@
--
2.23.0.359.gb967887aa5
From 63ef99b2a108b3cf2e2df9d4dcc5f43ca6dfd284 Mon Sep 17 00:00:00 2001
From: Guillem Jover <gjo...@sipwise.com>
Date: Thu, 19 Sep 2019 00:01:49 +0200
Subject: [PATCH 15/16] Remove trailing space from package description
---
debian/changelog | 1 +
debian/control | 3 +--
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index a09d4ba..b59d642 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,6 +30,7 @@ log4cplus (2.0.4-0.1) UNRELEASED; urgency=medium
* Remove debian/docs, as the contents are irrelevant.
* Enable all hardening features, although relro gets disabled due to
an apparent bug in binutils strip. (Closes: #761133)
+ * Remove trailing space from package description.
-- Guillem Jover <gjo...@sipwise.com> Fri, 13 Sep 2019 23:31:35 +0200
diff --git a/debian/control b/debian/control
index e792c6b..c99ace9 100644
--- a/debian/control
+++ b/debian/control
@@ -37,5 +37,4 @@ Description: C++ logging API modeled after the Java log4j API - development libr
flexible, and arbitrarily granular control over log management and
configuration. It is modeled after the Java log4j API.
.
- This package contains the header files and static library for
- developers.
+ This package contains the header files and static library for developers.
--
2.23.0.359.gb967887aa5
From 9be258ce9903156e953eda4f9f149b5c4329d679 Mon Sep 17 00:00:00 2001
From: Guillem Jover <gjo...@sipwise.com>
Date: Thu, 19 Sep 2019 00:01:55 +0200
Subject: [PATCH 16/16] Switch to Standards-Version 4.4.0
---
debian/changelog | 1 +
debian/control | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index b59d642..ed85828 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -31,6 +31,7 @@ log4cplus (2.0.4-0.1) UNRELEASED; urgency=medium
* Enable all hardening features, although relro gets disabled due to
an apparent bug in binutils strip. (Closes: #761133)
* Remove trailing space from package description.
+ * Switch to Standards-Version 4.4.0.
-- Guillem Jover <gjo...@sipwise.com> Fri, 13 Sep 2019 23:31:35 +0200
diff --git a/debian/control b/debian/control
index c99ace9..7208034 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends:
debhelper-compat (= 12),
doxygen,
libtool,
-Standards-Version: 3.9.6
+Standards-Version: 4.4.0
Homepage: https://log4cplus.sourceforge.net
Vcs-Browser: http://git.debian.org/?p=collab-maint/log4cplus.git;a=summary
Vcs-Git: git://git.debian.org/collab-maint/log4cplus.git
--
2.23.0.359.gb967887aa5
