From: Samuli Suominen Date: Mon, 21 Jun 2010 16:30:52 +0000 (+0000) Subject: old X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fd03d8868190483567a7ddcb146c15300cfebc3f;p=gentoo.git old Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- diff --git a/kde-base/kdm/ChangeLog b/kde-base/kdm/ChangeLog index fb71e0ff504a..2dfe07634a99 100644 --- a/kde-base/kdm/ChangeLog +++ b/kde-base/kdm/ChangeLog @@ -1,12 +1,13 @@ # ChangeLog for kde-base/kdm # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.218 2010/06/21 15:53:29 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.219 2010/06/21 16:30:52 ssuominen Exp $ 21 Jun 2010; Tomáš Chvátal kdm-4.3.5.ebuild, kdm-4.3.5-r1.ebuild, kdm-4.4.4.ebuild: Drop 4.3.3. Drop hppa keywords per bug #304363 - 21 Jun 2010; Samuli Suominen -kdm-4.3.3.ebuild: + 21 Jun 2010; Samuli Suominen -kdm-4.3.3.ebuild, + -kdm-4.3.5.ebuild: Remove vulnerable kde-base/kdm from tree wrt #315235. *kdm-4.4.4 (06 Jun 2010) diff --git a/kde-base/kdm/Manifest b/kde-base/kdm/Manifest index 2457c1e1546e..135ce7d1c0d1 100644 --- a/kde-base/kdm/Manifest +++ b/kde-base/kdm/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX kdebase-4.0.2-pam-optional.patch 979 RMD160 abdb7293c02507dfd0a032e72f3e449405b6d8a0 SHA1 33e2f936f0548f9b19fe541c0f71db06f9daaf63 SHA256 efa4e0132687dbaa68ab5c8a5911c4a08b5d4e9eb4d2a04879f765b8e44ba9ea AUX kdm-4-gentoo-xinitrc.d.patch 793 RMD160 1e22f23d7cbd4764b4a7675968e0a387de2fc09a SHA1 226db506807a31b565da598458faed4a3ce3ddb7 SHA256 7ddeaa5b5446ed9e4f94cfc474032ee7d450df3748b378a4803c5b7b2bdce684 AUX kdm-4.3.1-set-grub-default.patch 953 RMD160 c5cae2d7e2dd6dc8592ba257442cb6074d65d8c3 SHA1 c0610cd3442c11290a203c5cab9d59a7f353ebfc SHA256 0c890850869d048d15e13687d3bb889c2941280cc9ca3d62c57a2d0ea3674273 @@ -9,14 +6,6 @@ AUX kdm-4.4.2-CVE-2010-0436.patch 5823 RMD160 f5aa26aca739cfbf099e63c59ab692d0ef DIST kdebase-workspace-4.3.5.tar.bz2 62525359 RMD160 dcf04a40412ba236365423afc877ea0c2066f972 SHA1 703582cb8a3471c5821986dbdfc3c6deedac0ff3 SHA256 7985634ed1f87889bcd6613ef41127196df442017bf895be6fb2afb196ce149b DIST kdebase-workspace-4.4.4.tar.bz2 77036111 RMD160 26df3ddc22611f50d29818d27079dfe4bacf6910 SHA1 7b20bc91a5969b4c42c83076926cf6838b2ba47b SHA256 132df024801fff623d3e97f366dff0ed0fae7a653ac483184c0c65f8ea4adee7 EBUILD kdm-4.3.5-r1.ebuild 2673 RMD160 753b7c04d5d12fdf3255668b34df16b7ded7cc49 SHA1 67a2deefa01b9c998f9880d3643d7e7c2ba8a9c5 SHA256 9e90e93fd9f64f4bf695be31e68ab3d0c62935899744ed40a6bfb070e4894657 -EBUILD kdm-4.3.5.ebuild 2623 RMD160 1297d1ed44607b57a2d8c6852b1d141edba1a90d SHA1 7b3dd5685be1765b2683fd60608b5cbfabffc7c6 SHA256 065bb09e00d7e5a88e81f2e44da1e945ced92f48de6e99524d728e2a63bee863 EBUILD kdm-4.4.4.ebuild 2650 RMD160 b505a4e6f84b6006d6c7b120fcc91019e2e59495 SHA1 bf559762536c6ddb38cbeb576c12dfc876793062 SHA256 49d041077112cdc164596560836b08ac55c1c09e7204c1d55a2ca9ec02a4a57f -MISC ChangeLog 28880 RMD160 2831dfbb33ec949026475d2e4ff9cd5171f3cbdd SHA1 843a68b47b6137c52dff53dd8ca93602a2991892 SHA256 769d0f26ec8dd5de20ed92d2716914c895d84e0352bc5d5c719e8851e554201e +MISC ChangeLog 28901 RMD160 052947346ce88372f2446ff0a3821f548164657c SHA1 70b4dddac05ef6e123880828c14f4a8b367d750d SHA256 69010468982fdf4fca8a7789cf06e108d3288d902d393b28461d2f9bea0e52d9 MISC metadata.xml 253 RMD160 dbe3d0cc1778dad287767c5dee6b46b42ccf20ec SHA1 b4723a2baaec997efee2cdc543248a2aad8f1a7e SHA256 955ffc185b3b01315be94542ea43ae1180d5f61ea539a317c45c5746b463eeba ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.15 (GNU/Linux) - -iEYEARECAAYFAkwfi7oACgkQHB6c3gNBRYfBfwCeOS5ZWMuYUC54nEIZA8TifFij -X4sAn2KbUJPWf4bNZLmlCyUKRM7VUiE3 -=2ezZ ------END PGP SIGNATURE----- diff --git a/kde-base/kdm/kdm-4.3.5.ebuild b/kde-base/kdm/kdm-4.3.5.ebuild deleted file mode 100644 index 4ae11aa0558e..000000000000 --- a/kde-base/kdm/kdm-4.3.5.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-4.3.5.ebuild,v 1.4 2010/06/21 15:53:29 scarabeus Exp $ - -EAPI="2" - -KMNAME="kdebase-workspace" -inherit kde4-meta flag-o-matic - -DESCRIPTION="KDE login manager, similar to xdm and gdm" -KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ~ppc64 ~sparc x86" -IUSE="consolekit debug +handbook kerberos pam" - -DEPEND=" - x11-libs/libXau - x11-libs/libXdmcp - x11-libs/libXtst - consolekit? ( - >=sys-apps/dbus-1.0.2 - sys-auth/consolekit - ) - kerberos? ( virtual/krb5 ) - pam? ( - $(add_kdebase_dep kcheckpass) - virtual/pam - ) -" -RDEPEND="${DEPEND} - $(add_kdebase_dep kdepasswd) - >=x11-apps/xinit-1.0.5-r2 - x11-apps/xmessage -" - -KMEXTRACTONLY=" - kcontrol/kdm/ -" -KMEXTRA=" - libs/kdm/ -" - -PATCHES=( - "${FILESDIR}/kdebase-4.0.2-pam-optional.patch" - "${FILESDIR}/${PN}-4-gentoo-xinitrc.d.patch" - "${FILESDIR}/${PN}-4.3.1-set-grub-default.patch" -) - -src_configure() { - # genkdmconf breaks with -O3 - # last checked in 4.2.95 - replace-flags -O3 -O2 - - mycmakeargs=( - $(cmake-utils_use kerberos KDE4_KRB5AUTH) - $(cmake-utils_use_with pam) - $(cmake-utils_use_with consolekit CkConnector) - ) - - kde4-meta_src_configure -} - -src_install() { - export GENKDMCONF_FLAGS="--no-old --no-backup" - - kde4-meta_src_install - - # Customize the kdmrc configuration - sed -i -e "s:^.*SessionsDirs=.*$:#&\nSessionsDirs=${EPREFIX}/usr/share/xsessions:" \ - "${ED}"/${PREFIX}/share/config/kdm/kdmrc \ - || die "Failed to set SessionsDirs correctly." - - # Don't install empty dir - rmdir "${ED}${KDEDIR}"/share/config/kdm/sessions -} - -pkg_postinst() { - kde4-meta_pkg_postinst - - # Set the default kdm face icon if it's not already set by the system admin - # because this is user-overrideable in that way, it's not in src_install - if [[ ! -e "${EROOT}${KDEDIR}/share/apps/kdm/faces/.default.face.icon" ]]; then - mkdir -p "${EROOT}${KDEDIR}/share/apps/kdm/faces" - cp "${EROOT}${KDEDIR}/share/apps/kdm/pics/users/default1.png" \ - "${EROOT}${KDEDIR}/share/apps/kdm/faces/.default.face.icon" - fi - if [[ ! -e "${EROOT}${KDEDIR}/share/apps/kdm/faces/root.face.icon" ]]; then - mkdir -p "${EROOT}${KDEDIR}/share/apps/kdm/faces" - cp "${EROOT}${KDEDIR}/share/apps/kdm/pics/users/root1.png" \ - "${EROOT}${KDEDIR}/share/apps/kdm/faces/root.face.icon" - fi - - if use consolekit; then - echo - elog "You have compiled 'kdm' with consolekit support. If you want to use kdm," - elog "make sure consolekit daemon is running and started at login time" - elog - elog "rc-update add consolekit default && /etc/init.d/consolekit start" - echo - fi -}