Skip to content

Instantly share code, notes, and snippets.

@dmnks
Last active November 28, 2023 13:09
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save dmnks/ab3e59cd9500c4975b4795e4ff9d0a25 to your computer and use it in GitHub Desktop.
Save dmnks/ab3e59cd9500c4975b4795e4ff9d0a25 to your computer and use it in GitHub Desktop.
RPM 4.19.1 cherry-pick plan
pick 208529518 Drop no longer needed pull from updates-testing for rpm-sequoia
# PR #2537: Support generating dependencies for multiple files at once
drop 35a460e50 Refactor file walk loop into rpmfcHelper()
drop f24c242ef Pass the entire attribute to applyAttr() for more flexibility
drop 285d2d337 Split weeding out excludes to a separate loop
drop ed5571ac0 Refactor dependency generation out of rpmfcHelper()
drop ae71dda9a Low-level support for passing multiple files to dependency generators
drop d3dbe17b2 Support optional multifile protocol in dependency generation
drop 08ae4ee23 Add multifile support to elf dependency generation
noop 34d983fa2 Fix compile regression from 071be753cf05b2753efb0d3c51d4fa59b9641d09
# PR #2660: Source + header spring cleaning
pick 74783883c Split our include_directories() per use-case, comment
pick d4eb1f2fe Move top-level headers to misc/ and include that everywhere
pick 13eb82e9b Move rpmhash.[CH] into misc/ for clarity
pick 86d99a1d2 Move all cli utility sources under tools/
pick 1c98b6791 Drop top-level source for our global include directories
drop 959b4e475 Make the plugin API public
pick 1120c8cf7 Add a testcase for librpm development
pick 6867ef9f8 Add a Provides generator for rpm lua modules
drop 9c96c5d4c Axe the experimental non-privileged chroot support from b4c832ca
pick a25d881f2 Fix tagtbl.C placement in build dir
pick 580219249 Python tests: Close open files
pick ea6dab80d Simplify communicating crypto backend to the test-suite
pick 56558a5a6 Make 'cmake -L' output meaningful
# PR #2688: Make our plugin directory a global cache configurable and export it
drop ab28534f9 Make our plugin directory a global cache configurable and export it
drop 3d3b1557e Export our config dir in the cmake package
pick ea19571b8 Fix build-order regression from 1c98b67911e19a5f92c7fa4492aaa1000a06edad
# PR #2696: Minor test-suite tweaks/fixes, volume V
pick cca5d1b1d Make snapshot() work without CMake configuration
pick 09e472040 Move snapshot() to mktree.common
pick 46c64c3f9 Rename make target env to atshell
pick 7e87a27f3 Keep record of stock RPM in RPMDB in Dockerfile
pick d1fd06c12 Add build stages to Dockerfile
pick f5e0cbad4 Split development tests into its own file
# PR #2699: Split plugin macros to per-plugin macros.d files
drop 14c1ee29f Add a cmake shortcut to the macros.d directory
drop ce7210d58 Split plugin config macros to per-plugin macros.d files
drop c284d09e8 Argh, unbreak plugins from the previous commit
drop ede341668 Add a "plugin development" testcase
# PR #2674: WIP: Use Python Stable ABI for the bindings
drop 9da1f44f9 Python stable ABI: Remove PyType_Ready calls
drop 294edf675 Python stable ABI: Add helper for adding a heap type
drop 5ad6c9628 Python stable ABI: Call helper for adding a heap type
drop a532a0d8c Python stable ABI: Make calls to `tp_free` go through PyType_GetSlot
drop 46897602f Python stable ABI: Make calls to `tp_alloc` go through PyType_GetSlot
drop 0d33ad853 Python stable ABI: Change type definitions to heap type specs
drop 2e74eec24 Python stable ABI: Adjust type usage & declarations
drop 3dc58ca30 Python stable ABI: Convert uses of Py${container}_SET_ITEM
drop 585bbfeaa Python stable ABI: Add error handling to Py${container}_SetItem
drop d76026101 Python stable ABI: Avoid initializing the module more than once
drop 25c7bbfbf Python stable ABI: Disable instantiation "manually" for some types
drop 7aef24743 Python stable ABI: Define Py_TPFLAGS_IMMUTABLETYPE as no-op if missing
drop 3a12a898c Python Stable ABI: Build for Stable ABI, require Python 3.7+
pick 314faf551 Eliminate some unnecessary rpmpgp.h includes
# PR #2703: Minor test-suite tweaks/fixes, volume VI
pick 3a1fb2e68 Always let mktree.fedora build run through
pick d4e808ebd Only rebuild the test tree when sources change
pick dd669840d Ignore non-zero return code in make (at)shell
pick a50e092fc Don't assume PWD of / in tests
# PR #2705: Docs/README and minor rewording
pick 0dc37b5c2 Reword to make sentence easier to understand
pick e0dd87517 Add docs/README.md
pick 5079c05b0 Return an error on macro expansion failure from Lua macros table too
pick f41040358 Ensure proper working dir when processing rpmrc, platform and macros
pick 20c476f60 Make test-suite os detection stricter
pick 0c7a3be0c Eh, fix Friday afternoon brain-fart in test-suite os detection
pick db210b9ca Aaargh. Fix Monday morning "the fix is so obvious..."
# PR #2712: Enable debug information and optimizations in the CI build
pick 90c037a8c Enable debug information and optimizations in the CI build
pick 2fb0ddaf0 Run the CI build in parallel
drop fd8eaa52c Add a new plugin to enable Linux-specific namespace functionality
# PR #2713: Minor test-suite tweaks/fixes, volume VII
pick 1c25b5eb0 Move $PWD bind mount out of snapshot shell
pick 3fe6c981e Bind mount $PWD at $PWD, not /srv
pick 03dd07430 Don't stack overlays in test-suite
pick 0d0303414 Move make_install to after package installation
pick 70cc93cad Depend on mktree script when building the tree
pick cea7e09d7 Add --read-only argument to mount_tree
pick 860b3d82f Add rpmtests wrapper for container use
# PR #2646: Move checks and package initialization after build
drop 39617a379 Drop NVR parameter to make them easier to reuse
drop 051782496 Make functions available to be moved later on
drop fd32a43e0 Move checks and package initialization after build
drop 9165963de Remove checks during parsing of packages
drop f86998cd1 Always start parsing in the preable of the main package
drop 5d2885547 Add test case for dynamic spec
drop d13cea30c Add more dynamic spec test cases
drop d2be4773b Move internal OpenPGP parser into a subdirectory
# PR #2716: Minor cleanups towards detaching rpmpgp_legacy from rpm internals
drop ae2f4e783 Refactor internal PGP parser pgpValStr() uses to use the public API
drop 1bce1a1c2 Bury pgpValStr() inside rpmpgp.c now that we can
drop 4baecea43 Drop unneeded rpmio_internal.h includes in rpmpgp_legacy
drop 5a7c6eff1 Public rpmpgp.h header mass cleanup
drop 4a6114f7b Simplify pgpIdentItem() a bit
drop fa818208a Eliminate remaining pgpValStr() uses in the codebase
pick 12b073b56 Fix regression of mktree not always rebuilding
pick 3b070507a Document the argv[1] (vs 0) in rpmlua manual
pick bbadc2bb6 Add %_iconsdir macro
pick c97fd9359 Use uniform formatting for SEE ALSO sections
pick b3449a077 Remove lead checks other than the "magic number" check
# PR #2730: Convert %prep into a regular build scriptlet
drop 0758d03f7 Rename MacroBuf to rpmMacroBuf for exporting
drop 336c07c2e Rename mbErr() and mbAppend*() to rpmMacroBuf*() for exporting
drop e9c997f63 Add support for defining auxiliary macro functions
drop afd352481 Turn legacy %patchN syntax into a hard error
drop 7639512c5 Convert %prep into a regular build scriptlet
drop 064ba642f Drop now unnecessary spec parse hack, no functional changes
drop 283935b92 Implement prepend and append modes for all build scriptlets
pick 6e93ab1eb Fix typos
pick 61000db0b Add a blurb about portability expecations to contributing guidelines
# PR #2733: Standardize on OCI images in test-suite
pick 9ae317a81 Refactor rpmtests wrapper
pick 0dc534891 Add --shell command to rpmtests wrapper
pick f59100b3e Use the new --shell command in mktree.podman
pick b1eed579f Use --log only if running from source dir
pick 5fd2e028b Bind mount $PWD at /srv in test container
pick fe0c09f16 Only rebuild the RPM test layer
pick ec5ec7923 Add Dockerfile.fedora
pick 1a7956e00 Add native mode to mktree.podman
pick 93eef6d3a Standardize on OCI images in test-suite
pick c7ed626fb Move snapshot() back to atlocal
pick 47067768a Remove function keywords from atlocal
pick 15897bca7 Remove sudo from GH workflow
pick 05c3b37d1 Rename mktree.podman to mktree.oci
pick 302793af0 Exit from mktree on failure
# PR #2744: RPM 4.18.2 bugfix update
pick f8b4c99bd Properly document our different macro types and their scopes
pick e85a8a636 Document rpmdb --exportdb and --importdb switches + minor other tweaks
pick 173b737f4 Expose and document rpmdb --verifydb operation
# PR #2745: Bunch of sysusers.d handling fixes
pick 22e177f42 Use macro error reporting for %add_sysuser errors
pick d141c874b Fix an apparent thinko/typo in the sysusers test spec
pick 43cf645fc Handle unsupported 'r' and 'm' sysusers types more gracefully
pick a8ec76895 Fix comment line handling in sysusers.d(8) files
drop f9ae0a4da Refactor %__file_lineno management into an auxiliary macro
drop 5d5dc6076 Move OpenSSL code to newer API from version 3.0
pick 17f72c4e7 Fix a macro in the comment
drop 7a65f68d9 Set %_sharedstatedir to %{_var}/lib
pick bb1eeb491 Allow SOURCE_DATE_EPOCH=0 again
pick f851bce1e Adapt Dockerfile.fedora to F39
pick 4d219ed46 Switch brp-compress to bash
pick e3ab8a987 Split the dependency generation test into individual checks
pick 7d3d9041a Fix sbit removal if fchmodat() doesn't support AT_SYMLINK_NOFOLLOW
# PR #2758: Replace rpm2cpio with rpm2archive
drop d49e26498 Split the two rpm2archive tests to separate test-cases
drop 243deae92 Use the expected rpm2cpio-like syntax for rpm2archive tests
drop 80d5fc3c9 Fix some invalid rpm2cpio invocations in the test-suite
drop fa1fbe95e At least try to handle write errors in rpm2archive
drop b86f6ad4f Fix uid, gid and nlinks not getting populated by rpm2archive
drop 04d49fbd2 Add cpio format support to rpm2archive
pick f6b47609a Document rpm2cpio as obsolete, add pointer to rpm2archive.
drop 3151a1874 Refactor / cleanup rpm2archive entry fillup a bit
drop 833cd91be Replace rpm2cpio by rpm2archive entirely
# PR #2764: CVE-2021-35939 reproducer + a minor related fix
pick 2c20f9677 Allow version to be omitted in the replace test spec
pick 89ce4e7ca Fix wrong return code on O_DIRECTORY open of invalid symlink
pick 0091214d2 Add a test-case for invalid intermediate symlink owner (CVE-2021-35939)
pick 6714ec706 Fix %{getncpus proc/thread} potentially returning zero
pick 01fb42d42 Document pgpPrtParamsSubkeys() returning only signing-capable keys
pick c110ad11c Fix segfault on %{?getncpus}, regression in 4.19.x
drop 48610c051 Refactor the processing logic out of parseGeneratedSpecs() for reuse
drop 9d8ad5811 Drop parsePrep() entirely
pick 949f28197 Extend test README
pick c359a5cd3 Add support for retrieving %generate_buildrequires section from the spec
pick c14076820 Emit full paths for file disposition diagnostics on --fsmdebug
# PR #2784: Fix a bunch of compiler warnings on 32bit builds
pick 54a79a19c Fix a bunch of integer size mismatch warnings on 32bit builds
pick d0e03b21c Avoid compiler complaints from Transmeta Crusoe detection on x86 builds
pick 1cd9f9077 Fix integer overflow in memory calculations on 32bit systems
# Rebase 831296f1d..1cd9f9077 onto 831296f1d (315 commands)
#
# Commands:
# pick <commit> = use commit
# drop <commit> = remove commit, not suitable
# noop <commit> = remove commit, already applied
# <commit> = remove commit, not reviewed yet
#
# These lines MUST NOT be re-ordered; they are executed from top to bottom.
#
# vim:syntax=gitrebase
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment