From b66dbcf50c5c89b5d222a9da91ffa5e6b9592891 Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Wed, 2 Jan 2019 23:26:53 +0000 Subject: Wed Jan 2 23:26:53 UTC 2019 a/tar-1.31-x86_64-1.txz: Upgraded. a/util-linux-2.33-x86_64-2.txz: Rebuilt. fdisk: Don't include /dev/ram* devices in 'fdisk -l' output. ap/soma-3.2.1-noarch-1.txz: Upgraded. d/ccache-3.5.1-x86_64-1.txz: Upgraded. l/imagemagick-6.9.10_23-x86_64-1.txz: Upgraded. xap/gnuplot-5.2.6-x86_64-1.txz: Upgraded. xap/rdesktop-1.8.4-x86_64-1.txz: Upgraded. --- source/a/tar/tar.SlackBuild | 4 +- source/a/util-linux/util-linux.SlackBuild | 6 +- .../util-linux.do.not.list.ram.devices.diff | 13 +++ source/ap/soma/ChangeLog.txt | 6 +- source/ap/soma/slack-desc.diff | 10 +- source/ap/soma/soma.SlackBuild | 2 +- source/ap/soma/soma.info | 12 +- ....969a7d49d63f872b9c88661f432d4cfbfde074af.patch | 79 +++++++++++++ source/d/ccache/ccache.SlackBuild | 2 + .../02-Fix-OpenSSL-1.1-compability-issues.patch | 125 --------------------- source/xap/rdesktop/rdesktop.SlackBuild | 4 +- 11 files changed, 117 insertions(+), 146 deletions(-) create mode 100644 source/a/util-linux/util-linux.do.not.list.ram.devices.diff create mode 100644 source/d/ccache/ccache.969a7d49d63f872b9c88661f432d4cfbfde074af.patch delete mode 100644 source/xap/rdesktop/02-Fix-OpenSSL-1.1-compability-issues.patch (limited to 'source') diff --git a/source/a/tar/tar.SlackBuild b/source/a/tar/tar.SlackBuild index bbe48d331..d8fc9879c 100755 --- a/source/a/tar/tar.SlackBuild +++ b/source/a/tar/tar.SlackBuild @@ -25,8 +25,8 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=tar -VERSION=1.30 -BUILD=${BUILD:-3} +VERSION=1.31 +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} diff --git a/source/a/util-linux/util-linux.SlackBuild b/source/a/util-linux/util-linux.SlackBuild index 95bbb1ff9..5bda2e607 100755 --- a/source/a/util-linux/util-linux.SlackBuild +++ b/source/a/util-linux/util-linux.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=util-linux VERSION=${VERSION:-$(echo util-linux*.tar.xz | cut -d - -f 3 | rev | cut -f 3- -d . | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} ADJTIMEXVERS=1.29 SETSERIALVERS=2.17 @@ -87,6 +87,10 @@ find . \ # 83 back to "Linux swap": zcat $CWD/util-linux.fdisk-no-solaris.diff.gz | patch -p1 --verbose || exit 1 +# Revert to the behavior of earlier versions of fdisk which did not list the +# /dev/ram* devices in 'fdisk -l' output: +zcat $CWD/util-linux.do.not.list.ram.devices.diff.gz | patch -p1 --verbose || exit 1 + # This just call the configure script with $1 either being 2 for python2 # or 3 for python3. # diff --git a/source/a/util-linux/util-linux.do.not.list.ram.devices.diff b/source/a/util-linux/util-linux.do.not.list.ram.devices.diff new file mode 100644 index 000000000..33a743076 --- /dev/null +++ b/source/a/util-linux/util-linux.do.not.list.ram.devices.diff @@ -0,0 +1,13 @@ +--- ./disk-utils/fdisk-list.c.orig 2018-09-20 07:38:55.845404951 -0500 ++++ ./disk-utils/fdisk-list.c 2019-01-02 15:53:21.256868721 -0600 +@@ -337,6 +337,10 @@ + if (devno <= 0) + continue; + ++ /* Don't list /dev/ram* devices */ ++ if (strstr(line, "ram") && devno >= 256) ++ continue; ++ + if (sysfs_devno_is_dm_private(devno, NULL) || + sysfs_devno_is_wholedisk(devno) <= 0) + continue; diff --git a/source/ap/soma/ChangeLog.txt b/source/ap/soma/ChangeLog.txt index 08b8cc47c..466baa149 100644 --- a/source/ap/soma/ChangeLog.txt +++ b/source/ap/soma/ChangeLog.txt @@ -1,5 +1,9 @@ ============================================================================== -Sun 18 Nov 03:52:51 UTC 2018 +Thu 27 Dec 14:06:02 UTC 2018 +3.2.1 +Remove debugging helper line. +============================================================================== +Sun 18 Nov 05:42:15 UTC 2018 3.2.0 Add proxy support. ============================================================================== diff --git a/source/ap/soma/slack-desc.diff b/source/ap/soma/slack-desc.diff index 8e7d18007..36e8ad385 100644 --- a/source/ap/soma/slack-desc.diff +++ b/source/ap/soma/slack-desc.diff @@ -1,6 +1,6 @@ ---- slack-desc.orig 2018-11-15 18:52:49.000000000 -0600 +--- slack-desc.orig 2019-01-01 03:24:18.000000000 -0600 +++ slack-desc 2018-11-28 16:37:00.644976546 -0600 -@@ -1,17 +1,17 @@ +@@ -1,14 +1,14 @@ # HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line +# The "handy ruler" below makes it easier to edit a package description. Line @@ -19,8 +19,4 @@ +soma: Soma handles playing any internet audio stream supported by MPlayer. soma: It also supports playlists such as pls,m3u and ram. soma: --soma: Homepage: http://www.dawoodfall.net/slackbuilds/noversion/soma -+soma: Homepage: http://tty1.uk/slackbuilds/noversion/soma - soma: - soma: - soma: + soma: Homepage: http://tty1.uk/slackbuilds/noversion/soma diff --git a/source/ap/soma/soma.SlackBuild b/source/ap/soma/soma.SlackBuild index 94250798e..85147dc0c 100755 --- a/source/ap/soma/soma.SlackBuild +++ b/source/ap/soma/soma.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=soma -VERSION=${VERSION:-3.2.0} +VERSION=${VERSION:-3.2.1} ARCH=noarch BUILD=${BUILD:-1} diff --git a/source/ap/soma/soma.info b/source/ap/soma/soma.info index 9064b6f13..f9736e246 100644 --- a/source/ap/soma/soma.info +++ b/source/ap/soma/soma.info @@ -1,10 +1,10 @@ PRGNAM="soma" -VERSION="3.2.0" -HOMEPAGE="http://dawoodfall.net/slackbuilds/noversion/soma/" -DOWNLOAD="http://unrealize.co.uk/source/soma-3.2.0.tar.gz" -MD5SUM="9a24b9dcb2a604c26cc32767758dfdc1" +VERSION="3.2.1" +HOMEPAGE="http://tty1.uk/slackbuilds/noversion/soma/" +DOWNLOAD="http://unrealize.co.uk/source/soma-3.2.1.tar.gz" +MD5SUM="ae4b342d87e71a6504ffb269d8445ba4" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="David Woodfall" -EMAIL="dave@dawoodfall.net" +MAINTAINER="Dave Woodfall" +EMAIL="dave@tty1.uk" diff --git a/source/d/ccache/ccache.969a7d49d63f872b9c88661f432d4cfbfde074af.patch b/source/d/ccache/ccache.969a7d49d63f872b9c88661f432d4cfbfde074af.patch new file mode 100644 index 000000000..d332192b1 --- /dev/null +++ b/source/d/ccache/ccache.969a7d49d63f872b9c88661f432d4cfbfde074af.patch @@ -0,0 +1,79 @@ +From 969a7d49d63f872b9c88661f432d4cfbfde074af Mon Sep 17 00:00:00 2001 +From: Joel Rosdahl +Date: Wed, 2 Jan 2019 16:24:56 +0100 +Subject: [PATCH] Fix getopt_long.c compilation warning in an easier way + +Fixes #340 in an alternative way (see also #341). +--- + Makefile.in | 2 +- + configure.ac | 5 ----- + dev.mk.in | 1 - + src/getopt_long.c | 6 +++++- + 4 files changed, 6 insertions(+), 8 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index 9e90755d..c113e815 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -51,7 +51,7 @@ non_3pp_sources = \ + generated_sources = \ + src/version.c + 3pp_sources = \ +- @getopt_long_c@ \ ++ src/getopt_long.c \ + src/confitems_lookup.c \ + src/envtoconfitems_lookup.c \ + src/hashtable.c \ +diff --git a/configure.ac b/configure.ac +index d354ee18..a2234127 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -18,7 +18,6 @@ esac + + AC_SUBST(disable_man) + AC_SUBST(extra_libs) +-AC_SUBST(getopt_long_c) + AC_SUBST(include_dev_mk) + AC_SUBST(more_warnings) + AC_SUBST(no_implicit_fallthrough_warning) +@@ -91,10 +90,6 @@ AC_CHECK_FUNCS(strtok_r) + AC_CHECK_FUNCS(unsetenv) + AC_CHECK_FUNCS(utimes) + +-if test x"$ac_cv_func_getopt_long" != x"yes"; then +- getopt_long_c="src/getopt_long.c" +-fi +- + AC_CACHE_CHECK([for compar_fn_t in stdlib.h],ccache_cv_COMPAR_FN_T, [ + AC_TRY_COMPILE( + [#include ], +diff --git a/dev.mk.in b/dev.mk.in +index f5ce8b18..26c2a2c6 100644 +--- a/dev.mk.in ++++ b/dev.mk.in +@@ -92,7 +92,6 @@ source_dist_files = \ + src/confitems_lookup.c \ + src/envtoconfitems.gperf \ + src/envtoconfitems_lookup.c \ +- src/getopt_long.c \ + src/main.c \ + src/zlib/*.c \ + src/zlib/*.h \ +diff --git a/src/getopt_long.c b/src/getopt_long.c +index 61141c23..3e321930 100644 +--- a/src/getopt_long.c ++++ b/src/getopt_long.c +@@ -34,7 +34,11 @@ + + #include "config.h" + +-#ifndef HAVE_GETOPT_LONG ++#ifdef HAVE_GETOPT_LONG ++ ++typedef int do_not_warn_about_empty_compilation_unit; ++ ++#else + + #include "getopt_long.h" + + diff --git a/source/d/ccache/ccache.SlackBuild b/source/d/ccache/ccache.SlackBuild index 0b4b235fd..25b0bc6c1 100755 --- a/source/d/ccache/ccache.SlackBuild +++ b/source/d/ccache/ccache.SlackBuild @@ -63,6 +63,8 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +zcat $CWD/ccache.969a7d49d63f872b9c88661f432d4cfbfde074af.patch.gz | patch -p1 --verbose || exit 1 + ./configure \ --prefix=/usr \ --mandir=/usr/man \ diff --git a/source/xap/rdesktop/02-Fix-OpenSSL-1.1-compability-issues.patch b/source/xap/rdesktop/02-Fix-OpenSSL-1.1-compability-issues.patch deleted file mode 100644 index 17c41eefe..000000000 --- a/source/xap/rdesktop/02-Fix-OpenSSL-1.1-compability-issues.patch +++ /dev/null @@ -1,125 +0,0 @@ -From bd6aa6acddf0ba640a49834807872f4cc0d0a773 Mon Sep 17 00:00:00 2001 -From: Jani Hakala -Date: Thu, 16 Jun 2016 14:28:15 +0300 -Subject: [PATCH] Fix OpenSSL 1.1 compability issues - -Some data types have been made opaque in OpenSSL version 1.1 so -stack allocation and accessing struct fields directly does not work. ---- - ssl.c | 65 ++++++++++++++++++++++++++++++++++++++++------------------------- - 1 file changed, 40 insertions(+), 25 deletions(-) - -diff --git a/ssl.c b/ssl.c -index 4875125..032e9b9 100644 ---- a/ssl.c -+++ b/ssl.c -@@ -88,7 +88,7 @@ rdssl_rsa_encrypt(uint8 * out, uint8 * in, int len, uint32 modulus_size, uint8 * - uint8 * exponent) - { - BN_CTX *ctx; -- BIGNUM mod, exp, x, y; -+ BIGNUM *mod, *exp, *x, *y; - uint8 inr[SEC_MAX_MODULUS_SIZE]; - int outlen; - -@@ -98,24 +98,24 @@ rdssl_rsa_encrypt(uint8 * out, uint8 * in, int len, uint32 modulus_size, uint8 * - reverse(inr, len); - - ctx = BN_CTX_new(); -- BN_init(&mod); -- BN_init(&exp); -- BN_init(&x); -- BN_init(&y); -- -- BN_bin2bn(modulus, modulus_size, &mod); -- BN_bin2bn(exponent, SEC_EXPONENT_SIZE, &exp); -- BN_bin2bn(inr, len, &x); -- BN_mod_exp(&y, &x, &exp, &mod, ctx); -- outlen = BN_bn2bin(&y, out); -+ mod = BN_new(); -+ exp = BN_new(); -+ x = BN_new(); -+ y = BN_new(); -+ -+ BN_bin2bn(modulus, modulus_size, mod); -+ BN_bin2bn(exponent, SEC_EXPONENT_SIZE, exp); -+ BN_bin2bn(inr, len, x); -+ BN_mod_exp(y, x, exp, mod, ctx); -+ outlen = BN_bn2bin(y, out); - reverse(out, outlen); - if (outlen < (int) modulus_size) - memset(out + outlen, 0, modulus_size - outlen); - -- BN_free(&y); -- BN_clear_free(&x); -- BN_free(&exp); -- BN_free(&mod); -+ BN_free(y); -+ BN_clear_free(x); -+ BN_free(exp); -+ BN_free(mod); - BN_CTX_free(ctx); - } - -@@ -146,12 +146,20 @@ rdssl_cert_to_rkey(RDSSL_CERT * cert, uint32 * key_len) - - Kudos to Richard Levitte for the following (. intiutive .) - lines of code that resets the OID and let's us extract the key. */ -- nid = OBJ_obj2nid(cert->cert_info->key->algor->algorithm); -+ -+ X509_PUBKEY *key = NULL; -+ X509_ALGOR *algor = NULL; -+ -+ key = X509_get_X509_PUBKEY(cert); -+ algor = X509_PUBKEY_get0_param(NULL, NULL, 0, &algor, key); -+ -+ nid = OBJ_obj2nid(algor->algorithm); -+ - if ((nid == NID_md5WithRSAEncryption) || (nid == NID_shaWithRSAEncryption)) - { - DEBUG_RDP5(("Re-setting algorithm type to RSA in server certificate\n")); -- ASN1_OBJECT_free(cert->cert_info->key->algor->algorithm); -- cert->cert_info->key->algor->algorithm = OBJ_nid2obj(NID_rsaEncryption); -+ X509_PUBKEY_set0_param(key, OBJ_nid2obj(NID_rsaEncryption), -+ 0, NULL, NULL, 0); - } - epk = X509_get_pubkey(cert); - if (NULL == epk) -@@ -201,14 +209,24 @@ rdssl_rkey_get_exp_mod(RDSSL_RKEY * rkey, uint8 * exponent, uint32 max_exp_len, - { - int len; - -- if ((BN_num_bytes(rkey->e) > (int) max_exp_len) || -- (BN_num_bytes(rkey->n) > (int) max_mod_len)) -+ BIGNUM *e = NULL; -+ BIGNUM *n = NULL; -+ -+#if OPENSSL_VERSION_NUMBER < 0x10100000L -+ e = rkey->e; -+ n = rkey->n; -+#else -+ RSA_get0_key(rkey, &e, &n, NULL); -+#endif -+ -+ if ((BN_num_bytes(e) > (int) max_exp_len) || -+ (BN_num_bytes(n) > (int) max_mod_len)) - { - return 1; - } -- len = BN_bn2bin(rkey->e, exponent); -+ len = BN_bn2bin(e, exponent); - reverse(exponent, len); -- len = BN_bn2bin(rkey->n, modulus); -+ len = BN_bn2bin(n, modulus); - reverse(modulus, len); - return 0; - } -@@ -229,8 +247,5 @@ void - rdssl_hmac_md5(const void *key, int key_len, const unsigned char *msg, int msg_len, - unsigned char *md) - { -- HMAC_CTX ctx; -- HMAC_CTX_init(&ctx); - HMAC(EVP_md5(), key, key_len, msg, msg_len, md, NULL); -- HMAC_CTX_cleanup(&ctx); - } diff --git a/source/xap/rdesktop/rdesktop.SlackBuild b/source/xap/rdesktop/rdesktop.SlackBuild index 742a7a084..4a4e0e424 100755 --- a/source/xap/rdesktop/rdesktop.SlackBuild +++ b/source/xap/rdesktop/rdesktop.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=rdesktop VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -67,8 +67,6 @@ rm -rf ${PKGNAM}-${VERSION} tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1 cd ${PKGNAM}-$VERSION || exit 1 -zcat $CWD/02-Fix-OpenSSL-1.1-compability-issues.patch.gz | patch -p1 --verbose || exit 1 - # Make sure ownerships and permissions are sane: chown -R root:root . find . \ -- cgit v1.2.3