diff options
Diffstat (limited to 'net-misc')
-rw-r--r-- | net-misc/Manifest.gz | bin | 54115 -> 54110 bytes | |||
-rw-r--r-- | net-misc/connman/Manifest | 2 | ||||
-rw-r--r-- | net-misc/connman/connman-1.42_pre20230116.ebuild | 133 | ||||
-rw-r--r-- | net-misc/netkit-fingerd/Manifest | 6 | ||||
-rw-r--r-- | net-misc/netkit-fingerd/files/netkit-fingerd-0.17-includes.patch (renamed from net-misc/netkit-fingerd/files/netkit-fingerd-0.17-r2-gentoo.diff) | 22 | ||||
-rw-r--r-- | net-misc/netkit-fingerd/netkit-fingerd-0.17-r3.ebuild | 10 | ||||
-rw-r--r-- | net-misc/r8168/Manifest | 4 | ||||
-rw-r--r-- | net-misc/r8168/files/r8168-8.050.02-5.18-fix.patch | 51 | ||||
-rw-r--r-- | net-misc/r8168/files/r8168-8.050.03-5.19-fix.patch | 23 | ||||
-rw-r--r-- | net-misc/r8168/r8168-8.050.03.ebuild | 41 | ||||
-rw-r--r-- | net-misc/stunnel/Manifest | 2 | ||||
-rw-r--r-- | net-misc/stunnel/stunnel-5.65-r2.ebuild | 2 |
12 files changed, 161 insertions, 135 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz Binary files differindex 71b542092750..859e1d029787 100644 --- a/net-misc/Manifest.gz +++ b/net-misc/Manifest.gz diff --git a/net-misc/connman/Manifest b/net-misc/connman/Manifest index 0e5ea0bcc403..4807dea25e02 100644 --- a/net-misc/connman/Manifest +++ b/net-misc/connman/Manifest @@ -2,8 +2,10 @@ AUX connman.confd 728 BLAKE2B c4ee3b02bddaaa99af6aab2ecb0300cc7d67cfc73114d94863 AUX connman.initd2 479 BLAKE2B 4ef210f405b196fe2fe0fa2e95188cded69d3da37e9f368f500f95db48e1e51e881a5f04479e501283c70712f99a20569b9bf2c6793dc36fb37c68bafb9ff8c3 SHA512 6b636b53f1bede22f04d7107c0e5032dbd425032f317692b2ba39f810371eb89a840ced5f8988d26d384eb6e61ea967d1088c4f0ba6cff42782d9d39300b2a40 AUX libresolv-musl-fix.patch 1554 BLAKE2B 496cae4e748089c6f2fe46850a4940660bcaff8289f477e1c4b019f2a854d33022a171d7f16e2b8193c94964806542560e00fbf54e63deea9038845201120aa8 SHA512 c258e747e13b86c81ae96ac1743abf0c1461b9053c5b386d594a49f0b1890f10d89bea92610762ff609a4cc5fea04a43fab83894702f552b05af400f01cb011e DIST connman-82ce08135a14ef4ab5b5b60f1e426a26b9fc72fc.tar.gz 742300 BLAKE2B 90d6332ce6ee29ee313b6e83cb4c77982bfff02bf358cf066df7a77cfacfaaeb6b06315f7452a86b33a7351adb7883a608020010834604f94ae4671d72e268b4 SHA512 35c95b9544ee204bf57df3ff4258f3454a3d34e4fff2fe19d74df2fead8956c919fe5ecde7554b22c32504a32b15adb5c0d858457acdf21f4d2df766d4a0de4b +DIST connman-9971144ae862e83f1f5d8cb84c0b62f2542dcdec.tar.gz 743500 BLAKE2B 513380639f02c103f4e9aca73571e00edc42894e612712c20319c3ee9b8845bff41ce05b17016b52b7d34f09c8f74f877a639fd21455b13a5a2ef1554eb0b093 SHA512 bc37dabb13b76e3fa0efd811d664f321b47118d378285dfa06710ec227822c409ed0c60c2f42c00ae081e47ec879ec1b19f784e9fc2346d1d57f6e87550dda22 DIST connman-cb05780d86c39cfb5e6d9ac2b288bf3244a95d57.tar.gz 738675 BLAKE2B d2c8ee587bdf045e4438a5c4c48475a5ba8ae390032dbdee44ed884273d741e290fcaeb5cee1025a7dec1f7f7034cf01d3e074d08004024dc541bff1b729627c SHA512 3d49f7fad6044c080a5805cc35dbecbdf916d66a2ace0246631936fbf46d80fcfff960df79a8471069caa00975dd74f5fcc17812811ce9c93919e2947ef23f6d EBUILD connman-1.42_pre20220828-r1.ebuild 3055 BLAKE2B b37e514b1103788c30d3c6f686e757904ee48fb390f880d1986318f8a467b2177f5a6da8376f1a8d5f37b80e65e52a300272e46adb802be420980f880aeeaf41 SHA512 af0941568a533addeeaa394af1779798784eeb0ef9adc9b3f08b3577ffd1cb61cf1e1fb26bd9060b895746a54c8290fbe4e892ec4bdd8a61094af6a1de580dda EBUILD connman-1.42_pre20221103.ebuild 3062 BLAKE2B 2aa6bc41720c805c8cb03fdbb4626ac84b5bd1e4138b5d0cb8f843e11b028f0a370e1c88710fee8ba0708cfc174e9bccf6eb3e1b6ec92cb6d209dedd55f87dbd SHA512 6f9016713417907b2bef75bf4ef2f3c50abdc65d7125ef918d39e05987d6e8971b09ef6fcead9853699496afe905099afbcadc6b307b65c40c90742fbdf409a5 +EBUILD connman-1.42_pre20230116.ebuild 3606 BLAKE2B 316456d6c03d838f51bac72f17365f578a814f86adcc6fc02ac799c9a023c84c40e280595c39d03daee5c0d5e389710e9852b6f5d8a072fbf12b6eab21651b7a SHA512 9d20e6bf8bfcf95f60cf021d70ac00c9708ef62ebd179137d408dd67429d02fbc124c55738b3895b6456823683a9e3f3fca89d63c4035467e691dd871c854bb1 EBUILD connman-9999.ebuild 2768 BLAKE2B 941f992ea03c199415c7c453a58335bc14f5d1bea965a676c364052a4dacaa3b95f28e7b8258f8069d2d4551142a0cd96c4eb748900778612372f79085141446 SHA512 b0e4d9b12c0a509899304e021b36a24ccae6e60334a50561224065b7ab022b14c31336cb4032cbaec05f8fd49db4fdc1c13775cccd434eef2cabc24203b8b495 MISC metadata.xml 1314 BLAKE2B 8ac27df91b77d2da814c0f35368359f2c55c9cf9c9b8db56748ca9a6128f59514dbcba5c966777a1dda27ed37ccdc6e7e37b57724f7bac83e383c3f8e5b427ce SHA512 98dcfc78d0d4a7abab5282efc2cd10419ab067d6f52f9743f7b72dc446f6e0cc0c5a63266ffa3b9cdb4df3935fc5e7f96faa143bf796ccd90e709c26e7a652b7 diff --git a/net-misc/connman/connman-1.42_pre20230116.ebuild b/net-misc/connman/connman-1.42_pre20230116.ebuild new file mode 100644 index 000000000000..140c2c70f514 --- /dev/null +++ b/net-misc/connman/connman-1.42_pre20230116.ebuild @@ -0,0 +1,133 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" +inherit autotools systemd tmpfiles + +COMMIT=9971144ae862e83f1f5d8cb84c0b62f2542dcdec + +if [[ ${PV} == *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://git.kernel.org/pub/scm/network/connman/connman.git" +else + SRC_URI="https://git.kernel.org/pub/scm/network/connman/connman.git/snapshot/connman-${COMMIT}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" +fi + +DESCRIPTION="Provides a daemon for managing internet connections" +HOMEPAGE="https://git.kernel.org/pub/scm/network/connman/connman.git/" + +LICENSE="GPL-2" +SLOT="0" + +IUSE="bluetooth debug doc +ethernet examples iptables iwd l2tp networkmanager ++nftables ofono openconnect openvpn policykit pptp tools vpnc +wifi wireguard +wispr" + +REQUIRED_USE="^^ ( iptables nftables )" +BDEPEND="virtual/pkgconfig" +COMMON_DEPEND=">=dev-libs/glib-2.16 + net-libs/gnutls + >=sys-apps/dbus-1.2.24 + sys-libs/readline:0= + nftables? ( + >=net-libs/libnftnl-1.0.4:0= + >=net-libs/libmnl-1.0.0:0= + ) + openconnect? ( net-vpn/openconnect ) + openvpn? ( net-vpn/openvpn ) + pptp? ( net-dialup/pptpclient ) + vpnc? ( net-vpn/vpnc ) + wireguard? ( >=net-libs/libmnl-1.0.0:0= )" +RDEPEND="${COMMON_DEPEND} + bluetooth? ( net-wireless/bluez ) + iptables? ( >=net-firewall/iptables-1.4.8 ) + l2tp? ( net-dialup/xl2tpd ) + ofono? ( net-misc/ofono ) + policykit? ( sys-auth/polkit ) + wifi? ( + !iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] ) + iwd? ( net-wireless/iwd ) + )" +DEPEND="${COMMON_DEPEND} + >=sys-kernel/linux-headers-2.6.39" + +PATCHES=( "${FILESDIR}/libresolv-musl-fix.patch" ) +S=${WORKDIR}/${PN}-${COMMIT} + +src_prepare() { + default + eautoreconf + + cp "${FILESDIR}"/connman.initd2 "${FILESDIR}"/connman.confd "${T}" + if use iwd; then + sed -i \ + -e "s/need dbus/need dbus iwd/" \ + "${T}"/connman.initd2 || die + sed -i \ + -e 's/CONNMAN_OPTS=""/CONNMAN_OPTS="--wifi=iwd_agent"/' \ + "${T}"/connman.confd || die + sed -i \ + -e "/^ExecStart/ s/$/ --wifi=iwd_agent/" \ + src/connman.service.in || die + fi +} + +src_configure() { + local myeconfargs=( + --localstatedir=/var \ + --runstatedir=/run \ + --with-systemdunitdir=$(systemd_get_systemunitdir) \ + --with-tmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d \ + --enable-client \ + --enable-datafiles \ + --enable-loopback=builtin \ + $(use_enable bluetooth bluetooth builtin) \ + $(use_enable debug) \ + $(use_enable ethernet ethernet builtin) \ + $(use_enable examples test) \ + $(use_enable l2tp l2tp builtin) \ + $(use_enable networkmanager nmcompat) \ + $(use_enable ofono ofono builtin) \ + $(use_enable openconnect openconnect builtin) \ + $(use_enable openvpn openvpn builtin) \ + $(use_enable policykit polkit builtin) \ + $(use_enable pptp pptp builtin) \ + $(use_enable tools) \ + $(use_enable vpnc vpnc builtin) \ + $(use_enable wireguard) \ + $(use_enable wispr wispr builtin) \ + --with-firewall=$(usex iptables "iptables" "nftables" ) \ + --disable-iospm \ + --disable-hh2serial-gps + ) + # wifi USE logic to match networkmanager ebuild behavior + if use wifi; then + if use iwd; then + myeconfargs+=( --enable-iwd --disable-wifi ) + else + myeconfargs+=( --disable-iwd --enable-wifi=builtin ) + fi + else + myeconfargs+=( --disable-iwd --disable-wifi ) + fi + + econf "${myeconfargs[@]}" +} + +src_install() { + default + dobin client/connmanctl + + if use doc; then + dodoc doc/*.txt + fi + keepdir /usr/lib/${PN}/scripts + keepdir /var/lib/${PN} + newinitd "${T}"/${PN}.initd2 ${PN} + newconfd "${FILESDIR}"/${PN}.confd ${PN} +} + +pkg_postinst() { + tmpfiles_process connman_resolvconf.conf +} diff --git a/net-misc/netkit-fingerd/Manifest b/net-misc/netkit-fingerd/Manifest index 14ee3f977af0..74d02bbe50e0 100644 --- a/net-misc/netkit-fingerd/Manifest +++ b/net-misc/netkit-fingerd/Manifest @@ -1,6 +1,6 @@ AUX fingerd.xinetd 250 BLAKE2B 0b9a1e2af0bcf4223ae8919245c1b9696693c07adc9c6aed239f965515bc50c417789695b03dfb1a0fe5929a6a06e490ebcb6a6329e6f22c13e33038818e5fd8 SHA512 7867a6463fd1c0d6994d2c6a0f2d6e7ebb558b2d3131df478cd736aa2028a6c5246d3d7f3959af9057a6446a2350f25bcf1d956d0b6cf4809d729a5dae2a004b +AUX netkit-fingerd-0.17-includes.patch 654 BLAKE2B 40b3d976c6c5fbf146945ab877657f9459cc6530f4b6795f762f9cf462d1214d04dc014e63c71d154190193cba8c8373489b658ace8edf751e203bb59b2b0893 SHA512 adc48bb5d024227343e994e61139e3e628a37dc8e60ed7baf4cdd919c6916cec7fcebe02a961b9218872cf6fa9423a2f3295f297e960cd12ddc4e1a3e0ed890c AUX netkit-fingerd-0.17-name-check.patch 681 BLAKE2B 89b120b47f3d3ad0599b28586e455a8c5a25f93d9afe81ab55e69e12474c9706e63845d86c6405e4e3a31b2b5205b132b7c7d371c5e7d9c5e7b68dfc15ce2446 SHA512 832afddbf7c5d9985fd5ffd87f3354be1c2aba4a82146e2ebfca81045c80b91238b31f94ef72409042e8fd8c250108d2d29feb3a1ce1acd77769d3df8a09c23a -AUX netkit-fingerd-0.17-r2-gentoo.diff 603 BLAKE2B c17544baf5fb2cdec8172a4f9d833d575858b606e1dced6793ae4d7d6593d6ec416b7c35324c0dd39dad38a322d8cdbaa0135f79ee8bc2114a2bcaf30b7b4dc0 SHA512 1948a9c350a31497fa681aa6061ac859a5a3b18b9efb4b87a323a45a1472c6ddc31e50da33b891701f2e7196ea6fa07a40c31575ba261f9c2f3a6e28b35dbbb1 -DIST bsd-finger_0.17.orig.tar.bz2 24096 BLAKE2B 96342764b07e3946c2ddba8ecd094e3760b32601e6eea630c1586e821ee856a2e09420ba69ff55e3023d832757f8daaf58e4bf5d4bab35e475bcd83c851ab730 SHA512 06bc071fb5115be13ab88b946626f97b14ec60e9223c831bdc0575c6ad9556227179736078191ce4f4b982ebcba9a82b4aba2ad970803b35015999a167841bdc -EBUILD netkit-fingerd-0.17-r3.ebuild 1113 BLAKE2B 3ecfa35ea50bb2e1084858aac24c636062a8640f3b9e23fe5f6b45d7cfbb511c489311bb3717d2e2824099f19e7768b3d3dd8a8afb050147839a6a26d3116b01 SHA512 b8cdeb8022f6f1d7eea8232f0608cece85bf02965f81826f6c44d6458cdb7df2dbc81eb561097270d2e6da231b2ca071c5c1bf9f3fc590bff0cf3dec100cf15a +DIST bsd-finger-0.17.tar.gz 25521 BLAKE2B 4b8eb07d057d2ef2bfea5987820ad6aed7c73e2365fc78c7dcf76be0f74a3056ccf5115c3b58f3235384caaacda76dc38e4ce51713fa1c28c10160232213f348 SHA512 07570a9a5797579273938ef728f222f483c733e78eb6acb00e2bce9ff9df29aa85ed715872032701c8f67fcbc7cf5501f12dc2b8234c30df7d25f50cc38359b0 +EBUILD netkit-fingerd-0.17-r3.ebuild 1094 BLAKE2B 62dacfa6a2592d14808b627565182da70876689ce2ab35306271bfa2d14c17aff5891a7128aaca2b1a4df219e0c3b1c98f236f27c87adfc931961dfdd21adca4 SHA512 9e3f28b1a647a6f119d14899f8bc35324a6bc6992897b0234bdcde811a9a70e7ae29772070de3d0b907a93a350591deb5a135ff9e71bbfc60979d57db174c06c MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c diff --git a/net-misc/netkit-fingerd/files/netkit-fingerd-0.17-r2-gentoo.diff b/net-misc/netkit-fingerd/files/netkit-fingerd-0.17-includes.patch index e7c2d776147d..4318db053ac2 100644 --- a/net-misc/netkit-fingerd/files/netkit-fingerd-0.17-r2-gentoo.diff +++ b/net-misc/netkit-fingerd/files/netkit-fingerd-0.17-includes.patch @@ -1,6 +1,18 @@ ---- bsd-finger-0.17/finger/lprint.c~ Tue Sep 14 12:51:11 1999 -+++ bsd-finger-0.17/finger/lprint.c Sun Apr 29 21:49:04 2001 -@@ -48,7 +48,7 @@ +https://bugs.gentoo.org/897822 + +Add missing fcntl.h. +Change sys/time.h to time.h. + +--- a/finger/lprint.c ++++ b/finger/lprint.c +@@ -42,13 +42,14 @@ + + #include <stdio.h> + #include <ctype.h> ++#include <fcntl.h> + #include <paths.h> + #include <string.h> + #include <unistd.h> #include <sys/types.h> #include <sys/file.h> #include <sys/stat.h> @@ -9,8 +21,8 @@ #include "finger.h" static void lprint(PERSON *pn); ---- bsd-finger-0.17/finger/sprint.c~ Sun Dec 12 19:59:33 1999 -+++ bsd-finger-0.17/finger/sprint.c Sun Apr 29 21:49:22 2001 +--- a/finger/sprint.c ++++ b/finger/sprint.c @@ -40,7 +40,7 @@ #endif /* not lint */ diff --git a/net-misc/netkit-fingerd/netkit-fingerd-0.17-r3.ebuild b/net-misc/netkit-fingerd/netkit-fingerd-0.17-r3.ebuild index bd104d8c1edc..6c1adb7f6586 100644 --- a/net-misc/netkit-fingerd/netkit-fingerd-0.17-r3.ebuild +++ b/net-misc/netkit-fingerd/netkit-fingerd-0.17-r3.ebuild @@ -1,25 +1,23 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" inherit toolchain-funcs -MY_PN="${PN/netkit/bsd}" -MY_PN="${MY_PN/rd/r}" DESCRIPTION="Netkit - fingerd and finger client" HOMEPAGE="https://wiki.linuxfoundation.org/networking/netkit" -SRC_URI="mirror://debian/pool/main/b/${MY_PN}/${MY_PN}_${PV}.orig.tar.bz2" +SRC_URI="http://ftp.linux.org.uk/pub/linux/Networking/finger/bsd-finger-${PV}.tar.gz" LICENSE="BSD" SLOT="0" KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86" IUSE="" -S=${WORKDIR}/${MY_PN}-${PV} +S=${WORKDIR}/bsd-finger-${PV} PATCHES=( - "${FILESDIR}"/${P}-r2-gentoo.diff + "${FILESDIR}"/netkit-fingerd-0.17-includes.patch "${FILESDIR}"/${P}-name-check.patch #80286 ) diff --git a/net-misc/r8168/Manifest b/net-misc/r8168/Manifest index b71a2593a0c4..1efe43527c5e 100644 --- a/net-misc/r8168/Manifest +++ b/net-misc/r8168/Manifest @@ -1,8 +1,4 @@ -AUX r8168-8.050.02-5.18-fix.patch 2340 BLAKE2B d85b0d826b58bad42999309d81bd2a7a5202f81dfe516d32c0a7857d63394c70e5e9f66dcdfa03f8f05dce525204a225c6fa1c73dbd6a0cc2dae7a3995be120f SHA512 952660cd26f2c14e21b45bb0fa88012f980f7999b1f33849a295bc757063f25c2b5911f155305d4cc0d671b503acfc315901d584a83c78c47aeb76ee8301f3d7 -AUX r8168-8.050.03-5.19-fix.patch 849 BLAKE2B 1913abf46a1b0fa22587f64f5c81e87414e3bbf8d4fd392ce8eafe1405ef6499abf98cee4f26866216d781b6c0e7773dbd5867d4fe49038df3af001a4d81e826 SHA512 fe5977cfd0608a2335c96316568ef20ac4e6ae7913250f6fdfb885a1bf3f50a4de64c6102631650b5e1f4d752132086efa589a95e4cbb2086571fb3545847717 AUX r8168-8.051.02-6.1-fix.patch 983 BLAKE2B 6c3ec1726f47ab51d702481a8e6817c25917b4e3760d49df74fd888ec04a61468a55015b2444cbed114853079b7844b14370efe095e37e8572abb271bca87ee8 SHA512 b2484ac3169c27324f204d068ffa7e29497039b1e4694ff7aa5ba22ff4da939c371cc2df4ca95b5d96e591d7dc8c558c50bc4b4fe53515ef7776f1564e40dfd7 -DIST r8168-8.050.03.tar.bz2 115525 BLAKE2B 9681417c5ded9d089259d80226a16789beaacf31902d896410d581927468c44486a4c496e45d9973851ccca2d4c408159064452849b03347c789390b2b23e57b SHA512 b4c0af2f4e6b9dc36f2db9e33f465d8598afa0b28577ea1f016617e853af00cf41886941fd8173a5b035e219d87a0fae28771230079c88f34039efe669c1e1c6 DIST r8168-8.051.02.tar.bz2 115969 BLAKE2B 28b809c0330920ee0db7a8f8d41e178882531cd0a6793efeadd9670b1a9b5cbe903061073fd1d461f4234feb41249a244f9ef35cdbb780da498e5a6d6f1a5490 SHA512 2f29a413e7db2b7295ea0a970b3385de1dfd6e41e1820097355687daa5c8d155c1cf6115c72875bff4f366365579bffc81733469a62d76f437065b7e514387ca -EBUILD r8168-8.050.03.ebuild 1163 BLAKE2B b2c551916ca8a3314b2be6e57c3705c85368824164d203e7a8f856aa416921720b68d77f16c3a5389c7d3b545b4458dc5b0e747891e59cab9042f4b0e74823f9 SHA512 86bffbb8d2772c8a56d54429dfe2b76be59ce6e05128b56c802d48fba6bd2980968103edf70cd699c4ba9b21ada0337ed1e84efb7ad3e0f74ee4d2c42714e2c1 EBUILD r8168-8.051.02.ebuild 1117 BLAKE2B e0d47181a336316074241c3b4fc8b683d8d30ddfb56721249ccf2cf7e05284b6abf4160ee591b3fc26839e4af7acc0850a3950fb00ab9f064526dd3b7d186632 SHA512 39eb9098797e95003f4d6a18e40ed5c66dd77c7f2c117347fc4082e64dfcc70cb2a3a504fedff671207ba34fe7673467dd9e65642a0d87ddfcbee7825a6d763f MISC metadata.xml 577 BLAKE2B 0335cbfc902163abd4ffef0ad089b15ae7eaee15e41ed7760834d0329662a8ea0c66d68366a779265205557abe31bf3055b474f6bda7469e803a6240c3e68951 SHA512 f27ae61be558fe46b14fdf43a8d975c71cc900788761e6c5044eea6e8f80ddb6528b0d9d711844b6c8b45e58401a8736d08c40827fa0ceb99be32a3a0abd7086 diff --git a/net-misc/r8168/files/r8168-8.050.02-5.18-fix.patch b/net-misc/r8168/files/r8168-8.050.02-5.18-fix.patch deleted file mode 100644 index 442fa1c3eadf..000000000000 --- a/net-misc/r8168/files/r8168-8.050.02-5.18-fix.patch +++ /dev/null @@ -1,51 +0,0 @@ -Functions like 'pci_dma_sync_single_for_device', 'pci_set_dma_mask', and 'pci_set_consistent_dma_mask' -no longer exist in 5.18.0. -Fix similar to https://www.mail-archive.com/linux-kernel@vger.kernel.org/msg2238850.html - ---- a/src/r8168_n.c -+++ b/src/r8168_n.c -@@ -3698,7 +3698,11 @@ - txd->opts2 = 0; - while (1) { - memset(tmpAddr, pattern++, len - 14); -+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,18,0) - pci_dma_sync_single_for_device(tp->pci_dev, -+#else -+ dma_sync_single_for_device(&tp->pci_dev->dev, -+#endif - le64_to_cpu(mapping), - len, DMA_TO_DEVICE); - txd->opts1 = cpu_to_le32(DescOwn | FirstFrag | LastFrag | len); -@@ -3726,7 +3730,11 @@ - if (rx_len == len) { - dma_sync_single_for_cpu(tp_to_dev(tp), le64_to_cpu(rxd->addr), tp->rx_buf_sz, DMA_FROM_DEVICE); - i = memcmp(skb->data, rx_skb->data, rx_len); -+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,18,0) - pci_dma_sync_single_for_device(tp->pci_dev, le64_to_cpu(rxd->addr), tp->rx_buf_sz, DMA_FROM_DEVICE); -+#else -+ dma_sync_single_for_device(&tp->pci_dev->dev, le64_to_cpu(rxd->addr), tp->rx_buf_sz, DMA_FROM_DEVICE); -+#endif - if (i == 0) { - // dev_printk(KERN_INFO, tp_to_dev(tp), "loopback test finished\n",rx_len,len); - break; -@@ -26408,11 +26416,20 @@ - - if ((sizeof(dma_addr_t) > 4) && - use_dac && -+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,18,0) - !pci_set_dma_mask(pdev, DMA_BIT_MASK(64)) && - !pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64))) { -+#else -+ !dma_set_mask(&pdev->dev, DMA_BIT_MASK(64)) && -+ !dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64))) { -+#endif - dev->features |= NETIF_F_HIGHDMA; - } else { -+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,18,0) - rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(32)); -+#else -+ rc = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32)); -+#endif - if (rc < 0) { - #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0) - if (netif_msg_probe(tp)) diff --git a/net-misc/r8168/files/r8168-8.050.03-5.19-fix.patch b/net-misc/r8168/files/r8168-8.050.03-5.19-fix.patch deleted file mode 100644 index d0f5d30ada06..000000000000 --- a/net-misc/r8168/files/r8168-8.050.03-5.19-fix.patch +++ /dev/null @@ -1,23 +0,0 @@ -From: Andrea Righi <andrea.righi@canonical.com> -Subject: support linux 5.19 - -Index: r8168-8.050.03/src/r8168_n.c -=================================================================== ---- r8168-8.050.03.orig/src/r8168_n.c -+++ r8168-8.050.03/src/r8168_n.c -@@ -116,6 +116,15 @@ - #define FIRMWARE_8168FP_3 "rtl_nic/rtl8168fp-3.fw" - #define FIRMWARE_8168FP_4 "rtl_nic/rtl8168fp-4.fw" - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0) -+static inline void netif_set_gso_max_size(struct net_device *dev, -+ unsigned int size) -+{ -+ /* dev->gso_max_size is read locklessly from sk_setup_caps() */ -+ WRITE_ONCE(dev->gso_max_size, size); -+} -+#endif -+ - /* Maximum number of multicast addresses to filter (vs. Rx-all-multicast). - The RTL chips use a 64 element hash table based on the Ethernet CRC. */ - static const int multicast_filter_limit = 32; diff --git a/net-misc/r8168/r8168-8.050.03.ebuild b/net-misc/r8168/r8168-8.050.03.ebuild deleted file mode 100644 index 6c2652606478..000000000000 --- a/net-misc/r8168/r8168-8.050.03.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit linux-info linux-mod - -DESCRIPTION="r8168 driver for Realtek 8111/8168 PCI-E NICs" -HOMEPAGE="https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software" - -# "GBE Ethernet LINUX driver r8168 for kernel up to 5.17" from above link, -# we need to mirror it to avoid users from needing to fill a captcha to -# download -SRC_URI="https://dev.gentoo.org/~pacho/${PN}/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" - -MODULE_NAMES="r8168(net:${S}/src)" -BUILD_TARGETS="modules" -IUSE="use-firmware" - -CONFIG_CHECK="~!R8169" -WARNING_R8169="CONFIG_R8169 is enabled. ${P} will not be loaded unless kernel driver Realtek 8169 PCI Gigabit Ethernet (CONFIG_R8169) is DISABLED." - -PATCHES=( - "${FILESDIR}/r8168-8.050.02-5.18-fix.patch" - "${FILESDIR}/r8168-8.050.03-5.19-fix.patch" -) - -pkg_setup() { - linux-mod_pkg_setup - BUILD_PARAMS="KERNELDIR=${KV_DIR}" - BUILD_PARAMS+=" ENABLE_USE_FIRMWARE_FILE=$(usex use-firmware y n)" -} - -src_install() { - linux-mod_src_install - einstalldocs -} diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest index 75d59923e9ee..ee087c31e9b8 100644 --- a/net-misc/stunnel/Manifest +++ b/net-misc/stunnel/Manifest @@ -5,6 +5,6 @@ DIST stunnel-5.64.tar.gz 869088 BLAKE2B c6be054b825e57c1ac44adf28d4546ab78250cf9 DIST stunnel-5.65.tar.gz 872293 BLAKE2B 45cc4dd0ec91cb9a99c10d26910b05325af29ec2609c0b86d5aceb07fbd495ff6fe39b0fe2c5895358596ee34ed822870c6eb1a538e30557f4485d042f5ae781 SHA512 96ca0535a07d5ea050a5d985c0ab6299bb92e551715120f536869a7b408b795fdc251782aaa7a4a282749d3146726d71c8b3c25430969aa55745a863abe5728a DIST stunnel-5.68.tar.gz 884989 BLAKE2B e2551b2052db0719203b24dcf16a2ef74c078dccd1200d25502defcef1301456e755a71a1a2b6ab7b43fc9ddc04cd031fca83ffb760528133a0e22ae22e64d40 SHA512 cdc3b8ab4cd35ba722b5248c005ae58a39d79a80600447417b1d0d01fd3aa9e8b22f8568c3177423be99d7395bb15a8754e975fb953556cd80a9cc11e185e9fb EBUILD stunnel-5.64-r2.ebuild 2914 BLAKE2B 3983e2163da5f52ac0515eaf28ebe7d993a8c665ffbdd20f9823b57427a1409d5f1065903d503ee13f17b54cf3a12600f8bbe5b1a6e9d34e873dcf090da41ceb SHA512 6a3a22bbd63ee234a280df39dd97245b40dd8a4420e3956d32f8f1a2617fb6edcc2cbc7149734a515c750b98b747960212acd5ace9fd4a6c6e6ed02a836bdc12 -EBUILD stunnel-5.65-r2.ebuild 2889 BLAKE2B 073d38f258486bd5308a8c2bc3b80f681404e5932df1afb69cd44743307cf3e80baef7c6ec9dabefae4be8a5288f77afc3fbdd032afb6f69b8b2370eff99ddf7 SHA512 f380445ac7be5cf46bb1e231b1825f2c3296af4aa23bccc6a9f42844db58d68e826bd73b56384e83aee8b2402968d57a0118ebe74d0805e21b51ff9acd33b2a3 +EBUILD stunnel-5.65-r2.ebuild 2888 BLAKE2B ef210090dce4fae228bdb4400155e384c4b9a5e6dc7ff2fe7f3a805880b33593071438367ea943557acc3c3604457c1fdb1951273a6e0f656fe28f473f74e8b2 SHA512 48d7263cb1c6e68f8a56736c39f01e62a1f7b93ae8827b1e17da8a7f78d6bef6b71cac5d60783cf691fc862715d6f142cbb34359da7192957c857de0c65d8d58 EBUILD stunnel-5.68.ebuild 2894 BLAKE2B 855818cda850df7cc5718a60a41115e010fd63b8636469abaf974a0cc1430364001b79383b0b82eb3f0f8ec171f4e2965d0e0f5e8503ef7bed88f7c84e0e2890 SHA512 4955a57b15754be383ac22ac7461c5f28b33685d50baf0f42b6346f9eeaa2e7eeff7a8db8e07b3a5c0b07bd654164c0dd65a71188f6b811384053414fd446922 MISC metadata.xml 712 BLAKE2B abb0d57cf71591afbd71b86118435b149bb2a12ade506bac04e93fc0a334c7c458e58be0d428343582aa5738f2062307206bbfe4b79a809ab09e0e69e673459c SHA512 c6538a699b0135a536a8df4ab8355d7a8ca0ed25ff32e822a2e27dfdd896a2ba4b2a5398b75f692bcf5e77a88f9c64af358c14fdbaab213cafad882cb3f0deb3 diff --git a/net-misc/stunnel/stunnel-5.65-r2.ebuild b/net-misc/stunnel/stunnel-5.65-r2.ebuild index 94960aaac192..70102e5fd41d 100644 --- a/net-misc/stunnel/stunnel-5.65-r2.ebuild +++ b/net-misc/stunnel/stunnel-5.65-r2.ebuild @@ -20,7 +20,7 @@ SRC_URI=" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="selinux stunnel3 tcpd" DEPEND=" |