summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--package/openssh/Config.in50
-rw-r--r--package/openssh/Makefile140
-rw-r--r--package/openssh/ipkg/openssh-client-utils.control7
-rw-r--r--package/openssh/ipkg/openssh-client.conffiles1
-rw-r--r--package/openssh/ipkg/openssh-client.control (renamed from package/openssh/ipkg/openssh.control)4
-rw-r--r--package/openssh/ipkg/openssh-server.conffiles1
-rw-r--r--package/openssh/ipkg/openssh-server.control7
-rw-r--r--package/openssh/ipkg/openssh-sftp-client.control7
-rw-r--r--package/openssh/ipkg/openssh-sftp-server.control7
9 files changed, 167 insertions, 57 deletions
diff --git a/package/openssh/Config.in b/package/openssh/Config.in
index 69068e847..01bd2d12d 100644
--- a/package/openssh/Config.in
+++ b/package/openssh/Config.in
@@ -1,10 +1,52 @@
+menu "openssh - A free implementation of the Secure Shell protocol"
+
config BR2_PACKAGE_OPENSSH
- tristate "OpenSSH"
- default m if CONFIG_DEVEL
- select BR2_PACKAGE_OPENSSL
+ bool "OpenSSH - A free implementation of the Secure Shell protocol"
+ default y if CONFIG_DEVEL
help
- Popular SSH server and client
+ OpenSSH is a FREE version of the SSH protocol suite of network
+ connectivity tools that increasing numbers of people on the Internet
+ are coming to rely on. Many users of telnet, rlogin, ftp, and other
+ such programs might not realize that their password is transmitted
+ across the Internet unencrypted, but it is. OpenSSH encrypts all
+ traffic (including passwords) to effectively eliminate eavesdropping,
+ connection hijacking, and other network-level attacks. Additionally,
+ OpenSSH provides a myriad of secure tunneling capabilities, as well
+ as a variety of authentication methods.
http://www.openssh.com/
Depends: openssl
+
+
+config BR2_PACKAGE_OPENSSH_CLIENT
+ tristate "openssh-client - OpenSSH client"
+ default m if CONFIG_DEVEL
+ depends BR2_PACKAGE_OPENSSH
+ select BR2_PACKAGE_LIBOPENSSL
+
+config BR2_PACKAGE_OPENSSH_CLIENT_UTILS
+ tristate "openssh-client-utils - OpenSSH client utilities"
+ default m if CONFIG_DEVEL
+ depends BR2_PACKAGE_OPENSSH_CLIENT
+
+config BR2_PACKAGE_OPENSSH_SERVER
+ tristate "openssh-server - OpenSSH server"
+ default m if CONFIG_DEVEL
+ depends BR2_PACKAGE_OPENSSH
+ select BR2_PACKAGE_LIBOPENSSL
+
+config BR2_PACKAGE_OPENSSH_SFTP_CLIENT
+ tristate "openssh-sftp-client - OpenSSH SFTP client"
+ default m if CONFIG_DEVEL
+ depends BR2_PACKAGE_OPENSSH
+ select BR2_PACKAGE_LIBOPENSSL
+
+config BR2_PACKAGE_OPENSSH_SFTP_SERVER
+ tristate "openssh-sftp-server - OpenSSH SFTP server"
+ default m if CONFIG_DEVEL
+ depends BR2_PACKAGE_OPENSSH
+ select BR2_PACKAGE_LIBOPENSSL
+
+endmenu
+
diff --git a/package/openssh/Makefile b/package/openssh/Makefile
index 9d96f75f7..2d4a554a7 100644
--- a/package/openssh/Makefile
+++ b/package/openssh/Makefile
@@ -21,64 +21,102 @@ include $(TOPDIR)/package/rules.mk
PKG_DEPEND:="openssl"
-$(eval $(call PKG_template,OPENSSH,openssh,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,OPENSSH_CLIENT,openssh-client,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,OPENSSH_CLIENT_UTILS,openssh-client-utils,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,OPENSSH_SERVER,openssh-server,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,OPENSSH_SFTP_CLIENT,openssh-sftp-client,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,OPENSSH_SFTP_SERVER,openssh-sftp-server,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
- (cd $(PKG_BUILD_DIR); rm -rf config.cache; \
+$(PKG_BUILD_DIR)/.configured:
+ (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
$(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(TARGET_CFLAGS)" \
+ CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
+ LD="$(TARGET_CC)" \
+ LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
./configure \
- --target=$(GNU_TARGET_NAME) \
- --host=$(GNU_TARGET_NAME) \
- --build=$(GNU_HOST_NAME) \
- --prefix=/usr \
- --exec-prefix=/usr \
- --bindir=/usr/bin \
- --sbindir=/usr/sbin \
- --libexecdir=/usr/lib \
- --sysconfdir=/etc/ssh \
- --datadir=/usr/share \
- --localstatedir=/var \
- --mandir=/usr/man \
- --infodir=/usr/info \
- --with-zlib=$(STAGING_DIR)/usr \
- --with-ssl-dir=$(STAGING_DIR)/usr \
- --disable-strip \
- --disable-lastlog \
- --disable-etc-default-login \
- --disable-utmp \
- --disable-utmpx \
- --disable-wtmp \
- --disable-wtmpx \
- --with-cflags="$(TARGET_CFLAGS)" \
- --includedir=$(STAGING_DIR)/include \
- --without-pam \
- --without-bsd-auth \
- --without-kerberos5 \
- --without-x \
- --disable-debug \
+ --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 $(PKG_BUILD_DIR)/.configured
+ touch $@
-$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
- $(MAKE) CC=$(TARGET_CC) -C $(PKG_BUILD_DIR)
- touch $(PKG_BUILD_DIR)/.built
-
-$(PKG_BUILD_DIR)/.installed: $(PKG_BUILD_DIR)/.built
+$(PKG_BUILD_DIR)/.built:
+ rm -rf $(PKG_INSTALL_DIR)
mkdir -p $(PKG_INSTALL_DIR)
- $(MAKE) CC=$(TARGET_CC) -C $(PKG_BUILD_DIR) \
+ $(MAKE) -C $(PKG_BUILD_DIR) \
DESTDIR="$(PKG_INSTALL_DIR)" \
- install
- touch $(PKG_BUILD_DIR)/.installed
+ all install
+ touch $@
+
+$(IPKG_OPENSSH_CLIENT):
+ install -m0700 -d $(IDIR_OPENSSH_CLIENT)/etc/ssh
+ cp -fpR $(PKG_INSTALL_DIR)/etc/ssh/ssh_config $(IDIR_OPENSSH_CLIENT)/etc/ssh/
+ install -m0755 -d $(IDIR_OPENSSH_CLIENT)/usr/bin
+ cp -fpR $(PKG_INSTALL_DIR)/usr/bin/ssh $(IDIR_OPENSSH_CLIENT)/usr/bin/
+ cp -fpR $(PKG_INSTALL_DIR)/usr/bin/scp $(IDIR_OPENSSH_CLIENT)/usr/bin/
+ $(RSTRIP) $(IDIR_OPENSSH_CLIENT)
+ $(IPKG_BUILD) $(IDIR_OPENSSH_CLIENT) $(PACKAGE_DIR)
+
+$(IPKG_OPENSSH_CLIENT_UTILS):
+ install -m0755 -d $(IDIR_OPENSSH_CLIENT_UTILS)/usr/bin
+ cp -fpR $(PKG_INSTALL_DIR)/usr/bin/ssh-add $(IDIR_OPENSSH_CLIENT_UTILS)/usr/bin/
+ cp -fpR $(PKG_INSTALL_DIR)/usr/bin/ssh-agent $(IDIR_OPENSSH_CLIENT_UTILS)/usr/bin/
+ cp -fpR $(PKG_INSTALL_DIR)/usr/bin/ssh-keyscan $(IDIR_OPENSSH_CLIENT_UTILS)/usr/bin/
+ $(RSTRIP) $(IDIR_OPENSSH_CLIENT_UTILS)
+ $(IPKG_BUILD) $(IDIR_OPENSSH_CLIENT_UTILS) $(PACKAGE_DIR)
+
+$(IPKG_OPENSSH_SERVER):
+ install -m0700 -d $(IDIR_OPENSSH_SERVER)/etc/ssh
+ cp -fpR $(PKG_INSTALL_DIR)/etc/ssh/sshd_config $(IDIR_OPENSSH_SERVER)/etc/ssh/
+ install -m0755 -d $(IDIR_OPENSSH_SERVER)/etc/init.d
+ install -m0755 ./files/S50sshd $(IDIR_OPENSSH_SERVER)/etc/init.d/
+ install -m0755 -d $(IDIR_OPENSSH_SERVER)/usr/bin
+ cp -fpR $(PKG_INSTALL_DIR)/usr/bin/ssh-keygen $(IDIR_OPENSSH_SERVER)/usr/bin/
+ install -m0755 -d $(IDIR_OPENSSH_SERVER)/usr/sbin
+ cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/sshd $(IDIR_OPENSSH_SERVER)/usr/sbin/
+ $(RSTRIP) $(IDIR_OPENSSH_SERVER)
+ $(IPKG_BUILD) $(IDIR_OPENSSH_SERVER) $(PACKAGE_DIR)
+
+$(IPKG_OPENSSH_SFTP_CLIENT):
+ install -m0755 -d $(IDIR_OPENSSH_SFTP_CLIENT)/usr/bin
+ cp -fpR $(PKG_INSTALL_DIR)/usr/bin/sftp $(IDIR_OPENSSH_SFTP_CLIENT)/usr/bin/
+ $(RSTRIP) $(IDIR_OPENSSH_SFTP_CLIENT)
+ $(IPKG_BUILD) $(IDIR_OPENSSH_SFTP_CLIENT) $(PACKAGE_DIR)
-$(IPKG_OPENSSH): $(IDIR_OPENSSH)/CONTROL/control $(PKG_BUILD_DIR)/.installed
- mkdir -p $(IDIR_OPENSSH){/etc/ssh,/usr/sbin,/usr/bin}
- cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/sshd $(IDIR_OPENSSH)/usr/sbin/
- cp -fpR $(PKG_INSTALL_DIR)/usr/bin/ssh-keygen $(IDIR_OPENSSH)/usr/bin/
- #$(RSTRIP) $(IDIR_OPENSSH)
- mkdir -p $(PACKAGE_DIR)
- cp $(PKG_INSTALL_DIR)/etc/ssh/* $(IDIR_OPENSSH)/etc/ssh/
- mkdir -p $(IDIR_OPENSSH)/etc/init.d
- install -m 755 ./files/S50sshd $(IDIR_OPENSSH)/etc/init.d/
- $(IPKG_BUILD) $(IDIR_OPENSSH) $(PACKAGE_DIR)
+$(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/
+ $(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
new file mode 100644
index 000000000..981e2a2c7
--- /dev/null
+++ b/package/openssh/ipkg/openssh-client-utils.control
@@ -0,0 +1,7 @@
+Package: openssh-client-utils
+Priority: optional
+Section: net
+Maintainer: bugs@openwrt.org
+Source: buildroot internal
+Depends: zlib, libopenssl
+Description: OpenSSH client utilities
diff --git a/package/openssh/ipkg/openssh-client.conffiles b/package/openssh/ipkg/openssh-client.conffiles
new file mode 100644
index 000000000..489e8267f
--- /dev/null
+++ b/package/openssh/ipkg/openssh-client.conffiles
@@ -0,0 +1 @@
+/etc/ssh/ssh_config \ No newline at end of file
diff --git a/package/openssh/ipkg/openssh.control b/package/openssh/ipkg/openssh-client.control
index 7ad07c74c..4ba5190da 100644
--- a/package/openssh/ipkg/openssh.control
+++ b/package/openssh/ipkg/openssh-client.control
@@ -1,7 +1,7 @@
-Package: openssh
+Package: openssh-client
Priority: optional
Section: net
Maintainer: bugs@openwrt.org
Source: buildroot internal
Depends: zlib, libopenssl
-Description: SSH Server and Client
+Description: OpenSSH client
diff --git a/package/openssh/ipkg/openssh-server.conffiles b/package/openssh/ipkg/openssh-server.conffiles
new file mode 100644
index 000000000..6f0cfbcbe
--- /dev/null
+++ b/package/openssh/ipkg/openssh-server.conffiles
@@ -0,0 +1 @@
+/etc/ssh/sshd_config \ No newline at end of file
diff --git a/package/openssh/ipkg/openssh-server.control b/package/openssh/ipkg/openssh-server.control
new file mode 100644
index 000000000..8247c3f11
--- /dev/null
+++ b/package/openssh/ipkg/openssh-server.control
@@ -0,0 +1,7 @@
+Package: openssh-server
+Priority: optional
+Section: net
+Maintainer: bugs@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
new file mode 100644
index 000000000..0edad501b
--- /dev/null
+++ b/package/openssh/ipkg/openssh-sftp-client.control
@@ -0,0 +1,7 @@
+Package: openssh-sftp-client
+Priority: optional
+Section: net
+Maintainer: bugs@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
new file mode 100644
index 000000000..fba5d6a16
--- /dev/null
+++ b/package/openssh/ipkg/openssh-sftp-server.control
@@ -0,0 +1,7 @@
+Package: openssh-sftp-server
+Priority: optional
+Section: net
+Maintainer: bugs@openwrt.org
+Source: buildroot internal
+Depends: zlib, libopenssl
+Description: OpenSSH SFTP server
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-25 22:18:38 +0000