From: Martin Banky <martin.banky@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 19/21] openssl: bump to 1.0.0a
Date: Sat, 18 Sep 2010 19:53:41 -0700 [thread overview]
Message-ID: <1284864823-18993-20-git-send-email-Martin.Banky@gmail.com> (raw)
In-Reply-To: <1284864823-18993-1-git-send-email-Martin.Banky@gmail.com>
Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
---
.../openssl/openssl-1.0.0a-do-not-build-docs.patch | 13 +++++
.../openssl-1.0.0a-dont-force-large-file.patch | 19 +++++++
package/openssl/openssl-1.0.0a-optional-ipv6.patch | 20 +++++++
package/openssl/openssl-do-not-build-docs.patch | 13 -----
.../openssl/openssl-dont-force-large-file.patch | 19 -------
package/openssl/openssl-nofips.patch | 12 ----
package/openssl/openssl-optional-ipv6.patch | 55 --------------------
package/openssl/openssl-uclibc-susv3-legacy.patch | 18 ------
package/openssl/openssl.mk | 7 ++-
9 files changed, 56 insertions(+), 120 deletions(-)
create mode 100644 package/openssl/openssl-1.0.0a-do-not-build-docs.patch
create mode 100644 package/openssl/openssl-1.0.0a-dont-force-large-file.patch
create mode 100644 package/openssl/openssl-1.0.0a-optional-ipv6.patch
delete mode 100644 package/openssl/openssl-do-not-build-docs.patch
delete mode 100644 package/openssl/openssl-dont-force-large-file.patch
delete mode 100644 package/openssl/openssl-nofips.patch
delete mode 100644 package/openssl/openssl-optional-ipv6.patch
delete mode 100644 package/openssl/openssl-uclibc-susv3-legacy.patch
diff --git a/package/openssl/openssl-1.0.0a-do-not-build-docs.patch b/package/openssl/openssl-1.0.0a-do-not-build-docs.patch
new file mode 100644
index 0000000..329efbe
--- /dev/null
+++ b/package/openssl/openssl-1.0.0a-do-not-build-docs.patch
@@ -0,0 +1,13 @@
+Dont waste time building manpages if we're not going to use em.
+
+--- openssl/Makefile.org
++++ openssl/Makefile.org
+@@ -492,7 +492,7 @@
+ dist_pem_h:
+ (cd crypto/pem; $(MAKE) CC='${CC}' SDIRS='${SDIRS}' CFLAG='${CFLAG}' pem.h; $(MAKE) clean)
+
+-install: all install_docs install_sw
++install: all install_sw
+
+ install_sw:
+ @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
diff --git a/package/openssl/openssl-1.0.0a-dont-force-large-file.patch b/package/openssl/openssl-1.0.0a-dont-force-large-file.patch
new file mode 100644
index 0000000..5b04656
--- /dev/null
+++ b/package/openssl/openssl-1.0.0a-dont-force-large-file.patch
@@ -0,0 +1,19 @@
+[patch]: bss_file.c: don't force largefile mode
+---
+ crypto/bio/bss_file.c | 3 ---
+ 1 file changed, 3 deletions(-)
+
+Index: openssl-0.9.8g/crypto/bio/bss_file.c
+===================================================================
+--- openssl-0.9.8g.orig/crypto/bio/bss_file.c
++++ openssl-0.9.8g/crypto/bio/bss_file.c
+@@ -78,9 +78,6 @@
+ * sequential access of large files without extra "magic" comprise *BSD,
+ * Darwin, IRIX...
+ */
+-#ifndef _FILE_OFFSET_BITS
+-#define _FILE_OFFSET_BITS 64
+-#endif
+ #endif
+
+ #include <stdio.h>
diff --git a/package/openssl/openssl-1.0.0a-optional-ipv6.patch b/package/openssl/openssl-1.0.0a-optional-ipv6.patch
new file mode 100644
index 0000000..667d00f
--- /dev/null
+++ b/package/openssl/openssl-1.0.0a-optional-ipv6.patch
@@ -0,0 +1,20 @@
+[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,8 @@
+
+ #include <stdio.h>
+ #include <errno.h>
++#include <features.h>
++
+ #define USE_SOCKETS
+ #include "cryptlib.h"
+
diff --git a/package/openssl/openssl-do-not-build-docs.patch b/package/openssl/openssl-do-not-build-docs.patch
deleted file mode 100644
index 135a9d3..0000000
--- a/package/openssl/openssl-do-not-build-docs.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Dont waste time building manpages if we're not going to use em.
-
---- openssl/Makefile.org
-+++ openssl/Makefile.org
-@@ -792,7 +792,7 @@
- dist_pem_h:
- (cd crypto/pem; $(MAKE) CC='${CC}' SDIRS='${SDIRS}' CFLAG='${CFLAG}' pem.h; $(MAKE) clean)
-
--install: all install_docs install_sw
-+install: all install_sw
-
- install_sw:
- @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
diff --git a/package/openssl/openssl-dont-force-large-file.patch b/package/openssl/openssl-dont-force-large-file.patch
deleted file mode 100644
index 5b04656..0000000
--- a/package/openssl/openssl-dont-force-large-file.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-[patch]: bss_file.c: don't force largefile mode
----
- crypto/bio/bss_file.c | 3 ---
- 1 file changed, 3 deletions(-)
-
-Index: openssl-0.9.8g/crypto/bio/bss_file.c
-===================================================================
---- openssl-0.9.8g.orig/crypto/bio/bss_file.c
-+++ openssl-0.9.8g/crypto/bio/bss_file.c
-@@ -78,9 +78,6 @@
- * sequential access of large files without extra "magic" comprise *BSD,
- * Darwin, IRIX...
- */
--#ifndef _FILE_OFFSET_BITS
--#define _FILE_OFFSET_BITS 64
--#endif
- #endif
-
- #include <stdio.h>
diff --git a/package/openssl/openssl-nofips.patch b/package/openssl/openssl-nofips.patch
deleted file mode 100644
index 0edea3e..0000000
--- a/package/openssl/openssl-nofips.patch
+++ /dev/null
@@ -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
diff --git a/package/openssl/openssl-optional-ipv6.patch b/package/openssl/openssl-optional-ipv6.patch
deleted file mode 100644
index 2876058..0000000
--- a/package/openssl/openssl-optional-ipv6.patch
+++ /dev/null
@@ -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;
diff --git a/package/openssl/openssl-uclibc-susv3-legacy.patch b/package/openssl/openssl-uclibc-susv3-legacy.patch
deleted file mode 100644
index eb1d277..0000000
--- a/package/openssl/openssl-uclibc-susv3-legacy.patch
+++ /dev/null
@@ -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
-
diff --git a/package/openssl/openssl.mk b/package/openssl/openssl.mk
index edbfe8b..123fa40 100644
--- a/package/openssl/openssl.mk
+++ b/package/openssl/openssl.mk
@@ -3,12 +3,13 @@
# openssl
#
#############################################################
-OPENSSL_VERSION:=0.9.8o
-OPENSSL_SITE:=http://www.openssl.org/source
+OPENSSL_VERSION = 1.0.0a
+OPENSSL_SOURCE = openssl-$(OPENSSL_VERSION).tar.gz
+OPENSSL_SITE = http://www.openssl.org/source
OPENSSL_INSTALL_STAGING = YES
OPENSSL_DEPENDENCIES = zlib
-OPENSSL_TARGET_ARCH=generic32
+OPENSSL_TARGET_ARCH = generic32
# Some architectures are optimized in OpenSSL
ifeq ($(ARCH),ia64)
--
1.7.2.3
next prev parent reply other threads:[~2010-09-19 2:53 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-19 2:53 [Buildroot] [PATCH 00/21] Resend package updates patch set Martin Banky
2010-09-19 2:53 ` [Buildroot] [PATCH 01/21] alsa-lib: bump to 1.0.23 Martin Banky
2010-09-19 2:53 ` [Buildroot] [PATCH 02/21] alsa-utils: " Martin Banky
2010-09-19 2:53 ` [Buildroot] [PATCH 03/21] autoconf: bump to 2.67 Martin Banky
2010-09-19 2:53 ` [Buildroot] [PATCH 04/21] automake: bump to 1.11.1 Martin Banky
2010-09-19 2:53 ` [Buildroot] [PATCH 05/21] bison: bump to 2.4.3 Martin Banky
2010-09-19 2:53 ` [Buildroot] [PATCH 06/21] ccache: bump to 3.0.1 Martin Banky
2010-09-19 2:53 ` [Buildroot] [PATCH 07/21] fakeroot: bump to 1.14.4 Martin Banky
2010-09-19 2:53 ` [Buildroot] [PATCH 08/21] genext2fs: bump to 1.4.1 Martin Banky
2010-10-06 11:39 ` Peter Korsgaard
2010-09-19 2:53 ` [Buildroot] [PATCH 09/21] gmp: bump to 5.0.1 Martin Banky
2010-09-19 2:53 ` [Buildroot] [PATCH 10/21] libdeamon: bump to 0.14 Martin Banky
2010-09-19 2:53 ` [Buildroot] [PATCH 12/21] libogg: bump to 1.2.0 Martin Banky
2010-11-05 17:00 ` Thomas Petazzoni
2010-09-19 2:53 ` [Buildroot] [PATCH 13/21] libvorbis: bump to 1.3.1 Martin Banky
2010-11-05 17:01 ` Thomas Petazzoni
2010-09-19 2:53 ` [Buildroot] [PATCH 14/21] make: bump to 3.82 Martin Banky
2010-09-19 2:53 ` [Buildroot] [PATCH 15/21] module-init-tools: bump to 3.12 Martin Banky
2010-09-19 2:53 ` [Buildroot] [PATCH 16/21] mpfr: bump to 3.0.0 Martin Banky
2010-09-19 2:53 ` [Buildroot] [PATCH 17/21] nano: bump to 2.2.5 Martin Banky
2010-10-06 11:34 ` Peter Korsgaard
2010-09-19 2:53 ` [Buildroot] [PATCH 18/21] ntp: convert to autotargets and bump to 4.2.6p2 Martin Banky
2010-09-19 2:53 ` Martin Banky [this message]
2010-09-19 10:05 ` [Buildroot] [PATCH 19/21] openssl: bump to 1.0.0a Marcus Osdoba
2010-09-19 16:51 ` Martin Banky
2010-09-21 23:04 ` Martin Banky
2010-10-08 19:43 ` Marcus Osdoba
2010-09-19 2:53 ` [Buildroot] [PATCH 20/21] BugFix - Bison - Fixed Missing stddef.h Include In wchar.h Martin Banky
2010-09-19 2:53 ` [Buildroot] [PATCH 21/21] BugFix - m4 - Fixed Missing wint_t typedef When There Is No WChar Support Martin Banky
2010-09-19 9:58 ` Marcus Osdoba
2010-09-19 17:05 ` Martin Banky
2010-09-19 2:55 ` [Buildroot] [PATCH 11/21] libelf: bump to 0.8.13 Martin Banky
2010-11-05 16:13 ` Thomas Petazzoni
-- strict thread matches above, loose matches on Subject: below --
2010-09-14 3:40 [Buildroot] [PATCH 01/21] alsa-lib: bump to 1.0.23 Martin Banky
2010-09-14 3:40 ` [Buildroot] [PATCH 19/21] openssl: bump to 1.0.0a Martin Banky
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1284864823-18993-20-git-send-email-Martin.Banky@gmail.com \
--to=martin.banky@gmail.com \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox