From dc0471c1c87a4474d51396076ca0edead4ac1b45 Mon Sep 17 00:00:00 2001 From: Bernard Cafarelli Date: Fri, 16 Jan 2015 15:53:54 +0000 Subject: [PATCH] Fix invalid 'echo -n' usage (#528452), remove dangling symlink (#521126), both by polynomial-c. Also fix local desktop sharing Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0xC74525F2 --- net-misc/x2goserver/ChangeLog | 13 ++- net-misc/x2goserver/Manifest | 11 ++- ...r-4.0.1.18-fix_local_desktop_sharing.patch | 19 ++++ .../x2goserver-4.0.1.18-use_printf.patch | 58 ++++++++++++ .../x2goserver/x2goserver-4.0.1.18-r2.ebuild | 90 +++++++++++++++++++ 5 files changed, 185 insertions(+), 6 deletions(-) create mode 100644 net-misc/x2goserver/files/x2goserver-4.0.1.18-fix_local_desktop_sharing.patch create mode 100644 net-misc/x2goserver/files/x2goserver-4.0.1.18-use_printf.patch create mode 100644 net-misc/x2goserver/x2goserver-4.0.1.18-r2.ebuild diff --git a/net-misc/x2goserver/ChangeLog b/net-misc/x2goserver/ChangeLog index eaf39ddb9b80..9833b66a6672 100644 --- a/net-misc/x2goserver/ChangeLog +++ b/net-misc/x2goserver/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for net-misc/x2goserver -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goserver/ChangeLog,v 1.50 2014/10/23 08:35:58 voyageur Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goserver/ChangeLog,v 1.51 2015/01/16 15:53:46 voyageur Exp $ + +*x2goserver-4.0.1.18-r2 (16 Jan 2015) + + 16 Jan 2015; Bernard Cafarelli + +x2goserver-4.0.1.18-r2.ebuild, + +files/x2goserver-4.0.1.18-fix_local_desktop_sharing.patch, + +files/x2goserver-4.0.1.18-use_printf.patch: + Fix invalid 'echo -n' usage (#528452), remove dangling symlink (#521126), + both by polynomial-c. Also fix local desktop sharing *x2goserver-4.0.1.18-r1 (23 Oct 2014) diff --git a/net-misc/x2goserver/Manifest b/net-misc/x2goserver/Manifest index c81e5044a021..34a0df144b69 100644 --- a/net-misc/x2goserver/Manifest +++ b/net-misc/x2goserver/Manifest @@ -2,7 +2,9 @@ Hash: SHA256 AUX x2gocleansessions.service 198 SHA256 e06420fa5fe526c9ff616af1976840136ef174b94e8876fa6a2d32ee1d111ab8 SHA512 45f29bdaa70a91ccdd129158511f78f85b01aeb1ef874b087e3eb96000fbfc104b1c427a5ad5dab65e66624151988bb2fd75c63d4f5033b76bd19849b0986bd5 WHIRLPOOL c9485457a052188ef83aa7b15d4df69c2584ddc023248b7b7557b2d61a310f23cbae60a265e1e74c8be4a6d3a3cb54212452ff6c3905bb07e9e93389057cda71 +AUX x2goserver-4.0.1.18-fix_local_desktop_sharing.patch 751 SHA256 03c63a3e5d76d3f6ab66a35961c1e54417069c77f515600375aab739e5b28619 SHA512 4c2714327bf93c0024c2504f807e61f6df195c32a1caac68be059c5f8414c16e0c9bd20fcdcc1e563b47efd8ee18423b23d969316132073e709ed835bfde31a1 WHIRLPOOL 6f81b5d1f61a847c00c5b6cd8c417bb5a2900e8731d763f4d215917d6a8d60470cb200f26dfd1db90518cad83859d3a41aa6933669f67b76a26ec082e4b5302b AUX x2goserver-4.0.1.18-prevent_bash_failures_xsession.patch 751 SHA256 af187507fb9556889d28593460ac311ba3857b415d61a53a1db7cc6f7ccca87f SHA512 f6623186fc39d5cba0804f98d76604023edb17826d67a7e65ae534ddb450d5a442e1a1dacb09bc5e3a2a828c87a7a36cdffbba84088e5bc45fb81d902900256c WHIRLPOOL 8147ee0209ec0044a9ab8ff37f6efd631c8a1150ea372036ebd0dc8434e73f001b54b0fcac4e73c9fa09530837a22649d978db53b5d19443e87fa81d80f82d72 +AUX x2goserver-4.0.1.18-use_printf.patch 2280 SHA256 540763f2f14e10a50194c94d6dd107d2e9d88cd39f2bd491c41045af525200ed SHA512 2ee383e76ab57c002258773ebd01d3b6b6f02810dce6d4bb1e298a619eab0dd03c2a2a8395f0e68cd83bd5a74007443a85138969424f350410bd6b4dfba10980 WHIRLPOOL 434f514c12fe1ba094909926d741b820afb84bb6c60fee01fb85f3a6a79af9aa3edf281b06a96b617259f2978c1e48aae04147dc9b0adf488a6b24b24063371b AUX x2goserver.init 563 SHA256 c051f263ad2ad9b6064ce12098ad0c3d48b2a83a2c02ccd79020e0ce4be3331c SHA512 cac89ad0032b56188dc30f09bd461762934d5fadf53ccf361125dbefed3c09000b9b00684f7823424340d290c759e112e618f4d4e9d7e739c79702b70a6b3b3c WHIRLPOOL 0f134b9aed4e60f48e7089f97ca6d183387049d6f3ff44c9e8fe476acf3aa5cade1f205ac1d8c1905cacb1c58ea13e1c14545dc993f4dd59cf5a4d36c3e0a511 DIST x2goserver-4.0.1.12.tar.gz 78958 SHA256 447c5e7b47e6b2bc087731ed26c827020130cc8530ca020a03f7f3ecadc308cc SHA512 30ce6c20cf0bf67ee162cda5d0cbbfd994ac47aa140e3c4cd6118b594ed8fbf83dbc961f2323694206c705f647f32dba8a7fc7bde4ef22be2d4936642865a3d3 WHIRLPOOL 9d4887a1dd701d361311850a8e936d7f22ecf76e1b4ee78b11feca6ec25d02419221b0fb2e72c440394f81e63ffa73762b33bd58123e7bd441e32446ce40814e DIST x2goserver-4.0.1.15.tar.gz 76128 SHA256 46c0fc2303014db99b138a352a7f3df89c4f7cfabc11dc0aeea4cdc76253bdfb SHA512 ca806c39d2536e7962540733e85199fefea54e80695c6f1ca736cc1998b411524afa8d9cf29c26855fc3373105277daa4ddd69cbcd05c2bbecb01ca5172ba05c WHIRLPOOL b06ace09acf14a0b82b0b5b8f795823d7997c99a4a78bd120ecadedf3bbb8c0b6ad371e8bacf1c080e5d6b45d9760cef8c04f69b9a86a1b2dceb3ebaa450bde0 @@ -14,13 +16,14 @@ EBUILD x2goserver-4.0.1.15.ebuild 2414 SHA256 a49bcda8fa31b8903803bf92414c036f61 EBUILD x2goserver-4.0.1.16.ebuild 2425 SHA256 a70c1bd3a4544f2dd6f3985468b589573d3c2e53669c57973ff675c5feba298b SHA512 489c407d2e684772fb9ce36b2c99dd673c2a53003a557b6cafced0721e8e7b8ffbe52f9226125ab4ddad1b49101bc642e4f190231b3f0cd2c4a62709a190f936 WHIRLPOOL bc6ffd918775447ab0e29c4e082d621c6ced96ae3a9e72e43b978ba79bcd45ad9d4a6cf51c014f6fe082fb63494050cdf5e376a26f03f69325398fbfd0225962 EBUILD x2goserver-4.0.1.17.ebuild 2425 SHA256 4db3265a2c3a9f994731249444894b535ed72575d9aaeef0476aeed3527a60d9 SHA512 04648cf0d9563c80aa71f44a6047c490c70a8bc1eb9abc1452235f5343b764561cc423bcf39f230ef1d29624b6d800fd5e00726eecd8a766c5d700a91d9e17b8 WHIRLPOOL 4a44714972cca3c61c0de0cbf937ad7308979d468b8afadabe1c34b2d40c0aa859c4331bcf482d764cdc887b0ec8ecc324a71e327971029a32dfbe2e5202a07b EBUILD x2goserver-4.0.1.18-r1.ebuild 2508 SHA256 1a95ec5c10050a4785b5864c8b415c7ef3d179fcd6874df637222d7f3c4f96e9 SHA512 a681c4fa9020a1efe9cafedcc0cb2bd16b174b4a22731bec66ccda0df99806e7f5a376f5d87ab2b6405926179f7b4bc3e01466376ed79350b8f118710de39964 WHIRLPOOL d6e626d6428161499189a21c5e3b8fa1910a34cc962cc90e8b49928a32f9c1046576bebff6133f3a8c92969a0aad697e03598d49ac8824f5d86006d763df1d92 +EBUILD x2goserver-4.0.1.18-r2.ebuild 2803 SHA256 2b3fe3e2afb561c8f6d2d710759f2c5e3b69f67189f1c95d78264697021bb479 SHA512 da79076d82fe5aefda3f413c46ad5afad49e00829f82d817440644e96e84524b6a800e63f71a531f8a7ba9e8a342f7b446dfa302cbaa2d264df912ac96e41bd2 WHIRLPOOL 23be0b7a9b4153272e71d9dee625810afe7e8e460b8393f9443d2a3515cac604475540452db8936276a9392baa550f913a20f862492d7ab532f2773887927ca9 EBUILD x2goserver-4.0.1.18.ebuild 2425 SHA256 ef419bf6e15c479cdaa142832e88d90a4a7401c545a428f377cd49b83ae1608d SHA512 b55ff126b1de33c5b6acbf6a827884d589adf4f023a7cb718506e39912e3087be65c6f238a0d2a80c55f834ed50f75c066d40fc64796d6c3a345cadfb626b6ea WHIRLPOOL 96881eae44f70c407fb50563773e1787d8f89ae7dab43ba8e21af34ab4392b6c55f072d862fda311f89225e18e44b5a2fe7c25af1e9afa7c37ce749236e2a630 -MISC ChangeLog 9921 SHA256 5a49b2de7a6e2a563987ff6e039fe17e96cae73e88bb67e3540ecd38260533d1 SHA512 65cfbf1b84ba541c2672d25104154be9f995e199e9006bac5a2aa63a66502041f736016982358b651df706418f551169bd8b6670f85035eeb9ad44c33d0ebc10 WHIRLPOOL 0f88a861be56866665f5e7ae410d480f71f4b743b759a266eedbd6653579caedf1d6691441c62faa9b619a637c750ca1bef61fcef86999e9915a20ba2fc2397f +MISC ChangeLog 10290 SHA256 4780061502cbcc6d88c6e34a19c6e52567bcb79dfd9553faa27e94fb38c0be3b SHA512 f86e00ca9c8a3a3944c29b0358bfc467a07264aa8fe702963e23f062d9e7bb3cf066de456bc8a99eef94a2158d63d20de23d04818e03e279ef780c34ff592583 WHIRLPOOL d3d7d6929d7ffb321e03eff7c366c1b6e58be2a234c306ffbfc7f85f15be440fc0951b4c74d212d3396d013d098bcdb51db3cc45cbb2d18b412471afbb11cc87 MISC metadata.xml 307 SHA256 b19b0330b6614bc27421032b94f6ade24661e38c818140c598d50cb91e82bce6 SHA512 05ebd620c55763866f5be95eeef6c46ceb2f424023df9f0f46a4d675bf06efe95120ecc5bd3f752c6f762c11b5c4152005458cac3dd5797a4b52def34729024a WHIRLPOOL 5441c1a1e9879a9aac8481ebc51821a5ec2f4bf896eb8a7a8d77db4534edd310e314852f234311b6f4c05f6b5947eac7f7a3677f195c056252fed5c4c411f6b9 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iF4EAREIAAYFAlRIvfMACgkQFYEBGcdFJfJQJQD/czhMZkWK4ksce1IIpOJvXr+I -fQtx0CuRJ1MiIipGSgkA/3R6hGfTIRAKY0OQE8prDt3XhMRMYDEx0nhJN2BDczlO -=mK92 +iF4EAREIAAYFAlS5NA8ACgkQFYEBGcdFJfKAxQD5Aace3aqakzqul63BQmCTRAE1 +NRNvZKgcCRF3AywIpPYA/ifCDexhEWoSMp8zzx8r+ABtIyWv/wwHtyJWxfxYbLMb +=8Bok -----END PGP SIGNATURE----- diff --git a/net-misc/x2goserver/files/x2goserver-4.0.1.18-fix_local_desktop_sharing.patch b/net-misc/x2goserver/files/x2goserver-4.0.1.18-fix_local_desktop_sharing.patch new file mode 100644 index 000000000000..11cef863be06 --- /dev/null +++ b/net-misc/x2goserver/files/x2goserver-4.0.1.18-fix_local_desktop_sharing.patch @@ -0,0 +1,19 @@ +diff -Naur x2goserver-4.0.1.18.orig/x2goserver/bin/x2golistdesktops x2goserver-4.0.1.18/x2goserver/bin/x2golistdesktops +--- x2goserver-4.0.1.18.orig/x2goserver/bin/x2golistdesktops 2014-10-06 23:23:27.000000000 +0200 ++++ x2goserver-4.0.1.18/x2goserver/bin/x2golistdesktops 2015-01-14 10:52:55.044479499 +0100 +@@ -60,7 +60,15 @@ + $rdisp="I${rdisp}I"; + + my $uname=$ENV{'USER'}; ++ ++# on Debian the ss command is in /usr/bin, on Fedora, it is in /usr/sbin... ++# -> so we need to tweak the PATH env var a little here... ++my $old_PATH=$ENV{'PATH'}; ++$ENV{'PATH'}="$ENV{'PATH'}:/usr/sbin:/sbin"; + my $lines=`ss -lxu`; ++$ENV{'PATH'}=$old_PATH; ++undef $old_PATH; ++ + my @lines=split("\n", "$lines"); + + my @outp = grep ( /(@| )\/tmp\/.X11-unix\/X.*/, @lines); diff --git a/net-misc/x2goserver/files/x2goserver-4.0.1.18-use_printf.patch b/net-misc/x2goserver/files/x2goserver-4.0.1.18-use_printf.patch new file mode 100644 index 000000000000..434deb6daa5e --- /dev/null +++ b/net-misc/x2goserver/files/x2goserver-4.0.1.18-use_printf.patch @@ -0,0 +1,58 @@ +diff -Naur x2goserver-4.0.1.18.orig/rpm/x2goserver.init x2goserver-4.0.1.18/rpm/x2goserver.init +--- x2goserver-4.0.1.18.orig/rpm/x2goserver.init 2014-10-06 23:23:27.000000000 +0200 ++++ x2goserver-4.0.1.18/rpm/x2goserver.init 2015-01-14 11:23:42.840796430 +0100 +@@ -35,7 +35,7 @@ + mkdir $XSOCKDIR + chmod 1777 $XSOCKDIR + fi +- echo -n $"Starting $prog: " ++ printf '%s' $"Starting $prog: " + daemon $exec $OPTS + retval=$? + echo +@@ -43,7 +43,7 @@ + } + + stop() { +- echo -n $"Stopping $prog: " ++ printf '%s' $"Stopping $prog: " + killproc $exec + retval=$? + echo +diff -Naur x2goserver-4.0.1.18.orig/x2goserver/bin/x2gopath x2goserver-4.0.1.18/x2goserver/bin/x2gopath +--- x2goserver-4.0.1.18.orig/x2goserver/bin/x2gopath 2014-10-06 23:23:27.000000000 +0200 ++++ x2goserver-4.0.1.18/x2goserver/bin/x2gopath 2015-01-14 11:25:57.105755690 +0100 +@@ -32,12 +32,12 @@ + + # 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; + +diff -Naur x2goserver-4.0.1.18.orig/x2goserver-xsession/etc/Xsession x2goserver-4.0.1.18/x2goserver-xsession/etc/Xsession +--- x2goserver-4.0.1.18.orig/x2goserver-xsession/etc/Xsession 2014-10-06 23:23:27.000000000 +0200 ++++ x2goserver-4.0.1.18/x2goserver-xsession/etc/Xsession 2015-01-14 11:23:42.840796430 +0100 +@@ -26,9 +26,9 @@ + # 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 2>&1; 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/net-misc/x2goserver/x2goserver-4.0.1.18-r2.ebuild b/net-misc/x2goserver/x2goserver-4.0.1.18-r2.ebuild new file mode 100644 index 000000000000..733b2d5f9e32 --- /dev/null +++ b/net-misc/x2goserver/x2goserver-4.0.1.18-r2.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goserver/x2goserver-4.0.1.18-r2.ebuild,v 1.1 2015/01/16 15:53:46 voyageur Exp $ + +EAPI=4 +inherit eutils multilib systemd toolchain-funcs user + +DESCRIPTION="The X2Go server" +HOMEPAGE="http://www.x2go.org" +SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+fuse postgres +sqlite" + +REQUIRED_USE="|| ( postgres sqlite )" + +DEPEND="" +RDEPEND="dev-perl/Capture-Tiny + dev-perl/Config-Simple + dev-perl/File-BaseDir + dev-perl/File-ReadBackwards + media-fonts/font-cursor-misc + media-fonts/font-misc-misc + >=net-misc/nx-3.5.0.25 + net-misc/openssh + x11-apps/xauth + x11-apps/xhost + x11-apps/xwininfo + fuse? ( sys-fs/sshfs-fuse ) + postgres? ( dev-perl/DBD-Pg ) + sqlite? ( dev-perl/DBD-SQLite )" + +pkg_setup() { + # Force the group creation, #479650 + enewgroup x2gouser + enewgroup x2goprint + enewuser x2gouser -1 -1 /var/lib/x2go x2gouser + enewuser x2goprint -1 -1 /var/spool/x2goprint x2goprint +} + +src_prepare() { + # Bug #524350 + epatch "${FILESDIR}"/${P}-prevent_bash_failures_xsession.patch + epatch "${FILESDIR}"/${P}-fix_local_desktop_sharing.patch + # Bug #524350 + epatch "${FILESDIR}"/${P}-use_printf.patch + + # Do not install Xresources symlink (#521126) + sed -e '\#$(INSTALL_SYMLINK) /etc/X11/Xresources# s/^/#/' -i x2goserver-xsession/Makefile || die "Xresources symlink sed failed" + # Multilib clean + sed -e "/^LIBDIR=/s/lib/$(get_libdir)/" -i Makefile */Makefile || die "multilib sed failed" + # Skip man2html build + sed -e "s/build-indep: build_man2html/build-indep:/" -i Makefile */Makefile || die "man2html sed failed" + # Use nxagent directly + sed -i -e "/NX_TEMP=/s/x2goagent/nxagent/" x2goserver/bin/x2gostartagent || die "sed failed" +} + +src_compile() { + emake CC="$(tc-getCC)" PREFIX=/usr +} + +src_install() { + emake DESTDIR="${D}" PREFIX=/usr install + + fowners root:x2goprint /usr/bin/x2goprint + fperms 2755 /usr/bin/x2goprint + fperms 0750 /etc/sudoers.d + fperms 0440 /etc/sudoers.d/x2goserver + dosym /usr/share/applications /etc/x2go/applications + + newinitd "${FILESDIR}"/${PN}.init x2gocleansessions + systemd_dounit "${FILESDIR}"/x2gocleansessions.service +} + +pkg_postinst() { + if use sqlite ; then + elog "To use sqlite and create the initial database, run:" + elog " # x2godbadmin --createdb" + fi + if use postgres ; then + elog "To use a PostgreSQL databse, more information is availabe here:" + elog "http://www.x2go.org/doku.php/wiki:advanced:multi-node:x2goserver-pgsql" + fi + + elog "For password authentication, you need to enable PasswordAuthentication" + elog "in /etc/ssh/sshd_config (disabled by default in Gentoo)" + elog "An init script was installed for x2gocleansessions" +} -- 2.26.2