[packages/kde4-kdebase-workspace] - updated to 4.11.14 - sec.patch applied upstream
witekfl
witekfl at pld-linux.org
Sat Nov 15 13:11:49 CET 2014
commit 15b6849256fc79f4ca27629d6ee10f4bb146c404
Author: Witold Filipczyk <witekfl at poczta.onet.pl>
Date: Sat Nov 15 13:11:08 2014 +0100
- updated to 4.11.14
- sec.patch applied upstream
kde4-kdebase-workspace.spec | 10 ++--
sec.patch | 109 --------------------------------------------
2 files changed, 4 insertions(+), 115 deletions(-)
---
diff --git a/kde4-kdebase-workspace.spec b/kde4-kdebase-workspace.spec
index a65b71c..008d033 100644
--- a/kde4-kdebase-workspace.spec
+++ b/kde4-kdebase-workspace.spec
@@ -7,12 +7,12 @@
Summary: KDE 4 base workspace components
Summary(pl.UTF-8): Podstawowe komponenty środowiska KDE 4
Name: kde4-kdebase-workspace
-Version: 4.11.13
-Release: 2
+Version: 4.11.14
+Release: 1
License: GPL v2+
Group: X11/Applications
-Source0: http://download.kde.org/%{_state}/4.14.2/src/%{orgname}-%{version}.tar.xz
-# Source0-md5: 64dc4f44a7df7bcde32633a4ad036edb
+Source0: http://download.kde.org/%{_state}/4.14.3/src/%{orgname}-%{version}.tar.xz
+# Source0-md5: 65fd29346b8ec2afb2af78fe9b6225db
Source1: kdebase-kdesktop.pam
Source2: kdebase-kdm.pam
Source3: kdebase-kdm-np.pam
@@ -32,7 +32,6 @@ Patch1: %{name}-kdmconfig.patch
Patch2: %{name}-kdm_revertcrashlogic.patch
Patch3: kde4-kdebase-workspace-brightness.patch
Patch4: kde4-kdebase-workspace-brightness-step.patch
-Patch5: sec.patch
URL: http://www.kde.org/
BuildRequires: ConsoleKit-devel
BuildRequires: Mesa-libGLES-devel
@@ -523,7 +522,6 @@ dialogowych mających na celu rozszerzenie przywilejów użytkownika.
# https://bugs.kde.org/show_bug.cgi?id=276482
#%patch3 -p1
%patch4 -p1
-%patch5 -p1
%build
install -d build
diff --git a/sec.patch b/sec.patch
deleted file mode 100644
index acfab2f..0000000
--- a/sec.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-diff --git a/kcontrol/dateandtime/dtime.cpp b/kcontrol/dateandtime/dtime.cpp
-index 518afe5..e0147d9 100644
---- a/kcontrol/dateandtime/dtime.cpp
-+++ b/kcontrol/dateandtime/dtime.cpp
-@@ -238,7 +238,6 @@ void Dtime::save( QVariantMap& helperargs )
- helperargs["ntp"] = true;
- helperargs["ntpServers"] = list;
- helperargs["ntpEnabled"] = setDateTimeAuto->isChecked();
-- helperargs["ntpUtility"] = ntpUtility;
-
- if(setDateTimeAuto->isChecked() && !ntpUtility.isEmpty()){
- // NTP Time setting - done in helper
-diff --git a/kcontrol/dateandtime/helper.h b/kcontrol/dateandtime/helper.h
-index 1cbf103..fea71ba 100644
---- a/kcontrol/dateandtime/helper.h
-+++ b/kcontrol/dateandtime/helper.h
-@@ -42,8 +42,7 @@ class ClockHelper : public QObject
- ActionReply save(const QVariantMap &map);
-
- private:
-- int ntp(const QStringList& ntpServers, bool ntpEnabled,
-- const QString& ntpUtility);
-+ int ntp(const QStringList& ntpServers, bool ntpEnabled);
- int date(const QString& newdate, const QString& olddate);
- int tz(const QString& selectedzone);
- int tzreset();
-diff --git a/kcontrol/dateandtime/helper.cpp b/kcontrol/dateandtime/helper.cpp
-index 9168db3..87f3b96 100644
---- a/kcontrol/dateandtime/helper.cpp
-+++ b/kcontrol/dateandtime/helper.cpp
-@@ -52,8 +52,7 @@
- // clears it. So we have to use a reasonable default.
- static const QString exePath = QLatin1String("/usr/sbin:/usr/bin:/sbin:/bin");
-
--int ClockHelper::ntp( const QStringList& ntpServers, bool ntpEnabled,
-- const QString& ntpUtility )
-+int ClockHelper::ntp( const QStringList& ntpServers, bool ntpEnabled )
- {
- int ret = 0;
-
-@@ -69,24 +68,30 @@ int ClockHelper::ntp( const QStringList& ntpServers, bool ntpEnabled,
- config.writeEntry("servers", ntpServers );
- config.writeEntry("enabled", ntpEnabled );
-
-- if ( ntpEnabled && !ntpUtility.isEmpty() ) {
-- // NTP Time setting
-- QString timeServer = ntpServers.first();
-- if( timeServer.indexOf( QRegExp(".*\\(.*\\)$") ) != -1 ) {
-- timeServer.replace( QRegExp(".*\\("), "" );
-- timeServer.replace( QRegExp("\\).*"), "" );
-- // Would this be better?: s/^.*\(([^)]*)\).*$/\1/
-- }
-+ if ( ntpEnabled ) {
-+ QString ntpUtility;
-+ foreach(const QString &possible_ntputility, QStringList() << "ntpdate" << "rdate" ) {
-+ ntpUtility = KStandardDirs::findExe(possible_ntputility);
-+ if (!ntpUtility.isEmpty()) {
-+ // NTP Time setting
-+ QString timeServer = ntpServers.first();
-+ if( timeServer.indexOf( QRegExp(".*\\(.*\\)$") ) != -1 ) {
-+ timeServer.replace( QRegExp(".*\\("), "" );
-+ timeServer.replace( QRegExp("\\).*"), "" );
-+ // Would this be better?: s/^.*\(([^)]*)\).*$/\1/
-+ }
-
-- KProcess proc;
-- proc << ntpUtility << timeServer;
-- if ( proc.execute() != 0 ) {
-- ret |= NTPError;
-+ KProcess proc;
-+ proc << ntpUtility << timeServer;
-+ if ( proc.execute() != 0 ) {
-+ ret |= NTPError;
-+ }
-+ } else if( ntpEnabled ) {
-+ ret |= NTPError;
-+ }
-+ break;
- }
-- } else if( ntpEnabled ) {
-- ret |= NTPError;
- }
--
- return ret;
- }
-
-@@ -111,6 +116,13 @@ int ClockHelper::date( const QString& newdate, const QString& olddate )
- int ClockHelper::tz( const QString& selectedzone )
- {
- int ret = 0;
-+
-+ //only allow letters, numbers hyphen underscore plus and forward slash
-+ //allowed pattern taken from time-util.c in systemd
-+ if (!QRegExp("[a-zA-Z0-9-_+/]*").exactMatch(selectedzone)) {
-+ return ret;
-+ }
-+
- #if defined(USE_SOLARIS) // MARCO
-
- KTemporaryFile tf;
-@@ -227,7 +239,7 @@ ActionReply ClockHelper::save(const QVariantMap &args)
- int ret = 0; // error code
- // The order here is important
- if( _ntp )
-- ret |= ntp( args.value("ntpServers").toStringList(), args.value("ntpEnabled").toBool(), args.value("ntpUtility").toString() );
-+ ret |= ntp( args.value("ntpServers").toStringList(), args.value("ntpEnabled").toBool());
- if( _date )
- ret |= date( args.value("newdate").toString(), args.value("olddate").toString() );
- if( _tz )
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kde4-kdebase-workspace.git/commitdiff/15b6849256fc79f4ca27629d6ee10f4bb146c404
More information about the pld-cvs-commit
mailing list