diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-05-28 02:44:47 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-05-28 02:44:47 -0300 |
commit | c3b94090a6330f678ade2f767e76ab7802d3463e (patch) | |
tree | e3d2321dce46bfdbc070fcee19e2852566510fe8 /extra/libgnome-keyring | |
parent | 652c41cc5fd8dc5f23ef6a6c93f488911e1054c7 (diff) | |
parent | 33feb015eb09eee76827f359e685fce981d88111 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/chmsee/PKGBUILD
community/flumotion/PKGBUILD
community/gnash/PKGBUILD
community/kadu/PKGBUILD
community/mythplugins/PKGBUILD
community/performous/PKGBUILD
community/sleuthkit/PKGBUILD
community/virtualbox/PKGBUILD
community/wbar/PKGBUILD
core/attr/PKGBUILD
core/binutils/PKGBUILD
core/heimdal/PKGBUILD
core/sqlite3/PKGBUILD
extra/acpid/PKGBUILD
extra/apache-ant/PKGBUILD
extra/aria2/PKGBUILD
extra/boost/PKGBUILD
extra/bs/PKGBUILD
extra/bzr/PKGBUILD
extra/cvsps/PKGBUILD
extra/dosbox/PKGBUILD
extra/ettercap-gtk/PKGBUILD
extra/fetchmail/PKGBUILD
extra/gnome-desktop-sharp/PKGBUILD
extra/gnome-panel/PKGBUILD
extra/gptfdisk/PKGBUILD
extra/gqmpeg/PKGBUILD
extra/gstreamer0.10-base/PKGBUILD
extra/gstreamer0.10-ugly/PKGBUILD
extra/gtk-theme-switch2/PKGBUILD
extra/icecast/PKGBUILD
extra/kdeedu/PKGBUILD
extra/kmldonkey/PKGBUILD
extra/kmplayer/PKGBUILD
extra/libbtctl/PKGBUILD
extra/libftdi/PKGBUILD
extra/liborigin2/PKGBUILD
extra/libpst/PKGBUILD
extra/libx86/PKGBUILD
extra/lsdvd/PKGBUILD
extra/mc/PKGBUILD
extra/monotone/PKGBUILD
extra/multitail/PKGBUILD
extra/nbsmtp/PKGBUILD
extra/nickle/PKGBUILD
extra/nppangband/PKGBUILD
extra/numlockx/PKGBUILD
extra/pidgin/PKGBUILD
extra/poppler/PKGBUILD
extra/python-gtkglext/PKGBUILD
extra/scim/PKGBUILD
extra/socat/PKGBUILD
extra/speedcrunch/PKGBUILD
extra/transmission/PKGBUILD
extra/vbetool/PKGBUILD
extra/vlc/PKGBUILD
extra/xchat-gnome/xchat-gnome.install
libre/kernel26-libre/PKGBUILD
libre/pacman/PKGBUILD
libre/xchat-gnome-libre/PKGBUILD
libre/xchat-gnome-libre/gtk2-2.20.patch
libre/xchat-gnome-libre/xchat-gnome-0.26.1-deprecated-symbol.patch
libre/xchat-gnome-libre/xchat-gnome.install
multilib/nspluginwrapper/PKGBUILD
testing/libgweather/libgweather.install
testing/mesa/PKGBUILD
Diffstat (limited to 'extra/libgnome-keyring')
-rw-r--r-- | extra/libgnome-keyring/PKGBUILD | 6 | ||||
-rw-r--r-- | extra/libgnome-keyring/fix_crash.patch | 35 |
2 files changed, 38 insertions, 3 deletions
diff --git a/extra/libgnome-keyring/PKGBUILD b/extra/libgnome-keyring/PKGBUILD index 158699992..fa4540a1a 100644 --- a/extra/libgnome-keyring/PKGBUILD +++ b/extra/libgnome-keyring/PKGBUILD @@ -1,8 +1,8 @@ -#$Id: PKGBUILD 120579 2011-04-25 17:26:49Z ibiru $ +#$Id: PKGBUILD 125537 2011-05-26 16:32:57Z ibiru $ #Maintainer: Jan De Groot <jgc@archlinux.org> pkgname=libgnome-keyring -pkgver=3.0.1 +pkgver=3.0.3 pkgrel=1 pkgdesc="GNOME keyring client library" arch=(i686 x86_64 'mips64el') @@ -12,7 +12,7 @@ makedepends=('intltool' 'pkgconfig') options=('!libtool' '!emptydirs') url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('9d748842dab86914488bef039ca2c25f8ff5510daae3815643e6e00a2f69cacb') +sha256sums=('a0cc08bcd431070d3f01c2741903c2bd8b0231ee73de709d28e722e28575fdf8') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/libgnome-keyring/fix_crash.patch b/extra/libgnome-keyring/fix_crash.patch new file mode 100644 index 000000000..1e28cdb73 --- /dev/null +++ b/extra/libgnome-keyring/fix_crash.patch @@ -0,0 +1,35 @@ +From 9bcac748b54e00836715b0f70be26b7cbdc8c888 Mon Sep 17 00:00:00 2001 +From: Martin Pitt <martin.pitt@ubuntu.com> +Date: Mon, 23 May 2011 08:58:49 +0000 +Subject: Fix crash from recent memleak fix (b49e32b) + +make_attribute_list_va() statically copies the caller's method arguments into +the GnomeKeyringAttributeList, so we must only free the array itself, not the +GnomeKeyringAttribute strings. + +Bug: https://bugzilla.gnome.org/show_bug.cgi?id=650840 +--- +diff --git a/library/gnome-keyring.c b/library/gnome-keyring.c +index dc271dd..4febf47 100644 +--- a/library/gnome-keyring.c ++++ b/library/gnome-keyring.c +@@ -2443,7 +2443,7 @@ gnome_keyring_find_itemsv (GnomeKeyringItemType type, + va_end (args); + + ret = gnome_keyring_find_items (type, attributes, callback, data, destroy_data); +- gnome_keyring_attribute_list_free (attributes); ++ g_array_free (attributes, TRUE); + return ret; + } + +@@ -2520,7 +2520,7 @@ gnome_keyring_find_itemsv_sync (GnomeKeyringItemType type, + va_end (args); + + ret = gnome_keyring_find_items_sync (type, attributes, found); +- gnome_keyring_attribute_list_free (attributes); ++ g_array_free (attributes, TRUE); + return ret; + } + +-- +cgit v0.9 |