Added rpm4 original port

This commit is contained in:
2024-10-11 11:20:25 +02:00
parent 7c770cfb90
commit 6265e3ee84
14 changed files with 510 additions and 0 deletions

View File

@ -0,0 +1,13 @@
--- docs/Makefile.am.orig 2023-03-13 14:33:50 UTC
+++ docs/Makefile.am
@@ -1,8 +1,8 @@
## Process this file with automake to produce Makefile.in
-if PANDOC
+#if PANDOC
SUBDIRS = man
-endif
+#endif
EXTRA_DIST =

View File

@ -0,0 +1,11 @@
--- docs/Makefile.in.orig 2023-12-19 15:56:53 UTC
+++ docs/Makefile.in
@@ -442,7 +442,7 @@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-@PANDOC_TRUE@SUBDIRS = man
+SUBDIRS = man
EXTRA_DIST = _layouts/default.html _layouts/favicon.ico README.md \
index.md manual/index.md manual/arch_dependencies.md \
manual/autosetup.md manual/boolean_dependencies.md \

View File

@ -0,0 +1,11 @@
--- lib/fsm.c.orig 2023-03-13 14:33:50 UTC
+++ lib/fsm.c
@@ -1014,7 +1014,7 @@
rc = RPMERR_UNKNOWN_FILETYPE;
}
-setmeta:
+setmeta:;
/* Special files require path-based ops */
int mayopen = S_ISREG(fp->sb.st_mode) || S_ISDIR(fp->sb.st_mode);
if (!rc && fd == -1 && mayopen) {

View File

@ -0,0 +1,41 @@
--- misc/fts.c.orig 2022-04-07 11:13:19 UTC
+++ misc/fts.c
@@ -37,12 +37,14 @@ static char sccsid[] = "@(#)fts.c 8.6 (Berkeley) 8/14/
#endif
/* Conditional to set up proper fstat64 implementation */
-#if defined(hpux) || defined(sun) || (defined(__APPLE__) && defined(_DARWIN_FEATURE_ONLY_64_BIT_INODE))
+#if defined(hpux) || defined(sun) || defined(__FreeBSD__) || (defined(__APPLE__) && defined(_DARWIN_FEATURE_ONLY_64_BIT_INODE))
# define FTS_FSTAT64(_fd, _sbp) fstat((_fd), (_sbp))
#else
# define FTS_FSTAT64(_fd, _sbp) fstat64((_fd), (_sbp))
#endif
+#include "system.h"
+#include "misc/rpmfts.h"
#if defined(_LIBC)
#include <sys/param.h>
#include <include/sys/stat.h>
@@ -56,7 +58,7 @@ static char sccsid[] = "@(#)fts.c 8.6 (Berkeley) 8/14/
#else
/* Conditionals for working around non-GNU environments */
-#if defined(hpux)
+#if defined(hpux) || defined(__FreeBSD__)
# define _INCLUDE_POSIX_SOURCE
# define __errno_location() (&errno)
# define dirfd(dirp) -1
@@ -73,13 +75,11 @@ static char sccsid[] = "@(#)fts.c 8.6 (Berkeley) 8/14/
#endif
#endif
-#include "system.h"
#include <fcntl.h>
#include <stdlib.h>
#include <string.h>
#include <dirent.h>
#include <errno.h>
-#include "misc/rpmfts.h"
# define __set_errno(val) (*__errno_location ()) = (val)
# define __open open
# define __close close

View File

@ -0,0 +1,11 @@
--- plugins/ima.c.orig 2018-06-21 09:08:06 UTC
+++ plugins/ima.c
@@ -1,8 +1,6 @@
#include "system.h"
#include <errno.h>
-#include <sys/xattr.h>
-
#include <rpm/rpmfi.h>
#include <rpm/rpmte.h>
#include <rpm/rpmfiles.h>

View File

@ -0,0 +1,11 @@
--- python/header-py.c.orig 2023-11-30 19:45:23 UTC
+++ python/header-py.c
@@ -741,7 +741,7 @@
0, /* tp_as_number */
&hdr_as_sequence, /* tp_as_sequence */
&hdr_as_mapping, /* tp_as_mapping */
- hdr_hash, /* tp_hash */
+ (hashfunc)hdr_hash, /* tp_hash */
0, /* tp_call */
0, /* tp_str */
(getattrofunc) hdr_getattro, /* tp_getattro */

View File

@ -0,0 +1,11 @@
--- tools/elfdeps.c.orig 2023-01-16 16:44:45 UTC
+++ tools/elfdeps.c
@@ -84,7 +84,7 @@
if (ehdr->e_ident[EI_CLASS] == ELFCLASS64) {
switch (ehdr->e_machine) {
case EM_ALPHA:
- case EM_FAKE_ALPHA:
+ case EM_ALPHA_STD:
/* alpha doesn't traditionally have 64bit markers */
break;
default:

View File

@ -0,0 +1,13 @@
--- tools/rpmuncompress.c.orig 2023-12-19 16:39:32 UTC
+++ tools/rpmuncompress.c
@@ -1,8 +1,10 @@
#include "system.h"
+#include <sys/wait.h>
#include <popt.h>
#include <libgen.h>
#include <errno.h>
+#include <libgen.h>
#include <stdio.h>
#include <string.h>