silently upgraded from upstream; integrating patches from pkgsrc. Got confirmation from Ulli Horlacher

5 files changed, 16 insertions, 172 deletions

diff --git a/net/sendfile/distinfo b/net/sendfile/distinfo
index 19763e4b0ba..5db99ca58af 100644
--- a/net/sendfile/distinfo
+++ b/net/sendfile/distinfo
@@ -1,11 +1,8 @@
-$NetBSD: distinfo,v 1.13 2011/07/06 11:31:58 mspo Exp $
+$NetBSD: distinfo,v 1.14 2011/07/07 01:44:11 mspo Exp $
 
 SHA1 (sendfile-2.1b.tar.gz) = 134d0ace605fc022d6cf8fba896493e3c2e7bde3
 RMD160 (sendfile-2.1b.tar.gz) = 44f5cf03e02f1b620da12cccc62ece87f1a98873
 Size (sendfile-2.1b.tar.gz) = 343785 bytes
-SHA1 (patch-aa) = 3071fcbc26705b2f382d373913fa804aac0b35ab
+SHA1 (patch-aa) = f11c91153e8600b16335d1746e2ea5bbe4ad447b
 SHA1 (patch-ac) = d6830d56fa5a610d376cf847f0a4d54ed15d2056
 SHA1 (patch-ad) = ec9cf6dd79b6856c196058cb3117f2b140fffa31
-SHA1 (patch-ae) = 19847558b6b1bae8ce6d7ba37cb217ccd6fe896e
-SHA1 (patch-af) = f04e5bb9956e34b2b0ae1f1ba72addfffdd1ff78
-SHA1 (patch-ag) = d43da0ec208923ca825567b82197b8dcba97a94e
diff --git a/net/sendfile/patches/patch-aa b/net/sendfile/patches/patch-aa
index fa74f6dbd00..c08f28ea7dd 100644
--- a/net/sendfile/patches/patch-aa
+++ b/net/sendfile/patches/patch-aa
@@ -1,22 +1,25 @@
-$NetBSD: patch-aa,v 1.7 2011/06/01 11:21:01 is Exp $
+$NetBSD: patch-aa,v 1.8 2011/07/07 01:44:11 mspo Exp $
 
---- makeconfig.orig	2006-06-07 13:57:47.000000000 +0000
+--- makeconfig.orig	2011-07-07 01:05:11.000000000 +0000
 +++ makeconfig
-@@ -9,17 +9,13 @@
- #	$HOME/.develenv
+@@ -10,17 +10,18 @@
  # or simply call: makeconfig CC=gcc ...
  
--# default compiling settings
+ # default compiling settings
 -CC=gcc
 -CFLAGS=-O2
 -LDFLAGS=-s
--
++#CC=gcc
++#CFLAGS=-O2
++#LDFLAGS=-s
+ 
  # default installation settings
+ PREFIX=/usr/local
  SPOOL=/var/spool/sendfile
--BINDIR=/usr/local/bin
--MANDIR=/usr/local/man
--CONFIG=/usr/local/etc
--SERVERDIR=/usr/local/sbin
+-BINDIR=$PREFIX/bin
+-MANDIR=$PREFIX/man
+-CONFIG=$PREFIX/etc
+-SERVERDIR=$PREFIX/sbin
 +BINDIR=${LOCALBASE}/bin
 +MANDIR=${LOCALBASE}/man
 +CONFIG=${LOCALBASE}/etc
@@ -25,46 +28,7 @@ $NetBSD: patch-aa,v 1.7 2011/06/01 11:21:01 is Exp $
  INETDCONF=/etc/inetd.conf # xinetd will be automaticly recognized
  SERVICES=/etc/services
  
-@@ -89,17 +85,22 @@ SYSTEM=`./config.guess`
- case "$SYSTEM" in
-   *linux*)	SYSTEM=LINUX;;
-   *sunos4*)	SYSTEM=SOLARIS1
-+		SENDMAIL=/usr/lib/sendmail
-   		if [ -f /lib/lib44bsd.a -o -f /usr/lib/lib44bsd.a ]; then
- 		  LIBS="-l44bsd"
- 		fi;;
--  *solaris2*)	SYSTEM=SOLARIS2;;
--  *hp-ux*)	SYSTEM=HPUX;;
--  *aix*)	SYSTEM=AIX;;
-+  *solaris2*)	SYSTEM=SOLARIS2
-+		SENDMAIL=/usr/lib/sendmail;;
-+  *hp-ux*)	SYSTEM=HPUX
-+		SENDMAIL=/usr/lib/sendmail;;
-+  *aix*)	SYSTEM=AIX
-+		SENDMAIL=/usr/lib/sendmail;;
-   *irix*)	SYSTEM=IRIX;;
-   *next*)	SYSTEM=NEXT;;
--  *convex*)	SYSTEM=CONVEXOS;;
-+  *convex*)	SYSTEM=CONVEXOS
-+		SENDMAIL=/usr/lib/sendmail;;
-   *osf*)	SYSTEM=OSF1;;
--  *bsd*)	SYSTEM=BSD;;
-+  *bsd*|*dragonfly*)	SYSTEM=BSD;;
-   *darwin*)	SYSTEM=DARWIN;;
-   *)		SYSTEM=UNKNOWN;;
- #  *)		SYSTEM=`uname -a | tr '[a-z]' '[A-Z]'`
-@@ -111,6 +112,10 @@ case "$SYSTEM" in
- #		esac;;
- esac
- 
-+case "$SYSTEM" in
-+BSD)	CFLAGS="$CFLAGS -DHAVE_STRERROR=1 -DHAVE_GETOPT_H=1" ;;
-+esac
-+
- cd ../src
- echo now in `pwd`
- 
-@@ -134,6 +139,7 @@ cat <<EOD>globals.h
+@@ -145,6 +146,7 @@ cat <<EOD>globals.h
  #define MANDIR		"$MANDIR"
  #define SERVERDIR	"$SERVERDIR"
  
@@ -72,35 +36,3 @@ $NetBSD: patch-aa,v 1.7 2011/06/01 11:21:01 is Exp $
  #define CONFIG		"$CONFIG/sendfile.cf"
  #define ALIASES		"$CONFIG/sendfile.aliases"
  #define ALLOW		"$CONFIG/sendfile.allow"
-@@ -151,7 +157,7 @@ cat <<EOD>globals.h
- #define PGP	 	"${PGP:-pgp}"
- #define RECODE	 	"${RECODE:-recode}"
- #define METAMAIL 	"${METAMAIL:-metamail}"
--#define SENDMAIL 	"${SENDMAIL:-/usr/lib/sendmail}"
-+#define SENDMAIL 	"${SENDMAIL:-/usr/sbin/sendmail}"
- #define FIFODIR  	"${FIFODIR:-/tmp/sfm}"	
- 
- #define DBF		 "/var/log/sendfiled.dbg"
-@@ -170,7 +176,7 @@ cat <<EOD>globals.h
- #undef  DEBUG			/* more debugging output */
- #undef  ALT_MESSAGES		/* alternative user message format */
- #undef  RESPECT_MAIL_ALIASES	/* look for elm aliases, too */
--#undef  ENABLE_MULTIPROTOCOL	/* ipv6 support for Linux */
-+#define  ENABLE_MULTIPROTOCOL	/* ipv6 support for Linux */
- 
- #ifdef ENABLE_MULTIPROTOCOL
- #define SERVICE         "saft"  /* service entry for saft */
-@@ -204,6 +210,13 @@ cat <<EOD>>config.h
-   #endif
-   #ifndef _POSIX_SOURCE
-     #define _POSIX_SOURCE
-+    #define _POSIX_C_SOURCE	200112L	/* snprintf */
-+  #endif
-+  #ifndef _XOPEN_SOURCE
-+    #define _XOPEN_SOURCE		/* strdup */
-+  #endif
-+  #ifndef _NETBSD_SOURCE
-+    #define _NETBSD_SOURCE		/* struct timezone */
-   #endif
-   #ifndef __USE_BSD
-     #define __USE_BSD
diff --git a/net/sendfile/patches/patch-ae b/net/sendfile/patches/patch-ae
deleted file mode 100644
index 6c5ac2018a2..00000000000
--- a/net/sendfile/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2011/06/01 11:21:01 is Exp $
-
---- src/net.c.orig	2011-05-30 16:21:42.000000000 +0200
-+++ src/net.c
-@@ -393,7 +393,7 @@ int open_connection(char *adr, char* ser
-   result = getaddrinfo(hostname, service, &hints, &addressInfo);
-   free(hostptr);
- 
--  if (result < 0) return (-3);
-+  if (result != 0) return (-3);
- 
-   for (aiptr = addressInfo; aiptr != NULL; aiptr = aiptr->ai_next)
-   {
diff --git a/net/sendfile/patches/patch-af b/net/sendfile/patches/patch-af
deleted file mode 100644
index 351a18a19b8..00000000000
--- a/net/sendfile/patches/patch-af
+++ /dev/null
@@ -1,47 +0,0 @@
-$NetBSD: patch-af,v 1.1 2011/06/01 11:21:01 is Exp $
-
---- src/peername.c.orig	2005-06-06 23:14:16.000000000 +0200
-+++ src/peername.c
-@@ -65,7 +65,7 @@
- #ifndef ENABLE_MULTIPROTOCOL
- 
- char *peername(int fd) {
--  size_t len;
-+  socklen_t len;
-   struct sockaddr addr;
-   struct in_addr *iaddr;
-   struct hostent *hptr;
-@@ -109,7 +109,7 @@ char *defaultName = "UNKNOWN_HOST";
- 
- 
- char *peername(int fd) {
--  size_t len;
-+  socklen_t len;
-   char addrbuf[1024];
-   struct sockaddr *addr;
-   char service[1024];
-@@ -125,11 +125,13 @@ char *peername(int fd) {
-    * is less than sizeof(struct sockadd_in6)
-    */
- 
--  if ((getpeername(fd,&addrbuf,&len)) < 0) return(defaultName);
-+  if ((getpeername(fd,(struct sockaddr *)&addrbuf,&len)) < 0) {
-+	return(defaultName);
-+  }
-   addr = (struct sockaddr*)addrbuf;
- 
-   if (getnameinfo(addr, len, peerHostName, 1023, 
--                  service, 1023, 0) < 0) {
-+                  service, 1023, 0) != 0) {
-     return defaultName;
-   }
- 
-@@ -171,7 +173,7 @@ char *peername(int fd) {
-   }
- 
-   if (getnameinfo(addr, len, peerHostName, 1023, 
--                  service, 1023, NI_NUMERICHOST) < 0) {
-+                  service, 1023, NI_NUMERICHOST) != 0) {
-     return defaultName;
-   } else {
-     return strdup(peerHostName);
diff --git a/net/sendfile/patches/patch-ag b/net/sendfile/patches/patch-ag
deleted file mode 100644
index 769cfb4dc72..00000000000
--- a/net/sendfile/patches/patch-ag
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2011/06/01 11:21:01 is Exp $
-
---- src/address.c.orig	2005-06-06 21:14:16.000000000 +0000
-+++ src/address.c
-@@ -688,7 +688,8 @@ int saft_connect(const char *type, 
- 	if (strcasecmp(service, SERVICE) == 0 || strcmp(service, PORT_STRING) == 0) {
- 	  snprintf(MAXS(ahost),"saft.%s",host);
- 	  if (client) {
--	    if(gethostbyname2(ahost, addressFamily)){
-+	    sockfd=open_connection(host,service);
-+	    if(sockfd >= 0){
- 	      if (!quiet) {
- 		printf("try sending to %s@%s ? ",recipient,ahost);
- 		fgetl(answer,stdin);
-@@ -703,7 +704,9 @@ int saft_connect(const char *type, 
- 	      snprintf(MAXS(tmp),"opening connection to %s@%s",recipient,host);
- 	      if (quiet<2) message(prg,'I',tmp);
- 	    }
--	    sockfd=open_connection(host,service);
-+	  } else {
-+	    close(sockfd);
-+	    sockfd = -3;
- 	  }
- 	}
-