Resolve conflicts from earlier import (the package was apparently already

added and then deleted again during the last freeze)

8 files changed, 31 insertions, 3 deletions

diff --git a/security/sslwrap/Makefile b/security/sslwrap/Makefile
new file mode 100644
index 00000000000..e5f07c8c254
--- /dev/null
+++ b/security/sslwrap/Makefile
@@ -0,0 +1,14 @@
+# $NetBSD: Makefile,v 1.3 2000/12/30 20:12:16 rh Exp $
+#
+
+DISTNAME=	${PKGNAME:S/-//}
+PKGNAME=	sslwrap-206
+CATEGORIES=	security net
+MASTER_SITES=	http://www.rickk.com/sslwrap/
+
+MAINTAINER=	rh@netbsd.org
+HOMEPAGE=	http://www.rickk.com/sslwrap/
+
+DEPENDS+=	openssl>=0.9.4:../../security/openssl
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/security/sslwrap/files/md5 b/security/sslwrap/files/md5
new file mode 100644
index 00000000000..8c2610fbe6f
--- /dev/null
+++ b/security/sslwrap/files/md5
@@ -0,0 +1,3 @@
+$NetBSD: md5,v 1.3 2000/12/30 20:12:17 rh Exp $
+
+MD5 (sslwrap206.tar.gz) = 5a09f966f9114a108572f70a57bafdf7
diff --git a/security/sslwrap/files/patch-sum b/security/sslwrap/files/patch-sum
index 67e8b57bf26..1e1d86feb7d 100644
--- a/security/sslwrap/files/patch-sum
+++ b/security/sslwrap/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.1.1.1 2000/12/30 20:04:25 rh Exp $
+$NetBSD: patch-sum,v 1.2 2000/12/30 20:12:17 rh Exp $
 
 MD5 (patch-aa) = 7f3ca8d783a5364882f16c62261aaa40
 MD5 (patch-ab) = 29d912f363a1dfb6cb7eb52c3493de1b
diff --git a/security/sslwrap/patches/patch-aa b/security/sslwrap/patches/patch-aa
index 2795def05b9..8fc387b8111 100644
--- a/security/sslwrap/patches/patch-aa
+++ b/security/sslwrap/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/12/30 20:04:25 rh Exp $
+$NetBSD: patch-aa,v 1.2 2000/12/30 20:12:17 rh Exp $
 
 --- Makefile.orig	Sat Nov 11 23:01:25 2000
 +++ Makefile
diff --git a/security/sslwrap/patches/patch-ab b/security/sslwrap/patches/patch-ab
index 56a8f3fc8d5..f8b489992b9 100644
--- a/security/sslwrap/patches/patch-ab
+++ b/security/sslwrap/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.1.1.1 2000/12/30 20:04:25 rh Exp $
+$NetBSD: patch-ab,v 1.2 2000/12/30 20:12:18 rh Exp $
 
 --- apps.h.orig	Sat Nov 11 23:01:25 2000
 +++ apps.h
diff --git a/security/sslwrap/pkg/COMMENT b/security/sslwrap/pkg/COMMENT
new file mode 100644
index 00000000000..d765c0eb224
--- /dev/null
+++ b/security/sslwrap/pkg/COMMENT
@@ -0,0 +1 @@
+simple ssl wrapper
diff --git a/security/sslwrap/pkg/DESCR b/security/sslwrap/pkg/DESCR
new file mode 100644
index 00000000000..7958040ab8c
--- /dev/null
+++ b/security/sslwrap/pkg/DESCR
@@ -0,0 +1,8 @@
+  sslwrap is a simple Unix service that sits over any simple TCP service
+such as POP3, IMAP, SMTP, and encrypts all of the data on the connection
+using TLS/SSL. It uses openssl to support SSL version 2 and 3. It can run
+out of inetd. It can also encrypt data for services located on another
+computer.
+
+  It works with the servers you already have, and does not require any
+modifications to your existing servers.
diff --git a/security/sslwrap/pkg/PLIST b/security/sslwrap/pkg/PLIST
new file mode 100644
index 00000000000..af924e78de3
--- /dev/null
+++ b/security/sslwrap/pkg/PLIST
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST,v 1.3 2000/12/30 20:12:18 rh Exp $
+sbin/sslwrap