summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorjschauma <jschauma@pkgsrc.org>2003-11-14 00:42:18 +0000
committerjschauma <jschauma@pkgsrc.org>2003-11-14 00:42:18 +0000
commit0fb9e7d14ce0607e87e1c8e0c3b44af90624712c (patch)
tree4a1ebe84093d06ebdde4f78a08bb24d49866f029 /security
parent834571bb19574bfd8c2d04bedcab9578ac629fc9 (diff)
downloadpkgsrc-0fb9e7d14ce0607e87e1c8e0c3b44af90624712c.tar.gz
Fix problems seen in latest bulk-build by:
- using PKGNAME_NOREV as the basis for the DISTFILE - correcting/updating the MASTER_SITES and HOMEPAGE - patching instead of using -DOPENSSL="\"openssl\"", since apparently #include "openssl/""foo.h" is no good (gcc-3 issue?)
Diffstat (limited to 'security')
-rw-r--r--security/sslwrap/Makefile14
-rw-r--r--security/sslwrap/distinfo4
-rw-r--r--security/sslwrap/patches/patch-aa5
3 files changed, 14 insertions, 9 deletions
diff --git a/security/sslwrap/Makefile b/security/sslwrap/Makefile
index 7128e49920e..bf70ed0caa9 100644
--- a/security/sslwrap/Makefile
+++ b/security/sslwrap/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.11 2003/11/12 03:39:43 jschauma Exp $
+# $NetBSD: Makefile,v 1.12 2003/11/14 00:42:18 jschauma Exp $
#
-DISTNAME= ${PKGNAME:S/-//}
+DISTNAME= ${PKGNAME_NOREV:S/-//}
PKGNAME= sslwrap-206
PKGREVISION= 1
CATEGORIES= security net
-MASTER_SITES= http://www.rickk.com/sslwrap/
+MASTER_SITES= http://www.quiltaholic.com/rickk/sslwrap/
MAINTAINER= rh@NetBSD.org
-HOMEPAGE= http://www.rickk.com/sslwrap/
+HOMEPAGE= http://www.quiltaholic.com/rickk/sslwrap/
COMMENT= Simple SSL wrapper
USE_BUILDLINK2= YES
@@ -19,4 +19,10 @@ USE_BUILDLINK2= YES
CFLAGS+= -DFLAT_INC
.endif
+do-configure:
+.for f in apps.h s_cb.c s_server.c s_socket.c
+ sed -e 's|OPENSSL"|"openssl/|' ${WRKSRC}/$f > ${WRKSRC}/$f.not && \
+ mv ${WRKSRC}/$f.not ${WRKSRC}/$f
+.endfor
+
.include "../../mk/bsd.pkg.mk"
diff --git a/security/sslwrap/distinfo b/security/sslwrap/distinfo
index c3a55610ee2..819af8283a2 100644
--- a/security/sslwrap/distinfo
+++ b/security/sslwrap/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2003/09/18 04:09:18 jmc Exp $
+$NetBSD: distinfo,v 1.4 2003/11/14 00:42:18 jschauma Exp $
SHA1 (sslwrap206.tar.gz) = fc8a4a4134d2668705f9fc4ac92a45a847c3edf9
Size (sslwrap206.tar.gz) = 21170 bytes
-SHA1 (patch-aa) = 9a8e868a64ea7439f1a2c46f5295c552bf3060df
+SHA1 (patch-aa) = d036726db779562eea96c4909c6f2c790610928a
SHA1 (patch-ab) = 7f28cb5eca2a004408cb20aa365edad0d4f7d45a
SHA1 (patch-ac) = 7ffb5a45843d8d4d99867967547663ef7656bd32
diff --git a/security/sslwrap/patches/patch-aa b/security/sslwrap/patches/patch-aa
index 75100a0d3ca..0c071877702 100644
--- a/security/sslwrap/patches/patch-aa
+++ b/security/sslwrap/patches/patch-aa
@@ -1,11 +1,10 @@
-$NetBSD: patch-aa,v 1.3 2003/09/18 04:09:19 jmc Exp $
+$NetBSD: patch-aa,v 1.4 2003/11/14 00:42:18 jschauma Exp $
--- Makefile.orig 2000-11-11 22:01:25.000000000 +0000
+++ Makefile 2003-09-17 23:03:22.000000000 +0000
-@@ -1,28 +1,16 @@
+@@ -1,28 +1,15 @@
+PROG= sslwrap
+SRCS= s_server.c s_socket.c s_cb.c
-+COPTS+= -DOPENSSL="\"openssl/\""
+LDADD= -lssl -lcrypto
+MAN=
+