From ecd3feb35908182f27021938bd35b713337be6db Mon Sep 17 00:00:00 2001 From: Ondrej Vasik Date: Nov 12 2009 09:56:27 +0000 Subject: new upstream release 1.61 --- diff --git a/.cvsignore b/.cvsignore index fcd69a2..4f1ced1 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -wvdial-1.60.tar.gz +wvdial-1.61.tar.gz diff --git a/sources b/sources index b59eed0..5729369 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -27fbbde89f8fd9f6e735a8efa5217fc9 wvdial-1.60.tar.gz +acd3b2050c9b65fff2aecda6576ee7bc wvdial-1.61.tar.gz diff --git a/wvdial-1.60-dialtimeout.patch b/wvdial-1.60-dialtimeout.patch deleted file mode 100644 index ddb943c..0000000 --- a/wvdial-1.60-dialtimeout.patch +++ /dev/null @@ -1,46 +0,0 @@ -Written-by: Steve Marple -Modified-by: Ondrej Vasik - ---- wvdial-1.60.dialtimeout/wvdial.conf.5 2007-07-19 23:22:26.000000000 +0200 -+++ wvdial-1.60/wvdial.conf.5 2007-10-10 14:02:37.000000000 +0200 -@@ -231,6 +231,11 @@ - will quit after that many tries .If set to 0, - .B wvdial - will happily keep dialling forever. -+.TP -+.I Dial Timeout -+The maximum time in seconds that -+.B wvdial -+will wait for a connection to be made. Default value is 60 seconds. - .PP - The - .BR wvdialconf (1) ---- wvdial-1.60.dialtimeout/wvdialer.cc 2007-07-19 23:22:26.000000000 +0200 -+++ wvdial-1.60/wvdialer.cc 2007-10-10 14:01:21.000000000 +0200 -@@ -641,6 +641,7 @@ - { "Idle Seconds", NULL, &options.idle_seconds, "", 0 }, - { "ISDN", NULL, &options.isdn, "", false }, - { "Ask Password", NULL, &options.ask_password, "", false }, -+ { "Dial Timeout", NULL, &options.dial_timeout, "", 60 }, - - { NULL, NULL, NULL, "", 0 } - }; -@@ -908,7 +909,7 @@ - switch( received ) - { - case -1: // nothing -- return control. -- if( time( NULL ) - last_rx >= 60 ) -+ if( time( NULL ) - last_rx >= options.dial_timeout ) - { - log( WvLog::Warning, "Timed out while dialing. Trying again.\n" ); - stat = PreDial1; ---- wvdial-1.60.dialtimeout/wvdialer.h 2007-07-19 23:22:26.000000000 +0200 -+++ wvdial-1.60/wvdialer.h 2007-10-10 14:01:52.000000000 +0200 -@@ -141,6 +141,7 @@ - int idle_seconds; - int isdn; - int ask_password; -+ int dial_timeout; - - } options; - diff --git a/wvdial-1.60-dirent.patch b/wvdial-1.60-dirent.patch deleted file mode 100644 index 2f6471f..0000000 --- a/wvdial-1.60-dirent.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff -urNp wvdial-1.60-orig/wvdialer.cc wvdial-1.60/wvdialer.cc ---- wvdial-1.60-orig/wvdialer.cc 2009-06-11 12:37:13.000000000 +0200 -+++ wvdial-1.60/wvdialer.cc 2009-06-11 13:06:06.000000000 +0200 -@@ -680,7 +680,7 @@ void WvDialer::load_options() - { NULL, NULL, NULL, "", 0 } - }; - -- char * d = "Dialer Defaults"; -+ const char * d = "Dialer Defaults"; - - for( int i=0; opts[i].name != NULL; i++ ) - { -Binární soubory wvdial-1.60-orig/.wvdialer.cc.swp a wvdial-1.60/.wvdialer.cc.swp jsou různé -diff -urNp wvdial-1.60-orig/wvdialer.h wvdial-1.60/wvdialer.h ---- wvdial-1.60-orig/wvdialer.h 2009-06-11 12:37:13.000000000 +0200 -+++ wvdial-1.60/wvdialer.h 2009-06-11 12:39:30.000000000 +0200 -@@ -30,10 +30,10 @@ extern const char wvdial_version_text[]; - struct OptInfo - /************/ - { -- char * name; -+ const char * name; - WvString * str_member; - int * int_member; -- char * str_default; -+ const char * str_default; - int int_default; - }; - -diff -urNp wvdial-1.60-orig/wvmodemscan.cc wvdial-1.60/wvmodemscan.cc ---- wvdial-1.60-orig/wvmodemscan.cc 2007-07-19 23:22:26.000000000 +0200 -+++ wvdial-1.60/wvmodemscan.cc 2009-06-11 13:16:02.000000000 +0200 -@@ -20,7 +20,7 @@ bool default_asyncmap = false; - - // startup at atz atq0 atv1 ate1 ats0 carrier dtr fastdial - // baudstep reinit done --static char *commands[WvModemScan::NUM_STAGES] = { -+static const char *commands[WvModemScan::NUM_STAGES] = { - NULL, "Q0 V1 E1", "Z", "S0=0", - "&C1", "&D2", "+FCLASS=0", NULL, - NULL, "", NULL -@@ -496,7 +496,7 @@ static int fileselect(const struct diren - } - - --static int filesort(const void *_e1, const void *_e2) -+static int filesort(const struct dirent **_e1, const struct dirent **_e2) - { - dirent const * const *e1 = (dirent const * const *)_e1; - dirent const * const *e2 = (dirent const * const *)_e2; diff --git a/wvdial.spec b/wvdial.spec index f732091..cf9f40b 100644 --- a/wvdial.spec +++ b/wvdial.spec @@ -1,17 +1,15 @@ Summary: A heuristic autodialer for PPP connections Name: wvdial -Version: 1.60 -Release: 10%{?dist} +Version: 1.61 +Release: 1%{?dist} License: LGPLv2 URL: http://alumnit.ca/wiki/?WvDial Group: System Environment/Daemons Source0: http://alumnit.ca/download/wvdial-%{version}.tar.gz Patch1: wvdial-1.60-remotename.patch -Patch2: wvdial-1.60-dialtimeout.patch -Patch3: wvdial-1.54-9nums.patch -Patch4: wvdial-1.60-compuserve.patch -Patch5: wvdial-manpages.patch -Patch6: wvdial-1.60-dirent.patch +Patch2: wvdial-1.54-9nums.patch +Patch3: wvdial-1.60-compuserve.patch +Patch4: wvdial-manpages.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libwvstreams-devel >= 0:4.4 lockdev-devel openssl-devel BuildRequires: pkgconfig @@ -26,13 +24,12 @@ negotiate the PPP connection using any mechanism needed. %prep %setup -q %patch1 -p1 -b .remotename -%patch2 -p1 -b .dialtimeout -%patch3 -p1 -b .9nums -%patch4 -p1 -b .compuserve -%patch5 -p1 -b .manpages -%patch6 -p1 -b .dirent +%patch2 -p1 -b .9nums +%patch3 -p1 -b .compuserve +%patch4 -p1 -b .manpages %build +%configure make \ CPPOPTS="$RPM_OPT_FLAGS -DUSE_LOCKDEV=1" \ LOCKDEV=-llockdev \ @@ -65,6 +62,9 @@ touch $RPM_BUILD_ROOT/%{_sysconfdir}/wvdial.conf %verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/wvdial.conf %changelog +* Thu Nov 12 2009 Ondrej Vasik - 1.61-1 +- new upstream release 1.61 + * Mon Jul 27 2009 Fedora Release Engineering - 1.60-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild