Merge lp:~noskcaj/ubuntu/trusty/libbsd/merge into lp:ubuntu/trusty/libbsd

[Jackson Doak]

Merge from debian. Fixes conflict with libelf-dev + packaging improvements

[Daniel Holbach (dholbach)]

Thanks. Uploaded.

review: Approve

Unmerged revisions

17. By Jackson Doak on 2014-03-14

update-maintainer

16. By Jackson Doak on 2014-03-14

* Merge from debian. Remaining changes:
  - Use dh-autoreconf to update config files.
  - Don't run the tests for cross builds.
* Take over standalone maintainership.
  <https://lists.debian.org/debian-bsd/2013/10/msg00227.html>.
* Now using Standards-Version 3.9.5 (no changes needed).
* Do not set source compression to xz, it's now the default.
* Remove packaging history from debian/copyright.
* Add signature checking support to debian/watch, and ship upstream
  signing keys in debian/upstream/signing-key.asc, exported with
  pgp-clean (signing-party) to avoid useless bloat.
* Only restore /usr/include/nlist.h if it's missing, or if it contains
  a libbsd instance of the header. And use the matching header from the
  replaced package, which should now be ABI-compatible. (Closes: #724747)
* Remove debian/README.Debian, which contains information provided in the
  package description.
* Re-enable libbsd-udeb package on all architectures, as rdate-udeb
* Restrict the udeb package to kfreebsd-*, as requested by Otavio Salvador.
* Improve package descriptions.

=== removed file 'debian/README.Debian'
--- debian/README.Debian	2008-07-26 22:57:42 +0000
+++ debian/README.Debian	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-libbsd for Debian
------------------
-
-This package is a collection of functions and definitions missing from glibc
-which are needed for the Debian porting to the FreeBSD kernel.
-
- -- Hector Garcia <[e-mail]>, Sun, 17 Jul 2005 16:17:35 +0200
-
 
=== modified file 'debian/changelog'
--- debian/changelog	2013-12-03 13:19:47 +0000
+++ debian/changelog	2014-03-14 20:52:05 +0000
@@ -1,3 +1,29 @@
+libbsd (0.6.0-2ubuntu1) trusty; urgency=medium
+
+  * Merge from debian. Remaining changes:
+    - Use dh-autoreconf to update config files.
+    - Don't run the tests for cross builds.
+
+ -- Jackson Doak <[e-mail]>  Sat, 15 Mar 2014 07:42:26 +1100
+
+libbsd (0.6.0-2) unstable; urgency=low
+
+  * Take over standalone maintainership.
+    <https://lists.debian.org/debian-bsd/2013/10/msg00227.html>.
+  * Now using Standards-Version 3.9.5 (no changes needed).
+  * Do not set source compression to xz, it's now the default.
+  * Remove packaging history from debian/copyright.
+  * Add signature checking support to debian/watch, and ship upstream
+    signing keys in debian/upstream/signing-key.asc, exported with
+    pgp-clean (signing-party) to avoid useless bloat.
+  * Only restore /usr/include/nlist.h if it's missing, or if it contains
+    a libbsd instance of the header. And use the matching header from the
+    replaced package, which should now be ABI-compatible. (Closes: #724747)
+  * Remove debian/README.Debian, which contains information provided in the
+    package description.
+
+ -- Guillem Jover <[e-mail]>  Tue, 04 Mar 2014 05:02:42 +0100
+
 libbsd (0.6.0-1ubuntu1) trusty; urgency=low
 
   * Use dh-autoreconf to update config files.
@@ -119,15 +145,14 @@
 
 libbsd (0.1.5-3) unstable; urgency=low
 
-  * Re-enable libbsd-udeb package on all architectures, as it rdate-udeb
+  * Re-enable libbsd-udeb package on all architectures, as rdate-udeb
     will need it.
 
  -- Aurelien Jarno <[e-mail]>  Mon, 27 Jul 2009 01:56:27 +0200
 
 libbsd (0.1.5-2) unstable; urgency=low
 
-  * Restrict the udeb package to kfreebsd-*, as requested by Otavio
-    Salvador.
+  * Restrict the udeb package to kfreebsd-*, as requested by Otavio Salvador.
 
  -- Aurelien Jarno <[e-mail]>  Mon, 20 Jul 2009 23:21:10 +0200
 
@@ -227,7 +252,7 @@
   * Improve debian/copyright.
     - Add detailed information about licenses and copyright holders.
     - Update upstream download URL.
-  * Improve package descrptions.
+  * Improve package descriptions.
     - Add list of currently provided functions.
     - Mention this is a package with functions commonly available on BSD
       systems.
 
=== modified file 'debian/control'
--- debian/control	2013-12-03 13:19:47 +0000
+++ debian/control	2014-03-14 20:52:05 +0000
@@ -1,13 +1,12 @@
 Source: libbsd
 Priority: optional
 Section: libs
-Maintainer: Debian GNU/kFreeBSD <[e-mail]>
-Uploaders: Hector Garcia <[e-mail]>,
- Guillem Jover <[e-mail]>, Aurelien Jarno <[e-mail]>
-Vcs-Browser: http://anonscm.debian.org/viewvc/glibc-bsd/trunk/libbsd/
-Vcs-Svn: svn://anonscm.debian.org/glibc-bsd/trunk/libbsd/
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Guillem Jover <[e-mail]>
+Vcs-Browser: http://git.hadrons.org/?p=debian/pkgs/libbsd.git
+Vcs-Git: git://git.hadrons.org/git/debian/pkgs/libbsd.git
 Build-Depends: dpkg-dev (>= 1.15.7), debhelper (>= 9), dh-autoreconf
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 Homepage: http://libbsd.freedesktop.org/
 
 Package: libbsd-dev
 
=== modified file 'debian/copyright'
--- debian/copyright	2013-06-08 18:55:59 +0000
+++ debian/copyright	2014-03-14 20:52:05 +0000
@@ -1,6 +1,3 @@
-This package was debianized by Hector Garcia <[e-mail]> on
-Sun, 17 Jul 2005 16:17:35 +0200.
-
 It was downloaded from:
 
     <http://libbsd.freedesktop.org/releases/>
 
=== modified file 'debian/libbsd-dev.postinst'
--- debian/libbsd-dev.postinst	2013-05-27 07:02:08 +0000
+++ debian/libbsd-dev.postinst	2014-03-14 20:52:05 +0000
@@ -2,6 +2,139 @@
 
 set -e
 
+cat_elfutils_body_nlist_h()
+{
+  cat <<"EOF"
+
+#ifndef _NLIST_H
+#define _NLIST_H 1
+
+
+/* Symbol list type.  */
+struct nlist
+{
+  char *n_name;			/* Symbol name.  */
+  long int n_value;		/* Value of symbol.  */
+  short int n_scnum;		/* Section number found in.  */
+  unsigned short int n_type;	/* Type of symbol.  */
+  char n_sclass;		/* Storage class.  */
+  char n_numaux;		/* Number of auxiliary entries.  */
+};
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Get specified entries from file.  */
+extern int nlist (__const char *__filename, struct nlist *__nl);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  /* nlist.h */
+EOF
+}
+
+cat_elfutils_old_nlist_h()
+{
+  cat <<"EOF"
+/* Interface for nlist.
+   Copyright (C) 1998, 1999, 2000, 2002 Red Hat, Inc.
+   This file is part of Red Hat elfutils.
+
+   Red Hat elfutils 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; version 2 of the License.
+
+   Red Hat elfutils 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 Red Hat elfutils; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301 USA.
+
+   In addition, as a special exception, Red Hat, Inc. gives You the
+   additional right to link the code of Red Hat elfutils with code licensed
+   under any Open Source Initiative certified open source license
+   (http://www.opensource.org/licenses/index.php) which requires the
+   distribution of source code with any binary distribution and to
+   distribute linked combinations of the two.  Non-GPL Code permitted under
+   this exception must only link to the code of Red Hat elfutils through
+   those well defined interfaces identified in the file named EXCEPTION
+   found in the source code files (the "Approved Interfaces").  The files
+   of Non-GPL Code may instantiate templates or use macros or inline
+   functions from the Approved Interfaces without causing the resulting
+   work to be covered by the GNU General Public License.  Only Red Hat,
+   Inc. may make changes or additions to the list of Approved Interfaces.
+   Red Hat's grant of this exception is conditioned upon your not adding
+   any new exceptions.  If you wish to add a new Approved Interface or
+   exception, please contact Red Hat.  You must obey the GNU General Public
+   License in all respects for all of the Red Hat elfutils code and other
+   code used in conjunction with Red Hat elfutils except the Non-GPL Code
+   covered by this exception.  If you modify this file, you may extend this
+   exception to your version of the file, but you are not obligated to do
+   so.  If you do not wish to provide this exception without modification,
+   you must delete this exception statement from your version and license
+   this file solely under the GPL without exception.
+
+   Red Hat elfutils is an included package of the Open Invention Network.
+   An included package of the Open Invention Network is a package for which
+   Open Invention Network licensees cross-license their patents.  No patent
+   license is granted, either expressly or impliedly, by designation as an
+   included package.  Should you wish to participate in the Open Invention
+   Network licensing program, please visit www.openinventionnetwork.com
+   <http://www.openinventionnetwork.com>.  */
+EOF
+
+  cat_elfutils_body_nlist_h
+}
+
+cat_elfutils_new_nlist_h()
+{
+  cat <<"EOF"
+/* Interface for nlist.
+   Copyright (C) 1998, 1999, 2000, 2002 Red Hat, Inc.
+   This file is part of elfutils.
+
+   This file is free software; you can redistribute it and/or modify
+   it under the terms of either
+
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at
+       your option) any later version
+
+   or
+
+     * 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
+
+   or both in parallel, as here.
+
+   elfutils 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 copies of the GNU General Public License and
+   the GNU Lesser General Public License along with this program.  If
+   not, see <http://www.gnu.org/licenses/>.  */
+EOF
+
+  cat_elfutils_body_nlist_h
+}
+
+cat_libelf_nlist_h()
+{
+  cat <<"EOF"
+#include <libelf/nlist.h>
+EOF
+}
+
 pkg_installed()
 {
   local pkg="$1"
@@ -10,12 +143,32 @@
     grep -qE '[^ ]* ok (unpacked|triggers-awaited|triggers-pending|installed)'
 }
 
+pkg_cmp_version()
+{
+  local pkg="$1"
+  local cmp_op="$2"
+  local cmp_version="$3"
+  local pkg_version=$(dpkg-query -f '${Version}' -W "$pkg")
+
+  dpkg --compare-versions $pkg_version $cmp_op $cmp_version
+}
+
 case "$1" in
   configure)
-    # If either libelf-dev or libelfg0-dev is installed, then we took over
-    # nlist.h from them, restore a copy from the functional one.
-    if pkg_installed libelf-dev || pkg_installed libelfg0-dev; then
-      cp /usr/include/bsd/nlist.h /usr/include/nlist.h
+    # If nlist.h is missing or contains the libbsd instance, and either
+    # libelf-dev or libelfg0-dev is installed, then we took it over from
+    # them, restore a copy from the correct ABI-compatible one.
+    if [ ! -f /usr/include/nlist.h ] || \
+       [ "`md5sum /usr/include/nlist.h | awk '{print $1}'`" = "8df5a9787bae18098f88e31c1a31b1ca" ]; then
+      if pkg_installed libelf-dev; then
+        if pkg_cmp_version libelf-dev ge 0.154; then
+          cat_elfutils_new_nlist_h >/usr/include/nlist.h
+        else
+          cat_elfutils_old_nlist_h >/usr/include/nlist.h
+        fi
+      elif pkg_installed libelfg0-dev; then
+        cat_libelf_nlist_h >/usr/include/nlist.h
+      fi
     fi
     ;;
 esac
 
=== removed file 'debian/source/options'
--- debian/source/options	2013-05-27 07:02:08 +0000
+++ debian/source/options	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-compression = xz
 
=== added directory 'debian/upstream'
=== added file 'debian/upstream/signing-key.asc'
--- debian/upstream/signing-key.asc	1970-01-01 00:00:00 +0000
+++ debian/upstream/signing-key.asc	2014-03-14 20:52:05 +0000
@@ -0,0 +1,114 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1
+
+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
+ZXB0b24uaG4ub3JnPohfBBMRAgAXBQI8BvCaBQsHCgMEAxUDAgMWAgECF4AAEgkQ
+uW9ciZ2SjJsHZUdQRwABAYOrAKDH8m8CfFqjJENjmDqadQKkk5KDAgCg7EkvWOSt
+n6THjMX0OVFsL9iUZVeISQQwEQIACQUCQQGRfgIdIAAKCRC5b1yJnZKMm4R5AKDa
+O41ZaQmZVfxjEEpzzNZYZn72pQCfapLHJFPClhl0+i+Du2YgpGlGmBu0Lkd1aWxs
+ZW0gSm92ZXIgPGd1aWxsZW0uam92ZXJAc2lsaWNvbnRvd2VyLm5ldD6IXAQTEQIA
+HAUCPXdG1wIbAwQLBwMCAxUCAwMWAgECHgECF4AACgkQuW9ciZ2SjJuqIwCeKKhX
+PQYr9wHOO93mLUN1kOAGsVIAn3sRwB0IjY1Xom/cn/oxs8cIIQHAiEgEMBECAAkF
+AkEAeZMCHSAACgkQuW9ciZ2SjJuXlgCgoYXA7VcuBZOvdxWgoCzxaYWg7twAmM6I
+9puPp0Dt8JcbQb/vUYFlDUq0L0d1aWxsZW0gSm92ZXIgPGd1aWxsZW0uam92ZXJA
+c2lsaWNvbnRvd2VyLmluZm8+iFwEExECABwFAj13R5ACGwMECwcDAgMVAgMDFgIB
+Ah4BAheAAAoJELlvXImdkoybyd0AmwWXWQD7t7dydSEK50ssKrRYTI6oAJ9ISga0
+5Fvhpa+4cBcstdayi2eeYIhJBDARAgAJBQJBAHnWAh0gAAoJELlvXImdkoybNbkA
+njqUds0y0/pvxchTAt4GD/HL6EELAJ9yw5dz9KArvosuzmYfC0oZuDgNirQlR3Vp
+bGxlbSBKb3ZlciA8Z3VpbGxlbUBsZXB0b24uaG4ub3JnPohcBBMRAgAcBQI9gXRL
+AhsDBAsHAwIDFQIDAxYCAQIeAQIXgAAKCRC5b1yJnZKMmyZtAJ9Hg6g8PfvZLb/T
+obATQPz7UR0ZpACdHzy10pyz5TTzI6Ka0wb6oCl6NE+ISQQwEQIACQUCQ/OaFQId
+IAAKCRC5b1yJnZKMm69ZAKCGif4ip6zG1g5aTDZneguHuhhYlQCfWKskIgxt+92I
+UatnP9Zi9X9qGYy0Ikd1aWxsZW0gSm92ZXIgPGd1aWxsZW1AZGViaWFuLm9yZz6I
+YQQTEQIAIQIbAwIeAQIXgAUCSgItKQULCQgHAwUVCgkICwUWAgMBAAAKCRC5b1yJ
+nZKMm8qMAJ4xmQWB73mv7avqblqoNSwzocBy/wCfXu/0rydYi+8j7K6Q4cgOWzWO
+/i2IXAQTEQIAHAUCPlW54QIbAwQLBwMCAxUCAwMWAgECHgECF4AACgkQuW9ciZ2S
+jJsEQQCZAeN5hu8o3TuzRsktg4A774GgqVkAoL/ckd9zc8i+JqQG4pjmKxCYhVZ+
+tCFHdWlsbGVtIEpvdmVyIDxndWlsbGVtQGdudWFiLm9yZz6ISQQwEQgACQUCT3Um
+jwIdIAAKCRC5b1yJnZKMmwI2AJ4+wKvmUR7qlLwu4VqWAsmRjLJwwACbB4Q2Afdo
+5Ap+mh3CA6eX+3pYqtOIYQQTEQIAIQIbAwIeAQIXgAUCSgItKQULCQgHAwUVCgkI
+CwUWAgMBAAAKCRC5b1yJnZKMm6InAKDrPqIgsTgiUhMlF52R7UDUcoeLJQCgi3nU
+644hNCVVp0uBM9TsfZEUwZaIXgQTEQIAHgUCPwer7gIbAwYLCQgHAwIDFQIDAxYC
+AQIeAQIXgAAKCRC5b1yJnZKMm43pAJ9G4YSp4jtJroLAJObTsRWc5gnKtACfYPdz
+yZSDnz5B74VTudcXOfrHoUg=
+=WPcS
+-----END PGP PUBLIC KEY BLOCK-----
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1
+
+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
+cJL/gBUOrto9IS1htbpl3Q==
+=jW6z
+-----END PGP PUBLIC KEY BLOCK-----
 
=== modified file 'debian/watch'
--- debian/watch	2013-05-27 07:02:08 +0000
+++ debian/watch	2014-03-14 20:52:05 +0000
@@ -1,2 +1,3 @@
 version=3
+opts=pgpsigurlmangle=s/$/.asc/ \
 http://libbsd.freedesktop.org/releases/	libbsd-(.*)\.tar\.[xg]z	debian	uupdate