summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-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-07-29 02:57:03 +0000