Fix buffer overflow wrt bug 339901. Thanks to Diego for the report. Respect CC. Drop old. Add explicit RDEPEND.

Package-Manager: portage-2.2_rc90/cvs/Linux x86_64

6 files changed, 43 insertions, 96 deletions

diff --git a/sci-astronomy/xephem/ChangeLog b/sci-astronomy/xephem/ChangeLog
index 252cdfc4474c..d66235f90b99 100644
--- a/sci-astronomy/xephem/ChangeLog
+++ b/sci-astronomy/xephem/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-astronomy/xephem
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/xephem/ChangeLog,v 1.33 2010/10/10 21:13:34 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/xephem/ChangeLog,v 1.34 2010/10/11 20:35:38 xarthisius Exp $
+
+*xephem-3.7.4-r1 (11 Oct 2010)
+
+  11 Oct 2010; Kacper Kowalik <xarthisius@gentoo.org> -xephem-3.7.2.ebuild,
+  xephem-3.7.3.ebuild, -xephem-3.7.4.ebuild, +xephem-3.7.4-r1.ebuild,
+  +files/xephem-3.7.4-overflows.patch:
+  Fix buffer overflow wrt bug 339901. Thanks to Diego for the report.
+  Respect CC. Drop old. Add explicit RDEPEND.
 
   10 Oct 2010; Ulrich Mueller <ulm@gentoo.org> xephem-3.7.2.ebuild,
   xephem-3.7.3.ebuild, xephem-3.7.4.ebuild:
diff --git a/sci-astronomy/xephem/Manifest b/sci-astronomy/xephem/Manifest
index 52a084c2e5ec..2907b4d860f2 100644
--- a/sci-astronomy/xephem/Manifest
+++ b/sci-astronomy/xephem/Manifest
@@ -4,18 +4,19 @@ Hash: SHA1
 AUX 3.7.2.patch 1290 RMD160 e1f2e66a1b417b2fb66a3c13e74760d8f87977f5 SHA1 5d49ec0a316943287a94ad473778b56db02bf7f2 SHA256 c314c3f969eb13cf2151c4698e0721cebe714e62263d15dc3a7406daecf94a35
 AUX xephem-3.7.3-use-system-lib.patch 1422 RMD160 41c21f86dc207bc2bd1d236ece2f761c20332053 SHA1 7071c0e2262f052a9525783822b0a0cfaed98478 SHA256 6520076d6f201e05d3c5285a6bf58b859363bd0fdfc653b09c93769c57a44746
 AUX xephem-3.7.4-libs-flags.patch 5206 RMD160 4922f41df431aa70de891bc59149fc2536645133 SHA1 bd332a0dc2524f6c02fbe030ece30a7f99a612b9 SHA256 ae5eebb288daa710cceb19e2e5d52307137b1f190095387915ed8bc33c5f575d
-DIST xephem-3.7.2.tar.gz 19369598 RMD160 585ed51d167869919b512561714d380c83db8865 SHA1 8027f73e934e257316d15c474c88d435241c521d SHA256 51697f36e08000fc5f8f5e5edc570f82c92d0b323331291877814410396d0354
+AUX xephem-3.7.4-overflows.patch 426 RMD160 9c827b0816f2b425489be9a8fcad548967a5712d SHA1 8648c484569d2c90ce554207691c1aad0fc9d8d6 SHA256 89591dd616340a114e951a7d7c6661bc4379a8da7ec821bd5a29e60d4186fd8f
 DIST xephem-3.7.3.tar.gz 22148450 RMD160 d292a30cd6acbdd5dabf345aefd34b596534ce68 SHA1 b19c528097f7357e90a18bc605128eca9394b748 SHA256 450fa05a36ce4c8ceca80bd5a003c060bc4d9e07719aebcb13565b563b90e337
 DIST xephem-3.7.4.tar.gz 22154575 RMD160 96684e4b3afc445389ace82cbb200a0b7095852a SHA1 ea5859614381099ca3e9bc28930fd913dfd44926 SHA256 423b044d4a6433c62e493b891a7eb8aa332bc86d113069347945e4331d322726
-EBUILD xephem-3.7.2.ebuild 2287 RMD160 6d2db06faaf96c592b8afcccc59987779efbbafc SHA1 be4298d9b0cc280d42ffdcf76f1562105016edca SHA256 6ae87831367907f5b522c02560ff042f88d0887f02d9214068ffb0bdd18c22b4
-EBUILD xephem-3.7.3.ebuild 2379 RMD160 52f31b8af4bed241ae5e7023411fa5a4838c3016 SHA1 a655274e7db8a955e126458b2f15a8ca8c960c9d SHA256 f3b7e49b186dbe106501e8c3acc9e0ada80434794d64adf67e8f216ae35d7b01
-EBUILD xephem-3.7.4.ebuild 2002 RMD160 35c0f2d6d35ee9b6173b0b4cc5a5afdf3dda95f8 SHA1 4ee30ef9684663a7d8065a7d7c67ea4253284ee9 SHA256 0cd58ccfa9eff12fa2808f8de528bebddaccd02ce04a081e1c93045517a7b7c5
-MISC ChangeLog 7390 RMD160 100b6044a10168772cd4706061ec7be786ac748c SHA1 603ce1655d1b8206fd79fccd58abcade344ab88e SHA256 f0d1a67b16c11131079ad570ef3a20a7fb316d84617dbacb97e464cecdd728e1
+EBUILD xephem-3.7.3.ebuild 2406 RMD160 69880ad160813d99392745bbcac5762441c0d381 SHA1 972f678483e8c6d5bca3da4c3a33cf26f42776ec SHA256 efcf025ed381cff43bd971bafd56a6365c1d2e47d5d224d0f2b55648f6b05c00
+EBUILD xephem-3.7.4-r1.ebuild 2098 RMD160 ecda8d5dd97a3d6f00b9821c931afbd77f793a9d SHA1 272816b2820209c7c5badee4714449b716188dbe SHA256 2d702c2e2fed63efc4a3244ab023f3820fec37485ff86a083f0432a102cbc605
+MISC ChangeLog 7731 RMD160 f564ef184bdbd2d6fdd78a37f3fc72802c79b232 SHA1 fc7fb4fd8521e885058621a4b2665c1f94e5796f SHA256 78ea152035aabc11435cefc5c13e414e17184faa2b59b1d46e87f7cc129fff13
 MISC metadata.xml 619 RMD160 cfbd2b52291d0421faa2f96ac76671dbe072ba43 SHA1 38fb2c164ba78e788976b9550ad31c193294a81c SHA256 ef6a860f84a8c9bab7d5b4395c61bd1ab31c7a979d46d3c770a92d396fd47559
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkyyLPEACgkQOeoy/oIi7uxdnACgt/vVSwlgPHTRED3kp+Nd4cWQ
-45sAnRBfjTz3Wl50DnFk5Gl0jSgga0LR
-=7Eda
+iJwEAQECAAYFAkyzdSQACgkQIiMqcbOVdxQ49wP+Lm9h6hfZ2dzU7Dr1XvVwVZdp
+QBMOjhbUsLTpN9Iepa7LR+KAQEVBV3HfLd6f/c3iQZjsR578xj+BxKJzhiTQ0+Pz
+e8djEsickiSoCMizQx++fqAIXM4/vdHtU4KMtWWLRfkAQ8DwgwaGMrURBd0O+FQc
+6+MzVAHiYybpDE1DuW8=
+=KVgX
 -----END PGP SIGNATURE-----
diff --git a/sci-astronomy/xephem/files/xephem-3.7.4-overflows.patch b/sci-astronomy/xephem/files/xephem-3.7.4-overflows.patch
new file mode 100644
index 000000000000..2dd5e55c3696
--- /dev/null
+++ b/sci-astronomy/xephem/files/xephem-3.7.4-overflows.patch
@@ -0,0 +1,15 @@
+Fix buffer overflow
+
+http://bugs.gentoo.org/show_bug.cgi?id=339901
+
+--- GUI/xephem/tools/lx200xed/liblx200.c
++++ GUI/xephem/tools/lx200xed/liblx200.c
+@@ -855,7 +855,7 @@
+      return(LX200_FALSE);  /*Probably ought to verify all characters are acceptable*/
+    szCmd[1]='L' + iSite;
+    szCmd[2]='\0';
+-   snprintf(szSite,6,"%3s",buf);
++   snprintf(szSite,4,"%3s",buf);
+    return(lx200_set_generic(fd,szCmd,szSite));   
+ }
+ 
diff --git a/sci-astronomy/xephem/xephem-3.7.2.ebuild b/sci-astronomy/xephem/xephem-3.7.2.ebuild
deleted file mode 100644
index 2d4279e4b381..000000000000
--- a/sci-astronomy/xephem/xephem-3.7.2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/xephem/xephem-3.7.2.ebuild,v 1.11 2010/10/10 21:13:34 ulm Exp $
-
-EAPI=1
-
-inherit eutils
-
-DESCRIPTION="Interactive tool for astronomical ephemeris and sky simulation"
-SRC_URI="http://www.clearskyinstitute.com/xephem/${P}.tar.gz"
-HOMEPAGE="http://www.clearskyinstitute.com/xephem"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
-IUSE=""
-SLOT="0"
-LICENSE="as-is"
-DEPEND="!media-gfx/feh
-	>=x11-libs/openmotif-2.3:0"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${PV}.patch"
-	for i in libastro/Makefile libip/Makefile libjpegd/Makefile \
-		liblilxml/Makefile GUI/xephem/Makefile GUI/xephem/tools/*/Makefile ; do
-		einfo "Fixing CFLAGS in ${i}"
-		sed -e "s~^CFLAGS[ ]*=\(.*\)-O2\(.*\)~CFLAGS= \1 \2 ${CFLAGS}~" \
-			-i ${i} \
-			|| die "sed failed"
-	done
-	sed -e 's~^CFLAGS[ ]*=\(.*\)$(CLDFLAGS)\(.*\)~CFLAGS=\1 \2~' \
-		-i GUI/xephem/Makefile \
-		|| die "sed in GUI/xephem failed"
-}
-
-src_compile() {
-
-	cd libastro
-	emake || die "emake failed"
-	local myldflags
-	cd "${S}"
-	for dir in libip liblilxml libjpegd GUI/xephem/tools/* GUI/xephem; do
-		echo "going into ${dir}"
-		cd "${S}"/${dir}
-		if [ ${dir:0:3} = "lib" ]; then
-			myldflags=""
-		else
-			myldflags="${CLDFLAGS}"
-		fi
-		emake \
-			MOTIFI="/usr/include" \
-			MOTIFL="/usr/$(get_libdir)" \
-			CLDFLAGS="${myldflags}" \
-			|| die "emake in ${dir} failed"
-	done
-}
-
-src_install() {
-
-	into /usr
-	cd "${S}"/GUI/xephem
-	dobin xephem  || die "dobin xephem failed"
-	for file in tools/indi/{evalINDI,getINDI,setINDI,tmount,ota,wx,cam,security,indiserver} \
-		tools/{lx200xed/lx200xed,xedb/xedb,xephemdbd/xephemdbd}; do
-		dobin ${file} || die "dobin ${file} failed"
-	done
-	doman xephem.1 tools/*/*.1
-	mv tools .. # do not install tool sources into share directory
-	for i in $(find . -mindepth 1 -type d); do
-		insinto /usr/share/${PN}/${i}
-		doins ${i}/*
-	done
-
-	echo > "${S}/XEphem" "XEphem.ShareDir: /usr/share/${PN}"
-	insinto /usr/share/X11/app-defaults
-	has_version '<x11-base/xorg-x11-7.0' && \
-		insinto /etc/X11/app-defaults
-	doins "${S}"/XEphem
-
-	cd "${S}"
-	dodoc Copyright README INSTALL
-	newicon GUI/xephem/XEphem.png ${PN}.png
-	make_desktop_entry xephem XEphem ${PN}
-}
diff --git a/sci-astronomy/xephem/xephem-3.7.3.ebuild b/sci-astronomy/xephem/xephem-3.7.3.ebuild
index 46b6f40aa68f..041fb5553ca4 100644
--- a/sci-astronomy/xephem/xephem-3.7.3.ebuild
+++ b/sci-astronomy/xephem/xephem-3.7.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/xephem/xephem-3.7.3.ebuild,v 1.10 2010/10/10 21:13:34 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/xephem/xephem-3.7.3.ebuild,v 1.11 2010/10/11 20:35:38 xarthisius Exp $
 
 EAPI=1
 
@@ -16,6 +16,7 @@ LICENSE="as-is"
 DEPEND=">=x11-libs/openmotif-2.3:0
 	media-libs/jpeg
 	media-libs/libpng"
+RDEPEND="${DEPEND}"
 
 src_unpack() {
 	unpack ${A}
diff --git a/sci-astronomy/xephem/xephem-3.7.4.ebuild b/sci-astronomy/xephem/xephem-3.7.4-r1.ebuild
index bf585c55d02b..72356ccc9f44 100644
--- a/sci-astronomy/xephem/xephem-3.7.4.ebuild
+++ b/sci-astronomy/xephem/xephem-3.7.4-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/xephem/xephem-3.7.4.ebuild,v 1.2 2010/10/10 21:13:34 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/xephem/xephem-3.7.4-r1.ebuild,v 1.1 2010/10/11 20:35:38 xarthisius Exp $
 
 EAPI=2
-inherit eutils
+inherit eutils toolchain-funcs
 
 DESCRIPTION="Interactive tool for astronomical ephemeris and sky simulation"
 HOMEPAGE="http://www.clearskyinstitute.com/xephem"
@@ -18,9 +18,14 @@ DEPEND=">=x11-libs/openmotif-2.3:0
 	media-libs/libpng"
 RDEPEND="${DEPEND}"
 
+pkg_setup() {
+	tc-export CC
+}
+
 src_prepare() {
 	# make sure we use system libs and respect user flags
-	epatch "${FILESDIR}"/${P}-libs-flags.patch
+	epatch "${FILESDIR}"/${P}-libs-flags.patch \
+		"${FILESDIR}"/${P}-overflows.patch
 }
 
 src_compile() {