Hello community, here is the log from the commit of package i4l-base for openSUSE:Factory checked in at 2019-03-10 09:40:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/i4l-base (Old) and /work/SRC/openSUSE:Factory/.i4l-base.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "i4l-base" Sun Mar 10 09:40:27 2019 rev:71 rq:682875 version:2011.8.29 Changes: -------- --- /work/SRC/openSUSE:Factory/i4l-base/i4l-base.changes 2019-02-25 17:55:15.642457572 +0100 +++ /work/SRC/openSUSE:Factory/.i4l-base.new.28833/i4l-base.changes 2019-03-10 09:40:28.612102942 +0100 @@ -1,0 +2,8 @@ +Tue Mar 5 16:41:34 UTC 2019 - [email protected] + +- Added systemd support. Integrated SUSE-specific patches into + i4l_suse.tar.bz2. + [bsc#1116018, i4l-base.spec, i4l_suse.tar.bz2, + i4l_suse-sleep.diff, i4l_suse.diff] + +------------------------------------------------------------------- Old: ---- i4l_suse-sleep.diff i4l_suse.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ i4l-base.spec ++++++ --- /var/tmp/diff_new_pack.PlRIT0/_old 2019-03-10 09:40:29.912102630 +0100 +++ /var/tmp/diff_new_pack.PlRIT0/_new 2019-03-10 09:40:29.912102630 +0100 @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -66,8 +66,6 @@ Patch: isdn4k-utils.dif Patch1: capi20_3.0.7.patch Patch2: isdn4k-utils-gcc5-fixes.patch -Patch11: i4l_suse.diff -Patch12: i4l_suse-sleep.diff Patch31: divactrl_2.1-gcc.diff Patch32: divactrl_2.1-fix.diff Patch33: divactrl_2.1-dprintf.diff @@ -239,10 +237,6 @@ %patch36 %patch39 -p1 popd -pushd ../i4l_suse -%patch11 -p1 -%patch12 -p0 -popd pushd ../isdn4k-utils %patch37 -p1 %patch38 -p1 @@ -383,8 +377,10 @@ cp etc/ppp/peers/capi-adsl $RPM_BUILD_ROOT/etc/ppp/peers/ cp -p firm/* $RPM_BUILD_ROOT/lib/firmware/isdn chmod a+r $RPM_BUILD_ROOT/lib/firmware/isdn/* -install -d $RPM_BUILD_ROOT/etc/init.d -install -p -m 755 rc/isdn $RPM_BUILD_ROOT/etc/init.d +install -d $RPM_BUILD_ROOT/%{_datadir}/i4l-base/scripts +install -p -m 755 rc/isdn $RPM_BUILD_ROOT/%{_datadir}/i4l-base/scripts +install -d $RPM_BUILD_ROOT/%_unitdir +install -p -m 644 system/isdn.service $RPM_BUILD_ROOT/%_unitdir install -p -m 755 etc/sysconfig/isdn/scripts/* $RPM_BUILD_ROOT/etc/sysconfig/isdn/scripts install -p -m 755 etc/sysconfig/network/scripts/* $RPM_BUILD_ROOT/etc/sysconfig/network/scripts ######## /etc/logrotate.d ############ @@ -393,7 +389,7 @@ ######## postprocess.isdn ############# install -p -m 755 %{S:8} $RPM_BUILD_ROOT/etc/sysconfig/isdn/scripts/postprocess.isdn ###### rc links ###### -ln -sf ../../etc/init.d/isdn $RPM_BUILD_ROOT/usr/sbin/rcisdn +ln -sf /usr/sbin/service $RPM_BUILD_ROOT/usr/sbin/rcisdn ###### sysconfig links ###### ln -sf ifup-isdn $RPM_BUILD_ROOT/etc/sysconfig/network/scripts/ifdown-isdn ln -sf ifup-isdn $RPM_BUILD_ROOT/etc/sysconfig/network/scripts/ifstatus-isdn @@ -480,7 +476,11 @@ rm -f "%buildroot/%_libdir"/*.la %find_lang ant-phone +%pre -n i4l-base +%service_add_pre isdn.service + %post -p /bin/bash +%service_add_post isdn.service # install/doinst.sh - to be done after extraction # # @@ -530,6 +530,7 @@ %post -n capi4linux -p /sbin/ldconfig %preun +%service_del_preun isdn.service %stop_on_removal isdn %postun -n libcapi20-2 -p /sbin/ldconfig @@ -538,6 +539,9 @@ %postun -n capi4linux -p /sbin/ldconfig +%postun -n i4l-base +%service_del_postun isdn.service + %verifyscript %verify_permissions -e /sbin/isdnctrl @@ -590,7 +594,10 @@ /usr/lib/udev/isdn.sh /usr/lib/tmpfiles.d/i4l.conf ### init scripts -%config /etc/init.d/isdn +%{_datadir}/i4l-base +%{_datadir}/i4l-base/scripts +%{_datadir}/i4l-base/scripts/isdn +%_unitdir/isdn.service ### sysconfig ### %dir /etc/sysconfig/isdn %dir /etc/sysconfig/isdn/scripts ++++++ i4l_suse.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/i4l_suse/etc/sysconfig/isdn/scripts/add-hisax_fcpcipnp new/i4l_suse/etc/sysconfig/isdn/scripts/add-hisax_fcpcipnp --- old/i4l_suse/etc/sysconfig/isdn/scripts/add-hisax_fcpcipnp 2003-02-24 18:10:28.000000000 +0100 +++ new/i4l_suse/etc/sysconfig/isdn/scripts/add-hisax_fcpcipnp 2019-03-04 16:52:55.159497994 +0100 @@ -12,10 +12,6 @@ ni1) PROTOCOL_NR=4 ;; *) PROTOCOL_NR=2 ;; esac -if [ -z $HISAXFC_PROTOCOL ] ; then - HISAXFC_PROTOCOL="$PROTOCOL_NR" -else - HISAXFC_PROTOCOL="${HISAXFC_PROTOCOL},${PROTOCOL_NR}" -fi +HISAXFC_PROTOCOL="$PROTOCOL_NR" HISAXFC_CNT=$(($HISAXFC_CNT + 1)) RET=0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/i4l_suse/etc/sysconfig/isdn/scripts/load-avmusb new/i4l_suse/etc/sysconfig/isdn/scripts/load-avmusb --- old/i4l_suse/etc/sysconfig/isdn/scripts/load-avmusb 2005-08-15 11:43:13.000000000 +0200 +++ new/i4l_suse/etc/sysconfig/isdn/scripts/load-avmusb 2019-03-04 16:52:55.175497891 +0100 @@ -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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/i4l_suse/etc/sysconfig/isdn/scripts/load-capi new/i4l_suse/etc/sysconfig/isdn/scripts/load-capi --- old/i4l_suse/etc/sysconfig/isdn/scripts/load-capi 2005-03-07 17:43:34.000000000 +0100 +++ new/i4l_suse/etc/sysconfig/isdn/scripts/load-capi 2019-03-04 16:52:55.175497891 +0100 @@ -9,11 +9,10 @@ /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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/i4l_suse/etc/sysconfig/isdn/scripts/load-fcdslsl new/i4l_suse/etc/sysconfig/isdn/scripts/load-fcdslsl --- old/i4l_suse/etc/sysconfig/isdn/scripts/load-fcdslsl 2005-03-17 14:48:33.000000000 +0100 +++ new/i4l_suse/etc/sysconfig/isdn/scripts/load-fcdslsl 2019-03-04 16:52:55.175497891 +0100 @@ -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} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/i4l_suse/etc/sysconfig/network/scripts/ifup-isdn new/i4l_suse/etc/sysconfig/network/scripts/ifup-isdn --- old/i4l_suse/etc/sysconfig/network/scripts/ifup-isdn 2008-05-25 18:07:44.000000000 +0200 +++ new/i4l_suse/etc/sysconfig/network/scripts/ifup-isdn 2019-03-04 16:52:55.175497891 +0100 @@ -396,14 +396,18 @@ # 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 Binary files old/i4l_suse/firm/b1-1tr6.t4 and new/i4l_suse/firm/b1-1tr6.t4 differ Binary files old/i4l_suse/firm/b1-usa.t4 and new/i4l_suse/firm/b1-usa.t4 differ Binary files old/i4l_suse/firm/b1.t4 and new/i4l_suse/firm/b1.t4 differ Binary files old/i4l_suse/firm/c2.bin and new/i4l_suse/firm/c2.bin differ Binary files old/i4l_suse/firm/c4.bin and new/i4l_suse/firm/c4.bin differ Binary files old/i4l_suse/firm/ds4bri.bit and new/i4l_suse/firm/ds4bri.bit differ Binary files old/i4l_suse/firm/dspdload.bin and new/i4l_suse/firm/dspdload.bin differ Binary files old/i4l_suse/firm/fus2base.frm and new/i4l_suse/firm/fus2base.frm differ Binary files old/i4l_suse/firm/fus3base.frm and new/i4l_suse/firm/fus3base.frm differ Binary files old/i4l_suse/firm/loadpg.bin and new/i4l_suse/firm/loadpg.bin differ Binary files old/i4l_suse/firm/m1-s10.t4 and new/i4l_suse/firm/m1-s10.t4 differ Binary files old/i4l_suse/firm/m1-s4.t4 and new/i4l_suse/firm/m1-s4.t4 differ Binary files old/i4l_suse/firm/pc_1t_ca.bin and new/i4l_suse/firm/pc_1t_ca.bin differ Binary files old/i4l_suse/firm/pc_eu_ca.bin and new/i4l_suse/firm/pc_eu_ca.bin differ Binary files old/i4l_suse/firm/t1-1tr6.t4 and new/i4l_suse/firm/t1-1tr6.t4 differ Binary files old/i4l_suse/firm/t1.t4 and new/i4l_suse/firm/t1.t4 differ Binary files old/i4l_suse/firm/t1b-1tr6.t4 and new/i4l_suse/firm/t1b-1tr6.t4 differ Binary files old/i4l_suse/firm/t1b.t4 and new/i4l_suse/firm/t1b.t4 differ Binary files old/i4l_suse/firm/te_1tr6.pm and new/i4l_suse/firm/te_1tr6.pm differ Binary files old/i4l_suse/firm/te_1tr6.sm and new/i4l_suse/firm/te_1tr6.sm differ Binary files old/i4l_suse/firm/te_etsi.qm0 and new/i4l_suse/firm/te_etsi.qm0 differ Binary files old/i4l_suse/firm/te_etsi.qm1 and new/i4l_suse/firm/te_etsi.qm1 differ Binary files old/i4l_suse/firm/te_etsi.qm2 and new/i4l_suse/firm/te_etsi.qm2 differ Binary files old/i4l_suse/firm/te_etsi.qm3 and new/i4l_suse/firm/te_etsi.qm3 differ Binary files old/i4l_suse/firm_old/b1-1tr6.t4 and new/i4l_suse/firm_old/b1-1tr6.t4 differ Binary files old/i4l_suse/firm_old/b1.t4 and new/i4l_suse/firm_old/b1.t4 differ Binary files old/i4l_suse/firm_old/dspdload.bin and new/i4l_suse/firm_old/dspdload.bin differ Binary files old/i4l_suse/firm_old/te_etsi.pm and new/i4l_suse/firm_old/te_etsi.pm differ Binary files old/i4l_suse/firm_old/te_etsi.sm and new/i4l_suse/firm_old/te_etsi.sm differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/i4l_suse/system/isdn.service new/i4l_suse/system/isdn.service --- old/i4l_suse/system/isdn.service 1970-01-01 01:00:00.000000000 +0100 +++ new/i4l_suse/system/isdn.service 2019-03-06 14:56:02.526644078 +0100 @@ -0,0 +1,11 @@ +[Unit] +Description=This script is loading the needed ISDN drivers +Before=hylafax-hfaxd smpppd.service capisuite.service + +[Service] +Type=forking +ExecStart=/usr/share/i4l-base/scripts/isdn start +ExecStop=/usr/share/i4l-base/scripts/isdn stop + +[Install] +WantedBy=multi-user.target
