From 88c642bdff799c74aea86ff11117b3d29021695a Mon Sep 17 00:00:00 2001 From: Vitezslav Crhonek Date: Tue, 9 Oct 2012 11:22:20 +0200 Subject: [PATCH] Update to upstream version 2.12.0 --- .gitignore | 1 + ...-2.11.1-disable-privilege-separation.patch | 6 +- pegasus-2.9.0-no-rpath.patch | 16 ++--- pegasus-2.9.0-sparc.patch | 62 +++++++++---------- sources | 2 +- tog-pegasus.spec | 12 +++- 6 files changed, 52 insertions(+), 47 deletions(-) diff --git a/.gitignore b/.gitignore index 5555963..28bd48a 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ pegasus-2.9.0.tar.gz /pegasus-2.10.0.tar.gz /pegasus-2.11.0.tar.gz /pegasus-2.11.1.tar.gz +/pegasus-2.12.0.tar.gz diff --git a/pegasus-2.11.1-disable-privilege-separation.patch b/pegasus-2.11.1-disable-privilege-separation.patch index 6119eee..d2780b0 100644 --- a/pegasus-2.11.1-disable-privilege-separation.patch +++ b/pegasus-2.11.1-disable-privilege-separation.patch @@ -1,9 +1,9 @@ diff -up pegasus/env_var_Linux.status.orig pegasus/env_var_Linux.status ---- pegasus/env_var_Linux.status.orig 2011-09-27 11:49:11.000000000 +0200 -+++ pegasus/env_var_Linux.status 2011-09-27 11:49:41.713613634 +0200 +--- pegasus/env_var_Linux.status.orig 2012-10-08 12:45:34.246048518 +0200 ++++ pegasus/env_var_Linux.status 2012-10-08 12:45:49.428129781 +0200 @@ -31,7 +31,7 @@ PEGASUS_USE_RELEASE_DIRS=true PEGASUS_USE_SYSLOGS=true - PEGASUS_CIM_SCHEMA=CIM228 + PEGASUS_CIM_SCHEMA=CIM231 PEGASUS_USE_NET_SNMP=true -PEGASUS_ENABLE_PRIVILEGE_SEPARATION=true +PEGASUS_ENABLE_PRIVILEGE_SEPARATION=false diff --git a/pegasus-2.9.0-no-rpath.patch b/pegasus-2.9.0-no-rpath.patch index a52aff3..6a98f30 100644 --- a/pegasus-2.9.0-no-rpath.patch +++ b/pegasus-2.9.0-no-rpath.patch @@ -1,6 +1,6 @@ -diff -up pegasus/mak/program-unix.mak_old pegasus/mak/program-unix.mak ---- pegasus/mak/program-unix.mak_old 2008-12-16 19:55:36.000000000 +0100 -+++ pegasus/mak/program-unix.mak 2009-03-18 15:08:52.000000000 +0100 +diff -up pegasus/mak/program-unix.mak.orig pegasus/mak/program-unix.mak +--- pegasus/mak/program-unix.mak.orig 2012-10-08 12:19:55.965024675 +0200 ++++ pegasus/mak/program-unix.mak 2012-10-08 12:21:02.378355115 +0200 @@ -28,19 +28,10 @@ #////////////////////////////////////////////////////////////////////////// INCLUDES = -I$(ROOT)/src $(EXTRA_INCLUDES) @@ -38,10 +38,10 @@ diff -up pegasus/mak/program-unix.mak_old pegasus/mak/program-unix.mak endif endif endif -diff -up pegasus/mak/shared-library-unix.mak_old pegasus/mak/shared-library-unix.mak ---- pegasus/mak/shared-library-unix.mak_old 2008-12-16 19:55:37.000000000 +0100 -+++ pegasus/mak/shared-library-unix.mak 2009-03-18 15:12:40.000000000 +0100 -@@ -94,15 +94,14 @@ ifeq ($(COMPILER),gnu) +diff -up pegasus/mak/shared-library-unix.mak.orig pegasus/mak/shared-library-unix.mak +--- pegasus/mak/shared-library-unix.mak.orig 2012-10-08 12:21:15.279419276 +0200 ++++ pegasus/mak/shared-library-unix.mak 2012-10-08 12:22:32.715804612 +0200 +@@ -98,15 +98,14 @@ ifeq ($(COMPILER),gnu) ifneq ($(OS),darwin) ifdef PEGASUS_USE_RELEASE_DIRS LINK_COMMAND = $(CXX) -shared $(LINK_MACHINE_OPTIONS) @@ -59,4 +59,4 @@ diff -up pegasus/mak/shared-library-unix.mak_old pegasus/mak/shared-library-unix + LINK_ARGUMENTS = --helplib$(LIBRARY)$(LIB_SUFFIX) -ldl $(EXTRA_LINK_ARGUMENTS) endif ifeq ($(PEGASUS_PLATFORM), SOLARIS_SPARC_GNU) - LINK_ARGUMENTS = -Wl,-hlib$(LIBRARY)$(LIB_SUFFIX) -Xlinker -L$(LIB_DIR) $(EXTRA_LINK_ARGUMENTS) + LINK_ARGUMENTS = -Wl,-hlib$(LIBRARY)$(LIB_SUFFIX) -Xlinker -L$(LIB_DIR) $(EXTRA_LINK_ARGUMENTS) diff --git a/pegasus-2.9.0-sparc.patch b/pegasus-2.9.0-sparc.patch index 9c9f9b0..4a0e1d1 100644 --- a/pegasus-2.9.0-sparc.patch +++ b/pegasus-2.9.0-sparc.patch @@ -1,22 +1,19 @@ diff -up pegasus/mak/config-linux.mak.sparc pegasus/mak/config-linux.mak ---- pegasus/mak/config-linux.mak.sparc 2009-06-09 14:21:24.000000000 +0200 -+++ pegasus/mak/config-linux.mak 2009-06-09 14:22:04.000000000 +0200 -@@ -148,7 +148,11 @@ ifndef PEGASUS_ARCH_LIB - ifeq ($(PEGASUS_PLATFORM),LINUX_X86_64_GNU) +--- pegasus/mak/config-linux.mak.sparc 2012-10-08 12:25:24.910661094 +0200 ++++ pegasus/mak/config-linux.mak 2012-10-08 12:28:07.613507858 +0200 +@@ -166,6 +166,9 @@ ifndef PEGASUS_ARCH_LIB + ifeq ($(PEGASUS_PLATFORM),LINUX_X86_64_CLANG) PEGASUS_ARCH_LIB = lib64 - else -- PEGASUS_ARCH_LIB = lib -+ ifeq ($(PEGASUS_PLATFORM),LINUX_SPARC64_GNU) -+ PEGASUS_ARCH_LIB = lib64 -+ else -+ PEGASUS_ARCH_LIB = lib -+ endif endif ++ ifeq ($(PEGASUS_PLATFORM),LINUX_SPARC64_GNU) ++ PEGASUS_ARCH_LIB = lib64 ++ endif + PEGASUS_ARCH_LIB = lib endif DEFINES += -DPEGASUS_ARCH_LIB=\"$(PEGASUS_ARCH_LIB)\" diff -up pegasus/mak/platform_LINUX_SPARC64_GNU.mak.sparc pegasus/mak/platform_LINUX_SPARC64_GNU.mak ---- pegasus/mak/platform_LINUX_SPARC64_GNU.mak.sparc 2009-06-09 16:09:54.000000000 +0200 -+++ pegasus/mak/platform_LINUX_SPARC64_GNU.mak 2009-06-09 14:22:46.000000000 +0200 +--- pegasus/mak/platform_LINUX_SPARC64_GNU.mak.sparc 2012-10-08 12:29:27.198953706 +0200 ++++ pegasus/mak/platform_LINUX_SPARC64_GNU.mak 2012-10-08 12:33:08.735161475 +0200 @@ -0,0 +1,36 @@ +#//%2006//////////////////////////////////////////////////////////////////////// +#// @@ -55,8 +52,8 @@ diff -up pegasus/mak/platform_LINUX_SPARC64_GNU.mak.sparc pegasus/mak/platform_L + +ARCHITECTURE = sparc diff -up pegasus/mak/platform_LINUX_SPARCV9_GNU.mak.sparc pegasus/mak/platform_LINUX_SPARCV9_GNU.mak ---- pegasus/mak/platform_LINUX_SPARCV9_GNU.mak.sparc 2009-06-09 16:10:03.000000000 +0200 -+++ pegasus/mak/platform_LINUX_SPARCV9_GNU.mak 2009-06-09 14:23:28.000000000 +0200 +--- pegasus/mak/platform_LINUX_SPARCV9_GNU.mak.sparc 2012-10-08 12:33:49.424379019 +0200 ++++ pegasus/mak/platform_LINUX_SPARCV9_GNU.mak 2012-10-08 12:30:54.670435787 +0200 @@ -0,0 +1,36 @@ +#//%2006//////////////////////////////////////////////////////////////////////// +#// @@ -95,9 +92,9 @@ diff -up pegasus/mak/platform_LINUX_SPARCV9_GNU.mak.sparc pegasus/mak/platform_L + +ARCHITECTURE = sparc diff -up pegasus/mak/SDKMakefile.sparc pegasus/mak/SDKMakefile ---- pegasus/mak/SDKMakefile.sparc 2009-06-09 14:23:42.000000000 +0200 -+++ pegasus/mak/SDKMakefile 2009-06-09 15:40:23.000000000 +0200 -@@ -461,6 +461,18 @@ ifeq ($(RUNTIME_PLATFORM_TEST_NEEDED), t +--- pegasus/mak/SDKMakefile.sparc 2012-10-08 12:31:17.904562644 +0200 ++++ pegasus/mak/SDKMakefile 2012-10-08 12:37:29.392538539 +0200 +@@ -501,6 +501,18 @@ ifeq ($(RUNTIME_PLATFORM_TEST_NEEDED), t >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak @$(ECHO-E) " endif" \ >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak @@ -116,10 +113,11 @@ diff -up pegasus/mak/SDKMakefile.sparc pegasus/mak/SDKMakefile else $(error This SDK has been defined to include the following \ platforms: $(PACKAGED_PLATFORM_FILES). \ -@@ -517,6 +529,18 @@ ifeq ($(RUNTIME_PLATFORM_TEST_NEEDED), t +@@ -577,7 +589,18 @@ ifeq ($(RUNTIME_PLATFORM_TEST_NEEDED), t >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak @$(ECHO-E) "endif" \ >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak +- + @$(ECHO-E) "ifeq (\044(PEGASUS_PLATFORM),LINUX_SPARCV9_GNU)" \ + >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak + @$(ECHO-E) " PEGASUS_ARCH_LIB = lib" \ @@ -136,12 +134,12 @@ diff -up pegasus/mak/SDKMakefile.sparc pegasus/mak/SDKMakefile $(error This SDK has been defined to include the following \ platforms: $(PACKAGED_PLATFORM_FILES). \ diff -up pegasus/src/Pegasus/Common/Config.h.sparc pegasus/src/Pegasus/Common/Config.h ---- pegasus/src/Pegasus/Common/Config.h.sparc 2009-06-09 15:43:48.000000000 +0200 -+++ pegasus/src/Pegasus/Common/Config.h 2009-06-09 15:44:43.000000000 +0200 -@@ -76,6 +76,10 @@ - # include - #elif defined (PEGASUS_PLATFORM_LINUX_PPC64_GNU) +--- pegasus/src/Pegasus/Common/Config.h.sparc 2012-10-08 12:38:08.351741449 +0200 ++++ pegasus/src/Pegasus/Common/Config.h 2012-10-08 12:38:53.697976948 +0200 +@@ -82,6 +82,10 @@ # include + #elif defined (PEGASUS_PLATFORM_LINUX_PPC_E500_GNU) + # include +#elif defined (PEGASUS_PLATFORM_LINUX_SPARCV9_GNU) +# include +#elif defined (PEGASUS_PLATFORM_LINUX_SPARC64_GNU) @@ -150,8 +148,8 @@ diff -up pegasus/src/Pegasus/Common/Config.h.sparc pegasus/src/Pegasus/Common/Co # include #elif defined (PEGASUS_PLATFORM_LINUX_ZSERIES64_GNU) diff -up pegasus/src/Pegasus/Common/Platform_LINUX_SPARC64_GNU.h.sparc pegasus/src/Pegasus/Common/Platform_LINUX_SPARC64_GNU.h ---- pegasus/src/Pegasus/Common/Platform_LINUX_SPARC64_GNU.h.sparc 2009-06-09 16:10:36.000000000 +0200 -+++ pegasus/src/Pegasus/Common/Platform_LINUX_SPARC64_GNU.h 2009-06-09 15:46:22.000000000 +0200 +--- pegasus/src/Pegasus/Common/Platform_LINUX_SPARC64_GNU.h.sparc 2012-10-08 12:39:25.331140743 +0200 ++++ pegasus/src/Pegasus/Common/Platform_LINUX_SPARC64_GNU.h 2012-10-08 12:40:32.353486723 +0200 @@ -0,0 +1,93 @@ +/* +//%2006//////////////////////////////////////////////////////////////////////// @@ -247,8 +245,8 @@ diff -up pegasus/src/Pegasus/Common/Platform_LINUX_SPARC64_GNU.h.sparc pegasus/s + +#endif /* Pegasus_Platform_LINUX_SPARC64_GNU_h */ diff -up pegasus/src/Pegasus/Common/Platform_LINUX_SPARCV9_GNU.h.sparc pegasus/src/Pegasus/Common/Platform_LINUX_SPARCV9_GNU.h ---- pegasus/src/Pegasus/Common/Platform_LINUX_SPARCV9_GNU.h.sparc 2009-06-09 16:10:50.000000000 +0200 -+++ pegasus/src/Pegasus/Common/Platform_LINUX_SPARCV9_GNU.h 2009-06-09 15:47:38.000000000 +0200 +--- pegasus/src/Pegasus/Common/Platform_LINUX_SPARCV9_GNU.h.sparc 2012-10-08 12:40:43.042541758 +0200 ++++ pegasus/src/Pegasus/Common/Platform_LINUX_SPARCV9_GNU.h 2012-10-08 12:41:51.297892618 +0200 @@ -0,0 +1,93 @@ +/* +//%2006//////////////////////////////////////////////////////////////////////// @@ -344,8 +342,8 @@ diff -up pegasus/src/Pegasus/Common/Platform_LINUX_SPARCV9_GNU.h.sparc pegasus/s + +#endif /* Pegasus_Platform_LINUX_SPARCV9_GNU_h */ diff -up pegasus/src/SDK/samples/mak/LINUX_SPARC64_GNU.mak.sparc pegasus/src/SDK/samples/mak/LINUX_SPARC64_GNU.mak ---- pegasus/src/SDK/samples/mak/LINUX_SPARC64_GNU.mak.sparc 2009-06-09 16:11:24.000000000 +0200 -+++ pegasus/src/SDK/samples/mak/LINUX_SPARC64_GNU.mak 2009-06-09 16:04:48.000000000 +0200 +--- pegasus/src/SDK/samples/mak/LINUX_SPARC64_GNU.mak.sparc 2012-10-08 12:42:23.140055774 +0200 ++++ pegasus/src/SDK/samples/mak/LINUX_SPARC64_GNU.mak 2012-10-08 12:42:54.003213719 +0200 @@ -0,0 +1,55 @@ +#//%2006//////////////////////////////////////////////////////////////////////// +#// @@ -403,8 +401,8 @@ diff -up pegasus/src/SDK/samples/mak/LINUX_SPARC64_GNU.mak.sparc pegasus/src/SDK +SYM_LINK_LIB = $(PEGASUS_PROVIDER_LIB_DIR)/lib$(LIBRARY) +PLATFORM_LIB_SUFFIX = so diff -up pegasus/src/SDK/samples/mak/LINUX_SPARCV9_GNU.mak.sparc pegasus/src/SDK/samples/mak/LINUX_SPARCV9_GNU.mak ---- pegasus/src/SDK/samples/mak/LINUX_SPARCV9_GNU.mak.sparc 2009-06-09 16:11:37.000000000 +0200 -+++ pegasus/src/SDK/samples/mak/LINUX_SPARCV9_GNU.mak 2009-06-09 16:05:28.000000000 +0200 +--- pegasus/src/SDK/samples/mak/LINUX_SPARCV9_GNU.mak.sparc 2012-10-08 12:43:12.451308189 +0200 ++++ pegasus/src/SDK/samples/mak/LINUX_SPARCV9_GNU.mak 2012-10-08 12:43:44.962474061 +0200 @@ -0,0 +1,55 @@ +#//%2006//////////////////////////////////////////////////////////////////////// +#// diff --git a/sources b/sources index 5a443ce..5129f50 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b617e266d8fb3a2d14d33abe41b7ebaf pegasus-2.11.1.tar.gz +144d8d9f1a73405a31b7204bfe5bbb58 pegasus-2.12.0.tar.gz diff --git a/tog-pegasus.spec b/tog-pegasus.spec index ccb4432..32cbcc5 100644 --- 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.11 +%global major_ver 2.12 %global pegasus_gid 65 %global pegasus_uid 66 Name: tog-pegasus -Version: %{major_ver}.1 -Release: 10%{?dist} +Version: %{major_ver}.0 +Release: 1%{?dist} Epoch: 2 Summary: OpenPegasus WBEM Services for Linux @@ -172,6 +172,9 @@ The OpenPegasus WBEM tests for the OpenPegasus %{version} Linux rpm. %prep %setup -q -n %{srcname} +# upstream tarball has wrong structure - pegasus/pegasus/ +cp -pR pegasus/* . +rm -rf pegasus/ %patch1 -p1 -b .no-rpath %patch2 -p1 -b .PIE %patch3 -p1 -b .redhat-config @@ -434,6 +437,9 @@ fi %changelog +* Tue Oct 09 2012 Vitezslav Crhonek - 2:2.12.0-1 +- Update to upstream version 2.12.0 + * Wed Aug 22 2012 Lukáš Nykrýn - 2:2.11.1-10 - Scriptlets replaced with new systemd macros (#850411)