Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package cscreen for openSUSE:Factory checked
in at 2024-03-11 15:32:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cscreen (Old)
and /work/SRC/openSUSE:Factory/.cscreen.new.1770 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cscreen"
Mon Mar 11 15:32:18 2024 rev:9 rq:1156411 version:1.6
Changes:
--------
--- /work/SRC/openSUSE:Factory/cscreen/cscreen.changes 2024-02-13
22:43:32.886789839 +0100
+++ /work/SRC/openSUSE:Factory/.cscreen.new.1770/cscreen.changes
2024-03-11 15:38:41.400928417 +0100
@@ -1,0 +2,7 @@
+Fri Mar 8 16:00:49 UTC 2024 - o...@aepfle.de
+
+- version 1.6
+- Fix sysusers.d usage to make system-user-cscreen installable
+- Remove pre-systemd support
+
+-------------------------------------------------------------------
Old:
----
cscreen-1.5.tar.xz
New:
----
cscreen-1.6.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cscreen.spec ++++++
--- /var/tmp/diff_new_pack.CdbO69/_old 2024-03-11 15:38:42.144955817 +0100
+++ /var/tmp/diff_new_pack.CdbO69/_new 2024-03-11 15:38:42.144955817 +0100
@@ -1,7 +1,7 @@
#
# spec file for package cscreen
#
-# Copyright (c) 2020 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
@@ -16,19 +16,10 @@
#
-%define GROUPNAME _cscreen
%define USERNAME _cscreen
%define HOMEDIR %_localstatedir/lib/cscreen
-%if ! %{defined _fillupdir}
- %define _fillupdir %_localstatedir/adm/fillup-templates
-%endif
-%if 0%{?suse_version} > 1210
-%define has_systemd 1
-%else
-%define has_systemd 0
-%endif
Name: cscreen
-Version: 1.5
+Version: 1.6
Release: 0
Summary: Console screen
License: BSD-4-Clause
@@ -41,24 +32,16 @@
Requires: screen
Requires: sudo
Requires(postun): coreutils
-%if 0%{?has_systemd}
BuildRequires: pkgconfig(systemd)
BuildRequires: sysuser-tools
Requires(pre): system-user-%name = %version-%release
%{?systemd_ordering}
-%else
-PreReq: %fillup_prereq
-PreReq: %insserv_prereq
-PreReq: shadow
-%endif
BuildArch: noarch
-BuildRoot: %_tmppath/%name-%version-build
%description
This package allows to run multiple consoles in one 'screen' and
to start the screen automatically during boot.
-%if 0%{?has_systemd}
%package -n system-user-%name
Summary: System user %USERNAME
Requires(pre): group(dialout)
@@ -67,10 +50,9 @@
%description -n system-user-%name
System user %USERNAME
-%endif
%prep
-%setup
+%autosetup -p1
#
%build
#
@@ -82,31 +64,23 @@
fi
mkdir -p %buildroot/%_sbindir
-%if 0%{?has_systemd}
install -Dm644 systemd/cscreen.service %buildroot/%_unitdir/cscreend.service
pushd %buildroot/%_sbindir
ln -sf service %buildroot%_sbindir/rccscreend
popd
mkdir -vp %buildroot%_tmpfilesdir
tee %buildroot%_tmpfilesdir/%name.conf <<'_EOF_'
-d %_rundir/%name 0750 %USERNAME %GROUPNAME -
+d %_rundir/%name 0750 %USERNAME %USERNAME -
_EOF_
suc='system-user-%name.conf'
tee "${suc}" <<'_EOC_'
-u %USERNAME %GROUPNAME "cscreen daemon user" %{HOMEDIR} /bin/bash
+u %USERNAME - "cscreen daemon user" %HOMEDIR /bin/bash
m %USERNAME dialout
m %USERNAME tty
_EOC_
mkdir -p '%buildroot%_sysusersdir'
cp -avLt "$_" "${suc}"
%sysusers_generate_pre "${suc}" system-user-%name
-%else
-install -Dm644 configs/cscreen.sysconfig %buildroot/%_fillupdir/sysconfig.%name
-install -Dm755 systemd/cscreen.init %buildroot/%_sysconfdir/init.d/cscreend
-pushd %buildroot/%_sbindir
-ln -s %_sysconfdir/init.d/cscreend rccscreend
-popd
-%endif
install -Dm640 configs/cscreen.config %buildroot/%_sysconfdir/cscreenrc
install -Dm644 configs/cscreen.logrotate
%buildroot/%_sysconfdir/logrotate.d/%name
@@ -116,57 +90,26 @@
install -Dm755 src/cscreen_update_config.sh
%buildroot/%_bindir/cscreen_update_config.sh
mkdir -p %buildroot%_localstatedir/log/screen/old
-mkdir -pm700 %buildroot/%{HOMEDIR}
-mkdir -pm700 %buildroot/%{HOMEDIR}/.ssh
+mkdir -pm700 %buildroot/%HOMEDIR
+mkdir -pm700 %buildroot/%HOMEDIR/.ssh
%pre
-%if 0%{?has_systemd}
%service_add_pre cscreend.service
-%else
-getent group %{GROUPNAME} >/dev/null || groupadd -r %{GROUPNAME}
-if getent group tty >/dev/null;then
- TTY_GROUP="-G tty"
- if getent group dialout >/dev/null;then
- TTY_GROUP="$TTY_GROUP,dialout"
- fi
-else
- TTY_GROUP=""
- echo "WARNING: Could not find tty group"
-fi
-getent passwd %{USERNAME} >/dev/null || \
- useradd -r -g %{GROUPNAME} -d %{HOMEDIR} -s /bin/bash \
- -c "cscreen daemon user" %{USERNAME} $TTY_GROUP
-%endif
%post
-%if 0%{?has_systemd}
%service_add_post cscreend.service
%tmpfiles_create %_tmpfilesdir/%name.conf
-%else
-%{fillup_and_insserv cscreend }
-%fillup_only cscreen
-%endif
%preun
-%if 0%{?has_systemd}
%service_del_preun cscreend.service
-%else
-%stop_on_removal cscreend
-%endif
%postun
-%if 0%{?has_systemd}
%if %{defined service_del_postun_without_restart}
%service_del_postun_without_restart cscreend.service
%else
DISABLE_RESTART_ON_UPDATE=yes
%service_del_postun cscreend.service
%endif
-%else
-DISABLE_RESTART_ON_UPDATE=yes
-%restart_on_update cscreend
-%insserv_cleanup
-%endif
if [ -d /run/uscreens/S-cscreen ];then
if [ "$1" = "0" ];then
# Only delete on uninstall
@@ -174,14 +117,11 @@
fi
fi
-%if 0%{?has_systemd}
%pre -n system-user-%name -f system-user-%name.pre
%files -n system-user-%name
%_sysusersdir/*.conf
-%endif
%files -f %name.files
-%defattr(-,root,root)
%doc docs/motd_example
%if 0%{?suse_version} > 1320
%license License
@@ -189,20 +129,15 @@
%_bindir/%name
%_bindir/cscreen_update_config.sh
%_datadir/%name
-%if 0%{?has_systemd}
%_tmpfilesdir/%name.conf
%_unitdir/cscreend.service
-%else
-%attr(0644,root,root) %_fillupdir/sysconfig.%name
-%_sysconfdir/init.d/cscreend
-%endif
%_sbindir/rccscreend
%attr(0640,root,root) %config %_sysconfdir/sudoers.d/%name
-%attr(755,%{USERNAME}, %{GROUPNAME}) %dir %_localstatedir/log/screen
-%attr(755,%{USERNAME}, %{GROUPNAME}) %dir %_localstatedir/log/screen/old
-%attr(700,%{USERNAME}, %{GROUPNAME}) %dir %{HOMEDIR}
-%attr(700,%{USERNAME}, %{GROUPNAME}) %dir %{HOMEDIR}/.ssh
-%attr(644,%{USERNAME}, %{GROUPNAME}) %config(noreplace) %_sysconfdir/cscreenrc
+%attr(755,%{USERNAME}, %{USERNAME}) %dir %_localstatedir/log/screen
+%attr(755,%{USERNAME}, %{USERNAME}) %dir %_localstatedir/log/screen/old
+%attr(700,%{USERNAME}, %{USERNAME}) %dir %HOMEDIR
+%attr(700,%{USERNAME}, %{USERNAME}) %dir %HOMEDIR/.ssh
+%attr(644,%{USERNAME}, %{USERNAME}) %config(noreplace) %_sysconfdir/cscreenrc
%config(noreplace) %_sysconfdir/logrotate.d/%name
++++++ _service ++++++
--- /var/tmp/diff_new_pack.CdbO69/_old 2024-03-11 15:38:42.180957143 +0100
+++ /var/tmp/diff_new_pack.CdbO69/_new 2024-03-11 15:38:42.184957290 +0100
@@ -2,7 +2,7 @@
<service mode="disabled" name="obs_scm">
<param name="url">https://github.com/openSUSE/cscreen.git</param>
<param name="scm">git</param>
- <param name="revision">8ffffaa4988062dde0728ef4ff8e6c447b218588</param>
+ <param name="revision">2340b1d08bde46b6a21910dba076587dcb3be5b5</param>
<param name="versionformat">@PARENT_TAG@</param>
<param name="versionrewrite-pattern">[v]?([^\+]+)(.*)</param>
<param name="versionrewrite-replacement">\1</param>
++++++ cscreen-1.5.tar.xz -> cscreen-1.6.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cscreen-1.5/configs/cscreen.sysconfig
new/cscreen-1.6/configs/cscreen.sysconfig
--- old/cscreen-1.5/configs/cscreen.sysconfig 2024-02-05 23:41:18.000000000
+0100
+++ new/cscreen-1.6/configs/cscreen.sysconfig 1970-01-01 01:00:00.000000000
+0100
@@ -1,16 +0,0 @@
-## Path: Hardware/Console/Screen
-## Description: Console screen settings
-## Type: string(root,_cscreen)
-## Default: "_cscreen"
-#
-# The owner of the screen session.
-#
-SCREEN_OWNER="_cscreen"
-
-## Type: integer(1:)
-## Default: "2048"
-#
-# The maximum number of open file descriptors.
-# (set via ulimit -n)
-#
-SCREEN_FILE_LIMIT="2048"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cscreen-1.5/cscreen.spec new/cscreen-1.6/cscreen.spec
--- old/cscreen-1.5/cscreen.spec 2024-02-05 23:41:18.000000000 +0100
+++ new/cscreen-1.6/cscreen.spec 2024-03-08 16:55:42.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package cscreen
#
-# Copyright (c) 2020 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
@@ -16,17 +16,8 @@
#
-%define GROUPNAME _cscreen
%define USERNAME _cscreen
%define HOMEDIR %_localstatedir/lib/cscreen
-%if ! %{defined _fillupdir}
- %define _fillupdir %_localstatedir/adm/fillup-templates
-%endif
-%if 0%{?suse_version} > 1210
-%define has_systemd 1
-%else
-%define has_systemd 0
-%endif
Name: cscreen
Version: 0
Release: 0
@@ -41,24 +32,16 @@
Requires: screen
Requires: sudo
Requires(postun): coreutils
-%if 0%{?has_systemd}
BuildRequires: pkgconfig(systemd)
BuildRequires: sysuser-tools
Requires(pre): system-user-%name = %version-%release
%{?systemd_ordering}
-%else
-PreReq: %fillup_prereq
-PreReq: %insserv_prereq
-PreReq: shadow
-%endif
BuildArch: noarch
-BuildRoot: %_tmppath/%name-%version-build
%description
This package allows to run multiple consoles in one 'screen' and
to start the screen automatically during boot.
-%if 0%{?has_systemd}
%package -n system-user-%name
Summary: System user %USERNAME
Requires(pre): group(dialout)
@@ -67,10 +50,9 @@
%description -n system-user-%name
System user %USERNAME
-%endif
%prep
-%setup
+%autosetup -p1
#
%build
#
@@ -82,31 +64,23 @@
fi
mkdir -p %buildroot/%_sbindir
-%if 0%{?has_systemd}
install -Dm644 systemd/cscreen.service %buildroot/%_unitdir/cscreend.service
pushd %buildroot/%_sbindir
ln -sf service %buildroot%_sbindir/rccscreend
popd
mkdir -vp %buildroot%_tmpfilesdir
tee %buildroot%_tmpfilesdir/%name.conf <<'_EOF_'
-d %_rundir/%name 0750 %USERNAME %GROUPNAME -
+d %_rundir/%name 0750 %USERNAME %USERNAME -
_EOF_
suc='system-user-%name.conf'
tee "${suc}" <<'_EOC_'
-u %USERNAME %GROUPNAME "cscreen daemon user" %{HOMEDIR} /bin/bash
+u %USERNAME - "cscreen daemon user" %HOMEDIR /bin/bash
m %USERNAME dialout
m %USERNAME tty
_EOC_
mkdir -p '%buildroot%_sysusersdir'
cp -avLt "$_" "${suc}"
%sysusers_generate_pre "${suc}" system-user-%name
-%else
-install -Dm644 configs/cscreen.sysconfig %buildroot/%_fillupdir/sysconfig.%name
-install -Dm755 systemd/cscreen.init %buildroot/%_sysconfdir/init.d/cscreend
-pushd %buildroot/%_sbindir
-ln -s %_sysconfdir/init.d/cscreend rccscreend
-popd
-%endif
install -Dm640 configs/cscreen.config %buildroot/%_sysconfdir/cscreenrc
install -Dm644 configs/cscreen.logrotate
%buildroot/%_sysconfdir/logrotate.d/%name
@@ -116,57 +90,26 @@
install -Dm755 src/cscreen_update_config.sh
%buildroot/%_bindir/cscreen_update_config.sh
mkdir -p %buildroot%_localstatedir/log/screen/old
-mkdir -pm700 %buildroot/%{HOMEDIR}
-mkdir -pm700 %buildroot/%{HOMEDIR}/.ssh
+mkdir -pm700 %buildroot/%HOMEDIR
+mkdir -pm700 %buildroot/%HOMEDIR/.ssh
%pre
-%if 0%{?has_systemd}
%service_add_pre cscreend.service
-%else
-getent group %{GROUPNAME} >/dev/null || groupadd -r %{GROUPNAME}
-if getent group tty >/dev/null;then
- TTY_GROUP="-G tty"
- if getent group dialout >/dev/null;then
- TTY_GROUP="$TTY_GROUP,dialout"
- fi
-else
- TTY_GROUP=""
- echo "WARNING: Could not find tty group"
-fi
-getent passwd %{USERNAME} >/dev/null || \
- useradd -r -g %{GROUPNAME} -d %{HOMEDIR} -s /bin/bash \
- -c "cscreen daemon user" %{USERNAME} $TTY_GROUP
-%endif
%post
-%if 0%{?has_systemd}
%service_add_post cscreend.service
%tmpfiles_create %_tmpfilesdir/%name.conf
-%else
-%{fillup_and_insserv cscreend }
-%fillup_only cscreen
-%endif
%preun
-%if 0%{?has_systemd}
%service_del_preun cscreend.service
-%else
-%stop_on_removal cscreend
-%endif
%postun
-%if 0%{?has_systemd}
%if %{defined service_del_postun_without_restart}
%service_del_postun_without_restart cscreend.service
%else
DISABLE_RESTART_ON_UPDATE=yes
%service_del_postun cscreend.service
%endif
-%else
-DISABLE_RESTART_ON_UPDATE=yes
-%restart_on_update cscreend
-%insserv_cleanup
-%endif
if [ -d /run/uscreens/S-cscreen ];then
if [ "$1" = "0" ];then
# Only delete on uninstall
@@ -174,14 +117,11 @@
fi
fi
-%if 0%{?has_systemd}
%pre -n system-user-%name -f system-user-%name.pre
%files -n system-user-%name
%_sysusersdir/*.conf
-%endif
%files -f %name.files
-%defattr(-,root,root)
%doc docs/motd_example
%if 0%{?suse_version} > 1320
%license License
@@ -189,21 +129,16 @@
%_bindir/%name
%_bindir/cscreen_update_config.sh
%_datadir/%name
-%if 0%{?has_systemd}
%_tmpfilesdir/%name.conf
%_unitdir/cscreend.service
-%else
-%attr(0644,root,root) %_fillupdir/sysconfig.%name
-%_sysconfdir/init.d/cscreend
-%endif
%_sbindir/rccscreend
%attr(0640,root,root) %config %_sysconfdir/sudoers.d/%name
-%attr(755,%{USERNAME}, %{GROUPNAME}) %dir %_localstatedir/log/screen
-%attr(755,%{USERNAME}, %{GROUPNAME}) %dir %_localstatedir/log/screen/old
-%attr(700,%{USERNAME}, %{GROUPNAME}) %dir %{HOMEDIR}
-%attr(700,%{USERNAME}, %{GROUPNAME}) %dir %{HOMEDIR}/.ssh
-%attr(644,%{USERNAME}, %{GROUPNAME}) %config(noreplace) %_sysconfdir/cscreenrc
+%attr(755,%{USERNAME}, %{USERNAME}) %dir %_localstatedir/log/screen
+%attr(755,%{USERNAME}, %{USERNAME}) %dir %_localstatedir/log/screen/old
+%attr(700,%{USERNAME}, %{USERNAME}) %dir %HOMEDIR
+%attr(700,%{USERNAME}, %{USERNAME}) %dir %HOMEDIR/.ssh
+%attr(644,%{USERNAME}, %{USERNAME}) %config(noreplace) %_sysconfdir/cscreenrc
%config(noreplace) %_sysconfdir/logrotate.d/%name
%changelog
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cscreen-1.5/systemd/cscreen.init
new/cscreen-1.6/systemd/cscreen.init
--- old/cscreen-1.5/systemd/cscreen.init 2024-02-05 23:41:18.000000000
+0100
+++ new/cscreen-1.6/systemd/cscreen.init 1970-01-01 01:00:00.000000000
+0100
@@ -1,144 +0,0 @@
-#!/bin/sh
-# Copyright (c) 2011 SUSE Linux Products GmbH, Nuernberg, Germany.
-# All rights reserved.
-#
-# Author: Lars Vogdt
-#
-# /etc/init.d/cscreen
-# and its symbolic link
-# /(usr/)sbin/rccscreen
-#
-### BEGIN INIT INFO
-# Provides: cscreen
-# Required-Start: $network $named $remote_fs
-# Should-Start: $time sendmail
-# Required-Stop: $network $named $remote_fs
-# Should-Stop: $time sendmail
-# Default-Start: 3 5
-# Default-Stop: 0 1 2 6
-# Short-Description: cscreen providing access to other hosts
-# Description: Start cscreen to provide access to hosts
-# via the screen command.
-### END INIT INFO
-#
-
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-export PATH
-
-SCREEN_OWNER='_cscreen'
-SCREEN_NAME='console'
-SCREENRC='/etc/cscreenrc'
-SCREEN_HISTORY="20000"
-SCREEN_SHELL='/usr/share/cscreen/cscreen-shell'
-sysconfig='/etc/sysconfig/cscreen'
-screen='/usr/bin/screen'
-pidfile='/var/run/cscreen.pid'
-
-test -x "$screen" || { echo "$screen not installed";
- if [ "$1" = "stop" ]; then exit 0;
- else exit 5; fi;
-}
-test -r "$sysconfig" || { echo "$sysconfig not existing";
- if [ "$1" = "stop" ]; then exit 0;
- else exit 6; fi;
-}
-
-. "$sysconfig"
-
-test -r "$SCREENRC" || { echo "$SCREENRC not existing";
- if [ "$1" = "stop" ]; then exit 0;
- else exit 6; fi;
-}
-
-function test_screen(){
- $screen -q -ls $SCREEN_OWNER/$SCREEN_NAME < /dev/null > /dev/null 2>&1
- errmsg=$?
- if [ $errmsg -gt 10 ]; then
- return 0
- else
- return 1
- fi
-}
-
-function getpid(){
- PID=$(ps aux | grep -i 'screen' | grep $SCREEN_OWNER | grep
$SCREEN_NAME | awk '" " { print $2 }')
- echo "$PID"
-}
-
-# Shell functions sourced from /etc/rc.status
-. /etc/rc.status
-
-# Reset status of this service
-rc_reset
-
-case "$1" in
- start)
- echo -n "Starting cscreen "
- test_screen
- ret=$?
- case $ret in
- 0) echo "already running "
- ;;
- *)
- createcmd="(ulimit -n $SCREEN_FILE_LIMIT; $screen -wipe
$SCREEN_NAME; $screen -h $SCREEN_HISTORY -s $SCREEN_SHELL -d -m -S $SCREEN_NAME
-c $SCREENRC) < /dev/null > /dev/null 2>&1"
- su $SCREEN_OWNER -c "/bin/sh -c '$createcmd'"
- ;;
- esac
- PID=$(getpid)
- echo "$PID" > "$pidfile"
- rc_status -v
- ;;
- stop)
- echo -n "Shutting down cscreen "
- test_screen
- ret=$?
- case $ret in
- 0) su $SCREEN_OWNER -c "screen -S $SCREEN_NAME -X quit"
- killproc -p "$pidfile" $screen
- ;;
- *) echo "not running "
- ;;
- esac
- test -f $pidfile && rm $pidfile
- rc_failed 0
- rc_status -v
- ;;
- try-restart|condrestart)
- if test "$1" = "condrestart"; then
- echo "${attn} Use try-restart ${done}(LSB)${attn} rather than
condrestart ${warn}(RH)${norm}"
- fi
- $0 status
- if test $? = 0; then
- $0 restart
- else
- rc_reset # Not running is not a failure.
- fi
- rc_status
- ;;
- restart)
- $0 stop
- $0 start
- rc_status
- ;;
- status)
- echo -n "Checking for cscreen "
- test_screen
- ret=$?
- case $ret in
- 0) rc_failed 0
- ;;
- *) rc_failed 1
- ;;
- esac
- rc_status -v
- ;;
- probe)
- test "$screenrc" -nt "$pidfile" && echo reload
- ;;
- *)
- echo "Usage: $0
{start|stop|status|try-restart|restart|force-reload|reload|probe}"
- exit 1
- ;;
-esac
-rc_exit
-
