Fix build on OmniOS.

* Add -fno-stack-protector to CFLAGS to fix link error for SunOS.
* Patch configure.ac and regenerate the related stuff.
* Buildlink sysutils/file for libmagic.
* Detect dirfd, setprogname and htonll in configure script.
* Create PLIST for NetBSD and SunOS.

10 files changed, 181 insertions, 97 deletions

diff --git a/misc/rpm/Makefile b/misc/rpm/Makefile
index efda75d93e8..e0ecc58b6fc 100644
--- a/misc/rpm/Makefile
+++ b/misc/rpm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.78 2013/09/15 12:32:22 joerg Exp $
+# $NetBSD: Makefile,v 1.79 2013/09/20 17:26:14 ryoon Exp $
 
 DISTNAME=	rpm-4.11.1
 CATEGORIES=	misc
@@ -18,7 +18,7 @@ MAKE_JOBS_SAFE=		no
 
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
-USE_TOOLS+=		bash:run gmake msgfmt perl:run
+USE_TOOLS+=		automake bash:run gmake msgfmt perl:run
 GNU_CONFIGURE=		yes
 
 GMAKE_REQD+=		3.82nb1
@@ -57,6 +57,19 @@ FILES_SUBST+=		RPMDIR=${RPMDIR:Q}
 #
 BROKEN_GETTEXT_DETECTION=	yes
 
+.if ${OPSYS} == "SunOS"
+# for libmagic.
+.include "../../sysutils/file/buildlink3.mk"
+CFLAGS+=	-fno-stack-protector
+BUILDLINK_TRANSFORM+=	rm:-fstack-protector
+.endif
+
+
+pre-configure:
+	set -e; cd ${WRKSRC}; \
+	aclocal; autoheader; automake -a --foreign -i; autoconf
+
+.include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/nss/buildlink3.mk"
 .include "../../devel/nspr/buildlink3.mk"
diff --git a/misc/rpm/PLIST b/misc/rpm/PLIST
index 5f94a4043b7..59477d3bc21 100644
--- a/misc/rpm/PLIST
+++ b/misc/rpm/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2013/09/13 12:41:32 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.9 2013/09/20 17:26:14 ryoon Exp $
 bin/gendiff
 bin/rpm
 bin/rpm2cpio
@@ -97,55 +97,6 @@ lib/rpm/perl.prov
 lib/rpm/perl.req
 lib/rpm/perldeps.pl
 lib/rpm/pkgconfigdeps.sh
-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
-lib/rpm/platform/amd64--gnu/macros
-lib/rpm/platform/armv3l--gnu/macros
-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/armv6l--gnu/macros
-lib/rpm/platform/armv7l--gnu/macros
-lib/rpm/platform/athlon--gnu/macros
-lib/rpm/platform/geode--gnu/macros
-lib/rpm/platform/i386--gnu/macros
-lib/rpm/platform/i486--gnu/macros
-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/noarch--gnu/macros
-lib/rpm/platform/pentium3--gnu/macros
-lib/rpm/platform/pentium4--gnu/macros
-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/ppc64p7--gnu/macros
-lib/rpm/platform/ppc64pseries--gnu/macros
-lib/rpm/platform/ppc8260--gnu/macros
-lib/rpm/platform/ppc8560--gnu/macros
-lib/rpm/platform/ppciseries--gnu/macros
-lib/rpm/platform/ppcpseries--gnu/macros
-lib/rpm/platform/s390--gnu/macros
-lib/rpm/platform/s390x--gnu/macros
-lib/rpm/platform/sh--gnu/macros
-lib/rpm/platform/sh3--gnu/macros
-lib/rpm/platform/sh4--gnu/macros
-lib/rpm/platform/sh4a--gnu/macros
-lib/rpm/platform/sparc--gnu/macros
-lib/rpm/platform/sparc64--gnu/macros
-lib/rpm/platform/sparc64v--gnu/macros
-lib/rpm/platform/sparcv8--gnu/macros
-lib/rpm/platform/sparcv9--gnu/macros
-lib/rpm/platform/sparcv9v--gnu/macros
-lib/rpm/platform/${MACHINE_ARCH}--gnu/macros
 lib/rpm/pythondeps.sh
 lib/rpm/rpm.daily
 lib/rpm/rpm.log
diff --git a/misc/rpm/PLIST.NetBSD b/misc/rpm/PLIST.NetBSD
new file mode 100644
index 00000000000..52dc9d4d566
--- /dev/null
+++ b/misc/rpm/PLIST.NetBSD
@@ -0,0 +1,50 @@
+@comment $NetBSD: PLIST.NetBSD,v 1.1 2013/09/20 17:26:14 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
+lib/rpm/platform/amd64--gnu/macros
+lib/rpm/platform/armv3l--gnu/macros
+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/armv6l--gnu/macros
+lib/rpm/platform/armv7l--gnu/macros
+lib/rpm/platform/athlon--gnu/macros
+lib/rpm/platform/geode--gnu/macros
+lib/rpm/platform/i386--gnu/macros
+lib/rpm/platform/i486--gnu/macros
+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/noarch--gnu/macros
+lib/rpm/platform/pentium3--gnu/macros
+lib/rpm/platform/pentium4--gnu/macros
+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/ppc64p7--gnu/macros
+lib/rpm/platform/ppc64pseries--gnu/macros
+lib/rpm/platform/ppc8260--gnu/macros
+lib/rpm/platform/ppc8560--gnu/macros
+lib/rpm/platform/ppciseries--gnu/macros
+lib/rpm/platform/ppcpseries--gnu/macros
+lib/rpm/platform/s390--gnu/macros
+lib/rpm/platform/s390x--gnu/macros
+lib/rpm/platform/sh--gnu/macros
+lib/rpm/platform/sh3--gnu/macros
+lib/rpm/platform/sh4--gnu/macros
+lib/rpm/platform/sh4a--gnu/macros
+lib/rpm/platform/sparc--gnu/macros
+lib/rpm/platform/sparc64--gnu/macros
+lib/rpm/platform/sparc64v--gnu/macros
+lib/rpm/platform/sparcv8--gnu/macros
+lib/rpm/platform/sparcv9--gnu/macros
+lib/rpm/platform/sparcv9v--gnu/macros
+lib/rpm/platform/x86_64--gnu/macros
diff --git a/misc/rpm/PLIST.SunOS b/misc/rpm/PLIST.SunOS
new file mode 100644
index 00000000000..abf08e9d0ac
--- /dev/null
+++ b/misc/rpm/PLIST.SunOS
@@ -0,0 +1,50 @@
+@comment $NetBSD: PLIST.SunOS,v 1.1 2013/09/20 17:26:14 ryoon Exp $
+lib/rpm/platform/aarch64-solaris/macros
+lib/rpm/platform/alpha-solaris/macros
+lib/rpm/platform/alphaev5-solaris/macros
+lib/rpm/platform/alphaev56-solaris/macros
+lib/rpm/platform/alphaev6-solaris/macros
+lib/rpm/platform/alphaev67-solaris/macros
+lib/rpm/platform/alphapca56-solaris/macros
+lib/rpm/platform/amd64-solaris/macros
+lib/rpm/platform/armv3l-solaris/macros
+lib/rpm/platform/armv4b-solaris/macros
+lib/rpm/platform/armv4l-solaris/macros
+lib/rpm/platform/armv5tejl-solaris/macros
+lib/rpm/platform/armv5tel-solaris/macros
+lib/rpm/platform/armv6l-solaris/macros
+lib/rpm/platform/armv7l-solaris/macros
+lib/rpm/platform/athlon-solaris/macros
+lib/rpm/platform/geode-solaris/macros
+lib/rpm/platform/${MACHINE_ARCH}-solaris/macros
+lib/rpm/platform/i486-solaris/macros
+lib/rpm/platform/i586-solaris/macros
+lib/rpm/platform/i686-solaris/macros
+lib/rpm/platform/ia32e-solaris/macros
+lib/rpm/platform/ia64-solaris/macros
+lib/rpm/platform/noarch-solaris/macros
+lib/rpm/platform/pentium3-solaris/macros
+lib/rpm/platform/pentium4-solaris/macros
+lib/rpm/platform/ppc-solaris/macros
+lib/rpm/platform/ppc32dy4-solaris/macros
+lib/rpm/platform/ppc64-solaris/macros
+lib/rpm/platform/ppc64iseries-solaris/macros
+lib/rpm/platform/ppc64p7-solaris/macros
+lib/rpm/platform/ppc64pseries-solaris/macros
+lib/rpm/platform/ppc8260-solaris/macros
+lib/rpm/platform/ppc8560-solaris/macros
+lib/rpm/platform/ppciseries-solaris/macros
+lib/rpm/platform/ppcpseries-solaris/macros
+lib/rpm/platform/s390-solaris/macros
+lib/rpm/platform/s390x-solaris/macros
+lib/rpm/platform/sh-solaris/macros
+lib/rpm/platform/sh3-solaris/macros
+lib/rpm/platform/sh4-solaris/macros
+lib/rpm/platform/sh4a-solaris/macros
+lib/rpm/platform/sparc-solaris/macros
+lib/rpm/platform/sparc64-solaris/macros
+lib/rpm/platform/sparc64v-solaris/macros
+lib/rpm/platform/sparcv8-solaris/macros
+lib/rpm/platform/sparcv9-solaris/macros
+lib/rpm/platform/sparcv9v-solaris/macros
+lib/rpm/platform/x86_64-solaris/macros
diff --git a/misc/rpm/distinfo b/misc/rpm/distinfo
index c666467b44b..429cb8cea08 100644
--- a/misc/rpm/distinfo
+++ b/misc/rpm/distinfo
@@ -1,16 +1,16 @@
-$NetBSD: distinfo,v 1.11 2013/09/15 12:32:22 joerg Exp $
+$NetBSD: distinfo,v 1.12 2013/09/20 17:26:14 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-ac) = a9d4fb93a47f705b9220d886853b805f3b741ca2
 SHA1 (patch-build_rpmfc.c) = dab644d99d7ed43850443433b242d6ec16630b9c
 SHA1 (patch-cb) = c52dfaec6cf89d069f26900265d34f7ad91092f0
-SHA1 (patch-configure.ac) = c9df0915b2c9c08fd059a3c9a2c89fe25d3e194d
+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 (patch-lib_rpmrc.c) = cf9e1349d84dea4f60b7db574e31e14799d4e75c
 SHA1 (patch-misc_fnmatch.c) = ba5db96bb0f473d08a8fda5f32d7df455ce92208
-SHA1 (patch-misc_fts.c) = 26443c47db5e2211a926cf0f8b26b1f70475edda
+SHA1 (patch-misc_fts.c) = c0555292deb60c1bd661f082ca7318d6623541bc
 SHA1 (patch-misc_fts.h) = ec4ee0ea18f5d210eb32d9f22c90e43d2ede0c53
-SHA1 (patch-system.h) = 21336b9d2a7afbc0573ba0ce09c0849e5bef2548
+SHA1 (patch-system.h) = 215e3cfaafc1573c527b7f430b3807093550c39e
diff --git a/misc/rpm/patches/patch-ac b/misc/rpm/patches/patch-ac
deleted file mode 100644
index 4dd5ae1f2aa..00000000000
--- a/misc/rpm/patches/patch-ac
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ac,v 1.11 2013/09/13 12:41:32 ryoon Exp $
-
---- configure.orig	2013-06-27 09:29:11.000000000 +0000
-+++ configure
-@@ -17093,7 +17093,7 @@ fi
- if test "$cross_compiling" = "yes"; then
-     MYPATH=":"
- else
--    MYPATH=$PATH
-+    MYPATH=$MYPATH
- fi
- 
- # Extract the first word of "7zip", so it can be a program name with args.
-@@ -24310,7 +24310,7 @@ host_os_noversion=`echo "${host_os}" | s
- 
- 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"
-@@ -24323,7 +24323,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-configure.ac b/misc/rpm/patches/patch-configure.ac
index 8327b81e63a..4ab1e37bd47 100644
--- a/misc/rpm/patches/patch-configure.ac
+++ b/misc/rpm/patches/patch-configure.ac
@@ -1,8 +1,27 @@
-$NetBSD: patch-configure.ac,v 1.1 2013/09/13 12:41:32 ryoon Exp $
+$NetBSD: patch-configure.ac,v 1.2 2013/09/20 17:26:14 ryoon Exp $
 
 --- configure.ac.orig	2013-06-27 09:29:00.000000000 +0000
 +++ configure.ac
-@@ -777,7 +777,7 @@ changequote([, ])
+@@ -84,7 +84,7 @@ dnl
+ if test "$cross_compiling" = "yes"; then
+     MYPATH=":"
+ else
+-    MYPATH=$PATH
++    MYPATH=$MYPATH
+ fi
+ 
+ dnl
+@@ -518,6 +518,9 @@ dnl Checks for library functions.
+ AC_CHECK_FUNCS(putenv)
+ AC_CHECK_FUNCS(mempcpy)
+ AC_CHECK_FUNCS(fdatasync)
++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
@@ -11,7 +30,7 @@ $NetBSD: patch-configure.ac,v 1.1 2013/09/13 12:41:32 ryoon Exp $
             echo "*** no default provides information is available for ${host_os_noversion}"
         else
             echo "using ${srcdir}/autodeps/${provscript} for automatic provides generation"
-@@ -790,7 +790,7 @@ for provscript in ${host_cpu}-${host_os_
+@@ -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
diff --git a/misc/rpm/patches/patch-lib_header.c b/misc/rpm/patches/patch-lib_header.c
new file mode 100644
index 00000000000..eafb2bfd953
--- /dev/null
+++ b/misc/rpm/patches/patch-lib_header.c
@@ -0,0 +1,22 @@
+$NetBSD: patch-lib_header.c,v 1.1 2013/09/20 17:26:14 ryoon Exp $
+
+* Detect htonll in configure script.
+
+--- lib/header.c.orig	2013-06-10 15:55:10.000000000 +0000
++++ lib/header.c
+@@ -102,6 +102,7 @@ static const size_t headerMaxbytes = (32
+ #define	ENTRY_IN_REGION(_e)	((_e)->info.offset < 0)
+ 
+ /* Convert a 64bit value to network byte order. */
++#if !defined(HAVE_HTONLL)
+ 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);
+     return n;
+ }
++#endif
+ 
+ Header headerLink(Header h)
+ {
diff --git a/misc/rpm/patches/patch-misc_fts.c b/misc/rpm/patches/patch-misc_fts.c
index 98e7df4f29d..6f0aeae7d05 100644
--- a/misc/rpm/patches/patch-misc_fts.c
+++ b/misc/rpm/patches/patch-misc_fts.c
@@ -1,10 +1,20 @@
-$NetBSD: patch-misc_fts.c,v 1.1 2013/09/13 12:41:32 ryoon Exp $
+$NetBSD: patch-misc_fts.c,v 1.2 2013/09/20 17:26:14 ryoon Exp $
 
-* Definitions for NetBSD.
+* Detect dirfd(3) and setprogname(3) in configure script.
 
 --- misc/fts.c.orig	2012-11-18 08:21:06.000000000 +0000
 +++ misc/fts.c
-@@ -61,6 +61,11 @@ static char sccsid[] = "@(#)fts.c	8.6 (B
+@@ -52,7 +52,9 @@ static char sccsid[] = "@(#)fts.c	8.6 (B
+ #endif
+ #if defined(sun)
+ #   define __errno_location()	(&errno)
++# if defined(HAVE_DIRFD)
+ #   define dirfd(dirp)		-1
++# endif
+ #   define _STAT_VER		0
+ #   define __fxstat64(_stat_ver, _fd, _sbp)	fstat((_fd), (_sbp))
+ #endif
+@@ -61,6 +63,11 @@ static char sccsid[] = "@(#)fts.c	8.6 (B
  #   define _STAT_VER		0
  #   define __fxstat64(_stat_ver, _fd, _sbp) fstat64((_fd), (_sbp))
  #endif
diff --git a/misc/rpm/patches/patch-system.h b/misc/rpm/patches/patch-system.h
index 96d2abb26c6..7e7c3300093 100644
--- a/misc/rpm/patches/patch-system.h
+++ b/misc/rpm/patches/patch-system.h
@@ -1,6 +1,6 @@
-$NetBSD: patch-system.h,v 1.1 2013/09/13 12:41:32 ryoon Exp $
+$NetBSD: patch-system.h,v 1.2 2013/09/20 17:26:14 ryoon Exp $
 
-* NetBSD has setprogname(3).
+* Detect setprogname(3) in configure script.
 
 --- system.h.orig	2013-01-30 15:33:12.000000000 +0000
 +++ system.h
@@ -9,7 +9,7 @@ $NetBSD: patch-system.h,v 1.1 2013/09/13 12:41:32 ryoon Exp $
  
  /* Retrofit glibc __progname */
 -#if defined __GLIBC__ && __GLIBC__ >= 2
-+#if (defined __GLIBC__ && __GLIBC__ >= 2) || defined(__NetBSD__)
++#if (defined __GLIBC__ && __GLIBC__ >= 2) || defined(HAVE_SETPROGNAME)
  #if __GLIBC_MINOR__ >= 1
  #define	__progname	__assert_program_name
  #endif