forked from pool/openvpn
This commit is contained in:
parent
d8962ffe03
commit
9bca38bf3c
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:347c551e7c88affc1f4b7a4b715080253c9298dcc512ed29fe8ca5cd26d015d9
|
|
||||||
size 669076
|
|
@ -1,7 +0,0 @@
|
|||||||
-----BEGIN PGP SIGNATURE-----
|
|
||||||
Version: GnuPG v1.2.4 (GNU/Linux)
|
|
||||||
|
|
||||||
iD8DBQBFH7kKHQtJlh+/UfMRAsIdAJ41usSP8OGmeaW+/7osfXhjiRCKIACfSzex
|
|
||||||
ilPdxBhlGGL833OuyqRUgLY=
|
|
||||||
=fiJg
|
|
||||||
-----END PGP SIGNATURE-----
|
|
@ -1,15 +1,6 @@
|
|||||||
--- plugin/auth-pam/Makefile
|
--- plugin/auth-pam/Makefile
|
||||||
+++ plugin/auth-pam/Makefile 2008/01/17 14:23:16
|
+++ plugin/auth-pam/Makefile 2008/11/12 09:16:24
|
||||||
@@ -4,7 +4,7 @@
|
@@ -15,10 +15,10 @@ endif
|
||||||
|
|
||||||
# If PAM modules are not linked against libpam.so, set DLOPEN_PAM to 1. This
|
|
||||||
# must be done on SUSE 9.1, at least.
|
|
||||||
-DLOPEN_PAM=1
|
|
||||||
+DLOPEN_PAM=0
|
|
||||||
|
|
||||||
ifeq ($(DLOPEN_PAM),1)
|
|
||||||
LIBPAM=-ldl
|
|
||||||
@@ -15,10 +15,10 @@
|
|
||||||
# This directory is where we will look for openvpn-plugin.h
|
# This directory is where we will look for openvpn-plugin.h
|
||||||
INCLUDE=-I../..
|
INCLUDE=-I../..
|
||||||
|
|
||||||
@ -23,7 +14,7 @@
|
|||||||
auth-pam.o : auth-pam.c pamdl.h
|
auth-pam.o : auth-pam.c pamdl.h
|
||||||
gcc ${CC_FLAGS} -fPIC -c ${INCLUDE} auth-pam.c
|
gcc ${CC_FLAGS} -fPIC -c ${INCLUDE} auth-pam.c
|
||||||
--- plugin/down-root/Makefile
|
--- plugin/down-root/Makefile
|
||||||
+++ plugin/down-root/Makefile 2008/01/17 14:23:39
|
+++ plugin/down-root/Makefile 2008/11/12 09:58:25
|
||||||
@@ -5,10 +5,10 @@
|
@@ -5,10 +5,10 @@
|
||||||
# This directory is where we will look for openvpn-plugin.h
|
# This directory is where we will look for openvpn-plugin.h
|
||||||
INCLUDE=-I../..
|
INCLUDE=-I../..
|
3
openvpn-2.1_rc18.tar.gz
Normal file
3
openvpn-2.1_rc18.tar.gz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:5ddd900ab1293aa8882e8be4cadddb419c3c76b1d28079183323ebb1e9e333a2
|
||||||
|
size 838716
|
7
openvpn-2.1_rc18.tar.gz.asc
Normal file
7
openvpn-2.1_rc18.tar.gz.asc
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
-----BEGIN PGP SIGNATURE-----
|
||||||
|
Version: GnuPG v1.4.6 (GNU/Linux)
|
||||||
|
|
||||||
|
iD8DBQBKK2b1HQtJlh+/UfMRAt9bAJ0ZzKSpHWDsCuJeWmUGBtd7V+ueAQCg8f8y
|
||||||
|
DSKp92PwviznB7j42vKNFr4=
|
||||||
|
=VDjW
|
||||||
|
-----END PGP SIGNATURE-----
|
@ -1,3 +1,11 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Jun 10 10:24:06 CEST 2009 - mt@suse.de
|
||||||
|
|
||||||
|
- Updated to openvpn 2.1 [2.1_rc18] series (fate#305289).
|
||||||
|
- Enabled pkcs11-helper for openSUSE > 10.3 (bnc#487558).
|
||||||
|
- Adopted spec file and patches, improved init script.
|
||||||
|
- Disabled installation of easy-rsa for Windows.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Feb 17 18:22:23 CET 2009 - mt@suse.de
|
Tue Feb 17 18:22:23 CET 2009 - mt@suse.de
|
||||||
|
|
||||||
|
@ -111,10 +111,10 @@ case "$action" in
|
|||||||
rc_status -v1
|
rc_status -v1
|
||||||
done
|
done
|
||||||
test -n "$name" || {
|
test -n "$name" || {
|
||||||
echo 1>&2 "No $DAEMON${config:+ '$config'} configuration file found"
|
echo -n "Starting $DAEMON${config:+ [$config]} -- not configured"
|
||||||
rc_failed 6
|
rc_failed 6
|
||||||
|
rc_status -v
|
||||||
}
|
}
|
||||||
rc_status
|
|
||||||
|
|
||||||
;;
|
;;
|
||||||
stop)
|
stop)
|
||||||
@ -133,10 +133,10 @@ case "$action" in
|
|||||||
rm -f "$pidfile"
|
rm -f "$pidfile"
|
||||||
done
|
done
|
||||||
test -n "$name" || {
|
test -n "$name" || {
|
||||||
echo 1>&2 "No $DAEMON${config:+ for '$config' configuration} running"
|
echo -n "Shutting down $DAEMON${config:+ [$config]} -- not running"
|
||||||
|
rc_status -v
|
||||||
}
|
}
|
||||||
|
|
||||||
rc_status
|
|
||||||
;;
|
;;
|
||||||
try-restart)
|
try-restart)
|
||||||
## Do a restart only if the service was active before.
|
## Do a restart only if the service was active before.
|
||||||
|
41
openvpn.spec
41
openvpn.spec
@ -1,5 +1,5 @@
|
|||||||
#
|
#
|
||||||
# spec file for package openvpn (Version 2.0.9)
|
# spec file for package openvpn (Version 2.1.0.18)
|
||||||
#
|
#
|
||||||
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||||
#
|
#
|
||||||
@ -17,27 +17,32 @@
|
|||||||
|
|
||||||
# norootforbuild
|
# norootforbuild
|
||||||
|
|
||||||
|
%define upstream_version 2.1_rc18
|
||||||
|
|
||||||
Name: openvpn
|
Name: openvpn
|
||||||
Url: http://openvpn.net/
|
Url: http://openvpn.net/
|
||||||
License: GPL v2 or later; LGPL v2.1 or later
|
License: GPL v2 only
|
||||||
Group: Productivity/Networking/Security
|
Group: Productivity/Networking/Security
|
||||||
AutoReqProv: on
|
AutoReqProv: on
|
||||||
%if 0%{?suse_version}
|
%if 0%{?suse_version}
|
||||||
PreReq: %insserv_prereq %fillup_prereq
|
PreReq: %insserv_prereq %fillup_prereq
|
||||||
%endif
|
%endif
|
||||||
Version: 2.0.9
|
Version: 2.1.0.18
|
||||||
Release: 144
|
Release: 1
|
||||||
Summary: Full-featured SSL VPN solution using a TUN/TAP Interface
|
Summary: Full-featured SSL VPN solution using a TUN/TAP Interface
|
||||||
Source: http://openvpn.net/release/openvpn-%{version}.tar.gz
|
Source: http://openvpn.net/release/openvpn-%{upstream_version}.tar.gz
|
||||||
Source1: http://openvpn.net/signatures/openvpn-%{version}.tar.gz.asc
|
Source1: http://openvpn.net/signatures/openvpn-%{upstream_version}.tar.gz.asc
|
||||||
Source2: openvpn.init
|
Source2: openvpn.init
|
||||||
Source3: openvpn.README.SUSE
|
Source3: openvpn.README.SUSE
|
||||||
Patch1: %{name}-%{version}-plugin-man.dif
|
Patch1: %{name}-2.1-plugin-man.dif
|
||||||
Patch2: %{name}-%{version}-plugin-build.dif
|
Patch2: %{name}-2.1-plugin-build.dif
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
BuildRequires: lzo-devel openssl-devel
|
BuildRequires: lzo-devel openssl-devel
|
||||||
BuildRequires: iproute2 pam-devel
|
BuildRequires: iproute2 pam-devel
|
||||||
|
%if 0%{?suse_version} > 1030
|
||||||
|
BuildRequires: pkcs11-helper-devel
|
||||||
|
Requires: pkcs11-helper
|
||||||
|
%endif
|
||||||
%define plugin_dir %{_libdir}/%{name}/plugin
|
%define plugin_dir %{_libdir}/%{name}/plugin
|
||||||
%define plugin_libdir %{plugin_dir}/lib
|
%define plugin_libdir %{plugin_dir}/lib
|
||||||
|
|
||||||
@ -119,7 +124,7 @@ Authors:
|
|||||||
James Yonan <jim@yonan.net>
|
James Yonan <jim@yonan.net>
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q -n %{name}-%{upstream_version}
|
||||||
%patch1 -p0
|
%patch1 -p0
|
||||||
%patch2 -p0
|
%patch2 -p0
|
||||||
sed -e "s|@PLUGIN_DIR@|%{plugin_dir}|g" \
|
sed -e "s|@PLUGIN_DIR@|%{plugin_dir}|g" \
|
||||||
@ -159,14 +164,10 @@ install -D -m 755 $RPM_SOURCE_DIR/openvpn.init $RPM_BUILD_ROOT/%{_sysconfdir}/in
|
|||||||
ln -sv %{_sysconfdir}/init.d/openvpn $RPM_BUILD_ROOT/%{_sbindir}/rcopenvpn
|
ln -sv %{_sysconfdir}/init.d/openvpn $RPM_BUILD_ROOT/%{_sbindir}/rcopenvpn
|
||||||
cp -p $RPM_SOURCE_DIR/openvpn.README.SUSE README.SUSE
|
cp -p $RPM_SOURCE_DIR/openvpn.README.SUSE README.SUSE
|
||||||
find sample-* suse contrib -type f -exec chmod -x \{\} \;
|
find sample-* suse contrib -type f -exec chmod -x \{\} \;
|
||||||
rm -f easy-rsa/build-key-server.orig easy-rsa/.externals
|
chmod -x easy-rsa/2.0/{vars,openssl*.cnf}
|
||||||
chmod -x easy-rsa/2.0/vars
|
chmod +x easy-rsa/1.0/{revoke-crt,make-crl,list-crl}
|
||||||
chmod -x easy-rsa/2.0/openssl*.cnf
|
cp -rd easy-rsa $RPM_BUILD_ROOT%{_datadir}/openvpn/
|
||||||
chmod -x easy-rsa/Windows/init-config.bat
|
rm -rf $RPM_BUILD_ROOT%{_datadir}/openvpn/easy-rsa/Windows
|
||||||
chmod +x easy-rsa/revoke-crt
|
|
||||||
chmod +x easy-rsa/make-crl
|
|
||||||
chmod +x easy-rsa/list-crl
|
|
||||||
cp -a easy-rsa $RPM_BUILD_ROOT/%{_datadir}/openvpn/
|
|
||||||
#
|
#
|
||||||
# Install the plugins
|
# Install the plugins
|
||||||
#
|
#
|
||||||
@ -195,7 +196,6 @@ if ! test -f /.buildenv; then rm -rf $RPM_BUILD_ROOT; fi
|
|||||||
%doc AUTHORS COPYING COPYRIGHT.GPL ChangeLog INSTALL NEWS PORTS README
|
%doc AUTHORS COPYING COPYRIGHT.GPL ChangeLog INSTALL NEWS PORTS README
|
||||||
%doc README.*
|
%doc README.*
|
||||||
%doc contrib
|
%doc contrib
|
||||||
%doc management
|
|
||||||
%doc sample-config-files
|
%doc sample-config-files
|
||||||
%doc sample-keys
|
%doc sample-keys
|
||||||
%doc sample-scripts
|
%doc sample-scripts
|
||||||
@ -221,6 +221,11 @@ if ! test -f /.buildenv; then rm -rf $RPM_BUILD_ROOT; fi
|
|||||||
%{plugin_libdir}/openvpn-auth-pam.so
|
%{plugin_libdir}/openvpn-auth-pam.so
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Jun 10 2009 mt@suse.de
|
||||||
|
- Updated to openvpn 2.1 [2.1_rc18] series (fate#305289).
|
||||||
|
- Enabled pkcs11-helper for openSUSE > 10.3 (bnc#487558).
|
||||||
|
- Adopted spec file and patches, improved init script.
|
||||||
|
- Disabled installation of easy-rsa for Windows.
|
||||||
* Tue Feb 17 2009 mt@suse.de
|
* Tue Feb 17 2009 mt@suse.de
|
||||||
- Improved init script to show config name in action messages
|
- Improved init script to show config name in action messages
|
||||||
and allow to specify a config name in the second argument.
|
and allow to specify a config name in the second argument.
|
||||||
|
Loading…
x
Reference in New Issue
Block a user