开源软件构建与测试

_service:extract_file:libarchive.spec Deleted

@@ -1,252 +0,0 @@
-%bcond_without check
-
-Name:           libarchive
-Version:        3.6.1
-Release:        1
-Summary:        Multi-format archive and compression library
-License:        BSD
-URL:            https://www.libarchive.org/
-Source0:        https://libarchive.org/downloads/%{name}-%{version}.tar.gz
-
-BuildRequires:  gcc bison sharutils zlib-devel bzip2-devel xz-devel
-BuildRequires:  lzo-devel e2fsprogs-devel libacl-devel libattr-devel
-BuildRequires:  openssl-devel libxml2-devel lz4-devel automake libzstd-devel
-BuildRequires:  autoconf libtool make
-
-Patch0001:      0001-Drop-rmd160-from-OpenSSL.patch
-Patch9000:	libarchive-uninitialized-value.patch
-
-%description
-%{name} is an open-source BSD-licensed C programming library that 
-provides streaming access to a variety of different archive formats,
-including tar, cpio, pax, zip, and ISO9660 images. The distribution 
-also includes bsdtar and bsdcpio, full-featured implementations of 
-tar and cpio that use %{name}.
-
-%package 	devel
-Summary:        Development files for %{name}
-Requires:       %{name} = %{version}-%{release}
-
-%description 	devel
-%{name}-devel contains the header files for developing
-applications that want to make use of %{name}.
-
-%package_help
-
-%package -n bsdtar
-Summary:        Manipulate tape archives
-Requires:       %{name}%{?_isa} = %{version}-%{release}
- 
-%description -n bsdtar
-The bsdtar package contains standalone bsdtar utility split off regular
-libarchive packages.
- 
- 
-%package -n bsdcpio
-Summary:        Copy files to and from archives
-Requires:       %{name}%{?_isa} = %{version}-%{release}
- 
-%description -n bsdcpio
-The bsdcpio package contains standalone bsdcpio utility split off regular
-libarchive packages.
- 
- 
-%package -n bsdcat
-Summary:        Expand files to standard output
-Requires:       %{name}%{?_isa} = %{version}-%{release}
- 
-%description -n bsdcat
-The bsdcat program typically takes a filename as an argument or reads standard
-input when used in a pipe.  In both cases decompressed data it written to
-standard output.
-
-%prep
-%autosetup -n %{name}-%{version} -p1
-
-%build
-autoreconf -ifv
-%configure --disable-rpath --disable-static LT_SYS_LIBRARY_PATH=%_libdir
-%disable_rpath
-
-%make_build
-
-%install
-%make_install
-%delete_la
-
-replace ()
-{
-    filename=$1
-    file=`basename "$filename"`
-    binary=${file%%.*}
-    pattern=${binary##bsd}
-
-    awk "
-        # replace the topic
-        /^.Dt ${pattern^^} 1/ {
-            print \".Dt ${binary^^} 1\";
-            next;
-        }
-        # replace the first occurence of \"$pattern\" by \"$binary\"
-        !stop && /^.Nm $pattern/ {
-            print \".Nm $binary\" ;
-            stop = 1 ;
-            next;
-        }
-        # print remaining lines
-        1;
-    " "$filename" > "$filename.new"
-    mv "$filename".new "$filename"
-}
-
-for manpage in bsdtar.1 bsdcpio.1
-do
-    installed_manpage=`find "$RPM_BUILD_ROOT" -name "$manpage"`
-    replace "$installed_manpage"
-done
-
-%check
-%if %{with check}
-logfiles ()
-{
-    find -name '*_test.log' -or -name test-suite.log
-}
-
-tempdirs ()
-{
-    cat `logfiles` \
-        | awk "match(\$0, /^:space:*`date -I`^:space:*/) { print substr(\$0, RSTART, RLENGTH); }" \
-        | sort | uniq
-}
-
-cat_logs ()
-{
-    for i in `logfiles`
-    do
-        echo "=== $i ==="
-        cat "$i"
-    done
-}
-
-run_testsuite ()
-{
-    rc=0
-    %make_build check -j1 || {
-        # error happened - try to extract in koji as much info as possible
-        cat_logs
-
-        for i in `tempdirs`; do
-            if test -d "$i" ; then
-                find $i -printf "%p\n    ~> a: %a\n    ~> c: %c\n    ~> t: %t\n    ~> %s B\n"
-                cat $i/*.log
-            fi
-        done
-        return 1
-    }
-    cat_logs
-}
-
-run_testsuite
-
-%endif
-
-%files
-%defattr(-,root,root)
-%{!?_licensedir:%global license %%doc}
-%license COPYING
-%{_libdir}/%{name}.so.13*
-
-%files devel
-%defattr(-,root,root)
-%{_includedir}/*.h
-%{_libdir}/%{name}.so
-%{_libdir}/pkgconfig/%{name}.pc
-
-%files help
-%defattr(-,root,root)
-%doc NEWS README.md
-%{_mandir}/man1/*
-%{_mandir}/man3/*
-%{_mandir}/man5/*
-
-%files -n bsdtar
-%{!?_licensedir:%global license %%doc}
-%license COPYING
-%doc NEWS README.md
-%{_bindir}/bsdtar
- 
-%files -n bsdcpio
-%{!?_licensedir:%global license %%doc}
-%license COPYING
-%doc NEWS README.md
-%{_bindir}/bsdcpio
- 
-%files -n bsdcat
-%{!?_licensedir:%global license %%doc}
-%license COPYING
-%doc NEWS README.md
-%{_bindir}/bsdcat
-
-%changelog
-* Mon Jun 6 2022 lin zhang <lin.zhang@turbolinux.com.cn> - 3.6.1-1
-- Upgrade to 3.6.1
-
-* Sat Apr 09 2022 wangkerong <wangkerong@h-paetners.com> - 3.5.2-3
-- fix CVE-2021-36976,CVE-2021-31566,fix fuzz test
-
-* Sat Mar 26 2022 wangkerong <wangkerong@h-paetners.com> - 3.5.2-2
-- Eanable make check
-

_service:tar_scm:libarchive.spec Added

@@ -0,0 +1,256 @@
+%bcond_without check
+
+Name:           libarchive
+Version:        3.6.1
+Release:        2
+Summary:        Multi-format archive and compression library
+License:        BSD
+URL:            https://www.libarchive.org/
+Source0:        https://libarchive.org/downloads/%{name}-%{version}.tar.gz
+
+BuildRequires:  gcc bison sharutils zlib-devel bzip2-devel xz-devel
+BuildRequires:  lzo-devel e2fsprogs-devel libacl-devel libattr-devel
+BuildRequires:  openssl-devel libxml2-devel lz4-devel automake libzstd-devel
+BuildRequires:  autoconf libtool make
+
+Patch0001:      0001-Drop-rmd160-from-OpenSSL.patch
+Patch6000:	backport-CVE-2022-36227.patch
+Patch9000:	libarchive-uninitialized-value.patch
+
+%description
+%{name} is an open-source BSD-licensed C programming library that 
+provides streaming access to a variety of different archive formats,
+including tar, cpio, pax, zip, and ISO9660 images. The distribution 
+also includes bsdtar and bsdcpio, full-featured implementations of 
+tar and cpio that use %{name}.
+
+%package 	devel
+Summary:        Development files for %{name}
+Requires:       %{name} = %{version}-%{release}
+
+%description 	devel
+%{name}-devel contains the header files for developing
+applications that want to make use of %{name}.
+
+%package_help
+
+%package -n bsdtar
+Summary:        Manipulate tape archives
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+ 
+%description -n bsdtar
+The bsdtar package contains standalone bsdtar utility split off regular
+libarchive packages.
+ 
+ 
+%package -n bsdcpio
+Summary:        Copy files to and from archives
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+ 
+%description -n bsdcpio
+The bsdcpio package contains standalone bsdcpio utility split off regular
+libarchive packages.
+ 
+ 
+%package -n bsdcat
+Summary:        Expand files to standard output
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+ 
+%description -n bsdcat
+The bsdcat program typically takes a filename as an argument or reads standard
+input when used in a pipe.  In both cases decompressed data it written to
+standard output.
+
+%prep
+%autosetup -n %{name}-%{version} -p1
+
+%build
+autoreconf -ifv
+%configure --disable-rpath --disable-static LT_SYS_LIBRARY_PATH=%_libdir
+%disable_rpath
+
+%make_build
+
+%install
+%make_install
+%delete_la
+
+replace ()
+{
+    filename=$1
+    file=`basename "$filename"`
+    binary=${file%%.*}
+    pattern=${binary##bsd}
+
+    awk "
+        # replace the topic
+        /^.Dt ${pattern^^} 1/ {
+            print \".Dt ${binary^^} 1\";
+            next;
+        }
+        # replace the first occurence of \"$pattern\" by \"$binary\"
+        !stop && /^.Nm $pattern/ {
+            print \".Nm $binary\" ;
+            stop = 1 ;
+            next;
+        }
+        # print remaining lines
+        1;
+    " "$filename" > "$filename.new"
+    mv "$filename".new "$filename"
+}
+
+for manpage in bsdtar.1 bsdcpio.1
+do
+    installed_manpage=`find "$RPM_BUILD_ROOT" -name "$manpage"`
+    replace "$installed_manpage"
+done
+
+%check
+%if %{with check}
+logfiles ()
+{
+    find -name '*_test.log' -or -name test-suite.log
+}
+
+tempdirs ()
+{
+    cat `logfiles` \
+        | awk "match(\$0, /^:space:*`date -I`^:space:*/) { print substr(\$0, RSTART, RLENGTH); }" \
+        | sort | uniq
+}
+
+cat_logs ()
+{
+    for i in `logfiles`
+    do
+        echo "=== $i ==="
+        cat "$i"
+    done
+}
+
+run_testsuite ()
+{
+    rc=0
+    %make_build check -j1 || {
+        # error happened - try to extract in koji as much info as possible
+        cat_logs
+
+        for i in `tempdirs`; do
+            if test -d "$i" ; then
+                find $i -printf "%p\n    ~> a: %a\n    ~> c: %c\n    ~> t: %t\n    ~> %s B\n"
+                cat $i/*.log
+            fi
+        done
+        return 1
+    }
+    cat_logs
+}
+
+run_testsuite
+
+%endif
+
+%files
+%defattr(-,root,root)
+%{!?_licensedir:%global license %%doc}
+%license COPYING
+%{_libdir}/%{name}.so.13*
+
+%files devel
+%defattr(-,root,root)
+%{_includedir}/*.h
+%{_libdir}/%{name}.so
+%{_libdir}/pkgconfig/%{name}.pc
+
+%files help
+%defattr(-,root,root)
+%doc NEWS README.md
+%{_mandir}/man1/*
+%{_mandir}/man3/*
+%{_mandir}/man5/*
+
+%files -n bsdtar
+%{!?_licensedir:%global license %%doc}
+%license COPYING
+%doc NEWS README.md
+%{_bindir}/bsdtar
+ 
+%files -n bsdcpio
+%{!?_licensedir:%global license %%doc}
+%license COPYING
+%doc NEWS README.md
+%{_bindir}/bsdcpio
+ 
+%files -n bsdcat
+%{!?_licensedir:%global license %%doc}
+%license COPYING
+%doc NEWS README.md
+%{_bindir}/bsdcat
+
+%changelog
+* Fri Nov 25 2022 wangkerong <wangkerong@h-paetners.com> - 3.6.1-2
+- fix CVE-2022-36227
+
+* Mon Jun 6 2022 lin zhang <lin.zhang@turbolinux.com.cn> - 3.6.1-1
+- Upgrade to 3.6.1
+
+* Sat Apr 09 2022 wangkerong <wangkerong@h-paetners.com> - 3.5.2-3
+- fix CVE-2021-36976,CVE-2021-31566,fix fuzz test

_service:extract_file:0001-Drop-rmd160-from-OpenSSL.patch Deleted

_service:extract_file:libarchive-uninitialized-value.patch Deleted

_service:tar_scm:0001-Drop-rmd160-from-OpenSSL.patch Added

_service:tar_scm:backport-CVE-2022-36227.patch Added

@@ -0,0 +1,38 @@
+From bff38efe8c110469c5080d387bec62a6ca15b1a5 Mon Sep 17 00:00:00 2001
+From: obiwac <obiwac@gmail.com>
+Date: Fri, 22 Jul 2022 22:41:10 +0200
+Subject: PATCH libarchive: Handle a `calloc` returning NULL (fixes #1754)
+
+Conflict:NA
+Reference:https://github.com/libarchive/libarchive/commit/fd180c36036df7181a64931264732a10ad8cd024
+---
+ libarchive/archive_write.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/libarchive/archive_write.c b/libarchive/archive_write.c
+index 66592e826..27626b541 100644
+--- a/libarchive/archive_write.c
++++ b/libarchive/archive_write.c
+@@ -201,6 +201,10 @@ __archive_write_allocate_filter(struct archive *_a)
+ 	struct archive_write_filter *f;
+ 
+ 	f = calloc(1, sizeof(*f));
++
++	if (f == NULL)
++		return (NULL);
++
+ 	f->archive = _a;
+ 	f->state = ARCHIVE_WRITE_FILTER_STATE_NEW;
+ 	if (a->filter_first == NULL)
+@@ -548,6 +552,10 @@ archive_write_open2(struct archive *_a, void *client_data,
+ 	a->client_data = client_data;
+ 
+ 	client_filter = __archive_write_allocate_filter(_a);
++
++	if (client_filter == NULL)
++		return (ARCHIVE_FATAL);
++
+ 	client_filter->open = archive_write_client_open;
+ 	client_filter->write = archive_write_client_write;
+ 	client_filter->close = archive_write_client_close;
+

_service:tar_scm:libarchive-uninitialized-value.patch Added

_service Changed

_service:extract_file:libarchive-3.6.1.tar.gz Deleted

_service:extract_file:libarchive.yaml Deleted

_service:tar_scm:libarchive-1655100558.bf65438.tar -> _service:tar_scm:libarchive-3.6.1.tar.gz Changed

_service:tar_scm:libarchive.yaml Added

Changes of Revision 3