cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upgrade archivers/rpm4 from v4.13.1 to v4.14.2

Browse Source 
Main changes:
  - Support for enforcing signature policy and payload verification
  - Numerous bugfixes and minor enhancements across the board
See detailed release note here : http://rpm.org/wiki/Releases/4.14.2

Since I'm here :
 - redo the patches using makepatch
 - remove unnecesary USE_LDCONFIG (repored by portlint)

PR:		229750
Reported by:	Brian Zou  <zoujiaqing@gmail.com>
This commit is contained in:
Rodrigo Osorio 2018-09-02 16:29:56 +00:00
parent 90a0fbd259
commit 8a5da497b6
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=478806
6 changed files with 118 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
archivers/rpm4/Makefile
View File

@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= rpm
PORTVERSION= 4.13.1
PORTREVISION= 1
PORTVERSION= 4.14.2
CATEGORIES= archivers
MASTER_SITES= http://ftp.rpm.org/releases/rpm-${PORTVERSION:R}.x/
PKGNAMESUFFIX= 4
@ -21,7 +20,6 @@ USES= alias bdb gmake libarchive libtool lua:51 pathfix pkgconfig \
shebangfix tar:bzip2
INVALID_BDB_VER=51
GNU_CONFIGURE= yes
USE_LDCONFIG= 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 \

6
archivers/rpm4/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1523312897
SHA256 (rpm-4.13.1.tar.bz2) = 81e5bc8e46baa0710a19c7d9bb34c24baceefeeafd86a9033e1e4d9613bb5b60
SIZE (rpm-4.13.1.tar.bz2) = 3814812
TIMESTAMP = 1534968295
SHA256 (rpm-4.14.2.tar.bz2) = 80cbc2c1e8e24e67c6f88b41d8ab5633b653a9a79d50d4750474a18cdb69352b
SIZE (rpm-4.14.2.tar.bz2) = 4151934

6
archivers/rpm4/files/patch-misc_fts.c
View File

@ -1,4 +1,4 @@
--- misc/fts.c.orig 2016-11-30 07:03:00 UTC
--- misc/fts.c.orig 2018-08-25 09:14:19 UTC
+++ misc/fts.c
@@ -32,12 +32,14 @@ static char sccsid[] = "@(#)fts.c 8.6 (B
#endif /* LIBC_SCCS and not lint */
@ -12,7 +12,7 @@
#endif
+#include "system.h"
+#include "misc/fts.h"
+#include "misc/rpmfts.h"
#if defined(_LIBC)
#include <sys/param.h>
#include <include/sys/stat.h>
@ -33,7 +33,7 @@
#include <stdlib.h>
#include <string.h>
#include <errno.h>
-#include "misc/fts.h"
-#include "misc/rpmfts.h"
# define __set_errno(val) (*__errno_location ()) = (val)
# define __open open
# define __close close

7
archivers/rpm4/files/patch-plugins_ima.c
View File

@ -1,6 +1,9 @@
--- plugins/ima.c.orig 2017-03-29 21:11:01 UTC
--- plugins/ima.c.orig 2018-06-21 09:08:06 UTC
+++ plugins/ima.c
@@ -1,5 +1,3 @@
@@ -1,8 +1,6 @@
#include "system.h"
#include <errno.h>
-#include <sys/xattr.h>
-
#include <rpm/rpmfi.h>

13
archivers/rpm4/files/patch-system.h
View File

@ -1,6 +1,6 @@
--- system.h.orig 2017-02-16 09:40:09 UTC
--- system.h.orig 2017-10-05 10:04:57 UTC
+++ system.h
@@ -41,6 +41,13 @@ char * stpncpy(char * dest, const char *
@@ -43,6 +43,13 @@ char * stpncpy(char * dest, const char *
#define getenv(_s) __secure_getenv(_s)
#endif
@ -14,12 +14,3 @@
#ifdef HAVE_FCNTL_H
#include <fcntl.h>
#else
@@ -87,7 +94,7 @@ char * stpncpy(char * dest, const char *
#define _free(_ptr) rfree((_ptr))
/* Retrofit glibc __progname */
-#if defined __GLIBC__ && __GLIBC__ >= 2
+#if defined __GLIBC__ && __GLIBC__ >= 2 || defined(__FreeBSD__)
#if __GLIBC_MINOR__ >= 1
#define __progname __assert_program_name
#endif

200
archivers/rpm4/pkg-plist
View File

@ -1,73 +1,16 @@
bin/gendiff
bin/rpm
bin/rpm2archive
bin/rpm2cpio
bin/rpmbuild
bin/rpmdb
bin/rpmgraph
bin/rpmkeys
bin/rpmquery
bin/rpmsign
bin/rpmspec
bin/rpmverify
include/rpm/argv.h
include/rpm/header.h
include/rpm/rpmarchive.h
include/rpm/rpmbase64.h
include/rpm/rpmbuild.h
include/rpm/rpmcallback.h
include/rpm/rpmcli.h
include/rpm/rpmdb.h
include/rpm/rpmds.h
include/rpm/rpmfc.h
include/rpm/rpmfi.h
include/rpm/rpmfiles.h
include/rpm/rpmfileutil.h
include/rpm/rpmio.h
include/rpm/rpmkeyring.h
include/rpm/rpmlegacy.h
include/rpm/rpm%%LUA_LIBDIR%%.h
include/rpm/rpmlog.h
include/rpm/rpmmacro.h
include/rpm/rpmpgp.h
include/rpm/rpmpol.h
include/rpm/rpmprob.h
include/rpm/rpmps.h
include/rpm/rpmsign.h
include/rpm/rpmspec.h
include/rpm/rpmsq.h
include/rpm/rpmstring.h
include/rpm/rpmstrpool.h
include/rpm/rpmsw.h
include/rpm/rpmtag.h
include/rpm/rpmtd.h
include/rpm/rpmte.h
include/rpm/rpmts.h
include/rpm/rpmtypes.h
include/rpm/rpmurl.h
include/rpm/rpmutil.h
include/rpm/rpmvf.h
%%LUA_LIBDIR%%/%%LUA_LIBDIR%%rpm.so
%%LUA_LIBDIR%%/%%LUA_LIBDIR%%rpm.so.7
%%LUA_LIBDIR%%/%%LUA_LIBDIR%%rpm.so.7.0.2
%%LUA_LIBDIR%%/%%LUA_LIBDIR%%rpm.so.8
%%LUA_LIBDIR%%/%%LUA_LIBDIR%%rpm.so.8.1.0
%%LUA_LIBDIR%%/%%LUA_LIBDIR%%rpmbuild.so
%%LUA_LIBDIR%%/%%LUA_LIBDIR%%rpmbuild.so.7
%%LUA_LIBDIR%%/%%LUA_LIBDIR%%rpmbuild.so.7.0.2
%%LUA_LIBDIR%%/%%LUA_LIBDIR%%rpmbuild.so.8
%%LUA_LIBDIR%%/%%LUA_LIBDIR%%rpmbuild.so.8.1.0
%%LUA_LIBDIR%%/%%LUA_LIBDIR%%rpmio.so
%%LUA_LIBDIR%%/%%LUA_LIBDIR%%rpmio.so.7
%%LUA_LIBDIR%%/%%LUA_LIBDIR%%rpmio.so.7.0.2
%%LUA_LIBDIR%%/%%LUA_LIBDIR%%rpmio.so.8
%%LUA_LIBDIR%%/%%LUA_LIBDIR%%rpmio.so.8.1.0
%%LUA_LIBDIR%%/%%LUA_LIBDIR%%rpmsign.so
%%LUA_LIBDIR%%/%%LUA_LIBDIR%%rpmsign.so.7
%%LUA_LIBDIR%%/%%LUA_LIBDIR%%rpmsign.so.7.0.2
%%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
%%PLUGINS%%%%LUA_LIBDIR%%/rpm-plugins/ima.so
%%PLUGINS%%%%LUA_LIBDIR%%/rpm-plugins/syslog.so
%%PLUGINS%%%%LUA_LIBDIR%%/rpm-plugins/systemd_inhibit.so
%%LUA_LIBDIR%%/rpm/appdata.prov
%%LUA_LIBDIR%%/%%LUA_LIBDIR%%rpmsign.so.8
%%LUA_LIBDIR%%/%%LUA_LIBDIR%%rpmsign.so.8.1.0
%%LUA_LIBDIR%%/rpm/%%LUA_LIBDIR%%tooldeps.sh
%%LUA_LIBDIR%%/rpm/brp-compress
%%LUA_LIBDIR%%/rpm/brp-java-gcjcompile
%%LUA_LIBDIR%%/rpm/brp-python-bytecompile
@ -83,16 +26,18 @@ include/rpm/rpmvf.h
%%LUA_LIBDIR%%/rpm/check-rpaths-worker
%%LUA_LIBDIR%%/rpm/config.guess
%%LUA_LIBDIR%%/rpm/config.sub
%%LUA_LIBDIR%%/rpm/debuginfo.prov
%%LUA_LIBDIR%%/rpm/desktop-file.prov
%%LUA_LIBDIR%%/rpm/fileattrs/appdata.attr
%%LUA_LIBDIR%%/rpm/fileattrs/%%LUA_LIBDIR%%tool.attr
%%LUA_LIBDIR%%/rpm/fileattrs/debuginfo.attr
%%LUA_LIBDIR%%/rpm/fileattrs/desktop.attr
%%LUA_LIBDIR%%/rpm/fileattrs/elf.attr
%%LUA_LIBDIR%%/rpm/fileattrs/font.attr
%%LUA_LIBDIR%%/rpm/fileattrs/%%LUA_LIBDIR%%tool.attr
%%LUA_LIBDIR%%/rpm/fileattrs/metainfo.attr
%%LUA_LIBDIR%%/rpm/fileattrs/mono.attr
%%LUA_LIBDIR%%/rpm/fileattrs/ocaml.attr
%%LUA_LIBDIR%%/rpm/fileattrs/perl.attr
%%LUA_LIBDIR%%/rpm/fileattrs/perl%%LUA_LIBDIR%%.attr
%%LUA_LIBDIR%%/rpm/fileattrs/perl.attr
%%LUA_LIBDIR%%/rpm/fileattrs/pkgconfig.attr
%%LUA_LIBDIR%%/rpm/fileattrs/python.attr
%%LUA_LIBDIR%%/rpm/fileattrs/script.attr
@ -100,11 +45,11 @@ include/rpm/rpmvf.h
%%LUA_LIBDIR%%/rpm/find-provides
%%LUA_LIBDIR%%/rpm/find-requires
%%LUA_LIBDIR%%/rpm/fontconfig.prov
%%LUA_LIBDIR%%/rpm/%%LUA_LIBDIR%%tooldeps.sh
%%LUA_LIBDIR%%/rpm/macros
%%LUA_LIBDIR%%/rpm/macros.perl
%%LUA_LIBDIR%%/rpm/macros.php
%%LUA_LIBDIR%%/rpm/macros.python
%%LUA_LIBDIR%%/rpm/metainfo.prov
%%LUA_LIBDIR%%/rpm/mkinstalldirs
%%LUA_LIBDIR%%/rpm/mono-find-provides
%%LUA_LIBDIR%%/rpm/mono-find-requires
@ -126,6 +71,7 @@ include/rpm/rpmvf.h
%%LUA_LIBDIR%%/rpm/platform/armv4l-%%OPSYS%%/macros
%%LUA_LIBDIR%%/rpm/platform/armv5tejl-%%OPSYS%%/macros
%%LUA_LIBDIR%%/rpm/platform/armv5tel-%%OPSYS%%/macros
%%LUA_LIBDIR%%/rpm/platform/armv5tl-%%OPSYS%%/macros
%%LUA_LIBDIR%%/rpm/platform/armv6hl-%%OPSYS%%/macros
%%LUA_LIBDIR%%/rpm/platform/armv6l-%%OPSYS%%/macros
%%LUA_LIBDIR%%/rpm/platform/armv7hl-%%OPSYS%%/macros
@ -176,7 +122,9 @@ include/rpm/rpmvf.h
%%LUA_LIBDIR%%/rpm/platform/sparcv9-%%OPSYS%%/macros
%%LUA_LIBDIR%%/rpm/platform/sparcv9v-%%OPSYS%%/macros
%%LUA_LIBDIR%%/rpm/platform/x86_64-%%OPSYS%%/macros
%%LUA_LIBDIR%%/rpm/python-macro-helper
%%LUA_LIBDIR%%/rpm/pythondeps.sh
%%LUA_LIBDIR%%/rpm/pythondistdeps.py
%%LUA_LIBDIR%%/rpm/rpm.daily
%%LUA_LIBDIR%%/rpm/rpm.log
%%LUA_LIBDIR%%/rpm/rpm.supp
@ -188,32 +136,6 @@ include/rpm/rpmvf.h
%%LUA_LIBDIR%%/rpm/script.req
%%LUA_LIBDIR%%/rpm/tgpg
%%LUA_LIBDIR%%data/pkgconfig/rpm.pc
man/fr/man8/rpm.8.gz
man/ja/man8/rpm.8.gz
man/ja/man8/rpm2cpio.8.gz
man/ja/man8/rpmbuild.8.gz
man/ja/man8/rpmgraph.8.gz
man/ko/man8/rpm.8.gz
man/ko/man8/rpm2cpio.8.gz
man/man1/gendiff.1.gz
man/man8/rpm.8.gz
man/man8/rpm2cpio.8.gz
man/man8/rpmbuild.8.gz
man/man8/rpmdb.8.gz
man/man8/rpmdeps.8.gz
man/man8/rpmgraph.8.gz
man/man8/rpmkeys.8.gz
man/man8/rpmsign.8.gz
man/man8/rpmspec.8.gz
man/pl/man1/gendiff.1.gz
man/pl/man8/rpm.8.gz
man/pl/man8/rpm2cpio.8.gz
man/pl/man8/rpmbuild.8.gz
man/pl/man8/rpmdeps.8.gz
man/pl/man8/rpmgraph.8.gz
man/ru/man8/rpm.8.gz
man/ru/man8/rpm2cpio.8.gz
man/sk/man8/rpm.8.gz
%%NLS%%share/locale/ar/LC_MESSAGES/rpm.mo
%%NLS%%share/locale/br/LC_MESSAGES/rpm.mo
%%NLS%%share/locale/ca/LC_MESSAGES/rpm.mo
@ -248,3 +170,89 @@ man/sk/man8/rpm.8.gz
%%NLS%%share/locale/vi/LC_MESSAGES/rpm.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/rpm.mo
%%NLS%%share/locale/zh_TW/LC_MESSAGES/rpm.mo
%%PLUGINS%%%%LUA_LIBDIR%%/rpm-plugins/ima.so
%%PLUGINS%%%%LUA_LIBDIR%%/rpm-plugins/syslog.so
%%PLUGINS%%%%LUA_LIBDIR%%/rpm-plugins/systemd_inhibit.so
%%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
@dir %%LUA_LIBDIR%%/rpm/macros.d
bin/gendiff
bin/rpm
bin/rpm2archive
bin/rpm2cpio
bin/rpmbuild
bin/rpmdb
bin/rpmgraph
bin/rpmkeys
bin/rpmquery
bin/rpmsign
bin/rpmspec
bin/rpmverify
include/rpm/argv.h
include/rpm/header.h
include/rpm/rpm%%LUA_LIBDIR%%.h
include/rpm/rpmarchive.h
include/rpm/rpmbase64.h
include/rpm/rpmbuild.h
include/rpm/rpmcallback.h
include/rpm/rpmcli.h
include/rpm/rpmdb.h
include/rpm/rpmds.h
include/rpm/rpmfc.h
include/rpm/rpmfi.h
include/rpm/rpmfiles.h
include/rpm/rpmfileutil.h
include/rpm/rpmio.h
include/rpm/rpmkeyring.h
include/rpm/rpmlog.h
include/rpm/rpmmacro.h
include/rpm/rpmpgp.h
include/rpm/rpmpol.h
include/rpm/rpmprob.h
include/rpm/rpmps.h
include/rpm/rpmsign.h
include/rpm/rpmspec.h
include/rpm/rpmsq.h
include/rpm/rpmstring.h
include/rpm/rpmstrpool.h
include/rpm/rpmsw.h
include/rpm/rpmtag.h
include/rpm/rpmtd.h
include/rpm/rpmte.h
include/rpm/rpmts.h
include/rpm/rpmtypes.h
include/rpm/rpmurl.h
include/rpm/rpmutil.h
include/rpm/rpmvf.h
man/fr/man8/rpm.8.gz
man/ja/man8/rpm.8.gz
man/ja/man8/rpm2cpio.8.gz
man/ja/man8/rpmbuild.8.gz
man/ja/man8/rpmgraph.8.gz
man/ko/man8/rpm.8.gz
man/ko/man8/rpm2cpio.8.gz
man/man1/gendiff.1.gz
man/man8/rpm-misc.8.gz
man/man8/rpm-plugin-systemd-inhibit.8.gz
man/man8/rpm.8.gz
man/man8/rpm2cpio.8.gz
man/man8/rpmbuild.8.gz
man/man8/rpmdb.8.gz
man/man8/rpmdeps.8.gz
man/man8/rpmgraph.8.gz
man/man8/rpmkeys.8.gz
man/man8/rpmsign.8.gz
man/man8/rpmspec.8.gz
man/pl/man1/gendiff.1.gz
man/pl/man8/rpm.8.gz
man/pl/man8/rpm2cpio.8.gz
man/pl/man8/rpmbuild.8.gz
man/pl/man8/rpmdeps.8.gz
man/pl/man8/rpmgraph.8.gz
man/ru/man8/rpm.8.gz
man/ru/man8/rpm2cpio.8.gz
man/sk/man8/rpm.8.gz
share/locale/id/LC_MESSAGES/rpm.mo