This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch main in repository dpkg.
View the commit online: https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=f165802999476aa68325b60f69b2a8cdfc3c80d6 commit f165802999476aa68325b60f69b2a8cdfc3c80d6 (HEAD -> main) Author: Guillem Jover <[email protected]> AuthorDate: Tue Jul 5 05:52:25 2022 +0200 doc: Spell SELinux correctly --- debian/changelog | 16 ++++++++-------- src/common/selinux.c | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index d8c6e5d6f..86d73e365 100644 --- a/debian/changelog +++ b/debian/changelog @@ -532,7 +532,7 @@ dpkg (1.21.0) unstable; urgency=medium - dpkg: Mark deb_parse_conffiles() pkg argument as const. - libcompat: Remove local setexecfilecon() and require libselinux 2.3. - libdpkg: Add missing DPKG_{BEGIN,END}_DECLS in header files. - - dpkg: Move SE Linux function declarations into its own header file. + - dpkg: Move SELinux function declarations into its own header file. - dpkg: Move the command action enum to its own header file. - dpkg: Switch from including "main.h" to "force.h". - dselect: Rename dme() to display_menu_entry(). @@ -3092,7 +3092,7 @@ dpkg (1.18.11) unstable; urgency=medium - Fix M4sh/Autoconf coding style. Add a new section to coding-style.txt describing M4sh/Autoconf. - Disable C++ exceptions for dselect. - - Fix typo in SE Linux library detection code, only affecting static + - Fix typo in SELinux library detection code, only affecting static mode (not used in Debian). Regression introduced in dpkg 1.18.8. - Change --with-* option logic to default to check. - Disable -Wtautological-constant-out-of-range-compare (for clang). @@ -3866,9 +3866,9 @@ dpkg (1.18.1) unstable; urgency=low This fixes build failures on armel, armhf, ppc64el and s390x. * Do not allow pathnames with embedded newlines in dpkg-deb and dpkg. Closes: #720761 - * Fix setting the SE Linux context when a file has a statoverride. + * Fix setting the SELinux context when a file has a statoverride. Closes: #786435 - * Set the SE Linux file context even when the file mode has no file type. + * Set the SELinux file context even when the file mode has no file type. * Make dpkg-buildpackage -j override any parallel option specified in DEB_BUILD_OPTIONS. Regression introduced in dpkg 1.14.15. * Honor Pre-Depends, Conflicts and Breaks for packages in unpacked and @@ -3941,7 +3941,7 @@ dpkg (1.18.0) unstable; urgency=low except for --raw-extract which does not yet support it. Closes: #616614 Based on a patch by Johannes Schauer <[email protected]>. * Add ‘.mailmap’ to the default dpkg-source ignore lists. - * Set the SE Linux context on «dpkg-statoverride --update». Closes: #690361 + * Set the SELinux context on «dpkg-statoverride --update». Closes: #690361 * Do not fail on dpkg-query -W and -l when multiple arguments match the same package. Closes: #588505 * Change dpkg-maintscript-helper to handle symlinks and pathnames ending in @@ -5724,7 +5724,7 @@ dpkg (1.16.7) unstable; urgency=low dpkg (1.16.6) unstable; urgency=low [ Guillem Jover ] - * Do not translate SE Linux context to human readable form while unpacking, + * Do not translate SELinux context to human readable form while unpacking, as that might cause the operation to fail if the mcstransd daemon stopped running during the transaction. Closes: #679641 Thanks to Russell Coker <[email protected]>. @@ -6961,7 +6961,7 @@ dpkg (1.15.8) unstable; urgency=low * Consistently use earlier/later instead of smaller/bigger when describing comparison relationships. Closes: #587641 * Stop exporting DPKG_LIBDIR to maintainer scripts, no need for it anymore. - * Assign correct SE Linux label on non-regular files. Based on a patch by + * Assign correct SELinux label on non-regular files. Based on a patch by Russell Coker <[email protected]>. Closes: #587949 * Add -F option to dpkg-buildpackage to be able to explicitly specify a normal full build and combine it with -nc. Closes: #547993 @@ -7320,7 +7320,7 @@ dpkg (1.15.6) experimental; urgency=low - README.api only in development packages, dpkg-dev and libdpkg-dev. - triggers.txt only in dpkg-dev. * Move source.lintian-overrides to debian/source/lintian-overrides. - * Switch SE Linux support to explicitly set path context. This fixes the + * Switch SELinux support to explicitly set path context. This fixes the mislabeling of files under <admindir> on conffile extraction or on unpack errors, due to improper default context restoration. Closes: #498438 * Use FIEMAP when available (on Linux based systems) to sort the .list diff --git a/src/common/selinux.c b/src/common/selinux.c index 3a4abda6e..07f87a3dd 100644 --- a/src/common/selinux.c +++ b/src/common/selinux.c @@ -1,6 +1,6 @@ /* * dpkg - main program for package management - * selinux.c - SE Linux support + * selinux.c - SELinux support * * Copyright © 2007-2015 Guillem Jover <[email protected]> * -- Dpkg.Org's dpkg
