Hello community, here is the log from the commit of package wvdial for openSUSE:Factory checked in at 2013-04-02 13:28:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/wvdial (Old) and /work/SRC/openSUSE:Factory/.wvdial.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "wvdial", Maintainer is "dlova...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/wvdial/wvdial.changes 2011-09-23 12:50:49.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.wvdial.new/wvdial.changes 2013-04-02 13:28:17.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Feb 25 16:51:17 UTC 2013 - opens...@dstoecker.de + +- update to release 1.61, drop two outdated patches: + wvdial-glibc210.patch, wvdialer-retry.patch +- add option "No Hardware Protocol" to disable RTS/CTS + +------------------------------------------------------------------- Old: ---- wvdial-1.60.tar.bz2 wvdial-glibc210.patch wvdialer-retry.patch New: ---- wvdial-1.61.tar.bz2 wvdial-1.61_nocrtscts.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wvdial.spec ++++++ --- /var/tmp/diff_new_pack.APWoSW/_old 2013-04-02 13:28:18.000000000 +0200 +++ /var/tmp/diff_new_pack.APWoSW/_new 2013-04-02 13:28:18.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package wvdial (Version 1.60) +# spec file for package wvdial # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,20 +15,18 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: wvdial Url: http://alumnit.ca/wiki/?WvDial -Version: 1.60 -Release: 62 -License: LGPL-2.1+ -Group: Hardware/Modem -Provides: suseppp toppp +Version: 1.61 +Release: 0 +Provides: suseppp +Provides: toppp Requires: ppp -Obsoletes: wvdial-soho Provides: wvdial-soho Summary: A PPP dialer +License: LGPL-2.1+ +Group: Hardware/Modem BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: http://open.nit.ca/download/wvdial-%{version}.tar.bz2 Source1: wvdial.conf @@ -38,9 +36,11 @@ Patch2: makefile.diff Patch3: wvdial-1.56-chat.patch Patch4: wvdial-1.56-no-logrotation-for-dev-null.patch -Patch5: wvdial-glibc210.patch -Patch6: wvdialer-retry.patch -BuildRequires: gcc-c++ pam-devel pkgconfig wvstreams-devel +Patch5: wvdial-1.61_nocrtscts.patch +BuildRequires: gcc-c++ +BuildRequires: pam-devel +BuildRequires: pkgconfig +BuildRequires: wvstreams-devel %description A PPP dialer. With this program you can manually establish a PPP @@ -62,11 +62,11 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 -%patch6 %build # disable as-needed default export SUSE_ASNEEDED=0 +./configure export CFLAGS="$RPM_OPT_FLAGS" export COPTS="$CFLAGS" export CXXFLAGS="$RPM_OPT_FLAGS" @@ -74,10 +74,10 @@ make %install -make ROOT=$RPM_BUILD_ROOT prefix=$RPM_BUILD_ROOT/usr install -mkdir -p $RPM_BUILD_ROOT/etc/ppp/peers -install -m 640 %{S:1} $RPM_BUILD_ROOT/etc/wvdial.conf -install -m 644 %{S:2} $RPM_BUILD_ROOT/etc/ppp/peers/wvdial +make ROOT=%{buildroot} prefix=%{buildroot}/usr install +mkdir -p %{buildroot}/etc/ppp/peers +install -m 640 %{S:1} %{buildroot}/etc/wvdial.conf +install -m 644 %{S:2} %{buildroot}/etc/ppp/peers/wvdial %clean rm -rf %{buildroot} ++++++ makefile.diff ++++++ --- /var/tmp/diff_new_pack.APWoSW/_old 2013-04-02 13:28:18.000000000 +0200 +++ /var/tmp/diff_new_pack.APWoSW/_new 2013-04-02 13:28:18.000000000 +0200 @@ -1,6 +1,6 @@ ---- ./Makefile.orig 2004-02-13 18:05:02.202467500 +0000 -+++ ./Makefile 2004-02-13 18:05:17.516289347 +0000 -@@ -27,10 +27,7 @@ +--- Makefile.in.orig 2013-02-25 17:46:31.123725431 +0100 ++++ Makefile.in 2013-02-25 18:02:27.164480785 +0100 +@@ -40,10 +40,7 @@ install-bin: all [ -d ${BINDIR} ] || install -d ${BINDIR} @@ -11,7 +11,7 @@ install-man: [ -d ${MANDIR}/man1 ] || install -d ${MANDIR}/man1 -@@ -42,8 +39,6 @@ +@@ -55,8 +52,6 @@ uninstall-bin: rm -f ${BINDIR}/wvdial ${BINDIR}/wvdialconf ++++++ wvdial-1.60.tar.bz2 -> wvdial-1.61.tar.bz2 ++++++ ++++ 7539 lines of diff (skipped) ++++++ wvdial-1.61_nocrtscts.patch ++++++ diff -ur wvdial-1.61/wvdial.conf.5 wvdial-1.61_fix/wvdial.conf.5 --- wvdial-1.61/wvdial.conf.5 2008-10-22 15:54:03.000000000 +0200 +++ wvdial-1.61_fix/wvdial.conf.5 2013-02-26 09:51:27.499326167 +0100 @@ -69,6 +69,11 @@ .B wvdial will communicate with your modem. The default is 57600 baud. .TP +.I No Hardware Protocol +If value is set, +.B wvdial +will not use hardware protocol for connections. +.TP .I "Init1 ... Init9" .B wvdial can use up to nine initialization strings to set up your modem. Before diff -ur wvdial-1.61/wvdialer.cc wvdial-1.61_fix/wvdialer.cc --- wvdial-1.61/wvdialer.cc 2009-09-29 19:17:31.000000000 +0200 +++ wvdial-1.61_fix/wvdialer.cc 2013-02-26 09:56:35.321743732 +0100 @@ -642,6 +642,7 @@ { "ISDN", NULL, &options.isdn, "", false }, { "Ask Password", NULL, &options.ask_password, "", false }, { "Dial Timeout", NULL, &options.dial_timeout, "", 60 }, + { "No Hardware Protocol", NULL, &options.no_hardware_protocol, "", false }, { NULL, NULL, NULL, "", 0 } }; @@ -726,7 +727,8 @@ } else { - cloned = modem = new WvModem( options.modem, options.baud ); + cloned = modem = new WvModem( options.modem, options.baud, + options.no_hardware_protocol ? false : true ); } if( !modem->isok() ) { @@ -1206,7 +1208,7 @@ options.where_pppd, speed, "modem", - "crtscts", + options.no_hardware_protocol ? NULL : "crtscts", "defaultroute", "usehostname", "-detach", diff -ur wvdial-1.61/wvdialer.h wvdial-1.61_fix/wvdialer.h --- wvdial-1.61/wvdialer.h 2009-09-29 19:17:19.000000000 +0200 +++ wvdial-1.61_fix/wvdialer.h 2013-02-26 09:53:30.751489841 +0100 @@ -141,6 +141,7 @@ int idle_seconds; int isdn; int ask_password; + int no_hardware_protocol; int dial_timeout; } options; -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
