From 333753fcb56f8c514bfda5e7bbc18979266693986715630976261e18d6408626 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Thu, 9 Sep 2010 22:34:04 +0000 Subject: [PATCH 1/6] Accepting request 47645 from home:elvigia:branches:network OBS-URL: https://build.opensuse.org/request/show/47645 OBS-URL: https://build.opensuse.org/package/show/network/vpnc?expand=0&rev=49 --- bugfix.diff | 8 ++++---- ready | 0 vpnc-no-build-dates.patch | 14 ++++++++++++++ vpnc.changes | 7 +++++++ vpnc.spec | 5 +++-- 5 files changed, 28 insertions(+), 6 deletions(-) delete mode 100644 ready create mode 100644 vpnc-no-build-dates.patch diff --git a/bugfix.diff b/bugfix.diff index fafa5b9..78c19d6 100644 --- a/bugfix.diff +++ b/bugfix.diff @@ -1,8 +1,8 @@ -Index: vpnc-0.5.2r394/vpnc-script.in +Index: vpnc-script.in =================================================================== ---- vpnc-0.5.2r394.orig/vpnc-script.in -+++ vpnc-0.5.2r394/vpnc-script.in -@@ -445,8 +445,8 @@ +--- vpnc-script.in.orig ++++ vpnc-script.in +@@ -445,8 +445,8 @@ do_connect() { echo fi diff --git a/ready b/ready deleted file mode 100644 index 473a0f4..0000000 diff --git a/vpnc-no-build-dates.patch b/vpnc-no-build-dates.patch new file mode 100644 index 0000000..487f15f --- /dev/null +++ b/vpnc-no-build-dates.patch @@ -0,0 +1,14 @@ +Index: makeman.pl +=================================================================== +--- makeman.pl.orig ++++ makeman.pl +@@ -92,7 +92,8 @@ close $LONGHELP; + # Hopefully the code speaks for itself from now on... + + setlocale( LC_ALL, 'C' ); +-my $date = strftime( '%B %Y', localtime ); ++my $write_secs = (stat("./vpnc.8.template"))[9]; ++my $date = strftime( '%B %Y', localtime($write_secs) ); + + open my $VERSION, '<', './VERSION'; + my $vpnc_version = <$VERSION>; diff --git a/vpnc.changes b/vpnc.changes index 8e553e7..9148cc8 100644 --- a/vpnc.changes +++ b/vpnc.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Sep 9 20:42:08 UTC 2010 - cristian.rodriguez@opensuse.org + +- makeman.pl internal scripts adds local build time, change + it to the source man template filemtime instead, so we avoid + republishing this package every month. + ------------------------------------------------------------------- Mon Jan 4 15:18:13 CET 2010 - crrodriguez@opensuse.org diff --git a/vpnc.spec b/vpnc.spec index 89ff1cc..b1f8e0c 100644 --- a/vpnc.spec +++ b/vpnc.spec @@ -30,6 +30,7 @@ Summary: A Client for Cisco VPN concentrator Requires: /usr/bin/sed /sbin/ip Source: %{name}-%{version}.tar.bz2 Patch0: bugfix.diff +Patch1: vpnc-no-build-dates.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -55,7 +56,7 @@ Authors: %prep %setup -n %{name} %patch0 -p1 - +%patch1 %build export CFLAGS="%optflags -fno-strict-aliasing" make PREFIX=/usr @@ -71,7 +72,7 @@ touch ${RPM_BUILD_ROOT}/%{_localstatedir}/run/vpnc/{defaultroute,gateway,pid,res rm -rfv ${RPM_BUILD_ROOT}/usr/share/doc/vpnc %clean - +rm -rf %{buildroot} %files %defattr(-,root,root) %attr(0600,root,root) %config(noreplace) %ghost %{_sysconfdir}/vpnc/default.conf From fd49693f277f0366c921fc368102624e9915ea46f8c585a5a549803c71498fdc Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Thu, 9 Sep 2010 22:41:12 +0000 Subject: [PATCH 2/6] OBS-URL: https://build.opensuse.org/package/show/network/vpnc?expand=0&rev=50 --- vpnc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vpnc.spec b/vpnc.spec index b1f8e0c..9b494e3 100644 --- a/vpnc.spec +++ b/vpnc.spec @@ -55,7 +55,7 @@ Authors: %prep %setup -n %{name} -%patch0 -p1 +%patch0 -p0 %patch1 %build export CFLAGS="%optflags -fno-strict-aliasing" From 3948567daca104909b3478eb0f75667c837a59eda9753628a7fc1d6c829b9caa Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Fri, 17 Sep 2010 23:28:05 +0000 Subject: [PATCH 3/6] Accepting request 48291 from network checked in (request 48291) OBS-URL: https://build.opensuse.org/request/show/48291 OBS-URL: https://build.opensuse.org/package/show/network/vpnc?expand=0&rev=51 --- bugfix.diff | 8 ++++---- vpnc-no-build-dates.patch | 14 -------------- vpnc.changes | 7 ------- vpnc.spec | 7 +++---- 4 files changed, 7 insertions(+), 29 deletions(-) delete mode 100644 vpnc-no-build-dates.patch diff --git a/bugfix.diff b/bugfix.diff index 78c19d6..fafa5b9 100644 --- a/bugfix.diff +++ b/bugfix.diff @@ -1,8 +1,8 @@ -Index: vpnc-script.in +Index: vpnc-0.5.2r394/vpnc-script.in =================================================================== ---- vpnc-script.in.orig -+++ vpnc-script.in -@@ -445,8 +445,8 @@ do_connect() { +--- vpnc-0.5.2r394.orig/vpnc-script.in ++++ vpnc-0.5.2r394/vpnc-script.in +@@ -445,8 +445,8 @@ echo fi diff --git a/vpnc-no-build-dates.patch b/vpnc-no-build-dates.patch deleted file mode 100644 index 487f15f..0000000 --- a/vpnc-no-build-dates.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: makeman.pl -=================================================================== ---- makeman.pl.orig -+++ makeman.pl -@@ -92,7 +92,8 @@ close $LONGHELP; - # Hopefully the code speaks for itself from now on... - - setlocale( LC_ALL, 'C' ); --my $date = strftime( '%B %Y', localtime ); -+my $write_secs = (stat("./vpnc.8.template"))[9]; -+my $date = strftime( '%B %Y', localtime($write_secs) ); - - open my $VERSION, '<', './VERSION'; - my $vpnc_version = <$VERSION>; diff --git a/vpnc.changes b/vpnc.changes index 9148cc8..8e553e7 100644 --- a/vpnc.changes +++ b/vpnc.changes @@ -1,10 +1,3 @@ -------------------------------------------------------------------- -Thu Sep 9 20:42:08 UTC 2010 - cristian.rodriguez@opensuse.org - -- makeman.pl internal scripts adds local build time, change - it to the source man template filemtime instead, so we avoid - republishing this package every month. - ------------------------------------------------------------------- Mon Jan 4 15:18:13 CET 2010 - crrodriguez@opensuse.org diff --git a/vpnc.spec b/vpnc.spec index 9b494e3..89ff1cc 100644 --- a/vpnc.spec +++ b/vpnc.spec @@ -30,7 +30,6 @@ Summary: A Client for Cisco VPN concentrator Requires: /usr/bin/sed /sbin/ip Source: %{name}-%{version}.tar.bz2 Patch0: bugfix.diff -Patch1: vpnc-no-build-dates.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -55,8 +54,8 @@ Authors: %prep %setup -n %{name} -%patch0 -p0 -%patch1 +%patch0 -p1 + %build export CFLAGS="%optflags -fno-strict-aliasing" make PREFIX=/usr @@ -72,7 +71,7 @@ touch ${RPM_BUILD_ROOT}/%{_localstatedir}/run/vpnc/{defaultroute,gateway,pid,res rm -rfv ${RPM_BUILD_ROOT}/usr/share/doc/vpnc %clean -rm -rf %{buildroot} + %files %defattr(-,root,root) %attr(0600,root,root) %config(noreplace) %ghost %{_sysconfdir}/vpnc/default.conf From 941ff9802df04b0d29aefc64f6e36a7e342f48dc62da1a4e35e9aaeac8149957 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Thu, 4 Aug 2011 10:26:40 +0000 Subject: [PATCH 4/6] OBS-URL: https://build.opensuse.org/package/show/network/vpnc?expand=0&rev=52 --- bugfix.diff | 8 ++++---- vpnc-no-build-dates.patch | 14 ++++++++++++++ vpnc.changes | 12 ++++++++++++ vpnc.spec | 20 +++++++++++++++++--- 4 files changed, 47 insertions(+), 7 deletions(-) create mode 100644 vpnc-no-build-dates.patch diff --git a/bugfix.diff b/bugfix.diff index fafa5b9..78c19d6 100644 --- a/bugfix.diff +++ b/bugfix.diff @@ -1,8 +1,8 @@ -Index: vpnc-0.5.2r394/vpnc-script.in +Index: vpnc-script.in =================================================================== ---- vpnc-0.5.2r394.orig/vpnc-script.in -+++ vpnc-0.5.2r394/vpnc-script.in -@@ -445,8 +445,8 @@ +--- vpnc-script.in.orig ++++ vpnc-script.in +@@ -445,8 +445,8 @@ do_connect() { echo fi diff --git a/vpnc-no-build-dates.patch b/vpnc-no-build-dates.patch new file mode 100644 index 0000000..487f15f --- /dev/null +++ b/vpnc-no-build-dates.patch @@ -0,0 +1,14 @@ +Index: makeman.pl +=================================================================== +--- makeman.pl.orig ++++ makeman.pl +@@ -92,7 +92,8 @@ close $LONGHELP; + # Hopefully the code speaks for itself from now on... + + setlocale( LC_ALL, 'C' ); +-my $date = strftime( '%B %Y', localtime ); ++my $write_secs = (stat("./vpnc.8.template"))[9]; ++my $date = strftime( '%B %Y', localtime($write_secs) ); + + open my $VERSION, '<', './VERSION'; + my $vpnc_version = <$VERSION>; diff --git a/vpnc.changes b/vpnc.changes index 8e553e7..3ec1bc0 100644 --- a/vpnc.changes +++ b/vpnc.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Thu Aug 4 10:25:45 UTC 2011 - tittiatcoke@gmail.com + +- Resolved rpmlint warning non-ghost-in-var-run. + +------------------------------------------------------------------- +Thu Sep 9 20:42:08 UTC 2010 - cristian.rodriguez@opensuse.org + +- makeman.pl internal scripts adds local build time, change + it to the source man template filemtime instead, so we avoid + republishing this package every month. + ------------------------------------------------------------------- Mon Jan 4 15:18:13 CET 2010 - crrodriguez@opensuse.org diff --git a/vpnc.spec b/vpnc.spec index 89ff1cc..fe9b1c6 100644 --- a/vpnc.spec +++ b/vpnc.spec @@ -23,13 +23,14 @@ Group: Productivity/Networking/Security BuildRequires: libgcrypt-devel BuildRequires: gnutls libgnutls-devel pkg-config Version: 0.5.3r449 -Release: 3 +Release: 8 License: BSD3c(or similar) ; GPLv2+ AutoReqProv: on Summary: A Client for Cisco VPN concentrator Requires: /usr/bin/sed /sbin/ip Source: %{name}-%{version}.tar.bz2 Patch0: bugfix.diff +Patch1: vpnc-no-build-dates.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -54,7 +55,8 @@ Authors: %prep %setup -n %{name} -%patch0 -p1 +%patch0 -p0 +%patch1 %build export CFLAGS="%optflags -fno-strict-aliasing" @@ -71,6 +73,18 @@ touch ${RPM_BUILD_ROOT}/%{_localstatedir}/run/vpnc/{defaultroute,gateway,pid,res rm -rfv ${RPM_BUILD_ROOT}/usr/share/doc/vpnc %clean +rm -rf %{buildroot} + +%post +if [ "$1" -eq 1 ] ; then +mkdir %{_localstatedir}/run/vpnc +touch %{_localstatedir}/run/vpnc/{defaultroute,gateway,pid,resolv.conf-backup} +fi + +%postun +if [ "$1" -eq 0 ] ; then +rm -rf %{_localstatedir}/run/vpnc +fi %files %defattr(-,root,root) @@ -84,7 +98,7 @@ rm -rfv ${RPM_BUILD_ROOT}/usr/share/doc/vpnc %{_mandir}/man1/cisco-decrypt.1.* %{_mandir}/man1/pcf2vpnc.1.* %{_mandir}/man8/vpnc.8.* -%dir %{_localstatedir}/run/vpnc +%ghost %dir %{_localstatedir}/run/vpnc %ghost %{_localstatedir}/run/vpnc/defaultroute %ghost %{_localstatedir}/run/vpnc/gateway %ghost %{_localstatedir}/run/vpnc/pid From 2a0ffe1397dc6938e441193373c4d6f69a8de6540294d79d41f2cab45e13ae2f Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Thu, 4 Aug 2011 13:46:23 +0000 Subject: [PATCH 5/6] OBS-URL: https://build.opensuse.org/package/show/network/vpnc?expand=0&rev=53 --- vpnc.spec | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/vpnc.spec b/vpnc.spec index fe9b1c6..9f18f59 100644 --- a/vpnc.spec +++ b/vpnc.spec @@ -69,7 +69,8 @@ mkdir -p \ DESTDIR=${RPM_BUILD_ROOT} \ PREFIX=/usr # Use chmod as %attr doesn't work for %doc maked files in the list -touch ${RPM_BUILD_ROOT}/%{_localstatedir}/run/vpnc/{defaultroute,gateway,pid,resolv.conf-backup} || true +# No longer needed as that these files are created upon installation of the package +# touch ${RPM_BUILD_ROOT}/%{_localstatedir}/run/vpnc/{defaultroute,gateway,pid,resolv.conf-backup} || true rm -rfv ${RPM_BUILD_ROOT}/usr/share/doc/vpnc %clean @@ -98,11 +99,6 @@ fi %{_mandir}/man1/cisco-decrypt.1.* %{_mandir}/man1/pcf2vpnc.1.* %{_mandir}/man8/vpnc.8.* -%ghost %dir %{_localstatedir}/run/vpnc -%ghost %{_localstatedir}/run/vpnc/defaultroute -%ghost %{_localstatedir}/run/vpnc/gateway -%ghost %{_localstatedir}/run/vpnc/pid -%ghost %{_localstatedir}/run/vpnc/resolv.conf-backup %doc ChangeLog COPYING README TODO VERSION %changelog From 981706ec2abee3f68afcbe55c7d3cf66648364a144e8473cfb7c457a31eb8ac7 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Thu, 4 Aug 2011 14:06:51 +0000 Subject: [PATCH 6/6] OBS-URL: https://build.opensuse.org/package/show/network/vpnc?expand=0&rev=54 --- vpnc.changes | 2 ++ vpnc.spec | 14 -------------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/vpnc.changes b/vpnc.changes index 3ec1bc0..482c458 100644 --- a/vpnc.changes +++ b/vpnc.changes @@ -2,6 +2,8 @@ Thu Aug 4 10:25:45 UTC 2011 - tittiatcoke@gmail.com - Resolved rpmlint warning non-ghost-in-var-run. + - Files in /var/run/vpnc are not required as that they will be + created automatically ------------------------------------------------------------------- Thu Sep 9 20:42:08 UTC 2010 - cristian.rodriguez@opensuse.org diff --git a/vpnc.spec b/vpnc.spec index 9f18f59..565c1af 100644 --- a/vpnc.spec +++ b/vpnc.spec @@ -68,25 +68,11 @@ mkdir -p \ %{__make} install \ DESTDIR=${RPM_BUILD_ROOT} \ PREFIX=/usr -# Use chmod as %attr doesn't work for %doc maked files in the list -# No longer needed as that these files are created upon installation of the package -# touch ${RPM_BUILD_ROOT}/%{_localstatedir}/run/vpnc/{defaultroute,gateway,pid,resolv.conf-backup} || true rm -rfv ${RPM_BUILD_ROOT}/usr/share/doc/vpnc %clean rm -rf %{buildroot} -%post -if [ "$1" -eq 1 ] ; then -mkdir %{_localstatedir}/run/vpnc -touch %{_localstatedir}/run/vpnc/{defaultroute,gateway,pid,resolv.conf-backup} -fi - -%postun -if [ "$1" -eq 0 ] ; then -rm -rf %{_localstatedir}/run/vpnc -fi - %files %defattr(-,root,root) %attr(0600,root,root) %config(noreplace) %ghost %{_sysconfdir}/vpnc/default.conf