pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/misc/rpm RPM 4.13.0.1
details: https://anonhg.NetBSD.org/pkgsrc/rev/55db34c00d5c
branches: trunk
changeset: 361634:55db34c00d5c
user: adam <adam%pkgsrc.org@localhost>
date: Sun Apr 23 08:18:14 2017 +0000
description:
RPM 4.13.0.1
Security fixes
* Fix several out of bounds reads in the OpenPGP parser
* Fix handling of OpenPGP reserved tag (should be rejected)
* Fix various crashes from malformed packages with invalid tags
General bugfixes
* Fix %transfiletriggerpostun nondeterministic behavior
* Fix rpmdb cleanup on signal (regression introduced in 4.13.0)
Package building
* Fix debuginfo GDB index generation (regression introduced in 4.13.0)
* Fix malformed packages being generated around 4GB size boundary (regression introduced in 4.12.0)
* Fix special %doc/%license directory inheriting default file permissions (regression introduced in 4.13.0)
Build process
* Fix API documentation generation with Doxygen >= 1.8.8
diffstat:
misc/rpm/Makefile | 81 +++++++++++++++++++------------
misc/rpm/PLIST | 69 +++++++++++++++++++++++++-
misc/rpm/PLIST.Linux | 53 --------------------
misc/rpm/PLIST.NetBSD | 55 ---------------------
misc/rpm/PLIST.SunOS | 55 ---------------------
misc/rpm/buildlink3.mk | 4 +-
misc/rpm/distinfo | 25 ++++-----
misc/rpm/patches/patch-configure.ac | 20 ++++++-
misc/rpm/patches/patch-installplatform | 15 +++++
misc/rpm/patches/patch-lib_backend_db3.c | 8 +-
misc/rpm/patches/patch-lib_cpio.c | 20 -------
misc/rpm/patches/patch-lib_header.c | 4 +-
misc/rpm/patches/patch-lib_rpmrc.c | 18 +++++-
misc/rpm/patches/patch-misc_fnmatch.c | 4 +-
misc/rpm/patches/patch-misc_fts.c | 30 +++++++----
misc/rpm/patches/patch-misc_fts.h | 17 ------
16 files changed, 203 insertions(+), 275 deletions(-)
diffs (truncated from 689 to 300 lines):
diff -r 98e34519a91b -r 55db34c00d5c misc/rpm/Makefile
--- a/misc/rpm/Makefile Sun Apr 23 07:03:16 2017 +0000
+++ b/misc/rpm/Makefile Sun Apr 23 08:18:14 2017 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.91 2016/09/18 17:02:12 wiedi Exp $
+# $NetBSD: Makefile,v 1.92 2017/04/23 08:18:14 adam Exp $
-DISTNAME= rpm-4.12.0.1
-PKGREVISION= 4
+DISTNAME= rpm-4.13.0.1
CATEGORIES= misc
-MASTER_SITES= http://rpm.org/releases/rpm-4.12.x/
+MASTER_SITES= http://ftp.rpm.org/releases/rpm-4.13.x/
EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
@@ -15,26 +14,38 @@
NOT_FOR_PLATFORM+= Interix-*-* # getmntent() is nonpublic; needs porting
-MAKE_JOBS_SAFE= no
-
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
-USE_TOOLS+= automake bash:run gmake msgfmt perl:run pkg-config
+USE_TOOLS+= autoconf bash:run gmake msgfmt perl:run pkg-config
GNU_CONFIGURE= yes
-
-GMAKE_REQD+= 3.82nb1
-GMAKE= ${TOOLS_GMAKE}
-
-REPLACE_BASH+= scripts/*
-REPLACE_PERL+= scripts/*
-
-# To avoid build directory references.
-CONFIGURE_ENV+= MYPATH=/sbin:/bin:/usr/sbin:/usr/bin
-
# this is needed in addition of USE_PKGLOCALEDIR
CONFIGURE_ARGS+= --datadir=${PREFIX}/${PKGLOCALEDIR}
+CONFIGURE_ARGS+= --with-external-db
+CONFIGURE_ARGS+= --with-vendor=pkgsrc
CONFIGURE_ARGS+= --without-lua
-CONFIGURE_ARGS+= --with-external-db
+# avoid build directory references
+CONFIGURE_ENV+= MYPATH=/sbin:/bin:/usr/sbin:/usr/bin
+# rpm databases are kept under ${RPM_DB_PREFIX}/lib/rpm.
+CONFIGURE_ENV+= varprefix=${RPM_DB_PREFIX:Q}
+CONFIGURE_ENV.Darwin+= ac_cv_func_fdatasync=no
+
+PKGCONFIG_OVERRIDE= rpm.pc.in
+
+GMAKE_REQD= 3.82nb1
+
+REPLACE_BASH+= installplatform
+REPLACE_BASH+= scripts/brp-python-bytecompile
+REPLACE_BASH+= scripts/check-prereqs
+REPLACE_BASH+= scripts/check-rpaths-worker
+REPLACE_BASH+= scripts/find-debuginfo.sh
+REPLACE_BASH+= scripts/fontconfig.prov
+REPLACE_BASH+= scripts/mono-find-provides
+REPLACE_BASH+= scripts/mono-find-requires
+REPLACE_BASH+= scripts/pkgconfigdeps.sh
+REPLACE_BASH+= scripts/pythondeps.sh
+REPLACE_BASH+= scripts/rpmdb_loadcvt
+REPLACE_PERL+= scripts/perl.prov
+REPLACE_PERL+= scripts/perl.req
BDB_ACCEPTED= db4 db5
.include "../../mk/bdb.buildlink3.mk"
@@ -43,8 +54,6 @@
.else
BUILDLINK_TRANSFORM+= l:db:db5
.endif
-# The rpm databases are kept under ${RPM_DB_PREFIX}/lib/rpm.
-CONFIGURE_ENV+= varprefix=${RPM_DB_PREFIX:Q}
LDFLAGS+= ${PTHREAD_LDFLAGS}
@@ -52,25 +61,36 @@
MAKE_FLAGS+= ROOT=${DESTDIR}
RPMDIR= ${RPM_DB_PREFIX}/lib/rpm
-FILES_SUBST+= RPMDIR=${RPMDIR:Q}
+FILES_SUBST+= RPMDIR=${RPMDIR}
# The configure script doesn't detect whether libintl.so has any
# library dependencies.
-#
BROKEN_GETTEXT_DETECTION= yes
-BUILDLINK_TRANSFORM.SunOS+= rm:-fstack-protector
-CFLAGS.SunOS+= -fno-stack-protector
-
-pre-configure:
- set -e; cd ${WRKSRC}; \
- aclocal; autoheader; automake -a --foreign -i; autoconf
+CHECK_PORTABILITY_SKIP= tests/rpmtests
SUBST_CLASSES+= mkd
SUBST_STAGE.mkd= post-build
-SUBST_MESSAGE.mkd= Fixing workdir tools references in macros file
+SUBST_MESSAGE.mkd= Fixing workdir tools references in macros file.
SUBST_FILES.mkd= macros
-SUBST_SED.mkd+= -e 's,${TOOLS_CMD.mkdir},${TOOLS_PATH.mkdir},'
+SUBST_SED.mkd= -e 's,${TOOLS_CMD.mkdir},${TOOLS_PATH.mkdir},'
+
+# __progname without 'extern' segfaults on some platforms (e.g. Darwin)
+SUBST_CLASSES+= progname
+SUBST_STAGE.progname= pre-configure
+SUBST_MESSAGE.progname= Fixing __progname declarations to include 'extern'.
+SUBST_FILES.progname= lib/poptALL.c
+SUBST_FILES.progname+= rpm2archive.c
+SUBST_FILES.progname+= rpm2cpio.c
+SUBST_FILES.progname+= rpmbuild.c
+SUBST_FILES.progname+= rpmqv.c
+SUBST_FILES.progname+= rpmspec.c
+SUBST_FILES.progname+= tools/rpmdeps.c
+SUBST_FILES.progname+= tools/rpmgraph.c
+SUBST_SED.progname= -e 's,^const char \*__progname;,extern &,'
+
+pre-configure:
+ cd ${WRKSRC} && autoconf
.include "../../archivers/libarchive/buildlink3.mk"
.include "../../converters/libiconv/buildlink3.mk"
@@ -81,5 +101,4 @@
.include "../../devel/zlib/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
.include "../../sysutils/file/buildlink3.mk" # for libmagic.
-
.include "../../mk/bsd.pkg.mk"
diff -r 98e34519a91b -r 55db34c00d5c misc/rpm/PLIST
--- a/misc/rpm/PLIST Sun Apr 23 07:03:16 2017 +0000
+++ b/misc/rpm/PLIST Sun Apr 23 08:18:14 2017 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2015/03/15 05:34:56 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.11 2017/04/23 08:18:14 adam Exp $
bin/gendiff
bin/rpm
bin/rpm2archive
@@ -53,6 +53,7 @@
lib/librpmio.la
lib/librpmsign.la
lib/pkgconfig/rpm.pc
+lib/rpm-plugins/ima.la
lib/rpm-plugins/syslog.la
lib/rpm/appdata.prov
lib/rpm/brp-compress
@@ -97,11 +98,72 @@
lib/rpm/mono-find-requires
lib/rpm/ocaml-find-provides.sh
lib/rpm/ocaml-find-requires.sh
-lib/rpm/osgideps.pl
lib/rpm/perl.prov
lib/rpm/perl.req
-lib/rpm/perldeps.pl
lib/rpm/pkgconfigdeps.sh
+lib/rpm/platform/aarch64/macros
+lib/rpm/platform/alpha/macros
+lib/rpm/platform/alphaev5/macros
+lib/rpm/platform/alphaev56/macros
+lib/rpm/platform/alphaev6/macros
+lib/rpm/platform/alphaev67/macros
+lib/rpm/platform/alphapca56/macros
+lib/rpm/platform/amd64/macros
+lib/rpm/platform/armv3l/macros
+lib/rpm/platform/armv4b/macros
+lib/rpm/platform/armv4l/macros
+lib/rpm/platform/armv5tejl/macros
+lib/rpm/platform/armv5tel/macros
+lib/rpm/platform/armv6hl/macros
+lib/rpm/platform/armv6l/macros
+lib/rpm/platform/armv7hl/macros
+lib/rpm/platform/armv7hnl/macros
+lib/rpm/platform/armv7l/macros
+lib/rpm/platform/athlon/macros
+lib/rpm/platform/geode/macros
+lib/rpm/platform/i386/macros
+lib/rpm/platform/i486/macros
+lib/rpm/platform/i586/macros
+lib/rpm/platform/i686/macros
+lib/rpm/platform/ia32e/macros
+lib/rpm/platform/ia64/macros
+lib/rpm/platform/m68k/macros
+lib/rpm/platform/mips/macros
+lib/rpm/platform/mips64/macros
+lib/rpm/platform/mips64el/macros
+lib/rpm/platform/mips64r6/macros
+lib/rpm/platform/mips64r6el/macros
+lib/rpm/platform/mipsel/macros
+lib/rpm/platform/mipsr6/macros
+lib/rpm/platform/mipsr6el/macros
+lib/rpm/platform/noarch/macros
+lib/rpm/platform/pentium3/macros
+lib/rpm/platform/pentium4/macros
+lib/rpm/platform/ppc/macros
+lib/rpm/platform/ppc32dy4/macros
+lib/rpm/platform/ppc64/macros
+lib/rpm/platform/ppc64iseries/macros
+lib/rpm/platform/ppc64le/macros
+lib/rpm/platform/ppc64p7/macros
+lib/rpm/platform/ppc64pseries/macros
+lib/rpm/platform/ppc8260/macros
+lib/rpm/platform/ppc8560/macros
+lib/rpm/platform/ppciseries/macros
+lib/rpm/platform/ppcpseries/macros
+lib/rpm/platform/riscv64/macros
+lib/rpm/platform/s390/macros
+lib/rpm/platform/s390x/macros
+lib/rpm/platform/sh/macros
+lib/rpm/platform/sh3/macros
+lib/rpm/platform/sh4/macros
+lib/rpm/platform/sh4a/macros
+lib/rpm/platform/sparc/macros
+lib/rpm/platform/sparc64/macros
+lib/rpm/platform/sparc64v/macros
+lib/rpm/platform/sparcv8/macros
+lib/rpm/platform/sparcv9/macros
+lib/rpm/platform/sparcv9v/macros
+lib/rpm/platform/x86_64/macros
lib/rpm/pythondeps.sh
lib/rpm/rpm.daily
lib/rpm/rpm.log
@@ -112,7 +174,6 @@
lib/rpm/rpmpopt-${PKGVERSION}
lib/rpm/rpmrc
lib/rpm/script.req
-lib/rpm/tcl.req
lib/rpm/tgpg
man/fr/man8/rpm.8
man/ja/man8/rpm.8
diff -r 98e34519a91b -r 55db34c00d5c misc/rpm/PLIST.Linux
--- a/misc/rpm/PLIST.Linux Sun Apr 23 07:03:16 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-@comment $NetBSD: PLIST.Linux,v 1.1 2013/12/16 09:53:44 markd Exp $
-lib/rpm/debugedit
-lib/rpm/elfdeps
-lib/rpm/find-debuginfo.sh
-lib/rpm/platform/aarch64-linux/macros
-lib/rpm/platform/alphaev56-linux/macros
-lib/rpm/platform/alphaev5-linux/macros
-lib/rpm/platform/alphaev67-linux/macros
-lib/rpm/platform/alphaev6-linux/macros
-lib/rpm/platform/alpha-linux/macros
-lib/rpm/platform/alphapca56-linux/macros
-lib/rpm/platform/amd64-linux/macros
-lib/rpm/platform/armv3l-linux/macros
-lib/rpm/platform/armv4b-linux/macros
-lib/rpm/platform/armv4l-linux/macros
-lib/rpm/platform/armv5tejl-linux/macros
-lib/rpm/platform/armv5tel-linux/macros
-lib/rpm/platform/armv6l-linux/macros
-lib/rpm/platform/armv7l-linux/macros
-lib/rpm/platform/athlon-linux/macros
-lib/rpm/platform/geode-linux/macros
-lib/rpm/platform/i386-linux/macros
-lib/rpm/platform/i486-linux/macros
-lib/rpm/platform/i586-linux/macros
-lib/rpm/platform/i686-linux/macros
-lib/rpm/platform/ia32e-linux/macros
-lib/rpm/platform/ia64-linux/macros
-lib/rpm/platform/noarch-linux/macros
-lib/rpm/platform/pentium3-linux/macros
-lib/rpm/platform/pentium4-linux/macros
-lib/rpm/platform/ppc32dy4-linux/macros
-lib/rpm/platform/ppc64iseries-linux/macros
-lib/rpm/platform/ppc64-linux/macros
-lib/rpm/platform/ppc64p7-linux/macros
-lib/rpm/platform/ppc64pseries-linux/macros
-lib/rpm/platform/ppc8260-linux/macros
-lib/rpm/platform/ppc8560-linux/macros
-lib/rpm/platform/ppciseries-linux/macros
-lib/rpm/platform/ppc-linux/macros
-lib/rpm/platform/ppcpseries-linux/macros
-lib/rpm/platform/s390-linux/macros
-lib/rpm/platform/s390x-linux/macros
-lib/rpm/platform/sh3-linux/macros
-lib/rpm/platform/sh4a-linux/macros
-lib/rpm/platform/sh4-linux/macros
-lib/rpm/platform/sh-linux/macros
-lib/rpm/platform/sparc64-linux/macros
-lib/rpm/platform/sparc64v-linux/macros
-lib/rpm/platform/sparc-linux/macros
-lib/rpm/platform/sparcv8-linux/macros
-lib/rpm/platform/sparcv9-linux/macros
-lib/rpm/platform/sparcv9v-linux/macros
-lib/rpm/platform/x86_64-linux/macros
diff -r 98e34519a91b -r 55db34c00d5c misc/rpm/PLIST.NetBSD
--- a/misc/rpm/PLIST.NetBSD Sun Apr 23 07:03:16 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-@comment $NetBSD: PLIST.NetBSD,v 1.2 2015/03/15 05:34:56 ryoon Exp $
-lib/rpm/platform/aarch64--gnu/macros
-lib/rpm/platform/alpha--gnu/macros
-lib/rpm/platform/alphaev5--gnu/macros
-lib/rpm/platform/alphaev56--gnu/macros
-lib/rpm/platform/alphaev6--gnu/macros
-lib/rpm/platform/alphaev67--gnu/macros
-lib/rpm/platform/alphapca56--gnu/macros
Home |
Main Index |
Thread Index |
Old Index