Hello community,
here is the log from the commit of package openssh for
openSUSE:12.1:Update:Test checked in at 2012-02-20 18:11:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:12.1:Update:Test/openssh (Old)
and /work/SRC/openSUSE:12.1:Update:Test/.openssh.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openssh", Maintainer is "pce...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:12.1:Update:Test/openssh/openssh-askpass-gnome.changes
2012-02-20 18:11:52.000000000 +0100
+++
/work/SRC/openSUSE:12.1:Update:Test/.openssh.new/openssh-askpass-gnome.changes
2012-02-20 18:11:54.000000000 +0100
@@ -1,0 +2,5 @@
+Tue Feb 14 15:00:22 UTC 2012 - pce...@suse.com
+
+- .spec file cleanup
+
+-------------------------------------------------------------------
--- /work/SRC/openSUSE:12.1:Update:Test/openssh/openssh.changes 2012-02-20
18:11:52.000000000 +0100
+++ /work/SRC/openSUSE:12.1:Update:Test/.openssh.new/openssh.changes
2012-02-20 18:11:54.000000000 +0100
@@ -1,0 +2,7 @@
+Tue Feb 14 14:52:36 UTC 2012 - pce...@suse.com
+
+- correctly generate missing DSA keys (bnc#728002)
+- use correct paths for askpass helpers (bnc#726712)
+- .spec file cleanup
+
+-------------------------------------------------------------------
Old:
----
openssh-SuSE.tar.bz2
New:
----
sshd-gen-keys-start
sshd.init
sysconfig.ssh
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openssh-askpass-gnome.spec ++++++
--- /var/tmp/diff_new_pack.zje1pL/_old 2012-02-20 18:11:54.000000000 +0100
+++ /var/tmp/diff_new_pack.zje1pL/_new 2012-02-20 18:11:54.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package openssh-askpass-gnome
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -26,7 +26,7 @@
Requires: openssh = %{version} openssh-askpass = %{version}
AutoReqProv: on
Summary: A GNOME-Based Passphrase Dialog for OpenSSH
-URL: http://www.openssh.com/
+Url: http://www.openssh.com/
%define _name openssh
Source: %{_name}-%{version}.tar.bz2
Patch: %{_name}-5.8p1-sshd_config.diff
@@ -60,12 +60,12 @@
aclocal
autoheader
autoconf
-%configure \
- --sysconfdir=%_sysconfdir/ssh \
- --libexecdir=%_libexecdir/ssh \
+%{configure} \
+ --sysconfdir=%{_sysconfdir}/ssh \
+ --libexecdir=%{_libexecdir}/ssh \
--with-tcp-wrappers \
--with-pam \
- --with-kerberos5=/usr \
+ --with-kerberos5=%{_prefix} \
--with-privsep-path=/var/lib/empty \
--disable-strip \
--target=%{_target_cpu}-suse-linux
@@ -74,12 +74,12 @@
mv gnome-ssh-askpass2 gnome-ssh-askpass
%install
-install -d -m 755 %buildroot/%_libexecdir/ssh/
-install contrib/gnome-ssh-askpass %buildroot/%_libexecdir/ssh/gnome-ssh-askpass
+install -d -m 755 %{buildroot}%{_libexecdir}/ssh
+install contrib/gnome-ssh-askpass
%{buildroot}%{_libexecdir}/ssh/gnome-ssh-askpass
%files
%defattr(-,root,root)
-%dir %_libexecdir/ssh
-%attr(0755,root,root) %_libexecdir/ssh/gnome-ssh-askpass
+%dir %{_libexecdir}/ssh
+%attr(0755,root,root) %{_libexecdir}/ssh/gnome-ssh-askpass
%changelog
++++++ openssh.spec ++++++
--- /var/tmp/diff_new_pack.zje1pL/_old 2012-02-20 18:11:54.000000000 +0100
+++ /var/tmp/diff_new_pack.zje1pL/_new 2012-02-20 18:11:54.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package openssh
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
Name: openssh
-%define _fwdefdir %_sysconfdir/sysconfig/SuSEfirewall2.d/services
+%define _fwdefdir %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services
%define _appdefdir %{_prefix}/share/X11/app-defaults
BuildRequires: audit-devel krb5-devel openssl-devel pam-devel tcpd-devel
xorg-x11-devel
BuildRequires: libselinux-devel
@@ -26,15 +26,15 @@
License: BSD3c(or similar) ; MIT License (or similar)
Group: Productivity/Networking/SSH
Requires: /bin/netstat
-PreReq: pwdutils %insserv_prereq %fillup_prereq coreutils
+PreReq: pwdutils %{insserv_prereq} %{fillup_prereq} coreutils
Conflicts: nonfreessh
Version: 5.8p2
Release: 1
%define xversion 1.2.4.1
Summary: Secure Shell Client and Server (Remote Login Program)
-URL: http://www.openssh.com/
+Url: http://www.openssh.com/
Source: %{name}-%{version}.tar.bz2
-Source1: %{name}-SuSE.tar.bz2
+Source1: sshd.init
Source2: sshd.pamd
Source3: x11-ssh-askpass-%{xversion}.tar.bz2
Source4: README.SuSE
@@ -43,6 +43,8 @@
Source7: ssh.reg
Source8: ssh-askpass
Source9: sshd.fw
+Source10: sysconfig.ssh
+Source11: sshd-gen-keys-start
Patch: %{name}-5.8p1-sshd_config.diff
Patch1: %{name}-5.8p1-askpass-fix.diff
Patch2: %{name}-5.8p1-pam-fix2.diff
@@ -68,7 +70,7 @@
License: BSD3c(or similar) ; MIT License (or similar)
Summary: A passphrase dialog for OpenSSH and the X Window System
Requires: openssh = %{version}
-Provides: openssh:%_libexecdir/ssh/ssh-askpass
+Provides: openssh:%{_libexecdir}/ssh/ssh-askpass
Group: Productivity/Networking/SSH
%description
@@ -86,7 +88,7 @@
Window System passphrase dialog for OpenSSH.
%prep
-%setup -q -b 3 -a 1 -a 5
+%setup -q -b 3 -a 5
%patch
%patch2
%patch3
@@ -117,15 +119,16 @@
%else
PIEFLAGS="-fpie"
%endif
-%configure --with-ssl-engine \
- CFLAGS="%optflags $PIEFLAGS -fstack-protector" \
- CXXFLAGS="%optflags $PIEFLAGS -fstack-protector" \
+%{configure} \
+ CFLAGS="%{optflags} $PIEFLAGS -fstack-protector" \
+ CXXFLAGS="%{optflags} $PIEFLAGS -fstack-protector" \
LDFLAGS="-pie" \
+ --with-ssl-engine \
%if 0%{suse_version} >= 1140
--with-libedit \
%endif
- --sysconfdir=%_sysconfdir/ssh \
- --libexecdir=%_libexecdir/ssh \
+ --sysconfdir=%{_sysconfdir}/ssh \
+ --libexecdir=%{_libexecdir}/ssh \
--with-tcp-wrappers \
--with-selinux \
--with-pam \
@@ -134,44 +137,53 @@
--disable-strip \
--with-linux-audit \
--with-xauth=%{_prefix}/bin/xauth \
- --target=%{_target_cpu}-suse-linux
+ --target=%{_target_cpu}-suse-linux \
# --with-afs=/usr \
+
make %{?_smp_mflags}
-(cd converter; make %{?_smp_mflags})
+
+(cd converter && make %{?_smp_mflags})
+
cd contrib
cd ../../x11-ssh-askpass-%{xversion}
-%configure \
- --libexecdir=%_libdir/ssh
+%{configure} \
+ --libexecdir=%{_libdir}/ssh
xmkmf
-make includes USRLIBDIR=%_libdir
-make %{?_smp_mflags} USRLIBDIR=%_libdir CCOPTIONS="%optflags"
+make includes USRLIBDIR=%{_libdir}
+make %{?_smp_mflags} USRLIBDIR=%{_libdir} CCOPTIONS="%{optflags}"
%install
-make DESTDIR=%buildroot/ install
-install -d -m 755 %buildroot%_sysconfdir/pam.d
-install -d -m 755 %buildroot/var/lib/sshd
-install -m 644 %{S:2} %buildroot%_sysconfdir/pam.d/sshd
-install -d -m 755 %buildroot%_sysconfdir/slp.reg.d/
-install -m 644 %{S:7} %buildroot%_sysconfdir/slp.reg.d/
-cp -a SuSE/* %buildroot
+make DESTDIR=%{buildroot} install
+install -d -m 755 %{buildroot}%{_sysconfdir}/pam.d
+install -d -m 755 %{buildroot}/var/lib/sshd
+install -m 644 %{S:2} %{buildroot}%{_sysconfdir}/pam.d/sshd
+install -d -m 755 %{buildroot}%{_sysconfdir}/slp.reg.d/
+install -m 644 %{S:7} %{buildroot}%{_sysconfdir}/slp.reg.d/
+install -d -m 755 %{buildroot}%{_sysconfdir}/init.d
+install -m 755 %{S:1} %{buildroot}%{_sysconfdir}/init.d/sshd
+ln -vs ../..%{_sysconfdir}/init.d/sshd %{buildroot}%{_sbindir}/rcsshd
+install -d -m 755 %{buildroot}/var/adm/fillup-templates
+install -m 644 %{S:10} %{buildroot}/var/adm/fillup-templates
# install shell script to automate the process of adding your public key to a
remote machine
-install -m 755 contrib/ssh-copy-id %buildroot%_bindir
-install -m 644 contrib/ssh-copy-id.1 %buildroot/%_mandir/man1
-(cd converter; make install DESTDIR=%buildroot/)
-cd ../x11-ssh-askpass-%xversion
-make BINDIR=%_libexecdir/ssh DESTDIR=%buildroot install install.man
-rm -rf %buildroot/%_libexecdir/ssh/ssh-askpass
-sed -e "s@usr/lib/ssh@usr/%_lib/ssh@" < %{S:8} >
%buildroot/%_libexecdir/ssh/ssh-askpass
-rm -f %buildroot%_datadir/Ssh.bin
-sed -i -e s@/usr/libexec@%_libexecdir@g %buildroot%_sysconfdir/ssh/sshd_config
+install -m 755 contrib/ssh-copy-id %{buildroot}%{_bindir}
+install -m 644 contrib/ssh-copy-id.1 %{buildroot}%{_mandir}/man1
+(cd converter; make install DESTDIR=%{buildroot})
+cd ../x11-ssh-askpass-%{xversion}
+make BINDIR=%{_libexecdir}/ssh DESTDIR=%{buildroot} install install.man
+rm -rf %{buildroot}%{_libexecdir}/ssh/ssh-askpass
+sed -e "s,@LIBEXEC@,%{_libexecdir},g;s,@LIBDIR@,%{_libdir},g" \
+ < %{S:8} > %{buildroot}%{_libexecdir}/ssh/ssh-askpass
+rm -f %{buildroot}%{_datadir}/Ssh.bin
+sed -i -e "s@/usr/libexec@%{_libexecdir}@g"
%{buildroot}%{_sysconfdir}/ssh/sshd_config
#install firewall definitions format is described here:
-#%_datadir/SuSEfirewall2/services/TEMPLATE
-mkdir -p %buildroot/%{_fwdefdir}
-install -m 644 %{S:9} %buildroot/%{_fwdefdir}/sshd
+#%{_datadir}/SuSEfirewall2/services/TEMPLATE
+mkdir -p %{buildroot}%{_fwdefdir}
+install -m 644 %{S:9} %{buildroot}%{_fwdefdir}/sshd
+install -D -m 0755 %{SOURCE11} %{buildroot}%{_sbindir}/sshd-gen-keys-start
%pre
-getent group sshd >/dev/null || %_sbindir/groupadd -o -r sshd
-getent passwd sshd >/dev/null || %_sbindir/useradd -r -g sshd -d /var/lib/sshd
-s /bin/false -c "SSH daemon" sshd
+getent group sshd >/dev/null || %{_sbindir}/groupadd -o -r sshd
+getent passwd sshd >/dev/null || %{_sbindir}/useradd -r -g sshd -d
/var/lib/sshd -s /bin/false -c "SSH daemon" sshd
%post
%{fillup_and_insserv -n ssh sshd}
@@ -187,21 +199,21 @@
%defattr(-,root,root)
%dir %attr(755,root,root) /var/lib/sshd
%doc README.SuSE README.kerberos ChangeLog OVERVIEW README TODO LICENCE CREDITS
-%attr(0755,root,root) %dir %_sysconfdir/ssh
-%attr(0600,root,root) %config(noreplace) %_sysconfdir/ssh/moduli
-%attr(0644,root,root) %config(noreplace) %_sysconfdir/ssh/ssh_config
-%attr(0640,root,root) %config(noreplace) %_sysconfdir/ssh/sshd_config
-%attr(0644,root,root) %config %_sysconfdir/pam.d/sshd
-%attr(0755,root,root) %config %_initddir/sshd
-%attr(0755,root,root) %_bindir/ssh
-%_bindir/scp
-%_bindir/sftp
-%_bindir/slogin
-%_bindir/ssh-*
-%_sbindir/*
+%attr(0755,root,root) %dir %{_sysconfdir}/ssh
+%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/ssh/moduli
+%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/ssh/ssh_config
+%attr(0640,root,root) %config(noreplace) %{_sysconfdir}/ssh/sshd_config
+%attr(0644,root,root) %config %{_sysconfdir}/pam.d/sshd
+%attr(0755,root,root) %config %{_initddir}/sshd
+%attr(0755,root,root) %{_bindir}/ssh
+%{_bindir}/scp
+%{_bindir}/sftp
+%{_bindir}/slogin
+%{_bindir}/ssh-*
+%{_sbindir}/*
%attr(444,root,root) %doc %{_mandir}/man1/scp.1.gz
%attr(444,root,root) %doc %{_mandir}/man1/ssh-keygen.1.gz
-%attr(444,root,root) %doc %_mandir/man1/ssh-keyconverter.1.gz
+%attr(444,root,root) %doc %{_mandir}/man1/ssh-keyconverter.1.gz
%attr(444,root,root) %doc %{_mandir}/man1/ssh.1.gz
%attr(444,root,root) %doc %{_mandir}/man1/slogin.1.gz
%attr(444,root,root) %doc %{_mandir}/man1/ssh-agent.1*
@@ -211,21 +223,22 @@
%attr(444,root,root) %doc %{_mandir}/man1/ssh-copy-id.1*
%attr(444,root,root) %doc %{_mandir}/man5/*
%attr(444,root,root) %doc %{_mandir}/man8/*
-%attr(0755,root,root) %dir %_libexecdir/ssh
-%attr(0755,root,root) %_libexecdir/ssh/sftp-server
-%attr(0755,root,root) %_libexecdir/ssh/ssh-keysign
-%attr(0755,root,root) %_libexecdir/ssh/ssh-pkcs11-helper
-%dir %_sysconfdir/slp.reg.d
-%config %_sysconfdir/slp.reg.d/ssh.reg
+%attr(0755,root,root) %dir %{_libexecdir}/ssh
+%attr(0755,root,root) %{_libexecdir}/ssh/sftp-server
+%attr(0755,root,root) %{_libexecdir}/ssh/ssh-keysign
+%attr(0755,root,root) %{_libexecdir}/ssh/ssh-pkcs11-helper
+%dir %{_sysconfdir}/slp.reg.d
+%config %{_sysconfdir}/slp.reg.d/ssh.reg
/var/adm/fillup-templates/sysconfig.ssh
%config %{_fwdefdir}/sshd
+%{_sbindir}/sshd-gen-keys-start
%files askpass
%defattr(-,root,root)
-%attr(0755,root,root) %_libexecdir/ssh/ssh-askpass
-%attr(0755,root,root) %_libexecdir/ssh/x11-ssh-askpass
-%doc %_mandir/man1/ssh-askpass.1x.gz
-%doc %_mandir/man1/x11-ssh-askpass.1x.gz
-%_appdefdir/SshAskpass
+%attr(0755,root,root) %{_libexecdir}/ssh/ssh-askpass
+%attr(0755,root,root) %{_libexecdir}/ssh/x11-ssh-askpass
+%doc %{_mandir}/man1/ssh-askpass.1x.gz
+%doc %{_mandir}/man1/x11-ssh-askpass.1x.gz
+%{_appdefdir}/SshAskpass
%changelog
++++++ ssh-askpass ++++++
--- /var/tmp/diff_new_pack.zje1pL/_old 2012-02-20 18:11:54.000000000 +0100
+++ /var/tmp/diff_new_pack.zje1pL/_new 2012-02-20 18:11:54.000000000 +0100
@@ -24,9 +24,9 @@
fi
fi
-GNOME_SSH_ASKPASS="/usr/lib/ssh/gnome-ssh-askpass"
-KDE_SSH_ASKPASS="/usr/lib/ssh/ksshaskpass"
-X11_SSH_ASKPASS="/usr/lib/ssh/x11-ssh-askpass"
+GNOME_SSH_ASKPASS="@LIBEXEC@/ssh/gnome-ssh-askpass"
+KDE_SSH_ASKPASS="@LIBDIR@/ssh/ksshaskpass"
+X11_SSH_ASKPASS="@LIBEXEC@/ssh/x11-ssh-askpass"
case "$SESSION" in
gnome)
++++++ sshd-gen-keys-start ++++++
#!/bin/sh
if ! grep -q '^[[:space:]]*HostKey[[:space:]]' /etc/ssh/sshd_config; then
if ! test -f /etc/ssh/ssh_host_key ; then
echo Generating /etc/ssh/ssh_host_key.
ssh-keygen -t rsa1 -b 2048 -f /etc/ssh/ssh_host_key -N ''
fi
if ! test -f /etc/ssh/ssh_host_dsa_key ; then
echo Generating /etc/ssh/ssh_host_dsa_key.
ssh-keygen -t dsa -b 1024 -f /etc/ssh/ssh_host_dsa_key -N ''
fi
if ! test -f /etc/ssh/ssh_host_rsa_key ; then
echo Generating /etc/ssh/ssh_host_rsa_key.
ssh-keygen -t rsa -b 2048 -f /etc/ssh/ssh_host_rsa_key -N ''
fi
if ! test -f /etc/ssh/ssh_host_ecdsa_key ; then
echo Generating /etc/ssh/ssh_host_ecdsa_key.
ssh-keygen -t ecdsa -b 256 -f /etc/ssh/ssh_host_ecdsa_key -N ''
fi
fi
++++++ sshd.init ++++++
#! /bin/sh
# Copyright (c) 1995-2011 SuSE GmbH Nuernberg, Germany.
#
# Author: Jiri Smid <feedb...@suse.de>
#
# /etc/init.d/sshd
#
# and symbolic its link
#
# /usr/sbin/rcsshd
#
### BEGIN INIT INFO
# Provides: sshd
# Required-Start: $network $remote_fs
# Required-Stop: $network $remote_fs
# Default-Start: 3 5
# Default-Stop: 0 1 2 6
# Description: Start the sshd daemon
### END INIT INFO
SSHD_BIN=/usr/sbin/sshd
test -x $SSHD_BIN || exit 5
SSHD_SYSCONFIG=/etc/sysconfig/ssh
test -r $SSHD_SYSCONFIG || exit 6
. $SSHD_SYSCONFIG
SSHD_PIDFILE=/var/run/sshd.init.pid
. /etc/rc.status
# Shell functions sourced from /etc/rc.status:
# rc_check check and set local and overall rc status
# rc_status check and set local and overall rc status
# rc_status -v ditto but be verbose in local rc status
# rc_status -v -r ditto and clear the local rc status
# rc_failed set local and overall rc status to failed
# rc_reset clear local rc status (overall remains)
# rc_exit exit appropriate to overall rc status
# First reset status of this service
rc_reset
case "$1" in
start)
source /usr/sbin/sshd-gen-keys-start
echo -n "Starting SSH daemon"
## Start daemon with startproc(8). If this fails
## the echo return value is set appropriate.
startproc -f $SSHD_BIN $SSHD_OPTS -o "PidFile=$SSHD_PIDFILE"
# Remember status and be verbose
rc_status -v
;;
stop)
echo -n "Shutting down SSH daemon"
## Stop daemon with killproc(8) and if this fails
## set echo the echo return value.
killproc -p $SSHD_PIDFILE -TERM $SSHD_BIN
# Remember status and be verbose
rc_status -v
;;
try-restart)
## Stop the service and if this succeeds (i.e. the
## service was running before), start it again.
$0 status >/dev/null && $0 restart
# Remember status and be quiet
rc_status
;;
restart)
## Stop the service and regardless of whether it was
## running or not, start it again.
$0 stop
$0 start
# Remember status and be quiet
rc_status
;;
force-reload|reload)
## Signal the daemon to reload its config. Most daemons
## do this on signal 1 (SIGHUP).
echo -n "Reload service sshd"
killproc -p $SSHD_PIDFILE -HUP $SSHD_BIN
rc_status -v
;;
status)
echo -n "Checking for service sshd "
## Check status with checkproc(8), if process is running
## checkproc will return with exit status 0.
# Status has a slightly different for the status command:
# 0 - service running
# 1 - service dead, but /var/run/ pid file exists
# 2 - service dead, but /var/lock/ lock file exists
# 3 - service not running
checkproc -p $SSHD_PIDFILE $SSHD_BIN
rc_status -v
;;
probe)
## Optional: Probe for the necessity of a reload,
## give out the argument which is required for a reload.
test /etc/ssh/sshd_config -nt $SSHD_PIDFILE && echo reload
;;
*)
echo "Usage: $0
{start|stop|status|try-restart|restart|force-reload|reload|probe}"
exit 1
;;
esac
rc_exit
++++++ sysconfig.ssh ++++++
## Path: Network/Remote access/SSH
## Description: SSH server settings
## Type: string
## Default: ""
## ServiceRestart: sshd
#
# Options for sshd
#
SSHD_OPTS=""
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
