NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

openssl: Bump to 1.0.0a

Browse Source 
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
Gustavo Zacarias 2010-10-04 11:44:51 -03:00 committed by Peter Korsgaard
parent fe5945a043
commit 567eee4f54
5 changed files with 16 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@ -38,7 +38,7 @@
lm-sensors, lockfile-progs, logrotate, m4, mdadm, mesa3d,
metacity, mtd-utils, mysql_client, nano, nbd, ncftp, neon,
netperf, netsnmp, ng-spice-rework, ntfsprogs, ntp, openntpd,
openssh, openvpn, oprofile, pango, patch, pcre, php,
openssh, openssl, openvpn, oprofile, pango, patch, pcre, php,
pkg-config, prboom, radvd, rdesktop, ruby, qt, quagga, samba,
sawman, sdl_mixer, sdl_sound, setserial, shared-mime-info,
speex, sqlite, squashfs, startup-notification, strace,

12
package/openssl/openssl-nofips.patch
View File

@ -1,12 +0,0 @@
diff -Nura openssl-0.9.8k/Makefile.org openssl-0.9.8k.nofips/Makefile.org
--- openssl-0.9.8k/Makefile.org 2009-03-03 20:40:29.000000000 -0200
+++ openssl-0.9.8k.nofips/Makefile.org 2009-03-26 09:50:27.000000000 -0300
@@ -131,7 +131,7 @@
BASEADDR=
-DIRS= crypto fips ssl engines apps test tools
+DIRS= crypto ssl engines apps test tools
SHLIBDIRS= crypto ssl fips
# dirs in crypto to build

55
package/openssl/openssl-optional-ipv6.patch
View File

@ -1,55 +0,0 @@
[PATCH] openssl: fix build without IPv6 support
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
crypto/bio/bss_dgram.c | 10 ++++++++++
1 file changed, 10 insertions(+)
Index: openssl-0.9.8n/crypto/bio/bss_dgram.c
===================================================================
--- openssl-0.9.8n.orig/crypto/bio/bss_dgram.c
+++ openssl-0.9.8n/crypto/bio/bss_dgram.c
@@ -61,6 +61,12 @@
#include <stdio.h>
#include <errno.h>
+#include <features.h>
+
+#if defined(__UCLIBC__) && !defined (__UCLIBC_HAS_IPV6__)
+#define NO_IPV6
+#endif
+
#define USE_SOCKETS
#include "cryptlib.h"
@@ -429,12 +435,14 @@ static long dgram_ctrl(BIO *b, int cmd,
&sockopt_val, sizeof(sockopt_val))) < 0)
perror("setsockopt");
break;
+#ifndef NO_IPV6
case AF_INET6:
sockopt_val = IPV6_PMTUDISC_DO;
if ((ret = setsockopt(b->num, IPPROTO_IPV6, IPV6_MTU_DISCOVER,
&sockopt_val, sizeof(sockopt_val))) < 0)
perror("setsockopt");
break;
+#endif
default:
ret = -1;
break;
@@ -470,6 +478,7 @@ static long dgram_ctrl(BIO *b, int cmd,
ret = data->mtu;
}
break;
+#ifndef NO_IPV6
case AF_INET6:
if ((ret = getsockopt(b->num, IPPROTO_IPV6, IPV6_MTU, (void *)&sockopt_val,
&sockopt_len)) < 0 || sockopt_val < 0)
@@ -485,6 +494,7 @@ static long dgram_ctrl(BIO *b, int cmd,
ret = data->mtu;
}
break;
+#endif
default:
ret = 0;
break;

18
package/openssl/openssl-uclibc-susv3-legacy.patch
View File

@ -1,18 +0,0 @@
sys/timeb.h / ftime are legacy, so don't enable them for uClibc
---
apps/speed.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: openssl-0.9.8g/apps/speed.c
===================================================================
--- openssl-0.9.8g.orig/apps/speed.c
+++ openssl-0.9.8g/apps/speed.c
@@ -113,7 +113,7 @@
#elif !defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_VXWORKS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC))
# define TIMES
#endif
-#if !defined(_UNICOS) && !defined(__OpenBSD__) && !defined(sgi) && !defined(__FreeBSD__) && !(defined(__bsdi) || defined(__bsdi__)) && !defined(_AIX) && !defined(OPENSSL_SYS_MPE) && !defined(__NetBSD__) && !defined(OPENSSL_SYS_VXWORKS) /* FIXME */
+#if !defined(_UNICOS) && !defined(__OpenBSD__) && !defined(sgi) && !defined(__FreeBSD__) && !(defined(__bsdi) || defined(__bsdi__)) && !defined(_AIX) && !defined(OPENSSL_SYS_MPE) && !defined(__NetBSD__) && !defined(OPENSSL_SYS_VXWORKS) && !defined(__UCLIBC__) /* FIXME */
# define TIMEB
#endif

15
package/openssl/openssl.mk
View File

@ -3,14 +3,23 @@
# openssl
#
#############################################################
OPENSSL_VERSION:=0.9.8o
OPENSSL_SITE:=http://www.openssl.org/source
OPENSSL_VERSION = 1.0.0a
OPENSSL_SITE = http://www.openssl.org/source
OPENSSL_INSTALL_STAGING = YES
OPENSSL_DEPENDENCIES = zlib
OPENSSL_TARGET_ARCH = generic32
# Some architectures are optimized in OpenSSL
ifeq ($(ARCH),arm)
ifneq ($(BR2_generic_arm),y)
ifneq ($(BR2_arm610),y)
ifneq ($(BR2_arm710),y)
OPENSSL_TARGET_ARCH = armv4
endif
endif
endif
endif
ifeq ($(ARCH),powerpc)
OPENSSL_TARGET_ARCH = ppc
endif