Remove LSM-related stuff from the distribution.

IBiblio no longer accepts submissions, and considers itself an archive.
There is no point in our carrying forward any related material, if
needed for reference purposes, it can be fetched from older versions in
the Git repository.

diff --git a/Makefile.am b/Makefile.am
index 6f247daec90fa12bb11c033fc3093b857003b4a6..d6e27845fb924d5400e9624405f20684dbd745a8 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -222,10 +222,6 @@ dist-hook:
        cd $(distdir) && find $(distdirs) po -name .git -type d -prune -exec rm -rf '{}' ';'
        cd $(distdir) && find $(distdirs) po -name '*~' -exec rm -f '{}' ';'
 
-.PHONY: lsm
-lsm: genlsm.sh dist
-       $(SHELL) genlsm.sh >$(PACKAGE)-$(VERSION).lsm
-
 # this target expects a .rsyncs file with lines of this format:
 # host:directory/
 # it will call rsync from its source directory to the destination for

diff --git a/NEWS b/NEWS
index bd9bd13038df78c67bd0ba8b2985799f6e730272..d78cdcfd1a026ce2f68e651396ff58b3d2f2e96e 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -56,13 +56,16 @@ removed from a 6.4.0 or newer release.)
 
 --------------------------------------------------------------------------------
 
-fetchmail-6.3.24 (not yet released):
+fetchmail-6.3.24 (released 2012-12-23, 26108 LoC):
 
 # NOTE THAT THE RELEASE OF FUTURE FETCHMAIL 6.3.X VERSIONS IS UNCLEAR.
 Should a 7.0 release be made earlier, chances are that the 6.3.X branch
 is abandoned and its changes be folded into the 7.0 release, with changes
 after 6.3.24 not available on their own in a newer 6.3.X release.
 
+# NOTE THAT FETCHMAIL IS NO LONGER PUBLISHED THROUGH IBIBLIO.
+  They have stopped accepting submissions and consider themselves an archive.
+
 # CRITICAL AND REGRESSION FIXES
 * Plug a memory leak in OpenSSL's certificate verification callback.
   This would affect fetchmail configurations running with SSL in daemon mode

diff --git a/RELEASE-INSTRUCTIONS b/RELEASE-INSTRUCTIONS
index f9708f6c74c2a1bb6b2be083e1c13d87b7cc3ffd..e5d83be7ccadd62b52ed74a966f0b1ce77af10ad 100644 (file)
--- a/RELEASE-INSTRUCTIONS
+++ b/RELEASE-INSTRUCTIONS
@@ -14,7 +14,6 @@ To do a release:
 - These would be done automatically by makerelease.pl:
   - Upload sig and tarball to ~/public_html/fetchmail/
   - Upload sig and tarball to ftp.berlios.de:/incoming/ and release
-  - Upload lsm, sig and tarball to ibiblio.org:/incoming/linux/
 
 - Update the fetchmail website for version, link to release nodes
   (update release_id) and last update, commit, and upload.

diff --git a/configure.ac b/configure.ac
index f012c7a9ab69b55de9aa8871074713bc0886e837..c379ccb763d566f01ce4552d49ad5767797847df 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -968,7 +968,7 @@ if test "$needtrio" = 1 ; then
 fi
 dnl ----------------------------------------------------------------'
 
-AC_CONFIG_FILES([Makefile po/Makefile.in genlsm.sh])
+AC_CONFIG_FILES([Makefile po/Makefile.in])
 AC_OUTPUT
 
 dnl Local Variables:

diff --git a/dist-tools/makerelease.pl b/dist-tools/makerelease.pl
index 86e9ad71168f060888c32e076e36f407d9c91fbe..51b828540a8515f74123dadbe40986e95c470650 100755 (executable)
--- a/dist-tools/makerelease.pl
+++ b/dist-tools/makerelease.pl
@@ -100,7 +100,7 @@ if (system("mkdir -p autobuild && cd autobuild "
 
 print "### Test-building the software...\n";
 if (system("cd autobuild && make -s clean"
-       . " && make " . ($verbose ? '' : '-s') . " check distcheck lsm")) {
+       . " && make " . ($verbose ? '' : '-s') . " check distcheck")) {
        die("Compilation failure\n");
 }
 
@@ -177,10 +177,6 @@ print "=== local\n";
 
 system("cp", "autobuild/$project-$version$distsufx", "autobuild/$project-$version$distsufx.asc", "$ENV{HOME}/public_html/fetchmail/") and die "Cannot upload to \$HOME/public_html/fetchmail/: $!";
 
-print "=== ibiblio\n";
-
-system("lftp -e \"lcd autobuild ; mput $project-$version$distsufx $project-$version$distsufx.asc $project-$version.lsm ; quit\" ibiblio.org:/incoming/linux/") and warn "Upload to ibiblio failed: $!";
-
 print "=== berlios\n";
 
 system("lftp -e \"lcd autobuild ; mput $project-$version$distsufx $project-$version$distsufx.asc ; quit\" ftp.berlios.de:/incoming/") and warn "Upload to berlios failed: $!";

diff --git a/genlsm.sh.in b/genlsm.sh.in
deleted file mode 100644 (file)
index 5283428..0000000
--- a/genlsm.sh.in
+++ /dev/null
@@ -1,33 +0,0 @@
-#! /bin/sh
-# @configure_input@
-
-# WARNING:
-# WARNING: If you change the description, also change specgen.sh!
-# WARNING:
-
-cat <<EOF
-Begin4
-Title:         @PACKAGE@
-Version:       @VERSION@
-Entered-date:  `date -u +%Y-%m-%d`
-Description:   Fetchmail is a free, full-featured, robust, and well-documented
-               remote mail retrieval and forwarding utility intended to be used
-               over on-demand TCP/IP links (such as SLIP or PPP connections).
-               It retrieves mail from remote mail servers and forwards it
-               to your local (client) machine's delivery system, so it can
-               then be be read by normal mail user agents such as mutt, elm,
-               pine, (x)emacs/gnus, or mailx.  Comes with an interactive GUI
-               configurator (in Python/Tk) suitable for end-users.
-Keywords:      mail, client, POP3, APOP, KPOP, IMAP, ETRN, ODMR, SMTP, ESMTP, GSSAPI, RPA, NTLM, CRAM-MD5, SASL
-Author:                matthias.andree@gmx.de (Matthias Andree)
-               shetye@bombay.retortsoft.com (Sunil Shetye)
-               rfunk@funknet.net (Rob Funk)
-Maintained-by: fetchmail-devel@lists.berlios.de
-Primary-site:  http://developer.berlios.de/projects/fetchmail
-               `ls -sk @PACKAGE@-@VERSION@.tar.bz2 | \
-                @AWK@ '{ printf "%4dkB", $1 }'` @PACKAGE@-@VERSION@.tar.bz2
-                  1kB @PACKAGE@-@VERSION@.tar.bz2.asc
-Platforms:     All
-Copying-policy: GPL
-End
-EOF

diff --git a/specgen.sh b/specgen.sh
index 7aa0fa80430515369575cbd4eb657d08ce10653c..e2448c129456b9e8adc26b874af6c3fba1c3cae6 100755 (executable)
--- a/specgen.sh
+++ b/specgen.sh
@@ -1,8 +1,5 @@
 #!/bin/sh
 
-# WARNING:
-# WARNING: If you change the description, also change genlsm.sh.in!
-# WARNING:
 version="$1"
 
 set -e