[arch-commits] Commit in cri-o/trunk (PKGBUILD cri-o-1.23.1-pinns_ldflags.patch)

[David Runge]

    Date: Tuesday, May 10, 2022 @ 11:43:42
  Author: dvzrv
Revision: 1197777

upgpkg: cri-o 1.24.0-1: Upgrade to 1.24.0.

Drop patch for adding LDFLAGS for pinns binary (now fixed upstream).
Move gpgme to depends as it is likely dlopen'd during runtime.

Modified:
  cri-o/trunk/PKGBUILD
Deleted:
  cri-o/trunk/cri-o-1.23.1-pinns_ldflags.patch

----------------------------------+
 PKGBUILD                         |   24 ++++++++++--------------
 cri-o-1.23.1-pinns_ldflags.patch |   17 -----------------
 2 files changed, 10 insertions(+), 31 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-05-10 10:44:48 UTC (rev 1197776)
+++ PKGBUILD	2022-05-10 11:43:42 UTC (rev 1197777)
@@ -3,15 +3,16 @@
 # Contributor: Tony Lambiris <tony at libpcap.net>
 
 pkgname=cri-o
-pkgver=1.23.2
-pkgrel=2
+pkgver=1.24.0
+pkgrel=1
 pkgdesc="Open Container Initiative-based implementation of Kubernetes Container Runtime Interface"
 arch=(x86_64)
 url="https://github.com/cri-o/cri-o"
 license=(Apache)
+# NOTE: gpgme is dlopen'd
 depends=(cni-plugins conmon crun conntrack-tools containers-common
-device-mapper glibc iproute2 iptables runc)
-makedepends=(apparmor btrfs-progs gpgme go go-md2man libassuan libseccomp
+device-mapper glibc gpgme iproute2 iptables runc)
+makedepends=(apparmor btrfs-progs go go-md2man libassuan libseccomp
 ostree)
 optdepends=(
   'apparmor: for apparmor integration'
@@ -30,16 +31,13 @@
   $pkgname-$pkgver.tar.gz::https://github.com/$pkgname/$pkgname/archive/v$pkgver.tar.gz
   modules-$pkgname.conf
   sysctl-$pkgname.conf
-  $pkgname-1.23.1-pinns_ldflags.patch
 )
-sha512sums=('5080a0953c3b4e90a9e42606defe5f1e906533b9db66fa7daa823475e25a65040c442d06d591847ece3b1b7745a74cde938deac5c8bfd522dff25a2e76a07b1d'
+sha512sums=('0e0d7668098d90f1800c3763143c17721004f92355fc681cc7314d86d6d719788929c66ca06bab2ae3d3bbf77a5e95254458b7c79662e7aef5fc9548a4495504'
             '85ee1310cb36c85c42b4068a9549a3ef72b856cd61b2c1036c3e871ef43a69ed80b43599ad94ce5b069ddd823e730596bb3d3875d4ba8cd77c4cc1985335ffff'
-            'fbcc3c29d5d3dedf56ea96577dec50cb2656b4a22f5a82bf2d600ae20c6b113d35d5db116bac5520398d47a22d40835f56b86433c5713924060e1a7018d297ec'
-            '85be7e2250c543c6565182363ffccf47d0736b3aca4bf126bfe84e51a4d2b8b62a67b297254b174cde0d407c9f77d9abbad0c3883f3f9d89013720174c617004')
-b2sums=('6298398b4d712227debc346ebe7a26dea6aa3d74e55fb9584cbe3fbeb85e62872e5e634be2812a4d51643d41d64b817bcc17ed8dfc0f0e55796608cc1ede347b'
+            'fbcc3c29d5d3dedf56ea96577dec50cb2656b4a22f5a82bf2d600ae20c6b113d35d5db116bac5520398d47a22d40835f56b86433c5713924060e1a7018d297ec')
+b2sums=('0571c2719d3773fc1085e3fcecef959b210a601365686fd80262fe8ec5b9f2414641ed56f3fa6c6e21ff4cca1a3fecaa3ed5cd4de08799b2eb9b67fc0545d0f1'
         '2771c64b45876d728fc139aa90754df8aadb07e14a7e1126a1488dfcbad7ebcbca923cb0230c4b87acdc6dad8243af2ad06ef4ce587d5c71fc200e40835d8b8d'
-        'c8a2133df6575c54eb9bd0a89a0c6c764c0cd456bff7338c4a2e1ef4f70a5a778d5a05c335fcf2491ed55e15fc36c677853c0bc8ab66d673f1950fa2c7695f6e'
-        '5e4e453eaa99b930d018ca200de791be7de2e5c3da60e5a6f84f0d61e1b18e5f7a6a7700503445a7f39fba0baac67c0042f8d69e2529374c6913458c465bc0e5')
+        'c8a2133df6575c54eb9bd0a89a0c6c764c0cd456bff7338c4a2e1ef4f70a5a778d5a05c335fcf2491ed55e15fc36c677853c0bc8ab66d673f1950fa2c7695f6e')
 
 prepare() {
   cd $pkgname-$pkgver
@@ -52,8 +50,6 @@
   sed -e 's|/usr/local|/usr|g' -i contrib/systemd/*.service
   # set the correct default PATH for cni-plugins
   sed -e 's|/opt/cni/bin/|/usr/lib/cni/|g' -i pkg/config/config_unix.go
-  # apply LDFLAGS to pinns
-  patch -Np1 -i ../$pkgname-1.23.1-pinns_ldflags.patch
 }
 
 build() {
@@ -68,7 +64,7 @@
 }
 
 package() {
-  depends+=(libdevmapper.so libgpgme.so libseccomp.so)
+  depends+=(libdevmapper.so libseccomp.so)
 
   cd $pkgname-$pkgver
   # makefile is mixing DESTDIR and PREFIX

Deleted: cri-o-1.23.1-pinns_ldflags.patch
===================================================================
--- cri-o-1.23.1-pinns_ldflags.patch	2022-05-10 10:44:48 UTC (rev 1197776)
+++ cri-o-1.23.1-pinns_ldflags.patch	2022-05-10 11:43:42 UTC (rev 1197777)
@@ -1,17 +0,0 @@
-diff -ruN a/pinns/Makefile b/pinns/Makefile
---- a/pinns/Makefile	2022-02-11 22:59:14.000000000 +0100
-+++ b/pinns/Makefile	2022-02-13 00:49:24.575120677 +0100
-@@ -4,11 +4,12 @@
- STRIP ?= strip
- override LIBS +=
- CFLAGS ?= -std=c99 -Os -Wall -Werror -Wextra -static
-+LDFLAGS ?=
- 
- all: ../bin/pinns
- 
- ../bin/pinns: $(obj) | ../bin
--	$(CC) -o $@ $^ $(CFLAGS) $(LIBS)
-+	$(CC) -o $@ $^ $(CFLAGS) $(LDFLAGS) $(LIBS)
- 	$(STRIP) -s $@
- 
- %.o: %.c $(HEADERS)