aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2012-03-30 15:23:10 +0300
committerTimo Teräs <timo.teras@iki.fi>2012-03-30 15:23:10 +0300
commit0e6ee4189fa8d293eb9b840d76df43dd003d08e6 (patch)
treeee67025e6323f815962a4b7d48566d1310fd344d
parent2833f5bbfce09acde517fd626eb912b73bac35ff (diff)
downloadaports-0e6ee4189fa8d293eb9b840d76df43dd003d08e6.tar.bz2
aports-0e6ee4189fa8d293eb9b840d76df43dd003d08e6.tar.xz
main/libspf2: add missing patch
-rw-r--r--main/libspf2/libspf2-libreplace-fix.patch61
1 files changed, 61 insertions, 0 deletions
diff --git a/main/libspf2/libspf2-libreplace-fix.patch b/main/libspf2/libspf2-libreplace-fix.patch
new file mode 100644
index 0000000000..4f7c63a2fe
--- /dev/null
+++ b/main/libspf2/libspf2-libreplace-fix.patch
@@ -0,0 +1,61 @@
+diff --git a/src/libreplace/__ns_initparse.c b/src/libreplace/__ns_initparse.c
+index 10a7c9c..f22fa09 100644
+--- a/src/libreplace/__ns_initparse.c
++++ b/src/libreplace/__ns_initparse.c
+@@ -52,26 +52,6 @@ static void setsection(ns_msg *msg, ns_sect sect);
+
+ /* Public. */
+
+-/* These need to be in the same order as the nres.h:ns_flag enum. */
+-struct _ns_flagdata _ns_flagdata[16] = {
+- { 0x8000, 15 }, /* qr. */
+- { 0x7800, 11 }, /* opcode. */
+- { 0x0400, 10 }, /* aa. */
+- { 0x0200, 9 }, /* tc. */
+- { 0x0100, 8 }, /* rd. */
+- { 0x0080, 7 }, /* ra. */
+- { 0x0040, 6 }, /* z. */
+- { 0x0020, 5 }, /* ad. */
+- { 0x0010, 4 }, /* cd. */
+- { 0x000f, 0 }, /* rcode. */
+- { 0x0000, 0 }, /* expansion (1/6). */
+- { 0x0000, 0 }, /* expansion (2/6). */
+- { 0x0000, 0 }, /* expansion (3/6). */
+- { 0x0000, 0 }, /* expansion (4/6). */
+- { 0x0000, 0 }, /* expansion (5/6). */
+- { 0x0000, 0 }, /* expansion (6/6). */
+-};
+-
+ int
+ ns_skiprr(const u_char *ptr, const u_char *eom, ns_sect section, int count) {
+ const u_char *optr = ptr;
+diff --git a/src/libreplace/__ns_msg_getflag.c b/src/libreplace/__ns_msg_getflag.c
+index 19bfb88..a46c017 100644
+--- a/src/libreplace/__ns_msg_getflag.c
++++ b/src/libreplace/__ns_msg_getflag.c
+@@ -11,6 +11,25 @@
+ #include "arpa_nameser.h"
+
+
++/* These need to be in the same order as the nres.h:ns_flag enum. */
++struct _ns_flagdata _ns_flagdata[16] = {
++ { 0x8000, 15 }, /* qr. */
++ { 0x7800, 11 }, /* opcode. */
++ { 0x0400, 10 }, /* aa. */
++ { 0x0200, 9 }, /* tc. */
++ { 0x0100, 8 }, /* rd. */
++ { 0x0080, 7 }, /* ra. */
++ { 0x0040, 6 }, /* z. */
++ { 0x0020, 5 }, /* ad. */
++ { 0x0010, 4 }, /* cd. */
++ { 0x000f, 0 }, /* rcode. */
++ { 0x0000, 0 }, /* expansion (1/6). */
++ { 0x0000, 0 }, /* expansion (2/6). */
++ { 0x0000, 0 }, /* expansion (3/6). */
++ { 0x0000, 0 }, /* expansion (4/6). */
++ { 0x0000, 0 }, /* expansion (5/6). */
++ { 0x0000, 0 }, /* expansion (6/6). */
++};
+
+ int __ns_msg_getflag(ns_msg handle, int flag) {
+ return(((handle)._flags & _ns_flagdata[flag].mask) >> _ns_flagdata[flag].shift);