Просмотр исходного кода

Removed chroot patch I added earlier today cause Ralf doesn't seem to be happy with some kind of experimental patches even if they are optional. But nevertheless, upgrade to OpenSSH 3.1p1.

Christoph Schug 24 лет назад
Родитель
Сommit
9113a37e36
1 измененных файлов с 3 добавлено и 8 удалено
  1. 3 8
      openssh/openssh.spec

+ 3 - 8
openssh/openssh.spec

@@ -25,7 +25,6 @@
 
 %define       with_pcre           yes
 %define       with_skey           no
-%define       with_chroot         no
 
 #   package information
 Name:         openssh
@@ -36,7 +35,7 @@ Packager:     The OpenPKG Project
 Distribution: OpenPKG [REL]
 Group:        Cryptography
 License:      BSD
-Version:      3.0.2p1
+Version:      3.1p1
 Release:      20020307
 
 #   list of sources
@@ -46,7 +45,6 @@ Source2:      rc.openssh
 Source3:      sshd_config
 Source4:      ssh_config
 Source5:      ssh-askpass
-Patch0:       openssh-chroot.diff
 
 #   build information
 Prefix:       %{l_prefix}
@@ -76,9 +74,6 @@ AutoReqProv:  no
 %prep
     %setup0 -q -c -a 0
     %setup1 -q -T -D -a 1
-    %if "%{with_chroot}" == "yes"
-    %patch0 -p0
-    %endif
 
 %build
     #   build faked syslog(3) library
@@ -185,7 +180,7 @@ AutoReqProv:  no
     #   generate server RSA key
     if [ ! -f "$RPM_INSTALL_PREFIX/etc/openssh/ssh_host_key" -o \
          ! -s "$RPM_INSTALL_PREFIX/etc/openssh/ssh_host_key" ] ; then
-        $RPM_INSTALL_PREFIX/bin/ssh-keygen -b 1024 \
+        $RPM_INSTALL_PREFIX/bin/ssh-keygen -t rsa1 -b 1024 \
             -f $RPM_INSTALL_PREFIX/etc/openssh/ssh_host_key \
             -N '' -C `hostname` 1>&2
     fi
@@ -193,7 +188,7 @@ AutoReqProv:  no
     #   generate server DSA key
     if [ ! -f "$RPM_INSTALL_PREFIX/etc/openssh/ssh_host_dsa_key" -o \
          ! -s "$RPM_INSTALL_PREFIX/etc/openssh/ssh_host_dsa_key" ] ; then
-        $RPM_INSTALL_PREFIX/bin/ssh-keygen -d \
+        $RPM_INSTALL_PREFIX/bin/ssh-keygen -t dsa -d \
             -f $RPM_INSTALL_PREFIX/etc/openssh/ssh_host_dsa_key \
             -N '' -C `hostname` 1>&2
     fi