rpms/tog-pegasus/FC-5 RedHat.OpenPegasus.Makefile, NONE, 1.1 genOpenPegasusSSLCerts, NONE, 1.1 pegasus-2.5.1-AutoPtr-Core.patch, NONE, 1.1 pegasus-2.5.1-PIE.patch, NONE, 1.1 pegasus-2.5.1-cmpi-provider-lib.patch, NONE, 1.1 pegasus-2.5.1-enable_cql.patch, NONE, 1.1 pegasus-2.5.1-fix_tests.patch, NONE, 1.1 pegasus-2.5.1-fix_zseries_flags.patch, NONE, 1.1 pegasus-2.5.1-initscript.patch, NONE, 1.1 pegasus-2.5.1-linkflags.patch, NONE, 1.1 pegasus-2.5.1-local-or-remote-auth.patch, NONE, 1.1 pegasus-2.5.1-no-rpath.patch, NONE, 1.1 pegasus-2.5.1-pam-wbem.patch, NONE, 1.1 pegasus-2.5.1-parallel_make.patch, NONE, 1.1 pegasus-2.5.1-redhat-config.patch, NONE, 1.1 pegasus-2.5.1-warnings.patch, NONE, 1.1 sources, 1.4, 1.5 tog-pegasus.spec, 1.24, 1.25
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue Apr 11 20:41:11 UTC 2006
Author: jvdias
Update of /cvs/dist/rpms/tog-pegasus/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv22947
Modified Files:
sources tog-pegasus.spec
Added Files:
RedHat.OpenPegasus.Makefile genOpenPegasusSSLCerts
pegasus-2.5.1-AutoPtr-Core.patch pegasus-2.5.1-PIE.patch
pegasus-2.5.1-cmpi-provider-lib.patch
pegasus-2.5.1-enable_cql.patch pegasus-2.5.1-fix_tests.patch
pegasus-2.5.1-fix_zseries_flags.patch
pegasus-2.5.1-initscript.patch pegasus-2.5.1-linkflags.patch
pegasus-2.5.1-local-or-remote-auth.patch
pegasus-2.5.1-no-rpath.patch pegasus-2.5.1-pam-wbem.patch
pegasus-2.5.1-parallel_make.patch
pegasus-2.5.1-redhat-config.patch pegasus-2.5.1-warnings.patch
Log Message:
Upgrade to upstream version 2.5.1
--- NEW FILE RedHat.OpenPegasus.Makefile ---
# RedHat.OpenPegasus.Makefile
#
# Red Hat OpenPegasus distribution Makefile
#
# Makefile to build only the binary objects actually shipped by the
# default upstream linux build, that will work with 'make -j $ncpus' .
# Generated by a script from the installed upstream package.
#
# Jason Vas Dias <jvdias at redhat.com> Red Hat, Inc. April 2006
#
SRCNAME ?= pegasus
RPM_BUILD_DIR ?= $(shell cd ..;pwd)
RPM_ARCH ?= $(shell uname -i)
RPM_OPT_FLAGS ?= $(shell rpm -q rpm --qf '%{OPTFLAGS}')
ifndef PEGASUS_PLATFORM
ifeq ($(RPM_ARCH),ia64)
export PEGASUS_PLATFORM := LINUX_IA64_GNU
else
ifeq ($(RPM_ARCH),x86_64)
export PEGASUS_PLATFORM := LINUX_X86_64_GNU
else
ifeq ($(RPM_ARCH),ppc)
export PEGASUS_PLATFORM := LINUX_PPC_GNU
else
ifeq ($(RPM_ARCH), ppc64)
export PEGASUS_PLATFORM := LINUX_PPC64_GNU
else
ifeq ($(RPM_ARCH), s390)
export PEGASUS_PLATFORM := LINUX_ZSERIES_GNU
else
ifeq ($(RPM_ARCH), s390x)
export PEGASUS_PLATFORM := LINUX_ZSERIES64_GNU
else
export PEGASUS_PLATFORM := LINUX_IX86_GNU
endif
endif
endif
endif
endif
endif
endif
ifndef RPM_ARCH_LIB
ifeq ($(RPM_ARCH),x86_64)
export RPM_ARCH_LIB := lib64
else
ifeq ($(RPM_ARCH),ppc64)
export RPM_ARCH_LIB := lib64
else
ifeq ($(RPM_ARCH),s390x)
export RPM_ARCH_LIB := lib64
else
export RPM_ARCH_LIB := lib
endif
endif
endif
endif
export PEGASUS_ROOT ?= $(RPM_BUILD_DIR)/$(SRCNAME)
export PEGASUS_HOME ?= $(PEGASUS_ROOT)/build
export PEGASUS_ARCH_LIB ?= $(RPM_ARCH_LIB)
export PEGASUS_ENVVAR_FILE ?= $(PEGASUS_ROOT)/env_var_Linux.status
export PEGASUS_EXTRA_C_FLAGS ?= $(RPM_OPT_FLAGS) -Wno-unused
export PEGASUS_EXTRA_CXX_FLAGS ?= $(PEGASUS_EXTRA_C_FLAGS)
export PEGASUS_EXTRA_PROGRAM_LINK_FLAGS ?= -pie -Wl,-z,relro,-z,now,-z,nodlopen,-z,noexecstack
export OPENSSL_HOME ?= /usr
export OPENSSL_BIN ?= /usr/bin
export SYS_INCLUDES ?= -I/usr/kerberos/include
export LD_LIBRARY_PATH ?= $(PEGASUS_HOME)/lib
B = $(PEGASUS_HOME)
R = $(PEGASUS_ROOT)
SBINS=$(B)/bin/cimserver $(B)/bin/cimprovagt $(B)/bin/cimauth $(B)/bin/cimconfig $(B)/bin/cimuser $(B)/bin/repupgrade
UBINS=$(B)/bin/cimmof $(B)/bin/cimmofl $(B)/bin/cimprovider $(B)/bin/osinfo $(B)/bin/wbemexec
BINARIES=$(SBINS) $(UBINS)
PROVIDERS=$(B)/lib/Pegasus/providers/libComputerSystemProvider.so.1 $(B)/lib/Pegasus/providers/libOSProvider.so.1 $(B)/lib/Pegasus/providers/libProcessProvider.so.1
LIBRARIES=$(B)/lib/libCIMQueryCapabilitiesProvider.so.1 $(B)/lib/libCIMxmlIndicationHandler.so.1 $(B)/lib/libCMPIProviderManager.so.1 $(B)/lib/libCertificateProvider.so.1 $(B)/lib/libConfigSettingProvider.so.1 $(B)/lib/libDefaultProviderManager.so.1 $(B)/lib/libNamespaceProvider.so.1 $(B)/lib/libProviderRegistrationProvider.so.1 $(B)/lib/libUserAuthProvider.so.1 $(B)/lib/libcmpiCppImpl.so.1 $(B)/lib/libpegauthentication.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpegcliutils.so.1 $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegcompiler.so.1 $(B)/lib/libpegconfig.so.1 $(B)/lib/libpegcql.so.1 $(B)/lib/libpegexportclient.so.1 $(B)/lib/libpegexportserver.so.1 $(B)/lib/libpeggetoopt.so.1 $(B)/lib/libpeghandlerservice.so.1 $(B)/lib/libpegindicationservice.so.1 $(B)/lib/libpeglistener.so.1 $(B)/lib/libpegprm.so.1 $(B)/lib/libpegprovider.so.1 $(B)/lib/libpegprovidermanager.so.1 $(B)/lib/libpegquerycommon.so.1 $(B)/lib/libpegqueryexpression.so.1 $(B)/lib/libpegrepository.so.1 $(B)/lib/libp!
egserver.so.1 $(B)/lib/libpegservice.so.1 $(B)/lib/libpeguser.so.1 $(B)/lib/libpegwql.so.1
all: setup $(BINARIES) $(LIBRARIES) $(PROVIDERS)
setup:
$(MAKE) -f Makefile.Release create_ProductVersionFile
$(MAKE) -f Makefile.Release create_CommonProductDirectoriesInclude
$(MAKE) -f Makefile.Release create_ConfigProductDirectoriesInclude
touch setup
$(B)/bin/cimserver: $(B)/lib/libpegclient.so.1 $(B)/lib/libpegserver.so.1 $(B)/lib/libpeguser.so.1 $(B)/lib/libpegprm.so.1 $(B)/lib/libNamespaceProvider.so.1 $(B)/lib/libpegindicationservice.so.1 $(B)/lib/libpeghandlerservice.so.1 $(B)/lib/libConfigSettingProvider.so.1 $(B)/lib/libDefaultProviderManager.so.1 $(B)/lib/libProviderRegistrationProvider.so.1 $(B)/lib/libpegauthentication.so.1 $(B)/lib/libUserAuthProvider.so.1 $(B)/lib/libpegqueryexpression.so.1 $(B)/lib/libpegcql.so.1 $(B)/lib/libpegquerycommon.so.1 $(B)/lib/libpegwql.so.1 $(B)/lib/libCIMQueryCapabilitiesProvider.so.1 $(B)/lib/libpegprovidermanager.so.1 $(B)/lib/libpegprovider.so.1 $(B)/lib/libpegexportserver.so.1 $(B)/lib/libpegrepository.so.1 $(B)/lib/libpegconfig.so.1 $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegservice.so.1 $(B)/lib/libCertificateProvider.so.1 $(B)/lib/Pegasus/providers/libComputerSystemProvider.so.1 $(B)/lib/Pegasus/providers/libOSProvider.so.1 $(B)/lib/Pegasus/providers/libProcessProvider.so.1
$(MAKE) -C $(R)/src/Server
$(B)/bin/cimprovagt: $(B)/lib/libpegprovidermanager.so.1 $(B)/lib/libpegprovider.so.1 $(B)/lib/libpegconfig.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegprm.so.1 $(B)/lib/libpegwql.so.1 $(B)/lib/libpegquerycommon.so.1 $(B)/lib/libpegqueryexpression.so.1 $(B)/lib/libpegrepository.so.1 $(B)/lib/libpegcql.so.1 $(B)/lib/Pegasus/providers/libComputerSystemProvider.so.1 $(B)/lib/Pegasus/providers/libOSProvider.so.1 $(B)/lib/Pegasus/providers/libProcessProvider.so.1
$(MAKE) -C src/Pegasus/ProviderManager2/ProviderAgent
$(B)/bin/cimauth: $(B)/lib/libpegcliutils.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpeggetoopt.so.1 $(B)/lib/libpegconfig.so.1 $(B)/lib/libpegcommon.so.1
$(MAKE) -C $(R)/src/Clients/cimauth
$(B)/bin/cimconfig: $(B)/lib/libpegcliutils.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpeggetoopt.so.1 $(B)/lib/libpegconfig.so.1 $(B)/lib/libpegcommon.so.1
$(MAKE) -C $(R)/src/Clients/cimconfig
$(B)/bin/cimuser: $(B)/lib/libpegcliutils.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpeggetoopt.so.1 $(B)/lib/libpegcommon.so.1
$(MAKE) -C $(R)/src/Clients/cimuser
$(B)/bin/repupgrade: $(B)/lib/libpeggetoopt.so.1 $(B)/lib/libpegrepository.so.1 $(B)/lib/libpegcliutils.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpegconfig.so.1 $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegquerycommon.so.1
$(MAKE) -C $(R)/src/Clients/repupgrade
$(B)/bin/cimmof: $(B)/lib/libpegcompiler.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpeggetoopt.so.1 $(B)/lib/libpegrepository.so.1 $(B)/lib/libpegconfig.so.1 $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegquerycommon.so.1
$(MAKE) -C $(R)/src/Pegasus/Compiler/cmdline/cimmof
$(B)/bin/cimmofl: $(B)/bin/cimmof
$(MAKE) -C $(R)/src/Pegasus/Compiler/cmdline/cimmofl
$(B)/bin/cimprovider: $(B)/lib/libpegcliutils.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpeggetoopt.so.1 $(B)/lib/libpegcommon.so.1
$(MAKE) -C $(R)/src/Clients/cimprovider
$(B)/bin/osinfo: $(B)/lib/libpegcliutils.so.1 $(B)/lib/libpeggetoopt.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpegcommon.so.1
$(MAKE) -C $(R)/src/Clients/osinfo
$(B)/bin/wbemexec: $(B)/lib/libpegcliutils.so.1 $(B)/lib/libpeggetoopt.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpegcommon.so.1
$(MAKE) -C $(R)/src/Clients/wbemexec
$(B)/lib/Pegasus/providers/libComputerSystemProvider.so.1: $(B)/lib/libpegprovider.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegquerycommon.so.1 $(B)/lib/libpegqueryexpression.so.1 $(B)/lib/libpegwql.so.1 $(B)/lib/libpegcql.so.1
$(MAKE) -C $(R)/src/Providers/ManagedSystem/ComputerSystem
$(B)/lib/Pegasus/providers/libOSProvider.so.1: $(B)/lib/libpegprovider.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegquerycommon.so.1 $(B)/lib/libpegqueryexpression.so.1 $(B)/lib/libpegwql.so.1 $(B)/lib/libpegcql.so.1
$(MAKE) -C $(R)/src/Providers/ManagedSystem/OperatingSystem
$(B)/lib/Pegasus/providers/libProcessProvider.so.1: $(B)/lib/libpegprovider.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegquerycommon.so.1 $(B)/lib/libpegqueryexpression.so.1 $(B)/lib/libpegwql.so.1 $(B)/lib/libpegcql.so.1
$(MAKE) -C $(R)/src/Providers/ManagedSystem/Process
$(B)/lib/libCIMQueryCapabilitiesProvider.so.1: $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegprovider.so.1 $(B)/lib/libpegquerycommon.so.1 $(B)/lib/libpegqueryexpression.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpegwql.so.1 $(B)/lib/libpegcql.so.1
$(MAKE) -C $(R)/src/Pegasus/ControlProviders/QueryCapabilitiesProvider
$(B)/lib/libCIMxmlIndicationHandler.so.1: $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegconfig.so.1 $(B)/lib/libpegrepository.so.1 $(B)/lib/libpegexportclient.so.1 $(B)/lib/libpegquerycommon.so.1 $(B)/lib/libpegclient.so.1
$(MAKE) -C $(R)/src/Pegasus/Handler/CIMxmlIndicationHandler
$(B)/lib/libCMPIProviderManager.so.1: $(B)/lib/libpegprovider.so.1 $(B)/lib/libpegprovidermanager.so.1 $(B)/lib/libpegprm.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpegquerycommon.so.1 $(B)/lib/libpegconfig.so.1 $(B)/lib/libpegwql.so.1 $(B)/lib/libpegcql.so.1 $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegqueryexpression.so.1 $(B)/lib/libpegrepository.so.1
$(MAKE) -C $(R)/src/Pegasus/ProviderManager2/CMPI
$(B)/lib/libCertificateProvider.so.1: $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegconfig.so.1 $(B)/lib/libpegprovider.so.1 $(B)/lib/libpegquerycommon.so.1 $(B)/lib/libpegqueryexpression.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpegwql.so.1 $(B)/lib/libpegcql.so.1
$(MAKE) -C $(R)/src/Pegasus/ControlProviders/CertificateProvider
$(B)/lib/libConfigSettingProvider.so.1: $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegconfig.so.1 $(B)/lib/libpegprovider.so.1 $(B)/lib/libpegquerycommon.so.1 $(B)/lib/libpegqueryexpression.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpegwql.so.1 $(B)/lib/libpegcql.so.1
$(MAKE) -C $(R)/src/Pegasus/ControlProviders/ConfigSettingProvider
$(B)/lib/libDefaultProviderManager.so.1: $(B)/lib/libpegprovider.so.1 $(B)/lib/libpegprovidermanager.so.1 $(B)/lib/libpegqueryexpression.so.1 $(B)/lib/libpegcql.so.1 $(B)/lib/libpegwql.so.1 $(B)/lib/libpegquerycommon.so.1 $(B)/lib/libpegconfig.so.1 $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpegprm.so.1 $(B)/lib/libpegrepository.so.1
$(MAKE) -C $(R)/src/Pegasus/ProviderManager2/Default
$(B)/lib/libNamespaceProvider.so.1: $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegconfig.so.1 $(B)/lib/libpegprovider.so.1 $(B)/lib/libpegquerycommon.so.1 $(B)/lib/libpegqueryexpression.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpegwql.so.1 $(B)/lib/libpegcql.so.1
$(MAKE) -C $(R)/src/Pegasus/ControlProviders/NamespaceProvider
$(B)/lib/libProviderRegistrationProvider.so.1: $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegprm.so.1 $(B)/lib/libpegprovider.so.1 $(B)/lib/libpegrepository.so.1 $(B)/lib/libpegquerycommon.so.1 $(B)/lib/libpegqueryexpression.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpegconfig.so.1 $(B)/lib/libpegwql.so.1 $(B)/lib/libpegcql.so.1
$(MAKE) -C $(R)/src/Pegasus/ControlProviders/ProviderRegistrationProvider
$(B)/lib/libUserAuthProvider.so.1: $(B)/lib/libpegcommon.so.1 $(B)/lib/libpeguser.so.1 $(B)/lib/libpegprovider.so.1 $(B)/lib/libpegconfig.so.1 $(B)/lib/libpegquerycommon.so.1 $(B)/lib/libpegqueryexpression.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpegwql.so.1 $(B)/lib/libpegcql.so.1
$(MAKE) -C $(R)/src/Pegasus/ControlProviders/UserAuthProvider
$(B)/lib/libcmpiCppImpl.so.1:
$(MAKE) -C $(R)/src/Pegasus/Provider/CMPI
$(B)/lib/libpegauthentication.so.1: $(B)/lib/libpegcommon.so.1 $(B)/lib/libpeguser.so.1 $(B)/lib/libpegconfig.so.1
$(MAKE) -C $(R)/src/Pegasus/Security/Authentication
$(B)/lib/libpegclient.so.1: $(B)/lib/libpegcommon.so.1
$(MAKE) -C $(R)/src/Pegasus/Client
$(B)/lib/libpegcliutils.so.1: $(B)/lib/libpegcommon.so.1
$(MAKE) -C $(R)/src/Clients/cliutils
$(B)/lib/libpegcommon.so.1:
$(MAKE) -C $(R)/src/Pegasus/Common
$(B)/lib/libpegcompiler.so.1: $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegrepository.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpegquerycommon.so.1 $(B)/lib/libpegconfig.so.1
$(MAKE) -C $(R)/src/Pegasus/Compiler
$(B)/lib/libpegconfig.so.1: $(B)/lib/libpegcommon.so.1
$(MAKE) -C $(R)/src/Pegasus/Config
$(B)/lib/libpegcql.so.1: $(B)/lib/libpegquerycommon.so.1 $(B)/lib/libpegcommon.so.1
$(MAKE) -C $(R)/src/Pegasus/CQL
$(B)/lib/libpegexportclient.so.1: $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegclient.so.1
$(MAKE) -C $(R)/src/Pegasus/ExportClient
$(B)/lib/libpegexportserver.so.1: $(B)/lib/libpegcommon.so.1
$(MAKE) -C $(R)/src/Pegasus/ExportServer
$(B)/lib/libpeggetoopt.so.1: $(B)/lib/libpegcommon.so.1
$(MAKE) -C $(R)/src/Pegasus/getoopt
$(B)/lib/libpeghandlerservice.so.1: $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegconfig.so.1 $(B)/lib/libpegrepository.so.1 $(B)/lib/libpegquerycommon.so.1
$(MAKE) -C $(R)/src/Pegasus/HandlerService
$(B)/lib/libpegindicationservice.so.1: $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegprovider.so.1 $(B)/lib/libpegrepository.so.1 $(B)/lib/libpegprm.so.1 $(B)/lib/libpegwql.so.1 $(B)/lib/libpegquerycommon.so.1 $(B)/lib/libpegqueryexpression.so.1 $(B)/lib/libpegconfig.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpegcql.so.1
$(MAKE) -C $(R)/src/Pegasus/IndicationService
$(B)/lib/libpeglistener.so.1: $(B)/lib/libpegexportserver.so.1 $(B)/lib/libpegcommon.so.1
$(MAKE) -C $(R)/src/Pegasus/Listener
$(B)/lib/libpegprm.so.1: $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegprovider.so.1 $(B)/lib/libpegrepository.so.1 $(B)/lib/libpegquerycommon.so.1 $(B)/lib/libpegqueryexpression.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpegconfig.so.1 $(B)/lib/libpegwql.so.1 $(B)/lib/libpegcql.so.1
$(MAKE) -C $(R)/src/Pegasus/Server/ProviderRegistrationManager
$(B)/lib/libpegprovider.so.1: $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegquerycommon.so.1 $(B)/lib/libpegqueryexpression.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpegwql.so.1 $(B)/lib/libpegcql.so.1
$(MAKE) -C $(R)/src/Pegasus/Provider
$(B)/lib/libpegprovidermanager.so.1: $(B)/lib/libpegprm.so.1 $(B)/lib/libpegwql.so.1 $(B)/lib/libpegconfig.so.1 $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegprovider.so.1 $(B)/lib/libpegrepository.so.1 $(B)/lib/libpegquerycommon.so.1 $(B)/lib/libpegqueryexpression.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpegcql.so.1
$(MAKE) -C $(R)/src/Pegasus/ProviderManager2
$(B)/lib/libpegquerycommon.so.1: $(B)/lib/libpegcommon.so.1
$(MAKE) -C $(R)/src/Pegasus/Query/QueryCommon
$(B)/lib/libpegqueryexpression.so.1: $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegquerycommon.so.1 $(B)/lib/libpegwql.so.1 $(B)/lib/libpegcql.so.1
$(MAKE) -C $(R)/src/Pegasus/Query/QueryExpression
$(B)/lib/libpegrepository.so.1: $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegquerycommon.so.1 $(B)/lib/libpegconfig.so.1
$(MAKE) -C $(R)/src/Pegasus/Repository
$(B)/lib/libpegserver.so.1: $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegrepository.so.1 $(B)/lib/libpegprovider.so.1 $(B)/lib/libpegexportserver.so.1 $(B)/lib/libpegprovidermanager.so.1 $(B)/lib/libpegconfig.so.1 $(B)/lib/libpeguser.so.1 $(B)/lib/libpegauthentication.so.1 $(B)/lib/libpeghandlerservice.so.1 $(B)/lib/libpegindicationservice.so.1 $(B)/lib/libpegquerycommon.so.1 $(B)/lib/libpegwql.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpegprm.so.1 $(B)/lib/libDefaultProviderManager.so.1 $(B)/lib/libConfigSettingProvider.so.1 $(B)/lib/libUserAuthProvider.so.1 $(B)/lib/libProviderRegistrationProvider.so.1 $(B)/lib/libNamespaceProvider.so.1 $(B)/lib/libCIMQueryCapabilitiesProvider.so.1 $(B)/lib/libCertificateProvider.so.1 $(B)/lib/libpegqueryexpression.so.1 $(B)/lib/libpegcql.so.1
$(MAKE) -C $(R)/src/Pegasus/Server
$(B)/lib/libpegservice.so.1: $(B)/lib/libpegcommon.so.1
$(MAKE) -C $(R)/src/Service
$(B)/lib/libpeguser.so.1: $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegconfig.so.1
$(MAKE) -C $(R)/src/Pegasus/Security/UserManager
$(B)/lib/libpegwql.so.1: $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegquerycommon.so.1
$(MAKE) -C $(R)/src/Pegasus/WQL
#
# install target :
#
#
install ?= /usr/bin/install
prefix ?=
export prefix := $(prefix:/usr=)
D := $(prefix)
sysconfdir ?= /etc
export sysconfdir := $(subst $(prefix),,$(sysconfdir))
etc := $(sysconfdir)
bindir ?= /usr/bin
export bindir := $(subst $(prefix),,$(bindir))
bin := $(bindir)
sbindir ?= /usr/sbin
export sbindir := $(subst $(prefix),,$(sbindir))
sbin := $(sbindir)
libdir ?= /usr/$(RPM_ARCH_LIB)
export libdir := $(subst $(prefix),,$(libdir))
lib := $(libdir)
datadir ?= /usr/share
export datadir := $(subst $(prefix),,$(datadir))
share := $(datadir)
includedir ?= /usr/include
export includedir := $(subst $(prefix),,$(includedir))
inc := $(includedir)
localstatedir ?= /var
export localstatedir := $(subst $(prefix),,$(localstatedir))
var := $(localstatedir)
mandir ?= /usr/share/man
export mandir := $(subst $(prefix),,$(mandir))
root_user ?= root
pegasus_user ?= pegasus
SYSDIRS = $(D) $(D)/$(etc) $(D)/$(etc)/rc.d/init.d $(D)/$(etc)/pam.d \
$(D)/$(var) $(D)/$(lib) $(D)/$(bin)/ $(D)/$(sbin) \
$(D)/$(inc) $(D)/$(mandir)/man8 $(D)/$(mandir)/man1
ROOTDIRS = $(D)/$(etc)/Pegasus \
$(D)/$(var)/run/tog-pegasus $(D)/$(var)/run/tog-pegasus/socket \
$(D)/$(var)/lib/Pegasus $(D)/$(var)/lib/Pegasus/repository \
$(D)/$(var)/lib/Pegasus/repository/root/classes \
$(D)/$(var)/lib/Pegasus/repository/root/instances \
$(D)/$(var)/lib/Pegasus/repository/root/qualifiers \
$(D)/$(var)/lib/Pegasus/cache \
$(D)/$(var)/lib/Pegasus/cache/localauth \
$(D)/$(var)/lib/Pegasus/cache/trace \
$(D)/$(var)/lib/Pegasus/log \
$(D)/$(lib)/Pegasus \
$(D)/$(lib)/Pegasus/providers \
$(D)/$(lib)/cmpi \
$(D)/$(share)/Pegasus/scripts
PEGDIRS = $(D)/$(share)/Pegasus \
$(D)/$(share)/Pegasus/mof/CIM29 \
$(D)/$(share)/Pegasus/mof/Pegasus
MAN8S = $(wildcard $(R)/rpm/manLinux/man8.Z/*.8)
MAN1S = $(wildcard $(R)/rpm/manLinux/man1.Z/*.1)
CIMSCHEMA= $(wildcard $(R)/Schemas/CIM29/*)
CIMMOF=$(addprefix $(D)$(share)/Pegasus/mof/CIM29/,$(notdir $(CIMSCHEMA)))
PEGSCHEMA= $(R)/Schemas/Pegasus/Internal/VER20/PG_SSLCertificate20.mof \
$(R)/Schemas/Pegasus/ManagedSystem/VER20/PG_OperatingSystem20R.mof \
$(R)/Schemas/Pegasus/InterOp/VER20/PG_InterOpSchema20.mof \
$(R)/Schemas/Pegasus/ManagedSystem/VER20/PG_ComputerSystem20R.mof \
$(R)/Schemas/Pegasus/Internal/VER20/PG_User20.mof \
$(R)/Schemas/Pegasus/ManagedSystem/VER20/PG_UnixProcess20.mof \
$(R)/Schemas/Pegasus/ManagedSystem/VER20/PG_ManagedSystemSchema20.mof \
$(R)/Schemas/Pegasus/Internal/VER20/PG_ConfigSetting20.mof \
$(R)/Schemas/Pegasus/InterOp/VER20/PG_ProviderModule20.mof \
$(R)/Schemas/Pegasus/ManagedSystem/VER20/PG_OperatingSystem20.mof \
$(R)/Schemas/Pegasus/Internal/VER20/PG_Authorization20.mof \
$(R)/Schemas/Pegasus/Internal/VER20/PG_InternalSchema20.mof \
$(R)/Schemas/Pegasus/Internal/VER20/PG_ShutdownService20.mof \
$(R)/Schemas/Pegasus/ManagedSystem/VER20/PG_ComputerSystem20.mof \
$(R)/Schemas/Pegasus/ManagedSystem/VER20/PG_UnixProcess20R.mof \
$(R)/Schemas/Pegasus/ManagedSystem/VER20/PG_ManagedSystemSchema20R.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
export PEGASUS_STAGING_DIR := $(D)
install: dirs config libs lib_links bins mans mof SDK ghost_files repository
$(SYSDIRS):
/bin/mkdir -p $@
$(ROOTDIRS):
/bin/mkdir -p $@;
/bin/chown $(root_user):$(pegasus_user) $@ >/dev/null 2>&1;
/bin/chmod 0750 $@;
$(PEGDIRS):
/bin/mkdir -p $@;
/bin/chown $(root_user):$(pegasus_user) $@ >/dev/null 2>&1 || :;
/bin/chmod 0755 $@
dirs: $(SYSDIRS) $(ROOTDIRS) $(PEGDIRS)
$(D)/$(etc)/rc.d/init.d/tog-pegasus: $(R)/rpm/tog-pegasus.rc
$(install) -m 0750 -o $(root_user) -g $(pegasus_user) -p $< $@
$(D)/$(etc)/Pegasus/access.conf: $(R)/rpm/access.conf
$(install) -m 0640 -o $(root_user) -g $(pegasus_user) -p $< $@
$(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
$(D)/$(lib)/Pegasus/providers/%:
$(install) -m 0755 -o $(root_user) -g $(pegasus_user) -p $(B)/lib/$(patsubst Pegasus/providers/%,%,$*) $@
$(D)/$(lib)/%:
$(install) -m 0755 -o $(root_user) -g $(pegasus_user) -p $(B)/lib/$* $@
libs: $(LIBRARIES) $(patsubst $(B)/lib/%,$(D)/$(lib)/%,$(LIBRARIES) $(PROVIDERS))
$(patsubst %.so.1,%.so,$(LINKED_LIBS)):
/bin/ln -sf $(patsubst %,%.1,$(notdir $@)) $(patsubst %.so.1,%.so,$@)
lib_links: libs $(patsubst %.so.1,%.so,$(LINKED_LIBS))
$(patsubst $(B)/bin/%,$(D)/$(sbin)/%,$(SBINS)):
$(install) -m 0750 -o $(root_user) -g $(pegasus_user) -p $(patsubst $(D)/$(sbin)/%,$(B)/bin/%, $@) $@
$(patsubst $(B)/bin/%,$(D)/$(bin)/%,$(UBINS)):
$(install) -m 0755 -o $(root_user) -g $(pegasus_user) -p $(patsubst $(D)/$(bin)/%,$(B)/bin/%, $@) $@
bins: $(SBINS) $(UBINS) $(patsubst $(B)/bin/%,$(D)/$(sbin)/%,$(SBINS)) $(patsubst $(B)/bin/%,$(D)/$(bin)/%,$(UBINS))
$(D)/$(mandir)/man8/%.8:
$(install) -m 0644 -o $(root_user) -g $(root_user) -p $(R)/rpm/manLinux/man8.Z/$*.8 $@
$(D)/$(mandir)/man1/%.1:
$(install) -m 0644 -o $(root_user) -g $(root_user) -p $(R)/rpm/manLinux/man1.Z/$*.1 $@
mans: $(subst $(R)/rpm/manLinux/man8.Z,$(D)/$(mandir)/man8,$(MAN8S)) $(subst $(R)/rpm/manLinux/man1.Z,$(D)/$(mandir)/man1,$(MAN1S))
mof: $(CIMSCHEMA) $(PEGSCHEMA)
$(install) -m 0644 -o $(root_user) -g $(root_user) -p $(CIMSCHEMA) $(D)/$(share)/Pegasus/mof/CIM29
$(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.5/
$(MAKE) -f $(R)/mak/SDKMakefile stageSDK
/bin/rm -rf $(PEGASUS_STAGING_DIR)/usr/share/doc/tog-pegasus-2.5/
touch SDK
ghost_files:
touch $(D){/etc/Pegasus/{cimserver_current.conf,cimserver_planned.conf,cimserver_trust,indication_trust,crl,ssl.cnf,client.pem,server.pem,file.pem,},/var/{run/tog-pegasus/{cimxml.socket,cimserver.pid,cimserver_start.lock},lib/Pegasus/{log/install.log,cache/trace/cimserver.trc}}}
repository:
PATH=$(B)/bin:$$PATH LD_LIBRARY_PATH=$(B)/lib $(MAKE) -C Schemas/Pegasus repository REPOSITORY_DIR=$(D)/$(var)/lib/Pegasus
# 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/TestQueue $(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/TracerTest $(B)/bin/TestIPC $(B)/bin/TestClient $(B)/bin/OSTestClient $(B)/bin/TestPegClientInvokeMethod2 $(B)/bin/TestIndicationStressTest
$(B)/lib/libFamilyProvider.so.1: $(B)/lib/libpegcommon.so.1
$(MAKE) -C $(R)/src/Providers/TestProviders/FamilyProvider
$(B)/lib/libIndicationStressTestConsumer.so.1: $(B)/lib/libpegcommon.so.1
$(MAKE) -C $(R)/src/Providers/TestProviders/IndicationStressTestProvider/testconsumer
$(B)/lib/libIndicationStressTestProvider.so.1: $(B)/lib/libpegcommon.so.1
$(MAKE) -C $(R)/src/Providers/TestProviders/IndicationStressTestProvider
$(B)/lib/libSampleInstanceProvider.so.1: $(B)/lib/libpegcommon.so.1
$(MAKE) -C $(R)/src/Providers/sample/InstanceProvider
$(B)/lib/libSampleMethodProvider.so.1: $(B)/lib/libpegcommon.so.1
$(MAKE) -C $(R)/src/Providers/sample/MethodProvider
$(B)/bin/TestAbstract: $(B)/lib/libpegcommon.so.1
$(MAKE) -C $(R)/src/Pegasus/Common/tests/Abstract
$(B)/bin/TestArray: $(B)/lib/libpegcommon.so.1
$(MAKE) -C $(R)/src/Pegasus/Common/tests/Array
$(B)/bin/TestBase64: $(B)/lib/libpegcommon.so.1
$(MAKE) -C $(R)/src/Pegasus/Common/tests/Base64
$(B)/bin/TestClassDecl: $(B)/lib/libpegcommon.so.1
$(MAKE) -C $(R)/src/Pegasus/Common/tests/ClassDecl
$(B)/bin/TestDateTime: $(B)/lib/libpegcommon.so.1
$(MAKE) -C $(R)/src/Pegasus/Common/tests/DateTime
$(B)/bin/TestFlavor: $(B)/lib/libpegcommon.so.1
$(MAKE) -C $(R)/src/Pegasus/Common/tests/Flavor
$(B)/bin/TestFormatter: $(B)/lib/libpegcommon.so.1
$(MAKE) -C $(R)/src/Pegasus/Common/tests/Formatter
$(B)/bin/TestHashTable: $(B)/lib/libpegcommon.so.1
$(MAKE) -C $(R)/src/Pegasus/Common/tests/HashTable
$(B)/bin/TestInstanceDecl: $(B)/lib/libpegcommon.so.1
$(MAKE) -C $(R)/src/Pegasus/Common/tests/InstanceDecl
$(B)/bin/TestLogger: $(B)/lib/libpegcommon.so.1
$(MAKE) -C $(R)/src/Pegasus/Common/tests/Logger
$(B)/bin/TestMethod: $(B)/lib/libpegcommon.so.1
$(MAKE) -C $(R)/src/Pegasus/Common/tests/Method
$(B)/bin/TestObject: $(B)/lib/libpegcommon.so.1
$(MAKE) -C $(R)/src/Pegasus/Common/tests/Object
$(B)/bin/TestOperationContext: $(B)/lib/libpegcommon.so.1
$(MAKE) -C $(R)/src/Pegasus/Common/tests/OperationContext
$(B)/bin/TestParamValue: $(B)/lib/libpegcommon.so.1
$(MAKE) -C $(R)/src/Pegasus/Common/tests/ParamValue
$(B)/bin/TestParameter: $(B)/lib/libpegcommon.so.1
$(MAKE) -C $(R)/src/Pegasus/Common/tests/Parameter
$(B)/bin/TestProperty: $(B)/lib/libpegcommon.so.1
$(MAKE) -C $(R)/src/Pegasus/Common/tests/Property
$(B)/bin/TestQualifier: $(B)/lib/libpegcommon.so.1
$(MAKE) -C $(R)/src/Pegasus/Common/tests/Qualifier
$(B)/bin/TestQualifierDecl: $(B)/lib/libpegcommon.so.1
$(MAKE) -C $(R)/src/Pegasus/Common/tests/QualifierDecl
$(B)/bin/TestQualifierList: $(B)/lib/libpegcommon.so.1
$(MAKE) -C $(R)/src/Pegasus/Common/tests/QualifierList
$(B)/bin/TestQueue: $(B)/lib/libpegcommon.so.1
$(MAKE) -C $(R)/src/Pegasus/Common/tests/Queue
$(B)/bin/TestReference: $(B)/lib/libpegcommon.so.1
$(MAKE) -C $(R)/src/Pegasus/Common/tests/Reference
$(B)/bin/TestResolve: $(B)/lib/libpegcommon.so.1
$(MAKE) -C $(R)/src/Pegasus/Common/tests/Resolve
$(B)/bin/TestScope: $(B)/lib/libpegcommon.so.1
$(MAKE) -C $(R)/src/Pegasus/Common/tests/Scope
$(B)/bin/TestStack: $(B)/lib/libpegcommon.so.1
$(MAKE) -C $(R)/src/Pegasus/Common/tests/Stack
$(B)/bin/TestStopwatch: $(B)/lib/libpegcommon.so.1
$(MAKE) -C $(R)/src/Pegasus/Common/tests/Stopwatch
$(B)/bin/TestStrToInstName: $(B)/lib/libpegcommon.so.1
$(MAKE) -C $(R)/src/Pegasus/Common/tests/StrToInstName
$(B)/bin/TestString: $(B)/lib/libpegcommon.so.1
$(MAKE) -C $(R)/src/Pegasus/Common/tests/String
$(B)/bin/TestTimeValue: $(B)/lib/libpegcommon.so.1
$(MAKE) -C $(R)/src/Pegasus/Common/tests/TimeValue
$(B)/bin/TestToMof: $(B)/lib/libpegcommon.so.1
$(MAKE) -C $(R)/src/Pegasus/Common/tests/ToMof
$(B)/bin/TestValidateClass: $(B)/lib/libpegcommon.so.1
$(MAKE) -C $(R)/src/Pegasus/Common/tests/ValidateClass
$(B)/bin/TestValue: $(B)/lib/libpegcommon.so.1
$(MAKE) -C $(R)/src/Pegasus/Common/tests/Value
$(B)/bin/TestTracer: $(B)/lib/libpegcommon.so.1
$(MAKE) -C $(R)/src/Pegasus/Common/tests/Tracer
$(B)/bin/TestIPC: $(B)/lib/libpegcommon.so.1
$(MAKE) -C $(R)/src/Pegasus/Common/tests/IPC
$(B)/bin/TestResponseHandler: $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegprovider.so.1 $(B)/lib/libpegprovidermanager.so.1 $(B)/lib/libpegprm.so.1 $(B)/lib/libpegconfig.so.1 $(B)/lib/libpegquerycommon.so.1 $(B)/lib/libpegqueryexpression.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpegwql.so.1 $(B)/lib/libpegrepository.so.1 $(B)/lib/libpegcql.so.1
$(MAKE) -C $(R)/src/Pegasus/ProviderManager2/Default/tests/ResponseHandler
$(B)/bin/TracerTest: $(B)/lib/libpegcommon.so.1
$(MAKE) -C $(R)/src/Pegasus/Common/tests/Tracer
$(B)/bin/TestClient: $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegclient.so.1
$(MAKE) -C $(R)/src/Clients/TestClient
$(B)/bin/OSTestClient: $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegclient.so.1
$(MAKE) -C $(R)/src/Providers/ManagedSystem/OperatingSystem/tests/OSTestClient
$(B)/bin/TestPegClientInvokeMethod2: $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegclient.so.1
$(MAKE) -C $(R)/src/Pegasus/Client/tests/InvokeMethod2
$(B)/bin/TestIndicationStressTest: $(B)/lib/libpegcommon.so.1 $(B)/lib/libpeglistener.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpegexportserver.so.1
$(MAKE) -C $(R)/src/Providers/TestProviders/IndicationStressTestProvider/testclient
tests: $(TESTLIBS) $(TESTBINS)
install_tests: tests test_dirs test_lib test_bin test_mak test_makefile test_repository
TESTDIRS = $(D)/$(share)/Pegasus/test \
$(D)/$(share)/Pegasus/test/bin \
$(D)/$(share)/Pegasus/test/lib \
$(D)/$(share)/Pegasus/test/mak
$(TESTDIRS):
/bin/mkdir -p $@;
/bin/chown $(root_user):$(pegasus_user) $@ >/dev/null 2>&1 || :;
/bin/chmod 0755 $@
test_dirs: $(TESTDIRS)
$(patsubst $(B)/lib/%,$(D)/$(share)/Pegasus/test/lib/%,$(TESTLIBS)):
$(install) -m 0755 -o $(root_user) -g $(pegasus_user) -p $(patsubst $(D)/$(share)/Pegasus/test/lib/%,$(B)/lib/%,$@) $@
test_lib: $(TESTLIBS) $(patsubst $(B)/lib/%,$(D)/$(share)/Pegasus/test/lib/%,$(TESTLIBS))
$(patsubst $(B)/bin/%,$(D)/$(share)/Pegasus/test/bin/%,$(TESTBINS)):
$(install) -m 0755 -o $(root_user) -g $(pegasus_user) -p $(patsubst $(D)/$(share)/Pegasus/test/bin/%,$(B)/bin/%,$@) $@
test_bin: $(TESTBINS) $(patsubst $(B)/bin/%,$(D)/$(share)/Pegasus/test/bin/%,$(TESTBINS))
test_mak:
$(MAKE) --directory=$(R) -f Makefile.ReleaseTest -s stage_makfiles
test_makefile:
$(MAKE) --directory=$(R) -f Makefile.ReleaseTest -s create_Makefile
test_repository:
LD_LIBRARY_PATH=$(B)/lib PATH=$(B)/bin:$$PATH $(MAKE) --directory=$(R) -f Makefile.ReleaseTest -s create_repository
--- NEW FILE genOpenPegasusSSLCerts ---
#!/bin/bash
#
PEGASUS_PEM_DIR=/etc/Pegasus
PEGASUS_CONFIG_DIR=/etc/Pegasus
PEGASUS_INSTALL_LOG=/var/lib/Pegasus/log/install.log
PEGASUS_SSL_CERT_FILE=server.pem
PEGASUS_SSL_KEY_FILE=file.pem
PEGASUS_SSL_TRUSTSTORE=client.pem
#
# Set up OpenSSL certificates for the tog-pegasus cimserver
#
# Creates a default ssl.cnf file.
# Generates a self-signed certificate for use by the cimserver.
#
cnfChanged=0;
if [ ! -e $PEGASUS_CONFIG_DIR/ssl.cnf ]; then
mkdir -p ${PEGASUS_INSTALL_LOG%/*}
mkdir -p $PEGASUS_CONFIG_DIR
echo "[ req ]" > $PEGASUS_CONFIG_DIR/ssl.cnf
echo "distinguished_name = req_distinguished_name" >> \
$PEGASUS_CONFIG_DIR/ssl.cnf
echo "prompt = no" >> $PEGASUS_CONFIG_DIR/ssl.cnf
echo "[ req_distinguished_name ]" >> $PEGASUS_CONFIG_DIR/ssl.cnf
echo "C = UK" >> $PEGASUS_CONFIG_DIR/ssl.cnf
echo "ST = Berkshire" >> $PEGASUS_CONFIG_DIR/ssl.cnf
echo "L = Reading" >> $PEGASUS_CONFIG_DIR/ssl.cnf
echo "O = The Open Group" >> \
$PEGASUS_CONFIG_DIR/ssl.cnf
echo "OU = The OpenPegasus Project" >> \
$PEGASUS_CONFIG_DIR/ssl.cnf
DN=`hostname`;
if [ -z "$DN" ] || [ "$DN" = "(none)" ]; then
DN='localhost.localdomain';
fi;
FQDN=`{ host -W1 $DN 2>/dev/null || echo "$DN has address "; } |\
grep 'has address' | head -1 | sed 's/\ .*$//'`;
if [ -z "$FQDN" ] ; then
FQDN="$DN";
fi;
# cannot use 'hostname --fqdn' because this can hang indefinitely
echo "CN = $FQDN" >> $PEGASUS_CONFIG_DIR/ssl.cnf
chmod 400 $PEGASUS_CONFIG_DIR/ssl.cnf
chown root $PEGASUS_CONFIG_DIR/ssl.cnf
chgrp root $PEGASUS_CONFIG_DIR/ssl.cnf
cnfChanged=1;
fi
if [ $cnfChanged -eq 1 ] || \
[ ! -e $PEGASUS_PEM_DIR/$PEGASUS_SSL_CERT_FILE ] || \
[ ! -e $PEGASUS_PEM_DIR/$PEGASUS_SSL_KEY_FILE ]; then
/usr/bin/openssl req -x509 -days 3650 -newkey rsa:2048 \
-nodes -config $PEGASUS_CONFIG_DIR/ssl.cnf \
-keyout $PEGASUS_PEM_DIR/key.pem \
-out $PEGASUS_PEM_DIR/cert.pem 2>>$PEGASUS_INSTALL_LOG
chmod 700 $PEGASUS_PEM_DIR/*.pem
cp -fp $PEGASUS_PEM_DIR/cert.pem \
$PEGASUS_PEM_DIR/$PEGASUS_SSL_CERT_FILE
cp -fp $PEGASUS_PEM_DIR/key.pem \
$PEGASUS_PEM_DIR/$PEGASUS_SSL_KEY_FILE
chmod 400 $PEGASUS_PEM_DIR/$PEGASUS_SSL_KEY_FILE
chmod 444 $PEGASUS_PEM_DIR/$PEGASUS_SSL_CERT_FILE
rm -f $PEGASUS_PEM_DIR/key.pem $PEGASUS_PEM_DIR/cert.pem
fi;
if [ ! -e $PEGASUS_PEM_DIR/$PEGASUS_SSL_TRUSTSTORE ]; then
cp -fp $PEGASUS_PEM_DIR/$PEGASUS_SSL_CERT_FILE \
$PEGASUS_PEM_DIR/$PEGASUS_SSL_TRUSTSTORE
chmod 444 $PEGASUS_PEM_DIR/$PEGASUS_SSL_TRUSTSTORE;
fi;
pegasus-2.5.1-AutoPtr-Core.patch:
AutoPtr.h | 3 ++-
1 files changed, 2 insertions(+), 1 deletion(-)
--- NEW FILE pegasus-2.5.1-AutoPtr-Core.patch ---
--- pegasus/src/Pegasus/Common/AutoPtr.h.AutoPtr-Core 2006-01-30 11:16:46.000000000 -0500
+++ pegasus/src/Pegasus/Common/AutoPtr.h 2006-04-11 15:01:43.000000000 -0400
@@ -200,7 +200,8 @@
{
if (p != _ptr)
{
- delete _ptr;
+ if ( _ptr != 0 )
+ delete _ptr;
_ptr = p;
}
}
pegasus-2.5.1-PIE.patch:
Clients/cimauth/Makefile | 2 ++
Clients/cimconfig/Makefile | 2 ++
Clients/cimprovider/Makefile | 2 ++
Clients/cimuser/Makefile | 2 ++
Clients/osinfo/Makefile | 2 ++
Clients/repupgrade/Makefile | 2 ++
Clients/wbemexec/Makefile | 2 ++
Pegasus/Compiler/cmdline/cimmof/Makefile | 2 ++
Pegasus/Compiler/cmdline/cimmofl/Makefile | 2 ++
Pegasus/ProviderManager2/ProviderAgent/Makefile | 4 ++--
Server/Makefile | 3 +++
11 files changed, 23 insertions(+), 2 deletions(-)
--- NEW FILE pegasus-2.5.1-PIE.patch ---
--- pegasus/src/Pegasus/Compiler/cmdline/cimmof/Makefile.PIE 2006-01-30 11:17:34.000000000 -0500
+++ pegasus/src/Pegasus/Compiler/cmdline/cimmof/Makefile 2006-04-06 16:17:54.000000000 -0400
@@ -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.PIE 2006-01-30 11:17:34.000000000 -0500
+++ pegasus/src/Pegasus/Compiler/cmdline/cimmofl/Makefile 2006-04-06 16:17:43.000000000 -0400
@@ -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/Pegasus/ProviderManager2/ProviderAgent/Makefile.PIE 2006-01-30 11:18:16.000000000 -0500
+++ pegasus/src/Pegasus/ProviderManager2/ProviderAgent/Makefile 2006-04-05 21:05:58.000000000 -0400
@@ -29,11 +29,12 @@
#//
#//==============================================================================
ROOT = ../../../..
-
DIR = Pegasus/ProviderManager2/ProviderAgent
include $(ROOT)/mak/config.mak
+FLAGS := $(FLAGS:-fPIC=-fPIE)
+
LIBRARIES = \
pegprovidermanager \
pegprovider \
@@ -56,4 +57,3 @@
tests:
poststarttests:
-
--- pegasus/src/Server/Makefile.PIE 2006-01-30 11:19:33.000000000 -0500
+++ pegasus/src/Server/Makefile 2006-04-05 21:05:58.000000000 -0400
@@ -30,8 +30,11 @@
#//==============================================================================
ROOT = ../..
DIR = Server
+
include $(ROOT)/mak/config.mak
+FLAGS := $(FLAGS:-fPIC=-fPIE)
+
LIBRARIES = \
pegclient \
pegserver \
--- pegasus/src/Clients/cimprovider/Makefile.PIE 2006-01-30 11:16:33.000000000 -0500
+++ pegasus/src/Clients/cimprovider/Makefile 2006-04-06 16:17:31.000000000 -0400
@@ -36,6 +36,8 @@
include $(ROOT)/mak/config.mak
+FLAGS := $(FLAGS:-fPIC=-fPIE)
+
LIBRARIES = \
pegcliutils \
pegclient \
--- pegasus/src/Clients/osinfo/Makefile.PIE 2006-01-30 11:16:35.000000000 -0500
+++ pegasus/src/Clients/osinfo/Makefile 2006-04-06 16:17:14.000000000 -0400
@@ -35,6 +35,8 @@
DIR = Clients/osinfo
include $(ROOT)/mak/config.mak
+FLAGS := $(FLAGS:-fPIC=-fPIE)
+
LIBRARIES = \
pegcliutils \
peggetoopt \
--- pegasus/src/Clients/cimuser/Makefile.PIE 2006-01-30 11:16:33.000000000 -0500
+++ pegasus/src/Clients/cimuser/Makefile 2006-04-06 16:17:01.000000000 -0400
@@ -36,6 +36,8 @@
include $(ROOT)/mak/config.mak
+FLAGS := $(FLAGS:-fPIC=-fPIE)
+
LIBRARIES = \
pegcliutils \
pegclient \
--- pegasus/src/Clients/repupgrade/Makefile.PIE 2006-01-30 11:16:36.000000000 -0500
+++ pegasus/src/Clients/repupgrade/Makefile 2006-04-06 16:16:37.000000000 -0400
@@ -36,6 +36,8 @@
include $(ROOT)/mak/config.mak
+FLAGS := $(FLAGS:-fPIC=-fPIE)
+
LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
LIBRARIES = \
--- pegasus/src/Clients/cimauth/Makefile.PIE 2006-01-30 11:16:32.000000000 -0500
+++ pegasus/src/Clients/cimauth/Makefile 2006-04-06 16:16:17.000000000 -0400
@@ -36,6 +36,8 @@
include $(ROOT)/mak/config.mak
+FLAGS := $(FLAGS:-fPIC=-fPIE)
+
LIBRARIES = \
pegcliutils \
pegclient \
--- pegasus/src/Clients/cimconfig/Makefile.PIE 2006-01-30 11:16:32.000000000 -0500
+++ pegasus/src/Clients/cimconfig/Makefile 2006-04-06 16:15:59.000000000 -0400
@@ -36,6 +36,8 @@
include $(ROOT)/mak/config.mak
+FLAGS := $(FLAGS:-fPIC=-fPIE)
+
LIBRARIES = \
pegcliutils \
pegclient \
--- pegasus/src/Clients/wbemexec/Makefile.PIE 2006-01-30 11:16:37.000000000 -0500
+++ pegasus/src/Clients/wbemexec/Makefile 2006-04-06 16:15:23.000000000 -0400
@@ -36,6 +36,8 @@
include $(ROOT)/mak/config.mak
+FLAGS := $(FLAGS:-fPIC=-fPIE)
+
ifdef PEGASUS_HAS_SSL
FLAGS += -DPEGASUS_HAS_SSL -DPEGASUS_SSL_RANDOMFILE
SYS_INCLUDES += -I$(OPENSSL_HOME)/include
pegasus-2.5.1-cmpi-provider-lib.patch:
FixedPropertyTableLinux.h | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
--- NEW FILE pegasus-2.5.1-cmpi-provider-lib.patch ---
--- pegasus/src/Pegasus/Config/FixedPropertyTableLinux.h.cmpi_provider_lib 2006-03-14 16:06:37.000000000 -0500
+++ pegasus/src/Pegasus/Config/FixedPropertyTableLinux.h 2006-04-05 20:06:55.000000000 -0400
@@ -65,8 +65,8 @@
{"crlStore", PEGASUS_SSL_SERVER_CRL},
#endif
{"repositoryDir", PEGASUS_REPOSITORY_DIR},
- {"providerDir", PEGASUS_PROVIDER_LIB_DIR":/usr/lib/cmpi"},
-#else
+ {"providerDir", PEGASUS_PROVIDER_LIB_DIR ":" PEGASUS_DEST_LIB_DIR "/cmpi"},
+#else /* PEGASUS_OVERRIDE_DEFAULT_RELEASE_DIRS */
{"traceFilePath", "/var/opt/tog-pegasus/cache/trace/cimserver.trc"},
#if !defined(PEGASUS_USE_SYSLOGS)
{"logdir", "/var/opt/tog-pegasus/log"},
@@ -84,8 +84,8 @@
{"providerDir", "/opt/tog-pegasus/providers/lib"},
#endif
{"messageDir", "/opt/tog-pegasus/share/locale/ICU_Messages"},
-#endif
-#endif
+#endif /* PEGASUS_OVERRIDE_DEFAULT_RELEASE_DIRS */
+#endif /* defined(PEGASUS_USE_RELEASE_DIRS) && !defined(PEGASUS_OS_LSB) */
#if defined(PEGASUS_USE_RELEASE_DIRS) && defined(PEGASUS_OS_LSB)
{"traceFilePath", "/var/opt/lsb-pegasus/cache/cimserver.trc"},
#if !defined(PEGASUS_USE_SYSLOGS)
pegasus-2.5.1-enable_cql.patch:
env_var_Linux.status | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
--- NEW FILE pegasus-2.5.1-enable_cql.patch ---
--- pegasus/env_var_Linux.status.enable-cql 2006-03-15 20:33:51.000000000 -0500
+++ pegasus/env_var_Linux.status 2006-04-06 15:19:35.000000000 -0400
@@ -18,7 +18,7 @@
PEGASUS_STAGING_DIR = $(PEGASUS_HOME)/stagingDir
endif
-PEGASUS_DISABLE_CQL=true
+PEGASUS_ENABLE_CQL=true
PEGASUS_DISABLE_OBJECT_NORMALIZATION=true
PEGASUS_DISABLE_PERFINST=yes
PEGASUS_ENABLE_CMPI_PROVIDER_MANAGER=true
@@ -26,7 +26,6 @@
PEGASUS_HAS_SSL=yes
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,9 +63,10 @@
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
+PEGASUS_CONFIG_DIR = /etc/Pegasus
PEGASUS_PLANNED_CONFIG_FILE = cimserver_planned.conf
PEGASUS_PLANNED_CONFIG_FILE_PATH = \
- $(PEGASUS_VARDATA_DIR)/$(PEGASUS_PLANNED_CONFIG_FILE)
+ $(PEGASUS_CONFIG_DIR)/$(PEGASUS_PLANNED_CONFIG_FILE)
PEGASUS_CURRENT_CONFIG_FILE = cimserver_current.conf
PEGASUS_CURRENT_CONFIG_FILE_PATH = \
$(PEGASUS_VARDATA_DIR)/$(PEGASUS_CURRENT_CONFIG_FILE)
@@ -74,8 +74,6 @@
PEGASUS_LOG_DIR = $(PEGASUS_VARDATA_DIR)/log
PEGASUS_INSTALL_LOG = $(PEGASUS_LOG_DIR)/install.log
-PEGASUS_CONFIG_DIR = /etc/Pegasus
-
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-2.5.1-fix_tests.patch:
Makefile.ReleaseTest | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
--- NEW FILE pegasus-2.5.1-fix_tests.patch ---
--- pegasus/Makefile.ReleaseTest.fix-tests 2006-02-28 17:23:55.000000000 -0500
+++ pegasus/Makefile.ReleaseTest 2006-04-10 22:17:27.000000000 -0400
@@ -165,7 +165,7 @@
createMakefile_providerlinks:
@$(ECHO-E) "create_providerlinks:" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile
- @$(foreach i, $(PEGASUS_TEST_PROVIDERS), $(ECHO-E) "\t@$(MAKE) createlink OBJECT=$(PEGASUS_TEST_DIR)/$(PEGASUS_ARCH_LIB)/$(i)$(LIB_SUFFIX) LINKNAME=$(PEGASUS_PROVIDER_LIB_DIR)/$(i)$(LIB_LINK_SUFFIX)" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile ;)
+ @$(foreach i, $(PEGASUS_TEST_PROVIDERS), $(ECHO-E) "\t@$(MAKE) createlink OBJECT=$(PEGASUS_TEST_DIR)/lib/$(i)$(LIB_SUFFIX) LINKNAME=$(PEGASUS_PROVIDER_LIB_DIR)/$(i)$(LIB_LINK_SUFFIX)" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile ;)
@$(ECHO-E) "" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile
@$(ECHO-E) "remove_providerlinks:" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile
@$(foreach i, $(PEGASUS_TEST_PROVIDERS), $(ECHO-E) "\trm -f $(PEGASUS_PROVIDER_LIB_DIR)/$(i)$(LIB_LINK_SUFFIX)" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile ;)
@@ -189,8 +189,10 @@
@$(ECHO-E) "tests:" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile
@$(ECHO-E) "\t@$(MAKE) -i cimstop" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile
@$(ECHO-E) "\t@$(MAKE) prestarttests" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile
- @$(ECHO-E) "\t@$(MAKE) runTestSuite CIMSERVER_CONFIG_OPTIONS=\"$(TESTSUITE_CONFIG_1)\" TESTSUITE_CMDS=\"$(TESTSUITE_CMDS_1)\"" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile
- @$(ECHO-E) "\t@$(MAKE) runTestSuite CIMSERVER_CONFIG_OPTIONS=\"$(TESTSUITE_CONFIG_2)\" TESTSUITE_CMDS=\"$(TESTSUITE_CMDS_2)\"" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile
+ @$(ECHO-E) "\t@$(MAKE) setupTEST" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile
+ @$(ECHO-E) "\t@$(MAKE) runTestSuite CIMSERVER_CONFIG_OPTIONS=\"$(TESTSUITE_CONFIG_1)\" TESTSUITE_CMDS=\"$(TESTSUITE_CMDS_1)\" || { $(MAKE) unsetupTEST; exit 1; }" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile
+ @$(ECHO-E) "\t@$(MAKE) runTestSuite CIMSERVER_CONFIG_OPTIONS=\"$(TESTSUITE_CONFIG_2)\" TESTSUITE_CMDS=\"$(TESTSUITE_CMDS_2)\" || { $(MAKE) unsetupTEST; exit 1; }" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile
+ @$(ECHO-E) "\t@$(MAKE) unsetupTEST" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile
@$(ECHO-E) "" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile
createMakefile_setupTEST:
pegasus-2.5.1-fix_zseries_flags.patch:
platform_LINUX_ZSERIES64_GNU.mak | 2 +-
platform_LINUX_ZSERIES_GNU.mak | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE pegasus-2.5.1-fix_zseries_flags.patch ---
--- pegasus/mak/platform_LINUX_ZSERIES64_GNU.mak.fix_zseries_flags 2006-01-30 11:16:23.000000000 -0500
+++ pegasus/mak/platform_LINUX_ZSERIES64_GNU.mak 2006-04-10 20:10:04.000000000 -0400
@@ -35,4 +35,4 @@
ARCHITECTURE = zseries
-FLAGS = -fsigned-char
+FLAGS += -fsigned-char
--- pegasus/mak/platform_LINUX_ZSERIES_GNU.mak.fix_zseries_flags 2006-01-30 11:16:23.000000000 -0500
+++ pegasus/mak/platform_LINUX_ZSERIES_GNU.mak 2006-04-10 20:09:41.000000000 -0400
@@ -35,4 +35,4 @@
ARCHITECTURE = zseries
-FLAGS = -fsigned-char
+FLAGS += -fsigned-char
pegasus-2.5.1-initscript.patch:
tog-pegasus.rc | 124 ++++++++++++++++++++++++++++++---------------------------
1 files changed, 67 insertions(+), 57 deletions(-)
--- NEW FILE pegasus-2.5.1-initscript.patch ---
--- pegasus/rpm/tog-pegasus.rc.initscript 2006-01-30 11:16:24.000000000 -0500
+++ pegasus/rpm/tog-pegasus.rc 2006-04-11 13:57:31.000000000 -0400
@@ -1,80 +1,85 @@
-#//%2006////////////////////////////////////////////////////////////////////////
-#//
-#// Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development
-#// Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.
-#// Copyright (c) 2003 BMC Software; Hewlett-Packard Development Company, L.P.;
-#// IBM Corp.; EMC Corporation, The Open Group.
-#// Copyright (c) 2004 BMC Software; Hewlett-Packard Development Company, L.P.;
-#// IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.
-#// Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.;
-#// EMC Corporation; VERITAS Software Corporation; The Open Group.
-#// Copyright (c) 2006 Hewlett-Packard Development Company, L.P.; IBM Corp.;
-#// EMC Corporation; Symantec Corporation; The Open Group.
-#//
-#// Permission is hereby granted, free of charge, to any person obtaining a copy
-#// of this software and associated documentation files (the "Software"), to
-#// deal in the Software without restriction, including without limitation the
-#// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-#// sell copies of the Software, and to permit persons to whom the Software is
-#// furnished to do so, subject to the following conditions:
-#//
-#// THE ABOVE COPYRIGHT NOTICE AND THIS PERMISSION NOTICE SHALL BE INCLUDED IN
-#// ALL COPIES OR SUBSTANTIAL PORTIONS OF THE SOFTWARE. THE SOFTWARE IS PROVIDED
-#// "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
-#// LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
-#// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-#// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-#// ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-#// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#//
-#//==============================================================================
-#! /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
+# description: The Open Group Pegasus cimserver initscript
+# processname: cimserver
+# pidfile: /var/run/tog-pegasus/cimserver.pid
+#
+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}
+PEGASUS_SSL_CERT_FILE=${PEGASUS_SSL_CERT_FILE:=/etc/Pegasus/server.pem}
+PEGASUS_SSL_KEY_FILE=${PEGASUS_SSL_KEY_FILE:=/etc/Pegasus/file.pem}
+PEGASUS_SSL_TRUSTSTORE=${PEGASUS_SSL_TRUSTSTORE:=/etc/Pegasus/client.pem}
-. /lib/lsb/init-functions
RETVAL=0
case "$1" in
- start)
+ start)
+ 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
+ echo -n "tog-pegasus: Generating cimserver SSL certificates...";
+ /usr/share/Pegasus/scripts/genOpenPegasusSSLCerts;
+ if [ $? -eq 0 ]; then
+ success;
+ else
+ failure;
+ fi;
+ echo;
+ fi;
+ fi;
echo -n $"Starting up CIM server: "
- $CIMSERVER_BIN
+ $CIMSERVER_BIN ${CIMSERVER_OPTIONS}
RETVAL=$?
- [ "$RETVAL" -eq 0 ] && log_success_msg $"$prog start" || log_failure_msg $"$prog start"
- echo
+ if [ "$RETVAL" -eq 0 ]; then
+ touch $LOCKFILE;
+ success;
+ else
+ failure;
+ fi;
+ echo;
;;
stop)
echo -n $"Shutting down CIM server: "
killproc cimserver
RETVAL=$?
- [ "$RETVAL" -eq 0 ] && log_success_msg $"$prog stop" || log_failure_msg $"$prog stop"
+ if [ "$RETVAL" -eq 0 ]; then
+ rm -f $LOCKFILE;
+ rm -f /var/run/tog-pegasus/socket/*;
+ rm -f /var/run/tog-pegasus/cimserver.pid;
+ success;
+ else
+ failure;
+ fi
echo
;;
+
status)
pid=`pidofproc $CIMSERVER_BIN`
RETVAL=$?
if [ "$RETVAL" -eq 0 ]; then
- echo "CIM server is running"
+ echo -n $"CIM server ($pid) is running";
+ success;
else
- echo "CIM server is not running"
+ echo -n $"CIM server is not running";
+ failure;
fi
+ echo
;;
+
condrestart)
pid=`pidofproc $CIMSERVER_BIN`
RETVAL=$?
@@ -83,13 +88,18 @@
RETVAL=$?;
fi;
;;
+
try-restart)
- $0 stop && $0 start
+ $0 stop && $0 start;
+ RETVAL=$?;
;;
+
restart|force-reload)
- $0 stop
- $0 start
+ $0 stop;
+ $0 start;
+ RETVAL=$?;
;;
+
reload)
;;
*)
pegasus-2.5.1-linkflags.patch:
library.mak | 4 ++++
program.mak | 4 ++++
2 files changed, 8 insertions(+)
--- NEW FILE pegasus-2.5.1-linkflags.patch ---
--- pegasus/mak/library.mak.linkflags 2006-01-30 11:16:23.000000000 -0500
+++ pegasus/mak/library.mak 2006-04-05 17:11:23.000000000 -0400
@@ -40,6 +40,10 @@
include $(ROOT)/mak/common.mak
+ifdef PEGASUS_EXTRA_LIBRARY_LINK_FLAGS
+ EXTRA_LINK_FLAGS = $(PEGASUS_EXTRA_LIBRARY_LINK_FLAGS)
+endif
+
################################################################################
##
## Build list of object names.
--- pegasus/mak/program.mak.linkflags 2006-01-30 11:16:23.000000000 -0500
+++ pegasus/mak/program.mak 2006-04-05 17:10:37.000000000 -0400
@@ -38,6 +38,10 @@
include $(ROOT)/mak/common.mak
+ifdef PEGASUS_EXTRA_PROGRAM_LINK_FLAGS
+ EXTRA_LINK_FLAGS = $(PEGASUS_EXTRA_PROGRAM_LINK_FLAGS)
+endif
+
ifeq ($(OS_TYPE),windows)
include $(ROOT)/mak/program-windows.mak
endif
pegasus-2.5.1-local-or-remote-auth.patch:
Common/AuthenticationInfo.h | 16 ++
Common/AuthenticationInfoRep.cpp | 12 +-
Common/AuthenticationInfoRep.h | 11 +
Common/HTTPConnection.cpp | 24 ++++
Common/HTTPMessage.cpp | 3
Common/HTTPMessage.h | 3
Security/Authentication/BasicAuthenticationHandler.cpp | 2
Security/Authentication/BasicAuthenticator.h | 3
Security/Authentication/PAMBasicAuthenticator.h | 12 +-
Security/Authentication/PAMBasicAuthenticatorStub.cpp | 3
Security/Authentication/PAMBasicAuthenticatorUnix.cpp | 100 ++++++++++++++---
Server/HTTPAuthenticatorDelegator.cpp | 3
12 files changed, 165 insertions(+), 27 deletions(-)
--- NEW FILE pegasus-2.5.1-local-or-remote-auth.patch ---
--- pegasus/src/Pegasus/Server/HTTPAuthenticatorDelegator.cpp.local-or-remote-auth 2006-03-10 18:18:37.000000000 -0500
+++ pegasus/src/Pegasus/Server/HTTPAuthenticatorDelegator.cpp 2006-04-05 20:35:40.000000000 -0400
@@ -384,6 +384,9 @@
}
}
+ // Let Authenticators know whether this user is Local or Remote:
+ httpMessage->authInfo->setRemoteUser( httpMessage->fromRemoteHost );
+
//
// Handle authentication:
//
--- pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorUnix.cpp.local-or-remote-auth 2006-01-30 11:18:28.000000000 -0500
+++ pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorUnix.cpp 2006-04-05 20:40:40.000000000 -0400
@@ -48,6 +48,8 @@
#include <prot.h>
#endif
+#include <syslog.h>
+
#if defined (PEGASUS_USE_PAM_STANDALONE_PROC)
#include <Pegasus/Common/Logger.h>
#include <Pegasus/Common/IPC.h>
@@ -131,7 +133,8 @@
Boolean PAMBasicAuthenticator::authenticate(
const String& userName,
- const String& password)
+ const String& password,
+ Boolean isRemoteUser)
{
PEG_METHOD_ENTER(TRC_AUTHENTICATION,
"PAMBasicAuthenticator::authenticate()");
@@ -139,7 +142,7 @@
Boolean authenticated;
#if !defined(PEGASUS_USE_PAM_STANDALONE_PROC)
- authenticated = _authenticateByPAM(userName, password);
+ authenticated = _authenticateByPAM(userName, password, isRemoteUser);
#else
//
// Mutex to Serialize Authentication calls.
@@ -147,8 +150,9 @@
Tracer::trace(TRC_AUTHENTICATION, Tracer::LEVEL4,
"Authentication Mutex lock.");
AutoMutex lock(_authSerializeMutex);
- authenticated = _pamBasicAuthenticatorStandAlone.authenticate(
- userName, password);
+ authenticated =
+ _pamBasicAuthenticatorStandAlone->authenticate(userName,
+ password);
#endif
PEG_METHOD_EXIT();
@@ -157,7 +161,8 @@
Boolean PAMBasicAuthenticator::_authenticateByPAM(
const String& userName,
- const String& password)
+ const String& password,
+ Boolean isRemoteUser)
{
PEG_METHOD_ENTER(TRC_AUTHENTICATION,
"PAMBasicAuthenticator::_authenticateByPAM()");
@@ -167,6 +172,7 @@
pam_handle_t *phandle;
char *name;
APP_DATA mydata;
+ int retcode;
//
// Store the password for PAM authentication
@@ -180,13 +186,31 @@
// Tracer::trace(TRC_AUTHENTICATION, Tracer::LEVEL4,
// "PAMBasicAuthenticator::_authenticateByPAM() - userName = %s; userPassword = %s",
// (const char *)userName.getCString(), (const char *)password.getCString());
+
+ // NOTE: if any pam call should log anything, our syslog socket will be redirected
+ // to the AUTH facility, so we need to redirect it back after each pam call.
//
//Call pam_start since you need to before making any other PAM calls
//
- if ( ( pam_start(service,
+
+ if ( (retcode = pam_start(service,
(const char *)userName.getCString(), &pconv, &phandle) ) != PAM_SUCCESS )
{
+ closelog();
+ openlog("cimserver", LOG_PID, LOG_DAEMON);
+ syslog( LOG_ERR, "pam_start failed: %s", pam_strerror(phandle, retcode));
+ PEG_METHOD_EXIT();
+ return (authenticated);
+ }
+
+
+ if ( (retcode = pam_set_item(phandle, PAM_TTY, isRemoteUser ? "wbemNetwork" : "wbemLocal")) != PAM_SUCCESS )
+ {
+ pam_end(phandle, 0);
+ closelog();
+ openlog("cimserver", LOG_PID, LOG_DAEMON);
+ syslog( LOG_ERR, "pam_set_item(PAM_TTY=wbem) failed: %s", pam_strerror(phandle, retcode));
PEG_METHOD_EXIT();
return (authenticated);
}
@@ -194,7 +218,7 @@
//
//Call pam_authenticate to authenticate the user
//
- if ( ( pam_authenticate(phandle, 0) ) == PAM_SUCCESS )
+ if ( ( retcode = pam_authenticate(phandle, 0) ) == PAM_SUCCESS )
{
Tracer::trace(TRC_AUTHENTICATION, Tracer::LEVEL4,
"pam_authenticate successful.");
@@ -203,22 +227,40 @@
//checking for password and account expiration, as well as verifying access
//hour restrictions.
//
- if ( ( pam_acct_mgmt(phandle, 0) ) == PAM_SUCCESS )
+
+ if ( ( retcode = pam_acct_mgmt(phandle, 0) ) == PAM_SUCCESS )
{
Tracer::trace(TRC_AUTHENTICATION, Tracer::LEVEL4,
"pam_acct_mgmt successful.");
authenticated = true;
- }
+ }else
+ {
+ closelog();
+ openlog("cimserver", LOG_PID, LOG_DAEMON);
+ syslog(LOG_ERR, "pam_acct_mgmt failed: %s",pam_strerror(phandle, retcode));
+ }
+ }else
+ {
+ closelog();
+ openlog("cimserver", LOG_PID, LOG_DAEMON);
+ syslog(LOG_ERR, "pam_authenticate failed: %s",pam_strerror(phandle, retcode));
}
-
//
//Call pam_end to end our PAM work
//
pam_end(phandle, 0);
+ closelog();
+ openlog("cimserver", LOG_PID, LOG_DAEMON);
- PEG_METHOD_EXIT();
+ if ( ! authenticated )
+ syslog(LOG_ERR, "PAM authentication failed for %s user: %s",
+ isRemoteUser ? "remote" : "local",
+ (const char*)userName.getCString()
+ );
+ PEG_METHOD_EXIT();
return (authenticated);
+
}
Boolean PAMBasicAuthenticator::validateUser(const String& userName)
@@ -233,6 +275,7 @@
pam_handle_t *phandle;
char *name;
APP_DATA mydata;
+ int retcode;
const char *service = "wbem";
pconv.conv = PAMBasicAuthenticator::pamValidateUserCallback;
@@ -241,21 +284,43 @@
//
// Call pam_start since you need to before making any other PAM calls
//
- if ( pam_start(service,
- (const char *)userName.getCString(), &pconv, &phandle) != PAM_SUCCESS)
- {
+ if ( (retcode =
+ pam_start(service,(const char *)userName.getCString(), &pconv, &phandle)
+ ) != PAM_SUCCESS
+ )
+ {
+ closelog();
+ openlog("cimserver", LOG_PID, LOG_DAEMON);
+ syslog( LOG_ERR, "pam_start() failed: %s", pam_strerror(phandle, retcode));
PEG_METHOD_EXIT();
return (authenticated);
}
+ if ( (retcode = pam_set_item(phandle, PAM_TTY, "wbemLocal")) != PAM_SUCCESS )
+ {
+ pam_end(phandle, 0);
+ closelog();
+ openlog("cimserver", LOG_PID, LOG_DAEMON);
+ syslog( LOG_ERR, "pam_set_item(PAM_TTY=wbemLocal) failed: %s", pam_strerror(phandle, retcode));
+ PEG_METHOD_EXIT();
+ return (authenticated);
+ }
//
// Call pam_acct_mgmt, to check if the user account is valid. This includes
// checking for account expiration, as well as verifying access
// hour restrictions.
//
- if ( pam_acct_mgmt(phandle, 0) == PAM_SUCCESS )
- {
+ if ( (retcode = pam_acct_mgmt(phandle, 0)) == PAM_SUCCESS )
+ {
authenticated = true;
+ }else
+ {
+ pam_end(phandle, 0);
+ closelog();
+ openlog("cimserver", LOG_PID, LOG_DAEMON);
+ syslog( LOG_ERR, "pam_acct_mgmt() failed: %s", pam_strerror(phandle, retcode));
+ PEG_METHOD_EXIT();
+ return (authenticated);
}
//
@@ -263,6 +328,9 @@
//
pam_end(phandle, 0);
+ closelog();
+ openlog("cimserver", LOG_PID, LOG_DAEMON);
+
#else
//
// Mutex to Serialize Authentication calls.
--- pegasus/src/Pegasus/Security/Authentication/BasicAuthenticator.h.local-or-remote-auth 2006-01-30 11:18:28.000000000 -0500
+++ pegasus/src/Pegasus/Security/Authentication/BasicAuthenticator.h 2006-04-05 20:35:40.000000000 -0400
@@ -67,7 +67,8 @@
*/
virtual Boolean authenticate(
const String& userName,
- const String& password) = 0;
+ const String& password,
+ Boolean isRemoteUser) = 0;
/** Construct and return the HTTP Basic authentication challenge header
@return A string containing the authentication challenge header.
--- pegasus/src/Pegasus/Security/Authentication/BasicAuthenticationHandler.cpp.local-or-remote-auth 2006-01-30 11:18:28.000000000 -0500
+++ pegasus/src/Pegasus/Security/Authentication/BasicAuthenticationHandler.cpp 2006-04-05 20:35:40.000000000 -0400
@@ -138,7 +138,7 @@
authInfo->setAuthenticatedUser(userName);
authInfo->setAuthenticatedPassword(password);
#else
- authenticated = _basicAuthenticator->authenticate(userName, password);
+ authenticated = _basicAuthenticator->authenticate(userName, password, authInfo->isRemoteUser());
if (authenticated)
{
--- pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorStub.cpp.local-or-remote-auth 2006-01-30 11:18:28.000000000 -0500
+++ pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorStub.cpp 2006-04-05 20:35:40.000000000 -0400
@@ -92,7 +92,8 @@
Boolean PAMBasicAuthenticator::authenticate(
const String& userName,
- const String& password)
+ const String& password,
+ Boolean isRemoteUser)
{
PEG_METHOD_ENTER(TRC_AUTHENTICATION,
"PAMBasicAuthenticator::authenticate()");
--- pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticator.h.local-or-remote-auth 2006-01-30 11:18:28.000000000 -0500
+++ pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticator.h 2006-04-05 20:35:40.000000000 -0400
@@ -73,7 +73,8 @@
*/
Boolean authenticate(
const String& userName,
- const String& password);
+ const String& password,
+ Boolean isRemoteUser);
/** Verify PAM account management for the requesting user.
@param userName String containing the user name
@@ -102,7 +103,8 @@
Boolean _authenticateByPAM(
const String& userName,
- const String& password);
+ const String& password,
+ Boolean isRemoteUser);
void _createPAMStandalone();
@@ -158,7 +160,8 @@
*/
Boolean authenticate(
const String& userName,
- const String& password);
+ const String& password,
+ Boolean isRemoteUser);
/** Verify whether the user is valid.
@param userName String containing the user name
@@ -220,7 +223,8 @@
Boolean _authenticateByPAM(
const String& userName,
- const String& password);
+ const String& password,
+ Boolean isRemoteUser);
#if defined(PEGASUS_USE_PAM_STANDALONE_PROC)
PAMBasicAuthenticatorStandAlone _pamBasicAuthenticatorStandAlone;
--- pegasus/src/Pegasus/Common/AuthenticationInfoRep.cpp.local-or-remote-auth 2006-01-30 11:16:46.000000000 -0500
+++ pegasus/src/Pegasus/Common/AuthenticationInfoRep.cpp 2006-04-05 20:35:40.000000000 -0400
@@ -57,7 +57,8 @@
_privileged(false),
_authType(String::EMPTY),
_authStatus(NEW_REQUEST),
- _exportConnection(false)
+ _exportConnection(false),
+ _remoteUser(true)
{
PEG_METHOD_ENTER(
TRC_AUTHENTICATION, "AuthenticationInfoRep::AuthenticationInfoRep");
@@ -180,5 +181,14 @@
PEG_METHOD_EXIT();
}
+void AuthenticationInfoRep::setRemoteUser(Boolean remoteUser)
+{
+ PEG_METHOD_ENTER(TRC_AUTHENTICATION,
+ "AuthenticationInfoRep::setRemoteUser");
+
+ _remoteUser = remoteUser;
+
+ PEG_METHOD_EXIT();
+}
PEGASUS_NAMESPACE_END
--- pegasus/src/Pegasus/Common/HTTPMessage.cpp.local-or-remote-auth 2006-01-30 11:17:04.000000000 -0500
+++ pegasus/src/Pegasus/Common/HTTPMessage.cpp 2006-04-05 20:35:40.000000000 -0400
@@ -119,7 +119,8 @@
queueId(queueId_),
authInfo(0),
acceptLanguagesDecoded(false),
- contentLanguagesDecoded(false)
+ contentLanguagesDecoded(false),
+ fromRemoteHost(true)
{
if (cimException_)
cimException = *cimException_;
--- pegasus/src/Pegasus/Common/AuthenticationInfo.h.local-or-remote-auth 2006-01-30 11:16:46.000000000 -0500
+++ pegasus/src/Pegasus/Common/AuthenticationInfo.h 2006-04-05 20:35:40.000000000 -0400
@@ -331,6 +331,22 @@
_rep->setClientCertificateChain(clientCertificate);
}
+ /** Indicate whether the user is Remote
+ */
+ Boolean isRemoteUser() const
+ {
+ _checkRep();
+ return _rep->isRemoteUser();
+ }
+
+ /** Set the Remote User flag
+ */
+ void setRemoteUser(Boolean remoteUser)
+ {
+ _checkRep();
+ _rep->setRemoteUser(remoteUser);
+ }
+
private:
AuthenticationInfo(AuthenticationInfoRep* rep) : _rep(rep)
--- pegasus/src/Pegasus/Common/HTTPConnection.cpp.local-or-remote-auth 2006-02-28 21:21:37.000000000 -0500
+++ pegasus/src/Pegasus/Common/HTTPConnection.cpp 2006-04-05 20:35:40.000000000 -0400
@@ -1828,6 +1828,30 @@
"_requestCount = %d", _requestCount.get());
message->dest = _outputMessageQueue->getQueueId();
// SendForget(message);
+
+ // Allow authenticators to differentiate Remote and Local users:
+ struct sockaddr_in sin_peer, sin_svr; // don't need to worry about IPv6 yet ...
+ socklen_t slen1=sizeof(struct sockaddr_in), slen2=sizeof(struct sockaddr_in);
+ uint32_t sock = _socket.get()->getSocket() ;
+ memset(&sin_peer,'\0',slen1);
+ memset(&sin_svr, '\0',slen2);
+ if ( ( ::getpeername( sock, (struct sockaddr*)&sin_peer, &slen1) == 0 )
+ ||( ::getsockname( sock, (struct sockaddr*)&sin_svr, &slen2) == 0 )
+ )
+ {
+ if( sin_peer.sin_family == AF_INET )
+ {
+ if( ((ntohl( sin_peer.sin_addr.s_addr ) >> 24) & 0xff) == 127 )
+ // message was sent FROM localhost interface
+ message->fromRemoteHost = false;
+ }
+ if( sin_svr.sin_family == AF_INET )
+ {
+ if( ((ntohl( sin_svr.sin_addr.s_addr ) >> 24) & 0xff) == 127 )
+ // message was sent TO localhost interface
+ message->fromRemoteHost = false;
+ }
+ }
//
// Set the entry status to BUSY.
--- pegasus/src/Pegasus/Common/AuthenticationInfoRep.h.local-or-remote-auth 2006-01-30 11:16:46.000000000 -0500
+++ pegasus/src/Pegasus/Common/AuthenticationInfoRep.h 2006-04-05 20:37:59.000000000 -0400
@@ -143,6 +143,14 @@
void setExportConnection(Boolean exportConnection);
+ Boolean isRemoteUser() const
+ {
+ return _remoteUser;
+ }
+
+ void setRemoteUser(Boolean remoteUser);
+
+
//PEP187
Array<SSLCertificateInfo*> getClientCertificateChain()
{
@@ -173,7 +181,8 @@
#endif
Boolean _exportConnection;
- Array<SSLCertificateInfo*> _clientCertificate;
+ Array<SSLCertificateInfo*> _clientCertificate;
+ Boolean _remoteUser;
};
PEGASUS_NAMESPACE_END
--- pegasus/src/Pegasus/Common/HTTPMessage.h.local-or-remote-auth 2006-01-30 11:17:04.000000000 -0500
+++ pegasus/src/Pegasus/Common/HTTPMessage.h 2006-04-05 20:35:40.000000000 -0400
@@ -80,7 +80,8 @@
ContentLanguageList contentLanguages;
Boolean acceptLanguagesDecoded;
Boolean contentLanguagesDecoded;
- CIMException cimException;
+ Boolean fromRemoteHost;
+ CIMException cimException;
void parse(
String& startLine,
pegasus-2.5.1-no-rpath.patch:
mak/library-unix.mak | 6 +++---
mak/program-unix.mak | 14 ++------------
src/Pegasus/Common/Makefile | 3 +--
src/Pegasus/ControlProviders/CertificateProvider/Makefile | 3 +--
4 files changed, 7 insertions(+), 19 deletions(-)
--- NEW FILE pegasus-2.5.1-no-rpath.patch ---
--- pegasus/mak/library-unix.mak.no-rpath 2006-01-30 11:16:23.000000000 -0500
+++ pegasus/mak/library-unix.mak 2006-04-08 18:28:43.000000000 -0400
@@ -81,14 +81,14 @@
ifneq ($(PEGASUS_PLATFORM),DARWIN_PPC_GNU)
ifdef PEGASUS_USE_RELEASE_DIRS
LINK_COMMAND = $(CXX) -shared $(LINK_MACHINE_OPTIONS)
- LINK_ARGUMENTS = -Wl,-hlib$(LIBRARY)$(LIB_SUFFIX) -Xlinker -rpath -Xlinker $(PEGASUS_DEST_LIB_DIR)
+ LINK_ARGUMENTS = -Wl,-hlib$(LIBRARY)$(LIB_SUFFIX) $(EXTRA_LINK_ARGUMENTS)
else
LINK_COMMAND = $(CXX) -shared $(LINK_MACHINE_OPTIONS)
- LINK_ARGUMENTS = -Wl,-hlib$(LIBRARY)$(LIB_SUFFIX) -Xlinker -rpath -Xlinker $(LIB_DIR) $(EXTRA_LINK_ARGUMENTS)
+ LINK_ARGUMENTS = -Wl,-hlib$(LIBRARY)$(LIB_SUFFIX) $(EXTRA_LINK_ARGUMENTS)
endif
else
LINK_COMMAND = $(CXX) -dynamiclib
- LINK_ARGUMENTS = --helplib$(LIBRARY)$(LIB_SUFFIX) -ldl
+ LINK_ARGUMENTS = --helplib$(LIBRARY)$(LIB_SUFFIX) -ldl $(EXTRA_LINK_ARGUMENTS)
endif
ifeq ($(PEGASUS_PLATFORM), SOLARIS_SPARC_GNU)
LINK_ARGUMENTS = -Wl,-hlib$(LIBRARY)$(LIB_SUFFIX) -Xlinker -L$(LIB_DIR) $(EXTRA_LINK_ARGUMENTS)
--- pegasus/mak/program-unix.mak.no-rpath 2006-01-30 11:16:23.000000000 -0500
+++ pegasus/mak/program-unix.mak 2006-04-08 18:28:43.000000000 -0400
@@ -30,22 +30,12 @@
#//==============================================================================
INCLUDES = -I$(ROOT)/src $(EXTRA_INCLUDES)
-ifndef LINK_RPATH
- LINK_RPATH = -Xlinker -rpath
-endif
-
LINK_DEST_LIB = -Xlinker $(PEGASUS_DEST_LIB_DIR)
LINK_LIB_DIR = -Xlinker $(LIB_DIR)
LINK_ICU = -Xlinker ${ICU_INSTALL}/lib
-ifndef LINK_RPATH_LINK
- LINK_RPATH_LINK = -Xlinker -rpath-link
-endif
-
-
-
TMP_OBJECTS = $(foreach i,$(SOURCES),$(OBJ_DIR)/$i)
ifeq ($(OS_TYPE),windows)
@@ -118,9 +108,9 @@
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)
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)
endif
endif
else
--- pegasus/src/Pegasus/ControlProviders/CertificateProvider/Makefile.no-rpath 2006-01-30 11:17:40.000000000 -0500
+++ pegasus/src/Pegasus/ControlProviders/CertificateProvider/Makefile 2006-04-09 02:19:33.000000000 -0400
@@ -58,8 +58,7 @@
ifeq ($(OS),linux)
EXTRA_LIBRARIES += -lcrypt
ifdef PEGASUS_HAS_SSL
- EXTRA_LIBRARIES += -L$(OPENSSL_HOME)/lib -lssl -lcrypto
- EXTRA_LINK_ARGUMENTS = -Xlinker -rpath -Xlinker $(OPENSSL_HOME)/lib
+ EXTRA_LIBRARIES += -lssl -lcrypto
endif
endif
--- pegasus/src/Pegasus/Common/Makefile.no-rpath 2006-01-30 11:17:05.000000000 -0500
+++ pegasus/src/Pegasus/Common/Makefile 2006-04-09 02:23:54.000000000 -0400
@@ -185,8 +185,7 @@
ifeq ($(OS),linux)
EXTRA_LIBRARIES += -lcrypt
ifdef PEGASUS_HAS_SSL
- EXTRA_LIBRARIES += -L$(OPENSSL_HOME)/lib -lssl -lcrypto
- EXTRA_LINK_ARGUMENTS = -Xlinker -rpath -Xlinker $(OPENSSL_HOME)/lib
+ EXTRA_LIBRARIES += -lssl -lcrypto
endif
endif
pegasus-2.5.1-pam-wbem.patch:
wbem | 18 ++++++------------
1 files changed, 6 insertions(+), 12 deletions(-)
--- NEW FILE pegasus-2.5.1-pam-wbem.patch ---
--- pegasus/rpm/wbem.pam-wbem 2006-01-17 14:17:43.000000000 -0500
+++ pegasus/rpm/wbem 2006-04-05 19:26:46.000000000 -0400
@@ -1,13 +1,7 @@
#%PAM-1.0
-auth required $ISA/pam_env.so
-auth sufficient $ISA/pam_unix.so nullok
-auth required $ISA/pam_deny.so
-
-account required $ISA/pam_unix.so
-
-password required $ISA/pam_cracklib.so retry=3 type=
-password sufficient $ISA/pam_unix.so nullok use_authtok md5 shadow
-password required $ISA/pam_deny.so
-
-session required $ISA/pam_limits.so
-session required $ISA/pam_unix.so
+auth include system-auth
+account required pam_access.so accessfile=/etc/Pegasus/access.conf
+account include system-auth
+password include system-auth
+session include system-auth
+session required pam_loginuid.so
pegasus-2.5.1-parallel_make.patch:
objects-unix.mak | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
--- NEW FILE pegasus-2.5.1-parallel_make.patch ---
--- pegasus/mak/objects-unix.mak.parallel_make 2006-01-30 11:16:23.000000000 -0500
+++ pegasus/mak/objects-unix.mak 2006-04-10 16:58:30.000000000 -0400
@@ -50,7 +50,7 @@
ifeq ($(_NO_TMP_O), yes)
-$(OBJ_DIR)/%.o: %.cpp $(ERROR)
+$(OBJ_DIR)/%.o: $(OBJ_DIR)/target %.cpp $(ERROR)
$(CXX) -c -o $@ $(FLAGS) $(EXTRA_CXX_FLAGS) $(LOCAL_DEFINES) $(DEFINES) $(SYS_INCLUDES) $(INCLUDES) $*.cpp
@ $(TOUCH) $@
@ $(ECHO)
@@ -64,7 +64,7 @@
endif
ifeq ($(_NO_TMP_O), yes)
-$(OBJ_DIR)/%.o: %.c $(ERROR)
+$(OBJ_DIR)/%.o: $(OBJ_DIR)/target %.c $(ERROR)
$(CC) -c -o $@ $(FLAGS) $(EXTRA_C_FLAGS) $(LOCAL_DEFINES) $(DEFINES) $(SYS_INCLUDES) $(INCLUDES) $*.c
@ $(TOUCH) $@
@ $(ECHO)
@@ -78,7 +78,7 @@
endif
ifeq ($(_NO_TMP_O), yes)
-$(OBJ_DIR)/%.o: %.s $(ERROR)
+$(OBJ_DIR)/%.o: $(OBJ_DIR)/target %.s $(ERROR)
$(CC) -c -o $@ $(FLAGS) $(EXTRA_C_FLAGS) $(LOCAL_DEFINES) $(DEFINES) $(SYS_INCLUDES) $(INCLUDES) $*.s
@ $(TOUCH) $@
@ $(ECHO)
pegasus-2.5.1-redhat-config.patch:
Makefile.Release | 6 +++---
env_var_Linux.status | 14 +++++++-------
2 files changed, 10 insertions(+), 10 deletions(-)
--- NEW FILE pegasus-2.5.1-redhat-config.patch ---
--- pegasus/env_var_Linux.status.redhat-config 2006-03-15 20:33:51.000000000 -0500
+++ pegasus/env_var_Linux.status 2006-04-11 15:56:29.000000000 -0400
@@ -18,7 +18,9 @@
PEGASUS_STAGING_DIR = $(PEGASUS_HOME)/stagingDir
endif
-PEGASUS_DISABLE_CQL=true
+PEGASUS_ENABLE_CQL=true
+PEGASUS_DEFAULT_ENABLE_OOP = false
+
PEGASUS_DISABLE_OBJECT_NORMALIZATION=true
PEGASUS_DISABLE_PERFINST=yes
PEGASUS_ENABLE_CMPI_PROVIDER_MANAGER=true
@@ -26,7 +28,6 @@
PEGASUS_HAS_SSL=yes
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 @@
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
+PEGASUS_CONFIG_DIR = /etc/Pegasus
PEGASUS_PLANNED_CONFIG_FILE = cimserver_planned.conf
PEGASUS_PLANNED_CONFIG_FILE_PATH = \
- $(PEGASUS_VARDATA_DIR)/$(PEGASUS_PLANNED_CONFIG_FILE)
+ $(PEGASUS_CONFIG_DIR)/$(PEGASUS_PLANNED_CONFIG_FILE)
PEGASUS_CURRENT_CONFIG_FILE = cimserver_current.conf
PEGASUS_CURRENT_CONFIG_FILE_PATH = \
- $(PEGASUS_VARDATA_DIR)/$(PEGASUS_CURRENT_CONFIG_FILE)
+ $(PEGASUS_CONFIG_DIR)/$(PEGASUS_CURRENT_CONFIG_FILE)
PEGASUS_LOG_DIR = $(PEGASUS_VARDATA_DIR)/log
PEGASUS_INSTALL_LOG = $(PEGASUS_LOG_DIR)/install.log
-PEGASUS_CONFIG_DIR = /etc/Pegasus
-
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_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-11 15:47:08.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-2.5.1-warnings.patch:
Common/Packer.h | 4 ++--
Common/ResponseHandler.cpp | 4 ++--
Common/String.cpp | 4 ++--
Common/StringInline.h | 4 ++--
Config/ConfigManager.cpp | 2 +-
ProviderManager2/CMPI/CMPIProviderManager.cpp | 6 +++---
6 files changed, 12 insertions(+), 12 deletions(-)
--- NEW FILE pegasus-2.5.1-warnings.patch ---
--- pegasus/src/Pegasus/ProviderManager2/CMPI/CMPIProviderManager.cpp.warnings 2006-02-28 14:53:30.000000000 -0500
+++ pegasus/src/Pegasus/ProviderManager2/CMPI/CMPIProviderManager.cpp 2006-04-05 19:27:27.000000000 -0400
@@ -88,7 +88,7 @@
char **props;
int pCount;
public:
- CMPIPropertyList(CIMPropertyList &propertyList) {
+ CMPIPropertyList(CIMPropertyList &propertyList) : props(0L), pCount(0) {
if (!propertyList.isNull()) {
Array<CIMName> p=propertyList.getPropertyNameArray();
pCount=p.size();
@@ -2497,7 +2497,7 @@
try
{
- indProvRecord *provRec;
+ indProvRecord *provRec = 0L;
if (provTab.lookup (ph.GetProvider ().getName (), provRec))
{
provRec->enabled = true;
@@ -2587,7 +2587,7 @@
PEG_METHOD_ENTER (TRC_PROVIDERMANAGER,
"CMPIProviderManager::_callDisableIndications");
- indProvRecord * provRec;
+ indProvRecord * provRec = 0L;
if (provTab.lookup (ph.GetProvider ().getName (), provRec))
{
provRec->enabled = false;
--- pegasus/src/Pegasus/Config/ConfigManager.cpp.warnings 2006-03-14 16:06:37.000000000 -0500
+++ pegasus/src/Pegasus/Config/ConfigManager.cpp 2006-04-05 19:27:27.000000000 -0400
@@ -758,7 +758,7 @@
//
for (Uint32 i = 0; i < NUM_PROPERTIES; i++)
{
- const char* fixedValue;
+ const char* fixedValue = 0L;
_properties[i].propertyOwner->initialize();
--- pegasus/src/Pegasus/Common/Packer.h.warnings 2006-01-30 11:17:07.000000000 -0500
+++ pegasus/src/Pegasus/Common/Packer.h 2006-04-05 19:27:27.000000000 -0400
@@ -173,12 +173,12 @@
inline void Packer::packReal32(Buffer& out, Real32 x)
{
- packUint32(out, *((Uint32*)&x));
+ packUint32(out, (Uint32)x);
}
inline void Packer::packReal64(Buffer& out, Real64 x)
{
- packUint64(out, *((Uint64*)&x));
+ packUint64(out, (Uint64)x);
}
inline void Packer::packChar16(Buffer& out, Char16 x)
--- pegasus/src/Pegasus/Common/StringInline.h.warnings 2006-01-30 11:17:08.000000000 -0500
+++ pegasus/src/Pegasus/Common/StringInline.h 2006-04-05 19:30:43.000000000 -0400
@@ -102,7 +102,7 @@
PEGASUS_STRING_INLINE const Char16* String::getChar16Data() const
{
- return (Char16*)_rep->data;
+ return (Char16*)&(_rep->data[0]);
}
PEGASUS_STRING_INLINE Char16& String::operator[](Uint32 i)
@@ -145,7 +145,7 @@
PEGASUS_STRING_INLINE Uint32 String::find(const String& s) const
{
- return StringFindAux(_rep, (Char16*)s._rep->data, s._rep->size);
+ return StringFindAux(_rep, (Char16*)&(s._rep->data[0]), s._rep->size);
}
PEGASUS_STRING_INLINE String& String::append(const Char16& c)
--- pegasus/src/Pegasus/Common/ResponseHandler.cpp.warnings 2006-01-30 11:17:07.000000000 -0500
+++ pegasus/src/Pegasus/Common/ResponseHandler.cpp 2006-04-05 19:27:27.000000000 -0400
@@ -79,7 +79,7 @@
ResponseHandlerRep* _getRep(
const ResponseHandler* object)
{
- ResponseHandlerRep* rep;
+ ResponseHandlerRep* rep = 0L;
Boolean found;
AutoMutex lock(repTableMutex);
@@ -91,7 +91,7 @@
void _deleteRep(
ResponseHandler* object)
{
- ResponseHandlerRep* rep;
+ ResponseHandlerRep* rep = 0L;
Boolean found;
AutoMutex lock(repTableMutex);
--- pegasus/src/Pegasus/Common/String.cpp.warnings 2006-01-30 11:17:08.000000000 -0500
+++ pegasus/src/Pegasus/Common/String.cpp 2006-04-05 19:27:27.000000000 -0400
@@ -843,7 +843,7 @@
String& String::append(const String& str)
{
- return append((Char16*)str._rep->data, str._rep->size);
+ return append((Char16*)(&(str._rep->data[0])), str._rep->size);
}
String& String::append(const char* str, Uint32 size)
@@ -905,7 +905,7 @@
if (n == PEG_NOT_FOUND || n > _rep->size - index)
n = _rep->size - index;
- return String((Char16*)_rep->data + index, n);
+ return String((Char16*)(_rep->data + index), n);
}
return String();
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/tog-pegasus/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 3 Oct 2005 17:52:26 -0000 1.4
+++ sources 11 Apr 2006 20:40:59 -0000 1.5
@@ -1 +1 @@
-0b068fd576f199f8a0946e2f659acfe4 pegasus-2.5.tar.gz
+b7b392d2ff7ba9a4a3b8d7722d47314b pegasus-2.5.1.tar.gz
Index: tog-pegasus.spec
===================================================================
RCS file: /cvs/dist/rpms/tog-pegasus/FC-5/tog-pegasus.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- tog-pegasus.spec 7 Mar 2006 19:02:19 -0000 1.24
+++ tog-pegasus.spec 11 Apr 2006 20:40:59 -0000 1.25
@@ -1,45 +1,85 @@
-################################################################################
+#
#
# OpenPegasus (Red Hat release) RPM .spec file
#
-%{?!WITH_TEST: %define WITH_TEST 0}
-# do "rpmbuild --define 'WITH_TEST 1'" to build test RPM .
-# NOTE: Must use "rpm -[iU]vh --define 'WITH_TEST 1'" for all RPMs if test rpm
-# is to be installed.
-# DO NOT install test rpm for production use.
-%{?!AUTOSTART: %define AUTOSTART 0}
-# Use "rpm -[iU]vh --define 'AUTOSTART 1'" in order to have cimserver enabled
-# (chkconfig --level=345 tog-pegasus on) after installation.
-#
-#%define debug_package %{nil}
-Summary: OpenPegasus WBEM Services for Linux
-Name: tog-pegasus
-Version: 2.5
-Release: 9
-Epoch: 2
-Group: Systems Management/Base
-License: Open Group Pegasus Open Source
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-URL: http://www.openpegasus.org/
-%define srcname pegasus
-Source0: %{srcname}-%{version}.tar.gz
-Source1: rpm_build_env
-Source2: README.RedHat.Security
-Source3: access.conf
-Source4: genSSLcerts
-Patch0: pegasus-2.5-redhat.patch
-Patch1: pegasus-2.5-local-or-remote-auth.patch
-Patch2: pegasus-2.5-make_install.patch
-Patch3: pegasus-2.5-add_cmpi_provider_lib.patch
-Patch4: pegasus-2.5-enable_cql.patch
-Patch5: pegasus-2.5-bz173401.patch
-Patch6: pegasus-2.5-syslog_h.patch
-Patch7: pegasus-2.5-install_id.patch
-BuildRequires: bash, sed, grep, coreutils, procps, gcc, gcc-c++, libstdc++, make, pam-devel, krb5-devel, krb5-libs, openssl-devel >= 0.9.6, e2fsprogs
-Requires: bash, sed, grep, coreutils, procps, openssl >= 0.9.6, pam, krb5-libs, e2fsprogs, redhat-lsb, chkconfig, SysVinit, bind-utils, bind-libs, net-tools
-Requires(post): bash, sed, grep, coreutils, procps, openssl >= 0.9.6, pam, krb5-libs, e2fsprogs, redhat-lsb, chkconfig, SysVinit, bind-utils, bind-libs, net-tools
-Requires(pre): bash, sed, grep, coreutils, procps, openssl >= 0.9.6, pam, krb5-libs, e2fsprogs, redhat-lsb, chkconfig, SysVinit, bind-utils, bind-libs, net-tools
-Requires(postun): bash, sed, grep, coreutils, procps, openssl >= 0.9.6, pam, krb5-libs, e2fsprogs, redhat-lsb, chkconfig, SysVinit, bind-utils, bind-libs, net-tools
+# tog-pegasus.spec
+#
+# Copyright (c) 2000 - 2006,
+# The Open Group; Hewlett-Packard Development Company, L.P.;
+# IBM Corp.; BMC Software; Tivoli Systems.
+# Licensed under the "Open Group Pegasus Open Source" license
+# shipped with this software.
+#
+# Upstream tog-pegasus.spec file modified for Red Hat build -
+# April 2006, Jason Vas Dias <jvdias at redhat.com>, Red Hat Inc.
+#
+
+%{?!LINUX_VERSION: %define LINUX_VERSION FC5}
+#
+%{?!PEGASUS_BUILD_TEST_RPM: %define PEGASUS_BUILD_TEST_RPM 0}
+# do "rpmbuild --define 'PEGASUS_BUILD_TEST_RPM 1'" to build test RPM.
+#
+%{?!NOCLEAN: %define NOCLEAN 0}
+# ^- 1: don't do %clean
+%{?!NODEBUGINFO: %define NODEBUGINFO 0}
+# ^- 1: don't generate debuginfo or strip binaries
+%if %{NODEBUGINFO}
+%define debug_package %{nil}
+%endif
+%define srcname pegasus
+%define pegasus_gid 65
+%define pegasus_uid 66
+
+Version: 2.5.1
+Release: 1%{?LINUX_VERSION:.%{LINUX_VERSION}}
+Epoch: 2
+#
+Summary: OpenPegasus WBEM Services for Linux
+Name: tog-pegasus
+Group: Systems Management/Base
+URL: http://www.openpegasus.org
+#
+License: Open Group Pegasus Open Source
+#
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+#
+Source: http://www.openpegasus.org/uploads/40/10123/%{srcname}-%{version}.tar.gz
+Source1: RedHat.OpenPegasus.Makefile
+Source2: README.RedHat.Security
+Source3: genOpenPegasusSSLCerts
+#
+Patch0: pegasus-2.5.1-initscript.patch
+Patch1: pegasus-2.5.1-no-rpath.patch
+Patch2: pegasus-2.5.1-linkflags.patch
+Patch3: pegasus-2.5.1-PIE.patch
+Patch4: pegasus-2.5.1-warnings.patch
+Patch5: pegasus-2.5.1-redhat-config.patch
+Patch6: pegasus-2.5.1-cmpi-provider-lib.patch
+Patch7: pegasus-2.5.1-local-or-remote-auth.patch
+Patch8: pegasus-2.5.1-pam-wbem.patch
+Patch9: pegasus-2.5.1-parallel_make.patch
+Patch10: pegasus-2.5.1-fix_zseries_flags.patch
+Patch11: pegasus-2.5.1-fix_tests.patch
+Patch12: pegasus-2.5.1-AutoPtr-Core.patch
+#
+Conflicts: openwbem
+Provides: tog-pegasus-cimserver
+#
+BuildRequires: bash, sed, grep, coreutils, procps, gcc, gcc-c++
+BuildRequires: libstdc++, make, pam-devel
+BuildRequires: openssl-devel >= 0.9.6, e2fsprogs
+Requires: bash, sed, grep, coreutils, procps, openssl >= 0.9.6, pam
+Requires: redhat-lsb, chkconfig, SysVinit
+Requires: e2fsprogs, bind-utils, net-tools
+Requires(post): bash, sed, grep, coreutils, procps, openssl >= 0.9.6, pam
+Requires(post): redhat-lsb, chkconfig, SysVinit
+Requires(post): e2fsprogs, bind-utils, net-tools
+Requires(pre): bash, sed, grep, coreutils, procps, openssl >= 0.9.6, pam
+Requires(pre): redhat-lsb, chkconfig, SysVinit
+Requires(pre): e2fsprogs, bind-utils, net-tools
+Requires(postun): bash, sed, grep, coreutils, procps, openssl >= 0.9.6, pam
+Requires(postun): redhat-lsb, chkconfig, SysVinit
+Requires(postun): e2fsprogs, bind-utils, net-tools
%description
OpenPegasus WBEM Services for Linux enables management solutions that deliver
@@ -49,93 +89,77 @@
sources.
%package devel
-Summary: The OpenPegasus Software Development Kit
-Group: Systems Management/Base
-Requires: tog-pegasus >= 2.5
+Summary: The OpenPegasus Software Development Kit
+Group: Systems Management/Base
+Requires: tog-pegasus >= %{version}
+Obsoletes: tog-pegasus-sdk
+Requires: make, gcc, gcc-c++
+Requires(preun): make
%description devel
-The OpenPegasus WBEM Services for Linux SDK is the developer's kit for the OpenPegasus WBEM
-Services for Linux release. It provides Linux C++ developers with the WBEM files required to
-build WBEM Clients and Providers. It also supports C provider developers via the CMPI interface.
+The OpenPegasus WBEM Services for Linux SDK is the developer's kit for the
+OpenPegasus WBEM Services for Linux release. It provides Linux C++ developers
+with the WBEM files required to build WBEM Clients and Providers. It also
+supports C provider developers via the CMPI interface.
+
+%if %{PEGASUS_BUILD_TEST_RPM}
-%if %{WITH_TEST}
%package test
-Summary: The OpenPegasus Tests
-Group: Systems Management/Base
-Autoreq: 0
-Requires: tog-pegasus >= 2.5
+Summary: The OpenPegasus Tests
+Group: Systems Management/Base
+Requires: tog-pegasus >= %{version}, make
%description test
-The OpenPegasus WBEM tests for the OpenPegasus 2.5 Linux rpm.
-**********************************************************************************
-*** DO NOT INSTALL THIS RPM ON A PRODUCTION SYSTEM - THIS IS FOR TESTING ONLY. ***
-**********************************************************************************
+The OpenPegasus WBEM tests for the OpenPegasus %{version} Linux rpm.
%endif
%prep
-%setup -q -n %{srcname}-%{version}
-%patch0 -p1 -b .redhat
-%patch1 -p1 -b .local_or_remote_auth
-%patch2 -p1 -b .make_install
-%patch3 -p1 -b .add_cmpi_provider_lib
-%patch4 -p1 -b .enable_cql
-# %patch5 -p1 -b .bz173401
-# now fixed with openssl-0.9.8a-3+
-%patch6 -p1 -b .syslog_h
-%patch7 -p1 -b .install_id
+%setup -q -n %{srcname}
+%patch0 -p1 -b .initscript
+%patch1 -p1 -b .no-rpath
+%patch2 -p1 -b .linkflags
+%patch3 -p1 -b .PIE
+%patch4 -p1 -b .warnings
+%patch5 -p1 -b .redhat-config
+%patch6 -p1 -b .cmpi-provider-lib
+%patch7 -p1 -b .local-or-remote-auth
+%patch8 -p1 -b .pam-wbem
+%patch9 -p1 -b .parallel-make
+%patch10 -p1 -b .fix-zseries-flags
+%patch11 -p1 -b .fix-tests
+%patch12 -p1 -b .AutoPtr-Core
%build
-rm -rf $RPM_BUILD_ROOT
+rm -rf ${RPM_BUILD_ROOT} || :;
+cp -fp %SOURCE1 .;
+cp -fp %SOURCE2 doc
+cp -fp %SOURCE3 rpm
export RPM_ARCH_LIB=%{_lib}
-. %SOURCE1
-make
-export LD_LIBRARY_PATH=$PEGASUS_HOME/%{_lib}
-export PATH=$PEGASUS_HOME/bin:$PATH
-make repository
-make --directory=mak -f SDKMakefile stageSDK
-%if %{WITH_TEST}
-export PEGASUS_ENVVAR_FILE=${PEGASUS_ROOT}/env_var_Linux.status
-export PEGASUS_STAGING_DIR=$RPM_BUILD_ROOT
-make --directory=$PEGASUS_ROOT -f Makefile.ReleaseTest stageTEST
-unset PEGASUS_STAGING_DIR
+make %{?_smp_mflags} -f RedHat.OpenPegasus.Makefile;
+%if %{PEGASUS_BUILD_TEST_RPM}
+ make %{?_smp_mflags} -f RedHat.OpenPegasus.Makefile tests;
%endif
%install
-export RPM_ARCH_LIB=%{_lib}
-. %SOURCE1
-export PEGASUS_DESTDIR=$RPM_BUILD_ROOT
-export PEGASUS_ENVVAR_FILE=${PEGASUS_ROOT}/env_var_Linux.status
-export PATH=${PEGASUS_HOME}/bin:$PATH
-export LD_LIBRARY_PATH=${PEGASUS_HOME}/%{_lib}:/%{_lib}:/usr/%{_lib}
-unset PEGASUS_STAGING_DIR
-export PEGASUS_SDK_STAGING_DIR=${PEGASUS_HOME}/stageSDK
-# why oh why did they make /usr/bin/install fail on the chown!!! :
-export INSTALL_USER=`id -un`
-export INSTALL_GROUP=`id -gn`
-#
-make install
-rm -rf $PEGASUS_HOME
-mkdir -p $RPM_BUILD_ROOT{${PEGASUS_CONFIG_DIR},${PEGASUS_VARRUN_DIR},${PEGASUS_LOG_DIR},$PEGASUS_VARDATA_DIR}
-touch $RPM_BUILD_ROOT{${PEGASUS_CONFIG_DIR}/{cimserver_{current,planned}.conf,ssl.cnf,client.pem,server.pem,file.pem,client_2048.pem,server_2048.pem,file_2048.pem},${PEGASUS_LOG_DIR}/install.log,${PEGASUS_VARRUN_DIR}/cimxml.socket}
-mkdir -p $RPM_BUILD_ROOT/var/lib/Pegasus/prev_repository
-cp -fp %SOURCE2 ${PEGASUS_ROOT}/doc
-cp -fp %SOURCE3 $RPM_BUILD_ROOT/${PEGASUS_CONFIG_DIR}/access.conf
-chmod 640 $RPM_BUILD_ROOT/${PEGASUS_CONFIG_DIR}/access.conf
-mkdir -p $RPM_BUILD_ROOT/${PEGASUS_PRODSHARE_DIR}/scripts
-cp -fp %SOURCE4 $RPM_BUILD_ROOT/${PEGASUS_PRODSHARE_DIR}/scripts
-chmod 750 $RPM_BUILD_ROOT/${PEGASUS_PRODSHARE_DIR}/scripts/genSSLcerts
-mkdir -p $R$RPM_BUILD_ROOT/usr/%{_lib}/cmpi
-#/usr/lib/rpm/brp-compress
-#exit 0
+make -f RedHat.OpenPegasus.Makefile install prefix=$RPM_BUILD_ROOT libdir=%{_libdir} root_user=%(%{__id_u} -n) pegasus_user=%(%{__id_u} -n)
+%if %{PEGASUS_BUILD_TEST_RPM}
+ make -f RedHat.OpenPegasus.Makefile install_tests prefix=$RPM_BUILD_ROOT root_user=%(%{__id_u} -n) pegasus_user=%(%{__id_u} -n)
+%endif
+%if %{NODEBUGINFO}
+ /usr/lib/rpm/brp-compress;
+ exit 0;
+%endif
:;
%files
-%defattr(0640,root,pegasus,0750)
-%dir /etc/Pegasus
-%dir /var/lib/Pegasus
-%attr(1750,root,pegasus) /var/run/tog-pegasus
-%dir /var/log/Pegasus
-%config %attr(750,root,root) /etc/rc.d/init.d/tog-pegasus
+%defattr(0750, root, pegasus, 0750)
+/usr/%{_lib}/*
+/usr/sbin/*
+/usr/bin/*
+/usr/share/Pegasus/scripts
+%config /etc/rc.d/init.d/tog-pegasus
+%defattr(0640, root, pegasus, 0750)
+%dir /etc/Pegasus
%ghost %config(noreplace) /etc/Pegasus/cimserver_current.conf
%ghost %config(noreplace) /etc/Pegasus/cimserver_planned.conf
%config(noreplace) /etc/Pegasus/access.conf
@@ -144,101 +168,104 @@
%ghost /etc/Pegasus/client.pem
%ghost /etc/Pegasus/server.pem
%ghost /etc/Pegasus/file.pem
-%ghost /etc/Pegasus/client_2048.pem
-%ghost /etc/Pegasus/server_2048.pem
-%ghost /etc/Pegasus/file_2048.pem
-%ghost /var/log/Pegasus/install.log
-%ghost /var/lib/Pegasus/prev_repository
+%ghost /etc/Pegasus/cimserver_trust
+%ghost /etc/Pegasus/indication_trust
+%ghost /etc/Pegasus/crl
+%dir /var/lib/Pegasus
/var/lib/Pegasus/repository
/var/lib/Pegasus/cache
-%attr(0750,root,pegasus) /usr/sbin/*
-%attr(0755,root,pegasus) /usr/bin/*
-%attr(0755,root,pegasus) /usr/%{_lib}/*.so.*
-%dir /usr/%{_lib}/Pegasus/providers
-%dir /usr/%{_lib}/cmpi
-%attr(0755,root,pegasus) /usr/%{_lib}/Pegasus/providers/*.so.*
+%dir /var/lib/Pegasus/log
+%ghost /var/lib/Pegasus/log/install.log
+%ghost /var/lib/Pegasus/cache/trace/cimserver.trc
+%dir %attr(1750,root,pegasus) /var/run/tog-pegasus
+%ghost /var/run/tog-pegasus/cimserver.pid
+%ghost /var/run/tog-pegasus/cimserver_start.lock
+%ghost %attr(1640,root,pegasus) /var/run/tog-pegasus/cimxml.socket
+/usr/share/man/man8/*
+%defattr(0644, root, pegasus, 0755)
+%dir /usr/share/Pegasus
/usr/share/Pegasus/mof
-%dir /usr/share/Pegasus/scripts
-%attr(0755,root,pegasus) /usr/share/Pegasus/scripts/genSSLcerts
-/usr/share/man/man*/*
-%doc doc/license.txt doc/Admin_Guide_Release.pdf doc/README.RedHat.Security doc/SecurityGuidelinesForDevelopers.html doc/PegasusSSLGuidelines.htm doc/MessageQueueService.html doc/ProviderLoading.txt
+/usr/share/man/man1/*
+%doc doc/license.txt doc/Admin_Guide_Release.pdf doc/PegasusSSLGuidelines.htm doc/SecurityGuidelinesForDevelopers.html doc/README.RedHat.Security src/Clients/repupgrade/doc/repupgrade.html
%files devel
%defattr(0644,root,pegasus,0755)
/usr/include/Pegasus
/usr/share/Pegasus/samples
/usr/share/Pegasus/html
-%attr(0755,root,pegasus) /usr/%{_lib}/*.so
-%attr(0755,root,pegasus) /usr/%{_lib}/Pegasus/providers/*.so
-
-%if %{WITH_TEST}
-
-%post test
-/etc/init.d/tog-pegasus stop
-cd /var/lib/Pegasus
-mv repository repository.bak
-mv testrepository repository
-/usr/share/Pegasus/scripts/genSSLcerts
-cd /usr/share/Pegasus/test
-make create_providerlinks
-make tests
+%if %{PEGASUS_BUILD_TEST_RPM}
%files test
-%defattr(-,root,root,-)
+%defattr(0644,root,pegasus,0755)
+%dir /usr/share/Pegasus/test
+/usr/share/Pegasus/test/Makefile
+/usr/share/Pegasus/test/mak
/var/lib/Pegasus/testrepository
-/usr/share/Pegasus/test
+%defattr(0750,root,pegasus,0755)
+/usr/share/Pegasus/test/bin
+/usr/share/Pegasus/test/lib
+%endif
+%clean
+%if !%{NOCLEAN}
+[ "${RPM_BUILD_ROOT}" != "/" ] && rm -rf $RPM_BUILD_ROOT;
+[ "${RPM_BUILD_DIR}" != "/" ] && rm -rf ${RPM_BUILD_DIR}/%{srcname};
%endif
%pre
-if [ $1 -gt 1 ]; then
- if [ -d /var/lib/Pegasus/repository/root\#PG_Internal ]; then
- #
- # Save the current repository to prev_repository.
- #
- if [ -d /var/lib/Pegasus/prev_repository ]; then
- /bin/mv /var/lib/Pegasus/prev_repository /var/lib/Pegasus/prev_repository_`date '+%Y-%m-%d-%s.%N'`.rpmsave;
- fi
- /bin/mv /var/lib/Pegasus/repository /var/lib/Pegasus/prev_repository
- fi;
-elif [ $1 -eq 1 ]; then
+if [ $1 -eq 1 ]; then
# first install: create the 'pegasus' user and group:
-# By default, ONLY the "pegasus" user will be allowed to connect to cimserver over network
- /usr/sbin/groupadd -g 65 -f -r pegasus >/dev/null 2>&1 || :;
- /usr/sbin/useradd -u 66 -r -n -M -g pegasus -s /sbin/nologin -d /var/lib/Pegasus \
+ /usr/sbin/groupadd -g %{pegasus_gid} -f -r pegasus >/dev/null 2>&1 || :;
+ /usr/sbin/useradd -u %{pegasus_uid} -r -n -M -g pegasus -s /sbin/nologin -d /var/lib/Pegasus \
-c "tog-pegasus OpenPegasus WBEM/CIM services" pegasus >/dev/null 2>&1 || :;
+elif [ $1 -gt 1 ]; then
+ if [ -d /var/lib/Pegasus/repository ]; then
+ if [ -d /var/lib/Pegasus/prev_repository ]; then
+ mv /var/lib/Pegasus/prev_repository /var/lib/Pegasus/prev_repository_`date '+%Y-%m-%d-%s.%N'`.rpmsave;
+ fi;
+ mv /var/lib/Pegasus/repository /var/lib/Pegasus/prev_repository;
+ fi
fi
+:;
%post
+ldconfig;
+chkconfig --add tog-pegasus;
if [ $1 -eq 1 ]; then
- /sbin/ldconfig
-%if %{AUTOSTART}
- /sbin/chkconfig --add tog-pegasus
-%endif
- echo `date` >/var/log/Pegasus/install.log 2>&1
-elif [ $1 -gt 0 ]; then
- /sbin/service tog-pegasus condrestart
-:;
+ echo `date` > /var/lib/Pegasus/log/install.log 2>&1
+elif [ $1 -gt 1 ]; then
+ echo `date` >> /var/lib/Pegasus/log/install.log 2>&1 || :;
+ if [ -d /var/lib/Pegasus/prev_repository ]; then
+ # The user's old repository was moved to /var/lib/Pegasus/prev_repository, which
+ # now must be upgraded to the new repository in /var/lib/Pegasus/repository:
+ /usr/sbin/repupgrade /var/lib/Pegasus/prev_repository /var/lib/Pegasus/repository \
+ 2>> /var/lib/Pegasus/log/install.log || :;
+ mv /var/lib/Pegasus/prev_repository /var/lib/Pegasus/prev_repository_`date '+%Y-%m-%d-%s.%N'`.rpmsave;
+ fi;
+ /sbin/service tog-pegasus condrestart >/dev/null 2>&1 || :;
fi
+:;
%preun
if [ $1 -eq 0 ]; then
- service tog-pegasus stop >/dev/null 2>&1
- /sbin/chkconfig --del tog-pegasus;
+ /sbin/service tog-pegasus stop >/dev/null 2>&1 || :;
+ /sbin/chkconfig --del tog-pegasus >/dev/null 2>&1 || :;
fi
+:;
%postun
-if [ $1 -eq 0 ]; then
-# /usr/sbin/userdel pegasus >/dev/null 2>&1 || :;
-# /usr/sbin/groudel pegasus >/dev/null 2>&1 || :;
-:;
-fi;
+ldconfig
-%clean
-rm -rf $RPM_BUILD_ROOT;
-#rm -rf ${RPM_BUILD_DIR}/%{srcname}-%{version};
+%preun devel
+if [ $1 -eq 0 ] ; then
+ make --directory /usr/share/Pegasus/samples -s clean >/dev/null 2>&1 || :;
+fi
+:;
%changelog
+* Thu Apr 06 2006 Jason Vas Dias <jvdias at redhat.com> - 2:2.5.1-1
+- Upgrade to version 2.5.1 (including new upstream .spec file).
+
* Tue Mar 7 2006 Bill Nottingham <notting at redhat.com> - 2:2.5-9
- use an assigned uid/gid, do not loop over user ids looking for a free one
More information about the fedora-cvs-commits
mailing list