Accepting request 563868 from X11:lxde

OBS-URL: https://build.opensuse.org/request/show/563868
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/lxterminal?expand=0&rev=30

lxterminal-0.3.0.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2a424653565f04f4459cc86756e583f3107ca90e5e81250804dced5f8236c7f9
-size 193056

lxterminal-0.3.1-return-value-unixterminal.patch

@@ -0,0 +1,21 @@
+From fa3542ae702884c59dc2a1df9da22b9b939d5db8 Mon Sep 17 00:00:00 2001
+From: Mamoru TASAKA <mtasaka@fedoraproject.org>
+Date: Wed, 8 Nov 2017 15:00:05 +0900
+Subject: [PATCH] Properly set return value for lxterminal_socket_initialize
+
+Fixes #40 #41
+---
+ src/unixsocket.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/unixsocket.c b/src/unixsocket.c
+index b813f52..1874399 100644
+--- a/src/unixsocket.c
++++ b/src/unixsocket.c
+@@ -263,5 +263,5 @@ static gboolean handle_request(GIOChannel* gio, GIOCondition condition, ClientIn
+ }
+ 
+ gboolean lxterminal_socket_initialize(LXTermWindow* lxtermwin, gint argc, gchar** argv) {
+-    init(lxtermwin, argc, argv);
++    return init(lxtermwin, argc, argv);
+ }

lxterminal-0.3.1.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cd8df387c2dd40e03b48caacf700820f9421b421954a0ed56395f505411d2c4b
+size 197628

lxterminal.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Wed Jan 10 16:32:25 UTC 2018 - kbabioch@suse.com
+
+- new upstream version 0.3.1:
+ * Fix CVE-2016-10369, a Denial-of-Service vulnerability. (boo#1038127)
+ * Fix bug that prevents changing tab name, which is introduced since 0.3.0.
+ * The keyboard shortcut can be changed by pressing key combinations.
+- added lxterminal-0.3.1-return-value-unixterminal.patch to fix compiler warnings
+
 -------------------------------------------------------------------
 Sun Dec 25 13:37:54 UTC 2016 - trcs@gmx.com
 

lxterminal.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package lxterminal
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,45 +17,46 @@
 
 
 Name:           lxterminal
-Version:        0.3.0
+Version:        0.3.1
 Release:        0
 Summary:        Lightweight LXDE Terminal
 License:        GPL-2.0
 Group:          System/GUI/LXDE
 Url:            http://www.lxde.org/
-Source0:        %name-%version.tar.xz
+Source0:        %{name}-%{version}.tar.xz
 # PATCH-FEATURE-OPENSUSE lxterminal-0.1.8-disable-f10.patch andrea@opensuse.org
 # disable f10 shortcut because yast use it
-Patch0:         %name-0.1.8-disable-f10.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+Patch0:         %{name}-0.1.8-disable-f10.patch
+Patch1:         lxterminal-0.3.1-return-value-unixterminal.patch
 BuildRequires:  docbook-utils
 BuildRequires:  docbook-xsl-stylesheets
 BuildRequires:  fdupes
 BuildRequires:  gtk2-devel
 BuildRequires:  intltool
 BuildRequires:  libxslt-devel
-BuildRequires:  pkg-config
+BuildRequires:  pkgconfig
 BuildRequires:  update-desktop-files
 BuildRequires:  vte2-devel
-Recommends:     %name-lang
+Recommends:     %{name}-lang
 
 %description
 LXTerminal is a lightweight Terminal Emulator.
 This package even if DE independent is part
 of the LXDE project.
 
-
 %lang_package
+
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure --enable-man
-%__make %{?jobs:-j%jobs} V=1
+make %{?_smp_mflags} V=1
 
 %install
-%makeinstall
+%make_install
 %suse_update_desktop_file %{name} System
 %find_lang %{name}
 %fdupes -s %{buildroot}
@@ -67,7 +68,6 @@ of the LXDE project.
 %desktop_database_postun
 
 %files
-%defattr(-,root,root,0755)
 %doc COPYING
 %{_bindir}/%{name}
 %{_datadir}/applications/lxterminal.desktop
@@ -75,8 +75,8 @@ of the LXDE project.
 %{_datadir}/lxterminal/lxterminal.conf
 %{_datadir}/lxterminal/*.ui
 %{_datadir}/icons/hicolor/128x128/apps/lxterminal.png
-%{_mandir}/man1/lxterminal.1.gz
+%{_mandir}/man1/lxterminal.1%{ext_man}
 
-%files lang -f %name.lang
+%files lang -f %{name}.lang
 
 %changelog