Author: jajcus Date: Wed Jun 15 12:11:58 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- SERVICE=syslog replaced with SERVICE_syslog=y in upstart job
- %upstart_post and %upstart_postun macro definitions removed (they are defined
in rpm-build-macros)
- Release: 2
---- Files affected:
packages/openssh:
openssh.spec (1.362 -> 1.363) , opensshd.upstart (1.5 -> 1.6)
---- Diffs:
================================================================
Index: packages/openssh/openssh.spec
diff -u packages/openssh/openssh.spec:1.362 packages/openssh/openssh.spec:1.363
--- packages/openssh/openssh.spec:1.362 Tue May 3 12:53:50 2011
+++ packages/openssh/openssh.spec Wed Jun 15 14:11:53 2011
@@ -30,7 +30,7 @@
Summary(uk.UTF-8): OpenSSH - вільна реалізація протоколу Secure Shell (SSH)
Name: openssh
Version: 5.8p2
-Release: 1
+Release: 2
Epoch: 2
License: BSD
Group: Applications/Networking
@@ -95,26 +95,6 @@
%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
@@ -425,6 +405,7 @@
Group: Daemons
Requires: %{name}-server = %{epoch}:%{version}-%{release}
Requires: upstart >= 0.6
+Conflicts: syslog-ng < 3.2.4-1
%description server-upstart
Upstart job description for OpenSSH.
@@ -771,6 +752,12 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.363 2011/06/15 12:11:53 jajcus
+- SERVICE=syslog replaced with SERVICE_syslog=y in upstart job
+- %upstart_post and %upstart_postun macro definitions removed (they are defined
+ in rpm-build-macros)
+- Release: 2
+
Revision 1.362 2011/05/03 10:53:50 glen
- 5.8p2
================================================================
Index: packages/openssh/opensshd.upstart
diff -u packages/openssh/opensshd.upstart:1.5
packages/openssh/opensshd.upstart:1.6
--- packages/openssh/opensshd.upstart:1.5 Sun Feb 20 11:31:28 2011
+++ packages/openssh/opensshd.upstart Wed Jun 15 14:11:53 2011
@@ -1,4 +1,4 @@
-start on pld.network-started and started SERVICE=syslog and started random
+start on pld.network-started and started SERVICE_syslog=y and started random
stop on pld.shutdown-started
respawn
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openssh/openssh.spec?r1=1.362&r2=1.363&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openssh/opensshd.upstart?r1=1.5&r2=1.6&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
