SHA256
6
0
forked from pool/rpm

- Backport FA_TOUCH fixes from upsteam [bnc#1175025] [bnc#1177428]

OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=558
This commit is contained in:
2020-10-19 09:57:57 +00:00
committed by Git OBS Bridge
parent 478e3e65d4
commit 13b3f80177
33 changed files with 2589 additions and 310 deletions

View File

@@ -1,13 +1,13 @@
Don't let rpm complain about a missing /etc/magic.mgc file
--- ./build/rpmfc.c.orig 2020-09-30 13:08:18.770584384 +0000
+++ ./build/rpmfc.c 2020-09-30 13:08:54.306508417 +0000
@@ -1159,7 +1159,7 @@ static uint32_t getElfColor(const char *
--- ./build/rpmfc.c.orig 2019-10-02 11:41:15.063357579 +0000
+++ ./build/rpmfc.c 2019-10-02 11:41:42.583298884 +0000
@@ -1065,7 +1065,7 @@ static int initAttrs(rpmfc fc)
rpmRC rpmfcClassify(rpmfc fc, ARGV_t argv, rpm_mode_t * fmode)
{
- int msflags = MAGIC_CHECK | MAGIC_COMPRESS | MAGIC_NO_CHECK_TOKENS | MAGIC_ERROR;
+ int msflags = MAGIC_COMPRESS | MAGIC_NO_CHECK_TOKENS | MAGIC_ERROR;
int mimeflags = msflags | MAGIC_MIME_TYPE;
- int msflags = MAGIC_CHECK | MAGIC_COMPRESS | MAGIC_NO_CHECK_TOKENS;
+ int msflags = MAGIC_COMPRESS | MAGIC_NO_CHECK_TOKENS;
int nerrors = 0;
rpmRC rc = RPMRC_FAIL;