Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] xorgxrdp and xrdp
@ 2021-06-15  9:49 combro2k
  2021-06-15 10:25 ` combro2k
                   ` (7 more replies)
  0 siblings, 8 replies; 9+ messages in thread
From: combro2k @ 2021-06-15  9:49 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1580 bytes --]

There is a new pull request by combro2k against master on the void-packages repository

https://github.com/combro2k/void-packages master
https://github.com/void-linux/void-packages/pull/31512

xorgxrdp and xrdp
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/31512.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-31512.patch --]
[-- Type: text/x-diff, Size: 4892 bytes --]

From 0e821acee54c30be7c1b8ee0fb2e2c1ae58f52bd Mon Sep 17 00:00:00 2001
From: Martijn van Maurik <git@vmaurik.nl>
Date: Tue, 15 Jun 2021 11:44:04 +0200
Subject: [PATCH 1/2] New package: xrdp-0.9.16

---
 srcpkgs/xrdp/files/xrdp-sesman/run |  3 ++
 srcpkgs/xrdp/files/xrdp/run        |  3 ++
 srcpkgs/xrdp/template              | 61 ++++++++++++++++++++++++++++++
 3 files changed, 67 insertions(+)
 create mode 100644 srcpkgs/xrdp/files/xrdp-sesman/run
 create mode 100644 srcpkgs/xrdp/files/xrdp/run
 create mode 100644 srcpkgs/xrdp/template

diff --git a/srcpkgs/xrdp/files/xrdp-sesman/run b/srcpkgs/xrdp/files/xrdp-sesman/run
new file mode 100644
index 000000000000..1969d68769a2
--- /dev/null
+++ b/srcpkgs/xrdp/files/xrdp-sesman/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+[ -r conf ] && . ./conf
+exec xrdp-sesman ${OPTS:=-n} 1>&2
diff --git a/srcpkgs/xrdp/files/xrdp/run b/srcpkgs/xrdp/files/xrdp/run
new file mode 100644
index 000000000000..f47a94a3fd2b
--- /dev/null
+++ b/srcpkgs/xrdp/files/xrdp/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+[ -r conf ] && . ./conf
+exec xrdp ${OPTS:=-n} 1>&2
diff --git a/srcpkgs/xrdp/template b/srcpkgs/xrdp/template
new file mode 100644
index 000000000000..bca740d4b80c
--- /dev/null
+++ b/srcpkgs/xrdp/template
@@ -0,0 +1,61 @@
+# Template file for 'xrdp'
+pkgname=xrdp
+version=0.9.16
+revision=3
+#archs="x86_64"
+build_style=gnu-configure
+configure_args="--build $XBPS_TARGET_MACHINE
+	--enable-pam --enable-vsock --enable-pam-config=unix --enable-jpeg
+	--enable-fuse --enable-mp3lame --enable-rfxcodec --enable-opus --enable-pixman
+	--enable-ipv6 --enable-painter --libdir /usr/lib$XBPS_TARGET_WORDSIZE"
+hostmakedepends="pkg-config automake autoconf which nasm flex bison libxml2-python3 python3 libtool"
+makedepends="openssl-devel pam-devel libX11-devel libXfixes-devel libXrandr-devel fuse-devel libxml2-devel lame-devel pixman-devel xorg-server-devel opus-devel libjpeg-turbo-devel"
+depends="openssl pam libjpeg-turbo libX11 libXfixes libXrandr intltool libxslt fuse lame fdkaac opus pixman xorg"
+short_desc="Open source RDP server"
+maintainer="Martijn van Maurik <git@vmaurik.nl>"
+license="Apache-2.0"
+homepage="https://xrdp.org"
+distfiles="https://github.com/neutrinolabs/xrdp/releases/download/v$version/xrdp-$version.tar.gz"
+checksum="72a86bf3bb8ca3a41905bfa84f500ad73cd23615753f34db7e36278a33c19916"
+conf_files="
+	/etc/xrdp/cert.pem
+	/etc/xrdp/key.pem
+	/etc/xrdp/km-00000406.ini
+	/etc/xrdp/km-00000407.ini
+	/etc/xrdp/km-00000409.ini
+	/etc/xrdp/km-0000040a.ini
+	/etc/xrdp/km-0000040b.ini
+	/etc/xrdp/km-0000040c.ini
+	/etc/xrdp/km-00000410.ini
+	/etc/xrdp/km-00000411.ini
+	/etc/xrdp/km-00000412.ini
+	/etc/xrdp/km-00000414.ini
+	/etc/xrdp/km-00000415.ini
+	/etc/xrdp/km-00000416.ini
+	/etc/xrdp/km-00000419.ini
+	/etc/xrdp/km-0000041d.ini
+	/etc/xrdp/km-00000807.ini
+	/etc/xrdp/km-00000809.ini
+	/etc/xrdp/km-0000080a.ini
+	/etc/xrdp/km-0000080c.ini
+	/etc/xrdp/km-00000813.ini
+	/etc/xrdp/km-00000816.ini
+	/etc/xrdp/km-0000100c.ini
+	/etc/xrdp/km-00010409.ini
+	/etc/xrdp/km-19360409.ini
+	/etc/xrdp/pulse/default.pa
+	/etc/xrdp/reconnectwm.sh
+	/etc/xrdp/rsakeys.ini
+	/etc/xrdp/sesman.ini
+	/etc/xrdp/startwm.sh
+	/etc/xrdp/xrdp.ini
+	/etc/xrdp/xrdp_keyboard.ini"
+
+pre_configure() {
+	./bootstrap
+}
+
+post_install() {
+	vsv xrdp
+	vsv xrdp-sesman
+}

From 908276aa28cd204a14934ad6fb4f96032b6e86e8 Mon Sep 17 00:00:00 2001
From: Martijn van Maurik <git@vmaurik.nl>
Date: Tue, 15 Jun 2021 11:44:46 +0200
Subject: [PATCH 2/2] New package: xorgxrdp-0.2.16

---
 srcpkgs/xorgxrdp/template | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 srcpkgs/xorgxrdp/template

diff --git a/srcpkgs/xorgxrdp/template b/srcpkgs/xorgxrdp/template
new file mode 100644
index 000000000000..47bf6634a428
--- /dev/null
+++ b/srcpkgs/xorgxrdp/template
@@ -0,0 +1,22 @@
+# Template file for 'xorgxrdp'
+pkgname=xorgxrdp
+version=0.2.16
+revision=1
+archs="x86_64"
+build_style=gnu-configure
+configure_args="--build $XBPS_TARGET_MACHINE
+	--enable-rfxcodec --enable-mp3lame --enable-fdkaac --enable-opus --enable-pixman --enable-fuse --enable-jpeg --enable-ipv6 --libdir /usr/lib$XBPS_TARGET_WORDSIZE"
+make_build_args="EXTRA_FLAGS='-I${XBPS_CROSS_BASE}/usr/include'"
+hostmakedepends="pkg-config automake autoconf which nasm flex bison libxml2-python3 python3 libtool"
+makedepends="lame-devel opus-devel pixman-devel fuse-devel libjpeg-turbo-devel openssl-devel xorg-server-devel xrdp libdrm-devel"
+depends="lame fdkaac opus pixman fuse libjpeg-turbo xrdp libdrm"
+short_desc="Xorg videodriver for XRDP"
+maintainer="Martijn van Maurik <git@vmaurik.nl>"
+license="X11"
+homepage="https://xrdp.org"
+distfiles="https://github.com/neutrinolabs/xorgxrdp/releases/download/v$version/xorgxrdp-$version.tar.gz"
+checksum="e6b5f3df44cbf147dcbbc326cdd08c95fe28dba80c2a216e046fe42d962f9215"
+
+pre_configure() {
+	./bootstrap
+}

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: xorgxrdp and xrdp
  2021-06-15  9:49 [PR PATCH] xorgxrdp and xrdp combro2k
@ 2021-06-15 10:25 ` combro2k
  2021-06-15 15:01 ` New package: " combro2k
                   ` (6 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: combro2k @ 2021-06-15 10:25 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 194 bytes --]

New comment by combro2k on void-packages repository

https://github.com/void-linux/void-packages/pull/31512#issuecomment-861382256

Comment:
ARM and Musl I couldn't test, so if someone can :-) 

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: New package: xorgxrdp and xrdp
  2021-06-15  9:49 [PR PATCH] xorgxrdp and xrdp combro2k
  2021-06-15 10:25 ` combro2k
@ 2021-06-15 15:01 ` combro2k
  2021-07-01 19:59 ` Chocimier
                   ` (5 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: combro2k @ 2021-06-15 15:01 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 277 bytes --]

New comment by combro2k on void-packages repository

https://github.com/void-linux/void-packages/pull/31512#issuecomment-861575311

Comment:
I see some mistakes I made.
This is a  bit trial and error on my end, I'm not familair with void linux packaging only Debian and such.

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: New package: xorgxrdp and xrdp
  2021-06-15  9:49 [PR PATCH] xorgxrdp and xrdp combro2k
  2021-06-15 10:25 ` combro2k
  2021-06-15 15:01 ` New package: " combro2k
@ 2021-07-01 19:59 ` Chocimier
  2022-03-15 12:00 ` Anachron
                   ` (4 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: Chocimier @ 2021-07-01 19:59 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 886 bytes --]

New comment by Chocimier on void-packages repository

https://github.com/void-linux/void-packages/pull/31512#issuecomment-872512326

Comment:
Well.

Cross build fails because default build target generate keys with just-compiled binary.
Keys shouldn't be generated build-time, disable with 

    @@ -55,6 +53,11 @@ pre_configure() {
            ./bootstrap
     }
     
    +post_configure() {
    +       vsed -i keygen/Makefile -e 's@./xrdp-keygen@:@'
    +       vsed -i keygen/Makefile -e 's@$(OPENSSL)@:@'
    +}
    +
     post_install() {
            vsv xrdp
            vsv xrdp-sesman

Musl build fails because of wrong --build target passed. Pass none, build style gets that right.

Build of test need check-devel in checkdepends.

xorgxrdp should be build for all archs.

depends= are filled automatically, see 04-generate-runtime-deps in build log.

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: New package: xorgxrdp and xrdp
  2021-06-15  9:49 [PR PATCH] xorgxrdp and xrdp combro2k
                   ` (2 preceding siblings ...)
  2021-07-01 19:59 ` Chocimier
@ 2022-03-15 12:00 ` Anachron
  2022-03-16  9:48 ` combro2k
                   ` (3 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: Anachron @ 2022-03-15 12:00 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 209 bytes --]

New comment by Anachron on void-packages repository

https://github.com/void-linux/void-packages/pull/31512#issuecomment-1067905321

Comment:
@combro2k are you still interested? I may pick this one up if not.

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: New package: xorgxrdp and xrdp
  2021-06-15  9:49 [PR PATCH] xorgxrdp and xrdp combro2k
                   ` (3 preceding siblings ...)
  2022-03-15 12:00 ` Anachron
@ 2022-03-16  9:48 ` combro2k
  2022-06-15  2:16 ` github-actions
                   ` (2 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: combro2k @ 2022-03-16  9:48 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 308 bytes --]

New comment by combro2k on void-packages repository

https://github.com/void-linux/void-packages/pull/31512#issuecomment-1068930422

Comment:
Hi @Anachron please feel free to pick this up :-)
I don't have many time anymore to resolve the outstanding PR.
My work and private time has been changed a bit :-)

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: New package: xorgxrdp and xrdp
  2021-06-15  9:49 [PR PATCH] xorgxrdp and xrdp combro2k
                   ` (4 preceding siblings ...)
  2022-03-16  9:48 ` combro2k
@ 2022-06-15  2:16 ` github-actions
  2022-06-30  2:14 ` [PR PATCH] [Closed]: " github-actions
  2022-07-29  8:34 ` dezifit
  7 siblings, 0 replies; 9+ messages in thread
From: github-actions @ 2022-06-15  2:16 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 305 bytes --]

New comment by github-actions[bot] on void-packages repository

https://github.com/void-linux/void-packages/pull/31512#issuecomment-1155901273

Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that.  If this pull request is still relevant bump it or assign it.

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PR PATCH] [Closed]: New package: xorgxrdp and xrdp
  2021-06-15  9:49 [PR PATCH] xorgxrdp and xrdp combro2k
                   ` (5 preceding siblings ...)
  2022-06-15  2:16 ` github-actions
@ 2022-06-30  2:14 ` github-actions
  2022-07-29  8:34 ` dezifit
  7 siblings, 0 replies; 9+ messages in thread
From: github-actions @ 2022-06-30  2:14 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1441 bytes --]

There's a closed pull request on the void-packages repository

New package: xorgxrdp and xrdp
https://github.com/void-linux/void-packages/pull/31512

Description:
<!-- Mark items with [x] where applicable -->

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: New package: xorgxrdp and xrdp
  2021-06-15  9:49 [PR PATCH] xorgxrdp and xrdp combro2k
                   ` (6 preceding siblings ...)
  2022-06-30  2:14 ` [PR PATCH] [Closed]: " github-actions
@ 2022-07-29  8:34 ` dezifit
  7 siblings, 0 replies; 9+ messages in thread
From: dezifit @ 2022-07-29  8:34 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 555 bytes --]

New comment by dezifit on void-packages repository

https://github.com/void-linux/void-packages/pull/31512#issuecomment-1199019954

Comment:
@Anachron

> @combro2k are you still interested? I may pick this one up if not.

I also would like to see this package and tested the template with updated `xrdp` (0.9.19) on x86_64/glibc without issues (only replaced dependency `xorg` with the much lighter `xorg-server` package).  I'm not comfortable with the package submission process but am willing to help/test if needed. Any chance to add this package?

^ permalink raw reply	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2022-07-29  8:34 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-15  9:49 [PR PATCH] xorgxrdp and xrdp combro2k
2021-06-15 10:25 ` combro2k
2021-06-15 15:01 ` New package: " combro2k
2021-07-01 19:59 ` Chocimier
2022-03-15 12:00 ` Anachron
2022-03-16  9:48 ` combro2k
2022-06-15  2:16 ` github-actions
2022-06-30  2:14 ` [PR PATCH] [Closed]: " github-actions
2022-07-29  8:34 ` dezifit

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).