Bug#710894: pu: package gnome-settings-daemon/3.4.2+git20121218.7c1322-3
On 05/06/13 06:44, Adam D. Barratt wrote:
> On Wed, 2013-06-05 at 01:37 +0200, Michael Biebl wrote:
>> Am 05.06.2013 00:09, schrieb Emilio Pozuelo Monfort:
>>> I would like to include the attached fix in this p-u upload. I haven't uploaded
>>> the fix to sid because g-s-d just started to ftbfs there because of the new
>>> cups. I will include a fix in sid as well if I can fix the ftbfs soon.
>>
>> The build failures with cups 1.6 have been fixed by pulling some patches
>> from upstream Git. This means, the updated
>> 10_smaller_syndaemon_timeout.patch was also uploaded to sid in
>> 3.4.2+git20121218.7c1322-5
>
> Thanks; please go ahead.
Uploaded to wheezy. debdiff attached.
Unfortunately it looks like the package in sid is not going to migrate anytime
soon. Will that be a problem?
Emilio
diff -Nru gnome-settings-daemon-3.4.2+git20121218.7c1322/debian/changelog gnome-settings-daemon-3.4.2+git20121218.7c1322/debian/changelog
--- gnome-settings-daemon-3.4.2+git20121218.7c1322/debian/changelog 2013-02-05 16:39:29.000000000 +0100
+++ gnome-settings-daemon-3.4.2+git20121218.7c1322/debian/changelog 2013-06-05 10:44:09.000000000 +0200
@@ -1,3 +1,17 @@
+gnome-settings-daemon (3.4.2+git20121218.7c1322-3+deb7u1) wheezy; urgency=low
+
+ [ Xiyue Deng ]
+ * Backport from sid:
+ - Disable "-Wl,-z,defs" on mipsel to fix segfault. (Closes: #629351)
+
+ [ Emilio Pozuelo Monfort ]
+ * debian/patches/10_smaller_syndaemon_timeout.patch:
+ + Update patch to not write out of the array bounds. Fixes a crash
+ when the "Disable touchpad while typing" option is activated.
+ Closes: #684998.
+
+ -- Emilio Pozuelo Monfort <pochu@debian.org> Wed, 05 Jun 2013 10:35:35 +0200
+
gnome-settings-daemon (3.4.2+git20121218.7c1322-3) unstable; urgency=low
* 06_a11y_gdm_leak.patch: backported from git master. Reset keyboard
diff -Nru gnome-settings-daemon-3.4.2+git20121218.7c1322/debian/control gnome-settings-daemon-3.4.2+git20121218.7c1322/debian/control
--- gnome-settings-daemon-3.4.2+git20121218.7c1322/debian/control 2013-02-05 16:40:38.000000000 +0100
+++ gnome-settings-daemon-3.4.2+git20121218.7c1322/debian/control 2013-06-05 10:45:43.000000000 +0200
@@ -7,7 +7,7 @@
Section: gnome
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
-Uploaders: Josselin Mouette <joss@debian.org>, Michael Biebl <biebl@debian.org>, Sjoerd Simons <sjoerd@debian.org>
+Uploaders: Emilio Pozuelo Monfort <pochu@debian.org>, Josselin Mouette <joss@debian.org>, Michael Biebl <biebl@debian.org>, Sjoerd Simons <sjoerd@debian.org>
Build-Depends: cdbs,
debhelper (>= 8.1.0~),
gnome-pkg-tools,
diff -Nru gnome-settings-daemon-3.4.2+git20121218.7c1322/debian/patches/10_smaller_syndaemon_timeout.patch gnome-settings-daemon-3.4.2+git20121218.7c1322/debian/patches/10_smaller_syndaemon_timeout.patch
--- gnome-settings-daemon-3.4.2+git20121218.7c1322/debian/patches/10_smaller_syndaemon_timeout.patch 2012-09-29 15:31:53.000000000 +0200
+++ gnome-settings-daemon-3.4.2+git20121218.7c1322/debian/patches/10_smaller_syndaemon_timeout.patch 2013-06-05 00:14:51.000000000 +0200
@@ -1,8 +1,15 @@
-Index: gnome-settings-daemon-3.4.2+git20120925.a4c817/plugins/mouse/gsd-mouse-manager.c
-===================================================================
---- gnome-settings-daemon-3.4.2+git20120925.a4c817.orig/plugins/mouse/gsd-mouse-manager.c 2012-09-29 12:09:15.000000000 +0200
-+++ gnome-settings-daemon-3.4.2+git20120925.a4c817/plugins/mouse/gsd-mouse-manager.c 2012-09-29 12:11:23.119038602 +0200
-@@ -577,7 +577,8 @@ set_disable_w_typing (GsdMouseManager *m
+--- a/plugins/mouse/gsd-mouse-manager.c
++++ b/plugins/mouse/gsd-mouse-manager.c
+@@ -567,7 +567,7 @@
+ {
+ if (state && touchpad_is_present ()) {
+ GError *error = NULL;
+- char *args[6];
++ char *args[7];
+
+ if (manager->priv->syndaemon_spawned)
+ return 0;
+@@ -577,7 +577,8 @@
args[2] = "1.0";
args[3] = "-K";
args[4] = "-R";
diff -Nru gnome-settings-daemon-3.4.2+git20121218.7c1322/debian/rules gnome-settings-daemon-3.4.2+git20121218.7c1322/debian/rules
--- gnome-settings-daemon-3.4.2+git20121218.7c1322/debian/rules 2012-05-25 07:45:53.000000000 +0200
+++ gnome-settings-daemon-3.4.2+git20121218.7c1322/debian/rules 2013-06-03 10:00:05.000000000 +0200
@@ -7,7 +7,7 @@
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
-ifneq ($(DEB_HOST_ARCH_CPU),ia64)
+ifneq ($(DEB_HOST_ARCH_CPU),$(filter $(DEB_HOST_ARCH_CPU),ia64 mipsel))
LDFLAGS += -Wl,-z,defs
endif
LDFLAGS += -Wl,-O1 -Wl,--warn-unresolved-symbols -Wl,--as-needed
Reply to: