[arch-commits] Commit in kdebase-workspace/trunk (3 files)
Date: Monday, November 24, 2014 @ 09:05:15
Author: andrea
Revision: 227043
upgpkg: kdebase-workspace 4.11.14-1
Upstream release
Modified:
kdebase-workspace/trunk/PKGBUILD
Deleted:
kdebase-workspace/trunk/CVE-2014-8651-2.patch
kdebase-workspace/trunk/CVE-2014-8651.patch
---+
CVE-2014-8651-2.patch | 30
CVE-2014-8651.patch | 120
PKGBUILD | 19 ++-
3 files changed, 6 insertions(+), 163 deletions(-)
Deleted: CVE-2014-8651-2.patch
===
--- CVE-2014-8651-2.patch 2014-11-24 08:04:14 UTC (rev 227042)
+++ CVE-2014-8651-2.patch 2014-11-24 08:05:15 UTC (rev 227043)
@@ -1,30 +0,0 @@
-From: David Edmundson
-Date: Tue, 04 Nov 2014 13:00:54 +
-Subject: Validate timezone name before setting
-X-Git-Url:
http://quickgit.kde.org/?p=kde-workspace.git&a=commitdiff&h=54d0bfb5e9c8cf60da890b7728cbe36a454e
-Validate timezone name before setting
-
-This patch ensures that the symlink /etc/localtime always points to a
-file in /usr/share/timezones and not an arbitrary file in a user's home
-directory.
-
-
a/kcontrol/dateandtime/helper.cpp
-+++ b/kcontrol/dateandtime/helper.cpp
-@@ -123,6 +123,13 @@
- 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;
-
Deleted: CVE-2014-8651.patch
===
--- CVE-2014-8651.patch 2014-11-24 08:04:14 UTC (rev 227042)
+++ CVE-2014-8651.patch 2014-11-24 08:05:15 UTC (rev 227043)
@@ -1,120 +0,0 @@
-From: David Edmundson
-Date: Tue, 04 Nov 2014 12:57:59 +
-Subject: Do not pass ntpUtility as an argument to datetime helper
-X-Git-Url:
http://quickgit.kde.org/?p=kde-workspace.git&a=commitdiff&h=eebcb17746d9fa86ea8c5a7344709ef6750781cf
-Do not pass ntpUtility as an argument to datetime helper
-
-Passing the name of a binary to run to a polkit helper is a security
-risk as it allows any arbitrary process to be executed.
-
-This patch moves the detection of ntp utility location into the helper
-function.
-
-REVIEW: 120977
-
-
a/kcontrol/dateandtime/dtime.cpp
-+++ b/kcontrol/dateandtime/dtime.cpp
-@@ -142,27 +142,15 @@
- //kclock->setEnabled(enabled);
- }
-
--void Dtime::findNTPutility(){
-- QByteArray envpath = qgetenv("PATH");
-- if (!envpath.isEmpty() && envpath[0] == ':') {
--envpath = envpath.mid(1);
-- }
--
-- QString path = "/sbin:/usr/sbin:";
-- if (!envpath.isEmpty()) {
--path += QString::fromLocal8Bit(envpath);
-- } else {
--path += QLatin1String("/bin:/usr/bin");
-- }
--
-- foreach(const QString &possible_ntputility, QStringList() << "ntpdate" <<
"rdate" ) {
--if( !((ntpUtility = KStandardDirs::findExe(possible_ntputility,
path)).isEmpty()) ) {
-- kDebug() << "ntpUtility = " << ntpUtility;
-- return;
--}
-- }
--
-- kDebug() << "ntpUtility not found!";
-+void Dtime::findNTPutility()
-+{
-+const QString exePath = QLatin1String("/usr/sbin:/usr/bin:/sbin:/bin");
-+foreach(const QString &possible_ntputility, QStringList() << "ntpdate" <<
"rdate" ) {
-+ntpUtility = KStandardDirs::findExe(possible_ntputility, exePath);
-+if (!ntpUtility.isEmpty()) {
-+return;
-+}
-+}
- }
-
- void Dtime::set_time()
-@@ -238,7 +226,6 @@
- helperargs["ntp"] = true;
- helperargs["ntpServers"] = list;
- helperargs["ntpEnabled"] = setDateTimeAuto->isChecked();
-- helperargs["ntpUtility"] = ntpUtility;
-
- if(setDateTimeAuto->isChecked() && !ntpUtility.isEmpty()){
- // NTP Time setting - done in helper
-
a/kcontrol/dateandtime/helper.cpp
-+++ b/kcontrol/dateandtime/helper.cpp
-@@ -52,8 +52,18 @@
- // 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 )
-+static QString findNtpUtility()
-+{
-+foreach(const QString &possible_ntputility, QStringList() << "ntpdate" <<
"rdate" ) {
-+const QString ntpUtility =
KStandardDirs::findExe(possible_ntputility, exePath);
-+if (!ntpUtility.isEmpty()) {
-+return ntpUtility;
-+}
-+}
-+return QString();
-+}
-+
-+int ClockHelper::ntp( const QStringList& ntpServers, bool ntpEnabled )
- {
- int ret = 0;
-
-@@ -68,6 +78,8 @@
- KConfigGroup config(&_config, "NTP");
- config.writeEntry("servers", ntpServers );
- config.writeEntry("enabled", ntpEnabled );
-+
-+ QString ntpUtility(findNtpUtility());
-
-
[arch-commits] Commit in kdebase-workspace/trunk (3 files)
Date: Monday, November 10, 2014 @ 15:30:48
Author: andrea
Revision: 225876
upgpkg: kdebase-workspace 4.11.13-2
CVE-2014-8651
Added:
kdebase-workspace/trunk/CVE-2014-8651-2.patch
kdebase-workspace/trunk/CVE-2014-8651.patch
Modified:
kdebase-workspace/trunk/PKGBUILD
---+
CVE-2014-8651-2.patch | 30
CVE-2014-8651.patch | 120
PKGBUILD | 13 -
3 files changed, 160 insertions(+), 3 deletions(-)
Added: CVE-2014-8651-2.patch
===
--- CVE-2014-8651-2.patch (rev 0)
+++ CVE-2014-8651-2.patch 2014-11-10 14:30:48 UTC (rev 225876)
@@ -0,0 +1,30 @@
+From: David Edmundson
+Date: Tue, 04 Nov 2014 13:00:54 +
+Subject: Validate timezone name before setting
+X-Git-Url:
http://quickgit.kde.org/?p=kde-workspace.git&a=commitdiff&h=54d0bfb5e9c8cf60da890b7728cbe36a454e
+---
+Validate timezone name before setting
+
+This patch ensures that the symlink /etc/localtime always points to a
+file in /usr/share/timezones and not an arbitrary file in a user's home
+directory.
+---
+
+
+--- a/kcontrol/dateandtime/helper.cpp
b/kcontrol/dateandtime/helper.cpp
+@@ -123,6 +123,13 @@
+ 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;
+
Added: CVE-2014-8651.patch
===
--- CVE-2014-8651.patch (rev 0)
+++ CVE-2014-8651.patch 2014-11-10 14:30:48 UTC (rev 225876)
@@ -0,0 +1,120 @@
+From: David Edmundson
+Date: Tue, 04 Nov 2014 12:57:59 +
+Subject: Do not pass ntpUtility as an argument to datetime helper
+X-Git-Url:
http://quickgit.kde.org/?p=kde-workspace.git&a=commitdiff&h=eebcb17746d9fa86ea8c5a7344709ef6750781cf
+---
+Do not pass ntpUtility as an argument to datetime helper
+
+Passing the name of a binary to run to a polkit helper is a security
+risk as it allows any arbitrary process to be executed.
+
+This patch moves the detection of ntp utility location into the helper
+function.
+
+REVIEW: 120977
+---
+
+
+--- a/kcontrol/dateandtime/dtime.cpp
b/kcontrol/dateandtime/dtime.cpp
+@@ -142,27 +142,15 @@
+ //kclock->setEnabled(enabled);
+ }
+
+-void Dtime::findNTPutility(){
+- QByteArray envpath = qgetenv("PATH");
+- if (!envpath.isEmpty() && envpath[0] == ':') {
+-envpath = envpath.mid(1);
+- }
+-
+- QString path = "/sbin:/usr/sbin:";
+- if (!envpath.isEmpty()) {
+-path += QString::fromLocal8Bit(envpath);
+- } else {
+-path += QLatin1String("/bin:/usr/bin");
+- }
+-
+- foreach(const QString &possible_ntputility, QStringList() << "ntpdate" <<
"rdate" ) {
+-if( !((ntpUtility = KStandardDirs::findExe(possible_ntputility,
path)).isEmpty()) ) {
+- kDebug() << "ntpUtility = " << ntpUtility;
+- return;
+-}
+- }
+-
+- kDebug() << "ntpUtility not found!";
++void Dtime::findNTPutility()
++{
++const QString exePath = QLatin1String("/usr/sbin:/usr/bin:/sbin:/bin");
++foreach(const QString &possible_ntputility, QStringList() << "ntpdate" <<
"rdate" ) {
++ntpUtility = KStandardDirs::findExe(possible_ntputility, exePath);
++if (!ntpUtility.isEmpty()) {
++return;
++}
++}
+ }
+
+ void Dtime::set_time()
+@@ -238,7 +226,6 @@
+ helperargs["ntp"] = true;
+ helperargs["ntpServers"] = list;
+ helperargs["ntpEnabled"] = setDateTimeAuto->isChecked();
+- helperargs["ntpUtility"] = ntpUtility;
+
+ if(setDateTimeAuto->isChecked() && !ntpUtility.isEmpty()){
+ // NTP Time setting - done in helper
+
+--- a/kcontrol/dateandtime/helper.cpp
b/kcontrol/dateandtime/helper.cpp
+@@ -52,8 +52,18 @@
+ // 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 )
++static QString findNtpUtility()
++{
++foreach(const QString &possible_ntputility, QStringList() << "ntpdate" <<
"rdate" ) {
++const QString ntpUtility =
KStandardDirs::findExe(possible_ntputility, exePath);
++if (!ntpUtility.isEmpty()) {
++return ntpUtility;
++}
++}
++return QString();
++}
++
++int ClockHelper::ntp( const QStringList& ntpServers, bool ntpEnabled )
+ {
+ int ret = 0;
+
+@@ -68,6 +78,8 @@
+ KConfigGroup config(&_config, "NTP");
+ config.writeEntry("servers", ntpServers );
+ config.writeEntry("enabled", ntpEnabled );
++
++ QString ntpUtility(findNtpUtility());
+
+ if ( ntpEnabled && !
[arch-commits] Commit in kdebase-workspace/trunk (3 files)
Date: Friday, May 2, 2014 @ 10:31:06
Author: andrea
Revision: 211954
upgpkg: kdebase-workspace 4.11.9-2
Fix kscreensaver pam file; fix KDM crash when no DesktopNames is set
Added:
kdebase-workspace/trunk/kdm-desktopnames.patch
Modified:
kdebase-workspace/trunk/PKGBUILD
kdebase-workspace/trunk/kscreensaver.pam
+
PKGBUILD | 13 +
kdm-desktopnames.patch | 35 +++
kscreensaver.pam |3 ++-
3 files changed, 46 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-05-02 08:30:24 UTC (rev 211953)
+++ PKGBUILD2014-05-02 08:31:06 UTC (rev 211954)
@@ -6,7 +6,7 @@
_pkgname=kde-workspace
pkgver=4.11.9
_pkgver=4.12.5
-pkgrel=1
+pkgrel=2
pkgdesc="Provides the interface and basic tools for the KDE workspace"
arch=('i686' 'x86_64')
url='https://projects.kde.org/projects/kde/kde-workspace'
@@ -29,17 +29,19 @@
source=("http://download.kde.org/stable/${_pkgver}/src/${_pkgname}-${pkgver}.tar.xz";
'kde.pam' 'kde-np.pam' 'kscreensaver.pam' 'kdm.service' 'kdm.logrotate'
'etc-scripts.patch' 'terminate-server.patch' 'kdm-xinitrd.patch'
-'khotkeys-qt4.patch')
+'khotkeys-qt4.patch'
+'kdm-desktopnames.patch')
sha1sums=('ea4f3b3401b7304613adcc21acb92b5c3d11c9c1'
'660eae40a707d2711d8d7f32a93214865506b795'
'6aeecc9e0e221f0515c6bf544f9a3c11cb6961fe'
- '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
+ 'c6afdf8964b2b2c4809b2e8e694729b2661e29df'
'b6f8e8692737b11eec1f8022ce74b5b23e247b1b'
'bbe55f2000217474ce7246f12ee437ceaaf7e9ae'
'c079ebd157c836ba996190f0d2bcea1a7828d02c'
'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3'
'd509dac592bd8b310df27991b208c95b6d907514'
- 'aa9d2e5a69986c4c3d47829721ea99edb473be12')
+ 'aa9d2e5a69986c4c3d47829721ea99edb473be12'
+ '51d3a3a83e01ce1998c57b0389e7b094d8e9d7b8')
prepare() {
mkdir build
@@ -55,6 +57,9 @@
# KDEBUG#202629
patch -p0 -i "${srcdir}"/terminate-server.patch
+
+# KDEBUG#334159
+patch -p1 -i "${srcdir}"/kdm-desktopnames.patch
}
build() {
Added: kdm-desktopnames.patch
===
--- kdm-desktopnames.patch (rev 0)
+++ kdm-desktopnames.patch 2014-05-02 08:31:06 UTC (rev 211954)
@@ -0,0 +1,35 @@
+From: David Faure
+Date: Fri, 02 May 2014 08:26:38 +
+Subject: Fix crash when DesktopNames isn't set
+X-Git-Url:
http://quickgit.kde.org/?p=kde-workspace.git&a=commitdiff&h=e1724800ecf3c6a7035dfa7bcaa50b2a8f48688f
+---
+Fix crash when DesktopNames isn't set
+
+BUG: 334159
+FIXED-IN: 4.11.10
+---
+
+
+--- a/kdm/backend/client.c
b/kdm/backend/client.c
+@@ -1810,12 +1810,14 @@
+ !(sessargs = iniEntry(str, "Desktop Entry",
"Exec", 0)))
+ sessargs = "";
+ buf = iniEntry(str, "Desktop Entry", "DesktopNames", 0);
+-for (buf2 = buf; *buf2; ++buf2) {
+-if (*buf2 == ';')
+-*buf2 = ':';
++if (buf) {
++for (buf2 = buf; *buf2; ++buf2) {
++if (*buf2 == ';')
++*buf2 = ':';
++}
++userEnviron = setEnv(userEnviron,
"XDG_CURRENT_DESKTOP", buf);
++free(buf);
+ }
+-userEnviron = setEnv(userEnviron, "XDG_CURRENT_DESKTOP",
buf);
+-free(buf);
+ free(str);
+ free(fname);
+ goto gotit;
+
Modified: kscreensaver.pam
===
--- kscreensaver.pam2014-05-02 08:30:24 UTC (rev 211953)
+++ kscreensaver.pam2014-05-02 08:31:06 UTC (rev 211954)
@@ -1 +1,2 @@
-auth requiredpam_unix_auth.so
+#%PAM-1.0
+authinclude system-login
[arch-commits] Commit in kdebase-workspace/trunk (3 files)
Date: Wednesday, October 31, 2012 @ 06:14:47
Author: andrea
Revision: 170054
fix logind support on resume; fix mesa 9 compatibility
Added:
kdebase-workspace/trunk/fix-mesa9.patch
kdebase-workspace/trunk/logind-support2.patch
Modified:
kdebase-workspace/trunk/PKGBUILD
---+
PKGBUILD | 13 +++--
fix-mesa9.patch | 60 +++
logind-support2.patch | 124
3 files changed, 194 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-10-31 10:13:04 UTC (rev 170053)
+++ PKGBUILD2012-10-31 10:14:47 UTC (rev 170054)
@@ -5,7 +5,7 @@
pkgname=kdebase-workspace
_pkgname=kde-workspace
pkgver=4.9.2
-pkgrel=5
+pkgrel=6
pkgdesc="Provides the interface and basic tools for the KDE workspace"
arch=('i686' 'x86_64')
url='https://projects.kde.org/projects/kde/kde-workspace'
@@ -26,7 +26,9 @@
source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz";
'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam' 'kdm.service'
'kdm.logrotate'
'etc-scripts.patch' 'terminate-server.patch' 'kdm-xinitrd.patch'
-'logind-support.patch')
+'logind-support.patch'
+'logind-support2.patch'
+'fix-mesa9.patch')
sha1sums=('091bec159d85db2a9a6d6b1b43a53183c23de488'
'5db3a245201bd4a50e65aa2ef583cf5490e4f646'
'660eae40a707d2711d8d7f32a93214865506b795'
@@ -37,7 +39,9 @@
'c079ebd157c836ba996190f0d2bcea1a7828d02c'
'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3'
'd509dac592bd8b310df27991b208c95b6d907514'
- 'ccde71c42e19feaf40d3bd76e7396a0cb6df012f')
+ 'ccde71c42e19feaf40d3bd76e7396a0cb6df012f'
+ '8f27ebd4bcc2f833a73d453837f4522b2be0aa1f'
+ 'c57583555bf8acd213295316512b92b6dc07703e')
build() {
cd ${_pkgname}-${pkgver}
@@ -51,6 +55,9 @@
patch -p0 -i "${srcdir}"/terminate-server.patch
# KDEBUG#307412 (fixed upstream)
patch -p1 -i "${srcdir}"/logind-support.patch
+patch -p1 -i "${srcdir}"/logind-support2.patch
+# KDEBUG#308385 (fixed upstream)
+patch -p1 -i "${srcdir}"/fix-mesa9.patch
cd ../
Added: fix-mesa9.patch
===
--- fix-mesa9.patch (rev 0)
+++ fix-mesa9.patch 2012-10-31 10:14:47 UTC (rev 170054)
@@ -0,0 +1,60 @@
+commit 6cf05555a5d0c834de3a0165a62916cf3b40
+Author: Fredrik Höglund
+Date: Tue Oct 30 18:20:00 2012 +0100
+
+kwin/glx: Avoid MSAA configs in initBufferConfigs()
+
+It appears that we're accidentally choosing an MSAA config with the
+Intel driver in Mesa 9.0. So change the algorithm to take the values
+of GLX_SAMPLES and GLX_SAMPLE_BUFFERS into account.
+
+Found by Kenneth Graunke.
+
+diff --git a/kwin/scene_opengl_glx.cpp b/kwin/scene_opengl_glx.cpp
+index 1fe2f18..cf7933b 100644
+--- a/kwin/scene_opengl_glx.cpp
b/kwin/scene_opengl_glx.cpp
+@@ -270,12 +270,15 @@ bool SceneOpenGL::initBufferConfigs()
+ fbcbuffer_nondb = NULL;
+
+ for (int i = 0; i < 2; i++) {
+-int back, stencil, depth, caveat, alpha;
++int back, stencil, depth, caveat, msaa_buffers, msaa_samples, alpha;
+ back = i > 0 ? INT_MAX : 1;
+ stencil = INT_MAX;
+ depth = INT_MAX;
+ caveat = INT_MAX;
++msaa_buffers = INT_MAX;
++msaa_samples = INT_MAX;
+ alpha = 0;
++
+ for (int j = 0; j < cnt; j++) {
+ XVisualInfo *vi;
+ int visual_depth;
+@@ -322,10 +325,26 @@ bool SceneOpenGL::initBufferConfigs()
+ GLX_CONFIG_CAVEAT, &caveat_value);
+ if (caveat_value > caveat)
+ continue;
++
++int msaa_buffers_value;
++glXGetFBConfigAttrib(display(), fbconfigs[j], GLX_SAMPLE_BUFFERS,
++ &msaa_buffers_value);
++if (msaa_buffers_value > msaa_buffers)
++continue;
++
++int msaa_samples_value;
++glXGetFBConfigAttrib(display(), fbconfigs[j], GLX_SAMPLES,
++ &msaa_samples_value);
++if (msaa_samples_value > msaa_samples)
++continue;
++
+ back = back_value;
+ stencil = stencil_value;
+ depth = depth_value;
+ caveat = caveat_value;
++msaa_buffers = msaa_buffers_value;
++msaa_samples = msaa_samples_value;
++
+ if (i > 0)
+ fbcbuffer_nondb = fbconfigs[ j ];
+ else
Added: logind-support2.patch
===
--- logind-support2.patch (rev 0)
+++ logind-support2.patch 2012-10-31 10:14:47 UTC (rev 170054)
@@ -0,0 +1,124 @@
+commit 8
[arch-commits] Commit in kdebase-workspace/trunk (3 files)
Date: Wednesday, October 17, 2012 @ 12:10:11
Author: andrea
Revision: 169060
Cleanup
Modified:
kdebase-workspace/trunk/PKGBUILD
kdebase-workspace/trunk/kdebase-workspace.install
Deleted:
kdebase-workspace/trunk/use-systemctl.patch
---+
PKGBUILD |2 +-
kdebase-workspace.install |5 -
use-systemctl.patch | 13 -
3 files changed, 1 insertion(+), 19 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-10-17 16:10:07 UTC (rev 169059)
+++ PKGBUILD2012-10-17 16:10:11 UTC (rev 169060)
@@ -5,7 +5,7 @@
pkgname=kdebase-workspace
_pkgname=kde-workspace
pkgver=4.9.2
-pkgrel=6
+pkgrel=5
pkgdesc="Provides the interface and basic tools for the KDE workspace"
arch=('i686' 'x86_64')
url='https://projects.kde.org/projects/kde/kde-workspace'
Modified: kdebase-workspace.install
===
--- kdebase-workspace.install 2012-10-17 16:10:07 UTC (rev 169059)
+++ kdebase-workspace.install 2012-10-17 16:10:11 UTC (rev 169060)
@@ -12,11 +12,6 @@
chown -R 135:135 var/lib/kdm &>/dev/null
xdg-icon-resource forceupdate --theme hicolor &> /dev/null
update-desktop-database -q
-
-if [[ $(vercmp $2 4.9.2-6) -le 0 ]]; then
-echo ":: KDM now uses systemctl to shutdown/reboot the system."
-echo " Please replace your kdmrc with the kdmrc.pacnew or install
systemd-sysvcompat."
-fi
}
post_remove() {
Deleted: use-systemctl.patch
===
--- use-systemctl.patch 2012-10-17 16:10:07 UTC (rev 169059)
+++ use-systemctl.patch 2012-10-17 16:10:11 UTC (rev 169060)
@@ -1,13 +0,0 @@
kde-workspace-4.9.2/kdm/config.def~2012-10-17 13:58:07.236399517
+
-+++ kde-workspace-4.9.2/kdm/config.def 2012-10-17 14:01:35.181535177 +
-@@ -38,8 +38,8 @@
- # define HALT_CMD "/usr/sbin/shutdown -h now"
- # define REBOOT_CMD "/usr/sbin/shutdown -r now"
- #elif defined(__linux__)
--# define HALT_CMD "/sbin/shutdown -h -P now"
--# define REBOOT_CMD "/sbin/shutdown -r now"
-+# define HALT_CMD "/usr/bin/systemctl poweroff"
-+# define REBOOT_CMD "/usr/bin/systemctl reboot"
- #elif defined(BSD)
- # define HALT_CMD "/sbin/shutdown -p now"
- # define REBOOT_CMD "/sbin/shutdown -r now"
[arch-commits] Commit in kdebase-workspace/trunk (3 files)
Date: Tuesday, May 24, 2011 @ 13:22:55
Author: andrea
Revision: 124831
Disable NetworkManager backend, is provided by the new version of the
networkmanagement plasmoid; apply patch to avoid double launch of an
application from a plasmoid (FS#24263); remove useless bluez makedependence
Added:
kdebase-workspace/trunk/fix-app-launch-in-plasmoid.patch
Modified:
kdebase-workspace/trunk/PKGBUILD
Deleted:
kdebase-workspace/trunk/nm-09.patch
--+
PKGBUILD | 17 ++---
fix-app-launch-in-plasmoid.patch | 22 ++
nm-09.patch | 34 --
3 files changed, 32 insertions(+), 41 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-05-24 16:19:44 UTC (rev 124830)
+++ PKGBUILD2011-05-24 17:22:55 UTC (rev 124831)
@@ -4,7 +4,7 @@
pkgname=kdebase-workspace
pkgver=4.6.3
-pkgrel=1
+pkgrel=2
pkgdesc="KDE Base Workspace"
arch=('i686' 'x86_64')
url='http://www.kde.org'
@@ -16,8 +16,7 @@
depends=('kdepim-runtime' 'lm_sensors' 'libraw1394' 'qimageblitz'
'libqalculate'
'polkit-kde' 'consolekit' 'xorg-xprop' 'libxdamage' 'libxklavier'
'libdmtx'
'xorg-xsetroot' 'libxcomposite' 'libxinerama')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'networkmanager' 'bluez'
- 'python2' 'kdebindings-python')
+makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'kdebindings-python')
replaces=('kdmtheme' 'kde-common' 'guidance-power-manager' 'policykit-kde'
'kdebase-kinfocenter')
conflicts=('kde-common' 'guidance-power-manager' 'policykit-kde'
'kdebase-kinfocenter')
install="${pkgname}.install"
@@ -28,7 +27,8 @@
options=('emptydirs')
source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2";
'kdm-zsh-profile.patch' 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam'
-'fixpath.patch' 'terminate-server.patch' 'nm-09.patch')
+'fixpath.patch' 'terminate-server.patch'
+'fix-app-launch-in-plasmoid.patch')
sha1sums=('50103b7752defbab08965b665fa95361bb5b3ff6'
'8c2bdefb23a03b753b78d16944d03fa3939d2d99'
'5db3a245201bd4a50e65aa2ef583cf5490e4f646'
@@ -37,15 +37,17 @@
'106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
'd7b5883f7e65c6839b1f65f94d58026673dd0226'
'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3'
- '91ed84f5bb99909cab1b5ca0779bbf5cf6c72d33')
+ 'ca55cd0a25fd8cfb95fa3b1cdd373d496fd7312d')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
patch -p0 -i ${srcdir}/kdm-zsh-profile.patch
patch -p0 -i ${srcdir}/fixpath.patch
patch -p0 -i ${srcdir}/terminate-server.patch
-patch -p1 -i ${srcdir}/nm-09.patch
+# Already fixed upstream
+patch -p1 -i ${srcdir}/fix-app-launch-in-plasmoid.patch
+
cd ${srcdir}
mkdir build
cd build
@@ -54,7 +56,8 @@
-DCMAKE_SKIP_RPATH=ON \
-DCMAKE_INSTALL_PREFIX=/usr \
-DWITH_Xmms=OFF \
- -DWITH_Googlegadgets=OFF
+ -DWITH_Googlegadgets=OFF \
+-DWITH_NetworkManager=OFF
make
}
Added: fix-app-launch-in-plasmoid.patch
===
--- fix-app-launch-in-plasmoid.patch(rev 0)
+++ fix-app-launch-in-plasmoid.patch2011-05-24 17:22:55 UTC (rev 124831)
@@ -0,0 +1,22 @@
+commit 3f1dd3b94ab2b56abb43a51b7b78a9cd162325d0
+Author: Aaron Seigo
+Date: Fri May 6 22:51:50 2011 +0200
+
+get rid of duplicate connect
+
+patch contributed by Luc Menut
+BUG:262614
+REVIEW:101284
+
+diff --git a/plasma/generic/containmentactions/applauncher/launch.cpp
b/plasma/generic/containmentactions/applauncher/launch.cpp
+index cbc7175..bef53e5 100644
+--- a/plasma/generic/containmentactions/applauncher/launch.cpp
b/plasma/generic/containmentactions/applauncher/launch.cpp
+@@ -36,7 +36,6 @@ AppLauncher::AppLauncher(QObject *parent, const QVariantList
&args)
+ {
+ m_menu = new KMenu();
+ connect(m_menu, SIGNAL(triggered(QAction*)), this,
SLOT(switchTo(QAction*)));
+-connect(m_menu, SIGNAL(triggered(QAction*)), this,
SLOT(switchTo(QAction*)));
+
+ m_action->setMenu(m_menu);
+ }
Deleted: nm-09.patch
===
--- nm-09.patch 2011-05-24 16:19:44 UTC (rev 124830)
+++ nm-09.patch 2011-05-24 17:22:55 UTC (rev 124831)
@@ -1,34 +0,0 @@
kdebase-workspace-4.6.3/solid/CMakeLists.txt~ 2011-04-29
03:43:20.321994578 -0700
-+++ kdebase-workspace-4.6.3/solid/CMakeLists.txt 2011-04-29
03:43:33.271995023 -0700
-@@ -17,7 +17,7 @@
- add_subdirectory(networkmanager-0.6)
- endif (NM_0_6)
-
-- macro_ensure_version_range("0.7.0" ${NETWORKMANAGER_VERSION} "0.9.0" NM_0_7)
-+ macro_ensure_version("0.7.0" ${NETWORKMANAGER_VERSION}
[arch-commits] Commit in kdebase-workspace/trunk (3 files)
Date: Friday, April 8, 2011 @ 03:49:14
Author: andrea
Revision: 118827
Fix invalid shutdown command (FS#23640); Fix broken sensors support (FS#23627);
Removed useless cmake option
Added:
kdebase-workspace/trunk/sensors-fix.patch
kdebase-workspace/trunk/shutdown-fix.patch
Modified:
kdebase-workspace/trunk/PKGBUILD
+
PKGBUILD | 17 -
sensors-fix.patch | 22 ++
shutdown-fix.patch | 11 +++
3 files changed, 45 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-04-08 06:10:00 UTC (rev 118826)
+++ PKGBUILD2011-04-08 07:49:14 UTC (rev 118827)
@@ -4,7 +4,7 @@
pkgname=kdebase-workspace
pkgver=4.6.2
-pkgrel=1
+pkgrel=2
pkgdesc="KDE Base Workspace"
arch=('i686' 'x86_64')
url='http://www.kde.org'
@@ -26,7 +26,9 @@
'etc/pam.d/kscreensaver')
source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2";
'kdm-zsh-profile.patch' 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam'
-'fixpath.patch' 'terminate-server.patch')
+'fixpath.patch' 'terminate-server.patch'
+'shutdown-fix.patch'
+'sensors-fix.patch')
sha1sums=('63efb68733f347d0b7d24a7a061c5a0e3f84dee7'
'8c2bdefb23a03b753b78d16944d03fa3939d2d99'
'5db3a245201bd4a50e65aa2ef583cf5490e4f646'
@@ -34,14 +36,20 @@
'603cc79c4d2b4eae62bb5f244aeecb3a778b5516'
'106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
'd7b5883f7e65c6839b1f65f94d58026673dd0226'
- 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3')
+ 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3'
+ 'c18422cb964e51d2cfcca3907904a361d507c8e1'
+ 'fd6bb3239705c23d38f51fb39048b05ed6e95703')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
patch -p0 -i ${srcdir}/kdm-zsh-profile.patch
patch -p0 -i ${srcdir}/fixpath.patch
patch -p0 -i ${srcdir}/terminate-server.patch
+patch -Np1 -i ${srcdir}/shutdown-fix.patch
+# Already fixed upstream
+patch -Np1 -i ${srcdir}/sensors-fix.patch
+
cd ${srcdir}
mkdir build
cd build
@@ -50,8 +58,7 @@
-DCMAKE_SKIP_RPATH=ON \
-DCMAKE_INSTALL_PREFIX=/usr \
-DWITH_Xmms=OFF \
- -DWITH_Googlegadgets=OFF \
- -DWITH_PolkitQt=OFF
+ -DWITH_Googlegadgets=OFF
make
}
Added: sensors-fix.patch
===
--- sensors-fix.patch (rev 0)
+++ sensors-fix.patch 2011-04-08 07:49:14 UTC (rev 118827)
@@ -0,0 +1,22 @@
+commit 23863a99399cbb274f6756146b3c08de2efa0c7f
+Author: John Tapsell
+Date: Thu Apr 7 10:59:20 2011 +0100
+
+Fix accidental removal of a #include, when adding freebsd support. This
broke the lmsensors at minimum
+
+BUG: 270246
+BUG: 270246
+CCMAIL: naylor.b.da...@gmail.com
+
+diff --git a/ksysguard/ksysguardd/modules.h b/ksysguard/ksysguardd/modules.h
+index e780be6..9aae890 100644
+--- a/ksysguard/ksysguardd/modules.h
b/ksysguard/ksysguardd/modules.h
+@@ -23,6 +23,7 @@
+ #ifndef KSG_MODULES_H
+ #define KSG_MODULES_H
+
++#include "config-ksysguardd.h"
+ #include "Command.h"
+ #include "conf.h"
+ #include "ksysguardd.h"
Added: shutdown-fix.patch
===
--- shutdown-fix.patch (rev 0)
+++ shutdown-fix.patch 2011-04-08 07:49:14 UTC (rev 118827)
@@ -0,0 +1,11 @@
+--- kdebase-workspace-4.6.2/kdm/config.def~2011-04-08 00:29:48.291941154
-0700
kdebase-workspace-4.6.2/kdm/config.def 2011-04-08 00:32:04.738607619
-0700
+@@ -38,7 +38,7 @@
+ # define HALT_CMD "/usr/sbin/shutdown -h now"
+ # define REBOOT_CMD "/usr/sbin/shutdown -r now"
+ #elif defined(BSD) || defined(__linux__)
+-# define HALT_CMD "/sbin/shutdown -p now"
++# define HALT_CMD "/sbin/shutdown -h now"
+ # define REBOOT_CMD "/sbin/shutdown -r now"
+ #elif defined(__SVR4)
+ # define HALT_CMD "/usr/sbin/halt"
[arch-commits] Commit in kdebase-workspace/trunk (3 files)
Date: Wednesday, January 26, 2011 @ 14:56:53
Author: andrea
Revision: 107562
KDE 4.6.0
Added:
kdebase-workspace/trunk/fix-MALLOC_CHECK.patch
kdebase-workspace/trunk/set-horos-theme.patch
Modified:
kdebase-workspace/trunk/PKGBUILD
+
PKGBUILD | 26 --
fix-MALLOC_CHECK.patch | 23 +++
set-horos-theme.patch | 13 +
3 files changed, 52 insertions(+), 10 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-01-26 19:56:49 UTC (rev 107561)
+++ PKGBUILD2011-01-26 19:56:53 UTC (rev 107562)
@@ -3,7 +3,7 @@
# Contributor: Pierre Schmitz
pkgname=kdebase-workspace
-pkgver=4.5.5
+pkgver=4.6.0
pkgrel=1
pkgdesc="KDE Base Workspace"
arch=('i686' 'x86_64')
@@ -13,11 +13,10 @@
# note on libxdamage:
# not detected by namcap because libgl depends on it
# but nvidia providing libgl does not depend on libxdamage
-depends=('polkit-kde' 'kdepimlibs' 'kdepim-runtime' 'kdebase-runtime'
'qimageblitz'
- 'libxcomposite' 'lm_sensors' 'libxklavier' 'libxdamage'
- 'xorg-utils' 'libxrandr' 'libraw1394' 'libqalculate')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'networkmanager' 'bluez'
-'kdebindings-python' 'docbook-xsl' 'boost' 'python2')
+depends=('kdepim-runtime' 'lm_sensors' 'libraw1394' 'qimageblitz'
'libqalculate'
+'polkit-kde' 'consolekit' 'xorg-xprop' 'libxdamage' 'libxklavier'
'libdmtx')
+makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'networkmanager' 'bluez'
+'docbook-xsl' 'python2' 'kdebindings-python')
replaces=('kdmtheme' 'kde-common' 'guidance-power-manager' 'policykit-kde'
'kdebase-kinfocenter')
conflicts=('kde-common' 'guidance-power-manager' 'policykit-kde'
'kdebase-kinfocenter')
install="${pkgname}.install"
@@ -27,18 +26,26 @@
'etc/pam.d/kscreensaver')
source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2";
'kdm-zsh-profile.patch' 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam'
-'fixpath.patch' 'terminate-server.patch')
-sha1sums=('38457b606bfc0b39842fb451566ddf49d145da82'
+'fixpath.patch' 'terminate-server.patch'
+'set-horos-theme.patch'
+'fix-MALLOC_CHECK.patch')
+sha1sums=('c192f712d16617e625acc84fcd9e0546df887a70'
'8c2bdefb23a03b753b78d16944d03fa3939d2d99'
'5db3a245201bd4a50e65aa2ef583cf5490e4f646'
'f7b38af38549242a240f1a90ab9964ca8a366129'
'603cc79c4d2b4eae62bb5f244aeecb3a778b5516'
'106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
'd7b5883f7e65c6839b1f65f94d58026673dd0226'
- 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3')
+ 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3'
+ 'd1f74ba2c7e2580d32b16ab88b0e6e804951e663'
+ 'd8d6ac7f1b25a30fdd0d6a182e2ac6c6f2a28cd7')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
+# Already fixed upstream
+patch -Np0 -i ${srcdir}/set-horos-theme.patch
+patch -Np0 -i ${srcdir}/fix-MALLOC_CHECK.patch
+
patch -p0 -i ${srcdir}/kdm-zsh-profile.patch
patch -p0 -i ${srcdir}/fixpath.patch
patch -p0 -i ${srcdir}/terminate-server.patch
@@ -52,7 +59,6 @@
-DCMAKE_INSTALL_PREFIX=/usr \
-DWITH_Xmms=OFF \
-DWITH_Googlegadgets=OFF \
- -DWITH_QEdje=OFF \
-DWITH_PolkitQt=OFF
make
}
Added: fix-MALLOC_CHECK.patch
===
--- fix-MALLOC_CHECK.patch (rev 0)
+++ fix-MALLOC_CHECK.patch 2011-01-26 19:56:53 UTC (rev 107562)
@@ -0,0 +1,23 @@
+Index: startkde.cmake
+===
+--- startkde.cmake (revision 1217283)
startkde.cmake (revision 1217284)
+@@ -36,18 +36,6 @@
+ # we have to unset this for Darwin since it will screw up KDE's
dynamic-loading
+ unset DYLD_FORCE_FLAT_NAMESPACE
+
+-# Enable lightweight memory corruption checker if not already set
+-# -- this is for trunk only, we remove it for releases
+-if [ "x$MALLOC_CHECK_" = "x" ] && [ -x /lib/libc.so.6 ]; then
+-# Extract the first two components of the version from the output.
+-glibc_version=$(LC_ALL=C /lib/libc.so.6 | sed -e
's/[^0-9]*\([0-9]\.[0-9]\+\).*/\1/;s/\.\([0-9]\)$/.0\1/;q')
+-
+-MALLOC_CHECK_=2 # Default to 2 unless glibc 2.9 or higher.
+-test $glibc_version \> 2.08 && MALLOC_CHECK_=3
+-
+-export MALLOC_CHECK_
+-fi
+-
+ # in case we have been started with full pathname spec without being in PATH
+ bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'`
+ if [ -n "$bindir" ]; then
Added: set-horos-theme.patch
===
--- set-horos-theme.patch (rev 0)
+++ set-horos-theme.patch 2011-01-26 19:56:53 UTC (rev 107562)
@@
[arch-commits] Commit in kdebase-workspace/trunk (3 files)
Date: Monday, August 30, 2010 @ 04:03:20
Author: andrea
Revision: 89218
KDE 4.5.1
Modified:
kdebase-workspace/trunk/PKGBUILD
kdebase-workspace/trunk/kdebase-workspace.install
Deleted:
kdebase-workspace/trunk/malloc_check.patch
---+
PKGBUILD | 14 +-
kdebase-workspace.install |2 ++
malloc_check.patch| 21 -
3 files changed, 7 insertions(+), 30 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-08-30 08:03:14 UTC (rev 89217)
+++ PKGBUILD2010-08-30 08:03:20 UTC (rev 89218)
@@ -3,8 +3,8 @@
# Contributor: Pierre Schmitz
pkgname=kdebase-workspace
-pkgver=4.5.0
-pkgrel=2
+pkgver=4.5.1
+pkgrel=1
pkgdesc="KDE Base Workspace"
arch=('i686' 'x86_64')
url='http://www.kde.org'
@@ -27,16 +27,15 @@
'etc/pam.d/kscreensaver')
source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2";
'kdm-zsh-profile.patch' 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam'
-'fixpath.patch' 'terminate-server.patch' 'malloc_check.patch')
-sha1sums=('86648def4f6c1791ed385b649b867d9a38db6e1c'
+'fixpath.patch' 'terminate-server.patch')
+sha1sums=('b902ae08b2b64613b18ba8be478b244a569f8e0f'
'8c2bdefb23a03b753b78d16944d03fa3939d2d99'
'5db3a245201bd4a50e65aa2ef583cf5490e4f646'
'f7b38af38549242a240f1a90ab9964ca8a366129'
'603cc79c4d2b4eae62bb5f244aeecb3a778b5516'
'106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
'd7b5883f7e65c6839b1f65f94d58026673dd0226'
- 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3'
- 'bfd907a124705e72d01cec1afb613e2565cd0c44')
+ 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
@@ -44,9 +43,6 @@
patch -p0 -i ${srcdir}/fixpath.patch
patch -p0 -i ${srcdir}/terminate-server.patch
-# remove MALLOC_CHECK from startkde script
-patch -Np0 -i ${srcdir}/malloc_check.patch
-
cd ${srcdir}
mkdir build
cd build
Modified: kdebase-workspace.install
===
--- kdebase-workspace.install 2010-08-30 08:03:14 UTC (rev 89217)
+++ kdebase-workspace.install 2010-08-30 08:03:20 UTC (rev 89218)
@@ -1,12 +1,14 @@
post_install() {
groupadd -g 135 kdm &>/dev/null
useradd -u 135 -g kdm -d /var/lib/kdm -s /bin/false -r -m kdm
&>/dev/null
+ chown 135:135 var/lib/kdm &>/dev/null
xdg-icon-resource forceupdate --theme hicolor &>/dev/null
}
post_upgrade() {
getent group kdm >/dev/null 2>&1 || groupadd -g 135 kdm &>/dev/null
getent passwd kdm >/dev/null 2>&1 || useradd -u 135 -g kdm -d
/var/lib/kdm -s /bin/false -r -m kdm &>/dev/null
+ chown 135:135 var/lib/kdm &>/dev/null
xdg-icon-resource forceupdate --theme hicolor &> /dev/null
}
Deleted: malloc_check.patch
===
--- malloc_check.patch 2010-08-30 08:03:14 UTC (rev 89217)
+++ malloc_check.patch 2010-08-30 08:03:20 UTC (rev 89218)
@@ -1,21 +0,0 @@
startkde.cmake.old 2010-08-11 19:45:21.54823 +0200
-+++ startkde.cmake 2010-08-11 19:45:34.56482 +0200
-@@ -36,18 +36,6 @@
- # we have to unset this for Darwin since it will screw up KDE's
dynamic-loading
- unset DYLD_FORCE_FLAT_NAMESPACE
-
--# Enable lightweight memory corruption checker if not already set
--# -- this is for trunk only, we remove it for releases
--if [ "x$MALLOC_CHECK_" = "x" ] && [ -x /lib/libc.so.6 ]; then
--# Extract the first two components of the version from the output.
--glibc_version=$(LC_ALL=C /lib/libc.so.6 | sed -e
's/[^0-9]*\([0-9]\.[0-9]\+\).*/\1/;s/\.\([0-9]\)$/.0\1/;q')
--
--MALLOC_CHECK_=2 # Default to 2 unless glibc 2.9 or higher.
--test $glibc_version \> 2.08 && MALLOC_CHECK_=3
--
--export MALLOC_CHECK_
--fi
--
- # Boot sequence:
- #
- # kdeinit is used to fork off processes which improves memory usage
[arch-commits] Commit in kdebase-workspace/trunk (3 files)
Date: Tuesday, July 27, 2010 @ 05:09:31
Author: andrea
Revision: 86186
moved to [testing]
Modified:
kdebase-workspace/trunk/PKGBUILD
kdebase-workspace/trunk/kdebase-workspace.install
Deleted:
kdebase-workspace/trunk/screensaver-sleep.patch
---+
PKGBUILD | 37 ++---
kdebase-workspace.install | 16 +---
screensaver-sleep.patch | 12
3 files changed, 31 insertions(+), 34 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-07-27 09:09:26 UTC (rev 86185)
+++ PKGBUILD2010-07-27 09:09:31 UTC (rev 86186)
@@ -1,8 +1,9 @@
# $Id: PKGBUILD 59826 2009-11-28 01:40:21Z andrea $
-# Maintainer: Pierre Schmitz
+# Maintainer: Andrea Scarpino
+# Contributor: Pierre Schmitz
pkgname=kdebase-workspace
-pkgver=4.4.5
+pkgver=4.4.95
pkgrel=1
pkgdesc="KDE Base Workspace"
arch=('i686' 'x86_64')
@@ -13,36 +14,34 @@
# not detected by namcap because libgl depends on it
# but nvidia providing libgl does not depend on libxdamage
depends=('polkit-kde' 'kdepimlibs' 'kdepim-runtime' 'kdebase-runtime'
'qimageblitz'
- 'libxxf86misc' 'libxcomposite' 'libxss' 'lm_sensors' 'libxklavier'
'libxft'
- 'libxdamage' 'xorg-utils' 'libxrandr')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'networkmanager' 'bluez'
'kdebindings-python'
- 'kdebindings-ruby' 'boost')
-replaces=('kdmtheme' 'kde-common' 'guidance-power-manager' 'policykit-kde')
-conflicts=('kde-common' 'guidance-power-manager' 'policykit-kde')
-install='kdebase-workspace.install'
+ 'libxxf86misc' 'libxcomposite' 'lm_sensors' 'libxklavier' 'libxdamage'
+'xorg-utils' 'libxrandr' 'libraw1394' 'libqalculate')
+makedepends=('pkgconfig' 'cmake' 'automoc4' 'networkmanager' 'bluez'
'kdebindings-python' 'docbook-xsl' 'boost')
+# 'kdebindings-ruby')
+replaces=('kdmtheme' 'kde-common' 'guidance-power-manager' 'policykit-kde'
'kdebase-kinfocenter')
+conflicts=('kde-common' 'guidance-power-manager' 'policykit-kde'
'kdebase-kinfocenter')
+install="${pkgname}.install"
backup=('usr/share/config/kdm/kdmrc'
'etc/pam.d/kde'
'etc/pam.d/kde-np'
'etc/pam.d/kscreensaver')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2";
+source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2";
'kdm-zsh-profile.patch' 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam'
-'fixpath.patch' 'terminate-server.patch' 'screensaver-sleep.patch')
-sha1sums=('d0defe431a760503f8fbb9ee2413b666b3c84cd7'
+'fixpath.patch' 'terminate-server.patch')
+sha1sums=('2f38dfa0d925147af8f60c0d00eda54513c405ab'
'8c2bdefb23a03b753b78d16944d03fa3939d2d99'
'5db3a245201bd4a50e65aa2ef583cf5490e4f646'
'f7b38af38549242a240f1a90ab9964ca8a366129'
'603cc79c4d2b4eae62bb5f244aeecb3a778b5516'
'106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
'd7b5883f7e65c6839b1f65f94d58026673dd0226'
- 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3'
- 'd676932e89f201d1f381615651761af1badb88be')
+ 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
- patch -p0 -i ${srcdir}/kdm-zsh-profile.patch || return 1
- patch -p0 -i ${srcdir}/fixpath.patch || return 1
- patch -p0 -i ${srcdir}/terminate-server.patch || return 1
-patch -p1 -i ${srcdir}/screensaver-sleep.patch || return 1 # FS#19426
+ patch -p0 -i ${srcdir}/kdm-zsh-profile.patch
+ patch -p0 -i ${srcdir}/fixpath.patch
+ patch -p0 -i ${srcdir}/terminate-server.patch
cd ${srcdir}
mkdir build
@@ -55,7 +54,7 @@
-DWITH_Googlegadgets=OFF \
-DWITH_QEdje=OFF \
-DWITH_PolkitQt=OFF
- make || return 1
+ make
}
package() {
Modified: kdebase-workspace.install
===
--- kdebase-workspace.install 2010-07-27 09:09:26 UTC (rev 86185)
+++ kdebase-workspace.install 2010-07-27 09:09:31 UTC (rev 86186)
@@ -1,11 +1,21 @@
post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+ groupadd -g 135 kdm &>/dev/null
+ useradd -u 135 -g kdm -d /var/lib/kdm -s /bin/false -r kdm &>/dev/null
+ xdg-icon-resource forceupdate --theme hicolor &>/dev/null
}
post_upgrade() {
- post_install
+ getent group kdm >/dev/null 2>&1 || groupadd -g 135 kdm &>/dev/null
+ getent passwd kdm >/dev/null 2>&1 || useradd -u 135 -g kdm -d
/var/lib/kdm -s /bin/false -r kdm &>/dev/null
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
}
post_remove() {
- post_install
+ if getent passwd kdm >/dev/null 2>&1; then
+ userdel kdm
+ fi
+ if getent group kdm >/dev/null 2>&1
[arch-commits] Commit in kdebase-workspace/trunk (3 files)
Date: Friday, April 30, 2010 @ 05:59:50
Author: andrea
Revision: 79101
prepare for KDE 4.4.3
Modified:
kdebase-workspace/trunk/PKGBUILD
Deleted:
kdebase-workspace/trunk/fix-powerdevil-suspend.patch
kdebase-workspace/trunk/kdebase-workspace-4.3.5-CVE-2010-0436.diff
+
PKGBUILD | 18 --
fix-powerdevil-suspend.patch | 13 -
kdebase-workspace-4.3.5-CVE-2010-0436.diff | 196 ---
3 files changed, 5 insertions(+), 222 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-04-30 09:59:45 UTC (rev 79100)
+++ PKGBUILD2010-04-30 09:59:50 UTC (rev 79101)
@@ -2,8 +2,8 @@
# Maintainer: Pierre Schmitz
pkgname=kdebase-workspace
-pkgver=4.4.2
-pkgrel=4
+pkgver=4.4.3
+pkgrel=1
pkgdesc="KDE Base Workspace"
arch=('i686' 'x86_64')
url='http://www.kde.org'
@@ -26,19 +26,15 @@
'etc/pam.d/kscreensaver')
source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2";
'kdm-zsh-profile.patch' 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam'
-'fixpath.patch' 'terminate-server.patch'
-'kdebase-workspace-4.3.5-CVE-2010-0436.diff'
- 'fix-powerdevil-suspend.patch')
-md5sums=('6251e5d0060bd1529f90b9eaf5f84230'
+'fixpath.patch' 'terminate-server.patch')
+md5sums=('c334e70b425cbae2efc5a7e7dda4365f'
'721e97031b62aee8914e8617e86f9235'
'363a36b63f84bac79959cfbefdb8309e'
'10a490653b002e6f9e7476ff9d37c011'
'552337fd9a3982d809ea16c7f0033d42'
'367a3538f54db71f108b34cfa31088ac'
'47a1f12673f66e62e2463efd7037a26a'
- '814350c52c135d6f7bdada1e29223d38'
- '68c1dfe76e80812e5e049bb599b3374e'
-'3e50fd1dd00c724e7b28599492a37054')
+ '814350c52c135d6f7bdada1e29223d38')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
@@ -46,10 +42,6 @@
patch -p0 -i ${srcdir}/fixpath.patch || return 1
patch -p0 -i ${srcdir}/terminate-server.patch || return 1
- # fixed in 4.4.3
- patch -p0 -i ${srcdir}/kdebase-workspace-4.3.5-CVE-2010-0436.diff ||
return 1
- patch -p5 -i ${srcdir}/fix-powerdevil-suspend.patch || return 1
-
cd ${srcdir}
mkdir build
cd build
Deleted: fix-powerdevil-suspend.patch
===
--- fix-powerdevil-suspend.patch2010-04-30 09:59:45 UTC (rev 79100)
+++ fix-powerdevil-suspend.patch2010-04-30 09:59:50 UTC (rev 79101)
@@ -1,13 +0,0 @@
branches/KDE/4.4/kdebase/workspace/powerdevil/daemon/PowerDevilDaemon.cpp
2010/04/15 18:15:29 1115242
-+++ branches/KDE/4.4/kdebase/workspace/powerdevil/daemon/PowerDevilDaemon.cpp
2010/04/15 18:18:39 1115243
-@@ -985,10 +985,6 @@
- void PowerDevilDaemon::emitNotification(const QString &evid, const QString
&message,
- const char *slot, const QString
&iconname)
- {
--if (slot) {
--QTimer::singleShot(0, this, slot);
--}
--
- if (!slot) {
- KNotification::event(evid, message, KIcon(iconname).pixmap(20, 20),
- 0, KNotification::CloseOnTimeout,
d->applicationData);
Deleted: kdebase-workspace-4.3.5-CVE-2010-0436.diff
===
--- kdebase-workspace-4.3.5-CVE-2010-0436.diff 2010-04-30 09:59:45 UTC (rev
79100)
+++ kdebase-workspace-4.3.5-CVE-2010-0436.diff 2010-04-30 09:59:50 UTC (rev
79101)
@@ -1,196 +0,0 @@
kdm/ConfigureChecks.cmake
-+++ kdm/ConfigureChecks.cmake
-@@ -37,6 +37,35 @@ int main()
- }
- " HAVE_SETLOGIN)
-
-+check_c_source_runs("
-+#include
-+#include
-+#include
-+#include
-+#include
-+#include
-+#include
-+int main()
-+{
-+int fd, fd2;
-+struct sockaddr_un sa;
-+
-+if ((fd = socket(PF_UNIX, SOCK_STREAM, 0)) < 0)
-+return 2;
-+sa.sun_family = AF_UNIX;
-+strcpy(sa.sun_path, \"testsock\");
-+unlink(sa.sun_path);
-+if (bind(fd, (struct sockaddr *)&sa, sizeof(sa)))
-+return 2;
-+chmod(sa.sun_path, 0);
-+setuid(getuid() + 1000);
-+if ((fd2 = socket(PF_UNIX, SOCK_STREAM, 0)) < 0)
-+return 2;
-+connect(fd2, (struct sockaddr *)&sa, sizeof(sa));
-+return errno != EACCES;
-+}
-+" HONORS_SOCKET_PERMS)
-+
- # for config-kdm.h
- check_function_exists(seteuid HAVE_SETEUID)
-
kdm/backend/ctrl.c
-+++ kdm/backend/ctrl.c
-@@ -79,7 +79,25 @@ nukeSock( struct cmdsock *cs )
- }
-
-
-+#ifdef HONORS_SOCKET_PERMS
- static CtrlRec ctrl = { 0, 0, -1, 0 };
-+#else
-+static CtrlRec ctrl = { 0, 0, 0, -1, 0 };
-+
-+static int mkTempDir( char *dir )
-+{
-+ int i, l = strlen( dir ) - 6;
-+
-+ for (i = 0; i < 100; i++) {
-+ randomStr( dir + l );
-+ if (!mkdir( dir, 0700 ))
-+ return True;
-+ if (errno != EEXIS
[arch-commits] Commit in kdebase-workspace/trunk (3 files)
Date: Friday, February 26, 2010 @ 15:50:07
Author: andrea
Revision: 70450
updated for 4.4.1
Modified:
kdebase-workspace/trunk/PKGBUILD
Deleted:
kdebase-workspace/trunk/kickoff.patch
kdebase-workspace/trunk/krunner_lock.patch
+
PKGBUILD | 21 +--
kickoff.patch | 268 ---
krunner_lock.patch | 55 --
3 files changed, 6 insertions(+), 338 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-02-26 20:50:04 UTC (rev 70449)
+++ PKGBUILD2010-02-26 20:50:07 UTC (rev 70450)
@@ -2,8 +2,8 @@
# Maintainer: Pierre Schmitz
pkgname=kdebase-workspace
-pkgver=4.4.0
-pkgrel=4
+pkgver=4.4.1
+pkgrel=1
pkgdesc="KDE Base Workspace"
arch=('i686' 'x86_64')
url='http://www.kde.org'
@@ -26,30 +26,21 @@
'etc/pam.d/kscreensaver')
source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2";
'kdm-zsh-profile.patch' 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam'
-'fixpath.patch' 'terminate-server.patch'
-'kickoff.patch' 'krunner_lock.patch')
-md5sums=('08179cba422038d4bb6537d63186bb23'
+'fixpath.patch' 'terminate-server.patch')
+md5sums=('c5a5826ce0e8b0faa760971850b29111'
'721e97031b62aee8914e8617e86f9235'
- '3c155bc786a69d75f07e59f989ca93e7'
+ '363a36b63f84bac79959cfbefdb8309e'
'10a490653b002e6f9e7476ff9d37c011'
'552337fd9a3982d809ea16c7f0033d42'
'367a3538f54db71f108b34cfa31088ac'
'47a1f12673f66e62e2463efd7037a26a'
- '814350c52c135d6f7bdada1e29223d38'
- '5744a1c543d392c65a6fded1fee03cef'
- 'd7bd22d5ab6228804046f1e0e9e78ba1')
+ '814350c52c135d6f7bdada1e29223d38')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
patch -p0 -i ${srcdir}/kdm-zsh-profile.patch || return 1
patch -p0 -i ${srcdir}/fixpath.patch || return 1
patch -p0 -i ${srcdir}/terminate-server.patch || return 1
- # this patch will be in KDE 4.4.1
- # see http://websvn.kde.org/?view=revision&sortby=date&revision=1087230
- patch -p0 -i ${srcdir}/kickoff.patch || return 1
- # this patch will be in KDE 4.4.1
- # see http://bugs.kde.org/show_bug.cgi?id=217882
- patch -p0 -i ${srcdir}/krunner_lock.patch || return 1
cd ${srcdir}
mkdir build
Deleted: kickoff.patch
===
--- kickoff.patch 2010-02-26 20:50:04 UTC (rev 70449)
+++ kickoff.patch 2010-02-26 20:50:07 UTC (rev 70450)
@@ -1,268 +0,0 @@
-Index: plasma/desktop/applets/kickoff/core/systemmodel.cpp
-===
plasma/desktop/applets/kickoff/core/systemmodel.cpp(Revision
1087229)
-+++ plasma/desktop/applets/kickoff/core/systemmodel.cpp(Revision
1087230)
-@@ -52,21 +52,22 @@
-
- struct UsageInfo {
- UsageInfo()
--: used(0),
--available(0),
--dirty(true) {}
-+: used(0),
-+ available(0)
-+ {}
-
- quint64 used;
- quint64 available;
--bool dirty;
- };
-
- class SystemModel::Private
- {
- public:
- Private(SystemModel *parent)
--: q(parent)
--, placesModel(new KFilePlacesModel(parent)) {
-+: q(parent),
-+ placesModel(new KFilePlacesModel(parent)),
-+ currentPlacesModelUsageIndex(0)
-+{
- q->setSourceModel(placesModel);
-
- connect(placesModel, SIGNAL(dataChanged(QModelIndex, QModelIndex)),
-@@ -84,44 +85,15 @@
- << i18n("Places")
- << i18n("Removable Storage")
- << i18n("Storage");
--loadApplications();
--connect(&refreshTimer, SIGNAL(timeout()),
--q, SLOT(startRefreshingUsageInfo()));
--refreshTimer.start(1);
--QTimer::singleShot(0, q, SLOT(startRefreshingUsageInfo()));
- connect(KSycoca::self(), SIGNAL(databaseChanged(const QStringList&)),
q, SLOT(reloadApplications()));
- }
-
--void queryFreeSpace(const QString& mountPoint) {
--KDiskFreeSpaceInfo freeSpace =
KDiskFreeSpaceInfo::freeSpaceInfo(mountPoint);
--if (freeSpace.isValid())
--q->freeSpaceInfoAvailable(freeSpace.mountPoint(),
freeSpace.size() / 1024,
-- freeSpace.used() / 1024,
freeSpace.available() / 1024);
--}
--
--void loadApplications() {
--const QStringList apps = Kickoff::systemApplicationList();
--appsList.clear();
--
--foreach(const QString &app, apps) {
--KService::Ptr service = KService::serviceByStorageId(app);
--
--if (!service) {
--continue;
--}
--
--appsList << service;
--}
--//kDebug() << "*" << appsList;
--}
--
- SystemModel *
