From cecc5e657bb38c03f80747eab40073bc6ded9631 Mon Sep 17 00:00:00 2001 From: james Date: Thu, 13 Oct 2005 04:08:20 +0000 Subject: [PATCH] Renamed plugin to plugins to work around strange automake issue. 2.1_beta2 git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@603 e7ae566f-a301-0410-adde-c780ea21d3b5 --- ChangeLog | 9 +++++++++ INSTALL | 16 ++++++++++++++-- Makefile.am | 2 +- openvpn.spec.in | 20 ++++++++++++-------- {plugin => plugins}/README | 0 {plugin => plugins}/auth-pam/.svnignore | 0 {plugin => plugins}/auth-pam/Makefile | 0 {plugin => plugins}/auth-pam/README | 0 {plugin => plugins}/auth-pam/auth-pam.c | 0 {plugin => plugins}/auth-pam/pamdl.c | 0 {plugin => plugins}/auth-pam/pamdl.h | 0 {plugin => plugins}/down-root/Makefile | 0 {plugin => plugins}/down-root/README | 0 {plugin => plugins}/down-root/down-root.c | 0 {plugin => plugins}/examples/README | 0 {plugin => plugins}/examples/build | 0 {plugin => plugins}/examples/simple.c | 0 {plugin => plugins}/examples/simple.def | 0 {plugin => plugins}/examples/winbuild | 0 19 files changed, 36 insertions(+), 11 deletions(-) rename {plugin => plugins}/README (100%) rename {plugin => plugins}/auth-pam/.svnignore (100%) rename {plugin => plugins}/auth-pam/Makefile (100%) rename {plugin => plugins}/auth-pam/README (100%) rename {plugin => plugins}/auth-pam/auth-pam.c (100%) rename {plugin => plugins}/auth-pam/pamdl.c (100%) rename {plugin => plugins}/auth-pam/pamdl.h (100%) rename {plugin => plugins}/down-root/Makefile (100%) rename {plugin => plugins}/down-root/README (100%) rename {plugin => plugins}/down-root/down-root.c (100%) rename {plugin => plugins}/examples/README (100%) rename {plugin => plugins}/examples/build (100%) rename {plugin => plugins}/examples/simple.c (100%) rename {plugin => plugins}/examples/simple.def (100%) rename {plugin => plugins}/examples/winbuild (100%) diff --git a/ChangeLog b/ChangeLog index a960cfc4f23..a7da555299e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,15 @@ Copyright (C) 2002-2005 OpenVPN Solutions LLC $Id$ +2005.10.xx -- Version 2.1-beta3 + +* NOTE TO PACKAGE MAINTAINERS: Moved "plugin" + directory to "plugins". This is + to work around a strange problem with the + "make dist" target in the automake-generated + makefile, where the target tries to do a + rather bogus "gcc -g -O2 -I. plugin.c -o plugin". + 2005.10.13 -- Version 2.1-beta2 * Added --socket-flags directive with TCP_NODELAY diff --git a/INSTALL b/INSTALL index 0842305705f..55b2f614e9a 100644 --- a/INSTALL +++ b/INSTALL @@ -60,6 +60,18 @@ OPTIONAL (for developers only): ************************************************************************* +CHECK OUT SOURCE FROM SUBVERSION REPOSITORY: + + Check out stable version: + + svn checkout http://svn.openvpn.net/projects/openvpn/trunk/openvpn openvpn + + Check out beta21 branch: + + svn checkout http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn openvpn + +************************************************************************* + BUILD COMMANDS FROM TARBALL: ./configure @@ -68,7 +80,7 @@ BUILD COMMANDS FROM TARBALL: ************************************************************************* -BUILD COMMANDS FROM CVS: +BUILD COMMANDS FROM SUBVERSION REPOSITORY CHECKOUT: autoreconf -i -v ./configure @@ -77,7 +89,7 @@ BUILD COMMANDS FROM CVS: ************************************************************************* -BUILD A TARBALL FROM CVS: +BUILD A TARBALL FROM SUBVERSION REPOSITORY CHECKOUT: autoreconf -i -v ./configure diff --git a/Makefile.am b/Makefile.am index dd0e5b9dc83..d84952bde1f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -121,7 +121,7 @@ EXTRA_DIST = \ service-win32 \ contrib \ debug \ - plugin \ + plugins \ management dist-hook: diff --git a/openvpn.spec.in b/openvpn.spec.in index 041ffdd113a..01c9bfdde67 100644 --- a/openvpn.spec.in +++ b/openvpn.spec.in @@ -101,13 +101,13 @@ and portability to most major OS platforms. %__strip %{name} # Build down-root plugin -pushd plugin/down-root +pushd plugins/down-root %__make popd # Build auth-pam plugin %if %{build_auth_pam} -pushd plugin/auth-pam +pushd plugins/auth-pam %__make popd %endif @@ -151,16 +151,16 @@ popd # Install the plugins # -%__mkdir_p %{buildroot}%{_datadir}/%{name}/plugin/lib +%__mkdir_p %{buildroot}%{_datadir}/%{name}/plugins/lib for pi in auth-pam down-root; do - %__mv -f plugin/$pi/README plugin/README.$pi - if [ -e plugin/$pi/openvpn-$pi.so ]; then - %__install -c -m 755 plugin/$pi/openvpn-$pi.so %{buildroot}%{_datadir}/openvpn/plugin/lib/openvpn-$pi.so + %__mv -f plugins/$pi/README plugins/README.$pi + if [ -e plugins/$pi/openvpn-$pi.so ]; then + %__install -c -m 755 plugins/$pi/openvpn-$pi.so %{buildroot}%{_datadir}/openvpn/plugins/lib/openvpn-$pi.so fi done -%__mv -f plugin/README plugin/README.plugins +%__mv -f plugins/README plugins/README.plugins # # Clean section @@ -220,10 +220,14 @@ fi %endif # Install extra %doc stuff -%doc contrib/ easy-rsa/ management/ sample-*/ plugin/README.* +%doc contrib/ easy-rsa/ management/ sample-*/ plugins/README.* %changelog +* Mon Oct 13 2005 James Yonan +- Renamed plugin directory to plugins to + work around automake issue. + * Mon Aug 2 2005 James Yonan - Fixed build problem with --define 'without_pam 1' diff --git a/plugin/README b/plugins/README similarity index 100% rename from plugin/README rename to plugins/README diff --git a/plugin/auth-pam/.svnignore b/plugins/auth-pam/.svnignore similarity index 100% rename from plugin/auth-pam/.svnignore rename to plugins/auth-pam/.svnignore diff --git a/plugin/auth-pam/Makefile b/plugins/auth-pam/Makefile similarity index 100% rename from plugin/auth-pam/Makefile rename to plugins/auth-pam/Makefile diff --git a/plugin/auth-pam/README b/plugins/auth-pam/README similarity index 100% rename from plugin/auth-pam/README rename to plugins/auth-pam/README diff --git a/plugin/auth-pam/auth-pam.c b/plugins/auth-pam/auth-pam.c similarity index 100% rename from plugin/auth-pam/auth-pam.c rename to plugins/auth-pam/auth-pam.c diff --git a/plugin/auth-pam/pamdl.c b/plugins/auth-pam/pamdl.c similarity index 100% rename from plugin/auth-pam/pamdl.c rename to plugins/auth-pam/pamdl.c diff --git a/plugin/auth-pam/pamdl.h b/plugins/auth-pam/pamdl.h similarity index 100% rename from plugin/auth-pam/pamdl.h rename to plugins/auth-pam/pamdl.h diff --git a/plugin/down-root/Makefile b/plugins/down-root/Makefile similarity index 100% rename from plugin/down-root/Makefile rename to plugins/down-root/Makefile diff --git a/plugin/down-root/README b/plugins/down-root/README similarity index 100% rename from plugin/down-root/README rename to plugins/down-root/README diff --git a/plugin/down-root/down-root.c b/plugins/down-root/down-root.c similarity index 100% rename from plugin/down-root/down-root.c rename to plugins/down-root/down-root.c diff --git a/plugin/examples/README b/plugins/examples/README similarity index 100% rename from plugin/examples/README rename to plugins/examples/README diff --git a/plugin/examples/build b/plugins/examples/build similarity index 100% rename from plugin/examples/build rename to plugins/examples/build diff --git a/plugin/examples/simple.c b/plugins/examples/simple.c similarity index 100% rename from plugin/examples/simple.c rename to plugins/examples/simple.c diff --git a/plugin/examples/simple.def b/plugins/examples/simple.def similarity index 100% rename from plugin/examples/simple.def rename to plugins/examples/simple.def diff --git a/plugin/examples/winbuild b/plugins/examples/winbuild similarity index 100% rename from plugin/examples/winbuild rename to plugins/examples/winbuild