Compare commits
No commits in common. "fe5ec9ed35042f736f6a487b5431ea77b6a730fd" and "081267dc43eed58afcf27fddc162e9bb98318b56" have entirely different histories.
fe5ec9ed35
...
081267dc43
|
|
@ -1,2 +0,0 @@
|
|||
c832eaf240f6dfba843c4937f7a935382d48b9be pegasus-2.14.1.tar.gz
|
||||
151955bd95cefac21c67996b59910d61461e2132 cim_schema_2.38.0Experimental-MOFs.zip
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
--- !Policy
|
||||
product_versions:
|
||||
- rhel-9
|
||||
decision_context: osci_compose_gate
|
||||
rules:
|
||||
- !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}
|
||||
|
|
@ -1,55 +0,0 @@
|
|||
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[] =
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
---
|
||||
inspections:
|
||||
badfuncs: off
|
||||
ownership:
|
||||
bin_group: pegasus
|
||||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
Name: tog-pegasus
|
||||
Version: %{major_ver}.1
|
||||
Release: 64%{?dist}
|
||||
Release: 57%{?dist}
|
||||
Epoch: 2
|
||||
Summary: OpenPegasus WBEM Services for Linux
|
||||
|
||||
|
|
@ -104,8 +104,6 @@ Patch43: pegasus-2.14.1-fix-Wreserved-user-defined-literal.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
|
||||
|
|
@ -259,7 +257,6 @@ yes | mak/CreateDmtfSchema 238 %{SOURCE9} cim_schema_2.38.0
|
|||
%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
|
||||
|
|
@ -281,7 +278,7 @@ 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 -std=c++14"
|
||||
export PEGASUS_EXTRA_LINK_FLAGS="$RPM_OPT_FLAGS -Wl,-z,now"
|
||||
export PEGASUS_EXTRA_LINK_FLAGS="$RPM_OPT_FLAGS"
|
||||
export PEGASUS_EXTRA_PROGRAM_LINK_FLAGS="-g -pie -Wl,-z,relro,-z,now,-z,nodlopen,-z,noexecstack"
|
||||
export SYS_INCLUDES=-I/usr/kerberos/include
|
||||
|
||||
|
|
@ -493,7 +490,7 @@ fi
|
|||
:;
|
||||
|
||||
%preun
|
||||
%systemd_preun tog-pegasus.service
|
||||
%systemd_preun stop tog-pegasus.service
|
||||
if [ $1 -eq 0 ]; then
|
||||
# Package removal, not upgrade
|
||||
rm -rf /var/run/tog-pegasus
|
||||
|
|
@ -561,33 +558,6 @@ fi
|
|||
|
||||
|
||||
%changelog
|
||||
* 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 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>
|
||||
|
|
|
|||
Loading…
Reference in New Issue