4 files changed, 2 insertions, 73 deletions
diff --git a/modules/buildsystem/templates/signbot/mga-signpackage b/modules/buildsystem/templates/signbot/mga-signpackage
deleted file mode 100755
index bd88efeb..00000000
--- a/modules/buildsystem/templates/signbot/mga-signpackage
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/perl -w
-
-use strict;
-use warnings;
-use RPM4::Sign;
-use File::Spec;
-
-sub signpackage {
-    my ($file, $name, $path) = @_;
-
-    # check if parent directory is writable
-    my $parent = (File::Spec->splitpath($file))[1];
-    die "Unsignable package, parent directory is read-only"
-        unless -w $parent;
-
-    my $sign = RPM4::Sign->new(
-        name => $name,
-        path => $path,
-	passphrase => '',
-    );
-
-    $sign->rpmssign($file)
-}
-
-if (@ARGV != 3) {
-    exit 1;
-}
-
-signpackage(@ARGV);
-exit 0
-
diff --git a/modules/buildsystem/templates/signbot/sign-check-package b/modules/buildsystem/templates/signbot/sign-check-package
deleted file mode 100644
index fc9704fd..00000000
--- a/modules/buildsystem/templates/signbot/sign-check-package
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-
-if [ $# != 3 ] ; then 
-    echo "missing arguments"
-    echo "usage : $0 file key_number key_directory"
-    exit 1
-fi
- 
-file="$1"
-key="$2"
-keydir="$3"
-
-tmpdir=`mktemp -d ${TMPDIR:-/tmp}/signbot-XXXXX`
-tmpfile="$tmpdir/$(basename $file)"
-cp -pf "$file" "$tmpfile"
-rpm --delsign "$tmpfile"
-/usr/local/bin/mga-signpackage "$tmpfile" "$key" "$keydir"
-nbtry=0
-while rpmsign -Kv "$tmpfile" 2>&1 | grep BAD
-do
-    nbtry=$(($nbtry + 1))
-    if [ $nbtry -ge 30 ]
-    then
-	exit 1
-    fi
-
-    # Archive failed file for further analysis
-    mkdir -p "/tmp/failed-sign/"
-    failedfile="/tmp/failed-sign/$(basename "$file").$(date +%Y%m%d%H%M%S)"
-    cp -pf "$file" "$failedfile"
-
-    cp -pf "$file" "$tmpfile"
-    rpm --delsign "$tmpfile"
-    /usr/local/bin/mga-signpackage "$tmpfile" "$key" "$keydir"
-done
-mv -f "$tmpfile" "$file"
-rmdir "$tmpdir"
diff --git a/modules/buildsystem/templates/signbot/signbot-rpmmacros b/modules/buildsystem/templates/signbot/signbot-rpmmacros
deleted file mode 100644
index aab7e389..00000000
--- a/modules/buildsystem/templates/signbot/signbot-rpmmacros
+++ /dev/null
@@ -1,3 +0,0 @@
-%__gpg_sign_cmd                 %{__gpg} \
-        gpg --batch --force-v3-sigs --no-verbose --no-armor --passphrase-fd 3 --no-secmem-warning \
-        -u "%{_gpg_name}" -sbo %{__signature_filename} %{__plaintext_filename}
diff --git a/modules/buildsystem/templates/signbot/sudoers.signpackage b/modules/buildsystem/templates/signbot/sudoers.signpackage
index 05653d30..4ea30238 100644
--- a/modules/buildsystem/templates/signbot/sudoers.signpackage
+++ b/modules/buildsystem/templates/signbot/sudoers.signpackage
@@ -1,2 +1,2 @@
-<%= sched_login %>	ALL =(<%= login %>) NOPASSWD: /usr/local/bin/mga-signpackage
-<%= sched_login %>	ALL =(<%= login %>) NOPASSWD: /usr/local/bin/sign-check-package
+<%= sched_login %>      ALL =(<%= scope.lookupvar('buildsystem::var::signbot::login') %>) NOPASSWD: /usr/local/bin/mga-signpackage
+<%= sched_login %>      ALL =(<%= scope.lookupvar('buildsystem::var::signbot::login') %>) NOPASSWD: /usr/local/bin/sign-check-package