Merge pull request #22 from kasmtech/create_fedora_package

Create fedora package

builder/build-tarball

@@ -3,8 +3,13 @@
 set -e
 
 build_www_dir() {
-  docker build -t kasmweb/www -f builder/dockerfile.www.build .
+  local webpacked_www=$PWD/builder/www
-  docker run --rm -v $PWD/builder/www:/build kasmweb/www:latest
+  local src_www=kasmweb
+
+  if [ "$src_www" -nt "$webpacked_www" ]; then
+    docker build -t kasmweb/www -f builder/dockerfile.www.build .
+    docker run --rm -v $PWD/builder/www:/build kasmweb/www:latest
+  fi
 }
 
 shared_with_docker_dir=${GITLAB_SHARED_DIND_DIR:-/tmp}

builder/build.sh

@@ -63,7 +63,7 @@ ln -s /src/unix/xserver/hw/vnc/Xvnc Xvnc
 cd ..
 mkdir -p man/man1
 touch man/man1/Xserver.1
-touch man/man1/Xvnc.1
+cp /src/unix/xserver/hw/vnc/Xvnc.man man/man1/Xvnc.1
 mkdir lib
 cd lib
 if [ -d /usr/lib/x86_64-linux-gnu/dri ]; then

builder/dockerfile.centos_core.barebones.rpm.test

@@ -1,7 +1,6 @@
 FROM centos:centos7
 
-RUN yum install -y epel-release && yum install -y openbox xterm
+RUN yum install -y xterm
-RUN yum erase -y pm-utils xscreensaver*
 RUN yum install -y vim less
 
 ARG KASMVNC_PACKAGE_DIR
@@ -12,8 +11,7 @@ RUN useradd -m foo
 
 USER foo:kasmvnc
 
-RUN mkdir -p ~/.config/openbox && echo xterm > ~/.config/openbox/autostart && chmod +x ~/.config/openbox/autostart
+RUN mkdir ~/.vnc && echo '/usr/bin/xterm &' >> ~/.vnc/xstartup && \
-RUN mkdir ~/.vnc && echo '/usr/bin/openbox-session &' >> ~/.vnc/xstartup && \
   chmod +x ~/.vnc/xstartup
 RUN echo bar | kasmvncpasswd -f > $HOME/.kasmpasswd && chmod 0600 $HOME/.kasmpasswd
 

builder/dockerfile.centos_core.rpm.test

@@ -52,7 +52,7 @@ RUN yum localinstall -y /tmp/*.rpm
 ### END CUSTOM STUFF ###
 
 RUN chown -R 1000:0 $HOME
-USER 1000:kasmvnc
+USER 1000:kasmvnc-cert
 WORKDIR $HOME
 
 RUN mkdir ~/.vnc && echo '/usr/bin/xfce4-session &' >> ~/.vnc/xstartup && \

builder/dockerfile.debian_bullseye.deb.build

@@ -7,6 +7,6 @@ RUN apt-get update && \
 
 # Install build-deps for the package.
 COPY ./debian/control /tmp
-RUN echo YYY | mk-build-deps --install --remove /tmp/control
+RUN apt-get update && echo YYY | mk-build-deps --install --remove /tmp/control
 
 USER 1000

builder/dockerfile.debian_bullseye.deb.test

@@ -29,7 +29,7 @@ WORKDIR $HOME
 
 ### REQUIRED STUFF ###
 
-RUN apt-get update && apt-get install -y supervisor xfce4 xfce4-terminal xterm libnss-wrapper gettext wget
+RUN apt-get update && apt-get install -y supervisor xfce4 xfce4-terminal dbus-x11 xterm libnss-wrapper gettext wget
 RUN apt-get purge -y pm-utils xscreensaver*
 RUN apt-get update && apt-get install -y vim less
 

builder/dockerfile.debian_buster.barebones.deb.test

@@ -3,10 +3,15 @@ FROM debian:buster-slim
 ARG KASMVNC_PACKAGE_DIR
 COPY $KASMVNC_PACKAGE_DIR/kasmvncserver_*.deb /tmp
 RUN apt-get update && dpkg -i /tmp/*.deb; apt-get -yf install
-RUN apt-get update && apt-get -y install x11-xserver-utils xterm twm
+RUN apt-get update && apt-get -y install xterm
+# RUN apt-get update && apt-get -y install x11-xserver-utils xterm twm
 
-RUN useradd -m docker && addgroup docker ssl-cert
+RUN useradd -m foo && addgroup foo ssl-cert
 
-USER docker
+USER foo
+
+RUN mkdir ~/.vnc && echo '/usr/bin/xterm &' >> ~/.vnc/xstartup && \
+  chmod +x ~/.vnc/xstartup
+RUN echo bar | kasmvncpasswd -f > $HOME/.kasmpasswd && chmod 0600 $HOME/.kasmpasswd
 
 ENTRYPOINT bash -c "vncserver :1 -interface 0.0.0.0 && vncserver -kill :1 && vncserver :1 -depth 24 -geometry 1280x1050 -websocketPort 8443 -cert /etc/ssl/certs/ssl-cert-snakeoil.pem -key /etc/ssl/private/ssl-cert-snakeoil.key -sslOnly -FrameRate=24 -interface 0.0.0.0 -httpd /usr/share/kasmvnc/www && tail -f $HOME/.vnc/*.log "

builder/dockerfile.debian_buster.deb.build

@@ -7,6 +7,6 @@ RUN apt-get update && \
 
 # Install build-deps for the package.
 COPY ./debian/control /tmp
-RUN echo YYY | mk-build-deps --install --remove /tmp/control
+RUN apt-get update && echo YYY | mk-build-deps --install --remove /tmp/control
 
 USER 1000

builder/dockerfile.fedora_thirtythree.barebones.rpm.test

@@ -0,0 +1,18 @@
+FROM fedora:33
+
+RUN dnf install -y xterm
+RUN dnf install -y vim less
+
+ARG KASMVNC_PACKAGE_DIR
+COPY $KASMVNC_PACKAGE_DIR/*.rpm /tmp
+RUN dnf localinstall -y /tmp/*.rpm
+
+RUN useradd -m foo
+
+USER foo:kasmvnc
+
+RUN mkdir ~/.vnc && echo '/usr/bin/xterm &' >> ~/.vnc/xstartup && \
+  chmod +x ~/.vnc/xstartup
+RUN echo bar | kasmvncpasswd -f > $HOME/.kasmpasswd && chmod 0600 $HOME/.kasmpasswd
+
+ENTRYPOINT bash -c "vncserver :1 -interface 0.0.0.0 && vncserver -kill :1 && vncserver :1 -depth 24 -geometry 1280x1050 -websocketPort 8443 -cert /etc/pki/tls/private/kasmvnc.pem -sslOnly -FrameRate=24 -interface 0.0.0.0 -httpd /usr/share/kasmvnc/www && tail -f $HOME/.vnc/*.log "

builder/dockerfile.fedora_thirtythree.build

@@ -0,0 +1,38 @@
+FROM fedora:33
+
+ENV KASMVNC_BUILD_OS fedora
+ENV KASMVNC_BUILD_OS_CODENAME thirtythree
+ENV XORG_VER 1.20.10
+
+# RUN dnf install -y build-dep xorg-server libxfont-dev sudo
+RUN dnf install -y gcc cmake git gnutls-devel vim wget
+#tightvncserver
+RUN dnf install -y libjpeg-turbo-devel libpng-devel libtiff-devel giflib-devel openssl-devel
+
+#libavcodec-dev
+RUN dnf -y install https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm
+RUN dnf -y install https://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm
+RUN dnf -y install ffmpeg-devel
+
+RUN dnf install -y make
+RUN dnf group install -y "Development Tools"
+RUN dnf install -y xorg-x11-server-devel zlib-devel libjpeg-turbo-devel
+RUN dnf install -y libxkbfile-devel libXfont2-devel xorg-x11-font-utils \
+  xorg-x11-xtrans-devel xorg-x11-xkb-utils-devel
+RUN dnf install -y mesa-dri-drivers
+RUN dnf install -y bzip2 redhat-lsb-core
+
+# Additions for webp
+RUN cd /tmp && wget https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-1.0.2.tar.gz
+RUN cd /tmp && tar -xzvf /tmp/libwebp-*
+RUN cd /tmp/libwebp-1.0.2 && \
+    ./configure --enable-static --disable-shared && \
+    make && make install
+
+RUN useradd -m docker && echo "docker:docker" | chpasswd
+
+COPY . /src
+RUN chown -R docker:docker /src
+
+USER docker
+ENTRYPOINT ["/src/builder/build.sh"]

builder/dockerfile.fedora_thirtythree.rpm.build

@@ -0,0 +1,13 @@
+FROM fedora:33
+
+RUN dnf install -y fedora-packager fedora-review
+RUN dnf install -y tree vim less
+RUN dnf install -y redhat-lsb-core
+RUN dnf install -y dnf-plugins-core
+
+COPY centos/*.spec /tmp
+RUN dnf builddep -y /tmp/*.spec
+
+RUN useradd -m docker && echo "docker:docker" | chpasswd
+
+USER docker

builder/dockerfile.fedora_thirtythree.rpm.test

@@ -0,0 +1,64 @@
+FROM fedora:33
+
+ENV DISPLAY=:1 \
+    VNC_PORT=8443 \
+    VNC_RESOLUTION=1280x720 \
+    MAX_FRAME_RATE=24 \
+    VNCOPTIONS="-PreferBandwidth -DynamicQualityMin=4 -DynamicQualityMax=7" \
+    HOME=/home/user \
+    TERM=xterm \
+    STARTUPDIR=/dockerstartup \
+    INST_SCRIPTS=/dockerstartup/install \
+    KASM_RX_HOME=/dockerstartup/kasmrx \
+    DEBIAN_FRONTEND=noninteractive \
+    VNC_COL_DEPTH=24 \
+    VNC_RESOLUTION=1280x1024 \
+    VNC_PW=vncpassword \
+    VNC_USER=user \
+    VNC_VIEW_ONLY_PW=vncviewonlypassword \
+    LD_LIBRARY_PATH=/usr/local/lib/ \
+    OMP_WAIT_POLICY=PASSIVE \
+    SHELL=/bin/bash \
+    SINGLE_APPLICATION=0 \
+    KASMVNC_BUILD_OS=fedora \
+    KASMVNC_BUILD_OS_CODENAME=thirtythree
+
+EXPOSE $VNC_PORT
+
+WORKDIR $HOME
+
+### REQUIRED STUFF ###
+
+RUN dnf install -y openssl xterm gettext wget
+RUN dnf install -y nss_wrapper
+RUN dnf install -y xorg-x11-xauth xorg-x11-xkb-utils \
+  xkeyboard-config xorg-x11-server-utils
+# xorg-x11-server-Xorg
+# RUN dnf install -y @xfce-desktop-environment
+RUN dnf group install -y lxde-desktop
+RUN dnf erase -y pm-utils xscreensaver*
+RUN dnf install -y redhat-lsb-core
+RUN dnf install -y vim less
+
+RUN echo 'source $STARTUPDIR/generate_container_user' >> $HOME/.bashrc
+
+RUN mkdir -p $STARTUPDIR
+COPY startup/ $STARTUPDIR
+
+### START CUSTOM STUFF ####
+
+ARG KASMVNC_PACKAGE_DIR
+COPY $KASMVNC_PACKAGE_DIR/*.rpm /tmp
+# RUN dnf remove -y tigervnc-server-minimal
+RUN dnf localinstall -y --allowerasing /tmp/*.rpm
+
+### END CUSTOM STUFF ###
+
+RUN chown -R 1000:0 $HOME
+USER 1000:kasmvnc-cert
+WORKDIR $HOME
+
+RUN mkdir ~/.vnc && echo '/usr/bin/lxsession -s LXDE &' >> ~/.vnc/xstartup && \
+  chmod +x ~/.vnc/xstartup
+
+ENTRYPOINT [ "/dockerstartup/vnc_startup.sh" ]

builder/dockerfile.kali_kali-rolling.deb.build

@@ -7,6 +7,6 @@ RUN apt-get update && \
 
 # Install build-deps for the package.
 COPY ./debian/control /tmp
-RUN echo YYY | mk-build-deps --install --remove /tmp/control
+RUN apt-get update && echo YYY | mk-build-deps --install --remove /tmp/control
 
 USER 1000

builder/dockerfile.kali_kali-rolling.deb.test

@@ -29,7 +29,7 @@ WORKDIR $HOME
 
 ### REQUIRED STUFF ###
 
-RUN apt-get update && apt-get install -y supervisor xfce4 xfce4-terminal xterm libnss-wrapper gettext wget
+RUN apt-get update && apt-get install -y supervisor xfce4 xfce4-terminal dbus-x11 xterm libnss-wrapper gettext wget
 RUN apt-get purge -y pm-utils xscreensaver*
 RUN apt-get update && apt-get install -y vim less
 

builder/dockerfile.ubuntu_bionic.deb.build

@@ -5,6 +5,6 @@ RUN apt-get update && \
 
 # Install build-deps for the package.
 COPY ./debian/control /tmp
-RUN echo YYY | mk-build-deps --install --remove /tmp/control
+RUN apt-get update && echo YYY | mk-build-deps --install --remove /tmp/control
 
 USER 1000

builder/dockerfile.ubuntu_focal.barebones.deb.test

@@ -0,0 +1,16 @@
+FROM ubuntu:focal
+
+ARG KASMVNC_PACKAGE_DIR
+COPY $KASMVNC_PACKAGE_DIR/kasmvncserver_*.deb /tmp
+RUN apt-get update && dpkg -i /tmp/*.deb; apt-get -yf install
+RUN apt-get update && apt-get -y install xterm lsb-release
+
+RUN useradd -m foo && addgroup foo ssl-cert
+
+USER foo
+
+RUN mkdir ~/.vnc && echo '/usr/bin/xterm &' >> ~/.vnc/xstartup && \
+  chmod +x ~/.vnc/xstartup
+RUN echo bar | kasmvncpasswd -f > $HOME/.kasmpasswd && chmod 0600 $HOME/.kasmpasswd
+
+ENTRYPOINT bash -c "vncserver :1 -interface 0.0.0.0 && vncserver -kill :1 && vncserver :1 -depth 24 -geometry 1280x1050 -websocketPort 8443 -cert /etc/ssl/certs/ssl-cert-snakeoil.pem -key /etc/ssl/private/ssl-cert-snakeoil.key -sslOnly -FrameRate=24 -interface 0.0.0.0 -httpd /usr/share/kasmvnc/www && tail -f $HOME/.vnc/*.log "

builder/dockerfile.ubuntu_focal.deb.build

@@ -7,6 +7,6 @@ RUN apt-get update && \
 
 # Install build-deps for the package.
 COPY ./debian/control /tmp
-RUN echo YYY | mk-build-deps --install --remove /tmp/control
+RUN apt-get update && echo YYY | mk-build-deps --install --remove /tmp/control
 
 USER 1000

builder/test-deb-barebones

@@ -3,8 +3,8 @@
 set -e
 
 cd "$(dirname "$0")"
-os="debian"
+os="${1:-debian}"
-os_codename="buster"
+os_codename="${2:-buster}"
 
 docker build --build-arg KASMVNC_PACKAGE_DIR="build/${os_codename}" \
   -t kasmvnctester_barebones_${os}:$os_codename \

builder/test-rpm-barebones

@@ -3,8 +3,8 @@
 set -e
 
 cd "$(dirname "$0")"
-os="centos"
+os="${1:-centos}"
-os_codename="core"
+os_codename="${2:-core}"
 
 docker build --build-arg KASMVNC_PACKAGE_DIR="build/${os}_${os_codename}" \
   -t kasmvnctester_barebones_${os}:$os_codename \

centos/kasmvncserver.spec

@@ -1,24 +1,68 @@
 Name:           kasmvncserver
 Version:        0.9.1~beta
 Release:        1%{?dist}
-Summary:        Lorem ipsum
+Summary:        VNC server accessible from a web browser
 
 License: GPLv2+
 URL: https://github.com/kasmtech/KasmVNC
 
 BuildRequires: rsync
 Requires: xorg-x11-xauth, xorg-x11-xkb-utils, xkeyboard-config, xorg-x11-server-utils, openssl, perl
-Conflicts: tigervnc-server
+Conflicts: tigervnc-server, tigervnc-server-minimal
 
 %description
+VNC stands for Virtual Network Computing. It is, in essence, a remote
+display system which allows you to view a computing `desktop' environment
+not only on the machine where it is running, but from anywhere on the
+Internet and from a wide variety of machine architectures.
 
-Lorem ipsum
+KasmVNC has different goals than TigerVNC:
+
+Web-based - KasmVNC is designed to provide a web accessible remote desktop.
+It comes with a web server and web-socket server built in. There is no need to
+install other components. Simply run and navigate to your desktop's URL on the
+port you specify. While you can still tun on the legacy VNC port, it is
+disabled by default.
+
+Security - KasmVNC defaults to HTTPS and allows for HTTP Basic Auth. VNC
+Password authentication is limited by specification to 8 characters and is not
+sufficient for use on an internet accessible remote desktop. Our goal is to
+create a by default secure, web based experience.
+
+Simplicity - KasmVNC aims at being simple to deploy and configure.
 
 %prep
 
 %install
 rm -rf $RPM_BUILD_ROOT
-DESTDIR=$RPM_BUILD_ROOT make -f /src/debian/Makefile.to_fakebuild_tar_package install
+
+TARGET_OS=$(lsb_release -is | tr '[:upper:]' '[:lower:]')
+TARGET_OS_CODENAME=$(lsb_release -cs | tr '[:upper:]' '[:lower:]')
+TARBALL=$RPM_SOURCE_DIR/kasmvnc.${TARGET_OS}_${TARGET_OS_CODENAME}.tar.gz
+TAR_DATA=$(mktemp -d)
+tar -xzf "$TARBALL" -C "$TAR_DATA"
+
+SRC=$TAR_DATA/usr/local
+SRC_BIN=$SRC/bin
+DESTDIR=$RPM_BUILD_ROOT
+DST_MAN=$DESTDIR/usr/share/man/man1
+
+mkdir -p $DESTDIR/usr/bin $DESTDIR/usr/share/man/man1 \
+  $DESTDIR/usr/share/doc/kasmvncserver
+cp $SRC_BIN/Xvnc $DESTDIR/usr/bin;
+cp $SRC_BIN/vncserver $DESTDIR/usr/bin;
+cp $SRC_BIN/vncconfig $DESTDIR/usr/bin;
+cp $SRC_BIN/kasmvncpasswd $DESTDIR/usr/bin;
+cd $DESTDIR/usr/bin && ln -s kasmvncpasswd vncpasswd;
+cp -r $SRC/share/doc/kasmvnc*/* $DESTDIR/usr/share/doc/kasmvncserver/
+rsync -r --exclude '.git*' --exclude po2js --exclude xgettext-html \
+  --exclude www/utils/ --exclude .eslintrc \
+  $SRC/share/kasmvnc $DESTDIR/usr/share
+cp $SRC/man/man1/Xvnc.1 $DESTDIR/usr/share/man/man1/;
+cp $SRC/share/man/man1/vncserver.1 $DST_MAN;
+cp $SRC/share/man/man1/vncconfig.1 $DST_MAN;
+cp $SRC/share/man/man1/vncpasswd.1 $DST_MAN;
+cd $DST_MAN && ln -s vncpasswd.1 kasmvncpasswd.1;
 
 %files
 /usr/bin/*
@@ -33,19 +77,7 @@ DESTDIR=$RPM_BUILD_ROOT make -f /src/debian/Makefile.to_fakebuild_tar_package in
 - Initial release of the rpm package.
 
 %post
-  bindir=/usr/bin
+  kasmvnc_group="kasmvnc-cert"
-  mandir=/usr/share/man
-  commands="kasmvncserver kasmvncpasswd kasmvncconfig Xkasmvnc"
-
-  for kasm_command in $commands; do
-    generic_command=`echo "$kasm_command" | sed -e 's/kasm//'`;
-    update-alternatives --install "$bindir/$generic_command" \
-      "$generic_command" "$bindir/$kasm_command" 90 \
-      --slave "$mandir/man1/$generic_command.1.gz" "$generic_command.1.gz" \
-        "$mandir/man1/$kasm_command.1.gz"
-  done
-
-  kasmvnc_group="kasmvnc"
 
   create_kasmvnc_group() {
     if ! getent group "$kasmvnc_group" >/dev/null; then
@@ -69,13 +101,4 @@ DESTDIR=$RPM_BUILD_ROOT make -f /src/debian/Makefile.to_fakebuild_tar_package in
   make_self_signed_certificate
 
 %postun
-  bindir=/usr/bin
-  mandir=/usr/share/man
-  commands="kasmvncserver kasmvncpasswd kasmvncconfig Xkasmvnc"
-
-  for kasm_command in $commands; do
-    generic_command=`echo "$kasm_command" | sed -e 's/kasm//'`;
-    update-alternatives --remove "$generic_command" "$bindir/$kasm_command"
-  done
-
   rm -f /etc/pki/tls/private/kasmvnc.pem

debian/Makefile.to_fakebuild_tar_package

@@ -1,8 +1,10 @@
 TARGET_OS := $(shell lsb_release -is | tr '[:upper:]' '[:lower:]')
 TARGET_OS_CODENAME := $(shell lsb_release -cs | tr '[:upper:]' '[:lower:]')
-ifeq ($(TARGET_OS), centos)
+ifeq ($(TARGET_OS), $(filter $(TARGET_OS), centos fedora))
+	PACKAGE_TYPE := rpm
 	TARBALL_DIR := $$RPM_SOURCE_DIR
 else
+	PACKAGE_TYPE := deb
 	TARBALL_DIR := builder/build
 endif
 TARBALL := $(TARBALL_DIR)/kasmvnc.$(TARGET_OS)_$(TARGET_OS_CODENAME).tar.gz

debian/control

@@ -14,5 +14,23 @@ Architecture: amd64
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, ssl-cert, xauth,
   x11-xkb-utils, xkb-data, procps
 Provides: vnc-server
-Description: virtual network computing server with web interface
+Description: VNC server accessible from a web browser
- Lorem ipsum
+ VNC stands for Virtual Network Computing. It is, in essence, a remote
+ display system which allows you to view a computing `desktop' environment
+ not only on the machine where it is running, but from anywhere on the
+ Internet and from a wide variety of machine architectures.
+ .
+ KasmVNC has different goals than TigerVNC:
+ .
+ Web-based - KasmVNC is designed to provide a web accessible remote desktop.
+ It comes with a web server and websocket server built in. There is no need to
+ install other components. Simply run and navigate to your desktop's URL on the
+ port you specify. While you can still tun on the legacy VNC port, it is
+ disabled by default.
+ .
+ Security - KasmVNC defaults to HTTPS and allows for HTTP Basic Auth. VNC
+ Password authentication is limited by specification to 8 characters and is not
+ suffecient for use on an internet accessible remote desktop. Our goal is to
+ create a by default secure, web based experience.
+ .
+ Simplicity - KasmVNC aims at being simple to deploy and configure.