Update of /cvsroot/leaf/src/bering-uclibc/apps/openvpn20
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25810
Modified Files:
buildtool.cfg buildtool.mk
Log Message:
reduced the no. of packages: with and without lzo compression
Index: buildtool.cfg
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc/apps/openvpn20/buildtool.cfg,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** buildtool.cfg 25 Apr 2005 20:01:42 -0000 1.13
--- buildtool.cfg 27 Apr 2005 05:15:13 -0000 1.14
***************
*** 1,2 ****
--- 1,8 ----
+ <File buildtool.mk>
+ Server = cvs-sourceforge
+ directory = openvpn20
+ revision = HEAD
+ </File>
+
<File openvpn-2.0.tar.gz>
Server = cvs-sourceforge
***************
*** 5,13 ****
revision = HEAD
</File>
- <File buildtool.mk>
- Server = cvs-sourceforge
- directory = openvpn20
- revision = HEAD
- </File>
<File openvpn>
--- 11,14 ----
***************
*** 79,146 ****
</Contents>
</ovpn20>
- <ovpn20_small>
- Version = 2.0
- Revision = 1
- Packagename=ovpn20
-
- 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
- the OpenVPN docs, and the correct iproute2 commands
will be generated.
- To save space, this version comes without support for
Socks, HTTP proxy,
- management server and plugins.
- See: http://www.openvpn.net
- Requires: libcrpto.lrp libssl.lrp
- LEAF package by __PACKAGER__, __BUILDDATE__
- EOF
-
- <Permissions>
- Files = 644
- Directories = 755
- </Permissions>
-
- <Owner>
- Files = root:root
- Directories = root:root
- </Owner>
-
- <Contents>
- <File>
- Filename = etc/openvpn
- Type = list
- </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_small
- Type = binary
- Permissions = 755
- </File>
- <File>
- Filename = etc/init.d/openvpn
- Source = etc/init.d/openvpn20
- Type = binary
- Permissions = 755
- </File>
-
- </Contents>
- </ovpn20_small>
<ovpn20z>
Version = 2.0
--- 80,84 ----
***************
*** 205,274 ****
</ovpn20z>
- <ovpn20z_small>
- Version = 2.0
- Revision = 1
- Packagename=ovpn20z
-
-
- 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
- the OpenVPN docs, and the correct iproute2 commands
will be generated.
- To save space, this version comes without support for
Socks, HTTP proxy,
- management server and plugins.
- See: http://www.openvpn.net
- Requires: libcrpto.lrp libssl.lrp liblzo.lrp
- LEAF package by __PACKAGER__, __BUILDDATE__
- EOF
-
- <Permissions>
- Files = 644
- Directories = 755
- </Permissions>
-
- <Owner>
- Files = root:root
- Directories = root:root
- </Owner>
-
- <Contents>
- <File>
- Filename = etc/openvpn
- Type = list
- </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_small
- Type = binary
- Permissions = 755
- </File>
- <File>
- Filename = etc/init.d/openvpn
- Source = etc/init.d/openvpn20
- Type = binary
- Permissions = 755
- </File>
- </Contents>
- </ovpn20z_small>
-
<easyrsa>
Version = 2.0
--- 143,146 ----
Index: buildtool.mk
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc/apps/openvpn20/buildtool.mk,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** buildtool.mk 22 Apr 2005 18:30:08 -0000 1.12
--- buildtool.mk 27 Apr 2005 05:15:13 -0000 1.13
***************
*** 65,70 ****
--disable-pthread \
--prefix=/usr \
! --enable-small \
--disable-debug \
--libdir=$(BT_STAGING_DIR)/lib );
--- 65,72 ----
--disable-pthread \
--prefix=/usr \
! --disable-socks \
! --disable-http \
--disable-debug \
+ --enable-small \
--libdir=$(BT_STAGING_DIR)/lib );
***************
*** 100,137 ****
mv $(OPENVPN_TARGET_DIR)/usr/sbin/openvpn
$(OPENVPN_TARGET_DIR)/usr/sbin/openvpn20
- make CC=$(TARGET_CC) -C $(OPENVPN_DIR) clean
-
- # build a more compact version without 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 \
- --enable-iproute2 \
- --with-iproute-path=/sbin/ip \
- --includedir=$(BT_STAGING_DIR)/include \
- --disable-lzo \
- --disable-pthread \
- --prefix=/usr \
- --disable-socks \
- --disable-http \
- --disable-debug \
- --enable-small \
- --disable-management \
- --disable-plugins \
- --disable-tls \
- --libdir=$(BT_STAGING_DIR)/lib );
-
- make CC=$(TARGET_CC) -C $(OPENVPN_DIR)
- $(BT_STRIP) $(STRIP_OPTIONS) $(OPENVPN_DIR)/openvpn
- cp $(OPENVPN_DIR)/openvpn
$(OPENVPN_TARGET_DIR)/usr/sbin/openvpn20_small
- rm $(OPENVPN_DIR)/openvpn
-
# copy everything to the staging dir
cp $(OPENVPN_TARGET_DIR)/etc/openvpn/server.conf20
$(BT_STAGING_DIR)/etc/openvpn/
--- 102,105 ----
***************
*** 146,150 ****
# Build a version with lzo support
(cd $(OPENVPN_DIR); \
! CFLAGS="-Os -march=i486" \
CC=$(TARGET_CC) \
LD=$(TARGET_LD) \
--- 114,119 ----
# Build a version with lzo support
(cd $(OPENVPN_DIR); \
! rm -rf config.cache; \
! CFLAGS="$(BT_COPT_FLAGS)" \
CC=$(TARGET_CC) \
LD=$(TARGET_LD) \
***************
*** 161,168 ****
--disable-pthread \
--prefix=/usr \
--disable-debug \
! --enable-small \
--libdir=$(BT_STAGING_DIR)/lib );
!
make CC=$(TARGET_CC) -C $(OPENVPN_DIR)
$(BT_STRIP) $(STRIP_OPTIONS) $(OPENVPN_DIR)/openvpn
--- 130,139 ----
--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
***************
*** 177,215 ****
- # clean up for the next round
- make CC=$(TARGET_CC) -C $(OPENVPN_DIR) clean
-
- # Build a smaller version with lzo support
- (cd $(OPENVPN_DIR); \
- CFLAGS="-Os -march=i486" \
- 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 \
- --enable-iproute2 \
- --with-iproute-path=/sbin/ip \
-
--with-lzo-headers=$(BT_STAGING_DIR)/usr/include \
- --with-lzo-lib=$(BT_STAGING_DIR)/usr/lib \
- --includedir=$(BT_STAGING_DIR)/include \
- --disable-pthread \
- --prefix=/usr \
- --disable-socks \
- --disable-http \
- --disable-debug \
- --enable-small \
- --disable-management \
- --disable-plugins \
- --disable-tls \
- --libdir=$(BT_STAGING_DIR)/lib );
-
- make CC=$(TARGET_CC) -C $(OPENVPN_DIR)
- $(BT_STRIP) $(STRIP_OPTIONS) $(OPENVPN_DIR)/openvpn
-
- cp $(OPENVPN_DIR)/openvpn
$(OPENVPNLZO_TARGET_DIR)/usr/sbin/openvpn_lzo20_small
- rm $(OPENVPN_DIR)/openvpn
-
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
--- 148,151 ----
-------------------------------------------------------
SF.Net email is sponsored by: Tell us your software development plans!
Take this survey and enter to win a one-year sub to SourceForge.net
Plus IDC's 2005 look-ahead and a copy of this survey
Click here to start! http://www.idcswdc.com/cgi-bin/survey?id=105hix
_______________________________________________
leaf-cvs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/leaf-cvs-commits
