summaryrefslogtreecommitdiff
path: root/net-misc
diff options
context:
space:
mode:
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/Manifest.gzbin53331 -> 53333 bytes
-rw-r--r--net-misc/rsync/Manifest14
-rw-r--r--net-misc/rsync/files/rsync-3.2.7-flist-memcmp-ub.patch21
-rw-r--r--net-misc/rsync/files/rsync-3.2.7-fortify-source-3.patch54
-rw-r--r--net-misc/rsync/files/rsync-3.2.7-ipv6-configure-c99.patch32
-rw-r--r--net-misc/rsync/files/rsync-3.4.1-c23.patch20
-rw-r--r--net-misc/rsync/files/rsyncd.conf-3.0.9-r115
-rw-r--r--net-misc/rsync/rsync-3.2.7-r5.ebuild207
-rw-r--r--net-misc/rsync/rsync-3.4.1.ebuild (renamed from net-misc/rsync/rsync-3.3.0-r1.ebuild)17
-rw-r--r--net-misc/rsync/rsync-9999.ebuild14
-rw-r--r--net-misc/tuba/Manifest2
-rw-r--r--net-misc/tuba/tuba-0.9.1.ebuild76
12 files changed, 43 insertions, 429 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index e0b456b1e2c8..6a1980f52d91 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
Binary files differ
diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest
index a89aecb49015..5ea2b80b68ee 100644
--- a/net-misc/rsync/Manifest
+++ b/net-misc/rsync/Manifest
@@ -7,21 +7,17 @@ AUX 3.3.0/rsync-3.3.0-CVE-2024-12087-2.patch 1415 BLAKE2B 963e96a7b5ebf9f4910bc8
AUX 3.3.0/rsync-3.3.0-CVE-2024-12088.patch 2250 BLAKE2B c0454a03bc4868fcff7a3f94d68b6284197327f5ee909f1938d9e7e59ccfafbcd2d0d914c2e217aa1ccb5a93de4626d5c70950110e8bb39a8bdac6b6aec07ab9 SHA512 2e7efec103a8e8e0d32b881c9dac2673e7db66f7df77b1fc7689e6ae5f9a5c7246bae314dffedc45314164fbbb8ada951db69e8aa6a0e6544a3acae39f3841d8
AUX 3.3.0/rsync-3.3.0-CVE-2024-12747-1.patch 4916 BLAKE2B 335ec75ddc22e4f42723a98e839cf18d40d909a5d84a6dc0208a95582e6358be3f8c5b2fcc9fa804ee56b32ee6ecb8ff2739cf4a374dc58c0881934db7aab5fe SHA512 fd6f8c2f72441d77736cf223eeb33de415de1c1e13b4a399f4c1846aa678cd90b26952d55c62316ebf1633a901c35192baa15270c552131a5e687c2243f02364
AUX 3.3.0/rsync-3.3.0-CVE-2024-12747-2.patch 1110 BLAKE2B 4b049d3fee2fcdcfdeafca0560c9bab12de69657469bfab8f337d25a184e756361d154e9533d97b95417a066018bae9d135411f1342c0ccbf7f2eb6e409269d3 SHA512 e636c0b8b95582d2955eb38b7090706ed5a860d5835c5ef1e9432b58dd9d47c07bba599960931f4d503b1d25ddee02caffe325379c012e7d7849c4ad87894a58
-AUX rsync-3.2.7-flist-memcmp-ub.patch 773 BLAKE2B 9a30609a0bf09298dc2b1daeae7dcf3ba173d1d2431c077d612be03a3a531bf59b16d1846a8f7c467ef2ca576e01f0fe512067a04f834a9ca3d387e389b5d6e8 SHA512 4212d704d9b4b1a0d2d2cfca48ae91d29b90111ce4256ec8f9779d0778fe2bbb4a33b95e8a32ef181e1ab0ac2d1ea330e724a46f078826b39d2e09d374be6730
-AUX rsync-3.2.7-fortify-source-3.patch 1947 BLAKE2B c907e4ddc07693d8a6292f32782831953eee8711148c2e9aa5623dc5615474b59f25e309302c103a6c4a4177b18291a00983a62fa77c7faee04731114634c65d SHA512 b2bd012f318b1816a299a766c28a64cfc86307e4e1b047098f2a0334d775513f83724cdfa33ce567120c9b4fbbf9f6b8e0bbad0d434ac2444afff39fb5fa41da
-AUX rsync-3.2.7-ipv6-configure-c99.patch 1001 BLAKE2B 1ddb96eecef82a056af00ae221b9f5bc26284863a1ce63ae423e0b14979cfd57eb18f966f7572315e495ae25e4762da4115def7f04e32fe90cbc2b7a522805c0 SHA512 19a10798b8460741b8a3341a210d1828e1daeae707ad8cc910e4aa003e8bba405466a6cc64465294bd4eda81f1f876410a395e5012c3872cfce025f7ed0eec94
-AUX rsyncd.conf-3.0.9-r1 462 BLAKE2B 45a7dde876368e7392ee7a05edf593f55cf6b3b4dc913745f4322ebd75f97bcdf1a24240a54e11469bd659fd565fc74cd8eeaa9490434d88444b5a076803cea7 SHA512 5c57f633aa3daa6513b5d35a1157a50308559ad993257374ce4eea0269f6bf384938f95bed749acb19538e8c4672355351fcee5cef9607153463b19227d343d7
+AUX rsync-3.4.1-c23.patch 493 BLAKE2B 570b053d8700ca4a331108fb96df63e4c7f65ffe31d766482aa4ae19c258ee2f2fa738401c4c0da412b1af5864e43dd098543aee06b524683beb811876cd86ea SHA512 6c0f6c78dd1b236be204c8f075ea57b1fbc4b8ea849533a4ebae8c34c1a16885ea079fa34ae7a0bde2113165b68d8248b9cadc630ff9305f19cd221b64842713
AUX rsyncd.conf-3.2.7-r5 474 BLAKE2B e8a78329dee2afba0e11ce6698089e8a3199e80a00300e0093f7333817cc5bab222f65ecf34e254fddd60b909299f94965de0291404294b2b9f4124ea2700b4c SHA512 7f03b5fdd6da450926aaf3152fbe953653a9453d0490388e28ff96e21e140df1b6275c273a1bd785c49c3458a6c4d645cbb34a48d2213d5ab34f129f737f8571
AUX rsyncd.conf.d 149 BLAKE2B fd2556d0c270c2baa83d4d474d44ab1d16e35f112279a339f179f9af693d977cc0863bf4cd7139363c58e4e6a1a18a24c06474ecc248167224261dbaf04ae0a8 SHA512 8ea9a2f1fea508fa132313fa16513eac84a9ed3ce75741c42769b56bbcd3f1bd2eb8bfdfe40a6c7f619e4281e8fc8d95d1bd84096d0b64aaacf606cd614ae5b3
AUX rsyncd.init.d-r1 247 BLAKE2B ec4f7a875a51bae10cff7e15df18d285b01dddaa99a03127ba242ec535b7c8a3af3ad4489661ba7b5f6b074e2af38b12da394c0f8992bd28328d807a89757bb0 SHA512 df2ef4d9e65fa72daa9a7d91d69a06027d0e0fbc48f9ebd485e2d51990c8d00985b7ccf41314f984975e8073e2075bbdfe5543754718381497c334dc7d96451a
AUX rsyncd.logrotate 104 BLAKE2B 8e031a851e527815d26816985b8438dd439614cf8753d5137cccd73703e8311c33560580736b562ae03951520254b1e6a9ad26d587f5157866c2af1c9e648c3b SHA512 e7ff164926785c4eff2ea641c7ce2d270b25f1c26d93a6108bb6ff2c0207a28ebfd93dca39596243446ce41aceaeae62fc2b34084eb9c9086fcdbc03a657eed8
AUX rsyncd.xinetd-3.0.9-r1 194 BLAKE2B 8e3edf4831e020451ba1886e2e8ae86e576016aabcaaf8e84c48adb15ba6a2e8d8c58098af2757011ea4f84fbfd758029d905fb8f5ed21bcc5ac34c3baae2a9c SHA512 fc053fc4748950343e866cc95284d037156a953454e4294d775f01f059e96e805582688bf1de5c965836889192ce4a663ec740e6ec2265406e509c5c6d6c3215
-DIST rsync-3.2.7.tar.gz 1149787 BLAKE2B 1b910b321e8d6b49af9f26bef813509f0da12dedd6857897de136d3617c68d38368ce05de13b9b0ef35a5452dca141ebdcdfb6af8456151d0ca0ad546452b504 SHA512 c2afba11a352fd88133f9e96e19d6df80eb864450c83eced13a7faa23df947bccf2ef093f2101df6ee30abff4cbbd39ac802e9aa5f726e42c9caff274fad8377
-DIST rsync-3.2.7.tar.gz.asc 195 BLAKE2B d2bca9276d9a0c96a9156a8da60e391f58eceb2e1ffaa51b7e7ffd592feaba3ce54772bd563a251e3b30efb0ad07fc96da01158a77dd77c6534eac5d80b46e53 SHA512 bad9f48e033966566c6abf8cd485d35c0d9cf130eafb0c5fff9bcb928882283bbcdd2375e7c2880cf71cf81496ba6b743b61adca3d4678421c32915a2464acc3
DIST rsync-3.3.0.tar.gz 1153969 BLAKE2B 75a3cc50452086aebd16f42d7a309c173cbc1ea156227afb10d2106d0b9043e973676995b8199d22840775ae3df8db97d1c0de5f3aa58afa130c5b1348c3f825 SHA512 df5c53bc2f2b0e7e30f475903e5e4296dc2fbcf08e9ea6c3c61462d0e52b067c27e82deeb4be79102c86e9aa55a825182e126f22df44dabf5b7328acb2a01d10
DIST rsync-3.3.0.tar.gz.asc 195 BLAKE2B bd077217bd44d406ac49a55b0c0d38c2accd4867b9fbf78a13fe906f52e1773d5a69aa3116a0c245abdeb1af54705d6ffc75aaba8b276ba9229bbb3340d7c3e8 SHA512 611d26374e0ff98ffb11b6ad6555f08773b9f09e1fbf232abc73c5d472b0defd28fd559bd42707774204d055b93be289f19f4db94bbdfe0b0935918fd922cced
-EBUILD rsync-3.2.7-r5.ebuild 5576 BLAKE2B 5a8e3a2fb7c47ab5c1fb90d763cbad907b6640461e6ceba95873f396328582fd072e759bac9f7e237e0d33d121aed906be360c120ec7d927623f180633793e7c SHA512 b061f5535543cb940083326ce4aad8792f101cd3e1826094c887bea5aedadf2ee325cad8b1682c8efc4390b845524c7c8624a61492ed8ffeefdbb57d29ee0a64
-EBUILD rsync-3.3.0-r1.ebuild 5538 BLAKE2B 99329c9b455670a69887520f675ceb6455ab2ae11eedcce5320efe3b6e6d7d4350a7117dcc057c3f624b88dc83ba84212d8ed9c02be8a51eb8a24c89b6957423 SHA512 c41012aff6a0a5fa8c5140d888aeba80f950b6c631a8f0705b5d588fc533902838d04ce7cc23d48c3c59fddb67f778935dcae11d5098ba44dbb5832febc47bc9
+DIST rsync-3.4.1.tar.gz 1172739 BLAKE2B 79c1cad697547059ee241e20c26d7f97bed3ad062deb856d31a617fead333a2d9f62c7c47c1efaf70033dbc358fe547d034c35e8181abb51a1fc893557882bc7 SHA512 a3ecde4843ddb795308dca88581b868ac0221eb6f88a1477d7a9a2ecb4e4686042966bdddbab40866f90a4715d3104daa7b83222ddf0f3387b796a86bde8e5c2
+DIST rsync-3.4.1.tar.gz.asc 862 BLAKE2B 5684bd57423e8e43b973c2c416c4897901a3a8b33c22690eaedc609109088e1d5d70f5cf5deaafefc69f547d198b5f8b17f3c484211d545095b19dac7e0bc7d3 SHA512 c83e187c88110b6119a023d239c76291f15124760fd245ead17e747424946e7864187aae96af6f5930cb84beff7308b99daa0566f306c9f2de51e2475704c320
EBUILD rsync-3.3.0-r2.ebuild 5620 BLAKE2B 4f842f113a664fcabe1d1779cd201bc998e16b84f44c273ed0fcef5c489b63a3a2f358e5e654aca6a32f6cbaca3e82bbba93057218aa933a538e4afbb694e22a SHA512 35f476ca6d92607e113bf3f3db7ee04aa7ba1d3f5309c7f2a25ecd3f340e1ff69993412a6e2f0d58b27eb16c5bc8608f0227cee56902f1aee2ae16ec0e8c7218
-EBUILD rsync-9999.ebuild 5435 BLAKE2B fdc933e79da83abdd9df7e33aa4bba0e138f60efdc8a5723ca11c2bbc9009f07952cc88a8c4f126e76acb33cf8a7c4350e25917c0259289601954387f875388d SHA512 030e390d9e4b8c3895a4798684fd6d7ed203232cebedc6d1bc75cb9e6f8e3f6ad8466266641a889eb865da208d87fdcd9aef73a2f5b116005819e8608f9315b3
+EBUILD rsync-3.4.1.ebuild 5490 BLAKE2B ffa388570214d545037854b0fb4b8ded212bab3fdc8b4dddfb4860987d6fb7ba728421888a917a957d54e5967c9c848eaa423968445d8d5860aba0b6844404f0 SHA512 dd0cbf5b78b8d57bc083c77c54f894c12fd802e0340ec23bdbc63426a4605ea76fe9b3c97e85c98f60a9372fee644665ac121f89a78b0e452c63cfb396816b87
+EBUILD rsync-9999.ebuild 5490 BLAKE2B ffa388570214d545037854b0fb4b8ded212bab3fdc8b4dddfb4860987d6fb7ba728421888a917a957d54e5967c9c848eaa423968445d8d5860aba0b6844404f0 SHA512 dd0cbf5b78b8d57bc083c77c54f894c12fd802e0340ec23bdbc63426a4605ea76fe9b3c97e85c98f60a9372fee644665ac121f89a78b0e452c63cfb396816b87
MISC metadata.xml 886 BLAKE2B 65871157f4f8f6340408431fa5f019d7dd58382212b7b5c2021d77ecddcfba56f5528594dda16e624882b79a99235a1c3f5a4f8e7f175551922edd67e2d7c756 SHA512 0291f2876aa480d7d1a4d5834ac9b2e0267bb4b77874f43079d9ebb0420ee64f17df0ca28d71f94d0c3738f92d6fda44222ea0904360826bf3ce87c92375d081
diff --git a/net-misc/rsync/files/rsync-3.2.7-flist-memcmp-ub.patch b/net-misc/rsync/files/rsync-3.2.7-flist-memcmp-ub.patch
deleted file mode 100644
index 9aa1b93e2c9c..000000000000
--- a/net-misc/rsync/files/rsync-3.2.7-flist-memcmp-ub.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-https://github.com/WayneD/rsync/issues/427
-https://github.com/WayneD/rsync/issues/429
-https://github.com/WayneD/rsync/commit/90df93e446f9ebbfd4ce97d6755c5fe1f45f9fd0
-
-From 90df93e446f9ebbfd4ce97d6755c5fe1f45f9fd0 Mon Sep 17 00:00:00 2001
-From: Wayne Davison <wayne@opencoder.net>
-Date: Sun, 8 Jan 2023 21:35:39 -0800
-Subject: [PATCH] Don't call memcmp() on an empty lastdir.
-
---- a/flist.c
-+++ b/flist.c
-@@ -2367,7 +2367,7 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
- }
-
- dirlen = dir ? strlen(dir) : 0;
-- if (dirlen != lastdir_len || memcmp(lastdir, dir, dirlen) != 0) {
-+ if (dirlen != lastdir_len || (dirlen && memcmp(lastdir, dir, dirlen) != 0)) {
- if (!change_pathname(NULL, dir, -dirlen))
- goto bad_path;
- lastdir = pathname;
-
diff --git a/net-misc/rsync/files/rsync-3.2.7-fortify-source-3.patch b/net-misc/rsync/files/rsync-3.2.7-fortify-source-3.patch
deleted file mode 100644
index 952af573dfc7..000000000000
--- a/net-misc/rsync/files/rsync-3.2.7-fortify-source-3.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-https://bugs.gentoo.org/917517
-https://github.com/WayneD/rsync/issues/511
-https://bugzilla.suse.com/show_bug.cgi?id=1214249
-https://bugzilla.redhat.com/show_bug.cgi?id=2229654
-https://src.fedoraproject.org/rpms/rsync/raw/06d55616ec86c3a68a8af917783788b928fefcc4/f/rsync-3.2.7-buffer-overflow.patch
-
-From 1f83963f59960150e8c46112daa8411324c1f209 Mon Sep 17 00:00:00 2001
-From: Jiri Slaby <jslaby@suse.cz>
-Date: Fri, 18 Aug 2023 08:26:20 +0200
-Subject: [PATCH] exclude: fix crashes with fortified strlcpy()
-
-Fortified (-D_FORTIFY_SOURCE=2 for gcc) builds make strlcpy() crash when
-its third parameter (size) is larger than the buffer:
- $ rsync -FFXHav '--filter=merge global-rsync-filter' Align-37-43/ xxx
- sending incremental file list
- *** buffer overflow detected ***: terminated
-
-It's in the exclude code in setup_merge_file():
- strlcpy(y, save, MAXPATHLEN);
-
-Note the 'y' pointer was incremented, so it no longer points to memory
-with MAXPATHLEN "owned" bytes.
-
-Fix it by remembering the number of copied bytes into the 'save' buffer
-and use that instead of MAXPATHLEN which is clearly incorrect.
-
-Fixes #511.
----
- exclude.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/exclude.c b/exclude.c
-index ffe55b167..1a5de3b9e 100644
---- a/exclude.c
-+++ b/exclude.c
-@@ -720,7 +720,8 @@ static BOOL setup_merge_file(int mergelist_num, filter_rule *ex,
- parent_dirscan = True;
- while (*y) {
- char save[MAXPATHLEN];
-- strlcpy(save, y, MAXPATHLEN);
-+ /* copylen is strlen(y) which is < MAXPATHLEN. +1 for \0 */
-+ size_t copylen = strlcpy(save, y, MAXPATHLEN) + 1;
- *y = '\0';
- dirbuf_len = y - dirbuf;
- strlcpy(x, ex->pattern, MAXPATHLEN - (x - buf));
-@@ -734,7 +735,7 @@ static BOOL setup_merge_file(int mergelist_num, filter_rule *ex,
- lp->head = NULL;
- }
- lp->tail = NULL;
-- strlcpy(y, save, MAXPATHLEN);
-+ strlcpy(y, save, copylen);
- while ((*x++ = *y++) != '/') {}
- }
- parent_dirscan = False;
diff --git a/net-misc/rsync/files/rsync-3.2.7-ipv6-configure-c99.patch b/net-misc/rsync/files/rsync-3.2.7-ipv6-configure-c99.patch
deleted file mode 100644
index 1b99dc61088b..000000000000
--- a/net-misc/rsync/files/rsync-3.2.7-ipv6-configure-c99.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-https://github.com/WayneD/rsync/pull/558
-
-From d869bcd3850b9a80f27f5aee4d41725f39d84ea7 Mon Sep 17 00:00:00 2001
-From: Ivan Babrou <github@ivan.computer>
-Date: Mon, 1 Jan 2024 19:31:01 -0800
-Subject: [PATCH] configure.ac: fix failing IPv6 check due to missing return
- type
-
-Fixing this warning escalated to an error, resuting in no IPv6 support:
-
-```
-configure.sh:7679: checking whether to enable ipv6
-configure.sh:7718: clang -o conftest -g -O2 -DHAVE_CONFIG_H -Wall -W conftest.c >&5
-conftest.c:73:1: error: type specifier missing, defaults to 'int'; ISO C99 and later do not support implicit int [-Wimplicit-int]
-main()
-^
-int
-1 error generated.
-configure.sh:7718: $? = 1
-configure.sh: program exited with status 1
-```
---- a/configure.ac
-+++ b/configure.ac
-@@ -392,7 +392,7 @@ AS_HELP_STRING([--disable-ipv6],[disable to omit ipv6 support]),
- #include <stdlib.h>
- #include <sys/types.h>
- #include <sys/socket.h>
--main()
-+int main()
- {
- if (socket(AF_INET6, SOCK_STREAM, 0) < 0)
- exit(1);
diff --git a/net-misc/rsync/files/rsync-3.4.1-c23.patch b/net-misc/rsync/files/rsync-3.4.1-c23.patch
new file mode 100644
index 000000000000..111847c0e163
--- /dev/null
+++ b/net-misc/rsync/files/rsync-3.4.1-c23.patch
@@ -0,0 +1,20 @@
+https://github.com/RsyncProject/rsync/pull/716
+
+From 026ef4cd09660c0a096e285e668b4ba7cd396509 Mon Sep 17 00:00:00 2001
+From: Michal Ruprich <mruprich@redhat.com>
+Date: Fri, 17 Jan 2025 12:37:57 +0100
+Subject: [PATCH] bool is a keyword in C23
+
+--- a/wildtest.c
++++ b/wildtest.c
+@@ -32,7 +32,9 @@ int fnmatch_errors = 0;
+
+ int wildmatch_errors = 0;
+
++#if !defined(__STDC_VERSION__) || __STDC_VERSION__ < 202311L
+ typedef char bool;
++#endif
+
+ int output_iterations = 0;
+ int explode_mod = 0;
+
diff --git a/net-misc/rsync/files/rsyncd.conf-3.0.9-r1 b/net-misc/rsync/files/rsyncd.conf-3.0.9-r1
deleted file mode 100644
index e3c55fd53d3d..000000000000
--- a/net-misc/rsync/files/rsyncd.conf-3.0.9-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-# /etc/rsyncd.conf
-
-# Minimal configuration file for rsync daemon
-# See rsync(1) and rsyncd.conf(5) man pages for help
-
-# This line is required by the /etc/init.d/rsyncd script
-pid file = @GENTOO_PORTAGE_EPREFIX@/run/rsyncd.pid
-use chroot = yes
-read only = yes
-
-# Simple example for enabling your own local rsync server
-#[gentoo-portage]
-# path = @GENTOO_PORTAGE_EPREFIX@/var/db/repos/gentoo
-# comment = Gentoo ebuild repository
-# exclude = /distfiles /packages
diff --git a/net-misc/rsync/rsync-3.2.7-r5.ebuild b/net-misc/rsync/rsync-3.2.7-r5.ebuild
deleted file mode 100644
index d809a07382e0..000000000000
--- a/net-misc/rsync/rsync-3.2.7-r5.ebuild
+++ /dev/null
@@ -1,207 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Uncomment when introducing a patch which touches configure
-RSYNC_NEEDS_AUTOCONF=1
-PYTHON_COMPAT=( python3_{9..11} )
-inherit flag-o-matic prefix python-single-r1 systemd
-
-DESCRIPTION="File transfer program to keep remote files into sync"
-HOMEPAGE="https://rsync.samba.org/"
-if [[ ${PV} == *9999 ]] ; then
- EGIT_REPO_URI="https://github.com/WayneD/rsync.git"
- inherit autotools git-r3
-
- REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-else
- VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/waynedavison.asc
- inherit verify-sig
-
- if [[ -n ${RSYNC_NEEDS_AUTOCONF} ]] ; then
- inherit autotools
- fi
-
- if [[ ${PV} == *_pre* ]] ; then
- SRC_DIR="src-previews"
- else
- SRC_DIR="src"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
- fi
-
- SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz
- verify-sig? ( https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz.asc )"
- S="${WORKDIR}"/${P/_/}
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="acl examples iconv lz4 rrsync ssl stunnel system-zlib xattr xxhash zstd"
-REQUIRED_USE+=" examples? ( ${PYTHON_REQUIRED_USE} )"
-REQUIRED_USE+=" rrsync? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
- >=dev-libs/popt-1.5
- acl? ( virtual/acl )
- examples? (
- ${PYTHON_DEPS}
- dev-lang/perl
- )
- lz4? ( app-arch/lz4:= )
- rrsync? (
- ${PYTHON_DEPS}
- $(python_gen_cond_dep '
- dev-python/bracex[${PYTHON_USEDEP}]
- ')
- )
- ssl? ( dev-libs/openssl:= )
- system-zlib? ( sys-libs/zlib )
- xattr? ( kernel_linux? ( sys-apps/attr ) )
- xxhash? ( >=dev-libs/xxhash-0.8 )
- zstd? ( >=app-arch/zstd-1.4:= )
- iconv? ( virtual/libiconv )"
-DEPEND="${RDEPEND}"
-BDEPEND="
- examples? ( ${PYTHON_DEPS} )
- rrsync? ( ${PYTHON_DEPS} )
-"
-
-if [[ ${PV} == *9999 ]] ; then
- BDEPEND+=" ${PYTHON_DEPS}
- $(python_gen_cond_dep '
- dev-python/commonmark[${PYTHON_USEDEP}]
- ')"
-else
- BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-waynedavison )"
-fi
-
-PATCHES=(
- "${FILESDIR}"/${P}-flist-memcmp-ub.patch
- "${FILESDIR}"/${P}-fortify-source-3.patch
- "${FILESDIR}"/${PN}-3.2.7-ipv6-configure-c99.patch
-)
-
-pkg_setup() {
- # - USE=examples needs Python itself at runtime, but nothing else
- # - 9999 needs commonmark at build time
- if [[ ${PV} == *9999 ]] || use examples || use rrsync; then
- python-single-r1_pkg_setup
- fi
-}
-
-src_prepare() {
- default
-
- sed -i -e 's/AC_HEADER_MAJOR_FIXED/AC_HEADER_MAJOR/' configure.ac
-
- if [[ ${PV} == *9999 || -n ${RSYNC_NEEDS_AUTOCONF} ]] ; then
- eaclocal -I m4
- eautoconf -o configure.sh
- eautoheader && touch config.h.in
- fi
-
- if use examples || use rrsync; then
- python_fix_shebang support/
- fi
-
- if [[ -f rrsync.1 ]]; then
- # If the pre-build rrsync.1 man page exists, then link to it
- # from support/rrsync.1 to avoid rsync's build system attempting
- # re-creating the man page (bug #883049).
- ln -s ../rrsync.1 support/rrsync.1 || die
- fi
-}
-
-src_configure() {
- local myeconfargs=(
- --with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf
- --without-included-popt
- --enable-ipv6
- $(use_enable acl acl-support)
- $(use_enable iconv)
- $(use_enable lz4)
- $(use_with rrsync)
- $(use_enable ssl openssl)
- $(use_with !system-zlib included-zlib)
- $(use_enable xattr xattr-support)
- $(use_enable xxhash)
- $(use_enable zstd)
- )
-
- # https://github.com/WayneD/rsync/pull/428
- if is-flagq -fsanitize=undefined ; then
- sed -E -i \
- -e 's:#define CAREFUL_ALIGNMENT (0|1):#define CAREFUL_ALIGNMENT 1:' \
- byteorder.h || die
- append-flags -DCAREFUL_ALIGNMENT
- fi
-
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- newconfd "${FILESDIR}"/rsyncd.conf.d rsyncd
- newinitd "${FILESDIR}"/rsyncd.init.d-r1 rsyncd
-
- dodoc NEWS.md README.md TODO tech_report.tex
-
- insinto /etc
- newins "${FILESDIR}"/rsyncd.conf-3.2.7-r5 rsyncd.conf
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}"/rsyncd.logrotate rsyncd
-
- insinto /etc/xinetd.d
- newins "${FILESDIR}"/rsyncd.xinetd-3.0.9-r1 rsyncd
-
- # Install stunnel helpers
- if use stunnel ; then
- emake DESTDIR="${D}" install-ssl-daemon
- fi
-
- # Install the useful contrib scripts
- if use examples ; then
- # The 'rrsync' script is installed conditionally via the 'rrysnc'
- # USE flag, and not via the 'examples' USE flag.
- rm support/rrsync* || die
-
- exeinto /usr/share/rsync
- doexe support/*
-
- rm -f "${ED}"/usr/share/rsync/{Makefile*,*.c}
- fi
-
- eprefixify "${ED}"/etc/{,xinetd.d}/rsyncd*
-
- systemd_newunit packaging/systemd/rsync.service rsyncd.service
-}
-
-pkg_postinst() {
- if grep -Eqis '^[[:space:]]use chroot[[:space:]]*=[[:space:]]*(no|0|false)' \
- "${EROOT}"/etc/rsyncd.conf "${EROOT}"/etc/rsync/rsyncd.conf ; then
- ewarn "You have disabled chroot support in your rsyncd.conf. This"
- ewarn "is a security risk which you should fix. Please check your"
- ewarn "/etc/rsyncd.conf file and fix the setting 'use chroot'."
- fi
-
- if use stunnel ; then
- einfo "Please install \">=net-misc/stunnel-4\" in order to use stunnel feature."
- einfo
- einfo "You maybe have to update the certificates configured in"
- einfo "${EROOT}/etc/stunnel/rsync.conf"
- fi
-
- if use system-zlib ; then
- ewarn "Using system-zlib is incompatible with <rsync-3.1.1 when"
- ewarn "using the --compress option."
- ewarn
- ewarn "When syncing with >=rsync-3.1.1 built with bundled zlib,"
- ewarn "and the --compress option, add --new-compress (-zz)."
- ewarn
- ewarn "For syncing the portage tree, add:"
- ewarn "PORTAGE_RSYNC_EXTRA_OPTS=\"--new-compress\" to make.conf"
- fi
-}
diff --git a/net-misc/rsync/rsync-3.3.0-r1.ebuild b/net-misc/rsync/rsync-3.4.1.ebuild
index 2c4a1bb28ccb..759c2d0bd78d 100644
--- a/net-misc/rsync/rsync-3.3.0-r1.ebuild
+++ b/net-misc/rsync/rsync-3.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999 ]] ; then
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
else
- VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/waynedavison.asc
+ VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/andrewtridgell.asc
inherit verify-sig
if [[ -n ${RSYNC_NEEDS_AUTOCONF} ]] ; then
@@ -27,7 +27,7 @@ else
SRC_DIR="src-previews"
else
SRC_DIR="src"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
fi
SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz
@@ -42,7 +42,7 @@ REQUIRED_USE+=" examples? ( ${PYTHON_REQUIRED_USE} )"
REQUIRED_USE+=" rrsync? ( ${PYTHON_REQUIRED_USE} )"
RDEPEND="
- >=dev-libs/popt-1.5
+ >=dev-libs/popt-1.19
acl? ( virtual/acl )
examples? (
${PYTHON_DEPS}
@@ -73,9 +73,13 @@ if [[ ${PV} == *9999 ]] ; then
dev-python/commonmark[${PYTHON_USEDEP}]
')"
else
- BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-waynedavison )"
+ BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-andrewtridgell )"
fi
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.4.1-c23.patch
+)
+
pkg_setup() {
# - USE=examples needs Python itself at runtime, but nothing else
# - 9999 needs commonmark at build time
@@ -108,9 +112,6 @@ src_prepare() {
}
src_configure() {
- # Should be fixed upstream in next release (>3.3.0) (bug #943745)
- append-cflags $(test-flags-CC -std=gnu17)
-
local myeconfargs=(
--with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf
--without-included-popt
diff --git a/net-misc/rsync/rsync-9999.ebuild b/net-misc/rsync/rsync-9999.ebuild
index 5ee608143668..759c2d0bd78d 100644
--- a/net-misc/rsync/rsync-9999.ebuild
+++ b/net-misc/rsync/rsync-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999 ]] ; then
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
else
- VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/waynedavison.asc
+ VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/andrewtridgell.asc
inherit verify-sig
if [[ -n ${RSYNC_NEEDS_AUTOCONF} ]] ; then
@@ -42,7 +42,7 @@ REQUIRED_USE+=" examples? ( ${PYTHON_REQUIRED_USE} )"
REQUIRED_USE+=" rrsync? ( ${PYTHON_REQUIRED_USE} )"
RDEPEND="
- >=dev-libs/popt-1.5
+ >=dev-libs/popt-1.19
acl? ( virtual/acl )
examples? (
${PYTHON_DEPS}
@@ -73,9 +73,13 @@ if [[ ${PV} == *9999 ]] ; then
dev-python/commonmark[${PYTHON_USEDEP}]
')"
else
- BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-waynedavison )"
+ BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-andrewtridgell )"
fi
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.4.1-c23.patch
+)
+
pkg_setup() {
# - USE=examples needs Python itself at runtime, but nothing else
# - 9999 needs commonmark at build time
@@ -143,7 +147,7 @@ src_install() {
dodoc NEWS.md README.md TODO tech_report.tex
insinto /etc
- newins "${FILESDIR}"/rsyncd.conf-3.0.9-r1 rsyncd.conf
+ newins "${FILESDIR}"/rsyncd.conf-3.2.7-r5 rsyncd.conf
insinto /etc/logrotate.d
newins "${FILESDIR}"/rsyncd.logrotate rsyncd
diff --git a/net-misc/tuba/Manifest b/net-misc/tuba/Manifest
index c0cc2c3945ce..9c0731754d89 100644
--- a/net-misc/tuba/Manifest
+++ b/net-misc/tuba/Manifest
@@ -1,7 +1,5 @@
DIST Tuba-0.8.4.gh.tar.gz 1803987 BLAKE2B 9ec1647bc255a3cef37293fc86f81eed534f4a313e3ec0ab81318766972ed01100b30afcc05448f5344637da08962bb72dc2eb5d44fc0561ce1a61c48b9b8b5d SHA512 8484cdb898174958c1e79ddfd6fab9e74693bca19d1eddde504679d1074cac986580dcf2e2c98fa13ab54fec2a4ffc25b1977bc6e62f1b3a524a6810b2ac268f
-DIST Tuba-0.9.1.gh.tar.gz 2137594 BLAKE2B 1df526b4340896d367243eeee534b923554cf039368e851d82faa178b2d2bb43dc84612f0af209f4ded6e7902c47026dd2305b82159d8d92323810075c7daa43 SHA512 4c80fb98902359f9f8b59665ea580e477885d5de66e1d5640b67766fde49805702eababed4600b13afd6e8a16b5dbdc9b2391b0c8271eebdef70152c1b60f7a4
DIST Tuba-0.9.2.gh.tar.gz 2190160 BLAKE2B f4d0f6c1bca6da011fb19a42a34fc3773e5f2693075a9ac7d5d30d78701371e42c326482baa548688431022cf09661e78bac71da42c7e4b99652c57fa1eb5ee8 SHA512 2243a796fd5fb6fb8ce16640d0d5d49e64ad01736413408ca9825ef0ded3ccc2caa5daf7ce45685f0cfbb85100d34703ede4a59b235d371232f2c03a7a126ae1
EBUILD tuba-0.8.4.ebuild 1485 BLAKE2B 086983f0f203ccd28029a0e7f9f7181bbcc9400f1f32f08c877f3a138da74bfa14d969e6006e9540bf8a3ea73f1091e4d5c11bd7620d29539cf2c023d2af0049 SHA512 7e2e5f094c2922ad9cab185df380d492ac833e55fc0d058685eef197e8a08a76dfa589b97df5dcc9bf4729add269b9816add99fba68a26b6bcb462a41f54d14b
-EBUILD tuba-0.9.1.ebuild 1524 BLAKE2B a7b6b62116cb358f046f484fe6f102fcfaef2589fd4352bd44df2eb4e351a06b6a5ed0170c928b03be0e4613131285c60797ab4a478b6421099e16537d820ad4 SHA512 06e337c7fda37dd5088c4358ac313f5db99cd6a9416264e874d6c5e4fab5e9e8b65d00dcd8a0cf7a4ef346bb1864d754f0aa8fef1d2da087342631a689a480ea
EBUILD tuba-0.9.2.ebuild 1524 BLAKE2B a7b6b62116cb358f046f484fe6f102fcfaef2589fd4352bd44df2eb4e351a06b6a5ed0170c928b03be0e4613131285c60797ab4a478b6421099e16537d820ad4 SHA512 06e337c7fda37dd5088c4358ac313f5db99cd6a9416264e874d6c5e4fab5e9e8b65d00dcd8a0cf7a4ef346bb1864d754f0aa8fef1d2da087342631a689a480ea
MISC metadata.xml 324 BLAKE2B b9364b6c365bfaeda33ec6e0600582271501e80f0af0c075545a9d577e823bc4ce35ec37903f2f7f1f22c016b6bb0e7c40ef7d9ba8882fb924a865491bbb8dc7 SHA512 867574ad6665a12cb09aa75c525de101955dabdea5b744e688ab0b7214482ca5d151ed2007c5b050fbc69c48205fdbe5784aea0cb7ebce455d785200048b0a41
diff --git a/net-misc/tuba/tuba-0.9.1.ebuild b/net-misc/tuba/tuba-0.9.1.ebuild
deleted file mode 100644
index 09c732985f1f..000000000000
--- a/net-misc/tuba/tuba-0.9.1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 2023-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome2-utils meson optfeature vala
-
-MY_P=${P^}
-DESCRIPTION="Browse the Fediverse (GTK client)"
-HOMEPAGE="
- https://tuba.geopjr.dev/
- https://github.com/GeopJr/Tuba/
-"
-SRC_URI="
- https://github.com/GeopJr/Tuba/archive/v${PV}.tar.gz
- -> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-3 CC-BY-SA-4.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-
-# TODO: optional dep on libspelling-1
-DEPEND="
- app-crypt/libsecret[introspection,vala]
- >=dev-libs/glib-2.76.0:2
- dev-libs/icu:=
- >=dev-libs/json-glib-1.4.4[introspection]
- >=dev-libs/libgee-0.8.5:0.8[introspection]
- dev-libs/libxml2
- >=gui-libs/gtk-4.13.4:4[gstreamer,introspection]
- >=gui-libs/libadwaita-1.6:1[introspection,vala]
- >=gui-libs/gtksourceview-5.6.0:5[introspection,vala]
- media-libs/gstreamer[introspection]
- net-libs/libsoup:3.0[introspection,vala]
-"
-RDEPEND="
- ${DEPEND}
-"
-BDEPEND="
- $(vala_depend)
- sys-devel/gettext
- virtual/pkgconfig
-"
-
-src_configure() {
- local emesonargs=(
- # disable calling updaters (see pkg_post*)
- -Ddistro=true
- # not packaged
- -Dclapper=false
- )
-
- vala_setup
- meson_src_configure
-}
-
-src_install() {
- meson_src_install
- dosym dev.geopjr.Tuba /usr/bin/tuba
-}
-
-pkg_postinst() {
- optfeature "WebP image support" gui-libs/gdk-pixbuf-loader-webp
-
- gnome2_schemas_update
- xdg_desktop_database_update
- xdg_icon_cache_update
-}
-
-pkg_postrm() {
- gnome2_schemas_update
- xdg_desktop_database_update
- xdg_icon_cache_update
-}
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-08 12:25:44 +0000