head 1.3; access; symbols OPENPKG_E1_MP_HEAD:1.3 OPENPKG_E1_MP:1.3 OPENPKG_E1_MP_2_STABLE:1.3 OPENPKG_E1_FP:1.3 OPENPKG_2_STABLE_20061018:1.3 OPENPKG_2_STABLE:1.3.0.2 OPENPKG_2_STABLE_BP:1.3 OPENPKG_2_5_RELEASE:1.2 OPENPKG_2_5_SOLID:1.2.0.6 OPENPKG_2_5_SOLID_BP:1.2 OPENPKG_2_4_RELEASE:1.2 OPENPKG_2_4_SOLID:1.2.0.4 OPENPKG_2_4_SOLID_BP:1.2 OPENPKG_CW_FP:1.2 OPENPKG_2_3_RELEASE:1.2 OPENPKG_2_3_SOLID:1.2.0.2 OPENPKG_2_3_SOLID_BP:1.2 OPENPKG_2_2_RELEASE:1.1 OPENPKG_2_2_SOLID:1.1.0.8 OPENPKG_2_2_SOLID_BP:1.1 OPENPKG_2_1_RELEASE:1.1 OPENPKG_2_1_SOLID:1.1.0.6 OPENPKG_2_1_SOLID_BP:1.1 OPENPKG_2_0_RELEASE:1.1 OPENPKG_2_0_SOLID:1.1.0.4 OPENPKG_2_0_SOLID_BP:1.1 OPENPKG_1_3_RELEASE:1.1.2.1 OPENPKG_1_3_SOLID:1.1.2.1.0.2 OPENPKG_1_3_SOLID_BP:1.1.2.1 OPENPKG_1_STABLE:1.1.0.2 OPENPKG_1_STABLE_MP:1.1; locks; strict; comment @# @; 1.3 date 2005.12.21.08.22.14; author rse; state dead; branches; next 1.2; commitid qrsfSJ1mYXIztser; 1.2 date 2005.02.18.11.29.59; author rse; state Exp; branches; next 1.1; 1.1 date 2003.07.10.15.02.36; author rse; state Exp; branches 1.1.2.1; next ; 1.1.2.1 date 2003.07.24.20.49.09; author rse; state Exp; branches; next ; desc @@ 1.3 log @upgrading package: bind8 8.4.6 -> 8.4.7 @ text @--- src/lib/isc/eventlib.c.orig Thu Jul 4 15:01:28 2002 +++ src/lib/isc/eventlib.c Thu Jul 4 15:02:04 2002 @@@@ -293,9 +293,15 @@@@ evPrintf(ctx, 4, "pselect(%d, 0x%lx, 0x%lx, 0x%lx, %d.%09ld)\n", ctx->fdMax+1, +#ifdef __linux__ + (u_long)ctx->rdLast.__fds_bits[0], + (u_long)ctx->wrLast.__fds_bits[0], + (u_long)ctx->exLast.__fds_bits[0], +#else (u_long)ctx->rdLast.fds_bits[0], (u_long)ctx->wrLast.fds_bits[0], (u_long)ctx->exLast.fds_bits[0], +#endif tp ? (long)tp->tv_sec : -1L, tp ? tp->tv_nsec : -1); --- src/lib/isc/ev_files.c.orig Thu Jul 4 15:01:42 2002 +++ src/lib/isc/ev_files.c Thu Jul 4 15:01:54 2002 @@@@ -146,9 +146,15 @@@@ evPrintf(ctx, 5, "evSelectFD(fd %d, mask 0x%x): new masks: 0x%lx 0x%lx 0x%lx\n", fd, eventmask, +#ifdef __linux__ + (u_long)ctx->rdNext.__fds_bits[0], + (u_long)ctx->wrNext.__fds_bits[0], + (u_long)ctx->exNext.__fds_bits[0]); +#else (u_long)ctx->rdNext.fds_bits[0], (u_long)ctx->wrNext.fds_bits[0], (u_long)ctx->exNext.fds_bits[0]); +#endif return (0); } @@@@ -262,9 +268,15 @@@@ evPrintf(ctx, 5, "evDeselectFD(fd %d, mask 0x%x): new masks: 0x%lx 0x%lx 0x%lx\n", del->fd, eventmask, +#ifdef __linux__ + (u_long)ctx->rdNext.__fds_bits[0], + (u_long)ctx->wrNext.__fds_bits[0], + (u_long)ctx->exNext.__fds_bits[0]); +#else (u_long)ctx->rdNext.fds_bits[0], (u_long)ctx->wrNext.fds_bits[0], (u_long)ctx->exNext.fds_bits[0]); +#endif /* Couldn't free it before now since we were using fields out of it. */ FREE(del); Index: src/port/solaris/include/port_after.h --- src/port/solaris/include/port_after.h.orig 2005-02-18 12:28:23.703175502 +0100 +++ src/port/solaris/include/port_after.h 2005-02-18 12:27:28.150590319 +0100 @@@@ -8,7 +8,9 @@@@ #define NETREAD_BROKEN #define USE_WAITPID #define HAVE_FCHMOD +#if (OS_MAJOR == 5 && OS_MINOR < 10) #define NEED_PSELECT +#endif #define SETGRENT_VOID #define SETPWENT_VOID #define SIOCGIFCONF_ADDR @ 1.2 log @switch to versioned distribution files and fix building under Solaris 10 @ text @@ 1.1 log @cleanup packaging to conform to the latest world order @ text @d53 13 @ 1.1.2.1 log @mass Merge-From-CURRENT (MFC) in preparation for OpenPKG 1.3 [class PLUS only] @ text @@