net-misc/sks: Make default BDB version 4.8 as this is stable and add OID bug fix...
authorkristianf <devnull@localhost>
Thu, 14 Nov 2013 20:31:59 +0000 (21:31 +0100)
committerkristianf <devnull@localhost>
Thu, 14 Nov 2013 20:31:59 +0000 (21:31 +0100)
net-misc/sks/Manifest
net-misc/sks/files/0001_ECC_OID_fix_x86.patch [new file with mode: 0644]
net-misc/sks/sks-1.1.4.ebuild

index 603227b..034068f 100644 (file)
@@ -1,8 +1,9 @@
+AUX 0001_ECC_OID_fix_x86.patch 1293 SHA256 417db295f748d113d8e886ad586a53e84209be58f3690d5665d9df5b98d03b60 SHA512 4c3f8760e550534aad752e70c3ac7c4f84977161b7aa57bd51b6aa2e21e5745e99abc77db436e11c3ee7a2ef4bc53bd379095a0c03cde6f7759a1170c460fcaa WHIRLPOOL fc33da246fc44bf2dfe5ce76d7215076eeb09b9643e6d1ad11b2145469c6b33e77602880ea2f4c2f623d8d73b7e82e81475eec6c3e6cdc7942fb7a3e92b5b879
 AUX sks-confd 87 SHA256 811498c2c964ee109dcbf617682addf0631172bb75e9b221af5b4084f4720214 SHA512 617067acb45e7326ad79726302a1eea9bbebaaad905d5f586469056fe01ff8a3f5cfba1f43dcdec456ffe5c31058b80e3c9f2acbb1d19a9640fee073a2cf3660 WHIRLPOOL 0ee221d86ca478af20aa9e8530eff79ecd0181dbf52da282d41fed6881a6649335281f1907e486bdc1dd4877b930265aefb3e5d189cd6b5c270d383abf329fc7
 AUX sks-db.runscript 519 SHA256 947a04372252e9e21a020243a678d3f78ba9b6b5fffd8086f83592c772bed467 SHA512 157cdd1477d829acc7b983fbfea015528c16b88938f595cfb6a7bb7c27bf0be4f42d2a69def0e0ef38d618b23db56e241e2712c4eb9ebb837273693e05f2734f WHIRLPOOL 5b12f2434d0229e46b3e50176063df5d8b680f1cb1d003a39d1eb3d3950303b28ecea2e8f5907564a7dcf2c3d4275d7ea555f6530eebd0cac131160e1d573a1c
 AUX sks-db.service 186 SHA256 14154252dfe8ff757b67979c54053497fc6f0ef18c81393a925540904b5f0d41 SHA512 26973d2409fd605ec5851b0501a445e4666bf8c7d2854949858896ffa02b3f5ddd67c68c431c033c913399a90bb8fb2cd85af72fe419241fb8258a9c7e82ea98 WHIRLPOOL bdd61312995eb8d17efe0cb131df17f779c6606cdd37bff10075e8b670a5cc2706dc688aae2c3338f48368bbb7256fd2ebc713dcdb81153777b5b3ece0c7669f
 AUX sks-recon.runscript 592 SHA256 85ef9ab277082e6440a300dc3e1f7b94365a892982c073b1133d9b26a5292295 SHA512 5ea71ae4dc0cad2bf603ba450037507b96d059be9be1d3d8afff2fd0eeca06aa583480065d6bbb22e9ba453e959d7fbd2a1d6a00287abc97930e859f725002f8 WHIRLPOOL 7f74824e12028986ba86a56b0668f8f63dad55ccf7baa452ac72115bacadbded23e072787c4e4ae2e40cdff2d7b439bbbaddacaa8e275c6ebb89520066f643e1
 AUX sks-recon.service 207 SHA256 990b809a91323f94110a4024ebd4759a3f5c1cac96a1577b39f50ef4b6865e3a SHA512 7fc3c83f3267ef5e2b8b097c0d095cbaa682552df8caa1be47f54ff5639e9f64855f304562aad181800516d7faa8d081c4b225d9c95223cb14c61e8b6d58faa7 WHIRLPOOL 03f7623e12ff84f8affda5214d0b1234b77ce55eb7faad813365e9aa4acae61214b06d6b26e789ffdb1d25db6f5a6c6bbfc5dd2c60c14506f0337272c9e4e96d
 DIST sks-1.1.4.tgz 345249 SHA256 baa79be8c1983544518e8a72ccecacb2837d52ae4015dc7cf364cddb53220c76 SHA512 f83c02c995dd3519cfa221c41ab827b9689bcbf91360d2448f83a5dd8b42e7f15665213c4f048ad678da4093d2ec533b6fcc1f5297933ad5f445143b77e14202 WHIRLPOOL eda6d169998434e5eda58dfdd6d7b0e63a5fc493fd38c65d9ce12a2eb5319523c93be4d5244f7fa9f7a3cb408a12b89cbd357e67096b3c914a2e903635970a50
-EBUILD sks-1.1.4.ebuild 3269 SHA256 558be41799bb625f4a2cbbc6e2159e5e000a09764d0cb96a06d6120c6eb7eaf3 SHA512 1cfbf23f400345f240838fdd76c1f2cbac9f8a8e6021c341cdeb8a19df7d170aaaddc76af649cc5e6c7a9b2083c3b1888182772c080cdd58acfffbd6db348c45 WHIRLPOOL 76771d2d91fe66d234327431115f1dec1010d8623dbf596d76baa04f7681370fe72ffb9361c58314425ade150aa5a76bd29ef375b6c700098c81f340a8ba898e
+EBUILD sks-1.1.4.ebuild 3660 SHA256 012b6665f70b7bf2354183405e04b5b5c3fd7e826131b2ab01e106aea1d27039 SHA512 39f22de5879695a569473a3368c24aec80d85baa55e5f05c97931b51a8681c4a746b1ddb083e64b9178fd65c2f1f4b73a78f5c7b22735a15935f76c06b25a020 WHIRLPOOL 1673998bd3ef2d05a4e746805e4a6f98999ec36400a9d3524a8d85b3fdf28764b4eaf52ea99c201f0d24ac7c5ccb4fcd827ee2e7c1556d1a27806cce91db9e08
 EBUILD sks-9999.ebuild 3549 SHA256 3dfc216e0207bda7fdff87e9a8d403991fd1225182fc67e93347406e5d4a9087 SHA512 83d0698726acc2a2f4e77a5c6be183d10da09217e5a82a869130453b02e8fb94034688e929e6a5f0734a97b35862a8fbe1403440be864b1561a03528402d5c08 WHIRLPOOL 86eb3a1255827bf0affb2a826d8fe31dd887e66b34ecb7ec7f899d9fa1b16892882fb2d9014d2a1603317ff19823b61c9df9888ac4fb4f82cef96e2b5729a627
diff --git a/net-misc/sks/files/0001_ECC_OID_fix_x86.patch b/net-misc/sks/files/0001_ECC_OID_fix_x86.patch
new file mode 100644 (file)
index 0000000..30315ce
--- /dev/null
@@ -0,0 +1,34 @@
+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
index 8b2c415..ae0afb0 100644 (file)
@@ -16,7 +16,7 @@ IUSE="systemd optimize test"
 
 DEPEND="dev-lang/ocaml
                dev-ml/cryptokit
-               sys-libs/db:5.2"
+               sys-libs/db:4.8"
 RDEPEND="${DEPEND}"
 
 pkg_setup() {
@@ -26,6 +26,8 @@ pkg_setup() {
 }
 
 src_prepare() {
+       epatch "${FILESDIR}/0001_ECC_OID_fix_x86.patch";
+
        cp Makefile.local.unused Makefile.local || die
        sed -i \
                -e "s:^BDBLIB=.*$:BDBLIB=-L/usr/$(get_libdir):g" \
@@ -91,12 +93,19 @@ pkg_postinst() {
        einfo "to be in place before doing the database build, or the BDB"
        einfo "environment has to be manually cleared from both KDB and PTree."
        einfo "The same applies if you are upgrading to this version with an existing KDB/Ptree,"
-       einfo "using another version of BDB than 5.2; you need to clear the environment"
+       einfo "using another version of BDB than 4.8; you need to clear the environment"
        einfo "using e.g. db4.6_recover -h . and db4.6_checkpoint -1h . in both KDB and PTree"
        einfo "Additionally a sample web interface has been installed as"
        einfo "web.typical in /var/lib/sks that can be used by renaming it to web"
        einfo "Important: It is strongly recommended to set up SKS behind a"
        einfo "reverse proxy. Instructions on properly configuring SKS can be"
        einfo "found at https://bitbucket.org/skskeyserver/sks-keyserver/wiki/Peering"
+       ewarn "Note when upgrading from earlier versions of SKS"
+       ewarn "===================="
+        ewarn "The default values for pagesize settings have changed. To continue"
+       ewarn "using an existing DB without rebuilding, explicit settings have to be"
+       ewarn "added to the sksconf file."
+       ewarn "pagesize:       4"
+       ewarn "ptree_pagesize: 1"
 }