| 1 |
gentoofan23 08/06/20 19:16:51 |
| 2 |
|
| 3 |
Modified: jabberd-1.6.1.1-sandbox.patch |
| 4 |
Added: jabberd-1.6.1.1-undefineddebug.patch |
| 5 |
Log: |
| 6 |
Revision bump; fixes bug #228021, bug #228375, and bug #226411; Also removing nelchael from metadata.xml as he is no longer maintaining this package; Remove USE flags that do nothing; Disable conditional gnutls dependency as its always necessary |
| 7 |
(Portage version: 2.1.4.4) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 net-im/jabberd/files/jabberd-1.6.1.1-sandbox.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/jabberd/files/jabberd-1.6.1.1-sandbox.patch?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/jabberd/files/jabberd-1.6.1.1-sandbox.patch?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/jabberd/files/jabberd-1.6.1.1-sandbox.patch?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: jabberd-1.6.1.1-sandbox.patch |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/net-im/jabberd/files/jabberd-1.6.1.1-sandbox.patch,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- jabberd-1.6.1.1-sandbox.patch 9 Jun 2008 20:22:03 -0000 1.1 |
| 23 |
+++ jabberd-1.6.1.1-sandbox.patch 20 Jun 2008 19:16:50 -0000 1.2 |
| 24 |
@@ -1,14 +1,11 @@ |
| 25 |
-diff -ur jabberd14-1.6.1.1.orig/po/Makefile.in jabberd14-1.6.1.1.patched/po/Makefile.in |
| 26 |
---- jabberd14-1.6.1.1.orig/po/Makefile.in 2007-07-19 04:24:44.000000000 +0600 |
| 27 |
-+++ jabberd14-1.6.1.1.patched/po/Makefile.in 2008-01-11 18:05:36.000000000 +0500 |
| 28 |
-@@ -335,8 +335,8 @@ |
| 29 |
+--- jabberd14-1.6.1.1-orig/po/Makefile.am 2007-04-07 15:43:17.000000000 -0400 |
| 30 |
++++ jabberd14-1.6.1.1/po/Makefile.am 2008-06-18 13:35:10.000000000 -0400 |
| 31 |
+@@ -11,6 +11,6 @@ |
| 32 |
|
| 33 |
install-data-hook: |
| 34 |
-for f in $(LANGS); do \ |
| 35 |
- test -z "$(localedir)/$${f%.po}/LC_MESSAGES" || $(mkdir_p) "$(localedir)/$${f%.po}/LC_MESSAGES"; \ |
| 36 |
- msgfmt -o "$(localedir)/$${f%.po}/LC_MESSAGES/jabberd14.mo" $$f; \ |
| 37 |
-+ test -z "$(DESTDIR)$(localedir)/$${f%.po}/LC_MESSAGES" || $(mkdir_p) "$(DESTDIR)$(localedir)/$${f%.po}/LC_MESSAGES"; \ |
| 38 |
++ test -z "$(localedir)/$${f%.po}/LC_MESSAGES" || $(mkdir_p) "$(DESTDIR)/$(localedir)/$${f%.po}/LC_MESSAGES"; \ |
| 39 |
+ msgfmt -o "$(DESTDIR)$(localedir)/$${f%.po}/LC_MESSAGES/jabberd14.mo" $$f; \ |
| 40 |
done |
| 41 |
- # Tell versions [3.59,3.63) of GNU make to not export all variables. |
| 42 |
- # Otherwise a system limit (for SysV at least) may be exceeded. |
| 43 |
|
| 44 |
|
| 45 |
|
| 46 |
1.1 net-im/jabberd/files/jabberd-1.6.1.1-undefineddebug.patch |
| 47 |
|
| 48 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/jabberd/files/jabberd-1.6.1.1-undefineddebug.patch?rev=1.1&view=markup |
| 49 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/jabberd/files/jabberd-1.6.1.1-undefineddebug.patch?rev=1.1&content-type=text/plain |
| 50 |
|
| 51 |
Index: jabberd-1.6.1.1-undefineddebug.patch |
| 52 |
=================================================================== |
| 53 |
diff -aur jabberd14-1.6.1.1-orig/jabberd/jabberd.cc jabberd14-1.6.1.1/jabberd/jabberd.cc |
| 54 |
--- jabberd14-1.6.1.1-orig/jabberd/jabberd.cc 2007-04-07 15:43:18.000000000 -0400 |
| 55 |
+++ jabberd14-1.6.1.1/jabberd/jabberd.cc 2008-06-19 08:48:00.000000000 -0400 |
| 56 |
@@ -51,7 +51,6 @@ |
| 57 |
|
| 58 |
#include <popt.h> |
| 59 |
|
| 60 |
-xht debug__zones = NULL; /**< the debugging zones, that are enabled (key = zone string, value = zone string) */ |
| 61 |
extern int deliver__flag; |
| 62 |
extern xmlnode greymatter__; |
| 63 |
|
| 64 |
diff -aur jabberd14-1.6.1.1-orig/jabberd/jabberd.h jabberd14-1.6.1.1/jabberd/jabberd.h |
| 65 |
--- jabberd14-1.6.1.1-orig/jabberd/jabberd.h 2007-07-20 09:51:08.000000000 -0400 |
| 66 |
+++ jabberd14-1.6.1.1/jabberd/jabberd.h 2008-06-19 08:48:08.000000000 -0400 |
| 67 |
@@ -109,6 +109,8 @@ |
| 68 |
# include <gnutls/openpgp.h> |
| 69 |
#endif |
| 70 |
|
| 71 |
+static xht debug__zones = NULL; /**< the debugging zones, that are enabled (key = zone string, value = zone string) */ |
| 72 |
+ |
| 73 |
/** Packet types */ |
| 74 |
typedef enum { p_NONE, p_NORM, p_XDB, p_LOG, p_ROUTE } ptype; |
| 75 |
|
| 76 |
--- jabberd14-1.6.1.1-orig/xdb_file/xdbfiletool.cc 2007-07-21 18:36:29.000000000 -0400 |
| 77 |
+++ jabberd14-1.6.1.1/xdb_file/xdbfiletool.cc 2008-06-19 11:56:33.000000000 -0400 |
| 78 |
@@ -37,7 +37,7 @@ |
| 79 |
* we have to remove these globals (or at least move them |
| 80 |
* inside the library |
| 81 |
*/ |
| 82 |
-xht debug__zones; |
| 83 |
+extern xht debug__zones; |
| 84 |
|
| 85 |
/* end of hack */ |
| 86 |
|
| 87 |
|
| 88 |
|
| 89 |
|
| 90 |
|
| 91 |
-- |
| 92 |
gentoo-commits@l.g.o mailing list |
Archives