From 2e772bb961a72a798f90c147a85a55443ba6bca6 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Jun 28 2007 11:28:56 +0000 Subject: - version 4.3 --- diff --git a/.cvsignore b/.cvsignore index d4a063a..e26f0af 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -wvstreams-4.2.2.tar.gz +wvstreams-4.3.tar.gz diff --git a/libwvstreams-4.2.1-gcc41.patch b/libwvstreams-4.2.1-gcc41.patch deleted file mode 100644 index b4ac653..0000000 --- a/libwvstreams-4.2.1-gcc41.patch +++ /dev/null @@ -1,93 +0,0 @@ ---- wvstreams-4.2.2/utils/wvhash.cc.gcc41 2006-01-10 00:03:20.000000000 +0100 -+++ wvstreams-4.2.2/utils/wvhash.cc 2006-05-24 12:38:01.000000000 +0200 -@@ -2,7 +2,7 @@ - - // Note: this hash function is case-insensitive since it ignores the - // bit in ASCII that defines case. You may want to take advantage of this. --unsigned WvHash(const char *s) -+unsigned int WvHash(const char *s) - { - unsigned hash = 0, slide, andval; - if (!s) return 0; ---- wvstreams-4.2.2/include/wvstring.h.gcc41 2005-11-24 20:46:46.000000000 +0100 -+++ wvstreams-4.2.2/include/wvstring.h 2006-05-24 12:36:49.000000000 +0200 -@@ -393,7 +393,7 @@ - - protected: - void copy_constructor(const WvFastString &s); -- inline void WvString::construct(const char *_str) -+ inline void construct(const char *_str) - { - link(&nullbuf, _str); - ---- wvstreams-4.2.2/include/wvhttppool.h.gcc41 2005-11-24 20:46:46.000000000 +0100 -+++ wvstreams-4.2.2/include/wvhttppool.h 2006-05-24 12:36:49.000000000 +0200 -@@ -57,7 +57,7 @@ - WvString linkname; - WvUrl url; - -- WvUrlLink::WvUrlLink(WvStringParm _linkname, WvStringParm _url) -+ WvUrlLink(WvStringParm _linkname, WvStringParm _url) - : linkname(_linkname), url(_url) - {} - }; ---- wvstreams-4.2.2/include/uniconfkey.h.gcc41 2005-11-24 20:46:46.000000000 +0100 -+++ wvstreams-4.2.2/include/uniconfkey.h 2006-05-24 12:36:49.000000000 +0200 -@@ -113,7 +113,7 @@ - bool iswild() const; - - /** Returns true if the key has a trailing slash. */ -- bool UniConfKey::hastrailingslash() const; -+ bool hastrailingslash() const; - - /** - * Returns the number of segments in this path. ---- wvstreams-4.2.2/include/wvx509.h.gcc41 2006-01-09 22:42:53.000000000 +0100 -+++ wvstreams-4.2.2/include/wvx509.h 2006-05-24 12:36:49.000000000 +0200 -@@ -349,19 +349,19 @@ - * Set the Certificate to use X509v3, since that's all modern - * PKI uses anyways :) - */ -- void WvX509Mgr::set_version(); -+ void set_version(); - - /** - * Get and set the keyUsage field. - */ -- WvString WvX509Mgr::get_key_usage(); -- void WvX509Mgr::set_key_usage(WvStringParm values); -+ WvString get_key_usage(); -+ void set_key_usage(WvStringParm values); - - /** - * Get and set the extendedKeyUsage field. - */ -- WvString WvX509Mgr::get_ext_key_usage(); -- void WvX509Mgr::set_ext_key_usage(WvStringParm values); -+ WvString get_ext_key_usage(); -+ void set_ext_key_usage(WvStringParm values); - - /** - * Return the Subject alt name if it exists, and WvString::null if ---- wvstreams-4.2.2/gnulib/argp.h.gcc41 2005-11-24 20:46:38.000000000 +0100 -+++ wvstreams-4.2.2/gnulib/argp.h 2006-05-24 12:36:49.000000000 +0200 -@@ -505,7 +505,7 @@ - unsigned int __flags); - - /* Possibly output the standard usage message for ARGP to stderr and exit. */ --extern void argp_usage (__const struct argp_state *__state); -+extern void __NTH(argp_usage (__const struct argp_state *__state)); - extern void __argp_usage (__const struct argp_state *__state); - - /* If appropriate, print the printf string FMT and following args, preceded ---- wvstreams-4.2.2/include/wvvector.h.gcc5 2007-01-24 16:10:50.000000000 +0100 -+++ wvstreams-4.2.2/include/wvvector.h 2007-01-24 16:14:47.000000000 +0100 -@@ -347,7 +347,7 @@ - } - - /** A simple iterator that walks through all elements in the list. */ -- class Iter : public WvVector::IterBase -+ class Iter : public WvVectorBase::IterBase - { - public: - /** Binds the iterator to the specified vector. */ diff --git a/libwvstreams-4.3-gcc41.patch b/libwvstreams-4.3-gcc41.patch new file mode 100644 index 0000000..32cabd7 --- /dev/null +++ b/libwvstreams-4.3-gcc41.patch @@ -0,0 +1,12 @@ +--- wvstreams-4.2.2/gnulib/argp.h.gcc41 2005-11-24 20:46:38.000000000 +0100 ++++ wvstreams-4.2.2/gnulib/argp.h 2006-05-24 12:36:49.000000000 +0200 +@@ -505,7 +505,7 @@ + unsigned int __flags); + + /* Possibly output the standard usage message for ARGP to stderr and exit. */ +-extern void argp_usage (__const struct argp_state *__state); ++extern void __NTH(argp_usage (__const struct argp_state *__state)); + extern void __argp_usage (__const struct argp_state *__state); + + /* If appropriate, print the printf string FMT and following args, preceded + diff --git a/libwvstreams.spec b/libwvstreams.spec index a5b968b..a664861 100644 --- a/libwvstreams.spec +++ b/libwvstreams.spec @@ -1,16 +1,16 @@ Name: libwvstreams -Version: 4.2.2 -Release: 4%{?dist} +Version: 4.3 +Release: 1%{?dist} Summary: WvStreams is a network programming library written in C++ Source: http://open.nit.ca/download/wvstreams-%{version}.tar.gz Patch1: libwvstreams-3.70-gcc3.patch Patch2: wvstreams-4.2.1-lib64.patch -Patch3: libwvstreams-4.2.1-gcc41.patch +Patch3: libwvstreams-4.3-gcc41.patch Patch4: wvstreams-4.2.2-multilib.patch URL: http://open.nit.ca/wiki/?page=WvStreams Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: openssl-devel, pkgconfig, zlib-devel +BuildRequires: openssl-devel, pkgconfig, zlib-devel, readline-devel License: LGPL %description @@ -58,7 +58,7 @@ make COPTS="$RPM_OPT_FLAGS -fPIC -fpermissive" CXXOPTS="$RPM_OPT_FLAGS -fPIC -fp rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT chmod 755 $RPM_BUILD_ROOT%{_libdir}/*.so.* - +rm -fr $RPM_BUILD_ROOT/usr/bin pushd $RPM_BUILD_ROOT rm -f \ @@ -96,6 +96,9 @@ rm -rf $RPM_BUILD_ROOT %postun -p /sbin/ldconfig %changelog +* Thu Jun 28 2007 Harald Hoyer - 4.3-1 +- version 4.3 + * Wed Apr 18 2007 Harald Hoyer - 4.2.2-4 - specfile review diff --git a/sources b/sources index aa0d0f1..760c451 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -103230cb9926cb8f3f4d8dc8584f3b9c wvstreams-4.2.2.tar.gz +eb34544384c951fd14470d583273e02a wvstreams-4.3.tar.gz