aboutsummaryrefslogtreecommitdiffstats
path: root/package/isakmpd/patches/020-standardize.patch
blob: 435782b6376c3d47036f6281128d71e2ba402826 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
Index: isakmpd-20041012.orig/GNUmakefile
===================================================================
--- isakmpd-20041012.orig.orig/GNUmakefile	2007-06-04 13:22:39.283883224 +0200
+++ isakmpd-20041012.orig/GNUmakefile	2007-06-04 13:22:39.722816496 +0200
@@ -168,7 +168,6 @@
 X509=		x509.c
 CFLAGS+=	-DUSE_LIBCRYPTO
 LDADD+=		-lcrypto
-DPADD+=		${LIBCRYPTO}
 endif
 
 ifdef USE_RAWKEY
@@ -242,3 +241,16 @@
 
 realcleandepend:
 	rm -f .depend tags
+
+# Install rules
+install: install-bin install-man
+
+install-bin: isakmpd
+	-mkdir -p $(DESTDIR)$(BINDIR)
+	$(INSTALL) $(INSTALL_OPTS) -m 755 isakmpd $(DESTDIR)$(BINDIR)
+
+install-man:
+	-mkdir -p $(DESTDIR)$(MANDIR)/man8
+	$(INSTALL) $(INSTALL_OPTS) -m 444 isakmpd.8 $(DESTDIR)$(MANDIR)/man8
+	-mkdir -p $(DESTDIR)$(MANDIR)/man5
+	$(INSTALL) $(INSTALL_OPTS) -m 444 isakmpd.conf.5 isakmpd.policy.5 $(DESTDIR)$(MANDIR)/man5
Index: isakmpd-20041012.orig/samples/Makefile
===================================================================
--- isakmpd-20041012.orig.orig/samples/Makefile	2007-06-04 13:22:39.015923960 +0200
+++ isakmpd-20041012.orig/samples/Makefile	2007-06-04 13:22:39.722816496 +0200
@@ -26,7 +26,7 @@
 #
 
 FILES=		VPN-* policy singlehost-*
-TARGETDIR=	/usr/share/ipsec/isakmpd
+TARGETDIR=	/usr/share/isakmpd/samples
 
 # The mkdir below is for installation on OpenBSD pre 2.7
 install:
Index: isakmpd-20041012.orig/sysdep/linux/GNUmakefile.sysdep
===================================================================
--- isakmpd-20041012.orig.orig/sysdep/linux/GNUmakefile.sysdep	2007-06-04 13:22:39.291882008 +0200
+++ isakmpd-20041012.orig/sysdep/linux/GNUmakefile.sysdep	2007-06-04 13:22:39.722816496 +0200
@@ -25,18 +25,18 @@
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-LIBGMP:=	/usr/lib/libgmp.a
-LIBCRYPTO:=	/usr/lib/libcrypto.a
+LIBGMP:=
+LIBCRYPTO:=	-lcrypto
 LIBSYSDEPDIR:=	${.CURDIR}/sysdep/common/libsysdep
 LIBSYSDEP:=	${LIBSYSDEPDIR}/libsysdep.a
 
-LDADD+=		-lgmp ${LIBSYSDEP} ${LIBCRYPTO}
+LDADD+=		$(EXTRA_LDFLAGS) -lgmp ${LIBSYSDEP} ${LIBCRYPTO}
 DPADD+=		${LIBGMP} ${LIBSYSDEP}
 
 CFLAGS+=	-DHAVE_GETNAMEINFO -DUSE_OLD_SOCKADDR -DHAVE_PCAP \
 		-DNEED_SYSDEP_APP -DMP_FLAVOUR=MP_FLAVOUR_GMP -DUSE_AES \
 		-I${.CURDIR}/sysdep/linux/include -I${.CURDIR}/sysdep/common \
-		-I/usr/include/openssl
+		$(EXTRA_CPPFLAGS)
 
 FEATURES=	debug tripledes blowfish cast ec aggressive x509 policy
 FEATURES+=	dpd nat_traversal isakmp_cfg des aes
Index: isakmpd-20041012.orig/Makefile
===================================================================
--- isakmpd-20041012.orig.orig/Makefile	2007-06-04 13:22:39.028921984 +0200
+++ isakmpd-20041012.orig/Makefile	2007-06-04 13:22:39.723816344 +0200
@@ -147,7 +147,6 @@
 .ifdef USE_LIBCRYPTO
 CFLAGS+=	-DUSE_LIBCRYPTO
 LDADD+=		-lcrypto
-DPADD+=		${LIBCRYPTO}
 .endif
 
 .ifdef USE_LIBDES
Index: isakmpd-20041012.orig/apps/certpatch/Makefile
===================================================================
--- isakmpd-20041012.orig.orig/apps/certpatch/Makefile	2007-06-04 13:22:39.035920920 +0200
+++ isakmpd-20041012.orig/apps/certpatch/Makefile	2007-06-04 13:22:39.723816344 +0200
@@ -40,7 +40,6 @@
 .PATH:		${TOPSRC} ${TOPSRC}/sysdep/${OS} ${TOPOBJ}
 CFLAGS+=	-I${TOPSRC} -I${TOPSRC}/sysdep/${OS} -I${TOPOBJ} -Wall
 LDADD+=		-lcrypto
-DPADD+=		${LIBCRYPTO}
 MAN=		certpatch.8
 
 .if ${FEATURES:Mgmp} == "gmp"
Index: isakmpd-20041012.orig/regress/crypto/Makefile
===================================================================
--- isakmpd-20041012.orig.orig/regress/crypto/Makefile	2007-06-04 13:22:39.041920008 +0200
+++ isakmpd-20041012.orig/regress/crypto/Makefile	2007-06-04 13:22:39.723816344 +0200
@@ -13,7 +13,7 @@
 		-DUSE_TRIPLEDES -DUSE_CAST -DUSE_BLOWFISH -DUSE_DES \
 		-DUSE_AES
 LDADD+=		-lcrypto -ldes
-DPADD+=		${LIBCRYPTO} ${LIBDES}
+DPADD+=		${LIBDES}
 NOMAN=
 DEBUG=		-g
 
Index: isakmpd-20041012.orig/regress/dh/Makefile
===================================================================
--- isakmpd-20041012.orig.orig/regress/dh/Makefile	2007-06-04 13:22:39.048918944 +0200
+++ isakmpd-20041012.orig/regress/dh/Makefile	2007-06-04 13:22:39.726815888 +0200
@@ -15,7 +15,6 @@
 		-DUSE_EC
 NOMAN=
 LDADD+=		-lcrypto
-DPADD+=		${LIBCRYPTO}
 DEBUG=		-g
 
 .if ${FEATURES:Mgmp} == "gmp"
Index: isakmpd-20041012.orig/regress/group/Makefile
===================================================================
--- isakmpd-20041012.orig.orig/regress/group/Makefile	2007-06-04 13:22:39.054918032 +0200
+++ isakmpd-20041012.orig/regress/group/Makefile	2007-06-04 13:22:39.727815736 +0200
@@ -15,7 +15,6 @@
 		-DUSE_EC
 NOMAN=
 LDADD+=		-lcrypto
-DPADD+=		${LIBCRYPTO}
 DEBUG=		-g
 
 .if ${FEATURES:Mgmp} == "gmp"
Index: isakmpd-20041012.orig/regress/rsakeygen/Makefile
===================================================================
--- isakmpd-20041012.orig.orig/regress/rsakeygen/Makefile	2007-06-04 13:22:39.060917120 +0200
+++ isakmpd-20041012.orig/regress/rsakeygen/Makefile	2007-06-04 13:22:39.727815736 +0200
@@ -62,7 +62,6 @@
 .ifdef USE_LIBCRYPTO
 CFLAGS+=	-DUSE_LIBCRYPTO
 LDADD+=		-lcrypto
-DPADD+=		${LIBCRYPTO}
 .endif
 
 .if !defined (HAVE_DLOPEN) && !defined (USE_LIBCRYPTO)
Index: isakmpd-20041012.orig/regress/x509/Makefile
===================================================================
--- isakmpd-20041012.orig.orig/regress/x509/Makefile	2007-06-04 13:22:39.068915904 +0200
+++ isakmpd-20041012.orig/regress/x509/Makefile	2007-06-04 13:22:39.727815736 +0200
@@ -78,7 +78,6 @@
 X509=		x509.c
 CFLAGS+=	-DUSE_LIBCRYPTO
 LDADD+=		-lcrypto ${LIBLWRES}
-DPADD+=		${LIBCRYPTO}
 .endif
 
 .if !defined (HAVE_DLOPEN) && !defined (USE_LIBCRYPTO) || !defined (USE_KEYNOTE)