From b140228857f82ed21769d25710982706277bbd93 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Felix=20D=C3=B6rre?= <felix@dogcraft.de>
Date: Wed, 5 Nov 2014 18:59:22 +0100
Subject: [PATCH] fixup! UPD: Fix the debian package

---
 build.xml                                        |  2 +-
 ...acert-gigi-testing.cacert-gigi-signer.default |  1 +
 .../cacert-gigi-testing.cacert-gigi-signer.init  | 16 ++++++++++------
 debian/cacert-gigi-testing.cacert-gigi.default   |  1 +
 debian/cacert-gigi-testing.cacert-gigi.init      | 15 ++++++++++-----
 doc/scripts/gigi                                 | 12 +++++++-----
 6 files changed, 30 insertions(+), 17 deletions(-)
 create mode 100644 debian/cacert-gigi-testing.cacert-gigi-signer.default
 create mode 100644 debian/cacert-gigi-testing.cacert-gigi.default

diff --git a/build.xml b/build.xml
index b0c8ecef..7af97f6f 100644
--- a/build.xml
+++ b/build.xml
@@ -308,7 +308,7 @@
 			<arg value="${env.DESTDIR}/var/lib/cacert-gigi/natives/libsetuid.so"/>
 		</exec>
 
-		<mkdir dir="${env.DESTDIR}/etc/cacert-gigi"/>
+		<mkdir dir="${env.DESTDIR}/etc/cacert/gigi"/>
 		<!--<copy todir="${env.DESTDIR}/DEBIAN">
 			<fileset dir="debian">
 			</fileset>
diff --git a/debian/cacert-gigi-testing.cacert-gigi-signer.default b/debian/cacert-gigi-testing.cacert-gigi-signer.default
new file mode 100644
index 00000000..436a32a3
--- /dev/null
+++ b/debian/cacert-gigi-testing.cacert-gigi-signer.default
@@ -0,0 +1 @@
+START_DAEMON=0
diff --git a/debian/cacert-gigi-testing.cacert-gigi-signer.init b/debian/cacert-gigi-testing.cacert-gigi-signer.init
index 82d35144..b041f0d8 100644
--- a/debian/cacert-gigi-testing.cacert-gigi-signer.init
+++ b/debian/cacert-gigi-testing.cacert-gigi-signer.init
@@ -26,10 +26,14 @@ SCRIPTNAME=/etc/init.d/$NAME
 DIR=/var/lib/cacert-gigi
 
 # Exit if the package is not installed
-[ -x "$DAEMON" ] || exit 0
+[ -r "/usr/share/java/gigi.jar" ] || exit 0
 
 # Read configuration variable file if it is present
 [ -r /etc/default/$NAME ] && . /etc/default/$NAME
+if [ "$START_DAEMON" = "0" ]; then
+    echo "Not starting $NAME (as configured in /etc/default/$NAME)";
+    exit 0;
+fi
 
 # Load the VERBOSE setting and other rcS variables
 . /lib/init/vars.sh
@@ -44,15 +48,15 @@ DIR=/var/lib/cacert-gigi
 #
 do_start()
 {
-        if [ ! -f /var/lib/cacert-gigi/config/gigi.properties ]; then
-                echo Missing signer-configfile
-                return 2
-        fi
+	if [ ! -f /var/lib/cacert-gigi/config/gigi.properties ]; then
+		echo Missing signer-configfile
+		return 2
+	fi
 	# Return
 	#   0 if daemon has been started
 	#   1 if daemon was already running
 	#   2 if daemon could not be started
-	start-stop-daemon -b --start --quiet --pidfile $PIDFILE -d $DIR --startas $DAEMON --test > /dev/null \
+	start-stop-daemon --start --quiet --pidfile $PIDFILE -d $DIR --startas $DAEMON --test > /dev/null \
 		|| return 1
 	start-stop-daemon -b --start --quiet --pidfile $PIDFILE --make-pidfile -d $DIR --startas $DAEMON -- \
 		$DAEMON_ARGS \
diff --git a/debian/cacert-gigi-testing.cacert-gigi.default b/debian/cacert-gigi-testing.cacert-gigi.default
new file mode 100644
index 00000000..436a32a3
--- /dev/null
+++ b/debian/cacert-gigi-testing.cacert-gigi.default
@@ -0,0 +1 @@
+START_DAEMON=0
diff --git a/debian/cacert-gigi-testing.cacert-gigi.init b/debian/cacert-gigi-testing.cacert-gigi.init
index f0730123..278f6907 100644
--- a/debian/cacert-gigi-testing.cacert-gigi.init
+++ b/debian/cacert-gigi-testing.cacert-gigi.init
@@ -26,10 +26,15 @@ SCRIPTNAME=/etc/init.d/$NAME
 DIR=/var/lib/cacert-gigi
 
 # Exit if the package is not installed
-[ -x "$DAEMON" ] || exit 0
+[ -r "/usr/share/java/gigi.jar" ] || exit 0
 
 # Read configuration variable file if it is present
 [ -r /etc/default/$NAME ] && . /etc/default/$NAME
+if [ "$START_DAEMON" = "0" ]; then
+    echo "Not starting $NAME (as configured in /etc/default/$NAME)";
+    exit 0;
+fi
+
 
 # Load the VERBOSE setting and other rcS variables
 . /lib/init/vars.sh
@@ -44,15 +49,15 @@ DIR=/var/lib/cacert-gigi
 #
 do_start()
 {
-	if [ ! -f /etc/cacert-gigi/conf.tar ]; then
+	if [ ! -f /etc/cacert/gigi/conf.tar ]; then
 		echo Missing gigi-configfile
-                exit 2
-        fi
+		exit 2
+	fi
 	# Return
 	#   0 if daemon has been started
 	#   1 if daemon was already running
 	#   2 if daemon could not be started
-        start-stop-daemon -b --start --quiet --pidfile $PIDFILE -d $DIR --exec $DAEMON --test > /dev/null \
+	start-stop-daemon --start --quiet --pidfile $PIDFILE -d $DIR --exec $DAEMON --test > /dev/null \
 		|| return 1
 	start-stop-daemon -b --start --quiet --pidfile $PIDFILE -d $DIR --exec /usr/bin/gigi -- start-daemon \
 		|| return 2
diff --git a/doc/scripts/gigi b/doc/scripts/gigi
index f0c09b98..0f8c1e8a 100755
--- a/doc/scripts/gigi
+++ b/doc/scripts/gigi
@@ -9,25 +9,27 @@ then
 GIGI_EXEC=/usr/share/java/gigi.jar
 #echo "GIGI_EXEC environment variable not set. Assumed path: $GIGI_EXEC" 
 fi
+
 cd /var/lib/cacert-gigi
+
 if [ "$1" == "start" ]
 then
 	java -cp $JDBC_DRIVER:$GIGI_EXEC org.cacert.gigi.Launcher
 elif [ "$1" == "start-daemon" ]
 then
-	if [ ! -e /etc/cacert-gigi/conf.tar ]; then
+	if [ ! -e /etc/cacert/gigi/conf.tar ]; then
 		echo "Config missing."
 		exit 1;
 	fi
-	java -cp $JDBC_DRIVER:$GIGI_EXEC org.cacert.gigi.Launcher < /etc/cacert-gigi/conf.tar >> /var/log/cacert-gigi.log 2>&1 &
+	java -cp $JDBC_DRIVER:$GIGI_EXEC org.cacert.gigi.Launcher < /etc/cacert/gigi/conf.tar >> /var/log/cacert-gigi.log 2>&1 &
 	echo $! > /var/run/cacert-gigi.pid
-elif [ "$1" == "signer" ] 
+elif [ "$1" == "signer" ]
 then
 	java -cp $JDBC_DRIVER:$GIGI_EXEC org.cacert.gigi.util.SimpleSigner
-elif [ "$1" == "reset-database" ] 
+elif [ "$1" == "reset-database" ]
 then
 	java -cp $JDBC_DRIVER:$GIGI_EXEC org.cacert.gigi.util.DatabaseManager
-elif [ "$1" == "fetch-locales" ] 
+elif [ "$1" == "fetch-locales" ]
 then
 	java -cp $JDBC_DRIVER:$GIGI_EXEC org.cacert.gigi.util.FetchLocales
 elif [ "$1" == "signer-conf" ]
-- 
2.39.2