aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--archivers/rpm4/Makefile17
-rw-r--r--archivers/rpm4/distinfo6
-rw-r--r--archivers/rpm4/files/patch-luaext_lrexlib.c19
-rw-r--r--archivers/rpm4/files/patch-misc_fts.c8
-rw-r--r--archivers/rpm4/pkg-plist32
5 files changed, 47 insertions, 35 deletions
diff --git a/archivers/rpm4/Makefile b/archivers/rpm4/Makefile
index 187658882f78..ad168cc95156 100644
--- a/archivers/rpm4/Makefile
+++ b/archivers/rpm4/Makefile
@@ -2,10 +2,9 @@
# $FreeBSD$
PORTNAME= rpm
-PORTVERSION= 4.14.2.1
-PORTREVISION= 1
+PORTVERSION= 4.15.0
CATEGORIES= archivers
-MASTER_SITES= http://ftp.rpm.org/releases/rpm-4.14.x/
+MASTER_SITES= http://ftp.rpm.org/releases/rpm-4.15.x/
PKGNAMESUFFIX= 4
MAINTAINER= rodrigo@FreeBSD.org
@@ -15,17 +14,17 @@ LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libpopt.so:devel/popt \
- libnss3.so:security/nss
+ libnss3.so:security/nss \
+ libzstd.so:archivers/zstd
RUN_DEPENDS= bash:shells/bash
-USES= alias bdb gmake libarchive libtool lua:51 pathfix pkgconfig \
- shebangfix tar:bzip2
-INVALID_BDB_VER=51
+USES= alias bdb compiler:openmp gmake iconv libarchive libtool \
+ lua:52+ pathfix pkgconfig shebangfix tar:bzip2
USE_LDCONFIG= yes
+
GNU_CONFIGURE= yes
SHEBANG_FILES= scripts/brp-python-bytecompile scripts/check-prereqs \
scripts/check-rpaths-worker scripts/pythondeps.sh \
- scripts/mono-find-requires scripts/mono-find-provides \
scripts/pkgconfigdeps.sh scripts/fontconfig.prov \
scripts/rpmdb_loadcvt scripts/perl.prov scripts/perl.req \
scripts/pythondistdeps.py scripts/find-lang.sh \
@@ -69,8 +68,6 @@ PLUGINS_LIB_DEPENDS= libdbus-1.so:devel/dbus
post-patch:
@${REINPLACE_CMD} -e 's:\.\./\.\./bin/::' ${WRKSRC}/Makefile.in
- @${REINPLACE_CMD} -e 's/(hpux)/& || defined(__FreeBSD__)/' \
- ${WRKSRC}/misc/fts.?
@${REINPLACE_CMD} -e 's/ __GLIBC__.*/& || defined(__FreeBSD__)/' \
${WRKSRC}/system.h
diff --git a/archivers/rpm4/distinfo b/archivers/rpm4/distinfo
index bc08985c5d9c..df1138a44a67 100644
--- a/archivers/rpm4/distinfo
+++ b/archivers/rpm4/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1545582876
-SHA256 (rpm-4.14.2.1.tar.bz2) = 1139c24b7372f89c0a697096bf9809be70ba55e006c23ff47305c1849d98acda
-SIZE (rpm-4.14.2.1.tar.bz2) = 4156574
+TIMESTAMP = 1569770543
+SHA256 (rpm-4.15.0.tar.bz2) = 1e06723b13591e57c99ebe2006fb8daddc4cf72efb366a64a34673ba5f61c201
+SIZE (rpm-4.15.0.tar.bz2) = 4205632
diff --git a/archivers/rpm4/files/patch-luaext_lrexlib.c b/archivers/rpm4/files/patch-luaext_lrexlib.c
new file mode 100644
index 000000000000..0ba89537cc45
--- /dev/null
+++ b/archivers/rpm4/files/patch-luaext_lrexlib.c
@@ -0,0 +1,19 @@
+--- luaext/lrexlib.c.orig 2019-06-26 14:17:31 UTC
++++ luaext/lrexlib.c
+@@ -11,7 +11,6 @@
+ #include "lauxlib.h"
+ #include "lrexlib.h"
+
+-
+ /* Sanity check */
+ #if !defined(WITH_POSIX) && !defined(WITH_PCRE)
+ #error Define WITH_POSIX or WITH_PCRE, otherwise this library is useless!
+@@ -32,7 +31,7 @@ static int rex_comp(lua_State *L)
+ regex_t *pr = (regex_t *)lua_newuserdata(L, sizeof(regex_t));
+ pattern = luaL_checklstring(L, 1, &l);
+ #ifdef REG_BASIC
+- pr->re_endp = pattern + lua_strlen(L, 1);
++ pr->re_endp = pattern + lua_rawlen(L, (1));
+ res = regcomp(pr, pattern, REG_EXTENDED | REG_PEND);
+ #else
+ res = regcomp(pr, pattern, REG_EXTENDED);
diff --git a/archivers/rpm4/files/patch-misc_fts.c b/archivers/rpm4/files/patch-misc_fts.c
index d381be50208f..33fb81bc876d 100644
--- a/archivers/rpm4/files/patch-misc_fts.c
+++ b/archivers/rpm4/files/patch-misc_fts.c
@@ -1,6 +1,6 @@
---- misc/fts.c.orig 2018-08-25 09:14:19 UTC
+--- misc/fts.c.orig 2019-06-26 14:17:31 UTC
+++ misc/fts.c
-@@ -32,12 +32,14 @@ static char sccsid[] = "@(#)fts.c 8.6 (B
+@@ -32,12 +32,14 @@ static char sccsid[] = "@(#)fts.c 8.6 (Berkeley) 8/14/
#endif /* LIBC_SCCS and not lint */
/* Conditional to set up proper fstat64 implementation */
@@ -16,7 +16,7 @@
#if defined(_LIBC)
#include <sys/param.h>
#include <include/sys/stat.h>
-@@ -51,7 +53,7 @@ static char sccsid[] = "@(#)fts.c 8.6 (B
+@@ -51,7 +53,7 @@ static char sccsid[] = "@(#)fts.c 8.6 (Berkeley) 8/14/
#else
/* Conditionals for working around non-GNU environments */
@@ -25,7 +25,7 @@
# define _INCLUDE_POSIX_SOURCE
# define __errno_location() (&errno)
# define dirfd(dirp) -1
-@@ -65,11 +67,9 @@ static char sccsid[] = "@(#)fts.c 8.6 (B
+@@ -65,11 +67,9 @@ static char sccsid[] = "@(#)fts.c 8.6 (Berkeley) 8/14/
# define __errno_location() (__error())
#endif
diff --git a/archivers/rpm4/pkg-plist b/archivers/rpm4/pkg-plist
index b02a3560ee49..a96437398f1c 100644
--- a/archivers/rpm4/pkg-plist
+++ b/archivers/rpm4/pkg-plist
@@ -12,8 +12,6 @@ bin/rpmspec
bin/rpmverify
%%PYTHON%%%%PYTHON_SITELIBDIR%%/rpm/__init__.py
%%PYTHON%%%%PYTHON_SITELIBDIR%%/rpm/_rpm.so
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/rpm/_rpmb.so
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/rpm/_rpms.so
%%PYTHON%%%%PYTHON_SITELIBDIR%%/rpm/transaction.py
include/rpm/argv.h
include/rpm/header.h
@@ -50,19 +48,18 @@ include/rpm/rpmts.h
include/rpm/rpmtypes.h
include/rpm/rpmurl.h
include/rpm/rpmutil.h
-include/rpm/rpmvf.h
lib/librpm.so
-lib/librpm.so.8
-lib/librpm.so.8.1.0
+lib/librpm.so.9
+lib/librpm.so.9.0.0
lib/librpmbuild.so
-lib/librpmbuild.so.8
-lib/librpmbuild.so.8.1.0
+lib/librpmbuild.so.9
+lib/librpmbuild.so.9.0.0
lib/librpmio.so
-lib/librpmio.so.8
-lib/librpmio.so.8.1.0
+lib/librpmio.so.9
+lib/librpmio.so.9.0.0
lib/librpmsign.so
-lib/librpmsign.so.8
-lib/librpmsign.so.8.1.0
+lib/librpmsign.so.9
+lib/librpmsign.so.9.0.0
lib/rpm/brp-compress
lib/rpm/brp-java-gcjcompile
lib/rpm/brp-python-bytecompile
@@ -86,12 +83,12 @@ lib/rpm/fileattrs/elf.attr
lib/rpm/fileattrs/font.attr
lib/rpm/fileattrs/libtool.attr
lib/rpm/fileattrs/metainfo.attr
-lib/rpm/fileattrs/mono.attr
lib/rpm/fileattrs/ocaml.attr
lib/rpm/fileattrs/perl.attr
lib/rpm/fileattrs/perllib.attr
lib/rpm/fileattrs/pkgconfig.attr
lib/rpm/fileattrs/python.attr
+lib/rpm/fileattrs/pythondist.attr
lib/rpm/fileattrs/script.attr
lib/rpm/find-lang.sh
lib/rpm/find-provides
@@ -99,13 +96,8 @@ lib/rpm/find-requires
lib/rpm/fontconfig.prov
lib/rpm/libtooldeps.sh
lib/rpm/macros
-lib/rpm/macros.perl
-lib/rpm/macros.php
-lib/rpm/macros.python
lib/rpm/metainfo.prov
lib/rpm/mkinstalldirs
-lib/rpm/mono-find-provides
-lib/rpm/mono-find-requires
lib/rpm/ocaml-find-provides.sh
lib/rpm/ocaml-find-requires.sh
lib/rpm/perl.prov
@@ -119,6 +111,7 @@ lib/rpm/platform/alphaev6-%%OPSYS%%/macros
lib/rpm/platform/alphaev67-%%OPSYS%%/macros
lib/rpm/platform/alphapca56-%%OPSYS%%/macros
lib/rpm/platform/amd64-%%OPSYS%%/macros
+lib/rpm/platform/arm64-%%OPSYS%%/macros
lib/rpm/platform/armv3l-%%OPSYS%%/macros
lib/rpm/platform/armv4b-%%OPSYS%%/macros
lib/rpm/platform/armv4l-%%OPSYS%%/macros
@@ -130,6 +123,10 @@ lib/rpm/platform/armv6l-%%OPSYS%%/macros
lib/rpm/platform/armv7hl-%%OPSYS%%/macros
lib/rpm/platform/armv7hnl-%%OPSYS%%/macros
lib/rpm/platform/armv7l-%%OPSYS%%/macros
+lib/rpm/platform/armv8hcnl-%%OPSYS%%/macros
+lib/rpm/platform/armv8hl-%%OPSYS%%/macros
+lib/rpm/platform/armv8hnl-%%OPSYS%%/macros
+lib/rpm/platform/armv8l-%%OPSYS%%/macros
lib/rpm/platform/athlon-%%OPSYS%%/macros
lib/rpm/platform/geode-%%OPSYS%%/macros
lib/rpm/platform/i386-%%OPSYS%%/macros
@@ -175,7 +172,6 @@ lib/rpm/platform/sparcv8-%%OPSYS%%/macros
lib/rpm/platform/sparcv9-%%OPSYS%%/macros
lib/rpm/platform/sparcv9v-%%OPSYS%%/macros
lib/rpm/platform/x86_64-%%OPSYS%%/macros
-lib/rpm/python-macro-helper
lib/rpm/pythondeps.sh
%%PYTHON%%lib/rpm/pythondistdeps.py
lib/rpm/rpm.daily
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 08:13:00 +0000