diff options
Diffstat (limited to 'sys-process')
-rw-r--r-- | sys-process/Manifest.gz | bin | 10143 -> 10145 bytes | |||
-rw-r--r-- | sys-process/audit/Manifest | 6 | ||||
-rw-r--r-- | sys-process/audit/audit-3.1.4-r1.ebuild (renamed from sys-process/audit/audit-3.1.1.ebuild) | 28 | ||||
-rw-r--r-- | sys-process/audit/files/audit-3.0.8-linux-headers-5.17.patch | 41 | ||||
-rw-r--r-- | sys-process/audit/files/audit-3.1.4-c99.patch | 599 | ||||
-rw-r--r-- | sys-process/daemontools/Manifest | 2 | ||||
-rw-r--r-- | sys-process/daemontools/daemontools-0.76-r12.ebuild | 55 | ||||
-rw-r--r-- | sys-process/daemontools/files/0.76-const-typecasts-C99.patch | 292 | ||||
-rw-r--r-- | sys-process/gnome-usage/Manifest | 2 | ||||
-rw-r--r-- | sys-process/gnome-usage/gnome-usage-46.0.ebuild | 42 | ||||
-rw-r--r-- | sys-process/procps/Manifest | 2 | ||||
-rw-r--r-- | sys-process/procps/procps-4.0.4-r1.ebuild | 2 | ||||
-rw-r--r-- | sys-process/runit/Manifest | 2 | ||||
-rw-r--r-- | sys-process/runit/runit-2.1.2-r3.ebuild (renamed from sys-process/runit/runit-2.1.2-r2.ebuild) | 2 |
14 files changed, 1012 insertions, 63 deletions
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz Binary files differindex a10cffebe092..a6ddde3013c3 100644 --- a/sys-process/Manifest.gz +++ b/sys-process/Manifest.gz diff --git a/sys-process/audit/Manifest b/sys-process/audit/Manifest index ac23de364157..28ac1b502a31 100644 --- a/sys-process/audit/Manifest +++ b/sys-process/audit/Manifest @@ -1,15 +1,15 @@ -AUX audit-3.0.8-linux-headers-5.17.patch 1832 BLAKE2B 15d82a6c7c964f14414ca34ed09d4251c331497e9aae1f0cbb54398bef02a5be0eadbdee90b3bb26ac90e8b9825bdb09c01bfcea61cd99b905f508c08578a9ba SHA512 76a7f958c1523f3441ad9206f1bc58e71d81f992f64c06c69f705c8bdc535dff5078fcf89b93b195fb8a437079f27f0b75b7b1a2f12c16be309daec108b6c72b AUX audit-3.0.8-musl-malloc.patch 1415 BLAKE2B 0b3a9ec80ed8b445e4d5eea0b9f49f4e5a165ac538b7769305b9107be0874ee9b50f30ea13f77d1b9d54a35ada15a0dfd07e5b905f03b4df3834a4904dec4b94 SHA512 152674f0000a14d7e13b31c1b6cfc0bf48f94f56eb2a1d52e5aa2e306264c507dd1410b7a1457195578bce734ae9ac7f9ad3e10006a8451450b6d8bf6592a8d6 AUX audit-3.1.3-musl-malloc.patch 890 BLAKE2B bfe6bc484ed86af5c9bb03d53d5ba05c47a7e342665be02cb1ec23c00e7c1bdf1876021f3f787584c0685cd6b8a2f733ab9cbf65840fd161898d4a2b74d28412 SHA512 03c84792fa4dd3e4b9310b7e95247d1a8772e202c265b7f3272e57016b2b796b2bf71536a7e31143ad972b203d4470804288b9b973e3239670329ee5ac11cbca +AUX audit-3.1.4-c99.patch 17997 BLAKE2B 3e44a2f948dfed2f46c453c2e56a9440c56c58326f9e35a466119c3aa67ba56ca0a28e708a1a356400c411068fe09030c337a851ce8690a3645c58a5b406b7ae SHA512 cbf20ba9ffba31af0fa015a211fcb66d1420eff3547e3b7ff1e52e092fdb2a4d1bb790910d65774139b64c9dadcf68f75c56787fb7861a008cfd881bef3f7834 AUX audit.rules-2.1.3 1009 BLAKE2B df40176208bd68cb9021d15ea5803bb0d1c768c9d6400036a69409e1aae3ad55b89983ed94f22a6399a9cec8fc3dc7b20a7b27e75cdea24edda92b95ee19af87 SHA512 bce3ee9aaa0ab48395e6e10ee9b3627d6b7a8083abefdc4009de26649c65a39e000078f799e8c3c9e3341dfa030c6dfbbcad2fb7756fbb3d01b27be078adecec AUX audit.rules.stop.post 452 BLAKE2B b10d6d6c0fa475998856e674bd5c8dc0d7ca8f1d676a684223f48d1b22ce90441b2970c02b0eab882b3d3059f2b350d8a34109b03f5457f709624dccb3722e82 SHA512 a7bc52cbbea278a38e2837149524bb21b2c5367c96ed07fe576e08322595c5bee57ff07f8ebecd17391d9c3abe1ba187ac6e39400a153bf0ace4257303d036d3 AUX audit.rules.stop.pre 427 BLAKE2B ddf4ac16c3e1fd401c266287e792865adf8f4dd0b4bbaea6f991bf8dcee69c8ecd69c93d0cbd8352e280c3c61d24de23ca89f700e383c79036526e59c311c004 SHA512 def5ef378ad554f38754839d1c00c598686645a59896e37a3c7ff07b00aaa05a2b92305e49a750358eaba63a7d48fb647472529b155301069771678eed272463 AUX auditd-conf.d-2.1.3 734 BLAKE2B 018677362bc82c2052885cdd0e2185050cf5e97722ead4acdc51d428b52c265317c7dd03d1459be38b781e78f857cd967e5a60b68360c3381c31c62e1d61d843 SHA512 69d8777772ded7a8c0db2bcf84961b121bb355fa0d4ba0e14e311f8a8bfe665cbd2b7ac632d73477f9dfa9a6eec357a7ed458fe9b3e7b5ede75b166f3f092ab7 AUX auditd-init.d-2.4.3 2054 BLAKE2B 20e68ab676c925b8567a7e9a12d2ac055fd90477cbbd6444136b7198828798f7b6428948503c344639fab5fea54962682be7c986950c2cbae8b7c9dfeb321a4b SHA512 1b48c248db5d34f148f9c79f8b2a6acbf61c729230341b861f5e331bbfb0c8356305a09eb2cc5c82c14c4fd9a13c7c13957e1ed493834b8b3b9ee38978e4c31f -DIST audit-3.1.1.tar.gz 1218111 BLAKE2B a804684e438efc5f35b387708b3dc91bf857eeb56624261e0f75543556c436bfe638b792f63289f049c11541b10b2dc0e9f17b22f44b913da0168b1cf20684fc SHA512 4917970cc4c7f786c464a6d101bf66d55d55ac4716cf415ff97177f08176a6301e946716d28cf5b16054538469b3140b97db99d55a28686a9a807eea60c070f3 DIST audit-3.1.2.tar.gz 1219860 BLAKE2B dfdec470bf12cce6c570b3d260e65e2b49e8ac0761e6a6fbf7b4f4a57f92e88367cd74bfcb88e6d718619b88fea27ce963a977c9f4346c95d18a5310e217accb SHA512 a97003a294ed3671df01e2952688e7d5eef59a35f6891feb53e67c4c7eab9ae8c2d18de41a5b5b20e0ad7156fac93aec05f32f6bc5eea706b42b6f27f676446a DIST audit-3.1.3.tar.gz 1225761 BLAKE2B 97ee35fc722083d541e164b27fd318ec7be2a4e4e8774767d14c6a2e800092a37b7042a272db5d208c913fb36d295c5343bd6082237caf0fb561ec3c7a2883db SHA512 7d6399ca97b171d5ea3cf7f7566bdabe9d5677a3a54c75411146dc2971106809a90d1a9cd0b1ba9b8af4cc409e6bee5876c7f2a0c54c42400fdcf9cfade58a8c -EBUILD audit-3.1.1.ebuild 4961 BLAKE2B d13005c937536751f9649990378ceeae318cc284c55903c1f5ce6217ab57ab18354f8c4b1963e3ee1e6cc418d0232423117810d40f137d69d07f9603d19c5b4a SHA512 47a0d8b0beef8629a1b7619730a89adf12c74d52f5c8e9ccb2a00c05ba05cede72d065d8a4e9cffe64c644ded4d8bd579b382e649a5f3b92eb2141e06b48adf8 +DIST audit-3.1.4.tar.gz 1225648 BLAKE2B c6875f7d031e810469511ac8f86f05b2de7f19c044dbf67bc9d66430167fcf0f031e0279ce170a496b672a6fc99ee18b8cc39943e6faf3c19a24a381d2701439 SHA512 d26c498c91e838d97d3f199630650f509bb1e82b44d364306b20db32d4116fa73d775ef56c0fed2ec8d548b19215052691cbc80c74699bc87f2a0ea08cf664f5 EBUILD audit-3.1.2.ebuild 4808 BLAKE2B 6c0fc3cad44a8fa25428ae771feb649053238bbad4b925eb8ffd8ec5fb7345b092c8679273aa9a803959adf75682fe5b11a2bd020e2f93e815b33a89cab1d5d3 SHA512 11e52292da84178c5366c7e7c4560a2772f19b0566ee0f42b172c2612110a35cc28c718f5d26234f8b6e3c31f7e336c2d84e358b86f4e819709657a90e9e6abc EBUILD audit-3.1.3.ebuild 4813 BLAKE2B d97ddf923fbcd980d62b7650f5cf86e3cc90ec5657daeab6f80aa7b622e209a34068abd9602c66ff378bae482f4c9a76f9daeb1431873257f30f3ae2442c5de3 SHA512 3eb96b05b59d5048c799d928a25ddd021f4f0197699086636b3bfe4b85d517c49dd3ef3a2021f587e51f484c6a6fed9d576590fb3eeb695fadb9aee8ba4b50c1 +EBUILD audit-3.1.4-r1.ebuild 4798 BLAKE2B 2e42554299be2bed3a4ea5c7e45573a7c724ee6615ebe71b62176836a5d53e4129acf92bc71da61112dafce354595e69aee2be2e0c436a1ff8fc5cb38937f7c0 SHA512 94b11010c6924d1193068b965cef8d9fb7fd5d54e2e84c8189405020fff0119ff60bf10666b84c595d02f78acdc585b0d9637a35f7cd24247454ff0ff99dc834 MISC metadata.xml 628 BLAKE2B 1e927808210f4acff077f0c9e1a2d358c823fd5ce405b2ef5f0ed760cfa2ac059665f5a11cf1d87314012025844f21b3b9cb25f38a892f715ab2e7de47bbb86a SHA512 2bcb29cb5748ac22d0902dc616cf236eca7f5440c48a6f4bd2b7f2c65ec35cf63bda79252ea21d3553749146b9c84a6db7af256e01a84d347bfd4d8d60a204f6 diff --git a/sys-process/audit/audit-3.1.1.ebuild b/sys-process/audit/audit-3.1.4-r1.ebuild index 97910e182b7e..33f5402ee966 100644 --- a/sys-process/audit/audit-3.1.1.ebuild +++ b/sys-process/audit/audit-3.1.4-r1.ebuild @@ -7,7 +7,7 @@ EAPI=8 # check Fedora's packaging (https://src.fedoraproject.org/rpms/audit/tree/rawhide) # on bumps (or if hitting a bug) to see what they've done there. -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit autotools multilib-minimal toolchain-funcs python-r1 linux-info systemd usr-ldscript @@ -17,7 +17,7 @@ SRC_URI="https://people.redhat.com/sgrubb/audit/${P}.tar.gz" LICENSE="GPL-2+ LGPL-2.1+" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" IUSE="gssapi io-uring ldap python static-libs test" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" @@ -34,29 +34,27 @@ DEPEND=" >=sys-kernel/linux-headers-2.6.34 test? ( dev-libs/check ) " -BDEPEND="python? ( - dev-lang/swig - $(python_gen_cond_dep ' - dev-python/setuptools[${PYTHON_USEDEP}] - ' python3_12) - ) +BDEPEND=" + python? ( + dev-lang/swig + $(python_gen_cond_dep ' + dev-python/setuptools[${PYTHON_USEDEP}] + ' python3_12) + ) " CONFIG_CHECK="~AUDIT" -PATCHES=( - # See bug #836702 before removing / verify builds fine w/ USE=python - # with latest kernel headers. - "${FILESDIR}"/${PN}-3.0.8-linux-headers-5.17.patch - "${FILESDIR}"/${PN}-3.0.8-musl-malloc.patch -) - QA_CONFIG_IMPL_DECL_SKIP=( # missing on musl. Uses handrolled AC_LINK_IFELSE but fails at link time # for older compilers regardless. bug #898828 strndupa ) +PATCHES=( + "${FILESDIR}"/${P}-c99.patch +) + src_prepare() { # audisp-remote moved in multilib_src_install_all sed -i \ diff --git a/sys-process/audit/files/audit-3.0.8-linux-headers-5.17.patch b/sys-process/audit/files/audit-3.0.8-linux-headers-5.17.patch deleted file mode 100644 index 8d41d8363822..000000000000 --- a/sys-process/audit/files/audit-3.0.8-linux-headers-5.17.patch +++ /dev/null @@ -1,41 +0,0 @@ -Upstream rejected a workaround/fix at https://github.com/linux-audit/audit-userspace/pull/253 -/ https://github.com/linux-audit/audit-userspace/issues/252#issuecomment-1078595249. - -Instead, in Fedora (same maintainer as upstream), they're patching the headers then unpatching before install. - -Apparently the swig bindings are on their way out but I'm not convinced that's going to be a quick migration given the API will.. surely change? - -It's not ideal but let's take the patch slyfox ended up using in nixpkgs anyway. - -https://bugs.gentoo.org/836702 - -From beed138222421a2eb4212d83cb889404bd7efc49 Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich <slyich@gmail.com> -Date: Wed, 23 Mar 2022 07:27:05 +0000 -Subject: [PATCH] auditswig.i: avoid setter generation for audit_rule_data::buf - -As it's a flexible array generated code was never safe to use. -With kernel's https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=ed98ea2128b6fd83bce13716edf8f5fe6c47f574 -change it's a build failure now: - - audit> audit_wrap.c:5010:15: error: invalid use of flexible array member - audit> 5010 | arg1->buf = (char [])(char *)memcpy(malloc((size)*sizeof(char)), (const char *)(arg2), sizeof(char)*(size)); - audit> | ^ - -Let's avoid setter generation entirely. - -Closes: https://github.com/linux-audit/audit-userspace/issues/252 ---- a/bindings/swig/src/auditswig.i -+++ b/bindings/swig/src/auditswig.i -@@ -39,6 +39,10 @@ signed - #define __attribute(X) /*nothing*/ - typedef unsigned __u32; - typedef unsigned uid_t; -+/* Sidestep SWIG's limitation of handling c99 Flexible arrays by not: -+ * generating setters against them: https://github.com/swig/swig/issues/1699 -+ */ -+%ignore audit_rule_data::buf; - %include "/usr/include/linux/audit.h" - #define __extension__ /*nothing*/ - %include <stdint.i> - diff --git a/sys-process/audit/files/audit-3.1.4-c99.patch b/sys-process/audit/files/audit-3.1.4-c99.patch new file mode 100644 index 000000000000..e78d26038645 --- /dev/null +++ b/sys-process/audit/files/audit-3.1.4-c99.patch @@ -0,0 +1,599 @@ +https://bugs.gentoo.org/936080 +https://github.com/linux-audit/audit-userspace/commit/ec6763ed29a034b452a6fb568b226c57c7be30e7 + +From ec6763ed29a034b452a6fb568b226c57c7be30e7 Mon Sep 17 00:00:00 2001 +From: Yanase Yuki <41878038+zpc0@users.noreply.github.com> +Date: Tue, 14 May 2024 04:51:35 +0900 +Subject: [PATCH] Implicit builtin functions (#372) + +Correct a number of places where printf is being used without a prototype. +All cases are in libraries which should not be using printf. Change them +to return an error rather than communicate the problem. + +This is a backport of 8c7eaa7 + +Co-authored-by: Steve Grubb <ausearch.1@gmail.com> +--- a/audisp/audispd-llist.c ++++ b/audisp/audispd-llist.c +@@ -69,15 +69,13 @@ unsigned int plist_count_active(const conf_llist *l) + return cnt; + } + +-void plist_append(conf_llist *l, plugin_conf_t *p) ++int plist_append(conf_llist *l, plugin_conf_t *p) + { + lnode* newnode; + + newnode = malloc(sizeof(lnode)); +- if (newnode == NULL) { +- printf("Out of memory. Check %s file, %d line", __FILE__, __LINE__); +- return; +- } ++ if (newnode == NULL) ++ return 1; + + if (p) { + void *pp = malloc(sizeof(struct plugin_conf)); +@@ -98,6 +96,8 @@ void plist_append(conf_llist *l, plugin_conf_t *p) + // make newnode current + l->cur = newnode; + l->cnt++; ++ ++ return 0; + } + + void plist_clear(conf_llist* l) +--- a/audisp/audispd-llist.h ++++ b/audisp/audispd-llist.h +@@ -1,6 +1,6 @@ + /* + * audispd-llist.h - Header file for ausearch-conf_llist.c +-* Copyright (c) 2007,2013 Red Hat Inc., Durham, North Carolina. ++* Copyright (c) 2007,2013 Red Hat Inc. + * All Rights Reserved. + * + * This software may be freely redistributed and/or modified under the +@@ -51,7 +51,7 @@ unsigned int plist_count_active(const conf_llist *l); + void plist_last(conf_llist *l); + lnode *plist_next(conf_llist *l); + static inline lnode *plist_get_cur(conf_llist *l) { return l->cur; } +-void plist_append(conf_llist *l, plugin_conf_t *p); ++int plist_append(conf_llist *l, plugin_conf_t *p); + void plist_clear(conf_llist* l); + void plist_mark_all_unchecked(conf_llist* l); + lnode *plist_find_unchecked(conf_llist* l); +--- a/auparse/normalize-llist.c ++++ b/auparse/normalize-llist.c +@@ -1,6 +1,6 @@ + /* + * normalize-llist.c - Minimal linked list library +- * Copyright (c) 2016-17 Red Hat Inc., Durham, North Carolina. ++ * Copyright (c) 2016-17 Red Hat Inc. + * All Rights Reserved. + * + * This library is free software; you can redistribute it and/or +@@ -61,15 +61,14 @@ data_node *cllist_next(cllist *l) + return l->cur; + } + +-void cllist_append(cllist *l, uint32_t num, void *data) ++// Returns 0 on success and 1 on error ++int cllist_append(cllist *l, uint32_t num, void *data) + { + data_node *newnode; + + newnode = malloc(sizeof(data_node)); +- if (newnode == NULL) { +- printf("Out of memory. Check %s file, %d line", __FILE__, __LINE__); +- return; +- } ++ if (newnode == NULL) ++ return 1; + + newnode->num = num; + newnode->data = data; +@@ -84,5 +83,6 @@ void cllist_append(cllist *l, uint32_t num, void *data) + // make newnode current + l->cur = newnode; + l->cnt++; ++ return 0; + } + +--- a/auparse/normalize-llist.h ++++ b/auparse/normalize-llist.h +@@ -1,6 +1,6 @@ + /* + * normalize-llist.h - Header file for normalize-llist.c +- * Copyright (c) 2016-17 Red Hat Inc., Durham, North Carolina. ++ * Copyright (c) 2016-17 Red Hat Inc. + * All Rights Reserved. + * + * This library is free software; you can redistribute it and/or +@@ -53,7 +53,7 @@ AUDIT_HIDDEN_START + void cllist_create(cllist *l, void (*cleanup)(void *)); + void cllist_clear(cllist* l); + data_node *cllist_next(cllist *l); +-void cllist_append(cllist *l, uint32_t num, void *data); ++int cllist_append(cllist *l, uint32_t num, void *data); + + AUDIT_HIDDEN_END + +--- a/auparse/normalize.c ++++ b/auparse/normalize.c +@@ -179,7 +179,8 @@ static unsigned int add_subj_attr(auparse_state_t *au, const char *str, + if ((auparse_find_field(au, str))) { + attr = set_record(0, rnum); + attr = set_field(attr, auparse_get_field_num(au)); +- cllist_append(&D.actor.attr, attr, NULL); ++ if (cllist_append(&D.actor.attr, attr, NULL)) ++ return 1; + return 0; + } else + auparse_goto_record_num(au, rnum); +@@ -224,7 +225,8 @@ static unsigned int add_obj_attr(auparse_state_t *au, const char *str, + if ((auparse_find_field(au, str))) { + attr = set_record(0, rnum); + attr = set_field(attr, auparse_get_field_num(au)); +- cllist_append(&D.thing.attr, attr, NULL); ++ if (cllist_append(&D.thing.attr, attr, NULL)) ++ return 1; + return 0; + } else + auparse_goto_record_num(au, rnum); +@@ -360,21 +362,23 @@ static void collect_id_obj2(auparse_state_t *au, const char *syscall) + } + } + +-static void collect_path_attrs(auparse_state_t *au) ++static int collect_path_attrs(auparse_state_t *au) + { + value_t attr; + unsigned int rnum = auparse_get_record_num(au); + + auparse_first_field(au); + if (add_obj_attr(au, "mode", rnum)) +- return; // Failed opens don't have anything else ++ return 1; // Failed opens don't have anything else + + // All the rest of the fields matter + while ((auparse_next_field(au))) { + attr = set_record(0, rnum); + attr = set_field(attr, auparse_get_field_num(au)); +- cllist_append(&D.thing.attr, attr, NULL); ++ if (cllist_append(&D.thing.attr, attr, NULL)) ++ return 1; + } ++ return 0; + } + + static void collect_cwd_attrs(auparse_state_t *au) +--- a/src/auditctl-llist.c ++++ b/src/auditctl-llist.c +@@ -1,7 +1,7 @@ + /* + * ausearch-llist.c - Minimal linked list library +-* Copyright (c) 2005 Red Hat Inc., Durham, North Carolina. +-* All Rights Reserved. ++* Copyright (c) 2005 Red Hat Inc. ++* All Rights Reserved. + * + * This software may be freely redistributed and/or modified under the + * terms of the GNU General Public License as published by the Free +@@ -15,7 +15,7 @@ + * + * You should have received a copy of the GNU General Public License + * along with this program; see the file COPYING. If not, write to the +-* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor ++* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1335, USA. + * + * Authors: +@@ -59,19 +59,17 @@ lnode *list_next(llist *l) + return l->cur; + } + +-void list_append(llist *l, struct audit_rule_data *r, size_t sz) ++int list_append(llist *l, struct audit_rule_data *r, size_t sz) + { + lnode* newnode; + + newnode = malloc(sizeof(lnode)); +- if (newnode == NULL) { +- printf("Out of memory. Check %s file, %d line", __FILE__, __LINE__); +- return; +- } ++ if (newnode == NULL) ++ return 1; + + if (r) { + void *rr = malloc(sz); +- if (rr) ++ if (rr) + memcpy(rr, r, sz); + newnode->r = rr; + } else +@@ -89,6 +87,8 @@ void list_append(llist *l, struct audit_rule_data *r, size_t sz) + // make newnode current + l->cur = newnode; + l->cnt++; ++ ++ return 0; + } + + void list_clear(llist* l) +--- a/src/auditctl-llist.h ++++ b/src/auditctl-llist.h +@@ -1,6 +1,6 @@ + /* + * auditctl-llist.h - Header file for ausearch-llist.c +-* Copyright (c) 2005 Red Hat Inc., Durham, North Carolina. ++* Copyright (c) 2005 Red Hat Inc. + * All Rights Reserved. + * + * This software may be freely redistributed and/or modified under the +@@ -50,7 +50,7 @@ void list_first(llist *l); + void list_last(llist *l); + lnode *list_next(llist *l); + static inline lnode *list_get_cur(llist *l) { return l->cur; } +-void list_append(llist *l, struct audit_rule_data *r, size_t sz); ++int list_append(llist *l, struct audit_rule_data *r, size_t sz); + void list_clear(llist* l); + + #endif +--- a/src/ausearch-avc.c ++++ b/src/ausearch-avc.c +@@ -1,7 +1,7 @@ + /* + * ausearch-avc.c - Minimal linked list library for avcs +-* Copyright (c) 2006,2008,2014 Red Hat Inc., Durham, North Carolina. +-* All Rights Reserved. ++* Copyright (c) 2006,2008,2014 Red Hat Inc. ++* All Rights Reserved. + * + * This software may be freely redistributed and/or modified under the + * terms of the GNU General Public License as published by the Free +@@ -15,7 +15,7 @@ + * + * You should have received a copy of the GNU General Public License + * along with this program; see the file COPYING. If not, write to the +-* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor ++* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1335, USA. + * + * Authors: +@@ -62,15 +62,13 @@ static void alist_last(alist *l) + l->cur = cur; + } + +-void alist_append(alist *l, anode *node) ++int alist_append(alist *l, anode *node) + { + anode* newnode; + + newnode = malloc(sizeof(anode)); +- if (newnode == NULL) { +- printf("Out of memory. Check %s file, %d line", __FILE__, __LINE__); +- return; +- } ++ if (newnode == NULL) ++ return 1; + + if (node->scontext) + newnode->scontext = node->scontext; +@@ -108,6 +106,8 @@ void alist_append(alist *l, anode *node) + // make newnode current + l->cur = newnode; + l->cnt++; ++ ++ return 0; + } + + int alist_find_subj(alist *l) +--- a/src/ausearch-avc.h ++++ b/src/ausearch-avc.h +@@ -1,6 +1,6 @@ + /* + * ausearch-avc.h - Header file for ausearch-string.c +-* Copyright (c) 2006,2008 Red Hat Inc., Durham, North Carolina. ++* Copyright (c) 2006,2008 Red Hat Inc. + * All Rights Reserved. + * + * This software may be freely redistributed and/or modified under the +@@ -54,7 +54,7 @@ void alist_create(alist *l); + static inline void alist_first(alist *l) { l->cur = l->head; } + anode *alist_next(alist *l); + static inline anode *alist_get_cur(alist *l) { return l->cur; } +-void alist_append(alist *l, anode *node); ++int alist_append(alist *l, anode *node); + void anode_init(anode *an); + void anode_clear(anode *an); + void alist_clear(alist* l); +--- a/src/ausearch-int.c ++++ b/src/ausearch-int.c +@@ -1,6 +1,6 @@ + /* + * ausearch-int.c - Minimal linked list library for integers +-* Copyright (c) 2005,2008 Red Hat Inc., Durham, North Carolina. ++* Copyright (c) 2005,2008 Red Hat Inc. + * All Rights Reserved. + * + * This software may be freely redistributed and/or modified under the +@@ -41,15 +41,13 @@ int_node *ilist_next(ilist *l) + return l->cur; + } + +-void ilist_append(ilist *l, int num, unsigned int hits, int aux) ++int ilist_append(ilist *l, int num, unsigned int hits, int aux) + { + int_node* newnode; + + newnode = malloc(sizeof(int_node)); +- if (newnode == NULL) { +- printf("Out of memory. Check %s file, %d line", __FILE__, __LINE__); +- return; +- } ++ if (newnode == NULL) ++ return 1; + + newnode->num = num; + newnode->hits = hits; +@@ -65,6 +63,8 @@ void ilist_append(ilist *l, int num, unsigned int hits, int aux) + // make newnode current + l->cur = newnode; + l->cnt++; ++ ++ return 0; + } + + void ilist_clear(ilist* l) +--- a/src/ausearch-int.h ++++ b/src/ausearch-int.h +@@ -1,6 +1,6 @@ + /* + * ausearch-int.h - Header file for ausearch-int.c +-* Copyright (c) 2005,2008 Red Hat Inc., Durham, North Carolina. ++* Copyright (c) 2005,2008 Red Hat Inc. + * All Rights Reserved. + * + * This software may be freely redistributed and/or modified under the +@@ -48,7 +48,7 @@ void ilist_create(ilist *l); + static inline void ilist_first(ilist *l) { l->cur = l->head; } + int_node *ilist_next(ilist *l); + static inline int_node *ilist_get_cur(ilist *l) { return l->cur; } +-void ilist_append(ilist *l, int num, unsigned int hits, int aux); ++int ilist_append(ilist *l, int num, unsigned int hits, int aux); + void ilist_clear(ilist* l); + + /* append a number if its not already on the list */ +--- a/src/ausearch-llist.c ++++ b/src/ausearch-llist.c +@@ -1,6 +1,6 @@ + /* + * ausearch-llist.c - Minimal linked list library +-* Copyright (c) 2005-2008,2011,2016 Red Hat Inc., Durham, North Carolina. ++* Copyright (c) 2005-2008,2011,2016 Red Hat Inc. + * Copyright (c) 2011 IBM Corp. + * All Rights Reserved. + * +@@ -102,15 +102,13 @@ lnode *list_prev(llist *l) + return l->cur; + } + +-void list_append(llist *l, lnode *node) ++int list_append(llist *l, lnode *node) + { + lnode* newnode; + + newnode = malloc(sizeof(lnode)); +- if (newnode == NULL) { +- printf("Out of memory. Check %s file, %d line", __FILE__, __LINE__); +- return; +- } ++ if (newnode == NULL) ++ return 1; + + if (node->message) + newnode->message = node->message; +@@ -123,7 +121,7 @@ void list_append(llist *l, lnode *node) + newnode->type = node->type; + newnode->a0 = node->a0; + newnode->a1 = node->a1; +- newnode->item = l->cnt; ++ newnode->item = l->cnt; + newnode->next = NULL; + + // if we are at top, fix this up +@@ -135,6 +133,8 @@ void list_append(llist *l, lnode *node) + // make newnode current + l->cur = newnode; + l->cnt++; ++ ++ return 0; + } + + int list_find_item(llist *l, unsigned int i) +--- a/src/ausearch-llist.h ++++ b/src/ausearch-llist.h +@@ -107,7 +107,7 @@ void list_last(llist *l); + lnode *list_next(llist *l); + lnode *list_prev(llist *l); + static inline lnode *list_get_cur(llist *l) { return l->cur; } +-void list_append(llist *l, lnode *node); ++int list_append(llist *l, lnode *node); + void list_clear(llist* l); + int list_get_event(llist* l, event *e); + +--- a/src/ausearch-nvpair.c ++++ b/src/ausearch-nvpair.c +@@ -1,6 +1,6 @@ + /* + * ausearch-nvpair.c - Minimal linked list library for name-value pairs +-* Copyright (c) 2006-08 Red Hat Inc., Durham, North Carolina. ++* Copyright (c) 2006-08 Red Hat Inc. + * All Rights Reserved. + * + * This software may be freely redistributed and/or modified under the +@@ -42,13 +42,11 @@ nvnode *search_list_next(nvlist *l) + return l->cur; + } + +-void search_list_append(nvlist *l, nvnode *node) ++int search_list_append(nvlist *l, nvnode *node) + { + nvnode* newnode = malloc(sizeof(nvnode)); +- if (newnode == NULL) { +- printf("Out of memory. Check %s file, %d line", __FILE__, __LINE__); +- return; +- } ++ if (newnode == NULL) ++ return 1; + + newnode->name = node->name; + newnode->val = node->val; +@@ -66,6 +64,8 @@ void search_list_append(nvlist *l, nvnode *node) + // make newnode current + l->cur = newnode; + l->cnt++; ++ ++ return 0; + } + + int search_list_find_val(nvlist *l, long val) +--- a/src/ausearch-nvpair.h ++++ b/src/ausearch-nvpair.h +@@ -1,6 +1,6 @@ + /* + * ausearch-nvpair.h - Header file for ausearch-nvpair.c +-* Copyright (c) 2006-08 Red Hat Inc., Durham, North Carolina. ++* Copyright (c) 2006-08 Red Hat Inc. + * All Rights Reserved. + * + * This software may be freely redistributed and/or modified under the +@@ -48,7 +48,7 @@ void search_list_create(nvlist *l); + static inline void search_list_first(nvlist *l) { l->cur = l->head; } + nvnode *search_list_next(nvlist *l); + static inline nvnode *search_list_get_cur(nvlist *l) { return l->cur; } +-void search_list_append(nvlist *l, nvnode *node); ++int search_list_append(nvlist *l, nvnode *node); + void search_list_clear(nvlist* l); + + /* Given a numeric index, find that record. */ +--- a/src/ausearch-string.c ++++ b/src/ausearch-string.c +@@ -44,15 +44,13 @@ snode *slist_next(slist *l) + return l->cur; + } + +-void slist_append(slist *l, snode *node) ++int slist_append(slist *l, snode *node) + { + snode* newnode; + + newnode = malloc(sizeof(snode)); +- if (newnode == NULL) { +- printf("Out of memory. Check %s file, %d line", __FILE__, __LINE__); +- return; +- } ++ if (newnode == NULL) ++ return 1; + + if (node->str) + newnode->str = node->str; +@@ -79,6 +77,8 @@ void slist_append(slist *l, snode *node) + // make newnode current + l->cur = newnode; + l->cnt++; ++ ++ return 0; + } + + void slist_clear(slist* l) +--- a/src/ausearch-string.h ++++ b/src/ausearch-string.h +@@ -49,7 +49,7 @@ void slist_create(slist *l); + static inline void slist_first(slist *l) { l->cur = l->head; } + snode *slist_next(slist *l); + static inline snode *slist_get_cur(slist *l) { return l->cur; } +-void slist_append(slist *l, snode *node); ++int slist_append(slist *l, snode *node); + void slist_clear(slist* l); + + /* append a string if its not already on the list */ +--- a/tools/aulastlog/aulastlog-llist.c ++++ b/tools/aulastlog/aulastlog-llist.c +@@ -1,7 +1,7 @@ + /* + * aulastlog-llist.c - Minimal linked list library +-* Copyright (c) 2008 Red Hat Inc., Durham, North Carolina. +-* All Rights Reserved. ++* Copyright (c) 2008 Red Hat Inc.. ++* All Rights Reserved. + * + * This software may be freely redistributed and/or modified under the + * terms of the GNU General Public License as published by the Free +@@ -15,7 +15,7 @@ + * + * You should have received a copy of the GNU General Public License + * along with this program; see the file COPYING. If not, write to the +-* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor ++* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1335, USA. + * + * Authors: +@@ -41,15 +41,13 @@ lnode *list_next(llist *l) + return l->cur; + } + +-void list_append(llist *l, lnode *node) ++int list_append(llist *l, lnode *node) + { + lnode* newnode; + + newnode = malloc(sizeof(lnode)); +- if (newnode == NULL) { +- printf("Out of memory. Check %s file, %d line", __FILE__, __LINE__); +- return; +- } ++ if (newnode == NULL) ++ return 1; + + newnode->sec = node->sec; + newnode->uid = node->uid; +@@ -62,7 +60,7 @@ void list_append(llist *l, lnode *node) + newnode->term = strdup(node->term); + else + newnode->term = NULL; +- newnode->item = l->cnt; ++ newnode->item = l->cnt; + newnode->next = NULL; + + // if we are at top, fix this up +@@ -74,6 +72,8 @@ void list_append(llist *l, lnode *node) + // make newnode current + l->cur = newnode; + l->cnt++; ++ ++ return 0; + } + + void list_clear(llist* l) +--- a/tools/aulastlog/aulastlog-llist.h ++++ b/tools/aulastlog/aulastlog-llist.h +@@ -1,6 +1,6 @@ + /* + * aulastlog-llist.h - Header file for aulastlog-llist.c +-* Copyright (c) 2008 Red Hat Inc., Durham, North Carolina. ++* Copyright (c) 2008 Red Hat Inc. + * All Rights Reserved. + * + * This software may be freely redistributed and/or modified under the +@@ -53,7 +53,7 @@ static inline void list_first(llist *l) { l->cur = l->head; } + lnode *list_next(llist *l); + static inline lnode *list_get_cur(llist *l) { return l->cur; } + static inline unsigned int list_get_cnt(llist *l) { return l->cnt; } +-void list_append(llist *l, lnode *node); ++int list_append(llist *l, lnode *node); + void list_clear(llist* l); + int list_update_login(llist* l, time_t t); + int list_update_host(llist* l, const char *h); + diff --git a/sys-process/daemontools/Manifest b/sys-process/daemontools/Manifest index 4f33907629ad..2a6f67f0198f 100644 --- a/sys-process/daemontools/Manifest +++ b/sys-process/daemontools/Manifest @@ -1,4 +1,5 @@ AUX 0.76-C99-decls.patch 10397 BLAKE2B 3072b01973ebdf4e12d2d25ac70a953028c360a721b2ca6ef9cd05d6803fb3c9e48d9b7b11112d401e16b5e9dc039500cb2d9b5752000dcaabcc905c70643ad8 SHA512 36695347e98d4dc177f685cddcf9e7331da8630f0632d1fb35a2df1898c9e4a73d8908b56dd218d9b6f06cd3f063e6a946567ab256498bf0d425ea2f06719c58 +AUX 0.76-const-typecasts-C99.patch 9031 BLAKE2B 694b57edb7e44e6646191f0a9ae5d5fc44f29962eb56ed9e2410ac5d52b7059ec9743295c968b42c1a48fe6817628c326292cc243c0d367261160293079230df SHA512 bef1878140428a5c1ba06ad7d7d375c875569ca95ada71752de5bf3f969df839ac59f588b258e24673d5f6a3195c78c9868dd61c3d3a63583508fd0deb40d2fd AUX 0.76-errno.patch 246 BLAKE2B 10fc1da86bb91657dd9f1709f1f58852d93e6baa61ab89ce56911066677975699af1feff69bda5218afb36f2fbb66af6b810d5a9d8b6938054ff0123172c657a SHA512 76664b71e16ba4dbb081604a1a8c9ddc58a603777dccc0a53b0af9442ff8f0cdfce9ef8b05926dac62b81b2c805262df6a7e4df65920c00583132dbf136ba85e AUX 0.76-implicit-func-decl-clang16.patch 265 BLAKE2B 711ea0ff926d93964e6333745eb830979f50929892650489367246ab3c93963b28a4cecac5a3f72defa50646550b623687119036ac412930c836569c728cf37b SHA512 209250b752cda3d3b67784e3c906c02ae365de884dec759e21fd14ecaa433f7f6d646afc918d8c0ffd9eab313ccaacf482e1920669b9e2c884b79b7e1cfd6f66 AUX 0.76-makefile.patch 3630 BLAKE2B 777309c2c8d029927e29b1587c751ce9100dbc258d22b6b45d1375b52a15bb0c369086d762e521b4858eaaed432d06f834c7bee3c0de208fbcab05f7712e9a5d SHA512 8df1923e9b3fa84430941c652bf3462e6ce9d4dfee67ccfce36512124aaa7ad364c2a8f2f2c1e4fef2ffb55a60491fe5208df576965d072a3c5c396da711d030 @@ -7,4 +8,5 @@ DIST daemontools-0.76-man-20020131.tar.gz 8005 BLAKE2B 0c8f0ae71754516fda772b377 DIST daemontools-0.76.tar.gz 36975 BLAKE2B cb45c92fc06169b617befe9f9193377a07d31e9e6ae05526c299ce2a63c8009b599384a87f768fbe9283b229083ef74007b85662976cf7add5c855f5018fafa8 SHA512 e4a7938352b745a03ccc41acdddba1e6782f0ca245e5cae060de62ab6c5a23c841a994c30140298d274405a7f26d53ba7e84e5810a3d185b2c01e4c0feffe6c7 EBUILD daemontools-0.76-r10.ebuild 1343 BLAKE2B b34581ec22e8be4c29b76995d351aa559c6aa5471b8aa38adf8500493088639724cf66e7c19e1cbc7a06f589b60eefddb58c22fa05e1178b0083e163597c16f0 SHA512 6293cf98ed25b886e80013b07e98117073f03d6f0a4f2a186e74fd4a1fe152ce490ecad31192903681be1ef04182db3d7171236d69b0758a99ca86194eab5f13 EBUILD daemontools-0.76-r11.ebuild 1397 BLAKE2B b8e5ea3cc96ba23a01b96a7234ac83a127c83b23f1494be3bd822d288bd2a51495fcc52bea5d07fd480784ff4a44204779947fdd6b4327fcbd6202e48741afd0 SHA512 29010524af5267947c69bf7f7ea99588575a715db392961c048bb6828c0ba16474c866dff3f65385b6b09499be1e5776283d2a6a386e8ad99c0da9ca0e56845c +EBUILD daemontools-0.76-r12.ebuild 1452 BLAKE2B 5f5cb0c148769ed9116262faf683d6742c61febffb905e319ba80d809fff0cd52c38e984069a91c0e41ed1e52eff8cf07746274df8e581d8e966e0c0fda7040f SHA512 efbec6f58dbd4c8d5502f2c50c9275af141b2bd9a28674a349221d72afe4c0808c5795be5441e726e2bcfd3cf87ae1b9e08dad804eaee6a076299d9e286a2b04 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3 diff --git a/sys-process/daemontools/daemontools-0.76-r12.ebuild b/sys-process/daemontools/daemontools-0.76-r12.ebuild new file mode 100644 index 000000000000..308128cac5a2 --- /dev/null +++ b/sys-process/daemontools/daemontools-0.76-r12.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic toolchain-funcs + +DESCRIPTION="Collection of tools for managing UNIX services" +HOMEPAGE="https://cr.yp.to/daemontools.html" +SRC_URI=" + https://cr.yp.to/daemontools/${P}.tar.gz + https://smarden.org/pape/djb/manpages/${P}-man-20020131.tar.gz" +S="${WORKDIR}/admin/${P}/src" + +LICENSE="public-domain GPL-2" # GPL-2 for init script +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +IUSE="selinux static" + +RDEPEND="selinux? ( sec-policy/selinux-daemontools )" + +PATCHES=( + "${FILESDIR}"/${PV}-errno.patch + "${FILESDIR}"/${PV}-C99-decls.patch + "${FILESDIR}"/${PV}-makefile.patch + "${FILESDIR}"/${PV}-implicit-func-decl-clang16.patch + "${FILESDIR}"/${PV}-const-typecasts-C99.patch +) + +src_configure() { + tc-export AR CC + use static && append-ldflags -static + + touch home || die +} + +src_install() { + keepdir /service + + dobin $(<../package/commands) + dodoc CHANGES ../package/README TODO + doman "${WORKDIR}"/${PN}-man/*.8 + + newinitd "${FILESDIR}"/svscan.init-0.76-r7 svscan +} + +pkg_postinst() { + einfo + einfo "You can run daemontools using the svscan init.d script," + einfo "or you could run it through inittab." + einfo "To use inittab, emerge supervise-scripts and run:" + einfo "svscan-add-to-inittab" + einfo "Then you can hup init with the command telinit q" + einfo +} diff --git a/sys-process/daemontools/files/0.76-const-typecasts-C99.patch b/sys-process/daemontools/files/0.76-const-typecasts-C99.patch new file mode 100644 index 000000000000..3b34db2d2c08 --- /dev/null +++ b/sys-process/daemontools/files/0.76-const-typecasts-C99.patch @@ -0,0 +1,292 @@ +Memory allocation should have internal accounting and automatically +free the memory that was allocated and pointed by this, whatever +type pointer is. +Also, there's a lot of erroneous assignments of const types, added +consts everywhere, removed or cast them away only where it was impossible +https://bugs.gentoo.org/920062 +--- a/pathexec_env.c 2024-05-11 08:21:41.834811961 +0000 ++++ b/pathexec_env.c 2024-05-11 08:23:16.190437842 +0000 +@@ -65,5 +65,5 @@ + e[elen] = 0; + + pathexec_run(*argv,argv,e); +- alloc_free(e); ++ alloc_free((char *)e); + } +diff '--color=auto' -ru a/buffer.c b/buffer.c +--- a/buffer.c 2024-06-23 17:46:32.395780947 -0000 ++++ b/buffer.c 2024-06-23 17:53:20.305622176 -0000 +@@ -2,7 +2,7 @@ + + #include "buffer.h" + +-void buffer_init(buffer *s,int (*op)(int, char*, int),int fd,char *buf,unsigned int len) ++void buffer_init(buffer *s,int (*op)(int, const char*, int),int fd,char *buf,unsigned int len) + { + s->x = buf; + s->fd = fd; +diff '--color=auto' -ru a/buffer.h b/buffer.h +--- a/buffer.h 2024-06-23 17:46:32.395780947 -0000 ++++ b/buffer.h 2024-06-23 17:56:59.835455791 -0000 +@@ -8,14 +8,14 @@ + unsigned int p; + unsigned int n; + int fd; +- int (*op)(int, char*, int); ++ int (*op)(int, const char*, int); + } buffer; + + #define BUFFER_INIT(op,fd,buf,len) { (buf), 0, (len), (fd), (op) } + #define BUFFER_INSIZE 8192 + #define BUFFER_OUTSIZE 8192 + +-extern void buffer_init(buffer *, int (*)(int, char*, int), int, char *, unsigned int); ++extern void buffer_init(buffer *, int (*)(int, const char*, int), int, char *, unsigned int); + + extern int buffer_flush(buffer *); + extern int buffer_put(buffer *,const char *,unsigned int); +@@ -49,8 +49,8 @@ + + extern int buffer_copy(buffer *,buffer *); + +-extern int buffer_unixread(int,char *,unsigned int); +-extern int buffer_unixwrite(int, char *, int); ++extern int buffer_unixread(int,const char *,unsigned int); ++extern int buffer_unixwrite(int, const char *, int); + + extern buffer *buffer_0; + extern buffer *buffer_0small; +diff '--color=auto' -ru a/buffer_0.c b/buffer_0.c +--- a/buffer_0.c 2024-06-23 17:46:32.395780947 -0000 ++++ b/buffer_0.c 2024-06-23 18:00:19.773386824 -0000 +@@ -2,7 +2,7 @@ + + #include "buffer.h" + +-int buffer_0_read(int fd, char *buf, int len) ++int buffer_0_read(int fd, const char *buf, int len) + { + if (buffer_flush(buffer_1) == -1) return -1; + return buffer_unixread(fd,buf,len); +diff '--color=auto' -ru a/buffer_get.c b/buffer_get.c +--- a/buffer_get.c 2024-06-23 17:46:32.395780947 -0000 ++++ b/buffer_get.c 2024-06-23 17:54:25.506277116 -0000 +@@ -4,7 +4,7 @@ + #include "byte.h" + #include "error.h" + +-static int oneread(int (*op)(int, char*, int),int fd,char *buf,unsigned int len) ++static int oneread(int (*op)(int, const char*, int),int fd,char *buf,unsigned int len) + { + int r; + +diff '--color=auto' -ru a/buffer_put.c b/buffer_put.c +--- a/buffer_put.c 2024-06-23 17:46:32.395780947 -0000 ++++ b/buffer_put.c 2024-06-23 17:51:41.689144081 -0000 +@@ -5,7 +5,7 @@ + #include "byte.h" + #include "error.h" + +-static int allwrite(int (*op)(int, char*, int),int fd,const char *buf,unsigned int len) ++static int allwrite(int (*op)(int, const char*, int),int fd,const char *buf,unsigned int len) + { + int w; + +diff '--color=auto' -ru a/buffer_read.c b/buffer_read.c +--- a/buffer_read.c 2024-06-23 17:46:32.387780989 -0000 ++++ b/buffer_read.c 2024-06-23 18:04:30.854044424 -0000 +@@ -3,7 +3,7 @@ + #include <unistd.h> + #include "buffer.h" + +-int buffer_unixread(int fd,char *buf,unsigned int len) ++int buffer_unixread(int fd,const char *buf,unsigned int len) + { +- return read(fd,buf,len); ++ return read(fd,(void *)buf,len); + } +diff '--color=auto' -ru a/buffer_write.c b/buffer_write.c +--- a/buffer_write.c 2024-06-23 17:46:32.395780947 -0000 ++++ b/buffer_write.c 2024-06-23 17:55:26.617953696 -0000 +@@ -3,7 +3,7 @@ + #include <unistd.h> + #include "buffer.h" + +-int buffer_unixwrite(int fd, char *buf, int len) ++int buffer_unixwrite(int fd, const char *buf, int len) + { + return write(fd,buf,len); + } +diff '--color=auto' -ru a/byte.h b/byte.h +--- a/byte.h 2024-06-23 17:46:32.395780947 -0000 ++++ b/byte.h 2024-06-23 18:07:46.502998389 -0000 +@@ -4,10 +4,10 @@ + #define BYTE_H + + unsigned int byte_chr(char *s, unsigned int n, int c); +-unsigned int byte_rchr(char *s, unsigned int n, int c); +-void byte_copy(char *to, unsigned int n, char *from); ++unsigned int byte_rchr(const char *s, unsigned int n, int c); ++void byte_copy(char *to, unsigned int n, const char *from); + void byte_copyr(char *to, unsigned int n, char *from); +-int byte_diff(char *s, unsigned int n, char *t); ++int byte_diff(char *s, unsigned int n, const char *t); + + #define byte_equal(s,n,t) (!byte_diff((s),(n),(t))) + +diff '--color=auto' -ru a/byte_copy.c b/byte_copy.c +--- a/byte_copy.c 2024-06-23 17:46:32.395780947 -0000 ++++ b/byte_copy.c 2024-06-23 17:48:30.327156821 -0000 +@@ -2,7 +2,7 @@ + + #include "byte.h" + +-void byte_copy(char *to, unsigned int n, char *from) ++void byte_copy(char *to, unsigned int n, const char *from) + { + for (;;) { + if (!n) return; *to++ = *from++; --n; +diff '--color=auto' -ru a/byte_diff.c b/byte_diff.c +--- a/byte_diff.c 2024-06-23 17:46:32.396780942 -0000 ++++ b/byte_diff.c 2024-06-23 17:48:50.431050426 -0000 +@@ -2,7 +2,7 @@ + + #include "byte.h" + +-int byte_diff(char *s, unsigned int n, char *t) ++int byte_diff(char *s, unsigned int n, const char *t) + { + for (;;) { + if (!n) return 0; if (*s != *t) break; ++s; ++t; --n; +diff '--color=auto' -ru a/byte_rchr.c b/byte_rchr.c +--- a/byte_rchr.c 2024-06-23 17:46:32.396780942 -0000 ++++ b/byte_rchr.c 2024-06-23 18:08:32.408752954 -0000 +@@ -2,11 +2,11 @@ + + #include "byte.h" + +-unsigned int byte_rchr(char *s, unsigned int n, int c) ++unsigned int byte_rchr(const char *s, unsigned int n, int c) + { + register char ch; +- register char *t; +- register char *u; ++ register const char *t; ++ register const char *u; + + ch = c; + t = s; +diff '--color=auto' -ru a/multilog.c b/multilog.c +--- a/multilog.c 2024-06-23 17:46:32.396780942 -0000 ++++ b/multilog.c 2024-06-23 18:09:29.152449574 -0000 +@@ -173,7 +173,7 @@ + + void startprocessor(struct cyclog *d) + { +- const char *args[4]; ++ char *args[4]; + int fd; + + sig_uncatch(sig_term); +@@ -268,7 +268,7 @@ + } + } + +-int c_write(int pos,char *buf,int len) ++int c_write(int pos,const char *buf,int len) + { + struct cyclog *d; + int w; +@@ -446,7 +446,7 @@ + flagforcerotate = 1; + } + +-int flushread(int fd,char *buf,int len) ++int flushread(int fd,const char *buf,int len) + { + int j; + +@@ -468,7 +468,7 @@ + sig_unblock(sig_term); + sig_unblock(sig_alarm); + +- len = read(fd,buf,len); ++ len = read(fd,(void *)buf,len); + + sig_block(sig_term); + sig_block(sig_alarm); +diff '--color=auto' -ru a/pathexec_run.c b/pathexec_run.c +--- a/pathexec_run.c 2024-06-23 17:46:32.396780942 -0000 ++++ b/pathexec_run.c 2024-06-23 17:59:54.340522801 -0000 +@@ -16,7 +16,7 @@ + int savederrno; + + if (file[str_chr(file,'/')]) { +- execve(file,argv,envp); ++ execve(file,(char *const *)argv,(char *const *)envp); + return; + } + +@@ -33,7 +33,7 @@ + if (!stralloc_cats(&tmp,file)) return; + if (!stralloc_0(&tmp)) return; + +- execve(tmp.s,argv,envp); ++ execve(tmp.s,(char *const *)argv,(char *const *)envp); + if (errno != error_noent) { + savederrno = errno; + if ((errno != error_acces) && (errno != error_perm) && (errno != error_isdir)) return; +diff '--color=auto' -ru a/supervise.c b/supervise.c +--- a/supervise.c 2024-06-23 17:46:32.397780936 -0000 ++++ b/supervise.c 2024-06-23 18:03:30.334367992 -0000 +@@ -85,7 +85,7 @@ + write(selfpipe[1],"",1); + } + +-const char *run[2] = { "./run", 0 }; ++char * const run[2] = { "./run", 0 }; + + void trystart(void) + { +diff '--color=auto' -ru a/svscan.c b/svscan.c +--- a/svscan.c 2024-06-23 17:46:32.385781000 -0000 ++++ b/svscan.c 2024-06-23 17:47:36.647440909 -0000 +@@ -101,7 +101,7 @@ + args[0] = "supervise"; + args[1] = fn; + args[2] = 0; +- pathexec_run(*args,args,environ); ++ pathexec_run(*args,args,(const char *const *)environ); + strerr_die4sys(111,WARNING,"unable to start supervise ",fn,": "); + default: + x[i].pid = child; +@@ -120,7 +120,7 @@ + args[0] = "supervise"; + args[1] = "log"; + args[2] = 0; +- pathexec_run(*args,args,environ); ++ pathexec_run(*args,args,(const char *const *)environ); + strerr_die4sys(111,WARNING,"unable to start supervise ",fn,"/log: "); + default: + x[i].pidlog = child; +diff '--color=auto' -ru a/tai64n.c b/tai64n.c +--- a/tai64n.c 2024-06-23 17:46:32.397780936 -0000 ++++ b/tai64n.c 2024-06-23 18:05:56.551586243 -0000 +@@ -2,7 +2,7 @@ + #include "timestamp.h" + #include "buffer.h" + +-int mywrite(int fd,char *buf,int len) ++int mywrite(int fd,const char *buf,int len) + { + int w; + w = buffer_unixwrite(fd,buf,len); +@@ -13,7 +13,7 @@ + char outbuf[2048]; + buffer out = BUFFER_INIT(mywrite,1,outbuf,sizeof outbuf); + +-int myread(int fd,char *buf,int len) ++int myread(int fd,const char *buf,int len) + { + int r; + buffer_flush(&out); diff --git a/sys-process/gnome-usage/Manifest b/sys-process/gnome-usage/Manifest index cb43ae3a7f43..9fed85037861 100644 --- a/sys-process/gnome-usage/Manifest +++ b/sys-process/gnome-usage/Manifest @@ -1,3 +1,5 @@ DIST gnome-usage-45.1.tar.xz 232876 BLAKE2B be2f1378ba2c33ae95c9a2d2ddabfef5e08d76bb6a670b8dc10fb0c1c94ae72dfa55e934bb871dabd90b2a29bcfb2853f5ccd11047550c63f94a4b62a1be84ca SHA512 c5eaf2fda3657dc3188587f5d138c912ad3971660da98dafe210c6dff223d559df11aa44f9099a09978467acc1575229c05dd4123ddaeea438bd522c5dfc78c4 +DIST gnome-usage-46.0.tar.xz 267460 BLAKE2B 8d97ddb673a4f291493c63aa4e6802957351bf65a5f55d09fb9bbcee56685f68185176c33d120844ae887d55300abb75c3e87edbef1d2806ac1092b592bce3ab SHA512 29bd074dcab10fd676e6e9d9e13fecd7778a5aa87e338e8b3127d2d54fa86c4c8bd73805e21aa674e68568b3168b07219a0b70d934861a552593d581867cd4e6 EBUILD gnome-usage-45.1.ebuild 767 BLAKE2B e3ba01d2357ce1557fd7847c86594f6d7f9ee795abbfdf25ad6343be199b7c4d1340e9fc48daf5d7ddb070df03d14b1a5eb40eebc36e60292967ad63d382c3c4 SHA512 997b558ece48ff0c0056cedf70443e6849188f575a34706ddfa923adbb58d7d3798490ccaf569611346d7bc898fee93905b0801b41e3b0e168c693f8adda93af +EBUILD gnome-usage-46.0.ebuild 777 BLAKE2B 600f0d5598ba30baf3520425652d82c0a5918bef716ada81657cf5f35afba317c6913ef63fcb8ba8f7275fa5aeb68be2a3d74d16e748f70005779219419033ba SHA512 4adf3146eaae3b1e57914f770d99fc8d2989ec66b529706ef82b0e38fddbe03c6170b84cc4f1a90eb6e3917d8c662cdeac9cc771932924506c81ab2abdd3c58c MISC metadata.xml 352 BLAKE2B e928aba75e44e7ca7d459c7628f94361ec44c477a5340c53b274c4009662b781a15f12cd4c8b7795315b56bdad04eeb483fa69de2823018efe54eff41ecad816 SHA512 3d912ef601bb9ead4d4bec1f81cc8ca9b400ecc2940acdcb0dfd1e10ceb6ae356a3bb9c8d055614c3afb0a5b5ae12d9b172ac3317688b4948c64a36e1ff4ea74 diff --git a/sys-process/gnome-usage/gnome-usage-46.0.ebuild b/sys-process/gnome-usage/gnome-usage-46.0.ebuild new file mode 100644 index 000000000000..162e0c03cabc --- /dev/null +++ b/sys-process/gnome-usage/gnome-usage-46.0.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit gnome.org gnome2-utils meson vala xdg + +DESCRIPTION="A nice way to view information about use of system resources" +HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-usage" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~arm64" + +RDEPEND=" + >=dev-libs/libgee-0.8:0.8= + >=dev-libs/glib-2.74:2 + >=gui-libs/gtk-4.11.3:4 + >=gnome-base/libgtop-2.34.0:2= + >=gui-libs/libadwaita-1.5:1 + >=app-misc/tracker-3.0.3:3[vala(+)] +" +DEPEND="${RDEPEND}" +BDEPEND=" + $(vala_depend) + >=sys-devel/gettext-0.19.8 +" + +src_configure() { + vala_setup + meson_src_configure +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update +} diff --git a/sys-process/procps/Manifest b/sys-process/procps/Manifest index 5d8b735102f2..db0cb72def3d 100644 --- a/sys-process/procps/Manifest +++ b/sys-process/procps/Manifest @@ -8,6 +8,6 @@ AUX procps-4.0.4-xfail-pmap-test.patch 697 BLAKE2B 22f9ebf50f0a89a804eaeaf9515a4 DIST procps-ng-3.3.17.tar.xz 1008428 BLAKE2B 43aa1a21d4f0725b1c02457f343cf1fc66bc1771b25c6eaf689c9775c190e90545bfac1729f027abc4d3d13de37ffac4828554b5b25e12bcf6af9540de1695f3 SHA512 59e9a5013430fd9da508c4655d58375dc32e025bb502bb28fb9a92a48e4f2838b3355e92b4648f7384b2050064d17079bf4595d889822ebb5030006bc154a1a7 DIST procps-ng-4.0.4.tar.xz 1401540 BLAKE2B 63b972666ef9e92042be96739ffa15c787d0346b2d3ffcb0d240b0a4e999dc90024b2c5b058df683dd9d2c436ceb812abd0b115cc877a6ca1023988b86de443f SHA512 94375544e2422fefc23d7634063c49ef1be62394c46039444f85e6d2e87e45cfadc33accba5ca43c96897b4295bfb0f88d55a30204598ddb26ef66f0420cefb4 EBUILD procps-3.3.17-r2.ebuild 2600 BLAKE2B 6d2cf1234b34e77653e89471bec8f2926daa96cee64a706edfeed249a5e9ba7c95e80c62332ba5516667c358a2bc93c2ba530875cd28879be101a66539f31f59 SHA512 f1f8ebaee28f94275bff30f4eef0d56835cdde1fde5be0eb705a75cd93117d6921d09cf41cffc12a0133bf86628abdf6bb535d177711da74b037cff756752fc4 -EBUILD procps-4.0.4-r1.ebuild 3070 BLAKE2B b949eb624f9aff136133ccda7d906551e7647b93c36d5c9d327603ece82840e7534e3a30954e230764f1a8429e76818163c9643662c2584fb41abc601a25fe00 SHA512 9fffec476195671e42791cbd4a3735760b862203363df91ef4b02c33f36ef8b93613552fd5091515815e4739af298c6b4fbe4d65604737092d6d4574a264ccb9 +EBUILD procps-4.0.4-r1.ebuild 3069 BLAKE2B 939592d0a9c39e4daaaf1a19ff5cd7c86ae306667de243b14fd3de8727e35e0a9ad691b77a42711b35736bbb8c83376d4990c93115ecf699bc4649d2ae2b0eb4 SHA512 e29f14f85dd8e859af713a26d33450e30e2ccfadf8ef3302d18c05a26a144950afa8dc4dee241f273b1616a45d1cd2a20776bf08ce9ced47c081072ce3698002 EBUILD procps-4.0.4.ebuild 3113 BLAKE2B f83834cb54e72c31e5e2d895bfcdd9bc00bdfa846b2f1617f0a68c633cc0d8171ab56e5b17f1131656fabf174e098df175426fbbcf221576e49018f6bcbee6e9 SHA512 d274fe3db96e9486a87667bc4ca1bb444dc0adb9b6e7a671d19767e619844201c2d8d7840d87781f5a001250d0415c6499b92d59bec80784decc729fc81910e2 MISC metadata.xml 788 BLAKE2B b8352d682de7ad98344997d344783c444f326153bf5ed479d9e3032dac52b5f938c47ec83ca2d284617f98d0fbde2d9357ee7c205f74d7a2b2c586865a1de756 SHA512 cb6ebcf57a2800ae492fed52ad3de2ba7e767b121ccd6c20f8a0fd6c5fbbc97fb42d20e083ee3d3935fa6fa6e318bccd96d557c9b693507e64b22b8d3c92d1fd diff --git a/sys-process/procps/procps-4.0.4-r1.ebuild b/sys-process/procps/procps-4.0.4-r1.ebuild index f1fa09a9c3bb..04b848d70c72 100644 --- a/sys-process/procps/procps-4.0.4-r1.ebuild +++ b/sys-process/procps/procps-4.0.4-r1.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}"/${PN}-ng-${PV} # See bug #913210 LICENSE="GPL-2+ LGPL-2+ LGPL-2.1+" SLOT="0/0-ng" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" IUSE="elogind +kill modern-top +ncurses nls selinux static-libs systemd test unicode" RESTRICT="!test? ( test )" diff --git a/sys-process/runit/Manifest b/sys-process/runit/Manifest index 5b44d3813766..7f61f526c750 100644 --- a/sys-process/runit/Manifest +++ b/sys-process/runit/Manifest @@ -6,5 +6,5 @@ AUX finish.getty 30 BLAKE2B 97dec53a513713c68febd68177227e165ed3bdee28d3db4f57b6 AUX run.getty-2.1.2 44 BLAKE2B 38b80fc06bb53a06a6dd2ebeb6f5c320c73c9d3e928c5dbfeaad2fa0a19e1bdeaa28cf6fe61fcdd46406c0f1f4a05113b8b2cdb652bcac3d6560e0af0f5d521c SHA512 c23aa0ba79043a5717e5567f39bb714154f68c1e417538013943a65de5584b775c265423dd5d47c52027a1be1621f8fb017b115d75d127a31b2ef7cae3ed9eea DIST runit-2.1.2.tar.gz 110916 BLAKE2B 101e514aeed282685ebe636f401ca6f94d157281d08a3ac487340aebe945b82d2ee01d41e9917446f4ebd7b27fe9fd18ba4ad55739ab1b62a0e59e1c438b55e9 SHA512 a18773ebf1aa22305dd89ed67363165b9fcf86c192b2be4e268d08005dd82d51265160c637abe072f2f2e378c4b315a75bd3d3e602c3e75bdd451a3b0190f8cf DIST runit_2.1.2-59ubuntu1.debian.tar.xz 66756 BLAKE2B d071dae4a92f292837f55210cda62d8d0471efa623aeb43b56fb6381050b64fa5d3def7d0738756621e1c4d05b36d0cdaedb7d056d24d796f834ace932bd55b9 SHA512 de6289d9909a8df5c5657762f8214858f9301ac0d55cac9c605f70f92e663ed8067fe018a8585616099ac369b7078a95415040c27e82626261f2adf925d0bad2 -EBUILD runit-2.1.2-r2.ebuild 3881 BLAKE2B a9b06f6f41235f137817a3c4951eeb6575b0f9fd26109eabae879c7790d6e20a74a4e772e47a912caca1fc8ad77206ecbe25c2c3d1ee9cb5a08503e5518faed8 SHA512 c360647c8c6f06f27fb8f14ab53e8c2d22210f2db3088d1549130a90d121df808a2f15869f53090a0a0b1b8b58024c3bc320c6b16970523b369f4c478f8ea95f +EBUILD runit-2.1.2-r3.ebuild 3910 BLAKE2B db6d053c30b8867180ec8c483f32df2b7a936e2fd8489ad5e0692b8e27cbb2500e9bc7a1cf9854c781a5d1721209b69868fa90e41a1940745805e84115b2fd33 SHA512 b278c3e33f02d04948bbcf0c2e7bdf4bb2da6846f3f38fe24636ea794a4cbc6e3b4268196f4aa3d78aeb91f99cb2d87dcf1af67f80daacabf09285a706d530f1 MISC metadata.xml 331 BLAKE2B bdd00a86fff3c8a1d5d1bbe0c02c3b8ff3744cbaa2418005f2874a8996993a9adb114827bbd2f508f7df43ce8746c4528366d12e02c429cd5515c3b27de07972 SHA512 31b1e624cd18692713a25780237cb492a9541b61f18fae9522c39c5e0e6f292acf4534ce63135c20ea4f8bf9f29e15533ff5692e012732c1ab9d839277677b94 diff --git a/sys-process/runit/runit-2.1.2-r2.ebuild b/sys-process/runit/runit-2.1.2-r3.ebuild index 5f135925f8bc..4da7236850c6 100644 --- a/sys-process/runit/runit-2.1.2-r2.ebuild +++ b/sys-process/runit/runit-2.1.2-r3.ebuild @@ -14,7 +14,7 @@ SRC_URI=" http://archive.ubuntu.com/ubuntu/pool/universe/r/runit/${UBUNTU_A} " -RDEPEND="sys-apps/openrc" + RDEPEND="|| ( sys-apps/openrc sys-apps/openrc-navi )" S=${WORKDIR}/admin/${P}/src |