From c5353ab4e7736ddcacd9f206024bf2ca1eee7062 Mon Sep 17 00:00:00 2001 From: mimi89999 Date: Wed, 16 Jun 2021 21:16:32 +0200 Subject: [PATCH] temp/dino: upgrade to 9999_git20210616 (MR 2254) --- ...-Adjust-Real-for-latest-vala-version.patch | 43 ------------------- ...sal-issue-on-incoming-file-transfers.patch | 37 ---------------- temp/dino/APKBUILD | 19 ++++---- 3 files changed, 10 insertions(+), 89 deletions(-) delete mode 100644 temp/dino/0001-QLite-Adjust-Real-for-latest-vala-version.patch delete mode 100644 temp/dino/0002-Fix-file-traversal-issue-on-incoming-file-transfers.patch diff --git a/temp/dino/0001-QLite-Adjust-Real-for-latest-vala-version.patch b/temp/dino/0001-QLite-Adjust-Real-for-latest-vala-version.patch deleted file mode 100644 index 16a47facd..000000000 --- a/temp/dino/0001-QLite-Adjust-Real-for-latest-vala-version.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 3bd65e646b71321f02fa5492ce0939b8469bd262 Mon Sep 17 00:00:00 2001 -From: Marvin W -Date: Sat, 6 Mar 2021 08:31:53 -0600 -Subject: [PATCH] QLite: Adjust Real for latest vala version - ---- - qlite/src/column.vala | 10 ++++++---- - 1 file changed, 6 insertions(+), 4 deletions(-) - -diff --git a/qlite/src/column.vala b/qlite/src/column.vala -index 60125dd..45385f3 100644 ---- a/qlite/src/column.vala -+++ b/qlite/src/column.vala -@@ -96,12 +96,14 @@ public abstract class Column { - } - } - -- public class Real : Column { -- public Real(string name) { -+ public class NullableReal : Column { -+ public NullableReal(string name) { - base(name, FLOAT); - } - -- public override double get(Row row, string? table_name = DEFALT_TABLE_NAME) { -+ public override bool not_null { get { return false; } set {} } -+ -+ public override double? get(Row row, string? table_name = DEFALT_TABLE_NAME) { - return row.get_real(name, table_name == DEFALT_TABLE_NAME ? table.name : table_name); - } - -@@ -109,7 +111,7 @@ public abstract class Column { - return !row.has_real(name, table_name == DEFALT_TABLE_NAME ? table.name : table_name); - } - -- internal override void bind(Statement stmt, int index, double value) { -+ internal override void bind(Statement stmt, int index, double? value) { - stmt.bind_double(index, value); - } - } --- -2.31.1 - diff --git a/temp/dino/0002-Fix-file-traversal-issue-on-incoming-file-transfers.patch b/temp/dino/0002-Fix-file-traversal-issue-on-incoming-file-transfers.patch deleted file mode 100644 index 98c3e6fa2..000000000 --- a/temp/dino/0002-Fix-file-traversal-issue-on-incoming-file-transfers.patch +++ /dev/null @@ -1,37 +0,0 @@ -From bda2e4ead15ec9f8d043597f59ad6cdf1e8a5fe7 Mon Sep 17 00:00:00 2001 -From: fiaxh -Date: Mon, 7 Jun 2021 09:56:25 -0600 -Subject: [PATCH] Fix file traversal issue on incoming file transfers - -Fixes CVE-2021-33896 ---- - libdino/src/entity/file_transfer.vala | 13 ++++++++++++- - 1 file changed, 12 insertions(+), 1 deletion(-) - -diff --git a/libdino/src/entity/file_transfer.vala b/libdino/src/entity/file_transfer.vala -index a8e386b..1823478 100644 ---- a/libdino/src/entity/file_transfer.vala -+++ b/libdino/src/entity/file_transfer.vala -@@ -45,7 +45,18 @@ public class FileTransfer : Object { - } - } - -- public string file_name { get; set; } -+ private string file_name_; -+ public string file_name { -+ get { return file_name_; } -+ set { -+ file_name_ = Path.get_basename(value); -+ if (file_name_ == Path.DIR_SEPARATOR_S || file_name_ == ".") { -+ file_name_ = "unknown filename"; -+ } else if (file_name_.has_prefix(".")) { -+ file_name_ = "_" + file_name_; -+ } -+ } -+ } - private string? server_file_name_ = null; - public string server_file_name { - get { return server_file_name_ ?? file_name; } --- -2.31.1 - diff --git a/temp/dino/APKBUILD b/temp/dino/APKBUILD index 32804a7ba..e73a3a706 100644 --- a/temp/dino/APKBUILD +++ b/temp/dino/APKBUILD @@ -1,9 +1,9 @@ # Forked from Alpine Linux pkgname=dino -pkgver=9999_git20210115 -pkgrel=2 +pkgver=9999_git20210616 +pkgrel=0 # feature/handy branch -_commit="eb146f811904405a17251fbb66920eaf0506a6a3" +_commit="202d85779241e2088533d88a542bc5d0acfbe9ec" pkgdesc="Modern Jabber/XMPP client" url="https://dino.im" arch="all" @@ -13,11 +13,16 @@ makedepends=" glib-networking gtk+3.0-dev gpgme-dev + gspell-dev + gstreamer-dev + gst-plugins-base-dev libgee-dev libsignal-protocol-c-dev libgcrypt-dev libhandy1-dev + libnice-dev libsoup-dev + libsrtp-dev sqlite-dev libqrencode-dev cmake @@ -25,10 +30,8 @@ makedepends=" " subpackages="$pkgname-lang" source=" - https://github.com/dino/dino/archive/$_commit.tar.gz + https://github.com/mimi89999/dino/archive/$_commit.tar.gz bump-signal-version.patch - 0001-QLite-Adjust-Real-for-latest-vala-version.patch - 0002-Fix-file-traversal-issue-on-incoming-file-transfers.patch " builddir="$srcdir/$pkgname-$_commit" build() { @@ -52,8 +55,6 @@ package() { make DESTDIR="$pkgdir" install } sha512sums=" -a05c15199aae159ef03e05c4c2b97f81744f92cfaed718e2ea99043da76e68a557528e89abacf30519ae9a50e559fc0ed9f6794c5b0104b233a348695de82eea eb146f811904405a17251fbb66920eaf0506a6a3.tar.gz +1ce2b6c98a38be3736c3832396d12ef7b378b124e6bd8a3a1f12a64f80ba6142cca0c7086449cb3746c39eee0f3875c22eaff167d53842baf0dbf6fffea22db4 202d85779241e2088533d88a542bc5d0acfbe9ec.tar.gz 838ccba8d97db8bc43de26afd259e4bdaf3afea786bf40a7ed9ae63f4fb7c2190e8bf6de7b41880602113df87831d01467547f8bfd1f88b50d35287822cb5f4c bump-signal-version.patch -c2f0e5bfc8e33adefdef5efd93e86287c16600e1651b91cc43b25168d8341f72eeee55bef204f9234d018464e1003d7ae41247229688d596c355330e296e84e9 0001-QLite-Adjust-Real-for-latest-vala-version.patch -a2db353f817bad446eba263af820b74707730d1583bcb420908c45a32219e897ebff3fdd61d91dc678a250b863e7181b2525c93ca13d02fe0635ba27047d349e 0002-Fix-file-traversal-issue-on-incoming-file-transfers.patch "