diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2003-09-26 03:40:01 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2003-09-26 03:40:01 +0000 |
| commit | 75a934789a5842cd7a03ff5d683640a38d7429db (patch) | |
| tree | f3d111b3b4a7fd64c5988f93f73a998cf4077206 /net-libs/wvstreams/files | |
| parent | Added keyword for ia64. (diff) | |
| download | historical-75a934789a5842cd7a03ff5d683640a38d7429db.tar.gz historical-75a934789a5842cd7a03ff5d683640a38d7429db.tar.bz2 historical-75a934789a5842cd7a03ff5d683640a38d7429db.zip | |
gcc3 patches #28548
Diffstat (limited to 'net-libs/wvstreams/files')
| -rw-r--r-- | net-libs/wvstreams/files/3.70-gcc3.patch | 71 | ||||
| -rw-r--r-- | net-libs/wvstreams/files/3.70-openssl.patch | 12 |
2 files changed, 83 insertions, 0 deletions
diff --git a/net-libs/wvstreams/files/3.70-gcc3.patch b/net-libs/wvstreams/files/3.70-gcc3.patch new file mode 100644 index 000000000000..e9b0f4b1d82f --- /dev/null +++ b/net-libs/wvstreams/files/3.70-gcc3.patch @@ -0,0 +1,71 @@ +diff -ur wvstreams-3.70/src/ipstreams/wvaddr.cc wvstreams-3.70/src/ipstreams/wvaddr.cc +--- wvstreams-3.70/src/ipstreams/wvaddr.cc 2002-03-04 18:39:42.000000000 -0500 ++++ wvstreams-3.70/src/ipstreams/wvaddr.cc 2002-05-20 14:14:04.000000000 -0400 +@@ -637,7 +637,7 @@ + } + + +-WvIPPortAddr::WvIPPortAddr(const unsigned char _ipaddr[4], __u16 _port) ++WvIPPortAddr::WvIPPortAddr(const unsigned char *_ipaddr, __u16 _port) + : WvIPAddr(_ipaddr) + { + port = _port; +diff -ur wvstreams-3.70/src/ipstreams/wvaddr.h wvstreams-3.70/src/ipstreams/wvaddr.h +--- wvstreams-3.70/src/ipstreams/wvaddr.h 2002-04-02 15:53:20.000000000 -0500 ++++ wvstreams-3.70/src/ipstreams/wvaddr.h 2002-05-20 14:13:54.000000000 -0400 +@@ -221,7 +221,7 @@ + public: + unsigned char binaddr[4]; + +- WvIPAddr(const unsigned char _binaddr[4]) ++ WvIPAddr(const unsigned char *_binaddr) + { if (_binaddr) memcpy(binaddr, _binaddr, 4); } + WvIPAddr(const __u32 _binaddr = 0) + { memcpy(binaddr, &_binaddr, 4); } +diff -ur wvstreams-3.70/src/ipstreams/wvresolver.cc wvstreams-3.70/src/ipstreams/wvresolver.cc +--- wvstreams-3.70/src/ipstreams/wvresolver.cc 2002-03-01 23:33:08.000000000 -0500 ++++ wvstreams-3.70/src/ipstreams/wvresolver.cc 2002-05-20 14:52:47.000000000 -0400 +@@ -128,7 +128,7 @@ + // If addr==NULL, this just tests to see if the name exists. + int WvResolver::findaddr(int msec_timeout, const WvString &name, + WvIPAddr const **addr, +- WvIPAddrList *addrlist = NULL) ++ WvIPAddrList *addrlist) + { + WvResolverHost *host; + time_t now = time(NULL); +diff -ur wvstreams-3.70/wvrules.mk wvstreams-3.70/wvrules.mk +--- wvstreams-3.70/wvrules.mk 2002-05-20 15:05:07.000000000 -0400 ++++ wvstreams-3.70/wvrules.mk 2002-05-20 14:56:23.000000000 -0400 +@@ -245,16 +245,16 @@ + ranlib $@ + + %.so: +- @echo $(CC) $(LDFLAGS) $($@-LDFLAGS) -shared -o $@ $^ $($@-LIBS) $(LIBS) $(XX_LIBS) ++ @echo $(CXX) $(LDFLAGS) $($@-LDFLAGS) -shared -o $@ $^ $($@-LIBS) $(LIBS) $(XX_LIBS) + @set -e; \ + $(define_libexpand); \ +- $(CC) $(LDFLAGS) $($@-LDFLAGS) -shared -o $@ \ ++ $(CXX) $(LDFLAGS) $($@-LDFLAGS) -shared -o $@ \ + $(filter %.o %.a %.so,$^) \ + $$(libexpand . $(filter %.libs,$^)) \ + $($@-LIBS) $(LIBS) $(XX_LIBS) + + %: %.o +- $(CC) $(LDFLAGS) $($@-LDFLAGS) -o $@ $(filter %.o %.a %.so, $^) $($@-LIBS) $(LIBS) $(XX_LIBS) ++ $(CXX) $(LDFLAGS) $($@-LDFLAGS) -o $@ $(filter %.o %.a %.so, $^) $($@-LIBS) $(LIBS) $(XX_LIBS) + + # Force objects to be built before final binaries + $(addsuffix .o,$(basename $(wildcard *.c) $(wildcard *.cc) $(wildcard *.cpp))): +diff -Nru wvstreams-3.70-clean/src/ipstreams/wvaddr.h wvstreams-3.70/src/ipstreams/wvaddr.h +--- wvstreams-3.70-clean/src/ipstreams/wvaddr.h Tue Apr 2 20:53:20 2002 ++++ wvstreams-3.70/src/ipstreams/wvaddr.h Thu Jul 4 02:32:27 2002 +@@ -369,7 +369,8 @@ + __u16 port; + + WvIPPortAddr(); + WvIPPortAddr(const unsigned char _ipaddr[4], __u16 _port = 0); ++ WvIPPortAddr(unsigned char _ipaddr[4], __u16 _port = 0); + WvIPPortAddr(const WvIPAddr &_ipaddr, __u16 _port = 0); + WvIPPortAddr(const char string[]) : WvIPAddr(string) + { string_init(string); } diff --git a/net-libs/wvstreams/files/3.70-openssl.patch b/net-libs/wvstreams/files/3.70-openssl.patch new file mode 100644 index 000000000000..a3f97dd785f7 --- /dev/null +++ b/net-libs/wvstreams/files/3.70-openssl.patch @@ -0,0 +1,12 @@ +--- wvstreams-3.70/src/crypto/wvcrypto.cc 2003-01-03 12:51:22.000000000 -0500 ++++ wvstreams-3.70/src/crypto/wvcrypto.cc 2003-01-03 12:51:51.000000000 -0500 +@@ -146,7 +146,8 @@ + int bufsize = ((hexbytes < 2048) ? 2048 : hexbytes) + 16; + //int bufsize = hexbytes/2; + +- unsigned char *keybuf = new unsigned char[bufsize], *bufp; ++ unsigned char *keybuf = new unsigned char[bufsize]; ++ const unsigned char *bufp; + char *keystr; + RSA *rp; + |