From 912fc450ef8ff6dd3489142568634cefe56687bb Mon Sep 17 00:00:00 2001
From: mid-kid <esteve.varela@gmail.com>
Date: Wed, 8 Feb 2017 17:02:09 +0100
Subject: [PATCH] Lots 'o updates

---
 satellites/android-tools.sat                  |  2 +-
 .../extrafiles/android-tools/fix_core.patch   | 25 ++-----
 ...upport.patch => i3-4.13-iconsupport.patch} | 74 +++++++------------
 .../i3status-2.10-optional-pulseaudio.patch   | 46 ------------
 .../i3status-2.11-disable-pulseaudio.patch    | 23 ++++++
 ...aemon-6.31-fix-filenames-with-spaces.patch |  5 +-
 satellites/i3.sat                             |  4 +-
 satellites/i3status.sat                       | 10 +--
 satellites/iucode-tool.sat                    |  4 +-
 satellites/libxkbcommon.sat                   |  4 +-
 satellites/lua.sat                            |  4 +-
 satellites/profile-sync-daemon.sat            |  4 +-
 satellites/python3-cryptodome.sat             |  4 +-
 satellites/python3-requests.sat               |  4 +-
 satellites/qbittorrent.sat                    |  2 +-
 satellites/qt5-base.sat                       |  6 +-
 satellites/qt5-tools.sat                      |  6 +-
 satellites/radare2-git.sat                    | 24 ------
 satellites/radare2.sat                        |  1 +
 satellites/rofi.sat                           |  4 +-
 satellites/streamlink.sat                     |  4 +-
 satellites/youtube-dl.sat                     |  4 +-
 22 files changed, 90 insertions(+), 174 deletions(-)
 rename satellites/extrafiles/i3/{iconsupport.patch => i3-4.13-iconsupport.patch} (77%)
 delete mode 100644 satellites/extrafiles/i3status/i3status-2.10-optional-pulseaudio.patch
 create mode 100644 satellites/extrafiles/i3status/i3status-2.11-disable-pulseaudio.patch
 delete mode 100644 satellites/radare2-git.sat

diff --git a/satellites/android-tools.sat b/satellites/android-tools.sat
index 3d69207..a6523da 100644
--- a/satellites/android-tools.sat
+++ b/satellites/android-tools.sat
@@ -15,7 +15,7 @@ extrafile 'fix_core.patch'
 header_end
 
 ( cd core
-    patch -p1 -i ../fix_core.patch
+    patch -p0 -i ../fix_core.patch
 )
 
 make \
diff --git a/satellites/extrafiles/android-tools/fix_core.patch b/satellites/extrafiles/android-tools/fix_core.patch
index ab913b4..1b1d5a4 100644
--- a/satellites/extrafiles/android-tools/fix_core.patch
+++ b/satellites/extrafiles/android-tools/fix_core.patch
@@ -1,7 +1,4 @@
-diff --git a/adb/adb_client.h b/adb/adb_client.h
-index 9f9eb1f..5355ade 100644
---- a/adb/adb_client.h
-+++ b/adb/adb_client.h
++++ adb/adb_client.h
 @@ -25,8 +25,8 @@
  
  // Connect to adb, connect to the named service, and return a valid fd for
@@ -61,10 +58,7 @@ index 9f9eb1f..5355ade 100644
 +bool adb_get_feature_set(FeatureSet* feature_set, std::string* error);
  
  #endif
-diff --git a/base/errors_unix.cpp b/base/errors_unix.cpp
-index 296995e..3b983d3 100644
---- a/base/errors_unix.cpp
-+++ b/base/errors_unix.cpp
++++ base/errors_unix.cpp
 @@ -17,6 +17,7 @@
  #include "android-base/errors.h"
  
@@ -73,10 +67,7 @@ index 296995e..3b983d3 100644
  
  namespace android {
  namespace base {
-diff --git a/base/file.cpp b/base/file.cpp
-index da1adba..aed93d6 100644
---- a/base/file.cpp
-+++ b/base/file.cpp
++++ base/file.cpp
 @@ -21,7 +21,7 @@
  #include <sys/stat.h>
  #include <sys/types.h>
@@ -86,10 +77,7 @@ index da1adba..aed93d6 100644
  
  #include "android-base/macros.h"  // For TEMP_FAILURE_RETRY on Darwin.
  #include "android-base/utf8.h"
-diff --git a/base/logging.cpp b/base/logging.cpp
-index 1741871..a80cae9 100644
---- a/base/logging.cpp
-+++ b/base/logging.cpp
++++ base/logging.cpp
 @@ -32,7 +32,7 @@
  #include <iostream>
  #include <limits>
@@ -99,10 +87,7 @@ index 1741871..a80cae9 100644
  #include <utility>
  #include <vector>
  
-diff --git a/fastboot/socket.h b/fastboot/socket.h
-index de543db..b53d2b0 100644
---- a/fastboot/socket.h
-+++ b/fastboot/socket.h
++++ fastboot/socket.h
 @@ -41,7 +41,6 @@
  
  #include <android-base/macros.h>
diff --git a/satellites/extrafiles/i3/iconsupport.patch b/satellites/extrafiles/i3/i3-4.13-iconsupport.patch
similarity index 77%
rename from satellites/extrafiles/i3/iconsupport.patch
rename to satellites/extrafiles/i3/i3-4.13-iconsupport.patch
index c128c55..d006074 100644
--- a/satellites/extrafiles/i3/iconsupport.patch
+++ b/satellites/extrafiles/i3/i3-4.13-iconsupport.patch
@@ -1,6 +1,4 @@
-diff -Nurp ../i3-4.13/include/atoms_rest.xmacro ./include/atoms_rest.xmacro
---- ../i3-4.13/include/atoms_rest.xmacro	2016-11-08 19:54:01.000000000 +0100
-+++ ./include/atoms_rest.xmacro	2016-11-13 14:14:05.086086381 +0100
++++ include/atoms_rest.xmacro
 @@ -1,6 +1,7 @@
  xmacro(_NET_WM_USER_TIME)
  xmacro(_NET_STARTUP_ID)
@@ -9,10 +7,8 @@ diff -Nurp ../i3-4.13/include/atoms_rest.xmacro ./include/atoms_rest.xmacro
  xmacro(WM_PROTOCOLS)
  xmacro(WM_DELETE_WINDOW)
  xmacro(UTF8_STRING)
-diff -Nurp ../i3-4.13/include/data.h ./include/data.h
---- ../i3-4.13/include/data.h	2016-11-08 19:54:01.000000000 +0100
-+++ ./include/data.h	2016-11-13 14:40:42.765019561 +0100
-@@ -440,6 +440,11 @@ struct Window {
++++ include/data.h
+@@ -440,6 +440,11 @@
  
      /* aspect ratio from WM_NORMAL_HINTS (MPlayer uses this for example) */
      double aspect_ratio;
@@ -24,10 +20,8 @@ diff -Nurp ../i3-4.13/include/data.h ./include/data.h
  };
  
  /**
-diff -Nurp ../i3-4.13/include/libi3.h ./include/libi3.h
---- ../i3-4.13/include/libi3.h	2016-11-08 19:54:01.000000000 +0100
-+++ ./include/libi3.h	2016-11-13 14:40:49.707019271 +0100
-@@ -586,6 +586,11 @@ color_t draw_util_hex_to_color(const cha
++++ include/libi3.h
+@@ -586,6 +586,11 @@
  void draw_util_text(i3String *text, surface_t *surface, color_t fg_color, color_t bg_color, int x, int y, int max_width);
  
  /**
@@ -39,10 +33,8 @@ diff -Nurp ../i3-4.13/include/libi3.h ./include/libi3.h
   * Draws a filled rectangle.
   * This function is a convenience wrapper and takes care of flushing the
   * surface as well as restoring the cairo state.
-diff -Nurp ../i3-4.13/include/window.h ./include/window.h
---- ../i3-4.13/include/window.h	2016-11-08 19:54:01.000000000 +0100
-+++ ./include/window.h	2016-11-13 14:14:05.088086381 +0100
-@@ -89,3 +89,9 @@ void window_update_hints(i3Window *win,
++++ include/window.h
+@@ -89,3 +89,9 @@
   *
   */
  void window_update_motif_hints(i3Window *win, xcb_get_property_reply_t *prop, border_style_t *motif_border_style);
@@ -52,10 +44,8 @@ diff -Nurp ../i3-4.13/include/window.h ./include/window.h
 + *
 + */
 +void window_update_icon(i3Window *win, xcb_get_property_reply_t *prop);
-diff -Nurp ../i3-4.13/libi3/draw_util.c ./libi3/draw_util.c
---- ../i3-4.13/libi3/draw_util.c	2016-11-08 19:54:01.000000000 +0100
-+++ ./libi3/draw_util.c	2016-11-13 14:44:55.628008986 +0100
-@@ -135,6 +135,41 @@ void draw_util_text(i3String *text, surf
++++ libi3/draw_util.c
+@@ -135,6 +135,41 @@
      cairo_surface_mark_dirty(surface->surface);
  }
  
@@ -97,10 +87,8 @@ diff -Nurp ../i3-4.13/libi3/draw_util.c ./libi3/draw_util.c
  /**
   * Draws a filled rectangle.
   * This function is a convenience wrapper and takes care of flushing the
-diff -Nurp ../i3-4.13/src/handlers.c ./src/handlers.c
---- ../i3-4.13/src/handlers.c	2016-11-08 19:54:01.000000000 +0100
-+++ ./src/handlers.c	2016-11-13 14:36:19.002030592 +0100
-@@ -1287,6 +1287,20 @@ static bool handle_strut_partial_change(
++++ src/handlers.c
+@@ -1287,6 +1287,20 @@
      return true;
  }
  
@@ -121,7 +109,7 @@ diff -Nurp ../i3-4.13/src/handlers.c ./src/handlers.c
  /* Returns false if the event could not be processed (e.g. the window could not
   * be found), true otherwise */
  typedef bool (*cb_property_handler_t)(void *data, xcb_connection_t *c, uint8_t state, xcb_window_t window, xcb_atom_t atom, xcb_get_property_reply_t *property);
-@@ -1308,7 +1322,8 @@ static struct property_handler_t propert
+@@ -1308,7 +1322,8 @@
      {0, 128, handle_class_change},
      {0, UINT_MAX, handle_strut_partial_change},
      {0, UINT_MAX, handle_window_type},
@@ -131,7 +119,7 @@ diff -Nurp ../i3-4.13/src/handlers.c ./src/handlers.c
  #define NUM_HANDLERS (sizeof(property_handlers) / sizeof(struct property_handler_t))
  
  /*
-@@ -1330,6 +1345,7 @@ void property_handlers_init(void) {
+@@ -1330,6 +1345,7 @@
      property_handlers[8].atom = A__NET_WM_STRUT_PARTIAL;
      property_handlers[9].atom = A__NET_WM_WINDOW_TYPE;
      property_handlers[10].atom = A__MOTIF_WM_HINTS;
@@ -139,10 +127,8 @@ diff -Nurp ../i3-4.13/src/handlers.c ./src/handlers.c
  }
  
  static void property_notify(uint8_t state, xcb_window_t window, xcb_atom_t atom) {
-diff -Nurp ../i3-4.13/src/manage.c ./src/manage.c
---- ../i3-4.13/src/manage.c	2016-11-08 19:54:01.000000000 +0100
-+++ ./src/manage.c	2016-11-13 14:14:05.090086380 +0100
-@@ -91,6 +91,8 @@ void manage_window(xcb_window_t window,
++++ src/manage.c
+@@ -91,6 +91,8 @@
          role_cookie, startup_id_cookie, wm_hints_cookie,
          wm_normal_hints_cookie, motif_wm_hints_cookie, wm_user_time_cookie, wm_desktop_cookie;
  
@@ -151,7 +137,7 @@ diff -Nurp ../i3-4.13/src/manage.c ./src/manage.c
      geomc = xcb_get_geometry(conn, d);
  
      /* Check if the window is mapped (it could be not mapped when intializing and
-@@ -162,6 +164,7 @@ void manage_window(xcb_window_t window,
+@@ -162,6 +164,7 @@
      motif_wm_hints_cookie = GET_PROPERTY(A__MOTIF_WM_HINTS, 5 * sizeof(uint64_t));
      wm_user_time_cookie = GET_PROPERTY(A__NET_WM_USER_TIME, UINT32_MAX);
      wm_desktop_cookie = GET_PROPERTY(A__NET_WM_DESKTOP, UINT32_MAX);
@@ -159,7 +145,7 @@ diff -Nurp ../i3-4.13/src/manage.c ./src/manage.c
  
      DLOG("Managing window 0x%08x\n", window);
  
-@@ -177,6 +180,7 @@ void manage_window(xcb_window_t window,
+@@ -177,6 +180,7 @@
      window_update_class(cwindow, xcb_get_property_reply(conn, class_cookie, NULL), true);
      window_update_name_legacy(cwindow, xcb_get_property_reply(conn, title_cookie, NULL), true);
      window_update_name(cwindow, xcb_get_property_reply(conn, utf8_title_cookie, NULL), true);
@@ -167,7 +153,7 @@ diff -Nurp ../i3-4.13/src/manage.c ./src/manage.c
      window_update_leader(cwindow, xcb_get_property_reply(conn, leader_cookie, NULL));
      window_update_transient_for(cwindow, xcb_get_property_reply(conn, transient_cookie, NULL));
      window_update_strut_partial(cwindow, xcb_get_property_reply(conn, strut_cookie, NULL));
-@@ -185,6 +189,8 @@ void manage_window(xcb_window_t window,
+@@ -185,6 +189,8 @@
      window_update_hints(cwindow, xcb_get_property_reply(conn, wm_hints_cookie, NULL), &urgency_hint);
      border_style_t motif_border_style = BS_NORMAL;
      window_update_motif_hints(cwindow, xcb_get_property_reply(conn, motif_wm_hints_cookie, NULL), &motif_border_style);
@@ -176,10 +162,8 @@ diff -Nurp ../i3-4.13/src/manage.c ./src/manage.c
      xcb_size_hints_t wm_size_hints;
      if (!xcb_icccm_get_wm_size_hints_reply(conn, wm_normal_hints_cookie, &wm_size_hints, NULL))
          memset(&wm_size_hints, '\0', sizeof(xcb_size_hints_t));
-diff -Nurp ../i3-4.13/src/render.c ./src/render.c
---- ../i3-4.13/src/render.c	2016-11-08 19:54:01.000000000 +0100
-+++ ./src/render.c	2016-11-13 14:26:45.732054568 +0100
-@@ -125,6 +125,10 @@ void render_con(Con *con, bool render_fu
++++ src/render.c
+@@ -125,6 +125,10 @@
      /* find the height for the decorations */
      params.deco_height = render_deco_height();
  
@@ -190,10 +174,8 @@ diff -Nurp ../i3-4.13/src/render.c ./src/render.c
      /* precalculate the sizes to be able to correct rounding errors */
      params.sizes = precalculate_sizes(con, &params);
  
-diff -Nurp ../i3-4.13/src/window.c ./src/window.c
---- ../i3-4.13/src/window.c	2016-11-08 19:54:01.000000000 +0100
-+++ ./src/window.c	2016-11-13 14:48:01.177001226 +0100
-@@ -17,6 +17,7 @@ void window_free(i3Window *win) {
++++ src/window.c
+@@ -17,6 +17,7 @@
      FREE(win->class_class);
      FREE(win->class_instance);
      i3string_free(win->name);
@@ -201,7 +183,7 @@ diff -Nurp ../i3-4.13/src/window.c ./src/window.c
      FREE(win->ran_assignments);
      FREE(win);
  }
-@@ -365,3 +366,62 @@ void window_update_motif_hints(i3Window
+@@ -365,3 +366,62 @@
  #undef MWM_DECOR_BORDER
  #undef MWM_DECOR_TITLE
  }
@@ -264,10 +246,8 @@ diff -Nurp ../i3-4.13/src/window.c ./src/window.c
 +
 +    FREE(prop);
 +}
-diff -Nurp ../i3-4.13/src/x.c ./src/x.c
---- ../i3-4.13/src/x.c	2016-11-08 19:54:01.000000000 +0100
-+++ ./src/x.c	2016-11-13 14:48:26.856000152 +0100
-@@ -538,6 +538,7 @@ void x_draw_decoration(Con *con) {
++++ src/x.c
+@@ -538,6 +538,7 @@
  
      /* 6: draw the title */
      int text_offset_y = (con->deco_rect.height - config.font.height) / 2;
@@ -275,7 +255,7 @@ diff -Nurp ../i3-4.13/src/x.c ./src/x.c
  
      struct Window *win = con->window;
      if (win == NULL) {
-@@ -567,6 +568,9 @@ void x_draw_decoration(Con *con) {
+@@ -567,6 +568,9 @@
      if (win->name == NULL)
          goto copy_pixmaps;
  
@@ -285,7 +265,7 @@ diff -Nurp ../i3-4.13/src/x.c ./src/x.c
      int mark_width = 0;
      if (config.show_marks && !TAILQ_EMPTY(&(con->marks_head))) {
          char *formatted_mark = sstrdup("");
-@@ -602,12 +606,30 @@ void x_draw_decoration(Con *con) {
+@@ -602,12 +606,30 @@
      i3String *title = con->title_format == NULL ? win->name : con_parse_title_format(con);
      draw_util_text(title, &(parent->frame_buffer),
                     p->color->text, p->color->background,
diff --git a/satellites/extrafiles/i3status/i3status-2.10-optional-pulseaudio.patch b/satellites/extrafiles/i3status/i3status-2.10-optional-pulseaudio.patch
deleted file mode 100644
index b1297a0..0000000
--- a/satellites/extrafiles/i3status/i3status-2.10-optional-pulseaudio.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-+++ Makefile
-@@ -12,6 +12,10 @@
-   endif
- endif
- 
-+ifndef WITH_PULSEAUDIO
-+  WITH_PULSEAUDIO=yes
-+endif
-+
- CFLAGS+=-Wall -Wshadow -Wpointer-arith -Wcast-qual -Wsign-compare
- CFLAGS+=-g
- CFLAGS+=-std=gnu99
-@@ -21,8 +25,8 @@
- CFLAGS+=-Iinclude
- LIBS+=-lconfuse
- LIBS+=-lyajl
--LIBS+=-lpulse
- LIBS+=-lm
-+LIBS+=-lpulse
- 
- VERSION=2.10
- GIT_VERSION="2.10 (2016-01-01)"
-@@ -75,6 +79,13 @@
- LIBS:=$(filter-out -lpulse, $(LIBS)) -lpthread
- endif
- 
-+ifeq ($(WITH_PULSEAUDIO),yes)
-+CFLAGS+=-DWITH_PULSEAUDIO
-+else
-+OBJS:=$(filter-out src/pulse.o, $(OBJS))
-+LIBS:=$(filter-out -lpulse, $(LIBS))
-+endif
-+
- src/%.o: src/%.c include/i3status.h
- 	$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
- 	@echo " CC $<"
-+++ src/print_volume.c
-@@ -60,7 +60,7 @@
-         free(instance);
-     }
- 
--#ifndef __OpenBSD__
-+#if !defined(__OpenBSD__) && defined(WITH_PULSEAUDIO)
-     /* Try PulseAudio first */
- 
-     /* If the device name has the format "pulse[:N]" where N is the
diff --git a/satellites/extrafiles/i3status/i3status-2.11-disable-pulseaudio.patch b/satellites/extrafiles/i3status/i3status-2.11-disable-pulseaudio.patch
new file mode 100644
index 0000000..2944dad
--- /dev/null
+++ b/satellites/extrafiles/i3status/i3status-2.11-disable-pulseaudio.patch
@@ -0,0 +1,23 @@
++++ Makefile
+@@ -79,10 +79,8 @@
+ OBJS:=$(sort $(wildcard src/*.c *.c))
+ OBJS:=$(OBJS:.c=.o)
+ 
+-ifeq ($(OS),OpenBSD)
+ OBJS:=$(filter-out src/pulse.o, $(OBJS))
+ LIBS:=$(filter-out -lpulse, $(LIBS))
+-endif
+ 
+ src/%.o: src/%.c include/i3status.h
+ 	$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
++++ src/print_volume.c
+@@ -61,7 +61,8 @@
+         free(instance);
+     }
+ 
+-#ifndef __OpenBSD__
++#define NO
++#ifndef NO
+     /* Try PulseAudio first */
+ 
+     /* If the device name has the format "pulse[:N]" where N is the
diff --git a/satellites/extrafiles/profile-sync-daemon/profile-sync-daemon-6.31-fix-filenames-with-spaces.patch b/satellites/extrafiles/profile-sync-daemon/profile-sync-daemon-6.31-fix-filenames-with-spaces.patch
index 415a041..ed5f620 100644
--- a/satellites/extrafiles/profile-sync-daemon/profile-sync-daemon-6.31-fix-filenames-with-spaces.patch
+++ b/satellites/extrafiles/profile-sync-daemon/profile-sync-daemon-6.31-fix-filenames-with-spaces.patch
@@ -1,7 +1,4 @@
-diff --git a/common/profile-sync-daemon.in b/common/profile-sync-daemon.in
-index 4e83af6..3a8d5d7 100644
---- a/common/profile-sync-daemon.in
-+++ b/common/profile-sync-daemon.in
++++ common/profile-sync-daemon.in
 @@ -310,14 +310,18 @@ cleanup() {
      load_env_for "$browser"
      for item in "${DIRArr[@]}"; do
diff --git a/satellites/i3.sat b/satellites/i3.sat
index 440cd48..fc84424 100644
--- a/satellites/i3.sat
+++ b/satellites/i3.sat
@@ -10,13 +10,13 @@ dlextract "http://i3wm.org/downloads/$name-$version.tar.bz2" \
           '08d17dcf1fde665a15f7d411486546ae'
 
 if option window-icons; then
-    extrafile 'iconsupport.patch'
+    extrafile "$name-$version-iconsupport.patch"
 fi
 header_end
 
 cd "$name-$version"
 
-option window-icons patch -p1 -i ../iconsupport.patch
+option window-icons patch -p0 -i "../$name-$version-iconsupport.patch"
 
 compile_configure -b build -- --srcdir=..
 
diff --git a/satellites/i3status.sat b/satellites/i3status.sat
index d6fa404..9eaefdb 100644
--- a/satellites/i3status.sat
+++ b/satellites/i3status.sat
@@ -1,23 +1,23 @@
 name=i3status
-version=2.10
+version=2.11
 update_url="https://i3wm.org/$name/"
 
 define_option 'pulseaudio: Add pulseaudio support'
 
 dlextract "https://i3wm.org/$name/$name-$version.tar.bz2" \
-          '1121f7c1c193c873982aba22668398ef'
-extrafile "$name-$version-optional-pulseaudio.patch"
+          'a5c0a364d917ffc57c42af3f6936e700'
+extrafile "$name-$version-disable-pulseaudio.patch"
 header_end
 
 cd "$name-$version"
 
-patch -p0 -i "../$name-$version-optional-pulseaudio.patch"
+option !pulseaudio patch -p0 -i "../$name-$version-disable-pulseaudio.patch"
 
 # Fix paths
 sed -i -e "/install -m/s/bin/$(safe_sed "$dir_bindir")/" \
        -e "/install -m/s/share\/man/$(safe_sed "$dir_mandir")/" Makefile
 
-make WITH_PULSEAUDIO=$(option pulseaudio && echo yes || echo no)
+make
 make install \
     PREFIX="/$dir_prefix" \
     SYSCONFDIR="/$dir_prefix/$dir_sysconfdir" \
diff --git a/satellites/iucode-tool.sat b/satellites/iucode-tool.sat
index c739dce..07ea94d 100644
--- a/satellites/iucode-tool.sat
+++ b/satellites/iucode-tool.sat
@@ -1,11 +1,11 @@
 import 'compile/configure'
 
 name=iucode-tool
-version=2.1
+version=2.1.1
 update_url="https://gitlab.com/$name/releases/tree/master"
 
 dlextract "https://gitlab.com/$name/releases/raw/master/${name}_$version.tar.xz" \
-          '636bdfb7d87a1022a5035a4f82b2ac38'
+          '306d20b43da847812af4bf973f46045d'
 header_end
 
 cd "$name-$version"
diff --git a/satellites/libxkbcommon.sat b/satellites/libxkbcommon.sat
index f393fb0..e930751 100644
--- a/satellites/libxkbcommon.sat
+++ b/satellites/libxkbcommon.sat
@@ -1,11 +1,11 @@
 import 'compile/configure'
 
 name=libxkbcommon
-version=0.7.0
+version=0.7.1
 update_url='http://xkbcommon.org/'
 
 dlextract "http://xkbcommon.org/download/$name-$version.tar.xz" \
-          '61ba550fc529ea4d6f9faa2cad62c95f'
+          '947ba609cb0239b9462127d5cf8908ee'
 header_end
 
 cd "$name-$version"
diff --git a/satellites/lua.sat b/satellites/lua.sat
index 3637154..b478b46 100644
--- a/satellites/lua.sat
+++ b/satellites/lua.sat
@@ -1,10 +1,10 @@
 name=lua
 majver=5.3
-version=$majver.3
+version=$majver.4
 update_url="http://www.lua.org/download.html"
 
 dlextract "http://www.lua.org/ftp/$name-$version.tar.gz" \
-          '703f75caa4fdf4a911c1a72e67a27498'
+          '53a9c68bcc0eda58bdc2095ad5cdfc63'
 header_end
 
 cd "$name-$version"
diff --git a/satellites/profile-sync-daemon.sat b/satellites/profile-sync-daemon.sat
index 58eb3ec..9c77db0 100644
--- a/satellites/profile-sync-daemon.sat
+++ b/satellites/profile-sync-daemon.sat
@@ -4,11 +4,11 @@ update_url="https://github.com/graysky2/$name/releases"
 
 dlextract "https://github.com/graysky2/$name/archive/v$version.tar.gz" \
           '159cabc39972be8d72e760a0025b5cd9'
-extrafile 'profile-sync-daemon-6.31-fix-filenames-with-spaces.patch'
+extrafile "$name-$version-fix-filenames-with-spaces.patch"
 header_end
 
 cd "$name-$version"
-patch -p1 -i ../profile-sync-daemon-6.31-fix-filenames-with-spaces.patch
+patch -p0 -i "../$name-$version-fix-filenames-with-spaces.patch"
 
 make install-bin install-man COMPRESS_MAN=0 \
     DESTDIR="$dir_install" \
diff --git a/satellites/python3-cryptodome.sat b/satellites/python3-cryptodome.sat
index 25aee62..c62b0e8 100644
--- a/satellites/python3-cryptodome.sat
+++ b/satellites/python3-cryptodome.sat
@@ -1,11 +1,11 @@
 import 'compile/python'
 
 name=pycryptodome
-version=3.4.3
+version=3.4.4
 update_url="https://github.com/Legrandin/$name/releases"
 
 dlextract "https://github.com/Legrandin/$name/archive/v$version.tar.gz" \
-          'e3993dd919c22a97d0bdc4ce8f58cdb2'
+          '00ed7ff323d91806b43f756389503dd3'
 header_end
 
 cd "$name-$version"
diff --git a/satellites/python3-requests.sat b/satellites/python3-requests.sat
index 53955b1..075a7db 100644
--- a/satellites/python3-requests.sat
+++ b/satellites/python3-requests.sat
@@ -1,11 +1,11 @@
 import 'compile/python'
 
 name=requests
-version=2.12.4
+version=2.13.0
 update_url="https://github.com/kennethreitz/$name/releases"
 
 dlextract "https://github.com/kennethreitz/$name/archive/v$version.tar.gz" \
-          '0b7637c9a9e8b02d2258c91841d049f2'
+          '94ad79c2e57917aca999308b1fb4cbb4'
 header_end
 
 cd "$name-$version"
diff --git a/satellites/qbittorrent.sat b/satellites/qbittorrent.sat
index 1544a87..f1cc3e9 100644
--- a/satellites/qbittorrent.sat
+++ b/satellites/qbittorrent.sat
@@ -2,7 +2,7 @@ import 'compile/configure'
 
 name=qbittorrent
 version=3.3.10
-update_url='http://www.qbittorrent.org/download.php'
+update_url='https://www.qbittorrent.org/download.php'
 
 define_option '!qt4: Build for Qt4 instead of Qt5'
 
diff --git a/satellites/qt5-base.sat b/satellites/qt5-base.sat
index 45cf193..525caf4 100644
--- a/satellites/qt5-base.sat
+++ b/satellites/qt5-base.sat
@@ -1,7 +1,7 @@
 name=qt5
 submodule=base
-majver=5.7
-version=$majver.1
+majver=5.8
+version=$majver.0
 update_url='https://www.qt.io/download-open-source/'
 update_names="qt-everywhere-opensource-src-$version.tar.gz"
 
@@ -11,7 +11,7 @@ for opt in $optional_libraries; do
 done
 
 dlextract "http://download.qt.io/official_releases/qt/$majver/$version/submodules/qt$submodule-opensource-src-$version.tar.xz" \
-          'f0809befe04160fbb73bbf38a06a2073'
+          '6e1f7f6fb6333eb66e563b175c4e87e9'
 header_end
 
 cd "qt$submodule-opensource-src-$version"
diff --git a/satellites/qt5-tools.sat b/satellites/qt5-tools.sat
index 599d683..1147ce6 100644
--- a/satellites/qt5-tools.sat
+++ b/satellites/qt5-tools.sat
@@ -2,13 +2,13 @@ import 'compile/qt'
 
 name=qt5
 submodule=tools
-majver=5.7
-version=$majver.1
+majver=5.8
+version=$majver.0
 update_url='https://www.qt.io/download-open-source/'
 update_names="qt-everywhere-opensource-src-$version.tar.gz"
 
 dlextract "http://download.qt.io/official_releases/qt/$majver/$version/submodules/qt$submodule-opensource-src-$version.tar.xz" \
-          '74b74b9e354368fea6635e2166a9c481'
+          '506e53a228fe0c3d6c8b6fbebd8e47ae'
 header_end
 
 cd "qt$submodule-opensource-src-$version"
diff --git a/satellites/radare2-git.sat b/satellites/radare2-git.sat
deleted file mode 100644
index b668e59..0000000
--- a/satellites/radare2-git.sat
+++ /dev/null
@@ -1,24 +0,0 @@
-# Build with the included version of capstone due to it using a newer version and includes patches for it.
-# It also contains a patched libmagic which is incompatible with most systems.
-
-import 'vcs/git'
-import 'compile/configure'
-
-name=radare2
-
-vcs_git "https://github.com/radare/$name"
-header_end
-
-cd "$name"
-
-# Radare2 now uses acr instead of autoconf.
-# However, it tries to be full-compatible, so I hope it'll stay that way.
-
-# There's just one little thing...
-
-# Fix paths
-sed -i -e "s/\${DATADIR}\/doc/$(safe_sed "/$dir_prefix/$dir_docdir")/" Makefile
-
-compile_configure -- --with-syszip
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/radare2.sat b/satellites/radare2.sat
index b08cbf2..3aabeab 100644
--- a/satellites/radare2.sat
+++ b/satellites/radare2.sat
@@ -6,6 +6,7 @@ import 'compile/configure'
 name=radare2
 version=1.2.0
 update_url='http://rada.re/r/down.html'
+update_names="$name-$version.tar.gz\">$name"
 
 dlextract "http://cloud.radare.org/get/$version/$name-$version.tar.gz" \
           'a463cfd727f31d235afec80ab000345c'
diff --git a/satellites/rofi.sat b/satellites/rofi.sat
index 02004bd..99450c8 100644
--- a/satellites/rofi.sat
+++ b/satellites/rofi.sat
@@ -1,11 +1,11 @@
 import 'compile/configure'
 
 name=rofi
-version=1.3.0
+version=1.3.1
 update_url="https://github.com/DaveDavenport/$name/releases"
 
 dlextract "https://github.com/DaveDavenport/$name/releases/download/$version/$name-$version.tar.xz" \
-          '36ad3cf3cb4c4ec4894ff9b5fbcf4ba6'
+          'c1b0e12686cea1dab112586b0b1a5257'
 header_end
 
 cd "$name-$version"
diff --git a/satellites/streamlink.sat b/satellites/streamlink.sat
index 645ccf5..1bab229 100644
--- a/satellites/streamlink.sat
+++ b/satellites/streamlink.sat
@@ -1,11 +1,11 @@
 import 'compile/python'
 
 name=streamlink
-version=0.2.0
+version=0.3.1
 update_url="https://github.com/$name/$name/releases"
 
 dlextract "https://github.com/$name/$name/releases/download/$version/$name-$version.tar.gz" \
-          'fb3139f68f9c4808a591c8cffa7c180a'
+          '49ac6092941e3a92ed0540548af3112f'
 header_end
 
 cd "$name-$version"
diff --git a/satellites/youtube-dl.sat b/satellites/youtube-dl.sat
index c85ab0f..2a1d4a6 100644
--- a/satellites/youtube-dl.sat
+++ b/satellites/youtube-dl.sat
@@ -1,11 +1,11 @@
 import 'compile/python'
 
 name=youtube-dl
-version=2017.01.02
+version=2017.02.01
 update_url="http://rg3.github.io/$name/download.html"
 
 dlextract "https://yt-dl.org/downloads/$version/$name-$version.tar.gz" \
-          '254a2732d41ac82e7e3ee75181789082'
+          '38f159d4aa41583786907be6d2e05053'
 header_end
 
 cd "$name"