diff options
| author | dinoex <dinoex@FreeBSD.org> | 2001-12-02 07:04:27 +0000 |
|---|---|---|
| committer | dinoex <dinoex@FreeBSD.org> | 2001-12-02 07:04:27 +0000 |
| commit | a09c2a7fc383be4e7fc2129e99e2f27e22126557 (patch) | |
| tree | c559249fd624d05d592241915bc52e4c849e78c5 /security | |
| parent | bbe0fae48c78f07c0c2a2e3783f0a9726d360ad5 (diff) | |
| download | FreeBSD-ports-a09c2a7fc383be4e7fc2129e99e2f27e22126557.zip FreeBSD-ports-a09c2a7fc383be4e7fc2129e99e2f27e22126557.tar.gz | |
- extend patch for batch mode, so no site-specifc files are installed.
Diffstat (limited to 'security')
| -rw-r--r-- | security/hpn-ssh/files/batch.patch | 40 | ||||
| -rw-r--r-- | security/openssh-portable/files/batch.patch | 40 |
2 files changed, 78 insertions, 2 deletions
diff --git a/security/hpn-ssh/files/batch.patch b/security/hpn-ssh/files/batch.patch index 3dc8801..91391aa 100644 --- a/security/hpn-ssh/files/batch.patch +++ b/security/hpn-ssh/files/batch.patch @@ -1,5 +1,5 @@ --- Makefile.in.orig Mon Nov 12 00:34:23 2001 -+++ Makefile.in Sun Dec 2 07:45:09 2001 ++++ Makefile.in Sun Dec 2 08:01:27 2001 @@ -176,7 +176,7 @@ autoreconf (cd scard && $(MAKE) -f Makefile.in distprep) @@ -9,3 +9,41 @@ install-nokeys: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files scard-install: +@@ -213,37 +213,6 @@ + -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 + ln -s ssh.1 $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 + #@FILEPRIV@ -f dev,filesys,driver $(DESTDIR)$(bindir)/ssh $(DESTDIR)$(bindir)/slogin +- 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 ssh_prng_cmds -a ! -z "$(INSTALL_SSH_PRNG_CMDS)" ]; then \ +- $(PERL) $(srcdir)/fixprogs ssh_prng_cmds $(ENT); \ +- if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_prng_cmds ] ; then \ +- $(INSTALL) -m 644 ssh_prng_cmds.out $(DESTDIR)$(sysconfdir)/ssh_prng_cmds; \ +- else \ +- echo "$(DESTDIR)$(sysconfdir)/ssh_prng_cmds already exists, install will not overwrite"; \ +- fi ; \ +- 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 ; \ +- else \ +- echo "$(DESTDIR)$(sysconfdir)/moduli already exists, install will not overwrite"; \ +- fi + + host-key: ssh-keygen$(EXEEXT) + if [ -z "$(DESTDIR)" ] ; then \ diff --git a/security/openssh-portable/files/batch.patch b/security/openssh-portable/files/batch.patch index 3dc8801..91391aa 100644 --- a/security/openssh-portable/files/batch.patch +++ b/security/openssh-portable/files/batch.patch @@ -1,5 +1,5 @@ --- Makefile.in.orig Mon Nov 12 00:34:23 2001 -+++ Makefile.in Sun Dec 2 07:45:09 2001 ++++ Makefile.in Sun Dec 2 08:01:27 2001 @@ -176,7 +176,7 @@ autoreconf (cd scard && $(MAKE) -f Makefile.in distprep) @@ -9,3 +9,41 @@ install-nokeys: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files scard-install: +@@ -213,37 +213,6 @@ + -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 + ln -s ssh.1 $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 + #@FILEPRIV@ -f dev,filesys,driver $(DESTDIR)$(bindir)/ssh $(DESTDIR)$(bindir)/slogin +- 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 ssh_prng_cmds -a ! -z "$(INSTALL_SSH_PRNG_CMDS)" ]; then \ +- $(PERL) $(srcdir)/fixprogs ssh_prng_cmds $(ENT); \ +- if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_prng_cmds ] ; then \ +- $(INSTALL) -m 644 ssh_prng_cmds.out $(DESTDIR)$(sysconfdir)/ssh_prng_cmds; \ +- else \ +- echo "$(DESTDIR)$(sysconfdir)/ssh_prng_cmds already exists, install will not overwrite"; \ +- fi ; \ +- 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 ; \ +- else \ +- echo "$(DESTDIR)$(sysconfdir)/moduli already exists, install will not overwrite"; \ +- fi + + host-key: ssh-keygen$(EXEEXT) + if [ -z "$(DESTDIR)" ] ; then \ |
