r24642 - in /scripts/KGB: Makefile client/KGB_sendcommit client/post-commit debian/changelog server/KGB

tincho at users.alioth.debian.org tincho at users.alioth.debian.org
Wed Aug 27 07:57:48 UTC 2008


Author: tincho
Date: Wed Aug 27 07:57:45 2008
New Revision: 24642

URL: http://svn.debian.org/wsvn/?sc=1&rev=24642
Log:
* server/KGB, Makefile: match the /etc directory name with the package name.
* client/*: remove hardcodings.

Modified:
    scripts/KGB/Makefile
    scripts/KGB/client/KGB_sendcommit
    scripts/KGB/client/post-commit
    scripts/KGB/debian/changelog
    scripts/KGB/server/KGB

Modified: scripts/KGB/Makefile
URL: http://svn.debian.org/wsvn/scripts/KGB/Makefile?rev=24642&op=diff
==============================================================================
--- scripts/KGB/Makefile (original)
+++ scripts/KGB/Makefile Wed Aug 27 07:57:45 2008
@@ -9,8 +9,8 @@
 	install -m 0755 server/KGB $(DESTDIR)/$(PREFIX)/sbin/kgb-bot
 	install -d $(DESTDIR)/$(PREFIX)/share/man/man1
 	pod2man server/KGB > $(DESTDIR)/$(PREFIX)/share/man/man1/kgb-bot.1
-	install -d $(DESTDIR)/etc/kgb
-	install -m 0640 server/kgb.conf.sample $(DESTDIR)/etc/kgb/kgb.conf
+	install -d $(DESTDIR)/etc/kgb-bot
+	install -m 0640 server/kgb.conf.sample $(DESTDIR)/etc/kgb-bot/kgb.conf
 
 test:
 	$(PERL) -c server/KGB

Modified: scripts/KGB/client/KGB_sendcommit
URL: http://svn.debian.org/wsvn/scripts/KGB/client/KGB_sendcommit?rev=24642&op=diff
==============================================================================
--- scripts/KGB/client/KGB_sendcommit (original)
+++ scripts/KGB/client/KGB_sendcommit Wed Aug 27 07:57:45 2008
@@ -28,11 +28,11 @@
 use SOAP::Lite;
 
 #my $pool = SVN::Pool->new_default;
-my $uri = "http://asterix.decidir.net:9999/";
-my $proxy = "http://asterix.decidir.net:9999/?session=KGB";
+#my $uri = "http://asterix.decidir.net:9999/";
+#my $proxy = "http://asterix.decidir.net:9999/?session=KGB";
 
-my($repoid, $path, $rev) = @ARGV;
-die "$0 repoid path [revision]\n" unless($repoid and $path);
+my($uri, $proxy, $repoid, $password $path, $rev) = @ARGV;
+die "$0 URI proxy repoid password path [revision]\n" unless($repoid and $path);
 
 my $repo = SVN::Repos::open($path);
 my $fs = $repo->fs or die $!;
@@ -69,7 +69,7 @@
 	});
 
 my $res = $s->commit([
-		$repoid, undef, SOAP::Data->type(int => $rev),
+		$repoid, $password, SOAP::Data->type(int => $rev),
 		[ map({SOAP::Data->type(string => $_)} @changed) ],
 		SOAP::Data->type(string => $log),
 		SOAP::Data->type(string => $aut)]);

Modified: scripts/KGB/client/post-commit
URL: http://svn.debian.org/wsvn/scripts/KGB/client/post-commit?rev=24642&op=diff
==============================================================================
--- scripts/KGB/client/post-commit (original)
+++ scripts/KGB/client/post-commit Wed Aug 27 07:57:45 2008
@@ -23,7 +23,11 @@
 REPOS="$1"
 REV="$2"
 
-REPO_ID="`echo "$REPOS" | sed 's/-/_/g; s#^.*\(/var/lib\|/srv\)/svn/\(decidir/\)*\(.\+\)$#\3#; s#/*$##'`"
+BOT="`dirname "$0"`"/KGB/client/KGB_sendcommit
+URI="http://localhost:9999/"
+PROXY="$URI?service=KGB"
 
-BOT=/srv/svn/bot/KGB_sendcommit
-"$BOT" "$REPO_ID" "$REPOS" "$REV"
+REPO_ID="`echo "$REPOS" | sed 's/-/_/g; s#^.*\(/srv/svn.debian.org\|\)/svn/\(.\+\)$#\2#; s#/*$##'`"
+PASSWORD=""
+
+"$BOT" "$URI" "$PROXY" "$REPO_ID" "$PASSWORD" "$REPOS" "$REV"

Modified: scripts/KGB/debian/changelog
URL: http://svn.debian.org/wsvn/scripts/KGB/debian/changelog?rev=24642&op=diff
==============================================================================
--- scripts/KGB/debian/changelog (original)
+++ scripts/KGB/debian/changelog Wed Aug 27 07:57:45 2008
@@ -12,5 +12,7 @@
   * server/KGB: fixed an error in the password verification (protocol 1).
     Tried to make more sense of the protocol versions, by not making it
     configurable but a hardcoded hash of the *really* supported versions.
+  * server/KGB, Makefile: match the /etc directory name with the package name.
+  * client/*: remove hardcodings.
 
  -- Damyan Ivanov <dmn at debian.org>  Mon, 28 Jul 2008 14:44:04 +0300

Modified: scripts/KGB/server/KGB
URL: http://svn.debian.org/wsvn/scripts/KGB/server/KGB?rev=24642&op=diff
==============================================================================
--- scripts/KGB/server/KGB (original)
+++ scripts/KGB/server/KGB Wed Aug 27 07:57:45 2008
@@ -497,7 +497,7 @@
 KGB::save_argv();
 $KGB::out = \*STDERR;
 
-my $conf_file = '/etc/kgb/kgb.conf';
+my $conf_file = '/etc/kgb-bot/kgb.conf';
 GetOptions(
     'config=s'  => \$conf_file,
 ) or die 'Invalid parameters';




More information about the Pkg-perl-cvs-commits mailing list