diff options
Diffstat (limited to 'app-admin/sysklogd')
18 files changed, 3 insertions, 1014 deletions
diff --git a/app-admin/sysklogd/Manifest b/app-admin/sysklogd/Manifest index f3dbe1ff8e26..8f50ccfaab1c 100644 --- a/app-admin/sysklogd/Manifest +++ b/app-admin/sysklogd/Manifest @@ -1,26 +1,7 @@ -AUX sysklogd-1.4.2-caen-owl-klogd-drop-root.diff 4315 BLAKE2B 41b42e8f07abc905be77600e161065b063630e7e7ae92932b4d6165cab83f23e87fb521f7c0b36ce9ee42d99c5914a47605df277c9fce666dcb48ee93a3b918e SHA512 1a5cf4a5dec3ecaa8258110820b64d6a8e1e768e841a3f0ade8d7827b91e73c2d8a49a9d8b74566373133627af88dd46d14e83ae1940a0b2e6cd6fe8710a7e7a -AUX sysklogd-1.4.2-caen-owl-syslogd-bind.diff 3242 BLAKE2B 93a53fc525bab3ebac577e02d381bc69beab1cf69136aedaf06e6c8e4b6fbe78cb68f705d42d9dde2f315c93cf12594bd8d2c80d0f6773d604c465b5b99bed56 SHA512 995c240fc54681445f68f7681173e1e1860aaab309edc8ac3531881c63c8889f009a7fd622d37145e80fe187410b80c28554140d6a6660134ca87a1c8d13570d -AUX sysklogd-1.4.2-caen-owl-syslogd-drop-root.diff 3245 BLAKE2B 9c0459edcdfd6c453aa6b379e698c4343d9110c329d01fb5481beb9533dc0a33aa812a2fe6a039c3ffe8b2458aaa1ce581195c2702a0b4e23c7a196a2d97e840 SHA512 87865e069f9c78990660cf29a37ba1ded7cc078ea8f05af63fc6068c470d1881181387477dccb830d96af05f352959181619380d61afccf3a11d213372e68852 -AUX sysklogd-1.5-build.patch 626 BLAKE2B 03fe37ad2095f88cfa5cf3b79ece26acf4d70f9a0817482e5a509044baca0a8e2f8a122bb90f0a8ffedc42342183d26071347354cd4946398b011124d9c2ff15 SHA512 aa8ce937733bb24f6b4bc4a47e40df99697c554276a29a21201b76354b902875bbeb7387520f3b7f8e05a76b16d3c4431bf775c85480fd9e31b78d499b5605fa -AUX sysklogd-1.5-debian-cron.patch 913 BLAKE2B 20c0fc489b5ed90576f02f400817537ba6a59dd3521de2bacbc97964748792069bbeb1a656e4384ce8edfca320c9f212f4f04f2c4c49374f9cd5b0b59bb30c2f SHA512 5af0a61e5fb8dd78c30fa42d747b4de3a4f68b80b86a2f53447d2277c98d72972c242ffe5649c30a9f08f30e27974fd3bfe4a5537fa1c7b8658312b0550b28e0 -AUX sysklogd-1.5-glibc-2.24.patch 279 BLAKE2B 635ad71844161a13f5c95e670db49c486a856556f10ccd04ea7f4b9cb1252aa9788a2f4e17864d4e0155fd3ca148862a48ce0c4808e389d37f146087088e60be SHA512 35d92a0f1665d38201bdb2f4d4c0e5f17a6086f7a38e489ac4820cdff166419992253fa6c73e321c73e209e4b41a6e2363e19060ef48f18fef8c5ea65ac2664e -AUX sysklogd-1.5-syslog-func-collision.patch 2273 BLAKE2B 7aa2ccaf4bb1663c7c71f0d9f67c17f39b6c61b4706352bf779eb9a790e2fed8753afeaa4c2234739513500383593ee2f59a87485378fb554589e0e9a77f61ad SHA512 1fc3e215a45d95dd11ca2d1713f9a3f416e82b9d60127da62d904071f02ec1e934aa099a20d09a7c1eea37f9d93dbaa0e0ce8118af9b58b92d781cc26659e5fc -AUX sysklogd-2.0.3-no_parallel_build.patch 1525 BLAKE2B c428f26bd96afed63b4df50f1cf99954fce78c45f33efff91ad03c22176c1b647669f94de9b0276b2f5460ddab96fdeca7a0925c11f78ee219a45634b716083b SHA512 e1386135e46b28fb9207a36dcd45a3b3dbc5abeedd814a57082ffd03604d70c03bf5ec14ff90698dc085ce55d1cbb2682f11aca652c64bbb755bbff1f55c2c70 -AUX sysklogd.confd 113 BLAKE2B 392d4c0ac09d5dd85d01e4d57cb541271e3c09ce90671d6bfcbecfde64184c94603929bee0fe3ae2d65af2b6283919b8a6517c1e551f870d4c0e25bf1ffad051 SHA512 4553d85e93fb07e7d4a6ed0b47a3ea2044a5605adaac05223724c32a60bb8ae96d99ca95965c3931640beef234e976c1141b83f603aa8c6e8aca1dec20ca807c -AUX sysklogd.confd2 129 BLAKE2B 1b58336456d16fc93b3141adbe1730901e87ee991cba61b1ebc83542b521c2131afe0005a1a5629f884758ff70dc798279ecb3b456e895e879df4c08fa102043 SHA512 d106937527abc14921b973dbd4a90c90b1ae640f10e6d286c16d5f6ef91205cd3a2f2bf7323afb463e59d00995379123a88d22adf4458c58eb9b2cf4a221f5c4 AUX sysklogd.confd3 71 BLAKE2B 26e34fc5bd8fe936cb5cbe1ad7b3dc9ae47e153d731ecde62a354470448f91950a5ffe76104e80307543922bbb5777b9e3d096af8740d66a4dd637f4aa3adac5 SHA512 80a2159d24b343a5b14da054bd073015ffc8f81c6e5b47114429b6c069b81a3331392c88baafd9a5ac1e0d778119fa7ca10def17eeb9b88c7f5cca1c0d31c6b2 AUX sysklogd.logrotate 402 BLAKE2B 2aba98bcef0516602268132507248ea44097541ac5659427f24a286661c500e6ff92b387f184bba84d0f10669ff9c917d7c8ee613c7fdb3a472434485b5f8c78 SHA512 655b25bc92c6d73807b11b0d64f97d619c067efb9fc16ee9c2aba5ba349b13991a22c83e7adaafb95e17578b17992992cab16d18b7bdb2be7d4fc876df5824f7 AUX sysklogd.rc10 443 BLAKE2B 04d5d645a6e79582ce4532fdf5eb4453c61e66017596c641b6ebc087963f7667dc3dcef6d2d90c0602da753fb77fdd063a1bae5907798c47e7c0e92feb9a884c SHA512 274642e7555badc2395e4a08684b07e4b5be91cfe92f5f2e47903263dde1ccb67c9a5932864eb623d11d97a3ad429b28a8ab7a8d93177e949a2f8dec9a1aaea4 -AUX sysklogd.rc7 1447 BLAKE2B 352be79eca7a99213557f29110a53eca85dfbc11e134eac48801b5d61ebca9e77beadbee10c7f86267fe3509e17352468f9f777d25a875d583292a409d5db071 SHA512 f3c8f00fbf65833735d57927fe25c6299103bbc0b8fa548103b4f2f06f0dc2aa2276f12326ff7477f4ba491a96ccd30fe01cc53e841b0ccee83c4dacabb5a94e -AUX sysklogd.rc9 1550 BLAKE2B 8bfa8e31e42c4d06b630a79b80031c6e8ad5334bf8353b2217e23dfa69d3a7a11dfed8b614aec6bc22d374e97878bc0339af6094ce3aa9ad4021c35d9261b6fa SHA512 58aafffa09fc5eee28478d86a3a6b568c6c38106b796409b1f4a41edc10389875a4750fe0f34fb165af27cc85143963d51a873603a90fbee5ae7da923ac6c8c9 -DIST sysklogd-1.5.1.tar.gz 90011 BLAKE2B c40bd8d5769f7d3d4141d602c74ac41e05a140743d18c4923d9368da7ba193ccb89a6837173994f0b7a9c290cc23f64513040434d7ab8df81b5d09b73b0263ad SHA512 a72196a1a172d25be1c4791ef6256fe71fa2ba8c1383d230e646e93f8a65c3a57c535189726325da4c792fdb2e9cb119bba43c878816a8e78e78189fd32b12b7 -DIST sysklogd-2.0.3.tar.gz 466919 BLAKE2B d9ada06dadb5a43ca7102cb24eaffa0494af2743f4714bab7d362cf480835ea9c3fc51ee171e4eb3b90380d63abe78c759bdfc5d946ec4d5bf8fce748cd916b9 SHA512 95ed0465e37b438d624b0a78d74c1194c57d117890492b5773c9ccefa7aa2c1f54ed510e54a29019fb2d7274200370031fe822a9316c154e64a2a01cb912d7a8 -DIST sysklogd-2.1.1.tar.gz 560806 BLAKE2B 576da4c75a5f75f9df438764083d5f4a26a29edce7d8d2ce8e27e35b1b3460289aa366ac5e7e3dd887f0c2bc08fdea8fcca5dedcf5e7c34aaf677ddb5745a0be SHA512 7b486a123b651e9393a4f4d0340e6356e9cf73f344c4a51f84b732134a6d61bf7ee09125d723dda3a2137c3b93c4df156b79193a8111d1ae5c339a668debada3 DIST sysklogd-2.1.2.tar.gz 561286 BLAKE2B f70c2d116740930761677b9fdf715242844a583a59cd93c2e3408f985ce856d1a9eabc3ba736d18af44e8d154cdadec88035fc357db83eb504b4c6f800ea1f1d SHA512 dcd715939b4285e08ead0a1e797d09a8845156f456d3776cfcd0bcff7fbb9a306cb84a2b22731b430e2199d59ba42ab975fed6e675cf9d8a78833575c1490268 -DIST sysklogd_1.5-6.diff.gz 25677 BLAKE2B 3cb1f596490998b6002d4656a2321a500ce9941a37737c0b9d4702bbb87d7bc9ba21b68e06d175e3c1714a701adc6b3312e18a556ebc9ef395d8968762830cb5 SHA512 816961a835a43057569f62fd20d9f7b5e0bfcfcb173b68947457708504db3ce47e635956c8a9564f9bd577d8f3c49dfc725d321dfd3370b2de918363c30f838e -EBUILD sysklogd-1.5.1-r1.ebuild 1698 BLAKE2B ea86766e53c00480c5ee34ad978e5abf138e7292ed49ff96d7a46f2fed4294729ba029da780d21c67fb688ebd26d669dabb939718542897563e7287ed22e138f SHA512 39232dbb53a7baa81ee2904bcb24f4626da3d5c1ae8acf9357c1e185f308a844c23f11d751655da6aed3067085e667e2c3392738fa66a36233d477a5f32ccf7a -EBUILD sysklogd-2.0.3.ebuild 1816 BLAKE2B e76c43c7baa2e932aa8177def561beaaacd4fdc4c5980a489737cedb032662c8ec600bedcb5edd4ffbfe8c34d05b1328b7b0030ef3bafe2f522cf41fe7d86bd0 SHA512 bb9beab5a739c694841b699ce078c160b7b021f2c8ff51dc0daacad9ae776a05f1131358172aa387a1ac321ec2860098dccf9dd83aa4018dd300b02aced9cc1c -EBUILD sysklogd-2.1.1.ebuild 2077 BLAKE2B 7d87b09abd93c2feac26b14e7005e8203e538748fd935f62c408526a1ef82e57bd4bbe98976232d679e515454f5e82fed5e7c3663335543c2858f4330392cfd2 SHA512 6ea17133dde836a6090a8fd61c19246a66d921303cfd5bde944eb31e7b28fc03beec84301a016602ce634437e80fca796a4fcfd45bb18ee5688a59df7b93ec8d -EBUILD sysklogd-2.1.2.ebuild 2077 BLAKE2B 7d87b09abd93c2feac26b14e7005e8203e538748fd935f62c408526a1ef82e57bd4bbe98976232d679e515454f5e82fed5e7c3663335543c2858f4330392cfd2 SHA512 6ea17133dde836a6090a8fd61c19246a66d921303cfd5bde944eb31e7b28fc03beec84301a016602ce634437e80fca796a4fcfd45bb18ee5688a59df7b93ec8d +EBUILD sysklogd-2.1.2.ebuild 2070 BLAKE2B c384d16cc257dd8d227440df40013b9b43000db5b52ce46999d40a1e7f98e29d417c16d8a5b60384ad995ca5185aa3638738f82ec817c572a15fd590e34f36b4 SHA512 bc7a3ec98e7d94a48db378894e107a89dc0361a84f840b3f0b9b42cd8ea2b308f7d6adef56e5e65416b9a4cec085e75fa3e175e812677b9918c3ceca047523f4 EBUILD sysklogd-9999.ebuild 2077 BLAKE2B 7d87b09abd93c2feac26b14e7005e8203e538748fd935f62c408526a1ef82e57bd4bbe98976232d679e515454f5e82fed5e7c3663335543c2858f4330392cfd2 SHA512 6ea17133dde836a6090a8fd61c19246a66d921303cfd5bde944eb31e7b28fc03beec84301a016602ce634437e80fca796a4fcfd45bb18ee5688a59df7b93ec8d -MISC metadata.xml 513 BLAKE2B dbb65f1982fba7751a6c64809adcbe4d44ee4313693b9999dbd8d4e6596325fcbea9d8eef294821967f5ccef4f3f5da32510474dbfcc0d29743d42237e1efa85 SHA512 76e47e89a7eef4aa7156145447003085cea5670881e2228c2b8baad238a4bb1b0efe95c3829656119d9f6d291fd49ca0b424f66d17e8989ec71f39355c504218 +MISC metadata.xml 432 BLAKE2B 6333f9e73c96d80b69a0ae252660f93ae1466fc44fa379a461e7b611dae4841d0511887ce9a1ec3aa1f49bdb33a98fedce734be92b53580578f0e6a5ca67f192 SHA512 37d1ffbcdd86f5e94f5e38902bcb710fce1eb1c2702c06e05b00d56b02f51c6babbc05b8d1aa43317d336ab58af1df88e173dd152e4b62ca4fce411fe4a8ac23 diff --git a/app-admin/sysklogd/files/sysklogd-1.4.2-caen-owl-klogd-drop-root.diff b/app-admin/sysklogd/files/sysklogd-1.4.2-caen-owl-klogd-drop-root.diff deleted file mode 100644 index 40b8817d4e28..000000000000 --- a/app-admin/sysklogd/files/sysklogd-1.4.2-caen-owl-klogd-drop-root.diff +++ /dev/null @@ -1,162 +0,0 @@ -http://cvsweb.openwall.com/cgi/cvsweb.cgi/~checkout~/Owl/packages/sysklogd/sysklogd-1.4.2-caen-owl-klogd-drop-root.diff?rev=1.2;content-type=text%2Fplain -diff -upk.orig sysklogd-1.4.2.orig/klogd.8 sysklogd-1.4.2/klogd.8 ---- sysklogd-1.4.2.orig/klogd.8 2005-03-11 16:12:09 +0000 -+++ sysklogd-1.4.2/klogd.8 2005-08-18 14:37:47 +0000 -@@ -18,6 +19,12 @@ klogd \- Kernel Log Daemon - .RB [ " \-f " - .I fname - ] -+.RB [ " \-u " -+.I username -+] -+.RB [ " \-j " -+.I chroot_dir -+] - .RB [ " \-iI " ] - .RB [ " \-n " ] - .RB [ " \-o " ] -@@ -53,6 +60,20 @@ stderr. - .BI "\-f " file - Log messages to the specified filename rather than to the syslog facility. - .TP -+.BI "\-u " username -+Tells klogd to become the specified user and drop root privileges before -+starting logging. -+.TP -+.BI "\-j " chroot_dir -+Tells klogd to -+.BR chroot (2) -+into this directory after initializing. -+This option is only valid if the \-u option is also used to run klogd -+without root privileges. -+Note that the use of this option will prevent \-i and \-I from working -+unless you set up the chroot directory in such a way that klogd can still -+read the kernel module symbols. -+.TP - .BI "\-i \-I" - Signal the currently executing klogd daemon. Both of these switches control - the loading/reloading of symbol information. The \-i switch signals the -diff -upk.orig sysklogd-1.4.2.orig/klogd.c sysklogd-1.4.2/klogd.c ---- sysklogd-1.4.2.orig/klogd.c 2005-08-18 12:29:52 +0000 -+++ sysklogd-1.4.2/klogd.c 2005-08-18 14:37:47 +0000 -@@ -261,6 +261,8 @@ - #include <stdarg.h> - #include <paths.h> - #include <stdlib.h> -+#include <pwd.h> -+#include <grp.h> - #include "klogd.h" - #include "ksyms.h" - #ifndef TESTING -@@ -315,6 +317,9 @@ static enum LOGSRC {none, proc, kernel} - int debugging = 0; - int symbols_twice = 0; - -+char *server_user = NULL; -+char *chroot_dir = NULL; -+int log_flags = 0; - - /* Function prototypes. */ - extern int ksyslog(int type, char *buf, int len); -@@ -535,8 +540,9 @@ static enum LOGSRC GetKernelLogSrc(void) - * First do a stat to determine whether or not the proc based - * file system is available to get kernel messages from. - */ -- if ( use_syscall || -- ((stat(_PATH_KLOG, &sb) < 0) && (errno == ENOENT)) ) -+ if (!server_user && -+ (use_syscall || -+ ((stat(_PATH_KLOG, &sb) < 0) && (errno == ENOENT)))) - { - /* Initialize kernel logging. */ - ksyslog(1, NULL, 0); -@@ -983,6 +989,27 @@ static void LogProcLine(void) - } - - -+static int drop_root(void) -+{ -+ struct passwd *pw; -+ -+ if (!(pw = getpwnam(server_user))) return -1; -+ -+ if (!pw->pw_uid) return -1; -+ -+ if (chroot_dir) { -+ if (chdir(chroot_dir)) return -1; -+ if (chroot(".")) return -1; -+ } -+ -+ if (setgroups(0, NULL)) return -1; -+ if (setgid(pw->pw_gid)) return -1; -+ if (setuid(pw->pw_uid)) return -1; -+ -+ return 0; -+} -+ -+ - int main(argc, argv) - - int argc; -@@ -1000,7 +1027,7 @@ int main(argc, argv) - chdir ("/"); - #endif - /* Parse the command-line. */ -- while ((ch = getopt(argc, argv, "c:df:iIk:nopsvx2")) != EOF) -+ while ((ch = getopt(argc, argv, "c:df:u:j:iIk:nopsvx2")) != EOF) - switch((char)ch) - { - case '2': /* Print lines with symbols twice. */ -@@ -1022,6 +1049,10 @@ int main(argc, argv) - case 'I': - SignalDaemon(SIGUSR2); - return(0); -+ case 'j': /* chroot 'j'ail */ -+ chroot_dir = optarg; -+ log_flags |= LOG_NDELAY; -+ break; - case 'k': /* Kernel symbol file. */ - symfile = optarg; - break; -@@ -1037,6 +1068,9 @@ int main(argc, argv) - case 's': /* Use syscall interface. */ - use_syscall = 1; - break; -+ case 'u': /* Run as this user */ -+ server_user = optarg; -+ break; - case 'v': - printf("klogd %s.%s\n", VERSION, PATCHLEVEL); - exit (1); -@@ -1045,6 +1079,10 @@ int main(argc, argv) - break; - } - -+ if (chroot_dir && !server_user) { -+ fputs("'-j' is only valid with '-u'\n", stderr); -+ exit(1); -+ } - - /* Set console logging level. */ - if ( log_level != (char *) 0 ) -@@ -1158,7 +1196,7 @@ int main(argc, argv) - } - } - else -- openlog("kernel", 0, LOG_KERN); -+ openlog("kernel", log_flags, LOG_KERN); - - - /* Handle one-shot logging. */ -@@ -1191,6 +1229,11 @@ int main(argc, argv) - } - } - -+ if (server_user && drop_root()) { -+ syslog(LOG_ALERT, "klogd: failed to drop root"); -+ Terminate(); -+ } -+ - /* The main loop. */ - while (1) - { diff --git a/app-admin/sysklogd/files/sysklogd-1.4.2-caen-owl-syslogd-bind.diff b/app-admin/sysklogd/files/sysklogd-1.4.2-caen-owl-syslogd-bind.diff deleted file mode 100644 index ad311a512c0f..000000000000 --- a/app-admin/sysklogd/files/sysklogd-1.4.2-caen-owl-syslogd-bind.diff +++ /dev/null @@ -1,103 +0,0 @@ -http://cvsweb.openwall.com/cgi/cvsweb.cgi/~checkout~/Owl/packages/sysklogd/sysklogd-1.4.2-caen-owl-syslogd-bind.diff?rev=1.1;content-type=text%2Fplain -diff -upk.orig sysklogd-1.4.2.orig/sysklogd.8 sysklogd-1.4.2/sysklogd.8 ---- sysklogd-1.4.2.orig/sysklogd.8 2004-07-09 17:33:32 +0000 -+++ sysklogd-1.4.2/sysklogd.8 2005-08-18 14:40:25 +0000 -@@ -15,6 +15,9 @@ sysklogd \- Linux system logging utiliti - .I config file - ] - .RB [ " \-h " ] -+.RB [ " \-i " -+.I IP address -+] - .RB [ " \-l " - .I hostlist - ] -@@ -104,6 +107,13 @@ Specifying this switch on the command li - This can cause syslog loops that fill up hard disks quite fast and - thus needs to be used with caution. - .TP -+.BI "\-i " "IP address" -+If -+.B syslogd -+is configured to accept log input from a UDP port, specify an IP address -+to bind to, rather than the default of INADDR_ANY. The address must be in -+dotted quad notation, DNS host names are not allowed. -+.TP - .BI "\-l " "hostlist" - Specify a hostname that should be logged only with its simple hostname - and not the fqdn. Multiple hosts may be specified using the colon -diff -upk.orig sysklogd-1.4.2.orig/syslogd.c sysklogd-1.4.2/syslogd.c ---- sysklogd-1.4.2.orig/syslogd.c 2005-08-18 14:33:22 +0000 -+++ sysklogd-1.4.2/syslogd.c 2005-08-18 14:40:25 +0000 -@@ -774,6 +774,8 @@ char **LocalHosts = NULL; /* these hosts - int NoHops = 1; /* Can we bounce syslog messages through an - intermediate host. */ - -+char *bind_addr = NULL; /* bind UDP port to this interface only */ -+ - extern int errno; - - /* Function prototypes. */ -@@ -878,7 +880,7 @@ int main(argc, argv) - funix[i] = -1; - } - -- while ((ch = getopt(argc, argv, "a:dhf:l:m:np:rs:v")) != EOF) -+ while ((ch = getopt(argc, argv, "a:dhf:i:l:m:np:rs:v")) != EOF) - switch((char)ch) { - case 'a': - if (nfunix < MAXFUNIX) -@@ -895,9 +897,17 @@ int main(argc, argv) - case 'h': - NoHops = 0; - break; -+ case 'i': -+ if (bind_addr) { -+ fprintf(stderr, "Only one -i argument allowed, " -+ "the first one is taken.\n"); -+ break; -+ } -+ bind_addr = optarg; -+ break; - case 'l': - if (LocalHosts) { -- fprintf (stderr, "Only one -l argument allowed," \ -+ fprintf(stderr, "Only one -l argument allowed, " - "the first one is taken.\n"); - break; - } -@@ -1244,7 +1254,7 @@ int main(argc, argv) - int usage() - { - fprintf(stderr, "usage: syslogd [-drvh] [-l hostlist] [-m markinterval] [-n] [-p path]\n" \ -- " [-s domainlist] [-f conffile]\n"); -+ " [-s domainlist] [-f conffile] [-i IP address]\n"); - exit(1); - } - -@@ -1286,15 +1296,22 @@ static int create_inet_socket() - int fd, on = 1; - struct sockaddr_in sin; - -+ memset(&sin, 0, sizeof(sin)); -+ sin.sin_family = AF_INET; -+ sin.sin_port = LogPort; -+ if (bind_addr) { -+ if (!inet_aton(bind_addr, &sin.sin_addr)) { -+ logerror("syslog: not a valid IP address to bind to."); -+ return -1; -+ } -+ } -+ - fd = socket(AF_INET, SOCK_DGRAM, 0); - if (fd < 0) { - logerror("syslog: Unknown protocol, suspending inet service."); - return fd; - } - -- memset(&sin, 0, sizeof(sin)); -- sin.sin_family = AF_INET; -- sin.sin_port = LogPort; - if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, \ - (char *) &on, sizeof(on)) < 0 ) { - logerror("setsockopt(REUSEADDR), suspending inet"); diff --git a/app-admin/sysklogd/files/sysklogd-1.4.2-caen-owl-syslogd-drop-root.diff b/app-admin/sysklogd/files/sysklogd-1.4.2-caen-owl-syslogd-drop-root.diff deleted file mode 100644 index 8c3f571f3ca2..000000000000 --- a/app-admin/sysklogd/files/sysklogd-1.4.2-caen-owl-syslogd-drop-root.diff +++ /dev/null @@ -1,118 +0,0 @@ -http://cvsweb.openwall.com/cgi/cvsweb.cgi/~checkout~/Owl/packages/sysklogd/sysklogd-1.4.2-caen-owl-syslogd-drop-root.diff?rev=1.1;content-type=text%2Fplain -diff -upk.orig sysklogd-1.4.2.orig/sysklogd.8 sysklogd-1.4.2/sysklogd.8 ---- sysklogd-1.4.2.orig/sysklogd.8 2005-08-18 14:40:25 +0000 -+++ sysklogd-1.4.2/sysklogd.8 2005-08-18 14:41:26 +0000 -@@ -32,6 +32,9 @@ sysklogd \- Linux system logging utiliti - .RB [ " \-s " - .I domainlist - ] -+.RB [ " \-u" -+.IB username -+] - .RB [ " \-v " ] - .LP - .SH DESCRIPTION -@@ -161,6 +164,19 @@ is specified and the host logging resolv - no domain would be cut, you will have to specify two domains like: - .BR "\-s north.de:infodrom.north.de" . - .TP -+.BI "\-u " "username" -+This causes the -+.B syslogd -+daemon to become the named user before starting up logging. -+ -+Note that when this option is in use, -+.B syslogd -+will open all log files as root when the daemon is first started; -+however, after a -+.B SIGHUP -+the files will be reopened as the non-privileged user. You should -+take this into account when deciding the ownership of the log files. -+.TP - .B "\-v" - Print version and exit. - .LP -diff -upk.orig sysklogd-1.4.2.orig/syslogd.c sysklogd-1.4.2/syslogd.c ---- sysklogd-1.4.2.orig/syslogd.c 2005-08-18 14:40:25 +0000 -+++ sysklogd-1.4.2/syslogd.c 2005-08-18 14:41:26 +0000 -@@ -524,6 +524,10 @@ static char sccsid[] = "@(#)syslogd.c 5. - #include <arpa/nameser.h> - #include <arpa/inet.h> - #include <resolv.h> -+ -+#include <pwd.h> -+#include <grp.h> -+ - #ifndef TESTING - #include "pidfile.h" - #endif -@@ -775,6 +779,7 @@ int NoHops = 1; /* Can we bounce syslog - intermediate host. */ - - char *bind_addr = NULL; /* bind UDP port to this interface only */ -+char *server_user = NULL; /* user name to run server as */ - - extern int errno; - -@@ -827,6 +832,21 @@ static int set_nonblock_flag(int desc) - return fcntl(desc, F_SETFL, flags | O_NONBLOCK); - } - -+static int drop_root(void) -+{ -+ struct passwd *pw; -+ -+ if (!(pw = getpwnam(server_user))) return -1; -+ -+ if (!pw->pw_uid) return -1; -+ -+ if (initgroups(server_user, pw->pw_gid)) return -1; -+ if (setgid(pw->pw_gid)) return -1; -+ if (setuid(pw->pw_uid)) return -1; -+ -+ return 0; -+} -+ - int main(argc, argv) - int argc; - char **argv; -@@ -880,7 +900,7 @@ int main(argc, argv) - funix[i] = -1; - } - -- while ((ch = getopt(argc, argv, "a:dhf:i:l:m:np:rs:v")) != EOF) -+ while ((ch = getopt(argc, argv, "a:dhf:i:l:m:np:rs:u:v")) != EOF) - switch((char)ch) { - case 'a': - if (nfunix < MAXFUNIX) -@@ -933,6 +953,9 @@ int main(argc, argv) - } - StripDomains = crunch_list(optarg); - break; -+ case 'u': -+ server_user = optarg; -+ break; - case 'v': - printf("syslogd %s.%s\n", VERSION, PATCHLEVEL); - exit (0); -@@ -1100,6 +1123,11 @@ int main(argc, argv) - kill (ppid, SIGTERM); - #endif - -+ if (server_user && drop_root()) { -+ dprintf("syslogd: failed to drop root\n"); -+ exit(1); -+ } -+ - /* Main loop begins here. */ - for (;;) { - int nfds; -@@ -1254,7 +1282,7 @@ int main(argc, argv) - int usage() - { - fprintf(stderr, "usage: syslogd [-drvh] [-l hostlist] [-m markinterval] [-n] [-p path]\n" \ -- " [-s domainlist] [-f conffile] [-i IP address]\n"); -+ " [-s domainlist] [-f conffile] [-i IP address] [-u username]\n"); - exit(1); - } - diff --git a/app-admin/sysklogd/files/sysklogd-1.5-build.patch b/app-admin/sysklogd/files/sysklogd-1.5-build.patch deleted file mode 100644 index 12f4822cd265..000000000000 --- a/app-admin/sysklogd/files/sysklogd-1.5-build.patch +++ /dev/null @@ -1,20 +0,0 @@ -respect env CC/CFLAGS/CPPFLAGS/LDFLAGS - ---- Makefile -+++ Makefile -@@ -17,14 +17,12 @@ - # along with this program; if not, write to the Free Software - # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - --CC= gcc - #SKFLAGS= -g -DSYSV -Wall - #LDFLAGS= -g --SKFLAGS= $(RPM_OPT_FLAGS) -O3 -DSYSV -fomit-frame-pointer -Wall -fno-strength-reduce -+SKFLAGS= $(CFLAGS) $(CPPFLAGS) -DSYSV -Wall -fno-strength-reduce - # -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE - # -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE - # $(shell getconf LFS_SKFLAGS) --LDFLAGS= -s - - # Look where your install program is. - INSTALL = /usr/bin/install diff --git a/app-admin/sysklogd/files/sysklogd-1.5-debian-cron.patch b/app-admin/sysklogd/files/sysklogd-1.5-debian-cron.patch deleted file mode 100644 index 7f6c2a79b0b2..000000000000 --- a/app-admin/sysklogd/files/sysklogd-1.5-debian-cron.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- debian/cron.daily -+++ debian/cron.daily -@@ -20,10 +20,6 @@ - # Written by Martin Schulze <joey@debian.org>. - # $Id: cron.daily,v 1.14 2007-05-28 16:33:34 joey Exp $ - --test -x /usr/sbin/syslogd-listfiles || exit 0 --test -x /sbin/syslogd || exit 0 --test -f /usr/share/sysklogd/dummy || exit 0 -- - set -e - - cd /var/log -@@ -41,4 +37,4 @@ - - # Restart syslogd - # --/etc/init.d/sysklogd reload-or-restart > /dev/null -+/etc/init.d/sysklogd --quiet reload ---- debian/cron.weekly -+++ debian/cron.weekly -@@ -19,10 +19,6 @@ - # Written by Ian A. Murdock <imurdock@debian.org>. - # $Id: cron.weekly,v 1.11 2007-05-28 16:33:34 joey Exp $ - --test -x /usr/sbin/syslogd-listfiles || exit 0 --test -x /sbin/syslogd || exit 0 --test -f /usr/share/sysklogd/dummy || exit 0 -- - set -e - - cd /var/log -@@ -40,4 +36,4 @@ - - # Restart syslogd - # --/etc/init.d/sysklogd reload-or-restart > /dev/null -+/etc/init.d/sysklogd --quiet reload diff --git a/app-admin/sysklogd/files/sysklogd-1.5-glibc-2.24.patch b/app-admin/sysklogd/files/sysklogd-1.5-glibc-2.24.patch deleted file mode 100644 index fcddb7574590..000000000000 --- a/app-admin/sysklogd/files/sysklogd-1.5-glibc-2.24.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- sysklogd-1.5.1/syslogd.c -+++ sysklogd-1.5.1/syslogd.c -@@ -2094,7 +2094,7 @@ - (void) signal(SIGCHLD, reapchild); /* reset signal handler -ASP */ - wait ((int *)0); - #else -- union wait status; -+ int status; - - while (wait3(&status, WNOHANG, (struct rusage *) NULL) > 0) - ; diff --git a/app-admin/sysklogd/files/sysklogd-1.5-syslog-func-collision.patch b/app-admin/sysklogd/files/sysklogd-1.5-syslog-func-collision.patch deleted file mode 100644 index 76912a265565..000000000000 --- a/app-admin/sysklogd/files/sysklogd-1.5-syslog-func-collision.patch +++ /dev/null @@ -1,103 +0,0 @@ -http://bugs.gentoo.org/342601 - -rename local "syslog" and "vsyslog" functions to avoid conflicts with glibc's - -patch by Dmitriy Matrosov - ---- sysklogd-1.5/klogd.c -+++ sysklogd-1.5/klogd.c -@@ -258,7 +262,6 @@ - #if !defined(__GLIBC__) - #include <linux/time.h> - #endif /* __GLIBC__ */ --#include <stdarg.h> - #include <paths.h> - #include <stdlib.h> - #include <pwd.h> -@@ -637,7 +640,7 @@ - } - argl += 3; - } -- syslog(priority, fmt, argl); -+ syslog_own(priority, fmt, argl); - va_end(ap); - #ifdef TESTING - putchar('\n'); -@@ -646,7 +649,7 @@ - } - - va_start(ap, fmt); -- vsyslog(priority, fmt, ap); -+ vsyslog_own(priority, fmt, ap); - va_end(ap); - #ifdef TESTING - printf ("\n"); -@@ -1205,7 +1208,7 @@ - } - - if (server_user && drop_root()) { -- syslog(LOG_ALERT, "klogd: failed to drop root"); -+ syslog_own(LOG_ALERT, "klogd: failed to drop root"); - Terminate(); - } - ---- sysklogd-1.5/klogd.h -+++ sysklogd-1.5/klogd.h -@@ -24,6 +24,7 @@ - #include <stdio.h> - #include <syslog.h> - #include <string.h> -+#include <stdarg.h> - - - /* Function prototypes. */ -@@ -38,3 +43,5 @@ - extern char * ExpandKadds(char *, char *); - extern void SetParanoiaLevel(int); - extern void Syslog(int priority, char *fmt, ...); -+extern void syslog_own(int, const char *, ...); -+extern void vsyslog_own(int, const char *, va_list); ---- sysklogd-1.5/ksym_mod.c -+++ sysklogd-1.5/ksym_mod.c -@@ -95,7 +98,6 @@ - #if !defined(__GLIBC__) - #include <linux/time.h> - #endif /* __GLIBC__ */ --#include <stdarg.h> - #include <paths.h> - #include <linux/version.h> - ---- sysklogd-1.5/syslog.c -+++ sysklogd-1.5/syslog.c -@@ -75,6 +79,10 @@ - - #define _PATH_LOGNAME "/dev/log" - -+ -+void syslog_own(int, const char *, ...); -+void vsyslog_own(int, const char *, va_list); -+ - static int LogFile = -1; /* fd for log */ - static int connected; /* have done connect */ - static int LogStat = 0; /* status bits, set by openlog() */ -@@ -82,17 +90,17 @@ - static int LogFacility = LOG_USER; /* default facility code */ - - void --syslog(int pri, const char *fmt, ...) -+syslog_own(int pri, const char *fmt, ...) - { - va_list ap; - - va_start(ap, fmt); -- vsyslog(pri, fmt, ap); -+ vsyslog_own(pri, fmt, ap); - va_end(ap); - } - - void --vsyslog(pri, fmt, ap) -+vsyslog_own(pri, fmt, ap) - int pri; - const char *fmt; - va_list ap; diff --git a/app-admin/sysklogd/files/sysklogd-2.0.3-no_parallel_build.patch b/app-admin/sysklogd/files/sysklogd-2.0.3-no_parallel_build.patch deleted file mode 100644 index fa0f96ce2c81..000000000000 --- a/app-admin/sysklogd/files/sysklogd-2.0.3-no_parallel_build.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 9cf1f97cef04fed81c2407f7207795d7592ccb96 Mon Sep 17 00:00:00 2001 -From: Joachim Nilsson <troglobit@gmail.com> -Date: Fri, 6 Dec 2019 18:19:05 +0100 -Subject: [PATCH] Fix nasty parallel build problem reported by Gentoo and - Westermo - -Independently of each other both the Gentoo project and Westermo found -an issue with massively parallel builds on monster-core-machines. At -Westermo there are 40 core Xeon monsters that stumble when building -sysklogd. - -The Gentoo bug report is here: - - https://bugs.gentoo.org/701894 - -The problem stems from strlcat.c and strlcpy.c being used for both -the libcompat convenience library built for libsyslog and als for -syslogd when the system does not have either of the APIs in libc, -i.e. most Linux systems with GLIBC or musl libc. - -I can either rewrite the Makefile.am files to handle dependencies -better, or we just disable parallel build like this patch. There's -too few source files to gain anything from parallel build anyway. - -Signed-off-by: Joachim Nilsson <troglobit@gmail.com> ---- - Makefile.am | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/Makefile.am b/Makefile.am -index c4cc80f..7e2b854 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -46,3 +46,6 @@ release: distcheck - # Workaround for systemd unit file duing distcheck - DISTCHECK_CONFIGURE_FLAGS = --with-systemd=$$dc_install_base/$(systemd) --with-klogd - -+# Disable parallel build in top Makefile, we might otherwise get a very -+# bizarre build problem with strlcpy.o in libcompat and for syslogd. -+.NOTPARALLEL: diff --git a/app-admin/sysklogd/files/sysklogd.confd b/app-admin/sysklogd/files/sysklogd.confd deleted file mode 100644 index c9735739117d..000000000000 --- a/app-admin/sysklogd/files/sysklogd.confd +++ /dev/null @@ -1,6 +0,0 @@ -# Config file for /etc/init.d/sysklogd - -SYSLOGD="-m 0" -# send warnings and above to the console -KLOGD="-c 3 -2" - diff --git a/app-admin/sysklogd/files/sysklogd.confd2 b/app-admin/sysklogd/files/sysklogd.confd2 deleted file mode 100644 index 077f36bf6b64..000000000000 --- a/app-admin/sysklogd/files/sysklogd.confd2 +++ /dev/null @@ -1,6 +0,0 @@ -# Config file for /etc/init.d/sysklogd - -SYSLOGD="-m 0 -s -s -r 10M:10" -# send warnings and above to the console -KLOGD="-c 3 -2" - diff --git a/app-admin/sysklogd/files/sysklogd.rc7 b/app-admin/sysklogd/files/sysklogd.rc7 deleted file mode 100644 index 787fe3d752d7..000000000000 --- a/app-admin/sysklogd/files/sysklogd.rc7 +++ /dev/null @@ -1,74 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License, v2 or later - -extra_started_commands="reload" - -depend() { - need clock hostname - provide logger -} - -start_daemon() { - local retval=0 - local daemon="$1" - local options="$2" - - [ -z "${daemon}" ] && return 1 - - ebegin "sysklogd -> start: ${daemon}" - start-stop-daemon --start --exec /usr/sbin/"${daemon}" \ - --pidfile /var/run/"${daemon}".pid -- ${options} - retval=$? - eend ${retval} "Failed to start ${daemon}" - - return ${retval} -} - -stop_daemon() { - local retval=0 - local daemon="$1" - - [ -z "${daemon}" ] && return 1 - - ebegin "sysklogd -> stop: ${daemon}" - # syslogd can be stubborn some times (--retry 15)... - start-stop-daemon --stop --retry 15 --quiet --pidfile /var/run/"${daemon}".pid - retval=$? - eend ${retval} "Failed to stop ${daemon}" - - return ${retval} -} - -start() { - start_daemon "syslogd" "${SYSLOGD}" || return 1 - - # klogd do not always start proper if started too early - sleep 1 - - if ! start_daemon "klogd" "${KLOGD}" ; then - stop_daemon "syslogd" - return 1 - fi - - return 0 -} - -stop() { - stop_daemon "klogd" || return 1 - stop_daemon "syslogd" || return 1 - return 0 -} - -reload() { - local ret=0 - - ebegin "Reloading configuration" - - start-stop-daemon --signal HUP --pidfile /var/run/syslogd.pid - ret=$((${ret} + $?)) - start-stop-daemon --signal USR1 --pidfile /var/run/klogd.pid - ret=$((${ret} + $?)) - - eend ${ret} -} diff --git a/app-admin/sysklogd/files/sysklogd.rc9 b/app-admin/sysklogd/files/sysklogd.rc9 deleted file mode 100644 index b0479f1c1754..000000000000 --- a/app-admin/sysklogd/files/sysklogd.rc9 +++ /dev/null @@ -1,82 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License, v2 or later - -extra_started_commands="reload" - -depend() { - need clock hostname - provide logger -} - -has_klogd() { - [ -x "/usr/sbin/klogd" ] -} - -start_daemon() { - local retval=0 - local daemon="$1" - local options="$2" - local fg_opt="" - - ebegin "sysklogd -> start: ${daemon}" - start-stop-daemon --start --exec /usr/sbin/"${daemon}" \ - -b -m --pidfile /var/run/"${daemon}".pid \ - -- -F ${options} - retval=$? - eend ${retval} "Failed to start ${daemon}" - - return ${retval} -} - -stop_daemon() { - local retval=0 - local daemon="$1" - - [ -z "${daemon}" ] && return 1 - - ebegin "sysklogd -> stop: ${daemon}" - # syslogd can be stubborn some times (--retry 15)... - start-stop-daemon --stop --retry 15 --quiet --pidfile /var/run/"${daemon}".pid - retval=$? - eend ${retval} "Failed to stop ${daemon}" - - return ${retval} -} - -start() { - start_daemon "syslogd" "${SYSLOGD}" || return 1 - - # klogd do not always start proper if started too early - sleep 1 - - if has_klogd && ! start_daemon "klogd" "${KLOGD}" ; then - stop_daemon "syslogd" - return 1 - fi - - return 0 -} - -stop() { - if has_klogd ; then - stop_daemon "klogd" || return 1 - fi - stop_daemon "syslogd" || return 1 - return 0 -} - -reload() { - local ret=0 - - ebegin "Reloading configuration" - - start-stop-daemon --signal HUP --pidfile /var/run/syslogd.pid - ret=$((${ret} + $?)) - if has_klogd ; then - start-stop-daemon --signal USR1 --pidfile /var/run/klogd.pid - ret=$((${ret} + $?)) - fi - - eend ${ret} -} diff --git a/app-admin/sysklogd/metadata.xml b/app-admin/sysklogd/metadata.xml index be89c65a5ee9..e86f25cd136b 100644 --- a/app-admin/sysklogd/metadata.xml +++ b/app-admin/sysklogd/metadata.xml @@ -6,7 +6,6 @@ <name>Gentoo Base System</name> </maintainer> <use> - <flag name="klogd">Build and install (deprecated) kernel logging daemon</flag> <flag name="logger">Build the logger program</flag> <flag name="logrotate">use app-admin/logrotate for rotating logs rather than custom cron scripts</flag> </use> diff --git a/app-admin/sysklogd/sysklogd-1.5.1-r1.ebuild b/app-admin/sysklogd/sysklogd-1.5.1-r1.ebuild deleted file mode 100644 index ac6a9f5aa0c1..000000000000 --- a/app-admin/sysklogd/sysklogd-1.5.1-r1.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils flag-o-matic toolchain-funcs - -DEB_PV="1.5-6" -DESCRIPTION="Standard log daemons" -HOMEPAGE="http://www.infodrom.org/projects/sysklogd/" -SRC_URI="http://www.infodrom.org/projects/sysklogd/download/${P}.tar.gz - mirror://debian/pool/main/s/sysklogd/${PN}_${DEB_PV}.diff.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86" -IUSE="logrotate" -RESTRICT="test" - -DEPEND="" -RDEPEND="dev-lang/perl - sys-apps/debianutils" - -DOCS=( ANNOUNCE CHANGES NEWS README.1st README.linux ) - -PATCHES=( - "${WORKDIR}"/${PN}_${DEB_PV}.diff - - "${FILESDIR}"/${PN}-1.5-debian-cron.patch - "${FILESDIR}"/${PN}-1.5-build.patch - - # CAEN/OWL security patches - "${FILESDIR}"/${PN}-1.4.2-caen-owl-syslogd-bind.diff - "${FILESDIR}"/${PN}-1.4.2-caen-owl-syslogd-drop-root.diff - "${FILESDIR}"/${PN}-1.4.2-caen-owl-klogd-drop-root.diff - - "${FILESDIR}"/${PN}-1.5-syslog-func-collision.patch #342601 - "${FILESDIR}"/${PN}-1.5-glibc-2.24.patch #604232 -) - -src_prepare() { - epatch "${PATCHES[@]}" -} - -src_configure() { - append-lfs-flags - tc-export CC -} - -src_install() { - dosbin syslogd klogd debian/syslog-facility debian/syslogd-listfiles - doman *.[1-9] debian/syslogd-listfiles.8 - insinto /etc - doins debian/syslog.conf - if use logrotate ; then - insinto /etc/logrotate.d - newins "${FILESDIR}"/sysklogd.logrotate sysklogd - else - exeinto /etc/cron.daily - newexe debian/cron.daily syslog - exeinto /etc/cron.weekly - newexe debian/cron.weekly syslog - fi - - einstalldocs - - newinitd "${FILESDIR}"/sysklogd.rc7 sysklogd - newconfd "${FILESDIR}"/sysklogd.confd sysklogd -} diff --git a/app-admin/sysklogd/sysklogd-2.0.3.ebuild b/app-admin/sysklogd/sysklogd-2.0.3.ebuild deleted file mode 100644 index 0830400639b1..000000000000 --- a/app-admin/sysklogd/sysklogd-2.0.3.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools flag-o-matic systemd toolchain-funcs - -DESCRIPTION="Standard log daemons" -HOMEPAGE="https://troglobit.com/sysklogd.html https://github.com/troglobit/sysklogd" -SRC_URI="https://github.com/troglobit/sysklogd/releases/download/v${PV}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" -IUSE="klogd logger logrotate systemd" -RESTRICT="test" - -DEPEND=" - logger? ( - !<sys-apps/util-linux-2.34-r3 - !>=sys-apps/util-linux-2.34-r3[logger] - ) -" -RDEPEND="${DEPEND}" - -DOCS=( ChangeLog.md README.md ) - -PATCHES=( - "${FILESDIR}"/${P}-no_parallel_build.patch #701894 -) - -pkg_setup() { - append-lfs-flags - tc-export CC -} - -src_prepare() { - default - eautoreconf -} - -src_configure() { - local myeconfargs=( - --runstatedir="${EPREFIX}"/run - $(use_with klogd) - $(use_with logger) - $(use_with systemd systemd $(systemd_get_systemunitdir)) - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - - insinto /etc - doins syslog.conf - keepdir /etc/syslog.d - - newinitd "${FILESDIR}"/sysklogd.rc9 sysklogd - newconfd "${FILESDIR}"/sysklogd.confd2 sysklogd - - if use logrotate ; then - insinto /etc/logrotate.d - newins "${FILESDIR}"/sysklogd.logrotate sysklogd - sed 's@ -r 10M:10@@' -i "${ED}"/etc/conf.d/sysklogd || die - fi - - find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die -} - -pkg_postinst() { - if ! use logrotate && [[ -n ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -lt 2.0 ; then - elog "Starting with version 2.0 syslogd has built in log rotation" - elog "functionality that does no longer require a running cron daemon." - elog "So we no longer install any log rotation cron files for sysklogd." - fi -} diff --git a/app-admin/sysklogd/sysklogd-2.1.1.ebuild b/app-admin/sysklogd/sysklogd-2.1.1.ebuild deleted file mode 100644 index ad19247bad98..000000000000 --- a/app-admin/sysklogd/sysklogd-2.1.1.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic systemd toolchain-funcs - -DESCRIPTION="Standard log daemons" -HOMEPAGE="https://troglobit.com/sysklogd.html https://github.com/troglobit/sysklogd" - -if [[ "${PV}" == *9999 ]] ; then - inherit autotools git-r3 - EGIT_REPO_URI="https://github.com/troglobit/sysklogd.git" -else - SRC_URI="https://github.com/troglobit/sysklogd/releases/download/v${PV}/${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" -fi - -LICENSE="BSD" -SLOT="0" -IUSE="logger logrotate systemd" -RESTRICT="test" - -DEPEND=" - logger? ( - !<sys-apps/util-linux-2.34-r3 - !>=sys-apps/util-linux-2.34-r3[logger] - ) -" -RDEPEND="${DEPEND}" - -DOCS=( ChangeLog.md README.md ) - -pkg_setup() { - append-lfs-flags - tc-export CC -} - -src_prepare() { - default - [[ "${PV}" == *9999 ]] && eautoreconf -} - -src_configure() { - local myeconfargs=( - --runstatedir="${EPREFIX}"/run - $(use_with logger) - $(use_with systemd systemd $(systemd_get_systemunitdir)) - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - - insinto /etc - doins syslog.conf - keepdir /etc/syslog.d - - newinitd "${FILESDIR}"/sysklogd.rc10 sysklogd - newconfd "${FILESDIR}"/sysklogd.confd3 sysklogd - - if use logrotate ; then - insinto /etc/logrotate.d - newins "${FILESDIR}"/sysklogd.logrotate sysklogd - sed 's@ -r 10M:10@@' -i "${ED}"/etc/conf.d/sysklogd || die - fi - - find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die -} - -pkg_postinst() { - if ! use logrotate && [[ -n ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -lt 2.0 ; then - elog "Starting with version 2.0 syslogd has built in log rotation" - elog "functionality that does no longer require a running cron daemon." - elog "So we no longer install any log rotation cron files for sysklogd." - fi - if [[ -n ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -lt 2.1 ; then - elog "Starting with version 2.1 sysklogd no longer provides klogd." - elog "syslogd now also logs kernel messages." - fi -} diff --git a/app-admin/sysklogd/sysklogd-2.1.2.ebuild b/app-admin/sysklogd/sysklogd-2.1.2.ebuild index ad19247bad98..275e55226102 100644 --- a/app-admin/sysklogd/sysklogd-2.1.2.ebuild +++ b/app-admin/sysklogd/sysklogd-2.1.2.ebuild @@ -13,7 +13,7 @@ if [[ "${PV}" == *9999 ]] ; then EGIT_REPO_URI="https://github.com/troglobit/sysklogd.git" else SRC_URI="https://github.com/troglobit/sysklogd/releases/download/v${PV}/${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" + KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86" fi LICENSE="BSD" |