From: buildmaster Date: Sat, 4 Jul 2020 13:31:36 +0000 (+0200) Subject: New release X-Git-Url: https://repo.cephalix.eu/gitweb/?a=commitdiff_plain;h=1eded803110b4b56f3ae667d25f46d9175307e6c;p=UltraVNC.git New release --- diff --git a/Makefile b/Makefile index a9b18a0..b1304c7 100644 --- a/Makefile +++ b/Makefile @@ -21,7 +21,7 @@ package: mv oss-pkg-$(PACKAGE).tar.bz2 /usr/src/packages/SOURCES/ cp server/* /usr/src/packages/SOURCES/ rpmbuild -bb oss-pkg-$(PACKAGE).spec - rm -f $(REPO)/noarch/oss-pkg-$(PACKAGE)-*-*.noarch.rpm + #rm -f $(REPO)/noarch/oss-pkg-$(PACKAGE)-*-*.noarch.rpm mv /usr/src/packages/RPMS/noarch/oss-pkg-$(PACKAGE)-$(VERSION)-$(NRELEASE).noarch.rpm $(REPO)/noarch echo $(NRELEASE) > RELEASE git commit -a -m "New release" diff --git a/RELEASE b/RELEASE index b4de394..48082f7 100644 --- a/RELEASE +++ b/RELEASE @@ -1 +1 @@ -11 +12 diff --git a/VERSION b/VERSION index 9a83513..a39cbb3 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.22 +1.2.40 diff --git a/oss-pkg-UltraVnc.spec.in b/oss-pkg-UltraVnc.spec.in index f093fec..895e228 100644 --- a/oss-pkg-UltraVnc.spec.in +++ b/oss-pkg-UltraVnc.spec.in @@ -4,7 +4,7 @@ # Name: oss-pkg-PACKAGE -Summary: Package to install PACKAGE on OSS-Clients +Summary: Package to install PACKAGE on CRANIX-Clients Version: VERSION Release: RELEASE License: GPL-2.0 @@ -15,8 +15,8 @@ Source: %{name}.tar.bz2 Source1: vncsnapshot Source2: ultravncpw.pl Source3: get_screenshot.sh -Source4: oss_get_screenshots.sh -Source5: oss_get_screenshots.service +Source4: crx_get_screenshots.sh +Source5: crx_get_screenshots.service Source6: 110-open-fw-for-vnc.sh BuildArch: noarch BuildRequires:unzip @@ -24,11 +24,12 @@ Requires: xorg-x11-Xvnc Requires: filesystem Requires: perl-Crypt-DES PreReq: salt-master +Requires: cranix-base PreReq: %fillup_prereq BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -Package to install PACKAGE on OSS-Clients +Package to install PACKAGE on CRANIX-Clients Authors: -------- @@ -49,13 +50,13 @@ cp PACKAGE.sls %{buildroot}/srv/salt/packages/ cp -a repo-ng/* %{buildroot}/srv/salt/win/repo-ng/PACKAGE #Server stuff -mkdir -p %{buildroot}/usr/share/oss/vnc/ -install -m 755 %{SOURCE1} %{buildroot}/usr/share/oss/vnc/ -install -m 755 %{SOURCE2} %{buildroot}/usr/share/oss/vnc/ -install -m 755 %{SOURCE3} %{buildroot}/usr/share/oss/vnc/ +mkdir -p %{buildroot}/usr/share/cranix/vnc/ +install -m 755 %{SOURCE1} %{buildroot}/usr/share/cranix/vnc/ +install -m 755 %{SOURCE2} %{buildroot}/usr/share/cranix/vnc/ +install -m 755 %{SOURCE3} %{buildroot}/usr/share/cranix/vnc/ -mkdir -p %{buildroot}/usr/share/oss/plugins/clients/start/ -install -m 755 %{SOURCE6} %{buildroot}/usr/share/oss/plugins/clients/start/ +mkdir -p %{buildroot}/usr/share/cranix/plugins/clients/start/ +install -m 755 %{SOURCE6} %{buildroot}/usr/share/cranix/plugins/clients/start/ mkdir -p %{buildroot}/usr/sbin install -m 755 %{SOURCE4} %{buildroot}/usr/sbin/ @@ -67,43 +68,47 @@ install -m 755 %{SOURCE5} %{buildroot}/usr/lib/systemd/system/ rm -rf %{buildroot} %pre -%service_add_pre oss_get_screenshots.service +%service_add_pre crx_get_screenshots.service %preun -%service_del_preun oss_get_screenshots.service +%service_del_preun crx_get_screenshots.service %post -%service_add_post oss_get_screenshots.service -if [ ! -e /var/adm/oss/vncpwd/VNCPW1 ] +%service_add_post crx_get_screenshots.service +if [ ! -e /var/adm/cranix/vncpwd/VNCPW1 ] then - VNCPW1=$( mktemp -q XXXXXXXX ) - VNCPW2=$( mktemp -q XXXXXXXX ) - mkdir -m 750 /var/adm/oss/vncpwd/ - echo $VNCPW1 > /var/adm/oss/vncpwd/VNCPW1.txt - echo $VNCPW2 > /var/adm/oss/vncpwd/VNCPW2.txt - echo $VNCPW1 | vncpasswd -f > /var/adm/oss/vncpwd/VNCPW1 - echo $VNCPW2 | vncpasswd -f > /var/adm/oss/vncpwd/VNCPW2 - UVNCPW1=$( /usr/share/oss/vnc/ultravncpw.pl --password $VNCPW1 ) - UVNCPW2=$( /usr/share/oss/vnc/ultravncpw.pl --password $VNCPW2 ) - chmod 600 /var/adm/oss/vncpwd/* - echo -ne "[ultravnc]\r\n" > /srv/salt/win/repo-ng/PACKAGE/ultravnc.ini - echo -ne "passwd=${UVNCPW1}00\r\n" >> /srv/salt/win/repo-ng/PACKAGE/ultravnc.ini - echo -ne "passwd2=${UVNCPW2}00\r\n" >> /srv/salt/win/repo-ng/PACKAGE/ultravnc.ini + if [ -d /var/adm/oss/vncpwd/VNCPW1 ]; then + rsync -aAv /var/adm/oss/vncpwd/ /var/adm/cranix/vncpwd/ + else + VNCPW1=$( mktemp -q XXXXXXXX ) + VNCPW2=$( mktemp -q XXXXXXXX ) + mkdir -m 750 /var/adm/cranix/vncpwd/ + echo $VNCPW1 > /var/adm/cranix/vncpwd/VNCPW1.txt + echo $VNCPW2 > /var/adm/cranix/vncpwd/VNCPW2.txt + echo $VNCPW1 | vncpasswd -f > /var/adm/cranix/vncpwd/VNCPW1 + echo $VNCPW2 | vncpasswd -f > /var/adm/cranix/vncpwd/VNCPW2 + UVNCPW1=$( /usr/share/cranix/vnc/ultravncpw.pl --password $VNCPW1 ) + UVNCPW2=$( /usr/share/cranix/vnc/ultravncpw.pl --password $VNCPW2 ) + chmod 600 /var/adm/cranix/vncpwd/* + echo -ne "[ultravnc]\r\n" > /srv/salt/win/repo-ng/PACKAGE/ultravnc.ini + echo -ne "passwd=${UVNCPW1}00\r\n" >> /srv/salt/win/repo-ng/PACKAGE/ultravnc.ini + echo -ne "passwd2=${UVNCPW2}00\r\n" >> /srv/salt/win/repo-ng/PACKAGE/ultravnc.ini + fi fi -/usr/sbin/oss_api_post_file.sh 'softwares/add' /srv/salt/win/repo-ng/PACKAGE/HASH.json -systemctl enable oss_get_screenshots.service -systemctl start oss_get_screenshots.service +/usr/sbin/cranix_api_post_file.sh 'softwares/add' /srv/salt/win/repo-ng/PACKAGE/HASH.json +systemctl enable crx_get_screenshots.service +systemctl start crx_get_screenshots.service %postun -%service_del_postun oss_get_screenshots.service +%service_del_postun crx_get_screenshots.service %files %defattr(644,root,root) /srv/salt/win/repo-ng/PACKAGE /srv/salt/packages/PACKAGE.sls -/usr/lib/systemd/system/oss_* +/usr/lib/systemd/system/crx_* %defattr(755,root,root) -/usr/share/oss/vnc -/usr/share/oss/plugins/clients/start/* -/usr/sbin/oss_* +/usr/share/cranix/vnc +/usr/share/cranix/plugins/clients/start/* +/usr/sbin/crx_* diff --git a/repo-ng/UltraVNC_1_2_22_X64_Setup.exe b/repo-ng/UltraVNC_1_2_22_X64_Setup.exe deleted file mode 100755 index f8a0e0a..0000000 Binary files a/repo-ng/UltraVNC_1_2_22_X64_Setup.exe and /dev/null differ diff --git a/repo-ng/UltraVNC_1_2_22_X86_Setup.exe b/repo-ng/UltraVNC_1_2_22_X86_Setup.exe deleted file mode 100755 index 1f5d71a..0000000 Binary files a/repo-ng/UltraVNC_1_2_22_X86_Setup.exe and /dev/null differ diff --git a/server/oss_get_screenshots.service b/server/crx_get_screenshots.service similarity index 72% rename from server/oss_get_screenshots.service rename to server/crx_get_screenshots.service index ac7f84a..fe52d73 100755 --- a/server/oss_get_screenshots.service +++ b/server/crx_get_screenshots.service @@ -5,8 +5,8 @@ After=basic.target network.target syslog.target salt-master.service [Service] Restart=on-failure -ExecStartPre=/usr/bin/mkdir -p /srv/www/admin/screenShots -ExecStart=/usr/sbin/oss_get_screenshots.sh +ExecStartPre=/usr/bin/mkdir -p /var/adm/cranix/screenShots +ExecStart=/usr/sbin/crx_get_screenshots.sh LimitNOFILE=16384 TasksMax=infinity diff --git a/server/crx_get_screenshots.sh b/server/crx_get_screenshots.sh new file mode 100755 index 0000000..9418331 --- /dev/null +++ b/server/crx_get_screenshots.sh @@ -0,0 +1,16 @@ +#!/bin/bash + +. /etc/sysconfig/cranix +mkdir -p /var/adm/screenShots/ +mkdir -p /run/getScreenShots/ +while /bin/true +do + if [ -d /var/adm/cranix/running/ ]; then + for i in $( ls /var/adm/cranix/running/ ) + do + /usr/share/cranix/vnc/get_screenshot.sh ${i/.$SCHOOL_DOMAIN/} & + done + fi + sleep 4 +done + diff --git a/server/get_screenshot.sh b/server/get_screenshot.sh index c29665a..62f8c17 100755 --- a/server/get_screenshot.sh +++ b/server/get_screenshot.sh @@ -7,6 +7,6 @@ if [ -e "${PIDF}" ]; then fi echo $$ > /run/getScreenShots/${CLIENT} IP=$( host ${CLIENT} | gawk '{ print $4 }') -/usr/share/oss/vnc/vncsnapshot -quality 20 -passwd /var/adm/oss/vncpwd/VNCPW1 ${IP} /srv/www/admin/screenShots/${CLIENT}.jpg &> /dev/null +/usr/share/cranix/vnc/vncsnapshot -quality 20 -passwd /var/adm/cranix/vncpwd/VNCPW1 ${IP} /var/adm/cranix/screenShots/${CLIENT}.jpg &> /dev/null rm -f $PIDF diff --git a/server/oss_get_screenshots.sh b/server/oss_get_screenshots.sh deleted file mode 100755 index 3f3e635..0000000 --- a/server/oss_get_screenshots.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash - -. /etc/sysconfig/schoolserver -mkdir -p /srv/www/admin/screenShots/ -mkdir -p /run/getScreenShots/ -while /bin/true -do - if [ -d /var/adm/oss/running/ ]; then - for i in $( ls /var/adm/oss/running/ ) - do - /usr/share/oss/vnc/get_screenshot.sh ${i/.$SCHOOL_DOMAIN/} & - done - fi - sleep 4 -done -