Bugzilla – Attachment 2068 Details for
Bug 1920
Update linux .spec file and init scripts
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Update .spec file and init script for RHEL
openssh-contrib-rhel.diff (text/plain), 4.43 KB, created by
Iain Morgan
on 2011-07-27 08:14:45 AEST
(
hide
)
Description:
Update .spec file and init script for RHEL
Filename:
MIME Type:
Creator:
Iain Morgan
Created:
2011-07-27 08:14:45 AEST
Size:
4.43 KB
patch
obsolete
>Index: contrib/redhat/openssh.spec >=================================================================== >RCS file: /cvs/openssh/contrib/redhat/openssh.spec,v >retrieving revision 1.157 >diff -u -r1.157 openssh.spec >--- contrib/redhat/openssh.spec 3 Jun 2011 00:35:26 -0000 1.157 >+++ contrib/redhat/openssh.spec 25 Jul 2011 22:38:25 -0000 >@@ -84,24 +84,24 @@ > %if %{build6x} > PreReq: initscripts >= 5.00 > %else >-PreReq: initscripts >= 5.20 >+Requires: initscripts >= 5.20 > %endif >-BuildPreReq: perl, openssl-devel, tcp_wrappers >-BuildPreReq: /bin/login >+BuildRequires: perl, openssl-devel, tcp_wrappers >+BuildRequires: /bin/login > %if ! %{build6x} > BuildPreReq: glibc-devel, pam > %else >-BuildPreReq: /usr/include/security/pam_appl.h >+BuildRequires: /usr/include/security/pam_appl.h > %endif > %if ! %{no_x11_askpass} >-BuildPreReq: /usr/include/X11/Xlib.h >+BuildRequires: /usr/include/X11/Xlib.h > %endif > %if ! %{no_gnome_askpass} >-BuildPreReq: pkgconfig >+BuildRequires: pkgconfig > %endif > %if %{kerberos5} >-BuildPreReq: krb5-devel >-BuildPreReq: krb5-libs >+BuildRequires: krb5-devel >+BuildRequires: krb5-libs > %endif > > %package clients >@@ -114,7 +114,7 @@ > Summary: The OpenSSH server daemon. > Group: System Environment/Daemons > Obsoletes: ssh-server >-PreReq: openssh = %{version}-%{release}, chkconfig >= 0.9 >+Requires: openssh = %{version}-%{release}, chkconfig >= 0.9 > %if ! %{build6x} > Requires: /etc/pam.d/system-auth > %endif >@@ -712,7 +712,7 @@ > it generates. > > * Thu Oct 5 2000 Nalin Dahyabhai <nalin@redhat.com> >-- Add BuildPreReq on /usr/include/security/pam_appl.h to be sure we always >+- Add BuildRequires on /usr/include/security/pam_appl.h to be sure we always > build PAM authentication in. > - Try setting SSH_ASKPASS if gnome-ssh-askpass is installed. > - Clean out no-longer-used patches. >@@ -721,7 +721,7 @@ > > * Mon Oct 2 2000 Nalin Dahyabhai <nalin@redhat.com> > - Update x11-askpass to 1.0.2. (#17835) >-- Add BuildPreReqs for /bin/login and /usr/bin/rsh so that configure will >+- Add BuildRequiress for /bin/login and /usr/bin/rsh so that configure will > always find them in the right place. (#17909) > - Set the default path to be the same as the one supplied by /bin/login, but > add /usr/X11R6/bin. (#17909) >Index: contrib/redhat/sshd.init >=================================================================== >RCS file: /cvs/openssh/contrib/redhat/sshd.init,v >retrieving revision 1.12 >diff -u -r1.12 sshd.init >--- contrib/redhat/sshd.init 27 Aug 2010 00:12:55 -0000 1.12 >+++ contrib/redhat/sshd.init 25 Jul 2011 22:38:25 -0000 >@@ -22,70 +22,9 @@ > prog="sshd" > > # Some functions to make the below more readable >-KEYGEN=/usr/bin/ssh-keygen > SSHD=/usr/sbin/sshd >-RSA1_KEY=/etc/ssh/ssh_host_key >-RSA_KEY=/etc/ssh/ssh_host_rsa_key >-DSA_KEY=/etc/ssh/ssh_host_dsa_key > PID_FILE=/var/run/sshd.pid > >-do_rsa1_keygen() { >- if [ ! -s $RSA1_KEY ]; then >- echo -n $"Generating SSH1 RSA host key: " >- if $KEYGEN -q -t rsa1 -f $RSA1_KEY -C '' -N '' >&/dev/null; then >- chmod 600 $RSA1_KEY >- chmod 644 $RSA1_KEY.pub >- if [ -x /sbin/restorecon ]; then >- /sbin/restorecon $RSA1_KEY.pub >- fi >- success $"RSA1 key generation" >- echo >- else >- failure $"RSA1 key generation" >- echo >- exit 1 >- fi >- fi >-} >- >-do_rsa_keygen() { >- if [ ! -s $RSA_KEY ]; then >- echo -n $"Generating SSH2 RSA host key: " >- if $KEYGEN -q -t rsa -f $RSA_KEY -C '' -N '' >&/dev/null; then >- chmod 600 $RSA_KEY >- chmod 644 $RSA_KEY.pub >- if [ -x /sbin/restorecon ]; then >- /sbin/restorecon $RSA_KEY.pub >- fi >- success $"RSA key generation" >- echo >- else >- failure $"RSA key generation" >- echo >- exit 1 >- fi >- fi >-} >- >-do_dsa_keygen() { >- if [ ! -s $DSA_KEY ]; then >- echo -n $"Generating SSH2 DSA host key: " >- if $KEYGEN -q -t dsa -f $DSA_KEY -C '' -N '' >&/dev/null; then >- chmod 600 $DSA_KEY >- chmod 644 $DSA_KEY.pub >- if [ -x /sbin/restorecon ]; then >- /sbin/restorecon $DSA_KEY.pub >- fi >- success $"DSA key generation" >- echo >- else >- failure $"DSA key generation" >- echo >- exit 1 >- fi >- fi >-} >- > do_restart_sanity_check() > { > $SSHD -t >@@ -99,9 +38,13 @@ > start() > { > # Create keys if necessary >- do_rsa1_keygen >- do_rsa_keygen >- do_dsa_keygen >+ /usr/bin/ssh-keygen -A >+ if [ -x /sbin/restorecon ]; then >+ /sbin/restorcon /etc/ssh/ssh_host_key.pub >+ /sbin/restorcon /etc/ssh/ssh_host_rsa_key.pub >+ /sbin/restorcon /etc/ssh/ssh_host_dsa_key.pub >+ /sbin/restorcon /etc/ssh/ssh_host_ecdsa_key.pub >+ fi > > echo -n $"Starting $prog:" > $SSHD $OPTIONS && success || failure
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 1920
: 2068 |
2069