diff --git a/tog-pegasus.spec b/tog-pegasus.spec index e61b63e..e1b2117 100644 --- a/tog-pegasus.spec +++ b/tog-pegasus.spec @@ -49,11 +49,17 @@ # Use "rpm -[iU]vh --define 'AUTOSTART 1'" in order to have cimserver enabled # (chkconfig --level=345 tog-pegasus on) and running after installation. # +%{?!OPT_TOG_PEGASUS: %define OPT_TOG_PEGASUS 0} +# Use "rpm -[iU]vh --define 'OPT_TOG_PEGASUS 1' to create the /opt/* +# directory structure provided by the upstream tog-pegasus releases as links +# to the Red Hat tog-pegasus binaries, libraries, and directories, by running +# the /usr/share/Pegasus/scripts/opt-tog-pegasus script, installed by default. +# %define srcRelease 1 Summary: OpenPegasus WBEM Services for Linux Name: tog-pegasus Version: 2.4.1 -Release: 2.FC5 +Release: 4.FC5 Epoch: 1 Group: Systems Management/Base License: Open Group Pegasus Open Source @@ -65,10 +71,38 @@ Patch2: tog-pegasus-2.4.1-noecho.patch Patch3: tog-pegasus-2.4.1-execshield.patch Patch4: tog-pegasus-2.4.1-de-opt.patch Patch5: tog-pegasus-2.4.1-remove_socket.patch -Patch6: tog-pegasus-2.4.1-Beta3-gcc4.patch -Requires: openssl >= 0.9.6 lsb >= 1.3 +Patch6: tog-pegasus-2.4.1-de-lib.patch +Patch7: tog-pegasus-2.4.1-rbz167162_obz4025.patch +Patch8: tog-pegasus-2.4.1-bz167164.patch +Patch9: tog-pegasus-2.4.1-bz167165.patch +# These patches are direct from upstream BZs marked '2.4.2_approved', +# meaning they have passed upstream testing and are in 2.4.2: +Patch10: tog-pegasus-2.4.1-obz2207.patch +Patch11: tog-pegasus-2.4.1-obz2217.patch +Patch12: tog-pegasus-2.4.1-obz2499.patch +Patch13: tog-pegasus-2.4.1-obz2503.patch +# BZ 3416 fixed by our compile flags +# BZs 3728, 3731 fixed by this .spec file +Patch14: tog-pegasus-2.4.1-obz3858.patch +Patch15: tog-pegasus-2.4.1-obz3958.patch +Patch16: tog-pegasus-2.4.1-obz4004.patch +Patch17: tog-pegasus-2.4.1-obz4009.patch +Patch18: tog-pegasus-2.4.1-obz4014.patch +Patch19: tog-pegasus-2.4.1-obz4023.patch +Patch20: tog-pegasus-2.4.1-obz4027.patch +Patch21: tog-pegasus-2.4.1-obz4028.patch +Patch22: tog-pegasus-2.4.1-obz4029-new.patch +Patch23: tog-pegasus-2.4.1-obz4029.patch +Patch24: tog-pegasus-2.4.1-obz4050.patch +Patch25: tog-pegasus-2.4.1-obz4072.patch +# BZs 4103, 4126 already fixed in previous patches +Patch26: tog-pegasus-2.4.1-obz4120.patch +Patch27: tog-pegasus-2.4.1-2-4-2-sanity.patch +Patch28: tog-pegasus-2.4.1-obz3958_default.patch +Source1: opt-tog-pegasus +Requires: openssl >= 0.9.6 lsb >= 1.3 pam Provides: cimserver tog-pegasus-2.4 -BuildRequires: openssl-devel >= 0.9.6 +BuildRequires: openssl-devel >= 0.9.6 pam-devel BuildConflicts: tog-pegasus Requires(post): openssl lsb coreutils bash @@ -112,7 +146,29 @@ export PEGASUS_ROOT=$RPM_BUILD_DIR/$RPM_PACKAGE_NAME-$RPM_PACKAGE_VERSION %patch3 -p1 -b .execshield %patch4 -p1 -b .de-opt %patch5 -p1 -b .remove_socket -%patch6 -p1 -b .gcc4 +%patch6 -p1 -b .de-lib +%patch7 -p1 -b .rbz167162_obz4025 +%patch8 -p1 -b .bz167164 +%patch9 -p1 -b .bz167165 +%patch10 -p1 -b .obz2207 +%patch11 -p1 -b .obz2217 +%patch12 -p1 -b .obz2499 +%patch13 -p1 -b .obz2503 +%patch14 -p1 -b .obz3858 +%patch15 -p1 -b .obz3958 +%patch16 -p1 -b .obz4004 +%patch17 -p1 -b .obz4009 +%patch18 -p1 -b .obz4014 +%patch19 -p1 -b .obz4023 +%patch20 -p1 -b .obz4027 +%patch21 -p1 -b .obz4028 +%patch22 -p1 -b .obz4029-new +%patch23 -p1 -b .obz4029 +%patch24 -p1 -b .obz4050 +%patch25 -p1 -b .obz4072 +%patch26 -p1 -b .obz4120 +%patch27 -p1 -b .2.4.1-2-4-2-sanity +%patch28 -p1 -b .obz3958_default # Needed for CMPI patch ln -sf $RPM_BUILD_DIR/$RPM_PACKAGE_NAME-$RPM_PACKAGE_VERSION $RPM_BUILD_DIR/$RPM_PACKAGE_NAME @@ -122,6 +178,7 @@ export PEGASUS_EXTRA_CXX_FLAGS="$PEGASUS_EXTRA_C_FLAGS" export PEGASUS_EXE_LINK_FLAGS='-pie -Wl,-z,relro,-z,now,-z,nodlopen,-z,noexecstack' export PEGASUS_ROOT=$RPM_BUILD_DIR/$RPM_PACKAGE_NAME-$RPM_PACKAGE_VERSION export PEGASUS_HOME=$RPM_BUILD_ROOT/build +export PEGASUS_ARCH_LIB_DIR=%{_lib} %ifarch ia64 x86_64 %define PEGASUS_HARDWARE_PLATFORM LINUX_IA64_GNU %else @@ -171,7 +228,7 @@ export PEGASUS_NOASSERTS=true make -export LD_LIBRARY_PATH=$PEGASUS_HOME/lib +export LD_LIBRARY_PATH=$PEGASUS_HOME/%{_lib} export PATH=$PEGASUS_HOME/bin:$PATH make repository @@ -195,8 +252,8 @@ make --directory=$PEGASUS_ROOT -f Makefile.ReleaseTest stageTEST \ export PEGASUS_ROOT=$RPM_BUILD_DIR/$RPM_PACKAGE_NAME-$RPM_PACKAGE_VERSION export PEGASUS_HOME=$RPM_BUILD_ROOT/build %define PEGASUS_PROD_DIR /usr -%define PEGASUS_DEST_LIB_DIR %PEGASUS_PROD_DIR/lib -%define PEGASUS_PROVIDER_DIR %PEGASUS_PROD_DIR/lib/Pegasus/providers +%define PEGASUS_DEST_LIB_DIR %PEGASUS_PROD_DIR/%{_lib} +%define PEGASUS_PROVIDER_DIR %PEGASUS_PROD_DIR/%{_lib}/Pegasus/providers %define PEGASUS_PROVIDER_LIB_DIR %PEGASUS_PROVIDER_DIR %define PEGASUS_SBIN_DIR %PEGASUS_PROD_DIR/sbin %define PEGASUS_BIN_DIR %PEGASUS_PROD_DIR/bin @@ -225,7 +282,7 @@ export PEGASUS_HOME=$RPM_BUILD_ROOT/build %define PEGASUS_TEST_DIR %PEGASUS_DATA_DIR/test %define PEGASUS_TEST_STAGING_DIR $PEGASUS_HOME/stagingDir %define PEGASUS_TEST_BIN_DIR %PEGASUS_TEST_DIR/bin -%define PEGASUS_TEST_LIB_DIR %PEGASUS_TEST_DIR/lib +%define PEGASUS_TEST_LIB_DIR %PEGASUS_TEST_DIR/%{_lib} %define PEGASUS_TEST_MAK_DIR %PEGASUS_TEST_DIR/mak # @@ -259,37 +316,37 @@ install -D -m 0755 $PEGASUS_HOME/bin/wbemexec $RPM_BUILD_ROOT%PEGASUS_BIN_DIR/ # # Libraries -install -D -m 0755 $PEGASUS_HOME/lib/libCIMxmlIndicationHandler.so.1 $RPM_BUILD_ROOT%PEGASUS_DEST_LIB_DIR/libCIMxmlIndicationHandler.so.1 -install -D -m 0755 $PEGASUS_HOME/lib/libConfigSettingProvider.so.1 $RPM_BUILD_ROOT%PEGASUS_DEST_LIB_DIR/libConfigSettingProvider.so.1 -install -D -m 0755 $PEGASUS_HOME/lib/libNamespaceProvider.so.1 $RPM_BUILD_ROOT%PEGASUS_DEST_LIB_DIR/libNamespaceProvider.so.1 -install -D -m 0755 $PEGASUS_HOME/lib/libProviderRegistrationProvider.so.1 $RPM_BUILD_ROOT%PEGASUS_DEST_LIB_DIR/libProviderRegistrationProvider.so.1 -install -D -m 0755 $PEGASUS_HOME/lib/libUserAuthProvider.so.1 $RPM_BUILD_ROOT%PEGASUS_DEST_LIB_DIR/libUserAuthProvider.so.1 -install -D -m 0755 $PEGASUS_HOME/lib/libpegauthentication.so.1 $RPM_BUILD_ROOT%PEGASUS_DEST_LIB_DIR/libpegauthentication.so.1 -install -D -m 0755 $PEGASUS_HOME/lib/libpegclient.so.1 $RPM_BUILD_ROOT%PEGASUS_DEST_LIB_DIR/libpegclient.so.1 -install -D -m 0755 $PEGASUS_HOME/lib/libpegcliutils.so.1 $RPM_BUILD_ROOT%PEGASUS_DEST_LIB_DIR/libpegcliutils.so.1 -install -D -m 0755 $PEGASUS_HOME/lib/libpegcommon.so.1 $RPM_BUILD_ROOT%PEGASUS_DEST_LIB_DIR/libpegcommon.so.1 -install -D -m 0755 $PEGASUS_HOME/lib/libpegcompiler.so.1 $RPM_BUILD_ROOT%PEGASUS_DEST_LIB_DIR/libpegcompiler.so.1 -install -D -m 0755 $PEGASUS_HOME/lib/libpegconfig.so.1 $RPM_BUILD_ROOT%PEGASUS_DEST_LIB_DIR/libpegconfig.so.1 -install -D -m 0755 $PEGASUS_HOME/lib/libpegexportclient.so.1 $RPM_BUILD_ROOT%PEGASUS_DEST_LIB_DIR/libpegexportclient.so.1 -install -D -m 0755 $PEGASUS_HOME/lib/libpegexportserver.so.1 $RPM_BUILD_ROOT%PEGASUS_DEST_LIB_DIR/libpegexportserver.so.1 -install -D -m 0755 $PEGASUS_HOME/lib/libpeggetoopt.so.1 $RPM_BUILD_ROOT%PEGASUS_DEST_LIB_DIR/libpeggetoopt.so.1 -install -D -m 0755 $PEGASUS_HOME/lib/libpeghandlerservice.so.1 $RPM_BUILD_ROOT%PEGASUS_DEST_LIB_DIR/libpeghandlerservice.so.1 -install -D -m 0755 $PEGASUS_HOME/lib/libpegindicationservice.so.1 $RPM_BUILD_ROOT%PEGASUS_DEST_LIB_DIR/libpegindicationservice.so.1 -install -D -m 0755 $PEGASUS_HOME/lib/libpeglistener.so.1 $RPM_BUILD_ROOT%PEGASUS_DEST_LIB_DIR/libpeglistener.so.1 -install -D -m 0755 $PEGASUS_HOME/lib/libpegprm.so.1 $RPM_BUILD_ROOT%PEGASUS_DEST_LIB_DIR/libpegprm.so.1 -install -D -m 0755 $PEGASUS_HOME/lib/libpegprovidermanager.so.1 $RPM_BUILD_ROOT%PEGASUS_DEST_LIB_DIR/libpegprovidermanager.so.1 -install -D -m 0755 $PEGASUS_HOME/lib/libpegprovider.so.1 $RPM_BUILD_ROOT%PEGASUS_DEST_LIB_DIR/libpegprovider.so.1 -install -D -m 0755 $PEGASUS_HOME/lib/libpegrepository.so.1 $RPM_BUILD_ROOT%PEGASUS_DEST_LIB_DIR/libpegrepository.so.1 -install -D -m 0755 $PEGASUS_HOME/lib/libpegserver.so.1 $RPM_BUILD_ROOT%PEGASUS_DEST_LIB_DIR/libpegserver.so.1 -install -D -m 0755 $PEGASUS_HOME/lib/libpeguser.so.1 $RPM_BUILD_ROOT%PEGASUS_DEST_LIB_DIR/libpeguser.so.1 -install -D -m 0755 $PEGASUS_HOME/lib/libpegwql.so.1 $RPM_BUILD_ROOT%PEGASUS_DEST_LIB_DIR/libpegwql.so.1 -install -D -m 0755 $PEGASUS_HOME/lib/libCMPIProviderManager.so.1 $RPM_BUILD_ROOT%PEGASUS_DEST_LIB_DIR/libCMPIProviderManager.so.1 -install -D -m 0755 $PEGASUS_HOME/lib/libcmpiCppImpl.so.1 $RPM_BUILD_ROOT%PEGASUS_DEST_LIB_DIR/libcmpiCppImpl.so.1 -install -D -m 0755 $PEGASUS_HOME/lib/libDefaultProviderManager.so.1 $RPM_BUILD_ROOT%PEGASUS_DEST_LIB_DIR/libDefaultProviderManager.so.1 +install -D -m 0755 $PEGASUS_HOME/%{_lib}/libCIMxmlIndicationHandler.so.1 $RPM_BUILD_ROOT%PEGASUS_DEST_LIB_DIR/libCIMxmlIndicationHandler.so.1 +install -D -m 0755 $PEGASUS_HOME/%{_lib}/libConfigSettingProvider.so.1 $RPM_BUILD_ROOT%PEGASUS_DEST_LIB_DIR/libConfigSettingProvider.so.1 +install -D -m 0755 $PEGASUS_HOME/%{_lib}/libNamespaceProvider.so.1 $RPM_BUILD_ROOT%PEGASUS_DEST_LIB_DIR/libNamespaceProvider.so.1 +install -D -m 0755 $PEGASUS_HOME/%{_lib}/libProviderRegistrationProvider.so.1 $RPM_BUILD_ROOT%PEGASUS_DEST_LIB_DIR/libProviderRegistrationProvider.so.1 +install -D -m 0755 $PEGASUS_HOME/%{_lib}/libUserAuthProvider.so.1 $RPM_BUILD_ROOT%PEGASUS_DEST_LIB_DIR/libUserAuthProvider.so.1 +install -D -m 0755 $PEGASUS_HOME/%{_lib}/libpegauthentication.so.1 $RPM_BUILD_ROOT%PEGASUS_DEST_LIB_DIR/libpegauthentication.so.1 +install -D -m 0755 $PEGASUS_HOME/%{_lib}/libpegclient.so.1 $RPM_BUILD_ROOT%PEGASUS_DEST_LIB_DIR/libpegclient.so.1 +install -D -m 0755 $PEGASUS_HOME/%{_lib}/libpegcliutils.so.1 $RPM_BUILD_ROOT%PEGASUS_DEST_LIB_DIR/libpegcliutils.so.1 +install -D -m 0755 $PEGASUS_HOME/%{_lib}/libpegcommon.so.1 $RPM_BUILD_ROOT%PEGASUS_DEST_LIB_DIR/libpegcommon.so.1 +install -D -m 0755 $PEGASUS_HOME/%{_lib}/libpegcompiler.so.1 $RPM_BUILD_ROOT%PEGASUS_DEST_LIB_DIR/libpegcompiler.so.1 +install -D -m 0755 $PEGASUS_HOME/%{_lib}/libpegconfig.so.1 $RPM_BUILD_ROOT%PEGASUS_DEST_LIB_DIR/libpegconfig.so.1 +install -D -m 0755 $PEGASUS_HOME/%{_lib}/libpegexportclient.so.1 $RPM_BUILD_ROOT%PEGASUS_DEST_LIB_DIR/libpegexportclient.so.1 +install -D -m 0755 $PEGASUS_HOME/%{_lib}/libpegexportserver.so.1 $RPM_BUILD_ROOT%PEGASUS_DEST_LIB_DIR/libpegexportserver.so.1 +install -D -m 0755 $PEGASUS_HOME/%{_lib}/libpeggetoopt.so.1 $RPM_BUILD_ROOT%PEGASUS_DEST_LIB_DIR/libpeggetoopt.so.1 +install -D -m 0755 $PEGASUS_HOME/%{_lib}/libpeghandlerservice.so.1 $RPM_BUILD_ROOT%PEGASUS_DEST_LIB_DIR/libpeghandlerservice.so.1 +install -D -m 0755 $PEGASUS_HOME/%{_lib}/libpegindicationservice.so.1 $RPM_BUILD_ROOT%PEGASUS_DEST_LIB_DIR/libpegindicationservice.so.1 +install -D -m 0755 $PEGASUS_HOME/%{_lib}/libpeglistener.so.1 $RPM_BUILD_ROOT%PEGASUS_DEST_LIB_DIR/libpeglistener.so.1 +install -D -m 0755 $PEGASUS_HOME/%{_lib}/libpegprm.so.1 $RPM_BUILD_ROOT%PEGASUS_DEST_LIB_DIR/libpegprm.so.1 +install -D -m 0755 $PEGASUS_HOME/%{_lib}/libpegprovidermanager.so.1 $RPM_BUILD_ROOT%PEGASUS_DEST_LIB_DIR/libpegprovidermanager.so.1 +install -D -m 0755 $PEGASUS_HOME/%{_lib}/libpegprovider.so.1 $RPM_BUILD_ROOT%PEGASUS_DEST_LIB_DIR/libpegprovider.so.1 +install -D -m 0755 $PEGASUS_HOME/%{_lib}/libpegrepository.so.1 $RPM_BUILD_ROOT%PEGASUS_DEST_LIB_DIR/libpegrepository.so.1 +install -D -m 0755 $PEGASUS_HOME/%{_lib}/libpegserver.so.1 $RPM_BUILD_ROOT%PEGASUS_DEST_LIB_DIR/libpegserver.so.1 +install -D -m 0755 $PEGASUS_HOME/%{_lib}/libpeguser.so.1 $RPM_BUILD_ROOT%PEGASUS_DEST_LIB_DIR/libpeguser.so.1 +install -D -m 0755 $PEGASUS_HOME/%{_lib}/libpegwql.so.1 $RPM_BUILD_ROOT%PEGASUS_DEST_LIB_DIR/libpegwql.so.1 +install -D -m 0755 $PEGASUS_HOME/%{_lib}/libCMPIProviderManager.so.1 $RPM_BUILD_ROOT%PEGASUS_DEST_LIB_DIR/libCMPIProviderManager.so.1 +install -D -m 0755 $PEGASUS_HOME/%{_lib}/libcmpiCppImpl.so.1 $RPM_BUILD_ROOT%PEGASUS_DEST_LIB_DIR/libcmpiCppImpl.so.1 +install -D -m 0755 $PEGASUS_HOME/%{_lib}/libDefaultProviderManager.so.1 $RPM_BUILD_ROOT%PEGASUS_DEST_LIB_DIR/libDefaultProviderManager.so.1 -install -D -m 0755 $PEGASUS_HOME/lib/libComputerSystemProvider.so.1 $RPM_BUILD_ROOT%PEGASUS_PROVIDER_LIB_DIR/libComputerSystemProvider.so.1 -install -D -m 0755 $PEGASUS_HOME/lib/libOSProvider.so.1 $RPM_BUILD_ROOT%PEGASUS_PROVIDER_LIB_DIR/libOSProvider.so.1 -install -D -m 0755 $PEGASUS_HOME/lib/libProcessProvider.so.1 $RPM_BUILD_ROOT%PEGASUS_PROVIDER_LIB_DIR/libProcessProvider.so.1 +install -D -m 0755 $PEGASUS_HOME/%{_lib}/libComputerSystemProvider.so.1 $RPM_BUILD_ROOT%PEGASUS_PROVIDER_LIB_DIR/libComputerSystemProvider.so.1 +install -D -m 0755 $PEGASUS_HOME/%{_lib}/libOSProvider.so.1 $RPM_BUILD_ROOT%PEGASUS_PROVIDER_LIB_DIR/libOSProvider.so.1 +install -D -m 0755 $PEGASUS_HOME/%{_lib}/libProcessProvider.so.1 $RPM_BUILD_ROOT%PEGASUS_PROVIDER_LIB_DIR/libProcessProvider.so.1 # # CIM schema @@ -678,8 +735,13 @@ install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_LIB_DIR/libSampleInsta install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_LIB_DIR/libSampleMethodProvider.so.1 $RPM_BUILD_ROOT%PEGASUS_TEST_LIB_DIR/libSampleMethodProvider.so.1 install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_MAK_DIR/commands.mak $RPM_BUILD_ROOT%PEGASUS_TEST_MAK_DIR/commands.mak %endif +# +# install the 'opt-tog-pegasus' utility script for upstream release compatibility: +install -D -m 0755 %{SOURCE1} $RPM_BUILD_ROOT%PEGASUS_DATA_DIR/scripts/opt-tog-pegasus cd $RPM_BUILD_ROOT rm -Rf $PEGASUS_HOME +# These %ghost files will not be installed, but need to be present here: +touch $RPM_BUILD_ROOT{%PEGASUS_CONFIG_DIR/cimserver_current.conf,%PEGASUS_CONFIG_DIR/ssl.cnf,%PEGASUS_CONFIG_DIR/client.pem,%PEGASUS_CONFIG_DIR/server.pem,%PEGASUS_CONFIG_DIR/file.pem,%PEGASUS_CONFIG_DIR/client_2048.pem,%PEGASUS_CONFIG_DIR/server_2048.pem,%PEGASUS_CONFIG_DIR/file_2048.pem,%PEGASUS_LOG_DIR/install.log} %clean #make clean @@ -733,7 +795,6 @@ echo "CN = `host \`hostname\`|cut -d\" \" -f1`" >> %PEGASUS_ chmod 400 %PEGASUS_CONFIG_DIR/ssl.cnf chown root %PEGASUS_CONFIG_DIR/ssl.cnf chgrp root %PEGASUS_CONFIG_DIR/ssl.cnf - openssl req -x509 -days 3650 -newkey rsa:2048 \ -nodes -config %PEGASUS_CONFIG_DIR/ssl.cnf \ -keyout %PEGASUS_CONFIG_DIR/key.pem -out %PEGASUS_CONFIG_DIR/cert.pem 2>>%INSTALL_LOG @@ -744,27 +805,16 @@ cat %PEGASUS_CONFIG_DIR/cert.pem > %PEGASUS_CONFIG_DIR/server_2048.pem chmod 400 %PEGASUS_CONFIG_DIR/server_2048.pem cat %PEGASUS_CONFIG_DIR/cert.pem > %PEGASUS_CONFIG_DIR/client_2048.pem chmod 400 %PEGASUS_CONFIG_DIR/client_2048.pem - rm -f %PEGASUS_CONFIG_DIR/key.pem %PEGASUS_CONFIG_DIR/cert.pem - -if [ -f %PEGASUS_CONFIG_DIR/%PEGASUS_SSL_CERT_FILE ] -then - echo "WARNING: %PEGASUS_CONFIG_DIR/%PEGASUS_SSL_CERT_FILE SSL Certificate file already exists." -else - cp %PEGASUS_CONFIG_DIR/server_2048.pem %PEGASUS_CONFIG_DIR/%PEGASUS_SSL_CERT_FILE - cp %PEGASUS_CONFIG_DIR/file_2048.pem %PEGASUS_CONFIG_DIR/%PEGASUS_SSL_KEY_FILE - chmod 400 %PEGASUS_CONFIG_DIR/%PEGASUS_SSL_KEY_FILE - chmod 444 %PEGASUS_CONFIG_DIR/%PEGASUS_SSL_CERT_FILE -fi - -if [ -f %PEGASUS_CONFIG_DIR/%PEGASUS_SSL_TRUSTSTORE ] -then - echo "WARNING: %PEGASUS_CONFIG_DIR/%PEGASUS_SSL_TRUSTSTORE SSL Certificate trust store already exists." -else - cp %PEGASUS_CONFIG_DIR/client_2048.pem %PEGASUS_CONFIG_DIR/%PEGASUS_SSL_TRUSTSTORE - chmod 444 %PEGASUS_CONFIG_DIR/%PEGASUS_SSL_TRUSTSTORE -fi - +cp -fp %PEGASUS_CONFIG_DIR/server_2048.pem %PEGASUS_CONFIG_DIR/%PEGASUS_SSL_CERT_FILE +cp -fp %PEGASUS_CONFIG_DIR/file_2048.pem %PEGASUS_CONFIG_DIR/%PEGASUS_SSL_KEY_FILE +chmod 400 %PEGASUS_CONFIG_DIR/%PEGASUS_SSL_KEY_FILE +chmod 444 %PEGASUS_CONFIG_DIR/%PEGASUS_SSL_CERT_FILE +cp -fp %PEGASUS_CONFIG_DIR/client_2048.pem %PEGASUS_CONFIG_DIR/%PEGASUS_SSL_TRUSTSTORE +chmod 444 %PEGASUS_CONFIG_DIR/%PEGASUS_SSL_TRUSTSTORE +%if %{OPT_TOG_PEGASUS} + %PEGASUS_DATA_DIR/scripts/opt-tog-pegasus +%endif elif [ $1 -gt 1 ]; then /sbin/service tog-pegasus condrestart :; @@ -794,13 +844,16 @@ fi %files %defattr(-,root,root) -%dir %attr(-,root,root) %PEGASUS_PROD_DIR +# no, please don't Provide /usr !: %dir %attr(-,root,root) %PEGASUS_PROD_DIR %dir %attr(-,root,root) %PEGASUS_LOCAL_AUTH_DIR %dir %attr(-,root,root) %PEGASUS_CONFIG_DIR %dir %attr(-,root,root) %PEGASUS_VARDATA_DIR +%dir %attr(-,root,root) %PEGASUS_VARDATA_CACHE_DIR %dir %attr(-,root,root) %PEGASUS_LOG_DIR %dir %attr(-,root,root) %PEGASUS_PROVIDER_LIB_DIR %dir %attr(1555,root,root) %PEGASUS_LOCAL_DOMAIN_SOCKET_DIR +%dir %attr(-,root,root) %PEGASUS_DATA_DIR +%dir %attr(-,root,root) %PEGASUS_MOF_DIR %defattr(-,root,root) %PEGASUS_REPOSITORY_DIR %defattr(-,root,root) @@ -811,7 +864,8 @@ fi %PEGASUS_MANADMIN_DIR/cimauth.8* %PEGASUS_MANADMIN_DIR/cimconfig.8* %PEGASUS_MANADMIN_DIR/cimserver.8* -%doc doc/* +%doc doc/license.txt doc/Admin_Guide_Release_2.4.pdf +%dir %attr(-,root,root) %PEGASUS_MOF_DIR/CIM28 %attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/CIM_Core28.mof %attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/Core28_Qualifiers.mof %attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/Core28_CoreElements.mof @@ -925,6 +979,7 @@ fi %attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/User28_SharedSecret.mof %attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/User28_StorageHardwareID.mof %attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/User28_UsersAccess.mof +%dir %attr(-,root,root) %PEGASUS_MOF_DIR/Pegasus %attr(-,root,root) %PEGASUS_MOF_DIR/Pegasus/PG_InterOpSchema20.mof %attr(-,root,root) %PEGASUS_MOF_DIR/Pegasus/PG_InternalSchema20.mof %attr(-,root,root) %PEGASUS_MOF_DIR/Pegasus/PG_ManagedSystemSchema20.mof @@ -944,6 +999,15 @@ fi %config %attr(-,root,root) %PEGASUS_CONFIG_DIR/%PEGASUS_PLANNED_CONFIG_FILE %config %attr(-,root,root) /etc/init.d/tog-pegasus %config %attr(-,root,root) %PAM_CONF/wbem +%ghost %PEGASUS_CONFIG_DIR/cimserver_current.conf +%ghost %PEGASUS_CONFIG_DIR/ssl.cnf +%ghost %PEGASUS_CONFIG_DIR/client.pem +%ghost %PEGASUS_CONFIG_DIR/server.pem +%ghost %PEGASUS_CONFIG_DIR/file.pem +%ghost %PEGASUS_CONFIG_DIR/client_2048.pem +%ghost %PEGASUS_CONFIG_DIR/server_2048.pem +%ghost %PEGASUS_CONFIG_DIR/file_2048.pem +%ghost %PEGASUS_LOG_DIR/install.log %attr(0544,root,root) %PEGASUS_SBIN_DIR/cimauth %attr(0544,root,root) %PEGASUS_SBIN_DIR/cimserver %attr(0544,root,root) %PEGASUS_SBIN_DIR/cimservera @@ -987,11 +1051,9 @@ fi %attr(-,root,root) %PEGASUS_PROVIDER_LIB_DIR/libComputerSystemProvider.so.1 %attr(-,root,root) %PEGASUS_PROVIDER_LIB_DIR/libOSProvider.so.1 %attr(-,root,root) %PEGASUS_PROVIDER_LIB_DIR/libProcessProvider.so.1 - -%files devel -%defattr(0555,root,root) # symbolic links for client libs # +%defattr(0555,root,root) %PEGASUS_DEST_LIB_DIR/libpegcommon.so %PEGASUS_DEST_LIB_DIR/libpegclient.so %PEGASUS_DEST_LIB_DIR/libpegprovider.so @@ -1003,9 +1065,16 @@ fi %PEGASUS_PROVIDER_LIB_DIR/libComputerSystemProvider.so %PEGASUS_PROVIDER_LIB_DIR/libOSProvider.so %PEGASUS_PROVIDER_LIB_DIR/libProcessProvider.so +# upstream distribution compatibility utility +# +%dir %attr(-,root,root) %PEGASUS_DATA_DIR/scripts +%PEGASUS_DATA_DIR/scripts/opt-tog-pegasus + +%files devel # header files # %defattr(0444,root,root) +%dir %attr(-,root,root) %PEGASUS_INCLUDE_DIR %attr(-,root,root) %PEGASUS_INCLUDE_DIR/Pegasus/Client/CIMClientException.h %attr(-,root,root) %PEGASUS_INCLUDE_DIR/Pegasus/Client/CIMClient.h %attr(-,root,root) %PEGASUS_INCLUDE_DIR/Pegasus/Client/Linkage.h @@ -1058,7 +1127,22 @@ fi %attr(-,root,root) %PEGASUS_INCLUDE_DIR/Pegasus/Provider/CIMProvider.h %attr(-,root,root) %PEGASUS_INCLUDE_DIR/Pegasus/Provider/Linkage.h %attr(-,root,root) %PEGASUS_INCLUDE_DIR/Pegasus/Provider/ProviderException.h -%PEGASUS_HTML_DIR +%attr(-,root,root) %PEGASUS_HTML_DIR +%dir %attr(-,root,root) %PEGASUS_DATA_DIR +%dir %attr(-,root,root) %PEGASUS_SAMPLES_DIR +%dir %attr(-,root,root) %PEGASUS_SAMPLES_DIR/mak +%dir %attr(-,root,root) %PEGASUS_SAMPLES_DIR/Clients +%dir %attr(-,root,root) %PEGASUS_SAMPLES_DIR/Clients/DefaultC++ +%dir %attr(-,root,root) %PEGASUS_SAMPLES_DIR/Clients/DefaultC++/EnumInstances +%dir %attr(-,root,root) %PEGASUS_SAMPLES_DIR/Clients/DefaultC++/InvokeMethod +%dir %attr(-,root,root) %PEGASUS_SAMPLES_DIR/Clients/DefaultC++/SendTestIndications +%dir %attr(-,root,root) %PEGASUS_SAMPLES_DIR/Providers +%dir %attr(-,root,root) %PEGASUS_SAMPLES_DIR/Providers/Load +%dir %attr(-,root,root) %PEGASUS_SAMPLES_DIR/Providers/DefaultC++ +%dir %attr(-,root,root) %PEGASUS_SAMPLES_DIR/Providers/DefaultC++/IndicationProvider +%dir %attr(-,root,root) %PEGASUS_SAMPLES_DIR/Providers/DefaultC++/MethodProvider +%dir %attr(-,root,root) %PEGASUS_SAMPLES_DIR/Providers/DefaultC++/InstanceProvider +%dir %attr(-,root,root) %PEGASUS_SAMPLES_DIR/Providers/DefaultC++/SimpleDisplayConsumer # make files %attr(-,root,root) %PEGASUS_SAMPLES_DIR/Makefile %attr(-,root,root) %PEGASUS_SAMPLES_DIR/mak/common.mak @@ -1106,6 +1190,7 @@ fi %if %{WITH_TEST} %files test +%defattr(-,root,root) %attr(-,root,root) %PEGASUS_TEST_DIR/Makefile %attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/CompAssoc %attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/InvokeMethod2 @@ -1145,15 +1230,49 @@ fi %attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestValue %attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TracerTest %attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/UserManagerTest -%attr(-,root,root) %PEGASUS_TEST_LIB_DIR/libSampleFamilyProvider.so.1 -%attr(-,root,root) %PEGASUS_TEST_LIB_DIR/libSampleInstanceProvider.so.1 -%attr(-,root,root) %PEGASUS_TEST_LIB_DIR/libSampleMethodProvider.so.1 -%attr(-,root,root) %PEGASUS_TEST_MAK_DIR/commands.mak +%attr(0555,root,root) %PEGASUS_TEST_LIB_DIR/libSampleFamilyProvider.so.1 +%attr(0555,root,root) %PEGASUS_TEST_LIB_DIR/libSampleInstanceProvider.so.1 +%attr(0555,root,root) %PEGASUS_TEST_LIB_DIR/libSampleMethodProvider.so.1 +%attr(0555,root,root) %PEGASUS_TEST_MAK_DIR/commands.mak %PEGASUS_TEST_REPOSITORY_DIR %endif %changelog -* Wed Aug 17 2005 Jason Vas Dias - 2.4.1-2.rhel4 +* Fri Sep 02 2005 Jason Vas Dias - 2.4.1-4.FC5 +- .spec file changes to prevent files remaining after rpm erase + +* Thu Sep 01 2005 Jason Vas Dias - 2.4.1-4.rhel4 +- fix bug 167161: put all libraries into %{_libdir}, not /lib +- fix bug 167162: use internal pthread_cleanup_{push,pop} routines +- fix bug 167163: correct pam Requires and pam-devel BuildRequires +- fix bug 167164: remove potential buffer overflows with gethostbyname +- fix bug 167165: remove potential buffer overflow in System::extract_file_path +- Upstream bug patches applied, as agreed with bug committee, + which have been tested by HP and IBM and submitted to 2.4.2 - + see http://cvs.rdg.opengroup.org/bugzilla/buglist.cgi?&keywords=2.4.2_approved : +2207 CIMOMHandle drops InvokeMethod request +2217 Interrupts improperly handled in Unix Semaphore implement... +2499 Initial Provider load/initialize is not thread safe. +2503 IndicationHandlerService::_lookupHandlerForClass() not th... +3416 SDK sample build fails on x86_64 2.4 rpm +3858 _subscriptionClassesTable not threadsafe +3958 cimserver crashs after many indications delivered +4004 cimserver crash in MessageQueueService after running for ... +4009 Double close causes EBADF ("Bad file descriptor") failures +4014 host name validation in CIMObjectPathRep::isValidHostname... +4023 Assignment operators should return object references +4025 Thread class uses internal pthread functions +4027 SSLCallbackInfo class does not declare a copy constructor... +4028 CIMInstance::buildPath assumes key properties are specified +4029 Add TestIndicationStressTest to 2.4-branch +4042 TestIndicationStressTest not enabled in 2.4 branch. +4050 Compile warning building SDK packaged consumer. +4072 ThreadPool Test Failure - 2.4 version of Bug 2239 +4103 Timing window where in MessageQueue Service - Could cause... +4120 HTTPConnection _handleReadEvent should complete connectio... +4126 On shutdown, cimom::routing_proc loops attempting to send... + +* Wed Aug 17 2005 Jason Vas Dias - 2.4.1-2 - fix bug 165805: change location from /opt root to / root cimserver not running by default rename 'sdk' package 'devel' package @@ -1164,12 +1283,12 @@ fi moved symlinks into -devel package - further fix for bug 165770: cimserver no longer stores socket in subdirectory -* Fri Aug 12 2005 Jason Vas Dias - 2.4.1-2 +* Fri Aug 12 2005 Jason Vas Dias - 2.4.1-1 - fix bug 165805: remove 'echo's after initscript's use of redhat-lsb's log_success_msg / log_failure_msg functions. - fix bug 165770: make initscript stop do 'rm -rf /var/run/tog-pegasus' -* Thu May 05 2005 Jason Vas Dias - 2.4.1-1 +* Thu May 05 2005 Jason Vas Dias - 2.4.1-1beta - Import of tog-pegasus-2.4.1.Beta-3 . - Change .spec file to not build and install test RPM by default. You need to build and install RPMs with --define 'WITH_TEST 1'