From d3d07a6910fddfcdd4b0e435d82dae4ff2193b6c Mon Sep 17 00:00:00 2001 From: Robert-André Mauchin Date: Sep 11 2019 22:25:12 +0000 Subject: Release 2.0.27 (#1716575) Signed-off-by: Robert-André Mauchin --- diff --git a/.gitignore b/.gitignore index eb650cf..39d0c59 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /dnscrypt-proxy-2.0.20.tar.gz /dnscrypt-proxy-2.0.22.tar.gz /dnscrypt-proxy-2.0.23.tar.gz +/dnscrypt-proxy-2.0.27.tar.gz diff --git a/dnscrypt-proxy.spec b/dnscrypt-proxy.spec index c12df1b..9c4c380 100644 --- a/dnscrypt-proxy.spec +++ b/dnscrypt-proxy.spec @@ -1,5 +1,12 @@ +# Generated by go2rpm 1 +%bcond_without check + +# https://github.com/jedisct1/dnscrypt-proxy %global goipath github.com/jedisct1/dnscrypt-proxy -Version: 2.0.23 +Version: 2.0.27 +%global tag 2.0.27 + +%gometa %global common_description %{expand: A flexible DNS proxy, with support for modern encrypted DNS protocols such as @@ -27,14 +34,13 @@ Features: - Automatic background updates of resolvers lists - Can force outgoing connections to use TCP; useful with tunnels such as Tor.} -%gometa - Name: dnscrypt-proxy -Release: 2%{?dist} -Summary: A flexible DNS proxy, with support for encrypted DNS protocols +Release: 1%{?dist} +Summary: Flexible DNS proxy, with support for encrypted DNS protocols + License: ISC URL: %{gourl} -Source0: %{gourl}/archive/%{version}/%{name}-%{version}.tar.gz +Source0: %{gosource} Source1: dnscrypt-proxy.service Source2: dnscrypt-proxy.socket @@ -43,29 +49,30 @@ Source2: dnscrypt-proxy.socket Patch0: dnscrypt-proxy-2.0.14-custom_config.patch BuildRequires: systemd -BuildRequires: golang(github.com/BurntSushi/toml) -BuildRequires: golang(github.com/coreos/go-systemd/activation) -BuildRequires: golang(github.com/coreos/go-systemd/daemon) -BuildRequires: golang(github.com/dchest/safefile) -BuildRequires: golang(github.com/facebookgo/pidfile) -BuildRequires: golang(github.com/hashicorp/go-immutable-radix) -BuildRequires: golang(github.com/hashicorp/golang-lru) -BuildRequires: golang(github.com/jedisct1/dlog) -BuildRequires: golang(github.com/jedisct1/go-clocksmith) -BuildRequires: golang(github.com/jedisct1/go-dnsstamps) -BuildRequires: golang(github.com/jedisct1/go-minisign) -BuildRequires: golang(github.com/jedisct1/xsecretbox) -BuildRequires: golang(github.com/kardianos/service) -BuildRequires: golang(github.com/k-sone/critbitgo) -BuildRequires: golang(github.com/miekg/dns) -BuildRequires: golang(github.com/VividCortex/ewma) -BuildRequires: golang(golang.org/x/crypto/curve25519) -BuildRequires: golang(golang.org/x/crypto/ed25519) -BuildRequires: golang(golang.org/x/crypto/nacl/box) -BuildRequires: golang(golang.org/x/crypto/nacl/secretbox) -BuildRequires: golang(golang.org/x/net/http2) -BuildRequires: golang(golang.org/x/net/proxy) -BuildRequires: golang(gopkg.in/natefinch/lumberjack.v2) +BuildRequires: golang(github.com/BurntSushi/toml) +BuildRequires: golang(github.com/coreos/go-systemd/activation) +BuildRequires: golang(github.com/coreos/go-systemd/daemon) +BuildRequires: golang(github.com/dchest/safefile) +BuildRequires: golang(github.com/facebookgo/pidfile) +BuildRequires: golang(github.com/hashicorp/go-immutable-radix) +BuildRequires: golang(github.com/hashicorp/golang-lru) +BuildRequires: golang(github.com/jedisct1/dlog) +BuildRequires: golang(github.com/jedisct1/go-clocksmith) +BuildRequires: golang(github.com/jedisct1/go-dnsstamps) +BuildRequires: golang(github.com/jedisct1/go-minisign) +BuildRequires: golang(github.com/jedisct1/xsecretbox) +BuildRequires: golang(github.com/k-sone/critbitgo) +BuildRequires: golang(github.com/kardianos/service) +BuildRequires: golang(github.com/miekg/dns) +BuildRequires: golang(github.com/VividCortex/ewma) +BuildRequires: golang(golang.org/x/crypto/curve25519) +BuildRequires: golang(golang.org/x/crypto/ed25519) +BuildRequires: golang(golang.org/x/crypto/nacl/box) +BuildRequires: golang(golang.org/x/crypto/nacl/secretbox) +BuildRequires: golang(golang.org/x/net/http2) +BuildRequires: golang(golang.org/x/net/proxy) +BuildRequires: golang(golang.org/x/sys/unix) +BuildRequires: golang(gopkg.in/natefinch/lumberjack.v2) # For SELinux workaround BuildRequires: selinux-policy-devel @@ -78,20 +85,17 @@ Requires(postun): policycoreutils %description %{common_description} - %prep -%forgeautosetup -p1 - -rm -rf vendor - +%goprep %build -%gobuildroot -%gobuild -o _bin/%{name} %{goipath}/%{name} - +for cmd in dnscrypt-proxy; do + %gobuild -o %{gobuilddir}/bin/$(basename $cmd) %{goipath}/$cmd +done %install -install -Dpm 0755 _bin/%{name} %{buildroot}%{_bindir}/%{name} +install -m 0755 -vd %{buildroot}%{_bindir} +install -m 0755 -vp %{gobuilddir}/bin/* %{buildroot}%{_bindir}/ install -Dpm 0644 dnscrypt-proxy/example-dnscrypt-proxy.toml %{buildroot}%{_sysconfdir}/%{name}/dnscrypt-proxy.toml install -Dpm 0644 dnscrypt-proxy/example-blacklist.txt %{buildroot}%{_sysconfdir}/%{name}/blacklist.txt install -Dpm 0644 dnscrypt-proxy/example-cloaking-rules.txt %{buildroot}%{_sysconfdir}/%{name}/cloaking-rules.txt @@ -100,7 +104,6 @@ install -Dpm 0644 dnscrypt-proxy/example-whitelist.txt %{buildroot}%{_sysconfdir install -Dpm 0644 %{S:1} %{buildroot}%{_unitdir}/%{name}.service install -Dpm 0644 %{S:2} %{buildroot}%{_unitdir}/%{name}.socket - # Temporary SELinux workaround # https://github.com/fedora-selinux/selinux-policy/issues/231 mkdir selinux @@ -124,28 +127,24 @@ EOF make -f %{_datadir}/selinux/devel/Makefile install -p -m 644 -D my-ptproxy.pp %{buildroot}%{_datadir}/selinux/packages/%{name}/my-ptproxy.pp - %post %systemd_post %{name}.service if [ "$1" -le "1" ] ; then # First install semodule -i %{_datadir}/selinux/packages/%{name}/my-ptproxy.pp 2>/dev/null || : fi - %preun %systemd_preun %{name}.service if [ "$1" -lt "1" ] ; then # Final removal semodule -r my-ptproxy 2>/dev/null || : fi - %postun %systemd_postun %{name}.service if [ "$1" -ge "1" ] ; then # Upgrade semodule -i %{_datadir}/selinux/packages/%{name}/my-ptproxy.pp 2>/dev/null || : fi - %files %license LICENSE %doc README.md ChangeLog @@ -159,8 +158,10 @@ fi %{_datadir}/selinux/packages/%{name}/my-ptproxy.pp %{_unitdir}/%{name}.* - %changelog +* Thu Sep 12 00:14:59 CEST 2019 Robert-André Mauchin - 2.0.27-1 +- Release 2.0.27 (#1716575) + * Wed Jul 24 2019 Fedora Release Engineering - 2.0.23-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index cc96678..6d78883 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dnscrypt-proxy-2.0.23.tar.gz) = d4eeaf20a397c8aed08a7a91a720637bb49395488eb1f7ab4a52ca8832d3e0b98fb320b86ca30ad19e1e3504e226379e5d325891a68624532493fc4796959462 +SHA512 (dnscrypt-proxy-2.0.27.tar.gz) = 68cecec0228b3f03d5c50576c7dec32c7474a22bd1740d43b29514b5a00f27376ed5236302fa68c493f0c188134855b277fbbbb922222937fa726783af3f7246