Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/net
In directory
sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv28542/10.4-public/unstable/main/finkinfo/net
Modified Files:
bind9.info bind9.patch
Log Message:
sync with pangocairo so php5 can be sane(r)
Index: bind9.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/net/bind9.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- bind9.info 21 Nov 2007 23:01:58 -0000 1.5
+++ bind9.info 17 Mar 2008 20:14:51 -0000 1.6
@@ -1,38 +1,79 @@
-Package: bind9
-Version: 9.2.1
-Revision: 1025
-Depends: pth-shlibs, db4-shlibs, daemonic
-BuildDepends: pth, db4 (>= 4.0.14-1026), libxml2, gdbm
-Source: ftp://ftp.isc.org/isc/%n/%v/bind-%v.tar.gz
+Info2: <<
+Package: bind9%type_pkg[ssl]
+Version: 9.4.099
+Revision: 3
+Type: v (9.4.1-P1), ssl (.)
+# Please keep bind9.info and bind9.patch identical in crypto and in net except
for the type field.
+# Or make the crypto version disappear cleanly ..
+Depends: %N-shlibs (=%v-%r), daemonic, db44-aes-shlibs | db44-shlibs
+# dep and bdep on pth2-shlibs and -dev seem to have disappeared
+# also bdeps on gdbm3
+BuildDepends: db44-aes | db44, (%type_raw[ssl] = -ssl) openssl097-dev,
(%type_raw[ssl] = .) system-openssl-dev, fink (>= 0.24.12-1)
+## "checking for .. " also needs tetex-base w3m libxml2-bin libxslt-bin
+## but configure would still have to be patched to find the docbook stuff
(looks in hard-coded places).
+Conflicts: host, %{Ni}-ssl, %{Ni}
+Replaces: host, %{Ni}-ssl, %{Ni}
+Provides: host, %{Ni}-ssl, %{Ni}
+# The Provides host is because other pkgs like xtraceroute depend on host and
not on the alternative
+# The Provides make switching between the crypto and non-crypto variants
difficult.. (switch with dpkg --force-conflicts ...)
+Source: ftp://ftp.isc.org/isc/%{Ni}/%type_raw[v]/bind-%type_raw[v].tar.gz
+Source-MD5: 44e0514e6105ddaa235394045d9aeb0c
+Source2: ftp://ftp.internic.net/domain/named.root
+Source2-MD5: c17d2e4325d3fdcc247188e8f26a059e
+Source2ExtractDir: bind-%type_raw[v]/etc
+# the patch file should be re-checked. I updated _ ie, removed .. _ the
named.root part (was from 97...), but nothing else
+PatchFile: %{Ni}.patch
+PatchFile-MD5: 93f0a85f504c95ae6489a0320c1f699c
PatchScript: <<
- mkdir etc
- touch etc/db.127
- touch etc/db.0
- touch etc/db.255
- touch etc/db.local
- touch etc/db.root
- touch etc/named.conf
- sed 's|@FINKPREFIX@|%p|g' <%a/%n.patch | patch -p1
+ sed 's|@FINKPREFIX@|%p|g' <%{PatchFile} | patch -p1
+ perl -pi -e 's,(\{d\}\.)so,\1dylib,; s,db\-4\.2,db-4.4,' configure
+<<
+SetCFLAGS: -Os -fstrict-aliasing
+SetLIBRARY_PATH: %p/lib
+NoSetLDFLAGS: true
+NoSetCPPFLAGS: true
+ConfigureParams: <<
+ --mandir=%i/share/man --infodir=%p/share/info \
+ --with-libtool --enable-libbind --enable-threads --with-dlz-filesystem=yes
--with-dlz-bdb=%p \
+ (%type_raw[ssl] = .) --with-openssl=%p/lib/system-openssl (%type_raw[ssl] =
-ssl) --with-openssl=%p
+<<
+CompileScript: <<
+ #!/bin/sh -ev
+ export CPATH=%p/include/db4:%p/include
+ export STD_CDEFINES="-DDIG_SIGCHASE=1"
+ %{default_script}
+<<
+InfoTest: <<
+ # the following may slightly change your system environment while running
+ TestScript: ( ./bin/tests/system/ifconfig.sh up; make -k check 2>&1|tee
/tmp/bind9.test ) || true
<<
-ConfigureParams: --enable-libbind --mandir=%i/share/man
--infodir=%p/share/info --libexecdir=%p/lib --sysconfdir=%p/etc/bind
--localstatedir=%p/var
-GCC: 4.0
InstallScript: <<
make install prefix=%i
mkdir -p %i/var/cache/bind
- mkdir -p %i/etc/bind
- cp etc/* %i/etc/bind
+ chown 0:0 etc/*
+ cp -pPR etc %i
mv %i/bind/include %i/include/bind
- cd %i && rm -rf bind
- ranlib %i/lib/lib*.a
+ rm -rf %i/bind
+ mkdir -p %i/share/doc/%n
+ ln -s ../%N-shlibs/COPYRIGHT %i/share/doc/%n
+ install -m 644 doc/arm/Bv9ARM.pdf %i/share/doc/%n
<<
-DocFiles: CHANGES COPYRIGHT FAQ README
+PreInstScript: <<
+ ## in case existing one is a symlink (as in %r=1)
+ rm -f %p/share/doc/%n 2>/dev/null || :
+ ## save the conffiles to new name and location, so dpkg will allow users to
keep them
+ ## (changed location to default in %r=2, so named finds the conffiles on its
own)
+ for f in `ls -1 %p/etc/bind/* 2>/dev/null` ; do /bin/mv -n $f `sed -e
's,/bind,,' -e 's,etc/db\.,etc/named.,' <<<"$f"` ; done
+ rm -fR %p/etc/bind || :
+<<
+DocFiles: CHANGES FAQ README
ConfFiles: <<
- %p/etc/bind/named.conf
- %p/etc/bind/db.127
- %p/etc/bind/db.0
- %p/etc/bind/db.255
- %p/etc/bind/db.local
- %p/etc/bind/db.root
+ %p/etc/named.conf
+ %p/etc/named.0
+ %p/etc/named.127
+ %p/etc/named.255
+ %p/etc/named.local
+ %p/etc/named.root
<<
DaemonicName: bind9
DaemonicFile: <<
@@ -44,13 +85,41 @@
<executable background="yes">%p/sbin/named</executable>
<!-- the daemon will background itself, but may take a while
to start up to the point where it does so -->
-<configfile>%p/etc/bind/named.conf</configfile>
-<parameters>-c %p/etc/bind/named.conf</parameters>
+<configfile>%p/etc/named.conf</configfile>
+<parameters>-c %p/etc/named.conf</parameters>
<pidfile>%p/var/run/named.pid</pidfile>
</daemon>
</service>
<<
+Splitoff: <<
+ Package: %N-shlibs
+ Depends: (%type_raw[ssl] = -ssl) openssl097-shlibs
+ Conflicts: %{Ni}-ssl-shlibs, %{Ni}-shlibs
+ Replaces: %{Ni}-ssl-shlibs, %{Ni}-shlibs
+ Provides: %{Ni}-ssl-shlibs, %{Ni}-shlibs
+ Files: lib/*.*.dylib
+ Shlibs: <<
+ %p/lib/libbind.4.dylib 5.0.0 %n (>= 9.3.999-1)
+ %p/lib/libbind9.30.dylib 31.0.0 %n (>= 9.3.999-1)
+ %p/lib/libdns.32.dylib 34.0.0 %n (>= 9.3.999-1)
+ %p/lib/libisc.32.dylib 33.0.0 %n (>= 9.3.999-1)
+ %p/lib/libisccc.30.dylib 31.0.0 %n (>= 9.3.999-1)
+ %p/lib/libisccfg.30.dylib 31.0.0 %n (>= 9.3.999-1)
+ %p/lib/liblwres.30.dylib 31.0.0 %n (>= 9.3.999-1)
+ <<
+ DocFiles: COPYRIGHT
+<<
+Splitoff2: <<
+ Package: %N-dev
+ Conflicts: %{Ni}-ssl-dev, %{Ni}-dev, %{Ni} (<< 9.3.9)
+ Replaces: %{Ni}-ssl-dev, %{Ni}-dev, %{Ni} (<< 9.3.9)
+ Provides: %{Ni}-ssl-dev, %{Ni}-dev
+ Files: include lib bin/isc-config.sh
+ Depends: %N-shlibs (=%v-%r)
+ BuildDependsOnly: true
+ InstallScript: mkdir -p %i/share/doc; ln -s %N-shlibs %i/share/doc/%n
+<<
Description: Berkeley Internet Name Domain
DescDetail: <<
The Berkeley Internet Name Domain (BIND) implements an Internet name server
@@ -59,10 +128,16 @@
that enables clients to name resources or objects and share this information
with other objects in the network.
<<
+DescPort: <<
+Update of bind9, + policy conformance (making shared libs too, shlibs policy,
etc), + cleanup, by jfm
+File is commented as to main points. Using this as a TODO :
+_ probably needs a good DescUsage field (from what I remember about bind from
long ago)
+_ other subdirs of contrib to make ? (dbus eg ?)
+<<
License: Public Domain
DescPackaging: <<
Previous packages by Matthew Flanagan <[EMAIL PROTECTED]>
<<
Maintainer: None <[EMAIL PROTECTED]>
Homepage: http://www.isc.org/products/BIND/
-Source-MD5: 692cff6f44e006ce6984b2c286949dd1
+<<
Index: bind9.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/net/bind9.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- bind9.patch 7 Feb 2006 04:08:12 -0000 1.1
+++ bind9.patch 17 Mar 2008 20:14:51 -0000 1.2
@@ -1,6 +1,6 @@
-diff -ru bind-9.2.1/etc/db.0 bind-9.2.1-patched/etc/db.0
---- bind-9.2.1/etc/db.0 Sat Jan 26 04:13:34 2002
-+++ bind-9.2.1-patched/etc/db.0 Sat Jan 26 04:04:33 2002
+diff -ru bind-9.2.1/etc/named.0 bind-9.2.1-patched/etc/named.0
+--- bind-9.2.1/etc/named.0 Sat Jan 26 04:13:34 2002
++++ bind-9.2.1-patched/etc/named.0 Sat Jan 26 04:04:33 2002
@@ -0,0 +1,12 @@
+;
+; BIND reverse data file for broadcast zone
@@ -14,9 +14,9 @@
+ 604800 ) ; Negative Cache TTL
+;
+@ IN NS localhost.
-diff -ru bind-9.2.1/etc/db.127 bind-9.2.1-patched/etc/db.127
---- bind-9.2.1/etc/db.127 Sat Jan 26 04:13:37 2002
-+++ bind-9.2.1-patched/etc/db.127 Sat Jan 26 04:04:33 2002
+diff -ru bind-9.2.1/etc/named.127 bind-9.2.1-patched/etc/named.127
+--- bind-9.2.1/etc/named.127 Sat Jan 26 04:13:37 2002
++++ bind-9.2.1-patched/etc/named.127 Sat Jan 26 04:04:33 2002
@@ -0,0 +1,13 @@
+;
+; BIND reverse data file for local loopback interface
@@ -31,9 +31,9 @@
+;
+@ IN NS localhost.
+1.0.0 IN PTR localhost.
-diff -ru bind-9.2.1/etc/db.255 bind-9.2.1-patched/etc/db.255
---- bind-9.2.1/etc/db.255 Sat Jan 26 04:13:39 2002
-+++ bind-9.2.1-patched/etc/db.255 Sat Jan 26 04:04:33 2002
+diff -ru bind-9.2.1/etc/named.255 bind-9.2.1-patched/etc/named.255
+--- bind-9.2.1/etc/named.255 Sat Jan 26 04:13:39 2002
++++ bind-9.2.1-patched/etc/named.255 Sat Jan 26 04:04:33 2002
@@ -0,0 +1,12 @@
+;
+; BIND reverse data file for broadcast zone
@@ -47,9 +47,9 @@
+ 604800 ) ; Negative Cache TTL
+;
+@ IN NS localhost.
-diff -ru bind-9.2.1/etc/db.local bind-9.2.1-patched/etc/db.local
---- bind-9.2.1/etc/db.local Sat Jan 26 04:13:42 2002
-+++ bind-9.2.1-patched/etc/db.local Sat Jan 26 04:04:33 2002
+diff -ru bind-9.2.1/etc/named.local bind-9.2.1-patched/etc/named.local
+--- bind-9.2.1/etc/named.local Sat Jan 26 04:13:42 2002
++++ bind-9.2.1-patched/etc/named.local Sat Jan 26 04:04:33 2002
@@ -0,0 +1,13 @@
+;
+; BIND data file for local loopback interface
@@ -64,93 +64,6 @@
+;
+@ IN NS localhost.
+@ IN A 127.0.0.1
-diff -ru bind-9.2.1/etc/db.root bind-9.2.1-patched/etc/db.root
---- bind-9.2.1/etc/db.root Sat Jan 26 04:13:45 2002
-+++ bind-9.2.1-patched/etc/db.root Sat Jan 26 04:04:33 2002
-@@ -0,0 +1,83 @@
-+; This file holds the information on root name servers needed to
-+; initialize cache of Internet domain name servers
-+; (e.g. reference this file in the "cache . <file>"
-+; configuration file of BIND domain name servers).
-+;
-+; This file is made available by InterNIC registration services
-+; under anonymous FTP as
-+; file /domain/named.root
-+; on server FTP.RS.INTERNIC.NET
-+; -OR- under Gopher at RS.INTERNIC.NET
-+; under menu InterNIC Registration Services (NSI)
-+; submenu InterNIC Registration Archives
-+; file named.root
-+;
-+; last update: Aug 22, 1997
-+; related version of root zone: 1997082200
-+;
-+;
-+; formerly NS.INTERNIC.NET
-+;
-+. 3600000 IN NS A.ROOT-SERVERS.NET.
-+A.ROOT-SERVERS.NET. 3600000 A 198.41.0.4
-+;
-+; formerly NS1.ISI.EDU
-+;
-+. 3600000 NS B.ROOT-SERVERS.NET.
-+B.ROOT-SERVERS.NET. 3600000 A 128.9.0.107
-+;
-+; formerly C.PSI.NET
-+;
-+. 3600000 NS C.ROOT-SERVERS.NET.
-+C.ROOT-SERVERS.NET. 3600000 A 192.33.4.12
-+;
-+; formerly TERP.UMD.EDU
-+;
-+. 3600000 NS D.ROOT-SERVERS.NET.
-+D.ROOT-SERVERS.NET. 3600000 A 128.8.10.90
-+;
-+; formerly NS.NASA.GOV
-+;
-+. 3600000 NS E.ROOT-SERVERS.NET.
-+E.ROOT-SERVERS.NET. 3600000 A 192.203.230.10
-+;
-+; formerly NS.ISC.ORG
-+;
-+. 3600000 NS F.ROOT-SERVERS.NET.
-+F.ROOT-SERVERS.NET. 3600000 A 192.5.5.241
-+;
-+; formerly NS.NIC.DDN.MIL
-+;
-+. 3600000 NS G.ROOT-SERVERS.NET.
-+G.ROOT-SERVERS.NET. 3600000 A 192.112.36.4
-+;
-+; formerly AOS.ARL.ARMY.MIL
-+;
-+. 3600000 NS H.ROOT-SERVERS.NET.
-+H.ROOT-SERVERS.NET. 3600000 A 128.63.2.53
-+;
-+; formerly NIC.NORDU.NET
-+;
-+. 3600000 NS I.ROOT-SERVERS.NET.
-+I.ROOT-SERVERS.NET. 3600000 A 192.36.148.17
-+;
-+; temporarily housed at NSI (InterNIC)
-+;
-+. 3600000 NS J.ROOT-SERVERS.NET.
-+J.ROOT-SERVERS.NET. 3600000 A 198.41.0.10
-+;
-+; housed in LINX, operated by RIPE NCC
-+;
-+. 3600000 NS K.ROOT-SERVERS.NET.
-+K.ROOT-SERVERS.NET. 3600000 A 193.0.14.129
-+;
-+; temporarily housed at ISI (IANA)
-+;
-+. 3600000 NS L.ROOT-SERVERS.NET.
-+L.ROOT-SERVERS.NET. 3600000 A 198.32.64.12
-+;
-+; housed in Japan, operated by WIDE
-+;
-+. 3600000 NS M.ROOT-SERVERS.NET.
-+M.ROOT-SERVERS.NET. 3600000 A 202.12.27.33
-+; End of File
diff -ru bind-9.2.1/etc/named.conf bind-9.2.1-patched/etc/named.conf
--- bind-9.2.1/etc/named.conf Sat Jan 26 04:13:28 2002
+++ bind-9.2.1-patched/etc/named.conf Sat Jan 26 04:06:40 2002
@@ -189,7 +102,7 @@
+// prime the server with knowledge of the root servers
+zone "." {
+ type hint;
-+ file "@FINKPREFIX@/etc/bind/db.root";
++ file "@FINKPREFIX@/etc/named.root";
+};
+
+// be authoritative for the localhost forward and reverse zones, and for
@@ -197,22 +110,22 @@
+
+zone "localhost" {
+ type master;
-+ file "@FINKPREFIX@/etc/bind/db.local";
++ file "@FINKPREFIX@/etc/named.local";
+};
+
+zone "127.in-addr.arpa" {
+ type master;
-+ file "@FINKPREFIX@/etc/bind/db.127";
++ file "@FINKPREFIX@/etc/named.127";
+};
+
+zone "0.in-addr.arpa" {
+ type master;
-+ file "@FINKPREFIX@/etc/bind/db.0";
++ file "@FINKPREFIX@/etc/named.0";
+};
+
+zone "255.in-addr.arpa" {
+ type master;
-+ file "@FINKPREFIX@/etc/bind/db.255";
++ file "@FINKPREFIX@/etc/named.255";
+};
+
+// add entries for other zones below here
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
