diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index c272fba..e858967 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -39,6 +39,56 @@
appropriate for the entry or if needed the entire day's listitem.
-->
+
+ 2023-12-31
+
+
+ [xry111] - Fix CVE-2023-7008 for systemd-255. Fixes
+ #5405.
+
+
+ [xry111] - Update to iana-etc-20231205. Addresses
+ #5006.
+
+
+ [xry111] - Update to tzdata-2023d. Fixes
+ #5399.
+
+
+ [xry111] - Update to linux-6.6.8. Fixes
+ #5397.
+
+
+ [xry111] - Update to meson-1.3.1. Fixes
+ #5402.
+
+
+ [xry111] - Update to grub-2.12. Fixes
+ #5396.
+
+
+ [xry111] - Update to inetutils-2.5. Fixes
+ #5404.
+
+
+ [xry111] - Update to setuptools-69.0.3. Fixes
+ #5400.
+
+
+ [xry111] - Update to xml-parser-2.47. Fixes
+ #5403.
+
+
+ [xry111] - Update to vim-9.0.2189. Addresses
+ #4500.
+
+
+ [xry111] - Update to autoconf-2.72. Fixes
+ #5398.
+
+
+
+
2023-12-16
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 8e1bef4..6bbf2d3 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -31,9 +31,9 @@
-
+
@@ -115,18 +115,18 @@
-
+
Gzip-&gzip-version;
Iana-Etc-&iana-etc-version;
-
+
@@ -247,9 +247,9 @@
Texinfo-&texinfo-version;
-
+
@@ -262,9 +262,9 @@
wheel-&wheel-version;
-
+
Xz-&xz-version;
@@ -296,8 +296,11 @@
&glibc-upstream-fixes-patch;
-
+
+ &readline-fixes-patch;
+
+
Удалены:
@@ -306,6 +309,10 @@
glibc-2.38-memalign_fix-1.patch
+
+ grub-2.06-upstream_fixes-1.patch
+
+
readline-8.2-upstream_fix-1.patch
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index ed378e7..30f1889 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -92,14 +92,6 @@
-
- GRUB Upstream Fixes Patch - &grub-upstream-fixes-patch-size;:
-
- Ссылка на загрузку:
- Контрольная сумма MD5: &grub-upstream-fixes-patch-md5;
-
-
-
Kbd Backspace/Delete Fix Patch - &kbd-backspace-patch-size;:
diff --git a/chapter08/autoconf.xml b/chapter08/autoconf.xml
index fe22ab3..78bc507 100644
--- a/chapter08/autoconf.xml
+++ b/chapter08/autoconf.xml
@@ -41,13 +41,6 @@
Установка пакета Autoconf
- Во-первых, исправьте несколько проблем с тестами, обнаруженными в bash-5.2
- и более поздних версиях:
-
- sed -e 's/SECONDS|/&SHLVL|/' \
- -e '/BASH_ARGV=/a\ /^SHLVL=/ d' \
- -i.orig tests/local.at
-
Подготовьте Autoconf к компиляции:
./configure --prefix=/usr
diff --git a/chapter08/grub.xml b/chapter08/grub.xml
index c926615..d96db3e 100644
--- a/chapter08/grub.xml
+++ b/chapter08/grub.xml
@@ -60,13 +60,10 @@
- Устранена проблема, приводившая к сбою grub-install, когда раздел
- /boot (или корневой раздел, если
- /boot не является отдельным разделом) создается
- e2fsprogs-1.47.0 или более поздней версии:
+ Добавьте файл, отсутствующий в архиве релиза:
-patch -Np1 -i ../grub-&grub-version;-upstream_fixes-1.patch
+echo depends bli part_gpt > grub-core/extra_deps.lst
Подготовьте GRUB к компиляции:
diff --git a/chapter08/systemd.xml b/chapter08/systemd.xml
index 06e7290..89f4761 100644
--- a/chapter08/systemd.xml
+++ b/chapter08/systemd.xml
@@ -46,6 +46,13 @@
sed -i -e 's/GROUP="render"/GROUP="video"/' \
-e 's/GROUP="sgx", //' rules.d/50-udev-default.rules.in
+
+ Теперь исправьте уязвимость безопасности при проверке DNSSEC в
+ systemd-resolved:
+
+sed -e '/return FLAGS_SET.*AUTHENTICATED/s/(t/(dt/' \
+ -i src/resolve/resolved-dns-transaction.c
+
Подготовьте systemd к компиляции:
mkdir -p build
diff --git a/gen-changelog.py b/gen-changelog.py
index e7ee1d7..3bf6bc0 100644
--- a/gen-changelog.py
+++ b/gen-changelog.py
@@ -76,6 +76,8 @@ for i in tsv:
security.add(pkg)
ticket[pkg] = tic
+hold_ticket = {'vim': '4500', 'iana-etc': '5006'}
+
print("Plain Text:")
for (s, act) in [(upd, "Update to "), (add, "Add ")]:
for i in s:
@@ -83,6 +85,8 @@ for (s, act) in [(upd, "Update to "), (add, "Add ")]:
out = act + pkgver
if pkgver in ticket:
out += ' (#' + ticket[pkgver] + ')'
+ elif i in hold_ticket:
+ out += ' (#' + hold_ticket[i] + ')'
print("-", out)
for i in rem:
print("-", "Remove", i)
@@ -99,10 +103,18 @@ for (s, act) in [(upd, "Update to "), (add, "Add ")]:
if pkgver in security:
out += " (security fix)"
out += "."
+
+ pkg_ticket = None
if pkgver in ticket:
out += " Fixes\n "
- out += "#"
- out += ticket[pkgver] + "."
+ pkg_ticket = ticket[pkgver]
+ elif i in hold_ticket:
+ out += " Addresses\n "
+ pkg_ticket = hold_ticket[i]
+
+ if pkg_ticket:
+ out += "#"
+ out += pkg_ticket + "."
out += ""
print(out)
print(' ')
diff --git a/packages.ent b/packages.ent
index 3307e32..8411a44 100644
--- a/packages.ent
+++ b/packages.ent
@@ -29,10 +29,10 @@
-
-
+
+
-
+
@@ -299,10 +299,10 @@
-
-
+
+
-
+
@@ -317,18 +317,18 @@
-
-
+
+
-
+
-
-
+
+
-
+
@@ -431,12 +431,12 @@
-
+
-
+
-
+
-
+
-
+
@@ -754,10 +754,10 @@
-
-
+
+
-
+
diff --git a/patches.ent b/patches.ent
index 814ad2d..1bcd45d 100644
--- a/patches.ent
+++ b/patches.ent
@@ -18,10 +18,6 @@
-
-
-
-