Bug 2211063

Summary: Rebase package to upstream version 1.8.5
Product: Red Hat Enterprise Linux 8 Reporter: Phil Sutter <psutter>
Component: iptablesAssignee: Phil Sutter <psutter>
Status: MODIFIED --- QA Contact: qe-baseos-daemons
Severity: unspecified Docs Contact:
Priority: unspecified    
Version: 8.9CC: bpanchal, jbainbri, jpeska, todoleza
Target Milestone: rcKeywords: Triaged
Target Release: 8.9Flags: psutter: needinfo? (todoleza)
psutter: needinfo? (jpeska)
Hardware: Unspecified   
OS: Unspecified   
Whiteboard:
Fixed In Version: iptables-1.8.5-8.el8 Doc Type: If docs needed, set a value
Doc Text:
Story Points: ---
Clone Of: Environment:
Last Closed: Type: Bug
Regression: --- Mount Type: ---
Documentation: --- CRM:
Verified Versions: Category: ---
oVirt Team: --- RHEL 7.3 requirements from Atomic Host:
Cloudforms Team: --- Target Upstream Version:
Embargoed:
Bug Depends On:    
Bug Blocks: 2190094    

Description Phil Sutter 2023-05-30 12:21:12 UTC 
The current iptables-1.8.4-24.el8 contains 78 distinct backports from upstream.
A caching issue reported in bug 2190094 required an additional 29 backports to
resolve, mainly a cache-related refactoring which went into upstream's v1.8.5
release. The risk and testing overhead involved with backporting these commits
out of order makes up for that of a rebase, so we'll do the latter instead:

Rebase onto v1.8.5 plus the fixes upstream identified using 'Fixes:' tag and
all of the previous 78 backports not already present. To reduce merge
conflicts, sort them by commit date.
Comment 1 Phil Sutter 2023-05-30 12:36:15 UTC 
Use the opportunity for a bit of spec file cleanup:

* Drop the bootstrap code needed when libiptc SONAME bumped in RHEL8.2
* Eliminate a duplicate file warning caused by overlapping globbing in %files
  section
Comment 2 Phil Sutter 2023-05-30 12:39:12 UTC 
Changes proposed here: https://gitlab.com/redhat/centos-stream/rpms/iptables/-/merge_requests/36