Hello community, here is the log from the commit of package wvstreams for openSUSE:Factory checked in at Tue Jun 16 18:26:09 CEST 2009. -------- --- wvstreams/wvstreams.changes 2008-01-28 15:39:37.000000000 +0100 +++ /mounts/work_src_done/STABLE/wvstreams/wvstreams.changes 2009-06-16 11:24:42.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Jun 16 11:24:10 CEST 2009 - coolo@novell.com + +- remove unapplied patch +- fix build with glibc 2.10 +- rediff to avoid fuzz + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- wvstreams-const.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wvstreams.spec ++++++ --- /var/tmp/diff_new_pack.CE5955/_old 2009-06-16 18:25:58.000000000 +0200 +++ /var/tmp/diff_new_pack.CE5955/_new 2009-06-16 18:25:58.000000000 +0200 @@ -1,27 +1,34 @@ # # spec file for package wvstreams (Version 4.4.1) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild + Name: wvstreams Url: http://alumnit.ca/wiki/?WvStreams BuildRequires: db-devel gcc-c++ openssl-devel pam-devel pkgconfig zlib-devel License: LGPL v2.1 or later Version: 4.4.1 -Release: 5 +Release: 60 Summary: Network Programming Library in C++ Source0: http://open.nit.ca/download/%{name}-%{version}.tar.bz2 Patch0: set-empty.diff Patch1: sentinel.diff Patch2: 73045.diff -Patch3: wvstreams-const.diff Patch4: wvcrash.diff Patch5: wvstreams-wvmodem-iotcl.patch Patch8: wvstreams-gcc43.patch @@ -40,6 +47,7 @@ Net Integration Technologies, Inc. %package devel +License: LGPL v2.1 or later Summary: Network Programming Library in C++ Group: Development/Libraries/Other Requires: wvstreams = %{version} @@ -60,7 +68,6 @@ %patch0 %patch1 %patch2 -#%patch3 %patch4 %patch5 %patch8 @@ -106,6 +113,10 @@ %{_libdir}/*.so %changelog +* Tue Jun 16 2009 coolo@novell.com +- remove unapplied patch +- fix build with glibc 2.10 +- rediff to avoid fuzz * Mon Jan 28 2008 schwab@suse.de - Fix use of sigaction. * Wed Jan 16 2008 hvogel@suse.de @@ -129,7 +140,7 @@ - clean up tarball - some bugfixes - fix build with current gcc -* Thu Jun 15 2006 dmueller@suse.de +* Wed Jun 14 2006 dmueller@suse.de - build parallel * Wed May 03 2006 kukuk@suse.de - Fix compiling on some architectures ++++++ 73045.diff ++++++ --- /var/tmp/diff_new_pack.CE5955/_old 2009-06-16 18:25:58.000000000 +0200 +++ /var/tmp/diff_new_pack.CE5955/_new 2009-06-16 18:25:58.000000000 +0200 @@ -1,7 +1,9 @@ ---- ./include/wvscatterhash.h.orig 2005-03-17 13:05:56.000000000 +0000 -+++ ./include/wvscatterhash.h 2005-03-17 13:21:09.000000000 +0000 -@@ -148,7 +151,10 @@ - { _add((void *)data, hash(data), auto_free); } +Index: include/wvscatterhash.h +=================================================================== +--- include/wvscatterhash.h.orig ++++ include/wvscatterhash.h +@@ -151,7 +151,10 @@ public: + { _add((void *)data, hash(data), autofree); } void remove(const T *data) - { _remove(Accessor::get_key(data), hash(data)); } @@ -10,5 +12,5 @@ + _remove(data, hash(data)); + } - void set_autofree(const T *data, bool auto_free) - { _set_autofree(Accessor::get_key(data), hash(data), auto_free); } + void set_autofree(const K &key, bool autofree) + { ++++++ sentinel.diff ++++++ --- /var/tmp/diff_new_pack.CE5955/_old 2009-06-16 18:25:58.000000000 +0200 +++ /var/tmp/diff_new_pack.CE5955/_new 2009-06-16 18:25:58.000000000 +0200 @@ -1,6 +1,8 @@ ---- ./utils/wvcrash.cc.orig 2005-01-19 14:33:14.242433515 +0000 -+++ ./utils/wvcrash.cc 2005-01-19 14:33:43.090377452 +0000 -@@ -125,12 +125,12 @@ +Index: utils/wvcrash.cc +=================================================================== +--- utils/wvcrash.cc.orig ++++ utils/wvcrash.cc +@@ -343,12 +343,12 @@ void wvcrash(int sig) dup2(fds[0], 0); // make stdin read from pipe fcntl(0, F_SETFD, 0); ++++++ set-empty.diff ++++++ --- /var/tmp/diff_new_pack.CE5955/_old 2009-06-16 18:25:58.000000000 +0200 +++ /var/tmp/diff_new_pack.CE5955/_new 2009-06-16 18:25:58.000000000 +0200 @@ -1,6 +1,8 @@ ---- configfile/cfgsection.cc +Index: configfile/cfgsection.cc +=================================================================== +--- configfile/cfgsection.cc.orig +++ configfile/cfgsection.cc -@@ -50,14 +50,7 @@ +@@ -50,14 +50,7 @@ void WvConfigSection::set(WvStringParm e trim_string(clean_entry.edit()); WvConfigEntry *e = (*this)[clean_entry]; ++++++ wvcrash.diff ++++++ --- /var/tmp/diff_new_pack.CE5955/_old 2009-06-16 18:25:58.000000000 +0200 +++ /var/tmp/diff_new_pack.CE5955/_new 2009-06-16 18:25:58.000000000 +0200 @@ -1,4 +1,6 @@ ---- utils/wvcrash.cc +Index: utils/wvcrash.cc +=================================================================== +--- utils/wvcrash.cc.orig +++ utils/wvcrash.cc @@ -388,7 +388,6 @@ void wvcrash_add_signal(int sig) act.sa_handler = wvcrash; ++++++ wvstreams-gcc43.patch ++++++ --- /var/tmp/diff_new_pack.CE5955/_old 2009-06-16 18:25:59.000000000 +0200 +++ /var/tmp/diff_new_pack.CE5955/_new 2009-06-16 18:25:59.000000000 +0200 @@ -1,6 +1,8 @@ ---- include/wvserialize.h 2007-11-12 17:33:01.175464000 +0100 -+++ include/wvserialize.h 2007-11-12 18:01:36.917730000 +0100 -@@ -348,8 +348,8 @@ +Index: include/wvserialize.h +=================================================================== +--- include/wvserialize.h.orig ++++ include/wvserialize.h +@@ -348,8 +348,8 @@ template <> * (zero) character. Serialized WvStrings are guaranteed not to contain nul * except as the last character. */ @@ -11,7 +13,9 @@ /** Deserialize a WvBuf. */ ---- include/uniconfkey.h +Index: include/uniconfkey.h +=================================================================== +--- include/uniconfkey.h.orig +++ include/uniconfkey.h @@ -9,7 +9,7 @@ @@ -22,3 +26,60 @@ // The Python headers try to #define ANY as void. If we're building Python // wrappers, get rid of that. +Index: utils/strutils.cc +=================================================================== +--- utils/strutils.cc.orig ++++ utils/strutils.cc +@@ -305,7 +305,7 @@ WvString web_unescape(const char *str, b + { + const char *iptr; + char *optr; +- char *idx1, *idx2; ++ const char *idx1, *idx2; + static const char hex[] = "0123456789ABCDEF"; + WvString in, intmp(str), out; + +@@ -952,7 +952,7 @@ WvString afterstr(WvStringParm line, WvS + if (!line || !a) + return WvString::null; + +- char *loc = strstr(line, a); ++ const char *loc = strstr(line, a); + if (loc == 0) + return ""; + +@@ -970,7 +970,7 @@ WvString beforestr(WvStringParm line, Wv + + WvString ret = line; + ret.unique(); +- char *loc = strstr(ret, a); ++ char *loc = (char*)strstr(ret, a); + + if (loc == 0) + return line; +Index: utils/verstring.cc +=================================================================== +--- utils/verstring.cc.orig ++++ utils/verstring.cc +@@ -147,7 +147,7 @@ bool is_new_ver(unsigned int ver) + + bool is_new_verstr(const char *str) + { +- char *p = strchr(str, '.'); ++ const char *p = strchr(str, '.'); + if (p && strchr(p+1, '.')) + return true; + +Index: ipstreams/wvaddr.cc +=================================================================== +--- ipstreams/wvaddr.cc.orig ++++ ipstreams/wvaddr.cc +@@ -537,7 +537,7 @@ WvIPNet::WvIPNet(const WvIPNet &_net) + // 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; + ++++++ wvstreams-wvmodem-iotcl.patch ++++++ --- /var/tmp/diff_new_pack.CE5955/_old 2009-06-16 18:25:59.000000000 +0200 +++ /var/tmp/diff_new_pack.CE5955/_new 2009-06-16 18:25:59.000000000 +0200 @@ -1,6 +1,8 @@ ---- streams/wvmodem.cc +Index: streams/wvmodem.cc +=================================================================== +--- streams/wvmodem.cc.orig +++ streams/wvmodem.cc -@@ -205,7 +205,7 @@ +@@ -207,7 +207,7 @@ void WvModem::setup_modem(bool rtscts) sinfo.closing_wait = ASYNC_CLOSING_WAIT_NONE; sinfo.closing_wait2 = ASYNC_CLOSING_WAIT_NONE; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org