From 2f2393be6bc4766ba2e085afe9cb999f78a5349d Mon Sep 17 00:00:00 2001 From: Bernard Cafarelli Date: Mon, 7 Mar 2016 14:50:21 +0100 Subject: net-misc/x2goserver: clean some versions Package-Manager: portage-2.2.27 --- net-misc/x2goserver/Manifest | 2 - ...server-4.0.1.18-fix_local_desktop_sharing.patch | 19 ----- ...r-4.0.1.18-prevent_bash_failures_xsession.patch | 27 ------- .../files/x2goserver-4.0.1.18-use_printf.patch | 58 -------------- net-misc/x2goserver/x2goserver-4.0.1.12.ebuild | 83 -------------------- net-misc/x2goserver/x2goserver-4.0.1.18-r2.ebuild | 90 ---------------------- net-misc/x2goserver/x2goserver-4.0.1.19-r1.ebuild | 88 --------------------- 7 files changed, 367 deletions(-) delete mode 100644 net-misc/x2goserver/files/x2goserver-4.0.1.18-fix_local_desktop_sharing.patch delete mode 100644 net-misc/x2goserver/files/x2goserver-4.0.1.18-prevent_bash_failures_xsession.patch delete mode 100644 net-misc/x2goserver/files/x2goserver-4.0.1.18-use_printf.patch delete mode 100644 net-misc/x2goserver/x2goserver-4.0.1.12.ebuild delete mode 100644 net-misc/x2goserver/x2goserver-4.0.1.18-r2.ebuild delete mode 100644 net-misc/x2goserver/x2goserver-4.0.1.19-r1.ebuild (limited to 'net-misc/x2goserver') diff --git a/net-misc/x2goserver/Manifest b/net-misc/x2goserver/Manifest index a1416aa55877..bf0a61ac3fd6 100644 --- a/net-misc/x2goserver/Manifest +++ b/net-misc/x2goserver/Manifest @@ -1,3 +1 @@ -DIST x2goserver-4.0.1.12.tar.gz 78958 SHA256 447c5e7b47e6b2bc087731ed26c827020130cc8530ca020a03f7f3ecadc308cc SHA512 30ce6c20cf0bf67ee162cda5d0cbbfd994ac47aa140e3c4cd6118b594ed8fbf83dbc961f2323694206c705f647f32dba8a7fc7bde4ef22be2d4936642865a3d3 WHIRLPOOL 9d4887a1dd701d361311850a8e936d7f22ecf76e1b4ee78b11feca6ec25d02419221b0fb2e72c440394f81e63ffa73762b33bd58123e7bd441e32446ce40814e -DIST x2goserver-4.0.1.18.tar.gz 82452 SHA256 4a1e7eb9cf309c126fdab1f97bd55cd036b0a02a04cda1d317b193d8ab9b0612 SHA512 e0f439301cbb2acc09e14a101bebbbac3e436383de51b7ae029117eaa95c6181045335c83125615e0f0ed191ae39d5abb120c1f6b20fa5b78fe94288248d6fd8 WHIRLPOOL fe0ad6b5a0a1a124d62ebcee152a84dd7b34ebe83f04440ff5dac471b1f5e19339dfa340631cd2df10398d38c4ed34c875a52337a394281b2976d9059d6f1bbd DIST x2goserver-4.0.1.19.tar.gz 89434 SHA256 3dd5c1464a7992a38760fd6b08f5f8d37646f939f4f7834a7cd96bf4950623cc SHA512 dbd054a6bf781d843a48fcea3449037b991aaa38a52705d48dd5fa8d7fe85c56d4ff31b9a10189a9043a3e5cc0c69475947aea5a5fb78e3c076c0e56079b747d WHIRLPOOL f44fadfda6e1ff165ff989f0c10116c8318f5915764b9bfc663e4658190934eb5155e17e072f131842a98cc02908366b0f91c7b0b9b9e73d4e2a729f00ba0d31 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 deleted file mode 100644 index 11cef863be06..000000000000 --- a/net-misc/x2goserver/files/x2goserver-4.0.1.18-fix_local_desktop_sharing.patch +++ /dev/null @@ -1,19 +0,0 @@ -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-prevent_bash_failures_xsession.patch b/net-misc/x2goserver/files/x2goserver-4.0.1.18-prevent_bash_failures_xsession.patch deleted file mode 100644 index 868c52a0564e..000000000000 --- a/net-misc/x2goserver/files/x2goserver-4.0.1.18-prevent_bash_failures_xsession.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/x2goserver-xsession/etc/Xsession b/x2goserver-xsession/etc/Xsession -index b9ef15e..94692db 100755 ---- a/x2goserver-xsession/etc/Xsession -+++ b/x2goserver-xsession/etc/Xsession -@@ -139,7 +139,9 @@ elif [ -f /etc/redhat-release ] || [ -f /etc/gentoo-release ]; then - - # Set up i18n environment - if [ -r /etc/profile.d/lang.sh ]; then -+ set +e - . /etc/profile.d/lang.sh -+ set -e - fi - - # merge in defaults -@@ -177,7 +179,9 @@ elif [ -f /etc/redhat-release ] || [ -f /etc/gentoo-release ]; then - - # run all system xinitrc shell scripts. - for file in /etc/x2go/xinitrc.d/* ; do -+ set +e - [ -r "$file" ] && . $file -+ set -e - done - - # Prefix launch of session with ssh-agent if available and not already running. --- -1.7.9.5 - 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 deleted file mode 100644 index 434deb6daa5e..000000000000 --- a/net-misc/x2goserver/files/x2goserver-4.0.1.18-use_printf.patch +++ /dev/null @@ -1,58 +0,0 @@ -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.12.ebuild b/net-misc/x2goserver/x2goserver-4.0.1.12.ebuild deleted file mode 100644 index db55676150b0..000000000000 --- a/net-misc/x2goserver/x2goserver-4.0.1.12.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -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="+doc +fuse postgres +sqlite" - -REQUIRED_USE="|| ( postgres sqlite )" - -# Requires man2html, only provided by sys-apps/man -DEPEND="doc? ( sys-apps/man )" -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[nls] - net-misc/nx - 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() { - # Multilib clean - sed -e "/^LIBDIR=/s/lib/$(get_libdir)/" -i Makefile */Makefile || die "multilib sed failed" - # Skip man2html build if needed - if ! use doc; then - sed -e "s/build-indep: build_man2html/build-indep:/" -i Makefile */Makefile || die "man2html sed failed" - fi - # 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 - 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" -} diff --git a/net-misc/x2goserver/x2goserver-4.0.1.18-r2.ebuild b/net-misc/x2goserver/x2goserver-4.0.1.18-r2.ebuild deleted file mode 100644 index c67ee794cd9a..000000000000 --- a/net-misc/x2goserver/x2goserver-4.0.1.18-r2.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -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[nls] - >=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" -} diff --git a/net-misc/x2goserver/x2goserver-4.0.1.19-r1.ebuild b/net-misc/x2goserver/x2goserver-4.0.1.19-r1.ebuild deleted file mode 100644 index ecbadc032f78..000000000000 --- a/net-misc/x2goserver/x2goserver-4.0.1.19-r1.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 -inherit 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 - dev-perl/File-Which - media-fonts/font-cursor-misc - media-fonts/font-misc-misc[nls] - >=net-misc/nx-3.5.0.25 - net-misc/openssh - >=sys-apps/iproute2-4.3.0 - 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() { - # 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" - - eapply_user -} - -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" -} -- cgit v1.2.3-65-gdbad