Bug#1034368: unblock: amazon-ec2-net-utils/2.3.0-3
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
X-Debbugs-Cc: amazon-ec2-net-utils@packages.debian.org
Control: affects -1 + src:amazon-ec2-net-utils
Please unblock package amazon-ec2-net-utils
This is a targeted change to work around the debhelper dh_installsystemd issues
with management of unit files in /usr/lib/systemd/system (background in
#1031695). This closes RC bug #1034212 by moving these files to
/lib/systemd/system as shown below:
$ debdiff amazon-ec2-net-utils_2.3.0-2.dsc amazon-ec2-net-utils_2.3.0-3.dsc
dpkg-source: warning: extracting unsigned source package (/home/noahm/src/debian/cloud/amazon-ec2-net-utils_2.3.0-2.dsc)
dpkg-source: warning: extracting unsigned source package (/home/noahm/src/debian/cloud/amazon-ec2-net-utils_2.3.0-3.dsc)
diff -Nru amazon-ec2-net-utils-2.3.0/debian/changelog amazon-ec2-net-utils-2.3.0/debian/changelog
--- amazon-ec2-net-utils-2.3.0/debian/changelog 2023-01-21 11:25:53.000000000 -0800
+++ amazon-ec2-net-utils-2.3.0/debian/changelog 2023-04-13 10:22:32.000000000 -0700
@@ -1,3 +1,9 @@
+amazon-ec2-net-utils (2.3.0-3) unstable; urgency=medium
+
+ * Install systemd services to /lib/systemd/system. (Closes: 1034212)
+
+ -- Noah Meyerhans <noahm@debian.org> Thu, 13 Apr 2023 10:22:32 -0700
+
amazon-ec2-net-utils (2.3.0-2) unstable; urgency=medium
* Set Maintainer to the cloud team and add myself to Uploaders
diff -Nru amazon-ec2-net-utils-2.3.0/debian/patches/debian-changes amazon-ec2-net-utils-2.3.0/debian/patches/debian-changes
--- amazon-ec2-net-utils-2.3.0/debian/patches/debian-changes 2023-01-21 11:25:53.000000000 -0800
+++ amazon-ec2-net-utils-2.3.0/debian/patches/debian-changes 2023-04-13 10:22:32.000000000 -0700
@@ -1,3 +1,16 @@
+diff --git a/GNUmakefile b/GNUmakefile
+index d06847d..dd077a7 100644
+--- a/GNUmakefile
++++ b/GNUmakefile
+@@ -6,7 +6,7 @@ PREFIX?=/usr/local
+ BINDIR=${DESTDIR}${PREFIX}/bin
+ UDEVDIR=${DESTDIR}/usr/lib/udev/rules.d
+ SYSTEMDDIR=${DESTDIR}/usr/lib/systemd
+-SYSTEMD_SYSTEM_DIR=${SYSTEMDDIR}/system
++SYSTEMD_SYSTEM_DIR=${DESTDIR}/lib/systemd/system
+ SYSTEMD_NETWORK_DIR=${SYSTEMDDIR}/network
+ SHARE_DIR=${DESTDIR}/${PREFIX}/share/${pkgname}
+
diff --git a/lib/lib.sh b/lib/lib.sh
index d01dd23..02357d9 100644
--- a/lib/lib.sh
$ debdiff amazon-ec2-net-utils_2.3.0-2_amd64.changes amazon-ec2-net-utils_2.3.0-3_amd64.changes
[The following lists of changes regard files as different if they have
different names, permissions or owners.]
Files in second .changes but not in first
-----------------------------------------
-rw-r--r-- root/root /lib/systemd/system/policy-routes@.service
-rw-r--r-- root/root /lib/systemd/system/refresh-policy-routes@.service
-rw-r--r-- root/root /lib/systemd/system/refresh-policy-routes@.timer
Files in first .changes but not in second
-----------------------------------------
-rw-r--r-- root/root /usr/lib/systemd/system/policy-routes@.service
-rw-r--r-- root/root /usr/lib/systemd/system/refresh-policy-routes@.service
-rw-r--r-- root/root /usr/lib/systemd/system/refresh-policy-routes@.timer
Control files: lines which differ (wdiff format)
------------------------------------------------
Installed-Size: [-44-] {+47+}
Version: [-2.3.0-2-] {+2.3.0-3+}
[ Impact ]
Without this change, systemd services and timers installed by
amazon-ec2-net-utils may not be activated as expected when the package is
installed.
[ Tests ]
n/a
[ Risks ]
Worst case, if everything goes horribly wrong, is that certain non-default
network configuration in Amazon EC2 won't be applied. This includes
configuration of secondary network interfaces and secondary IPv4 addresses on
any interfaces.
[ 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 ]
(Anything else the release team should know.)
unblock amazon-ec2-net-utils/2.3.0-3
Reply to: