diff options
| author | Jacques Vidrine <nectar@FreeBSD.org> | 2001-07-19 22:54:09 +0000 |
|---|---|---|
| committer | Jacques Vidrine <nectar@FreeBSD.org> | 2001-07-19 22:54:09 +0000 |
| commit | ae3b77d7538c4d5c5f299faff462908734e7edaa (patch) | |
| tree | 82bcbfe26aa864a7a6d89c1738acbe1a6ed0076e /security/heimdal | |
| parent | = Fix possible telnetd vulnerability in option processing. (diff) | |
Update 0.4b -> 0.4c
Notes
Notes:
svn path=/head/; revision=45258
Diffstat (limited to 'security/heimdal')
| -rw-r--r-- | security/heimdal/Makefile | 8 | ||||
| -rw-r--r-- | security/heimdal/distinfo | 2 | ||||
| -rw-r--r-- | security/heimdal/files/patch-ae | 29 | ||||
| -rw-r--r-- | security/heimdal/files/patch-cp | 24 |
4 files changed, 5 insertions, 58 deletions
diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile index 6c61e7c3e53e..d74fc4aad9bf 100644 --- a/security/heimdal/Makefile +++ b/security/heimdal/Makefile @@ -6,8 +6,7 @@ # PORTNAME= heimdal -PORTVERSION= 0.4b -PORTREVISION= 1 +PORTVERSION= 0.4c CATEGORIES= security ipv6 MASTER_SITES= ftp://ftp.pdc.kth.se/pub/heimdal/src/ \ ftp://ftp.replay.com/pub/replay/crypto/APPS/kerberos/heimdal/ \ @@ -79,8 +78,9 @@ PLIST:= ${WRKDIR}/PLIST pre-configure: @(set -e; \ cd ${CONFIGURE_WRKSRC}; \ - find . -type f -name 'Makefile.in' -print | xargs perl -i -pe \ - 's,\$$\(top_builddir\)/lib/com_err/compile_et,compile_et,';) + find . -type f -name 'Makefile.in' -print | xargs perl -i -p \ + -e 's,\$$\(top_builddir\)/lib/com_err/compile_et,compile_et,;' \ + -e 's,../com_err/libcom_err.la,,;';) pre-install: @${CP} ${PKGDIR}/pkg-plist ${PLIST} diff --git a/security/heimdal/distinfo b/security/heimdal/distinfo index 71a35cb1bf35..6731e80f37e9 100644 --- a/security/heimdal/distinfo +++ b/security/heimdal/distinfo @@ -1 +1 @@ -MD5 (heimdal-0.4b.tar.gz) = 80f038def4d018d8ce974305a5881b61 +MD5 (heimdal-0.4c.tar.gz) = d2af66b8c962c216442d8627cfdbda6e diff --git a/security/heimdal/files/patch-ae b/security/heimdal/files/patch-ae deleted file mode 100644 index f4e1d38369c0..000000000000 --- a/security/heimdal/files/patch-ae +++ /dev/null @@ -1,29 +0,0 @@ ---- appl/telnet/telnetd/global.c 1997/05/11 06:29:59 1.12 -+++ appl/telnet/telnetd/global.c 2001/07/19 16:00:42 1.13 -@@ -36,7 +36,7 @@ - - #include "telnetd.h" - --RCSID("$Id: global.c,v 1.12 1997/05/11 06:29:59 assar Exp $"); -+RCSID("$Id: global.c,v 1.13 2001/07/19 16:00:42 assar Exp $"); - - /* - * Telnet server variable declarations -@@ -93,7 +93,7 @@ - output_data (const char *format, ...) - { - va_list args; -- size_t remaining, ret; -+ int remaining, ret; - - va_start(args, format); - remaining = BUFSIZ - (nfrontp - netobuf); -@@ -101,7 +101,7 @@ - remaining, - format, - args); -- nfrontp += ret; -+ nfrontp += min(ret, remaining-1); - va_end(args); - return ret; - } diff --git a/security/heimdal/files/patch-cp b/security/heimdal/files/patch-cp deleted file mode 100644 index 7c064faa7066..000000000000 --- a/security/heimdal/files/patch-cp +++ /dev/null @@ -1,24 +0,0 @@ ---- lib/asn1/Makefile.in.orig Wed Nov 8 10:31:04 2000 -+++ lib/asn1/Makefile.in Wed Nov 8 10:31:52 2000 -@@ -279,7 +279,6 @@ - - check_der_LDADD = \ - libasn1.la \ -- ../com_err/libcom_err.la \ - $(LIB_roken) - - -@@ -339,11 +338,11 @@ - asn1_compile_LDFLAGS = - asn1_print_SOURCES = asn1_print.c - asn1_print_OBJECTS = asn1_print.$(OBJEXT) --asn1_print_DEPENDENCIES = libasn1.la ../com_err/libcom_err.la -+asn1_print_DEPENDENCIES = libasn1.la - asn1_print_LDFLAGS = - check_der_SOURCES = check-der.c - check_der_OBJECTS = check-der.$(OBJEXT) --check_der_DEPENDENCIES = libasn1.la ../com_err/libcom_err.la -+check_der_DEPENDENCIES = libasn1.la - check_der_LDFLAGS = - COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) |