From a49ca582c8c00824f4fe5785134b051cb260cc9a Mon Sep 17 00:00:00 2001 From: Christian Stadelmann Date: Wed, 17 Apr 2019 08:58:00 +0000 Subject: [PATCH 1/3] vpnc-tmpfiles.conf: Update path from /var/run to /run --- vpnc-tmpfiles.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vpnc-tmpfiles.conf b/vpnc-tmpfiles.conf index 43d3bc4..67224ac 100644 --- a/vpnc-tmpfiles.conf +++ b/vpnc-tmpfiles.conf @@ -1 +1 @@ -D /var/run/vpnc 0755 root root - +D /run/vpnc 0755 root root - From abfdb28705cdef3b83883ce831113533e54fcde8 Mon Sep 17 00:00:00 2001 From: Felix Schwarz Date: Tue, 23 Apr 2019 22:38:25 +0200 Subject: [PATCH 2/3] final touches to avoid legacy warning from systemd (rhbz 1691908) --- vpnc.spec | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/vpnc.spec b/vpnc.spec index f10ff99..ee3eeee 100644 --- a/vpnc.spec +++ b/vpnc.spec @@ -2,7 +2,7 @@ Name: vpnc Version: 0.5.3 -Release: 34%{snapshot}%{?dist} +Release: 35%{snapshot}%{?dist} Summary: IPSec VPN client compatible with Cisco equipment License: GPLv2+ URL: http://www.unix-ag.uni-kl.de/~massar/vpnc/ @@ -24,6 +24,7 @@ BuildRequires: gcc BuildRequires: libgcrypt-devel > 1.1.90 BuildRequires: gnutls-devel BuildRequires: perl(autodie) +BuildRequires: systemd Requires: iproute vpnc-script %description @@ -47,7 +48,7 @@ switching to the root account. %patch2 -p1 -b .autodie %build -CFLAGS="$RPM_OPT_FLAGS -fPIE" LDFLAGS="$RPM_OPT_FLAGS -pie" make PREFIX=/usr +CFLAGS="$RPM_OPT_FLAGS -fPIE" LDFLAGS="$RPM_OPT_FLAGS -pie" make PREFIX=/usr %install make install DESTDIR="$RPM_BUILD_ROOT" PREFIX=/usr @@ -73,24 +74,20 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/doc/vpnc/COPYING # vpnc-script is packaged in a separate package rm -f $RPM_BUILD_ROOT%{_sysconfdir}/vpnc/vpnc-script -mkdir -p %{buildroot}%{_sysconfdir}/tmpfiles.d -install -m 0644 %{SOURCE8} %{buildroot}%{_sysconfdir}/tmpfiles.d/%{name}.conf - -mkdir -p %{buildroot}%{_localstatedir}/run/ -install -d -m 0755 %{buildroot}%{_localstatedir}/run/%{name}/ +mkdir -p %{buildroot}%{_tmpfilesdir} +install -m 0644 %{SOURCE8} %{buildroot}%{_tmpfilesdir}/%{name}.conf %files %license COPYING %doc README pcf2vpnc pcf2vpnc.1 -%config(noreplace) %{_sysconfdir}/tmpfiles.d/%{name}.conf +%{_tmpfilesdir}/%{name}.conf %config(noreplace) %{_sysconfdir}/vpnc/default.conf %{_sbindir}/vpnc %{_bindir}/cisco-decrypt %{_sbindir}/vpnc-disconnect %{_mandir}/man8/vpnc.* %{_mandir}/man1/cisco-decrypt.* -%dir %{_localstatedir}/run/%{name}/ %files consoleuser %config(noreplace) %{_sysconfdir}/security/console.apps/vpnc* @@ -100,6 +97,9 @@ install -d -m 0755 %{buildroot}%{_localstatedir}/run/%{name}/ %changelog +* Tue Apr 23 2019 Felix Schwarz - 0.5.3-35.svn550 +- avoid legacy warning from systemd (rhbz 1691908) + * Sun Feb 03 2019 Fedora Release Engineering - 0.5.3-34.svn550 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 6d06f9b2c46e7863af1eedd29e5953a6c6a93b54 Mon Sep 17 00:00:00 2001 From: Felix Schwarz Date: Sat, 27 Apr 2019 17:02:13 +0200 Subject: [PATCH 3/3] use %autosetup macro --- vpnc.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/vpnc.spec b/vpnc.spec index ee3eeee..3636a3f 100644 --- a/vpnc.spec +++ b/vpnc.spec @@ -43,9 +43,7 @@ Allows the console user to run the IPSec VPN client directly without switching to the root account. %prep -%setup -q -%patch1 -p1 -b .dpd -%patch2 -p1 -b .autodie +%autosetup %build CFLAGS="$RPM_OPT_FLAGS -fPIE" LDFLAGS="$RPM_OPT_FLAGS -pie" make PREFIX=/usr