From: Mike Frysinger Date: Sun, 18 Feb 2007 13:25:44 +0000 (+0000) Subject: Tweak patch slightly so we dont log an error on ENOSYS #167432 by UMknhSiu3oySN. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c59599a86c459d8cda63e0d53de7194789574e5b;p=gentoo.git Tweak patch slightly so we dont log an error on ENOSYS #167432 by UMknhSiu3oySN. Package-Manager: portage-2.1.2-r9 --- diff --git a/app-admin/sysklogd/ChangeLog b/app-admin/sysklogd/ChangeLog index 9986b2ee92c2..6f0f34ce2026 100644 --- a/app-admin/sysklogd/ChangeLog +++ b/app-admin/sysklogd/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-admin/sysklogd # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/sysklogd/ChangeLog,v 1.56 2007/02/13 14:22:36 gustavoz Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/sysklogd/ChangeLog,v 1.57 2007/02/18 13:25:44 vapier Exp $ + + 18 Feb 2007; Mike Frysinger + files/sysklogd-1.4.1-querymod.patch: + Tweak patch slightly so we dont log an error on ENOSYS #167432 by + UMknhSiu3oySN. 13 Feb 2007; Gustavo Zacarias sysklogd-1.4.2_pre20061230.ebuild: diff --git a/app-admin/sysklogd/Manifest b/app-admin/sysklogd/Manifest index 51eb9a795d8f..7c96ffda3889 100644 --- a/app-admin/sysklogd/Manifest +++ b/app-admin/sysklogd/Manifest @@ -37,10 +37,10 @@ AUX sysklogd-1.4.1-punt-SO_BSDCOMPAT.patch 641 RMD160 d74e697fb671bd09751d704f7a MD5 76ecef7e59c8fbb9ab22cc053fa476ae files/sysklogd-1.4.1-punt-SO_BSDCOMPAT.patch 641 RMD160 d74e697fb671bd09751d704f7a61d1534396b00a files/sysklogd-1.4.1-punt-SO_BSDCOMPAT.patch 641 SHA256 f08817a6974dbb3d331a4a6f1793a213862b16feff16bddd5ba320d9b63bd04c files/sysklogd-1.4.1-punt-SO_BSDCOMPAT.patch 641 -AUX sysklogd-1.4.1-querymod.patch 10572 RMD160 524cf03fc4955e53a63216282ef69304813c49b4 SHA1 28f30a110c14424ea051616b18092270b589358b SHA256 246aa5daa74f8f604bb81f9bc99e010d00e3b639032c25a7c95abba6d8b2656c -MD5 5fb95ed17d47e1d3fe76e4c036b4ec5d files/sysklogd-1.4.1-querymod.patch 10572 -RMD160 524cf03fc4955e53a63216282ef69304813c49b4 files/sysklogd-1.4.1-querymod.patch 10572 -SHA256 246aa5daa74f8f604bb81f9bc99e010d00e3b639032c25a7c95abba6d8b2656c files/sysklogd-1.4.1-querymod.patch 10572 +AUX sysklogd-1.4.1-querymod.patch 10599 RMD160 cedf716eddae02391be3b88f2013a13eadff767d SHA1 2512a7a2e9110082515fe4dda87d53749108e7e0 SHA256 a6033fd938b5febacad4f8ce056a3e17ed8942e861849744730e266b0ede9770 +MD5 752ebc6d5674da2a7b2c9536dfdb0ddf files/sysklogd-1.4.1-querymod.patch 10599 +RMD160 cedf716eddae02391be3b88f2013a13eadff767d files/sysklogd-1.4.1-querymod.patch 10599 +SHA256 a6033fd938b5febacad4f8ce056a3e17ed8942e861849744730e266b0ede9770 files/sysklogd-1.4.1-querymod.patch 10599 AUX sysklogd.confd 113 RMD160 08edc849adba1b6678832f50fb822b6338c464d5 SHA1 edb73eace5bdf91f8557cae95ca6ea1c62772f27 SHA256 11a1eeb9edd09639d5143227bada137945822b23c5abb88fec5ebaef064b991d MD5 e25d7b583b7e4bd8be503b89e1771e90 files/sysklogd.confd 113 RMD160 08edc849adba1b6678832f50fb822b6338c464d5 files/sysklogd.confd 113 @@ -80,10 +80,10 @@ EBUILD sysklogd-1.4.2_pre20061230.ebuild 1824 RMD160 d7556875038be0e2dfaf4caeebd MD5 96ca849e883a5126416e7deeb0afe2e8 sysklogd-1.4.2_pre20061230.ebuild 1824 RMD160 d7556875038be0e2dfaf4caeebddee834bb3ba9f sysklogd-1.4.2_pre20061230.ebuild 1824 SHA256 426c483c5c1d6522cb49175b6df8800d3afa1351e3b80a9416e82c951b1e67f5 sysklogd-1.4.2_pre20061230.ebuild 1824 -MISC ChangeLog 8450 RMD160 9330bb0f6f9b07ae3c4d83800177ee3f73ddd427 SHA1 98d91a46b08b2987ebe18e34df58c50cfd882990 SHA256 e93061adc57e92fffe01ef86c9c46164c228d1191f98d3ad6967e82e6e481bd5 -MD5 80ce27f2d11597651c7a9cb054e8267c ChangeLog 8450 -RMD160 9330bb0f6f9b07ae3c4d83800177ee3f73ddd427 ChangeLog 8450 -SHA256 e93061adc57e92fffe01ef86c9c46164c228d1191f98d3ad6967e82e6e481bd5 ChangeLog 8450 +MISC ChangeLog 8623 RMD160 bfed857e5e842afb36e39fbd01fa4723e85c843b SHA1 5922586730036ff1da9918e706cb9752cedd6d3c SHA256 b24d11c254f2f1e72fc9400ebcf5eeb027832ca74c53abf61de57fd80fa9947e +MD5 cf6cdb025437db3ffa0345ad06bcaaf9 ChangeLog 8623 +RMD160 bfed857e5e842afb36e39fbd01fa4723e85c843b ChangeLog 8623 +SHA256 b24d11c254f2f1e72fc9400ebcf5eeb027832ca74c53abf61de57fd80fa9947e ChangeLog 8623 MISC metadata.xml 165 RMD160 84307ea324cd4f0f46d52f2fa096a1873e2fbe53 SHA1 c7b83ef947fe7e8273cc512fee9bba06586a58f9 SHA256 23a8851c12bd4cf7cf0528250ad5605be6b0780bbec0c51331d6d2c618c13f6a MD5 6fe58567b648100d4ff11902921b6889 metadata.xml 165 RMD160 84307ea324cd4f0f46d52f2fa096a1873e2fbe53 metadata.xml 165 @@ -98,9 +98,9 @@ MD5 2212b78743454390818dd85c9c162a15 files/digest-sysklogd-1.4.2_pre20061230 530 RMD160 1bbbbc7ff6ebb34c30041a2b3544f39048ffdf04 files/digest-sysklogd-1.4.2_pre20061230 530 SHA256 65b541b12c517c56b5377ad827e2162c786179e6d195de832f3da4737aa7615a files/digest-sysklogd-1.4.2_pre20061230 530 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.6-ecc01.6 (GNU/Linux) +Version: GnuPG v2.0.2 (GNU/Linux) -iD8DBQFF0cm9KRy60XGEcJIRAvOAAJ9iMd1BEhswj788krbFgso0RWJE0wCbBYsB -3I/o9NJeq2glylif7L0AkH4= -=S9Ie +iD8DBQFF2FQJ8bi6rjpTunYRApHWAJ9JCYgwiEarTVgLnxLzu24QalPqUACdEtCo +smDgVv3BunkC+l1V/ikrFDI= +=UE69 -----END PGP SIGNATURE----- diff --git a/app-admin/sysklogd/files/sysklogd-1.4.1-querymod.patch b/app-admin/sysklogd/files/sysklogd-1.4.1-querymod.patch index d6ed1c82a267..77345be2c626 100644 --- a/app-admin/sysklogd/files/sysklogd-1.4.1-querymod.patch +++ b/app-admin/sysklogd/files/sysklogd-1.4.1-querymod.patch @@ -33,7 +33,7 @@ diff -Naur sysklogd-1.4.1-orig/ksym_mod.c sysklogd-1.4.1/ksym_mod.c static int symsort(const void *, const void *); -@@ -185,81 +187,106 @@ +@@ -185,81 +187,107 @@ extern int InitMsyms() { @@ -103,8 +103,9 @@ diff -Naur sysklogd-1.4.1-orig/ksym_mod.c sysklogd-1.4.1/ksym_mod.c + result=query_module(NULL, QM_MODULES, modbuf, modsize, &rtn); + + if (result<0 && errno!=ENOSPC) { -+ Syslog(LOG_ERR, "Error querying loaded modules " \ -+ "- %s\n", strerror(errno)); ++ if (errno != ENOSYS) ++ Syslog(LOG_ERR, "Error querying loaded modules " \ ++ "- %s\n", strerror(errno)); + free(modbuf); + return(0); + }