NMU uploaded: diff -Naur dupload-2.6.3.1.bak/debian/changelog dupload-2.6.3.2/debian/changelog --- dupload-2.6.3.1.bak/debian/changelog 2005-07-27 01:02:04.000000000 +0200 +++ dupload-2.6.3.2/debian/changelog 2005-08-06 20:18:54.227139936 +0200 @@ -1,3 +1,12 @@ +dupload (2.6.3.2) unstable; urgency=low + + * NMU during BSP. + * Try to differentiate between different gpg --verify error reasons + to allow uploads from hosts where the public key is not available. + (Closes: #321126) + + -- Frank Lichtenheld <[EMAIL PROTECTED]> Sat, 6 Aug 2005 20:14:23 +0200 + dupload (2.6.3.1) unstable; urgency=low * NMU to remove obsolete queues, based on @@ -6,7 +15,7 @@ http://lists.debian.org/debian-devel/2004/debian-devel-200401/msg01950.html> also cleaned up the bug list. * Removed non-functioning upload queues: anonymous-non-us, non-us, - chiark, erlangen, uk, jp, and samosa. (Closes #222938, #229744) + chiark, erlangen, uk, jp, and samosa. (Closes: #222938, #229744) * Added notes extracted from the Developer's reference regarding uploads to security and commented out these entries to prevent developers from uploading there unintentionally. (Closes: #251286) diff -Naur dupload-2.6.3.1.bak/gpg-check dupload-2.6.3.2/gpg-check --- dupload-2.6.3.1.bak/gpg-check 2005-07-27 01:14:56.000000000 +0200 +++ dupload-2.6.3.2/gpg-check 2005-08-06 01:28:27.000000000 +0200 @@ -11,9 +11,19 @@ echo -n Checking signatures before upload... # Use the exit status to determine if the signature is ok or not -if ! gpg --verify "$FILE" >/dev/null 2>&1 ; then +gpg --verify "$FILE" >/dev/null 2>&1 +ret=$? +if [ $ret -eq 1 ]; then echo "GPG verification of $FILE failed!" exit 1 +elif [ $ret -eq 2 ]; then + if grep -- '-----BEGIN PGP' "$FILE" >/dev/null 2>&1; then + echo "GPG signature couldn't be checked, probably because of missing key" + exit 0 + else + echo "GPG signature is missing" + exit 1 + fi fi echo ...signatures are ok
Gruesse, -- Frank Lichtenheld <[EMAIL PROTECTED]> www: http://www.djpig.de/ -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]