[arch-commits] Commit in menu-cache/trunk (Fix-CVE-2017-8933.patch PKGBUILD)

[Balló György]

    Date: Sunday, October 15, 2017 @ 19:50:35
  Author: bgyorgy
Revision: 262992

upgpkg: menu-cache 1.0.2+17+g8c85341-1

Update to the latest git snapshot, because it contains many fixes (FS#55628)

Modified:
  menu-cache/trunk/PKGBUILD
Deleted:
  menu-cache/trunk/Fix-CVE-2017-8933.patch

-------------------------+
 Fix-CVE-2017-8933.patch |   71 ----------------------------------------------
 PKGBUILD                |   26 +++++++++-------
 2 files changed, 15 insertions(+), 82 deletions(-)

Deleted: Fix-CVE-2017-8933.patch
===================================================================
--- Fix-CVE-2017-8933.patch	2017-10-15 19:35:53 UTC (rev 262991)
+++ Fix-CVE-2017-8933.patch	2017-10-15 19:50:35 UTC (rev 262992)
@@ -1,71 +0,0 @@
-From 56f66684592abf257c4004e6e1fff041c64a12ce Mon Sep 17 00:00:00 2001
-From: Andriy Grytsenko <andrej at rep.kiev.ua>
-Date: Sun, 14 May 2017 21:28:00 +0300
-Subject: [PATCH] Fix potential access violation, use runtime user dir instead
- of tmp dir.
-
-Note: it limits libmenu-cache compatibility to menu-cached >= 0.7.0.
----
- NEWS                            | 3 +++
- libmenu-cache/menu-cache.c      | 7 ++++++-
- menu-cache-daemon/menu-cached.c | 3 +++
- 3 files changed, 12 insertions(+), 1 deletion(-)
-
-diff --git a/NEWS b/NEWS
-index f7f12e6..6177e9d 100644
---- a/NEWS
-+++ b/NEWS
-@@ -3,6 +3,9 @@
- * Added new API menu_cache_app_get_generic_name() to get generic
-     name for application.
- 
-+* Fixed potential access violation, use runtime user dir instead of tmp dir.
-+    It limits libmenu-cache compatibility to menu-cached >= 0.7.0.
-+
- 
- Changes in 1.0.2 since 1.0.1:
- 
-diff --git a/libmenu-cache/menu-cache.c b/libmenu-cache/menu-cache.c
-index 9e3e0db..d914127 100644
---- a/libmenu-cache/menu-cache.c
-+++ b/libmenu-cache/menu-cache.c
-@@ -3,7 +3,7 @@
-  *
-  *      Copyright 2008 PCMan <pcman.tw at gmail.com>
-  *      Copyright 2009 Jürgen Hötzel <juergen at archlinux.org>
-- *      Copyright 2012-2015 Andriy Grytsenko (LStranger) <andrej at rep.kiev.ua>
-+ *      Copyright 2012-2017 Andriy Grytsenko (LStranger) <andrej at rep.kiev.ua>
-  *
-  *      This library is free software; you can redistribute it and/or
-  *      modify it under the terms of the GNU Lesser General Public
-@@ -1538,8 +1538,13 @@ static void get_socket_name( char* buf, int len )
-         if(*p)
-             *p = '\0';
-     }
-+#if GLIB_CHECK_VERSION(2, 28, 0)
-+    g_snprintf( buf, len, "%s/menu-cached-%s", g_get_user_runtime_dir(),
-+                dpy ? dpy : ":0" );
-+#else
-     g_snprintf( buf, len, "%s/.menu-cached-%s-%s", g_get_tmp_dir(),
-                 dpy ? dpy : ":0", g_get_user_name() );
-+#endif
-     g_free(dpy);
- }
- 
-diff --git a/menu-cache-daemon/menu-cached.c b/menu-cache-daemon/menu-cached.c
-index a6895ee..c100484 100644
---- a/menu-cache-daemon/menu-cached.c
-+++ b/menu-cache-daemon/menu-cached.c
-@@ -473,6 +473,9 @@ static void get_socket_name( char* buf, int len )
-         if(*p)
-             *p = '\0';
-     }
-+    /* NOTE: this socket name is incompatible with versions > 1.0.2,
-+            although this function is never used since 0.7.0 but
-+            libmenu-cache always requests exact socket name instead */
-     g_snprintf( buf, len, "%s/.menu-cached-%s-%s", g_get_tmp_dir(),
-                 dpy ? dpy : ":0", g_get_user_name() );
-     g_free(dpy);
--- 
-2.1.4
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-10-15 19:35:53 UTC (rev 262991)
+++ PKGBUILD	2017-10-15 19:50:35 UTC (rev 262992)
@@ -5,26 +5,30 @@
 # Contributor: Juergen Hoetzel <juergen at archlinux.org>
 
 pkgname=menu-cache
-pkgver=1.0.2
-pkgrel=2
+pkgver=1.0.2+17+g8c85341
+pkgrel=1
 pkgdesc='Caching mechanism for freedesktop.org compliant menus'
 arch=('i686' 'x86_64')
 license=('GPL2')
 url='http://lxde.org/'
 depends=('libfm-extra')
-makedepends=('gtk-doc')
-source=(https://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.xz
-        Fix-CVE-2017-8933.patch)
-sha256sums=('6f83edf2de34f83e701dcb52145d755250a5677580cd413476cc4d7f2d2012d5'
-            'd0ee65717d07ae423bac48d0676989cec624674bdacd3619f5d9fcc64c9e5796')
+makedepends=('gtk-doc' 'git')
+_commit=8c8534159d4898935b47f9103cf32cd9b21b3df5  # master
+source=("git+https://github.com/lxde/menu-cache#commit=$_commit")
+sha256sums=('SKIP')
 
+pkgver() {
+  cd $pkgname
+  git describe --tags | sed 's/-/+/g'
+}
+
 prepare() {
-  cd $pkgname-$pkgver
-  patch -Np1 -i ../Fix-CVE-2017-8933.patch
+  cd $pkgname
+  ./autogen.sh
 }
 
 build() {
-  cd $pkgname-$pkgver
+  cd $pkgname
   ./configure --prefix=/usr --sysconfdir=/etc \
     --libexecdir=/usr/lib \
     --enable-gtk-doc
@@ -32,6 +36,6 @@
 }
 
 package() {
-  cd $pkgname-$pkgver
+  cd $pkgname
   make DESTDIR="$pkgdir" install
 }