* [gentoo-commits] repo/gentoo:master commit in: net-misc/smb4k/files/, net-misc/smb4k/
@ 2017-03-11 22:15 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2017-03-11 22:15 UTC (permalink / raw
To: gentoo-commits
commit: 9078f92e75abf0d85fb26fc4cd4ba08c9e66df03
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 11 22:13:34 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Mar 11 22:15:31 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9078f92e
net-misc/smb4k: Drop old
Package-Manager: Portage-2.3.3, Repoman-2.3.1
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/smb4k-1.9.90.ebuild | 51 -----------------
4 files changed, 158 deletions(-)
diff --git a/net-misc/smb4k/Manifest b/net-misc/smb4k/Manifest
index 732a7852144..a28e2ce0330 100644
--- a/net-misc/smb4k/Manifest
+++ b/net-misc/smb4k/Manifest
@@ -1,5 +1,4 @@
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.2.3.tar.xz 3942852 SHA256 e751ae0f6b86c532a7e3796ae9c4590f46009075938afecb5ddd0c7421cf08ef SHA512 2066439ddda9abfb3649a1f53097637490b2187543a0cff32ad6b2ff6b250c9e3bb7b910f718a4c77761d064db8cbac7e0db2e9cf5f6ef5faf6a244fb070301b WHIRLPOOL f70b6ebb192888039844036b5798726f95c13ae5592220043c615e5378a04eb6073520ebb4b612248dd34096c17e7054db8ea11f1ed6fa6d6fad2dc6b73d410c
-DIST smb4k-1.9.90.tar.xz 3594360 SHA256 0ade199d85ce281bb98b7618ac8d7b66c7958c16619448c2f5277a8a315cb734 SHA512 1b412534299fec80f38936538accb045fa4754a9ad0a73e045b7f12abc6996332f9ef9be1572db791ebff67c4d5ee3b70aad83932665fd7def2cff57ea4f5260 WHIRLPOOL f7a8929fc3d7c840f1adf717f94a7a6f2df7b4a938605395e85f28419d210f5d1e9200cbc9d4b061fde630fc20f0fdc9c0cce39293f7919f8f55c31e74ea9d82
DIST smb4k-2.0.0.tar.xz 3594964 SHA256 8a9f9bbfc9876816393d9f269952ddfe896c540e2de26b634b8e709a13ceca95 SHA512 2fb2123a6be888b2d75f3ebb155e021aa85fa6e9c3ec7c0092ef2c40f938e09a1b9e7c1608ecc457760ad37d9faf93c2ddba0b8e5afcf4b1ed1c61b2d9c702f2 WHIRLPOOL 07c2b289f4da54d01a9b6a87dfda7992ed056d1ef29819302391632898ce16aa307cdfdb1342168f4866f44974d788680017e1f763a6fa85b43fc5af68364174
diff --git a/net-misc/smb4k/files/smb4k-1.9.90-deps.patch b/net-misc/smb4k/files/smb4k-1.9.90-deps.patch
deleted file mode 100644
index 055816f4c3f..00000000000
--- a/net-misc/smb4k/files/smb4k-1.9.90-deps.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-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
deleted file mode 100644
index dd179d6f55e..00000000000
--- a/net-misc/smb4k/files/smb4k-1.9.90-po1.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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/smb4k-1.9.90.ebuild b/net-misc/smb4k/smb4k-1.9.90.ebuild
deleted file mode 100644
index b83f209f319..00000000000
--- a/net-misc/smb4k/smb4k-1.9.90.ebuild
+++ /dev/null
@@ -1,51 +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}
- $(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/files/, net-misc/smb4k/
@ 2017-05-10 18:06 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2017-05-10 18:06 UTC (permalink / raw
To: gentoo-commits
commit: d39d7aa14725bc031c1e1b588b7dafa9198111bd
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed May 10 18:01:38 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed May 10 18:06:35 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d39d7aa1
net-misc/smb4k: Security revbump
Fixes CVE-2017-8849
Gentoo-bug: 618106
Package-Manager: Portage-2.3.5, Repoman-2.3.1
.../smb4k/files/smb4k-1.2.3-CVE-2017-8849.patch | 365 +++++++++++++++++++++
.../smb4k/files/smb4k-2.0.0-CVE-2017-8849.patch | 361 ++++++++++++++++++++
net-misc/smb4k/smb4k-1.2.3-r1.ebuild | 29 ++
net-misc/smb4k/smb4k-2.0.0-r1.ebuild | 50 +++
4 files changed, 805 insertions(+)
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
new file mode 100644
index 00000000000..b4f619ffb67
--- /dev/null
+++ b/net-misc/smb4k/files/smb4k-1.2.3-CVE-2017-8849.patch
@@ -0,0 +1,365 @@
+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/files/smb4k-2.0.0-CVE-2017-8849.patch b/net-misc/smb4k/files/smb4k-2.0.0-CVE-2017-8849.patch
new file mode 100644
index 00000000000..caef19445c5
--- /dev/null
+++ b/net-misc/smb4k/files/smb4k-2.0.0-CVE-2017-8849.patch
@@ -0,0 +1,361 @@
+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-1.2.3-r1.ebuild b/net-misc/smb4k/smb4k-1.2.3-r1.ebuild
new file mode 100644
index 00000000000..68e6be08235
--- /dev/null
+++ b/net-misc/smb4k/smb4k-1.2.3-r1.ebuild
@@ -0,0 +1,29 @@
+# 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" )
diff --git a/net-misc/smb4k/smb4k-2.0.0-r1.ebuild b/net-misc/smb4k/smb4k-2.0.0-r1.ebuild
new file mode 100644
index 00000000000..42121154749
--- /dev/null
+++ b/net-misc/smb4k/smb4k-2.0.0-r1.ebuild
@@ -0,0 +1,50 @@
+# 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/files/, net-misc/smb4k/
@ 2020-04-21 9:22 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2020-04-21 9:22 UTC (permalink / raw
To: gentoo-commits
commit: 7bb83005127b22c758cd4c834f17c1939bc104b4
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 21 08:32:12 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Apr 21 09:22:16 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bb83005
net-misc/smb4k: Fix build with Qt 5.15
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
net-misc/smb4k/files/smb4k-3.0.4-qt-5.15.patch | 25 +++++++++++++++++++++++++
net-misc/smb4k/smb4k-3.0.4.ebuild | 2 ++
2 files changed, 27 insertions(+)
diff --git a/net-misc/smb4k/files/smb4k-3.0.4-qt-5.15.patch b/net-misc/smb4k/files/smb4k-3.0.4-qt-5.15.patch
new file mode 100644
index 00000000000..8948e30dfa1
--- /dev/null
+++ b/net-misc/smb4k/files/smb4k-3.0.4-qt-5.15.patch
@@ -0,0 +1,25 @@
+From 009ebe0224f7e236837741a1b35f0c572024e8b3 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Tue, 21 Apr 2020 10:27:28 +0200
+Subject: [PATCH] Fix build with Qt-5.15 (missing header)
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ smb4k/smb4ktooltip.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/smb4k/smb4ktooltip.cpp b/smb4k/smb4ktooltip.cpp
+index de07a1d..b1064f7 100644
+--- a/smb4k/smb4ktooltip.cpp
++++ b/smb4k/smb4ktooltip.cpp
+@@ -43,6 +43,7 @@
+ #include <QToolTip>
+ #include <QApplication>
+ #include <QDesktopWidget>
++#include <QPainterPath>
+ #include <QStylePainter>
+ #include <QStyle>
+ #include <QStyleOptionFrame>
+--
+2.26.1
+
diff --git a/net-misc/smb4k/smb4k-3.0.4.ebuild b/net-misc/smb4k/smb4k-3.0.4.ebuild
index a7ff9e7f655..3786a642748 100644
--- a/net-misc/smb4k/smb4k-3.0.4.ebuild
+++ b/net-misc/smb4k/smb4k-3.0.4.ebuild
@@ -54,6 +54,8 @@ RDEPEND="${DEPEND}
)
"
+PATCHES=( "${FILESDIR}/${P}-qt-5.15.patch" )
+
src_configure() {
local mycmakeargs=(
-DINSTALL_PLASMOID=$(usex plasma)
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/smb4k/files/, net-misc/smb4k/
@ 2020-06-28 22:15 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2020-06-28 22:15 UTC (permalink / raw
To: gentoo-commits
commit: 885e62dc11ce0c4889486032df0c66059f9b08e1
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 28 22:12:25 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jun 28 22:15:41 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=885e62dc
net-misc/smb4k: Drop 3.0.4 and 3.0.5
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
net-misc/smb4k/Manifest | 2 -
net-misc/smb4k/files/smb4k-3.0.4-qt-5.15.patch | 25 ---------
net-misc/smb4k/smb4k-3.0.4.ebuild | 74 --------------------------
net-misc/smb4k/smb4k-3.0.5.ebuild | 72 -------------------------
4 files changed, 173 deletions(-)
diff --git a/net-misc/smb4k/Manifest b/net-misc/smb4k/Manifest
index d5b65f28c9b..eca14f8a11a 100644
--- a/net-misc/smb4k/Manifest
+++ b/net-misc/smb4k/Manifest
@@ -1,3 +1 @@
-DIST smb4k-3.0.4.tar.xz 3824508 BLAKE2B 98d9e66a577e40e734421cf46d72ebf010fa1d2161d411dbd5382af8fd84f2578a086f0425e576508aed0ed549940cf4b7f688c527f42218dd781006d2460204 SHA512 bd3b53f6f8e9ee3dd6fc8c0ab31b877fc89a887837b7bd91eef410b6dff81960ada872bada074638c8b7d204c638564a70568e87cc874e146508241e071665a3
-DIST smb4k-3.0.5.tar.xz 3841924 BLAKE2B 98bc44ed33b60fb983db34d39ed7bd51f9fab8c4594e81c9f3d6275c4b6f49822902d12da59cb777754febd839c37d42d6623cb42ae03385a5187e063790a872 SHA512 913e69ba30b4d7294e4436648fcebd54173cc0c32a712824218aee7c276dc0d8eea0a2e4a14648cd55c99424b80512e01c5a1929ce38a9f83d3dfb9c24601af1
DIST smb4k-3.0.6.tar.xz 3842424 BLAKE2B 7c42007a00b3da07bdc1629360bb8640c66ac7332fefca82698664cf197d4061d6c4419ab99ebd29e6515dace194973be2c179fa3c422820716fc5e5e1b8591f SHA512 993f669c12db30dd78f9f6cc694dfe563958407582f65ff64b6ada36cf4372ad6bb5addecc93970ce6750d031bf4ee9dfefa362e13100d2ce8d3e848a0d89382
diff --git a/net-misc/smb4k/files/smb4k-3.0.4-qt-5.15.patch b/net-misc/smb4k/files/smb4k-3.0.4-qt-5.15.patch
deleted file mode 100644
index 8948e30dfa1..00000000000
--- a/net-misc/smb4k/files/smb4k-3.0.4-qt-5.15.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 009ebe0224f7e236837741a1b35f0c572024e8b3 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Tue, 21 Apr 2020 10:27:28 +0200
-Subject: [PATCH] Fix build with Qt-5.15 (missing header)
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- smb4k/smb4ktooltip.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/smb4k/smb4ktooltip.cpp b/smb4k/smb4ktooltip.cpp
-index de07a1d..b1064f7 100644
---- a/smb4k/smb4ktooltip.cpp
-+++ b/smb4k/smb4ktooltip.cpp
-@@ -43,6 +43,7 @@
- #include <QToolTip>
- #include <QApplication>
- #include <QDesktopWidget>
-+#include <QPainterPath>
- #include <QStylePainter>
- #include <QStyle>
- #include <QStyleOptionFrame>
---
-2.26.1
-
diff --git a/net-misc/smb4k/smb4k-3.0.4.ebuild b/net-misc/smb4k/smb4k-3.0.4.ebuild
deleted file mode 100644
index dfe247ddeca..00000000000
--- a/net-misc/smb4k/smb4k-3.0.4.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Advanced network neighborhood browser"
-HOMEPAGE="https://kde.org/applications/utilities/org.kde.smb4k
-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"
-SLOT="5"
-IUSE="plasma"
-
-DEPEND="
- >=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtprintsupport-${QTMIN}:5
- >=dev-qt/qttest-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=kde-frameworks/kauth-${KFMIN}:5
- >=kde-frameworks/kcompletion-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kcrash-${KFMIN}:5
- >=kde-frameworks/kdbusaddons-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kiconthemes-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/kjobwidgets-${KFMIN}:5
- >=kde-frameworks/knotifications-${KFMIN}:5
- >=kde-frameworks/kwallet-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kwindowsystem-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- >=kde-frameworks/solid-${KFMIN}:5
- net-fs/samba[cups]
-"
-RDEPEND="${DEPEND}
- plasma? (
- >=dev-qt/qtquickcontrols2-${QTMIN}:5
- >=kde-frameworks/plasma-${KFMIN}:5
- )
-"
-
-PATCHES=( "${FILESDIR}/${P}-qt-5.15.patch" )
-
-src_configure() {
- local mycmakeargs=(
- -DINSTALL_PLASMOID=$(usex plasma)
- )
- ecm_src_configure
-}
-
-pkg_postinst() {
- ecm_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"
-}
diff --git a/net-misc/smb4k/smb4k-3.0.5.ebuild b/net-misc/smb4k/smb4k-3.0.5.ebuild
deleted file mode 100644
index a7ff9e7f655..00000000000
--- a/net-misc/smb4k/smb4k-3.0.5.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Advanced network neighborhood browser"
-HOMEPAGE="https://kde.org/applications/utilities/org.kde.smb4k
-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"
-SLOT="5"
-IUSE="plasma"
-
-DEPEND="
- >=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtprintsupport-${QTMIN}:5
- >=dev-qt/qttest-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=kde-frameworks/kauth-${KFMIN}:5
- >=kde-frameworks/kcompletion-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kcrash-${KFMIN}:5
- >=kde-frameworks/kdbusaddons-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kiconthemes-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/kjobwidgets-${KFMIN}:5
- >=kde-frameworks/knotifications-${KFMIN}:5
- >=kde-frameworks/kwallet-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kwindowsystem-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- >=kde-frameworks/solid-${KFMIN}:5
- net-fs/samba[cups]
-"
-RDEPEND="${DEPEND}
- plasma? (
- >=dev-qt/qtquickcontrols2-${QTMIN}:5
- >=kde-frameworks/plasma-${KFMIN}:5
- )
-"
-
-src_configure() {
- local mycmakeargs=(
- -DINSTALL_PLASMOID=$(usex plasma)
- )
- ecm_src_configure
-}
-
-pkg_postinst() {
- ecm_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:[~2020-06-28 22:15 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-04-21 9:22 [gentoo-commits] repo/gentoo:master commit in: net-misc/smb4k/files/, net-misc/smb4k/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2020-06-28 22:15 Andreas Sturmlechner
2017-05-10 18:06 Andreas Sturmlechner
2017-03-11 22:15 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox