2 files changed, 0 insertions, 78 deletions

diff --git a/net-im/jabberd/files/patch-41884d9919 b/net-im/jabberd/files/patch-41884d9919
deleted file mode 100644
index dc3932eb0767..000000000000
--- a/net-im/jabberd/files/patch-41884d9919
+++ /dev/null
@@ -1,53 +0,0 @@
-diff --git a/util/log.c b/util/log.c
-index edf3919..06835da 100644
---- a/util/log.c
-+++ util/log.c
-@@ -223,12 +223,12 @@ void set_debug_flag(int v)
-     debug_flag = v;
- }
- 
--int set_debug_log_from_config(config_t c)
-+void set_debug_log_from_config(config_t c)
- {
-     return set_debug_file(config_get_one(c, "log.debug", 0));
--};
-+}
- 
--JABBERD2_API int set_debug_file(const char *filename)
-+JABBERD2_API void set_debug_file(const char *filename)
- {
-     // Close debug output file but not stderr
-     if (debug_log_target != 0 &&
-@@ -255,7 +255,7 @@ JABBERD2_API int set_debug_file(const char *filename)
-         // set stderr
-         debug_log_target = stderr;
-     }
--};
-+}
- 
- #else /* DEBUG */
- void debug_log(const char *file, int line, const char *msgfmt, ...)
-@@ -263,4 +263,7 @@ void debug_log(const char *file, int line, const char *msgfmt, ...)
- 
- void set_debug_flag(int v)
- { }
-+
-+void set_debug_log_from_config(config_t c)
-+{ }
- #endif
-diff --git a/util/util.h b/util/util.h
-index 7d3a9da..802e25c 100644
---- a/util/util.h
-+++ util/util.h
-@@ -414,9 +414,9 @@ JABBERD2_API int hex_to_raw(char *in, int inlen, char *out);
- JABBERD2_API int get_debug_flag(void);
- JABBERD2_API void set_debug_flag(int v);
- JABBERD2_API void debug_log(const char *file, int line, const char *msgfmt, ...);
--JABBERD2_API int set_debug_file(const char *filename);
-+JABBERD2_API void set_debug_file(const char *filename);
- 
--JABBERD2_API int set_debug_log_from_config(config_t c);
-+JABBERD2_API void set_debug_log_from_config(config_t c);
- 
- #define ZONE __FILE__,__LINE__
- #define MAX_DEBUG 8192
diff --git a/net-im/jabberd/files/patch-cve-2012-3525 b/net-im/jabberd/files/patch-cve-2012-3525
deleted file mode 100644
index a9afdbd9af20..000000000000
--- a/net-im/jabberd/files/patch-cve-2012-3525
+++ /dev/null
@@ -1,25 +0,0 @@
-Fixes CVE-2012-3525
-
-Obtained-from: https://github.com/Jabberd2/jabberd2/commit/aabcffae560d5fd00cd1d2ffce5d760353cf0a4d.diff
-diff --git a/s2s/out.c b/s2s/out.c
-index 0ed9b30..7b9f44f 100644
---- s2s/out.c
-+++ s2s/out.c
-@@ -1661,7 +1661,7 @@ static void _out_result(conn_t out, nad_t nad) {
-     rkeylen = strlen(rkey);
- 
-     /* key is valid */
--    if(nad_find_attr(nad, 0, -1, "type", "valid") >= 0) {
-+    if(nad_find_attr(nad, 0, -1, "type", "valid") >= 0 && xhash_get(out->states, rkey) == (void*) conn_INPROGRESS) {
-         log_write(out->s2s->log, LOG_NOTICE, "[%d] [%s, port=%d] outgoing route '%s' is now valid%s%s", out->fd->fd, out->ip, out->port, rkey, (out->s->flags & SX_SSL_WRAPPER) ? ", TLS negotiated" : "", out->s->compressed ? ", ZLIB compression enabled" : "");
- 
-         xhash_put(out->states, pstrdup(xhash_pool(out->states), rkey), (void *) conn_VALID);    /* !!! small leak here */
-@@ -1749,7 +1749,7 @@ static void _out_verify(conn_t out, nad_t nad) {
-     rkey = s2s_route_key(NULL, to->domain, from->domain);
- 
-     attr = nad_find_attr(nad, 0, -1, "type", "valid");
--    if(attr >= 0) {
-+    if(attr >= 0 && xhash_get(in->states, rkey) == (void*) conn_INPROGRESS) {
-         xhash_put(in->states, pstrdup(xhash_pool(in->states), rkey), (void *) conn_VALID);
-         log_write(in->s2s->log, LOG_NOTICE, "[%d] [%s, port=%d] incoming route '%s' is now valid%s%s", in->fd->fd, in->ip, in->port, rkey, (in->s->flags & SX_SSL_WRAPPER) ? ", TLS negotiated" : "", in->s->compressed ? ", ZLIB compression enabled" : "");
-         valid = 1;