summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--net-im/jabberd/Manifest22
-rw-r--r--net-im/jabberd/files/digest-jabberd-2.1.11-r2 (renamed from net-im/jabberd/files/digest-jabberd-2.1.11-r1)0
-rw-r--r--net-im/jabberd/files/jabberd-2.1.11-r2.patch (renamed from net-im/jabberd/files/jabberd-2.1.11-r1.patch)38
-rw-r--r--net-im/jabberd/jabberd-2.1.11-r2.ebuild (renamed from net-im/jabberd/jabberd-2.1.11-r1.ebuild)0
4 files changed, 46 insertions, 14 deletions
diff --git a/net-im/jabberd/Manifest b/net-im/jabberd/Manifest
index 9af6591..c0bfa66 100644
--- a/net-im/jabberd/Manifest
+++ b/net-im/jabberd/Manifest
@@ -1,7 +1,7 @@
1AUX jabberd-2.1.11-r1.patch 9979 RMD160 bbd543765e41264e544948983e7193b8d50b9b88 SHA1 4e2b56baf5167ec0b3df31757bfe635a58055b55 SHA256 1b5dace5ba604a37e40637ff22eb856daad4f8504fff5337ffb9ffd77298d3bc 1AUX jabberd-2.1.11-r2.patch 11284 RMD160 192d97ba890c98969beedfba7bfad844228dee97 SHA1 97e9bf1a2f9a1b3c89a67440b4cd14cf7e571b50 SHA256 f8ac88a98f1f61bcd0f704209f9b4d507bd324380d38774a34c0246f519b4094
2MD5 2ee77f6ead80438a246b58de2b0ab73f files/jabberd-2.1.11-r1.patch 9979 2MD5 bd174b5023d99250951271bd7f6b7d42 files/jabberd-2.1.11-r2.patch 11284
3RMD160 bbd543765e41264e544948983e7193b8d50b9b88 files/jabberd-2.1.11-r1.patch 9979 3RMD160 192d97ba890c98969beedfba7bfad844228dee97 files/jabberd-2.1.11-r2.patch 11284
4SHA256 1b5dace5ba604a37e40637ff22eb856daad4f8504fff5337ffb9ffd77298d3bc files/jabberd-2.1.11-r1.patch 9979 4SHA256 f8ac88a98f1f61bcd0f704209f9b4d507bd324380d38774a34c0246f519b4094 files/jabberd-2.1.11-r2.patch 11284
5AUX jabberd-2.1.11.init 1404 RMD160 d93784cc30f573f20cd411a1a18578db46121b26 SHA1 ce0e735adbf539c809568aa2c1d3ee49f565600c SHA256 e9d004e8d83cc59f964b49c44aaf64445593ba8157d4b51df83e5e50f4625094 5AUX jabberd-2.1.11.init 1404 RMD160 d93784cc30f573f20cd411a1a18578db46121b26 SHA1 ce0e735adbf539c809568aa2c1d3ee49f565600c SHA256 e9d004e8d83cc59f964b49c44aaf64445593ba8157d4b51df83e5e50f4625094
6MD5 eacd752c3b8eb5f2d4914ca8b3580893 files/jabberd-2.1.11.init 1404 6MD5 eacd752c3b8eb5f2d4914ca8b3580893 files/jabberd-2.1.11.init 1404
7RMD160 d93784cc30f573f20cd411a1a18578db46121b26 files/jabberd-2.1.11.init 1404 7RMD160 d93784cc30f573f20cd411a1a18578db46121b26 files/jabberd-2.1.11.init 1404
@@ -11,10 +11,10 @@ MD5 ab77cef855566260d6a779d8d77bc78c files/jabberd-2.1.11.pamd 158
11RMD160 3143cb1689fbebb51c0d72fa4c6b79ee9c015185 files/jabberd-2.1.11.pamd 158 11RMD160 3143cb1689fbebb51c0d72fa4c6b79ee9c015185 files/jabberd-2.1.11.pamd 158
12SHA256 eba4b5cc68b3dd327cfa1afdadbe5adf6d9383f4c79c7661169a4339e40b9a7b files/jabberd-2.1.11.pamd 158 12SHA256 eba4b5cc68b3dd327cfa1afdadbe5adf6d9383f4c79c7661169a4339e40b9a7b files/jabberd-2.1.11.pamd 158
13DIST jabberd-2.1.11.tar.bz2 1034039 RMD160 540f9f510351c369938005acb7013ea41d77f5b8 SHA1 528df89fd1fc638590811bb4f14b2d0d8a498a56 SHA256 e99a70102896ce28e5e427234ddaa852aacd8a38700264741a40f5781919bea8 13DIST jabberd-2.1.11.tar.bz2 1034039 RMD160 540f9f510351c369938005acb7013ea41d77f5b8 SHA1 528df89fd1fc638590811bb4f14b2d0d8a498a56 SHA256 e99a70102896ce28e5e427234ddaa852aacd8a38700264741a40f5781919bea8
14EBUILD jabberd-2.1.11-r1.ebuild 2931 RMD160 b853d8d199905d0048a856765aeae27f982453ff SHA1 b0e7159bd13439320fdc4d72c0fe5e4ee8dac6bd SHA256 aa07d173367d7509a04f6482f29c36b9878956fc0542cd65dd539962c97079cb 14EBUILD jabberd-2.1.11-r2.ebuild 2931 RMD160 b853d8d199905d0048a856765aeae27f982453ff SHA1 b0e7159bd13439320fdc4d72c0fe5e4ee8dac6bd SHA256 aa07d173367d7509a04f6482f29c36b9878956fc0542cd65dd539962c97079cb
15MD5 38355a04b1112de9d828ba25118a87ad jabberd-2.1.11-r1.ebuild 2931 15MD5 38355a04b1112de9d828ba25118a87ad jabberd-2.1.11-r2.ebuild 2931
16RMD160 b853d8d199905d0048a856765aeae27f982453ff jabberd-2.1.11-r1.ebuild 2931 16RMD160 b853d8d199905d0048a856765aeae27f982453ff jabberd-2.1.11-r2.ebuild 2931
17SHA256 aa07d173367d7509a04f6482f29c36b9878956fc0542cd65dd539962c97079cb jabberd-2.1.11-r1.ebuild 2931 17SHA256 aa07d173367d7509a04f6482f29c36b9878956fc0542cd65dd539962c97079cb jabberd-2.1.11-r2.ebuild 2931
18MISC ChangeLog 15464 RMD160 bac8facc410dced776f4b5d9f0c4b051100f9409 SHA1 2ed0d2fa838de3b4e1d720f577116af6eba842ec SHA256 7ea8ffdf9c099ca3fc43ccb381100ce6b519de8f6bb582305535491373fb8830 18MISC ChangeLog 15464 RMD160 bac8facc410dced776f4b5d9f0c4b051100f9409 SHA1 2ed0d2fa838de3b4e1d720f577116af6eba842ec SHA256 7ea8ffdf9c099ca3fc43ccb381100ce6b519de8f6bb582305535491373fb8830
19MD5 e71dbcd3a38fc84fc22dac39a6019359 ChangeLog 15464 19MD5 e71dbcd3a38fc84fc22dac39a6019359 ChangeLog 15464
20RMD160 bac8facc410dced776f4b5d9f0c4b051100f9409 ChangeLog 15464 20RMD160 bac8facc410dced776f4b5d9f0c4b051100f9409 ChangeLog 15464
@@ -23,6 +23,6 @@ MISC metadata.xml 399 RMD160 e223c713f74619996bc47a70298aa535f6addf09 SHA1 dc9bc
23MD5 be8887bde84aab1d4ff9d5a0f5d50141 metadata.xml 399 23MD5 be8887bde84aab1d4ff9d5a0f5d50141 metadata.xml 399
24RMD160 e223c713f74619996bc47a70298aa535f6addf09 metadata.xml 399 24RMD160 e223c713f74619996bc47a70298aa535f6addf09 metadata.xml 399
25SHA256 f68b0864864ad54de5cf072835fc9903e709987261ad1fc102afb0019aa52377 metadata.xml 399 25SHA256 f68b0864864ad54de5cf072835fc9903e709987261ad1fc102afb0019aa52377 metadata.xml 399
26MD5 c07f7b9a6581fa2f5ea895378ce7f7de files/digest-jabberd-2.1.11-r1 250 26MD5 c07f7b9a6581fa2f5ea895378ce7f7de files/digest-jabberd-2.1.11-r2 250
27RMD160 cb7aaed13753b29cc9f5a1bce8487647ae3a39f2 files/digest-jabberd-2.1.11-r1 250 27RMD160 cb7aaed13753b29cc9f5a1bce8487647ae3a39f2 files/digest-jabberd-2.1.11-r2 250
28SHA256 6d1563e8ca5a90c87768d01e273bfd6cfbe11c93ff70249fb71eeb074b090a39 files/digest-jabberd-2.1.11-r1 250 28SHA256 6d1563e8ca5a90c87768d01e273bfd6cfbe11c93ff70249fb71eeb074b090a39 files/digest-jabberd-2.1.11-r2 250
diff --git a/net-im/jabberd/files/digest-jabberd-2.1.11-r1 b/net-im/jabberd/files/digest-jabberd-2.1.11-r2
index ae7be5e..ae7be5e 100644
--- a/net-im/jabberd/files/digest-jabberd-2.1.11-r1
+++ b/net-im/jabberd/files/digest-jabberd-2.1.11-r2
diff --git a/net-im/jabberd/files/jabberd-2.1.11-r1.patch b/net-im/jabberd/files/jabberd-2.1.11-r2.patch
index 6eba147..dbf441a 100644
--- a/net-im/jabberd/files/jabberd-2.1.11-r1.patch
+++ b/net-im/jabberd/files/jabberd-2.1.11-r2.patch
@@ -176,11 +176,17 @@ index 06f9e6e..5abf065 100644
176 log_debug(ZONE, "jid item with value '%s'", jid_full(zitem->jid)); 176 log_debug(ZONE, "jid item with value '%s'", jid_full(zitem->jid));
177 177
178diff --git a/storage/authreg_pgsql.c b/storage/authreg_pgsql.c 178diff --git a/storage/authreg_pgsql.c b/storage/authreg_pgsql.c
179index 1f15e83..cb68e7d 100644 179index 1f15e83..5f1583d 100644
180--- a/storage/authreg_pgsql.c 180--- a/storage/authreg_pgsql.c
181+++ b/storage/authreg_pgsql.c 181+++ b/storage/authreg_pgsql.c
182@@ -304,7 +304,7 @@ int _ar_pgsql_check_sql( authreg_t ar, char * sql, char * types ) { 182@@ -302,9 +302,13 @@ int _ar_pgsql_check_sql( authreg_t ar, char * sql, char * types ) {
183 return 1;
184 }
183 185
186+#ifdef HAVE_SSL
187+extern int sx_openssl_initialized;
188+#endif
189+
184 /** start me up */ 190 /** start me up */
185 int ar_init(authreg_t ar) { 191 int ar_init(authreg_t ar) {
186- char *host, *port, *dbname, *user, *pass; 192- char *host, *port, *dbname, *user, *pass;
@@ -188,7 +194,7 @@ index 1f15e83..cb68e7d 100644
188 char *create, *select, *setpassword, *delete; 194 char *create, *select, *setpassword, *delete;
189 char *table, *username, *realm; 195 char *table, *username, *realm;
190 char *template; 196 char *template;
191@@ -391,15 +391,22 @@ int ar_init(authreg_t ar) { 197@@ -391,15 +395,26 @@ int ar_init(authreg_t ar) {
192 free(setpassword); 198 free(setpassword);
193 free(delete); 199 free(delete);
194 200
@@ -199,6 +205,10 @@ index 1f15e83..cb68e7d 100644
199- pass = config_get_one(ar->c2s->config, "authreg.pgsql.pass", 0); 205- pass = config_get_one(ar->c2s->config, "authreg.pgsql.pass", 0);
200- 206-
201- log_debug( ZONE, "pgsql connecting as '%s' to database '%s' on %s:%s", user, dbname, host, port ); 207- log_debug( ZONE, "pgsql connecting as '%s' to database '%s' on %s:%s", user, dbname, host, port );
208+#ifdef HAVE_SSL
209+ if(sx_openssl_initialized)
210 +PQinitSSL(0);
211+#endif
202+ conninfo = config_get_one(ar->c2s->config,"authreg.pgsql.conninfo",0); 212+ conninfo = config_get_one(ar->c2s->config,"authreg.pgsql.conninfo",0);
203+ if(conninfo) { 213+ if(conninfo) {
204 +/* don't log connection info for it can contain password */ 214 +/* don't log connection info for it can contain password */
@@ -239,6 +249,28 @@ index 69eeec2..0036c0f 100644
239 return; 249 return;
240 } 250 }
241 251
252diff --git a/sx/ssl.c b/sx/ssl.c
253index 62c4258..9359f4d 100644
254--- a/sx/ssl.c
255+++ b/sx/ssl.c
256@@ -628,6 +628,8 @@ static void _sx_ssl_unload(sx_plugin_t p) {
257 SSL_CTX_free((SSL_CTX *) p->private);
258 }
259
260+int sx_openssl_initialized = 0;
261+
262 /** args: pemfile */
263 int sx_ssl_init(sx_env_t env, sx_plugin_t p, va_list args) {
264 char *pemfile, *cachain;
265@@ -653,6 +655,8 @@ int sx_ssl_init(sx_env_t env, sx_plugin_t p, va_list args) {
266 SSL_library_init();
267 SSL_load_error_strings();
268
269+ sx_openssl_initialized = 1;
270+
271 /* create the context */
272 ctx = SSL_CTX_new(SSLv23_method());
273 if(ctx == NULL) {
242diff --git a/util/jid.c b/util/jid.c 274diff --git a/util/jid.c b/util/jid.c
243index 695b15f..f4b0021 100644 275index 695b15f..f4b0021 100644
244--- a/util/jid.c 276--- a/util/jid.c
diff --git a/net-im/jabberd/jabberd-2.1.11-r1.ebuild b/net-im/jabberd/jabberd-2.1.11-r2.ebuild
index 9445d07..9445d07 100644
--- a/net-im/jabberd/jabberd-2.1.11-r1.ebuild
+++ b/net-im/jabberd/jabberd-2.1.11-r2.ebuild