[eurephia] Rebased against upstream v1.1.0

Tue Oct 9 00:14:23 UTC 2012

commit 919449e03a8d8b9787fad422e83523ef6c428da0
Author: David Sommerseth <davids at redhat.com>
Date:   Tue Oct 9 02:13:03 2012 +0200

    Rebased against upstream v1.1.0
    
    Signed-off-by: David Sommerseth <davids at redhat.com>

 .gitignore       |    1 +
 eurephia.spec    |   38 +++++++++++++++++---------------------
 openvpn-plugin.h |    3 ++-
 sources          |    1 +
 4 files changed, 21 insertions(+), 22 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 7600dcb..4275c33 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /eurephia-1.0.1.tar.bz2
+/eurephia-1.1.0.tar.bz2
diff --git a/eurephia.spec b/eurephia.spec
index 01ed423..fea3ac2 100644
--- a/eurephia.spec
+++ b/eurephia.spec
@@ -1,13 +1,14 @@
 Name:           eurephia
-Version:        1.0.1
-Release:        4%{?betatag:.%{betatag}}%{?dist}
+Version:        1.1.0
+Release:        1%{?betatag:.%{betatag}}%{?dist}
 Summary:        An advanced and flexible OpenVPN user authentication plug-in
 
 Group:          Applications/Internet
 License:        GPLv2
 URL:            http://www.eurephia.net/
 Source0:        http://downloads.sourceforge.net/project/eurephia/eurephia/v1.0/%{name}-%{version}%{?betatag:_%{betatag}}.tar.bz2
-Source1:        http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn/openvpn-plugin.h
+# Source1 can be downloaded from this URL: http://openvpn.git.sourceforge.net/git/gitweb.cgi?p=openvpn/openvpn.git;a=blob_plain;f=openvpn-plugin.h;hb=v2.2.2
+Source1:        openvpn-plugin.h
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}{?betatag:_%{betatag}}-root-%(%{__id_u} -n)
 
 BuildRequires:  libxml2-devel libxslt-devel openssl-devel
@@ -15,6 +16,8 @@ BuildRequires:  cmake >= 2.6.1
 BuildRequires:  sqlite-devel >= 3.0.0
 Requires:       openvpn
 Requires:       eurephia-sqlite3 = %{version}-%{release}
+Obsoletes:      eurephia-iptables < 1.0.1-2
+Provides:       eurephia-iptables >= 1.0.1-2
 
 %description
 This plug-in enhances OpenVPN by adding user name and password
@@ -34,16 +37,6 @@ Summary: The eurephia SQLite3 database driver
 %description sqlite3
 This package contains the SQLite3 database driver for eurephia
 
-%package iptables
-Group:   Applications/Internet
-Summary: The eurephia iptables interface module
-Requires: eurephia = %{version}-%{release}
-
-%description iptables
-To enable the firewall integration in eurephia, this module must be
-available for eurephia.  Use the eurephia-init package to setup
-configuration.
-
 %package admin
 Group:   Applications/Internet
 Summary: The eurephia command line administration utility
@@ -93,6 +86,10 @@ make VERBOSE=1
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 
+# Move the eurephia-auth.so file to the default OpenVPN plug-in directory
+mkdir -p -m 755 %{buildroot}/%{_libdir}/openvpn
+mv %{buildroot}/%{_libdir}/eurephia/eurephia-auth.so %{buildroot}/%{_libdir}/openvpn/
+
 # These files are not installed by default, but we want to package them for Fedora/RHEL
 install -p -m 755 utils/eurephia_init %{buildroot}/%{_bindir}
 install -p -m 755 utils/eurephia_saltdecode %{buildroot}/%{_bindir}
@@ -106,9 +103,10 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %doc LICENSE.txt CREDITS.txt
-%{_libdir}/eurephia/eurephia-auth.so
+%{_libdir}/openvpn/eurephia-auth.so
 %{_mandir}/man7/eurephia-auth.7.gz
 %{_mandir}/man7/eurephia-variables.7.gz
+%{_libdir}/eurephia/efw-iptables.so
 
 %files sqlite3
 %defattr(-,root,root,-)
@@ -118,11 +116,6 @@ rm -rf %{buildroot}
 %{_localstatedir}/lib/eurephia/
 %{_mandir}/man7/edb-sqlite.7.gz
 
-%files iptables
-%defattr(-,root,root,-)
-%doc LICENSE.txt CREDITS.txt
-%{_libdir}/eurephia/efw-iptables.so
-
 %files init
 %defattr(-,root,root,-)
 %doc LICENSE.txt CREDITS.txt
@@ -146,6 +139,9 @@ rm -rf %{buildroot}
 %{_mandir}/man7/eurephia_saltdecode.7.gz
 
 %changelog
+* Tue Oct  9 2012 David Sommerseth <dazo at users.sourceforge.net> - 1.1.0-1
+- Updated to upstream v1.1.0
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
@@ -155,8 +151,8 @@ rm -rf %{buildroot}
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
-* Sun Aug 29 2010 David Somerseth <dazo at users.sourceforge.net> - 1.0.1-1
-- Rebased to eurephia v1.0.1
+* Wed Oct 20 2010 David Sommerseth <dazo at users.sourceforge.net> - 1.0.1-2
+- Obsolete the eurephia-iptables RPM and move efw-iptables into eurephia.rpm
 
 * Thu Jul 15 2010 David Sommerseth <davids at redhat.com> - 1.0.0-8
 - Fixed silly mistakes
diff --git a/openvpn-plugin.h b/openvpn-plugin.h
index 56b0a70..173a0c1 100644
--- a/openvpn-plugin.h
+++ b/openvpn-plugin.h
@@ -41,6 +41,7 @@
  * New Client Connection:
  *
  * FUNC: openvpn_plugin_client_constructor_v1
+ * FUNC: openvpn_plugin_func_v1 OPENVPN_PLUGIN_ENABLE_PF
  * FUNC: openvpn_plugin_func_v1 OPENVPN_PLUGIN_TLS_VERIFY (called once for every cert
  *                                                     in the server chain)
  * FUNC: openvpn_plugin_func_v1 OPENVPN_PLUGIN_AUTH_USER_PASS_VERIFY
@@ -72,7 +73,7 @@
  * [Client session continues]
  *
  * FUNC: openvpn_plugin_func_v1 OPENVPN_PLUGIN_CLIENT_DISCONNECT
- * FUNC: openvpn_plugin_client_constructor_v1
+ * FUNC: openvpn_plugin_client_destructor_v1
  *
  * [ some time may pass ]
  *
diff --git a/sources b/sources
index a4c0d31..082a207 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 b4c329cbac5fd38dc8f4f3f13c36bf11  eurephia-1.0.1.tar.bz2
+b902119628931a45c7a84ed3d1bb1513  eurephia-1.1.0.tar.bz2
