tags 469855 + pending
thanks
Hello again,
On Sun, Mar 09, 2008 at 11:17:42AM +0100, Sebastian Harl wrote:
> On Sun, Mar 09, 2008 at 05:41:05AM +0000, Joseph Nahmias wrote:
> > On Fri, Mar 07, 2008 at 08:07:14PM +0100, Sebastian Harl wrote:
> > --- postinst 2008-02-08 10:13:24.000000000 -0500
> > +++ postinst.fixed 2008-03-09 00:34:04.000000000 -0500
> > @@ -19,8 +19,14 @@ case "$1" in
> > chmod 770 /var/run/nut /var/lib/nut
> >
> > # restart udev to apply the USB rules to the already plugged devices
> > - [ -x /etc/init.d/udev ] && pidof udevd > /dev/null \
> > - && /usr/sbin/invoke-rc.d udev restart
> > + # only if it's already running in this environment
> > + udevd_pid=$(pidof udevd)
>
> This should be "udevd_pid=$( pidof udevd 2> /dev/null ) || true" - the
> redirection of stderr is not strictly required but I'd add it for the
> sake of completeness. "|| true" is obviously required to not terminate
> because of "-e" in case udevd isn't running.
Yes, indeed.
> > + if [ -x /etc/init.d/udev ] && [ -n "$udev_pid" ]; then
> > + if [ "$(stat -c %d/%i /)" = "$(stat -Lc %d/%i /proc/$udev_pid/root
> > 2>/dev/null)" ];
>
> The builtin stat shipped with zsh does not seem to recognize the "-c"
> option. So, we should use "/usr/bin/stat" here to catch the (unlikely)
> case that anybody uses zsh (or possible other "incompatible" shells) as
> /bin/sh.
*shrug* ok.
> Also, if udevd would be running both inside and outside the chroot
> (which does not seem to be possible from a quick test though [1])
TTBOMK this is impossible, so I'm not bothering with the for loop.
> Thanks for the patch - imho it should be uploaded ASAP as it prevents
> other packages from being built. Arnaud, any comments?
I will be uploading the attached (proofread and tested) patch as an NMU
to the delayed-5 queue so that this will not be open for longer than a
week if the maintainer does nothing.
--Joe
diff -u nut-2.2.1/debian/changelog nut-2.2.1/debian/changelog
--- nut-2.2.1/debian/changelog
+++ nut-2.2.1/debian/changelog
@@ -1,3 +1,10 @@
+nut (2.2.1-2.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Skip udev restart logic within chroots, closes: #469855.
+
+ -- Joe Nahmias <[EMAIL PROTECTED]> Sun, 09 Mar 2008 13:12:12 -0400
+
nut (2.2.1-2) unstable; urgency=low
* debian/po/de.po: update the German po-debconf translation (Closes:
diff -u nut-2.2.1/debian/nut.postinst nut-2.2.1/debian/nut.postinst
--- nut-2.2.1/debian/nut.postinst
+++ nut-2.2.1/debian/nut.postinst
@@ -19,8 +19,14 @@
chmod 770 /var/run/nut /var/lib/nut
# restart udev to apply the USB rules to the already plugged devices
- [ -x /etc/init.d/udev ] && pidof udevd > /dev/null \
- && /usr/sbin/invoke-rc.d udev restart
+ # only if it's already running in this environment
+ udevd_pid=$(pidof udevd 2>/dev/null) || true
+ if [ -x /etc/init.d/udev ] && [ -n "$udevd_pid" ]; then
+ if [ "$(/usr/bin/stat -c %d/%i /)" = "$(/usr/bin/stat -Lc %d/%i /proc/$udevd_pid/root 2>/dev/null)" ];
+ then
+ /usr/sbin/invoke-rc.d udev restart
+ fi
+ fi
;;
abort-upgrade)
only in patch2:
unchanged:
--- nut-2.2.1.orig/config.sub
+++ nut-2.2.1/config.sub
@@ -1,10 +1,10 @@
#! /bin/sh
# Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
-# Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+# Free Software Foundation, Inc.
-timestamp='2007-01-18'
+timestamp='2008-01-16'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -72,8 +72,8 @@
version="\
GNU config.sub ($timestamp)
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -369,10 +369,14 @@
| v850-* | v850e-* | vax-* \
| we32k-* \
| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
- | xstormy16-* | xtensa-* \
+ | xstormy16-* | xtensa*-* \
| ymp-* \
| z8k-*)
;;
+ # Recognize the basic CPU types without company name, with glob match.
+ xtensa*)
+ basic_machine=$basic_machine-unknown
+ ;;
# Recognize the various machine names and aliases which stand
# for a CPU type and a company and sometimes even an OS.
386bsd)
@@ -443,6 +447,14 @@
basic_machine=ns32k-sequent
os=-dynix
;;
+ blackfin)
+ basic_machine=bfin-unknown
+ os=-linux
+ ;;
+ blackfin-*)
+ basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+ os=-linux
+ ;;
c90)
basic_machine=c90-cray
os=-unicos
@@ -475,8 +487,8 @@
basic_machine=craynv-cray
os=-unicosmp
;;
- cr16c)
- basic_machine=cr16c-unknown
+ cr16)
+ basic_machine=cr16-unknown
os=-elf
;;
crds | unos)
@@ -668,6 +680,14 @@
basic_machine=m68k-isi
os=-sysv
;;
+ m68knommu)
+ basic_machine=m68k-unknown
+ os=-linux
+ ;;
+ m68knommu-*)
+ basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
+ os=-linux
+ ;;
m88k-omron*)
basic_machine=m88k-omron
;;
@@ -683,6 +703,10 @@
basic_machine=i386-pc
os=-mingw32
;;
+ mingw32ce)
+ basic_machine=arm-unknown
+ os=-mingw32ce
+ ;;
miniframe)
basic_machine=m68000-convergent
;;
@@ -809,6 +833,14 @@
basic_machine=i860-intel
os=-osf
;;
+ parisc)
+ basic_machine=hppa-unknown
+ os=-linux
+ ;;
+ parisc-*)
+ basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
+ os=-linux
+ ;;
pbd)
basic_machine=sparc-tti
;;
@@ -1017,6 +1049,10 @@
basic_machine=tic6x-unknown
os=-coff
;;
+ tile*)
+ basic_machine=tile-unknown
+ os=-linux-gnu
+ ;;
tx39)
basic_machine=mipstx39-unknown
;;
only in patch2:
unchanged:
--- nut-2.2.1.orig/config.guess
+++ nut-2.2.1/config.guess
@@ -1,10 +1,10 @@
#! /bin/sh
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
-# Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+# Free Software Foundation, Inc.
-timestamp='2007-03-06'
+timestamp='2008-01-23'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -56,8 +56,8 @@
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -330,7 +330,7 @@
sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
- i86pc:SunOS:5.*:*)
+ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
sun4*:SunOS:6*:*)
@@ -532,7 +532,7 @@
echo rs6000-ibm-aix3.2
fi
exit ;;
- *:AIX:*:[45])
+ *:AIX:*:[456])
IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
IBM_ARCH=rs6000
@@ -793,12 +793,15 @@
exit ;;
*:Interix*:[3456]*)
case ${UNAME_MACHINE} in
- x86)
+ x86)
echo i586-pc-interix${UNAME_RELEASE}
exit ;;
EM64T | authenticamd)
echo x86_64-unknown-interix${UNAME_RELEASE}
exit ;;
+ IA64)
+ echo ia64-unknown-interix${UNAME_RELEASE}
+ exit ;;
esac ;;
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
echo i${UNAME_MACHINE}-pc-mks
@@ -833,7 +836,14 @@
echo ${UNAME_MACHINE}-pc-minix
exit ;;
arm*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ eval $set_cc_for_build
+ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+ | grep -q __ARM_EABI__
+ then
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ else
+ echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+ fi
exit ;;
avr32*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -954,8 +964,8 @@
x86_64:Linux:*:*)
echo x86_64-unknown-linux-gnu
exit ;;
- xtensa:Linux:*:*)
- echo xtensa-unknown-linux-gnu
+ xtensa*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
i*86:Linux:*:*)
# The BFD linker knows what the default object file format is, so
@@ -1474,9 +1484,9 @@
the operating system you are using. It is advised that you
download the most up to date version of the config scripts from
- http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
+ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
and
- http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
+ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
If the version you run ($0) is already up to date, please
send the following data and any information you think might be
