Hello community, here is the log from the commit of package opendkim for openSUSE:Factory checked in at 2018-07-06 10:48:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/opendkim (Old) and /work/SRC/openSUSE:Factory/.opendkim.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "opendkim" Fri Jul 6 10:48:12 2018 rev:2 rq:621115 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/opendkim/opendkim.changes 2018-05-15 10:33:27.508063697 +0200 +++ /work/SRC/openSUSE:Factory/.opendkim.new/opendkim.changes 2018-07-06 10:48:56.438758459 +0200 @@ -1,0 +2,30 @@ +Sat Jun 2 00:23:34 UTC 2018 - [email protected] + +- https://src.fedoraproject.org/rpms/opendkim/raw/master/f/opendkim.ticket35+37.patch + allow building on newer distros (openssl 1.1 support) + +------------------------------------------------------------------- +Fri Jun 1 23:55:05 UTC 2018 - [email protected] + +- fix the previous change: + source files got added but the renumbering was not applied to the + reference to the source files -> signature file was installed as + services file + +------------------------------------------------------------------- +Fri Jun 1 08:11:56 UTC 2018 - [email protected] + +- Applied spec-cleaner to spec file +- Removed conditionals around %license macro +- Used OpenPGP signature provided upstream +- Added opendkim.keyring containing the key used to sign official + releases. + +------------------------------------------------------------------- +Mon May 28 15:35:07 UTC 2018 - [email protected] + +- enable DNSSEC support (requires unbound library) + ATTENTION: The file /var/lib/unbound/root.key must be readable by + user opendkim, which is not the fact for older unbound packages + +------------------------------------------------------------------- New: ---- opendkim-2.10.3.tar.gz.asc opendkim.keyring opendkim.ticket35+37.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ opendkim.spec ++++++ --- /var/tmp/diff_new_pack.0aE87p/_old 2018-07-06 10:49:02.698750725 +0200 +++ /var/tmp/diff_new_pack.0aE87p/_new 2018-07-06 10:49:02.698750725 +0200 @@ -1,7 +1,7 @@ # # spec file for package opendkim # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -34,34 +34,36 @@ Version: %{ver_odkim} Release: 0 Summary: Milter based implementation of DKIM -License: BSD-3-Clause and Sendmail +License: BSD-3-Clause AND Sendmail Group: Productivity/Networking/Email/Servers -Url: http://www.opendkim.org/ -Source: http://sourceforge.net/projects/opendkim/files/opendkim-%{version}.tar.gz -Source1: opendkim.service -Source2: opendkim.tmpfiles.d -Source3: opendkim.init +URL: http://www.opendkim.org/ +Source0: http://sourceforge.net/projects/opendkim/files/opendkim-%{version}.tar.gz +Source1: http://sourceforge.net/projects/opendkim/files/opendkim-%{version}.tar.gz.asc +Source2: %{name}.keyring +Source3: opendkim.service +Source4: opendkim.tmpfiles.d +Source5: opendkim.init +# PATCH-FIX-UPSTREAM fix compiler warnings Patch0: opendkim-2.9.2_compiler_warnings.patch +# PATCH-FIX-OPENSUSE set default values in installed configuration file Patch1: opendkim-2.9.2_default_config.patch +Patch2: https://src.fedoraproject.org/rpms/opendkim/raw/master/f/opendkim.ticket35+37.patch BuildRequires: curl-devel BuildRequires: cyrus-sasl-devel BuildRequires: db-devel BuildRequires: erlang BuildRequires: libbsd-devel BuildRequires: libevent-devel -%if 0%{?suse_version} >= 1500 -BuildRequires: libopenssl-1_0_0-devel -%else -BuildRequires: libopenssl-devel -%endif BuildRequires: lua51-devel BuildRequires: openldap2-devel BuildRequires: pkgconfig BuildRequires: postgresql-devel BuildRequires: sendmail-devel BuildRequires: tre-devel -Requires(pre): /usr/sbin/groupadd /usr/sbin/useradd -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: unbound-devel +Requires(pre): %{_sbindir}/groupadd +Requires(pre): %{_sbindir}/useradd +BuildRequires: libopenssl-devel %if %{with opendkim_reputation} BuildRequires: libjansson-devel %endif @@ -78,7 +80,9 @@ BuildRequires: pkgconfig(systemd) %{?systemd_requires} %else -PreReq: %insserv_prereq %fillup_prereq +# FIXME: use proper Requires(pre/post/preun/...) +PreReq: %fillup_prereq +PreReq: %insserv_prereq %endif %description @@ -101,6 +105,7 @@ %package -n miltertest Version: %{ver_mt} +Release: 0 Summary: Milter unit test utility License: BSD-3-Clause Group: Productivity/Networking/Diagnostic @@ -113,7 +118,7 @@ %package -n libopendkim%{sover_odkim} Summary: Library for performing DKIM signing and verification -License: BSD-3-Clause and Sendmail +License: BSD-3-Clause AND Sendmail Group: System/Libraries %description -n libopendkim%{sover_odkim} @@ -152,7 +157,7 @@ %package -n libvbr%{sover_vbr} Summary: Library for assisting in Vouch By Refence functions -License: BSD-3-Clause and Sendmail +License: BSD-3-Clause AND Sendmail Group: System/Libraries %description -n libvbr%{sover_vbr} @@ -170,7 +175,7 @@ %package devel Summary: Development files to develop with opendkim -License: BSD-3-Clause and Sendmail +License: BSD-3-Clause AND Sendmail Group: Development/Libraries/C and C++ Requires: %{name} = %{ver_odkim} Requires: libopendkim%{sover_odkim} = %{ver_odkim} @@ -197,6 +202,7 @@ %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build %configure \ @@ -239,6 +245,7 @@ --with-openldap \ --with-sasl \ --with-erlang \ + --with-unbound \ --with-domain="example.com" make %{?_smp_mflags} @@ -248,11 +255,11 @@ find %{buildroot} -type f -name "*.la" -delete -print # install the init script %if %{with systemd} -install -D -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/%{name}.service -install -D -m 0644 %{SOURCE2} %{buildroot}%{_prefix}/lib/tmpfiles.d/%{name}.conf +install -D -m 0644 %{SOURCE3} %{buildroot}%{_unitdir}/%{name}.service +install -D -m 0644 %{SOURCE4} %{buildroot}%{_libexecdir}/tmpfiles.d/%{name}.conf ln -s -f %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name} %else -install -D -m 0755 %{SOURCE3} %{buildroot}%{_sysconfdir}/%{name}/init.d/%{name} +install -D -m 0755 %{SOURCE5} %{buildroot}%{_sysconfdir}/%{name}/init.d/%{name} ln -s -f %{_sysconfdir}/%{name}/init.d/%{name} %{buildroot}%{_sbindir}/rc%{name} %endif mkdir -p %{buildroot}%{_localstatedir}/lib/%{name} @@ -271,9 +278,9 @@ %pre getent group %{name} >/dev/null || \ - /usr/sbin/groupadd -r %{name} + %{_sbindir}/groupadd -r %{name} getent passwd %{name} >/dev/null || \ - /usr/sbin/useradd -r -g %{name} -d %{_localstatedir}/lib/%{name} -s /sbin/nologin -c "User for opendkim" %{name} + %{_sbindir}/useradd -r -g %{name} -d %{_localstatedir}/lib/%{name} -s /sbin/nologin -c "User for opendkim" %{name} %if %{with systemd} %service_add_pre %{name}.service %endif @@ -287,7 +294,7 @@ %post %if %{with systemd} -systemd-tmpfiles --create %{_prefix}/lib/tmpfiles.d/%{name}.conf || true +systemd-tmpfiles --create %{_libexecdir}/tmpfiles.d/%{name}.conf || true %service_add_post %{name}.service %endif @@ -313,64 +320,46 @@ %postun -n libreprrd%{sover_rrd} -p /sbin/ldconfig %files -n autobuild -%defattr(-,root,root) -%if 0%{?sle_version} <= 120100 -# leap 42.1 fix -%doc LICENSE -%else %license LICENSE -%endif %doc %{_docdir}/autobuild %{_bindir}/autobuild -%{_mandir}/man8/autobuild.8%{ext_man} +%{_mandir}/man8/autobuild.8%{?ext_man} %files -n miltertest -%defattr(-,root,root) -%if 0%{?sle_version} <= 120100 -%doc LICENSE -%else %license LICENSE -%endif %{_bindir}/miltertest -%{_mandir}/man8/miltertest.8* +%{_mandir}/man8/miltertest.8%{?ext_man} %files -n libopendkim%{sover_odkim} -%defattr(-,root,root) %{_libdir}/libopendkim.so.* %files -n librbl%{sover_rbl} -%defattr(-,root,root) %{_libdir}/librbl.so.* %files -n librepute%{sover_repute} -%defattr(-,root,root) %{_libdir}/librepute.so.* %files -n libut%{sover_ut} -%defattr(-,root,root) %dir %{_libdir}/%{name}-%{ver_odkim} %{_libdir}/%{name}-%{ver_odkim}/libut.so.* %config %{_sysconfdir}/ld.so.conf.d/%{name}-%{ver_odkim}.conf %files -n libvbr%{sover_vbr} -%defattr(-,root,root) %{_libdir}/libvbr.so.* %if %{with opendkim_rrd} %files -n libreprrd%{sover_rrd} -%defattr(-,root,root) %{_libdir}/libreprrd.so.* %endif %files -%defattr(-,root,root) %doc %{_docdir}/%{name} # %config(noreplace) %attr(-,root,%{name}) %{_sysconfdir}/%{name} %{_sbindir}/rc%{name} %if %{with systemd} %{_unitdir}/%{name}.service -%{_prefix}/lib/tmpfiles.d/%{name}.conf +%{_libexecdir}/tmpfiles.d/%{name}.conf %ghost /run/opendkim %else %{_sysconfdir}/%{name}/init.d/%{name} @@ -391,28 +380,27 @@ %{_sbindir}/opendkim-stats %{_sbindir}/opendkim-testkey %{_sbindir}/opendkim-testmsg -%{_mandir}/man3/opendkim-lua.3* -%{_mandir}/man5/opendkim.conf.5* -%{_mandir}/man8/opendkim-atpszone.8* -%{_mandir}/man8/opendkim-expire.8* -%{_mandir}/man8/opendkim-gengraphs.8* -%{_mandir}/man8/opendkim-genkey.8* -%{_mandir}/man8/opendkim-genrates.8* -%{_mandir}/man8/opendkim-genstats.8* -%{_mandir}/man8/opendkim-genzone.8* -%{_mandir}/man8/opendkim-modtotals.8* -%{_mandir}/man8/opendkim-rephistory.8* -%{_mandir}/man8/opendkim-stats.8* -%{_mandir}/man8/opendkim-testkey.8* -%{_mandir}/man8/opendkim-testmsg.8* -%{_mandir}/man8/opendkim.8* +%{_mandir}/man3/opendkim-lua.3%{?ext_man} +%{_mandir}/man5/opendkim.conf.5%{?ext_man} +%{_mandir}/man8/opendkim-atpszone.8%{?ext_man} +%{_mandir}/man8/opendkim-expire.8%{?ext_man} +%{_mandir}/man8/opendkim-gengraphs.8%{?ext_man} +%{_mandir}/man8/opendkim-genkey.8%{?ext_man} +%{_mandir}/man8/opendkim-genrates.8%{?ext_man} +%{_mandir}/man8/opendkim-genstats.8%{?ext_man} +%{_mandir}/man8/opendkim-genzone.8%{?ext_man} +%{_mandir}/man8/opendkim-modtotals.8%{?ext_man} +%{_mandir}/man8/opendkim-rephistory.8%{?ext_man} +%{_mandir}/man8/opendkim-stats.8%{?ext_man} +%{_mandir}/man8/opendkim-testkey.8%{?ext_man} +%{_mandir}/man8/opendkim-testmsg.8%{?ext_man} +%{_mandir}/man8/opendkim.8%{?ext_man} %if %{with opendkim_rrd} %{_bindir}/opendkim-reprrdimport -%{_mandir}/man8/opendkim-reprrdimport.8* +%{_mandir}/man8/opendkim-reprrdimport.8%{?ext_man} %endif %files devel -%defattr(-,root,root) %{_includedir}/opendkim/ %{_libdir}/libopendkim.so %{_libdir}/librbl.so @@ -427,8 +415,8 @@ %{_libdir}/pkgconfig/repute.pc %{_libdir}/pkgconfig/ut.pc %{_libdir}/pkgconfig/vbr.pc -%{_mandir}/man3/rbl.3* -%{_mandir}/man3/ut.3* -%{_mandir}/man3/vbr.3* +%{_mandir}/man3/rbl.3%{?ext_man} +%{_mandir}/man3/ut.3%{?ext_man} +%{_mandir}/man3/vbr.3%{?ext_man} %changelog ++++++ opendkim-2.9.2_default_config.patch ++++++ --- /var/tmp/diff_new_pack.0aE87p/_old 2018-07-06 10:49:02.726750691 +0200 +++ /var/tmp/diff_new_pack.0aE87p/_new 2018-07-06 10:49:02.726750691 +0200 @@ -57,6 +57,15 @@ ## SoftwareHeader { yes | no } ## default "no" +@@ -741,7 +742,7 @@ + ## DNS queries and applying the DNSSEC protocol. See the Unbound documentation + ## at http://unbound.net for the expected format of this file. + +-# TrustAnchorFile /var/named/trustanchor ++TrustAnchorFile /var/lib/unbound/root.key + + ## UMask mask + ## default (none) @@ -760,4 +761,4 @@ Syslog Yes ## Change to user "userid" before starting normal operation? May include ## a group ID as well, separated from the userid by a colon. ++++++ opendkim.ticket35+37.patch ++++++ diff -Naur -x opendkim-2.11.0.orig/configure opendkim-2.11.0/configure --- opendkim-2.11.0.orig/configure 2015-10-07 16:17:48.000000000 -0700 +++ opendkim-2.11.0/configure 2016-12-20 18:47:51.662158143 -0800 @@ -14700,13 +14700,13 @@ for d in $strldirs do - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for strl.h in $d/strl" >&5 -$as_echo_n "checking for strl.h in $d/strl... " >&6; } - if test -f $d/strl/strl.h + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for strl.h in $d" >&5 +$as_echo_n "checking for strl.h in $d... " >&6; } + if test -f $d/strl.h then unset ac_cv_header_strl_h saved_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS -I$d/strl" + CPPFLAGS="$CPPFLAGS -I$d" for ac_header in strl.h do : ac_fn_c_check_header_mongrel "$LINENO" "strl.h" "ac_cv_header_strl_h" "$ac_includes_default" @@ -14724,7 +14724,7 @@ if test x"$strl_h_found" = x"yes" then - CPPFLAGS="$CPPFLAGS -I$d/strl" + CPPFLAGS="$CPPFLAGS -I$d" break fi done @@ -16795,77 +16795,39 @@ fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing SSL_library_init" >&5 -$as_echo_n "checking for library containing SSL_library_init... " >&6; } -if ${ac_cv_search_SSL_library_init+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_func_search_save_LIBS=$LIBS -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char SSL_library_init (); + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <openssl/ssl.h> int main () { -return SSL_library_init (); +SSL_library_init(); ; return 0; } _ACEOF -for ac_lib in '' ssl; do - if test -z "$ac_lib"; then - ac_res="none required" - else - ac_res=-l$ac_lib - LIBS="-l$ac_lib $ac_func_search_save_LIBS" - fi - if ac_fn_c_try_link "$LINENO"; then : - ac_cv_search_SSL_library_init=$ac_res -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext - if ${ac_cv_search_SSL_library_init+:} false; then : - break -fi -done -if ${ac_cv_search_SSL_library_init+:} false; then : - +if ac_fn_c_try_link "$LINENO"; then : + od_have_ossl="yes"; else - ac_cv_search_SSL_library_init=no + od_have_ossl="no"; fi -rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_SSL_library_init" >&5 -$as_echo "$ac_cv_search_SSL_library_init" >&6; } -ac_res=$ac_cv_search_SSL_library_init -if test "$ac_res" != no; then : - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - -else - - if test x"$enable_shared" = x"yes" - then - as_fn_error $? "Cannot build shared opendkim - against static openssl libraries. - Configure with --disable-shared - to get this working or obtain a - shared libssl library for - opendkim to use." "$LINENO" 5 - fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + if test x"$od_have_ossl" = x"no" + then + if test x"$enable_shared" = x"yes" + then + as_fn_error $? "Cannot build shared opendkim + against static openssl libraries. + Configure with --disable-shared + to get this working or obtain a + shared libssl library for + opendkim to use." "$LINENO" 5 + fi - # avoid caching issue - last result of SSL_library_init - # shouldn't be cached for this next check - unset ac_cv_search_SSL_library_init - LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing SSL_library_init" >&5 + LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing SSL_library_init" >&5 $as_echo_n "checking for library containing SSL_library_init... " >&6; } if ${ac_cv_search_SSL_library_init+:} false; then : $as_echo_n "(cached) " >&6 @@ -16923,10 +16885,7 @@ as_fn_error $? "libssl not found" "$LINENO" 5 fi - - -fi - + fi ac_fn_c_check_decl "$LINENO" "SHA256_DIGEST_LENGTH" "ac_cv_have_decl_SHA256_DIGEST_LENGTH" " #include <sys/types.h> diff -Naur -x opendkim-2.11.0.orig/opendkim/opendkim-crypto.c opendkim-2.11.0/opendkim/opendkim-crypto.c --- opendkim-2.11.0.orig/opendkim/opendkim-crypto.c 2013-02-25 13:02:41.000000000 -0800 +++ opendkim-2.11.0/opendkim/opendkim-crypto.c 2016-12-20 18:47:03.477027225 -0800 @@ -222,7 +222,11 @@ { assert(pthread_setspecific(id_key, ptr) == 0); +#if OPENSSL_VERSION_NUMBER >= 0x10100000 + OPENSSL_thread_stop(); +#else ERR_remove_state(0); +#endif free(ptr); @@ -392,11 +396,15 @@ { if (crypto_init_done) { +#if OPENSSL_VERSION_NUMBER >= 0x10100000 + OPENSSL_thread_stop(); +#else CRYPTO_cleanup_all_ex_data(); CONF_modules_free(); EVP_cleanup(); ERR_free_strings(); ERR_remove_state(0); +#endif if (nmutexes > 0) {
