On Sat, 12 Feb 2000, Adrian Steinmann wrote:
> cd /usr/ports/security/openssl
> make -V FORBIDDEN
> "OpenSSL is already in the base system"
> yet it doesn't appear to be.
Yes it is :-) Install the crypto sources from internat.
> This causes openssh to fail likewise because it depends on openssl
> (crypto.1 shared library), the patch below removes that dependancy
> so
> cd /usr/ports/security/openssh
> make USA_RESIDENT=NO
> works after the 3.4 openssl port is installed.
I sent green a patch yesterday (attached) which will allow it to build
properly on all versions of FreeBSD. Since the ports freeze is on monday,
I'll commit it myself if I dont hear back from him before then.
> The real fix would be to really put openssl into the base system.
Thanks, already fixed about a month ago :-)
Kris
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/security/openssh/Makefile,v
retrieving revision 1.43
diff -u -r1.43 Makefile
--- Makefile 2000/02/10 12:23:49 1.43
+++ Makefile 2000/02/12 07:55:10
@@ -14,7 +14,7 @@
MAINTAINER= [EMAIL PROTECTED]
-LIB_DEPENDS= crypto.1:${PORTSDIR}/security/openssl
+USE_OPENSSL= RSA
.include <bsd.port.pre.mk>
CAT?= /bin/cat
@@ -29,13 +29,9 @@
CVS_DATE_!= ${ECHO} -n "${CVS_DATE}" | ${SED} 's/[ \t:]/_/g'
CVS_SITES= [EMAIL PROTECTED]:/cvs \
:pserver:[EMAIL PROTECTED]:/cvs
-CRYPTOLIBS= -L${PREFIX}/lib -lcrypto
-.ifdef USA_RESIDENT
-.if ${USA_RESIDENT} == YES
-CRYPTOLIBS+= -lRSAglue -lrsaref
-.endif
-.else
-.error "USA_RESIDENT must be set to 'YES' or 'NO' correctly!"
+CRYPTOLIBS= -L${OPENSSLLIB} -lcrypto
+.if defined(OPENSSL_RSAREF)
+CRYPTOLIBS+= -lRSAglue -L${LOCALBASE}/lib -lrsaref
.endif
# Here, MANDIR is concetenated to DESTDIR which all forms the man install dir...
MAKE_ENV= DESTDIR=${PREFIX} MANDIR=/man/man CRYPTOLIBS="${CRYPTOLIBS}"
Index: patches/patch-ab
===================================================================
RCS file: /home/ncvs/ports/security/openssh/patches/patch-ab,v
retrieving revision 1.9
diff -u -r1.9 patch-ab
--- patches/patch-ab 2000/02/09 03:28:48 1.9
+++ patches/patch-ab 2000/02/12 07:58:06
@@ -1,5 +1,5 @@
---- Makefile.inc.orig Wed Feb 9 01:00:11 2000
-+++ Makefile.inc Wed Feb 9 01:08:09 2000
+--- Makefile.inc.orig Fri Feb 11 23:56:29 2000
++++ Makefile.inc Fri Feb 11 23:57:56 2000
@@ -2,10 +2,14 @@
.include <bsd.obj.mk>
@@ -15,7 +15,7 @@
+TCP_WRAPPERS?= yes
+.if !defined(MAKEFILE_INC_FIRST_PASS)
+MAKEFILE_INC_FIRST_PASS= 0
-+CFLAGS+= -I${PREFIX}/include ${INET6FLAGS}
++CFLAGS+= -I${OPENSSLINC} ${INET6FLAGS}
LDADD+= -L${.CURDIR}/../lib -lssh
DPADD+= ${.CURDIR}/../lib/libssh.a
.endif
