Ticket #1767: arch1.2-1.2_1.patch

Portfile

@@ -3 +3 @@
 PortSystem 1.0
 name             arch
 version          1.2
+revision         1
 distname         tla-${version}
 categories       devel
 maintainers      toby@opendarwin.org
@@ -20 +21 @@
 
 master_sites     gnu:gnu-arch
 checksums        md5 1fbc9cd83c37ad6e88e9e6a5f0b62871
+patchfiles       patch-libneon-ne_207.c patch-libneon-ne_props.c \
+                 patch-libneon-ne_auth.c patch-libneon-ne_xml.c \
+                 patch-libneon-ne_locks.c
+
 
 worksrcdir       ${distname}/src/=build
 
-pre-configure {
+pre-patch {
     file mkdir ${worksrcpath}
 }
 configure.cmd    ../configure

files/patch-libneon-ne_207.c

@@ +1 @@
+--- ../tla/libneon.orig/ne_207.c        Sat Dec  6 20:35:28 2003
++++ ../tla/libneon/ne_207.c     Sat Apr 17 20:25:46 2004
+@@ -320,12 +320,12 @@
+        if (ne_get_status(req)->code == 207) {
+            if (!ne_xml_valid(p)) { 
+                /* The parse was invalid */
+-               ne_set_error(sess, ne_xml_get_error(p));
+-               ret = NE_ERROR;
++               ne_set_error(sess, "%s", ne_xml_get_error(p));
++                       ret = NE_ERROR;
+            } else if (ctx.is_error) {
+                /* If we've actually got any error information
+                 * from the 207, then set that as the error */
+-               ne_set_error(sess, ctx.buf->data);
++                ne_set_error(sess, "%s", ctx.buf->data);
+                ret = NE_ERROR;
+            }
+        } else if (ne_get_status(req)->klass != 2) {

files/patch-libneon-ne_auth.c

@@ +1 @@
+--- ../tla/libneon.orig/ne_auth.c       Sat Dec  6 20:35:28 2003
++++ ../tla/libneon/ne_auth.c    Sat Apr 17 20:11:55 2004
+@@ -950,7 +950,7 @@
+     if (areq->auth_info_hdr != NULL && 
+        verify_response(areq, sess, areq->auth_info_hdr)) {
+        NE_DEBUG(NE_DBG_HTTPAUTH, "Response authentication invalid.\n");
+-       ne_set_error(sess->sess, _(sess->spec->fail_msg));
++       ne_set_error(sess->sess, "%s", _(sess->spec->fail_msg));
+        ret = NE_ERROR;
+     } else if (status->code == sess->spec->status_code && 
+               areq->auth_hdr != NULL) {

files/patch-libneon-ne_locks.c

@@ +1 @@
+--- ../tla/libneon.orig/ne_locks.c      Sat Dec  6 20:35:28 2003
++++ ../tla/libneon/ne_locks.c   Sat Apr 17 20:11:55 2004
+@@ -734,7 +734,7 @@
+        }
+        else if (parse_failed) {
+            ret = NE_ERROR;
+-           ne_set_error(sess, ne_xml_get_error(parser));
++           ne_set_error(sess, "%s", ne_xml_get_error(parser));
+        }
+        else if (ne_get_status(req)->code == 207) {
+            ret = NE_ERROR;
+@@ -802,7 +802,7 @@
+     if (ret == NE_OK && ne_get_status(req)->klass == 2) {
+        if (parse_failed) {
+            ret = NE_ERROR;
+-           ne_set_error(sess, ne_xml_get_error(parser));
++           ne_set_error(sess, "%s", ne_xml_get_error(parser));
+        }
+        else if (ne_get_status(req)->code == 207) {
+            ret = NE_ERROR;

files/patch-libneon-ne_props.c

@@ +1 @@
+--- ../tla/libneon.orig/ne_props.c      Sat Dec  6 20:35:28 2003
++++ ../tla/libneon/ne_props.c   Sat Apr 17 20:11:55 2004
+@@ -142,7 +142,7 @@
+     if (ret == NE_OK && ne_get_status(req)->klass != 2) {
+        ret = NE_ERROR;
+     } else if (!ne_xml_valid(handler->parser)) {
+-       ne_set_error(handler->sess, ne_xml_get_error(handler->parser));
++       ne_set_error(handler->sess, "%s", ne_xml_get_error(handler->parser));
+        ret = NE_ERROR;
+     }
+ 

files/patch-libneon-ne_xml.c

@@ +1 @@
+--- ../tla/libneon.orig/ne_xml.c        Sat Dec  6 20:35:29 2003
++++ ../tla/libneon/ne_xml.c     Sat Apr 17 20:11:55 2004
+@@ -538,7 +538,7 @@
+ 
+ void ne_xml_set_error(ne_xml_parser *p, const char *msg)
+ {
+-    ne_snprintf(p->error, ERR_SIZE, msg);
++    ne_snprintf(p->error, ERR_SIZE, "%s", msg);
+ }
+ 
+ #ifdef HAVE_LIBXML