- updated to 1.12.0

- removed obsolete passwd-crash-with-malloc-checks,getmaster patches
- updated xserver-1.21 patch

diff --git a/tigervnc-getmaster.patch b/tigervnc-getmaster.patch
deleted file mode 100644 (file)
index 6ef99b4..0000000
--- a/tigervnc-getmaster.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-diff --git a/unix/xserver/hw/vnc/InputXKB.c b/unix/xserver/hw/vnc/InputXKB.c
-index f84a6e4..4eac939 100644
---- a/unix/xserver/hw/vnc/InputXKB.c
-+++ b/unix/xserver/hw/vnc/InputXKB.c
-@@ -226,10 +226,7 @@ void vncPrepareInputDevices(void)
- 
- unsigned vncGetKeyboardState(void)
- {
--      DeviceIntPtr master;
--
--      master = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT);
--      return XkbStateFieldFromRec(&master->key->xkbInfo->state);
-+      return XkbStateFieldFromRec(&vncKeyboardDev->master->key->xkbInfo->state);
- }
- 
- unsigned vncGetLevelThreeMask(void)
-@@ -250,7 +247,7 @@ unsigned vncGetLevelThreeMask(void)
-                       return 0;
-       }
- 
--      xkb = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
-+      xkb = vncKeyboardDev->master->key->xkbInfo->desc;
- 
-       act = XkbKeyActionPtr(xkb, keycode, state);
-       if (act == NULL)
-@@ -275,7 +272,7 @@ KeyCode vncPressShift(void)
-       if (state & ShiftMask)
-               return 0;
- 
--      xkb = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
-+      xkb = vncKeyboardDev->master->key->xkbInfo->desc;
-       for (key = xkb->min_key_code; key <= xkb->max_key_code; key++) {
-               XkbAction *act;
-               unsigned char mask;
-@@ -315,7 +312,7 @@ size_t vncReleaseShift(KeyCode *keys, size_t maxKeys)
- 
-       count = 0;
- 
--      master = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT);
-+      master = vncKeyboardDev->master;
-       xkb = master->key->xkbInfo->desc;
-       for (key = xkb->min_key_code; key <= xkb->max_key_code; key++) {
-               XkbAction *act;
-@@ -371,7 +368,7 @@ KeyCode vncPressLevelThree(void)
-                       return 0;
-       }
- 
--      xkb = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
-+      xkb = vncKeyboardDev->master->key->xkbInfo->desc;
- 
-       act = XkbKeyActionPtr(xkb, keycode, state);
-       if (act == NULL)
-@@ -402,7 +399,7 @@ size_t vncReleaseLevelThree(KeyCode *keys, size_t maxKeys)
- 
-       count = 0;
- 
--      master = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT);
-+      master = vncKeyboardDev->master;
-       xkb = master->key->xkbInfo->desc;
-       for (key = xkb->min_key_code; key <= xkb->max_key_code; key++) {
-               XkbAction *act;
-@@ -447,7 +444,7 @@ KeyCode vncKeysymToKeycode(KeySym keysym, unsigned state, unsigned *new_state)
-               *new_state = state;
- 
-       fallback = 0;
--      xkb = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
-+      xkb = vncKeyboardDev->master->key->xkbInfo->desc;
-       for (key = xkb->min_key_code; key <= xkb->max_key_code; key++) {
-               unsigned int state_out;
-               KeySym dummy;
-@@ -551,7 +548,7 @@ int vncIsAffectedByNumLock(KeyCode keycode)
-       if (numlock_keycode == 0)
-               return 0;
- 
--      xkb = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
-+      xkb = vncKeyboardDev->master->key->xkbInfo->desc;
- 
-       act = XkbKeyActionPtr(xkb, numlock_keycode, state);
-       if (act == NULL)
-@@ -585,7 +582,7 @@ KeyCode vncAddKeysym(KeySym keysym, unsigned state)
-       KeySym *syms;
-       KeySym upper, lower;
- 
--      master = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT);
-+      master = vncKeyboardDev->master;
-       xkb = master->key->xkbInfo->desc;
-       for (key = xkb->max_key_code; key >= xkb->min_key_code; key--) {
-               if (XkbKeyNumGroups(xkb, key) == 0)

diff --git a/tigervnc-passwd-crash-with-malloc-checks.patch b/tigervnc-passwd-crash-with-malloc-checks.patch
deleted file mode 100644 (file)
index 7377822..0000000
--- a/tigervnc-passwd-crash-with-malloc-checks.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff --git a/common/rfb/Password.cxx b/common/rfb/Password.cxx
-index e4a508c..f555c57 100644
---- a/common/rfb/Password.cxx
-+++ b/common/rfb/Password.cxx
-@@ -55,7 +55,7 @@ PlainPasswd::~PlainPasswd() {
- 
- void PlainPasswd::replaceBuf(char* b) {
-   if (buf)
--    memset(buf, 0, strlen(buf));
-+    memset(buf, 0, length ? length : strlen(buf));
-   CharArray::replaceBuf(b);
- }
- 
-diff --git a/common/rfb/util.h b/common/rfb/util.h
-index 3100f90..764692a 100644
---- a/common/rfb/util.h
-+++ b/common/rfb/util.h
-@@ -51,16 +51,21 @@ namespace rfb {
-     CharArray() : buf(0) {}
-     CharArray(char* str) : buf(str) {} // note: assumes ownership
-     CharArray(size_t len) {
-+      length = len;
-       buf = new char[len]();
-     }
-     ~CharArray() {
--      delete [] buf;
-+      if (buf) {
-+        delete [] buf;
-+        buf = nullptr;
-+      }
-     }
-     void format(const char *fmt, ...) __printf_attr(2, 3);
-     // Get the buffer pointer & clear it (i.e. caller takes ownership)
-     char* takeBuf() {char* tmp = buf; buf = 0; return tmp;}
--    void replaceBuf(char* b) {delete [] buf; buf = b;}
-+    void replaceBuf(char* b) {if (buf) delete [] buf; buf = b;}
-     char* buf;
-+    size_t length = 0;
-   private:
-     CharArray(const CharArray&);
-     CharArray& operator=(const CharArray&);

diff --git a/tigervnc.spec b/tigervnc.spec
index 4802e80dff12f3eb98741029adce165bf54429da..46778ea120deae609a4097082d26a51b5f4a32d3 100644 (file)
--- a/tigervnc.spec
+++ b/tigervnc.spec
@@ -3,17 +3,16 @@
 Summary:       A TigerVNC remote display system
 Summary(pl.UTF-8):     System zdalnego dostępu TigerVNC
 Name:          tigervnc
-Version:       1.11.0
-Release:       5
+Version:       1.12.0
+Release:       1
 License:       GPL v2
 Group:         X11/Applications/Networking
+#Source0Download: https://github.com/TigerVNC/tigervnc/releases
 Source0:       https://github.com/TigerVNC/tigervnc/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 07f5e217f288c515effb083896e65054
+# Source0-md5: e92945f43654e2a120f2c9d8b3a9b869
 Source1:       %{name}.desktop
 Source2:       vncserver.init
 Source3:       vncserver.sysconfig
-Patch1:                %{name}-passwd-crash-with-malloc-checks.patch
-Patch2:                %{name}-getmaster.patch
 Patch4:                %{name}-shebang.patch
 Patch5:                xserver-1.21.patch
 Patch100:      xserver.patch
@@ -23,7 +22,9 @@ BuildRequires:        ImageMagick-coder-png
 BuildRequires: ImageMagick-coder-svg
 BuildRequires: Mesa-libGL-devel >= 7.8.1
 BuildRequires: cpp
+BuildRequires: cmake >= 3.4.0
 BuildRequires: fltk-devel
+BuildRequires: gettext-tools
 BuildRequires: gnutls-devel
 BuildRequires: libjpeg-turbo-devel
 BuildRequires: xorg-xserver-server-source >= %{xversion}
@@ -174,8 +175,6 @@ zdalny dostęp do pulpitu.
 
 %prep
 %setup -q
-%patch1 -p1
-%patch2 -p1
 %patch4 -p1
 
 cp -a %{_usrsrc}/xorg-xserver-server-%{_xserverver}/* unix/xserver
@@ -221,8 +220,7 @@ cd unix/xserver
 %{__make}
 cd -
 
-cd media
-%{__make}
+%{__make} -C media
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -232,10 +230,10 @@ install -d $RPM_BUILD_ROOT%{_iconsdir}/hicolor/{16x16,22x22,24x24,32x32,48x48,sc
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-cd unix/xserver/hw/vnc
-%{__make} install \
+%{__make} -C unix/xserver/hw/vnc install \
        DESTDIR=$RPM_BUILD_ROOT
-cd -
+
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/libvnc.la
 
 cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 

diff --git a/xserver-1.21.patch b/xserver-1.21.patch
index bf6989d6b2f0570f73f5016e2f353c1cec61205f..c221910f07efd90c1cddf636201ec004805016ad 100644 (file)
--- a/xserver-1.21.patch
+++ b/xserver-1.21.patch
@@ -1,20 +1,19 @@
---- tigervnc-1.11.0/unix/xserver/hw/vnc/xorg-version.h~        2020-09-08 14:16:08.000000000 +0200
-+++ tigervnc-1.11.0/unix/xserver/hw/vnc/xorg-version.h 2021-11-03 16:04:19.496096213 +0100
-@@ -36,8 +36,10 @@
- #define XORG 119
- #elif XORG_VERSION_CURRENT < ((1 * 10000000) + (20 * 100000) + (99 * 1000))
- #define XORG 120
-+#elif XORG_VERSION_CURRENT < ((1 * 10000000) + (21 * 100000) + (99 * 1000))
-+#define XORG 120
- #else
+--- tigervnc-1.12.0/unix/xserver/hw/vnc/xorg-version.h.orig    2022-07-14 14:47:19.295275332 +0200
++++ tigervnc-1.12.0/unix/xserver/hw/vnc/xorg-version.h 2022-07-14 16:04:12.530283292 +0200
+@@ -33,8 +33,8 @@
+ #error "X.Org older than 1.16 is not supported"
+ #endif
+ 
+-#if XORG_AT_LEAST(1, 21, 0)
 -#error "X.Org newer than 1.20 is not supported"
++#if XORG_AT_LEAST(1, 22, 0)
 +#error "X.Org newer than 1.21 is not supported"
  #endif
  
  #endif
---- tigervnc-1.11.0/unix/xserver/hw/vnc/xvnc.c.orig    2021-11-03 16:05:33.000000000 +0100
-+++ tigervnc-1.11.0/unix/xserver/hw/vnc/xvnc.c 2021-11-06 10:46:56.759091419 +0100
-@@ -80,7 +80,14 @@
+--- tigervnc-1.12.0/unix/xserver/hw/vnc/xvnc.c.orig    2021-11-09 08:51:28.000000000 +0100
++++ tigervnc-1.12.0/unix/xserver/hw/vnc/xvnc.c 2022-07-14 16:04:32.873506417 +0200
+@@ -69,7 +69,14 @@ extern char buildtime[];
  #undef VENDOR_RELEASE
  #undef VENDOR_STRING
  #include "version-config.h"
@@ -28,9 +27,9 @@
 +#define DEFAULT_LOG_FILE_VERBOSITY    3
 +#endif
  
- #define XVNCVERSION "TigerVNC 1.11.0"
- #define XVNCCOPYRIGHT ("Copyright (C) 1999-2020 TigerVNC Team and many others (see README.rst)\n" \
-@@ -155,8 +162,7 @@
+ #define XVNCVERSION "TigerVNC 1.12.0"
+ #define XVNCCOPYRIGHT ("Copyright (C) 1999-2021 TigerVNC Team and many others (see README.rst)\n" \
+@@ -117,8 +124,7 @@ static void
  vncPrintBanner(void)
  {
      ErrorF("\nXvnc %s - built %s\n%s", XVNCVERSION, buildtime, XVNCCOPYRIGHT);