wok-6.x rev 22307

updated xrdp and xrdp-dev (0.9.3.1 -> 0.9.11)
author Hans-G?nter Theisgen
date Thu Nov 14 08:51:10 2019 +0100 (2019-11-14)
parents 029363c383f4
children 2cf22d62d7ce
files xrdp-dev/receipt xrdp/receipt
line diff
     1.1 --- a/xrdp-dev/receipt	Thu Nov 14 08:31:54 2019 +0100
     1.2 +++ b/xrdp-dev/receipt	Thu Nov 14 08:51:10 2019 +0100
     1.3 @@ -1,21 +1,22 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="xrdp-dev"
     1.7 -VERSION="0.9.3.1"
     1.8 +VERSION="0.9.11"
     1.9  CATEGORY="development"
    1.10  SHORT_DESC="An open source remote desktop protocol(rdp) server, development files."
    1.11  MAINTAINER="pascal.bellard@slitaz.org"
    1.12  LICENSE="GPL2"
    1.13  WEB_SITE="http://www.xrdp.org/"
    1.14 +
    1.15 +DEPENDS="pkg-config xrdp"
    1.16  WANTED="xrdp"
    1.17  
    1.18 -DEPENDS="xrdp pkg-config"
    1.19 -
    1.20  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.21  genpkg_rules()
    1.22  {
    1.23  	mkdir -p $fs/usr/lib/xrdp
    1.24 -	cp -a $install/usr/lib/xrdp/*a $fs/usr/lib/xrdp/
    1.25 -	cp -a $install/usr/lib/pkgconfig $fs/usr/lib/
    1.26 -	cp -a $install/usr/include $fs/usr/
    1.27 +
    1.28 +	cp -a $install/usr/lib/xrdp/*a		$fs/usr/lib/xrdp/
    1.29 +	cp -a $install/usr/lib/pkgconfig	$fs/usr/lib/
    1.30 +	cp -a $install/usr/include		$fs/usr/
    1.31  }
     2.1 --- a/xrdp/receipt	Thu Nov 14 08:31:54 2019 +0100
     2.2 +++ b/xrdp/receipt	Thu Nov 14 08:51:10 2019 +0100
     2.3 @@ -1,29 +1,31 @@
     2.4  # SliTaz package receipt.
     2.5  
     2.6  PACKAGE="xrdp"
     2.7 -VERSION="0.9.3.1"
     2.8 +VERSION="0.9.11"
     2.9  CATEGORY="network"
    2.10  SHORT_DESC="An open source remote desktop protocol(rdp) server."
    2.11  MAINTAINER="pascal.bellard@slitaz.org"
    2.12  LICENSE="Apache"
    2.13 +WEB_SITE="http://www.xrdp.org/"
    2.14 +
    2.15  TARBALL="$PACKAGE-$VERSION.tar.gz"
    2.16 -WEB_SITE="http://www.xrdp.org/"
    2.17 -WGET_URL="https://github.com/neutrinolabs/xrdp/releases/download/v$VERSION/$TARBALL"
    2.18 +WGET_URL="https://github.com/neutrinolabs/$PACKAGE/releases/download/v$VERSION/$TARBALL"
    2.19  
    2.20 -DEPENDS="libssl zlib xorg-libX11 xorg-libXfixes xorg-libSM xorg-libICE \
    2.21 -xorg-libXrandr xorg-libXext pam util-linux-uuid xorgxrdp"
    2.22 -BUILD_DEPENDS="autoconf automake libtool pkg-config openssl-dev pam-dev \
    2.23 -xorg-dev util-linux-uuid-dev nasm"
    2.24 +DEPENDS="libssl pam util-linux-uuid xorg-libICE xorg-libSM xorg-libX11 
    2.25 +	xorg-libXext xorg-libXfixes xorg-libXrandr xorgxrdp zlib"
    2.26 +BUILD_DEPENDS="autoconf automake libtool nasm openssl-dev pam-dev 
    2.27 +	pkg-config util-linux-uuid-dev xorg-dev"
    2.28  
    2.29  # Rules to configure and make the package.
    2.30  compile_rules()
    2.31  {
    2.32  	./bootstrap &&
    2.33 -	./configure --prefix=/usr \
    2.34 -		--sysconfdir=/etc \
    2.35 -		--mandir=/usr/share/man \
    2.36 -		--localstatedir=/var \
    2.37 -		--enable-ipv6 \
    2.38 +	./configure			\
    2.39 +		--prefix=/usr		\
    2.40 +		--sysconfdir=/etc	\
    2.41 +		--mandir=/usr/share/man	\
    2.42 +		--localstatedir=/var	\
    2.43 +		--enable-ipv6		\
    2.44  		$CONFIGURE_ARGS &&
    2.45  	make &&
    2.46  	make DESTDIR=$DESTDIR install
    2.47 @@ -32,18 +34,25 @@
    2.48  # Rules to gen a SliTaz package suitable for Tazpkg.
    2.49  genpkg_rules()
    2.50  {
    2.51 -	mkdir -p $fs/usr/lib/xrdp $fs/usr/share $install/usr/share/doc
    2.52 -	cp -a $src/*.txt $src/*.md $src/COPYING $install/usr/share/doc
    2.53 -	cp -a $install/etc $fs/
    2.54 -	cp -a $install/usr/lib/xrdp/*.so* $fs/usr/lib/xrdp/
    2.55 -	cp -a $install/usr/sbin $fs/usr/
    2.56 -	cp -a $install/usr/bin $fs/usr/
    2.57 -	cp -a $install/usr/share/xrdp $fs/usr/share/
    2.58 -	mv $fs/etc/xrdp/xrdp.sh $fs/etc/init.d/xrdp
    2.59 +	mkdir -p $fs/usr/lib/xrdp
    2.60 +	mkdir -p $fs/usr/share
    2.61 +	mkdir -p $install/usr/share/doc
    2.62 +
    2.63 +	cp -a $src/*.txt			$install/usr/share/doc
    2.64 +	cp -a $src/*.md				$install/usr/share/doc
    2.65 +	cp -a $src/COPYING			$install/usr/share/doc
    2.66 +	cp -a $install/etc			$fs/
    2.67 +	cp -a $install/usr/lib/xrdp/*.so*	$fs/usr/lib/xrdp/
    2.68 +	cp -a $install/usr/sbin			$fs/usr/
    2.69 +	cp -a $install/usr/bin			$fs/usr/
    2.70 +	cp -a $install/usr/share/xrdp		$fs/usr/share/
    2.71 +	mv $fs/etc/xrdp/xrdp.sh			$fs/etc/init.d/xrdp
    2.72 +
    2.73  	sed -i	-e 's|/usr/local|/usr|;s|xrdp\.sh|xrdp|' \
    2.74  		-e 's|--noheading -C||' \
    2.75  		-e 's,grep -q -i,grep /usr/sbin | &,' \
    2.76  		$fs/etc/init.d/xrdp
    2.77 +
    2.78  	SESSION="/usr/bin/lxde-session"
    2.79  	sed -i "s|xterm|[ -x $SESSION ] \\&\\& exec $SESSION\\n &|" \
    2.80  		$fs/etc/xrdp/startwm.sh