Fix bug #538092 - Move to proxy maintenance by Luis Ressel, fix to remove security vulnerability CVE-2006-1390

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x2EDD52403B68AF47

4 files changed, 217 insertions, 9 deletions

diff --git a/games-roguelike/nethack/ChangeLog b/games-roguelike/nethack/ChangeLog
index 6ddb7c30e7c2..4b2e8d819604 100644
--- a/games-roguelike/nethack/ChangeLog
+++ b/games-roguelike/nethack/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-roguelike/nethack
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/nethack/ChangeLog,v 1.35 2014/03/21 05:11:09 jer Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/nethack/ChangeLog,v 1.36 2015/02/19 14:11:41 swift Exp $
+
+*nethack-3.4.3-r2 (19 Feb 2015)
+
+  19 Feb 2015; Sven Vermeulen <swift@gentoo.org> +nethack-3.4.3-r2.ebuild,
+  metadata.xml:
+  Fix bug #538092 - Move to proxy maintenance by Luis Ressel, fix to remove
+  security vulnerability CVE-2006-1390
 
   21 Mar 2014; Jeroen Roovers <jer@gentoo.org> nethack-3.4.3-r1.ebuild:
   Fix building against sys-libs/ncurses[tinfo]. Respect LDFLAGS.
diff --git a/games-roguelike/nethack/Manifest b/games-roguelike/nethack/Manifest
index 1f9a50d51d5e..c53d96c8ac2d 100644
--- a/games-roguelike/nethack/Manifest
+++ b/games-roguelike/nethack/Manifest
@@ -11,12 +11,23 @@ AUX nethack-3.4.3-gibc210.patch 330 SHA256 5c74be994e8c5622b0c97f6178ef123ef614c
 AUX nethack-3.4.3-recover.patch 2542 SHA256 ce309d4b1d4ebb2c865754de905e5e16470f05c19460fc9491d98386a8015f63 SHA512 f3ecd7e59254fea509fecb9517c47b029c9293443b81e36e94699026d31f0f3c83212b8bf372059761173397e3a6817b6e36ce099aa4223fe0e6cc0283879627 WHIRLPOOL e5b07ca7c0d2b3f8dd0b4a9417060268a94ae345443e00620f72f083b75eaf9125aec30e266db576bf7052136bee5c12c9382b7c4404b606e63ef68f3c792316
 DIST nethack-343-src.tgz 3497458 SHA256 bb39c3d2a9ee2df4a0c8fdde708fbc63740853a7608d2f4c560b488124866fe4 SHA512 052342c19619219f291571d48cf7799f962eb6ec6f8a276427225c0abbd833eada18abeff9fbd647919f2a9e3bb097d7f154675e283fe48abc4752f24c192d8f WHIRLPOOL 397c787f83149d96ddbfa6a2235c20c3724ed67946889d432774901cb7ddc71b177e2cbd6c3029f4eb0b4df21c81c6a427494dad550fdbace01876a3d9c79d75
 EBUILD nethack-3.4.3-r1.ebuild 4777 SHA256 904cd8a525a5f84aedbef0d6eb88399bef04cc6109e3a218d3f91893aac81666 SHA512 95b9174386533dc8bdf9c56dc8e34984205bbd27489f2da4f0815c781bc0eafd4dde0e3c0a430994bf91e8d7e5279a56f35a767fffa31efb5f1aa3fd6ddede62 WHIRLPOOL 4da489d43aed289b07881929110dd503910d4782c40cda281b600db4473f4d57605bc17772d28a9e5234084f2b0b28b056ae564870d08d20abcd3a94f284bb78
-MISC ChangeLog 7449 SHA256 2d4406b0df765a4580c5c95bac0ad3529d50e48d2f920ffb9c83d3915c608fac SHA512 14cd897573fed0e44bcc15ac88fce237412ed81f7eb0407366b412ab1938cb3d4b3f510531381b9dbcdf7175b857fea58236fd4140fd991063cabee5b74d5dc6 WHIRLPOOL 2ecba45129ccda7e91065dd80dc873ad7d97fd1fb0bbd8c651609c0b35c164f8ea183d9b193a9c4c3bc8a8d8bc5bcc84469bd9e0bfea34c2fdcc9c41ee7ee0ce
-MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
+EBUILD nethack-3.4.3-r2.ebuild 4542 SHA256 7013a1c8af5eb7af7a14598f125b3f4d38f3fea10791da05e1cac82ba78aa711 SHA512 19963e73ca01c03559d7d376efc486e7e820576406e89c05116f00ed40329843a6ad0388c84ee083382a153cc4991549d437c383850d6e483feb59af8e4ed81e WHIRLPOOL 866a94f1cb33eff4b44bf8932ed28bf0aa166c9dba942b637c6b834ae80052c87ba865cf24e949c1d96558b281912a931f1cf4642622d356eabfcb51e492ec27
+MISC ChangeLog 7691 SHA256 d0922d4a95cdafa13ce2bc97d4203b6013f8c3beaf8b1a598bcc13486cd0c444 SHA512 af0328af9f902d6e4396ab5c1d49da9fdcd17feee053ef5a90b164000d5fe9d0949e02d36fcb83581cbadd20564f44345e6964e3ceda6e095a0921b4e35da52a WHIRLPOOL 414468f325e50886a231e5d19597e8f1025c8a018347fb60283ab4c6e436223d82f9fb26dd42d0c91992c923054e07047d44d0ec3e091eb72c03f9fc5339280f
+MISC metadata.xml 309 SHA256 2005cc1606b9c79a29209548d26024b75235e819bd5d96ce12a27ebf6b96c545 SHA512 5e4b98d6a3acf460bca83b8e0f0a08cfc4e8c932b59b6b5f0496e9892c5736a467048d3f3cc3e501055978d1a5b33f22073b9cdb9fc03249c7ffbbe19fc5158a WHIRLPOOL e54645a988abc7dc96c7ded87f278ce73fab73b53a9a3e03bfda3997abddb3a913a747222a23a045d37a77bc8052b3aba7b2864358e08e83a0265120ce82e185
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlMrye4ACgkQVWmRsqeSphM7/QCfQARGiEgQVOW1aRo2x3uj5ciV
-uRYAoIEdus9Lk2wDo+vv4Y0Vabxs0K1/
-=Euhs
+iQIcBAEBCAAGBQJU5e6yAAoJEC7dUkA7aK9HBc4P/3HcBO0T52F3d9UNbtMd30u+
+OfwyYeGuYfl8x3vEH/xdqYFER6luKvh7GxHPo6o0JnIcAcVJgs632qVMYxFBylPq
+UrkFhV8IUI/oMdvrdRkx2knRBfPc3NfPgf7390W2GG179xp0I/31ZbwVddTn+odk
+eQTUdoHH0bfIfFSHbIbaq4KQIhqN+YTdgmOAoizsX9utIikkC3pJhQWIPrmmIvum
+7X7kOHwmqqiKDZoFm+2GUQRIOtjN0fsxEyo5xrIoV/QDeGomMAw5M6+1xOxQBeZR
+bBTx9AnAX6I2+AB7X7PwgWRkKXyqlpMIyW5PG0JSpPajVrBauQPNytVZyzmWfH4K
+i0E3ZQWFj4f2VQ+q/MAVS+UIrJWvTCApSp1SnQqjVzz2H1uuwNwJv0pdLZ7hwgKn
+mlggIxkFi3dnYdjb80aJEpCJsrypDYEoEEoXFDdbbx+xjrObA+Kj4ApqAzQedO0f
+dqvoIv3CBHwghFKCsQN+7k+XZGaK5F71D/SiBb+DmEEKn5674nxxjg8+pkFW0MFi
+Ixpsdb2B1ofTIo9jOfakOMQJOlDdjuwc/kh8iHP5pnHy0CG0p2lhnRF5nzoi0T+v
+WGXJps4UbfZcLx0ss8YfhwR9l7pDgyRRsld8DKwa0puiWmtF7NX6qnH83U3rEAt/
+c9H9K5C8vRERVcjk84Tm
+=5qvS
 -----END PGP SIGNATURE-----
diff --git a/games-roguelike/nethack/metadata.xml b/games-roguelike/nethack/metadata.xml
index d3c2cc926f0b..63a0bb8c865a 100644
--- a/games-roguelike/nethack/metadata.xml
+++ b/games-roguelike/nethack/metadata.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+  <herd>proxy-maintainers</herd>
+  <maintainer>
+    <email>aranea@aixah.de</email>
+    <name>Luis Ressel</name>
+    <description>Maintainer</description>
+  </maintainer>
 </pkgmetadata>
diff --git a/games-roguelike/nethack/nethack-3.4.3-r2.ebuild b/games-roguelike/nethack/nethack-3.4.3-r2.ebuild
new file mode 100644
index 000000000000..bbe9e9426866
--- /dev/null
+++ b/games-roguelike/nethack/nethack-3.4.3-r2.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/nethack/nethack-3.4.3-r2.ebuild,v 1.1 2015/02/19 14:11:41 swift Exp $
+
+EAPI=5
+inherit eutils toolchain-funcs flag-o-matic user
+
+MY_PV=${PV//.}
+DESCRIPTION="The ultimate old-school single player dungeon exploration game"
+HOMEPAGE="http://www.nethack.org/"
+SRC_URI="mirror://sourceforge/nethack/${PN}-${MY_PV}-src.tgz"
+
+LICENSE="nethack"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE="X"
+
+RDEPEND=">=sys-libs/ncurses-5.2-r5
+	X? (
+		x11-libs/libXaw
+		x11-libs/libXpm
+		x11-libs/libXt
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	X? (
+		x11-proto/xproto
+		x11-apps/bdftopcf
+		x11-apps/mkfontdir
+	)"
+
+HACKDIR="/usr/share/${PN}"
+STATEDIR="/var/lib/${PN}"
+
+pkg_setup() {
+	enewgroup nethack
+}
+
+src_prepare() {
+	# This copies the /sys/unix Makefile.*s to their correct places for
+	# seding and compiling.
+	cd "sys/unix"
+	source setup.sh || die
+
+	cd ../..
+	epatch \
+		"${FILESDIR}"/${PV}-gentoo-paths.patch \
+		"${FILESDIR}"/${PV}-default-options.patch \
+		"${FILESDIR}"/${PV}-bison.patch \
+		"${FILESDIR}"/${PV}-macos.patch \
+		"${FILESDIR}"/${P}-gibc210.patch \
+		"${FILESDIR}"/${P}-recover.patch
+
+	epatch_user
+
+	mv doc/recover.6 doc/nethack-recover.6
+
+	sed -i \
+		-e "s:GENTOO_STATEDIR:${STATEDIR}:" include/unixconf.h \
+		|| die "setting statedir"
+	sed -i \
+		-e "s:GENTOO_HACKDIR:${HACKDIR}:" include/config.h \
+		|| die "setting hackdir"
+	# set the default pager from the environment bug #52122
+	if [[ -n "${PAGER}" ]] ; then
+		sed -i \
+			-e "115c\#define DEF_PAGER \"${PAGER}\"" \
+			include/unixconf.h \
+			|| die "setting statedir"
+		# bug #57410
+		sed -i \
+			-e "s/^DATNODLB =/DATNODLB = \$(DATHELP)/" Makefile \
+			|| die "sed Makefile failed"
+	fi
+
+	# sys-libs/ncurses[tinfo]
+	sed -i \
+		-e '/^WINTTYLIB/s| = .*| = '"$(
+				$(tc-getPKG_CONFIG) --libs ncurses
+			)"'|g' \
+		src/Makefile || die
+
+	if use X ; then
+		epatch "${FILESDIR}/${PV}-X-support.patch"
+	fi
+}
+
+src_compile() {
+	local lflags="${LDFLAGS}"
+
+	cd "${S}"/src
+	append-flags -I../include
+
+	emake \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		LFLAGS="${lflags}" \
+		../util/makedefs
+	emake \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		LFLAGS="${lflags}"
+	cd "${S}"/util
+	emake \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		LFLAGS="${lflags}" \
+		recover
+}
+
+src_install() {
+	emake \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		LFLAGS="-L/usr/X11R6/lib" \
+		GAMEPERM=02755 \
+		GAMEUID="root" GAMEGRP="nethack" \
+		PREFIX="${D}/usr" \
+		GAMEDIR="${D}${HACKDIR}" \
+		SHELLDIR="${D}/usr/bin" \
+		install
+
+	# We keep this stuff in STATEDIR instead so tidy up.
+	rm -rf "${D}/usr/share/nethack/"{recover,save}
+
+	newbin util/recover recover-nethack
+
+	# The final nethack is a sh script.  This fixes the hard-coded
+	# HACKDIR directory so it doesn't point to ${D}/usr/share/nethackdir
+	sed -i \
+		-e "s:^\(HACKDIR=\).*:\1${HACKDIR}:" \
+		"${D}/usr/bin/nethack" \
+		|| die "sed /usr/bin/nethack failed"
+
+	doman doc/*.6
+	dodoc doc/*.txt
+
+	# Can be copied to ~/.nethackrc to set options
+	# Add this to /etc/.skel as well, thats the place for default configs
+	insinto "${HACKDIR}"
+	doins "${FILESDIR}/dot.nethackrc"
+
+	local windowtypes="tty"
+	use X && windowtypes="${windowtypes} x11"
+	set -- ${windowtypes}
+	sed -i \
+		-e "s:GENTOO_WINDOWTYPES:${windowtypes}:" \
+		-e "s:GENTOO_DEFWINDOWTYPE:$1:" \
+		"${D}${HACKDIR}/dot.nethackrc" \
+		|| die "sed ${HACKDIR}/dot.nethackrc failed"
+	insinto /etc/skel
+	newins "${D}/${HACKDIR}/dot.nethackrc" .nethackrc
+
+	if use X ; then
+		# install nethack fonts
+		cd "${S}/win/X11"
+		bdftopcf -o nh10.pcf nh10.bdf || die "Converting fonts failed"
+		bdftopcf -o ibm.pcf ibm.bdf || die "Converting fonts failed"
+		insinto "${HACKDIR}/fonts"
+		doins *.pcf
+		cd "${D}/${HACKDIR}/fonts"
+		mkfontdir || die "The action mkfontdir ${HACKDIR}/fonts failed"
+
+		# copy nethack x application defaults
+		cd "${S}/win/X11"
+		insinto /etc/X11/app-defaults
+		newins NetHack.ad NetHack
+		sed -i \
+			-e 's:^!\(NetHack.tile_file.*\):\1:' \
+			"${D}/etc/X11/app-defaults/NetHack" \
+			|| die "sed /etc/X11/app-defaults/NetHack failed"
+	fi
+
+	keepdir "${STATEDIR}/save"
+	mv "${D}/${HACKDIR}/"{record,logfile,perm} "${D}/${STATEDIR}/"
+	make_desktop_entry nethack "Nethack"
+
+	chgrp -R nethack "${D}/${STATEDIR}"
+	chmod -R 660 "${D}/${STATEDIR}"
+	chmod 770 "${D}/${STATEDIR}" "${D}/${STATEDIR}/save"
+}
+
+pkg_postinst() {
+	elog "You may want to look at /etc/skel/.nethackrc for interesting options"
+}