wok-next rev 20625
Up tazpkg, alpine, wvdial
| author | Aleksej Bobylev <al.bobylev@gmail.com> |
|---|---|
| date | Thu Apr 26 12:47:45 2018 +0300 (2018-04-26) |
| parents | bbddbb716008 |
| children | 853306c2f4e8 |
| files | alpine/receipt tazpkg/receipt tazpkg/stuff/patches/series tazpkg/stuff/patches/tazpkg.conf.patch wvdial/receipt wvdial/stuff/patches/ftbfs_with_gcc_4.5.patch wvdial/stuff/patches/series wvdial/stuff/patches/typo_pon.wvdial.1.patch wvdial/stuff/wvdial-1.41-gcc4.2.diff |
line diff
1.1 --- a/alpine/receipt Thu Apr 26 03:40:57 2018 +0300 1.2 +++ b/alpine/receipt Thu Apr 26 12:47:45 2018 +0300 1.3 @@ -1,36 +1,32 @@ 1.4 # SliTaz package receipt v2. 1.5 1.6 PACKAGE="alpine" 1.7 -VERSION="2.00" 1.8 +VERSION="2.21.999" 1.9 +HASH="349642a84039a4b026513c32a3b4f8594acd50df" 1.10 CATEGORY="network" 1.11 SHORT_DESC="Fast, easy to use email client" 1.12 MAINTAINER="paul@slitaz.org" 1.13 LICENSE="Apache" 1.14 WEB_SITE="http://www.washington.edu/alpine/" 1.15 1.16 -TARBALL="$PACKAGE.tar.gz" 1.17 -WGET_URL="ftp://ftp.cac.washington.edu/alpine/$TARBALL" 1.18 +TARBALL="$PACKAGE-$HASH.tar.gz" 1.19 +WGET_URL="http://repo.or.cz/alpine.git/snapshot/$HASH.tar.gz" 1.20 1.21 -BUILD_DEPENDS="openssl10-dev pam-dev ncurses-dev gfortran gettext" 1.22 +BUILD_DEPENDS="openssl-dev pam-dev ncurses-dev gfortran gettext hunspell-dev" 1.23 1.24 compile_rules() { 1.25 - export LDFLAGS="$LDFLAGS -L/usr/lib/openssl-1.0 -lcrypto" 1.26 - 1.27 - CPPFLAGS="$CPPFLAGS -I/usr/include/openssl-1.0" \ 1.28 ./configure \ 1.29 --without-tcl \ 1.30 --without-ldap \ 1.31 --without-krb5 \ 1.32 - --with-ssl-include-dir=/usr/include/openssl-1.0/ \ 1.33 - --with-ssl-lib-dir=/usr/lib/openssl-1.0/ \ 1.34 $CONFIGURE_ARGS && 1.35 fix libtool && 1.36 make && 1.37 - make DESTDIR=$DESTDIR install 1.38 + make install 1.39 } 1.40 1.41 genpkg_rules() { 1.42 copy @std 1.43 - DEPENDS="ncurses openssl10 pam" 1.44 + DEPENDS="ncurses openssl pam" 1.45 TAGS="mail client" 1.46 }
2.1 --- a/tazpkg/receipt Thu Apr 26 03:40:57 2018 +0300 2.2 +++ b/tazpkg/receipt Thu Apr 26 12:47:45 2018 +0300 2.3 @@ -1,7 +1,7 @@ 2.4 # SliTaz package receipt v2. 2.5 2.6 PACKAGE="tazpkg" 2.7 -VERSION="963" 2.8 +VERSION="964" 2.9 CATEGORY="base-system" 2.10 SHORT_DESC="SliTaz packages manager" 2.11 MAINTAINER="pankso@slitaz.org"
3.1 --- a/tazpkg/stuff/patches/series Thu Apr 26 03:40:57 2018 +0300 3.2 +++ b/tazpkg/stuff/patches/series Thu Apr 26 12:47:45 2018 +0300 3.3 @@ -1,4 +1,3 @@ 3.4 -Rp1|r954.diff # revert changeset # 954 3.5 release.patch 3.6 tazpanel.desktop.patch 3.7 -tazpkg.conf.patch
4.1 --- a/tazpkg/stuff/patches/tazpkg.conf.patch Thu Apr 26 03:40:57 2018 +0300 4.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 4.3 @@ -1,9 +0,0 @@ 4.4 ---- a/tazpkg.conf 4.5 -+++ b/tazpkg.conf 4.6 -@@ -10,4 +10,5 @@ 4.7 - # Packages cache directory. 4.8 - CACHE_DIR="/var/cache/tazpkg" 4.9 - 4.10 -- 4.11 -+# The geometry of the desktop notification 4.12 -+NOTIFY_GEOM="360x80-0+24"
5.1 --- a/wvdial/receipt Thu Apr 26 03:40:57 2018 +0300 5.2 +++ b/wvdial/receipt Thu Apr 26 12:47:45 2018 +0300 5.3 @@ -1,37 +1,33 @@ 5.4 -# SliTaz package receipt. 5.5 +# SliTaz package receipt v2. 5.6 5.7 PACKAGE="wvdial" 5.8 VERSION="1.61" 5.9 CATEGORY="network" 5.10 -SHORT_DESC="makes modem-based connection to Internet" 5.11 +SHORT_DESC="Makes modem-based connection to Internet" 5.12 MAINTAINER="jozee@slitaz.org" 5.13 LICENSE="GPL2" 5.14 +WEB_SITE="https://code.google.com/archive/p/wvstreams/" 5.15 + 5.16 TARBALL="$PACKAGE-$VERSION.tar.gz" 5.17 -WEB_SITE="http://wvstreams.googlecode.com/" 5.18 -WGET_URL="http://wvstreams.googlecode.com/files/$TARBALL" 5.19 -TAGS="network 3G" 5.20 +WGET_URL="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/wvstreams/$TARBALL" 5.21 5.22 -DEPENDS="ppp gcc-lib-base wvstreams" 5.23 BUILD_DEPENDS="wvstreams-dev" 5.24 5.25 -# Rules to configure and make the package. 5.26 -compile_rules() 5.27 -{ 5.28 - cd $src 5.29 - ./configure && 5.30 - make -j1 && 5.31 - make -j1 prefix=$DESTDIR/usr PPPDIR=$DESTDIR/etc/ppp/peers install 5.32 +compile_rules() { 5.33 + ./configure && 5.34 + make -j1 && 5.35 + make -j1 \ 5.36 + prefix=$DESTDIR/usr \ 5.37 + PPPDIR=$DESTDIR/etc/ppp/peers \ 5.38 + install 5.39 } 5.40 5.41 -# Rules to gen a SliTaz package suitable for Tazpkg. 5.42 -genpkg_rules() 5.43 -{ 5.44 - mkdir -p $fs/usr/bin 5.45 - cp -a $install/usr/bin/wvdial* $fs/usr/bin 5.46 - cp -a $install/etc $fs 5.47 +genpkg_rules() { 5.48 + copy @std 5.49 + DEPENDS="wvstreams ppp" 5.50 + TAGS="network 3G" 5.51 } 5.52 5.53 -post_remove() 5.54 -{ 5.55 +post_remove() { 5.56 rm -rf /etc/ppp/peers/wvdial 5.57 }
6.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 6.2 +++ b/wvdial/stuff/patches/ftbfs_with_gcc_4.5.patch Thu Apr 26 12:47:45 2018 +0300 6.3 @@ -0,0 +1,13 @@ 6.4 +Index: wvdial-1.61/Makefile.in 6.5 +=================================================================== 6.6 +--- wvdial-1.61.orig/Makefile.in 2011-01-10 21:49:50.000000000 +0300 6.7 ++++ wvdial-1.61/Makefile.in 2011-01-10 21:50:51.000000000 +0300 6.8 +@@ -34,7 +34,7 @@ 6.9 + wvdialmon.o 6.10 + 6.11 + wvdial wvdialconf papchaptest pppmon: \ 6.12 +- LDFLAGS+=-luniconf -lwvstreams -lwvutils -lwvbase 6.13 ++ LIBS+=-luniconf -lwvstreams -lwvutils -lwvbase 6.14 + 6.15 + wvdial wvdialconf papchaptest pppmon: wvdial.a 6.16 +
7.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 7.2 +++ b/wvdial/stuff/patches/series Thu Apr 26 12:47:45 2018 +0300 7.3 @@ -0,0 +1,3 @@ 7.4 +# Debian patches fetched from http://wvdial.sourcearchive.com/downloads/1.61-4.1/wvdial_1.61-4.1.debian.tar.gz 7.5 +typo_pon.wvdial.1.patch 7.6 +ftbfs_with_gcc_4.5.patch
8.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 8.2 +++ b/wvdial/stuff/patches/typo_pon.wvdial.1.patch Thu Apr 26 12:47:45 2018 +0300 8.3 @@ -0,0 +1,20 @@ 8.4 +Remove warnings found by lintian 8.5 +Last-Update: 2011-01-09 8.6 +Index: wvdial-1.61/pon.wvdial.1 8.7 +=================================================================== 8.8 +--- wvdial-1.61.orig/pon.wvdial.1 2011-01-09 21:33:03.000000000 +0300 8.9 ++++ wvdial-1.61/pon.wvdial.1 2011-01-09 21:33:15.000000000 +0300 8.10 +@@ -8,13 +8,11 @@ 8.11 + .SH DESCRIPTION 8.12 + .B pon.wvdial 8.13 + .br 8.14 +-.TR 8.15 + .B poff.wvdial 8.16 + .br 8.17 + .RS 8.18 + Replacement scripts for pon and poff. 8.19 + .RE 8.20 +-\." 8.21 + .SH SEE ALSO 8.22 + .BR wvdial (1), 8.23 + .BR pon (1),
9.1 --- a/wvdial/stuff/wvdial-1.41-gcc4.2.diff Thu Apr 26 03:40:57 2018 +0300 9.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 9.3 @@ -1,351 +0,0 @@ 9.4 ---- wvdial-1.41/Makefile Sat Oct 3 05:40:30 1998 9.5 -+++ wvdial-1.41+dom/Makefile Thu Mar 19 20:56:27 2009 9.6 -@@ -1,10 +1,11 @@ 9.7 - TOPDIR=$(shell if [ "$$PWD" != "" ]; then echo $$PWD; else pwd; fi) 9.8 - 9.9 - DEBUG=0 9.10 --PREFIX=/usr/local 9.11 --BINDIR=${PREFIX}/bin 9.12 --MANDIR=${PREFIX}/man 9.13 --PPPDIR=/etc/ppp/peers 9.14 -+ 9.15 -+PREFIX=/usr 9.16 -+BINDIR=${DESTDIR}/${PREFIX}/bin 9.17 -+MANDIR=${DESTDIR]/${PREFIX}/man 9.18 -+PPPDIR=${DESTDIR}/etc/ppp/peers 9.19 - 9.20 - export TOPDIR DEBUG CC CXX 9.21 - include rules.mk 9.22 ---- wvdial-1.41/configfile/wvconf.cc Sun Nov 28 20:39:33 1999 9.23 -+++ wvdial-1.41+dom/configfile/wvconf.cc Thu Mar 19 20:56:27 2009 9.24 -@@ -130,7 +130,7 @@ 9.25 - // it must be an element for the current section *sect. 9.26 - p = parse_value(from_file); 9.27 - if (!p) 9.28 -- p = ""; // allow empty entries 9.29 -+ p = (char*)""; // allow empty entries 9.30 - 9.31 - from_file = trim_string(from_file); 9.32 - if (from_file[0]) // nonblank option name 9.33 ---- wvdial-1.41/rules.mk Thu Mar 19 21:04:33 2009 9.34 -+++ wvdial-1.41+dom/rules.mk Thu Oct 21 00:37:00 1999 9.35 -@@ -47,7 +47,7 @@ 9.36 - CFLAGS += -g -O6 -DDEBUG=0 -DNDEBUG 9.37 - #CFLAGS += -fomit-frame-pointer # really evil 9.38 - #CXXFLAGS += -fno-implement-inlines # causes trouble with egcs 1.0 9.39 --CXXFLAGS += -fno-rtti -fno-exceptions 9.40 -+CXXFLAGS += -fno-rtti -fno-exceptions -fno-strict-aliasing 9.41 - LDFLAGS += -g 9.42 - endif 9.43 - 9.44 ---- wvdial-1.41/streams/wvlog.cc Sat Jul 10 21:36:45 1999 9.45 -+++ wvdial-1.41+dom/streams/wvlog.cc Thu Mar 19 20:56:27 2009 9.46 -@@ -14,16 +14,16 @@ 9.47 - WvLogRcvBase *WvLog::default_receiver = NULL; 9.48 - 9.49 - char *WvLogRcv::loglevels[WvLog::NUM_LOGLEVELS] = { 9.50 -- "Crit", 9.51 -- "Err", 9.52 -- "Warn", 9.53 -- "Notice", 9.54 -- "Info", 9.55 -- "*1", 9.56 -- "*2", 9.57 -- "*3", 9.58 -- "*4", 9.59 -- "*5", 9.60 -+ (char*)"Crit", 9.61 -+ (char*)"Err", 9.62 -+ (char*)"Warn", 9.63 -+ (char*)"Notice", 9.64 -+ (char*)"Info", 9.65 -+ (char*)"*1", 9.66 -+ (char*)"*2", 9.67 -+ (char*)"*3", 9.68 -+ (char*)"*4", 9.69 -+ (char*)"*5", 9.70 - }; 9.71 - 9.72 - 9.73 ---- wvdial-1.41/streams/wvlog.h Wed Mar 24 04:41:37 1999 9.74 -+++ wvdial-1.41+dom/streams/wvlog.h Thu Mar 19 20:56:27 2009 9.75 -@@ -25,7 +25,7 @@ 9.76 - // or transmits log messages. 9.77 - class WvLogRcvBase 9.78 - { 9.79 -- friend WvLog; 9.80 -+ friend class WvLog; 9.81 - protected: 9.82 - const char *appname(const WvLog *log) const; 9.83 - virtual void log(const WvLog *source, int loglevel, 9.84 -@@ -43,7 +43,7 @@ 9.85 - // to all registered WvLogRcv's. 9.86 - class WvLog : public WvStream 9.87 - { 9.88 -- friend WvLogRcvBase; 9.89 -+ friend class WvLogRcvBase; 9.90 - public: 9.91 - enum LogLevel { 9.92 - Critical = 0, 9.93 ---- wvdial-1.41/streams/wvstream.cc Thu Oct 21 00:37:04 1999 9.94 -+++ wvdial-1.41+dom/streams/wvstream.cc Thu Mar 19 20:56:27 2009 9.95 -@@ -9,6 +9,7 @@ 9.96 - * for each stream. 9.97 - */ 9.98 - #include "wvstream.h" 9.99 -+#include <time.h> 9.100 - #include <sys/time.h> 9.101 - #include <sys/types.h> 9.102 - #include <errno.h> 9.103 ---- wvdial-1.41/streams/wvtimestream.h Wed Mar 24 04:41:37 1999 9.104 -+++ wvdial-1.41+dom/streams/wvtimestream.h Thu Mar 19 20:56:27 2009 9.105 -@@ -40,7 +40,7 @@ 9.106 - virtual bool test_set(SelectInfo &si); 9.107 - 9.108 - // notify timestream that we have "ticked" once 9.109 -- void WvTimeStream::tick(); 9.110 -+ virtual void tick(); 9.111 - virtual void execute(); 9.112 - }; 9.113 - 9.114 ---- wvdial-1.41/utils/base64.cc Wed Mar 24 04:41:38 1999 9.115 -+++ wvdial-1.41+dom/utils/base64.cc Thu Mar 19 20:56:27 2009 9.116 -@@ -16,7 +16,7 @@ 9.117 - #include "base64.h" 9.118 - #include <string.h> 9.119 - 9.120 --static char * alphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz" 9.121 -+const char * alphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz" 9.122 - "0123456789+/="; 9.123 - 9.124 - char * base64_encode( char * str ) 9.125 ---- wvdial-1.41/utils/base64.h Wed Mar 24 04:41:38 1999 9.126 -+++ wvdial-1.41+dom/utils/base64.h Thu Mar 19 20:56:27 2009 9.127 -@@ -12,4 +12,4 @@ 9.128 - extern char * base64_encode( char * str ); 9.129 - extern char * base64_decode( char * str ); 9.130 - 9.131 --#endif __BASE64_H 9.132 -+#endif // __BASE64_H 9.133 ---- wvdial-1.41/utils/wvbuffer.h Sun Jun 20 21:45:55 1999 9.134 -+++ wvdial-1.41+dom/utils/wvbuffer.h Thu Mar 19 20:56:27 2009 9.135 -@@ -10,6 +10,7 @@ 9.136 - #define __WVBUFFER_H 9.137 - 9.138 - #include "wvlinklist.h" 9.139 -+#include <string.h> 9.140 - 9.141 - class WvMiniBuffer 9.142 - { 9.143 ---- wvdial-1.41/utils/wvhashtable.h Thu Oct 14 23:33:38 1999 9.144 -+++ wvdial-1.41+dom/utils/wvhashtable.h Thu Mar 19 20:56:27 2009 9.145 -@@ -139,7 +139,7 @@ 9.146 - _type_##List *sl() \ 9.147 - { return (_type_##List *)slots; } \ 9.148 - \ 9.149 -- ~##_classname_() \ 9.150 -+ ~_classname_() \ 9.151 - { shutdown(); delete[] sl(); } \ 9.152 - \ 9.153 - void add(_type_ *data, bool auto_free) \ 9.154 ---- wvdial-1.41/utils/wvlinklist.h Thu Oct 14 23:33:38 1999 9.155 -+++ wvdial-1.41+dom/utils/wvlinklist.h Thu Mar 19 20:56:27 2009 9.156 -@@ -126,7 +126,7 @@ 9.157 - _newname_() \ 9.158 - { setup(); } \ 9.159 - \ 9.160 -- ~##_newname_() \ 9.161 -+ ~_newname_() \ 9.162 - { shutdown(); _zap(); } \ 9.163 - \ 9.164 - void zap() \ 9.165 ---- wvdial-1.41/wvdial/wvdialer.cc Fri Nov 19 06:14:46 1999 9.166 -+++ wvdial-1.41+dom/wvdial/wvdialer.cc Thu Mar 19 20:56:27 2009 9.167 -@@ -21,26 +21,26 @@ 9.168 - 9.169 - 9.170 - static char * init_responses[] = { 9.171 -- "ok", 9.172 -- "error", 9.173 -+ (char*)"ok", 9.174 -+ (char*)"error", 9.175 - NULL 9.176 - }; 9.177 - 9.178 - static char * dial_responses[] = { 9.179 -- "connect", 9.180 -- "no carrier", 9.181 -- "no dialtone", 9.182 -- "no dial tone", 9.183 -- "busy", 9.184 -- "error", 9.185 -- "voice", 9.186 -- "fclass", 9.187 -+ (char*)"connect", 9.188 -+ (char*)"no carrier", 9.189 -+ (char*)"no dialtone", 9.190 -+ (char*)"no dial tone", 9.191 -+ (char*)"busy", 9.192 -+ (char*)"error", 9.193 -+ (char*)"voice", 9.194 -+ (char*)"fclass", 9.195 - NULL 9.196 - }; 9.197 - 9.198 - static char * prompt_strings[] = { 9.199 -- "}!}", 9.200 -- "!}!", 9.201 -+ (char*)"}!}", 9.202 -+ (char*)"!}!", 9.203 - NULL 9.204 - }; 9.205 - 9.206 -@@ -51,7 +51,7 @@ 9.207 - // WvDialer Public Functions 9.208 - //************************************************** 9.209 - 9.210 --WvDialer::WvDialer( WvConf &_cfg, WvStringList *_sect_list, bool _chat_mode = false ) 9.211 -+WvDialer::WvDialer( WvConf &_cfg, WvStringList *_sect_list, bool _chat_mode ) 9.212 - /********************************************************/ 9.213 - : WvStreamClone( (WvStream **)&modem ), 9.214 - cfg(_cfg), log( "WvDial", WvLog::Debug ), 9.215 -@@ -360,40 +360,40 @@ 9.216 - { 9.217 - OptInfo opts[] = { 9.218 - // string options: 9.219 -- { "Modem", &options.modem, NULL, "/dev/modem", 0 }, 9.220 -- { "Init1", &options.init1, NULL, "ATZ", 0 }, 9.221 -- { "Init2", &options.init2, NULL, "", 0 }, 9.222 -- { "Init3", &options.init3, NULL, "", 0 }, 9.223 -- { "Init4", &options.init4, NULL, "", 0 }, 9.224 -- { "Init5", &options.init5, NULL, "", 0 }, 9.225 -- { "Init6", &options.init6, NULL, "", 0 }, 9.226 -- { "Init7", &options.init7, NULL, "", 0 }, 9.227 -- { "Init8", &options.init8, NULL, "", 0 }, 9.228 -- { "Init9", &options.init9, NULL, "", 0 }, 9.229 -- { "Phone", &options.phnum, NULL, "", 0 }, 9.230 -- { "Dial Prefix", &options.dial_prefix, NULL, "", 0 }, 9.231 -- { "Area Code", &options.areacode, NULL, "", 0 }, 9.232 -- { "Dial Command", &options.dial_cmd, NULL, "ATDT", 0 }, 9.233 -- { "Username", &options.login, NULL, "", 0 }, 9.234 -- { "Login Prompt", &options.login_prompt, NULL, "", 0 }, 9.235 -- { "Password", &options.password, NULL, "", 0 }, 9.236 -- { "Password Prompt", &options.pass_prompt, NULL, "", 0 }, 9.237 -- { "PPPD Path", &options.where_pppd, NULL, "/usr/sbin/pppd", 0 }, 9.238 -- { "Force Address", &options.force_addr, NULL, "", 0 }, 9.239 -- { "Remote Name", &options.remote, NULL, "*", 0 }, 9.240 -- { "Default Reply", &options.default_reply,NULL, "ppp", 0 }, 9.241 -- { "ISDN", &options.isdn, NULL, "", 0 }, 9.242 -+ { (char*)"Modem", &options.modem, NULL, (char*)"/dev/modem", 0 }, 9.243 -+ { (char*)"Init1", &options.init1, NULL, (char*)"ATZ", 0 }, 9.244 -+ { (char*)"Init2", &options.init2, NULL, (char*)"", 0 }, 9.245 -+ { (char*)"Init3", &options.init3, NULL, (char*)"", 0 }, 9.246 -+ { (char*)"Init4", &options.init4, NULL, (char*)"", 0 }, 9.247 -+ { (char*)"Init5", &options.init5, NULL, (char*)"", 0 }, 9.248 -+ { (char*)"Init6", &options.init6, NULL, (char*)"", 0 }, 9.249 -+ { (char*)"Init7", &options.init7, NULL, (char*)"", 0 }, 9.250 -+ { (char*)"Init8", &options.init8, NULL, (char*)"", 0 }, 9.251 -+ { (char*)"Init9", &options.init9, NULL, (char*)"", 0 }, 9.252 -+ { (char*)"Phone", &options.phnum, NULL, (char*)"", 0 }, 9.253 -+ { (char*)"Dial Prefix", &options.dial_prefix, NULL, (char*)"", 0 }, 9.254 -+ { (char*)"Area Code", &options.areacode, NULL, (char*)"", 0 }, 9.255 -+ { (char*)"Dial Command", &options.dial_cmd, NULL, (char*)"ATDT", 0 }, 9.256 -+ { (char*)"Username", &options.login, NULL, (char*)"", 0 }, 9.257 -+ { (char*)"Login Prompt", &options.login_prompt, NULL, (char*)"", 0 }, 9.258 -+ { (char*)"Password", &options.password, NULL, (char*)"", 0 }, 9.259 -+ { (char*)"Password Prompt", &options.pass_prompt, NULL, (char*)"", 0 }, 9.260 -+ { (char*)"PPPD Path", &options.where_pppd, NULL, (char*)"/usr/sbin/pppd", 0 }, 9.261 -+ { (char*)"Force Address", &options.force_addr, NULL, (char*)"", 0 }, 9.262 -+ { (char*)"Remote Name", &options.remote, NULL, (char*)"*", 0 }, 9.263 -+ { (char*)"Default Reply", &options.default_reply,NULL, (char*)"ppp", 0 }, 9.264 -+ { (char*)"ISDN", &options.isdn, NULL, (char*)"", 0 }, 9.265 - 9.266 - // int/bool options 9.267 -- { "Baud", NULL, &options.baud, "", DEFAULT_BAUD }, 9.268 -- { "Carrier Check", NULL, &options.carrier_check, "", true }, 9.269 -- { "Stupid Mode", NULL, &options.stupid_mode, "", false }, 9.270 -- { "New PPPD", NULL, &options.new_pppd, "", true }, 9.271 -- { "Auto Reconnect", NULL, &options.auto_reconnect,"", true }, 9.272 -- { NULL, NULL, NULL, "", 0 } 9.273 -+ { (char*)"Baud", NULL, &options.baud, (char*)"", DEFAULT_BAUD }, 9.274 -+ { (char*)"Carrier Check", NULL, &options.carrier_check, (char*)"", true }, 9.275 -+ { (char*)"Stupid Mode", NULL, &options.stupid_mode, (char*)"", false }, 9.276 -+ { (char*)"New PPPD", NULL, &options.new_pppd, (char*)"", true }, 9.277 -+ { (char*)"Auto Reconnect", NULL, &options.auto_reconnect,(char*)"", true }, 9.278 -+ { NULL, NULL, NULL, (char*)"", 0 } 9.279 - }; 9.280 - 9.281 -- char * d = "Dialer Defaults"; 9.282 -+ char * d = (char*)"Dialer Defaults"; 9.283 - 9.284 - for( int i=0; opts[i].name != NULL; i++ ) { 9.285 - if( opts[i].str_member == NULL ) { 9.286 ---- wvdial-1.41/wvdial/wvmodemscan.cc Mon Sep 13 22:07:35 1999 9.287 -+++ wvdial-1.41+dom/wvdial/wvmodemscan.cc Thu Mar 19 20:56:27 2009 9.288 -@@ -19,9 +19,9 @@ 9.289 - // startup at atz atq0 atv1 ate1 ats0 carrier dtr fastdial 9.290 - // baudstep reinit done 9.291 - static char *commands[WvModemScan::NUM_STAGES] = { 9.292 -- NULL, "Q0 V1 E1", "Z", "S0=0", 9.293 -- "&C1", "&D2", "S11=55", "+FCLASS=0", NULL, 9.294 -- NULL, "", NULL 9.295 -+ NULL, (char*)"Q0 V1 E1", (char*)"Z", (char*)"S0=0", 9.296 -+ (char*)"&C1", (char*)"&D2", (char*)"S11=55", (char*)"+FCLASS=0", NULL, 9.297 -+ NULL, (char*)"", NULL 9.298 - }; 9.299 - 9.300 - 9.301 ---- wvdial-1.41/wvdial/wvpapchap.cc Sun Jun 6 19:08:49 1999 9.302 -+++ wvdial-1.41+dom/wvdial/wvpapchap.cc Thu Mar 19 20:56:27 2009 9.303 -@@ -25,16 +25,16 @@ 9.304 - 9.305 - // PAP secrets: 9.306 - nuke_contents(); 9.307 -- load_file( PAP_SECRETS ); 9.308 -+ load_file( (char*)PAP_SECRETS ); 9.309 - do_secret( username, password, remote ); 9.310 -- if( write_file( PAP_SECRETS ) == false ) 9.311 -+ if( write_file( (char*)PAP_SECRETS ) == false ) 9.312 - pap_success = false; 9.313 - 9.314 - // CHAP secrets: 9.315 - nuke_contents(); 9.316 -- load_file( CHAP_SECRETS ); 9.317 -+ load_file( (char*)CHAP_SECRETS ); 9.318 - do_secret( username, password, remote ); 9.319 -- if( write_file( CHAP_SECRETS ) == false ) 9.320 -+ if( write_file( (char*)CHAP_SECRETS ) == false ) 9.321 - chap_success = false; 9.322 - } 9.323 - 9.324 ---- wvdial-1.41/wvdial/wvpapchap.h Wed Mar 24 04:41:42 1999 9.325 -+++ wvdial-1.41+dom/wvdial/wvpapchap.h Thu Mar 19 20:56:27 2009 9.326 -@@ -43,4 +43,4 @@ 9.327 - const char * remote ); 9.328 - }; 9.329 - 9.330 --#endif __WVPAPCHAP_H 9.331 -+#endif // __WVPAPCHAP_H 9.332 ---- wvdial-1.41/wvver.h Fri Jan 7 03:55:50 2000 9.333 -+++ wvdial-1.41+dom/wvver.h Thu Mar 19 20:56:27 2009 9.334 -@@ -28,4 +28,4 @@ 9.335 - #define TUNNELV_VER 0x00020000 9.336 - #define TUNNELV_VER_STRING "2.00" 9.337 - 9.338 --#endif __WVDEFS_H 9.339 -+#endif // __WVDEFS_H 9.340 - 9.341 ---- wvdial-1.41/wvdial/wvmodemscan.cc 9.342 -+++ wvdial-1.41/wvdial/wvmodemscan.cc 9.343 -@@ -331,10 +331,8 @@ 9.344 - } 9.345 - 9.346 - 9.347 --static int filesort(const void *_e1, const void *_e2) 9.348 -+static int filesort(const dirent **e1, const dirent **e2) 9.349 - { 9.350 -- dirent const * const *e1 = (dirent const * const *)_e1; 9.351 -- dirent const * const *e2 = (dirent const * const *)_e2; 9.352 - const char *p1, *p2; 9.353 - int diff; 9.354 -