153 lines
7.8 KiB
Diff
153 lines
7.8 KiB
Diff
--- openssh-7.5p1/Makefile.in.orig 2017-03-20 03:39:27.000000000 +0100
|
|
+++ openssh-7.5p1/Makefile.in 2019-12-10 05:50:55.590037728 +0100
|
|
@@ -62,7 +62,7 @@
|
|
EXEEXT=@EXEEXT@
|
|
MANFMT=@MANFMT@
|
|
|
|
-TARGETS=ssh$(EXEEXT) sshd$(EXEEXT) ssh-add$(EXEEXT) ssh-keygen$(EXEEXT) ssh-keyscan${EXEEXT} ssh-keysign${EXEEXT} ssh-pkcs11-helper$(EXEEXT) ssh-agent$(EXEEXT) scp$(EXEEXT) sftp-server$(EXEEXT) sftp$(EXEEXT)
|
|
+TARGETS=ssh$(EXEEXT) ssh-keygen$(EXEEXT) scp$(EXEEXT)
|
|
|
|
LIBOPENSSH_OBJS=\
|
|
ssh_api.o \
|
|
@@ -112,15 +112,15 @@
|
|
sandbox-seccomp-filter.o sandbox-capsicum.o sandbox-pledge.o \
|
|
sandbox-solaris.o
|
|
|
|
-MANPAGES = moduli.5.out scp.1.out ssh-add.1.out ssh-agent.1.out ssh-keygen.1.out ssh-keyscan.1.out ssh.1.out sshd.8.out sftp-server.8.out sftp.1.out ssh-keysign.8.out ssh-pkcs11-helper.8.out sshd_config.5.out ssh_config.5.out
|
|
-MANPAGES_IN = moduli.5 scp.1 ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh-keyscan.1 ssh.1 sshd.8 sftp-server.8 sftp.1 ssh-keysign.8 ssh-pkcs11-helper.8 sshd_config.5 ssh_config.5
|
|
+MANPAGES = scp.1.out ssh-keygen.1.out ssh.1.out ssh_config.5.out
|
|
+MANPAGES_IN = scp.1 ssh-keygen.1 ssh.1 ssh_config.5
|
|
MANTYPE = @MANTYPE@
|
|
|
|
-CONFIGFILES=sshd_config.out ssh_config.out moduli.out
|
|
-CONFIGFILES_IN=sshd_config ssh_config moduli
|
|
+CONFIGFILES=ssh_config.out
|
|
+CONFIGFILES_IN=ssh_config
|
|
|
|
PATHSUBS = \
|
|
- -e 's|/etc/ssh/ssh_config|$(sysconfdir)/ssh_config|g' \
|
|
+ -e 's|/etc/ssh/ssh_config|$(sysconfdir)/ssh_config1|g' \
|
|
-e 's|/etc/ssh/ssh_known_hosts|$(sysconfdir)/ssh_known_hosts|g' \
|
|
-e 's|/etc/ssh/sshd_config|$(sysconfdir)/sshd_config|g' \
|
|
-e 's|/usr/libexec|$(libexecdir)|g' \
|
|
@@ -301,71 +301,31 @@
|
|
$(AUTORECONF)
|
|
-rm -rf autom4te.cache
|
|
|
|
-install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf host-key check-config
|
|
+install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf host-key
|
|
install-nokeys: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf
|
|
install-nosysconf: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files
|
|
|
|
-check-config:
|
|
- -$(DESTDIR)$(sbindir)/sshd -t -f $(DESTDIR)$(sysconfdir)/sshd_config
|
|
-
|
|
install-files:
|
|
$(srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
|
|
- $(srcdir)/mkinstalldirs $(DESTDIR)$(sbindir)
|
|
$(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)
|
|
$(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)1
|
|
$(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)5
|
|
- $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)8
|
|
- $(srcdir)/mkinstalldirs $(DESTDIR)$(libexecdir)
|
|
- (umask 022 ; $(srcdir)/mkinstalldirs $(DESTDIR)$(PRIVSEP_PATH))
|
|
- $(INSTALL) -m 0755 $(STRIP_OPT) ssh$(EXEEXT) $(DESTDIR)$(bindir)/ssh$(EXEEXT)
|
|
- $(INSTALL) -m 0755 $(STRIP_OPT) scp$(EXEEXT) $(DESTDIR)$(bindir)/scp$(EXEEXT)
|
|
- $(INSTALL) -m 0755 $(STRIP_OPT) ssh-add$(EXEEXT) $(DESTDIR)$(bindir)/ssh-add$(EXEEXT)
|
|
- $(INSTALL) -m 0755 $(STRIP_OPT) ssh-agent$(EXEEXT) $(DESTDIR)$(bindir)/ssh-agent$(EXEEXT)
|
|
- $(INSTALL) -m 0755 $(STRIP_OPT) ssh-keygen$(EXEEXT) $(DESTDIR)$(bindir)/ssh-keygen$(EXEEXT)
|
|
- $(INSTALL) -m 0755 $(STRIP_OPT) ssh-keyscan$(EXEEXT) $(DESTDIR)$(bindir)/ssh-keyscan$(EXEEXT)
|
|
- $(INSTALL) -m 0755 $(STRIP_OPT) sshd$(EXEEXT) $(DESTDIR)$(sbindir)/sshd$(EXEEXT)
|
|
- $(INSTALL) -m 4711 $(STRIP_OPT) ssh-keysign$(EXEEXT) $(DESTDIR)$(SSH_KEYSIGN)$(EXEEXT)
|
|
- $(INSTALL) -m 0755 $(STRIP_OPT) ssh-pkcs11-helper$(EXEEXT) $(DESTDIR)$(SSH_PKCS11_HELPER)$(EXEEXT)
|
|
- $(INSTALL) -m 0755 $(STRIP_OPT) sftp$(EXEEXT) $(DESTDIR)$(bindir)/sftp$(EXEEXT)
|
|
- $(INSTALL) -m 0755 $(STRIP_OPT) sftp-server$(EXEEXT) $(DESTDIR)$(SFTP_SERVER)$(EXEEXT)
|
|
- $(INSTALL) -m 644 ssh.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh.1
|
|
- $(INSTALL) -m 644 scp.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/scp.1
|
|
- $(INSTALL) -m 644 ssh-add.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-add.1
|
|
- $(INSTALL) -m 644 ssh-agent.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-agent.1
|
|
- $(INSTALL) -m 644 ssh-keygen.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keygen.1
|
|
- $(INSTALL) -m 644 ssh-keyscan.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keyscan.1
|
|
- $(INSTALL) -m 644 moduli.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/moduli.5
|
|
- $(INSTALL) -m 644 sshd_config.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/sshd_config.5
|
|
- $(INSTALL) -m 644 ssh_config.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/ssh_config.5
|
|
- $(INSTALL) -m 644 sshd.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/sshd.8
|
|
- $(INSTALL) -m 644 sftp.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/sftp.1
|
|
- $(INSTALL) -m 644 sftp-server.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/sftp-server.8
|
|
- $(INSTALL) -m 644 ssh-keysign.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-keysign.8
|
|
- $(INSTALL) -m 644 ssh-pkcs11-helper.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-pkcs11-helper.8
|
|
+ $(INSTALL) -m 0755 $(STRIP_OPT) ssh$(EXEEXT) $(DESTDIR)$(bindir)/ssh1$(EXEEXT)
|
|
+ $(INSTALL) -m 0755 $(STRIP_OPT) scp$(EXEEXT) $(DESTDIR)$(bindir)/scp1$(EXEEXT)
|
|
+ $(INSTALL) -m 0755 $(STRIP_OPT) ssh-keygen$(EXEEXT) $(DESTDIR)$(bindir)/ssh-keygen1$(EXEEXT)
|
|
+ $(INSTALL) -m 644 ssh.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh1.1
|
|
+ $(INSTALL) -m 644 scp.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/scp1.1
|
|
+ $(INSTALL) -m 644 ssh-keygen.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keygen1.1
|
|
+ $(INSTALL) -m 644 ssh_config.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/ssh_config1.5
|
|
|
|
install-sysconf:
|
|
if [ ! -d $(DESTDIR)$(sysconfdir) ]; then \
|
|
$(srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir); \
|
|
fi
|
|
- @if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_config ]; then \
|
|
- $(INSTALL) -m 644 ssh_config.out $(DESTDIR)$(sysconfdir)/ssh_config; \
|
|
- else \
|
|
- echo "$(DESTDIR)$(sysconfdir)/ssh_config already exists, install will not overwrite"; \
|
|
- fi
|
|
- @if [ ! -f $(DESTDIR)$(sysconfdir)/sshd_config ]; then \
|
|
- $(INSTALL) -m 644 sshd_config.out $(DESTDIR)$(sysconfdir)/sshd_config; \
|
|
- else \
|
|
- echo "$(DESTDIR)$(sysconfdir)/sshd_config already exists, install will not overwrite"; \
|
|
- fi
|
|
- @if [ ! -f $(DESTDIR)$(sysconfdir)/moduli ]; then \
|
|
- if [ -f $(DESTDIR)$(sysconfdir)/primes ]; then \
|
|
- echo "moving $(DESTDIR)$(sysconfdir)/primes to $(DESTDIR)$(sysconfdir)/moduli"; \
|
|
- mv "$(DESTDIR)$(sysconfdir)/primes" "$(DESTDIR)$(sysconfdir)/moduli"; \
|
|
- else \
|
|
- $(INSTALL) -m 644 moduli.out $(DESTDIR)$(sysconfdir)/moduli; \
|
|
- fi ; \
|
|
+ @if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_config1 ]; then \
|
|
+ $(INSTALL) -m 644 ssh_config.out $(DESTDIR)$(sysconfdir)/ssh_config1; \
|
|
else \
|
|
- echo "$(DESTDIR)$(sysconfdir)/moduli already exists, install will not overwrite"; \
|
|
+ echo "$(DESTDIR)$(sysconfdir)/ssh_config1 already exists, install will not overwrite"; \
|
|
fi
|
|
|
|
host-key: ssh-keygen$(EXEEXT)
|
|
@@ -385,8 +345,7 @@
|
|
fi
|
|
|
|
uninstallall: uninstall
|
|
- -rm -f $(DESTDIR)$(sysconfdir)/ssh_config
|
|
- -rm -f $(DESTDIR)$(sysconfdir)/sshd_config
|
|
+ -rm -f $(DESTDIR)$(sysconfdir)/ssh_config1
|
|
-rmdir $(DESTDIR)$(sysconfdir)
|
|
-rmdir $(DESTDIR)$(bindir)
|
|
-rmdir $(DESTDIR)$(sbindir)
|
|
@@ -398,26 +357,10 @@
|
|
uninstall:
|
|
-rm -f $(DESTDIR)$(bindir)/ssh$(EXEEXT)
|
|
-rm -f $(DESTDIR)$(bindir)/scp$(EXEEXT)
|
|
- -rm -f $(DESTDIR)$(bindir)/ssh-add$(EXEEXT)
|
|
- -rm -f $(DESTDIR)$(bindir)/ssh-agent$(EXEEXT)
|
|
-rm -f $(DESTDIR)$(bindir)/ssh-keygen$(EXEEXT)
|
|
- -rm -f $(DESTDIR)$(bindir)/ssh-keyscan$(EXEEXT)
|
|
- -rm -f $(DESTDIR)$(bindir)/sftp$(EXEEXT)
|
|
- -rm -f $(DESTDIR)$(sbindir)/sshd$(EXEEXT)
|
|
- -rm -r $(DESTDIR)$(SFTP_SERVER)$(EXEEXT)
|
|
- -rm -f $(DESTDIR)$(SSH_KEYSIGN)$(EXEEXT)
|
|
- -rm -f $(DESTDIR)$(SSH_PKCS11_HELPER)$(EXEEXT)
|
|
-rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh.1
|
|
-rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/scp.1
|
|
- -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-add.1
|
|
- -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-agent.1
|
|
-rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keygen.1
|
|
- -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/sftp.1
|
|
- -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keyscan.1
|
|
- -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/sshd.8
|
|
- -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/sftp-server.8
|
|
- -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-keysign.8
|
|
- -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-pkcs11-helper.8
|
|
|
|
regress-prep:
|
|
[ -d `pwd`/regress ] || mkdir -p `pwd`/regress
|