From d9e84e176fe538e110d9612f9832d69846e8d3e7 Mon Sep 17 00:00:00 2001
From: "Eric S. Raymond"
Date: Tue, 1 Jun 2004 20:10:47 +0000
Subject: This is what I'm handing to Rob Funk.
svn path=/trunk/; revision=3879
---
NEWS | 8 +++++---
indexgen.sh | 13 ++-----------
upload | 52 +++-------------------------------------------------
3 files changed, 10 insertions(+), 63 deletions(-)
diff --git a/NEWS b/NEWS
index 7f7e1190..a031aa43 100644
--- a/NEWS
+++ b/NEWS
@@ -4,12 +4,14 @@
* Sunil Shetye's fix to force fetchsizelimit to 1 for APOP and RPOP.
* PopDel.py removed from contrib at author's request.
-* Matthias Andree's fix for Sunil Shetye's fetvh-split patch
+* Matthias Andree's fix for Sunil Shetye's fetch-split patch
* Include James Stone's moldremover.py script.
* Enable .fetchmailrc permissions checking under Cygwin.
* Nalin Dahyabai's fix for POP3 strong authentication.
* HOME_ETC patch for PLD Linux.
* Sunil Shetye's fix for SSL configuration.
+* Simon Josefsson's patch for GSS library support.
+* Added Andrey Lelikov's recupe for Hotmail and Lycos Webmail.
fetchmail-6.2.5 (Wed Oct 15 18:39:22 EDT 2003), 23079 lines:
@@ -21,8 +23,8 @@ fetchmail-6.2.5 (Wed Oct 15 18:39:22 EDT 2003), 23079 lines:
* OpenSSL cleanup patches from levinedl@acm.org.
* Benjamin Drieu's patch to fix Debian bug #212240, no oversized-message
flushing if both "flush" and "limit" were specified.
-* Benjamin Drieu's patch for Debian bug #156592, incorrect handing of host/port
- option.
+* Benjamin Drieu's patch for Debian bug #156592, incorrect handing of
+ host/port option.
* Smash all NULs out of headers right after the socket read.
* Dup-killer code now keys on an MD5 hash of the raw headers.
* Sunil Shetye's patches to break up fetching of sizes and UIDLs.
diff --git a/indexgen.sh b/indexgen.sh
index 4d19c170..34d7d6da 100755
--- a/indexgen.sh
+++ b/indexgen.sh
@@ -20,14 +20,14 @@ rm -f index.html
# Compute MD5 checksums for security audit
rm -f checksums
-for file in fetchmail-$version.tar.gz fetchmail-$version-1.i386.rpm fetchmail-$version-1.src.rpm
+for file in fetchmail-$version.tar.gz fetchmail-$version-1.*.rpm
do
md5sum $file >>checksums
done
if [ $version != $goldvers ]
then
- for file in /usr/src/redhat/SOURCES/fetchmail-$goldvers.tar.gz /usr/src/redhat/RPMS/i386/fetchmail-$goldvers-1.i386.rpm /usr/src/redhat/SRPMS/fetchmail-$goldvers-1.src.rpm
+ for file in fetchmail-$goldvers.tar.gz fetchmail-$goldvers-1.*.rpm
do
md5sum $file | sed -e "s: .*/: :" >>checksums
done
@@ -36,7 +36,6 @@ fi
# Cryptographically sign checksums
gpg --clearsign checksums
mv checksums.asc checksums
-gpg --detach-sign --armor fetchmail-$version.tar.gz
cat >index.html <
@@ -162,14 +161,6 @@ of known problems and requested features.
Source RPM of fetchmail $version
-The detached GPG
-signature for the binary tarball can be used to check it for
-correctness, with the command
-
-
-gpg --verify fetchmail-$version.tar.gz.asc fetchmail-$version.tar.gz
-
-
MD5 checksums are available for these files; the
checksum file is cryptographically signed and can be verified with the
command:
diff --git a/upload b/upload
index 2cf8d6d6..3a76ee49 100755
--- a/upload
+++ b/upload
@@ -11,62 +11,16 @@ else
echo "Beginning web upload..."
# First, copy to primary website
dest=esr@${WWWHOST}:${WWWDIR}/fetchmail
-scp fetchmail-${version}.tar.gz $dest
scp fetchmail-${version}.tar.gz.asc $dest
-scp fetchmail-FAQ.html $dest
-scp fetchmail-${version}-1.i386.rpm $dest
-scp fetchmail-${version}-1.src.rpm $dest
-scp fetchmail-features.html $dest
-scp NEWS $dest
-scp fetchmail-man.html $dest
-scp design-notes.html $dest
-scp todo.html $dest
-scp testservers.html $dest
-# The following things vary seldom
#scp funny.html $dest
#scp fetchmail.png $dest
#scp bighand.png $dest
scp growth.png $dest
scp timeseries $dest
scp growthplot $dest
-# The following things vary often
scp checksums $dest
-scp index.html $dest
-scp history.html $dest
-echo "Upload to ${WWWVIRTUAL} complete"
+# shipper does the rest.
+rm -f ANNOUNCE.FRESHMEAT
+shipper
-echo "Beginning FTP upload..."
-lftp <