From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E7ACB138350 for ; Tue, 28 Jan 2020 20:55:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3524DE084E; Tue, 28 Jan 2020 20:55:10 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0BD7DE084E for ; Tue, 28 Jan 2020 20:55:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0200C34E44C for ; Tue, 28 Jan 2020 20:55:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 869832A for ; Tue, 28 Jan 2020 20:55:07 +0000 (UTC) From: "Stefan Strogin" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Stefan Strogin" Message-ID: <1580244868.53d5d5bd85451baa1484b39a9861514e07f12c75.steils@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-roguelike/nethack/, games-roguelike/nethack/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-roguelike/nethack/Manifest games-roguelike/nethack/files/nethack-3.6.0-hint-tty games-roguelike/nethack/files/nethack-3.6.0-hint-x11 games-roguelike/nethack/files/nethack-3.6.1-recover.patch games-roguelike/nethack/nethack-3.6.1.ebuild games-roguelike/nethack/nethack-3.6.3.ebuild X-VCS-Directories: games-roguelike/nethack/files/ games-roguelike/nethack/ X-VCS-Committer: steils X-VCS-Committer-Name: Stefan Strogin X-VCS-Revision: 53d5d5bd85451baa1484b39a9861514e07f12c75 X-VCS-Branch: master Date: Tue, 28 Jan 2020 20:55:07 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 63ae016f-9af2-4221-8897-c5f1f8d991a2 X-Archives-Hash: ede7153a9ae0fb9ff31d8e23503c7a96 commit: 53d5d5bd85451baa1484b39a9861514e07f12c75 Author: Stefan Strogin gentoo org> AuthorDate: Tue Jan 28 20:53:13 2020 +0000 Commit: Stefan Strogin gentoo org> CommitDate: Tue Jan 28 20:54:28 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53d5d5bd games-roguelike/nethack: drop old and vulnerable 3.6.1, 3.6.3 Bug: https://bugs.gentoo.org/706200 Package-Manager: Portage-2.3.85, Repoman-2.3.20 Signed-off-by: Stefan Strogin gentoo.org> games-roguelike/nethack/Manifest | 2 - .../nethack/files/nethack-3.6.0-hint-tty | 19 --- .../nethack/files/nethack-3.6.0-hint-x11 | 23 ---- .../nethack/files/nethack-3.6.1-recover.patch | 115 ------------------ games-roguelike/nethack/nethack-3.6.1.ebuild | 128 -------------------- games-roguelike/nethack/nethack-3.6.3.ebuild | 129 --------------------- 6 files changed, 416 deletions(-) diff --git a/games-roguelike/nethack/Manifest b/games-roguelike/nethack/Manifest index 66a24f403d3..db4ca9ec040 100644 --- a/games-roguelike/nethack/Manifest +++ b/games-roguelike/nethack/Manifest @@ -1,3 +1 @@ -DIST nethack-3.6.3.tar.gz 5568657 BLAKE2B f0aa12a27fdf5005f57dcc802af88939b8460cfcfea3dc4d262b15a2807376ed434233dfa85ae0bfd60e50ad5a51ff4b060b5063e393d5859bac1b98364b5359 SHA512 38bc6140b12188397539f28528dd8e34364fb7efeb42dbe36d86fea6cc473e292b7f47fba01db19cf7641414dee86092e33deb3b074afa0e8b811e71be71e1d1 DIST nethack-3.6.4.tar.gz 5573777 BLAKE2B 4e5a48bbf521406f17bc699643dd9f9d912381cc91ab2228affc6f54ad2b84ea7c946ab2d5936c274752a36920440d34001b13f28ce4c8f35844300d596086a7 SHA512 c951f939d50027b4468ebd2e32f79771e696035df0918b814bf02899f5c1e89d462ebc3f63155c23f5c627e66ca74244512d666b102c380242df1500a2c0afa9 -DIST nethack-361-src.tgz 4640769 BLAKE2B 3793a753e4012df64335e7e7ec60284de206012d5bb5d30a7ccfb458e456818f30dd0b4bfa9c41b1691bd01ee6aec2e44b57327586f0c9d76a573bf4c9bb00b1 SHA512 bd6e36c163f0d85e1ab1fc659464696b5a02c3864a800ad47e047fdc4a35fff4ef7dd28a9b071fa46f7f67fa45c97fdc77bc1f2bdbad80cc02950d73731d9c30 diff --git a/games-roguelike/nethack/files/nethack-3.6.0-hint-tty b/games-roguelike/nethack/files/nethack-3.6.0-hint-tty deleted file mode 100644 index 3c250e7e719..00000000000 --- a/games-roguelike/nethack/files/nethack-3.6.0-hint-tty +++ /dev/null @@ -1,19 +0,0 @@ -#-PRE - -LINK=$(CC) - -WINSRC = $(WINTTYSRC) -WINOBJ = $(WINTTYOBJ) -WINLIB = $(WINTTYLIB) - -GAMEPERM = 02755 -VARDIRPERM = 0770 -VARFILEPERM = 0660 -CHOWN = true -CHGRP = true - - -#-POST - -# needed for external pager, bug #57410 -DATNODLB = $(VARDATND) license $(DATHELP) diff --git a/games-roguelike/nethack/files/nethack-3.6.0-hint-x11 b/games-roguelike/nethack/files/nethack-3.6.0-hint-x11 deleted file mode 100644 index d0d1a8d4cd4..00000000000 --- a/games-roguelike/nethack/files/nethack-3.6.0-hint-x11 +++ /dev/null @@ -1,23 +0,0 @@ -#-PRE - -LINK=$(CC) - -VARDATND = x11tiles NetHack.ad pet_mark.xbm pilemark.xbm rip.xpm - -WINSRC = $(WINTTYSRC) $(WINX11SRC) -WINOBJ = $(WINTTYOBJ) $(WINX11OBJ) -WINLIB = $(WINTTYLIB) $(WINX11LIB) - -GAMEPERM = 02755 -VARDIRPERM = 0770 -VARFILEPERM = 0660 -CHOWN = true -CHGRP = true - - -#-POST - -# needed for external pager, bug #57410 -DATNODLB = $(VARDATND) license $(DATHELP) - -WINX11LIB = -lXaw -lXmu -lXext -lXt -lX11 -lXpm diff --git a/games-roguelike/nethack/files/nethack-3.6.1-recover.patch b/games-roguelike/nethack/files/nethack-3.6.1-recover.patch deleted file mode 100644 index c7ad7808a2c..00000000000 --- a/games-roguelike/nethack/files/nethack-3.6.1-recover.patch +++ /dev/null @@ -1,115 +0,0 @@ -From 5d9a3ac6b9eaf63167e5c7c01f0bb33d383dab14 Mon Sep 17 00:00:00 2001 -From: Luis Ressel -Date: Tue, 21 Aug 2018 22:57:09 +0200 -Subject: [PATCH] doc: Rename recover to recover-nethack - ---- - doc/recover.6 | 30 +++++++++++++++--------------- - 1 file changed, 15 insertions(+), 15 deletions(-) - -diff --git a/doc/recover.6 b/doc/recover.6 -index 1209d31d..c3fdd851 100644 ---- a/doc/recover.6 -+++ b/doc/recover.6 -@@ -1,4 +1,4 @@ --.TH RECOVER 6 "14 December 2015" NETHACK -+.TH RECOVER-NETHACK 6 "14 December 2015" NETHACK - .de ND - .ds Nd \\$3 - .. -@@ -13,9 +13,9 @@ - .NR $NHDT-Revision: 1.9 $ - .ds Na Kenneth Lorber - .SH NAME --recover \- recover a NetHack game interrupted by disaster -+recover-nethack \- recover a NetHack game interrupted by disaster - .SH SYNOPSIS --.B recover -+.B recover-nethack - [ - .B \-d - .I directory -@@ -33,7 +33,7 @@ so such games can be recovered at the point of the last level change. - The - .I base - options tell --.I recover -+.I recover-nethack - which files to process. - Each base option specifies recovery of a separate game. - .PP -@@ -83,47 +83,47 @@ by a user number to avoid conflicts, - or "xlock" if the number of concurrent players is being limited. - It may be necessary to look in the playground to find the correct - base name of the interrupted game. --.I recover -+.I recover-nethack - will transform these level files into a save file of the same name as - .I nethack - would have used. - .PP - Since --.I recover -+.I recover-nethack - must be able to read and delete files from the playground - and create files in the save directory, - it has interesting interactions with game security. - Giving ordinary players access to --.I recover -+.I recover-nethack - through setuid or setgid is tantamount to leaving the playground - world-writable, - with respect to both cheating and messing up other players. - For a single-user system, this of course does not change anything, - so some of the microcomputer ports install --.I recover -+.I recover-nethack - by default. - .PP - For a multi-user system, - the game administrator may want to arrange for all .0 files in the --playground to be fed to recover when the host machine boots, -+playground to be fed to recover-nethack when the host machine boots, - and handle game crashes individually. - If the user population is sufficiently trustworthy, --.I recover -+.I recover-nethack - can be installed with the same permissions the - .I nethack - executable has. - In either case, --.I recover -+.I recover-nethack - is easily compiled from the distribution utility directory. - .SH NOTES - .PP - Like - .I nethack - itself, --.I recover -+.I recover-nethack - will overwrite existing savefiles of the same name. - Savefiles created by --.I recover -+.I recover-nethack - are uncompressed; - they may be compressed afterwards if desired, - but even a compression-using -@@ -133,12 +133,12 @@ will find them in the uncompressed form. - nethack(6) - .SH BUGS - .PP --.I recover -+.I recover-nethack - makes no attempt to find out if a base name specifies a game in progress. - If multiple machines share a playground, this would be impossible to - determine. - .PP --.I recover -+.I recover-nethack - should be taught to use the nethack playground locking mechanism to - avoid conflicts. - .SH COPYRIGHT --- -2.18.0 - diff --git a/games-roguelike/nethack/nethack-3.6.1.ebuild b/games-roguelike/nethack/nethack-3.6.1.ebuild deleted file mode 100644 index 260b50750f9..00000000000 --- a/games-roguelike/nethack/nethack-3.6.1.ebuild +++ /dev/null @@ -1,128 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit desktop flag-o-matic toolchain-funcs - -MY_PV=${PV//.} -DESCRIPTION="The ultimate old-school single player dungeon exploration game" -HOMEPAGE="https://www.nethack.org/" -SRC_URI="https://nethack.org/download/${PV}/nethack-${MY_PV}-src.tgz" - -LICENSE="nethack" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86" -IUSE="X" - -RDEPEND="acct-group/gamestat - sys-libs/ncurses:0= - X? ( - x11-libs/libXaw - x11-libs/libXpm - x11-libs/libXt - )" -DEPEND="${RDEPEND} - X? ( x11-base/xorg-proto ) - " -BDEPEND="virtual/pkgconfig - X? ( - x11-apps/bdftopcf - >=x11-apps/mkfontscale-1.2.0 - )" - -src_prepare() { - eapply "${FILESDIR}/${P}-recover.patch" - eapply_user - - cp "${FILESDIR}/${PN}-3.6.0-hint-$(usex X x11 tty)" hint || die "Failed to copy hint file" - sys/unix/setup.sh hint || die "Failed to run setup.sh" -} - -src_compile() { - append-cflags -I../include -DDLB -DSECURE -DTIMED_DELAY -DVISION_TABLES -DDUMPLOG -DSCORE_ON_BOTL - append-cflags '-DCOMPRESS=\"${EPREFIX}/bin/gzip\"' '-DCOMPRESS_EXTENSION=\".gz\"' - append-cflags "-DHACKDIR=\\\"${EPREFIX}/usr/$(get_libdir)/nethack\\\"" "-DVAR_PLAYGROUND=\\\"${EPREFIX}/var/games/nethack\\\"" - append-cflags "-DDEF_PAGER=\\\"${PAGER}\\\"" - append-cflags -DSYSCF "-DSYSCF_FILE=\\\"${EPREFIX}/etc/nethack.sysconf\\\"" - - use X && append-cflags -DX11_GRAPHICS -DUSE_XPM - - LOCAL_MAKEOPTS=( - CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LFLAGS="${LDFLAGS}" - WINTTYLIB="$($(tc-getPKG_CONFIG) --libs ncurses)" - HACKDIR="${EPREFIX}/usr/$(get_libdir)/nethack" INSTDIR="${ED}/usr/$(get_libdir)/nethack" - SHELLDIR="${ED}/usr/bin" VARDIR="${ED}/var/games/nethack" - ) - - emake "${LOCAL_MAKEOPTS[@]}" nethack recover Guidebook spec_levs - - # Upstream still has some parallel compilation bugs - emake -j1 "${LOCAL_MAKEOPTS[@]}" all -} - -src_install() { - emake "${LOCAL_MAKEOPTS[@]}" install - - mv "${ED}/usr/$(get_libdir)/nethack/recover" "${ED}/usr/bin/recover-nethack" || die "Failed to move recover-nethack" - - doman doc/nethack.6 - newman doc/recover.6 recover-nethack.6 - dodoc doc/Guidebook.txt - - insinto /etc - newins sys/unix/sysconf nethack.sysconf - - insinto /etc/skel - newins "${FILESDIR}/${PN}-3.6.0-nethackrc" .nethackrc - - if use X ; then - cd "${S}/win/X11" || die "Failed to enter win/X11 directory" - - mkdir -p "${ED}/etc/X11/app-defaults/" || die "Failed to make app-defaults directory" - mv "${ED}/usr/$(get_libdir)/nethack/NetHack.ad" "${ED}/etc/X11/app-defaults/" || die "Failed to move NetHack.ad" - - newicon nh_icon.xpm nethack.xpm - make_desktop_entry ${PN} Nethack - - # install nethack fonts - bdftopcf -o nh10.pcf nh10.bdf || die "Converting fonts failed" - bdftopcf -o ibm.pcf ibm.bdf || die "Converting fonts failed" - insinto "/usr/$(get_libdir)/nethack/fonts" - doins *.pcf - mkfontdir "${ED}/usr/$(get_libdir)/nethack/fonts" || die "mkfontdir failed" - fi - - rm -r "${ED}/var/games/nethack" || die "Failed to clean var/games/nethack" - keepdir /var/games/nethack/save -} - -pkg_preinst() { - fowners root:gamestat /var/games/nethack /var/games/nethack/save - fperms 2770 /var/games/nethack /var/games/nethack/save - - fowners root:gamestat "/usr/$(get_libdir)/nethack/nethack" - fperms g+s "/usr/$(get_libdir)/nethack/nethack" -} - -pkg_postinst() { - cd "${EROOT}/var/games/nethack" || die "Failed to enter ${EROOT}/var/games/nethack directory" - - # Transition mechanism for