OBS User unknown 2007-06-04 23:11:57 +00:00 committed by Git OBS Bridge
parent 37b5e500dd
commit abfd03898f
3 changed files with 49 additions and 26 deletions

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Mon Jun 4 10:14:03 CEST 2007 - mt@suse.de
- fixed easy-rsa installation (no exec in doc directory)
- improved spec to use configure directory variables and
cleaned up macro calls in RPM pre/post scripts.
- fixed openvpn binary check in the init script.
-------------------------------------------------------------------
Fri Oct 27 10:40:59 CEST 2006 - mt@suse.de

View File

@ -32,7 +32,10 @@ confdir=/etc/openvpn
piddir=/var/run/openvpn
test -d $piddir || mkdir $piddir
test -x $openvpn || exit 5
test -x $openvpn || {
echo 1>&2 "$openvpn not installed"
if test "$1" == "stop" ; then exit 0 ; else exit 5 ; fi
}
# Shell functions sourced from /etc/rc.status:
# rc_check check and set local and overall rc status

View File

@ -1,7 +1,7 @@
#
# spec file for package openvpn (Version 2.0.9)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@ -20,7 +20,7 @@ Autoreqprov: on
PreReq: %insserv_prereq %fillup_prereq
%endif
Version: 2.0.9
Release: 1
Release: 22
Summary: Create VPN over Wireless and Ethernet Networks using a Tun Device
Source: http://openvpn.net/release/openvpn-%{version}.tar.gz
Source1: http://openvpn.net/signatures/openvpn-%{version}.tar.gz.asc
@ -45,60 +45,72 @@ autoreconf -fi
export CFLAGS="$RPM_OPT_FLAGS -Wall"
export LDFLAGS=
# build with fPIE/pie on SUSE 10.0 or newer, or on any other platform
%if %{?suse_version:%suse_version}%{?!suse_version:99999} > 930
%if %{?suse_version}%{?!suse_version:99999} > 930
CFLAGS="$CFLAGS -fPIE"
LDFLAGS="$LDFLAGS -pie"
%endif
./configure --prefix=/usr --enable-pthread \
--mandir=%_mandir --with-lzo-headers=%_includedir/lzo
%configure \
--enable-pthread \
--with-lzo-headers=%_includedir/lzo
make
%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
mkdir -p $RPM_BUILD_ROOT/etc/openvpn
mkdir -p $RPM_BUILD_ROOT/var/run/openvpn
install -D -m 755 $RPM_SOURCE_DIR/openvpn.init $RPM_BUILD_ROOT/etc/init.d/openvpn
ln -sv ../../etc/init.d/openvpn $RPM_BUILD_ROOT/usr/sbin/rcopenvpn
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/openvpn
mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/run/openvpn
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/openvpn
install -D -m 755 $RPM_SOURCE_DIR/openvpn.init $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/openvpn
ln -sv %{_sysconfdir}/init.d/openvpn $RPM_BUILD_ROOT/%{_sbindir}/rcopenvpn
cp -p $RPM_SOURCE_DIR/openvpn.README.SUSE README.SUSE
rm -f easy-rsa/build-key-server.orig
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
chmod -x easy-rsa/2.0/openssl*.cnf
chmod -x easy-rsa/Windows/init-config.bat
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/
%clean
if ! test -f /.buildenv; then rm -rf $RPM_BUILD_ROOT; fi
%post
%{fillup_and_insserv -f}
%if %{?suse_version:%suse_version}%{?!suse_version:0} > 820
%{?fillup_and_insserv:%fillup_and_insserv -f}
%preun
%stop_on_removal openvpn
%endif
%{?stop_on_removal:%stop_on_removal openvpn}
%postun
%if %{?suse_version:%suse_version}%{?!suse_version:0} > 820
%restart_on_update openvpn
%endif
%insserv_cleanup
%{?restart_on_update:%restart_on_update openvpn}
%{?insserv_cleanup:%insserv_cleanup}
%files
%defattr(-,root,root)
%doc AUTHORS COPYING COPYRIGHT.GPL ChangeLog INSTALL NEWS PORTS README
%doc README.SUSE
%doc contrib
%doc easy-rsa
%doc management
%doc sample-config-files
%doc sample-keys
%doc sample-scripts
%doc suse
/usr/sbin/openvpn
%doc %{_mandir}/man8/openvpn.8.gz
%config(noreplace) /etc/openvpn/
%config /etc/init.d/openvpn
/usr/sbin/rcopenvpn
%dir /var/run/openvpn
%config(noreplace) %{_sysconfdir}/openvpn/
%config %{_sysconfdir}/init.d/openvpn
%{_sbindir}/openvpn
%{_sbindir}/rcopenvpn
%dir %{_localstatedir}/run/openvpn
%dir %{_datadir}/openvpn
%{_datadir}/openvpn/easy-rsa
%changelog -n openvpn
%changelog
* Mon Jun 04 2007 - mt@suse.de
- fixed easy-rsa installation (no exec in doc directory)
- improved spec to use configure directory variables and
cleaned up macro calls in RPM pre/post scripts.
- fixed openvpn binary check in the init script.
* Fri Oct 27 2006 - mt@suse.de
- upstream 2.0.9, Windows related fixes only
* Windows installer updated with OpenSSL 0.9.7l DLLs to fix