[openvpn/el6] Re-enable plugins. Restore man page. Enable pkcs11

[Jon Ciesla]

commit 5afcb173b5b1418a3aac5645d73f4e057ce8dbc3
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Thu May 23 09:28:24 2013 -0500

    Re-enable plugins.
    Restore man page.
    Enable pkcs11

 openvpn.spec |   40 ++++++++++++++++++++++++----------------
 1 files changed, 24 insertions(+), 16 deletions(-)
---
diff --git a/openvpn.spec b/openvpn.spec
index d007402..25a23bd 100644
--- a/openvpn.spec
+++ b/openvpn.spec
@@ -4,7 +4,7 @@
 
 Name:              openvpn
 Version:           2.3.1
-Release:           1%{?prerelease:.%{prerelease}}%{?dist}
+Release:           2%{?prerelease:.%{prerelease}}%{?dist}
 Summary:           A full-featured SSL VPN solution
 URL:               http://openvpn.net/
 #Source0:           http://openvpn.net/beta/%{name}-%{version}%{?prerelease:_%{prerelease}}.tar.gz
@@ -60,11 +60,11 @@ for compression.
 #%patch2 -p0
 #%patch3 -p0
 
-#sed -i -e 's,%{_datadir}/openvpn/plugin,%{_libdir}/openvpn/plugin,' openvpn.8
+sed -i -e 's,%{_datadir}/openvpn/plugin,%{_libdir}/openvpn/plugin,' doc/openvpn.8
 
 # %%doc items shouldn't be executable.
-#find contrib sample-config-files sample-keys sample-scripts -type f -perm +100 \
-#    -exec chmod a-x {} \;
+find contrib sample -type f -perm +100 \
+    -exec chmod a-x {} \;
 
 %build
 #  --enable-pthread        Enable pthread support (Experimental for OpenVPN 2.0)
@@ -78,9 +78,11 @@ for compression.
     --enable-pthread \
     --enable-password-save \
     --enable-iproute2 \
-    --with-ifconfig-path=/sbin/ifconfig \
     --with-iproute-path=/sbin/ip \
-    --with-route-path=/sbin/route
+    --enable-plugins \
+    --enable-plugin-down-root \
+    --enable-plugin-auth-pam \
+    --enable-pkcs11
 %{__make}
 
 # Build plugins
@@ -112,6 +114,7 @@ pushd sample
 ../src/openvpn/openvpn --config \
     %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u})-loopback-server
 wait
+popd
 
 rm -f %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u})-loopback-client \
     %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u})-loopback-server
@@ -119,7 +122,7 @@ rm -f %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u})-loopback-client \
 %install
 rm -rf $RPM_BUILD_ROOT
 
-#install -D -m 0644 %{name}.8 $RPM_BUILD_ROOT%{_mandir}/man8/%{name}.8
+install -D -m 0644 doc/%{name}.8 $RPM_BUILD_ROOT%{_mandir}/man8/%{name}.8
 install -D -m 0755 src/openvpn/%{name} $RPM_BUILD_ROOT%{_sbindir}/%{name}
 install -D -m 0755 %{SOURCE4} \
     $RPM_BUILD_ROOT%{_initrddir}/%{name}
@@ -130,12 +133,12 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
 #rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/easy-rsa/Windows
 cp %{SOURCE2} %{SOURCE3} sample/sample-config-files/
 
-#mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}/plugin/lib
-#for plugin in %{plugins} ; do
-#    install -m 0755 plugin/$plugin/openvpn-$plugin.so \
-#        $RPM_BUILD_ROOT%{_libdir}/%{name}/plugin/lib/openvpn-$plugin.so
-#    cp plugin/$plugin/README plugin/$plugin.txt
-#done
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/
+for plugin in %{plugins} ; do
+    install -m 0755 src/plugins/$plugin/.libs/openvpn-plugin-$plugin.so \
+        $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/openvpn-plugin-$plugin.so
+    cp src/plugins/$plugin/README* src/plugins/
+done
 
 mkdir -m 755 -p $RPM_BUILD_ROOT%{_var}/run/%{name}
 
@@ -166,17 +169,22 @@ fi
 %defattr(-,root,root,0755)
 %doc AUTHORS COPYING COPYRIGHT.GPL INSTALL PORTS README
 # Add NEWS when it isn't zero-length.
-%doc src/plugins/*/README.*
+%doc src/plugins/README.*
 %doc contrib sample
-#%{_mandir}/man8/%{name}.8*
+%{_mandir}/man8/%{name}.8*
 %{_sbindir}/%{name}
 %{_datadir}/%{name}/
-#%{_libdir}/%{name}/
+%{_libdir}/%{name}/
 %{_initrddir}/%{name}
 %{_var}/run/%{name}/
 %config %dir %{_sysconfdir}/%{name}/
 
 %changelog
+* Mon May 06 2013 Jon Ciesla <limburgher at gmail.com> 2.3.1-2
+- Restore man page, BZ 9664225.
+- Restore plugins, BZ 966373.
+- Enable --enable-pkcs11, BZ 963868.
+
 * Mon May 06 2013 Jon Ciesla <limburgher at gmail.com> 2.3.1-1
 - Update to 2.3.1