[Pkg-shadow-commits] r596 - in trunk/debian: . patches

Christian Perrier bubulle at costa.debian.org
Wed Oct 12 20:59:13 UTC 2005 

Author: bubulle
Date: 2005-10-12 20:59:12 +0000 (Wed, 12 Oct 2005)
New Revision: 596

Added:
   trunk/debian/patches/501_commonio_group_shadow
Removed:
   trunk/debian/add-shell.8
   trunk/debian/add-shell.sh
   trunk/debian/patches/457_commonio_group_shadow
   trunk/debian/remove-shell.8
   trunk/debian/remove-shell.sh
Modified:
   trunk/debian/changelog
   trunk/debian/patches/README.patches
   trunk/debian/rules
Log:
Rename 457 to 501
Document what are 5xx patches
Install upstream changelog
Remove {add|remove}-shell.*


Deleted: trunk/debian/add-shell.8
===================================================================
--- trunk/debian/add-shell.8	2005-10-12 20:34:36 UTC (rev 595)
+++ trunk/debian/add-shell.8	2005-10-12 20:59:12 UTC (rev 596)
@@ -1,16 +0,0 @@
-.TH ADD-SHELL 8 "7 Apr 2005"
-.SH NAME
-add-shell \- add shells to the list of valid login shells
-.SH SYNOPSIS
-.B  add-shell
-.I  shellname
-.RI [ shellname ...]
-.SH DESCRIPTION
-.B add-shell
-copy \fI/etc/shells\fR to \fI/etc/shells.tmp\fR, add the given shells to
-this file if they are not already present, and copy this temporary file
-back to \fI/etc/shells\fR.
-
-The shells must be provided by their full pathnames.
-.SH "SEE ALSO"
-.BR shells (5)

Deleted: trunk/debian/add-shell.sh
===================================================================
--- trunk/debian/add-shell.sh	2005-10-12 20:34:36 UTC (rev 595)
+++ trunk/debian/add-shell.sh	2005-10-12 20:59:12 UTC (rev 596)
@@ -1,40 +0,0 @@
-#!/bin/sh -e
-
-if test $# -eq 0
-then
-	echo usage: $0 shellname [shellname ...]
-	exit 1
-fi
-
-file=/etc/shells
-# I want this to be GUARANTEED to be on the same filesystem as $file
-tmpfile=${file}.tmp
-
-set -o noclobber
-
-trap "rm -f $tmpfile" EXIT
-        
-if ! cat $file > $tmpfile
-then
-        cat 1>&2 <<EOF
-Either another instance of $0 is running, or it was previously interrupted.
-Please examine ${tmpfile} to see if it should be moved onto ${file}.
-EOF
-        exit 1
-fi
-
-for i
-do
-        if ! grep -q "^${i}$" $tmpfile >/dev/null
-        then
-                echo $i >> $tmpfile
-        fi
-done
-
-chmod --reference=$file $tmpfile
-chown --reference=$file $tmpfile
-
-mv $tmpfile $file
-
-trap "" EXIT
-exit 0

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2005-10-12 20:34:36 UTC (rev 595)
+++ trunk/debian/changelog	2005-10-12 20:59:12 UTC (rev 596)
@@ -39,6 +39,7 @@
       - pack upstream's NEWS file into login and passwd. Closes: #331487
       - pack login.defs and its manpages into "passwd" instead of "login"
         package for the Hurd platform. Closes: #249372
+      - copy upstream's changelog. Closes: #331487
     - debian/passwd.config, debian/passwd.templates:
       - allow preseeding the root (and user) password with a MD5 hash
         Closes: #275343, #304352

Deleted: trunk/debian/patches/457_commonio_group_shadow
===================================================================
--- trunk/debian/patches/457_commonio_group_shadow	2005-10-12 20:34:36 UTC (rev 595)
+++ trunk/debian/patches/457_commonio_group_shadow	2005-10-12 20:59:12 UTC (rev 596)
@@ -1,39 +0,0 @@
-Goal: save the [g]shadow files with the 'shadow' group and mode 0440
-
-Fixes: #166793
-
-Index: shadow-4.0.13/lib/commonio.c
-===================================================================
---- shadow-4.0.13.orig/lib/commonio.c	2005-09-24 14:22:50.000000000 +0200
-+++ shadow-4.0.13/lib/commonio.c	2005-10-12 19:24:36.000000000 +0200
-@@ -11,6 +11,7 @@
- #include <stdio.h>
- #include <signal.h>
- #include <pwd.h>
-+#include <grp.h>
- #include <nscd.h>
- #ifdef HAVE_SHADOW_H
- #include <shadow.h>
-@@ -669,13 +670,20 @@
- 			goto fail;
- 		}
- 	} else {
-+		struct group *grp;
- 		/*
- 		 * Default permissions for new [g]shadow files.
- 		 * (passwd and group always exist...)
- 		 */
--		sb.st_mode = 0400;
-+		sb.st_mode = 0440;
- 		sb.st_uid = 0;
--		sb.st_gid = 0;
-+		/*
-+		 * Try to retrieve the shadow's GID, and fall back to GID 0.
-+		 */
-+		if ((grp = getgrnam("shadow")) != NULL)
-+			sb.st_gid = grp->gr_gid;
-+		else
-+			sb.st_gid = 0;
- 	}
- 
- 	snprintf (buf, sizeof buf, "%s+", db->filename);

Copied: trunk/debian/patches/501_commonio_group_shadow (from rev 595, trunk/debian/patches/457_commonio_group_shadow)

Modified: trunk/debian/patches/README.patches
===================================================================
--- trunk/debian/patches/README.patches	2005-10-12 20:34:36 UTC (rev 595)
+++ trunk/debian/patches/README.patches	2005-10-12 20:59:12 UTC (rev 596)
@@ -23,6 +23,10 @@
  and have NOT been accepted and/or applied upstream. These patches MUST be kept
  even after resynced with upstream
 
+-The 5xx series are patches which are applied to Debian's shadow
+ and will never be proposed upstream because they're too specific
+ This list SHOULD BE AS SHORT AS POSSIBLE
+
 In short, while we are working towards synchronisation with upstream,
 our goal is to make 0xx patches disappear by moving them either to 3xx
 series (things already implemented upstream) or to 4xx series

Deleted: trunk/debian/remove-shell.8
===================================================================
--- trunk/debian/remove-shell.8	2005-10-12 20:34:36 UTC (rev 595)
+++ trunk/debian/remove-shell.8	2005-10-12 20:59:12 UTC (rev 596)
@@ -1,14 +0,0 @@
-.TH REMOVE-SHELL 8 "7 Apr 2005"
-.SH NAME
-remove-shell \- remove shells from the list of valid login shells
-.SH SYNOPSIS
-.B  remove-shell
-.I  shellname
-.RI [ shellname ...]
-.SH DESCRIPTION
-.B remove-shell
-operates on the temporary files \fI/etc/shells.tmp\fR and
-\fI/etc/shells.tmp2\fR to remove the given shells from the list of valid
-login shells, and copy the result back to \fI/etc/shells\fR.
-.SH "SEE ALSO"
-.BR shells (5)

Deleted: trunk/debian/remove-shell.sh
===================================================================
--- trunk/debian/remove-shell.sh	2005-10-12 20:34:36 UTC (rev 595)
+++ trunk/debian/remove-shell.sh	2005-10-12 20:59:12 UTC (rev 596)
@@ -1,40 +0,0 @@
-#!/bin/sh -e
-
-if test $# -eq 0
-then
-	echo usage: $0 shellname '[shellname ...]' 1>&2
-	exit 1
-fi
-
-file=/etc/shells
-# I want this to be GUARANTEED to be on the same filesystem as $file
-tmpfile=${file}.tmp
-otmpfile=${file}.tmp2
-
-set -o noclobber
-
-trap "rm -f $tmpfile $otmpfile" EXIT
-        
-if ! cat $file > $tmpfile
-then
-        cat 1>&2 <<EOF
-Either another instance of $0 is running, or it was previously interrupted.
-Please examine ${tmpfile} to see if it should be moved onto ${file}.
-EOF
-        exit 1
-fi
-
-# this is supposed to be reliable, not pretty
-for i
-do
-	grep -v "^${i}$" $tmpfile > $otmpfile || true
-	mv $otmpfile $tmpfile
-done
-
-chmod --reference=$file $tmpfile
-chown --reference=$file $tmpfile
-
-mv $tmpfile $file
-
-trap "" EXIT
-exit 0

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2005-10-12 20:34:36 UTC (rev 595)
+++ trunk/debian/rules	2005-10-12 20:59:12 UTC (rev 596)
@@ -152,7 +152,7 @@
 	dh_installdocs -A NEWS
 	dh_installexamples
 	dh_compress
-	dh_installchangelogs
+	dh_installchangelogs ChangeLog
 	dh_fixperms
 	chmod u+s debian/passwd/usr/bin/chfn
 	chmod u+s debian/passwd/usr/bin/chsh

More information about the Pkg-shadow-commits mailing list