pool/restorecond
SHA256
12
0
Fork 1
Code Issues Pull Requests Activity

Accepting request 1295056 from openSUSE:Factory

Browse Source 
https://bugzilla.suse.com/show_bug.cgi?id=1246831

OBS-URL: https://build.opensuse.org/request/show/1295056
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/restorecond?expand=0&rev=20
This commit is contained in:
Ana Guerrero
2025-07-22 10:20:53 +00:00
committed by Git OBS Bridge
parent b673a2b605
commit d3b74b0b8f
12 changed files with 140 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
1231512-Set-GLib-IO-channels-to-binary-mode.patch Normal file
View File

@@ -0,0 +1,30 @@
By default, GIO channels use UTF-8 as encoding, which causes issues when
reading binary data such as inotify events.
Signed-off-by: Fabian Vogt <fvogt@suse.de>
---
restorecond/user.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/restorecond/user.c b/restorecond/user.c
index 3ae3ebbb7230..7188c22e3119 100644
--- a/restorecond/user.c
+++ b/restorecond/user.c
@@ -238,6 +238,7 @@ static int local_server(void) {
}
/* watch for stdin/terminal going away */
GIOChannel *in = g_io_channel_unix_new(0);
+ g_io_channel_set_encoding(in, NULL, NULL);
g_io_add_watch_full( in,
G_PRIORITY_HIGH,
G_IO_IN|G_IO_ERR|G_IO_HUP,
@@ -282,6 +283,7 @@ int server(int master_fd, const char *watch_file) {
set_matchpathcon_flags(MATCHPATHCON_NOTRANS);
GIOChannel *c = g_io_channel_unix_new(master_fd);
+ g_io_channel_set_encoding(c, NULL, NULL);
g_io_add_watch_full(c,
G_PRIORITY_HIGH,
--
2.47.0

32
1231512-Set-GLib-IO-channels-to-nonblocking.patch Normal file
View File

@@ -0,0 +1,32 @@
Without nonblocking IO, g_io_channel_read_chars waits indefinitely for more
data without ever returning control to the event loop.
Set the IO channels to nonblocking to fix SIGTERM handling.
Signed-off-by: Fabian Vogt <fvogt@suse.de>
---
restorecond/user.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/restorecond/user.c b/restorecond/user.c
index 7188c22e3119..25e70ae15b94 100644
--- a/restorecond/user.c
+++ b/restorecond/user.c
@@ -239,6 +239,7 @@ static int local_server(void) {
/* watch for stdin/terminal going away */
GIOChannel *in = g_io_channel_unix_new(0);
g_io_channel_set_encoding(in, NULL, NULL);
+ g_io_channel_set_flags(in, g_io_channel_get_flags(in) | G_IO_FLAG_NONBLOCK, NULL);
g_io_add_watch_full( in,
G_PRIORITY_HIGH,
G_IO_IN|G_IO_ERR|G_IO_HUP,
@@ -284,6 +285,7 @@ int server(int master_fd, const char *watch_file) {
GIOChannel *c = g_io_channel_unix_new(master_fd);
g_io_channel_set_encoding(c, NULL, NULL);
+ g_io_channel_set_flags(c, g_io_channel_get_flags(c) | G_IO_FLAG_NONBLOCK, NULL);
g_io_add_watch_full(c,
G_PRIORITY_HIGH,
--
2.47.0

3
restorecond-3.6.tar.gz Normal file
View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8f8aa2c6c66bcc6d91c6edd63913e5d738de6428928f27d1019d89c31cf347b1
size 18020

16
restorecond-3.6.tar.gz.asc Normal file
View File

@@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEG+LA/wiUliMQL9JWRpWIHCVFCNEFAmV5xAMACgkQRpWIHCVF
CNFXsw//RSQSkQcUwzxy+sVlv5IQnKNfc45b8xgsVmIkxfA5prVEPaQf+SAcuaQj
PQ9ukDHBr07vtfyPRYm/eRmPZW/6s6FLrGEwhu4mnIJMuL84nB229IraSQeHRK5n
53G+xuCMz3+fm8fZqyyr8XN1QS+ReVTeE1rFEGYTceAW2R+bYTfAoJXA+ExsQO/R
d7U23+JyrLY5xADbaszvE1v2fDyTxhaGrdT+QmqySqcnrt8BF1sGbX46sEoyIUyh
jgVy5dOfI11TxxZ3+uJovZmD6K1pQKcHuC7X/9LlGsoIOjdVz42DJlAcr2nGdPjc
8GyC6dgCnWhisl1ePZMY7cW2LYXQvKnf7YH0KXRVtywuGX4mKD+PXmekJgfP20vz
EeXkPMuRsHpnWhUcvPzxpVtlqsdVLKKVIhsKBQ/m5q8aplxM21xr5Ed/SZ+t2BA1
H5G2L7wwGU88AOmRfYqkC/ebjozSS7e0htAm92gdC3g8hUbm04XsHJSRXfDHkqNu
wkQJ6Y6A0M33Pc3YZFg+YnLL2Bb3F9+SxOh28YilEDtqgMBVyzlUhN2T4/oegABn
G77GRVV3HG9e7kMpA/Oek77r055RN/E684NfpqN8pfoA/6LvtVh+LO2twT6YjO6t
BpZWuPGPvlnjZiKUanDs9zNVshngq8gOuGhFqSt6uvMf+lO+BAE=
=hHoX
-----END PGP SIGNATURE-----

3
restorecond-3.7.tar.gz Normal file
View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4192595c08c775ff540f5ab850885ce11b132a4a4e29b65f20e751dd0a69d31f
size 18072

16
restorecond-3.7.tar.gz.asc Normal file
View File

@@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEG+LA/wiUliMQL9JWRpWIHCVFCNEFAmZ8NeEACgkQRpWIHCVF
CNEVjw//X+iCeLhgmmaxNsqucF8VahGo4wOeJTQUTr56hDDcrCderlCj1UYaeVgd
wINyW3dRPTfFqKGwHcf93uFvjJKfn4xbScIjpmyTxCSvvksh8aOeyqKPH7NC2CMU
sYivK+l6QDH0yzH+075Z2qMJW5dAIghFBAcJKrLPv7pdE4qmLuIERqD8UBWo+sBX
XWEcATVBAqxAP0Dw35sBrECHUUzLTHnfbHv9UogPO8w7nRRgtbPDvi+xJvVOaUxs
xbamgZ/yQwKbUnXWMslQSIim5egsn4HXPF3pkOZwbOE530ZC425pHFbtm5DGbdNa
hQs8v94qHO9lQGIkSx+J65O1/GZ5VLocnac+yySn9AjTXb3oJpJcNzzByEDgB9Er
0PYL1fbsJr9DCHX2B6DVENrPZ+FoZEBCpMdX4orcGz+5x9nzCHMzT6Yp+l0Mz25X
ZfO/ZKeIAjEGMYgyfmEiigOMGtT4vDL33D/dM5HLJKHRWkbDZQrX+JiHJ4Hcplsc
MFvvbvYH4ulIPrinSvoSZ2/7a+BgH1rObSqOD4s5PLGqF9U2GlVvwECXywsYzGIp
Ixx0peAHLvuPCXPoPYkAARToEV8VrV1jJPUCMaNE5G43vWKgovSDpqLRHR2q8bdR
CBA+V1c1mREoXe7gbp7aUI9gMcVMGXyL0MHk9HWL6ycOANaKPgU=
=FkJC
-----END PGP SIGNATURE-----

BIN
restorecond-3.8.1.tar.gz (Stored with Git LFS) Normal file
View File

Binary file not shown.

16
restorecond-3.8.1.tar.gz.asc Normal file
View File

@@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIyBAABCgAdFiEEcgDrLD9eSIRjwM6ezcroySfGvjEFAmfIn6cACgkQzcroySfG
vjGoPQ/3fymFfVLnPTejvYK/vP+iAaZ1bDWvfCXl3nfrKDfk5VfIMbW42uTXeQ2u
azoZ4Afyz0en80LCNBKJ+kpmJSWJ99PX+xr6F2pqmnKDQZQhAqUp+aNrSTDpd2D3
8nw492uLWpXNGi7KFvXOGTyWe2IGhe/ph9HtjP/CCON8R5GXt1AVbyewsoT2jpnp
Ic+sz7n41A0XclX3pJedK4RkdeGTTJZezgEfGcepqd+eSVs65A0CkxA5Wa22GtMm
dtfgyLJlGlcGWakcMQQ/4u/17cHK9Gw1vzrwxwOCmakX2Ux/8JktfYgvRZntVS8O
MDzILTyaa8lyHyGrvygOy8Ql1Q4yfX0JWGDZ9CBVydaF5KSi1NQP0+Yogjd+juyA
8JAf7e99OTnmXkvdqMpcMeHjZG1mSqaliWNKch7/YIU8RURJgWKmLe/Vdk7OVOYo
jbfJVUkZ3aNjTiR5hW3zXX7G8bXKTybwKBkjnrZ9RrHylbOSBwS3DzJgwhdiv7uR
XJ+XEule/9bxE27xFJ+26zufQHLYJsZbRB4DgGmFW+6LumzkHy0//2zVKCSR1SEJ
A/KZDQ5ndxYkMqQzYUfbDZ5JIqzSC97BeQpqFenZE038JHiEU0BsHn2L1PfX6rUt
i0MrTa2d5Xf45zC0/ZrDBFUWrsTPfJsKiCPFXvk+bPKpF/9OJQ==
=QBal
-----END PGP SIGNATURE-----

BIN
restorecond-3.8.tar.gz (Stored with Git LFS) Normal file
View File

Binary file not shown.

16
restorecond-3.8.tar.gz.asc Normal file
View File

@@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEcgDrLD9eSIRjwM6ezcroySfGvjEFAmeaa/0ACgkQzcroySfG
vjFw3A/+OHpO+4u7Hom34zBWYxvRubEz59IDMYFlD3dGHPnBjgg1wL5SvwiGIAP+
Fdo7E9lA1fmL59waqdPfQI+Uzu8FeFwClx1Z8QkKeCF5I8eCJE3JlMng/LuSSOq2
9W7yOqGT8SsR5TR5LH2ex1EDhUjNoSWp6iC9z+dNv12lQZdHw19363lQxA2U0dKb
//hM7KAXC8Z0Y21FBOWxx2uaXI4Q5g0HRRf/MhRCoqLjKeDEwsyz1uTLV/kgZshF
bgwfdfgR3O6Uaa3Ue5H99jHfOqYIkz7cmgDhCxOz6Jn+sWh/18cs6GArjMoIPida
ciCF/JSLPwVWznjQ4UopjIaYeXXWnluY+lywn6bdPthT7nv8rZ1i2Em6ZRVGb4Ta
umknsKH3UWUcSzO3Zef8G4sZ9Pwh0bKIDpOUUcgjgfcPoEL0c7+CncgBz4/r8ooA
dYsIxfEM/QQSY2fMWt1WpqdwIF5+MWdaa9DhntGbcrpJQD2XnxXm7fEsNj49xOkt
vvtIT1n9j0WJUoia88yZ8Iv4zinJRIjOKHYLsgr+rIycGMsC5EY30JCV0mehd9rp
uSsapv5O5U5poZLuJw9ZDeZ2s2U1NUELrIlgYRqxLsp77usRdVbyZNqnSxU6aDT8
LhCAcXL0IGhV1xaTJ50BeoHGJWWRkx+wpidhqqkAY3BtfLrq+s8=
=2i1G
-----END PGP SIGNATURE-----

6
restorecond.changes
View File

@@ -1,9 +1,3 @@
-------------------------------------------------------------------
Thu Jul 17 16:02:42 UTC 2025 - Johannes Segitz <jsegitz@suse.com>
- Update to version 3.9
* no source change
-------------------------------------------------------------------
Fri Mar 7 14:12:08 UTC 2025 - Cathy Hu <cathy.hu@suse.com>

4
restorecond.spec
View File

@@ -16,9 +16,9 @@
#
%define libselinux_ver 3.9
%define libselinux_ver 3.8.1
Name: restorecond
Version: 3.9
Version: 3.8.1
Release: 0
Summary: Daemon to restore SELinux contexts
License: GPL-2.0-or-later