Fix memory clobbering leading to outright crash on at least sparc and ia64

Package-Manager: portage-2.1.3.15

5 files changed, 123 insertions, 5 deletions

diff --git a/app-text/rarian/ChangeLog b/app-text/rarian/ChangeLog
index ece4e2f31367..2ad7b74f8113 100644
--- a/app-text/rarian/ChangeLog
+++ b/app-text/rarian/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/rarian
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/rarian/ChangeLog,v 1.7 2007/10/22 11:20:33 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/rarian/ChangeLog,v 1.8 2007/10/23 18:33:28 leio Exp $
+
+*rarian-0.6.0-r1 (23 Oct 2007)
+
+  23 Oct 2007; <leio@gentoo.org> +files/rarian-0.6.0-reg-return.patch,
+  +rarian-0.6.0-r1.ebuild:
+  Fix memory clobbering leading to outright crash on at least sparc and ia64
 
   22 Oct 2007; Raúl Porcel <armin76@gentoo.org> rarian-0.6.0.ebuild:
   Add ~alpha wrt #196360
diff --git a/app-text/rarian/Manifest b/app-text/rarian/Manifest
index 9e3f4c3514f5..b79b33d5c586 100644
--- a/app-text/rarian/Manifest
+++ b/app-text/rarian/Manifest
@@ -2,15 +2,23 @@ AUX rarian-0.6.0-posix-getopt.patch 1284 RMD160 6443e95fcdca98b2673cdcb4bfaed0dc
 MD5 9d77f2e6b41cb93522dc9677a029bd58 files/rarian-0.6.0-posix-getopt.patch 1284
 RMD160 6443e95fcdca98b2673cdcb4bfaed0dc3c9b5ea2 files/rarian-0.6.0-posix-getopt.patch 1284
 SHA256 374d0340c4241d9759fe538e857e685b1ee85d0a6de6c493da42ce34eb5f4c11 files/rarian-0.6.0-posix-getopt.patch 1284
+AUX rarian-0.6.0-reg-return.patch 1742 RMD160 67f19f8ef7907ab74e2fedbb702e01395d8dd72d SHA1 3ce654d23a3e9b9da6f8dad2511b4473892b78f8 SHA256 5553c36fb7c74873397e8e1b70f4c419f98d96bebf49950f878a357ee663345e
+MD5 037682c3d9668161fd15dfc4728be431 files/rarian-0.6.0-reg-return.patch 1742
+RMD160 67f19f8ef7907ab74e2fedbb702e01395d8dd72d files/rarian-0.6.0-reg-return.patch 1742
+SHA256 5553c36fb7c74873397e8e1b70f4c419f98d96bebf49950f878a357ee663345e files/rarian-0.6.0-reg-return.patch 1742
 DIST rarian-0.6.0.tar.bz2 312258 RMD160 167c02f58e493c624d0eedb1137928c7a7cc452a SHA1 7bf1fce5cc2bfd4584fb776d20d3a379e888b81a SHA256 2f169f3c794b2602d8590b1fd16c0aa5b7ca77e993f74b89c4f42db74c1d2029
+EBUILD rarian-0.6.0-r1.ebuild 963 RMD160 b45fb2726e4f56e64530615820f47d07a036556b SHA1 7dbc2a47217a4be85106fdc7e9139fc6e480a1b7 SHA256 5dec5a79f2db436b69f56d83f32b146a11f9a2bffc011ed3bd476b533c4c5bdb
+MD5 7081799ce1b9fe097d2a3180c1a6b08f rarian-0.6.0-r1.ebuild 963
+RMD160 b45fb2726e4f56e64530615820f47d07a036556b rarian-0.6.0-r1.ebuild 963
+SHA256 5dec5a79f2db436b69f56d83f32b146a11f9a2bffc011ed3bd476b533c4c5bdb rarian-0.6.0-r1.ebuild 963
 EBUILD rarian-0.6.0.ebuild 849 RMD160 ed7eda457456afc41e2f712c18a5a655d2a2ab80 SHA1 3ce11c0ed38b23234e86ca08f10e0fd45558259b SHA256 b196e869d8fa1d3ab71c2cffa3f5a75c4d7c34e3225fdcdf8749de795cff0ddd
 MD5 9f2b8940f2cef17ef7a661f95a748dc0 rarian-0.6.0.ebuild 849
 RMD160 ed7eda457456afc41e2f712c18a5a655d2a2ab80 rarian-0.6.0.ebuild 849
 SHA256 b196e869d8fa1d3ab71c2cffa3f5a75c4d7c34e3225fdcdf8749de795cff0ddd rarian-0.6.0.ebuild 849
-MISC ChangeLog 1056 RMD160 e38d7ecadeab0fc2eb56e2cdf4f277432cb5d483 SHA1 9358a23785c3ee8a8c29f81d4b09ad9128b106e5 SHA256 553708d6bccf6cce864ee1ef3a66c581c0ed83e80ab366f5ff4e10dadab317f0
-MD5 6a5ae69539159b8435640dd5acc0e9be ChangeLog 1056
-RMD160 e38d7ecadeab0fc2eb56e2cdf4f277432cb5d483 ChangeLog 1056
-SHA256 553708d6bccf6cce864ee1ef3a66c581c0ed83e80ab366f5ff4e10dadab317f0 ChangeLog 1056
+MISC ChangeLog 1261 RMD160 76a6373ad6b8eed956de0d36cfe3c186681a84e9 SHA1 8ceda73e11299604d072494766b10573c6fb28cf SHA256 454b6b801ae6c3645d6c735a8ed93ccf427d1bcca87e5904a0beb795b61d6b4c
+MD5 b7677f7cca500908d98472afddfbbbfe ChangeLog 1261
+RMD160 76a6373ad6b8eed956de0d36cfe3c186681a84e9 ChangeLog 1261
+SHA256 454b6b801ae6c3645d6c735a8ed93ccf427d1bcca87e5904a0beb795b61d6b4c ChangeLog 1261
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -18,3 +26,6 @@ SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 metadata
 MD5 87d55daf44dd5b4178f64a3d1102824c files/digest-rarian-0.6.0 241
 RMD160 73b5def62f7e00d57ab39d77b9f9fac5663c7b28 files/digest-rarian-0.6.0 241
 SHA256 4023cdce1a6d121f8daef2a5657fba44ffd13eb7f80edfbe0613db21baf70dae files/digest-rarian-0.6.0 241
+MD5 87d55daf44dd5b4178f64a3d1102824c files/digest-rarian-0.6.0-r1 241
+RMD160 73b5def62f7e00d57ab39d77b9f9fac5663c7b28 files/digest-rarian-0.6.0-r1 241
+SHA256 4023cdce1a6d121f8daef2a5657fba44ffd13eb7f80edfbe0613db21baf70dae files/digest-rarian-0.6.0-r1 241
diff --git a/app-text/rarian/files/digest-rarian-0.6.0-r1 b/app-text/rarian/files/digest-rarian-0.6.0-r1
new file mode 100644
index 000000000000..60868206e2a0
--- /dev/null
+++ b/app-text/rarian/files/digest-rarian-0.6.0-r1
@@ -0,0 +1,3 @@
+MD5 23772a3b0f882d13c86dd9fa67bb21bf rarian-0.6.0.tar.bz2 312258
+RMD160 167c02f58e493c624d0eedb1137928c7a7cc452a rarian-0.6.0.tar.bz2 312258
+SHA256 2f169f3c794b2602d8590b1fd16c0aa5b7ca77e993f74b89c4f42db74c1d2029 rarian-0.6.0.tar.bz2 312258
diff --git a/app-text/rarian/files/rarian-0.6.0-reg-return.patch b/app-text/rarian/files/rarian-0.6.0-reg-return.patch
new file mode 100644
index 000000000000..50bdf2d27480
--- /dev/null
+++ b/app-text/rarian/files/rarian-0.6.0-reg-return.patch
@@ -0,0 +1,61 @@
+Patch from comment #2 on https://bugs.freedesktop.org/show_bug.cgi?id=12279
+Fixes crash on sparc and ia64 and might fix weird issues on other arches as this is about memory clobbering
+
+--- rarian-0.6.0.old/librarian/rarian-reg-full.c	2007-10-16 16:33:02.685297000 +0100
++++ rarian-0.6.0/librarian/rarian-reg-full.c	2007-10-16 16:38:24.553412000 +0100
+@@ -59,6 +59,8 @@
+     reg->heritage    = NULL;
+     reg->lang = NULL;
+     reg->children = NULL;
++	
++	return (reg);
+ }
+ 
+ RrnRegFull *
+--- rarian-0.6.0.old/librarian/rarian-reg-utils.c	2007-10-16 16:33:02.683296000 +0100
++++ rarian-0.6.0/librarian/rarian-reg-utils.c	2007-10-16 16:38:43.173230000 +0100
+@@ -36,7 +36,7 @@
+ static void     process_sect_pair (RrnSect *sect, char *key, char *value);
+ static int      rrn_reg_add_sect (RrnReg *reg, RrnSect *sect);
+ static void     process_path (RrnReg *reg);
+-static char *   process_section_path (char *owner_path, RrnSect *section);
++static void     process_section_path (char *owner_path, RrnSect *section);
+ 
+ 
+ RrnReg *
+@@ -58,6 +58,8 @@
+     reg->lang = NULL;
+     reg->ghelp_name = NULL;
+     reg->children = NULL;
++
++	return (reg);
+ }
+ 
+ RrnReg *
+@@ -748,7 +750,7 @@
+ 
+ }
+ 
+-static char *
++static void
+ process_section_path (char *owner_path, RrnSect *section)
+ {
+ 	char *tmp = NULL;
+--- rarian-0.6.0.old/librarian/rarian-info.c	2007-10-16 16:33:02.684297000 +0100
++++ rarian-0.6.0/librarian/rarian-info.c	2007-10-16 16:37:02.125582000 +0100
+@@ -614,13 +614,13 @@
+       if (!section || (*section && l->reg->section && !strcmp (l->reg->section, section))) {
+ 	return l->reg;
+       } else {
+-	best_result = l->reg;
++	best_result = l;
+       }
+     }
+     l = l->next;
+   }
+   
+-  return best_result;
++  return best_result->reg;
+ 
+ }
+ 
diff --git a/app-text/rarian/rarian-0.6.0-r1.ebuild b/app-text/rarian/rarian-0.6.0-r1.ebuild
new file mode 100644
index 000000000000..92661079119a
--- /dev/null
+++ b/app-text/rarian/rarian-0.6.0-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/rarian/rarian-0.6.0-r1.ebuild,v 1.1 2007/10/23 18:33:28 leio Exp $
+
+inherit eutils gnome2
+
+DESCRIPTION="A documentation metadata library"
+HOMEPAGE="www.freedesktop.org"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="dev-libs/libxslt"
+DEPEND="${RDEPEND}
+	!<app-text/scrollkeeper-9999"
+
+DOCS="ChangeLog NEWS README"
+
+GCONF=""
+
+src_unpack() {
+	# You cannot run src_unpack from gnome2; it will break the install by
+	# calling gnome2_omf_fix
+	unpack ${A}
+	cd "${S}"
+
+	# Only GNU getopt supports long options
+	# Scrollkeeper didn't support them, so we'll punt them for now
+	epatch "${FILESDIR}/${P}-posix-getopt.patch"
+
+	# Fix memory clobbering leading to outright crash on sparc and ia64
+	epatch "${FILESDIR}/${P}-reg-return.patch"
+
+	elibtoolize ${ELTCONF}
+}