diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-16 20:36:56 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-16 20:36:56 +0100 |
| commit | 5844c1d52c76ba0df5b2b5cba19f03185e34959f (patch) | |
| tree | 544f9caa8ce6215df85831099a6636dd9eaef5be /package | |
| parent | 09f17a99057ee020e26696889413b178c33f55d4 (diff) | |
| parent | c4df48a030c704352ce51b73a664ef4d6ff0d324 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package')
| -rw-r--r-- | package/mksh/Makefile | 4 | ||||
| -rw-r--r-- | package/mksh/patches/patch-dot_mkshrc | 16 | ||||
| -rw-r--r-- | package/openssh/Makefile | 2 |
3 files changed, 6 insertions, 16 deletions
diff --git a/package/mksh/Makefile b/package/mksh/Makefile index f3815462f..88a7492f5 100644 --- a/package/mksh/Makefile +++ b/package/mksh/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= mksh -PKG_VERSION:= 39 +PKG_VERSION:= 39b PKG_RELEASE:= 1 -PKG_MD5SUM:= b2eeb4fe4ccac2704e1440e53cd2672c +PKG_MD5SUM:= 91274beff2be95260a51234d2c7bb4f7 PKG_DESCR:= MirBSD Korn Shell PKG_SECTION:= shells PKG_URL:= http://www.mirbsd.org diff --git a/package/mksh/patches/patch-dot_mkshrc b/package/mksh/patches/patch-dot_mkshrc index 038050e7e..e538fb5d5 100644 --- a/package/mksh/patches/patch-dot_mkshrc +++ b/package/mksh/patches/patch-dot_mkshrc @@ -1,7 +1,6 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- mksh.orig/dot.mkshrc 2009-05-30 12:07:24.734860691 +0200 -+++ mksh/dot.mkshrc 2009-05-30 12:07:18.782465058 +0200 -@@ -20,7 +20,7 @@ +--- mksh.orig/dot.mkshrc 2010-02-16 20:13:59.000000000 +0100 ++++ mksh/dot.mkshrc 2010-02-16 20:13:50.000000000 +0100 +@@ -21,7 +21,7 @@ #- # ~/.mkshrc: mksh initialisation file for interactive shells @@ -10,12 +9,3 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ [[ $HOSTNAME = @(localhost|*([ ])) ]] && HOSTNAME=$(ulimit -c 0;hostname 2>&-) : ${HOSTNAME:=nil}; if (( USER_ID )); then PS1='$'; else PS1='#'; fi function precmd { -@@ -38,7 +38,7 @@ unalias ls - alias l='ls -F' - alias la='l -a' - alias ll='l -l' --alias lo='l -alo' -+alias lo='l -al' - alias which='whence -p' - whence -p rot13 >&- || alias rot13='tr \ - abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ \ diff --git a/package/openssh/Makefile b/package/openssh/Makefile index 1818b893c..524cd4261 100644 --- a/package/openssh/Makefile +++ b/package/openssh/Makefile @@ -67,7 +67,6 @@ 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 @@ -86,6 +85,7 @@ post-install: ${INSTALL_DIR} ${IDIR_OPENSSH_SFTP_SERVER}/usr/sbin ${INSTALL_BIN} ${WRKINST}/usr/bin/sftp \ ${IDIR_OPENSSH_SFTP_CLIENT}/usr/bin + ${INSTALL_DIR} ${IDIR_OPENSSH_SFTP_SERVER}/usr/libexec ${INSTALL_BIN} ${WRKINST}/usr/libexec/sftp-server \ ${IDIR_OPENSSH_SFTP_SERVER}/usr/libexec chmod 0700 {${IDIR_OPENSSH_CLIENT},${IDIR_OPENSSH_SERVER}}/etc/ssh |