(fd.o #5970) Fix for a segfault bug caused by not properly initialising the

variant and option components to NULL when failing to get the RMLVO
component list from the server.
Package-Manager: portage-2.1_pre5-r4

diff --git a/x11-apps/setxkbmap/ChangeLog b/x11-apps/setxkbmap/ChangeLog
index abe57fd46b36f5e4562b353a980aa04aea3b0d25..5a7a60e654aa6cd92d60b6a2d1d8281752d110d5 100644 (file)
--- a/x11-apps/setxkbmap/ChangeLog
+++ b/x11-apps/setxkbmap/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-apps/setxkbmap
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/setxkbmap/ChangeLog,v 1.18 2006/03/09 14:00:36 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/setxkbmap/ChangeLog,v 1.19 2006/03/12 17:41:32 joshuabaergen Exp $
+
+*setxkbmap-1.0.2 (12 Mar 2006)
+
+  12 Mar 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  -setxkbmap-1.0.1.ebuild, +setxkbmap-1.0.2.ebuild:
+  (fd.o #5970) Fix for a segfault bug caused by not properly initialising the
+  variant and option components to NULL when failing to get the RMLVO
+  component list from the server.
 
   09 Mar 2006; Aron Griffis <agriffis@gentoo.org> setxkbmap-1.0.1.ebuild:
   Mark 1.0.1 ~ia64

diff --git a/x11-apps/setxkbmap/Manifest b/x11-apps/setxkbmap/Manifest
index 1f4cdf9ad508048140395024ff95f7ee0dcf4fd6..804207637bfb1055d4aa0a0af0d5f6750f11c5b1 100644 (file)
--- a/x11-apps/setxkbmap/Manifest
+++ b/x11-apps/setxkbmap/Manifest
@@ -1,22 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 e8aec4781cf991d9ffcc6d4cf1adc3a7 ChangeLog 2427
-RMD160 ab6406e28529126a4e4c21e7f58321196df00e92 ChangeLog 2427
-SHA256 a3913753dfb2a4df2ade2e76cb6704afc95c603a87985d08b9cbbdc29c9c9738 ChangeLog 2427
-MD5 1010cb8b45e43ed1209176453dd7d37e files/digest-setxkbmap-1.0.1 247
-RMD160 6b37d40a5b9f5f8cd76681cc000912b9c85eb402 files/digest-setxkbmap-1.0.1 247
-SHA256 a9ce1d0fc21cbed13681e606ee6d87184ec70ce331536888e3ece02ddffe4456 files/digest-setxkbmap-1.0.1 247
+MD5 ff11a8cc88b0724a99d8ca4f68610324 ChangeLog 2756
+RMD160 f5bfd88e3d0a39d3745238f2c6d4aff7f1318a92 ChangeLog 2756
+SHA256 7ba7f5b59e09a33b3f86fc5c846b0b489d0f4c08e2b773ff4585f2b01d73d843 ChangeLog 2756
+MD5 18a99120b1c08c9a2e7a6ad0dd51f6b4 files/digest-setxkbmap-1.0.2 247
+RMD160 d549dcc5aa7b15910d518036475146919299d060 files/digest-setxkbmap-1.0.2 247
+SHA256 b1709b18f0bbf6eeef409025c45a315733e36a75cf429dfbc821e8b210dbdcd7 files/digest-setxkbmap-1.0.2 247
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 metadata.xml 156
-MD5 21e2302946b72d7242e7161166e60732 setxkbmap-1.0.1.ebuild 513
-RMD160 d97b0447200bc963064b3dc36f5716069ba920eb setxkbmap-1.0.1.ebuild 513
-SHA256 0e417a76abee2acf14cdedbed30ac59f0082eb3178ff5f06b29da07f04c6d435 setxkbmap-1.0.1.ebuild 513
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFEEDUOJrHF4yAQTrARAsa7AJ9FOJN74PAPRl3pCe/gSFF0RsnCsACfdbOJ
-Kz2gC6b/LDkBS8Vd5D4jbqo=
-=8Cj1
------END PGP SIGNATURE-----
+MD5 7f0604b10743b79a8b8ce503fa37ae6d setxkbmap-1.0.2.ebuild 518
+RMD160 d2ade84efc4602a0b4f90e265aa621c1b06e4bc6 setxkbmap-1.0.2.ebuild 518
+SHA256 e1770c3591bc8388dfacdc0581df7e588accda411b0ba14645801221f1fc6fa6 setxkbmap-1.0.2.ebuild 518

diff --git a/x11-apps/setxkbmap/files/digest-setxkbmap-1.0.1 b/x11-apps/setxkbmap/files/digest-setxkbmap-1.0.1
deleted file mode 100644 (file)
index 0ef216f..0000000
--- a/x11-apps/setxkbmap/files/digest-setxkbmap-1.0.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 cfea4f25b13ea2976132a1247f68b4b6 setxkbmap-1.0.1.tar.bz2 80211
-RMD160 2ff05d4972cf0f435d32496e5a342a974d4d72cd setxkbmap-1.0.1.tar.bz2 80211
-SHA256 68fba99693aeb6c1cb42833a0334ff7f7ba0243e2bb65f8798f1b19b269e3cb3 setxkbmap-1.0.1.tar.bz2 80211

diff --git a/x11-apps/setxkbmap/files/digest-setxkbmap-1.0.2 b/x11-apps/setxkbmap/files/digest-setxkbmap-1.0.2
new file mode 100644 (file)
index 0000000..fadd09c
--- /dev/null
+++ b/x11-apps/setxkbmap/files/digest-setxkbmap-1.0.2
@@ -0,0 +1,3 @@
+MD5 0316b2ab6fea88ed76d231c3b47544d8 setxkbmap-1.0.2.tar.bz2 84415
+RMD160 f7255ac192ae0e443c8b9e673f1f7b12f15eb3c7 setxkbmap-1.0.2.tar.bz2 84415
+SHA256 222ce5404e1b7537f2ab740ba62e14ea322fb8d4413ca5a065248fa22dcb9c52 setxkbmap-1.0.2.tar.bz2 84415

diff --git a/x11-apps/setxkbmap/setxkbmap-1.0.1.ebuild b/x11-apps/setxkbmap/setxkbmap-1.0.2.ebuild
similarity index 88%
rename from x11-apps/setxkbmap/setxkbmap-1.0.1.ebuild
rename to x11-apps/setxkbmap/setxkbmap-1.0.2.ebuild
index e5d18c474699137750bd7f6626323b81e3c22455..3be49612324ddeb0c38336b8d5ed20aa72787b26 100644 (file)
--- a/x11-apps/setxkbmap/setxkbmap-1.0.1.ebuild
+++ b/x11-apps/setxkbmap/setxkbmap-1.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/setxkbmap/setxkbmap-1.0.1.ebuild,v 1.6 2006/03/09 14:00:36 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/setxkbmap/setxkbmap-1.0.2.ebuild,v 1.1 2006/03/12 17:41:32 joshuabaergen Exp $
 
 # Must be before x-modular eclass is inherited
 # SNAPSHOT="yes"