X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/7d52908f08ce60dcc0b8406ce08993ce0a567dc4..e5b8ab02efc65510bc96a79cd0015210e5ee7894:/openwrt/package/openssh/Makefile diff --git a/openwrt/package/openssh/Makefile b/openwrt/package/openssh/Makefile index 2d4a554a7..a720de7b8 100644 --- a/openwrt/package/openssh/Makefile +++ b/openwrt/package/openssh/Makefile @@ -3,9 +3,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=openssh -PKG_VERSION:=4.0p1 -PKG_RELEASE:=1 -PKG_MD5SUM:=7b36f28fc16e1b7f4ba3c1dca191ac92 +PKG_VERSION:=4.2p1 +PKG_RELEASE:=2 +PKG_MD5SUM:=df899194a340c933944b193477c628fa PKG_SOURCE_URL:=ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ \ ftp://openbsd.wiretapped.net/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 $@ @@ -80,43 +80,47 @@ $(PKG_BUILD_DIR)/.built: 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)/etc/ssh + chmod 0700 $(IDIR_OPENSSH_CLIENT)/etc/ssh + $(CP) $(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/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/ssh $(IDIR_OPENSSH_CLIENT)/usr/bin/ + $(CP) $(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/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/ssh-add $(IDIR_OPENSSH_CLIENT_UTILS)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/ssh-agent $(IDIR_OPENSSH_CLIENT_UTILS)/usr/bin/ + $(CP) $(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/ssh + chmod 0700 $(IDIR_OPENSSH_SERVER)/etc/ssh + $(CP) $(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/ + $(CP) $(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/ + $(CP) $(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/ + $(CP) $(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_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/ + $(CP) $(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)