Merge pull request #812 from flatcar/krnowak/sys-packages-net-glob

Automate updates of system packages: net-*
This commit is contained in:
Krzesimir Nowak 2023-05-17 15:53:07 +02:00 committed by GitHub
commit 50f6d87579
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 169 additions and 169 deletions

View File

@ -314,9 +314,12 @@ net-dns/bind-tools
net-dns/c-ares
net-dns/dnsmasq
net-firewall/ipset
net-fs/cifs-utils
net-libs/gnutls
net-libs/libnftnl
net-libs/libnsl
net-libs/libpcap
net-libs/libslirp
@ -332,6 +335,8 @@ net-misc/socat
net-misc/wget
net-misc/whois
net-nds/rpcbind
net-vpn/wireguard-tools
perl-core/File-Temp

View File

@ -0,0 +1,2 @@
- ipset ([7.17](https://git.netfilter.org/ipset/tree/ChangeLog?id=186f9b57c60bb53aae5f6633eff1e9d5e9095c3e)
- libnftnl ([1.2.5](https://git.netfilter.org/libnftnl/log/?h=libnftnl-1.2.5))

View File

@ -1,2 +1 @@
DIST ipset-7.11.tar.bz2 674100 BLAKE2B 97f2e3372e963654ece511960e8c22d0dd9e29376d087a3767d89544dfbd85f9f9e75e0cc6c4eb9e1d813d1a472a410033a76feef3319b1d87fd51b0c3fd97cd SHA512 20890de32c17c04d9d3ae42fff64acfe21a252974bee5843ae39bdda707fcef55fde11cffccab9f987bf7e18f5445443c46c50eb854fb6f93f172f7bad07f922
DIST ipset-7.15.tar.bz2 680383 BLAKE2B 10acff9741370ad80a2845605be1be4f691e987b271f4dcf1fab3abfe158c63c7d39e6b3453ba7cd361dee3df92f85419cfb70806a71b6806555f6571c70b1ed SHA512 0fc936d971c30a0925c585d506c8840e782fdaeec09bc8fd249e874fe838fa55a4dbb697f6e1423a6769abf07a1ce2195abc37cb641e8e4ad70f1b4c7130916a
DIST ipset-7.17.tar.bz2 684983 BLAKE2B 43b74ab7caf5a963787184aa75b6c071388c8d28997681444b72118aba68b843e961b50418c3fa70b451b4cb090ec62940b770abac2156910442115edbf90d41 SHA512 e308a0d7707ccf7d0cb06a32cf9a822f97862e007abdbab8a91a5a0d5bfbd9f2fb9a3f5e8f36b250ec0d565438c8648a31e8e5b45d8205a76558e90f46e6e597

View File

@ -0,0 +1,46 @@
From 6004475ff78ddb3afd8beadcb5330664d50081f5 Mon Sep 17 00:00:00 2001
From: Sam James <sam@gentoo.org>
Date: Thu, 24 Nov 2022 04:38:28 +0000
Subject: [PATCH] configure.ac: fix bashisms
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
configure scripts need to be runnable with a POSIX-compliant /bin/sh.
On many (but not all!) systems, /bin/sh is provided by Bash, so errors
like this aren't spotted. Notably Debian defaults to /bin/sh provided
by dash which doesn't tolerate such bashisms as '=='.
This retains compatibility with bash.
Signed-off-by: Sam James <sam@gentoo.org>
--- a/configure.ac
+++ b/configure.ac
@@ -27,7 +27,7 @@ AC_ARG_WITH([kmod],
[Build the kernel module (default: yes)]),
[BUILDKMOD="$withval";],
[BUILDKMOD="yes";])
-AM_CONDITIONAL(WITH_KMOD, test "$BUILDKMOD" == "yes")
+AM_CONDITIONAL(WITH_KMOD, test "$BUILDKMOD" = "yes")
dnl Additional arguments
dnl Kernel build directory or source tree
@@ -76,7 +76,7 @@ if test "x$enable_bashcompl" = "xyes"; then
AC_SUBST(bashcompdir)
fi
-if test "$BUILDKMOD" == "yes"
+if test "$BUILDKMOD" = "yes"
then
dnl Sigh: check kernel version dependencies
if test "$KBUILDDIR" != ""
@@ -204,7 +204,7 @@ AC_CHECK_TYPES([union nf_inet_addr],,,[#include <linux/types.h>
dnl Checks for functions
AC_CHECK_FUNCS(gethostbyname2)
-if test "$BUILDKMOD" == "yes"
+if test "$BUILDKMOD" = "yes"
then
dnl Check kernel incompatibilities... Ugly like hell

View File

@ -1,11 +0,0 @@
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -46,7 +46,7 @@ EXTRA_libipset_la_SOURCES = \
EXTRA_DIST = $(IPSET_SETTYPE_LIST) libipset.map
-pkgconfigdir = $(libdir)/pkgconfig
+pkgconfigdir = $(prefix)/$(libdir)/pkgconfig
pkgconfig_DATA = libipset.pc
dist_man_MANS = libipset.3

View File

@ -0,0 +1,15 @@
[Unit]
Description=ipset service
Before=network-pre.target iptables-restore.service ip6tables-restore.service firewalld.service
Wants=network-pre.target
ConditionFileNotEmpty=/var/lib/ipset/rules-save
[Service]
Type=oneshot
RemainAfterExit=yes
ExecStart=/usr/sbin/ipset -exist -file /var/lib/ipset/rules-save restore
ExecReload=/usr/sbin/ipset -exist -file /var/lib/ipset/rules-save restore
ExecStop=/usr/sbin/ipset -file /var/lib/ipset/rules-save save
[Install]
WantedBy=multi-user.target

View File

@ -1,114 +0,0 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
MODULES_OPTIONAL_USE=modules
inherit autotools linux-info linux-mod systemd
DESCRIPTION="IPset tool for iptables, successor to ippool"
HOMEPAGE="https://ipset.netfilter.org/"
SRC_URI="https://ipset.netfilter.org/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
BDEPEND="virtual/pkgconfig"
RDEPEND=">=net-firewall/iptables-1.4.7
net-libs/libmnl:="
DEPEND="${RDEPEND}"
DOCS=( ChangeLog INSTALL README UPGRADE )
PATCHES=( "${FILESDIR}"/${PN}-7.4-fix-pkgconfig-dir.patch )
# configurable from outside, e.g. /etc/portage/make.conf
IP_NF_SET_MAX=${IP_NF_SET_MAX:-256}
BUILD_TARGETS="modules"
MODULE_NAMES_ARG="kernel/net/netfilter/ipset/:${S}/kernel/net/netfilter/ipset"
MODULE_NAMES="xt_set(kernel/net/netfilter/ipset/:${S}/kernel/net/netfilter/)"
MODULE_NAMES+=" em_ipset(kernel/net/sched/:${S}/kernel/net/sched/)"
for i in ip_set{,_bitmap_{ip{,mac},port},_hash_{ip{,mac,mark,port{,ip,net}},mac,net{,port{,net},iface,net}},_list_set}; do
MODULE_NAMES+=" ${i}(${MODULE_NAMES_ARG})"
done
pkg_setup() {
get_version
CONFIG_CHECK="NETFILTER"
ERROR_NETFILTER="ipset requires NETFILTER support in your kernel."
CONFIG_CHECK+=" NETFILTER_NETLINK"
ERROR_NETFILTER_NETLINK="ipset requires NETFILTER_NETLINK support in your kernel."
# It does still build without NET_NS, but it may be needed in future.
#CONFIG_CHECK="${CONFIG_CHECK} NET_NS"
#ERROR_NET_NS="ipset requires NET_NS (network namespace) support in your kernel."
CONFIG_CHECK+=" !PAX_CONSTIFY_PLUGIN"
ERROR_PAX_CONSTIFY_PLUGIN="ipset contains constified variables (#614896)"
build_modules=0
if use modules; then
if linux_config_src_exists && linux_chkconfig_builtin "MODULES" ; then
if linux_chkconfig_present "IP_NF_SET" || \
linux_chkconfig_present "IP_SET"; then #274577
eerror "There is IP{,_NF}_SET or NETFILTER_XT_SET support in your kernel."
eerror "Please either build ipset with modules USE flag disabled"
eerror "or rebuild kernel without IP_SET support and make sure"
eerror "there is NO kernel ip_set* modules in /lib/modules/<your_kernel>/... ."
die "USE=modules and in-kernel ipset support detected."
else
einfo "Modular kernel detected. Gonna build kernel modules..."
build_modules=1
fi
else
eerror "Nonmodular kernel detected, but USE=modules. Either build"
eerror "modular kernel (without IP_SET) or disable USE=modules"
die "Nonmodular kernel detected, will not build kernel modules"
fi
fi
[[ ${build_modules} -eq 1 ]] && linux-mod_pkg_setup
}
src_prepare() {
default
eautoreconf
}
src_configure() {
econf \
$(use_with modules kmod) \
--disable-static \
--with-maxsets=${IP_NF_SET_MAX} \
--libdir="${EPREFIX}/$(get_libdir)" \
--with-ksource="${KV_DIR}" \
--with-kbuild="${KV_OUT_DIR}"
}
src_compile() {
einfo "Building userspace"
emake
if [[ ${build_modules} -eq 1 ]]; then
einfo "Building kernel modules"
set_arch_to_kernel
emake modules
fi
}
src_install() {
einfo "Installing userspace"
default
find "${ED}" -name '*.la' -delete || die
newinitd "${FILESDIR}"/ipset.initd-r4 ${PN}
newconfd "${FILESDIR}"/ipset.confd ${PN}
systemd_newunit "${FILESDIR}"/ipset.systemd ${PN}.service
keepdir /var/lib/ipset
if [[ ${build_modules} -eq 1 ]]; then
einfo "Installing kernel modules"
linux-mod_src_install
fi
}

View File

@ -1,27 +1,31 @@
# Copyright 1999-2021 Gentoo Authors
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
EAPI=8
MODULES_OPTIONAL_USE=modules
inherit autotools linux-info linux-mod systemd
inherit autotools bash-completion-r1 linux-info linux-mod systemd
DESCRIPTION="IPset tool for iptables, successor to ippool"
HOMEPAGE="https://ipset.netfilter.org/"
HOMEPAGE="https://ipset.netfilter.org/ https://git.netfilter.org/ipset/"
SRC_URI="https://ipset.netfilter.org/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ~arm arm64 ppc ~ppc64 ~riscv x86"
KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
BDEPEND="virtual/pkgconfig"
RDEPEND=">=net-firewall/iptables-1.4.7
net-libs/libmnl:="
RDEPEND="
>=net-firewall/iptables-1.4.7
net-libs/libmnl:=
"
DEPEND="${RDEPEND}"
BDEPEND="virtual/pkgconfig"
DOCS=( ChangeLog INSTALL README UPGRADE )
PATCHES=( "${FILESDIR}"/${PN}-7.4-fix-pkgconfig-dir.patch )
PATCHES=(
"${FILESDIR}"/${PN}-7.16-bashism.patch
)
# configurable from outside, e.g. /etc/portage/make.conf
IP_NF_SET_MAX=${IP_NF_SET_MAX:-256}
@ -76,11 +80,12 @@ src_prepare() {
}
src_configure() {
export bashcompdir="$(get_bashcompdir)"
econf \
--enable-bashcompl \
$(use_with modules kmod) \
--disable-static \
--with-maxsets=${IP_NF_SET_MAX} \
--libdir="${EPREFIX}/$(get_libdir)" \
--with-ksource="${KV_DIR}" \
--with-kbuild="${KV_OUT_DIR}"
}
@ -104,7 +109,7 @@ src_install() {
newinitd "${FILESDIR}"/ipset.initd-r4 ${PN}
newconfd "${FILESDIR}"/ipset.confd ${PN}
systemd_newunit "${FILESDIR}"/ipset.systemd ${PN}.service
systemd_newunit "${FILESDIR}"/ipset.systemd-r1 ${PN}.service
keepdir /var/lib/ipset
if [[ ${build_modules} -eq 1 ]]; then

View File

@ -1,2 +1,4 @@
DIST libnftnl-1.1.9.tar.bz2 389639 BLAKE2B 230a78cc350910735c622f4996a217490ee2384a0f6809784aa3ba0de484f540ea83d8cb72933c05961103ba20339b3eae3e866135a222b6f96df0ef01ac8066 SHA512 8e2551a902a320769198e0ebce52596501c548e230c3172ba4989e25dcb3dd6c9b97a104af69b93ede4ef298811cff10608758e6f1d274e758d87306c4b50f25
DIST libnftnl-1.2.0.tar.bz2 388751 BLAKE2B 6f61e7af8e50577029b1cf5ba7260f3803a64c410c7d35be8bbf3b6f9445d9db3be367442f56fb81f3ed49bc3efeab8dd2ed51bab4a1e4427f552d48e4bb559a SHA512 2a068e7eab308442bbfba5325f3aebeb874c142b029ff5906cadf63a1f879b20930bc55cd9554c5d256a0642f0f5a6d36177d9ae88cf507ab5dfc7fabffbb380
DIST libnftnl-1.2.4.tar.bz2 395444 BLAKE2B 43a89fd2f7d9fd77e59423b599fe209c821da660669c7fe3c569ac262b78cfe1942ab9fd597bf09a0c93b7d1ff465ca79bd925967be93333a11468845ef785fd SHA512 5375d1d15627aabf25129433630395f53009b22a255fcd113b302af7f2f0a234fd54c827b0ef1c8fd3a13e272a1696f780560672d4af6abad0e19805f9d56326
DIST libnftnl-1.2.4.tar.bz2.sig 566 BLAKE2B f7598f5ed56cf101a61358206d1e4e3fe3fa12514d6d6a89a00f4ec853d4473aefbfbedf7ce062160bd6c7578e5a09bfb6a5bf1c2b98f5858a8d9f4f9ce5be38 SHA512 89bb5ea536632518aad62e798868284fe82ba75d2af09b6505d506910aafdbaaed48b84b82fcf4ffb241672e51b696f8e24983636184b9713795c90f281f8683
DIST libnftnl-1.2.5.tar.xz 335744 BLAKE2B 8ad2b264cce6458dd992dd14197abe224fb5afc14e8d06296dbc917d83724dacaee876191165fe83831e842e45995f9ea874957b02ee19580783a576c2d56ccd SHA512 576ccd0815063a6ef3095b5514c3d286b4450fad98fbf7a85cd537f66adf043e7e6295d4c84cc3cbfd18cf9a29576d15a88cc439a61a3e654841a27c71babea1
DIST libnftnl-1.2.5.tar.xz.sig 566 BLAKE2B 1e47872354b714781b2ee3d9b375a9fe97a2e97a283d8b88bb7c0ec12cf779cfdfc668dbe64eb4d3bb3afff37bef2e5bc49fed6e3522c869c96c6f344ca18c25 SHA512 ca10b3856d8e690cd5ae763661972c5e4f4be2cca63f8120ad6550ece286078938efabba927070f830fc703cc17d16e8cbc1b4c8564bf888c199ea53c0b6a500

View File

@ -1,29 +1,38 @@
# Copyright 1999-2021 Gentoo Authors
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit autotools linux-info usr-ldscript
VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/netfilter.org.asc
inherit linux-info usr-ldscript verify-sig
DESCRIPTION="Netlink API to the in-kernel nf_tables subsystem"
HOMEPAGE="https://netfilter.org/projects/nftables/"
if [[ ${PV} =~ ^[9]{4,}$ ]]; then
inherit git-r3
inherit autotools git-r3
EGIT_REPO_URI="https://git.netfilter.org/${PN}"
else
SRC_URI="https://netfilter.org/projects/${PN}/files/${P}.tar.bz2"
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
SRC_URI="
https://netfilter.org/projects/${PN}/files/${P}.tar.bz2
verify-sig? ( https://netfilter.org/projects/${PN}/files/${P}.tar.bz2.sig )
"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
fi
LICENSE="GPL-2"
SLOT="0/11" # libnftnl.so version
IUSE="examples static-libs test"
RESTRICT="!test? ( test )"
RDEPEND=">=net-libs/libmnl-1.0.4:="
BDEPEND="virtual/pkgconfig"
RDEPEND="
>=net-libs/libmnl-1.0.4:=
"
BDEPEND+="
virtual/pkgconfig
"
DEPEND="${RDEPEND}"
pkg_setup() {
@ -37,6 +46,7 @@ pkg_setup() {
src_prepare() {
default
[[ ${PV} =~ ^[9]{4,}$ ]] && eautoreconf
}
@ -44,12 +54,15 @@ src_configure() {
local myeconfargs=(
$(use_enable static-libs static)
)
econf "${myeconfargs[@]}"
}
src_install() {
default
gen_usr_ldscript -a nftnl
find "${ED}" -type f -name '*.la' -delete || die
if use examples; then

View File

@ -1,23 +1,38 @@
# Copyright 1999-2021 Gentoo Authors
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
EAPI=8
inherit linux-info usr-ldscript
VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/netfilter.org.asc
inherit linux-info usr-ldscript verify-sig
DESCRIPTION="Netlink API to the in-kernel nf_tables subsystem"
HOMEPAGE="https://netfilter.org/projects/nftables/"
SRC_URI="https://netfilter.org/projects/${PN}/files/${P}.tar.bz2"
if [[ ${PV} =~ ^[9]{4,}$ ]]; then
inherit autotools git-r3
EGIT_REPO_URI="https://git.netfilter.org/${PN}"
else
SRC_URI="
https://netfilter.org/projects/${PN}/files/${P}.tar.xz
verify-sig? ( https://netfilter.org/projects/${PN}/files/${P}.tar.xz.sig )
"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
fi
LICENSE="GPL-2"
SLOT="0/11" # libnftnl.so version
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
IUSE="examples static-libs test"
RESTRICT="!test? ( test )"
RDEPEND=">=net-libs/libmnl-1.0.4:="
BDEPEND="virtual/pkgconfig"
RDEPEND="
>=net-libs/libmnl-1.0.4:=
"
BDEPEND+="
virtual/pkgconfig
"
DEPEND="${RDEPEND}"
pkg_setup() {
@ -29,16 +44,25 @@ pkg_setup() {
fi
}
src_prepare() {
default
[[ ${PV} =~ ^[9]{4,}$ ]] && eautoreconf
}
src_configure() {
local myeconfargs=(
$(use_enable static-libs static)
)
econf "${myeconfargs[@]}"
}
src_install() {
default
gen_usr_ldscript -a nftnl
find "${ED}" -type f -name '*.la' -delete || die
if use examples; then

View File

@ -1,29 +1,38 @@
# Copyright 1999-2021 Gentoo Authors
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
EAPI=8
inherit autotools linux-info usr-ldscript
VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/netfilter.org.asc
inherit linux-info usr-ldscript verify-sig
DESCRIPTION="Netlink API to the in-kernel nf_tables subsystem"
HOMEPAGE="https://netfilter.org/projects/nftables/"
if [[ ${PV} =~ ^[9]{4,}$ ]]; then
inherit git-r3
inherit autotools git-r3
EGIT_REPO_URI="https://git.netfilter.org/${PN}"
else
SRC_URI="https://netfilter.org/projects/${PN}/files/${P}.tar.bz2"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
SRC_URI="
https://netfilter.org/projects/${PN}/files/${P}.tar.xz
verify-sig? ( https://netfilter.org/projects/${PN}/files/${P}.tar.xz.sig )
"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
fi
LICENSE="GPL-2"
SLOT="0/11" # libnftnl.so version
IUSE="examples static-libs test"
RESTRICT="!test? ( test )"
RDEPEND=">=net-libs/libmnl-1.0.4:="
BDEPEND="virtual/pkgconfig"
RDEPEND="
>=net-libs/libmnl-1.0.4:=
"
BDEPEND+="
virtual/pkgconfig
"
DEPEND="${RDEPEND}"
pkg_setup() {
@ -37,6 +46,7 @@ pkg_setup() {
src_prepare() {
default
[[ ${PV} =~ ^[9]{4,}$ ]] && eautoreconf
}
@ -44,12 +54,15 @@ src_configure() {
local myeconfargs=(
$(use_enable static-libs static)
)
econf "${myeconfargs[@]}"
}
src_install() {
default
gen_usr_ldscript -a nftnl
find "${ED}" -type f -name '*.la' -delete || die
if use examples; then

View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>base-system@gentoo.org</email>

View File

@ -9,6 +9,7 @@
<flag name="warmstarts">Enables rpcbind to cache configuration for warm restarts</flag>
</use>
<upstream>
<remote-id type="cpe">cpe:/a:rpcbind_project:rpcbind</remote-id>
<remote-id type="sourceforge">rpcbind</remote-id>
</upstream>
</pkgmetadata>

View File

@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
inherit autotools git-r3
else
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
fi
DESCRIPTION="portmap replacement which supports RPC over various protocols"