diff options
| author | Kris Kennaway <kris@FreeBSD.org> | 2000-09-17 08:45:12 +0000 |
|---|---|---|
| committer | Kris Kennaway <kris@FreeBSD.org> | 2000-09-17 08:45:12 +0000 |
| commit | 1d852620cb2c6f89a368987efedb080530487e9c (patch) | |
| tree | e4cf0d7e1c7b2f791ce3878bc3b3af96bfe37571 | |
| parent | Update to realplayer 7.cs1 (Community Supported release 1) (diff) | |
Remove dependency on rsaref, comment out RESTRICTED line (but leave it
there for reference in case we replace these with a CRYPTO variable), and
bump PORTREVISION.
| -rw-r--r-- | security/ssh/Makefile | 22 | ||||
| -rw-r--r-- | security/ssh/files/patch-ac | 13 |
2 files changed, 7 insertions, 28 deletions
diff --git a/security/ssh/Makefile b/security/ssh/Makefile index 891cdf183aa5..7cb228b6fadb 100644 --- a/security/ssh/Makefile +++ b/security/ssh/Makefile @@ -10,6 +10,7 @@ PORTNAME= ssh PORTVERSION= 1.2.27 +PORTREVISION= 1 CATEGORIES= security ipv6 MASTER_SITES= ftp://ftp.cs.hut.fi/pub/ssh/ \ ftp://ftp.bitcon.no/.4/console/system/ \ @@ -20,13 +21,7 @@ MASTER_SITES= ftp://ftp.cs.hut.fi/pub/ssh/ \ MAINTAINER= kris@FreeBSD.org -.if defined(USA_RESIDENT) && ${USA_RESIDENT} == YES -CONFIGURE_ARGS+= --with-rsaref -LIB_DEPENDS+= rsaref.2:${PORTSDIR}/security/rsaref -BUILD_DEPENDS+= /nonexistent:${PORTSDIR}/security/rsaref:extract -.endif - -RESTRICTED= "Crypto: export-controlled" +#RESTRICTED= "Crypto: export-controlled" USE_AUTOCONF= YES GNU_CONFIGURE= YES @@ -86,19 +81,6 @@ pre-patch: @${MV} -f ${WRKSRC}/make-ssh-known-hosts.pl \ ${WRKSRC}/make-ssh-known-hosts.pl.in -fetch-depends: -.if !defined(USA_RESIDENT) || ${USA_RESIDENT} != YES && ${USA_RESIDENT} != NO - @ ${ECHO} - @ ${ECHO} You must set the variable USA_RESIDENT to YES if you are a - @ ${ECHO} United States resident, otherwise NO. - @ ${ECHO} If you are a US resident then this port must also fetch - @ ${ECHO} the RSAREF2 library from sources abroad \(RSA Inc. holds a - @ ${ECHO} patent on RSA and public key crypto in general in the United - @ ${ECHO} States so using RSA implementations other than RSAREF there - @ ${ECHO} may violate US patent law\). - @ ${FALSE} -.endif - post-install: @if [ ! -f ${PREFIX}/etc/ssh_host_key ]; then \ ${ECHO} "Generating a secret host key..."; \ diff --git a/security/ssh/files/patch-ac b/security/ssh/files/patch-ac index 0eb45972aba7..1f4163606c09 100644 --- a/security/ssh/files/patch-ac +++ b/security/ssh/files/patch-ac @@ -1,6 +1,6 @@ ---- Makefile.in.orig Wed May 12 20:19:31 1999 -+++ Makefile.in Sun Jun 6 01:22:50 1999 -@@ -301,14 +301,19 @@ +--- Makefile.in.orig Wed May 12 04:19:31 1999 ++++ Makefile.in Sun Sep 17 01:39:40 2000 +@@ -301,12 +301,17 @@ SHELL = /bin/sh GMPDIR = gmp-2.0.2-ssh-2 @@ -20,17 +20,14 @@ +ZLIBDEP = $(ZLIBINCDIR)/libz.a +ZLIBLIBS = -lz --RSAREFDIR = rsaref2 -+RSAREFDIR = ${PORTSDIR}/security/rsaref/work + RSAREFDIR = rsaref2 RSAREFSRCDIR = $(RSAREFDIR)/source - - X_CFLAGS = @X_CFLAGS@ @@ -411,7 +416,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../../../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) $< ++ $(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) $< sshd: $(SSHD_OBJS) $(GMPDEP) $(RSAREFDEP) $(ZLIBDEP) -rm -f sshd |