| 1 |
chithanh 13/07/02 09:57:47 |
| 2 |
|
| 3 |
Modified: metadata.xml ChangeLog |
| 4 |
Added: xdm-1.1.11-r3.ebuild |
| 5 |
Log: |
| 6 |
Add patch for security bug #473120. Make xdm-auth optional, bug #445662. |
| 7 |
|
| 8 |
(Portage version: 2.1.12.2/cvs/Linux x86_64, unsigned Manifest commit) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.3 x11-apps/xdm/metadata.xml |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-apps/xdm/metadata.xml?rev=1.3&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-apps/xdm/metadata.xml?rev=1.3&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-apps/xdm/metadata.xml?r1=1.2&r2=1.3 |
| 16 |
|
| 17 |
Index: metadata.xml |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/x11-apps/xdm/metadata.xml,v |
| 20 |
retrieving revision 1.2 |
| 21 |
retrieving revision 1.3 |
| 22 |
diff -u -r1.2 -r1.3 |
| 23 |
--- metadata.xml 28 Jan 2012 07:52:04 -0000 1.2 |
| 24 |
+++ metadata.xml 2 Jul 2013 09:57:47 -0000 1.3 |
| 25 |
@@ -4,5 +4,6 @@ |
| 26 |
<herd>x11</herd> |
| 27 |
<use> |
| 28 |
<flag name='consolekit'>Enable native <pkg>sys-auth/consolekit</pkg> support</flag> |
| 29 |
+ <flag name='xdm-auth'>Enable XDM-AUTHENTICATION-1 support</flag> |
| 30 |
</use> |
| 31 |
</pkgmetadata> |
| 32 |
|
| 33 |
|
| 34 |
|
| 35 |
1.147 x11-apps/xdm/ChangeLog |
| 36 |
|
| 37 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-apps/xdm/ChangeLog?rev=1.147&view=markup |
| 38 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-apps/xdm/ChangeLog?rev=1.147&content-type=text/plain |
| 39 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-apps/xdm/ChangeLog?r1=1.146&r2=1.147 |
| 40 |
|
| 41 |
Index: ChangeLog |
| 42 |
=================================================================== |
| 43 |
RCS file: /var/cvsroot/gentoo-x86/x11-apps/xdm/ChangeLog,v |
| 44 |
retrieving revision 1.146 |
| 45 |
retrieving revision 1.147 |
| 46 |
diff -u -r1.146 -r1.147 |
| 47 |
--- ChangeLog 7 Dec 2012 18:10:39 -0000 1.146 |
| 48 |
+++ ChangeLog 2 Jul 2013 09:57:47 -0000 1.147 |
| 49 |
@@ -1,6 +1,12 @@ |
| 50 |
# ChangeLog for x11-apps/xdm |
| 51 |
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 52 |
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/ChangeLog,v 1.146 2012/12/07 18:10:39 mgorny Exp $ |
| 53 |
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 54 |
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/ChangeLog,v 1.147 2013/07/02 09:57:47 chithanh Exp $ |
| 55 |
+ |
| 56 |
+*xdm-1.1.11-r3 (02 Jul 2013) |
| 57 |
+ |
| 58 |
+ 02 Jul 2013; Chí-Thanh Christopher Nguyễn <chithanh@g.o> |
| 59 |
+ +files/xdm-1.1.11-cve-2013-2179.patch, +xdm-1.1.11-r3.ebuild, metadata.xml: |
| 60 |
+ Add patch for security bug #473120. Make xdm-auth optional, bug #445662. |
| 61 |
|
| 62 |
*xdm-1.1.11-r2 (07 Dec 2012) |
| 63 |
|
| 64 |
|
| 65 |
|
| 66 |
|
| 67 |
1.1 x11-apps/xdm/xdm-1.1.11-r3.ebuild |
| 68 |
|
| 69 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-apps/xdm/xdm-1.1.11-r3.ebuild?rev=1.1&view=markup |
| 70 |
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 |
| 71 |
|
| 72 |
Index: xdm-1.1.11-r3.ebuild |
| 73 |
=================================================================== |
| 74 |
# Copyright 1999-2013 Gentoo Foundation |
| 75 |
# Distributed under the terms of the GNU General Public License v2 |
| 76 |
# $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 $ |
| 77 |
|
| 78 |
EAPI=5 |
| 79 |
|
| 80 |
XORG_EAUTORECONF=yes |
| 81 |
|
| 82 |
inherit multilib xorg-2 pam systemd |
| 83 |
|
| 84 |
DEFAULTVT=vt7 |
| 85 |
|
| 86 |
DESCRIPTION="X.Org xdm application" |
| 87 |
|
| 88 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" |
| 89 |
IUSE="consolekit ipv6 pam xdm-auth" |
| 90 |
|
| 91 |
RDEPEND="x11-apps/xrdb |
| 92 |
x11-libs/libXdmcp |
| 93 |
x11-libs/libXaw |
| 94 |
>=x11-apps/xinit-1.0.2-r3 |
| 95 |
x11-libs/libXinerama |
| 96 |
x11-libs/libXmu |
| 97 |
x11-libs/libX11 |
| 98 |
x11-libs/libXt |
| 99 |
x11-apps/sessreg |
| 100 |
x11-apps/xconsole |
| 101 |
consolekit? ( sys-auth/consolekit ) |
| 102 |
pam? ( virtual/pam ) |
| 103 |
!<sys-apps/systemd-187" |
| 104 |
DEPEND="${RDEPEND} |
| 105 |
consolekit? ( !=sys-auth/pambase-20101024-r1 ) |
| 106 |
x11-proto/xineramaproto |
| 107 |
x11-proto/xproto" |
| 108 |
|
| 109 |
pkg_setup() { |
| 110 |
PATCHES=( |
| 111 |
"${FILESDIR}"/${PN}-consolekit.patch |
| 112 |
"${FILESDIR}"/${P}-cve-2013-2179.patch |
| 113 |
) |
| 114 |
|
| 115 |
XORG_CONFIGURE_OPTIONS=( |
| 116 |
$(use_enable ipv6) |
| 117 |
$(use_with pam) |
| 118 |
"$(systemd_with_unitdir)" |
| 119 |
--with-default-vt=${DEFAULTVT} |
| 120 |
--with-xdmconfigdir=/etc/X11/xdm |
| 121 |
$(use_with consolekit) |
| 122 |
) |
| 123 |
} |
| 124 |
|
| 125 |
src_prepare() { |
| 126 |
# fedora invented that in -187... |
| 127 |
sed -i -e 's:^Alias=.*$:Alias=display-manager.service:' \ |
| 128 |
xdm.service.in || die |
| 129 |
|
| 130 |
# disable XDM-AUTHENTICATION-1 wrt bug #445662. |
| 131 |
# it causes issue with libreoffice and SDL games (bug #306223). |
| 132 |
if use !xdm-auth; then |
| 133 |
sed -i -e '/authorize/a\ |
| 134 |
DisplayManager*authName: MIT-MAGIC-COOKIE-1' \ |
| 135 |
config/xdm-config.cpp || die |
| 136 |
fi |
| 137 |
xorg-2_src_prepare |
| 138 |
} |
| 139 |
|
| 140 |
src_install() { |
| 141 |
xorg-2_src_install |
| 142 |
|
| 143 |
exeinto /usr/$(get_libdir)/X11/xdm |
| 144 |
doexe "${FILESDIR}"/Xsession |
| 145 |
|
| 146 |
use pam && pamd_mimic system-local-login xdm auth account session |
| 147 |
|
| 148 |
# Keep /var/lib/xdm. This is where authfiles are stored. See #286350. |
| 149 |
keepdir /var/lib/xdm |
| 150 |
} |
Archives