- updated to 9.12

diff --git a/openconnect-x32.patch b/openconnect-x32.patch
deleted file mode 100644 (file)
index 32b66c6..0000000
--- a/openconnect-x32.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- openconnect-8.20/vhost.c.orig      2021-07-27 15:49:16.000000000 +0200
-+++ openconnect-8.20/vhost.c   2022-03-18 06:33:02.298507500 +0100
-@@ -89,9 +89,9 @@ static int setup_vring(struct openconnec
- 
-       struct vhost_vring_addr va = { };
-       va.index = idx;
--      va.desc_user_addr = (uint64_t)vring->desc;
--      va.avail_user_addr = (uint64_t)vring->avail;
--      va.used_user_addr  = (uint64_t)vring->used;
-+      va.desc_user_addr = (uintptr_t)vring->desc;
-+      va.avail_user_addr = (uintptr_t)vring->avail;
-+      va.used_user_addr  = (uintptr_t)vring->used;
-       if (ioctl(vpninfo->vhost_fd, VHOST_SET_VRING_ADDR, &va) < 0) {
-               ret = -errno;
-               vpn_progress(vpninfo, PRG_ERR, _("Failed to set vring #%d base: %s\n"),
-@@ -457,7 +457,7 @@ static inline int process_ring(struct op
- 
-               if (!tx)
-                       ring->desc[desc].flags = vio16(VRING_DESC_F_WRITE);
--              ring->desc[desc].addr = vio64((uint64_t)this + pkt_offset(virtio.h));
-+              ring->desc[desc].addr = vio64((uintptr_t)this + pkt_offset(virtio.h));
-               ring->desc[desc].len = vio32(this->len + sizeof(this->virtio.h));
-               barrier();
- 

diff --git a/openconnect.spec b/openconnect.spec
index 50a7de5742ef31e35b55efa6542f9acabbc76a5a..491899a3147e3720439d0dc55ef630611c3f2cea 100644 (file)
--- a/openconnect.spec
+++ b/openconnect.spec
@@ -11,14 +11,13 @@
 Summary:       Client for Cisco's AnyConnect SSL VPN and Pulse Connect Secure
 Summary(pl.UTF-8):     Klient Cisco AnyConnect SSL VPN i Pulse Connect Secure
 Name:          openconnect
-Version:       8.20
+Version:       9.12
 Release:       1
 License:       LGPL v2.1
 Group:         Applications/Networking
 Source0:       ftp://ftp.infradead.org/pub/openconnect/%{name}-%{version}.tar.gz
-# Source0-md5: 26218ee45fea950ebcc65be242f3eb42
+# Source0-md5: 39060dcb58ebfb261bb6faf17755b98b
 Patch0:                %{name}-am.patch
-Patch1:                %{name}-x32.patch
 URL:           http://www.infradead.org/openconnect.html
 BuildRequires: autoconf >= 2.63
 BuildRequires: automake >= 1:1.10
@@ -37,6 +36,8 @@ BuildRequires:        p11-kit-devel
 %{?with_pcsc:BuildRequires:    pcsc-lite-devel}
 BuildRequires: pkgconfig >= 1:0.27
 BuildRequires: python >= 2
+BuildRequires: rpm-build >= 4.6
+BuildRequires: rpmbuild(macros) >= 1.673
 %{?with_stoken:BuildRequires:  stoken-devel}
 %{!?with_openssl:BuildRequires:        tpm2-tss-devel}
 %{!?with_openssl:BuildRequires:        trousers-devel}
@@ -103,7 +104,7 @@ Summary:    Bash completion for openconnect arguments
 Summary(pl.UTF-8):     Bashowe dopełnianie argumentów polecenia openconnect
 Group:         Applications/Shells
 Requires:      %{name} = %{version}-%{release}
-Requires:      bash-completion >= 2.0
+Requires:      bash-completion >= 1:2.0
 BuildArch:     noarch
 
 %description -n bash-completion-openconnect
@@ -115,7 +116,6 @@ Bashowe dopełnianie argumentów polecenia openconnect.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 %{__libtoolize}