summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlin Năstac <mrness@gentoo.org>2007-10-22 22:46:05 +0000
committerAlin Năstac <mrness@gentoo.org>2007-10-22 22:46:05 +0000
commitc22ae6b07217e6e494ceb73d67c28e9e07158b22 (patch)
tree24b49aac7098cf63b78ea2a1079d8ea0400a5219 /net-libs/wvstreams/files
parentx86 (diff)
downloadhistorical-c22ae6b07217e6e494ceb73d67c28e9e07158b22.tar.gz
historical-c22ae6b07217e6e494ceb73d67c28e9e07158b22.tar.bz2
historical-c22ae6b07217e6e494ceb73d67c28e9e07158b22.zip
Remove obsolete version.
Package-Manager: portage-2.1.3.9
Diffstat (limited to 'net-libs/wvstreams/files')
-rw-r--r--net-libs/wvstreams/files/digest-wvstreams-4.3-r23
-rw-r--r--net-libs/wvstreams/files/wvstreams-4.3-64bit.patch14
-rw-r--r--net-libs/wvstreams/files/wvstreams-4.3-MOC-fix.patch12
-rw-r--r--net-libs/wvstreams/files/wvstreams-4.3-as-needed.patch45
-rw-r--r--net-libs/wvstreams/files/wvstreams-4.3-external-xplc.patch36
-rw-r--r--net-libs/wvstreams/files/wvstreams-4.3-linux-serial.patch42
-rw-r--r--net-libs/wvstreams/files/wvstreams-4.3-sane-cflags.patch59
-rw-r--r--net-libs/wvstreams/files/wvstreams-4.3-sigaction.patch11
-rw-r--r--net-libs/wvstreams/files/wvstreams-4.3-type-punned.patch197
-rw-r--r--net-libs/wvstreams/files/wvstreams-4.3-uniconfd-ini.patch14
-rw-r--r--net-libs/wvstreams/files/wvstreams-4.3-wireless-user.patch11
11 files changed, 0 insertions, 444 deletions
diff --git a/net-libs/wvstreams/files/digest-wvstreams-4.3-r2 b/net-libs/wvstreams/files/digest-wvstreams-4.3-r2
deleted file mode 100644
index 3b2f6d51a4f1..000000000000
--- a/net-libs/wvstreams/files/digest-wvstreams-4.3-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 eb34544384c951fd14470d583273e02a wvstreams-4.3.tar.gz 1294177
-RMD160 fb6c480903cb725bf4911a05bfa1ef12bf05dfec wvstreams-4.3.tar.gz 1294177
-SHA256 54b2a693ef67fde375292d768fc6471bb00105870714cc4051289986a51aabb9 wvstreams-4.3.tar.gz 1294177
diff --git a/net-libs/wvstreams/files/wvstreams-4.3-64bit.patch b/net-libs/wvstreams/files/wvstreams-4.3-64bit.patch
deleted file mode 100644
index 2fc39eac68da..000000000000
--- a/net-libs/wvstreams/files/wvstreams-4.3-64bit.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Nru wvstreams-4.3.orig/utils/wvcrash.cc wvstreams-4.3/utils/wvcrash.cc
---- wvstreams-4.3.orig/utils/wvcrash.cc 2007-02-07 21:06:12.000000000 +0200
-+++ wvstreams-4.3/utils/wvcrash.cc 2007-03-12 14:23:47.000000000 +0200
-@@ -91,8 +91,8 @@
- char digits[] = "0123456789ABCDEF";
-
- write(fd, "0x", 2);
-- for (int shift=28; shift>=0; shift-=4)
-- write(fd, &digits[(((unsigned)addr)>>shift)&0xF], 1);
-+ for (int shift = (sizeof(addr) << 3) - 4; shift>=0; shift-=4)
-+ write(fd, &digits[(((ptrdiff_t)addr)>>shift)&0xF], 1);
- }
-
-
diff --git a/net-libs/wvstreams/files/wvstreams-4.3-MOC-fix.patch b/net-libs/wvstreams/files/wvstreams-4.3-MOC-fix.patch
deleted file mode 100644
index 135c4142e615..000000000000
--- a/net-libs/wvstreams/files/wvstreams-4.3-MOC-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nru wvstreams-4.3.orig/wvrules.mk wvstreams-4.3/wvrules.mk
---- wvstreams-4.3.orig/wvrules.mk 2007-03-12 14:02:55.000000000 +0200
-+++ wvstreams-4.3/wvrules.mk 2007-03-12 14:05:29.000000000 +0200
-@@ -296,7 +296,7 @@
- %.E: %.cc; $(call wvcxx,$@,$<,$*,,-E)
- %.E: %.cpp; $(call wvcxx,$@,$<,$*,,-E)
-
--%.moc: %.h; moc -o $@ $<
-+%.moc: %.h; $(MOC) -o $@ $<
-
- %: %.o; $(call wvlink,$@,$^)
- %.t: %.t.o; $(call wvlink,$@,$(call reverse,$(filter %.o,$^)) $(filter-out %.o,$^) $(LIBWVTEST))
diff --git a/net-libs/wvstreams/files/wvstreams-4.3-as-needed.patch b/net-libs/wvstreams/files/wvstreams-4.3-as-needed.patch
deleted file mode 100644
index 3088abc72f0f..000000000000
--- a/net-libs/wvstreams/files/wvstreams-4.3-as-needed.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -Nru wvstreams-4.3.orig/configure.ac wvstreams-4.3/configure.ac
---- wvstreams-4.3.orig/configure.ac 2007-02-07 21:06:17.000000000 +0200
-+++ wvstreams-4.3/configure.ac 2007-03-12 13:59:25.000000000 +0200
-@@ -528,16 +528,19 @@
- wv_cv_with_qt=no
- CPPFLAGS_save="$CPPFLAGS"
- LDFLAGS_save="$LDFLAGS"
-+ LIBS_save="$LIBS"
- for wv_qtdir in $with_qt $QTDIR $QT_SEARCH_PATH; do
- eval wv_qtdir="$wv_qtdir"
- CPPFLAGS="$CPPFLAGS_save -I$wv_qtdir/include -I$wv_qtdir/include/qt3"
-- LDFLAGS="$LDFLAGS_save -L$wv_qtdir/lib -lqt-mt"
-+ LDFLAGS="$LDFLAGS_save -L$wv_qtdir/lib"
-+ LIBS="$LIBS_save -lqt-mt"
- AC_TRY_LINK([#include <qstring.h>],
- [QString x("hello"); return 0; ],
- [wv_cv_with_qt=$wv_qtdir; break])
- done
- CPPFLAGS="$CPPFLAGS_save"
- LDFLAGS="$LDFLAGS_save"
-+ LIBS="$LIBS_save"
- ])
- with_qt=$wv_cv_with_qt
- if test "$with_qt" != no; then
-diff -Nru wvstreams-4.3.orig/wvrules.mk wvstreams-4.3/wvrules.mk
---- wvstreams-4.3.orig/wvrules.mk 2007-02-07 21:06:17.000000000 +0200
-+++ wvstreams-4.3/wvrules.mk 2007-03-12 13:59:25.000000000 +0200
-@@ -60,7 +60,7 @@
- -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
- CFLAGS += $(COPTS) $(C_AND_CXX_FLAGS)
- CXXFLAGS += $(CXXOPTS) $(C_AND_CXX_FLAGS)
--LDFLAGS += $(LDOPTS) -L$(WVSTREAMS_LIB)
-+LDFLAGS += $(LDOPTS) -L$(WVSTREAMS_LIB) -Wl,-rpath-link,$(WVSTREAMS_LIB)
-
- # Default compiler we use for linking
- WVLINK_CC = gcc
-@@ -272,7 +272,7 @@
- %.so: SONAME=$@$(if $(SO_VERSION),.$(SO_VERSION))
- wvsoname=$(if $($1-SONAME),$($1-SONAME),$(if $(SONAME),$(SONAME),$1))
- define wvlink_so
-- $(LINK_MSG)$(WVLINK_CC) $(LDFLAGS) $($1-LDFLAGS) -Wl,-soname,$(call wvsoname,$1) -shared -o $1 $(filter %.o %.a %.so,$2) $($1-LIBS) $(LIBS) $(XX_LIBS)
-+ $(LINK_MSG)$(WVLINK_CC) $(LDFLAGS) $($1-LDFLAGS) -Wl,-soname,$(call wvsoname,$1) -shared -o $1 $(filter %.o %.a,$2) $(filter %.so,$2) $($1-LIBS) $(LIBS) $(XX_LIBS)
- $(if $(filter-out $(call wvsoname,$1),$1),$(call wvlns,$1,$(call wvsoname,$1)))
- endef
-
diff --git a/net-libs/wvstreams/files/wvstreams-4.3-external-xplc.patch b/net-libs/wvstreams/files/wvstreams-4.3-external-xplc.patch
deleted file mode 100644
index 0e6307161a3d..000000000000
--- a/net-libs/wvstreams/files/wvstreams-4.3-external-xplc.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Nru wvstreams-4.3.orig/configure.ac wvstreams-4.3/configure.ac
---- wvstreams-4.3.orig/configure.ac 2007-03-12 14:00:52.000000000 +0200
-+++ wvstreams-4.3/configure.ac 2007-03-12 14:03:33.000000000 +0200
-@@ -556,7 +556,6 @@
-
- # xplc
- if test "$with_xplc" != "no"; then
-- if test "$with_xplc" = ""; then
- if pkg-config --modversion xplc-${xplc_version}; then
- WV_APPEND(CPPFLAGS, [`pkg-config --cflags xplc-${xplc_version}`])
- WV_APPEND(LDFLAGS, [`pkg-config --libs xplc-${xplc_version}`])
-@@ -568,15 +567,6 @@
- else
- with_xplc='no'
- fi
-- else
-- WV_APPEND(CPPFLAGS, [-I$with_xplc/include])
-- WV_APPEND(LDFLAGS, [-L$with_xplc])
-- AC_CHECK_HEADERS(xplc/core.h,, [with_xplc=no], [#define UNSTABLE])
-- LIBS_save="$LIBS"
-- AC_CHECK_LIB(xplc, XPLC_getServiceManager,, [with_xplc=no])
-- LIBS="$LIBS_save"
-- xplc_pc="xplc-${xplc_version}"
-- fi
- # What if we can't find it?
- if test "$with_xplc" = "no" && test -d xplc; then
- WV_APPEND(CPPFLAGS, [-I\$(WVSTREAMS)/xplc/include])
-@@ -584,7 +574,7 @@
- AC_CONFIG_SUBDIRS(xplc)
- build_xplc=yes
- with_xplc='$(WVSTREAMS)/xplc'
-- xplc_pc='wvxplc'
-+ xplc_pc='wvxplc'
- fi
- fi
-
diff --git a/net-libs/wvstreams/files/wvstreams-4.3-linux-serial.patch b/net-libs/wvstreams/files/wvstreams-4.3-linux-serial.patch
deleted file mode 100644
index 5cb98809beda..000000000000
--- a/net-libs/wvstreams/files/wvstreams-4.3-linux-serial.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -Nru wvstreams-4.3.orig/streams/wvmodem.cc wvstreams-4.3/streams/wvmodem.cc
---- wvstreams-4.3.orig/streams/wvmodem.cc 2007-02-07 21:06:17.000000000 +0200
-+++ wvstreams-4.3/streams/wvmodem.cc 2007-03-12 13:49:13.000000000 +0200
-@@ -194,22 +194,22 @@
- drain();
-
- #if HAVE_LINUX_SERIAL_H
-- struct serial_struct old_sinfo, sinfo;
-- sinfo.reserved_char[0] = 0;
-- if (ioctl(getrfd(), TIOCGSERIAL, &old_sinfo) < 0)
-- log("Cannot get information for serial port.");
-- else
-- {
-- sinfo = old_sinfo;
-- // Why there are two closing wait timeouts, is beyond me
-- // but there are... apparently the second one is deprecated
-- // but why take a chance...
-- sinfo.closing_wait = ASYNC_CLOSING_WAIT_NONE;
-- sinfo.closing_wait2 = ASYNC_CLOSING_WAIT_NONE;
--
-- if (ioctl(getrfd(), TIOCSSERIAL, &sinfo) < 0)
-- log("Cannot set information for serial port.");
-- }
-+ if (getuid() == 0)
-+ {
-+ struct serial_struct sinfo;
-+ if (ioctl(getrfd(), TIOCGSERIAL, &sinfo) >= 0) //Ignore errors because some modems (at least slmodem) do not support this
-+ {
-+ // Why there are two closing wait timeouts, is beyond me
-+ // but there are... apparently the second one is deprecated
-+ // but why take a chance...
-+ sinfo.closing_wait = ASYNC_CLOSING_WAIT_NONE;
-+ sinfo.closing_wait2 = ASYNC_CLOSING_WAIT_NONE;
-+
-+ //Ignore errors because ltmodem module implement TIOCGSERIAL but do not implement TIOCSSERIAL (go figure...)
-+ //see http://bugs.gentoo.org/show_bug.cgi?id=85754
-+ ioctl(getrfd(), TIOCSSERIAL, &sinfo);
-+ }
-+ }
- #endif
-
- // set up the terminal characteristics.
diff --git a/net-libs/wvstreams/files/wvstreams-4.3-sane-cflags.patch b/net-libs/wvstreams/files/wvstreams-4.3-sane-cflags.patch
deleted file mode 100644
index 749b9d4acee5..000000000000
--- a/net-libs/wvstreams/files/wvstreams-4.3-sane-cflags.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff -Nru wvstreams-4.3.orig/vars.mk wvstreams-4.3/vars.mk
---- wvstreams-4.3.orig/vars.mk 2007-02-07 21:06:17.000000000 +0200
-+++ wvstreams-4.3/vars.mk 2007-03-12 14:02:19.000000000 +0200
-@@ -71,10 +71,10 @@
- CXXFLAGS+=-D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
- CFLAGS+=-D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
-
--ifeq ($(DEBUG),)
--CXXFLAGS+=-g
--CFLAGS+=-g
--endif
-+#ifeq ($(DEBUG),)
-+#CXXFLAGS+=-g
-+#CFLAGS+=-g
-+#endif
-
- ifneq ($(DEBUG),)
- CXXFLAGS+=-ggdb -DDEBUG$(if $(filter-out yes,$(DEBUG)), -DDEBUG_$(DEBUG))
-@@ -96,9 +96,9 @@
- endif
-
- ifneq ("$(enable_optimization)", "no")
--CXXFLAGS+=-O2
-+#CXXFLAGS+=-O2
- #CXXFLAGS+=-felide-constructors
--CFLAGS+=-O2
-+#CFLAGS+=-O2
- endif
-
- ifneq ("$(enable_warnings)", "no")
-diff -Nru wvstreams-4.3.orig/wvrules.mk wvstreams-4.3/wvrules.mk
---- wvstreams-4.3.orig/wvrules.mk 2007-03-12 14:00:52.000000000 +0200
-+++ wvstreams-4.3/wvrules.mk 2007-03-12 14:02:19.000000000 +0200
-@@ -82,9 +82,9 @@
- endif
-
- ifneq ("$(enable_optimization)", "no")
-- CXXFLAGS+=-O2
-+ #CXXFLAGS+=-O2
- #CXXFLAGS+=-felide-constructors
-- CFLAGS+=-O2
-+ #CFLAGS+=-O2
- endif
-
- ifneq ("$(enable_warnings)", "no")
-@@ -177,11 +177,11 @@
- C_AND_CXX_FLAGS += -ggdb -DDEBUG=1
- LDFLAGS += -ggdb
- else
-- C_AND_CXX_FLAGS += -g -DDEBUG=0
-+ C_AND_CXX_FLAGS += -DDEBUG=0
- #CFLAGS += -DNDEBUG # I don't like disabling assertions...
- #CFLAGS += -fomit-frame-pointer # really evil
- #CXXFLAGS += -fno-implement-inlines # causes trouble with egcs 1.0
-- LDFLAGS += -g
-+ #LDFLAGS += -g
- endif
-
- ifeq ($(PROFILE),1)
diff --git a/net-libs/wvstreams/files/wvstreams-4.3-sigaction.patch b/net-libs/wvstreams/files/wvstreams-4.3-sigaction.patch
deleted file mode 100644
index a5da5fcdf83f..000000000000
--- a/net-libs/wvstreams/files/wvstreams-4.3-sigaction.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nru wvstreams-4.3.orig/utils/wvcrash.cc wvstreams-4.3/utils/wvcrash.cc
---- wvstreams-4.3.orig/utils/wvcrash.cc 2007-05-23 08:05:35.000000000 +0300
-+++ wvstreams-4.3/utils/wvcrash.cc 2007-05-23 20:14:37.000000000 +0300
-@@ -349,7 +349,6 @@
- act.sa_handler = wvcrash;
- sigfillset(&act.sa_mask);
- act.sa_flags = SA_ONSTACK | SA_RESTART;
-- act.sa_restorer = NULL;
-
- if (sigaction(sig, &act, NULL))
- fprintf(stderr, "Failed to setup wvcrash handler for signal %d: %s\n",
diff --git a/net-libs/wvstreams/files/wvstreams-4.3-type-punned.patch b/net-libs/wvstreams/files/wvstreams-4.3-type-punned.patch
deleted file mode 100644
index e99b413f19f1..000000000000
--- a/net-libs/wvstreams/files/wvstreams-4.3-type-punned.patch
+++ /dev/null
@@ -1,197 +0,0 @@
-diff -Nru wvstreams-4.3.orig/urlget/wvhttppool.cc wvstreams-4.3/urlget/wvhttppool.cc
---- wvstreams-4.3.orig/urlget/wvhttppool.cc 2007-02-07 21:05:29.000000000 +0200
-+++ wvstreams-4.3/urlget/wvhttppool.cc 2007-04-04 11:42:06.000000000 +0300
-@@ -43,7 +43,12 @@
- {
- WvBufUrlStream *x = new WvBufUrlStream;
- outstream = x;
-- x->death_notify = (WvStream **)&outstream;
-+ union {
-+ WvBufUrlStream** ppbufurlstream;
-+ WvStream** ppstream;
-+ } s;
-+ s.ppbufurlstream = &outstream;
-+ x->death_notify = s.ppstream;
- x->url = url;
-
- putstream = content_source;
-diff -Nru wvstreams-4.3.orig/utils/wvbdbhash.cc wvstreams-4.3/utils/wvbdbhash.cc
---- wvstreams-4.3.orig/utils/wvbdbhash.cc 2007-02-07 21:06:12.000000000 +0200
-+++ wvstreams-4.3/utils/wvbdbhash.cc 2007-04-04 11:37:44.000000000 +0300
-@@ -24,6 +24,11 @@
-
- #include "wvlog.h"
-
-+typedef union {
-+ WvBdbHash::datum d;
-+ DBT D;
-+} DBTdatum;
-+
- int comparefunc(const DBT *a, const DBT *b)
- {
- if (a == NULL && b == NULL) return 0;
-@@ -102,14 +107,14 @@
- void WvBdbHash::remove(const datum &key)
- {
- if (!isok()) return;
-+
-+ DBTdatum newkey, data;
-+ newkey.d = key;
-
-- datum newkey, data;
-- newkey = key;
--
-- int ret = dbf->seq(dbf, (DBT *)&newkey, (DBT *)&data, R_CURSOR);
-+ int ret = dbf->seq(dbf, &newkey.D, &data.D, R_CURSOR);
- if (!ret)
- {
-- ret = dbf->del(dbf, (DBT *)&newkey, R_CURSOR);
-+ ret = dbf->del(dbf, &newkey.D, R_CURSOR);
- }
-
- if (ret == 1) seterr("Strange: seq found a key that del didn't recognize");
-@@ -119,30 +124,35 @@
-
- WvBdbHash::datum WvBdbHash::find(const datum &key)
- {
-- datum ret = {0, 0};
-- if (!isok()) return ret;
-+ DBTdatum newkey, ret;
-+ newkey.d = key;
-+ ret.d.dptr = 0;
-+ ret.d.dsize = 0;
-+ if (!isok()) return ret.d;
-
-- int r = dbf->get(dbf, (DBT *)&key, (DBT *)&ret, 0);
-+ int r = dbf->get(dbf, &newkey.D, &ret.D, 0);
- if (r == 1)
- {
- // not found - make sure we return an empty datum
-- ret.dptr = NULL;
-+ ret.d.dptr = NULL;
- }
- else if (r != 0)
- {
-- ret.dptr = NULL;
-+ ret.d.dptr = NULL;
- seterr(errno);
- }
-- return ret;
-+ return ret.d;
- }
-
-
- bool WvBdbHash::exists(const datum &key)
- {
-+ DBTdatum newkey;
-+ newkey.d = key;
-+ DBT val;
- if (!isok()) return false;
-
-- datum ret = {0, 0};
-- int r = dbf->get(dbf, (DBT *)&key, (DBT *)&ret, 0);
-+ int r = dbf->get(dbf, &newkey.D, &val, 0);
-
- // return true on success
- if (r == 0) return true;
-@@ -165,11 +175,11 @@
- }
-
- // super-slow version
-- datum key, value;
-+ DBT key, value;
- int r;
-- while ((r = dbf->seq(dbf, (DBT *)&key, (DBT *)&value, R_FIRST)) == 0)
-+ while ((r = dbf->seq(dbf, &key, &value, R_FIRST)) == 0)
- {
-- int r2 = dbf->del(dbf, (DBT *)&key, R_CURSOR);
-+ int r2 = dbf->del(dbf, &key, R_CURSOR);
- if (r2 == 1) seterr("Strange: seq found a key that del didn't recognize");
- else if (r2 != 0) seterr(errno);
- }
-@@ -193,54 +203,60 @@
- {
- if (!parent.isok()) return;
-
-+ DBTdatum unionkey, uniondata;
-+ unionkey.d = curkey;
-+ uniondata.d = curdata;
-+
- // check if this is the first next() after a rewind()
-- bool first = !curkey.dptr;
-- datum wanted = { 0, 0 };
-+ bool first = !unionkey.d.dptr;
-+ DBTdatum wanted;
-+ wanted.d.dptr = 0;
-+ wanted.d.dsize = 0;
- if (first)
- {
- if (rewindto.dptr)
- {
-- curkey = rewindto;
-+ unionkey.d = rewindto;
- first = false;
- }
- }
- else
- {
-- wanted.dsize = curkey.dsize;
-- wanted.dptr = malloc(wanted.dsize);
-- memcpy(wanted.dptr, curkey.dptr, wanted.dsize);
-+ wanted.d.dsize = unionkey.d.dsize;
-+ wanted.d.dptr = malloc(wanted.d.dsize);
-+ memcpy(wanted.d.dptr, unionkey.d.dptr, wanted.d.dsize);
- }
-
- // always seek for the saved cursor we were just passed, to work around
- // bugs in libdb1's seq with btrees. (As a bonus, this gives us multiple
- // iterators for free!)
-- int r = parent.dbf->seq(parent.dbf, (DBT *)&curkey, (DBT *)&curdata,
-+ int r = parent.dbf->seq(parent.dbf, &unionkey.D, &uniondata.D,
- first ? R_FIRST : R_CURSOR);
-
- if (r == 1)
- {
- // current key gone, and none higher left: done
-- curkey.dptr = curdata.dptr = NULL;
-+ unionkey.d.dptr = uniondata.d.dptr = NULL;
- }
- else if (r != 0)
- parent.seterr(errno);
-
- else if (!first)
- {
-- while (comparefunc((DBT *)&wanted, (DBT *)&curkey) >= 0)
-+ while (comparefunc(&wanted.D, &unionkey.D) >= 0)
- {
- // found the exact key or earlier than requested: move forward one
- // (yes, libbdb1 can return a key less than requested, despite
- // the documentation's claims!)
- // This algorithm definitely makes it so inserting the same key
- // more than once doesn't work at all.
-- r = parent.dbf->seq(parent.dbf, (DBT *)&curkey, (DBT *)&curdata,
-+ r = parent.dbf->seq(parent.dbf, &unionkey.D, &uniondata.D,
- R_NEXT);
-
- if (r == 1)
- {
- // nothing left? Fine, we're done
-- curkey.dptr = curdata.dptr = NULL;
-+ unionkey.d.dptr = uniondata.d.dptr = NULL;
- break;
- }
- else if (r != 0)
-@@ -252,8 +268,11 @@
- // the very first key), as expected. (Also, if rewindto is set it should
- // be either filled in with the matching btree data or cleared.) Unless,
- // of course, the whole db is borked.
-- assert(!parent.isok() || !rewindto.dptr || curkey.dptr != rewindto.dptr);
-- free(wanted.dptr);
-+ assert(!parent.isok() || !rewindto.dptr || unionkey.d.dptr != rewindto.dptr);
-+ free(wanted.d.dptr);
-+
-+ curkey = unionkey.d;
-+ curdata = uniondata.d;
- }
-
- #endif /* WITH_BDB */
diff --git a/net-libs/wvstreams/files/wvstreams-4.3-uniconfd-ini.patch b/net-libs/wvstreams/files/wvstreams-4.3-uniconfd-ini.patch
deleted file mode 100644
index 664086eff623..000000000000
--- a/net-libs/wvstreams/files/wvstreams-4.3-uniconfd-ini.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Nru wvstreams-4.3.orig/Makefile wvstreams-4.3/Makefile
---- wvstreams-4.3.orig/Makefile 2007-02-07 21:06:17.000000000 +0200
-+++ wvstreams-4.3/Makefile 2007-03-12 13:57:57.000000000 +0200
-@@ -186,8 +186,8 @@
- $(INSTALL_PROGRAM) uniconf/tests/uni $(DESTDIR)$(bindir)/
- $(INSTALL) -d $(DESTDIR)$(sbindir)
- $(INSTALL_PROGRAM) uniconf/daemon/uniconfd $(DESTDIR)$(sbindir)/
-- $(INSTALL) -d $(DESTDIR)$(localstatedir)/lib/uniconf
-- touch $(DESTDIR)$(localstatedir)/lib/uniconf/uniconfd.ini
-+ $(INSTALL) -d $(DESTDIR)$(localstatedir)/uniconf
-+ $(INSTALL_DATA) uniconf/daemon/uniconfd.ini $(DESTDIR)$(localstatedir)/uniconf
- $(INSTALL) -d $(DESTDIR)$(mandir)/man8
- $(INSTALL_DATA) uniconf/daemon/uniconfd.8 $(DESTDIR)$(mandir)/man8
- $(INSTALL_DATA) uniconf/tests/uni.8 $(DESTDIR)$(mandir)/man8
diff --git a/net-libs/wvstreams/files/wvstreams-4.3-wireless-user.patch b/net-libs/wvstreams/files/wvstreams-4.3-wireless-user.patch
deleted file mode 100644
index c7247f5fb9ba..000000000000
--- a/net-libs/wvstreams/files/wvstreams-4.3-wireless-user.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nru wvstreams-4.3.orig/linuxstreams/wvinterface.cc wvstreams-4.3/linuxstreams/wvinterface.cc
---- wvstreams-4.3.orig/linuxstreams/wvinterface.cc 2007-02-07 21:06:03.000000000 +0200
-+++ wvstreams-4.3/linuxstreams/wvinterface.cc 2007-03-12 13:55:29.000000000 +0200
-@@ -21,6 +21,7 @@
- #include <errno.h>
- #include <linux/sockios.h>
-
-+#include <sys/sysctl.h> /* Needed for __user definition */
- #define _LINUX_IF_H /* Hack to prevent loading linux/if.h */
- #include <linux/wireless.h>
-