pool/dnscrypt-proxy
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 860360 from home:cunix:server_dns

Browse Source 
- Minimum golang version now at 1.15
- Include 'notice' and 'patents' files of vendored packages.
- Paths and hints in configuration file adjusted and added.

OBS-URL: https://build.opensuse.org/request/show/860360
OBS-URL: https://build.opensuse.org/package/show/server:dns/dnscrypt-proxy?expand=0&rev=31
This commit is contained in:
c unix 2021-01-05 22:23:51 +00:00 committed by Git OBS Bridge
parent 1fd8aa9304
commit a16d993949
5 changed files with 38 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.openSUSE
View File

@ -1,6 +1,6 @@
***************************************************************************
* *
* README.openSUSE last edited for version 2.0.44 *
* README.openSUSE last edited by cunix for version 2.0.44 *
* *
***************************************************************************

9
dnscrypt-proxy.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Mon Jan 4 20:00:00 UTC 2021 - cunix@mail.de
- Minimum golang version now at 1.15
- Include 'notice' and 'patents' files of vendored packages.
- Paths and hints in configuration file adjusted and added.
-------------------------------------------------------------------
Mon Jan 4 11:45:57 UTC 2021 - Ismail Dönmez <idonmez@suse.com>

22
dnscrypt-proxy.spec
View File

@ -48,7 +48,7 @@ BuildRequires: golang-packaging
BuildRequires: pkgconfig
BuildRequires: shadow
BuildRequires: systemd-rpm-macros
BuildRequires: golang(API) >= 1.14
BuildRequires: golang(API) >= 1.15
BuildRequires: pkgconfig(libsystemd)
# For systemd pidfile solution.
Requires: bash
@ -107,12 +107,13 @@ cp -a utils/generate-domains-blocklist/ %{buildroot}%{_datadir}/%{name}/
# Config files
install -D -m 0640 ./%{name}.toml %{buildroot}/%{config_dir}/%{name}.toml
install -D -m 0640 ./%{name}.toml.default %{buildroot}/%{config_dir}/%{name}.toml.default
install -D -m 0640 ./%{name}/example-blocked-names.txt %{buildroot}/%{config_dir}/blocked-names.txt
install -D -m 0640 ./%{name}/example-allowed-ips.txt %{buildroot}/%{config_dir}/allowed-ips.txt
install -D -m 0640 ./%{name}/example-allowed-names.txt %{buildroot}/%{config_dir}/allowed-names.txt
install -D -m 0640 ./%{name}/example-blocked-ips.txt %{buildroot}/%{config_dir}/blocked-ips.txt
install -D -m 0640 ./%{name}/example-blocked-names.txt %{buildroot}/%{config_dir}/blocked-names.txt
install -D -m 0640 ./%{name}/example-captive-portals.txt %{buildroot}/%{config_dir}/captive-portals.txt
install -D -m 0640 ./%{name}/example-cloaking-rules.txt %{buildroot}/%{config_dir}/cloaking-rules.txt
install -D -m 0640 ./%{name}/example-forwarding-rules.txt %{buildroot}/%{config_dir}/forwarding-rules.txt
install -D -m 0640 ./%{name}/example-allowed-names.txt %{buildroot}/%{config_dir}/allowed-names.txt
install -D -m 0640 ./%{name}/example-allowed-ips.txt %{buildroot}/%{config_dir}/allowed-ips.txt
# Systemd
install -D -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/%{name}.service
@ -149,16 +150,17 @@ getent passwd %{user_group} >/dev/null || %{_sbindir}/useradd -r -g %{user_group
%service_del_postun %{services}
%files
%doc ChangeLog README.md README.openSUSE %{name}.socket.conf
%doc dnscrypt-proxy/example-*
%doc ChangeLog README.md README.openSUSE %{name}.socket.conf %{name}.toml.default
%doc %{name}/example-*
%config(noreplace) %attr(-,root,%{user_group}) %{config_dir}/%{name}.toml
%config(noreplace) %attr(-,root,%{user_group}) %{config_dir}/blocked-names.txt
%config %attr(-,root,%{user_group}) %{config_dir}/%{name}.toml.default
%config(noreplace) %attr(-,root,%{user_group}) %{config_dir}/allowed-ips.txt
%config(noreplace) %attr(-,root,%{user_group}) %{config_dir}/allowed-names.txt
%config(noreplace) %attr(-,root,%{user_group}) %{config_dir}/blocked-ips.txt
%config(noreplace) %attr(-,root,%{user_group}) %{config_dir}/blocked-names.txt
%config(noreplace) %attr(-,root,%{user_group}) %{config_dir}/captive-portals.txt
%config(noreplace) %attr(-,root,%{user_group}) %{config_dir}/cloaking-rules.txt
%config(noreplace) %attr(-,root,%{user_group}) %{config_dir}/forwarding-rules.txt
%config(noreplace) %attr(-,root,%{user_group}) %{config_dir}/allowed-names.txt
%config(noreplace) %attr(-,root,%{user_group}) %{config_dir}/allowed-ips.txt
%config %attr(-,root,%{user_group}) %{config_dir}/%{name}.toml.default
%{_sbindir}/%{name}
%{_sbindir}/rc%{name}
%{_unitdir}/%{name}.service

18
example-dnscrypt-proxy.toml.sed
View File

@ -9,17 +9,23 @@ s/listen_addresses = \['127.0.0.1:53']/#listen_addresses = ['127.0.0.1:53']\nlis
s/# log_file = 'dnscrypt-proxy.log'/# log_file = '\/var\/log\/dnscrypt-proxy\/dnscrypt-proxy.log'/
s/# forwarding_rules = 'forwarding-rules.txt'/# forwarding_rules = '\/etc\/dnscrypt-proxy\/forwarding-rules.txt'/
s/# cloaking_rules = 'cloaking-rules.txt'/# cloaking_rules = '\/etc\/dnscrypt-proxy\/cloaking-rules.txt'/
s/# cert_file = "localhost.pem"/# cert_file = '\/etc\/dnscrypt-proxy\/localhost.pem'/
s/# cert_key_file = "localhost.pem"/# cert_key_file = '\/etc\/dnscrypt-proxy\/localhost.pem'/
s/# map_file = 'example-captive-portals.txt'/# map_file = '\/etc\/dnscrypt-proxy\/captive-portals.txt'/
s/# cert_file = 'localhost.pem'/# cert_file = '\/etc\/dnscrypt-proxy\/localhost.pem'/
s/# cert_key_file = 'localhost.pem'/# cert_key_file = '\/etc\/dnscrypt-proxy\/localhost.pem'/
s/ # file = 'query.log'/ # file = '\/var\/log\/dnscrypt-proxy\/query.log'/
s/ # file = 'nx.log'/ # file = '\/var\/log\/dnscrypt-proxy\/nx.log'/
s/ # blocked_names_file = 'blocked-names.txt'/# blacklist_file = '\/etc\/dnscrypt-proxy\/blocked-names.txt'/
s/ # blocked_names_file = 'blocked-names.txt'/ # blocked_names_file = '\/etc\/dnscrypt-proxy\/blocked-names.txt'/
s/ # log_file = 'blocked-names.log'/ # log_file = '\/var\/log\/dnscrypt-proxy\/blocked-names.log'/
s/ # blocked_ips_file = 'blocked-ips.txt'/ # blacklist_file = '\/etc\/dnscrypt-proxy\/blocked-ips.txt'/
s/ # blocked_ips_file = 'blocked-ips.txt'/ # blocked_ips_file = '\/etc\/dnscrypt-proxy\/blocked-ips.txt'/
s/ # log_file = 'blocked-ips.log'/ # log_file = '\/var\/log\/dnscrypt-proxy\/blocked-ips.log'/
s/ # allowed_names_file = 'allowed-names.txt'/# blacklist_file = '\/etc\/dnscrypt-proxy\/allowed-names.txt'/
s/ # allowed_names_file = 'allowed-names.txt'/ # allowed_names_file = '\/etc\/dnscrypt-proxy\/allowed-names.txt'/
s/ # log_file = 'allowed-names.log'/ # log_file = '\/var\/log\/dnscrypt-proxy\/allowed-names.log'/
s/ # allowed_ips_file = 'allowed-ips.txt'/ # allowed_ips_file = '\/etc\/dnscrypt-proxy\/allowed-ips.txt'/
s/ # log_file = 'allowed-ips.log'/ # log_file = '\/var\/log\/dnscrypt-proxy\/allowed-ips.log'/
s/ cache_file = 'public-resolvers.md'/ cache_file = '\/var\/lib\/dnscrypt-proxy\/public-resolvers.md'/
s/ cache_file = 'relays.md'/ cache_file = '\/var\/lib\/dnscrypt-proxy\/relays.md'/
s/ # cache_file = "quad9-resolvers.md"/ # cache_file = '\/var\/lib\/dnscrypt-proxy\/quad9-resolvers.md'/
s/ # cache_file = 'quad9-resolvers.md'/ # cache_file = '\/var\/lib\/dnscrypt-proxy\/quad9-resolvers.md'/
s/ # cache_file = 'parental-control.md'/ # cache_file = '\/var\/lib\/dnscrypt-proxy\/parental-control.md'/
# package directory instead of source code directory
s/## `utils\/generate-domains-blocklists` directory of the dnscrypt-proxy source code./## '\/usr\/share\/dnscrypt-proxy\/generate-domains-blocklists' directory./

4
find_licenses.sh
View File

@ -1,6 +1,8 @@
#!/bin/bash
# written by cunix in 2019
# corrected by Bernhard Wiedemann in 2020 (pipe through sort)
# updated by cunix in 2021
#
# Tries to find and prepare licenses from vendored packages for
# installation as file or link to existing file.
@ -35,6 +37,8 @@ if [[ -z "$vendor_licenses_dir" ]]
rm $licenses_file
find ./*/ -iname "license*" | sort > $licenses_file
find ./*/ -iname "copying*" | sort >> $licenses_file
find ./*/ -iname "notice*" | sort >> $licenses_file
find ./*/ -iname "patents*" | sort >> $licenses_file
goahead=1
else
echo "$vendor_licenses_dir" is not a directory.