From: Chris Lawrence Date: Sun, 6 Aug 2006 23:18:08 +0000 (-0500) Subject: lsb 3.1-11 Debian release. X-Git-Tag: archive/raspbian/10.2018112800+rpi1^2~240 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=9ade352ab4819ff5195b0fdbbe0eb24d4bb9c599;p=lsb.git lsb 3.1-11 Debian release. --- diff --git a/debian/TODO b/debian/TODO index 615a76a..79ce91a 100644 --- a/debian/TODO +++ b/debian/TODO @@ -1,8 +1,5 @@ A quickie TODO list for lsb*: -* Make output format for logging functions configurable. (#321963) * Finish lsbinstall -* Move lsb-release into this package; rewrite. (#135832) -* Move dynamic linker symlinks from postinst into package itself. -* Support additional Debian architectures. +* Move dynamic linker symlinks from postinst into package itself. (?) * Only build lsb-* for LSB architectures in Debian. diff --git a/debian/changelog b/debian/changelog index a7ed06b..f67e000 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,27 @@ +lsb (3.1-11) unstable; urgency=low + + * Patch for other architectures from Martin Habets + (closes: #375457) + * Stop using basename: patch from Tore Anderson + (closes: #354028) + * Move return code evaluation out of if $specified block in killproc, so + that evaluation is dependant on whether or not process is running, not on + whether a pidfile was specified (closes: #379387) + * log_end_msg no longer returns non-zero. It's a log function, after all + (closes: #381687) + * log_use_fancy_output is now overridable by admin (closes: #374780) + * pidofproc actually checks if process is running (closes: #381684) + (probably closes: #167757) + * Use shell built-in getopts instead of /usr/bin/getopt (closes: #335216) + * Remove reference to /usr/share/doc/lsb-core/html/ (closes: #380045) + * Ru translation (thanks: Yuri Kozlov ) + (closes: #380430) + * Above changes prepared by Stephen Gran . + * Update debian/TODO, which was a wee bit out of date. + * Accomplish Python policy transition. (Closes: #380858) + + -- Chris Lawrence Sun, 6 Aug 2006 18:18:08 -0500 + lsb (3.1-10) unstable; urgency=low * Quote tests of $specified. (Closes: #370256) diff --git a/debian/control b/debian/control index ac8017c..6e9c4be 100644 --- a/debian/control +++ b/debian/control @@ -2,15 +2,17 @@ Source: lsb Section: misc Priority: extra Maintainer: Chris Lawrence -Build-Depends: debhelper (>= 4.1.13), po-debconf (>= 0.5.0), dpkg-dev (>= 1.10) +Build-Depends: debhelper (>= 4.1.13), po-debconf (>= 0.5.0), dpkg-dev (>= 1.10), python-central (>= 0.5), python-all-dev Standards-Version: 3.7.2 +XS-Python-Version: current Package: lsb-core Architecture: any -Depends: lsb-release, ${glibc}, libz1, exim4 | mail-transport-agent, at, bc, binutils, bsdmainutils, bsdutils, cpio, cron, ed, file, libc6-dev | libc-dev, locales, lpr, lprng | cupsys-client, m4, mailx | mailutils, make, man-db, mawk | gawk, ncurses-term, passwd, patch, pax, procps, psmisc, rsync, alien (>= 8.36), python (>> 2.3), ${misc:Depends}, ${depends}, lsb-base +Depends: lsb-release, ${glibc}, libz1, exim4 | mail-transport-agent, at, bc, binutils, bsdmainutils, bsdutils, cpio, cron, ed, file, libc6-dev | libc-dev, locales, lpr, lprng | cupsys-client, m4, mailx | mailutils, make, man-db, mawk | gawk, ncurses-term, passwd, patch, pax, procps, psmisc, rsync, alien (>= 8.36), ${python:Depends}, ${misc:Depends}, ${depends}, lsb-base Provides: lsb-core-noarch, ${provides} Conflicts: python (>> 2.5), lsb (<< 2.0-2) Replaces: lsb (<< 2.0-2) +XB-Python-Version: ${python:Versions} Description: Linux Standard Base 3.1 core support package The Linux Standard Base (http://www.linuxbase.org/) is a standard core system that third-party applications written for Linux can @@ -150,8 +152,9 @@ Description: Linux Standard Base 3.1 init script functionality Package: lsb-release Architecture: all -Depends: python (>> 2.3), python (<< 2.5) +Depends: ${python:Depends} Recommends: lsb +XB-Python-Version: ${python:Versions} Description: Linux Standard Base version reporting utility The Linux Standard Base (http://www.linuxbase.org/) is a standard core system that third-party applications written for Linux can diff --git a/debian/lsb-base.README.Debian b/debian/lsb-base.README.Debian index 49f7f6e..93cd0a0 100644 --- a/debian/lsb-base.README.Debian +++ b/debian/lsb-base.README.Debian @@ -90,4 +90,6 @@ If supplied, this script fragment should be compatible with any Debian /bin/sh, as init scripts sourcing this file may be running under any Bourne-style shell permitted by Debian policy (i.e. not just bash). +"Fancy output" can be overriden by setting FANCYTTY=0 in this file. + -- Chris Lawrence , Sat Sep 24 19:15:02 2005 diff --git a/debian/po/ru.po b/debian/po/ru.po new file mode 100644 index 0000000..bd2280d --- /dev/null +++ b/debian/po/ru.po @@ -0,0 +1,74 @@ +# translation of lsb_3.1-10_debconf_ru.po to Russian +# This file is distributed under the same license as the PACKAGE package. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER. +# Yuri Kozlov , 2006. +# +msgid "" +msgstr "" +"Project-Id-Version: lsb_3.1-10\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2006-06-28 08:12-0600\n" +"PO-Revision-Date: 2006-07-30 10:49+0300\n" +"Last-Translator: Yuri Kozlov \n" +"Language-Team: Russian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.9.1\n" + +#. Type: boolean +#. Description +#: ../templates:4 +msgid "Should shadow passwords be enabled?" +msgstr "Включить поддержку теневых паролей?" + +#. Type: boolean +#. Description +#: ../templates:4 +msgid "" +"The Linux Standard Base requires that certain features of adduser(8) be " +"available to conforming applications (such as password aging). Debian only " +"provides these features when shadow passwords are enabled; however, your " +"system currently has shadow passwords disabled." +msgstr "" +"По стандарту Linux Standard Base требуется, чтобы определённые возможности " +"adduser(8) были доступны для соответствующих стандарту приложений (например, " +"устаревание паролей). Debian предоставляет эти возможности только, если включён " +"механизм теневых паролей; однако на данный момент в вашей системе теневые " +"пароли выключены." + +#. Type: boolean +#. Description +#: ../templates:4 +#, no-c-format +msgid "" +"Most LSB applications will work fine with either setting, but 100% " +"conformance requires shadow passwords to be enabled." +msgstr "" +"Большинство LSB приложений будут правильно работать при любой настройке, но " +"для 100% соответствия требуется включить теневые пароли." + +#. Type: boolean +#. Description +#: ../templates:4 +msgid "" +"Generally speaking, it is considered good practice to enable shadow " +"passwords. However, there are some situations in which shadow passwords may " +"not work properly (most notably, if non-root users need to authenticate " +"passwords against /etc/passwd)." +msgstr "" +"Вообще, считается хорошей практикой использовать механизм теневых паролей. " +"Однако, возможны ситуации, при которых теневые пароли могут работать неправильно " +"(самая заметная, когда обычным пользователям требуется аутентификация паролей через " +"/etc/passwd)." + +#. Type: boolean +#. Description +#: ../templates:4 +msgid "" +"If you answer in the affirmative, the command 'shadowconfig on' will be run " +"to enable shadow passwords." +msgstr "" +"Если вы ответите утвердительно, будет запущена команда 'shadowconfig on' " +"для включения теневых паролей." + diff --git a/debian/postinst b/debian/postinst index a17e83f..a75344b 100755 --- a/debian/postinst +++ b/debian/postinst @@ -3,7 +3,7 @@ setup_ldso_symlink () { ARCH=`dpkg --print-installation-architecture` case "$ARCH" in - s390|ppc64) + s390|ppc64|sparc|sparc64|alpha|hppa|m68k|mipsel) ln -sf ld.so.1 /lib/ld-lsb-$ARCH.so.1 ln -sf ld.so.1 /lib/ld-lsb-$ARCH.so.2 ln -sf ld.so.1 /lib/ld-lsb-$ARCH.so.3 diff --git a/debian/prerm b/debian/prerm index d0469c1..278be5b 100644 --- a/debian/prerm +++ b/debian/prerm @@ -3,7 +3,7 @@ remove_ldso_symlink () { ARCH=`dpkg --print-installation-architecture` case "$ARCH" in - s390|ia64|ppc64) + s390|ia64|ppc64|sparc|sparc64|alpha|hppa|m68k|mipsel) rm -f /lib/ld-lsb-$ARCH.so.[123] ;; powerpc) diff --git a/debian/rules b/debian/rules index 1948be9..aa3298d 100755 --- a/debian/rules +++ b/debian/rules @@ -109,6 +109,8 @@ binary-indep: build install # dh_makeshlibs dh_installdeb -i # dh_perl + dh_pycentral + dh_python dh_shlibdeps -i dh_gencontrol -i dh_md5sums -i diff --git a/init-functions b/init-functions index 07727ce..0480579 100644 --- a/init-functions +++ b/init-functions @@ -29,81 +29,78 @@ start_daemon () { local force nice pidfile exec i - set -- `POSIXLY_CORRECT=1 getopt "fn:p:" $*` force=0 nice=0 pidfile=/dev/null - for i in $*; do - case $i in - -f) force=1; shift;; - -n) nice=$2; shift 2;; - -p) pidfile=$2; shift 2;; - --) shift; break;; + while getopts fn:p: opt ; do + case "$opt" in + f) force=1; shift 1;; + n) nice="$OPTARG"; shift 2;; + p) pidfile="$OPTARG"; shift 2;; esac done - exec=$1; shift + exec=$1; shift 1 + if [ "$1" = '--' ] ; then shift 1; fi if [ $force = 1 ]; then - /sbin/start-stop-daemon --start --nicelevel $nice --quiet --startas $exec --pidfile /dev/null --oknodo -- $* + /sbin/start-stop-daemon --start --nicelevel $nice --quiet --startas $exec --pidfile /dev/null --oknodo -- "$@" elif [ $pidfile ]; then - /sbin/start-stop-daemon --start --nicelevel $nice --quiet --exec $exec --oknodo --pidfile "$pidfile" -- $* + /sbin/start-stop-daemon --start --nicelevel $nice --quiet --exec $exec --oknodo --pidfile "$pidfile" -- "$@" else - /sbin/start-stop-daemon --start --nicelevel $nice --quiet --exec $exec --oknodo -- $* + /sbin/start-stop-daemon --start --nicelevel $nice --quiet --exec $exec --oknodo -- "$@" fi } pidofproc () { local pidfile line i pids= status specified pid - set -- `POSIXLY_CORRECT=1 getopt "p:" $*` pidfile= specified= - for i in $*; do - case $i in - -p) pidfile=$2; specified=1; shift 2;; - --) shift; break;; + while getopts p:- opt ; do + case $opt in + p) pidfile="$OPTARG"; specified=1; shift 2;; esac done if [ -z "${pidfile:-}" ]; then - pidfile=/var/run/$(basename "$1").pid + pidfile=/var/run/${1##*/}.pid fi if [ -f "$pidfile" ]; then read pid < "$pidfile" if [ -n "${pid:-}" ]; then - echo "$pid" - return 0 - else - return 2 # program is dead and /var/run pid file exists + if $(kill -0 "${pid:-}"); then + echo "$pid" + return 0 + else + return 1 # program is dead and /var/run pid file exists + fi fi - elif [ -x /bin/pidof -a ! "$specified" ]; then + fi + if [ -x /bin/pidof -a ! "$specified" ]; then /bin/pidof -o %PPID $1 status="$?" [ "$status" = 1 ] && return 3 # program is not running return 0 - else - return 4 # program or service is unknown fi + return 4 # program or service is unknown } # start-stop-daemon uses the same algorithm as "pidofproc" above. killproc () { local pidfile sig status base i specified - set -- `POSIXLY_CORRECT=1 getopt "p:" $*` pidfile= specified= - for i in $*; do + while getopts p:- opt ; do case $i in - -p) pidfile=$2; specified=1; shift 2;; - --) shift; break;; + p) pidfile="$OPTARG"; specified=1; shift 2;; esac done - base=$(basename "$1") + base=${1##*/} if [ ! $pidfile ]; then pidfile=/var/run/$base.pid fi @@ -113,12 +110,12 @@ killproc () { sig=$(echo $sig | sed -e 's/^SIG\(.*\)/\1/') sig=${sig:-TERM} /sbin/start-stop-daemon --stop --pidfile "$pidfile" --signal $sig --quiet --name "$base" - status="$?" - [ "$status" = 1 ] && return 3 # program is not running - return 0 else /sbin/start-stop-daemon --stop --pidfile "$pidfile" --retry 5 --quiet --oknodo --name "$base" fi + status="$?" + [ "$status" = 1 ] && return 3 # program is not running + return 0 rm -f "$pidfile" } @@ -126,6 +123,9 @@ killproc () { log_use_fancy_output () { TPUT=/usr/bin/tput EXPR=/usr/bin/expr + if FANCYTTY=0; then + false + fi if [ "x$TERM" != "xdumb" ] && [ -x $TPUT ] && [ -x $EXPR ] && $TPUT hpa 60 >/dev/null 2>&1; then FANCYTTY=1 true @@ -252,7 +252,7 @@ log_end_msg () { echo " failed!" fi fi - return $1 + return 0 } log_action_msg () { diff --git a/lsb.8 b/lsb.8 index 8aee4b9..fa6b788 100644 --- a/lsb.8 +++ b/lsb.8 @@ -28,7 +28,6 @@ create binary packages that will run on any Linux distribution. For more information on the standard, please see the LSB web site. .SH SEE ALSO .BR /usr/share/doc/lsb-core/README.Debian -.BR /usr/share/doc/lsb-core/html/ .BR http://www.linuxbase.org/ .SH AUTHOR This manual page was written by Chris Lawrence