From 491beaf7f1285fb0b0f5778c0d14a377cb63977f Mon Sep 17 00:00:00 2001 From: Saikrishna Arcot Date: Fri, 19 Aug 2022 11:20:00 -0700 Subject: [PATCH] [snmpd]: Update to 5.9+dfsg-4+deb11u1 to match Debian version (#11763) * [snmpd]: Update to 5.9+dfsg-4+deb11u1 to match Debian version This brings in some security fixes. Signed-off-by: Saikrishna Arcot * Update snmpd makefile Signed-off-by: Saikrishna Arcot * Remove binNMU for snmpd Signed-off-by: Saikrishna Arcot Signed-off-by: Saikrishna Arcot --- rules/snmpd.mk | 2 +- src/snmpd/Makefile | 14 -------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/rules/snmpd.mk b/rules/snmpd.mk index 52be51d1c5..e9e498556c 100644 --- a/rules/snmpd.mk +++ b/rules/snmpd.mk @@ -2,7 +2,7 @@ ifeq ($(BLDENV),bullseye) SNMPD_VERSION = 5.9+dfsg -SNMPD_VERSION_FULL = $(SNMPD_VERSION)-3+b1 +SNMPD_VERSION_FULL = $(SNMPD_VERSION)-4+deb11u1 else SNMPD_VERSION = 5.7.3+dfsg SNMPD_VERSION_FULL = $(SNMPD_VERSION)-5 diff --git a/src/snmpd/Makefile b/src/snmpd/Makefile index 35fc1d38ce..0c6d5bbbf3 100644 --- a/src/snmpd/Makefile +++ b/src/snmpd/Makefile @@ -31,27 +31,13 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% : rm -rf net-snmp-$(SNMPD_VERSION) # download debian net-snmp -ifneq (,$(findstring 5.9,$(SNMPD_VERSION))) - dget -u https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_$(SNMPD_VERSION)-3.dsc -else dget -u https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_$(SNMPD_VERSION_FULL).dsc -endif pushd net-snmp-$(SNMPD_VERSION) git init git add -f * git commit -m "unmodified snmpd source" -ifneq (,$(findstring 5.9,$(SNMPD_VERSION))) - # Looks like Debian did a binNMU (binary non-maintainer upload), so the latest dsc - # file that we can get doesn't actually have the exact version number that Debian's - # repos have. - DEBEMAIL="$(shell git config --get user.name) <$(shell git config --get user.email)>" dch --bin-nmu "Rebuild against perl 5.32.0" - dch -r "" - git add debian/changelog - git commit -m "fix package version" -endif - # Apply patches stg init stg import -s ../patch-$(SNMPD_VERSION)/series