rpms/tog-pegasus/devel pegasus-2.5-local-or-remote-auth.patch, NONE, 1.1 pegasus-2.5-make_install.patch, NONE, 1.1 pegasus-2.5-redhat.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.3, 1.4 tog-pegasus.spec, 1.5, 1.6 opt-tog-pegasus, 1.1, NONE tog-pegasus-2.4.1-165770.patch, 1.1, NONE tog-pegasus-2.4.1-2-4-2-sanity.patch, 1.1, NONE tog-pegasus-2.4.1-Beta3-gcc4.patch, 1.1, NONE tog-pegasus-2.4.1-bz167164.patch, 1.1, NONE tog-pegasus-2.4.1-bz167165.patch, 1.1, NONE tog-pegasus-2.4.1-de-lib.patch, 1.1, NONE tog-pegasus-2.4.1-de-opt.patch, 1.1, NONE tog-pegasus-2.4.1-execshield.patch, 1.1, NONE tog-pegasus-2.4.1-noecho.patch, 1.1, NONE tog-pegasus-2.4.1-obz2207.patch, 1.1, NONE tog-pegasus-2.4.1-obz2217.patch, 1.1, NONE tog-pegasus-2.4.1-obz2499.patch, 1.1, NONE tog-pegasus-2.4.1-obz2503.patch, 1.1, NONE tog-pegasus-2.4.1-obz3858.patch, 1.1, NONE tog-pegasus-2.4.1-obz3958.patch, 1.1, NONE tog-pegasus-2.4.1-obz3958_default.patch, 1.1, NONE tog-pegasus-2.4.1-obz4004.patch, 1.1, NONE tog-pegasus-2.4.1-obz4009.patch, 1.1, ! NONE tog-pegasus-2.4.1-obz4014.patch, 1.1, NONE tog-pegasus-2.4.1-obz4023.patch, 1.1, NONE tog-pegasus-2.4.1-obz4027.patch, 1.1, NONE tog-pegasus-2.4.1-obz4028.patch, 1.1, NONE tog-pegasus-2.4.1-obz4029-new.patch, 1.1, NONE tog-pegasus-2.4.1-obz4029.patch, 1.1, NONE tog-pegasus-2.4.1-obz4050.patch, 1.1, NONE tog-pegasus-2.4.1-obz4072.patch, 1.1, NONE tog-pegasus-2.4.1-obz4120.patch, 1.1, NONE tog-pegasus-2.4.1-rbz167162_obz4025.patch, 1.1, NONE tog-pegasus-2.4.1-remove_socket.patch, 1.1, NONE tog-pegasus-2.4.1.Beta-3.condrestart.patch, 1.1, NONE tog-pegasus-2.4.1.Beta-3.ppc64.patch, 1.1, NONE tog-pegasus-2.4.1.Beta-flags.patch, 1.1, NONE tog-pegasus-2.4.1.Beta-ldflags.patch, 1.1, NONE tog-pegasus-2.4.1.Beta-permissions.patch, 1.1, NONE tog-pegasus-2.4.1.Beta-ppc64.patch, 1.1, NONE tog-pegasus-2.4.1.Beta-ptr64.patch, 1.2, NONE tog-pegasus-2.4.1.Beta-warnings.patch, 1.1, NONE tog-pegasus-2.4.1.pie.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Oct 3 17:52:29 UTC 2005
- Previous message (by thread): rpms/pango/devel .cvsignore, 1.20, 1.21 pango.spec, 1.37, 1.38 sources, 1.20, 1.21
- Next message (by thread): rpms/tog-pegasus/devel genSSLcerts, NONE, 1.1 access.conf, NONE, 1.1 README.RedHat.Security, NONE, 1.1 rpm_build_env, NONE, 1.1
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: jvdias
Update of /cvs/dist/rpms/tog-pegasus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21705
Modified Files:
.cvsignore sources tog-pegasus.spec
Added Files:
pegasus-2.5-local-or-remote-auth.patch
pegasus-2.5-make_install.patch pegasus-2.5-redhat.patch
Removed Files:
opt-tog-pegasus tog-pegasus-2.4.1-165770.patch
tog-pegasus-2.4.1-2-4-2-sanity.patch
tog-pegasus-2.4.1-Beta3-gcc4.patch
tog-pegasus-2.4.1-bz167164.patch
tog-pegasus-2.4.1-bz167165.patch
tog-pegasus-2.4.1-de-lib.patch tog-pegasus-2.4.1-de-opt.patch
tog-pegasus-2.4.1-execshield.patch
tog-pegasus-2.4.1-noecho.patch tog-pegasus-2.4.1-obz2207.patch
tog-pegasus-2.4.1-obz2217.patch
tog-pegasus-2.4.1-obz2499.patch
tog-pegasus-2.4.1-obz2503.patch
tog-pegasus-2.4.1-obz3858.patch
tog-pegasus-2.4.1-obz3958.patch
tog-pegasus-2.4.1-obz3958_default.patch
tog-pegasus-2.4.1-obz4004.patch
tog-pegasus-2.4.1-obz4009.patch
tog-pegasus-2.4.1-obz4014.patch
tog-pegasus-2.4.1-obz4023.patch
tog-pegasus-2.4.1-obz4027.patch
tog-pegasus-2.4.1-obz4028.patch
tog-pegasus-2.4.1-obz4029-new.patch
tog-pegasus-2.4.1-obz4029.patch
tog-pegasus-2.4.1-obz4050.patch
tog-pegasus-2.4.1-obz4072.patch
tog-pegasus-2.4.1-obz4120.patch
tog-pegasus-2.4.1-rbz167162_obz4025.patch
tog-pegasus-2.4.1-remove_socket.patch
tog-pegasus-2.4.1.Beta-3.condrestart.patch
tog-pegasus-2.4.1.Beta-3.ppc64.patch
tog-pegasus-2.4.1.Beta-flags.patch
tog-pegasus-2.4.1.Beta-ldflags.patch
tog-pegasus-2.4.1.Beta-permissions.patch
tog-pegasus-2.4.1.Beta-ppc64.patch
tog-pegasus-2.4.1.Beta-ptr64.patch
tog-pegasus-2.4.1.Beta-warnings.patch
tog-pegasus-2.4.1.pie.patch
Log Message:
- Implemented new 'make install' target.
- Re-wrote tog-pegasus.spec file from scratch.
- Ported BZ 167986 authentication code and BZ 167164 + BZ 167165 fixes from RHEL-4
pegasus-2.5-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 | 97 ++++++++++++++---
Server/HTTPAuthenticatorDelegator.cpp | 3
12 files changed, 162 insertions(+), 27 deletions(-)
--- NEW FILE pegasus-2.5-local-or-remote-auth.patch ---
--- pegasus-2.5/src/Pegasus/Server/HTTPAuthenticatorDelegator.cpp.local_or_remote_auth 2005-08-13 20:28:32.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Server/HTTPAuthenticatorDelegator.cpp 2005-09-28 16:18:58.000000000 -0400
@@ -364,6 +364,9 @@
}
}
+ // Let Authenticators know whether this user is Local or Remote:
+ httpMessage->authInfo->setRemoteUser( httpMessage->fromRemoteHost );
+
//
// Handle authentication:
//
--- pegasus-2.5/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorStub.cpp.local_or_remote_auth 2005-07-12 14:05:09.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorStub.cpp 2005-09-28 16:18:58.000000000 -0400
@@ -90,7 +90,8 @@
Boolean PAMBasicAuthenticator::authenticate(
const String& userName,
- const String& password)
+ const String& password,
+ Boolean isRemoteUser)
{
PEG_METHOD_ENTER(TRC_AUTHENTICATION,
"PAMBasicAuthenticator::authenticate()");
--- pegasus-2.5/src/Pegasus/Security/Authentication/PAMBasicAuthenticator.h.local_or_remote_auth 2005-07-12 14:05:09.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Security/Authentication/PAMBasicAuthenticator.h 2005-09-28 16:18:58.000000000 -0400
@@ -71,7 +71,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
@@ -100,7 +101,8 @@
Boolean _authenticateByPAM(
const String& userName,
- const String& password);
+ const String& password,
+ Boolean isRemoteUser);
void _createPAMStandalone();
@@ -156,7 +158,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
@@ -218,7 +221,8 @@
Boolean _authenticateByPAM(
const String& userName,
- const String& password);
+ const String& password,
+ Boolean isRemoteUser);
#if defined(PEGASUS_USE_PAM_STANDALONE_PROC)
PAMBasicAuthenticatorStandAlone _pamBasicAuthenticatorStandAlone;
--- pegasus-2.5/src/Pegasus/Security/Authentication/BasicAuthenticationHandler.cpp.local_or_remote_auth 2005-07-12 14:05:09.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Security/Authentication/BasicAuthenticationHandler.cpp 2005-09-28 16:18:58.000000000 -0400
@@ -136,7 +136,7 @@
authInfo->setAuthenticatedUser(userName);
authInfo->setAuthenticatedPassword(password);
#else
- authenticated = _basicAuthenticator->authenticate(userName, password);
+ authenticated = _basicAuthenticator->authenticate(userName, password, authInfo->isRemoteUser());
if (authenticated)
{
--- pegasus-2.5/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorUnix.cpp.local_or_remote_auth 2005-07-19 15:14:48.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorUnix.cpp 2005-09-28 16:47:55.000000000 -0400
@@ -129,7 +129,8 @@
Boolean PAMBasicAuthenticator::authenticate(
const String& userName,
- const String& password)
+ const String& password,
+ Boolean isRemoteUser)
{
PEG_METHOD_ENTER(TRC_AUTHENTICATION,
"PAMBasicAuthenticator::authenticate()");
@@ -137,7 +138,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.
@@ -145,8 +146,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();
@@ -155,7 +157,8 @@
Boolean PAMBasicAuthenticator::_authenticateByPAM(
const String& userName,
- const String& password)
+ const String& password,
+ Boolean isRemoteUser)
{
PEG_METHOD_ENTER(TRC_AUTHENTICATION,
"PAMBasicAuthenticator::_authenticateByPAM()");
@@ -165,6 +168,7 @@
pam_handle_t *phandle;
char *name;
APP_DATA mydata;
+ int retcode;
//
// Store the password for PAM authentication
@@ -178,21 +182,38 @@
// 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);
+ }
//
//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.");
@@ -201,22 +222,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)
@@ -231,6 +270,7 @@
pam_handle_t *phandle;
char *name;
APP_DATA mydata;
+ int retcode;
const char *service = "wbem";
pconv.conv = PAMBasicAuthenticator::pamValidateUserCallback;
@@ -239,21 +279,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);
}
//
@@ -261,6 +323,9 @@
//
pam_end(phandle, 0);
+ closelog();
+ openlog("cimserver", LOG_PID, LOG_DAEMON);
+
#else
//
// Mutex to Serialize Authentication calls.
--- pegasus-2.5/src/Pegasus/Security/Authentication/BasicAuthenticator.h.local_or_remote_auth 2005-07-12 14:05:09.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Security/Authentication/BasicAuthenticator.h 2005-09-28 16:18:58.000000000 -0400
@@ -65,7 +65,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-2.5/src/Pegasus/Common/HTTPMessage.cpp.local_or_remote_auth 2005-05-31 21:51:53.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Common/HTTPMessage.cpp 2005-09-28 16:18:58.000000000 -0400
@@ -101,7 +101,8 @@
message(message_),
queueId(queueId_),
acceptLanguagesDecoded(false),
- contentLanguagesDecoded(false)
+ contentLanguagesDecoded(false),
+ fromRemoteHost(true)
{
if (cimException_)
cimException = *cimException_;
--- pegasus-2.5/src/Pegasus/Common/HTTPMessage.h.local_or_remote_auth 2005-05-12 02:59:56.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Common/HTTPMessage.h 2005-09-28 16:18:58.000000000 -0400
@@ -77,7 +77,8 @@
ContentLanguages contentLanguages;
Boolean acceptLanguagesDecoded;
Boolean contentLanguagesDecoded;
- CIMException cimException;
+ Boolean fromRemoteHost;
+ CIMException cimException;
void parse(
String& startLine,
--- pegasus-2.5/src/Pegasus/Common/AuthenticationInfoRep.cpp.local_or_remote_auth 2005-02-05 17:59:23.000000000 -0500
+++ pegasus-2.5/src/Pegasus/Common/AuthenticationInfoRep.cpp 2005-09-28 16:18:58.000000000 -0400
@@ -55,7 +55,8 @@
_privileged(false),
_authType(String::EMPTY),
_authStatus(NEW_REQUEST),
- _exportConnection(false)
+ _exportConnection(false),
+ _remoteUser(true)
{
PEG_METHOD_ENTER(
TRC_AUTHENTICATION, "AuthenticationInfoRep::AuthenticationInfoRep");
@@ -178,5 +179,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-2.5/src/Pegasus/Common/AuthenticationInfo.h.local_or_remote_auth 2005-02-05 17:59:23.000000000 -0500
+++ pegasus-2.5/src/Pegasus/Common/AuthenticationInfo.h 2005-09-28 16:18:58.000000000 -0400
@@ -329,6 +329,22 @@
_rep->setClientCertificate(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-2.5/src/Pegasus/Common/AuthenticationInfoRep.h.local_or_remote_auth 2005-02-05 17:59:23.000000000 -0500
+++ pegasus-2.5/src/Pegasus/Common/AuthenticationInfoRep.h 2005-09-28 16:18:58.000000000 -0400
@@ -140,6 +140,14 @@
void setExportConnection(Boolean exportConnection);
+ Boolean isRemoteUser() const
+ {
+ return _remoteUser;
+ }
+
+ void setRemoteUser(Boolean remoteUser);
+
+
//PEP187
SSLCertificateInfo* getClientCertificate()
{
@@ -170,7 +178,8 @@
#endif
Boolean _exportConnection;
- SSLCertificateInfo* _clientCertificate;
+ SSLCertificateInfo* _clientCertificate;
+ Boolean _remoteUser;
};
PEGASUS_NAMESPACE_END
--- pegasus-2.5/src/Pegasus/Common/HTTPConnection.cpp.local_or_remote_auth 2005-08-18 20:24:32.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Common/HTTPConnection.cpp 2005-09-28 16:18:58.000000000 -0400
@@ -1807,6 +1807,30 @@
"_requestCount = %d", _requestCount.value());
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-2.5-make_install.patch:
InterfaceArchive/v002001/tests/Clients/EnumInstances/Makefile | 4 +
InterfaceArchive/v002001/tests/Clients/InvokeMethod/Makefile | 4 +
InterfaceArchive/v002001/tests/Clients/Makefile | 2
InterfaceArchive/v002001/tests/Makefile | 2
InterfaceArchive/v002001/tests/Providers/InstanceProvider/Makefile | 3
InterfaceArchive/v002001/tests/Providers/Makefile | 2
InterfaceArchive/v002001/tests/Providers/MethodProvider/Makefile | 3
Makefile | 32 ++++++++++
Schemas/Makefile | 13 ++++
Schemas/Pegasus/Makefile | 16 +++++
mak/SDKMakefile | 8 +-
mak/install-library-unix.mak | 16 +++++
mak/install-program-unix.mak | 16 +++++
mak/library-unix.mak | 2
mak/program-unix.mak | 2
mak/recurse.mak | 2
rpm/Makefile | 10 +++
src/Clients/CGIClient/Makefile | 2
src/Clients/CGIClient/tests/CGIQueryString/Makefile | 2
src/Clients/CGIClient/tests/Makefile | 2
src/Clients/CLITestClients/CLI/Makefile | 2
src/Clients/CLITestClients/CLI/doc/Makefile | 1
src/Clients/CLITestClients/CreateInstance/Makefile | 3
src/Clients/CLITestClients/DeleteInstance/Makefile | 3
src/Clients/CLITestClients/EnumInstNames/Makefile | 3
src/Clients/CLITestClients/EnumerateInstanceNames/Makefile | 3
src/Clients/CLITestClients/EnumerateInstances/Makefile | 3
src/Clients/CLITestClients/GetInstance/Makefile | 3
src/Clients/CLITestClients/Makefile | 4 -
src/Clients/MCCATestClient/Makefile | 6 +
src/Clients/SendTestIndications/Makefile | 4 +
src/Clients/TestCertClient/Makefile | 2
src/Clients/TestClient/Makefile | 2
src/Clients/benchmarkTest/Load/Makefile | 4 +
src/Clients/benchmarkTest/benchmarkClient/Makefile | 2
src/Clients/benchmarkTest/benchmarkDefinition/Makefile | 3
src/Clients/benchmarkTest/benchmarkProvider/Makefile | 2
src/Clients/cimauth/Makefile | 2
src/Clients/cimauth/tests/Makefile | 2
src/Clients/cimconfig/Makefile | 2
src/Clients/cimconfig/tests/Makefile | 2
src/Clients/cimprovider/tests/Makefile | 4 +
src/Clients/cimuser/Makefile | 2
src/Clients/cimuser/tests/Makefile | 2
src/Clients/g11ntest/Makefile | 2
src/Clients/ipinfo/Makefile | 2
src/Clients/repupgrade/Makefile | 2
src/Clients/repupgrade/SSPModules/SampleSSPModule/Makefile | 4 -
src/Clients/repupgrade/tests/Makefile | 3
src/Clients/ssltrustmgr/Makefile | 2
src/Clients/ssltrustmgr/tests/Makefile | 5 +
src/Clients/tomof/Makefile | 2
src/Clients/wbemexec/tests/Makefile | 2
src/Pegasus/CQL/tests/CQLChainedIdentifier/Makefile | 2
src/Pegasus/CQL/tests/CQLValue/Makefile | 2
src/Pegasus/CQL/tests/Makefile | 2
src/Pegasus/CQL/tests/Queries/Makefile | 3
src/Pegasus/CQL/tests/QueryContext/Makefile | 2
src/Pegasus/CQL/tests/RegularExpression/Makefile | 2
src/Pegasus/Client/tests/AssociationClient/Makefile | 3
src/Pegasus/Client/tests/Client/Makefile | 3
src/Pegasus/Client/tests/ClientStatistics/Makefile | 3
src/Pegasus/Client/tests/DeleteNamespace/Makefile | 3
src/Pegasus/Client/tests/EnumInstances/Makefile | 3
src/Pegasus/Client/tests/InvokeMethod2/Makefile | 3
src/Pegasus/Client/tests/MTTestClient/Makefile | 2
src/Pegasus/Client/tests/Makefile | 2
src/Pegasus/Client/tests/SSLClientVerification/Makefile | 4 +
src/Pegasus/Client/tests/slp/Makefile | 3
src/Pegasus/Common/tests/Abstract/Makefile | 3
src/Pegasus/Common/tests/AnonymousPipe/Child/Makefile | 2
src/Pegasus/Common/tests/AnonymousPipe/Makefile | 2
src/Pegasus/Common/tests/AnonymousPipe/Parent/Makefile | 2
src/Pegasus/Common/tests/Array/Makefile | 3
src/Pegasus/Common/tests/AtomicInt/Makefile | 3
src/Pegasus/Common/tests/AutoPtr/Makefile | 3
src/Pegasus/Common/tests/Base64/Makefile | 3
src/Pegasus/Common/tests/ClassDecl/Makefile | 3
src/Pegasus/Common/tests/Compare/Makefile | 3
src/Pegasus/Common/tests/Config/Makefile | 3
src/Pegasus/Common/tests/DQueue/Makefile | 3
src/Pegasus/Common/tests/DateTime/Makefile | 3
src/Pegasus/Common/tests/Dir/Makefile | 3
src/Pegasus/Common/tests/DynLib/Makefile | 3
src/Pegasus/Common/tests/DynLoad/Makefile | 3
src/Pegasus/Common/tests/DynamicLibrary/Makefile | 3
src/Pegasus/Common/tests/FileSystem/Makefile | 3
src/Pegasus/Common/tests/Flavor/Makefile | 3
src/Pegasus/Common/tests/Formatter/Makefile | 3
src/Pegasus/Common/tests/HTTPListener/Makefile | 3
src/Pegasus/Common/tests/HashTable/Makefile | 3
src/Pegasus/Common/tests/IPC/Makefile | 3
src/Pegasus/Common/tests/IndicationFormatter/Makefile | 3
src/Pegasus/Common/tests/InstanceDecl/Makefile | 3
src/Pegasus/Common/tests/L10N/Makefile | 3
src/Pegasus/Common/tests/L10N/msg/Makefile | 4 -
src/Pegasus/Common/tests/Logger/Makefile | 3
src/Pegasus/Common/tests/Makefile | 2
src/Pegasus/Common/tests/Match/Makefile | 3
src/Pegasus/Common/tests/MessageQueue/Makefile | 3
src/Pegasus/Common/tests/MessageQueueService/Makefile | 3
src/Pegasus/Common/tests/MessageSerializer/Makefile | 3
src/Pegasus/Common/tests/Method/Makefile | 3
src/Pegasus/Common/tests/ModuleController/Makefile | 3
src/Pegasus/Common/tests/Object/Makefile | 3
src/Pegasus/Common/tests/ObjectNormalizer/Makefile | 3
src/Pegasus/Common/tests/OperationContext/Makefile | 3
src/Pegasus/Common/tests/ParamValue/Makefile | 3
src/Pegasus/Common/tests/Parameter/Makefile | 3
src/Pegasus/Common/tests/Property/Makefile | 3
src/Pegasus/Common/tests/Qualifier/Makefile | 3
src/Pegasus/Common/tests/QualifierDecl/Makefile | 3
src/Pegasus/Common/tests/QualifierList/Makefile | 3
src/Pegasus/Common/tests/Queue/Makefile | 3
src/Pegasus/Common/tests/Reference/Makefile | 3
src/Pegasus/Common/tests/Resolve/Makefile | 3
src/Pegasus/Common/tests/Scope/Makefile | 3
src/Pegasus/Common/tests/Service/BeeperService/Makefile | 2
src/Pegasus/Common/tests/Service/InstallService/Makefile | 2
src/Pegasus/Common/tests/Service/Makefile | 2
src/Pegasus/Common/tests/Service/RemoveService/Makefile | 2
src/Pegasus/Common/tests/Stack/Makefile | 3
src/Pegasus/Common/tests/StatisticalData/Makefile | 3
src/Pegasus/Common/tests/Stopwatch/Makefile | 3
src/Pegasus/Common/tests/StrToInstName/Makefile | 3
src/Pegasus/Common/tests/String/Makefile | 3
src/Pegasus/Common/tests/Thread/Makefile | 3
src/Pegasus/Common/tests/ThreadPool/Makefile | 3
src/Pegasus/Common/tests/TimeValue/Makefile | 3
src/Pegasus/Common/tests/ToMof/Makefile | 3
src/Pegasus/Common/tests/Tracer/Makefile | 3
src/Pegasus/Common/tests/ValidateClass/Makefile | 3
src/Pegasus/Common/tests/Value/Makefile | 3
src/Pegasus/Common/tests/WebClient/Makefile | 3
src/Pegasus/Common/tests/WebServer/Makefile | 3
src/Pegasus/Common/tests/XmlDump/Makefile | 3
src/Pegasus/Common/tests/XmlParser/Makefile | 3
src/Pegasus/Common/tests/XmlPrint/Makefile | 3
src/Pegasus/Common/tests/XmlReader/Makefile | 3
src/Pegasus/Common/tests/async_callback/Makefile | 3
src/Pegasus/Compiler/cmdline/Makefile | 1
src/Pegasus/Compiler/cmdline/cimmofl/Makefile | 1
src/Pegasus/Compiler/cmdline/tests/Makefile | 3
src/Pegasus/Compiler/tests/CompAssoc/Makefile | 3
src/Pegasus/Compiler/tests/Makefile | 2
src/Pegasus/Config/tests/ConfigFileHandler/Makefile | 3
src/Pegasus/Config/tests/ConfigManager/Makefile | 3
src/Pegasus/Config/tests/Makefile | 2
src/Pegasus/Consumer/tests/DisplayConsumer/Makefile | 3
src/Pegasus/Consumer/tests/Makefile | 2
src/Pegasus/ControlProviders/InteropProvider/tests/Makefile | 2
src/Pegasus/ControlProviders/ProviderRegistrationProvider/tests/Makefile | 1
src/Pegasus/ControlProviders/ProviderRegistrationProvider/tests/createInstances/Makefile | 3
src/Pegasus/ControlProviders/ProviderRegistrationProvider/tests/modifyInstances/Makefile | 3
src/Pegasus/ControlProviders/QueryCapabilitiesProvider/tests/Makefile | 2
src/Pegasus/ControlProviders/Statistic/test/Makefile | 2
src/Pegasus/DynListener/tests/Makefile | 2
src/Pegasus/DynListener/tests/TestDynListener/Makefile | 3
src/Pegasus/ExportClient/tests/ExportClient/Makefile | 3
src/Pegasus/ExportClient/tests/Makefile | 2
src/Pegasus/ExportServer/tests/ExportServer/Makefile | 3
src/Pegasus/ExportServer/tests/HandlerTable/Makefile | 3
src/Pegasus/ExportServer/tests/Makefile | 2
src/Pegasus/Handler/EmailListenerDestination/tests/Makefile | 3
src/Pegasus/Handler/SystemLogListenerDestination/tests/Makefile | 3
src/Pegasus/HandlerService/tests/HandlerTable/Makefile | 3
src/Pegasus/HandlerService/tests/Makefile | 2
src/Pegasus/IndicationService/tests/DisableEnable/Makefile | 3
src/Pegasus/IndicationService/tests/DisableEnable2/Makefile | 3
src/Pegasus/IndicationService/tests/IndicationProcess/Makefile | 3
src/Pegasus/IndicationService/tests/Makefile | 2
src/Pegasus/IndicationService/tests/ProcessIndication/Makefile | 3
src/Pegasus/IndicationService/tests/Subscription/Makefile | 3
src/Pegasus/Listener/tests/Makefile | 2
src/Pegasus/Listener/tests/TestListener/Makefile | 3
src/Pegasus/ProviderManager2/Default/tests/Makefile | 2
src/Pegasus/ProviderManager2/Default/tests/ProviderFacade/Makefile | 2
src/Pegasus/ProviderManager2/Default/tests/ProviderManager/Makefile | 2
src/Pegasus/ProviderManager2/Default/tests/ProviderModule/Makefile | 2
src/Pegasus/ProviderManager2/Default/tests/ResponseHandler/Makefile | 2
src/Pegasus/ProviderManager2/JMPI/org/pegasus/jmpi/tests/Client/Makefile | 1
src/Pegasus/ProviderManager2/JMPI/org/pegasus/jmpi/tests/CreateInstance/Makefile | 3
src/Pegasus/ProviderManager2/JMPI/org/pegasus/jmpi/tests/DeleteInstance/Makefile | 3
src/Pegasus/ProviderManager2/JMPI/org/pegasus/jmpi/tests/EnumerateInstanceNames/Makefile | 3
src/Pegasus/ProviderManager2/JMPI/org/pegasus/jmpi/tests/EnumerateInstances/Makefile | 3
src/Pegasus/ProviderManager2/JMPI/org/pegasus/jmpi/tests/ErrorXml/Makefile | 3
src/Pegasus/ProviderManager2/JMPI/org/pegasus/jmpi/tests/GetInstance/Makefile | 3
src/Pegasus/ProviderManager2/JMPI/org/pegasus/jmpi/tests/Headers/Makefile | 3
src/Pegasus/ProviderManager2/JMPI/org/pegasus/jmpi/tests/InvokeMethod/Makefile | 3
src/Pegasus/ProviderManager2/JMPI/org/pegasus/jmpi/tests/JMPI_TestPropertyTypes/Makefile | 1
src/Pegasus/ProviderManager2/JMPI/org/pegasus/jmpi/tests/Load/Makefile | 2
src/Pegasus/ProviderManager2/JMPI/org/pegasus/jmpi/tests/Makefile | 3
src/Pegasus/ProviderManager2/JMPI/org/pegasus/jmpi/tests/ModifyClass/Makefile | 3
src/Pegasus/ProviderManager2/JMPI/org/pegasus/jmpi/tests/ModifyInstance/Makefile | 3
src/Pegasus/ProviderManager2/JMPI/org/pegasus/jmpi/tests/ProcessIndication/Makefile | 1
src/Pegasus/ProviderManager2/JMPI/org/pegasus/jmpi/tests/Property/Makefile | 3
src/Pegasus/ProviderManager2/tests/Lockable/Makefile | 2
src/Pegasus/ProviderManager2/tests/Makefile | 2
src/Pegasus/ProviderManager2/tests/OperationResponseHandler/Makefile | 2
src/Pegasus/ProviderManager2/tests/ProviderManager/Makefile | 2
src/Pegasus/ProviderManager2/tests/ProviderManagerModule/Makefile | 2
src/Pegasus/ProviderManager2/tests/ProviderManagerService/Makefile | 2
src/Pegasus/ProviderManager2/tests/SafeQueue/Makefile | 2
src/Pegasus/Query/QueryExpression/tests/Makefile | 4 +
src/Pegasus/Query/QueryExpression/tests/Queries/Makefile | 4 -
src/Pegasus/Repository/tests/AssocTable/Makefile | 3
src/Pegasus/Repository/tests/ClassDeclRep/Makefile | 3
src/Pegasus/Repository/tests/CompareRepositories/Makefile | 3
src/Pegasus/Repository/tests/CompareXmlBin/Makefile | 3
src/Pegasus/Repository/tests/CompareXmlCompressed/Makefile | 3
src/Pegasus/Repository/tests/EnumerateClassNames/Makefile | 3
src/Pegasus/Repository/tests/InheritanceTree/Makefile | 3
src/Pegasus/Repository/tests/Inst/Makefile | 3
src/Pegasus/Repository/tests/LoadClass/Makefile | 3
src/Pegasus/Repository/tests/LoadRepository/Makefile | 3
src/Pegasus/Repository/tests/Makefile | 2
src/Pegasus/Repository/tests/NameSpace/Makefile | 3
src/Pegasus/Repository/tests/NameSpaceManager/Makefile | 3
src/Pegasus/Repository/tests/QualifierDeclRep/Makefile | 3
src/Pegasus/Repository/tests/Repository/Makefile | 3
src/Pegasus/Repository/tests/Repository2/Makefile | 3
src/Pegasus/Repository/tests/RepositoryMix/Makefile | 3
src/Pegasus/Repository/tests/SharedInheritanceTree/Makefile | 3
src/Pegasus/Repository/tests/SharedNameSpace/Makefile | 3
src/Pegasus/Security/Authentication/tests/AuthenticationManager/Makefile | 3
src/Pegasus/Security/Authentication/tests/BasicAuthenticationHandler/Makefile | 3
src/Pegasus/Security/Authentication/tests/LocalAuthFile/Makefile | 3
src/Pegasus/Security/Authentication/tests/LocalAuthenticationHandler/Makefile | 3
src/Pegasus/Security/Authentication/tests/Makefile | 2
src/Pegasus/Security/UserManager/tests/AuthorizationHandler/Makefile | 3
src/Pegasus/Security/UserManager/tests/Makefile | 2
src/Pegasus/Security/UserManager/tests/UserManager/Makefile | 3
src/Pegasus/Server/ProviderRegistrationManager/tests/Makefile | 1
src/Pegasus/Server/ProviderRegistrationManager/tests/createInstances/Makefile | 3
src/Pegasus/Server/ProviderRegistrationManager/tests/deleteInstances/Makefile | 3
src/Pegasus/Server/ProviderRegistrationManager/tests/load/Makefile | 1
src/Pegasus/Server/ProviderRegistrationManager/tests/lookupIndicationProvider/Makefile | 3
src/Pegasus/Server/ProviderRegistrationManager/tests/lookupInstanceProvider/Makefile | 3
src/Pegasus/Server/ProviderRegistrationManager/tests/lookupMethodProvider/Makefile | 3
src/Pegasus/Server/ProviderRegistrationManager/tests/modifyInstances/Makefile | 3
src/Pegasus/Server/ProviderRegistrationManager/tests/wildCardNamespaceNames/Makefile | 3
src/Pegasus/Server/tests/Makefile | 2
src/Pegasus/WQL/tests/ExecQuery/Makefile | 3
src/Pegasus/WQL/tests/Makefile | 2
src/Pegasus/WQL/tests/Parser/Makefile | 2
src/Pegasus/WQL/tests/ParserCLI/Makefile | 2
src/Pegasus/msg/CLI/Makefile | 2
src/Pegasus/msg/Listener/Makefile | 1
src/Pegasus/msg/Server/Makefile | 1
src/Providers/IndicationConsumer/Makefile | 2
src/Providers/IndicationConsumer/SimpleDisplayConsumer/Makefile | 2
src/Providers/Makefile | 6 -
src/Providers/ManagedSystem/ComputerSystem/Makefile | 2
src/Providers/ManagedSystem/ComputerSystem/tests/Makefile | 4 +
src/Providers/ManagedSystem/DNSService/Makefile | 2
src/Providers/ManagedSystem/DNSService/tests/Makefile | 4 +
src/Providers/ManagedSystem/DNSService/tests/testclient/Makefile | 6 +
src/Providers/ManagedSystem/IP/Makefile | 2
src/Providers/ManagedSystem/IP/testclient/Makefile | 3
src/Providers/ManagedSystem/IP/tests/Makefile | 5 +
src/Providers/ManagedSystem/Makefile | 2
src/Providers/ManagedSystem/NISServerService/Makefile | 2
src/Providers/ManagedSystem/NISServerService/testclient/Makefile | 3
src/Providers/ManagedSystem/NISServerService/tests/Makefile | 4 +
src/Providers/ManagedSystem/NTPProviderSecurity/Makefile | 2
src/Providers/ManagedSystem/NTPService/Makefile | 2
src/Providers/ManagedSystem/NTPService/testclient/Makefile | 3
src/Providers/ManagedSystem/NTPService/tests/Makefile | 4 +
src/Providers/ManagedSystem/OperatingSystem/Makefile | 2
src/Providers/ManagedSystem/OperatingSystem/tests/Makefile | 5 +
src/Providers/ManagedSystem/OperatingSystem/tests/OSTestClient/Makefile | 4 +
src/Providers/ManagedSystem/Process/Makefile | 2
src/Providers/ManagedSystem/Process/tests/Makefile | 4 +
src/Providers/ManagedSystem/Processor/Makefile | 2
src/Providers/ManagedSystem/Processor/tests/Makefile | 4 +
src/Providers/ManagedSystem/tests/Makefile | 3
src/Providers/TestProviders/AlertIndicationProvider/Makefile | 2
src/Providers/TestProviders/AssociationTests/Makefile | 2
src/Providers/TestProviders/AssociationTests/Tests/Makefile | 2
src/Providers/TestProviders/CMPI/TestFail_1/Makefile | 2
src/Providers/TestProviders/CMPI/TestFail_1/tests/Makefile | 3
src/Providers/TestProviders/CMPI/TestFail_2/Makefile | 2
src/Providers/TestProviders/CMPI/TestFail_2/tests/Makefile | 3
src/Providers/TestProviders/CMPI/TestFail_3/Makefile | 2
src/Providers/TestProviders/CMPI/TestFail_3/tests/Makefile | 3
src/Providers/TestProviders/CMPI/TestFail_4/Makefile | 2
src/Providers/TestProviders/CMPI/TestFail_4/tests/Makefile | 4 +
src/Providers/TestProviders/CMPI/TestIndications/Makefile | 2
src/Providers/TestProviders/CMPI/TestIndications/tests/Makefile | 3
src/Providers/TestProviders/CMPI/TestInstance/Makefile | 2
src/Providers/TestProviders/CMPI/TestInstance/tests/Makefile | 3
src/Providers/TestProviders/CMPI/TestMethod/Makefile | 2
src/Providers/TestProviders/CMPI/TestMethod/tests/Makefile | 3
src/Providers/TestProviders/CMPI/TestProviderThreaded/Makefile | 2
src/Providers/TestProviders/CMPI/TestProviderThreaded/tests/Makefile | 3
src/Providers/TestProviders/ClientProvider/Load/Makefile | 2
src/Providers/TestProviders/ClientProvider/Makefile | 2
src/Providers/TestProviders/DefaultInstanceProvider/Makefile | 2
src/Providers/TestProviders/DynamicIndicationProvider/Makefile | 2
src/Providers/TestProviders/FamilyProvider/Makefile | 2
src/Providers/TestProviders/FamilyProvider/tests/Makefile | 4 +
src/Providers/TestProviders/IndicationStressTestProvider/Makefile | 2
src/Providers/TestProviders/IndicationStressTestProvider/testclient/Makefile | 2
src/Providers/TestProviders/InstanceProvider/Makefile | 2
src/Providers/TestProviders/InstanceProvider/testclient/Makefile | 2
src/Providers/TestProviders/Load/Makefile | 2
src/Providers/TestProviders/MCCA_TestAssocProvider/Makefile | 2
src/Providers/TestProviders/Makefile | 4 -
src/Providers/TestProviders/MethodTestProvider/Makefile | 2
src/Providers/TestProviders/MethodTestProvider/testclient/Makefile | 2
src/Providers/TestProviders/PG_TestPropertyTypes/Makefile | 2
src/Providers/TestProviders/ProcessIndicationProvider/Makefile | 2
src/Providers/TestProviders/UserContextTestProvider/Makefile | 2
src/Providers/TestProviders/UserContextTestProvider/testclient/Makefile | 2
src/Providers/generic/Makefile | 2
src/Providers/generic/OperatingSystemProvider/Makefile | 2
src/Providers/linux/CDROMDrive/Makefile | 2
src/Providers/linux/DiskDrive/Makefile | 2
src/Providers/linux/IOPort/Makefile | 2
src/Providers/linux/IPRoute/Makefile | 2
src/Providers/linux/Interrupt/Makefile | 2
src/Providers/linux/Makefile | 2
src/Providers/linux/NetworkAdapter/Makefile | 2
src/Providers/linux/OperatingSystem/Makefile | 2
src/Providers/linux/PCIController/Makefile | 2
src/Providers/linux/Processor/Makefile | 2
src/Providers/linux/ProviderData/CDROMDrive/Makefile | 2
src/Providers/linux/ProviderData/Controller/Makefile | 2
src/Providers/linux/ProviderData/DiskDrive/Makefile | 2
src/Providers/linux/ProviderData/Interrupt/Makefile | 2
src/Providers/linux/ProviderData/Makefile | 2
src/Providers/linux/ProviderData/NetworkAdapter/Makefile | 2
src/Providers/linux/ProviderData/PackageManager/Makefile | 2
src/Providers/linux/ProviderData/Processor/Makefile | 2
src/Providers/linux/ProviderSupport/DeviceLocator/Makefile | 2
src/Providers/linux/ProviderSupport/DeviceLocator/tests/Makefile | 6 +
src/Providers/linux/ProviderSupport/FileReader/Makefile | 2
src/Providers/linux/ProviderSupport/FileReader/tests/Makefile | 6 +
src/Providers/linux/ProviderSupport/Makefile | 2
src/Providers/linux/SoftwareElement/Makefile | 2
src/Providers/linux/load/Makefile | 2
src/Providers/sample/AssociationProvider/Makefile | 2
src/Providers/sample/AssociationProvider/testclient/Makefile | 2
src/Providers/sample/CMPI/FilesAndDirectories/Makefile | 2
src/Providers/sample/CMPI/FilesAndDirectories/tests/Makefile | 7 ++
src/Providers/sample/IndicationProvider/Makefile | 2
src/Providers/sample/InstanceProvider/Makefile | 2
src/Providers/sample/InstanceQueryProvider/Makefile | 2
src/Providers/sample/InstanceQueryProvider/tests/Makefile | 4 +
src/Providers/sample/Load/Makefile | 2
src/Providers/sample/LocalizedProvider/Makefile | 2
src/Providers/sample/LocalizedProvider/msg/Makefile | 4 +
src/Providers/sample/Makefile | 2
src/Providers/sample/MethodProvider/Makefile | 2
src/Providers/sample/RT_Indication/Makefile | 2
src/Providers/sample/RT_Indication/RT_IndicationConsumer/Makefile | 2
src/Providers/sample/RT_Indication/RT_IndicationProvider/Makefile | 2
src/Providers/sample/SNMPIndicationProvider/Makefile | 2
src/Providers/slp/Makefile | 2
src/Providers/statistic/Makefile | 2
src/SDK/samples/Providers/CMPI/FilesAndDirectories/tests/Makefile | 1
src/Server/Makefile | 5 -
src/slp/tests/Makefile | 4 +
src/slp/tests/srv_reg/Makefile | 3
src/utils/Makefile | 2
src/utils/cnv2rootbundle/Makefile | 3
src/utils/mu/tests/Makefile | 2
src/utils/mu/tests/SortCmd/Makefile | 2
src/utils/stripcrs/Makefile | 3
test/Makefile | 4 -
test/TestProviders/CIMOMSample/Makefile | 3
test/TestProviders/ExceptionsTest/Makefile | 3
test/TestProviders/LargeDataProvider/Makefile | 3
test/TestProviders/LoadMOFs/Makefile | 2
test/TestProviders/Makefile | 3
test/TestProviders/MultithreadingTests/Makefile | 3
test/TestProviders/TimingTests/Makefile | 3
test/TestProviders/XMLParserGen/Makefile | 3
test/wetest/Makefile | 6 +
test/wetest/cimv2/AssociatorNames/Makefile | 5 +
test/wetest/cimv2/Associators/Makefile | 5 +
test/wetest/cimv2/CreateClass/Makefile | 6 +
test/wetest/cimv2/DeleteClass/Makefile | 6 +
test/wetest/cimv2/DeleteQualifier/Makefile | 6 +
test/wetest/cimv2/EnumerateClassNames/Makefile | 6 +
test/wetest/cimv2/EnumerateClasses/Makefile | 6 +
test/wetest/cimv2/EnumerateInstanceNames/Makefile | 6 +
test/wetest/cimv2/EnumerateInstances/Makefile | 6 +
test/wetest/cimv2/EnumerateQualifiers/Makefile | 6 +
test/wetest/cimv2/GetClass/Makefile | 5 +
test/wetest/cimv2/GetQualifier/Makefile | 6 +
test/wetest/cimv2/Load/Makefile | 4 +
test/wetest/cimv2/Makefile | 6 +
test/wetest/cimv2/ModifyClass/Makefile | 6 +
test/wetest/cimv2/ReferenceNames/Makefile | 6 +
test/wetest/cimv2/References/Makefile | 6 +
test/wetest/cimv2/SetQualifier/Makefile | 6 +
test/wetest/static/CreateInstance/Makefile | 6 +
test/wetest/static/DeleteClass/Makefile | 6 +
test/wetest/static/DeleteInstance/Makefile | 6 +
test/wetest/static/EnumerateInstanceNames/Makefile | 6 +
test/wetest/static/EnumerateInstances/Makefile | 6 +
test/wetest/static/ErrorXml/Makefile | 6 +
test/wetest/static/GetInstance/Makefile | 6 +
test/wetest/static/Headers/Makefile | 6 +
test/wetest/static/Load/Makefile | 5 +
test/wetest/static/Makefile | 6 +
test/wetest/static/ModifyClass/Makefile | 6 +
test/wetest/static/ModifyInstance/Makefile | 6 +
test/wetest/static/Property/Makefile | 6 +
410 files changed, 1248 insertions(+), 31 deletions(-)
--- NEW FILE pegasus-2.5-make_install.patch ---
--- pegasus-2.5/Makefile.make_install 2005-05-12 11:27:24.000000000 -0400
+++ pegasus-2.5/Makefile 2005-10-03 13:07:31.000000000 -0400
@@ -60,12 +60,44 @@
world: depend all repository
@ $(MAKE) -s tests
+install: all repository repository_install sdk_install install_dirs install_scripts
+
+sdk_install:
+ifdef PEGASUS_INSTALL
+ if [ -d $(PEGASUS_SDK_STAGING_DIR) ]; then \
+ ( cd $(PEGASUS_SDK_STAGING_DIR); tar -cpf - .) | ( cd $(PEGASUS_DESTDIR); tar -xpf -); \
+ fi;
+endif
+
+install_dirs:
+ifdef PEGASUS_INSTALL
+ mkdir -p $(PEGASUS_DESTDIR)/$(PEGASUS_LOG_DIR)
+ mkdir -p $(PEGASUS_DESTDIR)/$(PEGASUS_VARRUN_DIR)
+ mkdir -p $(PEGASUS_DESTDIR)/$(PEGASUS_LOCAL_AUTH_DIR)
+endif
+
+install_scripts:
+ifdef PEGASUS_INSTALL
+ mkdir -p $(PEGASUS_DESTDIR)/$(PEGASUS_SBIN_DIR)
+ echo "#!/bin/bash" > $(PEGASUS_DESTDIR)/$(PEGASUS_SBIN_DIR)/init_repository
+ echo "PEGASUS_MOF_DIR="$(PEGASUS_MOF_DIR) >> $(PEGASUS_DESTDIR)/$(PEGASUS_SBIN_DIR)/init_repository
+ echo "PEGASUS_REPOSITORY_DIR="$(PEGASUS_REPOSITORY_DIR) >> $(PEGASUS_DESTDIR)/$(PEGASUS_SBIN_DIR)/init_repository
+ echo "PEGASUS_BIN_DIR="$(PEGASUS_BIN_DIR) >> $(PEGASUS_DESTDIR)/$(PEGASUS_SBIN_DIR)/init_repository
+ echo "PEGASUS_CIM_SCHEMA=29" >> $(PEGASUS_DESTDIR)/$(PEGASUS_SBIN_DIR)/init_repository
+ cat installs/scripts/init_repository >> $(PEGASUS_DESTDIR)/$(PEGASUS_SBIN_DIR)/init_repository
+ chown root:root $(PEGASUS_DESTDIR)/$(PEGASUS_SBIN_DIR)/init_repository >/dev/null 2>&1 || :;
+ chmod 0755 $(PEGASUS_DESTDIR)/$(PEGASUS_SBIN_DIR)/init_repository
+endif
+
# The repository Target removes and rebuilds the CIM repository
# Note: Arguments must be quoted to preserve upper case characters in VMS.
repository: FORCE
@ $(MAKE) "-SC" Schemas/Pegasus repository
+repository_install: repository
+ @ $(MAKE) "-SC" Schemas/Pegasus install_repository
+
repositoryclean: FORCE
@ $(RMREPOSITORY) $(REPOSITORY_ROOT)
--- pegasus-2.5/mak/SDKMakefile.make_install 2005-10-03 12:32:47.000000000 -0400
+++ pegasus-2.5/mak/SDKMakefile 2005-10-03 12:32:47.000000000 -0400
@@ -156,8 +156,7 @@
Providers/Load \
mak
-DOCSRCPATH1FILES = \
- SecurityGuidelinesForDevelopers.html
+DOCSRCPATH1FILES =
CLIENTSRCPATH1FILES = \
Makefile \
@@ -402,3 +401,8 @@
testSDK:
@$(MAKE) --directory=$(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR) -f Makefile tests \
PEGASUS_SAMPLES_DIR=$(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)
+
+install:
+ifdef PEGASUS_INSTALL
+ (cd $(PEGASUS_STAGING_DIR); tar -cpf - .) | ( cd $(PEGASUS_DESTDIR)/; tar -xpf -)
+endif
\ No newline at end of file
--- pegasus-2.5/mak/program-unix.mak.make_install 2005-10-03 12:32:47.000000000 -0400
+++ pegasus-2.5/mak/program-unix.mak 2005-10-03 12:32:47.000000000 -0400
@@ -154,4 +154,4 @@
include $(ROOT)/mak/misc.mak
-include $(ROOT)/mak/install-program-unix.mak
+include $(PEGASUS_ROOT)/mak/install-program-unix.mak
--- /dev/null 2005-10-03 10:53:34.123398250 -0400
+++ pegasus-2.5/mak/install-program-unix.mak 2005-10-03 12:32:47.000000000 -0400
@@ -0,0 +1,16 @@
+INSTALL_BIN?=bin
+INSTALL_USER?=root
+INSTALL_GROUP?=root
+INSTALL_MODE?=0755
+install: $(PEGASUS_HOME)/bin/$(PROGRAM)
+ifdef PEGASUS_INSTALL
+ ifndef TEST
+ $(PEGASUS_INSTALL) -D -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m $(INSTALL_MODE) $(PEGASUS_HOME)/bin/$(PROGRAM) $(PEGASUS_DESTDIR)/$(PEGASUS_PROD_DIR)/$(INSTALL_BIN)/$(PROGRAM)
+ else
+ ifeq ( $(TEST), 'INSTALL' )
+ $(PEGASUS_INSTALL) -D -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m $(INSTALL_MODE) $(PEGASUS_TEST_STAGING_DIR)/$(PEGASUS_TEST_BIN_DIR)/$(PROGRAM) $(PEGASUS_DESTDIR)/$(PEGASUS_PROD_DIR)/$(INSTALL_BIN)/$(PROGRAM)
+ endif
+ endif
+endif
+
+
--- /dev/null 2005-10-03 10:53:34.123398250 -0400
+++ pegasus-2.5/mak/install-library-unix.mak 2005-10-03 12:32:47.000000000 -0400
@@ -0,0 +1,16 @@
+INSTALL_LIB?=$(PEGASUS_ARCH_LIB_DIR)
+INSTALL_USER?=root
+INSTALL_GROUP?=root
+INSTALL_MODE?=0755
+install: $(PEGASUS_HOME)/$(PEGASUS_ARCH_LIB_DIR)/lib$(LIBRARY)$(LIB_SUFFIX)
+ifdef PEGASUS_INSTALL
+ ifndef TEST
+ $(PEGASUS_INSTALL) -D -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m $(INSTALL_MODE) $(PEGASUS_HOME)/$(PEGASUS_ARCH_LIB_DIR)/lib$(LIBRARY)$(LIB_SUFFIX) $(PEGASUS_DESTDIR)/$(PEGASUS_PROD_DIR)/$(INSTALL_LIB)/lib$(LIBRARY)$(LIB_SUFFIX)
+ ln -s lib$(LIBRARY)$(LIB_SUFFIX) $(PEGASUS_DESTDIR)/$(PEGASUS_PROD_DIR)/$(INSTALL_LIB)/lib$(LIBRARY).so
+ else
+ ifeq ( $(TEST), 'INSTALL' )
+ echo 'TEST is '"'"$(TEST)"'"
+ $(PEGASUS_INSTALL) -D -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m $(INSTALL_MODE) $(PEGASUS_HOME)/$(PEGASUS_ARCH_LIB_DIR)/lib$(LIBRARY)$(LIB_SUFFIX) $(PEGASUS_TEST_STAGING_DIR)/$(PEGASUS_TEST_LIB_DIR)/lib$(LIBRARY)$(LIB_SUFFIX)
+ endif
+ endif
+endif
--- pegasus-2.5/mak/library-unix.mak.make_install 2005-10-03 12:32:47.000000000 -0400
+++ pegasus-2.5/mak/library-unix.mak 2005-10-03 12:32:47.000000000 -0400
@@ -165,4 +165,4 @@
FILES_TO_CLEAN = $(OBJECTS) $(FULL_LIB)
-include $(ROOT)/mak/install-library-unix.mak
+include $(PEGASUS_ROOT)/mak/install-library-unix.mak
--- pegasus-2.5/mak/recurse.mak.make_install 2005-05-12 11:27:28.000000000 -0400
+++ pegasus-2.5/mak/recurse.mak 2005-10-03 12:32:47.000000000 -0400
@@ -76,3 +76,5 @@
messages: $(RECURSE_DEPENDS) $(ERROR)
@ $(foreach i, $(DIRS), $(MAKESH) $(MAKE) "-SC" $(i) messages $(NL) )
+install: $(RECURSE_DEPENDS) $(ERROR)
+ @ $(foreach i, $(DIRS), $(MAKESH) $(MAKE) "-SC" $(i) install $(NL) )
--- pegasus-2.5/rpm/Makefile.make_install 2005-05-12 11:27:29.000000000 -0400
+++ pegasus-2.5/rpm/Makefile 2005-10-03 12:32:47.000000000 -0400
@@ -51,3 +51,13 @@
messages:
+install: tog-pegasus.rc wbem cimserver_planned.conf
+ifdef PEGASUS_INSTALL
+ $(PEGASUS_INSTALL) -D -o root -g root -m 0550 tog-pegasus.rc $(PEGASUS_DESTDIR)/etc/rc.d/init.d/tog-pegasus
+ $(PEGASUS_INSTALL) -D -o root -g root -m 0660 cimserver_planned.conf $(PEGASUS_DESTDIR)/$(PEGASUS_CONFIG_DIR)/cimserver_planned.conf
+ $(PEGASUS_INSTALL) -D -o root -g root -m 0660 wbem $(PEGASUS_DESTDIR)/etc/pam.d/wbem
+ mkdir -p $(PEGASUS_DESTDIR)/$(PEGASUS_MANUSER_DIR) $(PEGASUS_DESTDIR)/$(PEGASUS_MANADMIN_DIR)
+ cp -fp manLinux/man1.Z/*.1 $(PEGASUS_DESTDIR)/$(PEGASUS_MANUSER_DIR)/
+ cp -fp manLinux/man8.Z/*.8 $(PEGASUS_DESTDIR)/$(PEGASUS_MANADMIN_DIR)/
+ for f in manLinux/man1m.Z/*.1m; do F=$(PEGASUS_DESTDIR)/$(PEGASUS_MANADMIN_DIR)/`echo $$f | sed 's/1m$$/8/;s/.*\///g'`; if [ ! -f $$F ]; then cp -fp $$f $$F; fi; done
+endif
\ No newline at end of file
--- pegasus-2.5/test/Makefile.make_install 2005-05-12 11:33:41.000000000 -0400
+++ pegasus-2.5/test/Makefile 2005-10-03 12:32:47.000000000 -0400
@@ -27,11 +27,13 @@
#//
#//==============================================================================
ROOT = ..
-
+TEST = true
+TEST=true
include $(ROOT)/mak/config.mak
DIRS = \
wetest
+TEST=true
include $(ROOT)/mak/recurse.mak
--- pegasus-2.5/test/TestProviders/ExceptionsTest/Makefile.make_install 2005-05-12 11:33:41.000000000 -0400
+++ pegasus-2.5/test/TestProviders/ExceptionsTest/Makefile 2005-10-03 12:32:47.000000000 -0400
@@ -59,7 +59,9 @@
ROOT = $(PEGASUS_ROOT)
+TEST=true
include $(ROOT)/mak/config.mak
+TEST=true
include $(ROOT)/mak/configschema.mak
SAMPLEPROVIDERNS= root/SampleProvider
@@ -77,6 +79,7 @@
LOCAL_DEFINES=-DTEST_EXCEPTIONS
+TEST=true
include $(PEGASUS_ROOT)/mak/library.mak
client:
--- pegasus-2.5/test/TestProviders/CIMOMSample/Makefile.make_install 2005-05-12 11:33:41.000000000 -0400
+++ pegasus-2.5/test/TestProviders/CIMOMSample/Makefile 2005-10-03 12:32:47.000000000 -0400
@@ -61,7 +61,9 @@
ROOT = $(PEGASUS_ROOT)
+TEST=true
include $(ROOT)/mak/config.mak
+TEST=true
include $(ROOT)/mak/configschema.mak
SAMPLEPROVIDERNS= root/SampleProvider
@@ -77,6 +79,7 @@
CIMOMSampleProvider.cpp \
[...7031 lines suppressed...]
@@ -702,3 +703,4 @@
prepend-license:
+install:
\ No newline at end of file
--- pegasus-2.5/src/Clients/MCCATestClient/Makefile.make_install 2005-05-12 11:27:35.000000000 -0400
+++ pegasus-2.5/src/Clients/MCCATestClient/Makefile 2005-10-03 12:32:47.000000000 -0400
@@ -27,13 +27,16 @@
#//
#//==============================================================================
ROOT = $(PEGASUS_ROOT)
-
+TEST = true
+TEST=true
include $(ROOT)/mak/config.mak
+TEST=true
include $(ROOT)/mak/configschema.mak
PEGASUS_ZOS_PROGRAM_OBJECT = yes
DIR = Clients/MCCATestClient
+TEST=true
include $(ROOT)/mak/config.mak
ifdef PEGASUS_HAS_SSL
@@ -57,6 +60,7 @@
endif
endif
+TEST=true
include $(ROOT)/mak/program.mak
tests:
--- pegasus-2.5/InterfaceArchive/v002001/tests/Makefile.make_install 2003-10-07 02:42:45.000000000 -0400
+++ pegasus-2.5/InterfaceArchive/v002001/tests/Makefile 2005-10-03 12:32:47.000000000 -0400
@@ -1,9 +1,11 @@
ROOT = $(PEGASUS_ROOT)
+TEST=true
include $(ROOT)/mak/config.mak
DIRS = \
Providers \
Clients
+TEST=true
include $(ROOT)/mak/recurse.mak
--- pegasus-2.5/InterfaceArchive/v002001/tests/Providers/InstanceProvider/Makefile.make_install 2003-10-07 02:42:45.000000000 -0400
+++ pegasus-2.5/InterfaceArchive/v002001/tests/Providers/InstanceProvider/Makefile 2005-10-03 12:32:47.000000000 -0400
@@ -2,7 +2,9 @@
DIR = InterfaceArchive/$(VERSION)/tests/Providers/InstanceProvider
+TEST=true
include ../../../version.mak
+TEST=true
include $(ROOT)/mak/config.mak
LIBRARY = SampleInstanceProvider
@@ -14,6 +16,7 @@
InstanceProviderMain.cpp \
InstanceProvider.cpp
+TEST=true
include $(ROOT)/mak/library.mak
ifdef PEGASUS_TEST_BACKWARD_COMPATIBILITY
--- pegasus-2.5/InterfaceArchive/v002001/tests/Providers/Makefile.make_install 2003-10-07 03:46:28.000000000 -0400
+++ pegasus-2.5/InterfaceArchive/v002001/tests/Providers/Makefile 2005-10-03 12:32:47.000000000 -0400
@@ -1,7 +1,9 @@
+TEST=true
include $(PEGASUS_ROOT)/mak/config.mak
DIRS = \
InstanceProvider \
MethodProvider
+TEST=true
include $(PEGASUS_ROOT)/mak/recurse.mak
--- pegasus-2.5/InterfaceArchive/v002001/tests/Providers/MethodProvider/Makefile.make_install 2003-10-07 02:42:45.000000000 -0400
+++ pegasus-2.5/InterfaceArchive/v002001/tests/Providers/MethodProvider/Makefile 2005-10-03 12:32:47.000000000 -0400
@@ -2,7 +2,9 @@
DIR = InterfaceArchive/$(VERSION)/tests/Providers/MethodProvider
+TEST=true
include ../../../version.mak
+TEST=true
include $(ROOT)/mak/config.mak
LIBRARY = SampleMethodProvider
@@ -14,6 +16,7 @@
MethodProviderMain.cpp \
MethodProvider.cpp
+TEST=true
include $(ROOT)/mak/library.mak
ifdef PEGASUS_TEST_BACKWARD_COMPATIBILITY
--- pegasus-2.5/InterfaceArchive/v002001/tests/Clients/Makefile.make_install 2003-10-07 02:42:45.000000000 -0400
+++ pegasus-2.5/InterfaceArchive/v002001/tests/Clients/Makefile 2005-10-03 12:32:47.000000000 -0400
@@ -1,9 +1,11 @@
ROOT = $(PEGASUS_ROOT)
+TEST=true
include $(ROOT)/mak/config.mak
DIRS = \
EnumInstances \
InvokeMethod
+TEST=true
include $(ROOT)/mak/recurse.mak
--- pegasus-2.5/InterfaceArchive/v002001/tests/Clients/EnumInstances/Makefile.make_install 2003-10-07 02:42:45.000000000 -0400
+++ pegasus-2.5/InterfaceArchive/v002001/tests/Clients/EnumInstances/Makefile 2005-10-03 12:32:47.000000000 -0400
@@ -4,8 +4,11 @@
DIR = InterfaceArchive/$(VERSION)/tests/Clients/EnumInstances
+TEST=true
include ../../../version.mak
+TEST=true
include $(ROOT)/mak/config.mak
+TEST=true
include ../libraries.mak
EXTRA_INCLUDES =
@@ -13,6 +16,7 @@
PROGRAM = EnumInstances
SOURCES = EnumInstances.cpp
+TEST=true
include $(ROOT)/mak/program.mak
ifdef PEGASUS_TEST_BACKWARD_COMPATIBILITY
--- pegasus-2.5/InterfaceArchive/v002001/tests/Clients/InvokeMethod/Makefile.make_install 2003-10-07 02:42:45.000000000 -0400
+++ pegasus-2.5/InterfaceArchive/v002001/tests/Clients/InvokeMethod/Makefile 2005-10-03 12:32:47.000000000 -0400
@@ -4,8 +4,11 @@
DIR = InterfaceArchive/$(VERSION)/tests/Clients/InvokeMethod
+TEST=true
include ../../../version.mak
+TEST=true
include $(ROOT)/mak/config.mak
+TEST=true
include ../libraries.mak
EXTRA_INCLUDES =
@@ -13,6 +16,7 @@
PROGRAM = InvokeMethod
SOURCES = InvokeMethod.cpp
+TEST=true
include $(ROOT)/mak/program.mak
ifdef PEGASUS_TEST_BACKWARD_COMPATIBILITY
--- pegasus-2.5/Schemas/Pegasus/Makefile.make_install 2005-05-12 11:27:26.000000000 -0400
+++ pegasus-2.5/Schemas/Pegasus/Makefile 2005-10-03 12:32:47.000000000 -0400
@@ -68,3 +68,19 @@
xml:
$(MAKE) -f $(ROOT)/Schemas/Makefile xml
+
+install_repository: $(PEGASUS_HOME)/repository
+ifdef PEGASUS_INSTALL
+ mkdir -p $(PEGASUS_DESTDIR)/$(PEGASUS_REPOSITORY_DIR)
+ cp -rfp $(PEGASUS_HOME)/repository/* $(PEGASUS_DESTDIR)/$(PEGASUS_REPOSITORY_DIR)
+endif
+
+install:
+ifdef PEGASUS_INSTALL
+ ifdef PEGASUS_MOF_DIR
+ mkdir -p $(PEGASUS_DESTDIR)/$(PEGASUS_MOF_DIR)/Pegasus
+ /bin/cp -fp Internal/VER20/* InterOp/VER20/* ManagedSystem/VER20/* $(PEGASUS_DESTDIR)/$(PEGASUS_MOF_DIR)/Pegasus
+ chmod 444 $(PEGASUS_DESTDIR)/$(PEGASUS_MOF_DIR)/Pegasus/*
+ chown -R root:root $(PEGASUS_DESTDIR)/$(PEGASUS_MOF_DIR)/Pegasus >/dev/null 2>&1 || :;
+ endif
+endif
--- pegasus-2.5/Schemas/Makefile.make_install 2005-05-12 11:27:25.000000000 -0400
+++ pegasus-2.5/Schemas/Makefile 2005-10-03 12:32:47.000000000 -0400
@@ -92,3 +92,16 @@
@ $(ECHO) +++++ Creating XML for CIM Schema$(CIM_SCHEMA_VER).mof in file $(TMP_DIR)/CIM_Schema$(CIM_SCHEMA_VER).xml
$(CIMMOFCLI) "-R$(TMP_DIR)" --xml "-I$(CIM_SCHEMA_DIR)" -nxml/cimv2 $(CIM_SCHEMA_DIR)/CIM_Schema$(CIM_SCHEMA_VER).mof > $(TMP_DIR)/CIM_Schema$(CIM_SCHEMA_VER).xml
@ $(RMREPOSITORY) $(TMP_DIR)/repository
+
+install:
+ifdef PEGASUS_INSTALL
+ ifdef PEGASUS_MOF_DIR
+ mkdir -p $(PEGASUS_DESTDIR)/$(PEGASUS_MOF_DIR)
+ cp -rfp CIM* $(PEGASUS_DESTDIR)/$(PEGASUS_MOF_DIR)/
+ chown -R root:root $(PEGASUS_DESTDIR)/$(PEGASUS_MOF_DIR)/* >/dev/null 2>&1 || :;
+ chmod 0444 $(PEGASUS_DESTDIR)/$(PEGASUS_MOF_DIR)/CIM*/* >/dev/null 2>&1 || :;
+ chmod 0755 $(PEGASUS_DESTDIR)/$(PEGASUS_MOF_DIR)/CIM* || :;
+ make -SC Pegasus install
+ endif
+endif
+
pegasus-2.5-redhat.patch:
Makefile.Release | 4
Makefile.ReleaseTest | 14 +-
env_var_Linux.status | 30 ++--
mak/SDKMakefile | 6
mak/config-linux.mak | 8 -
mak/config.mak | 4
mak/library-unix.mak | 12 +
mak/program-unix.mak | 18 +-
rpm/tog-pegasus.rc | 68 +++++-----
rpm/wbem | 18 --
src/Clients/repupgrade/RepositoryUpgrade.cpp | 2
src/Pegasus/Common/Config.h | 7 +
src/Pegasus/Common/Constants.h | 16 +-
src/Pegasus/Common/Makefile | 8 -
src/Pegasus/Common/MessageQueueService.cpp | 4
src/Pegasus/Common/Platform_LINUX_IX86_GNU.h | 9 -
src/Pegasus/Common/System.cpp | 4
src/Pegasus/Common/SystemUnix.cpp | 2
src/Pegasus/Common/tests/DynLoad/Makefile | 2
src/Pegasus/Config/ConfigFileDirLinux.h | 4
src/Pegasus/Config/FixedPropertyTableLinux.h | 22 +--
src/Pegasus/ControlProviders/CertificateProvider/Makefile | 4
src/Pegasus/ProviderManager2/CMPI/samples/ProcessIndication/Makefile | 2
src/Pegasus/ProviderManager2/tests/ProviderManagerModule/ProviderManagerModule.cpp | 8 -
src/Providers/ManagedSystem/ComputerSystem/ComputerSystem_Linux.cpp | 2
src/Providers/ManagedSystem/OperatingSystem/OperatingSystem_Linux.cpp | 2
src/Providers/ManagedSystem/Process/Process_Linux.cpp | 2
27 files changed, 152 insertions(+), 130 deletions(-)
--- NEW FILE pegasus-2.5-redhat.patch ---
--- pegasus-2.5/Makefile.ReleaseTest.redhat 2005-05-27 13:29:01.000000000 -0400
+++ pegasus-2.5/Makefile.ReleaseTest 2005-10-03 12:29:48.000000000 -0400
@@ -54,7 +54,7 @@
endif
TEST_BIN_FILES_SRCPATH = $(PEGASUS_HOME)/bin
-TEST_LIB_FILES_SRCPATH = $(PEGASUS_HOME)/lib
+TEST_LIB_FILES_SRCPATH = $(PEGASUS_HOME)/$(PEGASUS_ARCH_LIB_DIR)
TEST_MAK_FILES_SRCPATH = $(ROOT)/mak
MAK_FILES = \
@@ -121,7 +121,7 @@
stageTEST:
@$(RMDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)
@$(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/bin
- @$(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/lib
+ @$(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/$(PEGASUS_ARCH_LIB_DIR)
@$(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/mak
@$(MAKE) --directory=$(ROOT) -f Makefile.ReleaseTest -s stage_makfiles
@$(MAKE) --directory=$(ROOT) -f Makefile.ReleaseTest -s stage_testproviderfiles
@@ -134,7 +134,7 @@
@$(foreach i, $(MAK_FILES), $(COPY) $(TEST_MAK_FILES_SRCPATH)/$(i) $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/mak/$(i);)
stage_testproviderfiles:
- @$(foreach i, $(PEGASUS_TEST_PROVIDERS), $(COPY) $(TEST_LIB_FILES_SRCPATH)/$(i)$(LIB_SUFFIX) $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/lib/$(i)$(LIB_SUFFIX);)
+ @$(foreach i, $(PEGASUS_TEST_PROVIDERS), $(COPY) $(TEST_LIB_FILES_SRCPATH)/$(i)$(LIB_SUFFIX) $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/$(PEGASUS_ARCH_LIB_DIR)/$(i)$(LIB_SUFFIX);)
stage_prestarttests:
@$(foreach i, $(PRESTARTTEST_FILES), $(COPY) $(TEST_BIN_FILES_SRCPATH)/$(i) $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/bin/$(i);)
@@ -157,7 +157,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)/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)/$(PEGASUS_ARCH_LIB_DIR)/$(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 ;)
@@ -234,7 +234,7 @@
@$(MAKE) --directory=$(ROOT) -f Makefile.ReleaseTest -s preinstall_setreleasepermissions
preinstall_setreleasepermissions:
- @$(foreach i, $(PEGASUS_TEST_PROVIDERS), $(MAKE) -f $(ROOT)/Makefile.ReleaseTest setpermissions PERMISSIONS="$(Prwxr_xr_x)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/lib/$(i)$(LIB_SUFFIX);)
+ @$(foreach i, $(PEGASUS_TEST_PROVIDERS), $(MAKE) -f $(ROOT)/Makefile.ReleaseTest setpermissions PERMISSIONS="$(Prwxr_xr_x)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/$(PEGASUS_ARCH_LIB_DIR)/$(i)$(LIB_SUFFIX);)
_append_preunSectionToSpecFile:
@$(ECHO-E) "%if %{PEGASUS_BUILD_TEST_RPM}" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
@@ -253,13 +253,13 @@
@$(ECHO-E) "# Test Files" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
@$(ECHO-E) "#" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
@$(ECHO-E) "%dir %attr($(Pr_xr_xr_x), $(INSTALL_USR),$(INSTALL_GRP)) $(PEGASUS_TEST_DIR)" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
- @$(ECHO-E) "%dir %attr($(Pr_xr_xr_x), $(INSTALL_USR),$(INSTALL_GRP)) $(PEGASUS_TEST_DIR)/lib" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
+ @$(ECHO-E) "%dir %attr($(Pr_xr_xr_x), $(INSTALL_USR),$(INSTALL_GRP)) $(PEGASUS_TEST_DIR)/$(PEGASUS_ARCH_LIB_DIR)" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
@$(ECHO-E) "%dir %attr($(Pr_xr_xr_x), $(INSTALL_USR),$(INSTALL_GRP)) $(PEGASUS_TEST_DIR)/bin" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
@$(ECHO-E) "%dir %attr($(Pr_xr_xr_x), $(INSTALL_USR),$(INSTALL_GRP)) $(PEGASUS_TEST_DIR)/mak" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
@$(foreach i, $(MAK_FILES), $(ECHO-E) \
"%attr($(Pr__r__r__),$(INSTALL_USR),$(INSTALL_GRP)) $(PEGASUS_TEST_DIR)/mak/$(i)" >> $(PEGASUS_RPM_SPEC_FILE_PATH);)
@$(foreach i, $(PEGASUS_TEST_PROVIDERS), $(ECHO-E) \
- "%attr($(Pr_xr_xr_x),$(INSTALL_USR),$(INSTALL_GRP)) $(PEGASUS_TEST_DIR)/lib/$(i)$(LIB_SUFFIX)" >> $(PEGASUS_RPM_SPEC_FILE_PATH);)
+ "%attr($(Pr_xr_xr_x),$(INSTALL_USR),$(INSTALL_GRP)) $(PEGASUS_TEST_DIR)/$(PEGASUS_ARCH_LIB_DIR)/$(i)$(LIB_SUFFIX)" >> $(PEGASUS_RPM_SPEC_FILE_PATH);)
@$(foreach i, $(PRESTARTTEST_FILES), $(ECHO-E) \
"%attr($(Pr_xr_xr_x),$(INSTALL_USR),$(INSTALL_GRP)) $(PEGASUS_TEST_DIR)/bin/$(i)" >> $(PEGASUS_RPM_SPEC_FILE_PATH);)
@$(foreach i, $(POSTSTARTTEST_FILES), $(ECHO-E) \
--- pegasus-2.5/Makefile.Release.redhat 2005-08-17 17:00:43.000000000 -0400
+++ pegasus-2.5/Makefile.Release 2005-10-03 12:29:48.000000000 -0400
@@ -481,13 +481,13 @@
$(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Prwxr_xr_x)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_LOCAL_AUTH_DIR)
stage_PegasusLibraryDirectoryFiles: FORCE
- $(foreach i, $(PEGASUS_LIBRARIES), $(COPY) $(PEGASUS_HOME)/lib/$(i)$(LIB_SUFFIX) $(PEGASUS_STAGING_DIR)$(PEGASUS_DEST_LIB_DIR)/$(i)$(LIB_SUFFIX);)
+ $(foreach i, $(PEGASUS_LIBRARIES), $(COPY) $(PEGASUS_HOME)/$(PEGASUS_ARCH_LIB_DIR)/$(i)$(LIB_SUFFIX) $(PEGASUS_STAGING_DIR)$(PEGASUS_DEST_LIB_DIR)/$(i)$(LIB_SUFFIX);)
$(foreach i, $(PEGASUS_LIBRARY_LINKS), $(MAKE) -f $(ROOT)/Makefile.Release createlink OBJECT=$(i)$(LIB_SUFFIX) LINKNAME=$(PEGASUS_STAGING_DIR)$(PEGASUS_DEST_LIB_DIR)/$(i)$(LIB_LINK_SUFFIX);)
setpermissions_PegasusLibraryDirectoryFiles: FORCE
$(foreach i, $(PEGASUS_LIBRARIES), $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Prwxr_xr_x)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_DEST_LIB_DIR)/$(i)$(LIB_SUFFIX);)
stage_PegasusProviderLibraryDirectoryFiles: FORCE
- $(foreach i, $(PEGASUS_PROVIDERS), $(COPY) $(PEGASUS_HOME)/lib/$(i)$(LIB_SUFFIX) $(PEGASUS_STAGING_DIR)$(PEGASUS_PROVIDER_LIB_DIR)/$(i)$(LIB_SUFFIX);)
+ $(foreach i, $(PEGASUS_PROVIDERS), $(COPY) $(PEGASUS_HOME)/$(PEGASUS_ARCH_LIB_DIR)/$(i)$(LIB_SUFFIX) $(PEGASUS_STAGING_DIR)$(PEGASUS_PROVIDER_LIB_DIR)/$(i)$(LIB_SUFFIX);)
$(foreach i, $(PEGASUS_PROVIDERS), $(MAKE) -f $(ROOT)/Makefile.Release createlink OBJECT=$(i)$(LIB_SUFFIX) LINKNAME=$(PEGASUS_STAGING_DIR)$(PEGASUS_PROVIDER_LIB_DIR)/$(i)$(LIB_LINK_SUFFIX);)
setpermissions_PegasusProviderLibraryDirectoryFiles: FORCE
--- pegasus-2.5/env_var_Linux.status.redhat 2005-09-02 14:40:58.000000000 -0400
+++ pegasus-2.5/env_var_Linux.status 2005-10-03 12:29:48.000000000 -0400
@@ -9,6 +9,7 @@
PEGASUS_OVERRIDE_PRODUCT_ID=yes
PEGASUS_PRODUCT_NAME="OpenPegasus"
PEGASUS_PRODUCT_VERSION="2.5.0"
+PEGASUS_RPM_VERSION="2.5"
PEGASUS_PRODUCT_STATUS=""
PAM_CONFIG_DIR=/etc/pam.d
@@ -25,32 +26,31 @@
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
PEGASUS_CIM_SCHEMA=CIM29
-PEGASUS_PROD_DIR = /opt/tog-pegasus
-PEGASUS_PRODSHARE_DIR = $(PEGASUS_PROD_DIR)/share
-PEGASUS_DOC_DIR = $(PEGASUS_PRODSHARE_DIR)/doc
-PEGASUS_MAN_DIR = $(PEGASUS_PRODSHARE_DIR)/man
+PEGASUS_PROD_DIR = /usr
+PEGASUS_PRODSHARE_DIR = $(PEGASUS_PROD_DIR)/share/Pegasus
+PEGASUS_DOC_DIR = /usr/share/doc/tog-pegasus-$(PEGASUS_RPM_VERSION)
+PEGASUS_MAN_DIR = /usr/share/man
PEGASUS_MANUSER_DIR = $(PEGASUS_MAN_DIR)/man1
PEGASUS_MANADMIN_DIR = $(PEGASUS_MAN_DIR)/man8
-PEGASUS_MOF_DIR = $(PEGASUS_PROD_DIR)/mof
-PEGASUS_DEST_LIB_DIR = $(PEGASUS_PROD_DIR)/lib
-PEGASUS_PROVIDER_DIR = $(PEGASUS_PROD_DIR)/providers
-PEGASUS_PROVIDER_LIB_DIR = $(PEGASUS_PROVIDER_DIR)/lib
+PEGASUS_MOF_DIR = $(PEGASUS_PRODSHARE_DIR)/mof
+PEGASUS_DEST_LIB_DIR = $(PEGASUS_PROD_DIR)/$(PEGASUS_ARCH_LIB_DIR)
+PEGASUS_PROVIDER_DIR = $(PEGASUS_DEST_LIB_DIR)/Pegasus/providers
+PEGASUS_PROVIDER_LIB_DIR = $(PEGASUS_PROVIDER_DIR)
PEGASUS_SBIN_DIR = $(PEGASUS_PROD_DIR)/sbin
PEGASUS_BIN_DIR = $(PEGASUS_PROD_DIR)/bin
-PEGASUS_VARDATA_DIR = /var/opt/tog-pegasus
+PEGASUS_VARDATA_DIR = /var/lib/Pegasus
PEGASUS_REPOSITORY_PARENT_DIR = $(PEGASUS_VARDATA_DIR)
PEGASUS_REPOSITORY_DIR = $(PEGASUS_REPOSITORY_PARENT_DIR)/repository
PEGASUS_PREV_REPOSITORY_DIR = $(PEGASUS_REPOSITORY_PARENT_DIR)/prev_repository
-PEGASUS_CONFIG_DIR = /etc/opt/tog-pegasus
+PEGASUS_CONFIG_DIR = /etc/Pegasus
PEGASUS_VARRUN_DIR = /var/run/tog-pegasus
PEGASUS_CIMSERVER_START_FILE = $(PEGASUS_VARRUN_DIR)/cimserver.pid
-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_VARDATA_CACHE_DIR = $(PEGASUS_VARDATA_DIR)/cache
PEGASUS_LOCAL_AUTH_DIR = $(PEGASUS_VARDATA_CACHE_DIR)/localauth
@@ -63,11 +63,11 @@
PEGASUS_SSL_CERT_FILE = server.pem
PEGASUS_SSL_TRUSTSTORE = client.pem
-PEGASUS_SAMPLES_DIR = $(PEGASUS_PROD_DIR)/samples
+PEGASUS_SAMPLES_DIR = $(PEGASUS_PRODSHARE_DIR)/samples
PEGASUS_INCLUDE_DIR = $(PEGASUS_PROD_DIR)/include
-PEGASUS_HTML_DIR = $(PEGASUS_PROD_DIR)/html
+PEGASUS_HTML_DIR = $(PEGASUS_PRODSHARE_DIR)/html
-PEGASUS_TEST_DIR = $(PEGASUS_PROD_DIR)/test
+PEGASUS_TEST_DIR = $(PEGASUS_PRODSHARE_DIR)/test
PEGASUS_TEST_REPOSITORY_DIR = $(PEGASUS_VARDATA_DIR)
PEGASUS_TEST_REPOSITORY_NAME = testrepository
--- pegasus-2.5/mak/config-linux.mak.redhat 2005-05-12 11:27:28.000000000 -0400
+++ pegasus-2.5/mak/config-linux.mak 2005-10-03 12:29:59.000000000 -0400
@@ -76,10 +76,12 @@
SYS_LIBS = -ldl -lpthread
+PEGASUS_INSTALL = /usr/bin/install
+
# Build using fixed release settings
#
ifdef PEGASUS_USE_RELEASE_DIRS
- PEGASUS_DEST_LIB_DIR=/opt/tog-pegasus/lib
+ PEGASUS_DEST_LIB_DIR=/usr/$(PEGASUS_ARCH_LIB_DIR)
endif
# PAM support
@@ -102,7 +104,7 @@
ifdef PEGASUS_DEBUG
FLAGS += -g -fPIC -W -Wall -Wno-unused -D_GNU_SOURCE -DTHREAD_SAFE -D_REENTRANT
else
-FLAGS += -fPIC -W -Wall -Wno-unused -D_GNU_SOURCE -DTHREAD_SAFE -D_REENTRANT -s -fno-enforce-eh-specs
+FLAGS += -fPIC -W -Wall -Wno-unused -D_GNU_SOURCE -DTHREAD_SAFE -D_REENTRANT -fno-enforce-eh-specs
ifdef PEGASUS_OPTIMIZE_FOR_SIZE
FLAGS += -Os
else
@@ -152,7 +154,7 @@
SYS_INCLUDES += -I${ICU_ROOT}/source/common -I${ICU_ROOT}/source/i18n
DEFINES += -DPEGASUS_HAS_ICU
- EXTRA_LIBRARIES += -L$(ICU_INSTALL)/lib -licuuc -licui18n -licudata
+ EXTRA_LIBRARIES += -L$(ICU_INSTALL)/$(PEGASUS_ARCH_LIB_DIR) -licuuc -licui18n -licudata
endif
endif
--- pegasus-2.5/mak/SDKMakefile.redhat 2005-07-15 15:46:17.000000000 -0400
+++ pegasus-2.5/mak/SDKMakefile 2005-10-03 12:29:48.000000000 -0400
@@ -382,10 +382,10 @@
@$(MAKE) --directory=$(PEGASUS_ROOT)/mak -f SDKMakefile -i deregisterproviders
@$(MAKE) --directory=$(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR) -f Makefile clean \
PEGASUS_SAMPLES_DIR=$(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR) \
- PEGASUS_PROVIDER_LIB_DIR=$(PEGASUS_HOME)/lib
+ PEGASUS_PROVIDER_LIB_DIR=$(PEGASUS_HOME)/$(PEGASUS_ARCH_LIB_DIR)
@$(MAKE) --directory=$(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR) -f Makefile all \
- PEGASUS_PROVIDER_LIB_DIR=$(PEGASUS_HOME)/lib PEGASUS_INCLUDE_DIR=$(PEGASUS_STAGING_DIR)$(PEGASUS_INCLUDE_DIR) \
- PEGASUS_DEST_LIB_DIR=$(PEGASUS_HOME)/lib PEGASUS_SAMPLES_DIR=$(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR) \
+ PEGASUS_PROVIDER_LIB_DIR=$(PEGASUS_HOME)/$(PEGASUS_ARCH_LIB_DIR) PEGASUS_INCLUDE_DIR=$(PEGASUS_STAGING_DIR)$(PEGASUS_INCLUDE_DIR) \
+ PEGASUS_DEST_LIB_DIR=$(PEGASUS_HOME)/$(PEGASUS_ARCH_LIB_DIR) PEGASUS_SAMPLES_DIR=$(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR) \
PEGASUS_INDICATION_CONSUMER_LOG_DIR=$(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/Providers/DefaultC++/SimpleDisplayConsumer
@$(MAKE) --directory=$(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/Providers/Load -f Makefile createrepository \
PEGASUS_MOF_DIR=$(PEGASUS_ROOT)/Schemas PEGASUS_BIN_DIR=$(PEGASUS_HOME)bin
--- pegasus-2.5/mak/config.mak.redhat 2005-08-12 13:52:31.000000000 -0400
+++ pegasus-2.5/mak/config.mak 2005-10-03 12:29:48.000000000 -0400
@@ -85,7 +85,7 @@
OBJ_DIR = $(HOME_DIR)/obj/$(DIR)
BIN_DIR = $(HOME_DIR)/bin
-LIB_DIR = $(HOME_DIR)/lib
+LIB_DIR = $(HOME_DIR)/$(PEGASUS_ARCH_LIB_DIR)
# l10n
# define the location for the compiled messages
@@ -544,7 +544,7 @@
# Unless otherwise specified, Pegasus libraries go in $(PEGASUS_HOME)/lib
ifndef PEGASUS_DEST_LIB_DIR
- PEGASUS_DEST_LIB_DIR = lib
+ PEGASUS_DEST_LIB_DIR = $(PEGASUS_ARCH_LIB_DIR)
endif
ifeq ($(OS),VMS)
--- pegasus-2.5/mak/program-unix.mak.redhat 2005-05-12 11:27:28.000000000 -0400
+++ pegasus-2.5/mak/program-unix.mak 2005-10-03 12:29:48.000000000 -0400
@@ -28,6 +28,12 @@
#//==============================================================================
INCLUDES = -I$(ROOT)/src $(EXTRA_INCLUDES)
+ifdef PEGASUS_PLATFORM_LINUX_GENERIC_GNU
+ ifdef PEGASUS_EXE_LINK_FLAGS
+ EXTRA_LINK_FLAGS += $(PEGASUS_EXE_LINK_FLAGS)
+ endif
+endif
+
TMP_OBJECTS = $(foreach i,$(SOURCES),$(OBJ_DIR)/$i)
ifeq ($(OS_TYPE),windows)
@@ -56,7 +62,7 @@
ifdef PEGASUS_HAS_MESSAGES
ifdef ICU_ROOT
ifdef ICU_INSTALL
- SYS_LIBS += -L${ICU_INSTALL}/lib -licui18n -licuuc
+ SYS_LIBS += -L${ICU_INSTALL}/$(PEGASUS_ARCH_LIB_DIR) -licui18n -licuuc
endif
endif
endif
@@ -90,9 +96,9 @@
ifdef ICU_ROOT
ifdef ICU_INSTALL
ifdef PEGASUS_USE_RELEASE_DIRS
- $(LINK_WRAPPER) $(CXX) $(FLAGS) $(EXTRA_LINK_FLAGS) -Xlinker -rpath -Xlinker $(PEGASUS_DEST_LIB_DIR) -Xlinker -rpath-link -Xlinker $(LIB_DIR) -Xlinker -rpath -Xlinker ${ICU_INSTALL}/lib -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS)
+ $(LINK_WRAPPER) $(CXX) $(FLAGS) $(EXTRA_LINK_FLAGS) -Xlinker -rpath -Xlinker $(PEGASUS_DEST_LIB_DIR) -Xlinker -rpath-link -Xlinker $(LIB_DIR) -Xlinker -rpath -Xlinker ${ICU_INSTALL}/$(PEGASUS_ARCH_LIB_DIR) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS)
else
- $(LINK_WRAPPER) $(CXX) $(FLAGS) $(EXTRA_LINK_FLAGS) -Xlinker -rpath -Xlinker $(LIB_DIR) -Xlinker -rpath -Xlinker ${ICU_INSTALL}/lib -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS)
+ $(LINK_WRAPPER) $(CXX) $(FLAGS) $(EXTRA_LINK_FLAGS) -Xlinker -rpath -Xlinker $(LIB_DIR) -Xlinker -rpath -Xlinker ${ICU_INSTALL}/$(PEGASUS_ARCH_LIB_DIR) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS)
endif
endif
endif
@@ -109,11 +115,11 @@
ifdef PEGASUS_HAS_MESSAGES
ifdef ICU_ROOT
ifdef ICU_INSTALL
- $(LINK_WRAPPER) $(CXX) -Wl,-brtl -blibpath:/usr/linux/lib:/usr/lib:/lib:$(ICU_INSTALL)/lib -Wl,-bhalt:$(AIX_LD_HALT) $(FLAGS) $(EXTRA_LINK_FLAGS) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS)
+ $(LINK_WRAPPER) $(CXX) -Wl,-brtl -blibpath:/usr/linux/$(PEGASUS_ARCH_LIB_DIR):/usr/$(PEGASUS_ARCH_LIB_DIR):/$(PEGASUS_ARCH_LIB_DIR):$(ICU_INSTALL)/$(PEGASUS_ARCH_LIB_DIR) -Wl,-bhalt:$(AIX_LD_HALT) $(FLAGS) $(EXTRA_LINK_FLAGS) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS)
endif
endif
else
- $(LINK_WRAPPER) $(CXX) -Wl,-brtl -blibpath:/usr/linux/lib:/usr/lib:/lib -Wl,-bhalt:$(AIX_LD_HALT) $(FLAGS) $(EXTRA_LINK_FLAGS) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS)
+ $(LINK_WRAPPER) $(CXX) -Wl,-brtl -blibpath:/usr/linux/$(PEGASUS_ARCH_LIB_DIR):/usr/$(PEGASUS_ARCH_LIB_DIR):/$(PEGASUS_ARCH_LIB_DIR):$(ICU_INSTALL)/$(PEGASUS_ARCH_LIB_DIR) -Wl,-bhalt:$(AIX_LD_HALT) $(FLAGS) $(EXTRA_LINK_FLAGS) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS)
endif
else
$(LINK_WRAPPER) $(CXX) -Wl,-brtl -Wl,-bhalt:$(AIX_LD_HALT) $(FLAGS) $(EXTRA_LINK_FLAGS) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS)
@@ -147,3 +153,5 @@
-include $(OBJ_DIR)/depend.mak
include $(ROOT)/mak/misc.mak
+
+include $(ROOT)/mak/install-program-unix.mak
--- pegasus-2.5/mak/library-unix.mak.redhat 2005-05-12 11:27:28.000000000 -0400
+++ pegasus-2.5/mak/library-unix.mak 2005-10-03 12:29:48.000000000 -0400
@@ -32,11 +32,11 @@
ifdef PEGASUS_HAS_MESSAGES
ifdef ICU_ROOT
ifdef ICU_INSTALL
- LINK_ARGUMENTS = -qmkshrobj=$(AIX_LIB_PRIORITY) -blibpath:/usr/linux/lib:/usr/lib:/lib:$(ICU_INSTALL)/lib -Wl,-bhalt:$(AIX_LD_HALT)
+ LINK_ARGUMENTS = -qmkshrobj=$(AIX_LIB_PRIORITY) -blibpath:/usr/linux/$(PEGASUS_ARCH_LIB_DIR):/usr/$(PEGASUS_ARCH_LIB_DIR):/$(PEGASUS_ARCH_LIB_DIR):$(ICU_INSTALL)/$(PEGASUS_ARCH_LIB_DIR) -Wl,-bhalt:$(AIX_LD_HALT)
endif
endif
else
- LINK_ARGUMENTS = -qmkshrobj=$(AIX_LIB_PRIORITY) -blibpath:/usr/linux/lib:/usr/lib:/lib -Wl,-bhalt:$(AIX_LD_HALT)
+ LINK_ARGUMENTS = -qmkshrobj=$(AIX_LIB_PRIORITY) -blibpath:/usr/linux/$(PEGASUS_ARCH_LIB_DIR):/usr/$(PEGASUS_ARCH_LIB_DIR):/$(PEGASUS_ARCH_LIB_DIR) -Wl,-bhalt:$(AIX_LD_HALT)
endif
else
LINK_ARGUMENTS = -qmkshrobj=$(AIX_LIB_PRIORITY) -Wl,-bhalt:$(AIX_LD_HALT)
@@ -56,12 +56,12 @@
endif
ifeq ($(PEGASUS_SUPPORTS_DYNLIB),yes)
ifdef PEGASUS_USE_RELEASE_DIRS
- LINK_COMMAND += -Wl,+b$(PEGASUS_DEST_LIB_DIR):/usr/lib
+ LINK_COMMAND += -Wl,+b$(PEGASUS_DEST_LIB_DIR):/usr/$(PEGASUS_ARCH_LIB_DIR)
ifeq ($(PEGASUS_PLATFORM), HPUX_PARISC_ACC)
- LINK_COMMAND += -Wl,+cdp,$(PEGASUS_PLATFORM_SDKROOT)/usr/lib:/usr/lib -Wl,+cdp,$(PEGASUS_HOME)/lib:$(PEGASUS_DEST_LIB_DIR)
+ LINK_COMMAND += -Wl,+cdp,$(PEGASUS_PLATFORM_SDKROOT)/usr/$(PEGASUS_ARCH_LIB_DIR):/usr/$(PEGASUS_ARCH_LIB_DIR) -Wl,+cdp,$(PEGASUS_HOME)/$(PEGASUS_ARCH_LIB_DIR):$(PEGASUS_DEST_LIB_DIR)
endif
else
- LINK_COMMAND += -Wl,+b$(LIB_DIR):/usr/lib
+ LINK_COMMAND += -Wl,+b$(LIB_DIR):/usr/$(PEGASUS_ARCH_LIB_DIR)
endif
endif
LINK_COMMAND += -Wl,+s
@@ -164,3 +164,5 @@
ln -f -s $(LIBRARY)$(SUFFIX) $(LIBRARY).$(PLATFORM_SUFFIX)
FILES_TO_CLEAN = $(OBJECTS) $(FULL_LIB)
+
+include $(ROOT)/mak/install-library-unix.mak
--- pegasus-2.5/rpm/wbem.redhat 2003-03-13 12:25:15.000000000 -0500
+++ pegasus-2.5/rpm/wbem 2005-10-03 12:29:48.000000000 -0400
@@ -1,13 +1,7 @@
#%PAM-1.0
-auth required /lib/security/pam_env.so
-auth sufficient /lib/security/pam_unix.so likeauth nullok
-auth required /lib/security/pam_deny.so
-
-account required /lib/security/pam_unix.so
-
-password required /lib/security/pam_cracklib.so retry=3 type=
-password sufficient /lib/security/pam_unix.so nullok use_authtok md5 shadow
-password required /lib/security/pam_deny.so
-
-session required /lib/security/pam_limits.so
-session required /lib/security/pam_unix.so
+auth required pam_stack.so service=system-auth
+account required pam_stack.so service=system-auth
+account required pam_access.so accessfile=/etc/Pegasus/access.conf
+password required pam_stack.so service=system-auth
+session required pam_stack.so service=system-auth
+session required pam_loginuid.so
--- pegasus-2.5/rpm/tog-pegasus.rc.redhat 2005-05-29 02:43:30.000000000 -0400
+++ pegasus-2.5/rpm/tog-pegasus.rc 2005-10-03 12:29:48.000000000 -0400
@@ -1,34 +1,28 @@
#! /bin/sh
-#//%2005////////////////////////////////////////////////////////////////////////
-#//
-#// 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.
-#//
-#// 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.
-#//
-#//==============================================================================
-#//
-#//%/////////////////////////////////////////////////////////////////////////////
+#%/////////////////////////////////////////////////////////////////////////////
+#
+# Copyright (c) 2004 BMC Software, Hewlett-Packard Company, IBM,
+# The Open Group, Tivoli Systems
+#
+# 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.
+#
+#==============================================================================
+#
+#%/////////////////////////////////////////////////////////////////////////////
### BEGIN INIT INFO
# Provides: tog-pegasus
@@ -40,7 +34,10 @@
# Description: init script for Pegasus CIM server
### END INIT INFO
-CIMSERVER_BIN=/opt/tog-pegasus/sbin/cimserver
+CIMSERVER_BIN=/usr/sbin/cimserver
+PEGASUS_SSL_CERT_FILE=${PEGASUS_SSL_CERT_FILE:=server.pem}
+PEGASUS_SSL_KEY_FILE=${PEGASUS_SSL_KEY_FILE:=file.pem}
+PEGASUS_SSL_TRUSTSTORE=${PEGASUS_SSL_TRUSTSTORE:=client.pem}
prog=cimserver
test -x $CIMSERVER_BIN || exit 5
@@ -50,19 +47,22 @@
case "$1" in
start)
+ [ -e /var/run/tog-pegasus/cimxml.socket ] && rm -f /var/run/tog-pegasus/cimxml.socket
echo -n $"Starting up CIM server: "
+ if [ ! -e /etc/Pegasus/ssl.cnf ] || [ ! -e /etc/Pegasus/$PEGASUS_SSL_CERT_FILE ] || [ ! -e /etc/Pegasus/$PEGASUS_SSL_KEY_FILE ] || [ ! -e /etc/Pegasus/$PEGASUS_SSL_TRUSTSTORE ]; then
+ echo "Generating SSL certificates...";
+ /usr/share/Pegasus/scripts/genSSLcerts;
+ fi;
$CIMSERVER_BIN
RETVAL=$?
[ "$RETVAL" -eq 0 ] && log_success_msg $"$prog start" || log_failure_msg $"$prog start"
- echo
;;
-
stop)
echo -n $"Shutting down CIM server: "
killproc cimserver
RETVAL=$?
[ "$RETVAL" -eq 0 ] && log_success_msg $"$prog stop" || log_failure_msg $"$prog stop"
- echo
+ [ "$RETVAL" -eq 0 ] && [ -e /var/run/tog-pegasus/cimxml.socket ] && rm -f /var/run/tog-pegasus/cimxml.socket
;;
status)
pid=`pidofproc $CIMSERVER_BIN`
--- pegasus-2.5/src/Pegasus/ProviderManager2/tests/ProviderManagerModule/ProviderManagerModule.cpp.redhat 2005-04-18 17:18:24.000000000 -0400
+++ pegasus-2.5/src/Pegasus/ProviderManager2/tests/ProviderManagerModule/ProviderManagerModule.cpp 2005-10-03 12:29:48.000000000 -0400
@@ -134,7 +134,7 @@
int main(int argc, char** argv)
{
- const char * verbose = getenv("PEGASUS_TEST_VERBOSE");
+ const char * verbose = getenv("PEGASUS_TEST_VERBOSE"), *p;
const String FILE_NAME =
FileSystem::buildLibraryFileName("TestProviderManager");
@@ -146,7 +146,11 @@
#elif defined (PEGASUS_OS_VMS)
fileName= FILE_NAME;
#else
- fileName=String(getenv("PEGASUS_HOME"))+String("/lib/")+FILE_NAME;
+ fileName= String(getenv("PEGASUS_HOME"))
+ + String("/")
+ + String(((p = getenv("PEGASUS_ARCH_LIB_DIR")) == 0L) ? "lib" : p)
+ + String("/")
+ + FILE_NAME;
#endif
Test1();
--- pegasus-2.5/src/Pegasus/ProviderManager2/CMPI/samples/ProcessIndication/Makefile.redhat 2005-05-12 11:30:52.000000000 -0400
+++ pegasus-2.5/src/Pegasus/ProviderManager2/CMPI/samples/ProcessIndication/Makefile 2005-10-03 12:29:48.000000000 -0400
@@ -29,7 +29,7 @@
# Makefile for CMPIRT_SampleClass library
# Change the following lines to match the values on your system
-PEGDIRLIB=$(PEGASUS_HOME)/lib
+PEGDIRLIB=$(PEGASUS_HOME)/$(PEGASUS_ARCH_LIB_DIR)
# Changes shouldn't be necessary below this line
CFLAGS=-Wall -D_COMPILE_UNIX -g -I. -I../..
--- pegasus-2.5/src/Pegasus/Config/FixedPropertyTableLinux.h.redhat 2005-07-15 19:02:21.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Config/FixedPropertyTableLinux.h 2005-10-03 12:30:39.000000000 -0400
@@ -45,19 +45,19 @@
{"enableBinaryRepository", "false"},
#endif
#if defined(PEGASUS_USE_RELEASE_DIRS) && !defined(PEGASUS_OS_LSB)
- {"traceFilePath", "/var/opt/tog-pegasus/cache/trace/cimserver.trc"},
+ {"traceFilePath", "/var/lib/Pegasus/cache/cimserver.trc"},
#if !defined(PEGASUS_USE_SYSLOGS)
- {"logdir", "/var/opt/tog-pegasus/log"},
+ {"logdir", "/var/log/Pegasus"},
#endif
- {"passwordFilePath", "/etc/opt/tog-pegasus/cimserver.passwd"},
- {"sslCertificateFilePath", "/etc/opt/tog-pegasus/server.pem"},
- {"sslKeyFilePath", "/etc/opt/tog-pegasus/file.pem"},
- {"sslTrustStore", "/etc/opt/tog-pegasus/cimserver_trust"},
- {"exportSSLTrustStore", "/etc/opt/tog-pegasus/indication_trust"},
- {"crlStore", "/etc/opt/tog-pegasus/crl"},
- {"repositoryDir", "/var/opt/tog-pegasus/repository"},
- {"providerDir", "/opt/tog-pegasus/providers/lib:/usr/lib/cmpi"},
- {"messageDir", "/opt/tog-pegasus/share/locale/ICU_Messages"},
+ {"passwordFilePath", "/etc/Pegasus/cimserver.passwd"},
+ {"sslCertificateFilePath", "/etc/Pegasus/server.pem"},
+ {"sslKeyFilePath", "/etc/Pegasus/file.pem"},
+ {"sslTrustStore", "/etc/Pegasus/cimserver_trust"},
+ {"exportSSLTrustStore", "/etc/Pegasus/indication_trust"},
+ {"crlStore", "/etc/Pegasus/crl"},
+ {"repositoryDir", "/var/lib/Pegasus/repository"},
+ {"providerDir", PEGASUS_DEST_LIB_DIR "/Pegasus/providers"},
+ {"messageDir", "/usr/share/locale"},
#endif
#if defined(PEGASUS_USE_RELEASE_DIRS) && defined(PEGASUS_OS_LSB)
{"traceFilePath", "/var/opt/lsb-pegasus/cache/cimserver.trc"},
--- pegasus-2.5/src/Pegasus/Config/ConfigFileDirLinux.h.redhat 2005-02-05 18:00:07.000000000 -0500
+++ pegasus-2.5/src/Pegasus/Config/ConfigFileDirLinux.h 2005-10-03 12:29:48.000000000 -0400
@@ -37,12 +37,12 @@
/**
Default file name for the current configuration.
*/
-static char CURRENT_CONFIG_FILE [] = "/var/opt/tog-pegasus/cimserver_current.conf";
+static char CURRENT_CONFIG_FILE [] = "/etc/Pegasus/cimserver_current.conf";
/**
Default file name for the planned configuration.
*/
-static char PLANNED_CONFIG_FILE [] = "/var/opt/tog-pegasus/cimserver_planned.conf";
+static char PLANNED_CONFIG_FILE [] = "/etc/Pegasus/cimserver_planned.conf";
/**
Default file name for the cimserver startup file containing the PID.
--- pegasus-2.5/src/Pegasus/ControlProviders/CertificateProvider/Makefile.redhat 2005-05-12 11:29:46.000000000 -0400
+++ pegasus-2.5/src/Pegasus/ControlProviders/CertificateProvider/Makefile 2005-10-03 12:29:48.000000000 -0400
@@ -56,8 +56,8 @@
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 += -L$(OPENSSL_HOME)/$(PEGASUS_ARCH_LIB_DIR) -lssl -lcrypto
+ EXTRA_LINK_ARGUMENTS = -Xlinker -rpath -Xlinker $(OPENSSL_HOME)/$(PEGASUS_ARCH_LIB_DIR)
endif
endif
--- pegasus-2.5/src/Pegasus/Common/tests/DynLoad/Makefile.redhat 2005-05-12 11:28:46.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Common/tests/DynLoad/Makefile 2005-10-03 12:29:48.000000000 -0400
@@ -45,7 +45,7 @@
ifeq ($(PEGASUS_OS_TYPE),VMS)
$(PROGRAM) libTestDynLib
else
- $(PROGRAM) $(HOME_DIR)/lib/libTestDynLib$(LIB_SUFFIX)
+ $(PROGRAM) $(HOME_DIR)/$(PEGASUS_ARCH_LIB_DIR)/libTestDynLib$(LIB_SUFFIX)
endif
endif
--- pegasus-2.5/src/Pegasus/Common/MessageQueueService.cpp.redhat 2005-08-16 18:46:53.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Common/MessageQueueService.cpp 2005-10-03 12:29:48.000000000 -0400
@@ -68,7 +68,9 @@
#define MAX_THREADS_PER_SVC_QUEUE_LIMIT 5000
#define MAX_THREADS_PER_SVC_QUEUE_DEFAULT 5
-
+#ifndef MAX_THREADS_PER_SVC_QUEUE
+#define MAX_THREADS_PER_SVC_QUEUE MAX_THREADS_PER_SVC_QUEUE_DEFAULT
+#endif
Uint32 max_threads_per_svc_queue;
PEGASUS_THREAD_RETURN PEGASUS_THREAD_CDECL
--- pegasus-2.5/src/Pegasus/Common/Makefile.redhat 2005-06-12 18:31:19.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Common/Makefile 2005-10-03 12:29:48.000000000 -0400
@@ -165,8 +165,8 @@
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 += -L$(OPENSSL_HOME)/$(PEGASUS_ARCH_LIB_DIR) -lssl -lcrypto
+ EXTRA_LINK_ARGUMENTS = -Xlinker -rpath -Xlinker $(OPENSSL_HOME)/$(PEGASUS_ARCH_LIB_DIR)
endif
endif
@@ -206,11 +206,11 @@
ifeq ($(PEGASUS_PLATFORM),WIN32_IX86_MSVC)
SYS_LIBS = ws2_32.lib advapi32.lib netapi32.lib
ifdef PEGASUS_HAS_SSL
- SYS_LIBS += /libpath:$(OPENSSL_HOME)/lib libeay32.lib ssleay32.lib
+ SYS_LIBS += /libpath:$(OPENSSL_HOME)/$(PEGASUS_ARCH_LIB_DIR) libeay32.lib ssleay32.lib
endif
ifdef PEGASUS_WINDOWS_SDK_HOME
FLAGS += -DPEGASUS_WINDOWS_SDK_HOME
- SYS_LIBS += /libpath:$(PEGASUS_WINDOWS_SDK_HOME)/lib secur32.lib
+ SYS_LIBS += /libpath:$(PEGASUS_WINDOWS_SDK_HOME)/$(PEGASUS_ARCH_LIB_DIR) secur32.lib
else
ifneq ($(CL_MAJOR_VERSION), 12)
SYS_LIBS += secur32.lib
--- pegasus-2.5/src/Pegasus/Common/Constants.h.redhat 2005-07-27 17:02:36.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Common/Constants.h 2005-10-03 12:29:48.000000000 -0400
@@ -380,21 +380,21 @@
# define PEGASUS_PAM_STANDALONE_PROC_NAME "/opt/freeware/cimom/pegasus/bin/cimservera"
# elif defined(PEGASUS_OS_LINUX) && !defined(PEGASUS_OS_LSB)
# undef PEGASUS_SSLCLIENT_CERTIFICATEFILE
-# define PEGASUS_SSLCLIENT_CERTIFICATEFILE "/etc/opt/tog-pegasus/client.pem"
+# define PEGASUS_SSLCLIENT_CERTIFICATEFILE "/etc/Pegasus/client.pem"
# undef PEGASUS_SSLCLIENT_RANDOMFILE
-# define PEGASUS_SSLCLIENT_RANDOMFILE "/var/opt/tog-pegasus/ssl.rnd"
+# define PEGASUS_SSLCLIENT_RANDOMFILE "/var/lib/Pegasus/ssl.rnd"
# undef PEGASUS_SSLSERVER_RANDOMFILE
-# define PEGASUS_SSLSERVER_RANDOMFILE "/var/opt/tog-pegasus/cimserver.rnd"
+# define PEGASUS_SSLSERVER_RANDOMFILE "/var/lib/Pegasus/cimserver.rnd"
# undef PEGASUS_LOCAL_AUTH_DIR
-# define PEGASUS_LOCAL_AUTH_DIR "/var/opt/tog-pegasus/cache/localauth"
+# define PEGASUS_LOCAL_AUTH_DIR "/var/lib/Pegasus/cache/localauth"
# undef PEGASUS_LOCAL_DOMAIN_SOCKET_PATH
-# define PEGASUS_LOCAL_DOMAIN_SOCKET_PATH "/var/run/tog-pegasus/socket/cimxml.socket"
+# define PEGASUS_LOCAL_DOMAIN_SOCKET_PATH "/var/run/tog-pegasus/cimxml.socket"
# undef PEGASUS_CORE_DIR
-# define PEGASUS_CORE_DIR "/var/opt/tog-pegasus/cache"
+# define PEGASUS_CORE_DIR "/var/lib/Pegasus/cache"
# undef PEGASUS_PAM_STANDALONE_PROC_NAME
-# define PEGASUS_PAM_STANDALONE_PROC_NAME "/opt/tog-pegasus/sbin/cimservera"
+# define PEGASUS_PAM_STANDALONE_PROC_NAME "/usr/sbin/cimservera"
# undef PEGASUS_PROVIDER_AGENT_PROC_NAME
-# define PEGASUS_PROVIDER_AGENT_PROC_NAME "/opt/tog-pegasus/sbin/cimprovagt"
+# define PEGASUS_PROVIDER_AGENT_PROC_NAME "/usr/sbin/cimprovagt"
# elif defined(PEGASUS_OS_LSB)
# define PEGASUS_SSLCLIENT_CERTIFICATEFILE "/etc/opt/lsb-pegasus/client.pem"
# undef PEGASUS_SSLCLIENT_RANDOMFILE
--- pegasus-2.5/src/Pegasus/Common/System.cpp.redhat 2005-06-06 10:27:55.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Common/System.cpp 2005-10-03 12:29:48.000000000 -0400
@@ -144,13 +144,13 @@
char *System::extract_file_path(const char *fullpath, char *dirname)
{
char *p;
- char buff[2048];
+ char buff[PEGASUS_PATH_MAX];
if (fullpath == NULL)
{
dirname[0] = '\0';
return dirname;
}
- strcpy(buff, fullpath);
+ strncpy(buff, fullpath, PEGASUS_PATH_MAX);
for(p = buff + strlen(buff); p >= buff; p--)
{
if (*p == '\\' || *p == '/')
--- pegasus-2.5/src/Pegasus/Common/Platform_LINUX_IX86_GNU.h.redhat 2005-02-26 00:22:13.000000000 -0500
+++ pegasus-2.5/src/Pegasus/Common/Platform_LINUX_IX86_GNU.h 2005-10-03 12:29:48.000000000 -0400
@@ -72,9 +72,12 @@
#include <stdio.h>
#include <stdlib.h>
#include <sys/param.h> // For MAXHOSTNAMELEN
-
+#include <limits.h> // For _POSIX_HOST_NAME_LEN
#if defined(PEGASUS_OS_LSB) && !defined(MAXHOSTNAMELEN)
-#define PEGASUS_MAXHOSTNAMELEN 64
+#if defined(_POSIX_HOST_NAME_MAX)
+#define PEGASUS_MAXHOSTNAMELEN (_POSIX_HOST_NAME_MAX+1)
+#else
+#define PEGASUS_MAXHOSTNAMELEN 256
+#endif
#endif
-
#endif /* Pegasus_Platform_LINUX_IX86_GNU_h */
--- pegasus-2.5/src/Pegasus/Common/SystemUnix.cpp.redhat 2005-07-19 15:31:26.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Common/SystemUnix.cpp 2005-10-03 12:29:48.000000000 -0400
@@ -566,7 +566,7 @@
if ((he = gethostbyname (hostName)))
{
- strcpy (hostName, he->h_name);
+ strncpy (hostName, he->h_name, PEGASUS_MAXHOSTNAMELEN);
}
#if defined(PEGASUS_OS_OS400)
--- pegasus-2.5/src/Pegasus/Common/Config.h.redhat 2005-05-05 14:18:42.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Common/Config.h 2005-10-03 12:29:48.000000000 -0400
@@ -182,6 +182,13 @@
#define PEGASUS_MAXHOSTNAMELEN MAXHOSTNAMELEN
#endif
+#ifndef PEGASUS_PATH_MAX
+#ifndef PATH_MAX
+#define PEGASUS_PATH_MAX 4096
+#else
+#define PEGASUS_PATH_MAX PATH_MAX
+#endif
+#endif
#ifdef __cplusplus
PEGASUS_NAMESPACE_BEGIN
--- pegasus-2.5/src/Providers/ManagedSystem/ComputerSystem/ComputerSystem_Linux.cpp.redhat 2005-03-02 13:17:32.000000000 -0500
+++ pegasus-2.5/src/Providers/ManagedSystem/ComputerSystem/ComputerSystem_Linux.cpp 2005-10-03 12:29:48.000000000 -0400
@@ -310,7 +310,7 @@
he=gethostbyname(hostName);
if (he)
{
- strcpy(hostName, he->h_name);
+ strncpy(hostName, he->h_name, PEGASUS_MAXHOSTNAMELEN);
}
_hostName.assign(hostName);
--- pegasus-2.5/src/Providers/ManagedSystem/OperatingSystem/OperatingSystem_Linux.cpp.redhat 2005-02-05 18:01:03.000000000 -0500
+++ pegasus-2.5/src/Providers/ManagedSystem/OperatingSystem/OperatingSystem_Linux.cpp 2005-10-03 12:29:48.000000000 -0400
@@ -172,7 +172,7 @@
he=gethostbyname(hostName);
if (he)
{
- strcpy(hostName, he->h_name);
+ strncpy(hostName, he->h_name, PEGASUS_MAXHOSTNAMELEN);
}
csName.assign(hostName);
--- pegasus-2.5/src/Providers/ManagedSystem/Process/Process_Linux.cpp.redhat 2005-07-15 16:46:54.000000000 -0400
+++ pegasus-2.5/src/Providers/ManagedSystem/Process/Process_Linux.cpp 2005-10-03 12:29:48.000000000 -0400
@@ -782,7 +782,7 @@
he=gethostbyname(hostName);
if (he)
{
- strcpy(hostName, he->h_name);
+ strncpy(hostName, he->h_name, PEGASUS_MAXHOSTNAMELEN);
}
csName.assign(hostName);
--- pegasus-2.5/src/Clients/repupgrade/RepositoryUpgrade.cpp.redhat 2005-06-03 16:04:34.000000000 -0400
+++ pegasus-2.5/src/Clients/repupgrade/RepositoryUpgrade.cpp 2005-10-03 12:29:48.000000000 -0400
@@ -2075,7 +2075,7 @@
fileName = _pegasusHome + "/bin/" +
FileSystem::buildLibraryFileName(moduleName);
#else
- fileName = _pegasusHome + "/lib/" +
+ fileName = _pegasusHome + PEGASUS_DEST_LIB_DIR +
FileSystem::buildLibraryFileName(moduleName);
#endif
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/tog-pegasus/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 20 Jan 2005 02:41:52 -0000 1.2
+++ .cvsignore 3 Oct 2005 17:52:26 -0000 1.3
@@ -1 +1,2 @@
tog-pegasus-2.4.1.Beta-1.tar.gz
+pegasus-2.5.tar.gz
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/tog-pegasus/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 30 May 2005 21:21:15 -0000 1.3
+++ sources 3 Oct 2005 17:52:26 -0000 1.4
@@ -1 +1 @@
-303eef5aeb5b2156467a382911467bba tog-pegasus-2.4.1-1.tar.gz
+0b068fd576f199f8a0946e2f659acfe4 pegasus-2.5.tar.gz
Index: tog-pegasus.spec
===================================================================
RCS file: /cvs/dist/rpms/tog-pegasus/devel/tog-pegasus.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- tog-pegasus.spec 2 Sep 2005 19:02:05 -0000 1.5
+++ tog-pegasus.spec 3 Oct 2005 17:52:26 -0000 1.6
@@ -1,45 +1,7 @@
-#%2005////////////////////////////////////////////////////////////////////////
+################################################################################
#
-# 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.
+# OpenPegasus (Red Hat release) RPM .spec file
#
-# 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.
-#
-#==============================================================================
-#%/////////////////////////////////////////////////////////////////////////////
-#
-# tog-pegasus.spec
-#
-# Package spec for PEGASUS 2.4
-#%/////////////////////////////////////////////////////////////////////////////
-#
-# Modified for Red Hat tog-pegasus distribution
-#
-# Jason Vas Dias <jvdias at redhat.com>
-#
-# Copyright(C) Red Hat Inc. 2005
-#
-#%/////////////////////////////////////////////////////////////////////////////
%{?!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
@@ -47,64 +9,32 @@
# 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) and running after installation.
+# (chkconfig --level=345 tog-pegasus on) 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: 4.FC5
-Epoch: 1
-Group: Systems Management/Base
-License: Open Group Pegasus Open Source
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}
-Source: ftp://www.opengroup.org/pegasus/tog-pegasus-%{version}-%{srcRelease}.tar.gz
-Patch0: tog-pegasus-2.4.1.Beta-3.condrestart.patch
-Patch1: tog-pegasus-2.4.1.Beta-3.ppc64.patch
-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-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 pam-devel
-BuildConflicts: tog-pegasus
-Requires(post): openssl lsb coreutils bash
+Summary: OpenPegasus WBEM Services for Linux
+Name: tog-pegasus
+Version: 2.5
+Release: 1
+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
+BuildConflicts: tog-pegasus tog-pegasus-devel
+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
%description
OpenPegasus WBEM Services for Linux enables management solutions that deliver
@@ -116,9 +46,7 @@
%package devel
Summary: The OpenPegasus Software Development Kit
Group: Systems Management/Base
-Autoreq: 0
-Requires: tog-pegasus >= 2.4
-Obsoletes: tog-pegasus-sdk
+Requires: tog-pegasus >= 2.5
%description devel
The OpenPegasus WBEM Services for Linux SDK is the developer's kit for the OpenPegasus WBEM
@@ -129,1169 +57,172 @@
%package test
Summary: The OpenPegasus Tests
Group: Systems Management/Base
-Autoreq: 0
-Requires: tog-pegasus >= 2.4
+Autoreq: 0
+Requires: tog-pegasus >= 2.5
%description test
-The OpenPegasus WBEM tests for the OpenPegasus 2.4 Linux rpm.
+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. ***
+**********************************************************************************
%endif
%prep
-[ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT;
-%setup -q -n %{name}-%{version}
-export PEGASUS_ROOT=$RPM_BUILD_DIR/$RPM_PACKAGE_NAME-$RPM_PACKAGE_VERSION
-%patch0 -p1 -b .condrestart
-%patch1 -p1 -b .ppc64
-%patch2 -p1 -b .noecho
-%patch3 -p1 -b .execshield
-%patch4 -p1 -b .de-opt
-%patch5 -p1 -b .remove_socket
-%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
+%setup -q -n %{srcname}-%{version}
+%patch0 -p1 -b .redhat
+%patch1 -p1 -b .local_or_remote_auth
+%patch2 -p1 -b .make_install
%build
-export PEGASUS_EXTRA_C_FLAGS="$RPM_OPT_FLAGS -g -fPIC"
-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
-%ifarch ppc
-%define PEGASUS_HARDWARE_PLATFORM LINUX_PPC_GNU
-%else
-%ifarch ppc64 pseries
-%define PEGASUS_HARDWARE_PLATFORM LINUX_PPC64_GNU
-%else
-%ifarch s390
-%define PEGASUS_HARDWARE_PLATFORM LINUX_ZSERIES_GNU
-export PEGASUS_EXTRA_C_FLAGS="$PEGASUS_EXTRA_C_FLAGS -fsigned-char"
-export PEGASUS_EXTRA_CXX_FLAGS="$PEGASUS_EXTRA_C_FLAGS"
-%else
-%ifarch s390x zseries
-%define PEGASUS_HARDWARE_PLATFORM LINUX_ZSERIES64_GNU
-export PEGASUS_EXTRA_C_FLAGS="$PEGASUS_EXTRA_C_FLAGS -fsigned-char"
-export PEGASUS_EXTRA_CXX_FLAGS="$PEGASUS_EXTRA_C_FLAGS"
-%else
-%define PEGASUS_HARDWARE_PLATFORM LINUX_IX86_GNU
-%endif
-%endif
-%endif
-%endif
-%endif
-export PEGASUS_PLATFORM=%PEGASUS_HARDWARE_PLATFORM
-
-export OPENSSL_HOME=/usr
-export PEGASUS_HAS_SSL=yes
-
-# per bug #368
-export PEGASUS_USE_RELEASE_DIRS=true
-export PEGASUS_USE_RELEASE_CONFIG_OPTIONS=true
-export SYS_INCLUDES=-I/usr/kerberos/include
-
-# per PEP #144
-export PEGASUS_PAM_AUTHENTICATION=true
-export PEGASUS_USE_PAM_STANDALONE_PROC=true
-export PEGASUS_LOCAL_DOMAIN_SOCKET=true
-export PEGASUS_USE_SYSLOGS=true
-export PEGASUS_ENABLE_CMPI_PROVIDER_MANAGER=true
-
-# per PEP #174
-export PEGASUS_ENABLE_USERGROUP_AUTHORIZATION=true
-export PEGASUS_HAS_PERFSTATS=true
-export PEGASUS_NOASSERTS=true
-
+rm -rf $RPM_BUILD_ROOT
+export RPM_ARCH_LIB=%{_lib}
+. %SOURCE1
make
-
export LD_LIBRARY_PATH=$PEGASUS_HOME/%{_lib}
export PATH=$PEGASUS_HOME/bin:$PATH
make repository
-
-%define PEGASUS_DATA_DIR /usr/share/Pegasus
-%define PEGASUS_STAGING_DIR $PEGASUS_HOME/stageSDK
-%define PEGASUS_SAMPLES_DIR %PEGASUS_DATA_DIR/samples
-%define PEGASUS_HTML_DIR %PEGASUS_DATA_DIR/html
-%define PEGASUS_INCLUDE_DIR /usr/include
-
-make --directory=mak -f SDKMakefile stageSDK \
- PEGASUS_STAGING_DIR=%PEGASUS_STAGING_DIR \
- PEGASUS_SAMPLES_DIR=%PEGASUS_SAMPLES_DIR \
- PEGASUS_INCLUDE_DIR=%PEGASUS_INCLUDE_DIR \
- PEGASUS_HTML_DIR=%PEGASUS_HTML_DIR
+make --directory=mak -f SDKMakefile stageSDK
%if %{WITH_TEST}
-make --directory=$PEGASUS_ROOT -f Makefile.ReleaseTest stageTEST \
- PEGASUS_ENVVAR_FILE=$PEGASUS_ROOT/env_var_Linux.status
+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
%endif
%install
-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_PROVIDER_LIB_DIR %PEGASUS_PROVIDER_DIR
-%define PEGASUS_SBIN_DIR %PEGASUS_PROD_DIR/sbin
-%define PEGASUS_BIN_DIR %PEGASUS_PROD_DIR/bin
-%define PEGASUS_PRODSHARE_DIR %PEGASUS_PROD_DIR/share
-%define PEGASUS_MAN_DIR %PEGASUS_PRODSHARE_DIR/man
-%define PEGASUS_MANUSER_DIR %PEGASUS_MAN_DIR/man1
-%define PEGASUS_MANADMIN_DIR %PEGASUS_MAN_DIR/man8
-%define PEGASUS_VARDATA_DIR /var/lib/Pegasus
-%define PEGASUS_REPOSITORY_DIR %PEGASUS_VARDATA_DIR/repository
-%define PEGASUS_PREV_REPOSITORY_DIR %PEGASUS_VARDATA_DIR/prev_repository
-%define PEGASUS_VARDATA_CACHE_DIR %PEGASUS_VARDATA_DIR/cache
-%define PEGASUS_LOCAL_AUTH_DIR %PEGASUS_VARDATA_CACHE_DIR/localauth
-%define PEGASUS_MOF_DIR %PEGASUS_DATA_DIR/mof
-%define PEGASUS_CONFIG_DIR /etc/Pegasus
-%define PEGASUS_VARRUN_DIR /var/run/tog-pegasus
-%define PEGASUS_LOCAL_DOMAIN_SOCKET_DIR %PEGASUS_VARRUN_DIR
-%define PAM_CONF /etc/pam.d
-%define PEGASUS_LOG_DIR /var/log/Pegasus
-%define PEGASUS_LICENSE_FILE license.txt
-%define PEGASUS_PLANNED_CONFIG_FILE cimserver_planned.conf
-%define PEGASUS_PEM_DIR %PEGASUS_CONFIG_DIR
-%define PEGASUS_SSL_KEY_FILE file.pem
-%define PEGASUS_SSL_CERT_FILE server.pem
-%define PEGASUS_SSL_TRUSTSTORE client.pem
-%define PEGASUS_INSTALL_SCRIPT_DIR $PEGASUS_HOME/scripts
-%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_MAK_DIR %PEGASUS_TEST_DIR/mak
-
-#
-# Make directories
-mkdir -p $RPM_BUILD_ROOT%PEGASUS_VARDATA_DIR/{cache,repository}
-mkdir -p $RPM_BUILD_ROOT/%PEGASUS_LOCAL_AUTH_DIR
-mkdir -p $RPM_BUILD_ROOT/%PEGASUS_PROVIDER_LIB_DIR
-mkdir -p $RPM_BUILD_ROOT/%PEGASUS_CONFIG_DIR
-mkdir -p $RPM_BUILD_ROOT/%PEGASUS_LOG_DIR
-mkdir -p $RPM_BUILD_ROOT/%PEGASUS_MAN_DIR/{man1,man8}
-mkdir -p $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/{CIM28,Pegasus}
-mkdir -p $RPM_BUILD_ROOT%PEGASUS_LOCAL_DOMAIN_SOCKET_DIR
-
-#
-# Init scripts
-install -D -m 0755 $PEGASUS_ROOT/rpm/tog-pegasus.rc $RPM_BUILD_ROOT/etc/init.d/tog-pegasus
-
-#
-# Programs
-install -D -m 0744 $PEGASUS_HOME/bin/cimauth $RPM_BUILD_ROOT%PEGASUS_SBIN_DIR/cimauth
-install -D -m 0744 $PEGASUS_HOME/bin/cimserver $RPM_BUILD_ROOT%PEGASUS_SBIN_DIR/cimserver
-install -D -m 0744 $PEGASUS_HOME/bin/cimservera $RPM_BUILD_ROOT%PEGASUS_SBIN_DIR/cimservera
-install -D -m 0744 $PEGASUS_HOME/bin/cimuser $RPM_BUILD_ROOT%PEGASUS_SBIN_DIR/cimuser
-install -D -m 0744 $PEGASUS_HOME/bin/cimconfig $RPM_BUILD_ROOT%PEGASUS_SBIN_DIR/cimconfig
-install -D -m 0744 $PEGASUS_HOME/bin/cimprovagt $RPM_BUILD_ROOT%PEGASUS_SBIN_DIR/cimprovagt
-install -D -m 0755 $PEGASUS_HOME/bin/cimmof $RPM_BUILD_ROOT%PEGASUS_BIN_DIR/cimmof
-install -D -m 0755 $PEGASUS_HOME/bin/cimmofl $RPM_BUILD_ROOT%PEGASUS_BIN_DIR/cimmofl
-install -D -m 0755 $PEGASUS_HOME/bin/cimprovider $RPM_BUILD_ROOT%PEGASUS_BIN_DIR/cimprovider
-install -D -m 0755 $PEGASUS_HOME/bin/osinfo $RPM_BUILD_ROOT%PEGASUS_BIN_DIR/osinfo
-install -D -m 0755 $PEGASUS_HOME/bin/wbemexec $RPM_BUILD_ROOT%PEGASUS_BIN_DIR/wbemexec
-
-#
-# 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}/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
-#
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/Application28_AppRuntime.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/Application28_AppRuntime.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/Application28_BIOS.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/Application28_BIOS.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/Application28_CheckAction.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/Application28_CheckAction.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/Application28_DeploymentModel.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/Application28_DeploymentModel.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/Application28_InstalledProduct.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/Application28_InstalledProduct.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/Application28_J2eeAppServer.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/Application28_J2eeAppServer.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/Application28_J2eeAppServerStats.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/Application28_J2eeAppServerStats.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/Application28_SystemSoftware.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/Application28_SystemSoftware.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/CIM_Application28.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/CIM_Application28.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/CIM_Core28.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/CIM_Core28.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/CIM_Database28.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/CIM_Database28.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/CIM_Device28.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/CIM_Device28.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/CIM_Event28.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/CIM_Event28.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/CIM_Interop28.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/CIM_Interop28.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/CIM_IPsecPolicy28.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/CIM_IPsecPolicy28.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/CIM_Metrics28.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/CIM_Metrics28.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/CIM_Network28.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/CIM_Network28.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/CIM_Physical28.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/CIM_Physical28.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/CIM_Policy28.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/CIM_Policy28.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/CIM_Schema28.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/CIM_Schema28.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/CIM_Support28.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/CIM_Support28.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/CIM_System28.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/CIM_System28.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/CIM_User28.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/CIM_User28.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/Core28_Capabilities.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/Core28_Capabilities.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/Core28_Collection.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/Core28_Collection.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/Core28_CoreElements.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/Core28_CoreElements.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/Core28_Device.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/Core28_Device.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/Core28_MethodParms.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/Core28_MethodParms.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/Core28_Physical.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/Core28_Physical.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/Core28_PowerMgmt.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/Core28_PowerMgmt.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/Core28_ProductFRU.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/Core28_ProductFRU.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/Core28_Qualifiers.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/Core28_Qualifiers.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/Core28_Redundancy.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/Core28_Redundancy.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/Core28_Service.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/Core28_Service.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/Core28_Settings.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/Core28_Settings.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/Core28_Software.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/Core28_Software.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/Core28_Statistics.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/Core28_Statistics.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/Core28_StorageExtent.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/Core28_StorageExtent.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/Database28_Statistics.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/Database28_Statistics.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/Database28_Storage.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/Database28_Storage.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/Database28_System.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/Database28_System.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/Device28_Controller.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/Device28_Controller.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/Device28_CoolingAndPower.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/Device28_CoolingAndPower.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/Device28_DeviceElements.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/Device28_DeviceElements.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/Device28_DiskGroup.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/Device28_DiskGroup.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/Device28_FC.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/Device28_FC.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/Device28_IB.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/Device28_IB.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/Device28_Memory.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/Device28_Memory.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/Device28_Modems.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/Device28_Modems.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/Device28_NetworkAdapter.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/Device28_NetworkAdapter.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/Device28_Ports.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/Device28_Ports.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/Device28_Printing.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/Device28_Printing.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/Device28_Processor.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/Device28_Processor.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/Device28_ProtocolController.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/Device28_ProtocolController.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/Device28_SccExtents.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/Device28_SccExtents.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/Device28_Sensors.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/Device28_Sensors.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/Device28_StorageDevices.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/Device28_StorageDevices.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/Device28_StorageExtents.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/Device28_StorageExtents.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/Device28_StorageLib.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/Device28_StorageLib.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/Device28_StorageServices.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/Device28_StorageServices.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/Device28_USB.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/Device28_USB.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/Device28_UserDevices.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/Device28_UserDevices.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/Metrics28_BaseMetric.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/Metrics28_BaseMetric.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/Metrics28_UnitOfWork.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/Metrics28_UnitOfWork.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/Network28_BGP.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/Network28_BGP.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/Network28_Buffers.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/Network28_Buffers.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/Network28_Collections.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/Network28_Collections.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/Network28_Filtering.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/Network28_Filtering.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/Network28_IPsec.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/Network28_IPsec.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/Network28_OSPF.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/Network28_OSPF.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/Network28_Pipes.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/Network28_Pipes.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/Network28_ProtocolEndpoints.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/Network28_ProtocolEndpoints.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/Network28_QoS.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/Network28_QoS.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/Network28_Routes.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/Network28_Routes.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/Network28_RoutingForwarding.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/Network28_RoutingForwarding.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/Network28_SNMP.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/Network28_SNMP.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/Network28_SwitchingBridging.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/Network28_SwitchingBridging.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/Network28_Systems.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/Network28_Systems.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/Network28_VLAN.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/Network28_VLAN.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/Physical28_Component.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/Physical28_Component.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/Physical28_Connector.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/Physical28_Connector.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/Physical28_Link.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/Physical28_Link.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/Physical28_Misc.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/Physical28_Misc.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/Physical28_Package.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/Physical28_Package.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/Physical28_PhysicalMedia.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/Physical28_PhysicalMedia.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/Physical28_StoragePackage.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/Physical28_StoragePackage.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/System28_Boot.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/System28_Boot.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/System28_Diagnostics.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/System28_Diagnostics.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/System28_FileElements.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/System28_FileElements.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/System28_Logs.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/System28_Logs.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/System28_OperatingSystem.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/System28_OperatingSystem.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/System28_Processing.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/System28_Processing.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/System28_SystemElements.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/System28_SystemElements.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/System28_SystemResources.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/System28_SystemResources.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/System28_Time.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/System28_Time.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/System28_Unix.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/System28_Unix.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/User28_AccessControl.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/User28_AccessControl.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/User28_Account.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/User28_Account.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/User28_AuthenticationReqmt.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/User28_AuthenticationReqmt.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/User28_Credential.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/User28_Credential.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/User28_Group.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/User28_Group.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/User28_Identity.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/User28_Identity.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/User28_Kerberos.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/User28_Kerberos.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/User28_Org.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/User28_Org.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/User28_PrivilegeManagementService.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/User28_PrivilegeManagementService.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/User28_Privilege.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/User28_Privilege.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/User28_PublicKey.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/User28_PublicKey.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/User28_Role.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/User28_Role.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/User28_SecurityLevel.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/User28_SecurityLevel.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/User28_SecurityServices.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/User28_SecurityServices.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/User28_SharedSecret.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/User28_SharedSecret.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/User28_StorageHardwareID.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/User28_StorageHardwareID.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/CIM28/User28_UsersAccess.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/CIM28/User28_UsersAccess.mof
-
-#
-# Pegasus' schema
-#
-
-# Internal:
-install -D -m 0444 $PEGASUS_ROOT/Schemas/Pegasus/Internal/VER20/PG_Authorization20.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/Pegasus/PG_Authorization20.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/Pegasus/Internal/VER20/PG_ConfigSetting20.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/Pegasus/PG_ConfigSetting20.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/Pegasus/Internal/VER20/PG_InternalSchema20.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/Pegasus/PG_InternalSchema20.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/Pegasus/Internal/VER20/PG_ShutdownService20.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/Pegasus/PG_ShutdownService20.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/Pegasus/Internal/VER20/PG_User20.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/Pegasus/PG_User20.mof
-
-# InterOp:
-install -D -m 0444 $PEGASUS_ROOT/Schemas/Pegasus/InterOp/VER20/PG_Events20.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/Pegasus/PG_Events20.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/Pegasus/InterOp/VER20/PG_InterOpSchema20.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/Pegasus/PG_InterOpSchema20.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/Pegasus/InterOp/VER20/PG_ProviderModule20.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/Pegasus/PG_ProviderModule20.mof
-
-#
-# Pegasus Default Providers' schema
-#
-install -D -m 0444 $PEGASUS_ROOT/Schemas/Pegasus/ManagedSystem/VER20/PG_ComputerSystem20.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/Pegasus/PG_ComputerSystem20.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/Pegasus/ManagedSystem/VER20/PG_ComputerSystem20R.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/Pegasus/PG_ComputerSystem20R.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/Pegasus/ManagedSystem/VER20/PG_ManagedSystemSchema20.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/Pegasus/PG_ManagedSystemSchema20.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/Pegasus/ManagedSystem/VER20/PG_ManagedSystemSchema20R.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/Pegasus/PG_ManagedSystemSchema20R.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/Pegasus/ManagedSystem/VER20/PG_OperatingSystem20.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/Pegasus/PG_OperatingSystem20.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/Pegasus/ManagedSystem/VER20/PG_OperatingSystem20R.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/Pegasus/PG_OperatingSystem20R.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/Pegasus/ManagedSystem/VER20/PG_UnixProcess20.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/Pegasus/PG_UnixProcess20.mof
-install -D -m 0444 $PEGASUS_ROOT/Schemas/Pegasus/ManagedSystem/VER20/PG_UnixProcess20R.mof $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/Pegasus/PG_UnixProcess20R.mof
-#
-# Initial Repository
-#
-mkdir -p $RPM_BUILD_ROOT%PEGASUS_REPOSITORY_DIR
-cp -rf $PEGASUS_HOME/repository/* $RPM_BUILD_ROOT%PEGASUS_REPOSITORY_DIR
-
-#
-# cimserver config files
-#
-install -D -m 0644 $PEGASUS_ROOT/src/Server/%PEGASUS_PLANNED_CONFIG_FILE $RPM_BUILD_ROOT%PEGASUS_CONFIG_DIR/%PEGASUS_PLANNED_CONFIG_FILE
-
-#
-# WBEM pam authentication
-#
-install -D -m 0644 $PEGASUS_ROOT/rpm/wbem $RPM_BUILD_ROOT%PAM_CONF/wbem
+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
+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
+:;
-#
-# repository install script
-#
-echo "PEGASUS_MOF_DIR="%PEGASUS_MOF_DIR > initrepository.in
-echo "PEGASUS_REPOSITORY_DIR="%PEGASUS_REPOSITORY_DIR >> initrepository.in
-echo "PEGASUS_BIN_DIR="%PEGASUS_BIN_DIR >> initrepository.in
-echo "PEGASUS_CIM_SCHEMA=28" >> initrepository.in
-cat initrepository.in installs/scripts/init_repository > $RPM_BUILD_ROOT%PEGASUS_SBIN_DIR/init_repository
-chmod 0744 $RPM_BUILD_ROOT%PEGASUS_SBIN_DIR/init_repository
+%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
+%ghost %config(noreplace) /etc/Pegasus/cimserver_current.conf
+%ghost %config(noreplace) /etc/Pegasus/cimserver_planned.conf
+%config(noreplace) /etc/Pegasus/access.conf
+%config(noreplace) /etc/pam.d/wbem
+%ghost /etc/Pegasus/ssl.cnf
+%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
+/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
+%attr(0755,root,pegasus) /usr/%{_lib}/Pegasus/providers/*.so.*
+/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
-#
-# script to add tog-pegasus paths to /etc/profile
-#
-# install -D -m 0744 installs/scripts/settogpath $RPM_BUILD_ROOT%PEGASUS_SBIN_DIR/settogpath
-# No longer required now that tog-pegasus paths are sane.
-#
-# doc files
-#
-#install -D -m 0444 doc/Admin_Guide_Release_2.4.pdf $RPM_BUILD_ROOT%PEGASUS_DOC_DIR/Admin_Guide_Release_2.4.pdf
-# let %doc do it!
-#
-#
+%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
-# man pages
-#
-install -D -m 0444 rpm/manLinux/man1.Z/cimmof.1 $RPM_BUILD_ROOT%PEGASUS_MANUSER_DIR/cimmof.1
-install -D -m 0444 rpm/manLinux/man1.Z/cimprovider.1 $RPM_BUILD_ROOT%PEGASUS_MANUSER_DIR/cimprovider.1
-install -D -m 0444 rpm/manLinux/man1.Z/osinfo.1 $RPM_BUILD_ROOT%PEGASUS_MANUSER_DIR/osinfo.1
-install -D -m 0444 rpm/manLinux/man1.Z/wbemexec.1 $RPM_BUILD_ROOT%PEGASUS_MANUSER_DIR/wbemexec.1
-install -D -m 0444 rpm/manLinux/man8.Z/cimauth.8 $RPM_BUILD_ROOT%PEGASUS_MANADMIN_DIR/cimauth.8
-install -D -m 0444 rpm/manLinux/man8.Z/cimconfig.8 $RPM_BUILD_ROOT%PEGASUS_MANADMIN_DIR/cimconfig.8
-install -D -m 0444 rpm/manLinux/man8.Z/cimserver.8 $RPM_BUILD_ROOT%PEGASUS_MANADMIN_DIR/cimserver.8
+%if %{WITH_TEST}
-#install -D -m 0444 doc/%PEGASUS_LICENSE_FILE $RPM_BUILD_ROOT%PEGASUS_DOC_DIR/%PEGASUS_LICENSE_FILE
-# let %doc do it!
+%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
-#
-# SDK
-#
+%files test
+%defattr(-,root,root,-)
+/var/lib/Pegasus/testrepository
+/usr/share/Pegasus/test
-%define INCLUDE_DEST_PATH $RPM_BUILD_ROOT%PEGASUS_INCLUDE_DIR
-%define HTML_DEST_PATH $RPM_BUILD_ROOT%PEGASUS_HTML_DIR
-%define SAMPLES_DEST_PATH $RPM_BUILD_ROOT%PEGASUS_SAMPLES_DIR
-mkdir -p %INCLUDE_DEST_PATH/Pegasus/{Client,Common,Consumer,Handler,Provider}
-mkdir -p %HTML_DEST_PATH
-mkdir -p %SAMPLES_DEST_PATH/{Clients,mak,Providers}
-mkdir -p %SAMPLES_DEST_PATH/Providers/Load
-install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_INCLUDE_DIR/Pegasus/Client/CIMClientException.h %INCLUDE_DEST_PATH/Pegasus/Client/CIMClientException.h
-install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_INCLUDE_DIR/Pegasus/Client/CIMClient.h %INCLUDE_DEST_PATH/Pegasus/Client/CIMClient.h
-install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_INCLUDE_DIR/Pegasus/Client/Linkage.h %INCLUDE_DEST_PATH/Pegasus/Client/Linkage.h
-install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_INCLUDE_DIR/Pegasus/Common/AcceptLanguages.h %INCLUDE_DEST_PATH/Pegasus/Common/AcceptLanguages.h
-install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_INCLUDE_DIR/Pegasus/Common/AcceptLanguageElement.h %INCLUDE_DEST_PATH/Pegasus/Common/AcceptLanguageElement.h
-install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_INCLUDE_DIR/Pegasus/Common/Array.h %INCLUDE_DEST_PATH/Pegasus/Common/Array.h
-install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_INCLUDE_DIR/Pegasus/Common/ArrayInter.h %INCLUDE_DEST_PATH/Pegasus/Common/ArrayInter.h
-install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_INCLUDE_DIR/Pegasus/Common/Char16.h %INCLUDE_DEST_PATH/Pegasus/Common/Char16.h
-install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_INCLUDE_DIR/Pegasus/Common/CIMClass.h %INCLUDE_DEST_PATH/Pegasus/Common/CIMClass.h
-install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_INCLUDE_DIR/Pegasus/Common/CIMDateTime.h %INCLUDE_DEST_PATH/Pegasus/Common/CIMDateTime.h
-install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_INCLUDE_DIR/Pegasus/Common/CIMFlavor.h %INCLUDE_DEST_PATH/Pegasus/Common/CIMFlavor.h
-install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_INCLUDE_DIR/Pegasus/Common/CIMIndication.h %INCLUDE_DEST_PATH/Pegasus/Common/CIMIndication.h
-install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_INCLUDE_DIR/Pegasus/Common/CIMInstance.h %INCLUDE_DEST_PATH/Pegasus/Common/CIMInstance.h
-install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_INCLUDE_DIR/Pegasus/Common/CIMMethod.h %INCLUDE_DEST_PATH/Pegasus/Common//CIMMethod.h
-install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_INCLUDE_DIR/Pegasus/Common/CIMName.h %INCLUDE_DEST_PATH/Pegasus/Common/CIMName.h
-install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_INCLUDE_DIR/Pegasus/Common/CIMObject.h %INCLUDE_DEST_PATH/Pegasus/Common/CIMObject.h
-install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_INCLUDE_DIR/Pegasus/Common/CIMObjectPath.h %INCLUDE_DEST_PATH/Pegasus/Common/CIMObjectPath.h
-install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_INCLUDE_DIR/Pegasus/Common/CIMParameter.h %INCLUDE_DEST_PATH/Pegasus/Common/CIMParameter.h
-install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_INCLUDE_DIR/Pegasus/Common/CIMParamValue.h %INCLUDE_DEST_PATH/Pegasus/Common/CIMParamValue.h
-install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_INCLUDE_DIR/Pegasus/Common/CIMProperty.h %INCLUDE_DEST_PATH/Pegasus/Common/CIMProperty.h
-install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_INCLUDE_DIR/Pegasus/Common/CIMPropertyList.h %INCLUDE_DEST_PATH/Pegasus/Common/CIMPropertyList.h
-install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_INCLUDE_DIR/Pegasus/Common/CIMQualifierDecl.h %INCLUDE_DEST_PATH/Pegasus/Common/CIMQualifierDecl.h
-install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_INCLUDE_DIR/Pegasus/Common/CIMQualifier.h %INCLUDE_DEST_PATH/Pegasus/Common/CIMQualifier.h
-install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_INCLUDE_DIR/Pegasus/Common/CIMScope.h %INCLUDE_DEST_PATH/Pegasus/Common/CIMScope.h
-install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_INCLUDE_DIR/Pegasus/Common/CIMStatusCode.h %INCLUDE_DEST_PATH/Pegasus/Common/CIMStatusCode.h
-install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_INCLUDE_DIR/Pegasus/Common/CIMType.h %INCLUDE_DEST_PATH/Pegasus/Common/CIMType.h
-install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_INCLUDE_DIR/Pegasus/Common/CIMValue.h %INCLUDE_DEST_PATH/Pegasus/Common/CIMValue.h
-install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_INCLUDE_DIR/Pegasus/Common/Config.h %INCLUDE_DEST_PATH/Pegasus/Common/Config.h
-install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_INCLUDE_DIR/Pegasus/Common/ContentLanguageElement.h %INCLUDE_DEST_PATH/Pegasus/Common/ContentLanguageElement.h
-install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_INCLUDE_DIR/Pegasus/Common/ContentLanguages.h %INCLUDE_DEST_PATH/Pegasus/Common/ContentLanguages.h
-install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_INCLUDE_DIR/Pegasus/Common/Exception.h %INCLUDE_DEST_PATH/Pegasus/Common/Exception.h
-install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_INCLUDE_DIR/Pegasus/Common/Formatter.h %INCLUDE_DEST_PATH/Pegasus/Common/Formatter.h
-install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_INCLUDE_DIR/Pegasus/Common/LanguageElementContainer.h %INCLUDE_DEST_PATH/Pegasus/Common/LanguageElementContainer.h
-install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_INCLUDE_DIR/Pegasus/Common/LanguageElement.h %INCLUDE_DEST_PATH/Pegasus/Common/LanguageElement.h
-install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_INCLUDE_DIR/Pegasus/Common/Linkage.h %INCLUDE_DEST_PATH/Pegasus/Common/Linkage.h
-install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_INCLUDE_DIR/Pegasus/Common/MessageLoader.h %INCLUDE_DEST_PATH/Pegasus/Common/MessageLoader.h
-install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_INCLUDE_DIR/Pegasus/Common/OperationContext.h %INCLUDE_DEST_PATH/Pegasus/Common/OperationContext.h
-install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_INCLUDE_DIR/Pegasus/Common/Platform_%PEGASUS_HARDWARE_PLATFORM.h %INCLUDE_DEST_PATH/Pegasus/Common/Platform_%PEGASUS_HARDWARE_PLATFORM.h
-install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_INCLUDE_DIR/Pegasus/Common/ResponseHandler.h %INCLUDE_DEST_PATH/Pegasus/Common/ResponseHandler.h
-install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_INCLUDE_DIR/Pegasus/Common/SSLContext.h %INCLUDE_DEST_PATH/Pegasus/Common/SSLContext.h
-install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_INCLUDE_DIR/Pegasus/Common/String.h %INCLUDE_DEST_PATH/Pegasus/Common/String.h
-install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_INCLUDE_DIR/Pegasus/Consumer/CIMIndicationConsumer.h %INCLUDE_DEST_PATH/Pegasus/Consumer/CIMIndicationConsumer.h
-install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_INCLUDE_DIR/Pegasus/Consumer/Linkage.h %INCLUDE_DEST_PATH/Pegasus/Consumer/Linkage.h
-install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_INCLUDE_DIR/Pegasus/Provider/CIMAssociationProvider.h %INCLUDE_DEST_PATH/Pegasus/Provider/CIMAssociationProvider.h
-install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_INCLUDE_DIR/Pegasus/Provider/CIMIndicationConsumerProvider.h %INCLUDE_DEST_PATH/Pegasus/Provider/CIMIndicationConsumerProvider.h
-install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_INCLUDE_DIR/Pegasus/Provider/CIMIndicationProvider.h %INCLUDE_DEST_PATH/Pegasus/Provider/CIMIndicationProvider.h
-install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_INCLUDE_DIR/Pegasus/Provider/CIMInstanceProvider.h %INCLUDE_DEST_PATH/Pegasus/Provider/CIMInstanceProvider.h
-install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_INCLUDE_DIR/Pegasus/Provider/CIMMethodProvider.h %INCLUDE_DEST_PATH/Pegasus/Provider/CIMMethodProvider.h
-install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_INCLUDE_DIR/Pegasus/Provider/CIMOMHandle.h %INCLUDE_DEST_PATH/Pegasus/Provider/CIMOMHandle.h
-install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_INCLUDE_DIR/Pegasus/Provider/CIMProvider.h %INCLUDE_DEST_PATH/Pegasus/Provider/CIMProvider.h
-install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_INCLUDE_DIR/Pegasus/Provider/Linkage.h %INCLUDE_DEST_PATH/Pegasus/Provider/Linkage.h
-install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_INCLUDE_DIR/Pegasus/Provider/ProviderException.h %INCLUDE_DEST_PATH/Pegasus/Provider/ProviderException.h
-# Create symbolic links for client libs
-#
-cd $RPM_BUILD_ROOT%PEGASUS_DEST_LIB_DIR
-ln -sf libpegcommon.so.1 libpegcommon.so
-ln -sf libpegclient.so.1 libpegclient.so
-ln -sf libpegprovider.so.1 libpegprovider.so
-ln -sf libDefaultProviderManager.so.1 libDefaultProviderManager.so
-ln -sf libCMPIProviderManager.so.1 libCMPIProviderManager.so
-ln -sf libCIMxmlIndicationHandler.so.1 libCIMxmlIndicationHandler.so
-# Create symbolic links for provider libs
-#
-cd $RPM_BUILD_ROOT%PEGASUS_PROVIDER_LIB_DIR
-ln -sf libComputerSystemProvider.so.1 libComputerSystemProvider.so
-ln -sf libOSProvider.so.1 libOSProvider.so
-ln -sf libProcessProvider.so.1 libProcessProvider.so
-
-cd %PEGASUS_STAGING_DIR%PEGASUS_DATA_DIR/
-cp -rf html $RPM_BUILD_ROOT%PEGASUS_DATA_DIR
-
-install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_SAMPLES_DIR/Makefile %SAMPLES_DEST_PATH/Makefile
-install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_SAMPLES_DIR/mak/common.mak %SAMPLES_DEST_PATH/mak/common.mak
-
-echo "PEGASUS_DEST_LIB_DIR = "%PEGASUS_DEST_LIB_DIR > sampleconfig.txt
-echo "PEGASUS_VARDATA_DIR = "%PEGASUS_VARDATA_DIR >> sampleconfig.txt
-echo "PEGASUS_PROVIDER_LIB_DIR="%PEGASUS_PROVIDER_LIB_DIR >> sampleconfig.txt
-echo "PEGASUS_MOF_DIR = "%PEGASUS_MOF_DIR>> sampleconfig.txt
-echo "PEGASUS_INCLUDE_DIR = "%PEGASUS_INCLUDE_DIR >> sampleconfig.txt
-echo "PEGASUS_SAMPLES_DIR = "%PEGASUS_SAMPLES_DIR >> sampleconfig.txt
-echo "PEGASUS_BIN_DIR = "%PEGASUS_BIN_DIR >> sampleconfig.txt
-cat sampleconfig.txt %PEGASUS_STAGING_DIR%PEGASUS_SAMPLES_DIR/mak/config.mak > sampleconfig.mak
-install -D -m 0444 sampleconfig.mak %SAMPLES_DEST_PATH/mak/config.mak
-install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_SAMPLES_DIR/mak/%PEGASUS_HARDWARE_PLATFORM.mak %SAMPLES_DEST_PATH/mak/%PEGASUS_HARDWARE_PLATFORM.mak
-install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_SAMPLES_DIR/mak/library.mak %SAMPLES_DEST_PATH/mak/library.mak
-install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_SAMPLES_DIR/mak/program.mak %SAMPLES_DEST_PATH/mak/program.mak
-install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_SAMPLES_DIR/mak/recurse.mak %SAMPLES_DEST_PATH/mak/recurse.mak
-install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_SAMPLES_DIR/Clients/Makefile %SAMPLES_DEST_PATH/Clients/Makefile
-install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_SAMPLES_DIR/Clients/DefaultC++/Makefile %SAMPLES_DEST_PATH/Clients/DefaultC++/Makefile
-install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_SAMPLES_DIR/Clients/DefaultC++/EnumInstances/EnumInstances.cpp %SAMPLES_DEST_PATH/Clients/DefaultC++/EnumInstances/EnumInstances.cpp
-install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_SAMPLES_DIR/Clients/DefaultC++/EnumInstances/Makefile %SAMPLES_DEST_PATH/Clients/DefaultC++/EnumInstances/Makefile
-install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_SAMPLES_DIR/Clients/DefaultC++/InvokeMethod/InvokeMethod.cpp %SAMPLES_DEST_PATH/Clients/DefaultC++/InvokeMethod/InvokeMethod.cpp
-install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_SAMPLES_DIR/Clients/DefaultC++/InvokeMethod/Makefile %SAMPLES_DEST_PATH/Clients/DefaultC++/InvokeMethod/Makefile
-install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_SAMPLES_DIR/Clients/DefaultC++/SendTestIndications/Makefile %SAMPLES_DEST_PATH/Clients/DefaultC++/SendTestIndications/Makefile
-install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_SAMPLES_DIR/Clients/DefaultC++/SendTestIndications/SendTestIndications.cpp %SAMPLES_DEST_PATH/Clients/DefaultC++/SendTestIndications/SendTestIndications.cpp
-install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_SAMPLES_DIR/Providers/Makefile %SAMPLES_DEST_PATH/Providers/Makefile
-install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_SAMPLES_DIR/Providers/DefaultC++/Makefile %SAMPLES_DEST_PATH/Providers/DefaultC++/Makefile
-install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_SAMPLES_DIR/Providers/DefaultC++/IndicationProvider/IndicationProvider.h %SAMPLES_DEST_PATH/Providers/DefaultC++/IndicationProvider/IndicationProvider.h
-install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_SAMPLES_DIR/Providers/DefaultC++/IndicationProvider/IndicationProvider.cpp %SAMPLES_DEST_PATH/Providers/DefaultC++/IndicationProvider/IndicationProvider.cpp
-install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_SAMPLES_DIR/Providers/DefaultC++/IndicationProvider/IndicationProviderMain.cpp %SAMPLES_DEST_PATH/Providers/DefaultC++/IndicationProvider/IndicationProviderMain.cpp
-install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_SAMPLES_DIR/Providers/DefaultC++/IndicationProvider/Makefile %SAMPLES_DEST_PATH/Providers/DefaultC++/IndicationProvider/Makefile
-install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_SAMPLES_DIR/Providers/DefaultC++/InstanceProvider/EnumerateInstancesrspgood.xml %SAMPLES_DEST_PATH/Providers/DefaultC++/InstanceProvider/EnumerateInstancesrspgood.xml
-install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_SAMPLES_DIR/Providers/DefaultC++/InstanceProvider/EnumerateInstances.xml %SAMPLES_DEST_PATH/Providers/DefaultC++/InstanceProvider/EnumerateInstances.xml
-install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_SAMPLES_DIR/Providers/DefaultC++/InstanceProvider/InstanceProvider.cpp %SAMPLES_DEST_PATH/Providers/DefaultC++/InstanceProvider/InstanceProvider.cpp
-install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_SAMPLES_DIR/Providers/DefaultC++/InstanceProvider/InstanceProvider.h %SAMPLES_DEST_PATH/Providers/DefaultC++/InstanceProvider/InstanceProvider.h
-install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_SAMPLES_DIR/Providers/DefaultC++/InstanceProvider/InstanceProviderMain.cpp %SAMPLES_DEST_PATH/Providers/DefaultC++/InstanceProvider/InstanceProviderMain.cpp
-install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_SAMPLES_DIR/Providers/DefaultC++/InstanceProvider/Makefile %SAMPLES_DEST_PATH/Providers/DefaultC++/InstanceProvider/Makefile
-install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_SAMPLES_DIR/Providers/DefaultC++/MethodProvider/InvokeMethodrspgood.xml %SAMPLES_DEST_PATH/Providers/DefaultC++/MethodProvider/InvokeMethodrspgood.xml
-install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_SAMPLES_DIR/Providers/DefaultC++/MethodProvider/InvokeMethod.xml %SAMPLES_DEST_PATH/Providers/DefaultC++/MethodProvider/InvokeMethod.xml
-install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_SAMPLES_DIR/Providers/DefaultC++/MethodProvider/Makefile %SAMPLES_DEST_PATH/Providers/DefaultC++/MethodProvider/Makefile
-install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_SAMPLES_DIR/Providers/DefaultC++/MethodProvider/MethodProvider.cpp %SAMPLES_DEST_PATH/Providers/DefaultC++/MethodProvider/MethodProvider.cpp
-install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_SAMPLES_DIR/Providers/DefaultC++/MethodProvider/MethodProvider.h %SAMPLES_DEST_PATH/Providers/DefaultC++/MethodProvider/MethodProvider.h
-install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_SAMPLES_DIR/Providers/DefaultC++/MethodProvider/MethodProviderMain.cpp %SAMPLES_DEST_PATH/Providers/DefaultC++/MethodProvider/MethodProviderMain.cpp
-install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_SAMPLES_DIR/Providers/DefaultC++/SimpleDisplayConsumer/SimpleDisplayConsumerMain.cpp %SAMPLES_DEST_PATH/Providers/DefaultC++/SimpleDisplayConsumer/SimpleDisplayConsumerMain.cpp
-install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_SAMPLES_DIR/Providers/DefaultC++/SimpleDisplayConsumer/SimpleDisplayConsumer.cpp %SAMPLES_DEST_PATH/Providers/DefaultC++/SimpleDisplayConsumer/SimpleDisplayConsumer.cpp
-install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_SAMPLES_DIR/Providers/DefaultC++/SimpleDisplayConsumer/SimpleDisplayConsumer.h %SAMPLES_DEST_PATH/Providers/DefaultC++/SimpleDisplayConsumer/SimpleDisplayConsumer.h
-install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_SAMPLES_DIR/Providers/DefaultC++/SimpleDisplayConsumer/Makefile %SAMPLES_DEST_PATH/Providers/DefaultC++/SimpleDisplayConsumer/Makefile
-install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_SAMPLES_DIR/Providers/Load/Makefile %SAMPLES_DEST_PATH/Providers/Load/Makefile
-install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_SAMPLES_DIR/Providers/Load/IndicationProviderR.mof %SAMPLES_DEST_PATH/Providers/Load/IndicationProviderR.mof
-install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_SAMPLES_DIR/Providers/Load/InstanceProviderR.mof %SAMPLES_DEST_PATH/Providers/Load/InstanceProviderR.mof
-install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_SAMPLES_DIR/Providers/Load/MethodProviderR.mof %SAMPLES_DEST_PATH/Providers/Load/MethodProviderR.mof
-install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_SAMPLES_DIR/Providers/Load/SampleProviderSchema.mof %SAMPLES_DEST_PATH/Providers/Load/SampleProviderSchema.mof
-install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_SAMPLES_DIR/Providers/Load/SimpleDisplayConsumerR.mof %SAMPLES_DEST_PATH/Providers/Load/SimpleDisplayConsumerR.mof
-%if %{WITH_TEST}
-#
-# Tests
-#
-%define TEST_DEST_PATH $RPM_BUILD_ROOT%PEGASUS_TEST_DIR
-mkdir -p %TEST_DEST_PATH/{bin,lib,mak}
-#
-# Test Repository
-#
-%define PEGASUS_TEST_REPOSITORY_DIR %PEGASUS_VARDATA_DIR/testrepository
-mkdir -p $RPM_BUILD_ROOT%PEGASUS_TEST_REPOSITORY_DIR
-cp -rf %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_REPOSITORY_DIR/* $RPM_BUILD_ROOT%PEGASUS_TEST_REPOSITORY_DIR
-
-install -D -m 0444 %PEGASUS_TEST_STAGING_DIR/%PEGASUS_TEST_DIR/Makefile %TEST_DEST_PATH/Makefile
-install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/CompAssoc $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/CompAssoc
-install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/InvokeMethod2 $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/InvokeMethod2
-install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/IPC $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/IPC
-install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestAbstract $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestAbstract
-install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestArray $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestArray
-install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestBase64 $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestBase64
-install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestClassDecl $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestClassDecl
-install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestClient $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestClient
-install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestDateTime $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestDateTime
-install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestFlavor $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestFlavor
-install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestFormatter $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestFormatter
-install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestHashTable $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestHashTable
-install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestInstanceDecl $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestInstanceDecl
-install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestLogger $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestLogger
-install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestMethod $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestMethod
-install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestObject $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestObject
-install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestOperationContext $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestOperationContext
-install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestParameter $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestParameter
-install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestParamValue $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestParamValue
-install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestProperty $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestProperty
-install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestQualifier $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestQualifier
-install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestQualifierDecl $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestQualifierDecl
-install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestQualifierList $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestQualifierList
-install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestQueue $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestQueue
-install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestReference $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestReference
-install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestResolve $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestResolve
-install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestResponseHandler $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestResponseHandler
-install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestScope $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestScope
-install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestStack $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestStack
-install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestStopwatch $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestStopwatch
-install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestString $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestString
-install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestStrToInstName $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestStrToInstName
-install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestTimeValue $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestTimeValue
-install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestToMof $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestToMof
-install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestValidateClass $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestValidateClass
-install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestValue $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestValue
-install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TracerTest $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TracerTest
-install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/UserManagerTest $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/UserManagerTest
-install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_LIB_DIR/libSampleFamilyProvider.so.1 $RPM_BUILD_ROOT%PEGASUS_TEST_LIB_DIR/libSampleFamilyProvider.so.1
-install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_LIB_DIR/libSampleInstanceProvider.so.1 $RPM_BUILD_ROOT%PEGASUS_TEST_LIB_DIR/libSampleInstanceProvider.so.1
-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
-[ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT;
%pre
-if [ -d %PEGASUS_REPOSITORY_DIR"/root#PG_Internal" ]
-then
- #
- # Save the current repository to prev_repository.
- #
- if [[ -d %PEGASUS_REPOSITORY_DIR ]]
- then
- if [[ -d %PEGASUS_PREV_REPOSITORY_DIR ]]
- then
- rm -rf %PEGASUS_PREV_REPOSITORY_DIR
- fi
-
- mv %PEGASUS_REPOSITORY_DIR %PEGASUS_PREV_REPOSITORY_DIR
- mkdir %PEGASUS_REPOSITORY_DIR
- fi
+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
+# 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 pegasus >/dev/null 2>&1 || :;
+ /usr/sbin/useradd -c "tog-pegasus OpenPegasus WBEM/CIM services" -g pegasus \
+ -s /sbin/nologin -r -d /var/lib/Pegasus pegasus >/dev/null 2>&1 || :;
fi
%post
if [ $1 -eq 1 ]; then
-mkdir -p %PEGASUS_LOG_DIR
-%define INSTALL_LOG %PEGASUS_LOG_DIR/install.log
-echo `date` >%INSTALL_LOG 2>&1
+ /sbin/ldconfig
%if %{AUTOSTART}
-/usr/lib/lsb/install_initd /etc/init.d/tog-pegasus
+ /sbin/chkconfig --add tog-pegasus
%endif
-/sbin/ldconfig
-#
-# Set up the openssl certificate
-#
-# Modify entries in ssl.cnf, then
-# Create big random ssl.rnd file, then
-# Generate a self signed node certificate
-#
-#echo " Generating SSL certificates... "
-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
-echo "CN = `host \`hostname\`|cut -d\" \" -f1`" >> %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
-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
-chmod 700 %PEGASUS_CONFIG_DIR/*.pem
-cat %PEGASUS_CONFIG_DIR/key.pem > %PEGASUS_CONFIG_DIR/file_2048.pem
-chmod 400 %PEGASUS_CONFIG_DIR/file_2048.pem
-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
-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
+ echo `date` >/var/log/Pegasus/install.log 2>&1
+elif [ $1 -gt 0 ]; then
+ /sbin/service tog-pegasus condrestart
:;
fi
-%if %{WITH_TEST}
-%post test
-/etc/init.d/tog-pegasus stop
-cd %PEGASUS_VARDATA_DIR
-mv repository repository.bak
-mv testrepository repository
-cd %PEGASUS_TEST_DIR
-make create_providerlinks
-make tests
-%endif
-
%preun
if [ $1 -eq 0 ]; then
-# Check if the cimserver is running
-isRunning=`ps -el | grep cimserver | grep -v "grep cimserver"`
-if [ "$isRunning" ]; then
- %PEGASUS_SBIN_DIR/cimserver -s
-fi
-# Delete the Link to the rc.* Startup Directories
-/usr/lib/lsb/remove_initd /etc/init.d/tog-pegasus;
+ service tog-pegasus stop >/dev/null 2>&1
+ /sbin/chkconfig --del tog-pegasus;
fi
-%files
-%defattr(-,root,root)
-# 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)
-%PEGASUS_MANUSER_DIR/cimmof.1*
-%PEGASUS_MANUSER_DIR/cimprovider.1*
-%PEGASUS_MANUSER_DIR/osinfo.1*
-%PEGASUS_MANUSER_DIR/wbemexec.1*
-%PEGASUS_MANADMIN_DIR/cimauth.8*
-%PEGASUS_MANADMIN_DIR/cimconfig.8*
-%PEGASUS_MANADMIN_DIR/cimserver.8*
-%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
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/Core28_Physical.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/Core28_Software.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/Core28_Device.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/Core28_StorageExtent.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/Core28_Collection.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/Core28_Redundancy.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/Core28_Service.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/Core28_ProductFRU.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/Core28_Statistics.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/Core28_Capabilities.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/Core28_Settings.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/Core28_MethodParms.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/Core28_PowerMgmt.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/Application28_AppRuntime.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/Application28_BIOS.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/Application28_CheckAction.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/Application28_DeploymentModel.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/Application28_InstalledProduct.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/Application28_J2eeAppServer.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/Application28_J2eeAppServerStats.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/Application28_SystemSoftware.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/CIM_Application28.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/CIM_Database28.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/CIM_Device28.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/CIM_Event28.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/CIM_Interop28.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/CIM_IPsecPolicy28.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/CIM_Metrics28.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/CIM_Network28.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/CIM_Physical28.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/CIM_Policy28.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/CIM_Schema28.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/CIM_Support28.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/CIM_System28.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/CIM_User28.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/Database28_Statistics.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/Database28_Storage.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/Database28_System.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/Device28_Controller.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/Device28_CoolingAndPower.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/Device28_DeviceElements.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/Device28_DiskGroup.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/Device28_FC.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/Device28_IB.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/Device28_Memory.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/Device28_Modems.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/Device28_NetworkAdapter.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/Device28_Ports.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/Device28_Printing.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/Device28_Processor.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/Device28_ProtocolController.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/Device28_SccExtents.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/Device28_Sensors.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/Device28_StorageDevices.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/Device28_StorageExtents.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/Device28_StorageLib.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/Device28_StorageServices.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/Device28_USB.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/Device28_UserDevices.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/Metrics28_BaseMetric.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/Metrics28_UnitOfWork.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/Network28_BGP.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/Network28_Buffers.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/Network28_Collections.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/Network28_Filtering.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/Network28_IPsec.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/Network28_OSPF.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/Network28_Pipes.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/Network28_ProtocolEndpoints.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/Network28_QoS.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/Network28_Routes.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/Network28_RoutingForwarding.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/Network28_SNMP.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/Network28_SwitchingBridging.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/Network28_Systems.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/Network28_VLAN.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/Physical28_Component.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/Physical28_Connector.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/Physical28_Link.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/Physical28_Misc.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/Physical28_Package.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/Physical28_PhysicalMedia.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/Physical28_StoragePackage.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/System28_Boot.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/System28_Diagnostics.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/System28_FileElements.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/System28_Logs.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/System28_OperatingSystem.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/System28_Processing.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/System28_SystemElements.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/System28_SystemResources.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/System28_Time.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/System28_Unix.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/User28_AccessControl.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/User28_Account.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/User28_AuthenticationReqmt.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/User28_Credential.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/User28_Group.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/User28_Identity.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/User28_Kerberos.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/User28_Org.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/User28_Privilege.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/User28_PrivilegeManagementService.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/User28_PublicKey.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/User28_Role.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/User28_SecurityLevel.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/User28_SecurityServices.mof
-%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
-%attr(-,root,root) %PEGASUS_MOF_DIR/Pegasus/PG_ManagedSystemSchema20R.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/Pegasus/PG_Authorization20.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/Pegasus/PG_ConfigSetting20.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/Pegasus/PG_ShutdownService20.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/Pegasus/PG_User20.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/Pegasus/PG_Events20.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/Pegasus/PG_ProviderModule20.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/Pegasus/PG_ComputerSystem20.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/Pegasus/PG_ComputerSystem20R.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/Pegasus/PG_OperatingSystem20.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/Pegasus/PG_OperatingSystem20R.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/Pegasus/PG_UnixProcess20.mof
-%attr(-,root,root) %PEGASUS_MOF_DIR/Pegasus/PG_UnixProcess20R.mof
-%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
-%attr(0544,root,root) %PEGASUS_SBIN_DIR/cimuser
-%attr(0544,root,root) %PEGASUS_SBIN_DIR/cimconfig
-%attr(0544,root,root) %PEGASUS_SBIN_DIR/init_repository
-#%attr(0544,root,root) %PEGASUS_SBIN_DIR/settogpath
-%attr(0544,root,root) %PEGASUS_SBIN_DIR/cimprovagt
-%attr(0555,root,root) %PEGASUS_BIN_DIR/cimmof
-%attr(0555,root,root) %PEGASUS_BIN_DIR/cimmofl
-%attr(0555,root,root) %PEGASUS_BIN_DIR/cimprovider
-%attr(0555,root,root) %PEGASUS_BIN_DIR/osinfo
-%attr(0555,root,root) %PEGASUS_BIN_DIR/wbemexec
-%attr(-,root,root) %PEGASUS_DEST_LIB_DIR/libCIMxmlIndicationHandler.so.1
-%attr(-,root,root) %PEGASUS_DEST_LIB_DIR/libConfigSettingProvider.so.1
-%attr(-,root,root) %PEGASUS_DEST_LIB_DIR/libNamespaceProvider.so.1
-%attr(-,root,root) %PEGASUS_DEST_LIB_DIR/libProviderRegistrationProvider.so.1
-%attr(-,root,root) %PEGASUS_DEST_LIB_DIR/libUserAuthProvider.so.1
-%attr(-,root,root) %PEGASUS_DEST_LIB_DIR/libpegauthentication.so.1
-%attr(-,root,root) %PEGASUS_DEST_LIB_DIR/libpegclient.so.1
-%attr(-,root,root) %PEGASUS_DEST_LIB_DIR/libpegcliutils.so.1
-%attr(-,root,root) %PEGASUS_DEST_LIB_DIR/libpegcommon.so.1
-%attr(-,root,root) %PEGASUS_DEST_LIB_DIR/libpegcompiler.so.1
-%attr(-,root,root) %PEGASUS_DEST_LIB_DIR/libpegconfig.so.1
-%attr(-,root,root) %PEGASUS_DEST_LIB_DIR/libpegexportclient.so.1
-%attr(-,root,root) %PEGASUS_DEST_LIB_DIR/libpegexportserver.so.1
-%attr(-,root,root) %PEGASUS_DEST_LIB_DIR/libpeggetoopt.so.1
-%attr(-,root,root) %PEGASUS_DEST_LIB_DIR/libpeghandlerservice.so.1
-%attr(-,root,root) %PEGASUS_DEST_LIB_DIR/libpegindicationservice.so.1
-%attr(-,root,root) %PEGASUS_DEST_LIB_DIR/libpeglistener.so.1
-%attr(-,root,root) %PEGASUS_DEST_LIB_DIR/libpegprm.so.1
-%attr(-,root,root) %PEGASUS_DEST_LIB_DIR/libpegprovidermanager.so.1
-%attr(-,root,root) %PEGASUS_DEST_LIB_DIR/libpegprovider.so.1
-%attr(-,root,root) %PEGASUS_DEST_LIB_DIR/libpegrepository.so.1
-%attr(-,root,root) %PEGASUS_DEST_LIB_DIR/libpegserver.so.1
-%attr(-,root,root) %PEGASUS_DEST_LIB_DIR/libpeguser.so.1
-%attr(-,root,root) %PEGASUS_DEST_LIB_DIR/libpegwql.so.1
-%attr(-,root,root) %PEGASUS_DEST_LIB_DIR/libCMPIProviderManager.so.1
-%attr(-,root,root) %PEGASUS_DEST_LIB_DIR/libcmpiCppImpl.so.1
-%attr(-,root,root) %PEGASUS_DEST_LIB_DIR/libDefaultProviderManager.so.1
-%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
-# 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
-%PEGASUS_DEST_LIB_DIR/libDefaultProviderManager.so
-%PEGASUS_DEST_LIB_DIR/libCMPIProviderManager.so
-%PEGASUS_DEST_LIB_DIR/libCIMxmlIndicationHandler.so
-# symbolic links for provider libs
-#
-%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
-%attr(-,root,root) %PEGASUS_INCLUDE_DIR/Pegasus/Common/AcceptLanguages.h
-%attr(-,root,root) %PEGASUS_INCLUDE_DIR/Pegasus/Common/AcceptLanguageElement.h
-%attr(-,root,root) %PEGASUS_INCLUDE_DIR/Pegasus/Common/Array.h
-%attr(-,root,root) %PEGASUS_INCLUDE_DIR/Pegasus/Common/ArrayInter.h
-%attr(-,root,root) %PEGASUS_INCLUDE_DIR/Pegasus/Common/Char16.h
-%attr(-,root,root) %PEGASUS_INCLUDE_DIR/Pegasus/Common/CIMClass.h
-%attr(-,root,root) %PEGASUS_INCLUDE_DIR/Pegasus/Common/CIMDateTime.h
-%attr(-,root,root) %PEGASUS_INCLUDE_DIR/Pegasus/Common/CIMFlavor.h
-%attr(-,root,root) %PEGASUS_INCLUDE_DIR/Pegasus/Common/CIMIndication.h
-%attr(-,root,root) %PEGASUS_INCLUDE_DIR/Pegasus/Common/CIMInstance.h
-%attr(-,root,root) %PEGASUS_INCLUDE_DIR/Pegasus/Common//CIMMethod.h
-%attr(-,root,root) %PEGASUS_INCLUDE_DIR/Pegasus/Common/CIMName.h
-%attr(-,root,root) %PEGASUS_INCLUDE_DIR/Pegasus/Common/CIMObject.h
-%attr(-,root,root) %PEGASUS_INCLUDE_DIR/Pegasus/Common/CIMObjectPath.h
-%attr(-,root,root) %PEGASUS_INCLUDE_DIR/Pegasus/Common/CIMParameter.h
-%attr(-,root,root) %PEGASUS_INCLUDE_DIR/Pegasus/Common/CIMParamValue.h
-%attr(-,root,root) %PEGASUS_INCLUDE_DIR/Pegasus/Common/CIMProperty.h
-%attr(-,root,root) %PEGASUS_INCLUDE_DIR/Pegasus/Common/CIMPropertyList.h
-%attr(-,root,root) %PEGASUS_INCLUDE_DIR/Pegasus/Common/CIMQualifierDecl.h
-%attr(-,root,root) %PEGASUS_INCLUDE_DIR/Pegasus/Common/CIMQualifier.h
-%attr(-,root,root) %PEGASUS_INCLUDE_DIR/Pegasus/Common/CIMScope.h
-%attr(-,root,root) %PEGASUS_INCLUDE_DIR/Pegasus/Common/CIMStatusCode.h
-%attr(-,root,root) %PEGASUS_INCLUDE_DIR/Pegasus/Common/CIMType.h
-%attr(-,root,root) %PEGASUS_INCLUDE_DIR/Pegasus/Common/CIMValue.h
-%attr(-,root,root) %PEGASUS_INCLUDE_DIR/Pegasus/Common/Config.h
-%attr(-,root,root) %PEGASUS_INCLUDE_DIR/Pegasus/Common/ContentLanguageElement.h
-%attr(-,root,root) %PEGASUS_INCLUDE_DIR/Pegasus/Common/ContentLanguages.h
-%attr(-,root,root) %PEGASUS_INCLUDE_DIR/Pegasus/Common/Exception.h
-%attr(-,root,root) %PEGASUS_INCLUDE_DIR/Pegasus/Common/Formatter.h
-%attr(-,root,root) %PEGASUS_INCLUDE_DIR/Pegasus/Common/LanguageElementContainer.h
-%attr(-,root,root) %PEGASUS_INCLUDE_DIR/Pegasus/Common/LanguageElement.h
-%attr(-,root,root) %PEGASUS_INCLUDE_DIR/Pegasus/Common/Linkage.h
-%attr(-,root,root) %PEGASUS_INCLUDE_DIR/Pegasus/Common/MessageLoader.h
-%attr(-,root,root) %PEGASUS_INCLUDE_DIR/Pegasus/Common/OperationContext.h
-%attr(-,root,root) %PEGASUS_INCLUDE_DIR/Pegasus/Common/Platform_%PEGASUS_HARDWARE_PLATFORM.h
-%attr(-,root,root) %PEGASUS_INCLUDE_DIR/Pegasus/Common/ResponseHandler.h
-%attr(-,root,root) %PEGASUS_INCLUDE_DIR/Pegasus/Common/SSLContext.h
-%attr(-,root,root) %PEGASUS_INCLUDE_DIR/Pegasus/Common/String.h
-%attr(-,root,root) %PEGASUS_INCLUDE_DIR/Pegasus/Consumer/CIMIndicationConsumer.h
-%attr(-,root,root) %PEGASUS_INCLUDE_DIR/Pegasus/Consumer/Linkage.h
-%attr(-,root,root) %PEGASUS_INCLUDE_DIR/Pegasus/Provider/CIMAssociationProvider.h
-%attr(-,root,root) %PEGASUS_INCLUDE_DIR/Pegasus/Provider/CIMIndicationConsumerProvider.h
-%attr(-,root,root) %PEGASUS_INCLUDE_DIR/Pegasus/Provider/CIMIndicationProvider.h
-%attr(-,root,root) %PEGASUS_INCLUDE_DIR/Pegasus/Provider/CIMInstanceProvider.h
-%attr(-,root,root) %PEGASUS_INCLUDE_DIR/Pegasus/Provider/CIMMethodProvider.h
-%attr(-,root,root) %PEGASUS_INCLUDE_DIR/Pegasus/Provider/CIMOMHandle.h
-%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
-%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
-%attr(-,root,root) %PEGASUS_SAMPLES_DIR/mak/config.mak
-%attr(-,root,root) %PEGASUS_SAMPLES_DIR/mak/library.mak
-%attr(-,root,root) %PEGASUS_SAMPLES_DIR/mak/%PEGASUS_HARDWARE_PLATFORM.mak
-%attr(-,root,root) %PEGASUS_SAMPLES_DIR/mak/program.mak
-%attr(-,root,root) %PEGASUS_SAMPLES_DIR/mak/recurse.mak
-%attr(-,root,root) %PEGASUS_SAMPLES_DIR/Clients/Makefile
-%attr(-,root,root) %PEGASUS_SAMPLES_DIR/Clients/DefaultC++/Makefile
-%attr(-,root,root) %PEGASUS_SAMPLES_DIR/Clients/DefaultC++/EnumInstances/EnumInstances.cpp
-%attr(-,root,root) %PEGASUS_SAMPLES_DIR/Clients/DefaultC++/EnumInstances/Makefile
-%attr(-,root,root) %PEGASUS_SAMPLES_DIR/Clients/DefaultC++/InvokeMethod/InvokeMethod.cpp
-%attr(-,root,root) %PEGASUS_SAMPLES_DIR/Clients/DefaultC++/InvokeMethod/Makefile
-%attr(-,root,root) %PEGASUS_SAMPLES_DIR/Clients/DefaultC++/SendTestIndications/Makefile
-%attr(-,root,root) %PEGASUS_SAMPLES_DIR/Clients/DefaultC++/SendTestIndications/SendTestIndications.cpp
-%attr(-,root,root) %PEGASUS_SAMPLES_DIR/Providers/Makefile
-%attr(-,root,root) %PEGASUS_SAMPLES_DIR/Providers/DefaultC++/Makefile
-%attr(-,root,root) %PEGASUS_SAMPLES_DIR/Providers/DefaultC++/IndicationProvider/IndicationProvider.cpp
-%attr(-,root,root) %PEGASUS_SAMPLES_DIR/Providers/DefaultC++/IndicationProvider/IndicationProvider.h
-%attr(-,root,root) %PEGASUS_SAMPLES_DIR/Providers/DefaultC++/IndicationProvider/IndicationProviderMain.cpp
-%attr(-,root,root) %PEGASUS_SAMPLES_DIR/Providers/DefaultC++/IndicationProvider/Makefile
-%attr(-,root,root) %PEGASUS_SAMPLES_DIR/Providers/DefaultC++/InstanceProvider/EnumerateInstancesrspgood.xml
-%attr(-,root,root) %PEGASUS_SAMPLES_DIR/Providers/DefaultC++/InstanceProvider/EnumerateInstances.xml
-%attr(-,root,root) %PEGASUS_SAMPLES_DIR/Providers/DefaultC++/InstanceProvider/InstanceProvider.cpp
-%attr(-,root,root) %PEGASUS_SAMPLES_DIR/Providers/DefaultC++/InstanceProvider/InstanceProvider.h
-%attr(-,root,root) %PEGASUS_SAMPLES_DIR/Providers/DefaultC++/InstanceProvider/InstanceProviderMain.cpp
-%attr(-,root,root) %PEGASUS_SAMPLES_DIR/Providers/DefaultC++/InstanceProvider/Makefile
-%attr(-,root,root) %PEGASUS_SAMPLES_DIR/Providers/DefaultC++/MethodProvider/InvokeMethodrspgood.xml
-%attr(-,root,root) %PEGASUS_SAMPLES_DIR/Providers/DefaultC++/MethodProvider/InvokeMethod.xml
-%attr(-,root,root) %PEGASUS_SAMPLES_DIR/Providers/DefaultC++/MethodProvider/Makefile
-%attr(-,root,root) %PEGASUS_SAMPLES_DIR/Providers/DefaultC++/MethodProvider/MethodProvider.cpp
-%attr(-,root,root) %PEGASUS_SAMPLES_DIR/Providers/DefaultC++/MethodProvider/MethodProvider.h
-%attr(-,root,root) %PEGASUS_SAMPLES_DIR/Providers/DefaultC++/MethodProvider/MethodProviderMain.cpp
-%attr(-,root,root) %PEGASUS_SAMPLES_DIR/Providers/DefaultC++/SimpleDisplayConsumer/SimpleDisplayConsumer.cpp
-%attr(-,root,root) %PEGASUS_SAMPLES_DIR/Providers/DefaultC++/SimpleDisplayConsumer/SimpleDisplayConsumer.h
-%attr(-,root,root) %PEGASUS_SAMPLES_DIR/Providers/DefaultC++/SimpleDisplayConsumer/SimpleDisplayConsumerMain.cpp
-%attr(-,root,root) %PEGASUS_SAMPLES_DIR/Providers/DefaultC++/SimpleDisplayConsumer/Makefile
-%attr(-,root,root) %PEGASUS_SAMPLES_DIR/Providers/Load/Makefile
-%attr(-,root,root) %PEGASUS_SAMPLES_DIR/Providers/Load/IndicationProviderR.mof
-%attr(-,root,root) %PEGASUS_SAMPLES_DIR/Providers/Load/InstanceProviderR.mof
-%attr(-,root,root) %PEGASUS_SAMPLES_DIR/Providers/Load/MethodProviderR.mof
-%attr(-,root,root) %PEGASUS_SAMPLES_DIR/Providers/Load/SampleProviderSchema.mof
-%attr(-,root,root) %PEGASUS_SAMPLES_DIR/Providers/Load/SimpleDisplayConsumerR.mof
+%postun
+if [ $1 -eq 0 ]; then
+ /usr/sbin/userdel pegasus >/dev/null 2>&1 || :;
+ /usr/sbin/groudel pegasus >/dev/null 2>&1 || :;
+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
-%attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/IPC
-%attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestAbstract
-%attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestArray
-%attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestBase64
-%attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestClassDecl
-%attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestClient
-%attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestDateTime
-%attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestFlavor
-%attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestFormatter
-%attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestHashTable
-%attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestInstanceDecl
-%attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestLogger
-%attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestMethod
-%attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestObject
-%attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestOperationContext
-%attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestParameter
-%attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestParamValue
-%attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestProperty
-%attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestQualifier
-%attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestQualifierDecl
-%attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestQualifierList
-%attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestQueue
-%attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestReference
-%attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestResolve
-%attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestResponseHandler
-%attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestScope
-%attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestStack
-%attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestStopwatch
-%attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestString
-%attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestStrToInstName
-%attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestTimeValue
-%attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestToMof
-%attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestValidateClass
-%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(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
+%clean
+#rm -rf $RPM_BUILD_ROOT;
+#rm -rf ${RPM_BUILD_DIR}/%{srcname}-%{version};
%changelog
-* Fri Sep 02 2005 Jason Vas Dias <jvdias at redhat.com> - 2.4.1-4.FC5
-- .spec file changes to prevent files remaining after rpm erase
-
-* Thu Sep 01 2005 Jason Vas Dias <jvdias at redhat.com> - 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 <jvdias at redhat.com> - 2.4.1-2
-- fix bug 165805: change location from /opt root to / root
- cimserver not running by default
- rename 'sdk' package 'devel' package
- compile all executables with ExecShield
-- fix bug 165880: no logging during post scriptlet
- no postun scriptlets do 'rm -rf'
- added Requires(post)
- moved symlinks into -devel package
-- further fix for bug 165770: cimserver no longer stores socket in subdirectory
-
-* Fri Aug 12 2005 Jason Vas Dias <jvdias at redhat.com> - 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 <jvdias at redhat.com> - 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'
- to get test rpm.
-- Add condrestart option to initscript - invoke condrestart on upgrade.
-- Re-Enable PPC64 support
+* Fri Sep 30 2005 Jason Vas Dias <jvdias at redhat.com> - 2:tog-pegasus-2.5-1
+- Implemented new 'make install' target.
+- Re-wrote tog-pegasus.spec file from scratch.
+- Ported BZ 167986 authentication code and BZ 167164 + BZ 167165 fixes from RHEL-4
+
+* Wed Sep 28 2005 Jason Vas Dias <jvdias at redhat.com> - 2:tog-pegasus-2.5-0
+- Initial build.
--- opt-tog-pegasus DELETED ---
--- tog-pegasus-2.4.1-165770.patch DELETED ---
--- tog-pegasus-2.4.1-2-4-2-sanity.patch DELETED ---
--- tog-pegasus-2.4.1-Beta3-gcc4.patch DELETED ---
--- tog-pegasus-2.4.1-bz167164.patch DELETED ---
--- tog-pegasus-2.4.1-bz167165.patch DELETED ---
--- tog-pegasus-2.4.1-de-lib.patch DELETED ---
--- tog-pegasus-2.4.1-de-opt.patch DELETED ---
--- tog-pegasus-2.4.1-execshield.patch DELETED ---
--- tog-pegasus-2.4.1-noecho.patch DELETED ---
--- tog-pegasus-2.4.1-obz2207.patch DELETED ---
--- tog-pegasus-2.4.1-obz2217.patch DELETED ---
--- tog-pegasus-2.4.1-obz2499.patch DELETED ---
--- tog-pegasus-2.4.1-obz2503.patch DELETED ---
--- tog-pegasus-2.4.1-obz3858.patch DELETED ---
--- tog-pegasus-2.4.1-obz3958.patch DELETED ---
--- tog-pegasus-2.4.1-obz3958_default.patch DELETED ---
--- tog-pegasus-2.4.1-obz4004.patch DELETED ---
--- tog-pegasus-2.4.1-obz4009.patch DELETED ---
--- tog-pegasus-2.4.1-obz4014.patch DELETED ---
--- tog-pegasus-2.4.1-obz4023.patch DELETED ---
--- tog-pegasus-2.4.1-obz4027.patch DELETED ---
--- tog-pegasus-2.4.1-obz4028.patch DELETED ---
--- tog-pegasus-2.4.1-obz4029-new.patch DELETED ---
--- tog-pegasus-2.4.1-obz4029.patch DELETED ---
--- tog-pegasus-2.4.1-obz4050.patch DELETED ---
--- tog-pegasus-2.4.1-obz4072.patch DELETED ---
--- tog-pegasus-2.4.1-obz4120.patch DELETED ---
--- tog-pegasus-2.4.1-rbz167162_obz4025.patch DELETED ---
--- tog-pegasus-2.4.1-remove_socket.patch DELETED ---
--- tog-pegasus-2.4.1.Beta-3.condrestart.patch DELETED ---
--- tog-pegasus-2.4.1.Beta-3.ppc64.patch DELETED ---
--- tog-pegasus-2.4.1.Beta-flags.patch DELETED ---
--- tog-pegasus-2.4.1.Beta-ldflags.patch DELETED ---
--- tog-pegasus-2.4.1.Beta-permissions.patch DELETED ---
--- tog-pegasus-2.4.1.Beta-ppc64.patch DELETED ---
--- tog-pegasus-2.4.1.Beta-ptr64.patch DELETED ---
--- tog-pegasus-2.4.1.Beta-warnings.patch DELETED ---
--- tog-pegasus-2.4.1.pie.patch DELETED ---
- Previous message (by thread): rpms/pango/devel .cvsignore, 1.20, 1.21 pango.spec, 1.37, 1.38 sources, 1.20, 1.21
- Next message (by thread): rpms/tog-pegasus/devel genSSLcerts, NONE, 1.1 access.conf, NONE, 1.1 README.RedHat.Security, NONE, 1.1 rpm_build_env, NONE, 1.1
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list