[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#1040951: marked as done (bookworm-pu: package dhcpcd5/9.4.1-24~deb12u2)

Your message dated Sat, 07 Oct 2023 09:59:38 +0000
with message-id <E1qp45y-00A4AR-KW@coccia.debian.org>
and subject line Released with 12.2
has caused the Debian Bug report #1040951,
regarding bookworm-pu: package dhcpcd5/9.4.1-24~deb12u2
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
1040951: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1040951
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: release.debian.org
Severity: normal
Tags: bookworm
User: release.debian.org@packages.debian.org
Usertags: pu
X-Debbugs-Cc: martin-eric.racine@iki.fi
Control: affects -1 + src:dhcpcd5

[ Reason ]
The dhcpcd binary package last existed in wheezy with an epoch of 1: and
got reintroduced in bookworm without epoch.
Add back the epoch to have only increasing version numbers in the
archive. At the same time clean up leftovers from the wheezy package.

[ Impact ]
incomplete upgrade if dhcpcd/wheezy is still installed

[ Tests ]
local piuparts upgrade tests

[ Risks ]
low, there are no versioned dependencies within the package that could
be invalidated by adding the epoch

[ Checklist ]
  [*] *all* changes are documented in the d/changelog
  [*] I reviewed all changes and I approve them
  [*] attach debdiff against the package in (old)stable
  [*] the issue is verified as fixed in unstable

[ Changes ]
+  * Backported Wheezy upgrade mitigation from unstable (see #1037190):
+    + Include /usr/share/dpkg/pkg-info.mk needed for target version mingling.
+    + Add epoch to bin:dhcpcd via override_dh_gencontrol.
+      Wheezy had (1:3.2.3-11+deb7u1) so reintroduce the epoch for one target.
+    + Add dhcpcd.preinst by Andreas Beckmann to cleanup upgrade leftovers.

[ Other info ]


Andreas

diff -Nru dhcpcd5-9.4.1/debian/changelog dhcpcd5-9.4.1/debian/changelog
--- dhcpcd5-9.4.1/debian/changelog	2023-05-29 10:45:31.000000000 +0300
+++ dhcpcd5-9.4.1/debian/changelog	2023-07-09 22:22:47.000000000 +0300
@@ -1,6 +1,16 @@
+dhcpcd5 (9.4.1-24+deb12u1) stable-proposed-updates; urgency=medium
+
+  * Backported Wheezy upgrade mitigation from unstable (see #1037190):
+    + Include /usr/share/dpkg/pkg-info.mk needed for target version mingling.
+    + Add epoch to bin:dhcpcd via override_dh_gencontrol.
+      Wheezy had (1:3.2.3-11+deb7u1) so reintroduce the epoch for one target.
+    + Add dhcpcd.preinst by Andreas Beckmann to cleanup upgrade leftovers.
+
+ -- Martin-Éric Racine <martin-eric.racine@iki.fi>  Sun, 09 Jul 2023 22:22:47 +0300
+
 dhcpcd5 (9.4.1-24) unstable; urgency=medium
 
-  * Upload to unstable
+  * Upload to unstable.
 
  -- Martin-Éric Racine <martin-eric.racine@iki.fi>  Mon, 29 May 2023 15:45:31 +0800
 
diff -Nru dhcpcd5-9.4.1/debian/copyright dhcpcd5-9.4.1/debian/copyright
--- dhcpcd5-9.4.1/debian/copyright	2023-05-24 16:29:33.000000000 +0300
+++ dhcpcd5-9.4.1/debian/copyright	2023-07-09 22:09:15.000000000 +0300
@@ -4,7 +4,7 @@
 Upstream-Contact: Roy Marples <roy@marples.name>
 
 Files: *
-Copyright: 2006-2018  Roy Marples <roy@marples.name>
+Copyright: 2006-2023  Roy Marples <roy@marples.name>
            1999, 2016 The NetBSD Foundation, Inc.
            2005 Colin Percival
            2005 The DragonFly Project.  All rights reserved.
@@ -68,6 +68,7 @@
            2015 Daniel Echeverry <epsilon77@gmail.com>
            2018 Scott Leggett <scott@sl.id.au>
            2022-2023 Martin-Éric Racine <martin-eric.racine@iki.fi>
+           2023 Andreas Beckmann <anbe@debian.org>
 License: BSD-2
 
 Files: debian/hooks/*
diff -Nru dhcpcd5-9.4.1/debian/dhcpcd.preinst dhcpcd5-9.4.1/debian/dhcpcd.preinst
--- dhcpcd5-9.4.1/debian/dhcpcd.preinst	1970-01-01 02:00:00.000000000 +0200
+++ dhcpcd5-9.4.1/debian/dhcpcd.preinst	2023-07-09 22:07:22.000000000 +0300
@@ -0,0 +1,14 @@
+#!/bin/sh
+# As per Debian bug #1037190.
+# Copyright 2023 Andreas Beckmann <anbe@debian.org>
+set -e
+if dpkg --compare-versions "$2" lt-nl "1:9.4.1-24+deb12u1~" ; then
+  # Cleanup leftovers from dhcpcd 1:3.* in Wheezy.
+  # Can be removed after Trixie is released.
+  update-alternatives --remove dhcpcd /sbin/dhcpcd3
+  if [ -d /etc/dhcpc ]; then
+    test ! -h /etc/dhcpc/resolv.conf || rm -fv /etc/dhcpc/resolv.conf
+    rmdir --ignore-fail-on-non-empty /etc/dhcpc
+  fi
+fi
+#DEBHELPER#
diff -Nru dhcpcd5-9.4.1/debian/rules dhcpcd5-9.4.1/debian/rules
--- dhcpcd5-9.4.1/debian/rules	2023-05-24 16:29:33.000000000 +0300
+++ dhcpcd5-9.4.1/debian/rules	2023-07-09 22:14:37.000000000 +0300
@@ -1,4 +1,5 @@
 #!/usr/bin/make -f
+include /usr/share/dpkg/pkg-info.mk
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
@@ -12,8 +13,12 @@
 		--libexecdir=/usr/lib/dhcpcd \
 		--rundir=/run/dhcpcd
 
-# avoid starting the unconfigured service as it may break connectivity
+# Wheezy had (1:3.2.3-11+deb7u1) so reintroduce the epoch for one target.
+override_dh_gencontrol:
+	dh_gencontrol --package=dhcpcd -- -v1:$(DEB_VERSION_UPSTREAM_REVISION)
+	dh_gencontrol --remaining-packages
 
+# Avoid starting the unconfigured service as it may break connectivity.
 override_dh_installinit:
 	dh_installinit --name=dhcpcd --no-start

--- End Message ---
--- Begin Message --- 
Version: 12.2

The upload requested in this bug has been released as part of 12.2.

--- End Message ---
Reply to: