[Pkg-privacy-maintainers] Bug#1126619: trixie-pu: package torsocks/2.5.0-1+deb13+1

[Hefee]

Package: release.debian.org
Severity: normal
Tags: trixie
X-Debbugs-Cc: torsocks at packages.debian.org, team at security.debian.org, hefee at debian.org
Control: affects -1 + src:torsocks
User: release.debian.org at packages.debian.org
Usertags: pu

Hey,

currently I'm not 100% sure, if this should handled via security-team or
via pu. I think both issues are really bad for users and they really should get a fix.
But on the other side, it is only about i386 and installation.

That's why I send this to both teams.

#1126559 - libtorsocks on i386 doesn't work at all. In the
  end the users think they are  use tor, but they will be using the normal
  internet.

#1125775 - in order to get torsocks working, the ld.so cache needs to
  regenerate. Only installing packages from torsocks pacakge didn't
  trigger that. That is bad, but properly for mose users, the install one
  more libraray and they are save.


[ Impact ]
A broken package in i386 is really bad - sure users could update
/etc/ld.so.conf.d/torsocks-x86_64-linux-gnu.conf.

Not triggering ld.so cache is for most users not an issue, but sill it
can be very bad if the installation and usage is one script, that should
be run via Tor.


[ Tests ]
Made sure, that it builds for unstable ( not that mush delta). Looked at
it mannually to make sure, that the i386 build is fixed and that
ld.so cache generation is triggerd.

[ Risks ]
Very simply chacnges, that are hadly will trigger any new issues.

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

[ Changes ]

#1126559 - use correct envionment variable to match the correct multiarch path
  for /usr/lib/<tripplet>. Now it is the same voriable like documented
  in libtorsocks.install.

#1125775 - remove the empty override_dh_makeshlibs from d/rules. that
  makes debhelper add the ldconfig trigger.

The minimal fix for #1125775 add a new lintian warning
libtorsocks: package-has-unnecessary-activation-of-ldconfig-trigger

that's why I added lintian-overrides files. But strictly speacking, this
is not needed to fix the two issues.

The same is true for the fix in d/gbp.conf.

But I think both additional fixes are fine, as they are make it easeir for others to
understand my work. And do not add any complexity to the fix itself.

[ Other info ]

Thanks for your great work!

Regards,

hefee
-------------- next part --------------
diff -Nru torsocks-2.5.0/debian/changelog torsocks-2.5.0/debian/changelog
--- torsocks-2.5.0/debian/changelog	2025-04-09 19:27:01.000000000 +0200
+++ torsocks-2.5.0/debian/changelog	2026-01-29 17:55:23.000000000 +0100
@@ -1,3 +1,12 @@
+torsocks (2.5.0-1+deb13+1) trixie; urgency=medium
+
+  * Trigger ldconfig trigger (Closes: #1125775).
+  * Use correct environment variable (Closes: #1126559).
+  * add libtorsocks.lintian-overrides to document the need of ldconfig trigger
+    and the customized ld.so search path.
+
+ -- Sandro Knau? <hefee at debian.org>  Thu, 29 Jan 2026 17:55:23 +0100
+
 torsocks (2.5.0-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru torsocks-2.5.0/debian/gbp.conf torsocks-2.5.0/debian/gbp.conf
--- torsocks-2.5.0/debian/gbp.conf	2025-04-09 19:27:01.000000000 +0200
+++ torsocks-2.5.0/debian/gbp.conf	2026-01-29 17:50:31.000000000 +0100
@@ -1,4 +1,4 @@
 [DEFAULT]
 pristine-tar = True
-debian-branch = master
+debian-branch = debian/trixie
 upstream-branch = upstream
diff -Nru torsocks-2.5.0/debian/libtorsocks.install torsocks-2.5.0/debian/libtorsocks.install
--- torsocks-2.5.0/debian/libtorsocks.install	2025-04-09 19:27:01.000000000 +0200
+++ torsocks-2.5.0/debian/libtorsocks.install	2026-01-29 17:45:59.000000000 +0100
@@ -1,2 +1,2 @@
-etc/ld.so.conf.d/torsocks-${DEB_HOST_GNU_TYPE}.conf
+etc/ld.so.conf.d/torsocks-${DEB_HOST_MULTIARCH}.conf
 usr/lib/${DEB_HOST_MULTIARCH}/torsocks/
diff -Nru torsocks-2.5.0/debian/libtorsocks.lintian-overrides torsocks-2.5.0/debian/libtorsocks.lintian-overrides
--- torsocks-2.5.0/debian/libtorsocks.lintian-overrides	1970-01-01 01:00:00.000000000 +0100
+++ torsocks-2.5.0/debian/libtorsocks.lintian-overrides	2026-01-29 17:55:23.000000000 +0100
@@ -0,0 +1,4 @@
+# The library itself isn't placed in a public path but we need ld.so feature to find the correct library to use torsocks in multiarch environment (#902792)
+package-modifies-ld.so-search-path [etc/ld.so.conf.d/*]
+#We need ldconfig trigger (#1125775)
+package-has-unnecessary-activation-of-ldconfig-trigger
diff -Nru torsocks-2.5.0/debian/rules torsocks-2.5.0/debian/rules
--- torsocks-2.5.0/debian/rules	2025-04-09 19:27:01.000000000 +0200
+++ torsocks-2.5.0/debian/rules	2026-01-29 17:48:02.000000000 +0100
@@ -15,6 +15,4 @@
 
 execute_after_dh_auto_install:
 	mkdir -p $(DESTDIR)/etc/ld.so.conf.d
-	echo "/usr/lib/$(DEB_HOST_GNU_TYPE)/torsocks" > $(DESTDIR)/etc/ld.so.conf.d/torsocks-$(DEB_HOST_GNU_TYPE).conf
-
-override_dh_makeshlibs:
+	echo "/usr/lib/$(DEB_HOST_MULTIARCH)/torsocks" > $(DESTDIR)/etc/ld.so.conf.d/torsocks-$(DEB_HOST_MULTIARCH).conf