OpenPKG CVS Repository
http://www.openpkg.org/cvsweb/cvsweb.cgi
____________________________________________________________________________
Server: cvs.openpkg.org Name: Christoph Schug
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 03-Jul-2002 19:48:32
Branch: HEAD Handle: 2002070318483200
Modified files:
openpkg-src/bind8 bind.patch bind8.spec
Log:
- FreeBSD port patch isn't required anymore
- re-enabled and altered patch to let bind8 build on Linux
- fixed update issue of named is not running
Summary:
Revision Changes Path
1.2 +25 -59 openpkg-src/bind8/bind.patch
1.6 +4 -4 openpkg-src/bind8/bind8.spec
____________________________________________________________________________
Index: openpkg-src/bind8/bind.patch
============================================================
$ cvs diff -u -r1.1 -r1.2 bind.patch
--- openpkg-src/bind8/bind.patch 6 Mar 2002 16:30:19 -0000 1.1
+++ openpkg-src/bind8/bind.patch 3 Jul 2002 17:48:32 -0000 1.2
@@ -1,77 +1,43 @@
---- src/lib/isc/eventlib.c.orig Fri Feb 4 08:25:39 2000
-+++ src/lib/isc/eventlib.c Wed Mar 7 11:51:38 2001
-@@ -293,9 +293,15 @@
+--- src/lib/isc/eventlib.c.orig Wed Jul 3 19:17:43 2002
++++ src/lib/isc/eventlib.c Wed Jul 3 19:21:30 2002
+@@ -293,9 +293,9 @@
evPrintf(ctx, 4,
"pselect(%d, 0x%lx, 0x%lx, 0x%lx, %d.%09ld)\n",
ctx->fdMax+1,
-+#if 0
- (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),
-+ (u_long)&(ctx->wrLast),
-+ (u_long)&(ctx->exLast),
-+#endif
+- (u_long)ctx->rdLast.fds_bits[0],
+- (u_long)ctx->wrLast.fds_bits[0],
+- (u_long)ctx->exLast.fds_bits[0],
++ (u_long)ctx->rdLast.__fds_bits[0],
++ (u_long)ctx->wrLast.__fds_bits[0],
++ (u_long)ctx->exLast.__fds_bits[0],
tp ? tp->tv_sec : -1,
tp ? tp->tv_nsec : -1);
---- src/lib/isc/ev_files.c.orig Thu Oct 7 22:44:04 1999
-+++ src/lib/isc/ev_files.c Wed Mar 7 11:53:04 2001
-@@ -140,9 +140,15 @@
+--- src/lib/isc/ev_files.c.orig Wed Jul 3 19:22:45 2002
++++ src/lib/isc/ev_files.c Wed Jul 3 19:23:16 2002
+@@ -146,9 +146,9 @@
evPrintf(ctx, 5,
"evSelectFD(fd %d, mask 0x%x): new masks: 0x%lx 0x%lx 0x%lx\n",
fd, eventmask,
-+#if 0
- (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),
-+ (u_long)&(ctx->wrNext),
-+ (u_long)&(ctx->exNext));
-+#endif
+- (u_long)ctx->rdNext.fds_bits[0],
+- (u_long)ctx->wrNext.fds_bits[0],
+- (u_long)ctx->exNext.fds_bits[0]);
++ (u_long)ctx->rdNext.__fds_bits[0],
++ (u_long)ctx->wrNext.__fds_bits[0],
++ (u_long)ctx->exNext.__fds_bits[0]);
return (0);
}
-@@ -251,9 +257,15 @@
+@@ -262,9 +262,9 @@
evPrintf(ctx, 5,
"evDeselectFD(fd %d, mask 0x%x): new masks: 0x%lx 0x%lx 0x%lx\n",
del->fd, eventmask,
-+#if 0
- (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),
-+ (u_long)&(ctx->wrNext),
-+ (u_long)&(ctx->exNext));
-+#endif
+- (u_long)ctx->rdNext.fds_bits[0],
+- (u_long)ctx->wrNext.fds_bits[0],
+- (u_long)ctx->exNext.fds_bits[0]);
++ (u_long)ctx->rdNext.__fds_bits[0],
++ (u_long)ctx->wrNext.__fds_bits[0],
++ (u_long)ctx->exNext.__fds_bits[0]);
/* Couldn't free it before now since we were using fields out of it. */
FREE(del);
---- src/port/freebsd/include/port_before.h.orig Wed Oct 31 23:29:21 2001
-+++ src/port/freebsd/include/port_before.h Tue Feb 26 21:50:52 2002
-@@ -15,6 +15,7 @@
- #define SETPWENT_VOID
- #endif
-
-+#include <sys/param.h>
- #include <sys/types.h>
-
- #define GROUP_R_RETURN struct group *
-@@ -26,8 +27,14 @@
- #define GROUP_R_ENT_ARGS void
- #define GROUP_R_OK gptr
- #define GROUP_R_BAD NULL
-+
-+#if defined(__FreeBSD_version) && __FreeBSD_version >= 500030
-+#define GETGROUPLIST_ARGS const char *name, gid_t basegid, gid_t *groups, \
-+ int *ngroups
-+#else
- #define GETGROUPLIST_ARGS const char *name, int basegid, int *groups, \
- int *ngroups
-+#endif
-
- #define HOST_R_RETURN struct hostent *
- #define HOST_R_SET_RETURN void
Index: openpkg-src/bind8/bind8.spec
============================================================
$ cvs diff -u -r1.5 -r1.6 bind8.spec
--- openpkg-src/bind8/bind8.spec 28 Jun 2002 07:31:45 -0000 1.5
+++ openpkg-src/bind8/bind8.spec 3 Jul 2002 17:48:32 -0000 1.6
@@ -33,7 +33,7 @@
Group: DNS
License: GPL
Version: 8.3.3
-Release: 20020628
+Release: 20020703
# list of sources
Source0: ftp://ftp.isc.org/isc/bind/src/%{version}/bind-src.tar.gz
@@ -65,7 +65,7 @@
%prep
%setup0 -q -c -n bind8-%{version}
%setup1 -q -T -D -a 1
- #%patch0 -p0
+ %patch0 -p0
%build
PATH="%{l_prefix}/bin:$PATH"; export PATH
@@ -167,13 +167,13 @@
rm -rf $RPM_BUILD_ROOT
%pre
- if [ $1 -gt 1 ]; then
+ if [ $1 -gt 1 -a -e $RPM_INSTALL_PREFIX/var/bind/ndc ]; then
# stop daemon before any upgrade
$RPM_INSTALL_PREFIX/sbin/ndc stop >/dev/null 2>&1
fi
%preun
- if [ $1 -eq 0 ]; then
+ if [ $1 -eq 0 -a -e $RPM_INSTALL_PREFIX/var/bind/ndc ]; then
# stop daemon before removing package
$RPM_INSTALL_PREFIX/sbin/ndc stop >/dev/null 2>&1
# remove dynamically generated files
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
