uvncrepeater:

update CHANGELOG
help: official text
remove useless Makefile.in
fix .language
remove CMDLINE, all 3 possible options are used
defaults: remove whitespaces
create also group for user
remove startup spam message
makefile: fix whitespoaces
makefile: remove duplicates
PKG_DIR is not needed since freetz-ng

docs/CHANGELOG.md

@@ -132,6 +132,7 @@ Latest changes
    * tmux 3.5a
    * Tor 0.4.8.14
    * Tree 1.8.0/2.2.1
+   * UltraVNC Repeater 014
    * uMurmur 0.2.20/0.3.0
    * Unbound 1.22.0
    * VLMCSD svn1113

make/pkgs/uvncrepeater/Config.in

@@ -1,16 +1,14 @@
 config FREETZ_PACKAGE_UVNCREPEATER
-	bool "UVNC IPv4 repeater 014 (binary only)"
+	bool "UltraVNC Repeater 014 - DEPRECATED"
 	default n
 	help
-		A IPv4 only linux port of the UltraVNC
-		Repeater. The Repeater acts like a
-		proxy, sitting in the middle between
-		the UltraVNC Server and Viewer. All
-		data for the session is passed through
-		the UltraVNC Repeater meaning that the
-		UltraVNC Viewer and UltraVNC Server can
-		both be behind a NAT firewall, without
-		having to worry about forwarding ports
-		or anything else (providing the Repeater
-		is visible to both UltraVNC Viewer and
-		UltraVNC Server).
+		UltraVNC Repeater has two unique functions:
+		Mode 1:
+		Allows for connection to multiple servers (in listen mode), using only
+		one port. All connection data flows through the repeater, allowing
+		connection to multiple servers through a single port forward or tunnel.
+		Mode 2: 
+		Allows both a Viewer and Server to connect together using the repeater
+		as a PROXY. All connection data flows through the repeater, allowing
+		both the server and viewer to be behind firewalls or routers.
+

make/pkgs/uvncrepeater/external.in

@@ -5,3 +5,4 @@ config EXTERNAL_FREETZ_PACKAGE_UVNCREPEATER
 	help
 		externals the following file(s):
 		 /usr/bin/uvncrepeater
+

make/pkgs/uvncrepeater/files/.language

@@ -4,7 +4,6 @@ default
 { en }
 files
 {
-	etc/default.vlmcsd/uvncrepeater*.def
-	etc/init.d/rc.uvncrepeater
+	etc/default.uvncrepeater/uvncrepeater*.def
 	usr/lib/cgi-bin/uvncrepeater.cgi
 }

make/pkgs/uvncrepeater/files/root/etc/default.uvncrepeater/uvncrepeater.cfg

@@ -1,2 +1 @@
 export UVNCREPEATER_ENABLED="no"
-export UVNCREPEATER_CMDLINE="-d"

make/pkgs/uvncrepeater/files/root/etc/default.uvncrepeater/uvncrepeater.defaults

@@ -22,6 +22,7 @@ maxsessions = 10
 ;it changes to this user after ports have been bound in startup
 ;You need to create a suitable (normal, non-privileged) user/group and change name here
 runasuser = uvncrep
+;DO NOT CHANGE THE USER!
 
 ;Allowed modes for repeater
 ;0=None, 1=Only Mode 1, 2=Only Mode 2, 3=Both modes
@@ -34,7 +35,7 @@ runasuser = uvncrep
 ;1 = 0 + Important messages + Connections opened / closed
 ;2 = 1 + Ini values + exceptions in logic flow
 ;3 = 2 + Everything else (very detailed and exhaustive logging == BIG log files)
-;logginglevel = 3              
+;logginglevel = 3
 
 
 [mode1]
@@ -44,7 +45,7 @@ runasuser = uvncrep
 ;0=Allow connections to all server addressess,
 ;1=Require that server address (or range of addresses) is listed in 
 ;srvListAllow[0]...srvListAllow[SERVERS_LIST_SIZE-1]
-;requirelistedserver = 0             
+;requirelistedserver = 0
 
 ;List of allowed server addresses / ranges
 ;Ranges can be defined by setting corresponding number to 0, e.g. 10.0.0.0 allows all addresses 10.x.x.x
@@ -67,14 +68,14 @@ runasuser = uvncrep
 
 [mode2]
 ;0=Allow all IDs, 1=Allow only IDs listed in idList[0]...idList[ID_LIST_SIZE-1]
-;requirelistedid = 0             
+;requirelistedid = 0
 
 ;List of allowed ID: numbers
 ;Value 0 means "this authenticates negatively"
 ;If value is not listed, default is 0
 ;Values should be between [1...LONG_MAX-1]
 ;There can be max ID_LIST_SIZE (default 100) idList lines
-;idlist0 = 1111                  
+;idlist0 = 1111
 ;idlist1 = 2222
 ;idlist2 = 0
 ;idlist3 = 0
@@ -100,4 +101,3 @@ runasuser = uvncrep
 ;Somebody wanted this for making a PHP event listener
 ;usehttp = true
 
-

make/pkgs/uvncrepeater/files/root/etc/default.uvncrepeater/uvncrepeater_ini.def

@@ -1,4 +1,4 @@
-CAPTION='UVNCREPEATER: uvncrepeater.ini'
+CAPTION='UltraVNC Repeater: uvncrepeater.ini'
 
 CONFIG_FILE='/tmp/flash/uvncrepeater/uvncrepeater.ini'
 CONFIG_SAVE='modsave flash; if pidof uvncrepeater > /dev/null; then /mod/etc/init.d/rc.uvncrepeater restart; fi'

make/pkgs/uvncrepeater/files/root/etc/init.d/rc.uvncrepeater

@@ -2,18 +2,20 @@
 
 DAEMON=uvncrepeater
 DAEMON_USER=uvncrep
-DAEMON_LONG_NAME="UVNC-Repeater"
+DAEMON_LONG_NAME="UltraVNC Repeater"
 DAEMON_CFGFILE="/tmp/flash/$DAEMON/$DAEMON.ini"
 . /etc/init.d/modlibrc
 
+
 start() {
-	modlib_startdaemon $DAEMON_BIN -i $DAEMON_CFGFILE -p $PID_FILE $UVNCREPEATER_CMDLINE &
+	modlib_startdaemon $DAEMON_BIN -i $DAEMON_CFGFILE -p $PID_FILE -d
 }
 
 case $1 in
 	""|load)
 		modlib_defaults $DAEMON_CFGFILE
-		modlib_adduser $DAEMON_USER
+		modlib_add_user_and_group $DAEMON_USER
+
 		modreg cgi $DAEMON "$DAEMON_LONG_NAME"
 		modreg daemon $DAEMON
 		modreg file $DAEMON uvncrepeater_ini 'uvncrepeater.ini' 0 "uvncrepeater_ini"

make/pkgs/uvncrepeater/files/root/usr/lib/cgi-bin/uvncrepeater.cgi

@@ -6,7 +6,3 @@ sec_begin "$(lang de:"Starttyp" en:"Start type")"
 cgi_print_radiogroup_service_starttype "enabled" "$UVNCREPEATER_ENABLED" "" "" 0
 sec_end
 
-sec_begin "$(lang de:"Konfiguration" en:"Configuration")"
-cgi_print_textline_p "renew" "$UVNCREPEATER_CMDLINE" 55/250 "$(lang de:"Optionale Parameter" en:"Optional parameters"): "
-sec_end
-

make/pkgs/uvncrepeater/patches/101-freetz_compat.patch

@@ -62,7 +62,8 @@
      //Startup event
 @@ -1995,10 +2035,37 @@
 
-     fprintf(stderr, "UltraVnc Linux Repeater version %s\n", REPEATER_VERSION);
+-    fprintf(stderr, "UltraVnc Linux Repeater version %s\n", REPEATER_VERSION);
++//  fprintf(stderr, "UltraVnc Linux Repeater version %s\n", REPEATER_VERSION);
 
 -    //Read parameters from ini file
 -    strlcpy(tmpBuf, (argc >= 2) ? argv[1] : defaultIniFilePathAndName, MAX_PATH);

make/pkgs/uvncrepeater/uvncrepeater.mk

@@ -1,27 +1,24 @@
 $(call PKG_INIT_BIN, 014)
 $(PKG)_SOURCE:=repeater$($(PKG)_VERSION).zip
-$(PKG)_SITE:=https://web.archive.org/web/20151001044013/http://koti.mbnet.fi/jtko/uvncrepeater
-$(PKG)_DIR=$(SOURCE_DIR)/Ver014
-$(PKG)_BINARY:=$($(PKG)_DIR)/repeater
-$(PKG)_TARGET_BINARY:=$($(PKG)_DEST_DIR)/usr/bin/uvncrepeater
 $(PKG)_HASH:=f22f2c5a283c7ff636a649b4b2e0de7409537eaa
-
+$(PKG)_SITE:=https://web.archive.org/web/20151001044013/http://koti.mbnet.fi/jtko/uvncrepeater
 ### WEBSITE:=https://uvnc.com/products/ultravnc-repeater.html
 ### MANPAGE:=https://uvnc.com/docs/ultravnc-repeater.html
+### CHANGES:=https://web.archive.org/web/20151001044013/http://koti.mbnet.fi/jtko/uvncrepeater/
 ### SUPPORT:=manfred-mueller
 
 $(PKG)_BINARY:=$($(PKG)_DIR)/repeater
 $(PKG)_TARGET_BINARY:=$($(PKG)_DEST_DIR)/usr/bin/uvncrepeater
 
+
 $(PKG_SOURCE_DOWNLOAD)
 $(PKG_UNPACKED)
 $(PKG_CONFIGURED_NOP)
 
 $($(PKG)_BINARY): $($(PKG)_DIR)/.configured
 	$(SUBMAKE) -C $(UVNCREPEATER_DIR) \
-                CC="$(TARGET_CC)" \
-                CFLAGS="$(TARGET_CFLAGS)"
-
+		CC="$(TARGET_CC)" \
+		CFLAGS="$(TARGET_CFLAGS)"
 
 $($(PKG)_TARGET_BINARY): $($(PKG)_BINARY)
 	$(INSTALL_BINARY_STRIP)