Package: release.debian.org Severity: normal User: release.debian....@packages.debian.org Usertags: unblock X-Debbugs-Cc: sock...@packages.debian.org Control: affects -1 + src:socklog
Please unblock package socklog [ Reason ] Fix RC bug #1031794. [ Impact ] No change of behaviour. [ Tests ] After a manual package install and update the services socklog-klog and socklog-unix run fine. Also dpkg-source -x does not complain anymore. [ Risks ] Low, the changes are trivial. [ Checklist ] [X] all changes are documented in the d/changelog [X] I reviewed all changes and I approve them [X] attach debdiff against the package in testing [ Other info ] I was hoping to get this pushed before the hard freeze but I wasn't lucky finding an uploader on time. The changes are therefore a bit more than what I would want at this point but they are all trivial. unblock socklog/2.1.0+repack-5 -- Mathieu Mirmont <m...@parad0x.org>
diff -Nru socklog-2.1.0+repack/debian/changelog socklog-2.1.0+repack/debian/changelog --- socklog-2.1.0+repack/debian/changelog 2020-12-22 22:40:42.000000000 +0100 +++ socklog-2.1.0+repack/debian/changelog 2023-03-06 22:01:18.000000000 +0100 @@ -1,3 +1,15 @@ +socklog (2.1.0+repack-5) unstable; urgency=medium + + * Various uninteresting changes + * watch, repack.sh: append +repack to tarball filename + * Refresh lintian overrides + * service/socklog-unix: remove supervise symlink (Closes: #1031794) + * control: bump debian policy to 4.6.2, no change required + * gitlab-ci.yml: disable unnecessary jobs + * gbp.conf: add configuration file + + -- Mathieu Mirmont <m...@parad0x.org> Mon, 06 Mar 2023 22:01:18 +0100 + socklog (2.1.0+repack-4) unstable; urgency=medium * copyright: bump the year diff -Nru socklog-2.1.0+repack/debian/control socklog-2.1.0+repack/debian/control --- socklog-2.1.0+repack/debian/control 2020-12-22 22:40:42.000000000 +0100 +++ socklog-2.1.0+repack/debian/control 2023-03-06 21:52:36.000000000 +0100 @@ -5,7 +5,7 @@ Uploaders: Gerrit Pape <p...@smarden.org> Vcs-Browser: https://salsa.debian.org/debian/socklog Vcs-Git: https://salsa.debian.org/debian/socklog.git -Standards-Version: 4.5.1 +Standards-Version: 4.6.2 Homepage: http://smarden.org/socklog Build-Depends: debhelper-compat (= 13), dh-runit, @@ -37,9 +37,8 @@ ${misc:Depends}, ${shlibs:Depends} Recommends: ipsvd, mailx Provides: system-log-daemon, linux-kernel-log-daemon -Conflicts: system-log-daemon, linux-kernel-log-daemon, ${runit:Conflicts} -Breaks: socklog (<= 2.1.0+repack-3), ${runit:Breaks} -Replaces: socklog (<= 2.1.0+repack-3) +Conflicts: system-log-daemon, linux-kernel-log-daemon +Breaks: ${runit:Breaks} Description: system and kernel logging services - runit services socklog cooperates with the runit package to create a small and secure replacement for rsyslog. socklog supports system logging diff -Nru socklog-2.1.0+repack/debian/copyright socklog-2.1.0+repack/debian/copyright --- socklog-2.1.0+repack/debian/copyright 2020-11-23 16:13:31.000000000 +0100 +++ socklog-2.1.0+repack/debian/copyright 2023-03-06 21:52:36.000000000 +0100 @@ -9,7 +9,7 @@ Files: debian/* Copyright: Copyright 2001-2008, Gerrit Pape <p...@smarden.org> - 2019-2020, Mathieu Mirmont <m...@parad0x.org> + 2019-2023, Mathieu Mirmont <m...@parad0x.org> License: BSD-3-clause License: BSD-3-clause diff -Nru socklog-2.1.0+repack/debian/gbp.conf socklog-2.1.0+repack/debian/gbp.conf --- socklog-2.1.0+repack/debian/gbp.conf 1970-01-01 01:00:00.000000000 +0100 +++ socklog-2.1.0+repack/debian/gbp.conf 2023-03-06 22:01:10.000000000 +0100 @@ -0,0 +1,3 @@ +[DEFAULT] +pristine-tar = True +sign-tags = True diff -Nru socklog-2.1.0+repack/debian/gitlab-ci.yml socklog-2.1.0+repack/debian/gitlab-ci.yml --- socklog-2.1.0+repack/debian/gitlab-ci.yml 2020-11-02 03:12:15.000000000 +0100 +++ socklog-2.1.0+repack/debian/gitlab-ci.yml 2023-03-06 21:52:36.000000000 +0100 @@ -1,3 +1,7 @@ include: - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml + +variables: + SALSA_CI_DISABLE_BUILD_PACKAGE_ALL: 1 + SALSA_CI_DISABLE_AUTOPKGTEST: 1 diff -Nru socklog-2.1.0+repack/debian/repack.sh socklog-2.1.0+repack/debian/repack.sh --- socklog-2.1.0+repack/debian/repack.sh 2020-11-02 01:53:45.000000000 +0100 +++ socklog-2.1.0+repack/debian/repack.sh 2023-03-06 21:52:36.000000000 +0100 @@ -1,12 +1,13 @@ #!/bin/sh +set -eu # Command line check. -if [ $# -ne 3 ] || [ "$1" != "--upstream-version" ]; then +if [ $# -lt 2 ] || [ $# -gt 3 ]|| [ "$1" != "--upstream-version" ]; then echo "$0: This script must be called via uscan." >&2 exit 1 fi version="$2" -tarball="$3" +tarball="../socklog_$version.orig.tar.gz" # Create a temporary directory and delete it on exit. temp="$(mktemp -d)" @@ -15,6 +16,11 @@ # Unpack the original tarball, stripping the first directory component. tar -C "$temp" -xf "$tarball" --strip-components=1 -# Repack it, replacing the original tarball +# Rename the toplevel directory. +if [ "$(basename "$temp"/socklog-*)" != socklog-"$version" ]; then + mv "$temp"/socklog-* "$temp"/socklog-"$version" +fi + +# Repack it, overwriting the original tarball. rm -f "$tarball" tar -C "$temp" -czf "$tarball" --owner root --group root "socklog-$version" diff -Nru socklog-2.1.0+repack/debian/rules socklog-2.1.0+repack/debian/rules --- socklog-2.1.0+repack/debian/rules 2020-11-02 03:12:15.000000000 +0100 +++ socklog-2.1.0+repack/debian/rules 2023-03-06 21:52:36.000000000 +0100 @@ -1,8 +1,8 @@ #!/usr/bin/make -f -DPKG_EXPORT_BUILDFLAGS = 1 export DEB_BUILD_MAINT_OPTIONS = hardening=+all -include /usr/share/dpkg/default.mk +DPKG_EXPORT_BUILDFLAGS = 1 +include /usr/share/dpkg/buildflags.mk CONF_CC = src/conf-cc CONF_LD = src/conf-ld diff -Nru socklog-2.1.0+repack/debian/socklog-run.lintian-overrides socklog-2.1.0+repack/debian/socklog-run.lintian-overrides --- socklog-2.1.0+repack/debian/socklog-run.lintian-overrides 2020-12-22 22:40:42.000000000 +0100 +++ socklog-2.1.0+repack/debian/socklog-run.lintian-overrides 2023-03-06 21:52:36.000000000 +0100 @@ -1,6 +1,2 @@ # This package is specific to runit -socklog-run: package-supports-alternative-init-but-no-init.d-script etc/sv/socklog-inet/run -socklog-run: package-supports-alternative-init-but-no-init.d-script etc/sv/socklog-klog/run -socklog-run: package-supports-alternative-init-but-no-init.d-script etc/sv/socklog-notify/run -socklog-run: package-supports-alternative-init-but-no-init.d-script etc/sv/socklog-ucspi-tcp/run -socklog-run: package-supports-alternative-init-but-no-init.d-script etc/sv/socklog-unix/run +package-supports-alternative-init-but-no-init.d-script [etc/sv/*/run] diff -Nru socklog-2.1.0+repack/debian/socklog-run.runit socklog-2.1.0+repack/debian/socklog-run.runit --- socklog-2.1.0+repack/debian/socklog-run.runit 2020-12-22 22:40:42.000000000 +0100 +++ socklog-2.1.0+repack/debian/socklog-run.runit 2023-03-06 21:52:36.000000000 +0100 @@ -1,5 +1,5 @@ -debian/service/socklog-inet logscript,disable -debian/service/socklog-klog logscript -debian/service/socklog-notify disable -debian/service/socklog-ucspi-tcp logscript,disable -debian/service/socklog-unix +debian/service/socklog-inet logscript,disable +debian/service/socklog-klog logscript +debian/service/socklog-notify disable +debian/service/socklog-ucspi-tcp logscript,disable +debian/service/socklog-unix defaults diff -Nru socklog-2.1.0+repack/debian/socklog.install socklog-2.1.0+repack/debian/socklog.install --- socklog-2.1.0+repack/debian/socklog.install 2020-11-02 01:53:45.000000000 +0100 +++ socklog-2.1.0+repack/debian/socklog.install 2023-03-06 21:52:36.000000000 +0100 @@ -1,6 +1,6 @@ -command/socklog /usr/sbin -command/socklog-check /usr/bin -command/socklog-conf /usr/sbin -command/tryto /usr/bin -command/uncat /usr/bin -doc/*.html /usr/share/doc/socklog/html +command/socklog /usr/sbin +command/socklog-check /usr/bin +command/socklog-conf /usr/sbin +command/tryto /usr/bin +command/uncat /usr/bin +doc/*.html /usr/share/doc/socklog/html diff -Nru socklog-2.1.0+repack/debian/socklog.lintian-overrides socklog-2.1.0+repack/debian/socklog.lintian-overrides --- socklog-2.1.0+repack/debian/socklog.lintian-overrides 1970-01-01 01:00:00.000000000 +0100 +++ socklog-2.1.0+repack/debian/socklog.lintian-overrides 2023-03-06 21:52:36.000000000 +0100 @@ -0,0 +1,2 @@ +# False positive +hardening-no-fortify-functions [usr/*bin/*] \ No newline at end of file diff -Nru socklog-2.1.0+repack/debian/source/lintian-overrides socklog-2.1.0+repack/debian/source/lintian-overrides --- socklog-2.1.0+repack/debian/source/lintian-overrides 2020-12-22 22:40:42.000000000 +0100 +++ socklog-2.1.0+repack/debian/source/lintian-overrides 2023-03-06 21:52:36.000000000 +0100 @@ -1,9 +1,7 @@ # Upstream does not support https -socklog source: debian-watch-uses-insecure-uri http://smarden.org/socklog/install.html +debian-watch-uses-insecure-uri http://smarden.org/socklog/install.html [debian/watch:4] # Upstream does not accept patches -socklog source: patch-not-forwarded-upstream debian/patches/0001-socklog-conf-update-service.patch -socklog source: patch-not-forwarded-upstream debian/patches/0003-patches-fix-build-warnings.patch +patch-not-forwarded-upstream [debian/patches/0001-socklog-conf-update-service.patch] +patch-not-forwarded-upstream [debian/patches/0003-patches-fix-build-warnings.patch] # The upstream tarball is repacked due to its layout, nothing to do with the license -socklog source: missing-explanation-for-repacked-upstream-tarball -# Workaround for #977925 in dh-runit -socklog source: absolute-symbolic-link-target-in-source debian/service/socklog-unix/log/supervise -> /run/runit/supervise/socklog-unix.log +missing-explanation-for-repacked-upstream-tarball diff -Nru socklog-2.1.0+repack/debian/watch socklog-2.1.0+repack/debian/watch --- socklog-2.1.0+repack/debian/watch 2020-11-02 01:53:45.000000000 +0100 +++ socklog-2.1.0+repack/debian/watch 2023-03-06 21:52:36.000000000 +0100 @@ -1,4 +1,4 @@ -version=3 -opts="dversionmangle=s/\+repack$//" \ +version=4 +opts="dversionmangle=s/\+repack$//,oversionmangle=s/$/+repack/" \ http://smarden.org/socklog/install.html \ socklog-(.+)\.tar\.gz debian debian/repack.sh