CVS commit: pkgsrc/games/nethack-lib

["Masatake Daimon" <pho%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   pho
Date:           Wed Jan  8 16:55:13 UTC 2020

Modified Files:
        pkgsrc/games/nethack-lib: Makefile distinfo
Added Files:
        pkgsrc/games/nethack-lib/patches: patch-util_recover.c

Log Message:
Set a setuid bit on bin/recover too

Also corrected the default directory where bin/recover searches for
save files.


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 pkgsrc/games/nethack-lib/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/games/nethack-lib/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/games/nethack-lib/patches/patch-util_recover.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/games/nethack-lib/Makefile
diff -u pkgsrc/games/nethack-lib/Makefile:1.32 pkgsrc/games/nethack-lib/Makefile:1.33
--- pkgsrc/games/nethack-lib/Makefile:1.32      Thu Oct 24 11:51:23 2019
+++ pkgsrc/games/nethack-lib/Makefile   Wed Jan  8 16:55:13 2020
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.32 2019/10/24 11:51:23 pho Exp $
+# $NetBSD: Makefile,v 1.33 2020/01/08 16:55:13 pho Exp $
 #
 
 .include               "../../games/nethack-lib/Makefile.common"
 
 PKGNAME=               nethack-lib-${NETHACK_VERSION}
+PKGREVISION=           1
 
 COMMENT=               Data files for Nethack
 
@@ -47,4 +48,9 @@ CHECK_FILES_SKIP+=    ${VARDIR}/logfile                               
                        ${VARDIR}/xlogfile                              \
                        ${HACKDIR}/sysconf
 
+# Like bin/nethack-*, bin/recover also has to operate on save files
+# owned by ${NETHACK_USER}:${NETHACK_GROUP}. This means bin/recover
+# can only work when it's setuid'ed to that user/group.
+SPECIAL_PERMS+=                ${PREFIX}/bin/recover ${GAMEPERM}
+
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/games/nethack-lib/distinfo
diff -u pkgsrc/games/nethack-lib/distinfo:1.24 pkgsrc/games/nethack-lib/distinfo:1.25
--- pkgsrc/games/nethack-lib/distinfo:1.24      Thu Dec 19 14:41:59 2019
+++ pkgsrc/games/nethack-lib/distinfo   Wed Jan  8 16:55:13 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.24 2019/12/19 14:41:59 rhialto Exp $
+$NetBSD: distinfo,v 1.25 2020/01/08 16:55:13 pho Exp $
 
 SHA1 (nethack-364-src.tgz) = e8166806a65893d7b843718c37b8aa9e87cfcef1
 RMD160 (nethack-364-src.tgz) = 0af138fd481e6359f265d85423a36a160692dc92
@@ -14,3 +14,4 @@ SHA1 (patch-sys_unix_Makefile.src) = 35e
 SHA1 (patch-sys_unix_Makefile.top) = 0736aafda67dec45657f9f15338ce2f89add9747
 SHA1 (patch-sys_unix_Makefile.utl) = 142f267fdd9a94c212657b7242dea6a3716c738e
 SHA1 (patch-sys_unix_nethack.sh) = eec4b6619584d7e07ac5d9a086af9bc8f7e6285f
+SHA1 (patch-util_recover.c) = 60e5ec35313a97cf788ff1ed4a4772bbcf24bc48

Added files:

Index: pkgsrc/games/nethack-lib/patches/patch-util_recover.c
diff -u /dev/null pkgsrc/games/nethack-lib/patches/patch-util_recover.c:1.1
--- /dev/null   Wed Jan  8 16:55:13 2020
+++ pkgsrc/games/nethack-lib/patches/patch-util_recover.c       Wed Jan  8 16:55:13 2020
@@ -0,0 +1,19 @@
+$NetBSD: patch-util_recover.c,v 1.1 2020/01/08 16:55:13 pho Exp $
+
+The directory where save files are located is defined as
+VAR_PLAYGROUND. HACKDIR only has static files.
+
+--- util/recover.c.orig        2020-01-08 16:49:06.924084164 +0000
++++ util/recover.c
+@@ -121,9 +121,9 @@ char *argv[];
+     }
+ #endif /* SECURE && !VMS */
+ 
+-#ifdef HACKDIR
++#ifdef VAR_PLAYGROUND
+     if (!dir)
+-        dir = HACKDIR;
++        dir = VAR_PLAYGROUND;
+ #endif
+ 
+ #ifdef AMIGA