public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: net-misc/smb4k/, net-misc/smb4k/files/
@ 2017-02-07  1:36 Andreas Sturmlechner
  0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2017-02-07  1:36 UTC (permalink / raw
  To: gentoo-commits

commit:     60b8bc31c84b57ea77f8e6a1b330f44fcb75ab3d
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Feb  6 23:30:08 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Feb  7 01:30:29 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60b8bc31

net-misc/smb4k: 1.9.90 version bump

Package-Manager: portage-2.3.3

 net-misc/smb4k/Manifest                      |  1 +
 net-misc/smb4k/files/smb4k-1.9.90-deps.patch | 82 ++++++++++++++++++++++++++++
 net-misc/smb4k/files/smb4k-1.9.90-po1.patch  | 24 ++++++++
 net-misc/smb4k/files/smb4k-1.9.90-po2.patch  | 10 ++++
 net-misc/smb4k/smb4k-1.9.90.ebuild           | 52 ++++++++++++++++++
 5 files changed, 169 insertions(+)

diff --git a/net-misc/smb4k/Manifest b/net-misc/smb4k/Manifest
index 691086f..edc01d5 100644
--- a/net-misc/smb4k/Manifest
+++ b/net-misc/smb4k/Manifest
@@ -1,2 +1,3 @@
 DIST smb4k-1.2.1.tar.xz 3817104 SHA256 6562ab12c783d47e246d9d0a43b2342288384a7a78e0207a14e1dd6c40ffe97b SHA512 df5782de9b140dc6ec97f4b66e758dc62923a6d6e85843717a0a17b3f853d036bcd3e73cf289819c5b5caa6bc28e3943dea73a745197356a3351d5a643c21f37 WHIRLPOOL 6e89a20d4a7ce48278db2a27c7ce291c737f6a6485a02febedb4fc45dedadff2185867e87ad14d97cb1e56a593c80d7b09b2a1ee65c5a4dae0784700772f100b
 DIST smb4k-1.2.2.tar.xz 3938932 SHA256 338b43e9be4e0d8263329f145331656ff7d134e0038c3e830fb8a7b57f3cb5f6 SHA512 78cb5a3226d15d4b3f0eaa02cfe2969f18497f0ad3b6447338988f38540b3835fcea7acf05a50fd5d2b2c6a0873e341d099242e00c5660cbfd2e9795fcf3790e WHIRLPOOL b36ab80b8785c42dbff4593cbbad33d7be08a86c03be1d4349bf37da3b5cf15a3b9b041d7ea62eaf31ae5a03b054d72e745c448e35d1ae59ee53abad38807332
+DIST smb4k-1.9.90.tar.xz 3594360 SHA256 0ade199d85ce281bb98b7618ac8d7b66c7958c16619448c2f5277a8a315cb734 SHA512 1b412534299fec80f38936538accb045fa4754a9ad0a73e045b7f12abc6996332f9ef9be1572db791ebff67c4d5ee3b70aad83932665fd7def2cff57ea4f5260 WHIRLPOOL f7a8929fc3d7c840f1adf717f94a7a6f2df7b4a938605395e85f28419d210f5d1e9200cbc9d4b061fde630fc20f0fdc9c0cce39293f7919f8f55c31e74ea9d82

diff --git a/net-misc/smb4k/files/smb4k-1.9.90-deps.patch b/net-misc/smb4k/files/smb4k-1.9.90-deps.patch
new file mode 100644
index 00000000..055816f
--- /dev/null
+++ b/net-misc/smb4k/files/smb4k-1.9.90-deps.patch
@@ -0,0 +1,82 @@
+commit 8ea13011bbb0fcf232c1cdd5f7763ab2ac1e7455
+Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date:   Tue Feb 7 01:13:39 2017 +0100
+
+    Consolidate {KF5,QT5}_MIN_VERSION, mark KF5Plasma as RUNTIME dep
+    
+    In addition, sort and cleanup deps
+    
+    REVIEW: 129930
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b053562..39c45e6 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -19,36 +19,40 @@ include(KDECMakeSettings)
+ include(FeatureSummary)
+ include(ECMInstallIcons)
+ 
++set(QT_MIN_VERSION "5.4.0")
++set(KF5_MIN_VERSION "5.9.0")
++
+ # Qt5 modules
+-find_package(Qt5Core 5.4.0 REQUIRED)
+-find_package(Qt5Gui 5.4.0 REQUIRED)
+-find_package(Qt5Widgets 5.4.0 REQUIRED)
+-find_package(Qt5Qml 5.4.0 REQUIRED)
+-find_package(Qt5Test 5.4.0 REQUIRED)
+-find_package(Qt5Network 5.4.0 REQUIRED)
+-find_package(Qt5PrintSupport 5.4.0 REQUIRED)
++find_package(Qt5Core ${QT_MIN_VERSION} REQUIRED)
++find_package(Qt5Gui ${QT_MIN_VERSION} REQUIRED)
++find_package(Qt5Network ${QT_MIN_VERSION} REQUIRED)
++find_package(Qt5PrintSupport ${QT_MIN_VERSION} REQUIRED)
++find_package(Qt5Qml ${QT_MIN_VERSION} REQUIRED)
++find_package(Qt5Test ${QT_MIN_VERSION} REQUIRED)
++find_package(Qt5Widgets ${QT_MIN_VERSION} REQUIRED)
+ 
+ # KF5 modules
+-find_package(KF5Config 5.9.0 REQUIRED)
+-find_package(KF5Auth 5.9.0 REQUIRED)
+-find_package(KF5DocTools 5.9.0 REQUIRED)
+-find_package(KF5IconThemes 5.9.0 REQUIRED)
+-find_package(KF5WidgetsAddons 5.9.0 REQUIRED)
+-find_package(KF5I18n 5.9.0 REQUIRED)
+-find_package(KF5Completion 5.9.0 REQUIRED)
+-find_package(KF5CoreAddons 5.9.0 REQUIRED)
+-find_package(KF5Solid 5.9.0 REQUIRED)
+-find_package(KF5KIO 5.9.0 REQUIRED)
+-find_package(KF5Notifications 5.9.0 REQUIRED)
+-find_package(KF5XmlGui 5.9.0 REQUIRED)
+-find_package(KF5JobWidgets 5.9.0 REQUIRED)
+-find_package(KF5Wallet 5.9.0 REQUIRED)
+-find_package(KF5DBusAddons 5.9.0 REQUIRED)
+-find_package(KF5Parts 5.9.0 REQUIRED)
+-find_package(KF5ConfigWidgets 5.9.0 REQUIRED)
+-find_package(KF5Notifications 5.9.0 REQUIRED)
+-find_package(KF5WindowSystem 5.9.0 REQUIRED)
+-find_package(KF5Plasma 5.9.0 REQUIRED)
++find_package(KF5Auth ${KF5_MIN_VERSION} REQUIRED)
++find_package(KF5Completion ${KF5_MIN_VERSION} REQUIRED)
++find_package(KF5Config ${KF5_MIN_VERSION} REQUIRED)
++find_package(KF5ConfigWidgets ${KF5_MIN_VERSION} REQUIRED)
++find_package(KF5CoreAddons ${KF5_MIN_VERSION} REQUIRED)
++find_package(KF5DBusAddons ${KF5_MIN_VERSION} REQUIRED)
++find_package(KF5DocTools ${KF5_MIN_VERSION} REQUIRED)
++find_package(KF5I18n ${KF5_MIN_VERSION} REQUIRED)
++find_package(KF5IconThemes ${KF5_MIN_VERSION} REQUIRED)
++find_package(KF5JobWidgets ${KF5_MIN_VERSION} REQUIRED)
++find_package(KF5KIO ${KF5_MIN_VERSION} REQUIRED)
++find_package(KF5Notifications ${KF5_MIN_VERSION} REQUIRED)
++find_package(KF5Parts ${KF5_MIN_VERSION} REQUIRED)
++find_package(KF5Solid ${KF5_MIN_VERSION} REQUIRED)
++find_package(KF5Wallet ${KF5_MIN_VERSION} REQUIRED)
++find_package(KF5WidgetsAddons ${KF5_MIN_VERSION} REQUIRED)
++find_package(KF5WindowSystem ${KF5_MIN_VERSION} REQUIRED)
++find_package(KF5XmlGui ${KF5_MIN_VERSION} REQUIRED)
++
++find_package(KF5Plasma ${KF5_MIN_VERSION})
++set_package_properties(KF5Plasma PROPERTIES TYPE RUNTIME)
+ 
+ # Make sure that Smb4K builds when several custom targets
+ # with the same name exist (happens in the po directory).

diff --git a/net-misc/smb4k/files/smb4k-1.9.90-po1.patch b/net-misc/smb4k/files/smb4k-1.9.90-po1.patch
new file mode 100644
index 00000000..dd179d6
--- /dev/null
+++ b/net-misc/smb4k/files/smb4k-1.9.90-po1.patch
@@ -0,0 +1,24 @@
+commit 5da742c6fcaf9f15d4dc5dfba62ec42b59cbfcce
+Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date:   Tue Feb 7 01:49:45 2017 +0100
+
+    Add ki18n_install and kdoctools_install calls for release tarball
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b053562..d9df8ec 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -70,6 +70,13 @@ add_subdirectory(smb4k)
+ add_subdirectory(data)
+ add_subdirectory(doc)
+ 
++if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/po")
++  ki18n_install(po)
++  if(KF5DocTools_FOUND)
++    kdoctools_install(po)
++  endif(KF5DocTools_FOUND)
++endif(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/po")
++
+ ########### Plasmoid ####################
+ 
+ # option(INSTALL_PLASMOID "Install plasmoid" ON)

diff --git a/net-misc/smb4k/files/smb4k-1.9.90-po2.patch b/net-misc/smb4k/files/smb4k-1.9.90-po2.patch
new file mode 100644
index 00000000..11549ed
--- /dev/null
+++ b/net-misc/smb4k/files/smb4k-1.9.90-po2.patch
@@ -0,0 +1,10 @@
+--- a/CMakeLists.txt	2017-02-05 20:23:51.000000000 +0100
++++ b/CMakeLists.txt	2017-02-07 01:55:44.766375980 +0100
+@@ -94,7 +94,3 @@
+ ########### install files ###############
+ 
+ feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
+-find_package(KF5I18n CONFIG REQUIRED)
+-ki18n_install(po)
+-find_package(KF5DocTools CONFIG REQUIRED)
+-kdoctools_install(po)

diff --git a/net-misc/smb4k/smb4k-1.9.90.ebuild b/net-misc/smb4k/smb4k-1.9.90.ebuild
new file mode 100644
index 00000000..7641485
--- /dev/null
+++ b/net-misc/smb4k/smb4k-1.9.90.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Advanced network neighborhood browser"
+HOMEPAGE="https://sourceforge.net/p/smb4k/home/Home/"
+[[ ${PV} != 9999 ]] && SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+
+[[ ${PV} != 9999 ]] && KEYWORDS="~amd64 ~x86"
+LICENSE="GPL-2"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kauth)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qttest)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	$(add_frameworks_dep plasma)
+	>=net-fs/samba-3.4.2[cups]
+	!net-misc/smb4k:4
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-deps.patch
+	"${FILESDIR}"/${P}-po{1,2}.patch
+)


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-misc/smb4k/, net-misc/smb4k/files/
@ 2017-08-31 22:31 Andreas Sturmlechner
  0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2017-08-31 22:31 UTC (permalink / raw
  To: gentoo-commits

commit:     abd1f610e45b582298f73a9f127ec941ee3fca7f
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 31 22:04:01 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Aug 31 22:30:58 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abd1f610

net-misc/smb4k: Drop old

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 net-misc/smb4k/Manifest                            |   1 -
 net-misc/smb4k/files/smb4k-1.9.90-po2.patch        |  10 -
 .../smb4k/files/smb4k-2.0.0-CVE-2017-8849.patch    | 361 ---------------------
 net-misc/smb4k/smb4k-2.0.0-r1.ebuild               |  50 ---
 4 files changed, 422 deletions(-)

diff --git a/net-misc/smb4k/Manifest b/net-misc/smb4k/Manifest
index aac9c949a05..658d681ba84 100644
--- a/net-misc/smb4k/Manifest
+++ b/net-misc/smb4k/Manifest
@@ -1,3 +1,2 @@
 DIST smb4k-1.2.3.tar.xz 3942852 SHA256 e751ae0f6b86c532a7e3796ae9c4590f46009075938afecb5ddd0c7421cf08ef SHA512 2066439ddda9abfb3649a1f53097637490b2187543a0cff32ad6b2ff6b250c9e3bb7b910f718a4c77761d064db8cbac7e0db2e9cf5f6ef5faf6a244fb070301b WHIRLPOOL f70b6ebb192888039844036b5798726f95c13ae5592220043c615e5378a04eb6073520ebb4b612248dd34096c17e7054db8ea11f1ed6fa6d6fad2dc6b73d410c
-DIST smb4k-2.0.0.tar.xz 3594964 SHA256 8a9f9bbfc9876816393d9f269952ddfe896c540e2de26b634b8e709a13ceca95 SHA512 2fb2123a6be888b2d75f3ebb155e021aa85fa6e9c3ec7c0092ef2c40f938e09a1b9e7c1608ecc457760ad37d9faf93c2ddba0b8e5afcf4b1ed1c61b2d9c702f2 WHIRLPOOL 07c2b289f4da54d01a9b6a87dfda7992ed056d1ef29819302391632898ce16aa307cdfdb1342168f4866f44974d788680017e1f763a6fa85b43fc5af68364174
 DIST smb4k-2.0.2.tar.xz 3588608 SHA256 01cbd10fe7a293243a65333baa65871eec8de007d0110639498fc1e4c190a199 SHA512 de210b059757525c6e5b6db733c70f43f62ba14cdc447848c84325d3b838d2ac6d8aa591ef67881decb39801b9519ef05fc805e94bc02b93c629457194e1a974 WHIRLPOOL 3855c915319d017a5cb667c1f7b59357a2aa86586635a1ca4e80820dd695922fe54889dbd12f6b27d39cbbb767b313b680ac76069e3562791cd962e2ec3c880a

diff --git a/net-misc/smb4k/files/smb4k-1.9.90-po2.patch b/net-misc/smb4k/files/smb4k-1.9.90-po2.patch
deleted file mode 100644
index 11549ed4b9f..00000000000
--- a/net-misc/smb4k/files/smb4k-1.9.90-po2.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/CMakeLists.txt	2017-02-05 20:23:51.000000000 +0100
-+++ b/CMakeLists.txt	2017-02-07 01:55:44.766375980 +0100
-@@ -94,7 +94,3 @@
- ########### install files ###############
- 
- feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
--find_package(KF5I18n CONFIG REQUIRED)
--ki18n_install(po)
--find_package(KF5DocTools CONFIG REQUIRED)
--kdoctools_install(po)

diff --git a/net-misc/smb4k/files/smb4k-2.0.0-CVE-2017-8849.patch b/net-misc/smb4k/files/smb4k-2.0.0-CVE-2017-8849.patch
deleted file mode 100644
index caef19445c5..00000000000
--- a/net-misc/smb4k/files/smb4k-2.0.0-CVE-2017-8849.patch
+++ /dev/null
@@ -1,361 +0,0 @@
-From a90289b0962663bc1d247bbbd31b9e65b2ca000e Mon Sep 17 00:00:00 2001
-From: Albert Astals Cid <aacid@kde.org>
-Date: Wed, 10 May 2017 10:21:02 +0200
-Subject: Find the mount/umount commands in the helper
-
-Instead of trusting what we get passed in
-
-CVE-2017-8849
----
- core/smb4kglobal.cpp         | 32 +++++++++++++++++++
- core/smb4kglobal.h           | 14 +++++++++
- core/smb4kmounter.cpp        | 42 +++----------------------
- helpers/CMakeLists.txt       |  7 +++++
- helpers/smb4kmounthelper.cpp | 75 ++++++++++++++++++++++++++++++++++++++++----
- helpers/smb4kmounthelper.h   |  2 +-
- 6 files changed, 127 insertions(+), 45 deletions(-)
-
-diff --git a/core/smb4kglobal.cpp b/core/smb4kglobal.cpp
-index 765203d..cfa7ba5 100644
---- a/core/smb4kglobal.cpp
-+++ b/core/smb4kglobal.cpp
-@@ -864,3 +864,35 @@ QStringList Smb4KGlobal::whitelistedMountArguments()
- #endif
- 
- 
-+const QString Smb4KGlobal::findMountExecutable()
-+{
-+  QStringList paths;
-+  paths << "/bin";
-+  paths << "/sbin";
-+  paths << "/usr/bin";
-+  paths << "/usr/sbin";
-+  paths << "/usr/local/bin";
-+  paths << "/usr/local/sbin";
-+
-+#if defined(Q_OS_LINUX)
-+  return QStandardPaths::findExecutable("mount.cifs", paths);
-+#elif defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD)
-+  return QStandardPaths::findExecutable("mount_smbfs", paths);
-+#else
-+  return QString();
-+#endif
-+}
-+
-+
-+const QString Smb4KGlobal::findUmountExecutable()
-+{
-+  QStringList paths;
-+  paths << "/bin";
-+  paths << "/sbin";
-+  paths << "/usr/bin";
-+  paths << "/usr/sbin";
-+  paths << "/usr/local/bin";
-+  paths << "/usr/local/sbin";
-+
-+  return QStandardPaths::findExecutable("umount", paths);
-+}
-diff --git a/core/smb4kglobal.h b/core/smb4kglobal.h
-index 63b6294..f29e342 100644
---- a/core/smb4kglobal.h
-+++ b/core/smb4kglobal.h
-@@ -454,6 +454,20 @@ namespace Smb4KGlobal
-    */
-   Q_DECL_EXPORT QStringList whitelistedMountArguments();
- #endif
-+  
-+  /**
-+   * Find the mount executable on the system.
-+   * 
-+   * @returns the path of the mount executable.
-+   */
-+  Q_DECL_EXPORT const QString findMountExecutable();
-+  
-+  /**
-+   * Find the umount executable on the system.
-+   * 
-+   * @returns the path of the umount executable.
-+   */
-+  Q_DECL_EXPORT const QString findUmountExecutable();
- };
- 
- #endif
-diff --git a/core/smb4kmounter.cpp b/core/smb4kmounter.cpp
-index 91f3863..0bc71aa 100644
---- a/core/smb4kmounter.cpp
-+++ b/core/smb4kmounter.cpp
-@@ -1104,16 +1104,7 @@ void Smb4KMounter::timerEvent(QTimerEvent *)
- bool Smb4KMounter::fillMountActionArgs(Smb4KShare *share, QVariantMap& map)
- {
-   // Find the mount program.
--  QString mount;
--  QStringList paths;
--  paths << "/bin";
--  paths << "/sbin";
--  paths << "/usr/bin";
--  paths << "/usr/sbin";
--  paths << "/usr/local/bin";
--  paths << "/usr/local/sbin";
--
--  mount = QStandardPaths::findExecutable("mount.cifs", paths);
-+  const QString mount = findMountExecutable();
- 
-   if (!mount.isEmpty())
-   {
-@@ -1645,16 +1636,7 @@ bool Smb4KMounter::fillMountActionArgs(Smb4KShare *share, QVariantMap& map)
- bool Smb4KMounter::fillMountActionArgs(Smb4KShare *share, QVariantMap& map)
- {
-   // Find the mount program.
--  QString mount;
--  QStringList paths;
--  paths << "/bin";
--  paths << "/sbin";
--  paths << "/usr/bin";
--  paths << "/usr/sbin";
--  paths << "/usr/local/bin";
--  paths << "/usr/local/sbin";
--
--  mount = QStandardPaths::findExecutable("mount_smbfs", paths);
-+  const QString mount = findMountExecutable();
- 
-   if (!mount.isEmpty())
-   {
-@@ -1823,15 +1805,7 @@ bool Smb4KMounter::fillUnmountActionArgs(Smb4KShare *share, bool force, bool sil
-   //
-   // The umount program
-   //
--  QStringList paths;
--  paths << "/bin";
--  paths << "/sbin";
--  paths << "/usr/bin";
--  paths << "/usr/sbin";
--  paths << "/usr/local/bin";
--  paths << "/usr/local/sbin";
--
--  QString umount = QStandardPaths::findExecutable("umount", paths);
-+  const QString umount = findUmountExecutable();
- 
-   if (umount.isEmpty() && !silent)
-   {
-@@ -1884,15 +1858,7 @@ bool Smb4KMounter::fillUnmountActionArgs(Smb4KShare *share, bool force, bool sil
-   //
-   // The umount program
-   //
--  QStringList paths;
--  paths << "/bin";
--  paths << "/sbin";
--  paths << "/usr/bin";
--  paths << "/usr/sbin";
--  paths << "/usr/local/bin";
--  paths << "/usr/local/sbin";
--
--  QString umount = QStandardPaths::findExecutable("umount", paths);
-+  const QString umount = findUmountExecutable();
- 
-   if (umount.isEmpty() && !silent)
-   {
-diff --git a/helpers/CMakeLists.txt b/helpers/CMakeLists.txt
-index 77bb3a5..015c8b6 100644
---- a/helpers/CMakeLists.txt
-+++ b/helpers/CMakeLists.txt
-@@ -1,8 +1,15 @@
-+include_directories(
-+  ${CMAKE_CURRENT_SOURCE_DIR}
-+  ${CMAKE_CURRENT_BINARY_DIR}
-+  ${CMAKE_SOURCE_DIR}/core 
-+  ${CMAKE_BINARY_DIR}/core)
-+
- set(smb4kmounthelper_SRCS smb4kmounthelper.cpp)
- 
- add_executable(mounthelper ${smb4kmounthelper_SRCS})
- 
- target_link_libraries(mounthelper
-+  smb4kcore
-   Qt5::Core
-   KF5::Auth
-   KF5::CoreAddons
-diff --git a/helpers/smb4kmounthelper.cpp b/helpers/smb4kmounthelper.cpp
-index 641530e..0a1e215 100644
---- a/helpers/smb4kmounthelper.cpp
-+++ b/helpers/smb4kmounthelper.cpp
-@@ -2,7 +2,7 @@
-     The helper that mounts and unmounts shares.
-                              -------------------
-     begin                : Sa Okt 16 2010
--    copyright            : (C) 2010-2016 by Alexander Reinholdt
-+    copyright            : (C) 2010-2017 by Alexander Reinholdt
-     email                : alexander.reinholdt@kdemail.net
-  ***************************************************************************/
- 
-@@ -29,6 +29,7 @@
- 
- // application specific includes
- #include "smb4kmounthelper.h"
-+#include "../core/smb4kglobal.h"
- 
- // Qt includes
- #include <QProcessEnvironment>
-@@ -42,14 +43,24 @@
- #include <KI18n/KLocalizedString>
- #include <KIOCore/KMountPoint>
- 
-+using namespace Smb4KGlobal;
-+
- KAUTH_HELPER_MAIN("org.kde.smb4k.mounthelper", Smb4KMountHelper);
- 
- 
- ActionReply Smb4KMountHelper::mount(const QVariantMap &args)
- {
-+  //
-+  // The action reply
-+  //
-   ActionReply reply;
-   
-   //
-+  // Get the mount executable
-+  //
-+  const QString mount = findMountExecutable();
-+  
-+  //
-   // Iterate through the entries.
-   //
-   QMapIterator<QString, QVariant> it(args);
-@@ -61,6 +72,20 @@ ActionReply Smb4KMountHelper::mount(const QVariantMap &args)
-     QVariantMap entry = it.value().toMap();
-     
-     //
-+    // Check the executable
-+    //
-+    if (mount != entry["mh_command"].toString())
-+    {
-+      // Something weird is going on, bail out.
-+      reply.setType(ActionReply::HelperErrorType);
-+      return reply;
-+    }
-+    else
-+    {
-+      // Do nothing
-+    }
-+    
-+    //
-     // The process
-     //
-     KProcess proc(this);
-@@ -87,12 +112,12 @@ ActionReply Smb4KMountHelper::mount(const QVariantMap &args)
-     //
-     QStringList command;
- #if defined(Q_OS_LINUX)
--    command << entry["mh_command"].toString();
-+    command << mount;
-     command << entry["mh_unc"].toString();
-     command << entry["mh_mountpoint"].toString();
-     command << entry["mh_options"].toStringList();
- #elif defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD)
--    command << entry["mh_command"].toString();
-+    command << mount;
-     command << entry["mh_options"].toStringList();
-     command << entry["mh_unc"].toString();
-     command << entry["mh_mountpoint"].toString();
-@@ -208,6 +233,11 @@ ActionReply Smb4KMountHelper::unmountOneByOne(const QVariantMap& args)
-   ActionReply reply;
-   
-   //
-+  // Get the mount executable
-+  //
-+  const QString umount = findUmountExecutable();
-+  
-+  //
-   // Iterate through the entries.
-   //
-   QMapIterator<QString, QVariant> it(args);
-@@ -217,6 +247,20 @@ ActionReply Smb4KMountHelper::unmountOneByOne(const QVariantMap& args)
-     it.next();
-     QString index = it.key();
-     QVariantMap entry = it.value().toMap();
-+    
-+    //
-+    // Check the executable
-+    //
-+    if (umount != entry["mh_command"].toString())
-+    {
-+      // Something weird is going on, bail out.
-+      reply.setType(ActionReply::HelperErrorType);
-+      return reply;
-+    }
-+    else
-+    {
-+      // Do nothing
-+    }
-       
-     //
-     // Check if the mountpoint is valid and the filesystem is correct.
-@@ -261,7 +305,7 @@ ActionReply Smb4KMountHelper::unmountOneByOne(const QVariantMap& args)
-     // The command
-     //
-     QStringList command;
--    command << entry["mh_command"].toString();
-+    command << umount;
-     command << entry["mh_options"].toStringList();
-     command << entry["mh_mountpoint"].toString();
-     
-@@ -342,6 +386,11 @@ ActionReply Smb4KMountHelper::unmountAtOnce(const QVariantMap& args)
-   ActionReply reply;
-   
-   //
-+  // Get the mount executable
-+  //
-+  const QString umount = findUmountExecutable();
-+  
-+  //
-   // Check the mountpoints and put the valid ones into a string list
-   //
-   QStringList validMountPoints;
-@@ -351,7 +400,7 @@ ActionReply Smb4KMountHelper::unmountAtOnce(const QVariantMap& args)
-   {
-     it.next();
-     QVariantMap entry = it.value().toMap();
--      
-+    
-     bool mountPointOk = false;
-     KMountPoint::List mountPoints = KMountPoint::currentMountPoints(KMountPoint::BasicInfoNeeded|KMountPoint::NeedMountOptions);
-       
-@@ -399,9 +448,23 @@ ActionReply Smb4KMountHelper::unmountAtOnce(const QVariantMap& args)
-     
-   if (!validMountPoints.isEmpty())
-   {
-+    //
-+    // Check the executable
-+    //
-+    if (umount != args.first().toMap().value("mh_command").toString()) 
-+    {
-+      // Something weird is going on, bail output
-+      reply.setType(ActionReply::HelperErrorType);
-+      return reply;
-+    }
-+    else
-+    {
-+      // Do nothing
-+    }
-+    
-     // The command
-     QStringList command;
--    command << args.first().toMap().value("mh_command").toString();
-+    command << umount;
-     command << args.first().toMap().value("mh_options").toStringList();
-     command << validMountPoints;
-       
-diff --git a/helpers/smb4kmounthelper.h b/helpers/smb4kmounthelper.h
-index f3bc573..4b735af 100644
---- a/helpers/smb4kmounthelper.h
-+++ b/helpers/smb4kmounthelper.h
-@@ -2,7 +2,7 @@
-     The helper that mounts and unmounts shares.
-                              -------------------
-     begin                : Sa Okt 16 2010
--    copyright            : (C) 2010-2016 by Alexander Reinholdt
-+    copyright            : (C) 2010-2017 by Alexander Reinholdt
-     email                : alexander.reinholdt@kdemail.net
-  ***************************************************************************/
- 
--- 
-cgit v0.11.2

diff --git a/net-misc/smb4k/smb4k-2.0.0-r1.ebuild b/net-misc/smb4k/smb4k-2.0.0-r1.ebuild
deleted file mode 100644
index 42121154749..00000000000
--- a/net-misc/smb4k/smb4k-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Advanced network neighborhood browser"
-HOMEPAGE="https://sourceforge.net/p/smb4k/home/Home/"
-[[ ${PV} != 9999 ]] && SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-
-[[ ${PV} != 9999 ]] && KEYWORDS="~amd64 ~x86"
-LICENSE="GPL-2"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qttest)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!net-misc/smb4k:4
-	>=net-fs/samba-3.4.2[cups]
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.9.90-po2.patch
-	"${FILESDIR}"/${P}-CVE-2017-8849.patch
-)


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-misc/smb4k/, net-misc/smb4k/files/
@ 2017-09-03  8:12 Andreas Sturmlechner
  0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2017-09-03  8:12 UTC (permalink / raw
  To: gentoo-commits

commit:     e65961b54b0a29c4138b82104cda1e958ba91c84
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  3 08:11:58 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Sep  3 08:12:30 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e65961b5

net-misc/smb4k: Drop slot 4

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 net-misc/smb4k/Manifest                            |   1 -
 .../smb4k/files/smb4k-1.2.3-CVE-2017-8849.patch    | 365 ---------------------
 net-misc/smb4k/smb4k-1.2.3-r1.ebuild               |  29 --
 3 files changed, 395 deletions(-)

diff --git a/net-misc/smb4k/Manifest b/net-misc/smb4k/Manifest
index 658d681ba84..a1576c5916e 100644
--- a/net-misc/smb4k/Manifest
+++ b/net-misc/smb4k/Manifest
@@ -1,2 +1 @@
-DIST smb4k-1.2.3.tar.xz 3942852 SHA256 e751ae0f6b86c532a7e3796ae9c4590f46009075938afecb5ddd0c7421cf08ef SHA512 2066439ddda9abfb3649a1f53097637490b2187543a0cff32ad6b2ff6b250c9e3bb7b910f718a4c77761d064db8cbac7e0db2e9cf5f6ef5faf6a244fb070301b WHIRLPOOL f70b6ebb192888039844036b5798726f95c13ae5592220043c615e5378a04eb6073520ebb4b612248dd34096c17e7054db8ea11f1ed6fa6d6fad2dc6b73d410c
 DIST smb4k-2.0.2.tar.xz 3588608 SHA256 01cbd10fe7a293243a65333baa65871eec8de007d0110639498fc1e4c190a199 SHA512 de210b059757525c6e5b6db733c70f43f62ba14cdc447848c84325d3b838d2ac6d8aa591ef67881decb39801b9519ef05fc805e94bc02b93c629457194e1a974 WHIRLPOOL 3855c915319d017a5cb667c1f7b59357a2aa86586635a1ca4e80820dd695922fe54889dbd12f6b27d39cbbb767b313b680ac76069e3562791cd962e2ec3c880a

diff --git a/net-misc/smb4k/files/smb4k-1.2.3-CVE-2017-8849.patch b/net-misc/smb4k/files/smb4k-1.2.3-CVE-2017-8849.patch
deleted file mode 100644
index b4f619ffb67..00000000000
--- a/net-misc/smb4k/files/smb4k-1.2.3-CVE-2017-8849.patch
+++ /dev/null
@@ -1,365 +0,0 @@
-From 71554140bdaede27b95dbe4c9b5a028a83c83cce Mon Sep 17 00:00:00 2001
-From: Alexander Reinholdt <alexander.reinholdt@kdemail.net>
-Date: Wed, 10 May 2017 10:23:34 +0200
-Subject: Find the mount/umount commands in the helper
-
-Instead of trusting what we get passed in
-CVE-2017-8849
----
- core/smb4kglobal.cpp         | 65 +++++++++++++++++++++++++++++++++++-
- core/smb4kglobal.h           | 16 ++++++++-
- core/smb4kmounter_p.cpp      | 78 ++++----------------------------------------
- helpers/CMakeLists.txt       |  6 +++-
- helpers/smb4kmounthelper.cpp | 51 +++++++++++++++++++++++++++--
- 5 files changed, 139 insertions(+), 77 deletions(-)
-
-diff --git a/core/smb4kglobal.cpp b/core/smb4kglobal.cpp
-index 172016f..818a78a 100644
---- a/core/smb4kglobal.cpp
-+++ b/core/smb4kglobal.cpp
-@@ -2,7 +2,7 @@
-     smb4kglobal  -  This is the global namespace for Smb4K.
-                              -------------------
-     begin                : Sa Apr 2 2005
--    copyright            : (C) 2005-2014 by Alexander Reinholdt
-+    copyright            : (C) 2005-2017 by Alexander Reinholdt
-     email                : alexander.reinholdt@kdemail.net
-  ***************************************************************************/
- 
-@@ -851,3 +851,66 @@ QStringList Smb4KGlobal::whitelistedMountArguments()
- #endif
- 
- 
-+const QString Smb4KGlobal::findMountExecutable()
-+{
-+  QString mount;
-+  QStringList paths;
-+  paths << "/bin";
-+  paths << "/sbin";
-+  paths << "/usr/bin";
-+  paths << "/usr/sbin";
-+  paths << "/usr/local/bin";
-+  paths << "/usr/local/sbin";
-+
-+  for (int i = 0; i < paths.size(); ++i)
-+  {
-+#if defined(Q_OS_LINUX)
-+    mount = KGlobal::dirs()->findExe("mount.cifs", paths.at(i));
-+#elif defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD)
-+    mount = KGlobal::dirs()->findExe("mount_smbfs", paths.at(i));
-+#endif
-+
-+    if (!mount.isEmpty())
-+    {
-+      break;
-+    }
-+    else
-+    {
-+      continue;
-+    }
-+  }
-+  
-+  return mount;
-+}
-+
-+
-+const QString Smb4KGlobal::findUmountExecutable()
-+{
-+  // Find the umount program.
-+  QString umount;
-+  QStringList paths;
-+  paths << "/bin";
-+  paths << "/sbin";
-+  paths << "/usr/bin";
-+  paths << "/usr/sbin";
-+  paths << "/usr/local/bin";
-+  paths << "/usr/local/sbin";
-+
-+  for ( int i = 0; i < paths.size(); ++i )
-+  {
-+    umount = KGlobal::dirs()->findExe("umount", paths.at(i));
-+
-+    if (!umount.isEmpty())
-+    {
-+      break;
-+    }
-+    else
-+    {
-+      continue;
-+    }
-+  }
-+  
-+  return umount;
-+}
-+
-+
-diff --git a/core/smb4kglobal.h b/core/smb4kglobal.h
-index db1805b..0ef377d 100644
---- a/core/smb4kglobal.h
-+++ b/core/smb4kglobal.h
-@@ -2,7 +2,7 @@
-     smb4kglobal  -  This is the global namespace for Smb4K.
-                              -------------------
-     begin                : Sa Apr 2 2005
--    copyright            : (C) 2005-2014 by Alexander Reinholdt
-+    copyright            : (C) 2005-2017 by Alexander Reinholdt
-     email                : alexander.reinholdt@kdemail.net
-  ***************************************************************************/
- 
-@@ -455,6 +455,20 @@ namespace Smb4KGlobal
-    */
-   KDE_EXPORT QStringList whitelistedMountArguments();
- #endif
-+  
-+  /**
-+   * Find the mount executable on the system.
-+   * 
-+   * @returns the path of the mount executable.
-+   */
-+  KDE_EXPORT const QString findMountExecutable();
-+  
-+  /**
-+   * Find the umount executable on the system.
-+   * 
-+   * @returns the path of the umount executable.
-+   */
-+  KDE_EXPORT const QString findUmountExecutable();
- };
- 
- #endif
-diff --git a/core/smb4kmounter_p.cpp b/core/smb4kmounter_p.cpp
-index 63a87ed..342052a 100644
---- a/core/smb4kmounter_p.cpp
-+++ b/core/smb4kmounter_p.cpp
-@@ -207,30 +207,7 @@ bool Smb4KMountJob::createMountAction(Smb4KShare *share, Action *action)
- //
- bool Smb4KMountJob::fillArgs(Smb4KShare *share, QMap<QString, QVariant>& map)
- {
--  // Find the mount program.
--  QString mount;
--  QStringList paths;
--  paths << "/bin";
--  paths << "/sbin";
--  paths << "/usr/bin";
--  paths << "/usr/sbin";
--  paths << "/usr/local/bin";
--  paths << "/usr/local/sbin";
--
--  for (int i = 0; i < paths.size(); ++i)
--  {
--    mount = KGlobal::dirs()->findExe("mount.cifs", paths.at(i));
--
--    if (!mount.isEmpty())
--    {
--      map.insert("mh_command", mount);
--      break;
--    }
--    else
--    {
--      continue;
--    }
--  }
-+  const QString mount = findMountExecutable();
- 
-   if (mount.isEmpty())
-   {
-@@ -242,6 +219,8 @@ bool Smb4KMountJob::fillArgs(Smb4KShare *share, QMap<QString, QVariant>& map)
-     // Do nothing
-   }
-   
-+  map.insert("mh_command", mount);
-+  
-   // Mount arguments.
-   QMap<QString, QString> global_options = globalSambaOptions();
-   Smb4KCustomOptions *options  = Smb4KCustomOptionsManager::self()->findOptions(share);
-@@ -729,30 +708,7 @@ bool Smb4KMountJob::fillArgs(Smb4KShare *share, QMap<QString, QVariant>& map)
- //
- bool Smb4KMountJob::fillArgs(Smb4KShare *share, QMap<QString, QVariant>& map)
- {
--  // Find the mount program.
--  QString mount;
--  QStringList paths;
--  paths << "/bin";
--  paths << "/sbin";
--  paths << "/usr/bin";
--  paths << "/usr/sbin";
--  paths << "/usr/local/bin";
--  paths << "/usr/local/sbin";
--
--  for (int i = 0; i < paths.size(); ++i)
--  {
--    mount = KGlobal::dirs()->findExe("mount_smbfs", paths.at(i));
--
--    if (!mount.isEmpty())
--    {
--      map.insert("mh_command", mount);
--      break;
--    }
--    else
--    {
--      continue;
--    }
--  }
-+  const QString mount = findMountExecutable();
- 
-   if (mount.isEmpty())
-   {
-@@ -764,6 +720,8 @@ bool Smb4KMountJob::fillArgs(Smb4KShare *share, QMap<QString, QVariant>& map)
-     // Do nothing
-   }
-   
-+  map.insert("mh_command", mount);
-+  
-   // Mount arguments.
-   QMap<QString, QString> global_options = globalSambaOptions();
-   Smb4KCustomOptions *options  = Smb4KCustomOptionsManager::self()->findOptions(share);
-@@ -1253,29 +1211,7 @@ bool Smb4KUnmountJob::createUnmountAction(Smb4KShare *share, Action *action)
-     // Do nothing
-   }
-   
--  // Find the umount program.
--  QString umount;
--  QStringList paths;
--  paths << "/bin";
--  paths << "/sbin";
--  paths << "/usr/bin";
--  paths << "/usr/sbin";
--  paths << "/usr/local/bin";
--  paths << "/usr/local/sbin";
--
--  for ( int i = 0; i < paths.size(); ++i )
--  {
--    umount = KGlobal::dirs()->findExe("umount", paths.at(i));
--
--    if (!umount.isEmpty())
--    {
--      break;
--    }
--    else
--    {
--      continue;
--    }
--  }
-+  const QString umount = findUmountExecutable();
- 
-   if (umount.isEmpty() && !m_silent)
-   {
-diff --git a/helpers/CMakeLists.txt b/helpers/CMakeLists.txt
-index e9e670b..cd4228d 100644
---- a/helpers/CMakeLists.txt
-+++ b/helpers/CMakeLists.txt
-@@ -1,7 +1,11 @@
-+include_directories(
-+  ${CMAKE_SOURCE_DIR}/core
-+  ${CMAKE_BINARY_DIR}/core )
-+
- set( smb4kmounthelper_SRCS smb4kmounthelper.cpp )
- 
- kde4_add_executable( mounthelper ${smb4kmounthelper_SRCS} )
--target_link_libraries( mounthelper ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS} )
-+target_link_libraries( mounthelper smb4kcore ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS} )
- install( TARGETS mounthelper DESTINATION ${LIBEXEC_INSTALL_DIR} )
- 
- kde4_install_auth_helper_files( mounthelper net.sourceforge.smb4k.mounthelper root )
-diff --git a/helpers/smb4kmounthelper.cpp b/helpers/smb4kmounthelper.cpp
-index a2f2fed..7959020 100644
---- a/helpers/smb4kmounthelper.cpp
-+++ b/helpers/smb4kmounthelper.cpp
-@@ -29,6 +29,7 @@
- 
- // application specific includes
- #include "smb4kmounthelper.h"
-+#include "core/smb4kglobal.h"
- 
- // Qt includes
- #include <QProcessEnvironment>
-@@ -43,12 +44,35 @@
- #include <kmountpoint.h>
- #include <kurl.h>
- 
-+using namespace Smb4KGlobal;
-+
- KDE4_AUTH_HELPER_MAIN( "net.sourceforge.smb4k.mounthelper", Smb4KMountHelper )
- 
- 
- ActionReply Smb4KMountHelper::mount(const QVariantMap &args)
- {
-   ActionReply reply;
-+  
-+  //
-+  // Get the mount executable
-+  //
-+  const QString mount = findMountExecutable();
-+  
-+  //
-+  // Check the executable
-+  //
-+  if (mount != args["mh_command"].toString())
-+  {
-+    // Something weird is going on, bail out.
-+    reply.setErrorCode(ActionReply::HelperError);
-+    reply.setErrorDescription(i18n("Wrong executable passed. Bailing out."));
-+    return reply;
-+  }
-+  else
-+  {
-+    // Do nothing
-+  }
-+  
-   // The mountpoint is a unique and can be used to
-   // find the share.
-   reply.addData("mh_mountpoint", args["mh_mountpoint"]);
-@@ -75,12 +99,12 @@ ActionReply Smb4KMountHelper::mount(const QVariantMap &args)
-   // Set the mount command here.
-   QStringList command;
- #if defined(Q_OS_LINUX)
--  command << args["mh_command"].toString();
-+  command << mount;
-   command << args["mh_unc"].toString();
-   command << args["mh_mountpoint"].toString();
-   command << args["mh_options"].toStringList();
- #elif defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD)
--  command << args["mh_command"].toString();
-+  command << mount;
-   command << args["mh_options"].toStringList();
-   command << args["mh_unc"].toString();
-   command << args["mh_mountpoint"].toString();
-@@ -161,6 +185,27 @@ ActionReply Smb4KMountHelper::mount(const QVariantMap &args)
- ActionReply Smb4KMountHelper::unmount(const QVariantMap &args)
- {
-   ActionReply reply;
-+  
-+  //
-+  // Get the umount executable
-+  //
-+  const QString umount = findUmountExecutable();
-+  
-+  //
-+  // Check the executable
-+  //
-+  if (umount != args["mh_command"].toString())
-+  {
-+    // Something weird is going on, bail out.
-+    reply.setErrorCode(ActionReply::HelperError);
-+    reply.setErrorDescription(i18n("Wrong executable passed. Bailing out."));
-+    return reply;
-+  }
-+  else
-+  {
-+    // Do nothing
-+  }
-+  
-   // The mountpoint is a unique and can be used to
-   // find the share.
-   reply.addData("mh_mountpoint", args["mh_mountpoint"]);
-@@ -208,7 +253,7 @@ ActionReply Smb4KMountHelper::unmount(const QVariantMap &args)
-   
-   // Set the umount command here.
-   QStringList command;
--  command << args["mh_command"].toString();
-+  command << umount;
-   command << args["mh_options"].toStringList();
-   command << args["mh_mountpoint"].toString();
- 
--- 
-cgit v0.11.2

diff --git a/net-misc/smb4k/smb4k-1.2.3-r1.ebuild b/net-misc/smb4k/smb4k-1.2.3-r1.ebuild
deleted file mode 100644
index 296f781934b..00000000000
--- a/net-misc/smb4k/smb4k-1.2.3-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DECLARATIVE_REQUIRED="always"
-KDE_LINGUAS="bg bs ca ca@valencia cs da de en_GB eo es et fi fr ga gl hu is it
-ja ko lt mai mr nb nds nl nn pl pt pt_BR ro ru sk sv tr ug uk zh_CN zh_TW"
-KDE_HANDBOOK="optional"
-KDE_DOC_DIRS="doc doc-translations/%lingua_${PN}"
-inherit kde4-base
-
-DESCRIPTION="The advanced network neighborhood browser by KDE"
-HOMEPAGE="https://sourceforge.net/projects/smb4k/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-RDEPEND="net-fs/samba[cups]"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-"
-
-DOCS=( AUTHORS BUGS ChangeLog README )
-
-PATCHES=( "${FILESDIR}/${P}-CVE-2017-8849.patch" )


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-misc/smb4k/, net-misc/smb4k/files/
@ 2019-06-14 20:42 Andreas Sturmlechner
  0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2019-06-14 20:42 UTC (permalink / raw
  To: gentoo-commits

commit:     ad4e2a014bd8657071af9e96ac149475b3ff5963
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 14 20:15:30 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Jun 14 20:42:20 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad4e2a01

net-misc/smb4k: Fix mounting default values

Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../smb4k-3.0.0-fix-mount-readwrite-shares.patch   | 61 +++++++++++++++++++
 net-misc/smb4k/smb4k-3.0.0-r1.ebuild               | 70 ++++++++++++++++++++++
 2 files changed, 131 insertions(+)

diff --git a/net-misc/smb4k/files/smb4k-3.0.0-fix-mount-readwrite-shares.patch b/net-misc/smb4k/files/smb4k-3.0.0-fix-mount-readwrite-shares.patch
new file mode 100644
index 00000000000..84d50b75b46
--- /dev/null
+++ b/net-misc/smb4k/files/smb4k-3.0.0-fix-mount-readwrite-shares.patch
@@ -0,0 +1,61 @@
+From 886af393dab0f6efe0f8bafc03522f25c15e0ba6 Mon Sep 17 00:00:00 2001
+From: Alexander Reinholdt <alexander.reinholdt@kdemail.net>
+Date: Thu, 13 Jun 2019 20:57:38 +0200
+Subject: It was reported that Smb4K mounts shares read-only that were
+ previously accessible read-write. It turns out that the default for the "CIFS
+ Unix extensions" setting were not chosen very carefully. This commit changes
+ the default values back, so that mounting should work again as expected.
+
+(cherry picked from commit d3b89af5410ea8d4cb5f34921d48fdda486990f2)
+---
+ core/smb4kmountsettings_linux.kcfg | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/core/smb4kmountsettings_linux.kcfg b/core/smb4kmountsettings_linux.kcfg
+index 4ad329c..7e046dd 100644
+--- a/core/smb4kmountsettings_linux.kcfg
++++ b/core/smb4kmountsettings_linux.kcfg
+@@ -11,12 +11,12 @@
+     <entry name="CifsUnixExtensionsSupport" type="Bool">
+       <label>All or most of the servers support the CIFS Unix extensions</label>
+       <whatsthis>Most versions of Samba support the CIFS Unix or POSIX extensions. For these servers, some options are not needed, because the right values are negotiated during the mount process. For other servers, you might want to uncheck this option, so that predefined values can be passed to the server. Please note that if your computer is located in a Windows dominated network neighborhood with only a few Samba servers, you can safely uncheck this option and define custom options for the Samba servers.</whatsthis>
+-      <default>true</default>
++      <default>false</default>
+     </entry>
+     <entry name="UseUserId" type="Bool">
+       <label>User ID:</label>
+       <whatsthis>This is the user ID (a number) that the files and directories of the mounted share will have. If you are using the CIFS filesystem under Linux and the remote server supports the CIFS Unix Extensions, this setting will be ignored unless the assignment of the user ID is forced.</whatsthis>
+-      <default>false</default>
++      <default>true</default>
+     </entry>
+     <entry name="UserId" type="String">
+       <whatsthis>This is the user ID (a number) that the files and directories of the mounted share will have. If you are using the CIFS filesystem under Linux and the remote server supports the CIFS Unix Extensions, this setting will be ignored unless the assignment of the user ID is forced.</whatsthis>
+@@ -25,7 +25,7 @@
+     <entry name="UseGroupId" type="Bool">
+       <label>Group ID:</label>
+       <whatsthis>This is the group ID (a number) that the files and directories of the mounted share will have. If you are using the CIFS filesystem under Linux and the remote server supports the CIFS Unix Extensions, this setting will be ignored unless the assignment of the group ID is forced.</whatsthis>
+-      <default>false</default>
++      <default>true</default>
+     </entry>
+     <entry name="GroupId" type="String">
+       <whatsthis>This is the group ID (a number) that the files and directories of the mounted share will have. If you are using the CIFS filesystem under Linux and the remote server supports the CIFS Unix Extensions, this setting will be ignored unless the assignment of the group ID is forced.</whatsthis>
+@@ -34,7 +34,7 @@
+     <entry name="UseFileMode" type="Bool">
+       <label>File mode:</label>
+       <whatsthis>This is the file mode that will be used for creating files. It must be defined in octal. In case the CIFS file system is used, this setting only takes effect if the server does not support the CIFS Unix Extensions.</whatsthis>
+-      <default>false</default>
++      <default>true</default>
+     </entry>
+     <entry name="FileMode" type="String">
+       <whatsthis>This is the filemode that will be used for creating files. It must be defined in octal. In case the CIFS file system is used, this setting only takes effect if the server does not support the CIFS Unix Extensions.</whatsthis>
+@@ -43,7 +43,7 @@
+     <entry name="UseDirectoryMode" type="Bool">
+       <label>Directory mode:</label>
+       <whatsthis>This is the directory mode that will be used for creating directories. It must be defined in octal. In case the CIFS file system is used, this setting only takes effect if the server does not support the CIFS Unix Extensions.</whatsthis>
+-      <default>false</default>
++      <default>true</default>
+     </entry>
+     <entry name="DirectoryMode" type="String">
+       <whatsthis>This is the directory mode that will be used for creating directories. It must be defined in octal. In case the CIFS file system is used, this setting only takes effect if the server does not support the CIFS Unix Extensions.</whatsthis>
+-- 
+cgit v1.1

diff --git a/net-misc/smb4k/smb4k-3.0.0-r1.ebuild b/net-misc/smb4k/smb4k-3.0.0-r1.ebuild
new file mode 100644
index 00000000000..fd64fcc60aa
--- /dev/null
+++ b/net-misc/smb4k/smb4k-3.0.0-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Advanced network neighborhood browser"
+HOMEPAGE="https://sourceforge.net/p/smb4k/home/Home/"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+IUSE="plasma"
+
+DEPEND="
+	$(add_frameworks_dep kauth)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qttest)
+	$(add_qt_dep qtwidgets)
+	net-fs/samba[cups]
+"
+RDEPEND="${DEPEND}
+	plasma? (
+		$(add_frameworks_dep plasma)
+		$(add_qt_dep qtquickcontrols2)
+	)
+"
+
+PATCHES=( "${FILESDIR}/${P}-fix-mount-readwrite-shares.patch" )
+
+src_configure(){
+	local mycmakeargs=(
+		-DINSTALL_PLASMOID=$(usex plasma)
+	)
+	kde5_src_configure
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+	elog "Users of Samba 4.7 and above please note that for the time being,"
+	elog "the following setting has to be added to or changed in the [global]"
+	elog "section of the smb.conf file:"
+	elog
+	elog "[global]"
+	elog "client max protocol = NT1"
+}


^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2019-06-14 20:43 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-06-14 20:42 [gentoo-commits] repo/gentoo:master commit in: net-misc/smb4k/, net-misc/smb4k/files/ Andreas Sturmlechner
  -- strict thread matches above, loose matches on Subject: below --
2017-09-03  8:12 Andreas Sturmlechner
2017-08-31 22:31 Andreas Sturmlechner
2017-02-07  1:36 Andreas Sturmlechner

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox