commit tigervnc for openSUSE:Factory
Hello community, here is the log from the commit of package tigervnc for openSUSE:Factory checked in at 2018-03-04 11:53:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tigervnc (Old) and /work/SRC/openSUSE:Factory/.tigervnc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "tigervnc" Sun Mar 4 11:53:31 2018 rev:48 rq:581689 version:1.8.0 Changes: -------- --- /work/SRC/openSUSE:Factory/tigervnc/tigervnc.changes 2017-12-22 12:17:18.114635866 +0100 +++ /work/SRC/openSUSE:Factory/.tigervnc.new/tigervnc.changes 2018-03-04 11:53:31.744145115 +0100 @@ -1,0 +2,5 @@ +Wed Feb 28 12:19:52 UTC 2018 - msrb@suse.com + +- Replace SuSEFirewall2 by firewalld. (bnc#1081952) + +------------------------------------------------------------------- Old: ---- vnc-httpd.firewall vnc-server.firewall New: ---- tigervnc-https.firewalld tigervnc.firewalld vnc-httpd.susefirewall vnc-server.susefirewall ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tigervnc.spec ++++++ --- /var/tmp/diff_new_pack.5tpvsU/_old 2018-03-04 11:53:32.588114736 +0100 +++ /var/tmp/diff_new_pack.5tpvsU/_new 2018-03-04 11:53:32.592114592 +0100 @@ -1,7 +1,7 @@ # # spec file for package tigervnc # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,6 +24,12 @@ %define _unitdir %{_prefix}/lib/systemd/system +%if 0%{?suse_version} >= 1500 +%define use_firewalld 1 +%else +%define use_firewalld 0 +%endif + Name: tigervnc Version: 1.8.0 Release: 0 @@ -106,8 +112,8 @@ Group: System/X11/Servers/XF86_4 Source1: https://github.com/TigerVNC/tigervnc/archive/v%{version}.tar.gz Source4: 10-libvnc.conf -Source5: vnc-server.firewall -Source6: vnc-httpd.firewall +Source5: vnc-server.susefirewall +Source6: vnc-httpd.susefirewall Source7: vnc.reg Source8: vncpasswd.arg Source9: vnc.pam @@ -118,6 +124,8 @@ Source14: xvnc.socket Source15: xvnc-novnc.service Source16: xvnc-novnc.socket +Source17: tigervnc.firewalld +Source18: tigervnc-https.firewalld Patch1: tigervnc-newfbsize.patch Patch2: tigervnc-clean-pressed-key-on-exit.patch @@ -290,8 +298,15 @@ %ifnarch s390x install -D -m 644 %{SOURCE4} $RPM_BUILD_ROOT/etc/X11/xorg.conf.d/10-libvnc.conf %endif -install -D -m 644 %{SOURCE5} $RPM_BUILD_ROOT/etc/sysconfig/SuSEfirewall2.d/services/vnc-server -install -D -m 644 %{SOURCE6} $RPM_BUILD_ROOT/etc/sysconfig/SuSEfirewall2.d/services/vnc-httpd + +%if %{use_firewalld} +install -D -m 644 %{SOURCE17} $RPM_BUILD_ROOT%{_libexecdir}/firewalld/services/tigervnc.xml +install -D -m 644 %{SOURCE18} $RPM_BUILD_ROOT%{_libexecdir}/firewalld/services/tigervnc-https.xml +%else +install -D -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/vnc-server +install -D -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/vnc-httpd +%endif + install -D -m 644 %{SOURCE7} $RPM_BUILD_ROOT/etc/slp.reg.d/vnc.reg install -D -m 755 %{SOURCE8} $RPM_BUILD_ROOT%{_bindir}/vncpasswd.arg install -D -m 644 %{SOURCE9} $RPM_BUILD_ROOT/etc/pam.d/vnc @@ -435,8 +450,15 @@ %exclude /var/lib/xkb/compiled/README.compiled +%if %{use_firewalld} +%dir %{_libexecdir}/firewalld +%dir %{_libexecdir}/firewalld/services +%{_libexecdir}/firewalld/services/tigervnc.xml +%{_libexecdir}/firewalld/services/tigervnc-https.xml +%else %config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/vnc-server %config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/vnc-httpd +%endif %ifnarch s390 s390x %config(noreplace) /etc/X11/xorg.conf.d/10-libvnc.conf ++++++ tigervnc-https.firewalld ++++++ <?xml version="1.0" encoding="utf-8"?> <service> <short>VNC over HTTPS</short> <description>The xvnc-novnc servers a web-based VNC viewer over HTTPS. Allows accessing VNC using any modern browser. It displays VNC display :1.</description> <port protocol="tcp" port="5801"/> </service> ++++++ tigervnc.firewalld ++++++ <?xml version="1.0" encoding="utf-8"?> <service> <short>VNC display :1</short> <description>VNC is protocol for remote desktop. The TigerVNC service and the vncmanager service use VNC display number :1.</description> <port protocol="tcp" port="5901"/> </service> ++++++ vnc-httpd.susefirewall ++++++ ## Name: VNC mini-HTTP server ## Description: Opens the VNC HTTP ports so that browsers can connect. TCP="5800:5899" ++++++ vnc-server.susefirewall ++++++ ## Name: VNC ## Description: Opens VNC server ports so that viewers can connect. TCP="5900:5999"
participants (1)
-
root@hilbert.suse.de