OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web openpkg$ Date: 15-Nov-2003 20:55:42
Branch: HEAD Handle: 2003111519554002
Added files:
openpkg-src/nsd nsd.patch
Modified files:
openpkg-re/vcheck vc.nsd
openpkg-src/nsd nsd.spec
openpkg-web news.txt
Log:
upgrading package: nsd 1.2.2 -> 1.2.3
Summary:
Revision Changes Path
1.8 +1 -1 openpkg-re/vcheck/vc.nsd
1.3 +27 -0 openpkg-src/nsd/nsd.patch
1.25 +25 -10 openpkg-src/nsd/nsd.spec
1.7416 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-re/vcheck/vc.nsd
============================================================================
$ cvs diff -u -r1.7 -r1.8 vc.nsd
--- openpkg-re/vcheck/vc.nsd 17 Sep 2003 17:42:07 -0000 1.7
+++ openpkg-re/vcheck/vc.nsd 15 Nov 2003 19:55:40 -0000 1.8
@@ -2,7 +2,7 @@
}
prog nsd = {
- version = 1.2.2
+ version = 1.2.3
url = http://www.nlnetlabs.nl/nsd/index.html
regex = nsd-(\d+\.\d+\.\d+)\.tar\.gz
}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/nsd/nsd.patch
============================================================================
$ cvs diff -u -r0 -r1.3 nsd.patch
--- /dev/null 2003-11-15 20:55:42.000000000 +0100
+++ nsd.patch 2003-11-15 20:55:42.000000000 +0100
@@ -0,0 +1,27 @@
+Index: query.c
+--- query.c.orig 2003-11-15 13:46:00.000000000 +0100
++++ query.c 2003-11-15 20:54:38.000000000 +0100
+@@ -64,7 +64,7 @@
+ #include "util.h"
+
+ #ifdef LIBWRAP
+-#include <tcpd.h>
++#include "tcpd.h"
+
+ int allow_severity = LOG_INFO;
+ int deny_severity = LOG_NOTICE;
+@@ -704,12 +704,10 @@
+ *t = 0;
+
+ #endif /* AXFR_DAEMON_PREFIX */
+- request_init(&request, RQ_DAEMON, AXFR_DAEMON, RQ_CLIENT_SIN,
&q->addr, 0);
+- sock_methods(&request); /* This is to work around the bug in
libwrap */
++ request_init(&request, RQ_DAEMON, AXFR_DAEMON, RQ_CLIENT_ADDR,
&q->addr, 0);
+ if(!hosts_access(&request)) {
+ #ifdef AXFR_DAEMON_PREFIX
+- request_init(&request, RQ_DAEMON, axfr_daemon,
RQ_CLIENT_SIN, &q->addr, 0);
+- sock_methods(&request); /* This is to work around the
bug in libwrap */
++ request_init(&request, RQ_DAEMON, axfr_daemon,
RQ_CLIENT_ADDR, &q->addr, 0);
+ log_msg(LOG_ERR, "checking %s", axfr_daemon);
+ if(!hosts_access(&request)) {
+ #endif /* AXFR_DAEMON_PREFIX */
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/nsd/nsd.spec
============================================================================
$ cvs diff -u -r1.24 -r1.25 nsd.spec
--- openpkg-src/nsd/nsd.spec 11 Nov 2003 16:53:44 -0000 1.24
+++ openpkg-src/nsd/nsd.spec 15 Nov 2003 19:55:42 -0000 1.25
@@ -24,8 +24,6 @@
##
# FIXME: rse: optional AXFR support via BIND8 named-xfer?
-# FIXME: rse: optional libwrap support via {tcp,socket}_wrappers for AXFR
-# FIXME: thl: libwrap can be (mis-)used for fsl, but the right side of the
assignment must never be empty. this requires an "if"
# package information
Name: nsd
@@ -36,11 +34,12 @@
Distribution: OpenPKG [EVAL]
Group: DNS
License: GPL
-Version: 1.2.2
-Release: 20031111
+Version: 1.2.3
+Release: 20031115
# package option
%option with_fsl yes
+%option with_wrap no
# list of sources
Source0: http://www.nlnetlabs.nl/downloads/nsd/nsd-%{version}.tar.gz
@@ -49,6 +48,7 @@
Source3: nsd.conf
Source4: example.com
Source5: fsl.nsd
+Patch0: nsd.patch
# build information
Prefix: %{l_prefix}
@@ -59,6 +59,10 @@
BuildPreReq: fsl >= 1.3.0
PreReq: fsl >= 1.3.0
%endif
+%if "%{with_wrap}" == "yes"
+BuildPreReq: tcpwrappers
+PreReq: tcpwrappers
+%endif
AutoReq: no
AutoReqProv: no
@@ -71,12 +75,21 @@
%prep
%setup -q
+ %patch -p0
%build
# configure programs
- CC="%{l_cc}" \
- CFLAGS="%{l_cflags -O}" \
- LDFLAGS="%{l_ldflags}" \
+ export CC="%{l_cc}"
+ export CFLAGS="%{l_cflags -O}"
+ export CPPFLAGS="%{l_cppflags}"
+ export LDFLAGS="%{l_ldflags}"
+ export LIBS=""
+%if "%{with_wrap}" == "yes"
+ LIBS="$LIBS -lwrap"
+%endif
+%if "%{with_fsl}" == "yes"
+ LIBS="$LIBS %{l_fsl_ldflags} %{l_fsl_libs}"
+%endif
./configure \
--prefix=%{l_prefix} \
--with-configdir=%{l_prefix}/etc/nsd \
@@ -87,11 +100,13 @@
--with-dbfile=%{l_prefix}/var/nsd/nsd.db \
--with-user="%{l_ruid}.%{l_rgid}" \
--with-namedxfer=%{l_prefix}/libexec/bind/named-xfer \
-%if "%{with_fsl}" == "yes"
- --with-libwrap="%{l_fsl_ldflags} %{l_fsl_libs}" \
-%endif
--enable-bind8-stats \
--disable-shared \
+%if "%{with_wrap}" == "yes"
+ --with-libwrap=%{l_prefix} \
+%else
+ --without-libwrap \
+%endif
--disable-nls
# build programs
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.7415 -r1.7416 news.txt
--- openpkg-web/news.txt 15 Nov 2003 19:55:31 -0000 1.7415
+++ openpkg-web/news.txt 15 Nov 2003 19:55:41 -0000 1.7416
@@ -1,3 +1,4 @@
+15-Nov-2003: Upgraded package: P<nsd-1.2.3-20031115>
15-Nov-2003: Upgraded package: P<qt-3.2.3-20031115>
15-Nov-2003: Upgraded package: P<elm-2.4.109-20031115>
15-Nov-2003: Upgraded package: P<nail-10.6-20031115>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
