Hello community, here is the log from the commit of package xmms2 for openSUSE:Factory checked in at 2018-10-18 15:39:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xmms2 (Old) and /work/SRC/openSUSE:Factory/.xmms2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xmms2" Thu Oct 18 15:39:19 2018 rev:33 rq:642798 version:0.8 Changes: -------- --- /work/SRC/openSUSE:Factory/xmms2/xmms2.changes 2018-06-13 15:36:55.406007577 +0200 +++ /work/SRC/openSUSE:Factory/.xmms2.new/xmms2.changes 2018-10-18 15:39:34.766075867 +0200 @@ -1,0 +2,6 @@ +Tue Oct 9 14:52:12 UTC 2018 - Cristian RodrÃguez <[email protected]> + +- xmms-airplay-openssl11.patch: Support openssl 1.1 in airplay + plugin (upstream commit b8d1d0a1f43f652b19277c93a0eeb2d7432bc8a0) + +------------------------------------------------------------------- New: ---- xmms-airplay-openssl11.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xmms2.spec ++++++ --- /var/tmp/diff_new_pack.oA3huh/_old 2018-10-18 15:39:38.006072185 +0200 +++ /var/tmp/diff_new_pack.oA3huh/_new 2018-10-18 15:39:38.006072185 +0200 @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -63,6 +63,7 @@ # PATCH-FIX-UPSTREAM xmms2-pkgconfig.patch [email protected] -- pkg-config Version field contains illegal characters. Patch13: xmms2-pkgconfig.patch Patch14: %{name}-0.8-fixwarnings.patch +Patch17: xmms-airplay-openssl11.patch BuildRequires: SDL-devel BuildRequires: alsa-lib-devel BuildRequires: autoconf @@ -104,7 +105,7 @@ BuildRequires: sqlite-devel BuildRequires: wavpack-devel BuildRequires: pkgconfig(libxml-2.0) -BuildRequires: pkgconfig(openssl) < 1.1 +BuildRequires: pkgconfig(openssl) Requires: %{name}-plugin-base %if 0%{?suse_version} > 1325 BuildRequires: libboost_headers-devel @@ -596,7 +597,7 @@ %if 0%{?suse_version} >= 1310 %patch16 -p1 %endif - +%patch17 -p1 # unpack waf first to patch for ruby 2.2 ./waf --help &> /dev/null mv .waf-*/waflib . ++++++ xmms-airplay-openssl11.patch ++++++ Index: xmms2-0.8DrO_o/src/plugins/airplay/raop_client.c =================================================================== --- xmms2-0.8DrO_o.orig/src/plugins/airplay/raop_client.c +++ xmms2-0.8DrO_o/src/plugins/airplay/raop_client.c @@ -135,15 +135,34 @@ raop_rsa_encrypt (guchar *text, gint len 0x5e,0xf,0xc8,0x75,0x34,0x3e,0xc7,0x82,0x11,0x76,0x25,0xcd ,0xbf,0x98,0x44,0x7b}; static const guchar exp[] = {0x01, 0x00, 0x01}; + BIGNUM *n, *e; rsa = RSA_new (); - rsa->n = BN_bin2bn (mod, 256, NULL); - rsa->e = BN_bin2bn (exp, 3, NULL); + n = BN_bin2bn (mod, 256, NULL); + e = BN_bin2bn (exp, 3, NULL); + if (!rsa || !n || !e) + goto err; + #if OPENSSL_VERSION_NUMBER < 0x10100000 + rsa->n = n; + rsa->e = e; +#else + if (!RSA_set0_key(rsa, n, e, NULL)) + goto err; +#endif size = RSA_public_encrypt (len, text, res, rsa, RSA_PKCS1_OAEP_PADDING); RSA_free (rsa); return size; + +err: + if (rsa) + RSA_free(rsa); + if (n) + BN_free(n); + if (e) + BN_free(e); + return 0; } static void @@ -250,6 +269,9 @@ raop_rtsp_announce (raop_client_t *rc) gint ret = RAOP_EOK; size = raop_rsa_encrypt (rc->aes_key_str, 16, enc_aes_key); + + if (size == 0) + return RAOP_EFAIL; size = b64_encode_alloc (enc_aes_key, size, &key); g_strdelimit (key, "=", '\0');
