Remove old mason

This commit is contained in:
Patrick Niklaus
2016-12-15 09:39:46 +00:00
parent 38b2ad298d
commit 708ac04562
733 changed files with 0 additions and 30715 deletions
@@ -1,27 +0,0 @@
language: cpp
sudo: false
matrix:
include:
- os: osx
compiler: clang
- os: linux
compiler: clang
- os: linux
env: MASON_PLATFORM=android MASON_ANDROID_ARCH=arm
- os: linux
env: MASON_PLATFORM=android MASON_ANDROID_ARCH=x86
env:
global:
- secure: "clCFM3prHnDocZ8lXlimPxAogvFirD1Zx8cMcFJ/XpkTA/0pCgnhpArM4y/NzLHR57pNZTSCr3p6XZI1c1iTG4Zm8x0sK2A4aTFRahypXNy/e+LzAbtd1y1+dEEDwlJvNNGxizQX4frhOgSNQFDFnWLtmF3stlft5YWyc2kI+FI="
- secure: "jKJErCng8Sk8YJ0IN2FX3lhv7G1LeudMfFBAXViZaXn8w/gWPs+SlfXQmIJ5SruU7U2GQKnAhzbjwXjVAgAh8OAblzny0DDm5Lh5WmwkgAP8JH1LpsBwCYx2S/v8qyR4DX1RVhHS8mQu298180ZDVgGccw+hd8xrE/S5TEQcNfQ="
before_install:
script:
- ./mason build ${MASON_NAME} ${MASON_VERSION}
after_success:
- ./mason publish ${MASON_NAME} ${MASON_VERSION}
@@ -1,187 +0,0 @@
--- openssl.orig.c 2014-09-04 01:22:36.000000000 +1200
+++ openssl.c 2015-01-04 11:26:39.827435900 +1300
@@ -92,15 +92,6 @@
#undef HAVE_USERDATA_IN_PWD_CALLBACK
#endif
-#if OPENSSL_VERSION_NUMBER >= 0x00907001L
-/* ENGINE_load_private_key() takes four arguments */
-#define HAVE_ENGINE_LOAD_FOUR_ARGS
-#include <openssl/ui.h>
-#else
-/* ENGINE_load_private_key() takes three arguments */
-#undef HAVE_ENGINE_LOAD_FOUR_ARGS
-#endif
-
#if (OPENSSL_VERSION_NUMBER >= 0x00903001L) && defined(HAVE_OPENSSL_PKCS12_H)
/* OpenSSL has PKCS 12 support */
#define HAVE_PKCS12_SUPPORT
@@ -135,6 +126,9 @@
#define OPENSSL_NO_SSL2
#endif
+#undef HAVE_OPENSSL_ENGINE_H
+#define SSLEAY_VERSION_NUMBER OPENSSL_VERSION_NUMBER
+
/*
* Number of bytes to read from the random number seed file. This must be
* a finite value (because some entropy "files" like /dev/urandom have
@@ -168,108 +162,8 @@
return 0;
}
-/*
- * rand_enough() is a function that returns TRUE if we have seeded the random
- * engine properly. We use some preprocessor magic to provide a seed_enough()
- * macro to use, just to prevent a compiler warning on this function if we
- * pass in an argument that is never used.
- */
-
-#ifdef HAVE_RAND_STATUS
-#define seed_enough(x) rand_enough()
-static bool rand_enough(void)
-{
- return (0 != RAND_status()) ? TRUE : FALSE;
-}
-#else
-#define seed_enough(x) rand_enough(x)
-static bool rand_enough(int nread)
-{
- /* this is a very silly decision to make */
- return (nread > 500) ? TRUE : FALSE;
-}
-#endif
-
-static int ossl_seed(struct SessionHandle *data)
-{
- char *buf = data->state.buffer; /* point to the big buffer */
- int nread=0;
-
- /* Q: should we add support for a random file name as a libcurl option?
- A: Yes, it is here */
-
-#ifndef RANDOM_FILE
- /* if RANDOM_FILE isn't defined, we only perform this if an option tells
- us to! */
- if(data->set.ssl.random_file)
-#define RANDOM_FILE "" /* doesn't matter won't be used */
-#endif
- {
- /* let the option override the define */
- nread += RAND_load_file((data->set.str[STRING_SSL_RANDOM_FILE]?
- data->set.str[STRING_SSL_RANDOM_FILE]:
- RANDOM_FILE),
- RAND_LOAD_LENGTH);
- if(seed_enough(nread))
- return nread;
- }
-
-#if defined(HAVE_RAND_EGD)
- /* only available in OpenSSL 0.9.5 and later */
- /* EGD_SOCKET is set at configure time or not at all */
-#ifndef EGD_SOCKET
- /* If we don't have the define set, we only do this if the egd-option
- is set */
- if(data->set.str[STRING_SSL_EGDSOCKET])
-#define EGD_SOCKET "" /* doesn't matter won't be used */
-#endif
- {
- /* If there's an option and a define, the option overrides the
- define */
- int ret = RAND_egd(data->set.str[STRING_SSL_EGDSOCKET]?
- data->set.str[STRING_SSL_EGDSOCKET]:EGD_SOCKET);
- if(-1 != ret) {
- nread += ret;
- if(seed_enough(nread))
- return nread;
- }
- }
-#endif
-
- /* If we get here, it means we need to seed the PRNG using a "silly"
- approach! */
- do {
- unsigned char randb[64];
- int len = sizeof(randb);
- RAND_bytes(randb, len);
- RAND_add(randb, len, (len >> 1));
- } while(!RAND_status());
-
- /* generates a default path for the random seed file */
- buf[0]=0; /* blank it first */
- RAND_file_name(buf, BUFSIZE);
- if(buf[0]) {
- /* we got a file name to try */
- nread += RAND_load_file(buf, RAND_LOAD_LENGTH);
- if(seed_enough(nread))
- return nread;
- }
-
- infof(data, "libcurl is now using a weak random seed!\n");
- return nread;
-}
-
static int Curl_ossl_seed(struct SessionHandle *data)
{
- /* we have the "SSL is seeded" boolean static to prevent multiple
- time-consuming seedings in vain */
- static bool ssl_seeded = FALSE;
-
- if(!ssl_seeded || data->set.str[STRING_SSL_RANDOM_FILE] ||
- data->set.str[STRING_SSL_EGDSOCKET]) {
- ossl_seed(data);
- ssl_seeded = TRUE;
- }
return 0;
}
@@ -742,17 +636,6 @@
OpenSSL_add_all_algorithms();
-
- /* OPENSSL_config(NULL); is "strongly recommended" to use but unfortunately
- that function makes an exit() call on wrongly formatted config files
- which makes it hard to use in some situations. OPENSSL_config() itself
- calls CONF_modules_load_file() and we use that instead and we ignore
- its return code! */
-
- (void)CONF_modules_load_file(NULL, NULL,
- CONF_MFLAGS_DEFAULT_SECTION|
- CONF_MFLAGS_IGNORE_MISSING_FILE);
-
return 1;
}
@@ -2825,29 +2708,10 @@
#if(SSLEAY_VERSION_NUMBER >= 0x905000)
{
char sub[3];
- unsigned long ssleay_value;
+ unsigned long ssleay_value = 0;
sub[2]='\0';
sub[1]='\0';
- ssleay_value=SSLeay();
- if(ssleay_value < 0x906000) {
- ssleay_value=SSLEAY_VERSION_NUMBER;
- sub[0]='\0';
- }
- else {
- if(ssleay_value&0xff0) {
- int minor_ver = (ssleay_value >> 4) & 0xff;
- if(minor_ver > 26) {
- /* handle extended version introduced for 0.9.8za */
- sub[1] = (char) ((minor_ver - 1) % 26 + 'a' + 1);
- sub[0] = 'z';
- }
- else {
- sub[0]=(char)(((ssleay_value>>4)&0xff) + 'a' -1);
- }
- }
- else
- sub[0]='\0';
- }
+ sub[0]='\0';
return snprintf(buffer, size, "%s/%lx.%lx.%lx%s",
#ifdef OPENSSL_IS_BORINGSSL
@@ -1,91 +0,0 @@
#!/usr/bin/env bash
MASON_NAME=libcurl
MASON_VERSION=7.38.0-boringssl
MASON_LIB_FILE=lib/libcurl.a
MASON_PKGCONFIG_FILE=lib/pkgconfig/libcurl.pc
MASON_PWD=`pwd`
. ${MASON_DIR}/mason.sh
function mason_load_source {
mason_download \
http://curl.haxx.se/download/curl-7.38.0.tar.gz \
5463f1b9dc807e4ae8be2ef4ed57e67f677f4426
mason_extract_tar_gz
export MASON_BUILD_PATH=${MASON_ROOT}/.build/curl-7.38.0
}
function mason_prepare_compile {
${MASON_DIR}/mason install boringssl d3bcf13
MASON_OPENSSL=`${MASON_DIR}/mason prefix boringssl d3bcf13`
if [ ${MASON_PLATFORM} = 'linux' ]; then
LIBS="-ldl ${LIBS=}"
fi
}
function mason_compile {
curl --retry 3 -f -# -L "https://raw.githubusercontent.com/mapbox/mason/libcurl-7.38.0-boringssl/openssl.patch" -o ${MASON_BUILD_PATH}/openssl.patch
patch ${MASON_BUILD_PATH}/lib/vtls/openssl.c < ${MASON_BUILD_PATH}/openssl.patch
LIBS="${LIBS=}" ./configure \
--prefix=${MASON_PREFIX} \
${MASON_HOST_ARG} \
--enable-static \
--disable-shared \
--with-pic \
--enable-manual \
--with-ssl=${MASON_OPENSSL} \
--without-ca-bundle \
--without-ca-path \
--without-darwinssl \
--without-gnutls \
--without-polarssl \
--without-cyassl \
--without-nss \
--without-axtls \
--without-libmetalink \
--without-libssh2 \
--without-librtmp \
--without-winidn \
--without-libidn \
--without-nghttp2 \
--disable-ldap \
--disable-ldaps \
--disable-ldap \
--disable-ftp \
--disable-file \
--disable-rtsp \
--disable-proxy \
--disable-dict \
--disable-telnet \
--disable-tftp \
--disable-pop3 \
--disable-imap \
--disable-smtp \
--disable-gopher \
--disable-libcurl-option \
--disable-sspi \
--disable-crypto-auth \
--disable-ntlm-wb \
--disable-tls-srp \
--disable-cookies || cat config.log
make -j${MASON_CONCURRENCY}
make install
}
function mason_ldflags {
echo -L${MASON_PREFIX}/lib -lcurl
}
function mason_clean {
make clean
}
mason_run "$@"
-27
View File
@@ -1,27 +0,0 @@
language: cpp
sudo: false
os:
- linux
env:
global:
- secure: "clCFM3prHnDocZ8lXlimPxAogvFirD1Zx8cMcFJ/XpkTA/0pCgnhpArM4y/NzLHR57pNZTSCr3p6XZI1c1iTG4Zm8x0sK2A4aTFRahypXNy/e+LzAbtd1y1+dEEDwlJvNNGxizQX4frhOgSNQFDFnWLtmF3stlft5YWyc2kI+FI="
- secure: "jKJErCng8Sk8YJ0IN2FX3lhv7G1LeudMfFBAXViZaXn8w/gWPs+SlfXQmIJ5SruU7U2GQKnAhzbjwXjVAgAh8OAblzny0DDm5Lh5WmwkgAP8JH1LpsBwCYx2S/v8qyR4DX1RVhHS8mQu298180ZDVgGccw+hd8xrE/S5TEQcNfQ="
matrix:
- MASON_PLATFORM=android MASON_ANDROID_ABI=arm-v5
- MASON_PLATFORM=android MASON_ANDROID_ABI=arm-v7
- MASON_PLATFORM=android MASON_ANDROID_ABI=arm-v8
- MASON_PLATFORM=android MASON_ANDROID_ABI=x86
- MASON_PLATFORM=android MASON_ANDROID_ABI=x86-64
- MASON_PLATFORM=android MASON_ANDROID_ABI=mips
- MASON_PLATFORM=android MASON_ANDROID_ABI=mips-64
- MASON_PLATFORM=linux
before_install:
script:
- ./mason build ${MASON_NAME} ${MASON_VERSION}
after_success:
- ./mason publish ${MASON_NAME} ${MASON_VERSION}
-82
View File
@@ -1,82 +0,0 @@
#!/usr/bin/env bash
MASON_NAME=libcurl
MASON_VERSION=7.40.0
MASON_LIB_FILE=lib/libcurl.a
MASON_PKGCONFIG_FILE=lib/pkgconfig/libcurl.pc
. ${MASON_DIR}/mason.sh
function mason_load_source {
mason_download \
http://curl.haxx.se/download/curl-7.40.0.tar.gz \
c7c97e02f5fa4302f4c25c72486359f7b46f7d6d
mason_extract_tar_gz
export MASON_BUILD_PATH=${MASON_ROOT}/.build/curl-${MASON_VERSION}
}
function mason_prepare_compile {
${MASON_DIR}/mason install openssl 1.0.1l
MASON_OPENSSL=`${MASON_DIR}/mason prefix openssl 1.0.1l`
if [ ${MASON_PLATFORM} = 'linux' ]; then
LIBS="-ldl ${LIBS=}"
fi
}
function mason_compile {
LIBS="${LIBS=}" ./configure \
--prefix=${MASON_PREFIX} \
${MASON_HOST_ARG} \
--enable-static \
--disable-shared \
--with-pic \
--enable-manual \
--with-ssl=${MASON_OPENSSL} \
--without-ca-bundle \
--without-ca-path \
--without-darwinssl \
--without-gnutls \
--without-polarssl \
--without-cyassl \
--without-nss \
--without-axtls \
--without-libmetalink \
--without-libssh2 \
--without-librtmp \
--without-winidn \
--without-libidn \
--without-nghttp2 \
--disable-ldap \
--disable-ldaps \
--disable-ldap \
--disable-ftp \
--disable-file \
--disable-rtsp \
--disable-proxy \
--disable-dict \
--disable-telnet \
--disable-tftp \
--disable-pop3 \
--disable-imap \
--disable-smtp \
--disable-gopher \
--disable-libcurl-option \
--disable-sspi \
--disable-crypto-auth \
--disable-ntlm-wb \
--disable-tls-srp \
--disable-cookies
make -j${MASON_CONCURRENCY}
make install
}
function mason_clean {
make clean
}
mason_run "$@"
-27
View File
@@ -1,27 +0,0 @@
language: cpp
sudo: false
os:
- linux
env:
global:
- secure: "clCFM3prHnDocZ8lXlimPxAogvFirD1Zx8cMcFJ/XpkTA/0pCgnhpArM4y/NzLHR57pNZTSCr3p6XZI1c1iTG4Zm8x0sK2A4aTFRahypXNy/e+LzAbtd1y1+dEEDwlJvNNGxizQX4frhOgSNQFDFnWLtmF3stlft5YWyc2kI+FI="
- secure: "jKJErCng8Sk8YJ0IN2FX3lhv7G1LeudMfFBAXViZaXn8w/gWPs+SlfXQmIJ5SruU7U2GQKnAhzbjwXjVAgAh8OAblzny0DDm5Lh5WmwkgAP8JH1LpsBwCYx2S/v8qyR4DX1RVhHS8mQu298180ZDVgGccw+hd8xrE/S5TEQcNfQ="
matrix:
- MASON_PLATFORM=android MASON_ANDROID_ABI=arm-v5
- MASON_PLATFORM=android MASON_ANDROID_ABI=arm-v7
- MASON_PLATFORM=android MASON_ANDROID_ABI=arm-v8
- MASON_PLATFORM=android MASON_ANDROID_ABI=x86
- MASON_PLATFORM=android MASON_ANDROID_ABI=x86-64
- MASON_PLATFORM=android MASON_ANDROID_ABI=mips
- MASON_PLATFORM=android MASON_ANDROID_ABI=mips-64
- MASON_PLATFORM=linux
before_install:
script:
- ./mason build ${MASON_NAME} ${MASON_VERSION}
after_success:
- ./mason publish ${MASON_NAME} ${MASON_VERSION}
-84
View File
@@ -1,84 +0,0 @@
#!/usr/bin/env bash
MASON_NAME=libcurl
MASON_VERSION=7.45.0
MASON_LIB_FILE=lib/libcurl.a
MASON_PKGCONFIG_FILE=lib/pkgconfig/libcurl.pc
OPENSSL_VERSION=1.0.1p
. ${MASON_DIR}/mason.sh
function mason_load_source {
mason_download \
http://curl.haxx.se/download/curl-${MASON_VERSION}.tar.gz \
cf5b820a1ab30e49083784c46fe3ec9e6d2c84dc
mason_extract_tar_gz
export MASON_BUILD_PATH=${MASON_ROOT}/.build/curl-${MASON_VERSION}
}
function mason_prepare_compile {
${MASON_DIR}/mason install openssl ${OPENSSL_VERSION}
MASON_OPENSSL=`${MASON_DIR}/mason prefix openssl ${OPENSSL_VERSION}`
if [ ${MASON_PLATFORM} = 'linux' ]; then
LIBS="-ldl ${LIBS=}"
fi
}
function mason_compile {
LIBS="${LIBS=}" ./configure \
--prefix=${MASON_PREFIX} \
${MASON_HOST_ARG} \
--enable-static \
--disable-shared \
--with-pic \
--enable-manual \
--with-ssl=${MASON_OPENSSL} \
--without-ca-bundle \
--without-ca-path \
--without-darwinssl \
--without-gnutls \
--without-polarssl \
--without-cyassl \
--without-nss \
--without-axtls \
--without-libmetalink \
--without-libssh2 \
--without-librtmp \
--without-winidn \
--without-libidn \
--without-nghttp2 \
--disable-ldap \
--disable-ldaps \
--disable-ldap \
--disable-ftp \
--disable-file \
--disable-rtsp \
--disable-proxy \
--disable-dict \
--disable-telnet \
--disable-tftp \
--disable-pop3 \
--disable-imap \
--disable-smtp \
--disable-gopher \
--disable-libcurl-option \
--disable-sspi \
--disable-crypto-auth \
--disable-ntlm-wb \
--disable-tls-srp \
--disable-cookies
make -j${MASON_CONCURRENCY}
make install
}
function mason_clean {
make clean
}
mason_run "$@"
-70
View File
@@ -1,70 +0,0 @@
#!/usr/bin/env bash
MASON_NAME=libcurl
MASON_VERSION=system
MASON_SYSTEM_PACKAGE=true
. ${MASON_DIR}/mason.sh
if [[ ${MASON_PLATFORM} = 'ios' || ${MASON_PLATFORM} = 'android' ]]; then
mason_error "Unavailable on platform \"${MASON_PLATFORM}\""
exit 1
fi
MASON_CFLAGS="-I${MASON_PREFIX}/include"
MASON_LDFLAGS="-L${MASON_PREFIX}/lib"
if [[ ${MASON_PLATFORM} = 'osx' ]]; then
CURL_INCLUDE_PREFIX="${MASON_SDK_PATH}/usr/include"
CURL_LIBRARY="${MASON_SDK_PATH}/usr/lib/libcurl.${MASON_DYNLIB_SUFFIX}"
MASON_LDFLAGS="${MASON_LDFLAGS} -lcurl"
else
CURL_INCLUDE_PREFIX="`pkg-config libcurl --variable=includedir`"
CURL_LIBRARY="`pkg-config libcurl --variable=libdir`/libcurl.${MASON_DYNLIB_SUFFIX}"
MASON_CFLAGS="${MASON_CFLAGS} `pkg-config libcurl --cflags-only-other`"
MASON_LDFLAGS="${MASON_LDFLAGS} `pkg-config libcurl --libs-only-other --libs-only-l`"
fi
if [ ! -f "${CURL_INCLUDE_PREFIX}/curl/curl.h" ]; then
mason_error "Can't find header file ${CURL_INCLUDE_PREFIX}/curl/curl.h"
exit 1
fi
if [ ! -f "${CURL_LIBRARY}" ]; then
mason_error "Can't find library file ${CURL_LIBRARY}"
exit 1
fi
function mason_system_version {
mkdir -p "${MASON_PREFIX}"
cd "${MASON_PREFIX}"
if [ ! -f version ]; then
echo "#include <curl/curl.h>
#include <stdio.h>
int main() {
printf(\"%s\", curl_version_info(CURLVERSION_NOW)->version);
return 0;
}
" > version.c && ${CC:-cc} version.c $(mason_cflags) $(mason_ldflags) -o version
fi
./version
}
function mason_build {
mkdir -p ${MASON_PREFIX}/{include,lib}
ln -sf ${CURL_INCLUDE_PREFIX}/curl ${MASON_PREFIX}/include/
ln -sf ${CURL_LIBRARY} ${MASON_PREFIX}/lib/
echo "build is done and available at ${MASON_PREFIX}/"
}
function mason_cflags {
echo ${MASON_CFLAGS}
}
function mason_ldflags {
echo ${MASON_LDFLAGS}
}
mason_run "$@"