[gentoo-commits] repo/gentoo:master commit in: lxde-base/lxdm/, lxde-base/lxdm/files/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: lxde-base/lxdm/, lxde-base/lxdm/files/
@ 2018-04-13 19:32 Pacho Ramos
  0 siblings, 0 replies; 3+ messages in thread
From: Pacho Ramos @ 2018-04-13 19:32 UTC (permalink / raw
  To: gentoo-commits

commit:     2b0a858a59cd7e0cb063d9383b4b3598f3efc2a3
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 13 18:37:45 2018 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Fri Apr 13 19:32:00 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b0a858a

lxde-base/lxdm: Drop old

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 lxde-base/lxdm/Manifest                            |  1 -
 .../lxdm/files/lxdm-0.4.1-configure-add-pam.patch  | 45 -----------
 lxde-base/lxdm/files/lxdm-0.4.1-event-check.patch  | 25 ------
 .../lxdm/files/lxdm-0.4.1-fix-optional-pam.patch   | 31 --------
 .../lxdm/files/lxdm-0.4.1-fix-pam-100-cpu.patch    | 16 ----
 .../lxdm-0.4.1-git-fix-null-pointer-deref.patch    | 51 -------------
 .../files/lxdm-0.4.1-missing-pam-defines.patch     | 29 -------
 .../files/lxdm-0.4.1-optional-consolekit.patch     | 43 -----------
 .../files/lxdm-0.4.1-pam_console-disable.patch     |  9 ---
 .../lxdm/files/lxdm-0.4.1-selinux-support.patch    |  7 --
 lxde-base/lxdm/lxdm-0.4.1-r9.ebuild                | 89 ----------------------
 lxde-base/lxdm/lxdm-0.5.3.ebuild                   | 66 ----------------
 12 files changed, 412 deletions(-)

diff --git a/lxde-base/lxdm/Manifest b/lxde-base/lxdm/Manifest
index d1857d297fc..c32620da1a4 100644
--- a/lxde-base/lxdm/Manifest
+++ b/lxde-base/lxdm/Manifest
@@ -1,2 +1 @@
-DIST lxdm-0.4.1.tar.gz 296714 BLAKE2B bcc2122a5a9bd59e3d29b8e7932ebc5f399cf3bb6ae2bda02329f7b82ff54dfd4c2b7cf5675d917e9db1df354cfad43a39febefe3ef29284fa09c33a76bbb2d6 SHA512 8ed4a955a910def4db66958d1cb24976db178b8763199a024b6c2119894745e3646566c42d01472dffbbcbb7fd21784b01e74dc88038e01caebaa3b6d720ff27
 DIST lxdm-0.5.3.tar.xz 239132 BLAKE2B 9d27feb60452af49127972ce0ecdc25122f5f86961f65512fd6c185c5d6ca03e637fab703fa2df156dba8a3d0ef4e7cf9f55e20762ba49bb14dc4ee8a82b1fa3 SHA512 0e3539c595a71cb850c1756dd075b8d477a4e111a4167714057cac06650e9587f338f797f14122e7b2a2f4ad35b38cd7172b83e996758abeeaf0146d65bbc26f

diff --git a/lxde-base/lxdm/files/lxdm-0.4.1-configure-add-pam.patch b/lxde-base/lxdm/files/lxdm-0.4.1-configure-add-pam.patch
deleted file mode 100644
index d91bf75a67b..00000000000
--- a/lxde-base/lxdm/files/lxdm-0.4.1-configure-add-pam.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 949ee91acb55baeb4b8761957eabd2e5a345d2ae Mon Sep 17 00:00:00 2001
-From: Mitch Harder <mitch.harder@sabayonlinux.org>
-Date: Thu, 8 Dec 2011 11:02:28 -0600
-Subject: Fix configure.ac test for pam libs.
-
-A bug report on Gentoo noted that the configure test for pam
-wasn't working correctly.
-https://bugs.gentoo.org/show_bug.cgi?id=384615
-
-This corrections borrows the configure.ac pam testing method used in xdm.
----
- configure.ac |   13 +++++++++++--
- 1 files changed, 11 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index e952473..eaa883a 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -14,12 +14,21 @@ AC_PROG_INSTALL
- AM_PROG_CC_C_O
- 
- # Checks for libraries.
- AC_CHECK_LIB([crypt], [crypt])
- 
--AC_ARG_WITH(pam,AC_HELP_STRING([--without-pam],[build without pam]),
--[],[AC_CHECK_LIB([pam], [pam_open_session])])
-+# Check for PAM support
-+AC_ARG_WITH(pam, AC_HELP_STRING([--with-pam],[Use PAM for authentication]),
-+	[USE_PAM=$withval], [USE_PAM=$use_pam_default])
-+if test "x$USE_PAM" != "xno" ; then
-+	AC_SEARCH_LIBS(pam_open_session,[pam])
-+	AC_CHECK_FUNC(pam_open_session, 
-+		[AC_DEFINE(USE_PAM,1,[Use PAM for authentication])],
-+		[if test "x$USE_PAM" != "xtry" ; then
-+			AC_MSG_ERROR(["PAM support requested, but pam_open_session not found."])
-+		 fi])
-+fi
- 
- AC_CHECK_LIB([ck-connector],[ck_connector_open_session])
- 
- # Checks for header files.
- AC_PATH_X
--- 
-1.7.3.4
-

diff --git a/lxde-base/lxdm/files/lxdm-0.4.1-event-check.patch b/lxde-base/lxdm/files/lxdm-0.4.1-event-check.patch
deleted file mode 100644
index 4c2d5b35235..00000000000
--- a/lxde-base/lxdm/files/lxdm-0.4.1-event-check.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From d4e41ecb36a1ea29482b75674d804bb0f05540b2 Mon Sep 17 00:00:00 2001
-From: dgod <dgod.osa@gmail.com>
-Date: Sun, 25 Dec 2011 15:23:19 +0800
-Subject: [PATCH 1/1] fix event check bug caused cpu 100%
-
----
- src/lxcom.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/lxcom.c b/src/lxcom.c
-index 02763eb..18ee12e 100644
---- a/src/lxcom.c
-+++ b/src/lxcom.c
-@@ -89,7 +89,7 @@ static gboolean lxcom_prepare (GSource *source,gint *timeout)
- 
- static gboolean lxcom_check(GSource *source)
- {
--	return TRUE;
-+	return (((LXComSource*)source)->poll.revents&G_IO_IN)?TRUE:FALSE;
- }
- 
- static gboolean lxcom_dispatch (GSource *source,GSourceFunc callback,gpointer user_data)
--- 
-1.7.4.1
-

diff --git a/lxde-base/lxdm/files/lxdm-0.4.1-fix-optional-pam.patch b/lxde-base/lxdm/files/lxdm-0.4.1-fix-optional-pam.patch
deleted file mode 100644
index 0aecc08593d..00000000000
--- a/lxde-base/lxdm/files/lxdm-0.4.1-fix-optional-pam.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index bfac56b..40710fc 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -2,10 +2,13 @@ NULL =
- SUBDIRS= \
- 	src \
- 	po \
--	pam \
- 	data \
- 	$(NULL)
- 
-+if HAVE_PAM
-+SUBDIRS += pam
-+endif
-+
- rpm: dist @PACKAGE_NAME@.spec
- 	rpmbuild -bb \
- 	--define "_sourcedir `pwd`" \
-diff --git a/configure.ac b/configure.ac
-index ae5177f..aaa1bad 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -27,6 +27,7 @@ if test "x$USE_PAM" != "xno" ; then
- 			AC_MSG_ERROR(["PAM support requested, but pam_open_session not found."])
- 		 fi])
- fi
-+AM_CONDITIONAL(HAVE_PAM, [test -n "$USE_PAM" -a "x$USE_PAM" != xno ])
- 
- # Checks for header files.
- AC_PATH_X

diff --git a/lxde-base/lxdm/files/lxdm-0.4.1-fix-pam-100-cpu.patch b/lxde-base/lxdm/files/lxdm-0.4.1-fix-pam-100-cpu.patch
deleted file mode 100644
index 103268efec4..00000000000
--- a/lxde-base/lxdm/files/lxdm-0.4.1-fix-pam-100-cpu.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- lxdm-0.4.1.orig/src/lxdm.c
-+++ lxdm-0.4.1/src/lxdm.c
-@@ -1458,8 +1458,12 @@ void lxdm_do_login(struct passwd *pw, ch
- 		setenv("XDG_SESSION_COOKIE", ck_connector_get_cookie(s->ckc), 1);
- 	}
- #endif
-+	int i;
-+	for(i=2;i<256;i++)
-+		g_source_remove(i);
-+
- 	char** env, *path;
--	int n_env,i;
-+	int n_env;
- 	n_env  = g_strv_length(environ);
- 	/* copy all environment variables and override some of them */
- 	env = g_new(char*, n_env + 1 + 13);

diff --git a/lxde-base/lxdm/files/lxdm-0.4.1-git-fix-null-pointer-deref.patch b/lxde-base/lxdm/files/lxdm-0.4.1-git-fix-null-pointer-deref.patch
deleted file mode 100644
index 7abdbd47052..00000000000
--- a/lxde-base/lxdm/files/lxdm-0.4.1-git-fix-null-pointer-deref.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 19f82a206b2cec964cea0475395d63dedf183788 Mon Sep 17 00:00:00 2001
-From: Andrea Florio <andrea@opensuse.org>
-Date: Fri, 29 Jul 2011 23:59:32 +0200
-Subject: [PATCH] fix null pointer dereference
-
----
- src/config.c |   25 ++++++++++---------------
- 1 files changed, 10 insertions(+), 15 deletions(-)
-
-diff --git a/src/config.c b/src/config.c
-index 3f92f7b..4603ab4 100644
---- a/src/config.c
-+++ b/src/config.c
-@@ -125,24 +125,19 @@ static gboolean image_file_valid(const char *filename)
- static void update_face_image(GtkWidget *w)
- {
- 	GdkPixbuf *pixbuf;
--	char *path;
--	path=g_build_filename(user->pw_dir,".face",NULL);
--	if(access(path,R_OK))
--	{
--		g_free(path);
--		if(ui_nobody)
--			pixbuf=gdk_pixbuf_new_from_file_at_scale(ui_nobody,48,48,FALSE,NULL);
--		if(!pixbuf)
--			pixbuf=gtk_icon_theme_load_icon(gtk_icon_theme_get_default(),
-+	char *path=g_build_filename(user->pw_dir,".face",NULL);
-+	pixbuf=gdk_pixbuf_new_from_file_at_scale(path,48,48,FALSE,NULL);
-+	g_free(path);
-+	if(!pixbuf && ui_nobody)
-+		pixbuf=gdk_pixbuf_new_from_file_at_scale(ui_nobody,48,48,FALSE,NULL);
-+	if(!pixbuf)
-+		pixbuf=gtk_icon_theme_load_icon(gtk_icon_theme_get_default(),
- 						"avatar-default", 48,GTK_ICON_LOOKUP_FORCE_SIZE,NULL);
--	}
--	else
-+	if(pixbuf)
- 	{
--		pixbuf=gdk_pixbuf_new_from_file_at_scale(path,48,48,FALSE,NULL);
--		g_free(path);
-+		gtk_image_set_from_pixbuf(GTK_IMAGE(w),pixbuf);
-+		g_object_unref(pixbuf);
- 	}
--	gtk_image_set_from_pixbuf(GTK_IMAGE(w),pixbuf);
--	g_object_unref(pixbuf);
- }
- 
- static void set_face_file(const char *filename)
--- 
-1.7.0.1
-

diff --git a/lxde-base/lxdm/files/lxdm-0.4.1-missing-pam-defines.patch b/lxde-base/lxdm/files/lxdm-0.4.1-missing-pam-defines.patch
deleted file mode 100644
index a59273ccf40..00000000000
--- a/lxde-base/lxdm/files/lxdm-0.4.1-missing-pam-defines.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 0f9e8e53a8d30f5c8ccfb03edc282148f58bfd30 Mon Sep 17 00:00:00 2001
-From: dgod <dgod.osa@gmail.com>
-Date: Sun, 1 Jan 2012 17:05:22 +0800
-Subject: [PATCH] fix bug introduced from pam detect
-
----
- src/lxdm.c |    4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-diff --git a/src/lxdm.c b/src/lxdm.c
-index b5a90be..07be1e0 100644
---- a/src/lxdm.c
-+++ b/src/lxdm.c
-@@ -25,8 +25,12 @@
- #include <config.h>
- #endif
- #ifndef HAVE_LIBPAM
-+#ifdef USE_PAM
-+#define HAVE_LIBPAM 1
-+#else
- #define HAVE_LIBPAM 0
- #endif
-+#endif
- 
- #include <stdio.h>
- #include <stdlib.h>
--- 
-1.7.4.1
-

diff --git a/lxde-base/lxdm/files/lxdm-0.4.1-optional-consolekit.patch b/lxde-base/lxdm/files/lxdm-0.4.1-optional-consolekit.patch
deleted file mode 100644
index 621a9d62e45..00000000000
--- a/lxde-base/lxdm/files/lxdm-0.4.1-optional-consolekit.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-X-Gentoo-Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=443666
-X-Git-Url: http://lxde.git.sourceforge.net/git/gitweb.cgi?p=lxde/lxdm;a=patch;h=902438eb83b4ae97d774e4e5f38b46f2d826df2f
-X-Git-Url: http://lxde.git.sourceforge.net/git/gitweb.cgi?p=lxde/lxdm;a=patch;h=371b018474217bdff1d5108b384fbf0f45aa873d
-
-Signed-off-by: Markos Chandras <hwoarang@gentoo.org>
-
-Index: lxdm-0.4.1/configure.ac
-===================================================================
---- lxdm-0.4.1.orig/configure.ac
-+++ lxdm-0.4.1/configure.ac
-@@ -28,8 +28,6 @@ if test "x$USE_PAM" != "xno" ; then
- 		 fi])
- fi
- 
--AC_CHECK_LIB([ck-connector],[ck_connector_open_session])
--
- # Checks for header files.
- AC_PATH_X
- AC_CHECK_HEADERS([shadow.h stdlib.h string.h unistd.h utmpx.h])
-@@ -89,11 +87,22 @@ PKG_CHECK_MODULES(GTK, [$pkg_modules])
- AC_SUBST(GTK_CFLAGS)
- AC_SUBST(GTK_LIBS)
- 
--PKG_CHECK_MODULES(CONSOLEKIT, "ck-connector",[
-+
-+AC_ARG_ENABLE(consolekit,
-+	AC_HELP_STRING([--disable-consolekit],[disable ConsoleKit support]),
-+	[enable_consolekit=$enableval],
-+	[enable_consolekit=yes]
-+)
-+
-+if test "x$enable_consolekit" = "xyes" ; then
-+  AC_CHECK_LIB([ck-connector],[ck_connector_open_session])
-+  PKG_CHECK_MODULES(CONSOLEKIT, "ck-connector",[
- 	AC_SUBST(CONSOLEKIT_CFLAGS)
- 	AC_SUBST(CONSOLEKIT_LIBS)],[
- 	echo "ConsoleKit devel package not found"
- 	])
-+fi
-+
- 
- AC_ARG_ENABLE(password,
- AC_HELP_STRING([--enable-password],[enable to load autologin password store at config file]),

diff --git a/lxde-base/lxdm/files/lxdm-0.4.1-pam_console-disable.patch b/lxde-base/lxdm/files/lxdm-0.4.1-pam_console-disable.patch
deleted file mode 100644
index 628e9a51110..00000000000
--- a/lxde-base/lxdm/files/lxdm-0.4.1-pam_console-disable.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- lxdm-0.4.0.orig/pam/lxdm
-+++ lxdm-0.4.0/pam/lxdm
-@@ -5,5 +5,5 @@ account    include	system-auth
- session    optional	pam_keyinit.so force revoke
- session    include	system-auth
- session    required	pam_loginuid.so
--session    optional	pam_console.so
-+#session    optional	pam_console.so
- session    optional	pam_gnome_keyring.so auto_start

diff --git a/lxde-base/lxdm/files/lxdm-0.4.1-selinux-support.patch b/lxde-base/lxdm/files/lxdm-0.4.1-selinux-support.patch
deleted file mode 100644
index c7df391b104..00000000000
--- a/lxde-base/lxdm/files/lxdm-0.4.1-selinux-support.patch
+++ /dev/null
@@ -1,7 +0,0 @@
---- a/pam/lxdm	2011-12-05 17:30:39.749064359 -0600
-+++ b/pam/lxdm	2011-12-05 17:31:19.355569211 -0600
-@@ -7,3 +7,4 @@
- session    required	pam_loginuid.so
- #session    optional	pam_console.so
- session    optional	pam_gnome_keyring.so auto_start
-+session	   optional	pam_selinux.so

diff --git a/lxde-base/lxdm/lxdm-0.4.1-r9.ebuild b/lxde-base/lxdm/lxdm-0.4.1-r9.ebuild
deleted file mode 100644
index dee61e5e169..00000000000
--- a/lxde-base/lxdm/lxdm-0.4.1-r9.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-WANT_AUTOMAKE="1.12" #493996
-inherit eutils autotools systemd
-
-DESCRIPTION="LXDE Display Manager"
-HOMEPAGE="https://wiki.lxde.org/en/LXDM"
-SRC_URI="mirror://sourceforge/lxde/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86"
-
-IUSE="consolekit debug gtk3 nls pam"
-
-RDEPEND="consolekit? ( sys-auth/consolekit )
-	x11-libs/libxcb
-	gtk3? ( x11-libs/gtk+:3 )
-	!gtk3? ( x11-libs/gtk+:2 )
-	nls? ( sys-devel/gettext )
-	pam? ( virtual/pam )"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig"
-
-src_prepare() {
-	# Upstream bug, tarball contains pre-made lxdm.conf
-	rm "${S}"/data/lxdm.conf || die
-
-	# There is consolekit
-	epatch "${FILESDIR}/${P}-pam_console-disable.patch"
-	# Fix null pointer dereference, backported from git
-	epatch "${FILESDIR}/${P}-git-fix-null-pointer-deref.patch"
-
-	epatch "${FILESDIR}"/${P}-configure-add-pam.patch
-
-	# 403999
-	epatch "${FILESDIR}"/${P}-missing-pam-defines.patch
-
-	# 412025
-	epatch "${FILESDIR}"/${P}-event-check.patch
-
-	# 393329 Selinux support
-	epatch "${FILESDIR}"/${P}-selinux-support.patch
-
-	# See https://bugs.launchpad.net/ubuntu/+source/lxdm/+bug/922363
-	epatch "${FILESDIR}/${P}-fix-pam-100-cpu.patch"
-
-	# Optional Consolekit support. bug #443666
-	epatch "${FILESDIR}"/${P}-optional-consolekit.patch
-
-	# 469512
-	epatch "${FILESDIR}"/${P}-fix-optional-pam.patch
-
-	# this replaces the bootstrap/autogen script in most packages
-	eautoreconf
-
-	# process LINGUAS
-	if use nls; then
-		einfo "Running intltoolize ..."
-		intltoolize --force --copy --automake || die
-		strip-linguas -i "${S}/po" || die
-	fi
-}
-src_configure() {
-	econf	--enable-password \
-		--with-x \
-		--with-xconn=xcb \
-		$(use_enable consolekit) \
-		$(use_enable gtk3) \
-		$(use_enable nls) \
-		$(use_enable debug) \
-		$(use_with pam)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS README TODO || die
-	systemd_dounit "${FILESDIR}"/${PN}.service
-}
-
-pkg_postinst() {
-	echo
-	elog "Take into consideration that LXDM is in the early stages of development!"
-	echo
-}

diff --git a/lxde-base/lxdm/lxdm-0.5.3.ebuild b/lxde-base/lxdm/lxdm-0.5.3.ebuild
deleted file mode 100644
index 8e94e8c3fe9..00000000000
--- a/lxde-base/lxdm/lxdm-0.5.3.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils autotools systemd
-
-DESCRIPTION="LXDE Display Manager"
-HOMEPAGE="https://wiki.lxde.org/en/LXDM"
-SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-
-IUSE="consolekit debug gtk3 nls pam"
-
-RDEPEND="consolekit? ( sys-auth/consolekit )
-	x11-libs/libxcb
-	gtk3? ( x11-libs/gtk+:3 )
-	!gtk3? ( x11-libs/gtk+:2 )
-	nls? ( sys-devel/gettext )
-	pam? ( virtual/pam )"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig"
-DOCS=( AUTHORS README TODO )
-
-src_prepare() {
-	# Upstream bug, tarball contains pre-made lxdm.conf
-	rm "${S}"/data/lxdm.conf || die
-
-	# Fix consolekit and selinux
-	eapply "${FILESDIR}/${P}-pam_console-disable.patch"
-
-	eapply_user
-
-	# this replaces the bootstrap/autogen script in most packages
-	eautoreconf
-
-	# process LINGUAS
-	if use nls; then
-		einfo "Running intltoolize ..."
-		intltoolize --force --copy --automake || die
-		strip-linguas -i "${S}/po" || die
-	fi
-}
-src_configure() {
-	econf	--enable-password \
-		--with-x \
-		--with-xconn=xcb \
-		--with-systemdsystemunitdir=$(systemd_get_systemunitdir) \
-		$(use_enable consolekit) \
-		$(use_enable gtk3) \
-		$(use_enable nls) \
-		$(use_enable debug) \
-		$(use_with pam)
-}
-
-src_install() {
-	default_src_install
-
-	#Use Gentoo specific Xsession startup file
-	exeinto /etc/${PN}
-	doexe "${FILESDIR}"/Xsession
-}


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: lxde-base/lxdm/, lxde-base/lxdm/files/
@ 2021-02-07 14:33 Brian Evans
  0 siblings, 0 replies; 3+ messages in thread
From: Brian Evans @ 2021-02-07 14:33 UTC (permalink / raw
  To: gentoo-commits

commit:     3bb18d8385cd813991a46bdb34e5b34e75d9750a
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Sun Feb  7 14:33:12 2021 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Sun Feb  7 14:33:48 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3bb18d83

lxde-base/lxdm: Drop old; cleanup metadata

Signed-off-by: Brian Evans <grknight <AT> gentoo.org>

 .../files/lxdm-0.5.3-pam_console-disable.patch     |  8 ---
 lxde-base/lxdm/lxdm-0.5.3-r1.ebuild                | 68 ----------------------
 lxde-base/lxdm/metadata.xml                        |  3 -
 3 files changed, 79 deletions(-)

diff --git a/lxde-base/lxdm/files/lxdm-0.5.3-pam_console-disable.patch b/lxde-base/lxdm/files/lxdm-0.5.3-pam_console-disable.patch
deleted file mode 100644
index 8fb8cb4d388..00000000000
--- a/lxde-base/lxdm/files/lxdm-0.5.3-pam_console-disable.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- lxdm-0.4.0.orig/pam/lxdm
-+++ lxdm-0.4.0/pam/lxdm
-@@ -5,4 +5,4 @@ account    include	system-auth
- session    optional	pam_keyinit.so force revoke
- session    include	system-auth
--session    optional	pam_console.so
-+#session    optional	pam_console.so
- session    optional	pam_gnome_keyring.so auto_start

diff --git a/lxde-base/lxdm/lxdm-0.5.3-r1.ebuild b/lxde-base/lxdm/lxdm-0.5.3-r1.ebuild
deleted file mode 100644
index cc2c819ceec..00000000000
--- a/lxde-base/lxdm/lxdm-0.5.3-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Using strip-linguas in eutils
-inherit eutils autotools systemd
-
-DESCRIPTION="LXDE Display Manager"
-HOMEPAGE="https://wiki.lxde.org/en/LXDM"
-SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86"
-
-IUSE="debug gtk3 nls pam"
-
-RDEPEND="
-	x11-libs/libxcb
-	gtk3? ( x11-libs/gtk+:3 )
-	!gtk3? ( x11-libs/gtk+:2 )
-	nls? ( sys-devel/gettext )
-	pam? ( sys-libs/pam )"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig"
-DOCS=( AUTHORS README TODO )
-
-src_prepare() {
-	# Upstream bug, tarball contains pre-made lxdm.conf
-	rm "${S}"/data/lxdm.conf || die
-
-	# Fix consolekit and selinux
-	eapply "${FILESDIR}/${P}-pam_console-disable.patch"
-	# Apply all upstream fixes in git until 2016-11-11
-	eapply "${FILESDIR}/lxdm-0.5.3-upstream-fixes.patch"
-	eapply_user
-
-	# this replaces the bootstrap/autogen script in most packages
-	eautoreconf
-
-	# process LINGUAS
-	if use nls; then
-		einfo "Running intltoolize ..."
-		intltoolize --force --copy --automake || die
-		strip-linguas -i "${S}/po" || die
-	fi
-}
-src_configure() {
-	econf	--enable-password \
-		--with-x \
-		--with-xconn=xcb \
-		--with-systemdsystemunitdir=$(systemd_get_systemunitdir) \
-		--disable-consolekit \
-		$(use_enable gtk3) \
-		$(use_enable nls) \
-		$(use_enable debug) \
-		$(use_with pam)
-}
-
-src_install() {
-	default_src_install
-
-	#Use Gentoo specific Xsession startup file
-	exeinto /etc/${PN}
-	doexe "${FILESDIR}"/Xsession
-}

diff --git a/lxde-base/lxdm/metadata.xml b/lxde-base/lxdm/metadata.xml
index f241db24df3..0d7fd1bc737 100644
--- a/lxde-base/lxdm/metadata.xml
+++ b/lxde-base/lxdm/metadata.xml
@@ -5,9 +5,6 @@
 		<email>grknight@gentoo.org</email>
 		<name>Brian Evans</name>
 	</maintainer>
-	<use>
-		<flag name="gtk3">Use GTK+3 instead of 2</flag>
-	</use>
 	<upstream>
 		<remote-id type="sourceforge">lxde</remote-id>
 	</upstream>


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: lxde-base/lxdm/, lxde-base/lxdm/files/
@ 2023-03-26  1:31 Brian Evans
  0 siblings, 0 replies; 3+ messages in thread
From: Brian Evans @ 2023-03-26  1:31 UTC (permalink / raw
  To: gentoo-commits

commit:     f9f0e0bab1bb8213223e5fe44b3f2d7b7d44ead4
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 26 01:28:45 2023 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Sun Mar 26 01:28:45 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9f0e0ba

lxde-base/lxdm: Patch socket header failure on musl + clang:16

Makes struct members explicit

Closes: https://bugs.gentoo.org/896032
Patch-by: Sam James <sam <AT> gentoo.org>
Signed-off-by: Brian Evans <grknight <AT> gentoo.org>

 lxde-base/lxdm/files/lxdm-0.5.3-portable-msghdr.patch | 18 ++++++++++++++++++
 lxde-base/lxdm/lxdm-0.5.3-r4.ebuild                   | 14 +++++++++-----
 2 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/lxde-base/lxdm/files/lxdm-0.5.3-portable-msghdr.patch b/lxde-base/lxdm/files/lxdm-0.5.3-portable-msghdr.patch
new file mode 100644
index 000000000000..dc7f8ad016e9
--- /dev/null
+++ b/lxde-base/lxdm/files/lxdm-0.5.3-portable-msghdr.patch
@@ -0,0 +1,18 @@
+--- a/src/lxcom.c
++++ b/src/lxcom.c
+@@ -117,7 +117,15 @@
+ 	char ctrl[/*CMSG_SPACE(sizeof(LXDM_CRED))*/1024];
+ 	struct sockaddr_un peer;
+ 	struct iovec v={buf,sizeof(buf)};
+-	struct msghdr h={&peer,sizeof(peer),&v,1,ctrl,sizeof(ctrl),0};
++	struct msghdr h={
++		.msg_name = &peer,
++		.msg_namelen = sizeof(peer),
++		.msg_iov = &v,
++		.msg_iovlen = 1,
++		.msg_control = ctrl,
++		.msg_controllen = sizeof(ctrl),
++		.msg_flags = 0
++	};
+ 	struct cmsghdr *cmptr;
+ 	int ret;

diff --git a/lxde-base/lxdm/lxdm-0.5.3-r4.ebuild b/lxde-base/lxdm/lxdm-0.5.3-r4.ebuild
index 1242ecf466fa..f4ccc1ad9647 100644
--- a/lxde-base/lxdm/lxdm-0.5.3-r4.ebuild
+++ b/lxde-base/lxdm/lxdm-0.5.3-r4.ebuild
@@ -42,15 +42,19 @@ DOCS=( AUTHORS README TODO )
 
 REQUIRED_USE="?? ( elogind systemd ) elogind? ( pam ) systemd? ( pam )"
 
+PATCHES=(
+	# Fix consolekit and selinux
+	"${FILESDIR}/${P}-pam.patch"
+	# Apply all upstream fixes in git until 2016-11-11
+	"${FILESDIR}/lxdm-0.5.3-upstream-fixes.patch"
+	"${FILESDIR}/lxdm-0.5.3-portable-msghdr.patch"
+)
+
 src_prepare() {
 	# Upstream bug, tarball contains pre-made lxdm.conf
 	rm "${S}"/data/lxdm.conf || die
 
-	# Fix consolekit and selinux
-	eapply "${FILESDIR}/${P}-pam.patch"
-	# Apply all upstream fixes in git until 2016-11-11
-	eapply "${FILESDIR}/lxdm-0.5.3-upstream-fixes.patch"
-	eapply_user
+	default
 
 	# this replaces the bootstrap/autogen script in most packages
 	eautoreconf


^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2023-03-26  1:31 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-03-26  1:31 [gentoo-commits] repo/gentoo:master commit in: lxde-base/lxdm/, lxde-base/lxdm/files/ Brian Evans
  -- strict thread matches above, loose matches on Subject: below --
2021-02-07 14:33 Brian Evans
2018-04-13 19:32 Pacho Ramos

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox