[Pkg-xmpp-commits] [SCM] Jabberd2 XMPP server branch, master, updated. upstream/2.2.17-20-g03771f3

[W. van den Akker]

The following commit has been merged in the master branch:
commit d6972f00b005710f0fe1955d61c654aeafdc1e9d
Author: W. van den Akker <wvdakker at wilsoft.nl>
Date:   Wed Jan 16 11:41:43 2013 +0100

    Remove patches CVE-2011-1755.dpatch and implicit-pointer-conversion.dpatch.
    These are now included in upstream.

diff --git a/debian/changelog b/debian/changelog
index d3bbf37..ae35c03 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 jabberd2 (2.2.17-1) UNRELEASED; urgency=low
 
-  *   * New upstream version (Closes: #637112, #547767).
+  * New upstream version (Closes: #637112, #547767).
+  * Removed CVE-2011-1755.dpatch. Is now included in upstream source.
+  * Removed implicit-pointer-conversion.dpatch. Is now included in 
+    upstream source.
 
  -- Willem van den Akker <wvdakker at wilsoft.nl>  Wed, 16 Jan 2013 10:00:41 +0100
 
diff --git a/debian/patches/00list b/debian/patches/00list
index e276d3d..5afea71 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -2,5 +2,3 @@ pkgname.dpatch
 etc_pidpath.dpatch
 etc_logpath.dpatch
 etc_dbpath.dpatch
-implicit-pointer-conversion.dpatch
-CVE-2011-1755.dpatch
diff --git a/debian/patches/CVE-2011-1755.dpatch b/debian/patches/CVE-2011-1755.dpatch
deleted file mode 100644
index 3f4fab6..0000000
--- a/debian/patches/CVE-2011-1755.dpatch
+++ /dev/null
@@ -1,29 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## CVE-2011-1755.dpatch by Nico Golde <nion at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: disable entity expansian to prevent billion laughs attack
-
- at DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' jabberd2-2.2.8~/sx/sx.c jabberd2-2.2.8/sx/sx.c
---- jabberd2-2.2.8~/sx/sx.c	2009-04-27 11:05:13.000000000 +0200
-+++ jabberd2-2.2.8/sx/sx.c	2011-05-30 23:40:27.000000000 +0200
-@@ -36,6 +36,7 @@
-     s->expat = XML_ParserCreateNS(NULL, '|');
-     XML_SetReturnNSTriplet(s->expat, 1);
-     XML_SetUserData(s->expat, (void *) s);
-+    XML_SetDefaultHandler(s->expat, NULL);
- 
-     s->wbufq = jqueue_new();
-     s->rnadq = jqueue_new();
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' jabberd2-2.2.8~/util/nad.c jabberd2-2.2.8/util/nad.c
---- jabberd2-2.2.8~/util/nad.c	2009-04-27 11:05:15.000000000 +0200
-+++ jabberd2-2.2.8/util/nad.c	2011-05-30 23:40:27.000000000 +0200
-@@ -1331,6 +1331,7 @@
-         return NULL;
- 
-     XML_SetReturnNSTriplet(p, 1);
-+    XML_SetDefaultHandler(p, NULL);
- 
-     bd.nad = nad_new();
-     bd.depth = 0;
diff --git a/debian/patches/implicit-pointer-conversion.dpatch b/debian/patches/implicit-pointer-conversion.dpatch
deleted file mode 100755
index 41022cc..0000000
--- a/debian/patches/implicit-pointer-conversion.dpatch
+++ /dev/null
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## implicit-pointer-conversion.dpatch by Jorge Salamero Sanz <bencer at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad jabberd2~/storage/authreg_mysql.c jabberd2/storage/authreg_mysql.c
---- jabberd2~/storage/authreg_mysql.c	2009-04-27 10:05:14.000000000 +0100
-+++ jabberd2/storage/authreg_mysql.c	2009-05-01 15:18:35.000000000 +0100
-@@ -19,6 +19,7 @@
-  */
- 
- /* this module talks to a MySQL server via libmysqlclient */
-+#define _XOPEN_SOURCE 1
- 
- #include "c2s.h"
- #include <mysql.h>

-- 
Jabberd2 XMPP server