| @@ -1,57 +1,88 @@ | | | @@ -1,57 +1,88 @@ |
1 | $NetBSD: patch-aa,v 1.9 2011/08/25 14:54:06 hans Exp $ | | 1 | $NetBSD: patch-aa,v 1.10 2011/12/06 01:19:16 sbd Exp $ |
2 | | | 2 | |
3 | --- makefile.orig 2011-08-21 17:12:07.000000000 +0200 | | 3 | * Get K5LIB, K5INC, SSLLIB and SSLINC from pkgsrc. |
4 | +++ makefile 2011-08-25 16:36:42.000000000 +0200 | | 4 | * s/-lgssapi/-lgssapi_krb5/ on netbsd+krb5* |
| | | 5 | * Add $(LIBS) to link command on solaris2xg+openssl+zlib+pam+shadow |
| | | 6 | * s@$(K5INC)/krb5@$(K5INC)/kerberosv5/ on solaris9g+krb5+ssl |
| | | 7 | * On linux get HAVE_LIBCURSES and HAVE_CURSES from pkgsrc (with the |
| | | 8 | curses include and library pathes coming from BUILDLINK_*FLAGS). |
| | | 9 | |
| | | 10 | |
| | | 11 | --- makefile.orig 2011-08-21 15:12:07.000000000 +0000 |
| | | 12 | +++ makefile |
5 | @@ -824,12 +824,12 @@ manroot = $(prefix) | | 13 | @@ -824,12 +824,12 @@ manroot = $(prefix) |
6 | | | 14 | |
7 | K4LIB=-L/usr/kerberos/lib | | 15 | K4LIB=-L/usr/kerberos/lib |
8 | K4INC=-I/usr/kerberos/include | | 16 | K4INC=-I/usr/kerberos/include |
9 | -K5LIB=-L/usr/kerberos/lib | | 17 | -K5LIB=-L/usr/kerberos/lib |
10 | -K5INC=-I/usr/kerberos/include | | 18 | -K5INC=-I/usr/kerberos/include |
11 | +#K5LIB=-L/usr/kerberos/lib | | 19 | +#K5LIB=-L/usr/kerberos/lib |
12 | +#K5INC=-I/usr/kerberos/include | | 20 | +#K5INC=-I/usr/kerberos/include |
13 | SRPLIB=-L$(srproot)/lib | | 21 | SRPLIB=-L$(srproot)/lib |
14 | SRPINC=-I$(srproot)/include | | 22 | SRPINC=-I$(srproot)/include |
15 | -SSLLIB=-L$(sslroot)/ssl/lib | | 23 | -SSLLIB=-L$(sslroot)/ssl/lib |
16 | -SSLINC=-I$(sslroot)/ssl/include | | 24 | -SSLINC=-I$(sslroot)/ssl/include |
17 | +#SSLLIB=-L$(sslroot)/ssl/lib | | 25 | +#SSLLIB=-L$(sslroot)/ssl/lib |
18 | +#SSLINC=-I$(sslroot)/ssl/include | | 26 | +#SSLINC=-I$(sslroot)/ssl/include |
19 | | | 27 | |
20 | # To override these assignments; for example, if your OpenSSL files are | | 28 | # To override these assignments; for example, if your OpenSSL files are |
21 | # not in /usr/local/ssl, invoke the desired target like this: | | 29 | # not in /usr/local/ssl, invoke the desired target like this: |
22 | @@ -1869,7 +1869,7 @@ netbsd+krb5: | | 30 | @@ -1869,7 +1869,7 @@ netbsd+krb5: |
23 | -DCK_CAST $$HAVE_DES -DNOFTP_GSSAPI $(K5INC) $(K5INC)/krb5 \ | | 31 | -DCK_CAST $$HAVE_DES -DNOFTP_GSSAPI $(K5INC) $(K5INC)/krb5 \ |
24 | $(KFLAGS)" \ | | 32 | $(KFLAGS)" \ |
25 | "LIBS= $(K5LIB) -L/usr/pkg/lib -R/usr/pkg/lib -lcurses $$DES_LIB \ | | 33 | "LIBS= $(K5LIB) -L/usr/pkg/lib -R/usr/pkg/lib -lcurses $$DES_LIB \ |
26 | - -lcrypto -lgssapi -lkrb5 -lm -lutil $(LIBS)" | | 34 | - -lcrypto -lgssapi -lkrb5 -lm -lutil $(LIBS)" |
27 | + -lcrypto -lgssapi_krb5 -lkrb5 -lm -lutil $(LIBS)" | | 35 | + -lcrypto -lgssapi_krb5 -lkrb5 -lm -lutil $(LIBS)" |
28 | | | 36 | |
29 | # NetBSD - With Kerberos 5 and SSL and Zlib. | | 37 | # NetBSD - With Kerberos 5 and SSL and Zlib. |
30 | # OK: 2011/08/21 on 5.1 with MIT Kerberos. | | 38 | # OK: 2011/08/21 on 5.1 with MIT Kerberos. |
31 | @@ -1896,7 +1896,7 @@ netbsd+krb5+ssl netbsd+krb5+openssl+zlib | | 39 | @@ -1896,7 +1896,7 @@ netbsd+krb5+ssl netbsd+krb5+openssl+zlib |
32 | -DCK_SSL -DCK_PAM -DZLIB -DNO_DCL_INET_ATON $$OPENSSLOPTION \ | | 40 | -DCK_SSL -DCK_PAM -DZLIB -DNO_DCL_INET_ATON $$OPENSSLOPTION \ |
33 | $(KFLAGS)" "LNKFLAGS = $(LNKFLAGS)" \ | | 41 | $(KFLAGS)" "LNKFLAGS = $(LNKFLAGS)" \ |
34 | "LIBS= $(K5LIB) -L/usr/pkg/lib -R/usr/pkg/lib -lssl $$DES_LIB \ | | 42 | "LIBS= $(K5LIB) -L/usr/pkg/lib -R/usr/pkg/lib -lssl $$DES_LIB \ |
35 | - -lcrypto -lcrypt -lgssapi -lkrb5 -lz -lm -lpam -lutil -lcurses $(LIBS)" | | 43 | - -lcrypto -lcrypt -lgssapi -lkrb5 -lz -lm -lpam -lutil -lcurses $(LIBS)" |
36 | + -lcrypto -lcrypt -lgssapi_krb5 -lkrb5 -lz -lm -lpam -lutil -lcurses $(LIBS)" | | 44 | + -lcrypto -lcrypt -lgssapi_krb5 -lkrb5 -lz -lm -lpam -lutil -lcurses $(LIBS)" |
37 | | | 45 | |
38 | #Special Security Enhanced NetBSD target with SRP, SSL, and zlib support. | | 46 | #Special Security Enhanced NetBSD target with SRP, SSL, and zlib support. |
39 | #To build this, you need to BUILD the pkgsrc srp_client package. After | | 47 | #To build this, you need to BUILD the pkgsrc srp_client package. After |
40 | @@ -3544,7 +3544,7 @@ solaris2xg+openssl+zlib+pam+shadow: | | 48 | @@ -3544,7 +3544,7 @@ solaris2xg+openssl+zlib+pam+shadow: |
41 | -DCK_AUTHENTICATION -DCK_SSL -DCK_PAM -DCK_SHADOW -DZLIB \ | | 49 | -DCK_AUTHENTICATION -DCK_SSL -DCK_PAM -DCK_SHADOW -DZLIB \ |
42 | -DBIGBUFOK $(SSLINC) $(KFLAGS)" \ | | 50 | -DBIGBUFOK $(SSLINC) $(KFLAGS)" \ |
43 | "LIBS= $(SSLLIB) -ltermlib \ | | 51 | "LIBS= $(SSLLIB) -ltermlib \ |
44 | - -lsocket -lnsl -lm -lresolv -lssl -lcrypto -lpam -lz" | | 52 | - -lsocket -lnsl -lm -lresolv -lssl -lcrypto -lpam -lz" |
45 | + -lsocket -lnsl -lm -lresolv -lssl -lcrypto -lpam -lz $(LIBS)" | | 53 | + -lsocket -lnsl -lm -lresolv -lssl -lcrypto -lpam -lz $(LIBS)" |
46 | | | 54 | |
47 | #Ditto but with GCC 3.1 in which you have to specify 32-bit with -m32. | | 55 | #Ditto but with GCC 3.1 in which you have to specify 32-bit with -m32. |
48 | #In Solaris 9 (and maybe 8) you'll also need specifiy the Library path. | | 56 | #In Solaris 9 (and maybe 8) you'll also need specifiy the Library path. |
49 | @@ -3899,7 +3899,7 @@ solaris9g+krb5+ssl solaris10g+krb5+ssl s | | 57 | @@ -3899,7 +3899,7 @@ solaris9g+krb5+ssl solaris10g+krb5+ssl s |
50 | -DCK_CURSES -DCK_NEWTERM -DDIRENT -DHDBUUCP -DTCPSOCKET -DBIGBUFOK \ | | 58 | -DCK_CURSES -DCK_NEWTERM -DDIRENT -DHDBUUCP -DTCPSOCKET -DBIGBUFOK \ |
51 | -DCK_AUTHENTICATION -DCK_SSL -DZLIB -DCK_KERBEROS -DKRB5 \ | | 59 | -DCK_AUTHENTICATION -DCK_SSL -DZLIB -DCK_KERBEROS -DKRB5 \ |
52 | -DCK_ENCRYPTION -DCK_CAST $$OPENSSLOPTION \ | | 60 | -DCK_ENCRYPTION -DCK_CAST $$OPENSSLOPTION \ |
53 | - $$HAVE_DES $(SSLINC) $(K5INC) $(K5INC)/krb5 $(KFLAGS)" \ | | 61 | - $$HAVE_DES $(SSLINC) $(K5INC) $(K5INC)/krb5 $(KFLAGS)" \ |
54 | + $$HAVE_DES $(SSLINC) $(K5INC) $(K5INC)/kerberosv5 $(KFLAGS)" \ | | 62 | + $$HAVE_DES $(SSLINC) $(K5INC) $(K5INC)/kerberosv5 $(KFLAGS)" \ |
55 | "LIBS= $(SSLLIB) $(K5LIB) -lz -lssl -ltermlib -lsocket -lnsl -lm \ | | 63 | "LIBS= $(SSLLIB) $(K5LIB) -lz -lssl -ltermlib -lsocket -lnsl -lm \ |
56 | -lresolv -lcrypto \ | | 64 | -lresolv -lcrypto \ |
57 | $$GSSAPILIB -lkrb5 -lcom_err -lk5crypto $$DES_LIB $(LIBS)" | | 65 | $$GSSAPILIB -lkrb5 -lcom_err -lk5crypto $$DES_LIB $(LIBS)" |
| | | 66 | @@ -6095,22 +6095,6 @@ linux: |
| | | 67 | if test `grep openpty /usr/include/pty.h | wc -l` -gt 0; \ |
| | | 68 | then HAVE_OPENPTY='-DHAVE_OPENPTY'; \ |
| | | 69 | else HAVE_OPENPTY=''; fi ; \ |
| | | 70 | - HAVE_LIBCURSES=''; \ |
| | | 71 | - if test -f /usr/lib64/libncurses.so || \ |
| | | 72 | - test -f /usr/lib/libncurses.a || \ |
| | | 73 | - test -f /usr/lib/libncurses.so; then \ |
| | | 74 | - HAVE_LIBCURSES='-lncurses'; \ |
| | | 75 | - else if test -f /usr/lib64/libcurses.so || \ |
| | | 76 | - test -f /usr/lib/libcurses.a || \ |
| | | 77 | - test -f /usr/lib/libcurses.so; then \ |
| | | 78 | - HAVE_LIBCURSES='-lcurses'; fi; fi; \ |
| | | 79 | - HAVE_CURSES=''; \ |
| | | 80 | - if test -n '$$HAVE_LIBCURSES'; then \ |
| | | 81 | - if test -f /usr/include/ncurses.h; then \ |
| | | 82 | - HAVE_CURSES='-DCK_NCURSES -I/usr/include/ncurses'; \ |
| | | 83 | - else if test -f /usr/include/curses.h; then \ |
| | | 84 | - HAVE_CURSES='-DCK_CURSES'; \ |
| | | 85 | - fi; fi; fi; \ |
| | | 86 | if test -f /usr/include/baudboy.h || test -f /usr/include/ttylock.h; \ |
| | | 87 | then HAVE_LOCKDEV='-DHAVE_LOCKDEV' ; \ |
| | | 88 | else HAVE_LOCKDEV='' ; fi ; \ |