[gridengine] Update to 2011.11p1 Drop env-code-injection, buffer-overflow, and symlink patches Rebase rctemplates
Orion Poplawski
orion at fedoraproject.org
Mon Jul 9 20:17:24 UTC 2012
commit 782ee685ea9b00645bd92ef3c9abde1fd38da290
Author: Orion Poplawski <orion at nwra.com>
Date: Mon Jul 9 14:17:19 2012 -0600
Update to 2011.11p1
Drop env-code-injection, buffer-overflow, and symlink patches
Rebase rctemplates patch
.gitignore | 1 +
buffer-overflow.patch | 66 -
env-code-injection-GE2011.11p1.patch | 126 -
gridengine-rctemplates.patch | 66 +-
gridengine-svn131.patch | 6319 ----------------------------------
gridengine.spec | 18 +-
sources | 2 +-
symlink.patch | 75 -
8 files changed, 42 insertions(+), 6631 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b246baf..ca401cf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ ge-V62u5_TAG-src.tar.bz2
gridengine-ppc.tar.gz
/SGE6.2u5p2.tar.gz
/GE2011.11.tar.gz
+/GE2011.11p1.tar.gz
diff --git a/gridengine-rctemplates.patch b/gridengine-rctemplates.patch
index 666f8ad..507f93a 100644
--- a/gridengine-rctemplates.patch
+++ b/gridengine-rctemplates.patch
@@ -1,7 +1,7 @@
-diff -up GE2011.11/source/dist/inst_sge.rctemplates GE2011.11/source/dist/inst_sge
---- GE2011.11/source/dist/inst_sge.rctemplates 2012-03-01 15:05:53.266344314 -0700
-+++ GE2011.11/source/dist/inst_sge 2012-03-01 15:06:40.235653327 -0700
-@@ -696,8 +696,7 @@ if [ "$UPDATE" = true ]; then
+diff -up GE2011.11p1/source/dist/inst_sge.rctemplates GE2011.11p1/source/dist/inst_sge
+--- GE2011.11p1/source/dist/inst_sge.rctemplates 2012-05-23 13:04:49.000000000 -0600
++++ GE2011.11p1/source/dist/inst_sge 2012-07-09 14:11:10.645922508 -0600
+@@ -702,8 +702,7 @@ if [ "$UPDATE" = true ]; then
AddJMXFiles
fi
RestoreSequenceNumberFiles $QMDIR #Restore jobseqnum and arseqnum
@@ -11,7 +11,7 @@ diff -up GE2011.11/source/dist/inst_sge.rctemplates GE2011.11/source/dist/inst_s
CreateSettingsFile
InitCA
SetupRcScriptNames master #New qmaster RC script/SMF
-@@ -861,7 +860,6 @@ if [ "$BERKELEY" = "install" ]; then
+@@ -867,7 +866,6 @@ if [ "$BERKELEY" = "install" ]; then
Makedir $COMMONDIR
ProcessSGEClusterName "bdb"
SetSpoolingOptions
@@ -19,7 +19,7 @@ diff -up GE2011.11/source/dist/inst_sge.rctemplates GE2011.11/source/dist/inst_s
PrepareRPCServerStart
GiveBerkelyHints
else
-@@ -913,11 +911,9 @@ if [ "$QMASTER" = "install" -a "$UPDATE"
+@@ -919,11 +917,9 @@ if [ "$QMASTER" = "install" -a "$UPDATE"
AddDefaultUsersets
AddCommonFiles
AddJMXFiles
@@ -32,7 +32,7 @@ diff -up GE2011.11/source/dist/inst_sge.rctemplates GE2011.11/source/dist/inst_s
StartQmaster
AddWindowsAdmin
AddHosts
-@@ -1085,7 +1081,6 @@ if [ "$EXECD" = "install" -a "$UPDATE" !
+@@ -1091,7 +1087,6 @@ if [ "$EXECD" = "install" -a "$UPDATE" !
GetLocalExecdSpoolDir
AddLocalConfiguration_With_Qconf
AddSubmitHostsExecd
@@ -40,7 +40,7 @@ diff -up GE2011.11/source/dist/inst_sge.rctemplates GE2011.11/source/dist/inst_s
SetupWinSvc execinst #service install during execd installation -> param: execinst
# CopyIBMLoadSensor
StartExecd
-@@ -1121,7 +1116,6 @@ if [ "$EXECD" = "install" -a "$UPDATE" !
+@@ -1127,7 +1122,6 @@ if [ "$EXECD" = "install" -a "$UPDATE" !
CheckHostNameResolving install
GetLocalExecdSpoolDir
AddLocalConfiguration_With_Qconf
@@ -48,7 +48,7 @@ diff -up GE2011.11/source/dist/inst_sge.rctemplates GE2011.11/source/dist/inst_s
SetupWinSvc execinst #service install during execd installation -> param: execinst
# CopyIBMLoadSensor
StartExecd
-@@ -1438,7 +1432,6 @@ if [ $SHADOW = "install" ]; then
+@@ -1444,7 +1438,6 @@ if [ $SHADOW = "install" ]; then
if [ $SHADOW_HOST = `$SGE_UTILBIN/gethostname -aname` ]; then
. $SGE_ROOT/$SGE_CELL/common/settings.sh
SGE_ARCH=`$SGE_ROOT/util/arch`
@@ -56,7 +56,7 @@ diff -up GE2011.11/source/dist/inst_sge.rctemplates GE2011.11/source/dist/inst_s
$INFOTEXT "Starting sge_shadowd on host %s\n" $SHADOW_HOST
$INFOTEXT -log "Starting sge_shadowd on host %s\n" $SHADOW_HOST
if [ "$SGE_ENABLE_SMF" = "true" ]; then
-@@ -1684,20 +1677,7 @@ if [ $MAKE_RC = "true" ]; then
+@@ -1690,20 +1683,7 @@ if [ $MAKE_RC = "true" ]; then
COMMONDIR=$SGE_CELL/common
@@ -78,9 +78,9 @@ diff -up GE2011.11/source/dist/inst_sge.rctemplates GE2011.11/source/dist/inst_s
fi
exit 0
-diff -up GE2011.11/source/dist/util/create_settings.sh.rctemplates GE2011.11/source/dist/util/create_settings.sh
---- GE2011.11/source/dist/util/create_settings.sh.rctemplates 2011-11-14 12:00:55.000000000 -0700
-+++ GE2011.11/source/dist/util/create_settings.sh 2012-03-01 15:05:53.348341362 -0700
+diff -up GE2011.11p1/source/dist/util/create_settings.sh.rctemplates GE2011.11p1/source/dist/util/create_settings.sh
+--- GE2011.11p1/source/dist/util/create_settings.sh.rctemplates 2012-05-23 13:04:48.000000000 -0600
++++ GE2011.11p1/source/dist/util/create_settings.sh 2012-07-09 14:14:11.614473681 -0600
@@ -67,8 +67,6 @@ SP_SH=$1/settings.sh
echo "setenv SGE_ROOT $SGE_ROOT" > $SP_CSH
echo "" >> $SP_CSH
@@ -105,7 +105,7 @@ diff -up GE2011.11/source/dist/util/create_settings.sh.rctemplates GE2011.11/sou
-echo 'switch ($ARCH)' >> $SP_CSH
-#ENFORCE_SHLIBPATH#echo 'case "sol*":' >> $SP_CSH
--#ENFORCE_SHLIBPATH#echo 'case "lx*":' >> $SP_CSH
+-#ENFORCE_SHLIBPATH#echo 'case "linux-*":' >> $SP_CSH
-#ENFORCE_SHLIBPATH#echo 'case "hp11-64":' >> $SP_CSH
-#ENFORCE_SHLIBPATH#echo ' breaksw' >> $SP_CSH
-echo 'case "*":' >> $SP_CSH
@@ -119,7 +119,7 @@ diff -up GE2011.11/source/dist/util/create_settings.sh.rctemplates GE2011.11/sou
-echo " unset shlib_path_name old_value" >> $SP_CSH
-echo "endsw" >> $SP_CSH
-echo "unset ARCH DEFAULTMANPATH MANTYPE" >> $SP_CSH
-+echo "unset ARCH" >> $SP_CSH
++echo "unset ARCH" >> $SP_CSH
#
# bourne shell settings file
@@ -145,7 +145,7 @@ diff -up GE2011.11/source/dist/util/create_settings.sh.rctemplates GE2011.11/sou
-echo '# library path setting required only for architectures where RUNPATH is not supported' >> $SP_SH
-echo 'case $ARCH in' >> $SP_SH
--#ENFORCE_SHLIBPATH#echo 'sol*|lx*|hp11-64)' >> $SP_SH
+-#ENFORCE_SHLIBPATH#echo 'sol*|linux-*|hp11-64)' >> $SP_SH
-#ENFORCE_SHLIBPATH#echo ' ;;' >> $SP_SH
-echo '*)' >> $SP_SH
-echo " shlib_path_name=\`\$SGE_ROOT/util/arch -lib\`" >> $SP_SH
@@ -160,12 +160,12 @@ diff -up GE2011.11/source/dist/util/create_settings.sh.rctemplates GE2011.11/sou
-echo ' ;;' >> $SP_SH
-echo 'esac' >> $SP_SH
-echo "unset ARCH DEFAULTMANPATH MANTYPE" >> $SP_SH
-+echo "unset ARCH" >> $SP_SH
++echo "unset ARCH" >> $SP_SH
-diff -up GE2011.11/source/dist/util/install_modules/inst_common.sh.rctemplates GE2011.11/source/dist/util/install_modules/inst_common.sh
---- GE2011.11/source/dist/util/install_modules/inst_common.sh.rctemplates 2012-03-01 15:05:53.316342514 -0700
-+++ GE2011.11/source/dist/util/install_modules/inst_common.sh 2012-03-01 15:05:53.352341218 -0700
-@@ -567,19 +567,16 @@ ErrUsage()
+diff -up GE2011.11p1/source/dist/util/install_modules/inst_common.sh.rctemplates GE2011.11p1/source/dist/util/install_modules/inst_common.sh
+--- GE2011.11p1/source/dist/util/install_modules/inst_common.sh.rctemplates 2012-07-09 14:11:10.565925359 -0600
++++ GE2011.11p1/source/dist/util/install_modules/inst_common.sh 2012-07-09 14:11:10.650922330 -0600
+@@ -576,19 +576,16 @@ ErrUsage()
#
GetConfigFromFile()
{
@@ -194,7 +194,7 @@ diff -up GE2011.11/source/dist/util/install_modules/inst_common.sh.rctemplates G
#-nosmf takes precedence over the value in the autoinstall template
if [ "$SGE_ENABLE_SMF_LAST" = false ]; then
SGE_ENABLE_SMF=false
-@@ -2364,20 +2361,28 @@ CreateSGEStartUpScripts()
+@@ -2373,20 +2370,28 @@ CreateSGEStartUpScripts()
rm -f $TMP_SGE_STARTUP_FILE ${TMP_SGE_STARTUP_FILE}.0 ${TMP_SGE_STARTUP_FILE}.1
@@ -231,9 +231,9 @@ diff -up GE2011.11/source/dist/util/install_modules/inst_common.sh.rctemplates G
#-------------------------------------------------------------------------
# AddSGEStartUpScript: Add startup script to rc files if root installs
#
-diff -up GE2011.11/source/dist/util/install_modules/inst_execd.sh.rctemplates GE2011.11/source/dist/util/install_modules/inst_execd.sh
---- GE2011.11/source/dist/util/install_modules/inst_execd.sh.rctemplates 2012-03-01 15:05:53.195346870 -0700
-+++ GE2011.11/source/dist/util/install_modules/inst_execd.sh 2012-03-01 15:05:53.354341146 -0700
+diff -up GE2011.11p1/source/dist/util/install_modules/inst_execd.sh.rctemplates GE2011.11p1/source/dist/util/install_modules/inst_execd.sh
+--- GE2011.11p1/source/dist/util/install_modules/inst_execd.sh.rctemplates 2012-07-09 14:11:10.574925038 -0600
++++ GE2011.11p1/source/dist/util/install_modules/inst_execd.sh 2012-07-09 14:11:10.651922294 -0600
@@ -457,7 +457,7 @@ StartExecd()
exit 1
fi
@@ -243,9 +243,9 @@ diff -up GE2011.11/source/dist/util/install_modules/inst_execd.sh.rctemplates GE
fi
$INFOTEXT -wait -auto $AUTO -n "\nHit <RETURN> to continue >> "
$CLEAR
-diff -up GE2011.11/source/dist/util/install_modules/inst_qmaster.sh.rctemplates GE2011.11/source/dist/util/install_modules/inst_qmaster.sh
---- GE2011.11/source/dist/util/install_modules/inst_qmaster.sh.rctemplates 2012-03-01 15:05:53.274344026 -0700
-+++ GE2011.11/source/dist/util/install_modules/inst_qmaster.sh 2012-03-01 15:05:53.361340894 -0700
+diff -up GE2011.11p1/source/dist/util/install_modules/inst_qmaster.sh.rctemplates GE2011.11p1/source/dist/util/install_modules/inst_qmaster.sh
+--- GE2011.11p1/source/dist/util/install_modules/inst_qmaster.sh.rctemplates 2012-07-09 14:11:10.597924218 -0600
++++ GE2011.11p1/source/dist/util/install_modules/inst_qmaster.sh 2012-07-09 14:11:10.653922222 -0600
@@ -208,8 +208,8 @@ GetQmasterSpoolDir()
"the qmaster daemon on other hosts (see the corresponding section in the\n" \
"Grid Engine Installation and Administration Manual for details) the account\n" \
@@ -293,9 +293,9 @@ diff -up GE2011.11/source/dist/util/install_modules/inst_qmaster.sh.rctemplates
if [ $? -ne 0 ]; then
$INFOTEXT "sge_qmaster start problem"
$INFOTEXT -log "sge_qmaster start problem"
-diff -up GE2011.11/source/scripts/distinst.rctemplates GE2011.11/source/scripts/distinst
---- GE2011.11/source/scripts/distinst.rctemplates 2012-03-01 15:05:53.295343270 -0700
-+++ GE2011.11/source/scripts/distinst 2012-03-01 15:05:53.362340858 -0700
+diff -up GE2011.11p1/source/scripts/distinst.rctemplates GE2011.11p1/source/scripts/distinst
+--- GE2011.11p1/source/scripts/distinst.rctemplates 2012-05-23 13:04:39.000000000 -0600
++++ GE2011.11p1/source/scripts/distinst 2012-07-09 14:11:10.655922152 -0600
@@ -839,15 +839,9 @@ if [ $instcommon = true ]; then
Execute cp libs/jgdi/util/logging.properties.template $DEST_SGE_ROOT/util
if [ $enforce_shlibpath = true ]; then
@@ -312,7 +312,7 @@ diff -up GE2011.11/source/scripts/distinst.rctemplates GE2011.11/source/scripts/
Execute sed -e "s/#ENFORCE_SHLIBPATH#//" dist/util/install_modules/inst_common.sh > $DEST_SGE_ROOT/util/install_modules/inst_common.sh
fi
-@@ -876,7 +870,6 @@ if [ $instcommon = true ]; then
+@@ -872,7 +866,6 @@ if [ $instcommon = true ]; then
Execute chmod 755 $DEST_SGE_ROOT/util/install_modules \
$DEST_SGE_ROOT/util/upgrade_modules \
@@ -320,7 +320,7 @@ diff -up GE2011.11/source/scripts/distinst.rctemplates GE2011.11/source/scripts/
$DEST_SGE_ROOT/util/resources \
$DEST_SGE_ROOT/util/sgeCA \
$DEST_SGE_ROOT/util/resources/calendars \
-@@ -901,7 +894,6 @@ if [ $instcommon = true ]; then
+@@ -897,7 +890,6 @@ if [ $instcommon = true ]; then
$DEST_SGE_ROOT/util/resources/starter_methods/*
Execute chmod 644 $DEST_SGE_ROOT/util/install_modules/* \
diff --git a/gridengine.spec b/gridengine.spec
index 8733ac6..6e75a47 100644
--- a/gridengine.spec
+++ b/gridengine.spec
@@ -11,8 +11,8 @@
# No updates should be pushed that bump this version in a stable release.
Name: gridengine
-Version: 2011.11
-Release: 4.svn131%{?dist}
+Version: 2011.11p1
+Release: 1%{?dist}
Summary: Grid Engine - Distributed Computing Management software
Group: Applications/System
@@ -42,11 +42,6 @@ Source9: gridengine.sysconfig
Source10: http://gridengine.sunsource.net/nonav/issues/showattachment.cgi/165/libcore.c
Source11: README
Source12: maketarball
-Patch0: gridengine-svn131.patch
-# Upstream security patches
-Patch1: env-code-injection-GE2011.11p1.patch
-Patch2: buffer-overflow.patch
-Patch3: symlink.patch
# Try to support arm architecture
Patch4: gridengine-arm.patch
# Don't need to make rc files in inst_common.sh
@@ -184,10 +179,6 @@ rm -r source/3rdparty/jemalloc
cp %SOURCE8 %SOURCE11 .
#Remove unneeded shbangs
sed -i -e '/^#! *\/bin\/sh/d' source/dist/util/install_modules/*.sh
-%patch0 -p1 -b .svn
-%patch1 -p0 -b .env-code-injection
-%patch2 -p0 -b .buffer-overflow
-%patch3 -p0 -b .symlink
%patch4 -p1 -b .arm
%patch10 -p1 -b .rctemplates
%patch11 -p1 -b .sge_ca
@@ -644,6 +635,11 @@ fi
%changelog
+* Mon Jul 9 2012 Orion Poplawski <orion at cora.nwra.com> 2011.11p1-1
+- Update to 2011.11p1
+- Drop env-code-injection, buffer-overflow, and symlink patches
+- Rebase rctemplates patch
+
* Fri Jul 6 2012 Orion Poplawski <orion at cora.nwra.com> 2011.11-4.svn131
- Add patch to set JAVA_LIB_ARCH on arm (bug 837137)
- Add BR hostname
diff --git a/sources b/sources
index c068b97..7f3a226 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
5ba34d534cdeda9afe74cd367cb51ce0 gridengine-ppc.tar.gz
-20e5b99f7121f5b32787d022adafe183 GE2011.11.tar.gz
+00e21254e4411bedd0691be7112ff113 GE2011.11p1.tar.gz
More information about the scm-commits
mailing list