# HG changeset patch
# User Heiko Schlittermann <hs@schlittermann.de>
# Date 1238053585 -3600
# Node ID ada2cfc3bb8649eb905a2af46fa25058c0684dcc
# Parent  bb1b17fee8c389d6e45a7e7b7c9f1c1dc514e9bf# Parent  ae5ccba87bfc8e7e66114552f5fedd0538b74311
Automated merge with https://keller.schlittermann.de/hg/logbuch

diff -r bb1b17fee8c3 -r ada2cfc3bb86 Makefile
--- a/Makefile	Tue Mar 24 11:00:38 2009 +0100
+++ b/Makefile	Thu Mar 26 08:46:25 2009 +0100
@@ -8,14 +8,15 @@
 all:	$(bin_SCRIPTS)
 
 install:	all
-	install -d $(DESTDIR)/$(sysconfdir)
-	test -f $(DESTDIR)/$(sysconfdir)/config.pm \
-		|| install -m644 config.pm $(DESTDIR)/$(sysconfdir)/config.pm
-	install -d $(bindir)
-	install -m755 $(bin_SCRIPTS) $(DESTDIR)/$(bindir)/
+	install -d -m 0755 $(DESTDIR)/$(sysconfdir)
+	tools/chkconfig $(DESTDIR)/$(sysconfigdir)/config.pm \
+		&& install -m 644 config.pm $(DESTDIR)/$(sysconfdir)/config.pm
+	tools/signconfig $(DESTDIR)/$(sysconfigdir)/config.pm
+	install -d -m 0755 $(bindir)
+	install -m 0755 $(bin_SCRIPTS) $(DESTDIR)/$(bindir)/
 
-	install -d $(DESTDIR)/usr/share/perl5/Logbuch
-	install -m644 Logbuch/HG.pm $(DESTDIR)/usr/share/perl5/Logbuch/
+	install -d -m 0755 $(DESTDIR)/usr/share/perl5/Logbuch
+	install -m 0644 Logbuch/HG.pm $(DESTDIR)/usr/share/perl5/Logbuch/
 
 	cd $(DESTDIR)/$(bindir) && ln -sf log logbuch
 
diff -r bb1b17fee8c3 -r ada2cfc3bb86 tools/chkconfig
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tools/chkconfig	Thu Mar 26 08:46:25 2009 +0100
@@ -0,0 +1,42 @@
+#! /usr/bin/perl
+use strict;
+use warnings;
+use File::Temp;
+
+my $pattern = "# sha1:";
+
+die "need exactly one filename" if not @ARGV == 1;
+
+if ($0 =~ /chk/) {
+    local $" = "";
+    exit 0 if not -e $ARGV[0];
+    my @file = <>;
+
+    my $expected = "";
+    $expected = pop @file if $file[-1] =~ /^$pattern/;
+
+    my $tmp = new File::Temp;
+    open(SHA1, "|sha1sum >" . $tmp->filename);
+    print SHA1 @file;
+    close(SHA1);
+    seek($tmp, 0, 0);
+
+    my $current = $pattern . <$tmp>;
+
+    exit 0 if $current eq $expected;
+    exit 1;
+}
+
+if ($0 =~ /sig/) {
+    local $" = "";
+    open(FILE, "+<$ARGV[0]") or die "Can't open $ARGV[0]: $!\n";
+    my @file = <FILE>;
+    pop @file if $file[-1] =~ /^$pattern/;
+    seek(FILE, 0, 0);
+    print FILE @file, $pattern;
+    truncate(FILE, tell FILE);
+    close FILE;
+    open(SHA1, "|sha1sum >>$ARGV[0]");
+    print SHA1 @file;
+    close(SHA1);
+}
diff -r bb1b17fee8c3 -r ada2cfc3bb86 tools/signconfig
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tools/signconfig	Thu Mar 26 08:46:25 2009 +0100
@@ -0,0 +1,1 @@
+chkconfig
\ No newline at end of file