Update doc url in man-page, create docfile. Patches by Kristian Fiskerstrand.

Package-Manager: portage-2.2.7/cvs/Linux x86_64

4 files changed, 140 insertions, 2 deletions

diff --git a/net-misc/sks/ChangeLog b/net-misc/sks/ChangeLog
index 42ff1e7f47a6..a6e647e78f62 100644
--- a/net-misc/sks/ChangeLog
+++ b/net-misc/sks/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/sks
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/sks/ChangeLog,v 1.7 2013/11/22 02:35:45 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/sks/ChangeLog,v 1.8 2013/12/13 03:40:36 mrueg Exp $
+
+*sks-1.1.4-r1 (13 Dec 2013)
+
+  13 Dec 2013; Manuel Rüger <mrueg@gentoo.org> +files/sks-1.1.4-man_url.patch,
+  +sks-1.1.4-r1.ebuild:
+  Update doc url in man-page, create docfile. Patches by Kristian Fiskerstrand.
 
 *sks-1.1.4 (22 Nov 2013)
 
diff --git a/net-misc/sks/Manifest b/net-misc/sks/Manifest
index f2bba3f566f5..8713165f3b00 100644
--- a/net-misc/sks/Manifest
+++ b/net-misc/sks/Manifest
@@ -1,5 +1,6 @@
 AUX bdb_stubs-gentoo.patch 2999 SHA256 a5a7449c272daa1d95adaa388b1d27d8bce11d3c2a47a5661cec0cf486021752 SHA512 a1131eac45fa1838f1922f56454539e4576d89a6610892aaf759c7d3ff1152041dd8dfbbd0c64414edea918193152f7ea447d3d045aa19cf83947a6295a55659 WHIRLPOOL 616c1cdb9dfffc5a59292994d9c988bd39534566ee484a99c3b9509f6facd37d80c3ab705a5c7d17904ed7fda934cdadb57348eb5caf5632896c8090fe97b14a
 AUX sks-1.1.4-ECC_OID_fix_x86.patch 1293 SHA256 417db295f748d113d8e886ad586a53e84209be58f3690d5665d9df5b98d03b60 SHA512 4c3f8760e550534aad752e70c3ac7c4f84977161b7aa57bd51b6aa2e21e5745e99abc77db436e11c3ee7a2ef4bc53bd379095a0c03cde6f7759a1170c460fcaa WHIRLPOOL fc33da246fc44bf2dfe5ce76d7215076eeb09b9643e6d1ad11b2145469c6b33e77602880ea2f4c2f623d8d73b7e82e81475eec6c3e6cdc7942fb7a3e92b5b879
+AUX sks-1.1.4-man_url.patch 340 SHA256 71a97aef49dbd3c27920c6ce3881f367daf0bfbdc6d80b2a1f46a710da50e8aa SHA512 8267906e9024e98c2c54f657d25f5e0020accf61ab4af09ee0acca64999c5a623d50cfb4c5da1db4de595a1e5c8733ea461d663bb6b8850895e765d889c1f8f7 WHIRLPOOL 88e79a7f8a5fe0f9dda0d002bfce4e0c9462be5429523a2aac47ec190c025372ac18770f37a18e43211660414d22cac1bb0eb46fd7f70be8c6852c9d9976a966
 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
@@ -8,6 +9,7 @@ AUX sks.confd 87 SHA256 811498c2c964ee109dcbf617682addf0631172bb75e9b221af5b4084
 DIST sks-1.1.2.tgz 275724 SHA256 3700d9f91bf2b55d39dea269c22ba2585c70d141dbf9cc386730fd8a3d541396
 DIST sks-1.1.4.tgz 345249 SHA256 baa79be8c1983544518e8a72ccecacb2837d52ae4015dc7cf364cddb53220c76 SHA512 f83c02c995dd3519cfa221c41ab827b9689bcbf91360d2448f83a5dd8b42e7f15665213c4f048ad678da4093d2ec533b6fcc1f5297933ad5f445143b77e14202 WHIRLPOOL eda6d169998434e5eda58dfdd6d7b0e63a5fc493fd38c65d9ce12a2eb5319523c93be4d5244f7fa9f7a3cb408a12b89cbd357e67096b3c914a2e903635970a50
 EBUILD sks-1.1.2.ebuild 1439 SHA256 38ba2979fac456eb69be87e5cfc82583fc26fc5943f519eff06b38a1374da4e1 SHA512 c4aca6fc28b240d5b20baa524136788dcd0ca409dabbf86cae75e70109488b741b4a33e38c71aba671c1c3c99dfecc00832994f47e81979adb016c5f142542d3 WHIRLPOOL 4f1c977ed2738ec57ac1e07551de4b2d9643057b8bb9e8f89b6f7fb318efb4cbd29a6ad89e32453a936ef27f86c01eabb8c09f608270345c7fac6fbca4c490a2
+EBUILD sks-1.1.4-r1.ebuild 3735 SHA256 dbd6b24d98652fa53b2e0750dab2257202e18e915f062900f130141b70b67a75 SHA512 0c1c9facf9a18c13226926e2fffb4477e992b05cb1624051b62526db472b45448d0ee8b3af1e3444685e5fab2b1fcc2ccfb11705b0ce29c37404cda096ca4465 WHIRLPOOL 1e99103cee4cf88ff179fb31cc546cb2bc22ca2215adf8047b5479fdadbfd267eb35d5664e38604bfe030c38294ba9a0c577b55da0af2e43ef64953a9e2406ed
 EBUILD sks-1.1.4.ebuild 3669 SHA256 16c523e6266c02e078dae64314f1523e47e224a289716dab9ff2bf90a955075b SHA512 4e57939c24f53f60df632da3ac773bee8e853db8937635b954ed9daa60f48578cf52d2a5a0969f95efda7d2468d7856748ef489985004f88a6d0b91812c36842 WHIRLPOOL 31073b42adc9ccc21b7c847eaa100fc0c331ed0ea8e0e8b60f60ecadd75b39520a99c8cc479b91aad3556dd31f835085b6ee982caf6be05e8c5a48ae04062927
-MISC ChangeLog 1283 SHA256 bfe8d29b1843119a6aee652ec0c01625bf388b5dc617c1723c7c02c21eeddf40 SHA512 333d01ca362a26d44cf4cd7e61ae547daec727433649cfe309b6ec2c5bff8227e78e2ba98de41b35ee02a86821cb408260ce5e661409b0a0c2fac18c71e6a53e WHIRLPOOL 82e2b0c86ffa5fb493b15a9ddef49c62b12088aea15e7846d03519f010cb16038979bc231ffda7ef27caccb20f99a56ef7c19161ae7dba2b0b0accfad5a93587
+MISC ChangeLog 1497 SHA256 e4d6bc061a780fa97a8da3cf9f72e4352879ec1bc19666baed17cf74685ccded SHA512 bc4530a61ccebf76c25e2b205794842f10f0a0b8e869255c20fedfcad1b0e2e90e915edb5588f43d8210f0554835ad94be80c21c826200e5147ad1f41cb8e3f4 WHIRLPOOL 71dff948fba18f7ac178e2a7f4295b5c6fb2eb6a7a2047d1c1f14238b27b716006994f4f678d8b5d89b210e48df72efd8f679049a28b3f2057586002f82b7df3
 MISC metadata.xml 662 SHA256 3a708be3f9da5ea47b3933c1624d5f527c732fc3913c23f3240325d4a9b22b65 SHA512 1e9deb3390351c80c690453e0ca9dec9b1b77cdec876e5e7a34c3cc6cd19b6b01a70dca749699b8da2a2042d282af9a8933d3fa6a294ce203a69279f11e45004 WHIRLPOOL da86de94115aefa9b34dd7c404b3070716b714805e6f79093a48316f689f09efffbd59b8a280485dad1f7d8db9dfa2da509648f3603bee426f3d236b60f14909
diff --git a/net-misc/sks/files/sks-1.1.4-man_url.patch b/net-misc/sks/files/sks-1.1.4-man_url.patch
new file mode 100644
index 000000000000..dd7af061de3d
--- /dev/null
+++ b/net-misc/sks/files/sks-1.1.4-man_url.patch
@@ -0,0 +1,12 @@
+diff -r 4069c369eaaa -r 10a7587774ea sks.pod
+--- a/sks.pod	Wed Jun 19 00:41:13 2013 -0500
++++ b/sks.pod	Tue Dec 03 18:40:52 2013 +0100
+@@ -392,7 +392,7 @@
+ 
+ =head1 SEE ALSO
+ 
+- The SKS website is located at http://minskyprimus.net/sks/.
++ The SKS website is located at https://bitbucket.org/skskeyserver/sks-keyserver/.
+ 
+ =head1 AUTHOR
+ 
diff --git a/net-misc/sks/sks-1.1.4-r1.ebuild b/net-misc/sks/sks-1.1.4-r1.ebuild
new file mode 100644
index 000000000000..4b0055995cdf
--- /dev/null
+++ b/net-misc/sks/sks-1.1.4-r1.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/sks/sks-1.1.4-r1.ebuild,v 1.1 2013/12/13 03:40:36 mrueg Exp $
+
+EAPI=5
+
+inherit eutils 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() {
+	epatch "${FILESDIR}/${P}-ECC_OID_fix_x86.patch"\
+		"${FILESDIR}/${P}-man_url.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/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 earlier versions of SKS"
+		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;
+}