summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authornico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-10-19 13:54:29 +0000
committernico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-10-19 13:54:29 +0000
commit9b460ff9a06fefd1287dc6067198a83ab6ab65c2 (patch)
tree1f71fa7ccfaea8a683668647649b89b0835bc64e /package
parentdda8643c1ff3978df3bfdbed48960acf44327a17 (diff)
backport [2184] (openssh sftp-server) to trunk
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2185 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
-rw-r--r--package/openssh/Makefile70
-rw-r--r--package/openssh/ipkg/openssh-client-utils.control2
-rw-r--r--package/openssh/ipkg/openssh-server.control2
-rw-r--r--package/openssh/ipkg/openssh-sftp-client.control2
-rw-r--r--package/openssh/ipkg/openssh-sftp-server.control2
5 files changed, 40 insertions, 38 deletions
diff --git a/package/openssh/Makefile b/package/openssh/Makefile
index 2d4a554a79..742a8086fc 100644
--- a/package/openssh/Makefile
+++ b/package/openssh/Makefile
@@ -4,7 +4,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=openssh
PKG_VERSION:=4.0p1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_MD5SUM:=7b36f28fc16e1b7f4ba3c1dca191ac92
PKG_SOURCE_URL:=ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ \
@@ -35,39 +35,39 @@ $(PKG_BUILD_DIR)/.configured:
LD="$(TARGET_CC)" \
LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
./configure \
- --target=$(GNU_TARGET_NAME) \
- --host=$(GNU_TARGET_NAME) \
- --build=$(GNU_HOST_NAME) \
- --program-prefix="" \
- --program-suffix="" \
- --prefix=/usr \
- --exec-prefix=/usr \
- --bindir=/usr/bin \
- --datadir=/usr/share \
- --includedir=/usr/include \
- --infodir=/usr/share/info \
- --libdir=/usr/lib \
- --libexecdir=/usr/lib \
- --localstatedir=/var \
- --mandir=/usr/share/man \
- --sbindir=/usr/sbin \
- --sysconfdir=/etc/ssh \
- $(DISABLE_LARGEFILE) \
- $(DISABLE_NLS) \
- --enable-shared \
- --disable-static \
- --disable-debug \
- --disable-strip \
- --disable-etc-default-login \
- --disable-lastlog \
- --disable-utmp \
- --disable-utmpx \
- --disable-wtmp \
- --disable-wtmpx \
- --without-bsd-auth \
- --without-kerberos5 \
- --without-pam \
- --without-x \
+ --target=$(GNU_TARGET_NAME) \
+ --host=$(GNU_TARGET_NAME) \
+ --build=$(GNU_HOST_NAME) \
+ --program-prefix="" \
+ --program-suffix="" \
+ --prefix=/usr \
+ --exec-prefix=/usr \
+ --bindir=/usr/bin \
+ --datadir=/usr/share \
+ --includedir=/usr/include \
+ --infodir=/usr/share/info \
+ --libdir=/usr/lib \
+ --libexecdir=/usr/lib \
+ --localstatedir=/var \
+ --mandir=/usr/share/man \
+ --sbindir=/usr/sbin \
+ --sysconfdir=/etc/ssh \
+ $(DISABLE_LARGEFILE) \
+ $(DISABLE_NLS) \
+ --enable-shared \
+ --disable-static \
+ --disable-debug \
+ --disable-strip \
+ --disable-etc-default-login \
+ --disable-lastlog \
+ --disable-utmp \
+ --disable-utmpx \
+ --disable-wtmp \
+ --disable-wtmpx \
+ --without-bsd-auth \
+ --without-kerberos5 \
+ --without-pam \
+ --without-x \
);
touch $@
@@ -117,6 +117,8 @@ $(IPKG_OPENSSH_SFTP_CLIENT):
$(IPKG_OPENSSH_SFTP_SERVER):
install -m0755 -d $(IDIR_OPENSSH_SFTP_SERVER)/usr/lib
cp -fpR $(PKG_INSTALL_DIR)/usr/lib/sftp-server $(IDIR_OPENSSH_SFTP_SERVER)/usr/lib/
+ install -m0755 -d $(IDIR_OPENSSH_SFTP_SERVER)/usr/libexec
+ ln -sf ../lib/sftp-server $(IDIR_OPENSSH_SFTP_SERVER)/usr/libexec/sftp-server
$(RSTRIP) $(IDIR_OPENSSH_SFTP_SERVER)
$(IPKG_BUILD) $(IDIR_OPENSSH_SFTP_SERVER) $(PACKAGE_DIR)
diff --git a/package/openssh/ipkg/openssh-client-utils.control b/package/openssh/ipkg/openssh-client-utils.control
index 981e2a2c7b..280e6bfcc7 100644
--- a/package/openssh/ipkg/openssh-client-utils.control
+++ b/package/openssh/ipkg/openssh-client-utils.control
@@ -1,7 +1,7 @@
Package: openssh-client-utils
Priority: optional
Section: net
-Maintainer: bugs@openwrt.org
+Maintainer: OpenWrt Developers Team <openwrt-devel@openwrt.org>
Source: buildroot internal
Depends: zlib, libopenssl
Description: OpenSSH client utilities
diff --git a/package/openssh/ipkg/openssh-server.control b/package/openssh/ipkg/openssh-server.control
index 8247c3f110..22ce485ee4 100644
--- a/package/openssh/ipkg/openssh-server.control
+++ b/package/openssh/ipkg/openssh-server.control
@@ -1,7 +1,7 @@
Package: openssh-server
Priority: optional
Section: net
-Maintainer: bugs@openwrt.org
+Maintainer: OpenWrt Developers Team <openwrt-devel@openwrt.org>
Source: buildroot internal
Depends: zlib, libopenssl
Description: OpenSSH server
diff --git a/package/openssh/ipkg/openssh-sftp-client.control b/package/openssh/ipkg/openssh-sftp-client.control
index 0edad501bd..2accca8d13 100644
--- a/package/openssh/ipkg/openssh-sftp-client.control
+++ b/package/openssh/ipkg/openssh-sftp-client.control
@@ -1,7 +1,7 @@
Package: openssh-sftp-client
Priority: optional
Section: net
-Maintainer: bugs@openwrt.org
+Maintainer: OpenWrt Developers Team <openwrt-devel@openwrt.org>
Source: buildroot internal
Depends: zlib, libopenssl
Description: OpenSSH SFTP client
diff --git a/package/openssh/ipkg/openssh-sftp-server.control b/package/openssh/ipkg/openssh-sftp-server.control
index fba5d6a169..1e17432de1 100644
--- a/package/openssh/ipkg/openssh-sftp-server.control
+++ b/package/openssh/ipkg/openssh-sftp-server.control
@@ -1,7 +1,7 @@
Package: openssh-sftp-server
Priority: optional
Section: net
-Maintainer: bugs@openwrt.org
+Maintainer: OpenWrt Developers Team <openwrt-devel@openwrt.org>
Source: buildroot internal
Depends: zlib, libopenssl
Description: OpenSSH SFTP server