6:4.11.1-4
- kded4 leak sockets when wifi connections fail (kde#324954) - use upstreamed Samba patch - Wrong timestamp on files copied (kde#55804)
This commit is contained in:
Rex Dieter
parent
817dcd5aef
commit
4be0693da5
|
|
@ -1,7 +1,7 @@
|
|||
From f8fea3f01c85eb0d6d479647ac27fe431846a1ae Mon Sep 17 00:00:00 2001
|
||||
From 9027e0620d1f6bb06cbeb00db1072047ccb8ff13 Mon Sep 17 00:00:00 2001
|
||||
From: Valentin Rusu <kde@rusu.info>
|
||||
Date: Sun, 1 Sep 2013 01:16:28 +0200
|
||||
Subject: Fix the synchronous-mode wallet open logic
|
||||
Subject: [PATCH 07/17] Fix the synchronous-mode wallet open logic
|
||||
|
||||
BUG: 254198
|
||||
|
||||
|
|
@ -0,0 +1,37 @@
|
|||
From ef3de4a99c3af0557f51afe61e30addb592f2d4a Mon Sep 17 00:00:00 2001
|
||||
From: Dawit Alemayehu <adawit@kde.org>
|
||||
Date: Wed, 4 Sep 2013 01:00:58 -0400
|
||||
Subject: [PATCH 10/17] Set modified meta-data for all copy jobs, not just move
|
||||
operations.
|
||||
|
||||
CCBUG: 55804
|
||||
REVIEW: 112528
|
||||
---
|
||||
kio/kio/job.cpp | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/kio/kio/job.cpp b/kio/kio/job.cpp
|
||||
index 8ff088c..13107c2 100644
|
||||
--- a/kio/kio/job.cpp
|
||||
+++ b/kio/kio/job.cpp
|
||||
@@ -2103,7 +2103,7 @@ void FileCopyJobPrivate::startCopyJob(const KUrl &slave_url)
|
||||
//kDebug(7007);
|
||||
KIO_ARGS << m_src << m_dest << m_permissions << (qint8) (m_flags & Overwrite);
|
||||
m_copyJob = new DirectCopyJob(slave_url, packedArgs);
|
||||
- if (m_move && m_modificationTime.isValid()) {
|
||||
+ if (m_modificationTime.isValid()) {
|
||||
m_copyJob->addMetaData( "modified", m_modificationTime.toString( Qt::ISODate ) ); // #55804
|
||||
}
|
||||
q->addSubjob( m_copyJob );
|
||||
@@ -2118,7 +2118,7 @@ void FileCopyJobPrivate::startRenameJob(const KUrl &slave_url)
|
||||
m_mustChmod = true; // CMD_RENAME by itself doesn't change permissions
|
||||
KIO_ARGS << m_src << m_dest << (qint8) (m_flags & Overwrite);
|
||||
m_moveJob = SimpleJobPrivate::newJobNoUi(slave_url, CMD_RENAME, packedArgs);
|
||||
- if (m_move && m_modificationTime.isValid()) {
|
||||
+ if (m_modificationTime.isValid()) {
|
||||
m_moveJob->addMetaData( "modified", m_modificationTime.toString( Qt::ISODate ) ); // #55804
|
||||
}
|
||||
q->addSubjob( m_moveJob );
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
|
|
@ -0,0 +1,42 @@
|
|||
From db71048c79d09aad4dfc8ea935959686c5ecbdfd Mon Sep 17 00:00:00 2001
|
||||
From: Christophe Giboudeaux <cgiboudeaux@gmx.com>
|
||||
Date: Mon, 9 Sep 2013 21:34:38 +0200
|
||||
Subject: [PATCH 14/17] Use pkgconfig as hints to find both samba 3 & 4
|
||||
|
||||
REVIEW: 106861 112448
|
||||
---
|
||||
cmake/modules/FindSamba.cmake | 9 ++++++---
|
||||
1 file changed, 6 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/cmake/modules/FindSamba.cmake b/cmake/modules/FindSamba.cmake
|
||||
index 16522c6..9240fcb 100644
|
||||
--- a/cmake/modules/FindSamba.cmake
|
||||
+++ b/cmake/modules/FindSamba.cmake
|
||||
@@ -17,10 +17,14 @@ if(SAMBA_INCLUDE_DIR AND SAMBA_LIBRARIES)
|
||||
set(Samba_FIND_QUIETLY TRUE)
|
||||
endif(SAMBA_INCLUDE_DIR AND SAMBA_LIBRARIES)
|
||||
|
||||
-find_path(SAMBA_INCLUDE_DIR NAMES libsmbclient.h )
|
||||
+find_package(PkgConfig)
|
||||
+if(PKG_CONFIG_FOUND)
|
||||
+ pkg_check_modules(PC_SAMBA smbclient)
|
||||
+endif()
|
||||
|
||||
-find_library(SAMBA_LIBRARIES NAMES smbclient )
|
||||
+find_path(SAMBA_INCLUDE_DIR NAMES libsmbclient.h HINTS ${PC_SAMBA_INCLUDEDIR})
|
||||
|
||||
+find_library(SAMBA_LIBRARIES NAMES smbclient HINTS ${PC_SAMBA_LIBDIR})
|
||||
|
||||
if(SAMBA_INCLUDE_DIR AND SAMBA_LIBRARIES)
|
||||
set(SAMBA_FOUND TRUE)
|
||||
@@ -41,7 +45,6 @@ if(SAMBA_INCLUDE_DIR AND SAMBA_LIBRARIES)
|
||||
if (SAMBA_REQUIRE_SMBC_OPTION_SET AND NOT SAMBA_HAVE_SMBC_OPTION_SET)
|
||||
set(SAMBA_FOUND FALSE)
|
||||
endif (SAMBA_REQUIRE_SMBC_OPTION_SET AND NOT SAMBA_HAVE_SMBC_OPTION_SET)
|
||||
-
|
||||
else(SAMBA_INCLUDE_DIR AND SAMBA_LIBRARIES)
|
||||
set(SAMBA_FOUND FALSE)
|
||||
set(SAMBA_HAVE_SMBC_SET_CONTEXT FALSE)
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
|
|
@ -0,0 +1,38 @@
|
|||
From 8791daf6c46e57c3760a564a7dfbe85513aba522 Mon Sep 17 00:00:00 2001
|
||||
From: "Lamarque V. Souza" <lamarque@kde.org>
|
||||
Date: Sun, 22 Sep 2013 09:32:24 -0300
|
||||
Subject: [PATCH 17/17] Do not leak sockets in NetworkInterface::isWireless().
|
||||
|
||||
BUG: 324954
|
||||
REVIEW: 112869
|
||||
FIXED-IN: 4.11.2
|
||||
---
|
||||
solid/solid/backends/udev/udevnetworkinterface.cpp | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/solid/solid/backends/udev/udevnetworkinterface.cpp b/solid/solid/backends/udev/udevnetworkinterface.cpp
|
||||
index 06dc907..cf9c737 100644
|
||||
--- a/solid/solid/backends/udev/udevnetworkinterface.cpp
|
||||
+++ b/solid/solid/backends/udev/udevnetworkinterface.cpp
|
||||
@@ -25,6 +25,7 @@
|
||||
#include <sys/socket.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <sys/stat.h>
|
||||
+#include <unistd.h>
|
||||
#include <linux/if_arp.h>
|
||||
#include <linux/wireless.h>
|
||||
|
||||
@@ -67,8 +68,10 @@ bool NetworkInterface::isWireless() const
|
||||
QFileInfo phyDir(m_device->deviceName() + "/phy80211");
|
||||
|
||||
if ((ioctl (ioctl_fd, SIOCGIWNAME, &iwr) == 0) || phyDir.isDir()) {
|
||||
+ close(ioctl_fd);
|
||||
return true;
|
||||
}
|
||||
+ close(ioctl_fd);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
|
|
@ -1,40 +0,0 @@
|
|||
From aaeae76bc3e5fa02601608bae85cdd1478843678 Mon Sep 17 00:00:00 2001
|
||||
From: Rex Dieter <rdieter@math.unl.edu>
|
||||
Date: Sat, 6 Apr 2013 05:10:39 -0500
|
||||
Subject: [PATCH] FindSamba.cmake: help find samba4 more reliably
|
||||
|
||||
add PATH_SUFFIXES samba-4.0 and pkgconfig hints
|
||||
---
|
||||
cmake/modules/FindSamba.cmake | 14 ++++++++++++--
|
||||
1 file changed, 12 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/cmake/modules/FindSamba.cmake b/cmake/modules/FindSamba.cmake
|
||||
index 16522c6..ec1179d 100644
|
||||
--- a/cmake/modules/FindSamba.cmake
|
||||
+++ b/cmake/modules/FindSamba.cmake
|
||||
@@ -17,10 +17,20 @@ if(SAMBA_INCLUDE_DIR AND SAMBA_LIBRARIES)
|
||||
set(Samba_FIND_QUIETLY TRUE)
|
||||
endif(SAMBA_INCLUDE_DIR AND SAMBA_LIBRARIES)
|
||||
|
||||
-find_path(SAMBA_INCLUDE_DIR NAMES libsmbclient.h )
|
||||
+# use pkg-config to get the directories and then use these values
|
||||
+# in the FIND_PATH() and FIND_LIBRARY() calls
|
||||
+find_package(PkgConfig)
|
||||
+pkg_check_modules(PC_LIBSMBCLIENT QUIET smbclient)
|
||||
|
||||
-find_library(SAMBA_LIBRARIES NAMES smbclient )
|
||||
+find_path(SAMBA_INCLUDE_DIR NAMES libsmbclient.h PATH_SUFFIXES samba-4.0
|
||||
+ HINTS
|
||||
+ ${PC_LIBSMBCLIENT_INCLUDEDIR}
|
||||
+ ${PC_LIBSMBCLIENT_INCLUDE_DIRS})
|
||||
|
||||
+find_library(SAMBA_LIBRARIES NAMES smbclient
|
||||
+ HINTS
|
||||
+ ${PC_LIBSMBCLIENT_LIBDIR}
|
||||
+ ${PC_LIBSMBCLIENT_LIB_DIRS})
|
||||
|
||||
if(SAMBA_INCLUDE_DIR AND SAMBA_LIBRARIES)
|
||||
set(SAMBA_FOUND TRUE)
|
||||
--
|
||||
1.8.1.4
|
||||
|
||||
22
kdelibs.spec
22
kdelibs.spec
|
|
@ -38,7 +38,7 @@ Source10: SOLID_HAL_LEGACY.sh
|
|||
|
||||
Summary: KDE Libraries
|
||||
Version: 4.11.1
|
||||
Release: 3%{?dist}
|
||||
Release: 4%{?dist}
|
||||
|
||||
Name: kdelibs
|
||||
Epoch: 6
|
||||
|
|
@ -145,10 +145,6 @@ Patch53: kdelibs-4.7.2-kjs-s390.patch
|
|||
# return valid locale (RFC 1766)
|
||||
Patch54: kdelibs-4.8.4-kjs-locale.patch
|
||||
|
||||
# patch FindSamba.cmake to find samba4 libs (using pkg-config hints)
|
||||
# https://git.reviewboard.kde.org/r/106861/
|
||||
Patch55: FindSamba.cmake-help-find-samba4-more-reliably.patch
|
||||
|
||||
# make filter working, TODO: upstream? -- rex
|
||||
Patch59: kdelibs-4.9.3-kcm_ssl.patch
|
||||
|
||||
|
|
@ -169,7 +165,10 @@ Patch092: return-application-icons-properly.patch
|
|||
Patch093: turn-the-packagekit-support-feature-off-by-default.patch
|
||||
|
||||
# https://bugs.kde.org/254198
|
||||
Patch100: Fix-the-synchronous-mode-wallet-open-logic.patch
|
||||
Patch107: 0007-Fix-the-synchronous-mode-wallet-open-logic.patch
|
||||
Patch110: 0010-Set-modified-meta-data-for-all-copy-jobs-not-just-mo.patch
|
||||
Patch114: 0014-Use-pkgconfig-as-hints-to-find-both-samba-3-4.patch
|
||||
Patch117: 0017-Do-not-leak-sockets-in-NetworkInterface-isWireless.patch
|
||||
|
||||
## security fix
|
||||
|
||||
|
|
@ -354,7 +353,6 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
|
|||
%patch52 -p1 -b .SOLID_UPNP
|
||||
%patch53 -p1 -b .kjs-s390
|
||||
%patch54 -p1 -b .kjs-locale
|
||||
%patch55 -p1 -b .FindSamba-samba4
|
||||
%patch59 -p1 -b .filter
|
||||
%patch61 -p1 -b .dot
|
||||
|
||||
|
|
@ -364,7 +362,10 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
|
|||
%patch092 -p1 -R -b .return-application-icons-properly
|
||||
%patch093 -p1 -R -b .turn-the-packagekit-support-feature-off-by-default
|
||||
|
||||
%patch100 -p1 -b .Fix-the-synchronous-mode-wallet-open-logic
|
||||
%patch107 -p1 -b .0007
|
||||
%patch110 -p1 -b .0010
|
||||
%patch114 -p1 -b .0014
|
||||
%patch117 -p1 -b .0017
|
||||
|
||||
# security fixes
|
||||
|
||||
|
|
@ -614,6 +615,11 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
|
|||
|
||||
|
||||
%changelog
|
||||
* Mon Sep 23 2013 Rex Dieter <rdieter@fedoraproject.org> - 6:4.11.1-4
|
||||
- kded4 leak sockets when wifi connections fail (kde#324954)
|
||||
- use upstreamed Samba patch
|
||||
- Wrong timestamp on files copied (kde#55804)
|
||||
|
||||
* Sun Sep 08 2013 Rex Dieter <rdieter@fedoraproject.org> 6:4.11.1-3
|
||||
- rebuild (ilmbase/openexr)
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue