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

Bug#1072817: bookworm-pu: package openrc/0.45.2-2+deb12u1



Control: tags -1 - moreinfo

Adam,

On Sat, Jun 08, 2024 at 12:35:21PM +0100, Adam D. Barratt wrote:
> While you have attached a debdiff, it's of the binary packages. Please
> provide a source debdiff, i.e. between the current and proposed DSCs.

Apologies, attached.

Thanks.

Mark
diff -Nru openrc-0.45.2/debian/changelog openrc-0.45.2/debian/changelog
--- openrc-0.45.2/debian/changelog	2022-08-02 11:46:15.000000000 +0100
+++ openrc-0.45.2/debian/changelog	2024-05-02 10:04:20.000000000 +0100
@@ -1,3 +1,10 @@
+openrc (0.45.2-2+deb12u1) bookworm; urgency=medium
+
+  * d/openrc.postinst: ignore non-executable scripts in /etc/init.d
+    (Closes: #1070167)
+
+ -- Mark Hindley <leepen@debian.org>  Thu, 02 May 2024 10:04:20 +0100
+
 openrc (0.45.2-2) unstable; urgency=medium
 
   * Fix FTBFS on Hurd: explicitly set pam option and don't require kvm.
diff -Nru openrc-0.45.2/debian/gbp.conf openrc-0.45.2/debian/gbp.conf
--- openrc-0.45.2/debian/gbp.conf	2022-08-02 11:46:15.000000000 +0100
+++ openrc-0.45.2/debian/gbp.conf	2024-05-02 10:04:20.000000000 +0100
@@ -1,6 +1,6 @@
 [DEFAULT]
 upstream-branch = master
-debian-branch = debian
+debian-branch = bookworm
 upstream-tag = %(version)s
 compression = xz
 pristine-tar = False
diff -Nru openrc-0.45.2/debian/openrc.postinst openrc-0.45.2/debian/openrc.postinst
--- openrc-0.45.2/debian/openrc.postinst	2022-08-02 11:46:15.000000000 +0100
+++ openrc-0.45.2/debian/openrc.postinst	2024-05-02 10:04:20.000000000 +0100
@@ -25,7 +25,7 @@
 			rclink=/etc/rc${rl}.d/${f}
 			initsh=$(readlink -f ${rclink})
 			svc=$(basename ${initsh})
-			if [ -f ${initsh} ]; then
+			if [ -x ${initsh} ]; then
 				case ${rl} in
 				1) orl="recovery" ;;
 				2) orl="default" ;;
@@ -33,8 +33,12 @@
 				esac
 				rc-update add ${svc} ${orl}
 			else
+			    if [ -f ${initsh} ]; then
+				echo "*** WARNING: skipping non-executable $initsh"
+			    else
 				echo "*** WARNING: dangling link $rclink"
 				echo $dsvcs|grep -qw ${svc} || dsvcs="$dsvcs ${svc}"
+			    fi
 			fi
 		done
 	done

Reply to: