X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=scripts%2Fdebian%2Fbuildd-prepare-dir;h=f7e48e4ab51c63ac70e223b6f72dd0602059bc7e;hb=990c559dba43fa8e6537b12ac25c656ce938041d;hp=8366d3c2cfa82fb36b3cb774a1238b2cf74e534b;hpb=339fd0ea3582d0e414ff410929be45cb82ada017;p=dak.git

diff --git a/scripts/debian/buildd-prepare-dir b/scripts/debian/buildd-prepare-dir
index 8366d3c2..f7e48e4a 100755
--- a/scripts/debian/buildd-prepare-dir
+++ b/scripts/debian/buildd-prepare-dir
@@ -28,8 +28,6 @@ set -E
 export SCRIPTVARS=/srv/ftp-master.debian.org/dak/config/debian/vars
 . $SCRIPTVARS
 
-umask 027
-
 # And use one locale, no matter what the caller has set
 export LANG=C
 export LC_ALL=C
@@ -39,23 +37,25 @@ PROGRAM="buildd-prepare-dir"
 . "${configdir}/common"
 
 # should be relative to the general base dir later
-TARGET="${base}/scripts/builddkeyrings"
 COPYTARGET="${base}/keyrings"
+GNUPGHOME="${base}/s3kr1t/dot-gnupg"
+base="${base}/scripts/builddkeyrings"
+TARGET="${base}/keyrings"
 REMOVED="${base}/removed-buildd-keys.gpg"
 
 mkdir -p "${TARGET}/keyrings"
 
 for arch in $archs; do
     if [ -f ${base}/${arch}/keyring.gpg ]; then
-        cp -al ${base}/${arch}/keyring.gpg ${TARGET}/keyrings/buildd-${arch}-keyring.gpg
-        chmod 0644 ${TARGET}/keyrings/buildd-${arch}-keyring.gpg
+        cp -al ${base}/${arch}/keyring.gpg ${TARGET}/buildd-keyrings/buildd-${arch}-keyring.gpg
+        chmod 0644 ${TARGET}/buildd-keyrings/buildd-${arch}-keyring.gpg
     fi
 done
 
 cd ${TARGET}
-sha512sum keyrings/* > sha512sums
+sha512sum buildd-keyrings/* > sha512sums
 
 rm -f ${TARGET}/sha512sums.txt
-SIGNINGKEY=$(dak admin c signingkeyids)
-gpg --no-options  --batch --no-tty --armour --default-key ${SIGNINKEY} --clearsign -o "${TARGET}/sha512sums.txt" "${TARGET}/sha512sums"
+SIGNINGKEY=B1326A8D
+GNUPGHOME=${GNUPGHOME} gpg --no-options  --batch --no-tty --armour --default-key ${SIGNINGKEY} --clearsign -o "${TARGET}/sha512sums.txt" "${TARGET}/sha512sums"
 rm -f ${TARGET}/sha512sums