Correct a license of m4/ax_type_socklen_t.m4

Signed-off-by: Björn Esser <besser82@fedoraproject.org>

.gitignore

@@ -3,3 +3,5 @@
 /x11vnc-0.9.8-disableRpath.patch
 /x11vnc-0.9.14-dev.tar.gz
 /x11vnc-0.9.16.tar.gz
+/x11vnc-a61f364.tar.gz
+/x11vnc-0.9.17.tar.gz

sources

@@ -1 +1 @@
-SHA512 (x11vnc-0.9.16.tar.gz) = 69f65ee312f8dede6051b401304987502a213c6c28c7f41e855734f11de1fae14d5d493dc9c28b2e4b7c0be55f8dbd3b35dd2610aae910183772c3e626736fec
+SHA512 (x11vnc-0.9.17.tar.gz) = 687c41e03cca43dbca6ffdeb40960dddfba54ba00cf890f89f63fd66b9559a4c09602f84c1d4b7ffd7ac58818b90893013925d94a45a6feb83ab8cf7a02c1fe8

x11vnc-0.9.16-Fix-build-with-fno-common.patch

@@ -1,50 +0,0 @@
-From a48b0b1cd887d7f3ae67f525d7d334bd2feffe60 Mon Sep 17 00:00:00 2001
-From: Alexander Tsoy <alexander@tsoy.me>
-Date: Tue, 28 Jan 2020 22:21:01 +0300
-Subject: [PATCH] Fix build with -fno-common
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-GCC 10 defaults to -fno-common
-
-Signed-off-by: Petr Písař <ppisar@redhat.com>
----
- src/util.c | 3 +++
- src/util.h | 6 +++---
- 2 files changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/src/util.c b/src/util.c
-index a82a1a4..6a52ebf 100644
---- a/src/util.c
-+++ b/src/util.c
-@@ -47,6 +47,9 @@ int hxl = 0;
- #ifdef LIBVNCSERVER_HAVE_LIBPTHREAD
- MUTEX(x11Mutex);
- MUTEX(scrollMutex);
-+MUTEX(clientMutex);
-+MUTEX(inputMutex);
-+MUTEX(pointerMutex);
- #endif
- 
- int nfix(int i, int n);
-diff --git a/src/util.h b/src/util.h
-index 35c1afd..99b5dd1 100644
---- a/src/util.h
-+++ b/src/util.h
-@@ -102,9 +102,9 @@ extern struct timeval _mysleep;
- #ifdef LIBVNCSERVER_HAVE_LIBPTHREAD
- extern MUTEX(x11Mutex);
- extern MUTEX(scrollMutex);
--MUTEX(clientMutex);
--MUTEX(inputMutex);
--MUTEX(pointerMutex);
-+extern MUTEX(clientMutex);
-+extern MUTEX(inputMutex);
-+extern MUTEX(pointerMutex);
- #endif
- 
- #define X_INIT INIT_MUTEX(x11Mutex)
--- 
-2.21.1
-

x11vnc-0.9.16-Respect-a-system-crypto-policy.patch

@@ -31,11 +31,11 @@ diff --git a/src/sslhelper.c b/src/sslhelper.c
 index 1a3e747..a145a70 100644
 --- a/src/sslhelper.c
 +++ b/src/sslhelper.c
-@@ -1596,9 +1596,6 @@ static int switch_to_anon_dh(void) {
- 	if (ssl_client_mode) {
- 		return 1;
- 	}
--	if (!SSL_CTX_set_cipher_list(ctx, "ADH:@STRENGTH")) {
+@@ -1601,9 +1601,6 @@ static int switch_to_anon_dh(void) {
+ 	/* Security level must be set to 0 for unauthenticated suites. */
+ 	SSL_CTX_set_security_level(ctx, 0);
+ #endif
+-	if (!SSL_CTX_set_cipher_list(ctx, "ADH:@SECLEVEL=0")) {
 -		return 0;
 -	}
  	if (!add_anon_dh()) {
@@ -43,4 +43,3 @@ index 1a3e747..a145a70 100644
  	}
 -- 
 2.21.1
-

x11vnc-0.9.16-scan-limit-access-to-shared-memory-segments-to-curre.patch

@@ -1,29 +0,0 @@
-From 69eeb9f7baa14ca03b16c9de821f9876def7a36a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Gu=C3=A9nal=20DAVALAN?= <guenal.davalan@uca.fr>
-Date: Wed, 18 Nov 2020 08:40:45 +0100
-Subject: [PATCH] scan: limit access to shared memory segments to current user
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Petr Písař <ppisar@redhat.com>
----
- src/scan.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/scan.c b/src/scan.c
-index 43e00d2..12994d5 100644
---- a/src/scan.c
-+++ b/src/scan.c
-@@ -320,7 +320,7 @@ static int shm_create(XShmSegmentInfo *shm, XImage **ximg_ptr, int w, int h,
- 
- #if HAVE_XSHM
- 	shm->shmid = shmget(IPC_PRIVATE,
--	    xim->bytes_per_line * xim->height, IPC_CREAT | 0777);
-+	    xim->bytes_per_line * xim->height, IPC_CREAT | 0600);
- 
- 	if (shm->shmid == -1) {
- 		rfbErr("shmget(%s) failed.\n", name);
--- 
-2.26.2
-

x11vnc-0.9.16-src-cursor-fix-xfc-NULL-pointer-dereference.patch

@@ -1,36 +0,0 @@
-From 95a10ab64c2dbbec2c8dad91a5ffb73a0d68474b Mon Sep 17 00:00:00 2001
-From: Jonathan Liu <net147@gmail.com>
-Date: Mon, 16 Mar 2020 20:04:06 +1100
-Subject: [PATCH] src/cursor: fix xfc NULL pointer dereference
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-xfc->width and xfc->height for the XFixes cursor image returned from
-XFixesGetCursorImage(dpy) are accessed without first checking that xfc
-is not NULL. This can result in the server sometimes crashing when
-moving a Google Chrome window.
-
-Fixes: 37c946191a0f ("Broken cursor bugfix for 64 bit systems (#49)")
-Signed-off-by: Jonathan Liu <net147@gmail.com>
-Signed-off-by: Petr Písař <ppisar@redhat.com>
----
- src/cursor.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/cursor.c b/src/cursor.c
-index 39e73a6..74a08c6 100644
---- a/src/cursor.c
-+++ b/src/cursor.c
-@@ -1311,7 +1311,7 @@ static int get_exact_cursor(int init) {
- 
- 		/* retrieve the cursor info + pixels from server: */
- 		xfc = XFixesGetCursorImage(dpy);
--		{
-+		if (xfc) {
- 			/* 2017-07-09, Stephan Fuhrmann: This fixes an implementation flaw for 64 bit systems.
- 			 * The XFixesCursorImage structure says xfc->pixels is (unsigned long*) in the structure, but
- 			 * the protocol spec says it's 32 bit per pixel
--- 
-2.21.1
-

x11vnc.rpmlintrc

@@ -1,2 +1 @@
-from Config import *
-addFilter("spelling-error .* ru (т|п)");
+addFilter('spelling-error .* ru (т|п)')

x11vnc.spec

@@ -1,6 +1,6 @@
 Name:           x11vnc
-Version:        0.9.16
-Release:        11%{?dist}
+Version:        0.9.17
+Release:        1%{?dist}
 Summary:        VNC server for the current X11 session
 Summary(ru):    VNC-сервер для текущей сессии X11
 # COPYING:                  GPL-2.0-or-later text
@@ -14,7 +14,7 @@ Summary(ru):    VNC-сервер для текущей сессии X11
 # src/xi2_devices.h:        GPL-2.0-or-later
 # src/xkb_bell.h:           GPL-2.0-or-later WITH x11vnc-openssl-exception
 ## Not in any binary package
-# m4/ax_type_socklen_t.m4:  GPL-2.0-or-later WITH Autoconf-exception-2.0
+# m4/ax_type_socklen_t.m4:  GPL-2.0-or-later WITH Autoconf-exception-macro
 ## Not used at all
 # misc/blockdpy.c:          GPL-2.0-or-later
 # misc/connect_switch:      GPL-2.0-or-later
@@ -48,6 +48,7 @@ Summary(ru):    VNC-сервер для текущей сессии X11
 # src/nox11.h:              MIT-open-group
 # tkx11vnc:     GPL-2.0-or-later
 License:        GPL-2.0-or-later AND GPL-2.0-or-later WITH x11vnc-openssl-exception
+SourceLicense:  %{license} AND GPL-2.0-or-later WITH Autoconf-exception-macro AND LGPL-2.0-or-later WITH WxWindows-exception-3.1 AND BSD-3-Clause AND LicenseRef-Fedora-Public-Domain AND LGPL-2.0-or-later WITH WxWindows-exception-3.1 AND MIT-open-group
 URL:            https://github.com/LibVNC/x11vnc
 Source0:        %{url}/archive/%{version}/%{name}-%{version}.tar.gz
 # Enforce system crypto policy
@@ -55,14 +56,7 @@ Source0:        %{url}/archive/%{version}/%{name}-%{version}.tar.gz
 Patch0:         x11vnc-0.9.16-Respect-a-system-crypto-policy.patch
 # Normalize changlog encoding
 Patch1:         x11vnc-0.9.16-Convert-a-changelog-to-UTF-8.patch
-# Fix building with GCC 10 properly, in upstream after 0.9.16
-Patch2:         x11vnc-0.9.16-Fix-build-with-fno-common.patch
-# Fix a NULL pointer dereference in a cursor handler, upstream bug #123, in
-# upstream after 0.9.16
-Patch3:         x11vnc-0.9.16-src-cursor-fix-xfc-NULL-pointer-dereference.patch
-# Fix CVE-2020-29074 (insecure permissions on a shared memory), bug #1933603,
-# in upstream after 0.9.16
-Patch4:         x11vnc-0.9.16-scan-limit-access-to-shared-memory-segments-to-curre.patch
+
 BuildRequires:  autoconf
 BuildRequires:  automake
 # for autogen.sh script
@@ -76,6 +70,7 @@ BuildRequires:  libXfixes-devel
 BuildRequires:  libXinerama-devel
 BuildRequires:  libXrandr-devel
 BuildRequires:  libXtst-devel
+BuildRequires:  libxcrypt-devel
 BuildRequires:  make
 BuildRequires:  openssl-devel
 BuildRequires:  pkgconf-pkg-config
@@ -85,6 +80,7 @@ BuildRequires:  pkgconfig(inputproto) >= 1.9.99.9
 BuildRequires:  pkgconfig(libvncclient) >= 0.9.8
 BuildRequires:  pkgconfig(libvncserver) >= 0.9.8
 BuildRequires:  pkgconfig(xi) >= 1.2.99
+BuildRequires:  pkgconfig(libdrm)
 BuildRequires:  sed
 # Tests:
 BuildRequires:  desktop-file-utils
@@ -115,12 +111,7 @@ a versatile and productive while still easy to use program.
 в использовании.
 
 %prep
-%setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
+%autosetup -p1 -n %{name}-%{version}
 
 %build
 autoreconf -fi
@@ -134,7 +125,6 @@ autoreconf -fi
     --without-macosx-native \
     --with-ssl \
     --with-uinput \
-    --without-v4l \
     --with-x \
     --without-xcomposite \
     --with-xdamage \
@@ -154,13 +144,27 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/x11vnc.desktop
 
 %files
 %license COPYING
-%doc ChangeLog NEWS README
+%doc ChangeLog doc/* NEWS README
 %{_bindir}/x11vnc
 %{_bindir}/Xdummy
 %{_datadir}/applications/x11vnc.desktop
 %{_mandir}/man1/x11vnc.1*
 
 %changelog
+* Fri May 02 2025 Petr Pisar <ppisar@redhat.com> - 0.9.17-1
+- 0.9.17 bump
+
+* Sat Feb 01 2025 Björn Esser <besser82@fedoraproject.org> - 0.9.16^20230801gita61f364-2
+- Add explicit BR: libxcrypt-devel
+
+* Fri Nov 17 2023 Sérgio Basto <sergio@serjux.com> - 0.9.16^20230801gita61f364-1
+- Update to a61f364e385d98677c04070a994397b287385219 git snapshot from
+  2023-08-01 (a support for acquiring a DRM framebuffer with a drm schema
+  in -rawfb option)
+
+* Sat Feb  4 2023 Florian Weimer <fweimer@redhat.com> - 0.9.16-12
+- Do not configure with --without-v4l
+
 * Tue Sep 13 2022 Petr Pisar <ppisar@redhat.com> - 0.9.16-11
 - Convert a license tag to an SPDX format