Accepting request 400863 from home:MargueriteSu:branches:server:dns
OBS-URL: https://build.opensuse.org/request/show/400863 OBS-URL: https://build.opensuse.org/package/show/server:dns/dnscrypt-proxy?expand=0&rev=8
This commit is contained in:
Marguerite Su
Git OBS Bridge
parent
05c7a7e95d
commit
828956a422
@ -1,3 +1,17 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Jun 9 09:59:26 UTC 2016 - i@marguerite.su
|
||||
|
||||
- fix boo#977946 & boo#957003
|
||||
* use %fillup_only macro right. can't skip "-n", or it'll use
|
||||
package name while sysconfig.dnscrypt-proxy doesn't exist.
|
||||
- use %fillup_prereq macro
|
||||
- move libraries out from -devel subpackage, it's just not right.
|
||||
- don't link dnscrypt-proxy.8.gz to dnscrypt.8.gz
|
||||
- don't link /sbin/service to /sbin/rcdnscrypt.
|
||||
* that method is used for backward compability w/ systemd service
|
||||
while /sbin/dnscrypt is a wrapper to the actual command, and
|
||||
dnscrypt is not a valid service name but dnscrypt-proxy.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Feb 12 00:00:00 CET 2016 - dsterba@suse.cz
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package dnscrypt-proxy
|
||||
#
|
||||
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2016 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
|
||||
@ -23,25 +23,25 @@ Summary: A tool for securing communications between a client and a DNS re
|
||||
License: BSD-3-Clause
|
||||
Group: Productivity/Networking/DNS/Utilities
|
||||
#Git-Url: https://github.com/jedisct1/dnscrypt-proxy
|
||||
Url: http://dnscrypt.org
|
||||
Source: http://download.dnscrypt.org/dnscrypt-proxy/%{name}-%{version}.tar.bz2
|
||||
Url: https://dnscrypt.org
|
||||
Source: https://download.dnscrypt.org/dnscrypt-proxy/%{name}-%{version}.tar.bz2
|
||||
Source1: %{name}.service
|
||||
Source2: dnscrypt
|
||||
Source3: sysconfig.dnscrypt
|
||||
Source4: dnscrypt-resolvers.csv
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: automake
|
||||
Source4: https://download.dnscrypt.org/dnscrypt-proxy/dnscrypt-resolvers.csv
|
||||
BuildRequires: libsodium-devel
|
||||
BuildRequires: libtool
|
||||
BuildRequires: shadow
|
||||
Requires(pre): fillup coreutils grep diffutils
|
||||
Provides: dnscrypt = %{version}-%{release}
|
||||
Obsoletes: dnscrypt < %{version}-%{release}
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
%if 0%{?suse_version} >= 1210
|
||||
BuildRequires: systemd
|
||||
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,
|
||||
@ -65,7 +65,11 @@ Header files for developent of DNSCrypt plugins.
|
||||
%setup -q
|
||||
|
||||
%build
|
||||
%configure --enable-plugins
|
||||
%configure \
|
||||
%if 0%{?suse_version} >= 1210
|
||||
--with-systemd \
|
||||
%endif
|
||||
--enable-plugins
|
||||
make %{?_smp_mflags}
|
||||
|
||||
%install
|
||||
@ -78,37 +82,36 @@ install -m 755 %{SOURCE2} %{buildroot}%{_sbindir}
|
||||
install -m 755 -d %{buildroot}%{_localstatedir}/adm/fillup-templates
|
||||
install -m 644 -D %{SOURCE3} %{buildroot}%{_localstatedir}/adm/fillup-templates
|
||||
install -m 644 %{SOURCE4} %{buildroot}/%{_datadir}/%{name}/dnscrypt-resolvers.csv
|
||||
ln -s %{_mandir}/man8/%{name}.8.gz %{buildroot}%{_mandir}/man8/dnscrypt.8.gz
|
||||
ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}
|
||||
ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcdnscrypt
|
||||
|
||||
%if 0%{?suse_version}
|
||||
find %{buildroot} -name "*.la" -delete -print
|
||||
|
||||
%pre
|
||||
if ! /usr/bin/getent group dnscrypt >/dev/null; then
|
||||
if ! %{_bindir}/getent group dnscrypt >/dev/null; then
|
||||
%{_sbindir}/groupadd -r dnscrypt 2>/dev/null || :
|
||||
fi
|
||||
if ! /usr/bin/getent passwd dnscrypt >/dev/null; then
|
||||
%{_sbindir}/useradd -c "DNSCrypt daemon" -d /var/lib/empty -g dnscrypt \
|
||||
if ! %{_bindir}/getent passwd dnscrypt >/dev/null; then
|
||||
%{_sbindir}/useradd -c "DNSCrypt daemon" -d %{_localstatedir}/lib/empty -g dnscrypt \
|
||||
-r -s /bin/false dnscrypt 2>/dev/null || :
|
||||
fi
|
||||
%if 0%{?suse_version} >= 1210
|
||||
%service_add_pre %{name}.service
|
||||
|
||||
%post
|
||||
%service_add_post %{name}.service
|
||||
%{fillup_only dnscrypt}
|
||||
%{fillup_only -n dnscrypt}
|
||||
|
||||
%preun
|
||||
%service_del_preun %{name}.service
|
||||
|
||||
%postun
|
||||
%service_del_postun %{name}.service
|
||||
|
||||
%else
|
||||
|
||||
# non-systemd
|
||||
|
||||
%post
|
||||
%{fillup_only dnscrypt}
|
||||
%{fillup_only -n dnscrypt}
|
||||
%endif
|
||||
|
||||
%files
|
||||
@ -118,21 +121,20 @@ fi
|
||||
%{_sbindir}/dnscrypt
|
||||
%{_sbindir}/%{name}
|
||||
%{_sbindir}/rc%{name}
|
||||
%{_sbindir}/rcdnscrypt
|
||||
%{_unitdir}/%{name}.service
|
||||
%{_mandir}/man8/hostip.8.gz
|
||||
%{_mandir}/man8/%{name}.8.gz
|
||||
%{_mandir}/man8/dnscrypt.8.gz
|
||||
%{_mandir}/man8/hostip.8%{ext_man}
|
||||
%{_mandir}/man8/%{name}.8%{ext_man}
|
||||
%dir %{_datadir}/%{name}
|
||||
%{_datadir}/%{name}/dnscrypt-resolvers.csv
|
||||
%{_datadir}/%{name}/minisign.pub
|
||||
%{_localstatedir}/adm/fillup-templates/sysconfig.dnscrypt
|
||||
%{_datadir}/dnscrypt-proxy/minisign.pub
|
||||
%dir %{_libdir}/%{name}
|
||||
%{_libdir}/%{name}/libdcplugin_example.so
|
||||
%{_libdir}/%{name}/libdcplugin_example_logging.so
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root)
|
||||
%dir %{_includedir}/dnscrypt/
|
||||
%{_includedir}/dnscrypt/*
|
||||
%dir %{_libdir}/%{name}
|
||||
%{_libdir}/%{name}/*
|
||||
|
||||
%changelog
|
||||
|
||||
Loading…
Reference in New Issue
Block a user