diff options
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/Manifest.gz | bin | 51541 -> 51533 bytes | |||
| -rw-r--r-- | sys-apps/iproute2/Manifest | 1 | ||||
| -rw-r--r-- | sys-apps/iproute2/files/iproute2-6.6.0-musl-c99.patch | 75 | ||||
| -rw-r--r-- | sys-apps/openrc/Manifest | 3 | ||||
| -rw-r--r-- | sys-apps/openrc/files/openrc-0.60-rc-conf.patch | 14 | ||||
| -rw-r--r-- | sys-apps/openrc/openrc-0.60-r1.ebuild (renamed from sys-apps/openrc/openrc-0.60.ebuild) | 4 | ||||
| -rw-r--r-- | sys-apps/pcsc-lite/Manifest | 2 | ||||
| -rw-r--r-- | sys-apps/pcsc-lite/pcsc-lite-2.3.1.ebuild | 110 |
8 files changed, 132 insertions, 77 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz Binary files differindex 05c68bc17034..802343e2ae25 100644 --- a/sys-apps/Manifest.gz +++ b/sys-apps/Manifest.gz diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest index 4158595e6270..14282fe3e838 100644 --- a/sys-apps/iproute2/Manifest +++ b/sys-apps/iproute2/Manifest @@ -2,7 +2,6 @@ AUX iproute2-6.10.0-musl-1.patch 1243 BLAKE2B 66853640dec036026b4c9dce0e1ecd3278 AUX iproute2-6.10.0-musl-2.patch 1452 BLAKE2B b20f3a0769379339651a9c781b5a53e41f0678ad1493878ec0523698e86dd9f702a527cc3c09a5c9607309e750a19798346ee5f3ddf580739bd6d949f05ce671 SHA512 1958e1d4ee92092d169d87de8a8983aaf656b78b4f0ba7188b449768250457ad4f2266876d0077f39d9c0dc27e2531c4a76f6b13f44095c614d88ec7c1e0c302 AUX iproute2-6.11.0-musl-fixes.patch 763 BLAKE2B c7cf3f2c47152636b4560a84ffcaf7eb7b1dc205f188a9c4e84c2caf9e091fc1bb69909dfe62ac011e374d72fcae617ccd707d2c50113663c91870b921e91598 SHA512 ed5d30fb3637e7ee1a2ff3cd3180f80f0aa578ac383e86ae0d35a6bfc733e87174eae8603aade7f32573d200258f3baa52b35e81ef43a7daad887522f0d8b522 AUX iproute2-6.12.0-musl-3.patch 905 BLAKE2B 790957e0431e4014a06217d45eda0cd11313606573047e1a42044285ef07fb3b1abd99ad9c6c11ca07bcc245929629dd44389e363257f12e6bf516bbabd14b7d SHA512 2575a23f10506d4b255d0f8ae050c6c5315ffdbe21a7b7e606f52b5320f409a9c36a71765b9fa9a3ca5b286c03490b4a853cfe1e3d544585fb052297c3372119 -AUX iproute2-6.6.0-musl-c99.patch 2988 BLAKE2B c8b3f929a6d5423c95546fb93c5a6754856b75778ec053afffabc398affd72cb73429f4b889478e25c7d0b19bd59dcc5bc0e6a6323f6e3588efd9342181f4bd7 SHA512 7d0ff890371bc4115cd6cfd253fb70eeaedc048d83a030511cb97d5f03cede2fd20950adb3a8d4b704aea81ed6471ca72341c31f46571d1c9930cfe269c5868b AUX iproute2-6.8.0-configure-nomagic-nolibbsd.patch 7010 BLAKE2B 4aab31c6da283789a6d7aca1b2dddeb828983d8bd4d929a05f5678dc1e4ca67e6e60be173c0968b5aeb3c8b40a4a1d4b307df02171e7adb296d508bb758f8e3f SHA512 0aa9cd6963cbd400f8284299cbeba7d36fe9f4cc775ebc114caf3f7e9479296776bf62415e49cbf821dc3a1c6f6d161fa23e973c44620c3f2a7077de750e9cda AUX iproute2-6.8.0-disable-libbsd-fallback.patch 777 BLAKE2B 099a8a59ff6fe385e0bc3e33b94e20ea3319af70b54e45eaad870d8bc84a9cc59057a3d9e51fb566891128a051244e54365c5fb0287d6db859bfd4596dd0ce86 SHA512 c577f536781e1b37f40ddc691697d4875614d392b28f3cd5c53bd27b3a66cfeab39b9e69140274d8713d948cbaccf62fad1845c97500931ec67de51154e59640 AUX iproute2-6.9.0-mtu.patch 1135 BLAKE2B 503eb3ece9ef5b5a7918a0e26f7b1d57ed6889143e440d97ad7a56305d7a36e148b68e1f9f5de0c13656336ca9a675902aacb42e9866f053b2a68f5ae8c1bd80 SHA512 6b8fec963825ed8e9a51d559a87aa2ae0df53f8c288804547c2e8a9425a2c41a6c0524ee491f1600d011d9175aff3fcdaaec20a18f81e225cab7472f625f4b07 diff --git a/sys-apps/iproute2/files/iproute2-6.6.0-musl-c99.patch b/sys-apps/iproute2/files/iproute2-6.6.0-musl-c99.patch deleted file mode 100644 index c277bd6d1128..000000000000 --- a/sys-apps/iproute2/files/iproute2-6.6.0-musl-c99.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 12416003e4c691afc732d26f0a07c3890c24b396 Mon Sep 17 00:00:00 2001 -From: Gabi Falk <gabifalk@gmx.com> -Date: Fri, 10 May 2024 14:36:12 +0000 -Subject: [PATCH] bridge/vlan.c: bridge/vlan.c: fix build with gcc 14 on musl - systems - -On glibc based systems the definition of 'struct timeval' is pulled in -with inclusion of <stdlib.h> header, but on musl based systems it -doesn't work this way. Missing definition triggers an -incompatible-pointer-types error with gcc 14 (warning on previous -versions of gcc): - -../include/json_print.h:80:30: warning: 'struct timeval' declared inside parameter list will not be visible outside of this definition or declaration - 80 | _PRINT_FUNC(tv, const struct timeval *) - | ^~~~~~~ -../include/json_print.h:50:37: note: in definition of macro '_PRINT_FUNC' - 50 | type value); \ - | ^~~~ -../include/json_print.h:80:30: warning: 'struct timeval' declared inside parameter list will not be visible outside of this definition or declaration - 80 | _PRINT_FUNC(tv, const struct timeval *) - | ^~~~~~~ -../include/json_print.h:55:45: note: in definition of macro '_PRINT_FUNC' - 55 | type value) \ - | ^~~~ -../include/json_print.h: In function 'print_tv': -../include/json_print.h:58:48: error: passing argument 5 of 'print_color_tv' from incompatible pointer type [-Wincompatible-pointer-types] - 58 | value); \ - | ^~~~~ - | | - | const struct timeval * - -Link: https://lore.kernel.org/netdev/20240510143613.1531283-1-gabifalk@gmx.com/T/#u -Signed-off-by: Gabi Falk <gabifalk@gmx.com> ---- - bridge/vlan.c | 1 + - bridge/vni.c | 1 + - vdpa/vdpa.c | 1 + - 3 files changed, 3 insertions(+) - -diff --git a/bridge/vlan.c b/bridge/vlan.c -index 5352eb24..0a7e6c45 100644 ---- a/bridge/vlan.c -+++ b/bridge/vlan.c -@@ -4,6 +4,7 @@ - #include <unistd.h> - #include <fcntl.h> - #include <sys/socket.h> -+#include <sys/time.h> - #include <net/if.h> - #include <netinet/in.h> - #include <linux/if_bridge.h> -diff --git a/bridge/vni.c b/bridge/vni.c -index a7abe6de..e1f981fc 100644 ---- a/bridge/vni.c -+++ b/bridge/vni.c -@@ -10,6 +10,7 @@ - #include <string.h> - #include <fcntl.h> - #include <sys/socket.h> -+#include <sys/time.h> - #include <net/if.h> - #include <netinet/in.h> - #include <linux/if_link.h> -diff --git a/vdpa/vdpa.c b/vdpa/vdpa.c -index 6e4a9c11..43f87824 100644 ---- a/vdpa/vdpa.c -+++ b/vdpa/vdpa.c -@@ -3,6 +3,7 @@ - #include <stdio.h> - #include <getopt.h> - #include <errno.h> -+#include <sys/time.h> - #include <linux/genetlink.h> - #include <linux/if_ether.h> - #include <linux/vdpa.h> diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest index 7eab6439151c..718e789d8069 100644 --- a/sys-apps/openrc/Manifest +++ b/sys-apps/openrc/Manifest @@ -1,3 +1,4 @@ +AUX openrc-0.60-rc-conf.patch 453 BLAKE2B 536d8b283bdea21191bcb6ae36551390489957e81da9a6e8b5eafa4ecad02978f53229f6c8d123a6b3899e281ba45ad47a242df5f3cd7319afe175f95311edfb SHA512 eedca2c04696a184028d30a01ef975fa58890ecde1584eb5399ad6e59c65f8cd0f368672fefa5ff56aec0130947b332fba47828754dff4dc65dddeafcb7afb8d AUX openrc.logrotate 43 BLAKE2B 0587cd211767937fd6273e6b159271490443a94d80a54b5a20ef625a1959e77dbf38cd1756838337fb39a061c4ee19a39cccd2f5867fab9f04fb916a74029aaa SHA512 12bb6354e808fbf47bbab963de55ee7901738b4a912659982c57ef2777fff9a670e867fcb8ec316a76b151032c92dc89a950d7d1d835ef53f753a8f3b41d2cec AUX start-stop-daemon.pam 63 BLAKE2B df39a1a12fe09dbbc0746eac67035d9e6d4a63323f6c937ef3888c70787354128e415b3c1c8bccccec0c987b3e789711cd1ddaba55e9b53a7f67b332c4ca9d5b SHA512 85cf440611b8f87f51bf24bdd9fa03639a75b950f00096d81b8826c21ae85ff9784b8c56b8ddb482e70f08bce933d4561b30750346d51fb2cef3be34acc065cb DIST openrc-0.55.1.tar.gz 249926 BLAKE2B 058c4105ee8198e854c6fd23a3074f6ca4470ffe1faf66ee948e088b859ca55d163e16390ad4dbdd97ff4c1e9bc829fe791e4d96c5ac31f30022dcf91d5179cf SHA512 a06018ef98870bf42f209cdbcb1c578864653929df3d5954ce27adb28fa11c8a2fe0374fe6e10b03a957f7f513b3d64a94800b40f5ab104695d1ed2bfc91615d @@ -5,6 +6,6 @@ DIST openrc-0.56.tar.gz 250196 BLAKE2B 929fa18e2248a432095167ad5b07161103cc5c51c DIST openrc-0.60.tar.gz 254863 BLAKE2B 7606708469d3801eacb5b88f5899b16ccc566ee1cb56cb57ff7f9ef8c25b4289552b5548a7642a7662fb53ff93373447d219e6af9cd12ac0f5141ec5a7f0e8d0 SHA512 fa063d1c0ed4110d6a48c5a9af0fde18e83be8b0796ca9ebc39d268f435df0d8084edc0ef0101389c7aff81bb4f0224454ec35eef056a2c727aece1f78c51da9 EBUILD openrc-0.55.1.ebuild 4504 BLAKE2B e2595b1a44e03e1521d36cf996b0f483c139534627a8217e6af4f42970464e4fd9aba76e97955012273340617e071f3e02e8358c6aa2d711138d32ccd9486c0e SHA512 cc1ff04277c473326134097a9ef86bf1287d88e76113d3d97c5aef3c5180c27a0cdaed6c0f24e8c0ab478570fdff2d611bdb4698e5147cd663a531b48d93b6b0 EBUILD openrc-0.56.ebuild 4413 BLAKE2B 53678c0774b2a1889a3fd4758cb70a92965424e625271bc2262bf4b76bdbacbbe17f7c67152eddbbcebd0c54042f3b4a4ceb762f0b120d90aea1d3f487a22b67 SHA512 382896eace1d88a014191e87b6b42f26a9bc2efea5fb154c067502047dd37e23a53a756c3ced04b5bf550c87458fbbe8fff214abc033726e2543b4291a0a3c25 -EBUILD openrc-0.60.ebuild 4472 BLAKE2B a672501a2d5544e135203b102166fdcc805d8fbf71e65d0ec085d4772737196942773b723abfd3d8909967172d3e89efc2b68ed35a257d7847f7073ce9c9d794 SHA512 7b6ac24bf9611617211bfd59f03e9a72b8912e3d2f0543e6f772da53f5da455766b71b1d6ee1b73db2325aa1d168008af811133433e660996e519e3b13f72d39 +EBUILD openrc-0.60-r1.ebuild 4519 BLAKE2B 92ca27c50dcfc1fbfabb264d3980d664542b1eadd5d37432c0bc971207185784f7b7f644ec5545e6e9cd9c8e0ebcef4edb367b6a2aac6526b79e08a93f2295d1 SHA512 cfbc03b9b73dad387d5872484ff3577206622dd196ad28d92437a70daac09c801640b1e2dffea3ef168f170ccc817b5ef7a2266417408067eeab0eb0d4c7bcf6 EBUILD openrc-9999.ebuild 4472 BLAKE2B a672501a2d5544e135203b102166fdcc805d8fbf71e65d0ec085d4772737196942773b723abfd3d8909967172d3e89efc2b68ed35a257d7847f7073ce9c9d794 SHA512 7b6ac24bf9611617211bfd59f03e9a72b8912e3d2f0543e6f772da53f5da455766b71b1d6ee1b73db2325aa1d168008af811133433e660996e519e3b13f72d39 MISC metadata.xml 842 BLAKE2B 696a5ccdf7eca47ac64ee7f317817a06d93664bcbaa3e94cc4420cc9452c97781d69b6b259350a4c5caf681c2e3394019f9f208eec661c861f3f6e3f5c214542 SHA512 dee510e527b885c19b57f5831081d47a422c88d65b7d50dc5c3e74c0a439ddbd1d1d87e241734d08e35a7551b500ab25d01f7a6be73e36dccde576df59974f36 diff --git a/sys-apps/openrc/files/openrc-0.60-rc-conf.patch b/sys-apps/openrc/files/openrc-0.60-rc-conf.patch new file mode 100644 index 000000000000..28ed4a2a3d29 --- /dev/null +++ b/sys-apps/openrc/files/openrc-0.60-rc-conf.patch @@ -0,0 +1,14 @@ +# commit https://github.com/OpenRC/openrc/commit/01ba72b0b7f9b4c5ef7271ef05094f88ad0c96a8 +diff --git a/src/librc/librc-misc.c b/src/librc/librc-misc.c +index b1b9da46..b309396c 100644 +--- a/src/librc/librc-misc.c ++++ b/src/librc/librc-misc.c +@@ -418,7 +418,7 @@ rc_conf_value(const char *setting) + } + + xasprintf(&conf, "%s/%s", sysconfdir, "rc.conf"); +- rc_conf_append(sysconfdir); ++ rc_conf_append(conf); + free(conf); + + /* Support old configs. */ diff --git a/sys-apps/openrc/openrc-0.60.ebuild b/sys-apps/openrc/openrc-0.60-r1.ebuild index 0d8bd26defb3..133fe4156b9c 100644 --- a/sys-apps/openrc/openrc-0.60.ebuild +++ b/sys-apps/openrc/openrc-0.60-r1.ebuild @@ -50,6 +50,10 @@ RDEPEND="${COMMON_DEPEND} PDEPEND="netifrc? ( net-misc/netifrc )" +PATCHES=( + "${FILESDIR}/${P}-rc-conf.patch" +) + src_configure() { local emesonargs=( --bindir=/bin diff --git a/sys-apps/pcsc-lite/Manifest b/sys-apps/pcsc-lite/Manifest index f1c9a5c87555..0b6e97f294d6 100644 --- a/sys-apps/pcsc-lite/Manifest +++ b/sys-apps/pcsc-lite/Manifest @@ -7,6 +7,8 @@ AUX pcscd-udev 330 BLAKE2B 50e99953aec238fe98c6aee5219d3978b44d37c90ce74c9cb8e19 AUX pcscd.conf 32 BLAKE2B 2407e00c654d7e259ebf69ab420800f5605cb3ead23eb4aa07317928c38b6328eae2e566fab84c8844fb80e8a165cd32982fee753498b20c7a750f52fbb1f995 SHA512 ae27cdab8a60201639b9d9aca2d7f760146a5c5238878a0ebb562740385bf58f04bbc37a19cd1a2c8c69ee463f10beecc6531dde733cb6a6d4b06816f54b1569 DIST pcsc-lite-2.0.1.tar.bz2 815103 BLAKE2B a9eea4a4da1a78fc22797b17c128889b2f7caf8c4aa02dd77f4ac79e4ec458fb0162578b5422552545cd39303750d5396f3687f8cfee7603fad8d60cb54ee1e8 SHA512 af007f00f43e8d897710580f6f27814c9e7d3ca489ff01edf2e3b979e46267915aa04d9c15f225a420fa681de936e42a1d4779d962717cf9a9f4a3d1ca31502b DIST pcsc-lite-2.3.0.tar.xz 209064 BLAKE2B 48fc1a513a217ff499e8da63e026ce6adcd37987c878a0dda50756cfac5cc64245c95715df40df14e29883410c3d55670432ba0c658eff84add25b76c1828b11 SHA512 194c175ba7cf4610f09c08d463edf12f63e8e6a694938049988efb10c91e15b05d91747d58013f2f35452427996e8fe2ffb3706806d17ee278dc4896eab901c0 +DIST pcsc-lite-2.3.1.tar.xz 209724 BLAKE2B aafcecf34a284145eecd5e3e1c9cb6bf1d4a3f9e7dad82983cee72ecbb8682480c06bb1fe025e176ca8d34f8a50ed325d41f14217ee7cd8a96b5848398c89624 SHA512 ec70ab3cf338299b3a493344c176b73450631da208714f3ac0fb4d6aa942fdc7487467b971246407fc4f1815fe5e48a0f29dcc109fb5fef838fbce7a2207d87b EBUILD pcsc-lite-2.0.1-r1.ebuild 3342 BLAKE2B bbd40932c5106ce4505f35b36ab0378c8ba4db975d39d87e6f8118ae3e29e799547482987be4564a492ec5b186b27d01ffbe627a6e9cdba4e210e2a6b8d17461 SHA512 fc7db9328a1f5e77450b1af1647c86184d24bd958849631c671db946a4d028aa3d5be6d3c7e232ece60798ecc04a613fa51e0ee86d465df91f285631422a3e40 EBUILD pcsc-lite-2.3.0.ebuild 3217 BLAKE2B 68b1f23955d7731b5f431413a7c2050f20458432ae95526679b9a3a8672e29efb272a3901412033491ff0a2761cf97f85d10650d263fd50d0144b049ab530447 SHA512 41de02b95e1d2fbd77f1f82aba94e5682d7490894e93e5402a5841893f30c454a5a86cc406901c3240f26f2554d263c125a6fbead94ad5eb72c020ce8f8d0ae2 +EBUILD pcsc-lite-2.3.1.ebuild 3219 BLAKE2B d4e96160eef00ccb38ad465ca5acc10e0967db85050428ee36eb42256600cd7d98b0a22340a8e988142abd9c0864547e5a1b25c38135ece93167acbe600b1938 SHA512 9d5faa8ed244b717c73971a47ee6a4940c2cff35c5835052557dbe01f5e30f33da149e48d0b29c0fbb6cdf17a58c9595b4460327af2a9575570ebc3cd1dfd191 MISC metadata.xml 1147 BLAKE2B c89b7f5443b81af35a0debe239b95ffa3dea06c4e86c1cb3bfe50dfc81e49d32939ae2eaaabcc5b4c5947c69c8ae90ce278efafc324ff6ab10a9ed514fa0a8b3 SHA512 96aea50c57df7bf05d5e05d7dd19f985193638592526a1357680f3e3489c0680b38f2f732714a0726097e40503bf1573b5458d4917fbcf1cbfeb56953d05293f diff --git a/sys-apps/pcsc-lite/pcsc-lite-2.3.1.ebuild b/sys-apps/pcsc-lite/pcsc-lite-2.3.1.ebuild new file mode 100644 index 000000000000..8385c17fe46d --- /dev/null +++ b/sys-apps/pcsc-lite/pcsc-lite-2.3.1.ebuild @@ -0,0 +1,110 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..13} ) + +inherit meson-multilib python-single-r1 tmpfiles udev + +DESCRIPTION="PC/SC Architecture smartcard middleware library" +HOMEPAGE="https://pcsclite.apdu.fr https://github.com/LudovicRousseau/PCSC" +SRC_URI="https://pcsclite.apdu.fr/files/${P}.tar.xz" + +# GPL-2 is there for the init script; everything else comes from +# upstream. +LICENSE="BSD GPL-3+ BSD-2 ISC GPL-2" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +# This is called libusb so that it doesn't fool people in thinking that +# it is _required_ for USB support. Otherwise they'll disable udev and +# that's going to be worse. +IUSE="embedded libusb policykit selinux systemd +udev" +REQUIRED_USE="^^ ( udev libusb ) ${PYTHON_REQUIRED_USE}" + +# No dependencies need the MULTILIB_DEPS because the libraries are actually +# standalone, the deps are only needed for the daemon itself. +DEPEND=" + libusb? ( virtual/libusb:1 ) + udev? ( virtual/libudev:= ) + policykit? ( >=sys-auth/polkit-0.111 ) + acct-group/openct + acct-group/pcscd + acct-user/pcscd + ${PYTHON_DEPS}" +RDEPEND="${DEPEND} + selinux? ( sec-policy/selinux-pcscd )" +BDEPEND=" + app-alternatives/lex + virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${PN}-1.8.11-polkit-pcscd.patch + "${FILESDIR}"/${PN}-1.9.8-systemd-user.patch + "${FILESDIR}"/${PN}-2.2.3-change-setup-spy-script-location.patch +) + +multilib_src_configure() { + local emesonargs=( + -Dusbdropdir="${EPREFIX}"/usr/$(get_libdir)/readers/usb + -Dipcdir=/run/pcscd + -Dsystemdunit=system + $(meson_native_use_bool embedded) + $(meson_native_use_bool systemd libsystemd) + $(meson_native_use_bool udev libudev) + $(meson_native_use_bool libusb) + $(meson_native_use_bool policykit polkit) + ) + + meson_src_configure +} + +multilib_src_install_all() { + einstalldocs + dodoc HELP SECURITY + + newinitd "${FILESDIR}"/pcscd-init.7 pcscd + dotmpfiles "${FILESDIR}"/pcscd.conf + + if use udev; then + exeinto "$(get_udevdir)" + newexe "${FILESDIR}"/pcscd-udev pcscd.sh + + insinto "$(get_udevdir)"/rules.d + newins "${FILESDIR}"/99-pcscd-hotplug-r2.rules 99-pcscd-hotplug.rules + fi + + python_fix_shebang "${ED}"/usr/bin/pcsc-spy + + find "${ED}" -name '*.la' -delete || die +} + +pkg_postinst() { + elog "Starting from version 1.6.5, pcsc-lite will start as user nobody in" + elog "the pcscd group, to avoid running as root." + elog + elog "This also means you need the newest drivers available so that the" + elog "devices get the proper owner." + elog + elog "Furthermore, a conf.d file is no longer installed by default, as" + elog "the default configuration does not require one. If you need to" + elog "pass further options to pcscd, create a file and set the" + elog "EXTRA_OPTS variable." + elog + + if use udev; then + elog "Hotplug support is provided by udev rules." + elog "When using OpenRC you additionally need to tell it to hotplug" + elog "pcscd by setting this variable in /etc/rc.conf:" + elog + elog " rc_hotplug=\"pcscd\"" + fi + + tmpfiles_process pcscd.conf + + use udev && udev_reload +} + +pkg_postrm() { + use udev && udev_reload +} |