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 Date: 22-Sep-2003 20:38:42
Branch: OPENPKG_1_3_SOLID HEAD Handle: 2003092219384002
Modified files:
openpkg-web news.txt
Modified files: (Branch: OPENPKG_1_3_SOLID)
openpkg-src/bind bind.spec db.localhost db.localhost.ipv4
db.localhost.ipv6 db.root db.root.sh named.conf
Log:
MFC: all recent fixes and adjustments
Summary:
Revision Changes Path
1.37.2.7.2.2+8 -3 openpkg-src/bind/bind.spec
1.2.6.1 +1 -1 openpkg-src/bind/db.localhost
1.1.6.1 +1 -1 openpkg-src/bind/db.localhost.ipv4
1.1.6.1 +1 -1 openpkg-src/bind/db.localhost.ipv6
1.4.2.1.2.1 +1 -1 openpkg-src/bind/db.root
1.2.8.1 +6 -2 openpkg-src/bind/db.root.sh
1.3.2.1.2.1 +2 -2 openpkg-src/bind/named.conf
1.6687 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/bind/bind.spec
============================================================================
$ cvs diff -u -r1.37.2.7.2.1 -r1.37.2.7.2.2 bind.spec
--- openpkg-src/bind/bind.spec 29 Jul 2003 14:58:21 -0000 1.37.2.7.2.1
+++ openpkg-src/bind/bind.spec 22 Sep 2003 18:38:42 -0000 1.37.2.7.2.2
@@ -37,7 +37,7 @@
Group: DNS
License: ISC
Version: %{V_bind}
-Release: 1.3.0
+Release: 1.3.1
# package options
%option with_dlz_mysql no
@@ -65,6 +65,7 @@
Source8: rndc.conf
Source9: rc.bind
Source10: http://osdn.dl.sourceforge.net/bind-dlz/DLZ-%{V_dlz}.tar.gz
+Patch0: ftp://ftp.isc.org/isc/bind9/%{version}/patch.%{version}-P1
# build information
Prefix: %{l_prefix}
@@ -102,6 +103,7 @@
%prep
%setup -q
+ %patch -p1
%if "%{with_dlz}" == "yes"
%setup -q -T -D -a 10
%{l_patch} -p1 <dlz.patch
@@ -229,8 +231,11 @@
# determine the installed files
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
%{l_files_std} \
- '%config %{l_prefix}/etc/bind/*.conf' \
- '%config %{l_prefix}/etc/bind/named.db/*' \
+ '%config %attr(600,%{l_susr},%{l_sgrp}) %{l_prefix}/etc/bind/*.conf' \
+ '%config %attr(600,%{l_susr},%{l_sgrp}) %{l_prefix}/etc/bind/named.db/*' \
+ '%config %attr(700,%{l_susr},%{l_sgrp})
%{l_prefix}/etc/bind/named.db/db.root.sh' \
+ '%dir %attr(700,%{l_susr},%{l_sgrp}) %{l_prefix}/etc/bind' \
+ '%dir %attr(700,%{l_susr},%{l_sgrp}) %{l_prefix}/etc/bind/named.db' \
'%dir %attr(-,%{l_susr},%{l_mgrp}) %{l_prefix}/var/bind'
%files -f files
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/bind/db.localhost
============================================================================
$ cvs diff -u -r1.2 -r1.2.6.1 db.localhost
--- openpkg-src/bind/db.localhost 3 Dec 2002 14:03:29 -0000 1.2
+++ openpkg-src/bind/db.localhost 22 Sep 2003 18:38:42 -0000 1.2.6.1
@@ -11,7 +11,7 @@
1W ; EXPIRE: Maximum TTL of data (expiry)
1D ; MINTTL: Minimum TTL of data (expiry)
)
-
+
IN NS @
IN A 127.0.0.1
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/bind/db.localhost.ipv4
============================================================================
$ cvs diff -u -r1.1 -r1.1.6.1 db.localhost.ipv4
--- openpkg-src/bind/db.localhost.ipv4 3 Dec 2002 14:03:29 -0000 1.1
+++ openpkg-src/bind/db.localhost.ipv4 22 Sep 2003 18:38:42 -0000 1.1.6.1
@@ -11,7 +11,7 @@
1W ; EXPIRE: Maximum TTL of data (expiry)
1D ; MINTTL: Minimum TTL of data (expiry)
)
-
+
IN NS @
1 IN PTR localhost.
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/bind/db.localhost.ipv6
============================================================================
$ cvs diff -u -r1.1 -r1.1.6.1 db.localhost.ipv6
--- openpkg-src/bind/db.localhost.ipv6 3 Dec 2002 14:03:29 -0000 1.1
+++ openpkg-src/bind/db.localhost.ipv6 22 Sep 2003 18:38:42 -0000 1.1.6.1
@@ -11,7 +11,7 @@
1W ; EXPIRE: Maximum TTL of data (expiry)
1D ; MINTTL: Minimum TTL of data (expiry)
)
-
+
IN NS @
IN PTR localhost.
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/bind/db.root
============================================================================
$ cvs diff -u -r1.4.2.1 -r1.4.2.1.2.1 db.root
--- openpkg-src/bind/db.root 4 Mar 2003 12:28:19 -0000 1.4.2.1
+++ openpkg-src/bind/db.root 22 Sep 2003 18:38:42 -0000 1.4.2.1.2.1
@@ -1,6 +1,6 @@
;;
;; db.root -- Internet Root Nameservers
-;; DO NOT EDIT, IT WAS AUTOMATICALLY CREATED ON 2003-03-04 BY db.root.sh!
+;; DO NOT EDIT, IT WAS AUTOMATICALLY CREATED ON 2003-08-18 BY db.root.sh!
;;
. 99999999 IN NS A.ROOT-SERVERS.NET.
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/bind/db.root.sh
============================================================================
$ cvs diff -u -r1.2 -r1.2.8.1 db.root.sh
--- openpkg-src/bind/db.root.sh 26 Feb 2002 14:52:19 -0000 1.2
+++ openpkg-src/bind/db.root.sh 22 Sep 2003 18:38:42 -0000 1.2.8.1
@@ -10,11 +10,15 @@
;;
EOT
-dig @A.ROOT-SERVERS.NET . NS |\
-awk '
+for i in A B C D E F G H I J K L M; do
+ dig @$i.ROOT-SERVERS.NET . NS >$ROOTFILE.raw && break
+done
+[ -f $ROOTFILE.raw ] || exit 1
+awk <$ROOTFILE.raw '
/IN NS/ { printf("%-20s 99999999 IN NS %s\n", $1, $NF); }
/IN A/ { printf("%-20s 99999999 IN A %s\n", $1, $NF); }
' |\
sort >>$ROOTFILE
echo "" >>$ROOTFILE
+rm $ROOTFILE.raw
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/bind/named.conf
============================================================================
$ cvs diff -u -r1.3.2.1 -r1.3.2.1.2.1 named.conf
--- openpkg-src/bind/named.conf 24 Jul 2003 20:43:53 -0000 1.3.2.1
+++ openpkg-src/bind/named.conf 22 Sep 2003 18:38:42 -0000 1.3.2.1.2.1
@@ -62,8 +62,8 @@
};
zone "1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa" {
- type master;
- file "db.localhost.ipv6";
+ type master;
+ file "db.localhost.ipv6";
notify no;
allow-update { none; };
allow-transfer { any; };
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.6686 -r1.6687 news.txt
--- openpkg-web/news.txt 22 Sep 2003 18:10:00 -0000 1.6686
+++ openpkg-web/news.txt 22 Sep 2003 18:38:40 -0000 1.6687
@@ -1,3 +1,4 @@
+22-Sep-2003: Upgraded package: P<bind-9.2.2-1.3.1>
22-Sep-2003: Upgraded package: P<crm114-20030920-20030922>
22-Sep-2003: Upgraded package: P<zoem-03.265-20030922>
22-Sep-2003: Upgraded package: P<nmap-3.46-20030922>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
