diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..2214f09 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/wvdial-1.61.tar.gz diff --git a/.wvdial.metadata b/.wvdial.metadata new file mode 100644 index 0000000..47a117c --- /dev/null +++ b/.wvdial.metadata @@ -0,0 +1 @@ +2878cae3aaf067989eebc7313ccd2cec59893345 SOURCES/wvdial-1.61.tar.gz diff --git a/SOURCES/wvdial-1.54-9nums.patch b/SOURCES/wvdial-1.54-9nums.patch new file mode 100644 index 0000000..dd981da --- /dev/null +++ b/SOURCES/wvdial-1.54-9nums.patch @@ -0,0 +1,120 @@ +#added support for up to 9 alternative numbers instead of 4(#178025) +#Fedora specific + +diff -ru orig/wvdial.conf.5 wvdial/wvdial.conf.5 +--- orig/wvdial.conf.5 2003-11-15 03:46:13.000000000 +0800 ++++ wvdial/wvdial.conf.5 2006-01-16 16:19:16.000000000 +0800 +@@ -78,7 +78,7 @@ + .I Phone + The phone number you want + .B wvdial +-to dial. You can add up to 4 other phone numbers that ++to dial. You can add up to 9 other phone numbers that + .B wvdial + will dial in order, by adding: + .TP +@@ -90,6 +90,16 @@ + .TP + .I Phone4 + .TP ++.I Phone5 ++.TP ++.I Phone6 ++.TP ++.I Phone7 ++.TP ++.I Phone8 ++.TP ++.I Phone9 ++.TP + .I Dial Prefix + .B wvdial + will insert this string after the dial command and before the phone number. +diff -ru orig/wvdialer.cc wvdial/wvdialer.cc +--- orig/wvdialer.cc 2003-11-15 03:46:13.000000000 +0800 ++++ wvdial/wvdialer.cc 2007-01-16 16:14:59.000000000 +0800 +@@ -213,7 +213,29 @@ + { + phnum_max++; + if(options.phnum4.len()) +- phnum_max++; ++ { ++ phnum_max++; ++ if(options.phnum5.len()) ++ { ++ phnum_max++; ++ if(options.phnum6.len()) ++ { ++ phnum_max++; ++ if(options.phnum7.len()) ++ { ++ phnum_max++; ++ if(options.phnum8.len()) ++ { ++ phnum_max++; ++ if(options.phnum9.len()) ++ { ++ phnum_max++; ++ } ++ } ++ } ++ } ++ } ++ } + } + } + } +@@ -592,6 +612,11 @@ + { "Phone2", &options.phnum2, NULL, "", 0 }, + { "Phone3", &options.phnum3, NULL, "", 0 }, + { "Phone4", &options.phnum4, NULL, "", 0 }, ++ { "Phone5", &options.phnum5, NULL, "", 0 }, ++ { "Phone6", &options.phnum6, NULL, "", 0 }, ++ { "Phone7", &options.phnum7, NULL, "", 0 }, ++ { "Phone8", &options.phnum8, NULL, "", 0 }, ++ { "Phone9", &options.phnum9, NULL, "", 0 }, + { "Dial Prefix", &options.dial_prefix, NULL, "", 0 }, + { "Area Code", &options.areacode, NULL, "", 0 }, + { "Dial Command", &options.dial_cmd, NULL, "ATDT", 0 }, +@@ -874,9 +899,24 @@ + case 3: + this_str = &options.phnum3; + break; +- case 4: ++ case 4: ++ this_str = &options.phnum4; ++ break; ++ case 5: ++ this_str = &options.phnum5; ++ break; ++ case 6: ++ this_str = &options.phnum6; ++ break; ++ case 7: ++ this_str = &options.phnum7; ++ break; ++ case 8: ++ this_str = &options.phnum8; ++ break; ++ case 9: + default: +- this_str = &options.phnum4; ++ this_str = &options.phnum9; + break; + } + +diff -ru orig/wvdialer.h wvdial/wvdialer.h +--- orig/wvdialer.h 2003-11-15 03:46:13.000000000 +0800 ++++ wvdial/wvdialer.h 2006-01-16 20:12:54.000000000 +0800 +@@ -103,6 +103,11 @@ + WvString phnum2; + WvString phnum3; + WvString phnum4; ++ WvString phnum5; ++ WvString phnum6; ++ WvString phnum7; ++ WvString phnum8; ++ WvString phnum9; + WvString dial_prefix; + WvString areacode; + WvString dial_cmd; diff --git a/SOURCES/wvdial-1.60-compuserve.patch b/SOURCES/wvdial-1.60-compuserve.patch new file mode 100644 index 0000000..feb2d71 --- /dev/null +++ b/SOURCES/wvdial-1.60-compuserve.patch @@ -0,0 +1,16 @@ +#change Compuserve "Classic" login prompt to the "new" style (#146664) + +diff -urNp wvdial-1.60.orig/wvdialbrain.cc wvdial-1.60/wvdialbrain.cc +--- wvdial-1.60.orig/wvdialbrain.cc 2007-07-19 23:22:26.000000000 +0200 ++++ wvdial-1.60/wvdialbrain.cc 2008-04-02 10:37:51.000000000 +0200 +@@ -124,7 +124,9 @@ const char * WvDialBrain::check_prompt( + WvString login = dialer->options.login; + if (dialer->options.compuserve && + strstr (dialer->options.login, "/noint") == 0) { +- login = WvString("%s%s", login, "/noint/go:pppconnect"); ++ //login = WvString("%s%s", login, "/noint/go:pppconnect"); ++ //use "new" Compuserve "Classic" format ++ login = WvString("%s%s", login, "/noint/ppp:cisppp"); + } + dialer->log( "Looks like a login prompt.\n" + "Sending: %s\n", login ); diff --git a/SOURCES/wvdial-1.60-remotename.patch b/SOURCES/wvdial-1.60-remotename.patch new file mode 100644 index 0000000..5e2ac1c --- /dev/null +++ b/SOURCES/wvdial-1.60-remotename.patch @@ -0,0 +1,97 @@ +#allow specifying the remotename at startup-time +#In Fedora since Aug 2002, Fedora specific + +diff -up wvdial-1.60/wvdialer.h.remotename wvdial-1.60/wvdialer.h +--- wvdial-1.60/wvdialer.h.remotename 2007-07-19 17:22:26.000000000 -0400 ++++ wvdial-1.60/wvdialer.h 2007-10-29 12:53:46.000000000 -0400 +@@ -43,7 +43,8 @@ class WvDialer : public WvStreamClone + /***********************************/ + { + public: +- WvDialer( WvConf &_cfg, WvStringList *_sect_list, bool _chat_mode = false ); ++ WvDialer( WvConf &_cfg, WvStringList *_sect_list, bool _chat_mode = false, ++ WvString _remote_name = NULL ); + virtual ~WvDialer(); + + bool dial(); +diff -up wvdial-1.60/wvdial.cc.remotename wvdial-1.60/wvdial.cc +--- wvdial-1.60/wvdial.cc.remotename 2007-07-19 17:22:26.000000000 -0400 ++++ wvdial-1.60/wvdial.cc 2007-10-29 12:56:54.000000000 -0400 +@@ -93,6 +92,7 @@ int main(int argc, char **argv) + WvStringList cmdlineopts; + WvLog log( "WvDial", WvLog::Debug ); + WvString homedir = getenv("HOME"); ++ WvString remote_name = NULL; + + bool chat_mode = false; + bool write_syslog = true; +@@ -122,6 +122,9 @@ int main(int argc, char **argv) + args.add_option('C', "config", + "use configfile instead of /etc/wvdial.conf", + "configfile", WvArgs::ArgCallback(&config_cb), &cfg); ++ args.add_option('\0', "remotename", ++ "Override Remote Name setting from config file", ++ "remote name", remote_name); + args.add_set_bool_option('c', "chat", + "used when running wvdial from pppd", chat_mode); + args.add_reset_bool_option('n', "no-syslog", +@@ -209,7 +212,7 @@ int main(int argc, char **argv) + } + } + +- WvDialer dialer(cfg, §ions, chat_mode); ++ WvDialer dialer(cfg, §ions, chat_mode, remote_name); + + if (!chat_mode) + if (dialer.isok() && dialer.options.ask_password) +diff -up wvdial-1.60/wvdial.1.remotename wvdial-1.60/wvdial.1 +--- wvdial-1.60/wvdial.1.remotename 2007-07-19 17:22:26.000000000 -0400 ++++ wvdial-1.60/wvdial.1 2007-10-29 12:01:59.000000000 -0400 +@@ -68,6 +68,12 @@ This is mainly useful only if you want t + configurations, or you want to avoid having dial-up information (usernames, + passwords, calling card numbers, etc.) in a system wide configuration file. + .TP ++.B \-\-remotename ++Override the Remote Name setting in the dialer configuration section of the ++configuration file. This is mainly useful when you dial to multiple systems ++with the same user name and password, and you don't want to use inheritance ++to override this setting (which is the recommended way to do it). ++.TP + .B \-n, \-\-no\-syslog + Don't output debug information to the syslog daemon (only useful together + with \-\-chat). +diff -up wvdial-1.60/wvdialer.cc.remotename wvdial-1.60/wvdialer.cc +--- wvdial-1.60/wvdialer.cc.remotename 2007-07-19 17:22:26.000000000 -0400 ++++ wvdial-1.60/wvdialer.cc 2007-10-29 12:54:09.000000000 -0400 +@@ -55,7 +55,8 @@ static int messagetail_pid = 0; + // WvDialer Public Functions + //************************************************** + +-WvDialer::WvDialer( WvConf &_cfg, WvStringList *_sect_list, bool _chat_mode ) ++WvDialer::WvDialer( WvConf &_cfg, WvStringList *_sect_list, bool _chat_mode, ++ WvString _remote_name ) + /***************************************************************************/ + : WvStreamClone( 0 ), + cfg(_cfg), log( "WvDial", WvLog::Debug ), +@@ -125,6 +126,12 @@ WvDialer::WvDialer( WvConf &_cfg, WvStri + return; + } + ++ // Override configuration settings with any we got from the command-line. ++ if( _remote_name != NULL ) { ++ options.remote = _remote_name; ++ options.remote.unique(); ++ } ++ + if (options.provider.len()) + { + log( WvLog::Notice, "Dialing %s %s.\n", +@@ -1220,6 +1227,8 @@ void WvDialer::start_ppp() + options.new_pppd && options.idle_seconds >= 0 ? (const char *)idle_seconds : NULL, + "logfd", buffer1, + // !!buffer2 ? "passwordfd" : NULL, !!buffer2 ? (const char *)buffer2 : NULL, ++ options.remote.len() ? "remotename" : NULL, ++ options.remote.len() ? (const char *) options.remote : NULL, + NULL + }; + diff --git a/SOURCES/wvdial-manpages.patch b/SOURCES/wvdial-manpages.patch new file mode 100644 index 0000000..5794cdc --- /dev/null +++ b/SOURCES/wvdial-manpages.patch @@ -0,0 +1,13 @@ +#fixed wvdial.conf (5) manpage (#440161) +diff -urNp wvdial-1.60.orig/wvdial.conf.5 wvdial-1.60/wvdial.conf.5 +--- wvdial-1.60.orig/wvdial.conf.5 2008-04-02 10:31:46.000000000 +0200 ++++ wvdial-1.60/wvdial.conf.5 2008-04-02 10:38:48.000000000 +0200 +@@ -112,7 +112,7 @@ this to "*70,". + .B wvdial + will use this string to tell the modem to dial. The default is "ATDT". + .TP +-.I Login ++.I Username + You must set this to the username you use at your ISP. + .TP + .I Login Prompt diff --git a/SPECS/wvdial.spec b/SPECS/wvdial.spec new file mode 100644 index 0000000..6803c9a --- /dev/null +++ b/SPECS/wvdial.spec @@ -0,0 +1,303 @@ +Summary: A heuristic autodialer for PPP connections +Name: wvdial +Version: 1.61 +Release: 9%{?dist} +License: LGPLv2+ +URL: http://alumnit.ca/wiki/?WvDial +Group: System Environment/Daemons +#Old location for <1.61 was http://alumnit.ca/download/wvdial-%{version}.tar.gz +Source0: http://wvstreams.googlecode.com/files/wvdial-%{version}.tar.gz + +#allow specifying the remotename at startup-time +Patch1: wvdial-1.60-remotename.patch +#added support for up to 9 alternative numbers instead of 4(#178025) +Patch2: wvdial-1.54-9nums.patch +#change Compuserve "Classic" login prompt to the "new" style (#146664) +Patch3: wvdial-1.60-compuserve.patch +#fixed wvdial.conf (5) manpage (#440161) +Patch4: wvdial-manpages.patch + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: libwvstreams-devel lockdev-devel openssl-devel +BuildRequires: pkgconfig +Requires: ppp + +%description +WvDial automatically locates and configures modems and can log into +almost any ISP's server without special configuration. You need to +input the username, password, and phone number, and then WvDial will +negotiate the PPP connection using any mechanism needed. + +%prep +%setup -q +%patch1 -p1 -b .remotename +%patch2 -p1 -b .9nums +%patch3 -p1 -b .compuserve +%patch4 -p1 -b .manpages + +%build +%configure +make \ + CPPOPTS="$RPM_OPT_FLAGS -DUSE_LOCKDEV=1" \ + LOCKDEV=-llockdev \ + XX_LIBS="-lcrypt -llockdev" \ + PREFIX=%{_prefix} \ + BINDIR=%{_bindir} \ + MANDIR=%{_mandir} \ + PPPDIR=%{_sysconfdir}/ppp/peers $@ + +%install +rm -rf $RPM_BUILD_ROOT +make install \ + PREFIX=${RPM_BUILD_ROOT}%{_prefix} \ + BINDIR=${RPM_BUILD_ROOT}%{_bindir} \ + MANDIR=${RPM_BUILD_ROOT}%{_mandir} \ + PPPDIR=${RPM_BUILD_ROOT}%{_sysconfdir}/ppp/peers +rm $RPM_BUILD_ROOT/%{_sysconfdir}/ppp/peers/wvdial-pipe +touch $RPM_BUILD_ROOT/%{_sysconfdir}/wvdial.conf + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root,-) +%doc CHANGES* COPYING* README* TODO FAQ +%{_bindir}/wvdialconf +%{_bindir}/wvdial +%{_mandir}/man1/wvdialconf.* +%{_mandir}/man1/wvdial.* +%{_mandir}/man5/wvdial.conf* +%attr(0600,root,daemon) %config(noreplace) %{_sysconfdir}/ppp/peers/wvdial +%verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/wvdial.conf + +%changelog +* Fri Jan 24 2014 Daniel Mach - 1.61-9 +- Mass rebuild 2014-01-24 + +* Fri Dec 27 2013 Daniel Mach - 1.61-8 +- Mass rebuild 2013-12-27 + +* Fri Feb 15 2013 Fedora Release Engineering - 1.61-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Sun Jul 22 2012 Fedora Release Engineering - 1.61-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Sat Jan 14 2012 Fedora Release Engineering - 1.61-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Mon Feb 07 2011 Fedora Release Engineering - 1.61-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Mon Nov 30 2009 Ondrej Vasik - 1.61-3 +- fix source0 link (#226546) + +* Fri Nov 27 2009 Ondrej Vasik - 1.61-2 +- Merge review cleanup (#226546), comment patches, license + to LGPLv2+, specify names in files section... + +* 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 + +* Thu Jun 11 2009 Ondrej Vasik - 1.60-9 +- make wvdial compilable in rawhide (scandir api change), + reduce compiler warnings + +* Wed Feb 25 2009 Ondrej Vasik - 1.60-8 +- mark /etc/ppp/peers/wvdial as noreplace + +* Tue Nov 25 2008 Ondrej Vasik - 1.60-7 +- new libwvstreams rebuild, removed -fno-rtti CPP_FLAG to + compile correctly with new libwvstreams + +* Fri Aug 29 2008 Ondrej Vasik - 1.60-6 +- patch fuzz clean up + +* Wed Apr 02 2008 Ondrej Vasik - 1.60-5 +- fixed wvdial.conf (5) manpage (#440161) +- change Compuserve "Classic" login prompt to the "new" + style (#146664) + +* Tue Feb 12 2008 Ondrej Vasik - 1.60-4 +- added support for up to 9 alternative numbers instead of 4 + (#178025, patch by V.Mencl) +- gcc43 rebuild + +* Mon Oct 29 2007 Bill Nottingham - 1.60-3 +- fix remotename patch (#348831, #344391) + +* Wed Oct 10 2007 Ondrej Vasik - 1.60-2 +- added option for dial timeout(#200375) + +* Fri Aug 17 2007 Harald Hoyer - 1.60-1 +- version 1.60 +- changed license tag to LGPLv2 + +* Thu Jun 28 2007 Harald Hoyer - 1.56-1 +- version 1.56 + +* Wed Apr 18 2007 Harald Hoyer - 1.54.0-6 +- specfile review + +* Wed Jul 12 2006 Jesse Keating - 1.54.0-5.2.2.1 +- rebuild + +* Fri Feb 10 2006 Jesse Keating - 1.54.0-5.2.2 +- bump again for double-long bug on ppc(64) + +* Tue Feb 07 2006 Jesse Keating - 1.54.0-5.2.1 +- rebuilt for new gcc4.1 snapshot and glibc changes + +* Mon Dec 19 2005 Harald Hoyer +- rebuilt + +* Fri Dec 09 2005 Jesse Keating +- rebuilt + +* Thu Mar 03 2005 Harald Hoyer +- rebuilt + +* Wed Feb 09 2005 Harald Hoyer +- rebuilt + +* Tue Sep 21 2004 Harald Hoyer 1.54.0-3 +- added openssl-devel build req (bug 132887) + +* Mon Aug 31 2004 Harald Hoyer 1.54.0-2 +- added empty wvdial.conf file (bug 130622) + +* Mon Jun 21 2004 Harald Hoyer 1.54.0-1 +- version 1.54.0 + +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Tue Jun 01 2004 Karsten Hopp 1.53-14 +- remove -O0 + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Mon Sep 8 2003 Nalin Dahyabhai 1.53-12 +- rebuild + +* Mon Sep 8 2003 Nalin Dahyabhai 1.53-11 +- rebuild + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Thu Nov 14 2002 Nalin Dahyabhai 1.53-8 +- remove unpackaged files after %%install + +* Mon Aug 12 2002 Nalin Dahyabhai 1.53-7 +- add missing URL +- document --remotename in the man page + +* Sat Aug 10 2002 Elliot Lee 1.53-6 +- rebuilt with gcc-3.2 (we hope) + +* Fri Aug 9 2002 Nalin Dahyabhai 1.53-5 +- re-allow specifying the remotename at startup-time +- add man page for the configuration file + +* Tue Jul 23 2002 Tim Powers 1.53-4 +- build using gcc-3.2-0.1 + +* Fri Jun 21 2002 Tim Powers 1.53-3 +- automated rebuild + +* Sun May 26 2002 Tim Powers 1.53-2 +- automated rebuild + +* Wed Apr 10 2002 Nalin Dahyabhai 1.53-1 +- update to 1.53 + +* Thu Apr 4 2002 Nalin Dahyabhai 1.52-1 +- update to 1.52 + +* Wed Mar 27 2002 Nalin Dahyabhai 1.51-1 +- update to 1.51 + +* Fri Feb 22 2002 Nalin Dahyabhai 1.50-1 +- update to 1.50 +- use lockdev for locking + +* Thu Jan 24 2002 Than Ngo 1.41-18 +- fix to build against g++ 3 + +* Wed Sep 12 2001 Tim Powers +- rebuild with new gcc and binutils + +* Mon Jul 23 2001 Nalin Dahyabhai +- bump the release and rebuild + +* Wed Jul 11 2001 Nalin Dahyabhai +- bump the release and rebuild + +* Tue Jul 3 2001 Nalin Dahyabhai +- change Copyright: tag to License: + +* Mon Apr 2 2001 Nalin Dahyabhai +- include the actual TODO file in docs, not a dangling symlink to it (#34385) + +* Mon Feb 12 2001 Nalin Dahyabhai +- Merge in latest -libs patch from rp3. + +* Mon Aug 21 2000 Nalin Dahyabhai +- Merge in latest -libs patch from rp3. + +* Thu Jul 13 2000 Prospector +- automatic rebuild + +* Tue Jul 2 2000 Jakub Jelinek +- Rebuild with new C++ + +* Sat Jun 17 2000 Bill Nottingham +- add %%defattr + +* Fri Jun 16 2000 Nalin Dahyabhai +- Merge in latest -libs patch from rp3. + +* Sun Jun 4 2000 Nalin Dahyabhai +- FHS fixes. + +* Fri May 5 2000 Bill Nottingham +- fix build with more strict c++ compiler + +* Tue Mar 7 2000 Jeff Johnson +- rebuild for sparc baud rates > 38400. + +* Fri Jan 28 2000 Nalin Dahyabhai +- sync up to copy in rp3's CVS repository for consistency, except for + changes to Makefiles + +* Thu Jan 13 2000 Nalin Dahyabhai +- update to 1.41, backing out patches that are now in mainline source + +* Sat Sep 18 1999 Michael K. Johnson +- improved the speed up dialing patch +- improved the inheritance patch + +* Fri Sep 17 1999 Michael K. Johnson +- added explicit inheritance to wvdial.conf +- speed up dialing + +* Mon Sep 13 1999 Michael K. Johnson +- improved the chat mode fix to allow specifying the remotename + so that multiple wvdial instances can't step on each other. + +* Fri Sep 10 1999 Michael K. Johnson +- chat mode fix to make CHAP/PAP work with chat mode + +* Mon Aug 02 1999 Michael K. Johnson +- Packaged 1.40 + +* Wed Jul 28 1999 Michael K. Johnson +- Initial Red Hat package