--- rpms/smeserver-openvpn-s2s/contribs8/smeserver-openvpn-s2s.spec 2013/11/14 17:47:20 1.3 +++ rpms/smeserver-openvpn-s2s/contribs8/smeserver-openvpn-s2s.spec 2016/02/08 09:39:39 1.7 @@ -1,4 +1,4 @@ -# $Id: smeserver-openvpn-s2s.spec,v 1.2 2013/07/14 23:31:33 unnilennium Exp $ +# $Id: smeserver-openvpn-s2s.spec,v 1.6 2015/02/17 12:14:06 vip-ire Exp $ # Authority: vip-ire # Name: Daniel Berteaud @@ -6,7 +6,7 @@ Summary: OpenVPN, a strong VPN solution %define name smeserver-openvpn-s2s Name: %{name} %define version 0.1 -%define release 23 +%define release 27 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -50,6 +50,8 @@ Patch33: smeserver-openvpn-s2s-0.1-fix_r Patch34: smeserver-openvpn-s2s-0.1-locale-2011-10-13.patch Patch35: smeserver-openvpn-s2s-0.1-locale-2013-07-14.patch Patch36: smeserver-openvpn-s2s-0.1-use_verify_x509_name.patch +Patch37: smeserver-openvpn-s2s-0.1-locale-2014-11-02.patch +Patch38: smeserver-openvpn-s2s-0.1-locale-2015-02-17.patch BuildArchitectures: noarch @@ -64,6 +66,18 @@ This package contains all the needed scr to run openvpn in client or server mode for site to site tunnels %changelog +* Mon Feb 8 2016 Daniel Berteaud 0.1-27.sme +- Create /etc/openvpn/s2s/dev/urandom [SME: 9238] + +* Tue Feb 17 2015 Daniel Berteaud 0.1-26.sme +- Apply locale 2015-02-17 patch + +* Thu Dec 18 2014 Daniel Berteaud 0.1-25.sme +- Create required but unused /etc/openvpn/s2s/tmp dir + +* Sun Nov 2 2014 Daniel Berteaud 0.1-24.sme +- Apply locale 2014-11-02 patch + * Thu Nov 14 2013 Daniel Berteaud 0.1-23.sme - Use verify-x509-name instead of tls-remote @@ -181,12 +195,16 @@ to run openvpn in client or server mode %patch34 -p1 %patch35 -p1 %patch36 -p1 +%patch37 -p1 +%patch38 -p1 %build perl createlinks %{__mkdir_p} root/etc/openvpn/s2s/priv %{__mkdir_p} root/etc/openvpn/s2s/pub +%{__mkdir_p} root/etc/openvpn/s2s/tmp +%{__mkdir_p} root/etc/openvpn/s2s/dev %{__mkdir_p} root/var/run/openvpn-s2s %{__mkdir_p} root/var/log/openvpn-s2s @@ -197,6 +215,7 @@ perl createlinks /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \ --dir /etc/openvpn/s2s/pub 'attr(0755,root,root)' \ --dir /etc/openvpn/s2s/priv 'attr(0750,root,root)' \ + --dir /etc/openvpn/s2s/tmp 'attr(0750,root,root)' \ --dir /var/log/openvpn-s2s 'attr(0770,root,nobody)' \ --file /etc/openvpn/s2s/bin/up 'attr(4750,root,openvpn)' \ > %{name}-%{version}-filelist @@ -207,8 +226,10 @@ perl createlinks %clean rm -rf $RPM_BUILD_ROOT - %post +if [ \! -c /etc/openvpn/s2s/dev/urandom ]; then + mknod -m 0444 /etc/openvpn/s2s/dev/urandom c 1 9 +fi %preun