diff options
author | Dror Levin <spatz@gentoo.org> | 2010-06-04 12:54:18 +0000 |
---|---|---|
committer | Dror Levin <spatz@gentoo.org> | 2010-06-04 12:54:18 +0000 |
commit | a1145be0ee335e399a1b9da29b70e557446f44fa (patch) | |
tree | 17a05118e80575d1928f889a3046f565c230662e /net-libs/wvstreams | |
parent | old (diff) | |
download | historical-a1145be0ee335e399a1b9da29b70e557446f44fa.tar.gz historical-a1145be0ee335e399a1b9da29b70e557446f44fa.tar.bz2 historical-a1145be0ee335e399a1b9da29b70e557446f44fa.zip |
Add patch for compatibility with openssl-1.0.0, bug 304283. Thanks to Hanno Boeck.
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'net-libs/wvstreams')
-rw-r--r-- | net-libs/wvstreams/ChangeLog | 9 | ||||
-rw-r--r-- | net-libs/wvstreams/Manifest | 16 | ||||
-rw-r--r-- | net-libs/wvstreams/files/wvstreams-4.6.1-openssl-1.0.0.patch | 14 | ||||
-rw-r--r-- | net-libs/wvstreams/wvstreams-4.6.1-r1.ebuild | 90 |
4 files changed, 123 insertions, 6 deletions
diff --git a/net-libs/wvstreams/ChangeLog b/net-libs/wvstreams/ChangeLog index c557eefe5761..c773470b79fc 100644 --- a/net-libs/wvstreams/ChangeLog +++ b/net-libs/wvstreams/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-libs/wvstreams # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/ChangeLog,v 1.132 2010/05/31 19:34:46 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/ChangeLog,v 1.133 2010/06/04 12:54:18 spatz Exp $ + +*wvstreams-4.6.1-r1 (04 Jun 2010) + + 04 Jun 2010; Dror Levin <spatz@gentoo.org> +wvstreams-4.6.1-r1.ebuild, + +files/wvstreams-4.6.1-openssl-1.0.0.patch: + Add patch for compatibility with openssl-1.0.0, bug 304283. Thanks to + Hanno Boeck. 31 May 2010; Markus Meier <maekke@gentoo.org> wvstreams-4.6.1.ebuild: x86 stable, bug #321637 diff --git a/net-libs/wvstreams/Manifest b/net-libs/wvstreams/Manifest index 0fa8cc64f494..a6c7a0c37343 100644 --- a/net-libs/wvstreams/Manifest +++ b/net-libs/wvstreams/Manifest @@ -1,5 +1,5 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA512 AUX wvstreams-4.4-MOC-fix.patch 488 RMD160 aae0965e0b0dd7767c1183daf3005074089791be SHA1 2a9ea9c18329f6494c981cbc176e09a6e7b1b3ec SHA256 38127fc658a2b8342f1241fe3a8c775bb7a5e866a8b00bb89ad96778d6c187d0 AUX wvstreams-4.4-as-needed.patch 2127 RMD160 2e577dbdc8019858392e5f671cf5adbbba4114e1 SHA1 7c93cbb9462175d44257e6152baf0c83cca2dc2f SHA256 05484ded8bf9f46cc1a5217a41f3b99de549375f83003da67036b1014512f441 @@ -22,19 +22,25 @@ AUX wvstreams-4.5-no_sarestorer.patch 642 RMD160 96b677c8a8cd930f80f6a235bf9e209 AUX wvstreams-4.5-parallel-make.patch 2168 RMD160 ac2362b49f536c2e3d9ca5e8973886afe359040e SHA1 c249e7b9b48e7f92c5f9c51b6d268933e7475308 SHA256 7be478e1c35a1bca912966f7f77485f571d04395098950ce3eaf13c9ff8e65fa AUX wvstreams-4.5-qt-fixup.patch 824 RMD160 f8fd56ab82198660af76d85419fedbb52b5fae67 SHA1 ad0472b4bf2973d1fcbcdd3f32295e08d3ba769c SHA256 20059308afe2e4ad501b6f4f575f9d3bd8b42c6fe357d755c4f9815632665c6c AUX wvstreams-4.5-valgrind-optional.patch 1263 RMD160 d40fe9430e5692c9955488b73b3c3019191b6911 SHA1 fb3f08c3122c5a5efa2921da6706812a99731ac0 SHA256 ffac9d6172556280d764e5d3491fb3d7081a60aa9532b2c5eb5f324bae1028dd +AUX wvstreams-4.6.1-openssl-1.0.0.patch 470 RMD160 360e22417bb45eba87eade0c475464b36c026c38 SHA1 0bbbc7ca86181edab61152fa31675bdc906d3c51 SHA256 992a3ae041e0c859991ca0325590dc6e498214eadcc56395956dd23f6bdbd098 AUX wvstreams-4.6.1-parallel-make.patch 2236 RMD160 fc1082804587b0f392e4cc358fb56d0a4aba2801 SHA1 3c57a5a237059616fcc1cc76b6f08a35a39dc019 SHA256 aaefbb5aa45a7f377b91a11671d25cfe62856a5c801271b1be783eccc1acd7a0 DIST wvstreams-4.4.tar.gz 1296853 RMD160 82ad9584d586895612f42dcb1709edb8a7fcb6a6 SHA1 8a7ec82c0c4002bec16ec521747a689fb50d8f27 SHA256 c478eb0755b383baebe66e55135257eebbdb113e194946a40be0c765e14fb4d6 DIST wvstreams-4.5.tar.gz 1076353 RMD160 615a17b95f09a10f315daf01639179bcfdc0f5c6 SHA1 237bda88c417432be52b7a792065a35beb5f671c SHA256 fb67df069c647420908da62697587e115a27a2a760d5710e1e40494c21902268 DIST wvstreams-4.6.1.tar.gz 1118456 RMD160 55550608ccfa53c7daf0ee195466f077b3540acb SHA1 1431efc3f46a13b6a8dbcad4123e19473369f767 SHA256 8403f5fbf83aa9ac0c6ce15d97fd85607488152aa84e007b7d0621b8ebc07633 EBUILD wvstreams-4.4.ebuild 2557 RMD160 6203577d394b0b2cd1c95a9f04b84b3e77580b80 SHA1 42f018d46b0d155e4baca92b2472ac3980d0b420 SHA256 38cf855242998ffc4540efd6696c5aad7184c9d4b1aa130f40210dec478243d5 EBUILD wvstreams-4.5.ebuild 2601 RMD160 eee9439f106086dc798ff32cd922ef02ca5f9e12 SHA1 286de4d4737645c32aa43637ec5c738c895149a1 SHA256 f52a9d989886243614c0e09e501233ddfd42569b2b1cd6a97d3ed09a567bcac2 +EBUILD wvstreams-4.6.1-r1.ebuild 2130 RMD160 46aa4200e5aab02ae4456c9a236f12f52446a000 SHA1 6d6e416e62875230206b6d0e199e2ceadf58e759 SHA256 67d6a174ce3f36bd8b2345773798125f06a877715c85c5af83b1bb2e540fb13f EBUILD wvstreams-4.6.1.ebuild 2083 RMD160 905054653f61ce4b94b7197b0cee9acf87df7dd7 SHA1 331052743ea46d90ceb2efcc3ab566445987bb8a SHA256 74437d3f04e534ca8069ceff6b64e99bbc448676e3cbffaa804518d0be770a4f -MISC ChangeLog 23790 RMD160 3f07747b870a1816bcf8ed02c25987146b5e8d26 SHA1 4b5a39bccd3a6b3c50a1899f5b3cb5b010d2c50c SHA256 8b901be9da0d970c7a43a64fe85161466430ecc1e5e8b7ce933fe83efe4a2e27 +MISC ChangeLog 24031 RMD160 1822f09d9715b22de739b6eb2da52b346277776e SHA1 594a096118d727aa5bad9c2218533c41c3a9dad3 SHA256 9d73536a452d7dafb0e4f9af0322e56dba4d591864728b0ee9b95da57df4ea9a MISC metadata.xml 228 RMD160 62154bc737c6b25b3d4d0b938cb62a241c83ad15 SHA1 0bb4f84f2396dc72009f54c9efdadf50e203ae8e SHA256 98b56a813b3de314223d7193a3a055e191c9647a2f6887bf8dc7b05f8d0ec610 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.15 (GNU/Linux) -iEYEARECAAYFAkwEDvoACgkQkKaRLQcq0GLafACfbKnbKGEYyf6MjzKZ0ZJH81a2 -URYAoKSSyVnfKVfQkqoRNc7ARohHo31c -=wO6W +iQEcBAEBCgAGBQJMCPeCAAoJEAWF714uGAc6pG4H/jDLO/NDSiDKku/fj8w5bIi3 +r43V2qBWzmLWzl+huzvqRLvH+MhYpO4zwWp4f0peUD3hq/Yg+kAC+tsBkIkFtQp2 +tZ1u1zkpd/3O2wdwdB5lkvDYG4ZeThlyvQrE8UOn1ZgXN6orERJqps0fcMVZZsAV +hBoHQNqCO+H6Cxb+7p4TaU5QCXkoPZr5P9Xo+BHVWdgF21onurKVBd1ubDs83CT2 +0d+OKi5P6Xv1byunb5XdW01coEfKHq4cX2P9xbPHJbN8xVwm6BqpEtqNTNh3c6IL +mzFoLKXyTKJhdvZ0hdky17GKRFS3IauHM6KSG03NuBjud9WRcA5cLQwlODKnSNU= +=Voih -----END PGP SIGNATURE----- diff --git a/net-libs/wvstreams/files/wvstreams-4.6.1-openssl-1.0.0.patch b/net-libs/wvstreams/files/wvstreams-4.6.1-openssl-1.0.0.patch new file mode 100644 index 000000000000..6c32f0678ad8 --- /dev/null +++ b/net-libs/wvstreams/files/wvstreams-4.6.1-openssl-1.0.0.patch @@ -0,0 +1,14 @@ +--- wvstreams-4.6.1/crypto/wvx509.cc 2008-10-23 22:23:49.000000000 +0200 ++++ wvstreams-4.6.1-1/crypto/wvx509.cc 2010-01-27 11:09:06.000000000 +0100 +@@ -1157,7 +1157,11 @@ + + if (ext) + { ++#if OPENSSL_VERSION_NUMBER >= 0x10000000L ++ const X509V3_EXT_METHOD *method = X509V3_EXT_get(ext); ++#else + X509V3_EXT_METHOD *method = X509V3_EXT_get(ext); ++#endif + if (!method) + { + WvDynBuf buf; diff --git a/net-libs/wvstreams/wvstreams-4.6.1-r1.ebuild b/net-libs/wvstreams/wvstreams-4.6.1-r1.ebuild new file mode 100644 index 000000000000..4f4d21489663 --- /dev/null +++ b/net-libs/wvstreams/wvstreams-4.6.1-r1.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/wvstreams-4.6.1-r1.ebuild,v 1.1 2010/06/04 12:54:18 spatz Exp $ + +EAPI=2 +inherit autotools toolchain-funcs versionator + +DESCRIPTION="A network programming library in C++" +HOMEPAGE="http://alumnit.ca/wiki/?WvStreams" +SRC_URI="http://wvstreams.googlecode.com/files/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86" +IUSE="pam doc +ssl +dbus debug" + +#Tests fail if openssl is not compiled with -DPURIFY. Gentoo's isn't. FAIL! +RESTRICT="test" + +#QA Fail: xplc is compiled as a part of wvstreams. +#It'll take a larger patching effort to get it extracted, since upstream integrated it +#more tightly this time. Probably for the better since upstream xplc seems dead. + +RDEPEND="sys-libs/readline + sys-libs/zlib + dbus? ( >=sys-apps/dbus-1.2.14 ) + dev-libs/openssl + pam? ( sys-libs/pam ) + virtual/c++-tr1-functional" +DEPEND="${RDEPEND} + dev-util/pkgconfig + doc? ( app-doc/doxygen )" + +pkg_setup() { + if has_version '>=sys-devel/gcc-4.1' && ! has_version '>=dev-libs/boost-1.34.1' + then + if ! version_is_at_least 4.1 "$(gcc-fullversion)" + then + eerror "This package requires the active gcc to be at least version 4.1" + eerror "or >=dev-libs/boost-1.34.1 must be installed." + die "Please activate >=sys-devel/gcc-4.1 with gcc-config." + fi + fi +} + +src_prepare() { + epatch "${FILESDIR}"/${P}-parallel-make.patch \ + "${FILESDIR}"/${P}-openssl-1.0.0.patch + eautoreconf + cd argp + eautoreconf +} + +src_configure() { + export CXX="$(tc-getCXX)" + + econf \ + $(use_enable debug) \ + --disable-optimization \ + $(use_with dbus) \ + --with-openssl \ + $(use_with pam) \ + --without-tcl \ + --without-qt \ + --with-zlib \ + --without-valgrind +} + +src_compile() { + emake || die + + if use doc; then + doxygen || die + fi +} + +src_test() { + emake test || die +} + +src_install() { + emake DESTDIR="${D}" install || die + dodoc ChangeLog README* + + if use doc; then + #the list of files is too big for dohtml -r Docs/doxy-html/* + cd Docs/doxy-html + dohtml -r * + fi +} |