wvdial: fixed build with glibc 2.10

wvdial/.md5sum

@@ -1,3 +1,5 @@
+64a1d235c64cc607aac25f9ceb3e4083  wvdial-1.60-scandir.patch
 6fede1ca598a9905983a059f985807d5  wvdial-1.60.patch
 27fbbde89f8fd9f6e735a8efa5217fc9  wvdial-1.60.tar.gz
+4aa19c92287f0fd0aacae7afd283caf3  wvstreams-4.5.1-const.patch
 d092f6a80d38d361cb7a6d54d7699678  wvstreams-4.5.1.tar.gz

wvdial/Pkgfile

@@ -5,17 +5,20 @@
 
 name=wvdial
 version=1.60
-release=4
+release=5
 source=(http://alumnit.ca/download/$name-$version.tar.gz \
         http://wvstreams.googlecode.com/files/wvstreams-4.5.1.tar.gz \
-        $name-$version.patch)
+        $name-$version.patch $name-$version-scandir.patch \
+        wvstreams-4.5.1-const.patch)
 
 build() {
     cd wvstreams-4.5.1
+    patch -p0 -i $SRC/wvstreams-4.5.1-const.patch
     ./configure --prefix=/usr --without-{pam,tcl,qt,dbus}
     make -j1
 
     cd $SRC/$name-$version
+    patch -p1 -i $SRC/$name-$version-scandir.patch
     patch -p1 -i $SRC/$name-$version.patch
     make -j1 CXXOPTS="$CXXFLAGS" WVS=$SRC/wvstreams-4.5.1
     make DESTDIR=$PKG install

wvdial/wvdial-1.60-scandir.patch

@@ -0,0 +1,14 @@
+# http://bugs.gentoo.org/show_bug.cgi?&id=271477
+
+diff -Nru wvdial-1.60.orig/wvmodemscan.cc wvdial-1.60/wvmodemscan.cc
+--- wvdial-1.60.orig/wvmodemscan.cc	2009-06-04 10:40:35.913426298 +0000
++++ wvdial-1.60/wvmodemscan.cc	2009-06-04 10:40:55.723426715 +0000
+@@ -496,7 +496,7 @@
+ }
+ 
+ 
+-static int filesort(const void *_e1, const void *_e2)
++static int filesort(const dirent **_e1, const dirent **_e2)
+ {
+     dirent const * const *e1 = (dirent const * const *)_e1;
+     dirent const * const *e2 = (dirent const * const *)_e2;

wvdial/wvstreams-4.5.1-const.patch

@@ -0,0 +1,65 @@
+diff --git utils/strutils.cc utils/strutils.cc
+index ef10988..c4ed1fb 100644
+--- utils/strutils.cc
++++ utils/strutils.cc
+@@ -315,7 +315,7 @@ WvString url_decode(WvStringParm str, bool no_space)
+  
+     const char *iptr;
+     char *optr;
+-    char *idx1, *idx2;
++    const char *idx1, *idx2;
+     static const char hex[] = "0123456789ABCDEF";
+     WvString in, intmp(str), out;
+ 
+@@ -967,7 +967,7 @@ WvString afterstr(WvStringParm line, WvStringParm a)
+     if (!line || !a)
+ 	return WvString::null;
+ 
+-    char *loc = strstr(line, a);
++    const char *loc = strstr(line, a);
+     if (loc == 0)
+ 	return "";
+ 
+@@ -984,8 +984,8 @@ WvString beforestr(WvStringParm line, WvStringParm a)
+ 	return WvString::null;
+ 
+     WvString ret = line;
+-    ret.unique();     
+-    char *loc = strstr(ret, a);
++    ret.unique();
++    char *loc = strstr(ret.edit(), a);
+ 
+     if (loc == 0)
+ 	return line;
+--- utils/verstring.cc.orig	2009-05-19 21:14:35.533876383 +0200
++++ utils/verstring.cc	2009-05-19 21:15:05.193876300 +0200
+@@ -147,7 +147,7 @@
+ 
+ bool is_new_verstr(const char *str)
+ {
+-    char *p = strchr(str, '.');
++    const char *p = strchr(str, '.');
+     if (p && strchr(p+1, '.'))
+         return true;
+ 
+--- include/wvdigest.h.orig	2009-05-19 21:18:03.833876381 +0200
++++ include/wvdigest.h	2009-05-19 21:18:25.953876231 +0200
+@@ -8,6 +8,7 @@
+ #define __WVDIGEST_H
+ 
+ #include "wvencoder.h"
++#include <stdint.h>
+ 
+ struct env_md_st;
+ struct env_md_ctx_st;
+--- ipstreams/wvaddr.cc.orig	2009-05-19 21:20:01.753875972 +0200
++++ ipstreams/wvaddr.cc	2009-05-19 21:20:29.133878862 +0200
+@@ -538,7 +538,7 @@
+ // If the netmask is not specified, it will default to all 1's.
+ void WvIPNet::string_init(const char string[])
+ {
+-    char *maskptr;
++    const char *maskptr;
+     int bits;
+     uint32_t imask;
+