Hello community,
here is the log from the commit of package kdenetwork-filesharing for
openSUSE:Leap:15.2 checked in at 2020-02-13 14:39:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:15.2/kdenetwork-filesharing (Old)
and /work/SRC/openSUSE:Leap:15.2/.kdenetwork-filesharing.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdenetwork-filesharing"
Thu Feb 13 14:39:14 2020 rev:6 rq:771942 version:19.12.2
Changes:
--------
---
/work/SRC/openSUSE:Leap:15.2/kdenetwork-filesharing/kdenetwork-filesharing.changes
2020-01-15 15:15:18.714238339 +0100
+++
/work/SRC/openSUSE:Leap:15.2/.kdenetwork-filesharing.new.26092/kdenetwork-filesharing.changes
2020-02-13 14:39:15.689604829 +0100
@@ -1,0 +2,16 @@
+Fri Feb 7 08:37:19 UTC 2020 - Christophe Giboudeaux <[email protected]>
+
+- Replace %make_jobs with %cmake_build.
+
+-------------------------------------------------------------------
+Wed Feb 5 06:29:03 UTC 2020 - Luca Beltrame <[email protected]>
+
+- Update to 19.12.2
+ * New bugfix release
+ * For more details please see:
+ * https://www.kde.org/announcements/releases/19.12.2
+- Changes since 19.12.1:
+ * only list uids from the actual user uid range
+ * make min/maxuid detection more portable
+
+-------------------------------------------------------------------
Old:
----
kdenetwork-filesharing-19.12.1.tar.xz
kdenetwork-filesharing-19.12.1.tar.xz.sig
New:
----
kdenetwork-filesharing-19.12.2.tar.xz
kdenetwork-filesharing-19.12.2.tar.xz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdenetwork-filesharing.spec ++++++
--- /var/tmp/diff_new_pack.Krv6rz/_old 2020-02-13 14:39:16.093605050 +0100
+++ /var/tmp/diff_new_pack.Krv6rz/_new 2020-02-13 14:39:16.097605052 +0100
@@ -21,7 +21,7 @@
%{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print
$1"."$2}')}
%bcond_without lang
Name: kdenetwork-filesharing
-Version: 19.12.1
+Version: 19.12.2
Release: 0
Summary: KDE Network Libraries
License: GPL-2.0-or-later
@@ -62,7 +62,7 @@
export RPM_OPT_FLAGS="%{optflags} -mminimal-toc"
%endif
%cmake_kf5 -d build
- %make_jobs
+ %cmake_build
%install
%kf5_makeinstall -C build
++++++ kdenetwork-filesharing-19.12.1.tar.xz ->
kdenetwork-filesharing-19.12.2.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kdenetwork-filesharing-19.12.1/org.kde.kdenetwork-filesharing.metainfo.xml
new/kdenetwork-filesharing-19.12.2/org.kde.kdenetwork-filesharing.metainfo.xml
---
old/kdenetwork-filesharing-19.12.1/org.kde.kdenetwork-filesharing.metainfo.xml
2019-11-11 08:20:02.000000000 +0100
+++
new/kdenetwork-filesharing-19.12.2/org.kde.kdenetwork-filesharing.metainfo.xml
2020-02-02 08:12:07.000000000 +0100
@@ -12,6 +12,7 @@
<name xml:lang="es">Complemento para compartir archivos con Samba</name>
<name xml:lang="et">Samba failijagamise plugin</name>
<name xml:lang="eu">Fitxategiak partekatzeko Samba plugina</name>
+ <name xml:lang="fi">Samba-tiedostojakoliitännäinen</name>
<name xml:lang="fr">Module externe de partage de fichiers Samba</name>
<name xml:lang="it">Estensione di condivisione dei file con Samba</name>
<name xml:lang="ko">Samba 파일 공유 플러그인</name>
@@ -33,6 +34,7 @@
<summary xml:lang="es">Añade configuración para compartir carpetas con Samba
en Dolphin</summary>
<summary xml:lang="et">Samba jagamise seadistamise lisamine Dolphini
kataloogidele</summary>
<summary xml:lang="eu">Dolphinen Samba bidez karpetak partekatzeko
konfigurazioa gehitzen du</summary>
+ <summary xml:lang="fi">Lisää Dolphinin kansiolle
Samba-jakoasetukset</summary>
<summary xml:lang="fr">Ajoute la configuration des partages Samba pour les
dossiers dans Dolphin</summary>
<summary xml:lang="it">Aggiunge le configurazione della condivisione tramite
Samba delle cartelle in Dolphin</summary>
<summary xml:lang="ko">Dolphin에 Samba 폴더 공유 설정 추가</summary>
@@ -54,6 +56,7 @@
<p xml:lang="es">Con este complemento puede configurar las carpetas a
compartir en la red local usando Samba, que usa el protocolo SMB típico de
Windows y de otras plataformas.</p>
<p xml:lang="et">Selle plugina abil saab määrata kindlaks kataloogid, mida
soovid jagada kohtvõrgus Samba abil, mis suudab suhelda SMB protokolliga, mis
on levinud Windowsis ja teistel platvormidel.</p>
<p xml:lang="eu">Plugin honekin zure karpetak tokiko sarean Samba erabiliz
partekatzeko ezar ditzakezu. Samba, Windows eta beste plataforma batzuetan
ohikoa den SMB protokoloan mintzatzen da.</p>
+ <p xml:lang="fi">Tällä liitännäisellä voit asettaa kansiosi jaettaviksi
paikallisverkossa Samballa, joka käyttää samaa SMB-yhteyskäytäntöä kuin Windows
ja muut alustat.</p>
<p xml:lang="fr">Grâce à ce module externe, vous pouvez configurer les
dossiers que vous partagez sur votre réseau local à l'aide de Samba, qui permet
de dialoguer en utilisant le protocole SMB avec Windows et d'autres
plateformes.</p>
<p xml:lang="it">Con questa estensione puoi configurare le tue cartelle
perché siano condivise sulla rete locale tramite Samba, che parla il protocollo
SMB comune a Windows e ad altre piattaforme.</p>
<p xml:lang="ko">이 플러그인을 사용하여 Windows나 다른 플랫폼에서 자주 사용되는 SMB 프로토콜을 지원하는
Samba를 통해서 네트워크에 폴더를 공유할 수 있습니다.</p>
@@ -61,6 +64,7 @@
<p xml:lang="pl">Dzięki tej wtyczce można współdzielić katalogi w sieci
lokalnej przy użyciu Samby, która porozumiewa się przy użyciu protokołu SMB na
Windowsie i innych platformach.</p>
<p xml:lang="pt">Com este 'plugin', poderá configurar as suas pastas para
ficarem partilhadas na sua rede local com o Samba, que por sua vez fala o
protocolo SMB comum do Windows e das outras plataformas.</p>
<p xml:lang="pt-BR">Com este plugin você poderá configurar as suas pastas
para ficarem compartilhadas na sua rede local usando o Samba, que por sua vez,
utiliza o protocolo SMB comum do Windows e de outras plataformas.</p>
+ <p xml:lang="sk">Pomocou tohto doplnku môžete nastaviť zdieľanie
priečinkov vo vašej miestnej sieti pomocou Samby, ktorá používa protokol SMB,
ktorý je bežný vo Windowse a na iných platformách.</p>
<p xml:lang="sv">Med det här insticksprogrammet kan du ställa in kataloger
att delas på det lokala nätverket genom att använda Samba, vilket använder
SMB-protokollet gemensamt med Windows och andra plattformar.</p>
<p xml:lang="uk">За допомогою цього додатка ви можете налаштувати ваші
теки на спільне використання у локальній мережі за допомогою Samba, системи
обміну даними протоколом SMB, який є поширеним протоколом у Windows та на інших
платформах.</p>
<p xml:lang="x-test">xxWith this plugin you can set your folders to be
shared on your local network using Samba, which talks the SMB protocol common
on Windows and other platforms.xx</p>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kdenetwork-filesharing-19.12.1/po/ca@valencia/kfileshare.po
new/kdenetwork-filesharing-19.12.2/po/ca@valencia/kfileshare.po
--- old/kdenetwork-filesharing-19.12.1/po/ca@valencia/kfileshare.po
2020-01-07 03:23:14.000000000 +0100
+++ new/kdenetwork-filesharing-19.12.2/po/ca@valencia/kfileshare.po
2020-02-04 01:56:23.000000000 +0100
@@ -98,16 +98,3 @@
#, kde-format
msgid "Show Samba status &monitor"
msgstr "&Mostra el controlador de l'estat de Samba"
-
-#~ msgid "Samba is not installed on your system."
-#~ msgstr "El servidor Samba no està instal·lat en el sistema."
-
-#~ msgid "Share with S&amba (Microsoft Windows)"
-#~ msgstr "Comparteix amb S&amba (Microsoft Windows)"
-
-#~ msgid ""
-#~ "<qt><strong>Samba could not be installed.</strong><br />Please, check if "
-#~ "kpackagekit is properly installed</qt>"
-#~ msgstr ""
-#~ "<qt><strong>No s'ha pogut iniciar el Samba.</strong><br />Comproveu que "
-#~ "el kpackagekit estigui correctament instal·lat</qt>"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kdenetwork-filesharing-19.12.1/po/ia/kfileshare.po
new/kdenetwork-filesharing-19.12.2/po/ia/kfileshare.po
--- old/kdenetwork-filesharing-19.12.1/po/ia/kfileshare.po 2020-01-07
03:23:15.000000000 +0100
+++ new/kdenetwork-filesharing-19.12.2/po/ia/kfileshare.po 2020-02-04
01:56:55.000000000 +0100
@@ -1,15 +1,15 @@
# Copyright (C) YEAR This_file_is_part_of_KDE
# This file is distributed under the same license as the PACKAGE package.
#
-# g.sora <[email protected]>, 2011, 2017.
+# g.sora <[email protected]>, 2011, 2017, 2020.
msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: https://bugs.kde.org\n";
"POT-Creation-Date: 2019-06-04 03:12+0200\n"
-"PO-Revision-Date: 2017-04-07 23:37+0100\n"
-"Last-Translator: giovanni <[email protected]>\n"
-"Language-Team: Interlingua <[email protected]>\n"
+"PO-Revision-Date: 2020-01-18 10:05+0100\n"
+"Last-Translator: Giovanni Sora <[email protected]>\n"
+"Language-Team: Interlingua <[email protected]>\n"
"Language: ia\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -48,22 +48,20 @@
msgstr "Le pacchetto Samba falleva a installar."
#: samba/filepropertiesplugin/sambausershareplugin.cpp:94
-#, fuzzy, kde-format
-#| msgid "Only local folders can be shared."
+#, kde-format
msgid "Samba must be installed before folders can be shared."
-msgstr "Solmente dossieres local pote esser compartite."
+msgstr ""
+"Samba debe esser installate ante que le dossieres pote esser compartite."
#: samba/filepropertiesplugin/sambausershareplugin.cpp:99
-#, fuzzy, kde-format
-#| msgid "Install Samba..."
+#, kde-format
msgid "Install Samba"
-msgstr "Installa Samba..."
+msgstr "Installa Samba"
#: samba/filepropertiesplugin/sambausershareplugin.cpp:179
-#, fuzzy, kde-format
-#| msgid "Install Samba..."
+#, kde-format
msgid "Installing Samba..."
-msgstr "Installa Samba..."
+msgstr "Installante Samba..."
#: samba/filepropertiesplugin/sambausershareplugin.cpp:285
#, kde-format
@@ -76,10 +74,9 @@
#. i18n: ectx: property (text), widget (QCheckBox, sambaChk)
#: samba/filepropertiesplugin/sambausershareplugin.ui:19
-#, fuzzy, kde-format
-#| msgid "S&hare this folder in the local network"
+#, kde-format
msgid "Sh&are this folder with other computers on the local network"
-msgstr "Compa&rti iste dossier in le rete local"
+msgstr "Compa&rti iste dossier con altere computatores in le rete local"
#. i18n: ectx: property (text), widget (QLabel, textLabel1)
#: samba/filepropertiesplugin/sambausershareplugin.ui:39
@@ -97,7 +94,7 @@
#: samba/filepropertiesplugin/sambausershareplugin.ui:109
#, kde-format
msgid "Show Samba status &monitor"
-msgstr ""
+msgstr "Monstra &monitor de stato de Samba"
#~ msgid "Samba is not installed on your system."
#~ msgstr "Samba non es installate sur tu systema"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kdenetwork-filesharing-19.12.1/po/zh_CN/kfileshare.po
new/kdenetwork-filesharing-19.12.2/po/zh_CN/kfileshare.po
--- old/kdenetwork-filesharing-19.12.1/po/zh_CN/kfileshare.po 2020-01-07
03:23:18.000000000 +0100
+++ new/kdenetwork-filesharing-19.12.2/po/zh_CN/kfileshare.po 2020-02-04
01:57:46.000000000 +0100
@@ -10,7 +10,7 @@
"Project-Id-Version: kdeorg\n"
"Report-Msgid-Bugs-To: https://bugs.kde.org\n";
"POT-Creation-Date: 2019-06-04 03:12+0200\n"
-"PO-Revision-Date: 2020-01-04 21:49\n"
+"PO-Revision-Date: 2020-01-20 21:56\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Chinese Simplified\n"
"Language: zh_CN\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kdenetwork-filesharing-19.12.1/samba/filepropertiesplugin/model.cpp
new/kdenetwork-filesharing-19.12.2/samba/filepropertiesplugin/model.cpp
--- old/kdenetwork-filesharing-19.12.1/samba/filepropertiesplugin/model.cpp
2019-11-11 08:20:02.000000000 +0100
+++ new/kdenetwork-filesharing-19.12.2/samba/filepropertiesplugin/model.cpp
2020-02-02 08:12:07.000000000 +0100
@@ -20,6 +20,9 @@
#include <kuser.h>
+#include <QFile>
+#include <QRegularExpression>
+
#include <sys/stat.h>
#include "model.h"
@@ -51,31 +54,29 @@
QStringList UserPermissionModel::getUsersList() const
{
- unsigned int defminuid;
- unsigned int defmaxuid;
+ uid_t defminuid = 1000;
+ uid_t defmaxuid = 65000;
-#ifdef __linux__
- struct stat st;
- if (!stat("/etc/debian_version", &st)) { /* debian */
- defminuid = 1000;
- defmaxuid = 29999;
- } else if (!stat("/usr/portage", &st)) { /* gentoo */
- defminuid = 1000;
- defmaxuid = 65000;
- } else if (!stat("/etc/mandrake-release", &st)) { /* mandrake - check
before redhat! */
- defminuid = 500;
- defmaxuid = 65000;
- } else if (!stat("/etc/redhat-release", &st)) { /* redhat */
- defminuid = 100;
- defmaxuid = 65000;
- } else /* if (!stat("/etc/SuSE-release", &st)) */ { /* suse */
- defminuid = 500;
- defmaxuid = 65000;
+ QFile loginDefs(QStringLiteral("/etc/login.defs"));
+ if (loginDefs.open(QIODevice::ReadOnly | QIODevice::Text)) {
+ while (!loginDefs.atEnd()) {
+ const QString line = QString::fromLatin1(loginDefs.readLine());
+ {
+ const QRegularExpression
expression(QStringLiteral("^\\s*UID_MIN\\s+(?<UID_MIN>\\d+)"));
+ const auto match = expression.match(line);
+ if (match.hasMatch()) {
+ defminuid = match.captured(u"UID_MIN").toUInt();
+ }
+ }
+ {
+ const QRegularExpression
expression(QStringLiteral("^\\s*UID_MAX\\s+(?<UID_MAX>\\d+)"));
+ const auto match = expression.match(line);
+ if (match.hasMatch()) {
+ defmaxuid = match.captured(u"UID_MAX").toUInt();
+ }
+ }
+ }
}
-#else
- defminuid = 1000;
- defmaxuid = 65000;
-#endif
QStringList userList;
userList.append(QStringLiteral("Everyone"));
@@ -84,7 +85,8 @@
continue;
}
KUser user(username);
- if (user.userId().nativeId() >= defminuid) {
+ const uid_t nativeId = user.userId().nativeId();
+ if (nativeId >= defminuid && nativeId <= defmaxuid) {
userList << username;
}
}
