packages: openvpn/openvpn.spec - up to 2.2.1

[arekm]

Author: arekm                        Date: Mon Jul  4 12:51:15 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 2.2.1

---- Files affected:
packages/openvpn:
   openvpn.spec (1.165 -> 1.166) 

---- Diffs:

================================================================
Index: packages/openvpn/openvpn.spec
diff -u packages/openvpn/openvpn.spec:1.165 packages/openvpn/openvpn.spec:1.166
--- packages/openvpn/openvpn.spec:1.165	Wed Apr 27 23:02:58 2011
+++ packages/openvpn/openvpn.spec	Mon Jul  4 14:51:10 2011
@@ -8,12 +8,12 @@
 Summary:	VPN Daemon
 Summary(pl.UTF-8):	Serwer VPN
 Name:		openvpn
-Version:	2.2.0
+Version:	2.2.1
 Release:	1
 License:	GPL
 Group:		Networking/Daemons
 Source0:	http://swupdate.openvpn.net/community/releases/%{name}-%{version}.tar.gz
-# Source0-md5:	4f440603eac45fec7be218b87d570834
+# Source0-md5:	500bee5449b29906150569aaf2eb2730
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
 Source3:	%{name}-update-resolv-conf
@@ -110,14 +110,13 @@
 %configure \
 	%{!?with_pkcs11:--disable-pkcs11} \
 	--enable-password-save \
-	--enable-pthread \
 	--enable-iproute2
-%{__make} CFLAGS="%{rpmcflags} -D_GNU_SOURCE"
+%{__make} CFLAGS="%{rpmcflags} %{rpmcppflags} -D_GNU_SOURCE"
 
 %{__make} -C plugin/auth-pam \
-	OPTFLAGS="%{rpmcflags}"
+	OPTFLAGS="%{rpmcflags} %{rpmcppflags}"
 %{__make} -C plugin/down-root \
-	OPTFLAGS="%{rpmcflags}"
+	OPTFLAGS="%{rpmcflags} %{rpmcppflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -135,7 +134,8 @@
 # easy-rsa 2.0
 install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_datadir}}/easy-rsa
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/easy-rsa/keys
-cp -a easy-rsa/2.0/{vars,openssl.cnf} $RPM_BUILD_ROOT%{_sysconfdir}/easy-rsa
+cp -a easy-rsa/2.0/vars $RPM_BUILD_ROOT%{_sysconfdir}/easy-rsa
+cp -a easy-rsa/2.0/openssl-1.0.0.cnf $RPM_BUILD_ROOT%{_sysconfdir}/easy-rsa/openssl.cnf
 cp -a easy-rsa/2.0/{build-*,clean-all,inherit-inter,list-crl,revoke-full,sign-req} $RPM_BUILD_ROOT%{_datadir}/easy-rsa
 cp -a easy-rsa/2.0/pkitool $RPM_BUILD_ROOT%{_sbindir}
 
@@ -196,6 +196,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.166  2011/07/04 12:51:10  arekm
+- up to 2.2.1
+
 Revision 1.165  2011/04/27 21:02:58  marti
 - up to 2.2.0
 - adjusted easy-rsa2.patch
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openvpn/openvpn.spec?r1=1.165&r2=1.166&f=u