diff --git a/Makefile b/Makefile index e82c36d..a34ad48 100644 --- a/Makefile +++ b/Makefile @@ -51,7 +51,7 @@ nxenv_install: $(INSTALL_FILE) conf/conf.d/*.conf $(DESTDIR)/$(NX_ETC_DIR)/node.conf.d/ $(INSTALL_DIR) $(DESTDIR)/$(NX_ETC_DIR)/acls/ $(INSTALL_FILE) conf/acls/* $(DESTDIR)/$(NX_ETC_DIR)/acls/ - install -m775 -gusers -d $(DESTDIR)/$(NX_ETC_DIR)/ppd/ + install -m775 -d $(DESTDIR)/$(NX_ETC_DIR)/ppd/ $(INSTALL_DIR) $(DESTDIR)/$(PATH_SHARE)/freenx-server/node.conf.def $(INSTALL_FILE) node.conf.def/* $(DESTDIR)/$(PATH_SHARE)/freenx-server/node.conf.def/ $(INSTALL_FILE) nxfuncs $(DESTDIR)/$(PATH_SHARE)/freenx-server/ diff --git a/README.md b/README.md index b5fe644..4996828 100644 --- a/README.md +++ b/README.md @@ -43,9 +43,6 @@ Many thanks to Djelf for long consultations on sqlite. Thats all worked with [opennx ce](https://github.com/dimbor-ru/opennx) liux/windows client, but original nxclient basicaly alive too (with restrictions). -Debian package home-maded for Devuan ASCII now. There is a suspicion that -under Debian Stretch everything will be fine. - On modern systems with glibc >= 2.28 to run nxclient you must apply [solution](https://github.com/dimbor-ru/freenx-server/issues/5#issuecomment-579694048) from Djelf (on nxclient side of course). @@ -73,5 +70,7 @@ ln -s /usr/lib/x86_64-linux-gnu/libjpeg.so /usr/NX/lib/libjpeg.so.62 ln -s /usr/lib/x86_64-linux-gnu/libXcomp.so.3 /usr/NX/lib/libXcomp.so Archives of old nx stuff you can find [here](http://ftp.disconnected-by-peer.at/NX/) +Thanks to Mario Fetka (@geosone) for [NX Repos](https://ftp.disconnected-by-peer.at/Repositories/go-NX/) +freenx-server packages are also there. -dimbor. 2022 +dimbor. 2025 diff --git a/VERSION b/VERSION index b2865a2..ef327ce 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.5.0-2.1.3-CE +3.5.0-2.1.4-CE diff --git a/debian/changelog b/debian/changelog index 0625b3b..01aeb5b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +freenx-server (2.1.4) UNRELEASED; urgency=low + + * Add patches from Mario Fetka (@geosone) for debian trixie + + -- Dmitry Borisov Mon, 18 Aug 2025 00:27:25 +0300 + freenx-server (2.1.3) UNRELEASED; urgency=low * Fixing a funny misunderstanding with localization. diff --git a/debian/rules b/debian/rules index f2244f7..1c71b63 100755 --- a/debian/rules +++ b/debian/rules @@ -2,5 +2,18 @@ export DH_VERBOSE=1 +# Make sure lintian does not complain about missing hardenings. +export DEB_BUILD_MAINT_OPTIONS=hardening=+all + +# Make sure the decades-old source code gets compiled by allowing implicit +# function declarations and, for gcc-14 and above, by downgrading the +# diagnostics applied by the compiler. See +# https://gcc.gnu.org/onlinedocs/gcc-14.1.0/gcc/Warning-Options.html +# for further details. +export DEB_CFLAGS_MAINT_STRIP=-Werror=implicit-function-declaration +cc_major := $(shell $(CC) --version | head -n1 | cut -d' ' -f4 | cut -d. -f1) +cc_major_ge_14 := $(shell [ $(cc_major) -ge 14 ] && echo 'true') +export DEB_CFLAGS_MAINT_APPEND=$(if $(cc_major_ge_14),-fpermissive) + %: dh $@ diff --git a/node.conf.def/00--internal.cnf b/node.conf.def/00--internal.cnf index c6a4fa1..5b4d1de 100644 --- a/node.conf.def/00--internal.cnf +++ b/node.conf.def/00--internal.cnf @@ -5,7 +5,7 @@ #@ type: string #@ check: notempty error -NX_VERSION=3.5.0-2.1.3-CE +NX_VERSION=3.5.0-2.1.4-CE #@ type: string #@ check: advanced error diff --git a/nxviewer-passwd/libvncauth/Imakefile b/nxviewer-passwd/libvncauth/Imakefile index f7569b1..f59ff01 100644 --- a/nxviewer-passwd/libvncauth/Imakefile +++ b/nxviewer-passwd/libvncauth/Imakefile @@ -3,6 +3,8 @@ EXTRA_DEFINES = -D__EXTENSIONS__ #endif +CDEBUGFLAGS += -Wno-error=implicit-function-declaration -fpermissive + SRCS = vncauth.c d3des.c OBJS = vncauth.o d3des.o diff --git a/nxviewer-passwd/nxpasswd/Imakefile b/nxviewer-passwd/nxpasswd/Imakefile index f338030..f200de6 100644 --- a/nxviewer-passwd/nxpasswd/Imakefile +++ b/nxviewer-passwd/nxpasswd/Imakefile @@ -3,6 +3,8 @@ EXTRA_DEFINES = -D__EXTENSIONS__ #endif +CDEBUGFLAGS += -Wno-error=implicit-function-declaration -fpermissive + SRCS = vncpasswd.c INCLUDES = -I../include VNCAUTH_LIB = ../libvncauth/libvncauth.a