GNU bug report logs - #77398
[PATCH] gnu: xrdp: Update to 0.10.3, xorgxrdp: Update to 0.10.4.

Previous Next

To reply to this bug, email your comments to 77398 AT debbugs.gnu.org.
There is no need to reopen the bug first.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Andy Tai <atai <at> atai.org>
To: guix-patches <at> gnu.org
Cc: Andy Tai <atai <at> atai.org>
Subject: [PATCH] gnu: xrdp: Update to 0.10.3, xorgxrdp: Update to 0.10.4.
Date: Sun, 30 Mar 2025 21:47:13 -0700

* gnu/packages/rdesktop.scm (xrdp): Update to 0.10.3.
[inputs]: Replace fuse-2 with fuse.
* gnu/packages/rdesktop.scm (xorgxrdp): Update to 0.10.4.

Change-Id: I581b8f75c25642d054bcdf22a325b67a1c47c73e
---
 gnu/packages/rdesktop.scm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/rdesktop.scm b/gnu/packages/rdesktop.scm
index d5d49edc200..d7a105f4c27 100644
--- a/gnu/packages/rdesktop.scm
+++ b/gnu/packages/rdesktop.scm
@@ -168,7 +168,7 @@ (define-public freerdp
 (define-public xrdp
   (package
     (name "xrdp")
-    (version "0.10.1")
+    (version "0.10.3")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -176,10 +176,10 @@ (define-public xrdp
                     version "/xrdp-" version ".tar.gz"))
               (sha256
                (base32
-                "10rgc9bfharwj7bq5k4qp4x00w214h6c6f861zi301h84125ylx2"))))
+                "15nhfh8lxwf0jlmq6knh3851sp6njps9nhl8n2867il7mcr9gmsj"))))
     (build-system gnu-build-system)
     (inputs (list check
-                  fuse-2
+                  fuse
                   imlib2
                   lame
                   libjpeg-turbo
@@ -234,7 +234,7 @@ (define-public xrdp
 (define-public xorgxrdp
   (package
     (name "xorgxrdp")
-    (version "0.10.2")
+    (version "0.10.4")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -243,7 +243,7 @@ (define-public xorgxrdp
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1dcxn0v88426j4n7irhy6h3qb21202v5xs1vr7j8xvs3sxihc2f7"))))
+                "0y243h7mk9jy5yrdgngjkcr6rzq4116ip7pvc6vwz7yfnxxd9v2f"))))
     (build-system gnu-build-system)
     (inputs (list check
                   imlib2

base-commit: 8c43056aabc2d22da61dc86049b143f7ae1ef516
-- 
2.43.0

Message #8 received at 77398 <at> debbugs.gnu.org (full text, mbox):

From: Andreas Enge <andreas <at> enge.fr>
To: Andy Tai <atai <at> atai.org>
Cc: 77398 <at> debbugs.gnu.org
Subject: Re: [PATCH] gnu: xrdp: Update to 0.10.3, xorgxrdp: Update to 0.10.4.
Date: Tue, 1 Apr 2025 13:03:54 +0200

Hello Andy,

the patch fails on 32 bit according to QA:
   https://qa.guix.gnu.org/issue/77398/package-changes?i686-linux-change=broken&i686-linux-change=still-failing&i686-linux-change=unknown-to-failing&i686-linux-change=new-failing

The somewhat surprising error message in
   https://bordeaux.guix.gnu.org/build/cb17cf76-2ea0-4a1e-b19f-2f7220cc4a8a/log
is:
In file included from /gnu/store/83yp83mwzvdqn0qhr7hvs5cvizrcf76a-fuse-3.10.5/include/fuse3/fuse_lowlevel.h:25,
                 from chansrv_fuse.c:155:
/gnu/store/83yp83mwzvdqn0qhr7hvs5cvizrcf76a-fuse-3.10.5/include/fuse3/fuse_common.h:853:1: error: static assertion failed: "fuse: off_t must be 64bit"
  853 | _Static_assert(sizeof(off_t) == 8, "fuse: off_t must be 64bit");

Does this mean that fuse <at> 3 only works on 64 bit platforms?
In any case, going back to fuse <at> 2 will probably solve the problem.

Then I would suggest to write two commits for the two separate projects.

Thanks!

Andreas

Message #11 received at 77398 <at> debbugs.gnu.org (full text, mbox):

From: Andy Tai <atai <at> atai.org>
To: Andreas Enge <andreas <at> enge.fr>
Cc: 77398 <at> debbugs.gnu.org
Subject: Re: [PATCH] gnu: xrdp: Update to 0.10.3, xorgxrdp: Update to 0.10.4.
Date: Tue, 1 Apr 2025 14:40:04 -0700

[Message part 1 (text/plain, inline)]

OK I will take a look.  I think xrdp switched to fuse 3 in this release...
I need to check if 32-bit support is dropped

On Tue, Apr 1, 2025 at 4:04 AM Andreas Enge <andreas <at> enge.fr> wrote:

> Hello Andy,
>
> the patch fails on 32 bit according to QA:
>
> https://qa.guix.gnu.org/issue/77398/package-changes?i686-linux-change=broken&i686-linux-change=still-failing&i686-linux-change=unknown-to-failing&i686-linux-change=new-failing
>
> The somewhat surprising error message in
>
> https://bordeaux.guix.gnu.org/build/cb17cf76-2ea0-4a1e-b19f-2f7220cc4a8a/log
> is:
> In file included from
> /gnu/store/83yp83mwzvdqn0qhr7hvs5cvizrcf76a-fuse-3.10.5/include/fuse3/fuse_lowlevel.h:25,
>                  from chansrv_fuse.c:155:
> /gnu/store/83yp83mwzvdqn0qhr7hvs5cvizrcf76a-fuse-3.10.5/include/fuse3/fuse_common.h:853:1:
> error: static assertion failed: "fuse: off_t must be 64bit"
>   853 | _Static_assert(sizeof(off_t) == 8, "fuse: off_t must be 64bit");
>
> Does this mean that fuse <at> 3 only works on 64 bit platforms?
> In any case, going back to fuse <at> 2 will probably solve the problem.
>
> Then I would suggest to write two commits for the two separate projects.
>
> Thanks!
>
> Andreas
>
>

-- 
Andy Tai, atai <at> atai.org, Skype: licheng.tai, Line: andy_tai, WeChat:
andytai1010
Year 2025 民國114年
自動的精神力是信仰與覺悟
自動的行為力是勞動與技能

[Message part 2 (text/html, inline)]

Message #14 received at 77398 <at> debbugs.gnu.org (full text, mbox):

From: Andy Tai <atai <at> atai.org>
To: Andreas Enge <andreas <at> enge.fr>
Cc: 77398 <at> debbugs.gnu.org
Subject: Re: [PATCH] gnu: xrdp: Update to 0.10.3, xorgxrdp: Update to 0.10.4.
Date: Tue, 1 Apr 2025 22:52:23 -0700

For info, xrdp 0.10.2 moved to fuse 3 https://c-nergy.be/blog/?p=20148
so the change to fuse for input should be correct..

On Tue, Apr 1, 2025 at 2:40 PM Andy Tai <atai <at> atai.org> wrote:
>
> OK I will take a look.  I think xrdp switched to fuse 3 in this release... I need to check if 32-bit support is dropped
>
> On Tue, Apr 1, 2025 at 4:04 AM Andreas Enge <andreas <at> enge.fr> wrote:
>>
>> Hello Andy,
>>
>> the patch fails on 32 bit according to QA:
>>    https://qa.guix.gnu.org/issue/77398/package-changes?i686-linux-change=broken&i686-linux-change=still-failing&i686-linux-change=unknown-to-failing&i686-linux-change=new-failing
>>
>> The somewhat surprising error message in
>>    https://bordeaux.guix.gnu.org/build/cb17cf76-2ea0-4a1e-b19f-2f7220cc4a8a/log
>> is:
>> In file included from /gnu/store/83yp83mwzvdqn0qhr7hvs5cvizrcf76a-fuse-3.10.5/include/fuse3/fuse_lowlevel.h:25,
>>                  from chansrv_fuse.c:155:
>> /gnu/store/83yp83mwzvdqn0qhr7hvs5cvizrcf76a-fuse-3.10.5/include/fuse3/fuse_common.h:853:1: error: static assertion failed: "fuse: off_t must be 64bit"
>>   853 | _Static_assert(sizeof(off_t) == 8, "fuse: off_t must be 64bit");

Message #17 received at 77398 <at> debbugs.gnu.org (full text, mbox):

From: Andy Tai <atai <at> atai.org>
To: andreas <at> enge.fr,
	77398 <at> debbugs.gnu.org
Cc: Andy Tai <atai <at> atai.org>
Subject: [PATCH v2] gnu: xrdp: Update to 0.10.3, xorgxrdp: Update to 0.10.4.
Date: Tue,  1 Apr 2025 22:53:10 -0700

* gnu/packages/rdesktop.scm (xrdp): Update to 0.10.3.
[inputs]: Replace fuse-2 with fuse.
[arguments] <#:phases>: Add phase 'set-cflags-file-offset-bit-64
after 'unpack.
* gnu/packages/rdesktop.scm (xorgxrdp): Update to 0.10.4.

Change-Id: I581b8f75c25642d054bcdf22a325b67a1c47c73e
---
 gnu/packages/rdesktop.scm | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/rdesktop.scm b/gnu/packages/rdesktop.scm
index d5d49edc200..7eabfcbb0a6 100644
--- a/gnu/packages/rdesktop.scm
+++ b/gnu/packages/rdesktop.scm
@@ -168,7 +168,7 @@ (define-public freerdp
 (define-public xrdp
   (package
     (name "xrdp")
-    (version "0.10.1")
+    (version "0.10.3")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -176,10 +176,10 @@ (define-public xrdp
                     version "/xrdp-" version ".tar.gz"))
               (sha256
                (base32
-                "10rgc9bfharwj7bq5k4qp4x00w214h6c6f861zi301h84125ylx2"))))
+                "15nhfh8lxwf0jlmq6knh3851sp6njps9nhl8n2867il7mcr9gmsj"))))
     (build-system gnu-build-system)
     (inputs (list check
-                  fuse-2
+                  fuse
                   imlib2
                   lame
                   libjpeg-turbo
@@ -214,7 +214,13 @@ (define-public xrdp
                                      "--enable-pixman=yes"
                                      "--enable-imlib2=yes"
                                      "--enable-pam-config=unix"
-                                     "--enable-ipv6=yes")))
+                                     "--enable-ipv6=yes")
+     #:phases
+     #~(modify-phases %standard-phases
+       (add-after 'unpack 'set-cflags-file-offset-bit-64
+         (lambda _
+               (setenv "CFLAGS"
+                   "-D_FILE_OFFSET_BITS=64"))))))
     (home-page "https://www.xrdp.org")
     (synopsis "Remote Desktop Protocol (RDP) server")
     (description
@@ -234,7 +240,7 @@ (define-public xrdp
 (define-public xorgxrdp
   (package
     (name "xorgxrdp")
-    (version "0.10.2")
+    (version "0.10.4")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -243,7 +249,7 @@ (define-public xorgxrdp
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1dcxn0v88426j4n7irhy6h3qb21202v5xs1vr7j8xvs3sxihc2f7"))))
+                "0y243h7mk9jy5yrdgngjkcr6rzq4116ip7pvc6vwz7yfnxxd9v2f"))))
     (build-system gnu-build-system)
     (inputs (list check
                   imlib2

base-commit: 8c43056aabc2d22da61dc86049b143f7ae1ef516
-- 
2.43.0

Message #20 received at 77398 <at> debbugs.gnu.org (full text, mbox):

From: Andy Tai <atai <at> atai.org>
To: andreas <at> enge.fr, 77398 <at> debbugs.gnu.org
Subject: Re: [PATCH v2] gnu: xrdp: Update to 0.10.3,
 xorgxrdp: Update to 0.10.4.
Date: Wed, 2 Apr 2025 00:32:36 -0700

Hi, also the reason I sent the patch with the two packages upgraded
together because thy are closely related and released in close
matching versions.

On Tue, Apr 1, 2025 at 10:53 PM Andy Tai <atai <at> atai.org> wrote:
>
> * gnu/packages/rdesktop.scm (xrdp): Update to 0.10.3.
> [inputs]: Replace fuse-2 with fuse.
> [arguments] <#:phases>: Add phase 'set-cflags-file-offset-bit-64
> after 'unpack.
> * gnu/packages/rdesktop.scm (xorgxrdp): Update to 0.10.4.
>

Message #23 received at 77398 <at> debbugs.gnu.org (full text, mbox):

From: Andreas Enge <andreas <at> enge.fr>
To: Andy Tai <atai <at> atai.org>
Cc: 77398 <at> debbugs.gnu.org
Subject: Re: [PATCH v2] gnu: xrdp: Update to 0.10.3, xorgxrdp: Update to
 0.10.4.
Date: Wed, 2 Apr 2025 10:05:49 +0200

Hello!

Am Wed, Apr 02, 2025 at 12:32:36AM -0700 schrieb Andy Tai:
> Hi, also the reason I sent the patch with the two packages upgraded
> together because thy are closely related and released in close
> matching versions.

They can still be sent as a patch series of two different commits,
which is a bit more annoying to do with the debbugs interface, see
   https://guix.gnu.org/manual/devel/en/html_node/Sending-a-Patch-Series.html#Multiple-Patches-1
(but quite easy for a v2). Then QA handles them together.

Then they would be applied in a row with one "git push", so would also
appear together when people do a "guix pull".

Andreas

Message #26 received at 77398 <at> debbugs.gnu.org (full text, mbox):

From: Andy Tai <atai <at> atai.org>
To: andreas <at> enge.fr,
	77398 <at> debbugs.gnu.org
Cc: Andy Tai <atai <at> atai.org>
Subject: [PATCH v3 0/2] *** xrdp: Update to 0.10.3,
 xorgxrdp: Update to 0.10.4. ***
Date: Wed,  2 Apr 2025 01:19:34 -0700

*** xrdp: Update to 0.10.3, xorgxrdp: Update to 0.10.4. ***

Andy Tai (2):
  gnu: xrdp: Update to 0.10.3.
  gnu: xorgxrdp: Update to 0.10.4.

 gnu/packages/rdesktop.scm | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)


base-commit: 8c43056aabc2d22da61dc86049b143f7ae1ef516
--
2.43.0

Message #29 received at 77398 <at> debbugs.gnu.org (full text, mbox):

From: Andy Tai <atai <at> atai.org>
To: andreas <at> enge.fr,
	77398 <at> debbugs.gnu.org
Cc: Andy Tai <atai <at> atai.org>
Subject: [PATCH v3 1/2] gnu: xrdp: Update to 0.10.3.
Date: Wed,  2 Apr 2025 01:19:35 -0700

* gnu/packages/rdesktop.scm (xrdp): Update to 0.10.3.
[inputs]: Replace fuse-2 with fuse.
[arguments] <#:phases>: Add phase 'set-cflags-file-offset-bit-64
after 'unpack.

Change-Id: I86596ab0d1aee9449ae5895a1ef269a10480db46
---
 gnu/packages/rdesktop.scm | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/rdesktop.scm b/gnu/packages/rdesktop.scm
index d5d49edc200..352f5ca5e1f 100644
--- a/gnu/packages/rdesktop.scm
+++ b/gnu/packages/rdesktop.scm
@@ -168,7 +168,7 @@ (define-public freerdp
 (define-public xrdp
   (package
     (name "xrdp")
-    (version "0.10.1")
+    (version "0.10.3")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -176,10 +176,10 @@ (define-public xrdp
                     version "/xrdp-" version ".tar.gz"))
               (sha256
                (base32
-                "10rgc9bfharwj7bq5k4qp4x00w214h6c6f861zi301h84125ylx2"))))
+                "15nhfh8lxwf0jlmq6knh3851sp6njps9nhl8n2867il7mcr9gmsj"))))
     (build-system gnu-build-system)
     (inputs (list check
-                  fuse-2
+                  fuse
                   imlib2
                   lame
                   libjpeg-turbo
@@ -214,7 +214,13 @@ (define-public xrdp
                                      "--enable-pixman=yes"
                                      "--enable-imlib2=yes"
                                      "--enable-pam-config=unix"
-                                     "--enable-ipv6=yes")))
+                                     "--enable-ipv6=yes")
+     #:phases
+     #~(modify-phases %standard-phases
+       (add-after 'unpack 'set-cflags-file-offset-bit-64
+         (lambda _
+               (setenv "CFLAGS"
+                   "-D_FILE_OFFSET_BITS=64"))))))
     (home-page "https://www.xrdp.org")
     (synopsis "Remote Desktop Protocol (RDP) server")
     (description
-- 
2.43.0

Message #32 received at 77398 <at> debbugs.gnu.org (full text, mbox):

From: Andy Tai <atai <at> atai.org>
To: andreas <at> enge.fr,
	77398 <at> debbugs.gnu.org
Cc: Andy Tai <atai <at> atai.org>
Subject: [PATCH v3 2/2] gnu: xorgxrdp: Update to 0.10.4.
Date: Wed,  2 Apr 2025 01:19:36 -0700

* gnu/packages/rdesktop.scm (xorgxrdp): Update to 0.10.4.

Change-Id: I0014b8eb31be2770475bd116ee4d0c81788f7fb5
---
 gnu/packages/rdesktop.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/rdesktop.scm b/gnu/packages/rdesktop.scm
index 352f5ca5e1f..7eabfcbb0a6 100644
--- a/gnu/packages/rdesktop.scm
+++ b/gnu/packages/rdesktop.scm
@@ -240,7 +240,7 @@ (define-public xrdp
 (define-public xorgxrdp
   (package
     (name "xorgxrdp")
-    (version "0.10.2")
+    (version "0.10.4")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -249,7 +249,7 @@ (define-public xorgxrdp
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1dcxn0v88426j4n7irhy6h3qb21202v5xs1vr7j8xvs3sxihc2f7"))))
+                "0y243h7mk9jy5yrdgngjkcr6rzq4116ip7pvc6vwz7yfnxxd9v2f"))))
     (build-system gnu-build-system)
     (inputs (list check
                   imlib2
-- 
2.43.0

Message #37 received at 77398-done <at> debbugs.gnu.org (full text, mbox):

From: Andreas Enge <andreas <at> enge.fr>
To: 77398-done <at> debbugs.gnu.org
Subject: Close
Date: Wed, 2 Apr 2025 12:34:00 +0200

The CFLAGS did work, nice! I have pushed and am closing the issue.

Thanks,

Andreas

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.