VesperOS/shadow
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated patches for 4.0.18.2:

Browse Source 
* 409_man_generate_from_PO
   There is an Italian PO. Patch the Italian Makefile
 * 397_non_numerical_identifier
   usermod was patched. useradd is not patched yet.
This commit is contained in:
nekral-guest
2007-10-28 17:17:48 +00:00
parent c6f0bda817
commit 164c2b24bf
3 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
debian/changelog vendored
View File

@@ -25,6 +25,13 @@ shadow (1:4.0.18.2-1) UNRELEASED; urgency=low
+ 416_man-fr_newgrp
- The upstream tarball is now built with gettext 0.16. Remove
+ 499_gettext-0.15
- Significant changes to patches
+ 397_non_numerical_identifier
usermod.c was already patched upstream; useradd.c was not.
+ 467_useradd_-r_LSB
Simplifications. There should be no changes.
+ 409_man_generate_from_PO
The Italian PO was added upstream. Patch the Italian Makefile.
* Upstream bugs not fixed in upstream's CVS:
- debian/securetty.linux: Added xvc0 and hvc0 consoles to the Linux's
consoles where root login is allowed. (triggered by #423389)

25
debian/patches/397_non_numerical_identifier vendored
View File

@@ -3,19 +3,20 @@ Goal: allow non numerical group identifier to be specified with useradd's
Fixes: #381394, #381399, #381404, #381408, #381448
Status wrt upstream: Applied in CVS
Status wrt upstream: Was applied in CVS for usermod
Index: shadow-4.0.18.1/src/useradd.c
===================================================================
--- shadow-4.0.18.1.orig/src/useradd.c 2006-09-17 12:25:16.499523435 +0200
+++ shadow-4.0.18.1/src/useradd.c 2006-09-17 12:25:28.379617865 +0200
@@ -206,11 +206,8 @@
@@ -206,12 +206,8 @@
char *errptr;
gid = strtol (grname, &errptr, 10);
- if (*errptr || errno == ERANGE || gid < 0) {
- fprintf (stderr,
- _("%s: invalid numeric argument '%s'\n"), Prog, grname);
- _("%s: invalid numeric argument '%s'\n"), Prog,
- grname);
- exit (E_BAD_ARG);
- }
+ if (*grname != '\0' && *errptr == '\0' && errno != ERANGE && gid >= 0)
@@ -23,21 +24,3 @@ Index: shadow-4.0.18.1/src/useradd.c
return getgrnam (grname);
}
Index: shadow-4.0.18.1/src/usermod.c
===================================================================
--- shadow-4.0.18.1.orig/src/usermod.c 2006-09-17 12:25:24.475586833 +0200
+++ shadow-4.0.18.1/src/usermod.c 2006-09-17 12:25:28.383617897 +0200
@@ -167,11 +167,8 @@
char *errptr;
val = strtol (grname, &errptr, 10);
- if (*errptr || errno == ERANGE || val < 0) {
- fprintf (stderr, _("%s: invalid numeric argument '%s'\n"), Prog,
- grname);
- exit (E_BAD_ARG);
- }
+ if (*grname != '\0' && *errptr == '\0' && errno != ERANGE && val >= 0)
+ return getgrgid (val);
return getgrnam (grname);
}

52
debian/patches/409_man_generate_from_PO vendored
View File

@@ -5,10 +5,10 @@ man_MANS (and man_nopam) variables.
Status wrt upstream: not reported yet.
Index: shadow-4.0.18.1/man/Makefile.am
Index: shadow-4.0.18.2/man/Makefile.am
===================================================================
--- shadow-4.0.18.1.orig/man/Makefile.am 2007-05-17 13:50:42.000000000 +0200
+++ shadow-4.0.18.1/man/Makefile.am 2007-05-17 13:50:43.000000000 +0200
--- shadow-4.0.18.2.orig/man/Makefile.am 2007-10-28 17:50:38.000000000 +0100
+++ shadow-4.0.18.2/man/Makefile.am 2007-10-28 17:50:40.000000000 +0100
@@ -114,141 +114,20 @@
if ENABLE_REGENERATE_MAN
@@ -157,10 +157,10 @@ Index: shadow-4.0.18.1/man/Makefile.am
$(POFILES): shadow-man-pages.pot
Index: shadow-4.0.18.1/man/de/Makefile.am
Index: shadow-4.0.18.2/man/de/Makefile.am
===================================================================
--- shadow-4.0.18.1.orig/man/de/Makefile.am 2006-08-03 12:00:56.000000000 +0200
+++ shadow-4.0.18.1/man/de/Makefile.am 2007-05-17 13:50:43.000000000 +0200
--- shadow-4.0.18.2.orig/man/de/Makefile.am 2007-10-28 17:50:37.000000000 +0100
+++ shadow-4.0.18.2/man/de/Makefile.am 2007-10-28 17:50:40.000000000 +0100
@@ -13,3 +13,6 @@
vipw.8
@@ -168,10 +168,10 @@ Index: shadow-4.0.18.1/man/de/Makefile.am
+
+include ../generate_translations.mak
+
Index: shadow-4.0.18.1/man/fr/Makefile.am
Index: shadow-4.0.18.2/man/fr/Makefile.am
===================================================================
--- shadow-4.0.18.1.orig/man/fr/Makefile.am 2006-08-03 12:25:46.000000000 +0200
+++ shadow-4.0.18.1/man/fr/Makefile.am 2007-05-17 15:43:17.000000000 +0200
--- shadow-4.0.18.2.orig/man/fr/Makefile.am 2007-10-28 17:50:37.000000000 +0100
+++ shadow-4.0.18.2/man/fr/Makefile.am 2007-10-28 17:50:40.000000000 +0100
@@ -53,3 +53,6 @@
EXTRA_DIST = \
$(man_MANS) \
@@ -179,10 +179,10 @@ Index: shadow-4.0.18.1/man/fr/Makefile.am
+
+include ../generate_translations.mak
+
Index: shadow-4.0.18.1/man/generate_translations.mak
Index: shadow-4.0.18.2/man/generate_translations.mak
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ shadow-4.0.18.1/man/generate_translations.mak 2007-05-17 15:44:34.000000000 +0200
+++ shadow-4.0.18.2/man/generate_translations.mak 2007-10-28 17:50:40.000000000 +0100
@@ -0,0 +1,20 @@
+if ENABLE_REGENERATE_MAN
+
@@ -204,21 +204,21 @@ Index: shadow-4.0.18.1/man/generate_translations.mak
+CLEANFILES = .xml2po.mo $(man_MANS) $(addsuffix .xml,$(man_MANS))
+
+endif
Index: shadow-4.0.18.1/man/pl/Makefile.am
Index: shadow-4.0.18.2/man/pl/Makefile.am
===================================================================
--- shadow-4.0.18.1.orig/man/pl/Makefile.am 2006-08-03 12:08:58.000000000 +0200
+++ shadow-4.0.18.1/man/pl/Makefile.am 2007-05-17 13:50:43.000000000 +0200
@@ -53,3 +53,6 @@
--- shadow-4.0.18.2.orig/man/pl/Makefile.am 2007-10-28 17:50:37.000000000 +0100
+++ shadow-4.0.18.2/man/pl/Makefile.am 2007-10-28 17:50:40.000000000 +0100
@@ -54,3 +54,6 @@
id.1 \
shadow.3 \
sulogin.8
+
+include ../generate_translations.mak
+
Index: shadow-4.0.18.1/man/ru/Makefile.am
Index: shadow-4.0.18.2/man/ru/Makefile.am
===================================================================
--- shadow-4.0.18.1.orig/man/ru/Makefile.am 2006-08-03 12:09:45.000000000 +0200
+++ shadow-4.0.18.1/man/ru/Makefile.am 2007-05-17 13:50:43.000000000 +0200
--- shadow-4.0.18.2.orig/man/ru/Makefile.am 2007-10-28 17:50:37.000000000 +0100
+++ shadow-4.0.18.2/man/ru/Makefile.am 2007-10-28 17:50:40.000000000 +0100
@@ -58,3 +58,6 @@
$(man_nopam) \
id.1 \
@@ -226,10 +226,10 @@ Index: shadow-4.0.18.1/man/ru/Makefile.am
+
+include ../generate_translations.mak
+
Index: shadow-4.0.18.1/man/sv/Makefile.am
Index: shadow-4.0.18.2/man/sv/Makefile.am
===================================================================
--- shadow-4.0.18.1.orig/man/sv/Makefile.am 2007-05-17 13:50:41.000000000 +0200
+++ shadow-4.0.18.1/man/sv/Makefile.am 2007-05-17 13:50:43.000000000 +0200
--- shadow-4.0.18.2.orig/man/sv/Makefile.am 2007-10-28 17:50:38.000000000 +0100
+++ shadow-4.0.18.2/man/sv/Makefile.am 2007-10-28 17:50:40.000000000 +0100
@@ -55,3 +55,6 @@
EXTRA_DIST = \
$(man_MANS) \
@@ -237,3 +237,13 @@ Index: shadow-4.0.18.1/man/sv/Makefile.am
+
+include ../generate_translations.mak
+
Index: shadow-4.0.18.2/man/it/Makefile.am
===================================================================
--- shadow-4.0.18.2.orig/man/it/Makefile.am 2007-10-28 17:51:43.000000000 +0100
+++ shadow-4.0.18.2/man/it/Makefile.am 2007-10-28 17:52:06.000000000 +0100
@@ -49,3 +49,5 @@
$(man_nopam) \
id.1
+include ../generate_translations.mak
+