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 )

7 files changed, 18 insertions, 339 deletions

diff --git a/net-misc/sks/ChangeLog b/net-misc/sks/ChangeLog
index bbcf1e3d7bed..26fdf774c98f 100644
--- a/net-misc/sks/ChangeLog
+++ b/net-misc/sks/ChangeLog
@@ -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@gentoo.org> +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@gentoo.org> sks-1.1.4-r1.ebuild:
   Whitespace
diff --git a/net-misc/sks/files/bdb_stubs-gentoo.patch b/net-misc/sks/files/bdb_stubs-gentoo.patch
deleted file mode 100644
index c28db93853b1..000000000000
--- a/net-misc/sks/files/bdb_stubs-gentoo.patch
+++ /dev/null
@@ -1,110 +0,0 @@
---- bdb/bdb_stubs.c.orig	2012-02-06 14:41:54.294290158 -0800
-+++ bdb/bdb_stubs.c	2012-02-06 14:36:10.853355551 -0800
-@@ -27,7 +27,7 @@
- #define False 0
- 
- 
--void bzero(void* addr,size_t n) {
-+void zerob(void* addr,size_t n) {
-   memset(addr,0,n);
- }
- 
-@@ -210,7 +210,7 @@
- // calls to DB->err and DBENV->err lead to exceptions.
- 
- // FIX: currently, prefix is ignored.  Should be concatenated.
--void raise_db_cb(const DB_ENV *dbenv, const char *prefix, char *msg) {
-+void raise_db_cb(const DB_ENV *dbenv, const char *prefix, const char *msg) {
-     raise_db(msg);
- }
- 
-@@ -512,7 +512,7 @@
- 
-   test_db_closed(db);
- 
--  bzero(&dbt,sizeof(DBT));
-+  zerob(&dbt,sizeof(DBT));
- 
-   dbt.data = String_val(key);
-   dbt.size = string_length(key);
-@@ -542,7 +542,7 @@
- 
-   test_db_closed(db);
-   
--  bzero(&key,sizeof(DBT)); bzero(&data,sizeof(DBT));
-+  zerob(&key,sizeof(DBT)); zerob(&data,sizeof(DBT));
- 
-   key.data = String_val(vkey);
-   key.size = string_length(vkey);
-@@ -577,7 +577,7 @@
- 
-   test_db_closed(db);
- 
--  bzero(&key,sizeof(DBT)); bzero(&data,sizeof(DBT));
-+  zerob(&key,sizeof(DBT)); zerob(&data,sizeof(DBT));
- 
-   key.data = String_val(vkey);
-   key.size = string_length(vkey);
-@@ -827,7 +827,7 @@
-   
-   test_cursor_closed(cursor);
- 
--  bzero(&key,sizeof(DBT)); bzero(&data,sizeof(DBT));
-+  zerob(&key,sizeof(DBT)); zerob(&data,sizeof(DBT));
- 
-   data.data = String_val(vdata);
-   data.size = string_length(vdata);
-@@ -851,7 +851,7 @@
-   
-   test_cursor_closed(cursor);
- 
--  bzero(&key,sizeof(DBT)); bzero(&data,sizeof(DBT));
-+  zerob(&key,sizeof(DBT)); zerob(&data,sizeof(DBT));
- 
-   key.data = String_val(vkey);
-   key.size = string_length(vkey);
-@@ -880,7 +880,7 @@
- 
-   test_cursor_closed(cursor);
- 
--  bzero(&key,sizeof(DBT)); bzero(&data,sizeof(DBT));
-+  zerob(&key,sizeof(DBT)); zerob(&data,sizeof(DBT));
- 
-   key.data = String_val(vkey);
-   key.size = string_length(vkey);
-@@ -906,7 +906,7 @@
-   int flags = convert_flag_list(vflags,cursor_get_flags) | DB_SET_RANGE;
-   int err;
- 
--  bzero(&key,sizeof(DBT)); bzero(&data,sizeof(DBT));
-+  zerob(&key,sizeof(DBT)); zerob(&data,sizeof(DBT));
- 
-   test_cursor_closed(cursor);
- 
-@@ -948,7 +948,7 @@
-    flags = convert_flag_list(vflags,cursor_get_flags) | DB_GET_BOTH;
-    test_cursor_closed(cursor);
- 
--   bzero(&key,sizeof(DBT)); bzero(&data,sizeof(DBT));
-+   zerob(&key,sizeof(DBT)); zerob(&data,sizeof(DBT));
- 
-    key.data = String_val(vkey);
-    key.size = string_length(vkey);
-@@ -975,7 +975,7 @@
-   int flags = Flag_val(vtype,cursor_get_type) | 
-     convert_flag_list(vflags,cursor_get_flags);
-   int err;
--  bzero(&key,sizeof(DBT)); bzero(&data,sizeof(DBT));
-+  zerob(&key,sizeof(DBT)); zerob(&data,sizeof(DBT));
- 
-   test_cursor_closed(cursor);
- 
-@@ -1005,7 +1005,7 @@
-   int flags = Flag_val(vtype,cursor_get_type) | 
-     convert_flag_list(vflags,cursor_get_flags);
-   int err;
--  bzero(&key,sizeof(DBT)); bzero(&data,sizeof(DBT));
-+  zerob(&key,sizeof(DBT)); zerob(&data,sizeof(DBT));
- 
-   test_cursor_closed(cursor);
- 
diff --git a/net-misc/sks/files/sks-1.1.4-ECC_OID_fix_x86.patch b/net-misc/sks/files/sks-1.1.4-ECC_OID_fix_x86.patch
deleted file mode 100644
index 30315cef69c7..000000000000
--- a/net-misc/sks/files/sks-1.1.4-ECC_OID_fix_x86.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -r a4fab18949f0 -r 0374b3dbc4ae dbserver.ml
---- a/dbserver.ml	Fri Jan 25 18:16:13 2013 -0600
-+++ b/dbserver.ml	Tue Apr 16 15:36:36 2013 -0500
-@@ -293,8 +293,8 @@
-           let keys = lookup_keys request.search in
-           let count = List.length keys in
-           let keys = truncate request.limit keys in
-+          let keys = clean_keys request keys in
-           let hashes = List.map ~f:KeyHash.hash keys in
--          let keys = clean_keys request keys in
-           if request.machine_readable then
-             ("text/plain",
-              count,
-diff -r a4fab18949f0 -r 0374b3dbc4ae parsePGP.ml
---- a/parsePGP.ml	Fri Jan 25 18:16:13 2013 -0600
-+++ b/parsePGP.ml	Tue Apr 16 15:36:36 2013 -0500
-@@ -153,7 +153,7 @@
- 
- let parse_ecdh_pubkey cin =
-    let length = cin#read_int_size 1 in
--   let oid = sprintf "%x" (cin#read_int_size length) in
-+   let oid = sprintf "%Lx" (cin#read_int64_size length) in
-    let mpi = read_mpi cin in
-    let kdf_length = cin#read_int_size 1 in
-    let kdf_res = cin#read_int_size 1 in
-@@ -166,7 +166,7 @@
- 
-  let parse_ecdsa_pubkey cin =
-    let length = cin#read_int_size 1 in
--   let oid = sprintf "%x" (cin#read_int_size length) in
-+   let oid = sprintf "%Lx" (cin#read_int64_size length) in
-    let psize = oid_to_psize oid
-    in
-    psize
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
deleted file mode 100644
index dd7af061de3d..000000000000
--- a/net-misc/sks/files/sks-1.1.4-man_url.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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.2.ebuild b/net-misc/sks/sks-1.1.2.ebuild
deleted file mode 100644
index 97870bfaa850..000000000000
--- a/net-misc/sks/sks-1.1.2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/sks/sks-1.1.2.ebuild,v 1.4 2012/02/07 00:34:06 kingtaco Exp $
-
-EAPI=4
-
-inherit eutils multilib
-
-DESCRIPTION="SKS Keyserver"
-HOMEPAGE="http://code.google.com/p/sks-keyserver/"
-SRC_URI="http://sks-keyserver.googlecode.com/files/${PF}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="optimize"
-
-DEPEND="dev-lang/ocaml
-		dev-ml/cryptokit
-		sys-libs/db:4.6"
-RDEPEND="${DEPEND}"
-
-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.6/: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' \
-		-e 's:LIBS.bc= lib/cryptokit.cma bdb/bdb.cma:LIBS.bc= bdb/bdb.cma:g' \
-		-e 's:sks_build.bc.sh:sks_build.sh:g' \
-		Makefile bdb/Makefile || die
-	epatch "${FILESDIR}/bdb_stubs-gentoo.patch"
-}
-
-src_compile() {
-	emake dep
-	emake all
-	if use optimize; then
-		emake all.bc
-	fi
-}
-
-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
-}
diff --git a/net-misc/sks/sks-1.1.4-r1.ebuild b/net-misc/sks/sks-1.1.4-r1.ebuild
deleted file mode 100644
index 2aace5bd4610..000000000000
--- a/net-misc/sks/sks-1.1.4-r1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# 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.2 2013/12/13 09:29:03 patrick 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;
-}
diff --git a/net-misc/sks/sks-1.1.4.ebuild b/net-misc/sks/sks-1.1.5.ebuild
index ea74c2b9a661..520782a4acab 100644
--- a/net-misc/sks/sks-1.1.4.ebuild
+++ b/net-misc/sks/sks-1.1.5.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# 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.4.ebuild,v 1.1 2013/11/22 02:35:45 mrueg Exp $
+# $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 eutils multilib user readme.gentoo systemd
+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"
@@ -42,8 +42,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-ECC_OID_fix_x86.patch"
-
 	cp Makefile.local.unused Makefile.local || die
 	sed -i \
 		-e "s:^BDBLIB=.*$:BDBLIB=-L/usr/$(get_libdir):g" \
@@ -88,8 +86,8 @@ src_install() {
 	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"
+	systemd_dounit "${FILESDIR}"/sks-db.service
+	systemd_dounit "${FILESDIR}"/sks-recon.service
 
 	dodir "/var/lib/sks/web.typical"
 	insinto /var/lib/sks
@@ -99,13 +97,14 @@ src_install() {
 	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 "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."