Merge branch 'master' into master
This commit is contained in:
@@ -12,7 +12,7 @@
|
||||
<IsA>app:console</IsA>
|
||||
<Summary>Userland logical volume management tools</Summary>
|
||||
<Description>LVM2 includes all of the support for handling read/write operations physical and logical volumes.</Description>
|
||||
<Archive sha1sum="7a3834ca1ddaa7c4edc3863f18ec604f45722c65" type="targz">http://mirrors.kernel.org/sourceware/lvm2/LVM2.2.02.186.tgz</Archive>
|
||||
<Archive sha1sum="b3b19cc26c8792fe853083c4ad19b4987123d61a" type="targz">http://mirrors.kernel.org/sourceware/lvm2/LVM2.2.03.18.tgz</Archive>
|
||||
<BuildDependencies>
|
||||
<Dependency versionFrom="2.37.4">libutil-linux-devel</Dependency>
|
||||
<Dependency>eudev-devel</Dependency>
|
||||
@@ -36,9 +36,9 @@
|
||||
<Patch level="1">lvm2-2.02.166-HPPA-no-O_DIRECT.patch</Patch>
|
||||
<Patch level="1">lvm2-2.02.184-mksh_build.patch</Patch>
|
||||
<Patch level="1">lvm2-2.02.186-udev_remove_unsupported_option.patch</Patch-->
|
||||
<Patch level="1">fix-stdio-usage.patch</Patch>
|
||||
<!-- <Patch level="1">fix-stdio-usage.patch</Patch> -->
|
||||
<Patch level="1">mlockall-default-config.patch</Patch>
|
||||
<Patch level="1">portability.patch</Patch>
|
||||
<!-- <Patch level="1">portability.patch</Patch> -->
|
||||
</Patches>
|
||||
</Source>
|
||||
|
||||
@@ -57,6 +57,7 @@
|
||||
<Path fileType="data">/lib/udev/rules.d/10-dm.rules</Path>
|
||||
<Path fileType="data">/lib/udev/rules.d/13-dm-disk.rules</Path>
|
||||
<Path fileType="data">/lib/udev/rules.d/95-dm-notify.rules</Path>
|
||||
<Path fileType="data">/lib/udev/rules.d/69-dm-lvm.rules</Path>
|
||||
<!--Path fileType="doc">/usr/share/doc/lvm2/VERSION_DM</Path>
|
||||
<Path fileType="doc">/usr/share/doc/lvm2/WHATS_NEW_DM</Path-->
|
||||
<Path fileType="man">/usr/share/man/man8/dmsetup.8</Path>
|
||||
@@ -129,6 +130,7 @@
|
||||
<Path fileType="executable">/usr/sbin/lv*</Path>
|
||||
<Path fileType="executable">/usr/sbin/vg*</Path>
|
||||
<Path fileType="executable">/usr/sbin/pv*</Path>
|
||||
<Path fileType="executable">/usr/libexec/lvresize_fs_helper</Path>
|
||||
<Path fileType="library">/usr/lib/liblvm2app.so*</Path>
|
||||
<Path fileType="library">/usr/lib/liblvm2cmd.so*</Path>
|
||||
<Path fileType="library">/usr/lib/libdevmapper-event-lvm2.so*</Path>
|
||||
@@ -186,6 +188,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="10">
|
||||
<Date>2022-12-25</Date>
|
||||
<Version>2.03.18</Version>
|
||||
<Comment>Version bump.</Comment>
|
||||
<Name>Mustafa Cinasal</Name>
|
||||
<Email>muscnsl@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="9">
|
||||
<Date>2022-07-21</Date>
|
||||
<Version>2.02.186</Version>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<?xml version="1.0" ?>
|
||||
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
|
||||
<!DOCTYPE PISI SYSTEM "https://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
|
||||
<PISI>
|
||||
<Source>
|
||||
<Name>linux-firmware</Name>
|
||||
@@ -17,7 +17,7 @@
|
||||
<IsA>data</IsA>
|
||||
<Summary>Firmware files used by the Linux kernel</Summary>
|
||||
<Description>linux-firmware contains different firmware files required for some devices to operate correctly.</Description>
|
||||
<Archive sha1sum="bfa6bb5b68df73ce235ee49ca0d5b5b5f40e446f" type="tarxz">https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/linux-firmware-20220708.tar.xz</Archive>
|
||||
<Archive sha1sum="b0a96098f5cf68fe0f970c8915e8d38321430467" type="tarxz">https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/linux-firmware-20221109.tar.xz</Archive>
|
||||
<Archive sha1sum="dd685266f7bc0acb0d455462637d23e3e895bc96" type="tarxz" target="linux-firmware/mix">http://sourceforge.net/projects/pisilinux/files/source/common-fw.tar.xz</Archive>
|
||||
<Archive sha1sum="b2bb7fce3ea67d131f543a48134f7a65f2a8d834" type="tarxz" target="linux-firmware/mix">http://sourceforge.net/projects/pisilinux/files/source/firmware-ipw.tar.xz</Archive>
|
||||
<Archive sha1sum="a5a616a9f765cf9cbb224deb7ccefdc82a7fe4d9" type="tarbz2" target="linux-firmware/mix">http://sourceforge.net/projects/pisilinux/files/source/firmware-nonfreebox-2-tar.bz2</Archive>
|
||||
@@ -56,6 +56,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="18">
|
||||
<Date>2022-12-07</Date>
|
||||
<Version>20221109</Version>
|
||||
<Comment>Version bump.</Comment>
|
||||
<Name>Mustafa Cinasal</Name>
|
||||
<Email>muscnsl@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="17">
|
||||
<Date>2022-07-09</Date>
|
||||
<Version>20220708</Version>
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
<Summary>Kernel module allowing to switch dedicated graphics card on Optimus laptops</Summary>
|
||||
<Description>kernel module allowing to switch dedicated graphics card on Optimus laptops</Description>
|
||||
<BuildDependencies>
|
||||
<Dependency version="5.15.74">kernel-module-headers</Dependency>
|
||||
<Dependency version="5.15.86">kernel-module-headers</Dependency>
|
||||
</BuildDependencies>
|
||||
<Archive sha1sum="e282ee682d794e3962baa4dead01917c42571e78" type="targz">https://github.com/Bumblebee-Project/bbswitch/archive/v0.8.tar.gz</Archive>
|
||||
<Patches>
|
||||
@@ -24,7 +24,7 @@
|
||||
<Package>
|
||||
<Name>module-bbswitch</Name>
|
||||
<RuntimeDependencies>
|
||||
<Dependency version="5.15.74">kernel</Dependency>
|
||||
<Dependency version="5.15.86">kernel</Dependency>
|
||||
<Dependency release="current">bbswitch-common</Dependency>
|
||||
</RuntimeDependencies>
|
||||
<Files>
|
||||
@@ -62,6 +62,20 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="72">
|
||||
<Date>2023-01-03</Date>
|
||||
<Version>0.8</Version>
|
||||
<Comment>Rebuild.</Comment>
|
||||
<Name>Mustafa Cinasal</Name>
|
||||
<Email>muscnsl@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="71">
|
||||
<Date>2022-12-07</Date>
|
||||
<Version>0.8</Version>
|
||||
<Comment>Rebuild.</Comment>
|
||||
<Name>Mustafa Cinasal</Name>
|
||||
<Email>muscnsl@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="70">
|
||||
<Date>2022-10-22</Date>
|
||||
<Version>0.8</Version>
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
<Archive sha1sum="8acbdbb4ab4ab4123d1773b616904798fbef9277" type="targz" target="i686">https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/hybrid-v35-nodebug-pcoem-6_30_223_271.tar.gz</Archive>
|
||||
<Archive sha1sum="1f568bb989d175813c5631c6629d9479eae6f3be" type="targz" target="x86_64">https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/hybrid-v35_64-nodebug-pcoem-6_30_223_271.tar.gz</Archive>
|
||||
<BuildDependencies>
|
||||
<Dependency version="5.15.74">kernel-module-headers</Dependency>
|
||||
<Dependency version="5.15.86">kernel-module-headers</Dependency>
|
||||
</BuildDependencies>
|
||||
<Patches>
|
||||
<Patch level="1">broadcom-wl-6.30.223.271-debian-fix-kernel-warnings.patch</Patch>
|
||||
@@ -41,7 +41,7 @@
|
||||
<Package>
|
||||
<Name>module-broadcom-wl</Name>
|
||||
<RuntimeDependencies>
|
||||
<Dependency version="5.15.74">kernel</Dependency>
|
||||
<Dependency version="5.15.86">kernel</Dependency>
|
||||
<Dependency release="current">module-broadcom-wl-userspace</Dependency>
|
||||
</RuntimeDependencies>
|
||||
<Files>
|
||||
@@ -70,6 +70,20 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="71">
|
||||
<Date>2023-01-03</Date>
|
||||
<Version>6.30.223.271</Version>
|
||||
<Comment>Rebuild.</Comment>
|
||||
<Name>Mustafa Cinasal</Name>
|
||||
<Email>muscnsl@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="70">
|
||||
<Date>2022-12-07</Date>
|
||||
<Version>6.30.223.271</Version>
|
||||
<Comment>Rebuild.</Comment>
|
||||
<Name>Mustafa Cinasal</Name>
|
||||
<Email>muscnsl@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="69">
|
||||
<Date>2022-10-22</Date>
|
||||
<Version>6.30.223.271</Version>
|
||||
|
||||
@@ -12,9 +12,9 @@
|
||||
<IsA>driver</IsA>
|
||||
<Summary>Kernel modules for VirtualBox guest machines</Summary>
|
||||
<Description>This package provides the kernel modules needed for mouse integration and shared folder support between VirtualBox host and guest systems.</Description>
|
||||
<Archive sha1sum="36ce6a8d697e40f19d7a5e727d166e2862a8b6a3" type="tarxz">https://sourceforge.net/projects/pisilinux/files/source/module-virtualbox-guest-7.0.2.tar.xz</Archive>
|
||||
<Archive sha1sum="c1253d82b2d10a4e1f01935c3e78726593862a5d" type="tarxz">https://sourceforge.net/projects/pisilinux/files/source/module-virtualbox-guest-7.0.4.tar.xz</Archive>
|
||||
<BuildDependencies>
|
||||
<Dependency version="5.15.74">kernel-module-headers</Dependency>
|
||||
<Dependency version="5.15.86">kernel-module-headers</Dependency>
|
||||
</BuildDependencies>
|
||||
<Patches>
|
||||
<!-- <Patch>vboxsf-make.patch</Patch> -->
|
||||
@@ -24,7 +24,7 @@
|
||||
<Package>
|
||||
<Name>module-virtualbox-guest</Name>
|
||||
<RuntimeDependencies>
|
||||
<Dependency version="5.15.74">kernel</Dependency>
|
||||
<Dependency version="5.15.86">kernel</Dependency>
|
||||
<Dependency>baselayout</Dependency>
|
||||
<Dependency version="current">module-virtualbox-guest-userspace</Dependency>
|
||||
</RuntimeDependencies>
|
||||
@@ -55,6 +55,27 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="107">
|
||||
<Date>2023-01-03</Date>
|
||||
<Version>7.0.4</Version>
|
||||
<Comment>Version bump.</Comment>
|
||||
<Name>Mustafa Cinasal</Name>
|
||||
<Email>muscnsl@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="106">
|
||||
<Date>2022-12-07</Date>
|
||||
<Version>7.0.4</Version>
|
||||
<Comment>Version bump.</Comment>
|
||||
<Name>Mustafa Cinasal</Name>
|
||||
<Email>muscnsl@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="105">
|
||||
<Date>2022-11-20</Date>
|
||||
<Version>7.0.4</Version>
|
||||
<Comment>Version bump.</Comment>
|
||||
<Name>Mustafa Cinasal</Name>
|
||||
<Email>muscnsl@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="104">
|
||||
<Date>2022-10-23</Date>
|
||||
<Version>7.0.2</Version>
|
||||
|
||||
@@ -12,9 +12,9 @@
|
||||
<IsA>driver</IsA>
|
||||
<Summary>Kernel modules for VirtualBox</Summary>
|
||||
<Description>This package provides the kernel support for VirtualBox.</Description>
|
||||
<Archive sha1sum="f98854a99582c5e37b010581ee84041aa33e6eff" type="tarxz">https://sourceforge.net/projects/pisilinux/files/source/module-virtualbox-7.0.2.tar.xz</Archive>
|
||||
<Archive sha1sum="897bb851a077cd8080e03dc58439959644b5d5cb" type="tarxz">https://sourceforge.net/projects/pisilinux/files/source/module-virtualbox-7.0.4.tar.xz</Archive>
|
||||
<BuildDependencies>
|
||||
<Dependency version="5.15.74">kernel-module-headers</Dependency>
|
||||
<Dependency version="5.15.86">kernel-module-headers</Dependency>
|
||||
</BuildDependencies>
|
||||
<Patches>
|
||||
<!--Patch level="2">fixes_for_5.6.patch</Patch>
|
||||
@@ -25,7 +25,7 @@
|
||||
<Package>
|
||||
<Name>module-virtualbox</Name>
|
||||
<RuntimeDependencies>
|
||||
<Dependency version="5.15.74">kernel</Dependency>
|
||||
<Dependency version="5.15.86">kernel</Dependency>
|
||||
<Dependency version="current">module-virtualbox-userspace</Dependency>
|
||||
</RuntimeDependencies>
|
||||
<Files>
|
||||
@@ -51,6 +51,27 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="107">
|
||||
<Date>2023-01-03</Date>
|
||||
<Version>7.0.4</Version>
|
||||
<Comment>Version bump.</Comment>
|
||||
<Name>Mustafa Cinasal</Name>
|
||||
<Email>muscnsl@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="106">
|
||||
<Date>2022-12-07</Date>
|
||||
<Version>7.0.4</Version>
|
||||
<Comment>Version bump.</Comment>
|
||||
<Name>Mustafa Cinasal</Name>
|
||||
<Email>muscnsl@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="105">
|
||||
<Date>2022-11-20</Date>
|
||||
<Version>7.0.4</Version>
|
||||
<Comment>Version bump.</Comment>
|
||||
<Name>Mustafa Cinasal</Name>
|
||||
<Email>muscnsl@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="104">
|
||||
<Date>2022-10-23</Date>
|
||||
<Version>7.0.2</Version>
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Linux/x86_64 5.15.74 Kernel Configuration
|
||||
# Linux/x86_64 5.15.81 Kernel Configuration
|
||||
#
|
||||
CONFIG_CC_VERSION_TEXT="gcc (Pisi Linux) 10.3.0"
|
||||
CONFIG_CC_IS_GCC=y
|
||||
@@ -1132,6 +1132,7 @@ CONFIG_INET_ESP=m
|
||||
# CONFIG_INET_ESP_OFFLOAD is not set
|
||||
CONFIG_INET_ESPINTCP=y
|
||||
CONFIG_INET_IPCOMP=m
|
||||
CONFIG_INET_TABLE_PERTURB_ORDER=16
|
||||
CONFIG_INET_XFRM_TUNNEL=m
|
||||
CONFIG_INET_TUNNEL=m
|
||||
CONFIG_INET_DIAG=y
|
||||
@@ -3853,6 +3854,13 @@ CONFIG_RTW88_8723DE=m
|
||||
CONFIG_RTW88_8821CE=m
|
||||
CONFIG_RTW88_DEBUG=y
|
||||
CONFIG_RTW88_DEBUGFS=y
|
||||
CONFIG_RTW89=m
|
||||
CONFIG_RTW89_CORE=m
|
||||
CONFIG_RTW89_PCI=m
|
||||
CONFIG_RTW89_8852AE=m
|
||||
CONFIG_RTW89_DEBUG=y
|
||||
CONFIG_RTW89_DEBUGMSG=y
|
||||
CONFIG_RTW89_DEBUGFS=y
|
||||
CONFIG_WLAN_VENDOR_RSI=y
|
||||
CONFIG_RSI_91X=m
|
||||
CONFIG_RSI_DEBUGFS=y
|
||||
@@ -10347,6 +10355,8 @@ CONFIG_SYMBOLIC_ERRNAME=y
|
||||
CONFIG_DEBUG_BUGVERBOSE=y
|
||||
# end of printk and dmesg options
|
||||
|
||||
CONFIG_AS_HAS_NON_CONST_LEB128=y
|
||||
|
||||
#
|
||||
# Compile-time checks and compiler options
|
||||
#
|
||||
|
||||
@@ -153,7 +153,7 @@ index 04c88dd6eabd..0ff3ba22ee17 100644
|
||||
void *key_data;
|
||||
|
||||
diff --git a/fs/aufs/f_op.c b/fs/aufs/f_op.c
|
||||
index 99ceca144044..e49dfe855032 100644
|
||||
index c2924d055ebd..4efde401dbf4 100644
|
||||
--- a/fs/aufs/f_op.c
|
||||
+++ b/fs/aufs/f_op.c
|
||||
@@ -304,7 +304,7 @@ static ssize_t aufs_read_iter(struct kiocb *kio, struct iov_iter *iov_iter)
|
||||
|
||||
+101
-97
@@ -1,6 +1,6 @@
|
||||
diff -Naur null/Documentation/ABI/testing/debugfs-aufs linux-5.15.41/Documentation/ABI/testing/debugfs-aufs
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/Documentation/ABI/testing/debugfs-aufs 2022-09-06 12:51:51.030710012 +0300
|
||||
+++ linux-5.15.41/Documentation/ABI/testing/debugfs-aufs 2023-01-03 20:33:04.499529241 +0300
|
||||
@@ -0,0 +1,55 @@
|
||||
+What: /debug/aufs/si_<id>/
|
||||
+Date: March 2009
|
||||
@@ -59,7 +59,7 @@ diff -Naur null/Documentation/ABI/testing/debugfs-aufs linux-5.15.41/Documentati
|
||||
+ will be empty. About XINO files, see the aufs manual.
|
||||
diff -Naur null/Documentation/ABI/testing/sysfs-aufs linux-5.15.41/Documentation/ABI/testing/sysfs-aufs
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/Documentation/ABI/testing/sysfs-aufs 2022-09-06 12:51:51.030710012 +0300
|
||||
+++ linux-5.15.41/Documentation/ABI/testing/sysfs-aufs 2023-01-03 20:33:04.499529241 +0300
|
||||
@@ -0,0 +1,31 @@
|
||||
+What: /sys/fs/aufs/si_<id>/
|
||||
+Date: March 2009
|
||||
@@ -94,7 +94,7 @@ diff -Naur null/Documentation/ABI/testing/sysfs-aufs linux-5.15.41/Documentation
|
||||
+ will be empty. About XINO files, see the aufs manual.
|
||||
diff -Naur null/Documentation/filesystems/aufs/design/01intro.txt linux-5.15.41/Documentation/filesystems/aufs/design/01intro.txt
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/Documentation/filesystems/aufs/design/01intro.txt 2022-09-06 12:51:51.031709999 +0300
|
||||
+++ linux-5.15.41/Documentation/filesystems/aufs/design/01intro.txt 2023-01-03 20:33:04.499529241 +0300
|
||||
@@ -0,0 +1,171 @@
|
||||
+
|
||||
+# Copyright (C) 2005-2021 Junjiro R. Okajima
|
||||
@@ -269,7 +269,7 @@ diff -Naur null/Documentation/filesystems/aufs/design/01intro.txt linux-5.15.41/
|
||||
+about it. But currently I have implemented it in kernel space.
|
||||
diff -Naur null/Documentation/filesystems/aufs/design/02struct.txt linux-5.15.41/Documentation/filesystems/aufs/design/02struct.txt
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/Documentation/filesystems/aufs/design/02struct.txt 2022-09-06 12:51:51.031709999 +0300
|
||||
+++ linux-5.15.41/Documentation/filesystems/aufs/design/02struct.txt 2023-01-03 20:33:04.499529241 +0300
|
||||
@@ -0,0 +1,258 @@
|
||||
+
|
||||
+# Copyright (C) 2005-2021 Junjiro R. Okajima
|
||||
@@ -531,7 +531,7 @@ diff -Naur null/Documentation/filesystems/aufs/design/02struct.txt linux-5.15.41
|
||||
+For this purpose, use "aumvdown" command in aufs-util.git.
|
||||
diff -Naur null/Documentation/filesystems/aufs/design/03atomic_open.txt linux-5.15.41/Documentation/filesystems/aufs/design/03atomic_open.txt
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/Documentation/filesystems/aufs/design/03atomic_open.txt 2022-09-06 12:51:51.031709999 +0300
|
||||
+++ linux-5.15.41/Documentation/filesystems/aufs/design/03atomic_open.txt 2023-01-03 20:33:04.500529229 +0300
|
||||
@@ -0,0 +1,85 @@
|
||||
+
|
||||
+# Copyright (C) 2015-2021 Junjiro R. Okajima
|
||||
@@ -620,7 +620,7 @@ diff -Naur null/Documentation/filesystems/aufs/design/03atomic_open.txt linux-5.
|
||||
+ be implemented in aufs, but not all I am afraid.
|
||||
diff -Naur null/Documentation/filesystems/aufs/design/03lookup.txt linux-5.15.41/Documentation/filesystems/aufs/design/03lookup.txt
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/Documentation/filesystems/aufs/design/03lookup.txt 2022-09-06 12:51:51.031709999 +0300
|
||||
+++ linux-5.15.41/Documentation/filesystems/aufs/design/03lookup.txt 2023-01-03 20:33:04.500529229 +0300
|
||||
@@ -0,0 +1,113 @@
|
||||
+
|
||||
+# Copyright (C) 2005-2021 Junjiro R. Okajima
|
||||
@@ -737,7 +737,7 @@ diff -Naur null/Documentation/filesystems/aufs/design/03lookup.txt linux-5.15.41
|
||||
+ by over-mounting something (or another method).
|
||||
diff -Naur null/Documentation/filesystems/aufs/design/04branch.txt linux-5.15.41/Documentation/filesystems/aufs/design/04branch.txt
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/Documentation/filesystems/aufs/design/04branch.txt 2022-09-06 12:51:51.031709999 +0300
|
||||
+++ linux-5.15.41/Documentation/filesystems/aufs/design/04branch.txt 2023-01-03 20:33:04.500529229 +0300
|
||||
@@ -0,0 +1,74 @@
|
||||
+
|
||||
+# Copyright (C) 2005-2021 Junjiro R. Okajima
|
||||
@@ -815,7 +815,7 @@ diff -Naur null/Documentation/filesystems/aufs/design/04branch.txt linux-5.15.41
|
||||
+ same named entry on the upper branch.
|
||||
diff -Naur null/Documentation/filesystems/aufs/design/05wbr_policy.txt linux-5.15.41/Documentation/filesystems/aufs/design/05wbr_policy.txt
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/Documentation/filesystems/aufs/design/05wbr_policy.txt 2022-09-06 12:51:51.032709987 +0300
|
||||
+++ linux-5.15.41/Documentation/filesystems/aufs/design/05wbr_policy.txt 2023-01-03 20:33:04.500529229 +0300
|
||||
@@ -0,0 +1,64 @@
|
||||
+
|
||||
+# Copyright (C) 2005-2021 Junjiro R. Okajima
|
||||
@@ -883,7 +883,7 @@ diff -Naur null/Documentation/filesystems/aufs/design/05wbr_policy.txt linux-5.1
|
||||
+ copyup policy.
|
||||
diff -Naur null/Documentation/filesystems/aufs/design/06dirren.dot linux-5.15.41/Documentation/filesystems/aufs/design/06dirren.dot
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/Documentation/filesystems/aufs/design/06dirren.dot 2022-09-06 12:51:51.032709987 +0300
|
||||
+++ linux-5.15.41/Documentation/filesystems/aufs/design/06dirren.dot 2023-01-03 20:33:04.500529229 +0300
|
||||
@@ -0,0 +1,31 @@
|
||||
+
|
||||
+// to view this graph, run dot(1) command in GRAPHVIZ.
|
||||
@@ -918,7 +918,7 @@ diff -Naur null/Documentation/filesystems/aufs/design/06dirren.dot linux-5.15.41
|
||||
+}
|
||||
diff -Naur null/Documentation/filesystems/aufs/design/06dirren.txt linux-5.15.41/Documentation/filesystems/aufs/design/06dirren.txt
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/Documentation/filesystems/aufs/design/06dirren.txt 2022-09-06 12:51:51.032709987 +0300
|
||||
+++ linux-5.15.41/Documentation/filesystems/aufs/design/06dirren.txt 2023-01-03 20:33:04.500529229 +0300
|
||||
@@ -0,0 +1,102 @@
|
||||
+
|
||||
+# Copyright (C) 2017-2021 Junjiro R. Okajima
|
||||
@@ -1024,7 +1024,7 @@ diff -Naur null/Documentation/filesystems/aufs/design/06dirren.txt linux-5.15.41
|
||||
+equivalen to udba=reval case.
|
||||
diff -Naur null/Documentation/filesystems/aufs/design/06fhsm.txt linux-5.15.41/Documentation/filesystems/aufs/design/06fhsm.txt
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/Documentation/filesystems/aufs/design/06fhsm.txt 2022-09-06 12:51:51.032709987 +0300
|
||||
+++ linux-5.15.41/Documentation/filesystems/aufs/design/06fhsm.txt 2023-01-03 20:33:04.500529229 +0300
|
||||
@@ -0,0 +1,120 @@
|
||||
+
|
||||
+# Copyright (C) 2011-2021 Junjiro R. Okajima
|
||||
@@ -1148,7 +1148,7 @@ diff -Naur null/Documentation/filesystems/aufs/design/06fhsm.txt linux-5.15.41/D
|
||||
+should restore the original file state after an error happens.
|
||||
diff -Naur null/Documentation/filesystems/aufs/design/06mmap.txt linux-5.15.41/Documentation/filesystems/aufs/design/06mmap.txt
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/Documentation/filesystems/aufs/design/06mmap.txt 2022-09-06 12:51:51.032709987 +0300
|
||||
+++ linux-5.15.41/Documentation/filesystems/aufs/design/06mmap.txt 2023-01-03 20:33:04.500529229 +0300
|
||||
@@ -0,0 +1,72 @@
|
||||
+
|
||||
+# Copyright (C) 2005-2021 Junjiro R. Okajima
|
||||
@@ -1224,7 +1224,7 @@ diff -Naur null/Documentation/filesystems/aufs/design/06mmap.txt linux-5.15.41/D
|
||||
+I have to give up this "looks-smater" approach.
|
||||
diff -Naur null/Documentation/filesystems/aufs/design/06xattr.txt linux-5.15.41/Documentation/filesystems/aufs/design/06xattr.txt
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/Documentation/filesystems/aufs/design/06xattr.txt 2022-09-06 12:51:51.032709987 +0300
|
||||
+++ linux-5.15.41/Documentation/filesystems/aufs/design/06xattr.txt 2023-01-03 20:33:04.500529229 +0300
|
||||
@@ -0,0 +1,96 @@
|
||||
+
|
||||
+# Copyright (C) 2014-2021 Junjiro R. Okajima
|
||||
@@ -1324,7 +1324,7 @@ diff -Naur null/Documentation/filesystems/aufs/design/06xattr.txt linux-5.15.41/
|
||||
+now, aufs implements the branch attributes to ignore the error.
|
||||
diff -Naur null/Documentation/filesystems/aufs/design/07export.txt linux-5.15.41/Documentation/filesystems/aufs/design/07export.txt
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/Documentation/filesystems/aufs/design/07export.txt 2022-09-06 12:51:51.032709987 +0300
|
||||
+++ linux-5.15.41/Documentation/filesystems/aufs/design/07export.txt 2023-01-03 20:33:04.500529229 +0300
|
||||
@@ -0,0 +1,58 @@
|
||||
+
|
||||
+# Copyright (C) 2005-2021 Junjiro R. Okajima
|
||||
@@ -1386,7 +1386,7 @@ diff -Naur null/Documentation/filesystems/aufs/design/07export.txt linux-5.15.41
|
||||
+ lookup_one_len(), vfs_getattr(), encode_fh() and others.
|
||||
diff -Naur null/Documentation/filesystems/aufs/design/08shwh.txt linux-5.15.41/Documentation/filesystems/aufs/design/08shwh.txt
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/Documentation/filesystems/aufs/design/08shwh.txt 2022-09-06 12:51:51.032709987 +0300
|
||||
+++ linux-5.15.41/Documentation/filesystems/aufs/design/08shwh.txt 2023-01-03 20:33:04.500529229 +0300
|
||||
@@ -0,0 +1,52 @@
|
||||
+
|
||||
+# Copyright (C) 2005-2021 Junjiro R. Okajima
|
||||
@@ -1442,7 +1442,7 @@ diff -Naur null/Documentation/filesystems/aufs/design/08shwh.txt linux-5.15.41/D
|
||||
+initramfs will use it to replace the old one at the next boot.
|
||||
diff -Naur null/Documentation/filesystems/aufs/design/10dynop.txt linux-5.15.41/Documentation/filesystems/aufs/design/10dynop.txt
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/Documentation/filesystems/aufs/design/10dynop.txt 2022-09-06 12:51:51.032709987 +0300
|
||||
+++ linux-5.15.41/Documentation/filesystems/aufs/design/10dynop.txt 2023-01-03 20:33:04.500529229 +0300
|
||||
@@ -0,0 +1,47 @@
|
||||
+
|
||||
+# Copyright (C) 2010-2021 Junjiro R. Okajima
|
||||
@@ -1493,7 +1493,7 @@ diff -Naur null/Documentation/filesystems/aufs/design/10dynop.txt linux-5.15.41/
|
||||
+regular files only.
|
||||
diff -Naur null/Documentation/filesystems/aufs/README linux-5.15.41/Documentation/filesystems/aufs/README
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/Documentation/filesystems/aufs/README 2022-09-06 12:51:51.031709999 +0300
|
||||
+++ linux-5.15.41/Documentation/filesystems/aufs/README 2023-01-03 20:33:04.499529241 +0300
|
||||
@@ -0,0 +1,397 @@
|
||||
+
|
||||
+Aufs5 -- advanced multi layered unification filesystem version 5.x
|
||||
@@ -1894,7 +1894,7 @@ diff -Naur null/Documentation/filesystems/aufs/README linux-5.15.41/Documentatio
|
||||
+# End: ;
|
||||
diff -Naur null/fs/aufs/aufs.h linux-5.15.41/fs/aufs/aufs.h
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/aufs.h 2022-09-06 12:51:51.034709962 +0300
|
||||
+++ linux-5.15.41/fs/aufs/aufs.h 2023-01-03 20:33:04.501529216 +0300
|
||||
@@ -0,0 +1,62 @@
|
||||
+/* SPDX-License-Identifier: GPL-2.0 */
|
||||
+/*
|
||||
@@ -1960,7 +1960,7 @@ diff -Naur null/fs/aufs/aufs.h linux-5.15.41/fs/aufs/aufs.h
|
||||
+#endif /* __AUFS_H__ */
|
||||
diff -Naur null/fs/aufs/branch.c linux-5.15.41/fs/aufs/branch.c
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/branch.c 2022-09-06 12:51:51.034709962 +0300
|
||||
+++ linux-5.15.41/fs/aufs/branch.c 2023-01-03 20:33:04.502529204 +0300
|
||||
@@ -0,0 +1,1427 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
@@ -3391,7 +3391,7 @@ diff -Naur null/fs/aufs/branch.c linux-5.15.41/fs/aufs/branch.c
|
||||
+}
|
||||
diff -Naur null/fs/aufs/branch.h linux-5.15.41/fs/aufs/branch.h
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/branch.h 2022-09-06 12:51:51.034709962 +0300
|
||||
+++ linux-5.15.41/fs/aufs/branch.h 2023-01-03 20:33:04.502529204 +0300
|
||||
@@ -0,0 +1,375 @@
|
||||
+/* SPDX-License-Identifier: GPL-2.0 */
|
||||
+/*
|
||||
@@ -3770,7 +3770,7 @@ diff -Naur null/fs/aufs/branch.h linux-5.15.41/fs/aufs/branch.h
|
||||
+#endif /* __AUFS_BRANCH_H__ */
|
||||
diff -Naur null/fs/aufs/conf.mk linux-5.15.41/fs/aufs/conf.mk
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/conf.mk 2022-09-06 12:51:51.035709949 +0300
|
||||
+++ linux-5.15.41/fs/aufs/conf.mk 2023-01-03 20:33:04.502529204 +0300
|
||||
@@ -0,0 +1,40 @@
|
||||
+# SPDX-License-Identifier: GPL-2.0
|
||||
+
|
||||
@@ -3814,7 +3814,7 @@ diff -Naur null/fs/aufs/conf.mk linux-5.15.41/fs/aufs/conf.mk
|
||||
+-include ${srctree}/${src}/conf_priv.mk
|
||||
diff -Naur null/fs/aufs/cpup.c linux-5.15.41/fs/aufs/cpup.c
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/cpup.c 2022-09-06 12:51:51.035709949 +0300
|
||||
+++ linux-5.15.41/fs/aufs/cpup.c 2023-01-03 20:33:04.502529204 +0300
|
||||
@@ -0,0 +1,1459 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
@@ -4407,7 +4407,7 @@ diff -Naur null/fs/aufs/cpup.c linux-5.15.41/fs/aufs/cpup.c
|
||||
+ * regardless 'acl' option, reset all ACL.
|
||||
+ * All ACL will be copied up later from the original entry on the lower branch.
|
||||
+ */
|
||||
+static int au_reset_acl(struct inode *h_dir, struct path *h_path, umode_t mode)
|
||||
+static int au_reset_acl(struct path *h_path, umode_t mode)
|
||||
+{
|
||||
+ int err;
|
||||
+ struct dentry *h_dentry;
|
||||
@@ -4529,7 +4529,7 @@ diff -Naur null/fs/aufs/cpup.c linux-5.15.41/fs/aufs/cpup.c
|
||||
+ err = -EIO;
|
||||
+ }
|
||||
+ if (!err)
|
||||
+ err = au_reset_acl(h_dir, &h_path, mode);
|
||||
+ err = au_reset_acl(&h_path, mode);
|
||||
+
|
||||
+ mnt_flags = au_mntflags(sb);
|
||||
+ if (!au_opt_test(mnt_flags, UDBA_NONE)
|
||||
@@ -5277,7 +5277,7 @@ diff -Naur null/fs/aufs/cpup.c linux-5.15.41/fs/aufs/cpup.c
|
||||
+}
|
||||
diff -Naur null/fs/aufs/cpup.h linux-5.15.41/fs/aufs/cpup.h
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/cpup.h 2022-09-06 12:51:51.035709949 +0300
|
||||
+++ linux-5.15.41/fs/aufs/cpup.h 2023-01-03 20:33:04.502529204 +0300
|
||||
@@ -0,0 +1,100 @@
|
||||
+/* SPDX-License-Identifier: GPL-2.0 */
|
||||
+/*
|
||||
@@ -5381,7 +5381,7 @@ diff -Naur null/fs/aufs/cpup.h linux-5.15.41/fs/aufs/cpup.h
|
||||
+#endif /* __AUFS_CPUP_H__ */
|
||||
diff -Naur null/fs/aufs/dbgaufs.c linux-5.15.41/fs/aufs/dbgaufs.c
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/dbgaufs.c 2022-09-06 12:51:51.035709949 +0300
|
||||
+++ linux-5.15.41/fs/aufs/dbgaufs.c 2023-01-03 20:33:04.502529204 +0300
|
||||
@@ -0,0 +1,526 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
@@ -5911,7 +5911,7 @@ diff -Naur null/fs/aufs/dbgaufs.c linux-5.15.41/fs/aufs/dbgaufs.c
|
||||
+}
|
||||
diff -Naur null/fs/aufs/dbgaufs.h linux-5.15.41/fs/aufs/dbgaufs.h
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/dbgaufs.h 2022-09-06 12:51:51.035709949 +0300
|
||||
+++ linux-5.15.41/fs/aufs/dbgaufs.h 2023-01-03 20:33:04.502529204 +0300
|
||||
@@ -0,0 +1,53 @@
|
||||
+/* SPDX-License-Identifier: GPL-2.0 */
|
||||
+/*
|
||||
@@ -5968,7 +5968,7 @@ diff -Naur null/fs/aufs/dbgaufs.h linux-5.15.41/fs/aufs/dbgaufs.h
|
||||
+#endif /* __DBGAUFS_H__ */
|
||||
diff -Naur null/fs/aufs/dcsub.c linux-5.15.41/fs/aufs/dcsub.c
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/dcsub.c 2022-09-06 12:51:51.035709949 +0300
|
||||
+++ linux-5.15.41/fs/aufs/dcsub.c 2023-01-03 20:33:04.502529204 +0300
|
||||
@@ -0,0 +1,225 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
@@ -6197,7 +6197,7 @@ diff -Naur null/fs/aufs/dcsub.c linux-5.15.41/fs/aufs/dcsub.c
|
||||
+}
|
||||
diff -Naur null/fs/aufs/dcsub.h linux-5.15.41/fs/aufs/dcsub.h
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/dcsub.h 2022-09-06 12:51:51.035709949 +0300
|
||||
+++ linux-5.15.41/fs/aufs/dcsub.h 2023-01-03 20:33:04.502529204 +0300
|
||||
@@ -0,0 +1,137 @@
|
||||
+/* SPDX-License-Identifier: GPL-2.0 */
|
||||
+/*
|
||||
@@ -6338,7 +6338,7 @@ diff -Naur null/fs/aufs/dcsub.h linux-5.15.41/fs/aufs/dcsub.h
|
||||
+#endif /* __AUFS_DCSUB_H__ */
|
||||
diff -Naur null/fs/aufs/debug.c linux-5.15.41/fs/aufs/debug.c
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/debug.c 2022-09-06 12:51:51.036709937 +0300
|
||||
+++ linux-5.15.41/fs/aufs/debug.c 2023-01-03 20:33:04.502529204 +0300
|
||||
@@ -0,0 +1,444 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
@@ -6786,7 +6786,7 @@ diff -Naur null/fs/aufs/debug.c linux-5.15.41/fs/aufs/debug.c
|
||||
+}
|
||||
diff -Naur null/fs/aufs/debug.h linux-5.15.41/fs/aufs/debug.h
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/debug.h 2022-09-06 12:51:51.036709937 +0300
|
||||
+++ linux-5.15.41/fs/aufs/debug.h 2023-01-03 20:33:04.503529191 +0300
|
||||
@@ -0,0 +1,226 @@
|
||||
+/* SPDX-License-Identifier: GPL-2.0 */
|
||||
+/*
|
||||
@@ -7016,7 +7016,7 @@ diff -Naur null/fs/aufs/debug.h linux-5.15.41/fs/aufs/debug.h
|
||||
+#endif /* __AUFS_DEBUG_H__ */
|
||||
diff -Naur null/fs/aufs/dentry.c linux-5.15.41/fs/aufs/dentry.c
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/dentry.c 2022-09-06 12:51:51.036709937 +0300
|
||||
+++ linux-5.15.41/fs/aufs/dentry.c 2023-01-03 20:33:04.503529191 +0300
|
||||
@@ -0,0 +1,1168 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
@@ -8188,7 +8188,7 @@ diff -Naur null/fs/aufs/dentry.c linux-5.15.41/fs/aufs/dentry.c
|
||||
+};
|
||||
diff -Naur null/fs/aufs/dentry.h linux-5.15.41/fs/aufs/dentry.h
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/dentry.h 2022-09-06 12:51:51.036709937 +0300
|
||||
+++ linux-5.15.41/fs/aufs/dentry.h 2023-01-03 20:33:04.503529191 +0300
|
||||
@@ -0,0 +1,269 @@
|
||||
+/* SPDX-License-Identifier: GPL-2.0 */
|
||||
+/*
|
||||
@@ -8461,7 +8461,7 @@ diff -Naur null/fs/aufs/dentry.h linux-5.15.41/fs/aufs/dentry.h
|
||||
+#endif /* __AUFS_DENTRY_H__ */
|
||||
diff -Naur null/fs/aufs/dinfo.c linux-5.15.41/fs/aufs/dinfo.c
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/dinfo.c 2022-09-06 12:51:51.037709924 +0300
|
||||
+++ linux-5.15.41/fs/aufs/dinfo.c 2023-01-03 20:33:04.503529191 +0300
|
||||
@@ -0,0 +1,554 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
@@ -9019,7 +9019,7 @@ diff -Naur null/fs/aufs/dinfo.c linux-5.15.41/fs/aufs/dinfo.c
|
||||
+}
|
||||
diff -Naur null/fs/aufs/dir.c linux-5.15.41/fs/aufs/dir.c
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/dir.c 2022-09-06 12:51:51.037709924 +0300
|
||||
+++ linux-5.15.41/fs/aufs/dir.c 2023-01-03 20:33:04.503529191 +0300
|
||||
@@ -0,0 +1,765 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
@@ -9788,7 +9788,7 @@ diff -Naur null/fs/aufs/dir.c linux-5.15.41/fs/aufs/dir.c
|
||||
+};
|
||||
diff -Naur null/fs/aufs/dir.h linux-5.15.41/fs/aufs/dir.h
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/dir.h 2022-09-06 12:51:51.037709924 +0300
|
||||
+++ linux-5.15.41/fs/aufs/dir.h 2023-01-03 20:33:04.503529191 +0300
|
||||
@@ -0,0 +1,134 @@
|
||||
+/* SPDX-License-Identifier: GPL-2.0 */
|
||||
+/*
|
||||
@@ -9926,7 +9926,7 @@ diff -Naur null/fs/aufs/dir.h linux-5.15.41/fs/aufs/dir.h
|
||||
+#endif /* __AUFS_DIR_H__ */
|
||||
diff -Naur null/fs/aufs/dirren.c linux-5.15.41/fs/aufs/dirren.c
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/dirren.c 2022-09-06 12:51:51.037709924 +0300
|
||||
+++ linux-5.15.41/fs/aufs/dirren.c 2023-01-03 20:33:04.503529191 +0300
|
||||
@@ -0,0 +1,1315 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
@@ -11245,7 +11245,7 @@ diff -Naur null/fs/aufs/dirren.c linux-5.15.41/fs/aufs/dirren.c
|
||||
+}
|
||||
diff -Naur null/fs/aufs/dirren.h linux-5.15.41/fs/aufs/dirren.h
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/dirren.h 2022-09-06 12:51:51.037709924 +0300
|
||||
+++ linux-5.15.41/fs/aufs/dirren.h 2023-01-03 20:33:04.503529191 +0300
|
||||
@@ -0,0 +1,140 @@
|
||||
+/* SPDX-License-Identifier: GPL-2.0 */
|
||||
+/*
|
||||
@@ -11389,7 +11389,7 @@ diff -Naur null/fs/aufs/dirren.h linux-5.15.41/fs/aufs/dirren.h
|
||||
+#endif /* __AUFS_DIRREN_H__ */
|
||||
diff -Naur null/fs/aufs/dynop.c linux-5.15.41/fs/aufs/dynop.c
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/dynop.c 2022-09-06 12:51:51.037709924 +0300
|
||||
+++ linux-5.15.41/fs/aufs/dynop.c 2023-01-03 20:33:04.504529179 +0300
|
||||
@@ -0,0 +1,368 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
@@ -11761,7 +11761,7 @@ diff -Naur null/fs/aufs/dynop.c linux-5.15.41/fs/aufs/dynop.c
|
||||
+}
|
||||
diff -Naur null/fs/aufs/dynop.h linux-5.15.41/fs/aufs/dynop.h
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/dynop.h 2022-09-06 12:51:51.038709912 +0300
|
||||
+++ linux-5.15.41/fs/aufs/dynop.h 2023-01-03 20:33:04.504529179 +0300
|
||||
@@ -0,0 +1,77 @@
|
||||
+/* SPDX-License-Identifier: GPL-2.0 */
|
||||
+/*
|
||||
@@ -11842,7 +11842,7 @@ diff -Naur null/fs/aufs/dynop.h linux-5.15.41/fs/aufs/dynop.h
|
||||
+#endif /* __AUFS_DYNOP_H__ */
|
||||
diff -Naur null/fs/aufs/export.c linux-5.15.41/fs/aufs/export.c
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/export.c 2022-09-06 12:51:51.038709912 +0300
|
||||
+++ linux-5.15.41/fs/aufs/export.c 2023-01-03 20:33:04.504529179 +0300
|
||||
@@ -0,0 +1,830 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
@@ -12676,7 +12676,7 @@ diff -Naur null/fs/aufs/export.c linux-5.15.41/fs/aufs/export.c
|
||||
+}
|
||||
diff -Naur null/fs/aufs/fhsm.c linux-5.15.41/fs/aufs/fhsm.c
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/fhsm.c 2022-09-06 12:51:51.038709912 +0300
|
||||
+++ linux-5.15.41/fs/aufs/fhsm.c 2023-01-03 20:33:04.504529179 +0300
|
||||
@@ -0,0 +1,427 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
@@ -13107,7 +13107,7 @@ diff -Naur null/fs/aufs/fhsm.c linux-5.15.41/fs/aufs/fhsm.c
|
||||
+}
|
||||
diff -Naur null/fs/aufs/file.c linux-5.15.41/fs/aufs/file.c
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/file.c 2022-09-06 12:51:51.039709899 +0300
|
||||
+++ linux-5.15.41/fs/aufs/file.c 2023-01-03 20:33:04.504529179 +0300
|
||||
@@ -0,0 +1,863 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
@@ -13974,7 +13974,7 @@ diff -Naur null/fs/aufs/file.c linux-5.15.41/fs/aufs/file.c
|
||||
+};
|
||||
diff -Naur null/fs/aufs/file.h linux-5.15.41/fs/aufs/file.h
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/file.h 2022-09-06 12:51:51.039709899 +0300
|
||||
+++ linux-5.15.41/fs/aufs/file.h 2023-01-03 20:33:04.504529179 +0300
|
||||
@@ -0,0 +1,342 @@
|
||||
+/* SPDX-License-Identifier: GPL-2.0 */
|
||||
+/*
|
||||
@@ -14320,7 +14320,7 @@ diff -Naur null/fs/aufs/file.h linux-5.15.41/fs/aufs/file.h
|
||||
+#endif /* __AUFS_FILE_H__ */
|
||||
diff -Naur null/fs/aufs/finfo.c linux-5.15.41/fs/aufs/finfo.c
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/finfo.c 2022-09-06 12:51:51.039709899 +0300
|
||||
+++ linux-5.15.41/fs/aufs/finfo.c 2023-01-03 20:33:04.504529179 +0300
|
||||
@@ -0,0 +1,149 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
@@ -14473,8 +14473,8 @@ diff -Naur null/fs/aufs/finfo.c linux-5.15.41/fs/aufs/finfo.c
|
||||
+}
|
||||
diff -Naur null/fs/aufs/f_op.c linux-5.15.41/fs/aufs/f_op.c
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/f_op.c 2022-09-06 12:51:51.038709912 +0300
|
||||
@@ -0,0 +1,771 @@
|
||||
+++ linux-5.15.41/fs/aufs/f_op.c 2023-01-03 20:33:04.504529179 +0300
|
||||
@@ -0,0 +1,775 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
+ * Copyright (C) 2005-2021 Junjiro R. Okajima
|
||||
@@ -14920,6 +14920,10 @@ diff -Naur null/fs/aufs/f_op.c linux-5.15.41/fs/aufs/f_op.c
|
||||
+ lockdep_off();
|
||||
+ err = vfs_fallocate(h_file, mode, offset, len);
|
||||
+ lockdep_on();
|
||||
+ /*
|
||||
+ * we don't need to call file_modifed() here since au_write_post()
|
||||
+ * is equivalent and copies-up all timestamps and permission bits.
|
||||
+ */
|
||||
+ au_write_post(inode, h_file, &wpre, /*written*/1);
|
||||
+
|
||||
+out:
|
||||
@@ -15248,7 +15252,7 @@ diff -Naur null/fs/aufs/f_op.c linux-5.15.41/fs/aufs/f_op.c
|
||||
+};
|
||||
diff -Naur null/fs/aufs/fsctx.c linux-5.15.41/fs/aufs/fsctx.c
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/fsctx.c 2022-09-06 12:51:51.039709899 +0300
|
||||
+++ linux-5.15.41/fs/aufs/fsctx.c 2023-01-03 20:33:04.505529166 +0300
|
||||
@@ -0,0 +1,1242 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
@@ -16494,7 +16498,7 @@ diff -Naur null/fs/aufs/fsctx.c linux-5.15.41/fs/aufs/fsctx.c
|
||||
+}
|
||||
diff -Naur null/fs/aufs/fstype.h linux-5.15.41/fs/aufs/fstype.h
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/fstype.h 2022-09-06 12:51:51.039709899 +0300
|
||||
+++ linux-5.15.41/fs/aufs/fstype.h 2023-01-03 20:33:04.505529166 +0300
|
||||
@@ -0,0 +1,401 @@
|
||||
+/* SPDX-License-Identifier: GPL-2.0 */
|
||||
+/*
|
||||
@@ -16899,7 +16903,7 @@ diff -Naur null/fs/aufs/fstype.h linux-5.15.41/fs/aufs/fstype.h
|
||||
+#endif /* __AUFS_FSTYPE_H__ */
|
||||
diff -Naur null/fs/aufs/hbl.h linux-5.15.41/fs/aufs/hbl.h
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/hbl.h 2022-09-06 12:51:51.039709899 +0300
|
||||
+++ linux-5.15.41/fs/aufs/hbl.h 2023-01-03 20:33:04.505529166 +0300
|
||||
@@ -0,0 +1,65 @@
|
||||
+/* SPDX-License-Identifier: GPL-2.0 */
|
||||
+/*
|
||||
@@ -16968,7 +16972,7 @@ diff -Naur null/fs/aufs/hbl.h linux-5.15.41/fs/aufs/hbl.h
|
||||
+#endif /* __AUFS_HBL_H__ */
|
||||
diff -Naur null/fs/aufs/hfsnotify.c linux-5.15.41/fs/aufs/hfsnotify.c
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/hfsnotify.c 2022-09-06 12:51:51.040709887 +0300
|
||||
+++ linux-5.15.41/fs/aufs/hfsnotify.c 2023-01-03 20:33:04.505529166 +0300
|
||||
@@ -0,0 +1,288 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
@@ -17260,7 +17264,7 @@ diff -Naur null/fs/aufs/hfsnotify.c linux-5.15.41/fs/aufs/hfsnotify.c
|
||||
+};
|
||||
diff -Naur null/fs/aufs/hfsplus.c linux-5.15.41/fs/aufs/hfsplus.c
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/hfsplus.c 2022-09-06 12:51:51.040709887 +0300
|
||||
+++ linux-5.15.41/fs/aufs/hfsplus.c 2023-01-03 20:33:04.505529166 +0300
|
||||
@@ -0,0 +1,60 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
@@ -17324,7 +17328,7 @@ diff -Naur null/fs/aufs/hfsplus.c linux-5.15.41/fs/aufs/hfsplus.c
|
||||
+}
|
||||
diff -Naur null/fs/aufs/hnotify.c linux-5.15.41/fs/aufs/hnotify.c
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/hnotify.c 2022-09-06 12:51:51.040709887 +0300
|
||||
+++ linux-5.15.41/fs/aufs/hnotify.c 2023-01-03 20:33:04.505529166 +0300
|
||||
@@ -0,0 +1,715 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
@@ -18043,7 +18047,7 @@ diff -Naur null/fs/aufs/hnotify.c linux-5.15.41/fs/aufs/hnotify.c
|
||||
+}
|
||||
diff -Naur null/fs/aufs/iinfo.c linux-5.15.41/fs/aufs/iinfo.c
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/iinfo.c 2022-09-06 12:51:51.041709874 +0300
|
||||
+++ linux-5.15.41/fs/aufs/iinfo.c 2023-01-03 20:33:04.506529154 +0300
|
||||
@@ -0,0 +1,286 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
@@ -18333,7 +18337,7 @@ diff -Naur null/fs/aufs/iinfo.c linux-5.15.41/fs/aufs/iinfo.c
|
||||
+}
|
||||
diff -Naur null/fs/aufs/inode.c linux-5.15.41/fs/aufs/inode.c
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/inode.c 2022-09-06 12:51:51.041709874 +0300
|
||||
+++ linux-5.15.41/fs/aufs/inode.c 2023-01-03 20:33:04.506529154 +0300
|
||||
@@ -0,0 +1,531 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
@@ -18868,7 +18872,7 @@ diff -Naur null/fs/aufs/inode.c linux-5.15.41/fs/aufs/inode.c
|
||||
+}
|
||||
diff -Naur null/fs/aufs/inode.h linux-5.15.41/fs/aufs/inode.h
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/inode.h 2022-09-06 12:51:51.042709862 +0300
|
||||
+++ linux-5.15.41/fs/aufs/inode.h 2023-01-03 20:33:04.506529154 +0300
|
||||
@@ -0,0 +1,705 @@
|
||||
+/* SPDX-License-Identifier: GPL-2.0 */
|
||||
+/*
|
||||
@@ -19577,7 +19581,7 @@ diff -Naur null/fs/aufs/inode.h linux-5.15.41/fs/aufs/inode.h
|
||||
+#endif /* __AUFS_INODE_H__ */
|
||||
diff -Naur null/fs/aufs/ioctl.c linux-5.15.41/fs/aufs/ioctl.c
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/ioctl.c 2022-09-06 12:51:51.042709862 +0300
|
||||
+++ linux-5.15.41/fs/aufs/ioctl.c 2023-01-03 20:33:04.506529154 +0300
|
||||
@@ -0,0 +1,220 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
@@ -19801,7 +19805,7 @@ diff -Naur null/fs/aufs/ioctl.c linux-5.15.41/fs/aufs/ioctl.c
|
||||
+#endif
|
||||
diff -Naur null/fs/aufs/i_op_add.c linux-5.15.41/fs/aufs/i_op_add.c
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/i_op_add.c 2022-09-06 12:51:51.041709874 +0300
|
||||
+++ linux-5.15.41/fs/aufs/i_op_add.c 2023-01-03 20:33:04.505529166 +0300
|
||||
@@ -0,0 +1,941 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
@@ -20746,7 +20750,7 @@ diff -Naur null/fs/aufs/i_op_add.c linux-5.15.41/fs/aufs/i_op_add.c
|
||||
+}
|
||||
diff -Naur null/fs/aufs/i_op.c linux-5.15.41/fs/aufs/i_op.c
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/i_op.c 2022-09-06 12:51:51.040709887 +0300
|
||||
+++ linux-5.15.41/fs/aufs/i_op.c 2023-01-03 20:33:04.505529166 +0300
|
||||
@@ -0,0 +1,1512 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
@@ -22262,7 +22266,7 @@ diff -Naur null/fs/aufs/i_op.c linux-5.15.41/fs/aufs/i_op.c
|
||||
+};
|
||||
diff -Naur null/fs/aufs/i_op_del.c linux-5.15.41/fs/aufs/i_op_del.c
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/i_op_del.c 2022-09-06 12:51:51.041709874 +0300
|
||||
+++ linux-5.15.41/fs/aufs/i_op_del.c 2023-01-03 20:33:04.506529154 +0300
|
||||
@@ -0,0 +1,522 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
@@ -22788,7 +22792,7 @@ diff -Naur null/fs/aufs/i_op_del.c linux-5.15.41/fs/aufs/i_op_del.c
|
||||
+}
|
||||
diff -Naur null/fs/aufs/i_op_ren.c linux-5.15.41/fs/aufs/i_op_ren.c
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/i_op_ren.c 2022-09-06 12:51:51.041709874 +0300
|
||||
+++ linux-5.15.41/fs/aufs/i_op_ren.c 2023-01-03 20:33:04.506529154 +0300
|
||||
@@ -0,0 +1,1257 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
@@ -24049,7 +24053,7 @@ diff -Naur null/fs/aufs/i_op_ren.c linux-5.15.41/fs/aufs/i_op_ren.c
|
||||
+}
|
||||
diff -Naur null/fs/aufs/Kconfig linux-5.15.41/fs/aufs/Kconfig
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/Kconfig 2022-09-06 12:51:51.034709962 +0300
|
||||
+++ linux-5.15.41/fs/aufs/Kconfig 2023-01-03 20:33:04.501529216 +0300
|
||||
@@ -0,0 +1,199 @@
|
||||
+# SPDX-License-Identifier: GPL-2.0
|
||||
+config AUFS_FS
|
||||
@@ -24252,7 +24256,7 @@ diff -Naur null/fs/aufs/Kconfig linux-5.15.41/fs/aufs/Kconfig
|
||||
+endif
|
||||
diff -Naur null/fs/aufs/lcnt.h linux-5.15.41/fs/aufs/lcnt.h
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/lcnt.h 2022-09-06 12:51:51.042709862 +0300
|
||||
+++ linux-5.15.41/fs/aufs/lcnt.h 2023-01-03 20:33:04.506529154 +0300
|
||||
@@ -0,0 +1,186 @@
|
||||
+/* SPDX-License-Identifier: GPL-2.0 */
|
||||
+/*
|
||||
@@ -24442,7 +24446,7 @@ diff -Naur null/fs/aufs/lcnt.h linux-5.15.41/fs/aufs/lcnt.h
|
||||
+#endif /* __AUFS_LCNT_H__ */
|
||||
diff -Naur null/fs/aufs/loop.c linux-5.15.41/fs/aufs/loop.c
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/loop.c 2022-09-06 12:51:51.042709862 +0300
|
||||
+++ linux-5.15.41/fs/aufs/loop.c 2023-01-03 20:33:04.506529154 +0300
|
||||
@@ -0,0 +1,148 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
@@ -24594,7 +24598,7 @@ diff -Naur null/fs/aufs/loop.c linux-5.15.41/fs/aufs/loop.c
|
||||
+}
|
||||
diff -Naur null/fs/aufs/loop.h linux-5.15.41/fs/aufs/loop.h
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/loop.h 2022-09-06 12:51:51.042709862 +0300
|
||||
+++ linux-5.15.41/fs/aufs/loop.h 2023-01-03 20:33:04.506529154 +0300
|
||||
@@ -0,0 +1,55 @@
|
||||
+/* SPDX-License-Identifier: GPL-2.0 */
|
||||
+/*
|
||||
@@ -24653,7 +24657,7 @@ diff -Naur null/fs/aufs/loop.h linux-5.15.41/fs/aufs/loop.h
|
||||
+#endif /* __AUFS_LOOP_H__ */
|
||||
diff -Naur null/fs/aufs/magic.mk linux-5.15.41/fs/aufs/magic.mk
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/magic.mk 2022-09-06 12:51:51.042709862 +0300
|
||||
+++ linux-5.15.41/fs/aufs/magic.mk 2023-01-03 20:33:04.507529141 +0300
|
||||
@@ -0,0 +1,31 @@
|
||||
+# SPDX-License-Identifier: GPL-2.0
|
||||
+
|
||||
@@ -24688,7 +24692,7 @@ diff -Naur null/fs/aufs/magic.mk linux-5.15.41/fs/aufs/magic.mk
|
||||
+endif
|
||||
diff -Naur null/fs/aufs/Makefile linux-5.15.41/fs/aufs/Makefile
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/Makefile 2022-09-06 12:51:51.034709962 +0300
|
||||
+++ linux-5.15.41/fs/aufs/Makefile 2023-01-03 20:33:04.501529216 +0300
|
||||
@@ -0,0 +1,46 @@
|
||||
+# SPDX-License-Identifier: GPL-2.0
|
||||
+
|
||||
@@ -24738,7 +24742,7 @@ diff -Naur null/fs/aufs/Makefile linux-5.15.41/fs/aufs/Makefile
|
||||
+aufs-$(CONFIG_AUFS_MAGIC_SYSRQ) += sysrq.o
|
||||
diff -Naur null/fs/aufs/module.c linux-5.15.41/fs/aufs/module.c
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/module.c 2022-09-06 12:51:51.042709862 +0300
|
||||
+++ linux-5.15.41/fs/aufs/module.c 2023-01-03 20:33:04.507529141 +0300
|
||||
@@ -0,0 +1,273 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
@@ -25015,7 +25019,7 @@ diff -Naur null/fs/aufs/module.c linux-5.15.41/fs/aufs/module.c
|
||||
+module_exit(aufs_exit);
|
||||
diff -Naur null/fs/aufs/module.h linux-5.15.41/fs/aufs/module.h
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/module.h 2022-09-06 12:51:51.042709862 +0300
|
||||
+++ linux-5.15.41/fs/aufs/module.h 2023-01-03 20:33:04.507529141 +0300
|
||||
@@ -0,0 +1,166 @@
|
||||
+/* SPDX-License-Identifier: GPL-2.0 */
|
||||
+/*
|
||||
@@ -25185,7 +25189,7 @@ diff -Naur null/fs/aufs/module.h linux-5.15.41/fs/aufs/module.h
|
||||
+#endif /* __AUFS_MODULE_H__ */
|
||||
diff -Naur null/fs/aufs/mvdown.c linux-5.15.41/fs/aufs/mvdown.c
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/mvdown.c 2022-09-06 12:51:51.043709849 +0300
|
||||
+++ linux-5.15.41/fs/aufs/mvdown.c 2023-01-03 20:33:04.507529141 +0300
|
||||
@@ -0,0 +1,706 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
@@ -25895,7 +25899,7 @@ diff -Naur null/fs/aufs/mvdown.c linux-5.15.41/fs/aufs/mvdown.c
|
||||
+}
|
||||
diff -Naur null/fs/aufs/opts.c linux-5.15.41/fs/aufs/opts.c
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/opts.c 2022-09-06 12:51:51.043709849 +0300
|
||||
+++ linux-5.15.41/fs/aufs/opts.c 2023-01-03 20:33:04.507529141 +0300
|
||||
@@ -0,0 +1,1032 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
@@ -26931,7 +26935,7 @@ diff -Naur null/fs/aufs/opts.c linux-5.15.41/fs/aufs/opts.c
|
||||
+}
|
||||
diff -Naur null/fs/aufs/opts.h linux-5.15.41/fs/aufs/opts.h
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/opts.h 2022-09-06 12:51:51.043709849 +0300
|
||||
+++ linux-5.15.41/fs/aufs/opts.h 2023-01-03 20:33:04.507529141 +0300
|
||||
@@ -0,0 +1,263 @@
|
||||
+/* SPDX-License-Identifier: GPL-2.0 */
|
||||
+/*
|
||||
@@ -27198,7 +27202,7 @@ diff -Naur null/fs/aufs/opts.h linux-5.15.41/fs/aufs/opts.h
|
||||
+#endif /* __AUFS_OPTS_H__ */
|
||||
diff -Naur null/fs/aufs/plink.c linux-5.15.41/fs/aufs/plink.c
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/plink.c 2022-09-06 12:51:51.043709849 +0300
|
||||
+++ linux-5.15.41/fs/aufs/plink.c 2023-01-03 20:33:04.507529141 +0300
|
||||
@@ -0,0 +1,516 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
@@ -27718,7 +27722,7 @@ diff -Naur null/fs/aufs/plink.c linux-5.15.41/fs/aufs/plink.c
|
||||
+}
|
||||
diff -Naur null/fs/aufs/poll.c linux-5.15.41/fs/aufs/poll.c
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/poll.c 2022-09-06 12:51:51.044709837 +0300
|
||||
+++ linux-5.15.41/fs/aufs/poll.c 2023-01-03 20:33:04.507529141 +0300
|
||||
@@ -0,0 +1,51 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
@@ -27773,7 +27777,7 @@ diff -Naur null/fs/aufs/poll.c linux-5.15.41/fs/aufs/poll.c
|
||||
+}
|
||||
diff -Naur null/fs/aufs/posix_acl.c linux-5.15.41/fs/aufs/posix_acl.c
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/posix_acl.c 2022-09-06 12:51:51.044709837 +0300
|
||||
+++ linux-5.15.41/fs/aufs/posix_acl.c 2023-01-03 20:33:04.508529129 +0300
|
||||
@@ -0,0 +1,111 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
@@ -27888,7 +27892,7 @@ diff -Naur null/fs/aufs/posix_acl.c linux-5.15.41/fs/aufs/posix_acl.c
|
||||
+}
|
||||
diff -Naur null/fs/aufs/procfs.c linux-5.15.41/fs/aufs/procfs.c
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/procfs.c 2022-09-06 12:51:51.044709837 +0300
|
||||
+++ linux-5.15.41/fs/aufs/procfs.c 2023-01-03 20:33:04.508529129 +0300
|
||||
@@ -0,0 +1,170 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
@@ -28062,7 +28066,7 @@ diff -Naur null/fs/aufs/procfs.c linux-5.15.41/fs/aufs/procfs.c
|
||||
+}
|
||||
diff -Naur null/fs/aufs/rdu.c linux-5.15.41/fs/aufs/rdu.c
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/rdu.c 2022-09-06 12:51:51.044709837 +0300
|
||||
+++ linux-5.15.41/fs/aufs/rdu.c 2023-01-03 20:33:04.508529129 +0300
|
||||
@@ -0,0 +1,384 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
@@ -28450,7 +28454,7 @@ diff -Naur null/fs/aufs/rdu.c linux-5.15.41/fs/aufs/rdu.c
|
||||
+#endif
|
||||
diff -Naur null/fs/aufs/rwsem.h linux-5.15.41/fs/aufs/rwsem.h
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/rwsem.h 2022-09-06 12:51:51.044709837 +0300
|
||||
+++ linux-5.15.41/fs/aufs/rwsem.h 2023-01-03 20:33:04.508529129 +0300
|
||||
@@ -0,0 +1,85 @@
|
||||
+/* SPDX-License-Identifier: GPL-2.0 */
|
||||
+/*
|
||||
@@ -28539,7 +28543,7 @@ diff -Naur null/fs/aufs/rwsem.h linux-5.15.41/fs/aufs/rwsem.h
|
||||
+#endif /* __AUFS_RWSEM_H__ */
|
||||
diff -Naur null/fs/aufs/sbinfo.c linux-5.15.41/fs/aufs/sbinfo.c
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/sbinfo.c 2022-09-06 12:51:51.044709837 +0300
|
||||
+++ linux-5.15.41/fs/aufs/sbinfo.c 2023-01-03 20:33:04.508529129 +0300
|
||||
@@ -0,0 +1,316 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
@@ -28859,7 +28863,7 @@ diff -Naur null/fs/aufs/sbinfo.c linux-5.15.41/fs/aufs/sbinfo.c
|
||||
+}
|
||||
diff -Naur null/fs/aufs/super.c linux-5.15.41/fs/aufs/super.c
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/super.c 2022-09-06 12:51:51.044709837 +0300
|
||||
+++ linux-5.15.41/fs/aufs/super.c 2023-01-03 20:33:04.508529129 +0300
|
||||
@@ -0,0 +1,871 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
@@ -29734,7 +29738,7 @@ diff -Naur null/fs/aufs/super.c linux-5.15.41/fs/aufs/super.c
|
||||
+};
|
||||
diff -Naur null/fs/aufs/super.h linux-5.15.41/fs/aufs/super.h
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/super.h 2022-09-06 12:51:51.045709824 +0300
|
||||
+++ linux-5.15.41/fs/aufs/super.h 2023-01-03 20:33:04.508529129 +0300
|
||||
@@ -0,0 +1,592 @@
|
||||
+/* SPDX-License-Identifier: GPL-2.0 */
|
||||
+/*
|
||||
@@ -30330,7 +30334,7 @@ diff -Naur null/fs/aufs/super.h linux-5.15.41/fs/aufs/super.h
|
||||
+#endif /* __AUFS_SUPER_H__ */
|
||||
diff -Naur null/fs/aufs/sysaufs.c linux-5.15.41/fs/aufs/sysaufs.c
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/sysaufs.c 2022-09-06 12:51:51.045709824 +0300
|
||||
+++ linux-5.15.41/fs/aufs/sysaufs.c 2023-01-03 20:33:04.508529129 +0300
|
||||
@@ -0,0 +1,93 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
@@ -30427,7 +30431,7 @@ diff -Naur null/fs/aufs/sysaufs.c linux-5.15.41/fs/aufs/sysaufs.c
|
||||
+}
|
||||
diff -Naur null/fs/aufs/sysaufs.h linux-5.15.41/fs/aufs/sysaufs.h
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/sysaufs.h 2022-09-06 12:51:51.045709824 +0300
|
||||
+++ linux-5.15.41/fs/aufs/sysaufs.h 2023-01-03 20:33:04.508529129 +0300
|
||||
@@ -0,0 +1,102 @@
|
||||
+/* SPDX-License-Identifier: GPL-2.0 */
|
||||
+/*
|
||||
@@ -30533,7 +30537,7 @@ diff -Naur null/fs/aufs/sysaufs.h linux-5.15.41/fs/aufs/sysaufs.h
|
||||
+#endif /* __SYSAUFS_H__ */
|
||||
diff -Naur null/fs/aufs/sysfs.c linux-5.15.41/fs/aufs/sysfs.c
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/sysfs.c 2022-09-06 12:51:51.045709824 +0300
|
||||
+++ linux-5.15.41/fs/aufs/sysfs.c 2023-01-03 20:33:04.508529129 +0300
|
||||
@@ -0,0 +1,374 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
@@ -30911,7 +30915,7 @@ diff -Naur null/fs/aufs/sysfs.c linux-5.15.41/fs/aufs/sysfs.c
|
||||
+}
|
||||
diff -Naur null/fs/aufs/sysrq.c linux-5.15.41/fs/aufs/sysrq.c
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/sysrq.c 2022-09-06 12:51:51.045709824 +0300
|
||||
+++ linux-5.15.41/fs/aufs/sysrq.c 2023-01-03 20:33:04.508529129 +0300
|
||||
@@ -0,0 +1,149 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
@@ -31064,7 +31068,7 @@ diff -Naur null/fs/aufs/sysrq.c linux-5.15.41/fs/aufs/sysrq.c
|
||||
+}
|
||||
diff -Naur null/fs/aufs/vdir.c linux-5.15.41/fs/aufs/vdir.c
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/vdir.c 2022-09-06 12:51:51.045709824 +0300
|
||||
+++ linux-5.15.41/fs/aufs/vdir.c 2023-01-03 20:33:04.509529116 +0300
|
||||
@@ -0,0 +1,896 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
@@ -31964,7 +31968,7 @@ diff -Naur null/fs/aufs/vdir.c linux-5.15.41/fs/aufs/vdir.c
|
||||
+}
|
||||
diff -Naur null/fs/aufs/vfsub.c linux-5.15.41/fs/aufs/vfsub.c
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/vfsub.c 2022-09-06 12:51:51.045709824 +0300
|
||||
+++ linux-5.15.41/fs/aufs/vfsub.c 2023-01-03 20:33:04.509529116 +0300
|
||||
@@ -0,0 +1,918 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
@@ -32886,7 +32890,7 @@ diff -Naur null/fs/aufs/vfsub.c linux-5.15.41/fs/aufs/vfsub.c
|
||||
+}
|
||||
diff -Naur null/fs/aufs/vfsub.h linux-5.15.41/fs/aufs/vfsub.h
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/vfsub.h 2022-09-06 12:51:51.046709812 +0300
|
||||
+++ linux-5.15.41/fs/aufs/vfsub.h 2023-01-03 20:33:04.509529116 +0300
|
||||
@@ -0,0 +1,358 @@
|
||||
+/* SPDX-License-Identifier: GPL-2.0 */
|
||||
+/*
|
||||
@@ -33248,7 +33252,7 @@ diff -Naur null/fs/aufs/vfsub.h linux-5.15.41/fs/aufs/vfsub.h
|
||||
+#endif /* __AUFS_VFSUB_H__ */
|
||||
diff -Naur null/fs/aufs/wbr_policy.c linux-5.15.41/fs/aufs/wbr_policy.c
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/wbr_policy.c 2022-09-06 12:51:51.046709812 +0300
|
||||
+++ linux-5.15.41/fs/aufs/wbr_policy.c 2023-01-03 20:33:04.509529116 +0300
|
||||
@@ -0,0 +1,830 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
@@ -34082,7 +34086,7 @@ diff -Naur null/fs/aufs/wbr_policy.c linux-5.15.41/fs/aufs/wbr_policy.c
|
||||
+};
|
||||
diff -Naur null/fs/aufs/whout.c linux-5.15.41/fs/aufs/whout.c
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/whout.c 2022-09-06 12:51:51.046709812 +0300
|
||||
+++ linux-5.15.41/fs/aufs/whout.c 2023-01-03 20:33:04.509529116 +0300
|
||||
@@ -0,0 +1,1072 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
@@ -35158,7 +35162,7 @@ diff -Naur null/fs/aufs/whout.c linux-5.15.41/fs/aufs/whout.c
|
||||
+}
|
||||
diff -Naur null/fs/aufs/whout.h linux-5.15.41/fs/aufs/whout.h
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/whout.h 2022-09-06 12:51:51.046709812 +0300
|
||||
+++ linux-5.15.41/fs/aufs/whout.h 2023-01-03 20:33:04.509529116 +0300
|
||||
@@ -0,0 +1,87 @@
|
||||
+/* SPDX-License-Identifier: GPL-2.0 */
|
||||
+/*
|
||||
@@ -35249,7 +35253,7 @@ diff -Naur null/fs/aufs/whout.h linux-5.15.41/fs/aufs/whout.h
|
||||
+#endif /* __AUFS_WHOUT_H__ */
|
||||
diff -Naur null/fs/aufs/wkq.c linux-5.15.41/fs/aufs/wkq.c
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/wkq.c 2022-09-06 12:51:51.046709812 +0300
|
||||
+++ linux-5.15.41/fs/aufs/wkq.c 2023-01-03 20:33:04.509529116 +0300
|
||||
@@ -0,0 +1,372 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
@@ -35625,7 +35629,7 @@ diff -Naur null/fs/aufs/wkq.c linux-5.15.41/fs/aufs/wkq.c
|
||||
+}
|
||||
diff -Naur null/fs/aufs/wkq.h linux-5.15.41/fs/aufs/wkq.h
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/wkq.h 2022-09-06 12:51:51.047709799 +0300
|
||||
+++ linux-5.15.41/fs/aufs/wkq.h 2023-01-03 20:33:04.510529104 +0300
|
||||
@@ -0,0 +1,89 @@
|
||||
+/* SPDX-License-Identifier: GPL-2.0 */
|
||||
+/*
|
||||
@@ -35718,7 +35722,7 @@ diff -Naur null/fs/aufs/wkq.h linux-5.15.41/fs/aufs/wkq.h
|
||||
+#endif /* __AUFS_WKQ_H__ */
|
||||
diff -Naur null/fs/aufs/xattr.c linux-5.15.41/fs/aufs/xattr.c
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/xattr.c 2022-09-06 12:51:51.047709799 +0300
|
||||
+++ linux-5.15.41/fs/aufs/xattr.c 2023-01-03 20:33:04.510529104 +0300
|
||||
@@ -0,0 +1,368 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
@@ -36090,7 +36094,7 @@ diff -Naur null/fs/aufs/xattr.c linux-5.15.41/fs/aufs/xattr.c
|
||||
+}
|
||||
diff -Naur null/fs/aufs/xino.c linux-5.15.41/fs/aufs/xino.c
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/xino.c 2022-09-06 12:51:51.047709799 +0300
|
||||
+++ linux-5.15.41/fs/aufs/xino.c 2023-01-03 20:33:04.510529104 +0300
|
||||
@@ -0,0 +1,1926 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
@@ -38020,7 +38024,7 @@ diff -Naur null/fs/aufs/xino.c linux-5.15.41/fs/aufs/xino.c
|
||||
+}
|
||||
diff -Naur null/include/uapi/linux/aufs_type.h linux-5.15.41/include/uapi/linux/aufs_type.h
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/include/uapi/linux/aufs_type.h 2022-09-06 12:51:51.048709787 +0300
|
||||
+++ linux-5.15.41/include/uapi/linux/aufs_type.h 2023-01-03 20:33:04.510529104 +0300
|
||||
@@ -0,0 +1,452 @@
|
||||
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
|
||||
+/*
|
||||
@@ -38064,7 +38068,7 @@ diff -Naur null/include/uapi/linux/aufs_type.h linux-5.15.41/include/uapi/linux/
|
||||
+#include <limits.h>
|
||||
+#endif /* __KERNEL__ */
|
||||
+
|
||||
+#define AUFS_VERSION "5.15.41-20220620"
|
||||
+#define AUFS_VERSION "5.15.41-20221219"
|
||||
+
|
||||
+/* todo? move this to linux-2.6.19/include/magic.h */
|
||||
+#define AUFS_SUPER_MAGIC ('a' << 24 | 'u' << 16 | 'f' << 8 | 's')
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
+74
@@ -0,0 +1,74 @@
|
||||
From c1afb26727d9e507d3e17a9890e7aaf7fc85cd55 Mon Sep 17 00:00:00 2001
|
||||
From: Po-Hao Huang <phhuang@realtek.com>
|
||||
Date: Fri, 17 Dec 2021 09:27:08 +0800
|
||||
Subject: rtw88: 8822c: update rx settings to prevent potential hw deadlock
|
||||
|
||||
These settings enables mac to detect and recover when rx fifo
|
||||
circuit deadlock occurs. Previous version missed this, so we fix it.
|
||||
|
||||
Signed-off-by: Po-Hao Huang <phhuang@realtek.com>
|
||||
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
|
||||
Signed-off-by: Kalle Valo <kvalo@kernel.org>
|
||||
Link: https://lore.kernel.org/r/20211217012708.8623-1-pkshih@realtek.com
|
||||
---
|
||||
drivers/net/wireless/realtek/rtw88/main.c | 2 +-
|
||||
drivers/net/wireless/realtek/rtw88/rtw8821c.h | 2 +-
|
||||
drivers/net/wireless/realtek/rtw88/rtw8822b.c | 2 +-
|
||||
drivers/net/wireless/realtek/rtw88/rtw8822c.c | 2 +-
|
||||
4 files changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/drivers/net/wireless/realtek/rtw88/main.c b/drivers/net/wireless/realtek/rtw88/main.c
|
||||
index 78fcbc20942db..274e0af959177 100644
|
||||
--- a/drivers/net/wireless/realtek/rtw88/main.c
|
||||
+++ b/drivers/net/wireless/realtek/rtw88/main.c
|
||||
@@ -1869,7 +1869,7 @@ int rtw_core_init(struct rtw_dev *rtwdev)
|
||||
|
||||
/* default rx filter setting */
|
||||
rtwdev->hal.rcr = BIT_APP_FCS | BIT_APP_MIC | BIT_APP_ICV |
|
||||
- BIT_HTC_LOC_CTRL | BIT_APP_PHYSTS |
|
||||
+ BIT_PKTCTL_DLEN | BIT_HTC_LOC_CTRL | BIT_APP_PHYSTS |
|
||||
BIT_AB | BIT_AM | BIT_APM;
|
||||
|
||||
ret = rtw_load_firmware(rtwdev, RTW_NORMAL_FW);
|
||||
diff --git a/drivers/net/wireless/realtek/rtw88/rtw8821c.h b/drivers/net/wireless/realtek/rtw88/rtw8821c.h
|
||||
index 112faa60f653e..d9fbddd7b0f35 100644
|
||||
--- a/drivers/net/wireless/realtek/rtw88/rtw8821c.h
|
||||
+++ b/drivers/net/wireless/realtek/rtw88/rtw8821c.h
|
||||
@@ -131,7 +131,7 @@ _rtw_write32s_mask(struct rtw_dev *rtwdev, u32 addr, u32 mask, u32 data)
|
||||
#define WLAN_TX_FUNC_CFG2 0x30
|
||||
#define WLAN_MAC_OPT_NORM_FUNC1 0x98
|
||||
#define WLAN_MAC_OPT_LB_FUNC1 0x80
|
||||
-#define WLAN_MAC_OPT_FUNC2 0x30810041
|
||||
+#define WLAN_MAC_OPT_FUNC2 0xb0810041
|
||||
|
||||
#define WLAN_SIFS_CFG (WLAN_SIFS_CCK_CONT_TX | \
|
||||
(WLAN_SIFS_OFDM_CONT_TX << BIT_SHIFT_SIFS_OFDM_CTX) | \
|
||||
diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822b.c b/drivers/net/wireless/realtek/rtw88/rtw8822b.c
|
||||
index a4cbcc6bdcd14..dd4fbb82750d5 100644
|
||||
--- a/drivers/net/wireless/realtek/rtw88/rtw8822b.c
|
||||
+++ b/drivers/net/wireless/realtek/rtw88/rtw8822b.c
|
||||
@@ -205,7 +205,7 @@ static void rtw8822b_phy_set_param(struct rtw_dev *rtwdev)
|
||||
#define WLAN_TX_FUNC_CFG2 0x30
|
||||
#define WLAN_MAC_OPT_NORM_FUNC1 0x98
|
||||
#define WLAN_MAC_OPT_LB_FUNC1 0x80
|
||||
-#define WLAN_MAC_OPT_FUNC2 0x30810041
|
||||
+#define WLAN_MAC_OPT_FUNC2 0xb0810041
|
||||
|
||||
#define WLAN_SIFS_CFG (WLAN_SIFS_CCK_CONT_TX | \
|
||||
(WLAN_SIFS_OFDM_CONT_TX << BIT_SHIFT_SIFS_OFDM_CTX) | \
|
||||
diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822c.c b/drivers/net/wireless/realtek/rtw88/rtw8822c.c
|
||||
index a8b95dcdb8e90..e01d61b5d104b 100644
|
||||
--- a/drivers/net/wireless/realtek/rtw88/rtw8822c.c
|
||||
+++ b/drivers/net/wireless/realtek/rtw88/rtw8822c.c
|
||||
@@ -1962,7 +1962,7 @@ static void rtw8822c_phy_set_param(struct rtw_dev *rtwdev)
|
||||
#define WLAN_TX_FUNC_CFG2 0x30
|
||||
#define WLAN_MAC_OPT_NORM_FUNC1 0x98
|
||||
#define WLAN_MAC_OPT_LB_FUNC1 0x80
|
||||
-#define WLAN_MAC_OPT_FUNC2 0x30810041
|
||||
+#define WLAN_MAC_OPT_FUNC2 0xb0810041
|
||||
#define WLAN_MAC_INT_MIG_CFG 0x33330000
|
||||
|
||||
#define WLAN_SIFS_CFG (WLAN_SIFS_CCK_CONT_TX | \
|
||||
--
|
||||
cgit 1.2.3-1.el7
|
||||
|
||||
@@ -0,0 +1,14 @@
|
||||
|
||||
The staging driver rtlwifi/r8822be.ko.xz is being replaced by the new rtw88 driver.
|
||||
|
||||
Add a module alias to keep upgrade path.
|
||||
|
||||
Signed-off-by: Thomas Backlund <tmb@mageia.org>
|
||||
|
||||
--- a/drivers/net/wireless/realtek/rtw88/rtw8822be.c
|
||||
+++ b/drivers/net/wireless/realtek/rtw88/rtw8822be.c
|
||||
@@ -28,3 +28,4 @@ module_pci_driver(rtw_8822be_driver);
|
||||
MODULE_AUTHOR("Realtek Corporation");
|
||||
MODULE_DESCRIPTION("Realtek 802.11ac wireless 8822be driver");
|
||||
MODULE_LICENSE("Dual BSD/GPL");
|
||||
+MODULE_ALIAS("r8822be");
|
||||
+143
@@ -0,0 +1,143 @@
|
||||
From a3fd1f9aa79a7d3885faa486acb02c838533f332 Mon Sep 17 00:00:00 2001
|
||||
From: Chin-Yen Lee <timlee@realtek.com>
|
||||
Date: Fri, 17 Dec 2021 09:24:21 +0800
|
||||
Subject: rtw88: don't check CRC of VHT-SIG-B in 802.11ac signal
|
||||
|
||||
Currently all realtek wifi chip is set to check CRC of VHT-SIG-B
|
||||
in 802.11ac signal, but some AP don't calculate the CRC and packets
|
||||
from these AP can't be received and lead to disconnection.
|
||||
We disable the check defaultly to avoid this case.
|
||||
|
||||
Signed-off-by: Chin-Yen Lee <timlee@realtek.com>
|
||||
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
|
||||
Signed-off-by: Kalle Valo <kvalo@kernel.org>
|
||||
Link: https://lore.kernel.org/r/20211217012421.7859-1-pkshih@realtek.com
|
||||
---
|
||||
drivers/net/wireless/realtek/rtw88/bf.c | 14 +++++++++-----
|
||||
drivers/net/wireless/realtek/rtw88/bf.h | 7 +++++--
|
||||
drivers/net/wireless/realtek/rtw88/rtw8821c.c | 3 ++-
|
||||
drivers/net/wireless/realtek/rtw88/rtw8822b.c | 2 ++
|
||||
drivers/net/wireless/realtek/rtw88/rtw8822c.c | 2 ++
|
||||
5 files changed, 20 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/drivers/net/wireless/realtek/rtw88/bf.c b/drivers/net/wireless/realtek/rtw88/bf.c
|
||||
index aff70e4ae0288..df750b3a35e9d 100644
|
||||
--- a/drivers/net/wireless/realtek/rtw88/bf.c
|
||||
+++ b/drivers/net/wireless/realtek/rtw88/bf.c
|
||||
@@ -130,7 +130,8 @@ void rtw_bf_cfg_sounding(struct rtw_dev *rtwdev, struct rtw_vif *vif,
|
||||
BIT_WMAC_USE_NDPARATE |
|
||||
(csi_rsc << 13);
|
||||
|
||||
- rtw_write8(rtwdev, REG_SND_PTCL_CTRL, RTW_SND_CTRL_SOUNDING);
|
||||
+ rtw_write8_mask(rtwdev, REG_SND_PTCL_CTRL, BIT_MASK_BEAMFORM,
|
||||
+ RTW_SND_CTRL_SOUNDING);
|
||||
rtw_write8(rtwdev, REG_SND_PTCL_CTRL + 3, 0x26);
|
||||
rtw_write8_clr(rtwdev, REG_RXFLTMAP1, BIT_RXFLTMAP1_BF_REPORT_POLL);
|
||||
rtw_write8_clr(rtwdev, REG_RXFLTMAP4, BIT_RXFLTMAP4_BF_REPORT_POLL);
|
||||
@@ -177,7 +178,7 @@ void rtw_bf_del_bfer_entry_mu(struct rtw_dev *rtwdev)
|
||||
|
||||
void rtw_bf_del_sounding(struct rtw_dev *rtwdev)
|
||||
{
|
||||
- rtw_write8(rtwdev, REG_SND_PTCL_CTRL, 0);
|
||||
+ rtw_write8_mask(rtwdev, REG_SND_PTCL_CTRL, BIT_MASK_BEAMFORM, 0);
|
||||
}
|
||||
|
||||
void rtw_bf_enable_bfee_su(struct rtw_dev *rtwdev, struct rtw_vif *vif,
|
||||
@@ -204,7 +205,8 @@ void rtw_bf_enable_bfee_su(struct rtw_dev *rtwdev, struct rtw_vif *vif,
|
||||
}
|
||||
|
||||
/* Sounding protocol control */
|
||||
- rtw_write8(rtwdev, REG_SND_PTCL_CTRL, RTW_SND_CTRL_SOUNDING);
|
||||
+ rtw_write8_mask(rtwdev, REG_SND_PTCL_CTRL, BIT_MASK_BEAMFORM,
|
||||
+ RTW_SND_CTRL_SOUNDING);
|
||||
|
||||
/* MAC address/Partial AID of Beamformer */
|
||||
for (i = 0; i < ETH_ALEN; i++)
|
||||
@@ -273,7 +275,8 @@ void rtw_bf_remove_bfee_su(struct rtw_dev *rtwdev,
|
||||
struct rtw_bf_info *bfinfo = &rtwdev->bf_info;
|
||||
|
||||
rtw_dbg(rtwdev, RTW_DBG_BF, "remove as a su bfee\n");
|
||||
- rtw_write8(rtwdev, REG_SND_PTCL_CTRL, RTW_SND_CTRL_REMOVE);
|
||||
+ rtw_write8_mask(rtwdev, REG_SND_PTCL_CTRL, BIT_MASK_BEAMFORM,
|
||||
+ RTW_SND_CTRL_REMOVE);
|
||||
|
||||
switch (bfee->su_reg_index) {
|
||||
case 0:
|
||||
@@ -298,7 +301,8 @@ void rtw_bf_remove_bfee_mu(struct rtw_dev *rtwdev,
|
||||
{
|
||||
struct rtw_bf_info *bfinfo = &rtwdev->bf_info;
|
||||
|
||||
- rtw_write8(rtwdev, REG_SND_PTCL_CTRL, RTW_SND_CTRL_REMOVE);
|
||||
+ rtw_write8_mask(rtwdev, REG_SND_PTCL_CTRL, BIT_MASK_BEAMFORM,
|
||||
+ RTW_SND_CTRL_REMOVE);
|
||||
|
||||
rtw_bf_del_bfer_entry_mu(rtwdev);
|
||||
|
||||
diff --git a/drivers/net/wireless/realtek/rtw88/bf.h b/drivers/net/wireless/realtek/rtw88/bf.h
|
||||
index 17855edb5006a..7b40c2c038560 100644
|
||||
--- a/drivers/net/wireless/realtek/rtw88/bf.h
|
||||
+++ b/drivers/net/wireless/realtek/rtw88/bf.h
|
||||
@@ -13,6 +13,9 @@
|
||||
#define REG_ASSOCIATED_BFMER1_INFO 0x06EC
|
||||
#define REG_TX_CSI_RPT_PARAM_BW20 0x06F4
|
||||
#define REG_SND_PTCL_CTRL 0x0718
|
||||
+#define BIT_DIS_CHK_VHTSIGB_CRC BIT(6)
|
||||
+#define BIT_DIS_CHK_VHTSIGA_CRC BIT(5)
|
||||
+#define BIT_MASK_BEAMFORM (GENMASK(4, 0) | BIT(7))
|
||||
#define REG_MU_TX_CTL 0x14C0
|
||||
#define REG_MU_STA_GID_VLD 0x14C4
|
||||
#define REG_MU_STA_USER_POS_INFO 0x14C8
|
||||
@@ -42,8 +45,8 @@
|
||||
#define BIT_RXFLTMAP4_BF_REPORT_POLL BIT(4)
|
||||
|
||||
#define RTW_NDP_RX_STANDBY_TIME 0x70
|
||||
-#define RTW_SND_CTRL_REMOVE 0xD8
|
||||
-#define RTW_SND_CTRL_SOUNDING 0xDB
|
||||
+#define RTW_SND_CTRL_REMOVE 0x98
|
||||
+#define RTW_SND_CTRL_SOUNDING 0x9B
|
||||
|
||||
enum csi_seg_len {
|
||||
HAL_CSI_SEG_4K = 0,
|
||||
diff --git a/drivers/net/wireless/realtek/rtw88/rtw8821c.c b/drivers/net/wireless/realtek/rtw88/rtw8821c.c
|
||||
index 80a6f4da6acd9..db078df63f855 100644
|
||||
--- a/drivers/net/wireless/realtek/rtw88/rtw8821c.c
|
||||
+++ b/drivers/net/wireless/realtek/rtw88/rtw8821c.c
|
||||
@@ -223,7 +223,8 @@ static int rtw8821c_mac_init(struct rtw_dev *rtwdev)
|
||||
rtw_write8(rtwdev, REG_TCR + 1, WLAN_TX_FUNC_CFG1);
|
||||
rtw_write8(rtwdev, REG_ACKTO_CCK, 0x40);
|
||||
rtw_write8_set(rtwdev, REG_WMAC_TRXPTCL_CTL_H, BIT(1));
|
||||
- rtw_write8_set(rtwdev, REG_SND_PTCL_CTRL, BIT(6));
|
||||
+ rtw_write8_set(rtwdev, REG_SND_PTCL_CTRL,
|
||||
+ BIT_DIS_CHK_VHTSIGB_CRC);
|
||||
rtw_write32(rtwdev, REG_WMAC_OPTION_FUNCTION + 8, WLAN_MAC_OPT_FUNC2);
|
||||
rtw_write8(rtwdev, REG_WMAC_OPTION_FUNCTION + 4, WLAN_MAC_OPT_NORM_FUNC1);
|
||||
|
||||
diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822b.c b/drivers/net/wireless/realtek/rtw88/rtw8822b.c
|
||||
index c409c8c29ec8b..a4cbcc6bdcd14 100644
|
||||
--- a/drivers/net/wireless/realtek/rtw88/rtw8822b.c
|
||||
+++ b/drivers/net/wireless/realtek/rtw88/rtw8822b.c
|
||||
@@ -262,6 +262,8 @@ static int rtw8822b_mac_init(struct rtw_dev *rtwdev)
|
||||
rtw_write8(rtwdev, REG_TCR + 1, WLAN_TX_FUNC_CFG1);
|
||||
rtw_write32(rtwdev, REG_WMAC_OPTION_FUNCTION + 8, WLAN_MAC_OPT_FUNC2);
|
||||
rtw_write8(rtwdev, REG_WMAC_OPTION_FUNCTION + 4, WLAN_MAC_OPT_NORM_FUNC1);
|
||||
+ rtw_write8_set(rtwdev, REG_SND_PTCL_CTRL,
|
||||
+ BIT_DIS_CHK_VHTSIGB_CRC);
|
||||
|
||||
return 0;
|
||||
}
|
||||
diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822c.c b/drivers/net/wireless/realtek/rtw88/rtw8822c.c
|
||||
index 46b881e8e4feb..a8b95dcdb8e90 100644
|
||||
--- a/drivers/net/wireless/realtek/rtw88/rtw8822c.c
|
||||
+++ b/drivers/net/wireless/realtek/rtw88/rtw8822c.c
|
||||
@@ -2102,6 +2102,8 @@ static int rtw8822c_mac_init(struct rtw_dev *rtwdev)
|
||||
BIT_RXPSF_CONT_ERRCHKEN);
|
||||
value16 = BIT_SET_RXPSF_ERRTHR(value16, 0x07);
|
||||
rtw_write16(rtwdev, REG_RXPSF_CTRL, value16);
|
||||
+ rtw_write8_set(rtwdev, REG_SND_PTCL_CTRL,
|
||||
+ BIT_DIS_CHK_VHTSIGB_CRC);
|
||||
|
||||
/* Interrupt migration configuration */
|
||||
rtw_write32(rtwdev, REG_INT_MIG, WLAN_MAC_INT_MIG_CFG);
|
||||
--
|
||||
cgit 1.2.3-1.el7
|
||||
|
||||
+91474
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
+27
-11
@@ -33,10 +33,10 @@
|
||||
</BuildDependencies>
|
||||
<Patches>
|
||||
<!-- Linux patches -->
|
||||
<Patch level="1" compressionType="xz">patches/linux/patch-5.15.74.xz</Patch>
|
||||
<Patch level="1" compressionType="xz">patches/linux/patch-5.15.86.xz</Patch>
|
||||
|
||||
<!-- aufs5 patchec -->
|
||||
<Patch level="1">patches/aufs5/aufs5.15.41-20220620.patch</Patch>
|
||||
<Patch level="1">patches/aufs5/aufs5.15.41-20221219.patch</Patch>
|
||||
<Patch level="1">patches/aufs5/aufs5-base.patch</Patch>
|
||||
<Patch level="1">patches/aufs5/aufs5-kbuild.patch</Patch>
|
||||
<Patch level="1">patches/aufs5/aufs5-loopback.patch</Patch>
|
||||
@@ -94,15 +94,9 @@
|
||||
|
||||
<Patch level="1">patches/mageia/3rd-fix-kconfig.patch</Patch>
|
||||
|
||||
<!-- <Patch level="1">patches/mageia/3rd-ndiswrapper-1.63.patch</Patch> -->
|
||||
<!-- <Patch level="1">patches/mageia/3rd-ndiswrapper-Kconfig.patch</Patch> -->
|
||||
<!-- <Patch level="1">patches/mageia/3rd-ndiswrapper-Makefile-build-fix.patch</Patch> -->
|
||||
|
||||
<!-- <Patch level="1">patches/mageia/3rd-niswrapper-Kconfig-Makefile.patch</Patch> -->
|
||||
<!-- <Patch level="1">patches/mageia/3rd-rtl8821ce-Kconfig-Makefile.patch</Patch> -->
|
||||
<!-- <Patch level="1">patches/mageia/3rd-rtl8812au-Kconfig-Makefile.patch</Patch> -->
|
||||
<!-- <Patch level="1">patches/mageia/3rd-rtl8723de-Kconfig-Makefile.patch</Patch> -->
|
||||
<!-- <Patch level="1">patches/mageia/3rd-viahss-Kconfig-Makefile.patch</Patch> -->
|
||||
<Patch level="1">patches/mageia/net-wireless-rtw88-dont-check-CRC-of-VHT-SIG-B-in-802.11ac-signal.patch</Patch>
|
||||
<Patch level="1">patches/mageia/net-wireless-rtw89-add-Realtek-802.11ax-driver.patch</Patch>
|
||||
<Patch level="1">patches/mageia/net-wireless-rtw88-add-r8822be-alias.patch</Patch>
|
||||
</Patches>
|
||||
</Source>
|
||||
|
||||
@@ -161,6 +155,28 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="79">
|
||||
<Date>2023-01-03</Date>
|
||||
<Version>5.15.86</Version>
|
||||
<Comment>Version bump.</Comment>
|
||||
<Type package="kernel">security</Type>
|
||||
<Requires>
|
||||
<Action package="kernel">systemRestart</Action>
|
||||
</Requires>
|
||||
<Name>Mustafa Cinasal</Name>
|
||||
<Email>muscnsl@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="78">
|
||||
<Date>2022-12-07</Date>
|
||||
<Version>5.15.81</Version>
|
||||
<Comment>Version bump.</Comment>
|
||||
<Type package="kernel">security</Type>
|
||||
<Requires>
|
||||
<Action package="kernel">systemRestart</Action>
|
||||
</Requires>
|
||||
<Name>Mustafa Cinasal</Name>
|
||||
<Email>muscnsl@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="77">
|
||||
<Date>2022-10-22</Date>
|
||||
<Version>5.15.74</Version>
|
||||
|
||||
@@ -153,7 +153,7 @@ index 04c88dd6eabd..0ff3ba22ee17 100644
|
||||
void *key_data;
|
||||
|
||||
diff --git a/fs/aufs/f_op.c b/fs/aufs/f_op.c
|
||||
index 99ceca144044..e49dfe855032 100644
|
||||
index c2924d055ebd..4efde401dbf4 100644
|
||||
--- a/fs/aufs/f_op.c
|
||||
+++ b/fs/aufs/f_op.c
|
||||
@@ -304,7 +304,7 @@ static ssize_t aufs_read_iter(struct kiocb *kio, struct iov_iter *iov_iter)
|
||||
|
||||
+101
-97
@@ -1,6 +1,6 @@
|
||||
diff -Naur null/Documentation/ABI/testing/debugfs-aufs linux-5.15.41/Documentation/ABI/testing/debugfs-aufs
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/Documentation/ABI/testing/debugfs-aufs 2022-09-06 12:51:51.030710012 +0300
|
||||
+++ linux-5.15.41/Documentation/ABI/testing/debugfs-aufs 2023-01-03 20:33:04.499529241 +0300
|
||||
@@ -0,0 +1,55 @@
|
||||
+What: /debug/aufs/si_<id>/
|
||||
+Date: March 2009
|
||||
@@ -59,7 +59,7 @@ diff -Naur null/Documentation/ABI/testing/debugfs-aufs linux-5.15.41/Documentati
|
||||
+ will be empty. About XINO files, see the aufs manual.
|
||||
diff -Naur null/Documentation/ABI/testing/sysfs-aufs linux-5.15.41/Documentation/ABI/testing/sysfs-aufs
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/Documentation/ABI/testing/sysfs-aufs 2022-09-06 12:51:51.030710012 +0300
|
||||
+++ linux-5.15.41/Documentation/ABI/testing/sysfs-aufs 2023-01-03 20:33:04.499529241 +0300
|
||||
@@ -0,0 +1,31 @@
|
||||
+What: /sys/fs/aufs/si_<id>/
|
||||
+Date: March 2009
|
||||
@@ -94,7 +94,7 @@ diff -Naur null/Documentation/ABI/testing/sysfs-aufs linux-5.15.41/Documentation
|
||||
+ will be empty. About XINO files, see the aufs manual.
|
||||
diff -Naur null/Documentation/filesystems/aufs/design/01intro.txt linux-5.15.41/Documentation/filesystems/aufs/design/01intro.txt
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/Documentation/filesystems/aufs/design/01intro.txt 2022-09-06 12:51:51.031709999 +0300
|
||||
+++ linux-5.15.41/Documentation/filesystems/aufs/design/01intro.txt 2023-01-03 20:33:04.499529241 +0300
|
||||
@@ -0,0 +1,171 @@
|
||||
+
|
||||
+# Copyright (C) 2005-2021 Junjiro R. Okajima
|
||||
@@ -269,7 +269,7 @@ diff -Naur null/Documentation/filesystems/aufs/design/01intro.txt linux-5.15.41/
|
||||
+about it. But currently I have implemented it in kernel space.
|
||||
diff -Naur null/Documentation/filesystems/aufs/design/02struct.txt linux-5.15.41/Documentation/filesystems/aufs/design/02struct.txt
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/Documentation/filesystems/aufs/design/02struct.txt 2022-09-06 12:51:51.031709999 +0300
|
||||
+++ linux-5.15.41/Documentation/filesystems/aufs/design/02struct.txt 2023-01-03 20:33:04.499529241 +0300
|
||||
@@ -0,0 +1,258 @@
|
||||
+
|
||||
+# Copyright (C) 2005-2021 Junjiro R. Okajima
|
||||
@@ -531,7 +531,7 @@ diff -Naur null/Documentation/filesystems/aufs/design/02struct.txt linux-5.15.41
|
||||
+For this purpose, use "aumvdown" command in aufs-util.git.
|
||||
diff -Naur null/Documentation/filesystems/aufs/design/03atomic_open.txt linux-5.15.41/Documentation/filesystems/aufs/design/03atomic_open.txt
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/Documentation/filesystems/aufs/design/03atomic_open.txt 2022-09-06 12:51:51.031709999 +0300
|
||||
+++ linux-5.15.41/Documentation/filesystems/aufs/design/03atomic_open.txt 2023-01-03 20:33:04.500529229 +0300
|
||||
@@ -0,0 +1,85 @@
|
||||
+
|
||||
+# Copyright (C) 2015-2021 Junjiro R. Okajima
|
||||
@@ -620,7 +620,7 @@ diff -Naur null/Documentation/filesystems/aufs/design/03atomic_open.txt linux-5.
|
||||
+ be implemented in aufs, but not all I am afraid.
|
||||
diff -Naur null/Documentation/filesystems/aufs/design/03lookup.txt linux-5.15.41/Documentation/filesystems/aufs/design/03lookup.txt
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/Documentation/filesystems/aufs/design/03lookup.txt 2022-09-06 12:51:51.031709999 +0300
|
||||
+++ linux-5.15.41/Documentation/filesystems/aufs/design/03lookup.txt 2023-01-03 20:33:04.500529229 +0300
|
||||
@@ -0,0 +1,113 @@
|
||||
+
|
||||
+# Copyright (C) 2005-2021 Junjiro R. Okajima
|
||||
@@ -737,7 +737,7 @@ diff -Naur null/Documentation/filesystems/aufs/design/03lookup.txt linux-5.15.41
|
||||
+ by over-mounting something (or another method).
|
||||
diff -Naur null/Documentation/filesystems/aufs/design/04branch.txt linux-5.15.41/Documentation/filesystems/aufs/design/04branch.txt
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/Documentation/filesystems/aufs/design/04branch.txt 2022-09-06 12:51:51.031709999 +0300
|
||||
+++ linux-5.15.41/Documentation/filesystems/aufs/design/04branch.txt 2023-01-03 20:33:04.500529229 +0300
|
||||
@@ -0,0 +1,74 @@
|
||||
+
|
||||
+# Copyright (C) 2005-2021 Junjiro R. Okajima
|
||||
@@ -815,7 +815,7 @@ diff -Naur null/Documentation/filesystems/aufs/design/04branch.txt linux-5.15.41
|
||||
+ same named entry on the upper branch.
|
||||
diff -Naur null/Documentation/filesystems/aufs/design/05wbr_policy.txt linux-5.15.41/Documentation/filesystems/aufs/design/05wbr_policy.txt
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/Documentation/filesystems/aufs/design/05wbr_policy.txt 2022-09-06 12:51:51.032709987 +0300
|
||||
+++ linux-5.15.41/Documentation/filesystems/aufs/design/05wbr_policy.txt 2023-01-03 20:33:04.500529229 +0300
|
||||
@@ -0,0 +1,64 @@
|
||||
+
|
||||
+# Copyright (C) 2005-2021 Junjiro R. Okajima
|
||||
@@ -883,7 +883,7 @@ diff -Naur null/Documentation/filesystems/aufs/design/05wbr_policy.txt linux-5.1
|
||||
+ copyup policy.
|
||||
diff -Naur null/Documentation/filesystems/aufs/design/06dirren.dot linux-5.15.41/Documentation/filesystems/aufs/design/06dirren.dot
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/Documentation/filesystems/aufs/design/06dirren.dot 2022-09-06 12:51:51.032709987 +0300
|
||||
+++ linux-5.15.41/Documentation/filesystems/aufs/design/06dirren.dot 2023-01-03 20:33:04.500529229 +0300
|
||||
@@ -0,0 +1,31 @@
|
||||
+
|
||||
+// to view this graph, run dot(1) command in GRAPHVIZ.
|
||||
@@ -918,7 +918,7 @@ diff -Naur null/Documentation/filesystems/aufs/design/06dirren.dot linux-5.15.41
|
||||
+}
|
||||
diff -Naur null/Documentation/filesystems/aufs/design/06dirren.txt linux-5.15.41/Documentation/filesystems/aufs/design/06dirren.txt
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/Documentation/filesystems/aufs/design/06dirren.txt 2022-09-06 12:51:51.032709987 +0300
|
||||
+++ linux-5.15.41/Documentation/filesystems/aufs/design/06dirren.txt 2023-01-03 20:33:04.500529229 +0300
|
||||
@@ -0,0 +1,102 @@
|
||||
+
|
||||
+# Copyright (C) 2017-2021 Junjiro R. Okajima
|
||||
@@ -1024,7 +1024,7 @@ diff -Naur null/Documentation/filesystems/aufs/design/06dirren.txt linux-5.15.41
|
||||
+equivalen to udba=reval case.
|
||||
diff -Naur null/Documentation/filesystems/aufs/design/06fhsm.txt linux-5.15.41/Documentation/filesystems/aufs/design/06fhsm.txt
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/Documentation/filesystems/aufs/design/06fhsm.txt 2022-09-06 12:51:51.032709987 +0300
|
||||
+++ linux-5.15.41/Documentation/filesystems/aufs/design/06fhsm.txt 2023-01-03 20:33:04.500529229 +0300
|
||||
@@ -0,0 +1,120 @@
|
||||
+
|
||||
+# Copyright (C) 2011-2021 Junjiro R. Okajima
|
||||
@@ -1148,7 +1148,7 @@ diff -Naur null/Documentation/filesystems/aufs/design/06fhsm.txt linux-5.15.41/D
|
||||
+should restore the original file state after an error happens.
|
||||
diff -Naur null/Documentation/filesystems/aufs/design/06mmap.txt linux-5.15.41/Documentation/filesystems/aufs/design/06mmap.txt
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/Documentation/filesystems/aufs/design/06mmap.txt 2022-09-06 12:51:51.032709987 +0300
|
||||
+++ linux-5.15.41/Documentation/filesystems/aufs/design/06mmap.txt 2023-01-03 20:33:04.500529229 +0300
|
||||
@@ -0,0 +1,72 @@
|
||||
+
|
||||
+# Copyright (C) 2005-2021 Junjiro R. Okajima
|
||||
@@ -1224,7 +1224,7 @@ diff -Naur null/Documentation/filesystems/aufs/design/06mmap.txt linux-5.15.41/D
|
||||
+I have to give up this "looks-smater" approach.
|
||||
diff -Naur null/Documentation/filesystems/aufs/design/06xattr.txt linux-5.15.41/Documentation/filesystems/aufs/design/06xattr.txt
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/Documentation/filesystems/aufs/design/06xattr.txt 2022-09-06 12:51:51.032709987 +0300
|
||||
+++ linux-5.15.41/Documentation/filesystems/aufs/design/06xattr.txt 2023-01-03 20:33:04.500529229 +0300
|
||||
@@ -0,0 +1,96 @@
|
||||
+
|
||||
+# Copyright (C) 2014-2021 Junjiro R. Okajima
|
||||
@@ -1324,7 +1324,7 @@ diff -Naur null/Documentation/filesystems/aufs/design/06xattr.txt linux-5.15.41/
|
||||
+now, aufs implements the branch attributes to ignore the error.
|
||||
diff -Naur null/Documentation/filesystems/aufs/design/07export.txt linux-5.15.41/Documentation/filesystems/aufs/design/07export.txt
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/Documentation/filesystems/aufs/design/07export.txt 2022-09-06 12:51:51.032709987 +0300
|
||||
+++ linux-5.15.41/Documentation/filesystems/aufs/design/07export.txt 2023-01-03 20:33:04.500529229 +0300
|
||||
@@ -0,0 +1,58 @@
|
||||
+
|
||||
+# Copyright (C) 2005-2021 Junjiro R. Okajima
|
||||
@@ -1386,7 +1386,7 @@ diff -Naur null/Documentation/filesystems/aufs/design/07export.txt linux-5.15.41
|
||||
+ lookup_one_len(), vfs_getattr(), encode_fh() and others.
|
||||
diff -Naur null/Documentation/filesystems/aufs/design/08shwh.txt linux-5.15.41/Documentation/filesystems/aufs/design/08shwh.txt
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/Documentation/filesystems/aufs/design/08shwh.txt 2022-09-06 12:51:51.032709987 +0300
|
||||
+++ linux-5.15.41/Documentation/filesystems/aufs/design/08shwh.txt 2023-01-03 20:33:04.500529229 +0300
|
||||
@@ -0,0 +1,52 @@
|
||||
+
|
||||
+# Copyright (C) 2005-2021 Junjiro R. Okajima
|
||||
@@ -1442,7 +1442,7 @@ diff -Naur null/Documentation/filesystems/aufs/design/08shwh.txt linux-5.15.41/D
|
||||
+initramfs will use it to replace the old one at the next boot.
|
||||
diff -Naur null/Documentation/filesystems/aufs/design/10dynop.txt linux-5.15.41/Documentation/filesystems/aufs/design/10dynop.txt
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/Documentation/filesystems/aufs/design/10dynop.txt 2022-09-06 12:51:51.032709987 +0300
|
||||
+++ linux-5.15.41/Documentation/filesystems/aufs/design/10dynop.txt 2023-01-03 20:33:04.500529229 +0300
|
||||
@@ -0,0 +1,47 @@
|
||||
+
|
||||
+# Copyright (C) 2010-2021 Junjiro R. Okajima
|
||||
@@ -1493,7 +1493,7 @@ diff -Naur null/Documentation/filesystems/aufs/design/10dynop.txt linux-5.15.41/
|
||||
+regular files only.
|
||||
diff -Naur null/Documentation/filesystems/aufs/README linux-5.15.41/Documentation/filesystems/aufs/README
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/Documentation/filesystems/aufs/README 2022-09-06 12:51:51.031709999 +0300
|
||||
+++ linux-5.15.41/Documentation/filesystems/aufs/README 2023-01-03 20:33:04.499529241 +0300
|
||||
@@ -0,0 +1,397 @@
|
||||
+
|
||||
+Aufs5 -- advanced multi layered unification filesystem version 5.x
|
||||
@@ -1894,7 +1894,7 @@ diff -Naur null/Documentation/filesystems/aufs/README linux-5.15.41/Documentatio
|
||||
+# End: ;
|
||||
diff -Naur null/fs/aufs/aufs.h linux-5.15.41/fs/aufs/aufs.h
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/aufs.h 2022-09-06 12:51:51.034709962 +0300
|
||||
+++ linux-5.15.41/fs/aufs/aufs.h 2023-01-03 20:33:04.501529216 +0300
|
||||
@@ -0,0 +1,62 @@
|
||||
+/* SPDX-License-Identifier: GPL-2.0 */
|
||||
+/*
|
||||
@@ -1960,7 +1960,7 @@ diff -Naur null/fs/aufs/aufs.h linux-5.15.41/fs/aufs/aufs.h
|
||||
+#endif /* __AUFS_H__ */
|
||||
diff -Naur null/fs/aufs/branch.c linux-5.15.41/fs/aufs/branch.c
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/branch.c 2022-09-06 12:51:51.034709962 +0300
|
||||
+++ linux-5.15.41/fs/aufs/branch.c 2023-01-03 20:33:04.502529204 +0300
|
||||
@@ -0,0 +1,1427 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
@@ -3391,7 +3391,7 @@ diff -Naur null/fs/aufs/branch.c linux-5.15.41/fs/aufs/branch.c
|
||||
+}
|
||||
diff -Naur null/fs/aufs/branch.h linux-5.15.41/fs/aufs/branch.h
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/branch.h 2022-09-06 12:51:51.034709962 +0300
|
||||
+++ linux-5.15.41/fs/aufs/branch.h 2023-01-03 20:33:04.502529204 +0300
|
||||
@@ -0,0 +1,375 @@
|
||||
+/* SPDX-License-Identifier: GPL-2.0 */
|
||||
+/*
|
||||
@@ -3770,7 +3770,7 @@ diff -Naur null/fs/aufs/branch.h linux-5.15.41/fs/aufs/branch.h
|
||||
+#endif /* __AUFS_BRANCH_H__ */
|
||||
diff -Naur null/fs/aufs/conf.mk linux-5.15.41/fs/aufs/conf.mk
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/conf.mk 2022-09-06 12:51:51.035709949 +0300
|
||||
+++ linux-5.15.41/fs/aufs/conf.mk 2023-01-03 20:33:04.502529204 +0300
|
||||
@@ -0,0 +1,40 @@
|
||||
+# SPDX-License-Identifier: GPL-2.0
|
||||
+
|
||||
@@ -3814,7 +3814,7 @@ diff -Naur null/fs/aufs/conf.mk linux-5.15.41/fs/aufs/conf.mk
|
||||
+-include ${srctree}/${src}/conf_priv.mk
|
||||
diff -Naur null/fs/aufs/cpup.c linux-5.15.41/fs/aufs/cpup.c
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/cpup.c 2022-09-06 12:51:51.035709949 +0300
|
||||
+++ linux-5.15.41/fs/aufs/cpup.c 2023-01-03 20:33:04.502529204 +0300
|
||||
@@ -0,0 +1,1459 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
@@ -4407,7 +4407,7 @@ diff -Naur null/fs/aufs/cpup.c linux-5.15.41/fs/aufs/cpup.c
|
||||
+ * regardless 'acl' option, reset all ACL.
|
||||
+ * All ACL will be copied up later from the original entry on the lower branch.
|
||||
+ */
|
||||
+static int au_reset_acl(struct inode *h_dir, struct path *h_path, umode_t mode)
|
||||
+static int au_reset_acl(struct path *h_path, umode_t mode)
|
||||
+{
|
||||
+ int err;
|
||||
+ struct dentry *h_dentry;
|
||||
@@ -4529,7 +4529,7 @@ diff -Naur null/fs/aufs/cpup.c linux-5.15.41/fs/aufs/cpup.c
|
||||
+ err = -EIO;
|
||||
+ }
|
||||
+ if (!err)
|
||||
+ err = au_reset_acl(h_dir, &h_path, mode);
|
||||
+ err = au_reset_acl(&h_path, mode);
|
||||
+
|
||||
+ mnt_flags = au_mntflags(sb);
|
||||
+ if (!au_opt_test(mnt_flags, UDBA_NONE)
|
||||
@@ -5277,7 +5277,7 @@ diff -Naur null/fs/aufs/cpup.c linux-5.15.41/fs/aufs/cpup.c
|
||||
+}
|
||||
diff -Naur null/fs/aufs/cpup.h linux-5.15.41/fs/aufs/cpup.h
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/cpup.h 2022-09-06 12:51:51.035709949 +0300
|
||||
+++ linux-5.15.41/fs/aufs/cpup.h 2023-01-03 20:33:04.502529204 +0300
|
||||
@@ -0,0 +1,100 @@
|
||||
+/* SPDX-License-Identifier: GPL-2.0 */
|
||||
+/*
|
||||
@@ -5381,7 +5381,7 @@ diff -Naur null/fs/aufs/cpup.h linux-5.15.41/fs/aufs/cpup.h
|
||||
+#endif /* __AUFS_CPUP_H__ */
|
||||
diff -Naur null/fs/aufs/dbgaufs.c linux-5.15.41/fs/aufs/dbgaufs.c
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/dbgaufs.c 2022-09-06 12:51:51.035709949 +0300
|
||||
+++ linux-5.15.41/fs/aufs/dbgaufs.c 2023-01-03 20:33:04.502529204 +0300
|
||||
@@ -0,0 +1,526 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
@@ -5911,7 +5911,7 @@ diff -Naur null/fs/aufs/dbgaufs.c linux-5.15.41/fs/aufs/dbgaufs.c
|
||||
+}
|
||||
diff -Naur null/fs/aufs/dbgaufs.h linux-5.15.41/fs/aufs/dbgaufs.h
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/dbgaufs.h 2022-09-06 12:51:51.035709949 +0300
|
||||
+++ linux-5.15.41/fs/aufs/dbgaufs.h 2023-01-03 20:33:04.502529204 +0300
|
||||
@@ -0,0 +1,53 @@
|
||||
+/* SPDX-License-Identifier: GPL-2.0 */
|
||||
+/*
|
||||
@@ -5968,7 +5968,7 @@ diff -Naur null/fs/aufs/dbgaufs.h linux-5.15.41/fs/aufs/dbgaufs.h
|
||||
+#endif /* __DBGAUFS_H__ */
|
||||
diff -Naur null/fs/aufs/dcsub.c linux-5.15.41/fs/aufs/dcsub.c
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/dcsub.c 2022-09-06 12:51:51.035709949 +0300
|
||||
+++ linux-5.15.41/fs/aufs/dcsub.c 2023-01-03 20:33:04.502529204 +0300
|
||||
@@ -0,0 +1,225 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
@@ -6197,7 +6197,7 @@ diff -Naur null/fs/aufs/dcsub.c linux-5.15.41/fs/aufs/dcsub.c
|
||||
+}
|
||||
diff -Naur null/fs/aufs/dcsub.h linux-5.15.41/fs/aufs/dcsub.h
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/dcsub.h 2022-09-06 12:51:51.035709949 +0300
|
||||
+++ linux-5.15.41/fs/aufs/dcsub.h 2023-01-03 20:33:04.502529204 +0300
|
||||
@@ -0,0 +1,137 @@
|
||||
+/* SPDX-License-Identifier: GPL-2.0 */
|
||||
+/*
|
||||
@@ -6338,7 +6338,7 @@ diff -Naur null/fs/aufs/dcsub.h linux-5.15.41/fs/aufs/dcsub.h
|
||||
+#endif /* __AUFS_DCSUB_H__ */
|
||||
diff -Naur null/fs/aufs/debug.c linux-5.15.41/fs/aufs/debug.c
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/debug.c 2022-09-06 12:51:51.036709937 +0300
|
||||
+++ linux-5.15.41/fs/aufs/debug.c 2023-01-03 20:33:04.502529204 +0300
|
||||
@@ -0,0 +1,444 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
@@ -6786,7 +6786,7 @@ diff -Naur null/fs/aufs/debug.c linux-5.15.41/fs/aufs/debug.c
|
||||
+}
|
||||
diff -Naur null/fs/aufs/debug.h linux-5.15.41/fs/aufs/debug.h
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/debug.h 2022-09-06 12:51:51.036709937 +0300
|
||||
+++ linux-5.15.41/fs/aufs/debug.h 2023-01-03 20:33:04.503529191 +0300
|
||||
@@ -0,0 +1,226 @@
|
||||
+/* SPDX-License-Identifier: GPL-2.0 */
|
||||
+/*
|
||||
@@ -7016,7 +7016,7 @@ diff -Naur null/fs/aufs/debug.h linux-5.15.41/fs/aufs/debug.h
|
||||
+#endif /* __AUFS_DEBUG_H__ */
|
||||
diff -Naur null/fs/aufs/dentry.c linux-5.15.41/fs/aufs/dentry.c
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/dentry.c 2022-09-06 12:51:51.036709937 +0300
|
||||
+++ linux-5.15.41/fs/aufs/dentry.c 2023-01-03 20:33:04.503529191 +0300
|
||||
@@ -0,0 +1,1168 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
@@ -8188,7 +8188,7 @@ diff -Naur null/fs/aufs/dentry.c linux-5.15.41/fs/aufs/dentry.c
|
||||
+};
|
||||
diff -Naur null/fs/aufs/dentry.h linux-5.15.41/fs/aufs/dentry.h
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/dentry.h 2022-09-06 12:51:51.036709937 +0300
|
||||
+++ linux-5.15.41/fs/aufs/dentry.h 2023-01-03 20:33:04.503529191 +0300
|
||||
@@ -0,0 +1,269 @@
|
||||
+/* SPDX-License-Identifier: GPL-2.0 */
|
||||
+/*
|
||||
@@ -8461,7 +8461,7 @@ diff -Naur null/fs/aufs/dentry.h linux-5.15.41/fs/aufs/dentry.h
|
||||
+#endif /* __AUFS_DENTRY_H__ */
|
||||
diff -Naur null/fs/aufs/dinfo.c linux-5.15.41/fs/aufs/dinfo.c
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/dinfo.c 2022-09-06 12:51:51.037709924 +0300
|
||||
+++ linux-5.15.41/fs/aufs/dinfo.c 2023-01-03 20:33:04.503529191 +0300
|
||||
@@ -0,0 +1,554 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
@@ -9019,7 +9019,7 @@ diff -Naur null/fs/aufs/dinfo.c linux-5.15.41/fs/aufs/dinfo.c
|
||||
+}
|
||||
diff -Naur null/fs/aufs/dir.c linux-5.15.41/fs/aufs/dir.c
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/dir.c 2022-09-06 12:51:51.037709924 +0300
|
||||
+++ linux-5.15.41/fs/aufs/dir.c 2023-01-03 20:33:04.503529191 +0300
|
||||
@@ -0,0 +1,765 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
@@ -9788,7 +9788,7 @@ diff -Naur null/fs/aufs/dir.c linux-5.15.41/fs/aufs/dir.c
|
||||
+};
|
||||
diff -Naur null/fs/aufs/dir.h linux-5.15.41/fs/aufs/dir.h
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/dir.h 2022-09-06 12:51:51.037709924 +0300
|
||||
+++ linux-5.15.41/fs/aufs/dir.h 2023-01-03 20:33:04.503529191 +0300
|
||||
@@ -0,0 +1,134 @@
|
||||
+/* SPDX-License-Identifier: GPL-2.0 */
|
||||
+/*
|
||||
@@ -9926,7 +9926,7 @@ diff -Naur null/fs/aufs/dir.h linux-5.15.41/fs/aufs/dir.h
|
||||
+#endif /* __AUFS_DIR_H__ */
|
||||
diff -Naur null/fs/aufs/dirren.c linux-5.15.41/fs/aufs/dirren.c
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/dirren.c 2022-09-06 12:51:51.037709924 +0300
|
||||
+++ linux-5.15.41/fs/aufs/dirren.c 2023-01-03 20:33:04.503529191 +0300
|
||||
@@ -0,0 +1,1315 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
@@ -11245,7 +11245,7 @@ diff -Naur null/fs/aufs/dirren.c linux-5.15.41/fs/aufs/dirren.c
|
||||
+}
|
||||
diff -Naur null/fs/aufs/dirren.h linux-5.15.41/fs/aufs/dirren.h
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/dirren.h 2022-09-06 12:51:51.037709924 +0300
|
||||
+++ linux-5.15.41/fs/aufs/dirren.h 2023-01-03 20:33:04.503529191 +0300
|
||||
@@ -0,0 +1,140 @@
|
||||
+/* SPDX-License-Identifier: GPL-2.0 */
|
||||
+/*
|
||||
@@ -11389,7 +11389,7 @@ diff -Naur null/fs/aufs/dirren.h linux-5.15.41/fs/aufs/dirren.h
|
||||
+#endif /* __AUFS_DIRREN_H__ */
|
||||
diff -Naur null/fs/aufs/dynop.c linux-5.15.41/fs/aufs/dynop.c
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/dynop.c 2022-09-06 12:51:51.037709924 +0300
|
||||
+++ linux-5.15.41/fs/aufs/dynop.c 2023-01-03 20:33:04.504529179 +0300
|
||||
@@ -0,0 +1,368 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
@@ -11761,7 +11761,7 @@ diff -Naur null/fs/aufs/dynop.c linux-5.15.41/fs/aufs/dynop.c
|
||||
+}
|
||||
diff -Naur null/fs/aufs/dynop.h linux-5.15.41/fs/aufs/dynop.h
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/dynop.h 2022-09-06 12:51:51.038709912 +0300
|
||||
+++ linux-5.15.41/fs/aufs/dynop.h 2023-01-03 20:33:04.504529179 +0300
|
||||
@@ -0,0 +1,77 @@
|
||||
+/* SPDX-License-Identifier: GPL-2.0 */
|
||||
+/*
|
||||
@@ -11842,7 +11842,7 @@ diff -Naur null/fs/aufs/dynop.h linux-5.15.41/fs/aufs/dynop.h
|
||||
+#endif /* __AUFS_DYNOP_H__ */
|
||||
diff -Naur null/fs/aufs/export.c linux-5.15.41/fs/aufs/export.c
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/export.c 2022-09-06 12:51:51.038709912 +0300
|
||||
+++ linux-5.15.41/fs/aufs/export.c 2023-01-03 20:33:04.504529179 +0300
|
||||
@@ -0,0 +1,830 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
@@ -12676,7 +12676,7 @@ diff -Naur null/fs/aufs/export.c linux-5.15.41/fs/aufs/export.c
|
||||
+}
|
||||
diff -Naur null/fs/aufs/fhsm.c linux-5.15.41/fs/aufs/fhsm.c
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/fhsm.c 2022-09-06 12:51:51.038709912 +0300
|
||||
+++ linux-5.15.41/fs/aufs/fhsm.c 2023-01-03 20:33:04.504529179 +0300
|
||||
@@ -0,0 +1,427 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
@@ -13107,7 +13107,7 @@ diff -Naur null/fs/aufs/fhsm.c linux-5.15.41/fs/aufs/fhsm.c
|
||||
+}
|
||||
diff -Naur null/fs/aufs/file.c linux-5.15.41/fs/aufs/file.c
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/file.c 2022-09-06 12:51:51.039709899 +0300
|
||||
+++ linux-5.15.41/fs/aufs/file.c 2023-01-03 20:33:04.504529179 +0300
|
||||
@@ -0,0 +1,863 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
@@ -13974,7 +13974,7 @@ diff -Naur null/fs/aufs/file.c linux-5.15.41/fs/aufs/file.c
|
||||
+};
|
||||
diff -Naur null/fs/aufs/file.h linux-5.15.41/fs/aufs/file.h
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/file.h 2022-09-06 12:51:51.039709899 +0300
|
||||
+++ linux-5.15.41/fs/aufs/file.h 2023-01-03 20:33:04.504529179 +0300
|
||||
@@ -0,0 +1,342 @@
|
||||
+/* SPDX-License-Identifier: GPL-2.0 */
|
||||
+/*
|
||||
@@ -14320,7 +14320,7 @@ diff -Naur null/fs/aufs/file.h linux-5.15.41/fs/aufs/file.h
|
||||
+#endif /* __AUFS_FILE_H__ */
|
||||
diff -Naur null/fs/aufs/finfo.c linux-5.15.41/fs/aufs/finfo.c
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/finfo.c 2022-09-06 12:51:51.039709899 +0300
|
||||
+++ linux-5.15.41/fs/aufs/finfo.c 2023-01-03 20:33:04.504529179 +0300
|
||||
@@ -0,0 +1,149 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
@@ -14473,8 +14473,8 @@ diff -Naur null/fs/aufs/finfo.c linux-5.15.41/fs/aufs/finfo.c
|
||||
+}
|
||||
diff -Naur null/fs/aufs/f_op.c linux-5.15.41/fs/aufs/f_op.c
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/f_op.c 2022-09-06 12:51:51.038709912 +0300
|
||||
@@ -0,0 +1,771 @@
|
||||
+++ linux-5.15.41/fs/aufs/f_op.c 2023-01-03 20:33:04.504529179 +0300
|
||||
@@ -0,0 +1,775 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
+ * Copyright (C) 2005-2021 Junjiro R. Okajima
|
||||
@@ -14920,6 +14920,10 @@ diff -Naur null/fs/aufs/f_op.c linux-5.15.41/fs/aufs/f_op.c
|
||||
+ lockdep_off();
|
||||
+ err = vfs_fallocate(h_file, mode, offset, len);
|
||||
+ lockdep_on();
|
||||
+ /*
|
||||
+ * we don't need to call file_modifed() here since au_write_post()
|
||||
+ * is equivalent and copies-up all timestamps and permission bits.
|
||||
+ */
|
||||
+ au_write_post(inode, h_file, &wpre, /*written*/1);
|
||||
+
|
||||
+out:
|
||||
@@ -15248,7 +15252,7 @@ diff -Naur null/fs/aufs/f_op.c linux-5.15.41/fs/aufs/f_op.c
|
||||
+};
|
||||
diff -Naur null/fs/aufs/fsctx.c linux-5.15.41/fs/aufs/fsctx.c
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/fsctx.c 2022-09-06 12:51:51.039709899 +0300
|
||||
+++ linux-5.15.41/fs/aufs/fsctx.c 2023-01-03 20:33:04.505529166 +0300
|
||||
@@ -0,0 +1,1242 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
@@ -16494,7 +16498,7 @@ diff -Naur null/fs/aufs/fsctx.c linux-5.15.41/fs/aufs/fsctx.c
|
||||
+}
|
||||
diff -Naur null/fs/aufs/fstype.h linux-5.15.41/fs/aufs/fstype.h
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/fstype.h 2022-09-06 12:51:51.039709899 +0300
|
||||
+++ linux-5.15.41/fs/aufs/fstype.h 2023-01-03 20:33:04.505529166 +0300
|
||||
@@ -0,0 +1,401 @@
|
||||
+/* SPDX-License-Identifier: GPL-2.0 */
|
||||
+/*
|
||||
@@ -16899,7 +16903,7 @@ diff -Naur null/fs/aufs/fstype.h linux-5.15.41/fs/aufs/fstype.h
|
||||
+#endif /* __AUFS_FSTYPE_H__ */
|
||||
diff -Naur null/fs/aufs/hbl.h linux-5.15.41/fs/aufs/hbl.h
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/hbl.h 2022-09-06 12:51:51.039709899 +0300
|
||||
+++ linux-5.15.41/fs/aufs/hbl.h 2023-01-03 20:33:04.505529166 +0300
|
||||
@@ -0,0 +1,65 @@
|
||||
+/* SPDX-License-Identifier: GPL-2.0 */
|
||||
+/*
|
||||
@@ -16968,7 +16972,7 @@ diff -Naur null/fs/aufs/hbl.h linux-5.15.41/fs/aufs/hbl.h
|
||||
+#endif /* __AUFS_HBL_H__ */
|
||||
diff -Naur null/fs/aufs/hfsnotify.c linux-5.15.41/fs/aufs/hfsnotify.c
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/hfsnotify.c 2022-09-06 12:51:51.040709887 +0300
|
||||
+++ linux-5.15.41/fs/aufs/hfsnotify.c 2023-01-03 20:33:04.505529166 +0300
|
||||
@@ -0,0 +1,288 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
@@ -17260,7 +17264,7 @@ diff -Naur null/fs/aufs/hfsnotify.c linux-5.15.41/fs/aufs/hfsnotify.c
|
||||
+};
|
||||
diff -Naur null/fs/aufs/hfsplus.c linux-5.15.41/fs/aufs/hfsplus.c
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/hfsplus.c 2022-09-06 12:51:51.040709887 +0300
|
||||
+++ linux-5.15.41/fs/aufs/hfsplus.c 2023-01-03 20:33:04.505529166 +0300
|
||||
@@ -0,0 +1,60 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
@@ -17324,7 +17328,7 @@ diff -Naur null/fs/aufs/hfsplus.c linux-5.15.41/fs/aufs/hfsplus.c
|
||||
+}
|
||||
diff -Naur null/fs/aufs/hnotify.c linux-5.15.41/fs/aufs/hnotify.c
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/hnotify.c 2022-09-06 12:51:51.040709887 +0300
|
||||
+++ linux-5.15.41/fs/aufs/hnotify.c 2023-01-03 20:33:04.505529166 +0300
|
||||
@@ -0,0 +1,715 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
@@ -18043,7 +18047,7 @@ diff -Naur null/fs/aufs/hnotify.c linux-5.15.41/fs/aufs/hnotify.c
|
||||
+}
|
||||
diff -Naur null/fs/aufs/iinfo.c linux-5.15.41/fs/aufs/iinfo.c
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/iinfo.c 2022-09-06 12:51:51.041709874 +0300
|
||||
+++ linux-5.15.41/fs/aufs/iinfo.c 2023-01-03 20:33:04.506529154 +0300
|
||||
@@ -0,0 +1,286 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
@@ -18333,7 +18337,7 @@ diff -Naur null/fs/aufs/iinfo.c linux-5.15.41/fs/aufs/iinfo.c
|
||||
+}
|
||||
diff -Naur null/fs/aufs/inode.c linux-5.15.41/fs/aufs/inode.c
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/inode.c 2022-09-06 12:51:51.041709874 +0300
|
||||
+++ linux-5.15.41/fs/aufs/inode.c 2023-01-03 20:33:04.506529154 +0300
|
||||
@@ -0,0 +1,531 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
@@ -18868,7 +18872,7 @@ diff -Naur null/fs/aufs/inode.c linux-5.15.41/fs/aufs/inode.c
|
||||
+}
|
||||
diff -Naur null/fs/aufs/inode.h linux-5.15.41/fs/aufs/inode.h
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/inode.h 2022-09-06 12:51:51.042709862 +0300
|
||||
+++ linux-5.15.41/fs/aufs/inode.h 2023-01-03 20:33:04.506529154 +0300
|
||||
@@ -0,0 +1,705 @@
|
||||
+/* SPDX-License-Identifier: GPL-2.0 */
|
||||
+/*
|
||||
@@ -19577,7 +19581,7 @@ diff -Naur null/fs/aufs/inode.h linux-5.15.41/fs/aufs/inode.h
|
||||
+#endif /* __AUFS_INODE_H__ */
|
||||
diff -Naur null/fs/aufs/ioctl.c linux-5.15.41/fs/aufs/ioctl.c
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/ioctl.c 2022-09-06 12:51:51.042709862 +0300
|
||||
+++ linux-5.15.41/fs/aufs/ioctl.c 2023-01-03 20:33:04.506529154 +0300
|
||||
@@ -0,0 +1,220 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
@@ -19801,7 +19805,7 @@ diff -Naur null/fs/aufs/ioctl.c linux-5.15.41/fs/aufs/ioctl.c
|
||||
+#endif
|
||||
diff -Naur null/fs/aufs/i_op_add.c linux-5.15.41/fs/aufs/i_op_add.c
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/i_op_add.c 2022-09-06 12:51:51.041709874 +0300
|
||||
+++ linux-5.15.41/fs/aufs/i_op_add.c 2023-01-03 20:33:04.505529166 +0300
|
||||
@@ -0,0 +1,941 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
@@ -20746,7 +20750,7 @@ diff -Naur null/fs/aufs/i_op_add.c linux-5.15.41/fs/aufs/i_op_add.c
|
||||
+}
|
||||
diff -Naur null/fs/aufs/i_op.c linux-5.15.41/fs/aufs/i_op.c
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/i_op.c 2022-09-06 12:51:51.040709887 +0300
|
||||
+++ linux-5.15.41/fs/aufs/i_op.c 2023-01-03 20:33:04.505529166 +0300
|
||||
@@ -0,0 +1,1512 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
@@ -22262,7 +22266,7 @@ diff -Naur null/fs/aufs/i_op.c linux-5.15.41/fs/aufs/i_op.c
|
||||
+};
|
||||
diff -Naur null/fs/aufs/i_op_del.c linux-5.15.41/fs/aufs/i_op_del.c
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/i_op_del.c 2022-09-06 12:51:51.041709874 +0300
|
||||
+++ linux-5.15.41/fs/aufs/i_op_del.c 2023-01-03 20:33:04.506529154 +0300
|
||||
@@ -0,0 +1,522 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
@@ -22788,7 +22792,7 @@ diff -Naur null/fs/aufs/i_op_del.c linux-5.15.41/fs/aufs/i_op_del.c
|
||||
+}
|
||||
diff -Naur null/fs/aufs/i_op_ren.c linux-5.15.41/fs/aufs/i_op_ren.c
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/i_op_ren.c 2022-09-06 12:51:51.041709874 +0300
|
||||
+++ linux-5.15.41/fs/aufs/i_op_ren.c 2023-01-03 20:33:04.506529154 +0300
|
||||
@@ -0,0 +1,1257 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
@@ -24049,7 +24053,7 @@ diff -Naur null/fs/aufs/i_op_ren.c linux-5.15.41/fs/aufs/i_op_ren.c
|
||||
+}
|
||||
diff -Naur null/fs/aufs/Kconfig linux-5.15.41/fs/aufs/Kconfig
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/Kconfig 2022-09-06 12:51:51.034709962 +0300
|
||||
+++ linux-5.15.41/fs/aufs/Kconfig 2023-01-03 20:33:04.501529216 +0300
|
||||
@@ -0,0 +1,199 @@
|
||||
+# SPDX-License-Identifier: GPL-2.0
|
||||
+config AUFS_FS
|
||||
@@ -24252,7 +24256,7 @@ diff -Naur null/fs/aufs/Kconfig linux-5.15.41/fs/aufs/Kconfig
|
||||
+endif
|
||||
diff -Naur null/fs/aufs/lcnt.h linux-5.15.41/fs/aufs/lcnt.h
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/lcnt.h 2022-09-06 12:51:51.042709862 +0300
|
||||
+++ linux-5.15.41/fs/aufs/lcnt.h 2023-01-03 20:33:04.506529154 +0300
|
||||
@@ -0,0 +1,186 @@
|
||||
+/* SPDX-License-Identifier: GPL-2.0 */
|
||||
+/*
|
||||
@@ -24442,7 +24446,7 @@ diff -Naur null/fs/aufs/lcnt.h linux-5.15.41/fs/aufs/lcnt.h
|
||||
+#endif /* __AUFS_LCNT_H__ */
|
||||
diff -Naur null/fs/aufs/loop.c linux-5.15.41/fs/aufs/loop.c
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/loop.c 2022-09-06 12:51:51.042709862 +0300
|
||||
+++ linux-5.15.41/fs/aufs/loop.c 2023-01-03 20:33:04.506529154 +0300
|
||||
@@ -0,0 +1,148 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
@@ -24594,7 +24598,7 @@ diff -Naur null/fs/aufs/loop.c linux-5.15.41/fs/aufs/loop.c
|
||||
+}
|
||||
diff -Naur null/fs/aufs/loop.h linux-5.15.41/fs/aufs/loop.h
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/loop.h 2022-09-06 12:51:51.042709862 +0300
|
||||
+++ linux-5.15.41/fs/aufs/loop.h 2023-01-03 20:33:04.506529154 +0300
|
||||
@@ -0,0 +1,55 @@
|
||||
+/* SPDX-License-Identifier: GPL-2.0 */
|
||||
+/*
|
||||
@@ -24653,7 +24657,7 @@ diff -Naur null/fs/aufs/loop.h linux-5.15.41/fs/aufs/loop.h
|
||||
+#endif /* __AUFS_LOOP_H__ */
|
||||
diff -Naur null/fs/aufs/magic.mk linux-5.15.41/fs/aufs/magic.mk
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/magic.mk 2022-09-06 12:51:51.042709862 +0300
|
||||
+++ linux-5.15.41/fs/aufs/magic.mk 2023-01-03 20:33:04.507529141 +0300
|
||||
@@ -0,0 +1,31 @@
|
||||
+# SPDX-License-Identifier: GPL-2.0
|
||||
+
|
||||
@@ -24688,7 +24692,7 @@ diff -Naur null/fs/aufs/magic.mk linux-5.15.41/fs/aufs/magic.mk
|
||||
+endif
|
||||
diff -Naur null/fs/aufs/Makefile linux-5.15.41/fs/aufs/Makefile
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/Makefile 2022-09-06 12:51:51.034709962 +0300
|
||||
+++ linux-5.15.41/fs/aufs/Makefile 2023-01-03 20:33:04.501529216 +0300
|
||||
@@ -0,0 +1,46 @@
|
||||
+# SPDX-License-Identifier: GPL-2.0
|
||||
+
|
||||
@@ -24738,7 +24742,7 @@ diff -Naur null/fs/aufs/Makefile linux-5.15.41/fs/aufs/Makefile
|
||||
+aufs-$(CONFIG_AUFS_MAGIC_SYSRQ) += sysrq.o
|
||||
diff -Naur null/fs/aufs/module.c linux-5.15.41/fs/aufs/module.c
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/module.c 2022-09-06 12:51:51.042709862 +0300
|
||||
+++ linux-5.15.41/fs/aufs/module.c 2023-01-03 20:33:04.507529141 +0300
|
||||
@@ -0,0 +1,273 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
@@ -25015,7 +25019,7 @@ diff -Naur null/fs/aufs/module.c linux-5.15.41/fs/aufs/module.c
|
||||
+module_exit(aufs_exit);
|
||||
diff -Naur null/fs/aufs/module.h linux-5.15.41/fs/aufs/module.h
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/module.h 2022-09-06 12:51:51.042709862 +0300
|
||||
+++ linux-5.15.41/fs/aufs/module.h 2023-01-03 20:33:04.507529141 +0300
|
||||
@@ -0,0 +1,166 @@
|
||||
+/* SPDX-License-Identifier: GPL-2.0 */
|
||||
+/*
|
||||
@@ -25185,7 +25189,7 @@ diff -Naur null/fs/aufs/module.h linux-5.15.41/fs/aufs/module.h
|
||||
+#endif /* __AUFS_MODULE_H__ */
|
||||
diff -Naur null/fs/aufs/mvdown.c linux-5.15.41/fs/aufs/mvdown.c
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/mvdown.c 2022-09-06 12:51:51.043709849 +0300
|
||||
+++ linux-5.15.41/fs/aufs/mvdown.c 2023-01-03 20:33:04.507529141 +0300
|
||||
@@ -0,0 +1,706 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
@@ -25895,7 +25899,7 @@ diff -Naur null/fs/aufs/mvdown.c linux-5.15.41/fs/aufs/mvdown.c
|
||||
+}
|
||||
diff -Naur null/fs/aufs/opts.c linux-5.15.41/fs/aufs/opts.c
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/opts.c 2022-09-06 12:51:51.043709849 +0300
|
||||
+++ linux-5.15.41/fs/aufs/opts.c 2023-01-03 20:33:04.507529141 +0300
|
||||
@@ -0,0 +1,1032 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
@@ -26931,7 +26935,7 @@ diff -Naur null/fs/aufs/opts.c linux-5.15.41/fs/aufs/opts.c
|
||||
+}
|
||||
diff -Naur null/fs/aufs/opts.h linux-5.15.41/fs/aufs/opts.h
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/opts.h 2022-09-06 12:51:51.043709849 +0300
|
||||
+++ linux-5.15.41/fs/aufs/opts.h 2023-01-03 20:33:04.507529141 +0300
|
||||
@@ -0,0 +1,263 @@
|
||||
+/* SPDX-License-Identifier: GPL-2.0 */
|
||||
+/*
|
||||
@@ -27198,7 +27202,7 @@ diff -Naur null/fs/aufs/opts.h linux-5.15.41/fs/aufs/opts.h
|
||||
+#endif /* __AUFS_OPTS_H__ */
|
||||
diff -Naur null/fs/aufs/plink.c linux-5.15.41/fs/aufs/plink.c
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/plink.c 2022-09-06 12:51:51.043709849 +0300
|
||||
+++ linux-5.15.41/fs/aufs/plink.c 2023-01-03 20:33:04.507529141 +0300
|
||||
@@ -0,0 +1,516 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
@@ -27718,7 +27722,7 @@ diff -Naur null/fs/aufs/plink.c linux-5.15.41/fs/aufs/plink.c
|
||||
+}
|
||||
diff -Naur null/fs/aufs/poll.c linux-5.15.41/fs/aufs/poll.c
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/poll.c 2022-09-06 12:51:51.044709837 +0300
|
||||
+++ linux-5.15.41/fs/aufs/poll.c 2023-01-03 20:33:04.507529141 +0300
|
||||
@@ -0,0 +1,51 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
@@ -27773,7 +27777,7 @@ diff -Naur null/fs/aufs/poll.c linux-5.15.41/fs/aufs/poll.c
|
||||
+}
|
||||
diff -Naur null/fs/aufs/posix_acl.c linux-5.15.41/fs/aufs/posix_acl.c
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/posix_acl.c 2022-09-06 12:51:51.044709837 +0300
|
||||
+++ linux-5.15.41/fs/aufs/posix_acl.c 2023-01-03 20:33:04.508529129 +0300
|
||||
@@ -0,0 +1,111 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
@@ -27888,7 +27892,7 @@ diff -Naur null/fs/aufs/posix_acl.c linux-5.15.41/fs/aufs/posix_acl.c
|
||||
+}
|
||||
diff -Naur null/fs/aufs/procfs.c linux-5.15.41/fs/aufs/procfs.c
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/procfs.c 2022-09-06 12:51:51.044709837 +0300
|
||||
+++ linux-5.15.41/fs/aufs/procfs.c 2023-01-03 20:33:04.508529129 +0300
|
||||
@@ -0,0 +1,170 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
@@ -28062,7 +28066,7 @@ diff -Naur null/fs/aufs/procfs.c linux-5.15.41/fs/aufs/procfs.c
|
||||
+}
|
||||
diff -Naur null/fs/aufs/rdu.c linux-5.15.41/fs/aufs/rdu.c
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/rdu.c 2022-09-06 12:51:51.044709837 +0300
|
||||
+++ linux-5.15.41/fs/aufs/rdu.c 2023-01-03 20:33:04.508529129 +0300
|
||||
@@ -0,0 +1,384 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
@@ -28450,7 +28454,7 @@ diff -Naur null/fs/aufs/rdu.c linux-5.15.41/fs/aufs/rdu.c
|
||||
+#endif
|
||||
diff -Naur null/fs/aufs/rwsem.h linux-5.15.41/fs/aufs/rwsem.h
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/rwsem.h 2022-09-06 12:51:51.044709837 +0300
|
||||
+++ linux-5.15.41/fs/aufs/rwsem.h 2023-01-03 20:33:04.508529129 +0300
|
||||
@@ -0,0 +1,85 @@
|
||||
+/* SPDX-License-Identifier: GPL-2.0 */
|
||||
+/*
|
||||
@@ -28539,7 +28543,7 @@ diff -Naur null/fs/aufs/rwsem.h linux-5.15.41/fs/aufs/rwsem.h
|
||||
+#endif /* __AUFS_RWSEM_H__ */
|
||||
diff -Naur null/fs/aufs/sbinfo.c linux-5.15.41/fs/aufs/sbinfo.c
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/sbinfo.c 2022-09-06 12:51:51.044709837 +0300
|
||||
+++ linux-5.15.41/fs/aufs/sbinfo.c 2023-01-03 20:33:04.508529129 +0300
|
||||
@@ -0,0 +1,316 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
@@ -28859,7 +28863,7 @@ diff -Naur null/fs/aufs/sbinfo.c linux-5.15.41/fs/aufs/sbinfo.c
|
||||
+}
|
||||
diff -Naur null/fs/aufs/super.c linux-5.15.41/fs/aufs/super.c
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/super.c 2022-09-06 12:51:51.044709837 +0300
|
||||
+++ linux-5.15.41/fs/aufs/super.c 2023-01-03 20:33:04.508529129 +0300
|
||||
@@ -0,0 +1,871 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
@@ -29734,7 +29738,7 @@ diff -Naur null/fs/aufs/super.c linux-5.15.41/fs/aufs/super.c
|
||||
+};
|
||||
diff -Naur null/fs/aufs/super.h linux-5.15.41/fs/aufs/super.h
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/super.h 2022-09-06 12:51:51.045709824 +0300
|
||||
+++ linux-5.15.41/fs/aufs/super.h 2023-01-03 20:33:04.508529129 +0300
|
||||
@@ -0,0 +1,592 @@
|
||||
+/* SPDX-License-Identifier: GPL-2.0 */
|
||||
+/*
|
||||
@@ -30330,7 +30334,7 @@ diff -Naur null/fs/aufs/super.h linux-5.15.41/fs/aufs/super.h
|
||||
+#endif /* __AUFS_SUPER_H__ */
|
||||
diff -Naur null/fs/aufs/sysaufs.c linux-5.15.41/fs/aufs/sysaufs.c
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/sysaufs.c 2022-09-06 12:51:51.045709824 +0300
|
||||
+++ linux-5.15.41/fs/aufs/sysaufs.c 2023-01-03 20:33:04.508529129 +0300
|
||||
@@ -0,0 +1,93 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
@@ -30427,7 +30431,7 @@ diff -Naur null/fs/aufs/sysaufs.c linux-5.15.41/fs/aufs/sysaufs.c
|
||||
+}
|
||||
diff -Naur null/fs/aufs/sysaufs.h linux-5.15.41/fs/aufs/sysaufs.h
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/sysaufs.h 2022-09-06 12:51:51.045709824 +0300
|
||||
+++ linux-5.15.41/fs/aufs/sysaufs.h 2023-01-03 20:33:04.508529129 +0300
|
||||
@@ -0,0 +1,102 @@
|
||||
+/* SPDX-License-Identifier: GPL-2.0 */
|
||||
+/*
|
||||
@@ -30533,7 +30537,7 @@ diff -Naur null/fs/aufs/sysaufs.h linux-5.15.41/fs/aufs/sysaufs.h
|
||||
+#endif /* __SYSAUFS_H__ */
|
||||
diff -Naur null/fs/aufs/sysfs.c linux-5.15.41/fs/aufs/sysfs.c
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/sysfs.c 2022-09-06 12:51:51.045709824 +0300
|
||||
+++ linux-5.15.41/fs/aufs/sysfs.c 2023-01-03 20:33:04.508529129 +0300
|
||||
@@ -0,0 +1,374 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
@@ -30911,7 +30915,7 @@ diff -Naur null/fs/aufs/sysfs.c linux-5.15.41/fs/aufs/sysfs.c
|
||||
+}
|
||||
diff -Naur null/fs/aufs/sysrq.c linux-5.15.41/fs/aufs/sysrq.c
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/sysrq.c 2022-09-06 12:51:51.045709824 +0300
|
||||
+++ linux-5.15.41/fs/aufs/sysrq.c 2023-01-03 20:33:04.508529129 +0300
|
||||
@@ -0,0 +1,149 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
@@ -31064,7 +31068,7 @@ diff -Naur null/fs/aufs/sysrq.c linux-5.15.41/fs/aufs/sysrq.c
|
||||
+}
|
||||
diff -Naur null/fs/aufs/vdir.c linux-5.15.41/fs/aufs/vdir.c
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/vdir.c 2022-09-06 12:51:51.045709824 +0300
|
||||
+++ linux-5.15.41/fs/aufs/vdir.c 2023-01-03 20:33:04.509529116 +0300
|
||||
@@ -0,0 +1,896 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
@@ -31964,7 +31968,7 @@ diff -Naur null/fs/aufs/vdir.c linux-5.15.41/fs/aufs/vdir.c
|
||||
+}
|
||||
diff -Naur null/fs/aufs/vfsub.c linux-5.15.41/fs/aufs/vfsub.c
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/vfsub.c 2022-09-06 12:51:51.045709824 +0300
|
||||
+++ linux-5.15.41/fs/aufs/vfsub.c 2023-01-03 20:33:04.509529116 +0300
|
||||
@@ -0,0 +1,918 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
@@ -32886,7 +32890,7 @@ diff -Naur null/fs/aufs/vfsub.c linux-5.15.41/fs/aufs/vfsub.c
|
||||
+}
|
||||
diff -Naur null/fs/aufs/vfsub.h linux-5.15.41/fs/aufs/vfsub.h
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/vfsub.h 2022-09-06 12:51:51.046709812 +0300
|
||||
+++ linux-5.15.41/fs/aufs/vfsub.h 2023-01-03 20:33:04.509529116 +0300
|
||||
@@ -0,0 +1,358 @@
|
||||
+/* SPDX-License-Identifier: GPL-2.0 */
|
||||
+/*
|
||||
@@ -33248,7 +33252,7 @@ diff -Naur null/fs/aufs/vfsub.h linux-5.15.41/fs/aufs/vfsub.h
|
||||
+#endif /* __AUFS_VFSUB_H__ */
|
||||
diff -Naur null/fs/aufs/wbr_policy.c linux-5.15.41/fs/aufs/wbr_policy.c
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/wbr_policy.c 2022-09-06 12:51:51.046709812 +0300
|
||||
+++ linux-5.15.41/fs/aufs/wbr_policy.c 2023-01-03 20:33:04.509529116 +0300
|
||||
@@ -0,0 +1,830 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
@@ -34082,7 +34086,7 @@ diff -Naur null/fs/aufs/wbr_policy.c linux-5.15.41/fs/aufs/wbr_policy.c
|
||||
+};
|
||||
diff -Naur null/fs/aufs/whout.c linux-5.15.41/fs/aufs/whout.c
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/whout.c 2022-09-06 12:51:51.046709812 +0300
|
||||
+++ linux-5.15.41/fs/aufs/whout.c 2023-01-03 20:33:04.509529116 +0300
|
||||
@@ -0,0 +1,1072 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
@@ -35158,7 +35162,7 @@ diff -Naur null/fs/aufs/whout.c linux-5.15.41/fs/aufs/whout.c
|
||||
+}
|
||||
diff -Naur null/fs/aufs/whout.h linux-5.15.41/fs/aufs/whout.h
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/whout.h 2022-09-06 12:51:51.046709812 +0300
|
||||
+++ linux-5.15.41/fs/aufs/whout.h 2023-01-03 20:33:04.509529116 +0300
|
||||
@@ -0,0 +1,87 @@
|
||||
+/* SPDX-License-Identifier: GPL-2.0 */
|
||||
+/*
|
||||
@@ -35249,7 +35253,7 @@ diff -Naur null/fs/aufs/whout.h linux-5.15.41/fs/aufs/whout.h
|
||||
+#endif /* __AUFS_WHOUT_H__ */
|
||||
diff -Naur null/fs/aufs/wkq.c linux-5.15.41/fs/aufs/wkq.c
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/wkq.c 2022-09-06 12:51:51.046709812 +0300
|
||||
+++ linux-5.15.41/fs/aufs/wkq.c 2023-01-03 20:33:04.509529116 +0300
|
||||
@@ -0,0 +1,372 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
@@ -35625,7 +35629,7 @@ diff -Naur null/fs/aufs/wkq.c linux-5.15.41/fs/aufs/wkq.c
|
||||
+}
|
||||
diff -Naur null/fs/aufs/wkq.h linux-5.15.41/fs/aufs/wkq.h
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/wkq.h 2022-09-06 12:51:51.047709799 +0300
|
||||
+++ linux-5.15.41/fs/aufs/wkq.h 2023-01-03 20:33:04.510529104 +0300
|
||||
@@ -0,0 +1,89 @@
|
||||
+/* SPDX-License-Identifier: GPL-2.0 */
|
||||
+/*
|
||||
@@ -35718,7 +35722,7 @@ diff -Naur null/fs/aufs/wkq.h linux-5.15.41/fs/aufs/wkq.h
|
||||
+#endif /* __AUFS_WKQ_H__ */
|
||||
diff -Naur null/fs/aufs/xattr.c linux-5.15.41/fs/aufs/xattr.c
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/xattr.c 2022-09-06 12:51:51.047709799 +0300
|
||||
+++ linux-5.15.41/fs/aufs/xattr.c 2023-01-03 20:33:04.510529104 +0300
|
||||
@@ -0,0 +1,368 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
@@ -36090,7 +36094,7 @@ diff -Naur null/fs/aufs/xattr.c linux-5.15.41/fs/aufs/xattr.c
|
||||
+}
|
||||
diff -Naur null/fs/aufs/xino.c linux-5.15.41/fs/aufs/xino.c
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/fs/aufs/xino.c 2022-09-06 12:51:51.047709799 +0300
|
||||
+++ linux-5.15.41/fs/aufs/xino.c 2023-01-03 20:33:04.510529104 +0300
|
||||
@@ -0,0 +1,1926 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
@@ -38020,7 +38024,7 @@ diff -Naur null/fs/aufs/xino.c linux-5.15.41/fs/aufs/xino.c
|
||||
+}
|
||||
diff -Naur null/include/uapi/linux/aufs_type.h linux-5.15.41/include/uapi/linux/aufs_type.h
|
||||
--- /dev/null
|
||||
+++ linux-5.15.41/include/uapi/linux/aufs_type.h 2022-09-06 12:51:51.048709787 +0300
|
||||
+++ linux-5.15.41/include/uapi/linux/aufs_type.h 2023-01-03 20:33:04.510529104 +0300
|
||||
@@ -0,0 +1,452 @@
|
||||
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
|
||||
+/*
|
||||
@@ -38064,7 +38068,7 @@ diff -Naur null/include/uapi/linux/aufs_type.h linux-5.15.41/include/uapi/linux/
|
||||
+#include <limits.h>
|
||||
+#endif /* __KERNEL__ */
|
||||
+
|
||||
+#define AUFS_VERSION "5.15.41-20220620"
|
||||
+#define AUFS_VERSION "5.15.41-20221219"
|
||||
+
|
||||
+/* todo? move this to linux-2.6.19/include/magic.h */
|
||||
+#define AUFS_SUPER_MAGIC ('a' << 24 | 'u' << 16 | 'f' << 8 | 's')
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
+74
@@ -0,0 +1,74 @@
|
||||
From c1afb26727d9e507d3e17a9890e7aaf7fc85cd55 Mon Sep 17 00:00:00 2001
|
||||
From: Po-Hao Huang <phhuang@realtek.com>
|
||||
Date: Fri, 17 Dec 2021 09:27:08 +0800
|
||||
Subject: rtw88: 8822c: update rx settings to prevent potential hw deadlock
|
||||
|
||||
These settings enables mac to detect and recover when rx fifo
|
||||
circuit deadlock occurs. Previous version missed this, so we fix it.
|
||||
|
||||
Signed-off-by: Po-Hao Huang <phhuang@realtek.com>
|
||||
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
|
||||
Signed-off-by: Kalle Valo <kvalo@kernel.org>
|
||||
Link: https://lore.kernel.org/r/20211217012708.8623-1-pkshih@realtek.com
|
||||
---
|
||||
drivers/net/wireless/realtek/rtw88/main.c | 2 +-
|
||||
drivers/net/wireless/realtek/rtw88/rtw8821c.h | 2 +-
|
||||
drivers/net/wireless/realtek/rtw88/rtw8822b.c | 2 +-
|
||||
drivers/net/wireless/realtek/rtw88/rtw8822c.c | 2 +-
|
||||
4 files changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/drivers/net/wireless/realtek/rtw88/main.c b/drivers/net/wireless/realtek/rtw88/main.c
|
||||
index 78fcbc20942db..274e0af959177 100644
|
||||
--- a/drivers/net/wireless/realtek/rtw88/main.c
|
||||
+++ b/drivers/net/wireless/realtek/rtw88/main.c
|
||||
@@ -1869,7 +1869,7 @@ int rtw_core_init(struct rtw_dev *rtwdev)
|
||||
|
||||
/* default rx filter setting */
|
||||
rtwdev->hal.rcr = BIT_APP_FCS | BIT_APP_MIC | BIT_APP_ICV |
|
||||
- BIT_HTC_LOC_CTRL | BIT_APP_PHYSTS |
|
||||
+ BIT_PKTCTL_DLEN | BIT_HTC_LOC_CTRL | BIT_APP_PHYSTS |
|
||||
BIT_AB | BIT_AM | BIT_APM;
|
||||
|
||||
ret = rtw_load_firmware(rtwdev, RTW_NORMAL_FW);
|
||||
diff --git a/drivers/net/wireless/realtek/rtw88/rtw8821c.h b/drivers/net/wireless/realtek/rtw88/rtw8821c.h
|
||||
index 112faa60f653e..d9fbddd7b0f35 100644
|
||||
--- a/drivers/net/wireless/realtek/rtw88/rtw8821c.h
|
||||
+++ b/drivers/net/wireless/realtek/rtw88/rtw8821c.h
|
||||
@@ -131,7 +131,7 @@ _rtw_write32s_mask(struct rtw_dev *rtwdev, u32 addr, u32 mask, u32 data)
|
||||
#define WLAN_TX_FUNC_CFG2 0x30
|
||||
#define WLAN_MAC_OPT_NORM_FUNC1 0x98
|
||||
#define WLAN_MAC_OPT_LB_FUNC1 0x80
|
||||
-#define WLAN_MAC_OPT_FUNC2 0x30810041
|
||||
+#define WLAN_MAC_OPT_FUNC2 0xb0810041
|
||||
|
||||
#define WLAN_SIFS_CFG (WLAN_SIFS_CCK_CONT_TX | \
|
||||
(WLAN_SIFS_OFDM_CONT_TX << BIT_SHIFT_SIFS_OFDM_CTX) | \
|
||||
diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822b.c b/drivers/net/wireless/realtek/rtw88/rtw8822b.c
|
||||
index a4cbcc6bdcd14..dd4fbb82750d5 100644
|
||||
--- a/drivers/net/wireless/realtek/rtw88/rtw8822b.c
|
||||
+++ b/drivers/net/wireless/realtek/rtw88/rtw8822b.c
|
||||
@@ -205,7 +205,7 @@ static void rtw8822b_phy_set_param(struct rtw_dev *rtwdev)
|
||||
#define WLAN_TX_FUNC_CFG2 0x30
|
||||
#define WLAN_MAC_OPT_NORM_FUNC1 0x98
|
||||
#define WLAN_MAC_OPT_LB_FUNC1 0x80
|
||||
-#define WLAN_MAC_OPT_FUNC2 0x30810041
|
||||
+#define WLAN_MAC_OPT_FUNC2 0xb0810041
|
||||
|
||||
#define WLAN_SIFS_CFG (WLAN_SIFS_CCK_CONT_TX | \
|
||||
(WLAN_SIFS_OFDM_CONT_TX << BIT_SHIFT_SIFS_OFDM_CTX) | \
|
||||
diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822c.c b/drivers/net/wireless/realtek/rtw88/rtw8822c.c
|
||||
index a8b95dcdb8e90..e01d61b5d104b 100644
|
||||
--- a/drivers/net/wireless/realtek/rtw88/rtw8822c.c
|
||||
+++ b/drivers/net/wireless/realtek/rtw88/rtw8822c.c
|
||||
@@ -1962,7 +1962,7 @@ static void rtw8822c_phy_set_param(struct rtw_dev *rtwdev)
|
||||
#define WLAN_TX_FUNC_CFG2 0x30
|
||||
#define WLAN_MAC_OPT_NORM_FUNC1 0x98
|
||||
#define WLAN_MAC_OPT_LB_FUNC1 0x80
|
||||
-#define WLAN_MAC_OPT_FUNC2 0x30810041
|
||||
+#define WLAN_MAC_OPT_FUNC2 0xb0810041
|
||||
#define WLAN_MAC_INT_MIG_CFG 0x33330000
|
||||
|
||||
#define WLAN_SIFS_CFG (WLAN_SIFS_CCK_CONT_TX | \
|
||||
--
|
||||
cgit 1.2.3-1.el7
|
||||
|
||||
+14
@@ -0,0 +1,14 @@
|
||||
|
||||
The staging driver rtlwifi/r8822be.ko.xz is being replaced by the new rtw88 driver.
|
||||
|
||||
Add a module alias to keep upgrade path.
|
||||
|
||||
Signed-off-by: Thomas Backlund <tmb@mageia.org>
|
||||
|
||||
--- a/drivers/net/wireless/realtek/rtw88/rtw8822be.c
|
||||
+++ b/drivers/net/wireless/realtek/rtw88/rtw8822be.c
|
||||
@@ -28,3 +28,4 @@ module_pci_driver(rtw_8822be_driver);
|
||||
MODULE_AUTHOR("Realtek Corporation");
|
||||
MODULE_DESCRIPTION("Realtek 802.11ac wireless 8822be driver");
|
||||
MODULE_LICENSE("Dual BSD/GPL");
|
||||
+MODULE_ALIAS("r8822be");
|
||||
+143
@@ -0,0 +1,143 @@
|
||||
From a3fd1f9aa79a7d3885faa486acb02c838533f332 Mon Sep 17 00:00:00 2001
|
||||
From: Chin-Yen Lee <timlee@realtek.com>
|
||||
Date: Fri, 17 Dec 2021 09:24:21 +0800
|
||||
Subject: rtw88: don't check CRC of VHT-SIG-B in 802.11ac signal
|
||||
|
||||
Currently all realtek wifi chip is set to check CRC of VHT-SIG-B
|
||||
in 802.11ac signal, but some AP don't calculate the CRC and packets
|
||||
from these AP can't be received and lead to disconnection.
|
||||
We disable the check defaultly to avoid this case.
|
||||
|
||||
Signed-off-by: Chin-Yen Lee <timlee@realtek.com>
|
||||
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
|
||||
Signed-off-by: Kalle Valo <kvalo@kernel.org>
|
||||
Link: https://lore.kernel.org/r/20211217012421.7859-1-pkshih@realtek.com
|
||||
---
|
||||
drivers/net/wireless/realtek/rtw88/bf.c | 14 +++++++++-----
|
||||
drivers/net/wireless/realtek/rtw88/bf.h | 7 +++++--
|
||||
drivers/net/wireless/realtek/rtw88/rtw8821c.c | 3 ++-
|
||||
drivers/net/wireless/realtek/rtw88/rtw8822b.c | 2 ++
|
||||
drivers/net/wireless/realtek/rtw88/rtw8822c.c | 2 ++
|
||||
5 files changed, 20 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/drivers/net/wireless/realtek/rtw88/bf.c b/drivers/net/wireless/realtek/rtw88/bf.c
|
||||
index aff70e4ae0288..df750b3a35e9d 100644
|
||||
--- a/drivers/net/wireless/realtek/rtw88/bf.c
|
||||
+++ b/drivers/net/wireless/realtek/rtw88/bf.c
|
||||
@@ -130,7 +130,8 @@ void rtw_bf_cfg_sounding(struct rtw_dev *rtwdev, struct rtw_vif *vif,
|
||||
BIT_WMAC_USE_NDPARATE |
|
||||
(csi_rsc << 13);
|
||||
|
||||
- rtw_write8(rtwdev, REG_SND_PTCL_CTRL, RTW_SND_CTRL_SOUNDING);
|
||||
+ rtw_write8_mask(rtwdev, REG_SND_PTCL_CTRL, BIT_MASK_BEAMFORM,
|
||||
+ RTW_SND_CTRL_SOUNDING);
|
||||
rtw_write8(rtwdev, REG_SND_PTCL_CTRL + 3, 0x26);
|
||||
rtw_write8_clr(rtwdev, REG_RXFLTMAP1, BIT_RXFLTMAP1_BF_REPORT_POLL);
|
||||
rtw_write8_clr(rtwdev, REG_RXFLTMAP4, BIT_RXFLTMAP4_BF_REPORT_POLL);
|
||||
@@ -177,7 +178,7 @@ void rtw_bf_del_bfer_entry_mu(struct rtw_dev *rtwdev)
|
||||
|
||||
void rtw_bf_del_sounding(struct rtw_dev *rtwdev)
|
||||
{
|
||||
- rtw_write8(rtwdev, REG_SND_PTCL_CTRL, 0);
|
||||
+ rtw_write8_mask(rtwdev, REG_SND_PTCL_CTRL, BIT_MASK_BEAMFORM, 0);
|
||||
}
|
||||
|
||||
void rtw_bf_enable_bfee_su(struct rtw_dev *rtwdev, struct rtw_vif *vif,
|
||||
@@ -204,7 +205,8 @@ void rtw_bf_enable_bfee_su(struct rtw_dev *rtwdev, struct rtw_vif *vif,
|
||||
}
|
||||
|
||||
/* Sounding protocol control */
|
||||
- rtw_write8(rtwdev, REG_SND_PTCL_CTRL, RTW_SND_CTRL_SOUNDING);
|
||||
+ rtw_write8_mask(rtwdev, REG_SND_PTCL_CTRL, BIT_MASK_BEAMFORM,
|
||||
+ RTW_SND_CTRL_SOUNDING);
|
||||
|
||||
/* MAC address/Partial AID of Beamformer */
|
||||
for (i = 0; i < ETH_ALEN; i++)
|
||||
@@ -273,7 +275,8 @@ void rtw_bf_remove_bfee_su(struct rtw_dev *rtwdev,
|
||||
struct rtw_bf_info *bfinfo = &rtwdev->bf_info;
|
||||
|
||||
rtw_dbg(rtwdev, RTW_DBG_BF, "remove as a su bfee\n");
|
||||
- rtw_write8(rtwdev, REG_SND_PTCL_CTRL, RTW_SND_CTRL_REMOVE);
|
||||
+ rtw_write8_mask(rtwdev, REG_SND_PTCL_CTRL, BIT_MASK_BEAMFORM,
|
||||
+ RTW_SND_CTRL_REMOVE);
|
||||
|
||||
switch (bfee->su_reg_index) {
|
||||
case 0:
|
||||
@@ -298,7 +301,8 @@ void rtw_bf_remove_bfee_mu(struct rtw_dev *rtwdev,
|
||||
{
|
||||
struct rtw_bf_info *bfinfo = &rtwdev->bf_info;
|
||||
|
||||
- rtw_write8(rtwdev, REG_SND_PTCL_CTRL, RTW_SND_CTRL_REMOVE);
|
||||
+ rtw_write8_mask(rtwdev, REG_SND_PTCL_CTRL, BIT_MASK_BEAMFORM,
|
||||
+ RTW_SND_CTRL_REMOVE);
|
||||
|
||||
rtw_bf_del_bfer_entry_mu(rtwdev);
|
||||
|
||||
diff --git a/drivers/net/wireless/realtek/rtw88/bf.h b/drivers/net/wireless/realtek/rtw88/bf.h
|
||||
index 17855edb5006a..7b40c2c038560 100644
|
||||
--- a/drivers/net/wireless/realtek/rtw88/bf.h
|
||||
+++ b/drivers/net/wireless/realtek/rtw88/bf.h
|
||||
@@ -13,6 +13,9 @@
|
||||
#define REG_ASSOCIATED_BFMER1_INFO 0x06EC
|
||||
#define REG_TX_CSI_RPT_PARAM_BW20 0x06F4
|
||||
#define REG_SND_PTCL_CTRL 0x0718
|
||||
+#define BIT_DIS_CHK_VHTSIGB_CRC BIT(6)
|
||||
+#define BIT_DIS_CHK_VHTSIGA_CRC BIT(5)
|
||||
+#define BIT_MASK_BEAMFORM (GENMASK(4, 0) | BIT(7))
|
||||
#define REG_MU_TX_CTL 0x14C0
|
||||
#define REG_MU_STA_GID_VLD 0x14C4
|
||||
#define REG_MU_STA_USER_POS_INFO 0x14C8
|
||||
@@ -42,8 +45,8 @@
|
||||
#define BIT_RXFLTMAP4_BF_REPORT_POLL BIT(4)
|
||||
|
||||
#define RTW_NDP_RX_STANDBY_TIME 0x70
|
||||
-#define RTW_SND_CTRL_REMOVE 0xD8
|
||||
-#define RTW_SND_CTRL_SOUNDING 0xDB
|
||||
+#define RTW_SND_CTRL_REMOVE 0x98
|
||||
+#define RTW_SND_CTRL_SOUNDING 0x9B
|
||||
|
||||
enum csi_seg_len {
|
||||
HAL_CSI_SEG_4K = 0,
|
||||
diff --git a/drivers/net/wireless/realtek/rtw88/rtw8821c.c b/drivers/net/wireless/realtek/rtw88/rtw8821c.c
|
||||
index 80a6f4da6acd9..db078df63f855 100644
|
||||
--- a/drivers/net/wireless/realtek/rtw88/rtw8821c.c
|
||||
+++ b/drivers/net/wireless/realtek/rtw88/rtw8821c.c
|
||||
@@ -223,7 +223,8 @@ static int rtw8821c_mac_init(struct rtw_dev *rtwdev)
|
||||
rtw_write8(rtwdev, REG_TCR + 1, WLAN_TX_FUNC_CFG1);
|
||||
rtw_write8(rtwdev, REG_ACKTO_CCK, 0x40);
|
||||
rtw_write8_set(rtwdev, REG_WMAC_TRXPTCL_CTL_H, BIT(1));
|
||||
- rtw_write8_set(rtwdev, REG_SND_PTCL_CTRL, BIT(6));
|
||||
+ rtw_write8_set(rtwdev, REG_SND_PTCL_CTRL,
|
||||
+ BIT_DIS_CHK_VHTSIGB_CRC);
|
||||
rtw_write32(rtwdev, REG_WMAC_OPTION_FUNCTION + 8, WLAN_MAC_OPT_FUNC2);
|
||||
rtw_write8(rtwdev, REG_WMAC_OPTION_FUNCTION + 4, WLAN_MAC_OPT_NORM_FUNC1);
|
||||
|
||||
diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822b.c b/drivers/net/wireless/realtek/rtw88/rtw8822b.c
|
||||
index c409c8c29ec8b..a4cbcc6bdcd14 100644
|
||||
--- a/drivers/net/wireless/realtek/rtw88/rtw8822b.c
|
||||
+++ b/drivers/net/wireless/realtek/rtw88/rtw8822b.c
|
||||
@@ -262,6 +262,8 @@ static int rtw8822b_mac_init(struct rtw_dev *rtwdev)
|
||||
rtw_write8(rtwdev, REG_TCR + 1, WLAN_TX_FUNC_CFG1);
|
||||
rtw_write32(rtwdev, REG_WMAC_OPTION_FUNCTION + 8, WLAN_MAC_OPT_FUNC2);
|
||||
rtw_write8(rtwdev, REG_WMAC_OPTION_FUNCTION + 4, WLAN_MAC_OPT_NORM_FUNC1);
|
||||
+ rtw_write8_set(rtwdev, REG_SND_PTCL_CTRL,
|
||||
+ BIT_DIS_CHK_VHTSIGB_CRC);
|
||||
|
||||
return 0;
|
||||
}
|
||||
diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822c.c b/drivers/net/wireless/realtek/rtw88/rtw8822c.c
|
||||
index 46b881e8e4feb..a8b95dcdb8e90 100644
|
||||
--- a/drivers/net/wireless/realtek/rtw88/rtw8822c.c
|
||||
+++ b/drivers/net/wireless/realtek/rtw88/rtw8822c.c
|
||||
@@ -2102,6 +2102,8 @@ static int rtw8822c_mac_init(struct rtw_dev *rtwdev)
|
||||
BIT_RXPSF_CONT_ERRCHKEN);
|
||||
value16 = BIT_SET_RXPSF_ERRTHR(value16, 0x07);
|
||||
rtw_write16(rtwdev, REG_RXPSF_CTRL, value16);
|
||||
+ rtw_write8_set(rtwdev, REG_SND_PTCL_CTRL,
|
||||
+ BIT_DIS_CHK_VHTSIGB_CRC);
|
||||
|
||||
/* Interrupt migration configuration */
|
||||
rtw_write32(rtwdev, REG_INT_MIG, WLAN_MAC_INT_MIG_CFG);
|
||||
--
|
||||
cgit 1.2.3-1.el7
|
||||
|
||||
+91474
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -18,10 +18,10 @@
|
||||
</BuildDependencies>
|
||||
<Patches>
|
||||
<!-- Linux patches -->
|
||||
<Patch level="1" compressionType="xz">patches/linux/patch-5.15.74.xz</Patch>
|
||||
<Patch level="1" compressionType="xz">patches/linux/patch-5.15.86.xz</Patch>
|
||||
|
||||
<!-- aufs5 patchec -->
|
||||
<Patch level="1">patches/aufs5/aufs5.15.41-20220620.patch</Patch>
|
||||
<Patch level="1">patches/aufs5/aufs5.15.41-20221219.patch</Patch>
|
||||
<Patch level="1">patches/aufs5/aufs5-base.patch</Patch>
|
||||
<Patch level="1">patches/aufs5/aufs5-kbuild.patch</Patch>
|
||||
<Patch level="1">patches/aufs5/aufs5-loopback.patch</Patch>
|
||||
@@ -32,56 +32,56 @@
|
||||
|
||||
<!-- Mageia Linux patches-->
|
||||
<Patch level="1">patches/mageia/fs-procfs-do-not-list-TID-0-in-proc-pid-task.patch</Patch>
|
||||
|
||||
|
||||
<Patch level="1">patches/mageia/CVE-2019-12379.patch</Patch>
|
||||
<Patch level="1">patches/mageia/CVE-2020-16119-DCCP-CCID-structure-use-after-free.patch</Patch>
|
||||
|
||||
|
||||
<Patch level="1">patches/mageia/platform-x86-add-shuttle-wmi-driver.patch</Patch>
|
||||
<Patch level="1">patches/mageia/platform-x86-shuttle-wmi-drop-devinit-exit.patch</Patch>
|
||||
<Patch level="1">patches/mageia/platform-x86-shuttle-wmi-4.2-buildfix.patch</Patch>
|
||||
<Patch level="1">patches/mageia/platform-x86-shuttle-wmi-4.13-buildfix.patch</Patch>
|
||||
<Patch level="1">patches/mageia/platform-x86-shuttle-wmi-kernel-5.5.patch</Patch>
|
||||
|
||||
<Patch level="1">patches/mageia/platform-x86-shuttle-wmi-drop-devinit-exit.patch</Patch>
|
||||
<Patch level="1">patches/mageia/platform-x86-shuttle-wmi-4.2-buildfix.patch</Patch>
|
||||
<Patch level="1">patches/mageia/platform-x86-shuttle-wmi-4.13-buildfix.patch</Patch>
|
||||
<Patch level="1">patches/mageia/platform-x86-shuttle-wmi-kernel-5.5.patch</Patch>
|
||||
|
||||
<Patch level="1">patches/mageia/3rd-3rdparty-tree.patch</Patch>
|
||||
<Patch level="1">patches/mageia/3rd-3rdparty-merge.patch</Patch>
|
||||
|
||||
|
||||
<Patch level="1">patches/mageia/3rd-ndiswrapper-1.63.patch</Patch>
|
||||
<Patch level="1">patches/mageia/3rd-ndiswrapper-Kconfig.patch</Patch>
|
||||
<Patch level="1">patches/mageia/3rd-ndiswrapper-Makefile-build-fix.patch</Patch>
|
||||
<Patch level="1">patches/mageia/3rd-niswrapper-Kconfig-Makefile.patch</Patch>
|
||||
|
||||
|
||||
<Patch level="1">patches/mageia/3rd-rtl8812au.patch</Patch>
|
||||
<Patch level="1">patches/mageia/3rd-rtl8812au-Kconfig-Makefile.patch</Patch>
|
||||
<Patch level="1">patches/mageia/3rd-rtl8812au-rename.patch</Patch>
|
||||
<Patch level="1">patches/mageia/3rd-rtl8812au-kernel-5.12.patch</Patch>
|
||||
<Patch level="1">patches/mageia/3rd-rtl8812au-kernel-5.15.patch</Patch>
|
||||
|
||||
|
||||
<Patch level="1">patches/mageia/3rd-rtl8723de.patch</Patch>
|
||||
<Patch level="1">patches/mageia/3rd-rtl8723de-Kconfig-Makefile.patch</Patch>
|
||||
<Patch level="1">patches/mageia/3rd-rtl8723de-fix-redefine.patch</Patch>
|
||||
<Patch level="1">patches/mageia/3rd-rtl8723de-nodebug.patch</Patch>
|
||||
<Patch level="1">patches/mageia/3rd-rtl8223de-kernel-5.6.patch</Patch>
|
||||
<Patch level="1">patches/mageia/3rd-rtl8723de-add-kernel-5.8-support.patch</Patch>
|
||||
|
||||
|
||||
<Patch level="1">patches/mageia/3rd-viahss-0.92.patch</Patch>
|
||||
<Patch level="1">patches/mageia/3rd-viahss-config.patch</Patch>
|
||||
<Patch level="1">patches/mageia/3rd-viahss-module-license.patch</Patch>
|
||||
<Patch level="1">patches/mageia/3rd-viahss-2.6.35-buildfix.patch</Patch>
|
||||
<Patch level="1">patches/mageia/3rd-viahss-3.0-buildfix.patch</Patch>
|
||||
<Patch level="1">patches/mageia/3rd-viahss-Kconfig-Makefile.patch</Patch>
|
||||
|
||||
|
||||
<Patch level="1">patches/mageia/3rd-rtl8821ce.patch</Patch>
|
||||
<Patch level="1">patches/mageia/3rd-rtl8821ce-Kconfig-Makefile.patch</Patch>
|
||||
<Patch level="1">patches/mageia/3rd-rtl8821ce-5.8-fix.patch</Patch>
|
||||
<Patch level="1">patches/mageia/3rd-rtl8821ce-kernel-5.10.patch</Patch>
|
||||
<Patch level="1">patches/mageia/3rd-rtl8821ce-kernel-5.12.patch</Patch>
|
||||
<Patch level="1">patches/mageia/3rd-rtl8821ce-kernel-5.15.patch</Patch>
|
||||
|
||||
|
||||
<Patch level="1">patches/mageia/3rd-fix-kconfig.patch</Patch>
|
||||
|
||||
<!-- <Patch level="1">patches/mageia/3rd-ndiswrapper-Kconfig.patch</Patch> -->
|
||||
<!-- <Patch level="1">patches/mageia/3rd-ndiswrapper-1.63.patch</Patch> -->
|
||||
<!-- <Patch level="1">patches/mageia/3rd-ndiswrapper-Makefile-build-fix.patch</Patch> -->
|
||||
|
||||
<Patch level="1">patches/mageia/net-wireless-rtw88-dont-check-CRC-of-VHT-SIG-B-in-802.11ac-signal.patch</Patch>
|
||||
<Patch level="1">patches/mageia/net-wireless-rtw89-add-Realtek-802.11ax-driver.patch</Patch>
|
||||
<Patch level="1">patches/mageia/net-wireless-rtw88-add-r8822be-alias.patch</Patch>
|
||||
</Patches>
|
||||
</Source>
|
||||
|
||||
@@ -109,6 +109,20 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="77">
|
||||
<Date>2023-01-03</Date>
|
||||
<Version>5.15.86</Version>
|
||||
<Comment>Version bump</Comment>
|
||||
<Name>Mustafa Cinasal</Name>
|
||||
<Email>muscnsl@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="76">
|
||||
<Date>2022-12-07</Date>
|
||||
<Version>5.15.81</Version>
|
||||
<Comment>Version bump</Comment>
|
||||
<Name>Mustafa Cinasal</Name>
|
||||
<Email>muscnsl@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="75">
|
||||
<Date>2022-10-22</Date>
|
||||
<Version>5.15.74</Version>
|
||||
|
||||
@@ -37,16 +37,25 @@ def install():
|
||||
pisitools.insinto("/usr/share/xml/docbook/xml-dtd-%s/ent" % version, "4.4/ent/*.ent")
|
||||
|
||||
for version in ["4.5"]:
|
||||
pisitools.insinto("/usr/share/xml/docbook/xml-dtd-%s" % version, "*.dtd")
|
||||
pisitools.insinto("/usr/share/xml/docbook/xml-dtd-%s" % version, "*.mod")
|
||||
pisitools.insinto("/usr/share/xml/docbook/xml-dtd-%s" % version, "docbook.cat")
|
||||
pisitools.insinto("/usr/share/xml/docbook/xml-dtd-%s/ent" % version, "ent/*.ent")
|
||||
pisitools.insinto("/usr/share/xml/docbook/xml-dtd-%s" % version, "4.5/*.dtd")
|
||||
pisitools.insinto("/usr/share/xml/docbook/xml-dtd-%s" % version, "4.5/*.mod")
|
||||
pisitools.insinto("/usr/share/xml/docbook/xml-dtd-%s" % version, "4.5/docbook.cat")
|
||||
pisitools.insinto("/usr/share/xml/docbook/xml-dtd-%s/ent" % version, "4.5/ent/*.ent")
|
||||
|
||||
for version in ["5.0"]:
|
||||
pisitools.insinto("/usr/share/xml/docbook/xml-dtd-%s/dtd" % version, "docbook-5.0/dtd/*.dtd")
|
||||
pisitools.insinto("/usr/share/xml/docbook/xml-dtd-%s/rng" % version, "docbook-5.0/rng/*.rng")
|
||||
pisitools.insinto("/usr/share/xml/docbook/xml-dtd-%s/rng" % version, "docbook-5.0/rng/*.rnc")
|
||||
pisitools.insinto("/usr/share/xml/docbook/xml-dtd-%s/xsd" % version, "docbook-5.0/xsd/*.xsd")
|
||||
pisitools.insinto("/usr/share/xml/docbook/xml-dtd-%s/sch" % version, "docbook-5.0/sch/*.sch")
|
||||
|
||||
pisitools.insinto("/usr/share/xml/docbook/schema/dtd/%s/" % version, "docbook-5.0/dtd/*.dtd")
|
||||
pisitools.insinto("/usr/share/xml/docbook/schema/rng/%s/" % version, "docbook-5.0/rng/*.rng")
|
||||
pisitools.insinto("/usr/share/xml/docbook/schema/rng/%s/" % version, "docbook-5.0/rng/*.rnc")
|
||||
pisitools.insinto("/usr/share/xml/docbook/schema/xsd/%s/" % version, "docbook-5.0/xsd/*.xsd")
|
||||
pisitools.insinto("/usr/share/xml/docbook/schema/sch/%s/" % version, "docbook-5.0/sch/*.sch")
|
||||
|
||||
for version in ["5.1"]:
|
||||
pisitools.insinto("/usr/share/xml/docbook/schema/sch/%s/" % version, "5.1/schemas/*.xml")
|
||||
pisitools.insinto("/usr/share/xml/docbook/schema/rng/%s/" % version, "5.1/schemas/rng/*.rng")
|
||||
pisitools.insinto("/usr/share/xml/docbook/schema/rng/%s/" % version, "5.1/schemas/rng/*.rnc")
|
||||
pisitools.insinto("/usr/share/xml/docbook/schema/sch/%s/" % version, "5.1/schemas/sch/*.sch")
|
||||
pisitools.insinto("/usr/share/xml/docbook/stylesheet/docbook5", "5.1/tools/db4-upgrade.xsl")
|
||||
pisitools.dobin("5.1/tools/db4-entities.pl")
|
||||
|
||||
shelltools.cd("docbook-5.0")
|
||||
pisitools.dodoc("ChangeLog", "README")
|
||||
|
||||
@@ -0,0 +1,6 @@
|
||||
<?xml version="1.0"?>
|
||||
<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN" "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
|
||||
<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
|
||||
<public publicId="-//OASIS//DTD DocBook XML 5.0//EN" uri="docbook.dtd"/>
|
||||
<system systemId="http://www.oasis-open.org/docbook/xml/5.0/dtd/docbook.dtd" uri="docbook.dtd"/>
|
||||
</catalog>
|
||||
@@ -0,0 +1,12 @@
|
||||
<?xml version="1.0"?>
|
||||
<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN" "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
|
||||
<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
|
||||
<uri name="http://docbook.org/xml/5.0/rng/docbook.rng" uri="docbook.rng"/>
|
||||
<uri name="http://www.oasis-open.org/docbook/xml/5.0/rng/docbook.rng" uri="docbook.rng"/>
|
||||
<uri name="http://docbook.org/xml/5.0/rng/docbookxi.rng" uri="docbookxi.rng"/>
|
||||
<uri name="http://www.oasis-open.org/docbook/xml/5.0/rng/docbookxi.rng" uri="docbookxi.rng"/>
|
||||
<uri name="http://docbook.org/xml/5.0/rng/docbook.rnc" uri="docbook.rnc"/>
|
||||
<uri name="http://www.oasis-open.org/docbook/xml/5.0/rng/docbook.rnc" uri="docbook.rnc"/>
|
||||
<uri name="http://docbook.org/xml/5.0/rng/docbookxi.rnc" uri="docbookxi.rnc"/>
|
||||
<uri name="http://www.oasis-open.org/docbook/xml/5.0/rng/docbookxi.rnc" uri="docbookxi.rnc"/>
|
||||
</catalog>
|
||||
@@ -0,0 +1,6 @@
|
||||
<?xml version="1.0"?>
|
||||
<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN" "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
|
||||
<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
|
||||
<uri name="http://docbook.org/xml/5.0/sch/docbook.sch" uri="docbook.sch"/>
|
||||
<uri name="http://www.oasis-open.org/docbook/xml/5.0/sch/docbook.sch" uri="docbook.sch"/>
|
||||
</catalog>
|
||||
@@ -0,0 +1,12 @@
|
||||
<?xml version="1.0"?>
|
||||
<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN" "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
|
||||
<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
|
||||
<uri name="http://docbook.org/xml/5.0/xsd/docbook.xsd" uri="docbook.xsd"/>
|
||||
<uri name="http://www.oasis-open.org/docbook/xml/5.0/xsd/docbook.xsd" uri="docbook.xsd"/>
|
||||
<uri name="http://docbook.org/xml/5.0/xsd/docbookxi.xsd" uri="docbookxi.xsd"/>
|
||||
<uri name="http://www.oasis-open.org/docbook/xml/5.0/xsd/docbookxi.xsd" uri="docbookxi.xsd"/>
|
||||
<uri name="http://docbook.org/xml/5.0/xsd/xlink.xsd" uri="xlink.xsd"/>
|
||||
<uri name="http://www.oasis-open.org/docbook/xml/5.0/xsd/xlink.xsd" uri="xlink.xsd"/>
|
||||
<uri name="http://docbook.org/xml/5.0/xsd/xml.xsd" uri="xml.xsd"/>
|
||||
<uri name="http://www.oasis-open.org/docbook/xml/5.0/xsd/xml.xsd" uri="xml.xsd"/>
|
||||
</catalog>
|
||||
@@ -0,0 +1,12 @@
|
||||
<?xml version="1.0"?>
|
||||
<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN" "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
|
||||
<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
|
||||
<uri name="http://docbook.org/xml/5.1/schemas/rng/docbook.schemas/rng" uri="docbook.schemas/rng"/>
|
||||
<uri name="http://www.oasis-open.org/docbook/xml/5.1/schemas/rng/docbook.schemas/rng" uri="docbook.schemas/rng"/>
|
||||
<uri name="http://docbook.org/xml/5.1/schemas/rng/docbookxi.schemas/rng" uri="docbookxi.schemas/rng"/>
|
||||
<uri name="http://www.oasis-open.org/docbook/xml/5.1/schemas/rng/docbookxi.schemas/rng" uri="docbookxi.schemas/rng"/>
|
||||
<uri name="http://docbook.org/xml/5.1/schemas/rng/docbook.rnc" uri="docbook.rnc"/>
|
||||
<uri name="http://www.oasis-open.org/docbook/xml/5.1/schemas/rng/docbook.rnc" uri="docbook.rnc"/>
|
||||
<uri name="http://docbook.org/xml/5.1/schemas/rng/docbookxi.rnc" uri="docbookxi.rnc"/>
|
||||
<uri name="http://www.oasis-open.org/docbook/xml/5.1/schemas/rng/docbookxi.rnc" uri="docbookxi.rnc"/>
|
||||
</catalog>
|
||||
@@ -0,0 +1,3 @@
|
||||
<?xml version="1.0"?>
|
||||
<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN" "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
|
||||
<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog"/>
|
||||
@@ -76,4 +76,15 @@
|
||||
<uri name="http://docbook.org/xml/5.0/xsd/xml.xsd" uri="file:///usr/share/xml/docbook/xml-dtd-5.0/xsd/xml.xsd"/>
|
||||
<uri name="http://www.oasis-open.org/docbook/xml/5.0/sch/docbook.sch" uri="file:///usr/share/xml/docbook/xml-dtd-5.0/sch/docbook.sch"/>
|
||||
<uri name="http://docbook.org/xml/5.0/sch/docbook.sch" uri="file:///usr/share/xml/docbook/xml-dtd-5.0/sch/docbook.sch"/>
|
||||
|
||||
<uri name="http://www.oasis-open.org/docbook/xml/5.1/rng/docbook.rng" uri="file:///usr/share/xml/docbook/schema/rng/5.1/docbook.rng"/>
|
||||
<uri name="http://docbook.org/xml/5.1/rng/docbook.rng" uri="file:///usr/share/xml/docbook/schema/rng/5.1/docbook.rng"/>
|
||||
<uri name="http://www.oasis-open.org/docbook/xml/5.1/rng/docbookxi.rng" uri="file:///usr/share/xml/docbook/schema/rng/5.1/docbookxi.rng"/>
|
||||
<uri name="http://docbook.org/xml/5.1/rng/docbookxi.rng" uri="file:///usr/share/xml/docbook/schema/rng/5.1/docbookxi.rng"/>
|
||||
<uri name="http://www.oasis-open.org/docbook/xml/5.1/rnc/docbook.rnc" uri="file:///usr/share/xml/docbook/schema/rng/5.1/docbook.rnc"/>
|
||||
<uri name="http://docbook.org/xml/5.1/rng/docbook.rnc" uri="file:///usr/share/xml/docbook/schema/rng/5.1/docbook.rnc"/>
|
||||
<uri name="http://www.oasis-open.org/docbook/xml/5.1/rnc/docbookxi.rnc" uri="file:///usr/share/xml/docbook/schema/rng/5.1/docbookxi.rnc"/>
|
||||
<uri name="http://docbook.org/xml/5.1/rng/docbookxi.rnc" uri="file:///usr/share/xml/docbook/schema/rng/5.1/docbookxi.rnc"/>
|
||||
<uri name="http://www.oasis-open.org/docbook/xml/5.1/sch/docbook.sch" uri="file:///usr/share/xml/docbook/schema/sch/5.1/docbook.sch"/>
|
||||
<uri name="http://docbook.org/xml/5.1/sch/docbook.sch" uri="file:///usr/share/xml/docbook/schema/sch/5.1/docbook.sch"/>
|
||||
</catalog>
|
||||
|
||||
@@ -0,0 +1,38 @@
|
||||
<?xml version="1.0"?>
|
||||
<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN" "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
|
||||
<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
|
||||
<delegatePublic publicIdStartString="-//OASIS//DTD DocBook XML 5.0//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/5.0/catalog.xml"/>
|
||||
<delegateSystem systemIdStartString="http://docbook.org/xml/5.0/dtd/" catalog="file:///usr/share/xml/docbook/schema/dtd/5.0/catalog.xml"/>
|
||||
<delegateURI uriStartString="http://docbook.org/xml/5.0/dtd/" catalog="file:///usr/share/xml/docbook/schema/dtd/5.0/catalog.xml"/>
|
||||
<delegateURI uriStartString="http://docbook.org/xml/5.0/rng/" catalog="file:///usr/share/xml/docbook/schema/rng/5.0/catalog.xml"/>
|
||||
<delegateURI uriStartString="http://docbook.org/xml/5.0/sch/" catalog="file:///usr/share/xml/docbook/schema/sch/5.0/catalog.xml"/>
|
||||
<delegateURI uriStartString="http://docbook.org/xml/5.0/xsd/" catalog="file:///usr/share/xml/docbook/schema/xsd/5.0/catalog.xml"/>
|
||||
<delegatePublic publicIdStartString="-//OASIS//DTD DocBook XML 5.1//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/5.1/catalog.xml"/>
|
||||
<delegateSystem systemIdStartString="http://docbook.org/xml/5.1/dtd/" catalog="file:///usr/share/xml/docbook/schema/dtd/5.1/catalog.xml"/>
|
||||
<delegateURI uriStartString="http://docbook.org/xml/5.1/dtd/" catalog="file:///usr/share/xml/docbook/schema/dtd/5.1/catalog.xml"/>
|
||||
<delegateURI uriStartString="http://docbook.org/xml/5.1/rng/" catalog="file:///usr/share/xml/docbook/schema/rng/5.1/catalog.xml"/>
|
||||
<delegateURI uriStartString="http://docbook.org/xml/5.1/sch/" catalog="file:///usr/share/xml/docbook/schema/sch/5.1/catalog.xml"/>
|
||||
<delegateURI uriStartString="http://docbook.org/xml/5.1/xsd/" catalog="file:///usr/share/xml/docbook/schema/xsd/5.1/catalog.xml"/>
|
||||
<delegatePublic publicIdStartString="-//OASIS//ENTITIES DocBook XML" catalog="file:///etc/xml/docbook"/>
|
||||
<delegatePublic publicIdStartString="-//OASIS//DTD DocBook XML" catalog="file:///etc/xml/docbook"/>
|
||||
<delegateSystem systemIdStartString="http://www.oasis-open.org/docbook/" catalog="file:///etc/xml/docbook"/>
|
||||
<delegateURI uriStartString="http://www.oasis-open.org/docbook/" catalog="file:///etc/xml/docbook"/>
|
||||
<delegateSystem systemIdStartString="http://www.oasis-open.org/docbook/xml/4.1.2/" catalog="file:///etc/xml/docbook"/>
|
||||
<delegateURI uriStartString="http://www.oasis-open.org/docbook/xml/4.1.2/" catalog="file:///etc/xml/docbook"/>
|
||||
<delegateSystem systemIdStartString="http://www.oasis-open.org/docbook/xml/4.2/" catalog="file:///etc/xml/docbook"/>
|
||||
<delegateURI uriStartString="http://www.oasis-open.org/docbook/xml/4.2/" catalog="file:///etc/xml/docbook"/>
|
||||
<delegateSystem systemIdStartString="http://www.oasis-open.org/docbook/xml/4.3/" catalog="file:///etc/xml/docbook"/>
|
||||
<delegateURI uriStartString="http://www.oasis-open.org/docbook/xml/4.3/" catalog="file:///etc/xml/docbook"/>
|
||||
<delegateSystem systemIdStartString="http://www.oasis-open.org/docbook/xml/4.4/" catalog="file:///etc/xml/docbook"/>
|
||||
<delegateURI uriStartString="http://www.oasis-open.org/docbook/xml/4.4/" catalog="file:///etc/xml/docbook"/>
|
||||
<delegateSystem systemIdStartString="http://www.oasis-open.org/docbook/xml/4.5/" catalog="file:///etc/xml/docbook"/>
|
||||
<delegateURI uriStartString="http://www.oasis-open.org/docbook/xml/4.5/" catalog="file:///etc/xml/docbook"/>
|
||||
<delegatePublic publicIdStartString="-//OASIS//ENTITIES DocBook XML" catalog="file:///etc/xml/docbook"/>
|
||||
<delegatePublic publicIdStartString="-//OASIS//DTD DocBook XML" catalog="file:///etc/xml/docbook"/>
|
||||
<delegateSystem systemIdStartString="http://www.oasis-open.org/docbook/" catalog="file:///etc/xml/docbook"/>
|
||||
<delegateURI uriStartString="http://www.oasis-open.org/docbook/" catalog="file:///etc/xml/docbook"/>
|
||||
<rewriteSystem systemIdStartString="http://docbook.sourceforge.net/release/xsl/" rewritePrefix="/usr/share/xml/docbook/xsl-stylesheets"/>
|
||||
<rewriteURI uriStartString="http://docbook.sourceforge.net/release/xsl/" rewritePrefix="/usr/share/xml/docbook/xsl-stylesheets"/>
|
||||
<rewriteSystem systemIdStartString="http://docbook.sourceforge.net/release/xsl/current" rewritePrefix="/usr/share/xml/docbook/xsl-stylesheets"/>
|
||||
<rewriteURI uriStartString="http://docbook.sourceforge.net/release/xsl/current" rewritePrefix="/usr/share/xml/docbook/xsl-stylesheets"/>
|
||||
</catalog>
|
||||
@@ -0,0 +1,27 @@
|
||||
<?xml version="1.0"?>
|
||||
<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN" "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
|
||||
<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
|
||||
<public publicId="-//OASIS//DTD DocBook XML V4.5//EN" uri="http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"/>
|
||||
<public publicId="-//OASIS//DTD DocBook XML CALS Table Model V4.5//EN" uri="file:///usr/share/xml/docbook/xml-dtd-4.5/calstblx.dtd"/>
|
||||
<public publicId="-//OASIS//DTD XML Exchange Table Model 19990315//EN" uri="file:///usr/share/xml/docbook/xml-dtd-4.5/soextblx.dtd"/>
|
||||
<public publicId="-//OASIS//ELEMENTS DocBook XML Information Pool V4.5//EN" uri="file:///usr/share/xml/docbook/xml-dtd-4.5/dbpoolx.mod"/>
|
||||
<public publicId="-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.5//EN" uri="file:///usr/share/xml/docbook/xml-dtd-4.5/dbhierx.mod"/>
|
||||
<public publicId="-//OASIS//ELEMENTS DocBook XML HTML Tables V4.5//EN" uri="file:///usr/share/xml/docbook/xml-dtd-4.5/htmltblx.mod"/>
|
||||
<public publicId="-//OASIS//ENTITIES DocBook XML Notations V4.5//EN" uri="file:///usr/share/xml/docbook/xml-dtd-4.5/dbnotnx.mod"/>
|
||||
<public publicId="-//OASIS//ENTITIES DocBook XML Character Entities V4.5//EN" uri="file:///usr/share/xml/docbook/xml-dtd-4.5/dbcentx.mod"/>
|
||||
<public publicId="-//OASIS//ENTITIES DocBook XML Additional General Entities V4.5//EN" uri="file:///usr/share/xml/docbook/xml-dtd-4.5/dbgenent.mod"/>
|
||||
<rewriteSystem systemIdStartString="http://www.oasis-open.org/docbook/xml/4.5" rewritePrefix="file:///usr/share/xml/docbook/xml-dtd-4.5"/>
|
||||
<rewriteURI uriStartString="http://www.oasis-open.org/docbook/xml/4.5" rewritePrefix="file:///usr/share/xml/docbook/xml-dtd-4.5"/>
|
||||
<public publicId="-//OASIS//DTD DocBook XML V4.1.2//EN" uri="http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"/>
|
||||
<rewriteSystem systemIdStartString="http://www.oasis-open.org/docbook/xml/4.1.2" rewritePrefix="file:///usr/share/xml/docbook/xml-dtd-4.5"/>
|
||||
<rewriteURI uriStartString="http://www.oasis-open.org/docbook/xml/4.1.2" rewritePrefix="file:///usr/share/xml/docbook/xml-dtd-4.5"/>
|
||||
<public publicId="-//OASIS//DTD DocBook XML V4.2//EN" uri="http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"/>
|
||||
<rewriteSystem systemIdStartString="http://www.oasis-open.org/docbook/xml/4.2" rewritePrefix="file:///usr/share/xml/docbook/xml-dtd-4.5"/>
|
||||
<rewriteURI uriStartString="http://www.oasis-open.org/docbook/xml/4.2" rewritePrefix="file:///usr/share/xml/docbook/xml-dtd-4.5"/>
|
||||
<public publicId="-//OASIS//DTD DocBook XML V4.3//EN" uri="http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"/>
|
||||
<rewriteSystem systemIdStartString="http://www.oasis-open.org/docbook/xml/4.3" rewritePrefix="file:///usr/share/xml/docbook/xml-dtd-4.5"/>
|
||||
<rewriteURI uriStartString="http://www.oasis-open.org/docbook/xml/4.3" rewritePrefix="file:///usr/share/xml/docbook/xml-dtd-4.5"/>
|
||||
<public publicId="-//OASIS//DTD DocBook XML V4.4//EN" uri="http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd"/>
|
||||
<rewriteSystem systemIdStartString="http://www.oasis-open.org/docbook/xml/4.4" rewritePrefix="file:///usr/share/xml/docbook/xml-dtd-4.5"/>
|
||||
<rewriteURI uriStartString="http://www.oasis-open.org/docbook/xml/4.4" rewritePrefix="file:///usr/share/xml/docbook/xml-dtd-4.5"/>
|
||||
</catalog>
|
||||
@@ -0,0 +1,27 @@
|
||||
<?xml version="1.0"?>
|
||||
<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN" "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
|
||||
<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
|
||||
<public publicId="-//OASIS//DTD DocBook XML 5.0//EN" uri="file:///usr/share/xml/docbook/schema/dtd/5.0/docbook.dtd"/>
|
||||
<system systemId="http://www.oasis-open.org/docbook/xml/5.0/dtd/docbook.dtd" uri="file:///usr/share/xml/docbook/schema/dtd/5.0/docbook.dtd"/>
|
||||
<system systemId="http://docbook.org/xml/5.0/dtd/docbook.dtd" uri="file:///usr/share/xml/docbook/schema/dtd/5.0/docbook.dtd"/>
|
||||
<uri name="http://www.oasis-open.org/docbook/xml/5.0/rng/docbook.rng" uri="file:///usr/share/xml/docbook/schema/rng/5.0/docbook.rng"/>
|
||||
<uri name="http://docbook.org/xml/5.0/rng/docbook.rng" uri="file:///usr/share/xml/docbook/schema/rng/5.0/docbook.rng"/>
|
||||
<uri name="http://www.oasis-open.org/docbook/xml/5.0/rng/docbookxi.rng" uri="file:///usr/share/xml/docbook/schema/rng/5.0/docbookxi.rng"/>
|
||||
<uri name="http://docbook.org/xml/5.0/rng/docbookxi.rng" uri="file:///usr/share/xml/docbook/schema/rng/5.0/docbookxi.rng"/>
|
||||
<uri name="http://www.oasis-open.org/docbook/xml/5.0/rnc/docbook.rnc" uri="file:///usr/share/xml/docbook/schema/rng/5.0/docbook.rnc"/>
|
||||
<uri name="http://docbook.org/xml/5.0/rng/docbook.rnc" uri="file:///usr/share/xml/docbook/schema/rng/5.0/docbook.rnc"/>
|
||||
<uri name="http://www.oasis-open.org/docbook/xml/5.0/rnc/docbookxi.rnc" uri="file:///usr/share/xml/docbook/schema/rng/5.0/docbookxi.rnc"/>
|
||||
<uri name="http://docbook.org/xml/5.0/rng/docbookxi.rnc" uri="file:///usr/share/xml/docbook/schema/rng/5.0/docbookxi.rnc"/>
|
||||
<uri name="http://www.oasis-open.org/docbook/xml/5.0/xsd/docbook.xsd" uri="file:///usr/share/xml/docbook/schema/xsd/5.0/docbook.xsd"/>
|
||||
<uri name="http://docbook.org/xml/5.0/xsd/docbook.xsd" uri="file:///usr/share/xml/docbook/schema/xsd/5.0/docbook.xsd"/>
|
||||
<uri name="http://www.oasis-open.org/docbook/xml/5.0/xsd/docbookxi.xsd" uri="file:///usr/share/xml/docbook/schema/xsd/5.0/docbookxi.xsd"/>
|
||||
<uri name="http://docbook.org/xml/5.0/xsd/docbookxi.xsd" uri="file:///usr/share/xml/docbook/schema/xsd/5.0/docbookxi.xsd"/>
|
||||
<uri name="http://www.oasis-open.org/docbook/xml/5.0/xsd/xi.xsd" uri="file:///usr/share/xml/docbook/schema/xsd/5.0/xi.xsd"/>
|
||||
<uri name="http://docbook.org/xml/5.0/xsd/xi.xsd" uri="file:///usr/share/xml/docbook/schema/xsd/5.0/xi.xsd"/>
|
||||
<uri name="http://www.oasis-open.org/docbook/xml/5.0/xsd/xlink.xsd" uri="file:///usr/share/xml/docbook/schema/xsd/5.0/xlink.xsd"/>
|
||||
<uri name="http://docbook.org/xml/5.0/xsd/xlink.xsd" uri="file:///usr/share/xml/docbook/schema/xsd/5.0/xlink.xsd"/>
|
||||
<uri name="http://www.oasis-open.org/docbook/xml/5.0/xsd/xml.xsd" uri="file:///usr/share/xml/docbook/schema/xsd/5.0/xml.xsd"/>
|
||||
<uri name="http://docbook.org/xml/5.0/xsd/xml.xsd" uri="file:///usr/share/xml/docbook/schema/xsd/5.0/xml.xsd"/>
|
||||
<uri name="http://www.oasis-open.org/docbook/xml/5.0/sch/docbook.sch" uri="file:///usr/share/xml/docbook/schema/sch/5.0/docbook.sch"/>
|
||||
<uri name="http://docbook.org/xml/5.0/sch/docbook.sch" uri="file:///usr/share/xml/docbook/schema/sch/5.0/docbook.sch"/>
|
||||
</catalog>
|
||||
@@ -0,0 +1,14 @@
|
||||
<?xml version="1.0"?>
|
||||
<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN" "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
|
||||
<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
|
||||
<uri name="http://www.oasis-open.org/docbook/xml/5.1/rng/docbook.rng" uri="file:///usr/share/xml/docbook/schema/rng/5.1/docbook.rng"/>
|
||||
<uri name="http://docbook.org/xml/5.1/rng/docbook.rng" uri="file:///usr/share/xml/docbook/schema/rng/5.1/docbook.rng"/>
|
||||
<uri name="http://www.oasis-open.org/docbook/xml/5.1/rng/docbookxi.rng" uri="file:///usr/share/xml/docbook/schema/rng/5.1/docbookxi.rng"/>
|
||||
<uri name="http://docbook.org/xml/5.1/rng/docbookxi.rng" uri="file:///usr/share/xml/docbook/schema/rng/5.1/docbookxi.rng"/>
|
||||
<uri name="http://www.oasis-open.org/docbook/xml/5.1/rnc/docbook.rnc" uri="file:///usr/share/xml/docbook/schema/rng/5.1/docbook.rnc"/>
|
||||
<uri name="http://docbook.org/xml/5.1/rng/docbook.rnc" uri="file:///usr/share/xml/docbook/schema/rng/5.1/docbook.rnc"/>
|
||||
<uri name="http://www.oasis-open.org/docbook/xml/5.1/rnc/docbookxi.rnc" uri="file:///usr/share/xml/docbook/schema/rng/5.1/docbookxi.rnc"/>
|
||||
<uri name="http://docbook.org/xml/5.1/rng/docbookxi.rnc" uri="file:///usr/share/xml/docbook/schema/rng/5.1/docbookxi.rnc"/>
|
||||
<uri name="http://www.oasis-open.org/docbook/xml/5.1/sch/docbook.sch" uri="file:///usr/share/xml/docbook/schema/sch/5.1/docbook.sch"/>
|
||||
<uri name="http://docbook.org/xml/5.1/sch/docbook.sch" uri="file:///usr/share/xml/docbook/schema/sch/5.1/docbook.sch"/>
|
||||
</catalog>
|
||||
@@ -17,8 +17,9 @@
|
||||
<Archive sha1sum="5e3a35663cd028c5c5fbb959c3858fec2d7f8b9e" type="zip" target="4.2">https://www.oasis-open.org/docbook/xml/4.2/docbook-xml-4.2.zip</Archive>
|
||||
<Archive sha1sum="e79a59e9164c1013b8cc9f64f96f909a184ca016" type="zip" target="4.3">https://www.oasis-open.org/docbook/xml/4.3/docbook-xml-4.3.zip</Archive>
|
||||
<Archive sha1sum="7c4d91c82ad3747e1b5600c91782758e5d91c22b" type="zip" target="4.4">https://www.oasis-open.org/docbook/xml/4.4/docbook-xml-4.4.zip</Archive>
|
||||
<Archive sha1sum="b9124233b50668fb508773aa2b3ebc631d7c1620" type="zip">https://www.oasis-open.org/docbook/xml/4.5/docbook-xml-4.5.zip</Archive>
|
||||
<Archive sha1sum="b9124233b50668fb508773aa2b3ebc631d7c1620" type="zip" target="4.5">https://www.oasis-open.org/docbook/xml/4.5/docbook-xml-4.5.zip</Archive>
|
||||
<Archive sha1sum="49f274e67efdee771300cba4da1f3e4bc00be1ec" type="zip">http://www.docbook.org/xml/5.0/docbook-5.0.zip</Archive>
|
||||
<Archive sha1sum="31ee986a9f173b782f9d45b93165de46288c63f5" type="zip" target="5.1">https://docbook.org/xml/5.1/docbook-v5.1-os.zip</Archive>
|
||||
</Source>
|
||||
|
||||
<Package>
|
||||
@@ -28,19 +29,35 @@
|
||||
<Dependency>libxml2</Dependency>
|
||||
</RuntimeDependencies>
|
||||
<Files>
|
||||
<Path fileType="executable">/usr/bin</Path>
|
||||
<Path fileType="doc">/usr/share/doc/</Path>
|
||||
<Path fileType="data">/usr/share/xml</Path>
|
||||
<Path fileType="data">/etc/xml/docbook</Path>
|
||||
<Path fileType="data">/etc/xml/catalog</Path>
|
||||
<Path fileType="data">/etc/xml/docbook-5.0</Path>
|
||||
<Path fileType="data">/etc/xml/docbook-5.1</Path>
|
||||
</Files>
|
||||
<AdditionalFiles>
|
||||
<AdditionalFile owner="root" permission="0644" target="/etc/xml/docbook">docbook</AdditionalFile>
|
||||
<AdditionalFile owner="root" permission="0644" target="/etc/xml/catalog">catalog</AdditionalFile>
|
||||
<AdditionalFile owner="root" permission="0644" target="/usr/share/xml/docbook/xml-dtd-5.0/catalog.xml">5.0-catalog.xml</AdditionalFile>
|
||||
<AdditionalFile owner="root" permission="0644" target="/etc/xml/docbook">xml/docbook</AdditionalFile>
|
||||
<AdditionalFile owner="root" permission="0644" target="/etc/xml/docbook-5.0">xml/docbook-5.0</AdditionalFile>
|
||||
<AdditionalFile owner="root" permission="0644" target="/etc/xml/docbook-5.1">xml/docbook-5.1</AdditionalFile>
|
||||
<AdditionalFile owner="root" permission="0644" target="/etc/xml/catalog">xml/catalog</AdditionalFile>
|
||||
<AdditionalFile owner="root" permission="0644" target="/usr/share/xml/docbook/schema/dtd/5.0/catalog.xml">5.0/dtd/catalog.xml</AdditionalFile>
|
||||
<AdditionalFile owner="root" permission="0644" target="/usr/share/xml/docbook/schema/rng/5.0/catalog.xml">5.0/rng/catalog.xml</AdditionalFile>
|
||||
<AdditionalFile owner="root" permission="0644" target="/usr/share/xml/docbook/schema/sch/5.0/catalog.xml">5.0/sch/catalog.xml</AdditionalFile>
|
||||
<AdditionalFile owner="root" permission="0644" target="/usr/share/xml/docbook/schema/xsd/5.0/catalog.xml">5.0/xsd/catalog.xml</AdditionalFile>
|
||||
<AdditionalFile owner="root" permission="0644" target="/usr/share/xml/docbook/schema/rng/5.1/catalog.xml">5.1/rng/catalog.xml</AdditionalFile>
|
||||
</AdditionalFiles>
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="8">
|
||||
<Date>2022-11-24</Date>
|
||||
<Version>5.1</Version>
|
||||
<Comment>Rebuild</Comment>
|
||||
<Name>PisiLinux Community</Name>
|
||||
<Email>admin@pisilinux.org</Email>
|
||||
</Update>
|
||||
<Update release="7">
|
||||
<Date>2020-12-09</Date>
|
||||
<Version>5.0</Version>
|
||||
|
||||
+568
-84
File diff suppressed because it is too large
Load Diff
@@ -1 +1 @@
|
||||
c8abc1ca50989cad6ed66122e753c1654b94ef9c
|
||||
b92442ad2d993683e857f2f25877d0f45f47b0e8
|
||||
Binary file not shown.
@@ -1 +1 @@
|
||||
25ccac97c2c1ea82aa61aa10693a22f150e1b925
|
||||
8690abed8f13ba5f32279dd62946e072ff3af188
|
||||
@@ -14,7 +14,7 @@
|
||||
<IsA>app:console</IsA>
|
||||
<Summary>Python setuptools</Summary>
|
||||
<Description>python3-setuptools is a collection of enhancements to the Python distutils that allow you to more easily build and distribute Python packages, especially ones that have dependencies on other packages.</Description>
|
||||
<Archive sha1sum="b32f21cf81f476ed85238e1beaf136a41e358b1b" type="targz">https://github.com/pypa/setuptools/archive/refs/tags/v65.5.0.tar.gz</Archive>
|
||||
<Archive sha1sum="ea1b5328b511c7d88fb489ce397d1b69574fb9c2" type="targz">https://github.com/pypa/setuptools/archive/refs/tags/v65.6.3.tar.gz</Archive>
|
||||
<BuildDependencies>
|
||||
<Dependency>python3-devel</Dependency>
|
||||
<Dependency>python3-setuptools</Dependency>
|
||||
@@ -36,6 +36,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="31">
|
||||
<Date>2022-12-08</Date>
|
||||
<Version>65.6.3</Version>
|
||||
<Comment>Version bump.</Comment>
|
||||
<Name>Mustafa Cinasal</Name>
|
||||
<Email>muscnsl@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="30">
|
||||
<Date>2022-10-22</Date>
|
||||
<Version>65.5.0</Version>
|
||||
|
||||
@@ -28,9 +28,9 @@ def install():
|
||||
|
||||
# Dirty fix for now... (especially for flatpak)
|
||||
shelltools.system("mv %s/run/* %s/dev" % (get.installDIR(), get.installDIR()))
|
||||
pisitools.remove("/var/lock")
|
||||
# pisitools.remove("/var/lock")
|
||||
# shelltools.cd("%s/var" % get.installDIR())
|
||||
shelltools.system("ln -rs %s/dev/lock %s/var/lock" % (get.installDIR(), get.installDIR()))
|
||||
# shelltools.system("ln -rs %s/dev/lock %s/var/lock" % (get.installDIR(), get.installDIR()))
|
||||
# shelltools.cd("%s/baselayout/src" % get.workDIR())
|
||||
|
||||
# Adjust permissions
|
||||
|
||||
@@ -72,6 +72,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="20">
|
||||
<Date>2022-11-20</Date>
|
||||
<Version>3.10.1</Version>
|
||||
<Comment>Rebuild.</Comment>
|
||||
<Name>Mustafa Cinasal</Name>
|
||||
<Email>muscnsl@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="19">
|
||||
<Date>2022-10-01</Date>
|
||||
<Version>3.10.1</Version>
|
||||
|
||||
@@ -1,11 +1,12 @@
|
||||
--- bash-2.05b/aclocal.m4.pgrp_sync 2002-06-25 14:45:43.000000000 +0100
|
||||
+++ bash-2.05b/aclocal.m4 2003-01-15 18:17:35.000000000 +0000
|
||||
@@ -1255,7 +1255,7 @@
|
||||
diff --git a/aclocal.m4 b/aclocal.m4
|
||||
--- a/aclocal.m4
|
||||
+++ b/aclocal.m4
|
||||
@@ -1324,7 +1324,7 @@ main()
|
||||
wait(&status);
|
||||
exit(ok ? 0 : 5);
|
||||
}
|
||||
-], bash_cv_pgrp_pipe=no,bash_cv_pgrp_pipe=yes,
|
||||
+], bash_cv_pgrp_pipe=yes,bash_cv_pgrp_pipe=yes,
|
||||
-]])], [bash_cv_pgrp_pipe=no], [bash_cv_pgrp_pipe=yes],
|
||||
+]])], [bash_cv_pgrp_pipe=yes], [bash_cv_pgrp_pipe=yes],
|
||||
[AC_MSG_WARN(cannot check pgrp synchronization if cross compiling -- defaulting to no)
|
||||
bash_cv_pgrp_pipe=no])
|
||||
])
|
||||
bash_cv_pgrp_pipe=no]
|
||||
)])
|
||||
|
||||
@@ -1,18 +1,18 @@
|
||||
diff -up bash-4.1/examples/loadables/Makefile.in.examples bash-4.1/examples/loadables/Makefile.in
|
||||
--- bash-4.1/examples/loadables/Makefile.in.examples 2010-06-22 16:20:02.000000000 +0200
|
||||
+++ bash-4.1/examples/loadables/Makefile.in 2010-06-22 16:20:41.000000000 +0200
|
||||
@@ -43,7 +43,7 @@ host_os = @host_os@
|
||||
host_cpu = @host_cpu@
|
||||
diff --git a/examples/loadables/Makefile.in b/examples/loadables/Makefile.in
|
||||
--- a/examples/loadables/Makefile.in
|
||||
+++ b/examples/loadables/Makefile.in
|
||||
@@ -59,7 +59,7 @@ host_cpu = @host_cpu@
|
||||
host_vendor = @host_vendor@
|
||||
|
||||
STYLE_CFLAGS = @STYLE_CFLAGS@
|
||||
-CFLAGS = @CFLAGS@
|
||||
+CFLAGS = -O2 -g
|
||||
++CFLAGS = -O2 -g
|
||||
LOCAL_CFLAGS = @LOCAL_CFLAGS@
|
||||
DEFS = @DEFS@
|
||||
LOCAL_DEFS = @LOCAL_DEFS@
|
||||
diff -up bash-4.1/examples/loadables/perl/Makefile.in.examples bash-4.1/examples/loadables/perl/Makefile.in
|
||||
--- bash-4.1/examples/loadables/perl/Makefile.in.examples 2010-06-22 16:20:46.000000000 +0200
|
||||
+++ bash-4.1/examples/loadables/perl/Makefile.in 2010-06-22 16:21:04.000000000 +0200
|
||||
diff --git a/examples/loadables/perl/Makefile.in b/examples/loadables/perl/Makefile.in
|
||||
--- a/examples/loadables/perl/Makefile.in
|
||||
+++ b/examples/loadables/perl/Makefile.in
|
||||
@@ -42,7 +42,7 @@ SHELL = @MAKE_SHELL@
|
||||
|
||||
PERL5 = perl5
|
||||
|
||||
@@ -1,21 +1,20 @@
|
||||
diff --git a/parse.y b/parse.y
|
||||
index df1231d..2449fa8 100644
|
||||
--- a/parse.y
|
||||
+++ b/parse.y
|
||||
@@ -4482,6 +4482,8 @@ xparse_dolparen (base, string, indp, flags)
|
||||
@@ -4255,7 +4255,8 @@ xparse_dolparen (base, string, indp, flags)
|
||||
|
||||
save_parser_state (&ps);
|
||||
save_input_line_state (&ls);
|
||||
orig_eof_token = shell_eof_token;
|
||||
-
|
||||
+ /* avoid echoing every substitution again */
|
||||
+ echo_input_at_read = 0;
|
||||
#if defined (ALIAS) || defined (DPAREN_ARITHMETIC)
|
||||
saved_pushed_strings = pushed_string_list; /* separate parsing context */
|
||||
pushed_string_list = (STRING_SAVER *)NULL;
|
||||
#endif
|
||||
diff --git a/subst.c b/subst.c
|
||||
index 9ccbf33..8a9ee5c 100644
|
||||
--- a/subst.c
|
||||
+++ b/subst.c
|
||||
@@ -9453,6 +9453,7 @@ param_expand (string, sindex, quoted, expanded_something,
|
||||
@@ -10222,6 +10222,7 @@ param_expand (string, sindex, quoted, expanded_something,
|
||||
WORD_LIST *list, *l;
|
||||
WORD_DESC *tdesc, *ret;
|
||||
int tflag, nullarg;
|
||||
@@ -23,7 +22,7 @@ index 9ccbf33..8a9ee5c 100644
|
||||
|
||||
/*itrace("param_expand: `%s' pflags = %d", string+*sindex, pflags);*/
|
||||
zindex = *sindex;
|
||||
@@ -9843,6 +9844,9 @@ arithsub:
|
||||
@@ -10614,6 +10615,9 @@ arithsub:
|
||||
}
|
||||
|
||||
comsub:
|
||||
@@ -33,7 +32,7 @@ index 9ccbf33..8a9ee5c 100644
|
||||
if (pflags & PF_NOCOMSUB)
|
||||
/* we need zindex+1 because string[zindex] == RPAREN */
|
||||
temp1 = substring (string, *sindex, zindex+1);
|
||||
@@ -9855,6 +9859,7 @@ comsub:
|
||||
@@ -10626,6 +10630,7 @@ comsub:
|
||||
}
|
||||
FREE (temp);
|
||||
temp = temp1;
|
||||
|
||||
@@ -0,0 +1,13 @@
|
||||
diff --git a/doc/bash.1 b/doc/bash.1
|
||||
--- a/doc/bash.1
|
||||
+++ b/doc/bash.1
|
||||
@@ -10726,6 +10726,9 @@ If set, the shell automatically closes file descriptors assigned using the
|
||||
.el above)
|
||||
instead of leaving them open when the command completes.
|
||||
.TP 8
|
||||
+.B syslog_history
|
||||
+If set, command history is logged to syslog.
|
||||
+.TP 8
|
||||
.B xpg_echo
|
||||
If set, the \fBecho\fP builtin expands backslash-escape sequences
|
||||
by default.
|
||||
@@ -1,20 +1,18 @@
|
||||
diff --git a/builtins.h b/builtins.h
|
||||
index dac95fd..5b7e811 100644
|
||||
--- a/builtins.h
|
||||
+++ b/builtins.h
|
||||
@@ -45,6 +45,7 @@
|
||||
#define ASSIGNMENT_BUILTIN 0x10 /* This builtin takes assignment statements. */
|
||||
@@ -46,6 +46,7 @@
|
||||
#define POSIX_BUILTIN 0x20 /* This builtins is special in the Posix command search order. */
|
||||
#define LOCALVAR_BUILTIN 0x40 /* This builtin creates local variables */
|
||||
+#define REQUIRES_BUILTIN 0x80 /* This builtin requires other files. */
|
||||
#define ARRAYREF_BUILTIN 0x80 /* This builtin takes array references as arguments */
|
||||
+#define REQUIRES_BUILTIN 0x100 /* This builtin requires other files. */
|
||||
|
||||
#define BASE_INDENT 4
|
||||
|
||||
diff --git a/builtins/mkbuiltins.c b/builtins/mkbuiltins.c
|
||||
index e243021..0a7a0e5 100644
|
||||
--- a/builtins/mkbuiltins.c
|
||||
+++ b/builtins/mkbuiltins.c
|
||||
@@ -69,10 +69,15 @@ extern char *strcpy ();
|
||||
@@ -69,11 +69,16 @@ extern char *strcpy ();
|
||||
#define whitespace(c) (((c) == ' ') || ((c) == '\t'))
|
||||
|
||||
/* Flag values that builtins can have. */
|
||||
@@ -25,15 +23,18 @@ index e243021..0a7a0e5 100644
|
||||
#define BUILTIN_FLAG_SPECIAL 0x01
|
||||
#define BUILTIN_FLAG_ASSIGNMENT 0x02
|
||||
#define BUILTIN_FLAG_LOCALVAR 0x04
|
||||
#define BUILTIN_FLAG_POSIX_BUILTIN 0x08
|
||||
+#define BUILTIN_FLAG_REQUIRES 0x10
|
||||
#define BUILTIN_FLAG_POSIX_BUILTIN 0x08
|
||||
#define BUILTIN_FLAG_ARRAYREF_ARG 0x10
|
||||
+#define BUILTIN_FLAG_REQUIRES 0x20
|
||||
|
||||
#define BASE_INDENT 4
|
||||
|
||||
@@ -173,11 +178,19 @@ char *posix_builtins[] =
|
||||
@@ -189,13 +194,21 @@ char *arrayvar_builtins[] =
|
||||
"typeset", "unset", "wait", /*]*/
|
||||
(char *)NULL
|
||||
};
|
||||
|
||||
-
|
||||
+
|
||||
+/* The builtin commands that cause requirements on other files. */
|
||||
+static char *requires_builtins[] =
|
||||
+{
|
||||
@@ -46,36 +47,38 @@ index e243021..0a7a0e5 100644
|
||||
static int is_assignment_builtin ();
|
||||
static int is_localvar_builtin ();
|
||||
static int is_posix_builtin ();
|
||||
static int is_arrayvar_builtin ();
|
||||
+static int is_requires_builtin ();
|
||||
|
||||
#if !defined (HAVE_RENAME)
|
||||
static int rename ();
|
||||
@@ -831,6 +844,8 @@ builtin_handler (self, defs, arg)
|
||||
new->flags |= BUILTIN_FLAG_LOCALVAR;
|
||||
if (is_posix_builtin (name))
|
||||
@@ -856,6 +869,8 @@ builtin_handler (self, defs, arg)
|
||||
new->flags |= BUILTIN_FLAG_POSIX_BUILTIN;
|
||||
if (is_arrayvar_builtin (name))
|
||||
new->flags |= BUILTIN_FLAG_ARRAYREF_ARG;
|
||||
+ if (is_requires_builtin (name))
|
||||
+ new->flags |= BUILTIN_FLAG_REQUIRES;
|
||||
|
||||
array_add ((char *)new, defs->builtins);
|
||||
building_builtin = 1;
|
||||
@@ -1250,12 +1265,13 @@ write_builtins (defs, structfile, externfile)
|
||||
@@ -1275,13 +1290,14 @@ write_builtins (defs, structfile, externfile)
|
||||
else
|
||||
fprintf (structfile, "(sh_builtin_func_t *)0x0, ");
|
||||
|
||||
- fprintf (structfile, "%s%s%s%s%s, %s_doc,\n",
|
||||
+ fprintf (structfile, "%s%s%s%s%s%s, %s_doc,\n",
|
||||
- fprintf (structfile, "%s%s%s%s%s%s, %s_doc,\n",
|
||||
+ fprintf (structfile, "%s%s%s%s%s%s%s, %s_doc,\n",
|
||||
"BUILTIN_ENABLED | STATIC_BUILTIN",
|
||||
(builtin->flags & BUILTIN_FLAG_SPECIAL) ? " | SPECIAL_BUILTIN" : "",
|
||||
(builtin->flags & BUILTIN_FLAG_ASSIGNMENT) ? " | ASSIGNMENT_BUILTIN" : "",
|
||||
(builtin->flags & BUILTIN_FLAG_LOCALVAR) ? " | LOCALVAR_BUILTIN" : "",
|
||||
(builtin->flags & BUILTIN_FLAG_POSIX_BUILTIN) ? " | POSIX_BUILTIN" : "",
|
||||
(builtin->flags & BUILTIN_FLAG_ARRAYREF_ARG) ? " | ARRAYREF_BUILTIN" : "",
|
||||
+ (builtin->flags & BUILTIN_FLAG_REQUIRES) ? " | REQUIRES_BUILTIN" : "",
|
||||
document_name (builtin));
|
||||
|
||||
/* Don't translate short document summaries that are identical
|
||||
@@ -1645,6 +1661,13 @@ is_posix_builtin (name)
|
||||
return (_find_in_table (name, posix_builtins));
|
||||
@@ -1678,6 +1694,13 @@ is_arrayvar_builtin (name)
|
||||
return (_find_in_table (name, arrayvar_builtins));
|
||||
}
|
||||
|
||||
+static int
|
||||
@@ -89,7 +92,6 @@ index e243021..0a7a0e5 100644
|
||||
static int
|
||||
rename (from, to)
|
||||
diff --git a/doc/bash.1 b/doc/bash.1
|
||||
index 5af7d42..7539368 100644
|
||||
--- a/doc/bash.1
|
||||
+++ b/doc/bash.1
|
||||
@@ -239,6 +239,14 @@ The shell becomes restricted (see
|
||||
@@ -108,10 +110,9 @@ index 5af7d42..7539368 100644
|
||||
Equivalent to \fB\-v\fP.
|
||||
.TP
|
||||
diff --git a/doc/bashref.texi b/doc/bashref.texi
|
||||
index 9e23f58..d02151e 100644
|
||||
--- a/doc/bashref.texi
|
||||
+++ b/doc/bashref.texi
|
||||
@@ -6554,6 +6554,13 @@ standard. @xref{Bash POSIX Mode}, for a description of the Bash
|
||||
@@ -6927,6 +6927,13 @@ standard. @xref{Bash POSIX Mode}, for a description of the Bash
|
||||
@item --restricted
|
||||
Make the shell a restricted shell (@pxref{The Restricted Shell}).
|
||||
|
||||
@@ -126,10 +127,9 @@ index 9e23f58..d02151e 100644
|
||||
Equivalent to @option{-v}. Print shell input lines as they're read.
|
||||
|
||||
diff --git a/eval.c b/eval.c
|
||||
index 1d967da..f197033 100644
|
||||
--- a/eval.c
|
||||
+++ b/eval.c
|
||||
@@ -137,7 +137,8 @@ reader_loop ()
|
||||
@@ -138,7 +138,8 @@ reader_loop ()
|
||||
|
||||
if (read_command () == 0)
|
||||
{
|
||||
@@ -137,13 +137,12 @@ index 1d967da..f197033 100644
|
||||
+
|
||||
+ if (interactive_shell == 0 && (read_but_dont_execute && !rpm_requires))
|
||||
{
|
||||
set_exit_status (EXECUTION_SUCCESS);
|
||||
set_exit_status (last_command_exit_value);
|
||||
dispose_command (global_command);
|
||||
diff --git a/execute_cmd.c b/execute_cmd.c
|
||||
index d2555ad..397e283 100644
|
||||
--- a/execute_cmd.c
|
||||
+++ b/execute_cmd.c
|
||||
@@ -543,6 +543,8 @@ async_redirect_stdin ()
|
||||
@@ -561,6 +561,8 @@ async_redirect_stdin ()
|
||||
|
||||
#define DESCRIBE_PID(pid) do { if (interactive) describe_pid (pid); } while (0)
|
||||
|
||||
@@ -152,22 +151,22 @@ index d2555ad..397e283 100644
|
||||
/* Execute the command passed in COMMAND, perhaps doing it asynchronously.
|
||||
COMMAND is exactly what read_command () places into GLOBAL_COMMAND.
|
||||
ASYNCHRONOUS, if non-zero, says to do this command in the background.
|
||||
@@ -574,7 +576,13 @@ execute_command_internal (command, asynchronous, pipe_in, pipe_out,
|
||||
@@ -592,7 +594,13 @@ execute_command_internal (command, asynchronous, pipe_in, pipe_out,
|
||||
|
||||
if (breaking || continuing)
|
||||
return (last_command_exit_value);
|
||||
- if (command == 0 || read_but_dont_execute)
|
||||
- if (read_but_dont_execute)
|
||||
+ if (command == 0 || (read_but_dont_execute && !rpm_requires))
|
||||
+ return (EXECUTION_SUCCESS);
|
||||
+ if (rpm_requires && command->type == cm_function_def)
|
||||
+ return last_command_exit_value =
|
||||
+ execute_intern_function (command->value.Function_def->name,
|
||||
+ command->value.Function_def);
|
||||
+ if (read_but_dont_execute)
|
||||
+ if (read_but_dont_execute)
|
||||
return (last_command_exit_value);
|
||||
if (command == 0)
|
||||
return (EXECUTION_SUCCESS);
|
||||
|
||||
QUIT;
|
||||
@@ -2836,7 +2844,7 @@ execute_for_command (for_command)
|
||||
@@ -2883,7 +2891,7 @@ execute_for_command (for_command)
|
||||
save_line_number = line_number;
|
||||
if (check_identifier (for_command->name, 1) == 0)
|
||||
{
|
||||
@@ -177,7 +176,6 @@ index d2555ad..397e283 100644
|
||||
last_command_exit_value = EX_BADUSAGE;
|
||||
jump_to_top_level (ERREXIT);
|
||||
diff --git a/execute_cmd.h b/execute_cmd.h
|
||||
index 465030a..9c7fd1c 100644
|
||||
--- a/execute_cmd.h
|
||||
+++ b/execute_cmd.h
|
||||
@@ -22,6 +22,9 @@
|
||||
@@ -191,7 +189,6 @@ index 465030a..9c7fd1c 100644
|
||||
#if defined (ARRAY_VARS)
|
||||
struct func_array_state
|
||||
diff --git a/make_cmd.c b/make_cmd.c
|
||||
index 2d7ac96..ac53526 100644
|
||||
--- a/make_cmd.c
|
||||
+++ b/make_cmd.c
|
||||
@@ -35,6 +35,8 @@
|
||||
@@ -203,7 +200,7 @@ index 2d7ac96..ac53526 100644
|
||||
#include "execute_cmd.h"
|
||||
#include "parser.h"
|
||||
#include "flags.h"
|
||||
@@ -828,6 +830,30 @@ make_coproc_command (name, command)
|
||||
@@ -839,6 +841,30 @@ make_coproc_command (name, command)
|
||||
return (make_command (cm_coproc, (SIMPLE_COM *)temp));
|
||||
}
|
||||
|
||||
@@ -234,7 +231,7 @@ index 2d7ac96..ac53526 100644
|
||||
/* Reverse the word list and redirection list in the simple command
|
||||
has just been parsed. It seems simpler to do this here the one
|
||||
time then by any other method that I can think of. */
|
||||
@@ -845,6 +871,28 @@ clean_simple_command (command)
|
||||
@@ -856,6 +882,28 @@ clean_simple_command (command)
|
||||
REVERSE_LIST (command->value.Simple->redirects, REDIRECT *);
|
||||
}
|
||||
|
||||
@@ -264,10 +261,9 @@ index 2d7ac96..ac53526 100644
|
||||
return (command);
|
||||
}
|
||||
diff --git a/shell.c b/shell.c
|
||||
index ce8087f..7dcd000 100644
|
||||
--- a/shell.c
|
||||
+++ b/shell.c
|
||||
@@ -194,6 +194,9 @@ int have_devfd = 0;
|
||||
@@ -196,6 +196,9 @@ int have_devfd = 0;
|
||||
/* The name of the .(shell)rc file. */
|
||||
static char *bashrc_file = DEFAULT_BASHRC;
|
||||
|
||||
@@ -277,7 +273,7 @@ index ce8087f..7dcd000 100644
|
||||
/* Non-zero means to act more like the Bourne shell on startup. */
|
||||
static int act_like_sh;
|
||||
|
||||
@@ -260,6 +263,7 @@ static const struct {
|
||||
@@ -266,6 +269,7 @@ static const struct {
|
||||
{ "protected", Int, &protected_mode, (char **)0x0 },
|
||||
#endif
|
||||
{ "rcfile", Charp, (int *)0x0, &bashrc_file },
|
||||
@@ -285,9 +281,9 @@ index ce8087f..7dcd000 100644
|
||||
#if defined (RESTRICTED_SHELL)
|
||||
{ "restricted", Int, &restricted, (char **)0x0 },
|
||||
#endif
|
||||
@@ -502,6 +506,12 @@ main (argc, argv, env)
|
||||
if (dump_translatable_strings)
|
||||
@@ -510,6 +514,12 @@ main (argc, argv, env)
|
||||
read_but_dont_execute = 1;
|
||||
#endif
|
||||
|
||||
+ if (rpm_requires)
|
||||
+ {
|
||||
@@ -299,10 +295,9 @@ index ce8087f..7dcd000 100644
|
||||
disable_priv_mode ();
|
||||
|
||||
diff --git a/shell.h b/shell.h
|
||||
index 8b41792..29b0efb 100644
|
||||
--- a/shell.h
|
||||
+++ b/shell.h
|
||||
@@ -99,6 +99,7 @@ extern int interactive, interactive_shell;
|
||||
@@ -100,6 +100,7 @@ extern int interactive, interactive_shell;
|
||||
extern int startup_state;
|
||||
extern int reading_shell_script;
|
||||
extern int shell_initialized;
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
diff --git a/tests/exec.right b/tests/exec.right
|
||||
index 0a249dd..fe8a127 100644
|
||||
--- a/tests/exec.right
|
||||
+++ b/tests/exec.right
|
||||
@@ -51,7 +51,6 @@ this is ohio-state
|
||||
@@ -60,7 +60,6 @@ this is ohio-state
|
||||
0
|
||||
1
|
||||
testb
|
||||
@@ -11,7 +10,6 @@ index 0a249dd..fe8a127 100644
|
||||
1
|
||||
1
|
||||
diff --git a/tests/execscript b/tests/execscript
|
||||
index 2809676..1216828 100644
|
||||
--- a/tests/execscript
|
||||
+++ b/tests/execscript
|
||||
@@ -108,8 +108,6 @@ ${THIS_SH} ./exec6.sub
|
||||
@@ -24,26 +22,27 @@ index 2809676..1216828 100644
|
||||
|
||||
${THIS_SH} ./exec10.sub
|
||||
diff --git a/tests/read.right b/tests/read.right
|
||||
index 1144083..09cd422 100644
|
||||
--- a/tests/read.right
|
||||
+++ b/tests/read.right
|
||||
@@ -33,14 +33,6 @@ a = abcdefg
|
||||
@@ -34,17 +34,6 @@ xyz
|
||||
a = xyz
|
||||
a = -xyz 123-
|
||||
a = abc
|
||||
-timeout 1: ok
|
||||
-
|
||||
-unset or null 1
|
||||
-timeout 2: ok
|
||||
-
|
||||
-./read2.sub: line 36: read: -3: invalid timeout specification
|
||||
-unset or null 2
|
||||
-timeout 3: ok
|
||||
-unset or null 3
|
||||
-./read2.sub: line 45: read: -3: invalid timeout specification
|
||||
-1
|
||||
-
|
||||
-abcde
|
||||
-abcde
|
||||
./read3.sub: line 17: read: -1: invalid number
|
||||
abc
|
||||
ab
|
||||
defg
|
||||
diff --git a/tests/read.tests b/tests/read.tests
|
||||
index 7384f05..43fcf8d 100644
|
||||
--- a/tests/read.tests
|
||||
+++ b/tests/read.tests
|
||||
@@ -95,9 +95,6 @@ echo " foo" | { IFS=$':' ; read line; recho "$line"; }
|
||||
|
||||
@@ -0,0 +1,46 @@
|
||||
BASH PATCH REPORT
|
||||
=================
|
||||
|
||||
Bash-Release: 5.2
|
||||
Patch-ID: bash52-001
|
||||
|
||||
Bug-Reported-by: Emanuele Torre <torreemanuele6@gmail.com>
|
||||
Bug-Reference-ID: <CAA7hNqeR1eSdiGK8mjQSqJPo815JYoG-Ekz-5PrAJTEYy2e6hg@mail.gmail.com>
|
||||
Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2022-09/msg00060.html
|
||||
|
||||
Bug-Description:
|
||||
|
||||
Expanding unset arrays in an arithmetic context can cause a segmentation fault.
|
||||
|
||||
Patch (apply with `patch -p0'):
|
||||
|
||||
*** ../bash-5.2/subst.c 2022-08-31 17:36:46.000000000 -0400
|
||||
--- subst.c 2022-09-30 09:12:05.000000000 -0400
|
||||
***************
|
||||
*** 10858,10862 ****
|
||||
t = expand_subscript_string (exp, quoted & ~(Q_ARITH|Q_DOUBLE_QUOTES));
|
||||
free (exp);
|
||||
! exp = sh_backslash_quote (t, abstab, 0);
|
||||
free (t);
|
||||
|
||||
--- 10858,10862 ----
|
||||
t = expand_subscript_string (exp, quoted & ~(Q_ARITH|Q_DOUBLE_QUOTES));
|
||||
free (exp);
|
||||
! exp = t ? sh_backslash_quote (t, abstab, 0) : savestring ("");
|
||||
free (t);
|
||||
|
||||
*** ../bash-5.2/patchlevel.h 2020-06-22 14:51:03.000000000 -0400
|
||||
--- patchlevel.h 2020-10-01 11:01:28.000000000 -0400
|
||||
***************
|
||||
*** 26,30 ****
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 0
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
--- 26,30 ----
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 1
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
@@ -0,0 +1,46 @@
|
||||
BASH PATCH REPORT
|
||||
=================
|
||||
|
||||
Bash-Release: 5.2
|
||||
Patch-ID: bash52-002
|
||||
|
||||
Bug-Reported-by: Kan-Ru Chen <koster@debian.org>
|
||||
Bug-Reference-ID:
|
||||
Bug-Reference-URL: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1021109
|
||||
|
||||
Bug-Description:
|
||||
|
||||
Starting bash with an invalid locale specification for LC_ALL/LANG/LC_CTYPE
|
||||
can cause the shell to crash.
|
||||
|
||||
Patch (apply with `patch -p0'):
|
||||
|
||||
*** ../bash-5.2-patched/lib/readline/nls.c 2022-08-15 09:38:51.000000000 -0400
|
||||
--- lib/readline/nls.c 2022-10-05 09:23:22.000000000 -0400
|
||||
***************
|
||||
*** 142,145 ****
|
||||
--- 142,149 ----
|
||||
lspec = "";
|
||||
ret = setlocale (LC_CTYPE, lspec); /* ok, since it does not change locale */
|
||||
+ if (ret == 0 || *ret == 0)
|
||||
+ ret = setlocale (LC_CTYPE, (char *)NULL);
|
||||
+ if (ret == 0 || *ret == 0)
|
||||
+ ret = RL_DEFAULT_LOCALE;
|
||||
#else
|
||||
ret = (lspec == 0 || *lspec == 0) ? RL_DEFAULT_LOCALE : lspec;
|
||||
|
||||
*** ../bash-5.2/patchlevel.h 2020-06-22 14:51:03.000000000 -0400
|
||||
--- patchlevel.h 2020-10-01 11:01:28.000000000 -0400
|
||||
***************
|
||||
*** 26,30 ****
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 1
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
--- 26,30 ----
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 2
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
@@ -0,0 +1,89 @@
|
||||
BASH PATCH REPORT
|
||||
=================
|
||||
|
||||
Bash-Release: 5.2
|
||||
Patch-ID: bash52-003
|
||||
|
||||
Bug-Reported-by: D630 <d630@posteo.net>
|
||||
Bug-Reference-ID: <cf8523d58ac75b9ffba9519faa175618@posteo.de>
|
||||
Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2022-10/msg00092.html
|
||||
|
||||
Bug-Description:
|
||||
|
||||
Command substitutions need to preserve newlines instead of replacing them
|
||||
with semicolons, especially in the presence of multiple here-documents.
|
||||
|
||||
Patch (apply with `patch -p0'):
|
||||
|
||||
*** ../bash-5.2-patched/print_cmd.c 2022-07-26 09:16:39.000000000 -0400
|
||||
--- print_cmd.c 2022-10-17 10:41:06.000000000 -0400
|
||||
***************
|
||||
*** 298,305 ****
|
||||
--- 298,307 ----
|
||||
{
|
||||
char c = command->value.Connection->connector;
|
||||
+ int was_newline;
|
||||
|
||||
s[0] = printing_comsub ? c : ';';
|
||||
s[1] = '\0';
|
||||
|
||||
+ was_newline = deferred_heredocs == 0 && was_heredoc == 0 && c == '\n';
|
||||
if (deferred_heredocs == 0)
|
||||
{
|
||||
***************
|
||||
*** 315,318 ****
|
||||
--- 317,322 ----
|
||||
if (inside_function_def)
|
||||
cprintf ("\n");
|
||||
+ else if (printing_comsub && c == '\n' && was_newline == 0)
|
||||
+ cprintf ("\n"); /* preserve newlines in comsubs but don't double them */
|
||||
else
|
||||
{
|
||||
***************
|
||||
*** 1366,1370 ****
|
||||
}
|
||||
else
|
||||
! newline ("}");
|
||||
|
||||
dispose_command (cmdcopy);
|
||||
--- 1371,1379 ----
|
||||
}
|
||||
else
|
||||
! {
|
||||
! /* { */
|
||||
! newline ("}");
|
||||
! was_heredoc = 0; /* not printing any here-documents now */
|
||||
! }
|
||||
|
||||
dispose_command (cmdcopy);
|
||||
***************
|
||||
*** 1443,1447 ****
|
||||
}
|
||||
else
|
||||
! newline ("}");
|
||||
|
||||
result = the_printed_command;
|
||||
--- 1452,1459 ----
|
||||
}
|
||||
else
|
||||
! { /* { */
|
||||
! newline ("}");
|
||||
! was_heredoc = 0;
|
||||
! }
|
||||
|
||||
result = the_printed_command;
|
||||
*** ../bash-5.2/patchlevel.h 2020-06-22 14:51:03.000000000 -0400
|
||||
--- patchlevel.h 2020-10-01 11:01:28.000000000 -0400
|
||||
***************
|
||||
*** 26,30 ****
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 2
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
--- 26,30 ----
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 3
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
@@ -0,0 +1,70 @@
|
||||
BASH PATCH REPORT
|
||||
=================
|
||||
|
||||
Bash-Release: 5.2
|
||||
Patch-ID: bash52-004
|
||||
|
||||
Bug-Reported-by: Antoine <bug-bash@glitchimini.net>
|
||||
Bug-Reference-ID: <8bd59753-05ff-9b09-2337-2c7f52ded650@glitchimini.net>
|
||||
Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2022-10/msg00022.html
|
||||
|
||||
Bug-Description:
|
||||
|
||||
Bash needs to keep better track of nested brace expansions to avoid problems
|
||||
with quoting and POSIX semantics.
|
||||
|
||||
Patch (apply with `patch -p0'):
|
||||
|
||||
*** ../bash-5.2-patched/subst.c 2022-10-05 10:22:02.000000000 -0400
|
||||
--- subst.c 2022-10-06 15:19:08.000000000 -0400
|
||||
***************
|
||||
*** 1799,1802 ****
|
||||
--- 1804,1810 ----
|
||||
}
|
||||
|
||||
+ #define PARAMEXPNEST_MAX 32 // for now
|
||||
+ static int dbstate[PARAMEXPNEST_MAX];
|
||||
+
|
||||
/* Extract a parameter expansion expression within ${ and } from STRING.
|
||||
Obey the Posix.2 rules for finding the ending `}': count braces while
|
||||
***************
|
||||
*** 1829,1832 ****
|
||||
--- 1837,1842 ----
|
||||
return (extract_heredoc_dolbrace_string (string, sindex, quoted, flags));
|
||||
|
||||
+ dbstate[0] = dolbrace_state;
|
||||
+
|
||||
pass_character = 0;
|
||||
nesting_level = 1;
|
||||
***************
|
||||
*** 1853,1856 ****
|
||||
--- 1863,1868 ----
|
||||
if (string[i] == '$' && string[i+1] == LBRACE)
|
||||
{
|
||||
+ if (nesting_level < PARAMEXPNEST_MAX)
|
||||
+ dbstate[nesting_level] = dolbrace_state;
|
||||
nesting_level++;
|
||||
i += 2;
|
||||
***************
|
||||
*** 1865,1868 ****
|
||||
--- 1877,1881 ----
|
||||
if (nesting_level == 0)
|
||||
break;
|
||||
+ dolbrace_state = (nesting_level < PARAMEXPNEST_MAX) ? dbstate[nesting_level] : dbstate[0]; /* Guess using initial state */
|
||||
i++;
|
||||
continue;
|
||||
*** ../bash-5.2/patchlevel.h 2020-06-22 14:51:03.000000000 -0400
|
||||
--- patchlevel.h 2020-10-01 11:01:28.000000000 -0400
|
||||
***************
|
||||
*** 26,30 ****
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 3
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
--- 26,30 ----
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 4
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
@@ -0,0 +1,47 @@
|
||||
BASH PATCH REPORT
|
||||
=================
|
||||
|
||||
Bash-Release: 5.2
|
||||
Patch-ID: bash52-005
|
||||
|
||||
Bug-Reported-by: Justin Wood (Callek) <callek@gmail.com>
|
||||
Bug-Reference-ID: <CANBDKY9fp2yiXONP7RY4kNuRteuovUebxSJaqePHeu7cyaFS9Q@mail.gmail.com>
|
||||
Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2022-10/msg00088.html
|
||||
|
||||
Bug-Description:
|
||||
|
||||
Null pattern substitution replacement strings can cause a crash.
|
||||
|
||||
Patch (apply with `patch -p0'):
|
||||
|
||||
*** ../bash-5.2-patched/subst.c 2022-10-05 10:22:02.000000000 -0400
|
||||
--- subst.c 2022-10-13 16:57:26.000000000 -0400
|
||||
***************
|
||||
*** 8966,8970 ****
|
||||
}
|
||||
else if (*string == 0 && (match_pattern (string, pat, mtype, &s, &e) != 0))
|
||||
! return ((mflags & MATCH_EXPREP) ? strcreplace (rep, '&', "", 2) : savestring (rep));
|
||||
|
||||
ret = (char *)xmalloc (rsize = 64);
|
||||
--- 8966,8971 ----
|
||||
}
|
||||
else if (*string == 0 && (match_pattern (string, pat, mtype, &s, &e) != 0))
|
||||
! return (mflags & MATCH_EXPREP) ? strcreplace (rep, '&', "", 2)
|
||||
! : (rep ? savestring (rep) : savestring (""));
|
||||
|
||||
ret = (char *)xmalloc (rsize = 64);
|
||||
*** ../bash-5.2/patchlevel.h 2020-06-22 14:51:03.000000000 -0400
|
||||
--- patchlevel.h 2020-10-01 11:01:28.000000000 -0400
|
||||
***************
|
||||
*** 26,30 ****
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 4
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
--- 26,30 ----
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 5
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
@@ -0,0 +1,293 @@
|
||||
BASH PATCH REPORT
|
||||
=================
|
||||
|
||||
Bash-Release: 5.2
|
||||
Patch-ID: bash52-006
|
||||
|
||||
Bug-Reported-by: feng xiangjun <fengxj325@gmail.com>
|
||||
Bug-Reference-ID: <CAHH2t87LrCmO=gdyWOmGn5WJt7EucL+iOXzrry34OETe50S6uA@mail.gmail.com>
|
||||
Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2022-10/msg00089.html
|
||||
|
||||
Bug-Description:
|
||||
|
||||
In interactive shells, interrupting the shell while entering a command
|
||||
substitution can inhibit alias expansion.
|
||||
|
||||
Patch (apply with `patch -p0'):
|
||||
|
||||
*** ../bash-5.2-patched/parse.y 2022-10-08 13:10:06.000000000 -0400
|
||||
--- parse.y 2022-10-14 10:03:19.000000000 -0400
|
||||
***************
|
||||
*** 3307,3310 ****
|
||||
--- 3307,3312 ----
|
||||
extended_glob = global_extglob;
|
||||
#endif
|
||||
+ if (parser_state & (PST_CMDSUBST|PST_STRING))
|
||||
+ expand_aliases = expaliases_flag;
|
||||
|
||||
parser_state = 0;
|
||||
***************
|
||||
*** 4389,4392 ****
|
||||
--- 4391,4395 ----
|
||||
parser_state |= PST_NOERROR;
|
||||
|
||||
+ parser_state |= PST_STRING;
|
||||
expand_aliases = 0;
|
||||
|
||||
***************
|
||||
*** 6402,6406 ****
|
||||
parser_state &= ~PST_NOEXPAND; /* parse_comsub sentinel */
|
||||
/* State flags we want to set for this run through the tokenizer. */
|
||||
! parser_state |= PST_COMPASSIGN|PST_REPARSE;
|
||||
}
|
||||
|
||||
--- 6405,6409 ----
|
||||
parser_state &= ~PST_NOEXPAND; /* parse_comsub sentinel */
|
||||
/* State flags we want to set for this run through the tokenizer. */
|
||||
! parser_state |= PST_COMPASSIGN|PST_REPARSE|PST_STRING;
|
||||
}
|
||||
|
||||
*** ../bash-20221007/parser.h 2022-08-30 11:39:56.000000000 -0400
|
||||
--- parser.h 2022-10-14 09:56:18.000000000 -0400
|
||||
***************
|
||||
*** 51,54 ****
|
||||
--- 51,55 ----
|
||||
#define PST_NOEXPAND 0x400000 /* don't expand anything in read_token_word; for command substitution */
|
||||
#define PST_NOERROR 0x800000 /* don't print error messages in yyerror */
|
||||
+ #define PST_STRING 0x1000000 /* parsing a string to a command or word list */
|
||||
|
||||
/* Definition of the delimiter stack. Needed by parse.y and bashhist.c. */
|
||||
*** ../bash-20221007/builtins/shopt.def 2022-10-07 10:25:55.000000000 -0400
|
||||
--- builtins/shopt.def 2022-10-14 09:30:11.000000000 -0400
|
||||
***************
|
||||
*** 150,153 ****
|
||||
--- 150,156 ----
|
||||
#endif
|
||||
|
||||
+ int expaliases_flag = 0;
|
||||
+ static int shopt_set_expaliases PARAMS((char *, int));
|
||||
+
|
||||
static int shopt_set_debug_mode PARAMS((char *, int));
|
||||
|
||||
***************
|
||||
*** 199,203 ****
|
||||
{ "dotglob", &glob_dot_filenames, (shopt_set_func_t *)NULL },
|
||||
{ "execfail", &no_exit_on_failed_exec, (shopt_set_func_t *)NULL },
|
||||
! { "expand_aliases", &expand_aliases, (shopt_set_func_t *)NULL },
|
||||
#if defined (DEBUGGER)
|
||||
{ "extdebug", &debugging_mode, shopt_set_debug_mode },
|
||||
--- 202,206 ----
|
||||
{ "dotglob", &glob_dot_filenames, (shopt_set_func_t *)NULL },
|
||||
{ "execfail", &no_exit_on_failed_exec, (shopt_set_func_t *)NULL },
|
||||
! { "expand_aliases", &expaliases_flag, shopt_set_expaliases },
|
||||
#if defined (DEBUGGER)
|
||||
{ "extdebug", &debugging_mode, shopt_set_debug_mode },
|
||||
***************
|
||||
*** 351,355 ****
|
||||
allow_null_glob_expansion = glob_dot_filenames = 0;
|
||||
no_exit_on_failed_exec = 0;
|
||||
! expand_aliases = 0;
|
||||
extended_quote = 1;
|
||||
fail_glob_expansion = 0;
|
||||
--- 354,358 ----
|
||||
allow_null_glob_expansion = glob_dot_filenames = 0;
|
||||
no_exit_on_failed_exec = 0;
|
||||
! expand_aliases = expaliases_flag = 0;
|
||||
extended_quote = 1;
|
||||
fail_glob_expansion = 0;
|
||||
***************
|
||||
*** 632,635 ****
|
||||
--- 635,647 ----
|
||||
}
|
||||
|
||||
+ static int
|
||||
+ shopt_set_expaliases (option_name, mode)
|
||||
+ char *option_name;
|
||||
+ int mode;
|
||||
+ {
|
||||
+ expand_aliases = expaliases_flag;
|
||||
+ return 0;
|
||||
+ }
|
||||
+
|
||||
#if defined (READLINE)
|
||||
static int
|
||||
*** ../bash-20221007/builtins/common.h 2022-10-07 10:10:17.000000000 -0400
|
||||
--- builtins/common.h 2022-10-14 09:29:25.000000000 -0400
|
||||
***************
|
||||
*** 258,261 ****
|
||||
--- 258,263 ----
|
||||
#endif
|
||||
|
||||
+ extern int expaliases_flag;
|
||||
+
|
||||
/* variables from source.def */
|
||||
extern int source_searches_cwd;
|
||||
*** ../bash-20221007/execute_cmd.c 2022-10-10 10:48:54.000000000 -0400
|
||||
--- execute_cmd.c 2022-10-14 09:32:24.000000000 -0400
|
||||
***************
|
||||
*** 1537,1541 ****
|
||||
aliases. */
|
||||
if (ois != interactive_shell)
|
||||
! expand_aliases = 0;
|
||||
}
|
||||
|
||||
--- 1537,1541 ----
|
||||
aliases. */
|
||||
if (ois != interactive_shell)
|
||||
! expand_aliases = expaliases_flag = 0;
|
||||
}
|
||||
|
||||
*** ../bash-20221007/general.c 2021-11-04 14:12:38.000000000 -0400
|
||||
--- general.c 2022-10-14 09:34:24.000000000 -0400
|
||||
***************
|
||||
*** 92,96 ****
|
||||
&interactive_comments,
|
||||
&source_uses_path,
|
||||
! &expand_aliases,
|
||||
&inherit_errexit,
|
||||
&print_shift_error,
|
||||
--- 92,96 ----
|
||||
&interactive_comments,
|
||||
&source_uses_path,
|
||||
! &expaliases_flag,
|
||||
&inherit_errexit,
|
||||
&print_shift_error,
|
||||
***************
|
||||
*** 107,111 ****
|
||||
if (on != 0)
|
||||
{
|
||||
! interactive_comments = source_uses_path = expand_aliases = 1;
|
||||
inherit_errexit = 1;
|
||||
source_searches_cwd = 0;
|
||||
--- 107,112 ----
|
||||
if (on != 0)
|
||||
{
|
||||
! interactive_comments = source_uses_path = 1;
|
||||
! expand_aliases = expaliases_flag = 1;
|
||||
inherit_errexit = 1;
|
||||
source_searches_cwd = 0;
|
||||
***************
|
||||
*** 117,120 ****
|
||||
--- 118,122 ----
|
||||
{
|
||||
set_posix_options (saved_posix_vars);
|
||||
+ expand_aliases = expaliases_flag;
|
||||
free (saved_posix_vars);
|
||||
saved_posix_vars = 0;
|
||||
***************
|
||||
*** 123,127 ****
|
||||
{
|
||||
source_searches_cwd = 1;
|
||||
! expand_aliases = interactive_shell;
|
||||
print_shift_error = 0;
|
||||
}
|
||||
--- 125,129 ----
|
||||
{
|
||||
source_searches_cwd = 1;
|
||||
! expand_aliases = expaliases_flag = interactive_shell; /* XXX */
|
||||
print_shift_error = 0;
|
||||
}
|
||||
|
||||
*** ../bash-5.2-patched/shell.c 2022-03-04 15:13:00.000000000 -0500
|
||||
--- shell.c 2022-10-14 09:36:19.000000000 -0400
|
||||
***************
|
||||
*** 1845,1850 ****
|
||||
init_interactive ()
|
||||
{
|
||||
! expand_aliases = interactive_shell = startup_state = 1;
|
||||
! interactive = 1;
|
||||
#if defined (HISTORY)
|
||||
if (enable_history_list == -1)
|
||||
--- 1845,1850 ----
|
||||
init_interactive ()
|
||||
{
|
||||
! expand_aliases = expaliases_flag = 1;
|
||||
! interactive_shell = startup_state = interactive = 1;
|
||||
#if defined (HISTORY)
|
||||
if (enable_history_list == -1)
|
||||
***************
|
||||
*** 1866,1870 ****
|
||||
#endif /* HISTORY */
|
||||
interactive_shell = startup_state = interactive = 0;
|
||||
! expand_aliases = posixly_correct; /* XXX - was 0 not posixly_correct */
|
||||
no_line_editing = 1;
|
||||
#if defined (JOB_CONTROL)
|
||||
--- 1866,1870 ----
|
||||
#endif /* HISTORY */
|
||||
interactive_shell = startup_state = interactive = 0;
|
||||
! expand_aliases = expaliases_flag = posixly_correct; /* XXX - was 0 not posixly_correct */
|
||||
no_line_editing = 1;
|
||||
#if defined (JOB_CONTROL)
|
||||
***************
|
||||
*** 1883,1887 ****
|
||||
#endif
|
||||
init_noninteractive ();
|
||||
! expand_aliases = interactive_shell = startup_state = 1;
|
||||
#if defined (HISTORY)
|
||||
remember_on_history = enable_history_list; /* XXX */
|
||||
--- 1883,1887 ----
|
||||
#endif
|
||||
init_noninteractive ();
|
||||
! expand_aliases = expaliases_flag = interactive_shell = startup_state = 1;
|
||||
#if defined (HISTORY)
|
||||
remember_on_history = enable_history_list; /* XXX */
|
||||
***************
|
||||
*** 2026,2030 ****
|
||||
forced_interactive = interactive_shell = 0;
|
||||
subshell_environment = running_in_background = 0;
|
||||
! expand_aliases = 0;
|
||||
bash_argv_initialized = 0;
|
||||
|
||||
--- 2026,2030 ----
|
||||
forced_interactive = interactive_shell = 0;
|
||||
subshell_environment = running_in_background = 0;
|
||||
! expand_aliases = expaliases_flag = 0;
|
||||
bash_argv_initialized = 0;
|
||||
|
||||
*** ../bash-5.2-patched/y.tab.c 2022-09-23 10:18:27.000000000 -0400
|
||||
--- y.tab.c 2022-10-14 14:57:26.000000000 -0400
|
||||
***************
|
||||
*** 5618,5621 ****
|
||||
--- 5618,5623 ----
|
||||
extended_glob = global_extglob;
|
||||
#endif
|
||||
+ if (parser_state & (PST_CMDSUBST|PST_STRING))
|
||||
+ expand_aliases = expaliases_flag;
|
||||
|
||||
parser_state = 0;
|
||||
***************
|
||||
*** 6700,6703 ****
|
||||
--- 6702,6706 ----
|
||||
parser_state |= PST_NOERROR;
|
||||
|
||||
+ parser_state |= PST_STRING;
|
||||
expand_aliases = 0;
|
||||
|
||||
***************
|
||||
*** 8713,8717 ****
|
||||
parser_state &= ~PST_NOEXPAND; /* parse_comsub sentinel */
|
||||
/* State flags we want to set for this run through the tokenizer. */
|
||||
! parser_state |= PST_COMPASSIGN|PST_REPARSE;
|
||||
}
|
||||
|
||||
--- 8716,8720 ----
|
||||
parser_state &= ~PST_NOEXPAND; /* parse_comsub sentinel */
|
||||
/* State flags we want to set for this run through the tokenizer. */
|
||||
! parser_state |= PST_COMPASSIGN|PST_REPARSE|PST_STRING;
|
||||
}
|
||||
|
||||
*** ../bash-5.2/patchlevel.h 2020-06-22 14:51:03.000000000 -0400
|
||||
--- patchlevel.h 2020-10-01 11:01:28.000000000 -0400
|
||||
***************
|
||||
*** 26,30 ****
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 5
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
--- 26,30 ----
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 6
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
@@ -0,0 +1,262 @@
|
||||
BASH PATCH REPORT
|
||||
=================
|
||||
|
||||
Bash-Release: 5.2
|
||||
Patch-ID: bash52-007
|
||||
|
||||
Bug-Reported-by: Bruce Jerrick
|
||||
Bug-Reference-ID:
|
||||
Bug-Reference-URL: https://bugzilla.redhat.com/show_bug.cgi?id=2134307
|
||||
|
||||
Bug-Description:
|
||||
|
||||
This patch fixes several problems with alias expansion inside command
|
||||
substitutions when in POSIX mode.
|
||||
|
||||
Patch (apply with `patch -p0'):
|
||||
|
||||
*** /fs1/chet/scratch/bash-5.2.6/parse.y 2022-11-02 10:36:54.000000000 -0400
|
||||
--- parse.y 2022-10-24 10:53:26.000000000 -0400
|
||||
***************
|
||||
*** 3613,3616 ****
|
||||
--- 3614,3618 ----
|
||||
#define P_ARRAYSUB 0x0020 /* parsing a [...] array subscript for assignment */
|
||||
#define P_DOLBRACE 0x0040 /* parsing a ${...} construct */
|
||||
+ #define P_ARITH 0x0080 /* parsing a $(( )) arithmetic expansion */
|
||||
|
||||
/* Lexical state while parsing a grouping construct or $(...). */
|
||||
***************
|
||||
*** 3911,3914 ****
|
||||
--- 3914,3920 ----
|
||||
else if ((flags & (P_ARRAYSUB|P_DOLBRACE)) && (tflags & LEX_WASDOL) && (ch == '(' || ch == '{' || ch == '[')) /* ) } ] */
|
||||
goto parse_dollar_word;
|
||||
+ else if ((flags & P_ARITH) && (tflags & LEX_WASDOL) && ch == '(') /*)*/
|
||||
+ /* $() inside $(( ))/$[ ] */
|
||||
+ goto parse_dollar_word;
|
||||
#if defined (PROCESS_SUBSTITUTION)
|
||||
/* XXX - technically this should only be recognized at the start of
|
||||
***************
|
||||
*** 3941,3945 ****
|
||||
nestret = parse_matched_pair (0, '{', '}', &nestlen, P_FIRSTCLOSE|P_DOLBRACE|rflags);
|
||||
else if (ch == '[') /* ] */
|
||||
! nestret = parse_matched_pair (0, '[', ']', &nestlen, rflags);
|
||||
|
||||
CHECK_NESTRET_ERROR ();
|
||||
--- 3947,3951 ----
|
||||
nestret = parse_matched_pair (0, '{', '}', &nestlen, P_FIRSTCLOSE|P_DOLBRACE|rflags);
|
||||
else if (ch == '[') /* ] */
|
||||
! nestret = parse_matched_pair (0, '[', ']', &nestlen, rflags|P_ARITH);
|
||||
|
||||
CHECK_NESTRET_ERROR ();
|
||||
***************
|
||||
*** 4080,4084 ****
|
||||
shell_ungetc (peekc);
|
||||
if (peekc == '(') /*)*/
|
||||
! return (parse_matched_pair (qc, open, close, lenp, 0));
|
||||
}
|
||||
|
||||
--- 4086,4090 ----
|
||||
shell_ungetc (peekc);
|
||||
if (peekc == '(') /*)*/
|
||||
! return (parse_matched_pair (qc, open, close, lenp, P_ARITH));
|
||||
}
|
||||
|
||||
***************
|
||||
*** 4501,4505 ****
|
||||
|
||||
exp_lineno = line_number;
|
||||
! ttok = parse_matched_pair (0, '(', ')', &ttoklen, 0);
|
||||
rval = 1;
|
||||
if (ttok == &matched_pair_error)
|
||||
--- 4512,4516 ----
|
||||
|
||||
exp_lineno = line_number;
|
||||
! ttok = parse_matched_pair (0, '(', ')', &ttoklen, P_ARITH);
|
||||
rval = 1;
|
||||
if (ttok == &matched_pair_error)
|
||||
***************
|
||||
*** 5016,5020 ****
|
||||
}
|
||||
else
|
||||
! ttok = parse_matched_pair (cd, '[', ']', &ttoklen, 0);
|
||||
if (ttok == &matched_pair_error)
|
||||
return -1; /* Bail immediately. */
|
||||
--- 5030,5034 ----
|
||||
}
|
||||
else
|
||||
! ttok = parse_matched_pair (cd, '[', ']', &ttoklen, P_ARITH);
|
||||
if (ttok == &matched_pair_error)
|
||||
return -1; /* Bail immediately. */
|
||||
*** ../bash-5.2.6/y.tab.c 2022-11-02 10:36:54.000000000 -0400
|
||||
--- y.tab.c 2022-11-02 10:55:58.000000000 -0400
|
||||
***************
|
||||
*** 5924,5927 ****
|
||||
--- 5924,5928 ----
|
||||
#define P_ARRAYSUB 0x0020 /* parsing a [...] array subscript for assignment */
|
||||
#define P_DOLBRACE 0x0040 /* parsing a ${...} construct */
|
||||
+ #define P_ARITH 0x0080 /* parsing a $(( )) arithmetic expansion */
|
||||
|
||||
/* Lexical state while parsing a grouping construct or $(...). */
|
||||
***************
|
||||
*** 6222,6225 ****
|
||||
--- 6223,6229 ----
|
||||
else if ((flags & (P_ARRAYSUB|P_DOLBRACE)) && (tflags & LEX_WASDOL) && (ch == '(' || ch == '{' || ch == '[')) /* ) } ] */
|
||||
goto parse_dollar_word;
|
||||
+ else if ((flags & P_ARITH) && (tflags & LEX_WASDOL) && ch == '(') /*)*/
|
||||
+ /* $() inside $(( ))/$[ ] */
|
||||
+ goto parse_dollar_word;
|
||||
#if defined (PROCESS_SUBSTITUTION)
|
||||
/* XXX - technically this should only be recognized at the start of
|
||||
***************
|
||||
*** 6252,6256 ****
|
||||
nestret = parse_matched_pair (0, '{', '}', &nestlen, P_FIRSTCLOSE|P_DOLBRACE|rflags);
|
||||
else if (ch == '[') /* ] */
|
||||
! nestret = parse_matched_pair (0, '[', ']', &nestlen, rflags);
|
||||
|
||||
CHECK_NESTRET_ERROR ();
|
||||
--- 6256,6260 ----
|
||||
nestret = parse_matched_pair (0, '{', '}', &nestlen, P_FIRSTCLOSE|P_DOLBRACE|rflags);
|
||||
else if (ch == '[') /* ] */
|
||||
! nestret = parse_matched_pair (0, '[', ']', &nestlen, rflags|P_ARITH);
|
||||
|
||||
CHECK_NESTRET_ERROR ();
|
||||
***************
|
||||
*** 6391,6395 ****
|
||||
shell_ungetc (peekc);
|
||||
if (peekc == '(') /*)*/
|
||||
! return (parse_matched_pair (qc, open, close, lenp, 0));
|
||||
}
|
||||
|
||||
--- 6395,6399 ----
|
||||
shell_ungetc (peekc);
|
||||
if (peekc == '(') /*)*/
|
||||
! return (parse_matched_pair (qc, open, close, lenp, P_ARITH));
|
||||
}
|
||||
|
||||
***************
|
||||
*** 6812,6816 ****
|
||||
|
||||
exp_lineno = line_number;
|
||||
! ttok = parse_matched_pair (0, '(', ')', &ttoklen, 0);
|
||||
rval = 1;
|
||||
if (ttok == &matched_pair_error)
|
||||
--- 6816,6820 ----
|
||||
|
||||
exp_lineno = line_number;
|
||||
! ttok = parse_matched_pair (0, '(', ')', &ttoklen, P_ARITH);
|
||||
rval = 1;
|
||||
if (ttok == &matched_pair_error)
|
||||
***************
|
||||
*** 7327,7331 ****
|
||||
}
|
||||
else
|
||||
! ttok = parse_matched_pair (cd, '[', ']', &ttoklen, 0);
|
||||
if (ttok == &matched_pair_error)
|
||||
return -1; /* Bail immediately. */
|
||||
--- 7331,7335 ----
|
||||
}
|
||||
else
|
||||
! ttok = parse_matched_pair (cd, '[', ']', &ttoklen, P_ARITH);
|
||||
if (ttok == &matched_pair_error)
|
||||
return -1; /* Bail immediately. */
|
||||
*** /fs1/chet/scratch/bash-5.2.6/builtins/evalstring.c 2022-07-18 14:46:56.000000000 -0400
|
||||
--- builtins/evalstring.c 2022-10-18 10:57:51.000000000 -0400
|
||||
***************
|
||||
*** 432,435 ****
|
||||
--- 432,437 ----
|
||||
if (parse_command () == 0)
|
||||
{
|
||||
+ int local_expalias, local_alflag;
|
||||
+
|
||||
if ((flags & SEVAL_PARSEONLY) || (interactive_shell == 0 && read_but_dont_execute))
|
||||
{
|
||||
***************
|
||||
*** 508,511 ****
|
||||
--- 510,526 ----
|
||||
#endif /* ONESHOT */
|
||||
|
||||
+ /* We play tricks in the parser and command_substitute() turning
|
||||
+ expand_aliases on and off depending on which parsing pass and
|
||||
+ whether or not we're in posix mode. This only matters for
|
||||
+ parsing, and we let the higher layers deal with that. We just
|
||||
+ want to ensure that expand_aliases is set to the appropriate
|
||||
+ global value when we go to execute this command, so we save
|
||||
+ and restore it around the execution (we don't restore it if
|
||||
+ the global value of the flag (expaliases_flag) changes). */
|
||||
+ local_expalias = expand_aliases;
|
||||
+ local_alflag = expaliases_flag;
|
||||
+ if (subshell_environment & SUBSHELL_COMSUB)
|
||||
+ expand_aliases = expaliases_flag;
|
||||
+
|
||||
/* See if this is a candidate for $( <file ). */
|
||||
if (startup_state == 2 &&
|
||||
***************
|
||||
*** 525,528 ****
|
||||
--- 540,547 ----
|
||||
discard_unwind_frame ("pe_dispose");
|
||||
|
||||
+ /* If the global value didn't change, we restore what we had. */
|
||||
+ if ((subshell_environment & SUBSHELL_COMSUB) && local_alflag == expaliases_flag)
|
||||
+ expand_aliases = local_expalias;
|
||||
+
|
||||
if (flags & SEVAL_ONECMD)
|
||||
{
|
||||
*** /fs1/chet/scratch/bash-5.2.6/command.h 2021-04-30 15:43:15.000000000 -0400
|
||||
--- command.h 2022-10-18 11:44:31.000000000 -0400
|
||||
***************
|
||||
*** 115,118 ****
|
||||
--- 115,119 ----
|
||||
#define PF_EXPANDRHS 0x20 /* same as W_EXPANDRHS */
|
||||
#define PF_ALLINDS 0x40 /* array, act as if [@] was supplied */
|
||||
+ #define PF_BACKQUOTE 0x80 /* differentiate `` from $() for command_substitute */
|
||||
|
||||
/* Possible values for subshell_environment */
|
||||
*** /fs1/chet/scratch/bash-5.2.6/subst.c 2022-11-02 10:28:10.000000000 -0400
|
||||
--- subst.c 2022-10-20 12:41:07.000000000 -0400
|
||||
***************
|
||||
*** 7124,7129 ****
|
||||
|
||||
/* We want to expand aliases on this pass if we are not in posix mode
|
||||
! for backwards compatibility. */
|
||||
! if (expand_aliases)
|
||||
expand_aliases = posixly_correct == 0;
|
||||
|
||||
--- 7133,7142 ----
|
||||
|
||||
/* We want to expand aliases on this pass if we are not in posix mode
|
||||
! for backwards compatibility. parse_and_execute() takes care of
|
||||
! setting expand_aliases back to the global value when executing the
|
||||
! parsed string. We only do this for $(...) command substitution,
|
||||
! since that is what parse_comsub handles; `` comsubs are processed
|
||||
! using parse.y:parse_matched_pair(). */
|
||||
! if (expand_aliases && (flags & PF_BACKQUOTE) == 0)
|
||||
expand_aliases = posixly_correct == 0;
|
||||
|
||||
***************
|
||||
*** 11293,11297 ****
|
||||
{
|
||||
de_backslash (temp);
|
||||
! tword = command_substitute (temp, quoted, 0);
|
||||
temp1 = tword ? tword->word : (char *)NULL;
|
||||
if (tword)
|
||||
--- 11306,11310 ----
|
||||
{
|
||||
de_backslash (temp);
|
||||
! tword = command_substitute (temp, quoted, PF_BACKQUOTE);
|
||||
temp1 = tword ? tword->word : (char *)NULL;
|
||||
if (tword)
|
||||
*** ../bash-5.2/patchlevel.h 2020-06-22 14:51:03.000000000 -0400
|
||||
--- patchlevel.h 2020-10-01 11:01:28.000000000 -0400
|
||||
***************
|
||||
*** 26,30 ****
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 6
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
--- 26,30 ----
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 7
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
@@ -0,0 +1,58 @@
|
||||
BASH PATCH REPORT
|
||||
=================
|
||||
|
||||
Bash-Release: 5.2
|
||||
Patch-ID: bash52-008
|
||||
|
||||
Bug-Reported-by: Glenn Jackman <glenn.jackman@gmail.com>
|
||||
Bug-Reference-ID: <CAFC8ewQDx7hzNJzveuJ5o4FWo=ij7MzckiJVN_6NXjp504QZeg@mail.gmail.com>
|
||||
Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2022-10/msg00095.html
|
||||
|
||||
Bug-Description:
|
||||
|
||||
Array subscript expansion can inappropriately quote brackets if the expression
|
||||
contains < or >.
|
||||
|
||||
Patch (apply with `patch -p0'):
|
||||
|
||||
*** ../bash-20221015/subst.c 2022-10-18 10:47:33.000000000 -0500
|
||||
--- subst.c 2022-10-20 11:41:07.000000000 -0500
|
||||
***************
|
||||
*** 3820,3823 ****
|
||||
--- 3820,3827 ----
|
||||
#endif
|
||||
|
||||
+ /* We don't perform process substitution in arithmetic expressions, so don't
|
||||
+ bother checking for it. */
|
||||
+ #define ARITH_EXP_CHAR(s) (s == '$' || s == '`' || s == CTLESC || s == '~')
|
||||
+
|
||||
/* If there are any characters in STRING that require full expansion,
|
||||
then call FUNC to expand STRING; otherwise just perform quote
|
||||
***************
|
||||
*** 4029,4033 ****
|
||||
while (string[i])
|
||||
{
|
||||
! if (EXP_CHAR (string[i]))
|
||||
break;
|
||||
else if (string[i] == '\'' || string[i] == '\\' || string[i] == '"')
|
||||
--- 4033,4037 ----
|
||||
while (string[i])
|
||||
{
|
||||
! if (ARITH_EXP_CHAR (string[i]))
|
||||
break;
|
||||
else if (string[i] == '\'' || string[i] == '\\' || string[i] == '"')
|
||||
*** ../bash-5.2/patchlevel.h 2020-06-22 14:51:03.000000000 -0400
|
||||
--- patchlevel.h 2020-10-01 11:01:28.000000000 -0400
|
||||
***************
|
||||
*** 26,30 ****
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 7
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
--- 26,30 ----
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 8
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
@@ -0,0 +1,43 @@
|
||||
BASH PATCH REPORT
|
||||
=================
|
||||
|
||||
Bash-Release: 5.2
|
||||
Patch-ID: bash52-009
|
||||
|
||||
Bug-Reported-by: Corey Hickey <bugfood-ml@fatooh.org>
|
||||
Bug-Reference-ID: <134330ef-0ead-d73e-68eb-d58fc51efdba@fatooh.org>
|
||||
Bug-Reference-URL: https://lists.gnu.org/archive/html/help-bash/2022-10/msg00025.html
|
||||
|
||||
Bug-Description:
|
||||
|
||||
Bash arithmetic expansion should allow `@' and `*' to be used as associative
|
||||
array keys in expressions.
|
||||
|
||||
Patch (apply with `patch -p0'):
|
||||
|
||||
*** ../bash-5.2-patched/expr.c 2022-07-11 10:03:34.000000000 -0400
|
||||
--- expr.c 2022-10-31 10:51:08.000000000 -0400
|
||||
***************
|
||||
*** 1169,1172 ****
|
||||
--- 1169,1174 ----
|
||||
#if defined (ARRAY_VARS)
|
||||
aflag = tflag; /* use a different variable for now */
|
||||
+ if (shell_compatibility_level > 51)
|
||||
+ aflag |= AV_ATSTARKEYS;
|
||||
v = (e == ']') ? array_variable_part (tok, tflag, (char **)0, (int *)0) : find_variable (tok);
|
||||
#else
|
||||
*** ../bash-5.2/patchlevel.h 2020-06-22 14:51:03.000000000 -0400
|
||||
--- patchlevel.h 2020-10-01 11:01:28.000000000 -0400
|
||||
***************
|
||||
*** 26,30 ****
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 8
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
--- 26,30 ----
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 9
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
@@ -0,0 +1,71 @@
|
||||
BASH PATCH REPORT
|
||||
=================
|
||||
|
||||
Bash-Release: 5.2
|
||||
Patch-ID: bash52-010
|
||||
|
||||
Bug-Reported-by: larsh@apache.org
|
||||
Bug-Reference-ID:
|
||||
Bug-Reference-URL: https://savannah.gnu.org/support/?110744
|
||||
|
||||
Bug-Description:
|
||||
|
||||
Bash-5.2 checks the first 128 characters of an executable file that execve()
|
||||
refuses to execute to see whether it's a binary file before trying to
|
||||
execute it as a shell script. This defeats some previously-supported use
|
||||
cases like "self-executing" jar files or "self-uncompressing" scripts.
|
||||
|
||||
Patch (apply with `patch -p0'):
|
||||
|
||||
*** ../bash-5.2-patched/general.c 2022-11-07 10:31:42.000000000 -0500
|
||||
--- general.c 2022-11-18 14:48:45.000000000 -0500
|
||||
***************
|
||||
*** 684,687 ****
|
||||
--- 684,688 ----
|
||||
{
|
||||
register int i;
|
||||
+ int nline;
|
||||
unsigned char c;
|
||||
|
||||
***************
|
||||
*** 690,702 ****
|
||||
|
||||
/* Generally we check the first line for NULs. If the first line looks like
|
||||
! a `#!' interpreter specifier, we just look for NULs anywhere in the
|
||||
! buffer. */
|
||||
! if (sample[0] == '#' && sample[1] == '!')
|
||||
! return (memchr (sample, '\0', sample_len) != NULL);
|
||||
|
||||
for (i = 0; i < sample_len; i++)
|
||||
{
|
||||
c = sample[i];
|
||||
! if (c == '\n')
|
||||
return (0);
|
||||
if (c == '\0')
|
||||
--- 691,701 ----
|
||||
|
||||
/* Generally we check the first line for NULs. If the first line looks like
|
||||
! a `#!' interpreter specifier, we look for NULs in the first two lines. */
|
||||
! nline = (sample[0] == '#' && sample[1] == '!') ? 2 : 1;
|
||||
|
||||
for (i = 0; i < sample_len; i++)
|
||||
{
|
||||
c = sample[i];
|
||||
! if (c == '\n' && --nline == 0)
|
||||
return (0);
|
||||
if (c == '\0')
|
||||
*** ../bash-5.2/patchlevel.h 2020-06-22 14:51:03.000000000 -0400
|
||||
--- patchlevel.h 2020-10-01 11:01:28.000000000 -0400
|
||||
***************
|
||||
*** 26,30 ****
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 9
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
--- 26,30 ----
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 10
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
@@ -0,0 +1,45 @@
|
||||
BASH PATCH REPORT
|
||||
=================
|
||||
|
||||
Bash-Release: 5.2
|
||||
Patch-ID: bash52-011
|
||||
|
||||
Bug-Reported-by: Fabien Orjollet <of1@disroot.org>
|
||||
Bug-Reference-ID:
|
||||
Bug-Reference-URL: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1023776
|
||||
|
||||
Bug-Description:
|
||||
|
||||
Patch (apply with `patch -p0'):
|
||||
|
||||
Using timeouts and readline editing with the `read' builtin (read -e -t) can
|
||||
leave the readline timeout enabled, potentially resulting in an erroneous
|
||||
timeout on the next call.
|
||||
|
||||
*** ../bash-5.2-patched/builtins/read.def 2022-06-02 14:23:19.000000000 -0400
|
||||
--- builtins/read.def 2022-11-10 10:27:45.000000000 -0500
|
||||
***************
|
||||
*** 168,171 ****
|
||||
--- 168,174 ----
|
||||
if (read_timeout)
|
||||
shtimer_clear (read_timeout);
|
||||
+ #if defined (READLINE)
|
||||
+ rl_clear_timeout ();
|
||||
+ #endif
|
||||
read_timeout = 0;
|
||||
}
|
||||
*** ../bash-5.2/patchlevel.h 2020-06-22 14:51:03.000000000 -0400
|
||||
--- patchlevel.h 2020-10-01 11:01:28.000000000 -0400
|
||||
***************
|
||||
*** 26,30 ****
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 10
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
--- 26,30 ----
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 11
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
@@ -0,0 +1,344 @@
|
||||
BASH PATCH REPORT
|
||||
=================
|
||||
|
||||
Bash-Release: 5.2
|
||||
Patch-ID: bash52-012
|
||||
|
||||
Bug-Reported-by: Kerin Millar <kfm@plushkava.net>
|
||||
Bug-Reference-ID: <20221002095107.89561bc811e549b55644df11@plushkava.net>
|
||||
Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2022-10/msg00001.html
|
||||
|
||||
Bug-Description:
|
||||
|
||||
When running in bash compatibility mode, nested command substitutions can
|
||||
leave the `extglob' option enabled.
|
||||
|
||||
Patch (apply with `patch -p0'):
|
||||
|
||||
*** /fs1/chet/scratch/bash-5.2.12/builtins/shopt.def 2022-11-07 10:31:42.000000000 -0500
|
||||
--- builtins/shopt.def 2022-10-14 09:30:11.000000000 -0400
|
||||
***************
|
||||
*** 150,153 ****
|
||||
--- 150,158 ----
|
||||
#endif
|
||||
|
||||
+ #if defined (EXTENDED_GLOB)
|
||||
+ int extglob_flag = EXTGLOB_DEFAULT;
|
||||
+ static int shopt_set_extglob PARAMS((char *, int));
|
||||
+ #endif
|
||||
+
|
||||
int expaliases_flag = 0;
|
||||
static int shopt_set_expaliases PARAMS((char *, int));
|
||||
***************
|
||||
*** 207,211 ****
|
||||
#endif
|
||||
#if defined (EXTENDED_GLOB)
|
||||
! { "extglob", &extended_glob, (shopt_set_func_t *)NULL },
|
||||
#endif
|
||||
{ "extquote", &extended_quote, (shopt_set_func_t *)NULL },
|
||||
--- 212,216 ----
|
||||
#endif
|
||||
#if defined (EXTENDED_GLOB)
|
||||
! { "extglob", &extglob_flag, shopt_set_extglob },
|
||||
#endif
|
||||
{ "extquote", &extended_quote, (shopt_set_func_t *)NULL },
|
||||
***************
|
||||
*** 378,382 ****
|
||||
|
||||
#if defined (EXTENDED_GLOB)
|
||||
! extended_glob = EXTGLOB_DEFAULT;
|
||||
#endif
|
||||
|
||||
--- 383,387 ----
|
||||
|
||||
#if defined (EXTENDED_GLOB)
|
||||
! extended_glob = extglob_flag = EXTGLOB_DEFAULT;
|
||||
#endif
|
||||
|
||||
***************
|
||||
*** 644,647 ****
|
||||
--- 649,663 ----
|
||||
}
|
||||
|
||||
+ #if defined (EXTENDED_GLOB)
|
||||
+ static int
|
||||
+ shopt_set_extglob (option_name, mode)
|
||||
+ char *option_name;
|
||||
+ int mode;
|
||||
+ {
|
||||
+ extended_glob = extglob_flag;
|
||||
+ return 0;
|
||||
+ }
|
||||
+ #endif
|
||||
+
|
||||
#if defined (READLINE)
|
||||
static int
|
||||
*** /fs1/chet/scratch/bash-5.2.12/builtins/common.h 2022-11-07 10:31:42.000000000 -0500
|
||||
--- builtins/common.h 2022-10-14 09:29:25.000000000 -0400
|
||||
***************
|
||||
*** 258,261 ****
|
||||
--- 258,265 ----
|
||||
#endif
|
||||
|
||||
+ #if defined (EXTENDED_GLOB)
|
||||
+ extern int extglob_flag;
|
||||
+ #endif
|
||||
+
|
||||
extern int expaliases_flag;
|
||||
|
||||
*** /fs1/chet/scratch/bash-5.2.12/execute_cmd.c 2022-11-07 10:31:42.000000000 -0500
|
||||
--- execute_cmd.c 2022-11-02 16:32:12.000000000 -0400
|
||||
***************
|
||||
*** 3991,4001 ****
|
||||
#endif /* COND_REGEXP */
|
||||
{
|
||||
- int oe;
|
||||
- oe = extended_glob;
|
||||
extended_glob = 1;
|
||||
result = binary_test (cond->op->word, arg1, arg2, TEST_PATMATCH|TEST_ARITHEXP|TEST_LOCALE)
|
||||
? EXECUTION_SUCCESS
|
||||
: EXECUTION_FAILURE;
|
||||
! extended_glob = oe;
|
||||
}
|
||||
if (arg1 != nullstr)
|
||||
--- 4015,4023 ----
|
||||
#endif /* COND_REGEXP */
|
||||
{
|
||||
extended_glob = 1;
|
||||
result = binary_test (cond->op->word, arg1, arg2, TEST_PATMATCH|TEST_ARITHEXP|TEST_LOCALE)
|
||||
? EXECUTION_SUCCESS
|
||||
: EXECUTION_FAILURE;
|
||||
! extended_glob = extglob_flag;
|
||||
}
|
||||
if (arg1 != nullstr)
|
||||
*** /fs1/chet/scratch/bash-5.2.9/parse.y 2022-11-07 10:31:47.000000000 -0500
|
||||
--- parse.y 2022-11-14 11:27:22.000000000 -0500
|
||||
***************
|
||||
*** 126,130 ****
|
||||
|
||||
#if defined (EXTENDED_GLOB)
|
||||
! extern int extended_glob;
|
||||
#endif
|
||||
|
||||
--- 126,130 ----
|
||||
|
||||
#if defined (EXTENDED_GLOB)
|
||||
! extern int extended_glob, extglob_flag;
|
||||
#endif
|
||||
|
||||
***************
|
||||
*** 3305,3309 ****
|
||||
/* Reset to global value of extended glob */
|
||||
if (parser_state & (PST_EXTPAT|PST_CMDSUBST))
|
||||
! extended_glob = global_extglob;
|
||||
#endif
|
||||
if (parser_state & (PST_CMDSUBST|PST_STRING))
|
||||
--- 3321,3325 ----
|
||||
/* Reset to global value of extended glob */
|
||||
if (parser_state & (PST_EXTPAT|PST_CMDSUBST))
|
||||
! extended_glob = extglob_flag;
|
||||
#endif
|
||||
if (parser_state & (PST_CMDSUBST|PST_STRING))
|
||||
***************
|
||||
*** 4125,4132 ****
|
||||
#if defined (EXTENDED_GLOB)
|
||||
/* If (parser_state & PST_EXTPAT), we're parsing an extended pattern for a
|
||||
! conditional command and have already set global_extglob appropriately. */
|
||||
if (shell_compatibility_level <= 51 && was_extpat == 0)
|
||||
{
|
||||
! local_extglob = global_extglob = extended_glob;
|
||||
extended_glob = 1;
|
||||
}
|
||||
--- 4143,4150 ----
|
||||
#if defined (EXTENDED_GLOB)
|
||||
/* If (parser_state & PST_EXTPAT), we're parsing an extended pattern for a
|
||||
! conditional command and have already set extended_glob appropriately. */
|
||||
if (shell_compatibility_level <= 51 && was_extpat == 0)
|
||||
{
|
||||
! local_extglob = extended_glob;
|
||||
extended_glob = 1;
|
||||
}
|
||||
***************
|
||||
*** 4236,4240 ****
|
||||
sh_parser_state_t ps;
|
||||
sh_input_line_state_t ls;
|
||||
! int orig_ind, nc, sflags, start_lineno;
|
||||
char *ret, *ep, *ostring;
|
||||
|
||||
--- 4256,4260 ----
|
||||
sh_parser_state_t ps;
|
||||
sh_input_line_state_t ls;
|
||||
! int orig_ind, nc, sflags, start_lineno, local_extglob;
|
||||
char *ret, *ep, *ostring;
|
||||
|
||||
***************
|
||||
*** 4279,4283 ****
|
||||
expand_aliases = 0;
|
||||
#if defined (EXTENDED_GLOB)
|
||||
! global_extglob = extended_glob; /* for reset_parser() */
|
||||
#endif
|
||||
|
||||
--- 4299,4303 ----
|
||||
expand_aliases = 0;
|
||||
#if defined (EXTENDED_GLOB)
|
||||
! local_extglob = extended_glob;
|
||||
#endif
|
||||
|
||||
***************
|
||||
*** 4297,4300 ****
|
||||
--- 4317,4323 ----
|
||||
restore_parser_state (&ps);
|
||||
|
||||
+ #if defined (EXTENDED_GLOB)
|
||||
+ extended_glob = local_extglob;
|
||||
+ #endif
|
||||
token_to_read = 0;
|
||||
|
||||
***************
|
||||
*** 4732,4741 ****
|
||||
--- 4755,4768 ----
|
||||
|
||||
/* rhs */
|
||||
+ #if defined (EXTENDED_GLOB)
|
||||
local_extglob = extended_glob;
|
||||
if (parser_state & PST_EXTPAT)
|
||||
extended_glob = 1;
|
||||
+ #endif
|
||||
tok = read_token (READ);
|
||||
+ #if defined (EXTENDED_GLOB)
|
||||
if (parser_state & PST_EXTPAT)
|
||||
extended_glob = local_extglob;
|
||||
+ #endif
|
||||
parser_state &= ~(PST_REGEXP|PST_EXTPAT);
|
||||
|
||||
***************
|
||||
*** 4784,4788 ****
|
||||
COND_COM *cexp;
|
||||
|
||||
- global_extglob = extended_glob;
|
||||
cexp = cond_expr ();
|
||||
return (make_cond_command (cexp));
|
||||
--- 4811,4814 ----
|
||||
*** y.tab.c.save 2022-11-07 10:31:47.000000000 -0500
|
||||
--- y.tab.c 2022-11-18 15:58:03.000000000 -0500
|
||||
***************
|
||||
*** 176,180 ****
|
||||
|
||||
#if defined (EXTENDED_GLOB)
|
||||
! extern int extended_glob;
|
||||
#endif
|
||||
|
||||
--- 176,180 ----
|
||||
|
||||
#if defined (EXTENDED_GLOB)
|
||||
! extern int extended_glob, extglob_flag;
|
||||
#endif
|
||||
|
||||
***************
|
||||
*** 5616,5620 ****
|
||||
/* Reset to global value of extended glob */
|
||||
if (parser_state & (PST_EXTPAT|PST_CMDSUBST))
|
||||
! extended_glob = global_extglob;
|
||||
#endif
|
||||
if (parser_state & (PST_CMDSUBST|PST_STRING))
|
||||
--- 5616,5620 ----
|
||||
/* Reset to global value of extended glob */
|
||||
if (parser_state & (PST_EXTPAT|PST_CMDSUBST))
|
||||
! extended_glob = extglob_flag;
|
||||
#endif
|
||||
if (parser_state & (PST_CMDSUBST|PST_STRING))
|
||||
***************
|
||||
*** 6436,6443 ****
|
||||
#if defined (EXTENDED_GLOB)
|
||||
/* If (parser_state & PST_EXTPAT), we're parsing an extended pattern for a
|
||||
! conditional command and have already set global_extglob appropriately. */
|
||||
if (shell_compatibility_level <= 51 && was_extpat == 0)
|
||||
{
|
||||
! local_extglob = global_extglob = extended_glob;
|
||||
extended_glob = 1;
|
||||
}
|
||||
--- 6436,6443 ----
|
||||
#if defined (EXTENDED_GLOB)
|
||||
/* If (parser_state & PST_EXTPAT), we're parsing an extended pattern for a
|
||||
! conditional command and have already set extended_glob appropriately. */
|
||||
if (shell_compatibility_level <= 51 && was_extpat == 0)
|
||||
{
|
||||
! local_extglob = extended_glob;
|
||||
extended_glob = 1;
|
||||
}
|
||||
***************
|
||||
*** 6547,6551 ****
|
||||
sh_parser_state_t ps;
|
||||
sh_input_line_state_t ls;
|
||||
! int orig_ind, nc, sflags, start_lineno;
|
||||
char *ret, *ep, *ostring;
|
||||
|
||||
--- 6547,6551 ----
|
||||
sh_parser_state_t ps;
|
||||
sh_input_line_state_t ls;
|
||||
! int orig_ind, nc, sflags, start_lineno, local_extglob;
|
||||
char *ret, *ep, *ostring;
|
||||
|
||||
***************
|
||||
*** 6590,6594 ****
|
||||
expand_aliases = 0;
|
||||
#if defined (EXTENDED_GLOB)
|
||||
! global_extglob = extended_glob; /* for reset_parser() */
|
||||
#endif
|
||||
|
||||
--- 6590,6594 ----
|
||||
expand_aliases = 0;
|
||||
#if defined (EXTENDED_GLOB)
|
||||
! local_extglob = extended_glob;
|
||||
#endif
|
||||
|
||||
***************
|
||||
*** 6608,6611 ****
|
||||
--- 6608,6614 ----
|
||||
restore_parser_state (&ps);
|
||||
|
||||
+ #if defined (EXTENDED_GLOB)
|
||||
+ extended_glob = local_extglob;
|
||||
+ #endif
|
||||
token_to_read = 0;
|
||||
|
||||
***************
|
||||
*** 7043,7052 ****
|
||||
--- 7046,7059 ----
|
||||
|
||||
/* rhs */
|
||||
+ #if defined (EXTENDED_GLOB)
|
||||
local_extglob = extended_glob;
|
||||
if (parser_state & PST_EXTPAT)
|
||||
extended_glob = 1;
|
||||
+ #endif
|
||||
tok = read_token (READ);
|
||||
+ #if defined (EXTENDED_GLOB)
|
||||
if (parser_state & PST_EXTPAT)
|
||||
extended_glob = local_extglob;
|
||||
+ #endif
|
||||
parser_state &= ~(PST_REGEXP|PST_EXTPAT);
|
||||
|
||||
***************
|
||||
*** 7095,7099 ****
|
||||
COND_COM *cexp;
|
||||
|
||||
- global_extglob = extended_glob;
|
||||
cexp = cond_expr ();
|
||||
return (make_cond_command (cexp));
|
||||
--- 7102,7105 ----
|
||||
*** ../bash-5.2/patchlevel.h 2020-06-22 14:51:03.000000000 -0400
|
||||
--- patchlevel.h 2020-10-01 11:01:28.000000000 -0400
|
||||
***************
|
||||
*** 26,30 ****
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 11
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
--- 26,30 ----
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 12
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
@@ -0,0 +1,58 @@
|
||||
BASH PATCH REPORT
|
||||
=================
|
||||
|
||||
Bash-Release: 5.2
|
||||
Patch-ID: bash52-013
|
||||
|
||||
Bug-Reported-by: Ralf Oehler <Ralf@Oehler-Privat.de>
|
||||
Bug-Reference-ID: <20221120140252.2fc6489b@bilbo>
|
||||
Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2022-11/msg00082.html
|
||||
|
||||
Bug-Description:
|
||||
|
||||
Bash can leak memory when referencing a non-existent associative array
|
||||
element.
|
||||
|
||||
Patch (apply with `patch -p0'):
|
||||
|
||||
*** ../bash-5.2-patched/subst.c 2022-11-05 17:27:48.000000000 -0400
|
||||
--- subst.c 2022-11-21 14:42:59.000000000 -0500
|
||||
***************
|
||||
*** 7498,7503 ****
|
||||
: quote_escapes (temp);
|
||||
rflags |= W_ARRAYIND;
|
||||
- if (estatep)
|
||||
- *estatep = es; /* structure copy */
|
||||
}
|
||||
/* Note that array[*] and array[@] expanded to a quoted null string by
|
||||
--- 7508,7511 ----
|
||||
***************
|
||||
*** 7508,7512 ****
|
||||
rflags |= W_HASQUOTEDNULL;
|
||||
|
||||
! if (estatep == 0)
|
||||
flush_eltstate (&es);
|
||||
}
|
||||
--- 7516,7522 ----
|
||||
rflags |= W_HASQUOTEDNULL;
|
||||
|
||||
! if (estatep)
|
||||
! *estatep = es; /* structure copy */
|
||||
! else
|
||||
flush_eltstate (&es);
|
||||
}
|
||||
*** ../bash-5.2/patchlevel.h 2020-06-22 14:51:03.000000000 -0400
|
||||
--- patchlevel.h 2020-10-01 11:01:28.000000000 -0400
|
||||
***************
|
||||
*** 26,30 ****
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 12
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
--- 26,30 ----
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 13
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
@@ -0,0 +1,119 @@
|
||||
BASH PATCH REPORT
|
||||
=================
|
||||
|
||||
Bash-Release: 5.2
|
||||
Patch-ID: bash52-014
|
||||
|
||||
Bug-Reported-by: Andreas Schwab <schwab@suse.de>
|
||||
Bug-Reference-ID: <mvmv8opcbha.fsf@suse.de>
|
||||
Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2022-10/msg00076.html
|
||||
|
||||
Bug-Description:
|
||||
|
||||
Bash defers processing additional terminating signals when running the
|
||||
EXIT trap while exiting due to a terminating signal. This patch allows the
|
||||
new terminating signal to kill the shell immediately.
|
||||
|
||||
Patch (apply with `patch -p0'):
|
||||
|
||||
*** ../bash-5.2-patched/execute_cmd.c 2022-11-23 17:09:18.000000000 -0500
|
||||
--- execute_cmd.c 2022-11-28 10:36:08.000000000 -0500
|
||||
***************
|
||||
*** 3625,3628 ****
|
||||
--- 3649,3653 ----
|
||||
|
||||
dispose_words (es);
|
||||
+ QUIT;
|
||||
|
||||
if (match)
|
||||
*** ../bash-5.2-patched/sig.c 2021-11-04 14:15:31.000000000 -0400
|
||||
--- sig.c 2022-12-06 09:45:11.000000000 -0500
|
||||
***************
|
||||
*** 95,98 ****
|
||||
--- 95,99 ----
|
||||
|
||||
static void initialize_shell_signals PARAMS((void));
|
||||
+ static void kill_shell PARAMS((int));
|
||||
|
||||
void
|
||||
***************
|
||||
*** 487,490 ****
|
||||
--- 495,500 ----
|
||||
}
|
||||
|
||||
+ static int handling_termsig = 0;
|
||||
+
|
||||
sighandler
|
||||
termsig_sighandler (sig)
|
||||
***************
|
||||
*** 533,536 ****
|
||||
--- 543,554 ----
|
||||
terminate_immediately = 1;
|
||||
|
||||
+ /* If we are currently handling a terminating signal, we have a couple of
|
||||
+ choices here. We can ignore this second terminating signal and let the
|
||||
+ shell exit from the first one, or we can exit immediately by killing
|
||||
+ the shell with this signal. This code implements the latter; to implement
|
||||
+ the former, replace the kill_shell(sig) with return. */
|
||||
+ if (handling_termsig)
|
||||
+ kill_shell (sig); /* just short-circuit now */
|
||||
+
|
||||
terminating_signal = sig;
|
||||
|
||||
***************
|
||||
*** 565,572 ****
|
||||
int sig;
|
||||
{
|
||||
- static int handling_termsig = 0;
|
||||
- int i, core;
|
||||
- sigset_t mask;
|
||||
-
|
||||
/* Simple semaphore to keep this function from being executed multiple
|
||||
times. Since we no longer are running as a signal handler, we don't
|
||||
--- 585,588 ----
|
||||
***************
|
||||
*** 574,578 ****
|
||||
if (handling_termsig)
|
||||
return;
|
||||
! handling_termsig = 1;
|
||||
terminating_signal = 0; /* keep macro from re-testing true. */
|
||||
|
||||
--- 590,595 ----
|
||||
if (handling_termsig)
|
||||
return;
|
||||
!
|
||||
! handling_termsig = terminating_signal; /* for termsig_sighandler */
|
||||
terminating_signal = 0; /* keep macro from re-testing true. */
|
||||
|
||||
***************
|
||||
*** 614,617 ****
|
||||
--- 631,644 ----
|
||||
run_exit_trap (); /* XXX - run exit trap possibly in signal context? */
|
||||
|
||||
+ kill_shell (sig);
|
||||
+ }
|
||||
+
|
||||
+ static void
|
||||
+ kill_shell (sig)
|
||||
+ int sig;
|
||||
+ {
|
||||
+ int i, core;
|
||||
+ sigset_t mask;
|
||||
+
|
||||
/* We don't change the set of blocked signals. If a user starts the shell
|
||||
with a terminating signal blocked, we won't get here (and if by some
|
||||
*** ../bash-5.2/patchlevel.h 2020-06-22 14:51:03.000000000 -0400
|
||||
--- patchlevel.h 2020-10-01 11:01:28.000000000 -0400
|
||||
***************
|
||||
*** 26,30 ****
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 13
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
--- 26,30 ----
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 14
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
@@ -0,0 +1,216 @@
|
||||
BASH PATCH REPORT
|
||||
=================
|
||||
|
||||
Bash-Release: 5.2
|
||||
Patch-ID: bash52-015
|
||||
|
||||
Bug-Reported-by: Frode Nordahl <frode.nordahl@canonical.com>
|
||||
Bug-Reference-ID: <20221119070714.351759-1-frode.nordahl@canonical.com>
|
||||
Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2022-11/msg00078.html
|
||||
|
||||
Bug-Description:
|
||||
|
||||
There are several cases where bash is too aggressive when optimizing out forks
|
||||
in subshells. For example, `eval' and traps should never be optimized.
|
||||
|
||||
Patch (apply with `patch -p0'):
|
||||
|
||||
*** ../bash-5.2-patched/builtins/common.h 2022-11-23 17:09:18.000000000 -0500
|
||||
--- builtins/common.h 2022-11-19 18:03:59.000000000 -0500
|
||||
***************
|
||||
*** 52,55 ****
|
||||
--- 52,56 ----
|
||||
#define SEVAL_ONECMD 0x100 /* only allow a single command */
|
||||
#define SEVAL_NOHISTEXP 0x200 /* inhibit history expansion */
|
||||
+ #define SEVAL_NOOPTIMIZE 0x400 /* don't try to set optimization flags */
|
||||
|
||||
/* Flags for describe_command, shared between type.def and command.def */
|
||||
*** ../bash-5.2-patched/builtins/evalstring.c 2022-11-05 17:27:44.000000000 -0400
|
||||
--- builtins/evalstring.c 2022-11-19 18:23:21.000000000 -0500
|
||||
***************
|
||||
*** 133,138 ****
|
||||
(command->value.Connection->connector == AND_AND || command->value.Connection->connector == OR_OR || command->value.Connection->connector == ';') &&
|
||||
(command->value.Connection->second->flags & CMD_TRY_OPTIMIZING) &&
|
||||
! ((startup_state == 2 && should_suppress_fork (command->value.Connection->second)) ||
|
||||
! ((subshell_environment & SUBSHELL_PAREN) && should_optimize_fork (command->value.Connection->second, 0))))
|
||||
{
|
||||
command->value.Connection->second->flags |= CMD_NO_FORK;
|
||||
--- 133,138 ----
|
||||
(command->value.Connection->connector == AND_AND || command->value.Connection->connector == OR_OR || command->value.Connection->connector == ';') &&
|
||||
(command->value.Connection->second->flags & CMD_TRY_OPTIMIZING) &&
|
||||
! (should_suppress_fork (command->value.Connection->second) ||
|
||||
! ((subshell_environment & SUBSHELL_PAREN) && should_optimize_fork (command->value.Connection->second, 0))))
|
||||
{
|
||||
command->value.Connection->second->flags |= CMD_NO_FORK;
|
||||
***************
|
||||
*** 291,294 ****
|
||||
--- 291,295 ----
|
||||
(flags & SEVAL_RESETLINE) -> reset line_number to 1
|
||||
(flags & SEVAL_NOHISTEXP) -> history_expansion_inhibited -> 1
|
||||
+ (flags & SEVAL_NOOPTIMIZE) -> don't try to turn on optimizing flags
|
||||
*/
|
||||
|
||||
***************
|
||||
*** 503,507 ****
|
||||
series of connection commands is
|
||||
command->value.Connection->second. */
|
||||
! else if (command->type == cm_connection && can_optimize_connection (command))
|
||||
{
|
||||
command->value.Connection->second->flags |= CMD_TRY_OPTIMIZING;
|
||||
--- 504,510 ----
|
||||
series of connection commands is
|
||||
command->value.Connection->second. */
|
||||
! else if (command->type == cm_connection &&
|
||||
! (flags & SEVAL_NOOPTIMIZE) == 0 &&
|
||||
! can_optimize_connection (command))
|
||||
{
|
||||
command->value.Connection->second->flags |= CMD_TRY_OPTIMIZING;
|
||||
*** ../bash-5.2-patched/builtins/eval.def 2016-01-25 13:28:37.000000000 -0500
|
||||
--- builtins/eval.def 2022-11-19 18:04:25.000000000 -0500
|
||||
***************
|
||||
*** 54,57 ****
|
||||
list = loptend; /* skip over possible `--' */
|
||||
|
||||
! return (list ? evalstring (string_list (list), "eval", SEVAL_NOHIST) : EXECUTION_SUCCESS);
|
||||
}
|
||||
--- 54,57 ----
|
||||
list = loptend; /* skip over possible `--' */
|
||||
|
||||
! return (list ? evalstring (string_list (list), "eval", SEVAL_NOHIST|SEVAL_NOOPTIMIZE) : EXECUTION_SUCCESS);
|
||||
}
|
||||
*** ../bash-5.2-patched/trap.c 2022-08-10 08:59:45.000000000 -0400
|
||||
--- trap.c 2022-12-12 10:57:51.000000000 -0500
|
||||
***************
|
||||
*** 305,308 ****
|
||||
--- 305,309 ----
|
||||
volatile int save_return_catch_flag, function_code;
|
||||
procenv_t save_return_catch;
|
||||
+ char *trap_command, *old_trap;
|
||||
#if defined (ARRAY_VARS)
|
||||
ARRAY *ps;
|
||||
***************
|
||||
*** 420,423 ****
|
||||
--- 421,427 ----
|
||||
else
|
||||
{
|
||||
+ old_trap = trap_list[sig];
|
||||
+ trap_command = savestring (old_trap);
|
||||
+
|
||||
save_parser_state (&pstate);
|
||||
save_subst_varlist = subst_assign_varlist;
|
||||
***************
|
||||
*** 442,446 ****
|
||||
|
||||
if (function_code == 0)
|
||||
! x = parse_and_execute (savestring (trap_list[sig]), "trap", SEVAL_NONINT|SEVAL_NOHIST|SEVAL_RESETLINE);
|
||||
else
|
||||
{
|
||||
--- 446,451 ----
|
||||
|
||||
if (function_code == 0)
|
||||
! /* XXX is x always last_command_exit_value? */
|
||||
! x = parse_and_execute (trap_command, "trap", SEVAL_NONINT|SEVAL_NOHIST|SEVAL_RESETLINE|SEVAL_NOOPTIMIZE);
|
||||
else
|
||||
{
|
||||
***************
|
||||
*** 1003,1007 ****
|
||||
{
|
||||
reset_parser ();
|
||||
! parse_and_execute (trap_command, "exit trap", SEVAL_NONINT|SEVAL_NOHIST|SEVAL_RESETLINE);
|
||||
}
|
||||
else if (code == ERREXIT)
|
||||
--- 1008,1012 ----
|
||||
{
|
||||
reset_parser ();
|
||||
! parse_and_execute (trap_command, "exit trap", SEVAL_NONINT|SEVAL_NOHIST|SEVAL_RESETLINE|SEVAL_NOOPTIMIZE);
|
||||
}
|
||||
else if (code == ERREXIT)
|
||||
***************
|
||||
*** 1110,1114 ****
|
||||
}
|
||||
|
||||
! flags = SEVAL_NONINT|SEVAL_NOHIST;
|
||||
if (sig != DEBUG_TRAP && sig != RETURN_TRAP && sig != ERROR_TRAP)
|
||||
flags |= SEVAL_RESETLINE;
|
||||
--- 1115,1119 ----
|
||||
}
|
||||
|
||||
! flags = SEVAL_NONINT|SEVAL_NOHIST|SEVAL_NOOPTIMIZE;
|
||||
if (sig != DEBUG_TRAP && sig != RETURN_TRAP && sig != ERROR_TRAP)
|
||||
flags |= SEVAL_RESETLINE;
|
||||
*** ../bash-5.2-patched/parse.y 2022-11-23 17:09:18.000000000 -0500
|
||||
--- parse.y 2022-11-19 18:15:34.000000000 -0500
|
||||
***************
|
||||
*** 2828,2832 ****
|
||||
last_lastarg = savestring (last_lastarg);
|
||||
|
||||
! parse_and_execute (savestring (command), vname, SEVAL_NONINT|SEVAL_NOHIST);
|
||||
|
||||
restore_parser_state (&ps);
|
||||
--- 2844,2848 ----
|
||||
last_lastarg = savestring (last_lastarg);
|
||||
|
||||
! parse_and_execute (savestring (command), vname, SEVAL_NONINT|SEVAL_NOHIST|SEVAL_NOOPTIMIZE);
|
||||
|
||||
restore_parser_state (&ps);
|
||||
*** ../bash-5.2-patched/jobs.c 2022-07-18 10:19:56.000000000 -0400
|
||||
--- jobs.c 2022-11-19 18:10:24.000000000 -0500
|
||||
***************
|
||||
*** 4221,4225 ****
|
||||
for (i = 0; i < nchild; i++)
|
||||
{
|
||||
! parse_and_execute (savestring (trap_command), "trap", SEVAL_NOHIST|SEVAL_RESETLINE);
|
||||
}
|
||||
|
||||
--- 4243,4247 ----
|
||||
for (i = 0; i < nchild; i++)
|
||||
{
|
||||
! parse_and_execute (savestring (trap_command), "trap", SEVAL_NOHIST|SEVAL_RESETLINE|SEVAL_NOOPTIMIZE);
|
||||
}
|
||||
|
||||
*** ../bash-5.2-patched/y.tab.c 2022-11-23 17:09:18.000000000 -0500
|
||||
--- y.tab.c 2022-11-23 17:21:17.000000000 -0500
|
||||
***************
|
||||
*** 5139,5143 ****
|
||||
last_lastarg = savestring (last_lastarg);
|
||||
|
||||
! parse_and_execute (savestring (command), vname, SEVAL_NONINT|SEVAL_NOHIST);
|
||||
|
||||
restore_parser_state (&ps);
|
||||
--- 5154,5158 ----
|
||||
last_lastarg = savestring (last_lastarg);
|
||||
|
||||
! parse_and_execute (savestring (command), vname, SEVAL_NONINT|SEVAL_NOHIST|SEVAL_NOOPTIMIZE);
|
||||
|
||||
restore_parser_state (&ps);
|
||||
*** ../bash-5.2-patched/execute_cmd.c 2022-11-05 17:27:41.000000000 -0400
|
||||
--- execute_cmd.c 2022-11-22 17:09:38.000000000 -0500
|
||||
***************
|
||||
*** 1655,1659 ****
|
||||
and set CMD_TRY_OPTIMIZING for simple commands on the right side of an
|
||||
and-or or `;' list to test for optimizing forks when they are executed. */
|
||||
! if (user_subshell && command->type == cm_subshell)
|
||||
optimize_subshell_command (command->value.Subshell->command);
|
||||
|
||||
--- 1665,1670 ----
|
||||
and set CMD_TRY_OPTIMIZING for simple commands on the right side of an
|
||||
and-or or `;' list to test for optimizing forks when they are executed. */
|
||||
! if (user_subshell && command->type == cm_subshell &&
|
||||
! (command->flags & (CMD_TIME_PIPELINE|CMD_INVERT_RETURN)) == 0)
|
||||
optimize_subshell_command (command->value.Subshell->command);
|
||||
|
||||
*** ../bash-5.2/patchlevel.h 2020-06-22 14:51:03.000000000 -0400
|
||||
--- patchlevel.h 2020-10-01 11:01:28.000000000 -0400
|
||||
***************
|
||||
*** 26,30 ****
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 14
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
--- 26,30 ----
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 15
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
+25
-11
@@ -12,24 +12,31 @@
|
||||
<IsA>app:console</IsA>
|
||||
<Summary>The standard GNU Bourne again shell</Summary>
|
||||
<Description>Bash is the GNU Project's Bourne Again SHell, a complete implementation of the IEEE POSIX and Open Group shell specification with interactive command line editing, csh-like features such as history substitution.</Description>
|
||||
<Archive sha1sum="dc46d863c0410d9252f8fc3d356e47809b4bc46d" type="targz">mirrors://gnu/bash/bash-5.1.16.tar.gz</Archive>
|
||||
<Archive sha1sum="a799460be16c01aeab492b9aa88f5eb7f35c1b9b" type="targz">mirrors://gnu/bash/bash-5.2.tar.gz</Archive>
|
||||
<BuildDependencies>
|
||||
<Dependency>ncurses-devel</Dependency>
|
||||
</BuildDependencies>
|
||||
<Patches>
|
||||
<!-- Official Patches -->
|
||||
|
||||
<!-- <Patch>official/bash51-001.patch</Patch>
|
||||
<Patch>official/bash51-002.patch</Patch>
|
||||
<Patch>official/bash51-003.patch</Patch>
|
||||
<Patch>official/bash51-004.patch</Patch>
|
||||
<Patch>official/bash51-005.patch</Patch>
|
||||
<Patch>official/bash51-006.patch</Patch>
|
||||
<Patch>official/bash51-007.patch</Patch>
|
||||
<Patch>official/bash51-008.patch</Patch>-->
|
||||
<Patch>official/bash52-001.patch</Patch>
|
||||
<Patch>official/bash52-002.patch</Patch>
|
||||
<Patch>official/bash52-003.patch</Patch>
|
||||
<Patch>official/bash52-004.patch</Patch>
|
||||
<Patch>official/bash52-005.patch</Patch>
|
||||
<Patch>official/bash52-006.patch</Patch>
|
||||
<Patch>official/bash52-007.patch</Patch>
|
||||
<Patch>official/bash52-008.patch</Patch>
|
||||
<Patch>official/bash52-009.patch</Patch>
|
||||
<Patch>official/bash52-010.patch</Patch>
|
||||
<Patch>official/bash52-011.patch</Patch>
|
||||
<Patch>official/bash52-012.patch</Patch>
|
||||
<Patch>official/bash52-013.patch</Patch>
|
||||
<Patch>official/bash52-014.patch</Patch>
|
||||
<Patch>official/bash52-015.patch</Patch>
|
||||
|
||||
<!-- Fedora patches -->
|
||||
<Patch level="1">fedora/bash-2.03-paths.patch</Patch>
|
||||
<!-- <Patch level="1">fedora/bash-2.03-paths.patch</Patch> -->
|
||||
<Patch level="1">fedora/bash-2.03-profile.patch</Patch>
|
||||
<Patch level="1">fedora/bash-2.05a-interpreter.patch</Patch>
|
||||
<Patch level="1">fedora/bash-2.05b-debuginfo.patch</Patch>
|
||||
@@ -47,7 +54,7 @@
|
||||
<Patch level="1">fedora/bash-4.3-memleak-lc_all.patch</Patch>
|
||||
<Patch level="1">fedora/bash-4.3-noecho.patch</Patch>
|
||||
<Patch level="1">fedora/bash-4.4-no-loadable-builtins.patch</Patch>
|
||||
<Patch level="1">fedora/bash-infotags.patch</Patch>
|
||||
<Patch level="1">fedora/bash-5.0-syslog-history.patch</Patch>
|
||||
<Patch level="1">fedora/bash-requires.patch</Patch>
|
||||
<Patch level="1">fedora/bash-setlocale.patch</Patch>
|
||||
<Patch level="1">fedora/bash-tty-tests.patch</Patch>
|
||||
@@ -76,6 +83,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="13">
|
||||
<Date>2022-12-15</Date>
|
||||
<Version>5.2.15</Version>
|
||||
<Comment>Version bump.</Comment>
|
||||
<Name>Mustafa Cinasal</Name>
|
||||
<Email>muscnsl@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="12">
|
||||
<Date>2022-05-05</Date>
|
||||
<Version>5.1.16</Version>
|
||||
|
||||
@@ -11,9 +11,10 @@
|
||||
<IsA>app:web</IsA>
|
||||
<Summary>Common CA certificates</Summary>
|
||||
<Description>Common CA certificates</Description>
|
||||
<Archive sha1sum="c9875aa16e42981c6975e59a11727539053e2299" type="tarxz">http://ftp.debian.org/debian/pool/main/c/ca-certificates/ca-certificates_20210119.tar.xz</Archive>
|
||||
<Archive sha1sum="bce5a8fac45456dbebf256f3a812c6cd0a853e3e" type="tarxz">http://ftp.debian.org/debian/pool/main/c/ca-certificates/ca-certificates_20211016.tar.xz</Archive>
|
||||
<BuildDependencies>
|
||||
<Dependency>python3</Dependency>
|
||||
<Dependency>python3-cryptography</Dependency>
|
||||
</BuildDependencies>
|
||||
<Patches>
|
||||
<!--Patch>ca-certificates-undebianize.patch</Patch>
|
||||
@@ -42,6 +43,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="8">
|
||||
<Date>2022-12-13</Date>
|
||||
<Version>20211016</Version>
|
||||
<Comment>Version bump.</Comment>
|
||||
<Name>Mustafa Cinasal</Name>
|
||||
<Email>muscnsl@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="7">
|
||||
<Date>2021-10-24</Date>
|
||||
<Version>20210119</Version>
|
||||
|
||||
@@ -13,6 +13,8 @@ def setup():
|
||||
--sbindir=/sbin \
|
||||
--libdir=/lib \
|
||||
--disable-rpath\
|
||||
--disable-asciidoc \
|
||||
--disable-ssh-token \
|
||||
--enable-python")
|
||||
|
||||
pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ")
|
||||
@@ -23,5 +25,4 @@ def build():
|
||||
def install():
|
||||
autotools.rawInstall("DESTDIR=%s" % get.installDIR())
|
||||
pisitools.domove("/lib/pkgconfig", "/usr/lib")
|
||||
pisitools.dodoc("ABOUT-NLS", "AUTHORS", "ChangeLog", "COPYING*",
|
||||
"FAQ", "README*", "NEWS", "TODO")
|
||||
pisitools.dodoc("ABOUT-NLS", "AUTHORS", "COPYING*", "README*")
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
<IsA>app:cli</IsA>
|
||||
<Summary>Userspace setup tool for transparent encryption of block devices using dm-crypt</Summary>
|
||||
<Description>Userspace setup tool for transparent encryption of block devices using dm-crypt</Description>
|
||||
<Archive sha1sum="004a2c185f8ea45f78b9a171c9b96850081d0ad8" type="tarxz">https://mirrors.edge.kernel.org/pub/linux/utils/cryptsetup/v2.3/cryptsetup-2.3.6.tar.xz</Archive>
|
||||
<Archive sha1sum="8098a06269c4268b0446b34f7b20e8fa6032e006" type="tarxz">https://mirrors.edge.kernel.org/pub/linux/utils/cryptsetup/v2.6/cryptsetup-2.6.0.tar.xz</Archive>
|
||||
<BuildDependencies>
|
||||
<Dependency versionFrom="2.02.186">device-mapper-devel</Dependency>
|
||||
<Dependency>libgpg-error-devel</Dependency>
|
||||
@@ -56,6 +56,7 @@
|
||||
<Dependency>json-c</Dependency>
|
||||
</RuntimeDependencies>
|
||||
<Files>
|
||||
<Path fileType="library">/lib/cryptsetup</Path>
|
||||
<Path fileType="library">/lib/libcryptsetup.so*</Path>
|
||||
</Files>
|
||||
</Package>
|
||||
@@ -87,6 +88,13 @@
|
||||
</Package>-->
|
||||
|
||||
<History>
|
||||
<Update release="13">
|
||||
<Date>2022-12-06</Date>
|
||||
<Version>2.6.0</Version>
|
||||
<Comment>Version bump.</Comment>
|
||||
<Name>Mustafa Cinasal</Name>
|
||||
<Email>muscnsl@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="12">
|
||||
<Date>2022-09-21</Date>
|
||||
<Version>2.3.6</Version>
|
||||
|
||||
@@ -67,6 +67,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="22">
|
||||
<Date>2022-11-25</Date>
|
||||
<Version>0.112</Version>
|
||||
<Comment>Rebuild.</Comment>
|
||||
<Name>Mustafa Cinasal</Name>
|
||||
<Email>muscnsl@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="21">
|
||||
<Date>2022-11-11</Date>
|
||||
<Version>0.112</Version>
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
diff -Nuar a/glib/gthreadprivate.h b/glib/gthreadprivate.h
|
||||
--- a/glib/gthreadprivate.h 2022-12-22 00:16:58.000000000 +0300
|
||||
+++ b/glib/gthreadprivate.h 2022-12-22 13:34:01.816585997 +0300
|
||||
@@ -44,6 +44,7 @@
|
||||
#include <linux/futex.h>
|
||||
#include <sys/syscall.h>
|
||||
#include <unistd.h>
|
||||
+#include <errno.h>
|
||||
|
||||
#ifndef FUTEX_WAIT_PRIVATE
|
||||
#define FUTEX_WAIT_PRIVATE FUTEX_WAIT
|
||||
@@ -1,8 +1,8 @@
|
||||
diff --git i/gio/tests/meson.build w/gio/tests/meson.build
|
||||
index 65f43e267..3bd66bf60 100644
|
||||
index 41d4e3e6c..9f8110884 100644
|
||||
--- i/gio/tests/meson.build
|
||||
+++ w/gio/tests/meson.build
|
||||
@@ -598,6 +598,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
|
||||
@@ -838,6 +838,7 @@ if meson.can_run_host_binaries()
|
||||
'-r',
|
||||
'-b','binary',
|
||||
'@INPUT@',
|
||||
@@ -10,3 +10,18 @@ index 65f43e267..3bd66bf60 100644
|
||||
'-o','@OUTPUT@'])
|
||||
|
||||
# Rename symbol to match the one in the C file
|
||||
diff --git i/glib/tests/meson.build w/glib/tests/meson.build
|
||||
index db01b54b4..42a852b2b 100644
|
||||
--- i/glib/tests/meson.build
|
||||
+++ w/glib/tests/meson.build
|
||||
@@ -126,7 +126,9 @@ glib_tests = {
|
||||
'thread-pool' : {},
|
||||
'thread-pool-slow' : {'suite' : ['slow']},
|
||||
'timeout' : {},
|
||||
- 'timer' : {},
|
||||
+ 'timer' : {
|
||||
+ 'suite' : ['flaky'],
|
||||
+ },
|
||||
'tree' : {},
|
||||
'types' : {},
|
||||
'utf8-performance' : {},
|
||||
|
||||
@@ -1,8 +1,17 @@
|
||||
diff --git i/gio/glib-compile-schemas.c w/gio/glib-compile-schemas.c
|
||||
index b8de0907248f6860..130f89b1728f7932 100644
|
||||
--- i/gio/glib-compile-schemas.c
|
||||
+++ w/gio/glib-compile-schemas.c
|
||||
@@ -1219,19 +1219,6 @@ parse_state_start_schema (ParseState *state,
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
|
||||
Date: Fri, 7 Jan 2022 18:59:10 +0000
|
||||
Subject: [PATCH] glib-compile-schemas: Remove noisy deprecation warnings
|
||||
|
||||
---
|
||||
gio/glib-compile-schemas.c | 13 -------------
|
||||
1 file changed, 13 deletions(-)
|
||||
|
||||
diff --git a/gio/glib-compile-schemas.c b/gio/glib-compile-schemas.c
|
||||
index 326658a88b35..f61d45b9a364 100644
|
||||
--- a/gio/glib-compile-schemas.c
|
||||
+++ b/gio/glib-compile-schemas.c
|
||||
@@ -1234,19 +1234,6 @@ parse_state_start_schema (ParseState *state,
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
<IsA>library</IsA>
|
||||
<Summary>A library of handy utility functions</Summary>
|
||||
<Description>glib2 is the low-level core library that forms the basis for projects such as GTK+ and GNOME. It provides data structure handling for C, portability wrappers, and interfaces for such runtime functionality as an event loop, threads, dynamic loading, and an object system.</Description>
|
||||
<Archive sha1sum="91150e0471ebe3d37ba47f3ce74354812a202a84" type="tarxz">mirrors://gnome/glib/2.74/glib-2.74.1.tar.xz</Archive>
|
||||
<Archive sha1sum="8d1b033c9144f59330af6d8670bfe55595ecf2db" type="tarxz">mirrors://gnome/glib/2.74/glib-2.74.4.tar.xz</Archive>
|
||||
<BuildDependencies>
|
||||
<Dependency>meson</Dependency>
|
||||
<Dependency>ninja</Dependency>
|
||||
@@ -27,6 +27,7 @@
|
||||
<Patches>
|
||||
<Patch level="1">noisy-glib-compile-schemas.diff</Patch>
|
||||
<Patch level="1">glib-2.68.2-skip_warnings-1.patch</Patch>
|
||||
<Patch level="1">glib2.patch</Patch>
|
||||
</Patches>
|
||||
<AdditionalFiles>
|
||||
<AdditionalFile target="multilib.diff" permission="0644">multilib.diff</AdditionalFile>
|
||||
@@ -140,6 +141,20 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="27">
|
||||
<Date>2022-12-22</Date>
|
||||
<Version>2.74.4</Version>
|
||||
<Comment>Version bump.</Comment>
|
||||
<Name>Mustafa Cinasal</Name>
|
||||
<Email>muscnsl@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="26">
|
||||
<Date>2022-11-25</Date>
|
||||
<Version>2.74.2</Version>
|
||||
<Comment>Version bump.</Comment>
|
||||
<Name>Mustafa Cinasal</Name>
|
||||
<Email>muscnsl@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="25">
|
||||
<Date>2022-10-31</Date>
|
||||
<Version>2.74.1</Version>
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
<IsA>app:console</IsA>
|
||||
<Summary>GNU utility to convert program --help output to a man page</Summary>
|
||||
<Description>Help2man is a tool which generate man page from help text of programs.</Description>
|
||||
<Archive sha1sum="f0fa13494220bfcd902f2e2954ac34a0e3bad47a" type="tarxz">http://ftp.gnu.org/gnu/help2man/help2man-1.47.16.tar.xz</Archive>
|
||||
<Archive sha1sum="eec547bc2832d47a23437b680232339862d8ca4c" type="tarxz">http://ftp.gnu.org/gnu/help2man/help2man-1.47.3.tar.xz</Archive>
|
||||
<BuildDependencies>
|
||||
<Dependency>perl-Locale-gettext</Dependency>
|
||||
</BuildDependencies>
|
||||
@@ -37,6 +37,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="7">
|
||||
<Date>2022-12-16</Date>
|
||||
<Version>1.47.3</Version>
|
||||
<Comment>Version bump.</Comment>
|
||||
<Name>Mustafa Cinasal</Name>
|
||||
<Email>muscnsl@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="6">
|
||||
<Date>2020-12-09</Date>
|
||||
<Version>1.47.16</Version>
|
||||
|
||||
@@ -1,43 +0,0 @@
|
||||
From e92efc63acd7b377faa9e534f4bf52aaa86be2a9 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
Date: Tue, 27 Jul 2021 11:46:19 +1000
|
||||
Subject: [PATCH libX11] makekeys: handle the new _EVDEVK xorgproto symbols
|
||||
|
||||
These keys are all defined through a macro in the form:
|
||||
#define XF86XK_BrightnessAuto _EVDEVK(0x0F4)
|
||||
|
||||
The _EVDEVK macro is simply an offset of 0x10081000.
|
||||
Let's parse these lines correctly so those keysyms end up in our
|
||||
hashtables.
|
||||
|
||||
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
---
|
||||
src/util/makekeys.c | 12 ++++++++++++
|
||||
1 file changed, 12 insertions(+)
|
||||
|
||||
diff --git a/src/util/makekeys.c b/src/util/makekeys.c
|
||||
index e847ef4c..4896cc53 100644
|
||||
--- a/src/util/makekeys.c
|
||||
+++ b/src/util/makekeys.c
|
||||
@@ -78,6 +78,18 @@ parse_line(const char *buf, char *key, KeySym *val, char *prefix)
|
||||
return 1;
|
||||
}
|
||||
|
||||
+ /* See if we can parse one of the _EVDEVK symbols */
|
||||
+ i = sscanf(buf, "#define %127s _EVDEVK(0x%lx)", key, val);
|
||||
+ if (i == 2 && (tmp = strstr(key, "XK_"))) {
|
||||
+ memcpy(prefix, key, (size_t)(tmp - key));
|
||||
+ prefix[tmp - key] = '\0';
|
||||
+ tmp += 3;
|
||||
+ memmove(key, tmp, strlen(tmp) + 1);
|
||||
+
|
||||
+ *val += 0x10081000;
|
||||
+ return 1;
|
||||
+ }
|
||||
+
|
||||
/* Now try to catch alias (XK_foo XK_bar) definitions, and resolve them
|
||||
* immediately: if the target is in the form XF86XK_foo, we need to
|
||||
* canonicalise this to XF86foo before we do the lookup. */
|
||||
--
|
||||
2.31.1
|
||||
|
||||
@@ -0,0 +1,189 @@
|
||||
diff --git a/include/X11/Xlibint.h b/include/X11/Xlibint.h
|
||||
index e20c4833c16c6d3518e4b7feb9bdbc606584bfcc..b570bd01c657f4d86f06b414a43e96da4319f729 100644
|
||||
--- a/include/X11/Xlibint.h
|
||||
+++ b/include/X11/Xlibint.h
|
||||
@@ -43,6 +43,10 @@ from The Open Group.
|
||||
#include <X11/Xproto.h> /* to declare xEvent */
|
||||
#include <X11/XlibConf.h> /* for configured options like XTHREADS */
|
||||
|
||||
+#ifdef XTHREADS
|
||||
+#include <X11/Xthreads.h>
|
||||
+#endif
|
||||
+
|
||||
/* The Xlib structs are full of implicit padding to properly align members.
|
||||
We can't clean that up without breaking ABI, so tell clang not to bother
|
||||
complaining about it. */
|
||||
@@ -207,7 +211,10 @@ struct _XDisplay
|
||||
|
||||
XIOErrorExitHandler exit_handler;
|
||||
void *exit_handler_data;
|
||||
- CARD32 in_ifevent;
|
||||
+ CARD32 in_ifevent;
|
||||
+#ifdef XTHREADS
|
||||
+ xthread_t ifevent_thread;
|
||||
+#endif
|
||||
};
|
||||
|
||||
#define XAllocIDs(dpy,ids,n) (*(dpy)->idlist_alloc)(dpy,ids,n)
|
||||
diff --git a/src/ChkIfEv.c b/src/ChkIfEv.c
|
||||
index b32c2d3ebcb1aad0e704a3e5dce52dc31971afd2..666366966a0e81bf413a64e015a84da1fcf5cdf0 100644
|
||||
--- a/src/ChkIfEv.c
|
||||
+++ b/src/ChkIfEv.c
|
||||
@@ -49,8 +49,11 @@ Bool XCheckIfEvent (
|
||||
unsigned long qe_serial = 0;
|
||||
int n; /* time through count */
|
||||
|
||||
- dpy->in_ifevent++;
|
||||
LockDisplay(dpy);
|
||||
+#ifdef XTHREADS
|
||||
+ dpy->ifevent_thread = xthread_self();
|
||||
+#endif
|
||||
+ dpy->in_ifevent++;
|
||||
prev = NULL;
|
||||
for (n = 3; --n >= 0;) {
|
||||
for (qelt = prev ? prev->next : dpy->head;
|
||||
diff --git a/src/IfEvent.c b/src/IfEvent.c
|
||||
index 54c37f0031b27f3d7eb629ec2ea16b615b29e734..35c592e3a54d89f1d2ac1efa40c43a04eab1c0c5 100644
|
||||
--- a/src/IfEvent.c
|
||||
+++ b/src/IfEvent.c
|
||||
@@ -48,8 +48,11 @@ XIfEvent (
|
||||
register _XQEvent *qelt, *prev;
|
||||
unsigned long qe_serial = 0;
|
||||
|
||||
- dpy->in_ifevent++;
|
||||
LockDisplay(dpy);
|
||||
+#ifdef XTHREADS
|
||||
+ dpy->ifevent_thread = xthread_self();
|
||||
+#endif
|
||||
+ dpy->in_ifevent++;
|
||||
prev = NULL;
|
||||
while (1) {
|
||||
for (qelt = prev ? prev->next : dpy->head;
|
||||
diff --git a/src/PeekIfEv.c b/src/PeekIfEv.c
|
||||
index 68c028b70705968c6757c1e70a238886a94adecb..754749a77c0835c0ba3c1aa6edded15dab7fb478 100644
|
||||
--- a/src/PeekIfEv.c
|
||||
+++ b/src/PeekIfEv.c
|
||||
@@ -49,8 +49,11 @@ XPeekIfEvent (
|
||||
register _XQEvent *prev, *qelt;
|
||||
unsigned long qe_serial = 0;
|
||||
|
||||
- dpy->in_ifevent++;
|
||||
LockDisplay(dpy);
|
||||
+#ifdef XTHREADS
|
||||
+ dpy->ifevent_thread = xthread_self();
|
||||
+#endif
|
||||
+ dpy->in_ifevent++;
|
||||
prev = NULL;
|
||||
while (1) {
|
||||
for (qelt = prev ? prev->next : dpy->head;
|
||||
diff --git a/src/locking.c b/src/locking.c
|
||||
index c550603e1f5d0601af3fa19c0b8486ef5b1bc30f..642cf9894268dfbbb79a104b42b4097cfd293d82 100644
|
||||
--- a/src/locking.c
|
||||
+++ b/src/locking.c
|
||||
@@ -240,7 +240,9 @@ static void _XUnlockDisplay(
|
||||
if (lock_hist_loc >= LOCK_HIST_SIZE)
|
||||
lock_hist_loc = 0;
|
||||
#endif /* XTHREADS_WARN */
|
||||
- xmutex_unlock(dpy->lock->mutex);
|
||||
+
|
||||
+ if (dpy->in_ifevent == 0 || dpy->ifevent_thread != xthread_self())
|
||||
+ xmutex_unlock(dpy->lock->mutex);
|
||||
}
|
||||
|
||||
|
||||
@@ -453,63 +455,24 @@ static void _XDisplayLockWait(
|
||||
}
|
||||
|
||||
static void _XLockDisplay(
|
||||
- Display *dpy
|
||||
- XTHREADS_FILE_LINE_ARGS
|
||||
- );
|
||||
-
|
||||
-static void _XIfEventLockDisplay(
|
||||
Display *dpy
|
||||
XTHREADS_FILE_LINE_ARGS
|
||||
)
|
||||
{
|
||||
- /* assert(dpy->in_ifevent); */
|
||||
-}
|
||||
+ struct _XErrorThreadInfo *ti;
|
||||
|
||||
-static void _XInternalLockDisplay(
|
||||
- Display *dpy,
|
||||
- Bool wskip
|
||||
- XTHREADS_FILE_LINE_ARGS
|
||||
- );
|
||||
+ if (dpy->in_ifevent && dpy->ifevent_thread == xthread_self())
|
||||
+ return;
|
||||
|
||||
-static void _XIfEventInternalLockDisplay(
|
||||
- Display *dpy,
|
||||
- Bool wskip
|
||||
- XTHREADS_FILE_LINE_ARGS
|
||||
- )
|
||||
-{
|
||||
- /* assert(dpy->in_ifevent); */
|
||||
-}
|
||||
-
|
||||
-static void _XIfEventUnlockDisplay(
|
||||
- Display *dpy
|
||||
- XTHREADS_FILE_LINE_ARGS
|
||||
- )
|
||||
-{
|
||||
- if (dpy->in_ifevent == 0) {
|
||||
- dpy->lock_fns->lock_display = _XLockDisplay;
|
||||
- dpy->lock_fns->unlock_display = _XUnlockDisplay;
|
||||
- dpy->lock->internal_lock_display = _XInternalLockDisplay;
|
||||
- UnlockDisplay(dpy);
|
||||
- } else
|
||||
- return;
|
||||
-}
|
||||
-
|
||||
-static void _XLockDisplay(
|
||||
- Display *dpy
|
||||
- XTHREADS_FILE_LINE_ARGS
|
||||
- )
|
||||
-{
|
||||
-#ifdef XTHREADS
|
||||
- struct _XErrorThreadInfo *ti;
|
||||
-#endif
|
||||
#ifdef XTHREADS_WARN
|
||||
_XLockDisplayWarn(dpy, file, line);
|
||||
#else
|
||||
xmutex_lock(dpy->lock->mutex);
|
||||
#endif
|
||||
+
|
||||
if (dpy->lock->locking_level > 0)
|
||||
- _XDisplayLockWait(dpy);
|
||||
-#ifdef XTHREADS
|
||||
+ _XDisplayLockWait(dpy);
|
||||
+
|
||||
/*
|
||||
* Skip the two function calls below which may generate requests
|
||||
* when LockDisplay is called from within _XError.
|
||||
@@ -517,14 +480,9 @@ static void _XLockDisplay(
|
||||
for (ti = dpy->error_threads; ti; ti = ti->next)
|
||||
if (ti->error_thread == xthread_self())
|
||||
return;
|
||||
-#endif
|
||||
+
|
||||
_XIDHandler(dpy);
|
||||
_XSeqSyncFunction(dpy);
|
||||
- if (dpy->in_ifevent) {
|
||||
- dpy->lock_fns->lock_display = _XIfEventLockDisplay;
|
||||
- dpy->lock_fns->unlock_display = _XIfEventUnlockDisplay;
|
||||
- dpy->lock->internal_lock_display = _XIfEventInternalLockDisplay;
|
||||
- }
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -537,6 +495,9 @@ static void _XInternalLockDisplay(
|
||||
XTHREADS_FILE_LINE_ARGS
|
||||
)
|
||||
{
|
||||
+ if (dpy->in_ifevent && dpy->ifevent_thread == xthread_self())
|
||||
+ return;
|
||||
+
|
||||
#ifdef XTHREADS_WARN
|
||||
_XLockDisplayWarn(dpy, file, line);
|
||||
#else
|
||||
@@ -0,0 +1,32 @@
|
||||
diff --git a/src/PutBEvent.c b/src/PutBEvent.c
|
||||
index f7b74b31deeba41a47816a53bbccf5319810ffb3..b8273e1adca11f6a7cee0199729a0908c2888937 100644
|
||||
--- a/src/PutBEvent.c
|
||||
+++ b/src/PutBEvent.c
|
||||
@@ -85,15 +85,20 @@ XPutBackEvent (
|
||||
int type = event->type & 0177;
|
||||
|
||||
LockDisplay(dpy);
|
||||
- fp = dpy->wire_vec[type];
|
||||
- if (fp == NULL)
|
||||
- fp = _XEventToWire;
|
||||
- ret = (*fp)(dpy, event, &wire);
|
||||
- if (ret)
|
||||
+ if (type == GenericEvent)
|
||||
+ ret = _XPutBackEvent(dpy, event);
|
||||
+ else
|
||||
{
|
||||
- ret = (*dpy->event_vec[type])(dpy, &lib, &wire);
|
||||
+ fp = dpy->wire_vec[type];
|
||||
+ if (fp == NULL)
|
||||
+ fp = _XEventToWire;
|
||||
+ ret = (*fp)(dpy, event, &wire);
|
||||
if (ret)
|
||||
- ret = _XPutBackEvent(dpy, &lib);
|
||||
+ {
|
||||
+ ret = (*dpy->event_vec[type])(dpy, &lib, &wire);
|
||||
+ if (ret)
|
||||
+ ret = _XPutBackEvent(dpy, &lib);
|
||||
+ }
|
||||
}
|
||||
UnlockDisplay(dpy);
|
||||
return ret;
|
||||
@@ -1,12 +0,0 @@
|
||||
diff -Naur libX11-1.3.5//src/xlibi18n/ICWrap.c libX11-1.3.5.tpg//src/xlibi18n/ICWrap.c
|
||||
--- libX11-1.3.5//src/xlibi18n/ICWrap.c 2010-08-10 04:59:44.000000000 +0000
|
||||
+++ libX11-1.3.5.tpg//src/xlibi18n/ICWrap.c 2010-09-17 17:11:21.000000000 +0000
|
||||
@@ -283,7 +283,7 @@
|
||||
XIMArg *args;
|
||||
char *ret;
|
||||
|
||||
- if (!ic->core.im)
|
||||
+ if (!ic || !ic->core.im)
|
||||
return (char *) NULL;
|
||||
|
||||
/*
|
||||
@@ -1,50 +0,0 @@
|
||||
Index: libX11-1.4.99.1/src/Xrm.c
|
||||
===================================================================
|
||||
--- libX11-1.4.99.1.orig/src/Xrm.c
|
||||
+++ libX11-1.4.99.1/src/Xrm.c
|
||||
@@ -2540,30 +2540,40 @@ Bool XrmQGetResource(
|
||||
VClosureRec closure;
|
||||
|
||||
if (db && *names) {
|
||||
- _XLockMutex(&db->linfo);
|
||||
+ if ((_XLockMutex_fn) && db->linfo.lock ) {
|
||||
+ _XLockMutex(&db->linfo);
|
||||
+ }
|
||||
closure.type = pType;
|
||||
closure.value = pValue;
|
||||
table = db->table;
|
||||
if (names[1]) {
|
||||
if (table && !table->leaf) {
|
||||
if (GetNEntry(table, names, classes, &closure)) {
|
||||
- _XUnlockMutex(&db->linfo);
|
||||
+ if ((_XUnlockMutex_fn) && db->linfo.lock ) {
|
||||
+ _XUnlockMutex(&db->linfo);
|
||||
+ }
|
||||
return True;
|
||||
}
|
||||
} else if (table && table->hasloose &&
|
||||
GetLooseVEntry((LTable)table, names, classes, &closure)) {
|
||||
- _XUnlockMutex (&db->linfo);
|
||||
+ if ((_XUnlockMutex_fn) && db->linfo.lock ) {
|
||||
+ _XUnlockMutex (&db->linfo);
|
||||
+ }
|
||||
return True;
|
||||
}
|
||||
} else {
|
||||
if (table && !table->leaf)
|
||||
table = table->next;
|
||||
if (table && GetVEntry((LTable)table, names, classes, &closure)) {
|
||||
- _XUnlockMutex(&db->linfo);
|
||||
+ if ((_XUnlockMutex_fn) && db->linfo.lock ) {
|
||||
+ _XUnlockMutex(&db->linfo);
|
||||
+ }
|
||||
return True;
|
||||
}
|
||||
}
|
||||
- _XUnlockMutex(&db->linfo);
|
||||
+ if ((_XUnlockMutex_fn) && db->linfo.lock ) {
|
||||
+ _XUnlockMutex(&db->linfo);
|
||||
+ }
|
||||
}
|
||||
*pType = NULLQUARK;
|
||||
pValue->addr = (XPointer)NULL;
|
||||
@@ -1,27 +0,0 @@
|
||||
From 5dcb40f28d59587597d2ff6e6ac64c71cfe6ff7b Mon Sep 17 00:00:00 2001
|
||||
From: James Cloos <cloos@jhcloos.com>
|
||||
Date: Tue, 17 Sep 2013 16:50:42 +0000
|
||||
Subject: nls/en_US.UTF-8/Compose.pre: Fix typo.
|
||||
|
||||
Fix typo added in 215ce6a67863, s/actute/acute/.
|
||||
|
||||
Fixes bug #69476. Reported by Jean Krohn.
|
||||
|
||||
Signed-off-by: James Cloos <cloos@jhcloos.com>
|
||||
---
|
||||
diff --git a/nls/en_US.UTF-8/Compose.pre b/nls/en_US.UTF-8/Compose.pre
|
||||
index a741332..7314d7f 100644
|
||||
--- a/nls/en_US.UTF-8/Compose.pre
|
||||
+++ b/nls/en_US.UTF-8/Compose.pre
|
||||
@@ -743,7 +743,7 @@ XCOMM Part 3
|
||||
<Multi_key> <i> <quotedbl> : "ï" idiaeresis # LATIN SMALL LETTER I WITH DIAERESIS
|
||||
<Multi_key> <diaeresis> <i> : "ï" idiaeresis # LATIN SMALL LETTER I WITH DIAERESIS
|
||||
<Multi_key> <i> <diaeresis> : "ï" idiaeresis # LATIN SMALL LETTER I WITH DIAERESIS
|
||||
-<dead_actute> <j> : "j́" # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301
|
||||
+<dead_acute> <j> : "j́" # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301
|
||||
<Multi_key> <apostrophe> <j> : "j́" # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301
|
||||
<Multi_key> <j> <apostrophe> : "j́" # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301
|
||||
<Multi_key> <acute> <j> : "j́" # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301
|
||||
--
|
||||
cgit v0.9.0.2-2-gbebe
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
<IsA>library</IsA>
|
||||
<Summary>X.Org X11 library</Summary>
|
||||
<Description>Core X11 protocol client library.</Description>
|
||||
<Archive sha1sum="608e379a6ac24e1c16eed140d33c35e5fc0b2ed2" type="tarxz">mirrors://xorg/individual/lib/libX11-1.8.2.tar.xz</Archive>
|
||||
<Archive sha1sum="00f2f25174d2a02cd250e5a0aa9551c79e25e541" type="tarxz">mirrors://xorg/individual/lib/libX11-1.8.3.tar.xz</Archive>
|
||||
<BuildDependencies>
|
||||
<Dependency>libxcb-devel</Dependency>
|
||||
<Dependency>xorg-proto</Dependency>
|
||||
@@ -22,9 +22,8 @@
|
||||
<Dependency>xmlto</Dependency>
|
||||
</BuildDependencies>
|
||||
<Patches>
|
||||
<!--<Patch level="1">fix_typo.diff</Patch>
|
||||
<Patch level="1">fix-segfault.diff</Patch>-->
|
||||
<!-- <Patch level="1">0001-makekeys-handle-the-new-_EVDEVK-xorgproto-symbols.patch</Patch> -->
|
||||
<Patch level="1">176.diff</Patch>
|
||||
<Patch level="1">177.diff</Patch>
|
||||
</Patches>
|
||||
</Source>
|
||||
|
||||
@@ -76,6 +75,20 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="24">
|
||||
<Date>2022-12-19</Date>
|
||||
<Version>1.8.3</Version>
|
||||
<Comment>Rebuild</Comment>
|
||||
<Name>Mustafa Cinasal</Name>
|
||||
<Email>muscnsl@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="23">
|
||||
<Date>2022-12-16</Date>
|
||||
<Version>1.8.3</Version>
|
||||
<Comment>Version bump.</Comment>
|
||||
<Name>Mustafa Cinasal</Name>
|
||||
<Email>muscnsl@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="22">
|
||||
<Date>2022-11-11</Date>
|
||||
<Version>1.8.2</Version>
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
<IsA>library</IsA>
|
||||
<Summary>X.Org Au library</Summary>
|
||||
<Description>libXau provides functions to manage X authorization files</Description>
|
||||
<Archive sha1sum="fbfef1a4abe2f1d3aa3d8e2252b65f5824627138" type="tarxz">http://xorg.freedesktop.org/archive/individual/lib/libXau-1.0.10.tar.xz</Archive>
|
||||
<Archive sha1sum="0cf6d853fce4dc72d61c253d096408a313f1163b" type="tarxz">http://xorg.freedesktop.org/archive/individual/lib/libXau-1.0.11.tar.xz</Archive>
|
||||
<Patches>
|
||||
<Patch level="1">visibility.patch</Patch>
|
||||
</Patches>
|
||||
@@ -61,6 +61,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="10">
|
||||
<Date>2022-12-08</Date>
|
||||
<Version>1.0.11</Version>
|
||||
<Comment>Version bump.</Comment>
|
||||
<Name>Mustafa Cinasal</Name>
|
||||
<Email>muscnsl@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="9">
|
||||
<Date>2022-09-06</Date>
|
||||
<Version>1.0.10</Version>
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
<IsA>library</IsA>
|
||||
<Summary>X.Org Xdmcp library</Summary>
|
||||
<Description>LibXdmcp is the X Display Manager Control Protocol library.</Description>
|
||||
<Archive sha1sum="0a8f8a274f829331efb1e8e2027c38631b204dd0" type="tarbz2">http://xorg.freedesktop.org/archive/individual/lib/libXdmcp-1.1.3.tar.bz2</Archive>
|
||||
<Archive sha1sum="38964405cb1e14f57dcaede1fc213155a664b2ab" type="tarxz">http://xorg.freedesktop.org/archive/individual/lib/libXdmcp-1.1.4.tar.xz</Archive>
|
||||
<BuildDependencies>
|
||||
<Dependency>libxslt</Dependency>
|
||||
<Dependency>util-macros</Dependency>
|
||||
@@ -53,11 +53,11 @@
|
||||
<Summary>32-bit shared libraries for libXdmcp</Summary>
|
||||
<BuildType>emul32</BuildType>
|
||||
<BuildDependencies>
|
||||
|
||||
<Dependency>libbsd-32bit</Dependency>
|
||||
</BuildDependencies>
|
||||
<RuntimeDependencies>
|
||||
<Dependency release="current">libXdmcp</Dependency>
|
||||
|
||||
<Dependency>libbsd-32bit</Dependency>
|
||||
</RuntimeDependencies>
|
||||
<Files>
|
||||
<Path fileType="library">/usr/lib32</Path>
|
||||
@@ -65,6 +65,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="9">
|
||||
<Date>2022-11-19</Date>
|
||||
<Version>1.1.4</Version>
|
||||
<Comment>Version bump.</Comment>
|
||||
<Name>Mustafa Cinasal</Name>
|
||||
<Email>muscnsl@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="8">
|
||||
<Date>2020-12-09</Date>
|
||||
<Version>1.1.3</Version>
|
||||
|
||||
@@ -13,17 +13,40 @@
|
||||
<IsA>library</IsA>
|
||||
<Summary>Provides useful functions commonly found on BSD systems</Summary>
|
||||
<Description>This library provides useful functions commonly found on BSD systems, and lacking on others like GNU systems, thus making it easier to port projects with strong BSD origins, without needing to embed the same code over and over again on each project.</Description>
|
||||
<Archive sha1sum="9cb8f0b717da13c8aa13b9f3f5f8105ee6e5ccb5" type="tarxz">https://libbsd.freedesktop.org/releases/libbsd-0.10.0.tar.xz</Archive>
|
||||
<Archive sha1sum="e5f5fffcc2094661a105074c1538f1e434990490" type="tarxz">https://libbsd.freedesktop.org/releases/libbsd-0.11.7.tar.xz</Archive>
|
||||
<BuildDependencies>
|
||||
<Dependency>libmd-devel</Dependency>
|
||||
</BuildDependencies>
|
||||
</Source>
|
||||
|
||||
<Package>
|
||||
<Name>libbsd</Name>
|
||||
<RuntimeDependencies>
|
||||
<Dependency>libmd</Dependency>
|
||||
</RuntimeDependencies>
|
||||
<Files>
|
||||
<Path fileType="library">/usr/lib</Path>
|
||||
<Path fileType="doc">/usr/share/doc</Path>
|
||||
</Files>
|
||||
</Package>
|
||||
|
||||
<Package>
|
||||
<Name>libbsd-32bit</Name>
|
||||
<PartOf>emul32</PartOf>
|
||||
<Summary>32-bit shared libraries for libbsd</Summary>
|
||||
<BuildType>emul32</BuildType>
|
||||
<BuildDependencies>
|
||||
<Dependency>libmd-32bit</Dependency>
|
||||
</BuildDependencies>
|
||||
<RuntimeDependencies>
|
||||
<Dependency>libmd-32bit</Dependency>
|
||||
<Dependency release="current">libbsd</Dependency>
|
||||
</RuntimeDependencies>
|
||||
<Files>
|
||||
<Path fileType="library">/usr/lib32</Path>
|
||||
</Files>
|
||||
</Package>
|
||||
|
||||
<Package>
|
||||
<Name>libbsd-devel</Name>
|
||||
<Summary>Development files for libbsd</Summary>
|
||||
@@ -33,12 +56,27 @@
|
||||
<Files>
|
||||
<Path fileType="header">/usr/include</Path>
|
||||
<Path fileType="data">/usr/lib/pkgconfig</Path>
|
||||
<Path fileType="data">/usr/lib32/pkgconfig</Path>
|
||||
<Path fileType="man">/usr/share/man/man3</Path>
|
||||
<Path fileType="man">/usr/share/man/man7</Path>
|
||||
</Files>
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="9">
|
||||
<Date>2022-12-04</Date>
|
||||
<Version>0.11.7</Version>
|
||||
<Comment>Version bump.</Comment>
|
||||
<Name>Mustafa Cinasal</Name>
|
||||
<Email>muscnsl@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="8">
|
||||
<Date>2022-11-22</Date>
|
||||
<Version>0.10.0</Version>
|
||||
<Comment>Rebuild.</Comment>
|
||||
<Name>Pisi Linux Community</Name>
|
||||
<Email>admin@pisilinux.org</Email>
|
||||
</Update>
|
||||
<Update release="7">
|
||||
<Date>2020-12-09</Date>
|
||||
<Version>0.10.0</Version>
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
<IsA>library</IsA>
|
||||
<Summary>Library for error values used by GnuPG components</Summary>
|
||||
<Description>libgpg-error is a library that defines common error values for all GnuPG components.</Description>
|
||||
<Archive sha1sum="5e620d71fc24d287a7ac2460b1d819074bb8b9bb" type="tarbz2">https://www.gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.42.tar.bz2</Archive>
|
||||
<Archive sha1sum="a6e5efdd72e848aab4064e5ef4c6835ba344bcf1" type="tarbz2">https://www.gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.46.tar.bz2</Archive>
|
||||
</Source>
|
||||
|
||||
<Package>
|
||||
@@ -61,6 +61,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="11">
|
||||
<Date>2022-12-20</Date>
|
||||
<Version>1.46</Version>
|
||||
<Comment>Version bump.</Comment>
|
||||
<Name>Mustafa Cinasal</Name>
|
||||
<Email>muscnsl@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="10">
|
||||
<Date>2021-05-28</Date>
|
||||
<Version>1.42</Version>
|
||||
|
||||
@@ -0,0 +1,20 @@
|
||||
#!/usr/bin/env python
|
||||
# -*- coding: utf-8 -*-
|
||||
#
|
||||
# Licensed under the GNU General Public License, version 3.
|
||||
# See the file http://www.gnu.org/licenses/gpl.txt
|
||||
|
||||
from pisi.actionsapi import autotools
|
||||
from pisi.actionsapi import pisitools
|
||||
from pisi.actionsapi import get
|
||||
|
||||
def setup():
|
||||
autotools.configure(" --enable-static=no")
|
||||
|
||||
def build():
|
||||
autotools.make()
|
||||
|
||||
def install():
|
||||
autotools.rawInstall("DESTDIR=%s" % get.installDIR())
|
||||
|
||||
pisitools.dodoc("ChangeLog", "COPYING", "README*")
|
||||
@@ -0,0 +1,71 @@
|
||||
<?xml version="1.0" ?>
|
||||
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
|
||||
<PISI>
|
||||
<Source>
|
||||
<Name>libmd</Name>
|
||||
<Homepage>https://www.hadrons.org/software/libmd/</Homepage>
|
||||
<Packager>
|
||||
<Name>PisiLinux Community</Name>
|
||||
<Email>admins@pisilinux.org</Email>
|
||||
</Packager>
|
||||
<License>BSD</License>
|
||||
<IsA>library</IsA>
|
||||
<Summary>Message Digest functions from BSD systems</Summary>
|
||||
<Icon>libmd</Icon>
|
||||
<Description>Message Digest functions from BSD systems</Description>
|
||||
<Archive sha1sum="c412a6cb3792e00927127b85cb99b46f493eecce" type="tarxz">https://libbsd.freedesktop.org/releases/libmd-1.0.4.tar.xz</Archive>
|
||||
<!--
|
||||
<Patches>
|
||||
<Patch>libmd.patch</Patch>
|
||||
<Patch level="1">libmd.patch</Patch>
|
||||
</Patches>
|
||||
-->
|
||||
</Source>
|
||||
|
||||
<Package>
|
||||
<Name>libmd</Name>
|
||||
<Files>
|
||||
<Path fileType="library">/usr/lib</Path>
|
||||
<Path fileType="data">/usr/share</Path>
|
||||
<Path fileType="localedata">/usr/share/locale</Path>
|
||||
<Path fileType="man">/usr/share/man</Path>
|
||||
<Path fileType="doc">/usr/share/doc</Path>
|
||||
</Files>
|
||||
</Package>
|
||||
|
||||
<Package>
|
||||
<Name>libmd-32bit</Name>
|
||||
<PartOf>emul32</PartOf>
|
||||
<Summary>32-bit shared libraries for libmd</Summary>
|
||||
<BuildType>emul32</BuildType>
|
||||
<RuntimeDependencies>
|
||||
<Dependency release="current">libmd</Dependency>
|
||||
</RuntimeDependencies>
|
||||
<Files>
|
||||
<Path fileType="library">/usr/lib32</Path>
|
||||
</Files>
|
||||
</Package>
|
||||
|
||||
<Package>
|
||||
<Name>libmd-devel</Name>
|
||||
<Summary>Development files for libmd</Summary>
|
||||
<RuntimeDependencies>
|
||||
<Dependency release="current">libmd</Dependency>
|
||||
</RuntimeDependencies>
|
||||
<Files>
|
||||
<Path fileType="header">/usr/include</Path>
|
||||
<Path fileType="library">/usr/lib/pkgconfig</Path>
|
||||
<Path fileType="library">/usr/lib32/pkgconfig</Path>
|
||||
</Files>
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="1">
|
||||
<Date>2022-12-04</Date>
|
||||
<Version>1.0.4</Version>
|
||||
<Comment>First release</Comment>
|
||||
<Name>PisiLinux Community</Name>
|
||||
<Email>admins@pisilinux.org</Email>
|
||||
</Update>
|
||||
</History>
|
||||
</PISI>
|
||||
@@ -0,0 +1,8 @@
|
||||
<?xml version="1.0" ?>
|
||||
<PISI>
|
||||
<Source>
|
||||
<Name>libmd</Name>
|
||||
<Summary xml:lang="tr">Message Digest functions from BSD systems</Summary>
|
||||
<Description xml:lang="tr">Message Digest functions from BSD systems</Description>
|
||||
</Source>
|
||||
</PISI>
|
||||
@@ -19,4 +19,4 @@ def build():
|
||||
def install():
|
||||
autotools.rawInstall("DESTDIR=%s" % get.installDIR())
|
||||
|
||||
pisitools.dodoc("AUTHORS", "ChangeLog", "COPYING", "NEWS", "README")
|
||||
pisitools.dodoc("AUTHORS", "COPYING", "NEWS", "README")
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
<IsA>library</IsA>
|
||||
<Summary>Public client interface library for NIS(YP) and NIS+</Summary>
|
||||
<Description>Public client interface library for NIS(YP) and NIS+</Description>
|
||||
<Archive sha1sum="f141c7cf0ff96d96e369dda36af8ed19af0fc3ca" type="targz">https://github.com/thkukuk/libnsl/archive/v1.2.0/libnsl-1.2.0.tar.gz</Archive>
|
||||
<Archive sha1sum="f727e4e0bbf233a2367465bcbaed546ab4875744" type="targz">https://github.com/thkukuk/libnsl/archive/v2.0.0/libnsl-2.0.0.tar.gz</Archive>
|
||||
<BuildDependencies>
|
||||
<Dependency>libtirpc-devel</Dependency>
|
||||
</BuildDependencies>
|
||||
@@ -44,6 +44,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="5">
|
||||
<Date>2022-12-31</Date>
|
||||
<Version>2.0.0</Version>
|
||||
<Comment>Version bump.</Comment>
|
||||
<Name>Mustafa Cinasal</Name>
|
||||
<Email>muscnsl@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="4">
|
||||
<Date>2022-09-28</Date>
|
||||
<Version>1.2.0</Version>
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
<IsA>library</IsA>
|
||||
<Summary>Perl-compatible regular expression library</Summary>
|
||||
<Description>The PCRE (Perl Compatible Regular Expressions) library is a set of functions that implement regular expression pattern matching using the same syntax and semantics as Perl 5.</Description>
|
||||
<Archive sha1sum="5a433f92b29083d0d8ccd4ec56e3afbe1fa09863" type="tarbz2">https://github.com/PCRE2Project/pcre2/releases/download/pcre2-10.40/pcre2-10.40.tar.bz2</Archive>
|
||||
<Archive sha1sum="ea443ae87a4f5ab925a69cb3090605998061faed" type="tarbz2">https://github.com/PCRE2Project/pcre2/releases/download/pcre2-10.41/pcre2-10.41.tar.bz2</Archive>
|
||||
<BuildDependencies>
|
||||
<Dependency>readline-devel</Dependency>
|
||||
</BuildDependencies>
|
||||
@@ -71,6 +71,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="6">
|
||||
<Date>2022-12-07</Date>
|
||||
<Version>10.41</Version>
|
||||
<Comment>Version bump.</Comment>
|
||||
<Name>Mustafa Cinasal</Name>
|
||||
<Email>muscnsl@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="5">
|
||||
<Date>2022-08-23</Date>
|
||||
<Version>10.40</Version>
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
<IsA>library</IsA>
|
||||
<Summary>Transport Independent RPC library</Summary>
|
||||
<Description>Transport Independent RPC library</Description>
|
||||
<Archive sha1sum="51d75be0e5acc094a888f40042b23e128d163cb5" type="tarbz2">https://sourceforge.net/projects/libtirpc/files/libtirpc/1.3.2/libtirpc-1.3.2.tar.bz2</Archive>
|
||||
<Archive sha1sum="6e52c39148494e4836e2d5d4f28b11ddfa65394b" type="tarbz2">https://sourceforge.net/projects/libtirpc/files/libtirpc/1.3.3/libtirpc-1.3.3.tar.bz2</Archive>
|
||||
<BuildDependencies>
|
||||
<Dependency>mit-kerberos-devel</Dependency>
|
||||
<Dependency>e2fsprogs-devel</Dependency>
|
||||
@@ -49,6 +49,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="7">
|
||||
<Date>2022-12-04</Date>
|
||||
<Version>1.3.3</Version>
|
||||
<Comment>Version bump.</Comment>
|
||||
<Name>Mustafa Cinasal</Name>
|
||||
<Email>muscnsl@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="6">
|
||||
<Date>2022-09-28</Date>
|
||||
<Version>1.3.2</Version>
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
<IsA>app:console</IsA>
|
||||
<Summary>MIT Kerberos Library</Summary>
|
||||
<Description>Kerberos is a network authentication protocol. It is designed to provide strong authentication for client/server applications by using secret-key cryptography.</Description>
|
||||
<Archive sha1sum="e6addc23e361798b9f1243e6809620449d7fcb38" type="targz">http://web.mit.edu/kerberos/dist/krb5/1.20/krb5-1.20.tar.gz</Archive>
|
||||
<Archive sha1sum="06278439a6cd5a2aa861d8e877451b794487534b" type="targz">https://kerberos.org/dist/krb5/1.20/krb5-1.20.1.tar.gz</Archive>
|
||||
<BuildDependencies>
|
||||
<Dependency>python3</Dependency>
|
||||
<Dependency>keyutils</Dependency>
|
||||
@@ -76,6 +76,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="10">
|
||||
<Date>2022-12-06</Date>
|
||||
<Version>1.20.1</Version>
|
||||
<Comment>Version bump.</Comment>
|
||||
<Name>Mustafa Cinasal</Name>
|
||||
<Email>muscnsl@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="9">
|
||||
<Date>2022-09-26</Date>
|
||||
<Version>1.20</Version>
|
||||
|
||||
@@ -19,8 +19,9 @@
|
||||
<AdditionalFile target="dlopen-test.sh" permission="0755">dlopen-test.sh</AdditionalFile-->
|
||||
</AdditionalFiles>
|
||||
<BuildDependencies>
|
||||
<Dependency>libnsl-devel</Dependency>
|
||||
<Dependency versionFrom="2.0.0">libnsl-devel</Dependency>
|
||||
<Dependency>audit-devel</Dependency>
|
||||
<Dependency>libtirpc-devel</Dependency>
|
||||
</BuildDependencies>
|
||||
<!--Patches>
|
||||
<Patch level="1">CVE-2020-27780.patch</Patch>
|
||||
@@ -69,6 +70,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="12">
|
||||
<Date>2022-12-31</Date>
|
||||
<Version>1.5.2</Version>
|
||||
<Comment>Rebuild.</Comment>
|
||||
<Name>Mustafa Cinasal</Name>
|
||||
<Email>muscnsl@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="11">
|
||||
<Date>2022-09-28</Date>
|
||||
<Version>1.5.2</Version>
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user