Merge branch '2.2' into 2.3

fetchmail/.md5sum

@@ -1,2 +1 @@
-e8dc5cd8e80677bb60e397d6171d12ec  fetchmail-6.3.5.tar.bz2
-f6cd8be4e304921caa15024e0720b968  fetchmail-brokenheaders.patch
+4fab7ca100ca36e41a2e8dbf5b32a3cf  fetchmail-6.3.6.tar.bz2

fetchmail/Pkgfile

@@ -4,15 +4,16 @@
 # Depends on:  openssl
 
 name=fetchmail
-version=6.3.5
-release=2
-source=(http://download2.berlios.de/$name/$name-$version.tar.bz2 \
-	$name-brokenheaders.patch)
+version=6.3.6
+release=1
+source=(http://download2.berlios.de/$name/$name-$version.tar.bz2)
 
 build() {
     cd $name-$version
-    patch -p0 < ../$name-brokenheaders.patch
-    ./configure --prefix=/usr --with-ssl=/usr --disable-nls
+    ./configure --prefix=/usr \
+                --mandir=/usr/man \
+                --with-ssl=/usr \
+                --disable-nls
     make
     make DESTDIR=$PKG install
     rm -rf $PKG/usr/bin/fetchmailconf \

fetchmail/fetchmail-brokenheaders.patch

@@ -1,24 +0,0 @@
-Index: sink.c
-===================================================================
---- sink.c	(revision 4923)
-+++ sink.c	(working copy)
-@@ -1317,14 +1317,14 @@
-     {
- 	int rc,e,e2,err = 0;
- 
--	if (ferror(sinkfp))
--	    err = 1, e2 = errno;
--	if ((fflush(sinkfp)))
--	    err = 1, e2 = errno;
--
- 	/* close the delivery pipe, we'll reopen before next message */
- 	if (sinkfp)
- 	{
-+	    if (ferror(sinkfp))
-+		err = 1, e2 = errno;
-+	    if ((fflush(sinkfp)))
-+		err = 1, e2 = errno;
-+
- 	    errno = 0;
- 	    rc = pclose(sinkfp);
- 	    e = errno;