[Pkg-nethack-devel] nethack/debian changelog,1.10,1.11 nethack-common.config,1.1,1.2 nethack-common.postinst,1.2,1.3 nethack-common.templates,1.1,1.2

Joshua Kwan joshk-guest@quantz.debian.org
Sun, 12 Oct 2003 15:43:36 +0000


Update of /cvsroot/pkg-nethack/nethack/debian
In directory quantz:/tmp/cvs-serv7732/debian

Modified Files:
	changelog nethack-common.config nethack-common.postinst 
	nethack-common.templates 
Log Message:
Ask a question about recover setgidness.


Index: nethack-common.templates
===================================================================
RCS file: /cvsroot/pkg-nethack/nethack/debian/nethack-common.templates,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- nethack-common.templates	12 Oct 2003 05:36:18 -0000	1.1
+++ nethack-common.templates	12 Oct 2003 15:43:33 -0000	1.2
@@ -9,4 +9,16 @@
  the installation pending your own special decision.
  .
  If you choose to back up, the files will be random file names with the
- extension .tar.gz, with 'nethk' and 'nethk-older' in them.
+ extension .tar.gz, prefixed with 'nethk'.
+
+Template: nethack-common/recover-setgid
+Type: boolean
+Default: false
+_Description: Would you like recover to be setgid games?
+ The 'recover' program is installed as part of the nethack-common package
+ and exists to help the administrator recover broken save files etc.
+ However, it is traditionally setgid games, although it does not need to be
+ when run at boot time (as root.) Its only usefulness as a setgid binary
+ is to let players as normal users on the system recover their save files.
+ If you say no, you will have to run recover as root or as someone in group
+ games.

Index: nethack-common.postinst
===================================================================
RCS file: /cvsroot/pkg-nethack/nethack/debian/nethack-common.postinst,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- nethack-common.postinst	12 Oct 2003 05:36:18 -0000	1.2
+++ nethack-common.postinst	12 Oct 2003 15:43:33 -0000	1.3
@@ -18,6 +18,8 @@
 
 set -e
 
+. /usr/share/debconf/confmodule
+
 LOGDIR=/var/games/nethack
 OLDLOGDIR=/var/lib/games/nethack
 
@@ -35,9 +37,7 @@
       fi
       
       if [ -n "$PROCESSDIRS" ]; then
-        . /usr/share/debconf/confmodule
-
-        # The question should have been popped at this point
+         # The question should have been popped at this point
         db_get nethack-common/backup-incompatible
 
         case "$RET" in
@@ -71,10 +71,18 @@
           ignore)
           ;;
         esac
-
-        db_stop
       fi
     fi
+    
+    db_get nethack-common/recover-setgid
+
+    if [ "$RET" = false ]; then
+      chmod 755 /usr/lib/games/nethack/recover
+    else
+      chmod 2755 /usr/lib/games/nethack/recover
+    fi
+    
+    db_stop
     
     for file in perm record logfile; do
       test -e /var/games/nethack/$file || install -m 0664 -o root -g games \

Index: nethack-common.config
===================================================================
RCS file: /cvsroot/pkg-nethack/nethack/debian/nethack-common.config,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- nethack-common.config	12 Oct 2003 05:36:18 -0000	1.1
+++ nethack-common.config	12 Oct 2003 15:43:33 -0000	1.2
@@ -2,20 +2,24 @@
 
 set -e
 
-if dpkg --compare-versions $2 lt 3.4.0; then
-  . /usr/share/debconf/confmodule
+. /usr/share/debconf/confmodule
 
+if dpkg --compare-versions $2 lt 3.4.0; then
   # Save games are not to be treated lightly!
   db_input high nethack-common/backup-incompatible || true
   db_go
 
   db_get nethack-common/backup-incompatible
-  
-  db_stop
-  
+    
   if [ "$RET" = abort ]; then
+    db_stop
     exit 1
   fi
 fi
+
+db_input low nethack-common/recover-setgid || true
+db_go
+
+db_stop
 
 exit 0

Index: changelog
===================================================================
RCS file: /cvsroot/pkg-nethack/nethack/debian/changelog,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- changelog	12 Oct 2003 06:41:17 -0000	1.10
+++ changelog	12 Oct 2003 15:43:33 -0000	1.11
@@ -2,6 +2,8 @@
 
   * NetHack is now comaintained by Ben Gertzfield and Joshua Kwan.
   * New upstream version (closes: #208817)
+    - You can no longer eat while sleeping, possibly fixed in this version,
+      which closes: #184855
   * Acknowledge NMUs/patches, thanks all around to:
       - Mario Lang <mlang@debian.org> (Closes: #186609, #187167)
       - Brian Nelson <pyro@debian.org> (Closes: #184173, #180215)
@@ -10,21 +12,27 @@
     - Merge LISP window system copyright into main copyright file.
     - Add Joshua Kwan to uploaders list for co-maintainership.
   * Joshua Kwan <joshk@triplehelix.org>:
-    - Clean up old bugs:
-      o Fix char signedness issue in gnbind.c (Closes: #170531)
-      o Build nethack dummy package in binary-indep target. (Closes: #186619)
-      o Steal t32-1024.xpm from jnethack - it's missing from NetHack upstream.
-        This allows nethack-gnome to use the larger tileset. (Closes: #140398)
-      o Now using dh_installinit; use defaults, so we don't go to
-        /etc/rcS.d and start before NIS. (Closes: #164132)
     - Fix FTBFS caused by 'Invisible' being a youprop.h #define
       and used in a QListViewIterator enumerated type. (Closes: #213874)
-    - Also fix many qt_win.{cpp,h} warnings.
+    - Fix char signedness issue in gnbind.c (Closes: #170531)
+    - Build nethack dummy package in binary-indep target. (Closes: #186619)
+    - Steal t32-1024.xpm from jnethack - it's missing from NetHack upstream.
+      This allows nethack-gnome to use the larger tileset. (Closes: #140398)
+    - Now using dh_installinit; use defaults, so we don't go to
+      /etc/rcS.d and start before NIS. (Closes: #164132)
+    - No clue how this is meant to help, but it doesn't break anything,
+      so let's wrap all our menu stuff in sh -c '' and see what happens.
+      (Closes: #168385, #168386, #152232)
+    - Allow the administrator to decide whether recover should be setgid
+      games. (Closes: #148983)
     - Add a menu item to GNOME menu for readying/quivering. (Closes: #154627)
+    - Also fix many qt_win.{cpp,h} warnings.
     - Bump Standards-Version to 3.6.1.0:
       o Use our own CFLAGS, this allows us to use DEB_BUILD_OPTIONS=noopt
       o Use /var/mail instead of /var/spool/mail (although both worked as
         the two are still symlinked to each other)
+      o Question about old savegame backup becomes a debconf question,
+        and moved meat of the logic into postinst
     - Use debian/compat instead of DH_COMPAT, bump it to V4.
     - Use 'ln -sf' and 'gzip -f' so that multiple calls of binary-arch
       work without cleaning.
@@ -34,15 +42,11 @@
     - Compress the nethack-common changelog.Debian.
     - Migrate source modifications to dpatch patches and build-depend on
       dpatch.
-    - Move preinst stuff to postinst, and ask the question for backing up
-      old saved games into nethack-common.config (it's a Debconf question
-      now, yes!) Note, DDTP folk: get translating, it's gettextized already!
-    - Oops, actually touch build-lisp-stamp. Shucks.
     - Consolidate massive amounts of nearly duplicate config.hs into one
       common configuration patch for include/config.h and add additional
       -Ds to CFLAGS for each build.
 
- -- Joshua Kwan <joshk@triplehelix.org>  Sat, 11 Oct 2003 23:19:37 -0700
+ -- Joshua Kwan <joshk@triplehelix.org>  Sun, 12 Oct 2003 01:16:19 -0700
  
 nethack (3.4.1-1.2) unstable; urgency=low