rpms/dnssec-tools/devel dnssec-tools-arpa-1.4.1.patch, NONE, 1.1 dnssec-tools.spec, 1.20, 1.21

[Wes Hardaker]

Author: hardaker

Update of /cvs/extras/rpms/dnssec-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12582

Modified Files:
	dnssec-tools.spec 
Added Files:
	dnssec-tools-arpa-1.4.1.patch 
Log Message:
fixed compilation issue with new arpa header

dnssec-tools-arpa-1.4.1.patch:

--- NEW FILE dnssec-tools-arpa-1.4.1.patch ---
Index: validator/libsres/ns_parse.c
===================================================================
--- validator/libsres/ns_parse.c	(revision 4295)
+++ validator/libsres/ns_parse.c	(revision 4295)
@@ -54,7 +54,7 @@
 /*
  * These need to be in the same order as the nres.h:ns_flag enum. 
  */
-struct _ns_flagdata _ns_flagdata[16] = {
+struct _ns_flagdata _ns_flagdata_flags[16] = {
     {0x8000, 15},               /* qr. */
     {0x7800, 11},               /* opcode. */
     {0x0400, 10},               /* aa. */
@@ -77,15 +77,15 @@
  * ns_msg_getflag is a macro on linux, but Solaris and Darwin
  * both use defines of the function to map to other function
  * names.
+ *
+ * We completely rename the function for internal usage just to independent
  */
-#if !defined(ns_msg_getflag) || defined(sun) || defined(__APPLE__)
 int
-ns_msg_getflag(ns_msg han, int flag)
+libsres_msg_getflag(ns_msg han, int flag)
 {
-    return (((han)._flags & _ns_flagdata[flag].mask) >> _ns_flagdata[flag].
+    return (((han)._flags & _ns_flagdata_flags[flag].mask) >> _ns_flagdata_flags[flag].
             shift);
 }
-#endif
 
 int
 ns_skiprr(const u_char * ptr, const u_char * eom, ns_sect section,
--- validator/libsres/res_support.h	2008-07-22 20:24:09.000000000 -0700
+++ validator/libsres/res_support.h	2009-01-22 13:25:46.000000000 -0800
@@ -79,5 +79,6 @@
                                    int name_length);
 u_int16_t       retrieve_type(const u_int8_t * rr);
 u_int16_t       libsres_random(void);
+int             libsres_msg_getflag(ns_msg han, int flag);
 
 #endif                          /* RES_SUPPORT_H */
--- validator/libsres/res_debug.c	2008-07-22 20:07:30.000000000 -0700
+++ validator/libsres/res_debug.c	2009-01-22 13:25:46.000000000 -0800
@@ -191,7 +191,7 @@
         return;
     }
 
-    opcode = (ns_opcode) ns_msg_getflag(*handle, ns_f_opcode);
+    opcode = (ns_opcode) libsres_msg_getflag(*handle, ns_f_opcode);
     rrnum = 0;
     for (;;) {
         if (ns_parserr(handle, section, rrnum, &rr)) {
@@ -278,8 +278,8 @@
 
         return;
     }
-    opcode = ns_msg_getflag(handle, ns_f_opcode);
-    rcode = ns_msg_getflag(handle, ns_f_rcode);
+    opcode = libsres_msg_getflag(handle, ns_f_opcode);
+    rcode = libsres_msg_getflag(handle, ns_f_rcode);
     id = ns_msg_id(handle);
     qdcount = ns_msg_count(handle, ns_s_qd);
     ancount = ns_msg_count(handle, ns_s_an);
@@ -294,21 +294,21 @@
             _libsres_opcodes[opcode], p_rcode(rcode), id);
     putc(';', file);
     fprintf(file, "; flags:");
-    if (ns_msg_getflag(handle, ns_f_qr))
+    if (libsres_msg_getflag(handle, ns_f_qr))
         fprintf(file, " qr");
-    if (ns_msg_getflag(handle, ns_f_aa))
+    if (libsres_msg_getflag(handle, ns_f_aa))
         fprintf(file, " aa");
-    if (ns_msg_getflag(handle, ns_f_tc))
+    if (libsres_msg_getflag(handle, ns_f_tc))
         fprintf(file, " tc");
-    if (ns_msg_getflag(handle, ns_f_rd))
+    if (libsres_msg_getflag(handle, ns_f_rd))
         fprintf(file, " rd");
-    if (ns_msg_getflag(handle, ns_f_ra))
+    if (libsres_msg_getflag(handle, ns_f_ra))
         fprintf(file, " ra");
-    if (ns_msg_getflag(handle, ns_f_z))
+    if (libsres_msg_getflag(handle, ns_f_z))
         fprintf(file, " ??");
-    if (ns_msg_getflag(handle, ns_f_ad))
+    if (libsres_msg_getflag(handle, ns_f_ad))
         fprintf(file, " ad");
-    if (ns_msg_getflag(handle, ns_f_cd))
+    if (libsres_msg_getflag(handle, ns_f_cd))
         fprintf(file, " cd");
 
     fprintf(file, "; %s: %d", p_section(ns_s_qd, opcode), qdcount);


Index: dnssec-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/dnssec-tools/devel/dnssec-tools.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- dnssec-tools.spec	16 Jan 2009 07:23:12 -0000	1.20
+++ dnssec-tools.spec	26 Jan 2009 21:12:47 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: A suite of tools for managing dnssec aware DNS usage
 Name: dnssec-tools
 Version: 1.4.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: BSD
 Group: System Environment/Base
 URL: http://www.dnssec-tools.org/
@@ -18,6 +18,7 @@
 BuildRequires: perl(Test) perl(ExtUtils::MakeMaker)
 
 Patch4: dnssec-tools-linux-conf-paths-1.2.patch
+Patch5: dnssec-tools-arpa-1.4.1.patch
 
 %description
 
@@ -55,6 +56,7 @@
 %setup -q
 
 %patch4 -p0
+%patch5 -p0
 
 %build
 %configure --with-validator-testcases-file=%{_datadir}/dnssec-tools/validator-testcases --with-perl-build-args="INSTALLDIRS=vendor OPTIMIZE='$RPM_OPT_FLAGS'" --sysconfdir=/etc --with-root-hints=/etc/named.root.hints --with-resolv-conf=/etc/resolv.conf
@@ -282,6 +284,9 @@
 %{_mandir}/man3/val_freeaddrinfo.3.gz
 
 %changelog
+* Mon Jan 26 2009 Wes Hardaker <wjhns174 at hardakers.net> - 1.4.1-5
+- Fixed arpa header compile conflict
+
 * Thu Jan 15 2009 Tomas Mraz <tmraz at redhat.com> - 1.4.1-4
 - rebuild with new openssl