diff options
Diffstat (limited to 'source/l')
| -rwxr-xr-x | source/l/glibc/glibc.SlackBuild | 7 | ||||
| -rw-r--r-- | source/l/glibc/glibc.locale.no-archive.diff | 10 | ||||
| -rw-r--r-- | source/l/libimobiledevice/02a0e03e24bc96bba2e5ea2438c30baf803fd137.patch | 89 | ||||
| -rwxr-xr-x | source/l/libimobiledevice/fetch-libimobiledevice.sh | 47 | ||||
| -rwxr-xr-x | source/l/libimobiledevice/libimobiledevice.SlackBuild | 14 | ||||
| -rw-r--r-- | source/l/libimobiledevice/libimobiledevice.use_tlsv1_instead_of_sslv3.diff | 13 | ||||
| -rwxr-xr-x | source/l/libusbmuxd/fetch-libusbmuxd.sh | 47 | ||||
| -rwxr-xr-x | source/l/libusbmuxd/libusbmuxd.SlackBuild | 6 | ||||
| -rwxr-xr-x | source/l/mpfr/mpfr.SlackBuild | 2 |
9 files changed, 108 insertions, 127 deletions
diff --git a/source/l/glibc/glibc.SlackBuild b/source/l/glibc/glibc.SlackBuild index 33b4c6021..c9976d6e6 100755 --- a/source/l/glibc/glibc.SlackBuild +++ b/source/l/glibc/glibc.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=glibc VERSION=${VERSION:-$(echo glibc-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} CHECKOUT=${CHECKOUT:-""} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # I was considering disabling NSCD, but MoZes talked me out of it. :) #DISABLE_NSCD=" --disable-nscd " @@ -148,9 +148,6 @@ fix_doinst() { # This is a patch function to put all glibc patches in the build script # up near the top. apply_patches() { - # Use old-style locale directories rather than a single (and strangely - # formatted) /usr/lib/locale/locale-archive file: - zcat $CWD/glibc.locale.no-archive.diff.gz | patch -p1 --verbose || exit 1 # Support ru_RU.CP1251 locale: zcat $CWD/glibc.ru_RU.CP1251.diff.gz | patch -p1 --verbose || exit 1 # Add a C.UTF-8 locale: @@ -245,7 +242,7 @@ CFLAGS="-g $OPTIMIZ" \ make $NUMJOBS || make || exit 1 make install install_root=$PKG || exit 1 -make localedata/install-locales install_root=$PKG || exit 1 +make localedata/install-locale-files DESTDIR=$PKG || exit 1 # We've always had an sln symlink in /bin, so let's make sure it # remains there so as not to break any scripts that might need it: diff --git a/source/l/glibc/glibc.locale.no-archive.diff b/source/l/glibc/glibc.locale.no-archive.diff deleted file mode 100644 index 4b2828ba7..000000000 --- a/source/l/glibc/glibc.locale.no-archive.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- ./localedata/Makefile.orig 2018-02-04 23:06:03.700212576 -0600 -+++ ./localedata/Makefile 2018-02-04 23:07:10.102218076 -0600 -@@ -223,6 +223,7 @@ - echo -n '...'; \ - input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \ - $(LOCALEDEF) $$flags --alias-file=../intl/locale.alias \ -+ --no-archive \ - -i locales/$$input -f charmaps/$$charset \ - $(addprefix --prefix=,$(install_root)) $$locale \ - && echo ' done'; \ diff --git a/source/l/libimobiledevice/02a0e03e24bc96bba2e5ea2438c30baf803fd137.patch b/source/l/libimobiledevice/02a0e03e24bc96bba2e5ea2438c30baf803fd137.patch deleted file mode 100644 index 3fa0b1792..000000000 --- a/source/l/libimobiledevice/02a0e03e24bc96bba2e5ea2438c30baf803fd137.patch +++ /dev/null @@ -1,89 +0,0 @@ -From 02a0e03e24bc96bba2e5ea2438c30baf803fd137 Mon Sep 17 00:00:00 2001 -From: Christophe Fergeau <cfergeau@redhat.com> -Date: Tue, 25 Apr 2017 14:09:48 +0200 -Subject: [PATCH] Avoid double free with OpenSSL 1.1.0 - -Since commit OpenSSL_1_1_0-pre3~178 -https://github.com/openssl/openssl/commit/b184e3ef73200cb3b7914a603b43a5b8a074c85f -OpenSSL automatically cleans up some of its internal data when the -program exits. This conflicts with some similar clean up -libimobiledevice attempts to do, which causes a double-free. -SSL_COMP_free_compression_methods() was available in OpenSSL 1.0.2, -and is still there in 1.1.0 as a no-op, so we can use that to free -the compression methods. - -This bug can be hit with a simple idevicebackup2 --help - -==14299== Invalid read of size 4 -==14299== at 0x547AEBC: OPENSSL_sk_pop_free (stack.c:263) -==14299== by 0x508B848: ssl_library_stop (ssl_init.c:182) -==14299== by 0x5424D11: OPENSSL_cleanup (init.c:402) -==14299== by 0x5DC3134: __cxa_finalize (cxa_finalize.c:56) -==14299== by 0x53332B2: ??? (in /usr/lib64/libcrypto.so.1.1.0e) -==14299== by 0x4011232: _dl_fini (dl-fini.c:235) -==14299== by 0x5DC2DC7: __run_exit_handlers (exit.c:83) -==14299== by 0x5DC2E19: exit (exit.c:105) -==14299== by 0x5DA8604: (below main) (libc-start.c:329) -==14299== Address 0x6585590 is 0 bytes inside a block of size 40 free'd -==14299== at 0x4C2FCC8: free (vg_replace_malloc.c:530) -==14299== by 0x4E43381: sk_SSL_COMP_free (ssl.h:830) -==14299== by 0x4E434E7: internal_idevice_deinit (idevice.c:103) -==14299== by 0x5B79643: __pthread_once_slow (pthread_once.c:116) -==14299== by 0x4E5663A: thread_once (thread.c:104) -==14299== by 0x4E43525: libimobiledevice_deinitialize (idevice.c:140) -==14299== by 0x4011232: _dl_fini (dl-fini.c:235) -==14299== by 0x5DC2DC7: __run_exit_handlers (exit.c:83) -==14299== by 0x5DC2E19: exit (exit.c:105) -==14299== by 0x5DA8604: (below main) (libc-start.c:329) -==14299== Block was alloc'd at -==14299== at 0x4C2EB1B: malloc (vg_replace_malloc.c:299) -==14299== by 0x5428908: CRYPTO_zalloc (mem.c:100) -==14299== by 0x547A9AE: OPENSSL_sk_new (stack.c:108) -==14299== by 0x5087D43: sk_SSL_COMP_new (ssl.h:830) -==14299== by 0x5087D43: do_load_builtin_compressions (ssl_ciph.c:482) -==14299== by 0x5087D43: do_load_builtin_compressions_ossl_ (ssl_ciph.c:476) -==14299== by 0x5B79643: __pthread_once_slow (pthread_once.c:116) -==14299== by 0x547B198: CRYPTO_THREAD_run_once (threads_pthread.c:106) -==14299== by 0x5089F96: load_builtin_compressions (ssl_ciph.c:500) -==14299== by 0x5089F96: SSL_COMP_get_compression_methods (ssl_ciph.c:1845) -==14299== by 0x508B68B: ossl_init_ssl_base (ssl_init.c:125) -==14299== by 0x508B68B: ossl_init_ssl_base_ossl_ (ssl_init.c:25) -==14299== by 0x5B79643: __pthread_once_slow (pthread_once.c:116) -==14299== by 0x547B198: CRYPTO_THREAD_run_once (threads_pthread.c:106) -==14299== by 0x508B90A: OPENSSL_init_ssl (ssl_init.c:227) -==14299== by 0x4E43416: internal_idevice_init (idevice.c:73) -= - -Signed-off-by: Christophe Fergeau <cfergeau@redhat.com> ---- - src/idevice.c | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) - -diff --git a/src/idevice.c b/src/idevice.c -index 913038ef..d1f13cb6 100644 ---- a/src/idevice.c -+++ b/src/idevice.c -@@ -51,6 +51,14 @@ - #include "common/debug.h" - - #ifdef HAVE_OPENSSL -+ -+#if OPENSSL_VERSION_NUMBER < 0x10002000L -+static void SSL_COMP_free_compression_methods(void) -+{ -+ sk_SSL_COMP_free(SSL_COMP_get_compression_methods()); -+} -+#endif -+ - static mutex_t *mutex_buf = NULL; - static void locking_function(int mode, int n, const char* file, int line) - { -@@ -100,7 +108,7 @@ static void internal_idevice_deinit(void) - - EVP_cleanup(); - CRYPTO_cleanup_all_ex_data(); -- sk_SSL_COMP_free(SSL_COMP_get_compression_methods()); -+ SSL_COMP_free_compression_methods(); - #ifdef HAVE_ERR_REMOVE_THREAD_STATE - ERR_remove_thread_state(NULL); - #else diff --git a/source/l/libimobiledevice/fetch-libimobiledevice.sh b/source/l/libimobiledevice/fetch-libimobiledevice.sh new file mode 100755 index 000000000..8d2558d25 --- /dev/null +++ b/source/l/libimobiledevice/fetch-libimobiledevice.sh @@ -0,0 +1,47 @@ +#!/bin/sh + +# Copyright 2019 Patrick J. Volkerding, Sebeka, Minnesota, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +# Pull a stable branch + patches +BRANCH=${1:-master} + +# Clear download area: +rm -rf libimobiledevice + +# Clone repository: +git clone https://github.com/libimobiledevice/libimobiledevice + +# checkout $BRANCH: +( cd libimobiledevice + git checkout $BRANCH || exit 1 +) + +HEADISAT="$( cd libimobiledevice && git log -1 --format=%h )" +DATE="$( cd libimobiledevice && git log -1 --format=%ad --date=format:%Y%m%d )" +# Cleanup. We're not packing up the whole git repo. +( cd libimobiledevice && find . -type d -name ".git*" -exec rm -rf {} \; 2> /dev/null ) +mv libimobiledevice libimobiledevice-${DATE}_${HEADISAT} +tar cf libimobiledevice-${DATE}_${HEADISAT}.tar libimobiledevice-${DATE}_${HEADISAT} +xz -9 -f libimobiledevice-${DATE}_${HEADISAT}.tar +rm -rf libimobiledevice-${DATE}_${HEADISAT} +echo +echo "libimobiledevice branch $BRANCH with HEAD at $HEADISAT packaged as libimobiledevice-${DATE}_${HEADISAT}.tar.xz" +echo diff --git a/source/l/libimobiledevice/libimobiledevice.SlackBuild b/source/l/libimobiledevice/libimobiledevice.SlackBuild index cb7a0a844..d0f9d83c5 100755 --- a/source/l/libimobiledevice/libimobiledevice.SlackBuild +++ b/source/l/libimobiledevice/libimobiledevice.SlackBuild @@ -23,8 +23,8 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libimobiledevice -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-5} +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -67,7 +67,7 @@ fi cd $TMP rm -rf ${PKGNAM}-${VERSION} -tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1 +tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z || exit 1 cd ${PKGNAM}-$VERSION || exit 1 # Make sure ownerships and permissions are sane: @@ -78,11 +78,9 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# Fixes mounting issues with iOS 10: -zcat $CWD/libimobiledevice.use_tlsv1_instead_of_sslv3.diff.gz | patch -p1 --verbose || exit 1 - -# Fix for OpenSSL-1.1.x: -zcat $CWD/02a0e03e24bc96bba2e5ea2438c30baf803fd137.patch.gz | patch -p1 --verbose || exit 1 +if [ ! -r configure ]; then + NOCONFIGURE=1 ./autogen.sh +fi CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ diff --git a/source/l/libimobiledevice/libimobiledevice.use_tlsv1_instead_of_sslv3.diff b/source/l/libimobiledevice/libimobiledevice.use_tlsv1_instead_of_sslv3.diff deleted file mode 100644 index edf763ee8..000000000 --- a/source/l/libimobiledevice/libimobiledevice.use_tlsv1_instead_of_sslv3.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/idevice.c b/src/idevice.c -index f2de6a3..1dcdae2 100644 ---- a/src/idevice.c -+++ b/src/idevice.c -@@ -703,7 +703,7 @@ LIBIMOBILEDEVICE_API idevice_error_t idevice_connection_enable_ssl(idevice_conne - } - BIO_set_fd(ssl_bio, (int)(long)connection->data, BIO_NOCLOSE); - -- SSL_CTX *ssl_ctx = SSL_CTX_new(SSLv3_method()); -+ SSL_CTX *ssl_ctx = SSL_CTX_new(TLSv1_method()); - if (ssl_ctx == NULL) { - debug_info("ERROR: Could not create SSL context."); - BIO_free(ssl_bio); diff --git a/source/l/libusbmuxd/fetch-libusbmuxd.sh b/source/l/libusbmuxd/fetch-libusbmuxd.sh new file mode 100755 index 000000000..1fde09b9a --- /dev/null +++ b/source/l/libusbmuxd/fetch-libusbmuxd.sh @@ -0,0 +1,47 @@ +#!/bin/sh + +# Copyright 2019 Patrick J. Volkerding, Sebeka, Minnesota, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +# Pull a stable branch + patches +BRANCH=${1:-master} + +# Clear download area: +rm -rf libusbmuxd + +# Clone repository: +git clone https://github.com/libimobiledevice/libusbmuxd + +# checkout $BRANCH: +( cd libusbmuxd + git checkout $BRANCH || exit 1 +) + +HEADISAT="$( cd libusbmuxd && git log -1 --format=%h )" +DATE="$( cd libusbmuxd && git log -1 --format=%ad --date=format:%Y%m%d )" +# Cleanup. We're not packing up the whole git repo. +( cd libusbmuxd && find . -type d -name ".git*" -exec rm -rf {} \; 2> /dev/null ) +mv libusbmuxd libusbmuxd-${DATE}_${HEADISAT} +tar cf libusbmuxd-${DATE}_${HEADISAT}.tar libusbmuxd-${DATE}_${HEADISAT} +xz -9 -f libusbmuxd-${DATE}_${HEADISAT}.tar +rm -rf libusbmuxd-${DATE}_${HEADISAT} +echo +echo "libusbmuxd branch $BRANCH with HEAD at $HEADISAT packaged as libusbmuxd-${DATE}_${HEADISAT}.tar.xz" +echo diff --git a/source/l/libusbmuxd/libusbmuxd.SlackBuild b/source/l/libusbmuxd/libusbmuxd.SlackBuild index 4348e6281..9b650f997 100755 --- a/source/l/libusbmuxd/libusbmuxd.SlackBuild +++ b/source/l/libusbmuxd/libusbmuxd.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libusbmuxd VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -78,6 +78,10 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +if [ ! -r configure ]; then + NOCONFIGURE=1 ./autogen.sh +fi + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/source/l/mpfr/mpfr.SlackBuild b/source/l/mpfr/mpfr.SlackBuild index 7da56c204..b071e4f89 100755 --- a/source/l/mpfr/mpfr.SlackBuild +++ b/source/l/mpfr/mpfr.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=mpfr VERSION=${VERSION:-$(echo mpfr-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} |