Add a few fixes from debian

Package-Manager: portage-2.2.8-prefix/cvs/Linux x86_64
Manifest-Sign-Key: 0x13CB1360

5 files changed, 191 insertions, 12 deletions

diff --git a/sci-astronomy/funtools/ChangeLog b/sci-astronomy/funtools/ChangeLog
index fa2e58b1f8d6..05b8c8821dc4 100644
--- a/sci-astronomy/funtools/ChangeLog
+++ b/sci-astronomy/funtools/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-astronomy/funtools
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/funtools/ChangeLog,v 1.9 2013/07/08 23:23:33 bicatali Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/funtools/ChangeLog,v 1.10 2014/02/23 20:18:40 bicatali Exp $
+
+*funtools-1.4.4-r3 (23 Feb 2014)
+
+  23 Feb 2014; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/funtools-1.4.4-fix-crashes.patch,
+  +files/funtools-1.4.4-fix-hardening.patch, +funtools-1.4.4-r3.ebuild,
+  -funtools-1.4.4-r2.ebuild:
+  Add a few fixes from debian
 
 *funtools-1.4.4-r2 (08 Jul 2013)
 
diff --git a/sci-astronomy/funtools/Manifest b/sci-astronomy/funtools/Manifest
index db6c4944098d..c5452bee1fb5 100644
--- a/sci-astronomy/funtools/Manifest
+++ b/sci-astronomy/funtools/Manifest
@@ -3,16 +3,18 @@ Hash: SHA256
 
 AUX funtools-1.4.4-ds9-fixes.patch 8296 SHA256 1914bce0211bfa3380a9b99b14e27ee91c33a3acdf3ccb42fd311c57a0d0da58 SHA512 8b709af4e934976b46fee9a9ed3a42e4719081dec06b38abcd678bcfa7d6af7bea8b4c20914bbe6a5b7be3e9017a8cd07d97e34e620ea4c6cb440827696bcaba WHIRLPOOL 877923ade6e6cdecf49dfb143cc2c6d4debcb58598c37c5c9c594d9ed0e93692852b8b6ab367976ee620baf23d15de0e8170587f69c80b656d2430f26efc6df9
 AUX funtools-1.4.4-fix-autoheader.patch 3742 SHA256 fcebee46596904b85eb530da8912be1b4250c4d3128407d46465aa7e4b738c35 SHA512 e26459937c1c54410e5e7e8a9684b96b18955f3f1a8341907b8d6a4c7f8eeebac2d92585d009335a8315a80780bcc7448ee2197d5ecaf3b1bf6ac9697e404d7f WHIRLPOOL a83ad71fe0a0aa93c4e94a1a06a65d14798e6cb14617466e4e5569cbb19c7fc38823fdcb342e648a0b39493ad4a8d67351036bf829f5d5e6eacf40c854e87760
+AUX funtools-1.4.4-fix-crashes.patch 2383 SHA256 af377af62752f570ab27aaacb9ba0fbf140f1afb8d7662f14068bd7a849cb94a SHA512 c401e24d06632902ab3ea8651c3ee52444daf00291d24c13c2f072e4092d649719c42ae2e2ecbc56144972b0df4f488621e74d2d3803ee054ef7129f3ecc9895 WHIRLPOOL fef4fc177832d60940bc17e89e5dc96594b5769807bde5306883ec5adc08b3544fed95224a18625a803515b213f976207ae2c56d75678f202348359a4318c66e
+AUX funtools-1.4.4-fix-hardening.patch 1875 SHA256 a9aff9f82ec876adc5e922bc99f9197761de31e7878de7970c26da3b28867c25 SHA512 d20de25c6a3a48bf6978b3e7a3781127c9a1e0065604de7cbe4f188f22b73e13f118d135678cf6c301ac773a6e8f7f9ea2c910cfd345b27cf9f8a8c6807ae443 WHIRLPOOL b5f53565c89cc74be6718c9080687420efd42ee4682356bbad038b4e28a52f99458e147aa04fe59e822554c330a5649afc25f86cca9795d3f907d8082e853a5a
 AUX funtools-1.4.4-fix-includes.patch 10476 SHA256 fd925d78ba7c60fb940814178f1b7af41b76c56b545e89ef261a618813f8cf9a SHA512 7c71e60bd2ae1f35eecdf089001ba468f6bc6f1b67d613e6ce0d08a6218f1528aadb3259049d4395bebbcdc8b2ecc60c5d2ed4a05167132638579eb90cc80128 WHIRLPOOL 539630bba1dc5af5b279bea30ae00daf8ee363e01c950abacfd390f4cdb3bb155b6196e93f9d7461b4732f1547d4137fa219768b2b5e79d22a5b6cd3700097bf
 AUX funtools-1.4.4-makefiles.patch 10431 SHA256 74cb027c5c05094195b1fbd0a998ae9207856517c319c6d94dc0a9f0dbb0d76a SHA512 79996f139ca4932eb9209675252887b5045f16fe2cb83b8dbcc60081243b346d4721832ec11b3a082f079ddc1a3754ae14437cc2242e8438ea225a0a60b29b9e WHIRLPOOL 7bd2048a891764a72800e43156ea28c0dc4890a49d5ba16402a50bea09de2871cf8ddf3d592a84325b8f6f934e959efdfd5ca96cd8ff0ebd44938b29b1491ec8
 DIST funtools-1.4.4.tar.gz 3475367 SHA256 f47a00e774b557931a7ff00ddd0852e32ae5d2a2f0d3a227f8ba81d3db1e863b SHA512 3a58ad008bc33836109327add15eabaf95e9dc3f9e70a678fe9a8176dae87ccf0faf439e775b6efcb50e536afb022b9e4c226cbb98e56997960380e06012b5c2 WHIRLPOOL 5b89cb7280a4e1087c13103a813e9220432419215d8bc7e6463f5f08f2a5ba3731e7693f16d79ff4ec705665809cc33e81dbd36cd07a00d786aac35bbb975f71
-EBUILD funtools-1.4.4-r2.ebuild 1514 SHA256 5408c86d71fb229e7261697c98aea9faf2c111e8eaae0cb2b1be8f4b9b7bd14f SHA512 8b69f46a2a97fed974736ee52a0213025e30581e8744785185f2e81641b3c167b9c6e872f4dc829032b66791a48d714518af58c23e8d87ea76c327cd01df22a2 WHIRLPOOL b54f83bc514a803326fc8387305c06f3408d97879f9f5f569cf909c45fb76e33073431644bfb0f347f0954bb216508cd7e5828e7d345808e90d8a4c84e27e971
-MISC ChangeLog 1944 SHA256 97bffea4a158877ce4b065d30cd755b325b9d04167ef0a23947bf106f18b139d SHA512 7022bf63892f6407f8b5f27be9822a97c34043b2e470435337df7ac8b64b1f642a751aa84d1bbee60311c270ab2d7016b61b223a7c7f79d87ca9d36e4fedbf3b WHIRLPOOL 0504b681745a260e91040bfbee8ef777bdf576e3fa30f4d61bcf6cdf0b9e09621d41ed76f715b81f020ee0c585046f35249f89906e124fe6c96349efca4e9f7d
+EBUILD funtools-1.4.4-r3.ebuild 1663 SHA256 9811b1bda74e60139b38b939f694a8b564402a50134af02c58b9906d21d4eaeb SHA512 524e09b5bafb727f7ec342630a3a567ac263464044115dff1a29823e70e3cf1d27ff8e4e396625e4df7d829b66be803761d8dc07fbfe7defb8013c668d451e2e WHIRLPOOL b70485bed7e748a2acca7a81c31b016efad9343b7ab3e3a2f877c44c36ae7eef2d33dbbd3d475a8010459d86cf43ad3d989b2095fab7a0c32a8654ad6db3256b
+MISC ChangeLog 2209 SHA256 a04f271b616843174211578bf7bf18e9a546a23844b1cbe3e141efb0a2bfb6f8 SHA512 8ef3c723f8784c673fea9b35dc127b5b69b4fa17adc358bffd2e3fbd13c458f39bcf247571b50d4328c1499de1e9d21734c9306acb10fa902082fe53e0346c09 WHIRLPOOL 1ae1cd5e1e7d0555ec99e2bb94bf3934b7ef498fb394e35fec9c2628b89e4abb881e79c0ccd715008f4101f9aa2718b059504e0238cdfd9568001d9e0670619b
 MISC metadata.xml 520 SHA256 0a05ebd4a6b37b07a01ae0d0f5b469e76e581db24df936164a90e57103fbe167 SHA512 95e9a57668ab142791c997f2a4b731fa91eef80cb0fad26dfe6216727e3d460c9afb001049582ae617f413a36461d9f9f9eeb2efd044714e7b1046c66fcc2846 WHIRLPOOL a91963689b7a90ce8e175011de22b60baf9fd15b1b98618f8f106c405c6d0732f85462c91a5785b0d9ee94d3e45e36e7b30d881dc1fd9421fb5aa2c1cf0b1c1b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlHbSqIACgkQ1ycZbhPLE2AC9wCffQW7KscPmbk7gZx4E+rGMRpR
-5gAAn121fPQ44C5KO/zyYfyS2CQFPNXj
-=5NI+
+iEYEAREIAAYFAlMKV6QACgkQ1ycZbhPLE2BmvwCeMNewzdWB3T92vmcNmc3eNoAZ
+aKUAn3oZC9bYNWz9309TD8zIIVmvj7NZ
+=BsSN
 -----END PGP SIGNATURE-----
diff --git a/sci-astronomy/funtools/files/funtools-1.4.4-fix-crashes.patch b/sci-astronomy/funtools/files/funtools-1.4.4-fix-crashes.patch
new file mode 100644
index 000000000000..75d69089ef13
--- /dev/null
+++ b/sci-astronomy/funtools/files/funtools-1.4.4-fix-crashes.patch
@@ -0,0 +1,99 @@
+Author: Ole Streicher <debian@liska.ath.cx>
+Description: Check cmd line arguments for illegal input that caused crashes
+ found with the "Mayhem" tool.
+Bug: http://bugs.debian.org/715928
+Bug: http://bugs.debian.org/715929
+--- a/funjoin.c
++++ b/funjoin.c
+@@ -737,7 +737,7 @@ main(argc, argv)
+       case 'a':
+ 	if( argv[i][2] ){
+ 	  j = atoi(&argv[i][2])-1;
+-	  if( (j >= 0) && (j < MAXIFILE) ){
++	  if( (j >= 0) && (j < MAXIFILE) && (i < argc-1)){
+ 	    files[j].actstr = argv[++i];
+ 	  }
+ 	  else{
+@@ -751,7 +751,7 @@ main(argc, argv)
+       case 'b':
+ 	if( argv[i][2] ){
+ 	  j = atoi(&argv[i][2])-1;
+-	  if( (j >= 0) && (j < MAXIFILE) ){
++	  if( (j >= 0) && (j < MAXIFILE) && (i < argc-1)){
+ 	    files[j].bstr = argv[++i];
+ 	  }
+ 	  else{
+@@ -765,7 +765,7 @@ main(argc, argv)
+       case 'j':
+ 	if( argv[i][2] ){
+ 	  j = atoi(&argv[i][2])-1;
+-	  if( (j >= 0) && (j < MAXIFILE) ){
++	  if( (j >= 0) && (j < MAXIFILE) && (i < argc-1)){
+ 	    files[j].jname = argv[++i];
+ 	  }
+ 	  else{
+@@ -773,25 +773,35 @@ main(argc, argv)
+ 	  }
+ 	}
+ 	else{
+-	  defcol = argv[++i];
++          if (i < argc-1) {
++	    defcol = argv[++i];
++	  }
+ 	}
+ 	break;
+       case 'm':
+-	minmatch = atoi(argv[++i])+1;
++        if (i < argc-1) {
++	  minmatch = atoi(argv[++i])+1;
++	}
+ 	if( minmatch < 1 ) minmatch = 1;
+ 	break;
+       case 'M':
+-	maxmatch = atoi(argv[++i])+1;
++        if (i < argc-1) {
++	  maxmatch = atoi(argv[++i])+1;
++	}
+ 	if( maxmatch < 1 ) maxmatch = 1;
+ 	break;
+       case 's':
+ 	jfiles = JFILES_COL;
+ 	break;
+       case 'S':
+-	jfiles = argv[++i];
++        if (i < argc-1) {
++	  jfiles = argv[++i];
++	}
+ 	break;
+       case 't':
+-	tol = atof(argv[++i]);
++        if (i < argc-1) {
++	  tol = atof(argv[++i]);
++	}
+ 	if( tol <= 0 ){
+ 	  gerror(stderr, "tolerance value must be positive\n");
+ 	}
+--- a/funimage.c
++++ b/funimage.c
+@@ -338,12 +338,16 @@ main(argc, argv)
+     t = strchr(s, ',');
+     strncat(newname, s, t-s);
+     strncat(newname, ",y:", SZ_LINE-strlen(newname));
+-    s = ++t;
+-    t = strchr(s, ',');
+-    strncat(newname, s, t-s);
++    if (t != NULL) {
++      s = ++t;
++      t = strchr(s, ',');
++      strncat(newname, s, t-s);
++    }
+     strncat(newname, "),", SZ_LINE-strlen(newname));
+-    s = ++t;
+-    strncat(newname, s, SZ_LINE-strlen(newname));
++    if (t != NULL) {
++	s = ++t;
++	strncat(newname, s, SZ_LINE-strlen(newname));
++    }
+     iname = newname;
+   }
+ 
diff --git a/sci-astronomy/funtools/files/funtools-1.4.4-fix-hardening.patch b/sci-astronomy/funtools/files/funtools-1.4.4-fix-hardening.patch
new file mode 100644
index 000000000000..2f24268d74f2
--- /dev/null
+++ b/sci-astronomy/funtools/files/funtools-1.4.4-fix-hardening.patch
@@ -0,0 +1,68 @@
+Author: Ole Streicher <debian@liska.ath.cx>
+Description: Fix the format string for fprintf
+--- a/gnu/sort.c
++++ b/gnu/sort.c
+@@ -2775,7 +2775,7 @@
+ 		xfwrite (buf, 1, cc, ofp);
+ 	      if (ferror (fp))
+ 		{
+-		  fprintf (stderr, files[i]);
++  	          fprintf (stderr, "%s", files[i]);
+ 		  cleanup ();
+ 		  exit (2);
+ 		}
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -137,7 +137,7 @@
+ 
+ CC  =		@CC@
+ 
+-CC_SWITCHES =	-I. ${CFLAGS} @USE_DL@ ${INCLUDES} ${AC_FLAGS}
++CC_SWITCHES =	-I. ${CFLAGS} ${CPPFLAGS} @USE_DL@ ${INCLUDES} ${AC_FLAGS}
+ 
+ DEPEND_SWITCHES = -I. ${CFLAGS} ${INCLUDES} ${AC_FLAGS}
+ 
+--- a/filter/Makefile.in
++++ b/filter/Makefile.in
+@@ -114,7 +114,7 @@
+ 
+ CC =		@CC@
+ 
+-CC_SWITCHES =	-I. ${CFLAGS} -DFILT_VERSION="\"$(VERSION)\"" @USE_DL@ \
++CC_SWITCHES =	-I. ${CFLAGS} ${CPPFLAGS} -DFILT_VERSION="\"$(VERSION)\"" @USE_DL@ \
+ 		${INCLUDES} ${AC_FLAGS}
+ 
+ DEPEND_SWITCHES = -I. ${CFLAGS} -I. ${INCLUDES} ${AC_FLAGS}
+--- a/gnu/Makefile.in
++++ b/gnu/Makefile.in
+@@ -87,7 +87,7 @@
+ 
+ CC =		@CC@
+ 
+-CC_SWITCHES =	${CFLAGS} ${INCLUDES} ${AC_FLAGS}
++CC_SWITCHES =	${CFLAGS} ${CPPFLAGS} ${INCLUDES} ${AC_FLAGS}
+ 
+ DEPEND_SWITCHES = ${CFLAGS} ${INCLUDES} ${AC_FLAGS}
+ 
+--- a/util/Makefile.in
++++ b/util/Makefile.in
+@@ -105,7 +105,7 @@
+ 
+ CC =		@CC@
+ 
+-CC_SWITCHES =	-I. ${CFLAGS} @USE_DL@ ${INCLUDES} ${AC_FLAGS}
++CC_SWITCHES =	-I. ${CFLAGS} ${CPPFLAGS} @USE_DL@ ${INCLUDES} ${AC_FLAGS}
+ 
+ DEPEND_SWITCHES = -I. ${CFLAGS} ${INCLUDES} ${AC_FLAGS}
+ 
+--- a/mklib
++++ b/mklib
+@@ -169,7 +169,7 @@
+             rm -f ${LIBNAME}.so
+ 
+             # make lib
+-            ${LINK} ${OPTS} -o ${LIBNAME}.so.${VERSION} ${OBJECTS} ${DEPS}
++            ${LINK} ${LDFLAGS} ${OPTS} -o ${LIBNAME}.so.${VERSION} ${OBJECTS} ${DEPS}
+             # make usual symlinks
+             ln -s ${LIBNAME}.so.${VERSION} ${LIBNAME}.so.${MAJOR}
+             ln -s ${LIBNAME}.so.${MAJOR} ${LIBNAME}.so
diff --git a/sci-astronomy/funtools/funtools-1.4.4-r2.ebuild b/sci-astronomy/funtools/funtools-1.4.4-r3.ebuild
index e3e1f9e61023..362d5a20a4db 100644
--- a/sci-astronomy/funtools/funtools-1.4.4-r2.ebuild
+++ b/sci-astronomy/funtools/funtools-1.4.4-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/funtools/funtools-1.4.4-r2.ebuild,v 1.1 2013/07/08 23:23:33 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/funtools/funtools-1.4.4-r3.ebuild,v 1.1 2014/02/23 20:18:40 bicatali Exp $
 
 EAPI=5
 inherit eutils toolchain-funcs multilib autotools
@@ -26,7 +26,10 @@ src_prepare() {
 		"${FILESDIR}"/${P}-ds9-fixes.patch \
 		"${FILESDIR}"/${P}-fix-autoheader.patch \
 		"${FILESDIR}"/${P}-fix-includes.patch \
+		"${FILESDIR}"/${P}-fix-hardening.patch \
+		"${FILESDIR}"/${P}-fix-crashes.patch \
 		"${FILESDIR}"/${P}-makefiles.patch
+	sed -i -e "s:/usr:${EPREFIX}/usr:g" filter/Makefile.in || die
 	sed -i \
 		-e "s:\${LINK}:\${LINK} ${LDFLAGS}:" \
 		mklib || die "sed for ldflags failed"
@@ -54,6 +57,5 @@ src_install () {
 	insinto /usr/include/funtools/fitsy
 	doins fitsy/*.h
 	use static-libs || rm "${ED}"/usr/$(get_libdir)/lib*.a
-	cd doc
-	use doc && dodoc *.pdf && dohtml *html *c
+	use doc && cd doc && dodoc *.pdf && dohtml *html *c
 }