[cpp-log4shib] 04/26: Overhaul packaging and flesh out changelog
Scott Cantor
cantor.2 at osu.edu
Tue Oct 19 16:13:10 UTC 2021
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to annotated tag debian/1.0.4-1
in repository cpp-log4shib.
View the commit online:
http://git.shibboleth.net/view/?p=cpp-log4shib.git;a=commit;h=47fb618eb33da2faeed2e782f924da51a3d5e5d6
commit 47fb618eb33da2faeed2e782f924da51a3d5e5d6
Author: Russ Allbery <rra at stanford.edu>
AuthorDate: Tue Jun 5 18:40:29 2012 -0700
Overhaul packaging and flesh out changelog
* Add Maintainer, Uploaders, and Vcs-* headers for the pkg-shibboleth
packaging team.
* Work around issues with -lpthread and libtool and with picking up
dpkg-buildflags options in pkgconfig using code copied from
opensaml2.
* Remove any copy of jQuery installed by Doxygen and use the version
packaged for Debian.
* Regenerate the build system with dh_autoreconf during build.
* Enable --as-needed to avoid unnecessary build dependencies.
* Update package long descriptions from the ITP.
* Change package section to devel from contrib/devel.
* Lower the priority to extra.
* Convert the shared library package to multiarch.
* Add a watch file.
* Update debhelper compatibility level to V9.
- Add ${misc:Depends} to all dependencies.
- Use dpkg-buildflags for compiler and linker flags.
- Enable hardening flags.
* Update standards version to 3.9.3.
* Rewrite debian/copyright in the copyright-format 1.0 format and
include more licensing and copyright information.
Also add a changelog for the new upstream version.
---
debian/changelog | 25 ++++
debian/compat | 1 +
debian/control | 73 +++++++----
debian/copyright | 262 +++++++++++++++++++++++++++++++++++++---
debian/liblog4shib-dev.dirs | 2 -
debian/liblog4shib-dev.files | 4 -
debian/liblog4shib-dev.install | 3 +
debian/liblog4shib-doc.doc-base | 11 ++
debian/liblog4shib-doc.files | 1 -
debian/liblog4shib-doc.install | 1 +
debian/liblog4shib0.files | 1 -
debian/liblog4shib0.install | 1 +
debian/rules | 136 ++++++++-------------
debian/watch | 2 +
14 files changed, 395 insertions(+), 128 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index de15391..f7d911d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,31 @@ log4shib (1.0.4-1) UNRELEASED; urgency=low
* Initial upload to Debian based on the Debian packaging done by Scott
Cantor and included with the upstream source. (Closes: #666263)
+ * New upstream release.
+ - Fix error handling when Appenders fail.
+ - Fix crash when file appender can't open file.
+ - Fix varargs issue on x86_64.
+ * Add Maintainer, Uploaders, and Vcs-* headers for the pkg-shibboleth
+ packaging team.
+ * Work around issues with -lpthread and libtool and with picking up
+ dpkg-buildflags options in pkgconfig using code copied from
+ opensaml2.
+ * Remove any copy of jQuery installed by Doxygen and use the version
+ packaged for Debian.
+ * Regenerate the build system with dh_autoreconf during build.
+ * Enable --as-needed to avoid unnecessary build dependencies.
+ * Update package long descriptions from the ITP.
+ * Change package section to devel from contrib/devel.
+ * Lower the priority to extra.
+ * Convert the shared library package to multiarch.
+ * Add a watch file.
+ * Update debhelper compatibility level to V9.
+ - Add ${misc:Depends} to all dependencies.
+ - Use dpkg-buildflags for compiler and linker flags.
+ - Enable hardening flags.
+ * Update standards version to 3.9.3.
+ * Rewrite debian/copyright in the copyright-format 1.0 format and
+ include more licensing and copyright information.
-- Russ Allbery <rra at debian.org> Tue, 05 Jun 2012 16:30:38 -0700
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/control b/debian/control
index 3a1b842..ab61000 100644
--- a/debian/control
+++ b/debian/control
@@ -1,33 +1,62 @@
Source: log4shib
-Section: contrib/devel
-Priority: optional
-Maintainer: Scott Cantor <cantor.2 at osu.edu>
-Standards-Version: 1.0.0
-Build-Depends: debhelper (>> 3.0.0), libtool, doxygen, graphviz
+Section: devel
+Priority: extra
+Maintainer: Debian Shib Team <pkg-shibboleth-devel at lists.alioth.debian.org>
+Uploaders: Russ Allbery <rra at debian.org>
+Build-Depends: debhelper (>= 9), dh-autoreconf, doxygen, graphviz
+Standards-Version: 3.9.3
+Homepage: https://wiki.shibboleth.net/confluence/display/OpenSAML/log4shib
+Vcs-Git: git://git.debian.org/git/pkg-shibboleth/log4shib.git
+Vcs-Browser: http://git.debian.org/?p=pkg-shibboleth/log4shib.git
Package: liblog4shib0
Architecture: any
+Multi-Arch: same
Section: libs
-Depends: ${shlibs:Depends}
-Description: A C++ library for flexible logging
- Log for C++ is a library of C++ classes for flexible logging to files,
- syslog and other destinations. It is modeled after the Log for
- Java library (http://jakarta.apache.org/log4j/), staying as close to
- their API as is reasonable.
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: log4j-style configurable logging library for C++ (runtime)
+ log4shib provides a library of C++ classes for flexible logging to
+ files, syslog, and other destinations. It is modeled after the log4j
+ Java library, staying as close to that API as is reasonable.
+ .
+ log4shib is a fork of the log4cpp library with additional fixes and
+ modifications to improve its thread safety and robustness. It is
+ primarily intended for use by the Shibboleth web authentication
+ system.
+ .
+ This package contains the files necessary for running applications that
+ use the log4shib library.
Package: liblog4shib-dev
Architecture: any
-Depends: liblog4shib0 (= ${Source-Version}), libc6-dev
-Description: A C++ library for flexible logging (development files)
- Log for C++ is a library of C++ classes for flexible logging to files,
- syslog and other destinations. It is modeled after the Log for
- Java library (http://jakarta.apache.org/log4j/), staying as close to
- their API as is reasonable.
+Depends: ${misc:Depends}, liblog4shib0 (= ${binary:Version})
+Description: log4j-style configurable logging library for C++ (development)
+ log4shib provides a library of C++ classes for flexible logging to
+ files, syslog, and other destinations. It is modeled after the log4j
+ Java library, staying as close to that API as is reasonable.
+ .
+ log4shib is a fork of the log4cpp library with additional fixes and
+ modifications to improve its thread safety and robustness. It is
+ primarily intended for use by the Shibboleth web authentication
+ system.
+ .
+ This package contains the headers and other necessary files to build
+ applications or libraries that use or extend the log4shib library.
Package: liblog4shib-doc
+Section: doc
Architecture: all
-Description: A C++ library for flexible logging (documentation)
- Log for C++ is a library of C++ classes for flexible logging to files,
- syslog and other destinations. It is modeled after the Log for
- Java library (http://jakarta.apache.org/log4j/), staying as close to
- their API as is reasonable.
+Depends: ${misc:Depends}, libjs-jquery
+Description: log4j-style configurable logging library for C++ (API docs)
+ log4shib provides a library of C++ classes for flexible logging to
+ files, syslog, and other destinations. It is modeled after the log4j
+ Java library, staying as close to that API as is reasonable.
+ .
+ log4shib is a fork of the log4cpp library with additional fixes and
+ modifications to improve its thread safety and robustness. It is
+ primarily intended for use by the Shibboleth web authentication
+ system.
+ .
+ This package contains the log4shib library API documentation generated
+ by Doxygen.
diff --git a/debian/copyright b/debian/copyright
index 0706caf..9f6a44e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,20 +1,252 @@
-This package was debianized by Marcel Harkema <marcel at debian.org>
-on Sat, 7 Apr 2001 19:24:11 +0100.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Source: http://shibboleth.net/downloads/log4shib/
-Original source was modified based on source from:
- http://sourceforge.net/projects/log4cpp/
+Files: *
+Copyright: 2007 Internet2
+ 2000,2001 LifeLine Networks BV (www.lifeline.nl)
+ 2000,2001,2002 Bastiaan Bakker
+ 2000 Marc Welz
+ 2001 Glen Scott
+ 2001 Walter Stroebel
+ 2002 Log4cpp Project
+License: LGPL-2.1
-Homepage:
- http://shibboleth.internet2.edu/
+Files: debian/*
+Copyright: 2007 Internet2
+ 2012 Russ Allbery
+License: LGPL-2.1
-Copyright:
- Copyright (C) 2007 Internet2
- Copyright (C) 2000,2001 LifeLine Networks bv
- Copyright (C) 2000,2001 Bastiaan Bakker
+Files: */Makefile.in aclocal.m4
+Copyright: 1994,1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
+ Free Software Foundation, Inc.
+License: FSF-unlimited
+ This file is free software; the Free Software Foundation
+ gives unlimited permission to copy and/or distribute it,
+ with or without modifications, as long as this notice is preserved.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+ even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ PARTICULAR PURPOSE.
-License:
- GNU Lesser General Public License. A copy of the GNU Lesser General
- Public License, version 2.1, can be found in /usr/share/common-licenses/LGPL-2.1
+Files: config/config.guess config/config.sub config/depcomp config/missing
+Copyright: 1992,1993,1994,1995,1996,1997,1998,1999,2000,2001,2002,2003
+ Free Software Foundation, Inc.
+License: GPL-2+ or configure-same-as-package
+ This file 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 2 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.
+ .
+ The full text of the GNU General Public License version 2 is available on
+ Debian systems in /usr/share/common-licenses/GPL-2.
+ .
+ As a special exception to the GNU General Public License, if you
+ distribute this file as part of a program that contains a configuration
+ script generated by Autoconf, you may include it under the same
+ distribution terms that you use for the rest of that program.
-Debian package maintainer:
- Scott Cantor <cantor.2 at osu.edu>
+Files: config/install-sh
+Copyright: (C) 1994 X Consortium
+License: Expat
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+ .
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Files: config/ltmain.sh
+Copyright: 1996,1997,1998,1999,2000,2001,2003
+ Free Software Foundation, Inc.
+License: GPL-2+ or libtool-same-as-package
+ GNU Libtool 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 2 of the License, or
+ (at your option) any later version.
+ .
+ As a special exception to the GNU General Public License,
+ if you distribute this file as part of a program or library that
+ is built using GNU Libtool, you may include this file under the
+ same distribution terms that you use for the rest of that program.
+ .
+ GNU Libtool 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.
+
+Files: m4/acx_pthread.m4
+Copyright: 2006 Steven G. Johnson <stevenj at alum.mit.edu>
+License: GPL-2+ or macro-archive-same-as-package
+ 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 2 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.
+ .
+ The full text of the GNU General Public License version 2 is available on
+ Debian systems in /usr/share/common-licenses/GPL-2.
+ .
+ As a special exception, the respective Autoconf Macro's copyright owner
+ gives unlimited permission to copy, distribute and modify the configure
+ scripts that are the output of Autoconf when processing the Macro. You
+ need not follow the terms of the GNU General Public License when using or
+ distributing such scripts, even though portions of the text of the Macro
+ appear in them. The GNU General Public License (GPL) does govern all
+ other use of the material that constitutes the Autoconf Macro.
+ .
+ This special exception to the GPL applies to versions of the Autoconf
+ Macro released by the Autoconf Macro Archive. When you make and
+ distribute a modified version of the Autoconf Macro, you may extend this
+ special exception to the GPL to apply to your modified version as well.
+
+Files: src/snprintf.c
+Copyright: 1999 Mark Martinec
+License: frontier-artistic
+ THE FRONTIER ARTISTIC LICENSE Version 1.0
+ Copyright (c) 1999 by Samuel Reynolds.
+ Derived from the "Artistic License" at "OpenSource.org".
+ Submitted to OpenSource.org for Open Source Initiative certification.
+ .
+ PREAMBLE
+ .
+ The intent of this document is to state the conditions under which a
+ Package may be copied, such that the Copyright Holder maintains some
+ semblance of artistic control over the development of the package,
+ while giving the users of the package the right to use and distribute
+ the Package in a more-or-less customary fashion, plus the right to
+ make reasonable modifications.
+ .
+ DEFINITIONS
+ .
+ o "Package" refers to the script, suite, file, or collection of scripts,
+ suites, and/or files distributed by the Copyright Holder, and to
+ derivatives of that Package created through textual modification.
+ .
+ o "Standard Version" refers to such a Package if it has not been
+ modified, or has been modified in accordance with the wishes of the
+ Copyright Holder.
+ .
+ o "Copyright Holder" is whoever is named in the copyright statement or
+ statements for the package.
+ .
+ o "You" is you, if you're thinking about copying or distributing this
+ Package.
+ .
+ o "Reasonable copying fee" is whatever you can justify on the basis of
+ media cost, duplication charges, time of people involved, and so on.
+ (You will not be required to justify it to the Copyright Holder, but
+ only to the computing community at large as a market that must bear the
+ fee.)
+ .
+ o "Freely Available" means that no fee is charged for the item itself,
+ though there may be fees involved in handling the item. It also means
+ that recipients of the item may redistribute it under the same
+ conditions they received it.
+ .
+ TERMS
+ .
+ 1. You may make and give away verbatim copies of the source form of the
+ Standard Version of this Package without restriction, provided that you
+ duplicate all of the original copyright notices and associated disclaimers.
+ .
+ 2. You may apply bug fixes, portability fixes, and other modifications
+ derived from the Public Domain or from the Copyright Holder. A Package
+ modified in such a way shall still be considered the Standard Version.
+ .
+ 3. You may otherwise modify your copy of this Package in any way, provided
+ that you insert a prominent notice in each changed script, suite, or file
+ stating how and when you changed that script, suite, or file, and provided
+ that you do at least ONE of the following:
+ .
+ a) Use the modified Package only within your corporation or
+ organization, or retain the modified Package solely for personal use.
+ .
+ b) Place your modifications in the Public Domain or otherwise make them
+ Freely Available, such as by posting said modifications to Usenet or an
+ equivalent medium, or placing the modifications on a major archive site
+ such as ftp.uu.net, or by allowing the Copyright Holder to include your
+ modifications in the Standard Version of the Package.
+ .
+ c) Rename any non-standard executables so the names do not conflict
+ with standard executables, which must also be provided, and provide a
+ separate manual page (or equivalent) for each non-standard executable
+ that clearly documents how it differs from the Standard Version.
+ .
+ d) Make other distribution arrangements with the Copyright Holder.
+ .
+ 4. You may distribute the programs of this Package in object code or
+ executable form, provided that you do at least ONE of the following:
+ .
+ a) Distribute a Standard Version of the executables and library files,
+ together with instructions (in the manual page or equivalent) on where
+ to get the Standard Version.
+ .
+ b) Accompany the distribution with the machine-readable source of the
+ Package with your modifications.
+ .
+ c) Accompany any non-standard executables with their corresponding
+ Standard Version executables, give the non-standard executables
+ non-standard names, and clearly document the differences in manual
+ pages (or equivalent), together with instructions on where to get the
+ Standard Version.
+ .
+ d) Make other distribution arrangements with the Copyright Holder.
+ .
+ 5. You may charge a reasonable copying fee for any distribution of this
+ Package. You may charge any fee you choose for support of this Package.
+ You may not charge a fee for this Package itself. However, you may
+ distribute this Package in aggregate with other (possibly commercial)
+ programs as part of a larger (possibly commercial) software distribution
+ provided that you do not advertise this Package as a product of your own.
+ .
+ 6. The scripts and library files supplied as input to or produced as
+ output from the programs of this Package do not automatically fall under
+ the copyright of this Package, but belong to whomever generated them, and
+ may be sold commercially, and may be aggregated with this Package.
+ .
+ 7. Scripts, suites, or programs supplied by you that depend on or
+ otherwise make use of this Package shall not be considered part of this
+ Package.
+ .
+ 8. The name of the Copyright Holder may not be used to endorse or promote
+ products derived from this software without specific prior written
+ permission.
+ .
+ 9. THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
+ WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
+ MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+
+License: LGPL-2.1
+ This library is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License version 2.1 as
+ published by the Free Software Foundation.
+ .
+ This library 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 Lesser
+ General Public License for more details.
+ .
+ You can find a copy of the GNU Lesser General Public License version 2.1
+ at /usr/share/common-licenses/LGPL-2.1 on Debian systems.
diff --git a/debian/liblog4shib-dev.dirs b/debian/liblog4shib-dev.dirs
deleted file mode 100644
index 263d0b9..0000000
--- a/debian/liblog4shib-dev.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/include/log4shib
-usr/lib
diff --git a/debian/liblog4shib-dev.files b/debian/liblog4shib-dev.files
deleted file mode 100644
index cfd21a1..0000000
--- a/debian/liblog4shib-dev.files
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/lib/liblog4shib.a
-usr/lib/liblog4shib.la
-usr/lib/liblog4shib.so
-usr/include/log4shib
diff --git a/debian/liblog4shib-dev.install b/debian/liblog4shib-dev.install
new file mode 100644
index 0000000..9be10ff
--- /dev/null
+++ b/debian/liblog4shib-dev.install
@@ -0,0 +1,3 @@
+usr/include/*
+usr/lib/*/lib*.so
+usr/lib/*/pkgconfig/log4shib.pc
diff --git a/debian/liblog4shib-doc.doc-base b/debian/liblog4shib-doc.doc-base
new file mode 100644
index 0000000..b9ce678
--- /dev/null
+++ b/debian/liblog4shib-doc.doc-base
@@ -0,0 +1,11 @@
+Document: liblog4shib-doc
+Title: log4shib API documentation
+Author: Bastiaan Bakker and Scott Cantor
+Abstract: Doxygen generated HTML documentation of the log4shib library.
+Section: Programming/C++
+
+Format: HTML
+Index: /usr/share/doc/liblog4shib-doc/html/index.html
+Files: /usr/share/doc/liblog4shib-doc/html/*.html
+ /usr/share/doc/liblog4shib-doc/html/*.png
+ /usr/share/doc/liblog4shib-doc/html/*.css
diff --git a/debian/liblog4shib-doc.files b/debian/liblog4shib-doc.files
deleted file mode 100644
index 2ae7ac9..0000000
--- a/debian/liblog4shib-doc.files
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/man/man3
diff --git a/debian/liblog4shib-doc.install b/debian/liblog4shib-doc.install
new file mode 100644
index 0000000..3cafba7
--- /dev/null
+++ b/debian/liblog4shib-doc.install
@@ -0,0 +1 @@
+doc/html/* usr/share/doc/liblog4shib-doc
diff --git a/debian/liblog4shib0.files b/debian/liblog4shib0.files
deleted file mode 100644
index b74ef22..0000000
--- a/debian/liblog4shib0.files
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/liblog4shib.so.*
diff --git a/debian/liblog4shib0.install b/debian/liblog4shib0.install
new file mode 100644
index 0000000..3ddde58
--- /dev/null
+++ b/debian/liblog4shib0.install
@@ -0,0 +1 @@
+usr/lib/*/lib*.so.*
diff --git a/debian/rules b/debian/rules
index 8494515..947b9ac 100644
--- a/debian/rules
+++ b/debian/rules
@@ -1,85 +1,55 @@
#!/usr/bin/make -f
-# Uncomment this to turn on verbose mode.
-export DH_VERBOSE=1
-
-# This is the debhelper compatibility version to use.
-export DH_COMPAT=3
-
-# This has to be exported to make some magic below work.
-export DH_OPTIONS
-
-build: build-stamp
-build-stamp:
- dh_testdir
- if [ -x ./autogen.sh ] ; then ./autogen.sh ; fi
- ./configure --prefix=/usr --mandir=\$${prefix}/share/man
- $(MAKE)
- touch build-stamp
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp install-stamp
- -$(MAKE) clean
- -$(MAKE) distclean
- dh_clean
-
-install: DH_OPTIONS=
-install: install-stamp
-install-stamp: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
- # Add here commands to install the package into debian/tmp.
- $(MAKE) prefix=`pwd`/debian/tmp/usr install
- dh_movefiles
- # Copy class documentation (html) to doc/ directory of -doc package.
- mkdir -p debian/liblog4shib-doc/usr/share/doc/liblog4shib-doc/html
- mv debian/tmp/usr/doc/log4shib-*/html/* debian/liblog4shib-doc/usr/share/doc/liblog4shib-doc/html/
- touch install-stamp
-
-binary-common:
- dh_testdir
- dh_testroot
-# dh_installdebconf
- dh_installdocs
- dh_installexamples
- dh_installmenu
-# dh_installlogrotate
-# dh_installemacsen
-# dh_installpam
-# dh_installmime
-# dh_installinit
- dh_installman
- dh_installcron
- dh_installinfo
-# dh_undocumented
- dh_installchangelogs
- dh_link
- dh_compress
- dh_fixperms
- dh_makeshlibs --noscripts
- dh_installdeb
-# dh_perl
- dh_strip
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-# Build architecture dependant packages using the common target.
-binary-arch: build install
- $(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
-
-# Build architecture independant packages using the common target.
-binary-indep: build install
- $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
-
-# Any other binary targets build just one binary package at a time.
-binary-%: build install
- $(MAKE) -f debian/rules binary-common DH_OPTIONS=-p$*
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+# Enable compiler hardening flags.
+export DEB_BUILD_MAINT_OPTIONS = hardening=+bindnow,+pie
+
+# 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
+
+# Set the results of dpkg-buildflags as make variables. We don't use this
+# to communicate to dh_auto_configure; it calls dpkg-buildflags itself.
+# It's only used to strip those flags out of the pkgconfig file. If we
+# can't import this, we don't care.
+-include /usr/share/dpkg/buildflags.mk
+
+DOCS = debian/liblog4shib-doc/usr/share/doc/liblog4shib-doc
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ DEBUG = --enable-debug
+else
+ DEBUG =
+endif
+
+override_dh_auto_configure:
+ dh_auto_configure -- --disable-dependency-tracking $(DEBUG)
+
+# Remove the upstream-installed documentation, and strip the build flags out
+# of the Cflags and Libs pkgconfig configuration. LDFLAGS and CPPFLAGS are
+# set by /usr/share/dpkg/buildflags.mk above.
+override_dh_install:
+ dh_install -a -i --fail-missing
+ perl -i -pe 's/^(Libs: .*)\Q$(LDFLAGS)\E/$$1/' \
+ debian/*/usr/lib/*/pkgconfig/log4shib.pc
+ perl -i -pe 's/^(Cflags: .*)\Q$(CPPFLAGS)\E/$$1/' \
+ debian/*/usr/lib/*/pkgconfig/log4shib.pc
+
+override_dh_installdocs:
+ dh_installdocs -A doc/NOTICE.txt
+ set -e; if [ -d "$(DOCS)" ] ; then \
+ if [ -f "$(DOCS)/html/jquery.js" ] ; then \
+ rm $(DOCS)/html/jquery.js ; \
+ ln -s /usr/share/javascript/jquery/jquery.min.js \
+ $(DOCS)/html/jquery.js ; \
+ fi ; \
+ fi
+
+override_dh_autoreconf:
+ dh_autoreconf --as-needed
+
+%:
+ dh $@ --with autoreconf
+
+# Don't attempt to build the buildflags.mk file if it doesn't exist.
+/usr/share/dpkg/buildflags.mk:
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..9f394dc
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://www.shibboleth.net/downloads/log4shib/latest/log4shib-(.*)\.tar\.gz
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list