Retired: Fails to install: https://forge.fedoraproject.org/releng/tickets/issues/13473

the mariadb-connector-c-devel package is available for all fedora recent versions
therefore the condition checking for fedora version 27 and above (which
is quite old in and of itself) is no longer needed and all packages
should use the BuildRequires os mariadb-connector-c-devel instead of mysql-devel if possible

.gitignore

@@ -1,13 +0,0 @@
-/jabberd-2.2.13.tar.bz2
-/jabberd-2.2.14.tar.bz2
-/jabberd-2.2.16.tar.gz
-/jabberd-2.2.17.tar.xz
-/jabberd-2.3.1.tar.xz
-/jabberd-2.3.2.tar.xz
-/jabberd-2.3.3.tar.xz
-/jabberd-2.3.4.tar.xz
-/jabberd-2.3.5.tar.xz
-/jabberd-2.3.6.tar.xz
-/jabberd-2.4.0.tar.xz
-/jabberd-2.5.0.tar.xz
-/jabberd-2.6.1.tar.xz

0001-Fix-build-errors-with-MariaDB-10.2.patch

@@ -1,76 +0,0 @@
-From f955d005cee682afbfd3b004a796918804496d80 Mon Sep 17 00:00:00 2001
-From: Adrian Reber <adrian@lisas.de>
-Date: Wed, 12 Jul 2017 11:46:17 +0200
-Subject: [PATCH] Fix build errors with MariaDB 10.2
-
-Signed-off-by: Adrian Reber <adrian@lisas.de>
----
- storage/authreg_mysql.c | 6 +++---
- storage/storage_mysql.c | 6 +++---
- 2 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/storage/authreg_mysql.c b/storage/authreg_mysql.c
-index be7aaf6..0b35d6d 100644
---- a/storage/authreg_mysql.c
-+++ b/storage/authreg_mysql.c
-@@ -487,6 +487,8 @@ DLLEXPORT int ar_init(authreg_t ar) {
-     MYSQL *conn;
-     mysqlcontext_t mysqlcontext;
-     int fail = 0;
-+    /* enable reconnect */
-+    my_bool reconnect= 1;
- 
-     /* configure the database context with field names and SQL statements */
-     mysqlcontext = (mysqlcontext_t) malloc( sizeof( struct mysqlcontext_st ) );
-@@ -618,6 +620,7 @@ DLLEXPORT int ar_init(authreg_t ar) {
- 
-     mysql_options(conn, MYSQL_READ_DEFAULT_GROUP, "jabberd");
-     mysql_options(conn, MYSQL_SET_CHARSET_NAME, "utf8");
-+    mysql_options(conn, MYSQL_OPT_RECONNECT, (void *)&reconnect);
- 
-     /* connect with CLIENT_INTERACTIVE to get a (possibly) higher timeout value than default */
-     if(mysql_real_connect(conn, host, user, pass, dbname, atoi(port), NULL, CLIENT_INTERACTIVE) == NULL) {
-@@ -627,9 +630,6 @@ DLLEXPORT int ar_init(authreg_t ar) {
- 
-     mysql_query(conn, "SET NAMES 'utf8'");
- 
--    /* Set reconnect flag to 1 (set to 0 by default from mysql 5 on) */
--    conn->reconnect = 1;
--
-     ar->user_exists = _ar_mysql_user_exists;
-     if (MPC_PLAIN == mysqlcontext->password_type) {
-         /* only possible with plaintext passwords */
-diff --git a/storage/storage_mysql.c b/storage/storage_mysql.c
-index 2355b17..eb4f62f 100644
---- a/storage/storage_mysql.c
-+++ b/storage/storage_mysql.c
-@@ -584,6 +584,8 @@ DLLEXPORT st_ret_t st_init(st_driver_t drv) {
-     const char *host, *port, *dbname, *user, *pass;
-     MYSQL *conn;
-     drvdata_t data;
-+    /* enable reconnect */
-+    my_bool reconnect= 1;
- 
-     host = config_get_one(drv->st->config, "storage.mysql.host", 0);
-     port = config_get_one(drv->st->config, "storage.mysql.port", 0);
-@@ -604,6 +606,7 @@ DLLEXPORT st_ret_t st_init(st_driver_t drv) {
- 
-     mysql_options(conn, MYSQL_READ_DEFAULT_GROUP, "jabberd");
-     mysql_options(conn, MYSQL_SET_CHARSET_NAME, "utf8");
-+    mysql_options(conn, MYSQL_OPT_RECONNECT, (void *)&reconnect);
- 
-     /* connect with CLIENT_INTERACTIVE to get a (possibly) higher timeout value than default */
-     if(mysql_real_connect(conn, host, user, pass, dbname, atoi(port), NULL, CLIENT_INTERACTIVE) == NULL) {
-@@ -612,9 +615,6 @@ DLLEXPORT st_ret_t st_init(st_driver_t drv) {
-         return st_FAILED;
-     }
- 
--    /* Set reconnect flag to 1 (set to 0 by default from mysql 5 on) */
--    conn->reconnect = 1;
--
-     data = (drvdata_t) calloc(1, sizeof(struct drvdata_st));
- 
-     data->conn = conn;
--- 
-2.13.0
-

0001-configure.ac-adapt-to-openssl-1.1.patch

@@ -1,35 +0,0 @@
-From 451c8e45200aeb67c56d42e5398e7c12466b30d6 Mon Sep 17 00:00:00 2001
-From: Adrian Reber <adrian@lisas.de>
-Date: Fri, 2 Dec 2016 12:16:50 +0100
-Subject: [PATCH 1/3] configure.ac: adapt to openssl-1.1
-
-openssl-1.1 removed the function CRYPTO_lock() which was used
-in the configure script to check for openssl availability.
-This changes CRYPTO_lock() to HMAC_Update().
-
-Fixes: #125
-
-Signed-off-by: Adrian Reber <adrian@lisas.de>
----
- configure.ac | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index c8a933c..d38e290 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -406,9 +406,9 @@ if test "x-$want_ssl" != "x-no" ; then
-     fi
-     AC_CHECK_HEADERS(openssl/crypto.h)
-     if test "x-$ac_cv_header_openssl_crypto_h" = "x-yes" ; then
--        AC_CHECK_LIB(crypto, CRYPTO_lock)
-+        AC_CHECK_LIB(crypto, HMAC_Update)
-     fi
--    if test "x-$ac_cv_lib_crypto_CRYPTO_lock" = "x-yes" ; then
-+    if test "x-$ac_cv_lib_crypto_HMAC_Update" = "x-yes" ; then
-         AC_CHECK_HEADERS(openssl/ssl.h)
-     fi
-     if test "x-$ac_cv_header_openssl_ssl_h" = "x-yes" ; then
--- 
-2.9.3
-

0002-authreg_ldapfull-adapt-to-openssl-1.1.patch

@@ -1,249 +0,0 @@
-From 8a0cc8f79faae57c3d4e6c801c554970780416db Mon Sep 17 00:00:00 2001
-From: Adrian Reber <adrian@lisas.de>
-Date: Fri, 2 Dec 2016 12:20:29 +0100
-Subject: [PATCH 2/3] authreg_ldapfull: adapt to openssl-1.1
-
-Adding #ifdefs to use the new openssl-1.1 API if detected.
-
-Signed-off-by: Adrian Reber <adrian@lisas.de>
----
- storage/authreg_ldapfull.c | 107 +++++++++++++++++++++++++++++++++++++++------
- 1 file changed, 94 insertions(+), 13 deletions(-)
-
-diff --git a/storage/authreg_ldapfull.c b/storage/authreg_ldapfull.c
-index 7b32d48..6dbf202 100644
---- a/storage/authreg_ldapfull.c
-+++ b/storage/authreg_ldapfull.c
-@@ -39,6 +39,7 @@
- 
- #ifdef HAVE_SSL
- #include <openssl/rand.h>
-+#include <openssl/evp.h>
- #endif
- 
- #include <lber.h>
-@@ -228,13 +229,18 @@ int _ldapfull_base64_decode( const char *src, const unsigned char **ret, int *rl
-     int rc, tlen = 0;
-     int i;
-     unsigned char *text;
-+#if OPENSSL_VERSION_NUMBER < 0x10100005L
-     EVP_ENCODE_CTX EVP_ctx;
-+#else
-+    EVP_ENCODE_CTX *EVP_ctx;
-+#endif
- 
-     text = (unsigned char *)malloc(((strlen(src)+3)/4 * 3) + 1);
-     if (text == NULL) {
-         return 0;
-     }
- 
-+#if OPENSSL_VERSION_NUMBER < 0x10100005L
-     EVP_DecodeInit(&EVP_ctx);
-     rc = EVP_DecodeUpdate(&EVP_ctx, text, &i, (const unsigned char *)src, strlen(src));
-     if (rc < 0) {
-@@ -243,40 +249,70 @@ int _ldapfull_base64_decode( const char *src, const unsigned char **ret, int *rl
-     }
-     tlen+=i;
-     EVP_DecodeFinal(&EVP_ctx, (unsigned char*)text, &i);
-+#else
-+    EVP_ctx = EVP_ENCODE_CTX_new();
-+    EVP_DecodeInit(EVP_ctx);
-+    rc = EVP_DecodeUpdate(EVP_ctx, text, &i, (const unsigned char *)src, strlen(src));
-+    if (rc < 0) {
-+        free(text);
-+        EVP_ENCODE_CTX_free(EVP_ctx);
-+        return 0;
-+    }
-+    tlen+=i;
-+    EVP_DecodeFinal(EVP_ctx, (unsigned char*)text, &i);
-+#endif
- 
-     *ret = text;
-     if (rlen != NULL) {
-         *rlen = tlen;
-     }
- 
-+#if !(OPENSSL_VERSION_NUMBER < 0x10100005L)
-+    EVP_ENCODE_CTX_free(EVP_ctx);
-+#endif
-     return 1;
- }
- 
- static int _ldapfull_base64_encode( const unsigned char *src, int srclen, char **ret, int *rlen ) {
-     int tlen = 0;
-     unsigned char *text;
-+#if OPENSSL_VERSION_NUMBER < 0x10100005L
-     EVP_ENCODE_CTX EVP_ctx;
-+#else
-+    EVP_ENCODE_CTX *EVP_ctx;
-+#endif
-+
- 
-     text = (unsigned char *)malloc((srclen*4/3) + 1 );
-     if (text == NULL) {
-         return 0;
-     }
- 
-+#if OPENSSL_VERSION_NUMBER < 0x10100005L
-     EVP_EncodeInit(&EVP_ctx);
-     EVP_EncodeUpdate(&EVP_ctx, text, &tlen, src, srclen);
-     EVP_EncodeFinal(&EVP_ctx, text, &tlen);
-+#else
-+    EVP_ctx = EVP_ENCODE_CTX_new();
-+    EVP_EncodeInit(EVP_ctx);
-+    EVP_EncodeUpdate(EVP_ctx, text, &tlen, src, srclen);
-+    EVP_EncodeFinal(EVP_ctx, text, &tlen);
-+#endif
- 
-     *ret = (char*)text;
-     if (rlen != NULL) {
-         *rlen = tlen;
-     }
- 
-+#if !(OPENSSL_VERSION_NUMBER < 0x10100005L)
-+    EVP_ENCODE_CTX_free(EVP_ctx);
-+#endif
-     return 1;
- }
- 
- int _ldapfull_chk_hashed(moddata_t data, const char *scheme, int salted, const char *hash, const char *passwd) {
-     const unsigned char *bhash; // binary hash, will get it from base64
--    EVP_MD_CTX mdctx;
-+    EVP_MD_CTX *mdctx;
-     const EVP_MD *md;
-     unsigned char digest[EVP_MAX_MD_SIZE];
-     int bhlen, rc;
-@@ -289,22 +325,32 @@ int _ldapfull_chk_hashed(moddata_t data, const char *scheme, int salted, const c
-         return 0;
-     }
- 
--    EVP_DigestInit(&mdctx, md);
--    EVP_DigestUpdate(&mdctx, passwd, strlen(passwd));
-+#if OPENSSL_VERSION_NUMBER < 0x10100005L
-+    mdctx = EVP_MD_CTX_create();
-+#else
-+    mdctx = EVP_MD_CTX_new();
-+#endif
-+    EVP_DigestInit(mdctx, md);
-+    EVP_DigestUpdate(mdctx, passwd, strlen(passwd));
-     if (salted) {
--        EVP_DigestUpdate(&mdctx, &bhash[EVP_MD_size(md)],
-+        EVP_DigestUpdate(mdctx, &bhash[EVP_MD_size(md)],
-                 bhlen - EVP_MD_size(md));
-     }
--    EVP_DigestFinal(&mdctx, digest, NULL);
-+    EVP_DigestFinal(mdctx, digest, NULL);
- 
-     rc = memcmp((char *)bhash, (char *)digest, EVP_MD_size(md));
-     free((void*)bhash);
-+#if OPENSSL_VERSION_NUMBER < 0x10100005L
-+    EVP_MD_CTX_destroy(mdctx);
-+#else
-+    EVP_MD_CTX_free(mdctx);
-+#endif
-     return !rc;
- }
- 
- int _ldapfull_set_hashed(moddata_t data, const char *scheme, const char *prefix, int saltlen, const char *passwd, char *buf, int buflen) {
-     char *hash = 0; // base64 hash
--    EVP_MD_CTX mdctx;
-+    EVP_MD_CTX *mdctx;
-     const EVP_MD *md;
-     unsigned char *digest;
-     unsigned char *salt;
-@@ -316,30 +362,48 @@ int _ldapfull_set_hashed(moddata_t data, const char *scheme, const char *prefix,
-     if (!md) {
-         return 0;
-     }
--    EVP_DigestInit(&mdctx, md);
--    EVP_DigestUpdate(&mdctx, passwd, strlen(passwd));
-+
-+#if OPENSSL_VERSION_NUMBER < 0x10100005L
-+    mdctx = EVP_MD_CTX_create();
-+#else
-+    mdctx = EVP_MD_CTX_new();
-+#endif
-+    EVP_DigestInit(mdctx, md);
-+    EVP_DigestUpdate(mdctx, passwd, strlen(passwd));
-     if (saltlen) {
-         salt = (unsigned char *)malloc(saltlen);
-         if( !salt ) {
--            EVP_MD_CTX_cleanup(&mdctx);
-+#if OPENSSL_VERSION_NUMBER < 0x10100005L
-+            EVP_MD_CTX_destroy(mdctx);
-+#else
-+            EVP_MD_CTX_free(mdctx);
-+#endif
-             return 0;
-         }
-         if( !RAND_bytes(salt,saltlen) ) {
--            EVP_MD_CTX_cleanup(&mdctx);
-+#if OPENSSL_VERSION_NUMBER < 0x10100005L
-+            EVP_MD_CTX_destroy(mdctx);
-+#else
-+            EVP_MD_CTX_free(mdctx);
-+#endif
-             free(salt);
-             return 0;
-         }
--        EVP_DigestUpdate(&mdctx, salt, saltlen);
-+        EVP_DigestUpdate(mdctx, salt, saltlen);
-     }
-     digest = (unsigned char *)malloc(EVP_MD_size(md) + saltlen);
-     if( !digest ) {
-         if (saltlen) {
-             free(salt);
-         }
--        EVP_MD_CTX_cleanup(&mdctx);
-+#if OPENSSL_VERSION_NUMBER < 0x10100005L
-+        EVP_MD_CTX_destroy(mdctx);
-+#else
-+        EVP_MD_CTX_free(mdctx);
-+#endif
-         return 0;
-     }
--    EVP_DigestFinal(&mdctx, digest, &dlen);
-+    EVP_DigestFinal(mdctx, digest, &dlen);
- 
-     memcpy(digest+dlen,salt,saltlen);
-     if (saltlen) {
-@@ -352,6 +416,12 @@ int _ldapfull_set_hashed(moddata_t data, const char *scheme, const char *prefix,
-     free(digest);
-     if( !rc ) {
-         free(hash);
-+#if OPENSSL_VERSION_NUMBER < 0x10100005L
-+        EVP_MD_CTX_destroy(mdctx);
-+#else
-+        EVP_MD_CTX_free(mdctx);
-+#endif
-+        return 0;
-         return 0;
-     }
- 
-@@ -359,12 +429,23 @@ int _ldapfull_set_hashed(moddata_t data, const char *scheme, const char *prefix,
-     if( hlen + plen >= buflen ) {
-         log_write(data->ar->c2s->log,LOG_ERR,"_ldapfull_set_hashed: buffer is too short (%i bytes)",buflen);
-         free(hash);
-+#if OPENSSL_VERSION_NUMBER < 0x10100005L
-+        EVP_MD_CTX_destroy(mdctx);
-+#else
-+        EVP_MD_CTX_free(mdctx);
-+#endif
-+        return 0;
-         return 0;
-     }
-     memcpy(buf,prefix,plen);
-     memcpy(buf+plen,hash,hlen);
-     buf[hlen+plen]='\0';
-     free(hash);
-+#if OPENSSL_VERSION_NUMBER < 0x10100005L
-+    EVP_MD_CTX_destroy(mdctx);
-+#else
-+    EVP_MD_CTX_free(mdctx);
-+#endif
- 
-     return 1;
- }
--- 
-2.9.3
-

0003-sx-ssl.c-adapt-to-openssl-1.1.patch

@@ -1,134 +0,0 @@
-From da388416df1dbacb690ec754c65503a206eb2f88 Mon Sep 17 00:00:00 2001
-From: Adrian Reber <adrian@lisas.de>
-Date: Fri, 2 Dec 2016 15:33:48 +0100
-Subject: [PATCH 3/3] sx/ssl.c: adapt to openssl-1.1
-
-Adding #ifdefs to use the new openssl-1.1 API if detected.
-
-Signed-off-by: Adrian Reber <adrian@lisas.de>
----
- sx/ssl.c | 41 +++++++++++++++++++++++++++++++++++++----
- 1 file changed, 37 insertions(+), 4 deletions(-)
-
-diff --git a/sx/ssl.c b/sx/ssl.c
-index 208ebb6..5ff8618 100644
---- a/sx/ssl.c
-+++ b/sx/ssl.c
-@@ -70,7 +70,7 @@ static int _sx_ssl_verify_callback(int preverify_ok, X509_STORE_CTX *ctx)
-      */
-     if (!preverify_ok && (err == X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT))
-     {
--      X509_NAME_oneline(X509_get_issuer_name(ctx->current_cert), buf, 256);
-+      X509_NAME_oneline(X509_get_issuer_name(err_cert), buf, 256);
-       _sx_debug(ZONE, "issuer= %s\n", buf);
-     }
- 
-@@ -115,12 +115,29 @@ static DH *sx_ssl_make_dh_params(BIGNUM *(*const get_prime)(BIGNUM *), const cha
-     if (!dh)
-         return NULL;
- 
-+#if OPENSSL_VERSION_NUMBER < 0x10100005L
-+
-     dh->p = get_prime(NULL);
-     BN_dec2bn(&dh->g, gen);
-     if (!dh->p || !dh->g) {
-         DH_free(dh);
-         return NULL;
-     }
-+#else
-+    {
-+        BIGNUM *p, *g;
-+        p = get_prime(NULL);
-+        BN_dec2bn(&g, gen);
-+
-+        if (p == NULL || g == NULL || !DH_set0_pqg(dh, p, NULL, g)) {
-+            DH_free(dh);
-+            BN_free(p);
-+            BN_free(g);
-+            return NULL;
-+        }
-+    }
-+#endif
-+
-     return dh;
- }
- 
-@@ -134,7 +151,7 @@ static void sx_ssl_free_dh_params(void) {
- 
- static DH *_sx_ssl_tmp_dh_callback(SSL *ssl, int export, int keylen) {
-     EVP_PKEY *pkey = SSL_get_privatekey(ssl);
--    int type = pkey ? EVP_PKEY_type(pkey->type) : EVP_PKEY_NONE;
-+    int type = pkey ? EVP_PKEY_base_id(pkey) : EVP_PKEY_NONE;
-     unsigned i;
- 
-     if (type == EVP_PKEY_RSA || type == EVP_PKEY_DSA)
-@@ -351,7 +368,11 @@ static void _sx_ssl_get_external_id(sx_t s, _sx_ssl_conn_t sc) {
-             } else if (altname->type == GEN_DNS) {
-                 len = ASN1_STRING_length(altname->d.dNSName);
-                 sc->external_id[id] = (char *) malloc(sizeof(char) *  (len + 1));
-+#if OPENSSL_VERSION_NUMBER < 0x10100005L
-                 memcpy(sc->external_id[id], ASN1_STRING_data(altname->d.dNSName), len);
-+#else
-+                memcpy(sc->external_id[id], ASN1_STRING_get0_data(altname->d.dNSName), len);
-+#endif
-                 sc->external_id[id][len] = '\0'; // just to make sure
-                 _sx_debug(ZONE, "external_id: Found(%d) subjectAltName/dNSName: '%s'", id, sc->external_id[id]);
-                 id++;
-@@ -728,11 +749,15 @@ static void _sx_ssl_client(sx_t s, sx_plugin_t p) {
-     SSL_set_bio(sc->ssl, sc->rbio, sc->wbio);
-     SSL_set_connect_state(sc->ssl);
-     SSL_set_options(sc->ssl, SSL_OP_NO_TICKET);
-+#if OPENSSL_VERSION_NUMBER < 0x10100005L
- #ifdef ENABLE_EXPERIMENTAL
-     SSL_set_ssl_method(sc->ssl, TLSv1_2_client_method());
- #else
-     SSL_set_ssl_method(sc->ssl, TLSv1_client_method());
- #endif
-+#else
-+    SSL_set_ssl_method(sc->ssl, TLS_client_method());
-+#endif
- 
-     /* empty external_id */
-     for (i = 0; i < SX_CONN_EXTERNAL_ID_MAX_COUNT; i++)
-@@ -761,8 +786,8 @@ static void _sx_ssl_client(sx_t s, sx_plugin_t p) {
-         }
- 
-         /* set callback giving a password for pemfile */
--        SSL_CTX_set_default_passwd_cb_userdata(sc->ssl->ctx, (void *)pemfile_password);
--        SSL_CTX_set_default_passwd_cb(sc->ssl->ctx, &_sx_pem_passwd_callback);
-+        SSL_CTX_set_default_passwd_cb_userdata(ctx, (void *)pemfile_password);
-+        SSL_CTX_set_default_passwd_cb(ctx, &_sx_pem_passwd_callback);
- 
-         /* load the private key */
-         ret = SSL_use_PrivateKey_file(sc->ssl, pemfile, SSL_FILETYPE_PEM);
-@@ -977,11 +1002,15 @@ int sx_ssl_server_addcert(sx_plugin_t p, const char *name, const char *pemfile,
-     ERR_clear_error();
- 
-     /* create the context */
-+#if OPENSSL_VERSION_NUMBER < 0x10100005L
- #ifdef ENABLE_EXPERIMENTAL
-     ctx = SSL_CTX_new(TLSv1_2_method());
- #else
-     ctx = SSL_CTX_new(SSLv23_method());
- #endif
-+#else
-+    ctx = SSL_CTX_new(TLS_method());
-+#endif
-     if(ctx == NULL) {
-         _sx_debug(ZONE, "ssl context creation failed; %s", ERR_error_string(ERR_get_error(), NULL));
-         return 1;
-@@ -1063,7 +1092,11 @@ int sx_ssl_server_addcert(sx_plugin_t p, const char *name, const char *pemfile,
-     /* try to read DH params from pem file */
-     if((dhparams = sx_ssl_get_DHparams(pemfile))) {
-         SSL_CTX_set_tmp_dh(ctx, dhparams);
-+#if OPENSSL_VERSION_NUMBER < 0x10100005L
-         _sx_debug(ZONE, "custom DH parameters loaded from certificate", BN_num_bits(dhparams->p));
-+#else
-+        _sx_debug(ZONE, "custom DH parameters loaded from certificate", DH_bits(dhparams));
-+#endif
-     }
- 
-     /* try to read ECDH params from pem file */
--- 
-2.9.3
-

181e736dcbb19c828266d88837f4343510b4d20e.patch

@@ -1,31 +0,0 @@
-From 181e736dcbb19c828266d88837f4343510b4d20e Mon Sep 17 00:00:00 2001
-From: Oleg Girko <ol@infoserver.lv>
-Date: Fri, 22 Sep 2017 22:18:34 +0100
-Subject: [PATCH] sx/ssl.c: fix undefined behaviour with openssl-1.1
-
-BN_dec2bn in OpenSSL 1.1 requires its first argument to point to
-either pointer to initialised BIGNUM or NULL.
-Using pointer to uninitialised pointer to BIGNUM is undefined behaviour
-causing coredumps or other memory corruption.
-
-This change fixes missing initialisation overlooked when porting
-to OpenSSL 1.1 API.
-
-Signed-off-by: Oleg Girko <ol@infoserver.lv>
----
- sx/ssl.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/sx/ssl.c b/sx/ssl.c
-index 85fb709d..476748f1 100644
---- a/sx/ssl.c
-+++ b/sx/ssl.c
-@@ -124,7 +124,7 @@ static DH *sx_ssl_make_dh_params(BIGNUM *(*const get_prime)(BIGNUM *), const cha
-     }
- #else
-     {
--        BIGNUM *p, *g;
-+        BIGNUM *p, *g = NULL;
-         p = get_prime(NULL);
-         BN_dec2bn(&g, gen);
- 

README.fedora

@@ -1,9 +0,0 @@
-To make the authentication against PAM actually work one of the systemd
-service files needs to altered. The c2s part of jabberd needs to run as
-root to be able to read /etc/shadow. One way to accomplish this is to
-create a jabberd-c2s.service file in /etc/systemd/system with
-following content:
-
-.include /usr/lib/systemd/system/jabberd-c2s.service
-[Service]
-User=root

dead.package

@@ -0,0 +1 @@
+Retired: Fails to install: https://forge.fedoraproject.org/releng/tickets/issues/13473

jabberd-fedora-crypto-policy.patch

@@ -1,11 +0,0 @@
---- a/sx/ssl.c
-+++ b/sx/ssl.c
-@@ -989,7 +989,7 @@ int sx_ssl_server_addcert(sx_plugin_t p,
- 
-     // Set allowed ciphers. if non set, at least always disable NULL and export
-     if (!ciphers)
--        ciphers = "!aNULL:!eNULL:!EXP:" SSL_DEFAULT_CIPHER_LIST;
-+        ciphers = "PROFILE=SYSTEM";
-     _sx_debug(ZONE, "Restricting TLS ciphers to %s", ciphers);
-     if (SSL_CTX_set_cipher_list(ctx, ciphers) != 1) {
-         _sx_debug(ZONE, "Can't set cipher list for SSL context: %s", ERR_error_string(ERR_get_error(), NULL));

jabberd-fix-paths.patch

@@ -1,88 +0,0 @@
---- a/etc/c2s.xml.dist.in
-+++ b/etc/c2s.xml.dist.in
-@@ -56,16 +56,16 @@
- 
-     <!-- If logging to syslog, this is the log facility
-          (local0 - local7)                        [default: local3] -->
--    <facility>local3</facility>
-+    <facility>daemon</facility>
- 
-     <!-- If logging to file, this is the filename of the logfile -->
-     <!--
--    <file>@localstatedir@/@package@/log/c2s.log</file>
-+    <file>/var/log/jabber/c2s.log</file>
-     -->
- 
-     <!-- Filename of the debug logfile -->
-     <!--
--    <debug>@localstatedir@/@package@/log/debug-${id}.log</debug>
-+    <debug>/var/log/jabber/debug-${id}.log</debug>
-     -->
-   </log>
- 
---- a/etc/router.xml.dist.in
-+++ b/etc/router.xml.dist.in
-@@ -14,16 +14,16 @@
- 
-     <!-- If logging to syslog, this is the log facility
-          (local0 - local7)                        [default: local3] -->
--    <facility>local3</facility>
-+    <facility>daemon</facility>
- 
-     <!-- If logging to file, this is the filename of the logfile -->
-     <!--
--    <file>@localstatedir@/@package@/log/router.log</file>
-+    <file>/var/log/jabber/router.log</file>
-     -->
- 
-     <!-- Filename of the debug logfile -->
-     <!--
--    <debug>@localstatedir@/@package@/log/debug-${id}.log</debug>
-+    <debug>/var/log/jabber/debug-${id}.log</debug>
-     -->
-   </log>
- 
---- a/etc/s2s.xml.dist.in
-+++ b/etc/s2s.xml.dist.in
-@@ -66,16 +66,16 @@
- 
-     <!-- If logging to syslog, this is the log facility
-          (local0 - local7)                        [default: local3] -->
--    <facility>local3</facility>
-+    <facility>daemon</facility>
- 
-     <!-- if logging to file, this is the filename of the logfile -->
-     <!--
--    <file>@localstatedir@/@package@/log/s2s.log</file>
-+    <file>/var/log/jabber/s2s.log</file>
-     -->
- 
-     <!-- Filename of the debug logfile -->
-     <!--
--    <debug>@localstatedir@/@package@/log/debug-${id}.log</debug>
-+    <debug>/var/log/jabber/debug-${id}.log</debug>
-     -->
-   </log>
- 
---- a/etc/sm.xml.dist.in
-+++ b/etc/sm.xml.dist.in
-@@ -56,16 +56,16 @@
- 
-     <!-- If logging to syslog, this is the log facility
-          (local0 - local7)                        [default: local3] -->
--    <facility>local3</facility>
-+    <facility>daemon</facility>
- 
-     <!-- If logging to file, this is the filename of the logfile -->
-     <!--
--    <file>@localstatedir@/@package@/log/sm.log</file>
-+    <file>/var/log/jabber/sm.log</file>
-     -->
- 
-     <!-- Filename of the debug logfile -->
-     <!--
--    <debug>@localstatedir@/@package@/log/debug-${id}.log</debug>
-+    <debug>/var/log/jabber/debug-${id}.log</debug>
-     -->
-   </log>
- 

jabberd.init

@@ -1,161 +0,0 @@
-#!/bin/bash
-#
-# Based on script from Raymond 25DEC2003 support@bigriverinfotech.com
-# Changed by Adrian Reber <adrian@lisas.de>
-#
-# processname: jabberd
-# description: jabberd is the next generation of the jabberd server
-# chkconfig: - 85 15
-#
-
-# source function library
-. /etc/rc.d/init.d/functions
-
-# pull in sysconfig settings
-[ -f __SYSCONF__/jabberd ] && . __SYSCONF__/jabberd
-
-if [ -z "$START_DAEMONS" ]; then
-    START_DAEMONS="router resolver sm c2s s2s"
-fi
-
-#
-progs="$START_DAEMONS"
-progsPath="__BINDIR__"
-confPath="__ETCDIR__"
-pidPath="__PIDDIR__"
-retval=0
-#
-ReqBins ( ) {
-    for prog in ${progs}; do
-        if [ ! -x ${progsPath}/${prog} ]; then
-            echo "jabberd binary [${prog}] not found."
-            echo "Cannot continue."
-            return -1
-        fi
-    done
-    return 0
-}
-#
-ReqConfs ( ) {
-    for prog in ${progs}; do
-        if [ ! -f ${confPath}/${prog}.xml ]; then
-            echo "jabberd configuration [${prog}.xml] not found."
-            echo "Cannot continue."
-            return -1
-        fi
-    done
-    return 0
-}
-#
-ReqDirs ( ) {
-    if [ ! -d ${pidPath} ]; then
-        echo "jabberd PID directory not found. Cannot continue."
-        return -1
-    fi
-    return 0
-}
-#
-Start ( ) {
-    for req in ReqBins ReqConfs ReqDirs; do
-        ${req}
-        retval=$?
-        [ ${retval} == 0 ] || return ${retval}
-    done
-    echo "Initializing jabberd processes ..."
-    for prog in ${progs}; do
-        if [ $( pidof -s ${prog} ) ]; then
-            echo "process [${prog}] already running"
-            continue
-        fi
-        echo -n "Starting ${prog}: "
-        rm -f /var/lock/subsys/${prog}
-        rm -f ${pidPath}/${prog}.pid
-        args="-c ${confPath}/${prog}.xml"
-        if [ ${prog} == "c2s" -a ! -z "$C2S_AS_ROOT" ]; then
-            if [ $C2S_AS_ROOT == "yes" ]; then
-                daemon --user root --pidfile ${pidPath}/${prog}.pid --check ${prog} "${progsPath}/${prog} ${args} >/dev/null 2>&1 &"
-            else
-                daemon --user jabber --pidfile ${pidPath}/${prog}.pid --check ${prog} "${progsPath}/${prog} ${args} >/dev/null 2>&1 &"
-            fi
-        else
-            daemon --user jabber --pidfile ${pidPath}/${prog}.pid --check ${prog} "${progsPath}/${prog} ${args} >/dev/null 2>&1 &"
-        fi
-        retval=$?
-        echo
-        if [ ${retval} == 0 ]; then
-            touch /var/lock/subsys/${prog}
-        else
-            let retval=-1
-            break
-        fi
-    done
-    return ${retval}
-}
-#
-Stop ( ) {
-    echo "Terminating jabberd processes ..."
-    for prog in $(echo ${progs} | tac -s ' '); do
-        echo -n "Stopping ${prog}: "
-        killproc ${prog}
-        retval=$?
-        if [ ${retval} == 0 ]; then
-            rm -f /var/lock/subsys/${prog}
-            rm -f ${pidPath}/${prog}.pid
-        fi
-        echo
-        sleep 1
-    done
-    return ${retval}
-}
-#
-reload()
-{
-    echo "Reloading jabberd processes ..."
-    for prog in ${progs}; do
-        killproc ${prog} -HUP
-        retval=$?
-    done
-    return ${retval}
-}
-
-rhstatus()
-{
-        for prog in ${progs}; do
-                status ${prog}
-        retval=$?
-        done
-    return ${retval}
-}
-
-case "$1" in
-    start)
-        Start
-        ;;
-    stop)
-        Stop
-        ;;
-    reload)
-        reload
-        ;;
-    status)
-        rhstatus
-        ;;
-    restart)
-        Stop
-        Start
-        ;;
-    condrestart)
-            for prog in ${progs}; do
-            if [ ! -f /var/lock/subsys/${prog} ]; then
-                exit
-            fi
-        done
-        Stop
-        sleep 3
-        Start
-        ;;
-    *)
-        echo "Usage: $0 {start|stop|restart|condrestart|reload|status}"
-        let retval=2
-esac
-exit ${retval}

jabberd.pam

@@ -1,5 +0,0 @@
-#%PAM-1.0
-auth       required     pam_nologin.so
-auth       include      password-auth
-account    include      password-auth
-session    include      password-auth

jabberd.spec

@@ -1,709 +0,0 @@
-%global _hardened_build 1
-%bcond_without pam
-%bcond_without sqlite
-%bcond_without db
-%bcond_without ldap
-%bcond_without mysql
-%bcond_without postgresql
-%if 0%{?rhel} && 0%{?rhel} == 6
-%bcond_with systemd
-%else
-%bcond_without systemd
-%endif
-
-Summary:        OpenSource server implementation of the Jabber protocols
-Name:           jabberd
-Version:        2.6.1
-Release:        8%{?dist}
-License:        GPLv2+
-Group:          System Environment/Daemons
-Source0:        https://github.com/jabberd2/jabberd2/releases/download/jabberd-%{version}/jabberd-%{version}.tar.xz
-Source1:        README.fedora
-Source2:        jabberd.init
-Source3:        jabberd.sysconfig
-Patch0:         jabberd-fedora-crypto-policy.patch
-Patch1:         jabberd-fix-paths.patch
-Patch2:         unbreak-autoreconf.patch
-Patch3:         0001-configure.ac-adapt-to-openssl-1.1.patch
-Patch4:         0002-authreg_ldapfull-adapt-to-openssl-1.1.patch
-Patch5:         0003-sx-ssl.c-adapt-to-openssl-1.1.patch
-Patch6:         0001-Fix-build-errors-with-MariaDB-10.2.patch
-# rhbz1510642
-Patch7:         181e736dcbb19c828266d88837f4343510b4d20e.patch
-URL:            http://jabberd2.org/
-BuildRequires:  openssl-devel libidn-devel expat-devel
-BuildRequires:  perl-generators
-BuildRequires:  cppunit-devel
-%if %{with systemd}
-BuildRequires:          systemd-units
-Requires(post):         systemd-units systemd-sysv
-Requires(preun):        systemd-units
-Requires(postun):       systemd-units
-%else
-Requires(post):         openssl chkconfig /sbin/service
-Requires(pre):          shadow-utils
-Requires(preun):        chkconfig shadow-utils /sbin/service
-Requires(postun):       chkconfig /sbin/service
-%endif
-%if %{with pam}
-BuildRequires:  pam-devel
-%endif
-%if %{with sqlite}
-BuildRequires:  sqlite-devel
-%endif
-%if %{with db}
-%if 0%{?fedora} >= 26
-BuildRequires:  libdb-devel
-%else
-BuildRequires:  db4-devel
-%endif
-%endif
-%if %{with ldap}
-BuildRequires:  openldap-devel
-%endif
-%if %{with mysql}
-%if 0%{?fedora} > 27
-BuildRequires:  mariadb-connector-c-devel
-%else
-BuildRequires:  mysql-devel
-%endif
-%endif
-%if %{with postgresql}
-BuildRequires:  postgresql-devel
-%endif
-BuildRequires:          libgsasl-devel udns-devel
-BuildRequires:          http-parser-devel
-BuildRequires:          autoconf libtool
-Requires(post):         openssl
-Requires(pre):          shadow-utils
-Requires(preun):        shadow-utils
-
-%description
-The jabberd project aims to provide an open-source server implementation of
-the Jabber protocols for instant messaging and XML routing. The goal of this
-project is to provide a scalable, reliable, efficient and extensible server
-that provides a complete set of features and is up to date with the latest
-protocol revisions.
-
-jabberd2 is the next generation of the jabberd server. It has been
-rewritten from the ground up to be scalable, architecturally sound, and to
-support the latest protocol extensions coming out of the JSF.
-
-This package defaults to use pam and sqlite.
-
-%prep
-%setup -q
-# "Utilize system-wide crypto-policies" is only for F21+ (#1179229)
-# therefore the patch is not applied on non Fedora builds
-%if 0%{?fedora}
-%patch0 -p1
-%endif
-%patch1 -p1
-%if 0%{?fedora} >= 26
-# With Fedora 26 openssl-1.1 was introduced. jabberd needs patches
-# to work with openssl-1.1. These patches have been submitted upstream:
-# https://github.com/jabberd2/jabberd2/pull/129
-# The patches also work with older openssl versions.
-# For now the patches are only applied for rawhide/f26 as long as upstream
-# has not merged the patches.
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch7 -p1
-autoreconf --verbose --force --install
-%endif
-%patch6 -p1
-
-%build
-export CFLAGS="%{optflags}"
-%configure \
-        --sysconfdir=%{_sysconfdir}/%{name} \
-        --localstatedir=%{_var}/lib \
-%if %{with pam}
-        --enable-pam \
-%else
-        --disable-pam \
-%endif
-%if %{with db}
-        --enable-db \
-%if 0%{?fedora} < 26
-        --with-extra-include-path=%{_includedir}/libdb4 \
-%endif
-%else
-        --disable-db \
-%endif
-%if %{with mysql}
-        --enable-mysql \
-%if 0%{?fedora} > 27
-        --with-extra-library-path=%{_libdir}/mariadb \
-%else
-        --with-extra-library-path=%{_libdir}/mysql \
-%endif
-%else
-        --disable-mysql \
-%endif
-%if %{with ldap}
-        --enable-ldap \
-%else
-        --disable-ldap \
-%endif
-%if %{with postgresql}
-        --enable-pgsql \
-%else
-        --disable-pgsql \
-%endif
-%if %{with sqlite}
-        --enable-sqlite \
-%else
-        --disable-sqlite \
-%endif
-        --enable-fs --enable-anon --enable-pipe --enable-ssl \
-        --enable-websocket \
-        --enable-debug
-
-make %{?_smp_mflags}
-
-
-%install
-rm -rf $RPM_BUILD_ROOT
-
-make install DESTDIR=$RPM_BUILD_ROOT
-
-# correct the script interpreter for perl scripts
-sed -i "s|/usr/pkg/bin/perl|/usr/bin/env perl|" tools/*.pl
-
-install -dpm 700 $RPM_BUILD_ROOT/%{_var}/lib/%{name}/{log,pid,db}
-install -dpm 755 $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/
-install -Dpm 644 tools/pam_jabberd $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/%{name}
-
-install -dpm 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/
-# install any tool in tools/ to /usr/share/jabberd/, but skip Makefile-stuff
-# and unneccessary scripts
-install -dpm 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/
-for i in `ls tools`; do
-    if [ $i == "Makefile" -o $i == "Makefile.am" -o $i == "Makefile.in" \
-        -o $i == "jabberd.in" -o $i == "jabberd.rc" -o $i == "pam_jabberd" ]; then
-        continue;
-    fi
-
-    sed -i "s|\r||g" tools/$i
-    install -pm 755 tools/$i $RPM_BUILD_ROOT%{_datadir}/%{name}/
-done
-
-install -dpm 755 $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/
-
-%if ! %{with systemd}
-rm -frv $RPM_BUILD_ROOT%{_prefix}/lib/systemd
-
-install -Dpm 755 %{SOURCE2} $RPM_BUILD_ROOT%{_initrddir}/%{name}
-install -Dpm 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}
-
-sed -i -e "s,__BINDIR__,%{_bindir},g" \
-       -e "s,__ETCDIR__,%{_sysconfdir}/%{name}/,g" \
-       -e "s,__PIDDIR__,%{_var}/lib/%{name}/pid,g" \
-       -e "s,__SYSCONF__,%{_sysconfdir}/sysconfig,g" \
-          $RPM_BUILD_ROOT%{_initrddir}/%{name} \
-          $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}
-%endif
-
-# remove static libraries
-find $RPM_BUILD_ROOT -name "*.la" -delete
-
-# Remove Upstart configuration files, they are not needed for Fedora
-rm -f $RPM_BUILD_ROOT/etc/jabberd/*.conf
-rm -f $RPM_BUILD_ROOT/usr/etc/init/*.conf
-
-#default authentication backend
-#enable SSL certificate
-#clients must do STARTTLS
-#disable account registrations by default, because the default installation uses PAM
-#set the realm to '' for a working authentication against PAM
-sed -i -e ':a;N;$!ba' \
-            -e 's,<module>mysql</module>,<module>pam</module>,g' \
-            -e "s,register-enable='true'>,realm='' require-starttls='true' pemfile='/etc/%{name}/server.pem'>,g" \
-                $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/c2s.xml
-
-touch $RPM_BUILD_ROOT%{_sysconfdir}/jabberd/server.pem
-
-# we have our own start script
-rm -f $RPM_BUILD_ROOT%{_bindir}/jabberd
-
-# we have our own start script
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/jabberd.cfg*
-
-# README.fedora
-cp %{SOURCE1} .
-
-
-
-%pre
-#creating jabber user
-getent group jabber >/dev/null || groupadd -r jabber
-getent passwd jabber >/dev/null || \
-useradd -r -g jabber -d %{_var}/lib/%{name} -s /sbin/nologin \
-        -c "Jabber Server" jabber
-exit 0
-
-%post
-%if %{with systemd}
-%systemd_post %{name}.service
-if [ $1 -eq 1 ] ; then
-        #replace default passwords, yet another hack
-        export NEWPASS=$( dd if=/dev/urandom bs=20 count=1 2>/dev/null \
-                                | sha1sum | awk '{print $1}' )
-        cd %{_sysconfdir}/%{name}
-        %{__sed} -i -f- router-users.xml router.xml <<END
-s,<secret>secret</secret>,<secret>$NEWPASS</secret>,g
-END
-        %{__sed} -i -f- *.xml <<END
-s,<pass>secret</pass>,<pass>$NEWPASS</pass>,g
-END
-
-fi
-
-#create ssl certificate
-cd %{_sysconfdir}/%{name}
-if [ ! -s server.pem ]; then
- if [ -e %{_bindir}/make-dummy-cert ]; then
-  # openssl-1.1 places the script in /usr
-  %{___build_shell} %{_bindir}/make-dummy-cert
- else
-  %{___build_shell} %{_sysconfdir}/pki/tls/certs/make-dummy-cert server.pem
- fi
- chown root.jabber server.pem
- chmod 640 server.pem
-fi
-%else
-if [ "$1" -eq "1" ]; then
-        /sbin/chkconfig --add %{name}
-        #replace default passwords, yet another hack
-        export NEWPASS=$( dd if=/dev/urandom bs=20 count=1 2>/dev/null \
-                                | sha1sum | awk '{print $1}' )
-        cd %{_sysconfdir}/%{name}
-        %{__sed} -i -f- router-users.xml router.xml <<END
-s,<secret>secret</secret>,<secret>$NEWPASS</secret>,g
-END
-        %{__sed} -i -f- *.xml <<END
-s,<pass>secret</pass>,<pass>$NEWPASS</pass>,g
-END
-
-fi
-
-#create ssl certificate
-cd %{_sysconfdir}/%{name}
-if [ ! -s server.pem ]; then
- %{___build_shell} %{_sysconfdir}/pki/tls/certs/make-dummy-cert server.pem
- chown root.jabber server.pem
- chmod 640 server.pem
-fi
-%endif
-
-%preun
-%if %{with systemd}
-%systemd_preun %{name}.service
-%else
-if [ "$1" -eq "0" ]; then
-        /sbin/service %{name} stop > /dev/null 2>&1
-        /sbin/chkconfig --del %{name}
-fi
-%endif
-
-
-%postun
-%if %{with systemd}
-%systemd_postun_with_restart %{name}.service
-
-%triggerun -- jabberd < 2.2.14-3
-# Save the current service runlevel info
-# User must manually run systemd-sysv-convert --apply jabberd
-# to migrate them to systemd targets
-/usr/bin/systemd-sysv-convert --save %{name} >/dev/null 2>&1 ||:
-
-# If the package is allowed to autostart:
-/bin/systemctl --no-reload enable %{name}.service >/dev/null 2>&1 ||:
-
-# Run these because the SysV package being removed won't do them
-/sbin/chkconfig --del %{name} >/dev/null 2>&1 || :
-/bin/systemctl try-restart %{name}.service >/dev/null 2>&1 || :
-%else
-if [ "$1" -eq "1" ]; then
-        /sbin/service %{name} condrestart > /dev/null 2>&1
-fi
-%endif
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog NEWS README TODO README.fedora
-%{_mandir}/man8/*
-%{_bindir}/*
-%if %{with systemd}
-%{_unitdir}/*
-%else
-%{_initrddir}/%{name}
-%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
-%endif
-%{_libdir}/%{name}/
-%attr(750, jabber, jabber) %dir %{_sysconfdir}/%{name}
-%attr(750, jabber, jabber) %dir %{_sysconfdir}/%{name}/templates
-%config(noreplace) %{_sysconfdir}/%{name}/server.pem
-%attr(640, jabber, jabber) %config(noreplace) %{_sysconfdir}/%{name}/*xml*
-%attr(640, jabber, jabber) %config(noreplace) %{_sysconfdir}/%{name}/templates/*xml*
-%dir %{_datadir}/%{name}/
-%attr(644,root,root) %{_datadir}/%{name}/*
-%config(noreplace) %{_sysconfdir}/pam.d/%{name}
-%attr(700, jabber, jabber) %{_var}/lib/%{name}
-
-%changelog
-* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.1-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Sat Jan 20 2018 Björn Esser <besser82@fedoraproject.org> - 2.6.1-7
-- Rebuilt for switch to libxcrypt
-
-* Wed Nov 08 2017 Adrian Reber <adrian@lisas.de> - 2.6.1-6
-- Fix crash with new openssl 1.1 support patch (Oleg Girko) (#1510642)
-
-* Wed Sep 20 2017 Adrian Reber <adrian@lisas.de> - 2.6.1-5
-- Switch to mariadb-connector-c-devel from mysql-devel for > f27 (#1493627)
-
-* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.1-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Wed Jul 12 2017 Adrian Reber <adrian@lisas.de> - 2.6.1-2
-- added patch to fix build errors with mariadb 10.2 (#1470036)
-
-* Tue Jul 04 2017 Adrian Reber <adrian@lisas.de> - 2.6.1-1
-- updated to 2.6.1 (security bugfix release)
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Thu Jan 05 2017 Matěj Cepl <mcepl@redhat.com> - 2.5.0-1
-- New upstream release.
-
-* Tue Dec 20 2016 Adrian Reber <adrian@lisas.de> - 2.4.0-6
-- Added patches to fix "segfaut in 'sm' component when blocking users" (#1406062)
-- BR libdb-devel instead of db4-devel
-
-* Fri Dec 02 2016 Adrian Reber <adrian@lisas.de> - 2.4.0-5
-- Added patches to build against openssl-1.1 (only for >= 26)
-
-* Tue Oct 04 2016 Matěj Cepl <mcepl@redhat.com> - 2.4.0-4
-- Make spec alternatively working with RHEL-6 (no systemd).
-
-* Tue Oct 04 2016 Adrian Reber <adrian@lisas.de> - 2.4.0-3
-- Fixes "Enable websockets" (#1380958)
-
-* Sat Jun 25 2016 Matěj Cepl <mcepl@redhat.com> - 2.4.0-2
-- Use standard conditional macros in SPEC (#647101)
-- Fix system paths (#857540)
-
-* Mon May 23 2016 Adrian Reber <adrian@lisas.de> - 2.4.0-1
-- updated to 2.4.0
-
-* Sun Feb 28 2016 Adrian Reber <adrian@lisas.de> - 2.3.6-1
-- updated to 2.3.6
-- remove fix for "Version mismatch error."
-
-* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.5-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Sun Jan 31 2016 Adrian Reber <adrian@lisas.de> - 2.3.5-1
-- updated to 2.3.5
-- run autoreconf to fix libtool error
-
-* Mon Nov 09 2015 Adrian Reber <adrian@lisas.de> - 2.3.4-1
-- updated to 2.3.4
-
-* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3.3-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Tue Apr 21 2015 Adrian Reber <adrian@lisas.de> - 2.3.3-5
-- fix release number
-
-* Tue Apr 14 2015 Adrian Reber <adrian@lisas.de> - 2.3.3-1
-- updated to 2.3.3
-
-* Thu Feb 26 2015 Adrian Reber <adrian@lisas.de> - 2.3.2-4
-- fixes "Utilize system-wide crypto-policies" (#1179229) (thanks to Matěj Cepl)
-
-* Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3.2-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Tue Feb 25 2014 Adrian Reber <adrian@lisas.de> - 2.3.2-1
-- updated to 2.3.2
-- dropped patches
-
-* Tue Feb 18 2014 Adrian Reber <adrian@lisas.de> - 2.3.1-3
-- upstreamed systemd unit files (Patch1)
-
-* Wed Dec 04 2013 Adrian Reber <adrian@lisas.de> - 2.3.1-2
-- fixes "Regression with jabberd 2.3.1 and postgresql" (#1036876)
-  https://github.com/jabberd2/jabberd2/issues/48
-
-* Thu Nov 28 2013 Adrian Reber <adrian@lisas.de> - 2.3.1-1
-- updated to 2.3.1
-
-* Fri Aug 23 2013 Adrian Reber <adrian@lisas.de> - 2.2.17-5
-- enable _hardened_build (#954340)
-
-* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.17-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Wed Jul 17 2013 Petr Pisar <ppisar@redhat.com> - 2.2.17-3
-- Perl 5.18 rebuild
-
-* Thu Jan 31 2013 Adrian Reber <adrian@lisas.de> - 2.2.17-2
-- added README.fedora which describes what to change
-  for authentication with PAM (#896575)
-
-* Mon Aug 27 2012 Adrian Reber <adrian@lisas.de> - 2.2.17-1
-- updated to 2.2.17
-- removed all three patches which are now included
-
-* Wed Aug 22 2012 Adrian Reber <adrian@lisas.de> - 2.2.16-5
-- included patch for "Vulnerability in XMPP Server Dialback Implementations"
-  http://xmpp.org/resources/security-notices/server-dialback/
-- fixed "Introduce new systemd-rpm macros in jabberd spec file" (#850175)
-
-* Tue Jul 24 2012 Adrian Reber <adrian@lisas.de> - 2.2.16-4
-- added libdb4 include directory to include search path
-
-* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.16-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Wed Jun 20 2012 Adrian Reber <adrian@lisas.de> - 2.2.16-2
-- added patch for "multiple calls of srand() with expat-2.1.0"
-  https://github.com/Jabberd2/jabberd2/pull/5
-
-* Sat May 05 2012 Adrian Reber <adrian@lisas.de> - 2.2.16-1
-- updated to 2.2.16
-- added patch 41884d9919.patch to build without debug
-
-* Wed May 02 2012 Adrian Reber <adrian@lisas.de> - 2.2.15-1
-- updated to 2.2.15
-
-* Sat Mar 24 2012 Adrian Reber <adrian@lisas.de> - 2.2.14-3
-- removed buildroot and clean section
-- switched to systemd
-
-* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.14-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Wed Jun 01 2011 Dominic Hopf <dmaphy@fedoraproject.org> - 2.2.14-1
-- update to 2.2.14 (#700390, CVE-2011-1755)
-- remove unneeded upstart configuration files
-
-* Wed Mar 23 2011 Dan Horák <dan@danny.cz> - 2.2.13-3
-- rebuilt for mysql 5.5.10 (soname bump in libmysqlclient)
-
-* Tue Mar 22 2011 Dominic Hopf <dmaphy@fedoraproject.org> - 2.2.13-2
-- rebuild against new libmysqlclient
-
-* Wed Feb 23 2011 Dominic Hopf <dmaphy@fedoraproject.org> - 2.2.13-1
-- updated to 2.2.13
-
-* Tue Feb 15 2011 Adrian Reber <adrian@lisas.de> - 2.2.12-1
-- updated to 2.2.12
-
-* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.11-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Wed Jan 05 2011 Adrian Reber <adrian@lisas.de> - 2.2.11-7
-- ported spec changes from f14 branch to devel branch
-- fix "jabberd spec file puts server.pem in /etc instead of /etc/jabberd" (#667504)
-
-* Wed Sep 29 2010 jkeating - 2.2.11-2
-- Rebuilt for gcc bug 634757
-
-* Sun Sep 12 2010 Dominic Hopf <dmaphy@fedoraproject.org> - 2.2.11-1
-- new upstream release
-- fix script-without-shebang errors
-- preserve timestamp of ChangeLog while converting to UTF8
-
-* Thu Aug 12 2010 Dominic Hopf <dmaphy@fedoraproject.org> - 2.2.10-1
-- new upstream release jabberd 2.2.10
-- add patch jabberd-fix-missing-reference-in-log_error.patch from upstream svn
-- use %%{_mandir} macro for manpages
-- create a new source file for the PAM info instead of writing it on the fly
-- install all tools provided by upstream to /usr/share/jabberd/
-- remove storage driver replacement, since 2.2.10 sqlite is the default
-- remove dependency to gc-devel
-- remove unneccessary defines for sysconfdir and don't use unneccessary macros
-- remove static libraries
-- fix a lot of rpmlint errors and warnings
-
-* Wed Sep 16 2009 Tomas Mraz <tmraz@redhat.com> - 2.2.8-5
-- use password-auth common PAM configuration instead of system-auth
-
-* Fri Aug 21 2009 Tomas Mraz <tmraz@redhat.com> - 2.2.8-4
-- rebuilt with new openssl
-
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.8-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Fri Jun 19 2009 Adrian Reber <adrian@lisas.de> - 2.2.8-2
-- updated to 2.2.8
-- added patch to fix "router segfaults" (rhbz#497671)
-
-* Tue Mar 31 2009 Bernie Innocenti <bernie@codewiz.org> - 2.2.7.1-2
-- fix rhbz#349714: jabberd does not close its stdin/stdout/stderr
-
-* Thu Feb 26 2009 Adrian Reber <adrian@lisas.de> - 2.2.7.1-1
-- updated to 2.2.7.1
-- "Workaround for buggy Java TLS implementation (affecting OpenFire and GTalk)"
-
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.7-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Tue Feb 17 2009 Adrian Reber <adrian@lisas.de> - 2.2.7-1
-- updated to 2.2.7
-
-* Mon Feb 16 2009 Adrian Reber <adrian@lisas.de> - 2.2.6-1
-- updated to 2.2.6
-
-* Tue Feb 03 2009 Adrian Reber <adrian@lisas.de> - 2.2.5-1
-- updated to 2.2.5
-
-* Fri Jan 23 2009 Bernie Innocenti <bernie@codewiz.org> - 2.2.4-2
-- Replace /etc/sysconfig/jabberd on upgrade to drop obsolete daemons
-- Rebuilt for new libmysqlclient
-
-* Tue Oct 07 2008 Adrian Reber <adrian@lisas.de> - 2.2.4-1
-- updated to 2.2.4
-  (this version and pidgin 2.5.1 finally work together)
-
-* Mon Feb 11 2008 Adrian Reber <adrian@lisas.de> - 2.1.23-1
-- updated to 2.1.23
-
-* Tue Jan 08 2008 Adrian Reber <adrian@lisas.de> - 2.1.21-1
-- updated to 2.1.21
-
-* Tue Jan 08 2008 Adrian Reber <adrian@lisas.de> - 2.1.20-1
-- updated to 2.1.20
-
-* Thu Dec 06 2007 Adrian Reber <adrian@lisas.de> - 2.1.19-1
-- updated to 2.1.19
-- this version might be config file incompatible to 2.0
-  in certain cases
-- for details please refer to the UPGRADE file
-
-* Wed Dec 05 2007 Adrian Reber <adrian@lisas.de> - 2.0-0.s11.15
-- rebuilt for new openssl and openldap
-
-* Mon Aug 27 2007 Adrian Reber <adrian@lisas.de> - 2.0-0.s11.14
-- applied patch to fix bz #175219
-- removed config flag for startup script
-- updated License
-- added patch for new glibc open macro
-
-* Tue Jun 12 2007 Thorsten Leemhuis <fedora [AT] leemhuis.info> - 2.0-0.s11.13
-- rebuilt on behalf of Adrian
-
-* Thu Dec 07 2006 Adrian Reber <adrian@lisas.de> - 2.0-0.s11.12
-- rebuilt
-
-* Tue Sep 12 2006 Adrian Reber <adrian@lisas.de> - 2.0-0.s11.11
-- rebuilt
-
-* Mon Aug 07 2006 Adrian Reber <adrian@lisas.de> - 2.0-0.s11.10
-- changed pam file to use include
-- added return value for status() function (bz #200996)
-
-* Mon Apr 03 2006 Adrian Reber <adrian@lisas.de> - 2.0-0.s11.9
-- updated to 2.0-0.s11
-
-* Wed Feb 15 2006 Adrian Reber <adrian@lisas.de> - 2.0-0.s10.9
-- rebuilt
-
-* Sun Nov 27 2005 Adrian Reber <adrian@lisas.de> - 2.0-0.s10.8
-- %%{_sysconfdir}/jabberd/server.pem was listed twice
-- added /sbin/service dependency to %%post, %%postun and %%preun
-- jabber user is not deleted to avoid unowned files
-
-* Mon Oct 17 2005 Adrian Reber <adrian@lisas.de> - 2.0-0.s10.7
-- updated to 2.0-0.s10
-
-* Mon Aug 01 2005 Adrian Reber <adrian@lisas.de> - 2.0-0.s9.6
-- updated to 2.0-0.s9.6
-
-* Thu May 12 2005 Adrian Reber <adrian@lisas.de> - 2.0-0.s8.5
-- updated to 2.0-0.s8.5
-- using new location of make-dummy-cert
-
-* Wed Mar 09 2005 Adrian Reber <adrian@lisas.de> - 2.0-0.s6.5
-- removed Epoch: 0
-- more Requires(...)
-- typo
-- changed db location to %%{_var}/lib/jabberd
-- removed noreplace for start script
-- make backends optional during build
-- use -p with the install command
-- combined some of the sed magic
-- added a jabberd file in sysconfig to control if all daemons
-  should be started
-- don't suid c2s and add config option in sysconfig/jabberd
-  to start c2s as root if required to authenticate against pam/shadow
-
-* Tue Mar 08 2005 Adrian Reber <adrian@lisas.de> - 2.0-0.s6.4
-- made password more random (/dev/random)
-- replace password in the config without making it visible in ps
-- enable ldap, mysql, postgresql backends
-- remove dependency on perl during build
-- make pam default authentication backend in c2s.xml
-- make files in etc (640, jabber, jabber)
-- enabled SSL certificate in c2s.xml
-- enabled auto creation of accounts in sm.xml (necessary for usage with PAM)
-- enabled require-startls
-
-* Mon Mar 07 2005 Adrian Reber <adrian@lisas.de> - 2.0-0.s6.3
-- changed startscript again
-
-* Mon Mar 07 2005 Adrian Reber <adrian@lisas.de> - 2.0-0.s6.2
-- changed startscript to support condrestart
-
-* Mon Mar 07 2005 Adrian Reber <adrian@lisas.de> - 2.0-0.s6.1
-- updated to 2.0s6
-
-* Wed Nov 24 2004 Adrian Reber <adrian@lisas.de> - 0:2.0-0.fdr.16.s4
-- updated to 2.0s4
-- added jabberd-c2s-buffers.patch
-  (http://jabberstudio.org/projects/jabberd2/bugs/view.php?id=4528)
-- replace <driver>mysql</driver> with <driver>db</driver> in sm.xml
-
-* Mon Jul 19 2004 Adrian Reber <adrian@lisas.de> - 0:2.0-0.fdr.15.s3
-- add ||: at the end of the useradd line
-
-* Mon Jul 19 2004 Adrian Reber <adrian@lisas.de> - 0:2.0-0.fdr.14.s3
-- create jabber user in %%pre instead of in %%post
-- remove -r from userdel
-
-* Mon Jul 19 2004 Adrian Reber <adrian@lisas.de> - 0:2.0-0.fdr.13.s3
-- s/jabberd2/%%{name}/
-- replace another default password
-
-* Fri Jul 16 2004 Adrian Reber <adrian@lisas.de> - 0:2.0-0.fdr.12.s3
-- %%{_var}/jabberd is now owned be the package
-- %%ghost-ing server.pem
-- disable rm-ing %%{_var}/jabberd on uninstall
-
-* Fri Jul 16 2004 Adrian Reber <adrian@lisas.de> - 0:2.0-0.fdr.11.s3
-- using %%{_datadir}/ssl/certs/make-dummy-cert to
-  create the certificate
-- added -r to useradd
-- added openssl to post-requires
-- added libidn-devel and pam-devel as BuildRequires
-
-* Mon Jul 12 2004 Adrian Reber <adrian@lisas.de> - 0:2.0-0.fdr.10.s3
-- complete rewrite for fedora (I mean it)
-
-* Tue May 18 2004 Tim Niemueller <tim@niemueller.de>
-- Initial spec file

jabberd.sysconfig

@@ -1,18 +0,0 @@
-# __SYSCONF__/jabberd
-# this files controls which daemons are started by the jabberd startscript
-#
-# the following example shows a configuration for a startup of jabberd daemons
-# necessary for a jabberd server running on one host
-# START_DAEMONS="router sm c2s s2s"
-#
-# a jabberd server consists of:
-# * router
-# * sm (Session Manager)
-# * c2s (Client to Server)
-# * s2s (Server to Server)
-#
-START_DAEMONS="router sm c2s s2s"
-
-# set C2S_AS_ROOT to "yes" to start c2s as root
-# this can be necessary if c2s needs to authenticate against pam/shadow
-C2S_AS_ROOT="no"

sources

@@ -1 +0,0 @@
-SHA512 (jabberd-2.6.1.tar.xz) = 845347d2b812f6232ac84771e276c0783636406d73ae3cedbc5c28119f33c40a1c995827050c0227d7260dadba81434692059ff5a0b911e1c0c92f821e33eeea

unbreak-autoreconf.patch

@@ -1,13 +0,0 @@
---- a/configure.ac	2016-05-22 19:39:13.000000000 +0000
-+++ b/configure.ac	2016-12-02 09:05:22.692000000 +0000
-@@ -74,10 +74,6 @@
-     AC_DEFINE(MIO_DEBUG,1,[Define to 1 if you want to enable managed IO debug output.])
- fi
- 
--# Colorized build output
--AX_CHECK_COMPILE_FLAG([-fdiagnostics-color], [CFLAGS="${CFLAGS} -fdiagnostics-color"],
--    [AX_CHECK_COMPILE_FLAG([-fcolor-diagnostics], [CFLAGS="${CFLAGS} -fcolor-diagnostics"])])
--
- # Two-step header checking.  First check for headers which don't
- # require any other headers.
- AC_HEADER_DIRENT