Compare commits

...

132 Commits
f27 ... master

Author SHA1 Message Date
Fedora Release Engineering 76cdb88b46 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-08-01 07:56:43 +00:00
Fedora Release Engineering 0ebeb5e42f - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-07-29 05:54:57 +00:00
Peter Robinson 767e7a50a0 rebuild for ima-evm-utils 1.3 2020-07-26 13:53:37 +01:00
Tom Callaway 97e353c02c rebuild for lua 5.4 2020-06-29 22:41:11 -04:00
Panu Matilainen 621aa87bba Rebase to rpm 4.16.0 beta3 2020-06-24 11:37:24 +03:00
Panu Matilainen f7ecc585d0 Fix prefix search on sqlite backend (many file triggers not running) 2020-06-10 10:40:39 +03:00
Panu Matilainen b9a32bc4b3 Unbreak metainfo() provide generation 2020-06-08 12:00:05 +03:00
Panu Matilainen 220819b9e7 Don't auto-enable _flush_io on non-rotational media, it's too costly 2020-06-03 10:25:34 +03:00
Panu Matilainen bd27fcf3b7 Rebase to rpm 4.16.0 beta1 2020-06-01 09:51:16 +03:00
Panu Matilainen 03c8fed85d Move scriptlets to a more logical space in the spec
Accidentally slopped into middle of %files sections by yours truly.
2020-06-01 09:50:30 +03:00
Miro Hrončok 08269f4d3c Rebuilt for Python 3.9 2020-05-22 20:17:50 +02:00
Panu Matilainen 422abdab32 Fix segfault when trying to use unknown database backend 2020-05-12 12:56:04 +03:00
Panu Matilainen d451552090 Switch default database to sqlite (#1818910)
Newly created databases will be sqlite unless overridden in configuration.

If BDB database is detected at %posttrans of rpm itself, it's flagged
for rebuild in the next reboot. This will serve two purposes: the primary
objective is obviously to convert to configured (ie sqlite) format,
but as a secondary side-effect, any remaining BDB databases will get
a much needed maintenance rebuild from time to time.
2020-05-07 09:15:38 +03:00
Panu Matilainen 82d52d2b3a Use traditional comments instead of %dnl to preserve boostrappability 2020-05-07 08:40:26 +03:00
Panu Matilainen 13e726e8eb Handle rpmdb-rebuild service enablement for upgrades
Discussed in https://pagure.io/fesco/issue/2382, deemed to not require
any exceptions although this is a bit of an unusual path.

%triggerun as opposed to seemingly more obvious %triggerin is used to
ensure preset files have already been updated without adding new
ordering constraints.
2020-05-04 10:17:42 +03:00
Panu Matilainen 1b2c14f39a Fix questionable uses of %{name} and %{version} in the spec
%{name} and %{version} refer to the name and version strings of the
package that will be built and shouldn't be used for things that
do not honor those macros. Such as pre-existing or predetermined
filenames.

De-facto packaging practises over multiple decade liberally (ab)use
these and various other macros in places they don't belong - if rpm itself
doesn't follow its own rules then how can we expect anybody else to do so...

This doesn't change anything as is, but enables both Name: and Version:
to be changed arbitrarily without breaking the package build, which is
how it should optimally be. If this was strictly followed then scl-utils
would've been a walk in the park. Relatively speaking.
2020-04-23 11:00:47 +03:00
Panu Matilainen 931d61f432 Fix regression(s) on build dependency resolution
Upstream ticket https://github.com/rpm-software-management/rpm/issues/1189
2020-04-22 15:43:23 +03:00
Panu Matilainen b070660329 Remember to actually add the .service file, doh...
Should've been in commit c091c2fcdc
2020-04-22 12:18:02 +03:00
Panu Matilainen c091c2fcdc Add rpmdb-rebuild systemd service
This can be activated with 'touch /var/lib/rpm/.rebuilddb' to perform
rpmdb rebuild on next reboot. The immediate motivation is having a place
to perform automatic database format conversion in a reasonably safe
manner, but could also serve recovery purposes.
2020-04-22 12:00:38 +03:00
Panu Matilainen 9f5580ba45 Warn on undefined macros in buildtree setup macros (#1820349) 2020-04-20 14:18:05 +03:00
Panu Matilainen b48020478b Dumb copy-paste error with patch numbers, sigh. 2020-04-09 14:56:35 +03:00
Panu Matilainen 999c698ec1 Fix regression causing all ELF files classified as OCaml 2020-04-09 14:55:12 +03:00
Panu Matilainen 6715757024 Fix invalid path passed to parametric macro generators 2020-04-06 14:40:01 +03:00
Panu Matilainen 8332f4fa64 Fix db lock files not getting packaged
Commit a5c4573419 caused a literal
/var/lib/rpm/.*.* file to be packaged as a ghost instead of the db lock
files it was supposed to catch. Ensure any hidden db locks get copied
too after initializing. Thanks to Thierry Vignaud for spotting.
2020-04-02 12:48:24 +03:00
Panu Matilainen 52a9ca7aad Move bdb specific systemd-tmpfiles cleanup crutch behind the bdb bcond 2020-04-01 14:10:37 +03:00
Panu Matilainen a5c4573419 Rebase to rpm 4.16.0 alpha
- Add bconds for and enable sqlite, ndb and bdb_ro database backends
- Add bcond for disabling bdb backend
- Drop lmdb bcond, the backend was removed upstream
- Ensure all database backend files are owned
- Fix external environment causing test-suite failures in spec build
- Re-enable hard test-suite failures again
2020-03-31 13:54:46 +03:00
Fedora Release Engineering 5a0eaf89ad - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-01-30 17:51:32 +00:00
Panu Matilainen 47d58abc40 Obsolete python2-rpm to fix upgrade path (#1775113) 2020-01-09 13:01:09 +02:00
Panu Matilainen aa9697a386 Rebase to 4.15.1
Seems that one of the arm patches didn't get reverted upstream which
requires us to carry it here. Oh, poo.
2019-11-18 13:46:45 +02:00
Adam Williamson 7cf9f46d11 Really revert armv8 detection improvements (apply patch)
Peter added the patch to the repo but forgot to add it to the
spec file.
2019-11-14 10:15:02 -08:00
Peter Robinson 2be34826de Revert armv8 detection improvements 2019-10-23 22:38:51 +01:00
Stephen Gallagher 197455deb6
Revert aliasing arm64 to aarch64
Resolves: rhbz#1763831

Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
2019-10-21 13:38:12 -04:00
Panu Matilainen 534022dd6d Revert problematic sub-variants of armv8 (#1691430) 2019-10-18 14:56:50 +03:00
Panu Matilainen d09b7311d5 Drop python2 bindings for good (#1761211)
This means a breakup with F31 branch, but I dont want to add tonne of
conditional build foobar for a dying breed. Bye bye Python 2, and RIP.
2019-10-17 14:25:24 +03:00
Adam Williamson 706be6f0fd Revert systemd inhibit plugin's calling of dbus_shutdown (#1750575) 2019-10-15 17:23:50 -07:00
Panu Matilainen 5c57b11a0f Update to rpm 4.15.0 final 2019-09-26 13:22:19 +03:00
Panu Matilainen 41f9713949 Update to 4.15.0-rc1 2019-08-28 13:32:19 +03:00
Panu Matilainen 48ff1fa7e0 Fix some issues in the thread cap logic 2019-08-27 14:25:07 +03:00
Panu Matilainen dce71ded33 Re-enable test-suite, temporarily disabled during alpha troubleshooting 2019-08-26 11:35:43 +03:00
Panu Matilainen a0095d14ee Try again with less broken capping patches... 2019-08-23 14:12:34 +03:00
Panu Matilainen d678a6a69f Cap number of threads on 32bit platforms (#1729382)
Also drop %_lto_cflags macro (reverted upstream) before people
start adapting its use.
2019-08-23 13:52:16 +03:00
Panu Matilainen c9c421374c Restore strict order of build scriptlet stdout/stderr output 2019-08-23 13:32:44 +03:00
Miro Hrončok ac67522da9 Rebuilt for Python 3.8 2019-08-15 18:22:00 +02:00
Miro Hrončok d962bff879 Rebuilt for libimaevm.so.1 2019-07-31 20:01:44 +02:00
Fedora Release Engineering e4c27a9cdf - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-07-26 18:45:35 +00:00
Igor Gnatenko b419b5cbcd
Backport patch to not set RPMTAG_BUILDTIME to SOURCE_DATE_EPOCH
We have enabled SOURCE_DATE_EPOCH, but it changed behavior of
RPMTAG_BUILDTIME. We need to restore it…

Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2019-07-20 18:30:29 +02:00
Panu Matilainen 0052ff9134 Rebase to 4.15.0 beta 2019-06-27 11:08:03 +03:00
Panu Matilainen 70d62ac48f Fix excessive TLS use, part II (#1722181) 2019-06-20 15:15:06 +03:00
Panu Matilainen 894aa7a821 Fix excessive TLS use (#1722181) 2019-06-20 14:00:13 +03:00
Panu Matilainen d8b230b992 Drop buildarch again now that python_provide no longer needs it (#1720139) 2019-06-19 09:39:06 +03:00
Panu Matilainen c45704ba93 Temporarily re-enable buildarch macro for python_provide macro use (#1720139) 2019-06-14 10:37:34 +03:00
Panu Matilainen 67fd2db9f5 Reorg patches as per upstream status 2019-06-14 10:34:02 +03:00
Panu Matilainen 49f11812bc Don't fail build trying to kill a non-existent process (#1720143) 2019-06-13 12:59:03 +03:00
Igor Gnatenko 5965610d18
Fix build of binary packages in parallel
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2019-06-11 14:59:33 +02:00
Igor Gnatenko 7c70aabe3a
Bump release
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2019-06-11 13:45:55 +02:00
Igor Gnatenko 82285fa5c1
Copy changelog in one thread at a time
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2019-06-11 13:45:21 +02:00
Igor Gnatenko 7b81210f7b
Try fix for omp crash
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2019-06-11 12:48:53 +02:00
Igor Gnatenko c065605b86
Revert generation of binary packages in parallel
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2019-06-11 00:09:36 +02:00
Igor Gnatenko 68ce99e7f4
Try some probably non-working fix
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2019-06-10 23:46:44 +02:00
Igor Gnatenko 81c625136e
Switch back to 4.15-alpha
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2019-06-10 23:40:51 +02:00
Igor Gnatenko 0cd3bd878c
Next bisect (18c92e6fe)
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2019-06-10 23:13:47 +02:00
Igor Gnatenko 9e921777c3
Next bisect (d86c0c28a)
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2019-06-10 22:48:09 +02:00
Igor Gnatenko 6b35a985c8
Next bisect (272431d34)
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2019-06-10 22:27:45 +02:00
Igor Gnatenko 68e6f54804
Next bisect (8da6654e3)
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2019-06-10 22:04:22 +02:00
Igor Gnatenko f1d1d8f7d0
Next bisect (a5d7c6caf)
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2019-06-10 21:35:23 +02:00
Igor Gnatenko 1484f717c2
Fix build
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2019-06-10 20:54:26 +02:00
Igor Gnatenko 3d63652e9b
Start bisect (57899bd3b)
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2019-06-10 20:48:07 +02:00
Igor Gnatenko 5c48e03971
fix file list
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2019-06-10 20:30:42 +02:00
Igor Gnatenko 6f6aff51ae
chmod +x proper rpmbuild
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2019-06-10 20:23:42 +02:00
Igor Gnatenko 8d4a190d35
Add wrapper to export MALLOC_CHECK_=3
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2019-06-10 20:21:58 +02:00
Igor Gnatenko 9e41d42924
Disable tests temporarily
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2019-06-10 19:14:43 +02:00
Igor Gnatenko 472245e661
Build with -fsanitize=address
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2019-06-10 19:08:57 +02:00
Igor Gnatenko 055ecdaa97
Disable tests temporarily
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2019-06-10 17:58:13 +02:00
Igor Gnatenko cb6bbe0cd7
Add fullstop for audit plugin description
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2019-06-10 17:16:14 +02:00
Igor Gnatenko b52e74b1e1
Drop Group tag from audit plugin
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2019-06-10 17:15:52 +02:00
Panu Matilainen 0a7d172130 Update to rpm 4.15.0 alpha
- New rpm-plugin-audit sub-package
- Rebase patches as necessary
- Drop the evil python3 string monkey-patching
- Drop no longer needed LUA_COMPAT defines and friends and use
  %set_build_flags instead.
- python and perl macros and helper scripts are gone
2019-06-10 13:12:47 +03:00
Panu Matilainen d958e93dd1 More spec cleanups
- Drop support for sanitizer build, it never really worked anyway
- Drop leftover build-dependency on binutils-devel
- Truncate changelog to rpm 4.14.x (last two years)
2019-06-10 10:45:58 +03:00
Panu Matilainen 398bbf6b67 Spec cleanups
- Drop support for Fedora < 28 builds
- Drop leftover BDB-related compiler flag foo
2019-06-10 10:25:58 +03:00
Panu Matilainen d90bd67908 Avoid DNS use in test-suite, drop obsolete patches
Use pre-determined buildhost in test-suite to avoid DNS usage, sometimes
the builder DNS config is whacked which causes crazy slowdown of our builds.

Drop obsolete specspo and gpg2 related patches, specspo is gone for
seven years and gpg2 preferral is upstream in a different form (thanks
to Igor Gnatenko for pointing these out)
2019-06-07 13:59:22 +03:00
Igor Gnatenko bda4949bed Use py2/3 macros for building and installing the bindings 2019-06-07 10:34:46 +03:00
Igor Gnatenko 66e2ef5d88
End description with fullstop
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2019-06-02 14:27:37 +02:00
Panu Matilainen 3abc97620b Support build-id generation from compressed ELF files (#1650072) 2019-05-21 12:25:27 +03:00
Igor Gnatenko 2688218e05
Suggest gdb-minimal
References: https://fedoraproject.org/wiki/Changes/Minimal_GDB_in_buildroot
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2019-05-03 18:12:54 +02:00
Panu Matilainen 81329c3ca8 Replace deprecated __global_ldflags uses with build_ldflags macro 2019-04-25 15:04:30 +03:00
Panu Matilainen c7bd807f7c Fix excessive reference counting on faked string .decode() 2019-04-11 10:38:45 +03:00
Panu Matilainen d4f7fd8c04 Make the Python 3 API actually usable (#1693751)
All string data from rpm is now returned as surrogate-escaped utf-8
string objects. 99.999% of that data IS utf-8 encoded to begin with,
returning bytes is plain broken.

As a temporary crutch,  monkey-patch a .decode() method to returned strings
to give users time to migrate from the long-standing broken behavior.
2019-04-10 11:52:40 +03:00
Panu Matilainen 57b4e922b2 Debuginfo fixes:
Generate minidebug for PIE executables on file >= 5.33 too
Backport find-debuginfo --g-libs option for glibc's benefit (#1661512)
2019-04-10 10:28:12 +03:00
Fedora Release Engineering 9519e9e6d1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-02-02 11:34:43 +00:00
Igor Gnatenko 1aed509f16 Remove obsolete Group tag
References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag
2019-01-28 20:24:45 +01:00
Panu Matilainen 52b5a90d43 Meh, rpmtests isn't getting re-generated so patch it directly
...as otherwise the new modularity tag causes test-suite failure
2018-12-19 15:31:34 +02:00
Panu Matilainen af9bdc4611 Backport the new modularity label tag (#1650286) 2018-12-19 15:18:04 +02:00
Panu Matilainen 6c9430bd2a Acutlly add the patch for the previous comment (yeah its Monday alright) 2018-11-19 13:18:52 +02:00
Panu Matilainen 1eb187d393 Take prefix into account when compressing man pages etc for Flatpak builds
From the original PR (https://src.fedoraproject.org/rpms/rpm/pull-request/15):

    The way that a Flatpak works is that the runtime is mounted at /usr
    and the application and included libraries are mounted at /app. So
    the application and included libraries need to be rebuilt with
    a prefix of /app.

This patch makes brp-compress find man pages and info pages under current
prefix, avoiding the name for spec file changes for the rebuild.
2018-11-19 12:56:21 +02:00
Panu Matilainen 06f829d1d3 Selinux plugin requires a base policy to work (#1641631) 2018-10-24 17:18:58 +03:00
Panu Matilainen 4fa277df97 Rebase to rpm 4.14.2.1 2018-10-22 14:39:48 +03:00
Igor Gnatenko 69ee4d255a
Push name/epoch/version/release macro before invoking depgens
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2018-10-17 12:58:11 +02:00
Igor Gnatenko 5460ad1e17
Resurrect long since broken Lua library path
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2018-10-16 11:24:03 +02:00
Panu Matilainen 4ba57b66ab - Actually fail build on test-suite failures again
- Invoke python2 explicitly from test-suite to unbreak build, part II
2018-10-12 09:10:21 +03:00
Panu Matilainen 106f86a617 Cleanup more 10+ year old cruft:
- Drop duplicate BDB buildrequire
- Drop nowadays unnecessary BDB macro foo
- Drop nowadays unnecessary manual libcap dependency

Relevant and necessary in their day, but not anymore.
2018-10-11 16:53:06 +03:00
Panu Matilainen 3f81427a28 - Fix build when systemd is not installed (duh) 2018-10-11 14:46:47 +03:00
Panu Matilainen d58b662497 - Own all rpmdb files and ensure the list remains up to date
- Drop redundant verify exclusions on rpmdb ghosts
2018-10-11 14:29:55 +03:00
Panu Matilainen 2a29f1e128 - Erm, really use the macro for tmpfiles.d path
- Erm, don't nuke buildroot at beginning of %%install
- Use modern build/install helper macros
2018-10-11 14:15:40 +03:00
Panu Matilainen 85cd9c475b - Eh, selinux plugin dependency condition was upside down (#1493267)
- Drop no longer necessary condition over imaevm name
- Drop no longer necessary obsolete on compat-librpm3
2018-10-11 12:53:16 +03:00
Panu Matilainen 9a8f2080d7 - Fix ancient Python GIL locking bug (#1632488)
- Use the appropriate macro for tmpfiles.d now that one exists
2018-10-11 10:58:38 +03:00
Panu Matilainen 06b8b7f066 Update to rpm 4.14.2 final 2018-08-21 14:26:20 +03:00
Panu Matilainen 8d934fd72d Move python-macro-helper to main package where the macros are (#1577860) 2018-08-13 15:11:25 +03:00
Panu Matilainen cae019c19a Update to rpm 4.14.2-rc2 2018-08-08 17:12:55 +03:00
Florian Festi 026fff0d83 - Wrap zstd Requires in build condition 2018-08-07 11:24:30 +02:00
Igor Gnatenko adbe3634b5
Decompress DWARF compressed ELF sections
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2018-07-21 10:16:39 +02:00
Fedora Release Engineering 95db6548b8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-07-14 03:43:24 +00:00
Miro Hrončok 8029c4e85b Rebuilt for Python 3.7 2018-07-02 18:24:09 +02:00
Panu Matilainen 816a8d9b50 Doh, always forgetting new-sources.. 2018-06-29 15:44:27 +03:00
Panu Matilainen 22e1547001 Update to rpm 4.14.2-rc1
Additionally...
- Patching test-suite for python2 too painful, just sed it instead
- Fix premature version increment from previous changelog entries, oops
2018-06-29 15:43:00 +03:00
Panu Matilainen e79d625c87 Make it actually build, sigh
- Ehm, need to patch the autogenerated rpmtests script too for python2
- Ehm, it's ldconfig_scriptlets not scripts
- Drop the non-working python envvar magic from obsoleted change
2018-06-29 12:04:11 +03:00
Panu Matilainen 8b3e871c1f Invoke python2 explicitly from test-suite to unbreak build 2018-06-29 11:16:01 +03:00
Panu Matilainen 7d7537244d Remove direct ldconfig calls, use compat macros instead 2018-06-29 11:00:36 +03:00
Miro Hrončok b86c75e7b0 Rebuilt for Python 3.7 2018-06-15 12:25:41 +02:00
Miro Hrončok 364d038b55 Backport upstream solution to make brp-python-bytecompile automagic part opt-outable
See https://fedoraproject.org/wiki/Changes/No_more_automagic_Python_bytecompilation
2018-05-28 14:12:32 +02:00
Mark Wielaard 43ea916f2f find-debuginfo.sh: Handle application/x-pie-executable
Resolves: #1581224
2018-05-22 23:01:41 +02:00
Igor Gnatenko 99d6687a36
Split rpm-build-libs to one more subpackage rpm-sign-libs
This is the only package in default buildroot pulling in gnupg2 which
pulls gnutls, libgcrypt, nettle…

Acked-by: Panu Matilainen <pmatilai@redhat.com>
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2018-02-20 11:34:17 +01:00
Panu Matilainen 29c140818d Explicitly BuildRequire gcc and make 2018-02-19 11:21:50 +02:00
Igor Gnatenko 91f61a528c
Escape macros in %changelog
Reference: https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/Y2ZUKK2B7T2IKXPMODNF6HB2O5T5TS6H/
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2018-02-09 09:05:57 +01:00
Panu Matilainen a83817c556 Avoid unnecessary macro helper dependency on /usr/bin/python (#1538657)
Also fix release of previous changelog entry
2018-01-31 16:11:44 +02:00
Miro Hrončok f974a6c3d8 Fix patch number (two sixes) 2018-01-30 13:43:55 +01:00
Tomas Orsava 0670d684d5 Add envvar that will be present during RPM build
Part of a Fedora Change for F28: "Avoid /usr/bin/python in RPM build"
https://fedoraproject.org/wiki/Changes/Avoid_usr_bin_python_in_RPM_Build
2018-01-30 13:32:10 +01:00
Petr Viktorin 3f65cd7a41 Skip automatic Python byte-compilation if *.py files are not present 2018-01-30 10:48:34 +01:00
Florian Weimer c6d1f7c3e0 Rebuild to work around gcc bug leading to librpm miscompilation (#1538648) 2018-01-25 16:41:43 +01:00
Panu Matilainen eb1281d241 Avoid nuking the new python-macro-helper along with dep generators (#1535692) 2018-01-18 10:45:58 +02:00
Panu Matilainen 8219d71cbb Rebase to rpm 4.14.1 2018-01-16 13:39:27 +02:00
Igor Gnatenko 193c8871cc Fix typo in Obsoletes
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2017-11-07 12:51:46 +01:00
Igor Gnatenko e6d364fc15 Remove platform-python bits
Platform Python didn't prove to work.

Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2017-11-06 15:04:31 +01:00
Panu Matilainen 1a61b7b072 - Move selinux plugin dependency to selinux-policy in Fedora >= 28 (#1493267) 2017-10-26 09:32:14 +03:00
14 changed files with 635 additions and 1914 deletions

13
.gitignore vendored
View File

@ -27,3 +27,16 @@
/rpm-4.14.0-rc1.tar.bz2
/rpm-4.14.0-rc2.tar.bz2
/rpm-4.14.0.tar.bz2
/rpm-4.14.1.tar.bz2
/rpm-4.14.2-rc1.tar.bz2
/rpm-4.14.2-rc2.tar.bz2
/rpm-4.14.2.tar.bz2
/rpm-4.14.2.1.tar.bz2
/rpm-4.14.90-git14653.tar.bz2
/rpm-4.15.0-beta.tar.bz2
/rpm-4.15.0-rc1.tar.bz2
/rpm-4.15.0.tar.bz2
/rpm-4.15.1.tar.bz2
/rpm-4.15.90-git14971.tar.bz2
/rpm-4.16.0-beta1.tar.bz2
/rpm-4.16.0-beta3.tar.bz2

View File

@ -1,70 +0,0 @@
From 92b718bb0e98ecaea6d4229eab9ef3bc0220d9c2 Mon Sep 17 00:00:00 2001
Message-Id: <92b718bb0e98ecaea6d4229eab9ef3bc0220d9c2.1507815046.git.pmatilai@redhat.com>
From: Panu Matilainen <pmatilai@redhat.com>
Date: Thu, 12 Oct 2017 15:51:26 +0300
Subject: [PATCH] Don't assume per-user groups in test-suite
The tests from commits f2d3be2a8741234faaa96f5fd05fdfdc75779a79 and
c815822c8bdb138066ff58c624ae83e3a12ebfa9 assume per-user groups,
but this is not a generally valid assumption and causes unnecessary
bogus failures in the test-suite in some setups (eg mock)
---
tests/data/SPECS/replacetest.spec | 3 ++-
tests/rpmreplace.at | 2 ++
tests/rpmverify.at | 1 +
3 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/tests/data/SPECS/replacetest.spec b/tests/data/SPECS/replacetest.spec
index c764adc27..54974567b 100644
--- a/tests/data/SPECS/replacetest.spec
+++ b/tests/data/SPECS/replacetest.spec
@@ -1,6 +1,7 @@
%{!?filetype: %global filetype file}
%{?fixit: %global havepretrans 1}
%{!?user: %global user root}
+%{!?grp: %global grp root}
Name: replacetest%{?sub:-%{sub}}
Version: %{ver}
@@ -44,5 +45,5 @@ rm -rf $RPM_BUILD_ROOT
%endif
%files
-%defattr(-,%{user},%{user},-)
+%defattr(-,%{user},%{grp},-)
/opt/*
diff --git a/tests/rpmreplace.at b/tests/rpmreplace.at
index 11e6221d7..6f0444bb7 100644
--- a/tests/rpmreplace.at
+++ b/tests/rpmreplace.at
@@ -403,6 +403,7 @@ runroot rpmbuild --quiet -bb \
--define "filetype datadir" \
--define "filedata README1" \
--define "user $(id -u -n)" \
+ --define "grp $(id -g -n)" \
/data/SPECS/replacetest.spec
runroot rpmbuild --quiet -bb \
@@ -410,6 +411,7 @@ runroot rpmbuild --quiet -bb \
--define "filetype datadir" \
--define "filedata README2" \
--define "user $(id -u -n)" \
+ --define "grp $(id -g -n)" \
/data/SPECS/replacetest.spec
mkdir "${RPMTEST}"/opt/f00f
diff --git a/tests/rpmverify.at b/tests/rpmverify.at
index c5530de69..78f50fd33 100644
--- a/tests/rpmverify.at
+++ b/tests/rpmverify.at
@@ -78,6 +78,7 @@ runroot rpmbuild --quiet -bb \
--define "filetype datadir" \
--define "filedata README1" \
--define "user $(id -u -n)" \
+ --define "grp $(id -g -n)" \
/data/SPECS/replacetest.spec
runroot rpm -U /build/RPMS/noarch/replacetest-1.0-1.noarch.rpm
--
2.13.6

View File

@ -0,0 +1,95 @@
From 2426c2a066e44f4d9a342585e76cdbdb0a8a2db1 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Wed, 23 Oct 2019 20:22:19 +0100
Subject: [PATCH] Revert "Improve ARM detection"
This reverts commit 8c3a7b8fa92b49a811fe36b60857b12f5d7db8a8.
This is the final piece in fixing rhbz 1691430. It's a clean revert
so let's do that for F-31 and we can discuss the details later.
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
---
lib/rpmrc.c | 37 +++++++++----------------------------
1 file changed, 9 insertions(+), 28 deletions(-)
diff --git a/lib/rpmrc.c b/lib/rpmrc.c
index 0806e1b07..cada3f788 100644
--- a/lib/rpmrc.c
+++ b/lib/rpmrc.c
@@ -82,7 +82,6 @@ struct rpmOption {
static struct rpmat_s {
const char *platform;
uint64_t hwcap;
- uint64_t hwcap2;
} rpmat;
typedef struct defaultEntry_s {
@@ -951,9 +950,6 @@ static int is_geode(void)
#if defined(__linux__)
-#ifndef AT_HWCAP2 /* glibc < 2.18 */
-#define AT_HWCAP2 26
-#endif
/**
* Populate rpmat structure with auxv values
*/
@@ -967,7 +963,6 @@ static void read_auxv(void)
if (!rpmat.platform)
rpmat.platform = "";
rpmat.hwcap = getauxval(AT_HWCAP);
- rpmat.hwcap2 = getauxval(AT_HWCAP2);
#else
rpmat.platform = "";
int fd = open("/proc/self/auxv", O_RDONLY);
@@ -989,9 +984,6 @@ static void read_auxv(void)
case AT_HWCAP:
rpmat.hwcap = auxv.a_un.a_val;
break;
- case AT_HWCAP2:
- rpmat.hwcap2 = auxv.a_un.a_val;
- break;
}
}
close(fd);
@@ -1225,27 +1217,16 @@ static void defaultMachine(rpmrcCtx ctx, const char ** arch, const char ** os)
# if !defined(HWCAP_ARM_VFPv3)
# define HWCAP_ARM_VFPv3 (1 << 13)
# endif
-# if !defined(HWCAP2_AES)
-# define HWCAP2_AES (1 << 0)
-# endif
- /*
- * un.machine is armvXE, where X is version number and E is
- * endianness (b or l)
- */
- if (rstreqn(un.machine, "armv", 4)) {
- char endian = un.machine[strlen(un.machine)-1];
- char *modifier = un.machine + 5;
- /* keep armv7, armv8, armv9, armv10, ... */
- while(risdigit(*modifier))
- modifier++;
- if (rpmat.hwcap & HWCAP_ARM_VFPv3)
- *modifier++ = 'h';
- if (rpmat.hwcap2 & HWCAP2_AES)
- *modifier++ = 'c';
+ if (rstreq(un.machine, "armv7l")) {
+ if (rpmat.hwcap & HWCAP_ARM_VFPv3) {
if (rpmat.hwcap & HWCAP_ARM_NEON)
- *modifier++ = 'n';
- *modifier++ = endian;
- *modifier++ = 0;
+ strcpy(un.machine, "armv7hnl");
+ else
+ strcpy(un.machine, "armv7hl");
+ }
+ } else if (rstreq(un.machine, "armv6l")) {
+ if (rpmat.hwcap & HWCAP_ARM_VFP)
+ strcpy(un.machine, "armv6hl");
}
# endif /* arm*-linux */
--
2.23.0

View File

@ -0,0 +1,30 @@
From f2bc669cd0a080792522dd1bb7f50ef7025f16f0 Mon Sep 17 00:00:00 2001
From: Mark Wielaard <mark@klomp.org>
Date: Sat, 21 Jul 2018 10:13:04 +0200
Subject: [PATCH] find-debuginfo.sh: decompress DWARF compressed ELF sections
debugedit and dwz do not support DWARF compressed ELF sections, let's
just decompress those before extracting debuginfo.
Tested-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
---
scripts/find-debuginfo.sh | 3 +++
1 file changed, 3 insertions(+)
diff --git a/scripts/find-debuginfo.sh b/scripts/find-debuginfo.sh
index 90a44942d..7b01bc036 100755
--- a/scripts/find-debuginfo.sh
+++ b/scripts/find-debuginfo.sh
@@ -357,6 +357,9 @@ do_file()
get_debugfn "$f"
[ -f "${debugfn}" ] && return
+ echo "explicitly decompress any DWARF compressed ELF sections in $f"
+ eu-elfcompress -q -p -t none "$f"
+
echo "extracting debug info from $f"
# See also cpio SOURCEFILE copy. Directories must match up.
debug_base_name="$RPM_BUILD_DIR"
--
2.18.0

View File

@ -1,39 +0,0 @@
From fef3b646f3facd26dc04cfccdc27c061cfe0ee37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Mon, 7 Aug 2017 16:28:59 +0200
Subject: [PATCH] Generate requires and provides for platform-python(abi)
See https://fedoraproject.org/wiki/Changes/Platform_Python_Stack
---
scripts/pythondeps.sh | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/scripts/pythondeps.sh b/scripts/pythondeps.sh
index 10a060aac..a6d97ef4f 100755
--- a/scripts/pythondeps.sh
+++ b/scripts/pythondeps.sh
@@ -13,8 +13,8 @@ case $1 in
# generating a line of the form
# python(abi) = MAJOR.MINOR
# (Don't match against -config tools e.g. /usr/bin/python2.6-config)
- grep "/usr/bin/python.\..$" \
- | sed -e "s|.*/usr/bin/python\(.\..\)|python(abi) = \1|"
+ egrep '/usr/(bin/|libexec/platform-)python.\..$' \
+ | sed -r -e "s@.*/usr/(bin/|libexec/(platform-))python(.\..)@\2python(abi) = \3@"
;;
-R|--requires)
shift
@@ -23,8 +23,8 @@ case $1 in
# /PATH/OF/BUILDROOT/usr/lib64/pythonMAJOR.MINOR/
# generating (uniqely) lines of the form:
# python(abi) = MAJOR.MINOR
- grep "/usr/lib[^/]*/python.\../.*" \
- | sed -e "s|.*/usr/lib[^/]*/python\(.\..\)/.*|python(abi) = \1|g" \
+ egrep '/usr/lib[^/]*/(platform-|)python.\../.*' \
+ | sed -r -e "s@.*/usr/lib[^/]*/(platform-|)python(.\..)/.*@\1python(abi) = \2@g" \
| sort | uniq
;;
esac
--
2.13.3

View File

@ -1,52 +0,0 @@
From cc1a08b4a5222e74cae46ee17d4ef297ed63c2a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Tue, 8 Aug 2017 12:27:48 +0200
Subject: [PATCH] Bytecompile stuff in /usr/lib*/platform-python with
platform-python
---
scripts/brp-python-bytecompile | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/scripts/brp-python-bytecompile b/scripts/brp-python-bytecompile
index 894fa3459..92460b982 100644
--- a/scripts/brp-python-bytecompile
+++ b/scripts/brp-python-bytecompile
@@ -57,9 +57,15 @@ EOF
# and below /usr/lib/python3.1/, we're targeting /usr/bin/python3.1
shopt -s nullglob
-for python_libdir in `find "$RPM_BUILD_ROOT" -type d|grep -E "/usr/lib(64)?/python[0-9]\.[0-9]$"`;
+for python_libdir in `find "$RPM_BUILD_ROOT" -type d|grep -E "/usr/lib(64)?/(platform-)?python[0-9]\.[0-9]$"`;
do
- python_binary=/usr/bin/$(basename $python_libdir)
+ python_basename=$(basename $python_libdir)
+ if [[ $python_basename == platform* ]];
+ then
+ python_binary=/usr/libexec/$python_basename
+ else
+ python_binary=/usr/bin/$python_basename
+ fi
real_libdir=${python_libdir/$RPM_BUILD_ROOT/}
echo "Bytecompiling .py files below $python_libdir using $python_binary"
@@ -88,14 +94,14 @@ if [ ! -x "$default_python" ]; then
fi
# Generate normal (.pyc) byte-compiled files.
-python_bytecompile "" $default_python "/bin/|/sbin/|/usr/lib(64)?/python[0-9]\.[0-9]|/usr/share/doc" "$RPM_BUILD_ROOT" "$depth" "/"
+python_bytecompile "" $default_python "/bin/|/sbin/|/usr/lib(64)?/(platform-)?python[0-9]\.[0-9]|/usr/share/doc" "$RPM_BUILD_ROOT" "$depth" "/"
if [ $? -ne 0 -a 0$errors_terminate -ne 0 ]; then
# One or more of the files had a syntax error
exit 1
fi
# Generate optimized (.pyo) byte-compiled files.
-python_bytecompile "-O" $default_python "/bin/|/sbin/|/usr/lib(64)?/python[0-9]\.[0-9]|/usr/share/doc" "$RPM_BUILD_ROOT" "$depth" "/"
+python_bytecompile "-O" $default_python "/bin/|/sbin/|/usr/lib(64)?/(platform-)?python[0-9]\.[0-9]|/usr/share/doc" "$RPM_BUILD_ROOT" "$depth" "/"
if [ $? -ne 0 -a 0$errors_terminate -ne 0 ]; then
# One or more of the files had a syntax error
exit 1
--
2.13.3

View File

@ -1,42 +0,0 @@
From eb48f08dd30324f960b8e404b80eb885b2bbb593 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Thu, 24 Aug 2017 13:45:49 +0200
Subject: [PATCH] Do not provide pythonXdist for platform-python packages
---
scripts/pythondistdeps.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/scripts/pythondistdeps.py b/scripts/pythondistdeps.py
index 2abb59f49..f624fdbb7 100755
--- a/scripts/pythondistdeps.py
+++ b/scripts/pythondistdeps.py
@@ -16,6 +16,7 @@ from os.path import basename, dirname, isdir, sep
from sys import argv, stdin, version
from distutils.sysconfig import get_python_lib
from warnings import warn
+import re
opts, args = getopt(
@@ -78,6 +79,9 @@ for f in files:
f = f.strip()
lower = f.lower()
name = 'python(abi)'
+ if re.search(r'/usr/lib(64)?/platform-python\d\.\d', lower):
+ # https://bugzilla.redhat.com/show_bug.cgi?id=1484607
+ continue
# add dependency based on path, versioned if within versioned python directory
if py_abi and (lower.endswith('.py') or lower.endswith('.pyc') or lower.endswith('.pyo')):
if name not in py_deps:
@@ -115,7 +119,6 @@ for f in files:
if not dist.py_version:
# Try to parse the Python version from the path the metadata
# resides at (e.g. /usr/lib/pythonX.Y/site-packages/...)
- import re
res = re.search(r"/python(?P<pyver>\d+\.\d)/", path_item)
if res:
dist.py_version = res.group('pyver')
--
2.13.5

View File

@ -1,95 +0,0 @@
diff --git a/lib/tagexts.c b/lib/tagexts.c
index f72ff60..2c0b179 100644
--- a/lib/tagexts.c
+++ b/lib/tagexts.c
@@ -535,15 +535,6 @@ static int filerequireTag(Header h, rpmtd td, headerGetFlags hgflags)
return filedepTag(h, RPMTAG_REQUIRENAME, td, hgflags);
}
-/* I18N look aside diversions */
-
-#if defined(ENABLE_NLS)
-extern int _nl_msg_cat_cntr; /* XXX GNU gettext voodoo */
-#endif
-static const char * const language = "LANGUAGE";
-
-static const char * const _macro_i18ndomains = "%{?_i18ndomains}";
-
/**
* Retrieve i18n text.
* @param h header
@@ -554,59 +545,30 @@ static const char * const _macro_i18ndomains = "%{?_i18ndomains}";
*/
static int i18nTag(Header h, rpmTag tag, rpmtd td, headerGetFlags hgflags)
{
- int rc;
+ int rc = headerGet(h, tag, td, HEADERGET_ALLOC);
#if defined(ENABLE_NLS)
- char * dstring = rpmExpand(_macro_i18ndomains, NULL);
-
- td->type = RPM_STRING_TYPE;
- td->data = NULL;
- td->count = 0;
-
- if (dstring && *dstring) {
- char *domain, *de;
- const char * langval;
- char * msgkey;
- const char * msgid;
+ if (rc) {
+ static const char * const _macro_i18ndomains = "%{?_i18ndomains}";
+ char *de, *dstring = rpmExpand(_macro_i18ndomains, NULL);
+ const char *domain;
- rasprintf(&msgkey, "%s(%s)", headerGetString(h, RPMTAG_NAME),
- rpmTagGetName(tag));
-
- /* change to en_US for msgkey -> msgid resolution */
- langval = getenv(language);
- (void) setenv(language, "en_US", 1);
- ++_nl_msg_cat_cntr;
-
- msgid = NULL;
for (domain = dstring; domain != NULL; domain = de) {
+ const char *msgid = td->data;
+ const char *msg = NULL;
+
de = strchr(domain, ':');
if (de) *de++ = '\0';
- msgid = dgettext(domain, msgkey);
- if (msgid != msgkey) break;
- }
-
- /* restore previous environment for msgid -> msgstr resolution */
- if (langval)
- (void) setenv(language, langval, 1);
- else
- unsetenv(language);
- ++_nl_msg_cat_cntr;
-
- if (domain && msgid) {
- td->data = dgettext(domain, msgid);
- td->data = xstrdup(td->data); /* XXX xstrdup has side effects. */
- td->count = 1;
- td->flags = RPMTD_ALLOCED;
+ msg = dgettext(domain, td->data);
+ if (msg != msgid) {
+ free(td->data);
+ td->data = xstrdup(msg);
+ break;
+ }
}
- dstring = _free(dstring);
- free(msgkey);
- if (td->data)
- return 1;
+ free(dstring);
}
-
- free(dstring);
#endif
- rc = headerGet(h, tag, td, HEADERGET_ALLOC);
return rc;
}

View File

@ -2,14 +2,14 @@ diff -up rpm-4.9.1.1/macros.in.jx rpm-4.9.1.1/macros.in
--- rpm-4.9.1.1/macros.in.jx 2011-08-03 16:19:05.000000000 -0400
+++ rpm-4.9.1.1/macros.in 2011-08-08 09:41:52.981064316 -0400
@@ -674,9 +674,10 @@ print (t)\
RPM_SOURCE_DIR=\"%{u2p:%{_sourcedir}}\"\
RPM_BUILD_DIR=\"%{u2p:%{_builddir}}\"\
RPM_OPT_FLAGS=\"%{optflags}\"\
+ RPM_LD_FLAGS=\"%{?__global_ldflags}\"\
+ RPM_LD_FLAGS=\"%{?build_ldflags}\"\
RPM_ARCH=\"%{_arch}\"\
RPM_OS=\"%{_os}\"\
- export RPM_SOURCE_DIR RPM_BUILD_DIR RPM_OPT_FLAGS RPM_ARCH RPM_OS\
+ export RPM_SOURCE_DIR RPM_BUILD_DIR RPM_OPT_FLAGS RPM_LD_FLAGS RPM_ARCH RPM_OS\
RPM_BUILD_NCPUS=\"%{_smp_build_ncpus}\"\
- export RPM_SOURCE_DIR RPM_BUILD_DIR RPM_OPT_FLAGS RPM_ARCH RPM_OS RPM_BUILD_NCPUS\
+ export RPM_SOURCE_DIR RPM_BUILD_DIR RPM_OPT_FLAGS RPM_LD_FLAGS RPM_ARCH RPM_OS RPM_BUILD_NCPUS RPM_LD_FLAGS\
RPM_DOC_DIR=\"%{_docdir}\"\
export RPM_DOC_DIR\
RPM_PACKAGE_NAME=\"%{NAME}\"\

View File

@ -8,5 +8,5 @@ diff -up rpm-4.11.1-rc1/macros.in.siteconfig rpm-4.11.1-rc1/macros.in
+ CONFIG_SITE=${CONFIG_SITE:-NONE}\
+ export CONFIG_SITE\
\
%{verbose:set -x}%{!verbose:exec > /dev/null}\
%{verbose:set -x}\
umask 022\

View File

@ -1,12 +0,0 @@
diff -up rpm-4.8.1/macros.in.gpg2 rpm-4.8.1/macros.in
--- rpm-4.8.0/macros.in.gpg2 2011-01-17 12:17:38.000000000 +0200
+++ rpm-4.8.0/macros.in 2011-01-17 12:17:59.000000000 +0200
@@ -40,7 +40,7 @@
%__cp @__CP@
%__cpio @__CPIO@
%__file @__FILE@
-%__gpg @__GPG@
+%__gpg /usr/bin/gpg2
%__grep @__GREP@
%__gzip @__GZIP@
%__id @__ID@

2070
rpm.spec

File diff suppressed because it is too large Load Diff

19
rpmdb-rebuild.service Normal file
View File

@ -0,0 +1,19 @@
[Unit]
Description=RPM database rebuild
ConditionPathExists=/var/lib/rpm/.rebuilddb
# This should run before any daemons that may open the rpmdb
DefaultDependencies=no
After=sysinit.target
Before=basic.target shutdown.target
Conflicts=shutdown.target
# In case /var is remote-mounted
RequiresMountsFor=/var
[Service]
Type=oneshot
ExecStart=/usr/bin/rpmdb --rebuilddb
ExecStartPost=rm -f /var/lib/rpm/.rebuilddb
[Install]
WantedBy=basic.target

View File

@ -1 +1 @@
SHA512 (rpm-4.14.0.tar.bz2) = df6c063b4c30c3652cdf09e709b96f89b61c89aa4726b25f1132a51da3da67e33598d8acaf0134fad27ad4b38c619b9e1d77571697f2efa227fcfcac56651c82
SHA512 (rpm-4.16.0-beta3.tar.bz2) = 20efa638a7fe85b1b4d3d42fb07172c20a1f3c62024a29e4184b67a2d52ff3f94a186f178e9a5bfee9bf6c826a1023995d970b5c0ddaffe8b61fd2c888b44032