Date: Thursday, April 15, 2021 @ 09:44:38 Author: dvzrv Revision: 918971
upgpkg: cri-o 1.21.0-1: Upgrade to 1.21.0. Adapt patch for achieving PIE with the pinns build to the new version. Added: cri-o/trunk/cri-o-1.21.0-pinns_pie.patch Modified: cri-o/trunk/PKGBUILD Deleted: cri-o/trunk/cri-o-1.19.0-pinns_pie.patch ------------------------------+ PKGBUILD | 14 +++++++------- cri-o-1.19.0-pinns_pie.patch | 33 --------------------------------- cri-o-1.21.0-pinns_pie.patch | 24 ++++++++++++++++++++++++ 3 files changed, 31 insertions(+), 40 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-04-15 09:05:45 UTC (rev 918970) +++ PKGBUILD 2021-04-15 09:44:38 UTC (rev 918971) @@ -2,7 +2,7 @@ # Contributor: Tony Lambiris <t...@libpcap.net> pkgname=cri-o -pkgver=1.20.2 +pkgver=1.21.0 pkgrel=1 pkgdesc="Open Container Initiative-based implementation of Kubernetes Container Runtime Interface" arch=('x86_64') @@ -25,15 +25,15 @@ source=("${pkgname}-${pkgver}.tar.gz::https://github.com/${pkgname}/${pkgname}/archive/v${pkgver}.tar.gz" "modules-${pkgname}.conf" "sysctl-${pkgname}.conf" - "${pkgname}-1.19.0-pinns_pie.patch") -sha512sums=('af900c9b682c8f1c4a5814902aee1f616a735ff1f4c9442a554055257a477cd3ea19708c2303cffdfe4d215eab7ef5d2253a81817cfe66925d2d09458f9aea93' + "${pkgname}-1.21.0-pinns_pie.patch") +sha512sums=('69c13b00d259f9dc45192493dff0ab853f181629fba5408d895a96e291c2ed20235beea18b70ab77d6d8f593dc0a2c06ca29a40211caaedf51d89b58afcfe77e' '85ee1310cb36c85c42b4068a9549a3ef72b856cd61b2c1036c3e871ef43a69ed80b43599ad94ce5b069ddd823e730596bb3d3875d4ba8cd77c4cc1985335ffff' 'fbcc3c29d5d3dedf56ea96577dec50cb2656b4a22f5a82bf2d600ae20c6b113d35d5db116bac5520398d47a22d40835f56b86433c5713924060e1a7018d297ec' - '1eb382a0a5c273a6ed1df9666ff2b7a83cdb513818f85ca9984da254aecf518580c1b13410715eb73fd1bc7d687a4fd6ef5ae30eb11a1046e422157f117aeb1a') -b2sums=('a26176cbb2cdd65ab5ccfaa407020059456dd07c080e0b71e16e55267892c604691b59a4f2dd858ede3299e25b502dd6bfad07bbba8c74914fbe7593db1c3b02' + 'dbe51c558a50212065de97794b87af3205b3624b43d073f70be245528a309d2f2bf5c6f6a15e4137d9f3e737a38166d08fed87ede27e33fad843b3b01194eb34') +b2sums=('352f0313eba7b984dd37e64791c25e5d1dd1ab52ed7123062485362542f7b143aa2324b0788ff86a30423e10ec6b9df276a97f2ab7f7c2f2db0c4516f7c78931' '2771c64b45876d728fc139aa90754df8aadb07e14a7e1126a1488dfcbad7ebcbca923cb0230c4b87acdc6dad8243af2ad06ef4ce587d5c71fc200e40835d8b8d' 'c8a2133df6575c54eb9bd0a89a0c6c764c0cd456bff7338c4a2e1ef4f70a5a778d5a05c335fcf2491ed55e15fc36c677853c0bc8ab66d673f1950fa2c7695f6e' - '8d77c8060f483c943bd48d9bc2c1d676878e570b29989b7ff733906612b6dff09ed1ffcabc5174175ebc667df897e37e98a8132016bddcb27137661fca2da6dd') + '06558ff67ba4dd6386ada8d50883b7fbc6a74ee6110ad9dc1ee167c43ba48c2c4f15c6a3f7bcabdf6363c235fc482d6fad077821188d65489249ee5764fe7680') prepare() { cd "${pkgname}-${pkgver}" @@ -49,7 +49,7 @@ sed -e 's|/opt/cni/bin/|/usr/lib/cni/|g' \ -i pkg/config/config_unix.go # do not statically link pinns and enable PIE - patch -Np1 -i "../${pkgname}-1.19.0-pinns_pie.patch" + patch -Np1 -i "../${pkgname}-1.21.0-pinns_pie.patch" } build() { Deleted: cri-o-1.19.0-pinns_pie.patch =================================================================== --- cri-o-1.19.0-pinns_pie.patch 2021-04-15 09:05:45 UTC (rev 918970) +++ cri-o-1.19.0-pinns_pie.patch 2021-04-15 09:44:38 UTC (rev 918971) @@ -1,33 +0,0 @@ -diff -ruN a/Makefile b/Makefile ---- a/Makefile 2020-09-14 15:46:17.000000000 +0200 -+++ b/Makefile 2020-10-28 16:14:38.476052535 +0100 -@@ -157,7 +157,7 @@ - -x ${SHELLFILES} - - bin/pinns: -- $(MAKE) -C pinns -+ $(MAKE) -C pinns LDFLAGS=$(LDFLAGS) - - test/copyimg/copyimg: $(GO_FILES) .gopathok - $(GO_BUILD) $(GCFLAGS) $(GO_LDFLAGS) -tags "$(BUILDTAGS)" -o $@ $(PROJECT)/test/copyimg -diff -ruN a/pinns/Makefile b/pinns/Makefile ---- a/pinns/Makefile 2020-09-14 15:46:17.000000000 +0200 -+++ b/pinns/Makefile 2020-10-28 16:24:25.212722369 +0100 -@@ -1,15 +1,15 @@ - src = $(wildcard src/*.c) - obj = $(src:.c=.o) - -+LDFLAGS ?= - STRIP ?= strip - override LIBS += - CFLAGS ?= -std=c99 -Os -Wall -Werror -Wextra --override CFLAGS += -static - - all: ../bin/pinns - - ../bin/pinns: $(obj) | ../bin -- $(CC) -o $@ $^ $(CFLAGS) $(LIBS) -+ $(CC) -o $@ $^ $(CFLAGS) $(LDFLAGS) $(LIBS) - $(STRIP) -s $@ - - %.o: %.c $(HEADERS) Added: cri-o-1.21.0-pinns_pie.patch =================================================================== --- cri-o-1.21.0-pinns_pie.patch (rev 0) +++ cri-o-1.21.0-pinns_pie.patch 2021-04-15 09:44:38 UTC (rev 918971) @@ -0,0 +1,24 @@ +diff -ruN a/Makefile b/Makefile +--- a/Makefile 2021-04-13 23:47:29.000000000 +0200 ++++ b/Makefile 2021-04-15 11:18:45.140171673 +0200 +@@ -153,7 +153,7 @@ + ${SHELLFILES} ${BATS_FILES} + + bin/pinns: +- $(MAKE) -C pinns ++ $(MAKE) -C pinns LDFLAGS=$(LDFLAGS) + + test/copyimg/copyimg: $(GO_FILES) .gopathok + $(GO_BUILD) $(GCFLAGS) $(GO_LDFLAGS) -tags "$(BUILDTAGS)" -o $@ $(PROJECT)/test/copyimg +diff -ruN a/pinns/Makefile b/pinns/Makefile +--- a/pinns/Makefile 2021-04-13 23:47:29.000000000 +0200 ++++ b/pinns/Makefile 2021-04-15 11:21:01.100633321 +0200 +@@ -8,7 +8,7 @@ + all: ../bin/pinns + + ../bin/pinns: $(obj) | ../bin +- $(CC) -o $@ $^ $(CFLAGS) $(LIBS) ++ $(CC) -o $@ $^ $(CFLAGS) $(LDFLAGS) $(LIBS) + $(STRIP) -s $@ + + %.o: %.c $(HEADERS)