[arch-commits] Commit in gconf/trunk (4 files)
Date: Wednesday, April 18, 2018 @ 11:41:56 Author: heftig Revision: 322181 3.2.6+11+g07808097-1 Modified: gconf/trunk/PKGBUILD gconf/trunk/gconf.install Deleted: gconf/trunk/dbus-dontspew.patch gconf/trunk/gsettings-data-convert-fix-invalid-schema-path.patch --+ PKGBUILD | 86 - dbus-dontspew.patch | 86 - gconf.install| 14 -- gsettings-data-convert-fix-invalid-schema-path.patch | 44 4 files changed, 48 insertions(+), 182 deletions(-) Modified: PKGBUILD === --- PKGBUILD2018-04-18 11:16:02 UTC (rev 322180) +++ PKGBUILD2018-04-18 11:41:56 UTC (rev 322181) @@ -2,70 +2,70 @@ # Maintainer: Jan de Grootpkgname=gconf -pkgver=3.2.6 -pkgrel=5 +pkgver=3.2.6+11+g07808097 +pkgrel=1 pkgdesc="A configuration database system" +url="https://projects-old.gnome.org/gconf/; arch=(x86_64) -license=('LGPL') -depends=('libxml2' 'polkit' 'libldap' 'dbus-glib') -makedepends=('intltool' 'gtk-doc' 'gobject-introspection') +license=(LGPL) +depends=(libxml2 polkit libldap dbus-glib) +makedepends=(intltool gtk-doc gobject-introspection git gnome-common) install=gconf.install -url="http://www.gnome.org; -source=(https://download.gnome.org/sources/GConf/3.2/GConf-$pkgver.tar.xz -gconf-merge-schema -gconfpkg -gconf-reload.patch -gconf-{install,remove}.hook -01_xml-gettext-domain.patch - dbus-dontspew.patch - gsettings-data-convert-fix-invalid-schema-path.patch) -sha256sums=('1912b91803ab09a5eed34d364bf09fe3a2a9c96751fde03a4e0cfa51a04d784c' +_commit=0780809731c8ab1c364202b1900d3df106b28626 # master +source=("git+https://git.gnome.org/browse/gconf#commit=$_commit; +01_xml-gettext-domain.patch gconf-reload.patch +gconf-merge-schema gconfpkg gconf-{install,remove}.hook) +sha256sums=('SKIP' +'c883dec2b96978874a53700cfe7f26f24f8296767203e970bc6402b4b9945eb8' +'567b78d8b4b4bbcb77c5f134d57bc503c34867fcc6341c0b01716bcaa4a21694' 'ee6b6e6f4975dad13a8c45f1c1f0547a99373bdecdcd6604bfc12965c328a028' 'bf1928718caa5df2b9e54a13cfd0f15a8fe0e09e86b84385ce023616a114e898' -'567b78d8b4b4bbcb77c5f134d57bc503c34867fcc6341c0b01716bcaa4a21694' '2732b2a6b187c5620105a036bde12edee99669605f70cbde56fe5f39619c3dc0' -'436a65ff290095bc3d35d7d6297cf4d647f61e9f9922cea7ef9f1e251b447ff7' -'c883dec2b96978874a53700cfe7f26f24f8296767203e970bc6402b4b9945eb8' - 'b490394b0f541ca92134478fa2235536bdb1ccd3b3200d5040dd458cec33bfe8' -'0f2057fbd20837091cbcc1e291bb64c9c6066534891a4ee010bbf5b304bd831d') +'436a65ff290095bc3d35d7d6297cf4d647f61e9f9922cea7ef9f1e251b447ff7') +pkgver() { + cd $pkgname + git describe --tags | sed 's/-/+/g' +} + prepare() { - cd "GConf-$pkgver" + cd $pkgname # Patch from fedora - reloads gconf after installing schemas - patch -Np1 -i "$srcdir/gconf-reload.patch" + patch -Np1 -i ../gconf-reload.patch + # http://bugzilla.gnome.org/show_bug.cgi?id=568845 - patch -Np1 -i "$srcdir/01_xml-gettext-domain.patch" + patch -Np1 -i ../01_xml-gettext-domain.patch - # Upstream fixes - patch -Np1 -i ../dbus-dontspew.patch - patch -Np1 -i ../gsettings-data-convert-fix-invalid-schema-path.patch - # Python2 fix sed -i '1s|#!/usr/bin/env python$|&2|' gsettings/gsettings-schema-convert + + NOCONFIGURE=1 ./autogen.sh } build() { - cd "GConf-$pkgver" - - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --libexecdir=/usr/lib/GConf \ - --disable-static --enable-defaults-service \ - --disable-orbit - + cd $pkgname + ./configure \ +--prefix=/usr \ +--sysconfdir=/etc \ +--localstatedir=/var \ +--libexecdir=/usr/lib \ +--disable-static \ +--enable-defaults-service \ +--disable-orbit sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + make +} - make pkglibdir=/usr/lib/GConf +check() { + cd $pkgname + make check } package() { - cd "GConf-$pkgver" - make DESTDIR="$pkgdir" install + DESTDIR="$pkgdir" make -C $pkgname install - install -m755 -d "$pkgdir/etc/gconf/gconf.xml.system" - install -m755 "$srcdir/gconf-merge-schema" "$pkgdir/usr/bin/" - install -m755 "$srcdir/gconfpkg" "$pkgdir/usr/bin/gconfpkg" - - install -dm755 "$pkgdir"/usr/share/libalpm/hooks/ - install -m644 "$srcdir"/gconf-{install,remove}.hook "$pkgdir"/usr/share/libalpm/hooks/ + install -d "$pkgdir/etc/gconf/gconf.xml.system" + install -Dt "$pkgdir/usr/bin" gconf-merge-schema gconfpkg + install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 *.hook } Deleted: dbus-dontspew.patch === ---
[arch-commits] Commit in gconf/trunk (4 files)
Date: Monday, August 8, 2016 @ 22:26:16 Author: jgc Revision: 273520 upgpkg: gconf 3.2.6-5 Add upstream patches from master branch, remove gio-querymodules from .install file Added: gconf/trunk/dbus-dontspew.patch gconf/trunk/gsettings-data-convert-fix-invalid-schema-path.patch Modified: gconf/trunk/PKGBUILD gconf/trunk/gconf.install --+ PKGBUILD | 16 ++- dbus-dontspew.patch | 86 + gconf.install|6 - gsettings-data-convert-fix-invalid-schema-path.patch | 44 4 files changed, 143 insertions(+), 9 deletions(-) Modified: PKGBUILD === --- PKGBUILD2016-08-08 20:32:59 UTC (rev 273519) +++ PKGBUILD2016-08-08 22:26:16 UTC (rev 273520) @@ -3,7 +3,7 @@ pkgname=gconf pkgver=3.2.6 -pkgrel=4 +pkgrel=5 pkgdesc="A configuration database system" arch=(i686 x86_64) license=('LGPL') @@ -16,7 +16,9 @@ gconfpkg gconf-reload.patch gconf-{install,remove}.hook -01_xml-gettext-domain.patch) +01_xml-gettext-domain.patch + dbus-dontspew.patch + gsettings-data-convert-fix-invalid-schema-path.patch) sha256sums=('1912b91803ab09a5eed34d364bf09fe3a2a9c96751fde03a4e0cfa51a04d784c' 'ee6b6e6f4975dad13a8c45f1c1f0547a99373bdecdcd6604bfc12965c328a028' 'bf1928718caa5df2b9e54a13cfd0f15a8fe0e09e86b84385ce023616a114e898' @@ -23,7 +25,9 @@ '567b78d8b4b4bbcb77c5f134d57bc503c34867fcc6341c0b01716bcaa4a21694' '2732b2a6b187c5620105a036bde12edee99669605f70cbde56fe5f39619c3dc0' '436a65ff290095bc3d35d7d6297cf4d647f61e9f9922cea7ef9f1e251b447ff7' -'c883dec2b96978874a53700cfe7f26f24f8296767203e970bc6402b4b9945eb8') +'c883dec2b96978874a53700cfe7f26f24f8296767203e970bc6402b4b9945eb8' + 'b490394b0f541ca92134478fa2235536bdb1ccd3b3200d5040dd458cec33bfe8' +'0f2057fbd20837091cbcc1e291bb64c9c6066534891a4ee010bbf5b304bd831d') prepare() { cd "GConf-$pkgver" @@ -33,6 +37,10 @@ # http://bugzilla.gnome.org/show_bug.cgi?id=568845 patch -Np1 -i "$srcdir/01_xml-gettext-domain.patch" + # Upstream fixes + patch -Np1 -i ../dbus-dontspew.patch + patch -Np1 -i ../gsettings-data-convert-fix-invalid-schema-path.patch + # Python2 fix sed -i '1s|#!/usr/bin/env python$|&2|' gsettings/gsettings-schema-convert } @@ -45,6 +53,8 @@ --disable-static --enable-defaults-service \ --disable-orbit + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + make pkglibdir=/usr/lib/GConf } Added: dbus-dontspew.patch === --- dbus-dontspew.patch (rev 0) +++ dbus-dontspew.patch 2016-08-08 22:26:16 UTC (rev 273520) @@ -0,0 +1,86 @@ +From b0895e1998ebc83ab030ec0f17c0685439f5b404 Mon Sep 17 00:00:00 2001 +From: Ray Strode+Date: Mon, 15 Apr 2013 09:57:34 -0400 +Subject: dbus: Don't spew to console when unable to connect to dbus daemon + +Instead pass the error up for the caller to decide what to do. + +This prevent untrappable warning messages from showing up at the +console if gconftool --makefile-install-rule is called. +--- + gconf/gconf-dbus.c | 24 + 1 file changed, 12 insertions(+), 12 deletions(-) + +diff --git a/gconf/gconf-dbus.c b/gconf/gconf-dbus.c +index 5610fcf..048e3ea 100644 +--- a/gconf/gconf-dbus.c b/gconf/gconf-dbus.c +@@ -105,7 +105,7 @@ static GHashTable *engines_by_db = NULL; + static GHashTable *engines_by_address = NULL; + static gbooleandbus_disconnected = FALSE; + +-static gboolean ensure_dbus_connection (void); ++static gboolean ensure_dbus_connection (GError **error); + static gboolean ensure_service (gboolean start_if_not_found, +GError **err); + static gboolean ensure_database (GConfEngine *conf, +@@ -383,7 +383,7 @@ gconf_engine_detach (GConfEngine *conf) + } + + static gboolean +-ensure_dbus_connection (void) ++ensure_dbus_connection (GError **err) + { + DBusError error; + +@@ -392,7 +392,9 @@ ensure_dbus_connection (void) + + if (dbus_disconnected) + { +- g_warning ("The connection to DBus was broken. Can't reinitialize it."); ++ g_set_error (err, GCONF_ERROR, ++ GCONF_ERROR_NO_SERVER, ++ "The connection to DBus was broken. Can't reinitialize it."); + return FALSE; + } + +@@ -402,7 +404,10 @@ ensure_dbus_connection (void) + + if (!global_conn) + { +- g_warning ("Client failed to connect to the D-BUS daemon:\n%s", error.message); ++ g_set_error (err, GCONF_ERROR, ++
[arch-commits] Commit in gconf/trunk (4 files)
Date: Wednesday, March 13, 2013 @ 15:27:22 Author: jgc Revision: 179962 upgpkg: gconf 3.2.6-1 Modified: gconf/trunk/PKGBUILD Deleted: gconf/trunk/gconf-dbus-fix-shutdown.patch gconf/trunk/gconf-dbus-fix-use-after-free.patch gconf/trunk/gsettings-schema-convert-dont-fail.patch --+ PKGBUILD | 16 gconf-dbus-fix-shutdown.patch| 34 - gconf-dbus-fix-use-after-free.patch | 99 - gsettings-schema-convert-dont-fail.patch | 28 4 files changed, 3 insertions(+), 174 deletions(-) Modified: PKGBUILD === --- PKGBUILD2013-03-13 13:55:50 UTC (rev 179961) +++ PKGBUILD2013-03-13 14:27:22 UTC (rev 179962) @@ -2,8 +2,8 @@ # Maintainer: Jan de Groot j...@archlinux.org pkgname=gconf -pkgver=3.2.5 -pkgrel=3 +pkgver=3.2.6 +pkgrel=1 pkgdesc=A configuration database system arch=(i686 x86_64) license=('LGPL') @@ -13,17 +13,11 @@ install=gconf.install url=http://www.gnome.org; source=(http://ftp.gnome.org/pub/gnome/sources/GConf/3.2/GConf-$pkgver.tar.xz -gconf-dbus-fix-use-after-free.patch -gconf-dbus-fix-shutdown.patch -gsettings-schema-convert-dont-fail.patch gconf-merge-schema gconfpkg gconf-reload.patch 01_xml-gettext-domain.patch) -sha256sums=('4ddea9503a212ee126c5b46a0a958fd5484574c3cb6ef2baf38db02e819e58c6' -'76c078218e7c3e93691ddd4d7fd9f5c83d4862d0a0406d17b805f3106b50375d' -'ddf55a40a260dd00364b32b3200bd8a76e890070ea6267fbfb322907c0946ab2' -'be6f084a31229e8edfd6936005c6bb4f2d1548b777df5937923b4702f7a9ac19' +sha256sums=('1912b91803ab09a5eed34d364bf09fe3a2a9c96751fde03a4e0cfa51a04d784c' 'ee6b6e6f4975dad13a8c45f1c1f0547a99373bdecdcd6604bfc12965c328a028' 'bf1928718caa5df2b9e54a13cfd0f15a8fe0e09e86b84385ce023616a114e898' '567b78d8b4b4bbcb77c5f134d57bc503c34867fcc6341c0b01716bcaa4a21694' @@ -31,10 +25,6 @@ build() { cd GConf-$pkgver - # Upstream fixes from git - patch -Np1 -i $srcdir/gconf-dbus-fix-shutdown.patch - patch -Np1 -i $srcdir/gsettings-schema-convert-dont-fail.patch - patch -Np1 -i $srcdir/gconf-dbus-fix-use-after-free.patch # Patch from fedora - reloads gconf after installing schemas patch -Np1 -i $srcdir/gconf-reload.patch Deleted: gconf-dbus-fix-shutdown.patch === --- gconf-dbus-fix-shutdown.patch 2013-03-13 13:55:50 UTC (rev 179961) +++ gconf-dbus-fix-shutdown.patch 2013-03-13 14:27:22 UTC (rev 179962) @@ -1,34 +0,0 @@ -From 39299610083e0e7f9b44e62b7f4e51e89693cf89 Mon Sep 17 00:00:00 2001 -From: Ray Strode rstr...@redhat.com -Date: Tue, 06 Mar 2012 19:39:06 + -Subject: dbus: fix shutdown - -gconftool-2 wasn't properly shutting down gconfd, because -it was trying to do it before connecting to the daemon. - -This commit makes sure that we always first try to connect to -the daemon before asking it to shutdown. - -https://bugzilla.gnome.org/show_bug.cgi?id=671490 -diff --git a/gconf/gconf-dbus.c b/gconf/gconf-dbus.c -index 442a94b..f167fc5 100644 a/gconf/gconf-dbus.c -+++ b/gconf/gconf-dbus.c -@@ -2483,7 +2483,13 @@ gconf_shutdown_daemon (GError** err) - { - DBusMessage *message; - -- /* Don't want to spawn it if it's already down */ -+ /* If we haven't reached out to it yet, -+ * reach out now. -+ */ -+ if (global_conn == NULL) -+gconf_ping_daemon(); -+ -+ /* But we don't want to spawn it if it's already down */ - if (global_conn == NULL || !service_running) - return; - --- -cgit v0.9.0.2 Deleted: gconf-dbus-fix-use-after-free.patch === --- gconf-dbus-fix-use-after-free.patch 2013-03-13 13:55:50 UTC (rev 179961) +++ gconf-dbus-fix-use-after-free.patch 2013-03-13 14:27:22 UTC (rev 179962) @@ -1,99 +0,0 @@ -From 84884e9df7ce8c081a1c223c66a799b82545ff1e Mon Sep 17 00:00:00 2001 -From: Milan Crha mc...@redhat.com -Date: Thu, 18 Oct 2012 20:08:02 + -Subject: gconf-dbus: fix use after free - -gconf_engine_get_fuller is accessing freed memory. -The problem is that it's referencing strings that are owned -by a D-Bus message, and they go away when the D-Bus message is freed. - -This commit addresses the problem by duplicating the strings and -freeing them later. - -https://bugzilla.gnome.org/show_bug.cgi?id=667167 -diff --git a/gconf/gconf-dbus-utils.c b/gconf/gconf-dbus-utils.c -index 6fd5bfa..92f5980 100644 a/gconf/gconf-dbus-utils.c -+++ b/gconf/gconf-dbus-utils.c -@@ -569,11 +569,11 @@ gconf_dbus_utils_get_entry_values (DBusMessageIter *main_iter, - gchar **schema_name_p) - { - DBusMessageIter struct_iter; -- gchar *key; -+ const gchar *key; - GConfValue *value; -
[arch-commits] Commit in gconf/trunk (4 files)
Date: Wednesday, October 31, 2012 @ 05:23:21 Author: jgc Revision: 170050 upgpkg: gconf 3.2.5-3 Fix some bugs that upstream fixed upstream. Mainly a use-after-free bug that crashes Banshee Added: gconf/trunk/gconf-dbus-fix-shutdown.patch gconf/trunk/gconf-dbus-fix-use-after-free.patch gconf/trunk/gsettings-schema-convert-dont-fail.patch Modified: gconf/trunk/PKGBUILD --+ PKGBUILD | 13 +++ gconf-dbus-fix-shutdown.patch| 34 + gconf-dbus-fix-use-after-free.patch | 99 + gsettings-schema-convert-dont-fail.patch | 28 4 files changed, 173 insertions(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2012-10-31 09:09:59 UTC (rev 170049) +++ PKGBUILD2012-10-31 09:23:21 UTC (rev 170050) @@ -3,7 +3,7 @@ pkgname=gconf pkgver=3.2.5 -pkgrel=2 +pkgrel=3 pkgdesc=A configuration database system arch=(i686 x86_64) license=('LGPL') @@ -13,11 +13,17 @@ install=gconf.install url=http://www.gnome.org; source=(http://ftp.gnome.org/pub/gnome/sources/GConf/3.2/GConf-$pkgver.tar.xz +gconf-dbus-fix-use-after-free.patch +gconf-dbus-fix-shutdown.patch +gsettings-schema-convert-dont-fail.patch gconf-merge-schema gconfpkg gconf-reload.patch 01_xml-gettext-domain.patch) sha256sums=('4ddea9503a212ee126c5b46a0a958fd5484574c3cb6ef2baf38db02e819e58c6' +'76c078218e7c3e93691ddd4d7fd9f5c83d4862d0a0406d17b805f3106b50375d' +'ddf55a40a260dd00364b32b3200bd8a76e890070ea6267fbfb322907c0946ab2' +'be6f084a31229e8edfd6936005c6bb4f2d1548b777df5937923b4702f7a9ac19' 'ee6b6e6f4975dad13a8c45f1c1f0547a99373bdecdcd6604bfc12965c328a028' 'bf1928718caa5df2b9e54a13cfd0f15a8fe0e09e86b84385ce023616a114e898' '567b78d8b4b4bbcb77c5f134d57bc503c34867fcc6341c0b01716bcaa4a21694' @@ -25,6 +31,11 @@ build() { cd GConf-$pkgver + # Upstream fixes from git + patch -Np1 -i $srcdir/gconf-dbus-fix-shutdown.patch + patch -Np1 -i $srcdir/gsettings-schema-convert-dont-fail.patch + patch -Np1 -i $srcdir/gconf-dbus-fix-use-after-free.patch + # Patch from fedora - reloads gconf after installing schemas patch -Np1 -i $srcdir/gconf-reload.patch # http://bugzilla.gnome.org/show_bug.cgi?id=568845 Added: gconf-dbus-fix-shutdown.patch === --- gconf-dbus-fix-shutdown.patch (rev 0) +++ gconf-dbus-fix-shutdown.patch 2012-10-31 09:23:21 UTC (rev 170050) @@ -0,0 +1,34 @@ +From 39299610083e0e7f9b44e62b7f4e51e89693cf89 Mon Sep 17 00:00:00 2001 +From: Ray Strode rstr...@redhat.com +Date: Tue, 06 Mar 2012 19:39:06 + +Subject: dbus: fix shutdown + +gconftool-2 wasn't properly shutting down gconfd, because +it was trying to do it before connecting to the daemon. + +This commit makes sure that we always first try to connect to +the daemon before asking it to shutdown. + +https://bugzilla.gnome.org/show_bug.cgi?id=671490 +--- +diff --git a/gconf/gconf-dbus.c b/gconf/gconf-dbus.c +index 442a94b..f167fc5 100644 +--- a/gconf/gconf-dbus.c b/gconf/gconf-dbus.c +@@ -2483,7 +2483,13 @@ gconf_shutdown_daemon (GError** err) + { + DBusMessage *message; + +- /* Don't want to spawn it if it's already down */ ++ /* If we haven't reached out to it yet, ++ * reach out now. ++ */ ++ if (global_conn == NULL) ++gconf_ping_daemon(); ++ ++ /* But we don't want to spawn it if it's already down */ + if (global_conn == NULL || !service_running) + return; + +-- +cgit v0.9.0.2 Added: gconf-dbus-fix-use-after-free.patch === --- gconf-dbus-fix-use-after-free.patch (rev 0) +++ gconf-dbus-fix-use-after-free.patch 2012-10-31 09:23:21 UTC (rev 170050) @@ -0,0 +1,99 @@ +From 84884e9df7ce8c081a1c223c66a799b82545ff1e Mon Sep 17 00:00:00 2001 +From: Milan Crha mc...@redhat.com +Date: Thu, 18 Oct 2012 20:08:02 + +Subject: gconf-dbus: fix use after free + +gconf_engine_get_fuller is accessing freed memory. +The problem is that it's referencing strings that are owned +by a D-Bus message, and they go away when the D-Bus message is freed. + +This commit addresses the problem by duplicating the strings and +freeing them later. + +https://bugzilla.gnome.org/show_bug.cgi?id=667167 +--- +diff --git a/gconf/gconf-dbus-utils.c b/gconf/gconf-dbus-utils.c +index 6fd5bfa..92f5980 100644 +--- a/gconf/gconf-dbus-utils.c b/gconf/gconf-dbus-utils.c +@@ -569,11 +569,11 @@ gconf_dbus_utils_get_entry_values (DBusMessageIter *main_iter, + gchar **schema_name_p) + { + DBusMessageIter struct_iter; +- gchar *key; ++ const gchar *key; + GConfValue *value; + gboolean