[X2Go-Dev] Bug#1393: sftp-server binary not found gentoo (profile 17.1)
On Wed, 19 Jun 2019 12:52:18 +0200 Mihai Moldovan wrote:
>* On 6/18/19 3:27 PM, Lars Wendler wrote:
>> IMHO you should NAK such a patch as this is definitely an issue
>> coming from our 17.1 profile's new lib directory structure.
>> If you commit the suggested patch, all 32bit 17.1 profile
>> installations will suffer from the bug our 64bit 17.1 profile
>> installations currently suffer from.
>
>Can you elaborate on that, please? I understand that there's potential
>for breakage with a compat symlink. One example would be software that
>is not correctly trimmed to using lib32 instead of lib and hence
>trying to use the wrong, 64-bit, directory at compile time, unless
>additional patching is done.
I was reading the suggested patch wrong. I thought it
replaces /usr/lib/misc with /usr/lib64/misc bit I just saw that the
latter path was rather added to the list.
>I fail to see a lot of breakage potential with the current patch I
>applied that favors lib64. Let's create a matrix:
>
> System | 32-bit OpenSSH installed | 64-bit OpenSSH installed |
> [G]ood/[B]ad
>+--+--+---
>{32}| X | -| G
>{32}| - | X| B
>(nonsense) {32}| X |
>X| B (nonsense?) {64}| X
>| -| B (nonsense) {64}|
>- | X| G {64}
>| X | X| G (nonsense?)
>{32,64} | X | -|
>G {32,64} | - | X
>| B {64,32} | X |
>-| B {64,32} | -
>| X| G {64,32} |
>X | X| G (nonsense?)
>
>The failure cases are pretty rare and mostly boil down to users
>messing up their system - for instance, why would anyone install a
>64-bit version of OpenSSH on a 32-bit non-multilib system? The only
>cases that would be bad is having a 32-bit OpenSSH version installed
>on a {64,32} multilib system or a 64-bit OpenSSH version on a {32,64}
>multilib system - i.e., when the installed OpenSSH version does *not*
>match the primary arch. These cases should be very rare and indicate a
>hosed system to begin with.
>
>Additionally, none of these failure cases are actually fatal. A 32-bit
>OpenSSH sftp-server binary should work fine on a 64-bit system. As
>long as we actually find a binary, we should be mostly good to go.
>
>
>> We changed the following directories on 64bit arches with the 17.1
>> profile:
>>
>> 17.0:
>>
>> # ls -ld /lib*
>> lrwxrwxrwx 1 root root5 May 17 10:24 /lib -> lib64
>> drwxr-xr-x 1 root root 1174 May 17 10:26 /lib32
>> drwxr-xr-x 1 root root 5078 Jun 13 18:50 /lib64
>>
>>
>> 17.1:
>>
>> # ls -ld /lib*
>> drwxr-xr-x 1 root root 1382 May 13 22:54 /lib
>> drwxr-xr-x 1 root root 5340 Jun 18 10:23 /lib64
>>
>>
>> As you can see, "lib32" became "lib" and "lib" is no longer a symlink
>> pointing to "lib64".
>
>Hmm, that's just nitpicking maybe and too late for any change now that
>the profile went on to be stable, but I don't get why lib32 was
>renamed to lib. Wouldn't it have been better to just keep lib32 and
>lib64 around (which describes both directories's purpose vividly) and
>just remove the compat symlink? Just using "lib" is ambiguous and can
>be confusing.
IIRC it was an attempt to remove the lib symlinks. Unfortunately I
haven't found the original post about why that change was introduced
anymore or why it was done this way. All I can remember is some talking
about "other distros are doing it likewise".
>
>> My suggestion is to let the Gentoo package maintainers handle this in
>> the affected x2go package's ebuild files. We have a function called
>> "get_libdir" that can be used with sed to set the correct lib dir
>> name in the affected code.
>
>I could implement a Makefile variable that is being passed down via
>CFLAGS (no sed hackery) and add it as the first option. I'd like to
>keep the fallback list, though. Not sure if that would actually be
>really useful to anyone, though.
Not necessary. If both paths are present I suppose there will be no
more regressions.
>Mihai
>
>[0] {primary arch,secondary arch}
>
Cheers
Lars
--
Lars Wendler
Gentoo package maintainer
GPG: 21CC CF02 4586 0A07 ED93 9F68 498F E765 960E 9B39
pgpXgOTPniLz6.pgp
Description: Digitale Signatur von OpenPGP
___
x2go-dev mailing list
x2go-dev@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-dev
[X2Go-Dev] Bug#1307: Build failure with qt-5.11
Package: x2goclient Version: 4.1.2.1 This happens with qt-5.11.1: x86_64-pc-linux-gnu-g++ -c -march=native -mtune=native -O2 -pipe -Wall -W -D_REENTRANT -fPIC -DCFGCLIENT -D__linux__ -DQT_NO_DEBUG -DQT_SVG_LIB -DQT_WIDGETS_LIB -DQT_X11EXTRAS_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -I. -Isrc -isystem /usr/include/qt5 -isystem /usr/include/qt5/QtSvg -isystem /usr/include/qt5/QtWidgets -isystem /usr/include/qt5/QtX11Extras -isystem /usr/include/qt5/QtGui -isystem /usr/include/qt5/QtNetwork -isystem /usr/include/qt5/QtCore -I. -isystem /usr/include/libdrm -I. -I/usr/lib64/qt5/mkspecs/linux-g++ -o printwidget.o src/printwidget.cpp src/printwidget.cpp: In constructor ‘PrintWidget::PrintWidget(QWidget*)’: src/printwidget.cpp:77:36: error: invalid use of incomplete type ‘class QButtonGroup’ QButtonGroup* bg=new QButtonGroup(); ^ In file included from /usr/include/qt5/QtWidgets/qcheckbox.h:44:0, from /usr/include/qt5/QtWidgets/QCheckBox:1, from ./ui_printwidget.h:14, from src/printwidget.h:22, from src/printwidget.cpp:18: /usr/include/qt5/QtWidgets/qabstractbutton.h:53:7: note: forward declaration of ‘class QButtonGroup’ class QButtonGroup; ^~~~ src/printwidget.cpp:78:4: error: invalid use of incomplete type ‘class QButtonGroup’ bg->addButton ( ui.rbPrint ); ^~ In file included from /usr/include/qt5/QtWidgets/qcheckbox.h:44:0, from /usr/include/qt5/QtWidgets/QCheckBox:1, from ./ui_printwidget.h:14, from src/printwidget.h:22, from src/printwidget.cpp:18: /usr/include/qt5/QtWidgets/qabstractbutton.h:53:7: note: forward declaration of ‘class QButtonGroup’ class QButtonGroup; ^~~~ src/printwidget.cpp:78:6: error: invalid use of incomplete type ‘class QButtonGroup’ bg->addButton ( ui.rbPrint ); ^ In file included from /usr/include/qt5/QtWidgets/qcheckbox.h:44:0, from /usr/include/qt5/QtWidgets/QCheckBox:1, from ./ui_printwidget.h:14, from src/printwidget.h:22, from src/printwidget.cpp:18: /usr/include/qt5/QtWidgets/qabstractbutton.h:53:7: note: forward declaration of ‘class QButtonGroup’ class QButtonGroup; ^~~~ src/printwidget.cpp:79:4: error: invalid use of incomplete type ‘class QButtonGroup’ bg->addButton ( ui.rbView ); ^~ In file included from /usr/include/qt5/QtWidgets/qcheckbox.h:44:0, from /usr/include/qt5/QtWidgets/QCheckBox:1, from ./ui_printwidget.h:14, from src/printwidget.h:22, from src/printwidget.cpp:18: /usr/include/qt5/QtWidgets/qabstractbutton.h:53:7: note: forward declaration of ‘class QButtonGroup’ class QButtonGroup; ^~~~ src/printwidget.cpp:79:6: error: invalid use of incomplete type ‘class QButtonGroup’ bg->addButton ( ui.rbView ); ^ In file included from /usr/include/qt5/QtWidgets/qcheckbox.h:44:0, from /usr/include/qt5/QtWidgets/QCheckBox:1, from ./ui_printwidget.h:14, from src/printwidget.h:22, from src/printwidget.cpp:18: /usr/include/qt5/QtWidgets/qabstractbutton.h:53:7: note: forward declaration of ‘class QButtonGroup’ class QButtonGroup; ^~~~ make: *** [Makefile:2025: printwidget.o] Error 1 -- Lars Wendler Gentoo package maintainer GPG: 21CC CF02 4586 0A07 ED93 9F68 498F E765 960E 9B39 pgpuxVsDWAJdH.pgp Description: Digitale Signatur von OpenPGP ___ x2go-dev mailing list x2go-dev@lists.x2go.org https://lists.x2go.org/listinfo/x2go-dev
[X2Go-Dev] Bug#668: [Patch] Replace echo -n with printf
Package: x2goclient
Version: git master
Hi,
at Gentoo latest version of the dash shell doesn't support echo -n
anymore[1]. The result is that x2gpath returns every path with a
prefixed -n when dash is used as /bin/sh.
Accoring to man p1 echo section APPLICATION USAGE applications
should not rely on echo -n but use printf instead.
The attached patch does exactly that.
Kind regards
Lars
[1] https://bugs.gentoo.org/528452
--
Lars Wendler
Gentoo package maintainer
GPG: 4DD8 C47C CDFA 5295 E1A6 3FC8 F696 74AB 981C A6FC
From a4766ccfe06b7bb7c445a9fd2efd0f8e2d55bbba Mon Sep 17 00:00:00 2001
From: Lars Wendler polynomia...@gentoo.org
Date: Fri, 7 Nov 2014 13:35:08 +0100
Subject: [PATCH] echo -n cannot be expected to work with every POSIX shell.
See man 1p echo section APPLICATION USAGE. This patch replaces echo -n
with printf '%s'.
Signed-off-by: Lars Wendler polynomia...@gentoo.org
---
rpm/x2goserver.init | 4 ++--
x2goserver-xsession/etc/Xsession | 4 ++--
x2goserver/bin/x2gopath | 12 ++--
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/rpm/x2goserver.init b/rpm/x2goserver.init
index a2e6619..842b17f 100644
--- a/rpm/x2goserver.init
+++ b/rpm/x2goserver.init
@@ -35,7 +35,7 @@ start() {
mkdir $XSOCKDIR
chmod 1777 $XSOCKDIR
fi
- echo -n $Starting $prog:
+ printf '%s' $Starting $prog:
daemon $exec $OPTS
retval=$?
echo
@@ -43,7 +43,7 @@ start() {
}
stop() {
- echo -n $Stopping $prog:
+ printf '%s' $Stopping $prog:
killproc $exec
retval=$?
echo
diff --git a/x2goserver-xsession/etc/Xsession b/x2goserver-xsession/etc/Xsession
index 3b85b9e..e922dfc 100755
--- a/x2goserver-xsession/etc/Xsession
+++ b/x2goserver-xsession/etc/Xsession
@@ -26,9 +26,9 @@ message_nonl () {
# pretty-print messages of arbitrary length (no trailing newline); use
# xmessage if it is available and $DISPLAY is set
MESSAGE=$PROGNAME: $*
- echo -n $MESSAGE | fold -s -w ${COLUMNS:-80} 2;
+ printf '%s' $MESSAGE | fold -s -w ${COLUMNS:-80} 2;
if [ -n $DISPLAY ] which xmessage 1 /dev/null 21; then
- echo -n $MESSAGE | fold -s -w ${COLUMNS:-80} | xmessage -center -file -
+ printf '%s' $MESSAGE | fold -s -w ${COLUMNS:-80} | xmessage -center -file -
fi
}
diff --git a/x2goserver/bin/x2gopath b/x2goserver/bin/x2gopath
index 8fb36a8..dc6b1ba 100755
--- a/x2goserver/bin/x2gopath
+++ b/x2goserver/bin/x2gopath
@@ -31,12 +31,12 @@ base=$(readlink -f $base/..);
# The following section is subject to substitution by distro packaging tools.
case $1 in
- base) echo -n $base;;
- lib) echo -n $base/lib/x2go;;
- libexec) echo -n $base/lib/x2go;;
- share) echo -n $base/share/x2go;;
- nx-x11) echo -n $base/lib/nx/X11;;
- xinerama) echo -n $base/lib/nx/X11/Xinerama;;
+ base) printf '%s' $base;;
+ lib) printf '%s' $base/lib/x2go;;
+ libexec) printf '%s' $base/lib/x2go;;
+ share) printf '%s' $base/share/x2go;;
+ nx-x11) printf '%s' $base/lib/nx/X11;;
+ xinerama) printf '%s' $base/lib/nx/X11/Xinerama;;
*) exit 1;;
esac;
--
2.1.3
pgp2JAn9pxkUe.pgp
Description: Digitale Signatur von OpenPGP
___
x2go-dev mailing list
x2go-dev@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-dev
