From: Donnie Berkholz <dberkholz@gentoo.org>
Date: Wed, 11 Oct 2006 01:16:59 +0000 (+0000)
Subject: (#149327) Fix que_recov() by using que_free() rather than free() (Ian Stakenvicius... 
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a5899976e0d59314f2bc563512f3554642e88c1e;p=gentoo.git

(#149327) Fix que_recov() by using que_free() rather than free() (Ian Stakenvicius). Don't revbump because the common case of this, caused by .keep files, is already fixed.
Package-Manager: portage-2.1.2_pre2-r5
---

diff --git a/sys-cluster/torque/ChangeLog b/sys-cluster/torque/ChangeLog
index f1042ae37343..919cd9f2361e 100644
--- a/sys-cluster/torque/ChangeLog
+++ b/sys-cluster/torque/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-cluster/torque
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/ChangeLog,v 1.36 2006/09/28 05:48:05 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/ChangeLog,v 1.37 2006/10/11 01:16:59 dberkholz Exp $
+
+  11 Oct 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  +files/2.1.2-queue-recov-freemem-fix.patch, torque-2.1.2-r2.ebuild:
+  (#149327) Fix que_recov() by using que_free() rather than free() (Ian
+  Stakenvicius). Don't revbump because the common case of this, caused by
+  .keep files, is already fixed.
 
 *torque-2.1.2-r2 (28 Sep 2006)
 
diff --git a/sys-cluster/torque/Manifest b/sys-cluster/torque/Manifest
index 627a7a7732e8..235c97e63d8d 100644
--- a/sys-cluster/torque/Manifest
+++ b/sys-cluster/torque/Manifest
@@ -1,3 +1,7 @@
+AUX 2.1.2-queue-recov-freemem-fix.patch 579 RMD160 f7cfd077c92418c2b18d4fc76f10c419c7915ea8 SHA1 41684815e67339cb8ecc2be6a93b82e513754d00 SHA256 f61c25de5e5933c88f63bb298016e83ad714c55ccbe87fc6a2904fb059c6cf4a
+MD5 769b0bed4cefd7246cc4e5d5caab4ffe files/2.1.2-queue-recov-freemem-fix.patch 579
+RMD160 f7cfd077c92418c2b18d4fc76f10c419c7915ea8 files/2.1.2-queue-recov-freemem-fix.patch 579
+SHA256 f61c25de5e5933c88f63bb298016e83ad714c55ccbe87fc6a2904fb059c6cf4a files/2.1.2-queue-recov-freemem-fix.patch 579
 AUX 2.1.2-skip-dotnames.patch 262 RMD160 0088357d3cd67c7a8cbec659d98ce517148278d9 SHA1 ae0918dd5c74c94f22be9ac718cbbf6bec28b296 SHA256 d5ac890945e5c17410fe72d95ca4c3fb048316d9902e1a80beaa12afdb02960d
 MD5 6ac87aec8c8d1f0fbec48159248512fa files/2.1.2-skip-dotnames.patch 262
 RMD160 0088357d3cd67c7a8cbec659d98ce517148278d9 files/2.1.2-skip-dotnames.patch 262
@@ -36,14 +40,14 @@ EBUILD torque-2.1.2-r1.ebuild 4010 RMD160 847403e04dbdf654cfc4ca1897e6148532b164
 MD5 812524ab7bf66e1fcdfcab55b869f79c torque-2.1.2-r1.ebuild 4010
 RMD160 847403e04dbdf654cfc4ca1897e6148532b16445 torque-2.1.2-r1.ebuild 4010
 SHA256 846497344a892f899405c215ea5d30bca625c1628b5d270aae2a5baebd693070 torque-2.1.2-r1.ebuild 4010
-EBUILD torque-2.1.2-r2.ebuild 4056 RMD160 5e4b80d3f111cd202c66b04a45d15f1032e90cee SHA1 0c30d2fe8ea3bd2128e7f700c0017c3c71af98af SHA256 11732684dc7e350ccd86b3a0a6c7409d92712b731547c12b87d0c12bd7b68999
-MD5 782c39d6fec22d7118c51c1cf4d62024 torque-2.1.2-r2.ebuild 4056
-RMD160 5e4b80d3f111cd202c66b04a45d15f1032e90cee torque-2.1.2-r2.ebuild 4056
-SHA256 11732684dc7e350ccd86b3a0a6c7409d92712b731547c12b87d0c12bd7b68999 torque-2.1.2-r2.ebuild 4056
-MISC ChangeLog 6939 RMD160 e537089eb21bb3798490c2c85588e91ebebf5001 SHA1 2a5db2cc798349b725b45bb4402569037947cceb SHA256 24d96f10ab451e1a947b1f9a231f566940ff4afe995ab4bcafc8efbdc90d3522
-MD5 e655331daffdb3d228d64fa8a330ac73 ChangeLog 6939
-RMD160 e537089eb21bb3798490c2c85588e91ebebf5001 ChangeLog 6939
-SHA256 24d96f10ab451e1a947b1f9a231f566940ff4afe995ab4bcafc8efbdc90d3522 ChangeLog 6939
+EBUILD torque-2.1.2-r2.ebuild 4112 RMD160 935591591be0f7d22afb0434bbeb93ea20cbb17f SHA1 d8e84afa6a6fcb01a53bbd49f7e7c24b645d576a SHA256 eb5813158df32f0676aff202f1a556bea241e5bb6036f61da454781d27aff1af
+MD5 5040569d9a7d3888cd9e1359421f395a torque-2.1.2-r2.ebuild 4112
+RMD160 935591591be0f7d22afb0434bbeb93ea20cbb17f torque-2.1.2-r2.ebuild 4112
+SHA256 eb5813158df32f0676aff202f1a556bea241e5bb6036f61da454781d27aff1af torque-2.1.2-r2.ebuild 4112
+MISC ChangeLog 7244 RMD160 bd647f065b8f2ba3565262d9a553871602c45fd5 SHA1 e082f340bd255539f07292523d1ef45469f5fcd5 SHA256 294857b99289f055ca911c1442d1bb61e0dedff055c0646de0208c4a295ee09c
+MD5 22ce863e899db2a3f53f5062f6206fe7 ChangeLog 7244
+RMD160 bd647f065b8f2ba3565262d9a553871602c45fd5 ChangeLog 7244
+SHA256 294857b99289f055ca911c1442d1bb61e0dedff055c0646de0208c4a295ee09c ChangeLog 7244
 MISC metadata.xml 160 RMD160 1233ca29861ca7c47f0b09d1d7a29def80f7df02 SHA1 1bfdc9d282a84c95e2bdcda19ace5b94e2e67349 SHA256 56717bdb03ad5d833acecfbc612a67f569256b328bf610fbc6cc33714186dae9
 MD5 cde8b4e93c9339eb99fe3ad45941c99b metadata.xml 160
 RMD160 1233ca29861ca7c47f0b09d1d7a29def80f7df02 metadata.xml 160
diff --git a/sys-cluster/torque/files/2.1.2-queue-recov-freemem-fix.patch b/sys-cluster/torque/files/2.1.2-queue-recov-freemem-fix.patch
new file mode 100644
index 000000000000..b4c26938be6c
--- /dev/null
+++ b/sys-cluster/torque/files/2.1.2-queue-recov-freemem-fix.patch
@@ -0,0 +1,20 @@
+--- src/server/queue_recov.c	2006-07-27 18:53:53.000000000 -0400
++++ src/server/queue_recov.c	2006-09-27 13:34:33.000000000 -0400
+@@ -257,7 +257,7 @@
+     {
+     log_err(errno,"que_recov","open error");
+ 
+-    free((char *)pq);
++    que_free(pq);  /* free((char *)pq); */
+ 
+     return(NULL);
+     }
+@@ -267,7 +267,7 @@
+ 	if (read(fds, (char *)&pq->qu_qs, sizeof(struct queuefix)) !=
+ 	    sizeof(struct queuefix)) {
+ 		log_err(errno, "que_recov", "read error");
+-		free((char *)pq);
++		que_free(pq);  /* free((char *)pq); */
+ 		(void)close(fds);
+ 		return ((pbs_queue *)0);
+ 	}
diff --git a/sys-cluster/torque/torque-2.1.2-r2.ebuild b/sys-cluster/torque/torque-2.1.2-r2.ebuild
index b20f1d2419da..fb8ff7783916 100644
--- a/sys-cluster/torque/torque-2.1.2-r2.ebuild
+++ b/sys-cluster/torque/torque-2.1.2-r2.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/sys-cluster/torque/torque-2.1.2-r2.ebuild,v 1.1 2006/09/28 05:48:05 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-2.1.2-r2.ebuild,v 1.2 2006/10/11 01:16:59 dberkholz Exp $
 
 
 inherit autotools flag-o-matic eutils
@@ -44,6 +44,7 @@ src_unpack() {
 	cd "${S}"
 	epatch ${FILESDIR}/${PN}-setuid-safety.patch
 	epatch ${FILESDIR}/${PV}-skip-dotnames.patch
+	epatch ${FILESDIR}/${PV}-queue-recov-freemem-fix.patch
 }