From 4260a265b2da01ba1a9757ffb2693db898349ecc Mon Sep 17 00:00:00 2001 From: Matthias Andree Date: Sun, 23 Dec 2012 16:45:59 +0100 Subject: [PATCH] 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. --- Makefile.am | 4 ---- NEWS | 5 ++++- RELEASE-INSTRUCTIONS | 1 - configure.ac | 2 +- dist-tools/makerelease.pl | 6 +----- genlsm.sh.in | 33 --------------------------------- specgen.sh | 3 --- 7 files changed, 6 insertions(+), 48 deletions(-) delete mode 100644 genlsm.sh.in diff --git a/Makefile.am b/Makefile.am index 6f247dae..d6e27845 100644 --- 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 bd9bd130..d78cdcfd 100644 --- 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 f9708f6c..e5d83be7 100644 --- 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 f012c7a9..c379ccb7 100644 --- 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 86e9ad71..51b82854 100755 --- 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 index 52834287..00000000 --- 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 <