[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#702799: unblock: sks/1.1.3-2



Package: release.debian.org
User: release.debian.org@packages.debian.org
Usertags: unblock
Severity: normal

Please unblock package sks

I'd like to upload a fix for sks rc bug #699848. The bug prevents sks
from building an initial database. Included are the following minimal
fixes which do not change the functioning of sks.

+  * add Vcs tags to control file
+  * fix watch file because of upstream move
+  * add Homepage tag to control file

included is a debdiff. I would upload to testing-updates(?) as soon as
you approve.

unblock sks/1.1.3-2

Christoph


-- 
============================================================================
Christoph Martin, Zentrum für Datenverarbeitung, Uni-Mainz, Germany
 Instant-Messaging: Jabber: martin@uni-mainz.de
  (Siehe http://www.zdv.uni-mainz.de/4010.php)
diff -Nru sks-1.1.3/debian/changelog sks-1.1.3/debian/changelog
--- sks-1.1.3/debian/changelog	2012-06-20 11:59:13.000000000 +0200
+++ sks-1.1.3/debian/changelog	2013-03-11 16:32:52.000000000 +0100
@@ -1,3 +1,12 @@
+sks (1.1.3-2) UNRELEASED; urgency=high
+
+  * add Vcs tags to control file
+  * fix watch file because of upstream move
+  * add Homepage tag to control file
+  * add db parameter to sksconf to fix db build deadlocks (closes: #699848)
+
+ -- Christoph Martin <christoph.martin@uni-mainz.de>  Mon, 11 Mar 2013 16:32:52 +0100
+
 sks (1.1.3-1) unstable; urgency=low
 
   * New upstream release (closes: #663757)
diff -Nru sks-1.1.3/debian/control sks-1.1.3/debian/control
--- sks-1.1.3/debian/control	2012-06-20 10:41:30.000000000 +0200
+++ sks-1.1.3/debian/control	2012-10-15 11:45:50.000000000 +0200
@@ -5,6 +5,8 @@
 Maintainer: Christoph Martin <christoph.martin@uni-mainz.de>
 Uploaders: Fabio M. Di Nitto <fabbione@fabbione.net>
 Build-Depends: ocaml (>= 3.08), camlp4, libdb-dev, debhelper (>= 7.0.50~), zlib1g-dev, libcryptokit-ocaml-dev (>= 1.2-4), ocaml-nox (>= 1.3-4), perl, perl-doc, dh-ocaml (>= 0.9~)
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-sks
+Vcs-Svn: svn://svn.debian.org/pkg-sks/
 
 Package: sks
 Architecture: any
@@ -19,3 +21,4 @@
  This key server implementation uses an efficient and reliable reconciliation
  algorithm to keep the database in sync with other SKS servers.  Additionally
  it can both send and receive PKS style sync emails.
+Homepage: https://bitbucket.org/skskeyserver/sks-keyserver/wiki/Home
diff -Nru sks-1.1.3/debian/debcfg/sksconf sks-1.1.3/debian/debcfg/sksconf
--- sks-1.1.3/debian/debcfg/sksconf	2012-06-20 10:41:30.000000000 +0200
+++ sks-1.1.3/debian/debcfg/sksconf	2013-03-11 16:30:45.000000000 +0100
@@ -30,3 +30,11 @@
 
 # Runs database statistics calculation on boot (time and cpu expensive)
 #initial_stat:
+
+# bdb's db_tune program suggests a pagesize of 65536 for [K]DB/key. In practice
+# this caused page deadlocks. I found 8K (16) and 16K (32) to be better values
+pagesize:          16
+#
+# The tuner recommended 4096 (8) for the pagesize for PTree/ptree. I have had
+# very good results with 8196
+ptree_pagesize:    16
diff -Nru sks-1.1.3/debian/watch sks-1.1.3/debian/watch
--- sks-1.1.3/debian/watch	2012-06-20 10:41:30.000000000 +0200
+++ sks-1.1.3/debian/watch	2012-10-15 11:43:59.000000000 +0200
@@ -1,2 +1,2 @@
 version=3
-opts=downloadurlmangle=s/\/\/code.google.com// http://code.google.com/p/sks-keyserver/downloads/list?can=1 .*/sks-(\d[\d.]*)\.(?:zip|tgz|tbz2|txz|tar\.gz|tar\.bz2|tar\.xz)
+https://bitbucket.org/skskeyserver/sks-keyserver/downloads/sks-(\d[\d.]*)\.(?:zip|tgz|tbz2|txz|tar\.gz|tar\.bz2|tar\.xz)
begin:vcard
fn:Christoph Martin
n:Martin;Christoph
org;quoted-printable;quoted-printable:Johannes Gutenberg-Universit=C3=A4t;Zentrum f=C3=BCr Datenverarbeitung
adr:;;Anselm Franz von Bentzel-Weg 12;Mainz;;55128;Germany
email;internet:martin@uni-mainz.de
tel;work:+49-6131-3926337
tel;fax:+49-6131-3926407
tel;cell:+49-179-7952652
x-mozilla-html:FALSE
version:2.1
end:vcard

Attachment: signature.asc
Description: OpenPGP digital signature


Reply to: