Add new '--umask' option to start-stop-daemon. Closes: #368003

diff --git a/ChangeLog b/ChangeLog
index 30ab7364119e1717e0b8ec1dec54cbca872140b9..590da8a2c57df4f13d917bd514ea8005f9a62f5e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-06-21  Guillem Jover  <guillem@debian.org>
+
+       * utils/start-stop-daemon.c (umask_value): New variable.
+       (do_help): Print information about the new '--umask' option.
+       (parse_umask): New function.
+       (parse_options): Parse the new option using parse_umask.
+       (main): Set umask, and do not set for the background case if we set
+       it previously.
+
 2006-06-21  Guillem Jover  <guillem@debian.org>
 
        * scripts/controllib.pl (usageerr): Do not mark "%s: %s" for

diff --git a/debian/changelog b/debian/changelog
index 74be536a53d6ef63df7f53ca8fc563b0fcd16836..620ad976681eccec0ec603a1ab7d1a26ff43780d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,7 @@ dpkg (1.13.22~) UNRELEASED; urgency=low
     backward compatibility information and give some examples.
     Thanks for the initial suggestions to Junichi Uekawa. Closes: #370830
   * Modified some strings to be able to merge them in the .pot files.
+  * Add new '--umask' option to start-stop-daemon. Closes: #368003
   
   [ Frank Lichtenheld ]
   * dpkg-source issued spurious warnings about fields defined with

diff --git a/man/C/start-stop-daemon.8 b/man/C/start-stop-daemon.8
index 2fd8a30236a4f1ce25641a9419d09ebe41c4f6b7..5e90acd90dc9c759301fba7e2b52bec3442e5006 100644 (file)
--- a/man/C/start-stop-daemon.8
+++ b/man/C/start-stop-daemon.8
@@ -228,6 +228,9 @@ code for it to do this itself.
 \fB\-N\fP|\fB\-\-nicelevel\fP \fIint\fP
 This alters the priority of the process before starting it.
 .TP
+\fB\-k\fP|\fB\-\-umask\fP \fImask\fP
+This sets the umask of the process before starting it.
+.TP
 .BR \-m | \-\-make\-pidfile
 Used when starting a program that does not create its own pid file. This
 option will make

diff --git a/man/ChangeLog b/man/ChangeLog
index dd74e23e06d2d5665c640ba11f574d211d2c06f0..1adf0aa1e492dc95ae0371546436cb9f293437d3 100644 (file)
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,10 @@
+2006-06-21  Guillem Jover  <guillem@debian.org>
+
+       * C/start-stop-daemon.8: Document the new '--umask' option.
+       * po4a/start-stop-daemon.8/po/start-stop-daemon.8.pot: Regenerated.
+       Former completed translations become 63t2f.
+       * po4a/start-stop-daemon.8/po/*.po: Merge with pot file.
+
 2006-06-20  Nicolas Francois  <nicolas.francois@centraliens.net>
 
        * po4a/*/po/*.pot: Regenerated.

diff --git a/man/po4a/start-stop-daemon.8/po/de.po b/man/po4a/start-stop-daemon.8/po/de.po
index 14681db03b96e4447dc7952fc5ec2b31e23c4974..b961681ba212037e0ede9b145c4989d742ef22dc 100644 (file)
--- a/man/po4a/start-stop-daemon.8/po/de.po
+++ b/man/po4a/start-stop-daemon.8/po/de.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: dpkg man pages\n"
-"POT-Creation-Date: 2006-06-20 21:07+0200\n"
+"POT-Creation-Date: 2006-06-21 17:57+0300\n"
 "PO-Revision-Date: 2005-07-03 15:04+0200\n"
 "Last-Translator: Unknown translator\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -465,12 +465,24 @@ msgstr "Dies 
 
 # type: TP
 #: ../../../man/po4a/../C/start-stop-daemon.8:230
+#, fuzzy, no-wrap
+msgid "B<-k>|B<--umask> I<mask>"
+msgstr "B<-s>|B<--signal> I<Signal>"
+
+# type: Plain text
+#: ../../../man/po4a/../C/start-stop-daemon.8:233
+#, fuzzy
+msgid "This sets the umask of the process before starting it."
+msgstr "Dies ändert die Priorität des Prozesses bevor er gestartet wird."
+
+# type: TP
+#: ../../../man/po4a/../C/start-stop-daemon.8:233
 #, no-wrap
 msgid "B<-m>|B<--make-pidfile>"
 msgstr "B<-m>|B<--make-pidfile>"
 
 # type: Plain text
-#: ../../../man/po4a/../C/start-stop-daemon.8:245
+#: ../../../man/po4a/../C/start-stop-daemon.8:248
 #, fuzzy
 msgid ""
 "Used when starting a program that does not create its own pid file. This "
@@ -491,46 +503,46 @@ msgstr ""
 "Kombination mit der B<--background> Option sinnvoll."
 
 # type: TP
-#: ../../../man/po4a/../C/start-stop-daemon.8:245
+#: ../../../man/po4a/../C/start-stop-daemon.8:248
 #, no-wrap
 msgid "B<-v>|B<--verbose>"
 msgstr "B<-v>|B<--verbose>"
 
 # type: Plain text
-#: ../../../man/po4a/../C/start-stop-daemon.8:248
+#: ../../../man/po4a/../C/start-stop-daemon.8:251
 msgid "Print verbose informational messages."
 msgstr "Gibt ausführliche informative Meldungen aus."
 
 # type: TP
-#: ../../../man/po4a/../C/start-stop-daemon.8:248
+#: ../../../man/po4a/../C/start-stop-daemon.8:251
 #, no-wrap
 msgid "B<-H>|B<--help>"
 msgstr "B<-H>|B<--help>"
 
 # type: Plain text
-#: ../../../man/po4a/../C/start-stop-daemon.8:251
+#: ../../../man/po4a/../C/start-stop-daemon.8:254
 msgid "Print help information; then exit."
 msgstr "Gibt Hilfeinformationen aus und beendet sich dann."
 
 # type: TP
-#: ../../../man/po4a/../C/start-stop-daemon.8:251
+#: ../../../man/po4a/../C/start-stop-daemon.8:254
 #, no-wrap
 msgid "B<-V>|B<--version>"
 msgstr "B<-V>|B<--version>"
 
 # type: Plain text
-#: ../../../man/po4a/../C/start-stop-daemon.8:254
+#: ../../../man/po4a/../C/start-stop-daemon.8:257
 msgid "Print version information; then exit."
 msgstr "Gibt Versionsinformationen aus und beendet sich dann."
 
 # type: SH
-#: ../../../man/po4a/../C/start-stop-daemon.8:255
+#: ../../../man/po4a/../C/start-stop-daemon.8:258
 #, no-wrap
 msgid "AUTHORS"
 msgstr "AUTOREN"
 
 # type: Plain text
-#: ../../../man/po4a/../C/start-stop-daemon.8:258
+#: ../../../man/po4a/../C/start-stop-daemon.8:261
 msgid ""
 "Marek Michalkiewicz E<lt>marekm@i17linuxb.ists.pwr.wroc.plE<gt> based on a "
 "previous version by Ian Jackson E<lt>ian@chiark.greenend.org.ukE<gt>."
@@ -540,7 +552,7 @@ msgstr ""
 "ukE<gt>."
 
 # type: Plain text
-#: ../../../man/po4a/../C/start-stop-daemon.8:260
+#: ../../../man/po4a/../C/start-stop-daemon.8:263
 msgid ""
 "Manual page by Klee Dienes E<lt>klee@mit.eduE<gt>, partially reformatted by "
 "Ian Jackson."

diff --git a/man/po4a/start-stop-daemon.8/po/es.po b/man/po4a/start-stop-daemon.8/po/es.po
index f878551b796df0ec0f3ca18e46d9e4e3cc190dac..cfb08e63c1f8891b3133b62827e948150b79a564 100644 (file)
--- a/man/po4a/start-stop-daemon.8/po/es.po
+++ b/man/po4a/start-stop-daemon.8/po/es.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: dpkg man pages\n"
-"POT-Creation-Date: 2006-06-20 21:07+0200\n"
+"POT-Creation-Date: 2006-06-21 17:57+0300\n"
 "PO-Revision-Date: 2005-07-03 15:04+0200\n"
 "Last-Translator: Unknown translator\n"
 "Language-Team: Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -475,11 +475,23 @@ msgstr "Altera la prioridad del proceso antes de empezarlo."
 # type: TP
 #: ../../../man/po4a/../C/start-stop-daemon.8:230
 #, fuzzy, no-wrap
+msgid "B<-k>|B<--umask> I<mask>"
+msgstr "B<-s>|B<--signal> I<señal>"
+
+# type: Plain text
+#: ../../../man/po4a/../C/start-stop-daemon.8:233
+#, fuzzy
+msgid "This sets the umask of the process before starting it."
+msgstr "Altera la prioridad del proceso antes de empezarlo."
+
+# type: TP
+#: ../../../man/po4a/../C/start-stop-daemon.8:233
+#, fuzzy, no-wrap
 msgid "B<-m>|B<--make-pidfile>"
 msgstr "B<-m>|B<--make-pidfile>"
 
 # type: Plain text
-#: ../../../man/po4a/../C/start-stop-daemon.8:245
+#: ../../../man/po4a/../C/start-stop-daemon.8:248
 #, fuzzy
 msgid ""
 "Used when starting a program that does not create its own pid file. This "
@@ -499,49 +511,49 @@ msgstr ""
 "solamente es útil cuando se combina con la opción B<--background .>"
 
 # type: TP
-#: ../../../man/po4a/../C/start-stop-daemon.8:245
+#: ../../../man/po4a/../C/start-stop-daemon.8:248
 #, fuzzy, no-wrap
 msgid "B<-v>|B<--verbose>"
 msgstr "B<-v>|B<--verbose>"
 
 # type: Plain text
-#: ../../../man/po4a/../C/start-stop-daemon.8:248
+#: ../../../man/po4a/../C/start-stop-daemon.8:251
 #, fuzzy
 msgid "Print verbose informational messages."
 msgstr "Muestra mensajes informativos detallados."
 
 # type: TP
-#: ../../../man/po4a/../C/start-stop-daemon.8:248
+#: ../../../man/po4a/../C/start-stop-daemon.8:251
 #, fuzzy, no-wrap
 msgid "B<-H>|B<--help>"
 msgstr "B<-H>|B<--help>"
 
 # type: Plain text
-#: ../../../man/po4a/../C/start-stop-daemon.8:251
+#: ../../../man/po4a/../C/start-stop-daemon.8:254
 #, fuzzy
 msgid "Print help information; then exit."
 msgstr "Muestra la ayuda y luego termina."
 
 # type: TP
-#: ../../../man/po4a/../C/start-stop-daemon.8:251
+#: ../../../man/po4a/../C/start-stop-daemon.8:254
 #, fuzzy, no-wrap
 msgid "B<-V>|B<--version>"
 msgstr "B<-V>|B<--version>"
 
 # type: Plain text
-#: ../../../man/po4a/../C/start-stop-daemon.8:254
+#: ../../../man/po4a/../C/start-stop-daemon.8:257
 #, fuzzy
 msgid "Print version information; then exit."
 msgstr "Muestra la versión y luego termina."
 
 # type: SH
-#: ../../../man/po4a/../C/start-stop-daemon.8:255
+#: ../../../man/po4a/../C/start-stop-daemon.8:258
 #, fuzzy, no-wrap
 msgid "AUTHORS"
 msgstr "AUTORES"
 
 # type: Plain text
-#: ../../../man/po4a/../C/start-stop-daemon.8:258
+#: ../../../man/po4a/../C/start-stop-daemon.8:261
 #, fuzzy
 msgid ""
 "Marek Michalkiewicz E<lt>marekm@i17linuxb.ists.pwr.wroc.plE<gt> based on a "
@@ -551,7 +563,7 @@ msgstr ""
 "una versión previa de Ian Jackson E<lt>ian@chiark.greenend.org.ukE<gt>."
 
 # type: Plain text
-#: ../../../man/po4a/../C/start-stop-daemon.8:260
+#: ../../../man/po4a/../C/start-stop-daemon.8:263
 #, fuzzy
 msgid ""
 "Manual page by Klee Dienes E<lt>klee@mit.eduE<gt>, partially reformatted by "

diff --git a/man/po4a/start-stop-daemon.8/po/fr.po b/man/po4a/start-stop-daemon.8/po/fr.po
index bba9d25712168105e4ca859fb7a1211453e8399d..963ab9c496bb34d300fee1e8f3e2fdc3017362b8 100644 (file)
--- a/man/po4a/start-stop-daemon.8/po/fr.po
+++ b/man/po4a/start-stop-daemon.8/po/fr.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: dpkg man pages\n"
-"POT-Creation-Date: 2006-06-20 21:07+0200\n"
-"PO-Revision-Date: 2006-03-04 09:52+0100\n"
+"POT-Creation-Date: 2006-06-21 17:57+0300\n"
+"PO-Revision-Date: 2006-06-21 17:21+0300\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -453,12 +453,24 @@ msgstr "Cela modifie la priorit
 
 # type: TP
 #: ../../../man/po4a/../C/start-stop-daemon.8:230
+#, fuzzy, no-wrap
+msgid "B<-k>|B<--umask> I<mask>"
+msgstr "B<-s>|B<--signal> I<signal>"
+
+# type: Plain text
+#: ../../../man/po4a/../C/start-stop-daemon.8:233
+#, fuzzy
+msgid "This sets the umask of the process before starting it."
+msgstr "Cela modifie la priorité du processus avant qu'il ne soit lancé."
+
+# type: TP
+#: ../../../man/po4a/../C/start-stop-daemon.8:233
 #, no-wrap
 msgid "B<-m>|B<--make-pidfile>"
 msgstr "B<-m>|B<--make-pidfile>"
 
 # type: Plain text
-#: ../../../man/po4a/../C/start-stop-daemon.8:245
+#: ../../../man/po4a/../C/start-stop-daemon.8:248
 msgid ""
 "Used when starting a program that does not create its own pid file. This "
 "option will make B<start-stop-daemon> create the file referenced with B<--"
@@ -478,46 +490,46 @@ msgstr ""
 "habituellement utile que combinée avec l'option B<--background.>"
 
 # type: TP
-#: ../../../man/po4a/../C/start-stop-daemon.8:245
+#: ../../../man/po4a/../C/start-stop-daemon.8:248
 #, no-wrap
 msgid "B<-v>|B<--verbose>"
 msgstr "B<-v>|B<--verbose>"
 
 # type: Plain text
-#: ../../../man/po4a/../C/start-stop-daemon.8:248
+#: ../../../man/po4a/../C/start-stop-daemon.8:251
 msgid "Print verbose informational messages."
 msgstr "Affiche des messages prolixes en renseignements."
 
 # type: TP
-#: ../../../man/po4a/../C/start-stop-daemon.8:248
+#: ../../../man/po4a/../C/start-stop-daemon.8:251
 #, no-wrap
 msgid "B<-H>|B<--help>"
 msgstr "B<-H>|B<--help>"
 
 # type: Plain text
-#: ../../../man/po4a/../C/start-stop-daemon.8:251
+#: ../../../man/po4a/../C/start-stop-daemon.8:254
 msgid "Print help information; then exit."
 msgstr "Affiche une aide et se termine."
 
 # type: TP
-#: ../../../man/po4a/../C/start-stop-daemon.8:251
+#: ../../../man/po4a/../C/start-stop-daemon.8:254
 #, no-wrap
 msgid "B<-V>|B<--version>"
 msgstr "B<-V>|B<--version>"
 
 # type: Plain text
-#: ../../../man/po4a/../C/start-stop-daemon.8:254
+#: ../../../man/po4a/../C/start-stop-daemon.8:257
 msgid "Print version information; then exit."
 msgstr "Affiche le numéro de version et se termine."
 
 # type: SH
-#: ../../../man/po4a/../C/start-stop-daemon.8:255
+#: ../../../man/po4a/../C/start-stop-daemon.8:258
 #, no-wrap
 msgid "AUTHORS"
 msgstr "AUTEURS"
 
 # type: Plain text
-#: ../../../man/po4a/../C/start-stop-daemon.8:258
+#: ../../../man/po4a/../C/start-stop-daemon.8:261
 msgid ""
 "Marek Michalkiewicz E<lt>marekm@i17linuxb.ists.pwr.wroc.plE<gt> based on a "
 "previous version by Ian Jackson E<lt>ian@chiark.greenend.org.ukE<gt>."
@@ -526,7 +538,7 @@ msgstr ""
 "d'une version faite par Ian Jackson E<lt>ian@chiark.greenend.org.ukE<gt>."
 
 # type: Plain text
-#: ../../../man/po4a/../C/start-stop-daemon.8:260
+#: ../../../man/po4a/../C/start-stop-daemon.8:263
 msgid ""
 "Manual page by Klee Dienes E<lt>klee@mit.eduE<gt>, partially reformatted by "
 "Ian Jackson."

diff --git a/man/po4a/start-stop-daemon.8/po/ja.po b/man/po4a/start-stop-daemon.8/po/ja.po
index 01a2b3665480257b622f41b1d66855f7ff0be7c1..e6a433a4c5332f020ab314513c02d1d984c1bace 100644 (file)
--- a/man/po4a/start-stop-daemon.8/po/ja.po
+++ b/man/po4a/start-stop-daemon.8/po/ja.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: dpkg man pages\n"
-"POT-Creation-Date: 2006-06-20 21:07+0200\n"
+"POT-Creation-Date: 2006-06-21 17:57+0300\n"
 "PO-Revision-Date: 2005-07-03 15:04+0200\n"
 "Last-Translator: Unknown translator\n"
 "Language-Team: Japanese <debian-l10n-japanese@lists.debian.org>\n"
@@ -455,11 +455,23 @@ msgstr "
 # type: TP
 #: ../../../man/po4a/../C/start-stop-daemon.8:230
 #, fuzzy, no-wrap
+msgid "B<-k>|B<--umask> I<mask>"
+msgstr "B<-s>|B<--signal> I<signal>"
+
+# type: Plain text
+#: ../../../man/po4a/../C/start-stop-daemon.8:233
+#, fuzzy
+msgid "This sets the umask of the process before starting it."
+msgstr "¥×¥í¥»¥¹¤ò³«»Ï¤¹¤ëÁ°¤Ë¥×¥í¥»¥¹¤Î¥×¥é¥¤¥ª¥ê¥Æ¥£¤òÊѹ¹¤¹¤ë¡£"
+
+# type: TP
+#: ../../../man/po4a/../C/start-stop-daemon.8:233
+#, fuzzy, no-wrap
 msgid "B<-m>|B<--make-pidfile>"
 msgstr "B<-m>|B<--make-pidfile>"
 
 # type: Plain text
-#: ../../../man/po4a/../C/start-stop-daemon.8:245
+#: ../../../man/po4a/../C/start-stop-daemon.8:248
 #, fuzzy
 msgid ""
 "Used when starting a program that does not create its own pid file. This "
@@ -479,49 +491,49 @@ msgstr ""
 "¤Ë¤Î¤ßÍ­ÍѤǤ¢¤ë¡£"
 
 # type: TP
-#: ../../../man/po4a/../C/start-stop-daemon.8:245
+#: ../../../man/po4a/../C/start-stop-daemon.8:248
 #, fuzzy, no-wrap
 msgid "B<-v>|B<--verbose>"
 msgstr "B<-v>|B<--verbose>"
 
 # type: Plain text
-#: ../../../man/po4a/../C/start-stop-daemon.8:248
+#: ../../../man/po4a/../C/start-stop-daemon.8:251
 #, fuzzy
 msgid "Print verbose informational messages."
 msgstr "¾Ü¤·¤¤»²¹Í¾ðÊó¤ò½ÐÎϤ¹¤ë¡£"
 
 # type: TP
-#: ../../../man/po4a/../C/start-stop-daemon.8:248
+#: ../../../man/po4a/../C/start-stop-daemon.8:251
 #, fuzzy, no-wrap
 msgid "B<-H>|B<--help>"
 msgstr "B<-H>|B<--help>"
 
 # type: Plain text
-#: ../../../man/po4a/../C/start-stop-daemon.8:251
+#: ../../../man/po4a/../C/start-stop-daemon.8:254
 #, fuzzy
 msgid "Print help information; then exit."
 msgstr "¥Ø¥ë¥×¾ðÊó¤ò½ÐÎϤ·¤Æ½ªÎ»¤¹¤ë¡£"
 
 # type: TP
-#: ../../../man/po4a/../C/start-stop-daemon.8:251
+#: ../../../man/po4a/../C/start-stop-daemon.8:254
 #, fuzzy, no-wrap
 msgid "B<-V>|B<--version>"
 msgstr "B<-V>|B<--version>"
 
 # type: Plain text
-#: ../../../man/po4a/../C/start-stop-daemon.8:254
+#: ../../../man/po4a/../C/start-stop-daemon.8:257
 #, fuzzy
 msgid "Print version information; then exit."
 msgstr "¥Ð¡¼¥¸¥ç¥ó¾ðÊó¤ò½ÐÎϤ·¤Æ½ªÎ»¤¹¤ë¡£"
 
 # type: SH
-#: ../../../man/po4a/../C/start-stop-daemon.8:255
+#: ../../../man/po4a/../C/start-stop-daemon.8:258
 #, fuzzy, no-wrap
 msgid "AUTHORS"
 msgstr "Ãø¼Ô"
 
 # type: Plain text
-#: ../../../man/po4a/../C/start-stop-daemon.8:258
+#: ../../../man/po4a/../C/start-stop-daemon.8:261
 #, fuzzy
 msgid ""
 "Marek Michalkiewicz E<lt>marekm@i17linuxb.ists.pwr.wroc.plE<gt> based on a "
@@ -532,7 +544,7 @@ msgstr ""
 "À®¡£"
 
 # type: Plain text
-#: ../../../man/po4a/../C/start-stop-daemon.8:260
+#: ../../../man/po4a/../C/start-stop-daemon.8:263
 #, fuzzy
 msgid ""
 "Manual page by Klee Dienes E<lt>klee@mit.eduE<gt>, partially reformatted by "

diff --git a/man/po4a/start-stop-daemon.8/po/pl.po b/man/po4a/start-stop-daemon.8/po/pl.po
index 753de097128fad1e8d168dc39da962207b95a721..c67054f30f8f1450af51e0152986bdd337bc4d5c 100644 (file)
--- a/man/po4a/start-stop-daemon.8/po/pl.po
+++ b/man/po4a/start-stop-daemon.8/po/pl.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13.16\n"
-"POT-Creation-Date: 2006-06-20 21:07+0200\n"
+"POT-Creation-Date: 2006-06-21 17:57+0300\n"
 "PO-Revision-Date: 2006-03-01 23:37+0100\n"
 "Last-Translator: Robert Luberda <robert@debian.org>\n"
 "Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n"
@@ -476,13 +476,26 @@ msgstr "Zmienia priorytet uruchamianego procesu."
 
 # type: TP
 #: ../../../man/po4a/../C/start-stop-daemon.8:230
+#, fuzzy, no-wrap
+msgid "B<-k>|B<--umask> I<mask>"
+msgstr "B<-s>|B<--signal> I<sygna³>"
+
+# type: Plain text
+#
+#: ../../../man/po4a/../C/start-stop-daemon.8:233
+#, fuzzy
+msgid "This sets the umask of the process before starting it."
+msgstr "Zmienia priorytet uruchamianego procesu."
+
+# type: TP
+#: ../../../man/po4a/../C/start-stop-daemon.8:233
 #, no-wrap
 msgid "B<-m>|B<--make-pidfile>"
 msgstr "B<-m>|B<--make-pidfile>"
 
 # type: Plain text
 #
-#: ../../../man/po4a/../C/start-stop-daemon.8:245
+#: ../../../man/po4a/../C/start-stop-daemon.8:248
 msgid ""
 "Used when starting a program that does not create its own pid file. This "
 "option will make B<start-stop-daemon> create the file referenced with B<--"
@@ -502,50 +515,50 @@ msgstr ""
 "B<--background>."
 
 # type: TP
-#: ../../../man/po4a/../C/start-stop-daemon.8:245
+#: ../../../man/po4a/../C/start-stop-daemon.8:248
 #, no-wrap
 msgid "B<-v>|B<--verbose>"
 msgstr "B<-v>|B<--verbose>"
 
 # type: Plain text
 #
-#: ../../../man/po4a/../C/start-stop-daemon.8:248
+#: ../../../man/po4a/../C/start-stop-daemon.8:251
 msgid "Print verbose informational messages."
 msgstr "Wy¶wietlane s± dodatkowe komunikaty."
 
 # type: TP
-#: ../../../man/po4a/../C/start-stop-daemon.8:248
+#: ../../../man/po4a/../C/start-stop-daemon.8:251
 #, no-wrap
 msgid "B<-H>|B<--help>"
 msgstr "B<-H>|B<--help>"
 
 # type: Plain text
 #
-#: ../../../man/po4a/../C/start-stop-daemon.8:251
+#: ../../../man/po4a/../C/start-stop-daemon.8:254
 msgid "Print help information; then exit."
 msgstr "Wy¶wietlana jest krótka pomoc."
 
 # type: TP
-#: ../../../man/po4a/../C/start-stop-daemon.8:251
+#: ../../../man/po4a/../C/start-stop-daemon.8:254
 #, no-wrap
 msgid "B<-V>|B<--version>"
 msgstr "B<-V>|B<--version>"
 
 # type: Plain text
 #
-#: ../../../man/po4a/../C/start-stop-daemon.8:254
+#: ../../../man/po4a/../C/start-stop-daemon.8:257
 msgid "Print version information; then exit."
 msgstr "Wy¶wietlana jest informacja o wersji programu."
 
 # type: SH
-#: ../../../man/po4a/../C/start-stop-daemon.8:255
+#: ../../../man/po4a/../C/start-stop-daemon.8:258
 #, no-wrap
 msgid "AUTHORS"
 msgstr "AUTORZY"
 
 # type: Plain text
 #
-#: ../../../man/po4a/../C/start-stop-daemon.8:258
+#: ../../../man/po4a/../C/start-stop-daemon.8:261
 msgid ""
 "Marek Michalkiewicz E<lt>marekm@i17linuxb.ists.pwr.wroc.plE<gt> based on a "
 "previous version by Ian Jackson E<lt>ian@chiark.greenend.org.ukE<gt>."
@@ -556,7 +569,7 @@ msgstr ""
 
 # type: Plain text
 #
-#: ../../../man/po4a/../C/start-stop-daemon.8:260
+#: ../../../man/po4a/../C/start-stop-daemon.8:263
 msgid ""
 "Manual page by Klee Dienes E<lt>klee@mit.eduE<gt>, partially reformatted by "
 "Ian Jackson."

diff --git a/man/po4a/start-stop-daemon.8/po/ru.po b/man/po4a/start-stop-daemon.8/po/ru.po
index bca826dfd584808a9235752b0e5e0f2400fa7037..67e6984acd0985a042af0f28004622be6d6e3bd1 100644 (file)
--- a/man/po4a/start-stop-daemon.8/po/ru.po
+++ b/man/po4a/start-stop-daemon.8/po/ru.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: dpkg man pages\n"
-"POT-Creation-Date: 2006-06-20 21:07+0200\n"
+"POT-Creation-Date: 2006-06-21 17:57+0300\n"
 "PO-Revision-Date: 2006-04-08 18:28+0300\n"
 "Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -453,12 +453,24 @@ msgstr "Этот параметр перед запуском изменяет 
 
 # type: TP
 #: ../../../man/po4a/../C/start-stop-daemon.8:230
+#, fuzzy, no-wrap
+msgid "B<-k>|B<--umask> I<mask>"
+msgstr "B<-s>|B<--signal> I<сигнал>"
+
+# type: Plain text
+#: ../../../man/po4a/../C/start-stop-daemon.8:233
+#, fuzzy
+msgid "This sets the umask of the process before starting it."
+msgstr "Этот параметр перед запуском изменяет приоритет процесса."
+
+# type: TP
+#: ../../../man/po4a/../C/start-stop-daemon.8:233
 #, no-wrap
 msgid "B<-m>|B<--make-pidfile>"
 msgstr "B<-m>|B<--make-pidfile>"
 
 # type: Plain text
-#: ../../../man/po4a/../C/start-stop-daemon.8:245
+#: ../../../man/po4a/../C/start-stop-daemon.8:248
 msgid ""
 "Used when starting a program that does not create its own pid file. This "
 "option will make B<start-stop-daemon> create the file referenced with B<--"
@@ -478,46 +490,46 @@ msgstr ""
 "использовании вместе с параметром B<--background>."
 
 # type: TP
-#: ../../../man/po4a/../C/start-stop-daemon.8:245
+#: ../../../man/po4a/../C/start-stop-daemon.8:248
 #, no-wrap
 msgid "B<-v>|B<--verbose>"
 msgstr "B<-v>|B<--verbose>"
 
 # type: Plain text
-#: ../../../man/po4a/../C/start-stop-daemon.8:248
+#: ../../../man/po4a/../C/start-stop-daemon.8:251
 msgid "Print verbose informational messages."
 msgstr "Выдавать подробные информационные сообщения."
 
 # type: TP
-#: ../../../man/po4a/../C/start-stop-daemon.8:248
+#: ../../../man/po4a/../C/start-stop-daemon.8:251
 #, no-wrap
 msgid "B<-H>|B<--help>"
 msgstr "B<-H>|B<--help>"
 
 # type: Plain text
-#: ../../../man/po4a/../C/start-stop-daemon.8:251
+#: ../../../man/po4a/../C/start-stop-daemon.8:254
 msgid "Print help information; then exit."
 msgstr "Выдать подсказку и завершить работу."
 
 # type: TP
-#: ../../../man/po4a/../C/start-stop-daemon.8:251
+#: ../../../man/po4a/../C/start-stop-daemon.8:254
 #, no-wrap
 msgid "B<-V>|B<--version>"
 msgstr "B<-V>|B<--version>"
 
 # type: Plain text
-#: ../../../man/po4a/../C/start-stop-daemon.8:254
+#: ../../../man/po4a/../C/start-stop-daemon.8:257
 msgid "Print version information; then exit."
 msgstr "Выдать информацию о версии и завершить работу."
 
 # type: SH
-#: ../../../man/po4a/../C/start-stop-daemon.8:255
+#: ../../../man/po4a/../C/start-stop-daemon.8:258
 #, no-wrap
 msgid "AUTHORS"
 msgstr "АВТОРЫ"
 
 # type: Plain text
-#: ../../../man/po4a/../C/start-stop-daemon.8:258
+#: ../../../man/po4a/../C/start-stop-daemon.8:261
 msgid ""
 "Marek Michalkiewicz E<lt>marekm@i17linuxb.ists.pwr.wroc.plE<gt> based on a "
 "previous version by Ian Jackson E<lt>ian@chiark.greenend.org.ukE<gt>."
@@ -526,7 +538,7 @@ msgstr ""
 "на версии, сделанной Ian Jackson E<lt>ian@chiark.greenend.org.ukE<gt>."
 
 # type: Plain text
-#: ../../../man/po4a/../C/start-stop-daemon.8:260
+#: ../../../man/po4a/../C/start-stop-daemon.8:263
 msgid ""
 "Manual page by Klee Dienes E<lt>klee@mit.eduE<gt>, partially reformatted by "
 "Ian Jackson."

diff --git a/man/po4a/start-stop-daemon.8/po/start-stop-daemon.8.pot b/man/po4a/start-stop-daemon.8/po/start-stop-daemon.8.pot
index 86f110da11e3a3374571ea1549d22973c0103fcc..4adbf2d44ef7c9dc8c27abe7f75c65153297eb59 100644 (file)
--- a/man/po4a/start-stop-daemon.8/po/start-stop-daemon.8.pot
+++ b/man/po4a/start-stop-daemon.8/po/start-stop-daemon.8.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2006-06-20 21:07+0200\n"
+"POT-Creation-Date: 2006-06-21 17:57+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -370,11 +370,22 @@ msgstr ""
 # type: TP
 #: ../../../man/po4a/../C/start-stop-daemon.8:230
 #, no-wrap
+msgid "B<-k>|B<--umask> I<mask>"
+msgstr ""
+
+# type: Plain text
+#: ../../../man/po4a/../C/start-stop-daemon.8:233
+msgid "This sets the umask of the process before starting it."
+msgstr ""
+
+# type: TP
+#: ../../../man/po4a/../C/start-stop-daemon.8:233
+#, no-wrap
 msgid "B<-m>|B<--make-pidfile>"
 msgstr ""
 
 # type: Plain text
-#: ../../../man/po4a/../C/start-stop-daemon.8:245
+#: ../../../man/po4a/../C/start-stop-daemon.8:248
 msgid ""
 "Used when starting a program that does not create its own pid file. This "
 "option will make B<start-stop-daemon> create the file referenced with "
@@ -386,53 +397,53 @@ msgid ""
 msgstr ""
 
 # type: TP
-#: ../../../man/po4a/../C/start-stop-daemon.8:245
+#: ../../../man/po4a/../C/start-stop-daemon.8:248
 #, no-wrap
 msgid "B<-v>|B<--verbose>"
 msgstr ""
 
 # type: Plain text
-#: ../../../man/po4a/../C/start-stop-daemon.8:248
+#: ../../../man/po4a/../C/start-stop-daemon.8:251
 msgid "Print verbose informational messages."
 msgstr ""
 
 # type: TP
-#: ../../../man/po4a/../C/start-stop-daemon.8:248
+#: ../../../man/po4a/../C/start-stop-daemon.8:251
 #, no-wrap
 msgid "B<-H>|B<--help>"
 msgstr ""
 
 # type: Plain text
-#: ../../../man/po4a/../C/start-stop-daemon.8:251
+#: ../../../man/po4a/../C/start-stop-daemon.8:254
 msgid "Print help information; then exit."
 msgstr ""
 
 # type: TP
-#: ../../../man/po4a/../C/start-stop-daemon.8:251
+#: ../../../man/po4a/../C/start-stop-daemon.8:254
 #, no-wrap
 msgid "B<-V>|B<--version>"
 msgstr ""
 
 # type: Plain text
-#: ../../../man/po4a/../C/start-stop-daemon.8:254
+#: ../../../man/po4a/../C/start-stop-daemon.8:257
 msgid "Print version information; then exit."
 msgstr ""
 
 # type: SH
-#: ../../../man/po4a/../C/start-stop-daemon.8:255
+#: ../../../man/po4a/../C/start-stop-daemon.8:258
 #, no-wrap
 msgid "AUTHORS"
 msgstr ""
 
 # type: Plain text
-#: ../../../man/po4a/../C/start-stop-daemon.8:258
+#: ../../../man/po4a/../C/start-stop-daemon.8:261
 msgid ""
 "Marek Michalkiewicz E<lt>marekm@i17linuxb.ists.pwr.wroc.plE<gt> based on a "
 "previous version by Ian Jackson E<lt>ian@chiark.greenend.org.ukE<gt>."
 msgstr ""
 
 # type: Plain text
-#: ../../../man/po4a/../C/start-stop-daemon.8:260
+#: ../../../man/po4a/../C/start-stop-daemon.8:263
 msgid ""
 "Manual page by Klee Dienes E<lt>klee@mit.eduE<gt>, partially reformatted by "
 "Ian Jackson."

diff --git a/man/po4a/start-stop-daemon.8/po/sv.po b/man/po4a/start-stop-daemon.8/po/sv.po
index 8b686cd6a4d8288af0f3ad99f383ecfb5ab432c8..8fe58699b5a4412a12a3f00eaae21475f42f40cb 100644 (file)
--- a/man/po4a/start-stop-daemon.8/po/sv.po
+++ b/man/po4a/start-stop-daemon.8/po/sv.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: dpkg man pages\n"
-"POT-Creation-Date: 2006-06-20 21:07+0200\n"
+"POT-Creation-Date: 2006-06-21 17:57+0300\n"
 "PO-Revision-Date: 2006-06-11 20:34+0100\n"
 "Last-Translator: Peter Karlsson <peterk@debian.org>\n"
 "Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n"
@@ -444,12 +444,24 @@ msgstr "Detta 
 
 # type: TP
 #: ../../../man/po4a/../C/start-stop-daemon.8:230
+#, fuzzy, no-wrap
+msgid "B<-k>|B<--umask> I<mask>"
+msgstr "B<-s>|B<--signal> I<signal>"
+
+# type: Plain text
+#: ../../../man/po4a/../C/start-stop-daemon.8:233
+#, fuzzy
+msgid "This sets the umask of the process before starting it."
+msgstr "Detta ändrar prioriteten på processen innan den startas."
+
+# type: TP
+#: ../../../man/po4a/../C/start-stop-daemon.8:233
 #, no-wrap
 msgid "B<-m>|B<--make-pidfile>"
 msgstr "B<-m>|B<--make-pidfile>"
 
 # type: Plain text
-#: ../../../man/po4a/../C/start-stop-daemon.8:245
+#: ../../../man/po4a/../C/start-stop-daemon.8:248
 msgid ""
 "Used when starting a program that does not create its own pid file. This "
 "option will make B<start-stop-daemon> create the file referenced with B<--"
@@ -469,46 +481,46 @@ msgstr ""
 "background>."
 
 # type: TP
-#: ../../../man/po4a/../C/start-stop-daemon.8:245
+#: ../../../man/po4a/../C/start-stop-daemon.8:248
 #, no-wrap
 msgid "B<-v>|B<--verbose>"
 msgstr "B<-v>|B<--verbose>"
 
 # type: Plain text
-#: ../../../man/po4a/../C/start-stop-daemon.8:248
+#: ../../../man/po4a/../C/start-stop-daemon.8:251
 msgid "Print verbose informational messages."
 msgstr "Skriv ut pratsamma informationsmeddelanden."
 
 # type: TP
-#: ../../../man/po4a/../C/start-stop-daemon.8:248
+#: ../../../man/po4a/../C/start-stop-daemon.8:251
 #, no-wrap
 msgid "B<-H>|B<--help>"
 msgstr "B<-H>|B<--help>"
 
 # type: Plain text
-#: ../../../man/po4a/../C/start-stop-daemon.8:251
+#: ../../../man/po4a/../C/start-stop-daemon.8:254
 msgid "Print help information; then exit."
 msgstr "Skriv ut hjälpinformation och avsluta sedan."
 
 # type: TP
-#: ../../../man/po4a/../C/start-stop-daemon.8:251
+#: ../../../man/po4a/../C/start-stop-daemon.8:254
 #, no-wrap
 msgid "B<-V>|B<--version>"
 msgstr "B<-V>|B<--version>"
 
 # type: Plain text
-#: ../../../man/po4a/../C/start-stop-daemon.8:254
+#: ../../../man/po4a/../C/start-stop-daemon.8:257
 msgid "Print version information; then exit."
 msgstr "Skriv ut versionsinformation och avsluta sedan."
 
 # type: SH
-#: ../../../man/po4a/../C/start-stop-daemon.8:255
+#: ../../../man/po4a/../C/start-stop-daemon.8:258
 #, no-wrap
 msgid "AUTHORS"
 msgstr "FÖRFATTARE"
 
 # type: Plain text
-#: ../../../man/po4a/../C/start-stop-daemon.8:258
+#: ../../../man/po4a/../C/start-stop-daemon.8:261
 msgid ""
 "Marek Michalkiewicz E<lt>marekm@i17linuxb.ists.pwr.wroc.plE<gt> based on a "
 "previous version by Ian Jackson E<lt>ian@chiark.greenend.org.ukE<gt>."
@@ -517,7 +529,7 @@ msgstr ""
 "en tidigare version av Ian Jackson E<lt>ian@chiark.greenend.org.ukE<gt>."
 
 # type: Plain text
-#: ../../../man/po4a/../C/start-stop-daemon.8:260
+#: ../../../man/po4a/../C/start-stop-daemon.8:263
 msgid ""
 "Manual page by Klee Dienes E<lt>klee@mit.eduE<gt>, partially reformatted by "
 "Ian Jackson."

diff --git a/utils/start-stop-daemon.c b/utils/start-stop-daemon.c
index 220d773f0f77000f938acb99b547409895e99fd8..ed0ff818c54d2f4187640e7963afb3291470a510 100644 (file)
--- a/utils/start-stop-daemon.c
+++ b/utils/start-stop-daemon.c
@@ -140,6 +140,7 @@ static char what_stop[1024];
 static const char *schedule_str = NULL;
 static const char *progname = "";
 static int nicelevel = 0;
+static int umask_value = -1;
 
 static struct stat exec_stat;
 #if defined(OSHURD)
@@ -307,6 +308,7 @@ do_help(void)
 "  -r|--chroot <directory>       chroot to <directory> before starting\n"
 "  -d|--chdir <directory>        change to <directory> (default is /)\n"
 "  -N|--nicelevel <incr>         add incr to the process's nice level\n"
+"  -k|--umask <mask>             change the umask to <mask> before starting\n"
 "  -b|--background               force the process to detach\n"
 "  -m|--make-pidfile             create the pidfile before starting\n"
 "  -R|--retry <schedule>         check whether processes die, and retry\n"
@@ -394,6 +396,20 @@ static int parse_signal(const char *signal_str, int *signal_nr)
        return -1;
 }
 
+static int
+parse_umask(const char *string, int *value_r)
+{
+       if (!string[0])
+               return -1;
+
+       errno = 0;
+       *value_r = strtoul(string, NULL, 0);
+       if (errno)
+               return -1;
+       else
+               return 0;
+}
+
 static void
 parse_schedule_item(const char *string, struct schedule_item *item) {
        const char *after_hyph;
@@ -493,16 +509,18 @@ parse_options(int argc, char * const *argv)
                { "exec",         1, NULL, 'x'},
                { "chuid",        1, NULL, 'c'},
                { "nicelevel",    1, NULL, 'N'},
+               { "umask",        1, NULL, 'k'},
                { "background",   0, NULL, 'b'},
                { "make-pidfile", 0, NULL, 'm'},
                { "retry",        1, NULL, 'R'},
                { "chdir",        1, NULL, 'd'},
                { NULL,         0, NULL, 0}
        };
+       const char *umask_str = NULL;
        int c;
 
        for (;;) {
-               c = getopt_long(argc, argv, "HKSVa:n:op:qr:s:tu:vx:c:N:bmR:g:d:",
+               c = getopt_long(argc, argv, "HKSVa:n:op:qr:s:tu:vx:c:N:k:bmR:g:d:",
                                longopts, (int *) 0);
                if (c == -1)
                        break;
@@ -565,6 +583,9 @@ parse_options(int argc, char * const *argv)
                case 'N':  /* --nice */
                        nicelevel = atoi(optarg);
                        break;
+               case 'k':  /* --umask <mask> */
+                       umask_str = optarg;
+                       break;
                case 'b':  /* --background */
                        background = 1;
                        break;
@@ -592,6 +613,11 @@ parse_options(int argc, char * const *argv)
                parse_schedule(schedule_str);
        }
 
+       if (umask_str != NULL) {
+               if (parse_umask(umask_str, &umask_value) != 0)
+                       badusage("umask value must be a positive number");
+       }
+
        if (start == stop)
                badusage("need one of --start or --stop");
 
@@ -1306,6 +1332,8 @@ main(int argc, char **argv)
                        fatal("Unable to alter nice level by %i: %s", nicelevel,
                                strerror(errno));
        }
+       if (umask_value >= 0)
+               umask(umask_value);
        if (mpidfile && pidfile != NULL) { /* user wants _us_ to make the pidfile :) */
                FILE *pidf = fopen(pidfile, "w");
                pid_t pidt = getpid();
@@ -1338,7 +1366,8 @@ main(int argc, char **argv)
                ioctl(tty_fd, TIOCNOTTY, 0);
                close(tty_fd);
 #endif
-               umask(022); /* set a default for dumb programs */
+               if (umask_value < 0)
+                       umask(022); /* set a default for dumb programs */
                dup2(devnull_fd,0); /* stdin */
                dup2(devnull_fd,1); /* stdout */
                dup2(devnull_fd,2); /* stderr */