Accepting request 1177846 from X11:RemoteDesktop

OBS-URL: https://build.opensuse.org/request/show/1177846
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xrdp?expand=0&rev=57

force_stop

@@ -1,27 +0,0 @@
-#!/bin/sh -e
-
-DAEMON=${BASE}/sbin/xrdp
-SDAEMON=${BASE}/sbin/xrdp-sesman
-PIDDIR=/var/run/xrdp/
-
-force_stop() {
-
-DELAY=1
-PROCLIST="xrdp-sesman xrdp-sessvc xrdp-chansrv X11rdp Xvnc"
-
-    for p in $PROCLIST; do
-      pgrep -x $p >/dev/null && pkill  -x $p
-      sleep $DELAY
-      pgrep -x $p >/dev/null && pkill -9 -x $p
-    done
-    # let's not kill ourselves - the init script is called xrdp as well
-    pgrep -fx $DAEMON  >/dev/null && pkill -fx $DAEMON
-    sleep $DELAY
-    pgrep -fx $DAEMON  >/dev/null && pkill -9 -fx $DAEMON
-
-   rm -f $PIDDIR/xrdp*.pid
-}
-
-$0 stop
-# because it doesn't allways die the right way
-force_stop

xrdp.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri May 24 13:23:41 UTC 2024 - Thorsten Kukuk <kukuk@suse.com>
+
+- Drop initscripts-legacy support [jsc#PED264]
+- Drop rc<service> symlinks [jsc#PED-264], [jsc#PED-266]
+
 -------------------------------------------------------------------
 Mon Feb 26 12:18:21 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
 

xrdp.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package xrdp
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -32,7 +32,6 @@ Source0:        https://github.com/neutrinolabs/%{name}/releases/download/v%{ver
 Source1:        https://github.com/neutrinolabs/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.gz.asc
 Source2:        xrdp.keyring
 Source4:        sysconfig.xrdp
-Source5:        force_stop
 Source6:        xrdp.ini
 Source7:        sesman.ini
 Source100:      %{name}-rpmlintrc
@@ -132,13 +131,8 @@ find %{buildroot} -name '*.a' -delete
 find %{buildroot} -type f -name "*.la" -delete -print
 mkdir -p %{buildroot}/%{_fillupdir}
 install -m 644 %{SOURCE4} %{buildroot}/%{_fillupdir}/sysconfig.xrdp
-mkdir -p %{buildroot}/%{_libexecdir}/initscripts/legacy-actions/xrdp
-install -m 755 %{SOURCE5} %{buildroot}/%{_libexecdir}/initscripts/legacy-actions/xrdp/force_stop
 install -m 644 %{SOURCE6} %{SOURCE7} %{buildroot}/%{_sysconfdir}/xrdp/
 
-ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rcxrdp
-ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rcxrdp-sesman
-
 # remove a private key and certification file generated during make and
 # use certification file created at the post phase
 rm -f %{buildroot}/%{_sysconfdir}/xrdp/{cert,key}.pem
@@ -208,8 +202,6 @@ exit 0
 %{_mandir}/man1/*
 %{_mandir}/man5/*
 %{_mandir}/man8/*
-%{_libexecdir}/initscripts/legacy-actions/xrdp
-%{_sbindir}/rc*
 %{_sbindir}/xrdp*
 %dir %{_sysconfdir}/xrdp
 %config(noreplace) %{_sysconfdir}/xrdp/km*.ini