Attachment #207938 for bug #240922

View | Details | Raw Unified | Return to bug 240922
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	rpm
PORTVERSION=	4.15.0
PORTREVISION=	1
CATEGORIES=	archivers
MASTER_SITES=	http://ftp.rpm.org/releases/rpm-4.15.x/
PKGNAMESUFFIX=	4

MAINTAINER=	rodrigo@FreeBSD.org

LICENSE_FILE=	${WRKSRC}/COPYING

LIB_DEPENDS=	libpopt.so:devel/popt \
		libnss3.so:security/nss \
		libzstd.so:archivers/zstd
RUN_DEPENDS=	bash:shells/bash

USES=		alias bdb compiler:openmp gmake iconv libarchive libtool \
		lua:52+ pathfix pkgconfig shebangfix tar:bzip2
INVALID_BDB_VER=51
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 \

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1545582876	1	TIMESTAMP = 1569770543
2	SHA256 (rpm-4.14.2.1.tar.bz2) = 1139c24b7372f89c0a697096bf9809be70ba55e006c23ff47305c1849d98acda	2	SHA256 (rpm-4.15.0.tar.bz2) = 1e06723b13591e57c99ebe2006fb8daddc4cf72efb366a64a34673ba5f61c201
3	SIZE (rpm-4.14.2.1.tar.bz2) = 4156574	3	SIZE (rpm-4.15.0.tar.bz2) = 4205632




--- 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);




--- 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 (Berkeley) 8/14/
 #endif /* LIBC_SCCS and not lint */
 
 /* Conditional to set up proper fstat64 implementation */
-#if defined(hpux) || defined(sun)
+#if defined(hpux) || defined(__FreeBSD__) || defined(__FreeBSD__) || defined(sun)
 #   define FTS_FSTAT64(_fd, _sbp)   fstat((_fd), (_sbp))
 #else
 #   define FTS_FSTAT64(_fd, _sbp)   fstat64((_fd), (_sbp))

 #if defined(_LIBC)
 #include <sys/param.h>
 #include <include/sys/stat.h>
@@ -51,7 +53,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__) || defined(__FreeBSD__)
 #   define        _INCLUDE_POSIX_SOURCE
 #   define __errno_location() 	(&errno)
 #   define dirfd(dirp)		-1
@@ -65,11 +67,9 @@ static char sccsid[] = "@(#)fts.c	8.6 (Berkeley) 8/14/
 #   define __errno_location()	(__error())
 #endif
 




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

include/rpm/rpmtypes.h
include/rpm/rpmurl.h
include/rpm/rpmutil.h
include/rpm/rpmvf.h
lib/librpm.so
lib/librpm.so.9
lib/librpm.so.9.0.0
lib/librpmbuild.so
lib/librpmbuild.so.9
lib/librpmbuild.so.9.0.0
lib/librpmio.so
lib/librpmio.so.9
lib/librpmio.so.9.0.0
lib/librpmsign.so
lib/librpmsign.so.9
lib/librpmsign.so.9.0.0
lib/rpm/brp-compress
lib/rpm/brp-java-gcjcompile
lib/rpm/brp-python-bytecompile

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

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

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

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

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

Return to bug 240922

Lines 2-11 Link Here

(-)Makefile (-8 / +7 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= rpm	4	PORTNAME= rpm
5	PORTVERSION= 4.14.2.1	5	PORTVERSION= 4.15.0
6	PORTREVISION= 1
7	CATEGORIES= archivers	6	CATEGORIES= archivers
8	MASTER_SITES= http://ftp.rpm.org/releases/rpm-4.14.x/	7	MASTER_SITES= http://ftp.rpm.org/releases/rpm-4.15.x/
9	PKGNAMESUFFIX= 4	8	PKGNAMESUFFIX= 4
10		9
11	MAINTAINER= rodrigo@FreeBSD.org	10	MAINTAINER= rodrigo@FreeBSD.org
Lines 15-31 Link Here
15	LICENSE_FILE= ${WRKSRC}/COPYING	14	LICENSE_FILE= ${WRKSRC}/COPYING
16		15
17	LIB_DEPENDS= libpopt.so:devel/popt \	16	LIB_DEPENDS= libpopt.so:devel/popt \
18	libnss3.so:security/nss	17	libnss3.so:security/nss \
		18	libzstd.so:archivers/zstd
19	RUN_DEPENDS= bash:shells/bash	19	RUN_DEPENDS= bash:shells/bash
20		20
21	USES= alias bdb gmake libarchive libtool lua:51 pathfix pkgconfig \	21	USES= alias bdb compiler:openmp gmake iconv libarchive libtool \
22	shebangfix tar:bzip2	22	lua:52+ pathfix pkgconfig shebangfix tar:bzip2
23	INVALID_BDB_VER=51
24	USE_LDCONFIG= yes	23	USE_LDCONFIG= yes
		24
25	GNU_CONFIGURE= yes	25	GNU_CONFIGURE= yes
26	SHEBANG_FILES= scripts/brp-python-bytecompile scripts/check-prereqs \	26	SHEBANG_FILES= scripts/brp-python-bytecompile scripts/check-prereqs \
27	scripts/check-rpaths-worker scripts/pythondeps.sh \	27	scripts/check-rpaths-worker scripts/pythondeps.sh \
28	scripts/mono-find-requires scripts/mono-find-provides \
29	scripts/pkgconfigdeps.sh scripts/fontconfig.prov \	28	scripts/pkgconfigdeps.sh scripts/fontconfig.prov \
30	scripts/rpmdb_loadcvt scripts/perl.prov scripts/perl.req \	29	scripts/rpmdb_loadcvt scripts/perl.prov scripts/perl.req \
31	scripts/pythondistdeps.py scripts/find-lang.sh \	30	scripts/pythondistdeps.py scripts/find-lang.sh \

Line 0 Link Here

(-)files/patch-luaext_lrexlib.c (+19 lines)
	1	--- luaext/lrexlib.c.orig 2019-06-26 14:17:31 UTC
	2	+++ luaext/lrexlib.c
	3	@@ -11,7 +11,6 @@
	4	#include "lauxlib.h"
	5	#include "lrexlib.h"
	6
	7	-
	8	/* Sanity check */
	9	#if !defined(WITH_POSIX) && !defined(WITH_PCRE)
	10	#error Define WITH_POSIX or WITH_PCRE, otherwise this library is useless!
	11	@@ -32,7 +31,7 @@ static int rex_comp(lua_State *L)
	12	regex_t pr = (regex_t )lua_newuserdata(L, sizeof(regex_t));
	13	pattern = luaL_checklstring(L, 1, &l);
	14	#ifdef REG_BASIC
	15	- pr->re_endp = pattern + lua_strlen(L, 1);
	16	+ pr->re_endp = pattern + lua_rawlen(L, (1));
	17	res = regcomp(pr, pattern, REG_EXTENDED \| REG_PEND);
	18	#else
	19	res = regcomp(pr, pattern, REG_EXTENDED);

Lines 1-11 Link Here

(-)files/patch-misc_fts.c (-6 / +6 lines)
1	--- misc/fts.c.orig 2018-08-25 09:14:19 UTC	1	--- misc/fts.c.orig 2019-06-26 14:17:31 UTC
2	+++ misc/fts.c	2	+++ misc/fts.c
3	@@ -32,12 +32,14 @@ static char sccsid[] = "@(#)fts.c 8.6 (B	3	@@ -32,12 +32,14 @@ static char sccsid[] = "@(#)fts.c 8.6 (Berkeley) 8/14/
4	#endif /* LIBC_SCCS and not lint */	4	#endif /* LIBC_SCCS and not lint */
5		5
6	/* Conditional to set up proper fstat64 implementation */	6	/* Conditional to set up proper fstat64 implementation */
7	-#if defined(hpux) \|\| defined(sun)	7	-#if defined(hpux) \|\| defined(sun)
8	+#if defined(hpux) \|\| defined(__FreeBSD__) \|\| defined(sun)	8	+#if defined(hpux) \|\| defined(__FreeBSD__) \|\| defined(__FreeBSD__) \|\| defined(sun)
9	# define FTS_FSTAT64(_fd, _sbp) fstat((_fd), (_sbp))	9	# define FTS_FSTAT64(_fd, _sbp) fstat((_fd), (_sbp))
10	#else	10	#else
11	# define FTS_FSTAT64(_fd, _sbp) fstat64((_fd), (_sbp))	11	# define FTS_FSTAT64(_fd, _sbp) fstat64((_fd), (_sbp))
Lines 16-31 Link Here
16	#if defined(_LIBC)	16	#if defined(_LIBC)
17	#include <sys/param.h>	17	#include <sys/param.h>
18	#include <include/sys/stat.h>	18	#include <include/sys/stat.h>
19	@@ -51,7 +53,7 @@ static char sccsid[] = "@(#)fts.c 8.6 (B	19	@@ -51,7 +53,7 @@ static char sccsid[] = "@(#)fts.c 8.6 (Berkeley) 8/14/
20	#else	20	#else
21		21
22	/* Conditionals for working around non-GNU environments */	22	/* Conditionals for working around non-GNU environments */
23	-#if defined(hpux)	23	-#if defined(hpux)
24	+#if defined(hpux) \|\| defined(__FreeBSD__)	24	+#if defined(hpux) \|\| defined(__FreeBSD__) \|\| defined(__FreeBSD__)
25	# define _INCLUDE_POSIX_SOURCE	25	# define _INCLUDE_POSIX_SOURCE
26	# define __errno_location() (&errno)	26	# define __errno_location() (&errno)
27	# define dirfd(dirp) -1	27	# define dirfd(dirp) -1
28	@@ -65,11 +67,9 @@ static char sccsid[] = "@(#)fts.c 8.6 (B	28	@@ -65,11 +67,9 @@ static char sccsid[] = "@(#)fts.c 8.6 (Berkeley) 8/14/
29	# define __errno_location() (__error())	29	# define __errno_location() (__error())
30	#endif	30	#endif
31		31

Lines 12-19 Link Here

(-)pkg-plist (-18 / +14 lines)
12	bin/rpmverify	12	bin/rpmverify
13	%%PYTHON%%%%PYTHON_SITELIBDIR%%/rpm/__init__.py	13	%%PYTHON%%%%PYTHON_SITELIBDIR%%/rpm/__init__.py
14	%%PYTHON%%%%PYTHON_SITELIBDIR%%/rpm/_rpm.so	14	%%PYTHON%%%%PYTHON_SITELIBDIR%%/rpm/_rpm.so
15	%%PYTHON%%%%PYTHON_SITELIBDIR%%/rpm/_rpmb.so
16	%%PYTHON%%%%PYTHON_SITELIBDIR%%/rpm/_rpms.so
17	%%PYTHON%%%%PYTHON_SITELIBDIR%%/rpm/transaction.py	15	%%PYTHON%%%%PYTHON_SITELIBDIR%%/rpm/transaction.py
18	include/rpm/argv.h	16	include/rpm/argv.h
19	include/rpm/header.h	17	include/rpm/header.h
Lines 50-68 Link Here
50	include/rpm/rpmtypes.h	48	include/rpm/rpmtypes.h
51	include/rpm/rpmurl.h	49	include/rpm/rpmurl.h
52	include/rpm/rpmutil.h	50	include/rpm/rpmutil.h
53	include/rpm/rpmvf.h
54	lib/librpm.so	51	lib/librpm.so
55	lib/librpm.so.8	52	lib/librpm.so.9
56	lib/librpm.so.8.1.0	53	lib/librpm.so.9.0.0
57	lib/librpmbuild.so	54	lib/librpmbuild.so
58	lib/librpmbuild.so.8	55	lib/librpmbuild.so.9
59	lib/librpmbuild.so.8.1.0	56	lib/librpmbuild.so.9.0.0
60	lib/librpmio.so	57	lib/librpmio.so
61	lib/librpmio.so.8	58	lib/librpmio.so.9
62	lib/librpmio.so.8.1.0	59	lib/librpmio.so.9.0.0
63	lib/librpmsign.so	60	lib/librpmsign.so
64	lib/librpmsign.so.8	61	lib/librpmsign.so.9
65	lib/librpmsign.so.8.1.0	62	lib/librpmsign.so.9.0.0
66	lib/rpm/brp-compress	63	lib/rpm/brp-compress
67	lib/rpm/brp-java-gcjcompile	64	lib/rpm/brp-java-gcjcompile
68	lib/rpm/brp-python-bytecompile	65	lib/rpm/brp-python-bytecompile
Lines 86-97 Link Here
86	lib/rpm/fileattrs/font.attr	83	lib/rpm/fileattrs/font.attr
87	lib/rpm/fileattrs/libtool.attr	84	lib/rpm/fileattrs/libtool.attr
88	lib/rpm/fileattrs/metainfo.attr	85	lib/rpm/fileattrs/metainfo.attr
89	lib/rpm/fileattrs/mono.attr
90	lib/rpm/fileattrs/ocaml.attr	86	lib/rpm/fileattrs/ocaml.attr
91	lib/rpm/fileattrs/perl.attr	87	lib/rpm/fileattrs/perl.attr
92	lib/rpm/fileattrs/perllib.attr	88	lib/rpm/fileattrs/perllib.attr
93	lib/rpm/fileattrs/pkgconfig.attr	89	lib/rpm/fileattrs/pkgconfig.attr
94	lib/rpm/fileattrs/python.attr	90	lib/rpm/fileattrs/python.attr
		91	lib/rpm/fileattrs/pythondist.attr
95	lib/rpm/fileattrs/script.attr	92	lib/rpm/fileattrs/script.attr
96	lib/rpm/find-lang.sh	93	lib/rpm/find-lang.sh
97	lib/rpm/find-provides	94	lib/rpm/find-provides
Lines 99-111 Link Here
99	lib/rpm/fontconfig.prov	96	lib/rpm/fontconfig.prov
100	lib/rpm/libtooldeps.sh	97	lib/rpm/libtooldeps.sh
101	lib/rpm/macros	98	lib/rpm/macros
102	lib/rpm/macros.perl
103	lib/rpm/macros.php
104	lib/rpm/macros.python
105	lib/rpm/metainfo.prov	99	lib/rpm/metainfo.prov
106	lib/rpm/mkinstalldirs	100	lib/rpm/mkinstalldirs
107	lib/rpm/mono-find-provides
108	lib/rpm/mono-find-requires
109	lib/rpm/ocaml-find-provides.sh	101	lib/rpm/ocaml-find-provides.sh
110	lib/rpm/ocaml-find-requires.sh	102	lib/rpm/ocaml-find-requires.sh
111	lib/rpm/perl.prov	103	lib/rpm/perl.prov
Lines 119-124 Link Here
119	lib/rpm/platform/alphaev67-%%OPSYS%%/macros	111	lib/rpm/platform/alphaev67-%%OPSYS%%/macros
120	lib/rpm/platform/alphapca56-%%OPSYS%%/macros	112	lib/rpm/platform/alphapca56-%%OPSYS%%/macros
121	lib/rpm/platform/amd64-%%OPSYS%%/macros	113	lib/rpm/platform/amd64-%%OPSYS%%/macros
		114	lib/rpm/platform/arm64-%%OPSYS%%/macros
122	lib/rpm/platform/armv3l-%%OPSYS%%/macros	115	lib/rpm/platform/armv3l-%%OPSYS%%/macros
123	lib/rpm/platform/armv4b-%%OPSYS%%/macros	116	lib/rpm/platform/armv4b-%%OPSYS%%/macros
124	lib/rpm/platform/armv4l-%%OPSYS%%/macros	117	lib/rpm/platform/armv4l-%%OPSYS%%/macros
Lines 130-135 Link Here
130	lib/rpm/platform/armv7hl-%%OPSYS%%/macros	123	lib/rpm/platform/armv7hl-%%OPSYS%%/macros
131	lib/rpm/platform/armv7hnl-%%OPSYS%%/macros	124	lib/rpm/platform/armv7hnl-%%OPSYS%%/macros
132	lib/rpm/platform/armv7l-%%OPSYS%%/macros	125	lib/rpm/platform/armv7l-%%OPSYS%%/macros
		126	lib/rpm/platform/armv8hcnl-%%OPSYS%%/macros
		127	lib/rpm/platform/armv8hl-%%OPSYS%%/macros
		128	lib/rpm/platform/armv8hnl-%%OPSYS%%/macros
		129	lib/rpm/platform/armv8l-%%OPSYS%%/macros
133	lib/rpm/platform/athlon-%%OPSYS%%/macros	130	lib/rpm/platform/athlon-%%OPSYS%%/macros
134	lib/rpm/platform/geode-%%OPSYS%%/macros	131	lib/rpm/platform/geode-%%OPSYS%%/macros
135	lib/rpm/platform/i386-%%OPSYS%%/macros	132	lib/rpm/platform/i386-%%OPSYS%%/macros
Lines 175-181 Link Here
175	lib/rpm/platform/sparcv9-%%OPSYS%%/macros	172	lib/rpm/platform/sparcv9-%%OPSYS%%/macros
176	lib/rpm/platform/sparcv9v-%%OPSYS%%/macros	173	lib/rpm/platform/sparcv9v-%%OPSYS%%/macros
177	lib/rpm/platform/x86_64-%%OPSYS%%/macros	174	lib/rpm/platform/x86_64-%%OPSYS%%/macros
178	lib/rpm/python-macro-helper
179	lib/rpm/pythondeps.sh	175	lib/rpm/pythondeps.sh
180	%%PYTHON%%lib/rpm/pythondistdeps.py	176	%%PYTHON%%lib/rpm/pythondistdeps.py
181	lib/rpm/rpm.daily	177	lib/rpm/rpm.daily