Fixed a small leak (bug #340911). Added prefix.

Package-Manager: portage-2.1.9.35/cvs/Linux x86_64

4 files changed, 39 insertions, 13 deletions

diff --git a/sci-physics/cernlib/ChangeLog b/sci-physics/cernlib/ChangeLog
index f83f315ea771..601f8525b751 100644
--- a/sci-physics/cernlib/ChangeLog
+++ b/sci-physics/cernlib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-physics/cernlib
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/cernlib/ChangeLog,v 1.23 2010/10/10 21:51:50 ulm Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/cernlib/ChangeLog,v 1.24 2011/01/30 21:52:38 bicatali Exp $
+
+  30 Jan 2011; Sébastien Fabbro <bicatali@gentoo.org> cernlib-2006-r3.ebuild,
+  +files/cernlib-2006-fgets.patch:
+  Fixed a small leak (bug #340911). Added prefix.
 
   10 Oct 2010; Ulrich Mueller <ulm@gentoo.org> cernlib-2006-r3.ebuild:
   Fix openmotif dependency.
diff --git a/sci-physics/cernlib/Manifest b/sci-physics/cernlib/Manifest
index fa0db5e5d44d..ef548a6fd322 100644
--- a/sci-physics/cernlib/Manifest
+++ b/sci-physics/cernlib/Manifest
@@ -1,16 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX cernlib-2006-fgets.patch 759 RMD160 f8bdb2fc42740bc6baee8468eafa90d1a4389fb5 SHA1 24fe018212c9cee09d115ac9e5e44963d3f2ad03 SHA256 eb1e965627b094a698af5f9629f5f69cb4b966f33c01b48a7bcf75b80c3e9eaf
 AUX cernlib-2006-nogfortran.patch 1994 RMD160 dccb57e0b1d360080bc4527caef2beaa1225398d SHA1 10c32ccea93e78942afe5524b48dd47b4529ead8 SHA256 f9839ef5dc005715387bd997f69565aa1e5984502e6c6e625659e35bbaf9d997
 DIST cernlib_2006.dfsg.2-14.diff.gz 191345 RMD160 e2c6180b76855b33eb637878157722803c046119 SHA1 1d3c1e5300227eda76ea41672d0dc1675003d578 SHA256 e58c84825ea6fc775acdbccbaaa7ac8c3b70120da8f99e704270ea0aa437e665
 DIST cernlib_2006.dfsg.2.orig.tar.gz 6152834 RMD160 a75f320a2568eb3942268e7b03525a045e324b70 SHA1 181fef4381d49a2e40a8f21550c3cef0dbaa4dd9 SHA256 f8ef612cdef0e02b69ccabbe0061eed5f952522565affc25e8ad6e0b73b73f26
-EBUILD cernlib-2006-r3.ebuild 3244 RMD160 9a9bd19acfa2ea8c78413839e123f19212e572a4 SHA1 bd0ab6e60186ece55a336a2a400346037a19b1cb SHA256 28233b2d529df0c525329231809b76f01c319b18dbcfb0fd721a653d50420b9c
-MISC ChangeLog 3748 RMD160 2fa357a18927a39e8f5c2394671de84f7be2c099 SHA1 17be13e7194e9ffed393c4473f90cd6c355b47d3 SHA256 6b990d8581fd97f26d5368cefb01ffb8cc12b164f5886a44c4a09bbea945d6ff
+EBUILD cernlib-2006-r3.ebuild 3309 RMD160 fe819b2827fd9a92d585942656654700440d54ea SHA1 87f2f03f22ddbe19eec3f624ea3acad55cbc4df0 SHA256 81c147255ff18e354f20290383fce4fc7dd8be61a5a2e68ea5960c87daf59fd6
+MISC ChangeLog 3918 RMD160 24aa9c4db552e6482c398be0c189b8cb3035f1b1 SHA1 0f7ce753ade96d1dcc24adfebc71b5080a3567aa SHA256 cec668ab052ebe5669e10b48a0097bf5e723bbee88f29289da920ff1a27a3fac
 MISC metadata.xml 654 RMD160 a33df2636030f2653d4bf478451979fc9850dc85 SHA1 7b018c6bb2eb2b897cd4a60b3a6080995094f44a SHA256 9812f051c9ac5c19fd295cdf79d9ba9d799a7b5ebe6b10d4cf9428d1ebf4e32c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAkyyNekACgkQOeoy/oIi7uzGdgCfSmyK850TWJpChFYTnlWe3C8S
-VKoAoJLyyid8WyZVgKyFG2a8i5An6dpS
-=J0Yt
+iEYEARECAAYFAk1F3a8ACgkQ1ycZbhPLE2DfhQCgoynTs1idHiKK+KzUQkmmPaUn
+RQsAn1Xxw3IBvwkHk/9xEsUrJG63b7Gp
+=VFLG
 -----END PGP SIGNATURE-----
diff --git a/sci-physics/cernlib/cernlib-2006-r3.ebuild b/sci-physics/cernlib/cernlib-2006-r3.ebuild
index 236ede2f2b2e..c5234cec00e3 100644
--- a/sci-physics/cernlib/cernlib-2006-r3.ebuild
+++ b/sci-physics/cernlib/cernlib-2006-r3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/cernlib/cernlib-2006-r3.ebuild,v 1.8 2010/10/10 21:51:50 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/cernlib/cernlib-2006-r3.ebuild,v 1.9 2011/01/30 21:52:38 bicatali Exp $
 
-EAPI=2
+EAPI=3
 inherit eutils toolchain-funcs
 
 DEB_PN=cernlib
@@ -41,9 +41,9 @@ src_prepare() {
 	epatch "${FILESDIR}/${P}-nogfortran.patch"
 	# set some default paths
 	sed -i \
-		-e "s:/usr/local:/usr:g" \
+		-e "s:/usr/local:${EPREFIX}/usr:g" \
 		-e "s:prefix)/lib:prefix)/$(get_libdir):" \
-		-e 's:$(prefix)/etc:/etc:' \
+		-e "s:\$(prefix)/etc:${EPREFIX}/etc:" \
 		-e 's:$(prefix)/man:$(prefix)/share/man:' \
 		debian/add-ons/cernlib.mk || die "sed failed"
 
@@ -61,6 +61,7 @@ src_prepare() {
 	einfo "Applying Debian patches"
 	emake -j1 patch || die "debian patch failed"
 
+	epatch "${FILESDIR}/${P}-fgets.patch"
 	# since we depend on cfortran, do not use the one from cernlib
 	rm -f src/include/cfortran/cfortran.h
 
diff --git a/sci-physics/cernlib/files/cernlib-2006-fgets.patch b/sci-physics/cernlib/files/cernlib-2006-fgets.patch
new file mode 100644
index 000000000000..e42eaf833b35
--- /dev/null
+++ b/sci-physics/cernlib/files/cernlib-2006-fgets.patch
@@ -0,0 +1,20 @@
+--- src/packlib/cspack/tcpaw/tcpaw.c.old	2011-01-30 21:18:35.326089059 +0000
++++ src/packlib/cspack/tcpaw/tcpaw.c	2011-01-30 21:18:01.876081979 +0000
+@@ -984,7 +984,7 @@
+  int s, addrlen;
+  int sx, nn = 0;                     /* REXEC */
+ #ifndef IBM
+- char get[50], *getp = get;          /* REXEC */
++ char get[80], *getp = get;          /* REXEC */
+ #endif /*^IBM */
+  char sys[30];
+  register int i, j, k;
+@@ -1036,7 +1036,7 @@
+  char buff[100];
+  char *get;
+  char *getp;
+- char getbuf[50];                        /* REXEC */
++ char getbuf[80];                        /* REXEC */
+  getp = getbuf;                          /* REXEC */
+  get = getbuf;                           /* REXEC */
+ /* j = 80; */      /* (crude kludge) length of srvc in Fortran */