diff options
| -rw-r--r-- | security/srp_client/Makefile | 16 | ||||
| -rw-r--r-- | security/srp_client/files/patch-sum | 19 | ||||
| -rw-r--r-- | security/srp_client/patches/patch-ai | 16 |
3 files changed, 38 insertions, 13 deletions
diff --git a/security/srp_client/Makefile b/security/srp_client/Makefile index 93cef3207a6..ab76b5a0a33 100644 --- a/security/srp_client/Makefile +++ b/security/srp_client/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2001/02/17 17:50:08 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2001/03/23 10:31:51 wiz Exp $ # DISTNAME= srp-1.4.4 @@ -18,6 +18,7 @@ CRYPTO= yes GNU_CONFIGURE= yes CPPFLAGS+= -Dunix=1 +#CPPFLAGS+= -Dkrb_get_err_text=k_strerror CPPFLAGS+= -I${LOCALBASE}/include # gmp.h LDFLAGS+= -L${LOCALBASE}/lib # libgmp.a @@ -27,14 +28,21 @@ CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" .if exists(/usr/lib/libkrb.a) CONFIGURE_ARGS+= --with-krb4 +.include "../../mk/bsd.prefs.mk" + +SED_PATTERN= -e "s,include/kerberos,include/kerberosIV," +.if ${MACHINE_PLATFORM:MNetBSD-[01].[0-4]*-i386} == "" +SED_PATTERN+= -e "s,-ldes,-ldes -lroken -lcom_err," +.else +SED_PATTERN+= -e "s,-ldes,-ldes -lcom_err," +.endif + post-patch: for FILE in ftp/ftp/Makefile.in ftp/ftpd/Makefile.in \ telnet/configure telnet/configure.in; \ do \ cd ${WRKSRC} && \ - ${SED} -e "s,include/kerberos,include/kerberosIV," \ - -e "s,-ldes,-ldes -lroken -lcom_err," \ - $$FILE > $$FILE.patched && \ + ${SED} ${SED_PATTERN} $$FILE > $$FILE.patched && \ ${MV} $$FILE.patched $$FILE; \ done .endif diff --git a/security/srp_client/files/patch-sum b/security/srp_client/files/patch-sum index 69af54e5f0b..58c172c6888 100644 --- a/security/srp_client/files/patch-sum +++ b/security/srp_client/files/patch-sum @@ -1,10 +1,11 @@ -$NetBSD: patch-sum,v 1.3 2000/09/24 15:35:06 hubertf Exp $ +$NetBSD: patch-sum,v 1.4 2001/03/23 10:31:51 wiz Exp $ -MD5 (patch-aa) = 580062ab453b62709d94e6719b13d5a7 -MD5 (patch-ab) = ea792e20de0ae32d9f61cc23b475264a -MD5 (patch-ac) = 129d511d0ee27247f8805bc88dbb319c -MD5 (patch-ad) = 264a5557c9b4f9fdd59dd43223640576 -MD5 (patch-ae) = ebf427e1d675bbe7cf63c3f6946bcf2e -MD5 (patch-af) = b1f9ba02d55ec830b9ffc9116c556b2c -MD5 (patch-ag) = f6dd7ac5f273fd549fdeadfcf011e16f -MD5 (patch-ah) = f7416af1a131ad8e0c71d599a8f757a3 +SHA1 (patch-aa) = fefb8a7540c3c7e91b6c407a463a39bef948e0c8 +SHA1 (patch-ab) = cba14830f3dcae42c814d9ccb19cbdb5464eabb0 +SHA1 (patch-ac) = 1d5d56753ad45361351833b951bf7d1f82575955 +SHA1 (patch-ad) = d9869838822ab8d43c10dd1d8242f9ee49f857d7 +SHA1 (patch-ae) = 623c55e3283129a8312a8cdaf69165f29e04e3c6 +SHA1 (patch-af) = 4a5d21b667f39cfba61478614f4497710463aa06 +SHA1 (patch-ag) = 7022211c2dfbe6d23e94f1c40afa64661dfcdd12 +SHA1 (patch-ah) = 914544e6a2ae6c07be03ac8c5c46f9d996e8f3a5 +SHA1 (patch-ai) = ea2f81385d83b36f12ff2a63fc8b9cc9aad68674 diff --git a/security/srp_client/patches/patch-ai b/security/srp_client/patches/patch-ai new file mode 100644 index 00000000000..a8a10485008 --- /dev/null +++ b/security/srp_client/patches/patch-ai @@ -0,0 +1,16 @@ +$NetBSD: patch-ai,v 1.1 2001/03/23 10:31:51 wiz Exp $ + +--- telnet/libtelnet/encrypt.h.orig Thu Dec 10 02:44:43 1998 ++++ telnet/libtelnet/encrypt.h Thu Mar 22 19:31:18 2001 +@@ -60,6 +60,11 @@ + #define DIR_DECRYPT 1 + #define DIR_ENCRYPT 2 + ++/* XXX: work around broken MIT kerberos4 headers on <=1.4.* */ ++#ifdef _ ++#undef _ ++#endif ++ + typedef unsigned char Block[8]; + typedef unsigned char *BlockT; + typedef struct { Block _; } Schedule[16]; |