diff -Nru libutempter-1.2.1/debian/changelog libutempter-1.2.1/debian/changelog --- libutempter-1.2.1/debian/changelog 2022-03-24 16:13:50.000000000 +0000 +++ libutempter-1.2.1/debian/changelog 2023-02-26 15:21:54.000000000 +0000 @@ -1,14 +1,15 @@ -libutempter (1.2.1-2build2) jammy; urgency=high +libutempter (1.2.1-3) unstable; urgency=medium - * No change rebuild for ppc64el baseline bump. + * d/control: + - use https link in homepage + - bump to std version 4.6.2 (no further changes) + * d/rules: make use of execute_after_ + * d/libutempter0.lintian-overrides: update format + * d/copyright: correct license of utempter.3 and update years + * d/patches: cherry-pick commit logging PPID on error + * d/upstream: add minimal metadata - -- Julian Andres Klode Thu, 24 Mar 2022 17:13:50 +0100 - -libutempter (1.2.1-2build1) impish; urgency=medium - - * No-change rebuild to build packages with zstd compression. - - -- Matthias Klose Thu, 07 Oct 2021 12:19:03 +0200 + -- Christian Göttsche Sun, 26 Feb 2023 16:21:54 +0100 libutempter (1.2.1-2) unstable; urgency=medium diff -Nru libutempter-1.2.1/debian/control libutempter-1.2.1/debian/control --- libutempter-1.2.1/debian/control 2022-03-24 16:13:50.000000000 +0000 +++ libutempter-1.2.1/debian/control 2023-02-26 15:21:54.000000000 +0000 @@ -1,12 +1,11 @@ Source: libutempter Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Christian Göttsche +Maintainer: Christian Göttsche Build-Depends: debhelper-compat (= 13) -Standards-Version: 4.5.1 +Standards-Version: 4.6.2 Rules-Requires-Root: binary-targets Section: libs -Homepage: http://git.altlinux.org/people/ldv/packages/?p=libutempter.git +Homepage: https://git.altlinux.org/people/ldv/packages/?p=libutempter.git Vcs-Browser: https://salsa.debian.org/cgzones/libutempter Vcs-Git: https://salsa.debian.org/cgzones/libutempter.git diff -Nru libutempter-1.2.1/debian/copyright libutempter-1.2.1/debian/copyright --- libutempter-1.2.1/debian/copyright 2020-12-05 19:05:13.000000000 +0000 +++ libutempter-1.2.1/debian/copyright 2023-02-26 15:21:54.000000000 +0000 @@ -10,12 +10,12 @@ Files: utempter.3 Copyright: 2009, Ed Schouten 2010, Dmitry V. Levin -License: LGPL-2.1 +License: BSD-2-Clause Files: debian/* Copyright: 2009-2011, Fathi Boudra 2015, Felix Geyer - 2019-2020, Christian Göttsche + 2019-2023, Christian Göttsche License: LGPL-2.1 License: LGPL-2.1 @@ -35,3 +35,26 @@ . On Debian systems, the full text of the GNU Lesser General Public License version 2.1 can be found in the file `/usr/share/common-licenses/LGPL-2.1'. + +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 BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + AND ANY EXPRESS 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 COPYRIGHT HOLDER OR CONTRIBUTORS BE + LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + CONSEQUENTIAL DAMAGES (INCLUDING, 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. diff -Nru libutempter-1.2.1/debian/libutempter0.lintian-overrides libutempter-1.2.1/debian/libutempter0.lintian-overrides --- libutempter-1.2.1/debian/libutempter0.lintian-overrides 2020-12-05 19:05:13.000000000 +0000 +++ libutempter-1.2.1/debian/libutempter0.lintian-overrides 2023-02-26 15:21:54.000000000 +0000 @@ -1,2 +1,2 @@ -# This is intentional, we want utempter with these permissions. -libutempter0: setgid-binary usr/lib/*/utempter/utempter 2755 root/utmp +# utempter needs write access on /run/utmp owned by root:utmp +elevated-privileges 2755 root/utmp [usr/lib/x86_64-linux-gnu/utempter/utempter] diff -Nru libutempter-1.2.1/debian/patches/0004-Log-ppid-on-error.patch libutempter-1.2.1/debian/patches/0004-Log-ppid-on-error.patch --- libutempter-1.2.1/debian/patches/0004-Log-ppid-on-error.patch 1970-01-01 00:00:00.000000000 +0000 +++ libutempter-1.2.1/debian/patches/0004-Log-ppid-on-error.patch 2023-02-26 15:21:54.000000000 +0000 @@ -0,0 +1,43 @@ +From: =?utf-8?q?Christian_G=C3=B6ttsche?= +Date: Mon, 9 Jan 2023 15:52:49 +0100 +Applied-Upstream: https://github.com/altlinux/libutempter/commit/2a735b3e94ca6448f46fbb340673d0136e351b81 +Subject: Log ppid on error + +When sending an error message to syslog include the parent PID to ease +debugging which program actually called utempter and did so in an +erroneous way. +--- + diag.h | 13 +++++++------ + 1 file changed, 7 insertions(+), 6 deletions(-) + +diff --git a/diag.h b/diag.h +index 3b7e8c8..6081794 100644 +--- a/diag.h ++++ b/diag.h +@@ -22,6 +22,7 @@ + # define UTEMPTER_DIAG_H + + # include ++# include + + # ifdef UTEMPTER_LOG + # define log_debug(fmt_, ...) syslog(LOG_DEBUG, fmt_, ##__VA_ARGS__) +@@ -45,12 +46,12 @@ + } while (0) \ + /* End of debug_msg definition. */ + +-# define fatal_error(fmt_, ...) \ +- do { \ +- log_error(fmt_, ##__VA_ARGS__); \ +- print_dbg(fmt_, ##__VA_ARGS__); \ +- exit(EXIT_FAILURE); \ +- } while (0) \ ++# define fatal_error(fmt_, ...) \ ++ do { \ ++ log_error("[ppid=%ld] " fmt_, (long)getppid(), ##__VA_ARGS__); \ ++ print_dbg(fmt_, ##__VA_ARGS__); \ ++ exit(EXIT_FAILURE); \ ++ } while (0) \ + /* End of fatal_error definition. */ + + #endif /* UTEMPTER_DIAG_H */ diff -Nru libutempter-1.2.1/debian/patches/series libutempter-1.2.1/debian/patches/series --- libutempter-1.2.1/debian/patches/series 2020-12-05 19:05:13.000000000 +0000 +++ libutempter-1.2.1/debian/patches/series 2023-02-26 15:21:54.000000000 +0000 @@ -1,3 +1,4 @@ multiarch-location.diff 0002-utempter-print-invalid-character-in-hex-on-hostname-.patch 0003-Do-not-log-successful-invocations-to-syslog-Closes-9.patch +0004-Log-ppid-on-error.patch diff -Nru libutempter-1.2.1/debian/rules libutempter-1.2.1/debian/rules --- libutempter-1.2.1/debian/rules 2020-12-05 19:05:13.000000000 +0000 +++ libutempter-1.2.1/debian/rules 2023-02-26 15:21:54.000000000 +0000 @@ -7,7 +7,6 @@ %: dh $@ -override_dh_fixperms: - dh_fixperms +execute_after_dh_fixperms: chown root:utmp debian/libutempter0/usr/lib/$(DEB_HOST_MULTIARCH)/utempter/utempter chmod 2755 debian/libutempter0/usr/lib/$(DEB_HOST_MULTIARCH)/utempter/utempter diff -Nru libutempter-1.2.1/debian/salsa-ci.yml libutempter-1.2.1/debian/salsa-ci.yml --- libutempter-1.2.1/debian/salsa-ci.yml 2020-12-05 19:05:13.000000000 +0000 +++ libutempter-1.2.1/debian/salsa-ci.yml 2023-02-26 15:21:54.000000000 +0000 @@ -2,7 +2,9 @@ include: - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/recipes/debian.yml -# disable reprotest, cause chown fails (see #928921) variables: - SALSA_CI_DISABLE_REPROTEST: 1 + # workaround for chown not working with RRR binary-targets, + # see #928921 and + # https://salsa.debian.org/salsa-ci-team/pipeline/-/issues/26) + SALSA_CI_REPROTEST_ARGS: --vary=domain_host.use_sudo=1 SALSA_CI_LINTIAN_FAIL_WARNING: 1 diff -Nru libutempter-1.2.1/debian/upstream/metadata libutempter-1.2.1/debian/upstream/metadata --- libutempter-1.2.1/debian/upstream/metadata 1970-01-01 00:00:00.000000000 +0000 +++ libutempter-1.2.1/debian/upstream/metadata 2023-02-26 15:21:54.000000000 +0000 @@ -0,0 +1,4 @@ +Repository: https://github.com/altlinux/libutempter.git +Repository-Browse: https://github.com/altlinux/libutempter +Bug-Database: https://github.com/altlinux/libutempter/issues +Bug-Submit: https://github.com/altlinux/libutempter/issues