equal
deleted
inserted
replaced
4 # Because this is Solaris-specific and not suitable for upstream, we will not |
4 # Because this is Solaris-specific and not suitable for upstream, we will not |
5 # contribute the changes to the upstream community. |
5 # contribute the changes to the upstream community. |
6 # |
6 # |
7 --- orig/Makefile.in Wed Apr 16 17:10:03 2014 |
7 --- orig/Makefile.in Wed Apr 16 17:10:03 2014 |
8 +++ new/Makefile.in Wed Apr 23 11:00:05 2014 |
8 +++ new/Makefile.in Wed Apr 23 11:00:05 2014 |
|
9 @@ -26,6 +26,7 @@ |
|
10 SFTP_SERVER=$(libexecdir)/sftp-server |
|
11 SSH_KEYSIGN=$(libexecdir)/ssh-keysign |
|
12 SSH_PKCS11_HELPER=$(libexecdir)/ssh-pkcs11-helper |
|
13 +ROOTDLIBDIR64=$(DESTDIR)/usr/lib/dtrace/64 |
|
14 PRIVSEP_PATH=@PRIVSEP_PATH@ |
|
15 SSH_PRIVSEP_USER=@SSH_PRIVSEP_USER@ |
|
16 STRIP_OPT=@STRIP_OPT@ |
9 @@ -76,7 +76,8 @@ |
17 @@ -76,7 +76,8 @@ |
10 jpake.o schnorr.o ssh-pkcs11.o krl.o smult_curve25519_ref.o \ |
18 jpake.o schnorr.o ssh-pkcs11.o krl.o smult_curve25519_ref.o \ |
11 kexc25519.o kexc25519c.o poly1305.o chacha.o cipher-chachapoly.o \ |
19 kexc25519.o kexc25519c.o poly1305.o chacha.o cipher-chachapoly.o \ |
12 ssh-ed25519.o digest.o \ |
20 ssh-ed25519.o digest.o \ |
13 - sc25519.o ge25519.o fe25519.o ed25519.o verify.o hash.o blocks.o |
21 - sc25519.o ge25519.o fe25519.o ed25519.o verify.o hash.o blocks.o |
54 - rm -f *.out core survey |
62 - rm -f *.out core survey |
55 + rm -f *.out core survey sftp_provider.h |
63 + rm -f *.out core survey sftp_provider.h |
56 (cd openbsd-compat && $(MAKE) clean) |
64 (cd openbsd-compat && $(MAKE) clean) |
57 |
65 |
58 distclean: regressclean |
66 distclean: regressclean |
|
67 @@ -313,6 +314,7 @@ |
|
68 ln -s ./ssh$(EXEEXT) $(DESTDIR)$(bindir)/slogin |
|
69 -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 |
|
70 ln -s ./ssh.1 $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 |
|
71 + mkdir -p $(ROOTDLIBDIR64) && cp $(srcdir)/sftp64.d $(ROOTDLIBDIR64)/sftp64.d |
|
72 |
|
73 install-sysconf: |
|
74 if [ ! -d $(DESTDIR)$(sysconfdir) ]; then \ |
59 --- orig/sftp-server.c Wed Apr 16 18:44:37 2014 |
75 --- orig/sftp-server.c Wed Apr 16 18:44:37 2014 |
60 +++ new/sftp-server.c Thu Apr 17 11:53:54 2014 |
76 +++ new/sftp-server.c Thu Apr 17 11:53:54 2014 |
61 @@ -51,6 +51,9 @@ |
77 @@ -51,6 +51,9 @@ |
62 |
78 |
63 #include "sftp.h" |
79 #include "sftp.h" |