xrdp09: Import xrdp version 0.9.22.1

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: xrdp09: Import xrdp version 0.9.22.1
From: Michael Baeuerle <micha%NetBSD.org@localhost>
Date: Wed, 31 May 2023 16:47:40 +0000
Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <micha%NetBSD.org@localhost>
Pushed By:	micha
Date:		Wed May 31 18:47:40 2023 +0200
Changeset:	cdc9b39b07073d0b3f4db385ae66e7d5c841d498

Modified Files:
	Makefile
Added Files:
	xrdp09/DESCR
	xrdp09/Makefile
	xrdp09/PLIST
	xrdp09/distinfo
	xrdp09/files/sesman.sh
	xrdp09/files/xrdp.sh
	xrdp09/patches/patch-configure.ac
	xrdp09/patches/patch-tools_devel_tcp__proxy_Makefile.am

Log Message:
xrdp09: Import xrdp version 0.9.22.1

Note: This package has a different license compared to "wip/xrdp".

This release is just a re-packing of source code tarball since v0.9.22
tarball includes invalid source code (#2687).

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=cdc9b39b07073d0b3f4db385ae66e7d5c841d498

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 Makefile                                           |  1 +
 xrdp09/DESCR                                       | 15 +++++++
 xrdp09/Makefile                                    | 43 ++++++++++++++++++
 xrdp09/PLIST                                       | 51 ++++++++++++++++++++++
 xrdp09/distinfo                                    |  7 +++
 xrdp09/files/sesman.sh                             | 16 +++++++
 xrdp09/files/xrdp.sh                               | 15 +++++++
 xrdp09/patches/patch-configure.ac                  | 33 ++++++++++++++
 .../patch-tools_devel_tcp__proxy_Makefile.am       | 13 ++++++
 9 files changed, 194 insertions(+)

diffs:
diff --git a/Makefile b/Makefile
index 315b139e32..3ab14995a7 100644
--- a/Makefile
+++ b/Makefile
@@ -5937,6 +5937,7 @@ SUBDIR+=	xplugd
 SUBDIR+=	xpopple
 SUBDIR+=	xqf
 SUBDIR+=	xrdp
+SUBDIR+=	xrdp09
 SUBDIR+=	xsb
 SUBDIR+=	xspd
 SUBDIR+=	xspdapp
diff --git a/xrdp09/DESCR b/xrdp09/DESCR
new file mode 100644
index 0000000000..09812fa0b9
--- /dev/null
+++ b/xrdp09/DESCR
@@ -0,0 +1,15 @@
+xrdp provides a graphical login to remote machines using Microsoft
+Remote Desktop Protocol (RDP). xrdp accepts connections from a variety of
+RDP clients:
+
+- FreeRDP
+- rdesktop
+- KRDC
+- NeutrinoRDP
+- Windows MSTSC (Microsoft Terminal Services Client, aka mstsc.exe)
+- Microsoft Remote Desktop (found on Microsoft Store, which is distinct
+  from MSTSC)
+
+Many of these work on some or all of Windows, Mac OS, iOS, and/or Android.
+
+RDP transport is encrypted using TLS by default.
diff --git a/xrdp09/Makefile b/xrdp09/Makefile
new file mode 100644
index 0000000000..051b567a48
--- /dev/null
+++ b/xrdp09/Makefile
@@ -0,0 +1,43 @@
+# $NetBSD$
+
+DISTNAME=		xrdp-0.9.22.1
+CATEGORIES=		net x11
+MASTER_SITES=		${MASTER_SITE_GITHUB:=neutrinolabs/}
+GITHUB_PROJECT=		xrdp
+GITHUB_TAG=		v${PKGVERSION_NOREV}
+
+MAINTAINER=		micha%NetBSD.org@localhost
+HOMEPAGE=		https://www.xrdp.org/
+COMMENT=		Remote Desktop Protocol server
+LICENSE=		apache-2.0
+
+USE_TOOLS+=		autoconf automake gmake pkg-config
+USE_LIBTOOL=		yes
+DL_AUTO_VARS=		yes
+
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--disable-painter
+CONFIGURE_ARGS+=	--disable-rfxcodec
+
+RCD_SCRIPTS=		xrdp sesman
+RCD_SCRIPT_SRC.xrdp=	files/xrdp.sh
+RCD_SCRIPT_SRC.sesman=	files/sesman.sh
+
+AUTO_MKDIRS=		yes
+
+pre-configure:
+	cd ${WRKSRC} && autoreconf -fvi
+
+post-configure:
+	cd ${WRKSRC} && \
+		${CP} xrdp_configure_options.h xrdp_configure_options.h.orig && \
+		${AWK} '/PKG_CONFIG/{ next } //' xrdp_configure_options.h.orig >xrdp_configure_options.h
+
+.include "../../security/openssl/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
+.include "../../mk/pam.buildlink3.mk"
+.include "../../mk/dlopen.buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXfixes/buildlink3.mk"
+.include "../../x11/libXrandr/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/xrdp09/PLIST b/xrdp09/PLIST
new file mode 100644
index 0000000000..6e5a23139a
--- /dev/null
+++ b/xrdp09/PLIST
@@ -0,0 +1,51 @@
+@comment $NetBSD$
+bin/xrdp-dis
+bin/xrdp-genkeymap
+bin/xrdp-keygen
+bin/xrdp-sesadmin
+bin/xrdp-sesrun
+include/ms-erref.h
+include/ms-fscc.h
+include/ms-rdpbcgr.h
+include/ms-rdpeclip.h
+include/ms-rdpedisp.h
+include/ms-rdpefs.h
+include/ms-rdpegdi.h
+include/ms-rdpele.h
+include/ms-rdperp.h
+include/ms-smb2.h
+include/xrdp_client_info.h
+include/xrdp_constants.h
+include/xrdp_rail.h
+include/xrdp_sockets.h
+lib/pkgconfig/xrdp.pc
+lib/xrdp/libcommon.la
+lib/xrdp/libmc.la
+lib/xrdp/libscp.la
+lib/xrdp/libvnc.la
+lib/xrdp/libxrdp.la
+lib/xrdp/libxrdpapi.la
+lib/xrdp/libxup.la
+man/man1/xrdp-dis.1
+man/man5/sesman.ini.5
+man/man5/xrdp.ini.5
+man/man8/xrdp-chansrv.8
+man/man8/xrdp-genkeymap.8
+man/man8/xrdp-keygen.8
+man/man8/xrdp-sesadmin.8
+man/man8/xrdp-sesman.8
+man/man8/xrdp-sesrun.8
+man/man8/xrdp.8
+sbin/xrdp
+sbin/xrdp-chansrv
+sbin/xrdp-sesman
+share/examples/rc.d/sesman
+share/examples/rc.d/xrdp
+share/xrdp/ad24b.bmp
+share/xrdp/ad256.bmp
+share/xrdp/cursor0.cur
+share/xrdp/cursor1.cur
+share/xrdp/sans-10.fv1
+share/xrdp/xrdp24b.bmp
+share/xrdp/xrdp256.bmp
+share/xrdp/xrdp_logo.bmp
diff --git a/xrdp09/distinfo b/xrdp09/distinfo
new file mode 100644
index 0000000000..8464bade12
--- /dev/null
+++ b/xrdp09/distinfo
@@ -0,0 +1,7 @@
+$NetBSD$
+
+BLAKE2s (xrdp-0.9.22.1.tar.gz) = 09d56f9d668190084b44c6561e2f5bb0c6caf04aa5918c19327b78e277dbeebb
+SHA512 (xrdp-0.9.22.1.tar.gz) = 247816e5d6b5223f60d47fd831c3dfb3114d98b38890cfc27b142bc3defd590b86a13bf6e0b9cd2aab25b50256ebe4ee4c360f5ec23255c323d391bcd4be5a19
+Size (xrdp-0.9.22.1.tar.gz) = 778873 bytes
+SHA1 (patch-configure.ac) = 8dc92c52beb3eb95d8619a8dbe08ddb636917aa2
+SHA1 (patch-tools_devel_tcp__proxy_Makefile.am) = 565e5a60c77a3b42d1e94ec94054d1cc5ffd73b9
diff --git a/xrdp09/files/sesman.sh b/xrdp09/files/sesman.sh
new file mode 100644
index 0000000000..b9fb06a79a
--- /dev/null
+++ b/xrdp09/files/sesman.sh
@@ -0,0 +1,16 @@
+#!@RCD_SCRIPTS_SHELL@
+#
+# $NetBSD$
+#
+# PROVIDE: sesman
+# REQUIRE: DAEMON
+# BEFORE:  xrdp
+
+$_rc_subr_loaded . /etc/rc.subr
+
+name="sesman"
+rcvar=$name
+command="@PREFIX@/sbin/sesman"
+
+load_rc_config $name
+run_rc_command "$1"
diff --git a/xrdp09/files/xrdp.sh b/xrdp09/files/xrdp.sh
new file mode 100644
index 0000000000..3eccd0f5df
--- /dev/null
+++ b/xrdp09/files/xrdp.sh
@@ -0,0 +1,15 @@
+#!@RCD_SCRIPTS_SHELL@
+#
+# $NetBSD$
+#
+# PROVIDE: xrdp
+# REQUIRE: DAEMON
+
+$_rc_subr_loaded . /etc/rc.subr
+
+name="xrdp"
+rcvar=$name
+command="@PREFIX@/sbin/xrdp"
+
+load_rc_config $name
+run_rc_command "$1"
diff --git a/xrdp09/patches/patch-configure.ac b/xrdp09/patches/patch-configure.ac
new file mode 100644
index 0000000000..0d852d5d40
--- /dev/null
+++ b/xrdp09/patches/patch-configure.ac
@@ -0,0 +1,33 @@
+$NetBSD$
+
+Fix nonportable shell syntax.
+
+--- configure.ac.orig	2023-05-22 14:41:56.000000000 +0000
++++ configure.ac
+@@ -414,7 +414,7 @@ fi
+ fi
+ 
+ AC_PATH_XTRA
+-if test "x$no_x" == "xyes"; then
++if test "x$no_x" = "xyes"; then
+   AC_MSG_ERROR([please install libx11-dev or libX11-devel])
+ fi
+ 
+@@ -434,7 +434,7 @@ AC_CHECK_HEADER([X11/extensions/Xrandr.h
+ CFLAGS="$save_CFLAGS"
+ 
+ # perform unit tests if libcheck found
+-if test "x$ensure_tests_deps" == "xyes"; then
++if test "x$ensure_tests_deps" = "xyes"; then
+     PKG_CHECK_MODULES([CHECK], [check >= 0.10.0],
+         [perform_unit_tests=yes],
+         [AC_MSG_ERROR([please install check, the unit test framework])])
+@@ -444,7 +444,7 @@ else
+         [perform_unit_tests=no])
+ fi
+ 
+-if test "x$perform_unit_tests" == "xyes"; then
++if test "x$perform_unit_tests" = "xyes"; then
+     AC_MSG_NOTICE([libcheck found, unit tests will be performed])
+ else
+     AC_MSG_NOTICE([libcheck not found, unit tests will be skipped])
diff --git a/xrdp09/patches/patch-tools_devel_tcp__proxy_Makefile.am b/xrdp09/patches/patch-tools_devel_tcp__proxy_Makefile.am
new file mode 100644
index 0000000000..21c51aaa53
--- /dev/null
+++ b/xrdp09/patches/patch-tools_devel_tcp__proxy_Makefile.am
@@ -0,0 +1,13 @@
+$NetBSD$
+
+configure script decides whether libdl is required.
+
+--- tools/devel/tcp_proxy/Makefile.am.orig	2023-05-22 14:41:56.000000000 +0000
++++ tools/devel/tcp_proxy/Makefile.am
+@@ -9,5 +9,4 @@ tcp_proxy_SOURCES = \
+   main.c
+ 
+ tcp_proxy_LDADD = \
+-  $(top_builddir)/common/libcommon.la \
+-  -ldl
++  $(top_builddir)/common/libcommon.la
Prev by Date: isa-l: Patch for NetBSD bswap, clean up
Next by Date: remove udev, satisfied by sysutils/libudev
Previous by Thread: isa-l: Patch for NetBSD bswap, clean up
Next by Thread: remove udev, satisfied by sysutils/libudev
Indexes:
Home | Main Index | Thread Index | Old Index