OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 27-Jun-2005 14:19:11
Branch: HEAD Handle: 2005062713191100
Modified files:
openpkg-src/bind bind.spec
Log:
The DLZ patch is not maintained since April 2004 and hence our DLZ
support is broken since over one year (DLZ 0.7.0 doesn't work with
newer BIND versions), so finally kick out the DLZ support at all. If a
newer DLZ patch is available in the future, this DLZ support can be
readded again, of course. But for now just remove all of the broken
stuff.
Summary:
Revision Changes Path
1.106 +5 -114 openpkg-src/bind/bind.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/bind/bind.spec
============================================================================
$ cvs diff -u -r1.105 -r1.106 bind.spec
--- openpkg-src/bind/bind.spec 27 May 2005 12:20:35 -0000 1.105
+++ openpkg-src/bind/bind.spec 27 Jun 2005 12:19:11 -0000 1.106
@@ -22,10 +22,6 @@
## SUCH DAMAGE.
##
-# package versions
-%define V_bind 9.3.1
-%define V_dlz 0.7.0
-
# package information
Name: bind
Summary: Berkeley Internet Name Domain (BIND)
@@ -36,26 +32,11 @@
Class: BASE
Group: DNS
License: ISC
-Version: %{V_bind}
-Release: 20050527
-
-# package options
-%option with_dlz no
-%option with_dlz_mysql no
-%option with_dlz_postgres no
-%option with_dlz_filesystem no
-%option with_dlz_stub no
-%option with_dlz_bdb no
-%option with_dlz_odbc no
-
-# aggregate option
-%if "%{with_dlz_mysql}" == "yes" || "%{with_dlz_postgres}" == "yes" ||
"%{with_dlz_filesystem}" == "yes" || "%{with_dlz_stub}" == "yes" ||
"%{with_dlz_bdb}" == "yes" || "%{with_dlz_odbc}" == "yes"
-%undefine with_dlz
-%define with_dlz yes
-%endif
+Version: 9.3.1
+Release: 20050627
# list of sources
-Source0: ftp://ftp.isc.org/isc/bind9/%{version}/bind-%{V_bind}.tar.gz
+Source0: ftp://ftp.isc.org/isc/bind9/%{version}/bind-%{version}.tar.gz
Source2: db.root
Source3: db.root.sh
Source4: db.localhost
@@ -64,7 +45,6 @@
Source7: named.conf
Source8: rndc.conf
Source9: rc.bind
-Source10: http://prdownloads.sourceforge.net/bind-dlz/DLZ-%{V_dlz}.tar.gz
# build information
Prefix: %{l_prefix}
@@ -73,26 +53,6 @@
PreReq: OpenPKG, openpkg >= 20040130
BuildPreReq: openssl
PreReq: openssl
-%if "%{with_dlz}" == "yes"
-# FIXME: rse: autoconf dependency can be removed once DLZ patch is
available for 9.2.3
-BuildPreReq: autoconf
-%endif
-%if "%{with_dlz_mysql}" == "yes"
-BuildPreReq: mysql
-PreReq: mysql
-%endif
-%if "%{with_dlz_postgres}" == "yes"
-BuildPreReq: postgresql
-PreReq: postgresql
-%endif
-%if "%{with_dlz_bdb}" == "yes"
-BuildPreReq: db
-PreReq: db
-%endif
-%if "%{with_dlz_odbc}" == "yes"
-BuildPreReq: unixodbc
-PreReq: unixodbc
-%endif
AutoReq: no
AutoReqProv: no
Conflicts: bind8, powerdns
@@ -113,90 +73,21 @@
url = ftp://ftp.isc.org/isc/bind9/__NEWVER__/
regex = bind-(__VER__)\.tar\.gz
}
- prog bind:DLZ = {
- version = %{V_dlz}
- url = http://prdownloads.sourceforge.net/bind-dlz/
- regex = DLZ-(__VER__)\.tar\.gz
- }
%prep
%setup -q
-%if "%{with_dlz}" == "yes"
- %setup -q -T -D -a 10
- # FIXME: rse: sed hacks can be removed once DLZ patch is available for
9.2.3
- sed -e '/^diff -Naur.*\/configure$/,/^diff/d' \
- -e '/^diff -Naur.*lib\/dns\/win32\/libdns\.def$/,/^diff/d' \
- <dlz.patch | %{l_patch} -p1
- autoconf
- # fix up DLZ link libraries for MySQL and PostgreSQL
- %{l_shtool} subst \
- -e '/-lmysqlclient/s;-lnsl\([ "]\);\1;g' \
- -e '/-lmysqlclient/s;-lz\([ "]\);\1;g' \
- -e '/-lmysqlclient/s;-lcrypt\([ "]\);\1;g' \
- -e '/-lmysqlclient/s;-lm\([ "]\);\1;g' \
- -e 's;\(use_dlz_bdb/lib/lib..d.\)\.so;\1.a;g' \
- -e 's;\(-lpq\);\1 -lssl -lcrypto -lcrypt;g' \
- -e 's;\(\$use_dlz_postgres/include\);\1/postgresql;g' \
- configure
-%endif
%{l_shtool} subst \
-e '/LINENO: error: C[+]* preprocessor/{N;N;N;N;s/.*/:/;}' \
configure
%build
- cf=""
- lf=""
- li=""
-%if "%{with_dlz_mysql}" == "yes"
- cf="$cf `mysql_config --cflags`"
- lf="$lf `mysql_config --libs`"
-%endif
-%if "%{with_dlz_postgres}" == "yes"
- case "%{l_platform -t}" in
- *-sunos5*) li="$li -lresolv" ;;
- esac
-%endif
- cf=`eval echo $cf`
- lf=`eval echo $lf`
- li=`eval echo $li`
CC="%{l_cc}" \
- CFLAGS="%{l_cflags -O} $cf" \
- LDFLAGS="%{l_ldflags} $lf" \
- LIBS="$li" \
+ CFLAGS="%{l_cflags -O}" \
+ LDFLAGS="%{l_ldflags}" \
./configure \
--prefix=%{l_prefix} \
--sysconfdir=%{l_prefix}/etc/bind \
--localstatedir=%{l_prefix}/var/bind \
-%if "%{with_dlz_mysql}" == "yes"
- --with-dlz-mysql="%{l_prefix}" \
-%else
- --with-dlz-mysql=no \
-%endif
-%if "%{with_dlz_postgres}" == "yes"
- --with-dlz-postgres="%{l_prefix}" \
-%else
- --with-dlz-postgres=no \
-%endif
-%if "%{with_dlz_bdb}" == "yes"
- --with-dlz-bdb="%{l_prefix}" \
-%else
- --with-dlz-bdb=no \
-%endif
-%if "%{with_dlz_filesystem}" == "yes"
- --with-dlz-filesystem=yes \
-%else
- --with-dlz-filesystem=no \
-%endif
-%if "%{with_dlz_stub}" == "yes"
- --with-dlz-stub=yes \
-%else
- --with-dlz-stub=no \
-%endif
-%if "%{with_dlz_odbc}" == "yes"
- --with-dlz-odbc="%{l_prefix}" \
-%else
- --with-dlz-odbc=no \
-%endif
--with-openssl=%{l_prefix} \
--with-libtool \
--without-libbind \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
