Author: jajcus Date: Mon May 10 12:37:21 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- 'upstart_native' branch merged
- restart upstart service on upgrade
---- Files affected:
packages/openssh:
openssh.spec (1.335 -> 1.336) , opensshd.init (1.35 -> 1.36)
---- Diffs:
================================================================
Index: packages/openssh/openssh.spec
diff -u packages/openssh/openssh.spec:1.335 packages/openssh/openssh.spec:1.336
--- packages/openssh/openssh.spec:1.335 Fri Apr 16 14:56:33 2010
+++ packages/openssh/openssh.spec Mon May 10 14:37:15 2010
@@ -32,7 +32,7 @@
Summary(uk.UTF-8): OpenSSH - вільна реалізація протоколу Secure Shell (SSH)
Name: openssh
Version: 5.5p1
-Release: 2
+Release: 2.1
Epoch: 2
License: BSD
Group: Applications/Networking
@@ -46,6 +46,7 @@
Source5: ssh-agent.sh
Source6: ssh-agent.conf
Source7: %{name}-lpk.schema
+Source8: %{name}d.upstart
Patch100: %{name}-heimdal.patch
Patch0: %{name}-no_libnsl.patch
Patch2: %{name}-pam_misc.patch
@@ -96,6 +97,26 @@
%define _privsepdir /usr/share/empty
%define schemadir /usr/share/openldap/schema
+## to be moved to rpm-build-macros
+## TODO: handle RPM_SKIP_AUTO_RESTART
+
+# migrate from init script to upstart job
+%define upstart_post() \
+ if [ -f /var/lock/subsys/"%1" ] ; then \
+ /sbin/service --no-upstart "%1" stop \
+ /sbin/service "%1" start \
+ else \
+ /sbin/service "%1" try-restart \
+ fi
+
+# restart the job after upgrade or migrate to init script on removal
+%define upstart_postun() \
+ if [ -x /sbin/initctl ] && /sbin/initctl status "%1" 2>/dev/null | grep
-q 'running' ; then \
+ /sbin/initctl stop "%1" 2>/dev/null \
+ [ -f "/etc/rc.d/init.d/%1" -o -f "/etc/init/%1.conf" ] &&
/sbin/service "%1" start \
+ fi
+
+
%description
Ssh (Secure Shell) a program for logging into a remote machine and for
executing commands in a remote machine. It is intended to replace
@@ -332,7 +353,7 @@
Requires(pre): /usr/sbin/useradd
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: pam >= %{pam_ver}
-Requires: rc-scripts >= 0.4.1.23
+Requires: rc-scripts >= 0.4.3.0
Requires: util-linux
Suggests: /bin/login
Provides: ssh-server
@@ -400,6 +421,19 @@
частина протоколу Secure Shell, яка дозволяє клієнтам ssh зв'язуватись
з вашим хостом.
+%package server-upstart
+Summary: Upstart job description for OpenSSH server
+Summary(pl.UTF-8): Opis zadania Upstart dla serwera OpenSSH
+Group: Daemons
+Requires: %{name}-server = %{epoch}:%{version}-%{release}
+Requires: upstart >= 0.6
+
+%description server-upstart
+Upstart job description for OpenSSH.
+
+%description server-upstart -l pl.UTF-8
+Opis zadania Upstart dla OpenSSH.
+
%package gnome-askpass
Summary: OpenSSH GNOME passphrase dialog
Summary(de.UTF-8): OpenSSH GNOME Passwort-Dialog
@@ -538,7 +572,7 @@
%install
rm -rf $RPM_BUILD_ROOT
-install -d
$RPM_BUILD_ROOT{%{_sysconfdir},/etc/{pam.d,rc.d/init.d,sysconfig,security,env.d}}
\
+install -d
$RPM_BUILD_ROOT{%{_sysconfdir},/etc/{init,pam.d,rc.d/init.d,sysconfig,security,env.d}}
\
$RPM_BUILD_ROOT{%{_libexecdir}/ssh,%{schemadir}}
install -d $RPM_BUILD_ROOT/etc/{profile.d,X11/xinit/xinitrc.d}
@@ -555,6 +589,8 @@
install %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}
install %{SOURCE7} $RPM_BUILD_ROOT%{schemadir}
+install %{SOURCE8} $RPM_BUILD_ROOT/etc/init/sshd.conf
+
%if %{with gnome}
install contrib/gnome-ssh-askpass1
$RPM_BUILD_ROOT%{_libexecdir}/ssh/ssh-askpass
%endif
@@ -623,6 +659,12 @@
%userremove sshd
fi
+%post server-upstart
+%upstart_post sshd
+
+%postun server-upstart
+%upstart_postun sshd
+
%post -n openldap-schema-openssh-lpk
%openldap_schema_register %{schemadir}/openssh-lpk.schema
%service -q ldap restart
@@ -714,12 +756,26 @@
%{schemadir}/openssh-lpk.schema
%endif
+%files server-upstart
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) /etc/init/sshd.conf
+
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
* %{date} PLD Team <[email protected]>
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.336 2010/05/10 12:37:15 jajcus
+- 'upstart_native' branch merged
+- restart upstart service on upgrade
+
+Revision 1.335.2.2 2010/05/07 16:54:34 jajcus
+- dependencies improvement
+
+Revision 1.335.2.1 2010/05/07 08:47:23 jajcus
+- proof-of-concept upstart event-based startup
+
Revision 1.335 2010/04/16 12:56:33 glen
- release 2
================================================================
Index: packages/openssh/opensshd.init
diff -u packages/openssh/opensshd.init:1.35 packages/openssh/opensshd.init:1.36
--- packages/openssh/opensshd.init:1.35 Wed Mar 24 16:27:15 2010
+++ packages/openssh/opensshd.init Mon May 10 14:37:16 2010
@@ -107,6 +107,8 @@
fi
}
+upstart_controlled --except init configtest
+
RETVAL=0
# See how we were called.
case "$1" in
@@ -130,6 +132,9 @@
nls "will use password for the key, you will need to type it on each"
nls "reboot."
ssh_gen_keys
+ ;;
+ configtest)
+ checkconfig
;;
reload|force-reload)
if [ -f /var/lock/subsys/sshd ]; then
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openssh/openssh.spec?r1=1.335&r2=1.336&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openssh/opensshd.init?r1=1.35&r2=1.36&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
