rpms/bind/devel .cvsignore, 1.51, 1.52 bind-9.5-libidn.patch, 1.2, 1.3 bind-96-dyndb.patch, 1.2, 1.3 bind.spec, 1.308, 1.309 sources, 1.60, 1.61 bind-95-rh469440.patch, 1.1, NONE bind-96-isc_header.patch, 1.1, NONE bind-96-realloc.patch, 1.1, NONE bind9-fedora-0001.diff, 1.1, NONE

Adam Tkac atkac at fedoraproject.org
Mon Mar 30 14:55:12 UTC 2009 

Author: atkac

Update of /cvs/pkgs/rpms/bind/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14173

Modified Files:
	.cvsignore bind-9.5-libidn.patch bind-96-dyndb.patch bind.spec 
	sources 
Removed Files:
	bind-95-rh469440.patch bind-96-isc_header.patch 
	bind-96-realloc.patch bind9-fedora-0001.diff 
Log Message:
- 9.6.1b1 release
- patches merged
  - bind-96-isc_header.patch
  - bind-95-rh469440.patch
  - bind-96-realloc.patch
  - bind9-fedora-0001.diff
- use -version-number instead of -version-info libtool param



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/.cvsignore,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- .cvsignore	9 Mar 2009 14:35:56 -0000	1.51
+++ .cvsignore	30 Mar 2009 14:54:41 -0000	1.52
@@ -1,3 +1,3 @@
 config-4.tar.bz2
 bind-chroot.tar.bz2
-bind-9.6.0-P1.tar.gz
+bind-9.6.1b1.tar.gz

bind-9.5-libidn.patch:

Index: bind-9.5-libidn.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/bind-9.5-libidn.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bind-9.5-libidn.patch	11 Feb 2008 17:11:26 -0000	1.2
+++ bind-9.5-libidn.patch	30 Mar 2009 14:54:41 -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.6.1b1/bin/dig/dighost.c.libidn bind-9.6.1b1/bin/dig/dighost.c
+--- bind-9.6.1b1/bin/dig/dighost.c.libidn	2009-02-25 03:39:21.000000000 +0100
++++ bind-9.6.1b1/bin/dig/dighost.c	2009-03-30 15:01:41.350136527 +0200
 @@ -44,6 +44,11 @@
  #include <idn/api.h>
  #endif
@@ -49,17 +28,17 @@
  /*%
   * 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) {
+@@ -1068,8 +1084,15 @@ setup_system(void) {
  
  #ifdef WITH_IDN
  	initialize_idn();
@@ -76,7 +55,7 @@
  	if (keyfile[0] != 0)
  		setup_file_key();
  	else if (keysecret[0] != 0)
-@@ -1743,12 +1766,18 @@ setup_lookup(dig_lookup_t *lookup) {
+@@ -1770,12 +1793,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 @@
  	REQUIRE(lookup != NULL);
  	INSIST(!free_now);
  
-@@ -1785,6 +1814,16 @@ setup_lookup(dig_lookup_t *lookup) {
+@@ -1812,6 +1841,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 @@
  #endif
  
  	/*
-@@ -1804,6 +1843,15 @@ setup_lookup(dig_lookup_t *lookup) {
+@@ -1831,6 +1870,15 @@ setup_lookup(dig_lookup_t *lookup) {
  			lookup->origin = ISC_LIST_HEAD(search_list);
  			lookup->need_search = ISC_FALSE;
  		}
@@ -129,7 +108,7 @@
  #else
  		if ((count_dots(lookup->textname) >= ndots) || !usesearch) {
  			lookup->origin = NULL; /* Force abs lookup */
-@@ -1830,6 +1878,20 @@ setup_lookup(dig_lookup_t *lookup) {
+@@ -1857,6 +1905,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 @@
  #else
  	if (lookup->origin != NULL) {
  		debug("trying origin %s", lookup->origin->origin);
-@@ -1886,6 +1948,14 @@ setup_lookup(dig_lookup_t *lookup) {
+@@ -1913,6 +1975,14 @@ setup_lookup(dig_lookup_t *lookup) {
  						   dns_rootname,
  						   ISC_FALSE,
  						   &lookup->namebuf);
@@ -165,7 +144,7 @@
  #else
  			len = strlen(lookup->textname);
  			isc_buffer_init(&b, lookup->textname, len);
-@@ -3317,7 +3387,7 @@ destroy_libs(void) {
+@@ -3432,7 +3502,7 @@ destroy_libs(void) {
  	void * ptr;
  	dig_message_t *chase_msg;
  #endif
@@ -174,7 +153,7 @@
  	isc_result_t result;
  #endif
  
-@@ -3356,6 +3426,10 @@ destroy_libs(void) {
+@@ -3471,6 +3541,10 @@ destroy_libs(void) {
  	result = dns_name_settotextfilter(NULL);
  	check_result(result, "dns_name_settotextfilter");
  #endif
@@ -185,7 +164,7 @@
  	dns_name_destroy();
  
  	if (commctx != NULL) {
-@@ -3532,6 +3606,79 @@ idn_check_result(idn_result_t r, const c
+@@ -3647,6 +3721,79 @@ idn_check_result(idn_result_t r, const c
  	}
  }
  #endif /* WITH_IDN */
@@ -265,3 +244,24 @@
  
  #ifdef DIG_SIGCHASE
  void
+diff -up bind-9.6.1b1/bin/dig/Makefile.in.libidn bind-9.6.1b1/bin/dig/Makefile.in
+--- bind-9.6.1b1/bin/dig/Makefile.in.libidn	2007-06-20 01:46:59.000000000 +0200
++++ bind-9.6.1b1/bin/dig/Makefile.in	2009-03-30 15:00:42.883135505 +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}

bind-96-dyndb.patch:

Index: bind-96-dyndb.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/bind-96-dyndb.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bind-96-dyndb.patch	12 Feb 2009 15:21:08 -0000	1.2
+++ bind-96-dyndb.patch	30 Mar 2009 14:54:41 -0000	1.3
@@ -1,7 +1,6 @@
-diff --git a/bin/named/main.c b/bin/named/main.c
-index aa6575a..8030e3d 100644
---- a/bin/named/main.c
-+++ b/bin/named/main.c
+diff -up bind-9.6.1b1/bin/named/main.c.dyndb bind-9.6.1b1/bin/named/main.c
+--- bind-9.6.1b1/bin/named/main.c.dyndb	2009-01-19 00:47:34.000000000 +0100
++++ bind-9.6.1b1/bin/named/main.c	2009-03-30 14:56:54.895136109 +0200
 @@ -44,6 +44,7 @@
  #include <isccc/result.h>
  
@@ -19,11 +18,10 @@
  	dns_name_destroy();
  
  	isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
-diff --git a/bin/named/server.c b/bin/named/server.c
-index 31b2761..b76f3ce 100644
---- a/bin/named/server.c
-+++ b/bin/named/server.c
-@@ -56,6 +56,7 @@
+diff -up bind-9.6.1b1/bin/named/server.c.dyndb bind-9.6.1b1/bin/named/server.c
+--- bind-9.6.1b1/bin/named/server.c.dyndb	2009-01-30 04:53:38.000000000 +0100
++++ bind-9.6.1b1/bin/named/server.c	2009-03-30 14:59:00.478136755 +0200
+@@ -57,6 +57,7 @@
  #ifdef DLZ
  #include <dns/dlz.h>
  #endif
@@ -31,7 +29,7 @@
  #include <dns/forward.h>
  #include <dns/journal.h>
  #include <dns/keytable.h>
-@@ -849,6 +850,72 @@ configure_peer(const cfg_obj_t *cpeer, isc_mem_t *mctx, dns_peer_t **peerp) {
+@@ -849,6 +850,72 @@ configure_peer(const cfg_obj_t *cpeer, i
  }
  
  static isc_result_t
@@ -104,7 +102,7 @@
  disable_algorithms(const cfg_obj_t *disabled, dns_resolver_t *resolver) {
  	isc_result_t result;
  	const cfg_obj_t *algorithms;
-@@ -999,6 +1066,7 @@ configure_view(dns_view_t *view, const cfg_obj_t *config,
+@@ -1016,6 +1083,7 @@ configure_view(dns_view_t *view, const c
  	unsigned int dlzargc;
  	char **dlzargv;
  #endif
@@ -112,8 +110,8 @@
  	const cfg_obj_t *disabled;
  	const cfg_obj_t *obj;
  	const cfg_listelt_t *element;
-@@ -1171,6 +1239,22 @@ configure_view(dns_view_t *view, const cfg_obj_t *config,
- #endif
+@@ -1238,6 +1306,22 @@ configure_view(dns_view_t *view, const c
+ 		view->maxncachettl = 7 * 24 * 3600;
  
  	/*
 +	 * Configure dynamic databases.
@@ -135,34 +133,9 @@
  	 * Configure the view's cache.  Try to reuse an existing
  	 * cache if possible, otherwise create a new cache.
  	 * Note that the ADB is not preserved in either case.
-diff --git a/lib/dns/Makefile.in b/lib/dns/Makefile.in
-index ef5c12a..0f7abba 100644
---- a/lib/dns/Makefile.in
-+++ b/lib/dns/Makefile.in
-@@ -57,7 +57,8 @@ DSTOBJS =	@DST_EXTRA_OBJS@ \
- DNSOBJS =	acache. at O@ acl. at O@ adb. at O@ byaddr. at O@ \
- 		cache. at O@ callbacks. at O@ compress. at O@ \
- 		db. at O@ dbiterator. at O@ dbtable. at O@ diff. at O@ dispatch. at O@ \
--		dlz. at O@ dnssec. at O@ ds. at O@ forward. at O@ iptable. at O@ journal. at O@ \
-+		dlz. at O@ dnssec. at O@ ds. at O@ dynamic_db. at O@ forward. at O@ \
-+		iptable. at O@ journal. at O@ \
- 		keytable. at O@ lib. at O@ log. at O@ lookup. at O@ \
- 		master. at O@ masterdump. at O@ message. at O@ \
- 		name. at O@ ncache. at O@ nsec. at O@ nsec3. at O@ order. at O@ peer. at O@ portlist. at O@ \
-@@ -83,7 +84,7 @@ DSTSRCS =	@DST_EXTRA_SRCS@ \
- DNSSRCS =	acache.c acl.c adb.c byaddr.c \
- 		cache.c callbacks.c compress.c \
- 		db.c dbiterator.c dbtable.c diff.c dispatch.c \
--		dlz.c dnssec.c ds.c forward.c iptable.c journal.c \
-+		dlz.c dnssec.c ds.c dynamic_db.c forward.c iptable.c journal.c \
- 		keytable.c lib.c log.c lookup.c \
- 		master.c masterdump.c message.c \
- 		name.c ncache.c nsec.c nsec3.c order.c peer.c portlist.c \
-diff --git a/lib/dns/dynamic_db.c b/lib/dns/dynamic_db.c
-new file mode 100644
-index 0000000..b95b1fe
---- /dev/null
-+++ b/lib/dns/dynamic_db.c
+diff -up /dev/null bind-9.6.1b1/lib/dns/dynamic_db.c
+--- /dev/null	2009-03-30 11:37:35.392000941 +0200
++++ bind-9.6.1b1/lib/dns/dynamic_db.c	2009-03-30 14:56:54.899136384 +0200
 @@ -0,0 +1,240 @@
 +/*
 + * Copyright (C) 2004-2009  Internet Systems Consortium, Inc. ("ISC")
@@ -404,24 +377,9 @@
 +
 +	isc_mutex_destroy(&dyndb_lock);
 +}
-diff --git a/lib/dns/include/dns/Makefile.in b/lib/dns/include/dns/Makefile.in
-index e9e049e..27fdc45 100644
---- a/lib/dns/include/dns/Makefile.in
-+++ b/lib/dns/include/dns/Makefile.in
-@@ -23,7 +23,7 @@ top_srcdir =	@top_srcdir@
- 
- HEADERS =	acl.h adb.h byaddr.h cache.h callbacks.h \
- 		cert.h compress.h \
--		db.h dbiterator.h dbtable.h diff.h dispatch.h dlz.h \
-+		db.h dbiterator.h dbtable.h diff.h dispatch.h dlz.h dynamic_db.h \
- 		dnssec.h ds.h events.h fixedname.h iptable.h journal.h keyflags.h \
- 		keytable.h keyvalues.h lib.h log.h master.h masterdump.h \
- 		message.h name.h ncache.h \
-diff --git a/lib/dns/include/dns/dynamic_db.h b/lib/dns/include/dns/dynamic_db.h
-new file mode 100644
-index 0000000..03339e6
---- /dev/null
-+++ b/lib/dns/include/dns/dynamic_db.h
+diff -up /dev/null bind-9.6.1b1/lib/dns/include/dns/dynamic_db.h
+--- /dev/null	2009-03-30 11:37:35.392000941 +0200
++++ bind-9.6.1b1/lib/dns/include/dns/dynamic_db.h	2009-03-30 14:56:54.899136384 +0200
 @@ -0,0 +1,32 @@
 +/*
 + * Copyright (C) 2004-2009  Internet Systems Consortium, Inc. ("ISC")
@@ -455,11 +413,10 @@
 +void dns_dynamic_db_cleanup(void);
 +
 +#endif
-diff --git a/lib/dns/include/dns/log.h b/lib/dns/include/dns/log.h
-index 5adcedd..e171028 100644
---- a/lib/dns/include/dns/log.h
-+++ b/lib/dns/include/dns/log.h
-@@ -73,6 +73,7 @@ LIBDNS_EXTERNAL_DATA extern isc_logmodule_t dns_modules[];
+diff -up bind-9.6.1b1/lib/dns/include/dns/log.h.dyndb bind-9.6.1b1/lib/dns/include/dns/log.h
+--- bind-9.6.1b1/lib/dns/include/dns/log.h.dyndb	2009-01-19 00:47:41.000000000 +0100
++++ bind-9.6.1b1/lib/dns/include/dns/log.h	2009-03-30 14:56:54.899136384 +0200
+@@ -73,6 +73,7 @@ LIBDNS_EXTERNAL_DATA extern isc_logmodul
  #define DNS_LOGMODULE_HINTS		(&dns_modules[24])
  #define DNS_LOGMODULE_ACACHE		(&dns_modules[25])
  #define DNS_LOGMODULE_DLZ		(&dns_modules[26])
@@ -467,11 +424,22 @@
  
  ISC_LANG_BEGINDECLS
  
-diff --git a/lib/dns/log.c b/lib/dns/log.c
-index 7551e15..b9864eb 100644
---- a/lib/dns/log.c
-+++ b/lib/dns/log.c
-@@ -79,6 +79,7 @@ LIBDNS_EXTERNAL_DATA isc_logmodule_t dns_modules[] = {
+diff -up bind-9.6.1b1/lib/dns/include/dns/Makefile.in.dyndb bind-9.6.1b1/lib/dns/include/dns/Makefile.in
+--- bind-9.6.1b1/lib/dns/include/dns/Makefile.in.dyndb	2008-11-15 00:47:33.000000000 +0100
++++ bind-9.6.1b1/lib/dns/include/dns/Makefile.in	2009-03-30 14:56:54.899136384 +0200
+@@ -23,7 +23,7 @@ top_srcdir =	@top_srcdir@
+ 
+ HEADERS =	acl.h adb.h byaddr.h cache.h callbacks.h \
+ 		cert.h compress.h \
+-		db.h dbiterator.h dbtable.h diff.h dispatch.h dlz.h \
++		db.h dbiterator.h dbtable.h diff.h dispatch.h dlz.h dynamic_db.h \
+ 		dnssec.h ds.h events.h fixedname.h iptable.h journal.h keyflags.h \
+ 		keytable.h keyvalues.h lib.h log.h master.h masterdump.h \
+ 		message.h name.h ncache.h \
+diff -up bind-9.6.1b1/lib/dns/log.c.dyndb bind-9.6.1b1/lib/dns/log.c
+--- bind-9.6.1b1/lib/dns/log.c.dyndb	2007-06-19 01:47:40.000000000 +0200
++++ bind-9.6.1b1/lib/dns/log.c	2009-03-30 14:56:54.899136384 +0200
+@@ -79,6 +79,7 @@ LIBDNS_EXTERNAL_DATA isc_logmodule_t dns
  	{ "dns/hints",		0 },
  	{ "dns/acache",		0 },
  	{ "dns/dlz",		0 },
@@ -479,10 +447,31 @@
  	{ NULL, 		0 }
  };
  
-diff --git a/lib/isccfg/namedconf.c b/lib/isccfg/namedconf.c
-index 0610489..a1dba32 100644
---- a/lib/isccfg/namedconf.c
-+++ b/lib/isccfg/namedconf.c
+diff -up bind-9.6.1b1/lib/dns/Makefile.in.dyndb bind-9.6.1b1/lib/dns/Makefile.in
+--- bind-9.6.1b1/lib/dns/Makefile.in.dyndb	2009-03-30 14:56:54.887146135 +0200
++++ bind-9.6.1b1/lib/dns/Makefile.in	2009-03-30 14:56:54.899136384 +0200
+@@ -57,7 +57,8 @@ DSTOBJS =	@DST_EXTRA_OBJS@ \
+ DNSOBJS =	acache. at O@ acl. at O@ adb. at O@ byaddr. at O@ \
+ 		cache. at O@ callbacks. at O@ compress. at O@ \
+ 		db. at O@ dbiterator. at O@ dbtable. at O@ diff. at O@ dispatch. at O@ \
+-		dlz. at O@ dnssec. at O@ ds. at O@ forward. at O@ iptable. at O@ journal. at O@ \
++		dlz. at O@ dnssec. at O@ ds. at O@ dynamic_db. at O@ forward. at O@ \
++		iptable. at O@ journal. at O@ \
+ 		keytable. at O@ lib. at O@ log. at O@ lookup. at O@ \
+ 		master. at O@ masterdump. at O@ message. at O@ \
+ 		name. at O@ ncache. at O@ nsec. at O@ nsec3. at O@ order. at O@ peer. at O@ portlist. at O@ \
+@@ -83,7 +84,7 @@ DSTSRCS =	@DST_EXTRA_SRCS@ \
+ DNSSRCS =	acache.c acl.c adb.c byaddr.c \
+ 		cache.c callbacks.c compress.c \
+ 		db.c dbiterator.c dbtable.c diff.c dispatch.c \
+-		dlz.c dnssec.c ds.c forward.c iptable.c journal.c \
++		dlz.c dnssec.c ds.c dynamic_db.c forward.c iptable.c journal.c \
+ 		keytable.c lib.c log.c lookup.c \
+ 		master.c masterdump.c message.c \
+ 		name.c ncache.c nsec.c nsec3.c order.c peer.c portlist.c \
+diff -up bind-9.6.1b1/lib/isccfg/namedconf.c.dyndb bind-9.6.1b1/lib/isccfg/namedconf.c
+--- bind-9.6.1b1/lib/isccfg/namedconf.c.dyndb	2008-09-28 01:35:31.000000000 +0200
++++ bind-9.6.1b1/lib/isccfg/namedconf.c	2009-03-30 14:56:54.903136167 +0200
 @@ -78,6 +78,7 @@ static cfg_type_t cfg_type_controls;
  static cfg_type_t cfg_type_controls_sockaddr;
  static cfg_type_t cfg_type_destinationlist;
@@ -499,7 +488,7 @@
  	{ "server", &cfg_type_server, CFG_CLAUSEFLAG_MULTI },
  	{ "trusted-keys", &cfg_type_trustedkeys, CFG_CLAUSEFLAG_MULTI },
  	{ NULL, NULL, 0 }
-@@ -1365,6 +1367,40 @@ static cfg_type_t cfg_type_dialuptype = {
+@@ -1365,6 +1367,40 @@ static cfg_type_t cfg_type_dialuptype = 
  	&cfg_rep_string, dialup_enums
  };
  


Index: bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/bind.spec,v
retrieving revision 1.308
retrieving revision 1.309
diff -u -r1.308 -r1.309
--- bind.spec	23 Mar 2009 15:14:00 -0000	1.308
+++ bind.spec	30 Mar 2009 14:54:41 -0000	1.309
@@ -2,11 +2,11 @@
 # Red Hat BIND package .spec file
 #
 
-%define PATCHVER P1
-#%define PREVER rc2
-#%define VERSION %{version}%{PREVER}
+#%define PATCHVER P1
+%define PREVER b1
 #%define VERSION %{version}
-%define VERSION %{version}-%{PATCHVER}
+#%define VERSION %{version}-%{PATCHVER}
+%define VERSION %{version}%{PREVER}
 
 %{?!SDB:       %define SDB       1}
 %{?!test:      %define test      0}
@@ -19,8 +19,8 @@
 Summary:  The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) server
 Name:     bind
 License:  ISC
-Version:  9.6.0
-Release:  11.1.%{PATCHVER}%{?dist}
+Version:  9.6.1
+Release:  0.1.%{PREVER}%{?dist}
 Epoch:    32
 Url:      http://www.isc.org/products/BIND/
 Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -49,12 +49,9 @@
 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
 Patch99: bind-96-libtool2.patch
 Patch101:bind-96-old-api.patch
 Patch102:bind-95-rh452060.patch
-Patch103:bind-96-realloc.patch
-Patch106:bind9-fedora-0001.diff
 
 # SDB patches
 Patch11: bind-9.3.2b2-sdbsrc.patch
@@ -64,7 +61,6 @@
 # needs inpection
 Patch17: bind-9.3.2b1-fix_sdb_ldap.patch
 Patch104: bind-96-dyndb.patch
-Patch105: bind-96-isc_header.patch
 
 # IDN paches
 Patch73: bind-9.5-libidn.patch
@@ -172,7 +168,6 @@
 %patch10 -p1 -b .PIE
 %patch16 -p1 -b .redhat_doc
 %patch104 -p1 -b .dyndb
-%patch105 -p1 -b .isc_header
 %if %{SDB}
 %patch101 -p1 -b .old-api
 mkdir bin/named-sdb
@@ -213,15 +208,12 @@
 %patch85 -p1 -b .libidn3
 %patch87 -p1 -b .parallel
 %patch94 -p1 -b .rh461409
-%patch96 -p1 -b .rh469440
 
 # XXX due new libtool. Not sure about proper upstream approach yet.
 mkdir m4
 %patch99 -p1 -b .libtool2
 
 %patch102 -p1 -b .rh452060
-%patch103 -p0 -b .realloc
-%patch106 -p1 -b .nsec3
 
 # Sparc and s390 arches need to use -fPIE
 %ifarch sparcv9 sparc64 s390 s390x
@@ -241,6 +233,11 @@
 's/RELEASEVER=\(.*\)/RELEASEVER=\1-RedHat-%{version}-%{release}/' \
 version
 
+# Substitute libtool -version-info parameter by -version-number
+for all in `find . |grep Makefile.in`; do
+	sed -i 's/-version-info/-version-number/' $all
+done
+
 libtoolize -c -f; aclocal -I m4 --force; autoheader -f; autoconf -f
 
 %configure \
@@ -545,6 +542,7 @@
 %{_includedir}/isccc
 %{_includedir}/isccfg
 %{_includedir}/lwres
+%{_mandir}/man1/isc-config.sh.1*
 %{_mandir}/man3/lwres*
 %{_bindir}/isc-config.sh
 
@@ -571,6 +569,15 @@
 %ghost %{chroot_prefix}/etc/localtime
 
 %changelog
+* Mon Mar 30 2009 Adam Tkac <atkac redhat com> 32:9.6.1-0.1.b1
+- 9.6.1b1 release
+- patches merged
+  - bind-96-isc_header.patch
+  - bind-95-rh469440.patch
+  - bind-96-realloc.patch
+  - bind9-fedora-0001.diff
+- use -version-number instead of -version-info libtool param
+
 * Mon Mar 23 2009 Adam Tkac <atkac redhat com> 32:9.6.0-11.1.P1
 - logrotate configuration file now points to /var/named/data/named.run by
   default (#489986)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/sources,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- sources	9 Mar 2009 14:35:56 -0000	1.60
+++ sources	30 Mar 2009 14:54:41 -0000	1.61
@@ -1,3 +1,3 @@
 de68e10e91e05ab100be879b5bcaa6cb  config-4.tar.bz2
 4faa4395b955e5f8a3d50f308b9fabc8  bind-chroot.tar.bz2
-886b7eae55cfdc8cd8d2ca74a2f99c6e  bind-9.6.0-P1.tar.gz
+0a77b019db076c0b034d374abe3044ef  bind-9.6.1b1.tar.gz


--- bind-95-rh469440.patch DELETED ---


--- bind-96-isc_header.patch DELETED ---


--- bind-96-realloc.patch DELETED ---


--- bind9-fedora-0001.diff DELETED ---

More information about the fedora-extras-commits mailing list