[gentoo-commits] repo/gentoo:master commit in: net-misc/sks/files/, net-misc/sks/

[Kristian Fiskerstrand]

commit:     bb3ae6a78af0f3ebae09a3120696e0b1a2240520
Author:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 28 07:38:14 2017 +0000
Commit:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
CommitDate: Wed Jun 28 07:38:43 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb3ae6a7

net-misc/sks: Clean up old version

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 net-misc/sks/Manifest                              |   1 -
 net-misc/sks/files/sks-1.1.5-curve25519.patch      |  11 --
 .../sks/files/sks-1.1.5-disable-warn-error-a.patch |  29 -----
 net-misc/sks/files/sks-1.1.5-eddsa.patch           |  84 ---------------
 net-misc/sks/sks-1.1.5-r3.ebuild                   | 118 ---------------------
 net-misc/sks/sks-1.1.6.ebuild                      | 114 --------------------
 6 files changed, 357 deletions(-)

diff --git a/net-misc/sks/Manifest b/net-misc/sks/Manifest
index 7d543a7072d..9fcce71046f 100644
--- a/net-misc/sks/Manifest
+++ b/net-misc/sks/Manifest
@@ -1,2 +1 @@
-DIST sks-1.1.5.tgz 362941 SHA256 92a7f113f0ba7a28d51d7ced60a984d042d8524c651dc3fcafe9d11cc32981a0 SHA512 1fc1248281b4eb6bd0bafad7f3d1600ee86905614ee5c644d532059f972040c2673bee780a414e50e9287fc74fd140ac85db9629d502cff989981904acd3710c WHIRLPOOL 4281b40d72e7370b7c848d683beff2f4bd705a06139a25b27efe5be8a521df9fb870bdeeea97ac3617d542b64fd9c539f90d8f695cea1fec2bdcf267a2d3dc1f
 DIST sks-1.1.6.tgz 359499 SHA256 22312dbec6dfd372932075b0b0b1d04f772059a9520faa4937feafc737d5a632 SHA512 f7c54194274834840b9701bf827b81add0f807dd4c6019968a6b0c755c9117519433ebb1161da38d23c465b163dd31a766700023afa13174e4dc82542fa98099 WHIRLPOOL 85714515275c21821ff3bc429d00546f1f3b1cf6b8193edd1b26295ec07861ed1ed8b123deb811b6b915d761e977662398e7509581d8fe0e32d47ea6dd09388a

diff --git a/net-misc/sks/files/sks-1.1.5-curve25519.patch b/net-misc/sks/files/sks-1.1.5-curve25519.patch
deleted file mode 100644
index ccf484f4552..00000000000
--- a/net-misc/sks/files/sks-1.1.5-curve25519.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -r 1a1b0b48e642 parsePGP.ml
---- a/parsePGP.ml	Tue May 26 12:21:29 2015 -0400
-+++ b/parsePGP.ml	Tue Oct 13 14:46:03 2015 +0900
-@@ -151,6 +151,7 @@
-      | "\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 *)  
-+     | "\x2b\x06\x01\x04\x01\x97\x55\x01\x05\x01" -> 256 (* cv25519 *)
-      | _ -> failwith "Unknown OID"
-    in
-    psize

diff --git a/net-misc/sks/files/sks-1.1.5-disable-warn-error-a.patch b/net-misc/sks/files/sks-1.1.5-disable-warn-error-a.patch
deleted file mode 100644
index 18af6c524a2..00000000000
--- a/net-misc/sks/files/sks-1.1.5-disable-warn-error-a.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 5142992b465e87181a4674ac614bf7d2fd7110c4 Mon Sep 17 00:00:00 2001
-From: Kristian Fiskerstrand <kristian.fiskerstrand@××××××××××××××××.com>
-Date: Sun, 26 Jul 2015 21:25:53 +0200
-Subject: [PATCH] (Makefile) Disable warn-error A
-
-warn-error A is set for development versions (tagged with +) upstream,
-however it is not intended to actually be fatal errors for released
-versions. We want to keep EdDSA support, i.e it is actually one
-commit past 1.1.5, so just disabling making warnings fatal.
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index 543c531..d4a1222 100644
---- a/Makefile
-+++ b/Makefile
-@@ -49,7 +49,7 @@ SKSVS=$(shell grep 'version_suffix = "+"' common.ml)
- ifeq ($(strip $(SKSVS)),)
- WARNERR=
- else
--WARNERR=-warn-error A
-+WARNERR=
- endif
- 
- CAMLP4=-pp $(CAMLP4O)
--- 
-2.3.6
-

diff --git a/net-misc/sks/files/sks-1.1.5-eddsa.patch b/net-misc/sks/files/sks-1.1.5-eddsa.patch
deleted file mode 100644
index 36359f233c4..00000000000
--- a/net-misc/sks/files/sks-1.1.5-eddsa.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-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-r3.ebuild b/net-misc/sks/sks-1.1.5-r3.ebuild
deleted file mode 100644
index 6d440f02567..00000000000
--- a/net-misc/sks/sks-1.1.5-r3.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib user readme.gentoo systemd
-
-DESCRIPTION="An OpenPGP keyserver which is decentralized with highly reliable synchronization"
-HOMEPAGE="https://bitbucket.org/skskeyserver/sks-keyserver"
-SRC_URI="https://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 database, 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-4.0
-	dev-ml/camlp4
-	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"
-	epatch "${FILESDIR}/${P}-disable-warn-error-a.patch"
-	epatch "${FILESDIR}/${P}-curve25519.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;
-}

diff --git a/net-misc/sks/sks-1.1.6.ebuild b/net-misc/sks/sks-1.1.6.ebuild
deleted file mode 100644
index 98b924ffcf6..00000000000
--- a/net-misc/sks/sks-1.1.6.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib user readme.gentoo systemd
-
-DESCRIPTION="An OpenPGP keyserver which is decentralized with highly reliable synchronization"
-HOMEPAGE="https://bitbucket.org/skskeyserver/sks-keyserver"
-SRC_URI="https://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 database, 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-4.0
-	dev-ml/camlp4
-	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
-}
-
-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;
-}