dev-libs/botan: version bump

Package-Manager: portage-2.3.0

3 files changed, 3 insertions, 34 deletions

diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest
index 6a0114f8ddb8..b12002e7ccca 100644
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@@ -1,4 +1,4 @@
 DIST Botan-1.10.12.tgz 2707397 SHA256 affc3a79919577943f896e64d3e4a4dcc4970c5bf80cc98c7f3a3144745eac27 SHA512 074ed9c89d715ada53a3366139da3f0f2fd7ee01941d301b0a9c1a897927ed88c0ade32f66768091664e6b652b7921b3b4c513106ee6ce1942dece3a25216bf5 WHIRLPOOL bfe7029e5ebf660434b14cd49e0c9f4612e9ee88ad50803edfa589754bede01dc39d71542b62eaaa0f7e85dbf623b4b11a90528bcb903c2333103685ce91401f
 DIST Botan-1.10.13.tgz 2710181 SHA256 23ec973d4b4a4fe04f490d409e08ac5638afe3aa09acd7f520daaff38ba19b90 SHA512 a09d2cb5dda21bf384b81675025f249abdfe232c95dc3383f0baebc2bf1603b2ed1e2aec9a81aae95df592ec2eeae8906c63474a6da42ad3701669a5d8f14656 WHIRLPOOL 4161d689205f02ed8b97bb371be47829d11dee744a024e24bb834264cfa6143c8a9fb7df969410975e4bf2b708063e3c05b6106c4dbe7f5566e3331ee5e901a9
 DIST Botan-1.11.29.tgz 3137027 SHA256 e604eca7f0a733f6ef23ddd9209d82589728a4befd48dff3532740130ebaeb94 SHA512 c6ad6cf3d68c3524b9532e9f52e74d89cc2abfd093f1a46a44efa94a87b0fa50278f11dc5953225160d090cf8ae1c372f54c23b5dffd1f3dae79e210195cfd72 WHIRLPOOL f97f0a013c5ed3c7ec7403b8ae584b7396b91a8fcf9181d7e53f17cbd172301c1c228378e58d851fd591f2be9584b18e3eba05e5c5709750a3cf6cc6538f1bc7
-DIST Botan-1.11.32.tgz 4036606 SHA256 b6b579a08adc4005f7d026120152460e8d4c8656293f7760d38c29b33d7e9c2c SHA512 c9ceff4d4d73c8de2198ac94cd5d585280bc17349f97a9007ba878e8682e7650a598962d68a61ed2e87174c0880b6d162e47744ff6df3e4e110b625672f93f1e WHIRLPOOL c932be4335dfa298ca7379bc00899ea4fc61b5fc2265712e0057b544c9ed4eb5e3f81f9f29e229a2929f292af4568f563579dd270b9764555654d45d57a3b713
+DIST Botan-1.11.33.tgz 4329671 SHA256 d65f95399dc5710aea90d682d65e554fed4571115f1382416e9142370a47e949 SHA512 49bb4485663897dd07bb7982771befacc50bfabef5806dc802cbd4d39f5d641b08a264824b5b1b96421e810811353deea15e728c5d08ce2932cf0e4602ae099d WHIRLPOOL 86154158915e29eef7753797df037d560078bda4ecfaafffba1064a238618b1ec10e0712b85cd64537ca3dfbac5ce38bf1323456d30b2bd5a51c0dae7f81d339
diff --git a/dev-libs/botan/botan-1.11.32.ebuild b/dev-libs/botan/botan-1.11.33.ebuild
index 4e0c2eb76735..0b974916e136 100644
--- a/dev-libs/botan/botan-1.11.32.ebuild
+++ b/dev-libs/botan/botan-1.11.33.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://botan.randombit.net/releases/${MY_P}.tgz"
 KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos"
 SLOT="0"
 LICENSE="BSD"
-IUSE="bindist doc boost python bzip2 libressl lzma sqlite ssl static-libs zlib test"
+IUSE="bindist doc boost python bzip2 libressl lzma sqlite ssl static-libs zlib"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -32,13 +32,8 @@ RDEPEND="bzip2? ( >=app-arch/bzip2-1.0.5 )
 		libressl? ( dev-libs/libressl )
 	)"
 DEPEND="${RDEPEND}
-	test? ( app-misc/datefudge )
 	doc? ( dev-python/sphinx )"
 
-PATCHES=(
-	"${FILESDIR}/${P}-urandom.patch"
-)
-
 pkg_pretend() {
 	# Botan 1.11 requires -std=c++11
 	if [[ ${MERGE_TYPE} != binary ]]; then
@@ -114,7 +109,7 @@ src_compile() {
 }
 
 src_test() {
-	LD_LIBRARY_PATH="${S}" datefudge "2016-10-01 00:00" ./botan-test || die "Validation tests failed"
+	LD_LIBRARY_PATH="${S}" ./botan-test || die "Validation tests failed"
 }
 
 src_install() {
diff --git a/dev-libs/botan/files/botan-1.11.32-urandom.patch b/dev-libs/botan/files/botan-1.11.32-urandom.patch
deleted file mode 100644
index 6a4c53f79c12..000000000000
--- a/dev-libs/botan/files/botan-1.11.32-urandom.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/src/lib/rng/system_rng/system_rng.cpp b/src/lib/rng/system_rng/system_rng.cpp
-index 135f4fa..3b44d5a 100644
---- a/src/lib/rng/system_rng/system_rng.cpp
-+++ b/src/lib/rng/system_rng/system_rng.cpp
-@@ -74,7 +74,7 @@ System_RNG_Impl::System_RNG_Impl()
-   #define O_NOCTTY 0
- #endif
- 
--   m_fd = ::open(BOTAN_SYSTEM_RNG_DEVICE, O_RDWR | O_NOCTTY);
-+   m_fd = ::open(BOTAN_SYSTEM_RNG_DEVICE, O_RDONLY | O_NOCTTY);
-    if(m_fd < 0)
-       throw Exception("System_RNG failed to open RNG device");
- #endif
-diff --git a/src/tests/test_ffi.cpp b/src/tests/test_ffi.cpp
-index d481116..5b9f5fd 100644
---- a/src/tests/test_ffi.cpp
-+++ b/src/tests/test_ffi.cpp
-@@ -74,7 +74,7 @@ class FFI_Unit_Tests : public Test
-          if(TEST_FFI_OK(botan_rng_init, (&rng, "system")))
-             {
-             TEST_FFI_OK(botan_rng_get, (rng, outbuf.data(), outbuf.size()));
--            TEST_FFI_OK(botan_rng_reseed, (rng, 256));
-+            //TEST_FFI_OK(botan_rng_reseed, (rng, 256));
-             TEST_FFI_OK(botan_rng_destroy, (rng));
-             }
-