new release

5 files changed, 167 insertions, 6 deletions

diff --git a/gnome-base/gdm/ChangeLog b/gnome-base/gdm/ChangeLog
index aa8760770bdf..0ff20ab4b3ad 100644
--- a/gnome-base/gdm/ChangeLog
+++ b/gnome-base/gdm/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-base/gdm
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.50 2004/02/10 06:14:59 darkspecter Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.51 2004/02/17 23:10:44 foser Exp $
+
+*gdm-2.4.4.7 (17 Feb 2004)
+
+  17 Feb 2004; foser <foser@gentoo.org> gdm-2.4.4.7.ebuild :
+  Finally put this update in
+  Fixed some small issues after cleaning 2.4.4 triggered by the diff in #40711
+  Added selinux stuff as requested & proposed by pebenito in #41022
+  Added a new default gentoo theme : gentoo-cow
 
   10 Feb 2004; Bartosch Pixa <darkspecter@gentoo.org> gdm-2.4.1.7-r1.ebuild:
   set ppc in keywords
diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest
index 84381c9e4d52..e73e35809eac 100644
--- a/gnome-base/gdm/Manifest
+++ b/gnome-base/gdm/Manifest
@@ -1,13 +1,15 @@
-MD5 395247f14710e060a63ce937765ba487 ChangeLog 7248
+MD5 ffc0fd22bbabf40ba3b43062564a4a65 gdm-2.4.4.5.ebuild 2521
+MD5 c5473583b3048c1b1a0abf89a4089d1b gdm-2.4.4.7.ebuild 3216
 MD5 844b176c879a0925357b197e9cf0643e gdm-2.2.5.4-r5.ebuild 4523
-MD5 054cbb51637cc4f0f6785e5770fd3618 gdm-2.4.1.6.ebuild 4804
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 5f3ff6ab94e627408f9088ee31a8c0b6 gdm-2.4.1.7-r1.ebuild 5229
-MD5 ffc0fd22bbabf40ba3b43062564a4a65 gdm-2.4.4.5.ebuild 2521
+MD5 395247f14710e060a63ce937765ba487 ChangeLog 7248
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 054cbb51637cc4f0f6785e5770fd3618 gdm-2.4.1.6.ebuild 4804
 MD5 80ecdc9dea675084c39d7d30876acf5b files/digest-gdm-2.2.5.4-r5 65
-MD5 56240f76c07fea3245d9c6bb19066474 files/digest-gdm-2.4.1.6 134
 MD5 6392095707ae98912a626cb035796255 files/digest-gdm-2.4.1.7-r1 134
+MD5 56240f76c07fea3245d9c6bb19066474 files/digest-gdm-2.4.1.6 134
 MD5 3f9ff674c1629cb397ab0eb0894cc7e3 files/digest-gdm-2.4.4.5 65
+MD5 c716bff225c051785585954d8131c4f9 files/digest-gdm-2.4.4.7 136
 MD5 2a4dc345919a4094ead16d7a122e40bf files/2.2.5/gnomerc 235
 MD5 2a4dc345919a4094ead16d7a122e40bf files/2.4.1/gnomerc 235
 MD5 0107e56a45d8ef4413c1779e809f1c03 files/2.4.4/Xsession 6198
diff --git a/gnome-base/gdm/files/digest-gdm-2.4.4.7 b/gnome-base/gdm/files/digest-gdm-2.4.4.7
new file mode 100644
index 000000000000..e668d8837757
--- /dev/null
+++ b/gnome-base/gdm/files/digest-gdm-2.4.4.7
@@ -0,0 +1,2 @@
+MD5 a3d2f243c4f42e2542bda8cb5fb9a7c5 gdm-2.4.4.7.tar.bz2 2430455
+MD5 e0dcf60fc342ed1862f0fff26da984b2 gentoo-gdm-theme-r1.tar.bz2 54186
diff --git a/gnome-base/gdm/files/gdm-2.4.4-selinux_remove_attr.patch b/gnome-base/gdm/files/gdm-2.4.4-selinux_remove_attr.patch
new file mode 100644
index 000000000000..254f50a5c71d
--- /dev/null
+++ b/gnome-base/gdm/files/gdm-2.4.4-selinux_remove_attr.patch
@@ -0,0 +1,24 @@
+diff -urN gdm-2.4.4.5.orig/configure gdm-2.4.4.5/configure
+--- gdm-2.4.4.5.orig/configure	2003-10-17 12:48:47.000000000 -0500
++++ gdm-2.4.4.5/configure	2004-02-06 11:47:34.487419640 -0600
+@@ -25222,7 +25222,7 @@
+ #define HAVE_SELINUX 1
+ _ACEOF
+ 
+-	EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lselinux -lattr"
++	EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lselinux"
+ fi
+ 
+ #
+diff -urN gdm-2.4.4.5.orig/configure.in gdm-2.4.4.5/configure.in
+--- gdm-2.4.4.5.orig/configure.in	2003-10-17 12:48:29.000000000 -0500
++++ gdm-2.4.4.5/configure.in	2004-02-06 11:47:02.021488283 -0600
+@@ -463,7 +463,7 @@
+ 	AC_CHECK_LIB(selinux,setexeccon,/bin/true)
+ 	AC_CHECK_LIB(selinux,is_selinux_enabled,/bin/true)
+ 	AC_DEFINE(HAVE_SELINUX)
+-	EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lselinux -lattr"
++	EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lselinux"
+ fi
+ 
+ #
diff --git a/gnome-base/gdm/gdm-2.4.4.7.ebuild b/gnome-base/gdm/gdm-2.4.4.7.ebuild
new file mode 100644
index 000000000000..08f8246c2a7b
--- /dev/null
+++ b/gnome-base/gdm/gdm-2.4.4.7.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.4.4.7.ebuild,v 1.1 2004/02/17 23:10:44 foser Exp $
+
+inherit gnome2 eutils
+
+DESCRIPTION="GNOME2 Display Manager"
+HOMEPAGE="http://www.jirka.org/gdm.html"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64"
+IUSE="tcpd xinerama selinux"
+SRC_URI="${SRC_URI}
+	mirror://gentoo/gentoo-gdm-theme-r1.tar.bz2"
+MY_V="`echo ${PV} |cut -b -5`"
+
+RDEPEND=">=sys-libs/pam-0.72
+	>=x11-libs/gtk+-2
+	>=gnome-base/libglade-2
+	>=gnome-base/librsvg-2
+	>=media-libs/libart_lgpl-2.3.11
+	>=dev-libs/libxml2-2.4.12
+	>=gnome-base/libgnome-2
+	>=gnome-base/libgnomeui-2
+	>=gnome-base/libgnomecanvas-2
+	selinux? ( sys-libs/libselinux )"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	>=app-text/scrollkeeper-0.3.11
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )"
+
+G2CONF="${G2CONF} \
+	--sysconfdir=/etc/X11 \
+	--with-pam-prefix=/etc \
+	--with-xdmcp \
+	`use_with tcpd tcp-wrappers` \
+	`use_with xinerama` \
+	`use_enable selinux`"
+
+src_unpack() {
+
+	unpack ${A}
+
+	cd ${S}
+	# remove unneeded linker directive for selinux (#41022)
+	epatch ${FILESDIR}/${PN}-${MY_V}-selinux_remove_attr.patch
+
+}
+
+src_install() {
+
+	gnome2_src_install PAM_PREFIX=${D}/etc sysconfdir=${D}/etc/X11
+
+	# gdm-binary should be gdm to work with our init (#5598)
+	rm -f ${D}/usr/bin/gdm
+	mv ${D}/usr/bin/gdm-binary ${D}/usr/bin/gdm
+	dosym /usr/bin/gdm /usr/bin/gdm-binary
+
+	# log, etc.
+	dodir /var/lib/gdm
+	chown gdm:gdm ${D}/var/lib/gdm
+	chmod 750 ${D}/var/lib/gdm
+
+	# use our own session script
+	rm -f ${D}/etc/X11/gdm/Xsession
+	exeinto /etc/X11/gdm
+	doexe ${FILESDIR}/${MY_V}/Xsession
+
+	# We replace the pam stuff by our own
+	rm -f ${D}/etc/pam.d/gdm
+
+	# pam startup
+	dodir /etc/pam.d
+	insinto /etc/pam.d
+	doins ${FILESDIR}/${MY_V}/pam.d/gdm
+	doins ${FILESDIR}/${MY_V}/pam.d/gdmconfig
+	doins ${FILESDIR}/${MY_V}/pam.d/gdm-autologin
+
+	# pam security
+	dodir /etc/security/console.apps
+	insinto /etc/security/console.apps
+	doins ${FILESDIR}/${MY_V}/security/console.apps/gdmconfig
+
+	# use graphical greeter local
+	dosed "s:#Greeter=/usr/bin/gdmlogin:Greeter=/usr/bin/gdmgreeter:" /etc/X11/gdm/gdm.conf
+	# use Gentoo theme
+	dosed "s:#GraphicalTheme=circles:GraphicalTheme=gentoo-cow:" /etc/X11/gdm/gdm.conf
+
+	# Move Gentoo theme in
+	mv ${WORKDIR}/gentoo-cow  ${D}/usr/share/gdm/themes
+
+	dodoc ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README* TODO
+
+}
+
+pkg_postinst() {
+
+	gnome2_pkg_postinst
+
+	# Soft restart, assumes Gentoo defaults for file locations
+	FIFOFILE=/var/lib/gdm/.gdminfo
+	PIDFILE=/var/run/gdm.pid
+	if [ -w ${FIFOFILE} ] ; then
+		if [ -f ${PIDFILE} ] ; then
+			if [ kill -0 `cat ${PIDFILE}` ] ; then
+				(echo;echo SOFT_RESTART) >> ${FIFOFILE}
+			fi
+		fi
+	fi
+
+	einfo "To make GDM start at boot, edit /etc/rc.conf"
+	einfo "and then execute 'rc-update add xdm default'."
+
+}
+
+pkg_postrm() {
+
+	gnome2_pkg_postrm
+
+	einfo "To remove GDM from startup please execute"
+	einfo "'rc-update del xdm default'"
+
+}