Hello community, here is the log from the commit of package mrsh for openSUSE:Factory checked in at 2016-12-02 16:41:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mrsh (Old) and /work/SRC/openSUSE:Factory/.mrsh.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mrsh" Changes: -------- --- /work/SRC/openSUSE:Factory/mrsh/mrsh.changes 2016-10-31 09:54:49.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.mrsh.new/mrsh.changes 2016-12-02 16:41:19.000000000 +0100 @@ -1,0 +2,39 @@ +Sun Nov 27 22:44:45 UTC 2016 - jengelh@inai.de + +- Use SUSE rpm group classifications + +------------------------------------------------------------------- +Wed Nov 23 16:17:54 UTC 2016 - eich@suse.com + +- Fix services-Do-not-require-non-standard-entries-in-etc-services.patch + to set endianess correctly on ports. +- Patch both mrlogin and mrsh to replace system-auth. This fixes mrlogin. + +------------------------------------------------------------------- +Tue Nov 22 16:23:18 UTC 2016 - eich@suse.com + +- Fix up %pre, %post, %preun and %postun scripts to work with + systemd. + +------------------------------------------------------------------- +Tue Nov 22 07:39:33 UTC 2016 - eich@suse.com + +- Use systemd only on versions where supported. +- Add pkg-config and systemd-devel to BuildRequires: + where applicable. +- Handle & package xinetd.d files where no systemd is available, + package systemd unit files where applicable. + +------------------------------------------------------------------- +Tue Nov 15 16:02:01 UTC 2016 - pmladek@suse.com + +- Make mrsh-rsh-compat depend on exact version of the main package. + Remove conflict with rsh-server. +- Split mrsh-rsh-server-compat into separate package. And create + the compat symlinks for rlogind/rshd. +- Do not explicitly create symlinks for in.rshd.8/in.rlogind.8 + manpages. They are installed by make install. +- Restart xinetd in the mrsh-server package instead of the main one. + Do so using %%restart_on_update macro instead of a custom hack. + +------------------------------------------------------------------- @@ -8,0 +48,7 @@ +- services-Do-not-require-non-standard-entries-in-etc-services.patch: + Fix mrsh so that no modifications to /etc/services are required. +- mrlogin-Don-t-use-union-wait.patch + 'union wait' is no longer allowed. Replace by a simple int type + and test macro. +- autogen.sh-Add-force-to-libtoolize.patch + Add '--force' to libtoolize run. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mrsh.spec ++++++ --- /var/tmp/diff_new_pack.AEpHQC/_old 2016-12-02 16:41:20.000000000 +0100 +++ /var/tmp/diff_new_pack.AEpHQC/_new 2016-12-02 16:41:20.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package mrsh # -# Copyright (c) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,19 +15,31 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + +%if 0%{?suse_version} >= 1230 +%define have_systemd 1 +%endif + Name: mrsh Version: 2.12 Release: 0 Summary: Remote shell program that uses munge authentication License: GPL-2.0+ Group: Productivity/Clustering/Computing -URL: https://github.com/chaos/mrsh +Url: https://github.com/chaos/mrsh Source0: https://github.com/chaos/mrsh/archive/%{version}.tar.gz Patch1: services-Do-not-require-non-standard-entries-in-etc-services.patch Patch2: mrlogin-Don-t-use-union-wait.patch Patch3: autogen.sh-Add-force-to-libtoolize.patch -BuildRequires: ncurses-devel pam-devel munge-devel +BuildRequires: munge-devel +BuildRequires: ncurses-devel +BuildRequires: pam-devel +BuildRequires: pkg-config Requires: munge >= 0.1-0 +%if 0%{?have_systemd} +BuildRequires: systemd-devel +Requires(post): systemd +%endif # support re-run of autogen BuildRequires: autoconf @@ -42,20 +54,30 @@ %package -n %{name}-server Summary: Servers for remote access commands (mrsh, mrlogin, mrcp) -Group: System Environment/Daemons +Group: System/Daemons Requires: xinetd + %description -n %{name}-server Server daemons for remote access commands (mrsh, mrlogin, mrcp) %package -n %{name}-rsh-compat Summary: Rsh compatibility package for mrcp/mrlogin/mrsh -Group: System Environment/Base -Requires: mrsh +Group: System/Base +Requires: mrsh = %version Conflicts: rsh -Conflicts: rsh-server + %description -n %{name}-rsh-compat This package provides rsh compatibility for mrcp/mrlogin/mrsh +%package -n %{name}-rsh-server-compat +Summary: Rsh server compatibility package for mrlogind/mrshd +Group: System/Daemons +Requires: mrsh-server = %version +Conflicts: rsh-server + +%description -n %{name}-rsh-server-compat +This package provides rsh server compatibility for mrlogind/mrshd + %prep %setup -q -n %{name}-%{version} %patch1 -p1 @@ -73,13 +95,46 @@ %install DESTDIR="%{buildroot}" make install -ln -f %{buildroot}%{_mandir}/man8/mrshd.8 %{buildroot}%{_mandir}/man8/in.rshd.8 -ln -f %{buildroot}%{_mandir}/man8/mrlogind.8 %{buildroot}%{_mandir}/man8/in.rlogind.8 +ln -sf in.mrlogind %{buildroot}%{_sbindir}/in.rlogind +ln -sf in.mrshd %{buildroot}%{_sbindir}/in.rshd -sed -i 's#\(account\s\+include\s\+\)system-auth#\1common-account#' %{buildroot}/%{_sysconfdir}/pam.d/mrsh -sed -i 's#\(session\s\+include\s\+\)system-auth#\1common-session#' %{buildroot}/%{_sysconfdir}/pam.d/mrsh +for i in mrsh mrlogin +do + sed -i 's#\(account\s\+include\s\+\)system-auth#\1common-account#' %{buildroot}/%{_sysconfdir}/pam.d/$i + sed -i 's#\(session\s\+include\s\+\)system-auth#\1common-session#' %{buildroot}/%{_sysconfdir}/pam.d/$i +done +%if 0%{!?have_systemd} sed -i 's#disable\s*= yes#disable = no#' %{buildroot}/etc/xinetd.d/mrlogind sed -i 's#disable\s*= yes#disable = no#' %{buildroot}/etc/xinetd.d/mrshd +%endif + +%pre +%if 0%{?have_systemd} +%service_add_pre mrshd.socket mrlogind.socket +%endif + +%post server +%if 0%{?have_systemd} +%service_add_post mrshd.socket mrlogind.socket +%else +%restart_on_update xinetd +%endif + +%if 0%{?suse_version} > 1320 || 0%{?sle_version} > 120100 +%define service_arg 1 +%endif + +%preun +%if 0%{?have_systemd} +%service_del_preun %{?service_arg:-f} mrshd.socket mrlogind.socket +%endif + +%postun server +%if 0%{?have_systemd} +%service_del_postun %{?service_arg:-n} mrshd.socket mrlogind.socket +%else +%restart_on_update xinetd +%endif %files %defattr(-,root,root) @@ -93,27 +148,34 @@ %files -n %{name}-server %defattr(-,root,root) -%attr(644,root,root) %config(noreplace) /etc/xinetd.d/mrshd -%attr(644,root,root) %config(noreplace) /etc/xinetd.d/mrlogind +%{!?have_systemd:%attr(644,root,root) %config(noreplace) /etc/xinetd.d/mrshd} +%{!?have_systemd:%attr(644,root,root) %config(noreplace) /etc/xinetd.d/mrlogind} %attr(644,root,root) %config(noreplace) /etc/pam.d/mrsh %attr(644,root,root) %config(noreplace) /etc/pam.d/mrlogin +%{?have_systemd:%{_unitdir}/*} %{_mandir}/man8/in.mrlogind.8* %{_mandir}/man8/in.mrshd.8* %{_mandir}/man8/mrlogind.8* %{_mandir}/man8/mrshd.8* -%{_sbindir}/* +%{_sbindir}/in.mrlogind +%{_sbindir}/in.mrshd %files -n %{name}-rsh-compat %defattr(-,root,root) %{_mandir}/man1/rcp.1* %{_mandir}/man1/rsh.1* %{_mandir}/man1/rlogin.1* +%{_bindir}/rcp +%{_bindir}/rsh +%{_bindir}/rlogin + +%files -n %{name}-rsh-server-compat +%defattr(-,root,root) %{_mandir}/man8/in.rlogind.8* %{_mandir}/man8/in.rshd.8* %{_mandir}/man8/rlogind.8* %{_mandir}/man8/rshd.8* -%{_bindir}/rcp -%{_bindir}/rsh -%{_bindir}/rlogin +%{_sbindir}/in.rlogind +%{_sbindir}/in.rshd %changelog ++++++ services-Do-not-require-non-standard-entries-in-etc-services.patch ++++++ --- /var/tmp/diff_new_pack.AEpHQC/_old 2016-12-02 16:41:20.000000000 +0100 +++ /var/tmp/diff_new_pack.AEpHQC/_new 2016-12-02 16:41:20.000000000 +0100 @@ -59,7 +59,7 @@ - (void)fprintf(stderr, "mrcp: %s/tcp: unknown service\n", shell); - exit(1); + if (sp == NULL && service_port == 0) { -+ service_port = 21212; ++ service_port = htons(21212); } port = (service_port) ? service_port : sp->s_port; @@ -75,7 +75,7 @@ - fprintf(stderr, "mrlogin: mlogin/tcp: unknown service.\n"); - exit(1); + if (sp == NULL && service_port == 0) { -+ service_port = 541; ++ service_port = htons(541); } t = getenv("TERM"); @@ -91,7 +91,7 @@ - fprintf(stderr, "mrsh: mshell/tcp: unknown service.\n"); - exit(1); + if (sp == NULL && service_port == 0) { -+ service_port = 21212; ++ service_port = htons(21212); } rem = mcmd(&host,