diff options
author | Dirk Meyer <dinoex@FreeBSD.org> | 2003-03-02 10:35:12 +0000 |
---|---|---|
committer | Dirk Meyer <dinoex@FreeBSD.org> | 2003-03-02 10:35:12 +0000 |
commit | a0ed3d8a1f4dfe94a1423731c228407b70f69617 (patch) | |
tree | ad189863bd53b6dd2793a15080b8d1291d97631f /security/lsh | |
parent | Add LANG to Makefile. (diff) |
- Update to 1.5.1
- removed patches that are now part of distribution
- support for guile/slib
- fixed several new build errors
Notes
Notes:
svn path=/head/; revision=76727
Diffstat (limited to 'security/lsh')
-rw-r--r-- | security/lsh/Makefile | 10 | ||||
-rw-r--r-- | security/lsh/distinfo | 2 | ||||
-rw-r--r-- | security/lsh/files/patch-Makefile.in | 11 | ||||
-rw-r--r-- | security/lsh/files/patch-argp-help.c | 9 | ||||
-rw-r--r-- | security/lsh/files/patch-configure | 11 | ||||
-rw-r--r-- | security/lsh/files/patch-des-compat.c | 32 | ||||
-rw-r--r-- | security/lsh/files/patch-io.c | 14 | ||||
-rw-r--r-- | security/lsh/files/patch-sftp-buffer.c | 11 | ||||
-rw-r--r-- | security/lsh/files/patch-unix_random.c | 13 | ||||
-rw-r--r-- | security/lsh/pkg-plist | 9 |
10 files changed, 51 insertions, 71 deletions
diff --git a/security/lsh/Makefile b/security/lsh/Makefile index cdffd18fbd2a..588020cd830f 100644 --- a/security/lsh/Makefile +++ b/security/lsh/Makefile @@ -5,7 +5,7 @@ # $FreeBSD$ PORTNAME= lsh -PORTVERSION= 1.5 +PORTVERSION= 1.5.1 CATEGORIES= security ipv6 MASTER_SITES= ${MASTER_SITE_GNUPG} \ ftp://ftp.lysator.liu.se/pub/security/%SUBDIR%/ @@ -15,15 +15,13 @@ DISTNAME= ${PORTNAME}-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= A secure (encrypted) remote shell compatible with ssh 2.0 -BUILD_DEPENDS+= ${LOCALBASE}/include/gmp.h:${PORTSDIR}/math/libgmp4 +BUILD_DEPENDS+= ${LOCALBASE}/include/gmp.h:${PORTSDIR}/math/libgmp4 \ + ${LOCALBASE}/share/slib/require.scm:${PORTSDIR}/lang/slib LIB_DEPENDS+= oop:${PORTSDIR}/devel/liboop GNU_CONFIGURE= yes USE_GMAKE= yes INSTALL_TARGET= install -MAN1= lsh_writekey.1 lsh_keygen.1 lsh.1 -MAN5= DSA.5 secsh.5 SHA.5 SPKI.5 -MAN8= lshd.8 CONFIGURE_ARGS+= --with-include-path=${LOCALBASE}/include CONFIGURE_ARGS+= --with-lib-path=${LOCALBASE}/lib LDFLAGS+= ${PTHREAD_LIBS} @@ -46,7 +44,7 @@ post-install: .for BIN in lsh lsh-keygen lsh-writekey sexp-conv srp-gen lsh-decode-key strip ${PREFIX}/bin/${BIN} .endfor -.for SBIN in lshd lsh_proxy +.for SBIN in lshd strip ${PREFIX}/sbin/${SBIN} .endfor .if !defined(NOPORTDOCS) diff --git a/security/lsh/distinfo b/security/lsh/distinfo index ae7817b68fa1..ac4db9577c25 100644 --- a/security/lsh/distinfo +++ b/security/lsh/distinfo @@ -1 +1 @@ -MD5 (lsh-1.5.tar.gz) = 25f63a243a28b1a1e74b2fa233941fae +MD5 (lsh-1.5.1.tar.gz) = a8bb8806d990b0907bb251d8be014a63 diff --git a/security/lsh/files/patch-Makefile.in b/security/lsh/files/patch-Makefile.in deleted file mode 100644 index 51fa9ba88e05..000000000000 --- a/security/lsh/files/patch-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- src/testsuite/Makefile.in.orig Thu Jun 27 20:50:33 2002 -+++ src/testsuite/Makefile.in Wed Dec 18 07:26:20 2002 -@@ -122,7 +122,7 @@ - noinst_PROGRAMS = $(TS_PROGS) - - LDADD = testutils.o ../liblsh.a ../nettle/libnettle.a \ -- $(addprefix ../,@LIBARGP@) -+ ../@LIBARGP@ - - - EXTRA_DIST = testutils.c testutils.h $(TS_SH) $(TS_MORE_SH) \ diff --git a/security/lsh/files/patch-argp-help.c b/security/lsh/files/patch-argp-help.c index 5def26afdc0b..4dded4517c03 100644 --- a/security/lsh/files/patch-argp-help.c +++ b/security/lsh/files/patch-argp-help.c @@ -10,15 +10,6 @@ #include <ctype.h> -@@ -196,7 +198,7 @@ - { "header-col", 0, offsetof (struct uparams, header_col) }, - { "usage-indent", 0, offsetof (struct uparams, usage_indent) }, - { "rmargin", 0, offsetof (struct uparams, rmargin) }, -- { 0 } -+ { 0, 0, 0 } - }; - - /* Read user options from the environment, and fill in UPARAMS appropiately. */ @@ -1114,7 +1116,7 @@ int old_wm = __argp_fmtstream_wmargin (stream); /* PEST is a state block holding some of our variables that we'd like to diff --git a/security/lsh/files/patch-configure b/security/lsh/files/patch-configure deleted file mode 100644 index 18c05027ecf2..000000000000 --- a/security/lsh/files/patch-configure +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.orig Thu Jun 27 20:05:45 2002 -+++ configure Wed Dec 18 07:15:14 2002 -@@ -1980,7 +1980,7 @@ - fi; - - if test x$with_lib_path != x ; then -- LDFLAGS="-L `echo $with_lib_path | sed 's/:/ -L /g'`" -+ LDFLAGS="$LDFLAGS -L `echo $with_lib_path | sed 's/:/ -L /g'`" - fi - - echo "$as_me:$LINENO: checking for -R flag" >&5 diff --git a/security/lsh/files/patch-des-compat.c b/security/lsh/files/patch-des-compat.c deleted file mode 100644 index 04bd0bdd2f9f..000000000000 --- a/security/lsh/files/patch-des-compat.c +++ /dev/null @@ -1,32 +0,0 @@ ---- src/nettle/des-compat.c.orig Tue Sep 25 19:22:10 2001 -+++ src/nettle/des-compat.c Wed Dec 18 05:27:13 2002 -@@ -61,7 +61,14 @@ - des_key_schedule k1, des_key_schedule k2, - des_key_schedule k3, int enc) - { -+#ifndef __FreeBSD__ - struct des_compat_des3 keys = { { k1, k2, k3 } }; -+#else -+ struct des_compat_des3 keys; -+ keys.keys[1] = k1; -+ keys.keys[2] = k1; -+ keys.keys[3] = k3; -+#endif - - ((enc == DES_ENCRYPT) ? des_compat_des3_encrypt : des_compat_des3_decrypt) - (&keys, DES_BLOCK_SIZE, *dst, *src); -@@ -142,7 +149,14 @@ - des_cblock *iv, - int enc) - { -+#ifndef __FreeBSD__ - struct des_compat_des3 keys = { { k1, k2, k3 } }; -+#else -+ struct des_compat_des3 keys; -+ keys.keys[1] = k1; -+ keys.keys[2] = k1; -+ keys.keys[3] = k3; -+#endif - - switch (enc) - { diff --git a/security/lsh/files/patch-io.c b/security/lsh/files/patch-io.c new file mode 100644 index 000000000000..a75b70a39fec --- /dev/null +++ b/security/lsh/files/patch-io.c @@ -0,0 +1,14 @@ +--- src/io.c.orig Sun Feb 16 20:46:23 2003 ++++ src/io.c Sun Mar 2 10:11:18 2003 +@@ -34,7 +34,11 @@ + #endif + + /* For the popen code */ ++#ifdef __FreeBSD__ ++#include <sys/wait.h> ++#else + #include <wait.h> ++#endif + + #ifdef HAVE_POLL + # if HAVE_POLL_H diff --git a/security/lsh/files/patch-sftp-buffer.c b/security/lsh/files/patch-sftp-buffer.c new file mode 100644 index 000000000000..fd148bdeeedd --- /dev/null +++ b/security/lsh/files/patch-sftp-buffer.c @@ -0,0 +1,11 @@ +--- src/sftp/buffer.c.orig Sun Feb 23 19:34:44 2003 ++++ src/sftp/buffer.c Sun Mar 2 09:52:24 2003 +@@ -227,7 +227,7 @@ + { + uint8_t buf[8]; + +- WRITE_uint64_t(buf, value); ++ WRITE_UINT64(buf, value); + PUT_DATA(o, buf); + } + diff --git a/security/lsh/files/patch-unix_random.c b/security/lsh/files/patch-unix_random.c new file mode 100644 index 000000000000..e4600c0412ad --- /dev/null +++ b/security/lsh/files/patch-unix_random.c @@ -0,0 +1,13 @@ +--- src/unix_random.c.orig Sun Feb 16 21:27:45 2003 ++++ src/unix_random.c Sun Mar 2 10:18:35 2003 +@@ -36,9 +36,9 @@ + #endif + + #include <sys/types.h> ++#include <sys/time.h> + #include <sys/resource.h> + #include <sys/stat.h> +-#include <sys/time.h> + + #include "randomness.h" + diff --git a/security/lsh/pkg-plist b/security/lsh/pkg-plist index 8f51c4171d87..65ef315ae835 100644 --- a/security/lsh/pkg-plist +++ b/security/lsh/pkg-plist @@ -5,6 +5,7 @@ bin/lsh-decode-key bin/lsh-export-key bin/lsh-keygen bin/lsh-make-seed +bin/lsh-upgrade bin/lsh-writekey bin/lshg bin/sexp-conv @@ -12,19 +13,26 @@ bin/srp-gen bin/ssh-conv include/nettle/aes.h include/nettle/arcfour.h +include/nettle/base16.h include/nettle/base64.h include/nettle/blowfish.h +include/nettle/buffer.h include/nettle/cast128.h include/nettle/cbc.h include/nettle/des-compat.h include/nettle/des.h +include/nettle/dsa.h include/nettle/hmac.h include/nettle/knuth-lfib.h +include/nettle/macros.h include/nettle/md5-compat.h include/nettle/md5.h include/nettle/nettle-meta.h +include/nettle/pgp.h +include/nettle/realloc.h include/nettle/rsa.h include/nettle/serpent.h +include/nettle/sexp.h include/nettle/sha.h include/nettle/twofish.h include/nettle/yarrow.h @@ -41,6 +49,5 @@ lib/libnettle.a sbin/lsh-execuv %%KRB%%sbin/lsh-krb-checkpw sbin/lsh-pam-checkpw -sbin/lsh_proxy sbin/lshd sbin/sftp-server |