summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gnome-extra/gnome-screensaver/ChangeLog11
-rw-r--r--gnome-extra/gnome-screensaver/Manifest12
-rw-r--r--gnome-extra/gnome-screensaver/files/gnome-screensaver-2.24.1-pixmap-leak.patch14
-rw-r--r--gnome-extra/gnome-screensaver/gnome-screensaver-2.24.1-r1.ebuild (renamed from gnome-extra/gnome-screensaver/gnome-screensaver-2.24.0.ebuild)11
4 files changed, 38 insertions, 10 deletions
diff --git a/gnome-extra/gnome-screensaver/ChangeLog b/gnome-extra/gnome-screensaver/ChangeLog
index cfc4ad09f408..3b0fa3e3d251 100644
--- a/gnome-extra/gnome-screensaver/ChangeLog
+++ b/gnome-extra/gnome-screensaver/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for gnome-extra/gnome-screensaver
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/ChangeLog,v 1.87 2008/11/30 12:10:01 eva Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/ChangeLog,v 1.88 2009/01/29 21:38:54 eva Exp $
+
+*gnome-screensaver-2.24.1-r1 (29 Jan 2009)
+
+ 29 Jan 2009; Gilles Dartiguelongue <eva@gentoo.org>
+ +files/gnome-screensaver-2.24.1-pixmap-leak.patch,
+ -gnome-screensaver-2.24.0.ebuild, +gnome-screensaver-2.24.1-r1.ebuild:
+ Bump to 2.24.1-r1. Fix pixmap leak, bug #253581.
30 Nov 2008; Gilles Dartiguelongue <eva@gentoo.org>
-files/gnome-screensaver-CVE-2008-0887.patch,
diff --git a/gnome-extra/gnome-screensaver/Manifest b/gnome-extra/gnome-screensaver/Manifest
index 8288cbca6224..54ec648d1fe9 100644
--- a/gnome-extra/gnome-screensaver/Manifest
+++ b/gnome-extra/gnome-screensaver/Manifest
@@ -3,19 +3,19 @@ Hash: SHA1
AUX gnome-screensaver-2.20.0-fix-gamma.patch 1637 RMD160 1bda5b646edb2b38218c93ac05b6f592e1366bca SHA1 243191a5c59be9badbba440ef364483a83d69fae SHA256 20c5afb7c058e1a4acf308eee466bbf81fb01e2df9a238fc48b0e89384521005
AUX gnome-screensaver-2.22.2-fix-copy-themes-include.patch 566 RMD160 ebcac26112014e9465a6b706d40ab345f1c40c73 SHA1 9d05b510248f71c3deee0cb98225eaed1f1d0f2e SHA256 bee314d9a2a6c0e7fdd7fd2c26ea7c8d8525e6fe14283e3db47ad34cc868f95a
+AUX gnome-screensaver-2.24.1-pixmap-leak.patch 575 RMD160 87e26737ce5d93414987ea69f158c14864971be5 SHA1 c8d183c584a253c7bbbe4260a5b9e0fad01db9b8 SHA256 8406021577855a7abcb5b8c986a8b8221cedacb10de716e1f7d7028711b3aeff
AUX xss-conversion-2.txt 1026 RMD160 5a1810d1f41999907ff39adf0e6396d1d6f5c5d7 SHA1 477743e8fd025cff16c1b2ed538a57ce9550a9cf SHA256 f1bcc5e85d45e53e6170d0cdf25dd3d10020aeef545cf2fdea5e3b4b30ec86c8
DIST gnome-screensaver-2.22.2.tar.bz2 2042396 RMD160 91f57c339fdc025588101b7fbab4d5095d392f0b SHA1 473b00fc6306742ada4e89520c991c31d1f79984 SHA256 a686d41f8623dbfc56c2c0bab5517a6380f538ed6ef7478ca51cfb9062e9f15b
-DIST gnome-screensaver-2.24.0.tar.bz2 2058094 RMD160 34d418258a65325b97ae7a46c32b987ad3566709 SHA1 ed7871c8a004801717e6a7897b07b80386256ce8 SHA256 ca79b46000f0ce76e9e2c97b59bffbc1e2ef7db83d77cdc9fdf38ab050d6a480
DIST gnome-screensaver-2.24.1.tar.bz2 2058780 RMD160 14744c9eb5b139691e9fc33256e9093ae605bd6d SHA1 36cbdc1d614200a85391795fe8e3c3b827f792df SHA256 c8cf26fc1d402269b7030abadfdf2c6103391cf30466b3d30bc99671f4c89f7e
EBUILD gnome-screensaver-2.22.2.ebuild 3164 RMD160 e8ece743c022e8b8c6eceee1442f1f95def06b85 SHA1 baf9b502601d55138998835033f028fbc1ba726c SHA256 cf52f8dbbe6ac83d298f57c74252f5ae7ef15b1a3b0d7a149e03a09a69c18159
-EBUILD gnome-screensaver-2.24.0.ebuild 2831 RMD160 1cd6b964617f32658600cc25f39af084e0750f56 SHA1 41520bff824ecbd8c22a41bd30245baaa49497bf SHA256 91c3848da86d6cdf58b482104a93373fe001c71e4c38ada51723fa22218a46a5
+EBUILD gnome-screensaver-2.24.1-r1.ebuild 2944 RMD160 1fabcddad789f0bbd1eb48cbc49b9c8179b7e256 SHA1 d79decf2d0913f2771ec7b714dfe6d28579377a3 SHA256 2618076c1ba7d8c56f2307c6da4716ffd84df9c3bae903b186e6303ebcb0887d
EBUILD gnome-screensaver-2.24.1.ebuild 2831 RMD160 fa1b6d122aa9e30c1fc0fb0f49f3f0e7ba1d70e1 SHA1 272d400b1a21ffa8c5fb2d410d85cc452451a549 SHA256 d98f3fb36495172a80904e6396cbc48fc6229f6dcd3a090e3c50a601aa5941ce
-MISC ChangeLog 13952 RMD160 982a8009ffdfcd947f5404fa37edcae991a1dad9 SHA1 7a27fb3d28932773c2ea75c753ceff067ef058ed SHA256 15e88267e231421a63b82b862384383b37a46cff9c29a2adafb827df3bf52577
+MISC ChangeLog 14228 RMD160 38389d753206c8537e81dab2cb4639eb33da5d90 SHA1 88b7ab296f368e5a36f2c5b6ed9b1f774a6243d2 SHA256 4c6a8615d4f8e351fba662684d57c1ad5cd13545c715d7100b110b03b7972644
MISC metadata.xml 472 RMD160 3fe1221d0cb389cf1be040c98fa9c40dbf3c07e5 SHA1 18913172dba9d94ca5952b7f8bfb2aa13808bb67 SHA256 e70be8f69acbda81bd1e90c1bd3a57a0b5ccb5fa09c7a6f04427ef888e1872bc
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.9 (GNU/Linux)
-iEYEARECAAYFAkkygp8ACgkQ1fmVwcYIWAa/1QCfU0xrJ53bBiiSfpyw+gHFtqU4
-PgcAoI16T3StoOU6FTBFRbTNO5nW0IaT
-=arlP
+iEYEARECAAYFAkmCMAYACgkQ1fmVwcYIWAa2UwCfQIFqwaKTvlQiiiZHk6y1LMV9
+pdUAn3wMRRQqdOoZzFU8Z1C3aJoQvyz8
+=v1kU
-----END PGP SIGNATURE-----
diff --git a/gnome-extra/gnome-screensaver/files/gnome-screensaver-2.24.1-pixmap-leak.patch b/gnome-extra/gnome-screensaver/files/gnome-screensaver-2.24.1-pixmap-leak.patch
new file mode 100644
index 000000000000..b64077fe6db4
--- /dev/null
+++ b/gnome-extra/gnome-screensaver/files/gnome-screensaver-2.24.1-pixmap-leak.patch
@@ -0,0 +1,14 @@
+diff -up gnome-screensaver-2.25.1/src/gs-window-x11.c.pixmap-leak gnome-screensaver-2.25.1/src/gs-window-x11.c
+--- gnome-screensaver-2.25.1/src/gs-window-x11.c.pixmap-leak 2008-12-14 22:16:01.000000000 -0500
++++ gnome-screensaver-2.25.1/src/gs-window-x11.c 2008-12-14 22:16:34.000000000 -0500
+@@ -2287,6 +2287,10 @@ gs_window_finalize (GObject *object)
+
+ gs_window_dialog_finish (window);
+
++ if (window->priv->background_pixmap) {
++ g_object_unref (window->priv->background_pixmap);
++ }
++
+ G_OBJECT_CLASS (gs_window_parent_class)->finalize (object);
+ }
+
diff --git a/gnome-extra/gnome-screensaver/gnome-screensaver-2.24.0.ebuild b/gnome-extra/gnome-screensaver/gnome-screensaver-2.24.1-r1.ebuild
index 6e1735bb0e86..7c25ebc716a3 100644
--- a/gnome-extra/gnome-screensaver/gnome-screensaver-2.24.0.ebuild
+++ b/gnome-extra/gnome-screensaver/gnome-screensaver-2.24.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/gnome-screensaver-2.24.0.ebuild,v 1.2 2008/11/30 12:10:01 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/gnome-screensaver-2.24.1-r1.ebuild,v 1.1 2009/01/29 21:38:54 eva Exp $
inherit eutils gnome2
@@ -60,6 +60,13 @@ pkg_setup() {
--with-xscreensaverhackdir=/usr/lib/misc/xscreensaver"
}
+src_unpack() {
+ gnome2_src_unpack
+
+ # fix bug #253581
+ epatch "${FILESDIR}/${PN}-2.24.1-pixmap-leak.patch"
+}
+
src_install() {
gnome2_src_install