diff options
author | Parabola <dev@list.parabolagnulinux.org> | 2011-04-05 14:26:38 +0000 |
---|---|---|
committer | Parabola <dev@list.parabolagnulinux.org> | 2011-04-05 14:26:38 +0000 |
commit | 415856bdd4f48ab4f2732996f0bae58595092bbe (patch) | |
tree | ede2018b591f6dfb477fe9341ba17b9bc000fab9 /community/jabberd14/build-fix.patch |
Tue Apr 5 14:26:38 UTC 2011
Diffstat (limited to 'community/jabberd14/build-fix.patch')
-rw-r--r-- | community/jabberd14/build-fix.patch | 219 |
1 files changed, 219 insertions, 0 deletions
diff --git a/community/jabberd14/build-fix.patch b/community/jabberd14/build-fix.patch new file mode 100644 index 000000000..705ddccfd --- /dev/null +++ b/community/jabberd14/build-fix.patch @@ -0,0 +1,219 @@ +Only in jabberd14-1.6.1.1.my: config.h +Only in jabberd14-1.6.1.1.my: config.log +Only in jabberd14-1.6.1.1.my: config.status +Only in jabberd14-1.6.1.1.my/dialback: .deps +Only in jabberd14-1.6.1.1.my/dialback: dialback_in.lo +Only in jabberd14-1.6.1.1.my/dialback: dialback.lo +Only in jabberd14-1.6.1.1.my/dialback: dialback_out.lo +Only in jabberd14-1.6.1.1.my/dialback: libjabberddialback.la +Only in jabberd14-1.6.1.1.my/dialback: .libs +Only in jabberd14-1.6.1.1.my/dialback: Makefile +Only in jabberd14-1.6.1.1.my/dnsrv: .deps +Only in jabberd14-1.6.1.1.my/dnsrv: dnsrv.lo +Only in jabberd14-1.6.1.1.my/dnsrv: libjabberddnsrv.la +Only in jabberd14-1.6.1.1.my/dnsrv: .libs +Only in jabberd14-1.6.1.1.my/dnsrv: Makefile +Only in jabberd14-1.6.1.1.my/dnsrv: srv_resolv.lo +Only in jabberd14-1.6.1.1.my/jabberd: acl.lo +Only in jabberd14-1.6.1.1.my/jabberd/base: base_accept.lo +Only in jabberd14-1.6.1.1.my/jabberd/base: base_connect.lo +Only in jabberd14-1.6.1.1.my/jabberd/base: base_dir.lo +Only in jabberd14-1.6.1.1.my/jabberd/base: base_file.lo +Only in jabberd14-1.6.1.1.my/jabberd/base: base_format.lo +Only in jabberd14-1.6.1.1.my/jabberd/base: base_importspool.lo +Only in jabberd14-1.6.1.1.my/jabberd/base: base.lo +Only in jabberd14-1.6.1.1.my/jabberd/base: base_load.lo +Only in jabberd14-1.6.1.1.my/jabberd/base: base_null.lo +Only in jabberd14-1.6.1.1.my/jabberd/base: base_stderr.lo +Only in jabberd14-1.6.1.1.my/jabberd/base: base_stdout.lo +Only in jabberd14-1.6.1.1.my/jabberd/base: base_syslog.lo +Only in jabberd14-1.6.1.1.my/jabberd/base: base_to.lo +Only in jabberd14-1.6.1.1.my/jabberd/base: base_unsubscribe.lo +Only in jabberd14-1.6.1.1.my/jabberd/base: .deps +Only in jabberd14-1.6.1.1.my/jabberd/base: libjabberdbase.la +Only in jabberd14-1.6.1.1.my/jabberd/base: .libs +Only in jabberd14-1.6.1.1.my/jabberd/base: Makefile +Only in jabberd14-1.6.1.1.my/jabberd: config.lo +Only in jabberd14-1.6.1.1.my/jabberd: deliver.lo +Only in jabberd14-1.6.1.1.my/jabberd: .deps +Only in jabberd14-1.6.1.1.my/jabberd: gcrypt_init.lo +Only in jabberd14-1.6.1.1.my/jabberd: heartbeat.lo +Only in jabberd14-1.6.1.1.my/jabberd: jabberd +Only in jabberd14-1.6.1.1.my/jabberd: jabberd.o +Only in jabberd14-1.6.1.1.my/jabberd/lib: base64.lo +Only in jabberd14-1.6.1.1.my/jabberd/lib: crc32.lo +Only in jabberd14-1.6.1.1.my/jabberd/lib: .deps +Only in jabberd14-1.6.1.1.my/jabberd/lib: expat.lo +Only in jabberd14-1.6.1.1.my/jabberd/lib: hash.lo +Only in jabberd14-1.6.1.1.my/jabberd/lib: hmac.lo +Only in jabberd14-1.6.1.1.my/jabberd/lib: jid.lo +Only in jabberd14-1.6.1.1.my/jabberd/lib: jpacket.lo +Only in jabberd14-1.6.1.1.my/jabberd/lib: jutil.lo +Only in jabberd14-1.6.1.1.my/jabberd/lib: karma.lo +Only in jabberd14-1.6.1.1.my/jabberd/lib: libjabberdlib.la +Only in jabberd14-1.6.1.1.my/jabberd/lib: .libs +Only in jabberd14-1.6.1.1.my/jabberd/lib: Makefile +Only in jabberd14-1.6.1.1.my/jabberd/lib: messages.lo +Only in jabberd14-1.6.1.1.my/jabberd/lib: pool.lo +Only in jabberd14-1.6.1.1.my/jabberd/lib: rate.lo +Only in jabberd14-1.6.1.1.my/jabberd/lib: socket.lo +Only in jabberd14-1.6.1.1.my/jabberd/lib: str.lo +Only in jabberd14-1.6.1.1.my/jabberd/lib: xhash.lo +diff -wbBur jabberd14-1.6.1.1/jabberd/lib/xmlnode.cc jabberd14-1.6.1.1.my/jabberd/lib/xmlnode.cc +--- jabberd14-1.6.1.1/jabberd/lib/xmlnode.cc 2007-04-07 19:43:18.000000000 +0000 ++++ jabberd14-1.6.1.1.my/jabberd/lib/xmlnode.cc 2010-06-04 15:31:02.000000000 +0000 +@@ -910,8 +910,8 @@ + } + + /* separate this step from the next one, and check for a predicate in this step */ +- start_predicate = strchr(path, '['); +- next_step = strchr(path, '/'); ++ start_predicate = strchr((char*)path, '['); ++ next_step = strchr((char*)path, '/'); + if (start_predicate == NULL && next_step == NULL) { + this_step = pstrdup(p, path); + } else if (start_predicate == NULL || start_predicate > next_step && next_step != NULL) { +@@ -1833,7 +1833,8 @@ + if (lang != NULL && strchr(lang, '-') != NULL) { + snprintf(general_lang, sizeof(general_lang), "%s", lang); + if (strchr(lang, '-') != NULL) { +- strchr(lang, '-')[0] = 0; ++ char *tmp = strchr((char*)lang, '-'); ++ tmp[0] = 0; + } else { + general_lang[0] = 0; + } +Only in jabberd14-1.6.1.1.my/jabberd/lib: xmlnode.lo +Only in jabberd14-1.6.1.1.my/jabberd/lib: xstream.lo +Only in jabberd14-1.6.1.1.my/jabberd: libjabberd.la +Only in jabberd14-1.6.1.1.my/jabberd: .libs +diff -wbBur jabberd14-1.6.1.1/jabberd/log.cc jabberd14-1.6.1.1.my/jabberd/log.cc +--- jabberd14-1.6.1.1/jabberd/log.cc 2007-07-20 13:56:59.000000000 +0000 ++++ jabberd14-1.6.1.1.my/jabberd/log.cc 2010-06-04 15:34:05.000000000 +0000 +@@ -86,7 +86,7 @@ + char *pos, c = '\0'; + if(zone != NULL && debug__zones != NULL) + { +- pos = strchr(zone,'.'); ++ pos = strchr((char*)zone,'.'); + if(pos != NULL) + { + c = *pos; +Only in jabberd14-1.6.1.1.my/jabberd: log.lo +Only in jabberd14-1.6.1.1.my/jabberd: Makefile +Only in jabberd14-1.6.1.1.my/jabberd: mio.lo +Only in jabberd14-1.6.1.1.my/jabberd: mio_raw.lo +diff -wbBur jabberd14-1.6.1.1/jabberd/mio_tls.cc jabberd14-1.6.1.1.my/jabberd/mio_tls.cc +--- jabberd14-1.6.1.1/jabberd/mio_tls.cc 2007-07-16 23:20:44.000000000 +0000 ++++ jabberd14-1.6.1.1.my/jabberd/mio_tls.cc 2010-06-04 15:33:36.000000000 +0000 +@@ -612,7 +612,8 @@ + } + + // load OpenPGP key/certificate +- ret = gnutls_certificate_set_openpgp_key_file(current_credentials, pubfile, privfile); ++// ret = gnutls_certificate_set_openpgp_key_file(current_credentials, pubfile, privfile); ++ ret = gnutls_certificate_set_openpgp_key_file(current_credentials, pubfile, privfile, GNUTLS_OPENPGP_FMT_BASE64); + if (ret < 0) { + log_error(NULL, "Error loading OpenPGP key pub=%s/priv=%s: %s", pubfile, privfile, gnutls_strerror(ret)); + continue; +@@ -631,7 +632,8 @@ + } + + // load the OpenPGP keyring +- ret = gnutls_certificate_set_openpgp_keyring_file(current_credentials, file); ++// ret = gnutls_certificate_set_openpgp_keyring_file(current_credentials, file); ++ ret = gnutls_certificate_set_openpgp_keyring_file(current_credentials, file, GNUTLS_OPENPGP_FMT_BASE64); + if (ret < 0) { + log_error(NULL, "Error loading OpenPGP keyring %s: %s", file, gnutls_strerror(ret)); + continue; +@@ -640,6 +642,8 @@ + continue; + } + ++ ++/* + // load GnuPG trustdb + if (j_strcmp(xmlnode_get_localname(cur), "trustdb") == 0) { + char const *const file = xmlnode_get_data(cur); +@@ -656,6 +660,7 @@ + continue; + } + } ++*/ + + // setup protocols to use + if (j_strcmp(xmlnode_get_localname(cur), "protocols") == 0) { +Only in jabberd14-1.6.1.1.my/jabberd: mio_tls.lo +Only in jabberd14-1.6.1.1.my/jabberd: mio_xml.lo +Only in jabberd14-1.6.1.1.my/jabberd: mtq.lo +Only in jabberd14-1.6.1.1.my/jabberd: subjectAltName_asn1_tab.lo +Only in jabberd14-1.6.1.1.my/jabberd: xdb.lo +Only in jabberd14-1.6.1.1.my: jabber.xml.dist +Only in jabberd14-1.6.1.1.my/jsm: authreg.lo +Only in jabberd14-1.6.1.1.my/jsm: deliver.lo +Only in jabberd14-1.6.1.1.my/jsm: .deps +Only in jabberd14-1.6.1.1.my/jsm: jsm.lo +Only in jabberd14-1.6.1.1.my/jsm: libjabberdsm.la +Only in jabberd14-1.6.1.1.my/jsm: .libs +Only in jabberd14-1.6.1.1.my/jsm: Makefile +Only in jabberd14-1.6.1.1.my/jsm/modules: .deps +Only in jabberd14-1.6.1.1.my/jsm/modules: libjabberdsmmods.la +Only in jabberd14-1.6.1.1.my/jsm/modules: .libs +Only in jabberd14-1.6.1.1.my/jsm/modules: Makefile +Only in jabberd14-1.6.1.1.my/jsm/modules: mod_admin.lo +Only in jabberd14-1.6.1.1.my/jsm/modules: mod_agents.lo +Only in jabberd14-1.6.1.1.my/jsm/modules: mod_announce.lo +Only in jabberd14-1.6.1.1.my/jsm/modules: mod_auth_crypt.lo +Only in jabberd14-1.6.1.1.my/jsm/modules: mod_auth_digest.lo +Only in jabberd14-1.6.1.1.my/jsm/modules: mod_auth_plain.lo +Only in jabberd14-1.6.1.1.my/jsm/modules: mod_browse.lo +Only in jabberd14-1.6.1.1.my/jsm/modules: mod_disco.lo +Only in jabberd14-1.6.1.1.my/jsm/modules: mod_echo.lo +Only in jabberd14-1.6.1.1.my/jsm/modules: mod_example.lo +Only in jabberd14-1.6.1.1.my/jsm/modules: mod_last.lo +Only in jabberd14-1.6.1.1.my/jsm/modules: mod_log.lo +Only in jabberd14-1.6.1.1.my/jsm/modules: mod_offline.lo +Only in jabberd14-1.6.1.1.my/jsm/modules: mod_ping.lo +Only in jabberd14-1.6.1.1.my/jsm/modules: mod_presence.lo +Only in jabberd14-1.6.1.1.my/jsm/modules: mod_privacy.lo +Only in jabberd14-1.6.1.1.my/jsm/modules: mod_register.lo +Only in jabberd14-1.6.1.1.my/jsm/modules: mod_roster.lo +Only in jabberd14-1.6.1.1.my/jsm/modules: mod_stat.lo +Only in jabberd14-1.6.1.1.my/jsm/modules: mod_time.lo +Only in jabberd14-1.6.1.1.my/jsm/modules: mod_useridpolicy.lo +Only in jabberd14-1.6.1.1.my/jsm/modules: mod_vcard.lo +Only in jabberd14-1.6.1.1.my/jsm/modules: mod_version.lo +Only in jabberd14-1.6.1.1.my/jsm/modules: mod_xml.lo +Only in jabberd14-1.6.1.1.my/jsm: modules.lo +Only in jabberd14-1.6.1.1.my/jsm: offline.lo +Only in jabberd14-1.6.1.1.my/jsm: serialization.lo +Only in jabberd14-1.6.1.1.my/jsm: server.lo +Only in jabberd14-1.6.1.1.my/jsm: sessions.lo +Only in jabberd14-1.6.1.1.my/jsm: users.lo +Only in jabberd14-1.6.1.1.my/jsm: util.lo +Only in jabberd14-1.6.1.1.my: .libs +Only in jabberd14-1.6.1.1.my: libtool +Only in jabberd14-1.6.1.1.my: Makefile +Only in jabberd14-1.6.1.1.my/man: jabberd.8 +Only in jabberd14-1.6.1.1.my/man: jabber.xml.5 +Only in jabberd14-1.6.1.1.my/man: Makefile +Only in jabberd14-1.6.1.1.my/po: Makefile +Only in jabberd14-1.6.1.1.my/pthsock: client.lo +Only in jabberd14-1.6.1.1.my/pthsock: .deps +Only in jabberd14-1.6.1.1.my/pthsock: libjabberdpthsock.la +Only in jabberd14-1.6.1.1.my/pthsock: .libs +Only in jabberd14-1.6.1.1.my/pthsock: Makefile +Only in jabberd14-1.6.1.1.my: qwe +Only in jabberd14-1.6.1.1.my: stamp-h1 +Only in jabberd14-1.6.1.1.my/xdb_file: .deps +Only in jabberd14-1.6.1.1.my/xdb_file: libjabberdxdbfile.la +Only in jabberd14-1.6.1.1.my/xdb_file: .libs +Only in jabberd14-1.6.1.1.my/xdb_file: Makefile +Only in jabberd14-1.6.1.1.my/xdb_file: xdb_file.lo +Only in jabberd14-1.6.1.1.my/xdb_file: xdbfiletool +Only in jabberd14-1.6.1.1.my/xdb_file: xdbfiletool.o +Only in jabberd14-1.6.1.1.my/xdb_sql: .deps +Only in jabberd14-1.6.1.1.my/xdb_sql: libjabberdxdbsql.la +Only in jabberd14-1.6.1.1.my/xdb_sql: .libs +Only in jabberd14-1.6.1.1.my/xdb_sql: Makefile +Only in jabberd14-1.6.1.1.my/xdb_sql: xdb_sql.lo |