[Pkg-sks-commit] r160 - in sks/trunk/sks/debian: . patches

[chrism at alioth.debian.org]

Author: chrism
Date: 2008-06-19 15:14:21 +0000 (Thu, 19 Jun 2008)
New Revision: 160

Added:
   sks/trunk/sks/debian/patches/508_build_fastbuild
Modified:
   sks/trunk/sks/debian/changelog
Log:
[project @ 162]
resurrect 508_build_fastbuild

Original author: weasel
Date: 2004-10-25 23:43:29.045428+00:00

Modified: sks/trunk/sks/debian/changelog
===================================================================
--- sks/trunk/sks/debian/changelog	2008-06-19 15:14:13 UTC (rev 159)
+++ sks/trunk/sks/debian/changelog	2008-06-19 15:14:21 UTC (rev 160)
@@ -9,8 +9,10 @@
   * Upstream has a changelog again.
   * Upstream shipped manpage as pod, build-depend on perl and perl-doc
     so the Makefile can build it.
+  * The build script reappeared in the upstream tarball, resurrect
+    508_build_fastbuild.
 
- -- Peter Palfrader <weasel at debian.org>  Tue, 26 Oct 2004 01:39:38 +0200
+ -- Peter Palfrader <weasel at debian.org>  Tue, 26 Oct 2004 01:42:34 +0200
 
 sks (1.0.8-0.1) UNRELEASED; urgency=low
 

Added: sks/trunk/sks/debian/patches/508_build_fastbuild
===================================================================
--- sks/trunk/sks/debian/patches/508_build_fastbuild	                        (rev 0)
+++ sks/trunk/sks/debian/patches/508_build_fastbuild	2008-06-19 15:14:21 UTC (rev 160)
@@ -0,0 +1,52 @@
+diff -ruN sks-1.0.7-old/sks_build.sh sks-1.0.7/sks_build.sh
+--- sks-1.0.7-old/sks_build.sh	2003-11-29 14:38:18.000000000 +0100
++++ sks-1.0.7/sks_build.sh	2004-03-27 01:46:47.000000000 +0100
+@@ -5,12 +5,44 @@
+ # You might want to edit this file to reduce or increase memory usage 
+ # depending on your system
+ 
++ask_mode() {
++    echo "Please select the mode in which you want to import the keydump:"
++    echo ""
++    echo "1 - fastbuild"
++    echo "    only an index of the keydump is created and the keydump cannot be"
++    echo "    removed."
++    echo ""
++    echo "2 - normalbuild"
++    echo ""
++    echo "    all the keydump will be imported in a new database. It takes longer"
++    echo "    time and more disk space, but the server will run faster (depending"
++    echo "    from the source/age of the keydump)."
++    echo "    The keydump can be removed after the import."
++    echo ""
++    echo -n "Enter enter the mode (1/2): "
++    read
++    case "$REPLY" in
++     1)
++	mode="fastbuild"
++     ;;
++     2)
++	mode="build /var/lib/sks/dump/*.pgp"
++     ;;
++     *)
++	echo "Option unknown. bye!"
++	exit 1
++     ;;
++    esac
++}
++
+ fail() { echo Command failed unexpectedly.  Bailing out; exit -1; }
+ 
+-echo === Running fastbuild... ===
+-if ! sks fastbuild -n 10 -cache 100; then fail; fi
++ask_mode
++
++echo "=== Running (fast)build... ==="
++if ! /usr/sbin/sks $mode -n 10 -cache 100; then fail; fi
+ echo === Cleaning key database... ===
+-if ! sks cleandb; then fail; fi
++if ! /usr/sbin/sks cleandb; then fail; fi
+ echo === Building ptree database... ===
+-if ! sks pbuild -cache 20 -ptree_cache 70; then fail; fi
++if ! /usr/sbin/sks pbuild -cache 20 -ptree_cache 70; then fail; fi
+ echo === Done! ===