removed unnecessary (and b0rken) patch file for 2.2.17

This commit is contained in:
Manuel Friedli 2013-01-12 15:46:21 +00:00
parent 97e9ae31a8
commit 9cfccbae65
3 changed files with 1 additions and 57 deletions

View file

@ -3,7 +3,6 @@ AUX jabberd2-2.2.1.pamd 158 SHA256 eba4b5cc68b3dd327cfa1afdadbe5adf6d9383f4c79c7
AUX jabberd2-2.2.16-no_debug.patch 1597 SHA256 705e041cd90a25c33628cc398c6c62ada46142d70c21315f5fb0d52d5ea02bc0 SHA512 306ca11839756b2289c5deaee8c55148546f9301a3c3a8343eb652cdc90f337c1d2d3e555ab348b19b41f17f781c4d5b0f532502e87ce6d7981b043e0dd42713 WHIRLPOOL 476151b962a2deb6ababdcddbcd558d4363656f5219e719a6e6ce156295b405a31d33059a8689293041122f14076694da7fe68b32d30469ea4c6b63ca446ddd4 AUX jabberd2-2.2.16-no_debug.patch 1597 SHA256 705e041cd90a25c33628cc398c6c62ada46142d70c21315f5fb0d52d5ea02bc0 SHA512 306ca11839756b2289c5deaee8c55148546f9301a3c3a8343eb652cdc90f337c1d2d3e555ab348b19b41f17f781c4d5b0f532502e87ce6d7981b043e0dd42713 WHIRLPOOL 476151b962a2deb6ababdcddbcd558d4363656f5219e719a6e6ce156295b405a31d33059a8689293041122f14076694da7fe68b32d30469ea4c6b63ca446ddd4
AUX jabberd2-2.2.16.init 1625 SHA256 648f0e659175a060f852df502316db8221f622ad27b9085c8770aca20db151d9 SHA512 526f5a6e07c745532af019ced5ec2aa936c42c23f68720c16d5b8c45f779bf80afa9d7ab268888c56414f9c6d1393900f4bde68bc75ec4e8ac65d0cf33116c94 WHIRLPOOL a45d9b47ef3f9619bb120acd9658c1b15e1b16a0da1e644a12a52363a999131443cd7ca334b71fbc83427e0c75205b95e3aa312ff7fc66f266bc5198da89c699 AUX jabberd2-2.2.16.init 1625 SHA256 648f0e659175a060f852df502316db8221f622ad27b9085c8770aca20db151d9 SHA512 526f5a6e07c745532af019ced5ec2aa936c42c23f68720c16d5b8c45f779bf80afa9d7ab268888c56414f9c6d1393900f4bde68bc75ec4e8ac65d0cf33116c94 WHIRLPOOL a45d9b47ef3f9619bb120acd9658c1b15e1b16a0da1e644a12a52363a999131443cd7ca334b71fbc83427e0c75205b95e3aa312ff7fc66f266bc5198da89c699
AUX jabberd2-2.2.16.pamd 158 SHA256 eba4b5cc68b3dd327cfa1afdadbe5adf6d9383f4c79c7661169a4339e40b9a7b SHA512 a52bec9577f028f1141002d0ffaaf11615699a67a7b3677774d7e8aa6595c8291cb6ebcdc0f874e54f700e3b437ae05e05b8d7c8c717dee15cb7d908a954b979 WHIRLPOOL 2289538542300efe78a261285359c6e5ad9151cc01123e3c5579cc72393ce94308d713e38d73bc418c5bc9d7f7a200469568b7b3187b576b3efa8efa19dda919 AUX jabberd2-2.2.16.pamd 158 SHA256 eba4b5cc68b3dd327cfa1afdadbe5adf6d9383f4c79c7661169a4339e40b9a7b SHA512 a52bec9577f028f1141002d0ffaaf11615699a67a7b3677774d7e8aa6595c8291cb6ebcdc0f874e54f700e3b437ae05e05b8d7c8c717dee15cb7d908a954b979 WHIRLPOOL 2289538542300efe78a261285359c6e5ad9151cc01123e3c5579cc72393ce94308d713e38d73bc418c5bc9d7f7a200469568b7b3187b576b3efa8efa19dda919
AUX jabberd2-2.2.17-no_debug.patch 1597 SHA256 705e041cd90a25c33628cc398c6c62ada46142d70c21315f5fb0d52d5ea02bc0 SHA512 306ca11839756b2289c5deaee8c55148546f9301a3c3a8343eb652cdc90f337c1d2d3e555ab348b19b41f17f781c4d5b0f532502e87ce6d7981b043e0dd42713 WHIRLPOOL 476151b962a2deb6ababdcddbcd558d4363656f5219e719a6e6ce156295b405a31d33059a8689293041122f14076694da7fe68b32d30469ea4c6b63ca446ddd4
AUX jabberd2-2.2.17.init 1743 SHA256 6efed83f6513a2eb1aded8cfb88a34d184bdc1141b2f7b7f90e925c4239e0a0b SHA512 8ba8e894232bdce530944ee4b0c5b473e75f0a65f1edbc498cb143c8a5726e55dff377e18566a2cbc4069e3e8652df1253516bdf341737a719012d4cc3959532 WHIRLPOOL 30145da91aca78f0e6fceaad267d39b7d28b5fd8c0dd1f11f40cb9bcafcda0c292c4944cdceeda697c3f91fa2844f53e0ab37909fd61aa633128545209a6b287 AUX jabberd2-2.2.17.init 1743 SHA256 6efed83f6513a2eb1aded8cfb88a34d184bdc1141b2f7b7f90e925c4239e0a0b SHA512 8ba8e894232bdce530944ee4b0c5b473e75f0a65f1edbc498cb143c8a5726e55dff377e18566a2cbc4069e3e8652df1253516bdf341737a719012d4cc3959532 WHIRLPOOL 30145da91aca78f0e6fceaad267d39b7d28b5fd8c0dd1f11f40cb9bcafcda0c292c4944cdceeda697c3f91fa2844f53e0ab37909fd61aa633128545209a6b287
AUX jabberd2-2.2.17.pamd 158 SHA256 eba4b5cc68b3dd327cfa1afdadbe5adf6d9383f4c79c7661169a4339e40b9a7b SHA512 a52bec9577f028f1141002d0ffaaf11615699a67a7b3677774d7e8aa6595c8291cb6ebcdc0f874e54f700e3b437ae05e05b8d7c8c717dee15cb7d908a954b979 WHIRLPOOL 2289538542300efe78a261285359c6e5ad9151cc01123e3c5579cc72393ce94308d713e38d73bc418c5bc9d7f7a200469568b7b3187b576b3efa8efa19dda919 AUX jabberd2-2.2.17.pamd 158 SHA256 eba4b5cc68b3dd327cfa1afdadbe5adf6d9383f4c79c7661169a4339e40b9a7b SHA512 a52bec9577f028f1141002d0ffaaf11615699a67a7b3677774d7e8aa6595c8291cb6ebcdc0f874e54f700e3b437ae05e05b8d7c8c717dee15cb7d908a954b979 WHIRLPOOL 2289538542300efe78a261285359c6e5ad9151cc01123e3c5579cc72393ce94308d713e38d73bc418c5bc9d7f7a200469568b7b3187b576b3efa8efa19dda919
AUX jabberd2-2.2.4.init 1625 SHA256 f01a66b3303f1ac366492e913a82952996b75619335ae210357e43e4fbed37a7 SHA512 df57e053ca7e4a8af841d659295ea4a5d747b21b6ae49f238a66cb7583e6cee6e50b5ad2781c42bda142a16e6bc9bce1aecfb12bec4b1974b652639f1e164ee8 WHIRLPOOL 3c56c3f588048db901dcf20554387e303df0876d9a6962406568e4a061854930f8b1b539d8b1a35ba1a175c2f4ba39929709ab009a8a529bc161a6bd19adad5d AUX jabberd2-2.2.4.init 1625 SHA256 f01a66b3303f1ac366492e913a82952996b75619335ae210357e43e4fbed37a7 SHA512 df57e053ca7e4a8af841d659295ea4a5d747b21b6ae49f238a66cb7583e6cee6e50b5ad2781c42bda142a16e6bc9bce1aecfb12bec4b1974b652639f1e164ee8 WHIRLPOOL 3c56c3f588048db901dcf20554387e303df0876d9a6962406568e4a061854930f8b1b539d8b1a35ba1a175c2f4ba39929709ab009a8a529bc161a6bd19adad5d
@ -15,4 +14,4 @@ AUX jabberd2-2.2.8.pamd 158 SHA256 eba4b5cc68b3dd327cfa1afdadbe5adf6d9383f4c79c7
DIST jabberd-2.2.16.tar.gz 2818476 SHA256 112844e0319dc31faf9225930fe10f811b9faefe2e4e30b73d8e3ab965a7d4bf SHA512 dfa4f6ea5f01ea3c689d42bd51aab909b447d93ad5ecbd8ba6d1c93901cf22f0c99c7d1cf59cb841b7802e5baabf83535d7458aa8a6a50a263f818185fb85457 WHIRLPOOL 2104490084e2b72a5d3411c661590b9dd7b33015ba07625f8e2bb86739d50c927248daf603e2c3108c21bf7a4995bf9dfef99ff44f8cac90065c85877f4f988b DIST jabberd-2.2.16.tar.gz 2818476 SHA256 112844e0319dc31faf9225930fe10f811b9faefe2e4e30b73d8e3ab965a7d4bf SHA512 dfa4f6ea5f01ea3c689d42bd51aab909b447d93ad5ecbd8ba6d1c93901cf22f0c99c7d1cf59cb841b7802e5baabf83535d7458aa8a6a50a263f818185fb85457 WHIRLPOOL 2104490084e2b72a5d3411c661590b9dd7b33015ba07625f8e2bb86739d50c927248daf603e2c3108c21bf7a4995bf9dfef99ff44f8cac90065c85877f4f988b
DIST jabberd-2.2.17.tar.gz 636543 SHA256 2f14860928b4ef8ad0ed49a24d6946db48d64166fa08a7cacd22e0cd7ad45843 SHA512 f9e637868ed147f92445b58c4ecd5b38a36e52e7b32a07ce37778781c50eb84dbe4436929cbf39d814c92b473fa62ddabbd55015ffda9320580f59b882970017 WHIRLPOOL cdb8d917f8f8c4e722ef6526e8aa83bf8eb729f6cc7a1056bc36efb7a7a8aaa91b66c5305a6a14cce834d350f1c64adb8646800686f995b817edc5b5c0a11174 DIST jabberd-2.2.17.tar.gz 636543 SHA256 2f14860928b4ef8ad0ed49a24d6946db48d64166fa08a7cacd22e0cd7ad45843 SHA512 f9e637868ed147f92445b58c4ecd5b38a36e52e7b32a07ce37778781c50eb84dbe4436929cbf39d814c92b473fa62ddabbd55015ffda9320580f59b882970017 WHIRLPOOL cdb8d917f8f8c4e722ef6526e8aa83bf8eb729f6cc7a1056bc36efb7a7a8aaa91b66c5305a6a14cce834d350f1c64adb8646800686f995b817edc5b5c0a11174
EBUILD jabberd2-2.2.16.ebuild 3056 SHA256 eca1e557d33d53f5b1b324dc44ec6ba803da3557565a3d06b82f11d7600cf517 SHA512 1c85da4ff9fe40d9e005006fc77acaff498f6e36f0955267791d3c4ef368d750f5e332b0c0cc076e6b6670dcc4b02130d1169c3345a4dde7a81162becdbbaa56 WHIRLPOOL 65ea9c775a73e01d637a07ac815826085b7490c4aca8cae029326aa8d46cde8a32dd71b729b670ecbca9583c15d9e0045ae2fad44ca1928683dfafde4956f3a4 EBUILD jabberd2-2.2.16.ebuild 3056 SHA256 eca1e557d33d53f5b1b324dc44ec6ba803da3557565a3d06b82f11d7600cf517 SHA512 1c85da4ff9fe40d9e005006fc77acaff498f6e36f0955267791d3c4ef368d750f5e332b0c0cc076e6b6670dcc4b02130d1169c3345a4dde7a81162becdbbaa56 WHIRLPOOL 65ea9c775a73e01d637a07ac815826085b7490c4aca8cae029326aa8d46cde8a32dd71b729b670ecbca9583c15d9e0045ae2fad44ca1928683dfafde4956f3a4
EBUILD jabberd2-2.2.17.ebuild 3050 SHA256 c3c83468c969c6f42739bd5f1b89ee471f2bf805fca24c14775d62c05c73088c SHA512 2d70a34aa0c4b74eb4bdacc7ed36e5255dab789436d298e31146f6fbc75f389d56037ce4504abef770ecc4131a55d1e187da121c67f15a93c3f574277a32e9b0 WHIRLPOOL 03c8d4462f695b1b81715d33156fc43d05eb4f28332eb41bb9ce854568529765e0c659decb8d06b815fa2ad585fca63d642de0c47dcf6bc93e14ca8abed22799 EBUILD jabberd2-2.2.17.ebuild 2976 SHA256 2b393ab81c62bcc65e07a5068419b24552e9bf72832902be9598471e6b16d575 SHA512 ce1a7a7e6bb54b4b61a7b63bc0f279ace63df3a1c445fd8849de12977b55887bbf2eb843ce31f4c1a50399e15c289d5d009b977a2859408b8825879db67f2a41 WHIRLPOOL 7bd560ee2c6db8e81f83933b92fbe3382d8a78decba9126388326281dbcb44484624735430f8539004fc6cad723b2503843a906f1cf45de856dd1eb420249c91

View file

@ -1,51 +0,0 @@
diff -ur jabberd-2.2.16/util/log.c jabberd-2.2.16_patched/util/log.c
--- jabberd-2.2.16/util/log.c 2012-05-04 14:51:08.000000000 +0000
+++ jabberd-2.2.16_patched/util/log.c 2012-07-25 08:10:49.004560934 +0000
@@ -223,12 +223,12 @@
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 @@
// set stderr
debug_log_target = stderr;
}
-};
+}
#else /* DEBUG */
void debug_log(const char *file, int line, const char *msgfmt, ...)
@@ -263,4 +263,7 @@
void set_debug_flag(int v)
{ }
+
+void set_debug_log_from_config(config_t c)
+{ }
#endif
diff -ur jabberd-2.2.16/util/util.h jabberd-2.2.16_patched/util/util.h
--- jabberd-2.2.16/util/util.h 2012-05-04 14:51:08.000000000 +0000
+++ jabberd-2.2.16_patched/util/util.h 2012-07-25 08:11:19.612564607 +0000
@@ -414,9 +414,9 @@
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

View file

@ -34,10 +34,6 @@ RDEPEND="${DEPEND}
S="${WORKDIR}/jabberd-${PV}" S="${WORKDIR}/jabberd-${PV}"
src_prepare() {
use debug || epatch "${FILESDIR}/${P}-no_debug.patch"
}
src_compile() { src_compile() {
# https://bugs.gentoo.org/show_bug.cgi?id=207655#c3 # https://bugs.gentoo.org/show_bug.cgi?id=207655#c3