diff options
author | Kristian Fiskerstrand <k_f@gentoo.org> | 2015-02-02 23:18:33 +0000 |
---|---|---|
committer | Kristian Fiskerstrand <k_f@gentoo.org> | 2015-02-02 23:18:33 +0000 |
commit | 00786d5984b5af7f853b6e406ff54e65030bec4e (patch) | |
tree | fe11af23b0d68c4e614efa39741debe30a00411b /net-misc/sks | |
parent | Fix ChangeLog entry (diff) | |
download | historical-00786d5984b5af7f853b6e406ff54e65030bec4e.tar.gz historical-00786d5984b5af7f853b6e406ff54e65030bec4e.tar.bz2 historical-00786d5984b5af7f853b6e406ff54e65030bec4e.zip |
Add support for EdDSA (Ed25519) from the upstream master branch
Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xFED5002857C1ABFA!
Diffstat (limited to 'net-misc/sks')
-rw-r--r-- | net-misc/sks/ChangeLog | 10 | ||||
-rw-r--r-- | net-misc/sks/Manifest | 24 | ||||
-rw-r--r-- | net-misc/sks/files/sks-1.1.5-eddsa.patch | 84 | ||||
-rw-r--r-- | net-misc/sks/sks-1.1.5-r1.ebuild | 116 |
4 files changed, 218 insertions, 16 deletions
diff --git a/net-misc/sks/ChangeLog b/net-misc/sks/ChangeLog index e7819a76bc28..45ee700ffb14 100644 --- a/net-misc/sks/ChangeLog +++ b/net-misc/sks/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-misc/sks -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/sks/ChangeLog,v 1.11 2014/07/28 18:04:07 k_f Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/sks/ChangeLog,v 1.12 2015/02/02 23:18:26 k_f Exp $ + +*sks-1.1.5-r1 (02 Feb 2015) + + 02 Feb 2015; Kristian Fiskerstrand <k_f@gentoo.org> + +files/sks-1.1.5-eddsa.patch, +sks-1.1.5-r1.ebuild: + Add support for EdDSA (Ed25519) from the upstream master branch 28 Jul 2014; <kristianf@gentoo.org> metadata.xml: Taking over full maintainership instead of through proxy-maint diff --git a/net-misc/sks/Manifest b/net-misc/sks/Manifest index 147db09d4085..4931be58b33e 100644 --- a/net-misc/sks/Manifest +++ b/net-misc/sks/Manifest @@ -1,28 +1,24 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 +AUX sks-1.1.5-eddsa.patch 3398 SHA256 072a56943da8d010d7e4e2d550ed4545f259a6334facfb9fe61708f429d8860d SHA512 9a8a955f7880e86c6a73ee6b470737b7926481126ec382e29617b8ce517859e0de5e82c3f83c0f3131fc513b46be3eb427974932e2993c774838bedfd87c30f6 WHIRLPOOL 2fcd324290723e73bdc803b28760e0d7e9836babab413a54963a61f76aa4d4f3d5d33a5c90c36e3f4d0a91f5375a526c9b3154e5cd2369cd5f14b61de4e7a73e 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.5.tgz 362941 SHA256 92a7f113f0ba7a28d51d7ced60a984d042d8524c651dc3fcafe9d11cc32981a0 SHA512 1fc1248281b4eb6bd0bafad7f3d1600ee86905614ee5c644d532059f972040c2673bee780a414e50e9287fc74fd140ac85db9629d502cff989981904acd3710c WHIRLPOOL 4281b40d72e7370b7c848d683beff2f4bd705a06139a25b27efe5be8a521df9fb870bdeeea97ac3617d542b64fd9c539f90d8f695cea1fec2bdcf267a2d3dc1f +EBUILD sks-1.1.5-r1.ebuild 3690 SHA256 da6d4e02ff5794986860cf9d021234414e2e965c4b24a6dba55b0c82e76f13bf SHA512 cc41cae4ff61c07e2a88b28c12fd59ae7c50f469afec62c4087214e86df2ef1ef1c02c726031d6da0b240b9e29825dbd497bd357f7e5b35bba556ba73e6992d1 WHIRLPOOL 12e734d029c293cb316547c10b3608e3338850f19f60f23fbd0ff9188c169823568e4992d2731c80373e9315ed931ff34cb22ed46a32794c7c51a949433056ed EBUILD sks-1.1.5.ebuild 3649 SHA256 62ed9424271d4735e5ed5ce20297f3e7f9b668f166c0baa9dd9a914c8ef28190 SHA512 32165890bcc21a8da478a7ff9571b1e4c925688f68f4c1577139411777e34623b218f1c96d564415f699041af5d1fe3b9350a8d47fd7ce91a7d60f844d22a497 WHIRLPOOL 81663e376acd2ea5d844bc05b2adc338275f5413979c9f2f07891bd2fced0c0cfbac79b239bbf4ac8c72b9557d90b05f267887917eb374ebbb0e0b6ad2041319 -MISC ChangeLog 2069 SHA256 c1c75f91343546e5ac52017a7a305f03de595bd0d4c90bd1f590ac7a864e3186 SHA512 26502ad350b420bc3eef213bc6377a75debff12e9e392250a4588ae76aa9b51094f93356f43aceb1d60b3057889dd440e15567c6b00b84b691b38697cdcd4536 WHIRLPOOL 18ae1c4aef1c2cd9326ed1c77a3d8422030639f819618263b64e20e700772cab7fd0411f72eb05d08102f411254fda960172aa079db31e28aac3f2c1eb9facc2 +MISC ChangeLog 2273 SHA256 9584ef4fbda1a43b4285339e156f6fac41b88503b2a194dcda96e9fcd2b3d82e SHA512 38c12718819ebe99fa6e80541c05f6916f267c456d60dc5de9f055e10f5af6642449e99c4d0ab052cf58e51f567046639a41f9853af86461f1193080263cb026 WHIRLPOOL af6a827d8d9d5e295037eea1eac31d27fb3b4fc6e334b439781fc2e0e84dade549c3e154f559fdf2f3bf579f449bb17b76a2ac2368e823992414869e209b34e9 MISC metadata.xml 447 SHA256 4a188356b9206354cdf1796737f2ca208c91c5c3fe828582fa5605dc448b46b1 SHA512 ec7912917617b2ba83ce08df51d76b82428de6a0ef3f51bf5ead947c7674bf329e167d51fa17c505e2676de2f9e5f4d369f825773c1aa5e56b72be90934836cf WHIRLPOOL 5457b615e5089a6551e43770d69bb2b718a2487991fc92f8da736b5a68570b272fa49174808ea16a5797dd194eca5751fa5d03d7b18d6adf2dd0e6d604118993 -----BEGIN PGP SIGNATURE----- -iQIcBAEBCAAGBQJT1pBOAAoJEPw7F94F4TagC9kQAKe2Gi3tCsCtG1sUwrzqh3HN -KNQfofRiCydnlrjo5ECXoAlwWLAarmMQ/t5EnjFIOXoNUs8flMdjX2qnQmQLozWx -DcKe/AlPalqIfA3OL/Xoj9gNM89J+qfo7EnSWXMAGuGfPlF/bxZP4ZmD4dT9QXSR -fTPFm/QFqn8D7Mol/SCZsPVIk30t/D+lemP5vvJ3fBz1p8Pr5ysQvsohch9je5bc -m4EIa1T2hoOWYaxWqsXFJCQJI4HThPUfEcOTg/GIf+A94QUC5Yyw2lVDwAGI04lv -1twNWHV4QDPMRks4QukMhNIG3SOYzY0a5iOgLWlvpr+fga1LM/V3IRe4BKlyJVey -w0sHNsuJ567xhvFXCVhlOzOr7zBlEY8GbvlnID1vmW1bA7E1tYwdIkO5e+l5pl1X -smV5A1+qgRqoBP2iYSv2jYxLfb9YR+UbvRfIaeaVmtJlT3yeZNm69QF7h/Gl2Lp7 -0uupD57rCbATH8Nz8PQoMzcI/WYpXi0VmuWyrUvG+a1ZZV/YLYa5Gg0ugnpKAMFQ -PgHY5GJDpSJOEmtcmWmW5RDMZSkGZVyQ/jxQ+rj0z2gm1YBbX4ZL49YhOwhyBPqI -Rms89Wia/W9gtjvQDRbvXIrzVMhx0KUCL74U2HjYg9c55ovJfNc0fr88k0sgBGX7 -4qx74pyElRAMw5njENMM -=ygrs +iQEcBAEBCAAGBQJU0AXDAAoJEP7VAChXwav6LpMIAJ8HvvVHE7EnozwEixaRHcIs +GSMVoc3XFcjv1qDl6rSg4P3Qf75U1Hx47LLdz5r8PenfFgb/tQFG9BzDsoFPN5vq +i0WEq1HXSoeQojSkw7IAObFJqA9oUUffT1u55A0nEEN5D0R9HJqTAXO/YgbL/5yj +8cxmFEZWXYEHBYGg8RX14ZrE0M9RTNjxIamv3QOt3SJs5g0L5a31jr3iKgHvHs9n +NTXvQb6dO/xIlcJzN9ypSPcVXyPIubk0Pf07QulOoEz8m1e+o6WTTHsOMW3dn4pQ +PMVolUnwm8W9LCGlBCfOMf4rjW1bcMdB0Fm0OWNMc6nfe7JWJdYsH7FJSO3sT60= +=RCaI -----END PGP SIGNATURE----- diff --git a/net-misc/sks/files/sks-1.1.5-eddsa.patch b/net-misc/sks/files/sks-1.1.5-eddsa.patch new file mode 100644 index 000000000000..36359f233c49 --- /dev/null +++ b/net-misc/sks/files/sks-1.1.5-eddsa.patch @@ -0,0 +1,84 @@ +diff -r 4d5e4fd7c1c2 CHANGELOG +--- a/CHANGELOG Mon Aug 11 20:56:45 2014 -0500 ++++ b/CHANGELOG Tue Feb 03 00:01:20 2015 +0100 +@@ -1,3 +1,7 @@ ++Development: ++ - Add support for EdDSA key using Ed25519 signature scheme ++ (http://www.ietf.org/id/draft-koch-eddsa-for-openpgp-00.txt) ++ + 1.1.5 + - Fixes for machine-readable indices. Key expiration times are now read + from self-signatures on the key's UIDs. In addition, instead of 8-digit +diff -r 4d5e4fd7c1c2 common.ml +--- a/common.ml Mon Aug 11 20:56:45 2014 -0500 ++++ b/common.ml Tue Feb 03 00:01:20 2015 +0100 +@@ -47,7 +47,7 @@ + (* for Release versions, COMMONCAMLFLAGS in Makefile should include *) + (* '-warn-error a'. Development work should use '-warn-error A' for stricter *) + (* language checking. This affects the Ocaml compiler beginning with v4.01.0 *) +-let version_suffix = "" (* + for development branch *) ++let version_suffix = "+" (* + for development branch *) + let compatible_version_tuple = (0,1,5) + let version = + let (maj_version,min_version,release) = version_tuple in +diff -r 4d5e4fd7c1c2 packet.ml +--- a/packet.ml Mon Aug 11 20:56:45 2014 -0500 ++++ b/packet.ml Tue Feb 03 00:01:20 2015 +0100 +@@ -163,6 +163,7 @@ + | 19 -> "ECDSA (ECC)" (* RFC 6637 *) + | 20 -> "Elgamal (Encrypt or Sign)" + | 21 -> "Reserved for Diffie-Hellman (X9.42) as defined for IETF-S/MIME" ++ | 22 -> "EdDSA" + | x when x >= 100 && x <= 110 -> "Private/Experimental algorithm." + | _ -> "Unknown Public Key Algorithm" + +@@ -252,10 +253,11 @@ + | 2 -> "r" (* RSA encrypt *) + | 3 -> "s" (* RSA sign *) + | 16 -> "g" (* ElGamal encrypt *) +- | 20 -> "G" (* ElGamal sign and encrypt *) + | 17 -> "D" (* DSA *) + | 18 -> "e" (* ECDH *) + | 19 -> "E" (* ECDSA *) ++ | 20 -> "G" (* ElGamal sign and encrypt *) ++ | 22 -> "E" (* EdDSA *) + | _ -> "?" (* NoClue *) + + (** writes out packet, using old-style packets when possible *) +diff -r 4d5e4fd7c1c2 parsePGP.ml +--- a/parsePGP.ml Mon Aug 11 20:56:45 2014 -0500 ++++ b/parsePGP.ml Tue Feb 03 00:01:20 2015 +0100 +@@ -150,6 +150,7 @@ + | "\x2b\x24\x03\x03\x02\x08\x01\x01\x0b" -> 384 (* brainpoolP384r1 *) + | "\x2b\x24\x03\x03\x02\x08\x01\x01\x0d" -> 512 (* brainpoolP512r1 *) + | "\x2b\x81\x04\x00\x0a" -> 256 (* secp256k1 *) ++ | "\x2b\x06\x01\x04\x01\xda\x47\x0f\x01" -> 256 (* Ed25519 *) + | _ -> failwith "Unknown OID" + in + psize +@@ -168,6 +169,7 @@ + in + (mpi, psize) + ++ (* Algorithm specific fields for ECDSA and EdDSA *) + let parse_ecdsa_pubkey cin = + let length = cin#read_int_size 1 in + let oid = cin#read_string length in +@@ -185,7 +187,7 @@ + let algorithm = cin#read_byte in + let (tmpmpi, tmpsize) = match algorithm with + | 18 -> parse_ecdh_pubkey cin +- | 19 -> ( {mpi_bits = 0; mpi_data = ""}, (parse_ecdsa_pubkey cin)) ++ | 19 | 22 -> ( {mpi_bits = 0; mpi_data = ""}, (parse_ecdsa_pubkey cin)) + | _ -> ( {mpi_bits = 0; mpi_data = ""} , -1 ) + in + let mpis = match algorithm with +@@ -205,7 +207,7 @@ + pk_ctime = creation_time; + pk_expiration = (match expiration with Some 0 -> None | x -> x); + pk_alg = algorithm; +- pk_keylen = (match algorithm with |18|19 -> psize | _ -> mpi.mpi_bits); ++ pk_keylen = (match algorithm with |18|19|22 -> psize | _ -> mpi.mpi_bits); + } + + (********************************************************) diff --git a/net-misc/sks/sks-1.1.5-r1.ebuild b/net-misc/sks/sks-1.1.5-r1.ebuild new file mode 100644 index 000000000000..f7cf570930a4 --- /dev/null +++ b/net-misc/sks/sks-1.1.5-r1.ebuild @@ -0,0 +1,116 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/sks/sks-1.1.5-r1.ebuild,v 1.1 2015/02/02 23:18:26 k_f Exp $ + +EAPI=5 + +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" +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() { + 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 + + epatch "${FILESDIR}/${P}-eddsa.patch" +} + +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 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." + einfo "pagesize: 4" + einfo "ptree_pagesize: 1" + fi; +} |