summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Imhof <tantive@gentoo.org>2003-09-16 16:21:01 +0000
committerMichael Imhof <tantive@gentoo.org>2003-09-16 16:21:01 +0000
commitab971cd6d2d84096a569263b0b71739964a85923 (patch)
tree2883adb4f7ef801cd0bf93286f8c9e8c0d4863e1 /sys-cluster
parentRemoved virtual/modutils from .19 and .20 as repoman did not approve. Added p... (diff)
downloadgentoo-2-ab971cd6d2d84096a569263b0b71739964a85923.tar.gz
gentoo-2-ab971cd6d2d84096a569263b0b71739964a85923.tar.bz2
gentoo-2-ab971cd6d2d84096a569263b0b71739964a85923.zip
Added fixes from #22248
Diffstat (limited to 'sys-cluster')
-rw-r--r--sys-cluster/openpbs/ChangeLog3
-rw-r--r--sys-cluster/openpbs/Manifest9
-rw-r--r--sys-cluster/openpbs/files/openpbs-2.3.16-r1-errno-fixup.patch36
-rw-r--r--sys-cluster/openpbs/openpbs-2.3.16-r1.ebuild6
4 files changed, 47 insertions, 7 deletions
diff --git a/sys-cluster/openpbs/ChangeLog b/sys-cluster/openpbs/ChangeLog
index 2127cc668a6d..0cbd58a560b3 100644
--- a/sys-cluster/openpbs/ChangeLog
+++ b/sys-cluster/openpbs/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
# $Header: /home/cvsroot/gentoo-x86/sys-cluster/openpbs/ChangeLog
+ 16 Seep 2003; Michael Imhof <tantive@gentoo.org>
+ Added fixes from bug #22248.
+
09 Sep 2003; Michael Imhof <tantive@gentoo.org>
Little changes in the ebuilds, should close #28166
diff --git a/sys-cluster/openpbs/Manifest b/sys-cluster/openpbs/Manifest
index 28af4e7f6824..c4e309fc9c8b 100644
--- a/sys-cluster/openpbs/Manifest
+++ b/sys-cluster/openpbs/Manifest
@@ -1,8 +1,9 @@
-MD5 614fba4dc397c8e7822a6f78b10d96a0 ChangeLog 1159
-MD5 ce338455f3053dbd7298135aa2474dd8 openpbs-2.3.16.ebuild 2225
-MD5 5f5a5caa38ad37522b6e2757b0e8c72b openpbs-2.3.16-r1.ebuild 2310
+MD5 486d38b242438089402b6bec61c57d44 ChangeLog 1242
+MD5 5769b9fd901c6c6abad0076a9326de58 openpbs-2.3.16-r1.ebuild 2347
MD5 beb9efce81ae2c582a621528fc783095 metadata.xml 373
+MD5 ce338455f3053dbd7298135aa2474dd8 openpbs-2.3.16.ebuild 2225
MD5 49fb3f2f647a254c00afde279a3bd724 files/digest-openpbs-2.3.16 67
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-openpbs-2.3.16-r1 0
MD5 26475a5f76dd888dfbc3b5fa49f7238a files/makedepend-sh-gcc3.patch 549
MD5 2bbaf505f4ab6e61afff6b29656e0c5c files/pbs.rc 2272
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-openpbs-2.3.16-r1 0
+MD5 ae564f0950612dba4e6fea5b2b8e8065 files/openpbs-2.3.16-r1-errno-fixup.patch 1212
diff --git a/sys-cluster/openpbs/files/openpbs-2.3.16-r1-errno-fixup.patch b/sys-cluster/openpbs/files/openpbs-2.3.16-r1-errno-fixup.patch
new file mode 100644
index 000000000000..9bc646ed9e16
--- /dev/null
+++ b/sys-cluster/openpbs/files/openpbs-2.3.16-r1-errno-fixup.patch
@@ -0,0 +1,36 @@
+diff -urN src-old/lib/Liblog/pbs_log.c src/lib/Liblog/pbs_log.c
+--- src-old/lib/Liblog/pbs_log.c 2003-07-30 17:04:55.000000000 -0500
++++ src/lib/Liblog/pbs_log.c 2003-07-30 17:04:00.000000000 -0500
+@@ -109,7 +109,7 @@
+
+ /* Global Data */
+
+-extern int errno;
++#include <errno.h>
+ char log_buffer[LOG_BUF_SIZE];
+ char log_directory[_POSIX_PATH_MAX/2];
+
+diff -urN src-old/scheduler.basl/af_resmom.c src/scheduler.basl/af_resmom.c
+--- src-old/scheduler.basl/af_resmom.c 2003-07-30 17:04:56.000000000 -0500
++++ src/scheduler.basl/af_resmom.c 2003-07-30 17:04:00.000000000 -0500
+@@ -103,7 +103,7 @@
+ static char ident[] = "@(#) $RCSfile: openpbs-2.3.16-r1-errno-fixup.patch,v $ $Revision: 1.1 $";
+
+ /* External Variables */
+-extern int errno;
++#include <errno.h>
+
+ /* External Functions */
+ extern int
+diff -urN src-old/server/svr_connect.c src/server/svr_connect.c
+--- src-old/server/svr_connect.c 2003-07-30 17:04:56.000000000 -0500
++++ src/server/svr_connect.c 2003-07-30 17:04:00.000000000 -0500
+@@ -113,7 +113,7 @@
+
+ struct connect_handle connection[PBS_NET_MAX_CONNECTIONS]; /* used by API */
+
+-extern int errno;
++#include <errno.h>
+
+ extern int pbs_errno;
+ extern unsigned int pbs_server_port_dis;
diff --git a/sys-cluster/openpbs/openpbs-2.3.16-r1.ebuild b/sys-cluster/openpbs/openpbs-2.3.16-r1.ebuild
index b762e4185aa1..a1571dfed18f 100644
--- a/sys-cluster/openpbs/openpbs-2.3.16-r1.ebuild
+++ b/sys-cluster/openpbs/openpbs-2.3.16-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openpbs/openpbs-2.3.16-r1.ebuild,v 1.3 2003/09/10 04:37:16 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openpbs/openpbs-2.3.16-r1.ebuild,v 1.4 2003/09/16 16:20:54 tantive Exp $
NAME=`echo ${P} | sed -e "s|openpbs-|OpenPBS_|; y|.|_|"`
B=${NAME}.tar.gz
@@ -36,8 +36,8 @@ src_unpack() {
cd ${S}
# apply a patch I made for gcc3.
# maybe this should be done with sed but I'm too lazy
- patch -p0 < ${FILESDIR}/makedepend-sh-gcc3.patch
-
+ epatch ${FILESDIR}/makedepend-sh-gcc3.patch
+ epatch ${FILESDIR}/${PF}-errno-fixup.patch
# this thing doesn't use make install, but rather it's own install script
# fix it here so the install dirs are set to the ${D} directory
cd buildutils