Update of /cvsroot/leaf/src/bering-uclibc/apps/openvpn
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28250
Modified Files:
buildtool.cfg buildtool.mk openvpn
Added Files:
openvpn-2.0.tar.gz
Removed Files:
openvpn-1.6.0.tar.gz openvpn.conf
Log Message:
moved openvpn20 to openvpn and moved old source to attic
--- openvpn-1.6.0.tar.gz DELETED ---
Index: buildtool.cfg
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc/apps/openvpn/buildtool.cfg,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** buildtool.cfg 13 Jan 2005 21:37:22 -0000 1.9
--- buildtool.cfg 1 May 2005 12:29:20 -0000 1.10
***************
*** 1,17 ****
<File buildtool.mk>
Server = cvs-sourceforge
! Directory = openvpn
! revision = HEAD
! </File>
! <File openvpn-1.6.0.tar.gz>
! Server = cvs-sourceforge
! envname = OPENVPN_SOURCE
! directory = openvpn
revision = HEAD
</File>
! <File openvpn.conf>
Server = cvs-sourceforge
! directory = openvpn
revision = HEAD
</File>
--- 1,12 ----
<File buildtool.mk>
Server = cvs-sourceforge
! directory = openvpn20
revision = HEAD
</File>
! <File openvpn-2.0.tar.gz>
Server = cvs-sourceforge
! envname = OPENVPN_SOURCE
! directory = openvpn20
revision = HEAD
</File>
***************
*** 19,23 ****
<File openvpn>
Server = cvs-sourceforge
! directory = openvpn
revision = HEAD
</File>
--- 14,18 ----
<File openvpn>
Server = cvs-sourceforge
! directory = openvpn20
revision = HEAD
</File>
***************
*** 25,36 ****
<Package>
<openvpn>
! Version = 1.6.0
Revision = 1
Help <<EOF
! Easy-to-use, robust, and highly configurable VPN daemon
! OpenVPN is an easy-to-use, robust, and highly
configurable VPN
! (Virtual Private Network) daemon which can be used to
securely link two or
! more private networks using an encrypted tunnel over
the internet
This version supports iproute2, so there is no need for
the route or ifconfig
binaries. Simply specify the "ifconfig" and "route"
options as described in
--- 20,30 ----
<Package>
<openvpn>
! Version = 2.0
Revision = 1
Help <<EOF
! Robust and highly flexible tunneling application
! that uses all of the encryption, authentication, and
certification features
! of the OpenSSL library to securely tunnel IP networks
over a single UDP port.
This version supports iproute2, so there is no need for
the route or ifconfig
binaries. Simply specify the "ifconfig" and "route"
options as described in
***************
*** 57,69 ****
</File>
<File>
! Filename = etc/openvpn/openvpn.conf
! Source = etc/openvpn/openvpn.conf
! Description = openvpn config
! Type = conf
Type = binary
</File>
<File>
Filename = usr/sbin/openvpn
! Source = usr/sbin/openvpn
Type = binary
Permissions = 755
--- 51,70 ----
</File>
<File>
! Filename = etc/openvpn/server.conf
! Source = etc/openvpn/server.conf20
Type = binary
</File>
<File>
+ Filename = etc/openvpn/client.conf
+ Source = etc/openvpn/client.conf20
+ Type = binary
+ </File>
+ <File>
+ Filename = etc/openvpn/*.conf
+ Type = conf
+ </File>
+ <File>
Filename = usr/sbin/openvpn
! Source = usr/sbin/openvpn20
Type = binary
Permissions = 755
***************
*** 71,89 ****
<File>
Filename = etc/init.d/openvpn
! Source = etc/init.d/openvpn
Type = binary
Permissions = 755
</File>
</Contents>
</openvpn>
<openvpnz>
! Version = 1.6.0
Revision = 1
Help <<EOF
! Easy-to-use, robust, and highly configurable VPN daemon
with lzo online compression support
! OpenVPN is an easy-to-use, robust, and highly
configurable VPN
! (Virtual Private Network) daemon which can be used to
securely link two or
! more private networks using an encrypted tunnel over
the internet
This version supports iproute2, so there is no need for
the route or ifconfig
binaries. Simply specify the "ifconfig" and "route"
options as described in
--- 72,94 ----
<File>
Filename = etc/init.d/openvpn
! Source = etc/init.d/openvpn20
Type = binary
Permissions = 755
</File>
+
+
</Contents>
</openvpn>
+
<openvpnz>
! Version = 2.0
Revision = 1
Help <<EOF
! Robust and highly flexible tunneling application
! that uses all of the encryption, authentication, and
certification features
! of the OpenSSL library to securely tunnel IP networks
over a single UDP port.
! It uses the Marcus Franz Xaver Johannes Oberhumer's LZO
library for
! compression.
This version supports iproute2, so there is no need for
the route or ifconfig
binaries. Simply specify the "ifconfig" and "route"
options as described in
***************
*** 110,122 ****
</File>
<File>
! Filename = etc/openvpn/openvpn.conf
! Source = etc/openvpn/openvpn.conf
! Description = openvpn config
! Type = conf
Type = binary
</File>
<File>
Filename = usr/sbin/openvpn
! Source = usr/sbin/openvpn_lzo
Type = binary
Permissions = 755
--- 115,134 ----
</File>
<File>
! Filename = etc/openvpn/server.conf
! Source = etc/openvpn/server.lzo.conf20
! Type = binary
! </File>
! <File>
! Filename = etc/openvpn/client.conf
! Source = etc/openvpn/client.lzo.conf20
Type = binary
+ </File>
+ <File>
+ Filename = etc/openvpn/*.conf
+ Type = conf
</File>
<File>
Filename = usr/sbin/openvpn
! Source = usr/sbin/openvpn_lzo20
Type = binary
Permissions = 755
***************
*** 124,128 ****
<File>
Filename = etc/init.d/openvpn
! Source = etc/init.d/openvpn
Type = binary
Permissions = 755
--- 136,140 ----
<File>
Filename = etc/init.d/openvpn
! Source = etc/init.d/openvpn20
Type = binary
Permissions = 755
***************
*** 131,133 ****
--- 143,389 ----
</openvpnz>
+ <easyrsa>
+ Version = 2.0
+ Revision = 1
+
+ Help <<EOF
+ This is a small RSA key management package, based on
the openssl command line
+ tool, that can be found in the easy-rsa subdirectory
+ See: http://www.openvpn.net
+ Requires: openssl.lrp
+ LEAF package by __PACKAGER__, __BUILDDATE__
+
+ INSTALL
+
+ 1. Edit /etc/easyrse/vars.
+ 2. Set KEY_CONFIG to point to the openssl.cnf file
+ included in this distribution (/etc/ssl/openssl.cnf).
+ 3. Set KEY_DIR to point to a directory which will
+ contain all keys, certificates, etc. This
+ directory need not exist, and if it does,
+ it will be deleted with rm -rf, so BE
+ CAREFUL how you set KEY_DIR.
+ 4. (Optional) Edit other fields in vars
+ per your site data. You may want to
+ increase KEY_SIZE to 2048 if you are
+ paranoid and don't mind slower key
+ processing, but certainly 1024 is
+ fine for testing purposes. KEY_SIZE
+ must be compatible across both peers
+ participating in a secure SSL/TLS
+ connection.
+ 5 . /etc/easyrsa/vars
+ note that ". vars" will not work, even if you are
+ in the right directory
+ 6. clean-all
+ 7. As you create certificates, keys, and
+ certificate signing requests, understand that
+ only .key files should be kept confidential.
+ .crt and .csr files can be sent over insecure
+ channels such as plaintext email.
+ 8. You should never need to copy a .key file
+ between computers. Normally each computer
+ will have its own certificate/key pair.
+
+ BUILD YOUR OWN ROOT CERTIFICATE AUTHORITY (CA)
CERTIFICATE/KEY
+
+ 1. build-ca
+ 2. ca.crt and ca.key will be built in your KEY_DIR
+ directory
+
+ BUILD AN INTERMEDIATE CERTIFICATE AUTHORITY
CERTIFICATE/KEY
+
+ 1. build-inter inter
+ 2. inter.crt and inter.key will be built in your KEY_DIR
+ directory and signed with your root certificate.
+
+ BUILD DIFFIE-HELLMAN PARAMETERS (necessary for
+ the server end of a SSL/TLS connection).
+
+ 1. build-dh
+
+ BUILD A CERTIFICATE SIGNING REQUEST (If
+ you want to sign your certificate with a root
+ certificate controlled by another individual
+ or organization, or residing on a different machine).
+
+ 1. Get ca.crt (the root certificate) from your
+ certificate authority. Though this
+ transfer can be over an insecure channel, to prevent
+ man-in-the-middle attacks you must confirm that
+ ca.crt was not tampered with. Large CAs solve this
+ problem by hardwiring their root certificates into
+ popular web browsers. A simple way to verify a root
+ CA is to call the issuer on the telephone and confirm
+ that the md5sum or sha1sum signatures on the ca.crt
+ files match (such as with the command: "md5sum
ca.crt").
+ 2. Choose a name for your certificate such as your
computer
+ name. In our example we will use "deception".
+ 3. build-req deception
+ 4. You can ignore most of the fields, but set
+ "Common Name" to something unique such as your
+ computer's host name. Leave all password
+ fields blank, unless you want your private key
+ to be protected by password. Using a password
+ is not required -- it will make your key more secure
+ but also more inconvenient to use, because you will
+ need to supply your password anytime the key is used.
+ NOTE: if you are using a password, use
./build-req-pass
+ instead of ./build-req
+ 5. Your key will be written to $KEY_DIR/deception.key
+ 6. Your certificate signing request will be written to
+ to $KEY_DIR/deception.csr
+ 7. Email deception.csr to the individual or organization
+ which controls the root certificate. This can be
+ done over an insecure channel.
+ 8. After the .csr file is signed by the root certificate
+ authority, you will receive a file deception.crt
+ (your certificate). Place deception.crt in your
+ KEY_DIR directory.
+ 9. The combined files of deception.crt, deception.key,
+ and ca.crt can now be used to secure one end of
+ an SSL/TLS connection.
+
+ SIGN A CERTIFICATE SIGNING REQUEST
+
+ 1. sign-req deception
+ 2. deception.crt will be built in your KEY_DIR
+ directory using deception.csr and your root CA
+ file as input.
+
+ BUILD AND SIGN A CERTIFICATE SIGNING REQUEST
+ USING A LOCALLY INSTALLED ROOT CERTIFICATE/KEY -- this
+ script generates and signs a certificate in one step,
+ but it requires that the generated certificate and
private
+ key files be copied to the destination host over a
+ secure channel.
+
+ 1. build-key deception (no password protection)
+ 2. OR build-key-pass deception (with password
protection)
+ 3. deception.crt and deception.key will be built in your
+ KEY_DIR directory, and deception.crt will be signed
+ by your root CA.
+
+ EOF
+
+ <Permissions>
+ Files = 644
+ Directories = 755
+ </Permissions>
+
+ <Owner>
+ Files = root:root
+ Directories = root:root
+ </Owner>
+
+ <Contents>
+
+ <File>
+ Filename = usr/sbin/build-ca
+ Source = usr/sbin/build-ca
+ Type = binary
+ Permissions = 755
+ </File>
+
+ <File>
+ Filename = usr/sbin/build-dh
+ Source = usr/sbin/build-dh
+ Type = binary
+ Permissions = 755
+ </File>
+ <File>
+ Filename = usr/sbin/build-inter
+ Source = usr/sbin/build-inter
+ Type = binary
+ Permissions = 755
+ </File>
+ <File>
+ Filename = usr/sbin/build-key
+ Source = usr/sbin/build-key
+ Type = binary
+ Permissions = 755
+ </File>
+
+ <File>
+ Filename = usr/sbin/build-key-server
+ Source = usr/sbin/build-key-server
+ Type = binary
+ Permissions = 755
+ </File>
+
+ <File>
+ Filename = usr/sbin/build-key-pass
+ Source = usr/sbin/build-key-pass
+ Type = binary
+ Permissions = 755
+ </File>
+ <File>
+ Filename = usr/sbin/build-req
+ Source = usr/sbin/build-req
+ Type = binary
+ Permissions = 755
+ </File>
+
+ <File>
+ Filename = usr/sbin/build-req-pass
+ Source = usr/sbin/build-req-pass
+ Type = binary
+ Permissions = 755
+ </File>
+
+ <File>
+ Filename = usr/sbin/clean-all
+ Source = usr/sbin/clean-all
+ Type = binary
+ Permissions = 755
+ </File>
+
+ <File>
+ Filename = usr/sbin/list-crl
+ Source = usr/sbin/list-crl
+ Type = binary
+ Permissions = 755
+ </File>
+ <File>
+ Filename = usr/sbin/make-crl
+ Source = usr/sbin/make-crl
+ Type = binary
+ Permissions = 755
+ </File>
+ <File>
+ Filename = usr/sbin/revoke-crt
+ Source = usr/sbin/revoke-crt
+ Type = binary
+ Permissions = 755
+ </File>
+
+ <File>
+ Filename = etc/easyrsa/vars
+ Source = usr/sbin/vars
+ Type = binary
+ Type = conf
+ Permissions = 644
+ </File>
+
+ <File>
+ Filename = etc/easyrsa/openssl.cnf
+ Source = usr/sbin/openssl.cnf
+ Type = binary
+ Type = conf
+ Permissions = 644
+ </File>
+
+ <File>
+ Filename = etc/easyrsa
+ Type = list
+ Permissions = 755
+ </File>
+
+ </Contents>
+ </easyrsa>
+
</Package>
+
+
+
+
Index: buildtool.mk
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc/apps/openvpn/buildtool.mk,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** buildtool.mk 29 Jan 2005 17:42:26 -0000 1.9
--- buildtool.mk 1 May 2005 12:29:20 -0000 1.10
***************
*** 1,7 ****
include $(MASTERMAKEFILE)
! OPENVPN_DIR:=openvpn-1.6.0
! OPENVPN_TARGET_DIR:=$(BT_BUILD_DIR)/openvpn
! OPENVPNLZO_TARGET_DIR:=$(BT_BUILD_DIR)/openvpnlzo
STRIP_OPTIONS=-s --remove-section=.note --remove-section=.comment
--- 1,12 ----
include $(MASTERMAKEFILE)
! # setup for openvpn 2.0
! # based on the setup for 1.6 with enhancements for 2.0
! # and changes by Charles Duffy
!
!
! OPENVPN_DIR:=openvpn-2.0
! OPENVPN_TARGET_DIR:=$(BT_BUILD_DIR)/openvpn20
! OPENVPNLZO_TARGET_DIR:=$(BT_BUILD_DIR)/openvpnlzo20
STRIP_OPTIONS=-s --remove-section=.note --remove-section=.comment
***************
*** 9,12 ****
--- 14,36 ----
$(OPENVPN_DIR)/.source:
zcat $(OPENVPN_SOURCE) | tar -xvf -
+ perl -i -p -e 's,#!/bin/bash,#!/bin/sh,'
$(OPENVPN_DIR)/easy-rsa/build-ca
+ perl -i -p -e 's,#!/bin/bash,#!/bin/sh,'
$(OPENVPN_DIR)/easy-rsa/build-dh
+ perl -i -p -e 's,#!/bin/bash,#!/bin/sh,'
$(OPENVPN_DIR)/easy-rsa/build-inter
+ perl -i -p -e 's,#!/bin/bash,#!/bin/sh,'
$(OPENVPN_DIR)/easy-rsa/build-key
+ perl -i -p -e 's,#!/bin/bash,#!/bin/sh,'
$(OPENVPN_DIR)/easy-rsa/build-key-pass
+ perl -i -p -e 's,#!/bin/bash,#!/bin/sh,'
$(OPENVPN_DIR)/easy-rsa/build-key-server
+ perl -i -p -e 's,#!/bin/bash,#!/bin/sh,'
$(OPENVPN_DIR)/easy-rsa/build-req
+ perl -i -p -e 's,#!/bin/bash,#!/bin/sh,'
$(OPENVPN_DIR)/easy-rsa/build-req-pass
+ perl -i -p -e 's,#!/bin/bash,#!/bin/sh,'
$(OPENVPN_DIR)/easy-rsa/clean-all
+ perl -i -p -e 's,#!/bin/bash,#!/bin/sh,'
$(OPENVPN_DIR)/easy-rsa/list-crl
+ perl -i -p -e 's,#!/bin/bash,#!/bin/sh,'
$(OPENVPN_DIR)/easy-rsa/make-crl
+ perl -i -p -e 's,#!/bin/bash,#!/bin/sh,'
$(OPENVPN_DIR)/easy-rsa/revoke-crt
+ perl -i -p -e 's,#!/bin/bash,#!/bin/sh,' $(OPENVPN_DIR)/easy-rsa/vars
+ perl -i -p -e 's,^export D=.*$$,export D=/etc/openvpn,'
$(OPENVPN_DIR)/easy-rsa/vars
+ perl -i -p -e 's,^export KEY_CONFIG.*$$,export
KEY_CONFIG=/etc/easyrsa/openssl.cnf,' $(OPENVPN_DIR)/easy-rsa/vars
+ perl -i -p -e 's,group nobody,group nogroup,'
$(OPENVPN_DIR)/sample-config-files/server.conf
+ perl -i -p -e 's,group nobody,group nogroup,'
$(OPENVPN_DIR)/sample-config-files/client.conf
+ perl -i -p -e 's,status openvpn-status.log,status
/var/log/openvpn-status.log,' $(OPENVPN_DIR)/sample-config-files/server.conf
+ perl -i -p -e 's,ifconfig-pool-persist ipp.txt,ifconfig-pool-persist
/var/state/openvpn-ipp.txt,' $(OPENVPN_DIR)/sample-config-files/server.conf
touch $(OPENVPN_DIR)/.source
***************
*** 20,23 ****
--- 44,48 ----
mkdir -p $(OPENVPNLZO_TARGET_DIR)/etc/init.d
mkdir -p $(OPENVPNLZO_TARGET_DIR)/usr/sbin
+ mkdir -p $(OPENVPNLZO_TARGET_DIR)/usr/bin
mkdir -p $(BT_STAGING_DIR)/etc/init.d
mkdir -p $(BT_STAGING_DIR)/usr/sbin
***************
*** 40,43 ****
--- 65,72 ----
--disable-pthread \
--prefix=/usr \
+ --disable-socks \
+ --disable-http \
+ --disable-debug \
+ --enable-small \
--libdir=$(BT_STAGING_DIR)/lib );
***************
*** 45,64 ****
$(BT_STRIP) $(STRIP_OPTIONS) $(OPENVPN_DIR)/openvpn
make DESTDIR=$(OPENVPN_TARGET_DIR) -C $(OPENVPN_DIR) install
! cp openvpn.conf $(OPENVPN_TARGET_DIR)/etc/openvpn/
! cp openvpn $(OPENVPN_TARGET_DIR)/etc/init.d
! cp openvpn.conf $(BT_STAGING_DIR)/etc/openvpn/
! cp openvpn $(BT_STAGING_DIR)/etc/init.d/
! cp $(OPENVPN_TARGET_DIR)/usr/sbin/openvpn
$(BT_STAGING_DIR)/usr/sbin/openvpn
- make CC=$(TARGET_CC) -C $(OPENVPN_DIR) clean
# Build a version with lzo support
(cd $(OPENVPN_DIR); \
CFLAGS="$(BT_COPT_FLAGS)" \
CC=$(TARGET_CC) \
LD=$(TARGET_LD) \
./configure \
!
--with-ssl-headers=$(BT_STAGING_DIR)/include/openssl \
! --with-ssl-lib=$(BT_STAGING_DIR)/lib \
--disable-dependency-tracking \
--enable-ssl \
--- 74,124 ----
$(BT_STRIP) $(STRIP_OPTIONS) $(OPENVPN_DIR)/openvpn
make DESTDIR=$(OPENVPN_TARGET_DIR) -C $(OPENVPN_DIR) install
! cp $(OPENVPN_DIR)/sample-config-files/server.conf
$(OPENVPN_TARGET_DIR)/etc/openvpn/server.conf20
! cp $(OPENVPN_DIR)/sample-config-files/client.conf
$(OPENVPN_TARGET_DIR)/etc/openvpn/client.conf20
! cp openvpn $(OPENVPN_TARGET_DIR)/etc/init.d/openvpn20
!
! rm $(OPENVPN_DIR)/openvpn
!
! # make sure lzo is disabled in the sample config
! perl -i -p -e 's,^comp-lzo,;comp-lzo,'
$(OPENVPN_TARGET_DIR)/etc/openvpn/server.conf20
! perl -i -p -e 's,^comp-lzo,;comp-lzo,'
$(OPENVPN_TARGET_DIR)/etc/openvpn/client.conf20
!
!
! cp $(OPENVPN_DIR)/easy-rsa/build-ca
$(OPENVPN_TARGET_DIR)/usr/sbin/
! cp $(OPENVPN_DIR)/easy-rsa/build-dh
$(OPENVPN_TARGET_DIR)/usr/sbin/
! cp $(OPENVPN_DIR)/easy-rsa/build-inter
$(OPENVPN_TARGET_DIR)/usr/sbin/
! cp $(OPENVPN_DIR)/easy-rsa/build-key
$(OPENVPN_TARGET_DIR)/usr/sbin/
! cp $(OPENVPN_DIR)/easy-rsa/build-key-pass
$(OPENVPN_TARGET_DIR)/usr/sbin/
! cp $(OPENVPN_DIR)/easy-rsa/build-req
$(OPENVPN_TARGET_DIR)/usr/sbin/
! cp $(OPENVPN_DIR)/easy-rsa/build-key-server
$(OPENVPN_TARGET_DIR)/usr/sbin/
! cp $(OPENVPN_DIR)/easy-rsa/build-req-pass
$(OPENVPN_TARGET_DIR)/usr/sbin/
! cp $(OPENVPN_DIR)/easy-rsa/clean-all
$(OPENVPN_TARGET_DIR)/usr/sbin/
! cp $(OPENVPN_DIR)/easy-rsa/openssl.cnf
$(OPENVPN_TARGET_DIR)/usr/sbin/
! cp $(OPENVPN_DIR)/easy-rsa/list-crl
$(OPENVPN_TARGET_DIR)/usr/sbin/
! cp $(OPENVPN_DIR)/easy-rsa/make-crl
$(OPENVPN_TARGET_DIR)/usr/sbin/
! cp $(OPENVPN_DIR)/easy-rsa/revoke-crt
$(OPENVPN_TARGET_DIR)/usr/sbin/
! cp $(OPENVPN_DIR)/easy-rsa/vars $(OPENVPN_TARGET_DIR)/usr/sbin/
!
! mv $(OPENVPN_TARGET_DIR)/usr/sbin/openvpn
$(OPENVPN_TARGET_DIR)/usr/sbin/openvpn20
!
! # copy everything to the staging dir
! cp $(OPENVPN_TARGET_DIR)/etc/openvpn/server.conf20
$(BT_STAGING_DIR)/etc/openvpn/
! cp $(OPENVPN_TARGET_DIR)/etc/openvpn/client.conf20
$(BT_STAGING_DIR)/etc/openvpn/
! cp $(OPENVPN_TARGET_DIR)/etc/init.d/openvpn20
$(BT_STAGING_DIR)/etc/init.d/
! cp -a $(OPENVPN_TARGET_DIR)/usr/sbin/*
$(BT_STAGING_DIR)/usr/sbin/
+ # clean up for the next round
+ make CC=$(TARGET_CC) -C $(OPENVPN_DIR) clean
+
# Build a version with lzo support
(cd $(OPENVPN_DIR); \
+ rm -rf config.cache; \
CFLAGS="$(BT_COPT_FLAGS)" \
CC=$(TARGET_CC) \
LD=$(TARGET_LD) \
./configure \
!
--with-ssl-headers=$(BT_STAGING_DIR)/usr/include \
! --with-ssl-lib=$(BT_STAGING_DIR)/usr/lib \
--disable-dependency-tracking \
--enable-ssl \
***************
*** 70,81 ****
--disable-pthread \
--prefix=/usr \
--libdir=$(BT_STAGING_DIR)/lib );
!
make CC=$(TARGET_CC) -C $(OPENVPN_DIR)
$(BT_STRIP) $(STRIP_OPTIONS) $(OPENVPN_DIR)/openvpn
make DESTDIR=$(OPENVPNLZO_TARGET_DIR) -C $(OPENVPN_DIR) install
! cp openvpn.conf $(OPENVPNLZO_TARGET_DIR)/etc/openvpn/
! cp openvpn $(OPENVPNLZO_TARGET_DIR)/etc/init.d
! cp $(OPENVPNLZO_TARGET_DIR)/usr/sbin/openvpn
$(BT_STAGING_DIR)/usr/sbin/openvpn_lzo
touch $(OPENVPN_DIR)/.build
--- 130,155 ----
--disable-pthread \
--prefix=/usr \
+ --disable-socks \
+ --disable-http \
+ --disable-debug \
+ --enable-small \
--libdir=$(BT_STAGING_DIR)/lib );
!
make CC=$(TARGET_CC) -C $(OPENVPN_DIR)
$(BT_STRIP) $(STRIP_OPTIONS) $(OPENVPN_DIR)/openvpn
make DESTDIR=$(OPENVPNLZO_TARGET_DIR) -C $(OPENVPN_DIR) install
! rm $(OPENVPN_DIR)/openvpn
!
! cp $(OPENVPN_DIR)/sample-config-files/server.conf
$(OPENVPNLZO_TARGET_DIR)/etc/openvpn/server.conf20
! cp $(OPENVPN_DIR)/sample-config-files/client.conf
$(OPENVPNLZO_TARGET_DIR)/etc/openvpn/client.conf20
! cp openvpn $(OPENVPNLZO_TARGET_DIR)/etc/init.d/openvpn20
!
! mv $(OPENVPNLZO_TARGET_DIR)/usr/sbin/openvpn
$(OPENVPNLZO_TARGET_DIR)/usr/sbin/openvpn_lzo20
!
!
! cp $(OPENVPNLZO_TARGET_DIR)/etc/openvpn/server.conf20
$(BT_STAGING_DIR)/etc/openvpn/server.lzo.conf20
! cp $(OPENVPNLZO_TARGET_DIR)/etc/openvpn/client.conf20
$(BT_STAGING_DIR)/etc/openvpn/client.lzo.conf20
! cp -a $(OPENVPNLZO_TARGET_DIR)/usr/sbin/*
$(BT_STAGING_DIR)/usr/sbin/
!
touch $(OPENVPN_DIR)/.build
***************
*** 88,98 ****
make -C $(OPENVPN_DIR) clean
rm -rf $(OPENVPN_TARGET_DIR)
!
srcclean:
rm -rf $(OPENVPN_DIR)
! rm -rf $(BT_STAGING_DIR)/etc/openvpn
! rm -f $(BT_STAGING_DIR)/etc/init.d/openvpn
! rm -f $(BT_STAGING_DIR)/usr/sbin/openvpn
! rm -f $(BT_STAGING_DIR)/usr/sbin/openvpn_lzo
--- 162,172 ----
make -C $(OPENVPN_DIR) clean
rm -rf $(OPENVPN_TARGET_DIR)
! rm -rf $(OPENVPNLZO_TARGET_DIR)
srcclean:
rm -rf $(OPENVPN_DIR)
! rm -rf $(BT_STAGING_DIR)/etc/openvpn20
! rm -f $(BT_STAGING_DIR)/etc/init.d/openvpn20
! rm -f $(BT_STAGING_DIR)/usr/sbin/openvpn20
! rm -f $(BT_STAGING_DIR)/usr/sbin/openvpn_lzo20
Index: openvpn
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc/apps/openvpn/openvpn,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** openvpn 15 Jan 2004 13:42:46 -0000 1.1
--- openvpn 1 May 2005 12:29:20 -0000 1.2
***************
*** 1,7 ****
! #!/bin/sh -e
#
# Original version by Robert Leslie
# <[EMAIL PROTECTED]>, edited by iwj and cs
# Modified for openvpn by Alberto Gonzalez Iniesta <[EMAIL PROTECTED]>
RCDLINKS="0,K20 1,K20 2,S20 3,S20 4,S20 5,S20 6,K20"
--- 1,9 ----
! #!/bin/sh
#
# Original version by Robert Leslie
# <[EMAIL PROTECTED]>, edited by iwj and cs
# Modified for openvpn by Alberto Gonzalez Iniesta <[EMAIL PROTECTED]>
+ # modified for openvpn 2.0 by Martin Hejl <[EMAIL PROTECTED]>
+ # using additions by Douglas Keller <[EMAIL PROTECTED]>
RCDLINKS="0,K20 1,K20 2,S20 3,S20 4,S20 5,S20 6,K20"
***************
*** 9,73 ****
DAEMON=/usr/sbin/openvpn
CONFIG_DIR=/etc/openvpn
test -x $DAEMON || exit 0
test -d $CONFIG_DIR || exit 0
- start_vpn () {
- $DAEMON --daemon --writepid /var/run/openvpn.$NAME.pid \
- --config $CONFIG_DIR/$NAME.conf --cd $CONFIG_DIR || echo -n "
FAILED->"
- echo -n " $NAME"
- }
- stop_vpn () {
- kill `cat $PIDFILE` || true
- rm $PIDFILE
- }
case "$1" in
start)
! echo -n "Starting openvpn:"
for CONFIG in `cd $CONFIG_DIR; ls *.conf 2> /dev/null`; do
NAME=${CONFIG%%.conf}
! start_vpn
done
! echo "."
;;
stop)
! echo -n "Stopping openvpn:"
! for PIDFILE in `ls /var/run/openvpn.*.pid 2> /dev/null`; do
! NAME=`echo $PIDFILE | cut -c18-`
NAME=${NAME%%.pid}
! stop_vpn
! echo -n " $NAME"
done
! echo "."
;;
! # We only 'reload' for running VPNs. New ones will only start with 'start' or
'restart'.
! reload|force-reload)
! echo -n "Reloading openvpn:"
! for PIDFILE in `ls /var/run/openvpn.*.pid 2> /dev/null`; do
! NAME=`echo $PIDFILE | cut -c18-`
NAME=${NAME%%.pid}
! # If openvpn if running under a different user than root we'll need to restart
! if egrep '^( |\t)*user' $CONFIG_DIR/$NAME.conf > /dev/null 2>&1 ; then
! stop_vpn
! sleep 1
! start_vpn
! echo -n "(restarted)"
! else
! kill -HUP `cat $PIDFILE` || true
! # start-stop-daemon --stop --signal HUP --quiet --oknodo \
! # --exec $DAEMON --pidfile $PIDFILE
! echo -n " $NAME"
! fi
done
! echo "."
;;
!
restart)
! $0 stop
! sleep 1
! $0 start
;;
*)
! echo "Usage: $0 {start|stop|reload|restart|force-reload}" >&2
exit 1
;;
--- 11,95 ----
DAEMON=/usr/sbin/openvpn
CONFIG_DIR=/etc/openvpn
+ PIDDIR="/var/run"
+
test -x $DAEMON || exit 0
test -d $CONFIG_DIR || exit 0
case "$1" in
start)
! echo -n "Starting openvpn: "
!
for CONFIG in `cd $CONFIG_DIR; ls *.conf 2> /dev/null`; do
NAME=${CONFIG%%.conf}
! echo -n "$NAME "
! $DAEMON --daemon --writepid $PIDDIR/openvpn.$NAME.pid \
! --config $CONFIG_DIR/$NAME.conf --cd $CONFIG_DIR || echo "FAILED "
done
! echo ""
;;
stop)
! echo -n "Stopping openvpn: "
! for PIDFILE in `ls $PIDDIR/openvpn.*.pid 2> /dev/null`; do
! NAME=${PIDFILE##$PIDDIR/openvpn.}
NAME=${NAME%%.pid}
!
! if [ -s $PIDFILE ]; then
! echo -n "$NAME "
! kill `cat $PIDFILE` >/dev/null 2>&1
! fi
! rm -f $PIDFILE
done
! echo ""
;;
! # send SUGHUP to all running instances
! reload)
! echo -n "Reloading openvpn: "
! for PIDFILE in `ls $PIDDIR/openvpn.*.pid 2> /dev/null`; do
! NAME=${PIDFILE##$PIDDIR/openvpn.}
NAME=${NAME%%.pid}
!
! if [ -s $PIDFILE ]; then
! echo -n "$NAME "
! kill -HUP `cat $PIDFILE` >/dev/null 2>&1
! fi
done
! echo ""
;;
! #
restart)
! $0 stop
! sleep 2
! $0 start
;;
+ # send SIGUSR1 to all running instances
+ reopen)
+ echo -n "Reopening openvpn: "
+ for PIDFILE in `ls $PIDDIR/openvpn.*.pid 2> /dev/null`; do
+ if [ -s $PIDFILE ]; then
+ NAME=${PIDFILE##$PIDDIR/openvpn.}
+ NAME=${NAME%%.pid}
+ echo -n "$NAME "
+ kill -USR1 `cat $PIDFILE` >/dev/null 2>&1
+
+ fi
+ done
+ echo ""
+ ;;
+
+ status)
+ echo -n "Writing status to /var/log/daemon.log: "
+ for PIDFILE in `ls $PIDDIR/openvpn.*.pid 2> /dev/null`; do
+ if [ -s $PIDFILE ]; then
+ NAME=${PIDFILE##$PIDDIR/openvpn.}
+ NAME=${NAME%%.pid}
+ echo -n "$NAME "
+ kill -USR2 `cat $PIDFILE` >/dev/null 2>&1
+ fi
+ done
+ echo ""
+ ;;
*)
! echo "Usage: $0 {start|stop|reload|restart|reopen|status}" >&2
exit 1
;;
***************
*** 76,78 ****
exit 0
- # vim:set ai et sts=2 sw=2 tw=0:
--- 98,99 ----
--- NEW FILE: openvpn-2.0.tar.gz ---
(This appears to be a binary file; contents omitted.)
--- openvpn.conf DELETED ---
-------------------------------------------------------
This SF.Net email is sponsored by: NEC IT Guy Games.
Get your fingers limbered up and give it your best shot. 4 great events, 4
opportunities to win big! Highest score wins.NEC IT Guy Games. Play to
win an NEC 61 plasma display. Visit http://www.necitguy.com/?r=20
_______________________________________________
leaf-cvs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/leaf-cvs-commits
