Control: tags -1 - moreinfo
On Mon, Oct 23, 2023 at 04:04:50PM +0200, Helmut Grohne wrote:
> So I think this is how it works best, but maybe this is not the final
> solution and hence I'm tagging it moreinfo. What do you think?
Chris Hofstaedler kindly reviewed this patch we have since applied the
very same approach to quite some packages in unstable without having run
into problems just yet. I am hence updating a new patch. Changes:
* In postinst check for the reference count. This missing check may
render the mitigation ineffective in some cases. Thanks Chris.
* Add lintian-brush markup for getting rid of this again.
* Remove the version check. In case someone backports this anyway, the
version check would break the mitigation.
Helmut
diff -Nru openni2-2.2.0.33+dfsg/debian/changelog
openni2-2.2.0.33+dfsg/debian/changelog
--- openni2-2.2.0.33+dfsg/debian/changelog 2021-02-05 20:15:35.000000000
+0100
+++ openni2-2.2.0.33+dfsg/debian/changelog 2023-10-23 14:41:21.000000000
+0200
@@ -1,3 +1,9 @@
+openni2 (2.2.0.33+dfsg-16) UNRELEASED; urgency=medium
+
+ * Move files to /usr. (Closes: #1054411)
+
+ -- Helmut Grohne <hel...@subdivi.de> Mon, 23 Oct 2023 14:41:21 +0200
+
openni2 (2.2.0.33+dfsg-15) unstable; urgency=medium
* Add patch for Java 17 (Closes: #982019)
diff -Nru openni2-2.2.0.33+dfsg/debian/control
openni2-2.2.0.33+dfsg/debian/control
--- openni2-2.2.0.33+dfsg/debian/control 2020-12-03 19:21:15.000000000
+0100
+++ openni2-2.2.0.33+dfsg/debian/control 2023-10-23 14:41:21.000000000
+0200
@@ -7,7 +7,7 @@
Build-Depends: debhelper-compat (= 13),
freeglut3-dev,
libusb-1.0-0-dev,
- python3,
+ python3:any,
doxygen,
graphviz,
libjpeg-dev,
diff -Nru openni2-2.2.0.33+dfsg/debian/libopenni2-0.lintian-overrides
openni2-2.2.0.33+dfsg/debian/libopenni2-0.lintian-overrides
--- openni2-2.2.0.33+dfsg/debian/libopenni2-0.lintian-overrides 1970-01-01
01:00:00.000000000 +0100
+++ openni2-2.2.0.33+dfsg/debian/libopenni2-0.lintian-overrides 2023-10-23
14:41:21.000000000 +0200
@@ -0,0 +1,4 @@
+# begin-remove-after: released:forky
+# DEP17P7 mitigation
+diversion-for-unknown-file lib/udev/rules.d/60-libopenni2-0.rules [*]
+# end-remove-after
diff -Nru openni2-2.2.0.33+dfsg/debian/libopenni2-0.postinst
openni2-2.2.0.33+dfsg/debian/libopenni2-0.postinst
--- openni2-2.2.0.33+dfsg/debian/libopenni2-0.postinst 1970-01-01
01:00:00.000000000 +0100
+++ openni2-2.2.0.33+dfsg/debian/libopenni2-0.postinst 2023-10-23
14:41:21.000000000 +0200
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -e
+
+# begin-remove-after: released:forky
+if test "$1" = configure && test "$DPKG_MAINTSCRIPT_PACKAGE_REFCOUNT" = "1" &&
test -n "$(dpkg-divert --list /lib/udev/rules.d/60-libopenni2-0.rules)"; then
+ rm -f /lib/udev/rules.d/60-libopenni2-0.rules.usr-is-merged
+ dpkg-divert --no-rename --package usr-is-merged --remove
/lib/udev/rules.d/60-libopenni2-0.rules
+fi
+# end-remove-after
+
+#DEBHELPER#
diff -Nru openni2-2.2.0.33+dfsg/debian/libopenni2-0.postrm
openni2-2.2.0.33+dfsg/debian/libopenni2-0.postrm
--- openni2-2.2.0.33+dfsg/debian/libopenni2-0.postrm 1970-01-01
01:00:00.000000000 +0100
+++ openni2-2.2.0.33+dfsg/debian/libopenni2-0.postrm 2023-10-23
14:41:21.000000000 +0200
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -e
+
+# begin-remove-after: released:forky
+if test "$1" = abort-upgrade -o "$1" = upgrade-failed -o "$1" = remove && test
-n "$(dpkg-divert --list /lib/udev/rules.d/60-libopenni2-0.rules)"; then
+ rm -f /lib/udev/rules.d/60-libopenni2-0.rules.usr-is-merged
+ dpkg-divert --no-rename --package usr-is-merged --remove
/lib/udev/rules.d/60-libopenni2-0.rules
+fi
+# end-remove-after
+
+#DEBHELPER#
diff -Nru openni2-2.2.0.33+dfsg/debian/libopenni2-0.preinst
openni2-2.2.0.33+dfsg/debian/libopenni2-0.preinst
--- openni2-2.2.0.33+dfsg/debian/libopenni2-0.preinst 1970-01-01
01:00:00.000000000 +0100
+++ openni2-2.2.0.33+dfsg/debian/libopenni2-0.preinst 2023-10-23
14:41:21.000000000 +0200
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+set -e
+
+# begin-remove-after: released:forky
+if test "$1" = upgrade; then
+ dpkg-divert --no-rename --package usr-is-merged --divert
/lib/udev/rules.d/60-libopenni2-0.rules.usr-is-merged --add
/lib/udev/rules.d/60-libopenni2-0.rules
+fi
+# end-remove-after
+
+#DEBHELPER#
diff -Nru openni2-2.2.0.33+dfsg/debian/rules openni2-2.2.0.33+dfsg/debian/rules
--- openni2-2.2.0.33+dfsg/debian/rules 2020-12-03 19:11:13.000000000 +0100
+++ openni2-2.2.0.33+dfsg/debian/rules 2023-10-23 14:41:21.000000000 +0200
@@ -8,5 +8,8 @@
cd Source/Documentation && python3 ./Runme.py
cd Bin/*-Release/ && mv NiViewer NiViewer2
+execute_after_dh_installudev:
+ set -e; if test -d debian/libopenni2-0/lib/udev/rules.d; then mv
debian/libopenni2-0/lib/udev debian/libopenni2-0/usr/lib; fi
+
override_dh_shlibdeps:
dh_shlibdeps -- --ignore-missing-info
