Compare commits
2 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
cfd1919bb9 | ||
|
|
3c2865dff3 |
8 changed files with 301 additions and 368 deletions
4
.gitignore
vendored
4
.gitignore
vendored
|
|
@ -1,7 +1,3 @@
|
|||
/x11vnc-0.9.12.tar.gz
|
||||
/x11vnc-0.9.13.tar.gz
|
||||
/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
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (x11vnc-0.9.17.tar.gz) = 687c41e03cca43dbca6ffdeb40960dddfba54ba00cf890f89f63fd66b9559a4c09602f84c1d4b7ffd7ac58818b90893013925d94a45a6feb83ab8cf7a02c1fe8
|
||||
a372ec4fe8211221547b1c108cf56e4c x11vnc-0.9.13.tar.gz
|
||||
|
|
|
|||
|
|
@ -0,0 +1,32 @@
|
|||
From a43cac178bc5722169b25c70335038f03ca7034d 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
|
||||
|
||||
Petr Písař: Ported to 0.9.13 from upstream
|
||||
69eeb9f7baa14ca03b16c9de821f9876def7a36a commit.
|
||||
|
||||
Signed-off-by: Petr Písař <ppisar@redhat.com>
|
||||
---
|
||||
x11vnc/scan.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/x11vnc/scan.c b/x11vnc/scan.c
|
||||
index 2b03666..dfc5599 100644
|
||||
--- a/x11vnc/scan.c
|
||||
+++ b/x11vnc/scan.c
|
||||
@@ -320,7 +320,7 @@ static int shm_create(XShmSegmentInfo *shm, XImage **ximg_ptr, int w, int h,
|
||||
|
||||
#if LIBVNCSERVER_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
|
||||
|
||||
|
|
@ -1,29 +0,0 @@
|
|||
From a6059c3486840493733f3890a51ed52558f0a6bf Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
|
||||
Date: Mon, 6 Apr 2020 16:33:57 +0200
|
||||
Subject: [PATCH] Convert a changelog to UTF-8
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Signed-off-by: Petr PÃsaÅ™ <ppisar@redhat.com>
|
||||
---
|
||||
ChangeLog | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/ChangeLog b/ChangeLog
|
||||
index 24e33b2..3c92c52 100644
|
||||
--- a/ChangeLog
|
||||
+++ b/ChangeLog
|
||||
@@ -497,7 +497,7 @@
|
||||
|
||||
2007-02-12 Karl Runge <runge@karlrunge.com>
|
||||
* x11vnc: add avahi (aka mDNS/Zeroconf/Bonjour...)
|
||||
- support thanks to Diego Pettenò. -avahi/-mdns.
|
||||
+ support thanks to Diego Pettenò. -avahi/-mdns.
|
||||
Add -find and -create FINDISPLAY aliases.
|
||||
|
||||
2007-02-11 Karl Runge <runge@karlrunge.com>
|
||||
--
|
||||
2.21.1
|
||||
|
||||
|
|
@ -1,45 +0,0 @@
|
|||
From 089840dbe3d44363e55e319ff8f478c28c974e8b Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
|
||||
Date: Mon, 6 Apr 2020 16:24:42 +0200
|
||||
Subject: [PATCH] Respect a system crypto policy
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Software is not allowed to override system-wide cryptographic policy.
|
||||
<https://fedoraproject.org/wiki/Packaging:CryptoPolicies#C.2FC.2B.2B_applications>
|
||||
|
||||
Signed-off-by: Petr Písař <ppisar@redhat.com>
|
||||
---
|
||||
src/enc.h | 1 -
|
||||
src/sslhelper.c | 3 ---
|
||||
2 files changed, 4 deletions(-)
|
||||
|
||||
diff --git a/src/enc.h b/src/enc.h
|
||||
index 9d580e5..d8ffb63 100644
|
||||
--- a/src/enc.h
|
||||
+++ b/src/enc.h
|
||||
@@ -1626,7 +1626,6 @@ static void show_cert(int sock) {
|
||||
SSL_CTX_set_mode(ctx, mode);
|
||||
|
||||
if (getenv("ULTRAVNC_DSM_HELPER_SHOWCERT_ADH")) {
|
||||
- SSL_CTX_set_cipher_list(ctx, "ADH:@STRENGTH");
|
||||
SSL_CTX_set_verify(ctx, SSL_VERIFY_NONE, NULL);
|
||||
}
|
||||
|
||||
diff --git a/src/sslhelper.c b/src/sslhelper.c
|
||||
index 1a3e747..a145a70 100644
|
||||
--- a/src/sslhelper.c
|
||||
+++ b/src/sslhelper.c
|
||||
@@ -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()) {
|
||||
return 0;
|
||||
}
|
||||
--
|
||||
2.21.1
|
||||
103
x11vnc-0.9.8-disableRpath.patch
Normal file
103
x11vnc-0.9.8-disableRpath.patch
Normal file
|
|
@ -0,0 +1,103 @@
|
|||
--- configure.orig 2009-06-19 18:44:21.000000000 +0400
|
||||
+++ configure 2009-07-29 16:01:13.000000000 +0400
|
||||
@@ -4183,7 +4183,7 @@
|
||||
"SunOS 5"*)
|
||||
echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5
|
||||
echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6
|
||||
- ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
|
||||
+ ac_xsave_LIBS=$LIBS; LIBS="$LIBS"
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
@@ -4233,9 +4233,9 @@
|
||||
if test $ac_R_nospace = yes; then
|
||||
echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6
|
||||
- X_LIBS="$X_LIBS -R$x_libraries"
|
||||
+ X_LIBS="$X_LIBS"
|
||||
else
|
||||
- LIBS="$ac_xsave_LIBS -R $x_libraries"
|
||||
+ LIBS="$ac_xsave_LIBS"
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
@@ -4285,7 +4285,7 @@
|
||||
if test $ac_R_space = yes; then
|
||||
echo "$as_me:$LINENO: result: yes" >&5
|
||||
echo "${ECHO_T}yes" >&6
|
||||
- X_LIBS="$X_LIBS -R $x_libraries"
|
||||
+ X_LIBS="$X_LIBS"
|
||||
else
|
||||
echo "$as_me:$LINENO: result: neither works" >&5
|
||||
echo "${ECHO_T}neither works" >&6
|
||||
@@ -6705,7 +6705,7 @@
|
||||
if test ! -z "$HAVE_LIBXFIXES" -o ! -z "$HAVE_LIBXDAMAGE"; then
|
||||
# need /usr/sfw/lib in RPATH for Solaris 10 and later
|
||||
case `(uname -sr) 2>/dev/null` in
|
||||
- "SunOS 5"*) X_EXTRA_LIBS="$X_EXTRA_LIBS -R/usr/sfw/lib" ;;
|
||||
+ "SunOS 5"*) X_EXTRA_LIBS="$X_EXTRA_LIBS" ;;
|
||||
esac
|
||||
fi
|
||||
if test ! -z "$HAVE_LIBXRANDR"; then
|
||||
@@ -7026,9 +7026,9 @@
|
||||
if test "x$ld_minus_R" = "xno"; then
|
||||
:
|
||||
elif test "x$GCC" = "xyes"; then
|
||||
- LDFLAGS="$LDFLAGS -Xlinker -R$with_ssl/lib"
|
||||
+ LDFLAGS="$LDFLAGS -Xlinker"
|
||||
else
|
||||
- LDFLAGS="$LDFLAGS -R$with_ssl/lib"
|
||||
+ LDFLAGS="$LDFLAGS"
|
||||
fi
|
||||
fi
|
||||
echo "$as_me:$LINENO: checking for RAND_file_name in -lcrypto" >&5
|
||||
@@ -7910,13 +7910,6 @@
|
||||
fi
|
||||
if test "x$with_system_libvncserver" != "xyes"; then
|
||||
rflag=""
|
||||
- if test "x$ld_minus_R" = "xno"; then
|
||||
- :
|
||||
- elif test "x$GCC" = "xyes"; then
|
||||
- rflag="-Xlinker -R$with_system_libvncserver/lib"
|
||||
- else
|
||||
- rflag="-R$with_system_libvncserver/lib"
|
||||
- fi
|
||||
cmd="$with_system_libvncserver/bin/libvncserver-config"
|
||||
if $cmd --version 1>/dev/null 2>&1; then
|
||||
cvers=`$cmd --version 2>/dev/null`
|
||||
@@ -7958,9 +7951,9 @@
|
||||
if test "x$ld_minus_R" = "xno"; then
|
||||
:
|
||||
elif test "x$GCC" = "xyes"; then
|
||||
- rflag=" -Xlinker -R$rprefix/lib "
|
||||
+ rflag=" -Xlinker "
|
||||
else
|
||||
- rflag=" -R$rprefix/lib "
|
||||
+ rflag=" "
|
||||
fi
|
||||
cvers=`libvncserver-config --version 2>/dev/null`
|
||||
cscore=`echo "$cvers" | tr '.' ' ' | awk '{print 10000 * $1 + 100 * $2 + $3}'`
|
||||
@@ -8039,9 +8032,9 @@
|
||||
:
|
||||
elif test "x$GCC" = "xyes"; then
|
||||
# this is not complete... in general a rat's nest.
|
||||
- LDFLAGS="$LDFLAGS -Xlinker -R$with_jpeg/lib"
|
||||
+ LDFLAGS="$LDFLAGS -Xlinker"
|
||||
else
|
||||
- LDFLAGS="$LDFLAGS -R$with_jpeg/lib"
|
||||
+ LDFLAGS="$LDFLAGS"
|
||||
fi
|
||||
fi
|
||||
if test "${ac_cv_header_jpeglib_h+set}" = set; then
|
||||
@@ -8320,9 +8313,9 @@
|
||||
if test "x$ld_minus_R" = "xno"; then
|
||||
:
|
||||
elif test "x$GCC" = "xyes"; then
|
||||
- LDFLAGS="$LDFLAGS -Xlinker -R$with_zlib/lib"
|
||||
+ LDFLAGS="$LDFLAGS -Xlinker"
|
||||
else
|
||||
- LDFLAGS="$LDFLAGS -R$with_zlib/lib"
|
||||
+ LDFLAGS="$LDFLAGS"
|
||||
fi
|
||||
fi
|
||||
if test "${ac_cv_header_zlib_h+set}" = set; then
|
||||
|
|
@ -1 +0,0 @@
|
|||
addFilter('spelling-error .* ru (т|п)')
|
||||
451
x11vnc.spec
451
x11vnc.spec
|
|
@ -1,289 +1,166 @@
|
|||
Name: x11vnc
|
||||
Version: 0.9.17
|
||||
Release: 5%{?dist}
|
||||
Summary: VNC server for the current X11 session
|
||||
Summary(ru): VNC-сервер для текущей сессии X11
|
||||
# COPYING: GPL-2.0-or-later text
|
||||
# misc/Xdummy.in: GPL-2.0-or-later
|
||||
# src/cleanup.c: GPL-2.0-or-later WITH x11vnc-openssl-exception
|
||||
# src/help.c: GPL-2.0-or-later WITH x11vnc-openssl-exception AND GPL-2.0-or-later text
|
||||
# src/help.h: GPL-2.0-or-later WITH x11vnc-openssl-exception
|
||||
# src/tkx11vnc.h: GPL-2.0-or-later
|
||||
# src/win_utils.c: GPL-2.0-or-later WITH x11vnc-openssl-exception
|
||||
# src/xi2_devices.c: GPL-2.0-or-later
|
||||
# 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-macro
|
||||
## Not used at all
|
||||
# misc/blockdpy.c: GPL-2.0-or-later
|
||||
# misc/connect_switch: GPL-2.0-or-later
|
||||
# misc/desktop.cgi: GPL-2.0-or-later
|
||||
# misc/deskshot: GPL-2.0-or-later
|
||||
# misc/enhanced_tightvnc_viewer/bin/util/ss_vncviewer: GPL-2.0-or-later
|
||||
# misc/enhanced_tightvnc_viewer/COPYING: GPL-2.0-or-later text
|
||||
# misc/enhanced_tightvnc_viewer/man/man1/ssvnc.1: GPL-1.0-or-later
|
||||
# misc/enhanced_tightvnc_viewer/man/man1/ssvncviewer.1: GPL-1.0-or-later
|
||||
# misc/enhanced_tightvnc_viewer/README: GPL-1.0-or-later
|
||||
# misc/enhanced_tightvnc_viewer/src/patches/tight-vncviewer-full.patch:
|
||||
# GPL-2.0-or-later AND GPL-1.0-or-later AND
|
||||
# LGPL-2.0-or-later WITH WxWindows-exception-3.1 AND
|
||||
# BSD-3-Clause
|
||||
# misc/inet6to4: GPL-2.0-or-later
|
||||
# misc/LICENSE: GPL-2.0-or-later
|
||||
# misc/qt_tslib_inject.pl: GPL-2.0-or-later
|
||||
# misc/turbovnc/apply_turbovnc: LicenseRef-Fedora-Public-Domain
|
||||
# This license has been approved
|
||||
# <https://gitlab.com/fedora/legal/fedora-license-data/-/issues/62>.
|
||||
# misc/turbovnc/convert: LicenseRef-Fedora-Public-Domain
|
||||
# misc/turbovnc/convert_rfbserver: LicenseRef-Fedora-Public-Domain
|
||||
# misc/turbovnc/Makefile.am: LicenseRef-Fedora-Public-Domain
|
||||
# misc/turbovnc/README: LicenseRef-Fedora-Public-Domain
|
||||
# misc/turbovnc/tight.c: GPL-2.0-or-later
|
||||
# misc/turbovnc/turbojpeg.h: LGPL-2.0-or-later WITH WxWindows-exception-3.1
|
||||
# misc/turbovnc/undo_turbovnc: LicenseRef-Fedora-Public-Domain
|
||||
# misc/uinput.pl: GPL-2.0-or-later
|
||||
# misc/ultravnc_repeater.pl: GPL-2.0-or-later
|
||||
# misc/Xdummy.c: GPL-2.0-or-later WITH x11vnc-openssl-exception
|
||||
# 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
|
||||
# <https://fedoraproject.org/wiki/Packaging:CryptoPolicies#C.2FC.2B.2B_applications>
|
||||
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
|
||||
Summary: VNC server for the current X11 session
|
||||
Summary(ru): VNC-сервер для текущей сессии X11
|
||||
Name: x11vnc
|
||||
Version: 0.9.13
|
||||
Release: 12%{?dist}
|
||||
License: GPLv2
|
||||
Group: User Interface/X
|
||||
URL: http://www.karlrunge.com/x11vnc/
|
||||
Source0: http://downloads.sourceforge.net/libvncserver/%{name}-%{version}.tar.gz
|
||||
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: automake
|
||||
# for autogen.sh script
|
||||
BuildRequires: bash
|
||||
BuildRequires: gcc
|
||||
BuildRequires: libX11-devel
|
||||
BuildRequires: libXcursor-devel
|
||||
BuildRequires: libXdamage-devel
|
||||
BuildRequires: libXext-devel
|
||||
BuildRequires: libXfixes-devel
|
||||
BuildRequires: libXinerama-devel
|
||||
BuildRequires: libXrandr-devel
|
||||
BuildRequires: libXtst-devel
|
||||
BuildRequires: libxcrypt-devel
|
||||
BuildRequires: make
|
||||
BuildRequires: openssl-devel
|
||||
BuildRequires: pkgconf-pkg-config
|
||||
BuildRequires: pkgconfig(avahi-client) >= 0.6.4
|
||||
BuildRequires: pkgconfig(cairo)
|
||||
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
|
||||
# /usr/bin/wish is executed in do_gui() in src/gui.c.
|
||||
Requires: tk
|
||||
# Default X11 server for "x11vnc --create" is Xvfb
|
||||
Requires: Xvfb
|
||||
# Java viewers now are available on
|
||||
# https://github.com/LibVNC/libvncserver/tree/master/webclients/java-applet
|
||||
Obsoletes: x11vnc-javaviewers < 0.9.14-14
|
||||
# Actually only /usr/bin/wish needed.
|
||||
Requires: tk
|
||||
BuildRequires: avahi-devel
|
||||
BuildRequires: libjpeg-devel openssl-devel zlib-devel
|
||||
BuildRequires: libX11-devel
|
||||
BuildRequires: libXdamage-devel libXext-devel libXfixes-devel
|
||||
BuildRequires: libXinerama-devel libXrandr-devel libXtst-devel
|
||||
BuildRequires: libvncserver-devel
|
||||
BuildRequires: xorg-x11-proto-devel
|
||||
|
||||
# In Fedora 12 (and Epel 6) /usr/include/X11/extensions/XInput.h in libXi-devel but in
|
||||
# previous versions in xorg-x11-proto-devel /usr/include/X11/extensions/shmproto.h
|
||||
# placed in libXext-devel in F12 and in xorg-x11-proto-devel early.
|
||||
%if 0%{?fedora} > 11 || 0%{?rhel} > 5
|
||||
BuildRequires: libXi-devel libXext-devel
|
||||
%endif
|
||||
Requires: Xvfb
|
||||
|
||||
# Fedora don't want hardcoded rpaths.
|
||||
Patch1: x11vnc-0.9.8-disableRpath.patch
|
||||
# Fix CVE-2020-29074 (insecure permissions on a shared memory), bug #1933604,
|
||||
# in upstream after 0.9.16
|
||||
Patch2: x11vnc-0.9.13-scan-limit-access-to-shared-memory-segments-to-curre.patch
|
||||
|
||||
# Package intended to EL-5 too, so we still need define BuildRoot
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
# Required java not available on EL-5.ppc, EL-6.ppc64
|
||||
%if ! ( ( "%{_arch}"=="ppc" && 5 == 0%{?rhel} ) || ( "%{_arch}"=="ppc64" && 6 == 0%{?rhel} ) )
|
||||
%global java_support 1
|
||||
%endif
|
||||
|
||||
%description
|
||||
What WinVNC is to Windows x11vnc is to X Window System, i.e. a server which
|
||||
serves the current X Window System desktop via RFB (VNC) protocol to the user.
|
||||
What WinVNC is to Windows x11vnc is to X Window System, i.e. a server
|
||||
which serves the current X Window System desktop via RFB (VNC)
|
||||
protocol to the user.
|
||||
|
||||
Based on the ideas of x0rfbserver and on LibVNCServer it has evolved into
|
||||
a versatile and productive while still easy to use program.
|
||||
Based on the ideas of x0rfbserver and on LibVNCServer it has evolved into a
|
||||
versatile and productive while still easy to use program.
|
||||
|
||||
%description -l ru
|
||||
Это подобно VNC-серверу под Windows - VNC-сервер, который предоставляет доступ
|
||||
к текущей X-сессии пользователя по протоколу (VNC). Таким образом, Вы всегда
|
||||
можете вернуться к работе удаленно, даже если сессия была стандартно запущена
|
||||
локально. Более того, доступ к Логин- менеджеру также может быть осуществлен
|
||||
(GDM, KDM, XDM и т.п.)
|
||||
Это подобно VNC-серверу под Windows - VNC-сервер, который предоставля-
|
||||
ет доступ к текущей X-сессии пользователя по протоколу (VNC).
|
||||
Таким образом, Вы всегда можете вернуться к работе удаленно, даже если
|
||||
сессия была стандартно запущена локально. Более того, доступ к Логин-
|
||||
менеджеру также может быть осуществлен (GDM, KDM, XDM etc)
|
||||
|
||||
Базируется на идее x0rfbserver и LibVNCServer x11vnc эволюционировал в гибкий
|
||||
и производительный инструмент, который, однако, остаётся прост
|
||||
в использовании.
|
||||
Базируется на идее x0rfbserver и LibVNCServer x11vnc эволюционировал
|
||||
в гибкий и производительный инструмент, который, однако, остаётся
|
||||
прост в использовании.
|
||||
|
||||
%if 0%{?java_support}
|
||||
%package javaviewers
|
||||
Version: %{version}
|
||||
Summary: VNC clients (browser java applets)
|
||||
Summary(ru): VNC-клиенты в виде java-аплетов для браузеров
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
License: GPLv2+
|
||||
Group: User Interface/X
|
||||
# EL-5 does not support noarch subpackages ( https://fedorahosted.org/fedora-infrastructure/ticket/1772#comment:4 )
|
||||
%if 0%{?fedora} > 9 || 0%{?rhel} > 5
|
||||
BuildArch: noarch
|
||||
%endif
|
||||
BuildRequires: java-devel >= 1:1.6.0
|
||||
BuildRequires: jpackage-utils
|
||||
|
||||
%description javaviewers
|
||||
The package contains the corresponding java clients for %{name}. They
|
||||
can be used with any java-enabled browser and provide an easy access to
|
||||
the server without the need to install software on the client machine.
|
||||
|
||||
%description -l ru javaviewers
|
||||
Java-клиенты для использования совместно с %{name} прямо из браузера
|
||||
без необходимости ставить какой бы то ни было софт.
|
||||
|
||||
Должно по идее работать с любым современным браузером, где есть
|
||||
поддержка Java
|
||||
%endif # EL.ppc
|
||||
|
||||
%prep
|
||||
%autosetup -p1 -n %{name}-%{version}
|
||||
%setup -q
|
||||
%patch1 -p0 -b .rpath
|
||||
%patch2 -p1
|
||||
|
||||
# fix source perms for the -debuginfo package rpmlint warnings
|
||||
find -name "*.c" -o -name "*.h" -exec %{__chmod} 0644 {} \;
|
||||
|
||||
for file in README AUTHORS; do
|
||||
# ISO-8859-1 is my assumption.
|
||||
iconv -f ISO-8859-1 -t UTF-8 "$file" > "$file.new"
|
||||
touch --reference "$file" "$file.new"
|
||||
mv "$file.new" "$file"
|
||||
done
|
||||
|
||||
# Delete prebuilt binaries
|
||||
find -name '*.jar' -exec rm {} \;
|
||||
|
||||
%build
|
||||
autoreconf -fi
|
||||
%configure \
|
||||
--with-avahi \
|
||||
--with-colormultipointer \
|
||||
--with-crypto \
|
||||
--with-dpms \
|
||||
--with-fbdev \
|
||||
--without-fbpm \
|
||||
--without-macosx-native \
|
||||
--with-ssl \
|
||||
--with-uinput \
|
||||
--with-x \
|
||||
--without-xcomposite \
|
||||
--with-xdamage \
|
||||
--with-xfixes \
|
||||
--with-xinerama \
|
||||
--with-xkeyboard \
|
||||
--with-xrandr \
|
||||
--with-xrecord \
|
||||
--without-xtrap
|
||||
%make_build
|
||||
%configure --with-system-libvncserver --without-tightvnc-filetransfer
|
||||
|
||||
%if 0%{?java_support}
|
||||
# First rebuild jars, what have been removed in %%prep.
|
||||
pushd classes/ssl/src
|
||||
%{__make} %{?_smp_mflags}
|
||||
# Alternative to patch Makefiles.
|
||||
for jarfile in *.jar; do
|
||||
%{__ln_s} src/$jarfile ../;
|
||||
%{__ln_s} ssl/src/$jarfile ../../;
|
||||
done
|
||||
popd
|
||||
%else
|
||||
%{__rm} -rf classes
|
||||
sed -ri 's/(DUST_)?SUBDIRS = x11vnc classes/\1SUBDIRS = x11vnc/' Makefile
|
||||
%endif
|
||||
|
||||
%{__make} %{?_smp_mflags}
|
||||
|
||||
%install
|
||||
%make_install
|
||||
%{__rm} -rf %{buildroot}
|
||||
%{__make} install DESTDIR="%{buildroot}"
|
||||
|
||||
%check
|
||||
desktop-file-validate %{buildroot}/%{_datadir}/applications/x11vnc.desktop
|
||||
%if 0%{?java_support}
|
||||
# And Java viewers
|
||||
pushd classes/ssl
|
||||
%{__make} install DESTDIR="%{buildroot}"
|
||||
popd
|
||||
|
||||
# Rename README file to avoid name bump
|
||||
%{__mv} classes/ssl/src/tight/README classes/ssl/src/tight/README.tight
|
||||
%{__mv} classes/ssl/src/ultra/README classes/ssl/src/ultra/README.ultra
|
||||
%endif
|
||||
|
||||
%clean
|
||||
%{__rm} -rf %{buildroot}
|
||||
|
||||
%files
|
||||
%license COPYING
|
||||
%doc ChangeLog doc/* NEWS README
|
||||
%{_bindir}/x11vnc
|
||||
%{_bindir}/Xdummy
|
||||
%{_datadir}/applications/x11vnc.desktop
|
||||
%defattr(-,root,root,-)
|
||||
%doc AUTHORS ChangeLog COPYING NEWS README TODO
|
||||
%{_mandir}/man1/x11vnc.1*
|
||||
%{_bindir}/x11vnc
|
||||
%{_datadir}/applications/x11vnc.desktop
|
||||
|
||||
%if 0%{?java_support}
|
||||
%files javaviewers
|
||||
%defattr(-,root,root,-)
|
||||
%doc classes/ssl/README classes/ssl/src/tight/README.tight classes/ssl/src/ultra/README.ultra
|
||||
%{_datadir}/%{name}
|
||||
%exclude %{_datadir}/%{name}/classes/ssl/README
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.17-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
|
||||
|
||||
* Sat Jun 13 2026 Yaakov Selkowitz <yselkowi@redhat.com> - 0.9.17-4
|
||||
- Rebuilt for openssl 4.0
|
||||
|
||||
* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.17-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
|
||||
|
||||
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.17-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
|
||||
|
||||
* 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-5
|
||||
- Add explicit BR: libxcrypt-devel
|
||||
|
||||
* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.16^20230801gita61f364-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
|
||||
|
||||
* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.16^20230801gita61f364-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
|
||||
|
||||
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.16^20230801gita61f364-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* 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 Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.16-14
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
||||
* Sat Feb 4 2023 Florian Weimer <fweimer@redhat.com> - 0.9.16-13
|
||||
- Do not configure with --without-v4l
|
||||
|
||||
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.16-12
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Tue Sep 13 2022 Petr Pisar <ppisar@redhat.com> - 0.9.16-11
|
||||
- Convert a license tag to an SPDX format
|
||||
|
||||
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.16-10
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.16-9
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Tue Sep 14 2021 Sahana Prasad <sahana@redhat.com> - 0.9.16-8
|
||||
- Rebuilt with OpenSSL 3.0.0
|
||||
|
||||
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.16-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Mon Mar 01 2021 Petr Pisar <ppisar@redhat.com> - 0.9.16-6
|
||||
- Fix CVE-2020-29074 (insecure permissions on a shared memory) (bug #1933603)
|
||||
|
||||
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.16-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.16-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Sat Jul 11 2020 Jiri Vanek <jvanek@redhat.com> - 0.9.16-3
|
||||
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
|
||||
|
||||
* Mon Apr 06 2020 Petr Pisar <ppisar@redhat.com> - 0.9.16-2
|
||||
- Modernize a spec file
|
||||
- License corrected from GPLv2 to GPLv2+
|
||||
- Enforce system crypto policy
|
||||
- Normalize ChangeLog encoding
|
||||
- Fix building with GCC 10 properly
|
||||
- Fix a NULL pointer dereference in a cursor handler (upstream bug #123)
|
||||
|
||||
* Tue Feb 11 2020 Sérgio Basto <sergio@serjux.com> - 0.9.16-1
|
||||
- Update to 0.9.16
|
||||
- Java viewers moved to
|
||||
https://github.com/LibVNC/libvncserver/tree/master/webclients/java-applet
|
||||
- classes and jars have been removed from upstream sources.
|
||||
- Remove support to EL5
|
||||
- Encoding and permissions of files seems that are correct, no need to fix.
|
||||
- rpmlint doesn't find any hardcoded rpath
|
||||
|
||||
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.14-13
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.14-12
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.14-11
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Mon Jan 14 2019 Björn Esser <besser82@fedoraproject.org> - 0.9.14-10
|
||||
- Rebuilt for libcrypt.so.2 (#1666033)
|
||||
|
||||
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.14-9
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.14-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Sat Jan 20 2018 Björn Esser <besser82@fedoraproject.org> - 0.9.14-7
|
||||
- Rebuilt for switch to libxcrypt
|
||||
|
||||
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.14-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||
|
||||
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.14-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Wed Feb 15 2017 Rex Dieter <rdieter@fedoraproject.org> - 0.9.14-4
|
||||
- rebuild (libvncserver)
|
||||
|
||||
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.14-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.14-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
* Mon Nov 30 2015 Pavel Alexeev <Pahan@Hubbitus.info> - 0.9.14-1
|
||||
- New upstream version 0.9.19.
|
||||
- bz#1118353 should be fixed.
|
||||
|
||||
* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.13-14
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.13-13
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
||||
|
||||
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.13-12
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||
* Mon Mar 01 2021 Petr Pisar <ppisar@redhat.com> - 0.9.13-12
|
||||
- Fix CVE-2020-29074 (insecure permissions on a shared memory) (bug #1933604)
|
||||
|
||||
* Sat Dec 28 2013 Rex Dieter <rdieter@fedoraproject.org> 0.9.13-11
|
||||
- enable avahi support and xfixes/xinerama/xrandr extensions... for real (#864947)
|
||||
|
|
@ -329,10 +206,10 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/x11vnc.desktop
|
|||
|
||||
* Sun Nov 1 2009 Pavel Alexeev <Pahan@Hubbitus.info> - 0.9.8-16
|
||||
- Noarch subpackage became only on Fedora
|
||||
( https://fedorahosted.org/fedora-infrastructure/ticket/1772#comment:4 )
|
||||
( https://fedorahosted.org/fedora-infrastructure/ticket/1772#comment:4 )
|
||||
- Also -javaviewers subpackage compleatly disabled on PPC arch on EL-5 because
|
||||
there no java-devel >= 1:1.6.0 and java-1.6.0-openjdk-devel.
|
||||
( https://fedorahosted.org/fedora-infrastructure/ticket/1772#comment:4 )
|
||||
there no java-devel >= 1:1.6.0 and java-1.6.0-openjdk-devel.
|
||||
( https://fedorahosted.org/fedora-infrastructure/ticket/1772#comment:4 )
|
||||
|
||||
* Tue Oct 6 2009 Pavel Alexeev <Pahan@Hubbitus.info> - 0.9.8-14
|
||||
- Make -javaviewers subpackage noarch.
|
||||
|
|
@ -348,7 +225,7 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/x11vnc.desktop
|
|||
- Remove %%doc marker from man-page.
|
||||
- %%defattr(-,root,root,0755) -> %%defattr(-,root,root,-)
|
||||
- Add classes/ssl/src/tight/README classes/ssl/src/ultra/README files into
|
||||
javaviewers subpackage %%doc (thank you Orcan Ogetbil)
|
||||
javaviewers subpackage %%doc (thank you Orcan Ogetbil)
|
||||
- ln -s replaced by %%{__ln_s}
|
||||
- Set License: GPLv2+ for javaviewers subpackage (Thanks Spot)
|
||||
|
||||
|
|
@ -362,7 +239,7 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/x11vnc.desktop
|
|||
* Wed Aug 26 2009 Pavel Alexeev <Pahan@Hubbitus.info> - 0.9.8-10
|
||||
- Fix some spelling, change some cosmetic things.
|
||||
- Delete Patch0 and hacks to link with system lzo package - it is not needed
|
||||
anymore as we link it with systel libvncserver instead.
|
||||
anymore as we link it with systel libvncserver instead.
|
||||
- Delete BR lzo-devel
|
||||
- Remiove empty directory %%{_datadir}/%%{name}/
|
||||
|
||||
|
|
@ -374,13 +251,13 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/x11vnc.desktop
|
|||
- Add BuildRequires: /usr/include/X11/extensions/XShm.h
|
||||
- Patch2: x11vnc-0.9.8-XShm-explicit-include.patch
|
||||
- Step to conditional BR for Fedora 12, add
|
||||
Patch2: x11vnc-0.9.8-XShm-explicit-include.patch to build on it.
|
||||
Patch2: x11vnc-0.9.8-XShm-explicit-include.patch to build on it.
|
||||
|
||||
* Tue Aug 4 2009 Pavel Alexeev <Pahan@Hubbitus.info> - 0.9.8-7
|
||||
- Change license to GPLv2 without plus according to x11vnc.c
|
||||
source (thanks to Christian Krause).
|
||||
source (thanks to Christian Krause).
|
||||
- For consistency macros usage replace "ln -s" by %%{__ln_s},
|
||||
mv by %%{__mv} and similar (chmod, sed).
|
||||
mv by %%{__mv} and similar (chmod, sed).
|
||||
- Change find call to avoid using xargs in chmod sources command.
|
||||
|
||||
* Wed Jul 29 2009 Pavel Alexeev <Pahan@Hubbitus.info> - 0.9.8-6
|
||||
|
|
@ -391,11 +268,11 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/x11vnc.desktop
|
|||
* Tue Jul 21 2009 Pavel Alexeev <Pahan@Hubbitus.info> - 0.9.8-5
|
||||
- Try use lzo instead of minilzo in EL-5 (minilzo is not bundled in it).
|
||||
- Try use system libvncserver library (--with-system-libvncserver
|
||||
configure option) instead of bundled one.
|
||||
configure option) instead of bundled one.
|
||||
- System libvncserver built without tightvnc-filetransfer support.
|
||||
Now disable it there (--without-filetransfer)
|
||||
And according to it change License to only GPLv2+
|
||||
./configure --help misleading, using --without-tightvnc-filetransfer
|
||||
Now disable it there (--without-filetransfer)
|
||||
And according to it change License to only GPLv2+
|
||||
./configure --help misleading, using --without-tightvnc-filetransfer
|
||||
|
||||
* Tue Jul 21 2009 Pavel Alexeev <Pahan@Hubbitus.info> - 0.9.8-4
|
||||
- All changes inspired by started Fedora Review (thank you to Christian Krause).
|
||||
|
|
@ -403,26 +280,26 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/x11vnc.desktop
|
|||
- Explicit mention previous author in changelog and delet old entries of it.
|
||||
- Source renamed to Source0.
|
||||
- Source0 URL changed to long (correct) variant:
|
||||
http://downloads.sourceforge.net/libvncserver/%%{name}-%%{version}.tar.gz
|
||||
was http://dl.sf.net/libvncserver/x11vnc-%%{version}.tar.gz
|
||||
http://downloads.sourceforge.net/libvncserver/%%{name}-%%{version}.tar.gz
|
||||
was http://dl.sf.net/libvncserver/x11vnc-%%{version}.tar.gz
|
||||
- Add BR: /usr/include/X11/extensions/XInput.h; In F12 it is located in
|
||||
libXi-devel but in previous versions in xorg-x11-proto-devel
|
||||
so, to do not make conditional requires, require explicit file.
|
||||
libXi-devel but in previous versions in xorg-x11-proto-devel
|
||||
so, to do not make conditional requires, require explicit file.
|
||||
- Remove prebuild binaries clients.
|
||||
- Remove Requires: minilzo it will be automatically propogated.
|
||||
- Add BR: libvncserver-devel
|
||||
|
||||
* Fri Jul 10 2009 Pavel Alexeev <Pahan@Hubbitus.info> - 0.9.8-3
|
||||
- Add BR openssl-devel to provide SSL capability (thanks Manuel Wolfshant).
|
||||
- Requires: minilzo, BR lzo-devel and Patch0:
|
||||
11vnc-0.9.8-use-system-minilzo.patch to use system version of library.
|
||||
- Requires: minilzo, BR lzo-devel and Patch0:
|
||||
11vnc-0.9.8-use-system-minilzo.patch to use system version of library.
|
||||
- Add "and GPLv2" to License. See comment above why.
|
||||
- Add BuildRequires: libXfixes-devel
|
||||
|
||||
* Fri Jul 10 2009 Pavel Alexeev <Pahan@Hubbitus.info> - 0.9.8-2
|
||||
- Import http://packages.sw.be/x11vnc/x11vnc-0.9.7-1.rf.src.rpm to maintain it in fedora:
|
||||
Packager: Dag Wieers <dag@wieers.com>
|
||||
Vendor: Dag Apt Repository, http://dag.wieers.com/apt/
|
||||
Packager: Dag Wieers <dag@wieers.com>
|
||||
Vendor: Dag Apt Repository, http://dag.wieers.com/apt/
|
||||
- Step to version 0.9.8
|
||||
- Reformat spec with tabs.
|
||||
- Comment out (leave for history) Packager and Vendor tags
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue