From 25ae8d5bde6933ce0e9dff261a771abbd6deb7da Mon Sep 17 00:00:00 2001
From: Michael Scherer <misc@mageia.org>
Date: Sun, 8 Jan 2012 00:39:25 +0000
Subject: revert commit 2140 ( since this does not work as i expected after
 reading source code )

---
 .../templates/signbot/sign-check-package           | 35 ----------------------
 .../templates/signbot/signbot-rpmmacros            |  3 --
 .../templates/signbot/sudoers.signpackage          |  2 --
 3 files changed, 40 deletions(-)
 delete mode 100644 modules/buildsystem/templates/signbot/sign-check-package
 delete mode 100644 modules/buildsystem/templates/signbot/signbot-rpmmacros
 delete mode 100644 modules/buildsystem/templates/signbot/sudoers.signpackage

(limited to 'modules/buildsystem/templates/signbot')

diff --git a/modules/buildsystem/templates/signbot/sign-check-package b/modules/buildsystem/templates/signbot/sign-check-package
deleted file mode 100644
index 4c6d1937..00000000
--- a/modules/buildsystem/templates/signbot/sign-check-package
+++ /dev/null
@@ -1,35 +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"
-
-tmpfile=`mktemp`
-cp -pf "$file" "$tmpfile"
-rpm --delsign "$tmpfile"
-/usr/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/bin/mga-signpackage "$tmpfile" "$key" "$keydir"
-done
-mv -f "$tmpfile" "$file"
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
deleted file mode 100644
index 2322c186..00000000
--- a/modules/buildsystem/templates/signbot/sudoers.signpackage
+++ /dev/null
@@ -1,2 +0,0 @@
-<%= sched_login %>	ALL =(<%= sign_login %>) NOPASSWD: /usr/bin/mga-signpackage
-<%= sched_login %>	ALL =(<%= sign_login %>) NOPASSWD: /usr/local/bin/sign-check-package
-- 
cgit v1.2.1