!304 [sync] PR-302: consume z.current prepared by Reader.Read in Reader.WriteTo

From: @openeuler-sync-bot 
Reviewed-by: @duguhaotian 
Signed-off-by: @duguhaotian

VERSION-vendor

@@ -1 +1 @@
-0.9.6-18
+0.9.6-24

git-commit

@@ -1 +1 @@
-37aa4197d30b2780332cd40479f3231a775b212f
+a51590634bf5ef5eabadfcc2a88dc6b04dc319d7

isula-build.spec

@@ -2,7 +2,7 @@
 
 Name: isula-build
 Version: 0.9.6
-Release: 19
+Release: 24
 Summary: A tool to build container images
 License: Mulan PSL V2
 URL: https://gitee.com/openeuler/isula-build
@@ -41,7 +41,10 @@ sh ./apply-patches
 patch -p1 < patch/loong64-0001-add-loong64-support-for-etcd.patch
 patch -p1 < patch/loong64-0002-update-vendor-for-isula-build-to-support-loong64.patch
 %endif
-%ifarch loongarch64 riscv64
+%ifarch sw_64
+patch -p1 < patch/1000-add-sw64-support.patch
+%endif
+%ifarch loongarch64 riscv64 sw_64
 patch -p1 < patch/loong64-0003-delete-static-pie-for-loong64.patch
 %endif
 %{make_build} safe
@@ -75,6 +78,16 @@ if ! getent group isula > /dev/null; then
     groupadd --system isula
 fi
 
+%preun
+%if 0%{?is_systemd}
+%systemd_preun isula-build
+%else
+if [ $1 -eq 0 ] ; then
+    /sbin/service isula-build stop >/dev/null 2>&1
+    /sbin/chkconfig --del isula-build
+fi
+%endif
+
 %files
 # default perm for files and folder
 %defattr(0640,root,root,0550)
@@ -92,6 +105,36 @@ fi
 /usr/share/bash-completion/completions/isula-build
 
 %changelog
+* Wed Dec 18 2024 daisicheng <daisicheng@huawei.com> - 0.9.6-24
+- Type:bugfix
+- CVE:NA
+- SUG:NA
+- DESC:Consume z.current prepared by Reader.Read in Reader.WriteTo
+
+* Sun Apr 07 2024 daisicheng <daisicheng@huawei.com> - 0.9.6-23
+- Type:bugfix
+- CVE:NA
+- SUG:NA
+- DESC:fix sw_64 build error
+
+* Mon Apr 1 2024 luofeng <luofeng13@huawei.com> - 0.9.6-22
+- Type: bugfix
+- CVE:NA
+- SUG:NA
+- DESC:fix the problem that it failed when applying patches in RISCV architecture
+
+* Thu Feb 22 2024 luofeng <luofeng13@huawei.com> - 0.9.6-21
+- Type: enhencement
+- CVE:NA
+- SUG:NA
+- DESC:support for building with clang
+
+* Tue Dec 26 2023 daisicheng <daisicheng@huawei.com> - 0.9.6-20
+- Type:bugfix
+- CVE:NA
+- SUG:NA
+- DESC:fix the problem that isula-build service did not stop after it removed
+
 * Wed Mar 15 2023 laokz <zhangkai@iscas.ac.cn> - 0.9.6-19
 - Type:enhancement
 - CVE:NA

patch/0137-fix-cflags-for-clang-build.patch

@@ -0,0 +1,25 @@
+From a0b5196a28035fcb7e3d700409afd045b1bd2263 Mon Sep 17 00:00:00 2001
+From: liyunfei <liyunfei33@huawei.com>
+Date: Mon, 20 Nov 2023 16:57:14 +0800
+Subject: [PATCH] fix cflags for clang build
+ 
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ 
+diff --git a/Makefile b/Makefile
+index 0d6bd01..caa5de3 100644
+--- a/Makefile
++++ b/Makefile
+@@ -22,7 +22,7 @@ BUILDTAGS := seccomp
+ BUILDFLAGS := -tags "$(BUILDTAGS)"
+ TMPDIR := /tmp/isula_build_tmpdir
+ BEFLAG := -tmpdir=${TMPDIR}
+-SAFEBUILDFLAGS := -buildid=IdByIsula -buildmode=pie -extldflags=-ftrapv -extldflags=-zrelro -extldflags=-znow $(BEFLAG) $(LDFLAGS)
++SAFEBUILDFLAGS := -buildid=IdByIsula -buildmode=pie -extldflags=-ftrapv -extldflags=-Wl,-z,relro -extldflags=-Wl,-z,now $(BEFLAG) $(LDFLAGS)
+ STATIC_LDFLAGS := -linkmode=external -extldflags "-static-pie -Wl,-z,now"
+ 
+ IMAGE_BUILDARGS := $(if $(http_proxy), --build-arg http_proxy=$(http_proxy))
+-- 
+2.33.0
+ 

patch/0138-Consume-z.current-prepared-by-Reader.Read-in-Reader.patch

@@ -0,0 +1,36 @@
+From 17e8dac29df8ce00febbd08ee5d8ee922024a003 Mon Sep 17 00:00:00 2001
+From:Miloslav Trmač <mitr@redhat.com>
+Date: Fri, 30 Sep 2022 12:46:21 +0200
+Subject: [PATCH] Consume z.current prepared by Reader.Read in Reader.WriteTo
+
+---
+ vendor/github.com/klauspost/pgzip/gunzip.go | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+diff --git a/vendor/github.com/klauspost/pgzip/gunzip.go b/vendor/github.com/klauspost/pgzip/gunzip.go
+index d1ae730..3c4b32f 100644
+--- a/vendor/github.com/klauspost/pgzip/gunzip.go
++++ b/vendor/github.com/klauspost/pgzip/gunzip.go
+@@ -513,6 +513,19 @@ func (z *Reader) Read(p []byte) (n int, err error) {
+ 
+ func (z *Reader) WriteTo(w io.Writer) (n int64, err error) {
+ 	total := int64(0)
++	avail := z.current[z.roff:]
++	if len(avail) != 0 {
++		n, err := w.Write(avail)
++		if n != len(avail) {
++			return total, io.ErrShortWrite
++		}
++		total += int64(n)
++		if err != nil {
++			return total, err
++		}
++		z.blockPool <- z.current
++		z.current = nil
++	}
+ 	for {
+ 		if z.err != nil {
+ 			return total, z.err
+-- 
+2.33.0
+

patch/loong64-0003-delete-static-pie-for-loong64.patch

@@ -14,7 +14,7 @@ index 0d6bd01..889b610 100644
 @@ -23,7 +23,7 @@ BUILDFLAGS := -tags "$(BUILDTAGS)"
  TMPDIR := /tmp/isula_build_tmpdir
  BEFLAG := -tmpdir=${TMPDIR}
- SAFEBUILDFLAGS := -buildid=IdByIsula -buildmode=pie -extldflags=-ftrapv -extldflags=-zrelro -extldflags=-znow $(BEFLAG) $(LDFLAGS)
+ SAFEBUILDFLAGS := -buildid=IdByIsula -buildmode=pie -extldflags=-ftrapv -extldflags=-Wl,-z,relro -extldflags=-Wl,-z,now $(BEFLAG) $(LDFLAGS)
 -STATIC_LDFLAGS := -linkmode=external -extldflags "-static-pie -Wl,-z,now"
 +STATIC_LDFLAGS := -linkmode=external -extldflags "-Wl,-z,now"
  

series.conf

@@ -45,3 +45,5 @@ patch/0133-cmd-daemon-add-base-test-for-runDaemon-and-before-fu.patch
 patch/0134-add-dt-for-interface-manifest-health-status-in-daemo.patch
 patch/0135-fix-the-login_test-in-daemon-for-euleros-and-openeul.patch
 patch/0136-add-manifest.json-verification-before-loading-a-tar.patch
+patch/0137-fix-cflags-for-clang-build.patch
+patch/0138-Consume-z.current-prepared-by-Reader.Read-in-Reader.patch