diff options
author | cjep <cjep> | 2002-12-07 21:34:04 +0000 |
---|---|---|
committer | cjep <cjep> | 2002-12-07 21:34:04 +0000 |
commit | 300f4538bb966e5048e35e5b972ceb0a990f36a9 (patch) | |
tree | 4aedcb897b9e4d61a36b7b4d33a65ae883fed049 | |
parent | bf616ab398732dca5337e45ad682f0750184da26 (diff) | |
download | pkgsrc-300f4538bb966e5048e35e5b972ceb0a990f36a9.tar.gz |
Make this package happier on Solaris. Thanks to Pierre Bourgin.
Fixs PR#18953
-rw-r--r-- | net/bind8/Makefile | 14 | ||||
-rw-r--r-- | net/bind8/distinfo | 19 | ||||
-rw-r--r-- | net/bind8/patches/patch-aa | 10 | ||||
-rw-r--r-- | net/bind8/patches/patch-ab | 196 | ||||
-rw-r--r-- | net/bind8/patches/patch-ac | 35 | ||||
-rw-r--r-- | net/bind8/patches/patch-ad | 33 | ||||
-rw-r--r-- | net/bind8/patches/patch-ae | 34 | ||||
-rw-r--r-- | net/bind8/patches/patch-af | 35 | ||||
-rw-r--r-- | net/bind8/patches/patch-ag | 196 | ||||
-rw-r--r-- | net/bind8/patches/patch-ah | 26 | ||||
-rw-r--r-- | net/bind8/patches/patch-ai | 26 | ||||
-rw-r--r-- | net/bind8/patches/patch-aj | 26 |
12 files changed, 370 insertions, 280 deletions
diff --git a/net/bind8/Makefile b/net/bind8/Makefile index b5c8bb3f603..b93cf224ef8 100644 --- a/net/bind8/Makefile +++ b/net/bind8/Makefile @@ -1,5 +1,5 @@ # -# $NetBSD: Makefile,v 1.16 2002/11/17 16:08:08 itojun Exp $ +# $NetBSD: Makefile,v 1.17 2002/12/07 21:35:10 cjep Exp $ # # FreeBSD Id: Makefile,v 1.12 1999/06/28 21:25:07 billf Exp # @@ -27,14 +27,22 @@ EXTRACT_ONLY= ${DISTNAME}-src.tar.gz ${DISTNAME}-doc.tar.gz PLIST_SRC= ${PKGDIR}/PLIST-Linux .endif +.if ${OPSYS} == "SunOS" +MAKEFLAGS+= MANROFF=cat +MAKEFLAGS+= INSTALL=${INSTALL} +PLIST_SRC= ${PKGDIR}/PLIST-SunOS +.endif + +MAKEFLAGS+= PREFIX=${PREFIX} + post-build: - @(cd ${WRKDIR}/doc/man && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} clean all) + @(cd ${WRKDIR}/doc/man && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKEFLAGS} ${MAKEFILE} clean all) pre-install: ${SED} ${FILES_SUBST_SED} ${FILESDIR}/named.sh > ${WRKDIR}/named.sh post-install: - @(cd ${WRKDIR}/doc/man && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET}) + @(cd ${WRKDIR}/doc/man && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKEFLAGS} ${MAKEFILE} ${INSTALL_TARGET}) ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/bind8 (cd ${WRKDIR}/doc/html/; tar Bpcf - .) | (cd ${PREFIX}/share/doc/bind8; tar Bpxf -) ${INSTALL_SCRIPT} ${WRKDIR}/named.sh ${PREFIX}/etc/rc.d/named diff --git a/net/bind8/distinfo b/net/bind8/distinfo index f701c81d42a..626fc7d4a2b 100644 --- a/net/bind8/distinfo +++ b/net/bind8/distinfo @@ -1,13 +1,16 @@ -$NetBSD: distinfo,v 1.12 2002/11/17 16:08:09 itojun Exp $ +$NetBSD: distinfo,v 1.13 2002/12/07 21:35:11 cjep Exp $ SHA1 (bind/8.3.4/bind-src.tar.gz) = 18f8a6af0ede72981f5a1e45462978450f4d9b74 Size (bind/8.3.4/bind-src.tar.gz) = 1413654 bytes SHA1 (bind/8.3.4/bind-doc.tar.gz) = 31939d57faa01f761e25247cd7e1732308c3674a Size (bind/8.3.4/bind-doc.tar.gz) = 1490246 bytes -SHA1 (patch-aa) = 6897694a7fa77bfb7c5da2d29a7537c948c669cb -SHA1 (patch-ab) = 0d0e2e1a8cb58fc6c11b60fcc69fe496251f7659 -SHA1 (patch-ac) = fdf75b6b53fe4b9ab6ca74b90400edda54a825b1 -SHA1 (patch-ad) = 6ac74cfd60df2a9eb9b3dc7c74dab1dc68feadad -SHA1 (patch-ae) = 06268d28805c287721954de0676abf9327f64e13 -SHA1 (patch-af) = 9dacac60b3ad0101330144d29a3f0ee4108fe781 -SHA1 (patch-ag) = 9bf580c08118b44b4f82810ea65cb82b55bb506c +SHA1 (patch-aa) = f97a4c13a1ed957dab3012e6015f8070330f474d +SHA1 (patch-ab) = 9bf580c08118b44b4f82810ea65cb82b55bb506c +SHA1 (patch-ac) = 27fa07a5af995d296915825e0d2ef60498e58b0f +SHA1 (patch-ad) = 029b0f8b535eb2dbc8dc054135b0802996e8dd67 +SHA1 (patch-ae) = ed3b80dc19ff78e1caa8f9ac076e3370a10bfdd6 +SHA1 (patch-af) = 6b30cd30e8766b468ae1cc6027e83591d9d778a6 +SHA1 (patch-ag) = d2bd5d53c086261faf48671abf29d3a3a5e5c21c +SHA1 (patch-ah) = b6bf7776cddd44eccbf4fd17de9dcd9b14197402 +SHA1 (patch-ai) = 0ced4c8938b1b491e345f2d8fec2170204bdd585 +SHA1 (patch-aj) = 94d1e884e32d7b52b50354d27af78dd6c5ff7669 diff --git a/net/bind8/patches/patch-aa b/net/bind8/patches/patch-aa index aa1055e1ca5..4b6b0d7e59f 100644 --- a/net/bind8/patches/patch-aa +++ b/net/bind8/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.3 2001/12/24 14:10:55 abs Exp $ +$NetBSD: patch-aa,v 1.4 2002/12/07 21:34:04 cjep Exp $ --- ../doc/man/Makefile.orig Mon Nov 29 19:22:07 1999 +++ ../doc/man/Makefile @@ -17,7 +17,7 @@ $NetBSD: patch-aa,v 1.3 2001/12/24 14:10:55 abs Exp $ # # Install manuals in ${MANDIR}N. For systems that generate catable manual -@@ -228,14 +228,12 @@ +@@ -228,14 +228,12 @@ SYS_OPS_OUT_EXT = ${OUT_EXT}${SYS_OPS_EX # # User command manual entries # @@ -33,7 +33,7 @@ $NetBSD: patch-aa,v 1.3 2001/12/24 14:10:55 abs Exp $ dnsquery.${CMD_OUT_EXT} \ dnskeygen.${CMD_OUT_EXT} -@@ -303,7 +301,8 @@ +@@ -303,7 +301,8 @@ LIB_NETWORK_OUT = gethostbyname.${LIB_NE # # File format manual entries # @@ -43,7 +43,7 @@ $NetBSD: patch-aa,v 1.3 2001/12/24 14:10:55 abs Exp $ FORMAT_SRC_EXT = 5 FORMAT_SRC = resolver.${FORMAT_SRC_EXT} \ irs.conf.${FORMAT_SRC_EXT} \ -@@ -393,6 +392,10 @@ +@@ -393,6 +392,10 @@ install: ${OUTFILES} \ $${f}.${LIB_NETWORK_OUT_EXT} \ ${DESTDIR}${DESTMAN}/${MANDIR}${LIB_NETWORK_EXT_DIR}/$${f}.${CATEXT}; \ done @@ -54,7 +54,7 @@ $NetBSD: patch-aa,v 1.3 2001/12/24 14:10:55 abs Exp $ @set -x; N=${FORMAT_EXT}; for f in ${FORMAT_BASE}; do \ ${INSTALL} -c -m 444 ${MAN_OWNER} ${MAN_GROUP} \ $${f}.${FORMAT_OUT_EXT} \ -@@ -409,7 +412,7 @@ +@@ -409,7 +412,7 @@ ${DESTDIR}${DESTMAN}/${MANDIR}${SYS_OPS_ ${DESTDIR}${DESTMAN}/${MANDIR}${LIB_NETWORK_EXT_DIR} \ ${DESTDIR}${DESTMAN}/${MANDIR}${FORMAT_EXT_DIR} \ ${DESTDIR}${DESTMAN}/${MANDIR}${DESC_EXT_DIR}: diff --git a/net/bind8/patches/patch-ab b/net/bind8/patches/patch-ab index 64643d5680d..54c5a878e06 100644 --- a/net/bind8/patches/patch-ab +++ b/net/bind8/patches/patch-ab @@ -1,24 +1,174 @@ -$NetBSD: patch-ab,v 1.4 2001/12/24 14:10:55 abs Exp $ +$NetBSD: patch-ab,v 1.5 2002/12/07 21:34:04 cjep Exp $ ---- port/linux/Makefile.set.orig Fri Jun 11 07:01:35 1999 -+++ port/linux/Makefile.set -@@ -1,11 +1,13 @@ - 'CC=gcc -D_GNU_SOURCE' - 'CDEBUG=-O -g' --'DESTBIN=/usr/bin' --'DESTSBIN=/usr/sbin' --'DESTEXEC=/usr/sbin' --'DESTMAN=/usr/man' --'DESTHELP=/usr/lib' --'DESTETC=/etc' -+'DESTBIN=${PREFIX}/bin' -+'DESTLIB=${PREFIX}/lib' -+'DESTINC=${PREFIX}/include/bind' -+'DESTSBIN=${PREFIX}/sbin' -+'DESTEXEC=${PREFIX}/libexec' -+'DESTMAN=${PREFIX}/share/man' -+'DESTHELP=${PREFIX}/share/doc/bind8' -+'DESTETC=${PREFIX}/etc' - 'DESTRUN=/var/run' - 'LEX=flex -8 -I' - 'YACC=yacc -d' +--- lib/cylink/sha.c.orig Tue May 29 05:47:21 2001 ++++ lib/cylink/sha.c +@@ -150,6 +150,129 @@ int SHA( uchar *message, + * PRIVATE FUNCTIONS DEFINITIONS + ****************************************************************************/ + ++#ifdef __sparc_v9__ ++#define nR1(v,w,x,y,z,i) subRound(*v, *w, *x, *y, *z, f1, k1SHA, i) ++#define nR2(v,w,x,y,z,i) subRound(*v, *w, *x, *y, *z, f2, k2SHA, i) ++#define nR3(v,w,x,y,z,i) subRound(*v, *w, *x, *y, *z, f3, k3SHA, i) ++#define nR4(v,w,x,y,z,i) subRound(*v, *w, *x, *y, *z, f4, k4SHA, i) ++ ++void doexpand1(u_int32_t *W) ++{ ++ expand(16); expand(17); expand(18); expand(19); expand(20); expand(21); ++ expand(22); expand(23); expand(24); expand(25); expand(26); expand(27); ++ expand(28); expand(29); expand(30); expand(31); expand(32); expand(33); ++ expand(34); expand(35); expand(36); expand(37); expand(38); expand(39); ++ expand(40); expand(41); expand(42); expand(43); expand(44); expand(45); ++ expand(46); expand(47); expand(48); ++} ++ ++void doexpand2(u_int32_t *W) ++{ ++ expand(49); expand(50); expand(51); expand(52); expand(53); expand(54); ++ expand(55); expand(56); expand(57); expand(58); expand(59); expand(60); ++ expand(61); expand(62); expand(63); expand(64); expand(65); expand(66); ++ expand(67); expand(68); expand(69); expand(70); expand(71); expand(72); ++ expand(73); expand(74); expand(75); expand(76); expand(77); expand(78); ++ expand(79); ++} ++ ++void do_R1(u_int32_t *A, u_int32_t *B, u_int32_t *C, u_int32_t *D, u_int32_t *E, u_int32_t *W) ++{ ++ nR1( A, B, C, D, E, W[ 0] ); ++ nR1( E, A, B, C, D, W[ 1] ); ++ nR1( D, E, A, B, C, W[ 2] ); ++ nR1( C, D, E, A, B, W[ 3] ); ++ nR1( B, C, D, E, A, W[ 4] ); ++ nR1( A, B, C, D, E, W[ 5] ); ++ nR1( E, A, B, C, D, W[ 6] ); ++ nR1( D, E, A, B, C, W[ 7] ); ++ nR1( C, D, E, A, B, W[ 8] ); ++ nR1( B, C, D, E, A, W[ 9] ); ++ nR1( A, B, C, D, E, W[10] ); ++ nR1( E, A, B, C, D, W[11] ); ++ nR1( D, E, A, B, C, W[12] ); ++ nR1( C, D, E, A, B, W[13] ); ++ nR1( B, C, D, E, A, W[14] ); ++ nR1( A, B, C, D, E, W[15] ); ++ nR1( E, A, B, C, D, W[16] ); ++ nR1( D, E, A, B, C, W[17] ); ++ nR1( C, D, E, A, B, W[18] ); ++ nR1( B, C, D, E, A, W[19] ); ++} ++ ++void do_R2(u_int32_t *A, u_int32_t *B, u_int32_t *C, u_int32_t *D, u_int32_t *E, u_int32_t *W) ++{ ++ nR2( A, B, C, D, E, W[20]); ++ nR2( E, A, B, C, D, W[21]); ++ nR2( D, E, A, B, C, W[22]); ++ nR2( C, D, E, A, B, W[23]); ++ nR2( B, C, D, E, A, W[24]); ++ nR2( A, B, C, D, E, W[25]); ++ nR2( E, A, B, C, D, W[26]); ++ nR2( D, E, A, B, C, W[27]); ++ nR2( C, D, E, A, B, W[28]); ++ nR2( B, C, D, E, A, W[29]); ++ nR2( A, B, C, D, E, W[30]); ++ nR2( E, A, B, C, D, W[31]); ++ nR2( D, E, A, B, C, W[32]); ++ nR2( C, D, E, A, B, W[33]); ++ nR2( B, C, D, E, A, W[34]); ++ nR2( A, B, C, D, E, W[35]); ++ nR2( E, A, B, C, D, W[36]); ++ nR2( D, E, A, B, C, W[37]); ++ nR2( C, D, E, A, B, W[38]); ++ nR2( B, C, D, E, A, W[39]); ++} ++ ++void do_R3(u_int32_t *A, u_int32_t *B, u_int32_t *C, u_int32_t *D, u_int32_t *E, u_int32_t *W) ++{ ++ nR3( A, B, C, D, E, W[40]); ++ nR3( E, A, B, C, D, W[41]); ++ nR3( D, E, A, B, C, W[42]); ++ nR3( C, D, E, A, B, W[43]); ++ nR3( B, C, D, E, A, W[44]); ++ nR3( A, B, C, D, E, W[45]); ++ nR3( E, A, B, C, D, W[46]); ++ nR3( D, E, A, B, C, W[47]); ++ nR3( C, D, E, A, B, W[48]); ++ nR3( B, C, D, E, A, W[49]); ++ nR3( A, B, C, D, E, W[50]); ++ nR3( E, A, B, C, D, W[51]); ++ nR3( D, E, A, B, C, W[52]); ++ nR3( C, D, E, A, B, W[53]); ++ nR3( B, C, D, E, A, W[54]); ++ nR3( A, B, C, D, E, W[55]); ++ nR3( E, A, B, C, D, W[56]); ++ nR3( D, E, A, B, C, W[57]); ++ nR3( C, D, E, A, B, W[58]); ++ nR3( B, C, D, E, A, W[59]); ++} ++ ++void do_R4(u_int32_t *A, u_int32_t *B, u_int32_t *C, u_int32_t *D, u_int32_t *E, u_int32_t *W) ++{ ++ nR4( A, B, C, D, E, W[60]); ++ nR4( E, A, B, C, D, W[61]); ++ nR4( D, E, A, B, C, W[62]); ++ nR4( C, D, E, A, B, W[63]); ++ nR4( B, C, D, E, A, W[64]); ++ nR4( A, B, C, D, E, W[65]); ++ nR4( E, A, B, C, D, W[66]); ++ nR4( D, E, A, B, C, W[67]); ++ nR4( C, D, E, A, B, W[68]); ++ nR4( B, C, D, E, A, W[69]); ++ nR4( A, B, C, D, E, W[70]); ++ nR4( E, A, B, C, D, W[71]); ++ nR4( D, E, A, B, C, W[72]); ++ nR4( C, D, E, A, B, W[73]); ++ nR4( B, C, D, E, A, W[74]); ++ nR4( A, B, C, D, E, W[75]); ++ nR4( E, A, B, C, D, W[76]); ++ nR4( D, E, A, B, C, W[77]); ++ nR4( C, D, E, A, B, W[78]); ++ nR4( B, C, D, E, A, W[79]); ++} ++#endif ++ + + /**************************************************************************** + * NAME: void shaTransform( u_int32_t *state, +@@ -182,6 +305,10 @@ int SHA( uchar *message, + ByteSwap32( (uchar *)W, 64); /*TKL00201*/ + #endif /*TKL00201*/ + /* Expand the 16 words into 80 words */ ++#ifdef __sparc_v9__ ++ doexpand1(W); ++ doexpand2(W); ++#else + expand(16);expand(17);expand(18);expand(19);expand(20);expand(21); + expand(22);expand(23);expand(24);expand(25);expand(26);expand(27); + expand(28);expand(29);expand(30);expand(31);expand(32);expand(33); +@@ -193,6 +320,7 @@ int SHA( uchar *message, + expand(64);expand(65);expand(66);expand(67);expand(68);expand(69); + expand(70);expand(71);expand(72);expand(73);expand(74);expand(75); + expand(76);expand(77);expand(78);expand(79); ++#endif + /*Set up first buffer*/ + A = state[0]; + B = state[1]; +@@ -201,6 +329,12 @@ int SHA( uchar *message, + E = state[4]; + + /* Heavy mangling, in 4 sub-rounds of 20 iterations each. */ ++#ifdef __sparc_v9__ ++ do_R1(&A, &B, &C, &D, &E, W); ++ do_R2(&A, &B, &C, &D, &E, W); ++ do_R3(&A, &B, &C, &D, &E, W); ++ do_R4(&A, &B, &C, &D, &E, W); ++#else + subRound( A, B, C, D, E, f1, k1SHA, W[ 0] ); + subRound( E, A, B, C, D, f1, k1SHA, W[ 1] ); + subRound( D, E, A, B, C, f1, k1SHA, W[ 2] ); +@@ -284,6 +418,7 @@ int SHA( uchar *message, + subRound( D, E, A, B, C, f4, k4SHA, W[77]); + subRound( C, D, E, A, B, f4, k4SHA, W[78]); + subRound( B, C, D, E, A, f4, k4SHA, W[79]); ++#endif + + state[0] += A; + state[1] += B; diff --git a/net/bind8/patches/patch-ac b/net/bind8/patches/patch-ac index e1a152b4ae8..2abbfb18dba 100644 --- a/net/bind8/patches/patch-ac +++ b/net/bind8/patches/patch-ac @@ -1,24 +1,13 @@ -$NetBSD: patch-ac,v 1.5 2002/03/23 05:43:48 itojun Exp $ +$NetBSD: patch-ac,v 1.6 2002/12/07 21:34:04 cjep Exp $ ---- port/netbsd/Makefile.set.orig Thu Mar 19 19:50:33 1998 -+++ port/netbsd/Makefile.set -@@ -1,11 +1,13 @@ - 'CC=cc' - 'CDEBUG=-O2 -g' --'DESTBIN=/usr/bin' --'DESTSBIN=/usr/sbin' --'DESTEXEC=/usr/libexec' --'DESTMAN=/usr/share/man' --'DESTHELP=/usr/share/misc' --'DESTETC=/etc' -+'DESTBIN=${PREFIX}/bin' -+'DESTLIB=${PREFIX}/lib' -+'DESTINC=${PREFIX}/include/bind' -+'DESTSBIN=${PREFIX}/sbin' -+'DESTEXEC=${PREFIX}/libexec' -+'DESTMAN=${PREFIX}/man' -+'DESTHELP=${PREFIX}/share/doc/bind8' -+'DESTETC=${PREFIX}/etc' - 'DESTRUN=/var/run' - 'LEX=lex -I' - 'YACC=yacc -d' +--- lib/irs/getaddrinfo.c.orig Wed Feb 27 03:57:17 2002 ++++ lib/irs/getaddrinfo.c +@@ -595,7 +595,7 @@ explore_fqdn(pai, hostname, servname, re + char tmp[NS_MAXDNAME]; + const char *cp; + +- result = NULL; ++ *res = NULL; + + /* + * if the servname does not match socktype/protocol, ignore it. diff --git a/net/bind8/patches/patch-ad b/net/bind8/patches/patch-ad index 6a9e008beb3..563557353bb 100644 --- a/net/bind8/patches/patch-ad +++ b/net/bind8/patches/patch-ad @@ -1,11 +1,24 @@ -$NetBSD: patch-ad,v 1.1 2002/03/23 05:59:06 itojun Exp $ +$NetBSD: patch-ad,v 1.2 2002/12/07 21:34:05 cjep Exp $ ---- port/darwin/include/port_before.h- Fri Mar 22 21:38:26 2002 -+++ port/darwin/include/port_before.h Fri Mar 22 21:38:55 2002 -@@ -13,3 +13,6 @@ - #else - #define ISC_FORMAT_PRINTF(fmt, args) - #endif -+ -+#define HAS_INET6_STRUCTS -+#define NEED_IN6ADDR_ANY +--- port/darwin/Makefile.set.orig Mon Jun 24 00:32:44 2002 ++++ port/darwin/Makefile.set +@@ -1,11 +1,13 @@ + 'CC=cc' + 'CDEBUG=-O2 -g' +-'DESTBIN=/usr/local/bin' +-'DESTSBIN=/usr/local/sbin' +-'DESTEXEC=/usr/local/libexec' +-'DESTMAN=/usr/local/share/man' +-'DESTHELP=/usr/local/share/misc' +-'DESTETC=/etc' ++'DESTBIN=${PREFIX}/bin' ++'DESTLIB=${PREFIX}/lib' ++'DESTINC=${PREFIX}/include/bind' ++'DESTSBIN=${PREFIX}/sbin' ++'DESTEXEC=${PREFIX}/libexec' ++'DESTMAN=${PREFIX}/man' ++'DESTHELP=${PREFIX}/share/doc/bind8' ++'DESTETC=${PREFIX}/etc' + 'DESTRUN=/var/run' + 'LEX=lex -I' + 'YACC=yacc -d' diff --git a/net/bind8/patches/patch-ae b/net/bind8/patches/patch-ae index 114d2d4da67..649603e1257 100644 --- a/net/bind8/patches/patch-ae +++ b/net/bind8/patches/patch-ae @@ -1,23 +1,11 @@ -$NetBSD: patch-ae,v 1.1 2002/03/23 05:59:07 itojun Exp $ ---- port/darwin/Makefile.set- Fri Mar 22 21:39:46 2002 -+++ port/darwin/Makefile.set Fri Mar 22 21:42:22 2002 -@@ -1,11 +1,13 @@ - 'CC=cc' - 'CDEBUG=-O2 -g' --'DESTBIN=/usr/local/bin' --'DESTSBIN=/usr/local/sbin' --'DESTEXEC=/usr/local/libexec' --'DESTMAN=/usr/local/share/man' --'DESTHELP=/usr/local/share/misc' --'DESTETC=/etc' -+'DESTBIN=${PREFIX}/bin' -+'DESTLIB=${PREFIX}/lib' -+'DESTINC=${PREFIX}/include/bind' -+'DESTSBIN=${PREFIX}/sbin' -+'DESTEXEC=${PREFIX}/libexec' -+'DESTMAN=${PREFIX}/man' -+'DESTHELP=${PREFIX}/share/doc/bind8' -+'DESTETC=${PREFIX}/etc' - 'DESTRUN=/var/run' - 'LEX=lex -I' - 'YACC=yacc -d' +$NetBSD: patch-ae,v 1.2 2002/12/07 21:34:05 cjep Exp $ + +--- port/darwin/include/port_before.h.orig Thu Nov 1 07:29:20 2001 ++++ port/darwin/include/port_before.h +@@ -13,3 +13,6 @@ + #else + #define ISC_FORMAT_PRINTF(fmt, args) + #endif ++ ++#define HAS_INET6_STRUCTS ++#define NEED_IN6ADDR_ANY diff --git a/net/bind8/patches/patch-af b/net/bind8/patches/patch-af index a06e0eec6d1..5936c687c61 100644 --- a/net/bind8/patches/patch-af +++ b/net/bind8/patches/patch-af @@ -1,13 +1,24 @@ -$NetBSD: patch-af,v 1.1 2002/05/08 16:20:57 taca Exp $ +$NetBSD: patch-af,v 1.2 2002/12/07 21:34:05 cjep Exp $ ---- lib/irs/getaddrinfo.c.orig Fri Nov 30 09:36:54 2001 -+++ lib/irs/getaddrinfo.c -@@ -602,7 +602,7 @@ - char tmp[NS_MAXDNAME]; - const char *cp; - -- result = NULL; -+ *res = NULL; - - /* - * if the servname does not match socktype/protocol, ignore it. +--- port/linux/Makefile.set.orig Mon Jun 24 00:32:57 2002 ++++ port/linux/Makefile.set +@@ -1,11 +1,13 @@ + 'CC=gcc -D_GNU_SOURCE' + 'CDEBUG=-O -g' +-'DESTBIN=/usr/bin' +-'DESTSBIN=/usr/sbin' +-'DESTEXEC=/usr/sbin' +-'DESTMAN=/usr/man' +-'DESTHELP=/usr/lib' +-'DESTETC=/etc' ++'DESTBIN=${PREFIX}/bin' ++'DESTLIB=${PREFIX}/lib' ++'DESTINC=${PREFIX}/include/bind' ++'DESTSBIN=${PREFIX}/sbin' ++'DESTEXEC=${PREFIX}/libexec' ++'DESTMAN=${PREFIX}/share/man' ++'DESTHELP=${PREFIX}/share/doc/bind8' ++'DESTETC=${PREFIX}/etc' + 'DESTRUN=/var/run' + 'LEX=flex -8 -I' + 'YACC=yacc -d' diff --git a/net/bind8/patches/patch-ag b/net/bind8/patches/patch-ag index 25b6dbbd533..8750473528a 100644 --- a/net/bind8/patches/patch-ag +++ b/net/bind8/patches/patch-ag @@ -1,174 +1,24 @@ -$NetBSD: patch-ag,v 1.1 2002/08/19 18:26:20 seb Exp $ +$NetBSD: patch-ag,v 1.2 2002/12/07 21:34:05 cjep Exp $ ---- lib/cylink/sha.c.orig Tue May 29 05:47:21 2001 -+++ lib/cylink/sha.c -@@ -150,6 +150,129 @@ int SHA( uchar *message, - * PRIVATE FUNCTIONS DEFINITIONS - ****************************************************************************/ - -+#ifdef __sparc_v9__ -+#define nR1(v,w,x,y,z,i) subRound(*v, *w, *x, *y, *z, f1, k1SHA, i) -+#define nR2(v,w,x,y,z,i) subRound(*v, *w, *x, *y, *z, f2, k2SHA, i) -+#define nR3(v,w,x,y,z,i) subRound(*v, *w, *x, *y, *z, f3, k3SHA, i) -+#define nR4(v,w,x,y,z,i) subRound(*v, *w, *x, *y, *z, f4, k4SHA, i) -+ -+void doexpand1(u_int32_t *W) -+{ -+ expand(16); expand(17); expand(18); expand(19); expand(20); expand(21); -+ expand(22); expand(23); expand(24); expand(25); expand(26); expand(27); -+ expand(28); expand(29); expand(30); expand(31); expand(32); expand(33); -+ expand(34); expand(35); expand(36); expand(37); expand(38); expand(39); -+ expand(40); expand(41); expand(42); expand(43); expand(44); expand(45); -+ expand(46); expand(47); expand(48); -+} -+ -+void doexpand2(u_int32_t *W) -+{ -+ expand(49); expand(50); expand(51); expand(52); expand(53); expand(54); -+ expand(55); expand(56); expand(57); expand(58); expand(59); expand(60); -+ expand(61); expand(62); expand(63); expand(64); expand(65); expand(66); -+ expand(67); expand(68); expand(69); expand(70); expand(71); expand(72); -+ expand(73); expand(74); expand(75); expand(76); expand(77); expand(78); -+ expand(79); -+} -+ -+void do_R1(u_int32_t *A, u_int32_t *B, u_int32_t *C, u_int32_t *D, u_int32_t *E, u_int32_t *W) -+{ -+ nR1( A, B, C, D, E, W[ 0] ); -+ nR1( E, A, B, C, D, W[ 1] ); -+ nR1( D, E, A, B, C, W[ 2] ); -+ nR1( C, D, E, A, B, W[ 3] ); -+ nR1( B, C, D, E, A, W[ 4] ); -+ nR1( A, B, C, D, E, W[ 5] ); -+ nR1( E, A, B, C, D, W[ 6] ); -+ nR1( D, E, A, B, C, W[ 7] ); -+ nR1( C, D, E, A, B, W[ 8] ); -+ nR1( B, C, D, E, A, W[ 9] ); -+ nR1( A, B, C, D, E, W[10] ); -+ nR1( E, A, B, C, D, W[11] ); -+ nR1( D, E, A, B, C, W[12] ); -+ nR1( C, D, E, A, B, W[13] ); -+ nR1( B, C, D, E, A, W[14] ); -+ nR1( A, B, C, D, E, W[15] ); -+ nR1( E, A, B, C, D, W[16] ); -+ nR1( D, E, A, B, C, W[17] ); -+ nR1( C, D, E, A, B, W[18] ); -+ nR1( B, C, D, E, A, W[19] ); -+} -+ -+void do_R2(u_int32_t *A, u_int32_t *B, u_int32_t *C, u_int32_t *D, u_int32_t *E, u_int32_t *W) -+{ -+ nR2( A, B, C, D, E, W[20]); -+ nR2( E, A, B, C, D, W[21]); -+ nR2( D, E, A, B, C, W[22]); -+ nR2( C, D, E, A, B, W[23]); -+ nR2( B, C, D, E, A, W[24]); -+ nR2( A, B, C, D, E, W[25]); -+ nR2( E, A, B, C, D, W[26]); -+ nR2( D, E, A, B, C, W[27]); -+ nR2( C, D, E, A, B, W[28]); -+ nR2( B, C, D, E, A, W[29]); -+ nR2( A, B, C, D, E, W[30]); -+ nR2( E, A, B, C, D, W[31]); -+ nR2( D, E, A, B, C, W[32]); -+ nR2( C, D, E, A, B, W[33]); -+ nR2( B, C, D, E, A, W[34]); -+ nR2( A, B, C, D, E, W[35]); -+ nR2( E, A, B, C, D, W[36]); -+ nR2( D, E, A, B, C, W[37]); -+ nR2( C, D, E, A, B, W[38]); -+ nR2( B, C, D, E, A, W[39]); -+} -+ -+void do_R3(u_int32_t *A, u_int32_t *B, u_int32_t *C, u_int32_t *D, u_int32_t *E, u_int32_t *W) -+{ -+ nR3( A, B, C, D, E, W[40]); -+ nR3( E, A, B, C, D, W[41]); -+ nR3( D, E, A, B, C, W[42]); -+ nR3( C, D, E, A, B, W[43]); -+ nR3( B, C, D, E, A, W[44]); -+ nR3( A, B, C, D, E, W[45]); -+ nR3( E, A, B, C, D, W[46]); -+ nR3( D, E, A, B, C, W[47]); -+ nR3( C, D, E, A, B, W[48]); -+ nR3( B, C, D, E, A, W[49]); -+ nR3( A, B, C, D, E, W[50]); -+ nR3( E, A, B, C, D, W[51]); -+ nR3( D, E, A, B, C, W[52]); -+ nR3( C, D, E, A, B, W[53]); -+ nR3( B, C, D, E, A, W[54]); -+ nR3( A, B, C, D, E, W[55]); -+ nR3( E, A, B, C, D, W[56]); -+ nR3( D, E, A, B, C, W[57]); -+ nR3( C, D, E, A, B, W[58]); -+ nR3( B, C, D, E, A, W[59]); -+} -+ -+void do_R4(u_int32_t *A, u_int32_t *B, u_int32_t *C, u_int32_t *D, u_int32_t *E, u_int32_t *W) -+{ -+ nR4( A, B, C, D, E, W[60]); -+ nR4( E, A, B, C, D, W[61]); -+ nR4( D, E, A, B, C, W[62]); -+ nR4( C, D, E, A, B, W[63]); -+ nR4( B, C, D, E, A, W[64]); -+ nR4( A, B, C, D, E, W[65]); -+ nR4( E, A, B, C, D, W[66]); -+ nR4( D, E, A, B, C, W[67]); -+ nR4( C, D, E, A, B, W[68]); -+ nR4( B, C, D, E, A, W[69]); -+ nR4( A, B, C, D, E, W[70]); -+ nR4( E, A, B, C, D, W[71]); -+ nR4( D, E, A, B, C, W[72]); -+ nR4( C, D, E, A, B, W[73]); -+ nR4( B, C, D, E, A, W[74]); -+ nR4( A, B, C, D, E, W[75]); -+ nR4( E, A, B, C, D, W[76]); -+ nR4( D, E, A, B, C, W[77]); -+ nR4( C, D, E, A, B, W[78]); -+ nR4( B, C, D, E, A, W[79]); -+} -+#endif -+ - - /**************************************************************************** - * NAME: void shaTransform( u_int32_t *state, -@@ -182,6 +305,10 @@ int SHA( uchar *message, - ByteSwap32( (uchar *)W, 64); /*TKL00201*/ - #endif /*TKL00201*/ - /* Expand the 16 words into 80 words */ -+#ifdef __sparc_v9__ -+ doexpand1(W); -+ doexpand2(W); -+#else - expand(16);expand(17);expand(18);expand(19);expand(20);expand(21); - expand(22);expand(23);expand(24);expand(25);expand(26);expand(27); - expand(28);expand(29);expand(30);expand(31);expand(32);expand(33); -@@ -193,6 +320,7 @@ int SHA( uchar *message, - expand(64);expand(65);expand(66);expand(67);expand(68);expand(69); - expand(70);expand(71);expand(72);expand(73);expand(74);expand(75); - expand(76);expand(77);expand(78);expand(79); -+#endif - /*Set up first buffer*/ - A = state[0]; - B = state[1]; -@@ -201,6 +329,12 @@ int SHA( uchar *message, - E = state[4]; - - /* Heavy mangling, in 4 sub-rounds of 20 iterations each. */ -+#ifdef __sparc_v9__ -+ do_R1(&A, &B, &C, &D, &E, W); -+ do_R2(&A, &B, &C, &D, &E, W); -+ do_R3(&A, &B, &C, &D, &E, W); -+ do_R4(&A, &B, &C, &D, &E, W); -+#else - subRound( A, B, C, D, E, f1, k1SHA, W[ 0] ); - subRound( E, A, B, C, D, f1, k1SHA, W[ 1] ); - subRound( D, E, A, B, C, f1, k1SHA, W[ 2] ); -@@ -284,6 +418,7 @@ int SHA( uchar *message, - subRound( D, E, A, B, C, f4, k4SHA, W[77]); - subRound( C, D, E, A, B, f4, k4SHA, W[78]); - subRound( B, C, D, E, A, f4, k4SHA, W[79]); -+#endif - - state[0] += A; - state[1] += B; +--- port/netbsd/Makefile.set.orig Mon Jun 24 00:33:02 2002 ++++ port/netbsd/Makefile.set +@@ -1,11 +1,13 @@ + 'CC=cc' + 'CDEBUG=-O2 -g' +-'DESTBIN=/usr/bin' +-'DESTSBIN=/usr/sbin' +-'DESTEXEC=/usr/libexec' +-'DESTMAN=/usr/share/man' +-'DESTHELP=/usr/share/misc' +-'DESTETC=/etc' ++'DESTBIN=${PREFIX}/bin' ++'DESTLIB=${PREFIX}/lib' ++'DESTINC=${PREFIX}/include/bind' ++'DESTSBIN=${PREFIX}/sbin' ++'DESTEXEC=${PREFIX}/libexec' ++'DESTMAN=${PREFIX}/man' ++'DESTHELP=${PREFIX}/share/doc/bind8' ++'DESTETC=${PREFIX}/etc' + 'DESTRUN=/var/run' + 'LEX=lex -I' + 'YACC=yacc -d' diff --git a/net/bind8/patches/patch-ah b/net/bind8/patches/patch-ah new file mode 100644 index 00000000000..e9ee3a70c74 --- /dev/null +++ b/net/bind8/patches/patch-ah @@ -0,0 +1,26 @@ +$NetBSD: patch-ah,v 1.1 2002/12/07 21:34:05 cjep Exp $ + +--- port/solaris/Makefile.set.gcc.orig Tue Oct 19 00:45:13 1999 ++++ port/solaris/Makefile.set.gcc +@@ -1,12 +1,14 @@ + 'CC=gcc' + 'CDEBUG=-g -O2' +-'DESTBIN=/usr/local/bin' +-'DESTSBIN=/usr/local/sbin' +-'DESTEXEC=/usr/local/sbin' +-'DESTMAN=/usr/local/share/man' +-'DESTHELP=/usr/local/lib' +-'DESTETC=/usr/local/etc' +-'DESTRUN=/usr/local/etc' ++'DESTBIN=${PREFIX}/bin' ++'DESTSBIN=${PREFIX}/sbin' ++'DESTEXEC=${PREFIX}/libexec' ++'DESTMAN=${PREFIX}/man' ++'DESTHELP=${PREFIX}/share/doc/bind8' ++'DESTETC=${PREFIX}/etc' ++'DESTLIB=${PREFIX}/lib' ++'DESTINC=${PREFIX}/include/bind' ++'DESTRUN=${PREFIX}/etc' + 'LDS=:' + 'AR=/usr/ccs/bin/ar cru' + 'LEX=/usr/ccs/bin/lex' diff --git a/net/bind8/patches/patch-ai b/net/bind8/patches/patch-ai new file mode 100644 index 00000000000..90ce147297d --- /dev/null +++ b/net/bind8/patches/patch-ai @@ -0,0 +1,26 @@ +$NetBSD: patch-ai,v 1.1 2002/12/07 21:34:06 cjep Exp $ + +--- port/solaris/Makefile.set.orig Mon Jun 24 00:33:16 2002 ++++ port/solaris/Makefile.set +@@ -1,12 +1,14 @@ + 'CC=gcc' + 'CDEBUG=-g -O2' +-'DESTBIN=/usr/local/bin' +-'DESTSBIN=/usr/local/sbin' +-'DESTEXEC=/usr/local/sbin' +-'DESTMAN=/usr/local/share/man' +-'DESTHELP=/usr/local/lib' +-'DESTETC=/usr/local/etc' +-'DESTRUN=/usr/local/etc' ++'DESTBIN=${PREFIX}/bin' ++'DESTSBIN=${PREFIX}/sbin' ++'DESTEXEC=${PREFIX}/libexec' ++'DESTMAN=${PREFIX}/man' ++'DESTHELP=${PREFIX}/share/doc/bind8' ++'DESTETC=${PREFIX}/etc' ++'DESTLIB=${PREFIX}/lib' ++'DESTINC=${PREFIX}/include/bind' ++'DESTRUN=${PREFIX}/etc' + 'LDS=:' + 'AR=/usr/ccs/bin/ar cru' + 'LEX=/usr/ccs/bin/lex' diff --git a/net/bind8/patches/patch-aj b/net/bind8/patches/patch-aj new file mode 100644 index 00000000000..94f0b40a523 --- /dev/null +++ b/net/bind8/patches/patch-aj @@ -0,0 +1,26 @@ +$NetBSD: patch-aj,v 1.1 2002/12/07 21:34:06 cjep Exp $ + +--- port/solaris/Makefile.set.sun.orig Tue Oct 19 00:45:13 1999 ++++ port/solaris/Makefile.set.sun +@@ -1,12 +1,14 @@ + 'CC=cc' + 'CDEBUG=-g -O' +-'DESTBIN=/usr/local/bin' +-'DESTSBIN=/usr/local/sbin' +-'DESTEXEC=/usr/local/sbin' +-'DESTMAN=/usr/local/share/man' +-'DESTHELP=/usr/local/lib' +-'DESTETC=/usr/local/etc' +-'DESTRUN=/usr/local/etc' ++'DESTBIN=${PREFIX}/bin' ++'DESTSBIN=${PREFIX}/sbin' ++'DESTEXEC=${PREFIX}/libexec' ++'DESTMAN=${PREFIX}/man' ++'DESTHELP=${PREFIX}/share/doc/bind8' ++'DESTETC=${PREFIX}/etc' ++'DESTLIB=${PREFIX}/lib' ++'DESTINC=${PREFIX}/include/bind' ++'DESTRUN=${PREFIX}/etc' + 'LDS=:' + 'AR=/usr/ccs/bin/ar cru' + 'LEX=/usr/ccs/bin/lex' |