From 40faa82d02b516869b576f4a82702097a6c320c0 Mon Sep 17 00:00:00 2001 From: jvdias Date: Tue, 11 Apr 2006 02:31:28 +0000 Subject: [PATCH] Upgrade to 2.5.1 --- pegasus-2.5.1-fix_tests.patch | 24 +++++++++++ pegasus-2.5.1-no-rpath.patch | 28 +++++++++++- pegasus-2.5.1-redhat-config.patch | 11 +++-- tog-pegasus.spec | 72 +++++++++++-------------------- 4 files changed, 82 insertions(+), 53 deletions(-) create mode 100644 pegasus-2.5.1-fix_tests.patch diff --git a/pegasus-2.5.1-fix_tests.patch b/pegasus-2.5.1-fix_tests.patch new file mode 100644 index 0000000..f2e1c53 --- /dev/null +++ b/pegasus-2.5.1-fix_tests.patch @@ -0,0 +1,24 @@ +--- 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: diff --git a/pegasus-2.5.1-no-rpath.patch b/pegasus-2.5.1-no-rpath.patch index 72d0e5e..7e73006 100644 --- a/pegasus-2.5.1-no-rpath.patch +++ b/pegasus-2.5.1-no-rpath.patch @@ -1,5 +1,5 @@ --- pegasus/mak/library-unix.mak.no-rpath 2006-01-30 11:16:23.000000000 -0500 -+++ pegasus/mak/library-unix.mak 2006-04-05 19:31:23.000000000 -0400 ++++ 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 @@ -19,7 +19,7 @@ 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-05 19:41:59.000000000 -0400 ++++ pegasus/mak/program-unix.mak 2006-04-08 18:28:43.000000000 -0400 @@ -30,22 +30,12 @@ #//============================================================================== INCLUDES = -I$(ROOT)/src $(EXTRA_INCLUDES) @@ -55,3 +55,27 @@ 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 + diff --git a/pegasus-2.5.1-redhat-config.patch b/pegasus-2.5.1-redhat-config.patch index 49f5e81..7e39f66 100644 --- a/pegasus-2.5.1-redhat-config.patch +++ b/pegasus-2.5.1-redhat-config.patch @@ -1,5 +1,5 @@ --- pegasus/env_var_Linux.status.redhat-config 2006-03-15 20:33:51.000000000 -0500 -+++ pegasus/env_var_Linux.status 2006-04-06 19:15:13.000000000 -0400 ++++ pegasus/env_var_Linux.status 2006-04-10 14:29:52.000000000 -0400 @@ -18,7 +18,7 @@ PEGASUS_STAGING_DIR = $(PEGASUS_HOME)/stagingDir endif @@ -17,7 +17,7 @@ PEGASUS_USE_RELEASE_CONFIG_OPTIONS=true PEGASUS_USE_RELEASE_DIRS=true PEGASUS_USE_SYSLOGS=true -@@ -64,18 +63,17 @@ +@@ -64,22 +63,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 @@ -39,8 +39,13 @@ 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-06 20:14:11.000000000 -0400 ++++ pegasus/Makefile.Release 2006-04-08 18:28:43.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);) diff --git a/tog-pegasus.spec b/tog-pegasus.spec index 4b55118..6613bb8 100644 --- a/tog-pegasus.spec +++ b/tog-pegasus.spec @@ -1,19 +1,18 @@ -#============================================================================== +# # # OpenPegasus (Red Hat release) RPM .spec file # # tog-pegasus.spec # # Copyright (c) 2000 - 2006, -# The Open Group; Hewlett-Packard Development Company, L.P.; IBM Corp.; -# BMC Software; Tivoli Systems. +# 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 , Red Hat Inc. # -#============================================================================== %{?!LINUX_VERSION: %define LINUX_VERSION FC6} # @@ -45,8 +44,9 @@ 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: pegasus_rpm_build_env.sh +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 @@ -57,6 +57,9 @@ 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 # Conflicts: openwbem Provides: tog-pegasus-cimserver @@ -103,16 +106,10 @@ supports C provider developers via the CMPI interface. %package test Summary: The OpenPegasus Tests Group: Systems Management/Base -Requires: tog-pegasus >= %{version} -Requires(post): make -Requires(postun): make +Requires: tog-pegasus >= %{version}, make %description test The OpenPegasus WBEM tests for the OpenPegasus %{version} Linux rpm. -********************************************************************************** -*** DO NOT INSTALL THIS RPM ON A PRODUCTION SYSTEM - THIS IS FOR TESTING ONLY. *** -********************************************************************************** - %endif %prep @@ -126,39 +123,31 @@ The OpenPegasus WBEM tests for the OpenPegasus %{version} Linux rpm. %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 %build rm -rf ${RPM_BUILD_ROOT} || :; +cp -fp %SOURCE1 .; +cp -fp %SOURCE2 doc +cp -fp %SOURCE3 rpm export RPM_ARCH_LIB=%{_lib} -. %SOURCE1 +make %{?_smp_mflags} -f RedHat.OpenPegasus.Makefile; %if %{PEGASUS_BUILD_TEST_RPM} -export PEGASUS_DISPLAYCONSUMER_DIR=/var/lib/Pegasus/log + make %{?_smp_mflags} -f RedHat.OpenPegasus.Makefile tests; %endif -make -f $PEGASUS_ROOT/Makefile.Release create_ProductVersionFile -make -f $PEGASUS_ROOT/Makefile.Release create_CommonProductDirectoriesInclude -make -f $PEGASUS_ROOT/Makefile.Release create_ConfigProductDirectoriesInclude -make -f $PEGASUS_ROOT/Makefile.Release all -make -f $PEGASUS_ROOT/Makefile.Release repository %install -export RPM_ARCH_LIB=%{_lib} -. %SOURCE1 -export PEGASUS_STAGING_DIR=$RPM_BUILD_ROOT; +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} -export PEGASUS_BUILD_TEST_RPM=%{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 -make -f $PEGASUS_ROOT/Makefile.Release stage; -cp -fp %SOURCE2 doc -mkdir -p ${RPM_BUILD_ROOT}/etc/rc.d; -mkdir -p ${RPM_BUILD_ROOT}/var/run/tog-pegasus/socket; -mv ${RPM_BUILD_ROOT}/etc/init.d ${RPM_BUILD_ROOT}/etc/rc.d ||:; -cp -fp rpm/tog-pegasus.rc ${RPM_BUILD_ROOT}/etc/rc.d/init.d/tog-pegasus; -touch ${RPM_BUILD_ROOT}{/etc/Pegasus/{cimserver_current.conf,cimserver_planned.conf,cimserver_trust,indication_trust,crl},/var/run/tog-pegasus/{socket/cimxml.socket,cimserver.pid,cimserver_start.lock}} -rm -rf ${RPM_BUILD_ROOT}/usr/share/doc/%{name}-2.5 %if %{NODEBUGINFO} /usr/lib/rpm/brp-compress; exit 0; %endif +:; %files %defattr(0750, root, pegasus, 0750) @@ -188,8 +177,7 @@ rm -rf ${RPM_BUILD_ROOT}/usr/share/doc/%{name}-2.5 %dir %attr(1750,root,pegasus) /var/run/tog-pegasus %ghost /var/run/tog-pegasus/cimserver.pid %ghost /var/run/tog-pegasus/cimserver_start.lock -%dir %attr(1750,root,pegasus) /var/run/tog-pegasus/socket -%ghost %attr(1640,root,pegasus) /var/run/tog-pegasus/socket/cimxml.socket +%ghost %attr(1640,root,pegasus) /var/run/tog-pegasus/cimxml.socket /usr/share/man/man8/* %defattr(0644, root, pegasus, 0755) %dir /usr/share/Pegasus @@ -205,11 +193,12 @@ rm -rf ${RPM_BUILD_ROOT}/usr/share/doc/%{name}-2.5 %if %{PEGASUS_BUILD_TEST_RPM} %files test -%defattr(0640,root,pegasus,0750) +%defattr(0644,root,pegasus,0755) %dir /usr/share/Pegasus/test /usr/share/Pegasus/test/Makefile +/usr/share/Pegasus/test/mak /var/lib/Pegasus/testrepository -%defattr(0750,root,pegasus,0750) +%defattr(0750,root,pegasus,0755) /usr/share/Pegasus/test/bin /usr/share/Pegasus/test/lib %endif @@ -270,19 +259,6 @@ if [ $1 -eq 0 ] ; then fi :; -%if %{PEGASUS_BUILD_TEST_RPM} - -%preun test -if [ $1 -eq 0 ]; then - make --directory /usr/share/Pegasus/test -s unsetupTEST >/dev/null 2>&1 || :; - if [ -d /var/lib/Pegasus/testrepository ]; then - mv /var/lib/Pegasus/testrepository_`date '+%Y-%m-%d-%s.%N'`.rpmsave; - fi; -fi; -:; - -%endif - %changelog * Thu Apr 06 2006 Jason Vas Dias - 2:2.5.1-1 - Upgrade to version 2.5.1 (including new upstream .spec file).