Update to 9.9.3rc1

- bind-96-libtool2.patch has been merged
- fix bind tmpfiles.d for named.pid /run migration (#920713)

Signed-off-by: Adam Tkac <atkac@redhat.com>
This commit is contained in:
Adam Tkac 2013-04-16 15:39:46 +02:00
parent 31f953d106
commit c9b9417fb2
8 changed files with 352 additions and 360 deletions

1
.gitignore vendored
View File

@ -30,3 +30,4 @@ bind-9.7.2b1.tar.gz
/config-9.tar.bz2
/config-10.tar.bz2
/bind-9.9.2-P2.tar.gz
/bind-9.9.3rc1.tar.gz

View File

@ -1,21 +1,21 @@
diff -up bind-9.9.2/bin/Makefile.in.sdb bind-9.9.2/bin/Makefile.in
--- bind-9.9.2/bin/Makefile.in.sdb 2012-09-27 02:35:19.000000000 +0200
+++ bind-9.9.2/bin/Makefile.in 2012-10-11 13:23:43.933988077 +0200
diff -up bind-9.9.3rc1/bin/Makefile.in.sdb bind-9.9.3rc1/bin/Makefile.in
--- bind-9.9.3rc1/bin/Makefile.in.sdb 2013-04-05 00:21:21.000000000 +0200
+++ bind-9.9.3rc1/bin/Makefile.in 2013-04-16 15:21:22.286944331 +0200
@@ -19,8 +19,8 @@ srcdir = @srcdir@
VPATH = @srcdir@
top_srcdir = @top_srcdir@
-SUBDIRS = named rndc dig dnssec tests tools nsupdate \
-SUBDIRS = named rndc dig dnssec tools tests nsupdate \
- check confgen @PYTHON_TOOLS@ @PKCS11_TOOLS@
+SUBDIRS = named named-sdb rndc dig dnssec tests tools nsupdate \
+SUBDIRS = named named-sdb rndc dig dnssec tools tests nsupdate \
+ check confgen @PYTHON_TOOLS@ @PKCS11_TOOLS@ sdb_tools
TARGETS =
@BIND9_MAKE_RULES@
diff -up bind-9.9.2/bin/named/Makefile.in.sdb bind-9.9.2/bin/named/Makefile.in
--- bind-9.9.2/bin/named/Makefile.in.sdb 2012-10-11 13:21:35.877105690 +0200
+++ bind-9.9.2/bin/named/Makefile.in 2012-10-11 13:21:36.099105521 +0200
@@ -45,7 +45,7 @@ CINCLUDES = -I${srcdir}/include -I${srcd
diff -up bind-9.9.3rc1/bin/named/Makefile.in.sdb bind-9.9.3rc1/bin/named/Makefile.in
--- bind-9.9.3rc1/bin/named/Makefile.in.sdb 2013-04-16 15:21:22.102944727 +0200
+++ bind-9.9.3rc1/bin/named/Makefile.in 2013-04-16 15:21:22.286944331 +0200
@@ -49,7 +49,7 @@ CINCLUDES = -I${srcdir}/include -I${srcd
${ISCCFG_INCLUDES} ${ISCCC_INCLUDES} ${ISC_INCLUDES} \
${DLZDRIVER_INCLUDES} ${DBDRIVER_INCLUDES} @DST_OPENSSL_INC@
@ -24,7 +24,7 @@ diff -up bind-9.9.2/bin/named/Makefile.in.sdb bind-9.9.2/bin/named/Makefile.in
CWARNINGS =
@@ -69,11 +69,11 @@ DEPLIBS = ${LWRESDEPLIBS} ${DNSDEPLIBS}
@@ -73,11 +73,11 @@ DEPLIBS = ${LWRESDEPLIBS} ${DNSDEPLIBS}
LIBS = ${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \
${ISCCFGLIBS} ${ISCCCLIBS} ${ISCLIBS} \
@ -38,7 +38,7 @@ diff -up bind-9.9.2/bin/named/Makefile.in.sdb bind-9.9.2/bin/named/Makefile.in
SUBDIRS = unix
@@ -86,8 +86,7 @@ OBJS = builtin.@O@ client.@O@ config.@O
@@ -90,8 +90,7 @@ OBJS = builtin.@O@ client.@O@ config.@O
tkeyconf.@O@ tsigconf.@O@ update.@O@ xfrout.@O@ \
zoneconf.@O@ \
lwaddr.@O@ lwresd.@O@ lwdclient.@O@ lwderror.@O@ lwdgabn.@O@ \
@ -48,7 +48,7 @@ diff -up bind-9.9.2/bin/named/Makefile.in.sdb bind-9.9.2/bin/named/Makefile.in
UOBJS = unix/os.@O@ unix/dlz_dlopen_driver.@O@
@@ -100,8 +99,7 @@ SRCS = builtin.c client.c config.c cont
@@ -104,8 +103,7 @@ SRCS = builtin.c client.c config.c cont
tkeyconf.c tsigconf.c update.c xfrout.c \
zoneconf.c \
lwaddr.c lwresd.c lwdclient.c lwderror.c lwdgabn.c \
@ -58,15 +58,17 @@ diff -up bind-9.9.2/bin/named/Makefile.in.sdb bind-9.9.2/bin/named/Makefile.in
MANPAGES = named.8 lwresd.8 named.conf.5
@@ -169,5 +167,3 @@ install:: named@EXEEXT@ lwresd@EXEEXT@ i
${INSTALL_DATA} ${srcdir}/named.8 ${DESTDIR}${mandir}/man8
@@ -180,7 +178,5 @@ install:: named@EXEEXT@ lwresd@EXEEXT@ i
${INSTALL_DATA} ${srcdir}/lwresd.8 ${DESTDIR}${mandir}/man8
${INSTALL_DATA} ${srcdir}/named.conf.5 ${DESTDIR}${mandir}/man5
-
-@DLZ_DRIVER_RULES@
diff -up bind-9.9.2/bin/named-sdb/main.c.sdb bind-9.9.2/bin/named-sdb/main.c
--- bind-9.9.2/bin/named-sdb/main.c.sdb 2012-10-11 13:21:36.052105556 +0200
+++ bind-9.9.2/bin/named-sdb/main.c 2012-10-11 13:21:36.099105521 +0200
-
named-symtbl.@O@: named-symtbl.c
${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} -c named-symtbl.c
diff -up bind-9.9.3rc1/bin/named-sdb/main.c.sdb bind-9.9.3rc1/bin/named-sdb/main.c
--- bind-9.9.3rc1/bin/named-sdb/main.c.sdb 2013-04-16 15:21:22.249944411 +0200
+++ bind-9.9.3rc1/bin/named-sdb/main.c 2013-04-16 15:21:22.287944329 +0200
@@ -83,6 +83,9 @@
* Include header files for database drivers here.
*/
@ -77,7 +79,7 @@ diff -up bind-9.9.2/bin/named-sdb/main.c.sdb bind-9.9.2/bin/named-sdb/main.c
#ifdef CONTRIB_DLZ
/*
@@ -802,6 +805,10 @@ setup(void) {
@@ -808,6 +811,10 @@ setup(void) {
ns_main_earlyfatal("isc_app_start() failed: %s",
isc_result_totext(result));
@ -86,9 +88,9 @@ diff -up bind-9.9.2/bin/named-sdb/main.c.sdb bind-9.9.2/bin/named-sdb/main.c
+ dirdb_clear();
+
isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
ISC_LOG_NOTICE, "starting BIND %s%s", ns_g_version,
saved_command_line);
@@ -914,6 +921,57 @@ setup(void) {
ISC_LOG_NOTICE, "starting %s %s%s", ns_g_product,
ns_g_version, saved_command_line);
@@ -920,6 +927,57 @@ setup(void) {
isc_result_totext(result));
#endif
@ -146,7 +148,7 @@ diff -up bind-9.9.2/bin/named-sdb/main.c.sdb bind-9.9.2/bin/named-sdb/main.c
ns_server_create(ns_g_mctx, &ns_g_server);
}
@@ -945,6 +1003,10 @@ cleanup(void) {
@@ -951,6 +1009,10 @@ cleanup(void) {
dns_name_destroy();
@ -157,10 +159,10 @@ diff -up bind-9.9.2/bin/named-sdb/main.c.sdb bind-9.9.2/bin/named-sdb/main.c
isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
ISC_LOG_NOTICE, "exiting");
ns_log_shutdown();
diff -up bind-9.9.2/bin/named-sdb/Makefile.in.sdb bind-9.9.2/bin/named-sdb/Makefile.in
--- bind-9.9.2/bin/named-sdb/Makefile.in.sdb 2012-10-11 13:21:36.045105563 +0200
+++ bind-9.9.2/bin/named-sdb/Makefile.in 2012-10-11 13:21:36.100105520 +0200
@@ -28,10 +28,10 @@ top_srcdir = @top_srcdir@
diff -up bind-9.9.3rc1/bin/named-sdb/Makefile.in.sdb bind-9.9.3rc1/bin/named-sdb/Makefile.in
--- bind-9.9.3rc1/bin/named-sdb/Makefile.in.sdb 2013-04-16 15:21:22.243944424 +0200
+++ bind-9.9.3rc1/bin/named-sdb/Makefile.in 2013-04-16 15:21:22.287944329 +0200
@@ -32,10 +32,10 @@ top_srcdir = @top_srcdir@
#
# Add database drivers here.
#
@ -174,7 +176,7 @@ diff -up bind-9.9.2/bin/named-sdb/Makefile.in.sdb bind-9.9.2/bin/named-sdb/Makef
DLZ_DRIVER_DIR = ${top_srcdir}/contrib/dlz/drivers
@@ -77,7 +77,7 @@ NOSYMLIBS = ${LWRESLIBS} ${DNSLIBS} ${BI
@@ -81,7 +81,7 @@ NOSYMLIBS = ${LWRESLIBS} ${DNSLIBS} ${BI
SUBDIRS = unix
@ -183,7 +185,7 @@ diff -up bind-9.9.2/bin/named-sdb/Makefile.in.sdb bind-9.9.2/bin/named-sdb/Makef
OBJS = builtin.@O@ client.@O@ config.@O@ control.@O@ \
controlconf.@O@ interfacemgr.@O@ \
@@ -132,7 +132,7 @@ config.@O@: config.c bind.keys.h
@@ -139,7 +139,7 @@ config.@O@: config.c bind.keys.h
-DNS_SYSCONFDIR=\"${sysconfdir}\" \
-c ${srcdir}/config.c
@ -192,7 +194,7 @@ diff -up bind-9.9.2/bin/named-sdb/Makefile.in.sdb bind-9.9.2/bin/named-sdb/Makef
export MAKE_SYMTABLE="yes"; \
export BASEOBJS="${OBJS} ${UOBJS}"; \
${FINALBUILDCMD}
@@ -160,14 +160,8 @@ statschannel.@O@: bind9.xsl.h
@@ -170,15 +170,9 @@ statschannel.@O@: bind9.xsl.h bind9.ver3
installdirs:
$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${sbindir}
@ -209,10 +211,11 @@ diff -up bind-9.9.2/bin/named-sdb/Makefile.in.sdb bind-9.9.2/bin/named-sdb/Makef
+ ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named-sdb@EXEEXT@ ${DESTDIR}${sbindir}
@DLZ_DRIVER_RULES@
diff -up bind-9.9.2/configure.in.sdb bind-9.9.2/configure.in
--- bind-9.9.2/configure.in.sdb 2012-10-11 13:21:36.000000000 +0200
+++ bind-9.9.2/configure.in 2012-10-11 13:24:35.710940464 +0200
@@ -3571,11 +3571,14 @@ AC_CONFIG_FILES([
diff -up bind-9.9.3rc1/configure.in.sdb bind-9.9.3rc1/configure.in
--- bind-9.9.3rc1/configure.in.sdb 2013-04-16 15:21:22.208944499 +0200
+++ bind-9.9.3rc1/configure.in 2013-04-16 15:21:19.395950103 +0200
@@ -3651,12 +3651,15 @@ AC_CONFIG_FILES([
bin/dnssec/Makefile
bin/named/Makefile
bin/named/unix/Makefile
@ -222,6 +225,7 @@ diff -up bind-9.9.2/configure.in.sdb bind-9.9.2/configure.in
bin/pkcs11/Makefile
bin/python/Makefile
bin/python/dnssec-checkds.py
bin/python/dnssec-coverage.py
bin/rndc/Makefile
+ bin/sdb_tools/Makefile
bin/tests/Makefile

View File

@ -1,13 +0,0 @@
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

View File

@ -2,11 +2,11 @@
# Red Hat BIND package .spec file
#
%global PATCHVER P2
#%%global PREVER rc2
#%%global VERSION %{version}%{PREVER}
#%%global PATCHVER P2
%global PREVER rc1
%global VERSION %{version}%{PREVER}
#%%global VERSION %{version}
%global VERSION %{version}-%{PATCHVER}
#%%global VERSION %{version}-%{PATCHVER}
%{?!SDB: %global SDB 1}
%{?!test: %global test 0}
@ -25,8 +25,8 @@
Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) server
Name: bind
License: ISC
Version: 9.9.2
Release: 12.%{PATCHVER}%{?dist}
Version: 9.9.3
Release: 0.1.%{PREVER}%{?dist}
Epoch: 32
Url: http://www.isc.org/products/BIND/
Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -61,7 +61,6 @@ Patch10: bind-9.5-PIE.patch
Patch16: bind-9.3.2-redhat_doc.patch
Patch72: bind-9.5-dlz-64bit.patch
Patch87: bind-9.5-parallel-build.patch
Patch99: bind-96-libtool2.patch
Patch101:bind-96-old-api.patch
Patch102:bind-95-rh452060.patch
Patch106:bind93-rh490837.patch
@ -80,7 +79,7 @@ Patch131:bind-9.9.1-P2-multlib-conflict.patch
Patch132:bind99-stat.patch
Patch133:bind99-rh640538.patch
Patch134:bind97-rh669163.patch
Patch136:rl-9.9.2-P1.patch
Patch136:rl-9.9.3rc1.patch
# SDB patches
Patch11: bind-9.3.2b2-sdbsrc.patch
@ -261,10 +260,6 @@ Based on the code from Jan "Yenya" Kasprzak <kas@fi.muni.cz>
%patch87 -p1 -b .parallel
%patch94 -p1 -b .rh461409
# XXX due new libtool. Not sure about proper upstream approach yet.
mkdir m4
%patch99 -p1 -b .libtool2
%patch102 -p1 -b .rh452060
%patch106 -p0 -b .rh490837
%patch107 -p1 -b .dist-pkcs11
@ -281,7 +276,7 @@ popd
%patch127 -p1 -b .forward
%patch130 -p1 -b .libdb4
%patch131 -p1 -b .multlib-conflict
%patch136 -p1 -b .rl
%patch136 -p0 -b .rl
%if %{SDB}
%patch101 -p1 -b .old-api
@ -337,7 +332,7 @@ sed -i -e \
's/RELEASEVER=\(.*\)/RELEASEVER=\1-RedHat-%{version}-%{release}/' \
version
libtoolize -c -f; aclocal -I m4 --force; autoconf -f
libtoolize -c -f; aclocal -I libtool.m4 --force; autoconf -f
%configure \
--with-libtool \
@ -374,6 +369,9 @@ make %{?_smp_mflags}
pushd bin/dig
make man
popd
pushd bin/python
make man
popd
%if %{test}
%check
@ -776,6 +774,11 @@ rm -rf ${RPM_BUILD_ROOT}
%endif
%changelog
* Tue Apr 16 2013 Adam Tkac <atkac redhat com> 32:9.9.3-0.1.rc1
- update to 9.9.3rc1
- bind-96-libtool2.patch has been merged
- fix bind tmpfiles.d for named.pid /run migration (#920713)
* Wed Mar 27 2013 Tomas Hozza <thozza@redhat.com> 32:9.9.2-12.P2
- New upstream patch version fixing CVE-2013-2266 (#928032)

View File

@ -1 +1 @@
d /var/run/named 0755 named named -
d /run/named 0755 named named -

View File

@ -1,6 +1,6 @@
diff -up bind-9.7.2-P2/isc-config.sh.in.exportlib bind-9.7.2-P2/isc-config.sh.in
--- bind-9.7.2-P2/isc-config.sh.in.exportlib 2007-06-20 01:46:59.000000000 +0200
+++ bind-9.7.2-P2/isc-config.sh.in 2010-10-20 14:05:25.423861548 +0200
diff -up bind-9.9.3rc1/isc-config.sh.in.exportlib bind-9.9.3rc1/isc-config.sh.in
--- bind-9.9.3rc1/isc-config.sh.in.exportlib 2013-04-05 00:21:21.000000000 +0200
+++ bind-9.9.3rc1/isc-config.sh.in 2013-04-16 14:37:36.221590545 +0200
@@ -20,6 +20,8 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
@ -27,9 +27,9 @@ diff -up bind-9.7.2-P2/isc-config.sh.in.exportlib bind-9.7.2-P2/isc-config.sh.in
if test x"$liblwres" = x"true" ; then
libs="$libs -llwres"
fi
diff -up bind-9.7.2-P2/lib/export/dns/Makefile.in.exportlib bind-9.7.2-P2/lib/export/dns/Makefile.in
--- bind-9.7.2-P2/lib/export/dns/Makefile.in.exportlib 2010-06-10 01:49:43.000000000 +0200
+++ bind-9.7.2-P2/lib/export/dns/Makefile.in 2010-10-20 14:08:58.123772859 +0200
diff -up bind-9.9.3rc1/lib/export/dns/Makefile.in.exportlib bind-9.9.3rc1/lib/export/dns/Makefile.in
--- bind-9.9.3rc1/lib/export/dns/Makefile.in.exportlib 2013-04-05 00:21:21.000000000 +0200
+++ bind-9.9.3rc1/lib/export/dns/Makefile.in 2013-04-16 14:37:36.221590545 +0200
@@ -35,9 +35,9 @@ CDEFINES = -DUSE_MD5 @USE_OPENSSL@ @USE_
CWARNINGS =
@ -42,7 +42,7 @@ diff -up bind-9.7.2-P2/lib/export/dns/Makefile.in.exportlib bind-9.7.2-P2/lib/ex
LIBS = @LIBS@
@@ -114,29 +114,29 @@ version.@O@: ${srcdir}/version.c
@@ -116,29 +116,29 @@ version.@O@: ${srcdir}/version.c
-DLIBAGE=${LIBAGE} \
-c ${srcdir}/version.c
@ -78,10 +78,10 @@ diff -up bind-9.7.2-P2/lib/export/dns/Makefile.in.exportlib bind-9.7.2-P2/lib/ex
rm -f gen code.h include/dns/enumtype.h include/dns/enumclass.h
rm -f include/dns/rdatastruct.h
diff -up bind-9.7.2-P2/lib/export/irs/Makefile.in.exportlib bind-9.7.2-P2/lib/export/irs/Makefile.in
--- bind-9.7.2-P2/lib/export/irs/Makefile.in.exportlib 2009-12-06 00:31:40.000000000 +0100
+++ bind-9.7.2-P2/lib/export/irs/Makefile.in 2010-10-20 14:10:39.893717488 +0200
@@ -42,9 +42,9 @@ SRCS = context.c \
diff -up bind-9.9.3rc1/lib/export/irs/Makefile.in.exportlib bind-9.9.3rc1/lib/export/irs/Makefile.in
--- bind-9.9.3rc1/lib/export/irs/Makefile.in.exportlib 2013-04-05 00:21:21.000000000 +0200
+++ bind-9.9.3rc1/lib/export/irs/Makefile.in 2013-04-16 14:37:36.222590542 +0200
@@ -43,9 +43,9 @@ SRCS = context.c \
gai_sterror.c getaddrinfo.c getnameinfo.c \
resconf.c
@ -94,7 +94,7 @@ diff -up bind-9.7.2-P2/lib/export/irs/Makefile.in.exportlib bind-9.7.2-P2/lib/ex
LIBS = @LIBS@
@@ -61,26 +61,26 @@ version.@O@: ${srcdir}/version.c
@@ -62,26 +62,26 @@ version.@O@: ${srcdir}/version.c
-DLIBAGE=${LIBAGE} \
-c ${srcdir}/version.c
@ -127,17 +127,17 @@ diff -up bind-9.7.2-P2/lib/export/irs/Makefile.in.exportlib bind-9.7.2-P2/lib/ex
clean distclean::
- rm -f libirs.@A@ libirs.la timestamp
+ rm -f libirs-export.@A@ libirs-export.la timestamp
diff -up bind-9.7.2-P2/lib/export/isccfg/Makefile.in.exportlib bind-9.7.2-P2/lib/export/isccfg/Makefile.in
--- bind-9.7.2-P2/lib/export/isccfg/Makefile.in.exportlib 2009-12-06 00:31:41.000000000 +0100
+++ bind-9.7.2-P2/lib/export/isccfg/Makefile.in 2010-10-20 14:10:14.593741247 +0200
diff -up bind-9.9.3rc1/lib/export/isccfg/Makefile.in.exportlib bind-9.9.3rc1/lib/export/isccfg/Makefile.in
--- bind-9.9.3rc1/lib/export/isccfg/Makefile.in.exportlib 2013-04-05 00:21:21.000000000 +0200
+++ bind-9.9.3rc1/lib/export/isccfg/Makefile.in 2013-04-16 14:55:34.645271169 +0200
@@ -30,11 +30,11 @@ CINCLUDES = -I. ${DNS_INCLUDES} -I${expo
CDEFINES =
CWARNINGS =
-ISCLIBS = ../isc/libisc.@A@
-DNSLIBS = ../dns/libdns.@A@
-DNSLIBS = ../dns/libdns.@A@ @DNS_CRYPTO_LIBS@
+ISCLIBS = ../isc/libisc-export.@A@
+DNSLIBS = ../dns/libdns-export.@A@
+DNSLIBS = ../dns/libdns-export.@A@ @DNS_CRYPTO_LIBS@
ISCDEPLIBS = ../../lib/isc/libisc.@A@
-ISCCFGDEPLIBS = libisccfg.@A@
@ -178,10 +178,10 @@ diff -up bind-9.7.2-P2/lib/export/isccfg/Makefile.in.exportlib bind-9.7.2-P2/lib
clean distclean::
- rm -f libisccfg.@A@ timestamp
+ rm -f libisccfg-export.@A@ timestamp
diff -up bind-9.7.2-P2/lib/export/isc/Makefile.in.exportlib bind-9.7.2-P2/lib/export/isc/Makefile.in
--- bind-9.7.2-P2/lib/export/isc/Makefile.in.exportlib 2010-06-10 01:49:43.000000000 +0200
+++ bind-9.7.2-P2/lib/export/isc/Makefile.in 2010-10-20 14:05:25.433861543 +0200
@@ -101,6 +101,10 @@ SRCS = @ISC_EXTRA_SRCS@ \
diff -up bind-9.9.3rc1/lib/export/isc/Makefile.in.exportlib bind-9.9.3rc1/lib/export/isc/Makefile.in
--- bind-9.9.3rc1/lib/export/isc/Makefile.in.exportlib 2013-04-05 00:21:21.000000000 +0200
+++ bind-9.9.3rc1/lib/export/isc/Makefile.in 2013-04-16 14:37:36.223590540 +0200
@@ -100,6 +100,10 @@ SRCS = @ISC_EXTRA_SRCS@ \
LIBS = @LIBS@
@ -192,7 +192,7 @@ diff -up bind-9.7.2-P2/lib/export/isc/Makefile.in.exportlib bind-9.7.2-P2/lib/ex
SUBDIRS = include unix nls @ISC_THREAD_DIR@
TARGETS = timestamp
@@ -114,26 +118,26 @@ version.@O@: ${srcdir}/version.c
@@ -113,26 +117,26 @@ version.@O@: ${srcdir}/version.c
-DLIBAGE=${LIBAGE} \
-c ${srcdir}/version.c
@ -225,10 +225,10 @@ diff -up bind-9.7.2-P2/lib/export/isc/Makefile.in.exportlib bind-9.7.2-P2/lib/ex
clean distclean::
- rm -f libisc.@A@ libisc.la timestamp
+ rm -f libisc-export.@A@ libisc-export.la timestamp
diff -up bind-9.7.2-P2/lib/export/samples/Makefile.in.exportlib bind-9.7.2-P2/lib/export/samples/Makefile.in
--- bind-9.7.2-P2/lib/export/samples/Makefile.in.exportlib 2009-12-06 00:31:41.000000000 +0100
+++ bind-9.7.2-P2/lib/export/samples/Makefile.in 2010-10-20 14:05:25.433861543 +0200
@@ -30,15 +30,15 @@ CINCLUDES = -I${srcdir}/include -I../dns
diff -up bind-9.9.3rc1/lib/export/samples/Makefile.in.exportlib bind-9.9.3rc1/lib/export/samples/Makefile.in
--- bind-9.9.3rc1/lib/export/samples/Makefile.in.exportlib 2013-04-05 00:21:21.000000000 +0200
+++ bind-9.9.3rc1/lib/export/samples/Makefile.in 2013-04-16 14:37:36.223590540 +0200
@@ -31,15 +31,15 @@ CINCLUDES = -I${srcdir}/include -I../dns
CDEFINES =
CWARNINGS =
@ -236,16 +236,15 @@ diff -up bind-9.7.2-P2/lib/export/samples/Makefile.in.exportlib bind-9.7.2-P2/li
-ISCLIBS = ../isc/libisc.@A@
-ISCCFGLIBS = ../isccfg/libisccfg.@A@
-IRSLIBS = ../irs/libirs.@A@
-
-DNSDEPLIBS = ../dns/libdns.@A@
-ISCDEPLIBS = ../isc/libisc.@A@
-ISCCFGDEPLIBS = ../isccfg/libisccfg.@A@
-IRSDEPLIBS = ../irs/libirs.@A@
+DNSLIBS = ../dns/libdns-export.@A@ @DNS_CRYPTO_LIBS@
+ISCLIBS = ../isc/libisc-export.@A@
+ISCCFGLIBS = ../isccfg/libisccfg-export.@A@
+IRSLIBS = ../irs/libirs-export.@A@
+
-DNSDEPLIBS = ../dns/libdns.@A@
-ISCDEPLIBS = ../isc/libisc.@A@
-ISCCFGDEPLIBS = ../isccfg/libisccfg.@A@
-IRSDEPLIBS = ../irs/libirs.@A@
+DNSDEPLIBS = ../dns/libdns-export.@A@
+ISCDEPLIBS = ../isc/libisc-export.@A@
+ISCCFGDEPLIBS = ../isccfg/libisccfg-export.@A@

File diff suppressed because it is too large Load Diff

View File

@ -1,2 +1,2 @@
2be7763c99b7e7b42ac3a18a267ce1aa bind-9.9.2-P2.tar.gz
f26d0098e96214256cfa2b1b745a8011 bind-9.9.3rc1.tar.gz
cb4a8ddb193f69b5643a6ae918596fc9 config-10.tar.bz2