Hello community, here is the log from the commit of package i4l-base for openSUSE:Factory checked in at Fri May 1 01:24:15 CEST 2009. -------- --- i4l-base/i4l-base.changes 2009-03-02 14:45:31.000000000 +0100 +++ i4l-base/i4l-base.changes 2009-04-30 15:18:00.037901574 +0200 @@ -1,0 +2,5 @@ +Thu Apr 30 15:17:29 CEST 2009 - werner@suse.de + +- Use usleep for more often + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- i4l_suse-sleep.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ i4l-base.spec ++++++ --- /var/tmp/diff_new_pack.AW3911/_old 2009-05-01 01:20:24.000000000 +0200 +++ /var/tmp/diff_new_pack.AW3911/_new 2009-05-01 01:20:24.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package i4l-base (Version 2009.3.2) +# spec file for package i4l-base (Version 2009.4.30) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -26,7 +26,7 @@ Provides: i4l AutoReqProv: on Obsoletes: i4l -Version: 2009.3.2 +Version: 2009.4.30 Release: 1 Summary: ISDN for Linux Basic Utilities Source: isdn4k-utils.v3.13.tar.bz2 @@ -38,6 +38,7 @@ Patch: isdn4k-utils.dif Patch1: capi20_fixes.diff Patch11: i4l_suse.diff +Patch12: i4l_suse-sleep.diff Patch31: divactrl_2.1-gcc.diff Patch32: divactrl_2.1-fix.diff #Patch10: i4l_suse-auto.diff @@ -79,7 +80,7 @@ %package -n ppp-userpass License: GPL v2 or later; LGPL v2.1 or later -Version: 2009.3.2 +Version: 2009.4.30 Release: 1 Summary: Password plugin for pppd Group: Productivity/Networking/PPP @@ -100,7 +101,7 @@ %package -n capi4linux License: GPL v2 or later; LGPL v2.1 or later -Version: 2009.3.2 +Version: 2009.4.30 Release: 1 Summary: CAPI 2.0 library and associated tools Group: Hardware/ISDN @@ -135,7 +136,7 @@ %package -n capi4linux-devel License: GPL v2 or later; LGPL v2.1 or later -Version: 2009.3.2 +Version: 2009.4.30 Release: 1 Summary: CAPI 2.0 library files for development Group: Hardware/ISDN @@ -165,7 +166,7 @@ %package -n i4lfirm License: GPL v2 or later; freely distributable, no modification -Version: 2009.3.2 +Version: 2009.4.30 Release: 1 Summary: ISDN firmware for active ISDN cards Group: Hardware/ISDN @@ -193,7 +194,7 @@ %package -n i4l-vbox License: GPL v2 or later -Version: 2009.3.2 +Version: 2009.4.30 Release: 1 Obsoletes: vbox Provides: vbox vbox2b4 @@ -222,7 +223,7 @@ %package -n ant-phone License: GPL v2 or later -Version: 2009.3.2 +Version: 2009.4.30 Release: 1 Summary: A telephone application Group: Hardware/ISDN @@ -244,7 +245,7 @@ %package -n i4l-isdnlog License: GPL v2 or later -Version: 2009.3.2 +Version: 2009.4.30 Release: 1 Summary: An ISDN line logging and control utility Group: Hardware/ISDN @@ -281,6 +282,7 @@ %patch32 -p1 cd ../i4l_suse %patch11 -p1 +%patch12 -p0 %build for i in capi20 capiinfo capiinit capifax rcapid ; do @@ -855,6 +857,8 @@ /lib/firmware/isdn/te*.qm* %changelog +* Thu Apr 30 2009 werner@suse.de +- Use usleep for more often * Mon Mar 02 2009 kkeil@suse.de - fix some issue with the CAPI 2.0 libraries (bnc#475808) - fix load script for Fritz!Card PnP/PCI v2.0 (bnc#465219) @@ -1006,7 +1010,7 @@ - fix missing Globalconfiguration in BProtocol struct * firmware now in /lib/firmware/isdn * card config tools are under /sbin now -* Mon Dec 13 2004 kkeil@suse.de +* Tue Dec 14 2004 kkeil@suse.de - update to isdn4kutils 3.6 with pppd 2.4.3 support * Mon Sep 27 2004 kkeil@suse.de - add missing new drivers to hotplug files @@ -1056,7 +1060,7 @@ - remove debug code * Tue Sep 16 2003 kkeil@suse.de - message on ifup, if no ISDN hardware is activ (#29946) -* Mon Sep 15 2003 kkeil@suse.de +* Tue Sep 16 2003 kkeil@suse.de - fix isdnmonp wishx ---> wish (#30963) - add some english docu for isdnlog (#30252) - fix aplay call in vboxplay (#28144) @@ -1084,7 +1088,7 @@ - add ipppd filter to make the timeout working again (#24998) * Fri Mar 07 2003 ro@suse.de - added xinetd config file for i4l-vbox (#24672) -* Mon Feb 24 2003 kkeil@suse.de +* Tue Feb 25 2003 kkeil@suse.de - update to current 3.2b3 main version remove obsolete patches - 3.2b3 also fix some vbox problem on PPC (#23907) - fix problems with multiple activ AVM cards (#23966) @@ -1185,17 +1189,17 @@ - buffer overflow fixes for ipppd * Fri Jun 28 2002 ro@suse.de - use -fPIC when creating shared objects -* Thu Jun 13 2002 ro@suse.de +* Fri Jun 14 2002 ro@suse.de - always use macros when calling insserv * Tue Jun 11 2002 mls@suse.de - delete bogus config.* files from i4ldoc/act2000 -* Mon May 13 2002 ro@suse.de +* Tue May 14 2002 ro@suse.de - move libcapi20 libs to libdir where needed * Mon Apr 22 2002 kkeil@suse.de - fix typo in add-hisax PARA_MEM -> PARA_MEMBASE (#15919) * Mon Apr 22 2002 kkeil@suse.de - read real ID for hisaxctrl from /dev/isdninfo (#15916) -* Fri Apr 19 2002 kkeil@suse.de +* Sat Apr 20 2002 kkeil@suse.de - fix wrong user/name for multiple connections (#15773) - fix wrong relativ path in update.hwscan (#15865) - fix missing SECURE setting for interface (#15838) @@ -1217,9 +1221,9 @@ - add REMOTE_IN processing in SuSEconfig.isdn * Sat Mar 16 2002 kukuk@suse.de - Fix typo in etc/sysconfig/isdn/scripts/load-hisax_fcpcipnp -* Thu Mar 14 2002 kkeil@suse.de +* Fri Mar 15 2002 kkeil@suse.de - some fixes to make hotplug working (#13853) -* Mon Mar 11 2002 kkeil@suse.de +* Tue Mar 12 2002 kkeil@suse.de - don't setup interface from rc script if password will asked (#14777) - manual load all controller (#14821) * Sat Mar 09 2002 kukuk@suse.de @@ -1235,7 +1239,7 @@ - ask interactiv for password (#12413) - implement simple provider switching (#6169) - fix various bugs in scripts -* Mon Feb 25 2002 kkeil@suse.de +* Tue Feb 26 2002 kkeil@suse.de - fix rcisdn to handle selected controller - support for Fritz CAPI driver - fix AXP compiler problem @@ -1383,7 +1387,7 @@ * Sat Mar 04 2000 werner@suse.de - Pack .isdnctrl_conf.8.gz or .isdnctrl_timru.8.gz depending on the configuration (close bug #2170) -* Mon Feb 21 2000 kkeil@suse.de +* Tue Feb 22 2000 kkeil@suse.de - fix version numbers - fix i4l_hardware for Eicon * Sun Feb 20 2000 kkeil@suse.de @@ -1447,7 +1451,7 @@ * Sat Oct 16 1999 kkeil@suse.de - new cards, vbox working, ISAR.BIN moved from firmware update scripts -* Tue Oct 12 1999 kkeil@suse.de +* Wed Oct 13 1999 kkeil@suse.de - new utils snapshoot * Mon Oct 11 1999 max@suse.de - ready for the new Tcl/Tk packages @@ -1512,7 +1516,7 @@ - fix error messages * Tue Jan 12 1999 ray@suse.de - include I4L_VERBOSE in i4l_sp_option.rc.config - default yes -* Mon Dec 14 1998 ray@suse.de +* Tue Dec 15 1998 ray@suse.de - fix i4l_hardware * Mon Dec 14 1998 ray@suse.de - fix post install @@ -1619,7 +1623,7 @@ - ICN-4B bugfixes - ownerships fixed - minor bugfixes -* Tue Jun 24 1997 kfr@suse.de +* Wed Jun 25 1997 kfr@suse.de - AVM-B1 now works - finished documentations * Tue Jun 17 1997 kfr@suse.de ++++++ i4l_suse-sleep.diff ++++++ --- etc/sysconfig/isdn/scripts/load-avmusb +++ etc/sysconfig/isdn/scripts/load-avmusb 2009-04-30 15:12:46.177901975 +0200 @@ -2,11 +2,10 @@ test "$DSL_CONTR" = "dslonly" || /sbin/modprobe --ignore-install isdn /sbin/modprobe --ignore-install kernelcapi >& /dev/null /sbin/modprobe --ignore-install capi >& /dev/null -tout=0 -while [ $tout -le 10 ] ; do - test -e /dev/capi/31 && break; - sleep 1 - tout=$(($tout + 1)) +typeset -i tout=0 +while ((tout++ < 400)) ; do + test -e /dev/capi/31 && break + usleep 25000 done /sbin/modprobe --ignore-install $DRV >& /dev/null if [ "$DSL_CONTR" = "dslonly" ]; then --- etc/sysconfig/isdn/scripts/load-capi +++ etc/sysconfig/isdn/scripts/load-capi 2009-04-30 15:14:18.616916761 +0200 @@ -9,11 +9,10 @@ if [ -z "$LOAD_CAPI" ]; then /sbin/modprobe capi >& /dev/null RET=$? if [ $RET -eq 0 ]; then - tout=0 - while [ $tout -le 10 ] ; do + typeset -i tout=0 + while ((tout++ < 400)) ; do test -e /dev/capi/31 && break; - sleep 1 - tout=$(($tout + 1)) + usleep 25000 done else /sbin/modprobe -r kernelcapi --- etc/sysconfig/isdn/scripts/load-fcdslsl +++ etc/sysconfig/isdn/scripts/load-fcdslsl 2009-04-30 15:12:52.454692113 +0200 @@ -1,11 +1,10 @@ #!/bin/bash /sbin/modprobe kernelcapi >& /dev/null /sbin/modprobe capi >& /dev/null -tout=0 -while [ $tout -le 10 ] ; do - test -e /dev/capi/31 && break; - sleep 1 - tout=$(($tout + 1)) +typeset -i tout=0 +while ((tout++ < 400)) ; do + test -e /dev/capi/31 && break + usleep 25000 done /sbin/modprobe --ignore-install $DRV >& /dev/null CONTR=${CONTR:-0} --- etc/sysconfig/network/scripts/ifup-isdn +++ etc/sysconfig/network/scripts/ifup-isdn 2009-04-30 15:09:20.677901019 +0200 @@ -396,14 +396,18 @@ EOT # if [ "$ENCAP" = "syncppp" ] ; then PIDFILE=/var/run/ipppd.${DEVICE}.pid - test -s $PIDFILE && kill -15 `cat $PIDFILE` 2>/dev/null - sleep 0 if [ -s $PIDFILE ] ; then - sleep 2 - if test -s $PIDFILE; then - # very stubborn :-( - kill -9 `cat $PIDFILE` 2>/dev/null - fi + read -t 1 PID < $PIDFILE + kill -15 $PID 2>/dev/null + fi + for ((count=0; count<120; count++)) ; do + [ -s $PIDFILE ] || break; + usleep 25000 + done + if [ -s $PIDFILE ] ; then + # very stubborn :-( + kill -9 $PID + rm -f $PIDFILE fi PROVIDERLOCK=/var/run/ipppd.${DEVICE}.provider if [ -s $PROVIDERLOCK ]; then ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org