summaryrefslogtreecommitdiff
path: root/misc/rpm
diff options
context:
space:
mode:
authorryoon <ryoon>2015-03-15 05:34:56 +0000
committerryoon <ryoon>2015-03-15 05:34:56 +0000
commitf00f1492a803754ba4b8ebd4773f8725a05785a0 (patch)
tree2e6ab6195cb238cba0df702a7e6ab7aa43238ab6 /misc/rpm
parent924a69c2154474deb957a80e69ebb77eeb968e8c (diff)
downloadpkgsrc-f00f1492a803754ba4b8ebd4773f8725a05785a0.tar.gz
Update tp 4.12.0.1
Changelog: Summary of changes from RPM 4.12.0 Package building Fix RPMTAG_ARCHIVESIZE / RPMTAG_LONGARCHIVESIZE generation (RhBug:1142949) Reduce double separator in dependency EVR error into a warning (RhBug:1065563) Build process Add testcase for RhBug:1142949 Summary of changes from RPM 4.11.2 General bugfixes and enhancements New --nopretrans and --noposttrans disabler switches (previously tied to --nopre/--nopost) New --noplugins switch to disable all plugins New --reinstall mode which can handle changing file policies (RhBug:966715) New --exportdb and --importdb switches in rpmdb(8) New --recommends, --suggests, --supplements and --enhances query aliases for querying weak dependencies New optional payload format to support large (> 4GB) files within packages (ticket #41) New rpm2archive utility for converting rpm payload to tar archives Fix curl globbing being enabled on remote retrieval (RhBug:1076277) Fix $1 argument to %pretrans, %posttrans and %verifyscript to behave like all other scripts Fix mixed binary + source rpm installation progress (RhBug:984724) Fix file actions sometimes carrying state across multiple rpmtsRun() calls (RhBug:1076552) Fix duplicate usernames causing false positives on verification (ticket #872) Fix ordering to prefer self-provides on ordering when appropriate (RhBug:1111349) Fix a double-free on unpadded signature header Add support for "new" architectures: m68k (again) Sparc Niagara (detection) ARM v6 and v7 (hardware FPU detection) Documentation, translation updates Package building New warnings on invalid / dubious spec constructs: Detect multiple %files sections per package Detect empty %files -f manifest files Detect multiple %changelog sections per spec Detect duplicate Group, Summary, Description, Distribution, Vendor, License and Packager tags per package (ticket #27) Add support for specifying weak dependencies (Recommends, Suggests, Supplements and Enhances) tags in spec Add support for automatic generation of weak dependencies (RhBug:1117912) New %{load:<path>} macro to load custom macro files (from eg spec) New %_smp_ncpus_max macro to configure CPU limit for parallel builds (related to RhBug:669638) New %make_build macro for hiding parallel-build magic from specs (ticket #115) New %_rundir macro for referring to /run (formerly /var/run) directory New %__gpg_reserved_space macro allows preallocating space for signatures which allows very fast package signing Add support for detecting and warning on macro scoping violations (RhBug:552944) when %trace is active Add support for %autosetup -S git_am variant (RhBug:???) Fix parametrized macros eating newlines (RhBug:1045723) Fix around macro scoping problems in %autosetup (RhBug:???) Fix ELF soname dependencies getting generated for non-library DSO's too (RhBug:???) Fix garbage sonames sometimes getting added as dependencies (ticket #158) Fix various issues in dependency generator Fix libtool dependency generation with libtool >= 2.4.2 version Fix external dependency generator to use the same generators as internal one by default Fix crash on missing name-argument to %package (RhBug:1123722) Fix non-canonical path usage for matching in debugedit (RhBug:1077148) Fix PPC ABI change in default configuration (RhBug:1085127) Removed features Remove support for %_noPayloadPrefix (rpm < 3.0.5 compatibility) Remove experimental support for "collections", added in 4.9.0 API changes New rpmtxnBegin() and rpmtxnEnd() to permit clients to control transaction locking New rpmtsImportHeader() to permit importing "detached" headers into rpmdb New rpmtsAddReinstallElement() function for reinstalling packages New rpmdbIndexIteratorNextTd() provides a nicer iterator interface to rpmdb indexes New file info set iterator functions: rpmfiFLinks(), rpmfiFindFN(), rpmfiStat()... New file info set iterator functions for accessing original paths from relocated packages: rpmfiOFN(), rpmfiOBN(), rpmfiODN(), rpmfiFindOFN() New archive API on top of file info iterators: (FIXME: describe...) New "rpmfiles" object + related API for random access to file info sets Many new file info set iteration modes (FIXME: describe...) New rpmteFiles() to return transaction element file info set, to be used instead of rpmteFI() New rpmdsTagF(), rpmdsTagEVR(), rpmdsD(), rpmdsPutToHeader(), rpmdsTi(), rpmdsTagTi() and rpmdsSinglePoolTix() methods to rpmds objects Internal improvements and cleanups Lots of cleanups all over the codebase Former "file state manager" eliminated and rewritten "Package state manager" largely eliminated File IO subsystem sanity & improvements Berkeley DB dependencies isolated to backend code File info sets are finally properly opaque Handle trigger indexes within rpmds objects Partial thread-safety by added locks/mutexes (FIXME: describe...) Configuration and macros Logging Keyrings and keys ... Fix symlink timestamp on install on systems which support it Fix problematic license on internal mergesort() implementation (removed) Fix rpm dependency on libselinux (moved to a plugin) Fix installation to always use header, not payload metadata Fix global macro state side-effects from rpmInstallSourcePackage() Fix oversized stack allocation on verify (RhBug:1106594) Fix buffer overflows on malformed macro define/undefine (RhBug:1087000) Optimize package generation and signing considerably Optimize file requires processing Optimize installed dependency processing Plugins A new plugin system, internal-only for now (FIXME: describe...) Plugins included in this release: systemd_inhibit plugin - preventing shutdown while transaction is in progress (RhBug:1109927) selinux plugin - basic SELinux support, previously in librpm directly syslog - example plugin for logging rpm activity to syslog Python bindings Database index iteration returns proper types for non-strings New rpm.fi methods: FLinks(), FindFN(), OFN()... New fi.FLinks() method added New rpm.files object + related API for random access to file info sets New rpm.archive object + related API for manipulating package payloads New te.Files() method added New addReinstall() method in transaction set objects (related to RhBug:966715, RhBug:1071854...) New rpm.strpool object for utilizing shared string pool with eg rpm.fi and rpm.ds objects New rpm.header_magic constant exported Fix several Python 3 compatibility issues (RhBug:1064758 Fix build- and sign-module initialization (RhBug:1064758) Fix sign-module missing module methods Fix incompatible module name usage (foomodule.so vs foo.so) Fix misc Python 2 vs 3 API difference issues ... FIXME:this list is very incomplete Lua interface New rpm.load() function for loading macro files Build process New test-cases for various issues Fix dist tarballs to use PAX format to overcome UID/GID limitations Fix in-tree python binding build with setup.py (related to RhBug:531543) Fix librpmsign library to follow same versioning as other rpm libraries for consistency's sake Summary of changes from RPM 4.11.1 General bugfixes and enhancements Fix removed symlinks affecting fingerprinting (RhBug:???) Fix bogus dependency check errors from installed packages with self-obsoletes and -conflicts Fix bogus header growth on export in some circumstances, such as install (RhBug:953719) Fix byteorder for 64bit tags on big-endian systems (RhBug:1012946) Fix signature generation using RPMSIGTAG_LONGSIZE when not needed (RhBug:1012595) Fix segfault executing a -p <lua> scriptlet without a body (RhBug:1004062) Fix failure to install relocated package with unowned directories (RhBug:1001553) Fix scriptlets in relocatable packages not always executing with $RPM_INSTALL_PREFIX* defined (RhBug:979443) Fix RPMTAG_NOSOURCE and RPMTAG_NOPATCH tags defined as non-arrays (RhBug:991329) Fix a possible loophole in file triplet sanity-checking Fix name service initialization where passwd and group service differs from host (ticket #157) Add support for ppc64le architecture Package building Fix double-free on %caps() wildcard %files entry (RhBug:956190) Fix sub-package names not getting sanity-checked (RhBug:1039520) Fix invalid separators in EVR passing sanity checking Fix some invalid characters in dependency range operators passing sanity checking Fix autogenerated dependencies bypassing sanity-checking (related to RhBug:503846) Fix python libdirs in non-root prefix not getting bytecompiled (RhBug:868332) Fix (remove) bogus __find_requires|provides macro definitions in macros.perl (RhBug:1043149) Fix (really) debugedit choking on .debug_gdb_scripts section (SuseBug:818502) Fix %autosetup git patch application to handle file additions (RhBug:1059285) Add automatic generation for appdata() and application() provides Add support for (quoted) whitespace in automatically generated dependencies (RhBug:503846) Python bindings Fix mode and flags not honored when reopening a file descriptor as rpm.fd Fix RPMFILE_ICON and RPMFILE_SPECFILE constants missing Fix rpm.dsSingle() swapped arguments (regession introduced in rpm 4.8.0) Fix Python 3 compatibility issues in rpm.TransactionSet class Fix module import succeeding on rpm initialization failure Add .open() class-method to rpm.fd Add open-mode and -flags to rpm.fd as properties Add support for reopening an rpm.fd file descriptor Add accessor for spec %check section Add bindings for rpm stringpool Add support for shared stringpool with rpm.fi and rpm.ds objects (optional pool argument to constructor) Internal improvements and cleanups Fix minor memory leak in %files parsing Fix rpmstrPoolRehash() missing last id Fix string pool artifacts (unreliable rpmstrPoolNumStr(), empty strings showing up on rehash etc) caused by dummy entries Fix unnecessary /proc dependency if getauxval(3) is available Fix various minor issues in beecrypt crypto backend Fix possible mishandling of handing environment open on EACCESS and EROFS returns Optimize / cleanup %attr() and %defattr() string storage Optimize dependency set management in file classifier Optimize MPI length validation Optimize beecrypt crypto backend Build process Add upport 7za and 7z as alternatives to 7-zip Fix an include portability issue Add several new test-cases
Diffstat (limited to 'misc/rpm')
-rw-r--r--misc/rpm/Makefile8
-rw-r--r--misc/rpm/PLIST13
-rw-r--r--misc/rpm/PLIST.NetBSD7
-rw-r--r--misc/rpm/distinfo20
-rw-r--r--misc/rpm/patches/patch-build_rpmfc.c16
-rw-r--r--misc/rpm/patches/patch-cb12
-rw-r--r--misc/rpm/patches/patch-configure.ac30
-rw-r--r--misc/rpm/patches/patch-lib_backend_db3.c6
-rw-r--r--misc/rpm/patches/patch-lib_header.c10
-rw-r--r--misc/rpm/patches/patch-lib_rpmdb__internal.h13
-rw-r--r--misc/rpm/patches/patch-misc_fnmatch.c6
11 files changed, 54 insertions, 87 deletions
diff --git a/misc/rpm/Makefile b/misc/rpm/Makefile
index 4d145770ee6..bb6c2779e70 100644
--- a/misc/rpm/Makefile
+++ b/misc/rpm/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.84 2014/12/11 22:13:08 joerg Exp $
+# $NetBSD: Makefile,v 1.85 2015/03/15 05:34:56 ryoon Exp $
-DISTNAME= rpm-4.11.1
-PKGREVISION= 2
+DISTNAME= rpm-4.12.0.1
CATEGORIES= misc
-MASTER_SITES= http://rpm.org/releases/rpm-4.11.x/
+MASTER_SITES= http://rpm.org/releases/rpm-4.12.x/
EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users@NetBSD.org
@@ -77,6 +76,7 @@ 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},'
+.include "../../archivers/libarchive/buildlink3.mk"
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/nss/buildlink3.mk"
diff --git a/misc/rpm/PLIST b/misc/rpm/PLIST
index 59477d3bc21..64af7c466b0 100644
--- a/misc/rpm/PLIST
+++ b/misc/rpm/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.9 2013/09/20 17:26:14 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.10 2015/03/15 05:34:56 ryoon Exp $
bin/gendiff
bin/rpm
+bin/rpm2archive
bin/rpm2cpio
bin/rpmbuild
bin/rpmdb
@@ -12,6 +13,7 @@ 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
@@ -20,6 +22,7 @@ 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
@@ -50,7 +53,8 @@ lib/librpmbuild.la
lib/librpmio.la
lib/librpmsign.la
lib/pkgconfig/rpm.pc
-lib/rpm-plugins/exec.la
+lib/rpm-plugins/syslog.la
+lib/rpm/appdata.prov
lib/rpm/brp-compress
lib/rpm/brp-java-gcjcompile
lib/rpm/brp-python-bytecompile
@@ -67,6 +71,7 @@ lib/rpm/check-rpaths-worker
lib/rpm/config.guess
lib/rpm/config.sub
lib/rpm/desktop-file.prov
+lib/rpm/fileattrs/appdata.attr
lib/rpm/fileattrs/desktop.attr
lib/rpm/fileattrs/elf.attr
lib/rpm/fileattrs/font.attr
@@ -135,8 +140,10 @@ man/pl/man8/rpmgraph.8
man/ru/man8/rpm.8
man/ru/man8/rpm2cpio.8
man/sk/man8/rpm.8
+share/locale/ar/LC_MESSAGES/rpm.mo
share/locale/br/LC_MESSAGES/rpm.mo
share/locale/ca/LC_MESSAGES/rpm.mo
+share/locale/cmn/LC_MESSAGES/rpm.mo
share/locale/cs/LC_MESSAGES/rpm.mo
share/locale/da/LC_MESSAGES/rpm.mo
share/locale/de/LC_MESSAGES/rpm.mo
@@ -164,6 +171,6 @@ share/locale/sv/LC_MESSAGES/rpm.mo
share/locale/te/LC_MESSAGES/rpm.mo
share/locale/tr/LC_MESSAGES/rpm.mo
share/locale/uk/LC_MESSAGES/rpm.mo
+share/locale/vi/LC_MESSAGES/rpm.mo
share/locale/zh_CN/LC_MESSAGES/rpm.mo
share/locale/zh_TW/LC_MESSAGES/rpm.mo
-@pkgdir var/tmp
diff --git a/misc/rpm/PLIST.NetBSD b/misc/rpm/PLIST.NetBSD
index 52dc9d4d566..d182bd409cf 100644
--- a/misc/rpm/PLIST.NetBSD
+++ b/misc/rpm/PLIST.NetBSD
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.NetBSD,v 1.1 2013/09/20 17:26:14 ryoon Exp $
+@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
@@ -12,7 +12,10 @@ lib/rpm/platform/armv4b--gnu/macros
lib/rpm/platform/armv4l--gnu/macros
lib/rpm/platform/armv5tejl--gnu/macros
lib/rpm/platform/armv5tel--gnu/macros
+lib/rpm/platform/armv6hl--gnu/macros
lib/rpm/platform/armv6l--gnu/macros
+lib/rpm/platform/armv7hl--gnu/macros
+lib/rpm/platform/armv7hnl--gnu/macros
lib/rpm/platform/armv7l--gnu/macros
lib/rpm/platform/athlon--gnu/macros
lib/rpm/platform/geode--gnu/macros
@@ -22,6 +25,7 @@ lib/rpm/platform/i586--gnu/macros
lib/rpm/platform/i686--gnu/macros
lib/rpm/platform/ia32e--gnu/macros
lib/rpm/platform/ia64--gnu/macros
+lib/rpm/platform/m68k--gnu/macros
lib/rpm/platform/noarch--gnu/macros
lib/rpm/platform/pentium3--gnu/macros
lib/rpm/platform/pentium4--gnu/macros
@@ -29,6 +33,7 @@ lib/rpm/platform/ppc--gnu/macros
lib/rpm/platform/ppc32dy4--gnu/macros
lib/rpm/platform/ppc64--gnu/macros
lib/rpm/platform/ppc64iseries--gnu/macros
+lib/rpm/platform/ppc64le--gnu/macros
lib/rpm/platform/ppc64p7--gnu/macros
lib/rpm/platform/ppc64pseries--gnu/macros
lib/rpm/platform/ppc8260--gnu/macros
diff --git a/misc/rpm/distinfo b/misc/rpm/distinfo
index 83663074513..d07b1ad61d2 100644
--- a/misc/rpm/distinfo
+++ b/misc/rpm/distinfo
@@ -1,16 +1,14 @@
-$NetBSD: distinfo,v 1.13 2014/07/28 15:11:00 jperkin Exp $
+$NetBSD: distinfo,v 1.14 2015/03/15 05:34:56 ryoon Exp $
-SHA1 (rpm-4.11.1.tar.bz2) = 31ddc4185137ce3f718c99e91dcb040614fe820c
-RMD160 (rpm-4.11.1.tar.bz2) = 3acb73dffef60c5e98ad23d2551ebca0837c218c
-Size (rpm-4.11.1.tar.bz2) = 3778922 bytes
-SHA1 (patch-build_rpmfc.c) = dab644d99d7ed43850443433b242d6ec16630b9c
-SHA1 (patch-cb) = c52dfaec6cf89d069f26900265d34f7ad91092f0
-SHA1 (patch-configure.ac) = 6d57fc79820c8d9e604cad0eb1fd682eb0268cdb
-SHA1 (patch-lib_backend_db3.c) = f488c10c75a000a14f3026a2de6f871892ba9222
-SHA1 (patch-lib_header.c) = f4e1455704f5819613366b3864973c2a91926175
-SHA1 (patch-lib_rpmdb__internal.h) = 39947c14f9d65c5dc91e5f5979e76800904377d4
+SHA1 (rpm-4.12.0.1.tar.bz2) = d416bdb249b246b00b2d5d34c66e7f5a68a62524
+RMD160 (rpm-4.12.0.1.tar.bz2) = c57a676d467d0984b13bdca7df803e26609055fd
+Size (rpm-4.12.0.1.tar.bz2) = 4129093 bytes
+SHA1 (patch-build_rpmfc.c) = 10e3196d7d2dcc17f7c2be0acbea01f00354eee3
+SHA1 (patch-configure.ac) = c6301dce864ad1ade8bc21c2d00f2c9754594b2d
+SHA1 (patch-lib_backend_db3.c) = 241c9193723253bbe037e61c54992f66aa825136
+SHA1 (patch-lib_header.c) = 091dc42741fd5f34edcf9b90f1e9d76087be56b4
SHA1 (patch-lib_rpmrc.c) = cf9e1349d84dea4f60b7db574e31e14799d4e75c
-SHA1 (patch-misc_fnmatch.c) = ba5db96bb0f473d08a8fda5f32d7df455ce92208
+SHA1 (patch-misc_fnmatch.c) = d4a8d81fe4a0cb97946e4037c5d8a4299a4411a7
SHA1 (patch-misc_fts.c) = c0555292deb60c1bd661f082ca7318d6623541bc
SHA1 (patch-misc_fts.h) = ec4ee0ea18f5d210eb32d9f22c90e43d2ede0c53
SHA1 (patch-rpmio_rpmfileutil.c) = fd1debee2c38e866b8098223bab304a66b76eb23
diff --git a/misc/rpm/patches/patch-build_rpmfc.c b/misc/rpm/patches/patch-build_rpmfc.c
index 1cd928db346..2b47d68c774 100644
--- a/misc/rpm/patches/patch-build_rpmfc.c
+++ b/misc/rpm/patches/patch-build_rpmfc.c
@@ -1,17 +1,17 @@
-$NetBSD: patch-build_rpmfc.c,v 1.1 2013/09/13 12:41:32 ryoon Exp $
+$NetBSD: patch-build_rpmfc.c,v 1.2 2015/03/15 05:34:56 ryoon Exp $
* basemname(3) requires libgen.h on NetBSD.
---- build/rpmfc.c.orig 2013-06-10 15:55:10.000000000 +0000
+--- build/rpmfc.c.orig 2014-08-26 09:49:39.000000000 +0000
+++ build/rpmfc.c
-@@ -16,6 +16,10 @@
- #include <rpm/rpmfi.h>
- #include <rpm/rpmstrpool.h>
+@@ -7,6 +7,10 @@
+ #include <magic.h>
+ #include <regex.h>
+#if defined(__NetBSD__)
+#include <libgen.h>
+#endif
+
- #include "build/rpmbuild_internal.h"
-
- #include "debug.h"
+ #include <rpm/header.h>
+ #include <rpm/argv.h>
+ #include <rpm/rpmfc.h>
diff --git a/misc/rpm/patches/patch-cb b/misc/rpm/patches/patch-cb
deleted file mode 100644
index 0952c7f66a8..00000000000
--- a/misc/rpm/patches/patch-cb
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-cb,v 1.2 2013/09/13 12:41:32 ryoon Exp $
-
---- build/pack.c.orig 2013-06-10 15:55:10.000000000 +0000
-+++ build/pack.c
-@@ -6,6 +6,7 @@
- #include "system.h"
-
- #include <errno.h>
-+#include <sys/wait.h>
- #include <netdb.h>
- #include <time.h>
-
diff --git a/misc/rpm/patches/patch-configure.ac b/misc/rpm/patches/patch-configure.ac
index 4ab1e37bd47..9bacafe4fea 100644
--- a/misc/rpm/patches/patch-configure.ac
+++ b/misc/rpm/patches/patch-configure.ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-configure.ac,v 1.2 2013/09/20 17:26:14 ryoon Exp $
+$NetBSD: patch-configure.ac,v 1.3 2015/03/15 05:34:56 ryoon Exp $
---- configure.ac.orig 2013-06-27 09:29:00.000000000 +0000
+--- configure.ac.orig 2014-09-15 07:39:14.000000000 +0000
+++ configure.ac
@@ -84,7 +84,7 @@ dnl
if test "$cross_compiling" = "yes"; then
@@ -11,31 +11,13 @@ $NetBSD: patch-configure.ac,v 1.2 2013/09/20 17:26:14 ryoon Exp $
fi
dnl
-@@ -518,6 +518,9 @@ dnl Checks for library functions.
- AC_CHECK_FUNCS(putenv)
- AC_CHECK_FUNCS(mempcpy)
- AC_CHECK_FUNCS(fdatasync)
+@@ -547,6 +547,9 @@ AC_CHECK_FUNCS(fdatasync)
+ AC_CHECK_FUNCS(lutimes)
+ AC_CHECK_FUNCS(mergesort)
+ AC_CHECK_FUNCS(getauxval)
+AC_CHECK_FUNCS(dirfd)
+AC_CHECK_FUNCS(setprogname)
+AC_CHECK_FUNCS(htonll)
AC_REPLACE_FUNCS(stpcpy stpncpy)
-@@ -777,7 +780,7 @@ changequote([, ])
-
- for provscript in ${host_cpu}-${host_os_exact}.prov ${host_os_exact}.prov ${host_os_major}.prov ${host_os_noversion}.prov none ; do {
- if test -f ${srcdir}/autodeps/${provscript} ; then
-- if [[ ${provscript} == none ]] ; then
-+ if [[ ${provscript} = none ]] ; then
- echo "*** no default provides information is available for ${host_os_noversion}"
- else
- echo "using ${srcdir}/autodeps/${provscript} for automatic provides generation"
-@@ -790,7 +793,7 @@ for provscript in ${host_cpu}-${host_os_
-
- for reqscript in ${host_cpu}-${host_os_exact}.req ${host_os_exact}.req ${host_os_major}.req ${host_os_noversion}.req none ; do {
- if test -f ${srcdir}/autodeps/${reqscript} ; then
-- if [[ ${reqscript} == none ]] ; then
-+ if [[ ${reqscript} = none ]] ; then
- echo "*** no default requires information is available for ${host_os_noversion}"
- else
- echo "using ${srcdir}/autodeps/${reqscript} for automatic requires generation"
diff --git a/misc/rpm/patches/patch-lib_backend_db3.c b/misc/rpm/patches/patch-lib_backend_db3.c
index a2033ee6c3c..a55676b2220 100644
--- a/misc/rpm/patches/patch-lib_backend_db3.c
+++ b/misc/rpm/patches/patch-lib_backend_db3.c
@@ -1,6 +1,6 @@
-$NetBSD: patch-lib_backend_db3.c,v 1.1 2013/09/15 12:32:22 joerg Exp $
+$NetBSD: patch-lib_backend_db3.c,v 1.2 2015/03/15 05:34:56 ryoon Exp $
---- lib/backend/db3.c.orig 2013-09-14 20:59:12.000000000 +0000
+--- lib/backend/db3.c.orig 2014-06-30 08:47:13.000000000 +0000
+++ lib/backend/db3.c
@@ -7,6 +7,7 @@ static int _debug = 1; /* XXX if < 0 deb
#include "system.h"
@@ -8,5 +8,5 @@ $NetBSD: patch-lib_backend_db3.c,v 1.1 2013/09/15 12:32:22 joerg Exp $
#include <errno.h>
+#include <signal.h>
#include <sys/wait.h>
+ #include <db.h>
- #include <rpm/rpmtypes.h>
diff --git a/misc/rpm/patches/patch-lib_header.c b/misc/rpm/patches/patch-lib_header.c
index eafb2bfd953..a3b88ad3273 100644
--- a/misc/rpm/patches/patch-lib_header.c
+++ b/misc/rpm/patches/patch-lib_header.c
@@ -1,10 +1,10 @@
-$NetBSD: patch-lib_header.c,v 1.1 2013/09/20 17:26:14 ryoon Exp $
+$NetBSD: patch-lib_header.c,v 1.2 2015/03/15 05:34:56 ryoon Exp $
* Detect htonll in configure script.
---- lib/header.c.orig 2013-06-10 15:55:10.000000000 +0000
+--- lib/header.c.orig 2014-06-30 08:47:13.000000000 +0000
+++ lib/header.c
-@@ -102,6 +102,7 @@ static const size_t headerMaxbytes = (32
+@@ -108,6 +108,7 @@ static const size_t headerMaxbytes = (32
#define ENTRY_IN_REGION(_e) ((_e)->info.offset < 0)
/* Convert a 64bit value to network byte order. */
@@ -12,8 +12,8 @@ $NetBSD: patch-lib_header.c,v 1.1 2013/09/20 17:26:14 ryoon Exp $
RPM_GNUC_CONST
static uint64_t htonll(uint64_t n)
{
-@@ -111,6 +112,7 @@ static uint64_t htonll(uint64_t n)
- i[1] = htonl(b);
+@@ -119,6 +120,7 @@ static uint64_t htonll(uint64_t n)
+ #endif
return n;
}
+#endif
diff --git a/misc/rpm/patches/patch-lib_rpmdb__internal.h b/misc/rpm/patches/patch-lib_rpmdb__internal.h
deleted file mode 100644
index b27eef4c37d..00000000000
--- a/misc/rpm/patches/patch-lib_rpmdb__internal.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-lib_rpmdb__internal.h,v 1.1 2013/09/15 12:32:22 joerg Exp $
-
---- lib/rpmdb_internal.h.orig 2013-09-14 20:58:16.000000000 +0000
-+++ lib/rpmdb_internal.h
-@@ -148,7 +148,7 @@ int rpmdbPruneIterator(rpmdbMatchIterato
- RPM_GNUC_INTERNAL
- rpmdbMatchIterator rpmdbNewIterator(rpmdb db, rpmDbiTagVal dbitag);
-
--#ifndef __APPLE__
-+#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
- /**
- * * Mergesort, same arguments as qsort(2).
- * */
diff --git a/misc/rpm/patches/patch-misc_fnmatch.c b/misc/rpm/patches/patch-misc_fnmatch.c
index 7d15b8dbb3b..337bfb53b8b 100644
--- a/misc/rpm/patches/patch-misc_fnmatch.c
+++ b/misc/rpm/patches/patch-misc_fnmatch.c
@@ -1,12 +1,12 @@
-$NetBSD: patch-misc_fnmatch.c,v 1.1 2013/09/15 12:32:22 joerg Exp $
+$NetBSD: patch-misc_fnmatch.c,v 1.2 2015/03/15 05:34:56 ryoon Exp $
---- misc/fnmatch.c.orig 2013-09-14 20:58:02.000000000 +0000
+--- misc/fnmatch.c.orig 2014-06-30 08:47:14.000000000 +0000
+++ misc/fnmatch.c
@@ -17,6 +17,7 @@
Boston, MA 02111-1307, USA. */
# include "system.h"
-+#include <ctype.h>
++# include <ctype.h>
# include <stdlib.h>
/* Find the first occurrence of C in S or the final NUL byte. */
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-17 11:11:29 +0000