Fri Nov 25 20:37:16 UTC 2022

a/btrfs-progs-6.0.2-x86_64-1.txz:  Upgraded.
l/glib2-2.74.2-x86_64-1.txz:  Upgraded.
x/fcitx5-gtk-5.0.21-x86_64-1.txz:  Upgraded.
This commit is contained in:
Patrick J Volkerding 2022-11-25 20:37:16 +00:00 committed by Eric Hameleers
parent a8f1aa5a10
commit b0246e0205
6 changed files with 62 additions and 179 deletions

View file

@ -11,9 +11,22 @@
<description>Tracking Slackware development in git.</description>
<language>en-us</language>
<id xmlns="http://www.w3.org/2005/Atom">urn:uuid:c964f45e-6732-11e8-bbe5-107b4450212f</id>
<pubDate>Thu, 24 Nov 2022 20:55:37 GMT</pubDate>
<lastBuildDate>Fri, 25 Nov 2022 06:00:35 GMT</lastBuildDate>
<pubDate>Fri, 25 Nov 2022 20:37:16 GMT</pubDate>
<lastBuildDate>Sat, 26 Nov 2022 06:00:10 GMT</lastBuildDate>
<generator>maintain_current_git.sh v 1.17</generator>
<item>
<title>Fri, 25 Nov 2022 20:37:16 GMT</title>
<pubDate>Fri, 25 Nov 2022 20:37:16 GMT</pubDate>
<link>https://git.slackware.nl/current/tag/?h=20221125203716</link>
<guid isPermaLink="false">20221125203716</guid>
<description>
<![CDATA[<pre>
a/btrfs-progs-6.0.2-x86_64-1.txz: Upgraded.
l/glib2-2.74.2-x86_64-1.txz: Upgraded.
x/fcitx5-gtk-5.0.21-x86_64-1.txz: Upgraded.
</pre>]]>
</description>
</item>
<item>
<title>Thu, 24 Nov 2022 20:55:37 GMT</title>
<pubDate>Thu, 24 Nov 2022 20:55:37 GMT</pubDate>

View file

@ -1,3 +1,8 @@
Fri Nov 25 20:37:16 UTC 2022
a/btrfs-progs-6.0.2-x86_64-1.txz: Upgraded.
l/glib2-2.74.2-x86_64-1.txz: Upgraded.
x/fcitx5-gtk-5.0.21-x86_64-1.txz: Upgraded.
+--------------------------+
Thu Nov 24 20:55:37 UTC 2022
a/bash-5.2.012-x86_64-1.txz: Upgraded.
a/less-612-x86_64-1.txz: Upgraded.

View file

@ -1,20 +1,20 @@
Thu Nov 24 20:59:41 UTC 2022
Fri Nov 25 20:40:18 UTC 2022
Here is the file list for this directory. If you are using a
mirror site and find missing or extra files in the disk
subdirectories, please have the archive administrator refresh
the mirror.
drwxr-xr-x 12 root root 4096 2022-11-24 20:55 .
drwxr-xr-x 12 root root 4096 2022-11-25 20:37 .
-rw-r--r-- 1 root root 5767 2022-02-02 22:44 ./ANNOUNCE.15.0
-rw-r--r-- 1 root root 16617 2022-02-02 23:27 ./CHANGES_AND_HINTS.TXT
-rw-r--r-- 1 root root 1104860 2022-11-23 19:55 ./CHECKSUMS.md5
-rw-r--r-- 1 root root 163 2022-11-23 19:55 ./CHECKSUMS.md5.asc
-rw-r--r-- 1 root root 1105336 2022-11-24 20:59 ./CHECKSUMS.md5
-rw-r--r-- 1 root root 163 2022-11-24 20:59 ./CHECKSUMS.md5.asc
-rw-r--r-- 1 root root 17976 1994-06-10 02:28 ./COPYING
-rw-r--r-- 1 root root 35147 2007-06-30 04:21 ./COPYING3
-rw-r--r-- 1 root root 19573 2016-06-23 20:08 ./COPYRIGHT.TXT
-rw-r--r-- 1 root root 616 2006-10-02 04:37 ./CRYPTO_NOTICE.TXT
-rw-r--r-- 1 root root 396038 2022-11-24 20:55 ./ChangeLog.txt
-rw-r--r-- 1 root root 396226 2022-11-25 20:37 ./ChangeLog.txt
drwxr-xr-x 3 root root 4096 2013-03-20 22:17 ./EFI
drwxr-xr-x 2 root root 4096 2022-10-24 18:57 ./EFI/BOOT
-rw-r--r-- 1 root root 1187840 2021-06-15 19:16 ./EFI/BOOT/bootx64.efi
@ -25,9 +25,9 @@ drwxr-xr-x 2 root root 4096 2022-10-24 18:57 ./EFI/BOOT
-rwxr-xr-x 1 root root 2504 2019-07-05 18:54 ./EFI/BOOT/make-grub.sh
-rw-r--r-- 1 root root 10722 2013-09-21 19:02 ./EFI/BOOT/osdetect.cfg
-rw-r--r-- 1 root root 1273 2013-08-12 21:08 ./EFI/BOOT/tools.cfg
-rw-r--r-- 1 root root 1439109 2022-11-23 19:55 ./FILELIST.TXT
-rw-r--r-- 1 root root 1439679 2022-11-24 20:59 ./FILELIST.TXT
-rw-r--r-- 1 root root 1572 2012-08-29 18:27 ./GPG-KEY
-rw-r--r-- 1 root root 859693 2022-11-24 20:59 ./PACKAGES.TXT
-rw-r--r-- 1 root root 859693 2022-11-25 20:39 ./PACKAGES.TXT
-rw-r--r-- 1 root root 8034 2022-02-02 03:36 ./README.TXT
-rw-r--r-- 1 root root 3635 2022-10-24 18:47 ./README.initrd
-rw-r--r-- 1 root root 34162 2022-01-30 20:35 ./README_CRYPT.TXT
@ -746,13 +746,13 @@ drwxr-xr-x 2 root root 4096 2022-02-03 07:02 ./patches
-rw-r--r-- 1 root root 575 2022-02-03 07:02 ./patches/FILE_LIST
-rw-r--r-- 1 root root 14 2022-02-03 07:02 ./patches/MANIFEST.bz2
-rw-r--r-- 1 root root 224 2022-02-03 07:02 ./patches/PACKAGES.TXT
drwxr-xr-x 17 root root 4096 2022-11-24 20:59 ./slackware64
-rw-r--r-- 1 root root 335668 2022-11-24 20:59 ./slackware64/CHECKSUMS.md5
-rw-r--r-- 1 root root 163 2022-11-24 20:59 ./slackware64/CHECKSUMS.md5.asc
-rw-r--r-- 1 root root 416306 2022-11-24 20:58 ./slackware64/FILE_LIST
-rw-r--r-- 1 root root 4262150 2022-11-24 20:58 ./slackware64/MANIFEST.bz2
drwxr-xr-x 17 root root 4096 2022-11-25 20:39 ./slackware64
-rw-r--r-- 1 root root 335668 2022-11-25 20:39 ./slackware64/CHECKSUMS.md5
-rw-r--r-- 1 root root 163 2022-11-25 20:39 ./slackware64/CHECKSUMS.md5.asc
-rw-r--r-- 1 root root 416306 2022-11-25 20:39 ./slackware64/FILE_LIST
-rw-r--r-- 1 root root 4259628 2022-11-25 20:39 ./slackware64/MANIFEST.bz2
lrwxrwxrwx 1 root root 15 2009-08-23 23:34 ./slackware64/PACKAGES.TXT -> ../PACKAGES.TXT
drwxr-xr-x 2 root root 32768 2022-11-24 20:58 ./slackware64/a
drwxr-xr-x 2 root root 32768 2022-11-25 20:39 ./slackware64/a
-rw-r--r-- 1 root root 327 2022-02-15 18:16 ./slackware64/a/aaa_base-15.1-x86_64-2.txt
-rw-r--r-- 1 root root 10720 2022-02-15 18:16 ./slackware64/a/aaa_base-15.1-x86_64-2.txz
-rw-r--r-- 1 root root 163 2022-02-15 18:16 ./slackware64/a/aaa_base-15.1-x86_64-2.txz.asc
@ -780,9 +780,9 @@ drwxr-xr-x 2 root root 32768 2022-11-24 20:58 ./slackware64/a
-rw-r--r-- 1 root root 226 2021-02-13 10:55 ./slackware64/a/bin-11.1-x86_64-5.txt
-rw-r--r-- 1 root root 39244 2021-02-13 10:55 ./slackware64/a/bin-11.1-x86_64-5.txz
-rw-r--r-- 1 root root 163 2021-02-13 10:55 ./slackware64/a/bin-11.1-x86_64-5.txz.asc
-rw-r--r-- 1 root root 482 2022-11-09 20:10 ./slackware64/a/btrfs-progs-6.0.1-x86_64-1.txt
-rw-r--r-- 1 root root 813552 2022-11-09 20:10 ./slackware64/a/btrfs-progs-6.0.1-x86_64-1.txz
-rw-r--r-- 1 root root 163 2022-11-09 20:10 ./slackware64/a/btrfs-progs-6.0.1-x86_64-1.txz.asc
-rw-r--r-- 1 root root 482 2022-11-25 20:04 ./slackware64/a/btrfs-progs-6.0.2-x86_64-1.txt
-rw-r--r-- 1 root root 815184 2022-11-25 20:04 ./slackware64/a/btrfs-progs-6.0.2-x86_64-1.txz
-rw-r--r-- 1 root root 163 2022-11-25 20:04 ./slackware64/a/btrfs-progs-6.0.2-x86_64-1.txz.asc
-rw-r--r-- 1 root root 477 2021-02-13 10:55 ./slackware64/a/bzip2-1.0.8-x86_64-3.txt
-rw-r--r-- 1 root root 92456 2021-02-13 10:55 ./slackware64/a/bzip2-1.0.8-x86_64-3.txz
-rw-r--r-- 1 root root 163 2021-02-13 10:55 ./slackware64/a/bzip2-1.0.8-x86_64-3.txz.asc
@ -2765,7 +2765,7 @@ drwxr-xr-x 2 root root 86016 2022-11-23 19:54 ./slackware64/kde
-rw-r--r-- 1 root root 517 2022-11-03 20:24 ./slackware64/kde/zanshin-22.08.3-x86_64-1.txt
-rw-r--r-- 1 root root 679148 2022-11-03 20:24 ./slackware64/kde/zanshin-22.08.3-x86_64-1.txz
-rw-r--r-- 1 root root 163 2022-11-03 20:24 ./slackware64/kde/zanshin-22.08.3-x86_64-1.txz.asc
drwxr-xr-x 2 root root 86016 2022-11-24 20:58 ./slackware64/l
drwxr-xr-x 2 root root 86016 2022-11-25 20:39 ./slackware64/l
-rw-r--r-- 1 root root 329 2022-03-06 20:00 ./slackware64/l/GConf-3.2.6-x86_64-8.txt
-rw-r--r-- 1 root root 928144 2022-03-06 20:00 ./slackware64/l/GConf-3.2.6-x86_64-8.txz
-rw-r--r-- 1 root root 163 2022-03-06 20:00 ./slackware64/l/GConf-3.2.6-x86_64-8.txz.asc
@ -3015,9 +3015,9 @@ drwxr-xr-x 2 root root 86016 2022-11-24 20:58 ./slackware64/l
-rw-r--r-- 1 root root 300 2022-11-19 19:59 ./slackware64/l/glib-networking-2.74.0-x86_64-1.txt
-rw-r--r-- 1 root root 144184 2022-11-19 19:59 ./slackware64/l/glib-networking-2.74.0-x86_64-1.txz
-rw-r--r-- 1 root root 163 2022-11-19 19:59 ./slackware64/l/glib-networking-2.74.0-x86_64-1.txz.asc
-rw-r--r-- 1 root root 407 2022-11-23 19:27 ./slackware64/l/glib2-2.74.1-x86_64-2.txt
-rw-r--r-- 1 root root 4132772 2022-11-23 19:27 ./slackware64/l/glib2-2.74.1-x86_64-2.txz
-rw-r--r-- 1 root root 163 2022-11-23 19:27 ./slackware64/l/glib2-2.74.1-x86_64-2.txz.asc
-rw-r--r-- 1 root root 407 2022-11-25 20:05 ./slackware64/l/glib2-2.74.2-x86_64-1.txt
-rw-r--r-- 1 root root 4134964 2022-11-25 20:05 ./slackware64/l/glib2-2.74.2-x86_64-1.txz
-rw-r--r-- 1 root root 163 2022-11-25 20:05 ./slackware64/l/glib2-2.74.2-x86_64-1.txz.asc
-rw-r--r-- 1 root root 313 2022-09-01 02:33 ./slackware64/l/glibc-2.36-x86_64-3.txt
-rw-r--r-- 1 root root 5417592 2022-09-01 02:33 ./slackware64/l/glibc-2.36-x86_64-3.txz
-rw-r--r-- 1 root root 163 2022-09-01 02:33 ./slackware64/l/glibc-2.36-x86_64-3.txz.asc
@ -4445,7 +4445,7 @@ drwxr-xr-x 2 root root 4096 2022-11-23 19:54 ./slackware64/tcl
-rw-r--r-- 1 root root 227 2022-11-23 19:07 ./slackware64/tcl/tk-8.6.13-x86_64-1.txt
-rw-r--r-- 1 root root 1802760 2022-11-23 19:07 ./slackware64/tcl/tk-8.6.13-x86_64-1.txz
-rw-r--r-- 1 root root 163 2022-11-23 19:07 ./slackware64/tcl/tk-8.6.13-x86_64-1.txz.asc
drwxr-xr-x 2 root root 65536 2022-11-24 20:58 ./slackware64/x
drwxr-xr-x 2 root root 65536 2022-11-25 20:39 ./slackware64/x
-rw-r--r-- 1 root root 440 2022-06-04 18:16 ./slackware64/x/OpenCC-1.1.4-x86_64-1.txt
-rw-r--r-- 1 root root 682804 2022-06-04 18:16 ./slackware64/x/OpenCC-1.1.4-x86_64-1.txz
-rw-r--r-- 1 root root 163 2022-06-04 18:16 ./slackware64/x/OpenCC-1.1.4-x86_64-1.txz.asc
@ -4494,9 +4494,9 @@ drwxr-xr-x 2 root root 65536 2022-11-24 20:58 ./slackware64/x
-rw-r--r-- 1 root root 418 2022-11-21 19:36 ./slackware64/x/fcitx5-chinese-addons-5.0.16-x86_64-1.txt
-rw-r--r-- 1 root root 1075424 2022-11-21 19:36 ./slackware64/x/fcitx5-chinese-addons-5.0.16-x86_64-1.txz
-rw-r--r-- 1 root root 163 2022-11-21 19:36 ./slackware64/x/fcitx5-chinese-addons-5.0.16-x86_64-1.txz.asc
-rw-r--r-- 1 root root 275 2022-11-21 19:37 ./slackware64/x/fcitx5-gtk-5.0.20-x86_64-1.txt
-rw-r--r-- 1 root root 77152 2022-11-21 19:37 ./slackware64/x/fcitx5-gtk-5.0.20-x86_64-1.txz
-rw-r--r-- 1 root root 163 2022-11-21 19:37 ./slackware64/x/fcitx5-gtk-5.0.20-x86_64-1.txz.asc
-rw-r--r-- 1 root root 275 2022-11-25 20:05 ./slackware64/x/fcitx5-gtk-5.0.21-x86_64-1.txt
-rw-r--r-- 1 root root 77900 2022-11-25 20:05 ./slackware64/x/fcitx5-gtk-5.0.21-x86_64-1.txz
-rw-r--r-- 1 root root 163 2022-11-25 20:05 ./slackware64/x/fcitx5-gtk-5.0.21-x86_64-1.txz.asc
-rw-r--r-- 1 root root 262 2022-08-15 19:39 ./slackware64/x/fcitx5-hangul-5.0.10-x86_64-1.txt
-rw-r--r-- 1 root root 48100 2022-08-15 19:39 ./slackware64/x/fcitx5-hangul-5.0.10-x86_64-1.txz
-rw-r--r-- 1 root root 163 2022-08-15 19:39 ./slackware64/x/fcitx5-hangul-5.0.10-x86_64-1.txz.asc
@ -5585,11 +5585,11 @@ drwxr-xr-x 2 root root 4096 2021-02-15 19:33 ./slackware64/y
-rw-r--r-- 1 root root 1486956 2021-02-13 13:56 ./slackware64/y/nethack-3.6.6-x86_64-3.txz
-rw-r--r-- 1 root root 163 2021-02-13 13:56 ./slackware64/y/nethack-3.6.6-x86_64-3.txz.asc
-rw-r--r-- 1 root root 26 2020-12-30 21:55 ./slackware64/y/tagfile
drwxr-xr-x 18 root root 4096 2022-11-24 20:59 ./source
-rw-r--r-- 1 root root 593847 2022-11-24 20:59 ./source/CHECKSUMS.md5
-rw-r--r-- 1 root root 163 2022-11-24 20:59 ./source/CHECKSUMS.md5.asc
-rw-r--r-- 1 root root 826423 2022-11-24 20:59 ./source/FILE_LIST
-rw-r--r-- 1 root root 23893436 2022-11-24 20:59 ./source/MANIFEST.bz2
drwxr-xr-x 18 root root 4096 2022-11-25 20:40 ./source
-rw-r--r-- 1 root root 593764 2022-11-25 20:40 ./source/CHECKSUMS.md5
-rw-r--r-- 1 root root 163 2022-11-25 20:40 ./source/CHECKSUMS.md5.asc
-rw-r--r-- 1 root root 826323 2022-11-25 20:40 ./source/FILE_LIST
-rw-r--r-- 1 root root 23906656 2022-11-25 20:40 ./source/MANIFEST.bz2
-rw-r--r-- 1 root root 828 2022-02-02 04:43 ./source/README.TXT
drwxr-xr-x 123 root root 4096 2022-10-07 02:22 ./source/a
-rw-r--r-- 1 root root 234 2022-10-16 18:39 ./source/a/FTBFSlog
@ -5679,9 +5679,9 @@ drwxr-xr-x 2 root root 4096 2006-12-23 06:28 ./source/a/bin/scripts
-rw-r--r-- 1 root root 595 1993-05-02 00:04 ./source/a/bin/scripts/xx.gz
-rw-r--r-- 1 root root 677 2018-02-27 06:13 ./source/a/bin/slack-desc
-rw-r--r-- 1 root root 2403 1997-06-15 20:38 ./source/a/bin/todos.tar.gz
drwxr-xr-x 2 root root 4096 2022-11-09 20:10 ./source/a/btrfs-progs
-rw-r--r-- 1 root root 566 2022-11-04 19:32 ./source/a/btrfs-progs/btrfs-progs-v6.0.1.tar.sign
-rw-r--r-- 1 root root 2318988 2022-11-04 19:32 ./source/a/btrfs-progs/btrfs-progs-v6.0.1.tar.xz
drwxr-xr-x 2 root root 4096 2022-11-25 20:04 ./source/a/btrfs-progs
-rw-r--r-- 1 root root 566 2022-11-24 16:50 ./source/a/btrfs-progs/btrfs-progs-v6.0.2.tar.sign
-rw-r--r-- 1 root root 2321220 2022-11-24 16:50 ./source/a/btrfs-progs/btrfs-progs-v6.0.2.tar.xz
-rwxr-xr-x 1 root root 5172 2022-04-29 19:06 ./source/a/btrfs-progs/btrfs-progs.SlackBuild
-rw-r--r-- 1 root root 66 2017-04-23 04:56 ./source/a/btrfs-progs/btrfs-progs.url
-rw-r--r-- 1 root root 942 2018-11-04 19:06 ./source/a/btrfs-progs/slack-desc
@ -10192,11 +10192,10 @@ drwxr-xr-x 2 root root 4096 2022-11-19 19:52 ./source/l/glib-networking
-rw-r--r-- 1 root root 346080 2001-03-15 14:59 ./source/l/glib/glib-1.2.10.tar.bz2
-rwxr-xr-x 1 root root 5498 2021-02-13 05:31 ./source/l/glib/glib.SlackBuild
-rw-r--r-- 1 root root 754 2018-02-27 06:12 ./source/l/glib/slack-desc
drwxr-xr-x 2 root root 4096 2022-11-23 19:28 ./source/l/glib2
drwxr-xr-x 2 root root 4096 2022-11-25 20:01 ./source/l/glib2
-rw-r--r-- 1 root root 516 2011-11-06 22:03 ./source/l/glib2/doinst.sh.gz
-rw-r--r-- 1 root root 1546 2022-11-21 20:44 ./source/l/glib2/glib-2.74.1-gnome-keyring-cpu.patch.gz
-rw-r--r-- 1 root root 5189452 2022-10-25 13:07 ./source/l/glib2/glib-2.74.1.tar.xz
-rwxr-xr-x 1 root root 5359 2022-11-23 19:23 ./source/l/glib2/glib2.SlackBuild
-rw-r--r-- 1 root root 5182312 2022-11-25 18:08 ./source/l/glib2/glib-2.74.2.tar.xz
-rwxr-xr-x 1 root root 5277 2022-11-25 20:01 ./source/l/glib2/glib2.SlackBuild
-rw-r--r-- 1 root root 913 2021-09-02 23:31 ./source/l/glib2/libglib2.csh
-rw-r--r-- 1 root root 909 2021-09-01 17:51 ./source/l/glib2/libglib2.sh
-rw-r--r-- 1 root root 860 2018-11-15 04:21 ./source/l/glib2/slack-desc
@ -13122,10 +13121,10 @@ drwxr-xr-x 2 root root 4096 2022-11-21 19:36 ./source/x/fcitx5-chinese-add
-rwxr-xr-x 1 root root 3409 2022-05-21 09:13 ./source/x/fcitx5-chinese-addons/fcitx5-chinese-addons.SlackBuild
-rw-r--r-- 1 root root 60 2022-05-21 09:10 ./source/x/fcitx5-chinese-addons/fcitx5-chinese-addons.url
-rw-r--r-- 1 root root 920 2022-05-21 09:11 ./source/x/fcitx5-chinese-addons/slack-desc
drwxr-xr-x 2 root root 4096 2022-11-21 19:37 ./source/x/fcitx5-gtk
drwxr-xr-x 2 root root 4096 2022-11-25 20:05 ./source/x/fcitx5-gtk
-rw-r--r-- 1 root root 102 2022-05-19 18:01 ./source/x/fcitx5-gtk/doinst.sh.gz
-rw-r--r-- 1 root root 52564 2022-11-20 07:33 ./source/x/fcitx5-gtk/fcitx5-gtk-5.0.20.tar.xz
-rw-r--r-- 1 root root 310 2022-11-20 07:33 ./source/x/fcitx5-gtk/fcitx5-gtk-5.0.20.tar.xz.sig
-rw-r--r-- 1 root root 52900 2022-11-24 11:52 ./source/x/fcitx5-gtk/fcitx5-gtk-5.0.21.tar.xz
-rw-r--r-- 1 root root 310 2022-11-24 11:52 ./source/x/fcitx5-gtk/fcitx5-gtk-5.0.21.tar.xz.sig
-rwxr-xr-x 1 root root 3376 2022-05-19 18:13 ./source/x/fcitx5-gtk/fcitx5-gtk.SlackBuild
-rw-r--r-- 1 root root 49 2022-05-19 18:02 ./source/x/fcitx5-gtk/fcitx5-gtk.url
-rw-r--r-- 1 root root 766 2022-05-19 18:04 ./source/x/fcitx5-gtk/slack-desc

View file

@ -791,7 +791,6 @@ gzip ./source/l/netpbm/netpbm-gcc4.patch
gzip ./source/l/netpbm/netpbm-noppmtompeg.patch
gzip ./source/l/hicolor-icon-theme/doinst.sh
gzip ./source/l/dvdauthor/dvdauthor-0.7.2_imagemagick7.patch
gzip ./source/l/glib2/glib-2.74.1-gnome-keyring-cpu.patch
gzip ./source/l/glib2/doinst.sh
gzip ./source/l/gsettings-desktop-schemas/doinst.sh
gzip ./source/l/gsettings-desktop-schemas/gsettings-desktop-schemas.font.defaults.diff

View file

@ -1,131 +0,0 @@
https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3029
https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3039 (backport PR we've used)
https://bugs.gentoo.org/878995
https://bugs.gentoo.org/878351
From e2f283d7c8c5ab3aeb2f281a27ec7c0f24b86868 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@redhat.com>
Date: Fri, 28 Oct 2022 11:21:04 -0400
Subject: [PATCH 1/2] Revert "Handling collision between standard i/o file
descriptors and newly created ones"
g_unix_open_pipe tries to avoid the standard io fd range
when getting pipe fds. This turns out to be a bad idea because
certain buggy programs rely on it using that range.
This reverts commit d9ba6150909818beb05573f54f26232063492c5b
--- a/glib/glib-unix.c
+++ b/glib/glib-unix.c
@@ -108,17 +108,6 @@ g_unix_open_pipe (int *fds,
ecode = pipe2 (fds, pipe2_flags);
if (ecode == -1 && errno != ENOSYS)
return g_unix_set_error_from_errno (error, errno);
- /* Don't reassign pipes to stdin, stdout, stderr if closed meanwhile */
- else if (fds[0] < 3 || fds[1] < 3)
- {
- int old_fds[2] = { fds[0], fds[1] };
- gboolean result = g_unix_open_pipe (fds, flags, error);
- close (old_fds[0]);
- close (old_fds[1]);
-
- if (!result)
- g_unix_set_error_from_errno (error, errno);
- }
else if (ecode == 0)
return TRUE;
/* Fall through on -ENOSYS, we must be running on an old kernel */
@@ -127,19 +116,6 @@ g_unix_open_pipe (int *fds,
ecode = pipe (fds);
if (ecode == -1)
return g_unix_set_error_from_errno (error, errno);
- /* Don't reassign pipes to stdin, stdout, stderr if closed meanwhile */
- else if (fds[0] < 3 || fds[1] < 3)
- {
- int old_fds[2] = { fds[0], fds[1] };
- gboolean result = g_unix_open_pipe (fds, flags, error);
- close (old_fds[0]);
- close (old_fds[1]);
-
- if (!result)
- g_unix_set_error_from_errno (error, errno);
-
- return result;
- }
if (flags == 0)
return TRUE;
GitLab
From 4526620d8c485f5dfba6ddca33f91670982f82eb Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@redhat.com>
Date: Mon, 31 Oct 2022 09:17:55 -0400
Subject: [PATCH 2/2] glib-unix: Add test to make sure g_unix_open_pipe will
intrude standard range
Now that we know it's a bad idea to avoid the standard io fd range
when getting pipe fds for g_unix_open_pipe, we should test to make sure
we don't inadvertently try to do it again.
This commit adds that test.
--- a/glib/tests/unix.c
+++ b/glib/tests/unix.c
@@ -24,8 +24,11 @@
#include "config.h"
#include "glib-unix.h"
+#include "gstdio.h"
+
#include <string.h>
#include <pwd.h>
+#include <unistd.h>
static void
test_pipe (void)
@@ -52,6 +55,39 @@ test_pipe (void)
g_assert (g_str_has_prefix (buf, "hello"));
}
+static void
+test_pipe_stdio_overwrite (void)
+{
+ GError *error = NULL;
+ int pipefd[2], ret;
+ gboolean res;
+ int stdin_fd;
+
+ stdin_fd = dup (STDIN_FILENO);
+ g_assert_cmpint (stdin_fd, >, 0);
+
+ g_close (STDIN_FILENO, &error);
+ g_assert_no_error (error);
+
+ res = g_unix_open_pipe (pipefd, FD_CLOEXEC, &error);
+ g_assert_no_error (error);
+ g_assert_true (res);
+
+ g_assert_cmpint (pipefd[0], ==, STDIN_FILENO);
+
+ g_close (pipefd[0], &error);
+ g_assert_no_error (error);
+
+ g_close (pipefd[1], &error);
+ g_assert_no_error (error);
+
+ ret = dup2 (stdin_fd, STDIN_FILENO);
+ g_assert_cmpint (ret, >=, 0);
+
+ g_close (stdin_fd, &error);
+ g_assert_no_error (error);
+}
+
static void
test_error (void)
{
@@ -337,6 +373,7 @@ main (int argc,
g_test_init (&argc, &argv, NULL);
g_test_add_func ("/glib-unix/pipe", test_pipe);
+ g_test_add_func ("/glib-unix/pipe-stdio-overwrite", test_pipe_stdio_overwrite);
g_test_add_func ("/glib-unix/error", test_error);
g_test_add_func ("/glib-unix/nonblocking", test_nonblocking);
g_test_add_func ("/glib-unix/sighup", test_sighup);
GitLab

View file

@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=glib2
VERSION=${VERSION:-$(echo glib-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
BUILD=${BUILD:-2}
BUILD=${BUILD:-1}
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
@ -77,8 +77,6 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \+
zcat $CWD/glib-2.74.1-gnome-keyring-cpu.patch.gz | patch -p1 --verbose || exit 1
# Configure, build, and install:
export CFLAGS="$SLKCFLAGS"
export CXXFLAGS="$SLKCFLAGS"