Control: tags 530121 + patch Control: tags 530121 + pending Dear maintainer,
I've prepared an NMU for libuser (versioned as 1:0.62~dfsg-0.2) and uploaded it to DELAYED/15. It also includes various fixes for lintian warnings as well as metadata updates. Please feel free to tell me if I should delay it longer or cancel this upload if you find any of those changes inappropriate. Regards, Boyuan Yang diff -Nru libuser-0.62~dfsg/debian/changelog libuser- 0.62~dfsg/debian/changelog --- libuser-0.62~dfsg/debian/changelog 2016-05-27 09:02:20.000000000 -0400 +++ libuser-0.62~dfsg/debian/changelog 2019-10-10 16:03:46.000000000 -0400 @@ -1,3 +1,32 @@ +libuser (1:0.62~dfsg-0.2) unstable; urgency=medium + + * Non-maintainer upload. + * debian/control: + + Bump Standards-Version to 4.4.1. + + Bump debhelper compat to v12. + + Update Vcs-* fields to use git packaging repo under Salsa + Debian group. + + Update Homepage field to point to pagure.io. + * debian/watch: Monitor upstream releases on pagure.org. + * debian/rules: + + Use "dh_missing --fail-missing" instead of "dh_install + --fail-missing". + + Replace DEB_BUILD_OPTIONS with DEB_BUILD_MAINT_OPTIONS. + Solves lintian warning debian-rules-sets-DEB_BUILD_OPTIONS. + * debian/libuser1.symbols: Add a Build-Depends-Package field. + * debian/patches: + + Refresh patches. + + Refresh patch about pkg-config to ensure correct + cross-build. + + Add patch to fix bashism in tests/ldap_test script. + (Closes: #530121). + * debian/copyright: + + Replace defunct fedorahosted URL with pagure.io. + + Specifically mention that the project is licensed under + LGPL-2+ instead of ambiguous LGPL. + + -- Boyuan Yang <[email protected]> Thu, 10 Oct 2019 16:03:46 -0400 + libuser (1:0.62~dfsg-0.1) unstable; urgency=high * Non-maintainer upload. @@ -94,7 +123,7 @@ * New upstream release * New download homepage at copyright file - * Lintian clean: copyright-without-copyright-notice + * Lintian clean: copyright-without-copyright-notice -- Ghe Rivero <[email protected]> Tue, 11 Mar 2008 17:40:21 +0100 @@ -113,11 +142,11 @@ - python-package-should-be-section-python python-libuser -- Ghe Rivero <[email protected]> Mon, 4 Feb 2008 14:40:27 +0100 - + libuser (1:0.56.7-2) unstable; urgency=low * Updated watch file... again! (Closes: #462826) - * debian/control: updated python-libuser override section + * debian/control: updated python-libuser override section -- Ghe Rivero <[email protected]> Mon, 28 Jan 2008 00:31:48 +0100 @@ -180,4 +209,3 @@ * Initial Release, closes: #302312 -- Ghe Rivero <[email protected]> Mon, 27 Jun 2005 13:31:01 +0200 - diff -Nru libuser-0.62~dfsg/debian/compat libuser-0.62~dfsg/debian/compat --- libuser-0.62~dfsg/debian/compat 2016-05-27 06:36:56.000000000 -0400 +++ libuser-0.62~dfsg/debian/compat 1969-12-31 19:00:00.000000000 -0500 @@ -1 +0,0 @@ -9 diff -Nru libuser-0.62~dfsg/debian/control libuser-0.62~dfsg/debian/control --- libuser-0.62~dfsg/debian/control 2016-05-27 08:38:51.000000000 -0400 +++ libuser-0.62~dfsg/debian/control 2019-10-10 15:48:00.000000000 -0400 @@ -5,10 +5,8 @@ Uploaders: Tzafrir Cohen <[email protected]>, Build-Depends: - autotools-dev, cpio, - debhelper (>= 9), - dh-autoreconf, + debhelper-compat (= 12), dh-python, groff, libglib2.0-dev, @@ -17,10 +15,10 @@ linuxdoc-tools, pkg-config, python-all-dev, -Standards-Version: 3.9.8 -Vcs-Git: https://anonscm.debian.org/git/collab-maint/libuser.git -Vcs-Browser: https://anonscm.debian.org/git/collab-maint/libuser.git -Homepage: https://fedorahosted.org/libuser/ +Standards-Version: 4.4.1 +Homepage: https://pagure.io/libuser/ +Vcs-Git: https://salsa.debian.org/debian/libuser.git +Vcs-Browser: https://salsa.debian.org/debian/libuser Package: libuser Architecture: any diff -Nru libuser-0.62~dfsg/debian/copyright libuser- 0.62~dfsg/debian/copyright --- libuser-0.62~dfsg/debian/copyright 2016-05-27 08:34:42.000000000 -0400 +++ libuser-0.62~dfsg/debian/copyright 2019-10-10 16:03:44.000000000 -0400 @@ -1,17 +1,29 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: libuser -Source: https://fedorahosted.org/libuser/wiki/LibuserDownloads +Source: https://pagure.io/libuser Files-Excluded: docs/rfc2307.txt Files: * Copyright: Nalin Dahyabhai <[email protected]> -License: LGPL +License: LGPL-2+ Files: debian/* Copyright: 2005 Ghe Rivero <[email protected]> 2016 Mattia Rizzolo <[email protected]> -License: LGPL +License: LGPL-2+ -License: LGPL - /usr/share/common-licenses/LGPL +License: LGPL-2+ + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + . + 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 + Library General Public License for more details. + . + On Debian systems, the complete text of the + GNU Library General Public License version 2 can be found in + "/usr/share/common-licenses/LGPL-2". diff -Nru libuser-0.62~dfsg/debian/libuser1.symbols libuser- 0.62~dfsg/debian/libuser1.symbols --- libuser-0.62~dfsg/debian/libuser1.symbols 2016-05-27 07:49:49.000000000 -0400 +++ libuser-0.62~dfsg/debian/libuser1.symbols 2019-10-10 14:12:21.000000000 -0400 @@ -1,4 +1,5 @@ libuser.so.1 libuser1 #MINVER# +* Build-Depends-Package: libuser1-dev lu_cfg_read@Base 1:0.56.9.dfsg.1 lu_cfg_read_keys@Base 1:0.56.9.dfsg.1 lu_cfg_read_single@Base 1:0.56.9.dfsg.1 diff -Nru libuser-0.62~dfsg/debian/patches/0001-build-fix-not-a-proper-format- string.patch libuser-0.62~dfsg/debian/patches/0001-build-fix-not-a-proper- format-string.patch --- libuser-0.62~dfsg/debian/patches/0001-build-fix-not-a-proper-format- string.patch 2016-05-27 08:38:51.000000000 -0400 +++ libuser-0.62~dfsg/debian/patches/0001-build-fix-not-a-proper-format- string.patch 2019-10-10 14:12:21.000000000 -0400 @@ -1,16 +1,17 @@ -From 31693c6d68f4aee37abd67592e682b18d3d7cf31 Mon Sep 17 00:00:00 2001 From: Tzafrir Cohen <[email protected]> Date: Mon, 28 Apr 2014 10:30:28 +0300 Subject: build fix: not a proper format string Fix "format not a string literal and no format arguments" error --- - modules/files.c | 2 +- + modules/files.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) +diff --git a/modules/files.c b/modules/files.c +index 4ef0a57..6a7787e 100644 --- a/modules/files.c +++ b/modules/files.c -@@ -534,7 +534,7 @@ +@@ -534,7 +534,7 @@ parse_field(const struct format_specifier *format, GValue *value, string, &err); if (ret == FALSE) { g_assert(err != NULL); diff -Nru libuser-0.62~dfsg/debian/patches/0003-adapt-test-to-pbuilder-that- uses-UID-1234.patch libuser-0.62~dfsg/debian/patches/0003-adapt-test-to- pbuilder-that-uses-UID-1234.patch --- libuser-0.62~dfsg/debian/patches/0003-adapt-test-to-pbuilder-that-uses- UID-1234.patch 2016-05-27 07:35:26.000000000 -0400 +++ libuser-0.62~dfsg/debian/patches/0003-adapt-test-to-pbuilder-that-uses- UID-1234.patch 2019-10-10 14:12:21.000000000 -0400 @@ -1,14 +1,15 @@ -From 154405ab5f6673be0f4edec28d60c15652571446 Mon Sep 17 00:00:00 2001 From: Tzafrir Cohen <[email protected]> Date: Fri, 16 May 2014 09:19:29 +0300 Subject: adapt test to pbuilder, that uses UID 1234 --- - tests/config_login.defs | 16 ++++++++-------- - tests/config_test.c | 14 +++++++------- - tests/config_test.py | 4 ++-- + tests/config_login.defs | 16 ++++++++-------- + tests/config_test.c | 14 +++++++------- + tests/config_test.py | 4 ++-- 3 files changed, 17 insertions(+), 17 deletions(-) +diff --git a/tests/config_login.defs b/tests/config_login.defs +index c428352..4f2b0b8 100644 --- a/tests/config_login.defs +++ b/tests/config_login.defs @@ -1,12 +1,12 @@ @@ -32,9 +33,11 @@ +UID_MIN 2239 +SHA_CRYPT_MIN_ROUNDS 2240 +SHA_CRYPT_MAX_ROUNDS 2241 +diff --git a/tests/config_test.c b/tests/config_test.c +index 9bf043f..f5b1a45 100644 --- a/tests/config_test.c +++ b/tests/config_test.c -@@ -106,21 +106,21 @@ +@@ -106,21 +106,21 @@ main(int argc, char *argv[]) lu_end(ctx); ctx = start(argv[1], "libuser_import.conf"); @@ -63,9 +66,11 @@ /* From (echo $(($(date -d 'may 1 1980 0:0' +%s) / 24 / 3600))) */ verify_var(ctx, "userdefaults/" LU_SHADOWEXPIRE, "3773", (const char *)NULL); +diff --git a/tests/config_test.py b/tests/config_test.py +index 2d2fd17..30b9233 100644 --- a/tests/config_test.py +++ b/tests/config_test.py -@@ -10,12 +10,12 @@ +@@ -10,12 +10,12 @@ class Tests(unittest.TestCase): def testGetFirstUnusedUid(self): self.assertEqual(self.a.getFirstUnusedUid(start=LARGE_ID + 100), LARGE_ID + 100) diff -Nru libuser-0.62~dfsg/debian/patches/0004-tests-ldap_test-Explicitly- use-bin-bash-shabang-due-.patch libuser-0.62~dfsg/debian/patches/0004-tests- ldap_test-Explicitly-use-bin-bash-shabang-due-.patch --- libuser-0.62~dfsg/debian/patches/0004-tests-ldap_test-Explicitly-use-bin- bash-shabang-due-.patch 1969-12-31 19:00:00.000000000 -0500 +++ libuser-0.62~dfsg/debian/patches/0004-tests-ldap_test-Explicitly-use-bin- bash-shabang-due-.patch 2019-10-10 14:12:21.000000000 -0400 @@ -0,0 +1,18 @@ +From: Boyuan Yang <[email protected]> +Date: Wed, 9 Oct 2019 20:28:49 -0400 +Subject: tests/ldap_test: Explicitly use /bin/bash shabang due to bashism + +--- + tests/ldap_test | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/ldap_test b/tests/ldap_test +index f82c279..89d01a8 100755 +--- a/tests/ldap_test ++++ b/tests/ldap_test +@@ -1,4 +1,4 @@ +-#! /bin/sh ++#! /bin/bash + # Automated LDAP regression tester + # + # Copyright (c) 2004 Red Hat, Inc. All rights reserved. diff -Nru libuser-0.62~dfsg/debian/patches/series libuser- 0.62~dfsg/debian/patches/series --- libuser-0.62~dfsg/debian/patches/series 2016-05-27 07:35:26.000000000 -0400 +++ libuser-0.62~dfsg/debian/patches/series 2019-10-10 14:12:21.000000000 -0400 @@ -1,3 +1,4 @@ 0001-build-fix-not-a-proper-format-string.patch 0003-adapt-test-to-pbuilder-that-uses-UID-1234.patch use-pkg-config-for-python-include +0004-tests-ldap_test-Explicitly-use-bin-bash-shabang-due-.patch diff -Nru libuser-0.62~dfsg/debian/patches/use-pkg-config-for-python-include libuser-0.62~dfsg/debian/patches/use-pkg-config-for-python-include --- libuser-0.62~dfsg/debian/patches/use-pkg-config-for-python-include 2016- 05-27 07:36:37.000000000 -0400 +++ libuser-0.62~dfsg/debian/patches/use-pkg-config-for-python-include 2019- 10-10 14:12:21.000000000 -0400 @@ -1,24 +1,24 @@ -Description: use pkg-config to look up the python2 include paths. - sysconfig.get_path("include") returns /usr/local/include/python2.7, which is - not what we want -Author: Mattia Rizzolo <[email protected]> +From: Mattia Rizzolo <[email protected]> +Date: Fri, 27 May 2016 11:22:08 +0000 +Subject: use pkg-config to look up the python2 include paths. + Forwarded: no -Last-Update: 2016-05-27 +Last-Update: 2019-10-09 ---- a/configure.ac -+++ b/configure.ac -@@ -104,7 +104,7 @@ - AM_CONDITIONAL([WITH_PYTHON], [test $with_python != no]) - if test $with_python != no ; then - AM_PATH_PYTHON -- PYINCLUDEDIR=`$PYTHON -c 'import sysconfig; print(sysconfig.get_path("include"))'` -+ PYINCLUDEDIR=`pkg-config --cflags-only-I python` - fi - AC_SUBST(PYINCLUDEDIR) - +sysconfig.get_path("include") returns /usr/local/include/python2.7, which is +not what we want + +Signed-off-by: Boyuan Yang <[email protected]> +--- + Makefile.am | 2 +- + configure.ac | 3 ++- + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 080f97e..4d577a2 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -10,7 +10,7 @@ +@@ -10,7 +10,7 @@ HGTAG = 'libuser-$(VERSION)' AM_CPPFLAGS = $(GOBJECT_CFLAGS) LOCALEDIR_CPPFLAGS = -DLOCALEDIR='"$(localedir)"' @@ -27,3 +27,24 @@ AM_TESTS_ENVIRONMENT = PYTHON=$(PYTHON); export PYTHON; # Ignore possibly lost, there are too many due to Python. --gen- suppressions +diff --git a/configure.ac b/configure.ac +index 1ded1a2..13d4b82 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -97,6 +97,7 @@ if test x$sasl != xno ; then + fi + AM_CONDITIONAL([SASL], [test $build_sasl = yes]) + ++: "${PKG_CONFIG:=pkg-config}" + AC_ARG_WITH([python], + AS_HELP_STRING([--with-python], + [build Python modules (default is YES)]), [], +@@ -104,7 +105,7 @@ AC_ARG_WITH([python], + AM_CONDITIONAL([WITH_PYTHON], [test $with_python != no]) + if test $with_python != no ; then + AM_PATH_PYTHON +- PYINCLUDEDIR=`$PYTHON -c 'import sysconfig; print(sysconfig.get_path("include"))'` ++ PYINCLUDEDIR=`$PKG_CONFIG --cflags-only-I python` + fi + AC_SUBST(PYINCLUDEDIR) + diff -Nru libuser-0.62~dfsg/debian/rules libuser-0.62~dfsg/debian/rules --- libuser-0.62~dfsg/debian/rules 2016-05-27 08:38:51.000000000 -0400 +++ libuser-0.62~dfsg/debian/rules 2019-10-10 16:00:32.000000000 -0400 @@ -1,10 +1,24 @@ #!/usr/bin/make -f +# -*- makefile -*- +# Uncomment this to turn on verbose mode. +# export DH_VERBOSE=1 -export DH_VERBOSE=1 -export DEB_BUILD_OPTIONS=hardening=+all +# see FEATURE AREAS in dpkg-buildflags(1) +export DEB_BUILD_MAINT_OPTIONS = hardening=+all + +# see ENVIRONMENT in dpkg-buildflags(1) +# package maintainers to append CFLAGS +#export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic +# package maintainers to append LDFLAGS +export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed + +include /usr/share/dpkg/default.mk +-include /usr/share/dpkg/buildtools.mk + +export PKG_CONFIG ?= pkg-config %: - dh $@ --with python2,autoreconf --parallel + dh $@ --with python2 override_dh_auto_configure: dh_auto_configure -- --program-transform-name="s/lid/libuser-lid/" @@ -13,5 +27,5 @@ dh_auto_install find . -name '*.la' -delete -override_dh_install: - dh_install --fail-missing +override_dh_missing: + dh_missing --fail-missing diff -Nru libuser-0.62~dfsg/debian/watch libuser-0.62~dfsg/debian/watch --- libuser-0.62~dfsg/debian/watch 2016-05-27 07:35:25.000000000 -0400 +++ libuser-0.62~dfsg/debian/watch 2019-10-10 14:12:21.000000000 -0400 @@ -1,5 +1,4 @@ -version=3 - +version=4 opts=dversionmangle=s/~dfsg\d*$// \ -https://fedorahosted.org/libuser/wiki/LibuserDownloads \ -(?:|.*/)libuser(?:[_\- ]v?|)(\d[^\s/]*)\.(?:tar\.xz|txz|tar\.bz2|tbz2|tar\.gz|tgz) + https://releases.pagure.org/libuser/ \ + libuser-(\d.*)@ARCHIVE_EXT@ debian uupdate
signature.asc
Description: This is a digitally signed message part
