commit: efccc84553d9fe442448fda4d57fda7a0150a5e2 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Tue Jun 6 00:25:25 2023 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Tue Jun 6 00:25:25 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efccc845
net-vpn/openconnect: drop 9.01-r2, 9.01-r3 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> net-vpn/openconnect/Manifest | 1 - .../files/openconnect-9.01-inttypes.patch | 32 ----- net-vpn/openconnect/openconnect-9.01-r2.ebuild | 153 -------------------- net-vpn/openconnect/openconnect-9.01-r3.ebuild | 154 --------------------- 4 files changed, 340 deletions(-) diff --git a/net-vpn/openconnect/Manifest b/net-vpn/openconnect/Manifest index ca17f671e069..24ba24e5dd3f 100644 --- a/net-vpn/openconnect/Manifest +++ b/net-vpn/openconnect/Manifest @@ -1,3 +1,2 @@ -DIST openconnect-9.01.tar.gz 2718526 BLAKE2B e346b30ed8a299bcdd1fc88868d59b4d501c48bc5c02092e92e7ded0cd36e4de6a5b65aae4f6bf8c9aa60cf70f5466b110b64889df8d286016c9a1b4d9f46ff7 SHA512 b7428847a90f8ca9d1f1f61653c1f2486f0a07989f3b7435b746c5e901998194f4ee2b4f9569a548a23bba368bb1e9f273674c0759aac9df30208d2a6a303c34 DIST openconnect-9.12.tar.gz 2843115 BLAKE2B cd5f65ae0d67bece3e5aacdfb4c5c73c893d45d756554a1b6e39e66af5c6a171735d535ca7b16ed94244d02798d3c43a45b252ba05ddb0f3505f1fafc2ec0de9 SHA512 5c622e8bdfac3d21b5881660444e5d2b84e9463a99493d42cbfb480c3aa3972076bdeeb618aca02abed68e31dbeadcb66fb1c370e62a20f20cd544753c7ac48e DIST openconnect-9.12.tar.gz.asc 833 BLAKE2B c974439cef74eea9698a0b565c0d49c6026a0afe322739d5adfee2d484279d7366c6c3c703019ff2492eb3d5725de8e0fe4505d9e3a0e5b6d36201974d20a223 SHA512 ade33209a4c17bbdfd0bea7490588b248c36c4da56a9aec60818ed6c96bc8c3570b1f2ac2685003122a1e52dd9d24e4b678d77e001c752461649114167a7304c diff --git a/net-vpn/openconnect/files/openconnect-9.01-inttypes.patch b/net-vpn/openconnect/files/openconnect-9.01-inttypes.patch deleted file mode 100644 index c9b28913ce9f..000000000000 --- a/net-vpn/openconnect/files/openconnect-9.01-inttypes.patch +++ /dev/null @@ -1,32 +0,0 @@ -From c0775e6cd46fb5df6c6aab52314e3038c44d2152 Mon Sep 17 00:00:00 2001 -From: Mike Gilbert <flop...@gentoo.org> -Date: Fri, 19 Aug 2022 11:55:42 -0400 -Subject: [PATCH] jsondump.c: include <inttypes.h> for PRId64 - -Fixes a build failure with gnutls and a json-parser snapshot taken on -2021-12-08. - -Building with openssl or with the bundled copy of json-parser causes -inttypes.h to be included indirectly. - -Bug: https://bugs.gentoo.org/865797 -Signed-off-by: Mike Gilbert <flop...@gentoo.org> ---- - jsondump.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/jsondump.c b/jsondump.c -index a18780b5..2b097e8a 100644 ---- a/jsondump.c -+++ b/jsondump.c -@@ -24,6 +24,7 @@ - #include <string.h> - #include <ctype.h> - #include <errno.h> -+#include <inttypes.h> - - /* - * Copyright (C) 2015 Mirko Pasqualetti All rights reserved. --- -GitLab - diff --git a/net-vpn/openconnect/openconnect-9.01-r2.ebuild b/net-vpn/openconnect/openconnect-9.01-r2.ebuild deleted file mode 100644 index 1d3056470a80..000000000000 --- a/net-vpn/openconnect/openconnect-9.01-r2.ebuild +++ /dev/null @@ -1,153 +0,0 @@ -# Copyright 2011-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) -PYTHON_REQ_USE="xml(+)" - -inherit linux-info python-any-r1 - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://gitlab.com/openconnect/openconnect.git"; - inherit git-r3 autotools -else - SRC_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz"; - KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86" -fi - -DESCRIPTION="Free client for Cisco AnyConnect SSL VPN software" -HOMEPAGE="https://www.infradead.org/openconnect/"; - -LICENSE="LGPL-2.1 GPL-2" -SLOT="0/5" -IUSE="doc +gnutls gssapi libproxy lz4 nls pskc selinux smartcard stoken test" -RESTRICT="!test? ( test )" - -COMMON_DEPEND=" - dev-libs/libxml2 - sys-libs/zlib - app-crypt/p11-kit - !gnutls? ( - >=dev-libs/openssl-1.0.1h:0= - dev-libs/libp11 - ) - gnutls? ( - app-crypt/trousers - app-misc/ca-certificates - dev-libs/nettle - >=net-libs/gnutls-3.6.13:0= - dev-libs/libtasn1:0= - app-crypt/tpm2-tss:= - ) - gssapi? ( virtual/krb5 ) - libproxy? ( net-libs/libproxy ) - lz4? ( app-arch/lz4:= ) - nls? ( virtual/libintl ) - pskc? ( sys-auth/oath-toolkit[pskc(+)] ) - smartcard? ( sys-apps/pcsc-lite:0= ) - stoken? ( app-crypt/stoken ) -" -DEPEND="${COMMON_DEPEND} - test? ( - net-libs/socket_wrapper - sys-libs/uid_wrapper - !gnutls? ( dev-libs/openssl:0[weak-ssl-ciphers(-)] ) - ) -" -RDEPEND="${COMMON_DEPEND} - sys-apps/iproute2 - >=net-vpn/vpnc-scripts-20210402-r1 - selinux? ( sec-policy/selinux-vpn ) -" -BDEPEND=" - virtual/pkgconfig - doc? ( ${PYTHON_DEPS} sys-apps/groff ) - nls? ( sys-devel/gettext ) - test? ( net-vpn/ocserv ) -" - -CONFIG_CHECK="~TUN" - -pkg_pretend() { - check_extra_config -} - -pkg_setup() { - : -} - -src_unpack() { - if [[ ${PV} == 9999 ]]; then - git-r3_src_unpack - fi - default -} - -src_prepare() { - local PATCHES=( - "${FILESDIR}/openconnect-9.01-inttypes.patch" - ) - default - if [[ ${PV} == 9999 ]]; then - eautoreconf - fi -} - -src_configure() { - if use doc; then - python_setup - else - export ac_cv_path_PYTHON= - fi - - # Used by tests if userpriv is disabled - addwrite /run/netns - - local myconf=( - --disable-dsa-tests - $(use_enable nls) - --disable-static - $(use_with !gnutls openssl) - $(use_with gnutls) - $(use_with libproxy) - $(use_with lz4) - $(use_with gssapi) - $(use_with pskc libpskc) - $(use_with smartcard libpcsclite) - $(use_with stoken) - --with-vpnc-script="${EPREFIX}/etc/vpnc/vpnc-script" - --with-builtin-json - --without-java - ) - - econf "${myconf[@]}" -} - -src_test() { - local charset - for charset in UTF-8 ISO-8859-2; do - if [[ $(LC_ALL=cs_CZ.${charset} locale charmap 2>/dev/null) != ${charset} ]]; then - # If we don't have valid cs_CZ locale data, auth-nonascii will fail. - # Force a test skip by exiting with status 77. - sed -i -e '2i exit 77' tests/auth-nonascii || die - break - fi - done - default -} - -src_install() { - default - find "${ED}" -name '*.la' -delete || die - - dodoc "${FILESDIR}"/README.OpenRC - - newconfd "${FILESDIR}"/openconnect.confd openconnect - newinitd "${FILESDIR}"/openconnect.initd openconnect - - insinto /etc/logrotate.d - newins "${FILESDIR}"/openconnect.logrotate openconnect - - keepdir /var/log/openconnect -} diff --git a/net-vpn/openconnect/openconnect-9.01-r3.ebuild b/net-vpn/openconnect/openconnect-9.01-r3.ebuild deleted file mode 100644 index 397203414c25..000000000000 --- a/net-vpn/openconnect/openconnect-9.01-r3.ebuild +++ /dev/null @@ -1,154 +0,0 @@ -# Copyright 2011-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) -PYTHON_REQ_USE="xml(+)" - -inherit linux-info python-any-r1 - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://gitlab.com/openconnect/openconnect.git"; - inherit git-r3 autotools -else - SRC_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz"; - KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -fi - -DESCRIPTION="Free client for Cisco AnyConnect SSL VPN software" -HOMEPAGE="https://www.infradead.org/openconnect/"; - -LICENSE="LGPL-2.1 GPL-2" -SLOT="0/5" -IUSE="doc +gnutls gssapi libproxy lz4 nls pskc selinux smartcard stoken test" -RESTRICT="!test? ( test )" - -COMMON_DEPEND=" - dev-libs/json-parser:0= - dev-libs/libxml2 - sys-libs/zlib - app-crypt/p11-kit - !gnutls? ( - >=dev-libs/openssl-1.0.1h:0= - dev-libs/libp11 - ) - gnutls? ( - app-crypt/trousers - app-misc/ca-certificates - dev-libs/nettle - >=net-libs/gnutls-3.6.13:0= - dev-libs/libtasn1:0= - app-crypt/tpm2-tss:= - ) - gssapi? ( virtual/krb5 ) - libproxy? ( net-libs/libproxy ) - lz4? ( app-arch/lz4:= ) - nls? ( virtual/libintl ) - pskc? ( sys-auth/oath-toolkit[pskc(+)] ) - smartcard? ( sys-apps/pcsc-lite:0= ) - stoken? ( app-crypt/stoken ) -" -DEPEND="${COMMON_DEPEND} - test? ( - net-libs/socket_wrapper - sys-libs/uid_wrapper - !gnutls? ( dev-libs/openssl:0[weak-ssl-ciphers(-)] ) - ) -" -RDEPEND="${COMMON_DEPEND} - sys-apps/iproute2 - >=net-vpn/vpnc-scripts-20210402-r1 - selinux? ( sec-policy/selinux-vpn ) -" -BDEPEND=" - virtual/pkgconfig - doc? ( ${PYTHON_DEPS} sys-apps/groff ) - nls? ( sys-devel/gettext ) - test? ( net-vpn/ocserv ) -" - -CONFIG_CHECK="~TUN" - -pkg_pretend() { - check_extra_config -} - -pkg_setup() { - : -} - -src_unpack() { - if [[ ${PV} == 9999 ]]; then - git-r3_src_unpack - fi - default -} - -src_prepare() { - local PATCHES=( - "${FILESDIR}/openconnect-9.01-inttypes.patch" - ) - default - if [[ ${PV} == 9999 ]]; then - eautoreconf - fi -} - -src_configure() { - if use doc; then - python_setup - else - export ac_cv_path_PYTHON= - fi - - # Used by tests if userpriv is disabled - addwrite /run/netns - - local myconf=( - --disable-dsa-tests - $(use_enable nls) - --disable-static - $(use_with !gnutls openssl) - $(use_with gnutls) - $(use_with libproxy) - $(use_with lz4) - $(use_with gssapi) - $(use_with pskc libpskc) - $(use_with smartcard libpcsclite) - $(use_with stoken) - --with-vpnc-script="${EPREFIX}/etc/vpnc/vpnc-script" - --without-builtin-json - --without-java - ) - - econf "${myconf[@]}" -} - -src_test() { - local charset - for charset in UTF-8 ISO-8859-2; do - if [[ $(LC_ALL=cs_CZ.${charset} locale charmap 2>/dev/null) != ${charset} ]]; then - # If we don't have valid cs_CZ locale data, auth-nonascii will fail. - # Force a test skip by exiting with status 77. - sed -i -e '2i exit 77' tests/auth-nonascii || die - break - fi - done - default -} - -src_install() { - default - find "${ED}" -name '*.la' -delete || die - - dodoc "${FILESDIR}"/README.OpenRC - - newconfd "${FILESDIR}"/openconnect.confd openconnect - newinitd "${FILESDIR}"/openconnect.initd openconnect - - insinto /etc/logrotate.d - newins "${FILESDIR}"/openconnect.logrotate openconnect - - keepdir /var/log/openconnect -}
