Adjust various things after the removal of secure/.
authorSascha Wildner <saw@online.de>
Sun, 6 Nov 2016 23:08:49 +0000 (00:08 +0100)
committerSascha Wildner <saw@online.de>
Sun, 6 Nov 2016 23:08:49 +0000 (00:08 +0100)
* Fix etc/Makefile: This brings back installation of /etc/ssh_config
    and /etc/sshd_config to our IMG/ISO.

* Add back DES and Blowfish functions to libcrypt.

* Remove installation of CA.pl/CA.sh. They don't seem to be part of
  LibreSSL.

* Remove obsolete paths from whereis(1).

* Adjust hier(7) manual page.

* Adjust openssh upgrade instructions.

* While here, fix a typo in Makefile.ssh.common.

Makefile.ssh.common
crypto/openssh/README.DRAGONFLY
etc/Makefile
lib/libcrypt/Makefile
share/man/man7/hier.7
usr.bin/openssl/Makefile.etc
usr.bin/whereis/pathnames.h
usr.sbin/sshd/Makefile.etc

index c3080d3..165147e 100644 (file)
@@ -8,7 +8,7 @@ SSHC_SYSDIR=${.CURDIR}/../..
 .elif exists(${.CURDIR}/../../../Makefile.inc1)
 SSHC_SYSDIR=${.CURDIR}/../../..
 .else
-.error "Cannot find soure base"
+.error "Cannot find source base"
 .endif
 
 SSHDIR=                ${SSHC_SYSDIR}/crypto/openssh
index d36eb1e..8211034 100644 (file)
@@ -7,19 +7,19 @@ Upgrading notes:
 ./configure --prefix=/usr --sysconfdir=/etc/ssh --with-sandbox=rlimit \
        --with-pam --with-libedit --with-ssl-engine
 
-Update config.h in secure/lib/libssh.
+Update config.h in lib/libssh.
 Update version in sshd_config, sshd_config.5, version.h.
 
 Used in:
+lib/libssh/
 lib/pam_module/pam_ssh/
-secure/lib/libssh/
-secure/libexec/sftp-server/
-secure/libexec/ssh-keysign/
-secure/usr.bin/scp/
-secure/usr.bin/sftp/
-secure/usr.bin/ssh/
-secure/usr.bin/ssh-add/
-secure/usr.bin/ssh-agent/
-secure/usr.bin/ssh-keygen/
-secure/usr.bin/ssh-keyscan/
-secure/usr.sbin/sshd/
+libexec/sftp-server/
+libexec/ssh-keysign/
+usr.bin/scp/
+usr.bin/sftp/
+usr.bin/ssh-add/
+usr.bin/ssh-agent/
+usr.bin/ssh-keygen/
+usr.bin/ssh-keyscan/
+usr.bin/ssh/
+usr.sbin/sshd/
index 5db9e43..85db6ae 100644 (file)
@@ -41,9 +41,9 @@ BIN1+=        ${.CURDIR}/../gnu/usr.bin/man/manpath/manpath.config
 
 .if !defined(NO_CRYPT)
 DIRS+= lib/libssh \
-       secure/usr.bin/ssh \
-       secure/usr.sbin/sshd \
-       secure/usr.bin/openssl
+       usr.bin/openssl \
+       usr.bin/ssh \
+       usr.sbin/sshd
 .endif
 
 # Files that should be installed read-only-executable (555) root:wheel
index cf6147a..fee143a 100644 (file)
@@ -1,6 +1,5 @@
 #
 # $FreeBSD: src/lib/libcrypt/Makefile,v 1.24.2.4 2001/07/16 03:28:26 peter Exp $
-# $DragonFly: src/lib/libcrypt/Makefile,v 1.8 2008/10/28 17:23:45 swildner Exp $
 #
 
 SHLIB_MAJOR=   4
@@ -10,6 +9,7 @@ SHLIBDIR?=     /lib
 .PATH:         ${.CURDIR}/../libmd
 SRCS=          crypt.c crypt-md5.c \
                crypt-sha256.c crypt-sha512.c \
+               crypt-des.c crypt-blowfish.c blowfish.c \
                deprecated-crypt-sha256.c deprecated-crypt-sha512.c \
                md5c.c misc.c
 WARNS?=                2
@@ -20,13 +20,7 @@ MLINKS=              crypt.3 crypt_get_format.3 crypt.3 crypt_set_format.3
 CFLAGS+=       -I${.CURDIR}/../libmd -I${.CURDIR}/../libutil
 CFLAGS+=       -I${.CURDIR}/../../crypto/libressl/include
 CFLAGS+=       -D_CTYPE_H_DISABLE_MACROS_ 
-# Pull in the crypt-des.c source, assuming it is present.
-.if exists(${.CURDIR}/../../secure/lib/libcrypt/crypt-des.c) && \
-    !defined(NO_CRYPT)
-.PATH:         ${.CURDIR}/../../secure/lib/libcrypt
-SRCS+=         crypt-des.c crypt-blowfish.c blowfish.c
 CFLAGS+=       -I${.CURDIR} -DHAS_DES -DHAS_BLOWFISH
-.endif
 # And the auth_getval() code and support.
 .PATH:         ${.CURDIR}/../libutil
 SRCS+=         auth.c property.c
index 4bc8eb8..8de5448 100644 (file)
@@ -28,7 +28,7 @@
 .\"    @(#)hier.7      8.1 (Berkeley) 6/5/93
 .\" $FreeBSD: src/share/man/man7/hier.7,v 1.29.2.17 2003/01/13 21:43:50 ceri Exp $
 .\"
-.Dd May 15, 2016
+.Dd November 6, 2016
 .Dt HIER 7
 .Os
 .Sh NAME
@@ -534,9 +534,6 @@ release
 .It Pa sbin/
 source code for files in
 .Pa /sbin
-.It Pa secure/
-build directory for files in
-.Pa /usr/src/crypto
 .It Pa share/
 source for files in
 .Pa /usr/share
index be15426..2e1666f 100644 (file)
@@ -1,17 +1,9 @@
-# $DragonFly: src/secure/usr.bin/openssl/Makefile.etc,v 1.1 2005/07/07 12:18:30 corecode Exp $
-#
-
 FILES=         openssl.cnf
 FILESDIR=      /etc/ssl
 FILESOWN=      ${BINOWN}
 FILESGRP=      ${BINGRP}
 FILESMODE=     644
 
-SCRIPTS=       CA.pl CA.sh
-SCRIPTSNAME_CA.pl=     CA.pl
-SCRIPTSNAME_CA.sh=     CA.sh
-SCRIPTSDIR=    /etc/ssl
-
-.include "../../lib/libcrypto/Makefile.inc"
-.PATH: ${LCRYPTO_SRC}/apps
+.include "../../lib/librecrypto/Makefile.inc"
+.PATH: ${LIBRESSL_SRC}/apps/openssl
 .include <bsd.prog.mk>
index 51b95f0..6520a22 100644 (file)
 "/usr/src/gnu/bin:/usr/src/gnu/usr.bin:"               \
 "/usr/src/gnu/sbin:/usr/src/gnu/usr.sbin:"             \
 "/usr/src/gnu/libexec:/usr/src/contrib:"               \
-"/usr/src/secure/bin:/usr/src/secure/usr.bin:"         \
-"/usr/src/secure/sbin:/usr/src/secure/usr.sbin:"       \
-"/usr/src/secure/libexec:/usr/src/crypto:"             \
-"/usr/src/games"
+"/usr/src/crypto:/usr/src/games"
 
 /* Each subdirectory of PATH_DPORTS will be appended to PATH_SOURCES. */
 #define PATH_DPORTS "/usr/dports"
index 37a4f0f..269e5a7 100644 (file)
@@ -1,11 +1,8 @@
-# $DragonFly: src/secure/usr.sbin/sshd/Makefile.etc,v 1.2 2008/04/08 12:12:53 swildner Exp $
-#
-
 FILES=         sshd_config
 FILESDIR=      /etc/ssh
 FILESMODE=     644
 FILESOWN=      ${BINOWN}
 FILESGRP=      ${BINGRP}
 
-.include "../../../Makefile.ssh.common"
+.include "../../Makefile.ssh.common"
 .include <bsd.prog.mk>