mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2025-04-21 12:27:27 +03:00
bring up to date with nbd's br2_test20.tar.bz2
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@308 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
mbm
7
package/matrixssl/Config.in
Normal file
7
package/matrixssl/Config.in
Normal file
@@ -0,0 +1,7 @@
|
||||
config BR2_PACKAGE_MATRIXSSL
|
||||
tristate "matrixssl"
|
||||
default m
|
||||
help
|
||||
an embedded SSL implementation
|
||||
|
||||
http://www.matrixssl.org/
|
||||
54
package/matrixssl/Makefile
Normal file
54
package/matrixssl/Makefile
Normal file
@@ -0,0 +1,54 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME := matrixssl
|
||||
PKG_VERSION := 1.2.4
|
||||
PKG_RELEASE := 1
|
||||
|
||||
PKG_SOURCE_SITE := http://nbd.vd-s.ath.cx/openwrt
|
||||
PKG_SOURCE_FILE := $(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||
PKG_SOURCE_CAT := zcat
|
||||
PKG_SOURCE_DIR := $(PKG_NAME)
|
||||
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_SOURCE_DIR)
|
||||
PKG_IPK := $(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
|
||||
|
||||
|
||||
$(DL_DIR)/$(PKG_SOURCE_FILE):
|
||||
mkdir -p $(DL_DIR)
|
||||
$(WGET) -P $(DL_DIR) $(PKG_SOURCE_SITE)/$(PKG_SOURCE_FILE)
|
||||
|
||||
$(PKG_BUILD_DIR)/.patched: $(DL_DIR)/$(PKG_SOURCE_FILE)
|
||||
mkdir -p $(TOOL_BUILD_DIR)
|
||||
$(PKG_SOURCE_CAT) $(DL_DIR)/$(PKG_SOURCE_FILE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
|
||||
$(PATCH) $(PKG_BUILD_DIR) ./patches
|
||||
touch $(PKG_BUILD_DIR)/.patched
|
||||
|
||||
$(PKG_BUILD_DIR)/src/libmatrixssl.so: $(PKG_BUILD_DIR)/.patched
|
||||
$(MAKE) -C $(PKG_BUILD_DIR)/src \
|
||||
$(TARGET_CONFIGURE_OPTS) \
|
||||
DFLAGS="$(TARGET_CFLAGS) -Wall"
|
||||
|
||||
$(STAGING_DIR)/lib/libmatrixssl.so: $(PKG_BUILD_DIR)/src/libmatrixssl.so
|
||||
cp -a $(PKG_BUILD_DIR)/src/libmatrixssl.so* $(STAGING_DIR)/lib
|
||||
mkdir -p $(STAGING_DIR)/include/matrixSsl
|
||||
cp $(PKG_BUILD_DIR)/matrixSsl.h $(STAGING_DIR)/include/matrixSsl
|
||||
ln -sf matrixSsl/matrixSsl.h $(STAGING_DIR)/include/matrixSsl.h
|
||||
|
||||
$(PKG_IPK): $(STAGING_DIR)/lib/libmatrixssl.so
|
||||
mkdir -p $(PACKAGE_DIR)
|
||||
$(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_BUILD_DIR)/ipkg/matrixssl matrixssl.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
|
||||
mkdir -p $(PKG_BUILD_DIR)/ipkg/matrixssl/usr/lib
|
||||
cp -a $(PKG_BUILD_DIR)/src/libmatrixssl.so* $(PKG_BUILD_DIR)/ipkg/matrixssl/usr/lib
|
||||
$(STRIP) $(PKG_BUILD_DIR)/ipkg/matrixssl/usr/lib/*
|
||||
$(IPKG_BUILD) $(PKG_BUILD_DIR)/ipkg/matrixssl $(PACKAGE_DIR)
|
||||
|
||||
|
||||
source: $(DL_DIR)/$(PKG_SOURCE_FILE)
|
||||
prepare: $(PKG_BUILD_DIR)/.patched
|
||||
compile: $(STAGING_DIR)/lib/libmatrixssl.so $(PKG_IPK)
|
||||
install: $(PKG_ZLIB)
|
||||
$(IPKG) install $(PACKAGE_DIR)/$(PKG_IPK)
|
||||
clean:
|
||||
rm -rf $(PKG_BUILD_DIR)
|
||||
rm -f $(STAGING_DIR)/lib/libmatrixssl* $(STAGING_DIR)/include/matrixssl*
|
||||
rm -f $(PACKAGE_DIR)/matrixssl\*.ipk
|
||||
|
||||
8
package/matrixssl/matrixssl.control
Normal file
8
package/matrixssl/matrixssl.control
Normal file
@@ -0,0 +1,8 @@
|
||||
Package: libmatrixssl
|
||||
Priority: optional
|
||||
Section: libs
|
||||
Version: 1.2.4-1
|
||||
Architecture: mipsel
|
||||
Maintainer: Felix Fietkau <nbd@vd-s.ath.cx>
|
||||
Source: buildroot internal
|
||||
Description: an embedded SSL implementation
|
||||
80
package/matrixssl/matrixssl.mk
Normal file
80
package/matrixssl/matrixssl.mk
Normal file
@@ -0,0 +1,80 @@
|
||||
## matrixssl
|
||||
|
||||
MATRIXSSL_VERSION := 1.2.1
|
||||
MATRIXSSL_RELEASE := 1
|
||||
|
||||
MATRIXSSL_SOURCE := matrixssl-1-2-1.tar.gz
|
||||
#MATRIXSSL_SITE := http://www.matrixssl.org/
|
||||
MATRIXSSL_SITE := http://nthill.free.fr/openwrt/sources/
|
||||
MATRIXSSL_DIR := $(BUILD_DIR)/matrixssl
|
||||
MATRIXSSL_CAT := zcat
|
||||
|
||||
MATRIXSSL_PATCH_DIR := $(SOURCE_DIR)/openwrt/patches/matrixssl
|
||||
|
||||
MATRIXSSL_BUILD_DIR := $(BUILD_DIR)/libmatrixssl_$(MATRIXSSL_VERSION)-$(MATRIXSSL_RELEASE)
|
||||
MATRIXSSL_IPK_DIR := $(OPENWRT_IPK_DIR)/libmatrixssl
|
||||
MATRIXSSL_IPK := $(MATRIXSSL_BUILD_DIR)_$(ARCH).ipk
|
||||
|
||||
|
||||
$(DL_DIR)/$(MATRIXSSL_SOURCE):
|
||||
$(WGET) -P $(DL_DIR) $(MATRIXSSL_SITE)/$(MATRIXSSL_SOURCE)
|
||||
|
||||
|
||||
$(MATRIXSSL_DIR)/.stamp-unpacked: $(DL_DIR)/$(MATRIXSSL_SOURCE)
|
||||
$(MATRIXSSL_CAT) $(DL_DIR)/$(MATRIXSSL_SOURCE) | tar -C $(BUILD_DIR) -xvf -
|
||||
|
||||
touch $(MATRIXSSL_DIR)/.stamp-unpacked
|
||||
|
||||
|
||||
$(MATRIXSSL_DIR)/.stamp-patched: $(MATRIXSSL_DIR)/.stamp-unpacked
|
||||
$(SOURCE_DIR)/patch-kernel.sh $(MATRIXSSL_DIR) $(MATRIXSSL_PATCH_DIR)
|
||||
|
||||
touch $(MATRIXSSL_DIR)/.stamp-patched
|
||||
|
||||
|
||||
$(MATRIXSSL_DIR)/.stamp-built: $(MATRIXSSL_DIR)/.stamp-patched
|
||||
cd $(MATRIXSSL_DIR) ; \
|
||||
$(MAKE) -C src \
|
||||
CC=$(TARGET_CC) \
|
||||
DFLAGS="$(TARGET_CFLAGS)" \
|
||||
STRIP=/bin/true \
|
||||
all
|
||||
|
||||
touch $(MATRIXSSL_DIR)/.stamp-built
|
||||
|
||||
|
||||
$(MATRIXSSL_BUILD_DIR): $(MATRIXSSL_DIR)/.stamp-built
|
||||
mkdir -p $(MATRIXSSL_BUILD_DIR)
|
||||
|
||||
install -m0755 -d $(STAGING_DIR)/include/matrixSsl
|
||||
install -m0644 $(MATRIXSSL_DIR)/matrixSsl.h $(STAGING_DIR)/include/matrixSsl/
|
||||
ln -fs matrixSsl/matrixSsl.h $(STAGING_DIR)/include/
|
||||
install -m0755 $(MATRIXSSL_DIR)/src/libmatrixssl.so $(STAGING_DIR)/lib/libmatrixssl.so.$(MATRIXSSL_VERSION)
|
||||
ln -fs libmatrixssl.so.$(MATRIXSSL_VERSION) $(STAGING_DIR)/lib/libmatrixssl.so.1.2
|
||||
ln -fs libmatrixssl.so.1.2 $(STAGING_DIR)/lib/libmatrixssl.so
|
||||
|
||||
mkdir -p $(MATRIXSSL_BUILD_DIR)/usr/lib
|
||||
cp -a $(STAGING_DIR)/lib/libmatrixssl.so.* $(MATRIXSSL_BUILD_DIR)/usr/lib/
|
||||
|
||||
$(STRIP) $(MATRIXSSL_BUILD_DIR)/usr/lib/libmatrixssl.so.*
|
||||
|
||||
|
||||
$(MATRIXSSL_IPK): $(MATRIXSSL_BUILD_DIR)
|
||||
cp -a $(MATRIXSSL_IPK_DIR)/CONTROL $(MATRIXSSL_BUILD_DIR)/
|
||||
perl -pi -e "s/^Vers.*:.*$$/Version: $(MATRIXSSL_VERSION)-$(MATRIXSSL_RELEASE)/" $(MATRIXSSL_BUILD_DIR)/CONTROL/control
|
||||
perl -pi -e "s/^Arch.*:.*$$/Architecture: $(ARCH)/" $(MATRIXSSL_BUILD_DIR)/CONTROL/control
|
||||
cd $(BUILD_DIR); $(IPKG_BUILD) $(MATRIXSSL_BUILD_DIR)
|
||||
|
||||
|
||||
matrixssl-ipk: ipkg-utils libpthread-ipk $(MATRIXSSL_IPK)
|
||||
|
||||
matrixssl-clean:
|
||||
$(MAKE) -C $(MATRIXSSL_DIR) clean
|
||||
|
||||
matrixssl-clean-all:
|
||||
rm -rf $(MATRIXSSL_DIR)
|
||||
rm -rf $(MATRIXSSL_BUILD_DIR)
|
||||
rm -rf $(MATRIXSSL_IPK)
|
||||
rm -rf $(STAGING_DIR)/include/pcap*.h
|
||||
rm -rf $(STAGING_DIR)/lib/libpcap.a
|
||||
rm -rf $(STAGING_DIR)/lib/libpcap.so*
|
||||
1971
package/matrixssl/patches/matrixssl-1.2.4.diff
Normal file
1971
package/matrixssl/patches/matrixssl-1.2.4.diff
Normal file
File diff suppressed because it is too large
Load Diff
12
package/matrixssl/patches/matrixssl-typefix.patch
Normal file
12
package/matrixssl/patches/matrixssl-typefix.patch
Normal file
@@ -0,0 +1,12 @@
|
||||
diff -urN matrixssl.old/src/os/linux/linux.c matrixssl/src/os/linux/linux.c
|
||||
--- matrixssl.old/src/os/linux/linux.c 2005-02-23 22:43:10.000000000 +0100
|
||||
+++ matrixssl/src/os/linux/linux.c 2005-03-06 01:52:51.000000000 +0100
|
||||
@@ -51,7 +51,7 @@
|
||||
static sslTime_t hiresStart; /* zero-time */
|
||||
static sslTime_t hiresFreq; /* tics per second */
|
||||
#else /* __i386__ */
|
||||
-static unsigned int32 prevTicks; /* Check wrap */
|
||||
+static uint32 prevTicks; /* Check wrap */
|
||||
static sslTime_t elapsedTime; /* Last elapsed time */
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user