packages/glibc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix libnsl.so and libnss_.so filelist process

Browse Source 
In current code, we use `/libnss_`, which is OK for now, while
if we build multiple times, such as for glibc-hwcaps, `grep` will
find multiple ones.

Let's use %{_lib}/libnss_ for them.

And libns.so.1 is listed twice:
  1st in libnsl.filelist
  2nd in %files -f libnsl.filelist -n libnsl
Let's remove the second one.

add changelog entry

fix changelog format

Revert "fix changelog format"

This reverts commit 4a31913d6701c97cb780e82e0b5ff2f7b58c7876.

Fix Release value

(cherry picked from commit dd00306ebd049be4345176bdebba4117795a4ee0)
This commit is contained in:
YunQiang Su 2024-08-12 15:11:40 +08:00 committed by openeuler-sync-bot
parent 2d5c68e0ab
commit b54a5f2790
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
glibc.spec
View File

@ -67,7 +67,7 @@
############################################################################## ##############################################################################
Name: glibc Name: glibc
Version: 2.38 Version: 2.38
Release: 35 Release: 36
Summary: The GNU libc libraries Summary: The GNU libc libraries
License: %{all_license} License: %{all_license}
URL: http://www.gnu.org/software/glibc/ URL: http://www.gnu.org/software/glibc/
@ -959,7 +959,7 @@ echo '%{_prefix}/sbin/nscd' > nscd.filelist
############################################################################## ##############################################################################
# nss modules sub-package # nss modules sub-package
############################################################################## ##############################################################################
grep -E "/libnss_(db|hesiod)(\.so\.[0-9.]+|-[0-9.]+\.so)$" \ grep -E "%{_lib}/libnss_(db|hesiod)(\.so\.[0-9.]+|-[0-9.]+\.so)$" \
master.filelist > nss_modules.filelist master.filelist > nss_modules.filelist
############################################################################## ##############################################################################
@ -971,7 +971,7 @@ grep '/libnss_[a-z]*\.so$' master.filelist > nss-devel.filelist
# libnsl subpackage # libnsl subpackage
############################################################################## ##############################################################################
%ifnarch loongarch64 %ifnarch loongarch64
grep -E '/libnsl\.so\.[0-9]+$' master.filelist > libnsl.filelist grep -E '%{_lib}/libnsl\.so\.[0-9]+$' master.filelist > libnsl.filelist
test $(wc -l < libnsl.filelist) -eq 1 test $(wc -l < libnsl.filelist) -eq 1
%endif %endif
@ -1424,7 +1424,6 @@ fi
%ifnarch loongarch64 %ifnarch loongarch64
%files -f libnsl.filelist -n libnsl %files -f libnsl.filelist -n libnsl
/%{_lib}/libnsl.so.1
%endif %endif
%files -f debugutils.filelist debugutils %files -f debugutils.filelist debugutils
@ -1447,6 +1446,9 @@ fi
%endif %endif
%changelog %changelog
* Tue Aug 27 2024 YunQiang Su <yunqiang@isrc.iscas.ac.cn> - 2.38-36
- Fix libnsl.so and libnss_.so filelist process (PR 877)
* Thu Aug 22 2024 Qingqing Li <liqingqing3@huawei.com> - 2.38-35 * Thu Aug 22 2024 Qingqing Li <liqingqing3@huawei.com> - 2.38-35
- x86: Fix bug in strchrnul-evex512 [BZ #32078] - x86: Fix bug in strchrnul-evex512 [BZ #32078]
@ -1474,14 +1476,14 @@ fi
- fix bug "info command cannot index the glibc help documentation" - fix bug "info command cannot index the glibc help documentation"
- add the install-info libc.info.gz step during the glibc-help installation process - add the install-info libc.info.gz step during the glibc-help installation process
* Wed Jun 5 Qingqing Li <liqingqing3@huawei.com> - 2.38-30 * Wed Jun 5 2024 Qingqing Li <liqingqing3@huawei.com> - 2.38-30
- misc: Add support for Linux uio.h RWF_NOAPPEND flag - misc: Add support for Linux uio.h RWF_NOAPPEND flag
- Disable Intel Xeon Phi tests for GCC 15 and above (BZ 31782) - Disable Intel Xeon Phi tests for GCC 15 and above (BZ 31782)
* Mon May 13 Qingqing Li <liqingqing3@huawei.com> - 2.38-29 * Mon May 13 2024 Qingqing Li <liqingqing3@huawei.com> - 2.38-29
- Force DT_RPATH for --enable-hardcoded-path-in-tests - Force DT_RPATH for --enable-hardcoded-path-in-tests
* Fri May 10 Qingqing Li <liqingqing3@huawei.com> - 2.38-28 * Fri May 10 2024 Qingqing Li <liqingqing3@huawei.com> - 2.38-28
- backport glibc upstream 2.38 branch, here is the 26 patches: - backport glibc upstream 2.38 branch, here is the 26 patches:
- resolv: Fix some unaligned accesses in resolver [BZ #30750] - resolv: Fix some unaligned accesses in resolver [BZ #30750]
- nscd: Use time_t for return type of addgetnetgrentX - nscd: Use time_t for return type of addgetnetgrentX