[Pkg-shadow-commits] r409 - branches/experimental/debian/patches

Nicolas FRANCOIS nekral-guest at costa.debian.org
Tue Jul 26 00:53:56 UTC 2005 

Author: nekral-guest
Date: 2005-07-26 00:53:56 +0000 (Tue, 26 Jul 2005)
New Revision: 409

Modified:
   branches/experimental/debian/patches/345_shadowconfig.8
   branches/experimental/debian/patches/999_hack_build_package
Log:
shadowconfig is debian specific.
The shadowconfig.8 man page and its translations are no more
distributed upstream.


Modified: branches/experimental/debian/patches/345_shadowconfig.8
===================================================================
--- branches/experimental/debian/patches/345_shadowconfig.8	2005-07-25 21:08:43 UTC (rev 408)
+++ branches/experimental/debian/patches/345_shadowconfig.8	2005-07-26 00:53:56 UTC (rev 409)
@@ -1,31 +1,203 @@
-Goal: Correct file name and additionnal information in shadowconfig.8
+Goal: Document the shadowconfig utility
 
-Status wrt upstream: The following is not aplied (2005/06/18)
-                     It is very Debian specific IMHO.
+Status wrt upstream: The shadowconfig utility is debian specific.
+                     It's man page also (but it used to be distributed)
 
-Index: shadow-4.0.10/man/shadowconfig.8
+Note: should be renamed to a 4xx.
+
+Index: shadow-4.0.11.1/man/shadowconfig.8
 ===================================================================
---- shadow-4.0.10.orig/man/shadowconfig.8	2005-06-21 11:22:55.000000000 +0200
-+++ shadow-4.0.10/man/shadowconfig.8	2005-07-04 18:27:47.000000000 +0200
-@@ -34,7 +34,7 @@
- \fBshadowconfig\fR on will turn shadow passwords on; \fIshadowconfig off\fR will turn shadow passwords off\&. \fBshadowconfig\fR will print an error message and exit with a nonzero code if it finds anything awry\&. If that happens, you should correct the error and run it again\&. Turning shadow passwords on when they are already on, or off when they are already off, is harmless\&.
- 
- .PP
--Read \fI/usr/share/doc/passwd/README\&.debian\fR for a brief introduction to shadow passwords and related features\&.
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ shadow-4.0.11.1/man/shadowconfig.8	2005-07-26 00:56:12.000000000 +0200
+@@ -0,0 +1,41 @@
++.\"Generated by db2man.xsl. Don't modify this, modify the source.
++.de Sh \" Subsection
++.br
++.if t .Sp
++.ne 5
++.PP
++\fB\\$1\fR
++.PP
++..
++.de Sp \" Vertical space (when we can't use .PP)
++.if t .sp .5v
++.if n .sp
++..
++.de Ip \" List item
++.br
++.ie \\n(.$>=3 .ne \\$3
++.el .ne 3
++.IP "\\$1" \\$2
++..
++.TH "SHADOWCONFIG" 8 "19 Apr 1997" "" ""
++.SH NAME
++shadowconfig \- toggle shadow passwords on and off
++.SH "SYNOPSIS"
++.ad l
++.hy 0
++.HP 13
++\fBshadowconfig\fR \fB\fIon\fR\fR | \fB\fIoff\fR\fR 
++.ad
++.hy
++
++.SH "DESCRIPTION"
++
++.PP
++\fBshadowconfig\fR on will turn shadow passwords on; \fIshadowconfig off\fR will turn shadow passwords off\&. \fBshadowconfig\fR will print an error message and exit with a nonzero code if it finds anything awry\&. If that happens, you should correct the error and run it again\&. Turning shadow passwords on when they are already on, or off when they are already off, is harmless\&.
++
++.PP
 +Read \fI/usr/share/doc/passwd/README\&.Debian\fR for a brief introduction to shadow passwords and related features\&.
- 
- .PP
- Note that turning shadow passwords off and on again will lose all password aging information\&.
-Index: shadow-4.0.10/man/shadowconfig.8.xml
++
++.PP
++Note that turning shadow passwords off and on again will lose all password aging information\&.
++
+Index: shadow-4.0.11.1/man/shadowconfig.8.xml
 ===================================================================
---- shadow-4.0.10.orig/man/shadowconfig.8.xml	2005-06-15 14:39:27.000000000 +0200
-+++ shadow-4.0.10/man/shadowconfig.8.xml	2005-07-04 18:27:53.000000000 +0200
-@@ -39,7 +39,7 @@
-     </para>
-     
-     <para>
--      Read <filename>/usr/share/doc/passwd/README.debian</filename> for a
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ shadow-4.0.11.1/man/shadowconfig.8.xml	2005-07-26 00:56:12.000000000 +0200
+@@ -0,0 +1,52 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
++		"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
++<refentry id='shadowconfig.8'>
++  <!-- $Id: shadowconfig.8.xml,v 1.6 2005/06/15 12:39:27 kloczek Exp $ -->
++  <refentryinfo>
++    <date>19 Apr 1997</date>
++  </refentryinfo>
++  <refmeta>
++    <refentrytitle>shadowconfig</refentrytitle>
++    <manvolnum>8</manvolnum>
++    <refmiscinfo class='date'>19 Apr 1997</refmiscinfo>
++    <refmiscinfo class='source'>Debian GNU/Linux</refmiscinfo>
++  </refmeta>
++  <refnamediv id='name'>
++    <refname>shadowconfig</refname>
++    <refpurpose>toggle shadow passwords on and off</refpurpose>
++  </refnamediv>
++
++  <refsynopsisdiv id='synopsis'>
++    <cmdsynopsis>
++      <command>shadowconfig</command>    
++      <group choice='plain'>
++        <arg choice='plain'><replaceable>on</replaceable></arg>
++        <arg choice='plain'><replaceable>off</replaceable></arg>
++      </group>
++    </cmdsynopsis>
++  </refsynopsisdiv>
++  
++  <refsect1 id='description'>
++    <title>DESCRIPTION</title>
++    <para><command>shadowconfig</command> on will turn shadow passwords on;
++      <emphasis remap='B'>shadowconfig off</emphasis> will turn shadow
++      passwords off. <command>shadowconfig</command> will print an error
++      message and exit with a nonzero code if it finds anything awry. If
++      that happens, you should correct the error and run it again. Turning
++      shadow passwords on when they are already on, or off when they are
++      already off, is harmless.
++    </para>
++    
++    <para>
 +      Read <filename>/usr/share/doc/passwd/README.Debian</filename> for a
-       brief introduction
-       to shadow passwords and related features.
-     </para>
++      brief introduction
++      to shadow passwords and related features.
++    </para>
++    
++    <para>Note that turning shadow passwords off and on again will lose all
++      password
++      aging information.
++    </para>
++  </refsect1>
++</refentry>
+Index: shadow-4.0.11.1/man/fr/shadowconfig.8
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ shadow-4.0.11.1/man/fr/shadowconfig.8	2005-07-26 01:03:03.000000000 +0200
+@@ -0,0 +1,26 @@
++.\" This file was generated with po4a. Translate the source file.
++.\" 
++.\"$Id: shadowconfig.8,v 1.4 2001/08/23 23:10:48 kloczek Exp $
++.TH SHADOWCONFIG 8 "19 avril 1997" "Debian GNU/Linux" 
++.SH NOM
++shadowconfig \- active ou désactive les mots de passe cachés
++.SH SYNOPSIS
++\fBshadowconfig\fP \fIon\fP | \fIoff\fP
++.SH DESCRIPTION
++.PP
++\fBshadowconfig on\fP active les mots de passe cachés («\ shadow passwords\ »)\ ; \fBshadowconfig off\fP les désactive. \fBShadowconfig\fP affiche un message 
++d'erreur et quitte avec une valeur de retour non nulle s'il rencontre 
++quelque chose d'inattendu. Dans ce cas, vous devrez corriger l'erreur avant 
++de recommencer.
++
++Activer les mots de passe cachés lorsqu'ils sont déjà activés, ou les 
++désactiver lorsqu'ils ne sont pas actifs est sans effet.
++
++Lisez \fI/usr/share/doc/passwd/README.debian\fP pour une brève introduction aux 
++mots de passe cachés et à leurs fonctionnalités.
++
++Notez que désactiver puis réactiver les mots de passe cachés aura pour 
++conséquence la perte des informations d'âge sur les mots de passe.
++.SH TRADUCTION
++Nicolas FRANÇOIS, 2004.
++Veuillez signaler toute erreur à <\fIdebian\-l10\-french at lists.debian.org\fR>.
+Index: shadow-4.0.11.1/man/ja/shadowconfig.8
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ shadow-4.0.11.1/man/ja/shadowconfig.8	2005-07-26 01:03:12.000000000 +0200
+@@ -0,0 +1,25 @@
++.\"     all right reserved,
++.\" Translated Tue Oct 30 11:59:11 JST 2001
++.\" by Maki KURODA <mkuroda at aisys-jp.com>
++.\"
++.TH SHADOWCONFIG 8 "19 Apr 1997" "Debian GNU/Linux"
++.SH ̾Á°
++shadowconfig \- shadow ¥Ñ¥¹¥ï¡¼¥É¤ÎÀßÄê¤ò¥ª¥óµÚ¤Ó¥ª¥Õ¤ËÀÚÂؤ¨¤ë
++.SH ½ñ¼°
++.B "shadowconfig"
++.IR on " | " off
++.SH ÀâÌÀ
++.PP
++.B shadowconfig on
++¤Ï shadow ¥Ñ¥¹¥ï¡¼¥É¤òÍ­¸ú¤Ë¤¹¤ë¡£
++.B shadowconfig off
++¤Ï shadow ¥Ñ¥¹¥ï¡¼¥É¤ò̵¸ú¤Ë¤¹¤ë¡£
++.B shadowconfig
++¤Ï²¿¤é¤«¤Î´Ö°ã¤¤¤¬¤¢¤ë¤È¡¢¥¨¥é¡¼¥á¥Ã¥»¡¼¥¸¤òɽ¼¨¤·¡¢
++¥¼¥í¤Ç¤Ï¤Ê¤¤ÊÖ¤êÃͤòÊÖ¤¹¡£
++¤â¤·¤½¤Î¤è¤¦¤Ê¤³¤È¤¬µ¯¤³¤Ã¤¿¾ì¹ç¡¢¥¨¥é¡¼¤ò½¤Àµ¤·¡¢ºÆÅټ¹Ԥ·¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤¡£
++shadow ¥Ñ¥¹¥ï¡¼¥É¤ÎÀßÄ꤬¤¹¤Ç¤Ë¥ª¥ó¤Î¾ì¹ç¤Ë¥ª¥ó¤ËÀßÄꤷ¤¿¤ê¡¢
++¤¹¤Ç¤Ë¥ª¥Õ¤Î¾ì¹ç¤Ë¥ª¥Õ¤ËÀßÄꤷ¤Æ¤â¡¢²¿¤Î±Æ¶Á¤â¤Ê¤¤¡£
++
++.I /usr/share/doc/passwd/README.debian.gz
++¤Ë¤Ï shadow ¥Ñ¥¹¥ï¡¼¥É¤È¤½¤ì¤Ë´Ø¤¹¤ëÆÃħ¤Î´Êñ¤Ê¾Ò²ð¤¬½ñ¤«¤ì¤Æ¤¤¤ë¡£
+Index: shadow-4.0.11.1/man/pl/shadowconfig.8
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ shadow-4.0.11.1/man/pl/shadowconfig.8	2005-07-26 01:03:20.000000000 +0200
+@@ -0,0 +1,27 @@
++.\" $Id: shadowconfig.8,v 1.3 2001/08/23 23:10:51 kloczek Exp $
++.\" {PTM/WK/1999-09-14}
++.TH SHADOWCONFIG 8 "19 kwietnia 1997" "Debian GNU/Linux"
++.SH NAZWA
++shadowconfig - prze³±cza ochronê hase³ i grup przez pliki shadow
++.SH SK£ADNIA
++.B "shadowconfig"
++.IR on " | " off
++.SH OPIS
++.PP
++.B shadowconfig on
++w³±cza ochronê hase³ i grup przez dodatkowe, przes³aniane pliki (shadow);
++.B shadowconfig off
++wy³±cza dodatkowe pliki hase³ i grup.
++.B shadowconfig
++wy¶wietla komunikat o b³êdzie i koñczy pracê z niezerowym kodem je¶li
++znajdzie co¶ nieprawid³owego. W takim wypadku powiniene¶ poprawiæ b³±d
++.\" if it finds anything awry.
++i uruchomiæ program ponownie.
++
++W³±czenie ochrony hase³, gdy jest ona ju¿ w³±czona lub jej wy³±czenie,
++gdy jest wy³±czona jest nieszkodliwe.
++
++Przeczytaj
++.IR /usr/share/doc/passwd/README.debian.gz ,
++gdzie znajdziesz krótkie wprowadzenie do ochrony hase³ z u¿yciem dodatkowych
++plików hase³ przes³anianych (shadow passwords) i zwi±zanych tematów.

Modified: branches/experimental/debian/patches/999_hack_build_package
===================================================================
--- branches/experimental/debian/patches/999_hack_build_package	2005-07-25 21:08:43 UTC (rev 408)
+++ branches/experimental/debian/patches/999_hack_build_package	2005-07-26 00:53:56 UTC (rev 409)
@@ -4,12 +4,16 @@
    This should be indicated in a readme (re-introducing this functionnality is
    not trivial)
 
- * The French man pages should be reinstalled
+ * shadow group support is now disabled by default.
+   Is it used in Debian?
+   For the moment, it has --enable-shadowgrp has been added to debian/rules.
 
-Index: shadow-4.0.10/debian/passwd.files
+These points could be checked on debian-devel
+
+Index: shadow-4.0.11.1/debian/passwd.files
 ===================================================================
---- shadow-4.0.10.orig/debian/passwd.files	2005-07-09 14:21:58.000000000 +0300
-+++ shadow-4.0.10/debian/passwd.files	2005-07-10 14:58:41.000000000 +0300
+--- shadow-4.0.11.1.orig/debian/passwd.files	2005-07-26 01:04:21.000000000 +0200
++++ shadow-4.0.11.1/debian/passwd.files	2005-07-26 01:04:50.000000000 +0200
 @@ -6,7 +6,6 @@
  usr/bin/passwd
  usr/sbin/chpasswd
@@ -18,11 +22,11 @@
  usr/sbin/groupadd
  usr/sbin/groupdel
  usr/sbin/groupmod
-Index: shadow-4.0.10/debian/rules
+Index: shadow-4.0.11.1/debian/rules
 ===================================================================
---- shadow-4.0.10.orig/debian/rules	2005-07-09 14:21:58.000000000 +0300
-+++ shadow-4.0.10/debian/rules	2005-07-10 14:58:26.000000000 +0300
-@@ -89,14 +89,10 @@
+--- shadow-4.0.11.1.orig/debian/rules	2005-07-26 01:04:21.000000000 +0200
++++ shadow-4.0.11.1/debian/rules	2005-07-26 01:37:06.000000000 +0200
+@@ -100,10 +100,6 @@
  	# but does not reflect what we do in Debian
  	# so we'd better forget about that man page
  	rm -f debian/passwd/usr/share/man/man5/limits.5 || true
@@ -33,8 +37,3 @@
  	install -c -m 444 man/shadowconfig.8 debian/passwd/usr/share/man/man8
  	install -c -m 444 man/ja/shadowconfig.8 debian/passwd/usr/share/man/ja/man8
  	install -c -m 444 man/pl/shadowconfig.8 debian/passwd/usr/share/man/pl/man8
--	install -c -m 444 man/fr/shadowconfig.8 debian/passwd/usr/share/man/fr/man8
-+#	install -c -m 444 man/fr/shadowconfig.8 debian/passwd/usr/share/man/fr/man8
- 	install -d debian/login/etc/pam.d
- 	install -c -m 444 debian/pam.d/login debian/login/etc/pam.d/login
- 	install -c -m 444 debian/pam.d/su debian/login/etc/pam.d/su

More information about the Pkg-shadow-commits mailing list