[gentoo-commits] gentoo-x86 commit in x11-apps/xdm: metadata.xml xdm-1.1.11-r3.ebuild ChangeLog

[gentoo-commits] gentoo-x86 commit in x11-apps/xdm: metadata.xml xdm-1.1.11-r3.ebuild ChangeLog

[Chi-Thanh Christopher Nguyen (chithanh)]

chithanh    13/07/02 09:57:47

  Modified:             metadata.xml ChangeLog
  Added:                xdm-1.1.11-r3.ebuild
  Log:
  Add patch for security bug #473120. Make xdm-auth optional, bug #445662.
  
  (Portage version: 2.1.12.2/cvs/Linux x86_64, unsigned Manifest commit)

Revision  Changes    Path
1.3                  x11-apps/xdm/metadata.xml

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-apps/xdm/metadata.xml?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-apps/xdm/metadata.xml?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-apps/xdm/metadata.xml?r1=1.2&r2=1.3

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-apps/xdm/metadata.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- metadata.xml	28 Jan 2012 07:52:04 -0000	1.2
+++ metadata.xml	2 Jul 2013 09:57:47 -0000	1.3
@@ -4,5 +4,6 @@
   <herd>x11</herd>
   <use>
     <flag name='consolekit'>Enable native <pkg>sys-auth/consolekit</pkg> support</flag>
+    <flag name='xdm-auth'>Enable XDM-AUTHENTICATION-1 support</flag>
   </use>
 </pkgmetadata>



1.147                x11-apps/xdm/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-apps/xdm/ChangeLog?rev=1.147&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-apps/xdm/ChangeLog?rev=1.147&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-apps/xdm/ChangeLog?r1=1.146&r2=1.147

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-apps/xdm/ChangeLog,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- ChangeLog	7 Dec 2012 18:10:39 -0000	1.146
+++ ChangeLog	2 Jul 2013 09:57:47 -0000	1.147
@@ -1,6 +1,12 @@
 # ChangeLog for x11-apps/xdm
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/ChangeLog,v 1.146 2012/12/07 18:10:39 mgorny Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/ChangeLog,v 1.147 2013/07/02 09:57:47 chithanh Exp $
+
+*xdm-1.1.11-r3 (02 Jul 2013)
+
+  02 Jul 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +files/xdm-1.1.11-cve-2013-2179.patch, +xdm-1.1.11-r3.ebuild, metadata.xml:
+  Add patch for security bug #473120. Make xdm-auth optional, bug #445662.
 
 *xdm-1.1.11-r2 (07 Dec 2012)
 



1.1                  x11-apps/xdm/xdm-1.1.11-r3.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-apps/xdm/xdm-1.1.11-r3.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-apps/xdm/xdm-1.1.11-r3.ebuild?rev=1.1&content-type=text/plain

Index: xdm-1.1.11-r3.ebuild
===================================================================
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/xdm-1.1.11-r3.ebuild,v 1.1 2013/07/02 09:57:47 chithanh Exp $

EAPI=5

XORG_EAUTORECONF=yes

inherit multilib xorg-2 pam systemd

DEFAULTVT=vt7

DESCRIPTION="X.Org xdm application"

KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
IUSE="consolekit ipv6 pam xdm-auth"

RDEPEND="x11-apps/xrdb
	x11-libs/libXdmcp
	x11-libs/libXaw
	>=x11-apps/xinit-1.0.2-r3
	x11-libs/libXinerama
	x11-libs/libXmu
	x11-libs/libX11
	x11-libs/libXt
	x11-apps/sessreg
	x11-apps/xconsole
	consolekit? ( sys-auth/consolekit )
	pam? ( virtual/pam )
	!<sys-apps/systemd-187"
DEPEND="${RDEPEND}
	consolekit? ( !=sys-auth/pambase-20101024-r1 )
	x11-proto/xineramaproto
	x11-proto/xproto"

pkg_setup() {
	PATCHES=(
		"${FILESDIR}"/${PN}-consolekit.patch
		"${FILESDIR}"/${P}-cve-2013-2179.patch
	)

	XORG_CONFIGURE_OPTIONS=(
		$(use_enable ipv6)
		$(use_with pam)
		"$(systemd_with_unitdir)"
		--with-default-vt=${DEFAULTVT}
		--with-xdmconfigdir=/etc/X11/xdm
		$(use_with consolekit)
	)
}

src_prepare() {
	# fedora invented that in -187...
	sed -i -e 's:^Alias=.*$:Alias=display-manager.service:' \
		xdm.service.in || die

	# disable XDM-AUTHENTICATION-1 wrt bug #445662.
	# it causes issue with libreoffice and SDL games (bug #306223).
	if use !xdm-auth; then
		sed -i -e '/authorize/a\
DisplayManager*authName:	MIT-MAGIC-COOKIE-1' \
			config/xdm-config.cpp || die
	fi
	xorg-2_src_prepare
}

src_install() {
	xorg-2_src_install

	exeinto /usr/$(get_libdir)/X11/xdm
	doexe "${FILESDIR}"/Xsession

	use pam && pamd_mimic system-local-login xdm auth account session

	# Keep /var/lib/xdm. This is where authfiles are stored. See #286350.
	keepdir /var/lib/xdm
}