From dc3a05cb3e37d2e161e2f0e187a41df8c5d2128760cfc8bb45ff32eabc96abc8 Mon Sep 17 00:00:00 2001 From: Marguerite Su Date: Sat, 5 Aug 2017 13:09:15 +0000 Subject: [PATCH] Accepting request 514573 from home:sebix:branches:server:dns - upgrade to 1.9.5: - specfile fixes, cleanup also fixes rpmlint warnings and errors fixes build on TW shortened changelog OBS-URL: https://build.opensuse.org/request/show/514573 OBS-URL: https://build.opensuse.org/package/show/server:dns/dnscrypt-proxy?expand=0&rev=13 --- dnscrypt-proxy-1.9.4.tar.bz2 | 3 --- dnscrypt-proxy-1.9.5.tar.bz2 | 3 +++ dnscrypt-proxy.changes | 43 +++++++++++++++++++++++++++++++ dnscrypt-proxy.spec | 50 +++++++++++++++++++++++------------- dnscrypt-proxy.tmpfile | 2 +- 5 files changed, 79 insertions(+), 22 deletions(-) delete mode 100644 dnscrypt-proxy-1.9.4.tar.bz2 create mode 100644 dnscrypt-proxy-1.9.5.tar.bz2 diff --git a/dnscrypt-proxy-1.9.4.tar.bz2 b/dnscrypt-proxy-1.9.4.tar.bz2 deleted file mode 100644 index d40726b..0000000 --- a/dnscrypt-proxy-1.9.4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fdf4a708e7922e13b14555f315ca8d5361aec89b0595b06fdbbcaacfa4e6f11e -size 1286263 diff --git a/dnscrypt-proxy-1.9.5.tar.bz2 b/dnscrypt-proxy-1.9.5.tar.bz2 new file mode 100644 index 0000000..cb56aec --- /dev/null +++ b/dnscrypt-proxy-1.9.5.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e89f5b9039979ab392302faf369ef7593155d5ea21580402a75bbc46329d1bb6 +size 1290573 diff --git a/dnscrypt-proxy.changes b/dnscrypt-proxy.changes index 0044a2e..202bb01 100644 --- a/dnscrypt-proxy.changes +++ b/dnscrypt-proxy.changes @@ -1,3 +1,46 @@ +------------------------------------------------------------------- +Sun Jul 9 19:35:45 UTC 2017 - sebix+novell.com@sebix.at + +- upgrade to 1.9.5, shortened upstream changelog: + * Cache plugin: fix the way items are moved from recent to frequent lists + * In addition to making the cache work as expected, this prevents + `CacheEntry` items from becoming orphans. + * Cache plugin: fix the way items are moved from recent to frequent lists + * In addition to making the cache work as expected, this prevents + `CacheEntry` items from becoming orphans. + * Adding Babylon Network resolvers (#647) + * Update resolvers list + * Reset the reachability of nameservers if all are unreachable (#609) + * If all nameservers have been marked unreachable, they will not be queried + * again until dnscrypt-proxy is restarted. This fix allows for queries to be + * retried without restarting dnscrypt-proxy. + * Doc error: client-pk is the client' public key. Spotted by @willnix Fixes #603 + * Whitelist some TLDs typically used on local networks + * Normalize the dnscrypt-resolvers.csv format + * ldns-blocking: fix another corner case with suffix matching + + Ruleset: + ``` + *.example.com + ru.example.com + ``` + + A query for `xru.example.com` would find `ru.example.com` as the longest + suffix. The expression didn't match since this is neither an exact match + nor a match that stops at a label. + + However, this was ignoring the fact that there a different, shorter rule + could match. + + This is pretty annoying, as keeping our promise to log the longest match + means that we need at least yet another lookup in that specific case. + Alternatively, the fpst lookup function could be specialized to stop at + labels, but that would defeat the point of this example plugin. So, + perform an extra lookup after striping the first (last, once the name is + reversed) label. + * Added pidfile +- specfile fixes, cleanup + ------------------------------------------------------------------- Sun Jan 29 08:58:58 UTC 2017 - i@marguerite.su diff --git a/dnscrypt-proxy.spec b/dnscrypt-proxy.spec index 4acca81..8d8ae4e 100644 --- a/dnscrypt-proxy.spec +++ b/dnscrypt-proxy.spec @@ -1,7 +1,7 @@ # # spec file for package dnscrypt-proxy # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 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 @@ -15,14 +15,14 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %if %{undefined tmpfiles_create} %define tmpfiles_create() \ -/usr/bin/systemd-tmpfiles --create %{?*} || : \ +%{_bindir}/systemd-tmpfiles --create %{?*} || : \ %{nil} %endif - Name: dnscrypt-proxy -Version: 1.9.4 +Version: 1.9.5 Release: 0 Summary: A tool for securing communications between a client and a DNS resolver License: BSD-3-Clause @@ -30,24 +30,25 @@ Group: Productivity/Networking/DNS/Utilities #Git-Url: https://github.com/jedisct1/dnscrypt-proxy Url: https://dnscrypt.org Source: https://download.dnscrypt.org/dnscrypt-proxy/%{name}-%{version}.tar.bz2 -Source1: %{name}@.service +Source1: %{name}@.service Source4: https://download.dnscrypt.org/dnscrypt-proxy/dnscrypt-resolvers.csv -Source5: %{name}.tmpfile -Patch: dnscrypt-proxy-default-config.patch +Source5: %{name}.tmpfile +Patch0: dnscrypt-proxy-default-config.patch BuildRequires: libsodium-devel BuildRequires: libtool -BuildRequires: pkg-config +BuildRequires: pkgconfig BuildRequires: shadow -Requires(pre): fillup coreutils grep diffutils +Requires(pre): coreutils +Requires(pre): diffutils +Requires(pre): fillup +Requires(pre): grep Provides: dnscrypt = %{version}-%{release} Obsoletes: dnscrypt < %{version}-%{release} -BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} >= 1210 BuildRequires: systemd-devel %{?systemd_requires} %endif - %description dnscrypt-proxy provides local service which can be used directly as your local resolver or as a DNS forwarder, encrypting and authenticating requests using the DNSCrypt protocol and passing them to an upstream server, @@ -60,18 +61,21 @@ While not providing end-to-end security, it protects the local network, which is of the chain, against man-in-the-middle attacks. It also provides some confidentiality to DNS queries. %package devel -Summary: Header files for developent of DNSCrypt plugins +Summary: Header files for development of DNSCrypt plugins Group: Development/Languages/C and C++ Requires: %{name} = %{version} %description devel -Header files for developent of DNSCrypt plugins. +Header files for development of DNSCrypt plugins. %prep %setup -q -%patch -p1 +%patch0 -p1 # Strip __DATE__ sed -i "s/__DATE__/\"%(date +%%F)\"/" src/proxy/options.c +# Don't install COPYING with make, we use our %%license marcro if possible +sed -i "/\tCOPYING / d" Makefile.am +sed -i "s/COPYING //" Makefile.in %build %configure \ @@ -92,7 +96,7 @@ install -d -m 755 %{buildroot}%{_libexecdir}/tmpfiles.d/ install -m 644 %{SOURCE5} %{buildroot}%{_libexecdir}/tmpfiles.d/%{name}.conf ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name} -find %{buildroot} -name "*.la" -delete -print +find %{buildroot} -type f -name "*.la" -delete -print mkdir -p %{buildroot}%{_sysconfdir}/%{name}.conf.d mv %{buildroot}%{_sysconfdir}/%{name}.conf %{buildroot}%{_sysconfdir}/%{name}.conf.d/default.conf @@ -106,6 +110,7 @@ if ! %{_bindir}/getent passwd dnscrypt >/dev/null; then fi %if 0%{?suse_version} >= 1210 %service_add_pre %{name}@.service +%endif %post %service_add_post %{name}@.service @@ -120,15 +125,23 @@ if [ $1 == 2 ] && [ -r %{_sysconfdir}/sysconfig/dnscrypt ] ; then fi %preun +%if 0%{?suse_version} >= 1210 %service_del_preun %{name}@.service +%endif %postun +%if 0%{?suse_version} >= 1210 %service_del_postun %{name}@.service %endif %files -%defattr(-,root,root) -%doc AUTHORS ChangeLog README COPYING NEWS DNSCRYPT-V2-PROTOCOL.txt THANKS +%doc AUTHORS ChangeLog README.markdown NEWS DNSCRYPT-V2-PROTOCOL.txt +%doc THANKS README-PLUGINS.markdown dnscrypt-proxy.conf +%if 0%{?leap_version} >= 420200 || 0%{?suse_version} > 1320 +%license COPYING +%else +%doc COPYING +%endif %dir %{_sysconfdir}/%{name}.conf.d %config %{_sysconfdir}/%{name}.conf.d/default.conf %{_bindir}/hostip @@ -145,9 +158,10 @@ fi %{_libdir}/%{name}/libdcplugin_example_logging.so %{_libdir}/%{name}/libdcplugin_example_cache.so %{_libexecdir}/tmpfiles.d/%{name}.conf +%ghost %dir %{_localstatedir}/log/%{name} +%ghost %dir /run/%{name} %files devel -%defattr(-,root,root) %dir %{_includedir}/dnscrypt/ %{_includedir}/dnscrypt/* diff --git a/dnscrypt-proxy.tmpfile b/dnscrypt-proxy.tmpfile index 7e3727e..857902e 100644 --- a/dnscrypt-proxy.tmpfile +++ b/dnscrypt-proxy.tmpfile @@ -1,2 +1,2 @@ -d /var/run/dnscrypt-proxy 0755 dnscrypt dnscrypt +d /run/dnscrypt-proxy 0755 dnscrypt dnscrypt d /var/log/dnscrypt-proxy 0755 dnscrypt dnscrypt