diff options
author | Alexey Shvetsov <alexxy@gentoo.org> | 2009-06-14 12:41:14 +0000 |
---|---|---|
committer | Alexey Shvetsov <alexxy@gentoo.org> | 2009-06-14 12:41:14 +0000 |
commit | 2bb413237fda75b2ee830b37067d8667056c4c11 (patch) | |
tree | 73e98633055de3e5aa782c223771c44698ac1589 | |
parent | [kde-base/kdeartwork-kscreensaver] Clean unneeded patches (diff) | |
download | gentoo-2-2bb413237fda75b2ee830b37067d8667056c4c11.tar.gz gentoo-2-2bb413237fda75b2ee830b37067d8667056c4c11.tar.bz2 gentoo-2-2bb413237fda75b2ee830b37067d8667056c4c11.zip |
[kde-base/kdebase] Clean unneeded patches
(Portage version: 2.2_rc33/cvs/Linux x86_64)
-rw-r--r-- | kde-base/kdebase/ChangeLog | 7 | ||||
-rw-r--r-- | kde-base/kdebase/files/kdm-3.5.8-login.diff | 40 | ||||
-rw-r--r-- | kde-base/kdebase/files/ksmserver-3.5.8-gdm_interop_197133.patch | 41 |
3 files changed, 6 insertions, 82 deletions
diff --git a/kde-base/kdebase/ChangeLog b/kde-base/kdebase/ChangeLog index 24e7ee5ff323..37e1dfc6afbc 100644 --- a/kde-base/kdebase/ChangeLog +++ b/kde-base/kdebase/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for kde-base/kdebase # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.454 2009/05/16 09:02:35 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.455 2009/06/14 12:41:13 alexxy Exp $ + + 14 Jun 2009; Alexey Shvetsov <alexxy@gentoo.org> + -files/ksmserver-3.5.8-gdm_interop_197133.patch, + -files/kdm-3.5.8-login.diff: + Clean unneeded patches 16 May 2009; Robin H. Johnson <robbat2@gentoo.org> kdebase-3.5.9.ebuild, kdebase-3.5.9-r1.ebuild, kdebase-3.5.9-r2.ebuild, kdebase-3.5.9-r3.ebuild, diff --git a/kde-base/kdebase/files/kdm-3.5.8-login.diff b/kde-base/kdebase/files/kdm-3.5.8-login.diff deleted file mode 100644 index 790987adfdb4..000000000000 --- a/kde-base/kdebase/files/kdm-3.5.8-login.diff +++ /dev/null @@ -1,40 +0,0 @@ ---- kdm/backend/inifile.c -+++ kdm/backend/inifile.c -@@ -37,6 +37,7 @@ - #include "dm_error.h" - - #include <sys/types.h> -+#include <sys/stat.h> - #include <unistd.h> - #include <stdlib.h> - #include <string.h> -@@ -47,17 +48,27 @@ - { - char *data; - int fd, len; -+ struct stat st; - - if ((fd = open( fname, O_RDONLY | O_NONBLOCK )) < 0) { - Debug( "cannot open ini-file %\"s: %m", fname ); - return 0; - } -- len = lseek( fd, 0, SEEK_END ); -+ if (fstat( fd, &st ) || !S_ISREG( st.st_mode )) { -+ LogWarn( "Ini-file %\"s is no regular file\n", fname ); -+ close( fd ); -+ return 0; -+ } -+ if (st.st_size >= 0x10000) { -+ LogWarn( "Ini-file %\"s is too big\n", fname ); -+ close( fd ); -+ return 0; -+ } -+ len = st.st_size; - if (!(data = Malloc( len + 2 ))) { - close( fd ); - return 0; - } -- lseek( fd, 0, SEEK_SET ); - if (read( fd, data, len ) != len) { - Debug( "cannot read ini-file %\"s: %m", fname ); - free( data ); diff --git a/kde-base/kdebase/files/ksmserver-3.5.8-gdm_interop_197133.patch b/kde-base/kdebase/files/ksmserver-3.5.8-gdm_interop_197133.patch deleted file mode 100644 index 5fdc9af1a2e0..000000000000 --- a/kde-base/kdebase/files/ksmserver-3.5.8-gdm_interop_197133.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- branches/KDE/3.5/kdebase/kdmlib/dmctl.cpp 2006/10/31 11:38:26 600659 -+++ branches/KDE/3.5/kdebase/kdmlib/dmctl.cpp 2007/11/01 22:10:25 731815 -@@ -65,21 +65,28 @@ - if ((fd = ::socket( PF_UNIX, SOCK_STREAM, 0 )) < 0) - return; - sa.sun_family = AF_UNIX; -- if (DMType == GDM) -- strcpy( sa.sun_path, "/tmp/.gdm_socket" ); -- else { -+ if (DMType == GDM) { -+ strcpy( sa.sun_path, "/var/run/gdm_socket" ); -+ if (::connect( fd, (struct sockaddr *)&sa, sizeof(sa) )) { -+ strcpy( sa.sun_path, "/tmp/.gdm_socket" ); -+ if (::connect( fd, (struct sockaddr *)&sa, sizeof(sa) )) { -+ ::close( fd ); -+ fd = -1; -+ break; -+ } -+ } -+ GDMAuthenticate(); -+ } else { - if ((ptr = strchr( dpy, ':' ))) - ptr = strchr( ptr, '.' ); - snprintf( sa.sun_path, sizeof(sa.sun_path), - "%s/dmctl-%.*s/socket", -- ctl, ptr ? ptr - dpy : 512, dpy ); -- } -- if (::connect( fd, (struct sockaddr *)&sa, sizeof(sa) )) { -- ::close( fd ); -- fd = -1; -+ ctl, ptr ? int(ptr - dpy) : 512, dpy ); -+ if (::connect( fd, (struct sockaddr *)&sa, sizeof(sa) )) { -+ ::close( fd ); -+ fd = -1; -+ } - } -- if (DMType == GDM) -- GDMAuthenticate(); - break; - case OldKDM: - { |