[gentoo-commits] repo/gentoo:master commit in: x11-misc/slim/files/, x11-misc/slim/
commit: 6c6f4d7ae3a6eb8e0fcf2606ff87329291f17bb9
Author: Joonas Niilola gentoo org>
AuthorDate: Mon May 29 06:11:26 2023 +
Commit: Joonas Niilola gentoo org>
CommitDate: Mon May 29 06:11:35 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c6f4d7a
x11-misc/slim: drop 1.3.6-r5, 1.3.9
Bug: https://bugs.gentoo.org/906312
Signed-off-by: Joonas Niilola gentoo.org>
x11-misc/slim/Manifest | 2 -
x11-misc/slim/files/slim-1.3.5-arm.patch | 11 --
.../files/slim-1.3.5-disable-ck-for-systemd.patch | 122 ---
.../files/slim-1.3.6-add-missing-libgen_h.patch| 11 --
x11-misc/slim/files/slim-1.3.6-config.diff | 77
x11-misc/slim/files/slim-1.3.6-drop-zlib.patch | 10 --
.../slim-1.3.6-envcpy-bad-pointer-arithmetic.patch | 15 ---
.../files/slim-1.3.6-fix-slimlock-nopam-v2.patch | 26
x11-misc/slim/files/slim-1.3.6-freetype.patch | 12 --
x11-misc/slim/files/slim-1.3.6-gcc11.patch | 12 --
x11-misc/slim/files/slim-1.3.6-honour-cflags.patch | 14 ---
.../files/slim-1.3.6-libslim-cmake-fixes.patch | 33 -
.../slim/files/slim-1.3.6-session-chooser.patch| 115 --
.../slim-1.3.6-strip-systemd-unit-install.patch| 13 --
.../slim/files/slim-1.3.6-systemd-session.patch| 29 -
x11-misc/slim/files/slim-1.3.9-config.diff | 49
.../slim/files/slim-1.3.9-greeter-session.diff | 12 --
x11-misc/slim/slim-1.3.6-r5.ebuild | 133 -
x11-misc/slim/slim-1.3.9.ebuild| 98 ---
19 files changed, 794 deletions(-)
diff --git a/x11-misc/slim/Manifest b/x11-misc/slim/Manifest
index 6290a51df48d..0236f4cb80fe 100644
--- a/x11-misc/slim/Manifest
+++ b/x11-misc/slim/Manifest
@@ -1,3 +1 @@
-DIST slim-1.3.6.tar.gz 232547 BLAKE2B
3df58fa128cdf2b2ab005e8f41fccc076cfcf8adf7767075539f2b8edf51a92660b031837b3cdaccb261f1c1eb24104100317fd4e68ad0298242502d4e6bb506
SHA512
345b1dee5d6f0c3716dfa7c5c16274adbf18586bdaaa6af4f310e24c5a61f79a297ffac921a5ba545523317e9fe120916df226c36b9c9b49c2ac9c1ca21dee0c
-DIST slim-1.3.9.tar.gz 239609 BLAKE2B
41eec388b0d63bc720cb51f93707f69c4765800f4e69654fe5ebdcb280eb25775c7ed951163943b6f58884b0a9fb628e049d68a2faa7516b1f884adb080953c6
SHA512
607366a402479381858f8193db9b4da0a40eda15f4868cad9e7313b4a084390cf3cee80958f58a56d3e4383cf2fa9069960d1b20861068f921bd9ba89da7aec1
DIST slim-1.4.0.tar.gz 530318 BLAKE2B
507f22d09a3449b870bb5fd5a5f0ab1002ceee5372c82f702582809a5fc442088c17d79fedff6712e198cee672696388479604a194e5729c7bc12139770c833d
SHA512
2ef38d39e2d5186f9342161d99740b0c8cd87f234deaf550ca1528c9a61c052d26123c7da26f4a0a5e658d01cb200b115cf7879d349ed51a6e8c729ee3fdf77f
diff --git a/x11-misc/slim/files/slim-1.3.5-arm.patch
b/x11-misc/slim/files/slim-1.3.5-arm.patch
deleted file mode 100644
index 9438ce4a1caf..
--- a/x11-misc/slim/files/slim-1.3.5-arm.patch
+++ /dev/null
@@ -1,11 +0,0 @@
a/Ck.cpp 2012-06-26 04:20:14.0 -0400
-+++ b/Ck.cpp 2012-10-05 13:25:29.0 -0400
-@@ -91,7 +91,7 @@
-
- vt = *((long *)return_value);
-
-- std::snprintf(device, 32, "/dev/tty%ld", vt);
-+ std::sprintf(device, "/dev/tty%ld", vt);
-
- if(return_value)
- XFree(return_value);
diff --git a/x11-misc/slim/files/slim-1.3.5-disable-ck-for-systemd.patch
b/x11-misc/slim/files/slim-1.3.5-disable-ck-for-systemd.patch
deleted file mode 100644
index f7e361767615..
--- a/x11-misc/slim/files/slim-1.3.5-disable-ck-for-systemd.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-diff -Naur slim-1.3.5/app.cpp slim-1.3.5.new/app.cpp
slim-1.3.5/app.cpp 2012-12-31 08:03:42.0 -0500
-+++ slim-1.3.5.new/app.cpp 2013-08-22 14:16:37.994854259 -0400
-@@ -138,11 +138,14 @@
- daemonmode = false;
- force_nodaemon = false;
- firstlogin = true;
-+#ifdef USE_CONSOLEKIT
-+ consolekit_support_enabled = true;
-+#endif
- Dpy = NULL;
-
- /* Parse command line
- Note: we force a option for nodaemon switch to handle "-nodaemon" */
-- while((tmp = getopt(argc, argv, "vhp:n:d?")) != EOF) {
-+ while((tmp = getopt(argc, argv, "vhsp:n:d?")) != EOF) {
- switch (tmp) {
- case 'p': /* Test theme */
- testtheme = optarg;
-@@ -163,6 +166,11 @@
- std::cout << APPNAME << " version " << VERSION << endl;
- exit(OK_EXIT);
- break;
-+#ifdef USE_CONSOLEKIT
-+ case 's': /* Disable consolekit support */
-+ consolekit_support_enabled = false;
-+ break;
-+#endif
- case '?': /* Illegal */
- logStream << endl;
- case 'h': /* Help */
-@@ -171,6 +179,9 @@
- << "-d: daemon mode" << endl
- << "
[gentoo-commits] repo/gentoo:master commit in: x11-misc/slim/files/, x11-misc/slim/
commit: 33127b6d177f2d123c333c239a4ca13bfafd8124 Author: Robert Pearce flitspace org uk> AuthorDate: Tue Feb 21 08:01:47 2023 + Commit: Viorel Munteanu gentoo org> CommitDate: Tue Mar 14 19:28:15 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33127b6d x11-misc/slim: Added ebuilds for the resurrected upstream project Fixed issues from pkgcheck List myself as a proxy maintainer Correct several issues pointed out in review by ceamac and added a - ebuild in light of discussion Closes: https://bugs.gentoo.org/832562 Closes: https://bugs.gentoo.org/727544 Closes: https://bugs.gentoo.org/832303 Closes: https://bugs.gentoo.org/580458 Closes: https://bugs.gentoo.org/803476 Closes: https://bugs.gentoo.org/732430 Closes: https://bugs.gentoo.org/756181 Signed-off-by: Robert Pearce flitspace.org.uk> Closes: https://github.com/gentoo/gentoo/pull/29838 Signed-off-by: Viorel Munteanu gentoo.org> x11-misc/slim/Manifest | 2 + x11-misc/slim/files/slim-1.3.9-config.diff | 49 ++ .../slim/files/slim-1.3.9-greeter-session.diff | 12 +++ x11-misc/slim/files/slim-1.4.0-config.diff | 48 ++ x11-misc/slim/metadata.xml | 11 ++- x11-misc/slim/slim-1.3.9.ebuild| 98 +++ x11-misc/slim/slim-1.4.0.ebuild| 104 + x11-misc/slim/slim-.ebuild | 104 + 8 files changed, 426 insertions(+), 2 deletions(-) diff --git a/x11-misc/slim/Manifest b/x11-misc/slim/Manifest index d0638d550cf4..6290a51df48d 100644 --- a/x11-misc/slim/Manifest +++ b/x11-misc/slim/Manifest @@ -1 +1,3 @@ DIST slim-1.3.6.tar.gz 232547 BLAKE2B 3df58fa128cdf2b2ab005e8f41fccc076cfcf8adf7767075539f2b8edf51a92660b031837b3cdaccb261f1c1eb24104100317fd4e68ad0298242502d4e6bb506 SHA512 345b1dee5d6f0c3716dfa7c5c16274adbf18586bdaaa6af4f310e24c5a61f79a297ffac921a5ba545523317e9fe120916df226c36b9c9b49c2ac9c1ca21dee0c +DIST slim-1.3.9.tar.gz 239609 BLAKE2B 41eec388b0d63bc720cb51f93707f69c4765800f4e69654fe5ebdcb280eb25775c7ed951163943b6f58884b0a9fb628e049d68a2faa7516b1f884adb080953c6 SHA512 607366a402479381858f8193db9b4da0a40eda15f4868cad9e7313b4a084390cf3cee80958f58a56d3e4383cf2fa9069960d1b20861068f921bd9ba89da7aec1 +DIST slim-1.4.0.tar.gz 530318 BLAKE2B 507f22d09a3449b870bb5fd5a5f0ab1002ceee5372c82f702582809a5fc442088c17d79fedff6712e198cee672696388479604a194e5729c7bc12139770c833d SHA512 2ef38d39e2d5186f9342161d99740b0c8cd87f234deaf550ca1528c9a61c052d26123c7da26f4a0a5e658d01cb200b115cf7879d349ed51a6e8c729ee3fdf77f diff --git a/x11-misc/slim/files/slim-1.3.9-config.diff b/x11-misc/slim/files/slim-1.3.9-config.diff new file mode 100644 index ..da7e69f2eccd --- /dev/null +++ b/x11-misc/slim/files/slim-1.3.9-config.diff @@ -0,0 +1,49 @@ +Customize the configuration file to suit Gentoo practice +=== +--- a/slim.conf b/slim.conf +@@ -21,7 +21,7 @@ + + # Activate numlock when slim starts. Valid values: on|off + # Default is to not change it +-# numlock on ++numlock on + + # Hide the mouse cursor (note: does not work with some WMs). + # Valid values: true|false +@@ -36,7 +36,8 @@ + # to adjust the command according to your preferred shell, + # i.e. for freebsd use: + # login_cmd exec /bin/sh - ~/.xinitrc %session +-login_cmd exec /bin/bash -login ~/.xinitrc %session ++# login_cmd exec /bin/bash -login ~/.xinitrc %session ++login_cmd exec /bin/bash -login /usr/share/slim/Xsession %session + + # Commands executed when starting and exiting a session. + # They can be used for registering a X11 session with +@@ -66,12 +67,12 @@ + # %session is the Exec= value -- note that this may provide a full + # path to the session executable! +-#sessiondir /usr/share/xsessions ++sessiondir/usr/share/xsessions + + +-# Executed when pressing F11 (requires imagemagick) ++# Executed when pressing F11 (requires media-gfx/imagemagick for import) + screenshot_cmd import -window root /slim.png +-# Alternative using scrot. ++# Alternative is media-gfx/scrot. See Gentoo bug 252241 for more info. + #screenshot_cmd scrot /root/slim.png + + # welcome message. Available variables: %host, %domain + welcome_msg Welcome to %host +@@ -111,8 +111,8 @@ + # randomly choose from + current_theme default + +-# Lock file ++# Lock file, /etc/init.d/xdm expects slim.pid + lockfile/run/slim.pid + + # Log file + logfile /var/log/slim.log diff --git a/x11-misc/slim/files/slim-1.3.9-greeter-session.diff b/x11-misc/slim/files/slim-1.3.9-greeter-session.diff new file mode 100644 index ..c9e5e256850a --- /dev/null +++ b/x11-misc/slim/files/slim-1.3.9-greeter-session.diff @@ -0,0 +1,12 @@ +Fix bug #727544 by telling elogind that we're a greeter
[gentoo-commits] repo/gentoo:master commit in: x11-misc/slim/files/
commit: 1274abdcfa027517c1ca3374373eb5475f326d6d Author: Michael Mair-Keimberger levelnine at> AuthorDate: Wed Jul 28 19:54:48 2021 + Commit: Ionen Wolkens gentoo org> CommitDate: Wed Jul 28 21:22:24 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1274abdc x11-misc/slim: remove unused patch Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Michael Mair-Keimberger levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/21818 Signed-off-by: Ionen Wolkens gentoo.org> x11-misc/slim/files/slim--config.diff | 70 --- 1 file changed, 70 deletions(-) diff --git a/x11-misc/slim/files/slim--config.diff b/x11-misc/slim/files/slim--config.diff deleted file mode 100644 index 81f0feea43f..000 --- a/x11-misc/slim/files/slim--config.diff +++ /dev/null @@ -1,70 +0,0 @@ -diff --git a/slim.conf b/slim.conf -index 2c72255..7af4adb 100644 a/slim.conf -+++ b/slim.conf -@@ -2,7 +2,7 @@ - # Note: -xauth $authfile is automatically appended - default_path/bin:/usr/bin:/usr/local/bin - default_xserver /usr/bin/X --#xserver_arguments -dpi 75 -+xserver_arguments -nolisten tcp -br -deferglyphs 16 vt07 - - # Commands for halt, login, etc. - halt_cmd/sbin/shutdown -h now -@@ -18,7 +18,7 @@ authfile /var/run/slim.auth - - - # Activate numlock when slim starts. Valid values: on|off --# numlock on -+numlock on - - # Hide the mouse cursor (note: does not work with some WMs). - # Valid values: true|false -@@ -33,19 +33,20 @@ authfile /var/run/slim.auth - # to adjust the command according to your preferred shell, - # i.e. for freebsd use: - # login_cmd exec /bin/sh - ~/.xinitrc %session --login_cmd exec /bin/bash -login ~/.xinitrc %session -+# login_cmd exec /bin/bash -login ~/.xinitrc %session -+login_cmd exec /bin/bash -login /usr/share/slim/Xsession %session - - # Commands executed when starting and exiting a session. - # They can be used for registering a X11 session with - # sessreg. You can use the %user variable - # --# sessionstart_cmdsome command --# sessionstop_cmd some command -+sessionstart_cmd /usr/bin/sessreg -a -l :0.0 %user -+sessionstop_cmd /usr/bin/sessreg -d -l :0.0 %user - - # Start in daemon mode. Valid values: yes | no - # Note that this can be overriden by the command line - # options "-d" and "-nodaemon" --# daemon yes -+daemonyes - - # Available sessions: - # The current chosen session name replaces %session in the login_cmd -@@ -63,7 +64,10 @@ login_cmd exec /bin/bash -login ~/.xinitrc %session - sessiondir /usr/share/xsessions - - # Executed when pressing F11 (requires imagemagick for 'import') --screenshot_cmd import -window root /slim.png -+# Alternative: media-gfx/scrot. See Gentoo bug 252241 for more info. -+screenshot_cmd import -window root /tmp/slim.png -+#screenshot_cmd scrot /tmp/slim.png -+ - - # welcome message. Available variables: %host, %domain - welcome_msg Welcome to %host -@@ -92,8 +96,8 @@ reboot_msg The system is rebooting... - # randomly choose from - current_theme default - --# Lock file --lockfile/var/run/slim.lock -+# Lock file, /etc/init.d/xdm expects slim.pid -+lockfile/run/slim.pid - - # Log file - logfile /var/log/slim.log
[gentoo-commits] repo/gentoo:master commit in: x11-misc/slim/files/
commit: bc1ac2a43cfe711b89446135234666fb1bcf6b50
Author: Michael Mair-Keimberger (asterix) gmail
com>
AuthorDate: Thu Aug 10 17:49:10 2017 +
Commit: David Seifert gentoo org>
CommitDate: Sun Aug 13 11:29:22 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc1ac2a4
x11-misc/slim: remove unused patch
Closes: https://github.com/gentoo/gentoo/pull/5383
.../slim/files/slim-1.3.6-fix-slimlock-nopam.patch | 26 --
1 file changed, 26 deletions(-)
diff --git a/x11-misc/slim/files/slim-1.3.6-fix-slimlock-nopam.patch
b/x11-misc/slim/files/slim-1.3.6-fix-slimlock-nopam.patch
deleted file mode 100644
index bd6d1679c09..000
--- a/x11-misc/slim/files/slim-1.3.6-fix-slimlock-nopam.patch
+++ /dev/null
@@ -1,26 +0,0 @@
a/CMakeLists.txt 2013-10-27 21:24:21.193802669 -0400
-+++ b/CMakeLists.txt 2013-10-27 21:26:54.127806951 -0400
-@@ -220,7 +220,6 @@
- ### install
- # slim
- install(TARGETS slim RUNTIME DESTINATION bin)
--install(TARGETS slimlock RUNTIME DESTINATION bin)
-
- if (BUILD_SHARED_LIBS)
- set_target_properties(libslim PROPERTIES
-@@ -235,8 +234,14 @@
-
- # man file
- install(FILES slim.1 DESTINATION ${MANDIR}/man1/)
--install(FILES slimlock.1 DESTINATION ${MANDIR}/man1/)
- # configure
- install(FILES slim.conf DESTINATION ${SYSCONFDIR})
-+
-+#slimlock
-+if(BUILD_SLIMLOCK)
-+install(TARGETS slimlock RUNTIME DESTINATION bin)
-+install(FILES slimlock.1 DESTINATION ${MANDIR}/man1/)
-+endif(BUILD_SLIMLOCK)
-+
- # themes directory
- subdirs(themes)
[gentoo-commits] repo/gentoo:master commit in: x11-misc/slim/files/, x11-misc/slim/
commit: 55fa9dd65d9b67ce91db08adce9810357917c3dc
Author: Ian Stakenvicius gentoo org>
AuthorDate: Sun Sep 20 17:34:55 2015 +
Commit: Ian Stakenvicius gentoo org>
CommitDate: Mon Sep 21 16:59:49 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55fa9dd6
x11-misc/slim: add live ebuild
Package-Manager: portage-2.2.20.1
x11-misc/slim/files/slim--config.diff | 70 +
x11-misc/slim/slim-.ebuild| 125 ++
2 files changed, 195 insertions(+)
diff --git a/x11-misc/slim/files/slim--config.diff
b/x11-misc/slim/files/slim--config.diff
new file mode 100644
index 000..81f0fee
--- /dev/null
+++ b/x11-misc/slim/files/slim--config.diff
@@ -0,0 +1,70 @@
+diff --git a/slim.conf b/slim.conf
+index 2c72255..7af4adb 100644
+--- a/slim.conf
b/slim.conf
+@@ -2,7 +2,7 @@
+ # Note: -xauth $authfile is automatically appended
+ default_path/bin:/usr/bin:/usr/local/bin
+ default_xserver /usr/bin/X
+-#xserver_arguments -dpi 75
++xserver_arguments -nolisten tcp -br -deferglyphs 16 vt07
+
+ # Commands for halt, login, etc.
+ halt_cmd/sbin/shutdown -h now
+@@ -18,7 +18,7 @@ authfile /var/run/slim.auth
+
+
+ # Activate numlock when slim starts. Valid values: on|off
+-# numlock on
++numlock on
+
+ # Hide the mouse cursor (note: does not work with some WMs).
+ # Valid values: true|false
+@@ -33,19 +33,20 @@ authfile /var/run/slim.auth
+ # to adjust the command according to your preferred shell,
+ # i.e. for freebsd use:
+ # login_cmd exec /bin/sh - ~/.xinitrc %session
+-login_cmd exec /bin/bash -login ~/.xinitrc %session
++# login_cmd exec /bin/bash -login ~/.xinitrc %session
++login_cmd exec /bin/bash -login /usr/share/slim/Xsession %session
+
+ # Commands executed when starting and exiting a session.
+ # They can be used for registering a X11 session with
+ # sessreg. You can use the %user variable
+ #
+-# sessionstart_cmdsome command
+-# sessionstop_cmd some command
++sessionstart_cmd /usr/bin/sessreg -a -l :0.0 %user
++sessionstop_cmd /usr/bin/sessreg -d -l :0.0 %user
+
+ # Start in daemon mode. Valid values: yes | no
+ # Note that this can be overriden by the command line
+ # options "-d" and "-nodaemon"
+-# daemon yes
++daemonyes
+
+ # Available sessions:
+ # The current chosen session name replaces %session in the login_cmd
+@@ -63,7 +64,10 @@ login_cmd exec /bin/bash -login ~/.xinitrc
%session
+ sessiondir /usr/share/xsessions
+
+ # Executed when pressing F11 (requires imagemagick for 'import')
+-screenshot_cmd import -window root /slim.png
++# Alternative: media-gfx/scrot. See Gentoo bug 252241 for more info.
++screenshot_cmd import -window root /tmp/slim.png
++#screenshot_cmd scrot /tmp/slim.png
++
+
+ # welcome message. Available variables: %host, %domain
+ welcome_msg Welcome to %host
+@@ -92,8 +96,8 @@ reboot_msg The system is rebooting...
+ # randomly choose from
+ current_theme default
+
+-# Lock file
+-lockfile/var/run/slim.lock
++# Lock file, /etc/init.d/xdm expects slim.pid
++lockfile/run/slim.pid
+
+ # Log file
+ logfile /var/log/slim.log
diff --git a/x11-misc/slim/slim-.ebuild b/x11-misc/slim/slim-.ebuild
new file mode 100644
index 000..86ea64f
--- /dev/null
+++ b/x11-misc/slim/slim-.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+CMAKE_MIN_VERSION="2.8.8"
+inherit cmake-utils pam eutils systemd versionator
+
+if [[ ${PV} = * ]]; then
+ EGIT_REPO_URI="git://github.com/axs-gentoo/slim-git.git"
+ inherit git-r3
+ KEYWORDS=""
+else
+ SRC_URI="mirror://sourceforge/project/${PN}.berlios/${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+fi
+
+DESCRIPTION="Simple Login Manager"
+HOMEPAGE="http://sourceforge.net/projects/slim.berlios/";
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="branding pam consolekit"
+REQUIRED_USE="consolekit? ( pam )"
+
+RDEPEND="x11-libs/libXmu
+ x11-libs/libX11
+ x11-libs/libXpm
+ x11-libs/libXft
+ x11-libs/libXrandr
+ media-libs/libpng:0=
+ virtual/jpeg:=
+ x11-apps/sessreg
+ consolekit? ( sys-auth/consolekit
+ sys-apps/dbus )
+ pam? ( virtual/pam
+ !x11-misc/slimlock )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ x11-proto/xproto"
+PDEPEND="branding? ( >=x11-themes/slim-themes-1.2.3a-r3 )"
+
+src_prepare() {
+ # Our Gentoo-specific config changes
+ epatch "${FILESDIR}"/${P}-config.diff
+
+ if use elibc_FreeBSD; then
+ sed -i -e 's/"-DHAVE_SHADOW"/"-DNEEDS_BASENAME"/'
CMakeLists.txt \
+ || die
+ fi
+
+
[gentoo-commits] repo/gentoo:master commit in: x11-misc/slim/files/, x11-misc/slim/
commit: e44233b3de61851f504ee94f8b2c526d6ec200af
Author: Ian Stakenvicius gentoo org>
AuthorDate: Mon Sep 14 19:30:37 2015 +
Commit: Ian Stakenvicius gentoo org>
CommitDate: Mon Sep 14 19:39:44 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e44233b3
x11-misc/slim: fix pointer arithmetic error
While addressing bug 560088 related to consolekit-1.0, it was found that
some pointer arithmetic being used in a malloc and memcpy was wrong and was
causing
a malloc corruption error. This patch addresses the out-of-bounds indexing.
Package-Manager: portage-2.2.20.1
.../slim-1.3.6-envcpy-bad-pointer-arithmetic.patch | 15 +
.../{slim-1.3.6-r4.ebuild => slim-1.3.6-r5.ebuild} | 25 +++---
2 files changed, 28 insertions(+), 12 deletions(-)
diff --git a/x11-misc/slim/files/slim-1.3.6-envcpy-bad-pointer-arithmetic.patch
b/x11-misc/slim/files/slim-1.3.6-envcpy-bad-pointer-arithmetic.patch
new file mode 100644
index 000..b3787dd
--- /dev/null
+++ b/x11-misc/slim/files/slim-1.3.6-envcpy-bad-pointer-arithmetic.patch
@@ -0,0 +1,15 @@
+--- a/app.cpp 2015-09-14 12:00:00.460481656 -0400
b/app.cpp 2015-09-14 14:41:10.970536588 -0400
+@@ -606,9 +606,9 @@
+
+ n++;
+
+- child_env = static_cast(malloc(sizeof(char*)*n));
+- memcpy(child_env, old_env, sizeof(char*)*n+1);
+- child_env[n - 1] = StrConcat("XDG_SESSION_COOKIE=",
ck.get_xdg_session_cookie());
++ child_env = static_cast(malloc(sizeof(char*)*(n+1)));
++ memcpy(child_env, old_env, sizeof(char*)*n);
++ child_env[n-1] = StrConcat("XDG_SESSION_COOKIE=",
ck.get_xdg_session_cookie());
+ child_env[n] = NULL;
+ }
+ # endif /* USE_CONSOLEKIT */
diff --git a/x11-misc/slim/slim-1.3.6-r4.ebuild
b/x11-misc/slim/slim-1.3.6-r5.ebuild
similarity index 84%
rename from x11-misc/slim/slim-1.3.6-r4.ebuild
rename to x11-misc/slim/slim-1.3.6-r5.ebuild
index 728b2f4..2fdeebe 100644
--- a/x11-misc/slim/slim-1.3.6-r4.ebuild
+++ b/x11-misc/slim/slim-1.3.6-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -36,17 +36,18 @@ PDEPEND="branding? ( >=x11-themes/slim-themes-1.2.3a-r3 )"
src_prepare() {
# Our Gentoo-specific config changes
- epatch "${FILESDIR}"/${P}-config.diff
- epatch "${FILESDIR}"/${PN}-1.3.5-arm.patch
- epatch "${FILESDIR}"/${P}-honour-cflags.patch
- epatch "${FILESDIR}"/${P}-libslim-cmake-fixes.patch
- epatch "${FILESDIR}"/${PN}-1.3.5-disable-ck-for-systemd.patch
- epatch "${FILESDIR}"/${P}-strip-systemd-unit-install.patch
- epatch "${FILESDIR}"/${P}-systemd-session.patch
- epatch "${FILESDIR}"/${P}-session-chooser.patch
- epatch "${FILESDIR}"/${P}-fix-slimlock-nopam-v2.patch
- epatch "${FILESDIR}"/${P}-drop-zlib.patch
- epatch "${FILESDIR}"/${P}-freetype.patch
+ epatch "${FILESDIR}"/${P}-config.diff \
+ "${FILESDIR}"/${PN}-1.3.5-arm.patch \
+ "${FILESDIR}"/${P}-honour-cflags.patch \
+ "${FILESDIR}"/${P}-libslim-cmake-fixes.patch \
+ "${FILESDIR}"/${PN}-1.3.5-disable-ck-for-systemd.patch \
+ "${FILESDIR}"/${P}-strip-systemd-unit-install.patch \
+ "${FILESDIR}"/${P}-systemd-session.patch \
+ "${FILESDIR}"/${P}-session-chooser.patch \
+ "${FILESDIR}"/${P}-fix-slimlock-nopam-v2.patch \
+ "${FILESDIR}"/${P}-drop-zlib.patch \
+ "${FILESDIR}"/${P}-freetype.patch \
+ "${FILESDIR}"/${P}-envcpy-bad-pointer-arithmetic.patch
if use elibc_FreeBSD; then
sed -i -e 's/"-DHAVE_SHADOW"/"-DNEEDS_BASENAME"/'
CMakeLists.txt \
