Upgrade to 2.1a (pkgsrc 2.1.0.1): Fixes a security problem.

Closes pkg/12097.

6 files changed, 25 insertions, 33 deletions

diff --git a/net/sendfile/Makefile b/net/sendfile/Makefile
index df7620186f9..ae6fec3b528 100644
--- a/net/sendfile/Makefile
+++ b/net/sendfile/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2001/02/17 18:19:36 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2001/02/26 11:34:54 wiz Exp $
 #
 
-DISTNAME=	sendfile-2.1
+DISTNAME=	sendfile-2.1a
+PKGNAME=	sendfile-2.1.0.1
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.uni-stuttgart.de/pub/unix/comm/sendfile/current/
 
diff --git a/net/sendfile/files/md5 b/net/sendfile/files/md5
index c7a99196357..79de53f3310 100644
--- a/net/sendfile/files/md5
+++ b/net/sendfile/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 1999/06/06 17:08:37 hwr Exp $
+$NetBSD: md5,v 1.2 2001/02/26 11:34:55 wiz Exp $
 
-MD5 (sendfile-2.1.tar.gz) = 89d142b12ce005599842f11c59e840cc
+MD5 (sendfile-2.1a.tar.gz) = 436684ea7e76aec5d5ad5e321be06917
diff --git a/net/sendfile/files/patch-sum b/net/sendfile/files/patch-sum
index 00e0645b450..7125cd06d6a 100644
--- a/net/sendfile/files/patch-sum
+++ b/net/sendfile/files/patch-sum
@@ -1,5 +1,5 @@
-$NetBSD: patch-sum,v 1.2 2000/09/09 19:51:38 wiz Exp $
+$NetBSD: patch-sum,v 1.3 2001/02/26 11:34:55 wiz Exp $
 
-MD5 (patch-aa) = 188dd2e33651fddf5a8b34d6c553abad
-MD5 (patch-ab) = b53c39c98e6b8a52813070bf6ecbd148
-MD5 (patch-ac) = 13efc6f6952598e964015d50c97d3780
+MD5 (patch-aa) = cfbef103895f96c733f3f754a58747e0
+MD5 (patch-ab) = 0fd24b36fc63ab4267ac592798b8187b
+MD5 (patch-ac) = 6e77df6a3efa46381ea41df182301052
diff --git a/net/sendfile/patches/patch-aa b/net/sendfile/patches/patch-aa
index a584959ee3a..2a08d065503 100644
--- a/net/sendfile/patches/patch-aa
+++ b/net/sendfile/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.1.1.1 1999/06/06 17:08:37 hwr Exp $
+$NetBSD: patch-aa,v 1.2 2001/02/26 11:34:55 wiz Exp $
 
---- makeconfig.orig	Tue Jul 14 12:52:25 1998
-+++ makeconfig	Sun Jun  6 17:05:23 1999
+--- makeconfig.orig	Thu Aug 26 20:53:32 1999
++++ makeconfig
 @@ -16,10 +16,10 @@
  
  # default installation settings
diff --git a/net/sendfile/patches/patch-ab b/net/sendfile/patches/patch-ab
index 1202171bcf5..62fcf64011f 100644
--- a/net/sendfile/patches/patch-ab
+++ b/net/sendfile/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.3 2000/09/09 19:51:38 wiz Exp $
+$NetBSD: patch-ab,v 1.4 2001/02/26 11:34:55 wiz Exp $
 
---- src/sendfiled.c.orig	Thu Oct 29 17:48:08 1998
-+++ src/sendfiled.c
-@@ -2945,7 +2945,7 @@
-       exit(1);
-     }
-     if (wlock_file(lockf)<0) {
--      snprintf(MAXS(tmp),"cannot lock %s : ",lockfn,strerror(errno));
-+      snprintf(MAXS(tmp),"cannot lock %s : %s",lockfn,strerror(errno));
-       dbgout(tmp);
-       exit(1);
+--- src/io.c.orig	Fri Feb 16 14:53:43 2001
++++ src/io.c
+@@ -389,7 +389,7 @@
+ 
+     /* delete file */
+     if (unlink(dire->d_name) < 0) {
+-      snprintf(MAXS(tmp),"cannot remove %s/%s",tmpdir);
++      snprintf(MAXS(tmp),"cannot remove %s/%s",tmpdir,dire->d_name);
+       message("",'X',tmp);
      }
+     
diff --git a/net/sendfile/patches/patch-ac b/net/sendfile/patches/patch-ac
index 66622a25ca2..6d70fd03d6c 100644
--- a/net/sendfile/patches/patch-ac
+++ b/net/sendfile/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.1 2000/09/09 19:51:39 wiz Exp $
+$NetBSD: patch-ac,v 1.2 2001/02/26 11:34:55 wiz Exp $
 
---- develop/install.orig	Thu Jan 28 22:45:40 1999
+--- develop/install.orig	Tue Dec  7 10:40:11 1999
 +++ develop/install
 @@ -165,14 +165,6 @@
  To deinstall the sendfile-daemon, simply type: 	rm -f $SERVERDIR/sendfiled
@@ -17,12 +17,3 @@ $NetBSD: patch-ac,v 1.1 2000/09/09 19:51:39 wiz Exp $
  
  umask 022
  
-@@ -304,7 +296,7 @@
-     echo "adding check_sendfile to /etc/csh.login"
-     echo >>/etc/csh.login
-     echo "test -x $BINDIR/check_sendfile && $BINDIR/check_sendfile" \
--         >>/etc/profile
-+         >>/etc/csh.login
-   fi
- fi
-