Bug#1069780: RM: luajit2 -- ROM; ROM; duplicate source

2024-05-31 Thread Chris Hofstaedtler
Control: tags -1 - moreinfo

On Wed, Apr 24, 2024 at 12:54:55PM -0400, M. Zhou wrote:
> Before removing src:luajit2 from unstable, we still need to make the
> reverse build dependencies of src:luajit2 depend on src:luajit instead.
> I'll later file the corresponding bugs and let them block this one.

Were these bugs filed?

Chris



Bug#1068017: Y2038-safe replacements for utmp/wtmp and lastlog

2024-05-30 Thread Chris Hofstaedtler
* Jun MO  [240530 19:09]:
> On Thu, 30 May 2024 13:18:17 +0200, Vincent Lefevre wrote:
> > I agree, this may be useful. Unfortunately, the current status is
> > that one cannot have both: installing wtmpdb forces the upgrade of
> > util-linux to 2.40.1-3 (at least), where "last" is no longer installed.
> 
> Thanks for the change about version 2.40.1-3 of the util-linux package.
> This is indeed mentioned in the NEWS.Debian from the 2.40.1-3 util-linux
> package, and the NEWS.Debian also suggests installing wtmpdb. But
> the last(1) from wtmpdb can not read /var/log/wtmp:
> 
> $ last -f /var/log/wtmp
> wtmpdb_read_all: SQL error: file is not a database
> 
> And if I understood correctly, wtmpdb require program use PAM to update
> wtmpdb, thus program not use PAM will still write /var/log/wtmp.

Yes. It appears it is unclear if programs that are not
login-equivalents should write to wtmp in the first place.

wtmpdb upstream leans - in my vague reading - towards "no".
 
Chris



Bug#1072237: libutempter: integrate with wtmpdb

2024-05-30 Thread Chris Hofstaedtler
Source: libutempter
Severity: important

Hi,

per the discussion on debian-devel [1], we'll get a Y2038-safe
replacement for wtmp, named wtmpdb / libwtmpdb etc.
Please see if your package should integrate with it.

It is unclear to me if non-login-equivalent programs should write to
wtmpdb or not. login-equivalent programs write using libpam-wtmpdb.

Chris

[1] https://lists.debian.org/debian-devel/2024/04/msg00406.html



Bug#1072231: Switch wtmp writing to libwtmpdb

2024-05-30 Thread Chris Hofstaedtler
Hi,

* Romain Francoise  [240530 20:58]:
> On Thu, May 30, 2024 at 8:33 PM Chris Hofstaedtler  wrote:
> > per the discussion on debian-devel [1] Debian will, like other
> > distributions, switch to wtmpdb. Please also switch tmux away from
> > the old format, to the new Y2038-safe format. libwtmpdb-dev etc. are
> > already in unstable.
> 
> tmux updates utmp through libutempter. Will that be updated to use the
> new format?

Unclear.

I'll note that it is also unclear if programs that are not
"login-equivalent" should write to wtmp(db) in the first place.

Chris



Bug#1072236: xfce4-terminal: use wtmpdb to write wtmp entries

2024-05-30 Thread Chris Hofstaedtler
Source: xfce4-terminal
Severity: important

Per the discussion on debian-devel, Debian will switch to wtmpdb for
Y2038-safe wtmp recording. If your package writes wtmp entries,
please switch to libpam-wtmpdb or libwtmpdb.

https://lists.debian.org/debian-devel/2024/04/msg00406.html

Chris



Bug#1072235: xterm: use wtmpdb to write wtmp entries

2024-05-30 Thread Chris Hofstaedtler
Source: xterm
Severity: important

Per the discussion on debian-devel, Debian will switch to wtmpdb for
Y2038-safe wtmp recording. If your package writes wtmp entries,
please switch to libpam-wtmpdb or libwtmpdb.

https://lists.debian.org/debian-devel/2024/04/msg00406.html

Chris



Bug#1072233: mosh: use wtmpdb to write wtmp entries

2024-05-30 Thread Chris Hofstaedtler
Source: mosh
Severity: important

Per the discussion on debian-devel, Debian will switch to wtmpdb for
Y2038-safe wtmp recording. If your package writes wtmp entries,
please switch to libwtmpdb.

https://lists.debian.org/debian-devel/2024/04/msg00406.html

Chris



Bug#1072234: guake: use wtmpdb to write wtmp entries

2024-05-30 Thread Chris Hofstaedtler
Source: guake
Severity: important

Per the discussion on debian-devel, Debian will switch to wtmpdb for
Y2038-safe wtmp recording. If your package writes wtmp entries,
please switch to libwtmpdb.

https://lists.debian.org/debian-devel/2024/04/msg00406.html

Chris



Bug#1072232: screen: use wtmpdb to write wtmp entries

2024-05-30 Thread Chris Hofstaedtler
Source: screen
Severity: important

Per the discussion on debian-devel, Debian will switch to wtmpdb for
Y2038-safe wtmp recording. If your package writes wtmp entries,
please switch to libwtmpdb.

https://lists.debian.org/debian-devel/2024/04/msg00406.html

Chris



Bug#1072231: Switch wtmp writing to libwtmpdb

2024-05-30 Thread Chris Hofstaedtler
Source: tmux
Version: 3.4-5
Severity: important

Hi,

per the discussion on debian-devel [1] Debian will, like other
distributions, switch to wtmpdb. Please also switch tmux away from
the old format, to the new Y2038-safe format. libwtmpdb-dev etc. are
already in unstable.

Chris


[1] https://lists.debian.org/debian-devel/2024/04/msg00406.html



Bug#1072230: RM: freebsd-glue -- RoQA; port abandoned

2024-05-30 Thread Chris Hofstaedtler
Package: ftp.debian.org
User: ftp.debian@packages.debian.org
Usertags: remove
X-Debbugs-Cc: debian-...@lists.debian.org, aure...@debian.org, r...@debian.org, 
stev...@debian.org
Severity: normal
Control: affects -1 src:freebsd-glue
Control: tags -1 + moreinfo

The kfreebsd-* ports have been removed. Please remove the supporting
packages too, so we can stop worrying about them on linux-any and other
ports.

I'll remove the moreinfo tag after a month or so.

Chris



Bug#1072229: RM: freebsd-libs -- RoQA; port abandoned

2024-05-30 Thread Chris Hofstaedtler
Package: ftp.debian.org
User: ftp.debian@packages.debian.org
Usertags: remove
X-Debbugs-Cc: debian-...@lists.debian.org, aure...@debian.org, r...@debian.org, 
stev...@debian.org
Severity: normal
Control: affects -1 src:freebsd-libs
Control: tags -1 + moreinfo

The kfreebsd-* ports have been removed. Please remove the supporting
packages too, so we can stop worrying about them on linux-any and other
ports.

I'll remove the moreinfo tag after a month or so.

Chris



Bug#1072228: RM: freebsd-buildutils -- RoQA; port abandoned

2024-05-30 Thread Chris Hofstaedtler
Package: ftp.debian.org
Severity: normal
User: ftp.debian@packages.debian.org
Usertags: remove
X-Debbugs-Cc: debian-...@lists.debian.org, aure...@debian.org, r...@debian.org, 
stev...@debian.org
Control: affects -1 src:freebsd-buildutils
Control: tags -1 + moreinfo

The kfreebsd-* ports have been removed. Please remove the supporting
packages too, so we can stop worrying about them on linux-any and other
ports.

I'll remove the moreinfo tag after a month or so.

Chris



Bug#1072227: minissdpd: drop freebsd-glue from build-depends

2024-05-30 Thread Chris Hofstaedtler
Source: minissdpd
Version: 1.6.0-2
Severity: important

Hi,

freebsd-glue should probably go away. Please drop it from your
Build-Depends:

Chris



Bug#1061865: oddjob: diff for NMU version 0.34.7-2.1

2024-05-30 Thread Chris Hofstaedtler
Control: tags 1061865 + pending


Dear maintainer,

I've prepared an NMU for oddjob (versioned as 0.34.7-2.1) and
uploaded it to DELAYED/12. Please feel free to tell me if I
should delay it longer.

Regards.

diff -Nru oddjob-0.34.7/debian/changelog oddjob-0.34.7/debian/changelog
--- oddjob-0.34.7/debian/changelog	2023-11-16 12:29:36.0 +0100
+++ oddjob-0.34.7/debian/changelog	2024-05-30 20:02:08.0 +0200
@@ -1,3 +1,12 @@
+oddjob (0.34.7-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+
+  [ Michael Biebl ]
+  * Install PAM module into /usr. (Closes: #1061865)
+
+ -- Chris Hofstaedtler   Thu, 30 May 2024 20:02:08 +0200
+
 oddjob (0.34.7-2) unstable; urgency=medium
 
   [ Debian Janitor ]
diff -Nru oddjob-0.34.7/debian/oddjob-mkhomedir.install oddjob-0.34.7/debian/oddjob-mkhomedir.install
--- oddjob-0.34.7/debian/oddjob-mkhomedir.install	2021-01-07 07:56:06.0 +0100
+++ oddjob-0.34.7/debian/oddjob-mkhomedir.install	2024-05-30 20:02:00.0 +0200
@@ -1,6 +1,6 @@
 etc/dbus-1/system.d/oddjob-mkhomedir.conf
 etc/oddjobd.conf.d/oddjobd-mkhomedir.conf
-lib/*/security/pam_oddjob_mkhomedir.so
+usr/lib/*/security/pam_oddjob_mkhomedir.so
 usr/libexec/oddjob/mkhomedir
 usr/share/man/man5/oddjob-mkhomedir.conf.5
 usr/share/man/man5/oddjobd-mkhomedir.conf.5
diff -Nru oddjob-0.34.7/debian/rules oddjob-0.34.7/debian/rules
--- oddjob-0.34.7/debian/rules	2023-11-16 12:29:36.0 +0100
+++ oddjob-0.34.7/debian/rules	2024-05-30 20:02:00.0 +0200
@@ -25,9 +25,5 @@
 override_dh_install:
 	# purge .la files
 	find $(CURDIR)/debian/tmp -name "*.la" -type f -exec rm -f "{}" \;
-	# move pam module to correct location
-	mkdir -p $(CURDIR)/debian/tmp/lib/${DEB_HOST_MULTIARCH}
-	mv $(CURDIR)/debian/tmp/usr/lib/${DEB_HOST_MULTIARCH}/security \
-		$(CURDIR)/debian/tmp/lib/${DEB_HOST_MULTIARCH}/
 
 	dh_install


Bug#1064126: libvirt: install NSS modules into /usr

2024-05-30 Thread Chris Hofstaedtler
Hi,

please make sure the usrmerge changes land in trixie well before the
transition freeze.
Now would be a great time.

On Tue, Feb 27, 2024 at 10:53:12PM +0100, Andrea Bolognani wrote:
> On Mon, Feb 26, 2024 at 11:38:58AM +0100, Michael Biebl wrote:
> > > > Am 25.02.24 um 19:30 schrieb Andrea Bolognani:
> > > Right there with you. I just don't want to rush things, especially
> > > since AFAIK some really problematic scenarios can be triggered when
> > > paths are canonicalized at the same time as they are moved across
> > > binary packages.
> > 
> > This is correct. Moving files between packages and from / to /usr at the
> > same time corresponds to the file loss scenario described at
> > https://subdivi.de/~helmut/dep17.html as P1.
> > See also
> > https://udd.debian.org/cgi-bin/bts-usertags.cgi?user=helmutg%40debian.org=dep17p1
> 
> Note that "at the same time" can mean two things in this context:
> 
>   1) when upgrading from bookworm to trixie;
>   2) when upgrading testing/unstable.
> 
> I'm sure that 1) can be handled correctly, but the prospect of
> causing file loss for 2) by accident is not particularly appealing
> and I'd like to avoid it if at all possible.
> 
> > > Going forward, I will focus all the time I can spend on Debian on
> > > reorganizing the libvirt package to enable modular daemons. I hope to
> > > have at least a rough implementation ready within a few weeks.
> > 
> > I don't think postponing the usr-merge changes helps mitigating any issues
> > since those need to happen for trixie in one way or another.
> > 
> > My recommendation is to upload the current patch in this bug report soon,
> > and do the package re-organisation later  via an upload to experimental.
> > dumat will then pick up any potential issues.
> > See the recommendations in https://wiki.debian.org/UsrMerge
> 
> As I've explained we want to preserve backportability as much as
> possible, which pretty much rules out the current patch. At the very
> least we'd have to use dh_movetousr instead.
> 
> What I still fail to understand, and please bear with me because the
> issue is most likely on my side, is how the fallout from a "bad" file
> move would be dealt with.
> 
> Suppose that I made the usr-merge upload today, and the package
> restructure upload in a month. At that point, dumat would detect that
> file loss could occur, report it and... What then?

Then you get to fix them manually in various maintainer scripts,
hoping they can be fixed.

> Have reliable mitigations been developed for all possible file loss
> scenarios?  Is it guaranteed that such mitigations, when applied,
> will protect from file loss not just the people running stable, but
> also those running testing and unstable?

No. The mitigations are fragile; bugs in dpkg and/or policy have
been discovered. Extensive testing is required for all scenarios you
can envision.
Even then, some things are just not fixable in a reliable manner.

> My instincts tell me that it would be much easier to reason about
> this if the two transitions happened at the same time rather than
> potentially months apart. This is my main concern with applying the
> usr-merge changes when we still don't have a clear picture of what
> the final state of the package will look like.

The best is to have as few file moves as possible in trixie. In
forky, moving files becomes easier again.

Chris



Bug#1061491: libcgroup: diff for NMU version 2.0.2-2.1

2024-05-30 Thread Chris Hofstaedtler
Control: tags 1061491 + pending


Dear maintainer,

I've prepared an NMU for libcgroup (versioned as 2.0.2-2.1) and
uploaded it to DELAYED/12. Please feel free to tell me if I
should delay it longer.

Regards.

diff -Nru libcgroup-2.0.2/debian/changelog libcgroup-2.0.2/debian/changelog
--- libcgroup-2.0.2/debian/changelog	2022-07-25 17:16:51.0 +0200
+++ libcgroup-2.0.2/debian/changelog	2024-05-30 19:52:18.0 +0200
@@ -1,3 +1,12 @@
+libcgroup (2.0.2-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+
+  [ Michael Biebl ]
+  * Move PAM module and library to /usr. (Closes: #1061491)
+
+ -- Chris Hofstaedtler   Thu, 30 May 2024 19:52:18 +0200
+
 libcgroup (2.0.2-2) unstable; urgency=medium
 
   * Upload to unstable
diff -Nru libcgroup-2.0.2/debian/libcgroup2.install libcgroup-2.0.2/debian/libcgroup2.install
--- libcgroup-2.0.2/debian/libcgroup2.install	2022-05-16 14:08:22.0 +0200
+++ libcgroup-2.0.2/debian/libcgroup2.install	2024-05-30 19:52:17.0 +0200
@@ -1 +1 @@
-lib/*/libcgroup.so.*
+usr/lib/*/libcgroup.so.*
diff -Nru libcgroup-2.0.2/debian/libcgroup-dev.install libcgroup-2.0.2/debian/libcgroup-dev.install
--- libcgroup-2.0.2/debian/libcgroup-dev.install	2021-09-30 15:04:30.0 +0200
+++ libcgroup-2.0.2/debian/libcgroup-dev.install	2024-05-30 19:52:17.0 +0200
@@ -1,4 +1,4 @@
 usr/include
 usr/lib/*/*.so
 usr/lib/*/pkgconfig
-lib/*/*.a
+usr/lib/*/*.a
diff -Nru libcgroup-2.0.2/debian/libpam-cgroup.install libcgroup-2.0.2/debian/libpam-cgroup.install
--- libcgroup-2.0.2/debian/libpam-cgroup.install	2021-09-30 15:04:30.0 +0200
+++ libcgroup-2.0.2/debian/libpam-cgroup.install	2024-05-30 19:52:17.0 +0200
@@ -1 +1 @@
-lib/*/security/*.so
+usr/lib/*/security/*.so
diff -Nru libcgroup-2.0.2/debian/rules libcgroup-2.0.2/debian/rules
--- libcgroup-2.0.2/debian/rules	2022-05-11 15:22:01.0 +0200
+++ libcgroup-2.0.2/debian/rules	2024-05-30 19:52:17.0 +0200
@@ -15,7 +15,6 @@
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
-			--libdir /lib/$(DEB_HOST_MULTIARCH) \
 			--disable-silent-rules \
 			--enable-opaque-hierarchy="name=systemd"
 
@@ -24,28 +23,12 @@
 	# Disabled. Requires root and also modifies the testbed.
 
 
-override_dh_installdirs:
-	dh_installdirs
-
-	# While the PAM module and the library are in /lib, according to the
-	# FHS, development files must go into usr/lib/.
-	mkdir -p debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)
-
-
 override_dh_auto_install:
 	dh_auto_install
 
-	# libcgroup-dev:
-	#   Move the development files from lib/ to usr/lib. The pkgconfig files
-	#   can be moved as-is, but we need to redirect the .so symlink. dh_link
-	#   will later correct this link for us (from relative to absolute).
-	cd debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH) && \
-		mv../../../lib/$(DEB_HOST_MULTIARCH)/pkgconfig . && \
-		ln -s ../../../lib/$(DEB_HOST_MULTIARCH)/libcgroup.so.*.*.* libcgroup.so
-
 	# Remove unwanted/unused files (because of --fail-missing)
-	cd debian/tmp/lib/$(DEB_HOST_MULTIARCH) && \
-		rm -f *.so security/pam_cgroup.so.* *.la security/*.la security/*.a \
+	cd debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH) && \
+		rm -f *.la security/*.la security/*.a \
 		libcgroupfortesting.so.* \
 		libcgset.so.*
 


Bug#1058833: qlcplus: use udev.pc to place udev rules

2024-05-30 Thread Chris Hofstaedtler
Hi Jérôme,

On Tue, Mar 26, 2024 at 03:18:06PM +0100, Jérôme wrote:
> Hi Chris,
> 
> Thanks for your explained report and the patch! I finally took the time to
> have a look and integrate it. I am waiting for the end of the
> qtbase-opensource-src transition before uploading it - with the new upstream
> release by the way.

Please make sure this lands in trixie before the transition freeze.
Now would be a great time.

Best,
Chris



Bug#1064449: open-infrastructure-system-tools: diff for NMU version 20190301-lts1-3.1

2024-05-30 Thread Chris Hofstaedtler
Control: tags 1064449 + pending


Dear maintainer,

I've prepared an NMU for open-infrastructure-system-tools (versioned as 
20190301-lts1-3.1) and
uploaded it to DELAYED/14. Please feel free to tell me if I
should delay it longer.

Regards.

diff -Nru open-infrastructure-system-tools-20190301-lts1/debian/changelog open-infrastructure-system-tools-20190301-lts1/debian/changelog
--- open-infrastructure-system-tools-20190301-lts1/debian/changelog	2023-01-30 17:44:04.0 +0100
+++ open-infrastructure-system-tools-20190301-lts1/debian/changelog	2024-05-30 19:49:14.0 +0200
@@ -1,3 +1,13 @@
+open-infrastructure-system-tools (20190301-lts1-3.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+
+  [ Helmut Grohne ]
+  * Fix ineffective diversions due to /usr-move (DEP17)
+(Closes: #1064449)
+
+ -- Chris Hofstaedtler   Thu, 30 May 2024 19:49:14 +0200
+
 open-infrastructure-system-tools (20190301-lts1-3) sid; urgency=medium
 
   * Uploading to sid.
diff -Nru open-infrastructure-system-tools-20190301-lts1/debian/patches/fixusrmerge.patch open-infrastructure-system-tools-20190301-lts1/debian/patches/fixusrmerge.patch
--- open-infrastructure-system-tools-20190301-lts1/debian/patches/fixusrmerge.patch	1970-01-01 01:00:00.0 +0100
+++ open-infrastructure-system-tools-20190301-lts1/debian/patches/fixusrmerge.patch	2024-05-30 19:48:55.0 +0200
@@ -0,0 +1,71 @@
+--- open-infrastructure-system-tools-20190301-lts1.orig/system-build/scripts/build/chroot_dpkg
 open-infrastructure-system-tools-20190301-lts1/system-build/scripts/build/chroot_dpkg
+@@ -41,9 +41,15 @@ case "${1}" in
+ 		Create_lockfile .lock
+ 
+ 		# Create custom start-stop-daemon program
+-		Chroot chroot dpkg-divert --rename --quiet --add /sbin/start-stop-daemon
++		Chroot chroot dpkg-divert --rename --quiet --add /usr/sbin/start-stop-daemon
++		# begin-remove-after: released:trixie
++		# In the bookworm to trixie upgrade, dpkg moves
++		# start-stop-daemon from /sbin to /usr/sbin. Duplicate the
++		# diversion to cover both. DEP17 P3 M18
++		Chroot chroot dpkg-divert --rename --quiet --add --divert /sbin/start-stop-daemon.distrib.usr-is-merged
++		# end-remove-after
+ 
+-cat > chroot/sbin/start-stop-daemon << EOF
++cat > chroot/usr/sbin/start-stop-daemon << EOF
+ #!/bin/sh
+ 
+ exit 0
+@@ -89,8 +95,11 @@ EOF
+ 		Chroot chroot dpkg-divert --rename --quiet --remove /usr/sbin/flash-kernel
+ 
+ 		# Remove custom start-stop-daemon program
+-		rm -f chroot/sbin/start-stop-daemon
++		rm -f chroot/usr/sbin/start-stop-daemon
++		# begin-remove-after: released:trixie
+ 		Chroot chroot dpkg-divert --rename --quiet --remove /sbin/start-stop-daemon
++		# end-remove-after
++		Chroot chroot dpkg-divert --rename --quiet --remove /usr/sbin/start-stop-daemon
+ 
+ 		# Remove dpkg sync configuration
+ 		rm -f chroot/etc/dpkg/dpkg.cfg.d/live-build
+--- open-infrastructure-system-tools-20190301-lts1.orig/system-build/scripts/build/chroot_hostname
 open-infrastructure-system-tools-20190301-lts1/system-build/scripts/build/chroot_hostname
+@@ -46,15 +46,21 @@ case "${1}" in
+ 		# Create custom hostname
+ 		Echo_message "Configuring file /bin/hostname"
+ 
+-		Chroot chroot dpkg-divert --rename --quiet --add /bin/hostname
++		Chroot chroot dpkg-divert --rename --quiet --add /usr/bin/hostname
++		# begin-remove-after: released:trixie
++		# In the bookworm to trixie upgrade, hostname moves hostname
++		# from /bin to /usr/bin. Duplicate the diversion to cover both.
++		# DEP17 P3 M18
++		Chroot chroot dpkg-divert --rename --quiet --add --divert /bin/hostname.distrib.usr-is-merged /bin/hostname
++		# end-remove-after
+ 
+-cat > chroot/bin/hostname << EOF
++cat > chroot/usr/bin/hostname << EOF
+ #!/bin/sh
+ 
+ echo "localhost.localdomain"
+ EOF
+ 
+-		chmod 755 chroot/bin/hostname
++		chmod 755 chroot/usr/bin/hostname
+ 
+ 		# Creating stage file
+ 		Create_stagefile .build/chroot_hostname
+@@ -79,7 +85,10 @@ EOF
+ 
+ 		# Remove custom hostname
+ 		rm -f chroot/bin/hostname
++		# begin-remove-after: released:trixie
+ 		Chroot chroot dpkg-divert --rename --quiet --remove /bin/hostname
++		# end-remove-after
++		Chroot chroot dpkg-divert --rename --quiet --remove /usr/bin/hostname
+ 
+ 		# Removing stage file
+ 		rm -f .build/chroot_hostname
diff -Nru open-infrastructure-system-tools-20190301-lts1/debian/patches/series open-infrastructure-system-tools-20190301-lts1/debian/patches/series
--- open-infrastructure-system-tools-20190301-lts1/debian/patches/series	2023-01-25 12:37:41.0 +0100
+++ open-infrastructure-system-tools-20190301-lts1/debian/patches/series	2024-05-30 19:49:05.0 +0200
@@ -1 +1,2 @@
 upstream/0001-ftbfs-asciidoc.patch
+fixusrmerge.patch


Bug#1071912: pk4: diff for NMU version 5+nmu1

2024-05-30 Thread Chris Hofstaedtler
Control: tags 1071912 + patch
Control: tags 1071912 + pending


Dear maintainer,

I've prepared an NMU for pk4 (versioned as 5+nmu1) and
uploaded it to DELAYED/14. Please feel free to tell me if I
should delay it longer.

Regards.

diff -Nru pk4-5/debian/changelog pk4-5+nmu1/debian/changelog
--- pk4-5/debian/changelog	2018-01-14 20:36:08.0 +0100
+++ pk4-5+nmu1/debian/changelog	2024-05-30 19:44:07.0 +0200
@@ -1,3 +1,10 @@
+pk4 (5+nmu1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Install systemd units into /usr/lib. (Closes: #1071912)
+
+ -- Chris Hofstaedtler   Thu, 30 May 2024 19:44:07 +0200
+
 pk4 (5) unstable; urgency=medium
 
   * “avail” → “make available” (closes: #881343)
diff -Nru pk4-5/debian/pk4.install pk4-5+nmu1/debian/pk4.install
--- pk4-5/debian/pk4.install	2017-10-20 22:26:17.0 +0200
+++ pk4-5+nmu1/debian/pk4.install	2024-05-30 19:44:06.0 +0200
@@ -1,7 +1,7 @@
 apt.conf.d/50pk4.conf /etc/apt/apt.conf.d/
 bash-completion/pk4  /usr/share/bash-completion/completions/
 zsh-vendor-completions/_pk4 /usr/share/zsh/vendor-completions/
-pk4-generate-index.service /lib/systemd/system/
-pk4-generate-index.timer /lib/systemd/system/
+pk4-generate-index.service /usr/lib/systemd/system/
+pk4-generate-index.timer /usr/lib/systemd/system/
 dpkg.cfg.d/pk4 /etc/dpkg/dpkg.cfg.d/
 hooks-available/after-download /usr/share/pk4/hooks-available/


Bug#1068017: Y2038-safe replacements for utmp/wtmp and lastlog

2024-05-30 Thread Chris Hofstaedtler
* Vincent Lefevre  [240530 13:21]:
> On 2024-05-08 16:53:53 +0800, Jun MO wrote:
> > For last(1) my concern is that it will be helped to keep the original
> > last(1) for back-compatibility to read old wtmp files.
> 
> I agree, this may be useful. Unfortunately, the current status is
> that one cannot have both: installing wtmpdb forces the upgrade of
> util-linux to 2.40.1-3 (at least), where "last" is no longer installed.

wtmpdb takes over the "last" name. Unfortunately without support for
reading the old files. Nobody wrote tooling to import them or so.

Chris



Bug#1054093: monit: diff for NMU version 1:5.33.0-2.1

2024-05-30 Thread Chris Hofstaedtler
Hi Fabio,

* Fabio A. De Muzio Tobich  [240530 17:40]:
> > I've prepared an NMU for monit (versioned as 1:5.33.0-2.1) and
> > uploaded it to DELAYED/10. Please feel free to tell me if I
> > should delay it longer.
> 
> Your NMU is welcome, and feel free to reduce the delay if you see fit.

Thanks. I've rescheduled it to 1-day.

Best,
Chris



Bug#1057793: ipp-usb: diff for NMU version 0.9.23-1.1

2024-05-30 Thread Chris Hofstaedtler
Control: tags 1057793 + pending


Dear maintainer,

I've prepared an NMU for ipp-usb (versioned as 0.9.23-1.1) and
uploaded it to DELAYED/14. Please feel free to tell me if I
should delay it longer.

Regards.

diff -Nru ipp-usb-0.9.23/debian/changelog ipp-usb-0.9.23/debian/changelog
--- ipp-usb-0.9.23/debian/changelog	2022-12-07 12:26:08.0 +0100
+++ ipp-usb-0.9.23/debian/changelog	2024-05-30 17:30:20.0 +0200
@@ -1,3 +1,11 @@
+ipp-usb (0.9.23-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Delegate placement of udev/systemd files to pkg-config data
+(Closes: #1057793)
+
+ -- Chris Hofstaedtler   Thu, 30 May 2024 17:30:20 +0200
+
 ipp-usb (0.9.23-1) unstable; urgency=medium
 
   * Update to new upstream version 0.9.23.
diff -Nru ipp-usb-0.9.23/debian/control ipp-usb-0.9.23/debian/control
--- ipp-usb-0.9.23/debian/control	2022-12-07 12:25:07.0 +0100
+++ ipp-usb-0.9.23/debian/control	2024-05-30 17:30:19.0 +0200
@@ -13,6 +13,7 @@
  libusb-1.0-0-dev,
  pkg-config,
  ronn,
+ systemd-dev,
 Standards-Version: 4.6.0
 Rules-Requires-Root: no
 Homepage: https://github.com/OpenPrinting/ipp-usb
diff -Nru ipp-usb-0.9.23/debian/patches/0002-Use-pkg-config-for-systemd-dev-paths.patch ipp-usb-0.9.23/debian/patches/0002-Use-pkg-config-for-systemd-dev-paths.patch
--- ipp-usb-0.9.23/debian/patches/0002-Use-pkg-config-for-systemd-dev-paths.patch	1970-01-01 01:00:00.0 +0100
+++ ipp-usb-0.9.23/debian/patches/0002-Use-pkg-config-for-systemd-dev-paths.patch	2024-05-30 17:30:19.0 +0200
@@ -0,0 +1,24 @@
+Index: ipp-usb-0.9.23/Makefile
+===
+--- ipp-usb-0.9.23.orig/Makefile
 ipp-usb-0.9.23/Makefile
+@@ -1,6 +1,8 @@
+ MANDIR= /usr/share/man/
+ QUIRKSDIR = /usr/share/ipp-usb/quirks
+ MANPAGE   = ipp-usb.8
++SYSTEMDSYSTEMUNITDIR = $(shell pkg-config --variable=systemdsystemunitdir systemd)
++UDEVDIR   = $(shell pkg-config --variable=udevdir udev)
+ 
+ # Merge DESTDIR and PREFIX
+ PREFIX := $(abspath $(DESTDIR)/$(PREFIX))
+@@ -19,8 +21,8 @@ $(MANPAGE): $(MANPAGE).md
+ 
+ install:
+ 	install -s -D -t $(PREFIX)/sbin ipp-usb
+-	install -m 644 -D -t $(PREFIX)/lib/udev/rules.d systemd-udev/*.rules
+-	install -m 644 -D -t $(PREFIX)/lib/systemd/system systemd-udev/*.service
++	install -m 644 -D -t $(PREFIX)$(UDEVDIR)/rules.d systemd-udev/*.rules
++	install -m 644 -D -t $(PREFIX)$(SYSTEMDSYSTEMUNITDIR) systemd-udev/*.service
+ 	install -m 644 -D -t $(PREFIX)/etc/ipp-usb ipp-usb.conf
+ 	mkdir -p $(PREFIX)/$(MANDIR)/man8
+ 	gzip <$(MANPAGE) > $(PREFIX)$(MANDIR)/man8/$(MANPAGE).gz
diff -Nru ipp-usb-0.9.23/debian/patches/series ipp-usb-0.9.23/debian/patches/series
--- ipp-usb-0.9.23/debian/patches/series	2022-12-07 12:26:08.0 +0100
+++ ipp-usb-0.9.23/debian/patches/series	2024-05-30 17:30:19.0 +0200
@@ -1 +1,2 @@
 0001-Revert-make-install-made-dependent-on-make-all.patch
+0002-Use-pkg-config-for-systemd-dev-paths.patch


Bug#1058769: amazon-ec2-net-utils: diff for NMU version 2.4.1-1.1

2024-05-30 Thread Chris Hofstaedtler
Control: tags 1058769 + pending


Dear maintainer,

I've prepared an NMU for amazon-ec2-net-utils (versioned as 2.4.1-1.1) and
uploaded it to DELAYED/14. Please feel free to tell me if I
should delay it longer.

Regards.

diff -Nru amazon-ec2-net-utils-2.4.1/debian/changelog amazon-ec2-net-utils-2.4.1/debian/changelog
--- amazon-ec2-net-utils-2.4.1/debian/changelog	2023-10-26 05:38:56.0 +0200
+++ amazon-ec2-net-utils-2.4.1/debian/changelog	2024-05-30 16:38:12.0 +0200
@@ -1,3 +1,11 @@
+amazon-ec2-net-utils (2.4.1-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Install systemd services again into default location.
+(Closes: #1058769)
+
+ -- Chris Hofstaedtler   Thu, 30 May 2024 16:38:12 +0200
+
 amazon-ec2-net-utils (2.4.1-1) unstable; urgency=medium
 
   * New upstream release 2.4.1
diff -Nru amazon-ec2-net-utils-2.4.1/debian/patches/debian-changes amazon-ec2-net-utils-2.4.1/debian/patches/debian-changes
--- amazon-ec2-net-utils-2.4.1/debian/patches/debian-changes	2023-10-26 05:38:56.0 +0200
+++ amazon-ec2-net-utils-2.4.1/debian/patches/debian-changes	2024-05-30 16:38:10.0 +0200
@@ -1,16 +1,3 @@
-diff --git a/GNUmakefile b/GNUmakefile
-index ced341b221079b2a70b18085af7eac119f02174c..56c9b119b7a5bef49f8ce5f730bb5b68ca3e3cce 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 3a82e288100cb9a396758e9d7138d97f32eaaa74..336fa25417bcae82886b16126c7a9efb246e0602 100644
 --- a/lib/lib.sh


Bug#1061259: fbset: diff for NMU version 2.1-33.1

2024-05-30 Thread Chris Hofstaedtler
Control: tags 1061259 + pending


Dear maintainer,

I've prepared an NMU for fbset (versioned as 2.1-33.1) and
uploaded it to DELAYED/14. Please feel free to tell me if I
should delay it longer.

Regards.

diff -Nru fbset-2.1/debian/changelog fbset-2.1/debian/changelog
--- fbset-2.1/debian/changelog	2022-08-27 00:15:01.0 +0200
+++ fbset-2.1/debian/changelog	2024-05-30 16:33:04.0 +0200
@@ -1,3 +1,18 @@
+fbset (2.1-33.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+
+  [ Sven Joachim ]
+  * Move binaries below /usr (Closes: #1061259)
+The upstream Makefile installs binaries into /bin, in Debian trixie
+and later they should be installed into /usr/bin instead.  Use the
+dh_movetousr tool added in debhelper 13.11.7 to achieve that.
+Adding dh-sequence-movetousr to Build-Depends is not strictly
+necessary, but it helps with backports and ensures that dh_movetousr
+is run in case debian/rules gets ever converted to dh.
+
+ -- Chris Hofstaedtler   Thu, 30 May 2024 16:33:04 +0200
+
 fbset (2.1-33) unstable; urgency=medium
 
   [ Debian Janitor ]
diff -Nru fbset-2.1/debian/control fbset-2.1/debian/control
--- fbset-2.1/debian/control	2022-08-26 22:22:12.0 +0200
+++ fbset-2.1/debian/control	2024-05-30 16:31:00.0 +0200
@@ -7,7 +7,7 @@
 Vcs-Git: https://github.com/sudipm-mukherjee/fbset.git
 Standards-Version: 4.6.1.0
 Rules-Requires-Root: no
-Build-Depends: debhelper-compat (= 13), dpkg-dev (>= 1.15.7), flex, bison
+Build-Depends: debhelper-compat (= 13), dh-sequence-movetousr, dpkg-dev (>= 1.15.7), flex, bison
 
 Package: fbset
 Architecture: linux-any
diff -Nru fbset-2.1/debian/rules fbset-2.1/debian/rules
--- fbset-2.1/debian/rules	2022-08-26 22:24:02.0 +0200
+++ fbset-2.1/debian/rules	2024-05-30 16:31:00.0 +0200
@@ -79,6 +79,7 @@
 	dh_strip -a
 	dh_compress -a
 	dh_fixperms -a
+	dh_movetousr -a
 	dh_installdeb -a
 	dh_shlibdeps -a
 	dh_gencontrol -a


Bug#1059283: mate-settings-daemon: diff for NMU version 1.26.1-1.1

2024-05-29 Thread Chris Hofstaedtler
Control: tags 1059283 + pending


Dear maintainer,

I've prepared an NMU for mate-settings-daemon (versioned as 1.26.1-1.1) and
uploaded it to DELAYED/14. Please feel free to tell me if I
should delay it longer.

Regards.

diff -Nru mate-settings-daemon-1.26.1/debian/changelog mate-settings-daemon-1.26.1/debian/changelog
--- mate-settings-daemon-1.26.1/debian/changelog	2024-01-06 08:00:22.0 +0100
+++ mate-settings-daemon-1.26.1/debian/changelog	2024-05-30 03:21:29.0 +0200
@@ -1,3 +1,10 @@
+mate-settings-daemon (1.26.1-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Use udev.pc to place udev files. (Closes: #1059283)
+
+ -- Chris Hofstaedtler   Thu, 30 May 2024 03:21:29 +0200
+
 mate-settings-daemon (1.26.1-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru mate-settings-daemon-1.26.1/debian/control mate-settings-daemon-1.26.1/debian/control
--- mate-settings-daemon-1.26.1/debian/control	2024-01-06 08:00:14.0 +0100
+++ mate-settings-daemon-1.26.1/debian/control	2024-05-30 03:21:26.0 +0200
@@ -33,6 +33,8 @@
libxrandr-dev,
libxt-dev,
mate-common (>= 1.18),
+   pkgconf,
+   systemd-dev,
x11proto-kb-dev,
 Standards-Version: 4.6.2
 Rules-Requires-Root: no
diff -Nru mate-settings-daemon-1.26.1/debian/mate-settings-daemon-common.install mate-settings-daemon-1.26.1/debian/mate-settings-daemon-common.install
--- mate-settings-daemon-1.26.1/debian/mate-settings-daemon-common.install	2019-08-11 13:32:02.0 +0200
+++ mate-settings-daemon-1.26.1/debian/mate-settings-daemon-common.install	2024-05-30 03:21:26.0 +0200
@@ -1,6 +1,6 @@
 #! /usr/bin/dh-exec
 
-[linux-any] usr/lib/udev/rules.d/ lib/udev
+[linux-any] usr/lib/udev/rules.d/ ${deb_udevdir}
 usr/share/glib-2.0/
 usr/share/icons/
 usr/share/locale/
diff -Nru mate-settings-daemon-1.26.1/debian/rules mate-settings-daemon-1.26.1/debian/rules
--- mate-settings-daemon-1.26.1/debian/rules	2024-01-06 08:00:22.0 +0100
+++ mate-settings-daemon-1.26.1/debian/rules	2024-05-30 03:21:26.0 +0200
@@ -9,8 +9,10 @@
 DEB_HOST_ARCH_OS?=$(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 ifeq (,$(filter linux, $(DEB_HOST_ARCH_OS)))
 WITHOUT_RFKILL = "--disable-rfkill"
+export deb_udevdir =
 else
 WITHOUT_RFKILL = ""
+export deb_udevdir = $(shell pkg-config --variable=udevdir udev | sed s,^/,,)
 endif
 
 


Bug#1054013: dnssec-trigger: diff for NMU version 0.17+repack-5.2

2024-05-29 Thread Chris Hofstaedtler
Control: tags 1054013 + pending


Dear maintainer,

I've prepared an NMU for dnssec-trigger (versioned as 0.17+repack-5.2) and
uploaded it to DELAYED/14. Please feel free to tell me if I
should delay it longer.

Regards.

diff -Nru dnssec-trigger-0.17+repack/debian/changelog dnssec-trigger-0.17+repack/debian/changelog
--- dnssec-trigger-0.17+repack/debian/changelog	2023-05-11 19:40:04.0 +0200
+++ dnssec-trigger-0.17+repack/debian/changelog	2024-05-30 03:23:48.0 +0200
@@ -1,3 +1,12 @@
+dnssec-trigger (0.17+repack-5.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+
+  [ Helmut Grohne ]
+  * Defer placement of systemd units to systemd.pc. (Closes: #1054013)
+
+ -- Chris Hofstaedtler   Thu, 30 May 2024 03:23:48 +0200
+
 dnssec-trigger (0.17+repack-5.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru dnssec-trigger-0.17+repack/debian/control dnssec-trigger-0.17+repack/debian/control
--- dnssec-trigger-0.17+repack/debian/control	2023-05-11 19:39:30.0 +0200
+++ dnssec-trigger-0.17+repack/debian/control	2024-05-30 03:23:45.0 +0200
@@ -11,8 +11,10 @@
 	   libgtk2.0-dev,
 	   libldns-dev (>= 1.6.14-1~),
 	   lsb-base,
+	   pkgconf,
 	   python3,
-   sensible-utils
+	   sensible-utils,
+	   systemd-dev,
 Standards-Version: 4.3.0
 Homepage: https://www.nlnetlabs.nl/projects/dnssec-trigger/
 Vcs-Git: https://salsa.debian.org/dns-team/dnssec-trigger.git
diff -Nru dnssec-trigger-0.17+repack/debian/rules dnssec-trigger-0.17+repack/debian/rules
--- dnssec-trigger-0.17+repack/debian/rules	2020-08-24 20:24:56.0 +0200
+++ dnssec-trigger-0.17+repack/debian/rules	2024-05-30 03:23:45.0 +0200
@@ -21,7 +21,7 @@
 		--with-python=/usr/bin/python3 \
 		--with-hooks=networkmanager \
 		--with-gui=gtk \
-		--with-unitdir=/lib/systemd/system \
+		--with-unitdir=$(shell pkgconf --variable=systemdsystemunitdir systemd) \
 		--with-rundir=/run \
 		--with-keydir=/etc/dnssec-trigger \
 		--with-pidfile=/run/dnssec-triggerd.pid \


Bug#1063693: xdm: diff for NMU version 1:1.1.11-3.1

2024-05-29 Thread Chris Hofstaedtler
Control: tags 1063693 + pending


Dear maintainer,

I've prepared an NMU for xdm (versioned as 1:1.1.11-3.1) and
uploaded it to DELAYED/14. Please feel free to tell me if I
should delay it longer.

Regards.

diff -u xdm-1.1.11/debian/changelog xdm-1.1.11/debian/changelog
--- xdm-1.1.11/debian/changelog
+++ xdm-1.1.11/debian/changelog
@@ -1,3 +1,12 @@
+xdm (1:1.1.11-3.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+
+  [ Helmut Grohne ]
+  * Let systemd.pc determine the location of systemd units. (Closes: #1063693)
+
+ -- Chris Hofstaedtler   Thu, 30 May 2024 03:12:21 +0200
+
 xdm (1:1.1.11-3) unstable; urgency=medium
 
   * Team upload.
diff -u xdm-1.1.11/debian/control xdm-1.1.11/debian/control
--- xdm-1.1.11/debian/control
+++ xdm-1.1.11/debian/control
@@ -5,8 +5,9 @@
 Uploaders: Cyril Brulebois 
 Build-Depends:
  debhelper (>= 9),
+ dh-exec,
  dpkg-dev (>= 1.16.1),
- pkg-config,
+ pkgconf,
  libxmu-dev (>= 1:1.0.1),
  libx11-dev (>= 2:1.0.0),
  libxau-dev (>= 1:1.0.0),
@@ -18,6 +19,7 @@
  quilt,
  automake,
  libtool,
+ systemd-dev,
  xutils-dev,
 Standards-Version: 3.9.6
 Vcs-Git: git://anonscm.debian.org/pkg-xorg/app/xdm
diff -u xdm-1.1.11/debian/rules xdm-1.1.11/debian/rules
--- xdm-1.1.11/debian/rules
+++ xdm-1.1.11/debian/rules
@@ -13,6 +13,8 @@
 
 include debian/xsfbs/xsfbs.mk
 
+export deb_systemdsystemunitdir := $(shell pkgconf --variable=systemdsystemunitdir systemd | sed s,^/,,)
+
 confflags += \
 	--prefix=/usr \
 	--mandir=\$${prefix}/share/man \
@@ -24,7 +26,7 @@
 	--with-pixmapdir=/usr/share/X11/xdm/pixmaps \
 	--with-color-pixmap=debian.xpm \
 	--with-bw-pixmap=debianbw.xpm \
-	--with-systemdsystemunitdir=/lib/systemd/system \
+	--with-systemdsystemunitdir \
 	--disable-xdm-auth \
 	--with-xft \
 	--disable-silent-rules \
@@ -126,6 +128,7 @@
 	dh_testroot
 
 	dh_installdocs
+	chmod +x debian/xdm.install
 	dh_install --sourcedir=debian/tmp --list-missing
 	dh_installchangelogs ChangeLog
 	dh_installinit --noscripts
diff -u xdm-1.1.11/debian/xdm.install xdm-1.1.11/debian/xdm.install
--- xdm-1.1.11/debian/xdm.install
+++ xdm-1.1.11/debian/xdm.install
@@ -1,3 +1,4 @@
+#!/usr/bin/dh-exec
 etc/X11/app-defaults/Chooser
 etc/X11/xdm/Xaccess
 etc/X11/xdm/Xreset
@@ -10,7 +11,7 @@
 etc/X11/xdm/xdm-config
 etc/X11/xdm/xdm.options
 etc/insserv.conf.d/xdm
-lib/systemd/system/xdm.service
+${deb_systemdsystemunitdir}/xdm.service
 usr/bin/xdm
 usr/lib/X11/xdm/chooser
 usr/lib/X11/xdm/libXdmGreet.so


Bug#1063572: jfsutils: diff for NMU version 1.1.15-5.1

2024-05-29 Thread Chris Hofstaedtler
Control: tags 1063572 + pending


Dear maintainer,

I've prepared an NMU for jfsutils (versioned as 1.1.15-5.1) and
uploaded it to DELAYED/10. Please feel free to tell me if I
should delay it longer.

Regards.

diff -Nru jfsutils-1.1.15/debian/changelog jfsutils-1.1.15/debian/changelog
--- jfsutils-1.1.15/debian/changelog	2020-06-23 22:31:15.0 +0200
+++ jfsutils-1.1.15/debian/changelog	2024-05-30 03:10:37.0 +0200
@@ -1,3 +1,12 @@
+jfsutils (1.1.15-5.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+
+  [ Helmut Grohne ]
+  * Move files to /usr for DEP17 (closes: #1063572).
+
+ -- Chris Hofstaedtler   Thu, 30 May 2024 03:10:37 +0200
+
 jfsutils (1.1.15-5) unstable; urgency=medium
 
   * Update Standards-Version to 4.5.0 .
diff -Nru jfsutils-1.1.15/debian/jfsutils.install jfsutils-1.1.15/debian/jfsutils.install
--- jfsutils-1.1.15/debian/jfsutils.install	2016-11-07 18:39:06.0 +0100
+++ jfsutils-1.1.15/debian/jfsutils.install	2024-05-30 03:10:36.0 +0200
@@ -1 +1 @@
-debian/tmp/sbin
+debian/tmp/usr/sbin
diff -Nru jfsutils-1.1.15/debian/jfsutils-udeb.install jfsutils-1.1.15/debian/jfsutils-udeb.install
--- jfsutils-1.1.15/debian/jfsutils-udeb.install	2016-11-07 18:39:06.0 +0100
+++ jfsutils-1.1.15/debian/jfsutils-udeb.install	2024-05-30 03:10:36.0 +0200
@@ -1 +1 @@
-debian/tmp/sbin
\ No newline at end of file
+debian/tmp/usr/sbin
diff -Nru jfsutils-1.1.15/debian/rules jfsutils-1.1.15/debian/rules
--- jfsutils-1.1.15/debian/rules	2016-11-07 18:39:29.0 +0100
+++ jfsutils-1.1.15/debian/rules	2024-05-30 03:10:36.0 +0200
@@ -25,5 +25,4 @@
 	LDFLAGS += -Wl,--no-relax
 endif
 
-DEB_CONFIGURE_USER_FLAGS := --sbindir=/sbin
 DEB_MAKE_INSTALL_TARGET := install DESTDIR=$(CURDIR)/debian/tmp


Bug#1054088: sanoid: let dh_installsystemd choose the location of units

2024-05-29 Thread Chris Hofstaedtler
Hi,

On Tue, Oct 17, 2023 at 11:08:24AM -0400, Michael Jeanson wrote:
> On 2023-10-16 15:38, Helmut Grohne wrote:
> > Source: sanoid
> > Version: 2.2.0-1
> > Tags: patch
> > User: helm...@debian.org
> > Usertags: dep17m2
> > 
> > We want to move all aliased files from / to /usr to finalize the
> > /usr-merge transition via DEP17
[..]
> 
> Thanks for the patch, it will be included in the next upload.

Please make sure this lands in trixie before the transition freeze.
Now would be a great time.

Chris



Bug#1071911: debiman: diff for NMU version 0.0~git20220907.a582536-1.1

2024-05-29 Thread Chris Hofstaedtler
Control: tags 1071911 + patch
Control: tags 1071911 + pending


Dear maintainer,

I've prepared an NMU for debiman (versioned as 0.0~git20220907.a582536-1.1) and
uploaded it to DELAYED/14. Please feel free to tell me if I
should delay it longer.

Regards.

diff -Nru debiman-0.0~git20220907.a582536/debian/changelog debiman-0.0~git20220907.a582536/debian/changelog
--- debiman-0.0~git20220907.a582536/debian/changelog	2022-10-22 10:38:42.0 +0200
+++ debiman-0.0~git20220907.a582536/debian/changelog	2024-05-30 03:07:49.0 +0200
@@ -1,3 +1,10 @@
+debiman (0.0~git20220907.a582536-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Install systemd unit into /usr/lib. (Closes: #1071911)
+
+ -- Chris Hofstaedtler   Thu, 30 May 2024 03:07:49 +0200
+
 debiman (0.0~git20220907.a582536-1) unstable; urgency=medium
 
   * Team upload.
diff -Nru debiman-0.0~git20220907.a582536/debian/install debiman-0.0~git20220907.a582536/debian/install
--- debiman-0.0~git20220907.a582536/debian/install	2022-10-22 09:34:00.0 +0200
+++ debiman-0.0~git20220907.a582536/debian/install	2024-05-30 03:07:48.0 +0200
@@ -1 +1 @@
-debiman-auxserver.service lib/systemd/system
+debiman-auxserver.service usr/lib/systemd/system


Bug#1054086: lsm: let dh_installsystemd choose the location of units

2024-05-29 Thread Chris Hofstaedtler
On Wed, May 29, 2024 at 12:57:21PM -0300, Lucas Castro wrote:
> I would like the NMU be canceled.

> cancel lsm_1.0.4-2.1_source.changes
Files removed from 3-day: lsm_1.0.4-2.1_source.changes lsm_1.0.4-2.1.dsc 
lsm_1.0.4-2.1.debian.tar.xz lsm_1.0.4-2.1_arm64.buildinfo

I'm looking forward to your fix landing before the trixie transition
freeze.

Chris



Bug#1051460: crowdsec-custom-bouncer: move systemd units to /usr

2024-05-29 Thread Chris Hofstaedtler
On Tue, Dec 19, 2023 at 04:36:16AM +0100, Cyril Brulebois wrote:
> Chris Hofstaedtler  (2023-12-19):
> > If you can reasonably expect that the package in question will not
> > change name, or split out or move the systemd unit files in any
> > other way, than strictly from /lib to /usr/lib, then this is safe to
> > do now.
> 
> That's very safe to assume, yes. If that's enough to guarantee that I
> won't actually be generating another problem down the line, I'm happy to
> implement this change.

Yes, having migrated enough packages I (we) believe this is safe.

Please land this in trixie before the transition freeze.

Thanks,
Chris



Bug#1054093: monit: diff for NMU version 1:5.33.0-2.1

2024-05-29 Thread Chris Hofstaedtler
Control: tags 1054093 + pending


Dear maintainer,

I've prepared an NMU for monit (versioned as 1:5.33.0-2.1) and
uploaded it to DELAYED/10. Please feel free to tell me if I
should delay it longer.

Regards.

diff -Nru monit-5.33.0/debian/changelog monit-5.33.0/debian/changelog
--- monit-5.33.0/debian/changelog	2023-08-20 22:27:26.0 +0200
+++ monit-5.33.0/debian/changelog	2024-05-30 02:57:21.0 +0200
@@ -1,3 +1,12 @@
+monit (1:5.33.0-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+
+  [ Helmut Grohne ]
+  * Let dh_installsystemd choose the location of units (Closes: #1054093)
+
+ -- Chris Hofstaedtler   Thu, 30 May 2024 02:57:21 +0200
+
 monit (1:5.33.0-2) unstable; urgency=medium
 
   * debian/conf-available/:
diff -Nru monit-5.33.0/debian/monit.install monit-5.33.0/debian/monit.install
--- monit-5.33.0/debian/monit.install	2023-08-20 22:26:59.0 +0200
+++ monit-5.33.0/debian/monit.install	2024-05-30 02:57:07.0 +0200
@@ -2,4 +2,3 @@
 debian/conf-available/* etc/monit/conf-available/
 debian/templates/* etc/monit/templates/
 system/bash/monit usr/share/bash-completion/completions/
-system/startup/monit.service lib/systemd/system/
diff -Nru monit-5.33.0/debian/monit.service monit-5.33.0/debian/monit.service
--- monit-5.33.0/debian/monit.service	1970-01-01 01:00:00.0 +0100
+++ monit-5.33.0/debian/monit.service	2023-02-11 11:29:19.0 +0100
@@ -0,0 +1,33 @@
+# This file is systemd template for monit service. To
+# register monit with systemd, place the monit.service file
+# to the /lib/systemd/system/ directory and then start it
+# using systemctl (see bellow).
+#
+# Enable monit to start on boot:
+# systemctl enable monit.service
+#
+# Start monit immediately:
+# systemctl start monit.service
+#
+# Stop monit:
+# systemctl stop monit.service
+#
+# Status:
+# systemctl status monit.service
+
+[Unit]
+Description=Pro-active monitoring utility for unix systems
+After=network-online.target
+Documentation=man:monit(1) https://mmonit.com/wiki/Monit/HowTo
+
+[Service]
+Type=simple
+KillMode=process
+ExecStart=/usr/local/bin/monit -I
+ExecStop=/usr/local/bin/monit quit
+ExecReload=/usr/local/bin/monit reload
+Restart=on-abnormal
+StandardOutput=null
+
+[Install]
+WantedBy=multi-user.target


Bug#1054089: php-defaults: diff for NMU version 93+nmu1

2024-05-29 Thread Chris Hofstaedtler
Control: tags 1054089 + pending


Dear maintainer,

I've prepared an NMU for php-defaults (versioned as 93+nmu1) and
uploaded it to DELAYED/10. Please feel free to tell me if I
should delay it longer.

Regards.

diff -Nru php-defaults-93/debian/changelog php-defaults-93+nmu1/debian/changelog
--- php-defaults-93/debian/changelog	2022-07-13 10:19:37.0 +0200
+++ php-defaults-93+nmu1/debian/changelog	2024-05-30 02:53:37.0 +0200
@@ -1,3 +1,12 @@
+php-defaults (93+nmu1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+
+  [ Helmut Grohne ]
+  * Install systemd units using dh helpers. (Closes: #1054089)
+
+ -- Chris Hofstaedtler   Thu, 30 May 2024 02:53:37 +0200
+
 php-defaults (93) unstable; urgency=medium
 
   * Bump the default and supported version to PHP 8.2
diff -Nru php-defaults-93/debian/php-common.install php-defaults-93+nmu1/debian/php-common.install
--- php-defaults-93/debian/php-common.install	2022-07-13 10:19:37.0 +0200
+++ php-defaults-93+nmu1/debian/php-common.install	2024-05-30 02:53:37.0 +0200
@@ -3,6 +3,4 @@
 php-maintscript-helper /usr/lib/php/
 phpenmod /usr/sbin/
 phpquery /usr/sbin/
-phpsessionclean.service /lib/systemd/system/
-phpsessionclean.timer /lib/systemd/system/
 sessionclean /usr/lib/php/
diff -Nru php-defaults-93/debian/php-common.phpsessionclean.service php-defaults-93+nmu1/debian/php-common.phpsessionclean.service
--- php-defaults-93/debian/php-common.phpsessionclean.service	1970-01-01 01:00:00.0 +0100
+++ php-defaults-93+nmu1/debian/php-common.phpsessionclean.service	2022-07-13 10:19:37.0 +0200
@@ -0,0 +1,9 @@
+[Unit]
+Description=Clean php session files
+
+[Service]
+Type=oneshot
+ExecStart=/usr/lib/php/sessionclean
+ProtectHome=true
+ProtectSystem=true
+PrivateTmp=true
diff -Nru php-defaults-93/debian/php-common.phpsessionclean.timer php-defaults-93+nmu1/debian/php-common.phpsessionclean.timer
--- php-defaults-93/debian/php-common.phpsessionclean.timer	1970-01-01 01:00:00.0 +0100
+++ php-defaults-93+nmu1/debian/php-common.phpsessionclean.timer	2022-07-13 10:19:37.0 +0200
@@ -0,0 +1,9 @@
+[Unit]
+Description=Clean PHP session files every 30 mins
+
+[Timer]
+OnCalendar=*-*-* *:09,39:00
+Persistent=true
+
+[Install]
+WantedBy=timers.target
diff -Nru php-defaults-93/debian/rules php-defaults-93+nmu1/debian/rules
--- php-defaults-93/debian/rules	2022-07-13 10:19:37.0 +0200
+++ php-defaults-93+nmu1/debian/rules	2024-05-30 02:53:37.0 +0200
@@ -86,7 +86,8 @@
 	dh_gencontrol --remaining-packages -- -v$(PHP_DEB_VERSION)
 
 override_dh_systemd_enable:
-	dh_systemd_enable --package=php-common phpsessionclean.timer
+	dh_systemd_enable --package=php-common --name phpsessionclean phpsessionclean.timer
+	dh_systemd_enable --package=php-common --name phpsessionclean --no-enable phpsessionclean.service
 
 override_dh_systemd_start:
 	dh_systemd_start --package=php-common phpsessionclean.timer


Bug#1054191: memlockd: diff for NMU version 1.3.1-1.1

2024-05-29 Thread Chris Hofstaedtler
Control: tags 1054191 + pending


Dear maintainer,

I've prepared an NMU for memlockd (versioned as 1.3.1-1.1) and
uploaded it to DELAYED/10. Please feel free to tell me if I
should delay it longer.

Regards.

diff -Nru memlockd-1.3.1/changes.txt memlockd-1.3.1/changes.txt
--- memlockd-1.3.1/changes.txt	2023-09-30 03:49:17.0 +0200
+++ memlockd-1.3.1/changes.txt	2024-05-30 02:50:10.0 +0200
@@ -1,3 +1,12 @@
+memlockd (1.3.1-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+
+  [ Helmut Grohne ]
+  * Do not install a possibly empty /lib/systemd/system. (Closes: #1054191)
+
+ -- Chris Hofstaedtler   Thu, 30 May 2024 02:50:10 +0200
+
 memlockd (1.3.1-1) unstable; urgency=medium
 
   * Convert to source format 3.0, closes: #1043214
diff -Nru memlockd-1.3.1/debian/changelog memlockd-1.3.1/debian/changelog
--- memlockd-1.3.1/debian/changelog	2023-09-30 03:49:17.0 +0200
+++ memlockd-1.3.1/debian/changelog	2024-05-30 02:50:10.0 +0200
@@ -1,3 +1,12 @@
+memlockd (1.3.1-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+
+  [ Helmut Grohne ]
+  * Do not install a possibly empty /lib/systemd/system. (Closes: #1054191)
+
+ -- Chris Hofstaedtler   Thu, 30 May 2024 02:50:10 +0200
+
 memlockd (1.3.1-1) unstable; urgency=medium
 
   * Convert to source format 3.0, closes: #1043214
diff -Nru memlockd-1.3.1/debian/dirs memlockd-1.3.1/debian/dirs
--- memlockd-1.3.1/debian/dirs	2012-06-16 07:33:33.0 +0200
+++ memlockd-1.3.1/debian/dirs	2024-05-30 02:49:57.0 +0200
@@ -2,4 +2,3 @@
 etc/default
 etc/memlockd.d
 usr/share/man/man8
-lib/systemd/system


Bug#1054090: zram-tools: diff for NMU version 0.3.3.1-1.2

2024-05-29 Thread Chris Hofstaedtler
Control: tags 1054090 + pending


Dear maintainer,

I've prepared an NMU for zram-tools (versioned as 0.3.3.1-1.2) and
uploaded it to DELAYED/10. Please feel free to tell me if I
should delay it longer.

Regards.

diff -Nru zram-tools-0.3.3.1/debian/changelog zram-tools-0.3.3.1/debian/changelog
--- zram-tools-0.3.3.1/debian/changelog	2022-10-15 12:59:52.0 +0200
+++ zram-tools-0.3.3.1/debian/changelog	2024-05-30 02:51:05.0 +0200
@@ -1,3 +1,12 @@
+zram-tools (0.3.3.1-1.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+
+  [ Helmut Grohne ]
+  * Let dh_installsystemd choose the location of the unit (Closes: #1054090)
+
+ -- Chris Hofstaedtler   Thu, 30 May 2024 02:51:05 +0200
+
 zram-tools (0.3.3.1-1.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru zram-tools-0.3.3.1/debian/install zram-tools-0.3.3.1/debian/install
--- zram-tools-0.3.3.1/debian/install	2018-10-11 12:44:12.0 +0200
+++ zram-tools-0.3.3.1/debian/install	2024-05-30 02:51:01.0 +0200
@@ -1,3 +1,2 @@
 zramswap usr/sbin
 conf/zramswap etc/default
-zramswap.service lib/systemd/system
diff -Nru zram-tools-0.3.3.1/debian/rules zram-tools-0.3.3.1/debian/rules
--- zram-tools-0.3.3.1/debian/rules	2018-09-12 11:49:53.0 +0200
+++ zram-tools-0.3.3.1/debian/rules	2024-05-30 02:51:01.0 +0200
@@ -2,3 +2,6 @@
 
 %:
 	dh $@
+
+override_dh_installsystemd:
+	dh_installsystemd --name=zramswap
diff -Nru zram-tools-0.3.3.1/debian/zram-tools.zramswap.service zram-tools-0.3.3.1/debian/zram-tools.zramswap.service
--- zram-tools-0.3.3.1/debian/zram-tools.zramswap.service	1970-01-01 01:00:00.0 +0100
+++ zram-tools-0.3.3.1/debian/zram-tools.zramswap.service	2020-11-02 15:19:01.0 +0100
@@ -0,0 +1,14 @@
+[Unit]
+Description=Linux zramswap setup
+Documentation=man:zramswap(8)
+
+[Service]
+EnvironmentFile=-/etc/default/zramswap
+ExecStart=/usr/sbin/zramswap start
+ExecStop=/usr/sbin/zramswap stop
+ExecReload=/usr/sbin/zramswap restart
+Type=oneshot
+RemainAfterExit=true
+
+[Install]
+WantedBy=multi-user.target


Bug#1063458: open-infrastructure-storage-tools: diff for NMU version 20190301-lts1-5.1

2024-05-29 Thread Chris Hofstaedtler
Control: tags 1063458 + pending


Dear maintainer,

I've prepared an NMU for open-infrastructure-storage-tools (versioned as 
20190301-lts1-5.1) and
uploaded it to DELAYED/10. Please feel free to tell me if I
should delay it longer.

Regards.

diff -Nru open-infrastructure-storage-tools-20190301-lts1/debian/changelog open-infrastructure-storage-tools-20190301-lts1/debian/changelog
--- open-infrastructure-storage-tools-20190301-lts1/debian/changelog	2023-02-07 15:31:53.0 +0100
+++ open-infrastructure-storage-tools-20190301-lts1/debian/changelog	2024-05-30 02:44:06.0 +0200
@@ -1,3 +1,12 @@
+open-infrastructure-storage-tools (20190301-lts1-5.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+
+  [ Helmut Grohne ]
+  * Move files to /usr for DEP17. (Closes: #1063458)
+
+ -- Chris Hofstaedtler   Thu, 30 May 2024 02:44:06 +0200
+
 open-infrastructure-storage-tools (20190301-lts1-5) sid; urgency=high
 
   * Uploading to sid, with bumped urgency due to upcoming freeze deadline.
diff -Nru open-infrastructure-storage-tools-20190301-lts1/debian/patches/dep17.patch open-infrastructure-storage-tools-20190301-lts1/debian/patches/dep17.patch
--- open-infrastructure-storage-tools-20190301-lts1/debian/patches/dep17.patch	1970-01-01 01:00:00.0 +0100
+++ open-infrastructure-storage-tools-20190301-lts1/debian/patches/dep17.patch	2024-05-30 02:43:52.0 +0200
@@ -0,0 +1,13 @@
+--- open-infrastructure-storage-tools-20190301-lts1.orig/Makefile
 open-infrastructure-storage-tools-20190301-lts1/Makefile
+@@ -72,8 +72,8 @@
+ 	mkdir -p $(DESTDIR)/etc/logrotate.d
+ 	cp -r share/logrotate/* $(DESTDIR)/etc/logrotate.d
+ 
+-	mkdir -p $(DESTDIR)/lib/systemd/system
+-	cp -r share/systemd/* $(DESTDIR)/lib/systemd/system
++	mkdir -p $(DESTDIR)/usr/lib/systemd/system
++	cp -r share/systemd/* $(DESTDIR)/usr/lib/systemd/system
+ 
+ 	mkdir -p $(DESTDIR)/usr/share/$(PROJECT)/$(PROGRAM)
+ 	cp -r share/ceph-info $(DESTDIR)/usr/share/$(PROJECT)
diff -Nru open-infrastructure-storage-tools-20190301-lts1/debian/patches/series open-infrastructure-storage-tools-20190301-lts1/debian/patches/series
--- open-infrastructure-storage-tools-20190301-lts1/debian/patches/series	2023-02-07 15:31:22.0 +0100
+++ open-infrastructure-storage-tools-20190301-lts1/debian/patches/series	2024-05-30 02:44:02.0 +0200
@@ -1 +1,2 @@
 upstream/0001-ftbfs-asciidoc.patch
+dep17.patch


Bug#1063455: open-infrastructure-compute-tools: diff for NMU version 20221223-3.1

2024-05-29 Thread Chris Hofstaedtler
Control: tags 1063455 + pending


Dear maintainer,

I've prepared an NMU for open-infrastructure-compute-tools (versioned as 
20221223-3.1) and
uploaded it to DELAYED/10. Please feel free to tell me if I
should delay it longer.

Regards.

diff -Nru open-infrastructure-compute-tools-20221223/debian/changelog open-infrastructure-compute-tools-20221223/debian/changelog
--- open-infrastructure-compute-tools-20221223/debian/changelog	2023-02-05 16:42:42.0 +0100
+++ open-infrastructure-compute-tools-20221223/debian/changelog	2024-05-30 02:45:16.0 +0200
@@ -1,3 +1,12 @@
+open-infrastructure-compute-tools (20221223-3.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+
+  [ Helmut Grohne ]
+  * Move files to /usr for DEP17. (Closes: #1063455)
+
+ -- Chris Hofstaedtler   Thu, 30 May 2024 02:45:16 +0200
+
 open-infrastructure-compute-tools (20221223-3) sid; urgency=medium
 
   * Uploading to sid.
diff -Nru open-infrastructure-compute-tools-20221223/debian/patches/dep17.patch open-infrastructure-compute-tools-20221223/debian/patches/dep17.patch
--- open-infrastructure-compute-tools-20221223/debian/patches/dep17.patch	1970-01-01 01:00:00.0 +0100
+++ open-infrastructure-compute-tools-20221223/debian/patches/dep17.patch	2024-05-30 02:45:04.0 +0200
@@ -0,0 +1,13 @@
+--- open-infrastructure-compute-tools-20221223.orig/Makefile
 open-infrastructure-compute-tools-20221223/Makefile
+@@ -142,8 +142,8 @@
+ 	ln -sf stop $(DESTDIR)/usr/libexec/$(PROGRAM)/t
+ 	ln -sf update $(DESTDIR)/usr/libexec/$(PROGRAM)/u
+ 
+-	mkdir -p $(DESTDIR)/lib/systemd/system
+-	cp -r share/systemd/* $(DESTDIR)/lib/systemd/system
++	mkdir -p $(DESTDIR)/usr/lib/systemd/system
++	cp -r share/systemd/* $(DESTDIR)/usr/lib/systemd/system
+ 
+ 	mkdir -p $(DESTDIR)/var/log/$(SOFTWARE)
+ 
diff -Nru open-infrastructure-compute-tools-20221223/debian/patches/series open-infrastructure-compute-tools-20221223/debian/patches/series
--- open-infrastructure-compute-tools-20221223/debian/patches/series	1970-01-01 01:00:00.0 +0100
+++ open-infrastructure-compute-tools-20221223/debian/patches/series	2024-05-30 02:45:07.0 +0200
@@ -0,0 +1 @@
+dep17.patch


Bug#1068229: login: remove lastlog, remove pam_lastlog.so from PAM config [patch]

2024-05-29 Thread Chris Hofstaedtler
Control: tags 1068229 + patch

Hi,

here's a patch to achieve the requested changes.

When this is uploaded, we can have lastlog2 take over.

Please let me know about your plan on uploading.

Chris

diff -Nru shadow-4.13+dfsg1/debian/changelog shadow-4.13+dfsg1/debian/changelog
--- shadow-4.13+dfsg1/debian/changelog	2024-02-04 21:28:27.0 +0100
+++ shadow-4.13+dfsg1/debian/changelog	2024-05-30 02:23:58.0 +0200
@@ -1,3 +1,11 @@
+shadow (1:4.13+dfsg1-4.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Drop pam_lastlog.so from config. (Closes: #1068229)
+  * Stop installing lastlog binary.
+
+ -- Chris Hofstaedtler   Thu, 30 May 2024 02:23:58 +0200
+
 shadow (1:4.13+dfsg1-4) unstable; urgency=medium
 
   [ Helmut Grohne ]
diff -Nru shadow-4.13+dfsg1/debian/login.install shadow-4.13+dfsg1/debian/login.install
--- shadow-4.13+dfsg1/debian/login.install	2024-02-04 21:28:27.0 +0100
+++ shadow-4.13+dfsg1/debian/login.install	2024-05-30 02:23:58.0 +0200
@@ -2,6 +2,5 @@
 usr/share/locale/*/LC_MESSAGES/shadow.mo
 sbin/nologin usr/sbin
 usr/bin/faillog
-usr/bin/lastlog
 usr/bin/newgrp
 bin/login usr/bin
diff -Nru shadow-4.13+dfsg1/debian/login.manpages shadow-4.13+dfsg1/debian/login.manpages
--- shadow-4.13+dfsg1/debian/login.manpages	2024-02-04 21:28:27.0 +0100
+++ shadow-4.13+dfsg1/debian/login.manpages	2024-05-30 02:23:58.0 +0200
@@ -4,7 +4,6 @@
 usr/share/man/*/man5/faillog.5
 usr/share/man/*/man5/login.defs.5
 usr/share/man/*/man8/faillog.8
-usr/share/man/*/man8/lastlog.8
 usr/share/man/*/man8/nologin.8
 usr/share/man/man1/login.1
 usr/share/man/man1/newgrp.1
@@ -12,5 +11,4 @@
 usr/share/man/man5/faillog.5
 usr/share/man/man5/login.defs.5
 usr/share/man/man8/faillog.8
-usr/share/man/man8/lastlog.8
 usr/share/man/man8/nologin.8
diff -Nru shadow-4.13+dfsg1/debian/login.pam shadow-4.13+dfsg1/debian/login.pam
--- shadow-4.13+dfsg1/debian/login.pam	2024-02-04 21:28:27.0 +0100
+++ shadow-4.13+dfsg1/debian/login.pam	2024-05-30 02:23:58.0 +0200
@@ -77,10 +77,6 @@
 # (Replaces the use of /etc/limits in old login)
 sessionrequired   pam_limits.so
 
-# Prints the last login info upon successful login
-# (Replaces the `LASTLOG_ENAB' option from login.defs)
-sessionoptional   pam_lastlog.so
-
 # Prints the status of the user's mailbox upon successful login
 # (Replaces the `MAIL_CHECK_ENAB' option from login.defs). 
 #
diff -Nru shadow-4.13+dfsg1/debian/not-installed shadow-4.13+dfsg1/debian/not-installed
--- shadow-4.13+dfsg1/debian/not-installed	2024-02-04 21:28:27.0 +0100
+++ shadow-4.13+dfsg1/debian/not-installed	2024-05-30 02:23:58.0 +0200
@@ -15,6 +15,7 @@
 etc/pam.d/useradd
 etc/pam.d/userdel
 etc/pam.d/usermod
+usr/bin/lastlog
 usr/bin/sg
 usr/lib/*/libsubid.la
 usr/sbin/logoutd
@@ -25,6 +26,7 @@
 usr/share/man/*/man3/getspnam.3
 usr/share/man/*/man3/shadow.3
 usr/share/man/*/man5/suauth.5
+usr/share/man/*/man8/lastlog.8
 usr/share/man/*/man8/logoutd.8
 usr/share/man/man1/groups.1
 usr/share/man/man1/logoutd.1
@@ -32,5 +34,6 @@
 usr/share/man/man3/getspnam.3
 usr/share/man/man3/shadow.3
 usr/share/man/man5/suauth.5
+usr/share/man/man8/lastlog.8
 usr/share/man/man8/logoutd.8
 


Bug#1064238: fuse-umfuse-ext2: diff for NMU version 0.4-1.5

2024-05-29 Thread Chris Hofstaedtler
Control: tags 1064238 + pending


Dear maintainer,

I've prepared an NMU for fuse-umfuse-ext2 (versioned as 0.4-1.5) and
uploaded it to DELAYED/10. Please feel free to tell me if I
should delay it longer.

Regards.

diff -Nru fuse-umfuse-ext2-0.4/debian/changelog fuse-umfuse-ext2-0.4/debian/changelog
--- fuse-umfuse-ext2-0.4/debian/changelog	2023-09-29 01:48:00.0 +0200
+++ fuse-umfuse-ext2-0.4/debian/changelog	2024-05-30 02:19:03.0 +0200
@@ -1,3 +1,12 @@
+fuse-umfuse-ext2 (0.4-1.5) unstable; urgency=medium
+
+  * Non-maintainer upload.
+
+  [ Helmut Grohne ]
+  * DEP17: Move files to /usr. (Closes: #1064238)
+
+ -- Chris Hofstaedtler   Thu, 30 May 2024 02:19:03 +0200
+
 fuse-umfuse-ext2 (0.4-1.4) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru fuse-umfuse-ext2-0.4/debian/patches/series fuse-umfuse-ext2-0.4/debian/patches/series
--- fuse-umfuse-ext2-0.4/debian/patches/series	2023-09-29 01:48:00.0 +0200
+++ fuse-umfuse-ext2-0.4/debian/patches/series	2024-05-30 02:18:57.0 +0200
@@ -1 +1,2 @@
 fuse-ext2.h.patch
+usrmove.patch
diff -Nru fuse-umfuse-ext2-0.4/debian/patches/usrmove.patch fuse-umfuse-ext2-0.4/debian/patches/usrmove.patch
--- fuse-umfuse-ext2-0.4/debian/patches/usrmove.patch	1970-01-01 01:00:00.0 +0100
+++ fuse-umfuse-ext2-0.4/debian/patches/usrmove.patch	2024-05-30 02:18:57.0 +0200
@@ -0,0 +1,22 @@
+--- fuse-umfuse-ext2-0.4.orig/fuse-ext2/Makefile.am
 fuse-umfuse-ext2-0.4/fuse-ext2/Makefile.am
+@@ -283,7 +283,7 @@
+ if LINUX
+ install-exec-local:
+ 	$(INSTALL) -d "$(DESTDIR)/usr/sbin"
+-	$(LN_S) -f "$(DESTDIR)/$(bindir)/fuse-ext2" "$(DESTDIR)/sbin/mount.fuse-ext2"
++	$(LN_S) -f "$(DESTDIR)/$(bindir)/fuse-ext2" "$(DESTDIR)/$(sbindir)/mount.fuse-ext2"
+ endif
+ 
+ dist_man1_MANS = fuse-ext2.1
+--- fuse-umfuse-ext2-0.4.orig/fuse-ext2/Makefile.in
 fuse-umfuse-ext2-0.4/fuse-ext2/Makefile.in
+@@ -1884,7 +1884,7 @@
+ #endif
+ @LINUX_TRUE@install-exec-local:
+ @LINUX_TRUE@	$(INSTALL) -d "$(DESTDIR)/usr/sbin"
+-@LINUX_TRUE@	$(LN_S) -f "$(DESTDIR)/$(bindir)/fuse-ext2" "$(DESTDIR)/sbin/mount.fuse-ext2"
++@LINUX_TRUE@	$(LN_S) -f "$(DESTDIR)/$(bindir)/fuse-ext2" "$(DESTDIR)/$(sbindir)/mount.fuse-ext2"
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
diff -Nru fuse-umfuse-ext2-0.4/debian/rules fuse-umfuse-ext2-0.4/debian/rules
--- fuse-umfuse-ext2-0.4/debian/rules	2023-09-29 01:47:05.0 +0200
+++ fuse-umfuse-ext2-0.4/debian/rules	2024-05-30 02:18:57.0 +0200
@@ -3,15 +3,17 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 
+DEB_CONFIGURE_EXTRA_FLAGS=--exec-prefix='$${prefix}'
+
 common-install-prehook-arch common-install-prehook-indep::
-	mkdir -p debian/tmp/sbin
+	mkdir -p debian/tmp/usr/sbin
 
 install/fuseext2::
 	dh_link -pfuseext2 /usr/share/man/man1/fuse-ext2.1 /usr/share/man/man8/mount.fuse-ext2.8
-	dh_link -pfuseext2 /usr/bin/fuse-ext2 /sbin/mount.fuse-ext2
+	dh_link -pfuseext2 /usr/bin/fuse-ext2 /usr/sbin/mount.fuse-ext2
 	# Compatibility symlinks for versions up to 0.3.
 	dh_link -pfuseext2 /usr/bin/fuse-ext2 /usr/bin/fuseext2
-	dh_link -pfuseext2 /sbin/mount.fuse-ext2 /sbin/mount.fuseext2
+	dh_link -pfuseext2 /usr/sbin/mount.fuse-ext2 /usr/sbin/mount.fuseext2
 	dh_link -pfuseext2 /usr/share/man/man1/fuse-ext2.1 /usr/share/man/man1/fuseext2.1
 	dh_link -pfuseext2 /usr/share/man/man8/mount.fuse-ext2.8 /usr/share/man/man8/mount.fuseext2.8
 	dh_compress -pfuseext2


Bug#1068229: Bug#1066060: libpam-modules: pam_lastlog.so missing

2024-05-29 Thread Chris Hofstaedtler
Control: retitle -1 login: remove lastlog, remove pam_lastlog.so from PAM config
Control: severity -1 important

Dear shadow maintainers,

as originally requested, please drop pam_lastlog.so from the PAM
config.

Please also drop the lastlog binary, which isn't very useful when
the data it is reading is not updated anymore.

Chris



Bug#1066060: libpam-modules: pam_lastlog.so missing

2024-05-29 Thread Chris Hofstaedtler
Control: retitle -1 libpam-modules: pam_lastlog.so missing

Apologies, this was the wrong half of the bug.

I think in src:pam not much is to be done, except the NEWS.Debian
entry?

Chris



Bug#1061489: libpam-ccreds: diff for NMU version 10-8.1

2024-05-29 Thread Chris Hofstaedtler
Control: tags 1061489 + pending


Dear maintainer,

I've prepared an NMU for libpam-ccreds (versioned as 10-8.1) and
uploaded it to DELAYED/10. Please feel free to tell me if I
should delay it longer.

Regards.

diff -Nru libpam-ccreds-10/debian/changelog libpam-ccreds-10/debian/changelog
--- libpam-ccreds-10/debian/changelog	2019-10-26 00:28:29.0 +0200
+++ libpam-ccreds-10/debian/changelog	2024-05-30 02:15:58.0 +0200
@@ -1,3 +1,12 @@
+libpam-ccreds (10-8.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+
+  [ Michael Biebl ]
+  * Install PAM modules and binaries into /usr (Closes: #1061489)
+
+ -- Chris Hofstaedtler   Thu, 30 May 2024 02:15:58 +0200
+
 libpam-ccreds (10-8) unstable; urgency=medium
 
   [ Helmut Grohne ]
diff -Nru libpam-ccreds-10/debian/dirs libpam-ccreds-10/debian/dirs
--- libpam-ccreds-10/debian/dirs	2009-08-01 19:57:03.0 +0200
+++ libpam-ccreds-10/debian/dirs	1970-01-01 01:00:00.0 +0100
@@ -1,2 +0,0 @@
-usr/sbin
-lib/security
diff -Nru libpam-ccreds-10/debian/libpam-ccreds.lintian-overrides libpam-ccreds-10/debian/libpam-ccreds.lintian-overrides
--- libpam-ccreds-10/debian/libpam-ccreds.lintian-overrides	2009-08-01 19:57:03.0 +0200
+++ libpam-ccreds-10/debian/libpam-ccreds.lintian-overrides	2024-05-30 02:15:54.0 +0200
@@ -1,2 +1,2 @@
 # yes, we know it's suid, that's the whole point...
-libpam-ccreds: setuid-binary sbin/ccreds_chkpwd 4755 root/root
+libpam-ccreds: setuid-binary usr/sbin/ccreds_chkpwd 4755 root/root
diff -Nru libpam-ccreds-10/debian/rules libpam-ccreds-10/debian/rules
--- libpam-ccreds-10/debian/rules	2019-10-26 00:27:03.0 +0200
+++ libpam-ccreds-10/debian/rules	2024-05-30 02:15:54.0 +0200
@@ -4,8 +4,6 @@
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 DEB_CONFIGURE_EXTRA_ARGS := \
-	--libdir=/lib/$(DEB_HOST_GNU_TYPE) \
-	--sbindir=/sbin \
 	--enable-gcrypt \
 	$(NULL)
 
@@ -17,16 +15,15 @@
 
 override_dh_auto_install:
 	dh_auto_install
-	chown root:root debian/libpam-ccreds/sbin/ccreds_chkpwd
-	chmod 4755 debian/libpam-ccreds/sbin/ccreds_chkpwd
+	chown root:root debian/libpam-ccreds/usr/sbin/ccreds_chkpwd
+	chmod 4755 debian/libpam-ccreds/usr/sbin/ccreds_chkpwd
 
 	mkdir -p debian/libpam-ccreds/usr/share/pam-configs
 	install -m 0644 debian/libpam-ccreds.pam-auth-update.ccreds-save \
 		debian/libpam-ccreds/usr/share/pam-configs/ccreds-save
 	install -m 0644 debian/libpam-ccreds.pam-auth-update.ccreds-check \
 		debian/libpam-ccreds/usr/share/pam-configs/ccreds-check
-	rmdir debian/libpam-ccreds/lib/security
 
 override_dh_fixperms:
-	dh_fixperms -X/sbin/ccreds_chkpwd
+	dh_fixperms -X/usr/sbin/ccreds_chkpwd
 


Bug#1058859: teensy-loader-cli: diff for NMU version 2.2-1.1

2024-05-29 Thread Chris Hofstaedtler
Control: tags 1058859 + pending


Dear maintainer,

I've prepared an NMU for teensy-loader-cli (versioned as 2.2-1.1) and
uploaded it to DELAYED/10. Please feel free to tell me if I
should delay it longer.

Regards.

diff -Nru teensy-loader-cli-2.2/debian/49-teensy.rules teensy-loader-cli-2.2/debian/49-teensy.rules
--- teensy-loader-cli-2.2/debian/49-teensy.rules	2022-01-11 14:30:43.0 +0100
+++ teensy-loader-cli-2.2/debian/49-teensy.rules	1970-01-01 01:00:00.0 +0100
@@ -1,38 +0,0 @@
-# UDEV Rules for Teensy boards, http://www.pjrc.com/teensy/
-#
-# The latest version of this file may be found at:
-#   http://www.pjrc.com/teensy/49-teensy.rules
-#
-# This file must be placed at:
-#
-# /etc/udev/rules.d/49-teensy.rules(preferred location)
-#   or
-# /lib/udev/rules.d/49-teensy.rules(req'd on some broken systems)
-#
-# To install, type this command in a terminal:
-#   sudo cp 49-teensy.rules /etc/udev/rules.d/49-teensy.rules
-#
-# Or use the alternate way (from this forum message) to download and install:
-#   https://forum.pjrc.com/threads/45595?p=150445=1#post150445
-#
-# After this file is installed, physically unplug and reconnect Teensy.
-#
-ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789B]?", ENV{ID_MM_DEVICE_IGNORE}="1"
-ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789A]?", ENV{MTP_NO_PROBE}="1"
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789ABCD]?", TAG+="uaccess", TAG+="udev-acl"
-KERNEL=="ttyACM*", ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789B]?", TAG+="uaccess", TAG+="udev-acl"
-#
-# If you share your linux system with other users, or just don't like the
-# idea of write permission for everybody, you can replace MODE:="0666" with
-# OWNER:="yourusername" to create the device owned by you, or with
-# GROUP:="somegroupname" and mange access using standard unix groups.
-#
-#
-# If using USB Serial you get a new device each time (Ubuntu 9.10)
-# eg: /dev/ttyACM0, ttyACM1, ttyACM2, ttyACM3, ttyACM4, etc
-#apt-get remove --purge modemmanager (reboot may be necessary)
-#
-# Older modem proding (eg, Ubuntu 9.04) caused very slow serial device detection.
-# To fix, add this near top of /lib/udev/rules.d/77-nm-probe-modem-capabilities.rules
-#   SUBSYSTEMS=="usb", ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789]?", GOTO="nm_modem_probe_end" 
-#
diff -Nru teensy-loader-cli-2.2/debian/changelog teensy-loader-cli-2.2/debian/changelog
--- teensy-loader-cli-2.2/debian/changelog	2022-01-15 21:59:54.0 +0100
+++ teensy-loader-cli-2.2/debian/changelog	2024-05-30 02:13:46.0 +0200
@@ -1,3 +1,10 @@
+teensy-loader-cli (2.2-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Let dh_installudev install udev rules. (Closes: #1058859)
+
+ -- Chris Hofstaedtler   Thu, 30 May 2024 02:13:46 +0200
+
 teensy-loader-cli (2.2-1) unstable; urgency=medium
 
   * New upstream release, contained all debian patches
diff -Nru teensy-loader-cli-2.2/debian/install teensy-loader-cli-2.2/debian/install
--- teensy-loader-cli-2.2/debian/install	2022-01-11 14:30:43.0 +0100
+++ teensy-loader-cli-2.2/debian/install	2024-05-30 02:13:43.0 +0200
@@ -1,2 +1 @@
 teensy_loader_cli /usr/bin/
-debian/49-teensy.rules /lib/udev/rules.d/
diff -Nru teensy-loader-cli-2.2/debian/rules teensy-loader-cli-2.2/debian/rules
--- teensy-loader-cli-2.2/debian/rules	2022-01-11 14:30:43.0 +0100
+++ teensy-loader-cli-2.2/debian/rules	2024-05-30 02:13:43.0 +0200
@@ -12,3 +12,6 @@
 
 %:
 	dh $@
+
+override_dh_installudev:
+	dh_installudev --priority=49 --name=teensy
diff -Nru teensy-loader-cli-2.2/debian/teensy-loader-cli.teensy.udev teensy-loader-cli-2.2/debian/teensy-loader-cli.teensy.udev
--- teensy-loader-cli-2.2/debian/teensy-loader-cli.teensy.udev	1970-01-01 01:00:00.0 +0100
+++ teensy-loader-cli-2.2/debian/teensy-loader-cli.teensy.udev	2024-05-30 02:13:43.0 +0200
@@ -0,0 +1,38 @@
+# UDEV Rules for Teensy boards, http://www.pjrc.com/teensy/
+#
+# The latest version of this file may be found at:
+#   http://www.pjrc.com/teensy/49-teensy.rules
+#
+# This file must be placed at:
+#
+# /etc/udev/rules.d/49-teensy.rules(preferred location)
+#   or
+# /lib/udev/rules.d/49-teensy.rules(req'd on some broken systems)
+#
+# To install, type this command in a terminal:
+#   sudo cp 49-teensy.rules /etc/udev/rules.d/49-teensy.rules
+#
+# Or use the alternate way (from this forum message) to download and install:
+#   https://forum.pjrc.com/threads/45595?p=150445=1#post150445
+#
+# After this file is installed, physically unplug and reconnect Teensy.
+#
+ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789B]?", ENV{ID_MM_DEVICE_IGNORE}="1"
+ATTRS{idVendor}=="16c0&quo

Bug#1059379: f2fs-tools: diff for NMU version 1.16.0-1.1

2024-05-29 Thread Chris Hofstaedtler
Control: tags 1059379 + pending


Dear maintainer,

I've prepared an NMU for f2fs-tools (versioned as 1.16.0-1.1) and
uploaded it to DELAYED/10. Please feel free to tell me if I
should delay it longer.

Regards.

diff -Nru f2fs-tools-1.16.0/debian/changelog f2fs-tools-1.16.0/debian/changelog
--- f2fs-tools-1.16.0/debian/changelog	2023-07-17 06:03:45.0 +0200
+++ f2fs-tools-1.16.0/debian/changelog	2024-05-30 02:10:23.0 +0200
@@ -1,3 +1,10 @@
+f2fs-tools (1.16.0-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Install files into /usr instead of /. (Closes: #1059379)
+
+ -- Chris Hofstaedtler   Thu, 30 May 2024 02:10:23 +0200
+
 f2fs-tools (1.16.0-1) unstable; urgency=medium
 
   [ Vincent Cheng ]
diff -Nru f2fs-tools-1.16.0/debian/f2fs-tools.install f2fs-tools-1.16.0/debian/f2fs-tools.install
--- f2fs-tools-1.16.0/debian/f2fs-tools.install	2023-07-17 06:02:17.0 +0200
+++ f2fs-tools-1.16.0/debian/f2fs-tools.install	2024-05-30 02:10:20.0 +0200
@@ -1,4 +1,4 @@
 # All but sbin/sg_write_buffer
-sbin/*f2fs*
+usr/sbin/*f2fs*
 
 usr/share/man/man8/*.8
diff -Nru f2fs-tools-1.16.0/debian/f2fs-tools-udeb.install f2fs-tools-1.16.0/debian/f2fs-tools-udeb.install
--- f2fs-tools-1.16.0/debian/f2fs-tools-udeb.install	2023-07-17 06:02:17.0 +0200
+++ f2fs-tools-1.16.0/debian/f2fs-tools-udeb.install	2024-05-30 02:10:20.0 +0200
@@ -1,2 +1,2 @@
 # All but sbin/sg_write_buffer
-sbin/*f2fs*
+usr/sbin/*f2fs*
diff -Nru f2fs-tools-1.16.0/debian/rules f2fs-tools-1.16.0/debian/rules
--- f2fs-tools-1.16.0/debian/rules	2023-07-17 06:02:17.0 +0200
+++ f2fs-tools-1.16.0/debian/rules	2024-05-30 02:10:20.0 +0200
@@ -10,8 +10,8 @@
 	dh $@
 
 override_dh_auto_configure:
-	dh_auto_configure -- --sbindir=/sbin --disable-shared \
-		--with-root-libdir=/lib/$(DEB_HOST_MULTIARCH)
+	dh_auto_configure -- --sbindir=/usr/sbin --disable-shared \
+		--with-root-libdir=/usr/lib/$(DEB_HOST_MULTIARCH)
 
 # dh_dwz when run on f2fs-tools-udeb ends up installing the
 # /usr/lib/debug/.dwz files into the udeb.  I think that's a bug,


Bug#1058857: alsa-tools: diff for NMU version 1.2.11-1.1

2024-05-29 Thread Chris Hofstaedtler
Control: tags 1058857 + pending


Dear maintainer,

I've prepared an NMU for alsa-tools (versioned as 1.2.11-1.1) and
uploaded it to DELAYED/14. Please feel free to tell me if I
should delay it longer.

Regards.

diff -Nru alsa-tools-1.2.11/debian/alsa-firmware-loaders.dirs alsa-tools-1.2.11/debian/alsa-firmware-loaders.dirs
--- alsa-tools-1.2.11/debian/alsa-firmware-loaders.dirs	2019-11-07 00:42:01.0 +0100
+++ alsa-tools-1.2.11/debian/alsa-firmware-loaders.dirs	1970-01-01 01:00:00.0 +0100
@@ -1 +0,0 @@
-/lib/udev/rules.d
diff -Nru alsa-tools-1.2.11/debian/alsa-firmware-loaders.udev alsa-tools-1.2.11/debian/alsa-firmware-loaders.udev
--- alsa-tools-1.2.11/debian/alsa-firmware-loaders.udev	2021-09-09 02:44:36.0 +0200
+++ alsa-tools-1.2.11/debian/alsa-firmware-loaders.udev	2024-05-30 01:51:59.0 +0200
@@ -1,18 +1,18 @@
 ###
 # Description:   udev rule to load TASCAM US-122 usb sound card.
 # Created:   Wed, 12 Sep 2007 17:05:25 +0200
-# Last modified: Thu, 21 Jan 2010 21:21:12 +0100
+# Last modified: Sun, 17 Dec 2023 01:35:53 +0100
 # File:  /etc/udev/alsa-firmware-loaders.rules
 ###
 
 # TASCAM US-428 usb sound card.
-SUBSYSTEM=="usb", ACTION=="add", ATTR{idVendor}=="1604", ATTR{idProduct}=="8000", RUN+="/lib/udev/tascam_fw"
+SUBSYSTEM=="usb", ACTION=="add", ATTR{idVendor}=="1604", ATTR{idProduct}=="8000", RUN+="tascam_fw"
 # TASCAM US-224 usb sound card.
-SUBSYSTEM=="usb", ACTION=="add", ATTR{idVendor}=="1604", ATTR{idProduct}=="8004", RUN+="/lib/udev/tascam_fw"
+SUBSYSTEM=="usb", ACTION=="add", ATTR{idVendor}=="1604", ATTR{idProduct}=="8004", RUN+="tascam_fw"
 # TASCAM US-112 usb sound card.
-SUBSYSTEM=="usb", ACTION=="add", ATTR{idVendor}=="1604", ATTR{idProduct}=="8006", RUN+="/lib/udev/tascam_fw"
+SUBSYSTEM=="usb", ACTION=="add", ATTR{idVendor}=="1604", ATTR{idProduct}=="8006", RUN+="tascam_fw"
 
-SUBSYSTEM=="usb", ACTION=="add", ATTR{id}=="USX2Y", RUN+="/lib/udev/tascam_fpga"
+SUBSYSTEM=="usb", ACTION=="add", ATTR{id}=="USX2Y", RUN+="tascam_fpga"
 
 # vim:tw=160:syntax=udevrules
 
diff -Nru alsa-tools-1.2.11/debian/changelog alsa-tools-1.2.11/debian/changelog
--- alsa-tools-1.2.11/debian/changelog	2024-03-04 23:13:35.00000 +0100
+++ alsa-tools-1.2.11/debian/changelog	2024-05-30 01:58:32.0 +0200
@@ -1,3 +1,13 @@
+alsa-tools (1.2.11-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Use udev.pc to place udev files. (Closes: #1058857)
+  * Avoid hard-coding path to udev helpers in udev rules, as it will
+change.
+  * Update firmware path to /usr/lib/firmware.
+
+ -- Chris Hofstaedtler   Thu, 30 May 2024 01:58:32 +0200
+
 alsa-tools (1.2.11-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru alsa-tools-1.2.11/debian/control alsa-tools-1.2.11/debian/control
--- alsa-tools-1.2.11/debian/control	2023-05-05 00:30:53.0 +0200
+++ alsa-tools-1.2.11/debian/control	2024-05-30 01:51:59.0 +0200
@@ -10,7 +10,9 @@
libasound2-dev (>= 1.0.24.1),
libfltk1.3-dev,
libgtk-3-dev,
-   libgtk2.0-dev
+   libgtk2.0-dev,
+   pkgconf,
+   systemd-dev,
 Standards-Version: 4.6.0
 Homepage: https://www.alsa-project.org/
 Vcs-Git: https://salsa.debian.org/alsa-team/alsa-tools.git
diff -Nru alsa-tools-1.2.11/debian/patches/firmware_locations.patch alsa-tools-1.2.11/debian/patches/firmware_locations.patch
--- alsa-tools-1.2.11/debian/patches/firmware_locations.patch	2021-09-09 02:44:36.0 +0200
+++ alsa-tools-1.2.11/debian/patches/firmware_locations.patch	2024-05-30 01:51:59.0 +0200
@@ -1,5 +1,5 @@
 Author: Elimar Riesebieter 
-Description: Set firmware location to /lib/firmware, as expected in Debian.
+Description: Set firmware location to /usr/lib/firmware, as expected in Debian.
 Forwarded: no
 
 Index: alsa-tools/hdsploader/Makefile.in
@@ -11,7 +11,7 @@
  # # Process this file with automake to produce Makefile.in.
  MYNAME = hdsploader
 -AM_CFLAGS = -DDATAPATH=\"$(datadir)/alsa/firmware/$(MYNAME)\"
-+AM_CFLAGS = -DDATAPATH=\"/lib/firmware/$(MYNAME)\"
++AM_CFLAGS = -DDATAPATH=\"/usr/lib/firmware/$(MYNAME)\"
  hdsploader_SOURCES = hdsploader.c
  EXTRA_DIST = gitcompile depcomp
  all: all-am
@@ -24,7 +24,7 @@
  AUTOMAKE_OPTIONS = 1.3 foreign
  MYNAME = mixartloader
 -AM_CFLAGS = -DDATAPATH=\"$(datadir)/alsa/firmware/$(MYNAME)\&quo

Bug#1057804: libguestfs: diff for NMU version 1:1.52.0-6.1

2024-05-29 Thread Chris Hofstaedtler
Control: tags 1057804 + patch
Control: tags 1057804 + pending


Dear maintainer,

I've prepared an NMU for libguestfs (versioned as 1:1.52.0-6.1) and
uploaded it to DELAYED/10. Please feel free to tell me if I
should delay it longer.

Regards.

diff -Nru libguestfs-1.52.0/debian/changelog libguestfs-1.52.0/debian/changelog
--- libguestfs-1.52.0/debian/changelog	2024-05-18 22:26:51.0 +0200
+++ libguestfs-1.52.0/debian/changelog	2024-05-30 01:35:29.0 +0200
@@ -1,3 +1,11 @@
+libguestfs (1:1.52.0-6.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Install 99-guestfs-serial.rules into /usr/lib/udev/rules.d (Closes:
+#1057804)
+
+ -- Chris Hofstaedtler   Thu, 30 May 2024 01:35:29 +0200
+
 libguestfs (1:1.52.0-6) unstable; urgency=medium
 
   * Add util-linux-extra to appliance list (Closes: #1071313)
diff -Nru libguestfs-1.52.0/debian/guestfsd.install libguestfs-1.52.0/debian/guestfsd.install
--- libguestfs-1.52.0/debian/guestfsd.install	2023-07-23 13:30:56.0 +0200
+++ libguestfs-1.52.0/debian/guestfsd.install	2024-05-30 01:34:40.0 +0200
@@ -1,3 +1,3 @@
 usr/sbin/guestfsd
 usr/share/man/man8/guestfsd.8*
-lib/udev/rules.d/99-guestfs-serial.rules
+usr/lib/udev/rules.d/99-guestfs-serial.rules
diff -Nru libguestfs-1.52.0/debian/patches/series libguestfs-1.52.0/debian/patches/series
--- libguestfs-1.52.0/debian/patches/series	2024-05-18 22:26:51.0 +0200
+++ libguestfs-1.52.0/debian/patches/series	2024-05-30 01:35:09.0 +0200
@@ -20,3 +20,4 @@
 Only-set-rtc-driftfix-slew-on-x86-architectures.patch
 Add-dhcpcd-to-Debian-package-list.patch
 Add-util-linux-extra-to-appliance-list.patch
+udev-rules-path.patch
diff -Nru libguestfs-1.52.0/debian/patches/udev-rules-path.patch libguestfs-1.52.0/debian/patches/udev-rules-path.patch
--- libguestfs-1.52.0/debian/patches/udev-rules-path.patch	1970-01-01 01:00:00.0 +0100
+++ libguestfs-1.52.0/debian/patches/udev-rules-path.patch	2024-05-30 01:35:22.0 +0200
@@ -0,0 +1,13 @@
+Index: libguestfs-1.52.0/appliance/Makefile.am
+===
+--- libguestfs-1.52.0.orig/appliance/Makefile.am
 libguestfs-1.52.0/appliance/Makefile.am
+@@ -157,7 +157,7 @@ supermin.d/udev-rules.tar.gz: 99-guestfs
+ # If installing the daemon, install the udev rules too.
+ 
+ if INSTALL_DAEMON
+-udevrulesdir = /lib/udev/rules.d
++udevrulesdir = /usr/lib/udev/rules.d
+ udevrules_DATA = 99-guestfs-serial.rules
+ endif
+ 


Bug#1061342: gridengine: diff for NMU version 8.1.9+dfsg-11.1

2024-05-29 Thread Chris Hofstaedtler
Control: tags 1061342 + pending


Dear maintainer,

I've prepared an NMU for gridengine (versioned as 8.1.9+dfsg-11.1) and
uploaded it to DELAYED/10. Please feel free to tell me if I
should delay it longer.

Regards.

diff -Nru gridengine-8.1.9+dfsg/debian/changelog gridengine-8.1.9+dfsg/debian/changelog
--- gridengine-8.1.9+dfsg/debian/changelog	2023-08-13 17:56:03.0 +0200
+++ gridengine-8.1.9+dfsg/debian/changelog	2024-05-30 01:41:12.0 +0200
@@ -1,3 +1,12 @@
+gridengine (8.1.9+dfsg-11.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+
+  [ Michael Biebl ]
+  * Install PAM modules into /usr (DEP 17 M2). (Closes: #1061342)
+
+ -- Chris Hofstaedtler   Thu, 30 May 2024 01:41:12 +0200
+
 gridengine (8.1.9+dfsg-11) unstable; urgency=medium
 
   * Team upload.
diff -Nru gridengine-8.1.9+dfsg/debian/gridengine-exec.install gridengine-8.1.9+dfsg/debian/gridengine-exec.install
--- gridengine-8.1.9+dfsg/debian/gridengine-exec.install	2023-08-13 17:40:33.0 +0200
+++ gridengine-8.1.9+dfsg/debian/gridengine-exec.install	2024-05-30 01:41:11.0 +0200
@@ -1,3 +1,3 @@
 debian/tmp/usr/bin/*/sge_execd		usr/lib/gridengine
 debian/tmp/usr/bin/*/sge_*shepherd	usr/lib/gridengine
-/lib/*/security/*.so
+usr/lib/*/security/*.so
diff -Nru gridengine-8.1.9+dfsg/debian/rules gridengine-8.1.9+dfsg/debian/rules
--- gridengine-8.1.9+dfsg/debian/rules	2023-08-13 17:40:33.0 +0200
+++ gridengine-8.1.9+dfsg/debian/rules	2024-05-30 01:41:11.0 +0200
@@ -66,7 +66,7 @@
 override_dh_auto_install:
 	install -d debian/tmp/usr
 	install -d debian/tmp/usr/share
-	install -d debian/tmp/lib/$(DEB_HOST_GNU_TYPE)/security
+	install -d debian/tmp/usr/lib/$(DEB_HOST_GNU_TYPE)/security
 	cd source && /usr/bin/yes | ${PRECMD} scripts/distinst \
 	-basedir ${CURDIR}/debian \
 	-vdir tmp/usr \
@@ -102,7 +102,7 @@
 	mandb -u -c debian/tmp/usr/share/man
 	chmod 755 debian/scripts/init_cluster debian/gridengine-wrapper
 	cp source/clients/qmon/qmon.desktop debian
-	mv debian/tmp/usr/lib/*/pam_sge* debian/tmp/lib/$(DEB_HOST_GNU_TYPE)/security
+	mv debian/tmp/usr/lib/*/pam_sge* debian/tmp/usr/lib/$(DEB_HOST_GNU_TYPE)/security
 
 override_dh_installinit:
 	dh_installinit -p gridengine-master


Bug#1061359: not fixed in unstable

2024-05-29 Thread Chris Hofstaedtler
Hi,

are you working on this?
Please make sure fixed packages are in trixie before the transition
freeze.

Chris

On Sat, Mar 02, 2024 at 09:58:35PM +0100, Chris Hofstaedtler wrote:
> Control: reopen -1
> Control: found -1 zfs-linux/2.2.3-1
> 
> Hi,
> 
> 2.2.3-1 in unstable still installs a lot of files outside of /usr.
> 
> /srv/debian-mirror/mirror/pool/contrib/z/zfs-linux/libnvpair3linux_2.2.3-1_amd64.deb
> drwxr-xr-x root/root 0 2024-02-23 14:28 ./lib/
> drwxr-xr-x root/root 0 2024-02-23 14:28 ./lib/x86_64-linux-gnu/
> -rw-r--r-- root/root104400 2024-02-23 14:28 
> ./lib/x86_64-linux-gnu/libnvpair.so.3.0.0
> lrwxrwxrwx root/root 0 2024-02-23 14:28 
> ./lib/x86_64-linux-gnu/libnvpair.so.3 -> libnvpair.so.3.0.0
[..]



Bug#1065307: r4d: diff for NMU version 1.7-4.1

2024-05-29 Thread Chris Hofstaedtler
Control: tags 1065307 + patch
Control: tags 1065307 + pending


Dear maintainer,

I've prepared an NMU for r4d (versioned as 1.7-4.1) and
uploaded it to DELAYED/10. Please feel free to tell me if I
should delay it longer.

Regards.

diff -Nru r4d-1.7/debian/changelog r4d-1.7/debian/changelog
--- r4d-1.7/debian/changelog	2023-05-17 17:21:39.0 +0200
+++ r4d-1.7/debian/changelog	2024-05-30 01:29:57.0 +0200
@@ -1,3 +1,10 @@
+r4d (1.7-4.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Install systemd unit into /usr/lib. (Closes: #1065307)
+
+ -- Chris Hofstaedtler   Thu, 30 May 2024 01:29:57 +0200
+
 r4d (1.7-4) unstable; urgency=medium
 
   * Change bage's email address
diff -Nru r4d-1.7/debian/patches/series r4d-1.7/debian/patches/series
--- r4d-1.7/debian/patches/series	1970-01-01 01:00:00.0 +0100
+++ r4d-1.7/debian/patches/series	2024-05-30 01:29:51.0 +0200
@@ -0,0 +1 @@
+systemd-unit-usrmerge.patch
diff -Nru r4d-1.7/debian/patches/systemd-unit-usrmerge.patch r4d-1.7/debian/patches/systemd-unit-usrmerge.patch
--- r4d-1.7/debian/patches/systemd-unit-usrmerge.patch	1970-01-01 01:00:00.0 +0100
+++ r4d-1.7/debian/patches/systemd-unit-usrmerge.patch	2024-05-30 01:29:39.0 +0200
@@ -0,0 +1,13 @@
+Index: r4d-1.7/setup.py
+===
+--- r4d-1.7.orig/setup.py
 r4d-1.7/setup.py
+@@ -25,7 +25,7 @@ setup(name='r4d',
+   scripts=['r4dd', 'r4dcfg'],
+   data_files= [
+   ('/etc/',glob("r4d.cfg")),
+-  ('/lib/systemd/system',  glob("r4dd.service"))],
++  ('/usr/lib/systemd/system',  glob("r4dd.service"))],
+   classifiers=[
+   'License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)',
+   ],


Bug#1060799: libunwind: diff for NMU version 1.6.2-3.1

2024-05-29 Thread Chris Hofstaedtler
Control: tags 1060799 + patch
Control: tags 1060799 + pending


Dear maintainer,

I've prepared an NMU for libunwind (versioned as 1.6.2-3.1) and
uploaded it to DELAYED/10. Please feel free to tell me if I
should delay it longer.

Regards.

diff -Nru libunwind-1.6.2/debian/changelog libunwind-1.6.2/debian/changelog
--- libunwind-1.6.2/debian/changelog	2022-12-16 22:50:28.0 +0100
+++ libunwind-1.6.2/debian/changelog	2024-05-30 01:17:49.0 +0200
@@ -1,3 +1,10 @@
+libunwind (1.6.2-3.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Stop installing empty /lib directory. (Closes: #1060799)
+
+ -- Chris Hofstaedtler   Thu, 30 May 2024 01:17:49 +0200
+
 libunwind (1.6.2-3) unstable; urgency=low
 
   * Add upstream change to determine the page size dynamically,
diff -Nru libunwind-1.6.2/debian/libunwind8.dirs libunwind-1.6.2/debian/libunwind8.dirs
--- libunwind-1.6.2/debian/libunwind8.dirs	2015-07-04 07:02:00.0 +0200
+++ libunwind-1.6.2/debian/libunwind8.dirs	2024-05-30 01:17:43.0 +0200
@@ -1,2 +1 @@
-lib
 usr/lib


Bug#1059757: firmware-sof: diff for NMU version 2023.12.1-1.1

2024-05-29 Thread Chris Hofstaedtler
Control: tags 1059757 + patch
Control: tags 1059757 + pending


Dear maintainer,

I've prepared an NMU for firmware-sof (versioned as 2023.12.1-1.1) and
uploaded it to DELAYED/10. Please feel free to tell me if I
should delay it longer.

Regards.

diff -Nru firmware-sof-2023.12.1/debian/changelog firmware-sof-2023.12.1/debian/changelog
--- firmware-sof-2023.12.1/debian/changelog	2024-03-05 15:52:23.0 +0100
+++ firmware-sof-2023.12.1/debian/changelog	2024-05-30 01:19:39.0 +0200
@@ -1,3 +1,10 @@
+firmware-sof (2023.12.1-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Install into /usr/lib instead of /lib. (Closes: #1059757)
+
+ -- Chris Hofstaedtler   Thu, 30 May 2024 01:19:39 +0200
+
 firmware-sof (2023.12.1-1) unstable; urgency=medium
 
   * Update to upstream version 2023-12.1
diff -Nru firmware-sof-2023.12.1/debian/rules firmware-sof-2023.12.1/debian/rules
--- firmware-sof-2023.12.1/debian/rules	2024-03-05 15:52:23.0 +0100
+++ firmware-sof-2023.12.1/debian/rules	2024-05-30 01:19:39.0 +0200
@@ -4,7 +4,7 @@
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
-export SOF_INSTALL_DIR=debian/firmware-sof-signed/lib/firmware/intel
+export SOF_INSTALL_DIR=debian/firmware-sof-signed/usr/lib/firmware/intel
 %:
 	dh $@
 


Bug#1059414: open-ath9k-htc-firmware: diff for NMU version 1.4.0-108-gd856466+dfsg1-1.5

2024-05-29 Thread Chris Hofstaedtler
Control: tags 1059414 + pending


Dear maintainer,

I've prepared an NMU for open-ath9k-htc-firmware (versioned as 
1.4.0-108-gd856466+dfsg1-1.5) and
uploaded it to DELAYED/10. Please feel free to tell me if I
should delay it longer.

Regards.

diff -Nru open-ath9k-htc-firmware-1.4.0-108-gd856466+dfsg1/debian/changelog open-ath9k-htc-firmware-1.4.0-108-gd856466+dfsg1/debian/changelog
--- open-ath9k-htc-firmware-1.4.0-108-gd856466+dfsg1/debian/changelog	2023-07-26 21:09:48.0 +0200
+++ open-ath9k-htc-firmware-1.4.0-108-gd856466+dfsg1/debian/changelog	2024-05-30 01:01:56.0 +0200
@@ -1,3 +1,10 @@
+open-ath9k-htc-firmware (1.4.0-108-gd856466+dfsg1-1.5) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Install all files below /usr. (Closes: #1059414)
+
+ -- Chris Hofstaedtler   Thu, 30 May 2024 01:01:56 +0200
+
 open-ath9k-htc-firmware (1.4.0-108-gd856466+dfsg1-1.4) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru open-ath9k-htc-firmware-1.4.0-108-gd856466+dfsg1/debian/firmware-ath9k-htc.install open-ath9k-htc-firmware-1.4.0-108-gd856466+dfsg1/debian/firmware-ath9k-htc.install
--- open-ath9k-htc-firmware-1.4.0-108-gd856466+dfsg1/debian/firmware-ath9k-htc.install	2023-07-26 21:09:18.0 +0200
+++ open-ath9k-htc-firmware-1.4.0-108-gd856466+dfsg1/debian/firmware-ath9k-htc.install	2024-05-30 01:01:52.0 +0200
@@ -1,2 +1,2 @@
-target_firmware/htc_*.fw lib/firmware/ath9k_htc/
+target_firmware/htc_*.fw usr/lib/firmware/ath9k_htc/
 debian/firmware-ath9k-htc.metainfo.xml usr/share/metainfo


Bug#1060333: atmel-firmware: diff for NMU version 1.3-7.1

2024-05-29 Thread Chris Hofstaedtler
Control: tags 1060333 + pending


Dear maintainer,

I've prepared an NMU for atmel-firmware (versioned as 1.3-7.1) and
uploaded it to DELAYED/10. Please feel free to tell me if I
should delay it longer.

Regards.

diff -Nru atmel-firmware-1.3/debian/changelog atmel-firmware-1.3/debian/changelog
--- atmel-firmware-1.3/debian/changelog	2023-01-18 01:51:47.0 +0100
+++ atmel-firmware-1.3/debian/changelog	2024-05-30 01:05:26.0 +0200
@@ -1,3 +1,10 @@
+atmel-firmware (1.3-7.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Install files into /usr (DEP17 M2) (Closes: #1060333)
+
+ -- Chris Hofstaedtler   Thu, 30 May 2024 01:05:26 +0200
+
 atmel-firmware (1.3-7) unstable; urgency=medium
 
   [ Cyril Brulebois ]
diff -Nru atmel-firmware-1.3/debian/rules atmel-firmware-1.3/debian/rules
--- atmel-firmware-1.3/debian/rules	2021-12-29 07:06:04.0 +0100
+++ atmel-firmware-1.3/debian/rules	2024-05-30 01:04:59.0 +0200
@@ -5,9 +5,9 @@
 
 override_dh_auto_install:
 	dh_auto_install
-	install -d -m 0755 debian/atmel-firmware/lib/firmware
-	install -m 0644 images/*.bin debian/atmel-firmware/lib/firmware
-	install -m 0644 images.usb/*.bin debian/atmel-firmware/lib/firmware
+	install -d -m 0755 debian/atmel-firmware/usr/lib/firmware
+	install -m 0644 images/*.bin debian/atmel-firmware/usr/lib/firmware
+	install -m 0644 images.usb/*.bin debian/atmel-firmware/usr/lib/firmware
 	install -D -m 0755 atmel_fwl.pl debian/atmel-firmware/usr/sbin/atmel_fwl
 	install -D -m 0644 atmel_fwl.8 debian/atmel-firmware/usr/share/man/man8/atmel_fwl.8
 	install -D -m 0644 atmel.conf debian/atmel-firmware/etc/pcmcia/atmel.conf


Bug#1059378: dahdi-firmware: diff for NMU version 2.11.1.0.20170917-2.1

2024-05-29 Thread Chris Hofstaedtler
Control: tags 1059378 + pending


Dear maintainer,

I've prepared an NMU for dahdi-firmware (versioned as 2.11.1.0.20170917-2.1) and
uploaded it to DELAYED/10. Please feel free to tell me if I
should delay it longer.

Regards.

diff -Nru dahdi-firmware-2.11.1.0.20170917/debian/changelog dahdi-firmware-2.11.1.0.20170917/debian/changelog
--- dahdi-firmware-2.11.1.0.20170917/debian/changelog	2023-01-28 02:07:36.0 +0100
+++ dahdi-firmware-2.11.1.0.20170917/debian/changelog	2024-05-30 00:58:10.0 +0200
@@ -1,3 +1,10 @@
+dahdi-firmware (2.11.1.0.20170917-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Install files into /usr instead of /. (Closes: #1059378)
+
+ -- Chris Hofstaedtler   Thu, 30 May 2024 00:58:10 +0200
+
 dahdi-firmware (2.11.1.0.20170917-2) unstable; urgency=medium
 
   * Move source and binary from non-free/comm to non-free-firmware/comm
diff -Nru dahdi-firmware-2.11.1.0.20170917/debian/install dahdi-firmware-2.11.1.0.20170917/debian/install
--- dahdi-firmware-2.11.1.0.20170917/debian/install	2016-04-19 21:43:39.0 +0200
+++ dahdi-firmware-2.11.1.0.20170917/debian/install	2024-05-30 00:58:08.0 +0200
@@ -3,4 +3,4 @@
 debian/get-digium-firmware		usr/share/dahdi
 debian/OCT6104E-256D.ima		usr/share/dahdi
 build_tools/install_firmware		usr/share/dahdi
-drivers/dahdi/dahdi-fw-*.bin		lib/firmware/ 
+drivers/dahdi/dahdi-fw-*.bin		usr/lib/firmware/ 


Bug#1060358: rpcbind: diff for NMU version 1.2.6-8.1

2024-05-29 Thread Chris Hofstaedtler
Control: tags 1060358 + pending


Dear maintainer,

I've prepared an NMU for rpcbind (versioned as 1.2.6-8.1) and
uploaded it to DELAYED/10. Please feel free to tell me if I
should delay it longer.

Regards.

diff -Nru rpcbind-1.2.6/debian/changelog rpcbind-1.2.6/debian/changelog
--- rpcbind-1.2.6/debian/changelog	2024-04-15 02:31:00.0 +0200
+++ rpcbind-1.2.6/debian/changelog	2024-05-30 00:53:15.0 +0200
@@ -1,3 +1,11 @@
+rpcbind (1.2.6-8.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Install rpcbind into /usr/sbin (DEP17 M2). (Closes: #1060358)
+Update path in init script, systemd unit, et al.
+
+ -- Chris Hofstaedtler   Thu, 30 May 2024 00:53:15 +0200
+
 rpcbind (1.2.6-8) unstable; urgency=medium
 
   * Bump libtirpc-dev dependency to 1.3.4+ds-1.1. Closes: #1066880.
diff -Nru rpcbind-1.2.6/debian/init.d rpcbind-1.2.6/debian/init.d
--- rpcbind-1.2.6/debian/init.d	2024-04-15 02:31:00.0 +0200
+++ rpcbind-1.2.6/debian/init.d	2024-05-30 00:53:13.0 +0200
@@ -16,7 +16,7 @@
 #RPC include NFS and NIS.
 ### END INIT INFO
 
-test -f /sbin/rpcbind || exit 0
+test -f /usr/sbin/rpcbind || exit 0
 
 . /lib/lsb/init-functions
 
@@ -45,15 +45,15 @@
 exit 1
 fi
 [ -x /sbin/restorecon ] && /sbin/restorecon $STATEDIR
-pid=$( pidofproc /sbin/rpcbind )
+pid=$( pidofproc /usr/sbin/rpcbind )
 if [ -n "$pid" ]
 then
 log_action_msg "Already running: rpcbind"
 exit 0
 fi
 log_daemon_msg "Starting RPC port mapper daemon" "rpcbind"
-start-stop-daemon --start --quiet --oknodo --exec /sbin/rpcbind -- "$@"
-pid=$( pidofproc /sbin/rpcbind )
+start-stop-daemon --start --quiet --oknodo --exec /usr/sbin/rpcbind -- "$@"
+pid=$( pidofproc /usr/sbin/rpcbind )
 echo -n "$pid" >"$PIDFILE"
 # /run/sendsigs.omit.d is created by /etc/init.d/mountkernfs.sh
 ln -sf "$PIDFILE" /run/sendsigs.omit.d/rpcbind
@@ -64,7 +64,7 @@
 stop ()
 {
 log_daemon_msg "Stopping RPC port mapper daemon" "rpcbind"
-start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --oknodo --exec /sbin/rpcbind
+start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --oknodo --exec /usr/sbin/rpcbind
 rm -f "$PIDFILE"
 log_end_msg $?
 }
@@ -90,7 +90,7 @@
 start $OPTIONS
 ;;
 status)
-status_of_proc /sbin/rpcbind rpcbind && exit 0 || exit $?
+status_of_proc /usr/sbin/rpcbind rpcbind && exit 0 || exit $?
 ;;
 *)
 log_success_msg "Usage: /etc/init.d/rpcbind {start|stop|force-reload|restart|status}"
diff -Nru rpcbind-1.2.6/debian/rpcbind.service rpcbind-1.2.6/debian/rpcbind.service
--- rpcbind-1.2.6/debian/rpcbind.service	2024-04-15 02:31:00.0 +0200
+++ rpcbind-1.2.6/debian/rpcbind.service	2024-05-30 00:53:13.0 +0200
@@ -13,7 +13,7 @@
 
 [Service]
 Environment="OPTIONS=-w"
-ExecStart=/sbin/rpcbind -f $OPTIONS
+ExecStart=/usr/sbin/rpcbind -f $OPTIONS
 EnvironmentFile=-/etc/rpcbind.conf
 EnvironmentFile=-/etc/default/rpcbind
 Type=notify
diff -Nru rpcbind-1.2.6/debian/rules rpcbind-1.2.6/debian/rules
--- rpcbind-1.2.6/debian/rules	2024-04-15 02:31:00.0 +0200
+++ rpcbind-1.2.6/debian/rules	2024-05-30 00:53:13.0 +0200
@@ -17,7 +17,7 @@
 	dh $@
 
 override_dh_auto_configure:
-	dh_auto_configure -- --sbindir=/sbin --enable-warmstarts --enable-libwrap --with-statedir=/run/rpcbind --with-rpcuser=_rpc --enable-debug $(CONFIGURE_EXTRA_FLAGS)
+	dh_auto_configure -- --enable-warmstarts --enable-libwrap --with-statedir=/run/rpcbind --with-rpcuser=_rpc --enable-debug $(CONFIGURE_EXTRA_FLAGS)
 
 execute_after_dh_auto_install:
 	rm -Rf debian/rpcbind/unused
diff -Nru rpcbind-1.2.6/debian/tests/check-if-installed rpcbind-1.2.6/debian/tests/check-if-installed
--- rpcbind-1.2.6/debian/tests/check-if-installed	2024-04-15 02:31:00.0 +0200
+++ rpcbind-1.2.6/debian/tests/check-if-installed	2024-05-30 00:53:13.0 +0200
@@ -1,5 +1,5 @@
 #!/bin/bash
 
-if [ ! -f "/sbin/rpcbind" ]; then
+if [ ! -f "/usr/sbin/rpcbind" ]; then
 >&2 echo "rpcbind is not installed"
 fi


Bug#1060344: ecryptfs-utils: diff for NMU version 111-6.1

2024-05-29 Thread Chris Hofstaedtler
Control: tags 1060344 + patch
Control: tags 1060344 + pending


Dear maintainer,

I've prepared an NMU for ecryptfs-utils (versioned as 111-6.1) and
uploaded it to DELAYED/10. Please feel free to tell me if I
should delay it longer.

Regards.

diff -Nru ecryptfs-utils-111/debian/changelog ecryptfs-utils-111/debian/changelog
--- ecryptfs-utils-111/debian/changelog	2022-12-19 19:46:40.0 +0100
+++ ecryptfs-utils-111/debian/changelog	2024-05-30 00:48:02.0 +0200
@@ -1,3 +1,10 @@
+ecryptfs-utils (111-6.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Install aliases files into /usr (DEP17 M2) (Closes: #1060344)
+
+ -- Chris Hofstaedtler   Thu, 30 May 2024 00:48:02 +0200
+
 ecryptfs-utils (111-6) unstable; urgency=medium
 
   [ Andreas Metzler  ]
diff -Nru ecryptfs-utils-111/debian/ecryptfs-utils.install ecryptfs-utils-111/debian/ecryptfs-utils.install
--- ecryptfs-utils-111/debian/ecryptfs-utils.install	2013-02-09 08:05:28.0 +0100
+++ ecryptfs-utils-111/debian/ecryptfs-utils.install	2024-05-30 00:47:57.0 +0200
@@ -1,7 +1,7 @@
-lib/*/security
-sbin
+sbin/* usr/sbin/
 usr/bin
 usr/lib/*/ecryptfs
+usr/lib/*/security
 usr/share/doc
 usr/share/ecryptfs-utils
 usr/share/locale
diff -Nru ecryptfs-utils-111/debian/ecryptfs-utils.lintian-overrides ecryptfs-utils-111/debian/ecryptfs-utils.lintian-overrides
--- ecryptfs-utils-111/debian/ecryptfs-utils.lintian-overrides	2022-12-19 19:46:40.0 +0100
+++ ecryptfs-utils-111/debian/ecryptfs-utils.lintian-overrides	2024-05-30 00:47:57.0 +0200
@@ -1,3 +1,3 @@
 # false positives
-ecryptfs-utils: elevated-privileges 4755 root/root [sbin/mount.ecryptfs_private]
+ecryptfs-utils: elevated-privileges 4755 root/root [usr/sbin/mount.ecryptfs_private]
 ecryptfs-utils: executable-not-elf-or-script [usr/share/ecryptfs-utils/ecryptfs-record-passphrase]
diff -Nru ecryptfs-utils-111/debian/rules ecryptfs-utils-111/debian/rules
--- ecryptfs-utils-111/debian/rules	2020-06-16 21:31:59.0 +0200
+++ ecryptfs-utils-111/debian/rules	2024-05-30 00:47:57.0 +0200
@@ -21,7 +21,7 @@
 	dh_auto_configure -- \
 		--enable-gpg --enable-pam --enable-static --enable-tspi \
 		--disable-gui --disable-openssl --disable-pkcs11-helper \
-		--disable-pywrap \
+		--disable-pywrap --with-pamdir=/usr/lib/$(DEB_HOST_MULTIARCH)/security \
 		CFLAGS="$(CFLAGS)"
 
 override_dh_auto_install:
@@ -30,7 +30,7 @@
 	install -D -m 0644 debian/local/ecryptfs-utils.pam-auth-update debian/ecryptfs-utils/usr/share/pam-configs/ecryptfs-utils
 
 	# Adding kmod integration
-	install -D -m 0644 debian/local/ecryptfs-utils.kmod debian/ecryptfs-utils/lib/modules-load.d/ecryptfs.conf
+	install -D -m 0644 debian/local/ecryptfs-utils.kmod debian/ecryptfs-utils/usr/lib/modules-load.d/ecryptfs.conf
 
 	# Removing useless files
 	rm -f debian/tmp/usr/lib/*/*.la
@@ -38,7 +38,7 @@
 override_dh_fixperms:
 	dh_fixperms
 
-	chmod 4755 debian/ecryptfs-utils/sbin/mount.ecryptfs_private
+	chmod 4755 debian/ecryptfs-utils/usr/sbin/mount.ecryptfs_private
 
 override_dh_install:
 	dh_install --fail-missing


Bug#1058821: x2gothinclient: diff for NMU version 1.5.0.1-10.1

2024-05-29 Thread Chris Hofstaedtler
Control: tags 1058821 + patch
Control: tags 1058821 + pending


Dear maintainer,

I've prepared an NMU for x2gothinclient (versioned as 1.5.0.1-10.1) and
uploaded it to DELAYED/10. Please feel free to tell me if I
should delay it longer.

Regards.

diff -Nru x2gothinclient-1.5.0.1/debian/changelog x2gothinclient-1.5.0.1/debian/changelog
--- x2gothinclient-1.5.0.1/debian/changelog	2023-05-19 10:59:29.0 +0200
+++ x2gothinclient-1.5.0.1/debian/changelog	2024-05-30 00:43:28.0 +0200
@@ -1,3 +1,10 @@
+x2gothinclient (1.5.0.1-10.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Use udev.pc to place udev files. (Closes: #1058821)
+
+ -- Chris Hofstaedtler   Thu, 30 May 2024 00:43:28 +0200
+
 x2gothinclient (1.5.0.1-10) unstable; urgency=medium
 
   * debian/changelog:
diff -Nru x2gothinclient-1.5.0.1/debian/control x2gothinclient-1.5.0.1/debian/control
--- x2gothinclient-1.5.0.1/debian/control	2023-05-16 22:14:12.0 +0200
+++ x2gothinclient-1.5.0.1/debian/control	2024-05-30 00:43:25.0 +0200
@@ -8,7 +8,9 @@
 Build-Depends:
  debhelper-compat (= 13),
  qtbase5-dev,
+ pkgconf,
  po-debconf,
+ systemd-dev,
 Standards-Version: 4.6.1
 Rules-Requires-Root: no
 Homepage: https://code.x2go.org/releases/source/x2gothinclient
diff -Nru x2gothinclient-1.5.0.1/debian/rules x2gothinclient-1.5.0.1/debian/rules
--- x2gothinclient-1.5.0.1/debian/rules	2022-10-03 11:48:15.0 +0200
+++ x2gothinclient-1.5.0.1/debian/rules	2024-05-30 00:43:25.0 +0200
@@ -4,6 +4,8 @@
 DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/buildflags.mk
 
+export deb_udevdir = $(shell pkg-config --variable=udevdir udev | sed s,^/,,)
+
 export QT_SELECT=qt5
 
 DHFLAGS=--parallel
diff -Nru x2gothinclient-1.5.0.1/debian/x2gothinclient-smartcardrules.install x2gothinclient-1.5.0.1/debian/x2gothinclient-smartcardrules.install
--- x2gothinclient-1.5.0.1/debian/x2gothinclient-smartcardrules.install	2019-12-13 12:28:30.0 +0100
+++ x2gothinclient-1.5.0.1/debian/x2gothinclient-smartcardrules.install	2024-05-30 00:43:25.0 +0200
@@ -1,3 +1,3 @@
-smartcardrules/21-x2gognupgccid.ruleslib/udev/rules.d/
+smartcardrules/21-x2gognupgccid.rules${env:deb_udevdir}/rules.d/
 smartcardrules/x2gognupgccid usr/lib/x2go/tce/
 
diff -Nru x2gothinclient-1.5.0.1/debian/x2gothinclient-usbmount.install x2gothinclient-1.5.0.1/debian/x2gothinclient-usbmount.install
--- x2gothinclient-1.5.0.1/debian/x2gothinclient-usbmount.install	2019-12-13 12:28:29.0 +0100
+++ x2gothinclient-1.5.0.1/debian/x2gothinclient-usbmount.install	2024-05-30 00:43:25.0 +0200
@@ -1,3 +1,3 @@
-usbmount/61-x2gousbmount.ruleslib/udev/rules.d/
+usbmount/61-x2gousbmount.rules${env:deb_udevdir}/rules.d/
 usbmount/x2gousbmount usr/lib/x2go/tce/
 


Bug#1072184: openssh-server: Please stop writing /var/log/btmp

2024-05-29 Thread Chris Hofstaedtler
Package: openssh-server
Severity: normal

Hi Colin,

util-linux 2.40.1-3 will, as part of moving last to src:wtmpdb, also
stop installing lastb(1).
wtmpdb provides no replacement for lastb.

Please disable writing /var/log/btmp.

While openssh-server can continue writing that file, AFAIK nothing will
be left to read it.

I didn't understand this was part of the upstream changes until now,
sorry.

Thanks,
Chris



Bug#1066060: libpam-modules: pam_lastlog.so missing

2024-05-29 Thread Chris Hofstaedtler
Control: retitle -1 login: remove lastlog, remove pam_lastlog.so from PAM config
Control: severity -1 important

Dear shadow maintainers,

as originally requested, please drop pam_lastlog.so from the PAM
config.

Please also drop the lastlog binary, which isn't very useful when
the data it is reading is not updated anymore.

Chris



Bug#1058839: opencpn: diff for NMU version 5.8.4+dfsg-1.1

2024-05-29 Thread Chris Hofstaedtler
Control: tags 1058839 + patch
Control: tags 1058839 + pending


Dear maintainer,

I've prepared an NMU for opencpn (versioned as 5.8.4+dfsg-1.1) and
uploaded it to DELAYED/10. Please feel free to tell me if I
should delay it longer.

Regards.

diff -Nru opencpn-5.8.4+dfsg/debian/changelog opencpn-5.8.4+dfsg/debian/changelog
--- opencpn-5.8.4+dfsg/debian/changelog	2023-06-15 20:26:20.0 +0200
+++ opencpn-5.8.4+dfsg/debian/changelog	2024-05-29 17:45:16.0 +0200
@@ -1,3 +1,10 @@
+opencpn (5.8.4+dfsg-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Use udev.pc to place udev files. (Closes: #1058839)
+
+ -- Chris Hofstaedtler   Wed, 29 May 2024 17:45:16 +0200
+
 opencpn (5.8.4+dfsg-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru opencpn-5.8.4+dfsg/debian/control opencpn-5.8.4+dfsg/debian/control
--- opencpn-5.8.4+dfsg/debian/control	2023-05-17 10:09:06.0 +0200
+++ opencpn-5.8.4+dfsg/debian/control	2024-05-29 17:45:15.0 +0200
@@ -30,8 +30,10 @@
  libwxgtk3.2-dev | libwxgtk3.0-gtk3-dev,
  libwxgtk-webview3.2-dev | libwxgtk-webview3.0-gtk3-dev,
  lsb-release,
+ pkgconf,
  portaudio19-dev,
- rapidjson-dev
+ rapidjson-dev,
+ systemd-dev
 Standards-Version: 4.6.2
 Vcs-Browser: https://gitlab.com/leamas/opencpn
 Vcs-Git: https://gitlab.com/leamas/opencpn.git -b debian/sid
diff -Nru opencpn-5.8.4+dfsg/debian/opencpn.install opencpn-5.8.4+dfsg/debian/opencpn.install
--- opencpn-5.8.4+dfsg/debian/opencpn.install	2023-05-07 09:06:59.0 +0200
+++ opencpn-5.8.4+dfsg/debian/opencpn.install	2024-05-29 17:45:15.0 +0200
@@ -1,4 +1,4 @@
-lib/udev/rules.d/98-sglock-ocpn.rules
+lib/udev/rules.d/98-sglock-ocpn.rules ${env:deb_udevdir}/rules.d/
 usr/bin/opencpn
 usr/bin/opencpn-cmd
 usr/lib/opencpn/*.so
diff -Nru opencpn-5.8.4+dfsg/debian/rules opencpn-5.8.4+dfsg/debian/rules
--- opencpn-5.8.4+dfsg/debian/rules	2023-05-07 09:06:59.0 +0200
+++ opencpn-5.8.4+dfsg/debian/rules	2024-05-29 17:45:15.0 +0200
@@ -1,4 +1,5 @@
 #!/usr/bin/make -f
+export deb_udevdir = $(shell pkg-config --variable=udevdir udev | sed s,^/,,)
 
 include  /usr/share/dpkg/architecture.mk
 


Bug#1059516: chasquid: diff for NMU version 1.13-1.1

2024-05-29 Thread Chris Hofstaedtler
Control: tags 1059516 + patch
Control: tags 1059516 + pending


Dear maintainer,

I've prepared an NMU for chasquid (versioned as 1.13-1.1) and
uploaded it to DELAYED/10. Please feel free to tell me if I
should delay it longer.

Regards.

diff -Nru chasquid-1.13/debian/changelog chasquid-1.13/debian/changelog
--- chasquid-1.13/debian/changelog	2023-12-26 15:22:37.0 +0100
+++ chasquid-1.13/debian/changelog	2024-05-29 17:40:23.0 +0200
@@ -1,3 +1,11 @@
+chasquid (1.13-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Install systemd units into /usr instead of /. (Closes: #1059516)
+Build-Depend on newer debhelper supporting that path.
+
+ -- Chris Hofstaedtler   Wed, 29 May 2024 17:40:23 +0200
+
 chasquid (1.13-1) unstable; urgency=medium
 
   * New upstream release (1.13)
diff -Nru chasquid-1.13/debian/control chasquid-1.13/debian/control
--- chasquid-1.13/debian/control	2023-12-26 15:22:37.0 +0100
+++ chasquid-1.13/debian/control	2024-05-29 17:40:15.0 +0200
@@ -4,7 +4,7 @@
 Maintainer: Debian Go Packaging Team 
 Uploaders: Martina Ferrari ,
Alberto Bertogli 
-Build-Depends: debhelper (>= 13~),
+Build-Depends: debhelper (>= 13.11.6~),
debhelper-compat (= 13),
dh-golang (>= 1.18~),
golang-any,
diff -Nru chasquid-1.13/debian/install chasquid-1.13/debian/install
--- chasquid-1.13/debian/install	2023-12-26 15:22:37.0 +0100
+++ chasquid-1.13/debian/install	2024-05-29 17:40:15.0 +0200
@@ -9,5 +9,5 @@
 # Override the service and sockets, as we make small Debian-specific
 # changes to it, and retain the 1.10 structure (it was changed in 1.11 and we
 # have not yet updated the Debian package to it).
-debian/systemd/*.service	lib/systemd/system/
-debian/systemd/*.socket		lib/systemd/system/
+debian/systemd/*.service	usr/lib/systemd/system/
+debian/systemd/*.socket		usr/lib/systemd/system/


Bug#1058825: waagent: diff for NMU version 2.7.3.0-4.2

2024-05-28 Thread Chris Hofstaedtler
Control: tags 1058825 + patch
Control: tags 1058825 + pending

Dear maintainer,

I've prepared an NMU for waagent (versioned as 2.7.3.0-4.2) and
uploaded it to DELAYED/10. Please feel free to tell me if I
should delay it longer.

Regards.

diff -Nru waagent-2.7.3.0/debian/changelog waagent-2.7.3.0/debian/changelog
--- waagent-2.7.3.0/debian/changelog	2022-10-15 12:56:30.0 +0200
+++ waagent-2.7.3.0/debian/changelog	2024-05-29 01:05:22.0 +0200
@@ -1,3 +1,10 @@
+waagent (2.7.3.0-4.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Install udev rules into /usr/lib. (Closes: #1058825)
+
+ -- Chris Hofstaedtler   Wed, 29 May 2024 01:05:22 +0200
+
 waagent (2.7.3.0-4.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru waagent-2.7.3.0/debian/patches/debian-changes waagent-2.7.3.0/debian/patches/debian-changes
--- waagent-2.7.3.0/debian/patches/debian-changes	2022-10-04 09:52:50.0 +0200
+++ waagent-2.7.3.0/debian/patches/debian-changes	2024-05-29 01:05:22.0 +0200
@@ -1,7 +1,7 @@
-diff --git a/azurelinuxagent/agent.py b/azurelinuxagent/agent.py
-index b70429a1..9d5955b4 100644
 a/azurelinuxagent/agent.py
-+++ b/azurelinuxagent/agent.py
+Index: waagent-2.7.3.0/azurelinuxagent/agent.py
+===
+--- waagent-2.7.3.0.orig/azurelinuxagent/agent.py
 waagent-2.7.3.0/azurelinuxagent/agent.py
 @@ -65,6 +65,7 @@ class AgentCommands(object):
  CollectLogs = "collect-logs"
  SetupFirewall = "setup-firewall"
@@ -40,11 +40,11 @@
  elif re.match(regex_cmd_format.format(AgentCommands.Version), arg):
  cmd = AgentCommands.Version
  elif re.match(regex_cmd_format.format("verbose"), arg):
-diff --git a/azurelinuxagent/common/osutil/debian.py b/azurelinuxagent/common/osutil/debian.py
-index 5302b059..c0041a98 100644
 a/azurelinuxagent/common/osutil/debian.py
-+++ b/azurelinuxagent/common/osutil/debian.py
-@@ -33,20 +33,25 @@ import azurelinuxagent.common.utils.textutil as textutil  # pylint: disable=W061
+Index: waagent-2.7.3.0/azurelinuxagent/common/osutil/debian.py
+===
+--- waagent-2.7.3.0.orig/azurelinuxagent/common/osutil/debian.py
 waagent-2.7.3.0/azurelinuxagent/common/osutil/debian.py
+@@ -33,20 +33,25 @@ import azurelinuxagent.common.utils.text
  from azurelinuxagent.common.osutil.default import DefaultOSUtil
  
  
@@ -96,10 +96,10 @@
 -
 -def start_agent_service(self):
 -return shellutil.run("systemctl start {0}".format(self.service_name), chk_err=False)
-diff --git a/azurelinuxagent/common/osutil/default.py b/azurelinuxagent/common/osutil/default.py
-index 4c706a9e..322da792 100644
 a/azurelinuxagent/common/osutil/default.py
-+++ b/azurelinuxagent/common/osutil/default.py
+Index: waagent-2.7.3.0/azurelinuxagent/common/osutil/default.py
+===
+--- waagent-2.7.3.0.orig/azurelinuxagent/common/osutil/default.py
 waagent-2.7.3.0/azurelinuxagent/common/osutil/default.py
 @@ -416,9 +416,9 @@ class DefaultOSUtil(object):
  return
  
@@ -112,10 +112,10 @@
  
  if comment is not None:
  cmd.extend(["-c", comment])
-diff --git a/azurelinuxagent/common/osutil/factory.py b/azurelinuxagent/common/osutil/factory.py
-index 5b7db424..f44dcfdf 100644
 a/azurelinuxagent/common/osutil/factory.py
-+++ b/azurelinuxagent/common/osutil/factory.py
+Index: waagent-2.7.3.0/azurelinuxagent/common/osutil/factory.py
+===
+--- waagent-2.7.3.0.orig/azurelinuxagent/common/osutil/factory.py
 waagent-2.7.3.0/azurelinuxagent/common/osutil/factory.py
 @@ -25,7 +25,7 @@ from .arch import ArchUtil
  from .bigip import BigIpOSUtil
  from .clearlinux import ClearLinuxUtil
@@ -125,7 +125,7 @@
  from .default import DefaultOSUtil
  from .freebsd import FreeBSDOSUtil
  from .gaia import GaiaOSUtil
-@@ -83,7 +83,7 @@ def _get_osutil(distro_name, distro_code_name, distro_version, distro_full_name)
+@@ -83,7 +83,7 @@ def _get_osutil(distro_name, distro_code
  return AlpineOSUtil()
  
  if distro_name == "kali":
@@ -134,7 +134,7 @@
  
  if distro_name in ("flatcar", "coreos") or distro_code_name in ("flatcar", "coreos"):
  return CoreOSUtil()
-@@ -97,12 +97,10 @@ def _get_osutil(distro_name, distro_code_name, distro_version, distro_full_name)
+@@ -97,12 +97,10 @@ def _get_osutil(distro_name, distro_code
  return SUSEOSUtil()
  
  if distro_name == "debian":
@@ -150,10 +150,10 @@
  if Version(distro_version) < Version("7"):
  return Redhat6xOSUtil()
  
-diff --git a/azurelinuxagent/daemon/resourcedisk/default.py b/azurelinuxagent/daemon/resourcedisk/default.py
-index df4bb76f..

Bug#1059407: [Debian-on-mobile-maintainers] Bug#1059407: mobile-tweaks: install udev, systemd files below /usr

2024-05-28 Thread Chris Hofstaedtler
Hi,

On Tue, Jan 02, 2024 at 03:23:02PM +0100, Arnaud Ferraris wrote:
> Le 24/12/2023 à 20:11, Chris Hofstaedtler a écrit :
> > Your package installs files into /lib. For the ongoing Debian
> > UsrMerge effort [1] these files should move to /usr/lib in the
> > trixie cycle.
> > 
> > I'm attaching a patch to implement such a move.
> 
> Thanks for the report and patch! It has been applied to our developement
> branch and will be included in the next package release.

Please make sure this patch makes it into trixie well before the
transition freeze.
Now would be a great time.

Chris



Bug#1061701: nss-pam-ldapd: install PAM and NSS modules into /usr

2024-05-28 Thread Chris Hofstaedtler
Control: reopen -1
Control: severity -1 important

Hi,

On Sat, Feb 24, 2024 at 05:52:40PM +0100, Arthur de Jong wrote:
> On Sun, 2024-01-28 at 20:44 +0100, Michael Biebl wrote:
> > We want to finalize the /usr-merge via DEP17 by moving all files to
> > /usr. nss-pam-ldapd installs files into /lib; these should be moved
> > into the respective canonical locations in /usr/.
> > 
> > Please find a patch attached. It has been build-tested.
> 
> Thanks for your patch. I've uploaded version 0.9.12-5 to experimental
> which includes this change.

Please make sure this patch reaches unstable well before the trixie
transition freeze. Now would be a good time.

Chris



Bug#1059432: openafs: diff for NMU version 1.8.10-2.2

2024-05-28 Thread Chris Hofstaedtler
Control: tags 1059432 + patch
Control: tags 1059432 + pending

Dear maintainer,

I've prepared an NMU for openafs (versioned as 1.8.10-2.2) and
uploaded it to DELAYED/10. Please feel free to tell me if I
should delay it longer.

Regards.

diff -Nru openafs-1.8.10/debian/changelog openafs-1.8.10/debian/changelog
--- openafs-1.8.10/debian/changelog	2024-02-29 03:46:04.0 +0100
+++ openafs-1.8.10/debian/changelog	2024-05-29 00:48:42.0 +0200
@@ -1,3 +1,11 @@
+openafs (1.8.10-2.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Move afsd (back) into /usr/sbin (Closes: #1059432).
+Update path in init script and systemd service unit.
+
+ -- Chris Hofstaedtler   Wed, 29 May 2024 00:48:42 +0200
+
 openafs (1.8.10-2.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru openafs-1.8.10/debian/openafs-client.init openafs-1.8.10/debian/openafs-client.init
--- openafs-1.8.10/debian/openafs-client.init	2023-12-22 23:47:52.0 +0100
+++ openafs-1.8.10/debian/openafs-client.init	2024-05-29 00:48:25.0 +0200
@@ -34,7 +34,7 @@
 DKMSDIR=${DKMSDIR:-$MODULEROOT/updates/dkms}
 
 # Exit if the package is not installed.
-[ -x /sbin/afsd ] || exit 0
+[ -x /usr/sbin/afsd ] || exit 0
 
 # Define LSB log_* functions and get other support infrastructure.
 . /lib/lsb/init-functions
@@ -137,14 +137,14 @@
 
 # Start afsd.  Be careful not to start it if another one is already running,
 # as that has a bad tendency to hang the system.  Earlier versions of the
-# openafs-client package put afsd in /usr/sbin.
+# openafs-client package put afsd in /sbin.
 start_client() {
 if pidof /sbin/afsd >/dev/null || pidof /usr/sbin/afsd >/dev/null ; then
 echo "."
 else
 choose_afsd_options
 echo " afsd."
-start-stop-daemon --start --quiet --exec /sbin/afsd -- $AFSD_OPTIONS
+start-stop-daemon --start --quiet --exec /usr/sbin/afsd -- $AFSD_OPTIONS
 fi
 
 # From /etc/openafs/afs.conf.client, whether to enable fcrypt encryption.
@@ -196,7 +196,7 @@
 
 case "$1" in 
 start)
-if is_on $AFS_CLIENT && test -x /sbin/afsd ; then
+if is_on $AFS_CLIENT && test -x /usr/sbin/afsd ; then
 echo -n "Starting AFS services:"
 if load_client ; then
 start_client
@@ -210,7 +210,7 @@
 ;;
 
 force-start)
-if test -x /sbin/afsd ; then
+if test -x /usr/sbin/afsd ; then
 echo -n "Starting AFS services:"
 if load_client ; then
 start_client
diff -Nru openafs-1.8.10/debian/openafs-client.install openafs-1.8.10/debian/openafs-client.install
--- openafs-1.8.10/debian/openafs-client.install	2023-12-22 23:47:52.0 +0100
+++ openafs-1.8.10/debian/openafs-client.install	2024-05-29 00:48:25.0 +0200
@@ -28,7 +28,7 @@
 debian/tmp/usr/sbin/fstrace usr/sbin
 debian/tmp/usr/sbin/rmtsysd usr/sbin
 
-debian/tmp/usr/sbin/afsdsbin
+debian/tmp/usr/sbin/afsdusr/sbin
 
 debian/openafs-client-precheckusr/share/openafs
 debian/openafs-client-postcheckusr/share/openafs
diff -Nru openafs-1.8.10/debian/openafs-client-precheck openafs-1.8.10/debian/openafs-client-precheck
--- openafs-1.8.10/debian/openafs-client-precheck	2023-12-22 23:47:52.0 +0100
+++ openafs-1.8.10/debian/openafs-client-precheck	2024-05-29 00:48:25.0 +0200
@@ -46,7 +46,7 @@
 }
 
 # Exit if the package is not installed.
-[ -x /sbin/afsd ] || exit 1
+[ -x /usr/sbin/afsd ] || exit 1
 
 # Do some other checks for prerequisites
 if ! [ -f "${CACHEINFO}" ]; then
diff -Nru openafs-1.8.10/debian/openafs-client.service openafs-1.8.10/debian/openafs-client.service
--- openafs-1.8.10/debian/openafs-client.service	2023-12-22 23:47:52.0 +0100
+++ openafs-1.8.10/debian/openafs-client.service	2024-05-29 00:48:25.0 +0200
@@ -9,7 +9,7 @@
 Type=forking
 RemainAfterExit=true
 ExecStartPre=/usr/share/openafs/openafs-client-precheck
-ExecStart=/sbin/afsd $AFSD_ARGS
+ExecStart=/usr/sbin/afsd $AFSD_ARGS
 ExecStartPost=/usr/bin/fs setcrypt $AFS_SETCRYPT
 ExecStartPost=/usr/bin/fs sysname $AFS_SYSNAME
 ExecStop=/bin/grep -qv ^1$ /proc/sys/kernel/modules_disabled


Bug#1064430: android-sdk-meta: diff for NMU version 28.0.2+10+nmu1

2024-05-28 Thread Chris Hofstaedtler
Control: tags -1 + pending

Dear maintainer,

I've prepared an NMU for android-sdk-meta (versioned as 28.0.2+10+nmu1) and
uploaded it to DELAYED/10. Please feel free to tell me if I
should delay it longer.

Chris

diff -Nru android-sdk-meta-28.0.2+10/debian/android-sdk-platform-tools-common.install android-sdk-meta-28.0.2+10+nmu1/debian/android-sdk-platform-tools-common.install
--- android-sdk-meta-28.0.2+10/debian/android-sdk-platform-tools-common.install	2021-09-07 21:14:43.0 +0200
+++ android-sdk-meta-28.0.2+10+nmu1/debian/android-sdk-platform-tools-common.install	2024-05-29 00:55:22.0 +0200
@@ -1,3 +1,3 @@
-51-android.rules lib/udev/rules.d
+51-android.rules usr/lib/udev/rules.d
 debian/android-sdk.metainfo.xml  usr/share/metainfo
 platform-tools/* usr/lib/android-sdk/platform-tools
diff -Nru android-sdk-meta-28.0.2+10/debian/changelog android-sdk-meta-28.0.2+10+nmu1/debian/changelog
--- android-sdk-meta-28.0.2+10/debian/changelog	2024-03-15 12:39:18.0 +0100
+++ android-sdk-meta-28.0.2+10+nmu1/debian/changelog	2024-05-29 00:55:25.0 +0200
@@ -1,3 +1,12 @@
+android-sdk-meta (28.0.2+10+nmu1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+
+  [ Michael Biebl ]
+  * Install udev rules into /usr. (Closes: #1064430, #1057743)
+
+ -- Chris Hofstaedtler   Wed, 29 May 2024 00:55:25 +0200
+
 android-sdk-meta (28.0.2+10) unstable; urgency=medium
 
   [ Alessandro Sangiorgi ]


Bug#1064316: rtkit: diff for NMU version 0.13-5.1

2024-05-28 Thread Chris Hofstaedtler
Control: tags 1064316 + patch
Control: tags 1064316 + pending

Dear maintainer,

I've prepared an NMU for rtkit (versioned as 0.13-5.1) and
uploaded it to DELAYED/10. Please feel free to tell me if I
should delay it longer.

Chris

diff -Nru rtkit-0.13/debian/changelog rtkit-0.13/debian/changelog
--- rtkit-0.13/debian/changelog	2023-02-27 00:08:26.0 +0100
+++ rtkit-0.13/debian/changelog	2024-05-29 00:50:40.0 +0200
@@ -1,3 +1,12 @@
+rtkit (0.13-5.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+
+  [ Michael Biebl ]
+  * Install systemd units into /usr. (Closes: #1064316)
+
+ -- Chris Hofstaedtler   Wed, 29 May 2024 00:50:40 +0200
+
 rtkit (0.13-5) unstable; urgency=medium
 
   * Team upload
diff -Nru rtkit-0.13/debian/rules rtkit-0.13/debian/rules
--- rtkit-0.13/debian/rules	2023-02-27 00:07:20.0 +0100
+++ rtkit-0.13/debian/rules	2024-05-29 00:50:39.0 +0200
@@ -13,7 +13,7 @@
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
-		-Dsystemd_systemunitdir=/lib/systemd/system \
+		-Dsystemd_systemunitdir=/usr/lib/systemd/system \
 		-Dlibsystemd=enabled \
 		-Dinstalled_tests=true \
 


Bug#1072094: ruby-pgplot: please make the build reproducible

2024-05-28 Thread Chris Lamb
Source: ruby-pgplot
Version: 0.2.0-4
Severity: wishlist
Tags: patch
User: reproducible-bui...@lists.alioth.debian.org
Usertags: timestamps
X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org

Hi,

Whilst working on the Reproducible Builds effort [0], we noticed that
ruby-pgplot could not be built reproducibly.

The previous patch was not sufficient as we (apparently) can't
guarantee the mtime of the files in the build directory. A patch is
attached (that patches the existing patch!) that more reliably uses
SOURCE_DATE_EPOCH if its available.

 [0] https://reproducible-builds.org/


Regards,

-- 
  ,''`.
 : :'  : Chris Lamb
 `. `'`  la...@debian.org / chris-lamb.co.uk
   `-

--- a/debian/patches/0001-make-the-build-reproducible.patch 2024-05-28 
12:29:06.077839737 +0100
--- b/debian/patches/0001-make-the-build-reproducible.patch 2024-05-28 
12:33:57.999806104 +0100
@@ -7,16 +7,19 @@
  doc/myrd2html.rb | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/doc/myrd2html.rb b/doc/myrd2html.rb
-index 134dc39..a259103 100644
 a/doc/myrd2html.rb
-+++ b/doc/myrd2html.rb
-@@ -13,7 +13,7 @@ while /^--/ =~ ARGV[0]
+--- ruby-pgplot-0.2.0.orig/doc/myrd2html.rb
 ruby-pgplot-0.2.0/doc/myrd2html.rb
+@@ -13,7 +13,12 @@ while /^--/ =~ ARGV[0]
  end
  
  rdfile = ARGV.shift
 -$date = File.mtime(rdfile).strftime("%b %d %Y")
-+$date = File.mtime(rdfile).utc.strftime("%b %d %Y ")
++if ENV['SOURCE_DATE_EPOCH'].nil?
++  build_date = Time.now
++else
++  build_date = Time.at(ENV['SOURCE_DATE_EPOCH'].to_i).gmtime
++end
++$date = build_date.utc.strftime("%b %d %Y ")
  
  case $lang
  when 'ja'
--- a/doc/myrd2html.rb  2024-05-28 12:29:06.077839737 +0100
--- b/doc/myrd2html.rb  2024-05-28 12:32:04.0 +0100
@@ -13,7 +13,7 @@
 end
 
 rdfile = ARGV.shift
-$date = File.mtime(rdfile).utc.strftime("%b %d %Y ")
+$date = File.mtime(rdfile).strftime("%b %d %Y")
 
 case $lang
 when 'ja'


Bug#1072093: python-tld: ships test coverage directly under /usr/lib/python3/dist-packages/

2024-05-28 Thread Chris Lamb
Source: python-tld
Version: 0.11.11-4
Severity: normal
User: reproducible-bui...@lists.alioth.debian.org
Usertags: timestamps
X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org

Hi,

Whilst working on the Reproducible Builds effort [0], we noticed that
python-tld could not be built reproducibly. This was because it ships
test coverage information directly under /usr/lib/python3/dist-packages
(which, in turn, contain various timetamps that led to it being detected
in this way).

I'm not sure it is valuable to ship the test coverage to begin with, but
at the very least it probably not be shipped in that shared Python
directory.

  [0] https://reproducible-builds.org/


Regards,

-- 
  ,''`.
 : :'  : Chris Lamb
 `. `'`  la...@debian.org / chris-lamb.co.uk
   `-


Bug#1072085: FTBFS: PermissionError: [Errno 13] Permission denied: '/dev/stdout'

2024-05-28 Thread Chris Hofstaedtler
Source: supervisor
Version: 4.2.5-1
Severity: serious
Tags: ftbfs
X-Debbugs-Cc: z...@debian.org

Dear Maintainer,

your package fails to build from source, see below and the attached
build log.

This build was done in sbuild with unshare backend. As this is now a
configuration used by the buildds, people consider such problems to be
release-critical.

Chris

==
ERROR: test_ctor_with_dev_stdout 
(supervisor.tests.test_loggers.StdoutTests.test_ctor_with_dev_stdout)
--
Traceback (most recent call last):
  File "/<>/supervisor/tests/test_loggers.py", line 232, in 
test_ctor_with_dev_stdout
handler = self._makeOne('/dev/stdout')
  
  File "/<>/supervisor/tests/test_loggers.py", line 37, in _makeOne
return klass(*arg, **kw)
   ^
  File "/<>/supervisor/loggers.py", line 160, in __init__
self.stream = open(filename, mode)
  
PermissionError: [Errno 13] Permission denied: '/dev/stdout'

--
Ran 1369 tests in 9.365s

FAILED (errors=1)
Test failed: 
error: Test failed: 
E: pybuild pybuild:389: test: plugin distutils failed with: exit code=1: 
python3.11 setup.py test
dh_auto_test: error: pybuild --test -i python{version} -p "3.12 3.11" returned 
exit code 13
make: *** [debian/rules:4: binary] Error 25
dpkg-buildpackage: error: debian/rules binary subprocess returned exit status 2


supervisor_4.2.5-1_arm64.build.gz
Description: application/gzip


Bug#1072083: neutron-taas-openvswitch-agent: upload required to move systemd units

2024-05-28 Thread Chris Hofstaedtler
Package: neutron-taas-openvswitch-agent
Version: 12.0.0-1
User: helm...@debian.org
Usertag: dep17m2
Severity: important

Hello,

your package installs systemd units using debhelper. To pick up
changes in debhelper in your Architecture: all package, a new upload
is required.

This will move the units into /usr/lib (from /lib).

Please upload before the trixie transition freeze. If for some
reason you cannot (package is obsolete, etc), please remove your
package from trixie before the transition freeze.

Thanks,
Chris



Bug#1072082: irker: Installs files into /usr-aliased location

2024-05-28 Thread Chris Hofstaedtler
Package: irker
Version: 2.23+dfsg-1
Severity: important
User: helm...@debian.org
Usertags: dep17m2
X-Debbugs-CC: Neil Muller 

Hi,

your package installs the following file:
/lib/systemd/system/irkerd.service

It appears rebuilding your package completely loses the file.

To finalize UsrMerge this must be installed into /usr/lib/...
instead. Please move at your earliest convenience for trixie.
Latest until the transition freeze.

Additional info can be found on the wiki:
https://wiki.debian.org/UsrMerge

As a stop-gap until forky you can also use dh-sequence-movetousr.

Chris



Bug#1072081: dahdi-linux: upload required to move udev rules

2024-05-28 Thread Chris Hofstaedtler
Package: dahdi-linux
Version: 1:3.1.0+git20230717~dfsg-5
User: helm...@debian.org
Usertag: dep17m2
Severity: important

Hello,

your package installs udev rules using debhelper. To pick up
changes in debhelper in your Architecture: all package, a new upload
is required.

This will move the files into /usr/lib (from /lib).

Please upload before the trixie transition freeze. If for some
reason you cannot (package is obsolete, etc), please remove your
package from trixie before the transition freeze.

Thanks,
Chris



Bug#1072080: murano-agent: upload required to move systemd units

2024-05-28 Thread Chris Hofstaedtler
Package: murano-agent
Version: 1:12.0.0-1
User: helm...@debian.org
Usertag: dep17m2
Severity: important

Hello,

your package installs systemd units using debhelper. To pick up
changes in debhelper in your Architecture: all package, a new upload
is required.

This will move the units into /usr/lib (from /lib).

Please upload before the trixie transition freeze. If for some
reason you cannot (package is obsolete, etc), please remove your
package from trixie before the transition freeze.

Thanks,
Chris



Bug#1072079: containerd: upload required to move systemd units

2024-05-28 Thread Chris Hofstaedtler
Package: containerd
Version: 1.6.24~ds1-1
User: helm...@debian.org
Usertag: dep17m2
Severity: important
X-Debbugs-CC: z...@debian.org

Hello,

your package installs systemd units using debhelper. To pick up
changes in debhelper in your Architecture: all package, a new upload
is required.

This will move the units into /usr/lib (from /lib).

Please upload before the trixie transition freeze. If for some
reason you cannot (package is obsolete, etc), please remove your
package from trixie before the transition freeze.

Thanks,
Chris



Bug#1072078: kafs-client: upload required to move systemd units

2024-05-28 Thread Chris Hofstaedtler
Package: kafs-client
Version: 0.5-4
User: helm...@debian.org
Usertag: dep17m2
Severity: important
X-Debbugs-CC: r...@debian.org

Hello,

your package installs systemd units using debhelper. To pick up
changes in debhelper in your Architecture: all package, a new upload
is required.

This will move the units into /usr/lib (from /lib).

Please upload before the trixie transition freeze. If for some
reason you cannot (package is obsolete, etc), please remove your
package from trixie before the transition freeze.

Thanks,
Chris



Bug#1072077: mailman3: upload required to move systemd units

2024-05-28 Thread Chris Hofstaedtler
Package: mailman3
Version: 3.3.8-3.1
User: helm...@debian.org
Usertag: dep17m2
Severity: important
X-Debbugs-CC: p...@debian.org

Hello,

your package installs systemd units using debhelper. To pick up
changes in debhelper in your Architecture: all package, a new upload
is required.

This will move the units into /usr/lib (from /lib).

Please upload before the trixie transition freeze. If for some
reason you cannot (package is obsolete, etc), please remove your
package from trixie before the transition freeze.

Thanks,
Chris



Bug#1072076: supervisor: upload required to move systemd units

2024-05-28 Thread Chris Hofstaedtler
Package: supervisor
Version: 4.2.5-1
User: helm...@debian.org
Usertag: dep17m2
Severity: important
X-Debbugs-CC: Samuel Henrique 

Hello,

your package installs systemd units using debhelper. To pick up
changes in debhelper in your Architecture: all package, a new upload
is required.

This will move the units into /usr/lib (from /lib).

Please upload before the trixie transition freeze. If for some
reason you cannot (package is obsolete, etc), please remove your
package from trixie before the transition freeze.

Thanks,
Chris



Bug#1072075: request-tracker4: upload required to move systemd units

2024-05-28 Thread Chris Hofstaedtler
Package: request-tracker4
Version: 4.4.7+dfsg-1
User: helm...@debian.org
Usertag: dep17m2
Severity: important

Hello,

your package installs systemd units using debhelper. To pick up
changes in debhelper in your Architecture: all package, a new upload
is required.

This will move the units into /usr/lib (from /lib).

Please upload before the trixie transition freeze. If for some
reason you cannot (package is obsolete, etc), please remove your
package from trixie before the transition freeze.

Thanks,
Chris



Bug#1071983: netctl: puts .service files into /

2024-05-26 Thread Chris Hofstaedtler
Source: netctl
Version: 1.28-1
Severity: serious
Justification: FHS violation

Rebuilding your package in current unstable leads to .service files
being installed into /:

-rw-r--r-- root/root   512 2023-08-06 22:20 ./netctl-auto@.service
-rw-r--r-- root/root   445 2023-08-06 22:20 ./netctl-ifplugd@.service
-rw-r--r-- root/root   284 2023-08-06 22:20 ./netctl-sleep.service
-rw-r--r-- root/root   289 2023-08-06 22:20 ./netctl-wait-online.service
-rw-r--r-- root/root   260 2023-08-06 22:20 ./netctl.service
-rw-r--r-- root/root   316 2023-08-06 22:20 ./netctl@.service

Please investigate and fix this for trixie.

Chris



netctl_1.28-1_arm64-2024-05.build.gz
Description: application/gunzip


Bug#1071982: FTBFS: help2man fails

2024-05-26 Thread Chris Hofstaedtler
Source: jupyterhub
Version: 3.0.0+ds1-1
Severity: serious
Tags: ftbfs
X-Debbugs-Cc: z...@debian.org

Your package currently fails to build, see below and the attached build
log:

PYTHONPATH=debian/jupyterhub/usr/lib/python3.11/dist-packages help2man 
--output=jupyterhub-singleuser.1 --name="Single-user server for Jupyter 
notebooks" --version-string=$(dpkg-parsechangelog -S Version | sed s/-[^-]*$//) 
debian/jupyterhub/usr/bin/j
upyterhub-singleuser
help2man: can't get `--help' info from 
debian/jupyterhub/usr/bin/jupyterhub-singleuser
Try `--no-discard-stderr' if option outputs to stderr
make[1]: *** [debian/rules:14: override_dh_auto_install] Error 1



Bug#1071923: RM: maradns -- RoQA; extremely outdated in Debian; missed bookworm

2024-05-25 Thread Chris Hofstaedtler
Package: ftp.debian.org
Severity: normal
User: ftp.debian@packages.debian.org
Usertags: remove
Control: affects -1 src:maradns

Hi,

please remove maradns. It hasn't seen a maintainer upload since 2015,
and is seriously behind upstream. Given this is an Internet-facing
daemon, we shouldn't ship such an old version.

Didn't make it into bookworm, too.

Chris



Bug#1058772: btrbk: diff for NMU version 0.32.5-1.1

2024-05-25 Thread Chris Hofstaedtler
Control: tags 1058772 + patch
Control: tags 1058772 + pending


Dear maintainer,

I've prepared an NMU for btrbk (versioned as 0.32.5-1.1) and
uploaded it to DELAYED/10. Please feel free to tell me if I
should delay it longer.

Chris

diff -Nru btrbk-0.32.5/debian/changelog btrbk-0.32.5/debian/changelog
--- btrbk-0.32.5/debian/changelog	2022-11-05 10:44:49.0 +0100
+++ btrbk-0.32.5/debian/changelog	2024-05-25 23:46:17.0 +0200
@@ -1,3 +1,10 @@
+btrbk (0.32.5-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Let debhelper place systemd units. (Closes: #1058772)
+
+ -- Chris Hofstaedtler   Sat, 25 May 2024 23:46:17 +0200
+
 btrbk (0.32.5-1) unstable; urgency=medium
 
   * New Upstream Release
diff -Nru btrbk-0.32.5/debian/rules btrbk-0.32.5/debian/rules
--- btrbk-0.32.5/debian/rules	2022-11-05 10:44:49.0 +0100
+++ btrbk-0.32.5/debian/rules	2024-05-25 23:46:13.0 +0200
@@ -15,6 +15,13 @@
 override_dh_auto_configure:
 	dh_auto_configure
 	sed -i \
-	  -e 's/^SYSTEMDDIR\s*=.*/SYSTEMDDIR = \/lib\/systemd\/system/' \
 	  -e 's/ChangeLog//' \
 	  Makefile
+
+execute_after_dh_auto_install:
+	# Let dh place btrbk.service and btrbk.timer.
+	mv debian/btrbk/usr/lib/systemd/system/* debian/
+	rmdir debian/btrbk/usr/lib/systemd/system debian/btrbk/usr/lib/systemd
+
+execute_after_dh_auto_clean:
+	rm -f debian/btrbk.service debian/btrbk.timer


Bug#1057818: libirecovery: diff for NMU version 1.0.0-5.1

2024-05-25 Thread Chris Hofstaedtler
Control: tags 1057818 + patch
Control: tags 1057818 + pending

Dear maintainer,

I've prepared an NMU for libirecovery (versioned as 1.0.0-5.1) and
uploaded it to DELAYED/10. Please feel free to tell me if I
should delay it longer.

Chris

diff -Nru libirecovery-1.0.0/debian/changelog libirecovery-1.0.0/debian/changelog
--- libirecovery-1.0.0/debian/changelog	2020-10-22 18:02:40.0 +0200
+++ libirecovery-1.0.0/debian/changelog	2024-05-25 23:43:12.0 +0200
@@ -1,3 +1,12 @@
+libirecovery (1.0.0-5.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Delegate placement of udev files to pkg-config data (Closes: #1057818)
+  * Use dh compat 13 (from 12), for substitutions in .install files
+  * Switch from pkg-config (obsolete) to pkgconf
+
+ -- Chris Hofstaedtler   Sat, 25 May 2024 23:43:12 +0200
+
 libirecovery (1.0.0-5) unstable; urgency=medium
 
   * d/rules: force udev rules dir to prevent usrmerge discrepancy
diff -Nru libirecovery-1.0.0/debian/control libirecovery-1.0.0/debian/control
--- libirecovery-1.0.0/debian/control	2020-10-22 18:02:40.0 +0200
+++ libirecovery-1.0.0/debian/control	2024-05-25 23:43:12.0 +0200
@@ -5,10 +5,11 @@
 Uploaders: Yves-Alexis Perez 
 Standards-Version: 4.5.0
 Build-Depends: autoconf-archive,
-   debhelper-compat (= 12),
+   debhelper-compat (= 13),
libreadline-dev,
libusb-1.0-0-dev,
-   pkg-config
+   pkgconf,
+   systemd-dev
 Homepage: https://www.libimobiledevice.org/
 Vcs-Git: https://salsa.debian.org/imobiledevice-team/libirecovery.git
 Vcs-Browser: https://salsa.debian.org/imobiledevice-team/libirecovery
diff -Nru libirecovery-1.0.0/debian/libirecovery-common.install libirecovery-1.0.0/debian/libirecovery-common.install
--- libirecovery-1.0.0/debian/libirecovery-common.install	2020-10-22 18:02:40.0 +0200
+++ libirecovery-1.0.0/debian/libirecovery-common.install	2024-05-25 23:43:09.0 +0200
@@ -1,2 +1,2 @@
 debian/org.libimobiledevice.libirecovery.metainfo.xml /usr/share/metainfo/
-lib/udev/rules.d/39-libirecovery.rules
+${env:deb_udevdir}/rules.d/39-libirecovery.rules
diff -Nru libirecovery-1.0.0/debian/rules libirecovery-1.0.0/debian/rules
--- libirecovery-1.0.0/debian/rules	2020-10-22 18:02:40.0 +0200
+++ libirecovery-1.0.0/debian/rules	2024-05-25 23:43:09.0 +0200
@@ -2,13 +2,13 @@
 
 export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed -Wl,-O1 -Wl,-z,defs
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
+export deb_udevdir = $(shell pkg-config --variable=udevdir udev | sed s,^/,,)
 
 %:
 	dh $@
 
 override_dh_auto_configure:
-	dh_auto_configure -- --with-udevrule="TAG+=\"uaccess\"" \
-		--with-udevrulesdir=/lib/udev/rules.d
+	dh_auto_configure -- --with-udevrule="TAG+=\"uaccess\""
 
 override_dh_missing:
 	dh_missing --fail-missing


Bug#1061352: libpam-krb5: diff for NMU version 4.11-1.1

2024-05-25 Thread Chris Hofstaedtler
Control: tags 1061352 + patch
Control: tags 1061352 + pending

Dear maintainer,

I've prepared an NMU for libpam-krb5 (versioned as 4.11-1.1) and
uploaded it to DELAYED/10. Please feel free to tell me if I
should delay it longer.

Chris

diff -Nru libpam-krb5-4.11/debian/changelog libpam-krb5-4.11/debian/changelog
--- libpam-krb5-4.11/debian/changelog	2021-10-18 00:49:06.0 +0200
+++ libpam-krb5-4.11/debian/changelog	2024-05-25 23:38:28.0 +0200
@@ -1,3 +1,12 @@
+libpam-krb5 (4.11-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+
+  [ Michael Biebl ]
+  * Install PAM modules into /usr. (Closes: #1061352)
+
+ -- Chris Hofstaedtler   Sat, 25 May 2024 23:38:28 +0200
+
 libpam-krb5 (4.11-1) unstable; urgency=medium
 
   * Upload to unstable.
diff -Nru libpam-krb5-4.11/debian/rules libpam-krb5-4.11/debian/rules
--- libpam-krb5-4.11/debian/rules	2021-10-18 00:49:06.0 +0200
+++ libpam-krb5-4.11/debian/rules	2024-05-25 23:38:19.0 +0200
@@ -17,13 +17,13 @@
 override_dh_auto_configure:
 	mkdir build-mit build-heimdal
 	dh_auto_configure -Bbuild-mit --   \
-	--enable-reduced-depends --libdir=/lib/$(DEB_HOST_MULTIARCH)   \
+	--enable-reduced-depends --libdir=/usr/lib/$(DEB_HOST_MULTIARCH)   \
 	--with-krb5-include=/usr/include/mit-krb5			   \
 	--with-krb5-lib=/usr/lib/$(DEB_HOST_MULTIARCH)/mit-krb5	   \
 	--with-kadm-client-include=/usr/include/mit-krb5		   \
 	--with-kadm-client-lib=/usr/lib/$(DEB_HOST_MULTIARCH)/mit-krb5
 	dh_auto_configure -Bbuild-heimdal --  \
-	--enable-reduced-depends --libdir=/lib/$(DEB_HOST_MULTIARCH)  \
+	--enable-reduced-depends --libdir=/usr/lib/$(DEB_HOST_MULTIARCH)  \
 	--with-krb5-include=/usr/include/heimdal			  \
 	--with-krb5-lib=/usr/lib/$(DEB_HOST_MULTIARCH)/heimdal	  \
 	--with-kadm-client-include=/usr/include/heimdal		  \
@@ -40,8 +40,8 @@
 override_dh_auto_install:
 	dh_auto_install -Bbuild-mit --destdir=debian/libpam-krb5
 	dh_auto_install -Bbuild-heimdal --destdir=debian/libpam-heimdal
-	rm debian/libpam-*/lib/*/security/*.la
-	chmod 644 debian/libpam-*/lib/*/security/*.so
+	rm debian/libpam-*/usr/lib/*/security/*.la
+	chmod 644 debian/libpam-*/usr/lib/*/security/*.so
 	install -d debian/libpam-krb5/usr/share/pam-configs
 	install -d debian/libpam-heimdal/usr/share/pam-configs
 	install -m 644 debian/pam-auth-update \


Bug#1071918: openscap-daemon: Installs files into /usr-aliased location

2024-05-25 Thread Chris Hofstaedtler
Package: openscap-daemon
Version: 0.1.10-3.1
Severity: important
User: helm...@debian.org
Usertags: dep17m2

Hi,

your package installs the following file:
/lib/systemd/system/oscapd.service

To finalize UsrMerge this must be installed into /usr/lib/...
instead. Please move at your earliest convenience for trixie.

Additional info can be found on the wiki:
https://wiki.debian.org/UsrMerge

As a stop-gap until forky you can also use dh-sequence-movetousr.

Chris



Bug#1071916: nfs-ganesha: Installs files into /usr-aliased location

2024-05-25 Thread Chris Hofstaedtler
Package: nfs-ganesha
Version: 4.3-10
Severity: important
User: helm...@debian.org
Usertags: dep17m2

Hi,

your package installs the following file:
/lib/systemd/system/nfs-ganesha-config.service
/lib/systemd/system/nfs-ganesha-lock.service
/lib/systemd/system/nfs-ganesha.service

To finalize UsrMerge this must be installed into /usr/lib/...
instead. Please move at your earliest convenience for trixie.

Additional info can be found on the wiki:
https://wiki.debian.org/UsrMerge

As a stop-gap until forky you can also use dh-sequence-movetousr.

Chris



Bug#1063571: libpcre3: move libraries to /usr (DEP17)

2024-05-25 Thread Chris Hofstaedtler
Hi Matthew,

On Fri, Feb 09, 2024 at 04:23:27PM +0100, Helmut Grohne wrote:
> Package: libpcre3
[..]
> we want to finalize the /usr-merge transition by moving all aliased
> files from / to /usr via DEP17 to avoid any negative effects arising
> from aliasing. libpcre3 is involved, because installs a shared library
> below /lib.
[..]

Are you going to remove libpcre3 from trixie? If not, do you want an
NMU for this or are you going to upload it soon?

Best,
Chris



Bug#1064237: netscript-2.4: move aliased files from / to /usr (DEP17)

2024-05-25 Thread Chris Hofstaedtler
Dear Maintainer,

On Sun, Feb 18, 2024 at 12:08:44PM +0100, Helmut Grohne wrote:
> Package: netscript-2.4,netstcript-ipfilter
> 
> We want to finalize the /usr-merge transition via DEP17 by moving all
> aliased files [..]

I've prepared an NMU (5.5.5+nmu2) and uploaded to DELAYED/10.
Feel free to fix this bug yourself before that.

Best,
Chris



Bug#1071909: zsnapd: Installs files into /usr-aliased location

2024-05-25 Thread Chris Hofstaedtler
Package: zsnapd
Version: 0.8.12-1
Severity: important
User: helm...@debian.org
Usertags: dep17m2

Hi,

your package installs the following file:
  /lib/systemd/system/zsnapd.service

To finalize UsrMerge this must be installed into /usr/lib/...
instead. Please move at your earliest convenience for trixie.

Additional info can be found on the wiki:
https://wiki.debian.org/UsrMerge

As a stop-gap until forky you can also use dh-sequence-movetousr.

Chris



Bug#1071908: wsdd-server: Installs files into /usr-aliased location

2024-05-25 Thread Chris Hofstaedtler
Package: wsdd-server
Version: 2:0.7.1-5
Severity: important
User: helm...@debian.org
Usertags: dep17m2

Hi,

your package installs the following file:
  /lib/systemd/system/wsdd-server.service

To finalize UsrMerge this must be installed into /usr/lib/...
instead. Please move at your earliest convenience for trixie.

Additional info can be found on the wiki:
https://wiki.debian.org/UsrMerge

As a stop-gap until forky you can also use dh-sequence-movetousr.

Chris



Bug#1064315: alsa-topology-conf: install firmware files into /usr

2024-05-25 Thread Chris Hofstaedtler
On Sun, Feb 18, 2024 at 08:57:22AM +0100, Michael Biebl wrote:
> Source: alsa-topology-conf
> Version: 1.2.5.1-2
[..]
> We want to finalize the /usr-merge via DEP17 by moving all files to
> /usr. alsa-topology-conf installs files into /lib; these should be moved
> into the respective canonical locations in /usr/.
> 
> Please find a patch attached. It has been build-tested.

I've prepared an NMU (1.2.5.1-2.1) and uploaded to DELAYED/10.
Feel free to fix this bug yourself before that.

Best,
Chris



Bug#1054086: lsm: let dh_installsystemd choose the location of units

2024-05-25 Thread Chris Hofstaedtler
Dear Maintainer,

On Mon, Oct 16, 2023 at 08:11:55PM +0200, Helmut Grohne wrote:
> Source: lsm
> Version: 1.0.4-2

I've prepared an NMU and uploaded to DELAYED/7. It is time to get
this done.

Feel free to fix this bug yourself before this time.

Best,
Chris



Bug#1071904: RM: wuzzah -- RoQA; unmaintained upstream and in Debian; FTBFS

2024-05-25 Thread Chris Hofstaedtler
Package: ftp.debian.org
Severity: normal
User: ftp.debian@packages.debian.org
Usertags: remove
X-Debbugs-Cc: wuz...@packages.debian.org
Control: affects -1 + src:wuzzah
Control: tags -1 + moreinfo

wuzzah has recently started FTBFSing. It also has not seen any upstream
activity since 2003 (no typo), and the last maintainer upload to Debian
was in 2014.
Popcon data suggests this package is very unpopular.

I'm also expecting it to become a problem when new utmp interfaces will
be introduced soon.

I'm filing this tagged moreinfo for now, and will untag in a month if
nobody wants to take over the package until then.

Chris



Bug#1064887: dash: move files to /usr for DEP17

2024-05-25 Thread Chris Hofstaedtler
On Tue, Feb 27, 2024 at 11:22:18AM +0100, Helmut Grohne wrote:
> Source: dash
> Version: 0.5.12-6
> Tags: patch moreinfo
> 
> Do not upload this patch to unstable yet!
[..]
> I'm happy to have it reviewed already and don't have a
> concrete date for uploading yet, because we need to wait for time64 to
> complete first.
[..]

time64 is "done"; has the time arrived for this patch?

Chris



Bug#1059365: mergerfs: install files into /usr (instead of /)

2024-05-24 Thread Chris Hofstaedtler
On Sat, Dec 23, 2023 at 07:24:15PM +0100, Chris Hofstaedtler wrote:
> Your package installs files directly into /. For the ongoing Debian UsrMerge
> effort [1] these files should move to /usr in the trixie cycle.
> 
> I'm attaching a patch to implement such a move.

I've rebased and uploaded to DELAYED/10.

Please feel free to upload a fix yourself before that.

Best,
Chris



Bug#1060356: signify-openbsd: install into /usr (DEP17)

2024-05-24 Thread Chris Hofstaedtler
On Tue, Jan 09, 2024 at 11:27:10PM +0100, Chris Hofstaedtler wrote:
> Please find a relatively trivial patch attached to install into
> /usr, for the currently ongoing UsrMerge effort [1].

Rebased and uploaded to DELAYED/10.

Feel free to upload yourself first.

Best,
Chris



Bug#1071749: bidentd: Cannot work with current kernels - remove?

2024-05-24 Thread Chris Hofstaedtler
Source: bidentd
Version: 1.1.4-1.2
Severity: serious

Inspection of the source reveals bidentd uses /proc/net/ip_conntrack
and/or /proc/net_ip_masquerade to identify connections.
These files have long been removed from Linux.

I believe bidentd thus cannot work at all and propose its removal.

I'm filing with sev: serious, because it's been a really really long
time already since when bidentd could have become useful, and IMO we
should not have it in trixie.

Chris



  1   2   3   4   5   6   7   8   9   10   >