[Pkg-shadow-commits] r1006 - trunk/debian/patches
Christian Perrier
bubulle at costa.debian.org
Wed May 31 16:22:15 UTC 2006
Author: bubulle
Date: 2006-05-31 16:22:14 +0000 (Wed, 31 May 2006)
New Revision: 1006
Modified:
trunk/debian/patches/466_fflush-prompt
Log:
Adapted for 4.0.16
Modified: trunk/debian/patches/466_fflush-prompt
===================================================================
--- trunk/debian/patches/466_fflush-prompt 2006-05-31 16:19:12 UTC (rev 1005)
+++ trunk/debian/patches/466_fflush-prompt 2006-05-31 16:22:14 UTC (rev 1006)
@@ -3,10 +3,10 @@
Status wrt upstream: may appear in 4.0.14
-Index: shadow-4.0.15/libmisc/Makefile.am
+Index: shadow-4.0.16/libmisc/Makefile.am
===================================================================
---- shadow-4.0.15.orig/libmisc/Makefile.am 2006-03-08 19:32:09.500368352 +0100
-+++ shadow-4.0.15/libmisc/Makefile.am 2006-03-08 19:33:49.240163907 +0100
+--- shadow-4.0.16.orig/libmisc/Makefile.am 2005-09-05 23:21:37.000000000 +0700
++++ shadow-4.0.16/libmisc/Makefile.am 2006-05-31 23:20:37.606305440 +0700
@@ -49,4 +49,5 @@
ulimit.c \
utmp.c \
@@ -14,10 +14,10 @@
- xmalloc.c
+ xmalloc.c \
+ yesno.c
-Index: shadow-4.0.15/libmisc/fields.c
+Index: shadow-4.0.16/libmisc/fields.c
===================================================================
---- shadow-4.0.15.orig/libmisc/fields.c 2006-03-08 19:32:09.501368149 +0100
-+++ shadow-4.0.15/libmisc/fields.c 2006-03-08 19:33:49.242163502 +0100
+--- shadow-4.0.16.orig/libmisc/fields.c 2005-09-01 00:24:57.000000000 +0700
++++ shadow-4.0.16/libmisc/fields.c 2006-05-31 23:20:37.608305136 +0700
@@ -71,6 +71,7 @@
maxsize = sizeof (newf);
@@ -26,10 +26,10 @@
if (fgets (newf, maxsize, stdin) != newf)
return;
-Index: shadow-4.0.15/libmisc/yesno.c
+Index: shadow-4.0.16/libmisc/yesno.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ shadow-4.0.15/libmisc/yesno.c 2006-03-08 19:33:49.243163299 +0100
++++ shadow-4.0.16/libmisc/yesno.c 2006-05-31 23:20:37.609304984 +0700
@@ -0,0 +1,41 @@
+/*
+ * Common code for yes/no prompting
@@ -72,10 +72,10 @@
+
+ return 0;
+}
-Index: shadow-4.0.15/src/grpck.c
+Index: shadow-4.0.16/src/grpck.c
===================================================================
---- shadow-4.0.15.orig/src/grpck.c 2006-03-08 19:33:37.719497666 +0100
-+++ shadow-4.0.15/src/grpck.c 2006-03-08 19:33:49.248162287 +0100
+--- shadow-4.0.16.orig/src/grpck.c 2006-05-31 22:58:28.264396128 +0700
++++ shadow-4.0.16/src/grpck.c 2006-05-31 23:21:44.575124632 +0700
@@ -50,6 +50,8 @@
extern struct commonio_entry *__sgr_get_head (void);
#endif
@@ -144,23 +144,23 @@
@@ -397,7 +374,7 @@
grp->gr_name, grp->gr_mem[i]);
- printf (_("delete member `%s'? "), grp->gr_mem[i]);
+ printf (_("delete member '%s'? "), grp->gr_mem[i]);
- if (!yes_or_no ())
+ if (!yes_or_no (read_only))
continue;
- SYSLOG ((LOG_INFO, "delete member `%s' group `%s'",
-@@ -421,7 +398,7 @@
- printf (_("add group `%s' in %s? "),
- grp->gr_name, sgr_file);
+ SYSLOG ((LOG_INFO, "delete member '%s' group '%s'",
+@@ -422,7 +399,7 @@
+ printf (_("add group '%s' in %s ?"),
+ grp->gr_name, sgr_file);
errors++;
-- if (yes_or_no ())
-+ if (yes_or_no (read_only))
- {
+- if (yes_or_no ()) {
++ if (yes_or_no (read_only)) {
struct sgrp sg;
struct group gr;
-@@ -503,7 +480,7 @@
+ static char *empty = NULL;
+@@ -509,7 +486,7 @@
/*
* prompt the user to delete the entry or not
*/
@@ -169,7 +169,7 @@
continue;
/*
-@@ -559,7 +536,7 @@
+@@ -565,7 +542,7 @@
/*
* prompt the user to delete the entry or not
*/
@@ -178,17 +178,17 @@
goto delete_sg;
}
-@@ -571,7 +548,7 @@
- printf (_("no matching group file entry in %s\n"), grp_file);
- printf (_("delete line `%s'? "), sge->line);
+@@ -578,7 +555,7 @@
+ grp_file);
+ printf (_("delete line '%s'? "), sge->line);
errors++;
- if (yes_or_no ())
+ if (yes_or_no (read_only))
goto delete_sg;
} else {
/**
-@@ -611,7 +588,7 @@
- printf (_("delete administrative member `%s'? "),
+@@ -619,7 +596,7 @@
+ printf (_("delete administrative member '%s'? "),
sgr->sg_adm[i]);
- if (!yes_or_no ())
@@ -196,19 +196,19 @@
continue;
SYSLOG ((LOG_INFO,
-@@ -638,7 +615,7 @@
+@@ -646,7 +623,7 @@
sgr->sg_name, sgr->sg_mem[i]);
- printf (_("delete member `%s'? "), sgr->sg_mem[i]);
+ printf (_("delete member '%s'? "), sgr->sg_mem[i]);
- if (!yes_or_no ())
+ if (!yes_or_no (read_only))
continue;
SYSLOG ((LOG_INFO,
-Index: shadow-4.0.15/src/pwck.c
+Index: shadow-4.0.16/src/pwck.c
===================================================================
---- shadow-4.0.15.orig/src/pwck.c 2006-03-08 19:33:37.722497059 +0100
-+++ shadow-4.0.15/src/pwck.c 2006-03-08 19:33:49.251161679 +0100
+--- shadow-4.0.16.orig/src/pwck.c 2006-05-08 00:44:39.000000000 +0700
++++ shadow-4.0.16/src/pwck.c 2006-05-31 23:20:37.620303312 +0700
@@ -49,6 +49,8 @@
extern void __spw_del_entry (const struct commonio_entry *);
extern struct commonio_entry *__spw_get_head (void);
@@ -276,7 +276,7 @@
goto delete_pw;
}
-@@ -457,7 +433,7 @@
+@@ -462,7 +438,7 @@
/*
* prompt the user to delete the entry or not
*/
@@ -285,7 +285,7 @@
continue;
/*
-@@ -512,7 +488,7 @@
+@@ -517,7 +493,7 @@
/*
* prompt the user to delete the entry or not
*/
@@ -294,7 +294,7 @@
goto delete_spw;
}
-@@ -533,7 +509,7 @@
+@@ -538,7 +514,7 @@
/*
* prompt the user to delete the entry or not
*/
More information about the Pkg-shadow-commits
mailing list