Update to upstream version 2.11.0

2011-05-19 15:50:06 +02:00 · 2011-05-19 15:50:06 +02:00 · 064c19bb9a
commit 064c19bb9a
parent 844e44b252
8 changed files with 216 additions and 189 deletions
--- a/.gitignore
+++ b/.gitignore
@ -12,3 +12,4 @@ pegasus-2.7.2.tar.gz
 pegasus-2.9.0.tar.gz
 /pegasus-2.9.2.tar.gz
 /pegasus-2.10.0.tar.gz
+/pegasus-2.11.0.tar.gz
--- a/pegasus-2.7.0-PIE.patch
+++ b/pegasus-2.7.0-PIE.patch
@ -1,50 +1,7 @@
--- pegasus/src/Pegasus/Server/Makefile_old	2007-11-08 10:57:26.000000000 +0100
-+++ pegasus/src/Pegasus/Server/Makefile	2007-11-08 10:58:14.000000000 +0100
-@@ -34,6 +34,8 @@
- 
- include $(ROOT)/mak/config.mak
- 
-+FLAGS := $(FLAGS:-fPIC=-fPIE)
-+
- EXTRA_INCLUDES = $(SYS_INCLUDES)
- 
- LOCAL_DEFINES = -DPEGASUS_SERVER_INTERNAL -DPEGASUS_INTERNALONLY
--- pegasus/src/Pegasus/ProviderManagerService/ProviderAgent/Makefile_old	2007-11-08 11:00:46.000000000 +0100
-+++ pegasus/src/Pegasus/ProviderManagerService/ProviderAgent/Makefile	2007-11-08 11:01:03.000000000 +0100
-@@ -34,6 +34,8 @@
- 
- include $(ROOT)/mak/config.mak
- 
-+FLAGS := $(FLAGS:-fPIC=-fPIE)
-+
- LIBRARIES = \
-     pegpmservice \
-     pegprovidermanager \
--- pegasus/src/Pegasus/Compiler/cmdline/cimmof/Makefile_old	2007-11-08 11:01:34.000000000 +0100
-+++ pegasus/src/Pegasus/Compiler/cmdline/cimmof/Makefile	2007-11-08 11:01:57.000000000 +0100
-@@ -32,6 +32,8 @@
- DIR = Pegasus/Compiler/cmdline/cimmof
- include $(ROOT)/mak/config.mak
- 
-+FLAGS := $(FLAGS:-fPIC=-fPIE)
-+
- LOCAL_DEFINES = -DPEGASUS_CMDLINE_INTERNAL -DPEGASUS_INTERNALONLY
- 
- LIBRARIES = \
--- pegasus/src/Pegasus/Compiler/cmdline/cimmofl/Makefile_old	2007-11-08 11:02:29.000000000 +0100
-+++ pegasus/src/Pegasus/Compiler/cmdline/cimmofl/Makefile	2007-11-08 11:02:43.000000000 +0100
-@@ -32,6 +32,8 @@
- DIR = Pegasus/Compiler/cmdline/cimmofl
- include $(ROOT)/mak/config.mak
- 
-+FLAGS := $(FLAGS:-fPIC=-fPIE)
-+
- LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
- 
- PROGRAM = cimmofl
--- pegasus/src/Clients/cimconfig/Makefile_old	2007-11-08 11:03:43.000000000 +0100
-+++ pegasus/src/Clients/cimconfig/Makefile	2007-11-08 11:04:03.000000000 +0100
-@@ -36,6 +36,8 @@
+diff -up pegasus/src/Clients/cimauth/Makefile_orig pegasus/src/Clients/cimauth/Makefile
+--- pegasus/src/Clients/cimauth/Makefile_orig	2011-05-17 15:03:15.822670486 +0200
+++ pegasus/src/Clients/cimauth/Makefile	2011-05-17 15:03:26.893426279 +0200
+@@ -34,6 +34,8 @@ DIR = Clients/cimauth
 
 include $(ROOT)/mak/config.mak
 
@ -53,9 +10,10 @@
 LIBRARIES = \
     pegcliutils \
     pegclient \
--- pegasus/src/Clients/cimprovider/Makefile_old	2007-11-08 11:04:16.000000000 +0100
-+++ pegasus/src/Clients/cimprovider/Makefile	2007-11-08 11:04:30.000000000 +0100
-@@ -36,6 +36,8 @@
+diff -up pegasus/src/Clients/cimconfig/Makefile_orig pegasus/src/Clients/cimconfig/Makefile
+--- pegasus/src/Clients/cimconfig/Makefile_orig	2011-05-17 15:01:19.759266385 +0200
+++ pegasus/src/Clients/cimconfig/Makefile	2011-05-17 15:01:37.629099999 +0200
+@@ -34,6 +34,8 @@ DIR = Clients/cimconfig
 
 include $(ROOT)/mak/config.mak
 
@ -64,9 +22,10 @@
 LIBRARIES = \
     pegcliutils \
     pegclient \
--- pegasus/src/Clients/cimuser/Makefile_old	2007-11-08 11:04:47.000000000 +0100
-+++ pegasus/src/Clients/cimuser/Makefile	2007-11-08 11:05:02.000000000 +0100
-@@ -36,6 +36,8 @@
+diff -up pegasus/src/Clients/cimprovider/Makefile_orig pegasus/src/Clients/cimprovider/Makefile
+--- pegasus/src/Clients/cimprovider/Makefile_orig	2011-05-17 15:01:55.278898872 +0200
+++ pegasus/src/Clients/cimprovider/Makefile	2011-05-17 15:02:09.021077534 +0200
+@@ -34,6 +34,8 @@ DIR = Clients/cimprovider
 
 include $(ROOT)/mak/config.mak
 
@ -75,20 +34,10 @@
 LIBRARIES = \
     pegcliutils \
     pegclient \
--- pegasus/src/Clients/wbemexec/Makefile_old	2007-11-08 11:05:25.000000000 +0100
-+++ pegasus/src/Clients/wbemexec/Makefile	2007-11-08 11:05:49.000000000 +0100
-@@ -36,6 +36,8 @@
- 
- include $(ROOT)/mak/config.mak
- 
-+FLAGS := $(FLAGS:-fPIC=-fPIE)
-+
- LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
- 
- LIBRARIES = \
--- pegasus/src/Clients/cimauth/Makefile_old	2007-11-08 11:06:04.000000000 +0100
-+++ pegasus/src/Clients/cimauth/Makefile	2007-11-08 11:06:21.000000000 +0100
-@@ -36,6 +36,8 @@
+diff -up pegasus/src/Clients/cimuser/Makefile_orig pegasus/src/Clients/cimuser/Makefile
+--- pegasus/src/Clients/cimuser/Makefile_orig	2011-05-17 15:02:18.991658613 +0200
+++ pegasus/src/Clients/cimuser/Makefile	2011-05-17 15:02:38.476748769 +0200
+@@ -34,6 +34,8 @@ DIR = Clients/cimuser
 
 include $(ROOT)/mak/config.mak
 
@ -97,20 +46,10 @@
 LIBRARIES = \
     pegcliutils \
     pegclient \
--- pegasus/src/Clients/repupgrade/Makefile_old	2007-11-08 11:06:46.000000000 +0100
-+++ pegasus/src/Clients/repupgrade/Makefile	2007-11-08 11:07:03.000000000 +0100
-@@ -36,6 +36,8 @@
- 
- include $(ROOT)/mak/config.mak
- 
-+FLAGS := $(FLAGS:-fPIC=-fPIE)
-+
- LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
- 
- LIBRARIES = \
--- pegasus/src/Clients/osinfo/Makefile_old	2007-11-08 11:07:15.000000000 +0100
-+++ pegasus/src/Clients/osinfo/Makefile	2007-11-08 11:07:29.000000000 +0100
-@@ -35,6 +35,8 @@
+diff -up pegasus/src/Clients/osinfo/Makefile_orig pegasus/src/Clients/osinfo/Makefile
+--- pegasus/src/Clients/osinfo/Makefile_orig	2011-05-17 15:03:57.952350916 +0200
+++ pegasus/src/Clients/osinfo/Makefile	2011-05-17 15:04:08.622043080 +0200
+@@ -33,6 +33,8 @@ PEGASUS_ZOS_PROGRAM_OBJECT = yes
 DIR = Clients/osinfo
 include $(ROOT)/mak/config.mak
 
@ -119,3 +58,75 @@
 LIBRARIES = \
     pegcliutils \
     peggetoopt \
+diff -up pegasus/src/Clients/repupgrade/Makefile_orig pegasus/src/Clients/repupgrade/Makefile
+--- pegasus/src/Clients/repupgrade/Makefile_orig	2011-05-17 15:03:36.222905432 +0200
+++ pegasus/src/Clients/repupgrade/Makefile	2011-05-17 15:03:48.013774882 +0200
+@@ -34,6 +34,8 @@ DIR = Clients/repupgrade
+ 
+ include $(ROOT)/mak/config.mak
+ 
+FLAGS := $(FLAGS:-fPIC=-fPIE)
+
+ LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
+ 
+ LIBRARIES = \
+diff -up pegasus/src/Clients/wbemexec/Makefile_orig pegasus/src/Clients/wbemexec/Makefile
+--- pegasus/src/Clients/wbemexec/Makefile_orig	2011-05-17 15:02:46.254981788 +0200
+++ pegasus/src/Clients/wbemexec/Makefile	2011-05-17 15:02:59.917148729 +0200
+@@ -34,6 +34,8 @@ DIR = Clients/wbemexec
+ 
+ include $(ROOT)/mak/config.mak
+ 
+FLAGS := $(FLAGS:-fPIC=-fPIE)
+
+ LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
+ 
+ LIBRARIES = \
+diff -up pegasus/src/Pegasus/Compiler/cmdline/cimmofl/Makefile_orig pegasus/src/Pegasus/Compiler/cmdline/cimmofl/Makefile
+--- pegasus/src/Pegasus/Compiler/cmdline/cimmofl/Makefile_orig	2011-05-17 14:59:20.270319135 +0200
+++ pegasus/src/Pegasus/Compiler/cmdline/cimmofl/Makefile	2011-05-17 14:59:55.019829684 +0200
+@@ -30,6 +30,8 @@ ROOT = ../../../../..
+ DIR = Pegasus/Compiler/cmdline/cimmofl
+ include $(ROOT)/mak/config.mak
+ 
+FLAGS := $(FLAGS:-fPIC=-fPIE)
+
+ LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
+ 
+ PROGRAM = cimmofl
+diff -up pegasus/src/Pegasus/Compiler/cmdline/cimmof/Makefile_orig pegasus/src/Pegasus/Compiler/cmdline/cimmof/Makefile
+--- pegasus/src/Pegasus/Compiler/cmdline/cimmof/Makefile_orig	2011-05-17 14:58:44.334620532 +0200
+++ pegasus/src/Pegasus/Compiler/cmdline/cimmof/Makefile	2011-05-17 14:59:10.555778484 +0200
+@@ -32,6 +32,8 @@ include $(ROOT)/mak/config.mak
+ 
+ LOCAL_DEFINES = -DPEGASUS_CMDLINE_INTERNAL -DPEGASUS_INTERNALONLY
+ 
+FLAGS := $(FLAGS:-fPIC=-fPIE)
+
+ LIBRARIES = \
+     pegcompiler \
+     pegclient \
+diff -up pegasus/src/Pegasus/ProviderManagerService/ProviderAgent/Makefile_orig pegasus/src/Pegasus/ProviderManagerService/ProviderAgent/Makefile
+--- pegasus/src/Pegasus/ProviderManagerService/ProviderAgent/Makefile_orig	2011-05-17 14:58:03.166092772 +0200
+++ pegasus/src/Pegasus/ProviderManagerService/ProviderAgent/Makefile	2011-05-17 14:58:22.652182571 +0200
+@@ -32,6 +32,8 @@ DIR = Pegasus/ProviderManagerService/Pro
+ 
+ include $(ROOT)/mak/config.mak
+ 
+FLAGS := $(FLAGS:-fPIC=-fPIE)
+
+ LIBRARIES = \
+     pegpmrouter \
+     pegprovidermanager \
+diff -up pegasus/src/Pegasus/Server/Makefile_orig pegasus/src/Pegasus/Server/Makefile
+--- pegasus/src/Pegasus/Server/Makefile_orig	2011-05-17 14:57:08.349400296 +0200
+++ pegasus/src/Pegasus/Server/Makefile	2011-05-17 14:57:33.724424287 +0200
+@@ -32,6 +32,8 @@ DIR = Pegasus/Server
+ 
+ include $(ROOT)/mak/config.mak
+ 
+FLAGS := $(FLAGS:-fPIC=-fPIE)
+
+ EXTRA_INCLUDES = $(SYS_INCLUDES)
+ 
+ LOCAL_DEFINES = -DPEGASUS_SERVER_INTERNAL -DPEGASUS_INTERNALONLY
--- a/pegasus-2.9.0-cmpi-provider-lib.patch
+++ b/pegasus-2.9.0-cmpi-provider-lib.patch
@ -1,11 +1,12 @@
-diff -up pegasus/src/Pegasus/Config/FixedPropertyTableLinux.h.orig pegasus/src/Pegasus/Config/FixedPropertyTableLinux.h
--- pegasus/src/Pegasus/Config/FixedPropertyTableLinux.h.orig	2011-02-14 13:13:08.950012897 +0100
-+++ pegasus/src/Pegasus/Config/FixedPropertyTableLinux.h	2011-02-14 13:14:21.559049744 +0100
-@@ -63,7 +63,7 @@
+diff -up pegasus/src/Pegasus/Config/FixedPropertyTableLinux.h_orig pegasus/src/Pegasus/Config/FixedPropertyTableLinux.h
+--- pegasus/src/Pegasus/Config/FixedPropertyTableLinux.h_orig	2011-05-17 15:13:43.331172383 +0200
+++ pegasus/src/Pegasus/Config/FixedPropertyTableLinux.h	2011-05-17 15:15:34.672827232 +0200
+@@ -60,8 +60,7 @@
     {"crlStore",             PEGASUS_SSL_SERVER_CRL},
 #  endif
     {"repositoryDir",        PEGASUS_REPOSITORY_DIR},
-    {"providerDir", PEGASUS_PROVIDER_LIB_DIR ":/usr/" PEGASUS_ARCH_LIB "/cmpi"},
+-    {"providerDir", PEGASUS_EXTRA_PROVIDER_LIB_DIR PEGASUS_PROVIDER_LIB_DIR
+-                    ":/usr/" PEGASUS_ARCH_LIB "/cmpi"},
 +    {"providerDir", PEGASUS_PROVIDER_LIB_DIR ":" PEGASUS_DEST_LIB_DIR "/cmpi"},
     {"providerManagerDir",   PEGASUS_PROVIDER_MANAGER_LIB_DIR},
 # else /* PEGASUS_OVERRIDE_DEFAULT_RELEASE_DIRS */
--- a/pegasus-2.9.0-local-or-remote-auth.patch
+++ b/pegasus-2.9.0-local-or-remote-auth.patch
@ -1,12 +1,12 @@
-diff -up pegasus/src/Executor/PAMAuth.h.orig pegasus/src/Executor/PAMAuth.h
--- pegasus/src/Executor/PAMAuth.h.orig	2011-02-14 13:16:01.619503260 +0100
-+++ pegasus/src/Executor/PAMAuth.h	2011-02-14 13:31:30.694134170 +0100
+diff -up pegasus/src/Executor/PAMAuth.h.local-or-remote-auth pegasus/src/Executor/PAMAuth.h
+--- pegasus/src/Executor/PAMAuth.h.local-or-remote-auth	2009-12-15 11:52:33.000000000 +0100
+++ pegasus/src/Executor/PAMAuth.h	2011-05-19 14:26:12.849499761 +0200
@@ -49,6 +49,9 @@
 #include <Executor/Defines.h>
 #include <Executor/Socket.h>
 
 +#include <syslog.h>
-+typedef bool Boolean;
+typedef int Boolean;
 +
 #ifdef PEGASUS_FLAVOR
 # define PAM_CONFIG_FILE "wbem" PEGASUS_FLAVOR
@ -128,9 +128,33 @@ diff -up pegasus/src/Executor/PAMAuth.h.orig pegasus/src/Executor/PAMAuth.h
 #endif
 }
 
-diff -up pegasus/src/Pegasus/Common/AuthenticationInfo.h.orig pegasus/src/Pegasus/Common/AuthenticationInfo.h
--- pegasus/src/Pegasus/Common/AuthenticationInfo.h.orig	2011-02-14 14:50:41.087630325 +0100
-+++ pegasus/src/Pegasus/Common/AuthenticationInfo.h	2011-02-14 14:52:30.082207742 +0100
+diff -up pegasus/src/Executor/Parent.c.local-or-remote-auth pegasus/src/Executor/Parent.c
+--- pegasus/src/Executor/Parent.c.local-or-remote-auth	2011-05-19 14:26:49.662347923 +0200
+++ pegasus/src/Executor/Parent.c	2011-05-19 14:44:30.248822405 +0200
+@@ -635,7 +635,7 @@ static void HandleAuthenticatePasswordRe
+ 
+ #if defined(PEGASUS_PAM_AUTHENTICATION)
+ 
+-        if (PAMAuthenticate(request.username, request.password) != 0)
+        if (PAMAuthenticate(request.username, request.password, 0) != 0)
+         {
+             status = -1;
+             break;
+diff -up pegasus/src/Executor/tests/PAMAuth/TestExecutorPAMAuth.c.local-or-remote-auth pegasus/src/Executor/tests/PAMAuth/TestExecutorPAMAuth.c
+--- pegasus/src/Executor/tests/PAMAuth/TestExecutorPAMAuth.c.local-or-remote-auth	2011-05-19 15:34:25.895309730 +0200
+++ pegasus/src/Executor/tests/PAMAuth/TestExecutorPAMAuth.c	2011-05-19 15:34:39.744506661 +0200
+@@ -49,7 +49,7 @@ int main()
+         sprintf(prompt, "Enter password for %s: ", PEGASUS_CIMSERVERMAIN_USER);
+         pw = getpass(prompt);
+ 
+-        if (PAMAuthenticate(PEGASUS_CIMSERVERMAIN_USER, pw) == 0)
+        if (PAMAuthenticate(PEGASUS_CIMSERVERMAIN_USER, pw, 0) == 0)
+             printf("Correct password\n");
+         else
+             printf("Wrong password\n");
+diff -up pegasus/src/Pegasus/Common/AuthenticationInfo.h.local-or-remote-auth pegasus/src/Pegasus/Common/AuthenticationInfo.h
+--- pegasus/src/Pegasus/Common/AuthenticationInfo.h.local-or-remote-auth	2008-12-16 19:55:59.000000000 +0100
+++ pegasus/src/Pegasus/Common/AuthenticationInfo.h	2011-05-19 14:26:12.849499761 +0200
@@ -354,6 +354,22 @@ public:
         return _rep->getRemotePrivilegedUserAccessChecked();
     }
@ -154,20 +178,20 @@ diff -up pegasus/src/Pegasus/Common/AuthenticationInfo.h.orig pegasus/src/Pegasu
 private:
 
     AuthenticationInfo(AuthenticationInfoRep* rep) : _rep(rep)
-diff -up pegasus/src/Pegasus/Common/AuthenticationInfoRep.cpp.orig pegasus/src/Pegasus/Common/AuthenticationInfoRep.cpp
--- pegasus/src/Pegasus/Common/AuthenticationInfoRep.cpp.orig	2011-02-14 14:52:52.401989289 +0100
-+++ pegasus/src/Pegasus/Common/AuthenticationInfoRep.cpp	2011-02-14 14:55:40.179890990 +0100
-@@ -44,7 +44,8 @@ const String AuthenticationInfoRep::AUTH
+diff -up pegasus/src/Pegasus/Common/AuthenticationInfoRep.cpp.local-or-remote-auth pegasus/src/Pegasus/Common/AuthenticationInfoRep.cpp
+--- pegasus/src/Pegasus/Common/AuthenticationInfoRep.cpp.local-or-remote-auth	2010-07-28 16:37:52.000000000 +0200
+++ pegasus/src/Pegasus/Common/AuthenticationInfoRep.cpp	2011-05-19 14:26:12.850499919 +0200
+@@ -46,7 +46,8 @@ const String AuthenticationInfoRep::AUTH
 
 AuthenticationInfoRep::AuthenticationInfoRep(Boolean flag)
     : _connectionAuthenticated(false),
 -      _wasRemotePrivilegedUserAccessChecked(false)
 +      _wasRemotePrivilegedUserAccessChecked(false),
-+     _isRemoteUser(true)
+      _isRemoteUser(true)
 {
     PEG_METHOD_ENTER(
         TRC_AUTHENTICATION, "AuthenticationInfoRep::AuthenticationInfoRep");
-@@ -60,6 +61,16 @@ AuthenticationInfoRep::~AuthenticationIn
+@@ -79,6 +80,16 @@ AuthenticationInfoRep::~AuthenticationIn
     PEG_METHOD_EXIT();
 }
 
@ -184,9 +208,9 @@ diff -up pegasus/src/Pegasus/Common/AuthenticationInfoRep.cpp.orig pegasus/src/P
 void AuthenticationInfoRep::setConnectionAuthenticated(
     Boolean connectionAuthenticated)
 {
-diff -up pegasus/src/Pegasus/Common/AuthenticationInfoRep.h.orig pegasus/src/Pegasus/Common/AuthenticationInfoRep.h
--- pegasus/src/Pegasus/Common/AuthenticationInfoRep.h.orig	2011-02-14 14:55:54.525678940 +0100
-+++ pegasus/src/Pegasus/Common/AuthenticationInfoRep.h	2011-02-14 15:02:45.815917313 +0100
+diff -up pegasus/src/Pegasus/Common/AuthenticationInfoRep.h.local-or-remote-auth pegasus/src/Pegasus/Common/AuthenticationInfoRep.h
+--- pegasus/src/Pegasus/Common/AuthenticationInfoRep.h.local-or-remote-auth	2008-12-16 19:55:59.000000000 +0100
+++ pegasus/src/Pegasus/Common/AuthenticationInfoRep.h	2011-05-19 14:26:12.851500077 +0200
@@ -147,6 +147,13 @@ public:
     void setSecurityAssociation();
 #endif
@ -209,10 +233,10 @@ diff -up pegasus/src/Pegasus/Common/AuthenticationInfoRep.h.orig pegasus/src/Peg
 };
 
 PEGASUS_NAMESPACE_END
-diff -up pegasus/src/Pegasus/Common/Executor.cpp.orig pegasus/src/Pegasus/Common/Executor.cpp
--- pegasus/src/Pegasus/Common/Executor.cpp.orig	2011-02-14 15:03:08.021683671 +0100
-+++ pegasus/src/Pegasus/Common/Executor.cpp	2011-02-14 15:07:44.839168734 +0100
-@@ -125,7 +125,8 @@ public:
+diff -up pegasus/src/Pegasus/Common/Executor.cpp.local-or-remote-auth pegasus/src/Pegasus/Common/Executor.cpp
+--- pegasus/src/Pegasus/Common/Executor.cpp.local-or-remote-auth	2010-10-29 07:29:50.000000000 +0200
+++ pegasus/src/Pegasus/Common/Executor.cpp	2011-05-19 14:26:12.852500235 +0200
+@@ -126,7 +126,8 @@ public:
 
     virtual int authenticatePassword(
         const char* username,
@ -222,7 +246,7 @@ diff -up pegasus/src/Pegasus/Common/Executor.cpp.orig pegasus/src/Pegasus/Common
 
     virtual int validateUser(
         const char* username) = 0;
-@@ -555,10 +556,11 @@ public:
+@@ -560,10 +561,11 @@ public:
 
     virtual int authenticatePassword(
         const char* username,
@ -236,7 +260,7 @@ diff -up pegasus/src/Pegasus/Common/Executor.cpp.orig pegasus/src/Pegasus/Common
 #else
         // ATTN: not handled so don't call in this case.
         return -1;
-@@ -897,7 +899,8 @@ public:
+@@ -904,7 +906,8 @@ public:
 
     virtual int authenticatePassword(
         const char* username,
@ -246,7 +270,7 @@ diff -up pegasus/src/Pegasus/Common/Executor.cpp.orig pegasus/src/Pegasus/Common
     {
         AutoMutex autoMutex(_mutex);
 
-@@ -1165,10 +1168,11 @@ int Executor::reapProviderAgent(
+@@ -1173,10 +1176,11 @@ int Executor::reapProviderAgent(
 
 int Executor::authenticatePassword(
     const char* username,
@ -260,10 +284,10 @@ diff -up pegasus/src/Pegasus/Common/Executor.cpp.orig pegasus/src/Pegasus/Common
 }
 
 int Executor::validateUser(
-diff -up pegasus/src/Pegasus/Common/Executor.h.orig pegasus/src/Pegasus/Common/Executor.h
--- pegasus/src/Pegasus/Common/Executor.h.orig	2011-02-14 15:07:53.267218973 +0100
-+++ pegasus/src/Pegasus/Common/Executor.h	2011-02-14 15:08:44.392587890 +0100
-@@ -183,7 +183,8 @@ public:
+diff -up pegasus/src/Pegasus/Common/Executor.h.local-or-remote-auth pegasus/src/Pegasus/Common/Executor.h
+--- pegasus/src/Pegasus/Common/Executor.h.local-or-remote-auth	2010-10-29 07:29:50.000000000 +0200
+++ pegasus/src/Pegasus/Common/Executor.h	2011-05-19 14:26:12.853500393 +0200
+@@ -184,7 +184,8 @@ public:
     */
     static int authenticatePassword(
         const char* username,
@ -273,10 +297,10 @@ diff -up pegasus/src/Pegasus/Common/Executor.h.orig pegasus/src/Pegasus/Common/E
 
     /** Check whether the given user is valid for the underlying authentcation
         mechanism.
-diff -up pegasus/src/Pegasus/Common/HTTPConnection.cpp.orig pegasus/src/Pegasus/Common/HTTPConnection.cpp
--- pegasus/src/Pegasus/Common/HTTPConnection.cpp.orig	2011-02-14 15:09:01.546724864 +0100
-+++ pegasus/src/Pegasus/Common/HTTPConnection.cpp	2011-02-14 15:10:25.210147273 +0100
-@@ -2220,6 +2220,30 @@ void HTTPConnection::_handleReadEvent()
+diff -up pegasus/src/Pegasus/Common/HTTPConnection.cpp.local-or-remote-auth pegasus/src/Pegasus/Common/HTTPConnection.cpp
+--- pegasus/src/Pegasus/Common/HTTPConnection.cpp.local-or-remote-auth	2011-04-19 12:39:52.000000000 +0200
+++ pegasus/src/Pegasus/Common/HTTPConnection.cpp	2011-05-19 14:26:12.854500551 +0200
+@@ -2295,6 +2295,30 @@ void HTTPConnection::_handleReadEvent()
         message->contentLanguages = contentLanguages;
         message->dest = _outputMessageQueue->getQueueId();
 
@ -307,33 +331,33 @@ diff -up pegasus/src/Pegasus/Common/HTTPConnection.cpp.orig pegasus/src/Pegasus/
         //
         // The _closeConnection method sets the _connectionClosePending flag.
         // If we are executing on the client side and the
-diff -up pegasus/src/Pegasus/Common/HTTPMessage.cpp.orig pegasus/src/Pegasus/Common/HTTPMessage.cpp
--- pegasus/src/Pegasus/Common/HTTPMessage.cpp.orig	2011-02-14 15:10:33.796216618 +0100
-+++ pegasus/src/Pegasus/Common/HTTPMessage.cpp	2011-02-14 15:11:13.417152699 +0100
-@@ -133,7 +133,8 @@ HTTPMessage::HTTPMessage(
-     queueId(queueId_),
+diff -up pegasus/src/Pegasus/Common/HTTPMessage.cpp.local-or-remote-auth pegasus/src/Pegasus/Common/HTTPMessage.cpp
+--- pegasus/src/Pegasus/Common/HTTPMessage.cpp.local-or-remote-auth	2011-01-25 13:10:21.000000000 +0100
+++ pegasus/src/Pegasus/Common/HTTPMessage.cpp	2011-05-19 14:26:12.856500867 +0200
+@@ -134,7 +134,8 @@ HTTPMessage::HTTPMessage(
     authInfo(0),
     acceptLanguagesDecoded(false),
-    contentLanguagesDecoded(false)
-+    contentLanguagesDecoded(false),
+     contentLanguagesDecoded(false),
+-    binaryResponse(false)
+    binaryResponse(false),
 +    isFromRemoteHost(true)
 {
     if (cimException_)
         cimException = *cimException_;
-diff -up pegasus/src/Pegasus/Common/HTTPMessage.h.orig pegasus/src/Pegasus/Common/HTTPMessage.h
--- pegasus/src/Pegasus/Common/HTTPMessage.h.orig	2011-02-14 15:11:20.936089412 +0100
-+++ pegasus/src/Pegasus/Common/HTTPMessage.h	2011-02-14 15:11:49.449641100 +0100
+diff -up pegasus/src/Pegasus/Common/HTTPMessage.h.local-or-remote-auth pegasus/src/Pegasus/Common/HTTPMessage.h
+--- pegasus/src/Pegasus/Common/HTTPMessage.h.local-or-remote-auth	2011-01-25 13:10:21.000000000 +0100
+++ pegasus/src/Pegasus/Common/HTTPMessage.h	2011-05-19 14:26:12.856500867 +0200
@@ -73,6 +73,7 @@ public:
     ContentLanguageList contentLanguages;
     Boolean acceptLanguagesDecoded;
     Boolean contentLanguagesDecoded;
 +    Boolean isFromRemoteHost;
     CIMException cimException;
+     bool binaryResponse;
 
-     void parse(
-diff -up pegasus/src/Pegasus/Common/tests/Executor/TestExecutor.cpp.orig pegasus/src/Pegasus/Common/tests/Executor/TestExecutor.cpp
--- pegasus/src/Pegasus/Common/tests/Executor/TestExecutor.cpp.orig	2011-02-14 15:12:06.539770136 +0100
-+++ pegasus/src/Pegasus/Common/tests/Executor/TestExecutor.cpp	2011-02-14 15:13:14.537240826 +0100
+diff -up pegasus/src/Pegasus/Common/tests/Executor/TestExecutor.cpp.local-or-remote-auth pegasus/src/Pegasus/Common/tests/Executor/TestExecutor.cpp
+--- pegasus/src/Pegasus/Common/tests/Executor/TestExecutor.cpp.local-or-remote-auth	2010-10-29 07:29:50.000000000 +0200
+++ pegasus/src/Pegasus/Common/tests/Executor/TestExecutor.cpp	2011-05-19 14:26:12.857501025 +0200
@@ -76,7 +76,7 @@ void testExecutorLoopbackImpl()
 #endif
 
@ -352,9 +376,9 @@ diff -up pegasus/src/Pegasus/Common/tests/Executor/TestExecutor.cpp.orig pegasus
     PEGASUS_TEST_ASSERT(Executor::validateUser("xnonexistentuserx") == -1);
 
     char challengeFilePath[EXECUTOR_BUFFER_SIZE];
-diff -up pegasus/src/Pegasus/Security/Authentication/BasicAuthenticationHandler.cpp.orig pegasus/src/Pegasus/Security/Authentication/BasicAuthenticationHandler.cpp
--- pegasus/src/Pegasus/Security/Authentication/BasicAuthenticationHandler.cpp.orig	2011-02-14 15:13:40.405462470 +0100
-+++ pegasus/src/Pegasus/Security/Authentication/BasicAuthenticationHandler.cpp	2011-02-14 15:14:31.834866750 +0100
+diff -up pegasus/src/Pegasus/Security/Authentication/BasicAuthenticationHandler.cpp.local-or-remote-auth pegasus/src/Pegasus/Security/Authentication/BasicAuthenticationHandler.cpp
+--- pegasus/src/Pegasus/Security/Authentication/BasicAuthenticationHandler.cpp.local-or-remote-auth	2009-08-07 07:43:31.000000000 +0200
+++ pegasus/src/Pegasus/Security/Authentication/BasicAuthenticationHandler.cpp	2011-05-19 14:26:12.858501183 +0200
@@ -153,7 +153,7 @@ Boolean BasicAuthenticationHandler::auth
     }
     authInfo->setRemotePrivilegedUserAccessChecked();
@ -364,9 +388,9 @@ diff -up pegasus/src/Pegasus/Security/Authentication/BasicAuthenticationHandler.
 
     // Log audit message.
     PEG_AUDIT_LOG(logBasicAuthentication(
-diff -up pegasus/src/Pegasus/Security/Authentication/BasicAuthenticator.h.orig pegasus/src/Pegasus/Security/Authentication/BasicAuthenticator.h
--- pegasus/src/Pegasus/Security/Authentication/BasicAuthenticator.h.orig	2011-02-14 15:14:38.744727386 +0100
-+++ pegasus/src/Pegasus/Security/Authentication/BasicAuthenticator.h	2011-02-14 15:15:14.442171950 +0100
+diff -up pegasus/src/Pegasus/Security/Authentication/BasicAuthenticator.h.local-or-remote-auth pegasus/src/Pegasus/Security/Authentication/BasicAuthenticator.h
+--- pegasus/src/Pegasus/Security/Authentication/BasicAuthenticator.h.local-or-remote-auth	2008-12-16 19:57:08.000000000 +0100
+++ pegasus/src/Pegasus/Security/Authentication/BasicAuthenticator.h	2011-05-19 14:26:12.858501183 +0200
@@ -65,7 +65,8 @@ public:
     */
     virtual Boolean authenticate(
@ -377,9 +401,9 @@ diff -up pegasus/src/Pegasus/Security/Authentication/BasicAuthenticator.h.orig p
 
     /** Construct and return the HTTP Basic authentication challenge header
         @return A string containing the authentication challenge header.
-diff -up pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticator.h.orig pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticator.h
--- pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticator.h.orig	2011-02-14 15:15:34.154626760 +0100
-+++ pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticator.h	2011-02-14 15:16:12.858446134 +0100
+diff -up pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticator.h.local-or-remote-auth pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticator.h
+--- pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticator.h.local-or-remote-auth	2008-12-16 19:57:08.000000000 +0100
+++ pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticator.h	2011-05-19 14:26:12.859501341 +0200
@@ -53,7 +53,8 @@ public:
 
     Boolean authenticate(
@ -390,9 +414,9 @@ diff -up pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticator.h.ori
 
     Boolean validateUser(const String& userName);
 
-diff -up pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorStub.cpp.orig pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorStub.cpp
--- pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorStub.cpp.orig	2011-02-14 15:16:22.357629018 +0100
-+++ pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorStub.cpp	2011-02-14 15:16:58.699154516 +0100
+diff -up pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorStub.cpp.local-or-remote-auth pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorStub.cpp
+--- pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorStub.cpp.local-or-remote-auth	2008-12-16 19:57:08.000000000 +0100
+++ pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorStub.cpp	2011-05-19 14:26:12.859501341 +0200
@@ -73,7 +73,8 @@ PAMBasicAuthenticator::~PAMBasicAuthenti
 
 Boolean PAMBasicAuthenticator::authenticate(
@ -403,9 +427,9 @@ diff -up pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorStub.c
 {
     PEG_METHOD_ENTER(TRC_AUTHENTICATION,
         "PAMBasicAuthenticator::authenticate()");
-diff -up pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorUnix.cpp.orig pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorUnix.cpp
--- pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorUnix.cpp.orig	2011-02-14 15:17:06.878172796 +0100
-+++ pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorUnix.cpp	2011-02-14 15:18:17.547972458 +0100
+diff -up pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorUnix.cpp.local-or-remote-auth pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorUnix.cpp
+--- pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorUnix.cpp.local-or-remote-auth	2008-12-16 19:57:08.000000000 +0100
+++ pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorUnix.cpp	2011-05-19 14:26:12.860501499 +0200
@@ -64,13 +64,14 @@ PAMBasicAuthenticator::~PAMBasicAuthenti
 
 Boolean PAMBasicAuthenticator::authenticate(
@ -423,9 +447,9 @@ diff -up pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorUnix.c
     {
         return false;
     }
-diff -up pegasus/src/Pegasus/Security/Authentication/SecureBasicAuthenticator.cpp.orig pegasus/src/Pegasus/Security/Authentication/SecureBasicAuthenticator.cpp
--- pegasus/src/Pegasus/Security/Authentication/SecureBasicAuthenticator.cpp.orig	2011-02-14 15:18:30.200547751 +0100
-+++ pegasus/src/Pegasus/Security/Authentication/SecureBasicAuthenticator.cpp	2011-02-14 15:19:03.483692138 +0100
+diff -up pegasus/src/Pegasus/Security/Authentication/SecureBasicAuthenticator.cpp.local-or-remote-auth pegasus/src/Pegasus/Security/Authentication/SecureBasicAuthenticator.cpp
+--- pegasus/src/Pegasus/Security/Authentication/SecureBasicAuthenticator.cpp.local-or-remote-auth	2009-04-17 16:39:31.000000000 +0200
+++ pegasus/src/Pegasus/Security/Authentication/SecureBasicAuthenticator.cpp	2011-05-19 14:26:12.860501499 +0200
@@ -236,7 +236,7 @@ Boolean SecureBasicAuthenticator::authen
         if (Executor::detectExecutor() == 0)
         {
@ -435,9 +459,9 @@ diff -up pegasus/src/Pegasus/Security/Authentication/SecureBasicAuthenticator.cp
             {
                 authenticated = true;
             }
-diff -up pegasus/src/Pegasus/Server/HTTPAuthenticatorDelegator.cpp.orig pegasus/src/Pegasus/Server/HTTPAuthenticatorDelegator.cpp
--- pegasus/src/Pegasus/Server/HTTPAuthenticatorDelegator.cpp.orig	2011-02-14 15:19:27.483680767 +0100
-+++ pegasus/src/Pegasus/Server/HTTPAuthenticatorDelegator.cpp	2011-02-14 15:21:04.092710797 +0100
+diff -up pegasus/src/Pegasus/Server/HTTPAuthenticatorDelegator.cpp.local-or-remote-auth pegasus/src/Pegasus/Server/HTTPAuthenticatorDelegator.cpp
+--- pegasus/src/Pegasus/Server/HTTPAuthenticatorDelegator.cpp.local-or-remote-auth	2009-08-07 07:43:31.000000000 +0200
+++ pegasus/src/Pegasus/Server/HTTPAuthenticatorDelegator.cpp	2011-05-19 14:26:12.862501815 +0200
@@ -421,6 +421,9 @@ void HTTPAuthenticatorDelegator::handleH
         Tracer::LEVEL3,
         "HTTPAuthenticatorDelegator - Authentication processing start");
--- a/pegasus-2.9.0-openssl.patch
+++ b/pegasus-2.9.0-openssl.patch
@ -1,12 +0,0 @@
-diff -up pegasus/src/Pegasus/Common/SSLContext.cpp.openssl pegasus/src/Pegasus/Common/SSLContext.cpp
--- pegasus/src/Pegasus/Common/SSLContext.cpp.openssl	2008-12-16 19:56:00.000000000 +0100
-+++ pegasus/src/Pegasus/Common/SSLContext.cpp	2009-08-26 14:22:18.000000000 +0200
-@@ -272,7 +272,7 @@ int SSLCallback::verificationCRLCallback
-     X509_REVOKED* revokedCert = NULL;
-     for (int i = 0; i < sk_X509_REVOKED_num(revokedCerts); i++)
-     {
-        revokedCert = (X509_REVOKED *)sk_value(X509_CRL_get_REVOKED(crl), i);
-+        revokedCert = sk_X509_REVOKED_value(X509_CRL_get_REVOKED(crl), i);
- 
-         //a matching serial number indicates revocation
-         if (ASN1_INTEGER_cmp(revokedCert->serialNumber, serialNumber) == 0)
--- a/pegasus-2.9.0-redhat-config.patch
+++ b/pegasus-2.9.0-redhat-config.patch
@ -1,6 +1,6 @@
-diff -up pegasus/env_var_Linux.status.orig pegasus/env_var_Linux.status
--- pegasus/env_var_Linux.status.orig	2011-02-14 13:10:17.943729722 +0100
-+++ pegasus/env_var_Linux.status	2011-02-14 13:11:35.295357177 +0100
+diff -up pegasus/env_var_Linux.status_orig pegasus/env_var_Linux.status
+--- pegasus/env_var_Linux.status_orig	2011-05-17 15:05:31.568195433 +0200
+++ pegasus/env_var_Linux.status	2011-05-17 15:12:09.216249476 +0200
@@ -17,7 +17,8 @@ ifndef PEGASUS_STAGING_DIR
 PEGASUS_STAGING_DIR = $(PEGASUS_HOME)/stagingDir
 endif
@ -11,7 +11,7 @@ diff -up pegasus/env_var_Linux.status.orig pegasus/env_var_Linux.status
 PEGASUS_DISABLE_PERFINST=yes
 PEGASUS_ENABLE_CMPI_PROVIDER_MANAGER=true
 PEGASUS_ENABLE_USERGROUP_AUTHORIZATION=true
-@@ -25,13 +26,12 @@ PEGASUS_HAS_SSL=yes
+@@ -25,7 +26,6 @@ PEGASUS_HAS_SSL=yes
 PEGASUS_USE_SSL_RANDOMFILE=false
 PEGASUS_NOASSERTS=yes
 PEGASUS_PAM_AUTHENTICATION=true
@ -19,14 +19,16 @@ diff -up pegasus/env_var_Linux.status.orig pegasus/env_var_Linux.status
 PEGASUS_USE_RELEASE_CONFIG_OPTIONS=true
 PEGASUS_USE_RELEASE_DIRS=true
 PEGASUS_USE_SYSLOGS=true
- PEGASUS_CIM_SCHEMA=CIM222
- PEGASUS_USE_NET_SNMP=true
-PEGASUS_ENABLE_PRIVILEGE_SEPARATION=true
-+PEGASUS_ENABLE_PRIVILEGE_SEPARATION=false
- 
+@@ -36,7 +36,7 @@ PEGASUS_ENABLE_PRIVILEGE_SEPARATION=true
 PEGASUS_ENABLE_INTEROP_PROVIDER=false
+ PEGASUS_ENABLE_PROTOCOL_WSMAN=false
 
-@@ -112,7 +112,7 @@ PEGASUS_INSTALL_LOG = $(PEGASUS_LOG_DIR)
+-PEGASUS_ENABLE_SLP=false
+PEGASUS_ENABLE_SLP=true
+ ifeq ($(PEGASUS_ENABLE_SLP), true)
+ PEGASUS_ENABLE_INTEROP_PROVIDER=true
+ PEGASUS_SLP_REG_TIMEOUT=1090
+@@ -127,7 +127,7 @@ PEGASUS_INSTALL_LOG = $(PEGASUS_LOG_DIR)
 
 PEGASUS_CIMSERVER_START_FILE = $(PEGASUS_VARRUN_DIR)/cimserver.pid
 PEGASUS_CIMSERVER_START_LOCK_FILE = $(PEGASUS_VARRUN_DIR)/cimserver_start.lock
--- a/2
+++ b/2
@ -1 +1 @@
-6d97a13f361d02494304217638a593b1  pegasus-2.10.0.tar.gz
+d10ff1646bed371285acdcd0b8c8ea32  pegasus-2.11.0.tar.gz
--- a/tog-pegasus.spec
+++ b/tog-pegasus.spec
@ -2,13 +2,13 @@
 # do "rpmbuild --define 'PEGASUS_BUILD_TEST_RPM 1'" to build test RPM.

 %global srcname pegasus
-%global major_ver 2.10
+%global major_ver 2.11
 %global pegasus_gid 65
 %global pegasus_uid 66

 Name:           tog-pegasus
 Version:        %{major_ver}.0
-Release:        6%{?dist}
+Release:        1%{?dist}
 Epoch:          2
 Summary:        OpenPegasus WBEM Services for Linux

@ -54,8 +54,6 @@ Patch9:         pegasus-2.6.0-cimuser.patch
 Patch12:        pegasus-2.7.0-no_snmp_tests.patch
 # 13: Changes to make package compile on sparc
 Patch13:        pegasus-2.9.0-sparc.patch
-# 15: SSL fix
-Patch15:        pegasus-2.9.0-openssl.patch
 # 16: Fixes "getpagesize" build error
 Patch16:        pegasus-2.9.1-getpagesize.patch
 # 18: Let the makefile install initscript we want to use
@ -68,7 +66,7 @@ Patch20:        pegasus-2.10.0-sparc-posix-lock.patch
 BuildRequires:  bash, sed, grep, coreutils, procps, gcc, gcc-c++
 BuildRequires:  libstdc++, make, pam-devel
 BuildRequires:  openssl-devel >= 0.9.6
-BuildRequires:  net-snmp-devel
+BuildRequires:  net-snmp-devel, openslp-devel
 Requires:       net-snmp
 Requires:       %{name}-libs = %{epoch}:%{version}-%{release}
 Provides:       cim-server
@ -184,7 +182,6 @@ The OpenPegasus WBEM tests for the OpenPegasus %{version} Linux rpm.
 %patch12 -p1 -b .no_snmp_tests
 %patch5 -p1 -b .local-or-remote-auth
 %patch13 -p1 -b .sparc
-%patch15 -p1 -b .openssl
 %patch0 -p1 -b .initscript
 %patch16 -p1 -b .getpagesize
 %patch18 -p1 -b .makefile-initscript
@ -251,7 +248,7 @@ make -f $PEGASUS_ROOT/Makefile.Release stage \
 mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d/
 mv $RPM_BUILD_ROOT/etc/init.d/tog-pegasus $RPM_BUILD_ROOT/etc/rc.d/init.d/tog-pegasus
 # cimserver_planned.conf is on the right place since 2.9.2 (update - not in 2.10.0)
-mv $RPM_BUILD_ROOT/var/lib/Pegasus/cimserver_planned.conf $RPM_BUILD_ROOT/etc/Pegasus/cimserver_planned.conf
+#mv $RPM_BUILD_ROOT/var/lib/Pegasus/cimserver_planned.conf $RPM_BUILD_ROOT/etc/Pegasus/cimserver_planned.conf
 mkdir -p $RPM_BUILD_ROOT/%{_docdir}/%{name}-%{version}
 mv $RPM_BUILD_ROOT/usr/share/doc/%{name}-%{major_ver}/* $RPM_BUILD_ROOT/%{_docdir}/%{name}-%{version}
 rm -rf $RPM_BUILD_ROOT/usr/share/doc/%{name}-%{major_ver}
@ -417,24 +414,27 @@ fi


 %changelog
-* Tue Apr 05 2011 Vitezslav Crhonek <vcrhonek@redhat.com> - 2:2.10.1-6
+* Thu May 19 2011 Vitezslav Crhonek <vcrhonek@redhat.com> - 2:2.11.0-1
+- Update to upstream version 2.11.0
+
+* Tue Apr 05 2011 Vitezslav Crhonek <vcrhonek@redhat.com> - 2:2.10.0-6
 - Add -g flag for compiler

-* Wed Mar 30 2011 Dennis Gilmore <dennis@ausil.us> - 2:2.10.1-5
+* Wed Mar 30 2011 Dennis Gilmore <dennis@ausil.us> - 2:2.10.0-5
 - use posix locks on sparc linux arches

-* Tue Mar 22 2011 Vitezslav Crhonek <vcrhonek@redhat.com> - 2:2.10.1-4
+* Tue Mar 22 2011 Vitezslav Crhonek <vcrhonek@redhat.com> - 2:2.10.0-4
 - Use %%ghost for /var/run/tog-pegasus
  Resolves: #656705

-* Tue Mar 01 2011 Vitezslav Crhonek <vcrhonek@redhat.com> - 2:2.10.1-3
+* Tue Mar 01 2011 Vitezslav Crhonek <vcrhonek@redhat.com> - 2:2.10.0-3
 - Don't strip binaries

-* Thu Feb 17 2011 Vitezslav Crhonek <vcrhonek@redhat.com> - 2:2.10.1-2
+* Thu Feb 17 2011 Vitezslav Crhonek <vcrhonek@redhat.com> - 2:2.10.0-2
 - Remove dubuginfo files from -libs subpackage

-* Wed Feb 16 2011 Vitezslav Crhonek <vcrhonek@redhat.com> - 2:2.10.1-1
- Update to upstream version 2.10.1
+* Wed Feb 16 2011 Vitezslav Crhonek <vcrhonek@redhat.com> - 2:2.10.0-1
+- Update to upstream version 2.10.0
 - Move creating of the 'pegasus' user and group to the 'libs' %%pre
 - Use %%global instead of %%define and some minor spec file cleaning