CVS commit: pkgsrc/misc/rpm

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Mon May 15 13:52:38 UTC 2023

Modified Files:
        pkgsrc/misc/rpm: distinfo
        pkgsrc/misc/rpm/patches: patch-lib_header.c
Added Files:
        pkgsrc/misc/rpm/patches: patch-plugins_ima.c

Log Message:
rpm: SunOS build fixes.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 pkgsrc/misc/rpm/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/misc/rpm/patches/patch-lib_header.c
cvs rdiff -u -r0 -r1.1 pkgsrc/misc/rpm/patches/patch-plugins_ima.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/misc/rpm/distinfo
diff -u pkgsrc/misc/rpm/distinfo:1.19 pkgsrc/misc/rpm/distinfo:1.20
--- pkgsrc/misc/rpm/distinfo:1.19       Tue Oct 26 10:59:28 2021
+++ pkgsrc/misc/rpm/distinfo    Mon May 15 13:52:37 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.19 2021/10/26 10:59:28 nia Exp $
+$NetBSD: distinfo,v 1.20 2023/05/15 13:52:37 jperkin Exp $
 
 BLAKE2s (rpm-4.13.0.1.tar.bz2) = 4552ba04d068db35a42cb58ceb84ceac90268e2d11d132c2191a1d60b7514fe8
 SHA512 (rpm-4.13.0.1.tar.bz2) = b7475dd0803e06a5dd6a95d0bf8add6ff0d8f0620dd389c4d87a85becb0eb4637aa4ff8c48e18d4844ff6feefa25d642d9f876cd210006cb2144006d34a91b91
@@ -7,9 +7,10 @@ SHA1 (patch-build_rpmfc.c) = 10e3196d7d2
 SHA1 (patch-configure.ac) = 40f497407fd0af7ac0a17152b8751a7a02817b88
 SHA1 (patch-installplatform) = f9aed911d6c4695a13cedb63378bcd262b92ba99
 SHA1 (patch-lib_backend_db3.c) = 61c202b330baadaf5f68a22806e08f02a184e01a
-SHA1 (patch-lib_header.c) = e882a7578a844081dce9d534e4d458e89bc0d2f7
+SHA1 (patch-lib_header.c) = a7722a5b6587be5f83a27162d1ad6e9ce3ff63d1
 SHA1 (patch-lib_rpmrc.c) = 6e8c26311a596aba2aff142d94823d5b1304750f
 SHA1 (patch-misc_fnmatch.c) = f05137fc4c65986edf7dbcc87c8567ff18bf14eb
 SHA1 (patch-misc_fts.c) = becd8e4cacb126930f7f2c6446855164db6b4537
+SHA1 (patch-plugins_ima.c) = aa7abe37bc52a5284a3ceb6366d54e9aa98923d4
 SHA1 (patch-rpmio_rpmfileutil.c) = fd1debee2c38e866b8098223bab304a66b76eb23
 SHA1 (patch-system.h) = 215e3cfaafc1573c527b7f430b3807093550c39e

Index: pkgsrc/misc/rpm/patches/patch-lib_header.c
diff -u pkgsrc/misc/rpm/patches/patch-lib_header.c:1.3 pkgsrc/misc/rpm/patches/patch-lib_header.c:1.4
--- pkgsrc/misc/rpm/patches/patch-lib_header.c:1.3      Sun Apr 23 08:18:15 2017
+++ pkgsrc/misc/rpm/patches/patch-lib_header.c  Mon May 15 13:52:38 2023
@@ -1,14 +1,14 @@
-$NetBSD: patch-lib_header.c,v 1.3 2017/04/23 08:18:15 adam Exp $
+$NetBSD: patch-lib_header.c,v 1.4 2023/05/15 13:52:38 jperkin Exp $
 
 * Detect htonll in configure script.
 
---- lib/header.c.orig  2014-06-30 08:47:13.000000000 +0000
+--- lib/header.c.orig  2017-02-16 09:54:14.797025194 +0000
 +++ lib/header.c
 @@ -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. */
-+#if !defined(htonll)
++#if !defined(htonll) && !defined(__sun)
  RPM_GNUC_CONST
  static uint64_t htonll(uint64_t n)
  {

Added files:

Index: pkgsrc/misc/rpm/patches/patch-plugins_ima.c
diff -u /dev/null pkgsrc/misc/rpm/patches/patch-plugins_ima.c:1.1
--- /dev/null   Mon May 15 13:52:38 2023
+++ pkgsrc/misc/rpm/patches/patch-plugins_ima.c Mon May 15 13:52:38 2023
@@ -0,0 +1,23 @@
+$NetBSD: patch-plugins_ima.c,v 1.1 2023/05/15 13:52:38 jperkin Exp $
+
+Make plugin effectively a nop on SunOS (lacks lsetxattr).
+
+--- plugins/ima.c.orig 2017-02-16 09:40:09.909649457 +0000
++++ plugins/ima.c
+@@ -1,4 +1,6 @@
++#if !defined(__sun)
+ #include <sys/xattr.h>
++#endif
+ 
+ #include <rpm/rpmfi.h>
+ #include <rpm/rpmte.h>
+@@ -31,7 +33,9 @@ static rpmRC ima_psm_post(rpmPlugin plug
+               fpath = rpmfiFN(fi);
+               fsig = rpmfiFSignature(fi, &len);
+               if (fsig) {
++#if !defined(__sun)
+                   lsetxattr(fpath, XATTR_NAME_IMA, fsig, len, 0);
++#endif
+               }
+           }
+       }