kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Properly reference the rsaref sources, which are required during the build

Browse source 
of ssh now.  If anyone knows of a way of making the build dependency here
less gross, I'm listening! :)
This commit is contained in:
Jordan K. Hubbard 1998-10-08 03:42:23 +00:00
parent 54c57c6d28
commit 564a72f782
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=13727
4 changed files with 20 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
security/ssh/Makefile
View file

@ -3,7 +3,7 @@
# Date created: 30 Jul 1995
# Whom: torstenb@FreeBSD.ORG
#
# $Id: Makefile,v 1.65 1998/09/26 04:42:09 dima Exp $
# $Id: Makefile,v 1.66 1998/10/07 23:03:44 jkh Exp $
#
# Maximal ssh package requires YES values for
# USE_PERL, USE_TCPWRAP
@ -56,7 +56,7 @@ CONFIGURE_ARGS= --prefix=${PREFIX} --with-etcdir=${PREFIX}/etc
.if defined(USA_RESIDENT) && ${USA_RESIDENT} == YES
CONFIGURE_ARGS+= --with-rsaref
LIB_DEPENDS+= rsaref.2:${PORTSDIR}/security/rsaref
BUILD_DEPENDS+= ${PORTSDIR}/security/rsaref/work/.extract_done:${PORTSDIR}/security/rsaref
.endif
.if defined(KRB5_HOME) && exists(${KRB5_HOME})

13
security/ssh/files/patch-ac
View file

@ -1,6 +1,6 @@
--- Makefile.in.orig Wed Jul 8 12:40:39 1998
+++ Makefile.in Sun Sep 13 12:38:43 1998
@@ -294,12 +294,17 @@
--- Makefile.in.orig Wed Jul 8 09:40:39 1998
+++ Makefile.in Wed Oct 7 19:11:37 1998
@@ -294,14 +294,19 @@
SHELL = /bin/sh
GMPDIR = gmp-2.0.2-ssh-2
@ -20,14 +20,17 @@
+ZLIBDEP = $(ZLIBINCDIR)/libz.a
+ZLIBLIBS = -lz
RSAREFDIR = rsaref2
-RSAREFDIR = rsaref2
+RSAREFDIR = ${PORTSDIR}/security/rsaref/work
RSAREFSRCDIR = $(RSAREFDIR)/source
X_CFLAGS = @X_CFLAGS@
@@ -404,7 +409,7 @@
$(CC) -o rfc-pg rfc-pg.o
.c.o:
- $(CC) -c -I. $(KERBEROS_INCS) -I$(srcdir)/$(GMPDIR) -I$(srcdir)/$(ZLIBDIR) $(DEFS) -DHOST_KEY_FILE=\"$(HOST_KEY_FILE)\" -DHOST_CONFIG_FILE=\"$(HOST_CONFIG_FILE)\" -DSERVER_CONFIG_FILE=\"$(SERVER_CONFIG_FILE)\" -DSSH_PROGRAM=\"$(SSH_PROGRAM)\" -DETCDIR=\"$(etcdir)\" -DPIDDIR=\"$(piddir)\" -DSSH_BINDIR=\"$(bindir)\" -DTIS_MAP_FILE=\"$(TIS_MAP_FILE)\" $(CFLAGS) $(X_CFLAGS) $<
+ $(CC) -c -I. $(KERBEROS_INCS) -I$(srcdir)/$(GMPINCDIR) -I$(srcdir)/$(ZLIBINCDIR) $(DEFS) -DHOST_KEY_FILE=\"$(HOST_KEY_FILE)\" -DHOST_CONFIG_FILE=\"$(HOST_CONFIG_FILE)\" -DSERVER_CONFIG_FILE=\"$(SERVER_CONFIG_FILE)\" -DSSH_PROGRAM=\"$(SSH_PROGRAM)\" -DETCDIR=\"$(etcdir)\" -DPIDDIR=\"$(piddir)\" -DSSH_BINDIR=\"$(bindir)\" -DTIS_MAP_FILE=\"$(TIS_MAP_FILE)\" $(CFLAGS) $(X_CFLAGS) $<
+ $(CC) -c -I. $(KERBEROS_INCS) -I../../../rsaref/work -I$(srcdir)/$(GMPINCDIR) -I$(srcdir)/$(ZLIBINCDIR) $(DEFS) -DHOST_KEY_FILE=\"$(HOST_KEY_FILE)\" -DHOST_CONFIG_FILE=\"$(HOST_CONFIG_FILE)\" -DSERVER_CONFIG_FILE=\"$(SERVER_CONFIG_FILE)\" -DSSH_PROGRAM=\"$(SSH_PROGRAM)\" -DETCDIR=\"$(etcdir)\" -DPIDDIR=\"$(piddir)\" -DSSH_BINDIR=\"$(bindir)\" -DTIS_MAP_FILE=\"$(TIS_MAP_FILE)\" $(CFLAGS) $(X_CFLAGS) $<
sshd: $(SSHD_OBJS) $(GMPDEP) $(RSAREFDEP) $(ZLIBDEP)
-rm -f sshd

4
security/ssh2/Makefile
View file

@ -3,7 +3,7 @@
# Date created: 30 Jul 1995
# Whom: torstenb@FreeBSD.ORG
#
# $Id: Makefile,v 1.65 1998/09/26 04:42:09 dima Exp $
# $Id: Makefile,v 1.66 1998/10/07 23:03:44 jkh Exp $
#
# Maximal ssh package requires YES values for
# USE_PERL, USE_TCPWRAP
@ -56,7 +56,7 @@ CONFIGURE_ARGS= --prefix=${PREFIX} --with-etcdir=${PREFIX}/etc
.if defined(USA_RESIDENT) && ${USA_RESIDENT} == YES
CONFIGURE_ARGS+= --with-rsaref
LIB_DEPENDS+= rsaref.2:${PORTSDIR}/security/rsaref
BUILD_DEPENDS+= ${PORTSDIR}/security/rsaref/work/.extract_done:${PORTSDIR}/security/rsaref
.endif
.if defined(KRB5_HOME) && exists(${KRB5_HOME})

13
security/ssh2/files/patch-ac
View file

@ -1,6 +1,6 @@
--- Makefile.in.orig Wed Jul 8 12:40:39 1998
+++ Makefile.in Sun Sep 13 12:38:43 1998
@@ -294,12 +294,17 @@
--- Makefile.in.orig Wed Jul 8 09:40:39 1998
+++ Makefile.in Wed Oct 7 19:11:37 1998
@@ -294,14 +294,19 @@
SHELL = /bin/sh
GMPDIR = gmp-2.0.2-ssh-2
@ -20,14 +20,17 @@
+ZLIBDEP = $(ZLIBINCDIR)/libz.a
+ZLIBLIBS = -lz
RSAREFDIR = rsaref2
-RSAREFDIR = rsaref2
+RSAREFDIR = ${PORTSDIR}/security/rsaref/work
RSAREFSRCDIR = $(RSAREFDIR)/source
X_CFLAGS = @X_CFLAGS@
@@ -404,7 +409,7 @@
$(CC) -o rfc-pg rfc-pg.o
.c.o:
- $(CC) -c -I. $(KERBEROS_INCS) -I$(srcdir)/$(GMPDIR) -I$(srcdir)/$(ZLIBDIR) $(DEFS) -DHOST_KEY_FILE=\"$(HOST_KEY_FILE)\" -DHOST_CONFIG_FILE=\"$(HOST_CONFIG_FILE)\" -DSERVER_CONFIG_FILE=\"$(SERVER_CONFIG_FILE)\" -DSSH_PROGRAM=\"$(SSH_PROGRAM)\" -DETCDIR=\"$(etcdir)\" -DPIDDIR=\"$(piddir)\" -DSSH_BINDIR=\"$(bindir)\" -DTIS_MAP_FILE=\"$(TIS_MAP_FILE)\" $(CFLAGS) $(X_CFLAGS) $<
+ $(CC) -c -I. $(KERBEROS_INCS) -I$(srcdir)/$(GMPINCDIR) -I$(srcdir)/$(ZLIBINCDIR) $(DEFS) -DHOST_KEY_FILE=\"$(HOST_KEY_FILE)\" -DHOST_CONFIG_FILE=\"$(HOST_CONFIG_FILE)\" -DSERVER_CONFIG_FILE=\"$(SERVER_CONFIG_FILE)\" -DSSH_PROGRAM=\"$(SSH_PROGRAM)\" -DETCDIR=\"$(etcdir)\" -DPIDDIR=\"$(piddir)\" -DSSH_BINDIR=\"$(bindir)\" -DTIS_MAP_FILE=\"$(TIS_MAP_FILE)\" $(CFLAGS) $(X_CFLAGS) $<
+ $(CC) -c -I. $(KERBEROS_INCS) -I../../../rsaref/work -I$(srcdir)/$(GMPINCDIR) -I$(srcdir)/$(ZLIBINCDIR) $(DEFS) -DHOST_KEY_FILE=\"$(HOST_KEY_FILE)\" -DHOST_CONFIG_FILE=\"$(HOST_CONFIG_FILE)\" -DSERVER_CONFIG_FILE=\"$(SERVER_CONFIG_FILE)\" -DSSH_PROGRAM=\"$(SSH_PROGRAM)\" -DETCDIR=\"$(etcdir)\" -DPIDDIR=\"$(piddir)\" -DSSH_BINDIR=\"$(bindir)\" -DTIS_MAP_FILE=\"$(TIS_MAP_FILE)\" $(CFLAGS) $(X_CFLAGS) $<
sshd: $(SSHD_OBJS) $(GMPDEP) $(RSAREFDEP) $(ZLIBDEP)
-rm -f sshd