- removed uclibc stuff

-rel.3.

Changed files:
    openssh.spec -> 1.108

diff --git a/openssh.spec b/openssh.spec
index 83080c62c6e195351dcd9475a8ae084d461eebf4..fbd683b2a1112982c1d0ae96269b59353ba2ff11 100644 (file)
--- a/openssh.spec
+++ b/openssh.spec
@@ -1,7 +1,6 @@
 #
 # Conditional build:
 # _without_gnome - without gnome-askpass utility
-# _without_embed - don't build uClibc version
 
 Summary:       OpenSSH free Secure Shell (SSH) implementation
 Summary(es):   Implementación libre de SSH
@@ -9,7 +8,7 @@ Summary(pl):    Publicznie dost
 Summary(pt_BR):        Implementação livre do SSH
 Name:          openssh
 Version:       3.0.2p1
-Release:       2
+Release:       3
 License:       BSD
 Group:         Applications/Networking
 Source0:       ftp://ftp.ca.openbsd.org/pub/OpenBSD/OpenSSH/portable/%{name}-%{version}.tar.gz
@@ -33,22 +32,10 @@ BuildRequires:      pam-devel
 BuildRequires: zlib-devel
 BuildRequires: libwrap-devel
 BuildRequires: perl
-%if %{!?_without_embed:1}%{?_without_embed:0}
-BuildRequires: uClibc-devel
-BuildRequires: uClibc-static
-BuildRequires: openssl-devel-embed
-BuildRequires: zlib-devel-embed
-%endif
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Prereq:                openssl
 Obsoletes:     ssh
 
-%define embed_path     /usr/lib/embed
-%define embed_cc       %{_arch}-uclibc-cc
-%define embed_cflags   %{rpmcflags} -Os
-
-%define embed_binaries ssh scp sshd ssh-keygen
-
 %define                _sysconfdir     /etc/ssh
 %define                _libexecdir     %{_libdir}/%{name}
 
@@ -192,20 +179,6 @@ Esse pacote cont
 protocolo secure shell e permite que clientes ssh se conectem ao seu
 host.
 
-%package embed
-Summary:       OpenSSH Secure Shell for embedded applications
-Summary:       OpenSSH Secure Shell dla aplikacji wbudowanych
-Requires:      openssh
-Group:         Applications/Networking
-Obsoletes:     ssh-clients
-
-%description embed
-OpenSSH for embedded enviroment. Client, server, scp and ssh-keygen.
-
-%description embed -l pl
-OpenSSH dla aplikacji wbudowanych. Klient, serwer, scp i ssh-keygen.
-
-
 %package gnome-askpass
 Summary:       OpenSSH GNOME passphrase dialog
 Summary(es):   Diálogo para introducción de passphrase para GNOME
@@ -257,36 +230,6 @@ entrada de passphrase no GNOME.
 aclocal
 autoconf
 
-%if %{!?_without_embed:1}%{?_without_embed:0}
-%configure \
-       --without-gnome-askpass \
-       --without-pam \
-       --without-shadow \
-       --with-mantype=man \
-       --with-md5-passwords \
-       --with-ipaddr-display \
-       --with-4in6 \
-       --disable-suid-ssh \
-       --without-tcp-wrappers \
-       --with-pid-dir=%{_localstatedir}/run \
-       CC=%{embed_cc} CFLAGS="%{embed_cflags}"
-
-echo '#define LOGIN_PROGRAM           "/bin/login"' >>config.h
-%{__make}
-
-for f in %{embed_binaries} ; do
-       mv -f $f $f-embed-shared
-done
-
-%{__make} LDFLAGS="'-static -L. -Lopenbsd-compat/'"
-
-for f in %{embed_binaries} ; do
-       mv -f $f $f-embed-static
-done
-
-%{__make} distclean
-%endif
-
 %configure \
        %{!?_without_gnome:--with-gnome-askpass} \
        --with-pam \
@@ -328,14 +271,6 @@ gzip -9nf *.RNG TODO README OVERVIEW CREDITS Change*
 
 touch $RPM_BUILD_ROOT/etc/security/blacklist.sshd
 
-%if %{!?_without_embed:1}%{?_without_embed:0}
-install -d $RPM_BUILD_ROOT/%{embed_path}/{shared,static}
-for f in %{embed_binaries} ; do
-       install $f-embed-static $RPM_BUILD_ROOT/%{embed_path}/static/$f
-       install $f-embed-shared $RPM_BUILD_ROOT/%{embed_path}/shared/$f
-done
-%endif
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -399,9 +334,3 @@ fi
 %{!?_without_gnome:%defattr(644,root,root,755)}
 %{!?_without_gnome:%dir %{_libexecdir}/ssh}
 %{!?_without_gnome:%attr(755,root,root) %{_libexecdir}/ssh/ssh-askpass}
-
-%if %{!?_without_embed:1}%{?_without_embed:0}
-%files embed
-%defattr(644,root,root,755)
-%attr(755,root,root) %{embed_path}/*/*
-%endif