diff --git a/Makefile.rhelver b/Makefile.rhelver index 1a1e2ffbd..c2930e3e8 100644 --- a/Makefile.rhelver +++ b/Makefile.rhelver @@ -12,7 +12,7 @@ RHEL_MINOR = 99 # # Use this spot to avoid future merge conflicts. # Do not trim this comment. -RHEL_RELEASE = 37 +RHEL_RELEASE = 38 # # RHEL_REBASE_NUM diff --git a/kernel-aarch64-16k-debug-fedora.config b/kernel-aarch64-16k-debug-fedora.config index d0c3d47f1..58147c409 100644 --- a/kernel-aarch64-16k-debug-fedora.config +++ b/kernel-aarch64-16k-debug-fedora.config @@ -6962,7 +6962,7 @@ CONFIG_SECONDARY_TRUSTED_KEYRING=y CONFIG_SECRETMEM=y CONFIG_SECTION_MISMATCH_WARN_ONLY=y # CONFIG_SECURITY_APPARMOR is not set -# CONFIG_SECURITY_DMESG_RESTRICT is not set +CONFIG_SECURITY_DMESG_RESTRICT=y CONFIG_SECURITYFS=y CONFIG_SECURITY_INFINIBAND=y CONFIG_SECURITY_LANDLOCK=y diff --git a/kernel-aarch64-16k-fedora.config b/kernel-aarch64-16k-fedora.config index 496d35699..f5b254ee4 100644 --- a/kernel-aarch64-16k-fedora.config +++ b/kernel-aarch64-16k-fedora.config @@ -6935,7 +6935,7 @@ CONFIG_SECONDARY_TRUSTED_KEYRING=y CONFIG_SECRETMEM=y CONFIG_SECTION_MISMATCH_WARN_ONLY=y # CONFIG_SECURITY_APPARMOR is not set -# CONFIG_SECURITY_DMESG_RESTRICT is not set +CONFIG_SECURITY_DMESG_RESTRICT=y CONFIG_SECURITYFS=y CONFIG_SECURITY_INFINIBAND=y CONFIG_SECURITY_LANDLOCK=y diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 6de852177..720538bf3 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -6962,7 +6962,7 @@ CONFIG_SECONDARY_TRUSTED_KEYRING=y CONFIG_SECRETMEM=y CONFIG_SECTION_MISMATCH_WARN_ONLY=y # CONFIG_SECURITY_APPARMOR is not set -# CONFIG_SECURITY_DMESG_RESTRICT is not set +CONFIG_SECURITY_DMESG_RESTRICT=y CONFIG_SECURITYFS=y CONFIG_SECURITY_INFINIBAND=y CONFIG_SECURITY_LANDLOCK=y diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index 02699e7de..6c16d7c32 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -6935,7 +6935,7 @@ CONFIG_SECONDARY_TRUSTED_KEYRING=y CONFIG_SECRETMEM=y CONFIG_SECTION_MISMATCH_WARN_ONLY=y # CONFIG_SECURITY_APPARMOR is not set -# CONFIG_SECURITY_DMESG_RESTRICT is not set +CONFIG_SECURITY_DMESG_RESTRICT=y CONFIG_SECURITYFS=y CONFIG_SECURITY_INFINIBAND=y CONFIG_SECURITY_LANDLOCK=y diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index d0d4cc8bd..2162dbb43 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -5775,7 +5775,7 @@ CONFIG_SECONDARY_TRUSTED_KEYRING=y CONFIG_SECRETMEM=y CONFIG_SECTION_MISMATCH_WARN_ONLY=y # CONFIG_SECURITY_APPARMOR is not set -# CONFIG_SECURITY_DMESG_RESTRICT is not set +CONFIG_SECURITY_DMESG_RESTRICT=y CONFIG_SECURITYFS=y CONFIG_SECURITY_INFINIBAND=y CONFIG_SECURITY_LANDLOCK=y diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index 43fdda920..898c420d5 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -5746,7 +5746,7 @@ CONFIG_SECONDARY_TRUSTED_KEYRING=y CONFIG_SECRETMEM=y CONFIG_SECTION_MISMATCH_WARN_ONLY=y # CONFIG_SECURITY_APPARMOR is not set -# CONFIG_SECURITY_DMESG_RESTRICT is not set +CONFIG_SECURITY_DMESG_RESTRICT=y CONFIG_SECURITYFS=y CONFIG_SECURITY_INFINIBAND=y CONFIG_SECURITY_LANDLOCK=y diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index cea77383b..d4e5ea1ef 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -5707,7 +5707,7 @@ CONFIG_SECONDARY_TRUSTED_KEYRING=y CONFIG_SECRETMEM=y CONFIG_SECTION_MISMATCH_WARN_ONLY=y # CONFIG_SECURITY_APPARMOR is not set -# CONFIG_SECURITY_DMESG_RESTRICT is not set +CONFIG_SECURITY_DMESG_RESTRICT=y CONFIG_SECURITYFS=y CONFIG_SECURITY_INFINIBAND=y CONFIG_SECURITY_LANDLOCK=y diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index 8daba7e61..788976ba9 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -5678,7 +5678,7 @@ CONFIG_SECONDARY_TRUSTED_KEYRING=y CONFIG_SECRETMEM=y CONFIG_SECTION_MISMATCH_WARN_ONLY=y # CONFIG_SECURITY_APPARMOR is not set -# CONFIG_SECURITY_DMESG_RESTRICT is not set +CONFIG_SECURITY_DMESG_RESTRICT=y CONFIG_SECURITYFS=y CONFIG_SECURITY_INFINIBAND=y CONFIG_SECURITY_LANDLOCK=y diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index b2f5c2710..83855c36a 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -6147,7 +6147,7 @@ CONFIG_SECONDARY_TRUSTED_KEYRING=y CONFIG_SECRETMEM=y CONFIG_SECTION_MISMATCH_WARN_ONLY=y # CONFIG_SECURITY_APPARMOR is not set -# CONFIG_SECURITY_DMESG_RESTRICT is not set +CONFIG_SECURITY_DMESG_RESTRICT=y CONFIG_SECURITYFS=y CONFIG_SECURITY_INFINIBAND=y CONFIG_SECURITY_LANDLOCK=y diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index cea8394c6..997816ff7 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -6119,7 +6119,7 @@ CONFIG_SECONDARY_TRUSTED_KEYRING=y CONFIG_SECRETMEM=y CONFIG_SECTION_MISMATCH_WARN_ONLY=y # CONFIG_SECURITY_APPARMOR is not set -# CONFIG_SECURITY_DMESG_RESTRICT is not set +CONFIG_SECURITY_DMESG_RESTRICT=y CONFIG_SECURITYFS=y CONFIG_SECURITY_INFINIBAND=y CONFIG_SECURITY_LANDLOCK=y diff --git a/kernel.spec b/kernel.spec index 418f82b48..29aec3dc4 100644 --- a/kernel.spec +++ b/kernel.spec @@ -163,13 +163,13 @@ Summary: The Linux kernel %define specrpmversion 6.7.0 %define specversion 6.7.0 %define patchversion 6.7 -%define pkgrelease 0.rc4.20231206gitbee0e7762ad2.37 +%define pkgrelease 0.rc4.20231208git5e3f5b81de80.38 %define kversion 6 -%define tarfile_release 6.7-rc4-9-gbee0e7762ad2 +%define tarfile_release 6.7-rc4-111-g5e3f5b81de80 # This is needed to do merge window version magic %define patchlevel 7 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc4.20231206gitbee0e7762ad2.37%{?buildid}%{?dist} +%define specrelease 0.rc4.20231208git5e3f5b81de80.38%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.7.0 @@ -3754,6 +3754,10 @@ fi\ # # %changelog +* Fri Dec 08 2023 Fedora Kernel Team [6.7.0-0.rc4.5e3f5b81de80.38] +- Turn on CONFIG_SECURITY_DMESG_RESTRICT for Fedora (Justin M. Forbes) +- Linux v6.7.0-0.rc4.5e3f5b81de80 + * Wed Dec 06 2023 Fedora Kernel Team [6.7.0-0.rc4.bee0e7762ad2.37] - Turn off shellcheck for the fedora-stable-release script (Justin M. Forbes) diff --git a/sources b/sources index b9057f360..da1810821 100644 --- a/sources +++ b/sources @@ -1,5 +1,5 @@ SHA512 (kernel-abi-stablelists-6.6.0.tar.bz2) = 4f917598056dee5e23814621ec96ff2e4a411c8c4ba9d56ecb01b23cb96431825bedbecfcbaac9338efbf5cb21694d85497fa0bf43e7c80d9cd10bc6dd144dbd SHA512 (kernel-kabi-dw-6.6.0.tar.bz2) = 19308cd976031d05e18ef7f5d093218acdb89446418bab0cd956ff12cf66369915b9e64bb66fa9f20939428a60e81884fec5be3529c6c7461738d6540d3cc5c6 -SHA512 (linux-6.7-rc4-9-gbee0e7762ad2.tar.xz) = 98dcb797a9d0d63adec8c9257f8f96cd0d670236a481ede231e38dd84ae995a235922ba1edc8ba0e39b7ab4732939a6c924e763d7242f7a8ca72a7f09104b440 -SHA512 (kernel-abi-stablelists-6.7.0.tar.xz) = bfe0e3bcf1786298d7c29f69a5ae45a1754cd868244fb78f180b09545e32dbdb93689622b135cf17a47d223ef9cd9009a1cfa67e264ca88d6210cea5fbba9323 -SHA512 (kernel-kabi-dw-6.7.0.tar.xz) = 7e9e4d2b5871e24a62208f33843bdd2f087c1c991ba00efca3af8d6851ac2235102191486bd0ccfd0853abc60ebd2586a6dd54996c6adf66e62f262427cb3a7b +SHA512 (linux-6.7-rc4-111-g5e3f5b81de80.tar.xz) = a618c6713266f74113703de5dd0a80f340a904ab727ac59c472c14a61b61801cf8671a2fece905b3ff75b9f65a017cfa4e9b328d53ba529b7295d3c2dd142d1f +SHA512 (kernel-abi-stablelists-6.7.0.tar.xz) = 61b2844bc71ec1146fb670def218dd550859bd574a7f435a11aad735972dcdba3c6469e8cc425f10db8582dd79385abd5cf5c179f2e5b28c311c1f210fb5a863 +SHA512 (kernel-kabi-dw-6.7.0.tar.xz) = 4dec91a1315b11dd9edbf69299111c28fa63fe31d476b84f70d4316fa8a3dcc35c9fab2021da13ed34ea4ebbdca61cdaeef16444d67558d99011af6a36a19652