Open Build Service

_service:extract_file:musl.spec Added

@@ -0,0 +1,195 @@
+# Ensure the value is set correctly
+%ifarch %{ix86}
+%global _musl_target_cpu i386
+%endif
+ 
+%ifarch %{arm}
+%ifarch armv3l armv4b armv4l armv4tl armv5tl armv5tel armv5tejl armv6l armv7l
+%global _musl_target_cpu arm
+%else
+%global _musl_target_cpu armhf
+%endif
+%global _musl_platform_suffix eabi
+%endif
+ 
+%ifarch %{mips64}
+%global _musl_target_cpu mips64
+%endif
+ 
+%ifarch %{mips32}
+%global _musl_target_cpu mips
+%endif
+ 
+%ifarch ppc
+%global _musl_target_cpu powerpc
+%endif
+ 
+%ifarch %{power64}
+# POWER architectures have a different name if little-endian
+%ifarch ppc64le
+%global _musl_target_cpu powerpc64le
+%else
+%global _musl_target_cpu powerpc64
+%endif
+%endif
+ 
+%ifnarch %{ix86} %{arm} %{mips} %{power64} ppc
+%global _musl_target_cpu %{_target_cpu}
+%endif
+ 
+# Define the platform name
+%global _musl_platform %{_musl_target_cpu}-linux-musl%{?_musl_platform_suffix}
+%global _musl_gcc_platform %{_musl_target_cpu}-linux-musl-gcc 
+
+%global _libdir %{_prefix}/musl/lib
+%global _includedir %{_prefix}/musl/include
+
+Name:		musl
+Version:	1.2.2
+Release:	1
+Summary:	An implementation of the standard library for Linux-based systems
+
+License:	MIT
+URL:		https://musl-libc.org
+Source0:	%{url}/releases/%{name}-%{version}.tar.gz
+
+Patch6000:	backport-rewrite-wcsnrtombs-to-fix-buffer-overflow.patch
+
+BuildRequires:	gcc
+BuildRequires:	make
+BuildRequires:	gnupg2
+%description
+musl is an implementation of the C standard library built
+on top of the Linux system call API, including interfaces
+defined in the base language standard, POSIX, and widely
+agreed-upon extensions. It is lightweight, fast, simple,
+free, and strives to be correct in the sense of standards
+conformance and safety.
+
+%package libc
+Summary:	Fully featured lightweight standard C library for Linux
+Provides:	%{name}-libs%{?_isa} = %{version}-%{release}
+
+%description libc
+musl is an implementation of the C standard library built
+on top of the Linux system call API, including interfaces
+defined in the base language standard, POSIX, and widely
+agreed-upon extensions. It is lightweight, fast, simple,
+free, and strives to be correct in the sense of standards
+conformance and safety.
+This package provides the system dynamic linker library.
+It also provides the dynamic libraries for linking
+programs and libraries against musl.
+
+%package devel
+Summary:	Development files for %{name}
+Provides:	%{name}-headers%{?_isa} = %{version}-%{release}
+Requires:	%{name}-libc = %{version}-%{release}
+Recommends:	%{name}-libc-static = %{version}-%{release}
+
+%description devel
+musl is an implementation of the C standard library built
+on top of the Linux system call API, including interfaces
+defined in the base language standard, POSIX, and widely
+agreed-upon extensions. It is lightweight, fast, simple,
+free, and strives to be correct in the sense of standards
+conformance and safety.
+This package provides header files and other required files
+for developers.
+
+%package libc-static
+Summary:	Static link library for %{name}
+Provides:	%{name}-static%{?_isa} = %{version}-%{release}
+Requires:	%{name}-devel = %{version}-%{release}
+
+%description libc-static
+musl is an implementation of the C standard library built
+on top of the Linux system call API, including interfaces
+defined in the base language standard, POSIX, and widely
+agreed-upon extensions. It is lightweight, fast, simple,
+free, and strives to be correct in the sense of standards
+conformance and safety.
+This package provides the additional development files for
+statically linking musl into programs and libraries.
+	
+%package gcc
+Summary:	Wrapper for using gcc with musl
+Requires:	%{name}-devel = %{version}-%{release}
+Requires:	gcc
+ 
+%description gcc
+musl is a C standard library to power a new generation
+of Linux-based devices. It is lightweight, fast, simple,
+free, and strives to be correct in the sense of standards
+conformance and safety. 
+This package provides a wrapper around gcc to compile
+programs and libraries with musl easily.
+
+%prep
+%setup
+
+%build
+export LDFLAGS="%{?build_ldflags} -Wl,-soname,ld-musl.so.1"
+%configure --enable-debug --enable-wrapper=gcc
+%make_build
+
+%install
+%make_install
+mkdir -p %{buildroot}/lib/
+mv %{buildroot}%{_libdir}/libc.so %{buildroot}/lib/ld-musl.so.1
+ln -sr %{buildroot}/lib/ld-musl.so.1 %{buildroot}%{_libdir}/ld-musl.so.1
+ln -sr %{buildroot}%{_bindir}/musl-gcc %{buildroot}%{_bindir}/%{_musl_gcc_platform}
+ln -sr %{buildroot}%{_libdir}/ld-musl.so.1 %{buildroot}%{_libdir}/libc.so
+ln -sr %{buildroot}%{_libdir}/libc.so %{buildroot}%{_libdir}/libcrypt.so
+ln -sr %{buildroot}%{_libdir}/libc.so %{buildroot}%{_libdir}/libdl.so
+ln -sr %{buildroot}%{_libdir}/libc.so %{buildroot}%{_libdir}/libm.so
+ln -sr %{buildroot}%{_libdir}/libc.so %{buildroot}%{_libdir}/libpthread.so
+ln -sr %{buildroot}%{_libdir}/libc.so %{buildroot}%{_libdir}/libresolv.so
+ln -sr %{buildroot}%{_libdir}/libc.so %{buildroot}%{_libdir}/librt.so
+ln -sr %{buildroot}%{_libdir}/libc.so %{buildroot}%{_libdir}/libutil.so
+ln -sr %{buildroot}%{_libdir}/libc.so %{buildroot}%{_libdir}/libxnet.so
+ln -sr %{buildroot}%{_libdir}/libc.so %{buildroot}%{_libdir}/libc.so.6
+ln -sr %{buildroot}%{_libdir}/libc.so %{buildroot}%{_libdir}/libcrypt.so.1
+ln -sr %{buildroot}%{_libdir}/libc.so %{buildroot}%{_libdir}/libdl.so.2
+ln -sr %{buildroot}%{_libdir}/libc.so %{buildroot}%{_libdir}/libm.so.6
+ln -sr %{buildroot}%{_libdir}/libc.so %{buildroot}%{_libdir}/libpthread.so.0
+ln -sr %{buildroot}%{_libdir}/libc.so %{buildroot}%{_libdir}/libresolv.so.2
+ln -sr %{buildroot}%{_libdir}/libc.so %{buildroot}%{_libdir}/librt.so.1
+ln -sr %{buildroot}%{_libdir}/libc.so %{buildroot}%{_libdir}/libutil.so.1
+
+%files libc
+%license COPYRIGHT
+/lib/ld-musl.so.1
+%{_libdir}/*.so*
+
+%files devel
+%license COPYRIGHT
+%doc README WHATSNEW
+%{_includedir}/*
+%{_libdir}/*.so
+%{_libdir}/*.o
+%{_libdir}/*.a
+%exclude %{_libdir}/libc.a
+
+%files libc-static
+%license COPYRIGHT
+%{_libdir}/libc.a
+
+%files gcc
+%license COPYRIGHT
+%{_bindir}/musl-gcc
+%{_bindir}/%{_musl_gcc_platform}
+%{_libdir}/musl-gcc.specs
+
+%changelog
+* Fri Sep 24 2021 zhuyan <zhuyan34@huawei.com> - 1.2.2-1
+- upgrade to 1.2.2
+
+* Tue Aug 19 2021 zhuyan <zhuyan34@huawei.com> - 1.2.0-3
+- fix CVE-2020-28928
+
+* Tue May 11 2021 Jiajie Li <lijiajie11@huawei.com> - 1.2.0-2
+- Add musl-gcc support
+
+* Fri Dec 4 2020 tangmeng5 <tangmeng5@huawei.com> - 1.2.0-1
+- package init

_service:tar_scm_kernel_repo:musl.spec Deleted

@@ -1,192 +0,0 @@
-# Ensure the value is set correctly
-%ifarch %{ix86}
-%global _musl_target_cpu i386
-%endif
- 
-%ifarch %{arm}
-%ifarch armv3l armv4b armv4l armv4tl armv5tl armv5tel armv5tejl armv6l armv7l
-%global _musl_target_cpu arm
-%else
-%global _musl_target_cpu armhf
-%endif
-%global _musl_platform_suffix eabi
-%endif
- 
-%ifarch %{mips64}
-%global _musl_target_cpu mips64
-%endif
- 
-%ifarch %{mips32}
-%global _musl_target_cpu mips
-%endif
- 
-%ifarch ppc
-%global _musl_target_cpu powerpc
-%endif
- 
-%ifarch %{power64}
-# POWER architectures have a different name if little-endian
-%ifarch ppc64le
-%global _musl_target_cpu powerpc64le
-%else
-%global _musl_target_cpu powerpc64
-%endif
-%endif
- 
-%ifnarch %{ix86} %{arm} %{mips} %{power64} ppc
-%global _musl_target_cpu %{_target_cpu}
-%endif
- 
-# Define the platform name
-%global _musl_platform %{_musl_target_cpu}-linux-musl%{?_musl_platform_suffix}
-%global _musl_gcc_platform %{_musl_target_cpu}-linux-musl-gcc 
-
-%global _libdir %{_prefix}/musl/lib
-%global _includedir %{_prefix}/musl/include
-
-Name:		musl
-Version:	1.2.0
-Release:	3
-Summary:	An implementation of the standard library for Linux-based systems
-
-License:	MIT
-URL:		https://musl.libc.org
-Source0:	%{url}/releases/%{name}-%{version}.tar.gz
-
-Patch6000:	backport-rewrite-wcsnrtombs-to-fix-buffer-overflow.patch
-
-BuildRequires:	gcc
-BuildRequires:	make
-BuildRequires:	gnupg2
-%description
-musl is an implementation of the C standard library built
-on top of the Linux system call API, including interfaces
-defined in the base language standard, POSIX, and widely
-agreed-upon extensions. It is lightweight, fast, simple,
-free, and strives to be correct in the sense of standards
-conformance and safety.
-
-%package libc
-Summary:	Fully featured lightweight standard C library for Linux
-Provides:	%{name}-libs%{?_isa} = %{version}-%{release}
-
-%description libc
-musl is an implementation of the C standard library built
-on top of the Linux system call API, including interfaces
-defined in the base language standard, POSIX, and widely
-agreed-upon extensions. It is lightweight, fast, simple,
-free, and strives to be correct in the sense of standards
-conformance and safety.
-This package provides the system dynamic linker library.
-It also provides the dynamic libraries for linking
-programs and libraries against musl.
-
-%package devel
-Summary:	Development files for %{name}
-Provides:	%{name}-headers%{?_isa} = %{version}-%{release}
-Requires:	%{name}-libc = %{version}-%{release}
-Recommends:	%{name}-libc-static = %{version}-%{release}
-
-%description devel
-musl is an implementation of the C standard library built
-on top of the Linux system call API, including interfaces
-defined in the base language standard, POSIX, and widely
-agreed-upon extensions. It is lightweight, fast, simple,
-free, and strives to be correct in the sense of standards
-conformance and safety.
-This package provides header files and other required files
-for developers.
-
-%package libc-static
-Summary:	Static link library for %{name}
-Provides:	%{name}-static%{?_isa} = %{version}-%{release}
-Requires:	%{name}-devel = %{version}-%{release}
-
-%description libc-static
-musl is an implementation of the C standard library built
-on top of the Linux system call API, including interfaces
-defined in the base language standard, POSIX, and widely
-agreed-upon extensions. It is lightweight, fast, simple,
-free, and strives to be correct in the sense of standards
-conformance and safety.
-This package provides the additional development files for
-statically linking musl into programs and libraries.
-	
-%package gcc
-Summary:	Wrapper for using gcc with musl
-Requires:	%{name}-devel = %{version}-%{release}
-Requires:	gcc
- 
-%description gcc
-musl is a C standard library to power a new generation
-of Linux-based devices. It is lightweight, fast, simple,
-free, and strives to be correct in the sense of standards
-conformance and safety. 
-This package provides a wrapper around gcc to compile
-programs and libraries with musl easily.
-
-%prep
-%setup
-
-%build
-export LDFLAGS="%{?build_ldflags} -Wl,-soname,ld-musl.so.1"
-%configure --enable-debug --enable-wrapper=gcc
-%make_build
-
-%install
-%make_install
-mkdir -p %{buildroot}/lib/
-mv %{buildroot}%{_libdir}/libc.so %{buildroot}/lib/ld-musl.so.1
-ln -sr %{buildroot}/lib/ld-musl.so.1 %{buildroot}%{_libdir}/ld-musl.so.1
-ln -sr %{buildroot}%{_bindir}/musl-gcc %{buildroot}%{_bindir}/%{_musl_gcc_platform}
-ln -sr %{buildroot}%{_libdir}/ld-musl.so.1 %{buildroot}%{_libdir}/libc.so
-ln -sr %{buildroot}%{_libdir}/libc.so %{buildroot}%{_libdir}/libcrypt.so
-ln -sr %{buildroot}%{_libdir}/libc.so %{buildroot}%{_libdir}/libdl.so
-ln -sr %{buildroot}%{_libdir}/libc.so %{buildroot}%{_libdir}/libm.so
-ln -sr %{buildroot}%{_libdir}/libc.so %{buildroot}%{_libdir}/libpthread.so
-ln -sr %{buildroot}%{_libdir}/libc.so %{buildroot}%{_libdir}/libresolv.so
-ln -sr %{buildroot}%{_libdir}/libc.so %{buildroot}%{_libdir}/librt.so
-ln -sr %{buildroot}%{_libdir}/libc.so %{buildroot}%{_libdir}/libutil.so
-ln -sr %{buildroot}%{_libdir}/libc.so %{buildroot}%{_libdir}/libxnet.so
-ln -sr %{buildroot}%{_libdir}/libc.so %{buildroot}%{_libdir}/libc.so.6
-ln -sr %{buildroot}%{_libdir}/libc.so %{buildroot}%{_libdir}/libcrypt.so.1
-ln -sr %{buildroot}%{_libdir}/libc.so %{buildroot}%{_libdir}/libdl.so.2
-ln -sr %{buildroot}%{_libdir}/libc.so %{buildroot}%{_libdir}/libm.so.6
-ln -sr %{buildroot}%{_libdir}/libc.so %{buildroot}%{_libdir}/libpthread.so.0
-ln -sr %{buildroot}%{_libdir}/libc.so %{buildroot}%{_libdir}/libresolv.so.2
-ln -sr %{buildroot}%{_libdir}/libc.so %{buildroot}%{_libdir}/librt.so.1
-ln -sr %{buildroot}%{_libdir}/libc.so %{buildroot}%{_libdir}/libutil.so.1
-
-%files libc
-%license COPYRIGHT
-/lib/ld-musl.so.1
-%{_libdir}/*.so*
-
-%files devel
-%license COPYRIGHT
-%doc README WHATSNEW
-%{_includedir}/*
-%{_libdir}/*.so
-%{_libdir}/*.o
-%{_libdir}/*.a
-%exclude %{_libdir}/libc.a
-
-%files libc-static
-%license COPYRIGHT
-%{_libdir}/libc.a
-
-%files gcc
-%license COPYRIGHT
-%{_bindir}/musl-gcc
-%{_bindir}/%{_musl_gcc_platform}
-%{_libdir}/musl-gcc.specs
-
-%changelog
-* Tue Aug 19 2021 zhuyan <zhuyan34@huawei.com> - 1.2.0-3
-- fix CVE-2020-28928
-
-* Tue May 11 2021 Jiajie Li <lijiajie11@huawei.com> - 1.2.0-2
-- Add musl-gcc support
-
-* Fri Dec 4 2020 tangmeng5 <tangmeng5@huawei.com> - 1.2.0-1
-- package init

_service:tar_scm_kernel_repo:backport-rewrite-wcsnrtombs-to-fix-buffer-overflow.patch Deleted

@@ -1,112 +0,0 @@
-From 3ab2a4e02682df1382955071919d8aa3c3ec40d4 Mon Sep 17 00:00:00 2001
-From: Rich Felker <dalias@aerifal.cx>
-Date: Thu, 19 Nov 2020 17:12:43 -0500
-Subject: [PATCH] rewrite wcsnrtombs to fix buffer overflow and other bugs
-
-the original wcsnrtombs implementation, which has been largely
-untouched since 0.5.0, attempted to build input-length-limiting
-conversion on top of wcsrtombs, which only limits output length. as
-best I recall, this choice was made out of a mix of disdain over
-having yet another variant function to implement (added in POSIX 2008;
-not standard C) and preference not to switch things around and
-implement the wcsrtombs in terms of the more general new function,
-probably over namespace issues. the strategy employed was to impose
-output limits that would ensure the input limit wasn't exceeded, then
-finish up the tail character-at-a-time. unfortunately, none of that
-worked correctly.
-
-first, the logic in the wcsrtombs loop was wrong in that it could
-easily get stuck making no forward progress, by imposing an output
-limit too small to convert even one character.
-
-the character-at-a-time loop that followed was even worse. it made no
-effort to ensure that the converted multibyte character would fit in
-the remaining output space, only that there was a nonzero amount of
-output space remaining. it also employed an incorrect interpretation
-of wcrtomb's interface contract for converting the null character,
-thereby failing to act on end of input, and remaining space accounting
-was subject to unsigned wrap-around. together these errors allow
-unbounded overflow of the destination buffer, controlled by input
-length limit and input wchar_t string contents.
-
-given the extent to which this function was broken, it's plausible
-that most applications that would have been rendered exploitable were
-sufficiently broken not to be usable in the first place. however, it's
-also plausible that common (especially ASCII-only) inputs succeeded in
-the wcsrtombs loop, which mostly worked, while leaving the wildly
-erroneous code in the second loop exposed to particular non-ASCII
-inputs.
-
-CVE-2020-28928 has been assigned for this issue.
----
- src/multibyte/wcsnrtombs.c | 46 ++++++++++++++++----------------------
- 1 file changed, 19 insertions(+), 27 deletions(-)
-
-diff --git a/src/multibyte/wcsnrtombs.c b/src/multibyte/wcsnrtombs.c
-index 676932b5..95e25e70 100644
---- a/src/multibyte/wcsnrtombs.c
-+++ b/src/multibyte/wcsnrtombs.c
-@@ -1,41 +1,33 @@
- #include <wchar.h>
-+#include <limits.h>
-+#include <string.h>
- 
- size_t wcsnrtombs(char *restrict dst, const wchar_t **restrict wcs, size_t wn, size_t n, mbstate_t *restrict st)
- {
--	size_t l, cnt=0, n2;
--	char *s, buf[256];
- 	const wchar_t *ws = *wcs;
--	const wchar_t *tmp_ws;
--
--	if (!dst) s = buf, n = sizeof buf;
--	else s = dst;
--
--	while ( ws && n && ( (n2=wn)>=n || n2>32 ) ) {
--		if (n2>=n) n2=n;
--		tmp_ws = ws;
--		l = wcsrtombs(s, &ws, n2, 0);
--		if (!(l+1)) {
--			cnt = l;
--			n = 0;
-+	size_t cnt = 0;
-+	if (!dst) n=0;
-+	while (ws && wn) {
-+		char tmp[MB_LEN_MAX];
-+		size_t l = wcrtomb(n<MB_LEN_MAX ? tmp : dst, *ws, 0);
-+		if (l==-1) {
-+			cnt = -1;
- 			break;
- 		}
--		if (s != buf) {
--			s += l;
-+		if (dst) {
-+			if (n<MB_LEN_MAX) {
-+				if (l>n) break;
-+				memcpy(dst, tmp, l);
-+			}
-+			dst += l;
- 			n -= l;
- 		}
--		wn = ws ? wn - (ws - tmp_ws) : 0;
--		cnt += l;
--	}
--	if (ws) while (n && wn) {
--		l = wcrtomb(s, *ws, 0);
--		if ((l+1)<=1) {
--			if (!l) ws = 0;
--			else cnt = l;
-+		if (!*ws) {
-+			ws = 0;
- 			break;
- 		}
--		ws++; wn--;
--		/* safe - this loop runs fewer than sizeof(buf) times */
--		s+=l; n-=l;
-+		ws++;
-+		wn--;
- 		cnt += l;
- 	}
- 	if (dst) *wcs = ws;
--- 
-2.27.0
-

_service Changed

_service:extract_file:README.en.md Added

@@ -0,0 +1,36 @@
+# musl
+
+#### Description
+musl is an implementation of the C standard library built on top of the Linux system call API, including interfaces defined in the base language standard, POSIX, and widely agreed-upon extensions.
+
+#### Software Architecture
+Software architecture description
+
+#### Installation
+
+1.  xxxx
+2.  xxxx
+3.  xxxx
+
+#### Instructions
+
+1.  xxxx
+2.  xxxx
+3.  xxxx
+
+#### Contribution
+
+1.  Fork the repository
+2.  Create Feat_xxx branch
+3.  Commit your code
+4.  Create Pull Request
+
+
+#### Gitee Feature
+
+1.  You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md
+2.  Gitee blog [blog.gitee.com](https://blog.gitee.com)
+3.  Explore open source project [https://gitee.com/explore](https://gitee.com/explore)
+4.  The most valuable open source project [GVP](https://gitee.com/gvp)
+5.  The manual of Gitee [https://gitee.com/help](https://gitee.com/help)
+6.  The most popular members  [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)

_service:extract_file:README.md Added

_service:extract_file:musl-1.2.2.tar.gz Added

_service:tar_scm:musl-1632470610.18cbfd3.tar Added

_service:tar_scm_kernel_repo:README.en.md Deleted

@@ -1,36 +0,0 @@
-# musl
-
-#### Description
-musl is an implementation of the C standard library built on top of the Linux system call API, including interfaces defined in the base language standard, POSIX, and widely agreed-upon extensions.
-
-#### Software Architecture
-Software architecture description
-
-#### Installation
-
-1.  xxxx
-2.  xxxx
-3.  xxxx
-
-#### Instructions
-
-1.  xxxx
-2.  xxxx
-3.  xxxx
-
-#### Contribution
-
-1.  Fork the repository
-2.  Create Feat_xxx branch
-3.  Commit your code
-4.  Create Pull Request
-
-
-#### Gitee Feature
-
-1.  You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md
-2.  Gitee blog [blog.gitee.com](https://blog.gitee.com)
-3.  Explore open source project [https://gitee.com/explore](https://gitee.com/explore)
-4.  The most valuable open source project [GVP](https://gitee.com/gvp)
-5.  The manual of Gitee [https://gitee.com/help](https://gitee.com/help)
-6.  The most popular members  [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)

_service:tar_scm_kernel_repo:README.md Deleted

_service:tar_scm_kernel_repo:musl-1.2.0.tar.gz Deleted

Changes of Revision 2