fake
20 years ago
5 changed files with 114 additions and 111 deletions
Unified View
Diff Options
-
+0 -106package/esden/wvdial/gcc3_and_smallfix.patch
-
+1 -2package/esden/wvdial/wvdial.conf
-
+5 -3package/esden/wvdial/wvdial.desc
-
+67 -0package/esden/wvstreams/gcc34.patch
-
+41 -0package/esden/wvstreams/wvstreams.desc
@ -1,106 +0,0 @@ |
|||||
# --- ROCK-COPYRIGHT-NOTE-BEGIN --- |
|
||||
# |
|
||||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
|
||||
# Please add additional copyright information _after_ the line containing |
|
||||
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by |
|
||||
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! |
|
||||
# |
|
||||
# ROCK Linux: rock-src/package/esden/wvdial/gcc3_and_smallfix.patch |
|
||||
# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf |
|
||||
# |
|
||||
# This program is free software; you can redistribute it and/or modify |
|
||||
# it under the terms of the GNU General Public License as published by |
|
||||
# the Free Software Foundation; either version 2 of the License, or |
|
||||
# (at your option) any later version. A copy of the GNU General Public |
|
||||
# License can be found at Documentation/COPYING. |
|
||||
# |
|
||||
# Many people helped and are helping developing ROCK Linux. Please |
|
||||
# have a look at http://www.rocklinux.org/ and the Documentation/TEAM |
|
||||
# file for details. |
|
||||
# |
|
||||
# --- ROCK-COPYRIGHT-NOTE-END --- |
|
||||
|
|
||||
diff -Nur wvdial-1.42/Makefile wvdial-1.42.new/Makefile
|
|
||||
--- wvdial-1.42/Makefile Fri May 11 22:01:21 2001
|
|
||||
+++ wvdial-1.42.new/Makefile Tue Oct 1 01:07:02 2002
|
|
||||
@@ -1,7 +1,7 @@
|
|
||||
TOPDIR=$(shell if [ "$$PWD" != "" ]; then echo $$PWD; else pwd; fi) |
|
||||
|
|
||||
DEBUG=0 |
|
||||
-PREFIX=/usr/local
|
|
||||
+PREFIX=/usr
|
|
||||
BINDIR=${PREFIX}/bin |
|
||||
MANDIR=${PREFIX}/man |
|
||||
PPPDIR=/etc/ppp/peers |
|
||||
@@ -20,7 +20,7 @@
|
|
||||
[ -d ${MANDIR}/man1 ] || install -d ${MANDIR}/man1 |
|
||||
[ -d ${PPPDIR} ] || install -d ${PPPDIR} |
|
||||
install -m 0755 --strip src/wvdial/wvdial src/wvdial/wvdialconf ${BINDIR} |
|
||||
- install -m 0644 wvdial.1 wvdialconf.1 ${MANDIR}/man1
|
|
||||
+ install -m 0644 wvdial.1 wvdialconf.1 wvdial.conf.5 ${MANDIR}/man1
|
|
||||
cp ppp.provider ${PPPDIR}/wvdial |
|
||||
|
|
||||
uninstall: |
|
||||
diff -Nur wvdial-1.42/src/streams/wvlog.h wvdial-1.42.new/src/streams/wvlog.h
|
|
||||
--- wvdial-1.42/src/streams/wvlog.h Wed Mar 15 21:44:53 2000
|
|
||||
+++ wvdial-1.42.new/src/streams/wvlog.h Tue Oct 1 00:52:21 2002
|
|
||||
@@ -25,7 +25,7 @@
|
|
||||
// or transmits log messages. |
|
||||
class WvLogRcvBase |
|
||||
{ |
|
||||
- friend WvLog;
|
|
||||
+ friend class WvLog;
|
|
||||
protected: |
|
||||
const char *appname(const WvLog *log) const; |
|
||||
virtual void log(const WvLog *source, int loglevel, |
|
||||
@@ -43,7 +43,7 @@
|
|
||||
// to all registered WvLogRcv's. |
|
||||
class WvLog : public WvStream |
|
||||
{ |
|
||||
- friend WvLogRcvBase;
|
|
||||
+ friend class WvLogRcvBase;
|
|
||||
public: |
|
||||
enum LogLevel { |
|
||||
Critical = 0, |
|
||||
diff -Nur wvdial-1.42/src/utils/wvstringtable.cc wvdial-1.42.new/src/utils/wvstringtable.cc
|
|
||||
--- wvdial-1.42/src/utils/wvstringtable.cc Sat Apr 1 12:40:47 2000
|
|
||||
+++ wvdial-1.42.new/src/utils/wvstringtable.cc Tue Oct 1 00:46:57 2002
|
|
||||
@@ -8,7 +8,7 @@
|
|
||||
#include "strutils.h" |
|
||||
|
|
||||
|
|
||||
-WvString WvStringTable::join(const char *joinchars = " ")
|
|
||||
+WvString WvStringTable::join(const char *joinchars)
|
|
||||
{ |
|
||||
WvStringTable::Iter s(*this); |
|
||||
size_t totlen; |
|
||||
@@ -16,6 +16,8 @@
|
|
||||
char *te; |
|
||||
int x; |
|
||||
|
|
||||
+ if(joinchars == NULL) joinchars=" ";
|
|
||||
+
|
|
||||
totlen = 1; |
|
||||
for (s.rewind(); s.next(); ) |
|
||||
totlen += strlen(s()) + strlen(joinchars); |
|
||||
diff -Nur wvdial-1.42/src/utils/wvtask.h wvdial-1.42.new/src/utils/wvtask.h
|
|
||||
--- wvdial-1.42/src/utils/wvtask.h Thu Mar 16 00:16:38 2000
|
|
||||
+++ wvdial-1.42.new/src/utils/wvtask.h Tue Oct 1 00:49:03 2002
|
|
||||
@@ -21,7 +21,7 @@
|
|
||||
|
|
||||
class WvTask |
|
||||
{ |
|
||||
- friend WvTaskMan;
|
|
||||
+ friend class WvTaskMan;
|
|
||||
typedef void TaskFunc(void *userdata); |
|
||||
|
|
||||
static int taskcount, numtasks, numrunning; |
|
||||
@@ -53,7 +53,7 @@
|
|
||||
|
|
||||
class WvTaskMan |
|
||||
{ |
|
||||
- friend WvTask;
|
|
||||
+ friend class WvTask;
|
|
||||
WvTaskList free_tasks; |
|
||||
|
|
||||
void get_stack(WvTask &task, size_t size); |
|
||||
@ -0,0 +1,67 @@ |
|||||
|
Submitted By: Uwe Düffert (lfs at uwe-dueffert dot de) |
||||
|
Date: 2004-05-16 |
||||
|
Initial Package Version: 3.75.0 |
||||
|
Origin: self-created, http://www.uwe-dueffert.de/lfs/ownpatches/wvstreams-3.75.0-gcc34-1.patch |
||||
|
Upstream Status: not reported |
||||
|
Description: fix compilation with gcc34 |
||||
|
|
||||
|
diff -Naur wvstreams-3.75.0.orig/include/uniconftree.h wvstreams-3.75.0/include/uniconftree.h
|
||||
|
--- wvstreams-3.75.0.orig/include/uniconftree.h 2004-05-16 14:22:42.665940696 +0000
|
||||
|
+++ wvstreams-3.75.0/include/uniconftree.h 2004-05-16 14:22:53.992218840 +0000
|
||||
|
@@ -48,7 +48,7 @@
|
||||
|
|
||||
|
/** Returns a pointer to the parent node, or NULL if there is none. */ |
||||
|
Sub *parent() const |
||||
|
- { return static_cast<Sub*>(xparent); }
|
||||
|
+ { return static_cast<Sub*>(Base::xparent); }
|
||||
|
|
||||
|
/** Reparents this node. */ |
||||
|
void setparent(Sub *parent) |
||||
|
@@ -93,13 +93,13 @@
|
||||
|
/** Removes and deletes all children of this node. */ |
||||
|
void zap() |
||||
|
{ |
||||
|
- if (!xchildren)
|
||||
|
+ if (!Base::xchildren)
|
||||
|
return; |
||||
|
// set xchildren to NULL first so that the zap() will happen faster |
||||
|
// otherwise, each child will attempt to unlink itself uselessly |
||||
|
|
||||
|
- typename Base::Container *oldchildren = xchildren;
|
||||
|
- xchildren = NULL;
|
||||
|
+ typename Base::Container *oldchildren = Base::xchildren;
|
||||
|
+ Base::xchildren = NULL;
|
||||
|
|
||||
|
// delete all children |
||||
|
typename Base::Container::Iter i(*oldchildren); |
||||
|
diff -Naur wvstreams-3.75.0.orig/include/wvsorter.h wvstreams-3.75.0/include/wvsorter.h
|
||||
|
--- wvstreams-3.75.0.orig/include/wvsorter.h 2004-05-16 14:22:42.587952552 +0000
|
||||
|
+++ wvstreams-3.75.0/include/wvsorter.h 2004-05-16 14:22:53.993218688 +0000
|
||||
|
@@ -90,7 +90,7 @@
|
||||
|
for (i.rewind(); i.next(); ) |
||||
|
n++; |
||||
|
|
||||
|
- array = new (void *) [n+2];
|
||||
|
+ array = new void*[n+2];
|
||||
|
void **aptr = array; |
||||
|
|
||||
|
*aptr++ = NULL; // initial link is NULL, to act like a normal iterator |
||||
|
diff -Naur wvstreams-3.75.0.orig/utils/wvbuffer.cc wvstreams-3.75.0/utils/wvbuffer.cc
|
||||
|
--- wvstreams-3.75.0.orig/utils/wvbuffer.cc 2004-05-16 14:22:42.433975960 +0000
|
||||
|
+++ wvstreams-3.75.0/utils/wvbuffer.cc 2004-05-16 14:22:53.993218688 +0000
|
||||
|
@@ -9,6 +9,7 @@
|
||||
|
/***** Specialization for raw memory buffers *****/ |
||||
|
|
||||
|
// Instantiate some commonly used templates |
||||
|
+/*
|
||||
|
template WvBufBaseCommonImpl<unsigned char>; |
||||
|
template WvInPlaceBufBase<unsigned char>; |
||||
|
template WvConstInPlaceBufBase<unsigned char>; |
||||
|
@@ -16,6 +17,7 @@
|
||||
|
template WvDynBufBase<unsigned char>; |
||||
|
template WvNullBufBase<unsigned char>; |
||||
|
template WvBufCursorBase<unsigned char>; |
||||
|
+*/
|
||||
|
|
||||
|
void WvBufBase<unsigned char>::putstr(WvStringParm str) |
||||
|
{ |
||||
@ -0,0 +1,41 @@ |
|||||
|
|
||||
|
[COPY] --- ROCK-COPYRIGHT-NOTE-BEGIN --- |
||||
|
[COPY] |
||||
|
[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
||||
|
[COPY] Please add additional copyright information _after_ the line containing |
||||
|
[COPY] the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by |
||||
|
[COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text! |
||||
|
[COPY] |
||||
|
[COPY] ROCK Linux: rock-src/package/esden/wvstreams/wvstreams.desc |
||||
|
[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf |
||||
|
[COPY] |
||||
|
[COPY] This program is free software; you can redistribute it and/or modify |
||||
|
[COPY] it under the terms of the GNU General Public License as published by |
||||
|
[COPY] the Free Software Foundation; either version 2 of the License, or |
||||
|
[COPY] (at your option) any later version. A copy of the GNU General Public |
||||
|
[COPY] License can be found at Documentation/COPYING. |
||||
|
[COPY] |
||||
|
[COPY] Many people helped and are helping developing ROCK Linux. Please |
||||
|
[COPY] have a look at http://www.rocklinux.org/ and the Documentation/TEAM |
||||
|
[COPY] file for details. |
||||
|
[COPY] |
||||
|
[COPY] --- ROCK-COPYRIGHT-NOTE-END --- |
||||
|
|
||||
|
[I] a network programming library written in C++ |
||||
|
|
||||
|
[T] WvStreams aims to be an efficient, secure, easy-to-use, and OS-independent |
||||
|
[T] library for doing network applications development, and we think that it |
||||
|
[T] has pretty much lived up to those goals. |
||||
|
|
||||
|
[A] Dave Coombs and Avery Pennarun of Worldvisions Computer Technology, Inc. |
||||
|
[M] Piotr Esden-Tempski <esden@rocklinux.org> |
||||
|
|
||||
|
[C] extra/network |
||||
|
|
||||
|
[L] LGPL |
||||
|
[S] Stable |
||||
|
[V] 3.75.0 |
||||
|
[P] X -?---5---9 173.300 |
||||
|
|
||||
|
[D] 2918776912 wvstreams-3.75.0.tar.gz http://people.nit.ca/~jim/ |
||||
|
|
||||