backout incorrect downgrade changes

openssh/openssh.spec

@@ -24,8 +24,9 @@
 ##
 
 #   package versions
-%define       V_base       3.4
+%define       V_base       3.5
 %define       V_portable   p1
+%define       V_chroot     3.5
 
 #   package options
 %ifndef       with_pam
@@ -38,7 +39,7 @@
 %define       with_skey    no
 %endif
 %ifndef       with_x11
-%define       with_x11     no
+%define       with_x11     %{l_test -p x11}
 %endif
 %ifndef       with_chroot
 %define       with_chroot  no
@@ -54,25 +55,25 @@ Distribution: OpenPKG [CORE]
 Group:        Security
 License:      BSD
 Version:      %{V_base}%{V_portable}
-Release:      20021111
+Release:      20021017
 
 #   list of sources
 Source0:      ftp://ftp.openssh.com/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
-Source1:      fakesyslog.tar.gz
-Source2:      rc.openssh
+Source1:      rc.openssh
+Source2:      fsl.openssh
 Source3:      sshd_config
 Source4:      ssh_config
 Source5:      ssh-askpass
 Source6:      ssh-keyman
 Source7:      ssh-keyman.1
 Source8:      ssh-keyman.pod
-Source9:      http://chrootssh.sourceforge.net/patches/osshChroot-%{V_base}.diff
+Source9:      http://chrootssh.sourceforge.net/patches/osshChroot-%{V_chroot}.diff
 
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 1.1.0, perl, openssl, zlib
-PreReq:       OpenPKG, openpkg >= 1.1.0
+BuildPreReq:  OpenPKG, openpkg >= 20021002, fsl, perl, openssl, zlib
+PreReq:       OpenPKG, openpkg >= 20021002, fsl
 %if "%{with_pam}" == "yes"
 BuildPreReq:  PAM
 PreReq:       PAM
@@ -101,42 +102,34 @@ AutoReqProv:  no
     terms of security and features, as well as removing all patented
     algorithms to separate libraries (OpenSSL).
 
-    Options: with_pam=%{with_pam} with_pcre=%{with_pcre}
-    Options: with_skey=%{with_skey} with_x11=%{with_x11}
-    Options: with_chroot=%{with_chroot}
+    Options: 
+    --define 'with_pam %{with_pam}'
+    --define 'with_pcre %{with_pcre}'
+    --define 'with_skey %{with_skey}'
+    --define 'with_x11 %{with_x11}'
+    --define 'with_chroot %{with_chroot}'
 
 %prep
     %setup0 -q -c
-    %setup1 -q -T -D -a 1
 %if "%{with_chroot}" == "yes"
     cd openssh-%{version}
-    %{l_patch} -p1 <%{SOURCE osshChroot-%{V_base}.diff}
+    %{l_patch} -p1 <%{SOURCE osshChroot-%{V_chroot}.diff}
 %endif
 
 %build
-    #   build faked syslog(3) library
-    fakesyslogdir="`pwd`/fakesyslog"
-    ( cd fakesyslog
-      CC="%{l_cc}" \
-      CFLAGS="%{l_cflags -O}" \
-      ./configure \
-          --with-logfile=%{l_prefix}/var/openssh/sshd.log
-      %{l_make} %{l_mflags}
-    )
-
     #   build OpenSSH
     ( cd openssh-%{version}
       inc="-I%{l_prefix}/include"
-      lib="-L%{l_prefix}/lib -L$fakesyslogdir"
+      lib="-L%{l_prefix}/lib"
 %if "%{with_pam}" == "yes"
       inc="$inc -I`%{l_prefix}/etc/rc --query pam_incdir`"
       lib="$lib -L`%{l_prefix}/etc/rc --query pam_libdir`"
 %endif
       CC="%{l_cc}" \
-      CFLAGS="%{l_cflags -O} $inc" \
-      CPPFLAGS="$inc" \
-      LDFLAGS="$lib" \
-      LIBS="-lfakesyslog" \
+      CFLAGS="`%{l_prefix}/bin/fsl-config --all --cflags` $inc" \
+      CFLAGS="$inc" \
+      LDFLAGS="`%{l_prefix}/bin/fsl-config --all --ldflags` $lib" \
+      LIBS="`%{l_prefix}/bin/fsl-config --all --libs`" \
       ./configure \
           --prefix=%{l_prefix} \
           --sbindir=%{l_prefix}/bin \
@@ -193,6 +186,7 @@ AutoReqProv:  no
     strip $RPM_BUILD_ROOT%{l_prefix}/libexec/openssh/* 2> /dev/null || true
 
     #   install ssh-askpass wrapper
+    %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/libexec/openssh/
     %{l_shtool} install -c -m 755 -e 's;@l_prefix@;%{l_prefix};g' \
         %{SOURCE ssh-askpass} $RPM_BUILD_ROOT%{l_prefix}/libexec/openssh/
 
@@ -202,18 +196,27 @@ AutoReqProv:  no
 	    $RPM_BUILD_ROOT%{l_prefix}/var/openssh/empty
 
     #   install addons
+    %{l_shtool} mkdir -f -p -m 755 \
+        $RPM_BUILD_ROOT%{l_prefix}/bin/ \
+        $RPM_BUILD_ROOT%{l_prefix}/man/man1/
     %{l_shtool} install -c -m 755 -e 's;@l_prefix@;%{l_prefix};g' \
         %{SOURCE ssh-keyman} $RPM_BUILD_ROOT%{l_prefix}/bin/
     %{l_shtool} install -c -m 644 -e 's;@l_prefix@;%{l_prefix};g' \
         %{SOURCE ssh-keyman.1} $RPM_BUILD_ROOT%{l_prefix}/man/man1/
 
     #   install run-command script
-    %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
+    %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
     %{l_shtool} install -c -m 755 -e 's;@l_prefix@;%{l_prefix};g' \
         -e 's;@l_musr@;%{l_musr};g' -e 's;@l_mgrp@;%{l_mgrp};g' \
         %{SOURCE rc.openssh} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
 
+    #   install fsl configuration file
+    %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
+    %{l_shtool} install -c -m 644 -e 's;@l_prefix@;%{l_prefix};g' \
+        %{SOURCE fsl.openssh} $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
+
     #   install reasonable ssh server and client configuration files
+    %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/openssh/
     %{l_shtool} install -c -m 644 \
         -e 's;@l_prefix@;%{l_prefix};g' \
         -e 's;@l_x11forwarding@;%{with_x11};' \
@@ -226,12 +229,14 @@ AutoReqProv:  no
         %{l_files_std} \
         '%config %{l_prefix}/etc/openssh/*' \
         '%attr(4711,root,%{l_mgrp}) %{l_prefix}/libexec/openssh/ssh-keysign' \
-        '%dir %attr(700,root,root) %{l_prefix}/var/openssh/empty'
+        '%dir %attr(700,root,root) %{l_prefix}/var/openssh/empty' \
+        '%config %{l_prefix}/etc/fsl/fsl.openssh' \
+        '%not %dir %{l_prefix}/etc/fsl'
 
 %files -f files
 
 %clean
-  #  rm -rf $RPM_BUILD_ROOT
+    rm -rf $RPM_BUILD_ROOT
 
 %post
     #   generate server RSA1 (SSHv1) key
@@ -260,12 +265,12 @@ AutoReqProv:  no
 
     #   add PAM configuration entry
 %if "%{with_pam}" == "yes"
-    $RPM_INSTALL_PREFIX/sbin/pamtool -a -s -n "openssh"
+    $RPM_INSTALL_PREFIX/sbin/pamtool --add --smart --name=openssh
 %endif
 
 %preun
     #   remove PAM configuration entry
 %if "%{with_pam}" == "yes"
-    $RPM_INSTALL_PREFIX/sbin/pamtool -r -s -n "openssh"
+    $RPM_INSTALL_PREFIX/sbin/pamtool --remove --smart --name=openssh
 %endif