rpms/bind/devel bind-96-libtool2-libbind.patch, NONE, 1.1 bind-96-libtool2.patch, NONE, 1.1 bind-96-old-api.patch, NONE, 1.1 bind.spec, 1.286, 1.287 ldap2zone.c, 1.1, 1.2
Adam Tkac
atkac at fedoraproject.org
Mon Nov 24 12:59:45 UTC 2008
- Previous message (by thread): rpms/chrony/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 chrony-1.23-gitbe42b4.patch, 1.1, NONE getdate.y, 1.1, NONE
- Next message (by thread): rpms/chrony/F-10 chrony-1.23-gethost.patch, NONE, 1.1 chrony-1.23-ppc.patch, NONE, 1.1 chrony-1.23-res.patch, NONE, 1.1 chrony.conf, NONE, 1.1 chrony.keys, NONE, 1.1 chrony.logrotate, NONE, 1.1 chrony.spec, NONE, 1.1 chronyd.init, NONE, 1.1 chronyd.sysconfig, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: atkac
Update of /cvs/pkgs/rpms/bind/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28162
Modified Files:
bind.spec ldap2zone.c
Added Files:
bind-96-libtool2-libbind.patch bind-96-libtool2.patch
bind-96-old-api.patch
Log Message:
- updates due libtool 2.2.6
- don't pass -DLDAP_DEPRECATED to cpp, handle it directly in sources
bind-96-libtool2-libbind.patch:
--- NEW FILE bind-96-libtool2-libbind.patch ---
diff -up bind-9.6.0b1/lib/bind/configure.in.libtool2-libbind bind-9.6.0b1/lib/bind/configure.in
--- bind-9.6.0b1/lib/bind/configure.in.libtool2-libbind 2008-11-24 13:11:18.000000000 +0100
+++ bind-9.6.0b1/lib/bind/configure.in 2008-11-24 13:11:41.000000000 +0100
@@ -20,6 +20,8 @@ AC_PREREQ(2.13)
AC_CONFIG_HEADER(config.h)
+AC_CONFIG_MACRO_DIR([m4])
+
AC_CANONICAL_HOST
AC_PROG_MAKE_SET
bind-96-libtool2.patch:
--- NEW FILE bind-96-libtool2.patch ---
diff -up bind-9.6.0b1/configure.in.libtool2 bind-9.6.0b1/configure.in
--- bind-9.6.0b1/configure.in.libtool2 2008-11-24 13:05:37.000000000 +0100
+++ bind-9.6.0b1/configure.in 2008-11-24 13:05:56.000000000 +0100
@@ -27,6 +27,8 @@ AC_CONFIG_SUBDIRS(lib/bind)
AC_CONFIG_HEADER(config.h)
+AC_CONFIG_MACRO_DIR([m4])
+
AC_CANONICAL_HOST
AC_PROG_MAKE_SET
diff -up bind-9.6.0b1/Makefile.in.libtool2 bind-9.6.0b1/Makefile.in
bind-96-old-api.patch:
--- NEW FILE bind-96-old-api.patch ---
diff -up bind-9.6.0b1/contrib/sdb/ldap/ldapdb.c.old-api bind-9.6.0b1/contrib/sdb/ldap/ldapdb.c
--- bind-9.6.0b1/contrib/sdb/ldap/ldapdb.c.old-api 2008-11-24 13:28:13.000000000 +0100
+++ bind-9.6.0b1/contrib/sdb/ldap/ldapdb.c 2008-11-24 13:28:23.000000000 +0100
@@ -25,6 +25,7 @@
/* Using LDAPv3 by default, change this if you want v2 */
#ifndef LDAPDB_LDAP_VERSION
#define LDAPDB_LDAP_VERSION 3
+#define LDAP_DEPRECATED 1
#endif
#include <config.h>
diff -up bind-9.6.0b1/contrib/sdb/ldap/zone2ldap.c.old-api bind-9.6.0b1/contrib/sdb/ldap/zone2ldap.c
--- bind-9.6.0b1/contrib/sdb/ldap/zone2ldap.c.old-api 2008-11-24 13:29:05.000000000 +0100
+++ bind-9.6.0b1/contrib/sdb/ldap/zone2ldap.c 2008-11-24 13:29:14.000000000 +0100
@@ -13,6 +13,8 @@
* ditched dNSDomain2 schema support. Version 0.3-ALPHA
*/
+#define LDAP_DEPRECATED 1
+
#include <errno.h>
#include <string.h>
#include <stdlib.h>
Index: bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/bind.spec,v
retrieving revision 1.286
retrieving revision 1.287
diff -u -r1.286 -r1.287
--- bind.spec 11 Nov 2008 14:39:31 -0000 1.286
+++ bind.spec 24 Nov 2008 12:59:15 -0000 1.287
@@ -18,7 +18,7 @@
Name: bind
License: ISC
Version: 9.6.0
-Release: 0.2.%{PREVER}%{?dist}
+Release: 0.2.1.%{PREVER}%{?dist}
Epoch: 32
Url: http://www.isc.org/products/BIND/
Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -60,8 +60,11 @@
Patch96: bind-95-rh469440.patch
%if %{LIBBIND}
Patch97: bind-96-temporary-libbind.patch
+Patch100:bind-96-libtool2-libbind.patch
%endif
Patch98: bind-96-libxml2.patch
+Patch99: bind-96-libtool2.patch
+Patch101:bind-96-old-api.patch
# SDB patches
Patch11: bind-9.3.2b2-sdbsrc.patch
@@ -185,6 +188,7 @@
%patch10 -p1 -b .PIE
%patch16 -p1 -b .redhat_doc
%if %{SDB}
+%patch101 -p1 -b .old-api
mkdir bin/named-sdb
cp -r bin/named/* bin/named-sdb
%patch11 -p1 -b .sdbsrc
@@ -231,6 +235,14 @@
%patch96 -p1 -b .rh469440
%patch98 -p1 -b .libxml2
+# XXX due new libtool. Not sure about proper upstream approach yet.
+mkdir m4
+%patch99 -p1 -b .libtool2
+%if %{LIBBIND}
+mkdir lib/bind/m4
+%patch100 -p1 -b .libtool2-libbind
+%endif
+
# Sparc and s390 arches need to use -fPIE
%ifarch sparcv9 sparc64 s390 s390x
for i in bin/named{,-sdb}/{,unix}/Makefile.in; do
@@ -242,20 +254,20 @@
%build
export CFLAGS="$CFLAGS $RPM_OPT_FLAGS"
-export CPPFLAGS="$CPPFLAGS -DLDAP_DEPRECATED -D_GNU_SOURCE"
+export CPPFLAGS="$CPPFLAGS"
export STD_CFLAGS="$CPPFLAGS"
sed -i -e \
's/RELEASEVER=\(.*\)/RELEASEVER=\1-RedHat-%{version}-%{release}/' \
version
-libtoolize -c -f; aclocal --force; autoheader -f; autoconf -f
+%if %{LIBBIND}
+pushd lib/bind
+libtoolize -c -f; aclocal -I m4 --force; autoconf -f
+popd
+%endif
+libtoolize -c -f; aclocal -I m4 --force; autoheader -f; autoconf -f
-if pkg-config openssl ; then
- export CFLAGS="$CFLAGS `pkg-config --cflags openssl`"
- export CPPFLAGS="$CPPFLAGS `pkg-config --cflags-only-I openssl`"
- export LDFLAGS="$LDFLAGS `pkg-config --libs-only-L openssl`"
-fi
%configure \
--with-libtool \
--localstatedir=/var \
@@ -275,7 +287,6 @@
--disable-isc-spnego \
%endif
;
-if [ -s openssl_config.h ]; then cat openssl_config.h >> config.h ; fi;
make %{?_smp_mflags}
%if %{test}
@@ -589,6 +600,10 @@
%ghost %{chroot_prefix}/etc/localtime
%changelog
+* Mon Nov 24 2008 Adam Tkac <atkac redhat com> 32:9.6.0-0.2.1.b1
+- updates due libtool 2.2.6
+- don't pass -DLDAP_DEPRECATED to cpp, handle it directly in sources
+
* Tue Nov 11 2008 Adam Tkac <atkac redhat com> 32:9.6.0-0.2.b1
- make statistics http server working, patch backported from 9.6 HEAD
Index: ldap2zone.c
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/ldap2zone.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ldap2zone.c 24 Jul 2007 15:18:00 -0000 1.1
+++ ldap2zone.c 24 Nov 2008 12:59:15 -0000 1.2
@@ -7,6 +7,8 @@
* copyright notice and this permission notice appear in all copies.
*/
+#define LDAP_DEPRECATED 1
+
#include <sys/types.h>
#include <stdio.h>
#include <stdlib.h>
- Previous message (by thread): rpms/chrony/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 chrony-1.23-gitbe42b4.patch, 1.1, NONE getdate.y, 1.1, NONE
- Next message (by thread): rpms/chrony/F-10 chrony-1.23-gethost.patch, NONE, 1.1 chrony-1.23-ppc.patch, NONE, 1.1 chrony-1.23-res.patch, NONE, 1.1 chrony.conf, NONE, 1.1 chrony.keys, NONE, 1.1 chrony.logrotate, NONE, 1.1 chrony.spec, NONE, 1.1 chronyd.init, NONE, 1.1 chronyd.sysconfig, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list