rpms/bind/F-10 .cvsignore, 1.49, 1.50 bind-9.3.2b2-sdbsrc.patch, 1.1, 1.2 bind-9.5-libidn.patch, 1.2, 1.3 bind.spec, 1.292, 1.293 sources, 1.58, 1.59 bind-95-rh469440.patch, 1.1, NONE
Adam Tkac
atkac at fedoraproject.org
Thu Sep 24 14:31:43 UTC 2009
Author: atkac
Update of /cvs/pkgs/rpms/bind/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22630
Modified Files:
.cvsignore bind-9.3.2b2-sdbsrc.patch bind-9.5-libidn.patch
bind.spec sources
Removed Files:
bind-95-rh469440.patch
Log Message:
- update to 9.5.2
- bind-95-rh469440.patch merged to upstream
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bind/F-10/.cvsignore,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- .cvsignore 29 Jul 2009 12:55:14 -0000 1.49
+++ .cvsignore 24 Sep 2009 14:31:42 -0000 1.50
@@ -1,4 +1,4 @@
config-4.tar.bz2
libbind-man.tar.gz
bind-chroot.tar.bz2
-bind-9.5.1-P3.tar.gz
+bind-9.5.2.tar.gz
bind-9.3.2b2-sdbsrc.patch:
bdb/bdb.c | 2 -
ldap/zone2ldap.c | 59 +++++++++++++++++++++++++++++++------------------------
pgsql/pgsqldb.c | 2 -
pgsql/zonetodb.c | 11 ++++++++--
4 files changed, 45 insertions(+), 29 deletions(-)
Index: bind-9.3.2b2-sdbsrc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bind/F-10/bind-9.3.2b2-sdbsrc.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- bind-9.3.2b2-sdbsrc.patch 3 Dec 2005 00:10:48 -0000 1.1
+++ bind-9.3.2b2-sdbsrc.patch 24 Sep 2009 14:31:42 -0000 1.2
@@ -241,12 +241,3 @@
void
addrdata(dns_name_t *name, dns_ttl_t ttl, dns_rdata_t *rdata) {
unsigned char namearray[DNS_NAME_MAXTEXT + 1];
-@@ -165,7 +172,7 @@
- check_result(result, "isc_mem_create");
-
- result = isc_entropy_create(mctx, &ectx);
-- result_check (result, "isc_entropy_create");
-+ check_result (result, "isc_entropy_create");
-
- result = isc_hash_create(mctx, ectx, DNS_NAME_MAXWIRE);
- check_result (result, "isc_hash_create");
bind-9.5-libidn.patch:
Makefile.in | 4 +
dighost.c | 153 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
2 files changed, 153 insertions(+), 4 deletions(-)
Index: bind-9.5-libidn.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bind/F-10/bind-9.5-libidn.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- bind-9.5-libidn.patch 11 Feb 2008 17:11:26 -0000 1.2
+++ bind-9.5-libidn.patch 24 Sep 2009 14:31:42 -0000 1.3
@@ -1,27 +1,6 @@
-diff -up bind-9.5.0b2/bin/dig/Makefile.in.libidn bind-9.5.0b2/bin/dig/Makefile.in
---- bind-9.5.0b2/bin/dig/Makefile.in.libidn 2007-06-20 01:46:59.000000000 +0200
-+++ bind-9.5.0b2/bin/dig/Makefile.in 2008-02-11 17:50:08.000000000 +0100
-@@ -45,7 +45,7 @@ DEPLIBS = ${DNSDEPLIBS} ${BIND9DEPLIBS}
- ${LWRESDEPLIBS}
-
- LIBS = ${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} ${ISCLIBS} \
-- ${ISCCFGLIBS} @IDNLIBS@ @LIBS@
-+ ${ISCCFGLIBS} @IDNLIBS@ @LIBS@ -lidn
-
- SUBDIRS =
-
-@@ -63,6 +63,8 @@ HTMLPAGES = dig.html host.html nslookup.
-
- MANOBJS = ${MANPAGES} ${HTMLPAGES}
-
-+EXT_CFLAGS = -DWITH_LIBIDN
-+
- @BIND9_MAKE_RULES@
-
- dig at EXEEXT@: dig. at O@ dighost. at O@ ${UOBJS} ${DEPLIBS}
-diff -up bind-9.5.0b2/bin/dig/dighost.c.libidn bind-9.5.0b2/bin/dig/dighost.c
---- bind-9.5.0b2/bin/dig/dighost.c.libidn 2008-01-18 00:46:35.000000000 +0100
-+++ bind-9.5.0b2/bin/dig/dighost.c 2008-02-11 17:49:03.000000000 +0100
+diff -up bind-9.5.2/bin/dig/dighost.c.libidn bind-9.5.2/bin/dig/dighost.c
+--- bind-9.5.2/bin/dig/dighost.c.libidn 2009-06-24 05:42:32.000000000 +0200
++++ bind-9.5.2/bin/dig/dighost.c 2009-09-24 15:41:13.000000000 +0200
@@ -44,6 +44,11 @@
#include <idn/api.h>
#endif
@@ -49,17 +28,17 @@ diff -up bind-9.5.0b2/bin/dig/dighost.c.
/*%
* Exit Codes:
*
-@@ -1004,6 +1017,9 @@ void
- setup_system(void) {
+@@ -1012,6 +1025,9 @@ setup_system(void) {
dig_searchlist_t *domain = NULL;
lwres_result_t lwresult;
+ unsigned int lwresflags;
+#ifdef WITH_LIBIDN
+ isc_result_t result;
+#endif
debug("setup_system()");
-@@ -1052,8 +1068,15 @@ setup_system(void) {
+@@ -1070,8 +1086,15 @@ setup_system(void) {
#ifdef WITH_IDN
initialize_idn();
@@ -76,7 +55,7 @@ diff -up bind-9.5.0b2/bin/dig/dighost.c.
if (keyfile[0] != 0)
setup_file_key();
else if (keysecret[0] != 0)
-@@ -1743,12 +1766,18 @@ setup_lookup(dig_lookup_t *lookup) {
+@@ -1772,12 +1795,18 @@ setup_lookup(dig_lookup_t *lookup) {
idn_result_t mr;
char utf8_textname[MXNAME], utf8_origin[MXNAME], idn_textname[MXNAME];
#endif
@@ -96,7 +75,7 @@ diff -up bind-9.5.0b2/bin/dig/dighost.c.
REQUIRE(lookup != NULL);
INSIST(!free_now);
-@@ -1785,6 +1814,16 @@ setup_lookup(dig_lookup_t *lookup) {
+@@ -1814,6 +1843,16 @@ setup_lookup(dig_lookup_t *lookup) {
mr = idn_encodename(IDN_LOCALCONV | IDN_DELIMMAP, lookup->textname,
utf8_textname, sizeof(utf8_textname));
idn_check_result(mr, "convert textname to UTF-8");
@@ -113,7 +92,7 @@ diff -up bind-9.5.0b2/bin/dig/dighost.c.
#endif
/*
-@@ -1804,6 +1843,15 @@ setup_lookup(dig_lookup_t *lookup) {
+@@ -1833,6 +1872,15 @@ setup_lookup(dig_lookup_t *lookup) {
lookup->origin = ISC_LIST_HEAD(search_list);
lookup->need_search = ISC_FALSE;
}
@@ -129,7 +108,7 @@ diff -up bind-9.5.0b2/bin/dig/dighost.c.
#else
if ((count_dots(lookup->textname) >= ndots) || !usesearch) {
lookup->origin = NULL; /* Force abs lookup */
-@@ -1830,6 +1878,20 @@ setup_lookup(dig_lookup_t *lookup) {
+@@ -1859,6 +1907,20 @@ setup_lookup(dig_lookup_t *lookup) {
IDN_IDNCONV | IDN_LENCHECK, utf8_textname,
idn_textname, sizeof(idn_textname));
idn_check_result(mr, "convert UTF-8 textname to IDN encoding");
@@ -150,7 +129,7 @@ diff -up bind-9.5.0b2/bin/dig/dighost.c.
#else
if (lookup->origin != NULL) {
debug("trying origin %s", lookup->origin->origin);
-@@ -1886,6 +1948,14 @@ setup_lookup(dig_lookup_t *lookup) {
+@@ -1915,6 +1977,14 @@ setup_lookup(dig_lookup_t *lookup) {
dns_rootname,
ISC_FALSE,
&lookup->namebuf);
@@ -165,7 +144,7 @@ diff -up bind-9.5.0b2/bin/dig/dighost.c.
#else
len = strlen(lookup->textname);
isc_buffer_init(&b, lookup->textname, len);
-@@ -3317,7 +3387,7 @@ destroy_libs(void) {
+@@ -3434,7 +3504,7 @@ destroy_libs(void) {
void * ptr;
dig_message_t *chase_msg;
#endif
@@ -174,7 +153,7 @@ diff -up bind-9.5.0b2/bin/dig/dighost.c.
isc_result_t result;
#endif
-@@ -3356,6 +3426,10 @@ destroy_libs(void) {
+@@ -3473,6 +3543,10 @@ destroy_libs(void) {
result = dns_name_settotextfilter(NULL);
check_result(result, "dns_name_settotextfilter");
#endif
@@ -185,7 +164,7 @@ diff -up bind-9.5.0b2/bin/dig/dighost.c.
dns_name_destroy();
if (commctx != NULL) {
-@@ -3532,6 +3606,79 @@ idn_check_result(idn_result_t r, const c
+@@ -3649,6 +3723,79 @@ idn_check_result(idn_result_t r, const c
}
}
#endif /* WITH_IDN */
@@ -265,3 +244,24 @@ diff -up bind-9.5.0b2/bin/dig/dighost.c.
#ifdef DIG_SIGCHASE
void
+diff -up bind-9.5.2/bin/dig/Makefile.in.libidn bind-9.5.2/bin/dig/Makefile.in
+--- bind-9.5.2/bin/dig/Makefile.in.libidn 2007-06-20 01:46:59.000000000 +0200
++++ bind-9.5.2/bin/dig/Makefile.in 2009-09-24 15:40:21.000000000 +0200
+@@ -45,7 +45,7 @@ DEPLIBS = ${DNSDEPLIBS} ${BIND9DEPLIBS}
+ ${LWRESDEPLIBS}
+
+ LIBS = ${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} ${ISCLIBS} \
+- ${ISCCFGLIBS} @IDNLIBS@ @LIBS@
++ ${ISCCFGLIBS} @IDNLIBS@ @LIBS@ -lidn
+
+ SUBDIRS =
+
+@@ -63,6 +63,8 @@ HTMLPAGES = dig.html host.html nslookup.
+
+ MANOBJS = ${MANPAGES} ${HTMLPAGES}
+
++EXT_CFLAGS = -DWITH_LIBIDN
++
+ @BIND9_MAKE_RULES@
+
+ dig at EXEEXT@: dig. at O@ dighost. at O@ ${UOBJS} ${DEPLIBS}
Index: bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bind/F-10/bind.spec,v
retrieving revision 1.292
retrieving revision 1.293
diff -u -p -r1.292 -r1.293
--- bind.spec 29 Jul 2009 12:55:14 -0000 1.292
+++ bind.spec 24 Sep 2009 14:31:43 -0000 1.293
@@ -4,8 +4,9 @@
#%define PREVER b3
#%define VERSION %{version}%{PREVER}
-%define PATCHVER P3
-%define VERSION %{version}-%{PATCHVER}
+#%define PATCHVER P3
+#%define VERSION %{version}-%{PATCHVER}
+%define VERSION %{version}
%{?!SDB: %define SDB 1}
%{?!LIBBIND: %define LIBBIND 1}
@@ -20,8 +21,8 @@
Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) server
Name: bind
License: ISC
-Version: 9.5.1
-Release: 3.%{PATCHVER}%{?dist}
+Version: 9.5.2
+Release: 1%{?dist}
Epoch: 32
Url: http://www.isc.org/products/BIND/
Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -58,7 +59,6 @@ Patch16: bind-9.3.2-redhat_doc.patch
Patch71: bind-9.5-overflow.patch
Patch72: bind-9.5-dlz-64bit.patch
Patch87: bind-9.5-parallel-build.patch
-Patch96: bind-95-rh469440.patch
Patch97: bind-95-rh452060.patch
# SDB patches
@@ -239,7 +239,6 @@ cp -fp contrib/dbus/{dbus_mgr.h,dbus_ser
%patch85 -p1 -b .libidn3
%patch87 -p1 -b .parallel
%patch94 -p1 -b .rh461409
-%patch96 -p1 -b .rh469440
%patch97 -p1 -b .rh452060
# Sparc and s390 arches need to use -fPIE
@@ -599,6 +598,7 @@ rm -rf ${RPM_BUILD_ROOT}
%{_includedir}/isccfg
%{_includedir}/lwres
%{_mandir}/man3/lwres*
+%{_mandir}/man1/isc-config.sh.1*
%{_bindir}/isc-config.sh
%if %{LIBBIND}
%{_libdir}/pkgconfig/libbind.pc
@@ -638,6 +638,10 @@ rm -rf ${RPM_BUILD_ROOT}
%{_sbindir}/bind-chroot-admin
%changelog
+* Thu Sep 24 2009 Adam Tkac <atkac redhat com> 32:9.5.2-1
+- update to 9.5.2
+- bind-95-rh469440.patch merged to upstream
+
* Wed Jul 29 2009 Adam Tkac <atkac redhat com> 32:9.5.1-3.P3
- 9.5.1-P3 release (CVE-2009-0696)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bind/F-10/sources,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- sources 29 Jul 2009 12:55:14 -0000 1.58
+++ sources 24 Sep 2009 14:31:43 -0000 1.59
@@ -1,4 +1,4 @@
de68e10e91e05ab100be879b5bcaa6cb config-4.tar.bz2
13fef79f99fcefebb51d84b08805de51 libbind-man.tar.gz
4faa4395b955e5f8a3d50f308b9fabc8 bind-chroot.tar.bz2
-a25a93711c2498bca7e8f208aab0c896 bind-9.5.1-P3.tar.gz
+d1bd3e81bad99bffcf89059b29acc22d bind-9.5.2.tar.gz
--- bind-95-rh469440.patch DELETED ---
More information about the fedora-extras-commits
mailing list