Update of /cvsroot/leaf/src/bering-uclibc/apps/openssl
In directory sc8-pr-cvs1:/tmp/cvs-serv17345/openssl
Modified Files:
buildtool.cfg buildtool.mk
Log Message:
Updated to OpenSSL 0.9.7c
Index: buildtool.cfg
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc/apps/openssl/buildtool.cfg,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** buildtool.cfg 13 Sep 2003 12:56:15 -0000 1.6
--- buildtool.cfg 30 Sep 2003 15:18:11 -0000 1.7
***************
*** 17,21 ****
</File>
! <File openssl-0.9.7b.tar.gz>
Server = openssl
envname = OPENSSL_SOURCE
--- 17,21 ----
</File>
! <File openssl-0.9.7c.tar.gz>
Server = openssl
envname = OPENSSL_SOURCE
***************
*** 25,30 ****
<libssl>
! Version = 0.9.7b
! Revision = 2
Help <<EOF
--- 25,30 ----
<libssl>
! Version = 0.9.7c
! Revision = 1
Help <<EOF
***************
*** 84,89 ****
<libcrpto>
! Version = 0.9.7b
! Revision = 2
Help <<EOF
--- 84,89 ----
<libcrpto>
! Version = 0.9.7c
! Revision = 1
Help <<EOF
***************
*** 145,155 ****
<openssl>
! Version = 0.9.7b
Revision = 1
Help <<EOF
Openssl binaries
- Requires libssl.lrp and libcrpto.lrp
See http://www.openssl.org
LRP package by __PACKAGER__, __BUILDDATE__
EOF
--- 145,155 ----
<openssl>
! Version = 0.9.7c
Revision = 1
Help <<EOF
Openssl binaries
See http://www.openssl.org
+ Requires: libssl.lrp, libcrpto.lrp
LRP package by __PACKAGER__, __BUILDDATE__
EOF
***************
*** 238,242 ****
<File>
! Filename = usr/ssl/openssl.conf
Target = etc/ssl/openssl.cnf
Type = link
--- 238,242 ----
<File>
! Filename = usr/ssl/openssl.cnf
Target = etc/ssl/openssl.cnf
Type = link
Index: buildtool.mk
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc/apps/openssl/buildtool.mk,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** buildtool.mk 14 Sep 2003 18:44:01 -0000 1.3
--- buildtool.mk 30 Sep 2003 15:18:11 -0000 1.4
***************
*** 7,11 ****
include $(MASTERMAKEFILE)
! OPENSSL_DIR:=openssl-0.9.7b
OPENSSL_TARGET_DIR:=$(BT_BUILD_DIR)/openssl
--- 7,11 ----
include $(MASTERMAKEFILE)
! OPENSSL_DIR:=openssl-0.9.7c
OPENSSL_TARGET_DIR:=$(BT_BUILD_DIR)/openssl
***************
*** 19,35 ****
build:
-mkdir $(OPENSSL_TARGET_DIR)
(cd $(OPENSSL_DIR); \
! ./Configure linux-elf --prefix=$(OPENSSL_TARGET_DIR) \
! --openssldir=$(OPENSSL_TARGET_DIR) -L$(BT_STAGING_DIR)/lib -ldl \
386 no-threads shared no-asm no-ssl3 no-tls1 no-hw )
perl -i -p -e 's,-m486,-march=i486,' $(OPENSSL_DIR)/Makefile
perl -i -p -e 's,-O3,-Os,' $(OPENSSL_DIR)/Makefile
make CC=$(TARGET_CC) -C $(OPENSSL_DIR) depend
make CC=$(TARGET_CC) -C $(OPENSSL_DIR)
make CC=$(TARGET_CC) -C $(OPENSSL_DIR) install
! $(BT_STRIP) --strip-unneeded $(OPENSSL_TARGET_DIR)/bin/openssl
! $(BT_STRIP) --strip-unneeded $(OPENSSL_TARGET_DIR)/lib/libcrypto.so*
! $(BT_STRIP) --strip-unneeded $(OPENSSL_TARGET_DIR)/lib/libssl.so*
-mkdir -p $(BT_STAGING_DIR)/usr/
-mkdir -p $(BT_STAGING_DIR)/usr/share
--- 19,38 ----
build:
+ #--prefix=$(OPENSSL_TARGET_DIR)
+ #--openssldir=$(OPENSSL_TARGET_DIR)
-mkdir $(OPENSSL_TARGET_DIR)
(cd $(OPENSSL_DIR); \
! ./Configure linux-elf --prefix=/usr \
! -L$(BT_STAGING_DIR)/lib -ldl \
386 no-threads shared no-asm no-ssl3 no-tls1 no-hw )
perl -i -p -e 's,-m486,-march=i486,' $(OPENSSL_DIR)/Makefile
perl -i -p -e 's,-O3,-Os,' $(OPENSSL_DIR)/Makefile
+ perl -i -p -e
's,^\s*INSTALL_PREFIX\s*=.*,INSTALL_PREFIX=$(OPENSSL_TARGET_DIR),'
$(OPENSSL_DIR)/Makefile
make CC=$(TARGET_CC) -C $(OPENSSL_DIR) depend
make CC=$(TARGET_CC) -C $(OPENSSL_DIR)
make CC=$(TARGET_CC) -C $(OPENSSL_DIR) install
! $(BT_STRIP) -s --remove-section=.note --remove-section=.comment
$(OPENSSL_TARGET_DIR)/usr/bin/openssl
! $(BT_STRIP) --strip-unneeded $(OPENSSL_TARGET_DIR)/usr/lib/libcrypto.so*
! $(BT_STRIP) --strip-unneeded $(OPENSSL_TARGET_DIR)/usr/lib/libssl.so*
-mkdir -p $(BT_STAGING_DIR)/usr/
-mkdir -p $(BT_STAGING_DIR)/usr/share
***************
*** 40,49 ****
-mkdir -p $(BT_STAGING_DIR)/usr/ssl
-mkdir -p $(BT_STAGING_DIR)/usr/ssl/misc
! cp -f $(OPENSSL_TARGET_DIR)/bin/openssl $(BT_STAGING_DIR)/usr/bin/
! cp -f $(OPENSSL_TARGET_DIR)/bin/c_rehash $(BT_STAGING_DIR)/usr/bin/
! cp -f $(OPENSSL_TARGET_DIR)/lib/lib* $(BT_STAGING_DIR)/lib/
! cp -a -f $(OPENSSL_TARGET_DIR)/include/* $(BT_STAGING_DIR)/include/
! cp -a -f $(OPENSSL_TARGET_DIR)/misc/* $(BT_STAGING_DIR)/usr/ssl/misc/
! cp -f $(OPENSSL_TARGET_DIR)/openssl.cnf $(BT_STAGING_DIR)/etc/ssl/
clean:
--- 43,52 ----
-mkdir -p $(BT_STAGING_DIR)/usr/ssl
-mkdir -p $(BT_STAGING_DIR)/usr/ssl/misc
! cp -f $(OPENSSL_TARGET_DIR)/usr/bin/openssl $(BT_STAGING_DIR)/usr/bin/
! cp -f $(OPENSSL_TARGET_DIR)/usr/bin/c_rehash $(BT_STAGING_DIR)/usr/bin/
! cp -f $(OPENSSL_TARGET_DIR)/usr/lib/lib* $(BT_STAGING_DIR)/lib/
! cp -a -f $(OPENSSL_TARGET_DIR)/usr/include/* $(BT_STAGING_DIR)/include/
! cp -a -f $(OPENSSL_TARGET_DIR)/usr/ssl/misc/* $(BT_STAGING_DIR)/usr/ssl/misc/
! cp -f $(OPENSSL_TARGET_DIR)/usr/ssl/openssl.cnf $(BT_STAGING_DIR)/etc/ssl/
clean:
***************
*** 54,55 ****
--- 57,65 ----
$(MAKE) -C $(OPENSSL_DIR) clean
+
+ srcclean:
+ rm -f $(BT_STAGING_DIR)/bin/openssl
+ rm -f $(BT_STAGING_DIR)/lib/libcrypto.so*
+ rm -f $(BT_STAGING_DIR)/lib/libssl.so*
+ rm -rf $(OPENSSL_BUILD_DIR)
+ rm -rf $(OPENSSL_DIR)
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
Leaf-cvs-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/leaf-cvs-commits
