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: 10-Aug-2005 11:46:07
Branch: HEAD Handle: 2005081010460600
Modified files:
openpkg-src/openssh openssh.spec
Log:
Add option for sshd to try setting PATH
Without this option only the system default mechanism
to set the PATH is used. This is the OpenPKG default.
Setting with_trysetpath=yes has no effect on some
platforms. The following tests have been performed:
o PATH has system default, option has no effect
amd64-freebsd5.4
ia64-freebsd5.4
ix86-freebsd4.11
ix86-freebsd5.4
ix86-freebsd6.0
ix86-freebsd7.0
ix86-netbsd2.0.2
sparc64-solaris8
sparc64-solaris9
o PATH set for users but not for root
ix86-gentoo1.6.12
ix86-mandriva10.2
ix86-rhel3
o PATH set for users and root
ix86-debian3.1
ix86-fedora4
ix86-solaris10
ix86-solaris9
ix86-suse9.3
sparc64-solaris10
Summary:
Revision Changes Path
1.151 +21 -1 openpkg-src/openssh/openssh.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openssh/openssh.spec
============================================================================
$ cvs diff -u -r1.150 -r1.151 openssh.spec
--- openpkg-src/openssh/openssh.spec 24 Jul 2005 17:59:36 -0000 1.150
+++ openpkg-src/openssh/openssh.spec 10 Aug 2005 09:46:06 -0000 1.151
@@ -44,7 +44,7 @@
Group: Security
License: BSD
Version: %{V_base}%{V_portable}
-Release: 20050724
+Release: 20050810
# package options
%option with_fsl yes
@@ -58,6 +58,7 @@
%option with_watchdog no
%option with_wrap no
%option with_x11 no
+%option with_trysetpath no
# list of sources
Source0:
ftp://ftp.openssh.com/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
@@ -224,9 +225,15 @@
--disable-suid-ssh \
--without-rsh \
--with-mantype=man \
+%if "%{with_trysetpath}" == "yes"
+ --enable-etc-default-login \
+ --with-default-path=%{l_prefix}/bin:/bin:/usr/bin:/usr/local/bin \
+ --with-superuser-path=%{l_prefix}/bin:/usr/bin:/sbin:/usr/sbin \
+%else
--disable-etc-default-login \
--with-default-path=/bin:/usr/bin \
--with-superuser-path=/bin:/usr/bin:/sbin:/usr/sbin \
+%endif
--with-privsep-user=%{l_nusr} \
--with-privsep-path=%{l_prefix}/var/openssh/empty
@@ -361,6 +368,19 @@
fi
%endif
+ # on install, warn about PATH issues
+ if [ $1 -eq 1 ]; then
+ ( echo "Make sure sshd users have the proper PATH set to find"
+ echo "utilities like scp, sftp-server, rsync, cvs, svn etc."
+%if "%{with_trysetpath}" == "yes"
+ echo "This package tries to set the PATH for users and"
+ echo "root properly. The success of this attempt is platform"
+ echo "specific and out of OpenPKG scope. Please verify"
+ echo "whether it works as expected."
+%endif
+ ) | %{l_rpmtool} msg -b -t warn
+ fi
+
# after upgrade, restart service
[ $1 -eq 2 ] || exit 0
eval `%{l_rc} openssh status 2>/dev/null`
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
