OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 24-Jul-2005 19:58:30
Branch: HEAD Handle: 2005072418583000
Modified files:
openpkg-src/openssh openssh.spec
Log:
optionally add connect utility which is a simple relaying command (for
use with the ProxyCommand directory in ~/ssh/config) to make outgoing
network connections via SOCKS or HTTP/HTTPS proxies
Summary:
Revision Changes Path
1.149 +28 -1 openpkg-src/openssh/openssh.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openssh/openssh.spec
============================================================================
$ cvs diff -u -r1.148 -r1.149 openssh.spec
--- openpkg-src/openssh/openssh.spec 29 May 2005 08:10:06 -0000 1.148
+++ openpkg-src/openssh/openssh.spec 24 Jul 2005 17:58:30 -0000 1.149
@@ -31,6 +31,7 @@
%define V_ldap_base 3.7.1p2
%define V_ldap_vers1 v2.01
%define V_ldap_vers2 v201
+%define V_connect 1.95
# package information
Name: openssh
@@ -43,7 +44,7 @@
Group: Security
License: BSD
Version: %{V_base}%{V_portable}
-Release: 20050529
+Release: 20050724
# package options
%option with_fsl yes
@@ -56,6 +57,7 @@
%option with_watchdog no
%option with_wrap no
%option with_x11 no
+%option with_connect no
# list of sources
Source0:
ftp://ftp.openssh.com/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
@@ -67,6 +69,7 @@
Source6: ssh-keyman
Source7: ssh-keyman.1
Source8: ssh-keyman.pod
+Source9:
ftp://ftp.openpkg.org/sources/CPY/VERSIONED/openssh-connect/openssh-connect-%{V_connect}.tar.gz
Patch0: openssh.patch
Patch1: openssh.patch.chroot
Patch2: openssh.patch.alias
@@ -135,6 +138,9 @@
%prep
# unpack and patch distribution
%setup -q
+%if "%{with_connect}" == "yes"
+ %setup -q -D -T -a 9
+%endif
%patch -p0 -P 0
%{l_shtool} subst \
-e 's;@l_openpkg_release@;%{l_openpkg_release -F "OpenPKG-%s"};' \
@@ -227,6 +233,19 @@
# build package
%{l_make} %{l_mflags -O}
+%if "%{with_connect}" == "yes"
+ # build proxy connect utility
+ ( cd openssh-connect
+ CC="%{l_cc}" \
+ CFLAGS="%{l_cflags -O}" \
+ CPPFLAGS="%{l_cppflags}" \
+ LDFLAGS="%{l_ldflags}" \
+ ./configure \
+ --prefix=%{l_prefix}
+ %{l_make} %{l_mflags}
+ ) || exit $?
+%endif
+
%install
rm -rf $RPM_BUILD_ROOT
@@ -240,6 +259,14 @@
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* 2>/dev/null || true
strip $RPM_BUILD_ROOT%{l_prefix}/libexec/openssh/* 2>/dev/null || true
+%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
+ ) || exit $?
+%endif
+
# install ssh-askpass wrapper
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/libexec/openssh
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
