Hello community, here is the log from the commit of package knot for openSUSE:Factory checked in at 2014-01-08 20:06:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/knot (Old) and /work/SRC/openSUSE:Factory/.knot.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "knot" Changes: -------- --- /work/SRC/openSUSE:Factory/knot/knot.changes 2013-12-16 16:32:20.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.knot.new/knot.changes 2014-01-08 20:06:58.000000000 +0100 @@ -1,0 +2,21 @@ +Wed Jan 8 08:58:19 UTC 2014 - ondrej@sury.org + +- Add support to compile with OpenSSL << 1.0.0 + +- added patches: + * 0001-Add-support-for-OpenSSL-threads-in-OpenSSL-1.0.0.patch + * 0001-Check-the-OpenSSL-version-when-checking-for-GOST-alg.patch +------------------------------------------------------------------- +Wed Jan 8 08:40:45 UTC 2014 - ondrej@sury.org + +- update to 1.4.0: + * Experimental automatic DNSSEC signing + * Fastest ragel parser enabled by default + * Reduced memory usage + * Zone SOA SERIAL policies (INCREMENT, UNIXTIME) for DDNS and + automatic DNSSEC signing + * IDN support in Knot utilities (kdig, knsupdate, ...) + * DNSSEC: support for GOST algorithm + * Support for DNSSEC key pre-publication + +------------------------------------------------------------------- Old: ---- knot-1.3.4.tar.bz2 New: ---- 0001-Add-support-for-OpenSSL-threads-in-OpenSSL-1.0.0.patch 0001-Check-the-OpenSSL-version-when-checking-for-GOST-alg.patch knot-1.4.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ knot.spec ++++++ --- /var/tmp/diff_new_pack.DXenAU/_old 2014-01-08 20:06:59.000000000 +0100 +++ /var/tmp/diff_new_pack.DXenAU/_new 2014-01-08 20:06:59.000000000 +0100 @@ -18,7 +18,7 @@ Name: knot Url: http://www.knot-dns.cz -Version: 1.3.4 +Version: 1.4.0 Release: 0 Summary: An authoritative DNS daemon License: GPL-3.0+ @@ -39,9 +39,11 @@ %{?systemd_requires} %define has_systemd 1 %endif -Source0: http://public.nic.cz/files/knot-dns/%{name}-%{version}.tar.bz2 +Source0: https://secure.nic.cz/files/knot-dns/%{name}-%{version}.tar.bz2 Source1: knot.conf Source2: knot.service +Patch0: 0001-Add-support-for-OpenSSL-threads-in-OpenSSL-1.0.0.patch +Patch1: 0001-Check-the-OpenSSL-version-when-checking-for-GOST-alg.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -49,6 +51,8 @@ %prep %setup -q +%patch0 -p1 +%patch1 -p1 %build %if 0%{suse_version} == 1210 ++++++ 0001-Add-support-for-OpenSSL-threads-in-OpenSSL-1.0.0.patch ++++++
From c0c390f18d602e310e8bf31a23b25a376314e07c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?=
Date: Mon, 6 Jan 2014 12:04:45 +0100 Subject: [PATCH] Add support for OpenSSL threads in OpenSSL << 1.0.0
--- src/libknot/dnssec/crypto.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) --- knot.orig/src/libknot/dnssec/crypto.c +++ knot/src/libknot/dnssec/crypto.c @@ -105,11 +105,20 @@ static void openssl_mutexes_destroy(void * * \param openssl_id Thread identifier in OpenSSL. */ +#if OPENSSL_VERSION_NUMBER >= 0x1000001fL static void openssl_threadid_cb(CRYPTO_THREADID *openssl_id) { pthread_t id = pthread_self(); CRYPTO_THREADID_set_pointer(openssl_id, (void *)id); } +#else +static unsigned long openssl_threadid_cb(void) +{ + unsigned long ret; + ret = (unsigned long)pthread_self(); + return(ret); +} +#endif /*- pluggable engines -------------------------------------------------------*/ @@ -181,7 +190,11 @@ void knot_crypto_init_threads(void) } // thread identification +#if OPENSSL_VERSION_NUMBER >= 0x1000001fL CRYPTO_THREADID_set_callback(openssl_threadid_cb); +#else + CRYPTO_set_id_callback((unsigned long (*)())openssl_threadid_cb); +#endif } void knot_crypto_cleanup_threads(void) ++++++ 0001-Check-the-OpenSSL-version-when-checking-for-GOST-alg.patch ++++++
From 2354047b6402aa68daffe96d6f82f30f0dad1cff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?=
Date: Mon, 6 Jan 2014 11:37:23 +0100 Subject: [PATCH] Check the OpenSSL version when checking for GOST algorithm support
--- src/libknot/dnssec/config.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- knot.orig/src/libknot/dnssec/config.h +++ knot/src/libknot/dnssec/config.h @@ -35,13 +35,13 @@ #endif // ECDSA support requires OpenSSL version >= 1.0.1 -#if !defined(OPENSSL_NO_ECDSA) && OPENSSL_VERSION_NUMBER >= 0x10001000 +#if !defined(OPENSSL_NO_ECDSA) && OPENSSL_VERSION_NUMBER >= 0x10001000L #define KNOT_ENABLE_ECDSA 1 #else #undef KNOT_ENABLE_ECDSA #endif -#if !defined(OPENSSL_NO_GOST) +#if !defined(OPENSSL_NO_GOST) && OPENSSL_VERSION_NUMBER >= 0x1000001fL #define KNOT_ENABLE_GOST 1 #else #undef KNOT_ENABLE_GOST ++++++ knot-1.3.4.tar.bz2 -> knot-1.4.0.tar.bz2 ++++++ ++++ 261832 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org