Bug#1062194: Bug#1065145: guacd: internal aliasing conflict on guacd.service

2024-03-03 Thread Steve Langasek
Thanks, NMU uploaded to address this regression.  Please find attached the
full NMU debdiff for time_t.

On Fri, Mar 01, 2024 at 07:50:10AM +0100, Helmut Grohne wrote:
> Package: guacd
> Version: 1.3.0-1.2
> Severity: serious
> Tags: patch
> User: helm...@debian.org
> Usertags: dep17
> X-Debbugs-Cc: vor...@debian.org
> 
> I changed dh_installsystemd to install systemd units below /usr/lib
> rather than /lib a while back. Back then, I rebuilt all possibly
> affected packages and guacd happened to FTBFS. Hence, it was ignored in
> my analysis. Now the time64 transition fixed the FTBFS and guacd
> installs both /lib/systemd/system/guacd.service and
> /usr/lib/systemd/system/guacd.service. Doing so is a policy violation
> and causes an installation failure on /usr-merged systems:
> 
> Unpacking guacd (1.3.0-1.2) ...
> dpkg: error processing archive 
> /tmp/apt-dpkg-install-JKIS2y/25-guacd_1.3.0-1.2_amd64.deb (--unpack):
>  unable to install new version of '/usr/lib/systemd/system/guacd.service': No 
> such file or directory
> 
> I'm attaching a patch fixing this issue.
> 
> Helmut

> diff --minimal -Nru guacamole-server-1.3.0/debian/changelog 
> guacamole-server-1.3.0/debian/changelog
> --- guacamole-server-1.3.0/debian/changelog   2024-02-29 07:18:24.0 
> +0100
> +++ guacamole-server-1.3.0/debian/changelog   2024-03-01 07:40:03.0 
> +0100
> @@ -1,3 +1,10 @@
> +guacamole-server (1.3.0-1.3) UNRELEASED; urgency=medium
> +
> +  * Non-maintainer upload.
> +  * Install guacd.service only once. (Closes: #-1)
> +
> + -- Helmut Grohne   Fri, 01 Mar 2024 07:40:03 +0100
> +
>  guacamole-server (1.3.0-1.2) unstable; urgency=medium
>  
>* Non-maintainer upload.
> diff --minimal -Nru guacamole-server-1.3.0/debian/guacd.install 
> guacamole-server-1.3.0/debian/guacd.install
> --- guacamole-server-1.3.0/debian/guacd.install   2022-02-07 
> 19:02:10.0 +0100
> +++ guacamole-server-1.3.0/debian/guacd.install   2024-03-01 
> 07:39:57.0 +0100
> @@ -1,4 +1,3 @@
>  bin/guacctl /usr/bin
>  /usr/sbin/guacd
>  /usr/share/man/man8/guacd.8
> -debian/guacd.service /lib/systemd/system/


-- 
Steve Langasek   Give me a lever long enough and a Free OS
Debian Developer   to set it on, and I can move the world.
Ubuntu Developer   https://www.debian.org/
slanga...@ubuntu.com vor...@debian.org
diff -Nru guacamole-server-1.3.0/debian/changelog 
guacamole-server-1.3.0/debian/changelog
--- guacamole-server-1.3.0/debian/changelog 2022-02-07 18:02:10.0 
+
+++ guacamole-server-1.3.0/debian/changelog 2024-03-03 08:10:03.0 
+
@@ -1,3 +1,18 @@
+guacamole-server (1.3.0-1.3) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Install guacd.service only once.  Thanks to
+Helmut Grohne .  Closes #1065145.
+
+ -- Steve Langasek   Sun, 03 Mar 2024 08:10:03 +
+
+guacamole-server (1.3.0-1.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.  Closes: #1062194
+
+ -- Steve Langasek   Thu, 29 Feb 2024 06:18:24 +
+
 guacamole-server (1.3.0-1.1) unstable; urgency=medium
 
   * Non-maintainer upload
diff -Nru guacamole-server-1.3.0/debian/control 
guacamole-server-1.3.0/debian/control
--- guacamole-server-1.3.0/debian/control   2022-02-07 18:02:10.0 
+
+++ guacamole-server-1.3.0/debian/control   2024-02-29 06:18:23.0 
+
@@ -3,7 +3,7 @@
 Maintainer: Debian Remote Maintainers 
 Uploaders:
  Dominik George ,
-Build-Depends:
+Build-Depends: dpkg-dev (>= 1.22.5),
  debhelper (>= 11),
  freerdp2-dev,
  libcairo-dev,
@@ -30,7 +30,7 @@
 Architecture: any
 Multi-Arch: same
 Depends:
- libguac19 (= ${binary:Version}),
+ libguac19t64 (= ${binary:Version}),
  ${misc:Depends},
 Replaces:
  libguac1-dev,
@@ -50,11 +50,11 @@
  ${misc:Depends},
  ${shlibs:Depends},
 Recommends:
- libguac-client-rdp0,
- libguac-client-ssh0,
- libguac-client-vnc0,
+ libguac-client-rdp0t64,
+ libguac-client-ssh0t64,
+ libguac-client-vnc0t64,
 Suggests:
- libguac-client-telnet0,
+ libguac-client-telnet0t64,
 Description: HTML5 web application for accessing remote desktops (proxy daemon)
  Guacamole is an HTML5 web application that provides access to a desktop
  environment using remote desktop protocols. A centralized server acts as a
@@ -70,7 +70,10 @@
  .
  This package contains the daemon binary.
 
-Package: libguac-client-rdp0
+Package: libguac-client-rdp0t64
+Provides: ${t64:Provides}
+Replaces: libguac-client-rdp0
+Breaks: libguac-client-rdp0 (<< ${source:Version})
 Section: libs
 Architecture: any
 Multi-Arch: same
@@ -97,7 +100,10 @@
  .
  This package contains protocol support for RDP backends.
 
-Package: libguac-client-ssh0
+Package: libguac-client-ssh0t64
+Provides: ${t64:Provides}
+Replaces: libguac-client-ssh0
+Breaks: libguac-client-ssh0 (<< ${source:Version})
 Section: libs
 Architecture: any
 Multi-Arch: 

Bug#1065145: guacd: internal aliasing conflict on guacd.service

2024-02-29 Thread Helmut Grohne
Package: guacd
Version: 1.3.0-1.2
Severity: serious
Tags: patch
User: helm...@debian.org
Usertags: dep17
X-Debbugs-Cc: vor...@debian.org

I changed dh_installsystemd to install systemd units below /usr/lib
rather than /lib a while back. Back then, I rebuilt all possibly
affected packages and guacd happened to FTBFS. Hence, it was ignored in
my analysis. Now the time64 transition fixed the FTBFS and guacd
installs both /lib/systemd/system/guacd.service and
/usr/lib/systemd/system/guacd.service. Doing so is a policy violation
and causes an installation failure on /usr-merged systems:

Unpacking guacd (1.3.0-1.2) ...
dpkg: error processing archive 
/tmp/apt-dpkg-install-JKIS2y/25-guacd_1.3.0-1.2_amd64.deb (--unpack):
 unable to install new version of '/usr/lib/systemd/system/guacd.service': No 
such file or directory

I'm attaching a patch fixing this issue.

Helmut
diff --minimal -Nru guacamole-server-1.3.0/debian/changelog 
guacamole-server-1.3.0/debian/changelog
--- guacamole-server-1.3.0/debian/changelog 2024-02-29 07:18:24.0 
+0100
+++ guacamole-server-1.3.0/debian/changelog 2024-03-01 07:40:03.0 
+0100
@@ -1,3 +1,10 @@
+guacamole-server (1.3.0-1.3) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Install guacd.service only once. (Closes: #-1)
+
+ -- Helmut Grohne   Fri, 01 Mar 2024 07:40:03 +0100
+
 guacamole-server (1.3.0-1.2) unstable; urgency=medium
 
   * Non-maintainer upload.
diff --minimal -Nru guacamole-server-1.3.0/debian/guacd.install 
guacamole-server-1.3.0/debian/guacd.install
--- guacamole-server-1.3.0/debian/guacd.install 2022-02-07 19:02:10.0 
+0100
+++ guacamole-server-1.3.0/debian/guacd.install 2024-03-01 07:39:57.0 
+0100
@@ -1,4 +1,3 @@
 bin/guacctl /usr/bin
 /usr/sbin/guacd
 /usr/share/man/man8/guacd.8
-debian/guacd.service /lib/systemd/system/