net-misc/sks: fixing ebuild
authorkristianf <devnull@localhost>
Fri, 15 Nov 2013 00:38:56 +0000 (01:38 +0100)
committerkristianf <devnull@localhost>
Fri, 15 Nov 2013 00:38:56 +0000 (01:38 +0100)
net-misc/sks/Manifest
net-misc/sks/files/README.gentoo [new file with mode: 0644]
net-misc/sks/files/sks-1.1.4-ECC_OID_fix_x86.patch [new file with mode: 0644]
net-misc/sks/sks-1.1.4.ebuild

index 4f1759d..290ad50 100644 (file)
@@ -1,10 +1,11 @@
-AUX 0001_ECC_OID_fix_x86.patch 1293 SHA256 417db295f748d113d8e886ad586a53e84209be58f3690d5665d9df5b98d03b60 SHA512 4c3f8760e550534aad752e70c3ac7c4f84977161b7aa57bd51b6aa2e21e5745e99abc77db436e11c3ee7a2ef4bc53bd379095a0c03cde6f7759a1170c460fcaa WHIRLPOOL fc33da246fc44bf2dfe5ce76d7215076eeb09b9643e6d1ad11b2145469c6b33e77602880ea2f4c2f623d8d73b7e82e81475eec6c3e6cdc7942fb7a3e92b5b879
+AUX README.gentoo 996 SHA256 4154e73ed423713ae84de7ab80e6f41662eb17ea8718ae1b168ff853ecc462da SHA512 f2390a9802dc82f1cc0cadc3c616ab8d6342a8f354dd20ae8111a17e6d1b5145a660ad1a4cdd44c3fa553221b7eb2d4f0116dc1dfce1f110973865f58fa4e138 WHIRLPOOL 12ef8f90ccdde3c35b9ea58b73142f3d8c98e37cb9a82254507c5f22cb6ca4be039f867776de7667bc0f9980c1e8f3a0420282c5685f474b5790992185e4d4cd
+AUX sks-1.1.4-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 3666 SHA256 556a49d1143e7a4e5defaa5e327d976b74b3aee28ec31068411f406f9b01f58f SHA512 b2badd2e0e3641d3964f7b6364387822615d7ff982fe9b5f2a9527492c6802105edace04838ca16bb5be12d06a9fc1fc3ccfac02bfe1783a8ce744e235d9d6c8 WHIRLPOOL 48d3f015f37c41a0e167d4ec61f918fdee090e862c9f11a4f3e6db9d736f2aad8830203436c52b987a2c2c44e9d2dd6fbc52e8bd38a921e32742dbde1e31f3e4
+EBUILD sks-1.1.4.ebuild 2615 SHA256 fd7f43da0b4ac213f6a349a32024873af3f9ce204757b07dad1d77137f501992 SHA512 4fe752fe756824380a2d88cd14ca08ad4a9340b6ca20d9a8f09237557dedfa6258fb0fb6fc7833edac9b1c676c6b9cfa7ac808c63221285588489e3c0ebd4a0d WHIRLPOOL 2690300c431f0b89cf5b383d416fe60063e903bc291a78f1ddbb0de1affe02f81610cb046bed15403f51f9a695a1de51a7e953e2534bde78e04a89c1d890be98
 EBUILD sks-9999.ebuild 3549 SHA256 3dfc216e0207bda7fdff87e9a8d403991fd1225182fc67e93347406e5d4a9087 SHA512 83d0698726acc2a2f4e77a5c6be183d10da09217e5a82a869130453b02e8fb94034688e929e6a5f0734a97b35862a8fbe1403440be864b1561a03528402d5c08 WHIRLPOOL 86eb3a1255827bf0affb2a826d8fe31dd887e66b34ecb7ec7f899d9fa1b16892882fb2d9014d2a1603317ff19823b61c9df9888ac4fb4f82cef96e2b5729a627
 MISC metadata.xml 379 SHA256 62e2a66602fa78c8762d735ea81e3f02737a014a7b0057d9b3668950bbc370f9 SHA512 0e2b7237549e7e302176f772df2e94b5212c3d624e6750ba6e364922e36645453ae5e45a0c07b4a964741ad80a16a923845aa79710eff288a4e7d27428a545e1 WHIRLPOOL 9ce01763df9cd85a3de610eb70e606cdc9c14f06d88437c6f6858fd8c2a39864198ed1a8b5eea7c9117e314738083bdcc72556ba9dd5d8b4d09d950ab0bbfc72
diff --git a/net-misc/sks/files/README.gentoo b/net-misc/sks/files/README.gentoo
new file mode 100644 (file)
index 0000000..b0c0b94
--- /dev/null
@@ -0,0 +1,16 @@
+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
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
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 371ff9b..8343d1f 100644 (file)
@@ -4,15 +4,15 @@
 
 EAPI=5
 
-inherit eutils multilib
+inherit eutils multilib user readme.gentoo systemd
 
-DESCRIPTION="SKS Keyserver"
+DESCRIPTION="An OpenPGP keyserver whose goal is to provide easy to deploy, decentralized, and highly reliable synchronization"
 HOMEPAGE="https://bitbucket.org/skskeyserver/sks-keyserver"
-SRC_URI="https://bitbucket.org/skskeyserver/sks-keyserver/downloads/${P}.tgz"
+SRC_URI="http://bitbucket.org/skskeyserver/sks-keyserver/downloads/${P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="systemd optimize test"
+IUSE="optimize test"
 
 DEPEND="dev-lang/ocaml
                dev-ml/cryptokit
@@ -26,7 +26,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-       epatch "${FILESDIR}/0001_ECC_OID_fix_x86.patch";
+       epatch "${FILESDIR}/${P}-ECC_OID_fix_x86.patch"
 
        cp Makefile.local.unused Makefile.local || die
        sed -i \
@@ -54,7 +54,7 @@ src_compile() {
 }
 
 src_test() {
-       ./sks unit_test
+       ./sks unit_test || die
 }
 
 src_install() {
@@ -71,35 +71,21 @@ src_install() {
        newinitd "${FILESDIR}/sks-db.runscript" sks-db
        newinitd "${FILESDIR}/sks-recon.runscript" sks-recon
        newconfd "${FILESDIR}/sks-confd" sks
-       use systemd && systemd_dounit "${FILESDIR}/sks-db.service"
-       use systemd && systemd_dounit "${FILESDIR}/sks-recon.service"
+       systemd_dounit "${FILESDIR}/sks-db.service"
+       systemd_dounit "${FILESDIR}/sks-recon.service"
 
-       mkdir -p "$D/var/lib/sks/web.typical"
-       cp "$S/sampleConfig/DB_CONFIG" "$D/var/lib/sks/DB_CONFIG.typical"
-       cp "$S/sampleConfig/sksconf.typical" "$D/var/lib/sks/sksconf.typical"
-       cp "$S"/sampleWeb/HTML5/* "$D"/var/lib/sks/web.typical/
+       dodir "${D}/var/lib/sks/web.typical"
+       insinto /var/lib/sks
+       newins sampleConfig/DB_CONFIG DB_CONFIG.typical
+       newins sampleConfig/sksconf sksconf.typical
+       insinto /var/lib/sks/web.typical
+       doins sampleWeb/HTML5/*
 
        keepdir /var/lib/sks
 }
 
 pkg_postinst() {
-       einfo "To get sks running, first build the database,"
-       einfo "start the databse, import atleast one key, then"
-       einfo "run a cleandb. See the sks man page for more"
-       einfo "information"
-       einfo "Typical DB_CONFIG file and sksconf has been installed"
-       einfo "in /var/lib/sks and can be used as templates by renaming"
-       einfo "to remove the .typical extension. The DB_CONFIG file has"
-       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 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"
+       readme.gentoo_print_elog
        ewarn "Note when upgrading from earlier versions of SKS"
        ewarn "===================="
        ewarn "The default values for pagesize settings have changed. To continue"