diff options
Diffstat (limited to 'package/openssh')
| -rw-r--r-- | package/openssh/Makefile | 14 | ||||
| -rw-r--r-- | package/openssh/files/sshd.init | 2 | ||||
| -rw-r--r-- | package/openssh/files/sshd_config | 2 |
3 files changed, 8 insertions, 10 deletions
diff --git a/package/openssh/Makefile b/package/openssh/Makefile index 6aa819a3d..1818b893c 100644 --- a/package/openssh/Makefile +++ b/package/openssh/Makefile @@ -9,14 +9,14 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 13563dbf61f36ca9a1e4254260131041 PKG_DESCR:= OpenSSH server PKG_SECTION:= net -PKG_DEPENDS:= zlib libopenssl +PKG_DEPENDS:= zlib libopenssl libpthread PKG_BUILDDEP+= zlib openssl ifeq (${ADK_COMPILE_OPENSSH_WITH_KRB5},y) -PKG_DEPENDS+= krb5-libs +PKG_DEPENDS+= libkrb5 libcom-err PKG_BUILDDEP+= krb5 endif ifeq (${ADK_COMPILE_OPENSSH_WITH_HEIMDAL},y) -PKG_DEPENDS+= heimdal-libs +PKG_DEPENDS+= libheimdal libcom-err PKG_BUILDDEP+= heimdal endif PKG_URL:= http://www.openssh.com @@ -44,7 +44,6 @@ CONFIGURE_ARGS+= --with-kerberos5="${STAGING_DIR}/usr" else CONFIGURE_ARGS+= --without-kerberos5 endif -CONFIGURE_STYLE:= gnu CONFIGURE_ENV+= LD='${TARGET_CC}' \ ac_cv_func_setlogin=no \ ac_cv_lib_nsl_yp_match=no @@ -63,13 +62,12 @@ CONFIGURE_ARGS+= --disable-strip \ --with-privsep-user=sshd \ --with-privsep-path=/var/run/sshd \ --with-ssl-dir="${STAGING_DIR}/usr" -BUILD_STYLE:= auto -INSTALL_STYLE:= auto post-install: ${INSTALL_DIR} ${IDIR_OPENSSH_SERVER}/etc/ssh ${INSTALL_DIR} ${IDIR_OPENSSH_SERVER}/usr/bin ${INSTALL_DIR} ${IDIR_OPENSSH_SERVER}/usr/sbin + ${INSTALL_DIR} ${IDIR_OPENSSH_SERVER}/usr/libexec ${CP} ./files/sshd_config ${IDIR_OPENSSH_SERVER}/etc/ssh ${INSTALL_BIN} ${WRKINST}/usr/bin/ssh-keygen \ ${IDIR_OPENSSH_SERVER}/usr/bin @@ -88,8 +86,8 @@ post-install: ${INSTALL_DIR} ${IDIR_OPENSSH_SFTP_SERVER}/usr/sbin ${INSTALL_BIN} ${WRKINST}/usr/bin/sftp \ ${IDIR_OPENSSH_SFTP_CLIENT}/usr/bin - ${INSTALL_BIN} ${WRKINST}/usr/sbin/sftp-server \ - ${IDIR_OPENSSH_SFTP_SERVER}/usr/sbin + ${INSTALL_BIN} ${WRKINST}/usr/libexec/sftp-server \ + ${IDIR_OPENSSH_SFTP_SERVER}/usr/libexec chmod 0700 {${IDIR_OPENSSH_CLIENT},${IDIR_OPENSSH_SERVER}}/etc/ssh include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/openssh/files/sshd.init b/package/openssh/files/sshd.init index 149da9dc4..1a2db6ada 100644 --- a/package/openssh/files/sshd.init +++ b/package/openssh/files/sshd.init @@ -8,7 +8,7 @@ case $1 in autostop) ;; autostart) [[ $openssh = NO ]] && exit 0 - grep dropbear /etc/rc.conf >/dev/null 2>&1 || dropbear=NO + grep "^dropbear" /etc/rc.conf >/dev/null 2>&1 || dropbear=NO if [[ $openssh = AUTO && $dropbear != NO ]]; then echo openssh not starting: set to AUTO and dropbear is enabled exit 0 diff --git a/package/openssh/files/sshd_config b/package/openssh/files/sshd_config index 1ef114940..b8a2c1a70 100644 --- a/package/openssh/files/sshd_config +++ b/package/openssh/files/sshd_config @@ -104,7 +104,7 @@ UsePrivilegeSeparation yes #Banner none # override default of no subsystems -Subsystem sftp /usr/sbin/sftp-server +Subsystem sftp /usr/libexec/sftp-server # Example of overriding settings on a per-user basis #Match User anoncvs |