[SCM] KDE Development Platform Libraries module packaging branch, master, updated. debian/4.8.4-3-9-g68f9e65

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kde4libs.git;a=commitdiff;h=68f9e65

The following commit has been merged in the master branch:
commit 68f9e6571c3060d3fd2f7a37a32b92c4105c0484
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Fri Sep 21 15:55:39 2012 -0300

    Add fix-copying-of-files-with-extended-ACLs.patch.
    
    Taken from upstream commit 73ea8cee7661579d3c414f510f6a74fc241c3ecf.
---
 debian/changelog                                   |    2 +
 .../fix-copying-of-files-with-extended-ACLs.patch  |   98 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 3 files changed, 101 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 70337f5..7f4d97f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,8 @@ kde4libs (4:4.8.5-0r0) UNRELEASED; urgency=low
     - make_libkdeinit4_private.diff.
     - add_dlrestrictions_support.diff
   * Update symbols files with the build logs of the previous version.
+  * Add fix-copying-of-files-with-extended-ACLs.patch taken from upstream
+    commit 73ea8cee7661579d3c414f510f6a74fc241c3ecf.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 21 Sep 2012 14:02:51 -0300
 
diff --git a/debian/patches/fix-copying-of-files-with-extended-ACLs.patch b/debian/patches/fix-copying-of-files-with-extended-ACLs.patch
new file mode 100644
index 0000000..02510ac
--- /dev/null
+++ b/debian/patches/fix-copying-of-files-with-extended-ACLs.patch
@@ -0,0 +1,98 @@
+From 73ea8cee7661579d3c414f510f6a74fc241c3ecf Mon Sep 17 00:00:00 2001
+From: David Faure <faure at kde.org>
+Date: Mon, 20 Aug 2012 17:53:49 +0200
+Subject: [PATCH 234/299] Fix copying of files with extended ACLs.
+
+The switch to #cmakedefine01 in KDE Frameworks has detected a missing
+ #include <config-acl.h> in file_unix.cpp ever since it was splitted
+out. In case we still had a doubt about how much more superior the
+cmakedefine01 (#if instead of #ifdef) solution is...
+
+CCBUG: 191474
+  (not tested, but might help...)
+---
+ kioslave/file/file.cpp |   11 ++---------
+ kioslave/file/file.h   |   10 ++++++++++
+ 2 files changed, 12 insertions(+), 9 deletions(-)
+
+diff --git a/kioslave/file/file.cpp b/kioslave/file/file.cpp
+index 500f07c..f3a6448 100644
+--- a/kioslave/file/file.cpp
++++ b/kioslave/file/file.cpp
+@@ -28,7 +28,6 @@
+ #include <QDirIterator>
+ 
+ #include <config.h>
+-#include <config-acl.h>
+ #include <config-kioslave-file.h>
+ 
+ 
+@@ -40,11 +39,6 @@
+ #include <sys/time.h>
+ #endif
+ 
+-#ifdef HAVE_POSIX_ACL
+-#include <sys/acl.h>
+-#include <acl/libacl.h>
+-#endif
+-
+ #include <assert.h>
+ #include <dirent.h>
+ #include <errno.h>
+@@ -101,7 +95,6 @@ using namespace KIO;
+ 
+ static QString testLogFile( const QByteArray&_filename );
+ #ifdef HAVE_POSIX_ACL
+-static bool isExtendedACL(  acl_t p_acl );
+ static void appendACLAtoms( const QByteArray & path, UDSEntry& entry,
+                             mode_t type, bool withACL );
+ #endif
+@@ -1279,7 +1272,7 @@ static QString testLogFile( const QByteArray& _filename )
+  *************************************/
+ #ifdef HAVE_POSIX_ACL
+ 
+-static bool isExtendedACL( acl_t acl )
++bool FileProtocol::isExtendedACL( acl_t acl )
+ {
+     return ( acl_equiv_mode( acl, 0 ) != 0 );
+ }
+@@ -1298,7 +1291,7 @@ static void appendACLAtoms( const QByteArray & path, UDSEntry& entry, mode_t typ
+      * ACL separately. Since a directory can have both, we need to check again. */
+     if ( isDir ) {
+         if ( acl ) {
+-            if ( !isExtendedACL( acl ) ) {
++            if ( !FileProtocol::isExtendedACL( acl ) ) {
+                 acl_free( acl );
+                 acl = 0;
+             }
+diff --git a/kioslave/file/file.h b/kioslave/file/file.h
+index 98d64ca..79768ea 100644
+--- a/kioslave/file/file.h
++++ b/kioslave/file/file.h
+@@ -30,6 +30,12 @@
+ #include <QtCore/QObject>
+ #include <QtCore/QHash>
+ 
++#include <config-acl.h>
++
++#ifdef HAVE_POSIX_ACL
++#include <sys/acl.h>
++#include <acl/libacl.h>
++#endif
+ 
+ #include <sys/types.h>
+ #include <sys/stat.h>
+@@ -78,6 +84,10 @@ public:
+   bool pumount( const QString &point );
+   bool pmount( const QString &dev );
+ 
++#ifdef HAVE_POSIX_ACL
++  static bool isExtendedACL(acl_t acl);
++#endif
++
+ private:
+   bool createUDSEntry( const QString & filename, const QByteArray & path, KIO::UDSEntry & entry,
+                        short int details, bool withACL );
+-- 
+1.7.10.4
+
diff --git a/debian/patches/series b/debian/patches/series
index 18d67be..25886a3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -22,3 +22,4 @@ ktar_header_checksum_fix.diff
 ktar_longlink_length_in_bytes.diff
 glibc_filesystem.diff
 python3-support-bytecode.patch
+fix-copying-of-files-with-extended-ACLs.patch

-- 
KDE Development Platform Libraries module packaging