diff options
| author | Dirk Meyer <dinoex@FreeBSD.org> | 2003-09-28 03:07:19 +0000 |
|---|---|---|
| committer | Dirk Meyer <dinoex@FreeBSD.org> | 2003-09-28 03:07:19 +0000 |
| commit | 537a93ab729e3738122e96cccad7e5dc452a07a9 (patch) | |
| tree | aef1ba6e6f97e1c778e7bf51dcf20b3cef9ca82e /security | |
| parent | iUpdate port: print/ghostscript-afpl (diff) | |
- Fix BATCH=yes patch for bento.
Notes
Notes:
svn path=/head/; revision=89600
Diffstat (limited to 'security')
| -rw-r--r-- | security/hpn-ssh/files/batch.patch | 37 | ||||
| -rw-r--r-- | security/openssh-portable/files/batch.patch | 37 |
2 files changed, 12 insertions, 62 deletions
diff --git a/security/hpn-ssh/files/batch.patch b/security/hpn-ssh/files/batch.patch index 1e99a5d92180..6d5f60af0470 100644 --- a/security/hpn-ssh/files/batch.patch +++ b/security/hpn-ssh/files/batch.patch @@ -1,36 +1,11 @@ ---- Makefile.in.orig Sun Jul 14 19:02:21 2002 -+++ Makefile.in Sat Oct 26 05:49:23 2002 -@@ -198,7 +198,7 @@ +--- Makefile.in.orig Mon Sep 22 03:00:12 2003 ++++ Makefile.in Sun Sep 28 05:02:19 2003 +@@ -224,7 +224,7 @@ $(AUTORECONF) (cd scard && $(MAKE) -f Makefile.in distprep) --install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files host-key check-config -+install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files check-config - install-nokeys: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files +-install: $(CONFIGFILES) ssh_prng_cmds.out $(MANPAGES) $(TARGETS) install-files host-key check-config ++install: $(CONFIGFILES) ssh_prng_cmds.out $(MANPAGES) $(TARGETS) install-files check-config + install-nokeys: $(CONFIGFILES) ssh_prng_cmds.out $(MANPAGES) $(TARGETS) install-files check-config: -@@ -251,24 +251,6 @@ - ln -s ./ssh.1 $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 - 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 \ diff --git a/security/openssh-portable/files/batch.patch b/security/openssh-portable/files/batch.patch index 1e99a5d92180..6d5f60af0470 100644 --- a/security/openssh-portable/files/batch.patch +++ b/security/openssh-portable/files/batch.patch @@ -1,36 +1,11 @@ ---- Makefile.in.orig Sun Jul 14 19:02:21 2002 -+++ Makefile.in Sat Oct 26 05:49:23 2002 -@@ -198,7 +198,7 @@ +--- Makefile.in.orig Mon Sep 22 03:00:12 2003 ++++ Makefile.in Sun Sep 28 05:02:19 2003 +@@ -224,7 +224,7 @@ $(AUTORECONF) (cd scard && $(MAKE) -f Makefile.in distprep) --install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files host-key check-config -+install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files check-config - install-nokeys: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files +-install: $(CONFIGFILES) ssh_prng_cmds.out $(MANPAGES) $(TARGETS) install-files host-key check-config ++install: $(CONFIGFILES) ssh_prng_cmds.out $(MANPAGES) $(TARGETS) install-files check-config + install-nokeys: $(CONFIGFILES) ssh_prng_cmds.out $(MANPAGES) $(TARGETS) install-files check-config: -@@ -251,24 +251,6 @@ - ln -s ./ssh.1 $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 - 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 \ |