[Pkg-shadow-commits] r414 - branches/experimental/debian/patches
Nicolas FRANCOIS
nekral-guest at costa.debian.org
Tue Jul 26 01:04:35 UTC 2005
Author: nekral-guest
Date: 2005-07-26 01:04:34 +0000 (Tue, 26 Jul 2005)
New Revision: 414
Modified:
branches/experimental/debian/patches/005_manpages.dpatch
branches/experimental/debian/patches/363_su_ignore_SIGINT
branches/experimental/debian/patches/424_pwck.8_quiet_option
branches/experimental/debian/patches/443_man_it_Makefile.am
Log:
Those are still here;)
Modified: branches/experimental/debian/patches/005_manpages.dpatch
===================================================================
--- branches/experimental/debian/patches/005_manpages.dpatch 2005-07-26 01:01:57 UTC (rev 413)
+++ branches/experimental/debian/patches/005_manpages.dpatch 2005-07-26 01:04:34 UTC (rev 414)
@@ -1,5 +1,7 @@
Note: * the man pages were not generated from the XML (there will be a new
build dependency).
+ To generate the man pages:
+ xsltproc /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl xx.xml
* the XML pages were not verified.
Index: shadow-4.0.10/man/su.1
@@ -46,7 +48,7 @@
+user's environment is not changed.
.PP
- A subsystem login is indicated by the presense of a "*" as the first character of the login shell\&. The given home directory will be used as the root of a new filesystem which the user is actually logged into\&.
+ A subsystem login is indicated by the presence of a "*" as the first character of the login shell\&. The given home directory will be used as the root of a new file system which the user is actually logged into\&.
+.SH OPTIONS
+.TP
@@ -68,7 +70,7 @@
+it's assumed to be a restricted account, a normal su is performed, and
+those options are ignored silently.
+.PP
-+A subsystem login is indicated by the presense of a "*" as the first
++A subsystem login is indicated by the presence of a "*" as the first
+character of the login shell. The given home directory will be used as
+the root of a new filesystem which the user is actually logged into.
+.PP
@@ -163,7 +165,7 @@
+ the user's environment is not changed.
</para>
- <para>A subsystem login is indicated by the presense of a "*" as the
+ <para>A subsystem login is indicated by the presence of a "*" as the
@@ -65,6 +79,70 @@
</para>
</refsect1>
@@ -221,7 +223,7 @@
+ are ignored silently.
+ </para>
+
-+ <para>A subsystem login is indicated by the presense of a "*" as the first
++ <para>A subsystem login is indicated by the presence of a "*" as the first
+ character of the login shell. The given home directory will be used as
+ the root of a new filesystem which the user is actually logged into.
+ </para>
Modified: branches/experimental/debian/patches/363_su_ignore_SIGINT
===================================================================
--- branches/experimental/debian/patches/363_su_ignore_SIGINT 2005-07-26 01:01:57 UTC (rev 413)
+++ branches/experimental/debian/patches/363_su_ignore_SIGINT 2005-07-26 01:04:34 UTC (rev 414)
@@ -14,20 +14,11 @@
===================================================================
--- shadow-4.0.3.orig/src/su.c 2005-06-21 23:26:13.808723000 +0200
+++ shadow-4.0.3/src/su.c 2005-06-21 23:27:58.518723000 +0200
-@@ -538,6 +538,8 @@
- if (shell == 0)
- shell = (char *) strdup (pwent.pw_shell);
-
-+ signal(SIGINT, SIG_IGN);
-+ signal(SIGQUIT, SIG_IGN);
- #ifdef USE_PAM
- ret = pam_authenticate (pamh, 0);
- if (ret != PAM_SUCCESS) {
@@ -629,6 +631,7 @@
#endif /* !USE_PAM */
signal (SIGINT, SIG_DFL);
+ signal (SIGQUIT, SIG_DFL);
+ #ifndef USE_PAM
cp = getdef_str ((pwent.pw_uid == 0) ? "ENV_SUPATH" : "ENV_PATH");
- #if 0
- addenv (cp ? cp : "PATH=/bin:/usr/bin", NULL);
+
Modified: branches/experimental/debian/patches/424_pwck.8_quiet_option
===================================================================
--- branches/experimental/debian/patches/424_pwck.8_quiet_option 2005-07-26 01:01:57 UTC (rev 413)
+++ branches/experimental/debian/patches/424_pwck.8_quiet_option 2005-07-26 01:04:34 UTC (rev 414)
@@ -1,44 +1,53 @@
-Goal: document the -q option
+Goal: document the -q option:
+ -q can be used with -r
+ -q just mask warnings, but if an action is necessary, it asks for
+ the proper action.
Fixes: 309408
Status wrt upstream: It should be forwarded to upstream.
-Index: shadow-4.0.10/man/pwck.8
+Index: shadow-4.0.11.1/man/pwck.8
===================================================================
---- shadow-4.0.10.orig/man/pwck.8 2005-06-16 22:15:52.000000000 +0200
-+++ shadow-4.0.10/man/pwck.8 2005-07-09 13:37:22.000000000 +0200
-@@ -24,7 +24,7 @@
+--- shadow-4.0.11.1.orig/man/pwck.8 2005-07-12 19:31:55.000000000 +0300
++++ shadow-4.0.11.1/man/pwck.8 2005-07-25 18:25:35.000000000 +0300
+@@ -30,7 +30,7 @@
.ad l
.hy 0
.HP 5
--\fBpwck\fR [\-sr] [\fIpasswd\fR\ \fIshadow\fR]
-+\fBpwck\fR [\-qsr] [\fIpasswd\fR\ \fIshadow\fR]
+-\fBpwck\fR [\-r] [\fIpasswd\fR\ \fIshadow\fR]
++\fBpwck\fR [\-q] [\-r] [\fIpasswd\fR\ \fIshadow\fR]
.ad
.hy
-@@ -67,6 +67,10 @@
- .PP
- By default, \fBpwck\fR operates on the files \fI/etc/passwd\fR and \fI/etc/shadow\fR\&. The user may select alternate files with the \fIpasswd\fR and \fIshadow\fR parameters\&. Additionally, the user may execute the command in read\-only mode by specifying the \fB\-r\fR flag\&. This causes all questions regarding changes to be answered \fIno\fR without user intervention\&. \fBpwck\fR can also sort entries in \fI/etc/passwd\fR and \fI/etc/shadow\fR by UID\&. To run it in sort mode pass it \fB\-s\fR flag\&. No checks are performed then, it just sorts\&.
+@@ -75,7 +75,7 @@
-+.PP
-+With the \fB\-q\fR flag, \fBpwck\fR will only report errors which require an
-+action from the user.
-+
- .SH "FILES"
+ .TP
+ \fB\-q\fR
+-Report errors only\&. Using this option will not require an action from the user\&.
++Report errors only\&. The warnings which do not require any action from the user won't be displayed\&.
.TP
-Index: shadow-4.0.10/man/pwck.8.xml
+ \fB\-r\fR
+Index: shadow-4.0.11.1/man/pwck.8.xml
===================================================================
---- shadow-4.0.10.orig/man/pwck.8.xml 2005-06-16 22:09:08.000000000 +0200
-+++ shadow-4.0.10/man/pwck.8.xml 2005-07-09 13:38:32.000000000 +0200
-@@ -92,6 +92,10 @@
- by UID. To run it in sort mode pass it <option>-s</option> flag. No
- checks are performed then, it just sorts.
- </para>
-+
-+ <para>With the <option>-q</option> flag, <command>pwck</command> will
-+ only report errors which require an action from the user.
-+ </para>
- </refsect1>
-
- <refsect1 id='files'>
+--- shadow-4.0.11.1.orig/man/pwck.8.xml 2005-07-12 19:28:14.000000000 +0300
++++ shadow-4.0.11.1/man/pwck.8.xml 2005-07-25 18:24:47.000000000 +0300
+@@ -28,6 +28,7 @@
+ </cmdsynopsis>
+ <cmdsynopsis>
+ <command>pwck</command>
++ <arg choice='opt'>-q </arg>
+ <arg choice='opt'>-r </arg>
+ <arg choice='opt'>
+ <arg choice='plain'>
+@@ -101,8 +102,8 @@
+ </term>
+ <listitem>
+ <para>
+- Report errors only. Using this option will not require an action
+- from the user.
++ Report errors only. The warnings which do not require any
++ action from the user won't be displayed.
+ </para>
+ </listitem>
+ </varlistentry>
Modified: branches/experimental/debian/patches/443_man_it_Makefile.am
===================================================================
--- branches/experimental/debian/patches/443_man_it_Makefile.am 2005-07-26 01:01:57 UTC (rev 413)
+++ branches/experimental/debian/patches/443_man_it_Makefile.am 2005-07-26 01:04:34 UTC (rev 414)
@@ -3,16 +3,17 @@
Status wrt upstream: must be forwarded
-Index: shadow-4.0.10/man/it/Makefile.am
+Index: shadow-4.0.11.1/man/it/Makefile.am
===================================================================
---- shadow-4.0.10.orig/man/it/Makefile.am 2005-04-21 23:03:15.000000000 +0200
-+++ shadow-4.0.10/man/it/Makefile.am 2005-07-09 15:13:05.000000000 +0200
-@@ -4,7 +4,7 @@
- # Links to missing pages:
- # grpconv.8 \
- # grpunconv.8 \
--# pwunconv.8 \
-+# pwunconv.8
+--- shadow-4.0.11.1.orig/man/it/Makefile.am 2005-07-10 19:34:41.000000000 +0200
++++ shadow-4.0.11.1/man/it/Makefile.am 2005-07-26 00:17:16.000000000 +0200
+@@ -2,9 +2,6 @@
+
+ mandir = @mandir@/it
+
+-# Links to missing pages:
+-# grpconv.8 \
+-# grpunconv.8 \
man_MANS = \
chage.1 \
chfn.1 \
More information about the Pkg-shadow-commits
mailing list