mirror of
https://github.com/Linux4Yourself/book.git
synced 2025-01-23 14:32:18 +08:00
Update
This commit is contained in:
parent
bdba5ecc06
commit
8d8a5ba6a0
@ -3,6 +3,12 @@
|
||||
|
||||
## Подготовка
|
||||
|
||||
Примените патч, исправляющий ошибку в chmod:
|
||||
|
||||
```bash
|
||||
patch -Np1 -i ../coreutils-9.0-chmod_fix-1.patch
|
||||
```
|
||||
|
||||
Примените необязательный патч для поддержки локализации:
|
||||
|
||||
```bash
|
||||
|
@ -11,6 +11,9 @@
|
||||
|
||||
## Обновление пакетов
|
||||
|
||||
- glibc 2.35
|
||||
- findutils 4.9.0
|
||||
- expat 2.4.4
|
||||
- make-ca 0.10
|
||||
- linux 5.16.2
|
||||
- p11-kit 0.24.1
|
||||
@ -30,6 +33,7 @@
|
||||
|
||||
## Изменения
|
||||
|
||||
- Добавлен патч для coreutils
|
||||
- Пакет `file` удален из временной системы, так как не требуется на данном этапе.
|
||||
- Чиска инструкций util-linux.
|
||||
- [Исправления пунктуации, мелкие дополнения и изменения по тексту руководства](https://github.com/Linux4Yourself/book/pull/1040)
|
||||
|
@ -16,16 +16,16 @@ d774f74c78afe1c6179b16cae8a420a5 e2fsprogs-1.46.5.tar.gz
|
||||
4c3d9ff35b2ab2fe518dc7eb3951e128 emacs-27.2.tar.xz
|
||||
2c095e31e35d6be7b3718477b6d52702 elfutils-0.186.tar.bz2
|
||||
417ba948335736d4d81874fba47a30f7 eudev-3.2.11.tar.gz
|
||||
b1137f030590b3f0c41c69c6cd68fa90 expat-2.4.3.tar.xz
|
||||
a712d23b7afb32e7527cf0b3fd8f12ac expat-2.4.4.tar.xz
|
||||
00fce8de158422f5ccd2666512329bd2 expect5.45.4.tar.gz
|
||||
18233bb0a0089dfdc7dfbc93b96f231b file-5.41.tar.gz
|
||||
eeefe2e6380931a77dfa6d9350b43186 findutils-4.8.0.tar.xz
|
||||
4a4a547e888a944b2f3af31d789a1137 findutils-4.9.0.tar.xz
|
||||
2882e3179748cc9f9c23ec593d6adc8d flex-2.6.4.tar.gz
|
||||
83650aa943ff2fd519b2abedf8506ace gawk-5.1.1.tar.xz
|
||||
31c86f2ced76acac66992eeedce2fce2 gcc-11.2.0.tar.xz
|
||||
0bbd38f12656e4728e2f7c4708aec014 gdbm-1.22.tar.gz
|
||||
40996bbaf7d1356d3c22e33a8b255b31 gettext-0.21.tar.xz
|
||||
31998b53fb39cb946e96abc310af1c89 glibc-2.34.tar.xz
|
||||
dd571c67d85d89d7f60b854a4e207423 glibc-2.35.tar.xz
|
||||
0b82665c4a92fd2ade7440c13fcaa42b gmp-6.2.1.tar.xz
|
||||
9e251c0a618ad0824b51117d5d9db87e gperf-3.1.tar.gz
|
||||
7c9cca97fa18670a21e72638c3e1dabf grep-3.7.tar.xz
|
||||
@ -45,7 +45,7 @@ f029087448357812fba450091a1172ab less-590.tar.gz
|
||||
294b921e6cf9ab0fbaea4b639f8fdbe8 libffi-3.4.2.tar.gz
|
||||
3e725c76bfea1985e87e851ee50c2e29 libpipeline-1.5.5.tar.gz
|
||||
1bfb9b923f2c1339b4d2ce1807064aa5 libtool-2.4.6.tar.xz
|
||||
121e4f65cf16ff76527020ea596fa431 linux-5.16.1.tar.xz
|
||||
fd00badc3b53d42da3d84a7cf6f53f17 linux-5.16.2.tar.xz
|
||||
0d90823e1426f1da2fd872df0311298d m4-1.4.19.tar.xz
|
||||
fc7a67ea86ace13195b0bce683fd4469 make-4.3.tar.gz
|
||||
6e233a555f7b9ae91ce7cd0faa322bce man-db-2.9.4.tar.xz
|
||||
@ -89,10 +89,11 @@ f931582653774e310ed3a7e49b7167a3 freetype-2.11.0.tar.xz
|
||||
49c8e457327dc61efab5b115a27b087a dosfstools-4.2.tar.gz
|
||||
6321d4c2b820394cf2392985d8f8c563 wget-1.21.2.tar.gz
|
||||
c46f6eb3bd1287031ae5d36465094402 libtasn1-4.17.0.tar.gz
|
||||
8ccf11c4a2e2e505b8e516d8549e64a5 p11-kit-0.24.0.tar.xz
|
||||
68c8625c9456815ed17e4f2219c79372 make-ca-1.9.tar.xz
|
||||
67b2539bdca6b4bedaeecc12864d2796 p11-kit-0.24.1.tar.xz
|
||||
74f1ad16d7a086ac76e0424fd4dfe67b make-ca-1.10.tar.xz
|
||||
b45d3bea4ddb7f64b6e56033ecc0fb11 bzip2-1.0.8-install_docs-1.patch
|
||||
e716728302e3ed1dfffb06050a68517c coreutils-9.0-i18n-1.patch
|
||||
4709df88e68279e6ef357aa819ba5b1a coreutils-9.0-chmod_fix-1.patch
|
||||
9a5997c3452909b1769918c759eff8a2 glibc-2.34-fhs-1.patch
|
||||
f75cca16a38da6caa7d52151f7136895 kbd-2.4.0-backspace-1.patch
|
||||
4900322141d493e74020c9cf437b2cdc sysvinit-2.99-consolidated-1.patch
|
||||
|
@ -475,14 +475,14 @@
|
||||
},
|
||||
{
|
||||
"name": "expat",
|
||||
"fileName": "expat-2.4.3.tar.xz",
|
||||
"fileName": "expat-2.4.4.tar.xz",
|
||||
"description": "Expat - потокоориентированная библиотека парсинга XML, написанная на C. Как один из наиболее доступных XML парсеров, широко используется в открытом программном обеспечении.",
|
||||
"url": "https://prdownloads.sourceforge.net/expat/expat-2.4.3.tar.xz",
|
||||
"url": "https://prdownloads.sourceforge.net/expat/expat-2.4.4.tar.xz",
|
||||
"homeUrl": "https://sourceforge.net/projects/expat",
|
||||
"version": "2.4.3",
|
||||
"version": "2.4.4",
|
||||
"releasesUrl": "https://sourceforge.net/projects/expat/files/expat/",
|
||||
"priority": "important",
|
||||
"md5": "b1137f030590b3f0c41c69c6cd68fa90",
|
||||
"md5": "a712d23b7afb32e7527cf0b3fd8f12ac",
|
||||
"size": "0.43",
|
||||
"installedSize": 0.3,
|
||||
"sbu": 0,
|
||||
@ -499,7 +499,7 @@
|
||||
"test"
|
||||
],
|
||||
"multilibSupport": false,
|
||||
"downloadUrl": "https://lx4u.ru/downloads/packages/expat-2.4.3.tar.xz"
|
||||
"downloadUrl": "https://lx4u.ru/downloads/packages/expat-2.4.4.tar.xz"
|
||||
},
|
||||
{
|
||||
"name": "expect",
|
||||
@ -549,15 +549,15 @@
|
||||
},
|
||||
{
|
||||
"name": "findutils",
|
||||
"fileName": "findutils-4.8.0.tar.xz",
|
||||
"fileName": "findutils-4.9.0.tar.xz",
|
||||
"description": "Пакет содержит программы для поиска файлов. Программы предоставляют способы для рекурсивного поиска файлов по дереву каталогов, создания, обслуживания и поиска в базе данных (как правило, поиск выполняется быстрее, чем рекурсивный поиск, но менее надёжен, если база данных не в актуальном состоянии).",
|
||||
"url": "https://ftp.gnu.org/gnu/findutils/findutils-4.8.0.tar.xz",
|
||||
"url": "https://ftp.gnu.org/gnu/findutils/findutils-4.9.0.tar.xz",
|
||||
"homeUrl": "https://gnu.org/software/findutils",
|
||||
"version": "4.8.0",
|
||||
"version": "4.9.0",
|
||||
"releasesUrl": "https://ftp.gnu.org/gnu/findutils",
|
||||
"priority": "required",
|
||||
"md5": "eeefe2e6380931a77dfa6d9350b43186",
|
||||
"size": "1.89",
|
||||
"md5": "4a4a547e888a944b2f3af31d789a1137",
|
||||
"size": "1.95",
|
||||
"installedSize": 0.68,
|
||||
"sbu": 0.3,
|
||||
"sbu2": 0.3,
|
||||
@ -569,7 +569,7 @@
|
||||
"test"
|
||||
],
|
||||
"multilibSupport": false,
|
||||
"downloadUrl": "https://lx4u.ru/downloads/packages/findutils-4.8.0.tar.xz"
|
||||
"downloadUrl": "https://lx4u.ru/downloads/packages/findutils-4.9.0.tar.xz"
|
||||
},
|
||||
{
|
||||
"name": "flex",
|
||||
@ -694,15 +694,15 @@
|
||||
},
|
||||
{
|
||||
"name": "glibc",
|
||||
"fileName": "glibc-2.34.tar.xz",
|
||||
"fileName": "glibc-2.35.tar.xz",
|
||||
"description": "Пакет содержит стандартную библиотеку языка Си (GNU C Library). Эта библиотека предоставляет функции для выделения памяти, поиска каталогов, открытия и закрытия файлов, чтения и записи файлов, обработки строк, соответствия шаблонов (pattern matching), арифметических операций, и т.д.",
|
||||
"url": "https://ftp.gnu.org/gnu/glibc/glibc-2.34.tar.xz",
|
||||
"url": "https://ftp.gnu.org/gnu/glibc/glibc-2.35.tar.xz",
|
||||
"homeUrl": "https://gnu.org/software/glibc",
|
||||
"version": "2.34",
|
||||
"version": "2.35",
|
||||
"releasesUrl": "https://ftp.gnu.org/gnu/glibc/",
|
||||
"priority": "required",
|
||||
"md5": "31998b53fb39cb946e96abc310af1c89",
|
||||
"size": "16.50",
|
||||
"md5": "dd571c67d85d89d7f60b854a4e207423",
|
||||
"size": "17.32",
|
||||
"installedSize": 43,
|
||||
"sbu": 5.4,
|
||||
"sbu2": 4.2,
|
||||
@ -725,7 +725,7 @@
|
||||
"test"
|
||||
],
|
||||
"multilibSupport": false,
|
||||
"downloadUrl": "https://lx4u.ru/downloads/packages/glibc-2.34.tar.xz"
|
||||
"downloadUrl": "https://lx4u.ru/downloads/packages/glibc-2.35.tar.xz"
|
||||
},
|
||||
{
|
||||
"name": "gmp",
|
||||
@ -1201,8 +1201,8 @@
|
||||
"version": "5.16.2",
|
||||
"releasesUrl": "https://www.kernel.org",
|
||||
"priority": "required",
|
||||
"md5": "121e4f65cf16ff76527020ea596fa431",
|
||||
"size": "121.61",
|
||||
"md5": "fd00badc3b53d42da3d84a7cf6f53f17",
|
||||
"size": "121.62",
|
||||
"installedSize": 0,
|
||||
"sbu": 0,
|
||||
"sbu2": 4.4,
|
||||
@ -2265,7 +2265,7 @@
|
||||
"homeUrl": "https://github.com/p11-glue/p11-kit/",
|
||||
"version": "0.24.1",
|
||||
"priority": "optional",
|
||||
"md5": "8ccf11c4a2e2e505b8e516d8549e64a5",
|
||||
"md5": "67b2539bdca6b4bedaeecc12864d2796",
|
||||
"size": "0.80",
|
||||
"installedSize": "0",
|
||||
"sbu": "0",
|
||||
@ -2293,7 +2293,7 @@
|
||||
"homeUrl": "https://github.com/lfs-book/make-ca/",
|
||||
"version": "1.10",
|
||||
"priority": "optional",
|
||||
"md5": "68c8625c9456815ed17e4f2219c79372",
|
||||
"md5": "74f1ad16d7a086ac76e0424fd4dfe67b",
|
||||
"size": "0.03",
|
||||
"installedSize": "0",
|
||||
"sbu": "0",
|
||||
@ -2342,6 +2342,24 @@
|
||||
"multilibSupport": false,
|
||||
"scripts": []
|
||||
},
|
||||
{
|
||||
"name": "coreutils-patch",
|
||||
"fileName": "coreutils-9.0-chmod_fix-1.patch",
|
||||
"description": "",
|
||||
"url": "https://raw.githubusercontent.com/Linux4Yourself/book/develop/docs/patches/coreutils-9.0-chmod_fix-1.patch",
|
||||
"homeUrl": "",
|
||||
"version": "9.0-chmod_fix-1",
|
||||
"releasesUrl": "",
|
||||
"priority": "required",
|
||||
"md5": "4709df88e68279e6ef357aa819ba5b1a",
|
||||
"size": "0.00",
|
||||
"installedSize": 0,
|
||||
"sbu": 0,
|
||||
"sbu2": 0,
|
||||
"downloadUrl": "https://lx4u.ru/downloads/packages/coreutils-9.0-chmod_fix-1.patch",
|
||||
"multilibSupport": false,
|
||||
"scripts": []
|
||||
},
|
||||
{
|
||||
"name": "glibc-patch",
|
||||
"fileName": "glibc-2.34-fhs-1.patch",
|
||||
|
@ -16,16 +16,16 @@ e2fsprogs-1.46.5.tar.gz
|
||||
emacs-27.2.tar.xz
|
||||
elfutils-0.186.tar.bz2
|
||||
eudev-3.2.11.tar.gz
|
||||
expat-2.4.3.tar.xz
|
||||
expat-2.4.4.tar.xz
|
||||
expect5.45.4.tar.gz
|
||||
file-5.41.tar.gz
|
||||
findutils-4.8.0.tar.xz
|
||||
findutils-4.9.0.tar.xz
|
||||
flex-2.6.4.tar.gz
|
||||
gawk-5.1.1.tar.xz
|
||||
gcc-11.2.0.tar.xz
|
||||
gdbm-1.22.tar.gz
|
||||
gettext-0.21.tar.xz
|
||||
glibc-2.34.tar.xz
|
||||
glibc-2.35.tar.xz
|
||||
gmp-6.2.1.tar.xz
|
||||
gperf-3.1.tar.gz
|
||||
grep-3.7.tar.xz
|
||||
@ -45,7 +45,7 @@ libcap-2.62.tar.xz
|
||||
libffi-3.4.2.tar.gz
|
||||
libpipeline-1.5.5.tar.gz
|
||||
libtool-2.4.6.tar.xz
|
||||
linux-5.16.1.tar.xz
|
||||
linux-5.16.2.tar.xz
|
||||
m4-1.4.19.tar.xz
|
||||
make-4.3.tar.gz
|
||||
man-db-2.9.4.tar.xz
|
||||
@ -89,10 +89,11 @@ efibootmgr-17.tar.gz
|
||||
dosfstools-4.2.tar.gz
|
||||
wget-1.21.2.tar.gz
|
||||
libtasn1-4.17.0.tar.gz
|
||||
p11-kit-0.24.0.tar.xz
|
||||
make-ca-1.9.tar.xz
|
||||
p11-kit-0.24.1.tar.xz
|
||||
make-ca-1.10.tar.xz
|
||||
bzip2-1.0.8-install_docs-1.patch
|
||||
coreutils-9.0-i18n-1.patch
|
||||
coreutils-9.0-chmod_fix-1.patch
|
||||
glibc-2.34-fhs-1.patch
|
||||
kbd-2.4.0-backspace-1.patch
|
||||
sysvinit-2.99-consolidated-1.patch
|
||||
|
@ -16,16 +16,16 @@ https://lx4u.ru/downloads/packages/e2fsprogs-1.46.5.tar.gz
|
||||
https://lx4u.ru/downloads/packages/emacs-27.2.tar.xz
|
||||
https://lx4u.ru/downloads/packages/elfutils-0.186.tar.bz2
|
||||
https://lx4u.ru/downloads/packages/eudev-3.2.11.tar.gz
|
||||
https://lx4u.ru/downloads/packages/expat-2.4.3.tar.xz
|
||||
https://lx4u.ru/downloads/packages/expat-2.4.4.tar.xz
|
||||
https://lx4u.ru/downloads/packages/expect5.45.4.tar.gz
|
||||
https://lx4u.ru/downloads/packages/file-5.41.tar.gz
|
||||
https://lx4u.ru/downloads/packages/findutils-4.8.0.tar.xz
|
||||
https://lx4u.ru/downloads/packages/findutils-4.9.0.tar.xz
|
||||
https://lx4u.ru/downloads/packages/flex-2.6.4.tar.gz
|
||||
https://lx4u.ru/downloads/packages/gawk-5.1.1.tar.xz
|
||||
https://lx4u.ru/downloads/packages/gcc-11.2.0.tar.xz
|
||||
https://lx4u.ru/downloads/packages/gdbm-1.22.tar.gz
|
||||
https://lx4u.ru/downloads/packages/gettext-0.21.tar.xz
|
||||
https://lx4u.ru/downloads/packages/glibc-2.34.tar.xz
|
||||
https://lx4u.ru/downloads/packages/glibc-2.35.tar.xz
|
||||
https://lx4u.ru/downloads/packages/gmp-6.2.1.tar.xz
|
||||
https://lx4u.ru/downloads/packages/gperf-3.1.tar.gz
|
||||
https://lx4u.ru/downloads/packages/grep-3.7.tar.xz
|
||||
@ -45,7 +45,7 @@ https://lx4u.ru/downloads/packages/libcap-2.62.tar.xz
|
||||
https://lx4u.ru/downloads/packages/libffi-3.4.2.tar.gz
|
||||
https://lx4u.ru/downloads/packages/libpipeline-1.5.5.tar.gz
|
||||
https://lx4u.ru/downloads/packages/libtool-2.4.6.tar.xz
|
||||
https://lx4u.ru/downloads/packages/linux-5.16.1.tar.xz
|
||||
https://lx4u.ru/downloads/packages/linux-5.16.2.tar.xz
|
||||
https://lx4u.ru/downloads/packages/m4-1.4.19.tar.xz
|
||||
https://lx4u.ru/downloads/packages/make-4.3.tar.gz
|
||||
https://lx4u.ru/downloads/packages/man-db-2.9.4.tar.xz
|
||||
@ -89,10 +89,11 @@ https://lx4u.ru/downloads/packages/efibootmgr-17.tar.gz
|
||||
https://lx4u.ru/downloads/packages/dosfstools-4.2.tar.gz
|
||||
https://lx4u.ru/downloads/packages/wget-1.21.2.tar.gz
|
||||
https://lx4u.ru/downloads/packages/libtasn1-4.17.0.tar.gz
|
||||
https://lx4u.ru/downloads/packages/p11-kit-0.24.0.tar.xz
|
||||
https://lx4u.ru/downloads/packages/make-ca-1.9.tar.xz
|
||||
https://lx4u.ru/downloads/packages/p11-kit-0.24.1.tar.xz
|
||||
https://lx4u.ru/downloads/packages/make-ca-1.10.tar.xz
|
||||
https://lx4u.ru/downloads/packages/bzip2-1.0.8-install_docs-1.patch
|
||||
https://lx4u.ru/downloads/packages/coreutils-9.0-i18n-1.patch
|
||||
https://lx4u.ru/downloads/packages/coreutils-9.0-chmod_fix-1.patch
|
||||
https://lx4u.ru/downloads/packages/glibc-2.34-fhs-1.patch
|
||||
https://lx4u.ru/downloads/packages/kbd-2.4.0-backspace-1.patch
|
||||
https://lx4u.ru/downloads/packages/sysvinit-2.99-consolidated-1.patch
|
||||
|
@ -16,16 +16,16 @@ https://mirrors.edge.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.46.5/
|
||||
https://ftp.gnu.org/gnu/emacs/emacs-27.2.tar.xz
|
||||
https://sourceware.org/ftp/elfutils/0.186/elfutils-0.186.tar.bz2
|
||||
https://github.com/eudev-project/eudev/releases/download/v3.2.11/eudev-3.2.11.tar.gz
|
||||
https://prdownloads.sourceforge.net/expat/expat-2.4.3.tar.xz
|
||||
https://prdownloads.sourceforge.net/expat/expat-2.4.4.tar.xz
|
||||
https://prdownloads.sourceforge.net/expect/expect5.45.4.tar.gz
|
||||
https://astron.com/pub/file/file-5.41.tar.gz
|
||||
https://ftp.gnu.org/gnu/findutils/findutils-4.8.0.tar.xz
|
||||
https://ftp.gnu.org/gnu/findutils/findutils-4.9.0.tar.xz
|
||||
https://github.com/westes/flex/releases/download/v2.6.4/flex-2.6.4.tar.gz
|
||||
https://ftp.gnu.org/gnu/gawk/gawk-5.1.1.tar.xz
|
||||
https://ftp.gnu.org/gnu/gcc/gcc-11.2.0/gcc-11.2.0.tar.xz
|
||||
https://ftp.gnu.org/gnu/gdbm/gdbm-1.22.tar.gz
|
||||
https://ftp.gnu.org/gnu/gettext/gettext-0.21.tar.xz
|
||||
https://ftp.gnu.org/gnu/glibc/glibc-2.34.tar.xz
|
||||
https://ftp.gnu.org/gnu/glibc/glibc-2.35.tar.xz
|
||||
https://ftp.gnu.org/gnu/gmp/gmp-6.2.1.tar.xz
|
||||
https://ftp.gnu.org/gnu/gperf/gperf-3.1.tar.gz
|
||||
https://ftp.gnu.org/gnu/grep/grep-3.7.tar.xz
|
||||
@ -45,7 +45,7 @@ https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-2.62.t
|
||||
https://github.com/libffi/libffi/releases/download/v3.4.2/libffi-3.4.2.tar.gz
|
||||
https://download.savannah.gnu.org/releases/libpipeline/libpipeline-1.5.5.tar.gz
|
||||
https://ftp.gnu.org/gnu/libtool/libtool-2.4.6.tar.xz
|
||||
https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.16.1.tar.xz
|
||||
https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.16.2.tar.xz
|
||||
https://ftp.gnu.org/gnu/m4/m4-1.4.19.tar.xz
|
||||
https://ftp.gnu.org/gnu/make/make-4.3.tar.gz
|
||||
https://download.savannah.gnu.org/releases/man-db/man-db-2.9.4.tar.xz
|
||||
@ -89,10 +89,11 @@ https://github.com/rhboot/efibootmgr/archive/17/efibootmgr-17.tar.gz
|
||||
https://github.com/dosfstools/dosfstools/releases/download/v4.2/dosfstools-4.2.tar.gz
|
||||
https://ftp.gnu.org/gnu/wget/wget-1.21.2.tar.gz
|
||||
https://ftp.gnu.org/gnu/libtasn1/libtasn1-4.17.0.tar.gz
|
||||
https://github.com/p11-glue/p11-kit/releases/download/0.24.0/p11-kit-0.24.0.tar.xz
|
||||
https://github.com/lfs-book/make-ca/releases/download/v1.9/make-ca-1.9.tar.xz
|
||||
https://github.com/p11-glue/p11-kit/releases/download/0.24.1/p11-kit-0.24.1.tar.xz
|
||||
https://github.com/lfs-book/make-ca/releases/download/v1.10/make-ca-1.10.tar.xz
|
||||
https://raw.githubusercontent.com/Linux4Yourself/book/develop/docs/patches/bzip2-1.0.8-install_docs-1.patch
|
||||
https://raw.githubusercontent.com/Linux4Yourself/book/develop/docs/patches/coreutils-9.0-i18n-1.patch
|
||||
https://raw.githubusercontent.com/Linux4Yourself/book/develop/docs/patches/coreutils-9.0-chmod_fix-1.patch
|
||||
https://raw.githubusercontent.com/Linux4Yourself/book/develop/docs/patches/glibc-2.34-fhs-1.patch
|
||||
https://raw.githubusercontent.com/Linux4Yourself/book/develop/docs/patches/kbd-2.4.0-backspace-1.patch
|
||||
https://raw.githubusercontent.com/Linux4Yourself/book/develop/docs/patches/sysvinit-2.99-consolidated-1.patch
|
||||
|
118
docs/patches/coreutils-9.0-chmod_fix-1.patch
Normal file
118
docs/patches/coreutils-9.0-chmod_fix-1.patch
Normal file
@ -0,0 +1,118 @@
|
||||
Submitted by: Xi Ruoyao <xry111@mengyan1223.wang>
|
||||
Date: 2022-01-28
|
||||
Initial Package Version: 9.0
|
||||
Upstream Status: Applied
|
||||
Origin: Upstream git repository (sha: e8b56ebd5)
|
||||
Description: Fixes an issue in chmod breaking glibc-2.35 test
|
||||
|
||||
From e8b56ebd536e82b15542a00c888109471936bfda Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com>
|
||||
Date: Fri, 24 Sep 2021 20:57:41 +0100
|
||||
Subject: chmod: fix exit status when ignoring symlinks
|
||||
|
||||
* src/chmod.c: Reorder enum so CH_NOT_APPLIED
|
||||
can be treated as a non error.
|
||||
* tests/chmod/ignore-symlink.sh: A new test.
|
||||
* tests/local.mk: Reference the new test.
|
||||
* NEWS: Mention the bug fix.
|
||||
Fixes https://bugs.gnu.org/50784
|
||||
---
|
||||
NEWS | 6 ++++++
|
||||
src/chmod.c | 4 ++--
|
||||
tests/chmod/ignore-symlink.sh | 31 +++++++++++++++++++++++++++++++
|
||||
tests/local.mk | 1 +
|
||||
4 files changed, 40 insertions(+), 2 deletions(-)
|
||||
create mode 100755 tests/chmod/ignore-symlink.sh
|
||||
|
||||
diff --git a/NEWS b/NEWS
|
||||
index a1470a7..1cb3c28 100644
|
||||
--- a/NEWS
|
||||
+++ b/NEWS
|
||||
@@ -2,6 +2,12 @@ GNU coreutils NEWS -*- outline -*-
|
||||
|
||||
* Noteworthy changes in release ?.? (????-??-??) [?]
|
||||
|
||||
+** Bug fixes
|
||||
+
|
||||
+ chmod -R no longer exits with error status when encountering symlinks.
|
||||
+ All files would be processed correctly, but the exit status was incorrect.
|
||||
+ [bug introduced in coreutils-9.0]
|
||||
+
|
||||
|
||||
* Noteworthy changes in release 9.0 (2021-09-24) [stable]
|
||||
|
||||
diff --git a/src/chmod.c b/src/chmod.c
|
||||
index 37b04f5..57ac47f 100644
|
||||
--- a/src/chmod.c
|
||||
+++ b/src/chmod.c
|
||||
@@ -44,8 +44,8 @@ struct change_status
|
||||
enum
|
||||
{
|
||||
CH_NO_STAT,
|
||||
- CH_NOT_APPLIED,
|
||||
CH_FAILED,
|
||||
+ CH_NOT_APPLIED,
|
||||
CH_NO_CHANGE_REQUESTED,
|
||||
CH_SUCCEEDED
|
||||
}
|
||||
@@ -322,7 +322,7 @@ process_file (FTS *fts, FTSENT *ent)
|
||||
if ( ! recurse)
|
||||
fts_set (fts, ent, FTS_SKIP);
|
||||
|
||||
- return CH_NO_CHANGE_REQUESTED <= ch.status;
|
||||
+ return CH_NOT_APPLIED <= ch.status;
|
||||
}
|
||||
|
||||
/* Recursively change the modes of the specified FILES (the last entry
|
||||
diff --git a/tests/chmod/ignore-symlink.sh b/tests/chmod/ignore-symlink.sh
|
||||
new file mode 100755
|
||||
index 0000000..5ce3de8
|
||||
--- /dev/null
|
||||
+++ b/tests/chmod/ignore-symlink.sh
|
||||
@@ -0,0 +1,31 @@
|
||||
+#!/bin/sh
|
||||
+# Test for proper exit code of chmod on a processed symlink.
|
||||
+
|
||||
+# Copyright (C) 2021 Free Software Foundation, Inc.
|
||||
+
|
||||
+# This program is free software: you can redistribute it and/or modify
|
||||
+# it under the terms of the GNU General Public License as published by
|
||||
+# the Free Software Foundation, either version 3 of the License, or
|
||||
+# (at your option) any later version.
|
||||
+
|
||||
+# This program is distributed in the hope that it will be useful,
|
||||
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
+# GNU General Public License for more details.
|
||||
+
|
||||
+# You should have received a copy of the GNU General Public License
|
||||
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
+
|
||||
+. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
|
||||
+print_ver_ chmod
|
||||
+
|
||||
+mkdir dir || framework_failure_
|
||||
+touch dir/f || framework_failure_
|
||||
+ln -s f dir/l || framework_failure_
|
||||
+
|
||||
+# This operation ignores symlinks but should succeed.
|
||||
+chmod u+w -R dir 2> out || fail=1
|
||||
+
|
||||
+compare /dev/null out || fail=1
|
||||
+
|
||||
+Exit $fail
|
||||
diff --git a/tests/local.mk b/tests/local.mk
|
||||
index 228d0e3..b5b893f 100644
|
||||
--- a/tests/local.mk
|
||||
+++ b/tests/local.mk
|
||||
@@ -456,6 +456,7 @@ all_tests = \
|
||||
tests/chmod/c-option.sh \
|
||||
tests/chmod/equal-x.sh \
|
||||
tests/chmod/equals.sh \
|
||||
+ tests/chmod/ignore-symlink.sh \
|
||||
tests/chmod/inaccessible.sh \
|
||||
tests/chmod/octal.sh \
|
||||
tests/chmod/setgid.sh \
|
||||
--
|
||||
cgit v1.1
|
||||
|
Loading…
Reference in New Issue
Block a user