[gentoo-commits] gentoo-x86 commit in net-misc/sks: sks-1.1.5.ebuild ChangeLog sks-1.1.4-r1.ebuild sks-1.1.2.ebuild sks-1.1.4.ebuild

[Manuel Rueger (mrueg)]

mrueg       14/05/05 22:02:47

  Modified:             ChangeLog
  Added:                sks-1.1.5.ebuild
  Removed:              sks-1.1.4-r1.ebuild sks-1.1.2.ebuild
                        sks-1.1.4.ebuild
  Log:
  Version bump. Cleanup old. Proxy commit for Kristian Fiskerstrand. Fixes bug #509352 (CVE-2014-3207).
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key )

Revision  Changes    Path
1.10                 net-misc/sks/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/sks/ChangeLog?rev=1.10&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/sks/ChangeLog?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/sks/ChangeLog?r1=1.9&r2=1.10

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/sks/ChangeLog,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ChangeLog	13 Dec 2013 09:29:03 -0000	1.9
+++ ChangeLog	5 May 2014 22:02:47 -0000	1.10
@@ -1,6 +1,15 @@
 # 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.9 2013/12/13 09:29:03 patrick Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/sks/ChangeLog,v 1.10 2014/05/05 22:02:47 mrueg Exp $
+
+*sks-1.1.5 (05 May 2014)
+
+  05 May 2014; Manuel Rüger <mrueg@g.o> +sks-1.1.5.ebuild,
+  -files/bdb_stubs-gentoo.patch, -files/sks-1.1.4-ECC_OID_fix_x86.patch,
+  -files/sks-1.1.4-man_url.patch, -sks-1.1.2.ebuild, -sks-1.1.4-r1.ebuild,
+  -sks-1.1.4.ebuild:
+  Version bump. Cleanup old. Proxy commit for Kristian Fiskerstrand. Fixes bug
+  #509352 (CVE-2014-3207).
 
   13 Dec 2013; Patrick Lauer <patrick@g.o> sks-1.1.4-r1.ebuild:
   Whitespace



1.1                  net-misc/sks/sks-1.1.5.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/sks/sks-1.1.5.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/sks/sks-1.1.5.ebuild?rev=1.1&content-type=text/plain

Index: sks-1.1.5.ebuild
===================================================================
# Copyright 1999-2014 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.ebuild,v 1.1 2014/05/05 22:02:47 mrueg 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
}

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;
}