From 21f886c230f730321c87b2a51f3d609bde112c35 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Mat=C3=ADas=20Fonzo?= <selk@dragora.org>
Date: Mon, 24 Dec 2018 10:56:22 -0300
Subject: [PATCH] recipes: upgrade libevent to snapshot 246f440 and tmux to
 version 2.8

---
 recipes/libs/libevent/recipe                            | 17 ++++++++++++++---
 recipes/tools/tmux/recipe                               |  2 +-
 sources/SOURCELIST.txt                                  |  4 ++--
 ...6f44041e0782f728fa5ff2d39113005a1ab02d.tar.lz.sha256 |  1 +
 sources/libevent-git8483c53-20180914.tar.lz.sha256      |  1 -
 sources/tmux-2.7.tar.gz.sha256                          |  1 -
 sources/tmux-2.8.tar.gz.sha256                          |  1 +
 7 files changed, 19 insertions(+), 8 deletions(-)
 create mode 100644 sources/libevent-246f44041e0782f728fa5ff2d39113005a1ab02d.tar.lz.sha256
 delete mode 100644 sources/libevent-git8483c53-20180914.tar.lz.sha256
 delete mode 100644 sources/tmux-2.7.tar.gz.sha256
 create mode 100644 sources/tmux-2.8.tar.gz.sha256

diff --git a/recipes/libs/libevent/recipe b/recipes/libs/libevent/recipe
index 9d5be23a..34c655f6 100644
--- a/recipes/libs/libevent/recipe
+++ b/recipes/libs/libevent/recipe
@@ -16,9 +16,10 @@
 # limitations under the License.
 
 program=libevent
-version=git8483c53-20180914
-pkgversion="$(echo $version | tr - _)"
-release=2
+version=246f44041e0782f728fa5ff2d39113005a1ab02d
+release=1
+
+pkgversion=246f440
 
 # Set 'outdir' for a nice and well-organized output directory
 outdir="${outdir}/${arch}/libs"
@@ -58,6 +59,8 @@ build()
     # Set sane permissions
     chmod -R u+w,go-w,a+rX-s .
 
+    sh ./autogen.sh
+
     ./configure CFLAGS="$QICFLAGS" LDFLAGS="$QILDFLAGS" \
      $configure_args \
      --libdir=/usr/lib${libSuffix} \
@@ -67,6 +70,14 @@ build()
     make -j${jobs} V=1
     make -j${jobs} DESTDIR="$destdir" install
 
+    # Strip remaining binaries and libraries
+    find "$destdir" -type f | xargs file | \
+     awk '/ELF/ && /executable/ || /shared object/' | \
+      cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+    find "$destdir" -type f | xargs file | awk '/current ar archive/' | \
+     cut -f 1 -d : | xargs strip --strip-debug 2> /dev/null || true
+
     # Copy documentation
     mkdir -p "${destdir}${docsdir}"
     cp -p $docs "${destdir}${docsdir}"
diff --git a/recipes/tools/tmux/recipe b/recipes/tools/tmux/recipe
index dc2cbf1f..3f768a66 100644
--- a/recipes/tools/tmux/recipe
+++ b/recipes/tools/tmux/recipe
@@ -15,7 +15,7 @@
 # limitations under the License.
 
 program=tmux
-version=2.7
+version=2.8
 release=1
 
 # Set 'outdir' for a nice and well-organized output directory
diff --git a/sources/SOURCELIST.txt b/sources/SOURCELIST.txt
index 418a9bc1..7e542e72 100644
--- a/sources/SOURCELIST.txt
+++ b/sources/SOURCELIST.txt
@@ -142,7 +142,7 @@ http://github.com/mesonbuild/meson/releases/download/0.47.2/meson-0.47.2.tar.gz
 http://github.com/ninja-build/ninja/archive/v1.8.2/ninja-1.8.2.tar.gz
 http://github.com/shadow-maint/shadow/releases/download/4.6/shadow-4.6.tar.gz
 http://github.com/skvadrik/re2c/releases/download/1.1.1/re2c-1.1.1.tar.gz
-http://github.com/tmux/tmux/releases/download/2.7/tmux-2.7.tar.gz
+http://github.com/tmux/tmux/releases/download/2.8/tmux-2.8.tar.gz
 http://github.com/vim/vim/archive/v8.1.0327/vim-8.1.0327.tar.gz
 http://github.com/westes/flex/releases/download/v2.6.4/flex-2.6.4.tar.lz
 http://github.com/williamh/espeakup/archive/v0.80/espeakup-0.80.tar.gz
@@ -179,7 +179,7 @@ http://roy.marples.name/downloads/dhcpcd/dhcpcd-7.0.8.tar.xz
 http://download.savannah.gnu.org/releases/attr/attr-2.4.48.tar.gz
 http://rsync.dragora.org/current/sources/dwm-b69c870.tar.lz
 http://rsync.dragora.org/current/sources/gpm-54651a0_dragora.tar.lz
-http://rsync.dragora.org/current/sources/libevent-git8483c53-20180914.tar.lz
+http://rsync.dragora.org/current/sources/libevent-246f44041e0782f728fa5ff2d39113005a1ab02d.tar.lz
 http://rsync.dragora.org/current/sources/perp-2.07.tar.gz
 http://rsync.dragora.org/current/sources/squashfs-tools-master.zip
 http://rsync.dragora.org/current/sources/xf86-video-intel-25c9a2fcc83ae7252a178b42262da383e59df744.tar.lz
diff --git a/sources/libevent-246f44041e0782f728fa5ff2d39113005a1ab02d.tar.lz.sha256 b/sources/libevent-246f44041e0782f728fa5ff2d39113005a1ab02d.tar.lz.sha256
new file mode 100644
index 00000000..84c8175d
--- /dev/null
+++ b/sources/libevent-246f44041e0782f728fa5ff2d39113005a1ab02d.tar.lz.sha256
@@ -0,0 +1 @@
+f2bd769a06d208d0fcc35b6070588ceeef9bb6103e1e87cec691d3787ba98fbf  libevent-246f44041e0782f728fa5ff2d39113005a1ab02d.tar.lz
diff --git a/sources/libevent-git8483c53-20180914.tar.lz.sha256 b/sources/libevent-git8483c53-20180914.tar.lz.sha256
deleted file mode 100644
index d3fa3038..00000000
--- a/sources/libevent-git8483c53-20180914.tar.lz.sha256
+++ /dev/null
@@ -1 +0,0 @@
-94361a703f9e1986b363209468a32510cac6b0175c53211818de1a8307fd85e7  libevent-git8483c53-20180914.tar.lz
diff --git a/sources/tmux-2.7.tar.gz.sha256 b/sources/tmux-2.7.tar.gz.sha256
deleted file mode 100644
index 725e0c25..00000000
--- a/sources/tmux-2.7.tar.gz.sha256
+++ /dev/null
@@ -1 +0,0 @@
-9ded7d100313f6bc5a87404a4048b3745d61f2332f99ec1400a7c4ed9485d452  tmux-2.7.tar.gz
diff --git a/sources/tmux-2.8.tar.gz.sha256 b/sources/tmux-2.8.tar.gz.sha256
new file mode 100644
index 00000000..d239d728
--- /dev/null
+++ b/sources/tmux-2.8.tar.gz.sha256
@@ -0,0 +1 @@
+7f6bf335634fafecff878d78de389562ea7f73a7367f268b66d37ea13617a2ba  tmux-2.8.tar.gz
-- 
2.11.4.GIT