From 688b3293ab91a05480bfa121624ae85c071e039a Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Sat, 28 Apr 2018 13:06:58 +0000 Subject: transmission: update to 2.93 --- abs/extra/transmission/PKGBUILD | 11 +- .../transmission-2.92-openssl-1.1.0.patch | 261 --------------------- 2 files changed, 4 insertions(+), 268 deletions(-) delete mode 100644 abs/extra/transmission/transmission-2.92-openssl-1.1.0.patch diff --git a/abs/extra/transmission/PKGBUILD b/abs/extra/transmission/PKGBUILD index cec5033..21b70bd 100644 --- a/abs/extra/transmission/PKGBUILD +++ b/abs/extra/transmission/PKGBUILD @@ -4,27 +4,24 @@ pkgbase=transmission pkgname=(transmission-cli transmission-gtk transmission-qt) -pkgver=2.92 -pkgrel=7 -arch=(i686 x86_64) +pkgver=2.93 +pkgrel=1 +arch=(x86_64) url="http://www.transmissionbt.com/" license=(MIT) makedepends=(gtk3 intltool curl qt5-base libevent systemd qt5-tools) source=(https://github.com/transmission/transmission-releases/raw/master/transmission-${pkgver}.tar.xz transmission-2.90-libsystemd.patch - transmission-2.92-openssl-1.1.0.patch transmission-cli.sysusers transmission-cli.tmpfiles) -sha256sums=('3a8d045c306ad9acb7bf81126939b9594553a388482efa0ec1bfb67b22acd35f' +sha256sums=('8815920e0a4499bcdadbbe89a4115092dab42ce5199f71ff9a926cfd12b9b90b' '9f8f4bb532e0e46776dbd90e75557364f495ec95896ee35900ea222d69bda411' - 'efd41985f60c977a95744ee44dfbb628424765caee83c6af3e29a5b1cbfadc98' '641310fb0590d40e00bea1b5b9c843953ab78edf019109f276be9c6a7bdaf5b2' '1266032bb07e47d6bcdc7dabd74df2557cc466c33bf983a5881316a4cc098451') prepare() { cd $pkgbase-$pkgver patch -p1 -i "$srcdir/transmission-2.90-libsystemd.patch" - patch -p1 -i "$srcdir/transmission-2.92-openssl-1.1.0.patch" rm -f m4/glib-gettext.m4 autoreconf -fi diff --git a/abs/extra/transmission/transmission-2.92-openssl-1.1.0.patch b/abs/extra/transmission/transmission-2.92-openssl-1.1.0.patch deleted file mode 100644 index 29484b8..0000000 --- a/abs/extra/transmission/transmission-2.92-openssl-1.1.0.patch +++ /dev/null @@ -1,261 +0,0 @@ -From f91cf5ad8c677b61ceb0bf5877b87f9e93256dd7 Mon Sep 17 00:00:00 2001 -From: Sebastian Andrzej Siewior -Date: Mon, 5 Sep 2016 21:49:07 +0000 -Subject: [PATCH] transmission: build against openssl 1.1.0 - -Signed-off-by: Sebastian Andrzej Siewior ---- - libtransmission/crypto-utils-openssl.c | 73 ++++++++++++++++++++++++++++++++-- - 1 file changed, 69 insertions(+), 4 deletions(-) - -diff --git a/libtransmission/crypto-utils-openssl.c b/libtransmission/crypto-utils-openssl.c -index c4539dc..972e24a 100644 ---- a/libtransmission/crypto-utils-openssl.c -+++ b/libtransmission/crypto-utils-openssl.c -@@ -229,6 +229,61 @@ tr_rc4_process (tr_rc4_ctx_t handle, - **** - ***/ - -+#if OPENSSL_VERSION_NUMBER < 0x10100000 -+static inline int -+DH_set0_pqg (DH * dh, -+ BIGNUM * p, -+ BIGNUM * q, -+ BIGNUM * g) -+{ -+ /* If the fields p and g in d are NULL, the corresponding input -+ * parameters MUST be non-NULL. q may remain NULL. -+ */ -+ if ((dh->p == NULL && p == NULL) -+ || (dh->g == NULL && g == NULL)) -+ return 0; -+ -+ if (p != NULL) { -+ BN_free (dh->p); -+ dh->p = p; -+ } -+ if (q != NULL) { -+ BN_free (dh->q); -+ dh->q = q; -+ } -+ if (g != NULL) { -+ BN_free (dh->g); -+ dh->g = g; -+ } -+ -+ if (q != NULL) { -+ dh->length = BN_num_bits (q); -+ } -+ -+ return 1; -+} -+ -+static inline int -+DH_set_length (DH * dh, -+ long length) -+{ -+ dh->length = length; -+ return 1; -+} -+ -+static inline void -+DH_get0_key(const DH * dh, -+ const BIGNUM ** pub_key, -+ const BIGNUM ** priv_key) -+{ -+ if (pub_key != NULL) -+ *pub_key = dh->pub_key; -+ if (priv_key != NULL) -+ *priv_key = dh->priv_key; -+} -+ -+#endif -+ - tr_dh_ctx_t - tr_dh_new (const uint8_t * prime_num, - size_t prime_num_length, -@@ -236,13 +291,19 @@ tr_dh_new (const uint8_t * prime_num, - size_t generator_num_length) - { - DH * handle = DH_new (); -+ BIGNUM * p, * g; - - assert (prime_num != NULL); - assert (generator_num != NULL); -+ p = BN_bin2bn (prime_num, prime_num_length, NULL); -+ g = BN_bin2bn (generator_num, generator_num_length, NULL); - -- if (!check_pointer (handle->p = BN_bin2bn (prime_num, prime_num_length, NULL)) || -- !check_pointer (handle->g = BN_bin2bn (generator_num, generator_num_length, NULL))) -+ if (!check_pointer (p) || -+ !check_pointer (g) || -+ !DH_set0_pqg (handle, p, NULL, g)) - { -+ BN_free (p); -+ BN_free (g); - DH_free (handle); - handle = NULL; - } -@@ -267,16 +328,20 @@ tr_dh_make_key (tr_dh_ctx_t raw_handle, - { - DH * handle = raw_handle; - int dh_size, my_public_key_length; -+ const BIGNUM * hand_pub_key; - - assert (handle != NULL); - assert (public_key != NULL); - -- handle->length = private_key_length * 8; -+ -+ DH_set_length(handle, private_key_length * 8); - - if (!check_result (DH_generate_key (handle))) - return false; - -- my_public_key_length = BN_bn2bin (handle->pub_key, public_key); -+ DH_get0_key (handle, &hand_pub_key, NULL); -+ -+ my_public_key_length = BN_bn2bin (hand_pub_key, public_key); - dh_size = DH_size (handle); - - tr_dh_align_key (public_key, my_public_key_length, dh_size); -From 8c8386a7f3f482a9c917f51d28e0042e55f56b3e Mon Sep 17 00:00:00 2001 -From: Mike Gelfand -Date: Wed, 7 Sep 2016 01:09:04 +0300 -Subject: [PATCH] Fix coding style and building with !TR_LIGHTWEIGHT - ---- - libtransmission/crypto-utils-openssl.c | 60 +++++++++++++++++++--------------- - 1 file changed, 33 insertions(+), 27 deletions(-) - -diff --git a/libtransmission/crypto-utils-openssl.c b/libtransmission/crypto-utils-openssl.c -index 972e24a..9fd2c58 100644 ---- a/libtransmission/crypto-utils-openssl.c -+++ b/libtransmission/crypto-utils-openssl.c -@@ -14,6 +14,7 @@ - #include - - #include -+#include - #include - #include - #include -@@ -48,7 +49,12 @@ log_openssl_error (const char * file, - static bool strings_loaded = false; - if (!strings_loaded) - { -+#if OPENSSL_VERSION_NUMBER < 0x10100000 - ERR_load_crypto_strings (); -+#else -+ OPENSSL_init_crypto (OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL); -+#endif -+ - strings_loaded = true; - } - #endif -@@ -230,6 +236,7 @@ tr_rc4_process (tr_rc4_ctx_t handle, - ***/ - - #if OPENSSL_VERSION_NUMBER < 0x10100000 -+ - static inline int - DH_set0_pqg (DH * dh, - BIGNUM * p, -@@ -237,28 +244,29 @@ DH_set0_pqg (DH * dh, - BIGNUM * g) - { - /* If the fields p and g in d are NULL, the corresponding input -- * parameters MUST be non-NULL. q may remain NULL. -+ * parameters MUST be non-NULL. q may remain NULL. - */ -- if ((dh->p == NULL && p == NULL) -- || (dh->g == NULL && g == NULL)) -+ if ((dh->p == NULL && p == NULL) || (dh->g == NULL && g == NULL)) - return 0; - -- if (p != NULL) { -- BN_free (dh->p); -- dh->p = p; -- } -- if (q != NULL) { -- BN_free (dh->q); -- dh->q = q; -- } -- if (g != NULL) { -- BN_free (dh->g); -- dh->g = g; -- } -- -- if (q != NULL) { -+ if (p != NULL) -+ { -+ BN_free (dh->p); -+ dh->p = p; -+ } -+ if (q != NULL) -+ { -+ BN_free (dh->q); -+ dh->q = q; -+ } -+ if (g != NULL) -+ { -+ BN_free (dh->g); -+ dh->g = g; -+ } -+ -+ if (q != NULL) - dh->length = BN_num_bits (q); -- } - - return 1; - } -@@ -267,8 +275,8 @@ static inline int - DH_set_length (DH * dh, - long length) - { -- dh->length = length; -- return 1; -+ dh->length = length; -+ return 1; - } - - static inline void -@@ -295,12 +303,11 @@ tr_dh_new (const uint8_t * prime_num, - - assert (prime_num != NULL); - assert (generator_num != NULL); -+ - p = BN_bin2bn (prime_num, prime_num_length, NULL); - g = BN_bin2bn (generator_num, generator_num_length, NULL); - -- if (!check_pointer (p) || -- !check_pointer (g) || -- !DH_set0_pqg (handle, p, NULL, g)) -+ if (!check_pointer (p) || !check_pointer (g) || !DH_set0_pqg (handle, p, NULL, g)) - { - BN_free (p); - BN_free (g); -@@ -328,20 +335,19 @@ tr_dh_make_key (tr_dh_ctx_t raw_handle, - { - DH * handle = raw_handle; - int dh_size, my_public_key_length; -- const BIGNUM * hand_pub_key; -+ const BIGNUM * my_public_key; - - assert (handle != NULL); - assert (public_key != NULL); - -- - DH_set_length(handle, private_key_length * 8); - - if (!check_result (DH_generate_key (handle))) - return false; - -- DH_get0_key (handle, &hand_pub_key, NULL); -+ DH_get0_key (handle, &my_public_key, NULL); - -- my_public_key_length = BN_bn2bin (hand_pub_key, public_key); -+ my_public_key_length = BN_bn2bin (my_public_key, public_key); - dh_size = DH_size (handle); - - tr_dh_align_key (public_key, my_public_key_length, dh_size); -- cgit v0.12