diff options
| author |   Nirbheek Chauhan <nirbheek.chauhan@gmail.com> | 2008-12-14 23:06:41 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek.chauhan@gmail.com> | 2008-12-14 23:06:41 +0530 |
| commit | 1755189ae5de392781a5c4781b9af66e9ea03be0 (patch) | |
| tree | 331092a3cfecad1fa8acf948928ce604a56955e0 | |
| parent | Add =x11-themes/gtk-engines-murrine-9999 (diff) | |
| download | gnome-live-1755189ae5de392781a5c4781b9af66e9ea03be0.tar.gz gnome-live-1755189ae5de392781a5c4781b9af66e9ea03be0.tar.bz2 gnome-live-1755189ae5de392781a5c4781b9af66e9ea03be0.zip | |
Update gdm-selinux-remove-attr.patch for trunk
Also, change ebuild to use the PATCHES variable
| -rw-r--r-- | gnome-base/gdm/Manifest | 4 | ||||
| -rw-r--r-- | gnome-base/gdm/files/gdm-selinux-remove-attr.patch | 13 | ||||
| -rw-r--r-- | gnome-base/gdm/gdm-9999.ebuild | 11 |
3 files changed, 12 insertions, 16 deletions
diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest index 0dabe80..c8e7bd1 100644 --- a/gnome-base/gdm/Manifest +++ b/gnome-base/gdm/Manifest @@ -1,4 +1,4 @@ AUX gdm-fix-daemonize-regression.patch 3810 RMD160 4d6cd08ba2cb27f3d4702a7f7d8cb55ba84e2e1f SHA1 c5c0569f2bf5f95ac86389da2c21088755dfd422 SHA256 95725e57a6c19667e7bbf7ac533c031dc6590e869b3a8b93916c5cda9b91ca71 -AUX gdm-selinux-remove-attr.patch 503 RMD160 f6281e88fdd718d04667effa938a23286e583770 SHA1 96736ecf27810a055b18890acceac46a25eb8b90 SHA256 cad06b235a669ee342386b9a97502e635c632b0d15b5833b05349c90ea76fb59 +AUX gdm-selinux-remove-attr.patch 522 RMD160 212f4abb28c03015c46b9f4252a3a789fc28273c SHA1 5d2ea44054b1b9dea2988daddf31294b342d078d SHA256 02bd787501596555d51de7fa40f6466495b9e73630259ccc612c61921b2059f9 DIST gdm-2.20.5-gentoo-files.tar.bz2 3214 RMD160 a075aa94fc3f6f2947bddf46f008979d62cc94d3 SHA1 9654caf36a91a83ffb5d4e53078a70e8c29a0b61 SHA256 47716f35eb1c6875e9c8e42120ff5f65da806aa06f15a48b082a6f5e5a94da83 -EBUILD gdm-9999.ebuild 4578 RMD160 11a9cbf1370c98120cc82ecdda0c86a1ec62e8fa SHA1 b55cb67ce3a614f53eaadcc48a08225f66127c4c SHA256 affb4a6a3524a5a94eecf195c76352c7f9f9da632eb4a63297d926c5eea2a8f8 +EBUILD gdm-9999.ebuild 4450 RMD160 b265bfc93289818a45aa263efa203c55ed288aa4 SHA1 d6e6748257ef044239fca89298ecc3e68ae8705c SHA256 4c361a224b253f30c3d7f4feac8fb2006e05ce4cba209eb1638f16672f86032e diff --git a/gnome-base/gdm/files/gdm-selinux-remove-attr.patch b/gnome-base/gdm/files/gdm-selinux-remove-attr.patch index 74ac70b..8a3b6ff 100644 --- a/gnome-base/gdm/files/gdm-selinux-remove-attr.patch +++ b/gnome-base/gdm/files/gdm-selinux-remove-attr.patch @@ -1,12 +1,13 @@ -diff --exclude-from=/home/dang/.diffrc -u -ruN gdm-2.13.0.1.orig/configure.ac gdm-2.13.0.1/configure.ac ---- gdm-2.13.0.1.orig/configure.ac 2005-11-14 17:13:40.000000000 -0500 -+++ gdm-2.13.0.1/configure.ac 2005-11-18 14:59:23.000000000 -0500 -@@ -750,7 +750,7 @@ +Index: configure.ac +=================================================================== +--- configure.ac (revision 6635) ++++ configure.ac (working copy) +@@ -873,7 +873,7 @@ AC_CHECK_LIB(selinux,setexeccon,/bin/true) AC_CHECK_LIB(selinux,is_selinux_enabled,/bin/true) - AC_DEFINE(HAVE_SELINUX) + AC_DEFINE(HAVE_SELINUX, 1, [Define if have selinux]) - EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lselinux -lattr" + EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lselinux" fi - # + dnl --------------------------------------------------------------------------- diff --git a/gnome-base/gdm/gdm-9999.ebuild b/gnome-base/gdm/gdm-9999.ebuild index ca84240..26d01bb 100644 --- a/gnome-base/gdm/gdm-9999.ebuild +++ b/gnome-base/gdm/gdm-9999.ebuild @@ -66,6 +66,9 @@ DEPEND="${RDEPEND} >=app-text/gnome-doc-utils-0.3.2" DOCS="AUTHORS ChangeLog NEWS README TODO" +PATCHES=" +${PN}-selinux-remove-attr.patch +${PN}-fix-daemonize-regression.patch" pkg_setup() { G2CONF="${G2CONF} @@ -87,14 +90,6 @@ pkg_setup() { enewuser gdm -1 -1 /var/lib/gdm gdm } -src_unpack() { - gnome2_src_unpack - - # remove unneeded linker directive for selinux (#41022) - epatch "${FILESDIR}/${PN}-selinux-remove-attr.patch" - epatch "${FILESDIR}/${PN}-fix-daemonize-regression.patch" -} - src_install() { gnome2_src_install |