* [gentoo-commits] repo/gentoo:master commit in: net-misc/sks/files/, net-misc/sks/
@ 2015-10-31 13:25 Kristian Fiskerstrand
0 siblings, 0 replies; 6+ messages in thread
From: Kristian Fiskerstrand @ 2015-10-31 13:25 UTC (permalink / raw
To: gentoo-commits
commit: 06c7a2c09636cad16fe69eb8e1779d0c7269a0d9
Author: Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 31 13:24:56 2015 +0000
Commit: Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
CommitDate: Sat Oct 31 13:25:16 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06c7a2c0
net-misc/sks: Revision bump, adding curve25519 encryption support
Upstream patch in issue
https://bitbucket.org/skskeyserver/sks-keyserver/issues/36/curve25519-oid-for-encryption
has been reviewed and is going for inclusion
Package-Manager: portage-2.2.20.1
net-misc/sks/files/sks-1.1.5-curve25519.patch | 11 +++
net-misc/sks/sks-1.1.5-r2.ebuild | 118 ++++++++++++++++++++++++++
2 files changed, 129 insertions(+)
diff --git a/net-misc/sks/files/sks-1.1.5-curve25519.patch b/net-misc/sks/files/sks-1.1.5-curve25519.patch
new file mode 100644
index 0000000..ccf484f
--- /dev/null
+++ b/net-misc/sks/files/sks-1.1.5-curve25519.patch
@@ -0,0 +1,11 @@
+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/sks-1.1.5-r2.ebuild b/net-misc/sks/sks-1.1.5-r2.ebuild
new file mode 100644
index 0000000..4aa095c
--- /dev/null
+++ b/net-misc/sks/sks-1.1.5-r2.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="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 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"
+ 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;
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/sks/files/, net-misc/sks/
@ 2017-06-25 22:34 Kristian Fiskerstrand
0 siblings, 0 replies; 6+ messages in thread
From: Kristian Fiskerstrand @ 2017-06-25 22:34 UTC (permalink / raw
To: gentoo-commits
commit: c5d3a33403d2ff4f05b29ec925e06adf600e6a98
Author: Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 25 22:34:09 2017 +0000
Commit: Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
CommitDate: Sun Jun 25 22:34:41 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5d3a334
net-misc/sks: Unbundle cryptokit
Gentoo-Bug: 591326
Package-Manager: Portage-2.3.6, Repoman-2.3.1
.../sks/files/sks-1.1.6-unbundle-cryptokit.patch | 79 ++++++++++++++
net-misc/sks/sks-1.1.6-r1.ebuild | 117 +++++++++++++++++++++
2 files changed, 196 insertions(+)
diff --git a/net-misc/sks/files/sks-1.1.6-unbundle-cryptokit.patch b/net-misc/sks/files/sks-1.1.6-unbundle-cryptokit.patch
new file mode 100644
index 00000000000..da11839fa12
--- /dev/null
+++ b/net-misc/sks/files/sks-1.1.6-unbundle-cryptokit.patch
@@ -0,0 +1,79 @@
+diff -r 4af75b3526d9 Makefile
+--- a/Makefile Sun Jun 25 20:39:45 2017 +0000
++++ b/Makefile Mon Jun 26 00:27:10 2017 +0200
+@@ -53,10 +53,11 @@
+ endif
+
+ CAMLP4=-pp $(CAMLP4O)
+-CAMLINCLUDE= -I lib -I bdb
++CRYPTOKIT=$(shell ocamlfind query cryptokit)
++CAMLINCLUDE= -I lib -I bdb -I $(CRYPTOKIT)
+ COMMONCAMLFLAGS=$(CAMLINCLUDE) $(OCAMLLIB) $(CAMLLDFLAGS) -ccopt -Lbdb -dtypes $(WARNERR)
+ OCAMLDEP=ocamldep $(CAMLP4)
+-CAMLLIBS=unix.cma str.cma bdb.cma nums.cma bigarray.cma cryptokit.cma
++CAMLLIBS=unix.cma str.cma bdb.cma nums.cma bigarray.cma $(CRYPTOKIT)/cryptokit.cma
+ OCAMLFLAGS=$(COMMONCAMLFLAGS) -g $(CAMLLIBS)
+ OCAMLOPTFLAGS=$(COMMONCAMLFLAGS) -inline 40 $(CAMLLIBS:.cma=.cmxa)
+
+@@ -107,7 +108,7 @@
+
+ EXEOBJS.bc=$(RSERVOBJS.bc) build.cmo fastbuild.cmo dbserver.cmo pdiskTest.cmo
+
+-LIBS.bc= lib/cryptokit.cma bdb/bdb.cma
++LIBS.bc= bdb/bdb.cma
+ LIBS=$(LIBS.bc:.cma=.cmxa)
+
+ VERSION := $(shell cat VERSION)
+@@ -278,32 +279,11 @@
+ touch prepared
+
+
+-CKVER=cryptokit-1.7
+-CKDIR=$(CKVER)/src
+-
+ $(CKVER)/README.txt:
+ tar xmvfz $(CKVER).tar.gz
+ patch -p 0 < $(CKVER)-sks.patch
+ patch -p 0 < $(CKVER)-sks-custom_compare.patch
+
+-$(CKDIR)/cryptokit.cma: $(CKVER)/README.txt
+- cd $(CKDIR) && $(MAKE) all
+-
+-$(CKDIR)/cryptokit.cmxa: $(CKVER)/README.txt
+- cd $(CKDIR) && $(MAKE) allopt
+-
+-lib/cryptokit.cma: $(CKDIR)/cryptokit.cma $(CKDIR)/cryptokit.cmxa prepared
+- cp $(CKDIR)/cryptokit.cmi $(CKDIR)/cryptokit.cma \
+- $(CKDIR)/cryptokit.mli lib
+- cp $(CKDIR)/libcryptokit.a lib
+- if test -f $(CKDIR)/dllcryptokit.so; then \
+- cp $(CKDIR)/dllcryptokit.so lib; fi
+- if test -f $(CKDIR)/cryptokit.cmxa; then \
+- cp $(CKDIR)/cryptokit.cmxa $(CKDIR)/cryptokit.cmx \
+- $(CKDIR)/cryptokit.a lib; fi
+-
+-lib/cryptokit.cmxa: lib/cryptokit.cma
+-
+ ################################
+ # old stuff
+ ################################
+@@ -340,16 +320,16 @@
+ dumbloop: $(LIBS) $(ALLOBJS) dumbloop.cmo
+ $(OCAMLC) -o dumbloop $(OCAMLFLAGS) $(ALLOBJS) dumbloop.cmo
+
+-scan: $(OBJS) cryptokit dblib scan.ml
++scan: $(OBJS) dblib scan.ml
+ $(OCAMLC) -o scan $(OCAMLFLAGS) $(OBJS) scan.ml
+
+ query: $(LIBS) $(ALLOBJS) query.cmo
+ $(OCAMLC) -o query $(OCAMLFLAGS) $(ALLOBJS) query.cmo
+
+-printids: $(OBJS:.cmo=.cmx) cryptokit printids.ml
++printids: $(OBJS:.cmo=.cmx) printids.ml
+ $(OCAMLOPT) -o printids $(OCAMLOPTFLAGS) $(OBJS:.cmo=.cmx) printids.ml
+
+-printids.bc: $(OBJS) cryptokit printids.ml
++printids.bc: $(OBJS) printids.ml
+ $(OCAMLC) -o printids $(OCAMLFLAGS) $(OBJS) printids.ml
+
+ krecode: $(ALLOBJS.opt) $(LIBS) recode.ml
diff --git a/net-misc/sks/sks-1.1.6-r1.ebuild b/net-misc/sks/sks-1.1.6-r1.ebuild
new file mode 100644
index 00000000000..1368af1fdc2
--- /dev/null
+++ b/net-misc/sks/sks-1.1.6-r1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib user readme.gentoo-r1 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/findlib
+ dev-ml/camlp4
+ dev-ml/cryptokit:0/1.10
+ sys-libs/db:5.3"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+ ebegin "Creating named group and user"
+ enewgroup sks
+ enewuser sks -1 -1 /var/lib/sks sks
+}
+
+src_prepare() {
+ eapply "${FILESDIR}/${P}-unbundle-cryptokit.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/db5.3/:g" \
+ -e "s:^LIBDB=.*$:LIBDB=-ldb-5.3: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
+ eapply_user
+}
+
+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;
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/sks/files/, net-misc/sks/
@ 2017-06-28 7:38 Kristian Fiskerstrand
0 siblings, 0 replies; 6+ messages in thread
From: Kristian Fiskerstrand @ 2017-06-28 7:38 UTC (permalink / raw
To: gentoo-commits
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@sumptuouscapital.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;
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/sks/files/, net-misc/sks/
@ 2017-07-09 19:11 Kristian Fiskerstrand
0 siblings, 0 replies; 6+ messages in thread
From: Kristian Fiskerstrand @ 2017-07-09 19:11 UTC (permalink / raw
To: gentoo-commits
commit: 5572206ce66a7efca524f9ac45221ddbda28e185
Author: Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 9 19:10:49 2017 +0000
Commit: Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
CommitDate: Sun Jul 9 19:11:16 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5572206c
net-misc/sks: backport a few additional fixes from upstream
Package-Manager: Portage-2.3.6, Repoman-2.3.1
net-misc/sks/files/sks-1.1.6-use-ocamlfind2.patch | 19 ++++
net-misc/sks/files/sks-1.1.6-use-ocamlfind3.patch | 21 ++++
net-misc/sks/sks-1.1.6-r5.ebuild | 118 ++++++++++++++++++++++
3 files changed, 158 insertions(+)
diff --git a/net-misc/sks/files/sks-1.1.6-use-ocamlfind2.patch b/net-misc/sks/files/sks-1.1.6-use-ocamlfind2.patch
new file mode 100644
index 00000000000..1fba250fd4b
--- /dev/null
+++ b/net-misc/sks/files/sks-1.1.6-use-ocamlfind2.patch
@@ -0,0 +1,19 @@
+# HG changeset patch
+# User Kristian Fiskerstrand <kf@sumptuouscapital.com>
+# Date 1499610580 -7200
+# Node ID 719ffdf628a81a2f052f3b6dc746a3e1d37afe30
+# Parent 6352f0dbcadf35aac29c2fbf10fb218ae50d9c77
+Fix nums specification
+
+diff --git a/Makefile b/Makefile
+--- a/Makefile
++++ b/Makefile
+@@ -56,7 +56,7 @@
+ CAMLINCLUDE= -package cryptokit,unix,str,bigarray -I lib -I bdb
+ COMMONCAMLFLAGS=$(CAMLINCLUDE) $(OCAMLLIB) $(CAMLLDFLAGS) -ccopt -Lbdb -dtypes $(WARNERR)
+ OCAMLDEP=ocamldep $(CAMLP4)
+-CAMLLIBS=bdb.cma nums.cma
++CAMLLIBS=bdb.cma
+ OCAMLFLAGS=$(COMMONCAMLFLAGS) -linkpkg -g $(CAMLLIBS)
+ OCAMLOPTFLAGS=$(COMMONCAMLFLAGS) -linkpkg -inline 40 $(CAMLLIBS:.cma=.cmxa)
+
diff --git a/net-misc/sks/files/sks-1.1.6-use-ocamlfind3.patch b/net-misc/sks/files/sks-1.1.6-use-ocamlfind3.patch
new file mode 100644
index 00000000000..ea5a82db653
--- /dev/null
+++ b/net-misc/sks/files/sks-1.1.6-use-ocamlfind3.patch
@@ -0,0 +1,21 @@
+# HG changeset patch
+# User Kristian Fiskerstrand <kf@sumptuouscapital.com>
+# Date 1499612080 -7200
+# Node ID 0106ba2f6abc8ee2f685026d3f218730114a60fa
+# Parent 719ffdf628a81a2f052f3b6dc746a3e1d37afe30
+Add num to findlib packages
+
+Although nums is detected, making this explicit
+
+diff --git a/Makefile b/Makefile
+--- a/Makefile
++++ b/Makefile
+@@ -53,7 +53,7 @@
+ endif
+
+ CAMLP4=-pp $(CAMLP4O)
+-CAMLINCLUDE= -package cryptokit,unix,str,bigarray -I lib -I bdb
++CAMLINCLUDE= -package cryptokit,unix,str,bigarray,num -I lib -I bdb
+ COMMONCAMLFLAGS=$(CAMLINCLUDE) $(OCAMLLIB) $(CAMLLDFLAGS) -ccopt -Lbdb -dtypes $(WARNERR)
+ OCAMLDEP=ocamldep $(CAMLP4)
+ CAMLLIBS=bdb.cma
diff --git a/net-misc/sks/sks-1.1.6-r5.ebuild b/net-misc/sks/sks-1.1.6-r5.ebuild
new file mode 100644
index 00000000000..3ca116dbae9
--- /dev/null
+++ b/net-misc/sks/sks-1.1.6-r5.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib user readme.gentoo-r1 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"
+
+RDEPEND=">=dev-lang/ocaml-4.0:=
+ dev-ml/camlp4:=
+ dev-ml/cryptokit:=
+ sys-libs/db:5.3"
+DEPEND="${RDEPEND}
+ dev-ml/findlib"
+
+pkg_setup() {
+ ebegin "Creating named group and user"
+ enewgroup sks
+ enewuser sks -1 -1 /var/lib/sks sks
+}
+
+src_prepare() {
+ eapply "${FILESDIR}/${P}-unbundle-cryptokit.patch" \
+ "${FILESDIR}/${P}-use-ocamlfind.patch" \
+ "${FILESDIR}/${P}-use-ocamlfind2.patch" \
+ "${FILESDIR}/${P}-use-ocamlfind3.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/db5.3/:g" \
+ -e "s:^LIBDB=.*$:LIBDB=-ldb-5.3:g" \
+ -e "s:^PREFIX=.*$:PREFIX=${D}/usr:g" \
+ -e "s:^MANDIR=.*$:MANDIR=${D}/usr/share/man:g" \
+ Makefile.local || die
+ sed -i \
+ -e 's:/usr/sbin/sks:/usr/bin/sks:g' \
+ sks_build.sh || die
+ eapply_user
+}
+
+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;
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/sks/files/, net-misc/sks/
@ 2020-10-08 22:41 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2020-10-08 22:41 UTC (permalink / raw
To: gentoo-commits
commit: a5dd34d1d01a2a3e1fba5e99a9f9154326d33c62
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 8 22:29:35 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Oct 8 22:40:28 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5dd34d1
net-misc/sks: take 20200624 snapshot
Closes: https://bugs.gentoo.org/704246
Closes: https://bugs.gentoo.org/625546
Closes: https://bugs.gentoo.org/725174
Closes: https://bugs.gentoo.org/710946
Closes: https://bugs.gentoo.org/713160
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-misc/sks/Manifest | 1 +
.../sks/files/sks-1.1.6_p20200624-QA-fixups.patch | 71 +++++++++++
...s-1.1.6_p20200624-respect-CFLAGS-CXXFLAGS.patch | 81 +++++++++++++
net-misc/sks/sks-1.1.6_p20200624.ebuild | 132 +++++++++++++++++++++
4 files changed, 285 insertions(+)
diff --git a/net-misc/sks/Manifest b/net-misc/sks/Manifest
index 389f58d91ae..1533b8e4a5c 100644
--- a/net-misc/sks/Manifest
+++ b/net-misc/sks/Manifest
@@ -1 +1,2 @@
DIST sks-1.1.6.tgz 359499 BLAKE2B 6fb92aab93db8e19536db7df6a05bccc4c13a4859b8df8dba29da1bbfe854d65d5ed1b99d042f9f1509f07187810f25500513f2730a2c8fb579fdd4cd00c820c SHA512 f7c54194274834840b9701bf827b81add0f807dd4c6019968a6b0c755c9117519433ebb1161da38d23c465b163dd31a766700023afa13174e4dc82542fa98099
+DIST sks-1.1.6_p20200624.tar.gz 213871 BLAKE2B d44dc73aa49bf1b1375acbb141dd7f62732866f87e48d25d0ed3fdae4e00f7ced42bef2fe73ea0a065772b8b33b7e9da14508b5d8591313566269c24bd9c1d6a SHA512 b0de7803afd61b45051daad67b2b63f9b4685c7820485326c63e053ce09f545ff0b9b8a91fb6543712c16e508ab20176d259c2fba3a47e0e75a862932954183a
diff --git a/net-misc/sks/files/sks-1.1.6_p20200624-QA-fixups.patch b/net-misc/sks/files/sks-1.1.6_p20200624-QA-fixups.patch
new file mode 100644
index 00000000000..3657a8bd5f0
--- /dev/null
+++ b/net-misc/sks/files/sks-1.1.6_p20200624-QA-fixups.patch
@@ -0,0 +1,71 @@
+diff --git a/Makefile b/Makefile
+index f182225..c84368e 100644
+--- a/Makefile
++++ b/Makefile
+@@ -15,8 +15,8 @@
+ # USA
+ #
+ CINCLUDES=-I$(shell ocamlc -where)
+-CFLAGS+=-O3 -Werror-implicit-function-declaration $(CINCLUDES) -I .
+-CXXFLAGS+=-O3 $(CINCLUDES) -I .
++CFLAGS+=$(CINCLUDES) -I .
++CXXFLAGS+=$(CINCLUDES) -I .
+
+ ifndef OCAMLC
+ OCAMLC=ocamlfind ocamlc
+@@ -60,8 +60,8 @@ OCAMLFLAGS=$(COMMONCAMLFLAGS) -linkpkg -g $(CAMLLIBS)
+ OCAMLOPTFLAGS=$(COMMONCAMLFLAGS) -linkpkg -inline 40 $(CAMLLIBS:.cma=.cmxa)
+
+ EXE=sks sks_add_mail
+-ALL=$(EXE) sks.8.gz
+-ALL.bc=$(EXE:=.bc) sks.8.gz
++ALL=$(EXE) sks.8
++ALL.bc=$(EXE:=.bc) sks.8
+
+ all: $(ALL)
+ all.bc: $(ALL.bc)
+@@ -132,13 +132,13 @@ install:
+ mkdir -p $(DESTDIR)$(PREFIX)/bin
+ install sks_build.sh sks sks_add_mail $(DESTDIR)$(PREFIX)/bin
+ mkdir -p $(DESTDIR)$(MANDIR)/man8
+- install sks.8.gz $(DESTDIR)$(MANDIR)/man8
++ install sks.8 $(DESTDIR)$(MANDIR)/man8
+
+ install.bc:
+ mkdir -p $(DESTDIR)$(PREFIX)/bin
+ install sks_build.bc.sh sks.bc sks_add_mail.bc $(DESTDIR)$(PREFIX)/bin
+ mkdir -p $(DESTDIR)$(MANDIR)/man8
+- install sks.8.gz $(DESTDIR)$(MANDIR)/man8
++ install sks.8 $(DESTDIR)$(MANDIR)/man8
+
+
+ Makefile.local:
+@@ -151,9 +151,6 @@ src:
+
+ # Ordinary targets
+
+-sks.8.gz: sks.8
+- gzip -9nf sks.8
+-
+ sks.8: sks.pod
+ pod2man -c "SKS OpenPGP Key server" --section 8 -r 0.1 -name sks sks.pod sks.8
+
+diff --git a/bdb/Makefile b/bdb/Makefile
+index 0913014..4a68399 100644
+--- a/bdb/Makefile
++++ b/bdb/Makefile
+@@ -15,11 +15,11 @@
+ -include ../Makefile.local
+
+ CINCLUDES=-I$(shell ocamlc -where) $(BDBINCLUDE)
+-CFLAGS+=-O3 -Werror-implicit-function-declaration $(CINCLUDES) $(BDBLIB) -I .
+-CXXFLAGS+=-O3 $(CINCLUDES) $(BDBLIB) -I .
++CFLAGS+=$(CINCLUDES) $(BDBLIB) -I .
++CXXFLAGS+=$(CINCLUDES) $(BDBLIB) -I .
+
+ MKLIB=ocamlmklib
+-RANLIB=ranlib
++RANLIB?=ranlib
+ OCAMLDEP=ocamldep $(PP)
+ CAMLINCLUDE=
+ COMMONCAMLFLAGS= $(CAMLINCLUDE) $(PP) #-thread
diff --git a/net-misc/sks/files/sks-1.1.6_p20200624-respect-CFLAGS-CXXFLAGS.patch b/net-misc/sks/files/sks-1.1.6_p20200624-respect-CFLAGS-CXXFLAGS.patch
new file mode 100644
index 00000000000..02da8d2d2e7
--- /dev/null
+++ b/net-misc/sks/files/sks-1.1.6_p20200624-respect-CFLAGS-CXXFLAGS.patch
@@ -0,0 +1,81 @@
+https://sources.debian.org/src/sks/1.1.6+git20200620.9e9d504-1/debian/patches/0008-accept-and-use-CFLAGS-and-CPPFLAGS-from-environment.patch/
+----
+From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+Date: Mon, 8 Aug 2016 13:20:38 -0400
+Subject: accept and use CFLAGS and CPPFLAGS from environment
+
+---
+ Makefile | 9 +++++----
+ bdb/Makefile | 14 ++++++++------
+ 2 files changed, 13 insertions(+), 10 deletions(-)
+
+--- a/Makefile
++++ b/Makefile
+@@ -14,7 +14,7 @@
+ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ # USA
+ #
+-CINCLUDES=-I`ocamlc -where`
++CINCLUDES=-I$(shell ocamlc -where)
+ CFLAGS+=-O3 -Werror-implicit-function-declaration $(CINCLUDES) -I .
+ CXXFLAGS+=-O3 $(CINCLUDES) -I .
+
+@@ -43,6 +43,7 @@ else
+ endif
+
+ CAMLLDFLAGS=$(foreach x, $(LDFLAGS), -ccopt $(x))
++CAMLCFLAGS=$(foreach x, $(CFLAGS), -ccopt $(x)) $(foreach x, $(CPPFLAGS), -ccopt $(x))
+
+ SKSVS=$(shell grep 'version_suffix = "+"' common.ml)
+ ifeq ($(strip $(SKSVS)),)
+@@ -52,7 +53,7 @@ WARNERR=-warn-error A
+ endif
+
+ CAMLINCLUDE= -package cryptokit,unix,str,bigarray,num -I bdb
+-COMMONCAMLFLAGS=$(CAMLINCLUDE) $(OCAMLLIB) $(CAMLLDFLAGS) -ccopt -Lbdb -annot -bin-annot $(WARNERR)
++COMMONCAMLFLAGS=$(CAMLINCLUDE) $(OCAMLLIB) $(CAMLCFLAGS) $(CAMLLDFLAGS) -ccopt -Lbdb -annot -bin-annot $(WARNERR)
+ OCAMLDEP=ocamldep
+ CAMLLIBS=bdb.cma
+ OCAMLFLAGS=$(COMMONCAMLFLAGS) -linkpkg -g $(CAMLLIBS)
+--- a/bdb/Makefile
++++ b/bdb/Makefile
+@@ -14,7 +14,7 @@
+ # $Id: Makefile,v 1.6 2003/07/05 15:16:29 yminsky Exp $
+ -include ../Makefile.local
+
+-CINCLUDES=-I`ocamlc -where` $(BDBINCLUDE)
++CINCLUDES=-I$(shell ocamlc -where) $(BDBINCLUDE)
+ CFLAGS+=-O3 -Werror-implicit-function-declaration $(CINCLUDES) $(BDBLIB) -I .
+ CXXFLAGS+=-O3 $(CINCLUDES) $(BDBLIB) -I .
+
+@@ -27,6 +27,8 @@ CAMLLIBS=unix.cma str.cma mylibs.cma
+ OCAMLFLAGS=$(COMMONCAMLFLAGS) -g
+ OCAMLOPTFLAGS=$(COMMONCAMLFLAGS) -inline 40
+
++CAMLCFLAGS=$(foreach x, $(CFLAGS), -ccopt $(x)) $(foreach x, $(CPPFLAGS), -ccopt $(x))
++
+ ifndef LIBDB
+ LIBDB=-ldb-4.6
+ endif
+@@ -37,7 +39,7 @@ ocextr: ocextr.ml
+ $(OCAMLC) -o ocextr ocextr.ml
+
+ libbdb.a: $(COBJS)
+- $(MKLIB) -custom -o bdb $(COBJS)
++ $(MKLIB) $(CAMLCFLAGS) -custom -o bdb $(COBJS)
+
+ bdb_stubs.o: bdb_stubs.h bdb_stubs.c
+
+@@ -45,10 +47,10 @@ bdb.ml: ocextr bdb_stubs.c
+ ./ocextr bdb_stubs.c > bdb.ml
+
+ bdb.cma: bdb.cmo libbdb.a
+- $(MKLIB) -custom -o bdb bdb.cmo -lbdb $(LIBDB)
++ $(MKLIB) $(CAMLCFLAGS) -custom -o bdb bdb.cmo -lbdb $(LIBDB)
+
+ bdb.cmxa: bdb.cmx libbdb.a
+- $(MKLIB) -custom -o bdb bdb.cmx -lbdb $(LIBDB)
++ $(MKLIB) $(CAMLCFLAGS) -custom -o bdb bdb.cmx -lbdb $(LIBDB)
+
+ bdbcaml: bdb.cma
+ ocamlmktop -o bdbcaml -custom unix.cma bdb.cma $^
diff --git a/net-misc/sks/sks-1.1.6_p20200624.ebuild b/net-misc/sks/sks-1.1.6_p20200624.ebuild
new file mode 100644
index 00000000000..7c9d13994f7
--- /dev/null
+++ b/net-misc/sks/sks-1.1.6_p20200624.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit readme.gentoo-r1 systemd toolchain-funcs
+
+COMMIT="591a7834dc9f1dff3d336d769a6561138a5befe7"
+DESCRIPTION="An OpenPGP keyserver which is decentralized with highly reliable synchronization"
+HOMEPAGE="https://github.com/SKS-Keyserver/sks-keyserver"
+SRC_URI="https://github.com/SKS-Keyserver/sks-keyserver/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-keyserver-${COMMIT}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="optimize test"
+RESTRICT="!test? ( 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"
+
+RDEPEND="
+ acct-user/sks
+ acct-group/sks
+ >=dev-lang/ocaml-4.0:=
+ dev-ml/camlp4:=
+ dev-ml/cryptokit:=
+ dev-ml/num:=
+ sys-libs/db:5.3
+"
+DEPEND="${RDEPEND}
+ dev-ml/findlib"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.1.6_p20200624-respect-CFLAGS-CXXFLAGS.patch"
+ "${FILESDIR}/${PN}-1.1.6_p20200624-QA-fixups.patch"
+)
+
+QA_FLAGS_IGNORED=(
+ /usr/bin/sks_add_mail
+)
+
+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/db5.3/:g" \
+ -e "s:^LIBDB=.*$:LIBDB=-ldb-5.3:g" \
+ -e "s:^PREFIX=.*$:PREFIX=${D}/usr:g" \
+ -e "s:^MANDIR=.*$:MANDIR=${D}/usr/share/man:g" \
+ Makefile.local || die
+ sed -i \
+ -e 's:/usr/sbin/sks:/usr/bin/sks:g' \
+ sks_build.sh || die
+
+ dosym sks_build.sh /usr/bin/sks_build.bc.sh
+ default
+}
+
+src_compile() {
+ tc-export CC CXX RANLIB
+
+ emake dep
+ # sks build fails with parallel 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 sks.bc usr/bin/sks
+ dosym 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
+ fowners sks:sks /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;
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/sks/files/, net-misc/sks/
@ 2024-03-25 5:56 Robin H. Johnson
0 siblings, 0 replies; 6+ messages in thread
From: Robin H. Johnson @ 2024-03-25 5:56 UTC (permalink / raw
To: gentoo-commits
commit: 10e3fa8b58a6d0224cba3d2b2e2df958891879f0
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 25 05:52:58 2024 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Mar 25 05:55:35 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10e3fa8b
net-misc/sks: match init.d behavior
- support args to systemd service
- ensure paths are correctly owned (/var/lib/sks/{PTree,KDB} must exist)
- sks-recon must start after sks-db
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
net-misc/sks/files/sks-db.service | 7 ++++++-
net-misc/sks/files/sks-recon.service | 7 +++++--
...sks-1.1.6_p20200624-r1.ebuild => sks-1.1.6_p20200624-r2.ebuild} | 0
3 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/net-misc/sks/files/sks-db.service b/net-misc/sks/files/sks-db.service
index bbc3ba7e2b2d..b48db1add6ff 100644
--- a/net-misc/sks/files/sks-db.service
+++ b/net-misc/sks/files/sks-db.service
@@ -3,8 +3,13 @@ Description=SKS database thread
After=network.target
[Service]
-ExecStart=/usr/bin/sks db
+Environment=SKS_DIR=/var/lib/sks
+EnvironmentFile=-/etc/sysconfig/sks
+ExecStartPre=/usr/lib/rc/bin/checkpath --owner sks:sks --directory ${SKS_DIR} ${SKS_DIR}/SKS ${SKS_DIR}/PTree
+ExecStartPre=/usr/lib/rc/bin/checkpath --owner sks:sks --file ${SKS_DIR}/*.log ${SKS_DIR}/KDB/* ${SKS_DIR}/PTree/*
+ExecStart=/usr/bin/sks db ${SKS_OPTIONS} ${SKS_DB_OPTIONS}
User=sks
+# WorkingDirectory cannot use a variable
WorkingDirectory=/var/lib/sks
[Install]
diff --git a/net-misc/sks/files/sks-recon.service b/net-misc/sks/files/sks-recon.service
index 97ee52ffc0ed..d56731d1c961 100644
--- a/net-misc/sks/files/sks-recon.service
+++ b/net-misc/sks/files/sks-recon.service
@@ -1,10 +1,13 @@
[Unit]
Description=SKS key reconnaissance thread
-After=network.target
+After=network.target sks-db.service
[Service]
-ExecStart=/usr/bin/sks recon
+Environment=SKS_DIR=/var/lib/sks
+EnvironmentFile=-/etc/sysconfig/sks
+ExecStart=/usr/bin/sks recon ${SKS_OPTIONS} ${SKS_RECON_OPTIONS}
User=sks
+# WorkingDirectory cannot use a variable
WorkingDirectory=/var/lib/sks
[Install]
diff --git a/net-misc/sks/sks-1.1.6_p20200624-r1.ebuild b/net-misc/sks/sks-1.1.6_p20200624-r2.ebuild
similarity index 100%
rename from net-misc/sks/sks-1.1.6_p20200624-r1.ebuild
rename to net-misc/sks/sks-1.1.6_p20200624-r2.ebuild
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-03-25 5:56 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-06-25 22:34 [gentoo-commits] repo/gentoo:master commit in: net-misc/sks/files/, net-misc/sks/ Kristian Fiskerstrand
-- strict thread matches above, loose matches on Subject: below --
2024-03-25 5:56 Robin H. Johnson
2020-10-08 22:41 Sam James
2017-07-09 19:11 Kristian Fiskerstrand
2017-06-28 7:38 Kristian Fiskerstrand
2015-10-31 13:25 Kristian Fiskerstrand
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox