Update documents/scripts after SVN -> Git move.

12 files changed, 58 insertions, 62 deletions

diff --git a/INSTALL b/INSTALL
index 008dc0ac..a0b75204 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,7 +1,7 @@
 INSTALL Instructions for fetchmail
 ==================================
 
-Building from subversion (SVN) repository: see README.svn
+Building from Git repository: see README.git
 
 Packagers and port/emerge maintainers: see README.packaging.
 
diff --git a/Makefile.am b/Makefile.am
index 7c277226..3415a035 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -142,7 +142,6 @@ DISTDOCS=	FAQ FEATURES NOTES OLDNEWS fetchmail-man.html \
 distdirs = rh-config contrib beos
 
 EXTRA_DIST+=	$(DISTDOCS) $(distdirs) \
-		ucs/README.svn \
 		fetchmail.spec fetchmail.xpm \
 		trio/CHANGES trio/README \
 		strlcpy.3 bighand.png \
@@ -211,7 +210,7 @@ fetchmail-man.html: fetchmail.man $(srcdir)/dist-tools/manServer.pl
 	|| { rm -f $@ ; exit 1 ; }
 
 dist-hook:
-	cd $(distdir) && find $(distdirs) po -name .svn -type d -prune -exec rm -rf '{}' ';'
+	cd $(distdir) && find $(distdirs) po -name .git -type d -prune -exec rm -rf '{}' ';'
 	cd $(distdir) && find $(distdirs) po -name '*~' -exec rm -f '{}' ';'
 
 .PHONY: lsm
diff --git a/NEWS b/NEWS
index 90289351..c8ee0933 100644
--- a/NEWS
+++ b/NEWS
@@ -47,6 +47,23 @@ removed from a 6.4.0 or newer release.)
 
 --------------------------------------------------------------------------------
 
+fetchmail 6.3.15 (not yet released):
+
+# CHANGES
+* The repository has been converted and moved from the Subversion (SVN) format
+  kindly hosted by Graham Wilson over the past years to Git format hosted on
+  Gitorious.org.  My deepest thanks to Graham Wilson for this service that
+  kept us going when BerliOS's Subversion service was faulty in its early days.
+* This opportunity was used to convert BRANCH_6-2 and BRANCH_1-9-9 to GnuPG-signed
+  tags, as a sign that these are now closed.
+* The outdated SVN trunk is now called "oldtrunk" in Git just to save the work
+  for future reference. All development in the past few years was on BRANCH_6-3.
+* master was branched from BRANCH_6-3 for user convenience.
+
+# DOCUMENTATION
+* Web site and documentation were adjusted to reflect the SVN->Git move.
+
+
 fetchmail 6.3.14 (released 2010-02-05, 25487 LoC):
 
 # SECURITY FIXES
@@ -116,7 +133,7 @@ fetchmail 6.3.13 (released 2009-10-30, 25333 LoC):
 fetchmail 6.3.12 (released 2009-10-05):
 
 # REGRESSION FIXES
-* The CVS-2009-2666 fix in fetchmail release 6.3.11 caused a free() of
+* The CVE-2009-2666 fix in fetchmail release 6.3.11 caused a free() of
   unallocated memory on SSL connections, which caused crashes or program aborts
   on some systems (depending on how initialization and free() of unallocated
   memory is handled in compiler and libc).
diff --git a/README.svn b/README.git
index 799740e0..f9832d7f 100644
--- a/README.svn
+++ b/README.git
@@ -1,17 +1,14 @@
-In order to be able to build from the subversion repository (working
-directory), some files need to be (re-)generated.
+In order to be able to build from the git repository (working directory), some
+files need to be (re-)generated.
 
 Note that these generated files will be shipped with "make dist",
 so the end user will not need these packages.
 
 The prerequisite packages are:
 
-- GNU autoconf >= 2.59
+- GNU autoconf >= 2.60
 - GNU automake >= 1.8
-  (editing Makefile.am to remove unsupported options may
-   work with automake-1.7, but this is neither tested nor supported)
 - GNU gettext >= 0.14.3
-  (>= 0.13 may also work, but has not been tested in a while)
 - GNU m4
 - bison or yacc
 - flex or lex
@@ -19,7 +16,7 @@ The prerequisite packages are:
 On FreeBSD, install the gnu-autoconf and gnu-automake ports
 and add /usr/local/gnu-autotools/bin to your PATH.
 
-After you have these installed, type:
+After you have everything installed, type:
 
 $ ./autogen.sh
 
@@ -33,4 +30,4 @@ $ make
 (become root)
 # make install-strip
 
--- Matthias Andree, 2006-02-17
+-- Matthias Andree, 2010-02-06
diff --git a/autogen.sh b/autogen.sh
index c951f228..f175227c 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,7 +1,7 @@
 #! /bin/sh
 
-# bootstrap.sh - bootstrap the fetchmail build after a fresh subversion checkout
-# (C) 2004  Matthias Andree -- GNU GPL V2
+# autogen.sh - bootstrap the fetchmail build after a fresh git checkout
+# (C) 2004, 2010  Matthias Andree -- GNU GPL V2 or newer
 
 set -e
 # sanity checks:
diff --git a/dist-tools/getstats.py b/dist-tools/getstats.py
index 17fcab50..df2fbeaf 100755
--- a/dist-tools/getstats.py
+++ b/dist-tools/getstats.py
@@ -4,6 +4,9 @@
 
 import commands, os, string, ftplib
 
+print "This script must be adjusted for Git."
+exit(1)
+
 # Get version and date
 date = commands.getoutput("LC_TIME=C date -u")
 pid = os.getpid()
diff --git a/dist-tools/makerelease b/dist-tools/makerelease.pl
index 59b120e3..9578eb52 100755
--- a/dist-tools/makerelease
+++ b/dist-tools/makerelease.pl
@@ -7,6 +7,8 @@
 use POSIX qw(strftime);
 $tmp = $ENV{TMPDIR} || $ENV{TMP} || $ENV{TEMP} || "/tmp";
 
+die "This script ($0) needs to be updated for the Git-orious repo.";
+
 $project = "fetchmail";
 $svnrepos = "http://mknod.org/svn/$project";
 $website = "http://developer.berlios.de/projects/$project";
diff --git a/dist-tools/send-security-announce.sh b/dist-tools/send-security-announce.sh
index 2fe60265..d7da5fbb 100755
--- a/dist-tools/send-security-announce.sh
+++ b/dist-tools/send-security-announce.sh
@@ -1,7 +1,7 @@
 test "$SEND_ANNOUNCEMENTS" = doit || { echo "read the source, luke! -> $0" ; cat "$0" ; exit 1 ; }
 
-ANN=fetchmail-SA-2009-01
-FILE=$HOME/VCS-mine/fetchmail.svn/BRANCH_6-3/$ANN.txt
+ANN=fetchmail-SA-2010-01
+FILE=$HOME/VCS-mine/fetchmail.git/$ANN.txt
 test -r $FILE || { echo "Cannot find $FILE." ; exit 1 ; }
 CVE=$(sed -n '/^CVE Name:/ { s/^.*:[ 	]*//p;q; }' $FILE)
 SUBJECT="fetchmail security announcement $ANN ($CVE)"
diff --git a/fetchmail-FAQ.html b/fetchmail-FAQ.html
index 852314be..dd198677 100644
--- a/fetchmail-FAQ.html
+++ b/fetchmail-FAQ.html
@@ -35,7 +35,7 @@ Page</a></td>
 href="#G3">G3</a> for what information is required to get your problem
 solved as quickly as possible.</p>
 
-<p>Note that this FAQ is occasionally updated from the SVN repository
+<p>Note that this FAQ is occasionally updated from the Git repository
 and speaks in the past tense ("since") about a fetchmail release that is
 not yet available. Please try a release candidate for that version in
 case you need the new option.</p>
diff --git a/ucs/README.svn b/ucs/README.svn
deleted file mode 100644
index 221c3384..00000000
--- a/ucs/README.svn
+++ /dev/null
@@ -1,19 +0,0 @@
-The procedure of the files in this directory is laid out in the
-"General Vendor Branch Management Procedure" chapter of the SVN book.
-
-In detail:
-
-- check out /vendor/markus-kuhn/ucs/current
-- replace the files we have by the newer releases
-- if files are removed or added, make this known to svn with svn rm and
-  svn add
-- commit
-- then tag (svn copy) as /vendor/markus-kuhn/ucs/YYYY-MM-DD
-
-- change to the trunk directory
-- run svn merge, merging from the previous _tag_ to "current"
-  (literally)
-- resolve conflicts
-- commit the merge
-
-(C) 2004 Matthias Andree. GNU General Public License v2, see ../COPYING
diff --git a/website/host-scripts/upload-website.sh b/website/host-scripts/upload-website.sh
index eec2061f..35613402 100755
--- a/website/host-scripts/upload-website.sh
+++ b/website/host-scripts/upload-website.sh
@@ -1,20 +1,20 @@
 #! /bin/sh
 
-# Script to upload fetchmail website from SVN repository
-# (C) 2008 - 2009 by Matthias Andree. GNU GPL v3.
+# Script to upload fetchmail website from Git repository
+# (C) 2008 - 2010 by Matthias Andree. GNU GPL v3.
 
 : ${BERLIOS_LOGIN=m-a}
 
 # abort on error
-set -e
+set -eu
 
 # cd to parent of script
-cd $(dirname "$0")
+cd "$(dirname "$0")"
 cd ..
 
 echo "==>  Running sanity checks"
 # make sure we have no dangling symlinks
-if file * | egrep broken\|dangling ; then
+if LC_ALL=C file * | egrep broken\|dangling ; then
     echo "broken symlinks -> abort" >&2
     exit 1
 fi
@@ -27,7 +27,7 @@ rsync \
     --chmod=ug=rwX,o=rX,Dg=s --perms \
     --copy-links --times --checksum --verbose \
     --exclude host-scripts \
-    --exclude .svn --exclude '*~' --exclude '#*#' \
+    --exclude .git --exclude '*~' --exclude '#*#' \
     * \
     "$BERLIOS_LOGIN@shell.berlios.de:/home/groups/fetchmail/htdocs/" &
 pids="$pids $!"
@@ -37,7 +37,7 @@ rsync \
     --chmod=ug=rwX,o=rX,Dg=s --perms \
     --copy-links --times --checksum --verbose \
     --exclude host-scripts \
-    --exclude .svn --exclude '*~' --exclude '#*#' \
+    --exclude .git --exclude '*~' --exclude '#*#' \
     * \
     $HOME/public_html/fetchmail/info/ &
 pids="$pids $!"
diff --git a/website/index.html b/website/index.html
index e517d10e..2cca1f82 100644
--- a/website/index.html
+++ b/website/index.html
@@ -29,7 +29,7 @@
 	<a href="fetchmail-FAQ.pdf" title="Fetchmail FAQ as PDF">FAQ (PDF)</a><br>
 	<a href="design-notes.html">Design Notes</a><br>
 	<a href="http://developer.berlios.de/project/showfiles.php?group_id=1824">Download</a><br>
-	<a href="http://mknod.org/svn/fetchmail/">Development Code</a><br>
+	<a href="http://gitorious.org/fetchmail/fetchmail/">Development Code</a><br>
 	<a href="http://developer.berlios.de/projects/fetchmail/">Project Page</a><br>
 	<hr>
 </div>
@@ -145,38 +145,35 @@ for discussion of some of the design choices in fetchmail.</p>
 <p>See the project's <a href="todo.html">To-Do list</a> for indications
 of known problems and requested features.</p>
 
-<p>The developers use <a
-href="http://subversion.tigris.org/">Subversion</a> for revision control.
-To get the latest development version, point your subversion client at <a
-href="http://mknod.org/svn/fetchmail/trunk/">http://mknod.org/svn/fetchmail/trunk/</a>.</p>
+<p>The developers use <a href="http://git-scm.com/">Git</a> for revision
+control.  To browse the repository or to get the latest development version,
+find the instructions at <a href="http://gitorious.org/fetchmail/fetchmail">http://gitorious.org/fetchmail/fetchmail</a>.</p>
 
-<p>See the <a
-href="http://developer.berlios.de/projects/fetchmail/">project
+<p>See the <a href="http://developer.berlios.de/projects/fetchmail/">project
 page</a> for more, including <a
-href="http://developer.berlios.de/project/showfiles.php?group_id=1824">downloads</a>.
-(However, note that we no longer use the subversion repository that Berlios provides.)</p>
+href="http://developer.berlios.de/project/showfiles.php?group_id=1824">downloads</a>.</p>
 
 <h1>Getting help with fetchmail:</h1>
 
-<p>
-There is a fetchmail-users list for help and other user discussion
+<p>Before submitting a question anywhere, <strong>please read the <a
+href="fetchmail-FAQ.html">FAQ</a></strong> (especially item <a
+href="fetchmail-FAQ.html#G3">G3</a> on how to report problems).  We tend to get
+the same three newbie questions over and over again.  The FAQ covers them like
+a blanket.</p>
+
+<p>There is a fetchmail-users list for help and other user discussion
 of fetchmail.  It's a MailMan list, which you can sign up for at <a
 href="http://lists.berlios.de/mailman/listinfo/fetchmail-users">
-fetchmail-users@lists.berlios.de</a>.  There is also a
+fetchmail-users@lists.berlios.de</a>. 
+<br>There is also a
 fetchmail-devel list for people who want to discuss fixes and
 improvements in fetchmail and help co-develop it.  That one is at <a
 href="http://lists.berlios.de/mailman/listinfo/fetchmail-devel">
 fetchmail-devel@lists.berlios.de</a>.
-Finally, there is an announcements-only list, <a
+<br>Finally, there is an announcements-only list, <a
 href="http://lists.berlios.de/mailman/listinfo/fetchmail-announce">
 fetchmail-announce@lists.berlios.de</a>.</p>
 
-<p>Note: before submitting a question to the lists, <strong>please read
-the <a href="fetchmail-FAQ.html">FAQ</a></strong> (especially item <a
-href="fetchmail-FAQ.html#G3">G3</a> on how to report bugs).  We
-tend to get the same three newbie questions over and over again.  The
-FAQ covers them like a blanket.</p>
-
 <h1>Maintainer History</h1>
 <p>Fetchmail originated as a program called <i>popclient</i>, written
 by Carl Harris.  In 1996, <a href="http://www.catb.org/~esr/">Eric