Version bump. Cleanup old. Proxy commit for Kristian Fiskerstrand. Fixes bug #509352 (CVE-2014-3207).

Package-Manager: portage-2.2.10/cvs/Linux x86_64

8 files changed, 21 insertions, 348 deletions

diff --git a/net-misc/sks/ChangeLog b/net-misc/sks/ChangeLog
index bbcf1e3d7bed..26fdf774c98f 100644
--- a/net-misc/sks/ChangeLog
+++ b/net-misc/sks/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-misc/sks
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/sks/ChangeLog,v 1.9 2013/12/13 09:29:03 patrick Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/sks/ChangeLog,v 1.10 2014/05/05 22:02:47 mrueg Exp $
+
+*sks-1.1.5 (05 May 2014)
+
+  05 May 2014; Manuel Rüger <mrueg@gentoo.org> +sks-1.1.5.ebuild,
+  -files/bdb_stubs-gentoo.patch, -files/sks-1.1.4-ECC_OID_fix_x86.patch,
+  -files/sks-1.1.4-man_url.patch, -sks-1.1.2.ebuild, -sks-1.1.4-r1.ebuild,
+  -sks-1.1.4.ebuild:
+  Version bump. Cleanup old. Proxy commit for Kristian Fiskerstrand. Fixes bug
+  #509352 (CVE-2014-3207).
 
   13 Dec 2013; Patrick Lauer <patrick@gentoo.org> sks-1.1.4-r1.ebuild:
   Whitespace
diff --git a/net-misc/sks/Manifest b/net-misc/sks/Manifest
index ad4550757837..bdaec496ecf3 100644
--- a/net-misc/sks/Manifest
+++ b/net-misc/sks/Manifest
@@ -1,15 +1,9 @@
-AUX bdb_stubs-gentoo.patch 2999 SHA256 a5a7449c272daa1d95adaa388b1d27d8bce11d3c2a47a5661cec0cf486021752 SHA512 a1131eac45fa1838f1922f56454539e4576d89a6610892aaf759c7d3ff1152041dd8dfbbd0c64414edea918193152f7ea447d3d045aa19cf83947a6295a55659 WHIRLPOOL 616c1cdb9dfffc5a59292994d9c988bd39534566ee484a99c3b9509f6facd37d80c3ab705a5c7d17904ed7fda934cdadb57348eb5caf5632896c8090fe97b14a
-AUX sks-1.1.4-ECC_OID_fix_x86.patch 1293 SHA256 417db295f748d113d8e886ad586a53e84209be58f3690d5665d9df5b98d03b60 SHA512 4c3f8760e550534aad752e70c3ac7c4f84977161b7aa57bd51b6aa2e21e5745e99abc77db436e11c3ee7a2ef4bc53bd379095a0c03cde6f7759a1170c460fcaa WHIRLPOOL fc33da246fc44bf2dfe5ce76d7215076eeb09b9643e6d1ad11b2145469c6b33e77602880ea2f4c2f623d8d73b7e82e81475eec6c3e6cdc7942fb7a3e92b5b879
-AUX sks-1.1.4-man_url.patch 340 SHA256 71a97aef49dbd3c27920c6ce3881f367daf0bfbdc6d80b2a1f46a710da50e8aa SHA512 8267906e9024e98c2c54f657d25f5e0020accf61ab4af09ee0acca64999c5a623d50cfb4c5da1db4de595a1e5c8733ea461d663bb6b8850895e765d889c1f8f7 WHIRLPOOL 88e79a7f8a5fe0f9dda0d002bfce4e0c9462be5429523a2aac47ec190c025372ac18770f37a18e43211660414d22cac1bb0eb46fd7f70be8c6852c9d9976a966
 AUX sks-db.initd 519 SHA256 947a04372252e9e21a020243a678d3f78ba9b6b5fffd8086f83592c772bed467 SHA512 157cdd1477d829acc7b983fbfea015528c16b88938f595cfb6a7bb7c27bf0be4f42d2a69def0e0ef38d618b23db56e241e2712c4eb9ebb837273693e05f2734f WHIRLPOOL 5b12f2434d0229e46b3e50176063df5d8b680f1cb1d003a39d1eb3d3950303b28ecea2e8f5907564a7dcf2c3d4275d7ea555f6530eebd0cac131160e1d573a1c
 AUX sks-db.service 174 SHA256 a6ae25f8f4b4ead48046ce31af89cbc0cd2fb7acc80d6ae241d301dc0059bce8 SHA512 bf90ca8a5c14ccdddb9bc0c4a7493fe10ce54ae8df7ba32773cc3f59d018f74afd3c5302794deb69186cdddbaadc82d7db8d0c3d8862f37862a3c8c104b2365e WHIRLPOOL e03a2329ed423e1d557ad9a37491285ca29f9f677ca05d4b8ae09c912b4a87958e12f70282e56d3c0350183702fafa0ba74b5019bb13d89ecf6e1ca336d22ad5
 AUX sks-recon.initd 582 SHA256 3fa7a70cf1246d755186227ff7ed3ce7c6161f30ea88764b578a92c2e3d28bc6 SHA512 4da1d6584579651f5df3b826e9dc2201663e124c16bfd63a4b7337403571b9843944494259a384ce4772ae00aa7ec2618fb8f802ad8514348b391cd13e3258e5 WHIRLPOOL deeab484b9c5d167ebe39ac08a1b61f6afa26eb3fb6c023fa3b294e5000096c9531864bcf7ade370a0528265963056684adacae0fbcaa6857e79eeed8620fc03
 AUX sks-recon.service 187 SHA256 bb68920796fb0fd22ccc433306b65ff988125884988bb3d5beb0449d7e30389d SHA512 45c2734c67fa55f12431a8f80256fc25c2645ad5d0ce148c389c1ac73550354efb65681bc4ac6f319149737759de3de5ea75bdd1f8e927ca76408599ea3dd4ef WHIRLPOOL b260bc4bc1091e96aed0d5e94e80574b3679449962b0dc4953e40a222cc050fc08751d33b64200de01af964b054ee65e15c4d52f7c45f8f01d80cd27e7d0df0a
 AUX sks.confd 87 SHA256 811498c2c964ee109dcbf617682addf0631172bb75e9b221af5b4084f4720214 SHA512 617067acb45e7326ad79726302a1eea9bbebaaad905d5f586469056fe01ff8a3f5cfba1f43dcdec456ffe5c31058b80e3c9f2acbb1d19a9640fee073a2cf3660 WHIRLPOOL 0ee221d86ca478af20aa9e8530eff79ecd0181dbf52da282d41fed6881a6649335281f1907e486bdc1dd4877b930265aefb3e5d189cd6b5c270d383abf329fc7
-DIST sks-1.1.2.tgz 275724 SHA256 3700d9f91bf2b55d39dea269c22ba2585c70d141dbf9cc386730fd8a3d541396
-DIST sks-1.1.4.tgz 345249 SHA256 baa79be8c1983544518e8a72ccecacb2837d52ae4015dc7cf364cddb53220c76 SHA512 f83c02c995dd3519cfa221c41ab827b9689bcbf91360d2448f83a5dd8b42e7f15665213c4f048ad678da4093d2ec533b6fcc1f5297933ad5f445143b77e14202 WHIRLPOOL eda6d169998434e5eda58dfdd6d7b0e63a5fc493fd38c65d9ce12a2eb5319523c93be4d5244f7fa9f7a3cb408a12b89cbd357e67096b3c914a2e903635970a50
-EBUILD sks-1.1.2.ebuild 1439 SHA256 38ba2979fac456eb69be87e5cfc82583fc26fc5943f519eff06b38a1374da4e1 SHA512 c4aca6fc28b240d5b20baa524136788dcd0ca409dabbf86cae75e70109488b741b4a33e38c71aba671c1c3c99dfecc00832994f47e81979adb016c5f142542d3 WHIRLPOOL 4f1c977ed2738ec57ac1e07551de4b2d9643057b8bb9e8f89b6f7fb318efb4cbd29a6ad89e32453a936ef27f86c01eabb8c09f608270345c7fac6fbca4c490a2
-EBUILD sks-1.1.4-r1.ebuild 3736 SHA256 49f6434734155a04675f182f1cced58832dfe1be1181f6ea27bddfc2db5b6bf7 SHA512 4872282d63e7302a14ad5248c9147b9bcf1372c7b58901cb4e075c8166dcc678d00b279e78d71186164a1c328ab1db7d22160085c4b5465b31f180c4f03ea9e8 WHIRLPOOL b09b3cb09a5072212335bad5ffb3c268ef425c97d5bd335ab1a4c87746714d913026ff04d4f9ac5e85a776d83fde0c72851e794d3ae0a7b5c737ef50f7bfd683
-EBUILD sks-1.1.4.ebuild 3669 SHA256 16c523e6266c02e078dae64314f1523e47e224a289716dab9ff2bf90a955075b SHA512 4e57939c24f53f60df632da3ac773bee8e853db8937635b954ed9daa60f48578cf52d2a5a0969f95efda7d2468d7856748ef489985004f88a6d0b91812c36842 WHIRLPOOL 31073b42adc9ccc21b7c847eaa100fc0c331ed0ea8e0e8b60f60ecadd75b39520a99c8cc479b91aad3556dd31f835085b6ee982caf6be05e8c5a48ae04062927
-MISC ChangeLog 1584 SHA256 333592bb5bcf7ba04f196907bd4fe289322c637b91175233ae02f1f151cd8c17 SHA512 561f76c49d9327cff55b4817f492c3c2c9ae8e392d5588eb17ca1cf42a115c7cfaa53c888a806df95ba776033787be7e487ef2eac05ad4679a6f06cc7ee95e6b WHIRLPOOL ced484eea09fdd3884c60ebbe99abfa32d147a8cf80814e098adec73f12c94c7984828121e1260c937813a9aa86bd99e5b76d455d113ad4ea2107119472b595a
+DIST sks-1.1.5.tgz 362941 SHA256 92a7f113f0ba7a28d51d7ced60a984d042d8524c651dc3fcafe9d11cc32981a0 SHA512 1fc1248281b4eb6bd0bafad7f3d1600ee86905614ee5c644d532059f972040c2673bee780a414e50e9287fc74fd140ac85db9629d502cff989981904acd3710c WHIRLPOOL 4281b40d72e7370b7c848d683beff2f4bd705a06139a25b27efe5be8a521df9fb870bdeeea97ac3617d542b64fd9c539f90d8f695cea1fec2bdcf267a2d3dc1f
+EBUILD sks-1.1.5.ebuild 3649 SHA256 62ed9424271d4735e5ed5ce20297f3e7f9b668f166c0baa9dd9a914c8ef28190 SHA512 32165890bcc21a8da478a7ff9571b1e4c925688f68f4c1577139411777e34623b218f1c96d564415f699041af5d1fe3b9350a8d47fd7ce91a7d60f844d22a497 WHIRLPOOL 81663e376acd2ea5d844bc05b2adc338275f5413979c9f2f07891bd2fced0c0cfbac79b239bbf4ac8c72b9557d90b05f267887917eb374ebbb0e0b6ad2041319
+MISC ChangeLog 1952 SHA256 39bc64e5e8f1240871907ec400e4f9305e119b58768281ed9115bbf3c7488921 SHA512 da9dd9674d4ac05244c9a00f4705814dc3ab022b0aa94ec17903e6cdf33485d859ea5d22f28faac60a6599b354af0bb96a32538d41a1e290c7f27072a66a5414 WHIRLPOOL 0dffad394a155384e935bbcdb89d73c64fdf749ea77cabdf53d04d772ef63485153db86623d7dbcde1c80ec516e13bc5cfd566d50c4b57baf0d7f94eb11d2c8e
 MISC metadata.xml 662 SHA256 3a708be3f9da5ea47b3933c1624d5f527c732fc3913c23f3240325d4a9b22b65 SHA512 1e9deb3390351c80c690453e0ca9dec9b1b77cdec876e5e7a34c3cc6cd19b6b01a70dca749699b8da2a2042d282af9a8933d3fa6a294ce203a69279f11e45004 WHIRLPOOL da86de94115aefa9b34dd7c404b3070716b714805e6f79093a48316f689f09efffbd59b8a280485dad1f7d8db9dfa2da509648f3603bee426f3d236b60f14909
diff --git a/net-misc/sks/files/bdb_stubs-gentoo.patch b/net-misc/sks/files/bdb_stubs-gentoo.patch
deleted file mode 100644
index c28db93853b1..000000000000
--- a/net-misc/sks/files/bdb_stubs-gentoo.patch
+++ /dev/null
@@ -1,110 +0,0 @@
---- bdb/bdb_stubs.c.orig	2012-02-06 14:41:54.294290158 -0800
-+++ bdb/bdb_stubs.c	2012-02-06 14:36:10.853355551 -0800
-@@ -27,7 +27,7 @@
- #define False 0
- 
- 
--void bzero(void* addr,size_t n) {
-+void zerob(void* addr,size_t n) {
-   memset(addr,0,n);
- }
- 
-@@ -210,7 +210,7 @@
- // calls to DB->err and DBENV->err lead to exceptions.
- 
- // FIX: currently, prefix is ignored.  Should be concatenated.
--void raise_db_cb(const DB_ENV *dbenv, const char *prefix, char *msg) {
-+void raise_db_cb(const DB_ENV *dbenv, const char *prefix, const char *msg) {
-     raise_db(msg);
- }
- 
-@@ -512,7 +512,7 @@
- 
-   test_db_closed(db);
- 
--  bzero(&dbt,sizeof(DBT));
-+  zerob(&dbt,sizeof(DBT));
- 
-   dbt.data = String_val(key);
-   dbt.size = string_length(key);
-@@ -542,7 +542,7 @@
- 
-   test_db_closed(db);
-   
--  bzero(&key,sizeof(DBT)); bzero(&data,sizeof(DBT));
-+  zerob(&key,sizeof(DBT)); zerob(&data,sizeof(DBT));
- 
-   key.data = String_val(vkey);
-   key.size = string_length(vkey);
-@@ -577,7 +577,7 @@
- 
-   test_db_closed(db);
- 
--  bzero(&key,sizeof(DBT)); bzero(&data,sizeof(DBT));
-+  zerob(&key,sizeof(DBT)); zerob(&data,sizeof(DBT));
- 
-   key.data = String_val(vkey);
-   key.size = string_length(vkey);
-@@ -827,7 +827,7 @@
-   
-   test_cursor_closed(cursor);
- 
--  bzero(&key,sizeof(DBT)); bzero(&data,sizeof(DBT));
-+  zerob(&key,sizeof(DBT)); zerob(&data,sizeof(DBT));
- 
-   data.data = String_val(vdata);
-   data.size = string_length(vdata);
-@@ -851,7 +851,7 @@
-   
-   test_cursor_closed(cursor);
- 
--  bzero(&key,sizeof(DBT)); bzero(&data,sizeof(DBT));
-+  zerob(&key,sizeof(DBT)); zerob(&data,sizeof(DBT));
- 
-   key.data = String_val(vkey);
-   key.size = string_length(vkey);
-@@ -880,7 +880,7 @@
- 
-   test_cursor_closed(cursor);
- 
--  bzero(&key,sizeof(DBT)); bzero(&data,sizeof(DBT));
-+  zerob(&key,sizeof(DBT)); zerob(&data,sizeof(DBT));
- 
-   key.data = String_val(vkey);
-   key.size = string_length(vkey);
-@@ -906,7 +906,7 @@
-   int flags = convert_flag_list(vflags,cursor_get_flags) | DB_SET_RANGE;
-   int err;
- 
--  bzero(&key,sizeof(DBT)); bzero(&data,sizeof(DBT));
-+  zerob(&key,sizeof(DBT)); zerob(&data,sizeof(DBT));
- 
-   test_cursor_closed(cursor);
- 
-@@ -948,7 +948,7 @@
-    flags = convert_flag_list(vflags,cursor_get_flags) | DB_GET_BOTH;
-    test_cursor_closed(cursor);
- 
--   bzero(&key,sizeof(DBT)); bzero(&data,sizeof(DBT));
-+   zerob(&key,sizeof(DBT)); zerob(&data,sizeof(DBT));
- 
-    key.data = String_val(vkey);
-    key.size = string_length(vkey);
-@@ -975,7 +975,7 @@
-   int flags = Flag_val(vtype,cursor_get_type) | 
-     convert_flag_list(vflags,cursor_get_flags);
-   int err;
--  bzero(&key,sizeof(DBT)); bzero(&data,sizeof(DBT));
-+  zerob(&key,sizeof(DBT)); zerob(&data,sizeof(DBT));
- 
-   test_cursor_closed(cursor);
- 
-@@ -1005,7 +1005,7 @@
-   int flags = Flag_val(vtype,cursor_get_type) | 
-     convert_flag_list(vflags,cursor_get_flags);
-   int err;
--  bzero(&key,sizeof(DBT)); bzero(&data,sizeof(DBT));
-+  zerob(&key,sizeof(DBT)); zerob(&data,sizeof(DBT));
- 
-   test_cursor_closed(cursor);
- 
diff --git a/net-misc/sks/files/sks-1.1.4-ECC_OID_fix_x86.patch b/net-misc/sks/files/sks-1.1.4-ECC_OID_fix_x86.patch
deleted file mode 100644
index 30315cef69c7..000000000000
--- a/net-misc/sks/files/sks-1.1.4-ECC_OID_fix_x86.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -r a4fab18949f0 -r 0374b3dbc4ae dbserver.ml
---- a/dbserver.ml	Fri Jan 25 18:16:13 2013 -0600
-+++ b/dbserver.ml	Tue Apr 16 15:36:36 2013 -0500
-@@ -293,8 +293,8 @@
-           let keys = lookup_keys request.search in
-           let count = List.length keys in
-           let keys = truncate request.limit keys in
-+          let keys = clean_keys request keys in
-           let hashes = List.map ~f:KeyHash.hash keys in
--          let keys = clean_keys request keys in
-           if request.machine_readable then
-             ("text/plain",
-              count,
-diff -r a4fab18949f0 -r 0374b3dbc4ae parsePGP.ml
---- a/parsePGP.ml	Fri Jan 25 18:16:13 2013 -0600
-+++ b/parsePGP.ml	Tue Apr 16 15:36:36 2013 -0500
-@@ -153,7 +153,7 @@
- 
- let parse_ecdh_pubkey cin =
-    let length = cin#read_int_size 1 in
--   let oid = sprintf "%x" (cin#read_int_size length) in
-+   let oid = sprintf "%Lx" (cin#read_int64_size length) in
-    let mpi = read_mpi cin in
-    let kdf_length = cin#read_int_size 1 in
-    let kdf_res = cin#read_int_size 1 in
-@@ -166,7 +166,7 @@
- 
-  let parse_ecdsa_pubkey cin =
-    let length = cin#read_int_size 1 in
--   let oid = sprintf "%x" (cin#read_int_size length) in
-+   let oid = sprintf "%Lx" (cin#read_int64_size length) in
-    let psize = oid_to_psize oid
-    in
-    psize
diff --git a/net-misc/sks/files/sks-1.1.4-man_url.patch b/net-misc/sks/files/sks-1.1.4-man_url.patch
deleted file mode 100644
index dd7af061de3d..000000000000
--- a/net-misc/sks/files/sks-1.1.4-man_url.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -r 4069c369eaaa -r 10a7587774ea sks.pod
---- a/sks.pod	Wed Jun 19 00:41:13 2013 -0500
-+++ b/sks.pod	Tue Dec 03 18:40:52 2013 +0100
-@@ -392,7 +392,7 @@
- 
- =head1 SEE ALSO
- 
-- The SKS website is located at http://minskyprimus.net/sks/.
-+ The SKS website is located at https://bitbucket.org/skskeyserver/sks-keyserver/.
- 
- =head1 AUTHOR
- 
diff --git a/net-misc/sks/sks-1.1.2.ebuild b/net-misc/sks/sks-1.1.2.ebuild
deleted file mode 100644
index 97870bfaa850..000000000000
--- a/net-misc/sks/sks-1.1.2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/sks/sks-1.1.2.ebuild,v 1.4 2012/02/07 00:34:06 kingtaco Exp $
-
-EAPI=4
-
-inherit eutils multilib
-
-DESCRIPTION="SKS Keyserver"
-HOMEPAGE="http://code.google.com/p/sks-keyserver/"
-SRC_URI="http://sks-keyserver.googlecode.com/files/${PF}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="optimize"
-
-DEPEND="dev-lang/ocaml
-		dev-ml/cryptokit
-		sys-libs/db:4.6"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	cp Makefile.local.unused Makefile.local || die
-	sed -i \
-		-e "s:^BDBLIB=.*$:BDBLIB=-L/usr/$(get_libdir):g" \
-		-e "s:^BDBINCLUDE=.*$:BDBINCLUDE=-I/usr/include/db4.6/:g" \
-		-e "s:^PREFIX=.*$:PREFIX=${D}/usr:g" \
-		-e "s:^MANDIR=.*$:MANDIR=${D}/usr/share/man:g" \
-		Makefile.local || die
-	sed -i \
-		-e 's:^CAMLINCLUDE= -I lib -I bdb$:CAMLINCLUDE= -I lib -I bdb -I +cryptokit:g' \
-		-e 's:-Werror-implicit-function-declaration::g' \
-		-e 's:LIBS.bc= lib/cryptokit.cma bdb/bdb.cma:LIBS.bc= bdb/bdb.cma:g' \
-		-e 's:sks_build.bc.sh:sks_build.sh:g' \
-		Makefile bdb/Makefile || die
-	epatch "${FILESDIR}/bdb_stubs-gentoo.patch"
-}
-
-src_compile() {
-	emake dep
-	emake all
-	if use optimize; then
-		emake all.bc
-	fi
-}
-
-src_install() {
-	if use optimize; then
-		emake install.bc
-		dosym /usr/bin/sks.bc usr/bin/sks
-		dosym /usr/bin/sks_add_mail.bc usr/bin/sks_add_mail
-	else
-		emake install
-	fi
-}
diff --git a/net-misc/sks/sks-1.1.4-r1.ebuild b/net-misc/sks/sks-1.1.4-r1.ebuild
deleted file mode 100644
index 2aace5bd4610..000000000000
--- a/net-misc/sks/sks-1.1.4-r1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/sks/sks-1.1.4-r1.ebuild,v 1.2 2013/12/13 09:29:03 patrick Exp $
-
-EAPI=5
-
-inherit eutils multilib user readme.gentoo systemd
-
-DESCRIPTION="An OpenPGP keyserver which is decentralized and provides highly reliable synchronization"
-HOMEPAGE="https://bitbucket.org/skskeyserver/sks-keyserver"
-SRC_URI="http://bitbucket.org/skskeyserver/sks-keyserver/downloads/${P}.tgz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="optimize test"
-DOC_CONTENTS="To get sks running, first build the database,
-start the databse, import atleast one key, then
-run a cleandb. See the sks man page for more information
-Typical DB_CONFIG file and sksconf has been installed
-in /var/lib/sks and can be used as templates by renaming
-to remove the .typical extension. The DB_CONFIG file has
-to be in place before doing the database build, or the BDB
-environment has to be manually cleared from both KDB and PTree.
-The same applies if you are upgrading to this version with an existing KDB/Ptree,
-using another version of BDB than 4.8; you need to clear the environment
-using e.g. db4.6_recover -h . and db4.6_checkpoint -1h . in both KDB and PTree
-Additionally a sample web interface has been installed as
-web.typical in /var/lib/sks that can be used by renaming it to web
-Important: It is strongly recommended to set up SKS behind a
-reverse proxy. Instructions on properly configuring SKS can be
-found at https://bitbucket.org/skskeyserver/sks-keyserver/wiki/Peering"
-
-DEPEND="dev-lang/ocaml
-	dev-ml/cryptokit
-	sys-libs/db:4.8"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	ebegin "Creating named group and user"
-	enewgroup sks
-	enewuser sks -1 -1 /var/lib/sks sks
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-ECC_OID_fix_x86.patch"\
-		"${FILESDIR}/${P}-man_url.patch"
-
-	cp Makefile.local.unused Makefile.local || die
-	sed -i \
-		-e "s:^BDBLIB=.*$:BDBLIB=-L/usr/$(get_libdir):g" \
-		-e "s:^BDBINCLUDE=.*$:BDBINCLUDE=-I/usr/include/db4.8/:g" \
-		-e "s:^LIBDB=.*$:LIBDB=-ldb-4.8:g" \
-		-e "s:^PREFIX=.*$:PREFIX=${D}/usr:g" \
-		-e "s:^MANDIR=.*$:MANDIR=${D}/usr/share/man:g" \
-		Makefile.local || die
-	sed -i \
-		-e 's:^CAMLINCLUDE= -I lib -I bdb$:CAMLINCLUDE= -I lib -I bdb -I +cryptokit:g' \
-		-e 's:-Werror-implicit-function-declaration::g' \
-		Makefile bdb/Makefile || die
-	sed -i \
-		-e 's:/usr/sbin/sks:/usr/bin/sks:g' \
-		sks_build.sh || die
-}
-
-src_compile() {
-	emake dep
-	# sks build fails with paralell build in module Bdb
-	emake -j1 all
-	if use optimize; then
-		emake all.bc
-	fi
-}
-
-src_test() {
-	./sks unit_test || die
-}
-
-src_install() {
-	if use optimize; then
-		emake install.bc
-		dosym /usr/bin/sks.bc usr/bin/sks
-		dosym /usr/bin/sks_add_mail.bc usr/bin/sks_add_mail
-	else
-		emake install
-	fi
-
-	dodoc README.md
-
-	newinitd "${FILESDIR}/sks-db.initd" sks-db
-	newinitd "${FILESDIR}/sks-recon.initd" sks-recon
-	newconfd "${FILESDIR}/sks.confd" sks
-	systemd_dounit "${FILESDIR}/sks-db.service"
-	systemd_dounit "${FILESDIR}/sks-recon.service"
-
-	dodir "/var/lib/sks/web.typical"
-	insinto /var/lib/sks
-	newins sampleConfig/DB_CONFIG DB_CONFIG.typical
-	newins sampleConfig/sksconf.typical sksconf.typical
-	insinto /var/lib/sks/web.typical
-	doins sampleWeb/HTML5/*
-
-	keepdir /var/lib/sks
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		einfo "Note when upgrading from earlier versions of SKS"
-		einfo "The default values for pagesize settings have changed. To continue"
-		einfo "using an existing DB without rebuilding, explicit settings have to be"
-		einfo "added to the sksconf file."
-		einfo "pagesize:       4"
-		einfo "ptree_pagesize: 1"
-	fi;
-}
diff --git a/net-misc/sks/sks-1.1.4.ebuild b/net-misc/sks/sks-1.1.5.ebuild
index ea74c2b9a661..520782a4acab 100644
--- a/net-misc/sks/sks-1.1.4.ebuild
+++ b/net-misc/sks/sks-1.1.5.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/sks/sks-1.1.4.ebuild,v 1.1 2013/11/22 02:35:45 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/sks/sks-1.1.5.ebuild,v 1.1 2014/05/05 22:02:47 mrueg Exp $
 
 EAPI=5
 
-inherit eutils multilib user readme.gentoo systemd
+inherit multilib user readme.gentoo systemd
 
 DESCRIPTION="An OpenPGP keyserver which is decentralized and provides highly reliable synchronization"
 HOMEPAGE="https://bitbucket.org/skskeyserver/sks-keyserver"
@@ -42,8 +42,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-ECC_OID_fix_x86.patch"
-
 	cp Makefile.local.unused Makefile.local || die
 	sed -i \
 		-e "s:^BDBLIB=.*$:BDBLIB=-L/usr/$(get_libdir):g" \
@@ -88,8 +86,8 @@ src_install() {
 	newinitd "${FILESDIR}/sks-db.initd" sks-db
 	newinitd "${FILESDIR}/sks-recon.initd" sks-recon
 	newconfd "${FILESDIR}/sks.confd" sks
-	systemd_dounit "${FILESDIR}/sks-db.service"
-	systemd_dounit "${FILESDIR}/sks-recon.service"
+	systemd_dounit "${FILESDIR}"/sks-db.service
+	systemd_dounit "${FILESDIR}"/sks-recon.service
 
 	dodir "/var/lib/sks/web.typical"
 	insinto /var/lib/sks
@@ -99,13 +97,14 @@ src_install() {
 	doins sampleWeb/HTML5/*
 
 	keepdir /var/lib/sks
+	readme.gentoo_create_doc
 }
 
 pkg_postinst() {
 	readme.gentoo_print_elog
 
 	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		einfo "Note when upgrading from earlier versions of SKS"
+		einfo "Note when upgrading from versions of SKS earlier than 1.1.4"
 		einfo "The default values for pagesize settings have changed. To continue"
 		einfo "using an existing DB without rebuilding, explicit settings have to be"
 		einfo "added to the sksconf file."