Compare commits
No commits in common. "c8" and "c9" have entirely different histories.
|
|
@ -0,0 +1,10 @@
|
|||
diff -up pegasus/src/Pegasus/ExportClient/tests/libraries.mak.orig pegasus/src/Pegasus/ExportClient/tests/libraries.mak
|
||||
--- pegasus/src/Pegasus/ExportClient/tests/libraries.mak.orig 2020-11-26 10:20:13.938292092 +0100
|
||||
+++ pegasus/src/Pegasus/ExportClient/tests/libraries.mak 2020-11-26 10:25:30.248432039 +0100
|
||||
@@ -35,4 +35,5 @@ LIBRARIES= \
|
||||
pegrepository \
|
||||
pegconfig \
|
||||
pegclient \
|
||||
- pegcommon
|
||||
+ pegcommon \
|
||||
+ pegwsmserver
|
||||
|
|
@ -0,0 +1,22 @@
|
|||
--- pegasus/src/Pegasus/Common/InternalException.cpp.orig 2020-03-25 04:14:59.507215411 +0000
|
||||
+++ pegasus/src/Pegasus/Common/InternalException.cpp 2020-03-25 04:06:31.545770255 +0000
|
||||
@@ -982,7 +982,7 @@ SocketWriteError::~SocketWriteError()
|
||||
// PEGASUS_MAXELEMENTS_NUM HTTP header fields in a single HTTP message
|
||||
//==============================================================================
|
||||
TooManyHTTPHeadersException::TooManyHTTPHeadersException()
|
||||
- : Exception("more than "PEGASUS_MAXELEMENTS
|
||||
+ : Exception("more than " PEGASUS_MAXELEMENTS
|
||||
" header fields detected in HTTP message")
|
||||
{
|
||||
}
|
||||
--- pegasus/src/Pegasus/Client/tests/slp/slpclient.cpp.orig 2020-03-25 04:21:46.078970915 +0000
|
||||
+++ pegasus/src/Pegasus/Client/tests/slp/slpclient.cpp 2020-03-25 04:22:16.302878401 +0000
|
||||
@@ -49,7 +49,7 @@ int main(int argc, char** argv)
|
||||
|
||||
Array<Attribute> criteria;
|
||||
Attribute attr(
|
||||
- PEG_WBEM_SLP_SERVICE_ID"="PEG_WBEM_SLP_SERVICE_ID_DEFAULT);
|
||||
+ PEG_WBEM_SLP_SERVICE_ID"=" PEG_WBEM_SLP_SERVICE_ID_DEFAULT);
|
||||
Array<CIMServerDescription> connections;
|
||||
SLPClientOptions* opts = (SLPClientOptions*)NULL;
|
||||
if (argc == 2)
|
||||
|
|
@ -0,0 +1,55 @@
|
|||
This patch is required because net-smp is not build with DES support,
|
||||
so usmDESPrivProtocol is not available.
|
||||
|
||||
diff -up pegasus/src/Pegasus/Handler/snmpIndicationHandler/snmpDeliverTrap_netsnmp.cpp.orig pegasus/src/Pegasus/Handler/snmpIndicationHandler/snmpDeliverTrap_netsnmp.cpp
|
||||
--- pegasus/src/Pegasus/Handler/snmpIndicationHandler/snmpDeliverTrap_netsnmp.cpp.orig 2021-06-23 09:57:12.052712533 +0200
|
||||
+++ pegasus/src/Pegasus/Handler/snmpIndicationHandler/snmpDeliverTrap_netsnmp.cpp 2021-06-23 10:06:19.893857294 +0200
|
||||
@@ -247,6 +247,16 @@ void snmpDeliverTrap_netsnmp::_createSes
|
||||
#ifdef PEGASUS_ENABLE_NET_SNMPV3
|
||||
case _SNMPv3_TRAP:
|
||||
{
|
||||
+ if(snmpSecPrivProto == 1)
|
||||
+ {
|
||||
+ //DES is no longer supported.
|
||||
+ PEG_METHOD_EXIT();
|
||||
+ throw PEGASUS_CIM_EXCEPTION_L(CIM_ERR_NOT_SUPPORTED,
|
||||
+ MessageLoaderParms(
|
||||
+ _MSG_DES_NOT_SUPPORTED_KEY,
|
||||
+ _MSG_DES_NOT_SUPPORTED));
|
||||
+ }
|
||||
+
|
||||
snmpSession.version = SNMP_VERSION_3;
|
||||
CString securityNameCStr = securityName.getCString();
|
||||
size_t securityNameLen = strlen(securityNameCStr);
|
||||
@@ -321,14 +331,7 @@ void snmpDeliverTrap_netsnmp::_createSes
|
||||
|
||||
SNMP_FREE(snmpSession.securityPrivProto);
|
||||
//Privacy
|
||||
- if(snmpSecPrivProto == 1) //DES
|
||||
- {
|
||||
- snmpSession.securityPrivProto = snmp_duplicate_objid(
|
||||
- usmDESPrivProtocol,
|
||||
- USM_PRIV_PROTO_DES_LEN);
|
||||
- snmpSession.securityPrivProtoLen = USM_PRIV_PROTO_DES_LEN;
|
||||
- }
|
||||
- else if(snmpSecPrivProto == 2) // AES
|
||||
+ if(snmpSecPrivProto == 2) // AES
|
||||
{
|
||||
snmpSession.securityPrivProto = snmp_duplicate_objid(
|
||||
usmAESPrivProtocol,
|
||||
diff -up pegasus/src/Pegasus/Handler/snmpIndicationHandler/snmpDeliverTrap_netsnmp.h.orig pegasus/src/Pegasus/Handler/snmpIndicationHandler/snmpDeliverTrap_netsnmp.h
|
||||
--- pegasus/src/Pegasus/Handler/snmpIndicationHandler/snmpDeliverTrap_netsnmp.h.orig 2021-06-23 09:57:54.014119384 +0200
|
||||
+++ pegasus/src/Pegasus/Handler/snmpIndicationHandler/snmpDeliverTrap_netsnmp.h 2021-06-23 10:05:04.489320833 +0200
|
||||
@@ -64,6 +64,12 @@ static const char _MSG_VERSION_NOT_SUPPO
|
||||
"Handler.snmpIndicationHandler.snmpDeliverTrap_netsnmp."
|
||||
"_MSG_VERSION_NOT_SUPPORTED";
|
||||
|
||||
+static const char _MSG_DES_NOT_SUPPORTED[] =
|
||||
+ "DES support is disabled in SNMP.";
|
||||
+static const char _MSG_DES_NOT_SUPPORTED_KEY[] =
|
||||
+ "Handler.snmpIndicationHandler.snmpDeliverTrap_netsnmp."
|
||||
+ "_MSG_DES_NOT_SUPPORTED";
|
||||
+
|
||||
static const char _MSG_SESSION_SEND_FAILED[] =
|
||||
"Snmp Indication Handler failed to send the trap: ";
|
||||
static const char _MSG_SESSION_SEND_FAILED_KEY[] =
|
||||
|
|
@ -8,11 +8,10 @@
|
|||
|
||||
Name: tog-pegasus
|
||||
Version: %{major_ver}.1
|
||||
Release: 46%{?dist}
|
||||
Release: 64%{?dist}
|
||||
Epoch: 2
|
||||
Summary: OpenPegasus WBEM Services for Linux
|
||||
|
||||
Group: System Environment/Daemons
|
||||
License: MIT
|
||||
URL: http://www.openpegasus.org
|
||||
Source0: https://collaboration.opengroup.org/pegasus/documents/27211/pegasus-%{version}.tar.gz
|
||||
|
|
@ -98,9 +97,15 @@ Patch40: pegasus-2.14.1-tesid.patch
|
|||
Patch41: pegasus-2.14.1-ssl-cert-path.patch
|
||||
# 42: port to openssl-1.1
|
||||
Patch42: pegasus-2.14.1-openssl-1.1-fix.patch
|
||||
# 43: comply with system crypto policy
|
||||
# 43: fix -Wreserved-user-defined-literal warnings which prevents building with clang
|
||||
Patch43: pegasus-2.14.1-fix-Wreserved-user-defined-literal.patch
|
||||
# 44: comply with Fedora crypto policy
|
||||
# (use 'PROFILE=SYSTEM' instead of 'DEFAULT' in SSL_CTX_set_cipher_list calls)
|
||||
Patch43: pegasus-2.14.1-crypto-policy-compliance.patch
|
||||
Patch44: pegasus-2.14.1-crypto-policy-compliance.patch
|
||||
# 45: add required lib to fix FTBS
|
||||
Patch45: pegasus-2.14.1-add-pegwsmserver-to-ldd-libs.patch
|
||||
# 46: Remove DES support.
|
||||
Patch46: pegasus-snmp-disable-des.patch
|
||||
|
||||
BuildRequires: procps, libstdc++, pam-devel
|
||||
BuildRequires: openssl, openssl-devel
|
||||
|
|
@ -126,7 +131,6 @@ sources.
|
|||
|
||||
%package devel
|
||||
Summary: The OpenPegasus Software Development Kit
|
||||
Group: Development/Tools
|
||||
Requires: tog-pegasus >= %{version}-%{release}
|
||||
Obsoletes: tog-pegasus-sdk
|
||||
|
||||
|
|
@ -138,7 +142,6 @@ supports C provider developers via the CMPI interface.
|
|||
|
||||
%package libs
|
||||
Summary: The OpenPegasus Libraries
|
||||
Group: System Environment/Libraries
|
||||
Conflicts: libcmpiCppImpl0
|
||||
Requires(pre): /usr/sbin/useradd
|
||||
Requires(pre): /usr/sbin/groupadd
|
||||
|
|
@ -150,7 +153,6 @@ The OpenPegasus libraries.
|
|||
%if %{PEGASUS_BUILD_TEST_RPM}
|
||||
%package test
|
||||
Summary: The OpenPegasus Tests
|
||||
Group: Development/Debug
|
||||
Requires: tog-pegasus >= %{version}-%{release}, make
|
||||
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
|
||||
|
||||
|
|
@ -254,7 +256,10 @@ yes | mak/CreateDmtfSchema 238 %{SOURCE9} cim_schema_2.38.0
|
|||
%patch40 -p1 -b .testid
|
||||
%patch41 -p1 -b .ssl-cert-path
|
||||
%patch42 -p1 -b .openssl-1.1-fix
|
||||
%patch43 -p1 -b .crypto-policy-compliance
|
||||
%patch43 -p1 -b .Wreserved-user-defined-literal-fix
|
||||
%patch44 -p1 -b .crypto-policy-compliance
|
||||
%patch45 -p1 -b .add-pegwsmserver-to-ldd-libs
|
||||
%patch46 -p1 -b .snmp-disable-des
|
||||
|
||||
|
||||
%build
|
||||
|
|
@ -275,16 +280,16 @@ export LD_LIBRARY_PATH=$PEGASUS_HOME/lib
|
|||
export PATH=$PEGASUS_HOME/bin:$PATH
|
||||
|
||||
export PEGASUS_EXTRA_C_FLAGS="$RPM_OPT_FLAGS -fPIC -g -Wall -Wno-unused -fno-strict-aliasing"
|
||||
export PEGASUS_EXTRA_CXX_FLAGS="$PEGASUS_EXTRA_C_FLAGS"
|
||||
export PEGASUS_EXTRA_LINK_FLAGS="$RPM_OPT_FLAGS"
|
||||
export PEGASUS_EXTRA_CXX_FLAGS="$PEGASUS_EXTRA_C_FLAGS -std=c++14"
|
||||
export PEGASUS_EXTRA_LINK_FLAGS="$RPM_OPT_FLAGS -Wl,-z,now"
|
||||
export PEGASUS_EXTRA_PROGRAM_LINK_FLAGS="-g -pie -Wl,-z,relro,-z,now,-z,nodlopen,-z,noexecstack"
|
||||
export SYS_INCLUDES=-I/usr/kerberos/include
|
||||
|
||||
make %{?_smp_mflags} -f ${PEGASUS_ROOT}/Makefile.Release create_ProductVersionFile
|
||||
make %{?_smp_mflags} -f ${PEGASUS_ROOT}/Makefile.Release create_CommonProductDirectoriesInclude
|
||||
make %{?_smp_mflags} -f ${PEGASUS_ROOT}/Makefile.Release create_ConfigProductDirectoriesInclude
|
||||
make %{?_smp_mflags} -f ${PEGASUS_ROOT}/Makefile.Release all
|
||||
make %{?_smp_mflags} -f ${PEGASUS_ROOT}/Makefile.Release repository
|
||||
%make_build -f ${PEGASUS_ROOT}/Makefile.Release create_ProductVersionFile
|
||||
%make_build -f ${PEGASUS_ROOT}/Makefile.Release create_CommonProductDirectoriesInclude
|
||||
%make_build -f ${PEGASUS_ROOT}/Makefile.Release create_ConfigProductDirectoriesInclude
|
||||
%make_build -f ${PEGASUS_ROOT}/Makefile.Release all
|
||||
%make_build -f ${PEGASUS_ROOT}/Makefile.Release repository
|
||||
|
||||
|
||||
%install
|
||||
|
|
@ -488,7 +493,7 @@ fi
|
|||
:;
|
||||
|
||||
%preun
|
||||
%systemd_preun stop tog-pegasus.service
|
||||
%systemd_preun tog-pegasus.service
|
||||
if [ $1 -eq 0 ]; then
|
||||
# Package removal, not upgrade
|
||||
rm -rf /var/run/tog-pegasus
|
||||
|
|
@ -556,17 +561,76 @@ fi
|
|||
|
||||
|
||||
%changelog
|
||||
* Mon Jun 29 2020 Vitezslav Crhonek <vcrhonek@redhat.com> - 2:2.14.1-46
|
||||
- Comply with system crypto policy
|
||||
Resolves: #1842838
|
||||
* Tue Feb 01 2022 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.14.1-64
|
||||
- Fix build flags
|
||||
Resolves: #2044895
|
||||
- Fix preun systemd macro call
|
||||
Resolves: #2048002
|
||||
|
||||
* Tue May 05 2020 Vitezslav Crhonek <vcrhonek@redhat.com> - 2:2.14.1-45
|
||||
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 2:2.14.1-63
|
||||
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
||||
Related: rhbz#1991688
|
||||
|
||||
* Thu Jul 22 2021 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.14.1-62
|
||||
- Improve error message without DES support in SNMP
|
||||
Resolves: rhbz#1972623
|
||||
|
||||
* Wed Jun 16 2021 Florian Weimer <fweimer@redhat.com> - 2:2.14.1-61
|
||||
- Port to net-snmp without DES support (#1958073)
|
||||
|
||||
* Wed Jun 16 2021 Mohan Boddu <mboddu@redhat.com> - 2:2.14.1-60
|
||||
- Rebuilt for RHEL 9 BETA for openssl 3.0
|
||||
Related: rhbz#1971065
|
||||
|
||||
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 2:2.14.1-59
|
||||
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
||||
|
||||
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2:2.14.1-58
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Thu Nov 26 2020 Vitezslav Crhonek <vcrhonek@redhat.com> - 2:2.14.1-57
|
||||
- Fix FTBFS
|
||||
- Use make macros, patch by Tom Stellard <tstellar@redhat.com>
|
||||
|
||||
* Thu Aug 27 2020 Josef Řídký <jridky@redhat.com> - 2:2.14.1-56
|
||||
- Rebuilt for new net-snmp release
|
||||
|
||||
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2:2.14.1-55
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Tue Jul 28 2020 Jeff Law <law@redhat.com> - 2:2.14.1-54
|
||||
- Force C++14 as this code is not C++17 ready
|
||||
|
||||
* Thu Jun 25 2020 Vitezslav Crhonek <vcrhonek@redhat.com> - 2:2.14.1-53
|
||||
- Comply with Fedora crypto policy
|
||||
|
||||
* Wed Mar 25 2020 Tom Stellard <tstellar@redhat.com> - 2:2.14.1-52
|
||||
- Fix -Wreserved-user-defined-literal warnings
|
||||
|
||||
* Thu Feb 27 2020 Vitezslav Crhonek <vcrhonek@redhat.com> - 2:2.14.1-51
|
||||
- Fix tmpfiles path
|
||||
Resolves: #1805977
|
||||
|
||||
* Wed Aug 01 2018 Vitezslav Crhonek <vcrhonek@redhat.com> - 2:2.14.1-44
|
||||
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2:2.14.1-50
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2:2.14.1-49
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2:2.14.1-48
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Mon Jan 14 2019 Björn Esser <besser82@fedoraproject.org> - 2:2.14.1-47
|
||||
- Rebuilt for libcrypt.so.2 (#1666033)
|
||||
|
||||
* Wed Aug 01 2018 Vitezslav Crhonek <vcrhonek@redhat.com> - 2:2.14.1-46
|
||||
- Review and fix %%files section because of failing rpm -V
|
||||
|
||||
* Tue Jul 24 2018 Adam Williamson <awilliam@redhat.com> - 2:2.14.1-45
|
||||
- Rebuild for new net-snmp
|
||||
|
||||
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2:2.14.1-44
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2:2.14.1-43
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue