package/isakmpd/patches/020-standardize.patch

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