Remove vulnerable versions, bug #472582

(Portage version: 2.2.0_alpha179/cvs/Linux x86_64, signed Manifest commit with key C74525F2)

6 files changed, 7 insertions, 264 deletions

diff --git a/net-misc/x2goserver/ChangeLog b/net-misc/x2goserver/ChangeLog
index d5b76ab932b7..1299d9f34e84 100644
--- a/net-misc/x2goserver/ChangeLog
+++ b/net-misc/x2goserver/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/x2goserver
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goserver/ChangeLog,v 1.23 2013/06/11 10:20:28 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goserver/ChangeLog,v 1.24 2013/06/12 09:40:13 voyageur Exp $
+
+  12 Jun 2013; Bernard Cafarelli <voyageur@gentoo.org>
+  -x2goserver-3.1.1.4-r1.ebuild, -x2goserver-3.1.1.9.ebuild,
+  -x2goserver-4.0.0.0.ebuild, -files/x2goserver-3.1.1.4-cflags.patch,
+  -files/x2goserver-4.0.0.0-cc_ldflags.patch:
+  Remove vulnerable versions, bug #472582
 
   11 Jun 2013; Agostino Sarubbo <ago@gentoo.org> x2goserver-4.0.0.2.ebuild:
   Stable for x86, wrt bug #472582
diff --git a/net-misc/x2goserver/files/x2goserver-3.1.1.4-cflags.patch b/net-misc/x2goserver/files/x2goserver-3.1.1.4-cflags.patch
deleted file mode 100644
index b87bef39bc98..000000000000
--- a/net-misc/x2goserver/files/x2goserver-3.1.1.4-cflags.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- x2goserver/Makefile.orig	2012-10-31 15:03:35.734483627 +0100
-+++ x2goserver/Makefile	2012-10-31 15:05:55.505918654 +0100
-@@ -3,6 +3,10 @@
- SRC_DIR=$(CURDIR)
- SHELL=/bin/bash
- 
-+CC?=gcc
-+CFLAGS+=-fPIE -pie
-+LDFLAGS+=
-+
- INSTALL_DIR=install -d -o root -g root -m 755
- INSTALL_FILE=install -o root -g root -m 644
- INSTALL_PROGRAM=install -o root -g root -m 755
-@@ -37,7 +41,7 @@
- build-arch: build_setgidwrappers
- 
- build_setgidwrappers:
--	gcc -fPIE -pie -o x2gosqlitewrapper x2gosqlitewrapper.c
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o x2gosqlitewrapper x2gosqlitewrapper.c
- 
- build-indep: build_man2html
- 
diff --git a/net-misc/x2goserver/files/x2goserver-4.0.0.0-cc_ldflags.patch b/net-misc/x2goserver/files/x2goserver-4.0.0.0-cc_ldflags.patch
deleted file mode 100644
index 91739851419b..000000000000
--- a/net-misc/x2goserver/files/x2goserver-4.0.0.0-cc_ldflags.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- x2goserver/Makefile.orig	2013-01-08 10:44:54.134787510 +0100
-+++ x2goserver/Makefile	2013-01-08 10:46:06.721676563 +0100
-@@ -3,6 +3,10 @@
- SRC_DIR=$(CURDIR)
- SHELL=/bin/bash
- 
-+CC?=gcc
-+CFLAGS+=-fPIE
-+LDFLAGS+=-pie
-+
- INSTALL_DIR=install -d -o root -g root -m 755
- INSTALL_FILE=install -o root -g root -m 644
- INSTALL_PROGRAM=install -o root -g root -m 755
-@@ -37,7 +41,7 @@
- build-arch: build_setgidwrappers
- 
- build_setgidwrappers:
--	gcc -fPIE -pie $(CFLAGS) -o x2gosqlitewrapper x2gosqlitewrapper.c
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o x2gosqlitewrapper x2gosqlitewrapper.c
- 
- build-indep: build_man2html
- 
diff --git a/net-misc/x2goserver/x2goserver-3.1.1.4-r1.ebuild b/net-misc/x2goserver/x2goserver-3.1.1.4-r1.ebuild
deleted file mode 100644
index 904843aa9c21..000000000000
--- a/net-misc/x2goserver/x2goserver-3.1.1.4-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goserver/x2goserver-3.1.1.4-r1.ebuild,v 1.5 2013/03/21 13:55:35 voyageur Exp $
-
-EAPI=4
-inherit eutils multilib 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 )"
-
-# Requires man2html, only provided by sys-apps/man
-DEPEND="sys-apps/man"
-RDEPEND="dev-perl/Config-Simple
-	media-fonts/font-cursor-misc
-	media-fonts/font-misc-misc
-	net-misc/nx
-	virtual/ssh
-	x11-apps/xauth
-	fuse? ( sys-fs/sshfs-fuse )
-	postgres? ( dev-perl/DBD-Pg )
-	sqlite? ( dev-perl/DBD-SQLite )"
-
-pkg_setup() {
-	enewuser x2gouser -1 -1 /var/lib/x2go
-	enewuser x2goprint -1 -1 /var/spool/x2goprint
-}
-
-src_prepare() {
-	# Respect CC/CFLAGS
-	epatch "${FILESDIR}"/${P}-cflags.patch
-
-	# Multilib clean
-	sed -e "/^LIBDIR=/s/lib/$(get_libdir)/" -i */Makefile || die "multilib sed failed"
-	# Use nxagent directly
-	sed -i -e "s/x2goagent/nxagent/" x2goserver/bin/x2gostartagent || die "sed failed"
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-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
-}
-
-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-3.1.1.9.ebuild b/net-misc/x2goserver/x2goserver-3.1.1.9.ebuild
deleted file mode 100644
index ea8366841c02..000000000000
--- a/net-misc/x2goserver/x2goserver-3.1.1.9.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goserver/x2goserver-3.1.1.9.ebuild,v 1.3 2013/03/21 13:55:35 voyageur Exp $
-
-EAPI=4
-inherit eutils multilib 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 )"
-
-# Requires man2html, only provided by sys-apps/man
-DEPEND="sys-apps/man"
-RDEPEND="dev-perl/Config-Simple
-	media-fonts/font-cursor-misc
-	media-fonts/font-misc-misc
-	net-misc/nx
-	virtual/ssh
-	x11-apps/xauth
-	fuse? ( sys-fs/sshfs-fuse )
-	postgres? ( dev-perl/DBD-Pg )
-	sqlite? ( dev-perl/DBD-SQLite )"
-
-pkg_setup() {
-	enewuser x2gouser -1 -1 /var/lib/x2go
-	enewuser x2goprint -1 -1 /var/spool/x2goprint
-}
-
-src_prepare() {
-	# Respect CC/CFLAGS
-	epatch "${FILESDIR}"/${PN}-3.1.1.4-cflags.patch
-
-	# Multilib clean
-	sed -e "/^LIBDIR=/s/lib/$(get_libdir)/" -i */Makefile || die "multilib sed failed"
-	# Use nxagent directly
-	sed -i -e "s/x2goagent/nxagent/" x2goserver/bin/x2gostartagent || die "sed failed"
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-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
-}
-
-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.0.0.ebuild b/net-misc/x2goserver/x2goserver-4.0.0.0.ebuild
deleted file mode 100644
index 45dfded15cf6..000000000000
--- a/net-misc/x2goserver/x2goserver-4.0.0.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goserver/x2goserver-4.0.0.0.ebuild,v 1.3 2013/03/21 13:55:35 voyageur Exp $
-
-EAPI=4
-inherit eutils multilib 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 )"
-
-# Requires man2html, only provided by sys-apps/man
-DEPEND="sys-apps/man"
-RDEPEND="dev-perl/Config-Simple
-	media-fonts/font-cursor-misc
-	media-fonts/font-misc-misc
-	net-misc/nx
-	virtual/ssh
-	x11-apps/xauth
-	fuse? ( sys-fs/sshfs-fuse )
-	postgres? ( dev-perl/DBD-Pg )
-	sqlite? ( dev-perl/DBD-SQLite )"
-
-pkg_setup() {
-	enewuser x2gouser -1 -1 /var/lib/x2go
-	enewuser x2goprint -1 -1 /var/spool/x2goprint
-}
-
-src_prepare() {
-	# Respect CC/LDFLAGS
-	epatch "${FILESDIR}"/${P}-cc_ldflags.patch
-
-	# Multilib clean
-	sed -e "/^LIBDIR=/s/lib/$(get_libdir)/" -i */Makefile || die "multilib 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)"
-}
-
-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
-}
-
-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"
-}