OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael van Elst
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web openpkg$ Date: 06-Jun-2003 11:20:27
Branch: HEAD Handle: 2003060610202402
Modified files:
openpkg-re/vcheck vc.bind
openpkg-src/bind bind.spec
openpkg-web news.txt
Log:
upgrade DLZ 0.40 -> 0.50 with ODBC support, fix dlz_postgres linking
Summary:
Revision Changes Path
1.11 +1 -1 openpkg-re/vcheck/vc.bind
1.54 +16 -11 openpkg-src/bind/bind.spec
1.4751 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-re/vcheck/vc.bind
============================================================================
$ cvs diff -u -r1.10 -r1.11 vc.bind
--- openpkg-re/vcheck/vc.bind 3 May 2003 18:13:23 -0000 1.10
+++ openpkg-re/vcheck/vc.bind 6 Jun 2003 09:20:24 -0000 1.11
@@ -10,7 +10,7 @@
regex = bind-(__VER__)\.tar\.gz
}
prog bind:DLZ = {
- version = 0.4.3
+ version = 0.5.0
url = http://osdn.dl.sourceforge.net/bind-dlz/
regex = DLZ-(__VER__)\.tar\.gz
}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/bind/bind.spec
============================================================================
$ cvs diff -u -r1.53 -r1.54 bind.spec
--- openpkg-src/bind/bind.spec 3 May 2003 18:13:27 -0000 1.53
+++ openpkg-src/bind/bind.spec 6 Jun 2003 09:20:26 -0000 1.54
@@ -25,7 +25,7 @@
# package versions
%define V_bind 9.2.2
-%define V_dlz 0.4.3
+%define V_dlz 0.5.0
# package information
Name: bind
@@ -37,7 +37,7 @@
Group: DNS
License: ISC
Version: %{V_bind}
-Release: 20030503
+Release: 20030606
# package options
%option with_dlz_mysql no
@@ -45,9 +45,10 @@
%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"
+%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"
%define with_dlz yes
%else
%define with_dlz no
@@ -82,6 +83,10 @@
BuildPreReq: db
PreReq: db
%endif
+%if "%{with_dlz_odbc}" == "yes"
+BuildPreReq: unixodbc
+PreReq: unixodbc
+%endif
AutoReq: no
AutoReqProv: no
Conflicts: bind8
@@ -96,26 +101,21 @@
%prep
%setup -q
%if "%{with_dlz}" == "yes"
- echo "WITH DLZ"
%setup -q -T -D -a 10
#
%{l_patch} -p1 <dlz.patch
#
- # fix up DLZ link libraries for MYSQL
+ # fix up DLZ link libraries for MYSQL and Postgres
%{l_shtool} subst \
-e '/-lmysqlclient/s;-l\(nsl\|z\|crypt\|m\)\( \|"\);\2;g' \
+ -e 's;\(-lpq\);\1 -lssl -lcrypto;g' \
configure
%endif
-%if "%{with_dlz_bdb}" != "yes"
- # dlzbdb still doesn't link if not enabled
- %{l_shtool} subst \
- -e 's;dlzbdb *;;g' \
- bin/Makefile.in
-%endif
%build
cf=""
lf=""
+ li=""
%if "%{with_dlz_mysql}" == "yes"
cf=`mysql_config --cflags`
cf=`eval echo $cf`
@@ -153,6 +153,11 @@
--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 \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.4750 -r1.4751 news.txt
--- openpkg-web/news.txt 6 Jun 2003 08:15:42 -0000 1.4750
+++ openpkg-web/news.txt 6 Jun 2003 09:20:25 -0000 1.4751
@@ -1,3 +1,4 @@
+06-Jun-2003: Upgraded package: P<bind-9.2.2-20030606>
06-Jun-2003: Upgraded package: P<dss-4.1.3-20030606>
06-Jun-2003: Upgraded package: P<perl-xml-20030606-20030606>
06-Jun-2003: Upgraded package: P<rt-3.0.2-20030606>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
