!60 [sync] PR-57: 【轻量级 PR】：rebuild for CVE-2023-1393

From: @openeuler-sync-bot 
Reviewed-by: @leeffo 
Signed-off-by: @leeffo

0001-Fix-some-translations-of-start-menu.patch

@@ -0,0 +1,75 @@
+From 8c41423d0da811043b2b6f7c1d0f01030e9d5a98 Mon Sep 17 00:00:00 2001
+From: longcheng <longcheng@kylinos.com.cn>
+Date: Wed, 16 Mar 2022 19:51:37 +0800
+Subject: [PATCH] Fix some translations of start menu
+
+---
+ po/zh_CN.po | 18 +++++++++++++-----
+ 1 file changed, 13 insertions(+), 5 deletions(-)
+
+diff --git a/po/zh_CN.po b/po/zh_CN.po
+index d22ebb5..7e172a2 100644
+--- a/po/zh_CN.po
++++ b/po/zh_CN.po
+@@ -449,7 +449,7 @@ msgstr "连接信息...(&I)"
+ #: vncviewer/Viewport.cxx:746
+ msgctxt "ContextMenu|"
+ msgid "About &TigerVNC viewer..."
+-msgstr "关于 &TigerVNC 查看器..."
++msgstr "关于 &VNC远程桌面客户端..."
+ 
+ #: vncviewer/Viewport.cxx:749
+ msgctxt "ContextMenu|"
+@@ -566,14 +566,14 @@ msgid ""
+ "Copyright (C) 1999-%d TigerVNC Team and many others (see README.txt)\n"
+ "See http://www.tigervnc.org for information on TigerVNC."
+ msgstr ""
+-"TigerVNC 查看器 %d 位 v%s\n"
++"VNC远程桌面客户端 %d 位 v%s\n"
+ "构建于：%s\n"
+ "版权所有 1999-%d TigerVNC 团队及众多开发者（参见 README.txt）\n"
+ "访问 http://www.tigervnc.org 以获取更多关于 TigerVNC 的信息。"
+ 
+ #: vncviewer/vncviewer.cxx:127
+ msgid "About TigerVNC Viewer"
+-msgstr "关于 TigerVNC 查看器"
++msgstr "关于VNC远程桌面客户端"
+ 
+ #: vncviewer/vncviewer.cxx:140
+ msgid "Internal FLTK error. Exiting."
+@@ -582,7 +582,7 @@ msgstr "FLTK 内部错误。现在将退出。"
+ #: vncviewer/vncviewer.cxx:158 vncviewer/vncviewer.cxx:170
+ #, c-format
+ msgid "Error starting new TigerVNC Viewer: %s"
+-msgstr "启动 TigerVNC 查看器出错：%s"
++msgstr "启动VNC远程桌面客户端：%s"
+ 
+ #: vncviewer/vncviewer.cxx:179
+ #, c-format
+@@ -591,7 +591,7 @@ msgstr "收到终端信号 %d 。TigerVNC 现在将退出。"
+ 
+ #: vncviewer/vncviewer.cxx:271
+ msgid "TigerVNC Viewer"
+-msgstr "TigerVNC 查看器"
++msgstr "VNC远程桌面客户端"
+ 
+ #: vncviewer/vncviewer.cxx:279
+ msgid "No"
+@@ -659,6 +659,14 @@ msgstr "-listen 及 -via 参数不兼容"
+ msgid "Listening on port %d"
+ msgstr "正在监听端口 %d"
+ 
++#: vncviewer/vncviewer.desktop.in.in:4
++msgid "Remote Desktop Viewer"
++msgstr "VNC远程桌面客户端"
++
++#: vncviewer/vncviewer.desktop.in.in:5
++msgid "Connect to VNC server and display remote desktop"
++msgstr "连接到VNC远程服务器并展示远程桌面"
++
+ #~ msgid "Unknown encoding %d"
+ #~ msgstr "未知编码 %d"
+ 
+-- 
+2.27.0
+

tigervnc.spec

@@ -4,7 +4,7 @@
 
 Name:           tigervnc
 Version:        1.12.0
-Release:        4
+Release:        9
 Summary:        A TigerVNC remote display system
 
 License:        GPLv2+
@@ -19,12 +19,14 @@ Source5:        xvnc.socket
 Source6:        HOWTO.md
 
 Patch0001:      tigervnc-xserver120.patch
+Patch0002:      0001-Fix-some-translations-of-start-menu.patch
 
 BuildRequires:  gcc-c++ systemd cmake automake autoconf gettext gettext-autopoint pixman-devel fltk-devel >= 1.3.3
 BuildRequires:  libX11-devel libtool libxkbfile-devel libpciaccess-devel libXinerama-devel libXfont2-devel
 BuildRequires:  libXext-devel xorg-x11-server-source libXi-devel libXdmcp-devel libxshmfence-devel
 BuildRequires:  xorg-x11-xtrans-devel xorg-x11-util-macros xorg-x11-server-devel libXtst-devel libdrm-devel libXt-devel
 BuildRequires:  openssl-devel mesa-libGL-devel freetype-devel desktop-file-utils java-devel jpackage-utils pam-devel gnutls-devel libjpeg-turbo-devel selinux-policy-devel
+BuildRequires:  xorg-x11-font-utils
 
 Requires(post): coreutils
 Requires(postun):coreutils
@@ -102,6 +104,7 @@ for all in `find . -type f -perm -001`; do
         chmod -x "$all"
 done
 popd
+%patch0002 -p1
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -fpic"
@@ -183,6 +186,14 @@ install -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/X11/xorg.conf.d/10-libvnc.c
 
 install -m 644 %{SOURCE6} %{buildroot}%{_docdir}/tigervnc/HOWTO.md
 
+%check
+pushd tests
+make %{?_smp_mflags}
+./unit/conv
+./unit/convertlf
+./unit/hostport
+./unit/pixelformat
+popd
 
 %files -f %{name}.lang
 %defattr(-,root,root)
@@ -236,6 +247,33 @@ install -m 644 %{SOURCE6} %{buildroot}%{_docdir}/tigervnc/HOWTO.md
 %{_mandir}/man8/*
 
 %changelog
+* Tue May 23 2023 zhouyihang <zhouyihang3@h-partners.com> - 1.12.0-9
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:rebuild for CVE-2023-1393
+
+* Thu Mar 09 2023 Lvcongqing <lvcongqing@uniontech.com> - 1.12.0-8
+- add BR xorg-x11-font-utils(fix issue:I6L35B)
+
+* Sat Jun 11 2022 gaihuiying <eaglegai@163.com> - 1.12.0-7
+- Type:bugfix
+- CVE:NA
+- SUG:NA
+- DESC: enable test
+
+* Thu Apr 14 2022 ouyangminxiang <ouyangminxiang@kylinsec.com.cn> - 1.12.0-6
+- Type:translation
+- ID:NA
+- SUG:NA
+- DESC:fix some translation of start menu
+
+* Tue Apr 12 2022 gaihuiying <eaglegai@163.com> - 1.12.0-5
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:fix vncserver unrecognized option rfbwait
+
 * Tue Apr 12 2022 gaihuiying <eaglegai@163.com> - 1.12.0-4
 - Type:bugfix
 - ID:NA

vncserver

@@ -194,7 +194,6 @@ $default_opts{auth} = &quotedString($xauthorityFile);
 $default_opts{geometry} = $geometry if ($geometry);
 $default_opts{depth} = $depth if ($depth);
 $default_opts{pixelformat} = $pixelformat if ($pixelformat);
-$default_opts{rfbwait} = 30000;
 $default_opts{rfbauth} = "$vncUserDir/passwd";
 $default_opts{rfbport} = $vncPort;
 $default_opts{fp} = $fontPath if ($fontPath);
@@ -894,4 +893,4 @@ sub NotifyAboutDeprecation
 {
     warn "\nWARNING: vncserver has been replaced by a systemd unit and is now considered deprecated and removed in upstream.\n";
     warn "Please read /usr/share/doc/tigervnc/HOWTO.md for more information.\n";
-}
+}