Update rpm4 to 4.9.0

6 files changed, 118 insertions, 61 deletions

diff --git a/archivers/rpm4/Makefile b/archivers/rpm4/Makefile
index d0c1ec0ef842..81da463b5b4d 100644
--- a/archivers/rpm4/Makefile
+++ b/archivers/rpm4/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	rpm
-PORTVERSION=	4.8.1
-PORTREVISION=	4
+PORTVERSION=	4.9.0
 CATEGORIES=	archivers
 MASTER_SITES=	http://rpm.org/releases/rpm-${PORTVERSION:R}.x/ \
 		ftp://ftp.mirrorservice.org/sites/ftp.rpm.org/pub/rpm/dist/rpm-${PORTVERSION:E}.x/
@@ -74,7 +73,8 @@ CONFIGURE_ARGS+=--without-db \
 
 MANLANG=	"" ja fr pl ru ko sk
 MAN1_EN=	gendiff.1
-MAN8_EN=	rpm.8 rpm2cpio.8 rpmbuild.8 rpmdeps.8 rpmgraph.8
+MAN8_EN=	rpm.8 rpm2cpio.8 rpmbuild.8 rpmdeps.8 rpmgraph.8 \
+		rpmdb.8 rpmkeys.8 rpmsign.8 rpmspec.8
 MAN8_JA=	rpm.8 rpm2cpio.8 rpmbuild.8 rpmgraph.8
 MAN8_FR=	rpm.8
 MAN8_PL=	rpm.8 rpm2cpio.8 rpmbuild.8 rpmdeps.8 rpmgraph.8
@@ -103,7 +103,9 @@ post-patch:
 	${REINPLACE_CMD} -e '/^pkgconfigdir/s:/:data/:' \
 		-e 's:\.\./\.\./bin/::' ${WRKSRC}/Makefile.in
 	${REINPLACE_CMD} -e 's/(hpux)/& || defined(__FreeBSD__)/' \
-		${WRKSRC}/rpmio/fts.?
+		${WRKSRC}/misc/fts.?
+	${REINPLACE_CMD} -e 's/ __GLIBC__.*/& || defined(__FreeBSD__)/' \
+		${WRKSRC}/system.h
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/archivers/rpm4/distinfo b/archivers/rpm4/distinfo
index e5cbae7373ad..ac65458fbbb4 100644
--- a/archivers/rpm4/distinfo
+++ b/archivers/rpm4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rpm-4.8.1.tar.bz2) = 43ca026dd2b80e339066d12422f67d213dde9f1869a56b0b95aa0091a834c8fa
-SIZE (rpm-4.8.1.tar.bz2) = 3714502
+SHA256 (rpm-4.9.0.tar.bz2) = 9af1a56b05fc2c54935062e04a3e02999110c74d00bfd5b5c5ff3a03dde61688
+SIZE (rpm-4.9.0.tar.bz2) = 3410799
diff --git a/archivers/rpm4/files/patch-lib_backend_db3.c b/archivers/rpm4/files/patch-lib_backend_db3.c
new file mode 100644
index 000000000000..829bc2a4dba6
--- /dev/null
+++ b/archivers/rpm4/files/patch-lib_backend_db3.c
@@ -0,0 +1,20 @@
+--- lib/backend/db3.c.orig	2011-03-02 07:40:10.000000000 +0100
++++ lib/backend/db3.c	2011-06-10 15:21:12.000000000 +0200
+@@ -8,6 +8,8 @@ static int _debug = 1;	/* XXX if < 0 deb
+ 
+ #include <errno.h>
+ #include <sys/wait.h>
++#include <sys/types.h>
++#include <signal.h>
+ 
+ #include <rpm/rpmtypes.h>
+ #include <rpm/rpmmacro.h>
+@@ -213,7 +215,7 @@ errxit:
+ 
+ void dbSetFSync(void *dbenv, int enable)
+ {
+-    db_env_set_func_fsync(enable ? fdatasync : fsync_disable);
++    db_env_set_func_fsync(enable ? fsync : fsync_disable);
+ }
+ 
+ int dbiSync(dbiIndex dbi, unsigned int flags)
diff --git a/archivers/rpm4/files/patch-misc_glob.c b/archivers/rpm4/files/patch-misc_glob.c
index 3325ea1f3534..9a06b324faf6 100644
--- a/archivers/rpm4/files/patch-misc_glob.c
+++ b/archivers/rpm4/files/patch-misc_glob.c
@@ -1,6 +1,6 @@
---- misc/glob.c.orig	2010-07-02 09:52:38.000000000 +0200
-+++ misc/glob.c	2010-07-02 09:52:10.000000000 +0200
-@@ -903,6 +903,11 @@ prefix_array (const char *dirname, char 
+--- misc/glob.c.orig	2010-12-03 13:11:57.000000000 +0100
++++ misc/glob.c	2011-03-03 19:12:51.000000000 +0100
+@@ -907,6 +907,11 @@ prefix_array (const char *dirname, char 
    return 0;
  }
  
diff --git a/archivers/rpm4/files/patch-system.h b/archivers/rpm4/files/patch-system.h
new file mode 100644
index 000000000000..53fbda2846e3
--- /dev/null
+++ b/archivers/rpm4/files/patch-system.h
@@ -0,0 +1,11 @@
+--- system.h.orig	2011-06-10 15:27:05.000000000 +0200
++++ system.h	2011-06-10 15:27:09.000000000 +0200
+@@ -39,6 +39,8 @@ char * stpncpy(char * dest, const char *
+ #define	getenv(_s)	__secure_getenv(_s)
+ #endif
+ 
++#include <sys/wait.h>
++
+ #ifdef HAVE_FCNTL_H
+ #include <fcntl.h>
+ #else
diff --git a/archivers/rpm4/pkg-plist b/archivers/rpm4/pkg-plist
index fcfaffa8f2e6..f7130bc3e059 100644
--- a/archivers/rpm4/pkg-plist
+++ b/archivers/rpm4/pkg-plist
@@ -4,100 +4,122 @@ bin/rpm2cpio
 bin/rpmbuild
 bin/rpmdb
 bin/rpmgraph
+bin/rpmkeys
 bin/rpmquery
 bin/rpmsign
+bin/rpmspec
 bin/rpmverify
 include/rpm/argv.h
+include/rpm/rpmio.h
+include/rpm/rpmurl.h
+include/rpm/rpmmacro.h
+include/rpm/rpmlog.h
+include/rpm/rpmpgp.h
+include/rpm/rpmsq.h
+include/rpm/rpmstring.h
+include/rpm/rpmsw.h
+include/rpm/rpmfileutil.h
+include/rpm/rpmutil.h
+include/rpm/rpmkeyring.h
 include/rpm/header.h
-include/rpm/rpmbuild.h
+include/rpm/rpmdb.h
 include/rpm/rpmcallback.h
 include/rpm/rpmcli.h
-include/rpm/rpmdb.h
+include/rpm/rpmlib.h
 include/rpm/rpmds.h
-include/rpm/rpmfc.h
 include/rpm/rpmfi.h
-include/rpm/rpmfileutil.h
-include/rpm/rpmgi.h
-include/rpm/rpmio.h
-include/rpm/rpmkeyring.h
 include/rpm/rpmlegacy.h
-include/rpm/rpmlib.h
-include/rpm/rpmlog.h
-include/rpm/rpmmacro.h
-include/rpm/rpmpgp.h
+include/rpm/rpmpol.h
 include/rpm/rpmps.h
-include/rpm/rpmspec.h
-include/rpm/rpmsq.h
-include/rpm/rpmstring.h
-include/rpm/rpmsw.h
+include/rpm/rpmprob.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
+include/rpm/rpmsign.h
+include/rpm/rpmbuild.h
+include/rpm/rpmfc.h
+include/rpm/rpmspec.h
 lib/librpm.a
 lib/librpm.la
 lib/librpm.so
-lib/librpm.so.1
+lib/librpm.so.2
 lib/librpmbuild.a
 lib/librpmbuild.la
 lib/librpmbuild.so
-lib/librpmbuild.so.1
+lib/librpmbuild.so.2
 lib/librpmio.a
 lib/librpmio.la
 lib/librpmio.so
-lib/librpmio.so.1
+lib/librpmio.so.2
+lib/librpmsign.a
+lib/librpmsign.la
+lib/librpmsign.so
+lib/librpmsign.so.0
+lib/rpm/rpm.daily
+lib/rpm/rpm.log
+lib/rpm/macros.perl
+lib/rpm/macros.php
+lib/rpm/macros.python
 lib/rpm/brp-compress
-lib/rpm/brp-java-gcjcompile
 lib/rpm/brp-python-bytecompile
+lib/rpm/brp-java-gcjcompile
 lib/rpm/brp-strip
 lib/rpm/brp-strip-comment-note
+lib/rpm/brp-python-hardlink
 lib/rpm/brp-strip-shared
 lib/rpm/brp-strip-static-archive
-lib/rpm/check-buildroot
 lib/rpm/check-files
 lib/rpm/check-prereqs
+lib/rpm/check-buildroot
 lib/rpm/check-rpaths
 lib/rpm/check-rpaths-worker
-lib/rpm/config.guess
-lib/rpm/config.sub
-lib/rpm/desktop-file.prov
 lib/rpm/find-lang.sh
-lib/rpm/find-provides
-lib/rpm/find-requires
-lib/rpm/fontconfig.prov
-lib/rpm/javadeps
-lib/rpm/libtooldeps.sh
-lib/rpm/macros
-lib/rpm/macros.perl
-lib/rpm/macros.php
-lib/rpm/macros.python
-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/osgideps.pl
+lib/rpm/tcl.req
 lib/rpm/perl.prov
 lib/rpm/perl.req
 lib/rpm/perldeps.pl
-lib/rpm/pkgconfigdeps.sh
 lib/rpm/pythondeps.sh
-lib/rpm/rpm.daily
-lib/rpm/rpm.log
-lib/rpm/rpm.xinetd
-lib/rpm/rpm2cpio.sh
+lib/rpm/osgideps.pl
+lib/rpm/mono-find-requires
+lib/rpm/mono-find-provides
+lib/rpm/pkgconfigdeps.sh
+lib/rpm/libtooldeps.sh
+lib/rpm/ocaml-find-requires.sh
+lib/rpm/ocaml-find-provides.sh
+lib/rpm/fontconfig.prov
+lib/rpm/desktop-file.prov
+lib/rpm/script.req
 lib/rpm/rpmdb_loadcvt
+lib/rpm/rpm2cpio.sh
+lib/rpm/tgpg
+lib/rpm/fileattrs/desktop.attr
+lib/rpm/fileattrs/elf.attr
+lib/rpm/fileattrs/font.attr
+lib/rpm/fileattrs/libtool.attr
+lib/rpm/fileattrs/perl.attr
+lib/rpm/fileattrs/perllib.attr
+lib/rpm/fileattrs/pkgconfig.attr
+lib/rpm/fileattrs/python.attr
+lib/rpm/fileattrs/ocaml.attr
+lib/rpm/fileattrs/script.attr
+lib/rpm/fileattrs/mono.attr
+lib/rpm/javadeps
 lib/rpm/rpmdeps
-lib/rpm/rpmdiff
-lib/rpm/rpmdiff.cgi
-lib/rpm/rpmpopt-4.8.1
 lib/rpm/rpmrc
-lib/rpm/tcl.req
-lib/rpm/tgpg
+lib/rpm/macros
+lib/rpm/rpmpopt-4.9.0
+lib/rpm/find-provides
+lib/rpm/find-requires
+lib/rpm/mkinstalldirs
+lib/rpm/config.guess
+lib/rpm/config.sub
+lib/rpm-plugins/exec.so
+lib/rpm-plugins/exec.la
+lib/rpm-plugins/sepolicy.so
+lib/rpm-plugins/sepolicy.la
 %%NLS%%share/locale/ca/LC_MESSAGES/rpm.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/rpm.mo
 %%NLS%%share/locale/da/LC_MESSAGES/rpm.mo
@@ -124,15 +146,17 @@ lib/rpm/tgpg
 %%NLS%%share/locale/tr/LC_MESSAGES/rpm.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/rpm.mo
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/rpm/__init__.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/rpm/_rpmmodule.a
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/rpm/_rpmmodule.la
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/rpm/_rpmmodule.so
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/rpm/_rpmbmodule.a
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/rpm/_rpmbmodule.la
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/rpm/_rpmbmodule.so
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/rpm/_rpmsmodule.la
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/rpm/_rpmsmodule.so
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/rpm/transaction.py
 libdata/pkgconfig/rpm.pc
+@dirrm lib/rpm/fileattrs
 @dirrm lib/rpm
+@dirrm lib/rpm-plugins
 @dirrm include/rpm
 @dirrmtry src/portbld/SRPMS
 @dirrmtry src/portbld/SPECS