aboutsummaryrefslogtreecommitdiff
path: root/package/openssl
diff options
context:
space:
mode:
authorGravatar Peter Korsgaard <peter@korsgaard.com>2014-12-01 11:15:54 +0100
committerGravatar Peter Korsgaard <peter@korsgaard.com>2014-12-01 11:16:42 +0100
commitfe1b2ef1d3236ffd36e0ec033566d45fcd9ba3fb (patch)
treefd6edbe93b19b167b105897e3de6a7c11eac4f9c /package/openssl
parent9a5434fbfc98a0c427c880b167b8ca3499b44e87 (diff)
parent9b47f40bb29d9be34afabfb423bab0ad45cbc11f (diff)
downloadbuildroot-fe1b2ef1d3236ffd36e0ec033566d45fcd9ba3fb.tar.gz
buildroot-fe1b2ef1d3236ffd36e0ec033566d45fcd9ba3fb.tar.bz2
Merge branch 'next'
Conflicts: Makefile package/flac/0001-fix-altivec-logic.patch package/grantlee/Config.in Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/openssl')
-rw-r--r--package/openssl/001-do-not-build-docs.patch (renamed from package/openssl/openssl-001-do-not-build-docs.patch)0
-rw-r--r--package/openssl/002-dont-force-large-file.patch (renamed from package/openssl/openssl-002-dont-force-large-file.patch)0
-rw-r--r--package/openssl/003-cryptodev-Fix-issue-with-signature-generation.patch (renamed from package/openssl/openssl-003-cryptodev-Fix-issue-with-signature-generation.patch)0
-rw-r--r--package/openssl/004-musl-termios.patch (renamed from package/openssl/openssl-004-musl-termios.patch)0
4 files changed, 0 insertions, 0 deletions
diff --git a/package/openssl/openssl-001-do-not-build-docs.patch b/package/openssl/001-do-not-build-docs.patch
index 135a9d3b04..135a9d3b04 100644
--- a/package/openssl/openssl-001-do-not-build-docs.patch
+++ b/package/openssl/001-do-not-build-docs.patch
diff --git a/package/openssl/openssl-002-dont-force-large-file.patch b/package/openssl/002-dont-force-large-file.patch
index 5b04656ff5..5b04656ff5 100644
--- a/package/openssl/openssl-002-dont-force-large-file.patch
+++ b/package/openssl/002-dont-force-large-file.patch
diff --git a/package/openssl/openssl-003-cryptodev-Fix-issue-with-signature-generation.patch b/package/openssl/003-cryptodev-Fix-issue-with-signature-generation.patch
index a95ba04916..a95ba04916 100644
--- a/package/openssl/openssl-003-cryptodev-Fix-issue-with-signature-generation.patch
+++ b/package/openssl/003-cryptodev-Fix-issue-with-signature-generation.patch
diff --git a/package/openssl/openssl-004-musl-termios.patch b/package/openssl/004-musl-termios.patch
index 66631d1129..66631d1129 100644
--- a/package/openssl/openssl-004-musl-termios.patch
+++ b/package/openssl/004-musl-termios.patch