packages/lxsession
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!1 lxsession: update software package

Browse Source 
Merge pull request !1 from algorithmofdish/master
This commit is contained in:
openeuler-ci-bot 2020-01-09 09:21:18 +08:00 committed by Gitee
commit 83bee1c3b8
3 changed files with 34 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
1004-Never-free-buffer-returned-by-gtk_entry_get_text.patch → 0001-Never-free-buffer-returned-by-gtk_entry_get_text.patch
View File

@ -1,12 +1,11 @@
From c3f821656bc3402308a495af7f7f1718687f84a1 Mon Sep 17 00:00:00 2001
From: Mamoru TASAKA <mtasaka@fedoraproject.org>
Date: Mon, 22 Aug 2016 15:36:52 +0900
Subject: [PATCH] Never free buffer returned by gtk_entry_get_text()
From e5efeb654c585dda622f2e8765f06f67f3230aa6 Mon Sep 17 00:00:00 2001
From: hexiujun1 <hexiujun1@huawei.com>
Date: Tue, 7 Jan 2020 14:25:59 +0800
Subject: [PATCH] Never free buffer returned by gtk_entry_get_text
Manual says that gtk_entry_get_text(entry) equals to
gtk_entry_buffer_get_text (gtk_entry_get_buffer (entry)), and
the string returned by gtk_entry_buffer_get_text() must not be
freed.
Free() of invalid pointer may not die immediately and can cause
abort/segv on next free/malloc, so calling free() on the buffer
returned by gtk_entry_get_text() here must be removed.
---
lxsession-edit/lxsession-edit.c | 1 -
1 file changed, 1 deletion(-)

20
lxsession-edit-0.5.2-fix-invalid-memcpy.patch
View File

@ -1,20 +0,0 @@
--- lxsession-0.5.2/lxsession-edit/lxsession-edit-common.c.memmove 2014-10-05 08:49:49.000000000 +0900
+++ lxsession-0.5.2/lxsession-edit/lxsession-edit-common.c 2016-02-15 19:21:23.780783021 +0900
@@ -216,7 +216,7 @@ void update_enable_state(GKeyFile* kf, g
if( strcmp(list[i], session_name) == 0 )
{
g_free(list[i]);
- memcpy( list + i, list + i + 1, (n-i) * sizeof(char*) );
+ memmove( list + i, list + i + 1, (n-i) * sizeof(char*) );
--n;
break;
}
@@ -259,7 +259,7 @@ void update_enable_state(GKeyFile* kf, g
if( strcmp(list[i], session_name) == 0 )
{
g_free(list[i]);
- memcpy( list + i, list + i + 1, (n-i) * sizeof(char*) );
+ memmove( list + i, list + i + 1, (n-i) * sizeof(char*) );
--n;
break;
}

53
lxsession.spec
View File

@ -1,30 +1,29 @@
Name: lxsession
Version: 0.5.4
Release: 1
Summary: Lightweight X11 session manager
License: GPLv2+
URL: http://lxde.sourceforge.net/
Source0: http://downloads.sourceforge.net/sourceforge/lxde/%{name}-%{version}.tar.xz
Name: lxsession
Version: 0.5.4
Release: 2
Summary: Lightweight X11 session manager
License: GPLv2+
URL: http://lxde.sourceforge.net/
Source0: http://downloads.sourceforge.net/sourceforge/lxde/%{name}-%{version}.tar.xz
Patch1000: lxsession-0.5.2-git9f8d6133-reload.patch
Patch1002: lxsession-0.5.2-notify-daemon-default.patch
Patch1003: lxsession-edit-0.5.2-fix-invalid-memcpy.patch
Patch1004: 1004-Never-free-buffer-returned-by-gtk_entry_get_text.patch
# https://github.com/lxde/lxsession/pull/10
Patch0001: 0001-Never-free-buffer-returned-by-gtk_entry_get_text.patch
# https://sourceforge.net/p/lxde/bugs/760/
Patch1000: lxsession-0.5.2-git9f8d6133-reload.patch
Patch1001: lxsession-0.5.2-notify-daemon-default.patch
BuildRequires: gtk2-devel libindicator-devel libappindicator-devel polkit-devel vala
BuildRequires: docbook-utils intltool gettext desktop-file-utils docbook-style-xsl
BuildRequires: %{_bindir}/xsltproc automake autoconf unique-devel libnotify-devel
Requires: upower
BuildRequires: gtk2-devel libindicator-devel libappindicator-devel polkit-devel vala
BuildRequires: docbook-utils intltool gettext desktop-file-utils docbook-style-xsl
BuildRequires: %{_bindir}/xsltproc automake autoconf unique-devel libnotify-devel
Requires: upower
Provides: lxsession-lite = %{version}-%{release} lxde-settings-daemon = 0.4.1-3
Obsoletes: lxsession-lite <= 0.3.6-6 lxde-settings-daemon <= 0.4.1-2
%description
A session manager is used to automatically start a set of applications and
set up a working desktop environment.Besides, LXSession has a built-in lightweight
Xsettings daemon, which can configure gtk+ themes, keyboard, and mouse for you on
set up a working desktop environment.Besides, LXSession has a built-in lightweight
Xsettings daemon, which can configure gtk+ themes, keyboard, and mouse for you on
session startup.
In gnome the Xsettings part is provided by gnome-settings-daemon.
@ -36,20 +35,19 @@ Edit pakage for lxsession.
%package -n lxpolkit
Summary: lxpolkit package for lxsession
Requires: polkit >= 0.95
Requires: polkit >= 0.95
Provides: PolicyKit-authentication-agent
%description -n lxpolkit
lxpolkit package for lxsession
%package_help
%package_help
%prep
%autosetup -n %{name}-%{version} -p1
mkdir m4 || :
sh autogen.sh
@ -72,7 +70,7 @@ desktop-file-install \
--delete-original \
--dir=%{buildroot}%{_sysconfdir}/xdg/autostart \
%{buildroot}%{_sysconfdir}/xdg/autostart/lxpolkit.desktop
desktop-file-install \
--remove-key="NotShowIn" \
--add-only-show-in="LXDE;" \
@ -93,7 +91,7 @@ desktop-file-install \
%exclude %{_bindir}/lxpolkit
%exclude %{_bindir}/%{name}-edit
%exclude %{_datadir}/%{name}/ui/lxpolkit.ui
%exclude %{_datadir}/%{name}/ui/lxsession-edit.uiiles
%exclude %{_datadir}/%{name}/ui/lxsession-edit.uiiles
%files edit
%defattr(-,root,root)
@ -109,9 +107,12 @@ desktop-file-install \
%files help
%defattr(-,root,root)
%doc ChangeLog README
%doc ChangeLog README
%{_mandir}/man1/*
%changelog
* Tue Jan 7 2020 openEuler Buildteam <buildteam@openeuler.org> - 0.5.4-2
- update software package
* Fri Nov 1 2019 openEuler Buildteam <buildteam@openeuler.org> - 0.5.4-1
- Package init