| 1 |
commit: 3bc9bf8c1078e8427596f4a4022d769513094135 |
| 2 |
Author: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Oct 28 08:25:18 2016 +0000 |
| 4 |
Commit: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Oct 28 08:26:03 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3bc9bf8c |
| 7 |
|
| 8 |
dev-libs/botan: version bump |
| 9 |
|
| 10 |
Package-Manager: portage-2.3.0 |
| 11 |
|
| 12 |
dev-libs/botan/Manifest | 2 +- |
| 13 |
.../{botan-1.11.32.ebuild => botan-1.11.33.ebuild} | 9 ++------ |
| 14 |
dev-libs/botan/files/botan-1.11.32-urandom.patch | 26 ---------------------- |
| 15 |
3 files changed, 3 insertions(+), 34 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest |
| 18 |
index 6a0114f..b12002e 100644 |
| 19 |
--- a/dev-libs/botan/Manifest |
| 20 |
+++ b/dev-libs/botan/Manifest |
| 21 |
@@ -1,4 +1,4 @@ |
| 22 |
DIST Botan-1.10.12.tgz 2707397 SHA256 affc3a79919577943f896e64d3e4a4dcc4970c5bf80cc98c7f3a3144745eac27 SHA512 074ed9c89d715ada53a3366139da3f0f2fd7ee01941d301b0a9c1a897927ed88c0ade32f66768091664e6b652b7921b3b4c513106ee6ce1942dece3a25216bf5 WHIRLPOOL bfe7029e5ebf660434b14cd49e0c9f4612e9ee88ad50803edfa589754bede01dc39d71542b62eaaa0f7e85dbf623b4b11a90528bcb903c2333103685ce91401f |
| 23 |
DIST Botan-1.10.13.tgz 2710181 SHA256 23ec973d4b4a4fe04f490d409e08ac5638afe3aa09acd7f520daaff38ba19b90 SHA512 a09d2cb5dda21bf384b81675025f249abdfe232c95dc3383f0baebc2bf1603b2ed1e2aec9a81aae95df592ec2eeae8906c63474a6da42ad3701669a5d8f14656 WHIRLPOOL 4161d689205f02ed8b97bb371be47829d11dee744a024e24bb834264cfa6143c8a9fb7df969410975e4bf2b708063e3c05b6106c4dbe7f5566e3331ee5e901a9 |
| 24 |
DIST Botan-1.11.29.tgz 3137027 SHA256 e604eca7f0a733f6ef23ddd9209d82589728a4befd48dff3532740130ebaeb94 SHA512 c6ad6cf3d68c3524b9532e9f52e74d89cc2abfd093f1a46a44efa94a87b0fa50278f11dc5953225160d090cf8ae1c372f54c23b5dffd1f3dae79e210195cfd72 WHIRLPOOL f97f0a013c5ed3c7ec7403b8ae584b7396b91a8fcf9181d7e53f17cbd172301c1c228378e58d851fd591f2be9584b18e3eba05e5c5709750a3cf6cc6538f1bc7 |
| 25 |
-DIST Botan-1.11.32.tgz 4036606 SHA256 b6b579a08adc4005f7d026120152460e8d4c8656293f7760d38c29b33d7e9c2c SHA512 c9ceff4d4d73c8de2198ac94cd5d585280bc17349f97a9007ba878e8682e7650a598962d68a61ed2e87174c0880b6d162e47744ff6df3e4e110b625672f93f1e WHIRLPOOL c932be4335dfa298ca7379bc00899ea4fc61b5fc2265712e0057b544c9ed4eb5e3f81f9f29e229a2929f292af4568f563579dd270b9764555654d45d57a3b713 |
| 26 |
+DIST Botan-1.11.33.tgz 4329671 SHA256 d65f95399dc5710aea90d682d65e554fed4571115f1382416e9142370a47e949 SHA512 49bb4485663897dd07bb7982771befacc50bfabef5806dc802cbd4d39f5d641b08a264824b5b1b96421e810811353deea15e728c5d08ce2932cf0e4602ae099d WHIRLPOOL 86154158915e29eef7753797df037d560078bda4ecfaafffba1064a238618b1ec10e0712b85cd64537ca3dfbac5ce38bf1323456d30b2bd5a51c0dae7f81d339 |
| 27 |
|
| 28 |
diff --git a/dev-libs/botan/botan-1.11.32.ebuild b/dev-libs/botan/botan-1.11.33.ebuild |
| 29 |
similarity index 94% |
| 30 |
rename from dev-libs/botan/botan-1.11.32.ebuild |
| 31 |
rename to dev-libs/botan/botan-1.11.33.ebuild |
| 32 |
index 4e0c2eb..0b97491 100644 |
| 33 |
--- a/dev-libs/botan/botan-1.11.32.ebuild |
| 34 |
+++ b/dev-libs/botan/botan-1.11.33.ebuild |
| 35 |
@@ -16,7 +16,7 @@ SRC_URI="http://botan.randombit.net/releases/${MY_P}.tgz" |
| 36 |
KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos" |
| 37 |
SLOT="0" |
| 38 |
LICENSE="BSD" |
| 39 |
-IUSE="bindist doc boost python bzip2 libressl lzma sqlite ssl static-libs zlib test" |
| 40 |
+IUSE="bindist doc boost python bzip2 libressl lzma sqlite ssl static-libs zlib" |
| 41 |
|
| 42 |
S="${WORKDIR}/${MY_P}" |
| 43 |
|
| 44 |
@@ -32,13 +32,8 @@ RDEPEND="bzip2? ( >=app-arch/bzip2-1.0.5 ) |
| 45 |
libressl? ( dev-libs/libressl ) |
| 46 |
)" |
| 47 |
DEPEND="${RDEPEND} |
| 48 |
- test? ( app-misc/datefudge ) |
| 49 |
doc? ( dev-python/sphinx )" |
| 50 |
|
| 51 |
-PATCHES=( |
| 52 |
- "${FILESDIR}/${P}-urandom.patch" |
| 53 |
-) |
| 54 |
- |
| 55 |
pkg_pretend() { |
| 56 |
# Botan 1.11 requires -std=c++11 |
| 57 |
if [[ ${MERGE_TYPE} != binary ]]; then |
| 58 |
@@ -114,7 +109,7 @@ src_compile() { |
| 59 |
} |
| 60 |
|
| 61 |
src_test() { |
| 62 |
- LD_LIBRARY_PATH="${S}" datefudge "2016-10-01 00:00" ./botan-test || die "Validation tests failed" |
| 63 |
+ LD_LIBRARY_PATH="${S}" ./botan-test || die "Validation tests failed" |
| 64 |
} |
| 65 |
|
| 66 |
src_install() { |
| 67 |
|
| 68 |
diff --git a/dev-libs/botan/files/botan-1.11.32-urandom.patch b/dev-libs/botan/files/botan-1.11.32-urandom.patch |
| 69 |
deleted file mode 100644 |
| 70 |
index 6a4c53f..00000000 |
| 71 |
--- a/dev-libs/botan/files/botan-1.11.32-urandom.patch |
| 72 |
+++ /dev/null |
| 73 |
@@ -1,26 +0,0 @@ |
| 74 |
-diff --git a/src/lib/rng/system_rng/system_rng.cpp b/src/lib/rng/system_rng/system_rng.cpp |
| 75 |
-index 135f4fa..3b44d5a 100644 |
| 76 |
---- a/src/lib/rng/system_rng/system_rng.cpp |
| 77 |
-+++ b/src/lib/rng/system_rng/system_rng.cpp |
| 78 |
-@@ -74,7 +74,7 @@ System_RNG_Impl::System_RNG_Impl() |
| 79 |
- #define O_NOCTTY 0 |
| 80 |
- #endif |
| 81 |
- |
| 82 |
-- m_fd = ::open(BOTAN_SYSTEM_RNG_DEVICE, O_RDWR | O_NOCTTY); |
| 83 |
-+ m_fd = ::open(BOTAN_SYSTEM_RNG_DEVICE, O_RDONLY | O_NOCTTY); |
| 84 |
- if(m_fd < 0) |
| 85 |
- throw Exception("System_RNG failed to open RNG device"); |
| 86 |
- #endif |
| 87 |
-diff --git a/src/tests/test_ffi.cpp b/src/tests/test_ffi.cpp |
| 88 |
-index d481116..5b9f5fd 100644 |
| 89 |
---- a/src/tests/test_ffi.cpp |
| 90 |
-+++ b/src/tests/test_ffi.cpp |
| 91 |
-@@ -74,7 +74,7 @@ class FFI_Unit_Tests : public Test |
| 92 |
- if(TEST_FFI_OK(botan_rng_init, (&rng, "system"))) |
| 93 |
- { |
| 94 |
- TEST_FFI_OK(botan_rng_get, (rng, outbuf.data(), outbuf.size())); |
| 95 |
-- TEST_FFI_OK(botan_rng_reseed, (rng, 256)); |
| 96 |
-+ //TEST_FFI_OK(botan_rng_reseed, (rng, 256)); |
| 97 |
- TEST_FFI_OK(botan_rng_destroy, (rng)); |
| 98 |
- } |
| 99 |
- |
Archives