OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 12-Aug-2005 13:56:11
Branch: HEAD Handle: 2005081212561100
Modified files:
openpkg-src/openssh openssh.spec
Log:
remove dependency to binutils tool strip(1)
Summary:
Revision Changes Path
1.152 +7 -4 openpkg-src/openssh/openssh.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openssh/openssh.spec
============================================================================
$ cvs diff -u -r1.151 -r1.152 openssh.spec
--- openpkg-src/openssh/openssh.spec 10 Aug 2005 09:46:06 -0000 1.151
+++ openpkg-src/openssh/openssh.spec 12 Aug 2005 11:56:11 -0000 1.152
@@ -44,7 +44,7 @@
Group: Security
License: BSD
Version: %{V_base}%{V_portable}
-Release: 20050810
+Release: 20050812
# package options
%option with_fsl yes
@@ -189,6 +189,7 @@
cflags="$cflags -DWITH_LDAP_PUBKEY"
ldflags="$ldflags -lldap -llber -lcrypto -lssl"
%endif
+ strip="--enable-strip"; %{l_shtool} path strip || strip="--disable-strip"
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O} %{l_cppflags} $cflags" \
LDFLAGS="%{l_ldflags} %{l_fsl_ldflags} $ldflags" \
@@ -235,7 +236,8 @@
--with-superuser-path=/bin:/usr/bin:/sbin:/usr/sbin \
%endif
--with-privsep-user=%{l_nusr} \
- --with-privsep-path=%{l_prefix}/var/openssh/empty
+ --with-privsep-path=%{l_prefix}/var/openssh/empty \
+ $strip
# build package
%{l_make} %{l_mflags -O}
@@ -269,8 +271,9 @@
%if "%{with_connect}" == "yes"
# install proxy connect utility
( cd openssh-connect
- %{l_shtool} install -c -s -m 755 \
- connect $RPM_BUILD_ROOT%{l_prefix}/bin/ssh-connect
+ strip connect 2>/dev/null || true
+ %{l_shtool} install -c -m 755 connect \
+ $RPM_BUILD_ROOT%{l_prefix}/bin/ssh-connect
) || exit $?
%endif
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
