rpms/fetchmail/devel fetchmail-6.3.3-resolv.patch, NONE, 1.1 fetchmail-6.3.3-types.patch, NONE, 1.1 fetchmail.spec, 1.41, 1.42

Fri Mar 31 20:46:44 UTC 2006

Author: mitr

Update of /cvs/dist/rpms/fetchmail/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8770

Modified Files:
	fetchmail.spec 
Added Files:
	fetchmail-6.3.3-resolv.patch fetchmail-6.3.3-types.patch 
Log Message:
* Fri Mar 31 2006 Miloslav Trmac <mitr at redhat.com> - 6.3.3-2
- Fix some type mismatches on 64-bit architectures
- Fix checking for res_* on architectures with newer glibc ABI


fetchmail-6.3.3-resolv.patch:
 configure.ac |   32 +++++++++++++++++++++++++++-----
 1 files changed, 27 insertions(+), 5 deletions(-)

--- NEW FILE fetchmail-6.3.3-resolv.patch ---
diff --exclude '*~' --exclude '*.o' -urN fetchmail/configure.ac fetchmail-6.3.3/configure.ac
--- fetchmail/configure.ac	2006-03-29 12:30:05.000000000 +0200
+++ fetchmail-6.3.3/configure.ac	2006-03-31 19:29:12.000000000 +0200
@@ -137,7 +137,7 @@
 AC_SUBST(EXTRAOBJ)
 
 AC_CHECK_FUNCS(tcsetattr stty setsid geteuid seteuid dnl
-  res_search strerror syslog snprintf vprintf vsnprintf vsyslog dnl
+  strerror syslog snprintf vprintf vsnprintf vsyslog dnl
   atexit inet_aton strftime setrlimit socketpair sigprocmask dnl
   sigaction strdup setlocale)
 
@@ -147,10 +147,32 @@
 # and breaks gethostbyname(2).  It's better to use the bind stuff in the C
 # library.  So don't add -lresolv to the link list unless it's necessary
 # (It will be necessary when using GNU libc6).
-AC_CHECK_FUNC(res_search,
-    AC_MSG_RESULT(using libc's resolver functions),
-    AC_CHECK_LIB(resolv,res_search, 
-	[AC_DEFINE(HAVE_RES_SEARCH) AC_MSG_RESULT(found resolver functions in libresolv); LIBS="$LIBS -lresolv"], AC_MSG_RESULT(no resolver calls found)))
+old_libs=$LIBS
+for lib in '' -lresolv; do
+    if test -z "$lib"; then
+       AC_MSG_CHECKING([for res_search in libc])
+    else
+       AC_MSG_CHECKING([for res_search in $lib])
+    fi
+    LIBS="$old_LIBS $lib"
+    AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+#include <sys/types.h>
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_NAMESER_H
+#include <arpa/nameser.h>
+#endif
+#ifdef HAVE_RESOLV_H
+#include <resolv.h>
+#endif
+extern int res_search();
+]], [[res_search(0, 0, 0, 0, 0);]])],
+    [AC_MSG_RESULT([found])
+     AC_DEFINE(HAVE_RES_SEARCH, [1],
+	       [Define to 1 if you have the `res_search' function.])
+     break], [AC_MSG_RESULT([not found])])
+done
 
 dnl Check for libcrypt -- it may live in libc or libcrypt, as on IRIX
 AC_CHECK_FUNC(crypt, , AC_CHECK_LIB(crypt,crypt))

fetchmail-6.3.3-types.patch:
 rpa.c      |    2 +-
 socket.c   |    2 +-
 transact.c |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE fetchmail-6.3.3-types.patch ---
diff --exclude '*~' --exclude '*.o' -urN fetchmail/rpa.c fetchmail-6.3.3/rpa.c
--- fetchmail/rpa.c	2006-03-15 17:38:55.000000000 +0100
+++ fetchmail-6.3.3/rpa.c	2006-03-31 17:35:53.000000000 +0200
@@ -527,7 +527,7 @@
 	    else if ( ch=='+'                )   newx = 62;
 	    else if ( ch=='/'                )   newx = 63;
 	    else {
-		report(stderr,  GT_("dec64 error at char %d: %x\n"), inp - bufp, ch);
+	        report(stderr,  GT_("dec64 error at char %d: %x\n"), (int)(inp - bufp), ch);
 		return(0);
 	    }
 	    part=((part & 0x3F)*64) + newx;
diff --exclude '*~' --exclude '*.o' -urN fetchmail/socket.c fetchmail-6.3.3/socket.c
--- fetchmail/socket.c	2006-03-31 17:30:00.000000000 +0200
+++ fetchmail-6.3.3/socket.c	2006-03-31 17:34:17.000000000 +0200
@@ -755,7 +755,7 @@
 		case X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT:
 			X509_NAME_oneline(issuer, buf, sizeof(buf));
 			buf[sizeof(buf) - 1] = '\0';
-			report(stderr, GT_("unknown issuer (first %d characters): %s\n"), sizeof(buf)-1, buf);
+			report(stderr, GT_("unknown issuer (first %d characters): %s\n"), (int)(sizeof(buf)-1), buf);
 			break;
 		}
 	}
diff --exclude '*~' --exclude '*.o' -urN fetchmail/transact.c fetchmail-6.3.3/transact.c
--- fetchmail/transact.c	2006-03-15 17:58:18.000000000 +0100
+++ fetchmail-6.3.3/transact.c	2006-03-31 17:35:19.000000000 +0200
@@ -1164,7 +1164,7 @@
 		    saddr, sizeof(saddr), NULL, 0,
 		    NI_NUMERICHOST);
 	    if (e)
-		snprintf(saddr, sizeof(saddr), "(%-.*s)", sizeof(saddr) - 3, gai_strerror(e));
+		snprintf(saddr, sizeof(saddr), "(%-.*s)", (int)(sizeof(saddr) - 3), gai_strerror(e));
 	    snprintf(buf, sizeof(buf),
 		    "Received: from %s [%s]\r\n", 
 		    ctl->server.truename, saddr);


Index: fetchmail.spec
===================================================================
RCS file: /cvs/dist/rpms/fetchmail/devel/fetchmail.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- fetchmail.spec	31 Mar 2006 15:20:22 -0000	1.41
+++ fetchmail.spec	31 Mar 2006 20:46:42 -0000	1.42
@@ -4,11 +4,13 @@
 Summary: A remote mail retrieval and forwarding utility.
 Name: fetchmail
 Version: 6.3.3
-Release: 1
+Release: 2
 Requires: smtpdaemon
 Source0: http://download.berlios.de/fetchmail/fetchmail-%{version}.tar.bz2
 Source1: http://download.berlios.de/fetchmail/fetchmail-%{version}.tar.bz2.asc
 Patch0: fetchmail-6.2.5-addrconf.patch
+Patch1: fetchmail-6.3.3-types.patch
+Patch2: fetchmail-6.3.3-resolv.patch
 URL: http://fetchmail.berlios.de/
 License: GPL
 Group: Applications/Internet
@@ -46,6 +48,11 @@
 %prep
 %setup -q
 %patch0 -p1 -b .addrconf
+%patch1 -p1 -b .types
+%patch2 -p1 -b .resolv
+
+# For fetchmail-6.3.3-resolv.patch
+autoreconf -f
 
 %build
 %configure --enable-POP3 --enable-IMAP --with-ssl --with-hesiod \
@@ -83,6 +90,10 @@
 %endif
 
 %changelog
+* Fri Mar 31 2006 Miloslav Trmac <mitr at redhat.com> - 6.3.3-2
+- Fix some type mismatches on 64-bit architectures
+- Fix checking for res_* on architectures with newer glibc ABI
+
 * Fri Mar 31 2006 Miloslav Trmac <mitr at redhat.com> - 6.3.3-1
 - Update to fetchmail-6.3.3
 


