openssh: updated to 7.1p1 and updated mandir

diff --git a/openssh/.footprint b/openssh/.footprint
index 8548114b49ce42b6ab3f43bc94d7ece7aa456b7e..8b6d478122df2a5811b2dd791ebc325056082754 100644 (file)
--- a/openssh/.footprint
+++ b/openssh/.footprint
@@ -20,24 +20,25 @@ drwxr-xr-x  root/root       usr/lib/ssh/
 -rwxr-xr-x     root/root       usr/lib/ssh/sftp-server
 -rws--x--x     root/root       usr/lib/ssh/ssh-keysign
 -rwxr-xr-x     root/root       usr/lib/ssh/ssh-pkcs11-helper
-drwxr-xr-x     root/root       usr/man/
-drwxr-xr-x     root/root       usr/man/man1/
--rw-r--r--     root/root       usr/man/man1/scp.1.gz
--rw-r--r--     root/root       usr/man/man1/sftp.1.gz
-lrwxrwxrwx     root/root       usr/man/man1/slogin.1.gz -> ssh.1.gz
--rw-r--r--     root/root       usr/man/man1/ssh-add.1.gz
--rw-r--r--     root/root       usr/man/man1/ssh-agent.1.gz
--rw-r--r--     root/root       usr/man/man1/ssh-keygen.1.gz
--rw-r--r--     root/root       usr/man/man1/ssh-keyscan.1.gz
--rw-r--r--     root/root       usr/man/man1/ssh.1.gz
-drwxr-xr-x     root/root       usr/man/man5/
--rw-r--r--     root/root       usr/man/man5/moduli.5.gz
--rw-r--r--     root/root       usr/man/man5/ssh_config.5.gz
--rw-r--r--     root/root       usr/man/man5/sshd_config.5.gz
-drwxr-xr-x     root/root       usr/man/man8/
--rw-r--r--     root/root       usr/man/man8/sftp-server.8.gz
--rw-r--r--     root/root       usr/man/man8/ssh-keysign.8.gz
--rw-r--r--     root/root       usr/man/man8/ssh-pkcs11-helper.8.gz
--rw-r--r--     root/root       usr/man/man8/sshd.8.gz
 drwxr-xr-x     root/root       usr/sbin/
 -rwxr-xr-x     root/root       usr/sbin/sshd
+drwxr-xr-x     root/root       usr/share/
+drwxr-xr-x     root/root       usr/share/man/
+drwxr-xr-x     root/root       usr/share/man/man1/
+-rw-r--r--     root/root       usr/share/man/man1/scp.1.gz
+-rw-r--r--     root/root       usr/share/man/man1/sftp.1.gz
+lrwxrwxrwx     root/root       usr/share/man/man1/slogin.1.gz -> ssh.1.gz
+-rw-r--r--     root/root       usr/share/man/man1/ssh-add.1.gz
+-rw-r--r--     root/root       usr/share/man/man1/ssh-agent.1.gz
+-rw-r--r--     root/root       usr/share/man/man1/ssh-keygen.1.gz
+-rw-r--r--     root/root       usr/share/man/man1/ssh-keyscan.1.gz
+-rw-r--r--     root/root       usr/share/man/man1/ssh.1.gz
+drwxr-xr-x     root/root       usr/share/man/man5/
+-rw-r--r--     root/root       usr/share/man/man5/moduli.5.gz
+-rw-r--r--     root/root       usr/share/man/man5/ssh_config.5.gz
+-rw-r--r--     root/root       usr/share/man/man5/sshd_config.5.gz
+drwxr-xr-x     root/root       usr/share/man/man8/
+-rw-r--r--     root/root       usr/share/man/man8/sftp-server.8.gz
+-rw-r--r--     root/root       usr/share/man/man8/ssh-keysign.8.gz
+-rw-r--r--     root/root       usr/share/man/man8/ssh-pkcs11-helper.8.gz
+-rw-r--r--     root/root       usr/share/man/man8/sshd.8.gz

diff --git a/openssh/.md5sum b/openssh/.md5sum
index bf52a56fe6d560995b144de46696ba70ddacc21c..e25730d77e307e74ea08ea29eea82d0ec8454af4 100644 (file)
--- a/openssh/.md5sum
+++ b/openssh/.md5sum
@@ -1,2 +1,2 @@
-3e9800e6bca1fbac0eea4d41baa7f239  openssh-6.6p1.tar.gz
+8709736bc8a8c253bc4eeb4829888ca5  openssh-7.1p1.tar.gz
 ce4ef44c7d80f6451170e6fe5c07d3f4  sshd

diff --git a/openssh/Pkgfile b/openssh/Pkgfile
index 1b797fdaeb4a032ab952a3741c35bd0831b386a3..201ae8f0cc689ff73ee828214da6803775377d67 100644 (file)
--- a/openssh/Pkgfile
+++ b/openssh/Pkgfile
@@ -5,7 +5,7 @@
 # Depends on: openssl zlib tcp_wrappers
 
 name=openssh
-version=6.6p1
+version=7.1p1
 release=1
 source=(ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/$name-$version.tar.gz sshd)
 
@@ -17,8 +17,7 @@ build() {
               --libexecdir=/usr/lib/ssh \
               --sysconfdir=/etc/ssh \
               --with-mantype=man \
-              --mandir=/usr/man \
-              --with-tcp-wrappers \
+              --mandir=/usr/share/man \
               --with-md5-passwords \
               --with-privsep-user=nobody \
               --with-privsep-path=/var/empty \
@@ -30,5 +29,5 @@ build() {
   make AR="$AR" RANLIB="$RANLIB" AS="$AS" LD="$CC"
   make DESTDIR=$PKG STRIP_OPT="-s --strip-program=$STRIP" AR="$AR" RANLIB="$RANLIB" AS="$AS" install
   install -D -m 755 $SRC/sshd $PKG/etc/rc.d/sshd
-  rm -rf $PKG/usr/share $PKG/var
+  rm -rf $PKG/var
 }