rpms/tog-pegasus
5
0
Fork 0
Code Issues Pull Requests Releases Activity

update to 2.7.0, bugs fixed

Browse Source
This commit is contained in:
vcrhonek 2007-11-19 12:20:15 +00:00
parent 1fdbaa4bac
commit c5813fac0f
12 changed files with 447 additions and 203 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.cvsignore
View File

@ -6,3 +6,4 @@ pegasus-2.6.0.tar.gz
pegasus-2.6.0-cmpi-provider-lib.patch
pegasus-2.6.0-local-or-remote-auth.patch
pegasus-2.6.0-no-rpath.patch
pegasus-2.7.0.tar.gz

19
RedHat.OpenPegasus.Makefile
View File

@ -306,7 +306,7 @@ PEGSCHEMA= $(R)/Schemas/Pegasus/Internal/VER20/PG_SSLCertificate20.mof \
$(R)/Schemas/Pegasus/Internal/VER20/PG_SSLCertificateRevocationList20.mof \
$(R)/Schemas/Pegasus/InterOp/VER20/PG_Events20.mof
PEGMOF=$(addprefix $(D)$(share)/Pegasus/mof/Pegasus/,$(notdir $(CIMSCHEMA)))
LINKED_LIBS=$(D)/$(lib)/libpegclient.so.1 $(D)/$(lib)/libpegcommon.so.1 $(D)/$(lib)/libpegprovider.so.1 $(D)/$(lib)/libDefaultProviderManager.so.1 $(D)/$(lib)/libCIMxmlIndicationHandler.so.1 $(D)/$(lib)/libCMPIProviderManager.so.1 $(D)/$(lib)/Pegasus/providers/libComputerSystemProvider.so.1 $(D)/$(lib)/Pegasus/providers/libOSProvider.so.1 $(D)/$(lib)/Pegasus/providers/libProcessProvider.so.1
LINKED_LIBS=$(D)/$(lib)/libcmpiCppImpl.so.1 $(D)/$(lib)/libpegclient.so.1 $(D)/$(lib)/libpegcommon.so.1 $(D)/$(lib)/libpegprovider.so.1 $(D)/$(lib)/libDefaultProviderManager.so.1 $(D)/$(lib)/libCIMxmlIndicationHandler.so.1 $(D)/$(lib)/libCMPIProviderManager.so.1 $(D)/$(lib)/Pegasus/providers/libComputerSystemProvider.so.1 $(D)/$(lib)/Pegasus/providers/libOSProvider.so.1 $(D)/$(lib)/Pegasus/providers/libProcessProvider.so.1
export PEGASUS_STAGING_DIR := $(D)
BSX ?=
@ -336,16 +336,13 @@ $(D)/$(etc)/Pegasus/access.conf: $(R)/rpm/access.conf
$(D)/$(etc)/pam.d/wbem: $(R)/rpm/wbem
$(install) -m 0640 -o $(root_user) -g $(pegasus_user) -p $< $@
$(D)/$(share)/Pegasus/scripts/init_repository: $(R)/installs/scripts/init_repository
$(install) -m 0640 -o $(root_user) -g $(pegasus_user) -p $< $@
$(D)/$(share)/Pegasus/scripts/settogpath: $(R)/installs/scripts/settogpath
$(install) -m 0640 -o $(root_user) -g $(pegasus_user) -p $< $@
$(D)/$(share)/Pegasus/scripts/genOpenPegasusSSLCerts: $(R)/rpm/genOpenPegasusSSLCerts
$(install) -m 0640 -o $(root_user) -g $(pegasus_user) -p $< $@
config: $(D)/$(etc)/rc.d/init.d/tog-pegasus $(D)/$(etc)/Pegasus/access.conf $(D)/$(etc)/pam.d/wbem $(D)/$(share)/Pegasus/scripts/genOpenPegasusSSLCerts $(D)/$(share)/Pegasus/scripts/init_repository $(D)/$(share)/Pegasus/scripts/settogpath
config: $(D)/$(etc)/rc.d/init.d/tog-pegasus $(D)/$(etc)/Pegasus/access.conf $(D)/$(etc)/pam.d/wbem $(D)/$(share)/Pegasus/scripts/genOpenPegasusSSLCerts $(D)/$(share)/Pegasus/scripts/settogpath
$(D)/$(lib)/Pegasus/providers/%:
$(install) -m 0755 -o $(root_user) -g $(pegasus_user) -p $(B)/lib/$(patsubst Pegasus/providers/%,%,$*) $@
@ -383,9 +380,9 @@ mof: $(CIMSCHEMA) $(PEGSCHEMA)
$(install) -m 0644 -o $(root_user) -g $(root_user) -p $(PEGSCHEMA) $(D)/$(share)/Pegasus/mof/Pegasus
SDK:
/bin/mkdir -p $(PEGASUS_STAGING_DIR)/usr/share/doc/tog-pegasus-2.6/
/bin/mkdir -p $(PEGASUS_STAGING_DIR)/usr/share/doc/tog-pegasus-2.7/
$(MAKE) -f $(R)/mak/SDKMakefile stageSDK
/bin/rm -rf $(PEGASUS_STAGING_DIR)/usr/share/doc/tog-pegasus-2.6/
/bin/rm -rf $(PEGASUS_STAGING_DIR)/usr/share/doc/tog-pegasus-2.7/
if [ -n "$(BSX)" ]; then mv $(D)/$(share)/Pegasus/samples/mak/config.mak $(D)/$(share)/Pegasus/samples/mak/config.mak$(BSX); /bin/ln -s config.mak$(BSX) $(D)/$(share)/Pegasus/samples/mak/config.mak; fi;
touch SDK
@ -398,7 +395,7 @@ repository:
# test package :
TESTLIBS:=$(B)/lib/libFamilyProvider.so.1 $(B)/lib/libIndicationStressTestConsumer.so.1 $(B)/lib/libIndicationStressTestProvider.so.1 $(B)/lib/libSampleInstanceProvider.so.1 $(B)/lib/libSampleMethodProvider.so.1
TESTBINS:=$(B)/bin/TestAbstract $(B)/bin/TestArray $(B)/bin/TestBase64 $(B)/bin/TestClassDecl $(B)/bin/TestDateTime $(B)/bin/TestFlavor $(B)/bin/TestFormatter $(B)/bin/TestHashTable $(B)/bin/TestInstanceDecl $(B)/bin/TestLogger $(B)/bin/TestMethod $(B)/bin/TestObject $(B)/bin/TestOperationContext $(B)/bin/TestParamValue $(B)/bin/TestParameter $(B)/bin/TestProperty $(B)/bin/TestQualifier $(B)/bin/TestQualifierDecl $(B)/bin/TestQualifierList $(B)/bin/TestReference $(B)/bin/TestResolve $(B)/bin/TestResponseHandler $(B)/bin/TestScope $(B)/bin/TestStack $(B)/bin/TestStopwatch $(B)/bin/TestStrToInstName $(B)/bin/TestString $(B)/bin/TestTimeValue $(B)/bin/TestToMof $(B)/bin/TestValidateClass $(B)/bin/TestValue $(B)/bin/TestClient $(B)/bin/TestOSTestClient $(B)/bin/TestPegClientInvokeMethod2 $(B)/bin/TestIndicationStressTest $(B)/bin/TestAsyncQueue $(B)/bin/TestList $(B)/bin/TestTracer
TESTBINS:=$(B)/bin/TestAbstract $(B)/bin/TestArray $(B)/bin/TestAsyncQueue $(B)/bin/TestBase64 $(B)/bin/TestClassDecl $(B)/bin/TestDateTime $(B)/bin/TestFlavor $(B)/bin/TestFormatter $(B)/bin/TestHashTable $(B)/bin/TestInstanceDecl $(B)/bin/TestList $(B)/bin/TestLogger $(B)/bin/TestMethod $(B)/bin/TestObject $(B)/bin/TestOperationContext $(B)/bin/TestParamValue $(B)/bin/TestParameter $(B)/bin/TestProperty $(B)/bin/TestQualifier $(B)/bin/TestQualifierDecl $(B)/bin/TestQualifierList $(B)/bin/TestReference $(B)/bin/TestResolve $(B)/bin/TestResponseHandler $(B)/bin/TestScope $(B)/bin/TestStack $(B)/bin/TestStopwatch $(B)/bin/TestStrToInstName $(B)/bin/TestString $(B)/bin/TestTimeValue $(B)/bin/TestToMof $(B)/bin/TestTracer $(B)/bin/TestValidateClass $(B)/bin/TestValue $(B)/bin/TestClient $(B)/bin/TestOSTestClient $(B)/bin/TestPegClientInvokeMethod2 $(B)/bin/TestIndicationStressTest
$(B)/lib/libFamilyProvider.so.1: $(B)/lib/libpegcommon.so.1
$(MAKE) -C $(R)/src/Providers/TestProviders/FamilyProvider
@ -421,6 +418,9 @@ $(B)/bin/TestAbstract: $(B)/lib/libpegcommon.so.1
$(B)/bin/TestArray: $(B)/lib/libpegcommon.so.1
$(MAKE) -C $(R)/src/Pegasus/Common/tests/Array
$(B)/bin/TestAsyncQueue: $(B)/lib/libpegcommon.so.1
$(MAKE) -C $(R)/src/Pegasus/Common/tests/AsyncQueue
$(B)/bin/TestBase64: $(B)/lib/libpegcommon.so.1
$(MAKE) -C $(R)/src/Pegasus/Common/tests/Base64
@ -442,6 +442,9 @@ $(B)/bin/TestHashTable: $(B)/lib/libpegcommon.so.1
$(B)/bin/TestInstanceDecl: $(B)/lib/libpegcommon.so.1
$(MAKE) -C $(R)/src/Pegasus/Common/tests/InstanceDecl
$(B)/bin/TestList: $(B)/lib/libpegcommon.so.1
$(MAKE) -C $(R)/src/Pegasus/Common/tests/List
$(B)/bin/TestLogger: $(B)/lib/libpegcommon.so.1
$(MAKE) -C $(R)/src/Pegasus/Common/tests/Logger

103
pegasus-2.6.0-multilib.patch Normal file
View File

@ -0,0 +1,103 @@
--- pegasus/mak/SDKMakefile_old 2006-09-28 02:18:17.000000000 +0200
+++ pegasus/mak/SDKMakefile 2007-06-22 11:40:23.000000000 +0200
@@ -283,18 +283,52 @@
>> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
@$(ECHO) "endif" \
>> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
- @$(ECHO) "ifndef PEGASUS_DEST_LIB_DIR" \
- >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
- @$(ECHO) " PEGASUS_DEST_LIB_DIR = $(PEGASUS_DEST_LIB_DIR)" \
- >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
- @$(ECHO) "endif" \
- >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
- @$(ECHO) "ifndef PEGASUS_PROVIDER_LIB_DIR" \
- >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
- @$(ECHO) " PEGASUS_PROVIDER_LIB_DIR = $(PEGASUS_PROVIDER_LIB_DIR)" \
- >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
- @$(ECHO) "endif" \
- >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) 'ifndef PEGASUS_DEST_LIB_DIR' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) ' ifeq ($$(shell uname -i),ia64)' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) ' PEGASUS_DEST_LIB_DIR = /usr/lib' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) ' endif' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) ' ifeq ($$(shell uname -i),i386)' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) ' PEGASUS_DEST_LIB_DIR = /usr/lib' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) ' endif' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) ' ifeq ($$(shell uname -i),ppc)' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) ' PEGASUS_DEST_LIB_DIR = /usr/lib' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) ' endif' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) ' ifeq ($$(shell uname -i),ppc64)' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) ' PEGASUS_DEST_LIB_DIR = /usr/lib64' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) ' endif' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) ' ifeq ($$(shell uname -i),s390)' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) ' PEGASUS_DEST_LIB_DIR = /usr/lib' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) ' endif' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) ' ifeq ($$(shell uname -i),s390x)' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) ' PEGASUS_DEST_LIB_DIR = /usr/lib64' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) ' endif' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) ' ifeq ($$(shell uname -i),x86_64)' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) ' PEGASUS_DEST_LIB_DIR = /usr/lib64' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) ' endif' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) 'endif' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) 'ifndef PEGASUS_PROVIDER_LIB_DIR' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) ' ifeq ($$(shell uname -i),ia64)' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) ' PEGASUS_PROVIDER_LIB_DIR = /usr/lib/Pegasus/providers' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) ' endif' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) ' ifeq ($$(shell uname -i),i386)' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) ' PEGASUS_PROVIDER_LIB_DIR = /usr/lib/Pegasus/providers' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) ' endif' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) ' ifeq ($$(shell uname -i),ppc)' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) ' PEGASUS_PROVIDER_LIB_DIR = /usr/lib/Pegasus/providers' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) ' endif' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) ' ifeq ($$(shell uname -i),ppc64)' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) ' PEGASUS_PROVIDER_LIB_DIR = /usr/lib64/Pegasus/providers' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) ' endif' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) ' ifeq ($$(shell uname -i),s390)' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) ' PEGASUS_PROVIDER_LIB_DIR = /usr/lib/Pegasus/providers' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) ' endif' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) ' ifeq ($$(shell uname -i),s390x)' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) ' PEGASUS_PROVIDER_LIB_DIR = /usr/lib64/Pegasus/providers' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) ' endif' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) ' ifeq ($$(shell uname -i),x86_64)' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) ' PEGASUS_PROVIDER_LIB_DIR = /usr/lib64/Pegasus/providers' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) ' endif' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) 'endif' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
@$(ECHO) "ifndef PEGASUS_SAMPLES_DIR" \
>> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
@$(ECHO) " PEGASUS_SAMPLES_DIR = $(PEGASUS_SAMPLES_DIR)" \
@@ -345,12 +379,29 @@
>> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
createConfigFile:
- @$(ECHO) "ifndef PEGASUS_PLATFORM" \
- > $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
- @$(ECHO) " PEGASUS_PLATFORM = $(PEGASUS_PLATFORM)" \
- >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
- @$(ECHO) "endif" \
- >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
+ @$(ECHO) 'ifndef PEGASUS_PLATFORM' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
+ @$(ECHO) ' ifeq ($$(shell uname -i),ia64)' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
+ @$(ECHO) ' PEGASUS_PLATFORM = LINUX_IA64_GNU' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
+ @$(ECHO) ' endif' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
+ @$(ECHO) ' ifeq ($$(shell uname -i),i386)' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
+ @$(ECHO) ' PEGASUS_PLATFORM = LINUX_IX86_GNU' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
+ @$(ECHO) ' endif' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
+ @$(ECHO) ' ifeq ($$(shell uname -i),ppc)' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
+ @$(ECHO) ' PEGASUS_PLATFORM = LINUX_PPC_GNU' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
+ @$(ECHO) ' endif' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
+ @$(ECHO) ' ifeq ($$(shell uname -i),ppc64)' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
+ @$(ECHO) ' PEGASUS_PLATFORM = LINUX_PPC64_GNU' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
+ @$(ECHO) ' endif' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
+ @$(ECHO) ' ifeq ($$(shell uname -i),s390)' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
+ @$(ECHO) ' PEGASUS_PLATFORM = LINUX_ZSERIES_GNU' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
+ @$(ECHO) ' endif' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
+ @$(ECHO) ' ifeq ($$(shell uname -i),s390x)' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
+ @$(ECHO) ' PEGASUS_PLATFORM = LINUX_ZSERIES64_GNU' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
+ @$(ECHO) ' endif' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
+ @$(ECHO) ' ifeq ($$(shell uname -i),x86_64)' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
+ @$(ECHO) ' PEGASUS_PLATFORM = LINUX_X86_64_GNU' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
+ @$(ECHO) ' endif' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
+ @$(ECHO) 'endif' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
@$(ECHO) "" \
>> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
@$(CAT) $(PEGASUS_ROOT)/src/SDK/samples/mak/config.mak \

81
pegasus-2.6.1-init_script.patch
View File

@ -1,81 +0,0 @@
--- pegasus-2.6.1/rpm/tog-pegasus.rc_old 2007-08-30 09:30:13.000000000 +0200
+++ pegasus-2.6.1/rpm/tog-pegasus.rc 2007-08-30 10:21:42.000000000 +0200
@@ -5,17 +5,22 @@
# processname: cimserver
# pidfile: /var/run/tog-pegasus/cimserver.pid
#
+
+### BEGIN INIT INFO
+# Provides: lsb-pegasus
+# Required-Start: $syslog $network
+# Should-Start: $time
+# Required-Stop: $syslog
+# Default-Start: 3 5
+# Default-Stop: 0 1 2 6
+# Description: init script for Pegasus CIMServer
+### END INIT INFO
+
CIMSERVER_BIN=/usr/sbin/cimserver
prog=cimserver
LOCKFILE=/var/lock/subsys/tog-pegasus
. /etc/rc.d/init.d/functions
-if [ ! -x $CIMSERVER_BIN ]; then
- echo -n "tog-pegasus $1: $CIMSERVER_BIN not found or not executable.";
- failure;
- exit 1;
-fi;
-
[ -e /etc/sysconfig/tog-pegasus ] && . /etc/sysconfig/tog-pegasus;
PEGASUS_SSL_CONF_FILE=${PEGASUS_SSL_CONF_FILE:=/etc/Pegasus/ssl.cnf}
@@ -26,7 +31,26 @@
RETVAL=0
case "$1" in
- start)
+ start)
+ pid=`pidofproc $CIMSERVER_BIN`
+ RETVAL=$?
+ if [ "$RETVAL" -eq 0 ]; then
+ echo "tog-pegasus $1: $CIMSERVER_BIN is already running";
+ exit 0;
+ fi;
+
+ if [ ! -e $CIMSERVER_BIN ]; then
+ echo "tog-pegasus $1: $CIMSERVER_BIN not found";
+ failure;
+ exit 5;
+ fi;
+
+ if [ ! -x $CIMSERVER_BIN ]; then
+ echo "tog-pegasus $1: $CIMSERVER_BIN not executable";
+ failure;
+ exit 4;
+ fi;
+
if [ ! -e ${PEGASUS_SSL_CONF_FILE} ] || [ ! -e ${PEGASUS_SSL_CERT_FILE} ] ||
[ ! -e ${PEGASUS_SSL_KEY_FILE} ] || [ ! -e ${PEGASUS_SSL_TRUSTSTORE} ]; then
if [ -x /usr/share/Pegasus/scripts/genOpenPegasusSSLCerts ]; then
@@ -71,10 +95,10 @@
RETVAL=$?
if [ "$RETVAL" -eq 0 ]; then
echo -n $"CIM server ($pid) is running";
- success;
+ RETVAL=0
else
echo -n $"CIM server is not running";
- failure;
+ RETVAL=3
fi
echo
;;
@@ -103,7 +127,7 @@
;;
*)
echo "Usage: $0 {start|stop|status|restart|reload|force-reload|try-restart}"
- exit 1
+ RETVAL=3
esac
exit $RETVAL

121
pegasus-2.7.0-PIE.patch Normal file
View File

@ -0,0 +1,121 @@
--- pegasus/src/Pegasus/Server/Makefile_old 2007-11-08 10:57:26.000000000 +0100
+++ pegasus/src/Pegasus/Server/Makefile 2007-11-08 10:58:14.000000000 +0100
@@ -34,6 +34,8 @@
include $(ROOT)/mak/config.mak
+FLAGS := $(FLAGS:-fPIC=-fPIE)
+
EXTRA_INCLUDES = $(SYS_INCLUDES)
LOCAL_DEFINES = -DPEGASUS_SERVER_INTERNAL -DPEGASUS_INTERNALONLY
--- pegasus/src/Pegasus/ProviderManagerService/ProviderAgent/Makefile_old 2007-11-08 11:00:46.000000000 +0100
+++ pegasus/src/Pegasus/ProviderManagerService/ProviderAgent/Makefile 2007-11-08 11:01:03.000000000 +0100
@@ -34,6 +34,8 @@
include $(ROOT)/mak/config.mak
+FLAGS := $(FLAGS:-fPIC=-fPIE)
+
LIBRARIES = \
pegpmservice \
pegprovidermanager \
--- pegasus/src/Pegasus/Compiler/cmdline/cimmof/Makefile_old 2007-11-08 11:01:34.000000000 +0100
+++ pegasus/src/Pegasus/Compiler/cmdline/cimmof/Makefile 2007-11-08 11:01:57.000000000 +0100
@@ -32,6 +32,8 @@
DIR = Pegasus/Compiler/cmdline/cimmof
include $(ROOT)/mak/config.mak
+FLAGS := $(FLAGS:-fPIC=-fPIE)
+
LOCAL_DEFINES = -DPEGASUS_CMDLINE_INTERNAL -DPEGASUS_INTERNALONLY
LIBRARIES = \
--- pegasus/src/Pegasus/Compiler/cmdline/cimmofl/Makefile_old 2007-11-08 11:02:29.000000000 +0100
+++ pegasus/src/Pegasus/Compiler/cmdline/cimmofl/Makefile 2007-11-08 11:02:43.000000000 +0100
@@ -32,6 +32,8 @@
DIR = Pegasus/Compiler/cmdline/cimmofl
include $(ROOT)/mak/config.mak
+FLAGS := $(FLAGS:-fPIC=-fPIE)
+
LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
PROGRAM = cimmofl
--- pegasus/src/Clients/cimconfig/Makefile_old 2007-11-08 11:03:43.000000000 +0100
+++ pegasus/src/Clients/cimconfig/Makefile 2007-11-08 11:04:03.000000000 +0100
@@ -36,6 +36,8 @@
include $(ROOT)/mak/config.mak
+FLAGS := $(FLAGS:-fPIC=-fPIE)
+
LIBRARIES = \
pegcliutils \
pegclient \
--- pegasus/src/Clients/cimprovider/Makefile_old 2007-11-08 11:04:16.000000000 +0100
+++ pegasus/src/Clients/cimprovider/Makefile 2007-11-08 11:04:30.000000000 +0100
@@ -36,6 +36,8 @@
include $(ROOT)/mak/config.mak
+FLAGS := $(FLAGS:-fPIC=-fPIE)
+
LIBRARIES = \
pegcliutils \
pegclient \
--- pegasus/src/Clients/cimuser/Makefile_old 2007-11-08 11:04:47.000000000 +0100
+++ pegasus/src/Clients/cimuser/Makefile 2007-11-08 11:05:02.000000000 +0100
@@ -36,6 +36,8 @@
include $(ROOT)/mak/config.mak
+FLAGS := $(FLAGS:-fPIC=-fPIE)
+
LIBRARIES = \
pegcliutils \
pegclient \
--- pegasus/src/Clients/wbemexec/Makefile_old 2007-11-08 11:05:25.000000000 +0100
+++ pegasus/src/Clients/wbemexec/Makefile 2007-11-08 11:05:49.000000000 +0100
@@ -36,6 +36,8 @@
include $(ROOT)/mak/config.mak
+FLAGS := $(FLAGS:-fPIC=-fPIE)
+
LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
LIBRARIES = \
--- pegasus/src/Clients/cimauth/Makefile_old 2007-11-08 11:06:04.000000000 +0100
+++ pegasus/src/Clients/cimauth/Makefile 2007-11-08 11:06:21.000000000 +0100
@@ -36,6 +36,8 @@
include $(ROOT)/mak/config.mak
+FLAGS := $(FLAGS:-fPIC=-fPIE)
+
LIBRARIES = \
pegcliutils \
pegclient \
--- pegasus/src/Clients/repupgrade/Makefile_old 2007-11-08 11:06:46.000000000 +0100
+++ pegasus/src/Clients/repupgrade/Makefile 2007-11-08 11:07:03.000000000 +0100
@@ -36,6 +36,8 @@
include $(ROOT)/mak/config.mak
+FLAGS := $(FLAGS:-fPIC=-fPIE)
+
LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
LIBRARIES = \
--- pegasus/src/Clients/osinfo/Makefile_old 2007-11-08 11:07:15.000000000 +0100
+++ pegasus/src/Clients/osinfo/Makefile 2007-11-08 11:07:29.000000000 +0100
@@ -35,6 +35,8 @@
DIR = Clients/osinfo
include $(ROOT)/mak/config.mak
+FLAGS := $(FLAGS:-fPIC=-fPIE)
+
LIBRARIES = \
pegcliutils \
peggetoopt \

55
pegasus-2.7.0-cmpiheaders.patch Normal file
View File

@ -0,0 +1,55 @@
--- pegasus/src/Pegasus/Provider/CMPI/cmpidt.h_old 2007-11-07 12:30:36.000000000 +0100
+++ pegasus/src/Pegasus/Provider/CMPI/cmpidt.h 2007-11-07 12:32:07.000000000 +0100
@@ -34,6 +34,8 @@
#ifndef _CMPIDT_H_
# define _CMPIDT_H_
+# include <stdio.h>
+
# include "cmpipl.h"
# ifdef __cplusplus
--- pegasus/src/Pegasus/Provider/CMPI/CmpiArgs.h_old 2007-11-07 12:32:25.000000000 +0100
+++ pegasus/src/Pegasus/Provider/CMPI/CmpiArgs.h 2007-11-07 12:33:13.000000000 +0100
@@ -49,7 +49,7 @@
passed to methodInvocation functions.
*/
-class CmpiArgs : public CmpiObject
+class PEGASUS_CMPI_PROVIDER_LINKAGE CmpiArgs : public CmpiObject
{
friend class CmpiBroker;
friend class CmpiMethodMI;
--- pegasus/mak/SDKMakefile_old 2007-11-07 12:33:39.000000000 +0100
+++ pegasus/mak/SDKMakefile 2007-11-07 12:40:52.000000000 +0100
@@ -118,6 +118,30 @@
# CMPI header files
INCLUDE_FILES += \
+ Pegasus/Provider/CMPI/CmpiArgs.h \
+ Pegasus/Provider/CMPI/CmpiArray.h \
+ Pegasus/Provider/CMPI/CmpiAssociationMI.h \
+ Pegasus/Provider/CMPI/CmpiBaseMI.h \
+ Pegasus/Provider/CMPI/CmpiBooleanData.h \
+ Pegasus/Provider/CMPI/CmpiBroker.h \
+ Pegasus/Provider/CMPI/CmpiCharData.h \
+ Pegasus/Provider/CMPI/CmpiContext.h \
+ Pegasus/Provider/CMPI/CmpiData.h \
+ Pegasus/Provider/CMPI/CmpiDateTime.h \
+ Pegasus/Provider/CMPI/CmpiEnumeration.h \
+ Pegasus/Provider/CMPI/CmpiIndicationMI.h \
+ Pegasus/Provider/CMPI/CmpiInstance.h \
+ Pegasus/Provider/CMPI/CmpiInstanceMI.h \
+ Pegasus/Provider/CMPI/CmpiMethodMI.h \
+ Pegasus/Provider/CMPI/CmpiObject.h \
+ Pegasus/Provider/CMPI/CmpiObjectPath.h \
+ Pegasus/Provider/CMPI/CmpiPropertyMI.h \
+ Pegasus/Provider/CMPI/CmpiProviderBase.h \
+ Pegasus/Provider/CMPI/CmpiResult.h \
+ Pegasus/Provider/CMPI/CmpiSelectExp.h \
+ Pegasus/Provider/CMPI/CmpiStatus.h \
+ Pegasus/Provider/CMPI/CmpiString.h \
+ Pegasus/Provider/CMPI/Linkage.h \
Pegasus/Provider/CMPI/cmpift.h \
Pegasus/Provider/CMPI/cmpidt.h \
Pegasus/Provider/CMPI/cmpimacs.h \

72
pegasus-2.5.1-initscript.patch → pegasus-2.7.0-initscript.patch
View File

@ -1,6 +1,6 @@
--- pegasus/rpm/tog-pegasus.rc.initscript 2006-01-30 11:16:24.000000000 -0500
+++ pegasus/rpm/tog-pegasus.rc 2006-05-02 18:44:18.000000000 -0400
@@ -1,80 +1,84 @@
--- pegasus/rpm/tog-pegasus.rc_old 2006-01-30 17:16:24.000000000 +0100
+++ pegasus/rpm/tog-pegasus.rc 2007-11-08 10:50:40.000000000 +0100
@@ -1,80 +1,108 @@
-#//%2006////////////////////////////////////////////////////////////////////////
-#//
-#// Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development
@ -34,18 +34,6 @@
-#! /bin/sh
-#//
-#//%/////////////////////////////////////////////////////////////////////////////
-
-### BEGIN INIT INFO
-# Provides: tog-pegasus
-# Required-Start: $syslog $network
-# Should-Start: $time
-# Required-Stop: $syslog
-# Default-Start: 3 5
-# Default-Stop: 0 1 2 6
-# Description: init script for Pegasus CIM server
-### END INIT INFO
-
-CIMSERVER_BIN=/opt/tog-pegasus/sbin/cimserver
+#!/bin/bash
+#
+# chkconfig: - 98 1
@ -53,18 +41,26 @@
+# processname: cimserver
+# pidfile: /var/run/tog-pegasus/cimserver.pid
+#
### BEGIN INIT INFO
-# Provides: tog-pegasus
+# Provides: lsb-pegasus
# Required-Start: $syslog $network
# Should-Start: $time
# Required-Stop: $syslog
# Default-Start: 3 5
# Default-Stop: 0 1 2 6
-# Description: init script for Pegasus CIM server
+# Description: init script for Pegasus CIMServer
### END INIT INFO
-CIMSERVER_BIN=/opt/tog-pegasus/sbin/cimserver
+CIMSERVER_BIN=/usr/sbin/cimserver
prog=cimserver
+LOCKFILE=/var/lock/subsys/tog-pegasus
+. /etc/rc.d/init.d/functions
-test -x $CIMSERVER_BIN || exit 5
+if [ ! -x $CIMSERVER_BIN ]; then
+ echo -n "tog-pegasus $1: $CIMSERVER_BIN not found or not executable.";
+ failure;
+ exit 1;
+fi;
+
+[ -e /etc/sysconfig/tog-pegasus ] && . /etc/sysconfig/tog-pegasus;
+
+PEGASUS_SSL_CONF_FILE=${PEGASUS_SSL_CONF_FILE:=/etc/Pegasus/ssl.cnf}
@ -76,8 +72,26 @@
RETVAL=0
case "$1" in
- start)
+ start)
start)
+ pid=`pidofproc $CIMSERVER_BIN`
+ RETVAL=$?
+ if [ "$RETVAL" -eq 0 ]; then
+ echo "tog-pegasus $1: $CIMSERVER_BIN is already running";
+ exit 0;
+ fi;
+
+ if [ ! -e $CIMSERVER_BIN ]; then
+ echo "tog-pegasus $1: $CIMSERVER_BIN not found";
+ failure;
+ exit 5;
+ fi;
+
+ if [ ! -x $CIMSERVER_BIN ]; then
+ echo "tog-pegasus $1: $CIMSERVER_BIN not executable";
+ failure;
+ exit 4;
+ fi;
+
+ if [ ! -e ${PEGASUS_SSL_CONF_FILE} ] || [ ! -e ${PEGASUS_SSL_CERT_FILE} ] ||
+ [ ! -e ${PEGASUS_SSL_KEY_FILE} ] || [ ! -e ${PEGASUS_SSL_TRUSTSTORE} ]; then
+ if [ -x /usr/share/Pegasus/scripts/genOpenPegasusSSLCerts ]; then
@ -127,11 +141,11 @@
if [ "$RETVAL" -eq 0 ]; then
- echo "CIM server is running"
+ echo -n $"CIM server ($pid) is running";
+ success;
+ RETVAL=0
else
- echo "CIM server is not running"
+ echo -n $"CIM server is not running";
+ failure;
+ RETVAL=3
fi
+ echo
;;
@ -139,7 +153,7 @@
condrestart)
pid=`pidofproc $CIMSERVER_BIN`
RETVAL=$?
@@ -83,13 +87,18 @@
@@ -83,18 +111,23 @@
RETVAL=$?;
fi;
;;
@ -161,3 +175,9 @@
reload)
;;
*)
echo "Usage: $0 {start|stop|status|restart|reload|force-reload|try-restart}"
- exit 1
+ RETVAL=3
esac
exit $RETVAL

32
pegasus-2.6.0-no-rpath.patch → pegasus-2.7.0-no-rpath.patch
View File

@ -1,6 +1,5 @@
diff -Nur pegasus.orig/mak/program-unix.mak pegasus/mak/program-unix.mak
--- pegasus.orig/mak/program-unix.mak 2006-01-30 10:16:23.000000000 -0600
+++ pegasus/mak/program-unix.mak 2007-02-22 14:03:24.000000000 -0600
--- pegasus/mak/program-unix.mak_old 2007-08-01 10:16:28.000000000 +0200
+++ pegasus/mak/program-unix.mak 2007-11-07 10:29:36.000000000 +0100
@@ -30,22 +30,12 @@
#//==============================================================================
INCLUDES = -I$(ROOT)/src $(EXTRA_INCLUDES)
@ -23,33 +22,32 @@ diff -Nur pegasus.orig/mak/program-unix.mak pegasus/mak/program-unix.mak
-
TMP_OBJECTS = $(foreach i,$(SOURCES),$(OBJ_DIR)/$i)
ifeq ($(OS_TYPE),windows)
@@ -110,17 +100,17 @@
S_OBJECTS = $(TMP_OBJECTS:.s=.o)
@@ -109,17 +99,17 @@
ifdef ICU_ROOT
ifdef ICU_INSTALL
ifdef PEGASUS_USE_RELEASE_DIRS
- $(LINK_WRAPPER) $(CXX) $(FLAGS) $(EXTRA_LINK_FLAGS) $(LINK_RPATH) $(LINK_DEST_LIB) $(LINK_RPATH_LINK) $(LINK_LIB_DIR) $(LINK_RPATH) $(LINK_ICU) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS)
+ $(LINK_WRAPPER) $(CXX) $(FLAGS) $(EXTRA_LINK_FLAGS) $(LINK_ICU) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS)
- $(LINK_WRAPPER) $(CXX) $(FLAGS) $(EXTRA_LINK_FLAGS) $(LINK_RPATH) $(LINK_DEST_LIB) $(LINK_RPATH_LINK) $(LINK_LIB_DIR) $(LINK_RPATH) $(LINK_ICU) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS) $(EXTRA_LIBRARIES)
+ $(LINK_WRAPPER) $(CXX) $(FLAGS) $(EXTRA_LINK_FLAGS) $(LINK_ICU) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS) $(EXTRA_LIBRARIES)
else
- $(LINK_WRAPPER) $(CXX) $(FLAGS) $(EXTRA_LINK_FLAGS) $(LINK_RPATH) $(LINK_LIB_DIR) $(LINK_RPATH) $(LINK_ICU) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS)
+ $(LINK_WRAPPER) $(CXX) $(FLAGS) $(EXTRA_LINK_FLAGS) $(LINK_ICU) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS)
- $(LINK_WRAPPER) $(CXX) $(FLAGS) $(EXTRA_LINK_FLAGS) $(LINK_RPATH) $(LINK_LIB_DIR) $(LINK_RPATH) $(LINK_ICU) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS) $(EXTRA_LIBRARIES)
+ $(LINK_WRAPPER) $(CXX) $(FLAGS) $(EXTRA_LINK_FLAGS) $(LINK_ICU) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS) $(EXTRA_LIBRARIES)
endif
endif
endif
else
ifdef PEGASUS_USE_RELEASE_DIRS
- $(LINK_WRAPPER) $(CXX) $(FLAGS) $(EXTRA_LINK_FLAGS) $(LINK_RPATH) $(LINK_DEST_LIB) $(LINK_RPATH_LINK) $(LINK_LIB_DIR) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS)
+ $(LINK_WRAPPER) $(CXX) $(FLAGS) $(EXTRA_LINK_FLAGS) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS)
- $(LINK_WRAPPER) $(CXX) $(FLAGS) $(EXTRA_LINK_FLAGS) $(LINK_RPATH) $(LINK_DEST_LIB) $(LINK_RPATH_LINK) $(LINK_LIB_DIR) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS) $(EXTRA_LIBRARIES)
+ $(LINK_WRAPPER) $(CXX) $(FLAGS) $(EXTRA_LINK_FLAGS) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS) $(EXTRA_LIBRARIES)
else
- $(LINK_WRAPPER) $(CXX) $(FLAGS) $(EXTRA_LINK_FLAGS) $(LINK_RPATH) $(LINK_LIB_DIR) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS)
+ $(LINK_WRAPPER) $(CXX) $(FLAGS) $(EXTRA_LINK_FLAGS) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS)
- $(LINK_WRAPPER) $(CXX) $(FLAGS) $(EXTRA_LINK_FLAGS) $(LINK_RPATH) $(LINK_LIB_DIR) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS) $(EXTRA_LIBRARIES)
+ $(LINK_WRAPPER) $(CXX) $(FLAGS) $(EXTRA_LINK_FLAGS) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS) $(EXTRA_LIBRARIES)
endif
endif
else
diff -Nur pegasus.orig/mak/shared-library-unix.mak pegasus/mak/shared-library-unix.mak
--- pegasus.orig/mak/shared-library-unix.mak 2006-12-01 16:40:22.000000000 -0600
+++ pegasus/mak/shared-library-unix.mak 2007-02-22 11:01:46.000000000 -0600
@@ -108,14 +108,14 @@
--- pegasus/mak/shared-library-unix.mak_old 2007-11-07 10:29:56.000000000 +0100
+++ pegasus/mak/shared-library-unix.mak 2007-11-07 10:38:10.000000000 +0100
@@ -107,14 +107,14 @@
ifneq ($(OS),darwin)
ifdef PEGASUS_USE_RELEASE_DIRS
LINK_COMMAND = $(CXX) -shared $(LINK_MACHINE_OPTIONS)

11
pegasus-2.7.0-no_privilege_separation.patch Normal file
View File

@ -0,0 +1,11 @@
--- pegasus/env_var_Linux.status_old 2007-11-12 16:30:16.000000000 +0100
+++ pegasus/env_var_Linux.status 2007-11-12 16:30:58.000000000 +0100
@@ -35,7 +35,7 @@
PEGASUS_USE_SYSLOGS=true
PEGASUS_CIM_SCHEMA=CIM2131
PEGASUS_USE_NET_SNMP=true
-PEGASUS_ENABLE_PRIVILEGE_SEPARATION=true
+PEGASUS_ENABLE_PRIVILEGE_SEPARATION=false
PEGASUS_PROD_DIR = /usr
PEGASUS_SBIN_DIR = $(PEGASUS_PROD_DIR)/sbin

86
pegasus-2.5.1-redhat-config.patch → pegasus-2.7.0-redhat-config.patch
View File

@ -1,6 +1,42 @@
--- pegasus/env_var_Linux.status.redhat-config 2006-03-15 20:33:51.000000000 -0500
+++ pegasus/env_var_Linux.status 2006-04-12 13:46:18.000000000 -0400
@@ -18,7 +18,9 @@
--- pegasus/mak/config-linux.mak_old 2007-11-07 11:10:31.000000000 +0100
+++ pegasus/mak/config-linux.mak 2007-11-07 11:14:48.000000000 +0100
@@ -119,7 +119,8 @@
ifdef PEGASUS_USE_DEBUG_BUILD_OPTIONS
FLAGS += -g
else
- FLAGS += -s
+# FLAGS += -s
+# ^= let rpm handle stripping
#
# The -fno-enforce-eh-specs is not available in 2.9.5 and it probably
# appeared in the 3.0 series of compilers.
--- pegasus/Makefile.Release_old 2007-11-07 10:49:01.000000000 +0100
+++ pegasus/Makefile.Release 2007-11-07 11:08:05.000000000 +0100
@@ -366,10 +366,10 @@
$(foreach i, $(MANAGEDSYSTEM_MOF_FILES), $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Pr__r__r__)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_MOF_DIR)/Pegasus/$(i);)
stage_PegasusVarDataDirectoryFiles: FORCE
- $(COPY) $(ROOT)/src/Server/cimserver_planned.conf $(PEGASUS_STAGING_DIR)$(PEGASUS_VARDATA_DIR)/$(PEGASUS_PLANNED_CONFIG_FILE)
+ $(COPY) $(ROOT)/src/Server/cimserver_planned.conf $(PEGASUS_STAGING_DIR)$(PEGASUS_CONFIG_DIR)/$(PEGASUS_PLANNED_CONFIG_FILE)
setpermissions_PegasusVarDataDirectoryFiles: FORCE
- $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Prw_r__r__)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_VARDATA_DIR)/$(PEGASUS_PLANNED_CONFIG_FILE)
+ $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Pr________)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_CONFIG_DIR)/$(PEGASUS_PLANNED_CONFIG_FILE)
stage_genOpenPegasusSSLCertsFile: FORCE
@$(RM) $(PEGASUS_STAGING_DIR)$(PEGASUS_SCRIPT_DIR)/genOpenPegasusSSLCerts
@@ -1037,7 +1037,7 @@
"/etc/init.d/tog-pegasus" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
@$(ECHO-E) "%config(noreplace) %attr($(Prw_r__r__), " \
"$(CIMSERVER_USR), $(CIMSERVER_GRP))" \
- "$(PEGASUS_VARDATA_DIR)/$(PEGASUS_PLANNED_CONFIG_FILE)" \
+ "$(PEGASUS_CONFIG_DIR)/$(PEGASUS_PLANNED_CONFIG_FILE)" \
>> $(PEGASUS_RPM_SPEC_FILE_PATH)
@$(ECHO-E) "%config(noreplace) $(PEGASUS_CONFIG_DIR)/access.conf" \
>> $(PEGASUS_RPM_SPEC_FILE_PATH)
--- pegasus/env_var_Linux.status_old 2007-11-07 10:44:43.000000000 +0100
+++ pegasus/env_var_Linux.status 2007-11-07 10:48:47.000000000 +0100
@@ -19,7 +19,9 @@
PEGASUS_STAGING_DIR = $(PEGASUS_HOME)/stagingDir
endif
@ -11,15 +47,15 @@
PEGASUS_DISABLE_OBJECT_NORMALIZATION=true
PEGASUS_DISABLE_PERFINST=yes
PEGASUS_ENABLE_CMPI_PROVIDER_MANAGER=true
@@ -26,7 +28,6 @@
PEGASUS_HAS_SSL=yes
@@ -28,7 +30,6 @@
PEGASUS_USE_SSL_RANDOMFILE=false
PEGASUS_NOASSERTS=yes
PEGASUS_PAM_AUTHENTICATION=true
-PEGASUS_USE_PAM_STANDALONE_PROC=true
PEGASUS_USE_RELEASE_CONFIG_OPTIONS=true
PEGASUS_USE_RELEASE_DIRS=true
PEGASUS_USE_SYSLOGS=true
@@ -64,22 +65,21 @@
@@ -67,22 +68,21 @@
PEGASUS_LOCAL_AUTH_DIR = $(PEGASUS_VARDATA_CACHE_DIR)/localauth
PEGASUS_TRACE_DIR = $(PEGASUS_VARDATA_CACHE_DIR)/trace
PEGASUS_TRACE_FILE_PATH = $(PEGASUS_VARDATA_CACHE_DIR)/trace/cimserver.trc
@ -40,45 +76,9 @@
-
PEGASUS_VARRUN_DIR = /var/run/tog-pegasus
PEGASUS_CIMSERVER_START_FILE = $(PEGASUS_VARRUN_DIR)/cimserver.pid
CIMSERVER_LOCK_FILE = $(PEGASUS_VARRUN_DIR)/cimserver_start.lock
PEGASUS_CIMSERVER_START_LOCK_FILE = $(PEGASUS_VARRUN_DIR)/cimserver_start.lock
-PEGASUS_LOCAL_DOMAIN_SOCKET_DIR = $(PEGASUS_VARRUN_DIR)/socket
+PEGASUS_LOCAL_DOMAIN_SOCKET_DIR = $(PEGASUS_VARRUN_DIR)
PEGASUS_LOCAL_DOMAIN_SOCKET_PATH = \
$(PEGASUS_LOCAL_DOMAIN_SOCKET_DIR)/cimxml.socket
--- pegasus/Makefile.Release.redhat-config 2006-01-30 11:16:16.000000000 -0500
+++ pegasus/Makefile.Release 2006-04-12 13:46:18.000000000 -0400
@@ -590,10 +590,10 @@
$(foreach i, $(MANAGEDSYSTEM_MOF_FILES), $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Pr__r__r__)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_MOF_DIR)/Pegasus/$(i);)
stage_PegasusVarDataDirectoryFiles: FORCE
- $(COPY) $(ROOT)/src/Server/cimserver_planned.conf $(PEGASUS_STAGING_DIR)$(PEGASUS_VARDATA_DIR)/$(PEGASUS_PLANNED_CONFIG_FILE)
+ $(COPY) $(ROOT)/src/Server/cimserver_planned.conf $(PEGASUS_STAGING_DIR)$(PEGASUS_CONFIG_DIR)/$(PEGASUS_PLANNED_CONFIG_FILE)
setpermissions_PegasusVarDataDirectoryFiles: FORCE
- $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Pr________)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_VARDATA_DIR)/$(PEGASUS_PLANNED_CONFIG_FILE)
+ $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Pr________)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_CONFIG_DIR)/$(PEGASUS_PLANNED_CONFIG_FILE)
stage_genOpenPegasusSSLCertsFile: FORCE
@$(RM) $(PEGASUS_STAGING_DIR)$(PEGASUS_SCRIPT_DIR)/genOpenPegasusSSLCerts
@@ -1233,7 +1233,7 @@
@$(ECHO-E) "%config %attr($(Prwxr_x___),$(INSTALL_USR),$(INSTALL_GRP))"\
"/etc/init.d/tog-pegasus" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
@$(ECHO-E) "%config(noreplace)" \
- "$(PEGASUS_VARDATA_DIR)/$(PEGASUS_PLANNED_CONFIG_FILE)" \
+ "$(PEGASUS_CONFIG_DIR)/$(PEGASUS_PLANNED_CONFIG_FILE)" \
>> $(PEGASUS_RPM_SPEC_FILE_PATH)
@$(ECHO-E) "%config(noreplace) $(PEGASUS_CONFIG_DIR)/access.conf" \
>> $(PEGASUS_RPM_SPEC_FILE_PATH)
--- pegasus/mak/config-linux.mak.redhat-config 2006-02-07 16:03:57.000000000 -0500
+++ pegasus/mak/config-linux.mak 2006-04-12 16:06:26.000000000 -0400
@@ -118,7 +118,8 @@
ifdef PEGASUS_USE_DEBUG_BUILD_OPTIONS
FLAGS += -g
else
- FLAGS += -s
+# FLAGS += -s
+# ^= let rpm handle stripping
#
# The -fno-enforce-eh-specs is not available in 2.9.5 and it probably
# appeared in the 3.0 series of compilers.

2
sources
View File

@ -1 +1 @@
fa4c1f760482e7222f4a8790185c09dc pegasus-2.6.1.tar.gz
f52417ddf39f1b3f75f8e0b172bebecb pegasus-2.7.0.tar.gz

67
tog-pegasus.spec
View File

@ -26,7 +26,7 @@
%if %{NODEBUGINFO}
%define debug_package %{nil}
%endif
%define srcname pegasus-2.6.1
%define srcname pegasus
%define pegasus_gid 65
%define pegasus_uid 66
@ -40,8 +40,8 @@
%endif
%endif
Version: 2.6.1
Release: 2%{?dist}
Version: 2.7.0
Release: 1%{?dist}
Epoch: 2
#
Summary: OpenPegasus WBEM Services for Linux
@ -59,25 +59,25 @@ Source2: genOpenPegasusSSLCerts
Source3: pegasus_arch_alternatives
Source4: RedHat.OpenPegasus.Makefile
#
# patches 2-4, 9-10, 12-38 now upstream
#
# 0: Still not fixed by http://cvs.rdg.opengroup.org/bugzilla/show_bug.cgi?id=5008
Patch0: pegasus-2.5.1-initscript.patch
Patch0: pegasus-2.7.0-initscript.patch
# 1: http://cvs.rdg.opengroup.org/bugzilla/show_bug.cgi?id=5011
Patch1: pegasus-2.6.0-no-rpath.patch
# 5: http://cvs.rdg.opengroup.org/bugzilla/show_bug.cgi?id=5016
Patch5: pegasus-2.5.1-redhat-config.patch
# 6: don't see how http://cvs.rdg.opengroup.org/bugzilla/show_bug.cgi?id=5099 fixed it
Patch6: pegasus-2.6.0-cmpi-provider-lib.patch
# 7: http://cvs.rdg.opengroup.org/bugzilla/show_bug.cgi?id=5010
Patch7: pegasus-2.6.1-local-or-remote-auth.patch
# 8: http://cvs.rdg.opengroup.org/bugzilla/show_bug.cgi?id=5012
Patch8: pegasus-2.5.1-pam-wbem.patch
# 11: http://cvs.rdg.opengroup.org/bugzilla/show_bug.cgi?id=5006
Patch11: pegasus-2.5.1-fix_tests.patch
#
Patch39: pegasus-2.6.0-cimuser.patch
Patch40: pegasus-2.6.1-init_script.patch
Patch1: pegasus-2.7.0-no-rpath.patch
Patch2: pegasus-2.7.0-PIE.patch
# 3: http://cvs.rdg.opengroup.org/bugzilla/show_bug.cgi?id=5016
Patch3: pegasus-2.7.0-redhat-config.patch
# 4: don't see how http://cvs.rdg.opengroup.org/bugzilla/show_bug.cgi?id=5099 fixed it
Patch4: pegasus-2.6.0-cmpi-provider-lib.patch
# 5: http://cvs.rdg.opengroup.org/bugzilla/show_bug.cgi?id=5010
Patch5: pegasus-2.6.1-local-or-remote-auth.patch
# 6: http://cvs.rdg.opengroup.org/bugzilla/show_bug.cgi?id=5012
Patch6: pegasus-2.5.1-pam-wbem.patch
# 7: http://cvs.rdg.opengroup.org/bugzilla/show_bug.cgi?id=5006
Patch7: pegasus-2.5.1-fix_tests.patch
Patch8: pegasus-2.6.0-multilib.patch
Patch9: pegasus-2.6.0-cimuser.patch
Patch10: pegasus-2.7.0-cmpiheaders.patch
Patch11: pegasus-2.7.0-no_privilege_separation.patch
#
Conflicts: openwbem
Provides: tog-pegasus-cimserver
@ -85,6 +85,7 @@ Provides: tog-pegasus-cimserver
BuildRequires: bash, sed, grep, coreutils, procps, gcc, gcc-c++
BuildRequires: imake, libstdc++, make, pam-devel
BuildRequires: openssl-devel >= 0.9.8b, e2fsprogs
BuildRequires: net-snmp-devel
Requires: bash, sed, grep, coreutils, procps, openssl >= 0.9.8b, pam
Requires: redhat-lsb, chkconfig, SysVinit
Requires: e2fsprogs, bind-utils, net-tools
@ -97,6 +98,7 @@ Requires(pre): e2fsprogs, bind-utils, net-tools
Requires(postun): bash, sed, grep, coreutils, procps, openssl >= 0.9.8b, pam
Requires(postun): redhat-lsb, chkconfig, SysVinit
Requires(postun): e2fsprogs, bind-utils, net-tools
Requires: net-snmp
%description
OpenPegasus WBEM Services for Linux enables management solutions that deliver
@ -133,13 +135,16 @@ The OpenPegasus WBEM tests for the OpenPegasus %{version} Linux rpm.
%setup -q -n %{srcname}
%patch0 -p1 -b .initscript
%patch1 -p1 -b .no-rpath
%patch5 -p1 -b .redhat-config
%patch6 -p1 -b .cmpi-provider-lib
%patch7 -p1 -b .local-or-remote-auth
%patch8 -p1 -b .pam-wbem
%patch11 -p1 -b .fix-tests
%patch39 -p1 -b .cimuser
%patch40 -p1 -b .init_script
%patch2 -p1 -b .PIE
%patch3 -p1 -b .redhat-config
%patch4 -p1 -b .cmpi-provider-lib
#%patch5 -p1 -b .local-or-remote-auth
%patch6 -p1 -b .pam-wbem
%patch7 -p1 -b .fix-tests
%patch8 -p1 -b .multilib
%patch9 -p1 -b .cimuser
%patch10 -p1 -b .cmpiheaders
%patch11 -p1 -b .no_privilege_separation
find . -name 'CVS' -exec /bin/rm -rf '{}' ';' >/dev/null 2>&1 ||:;
%build
@ -435,6 +440,14 @@ fi
%changelog
* Mon Nov 19 2007 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.7.0-1
- Update to upstream version 2.7.0
- Unhide some cmpi classes, package cmpi C++ headers
- Fix multiarch conflicts
Resolves: #343311
- Add libcmpiCppImpl.so (symlink to libcmpiCppImpl.so.1)
Resolves: #366871
* Tue Oct 9 2007 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.6.1-2
- Fix files permissions
Resolves: #200906