diff options
| author |   Ian Stakenvicius <axs@gentoo.org> | 2012-10-05 17:05:56 +0000 |
|---|---|---|
| committer | Ian Stakenvicius <axs@gentoo.org> | 2012-10-05 17:05:56 +0000 |
| commit | 2b626209c3c08cd6fe6601238a8508958e354267 (patch) | |
| tree | c6e2c9b92e6d678f418a6485c8b0efd9d8733ce2 /x11-misc/slim | |
| parent | Marking net-snmp-5.7.2_rc1 ppc for bug 431752 (diff) | |
| download | gentoo-2-2b626209c3c08cd6fe6601238a8508958e354267.tar.gz gentoo-2-2b626209c3c08cd6fe6601238a8508958e354267.tar.bz2 gentoo-2-2b626209c3c08cd6fe6601238a8508958e354267.zip | |
force default vt07 (bug 436620) and ensure pam session isn't erroneously cleaned during child execution (cause for krb5 ticket cache not existing in bug 436556)
(Portage version: 2.1.11.22/cvs/Linux x86_64)
Diffstat (limited to 'x11-misc/slim')
| -rw-r--r-- | x11-misc/slim/ChangeLog | 11 | ||||
| -rw-r--r-- | x11-misc/slim/files/slim-1.3.4-config.diff (renamed from x11-misc/slim/files/slim-1.3.3-config.diff) | 2 | ||||
| -rw-r--r-- | x11-misc/slim/files/slim-1.3.4-pam-end.patch | 10 | ||||
| -rw-r--r-- | x11-misc/slim/slim-1.3.4-r1.ebuild (renamed from x11-misc/slim/slim-1.3.4.ebuild) | 5 |
4 files changed, 24 insertions, 4 deletions
diff --git a/x11-misc/slim/ChangeLog b/x11-misc/slim/ChangeLog index dba5682cb84c..61771ee28f23 100644 --- a/x11-misc/slim/ChangeLog +++ b/x11-misc/slim/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for x11-misc/slim # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/ChangeLog,v 1.88 2012/06/27 16:01:19 axs Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/ChangeLog,v 1.89 2012/10/05 17:05:56 axs Exp $ + +*slim-1.3.4-r1 (05 Oct 2012) + + 05 Oct 2012; Ian Stakenvicius <axs@gentoo.org> -files/slim-1.3.3-config.diff, + -slim-1.3.4.ebuild, +slim-1.3.4-r1.ebuild, +files/slim-1.3.4-config.diff, + +files/slim-1.3.4-pam-end.patch: + force default vt07 (bug 436620) and ensure pam session isn't erroneously + cleaned during child execution (cause for krb5 ticket cache not existing in + bug 436556) *slim-1.3.4 (27 Jun 2012) diff --git a/x11-misc/slim/files/slim-1.3.3-config.diff b/x11-misc/slim/files/slim-1.3.4-config.diff index 533b3ac4ac42..cfc6aa2a1770 100644 --- a/x11-misc/slim/files/slim-1.3.3-config.diff +++ b/x11-misc/slim/files/slim-1.3.4-config.diff @@ -5,7 +5,7 @@ default_path /bin:/usr/bin:/usr/local/bin default_xserver /usr/bin/X -#xserver_arguments -dpi 75 -+xserver_arguments -nolisten tcp -br -deferglyphs 16 ++xserver_arguments -nolisten tcp -br -deferglyphs 16 vt07 # Commands for halt, login, etc. halt_cmd /sbin/shutdown -h now diff --git a/x11-misc/slim/files/slim-1.3.4-pam-end.patch b/x11-misc/slim/files/slim-1.3.4-pam-end.patch new file mode 100644 index 000000000000..c3668c39e867 --- /dev/null +++ b/x11-misc/slim/files/slim-1.3.4-pam-end.patch @@ -0,0 +1,10 @@ +--- a/app.cpp 2012-10-05 12:31:24.000000000 -0400 ++++ b/app.cpp 2012-10-05 12:32:02.000000000 -0400 +@@ -599,7 +599,6 @@ + child_env[n] = NULL; + # endif /* USE_CONSOLEKIT */ + +- pam.end(); + #else + + # ifdef USE_CONSOLEKIT diff --git a/x11-misc/slim/slim-1.3.4.ebuild b/x11-misc/slim/slim-1.3.4-r1.ebuild index 4105b8883706..41e511f2e484 100644 --- a/x11-misc/slim/slim-1.3.4.ebuild +++ b/x11-misc/slim/slim-1.3.4-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/slim-1.3.4.ebuild,v 1.1 2012/06/27 16:01:19 axs Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/slim-1.3.4-r1.ebuild,v 1.1 2012/10/05 17:05:56 axs Exp $ EAPI=4 @@ -34,8 +34,9 @@ PDEPEND="branding? ( >=x11-themes/slim-themes-1.2.3a-r3 )" src_prepare() { # Our Gentoo-specific config changes - epatch "${FILESDIR}"/${PN}-1.3.3-config.diff + epatch "${FILESDIR}"/${P}-config.diff epatch "${FILESDIR}"/${P}-libpng.patch + epatch "${FILESDIR}"/${P}-pam-end.patch if use elibc_FreeBSD; then sed -i -e 's/"-DHAVE_SHADOW"/"-DNEEDS_BASENAME"/' CMakeLists.txt \ |