package/isakmpd/patches/01-standardize.patch

   1 diff -urN isakmpd/GNUmakefile isakmpd.new/GNUmakefile
   2 --- isakmpd/GNUmakefile 2004-01-16 13:36:32.000000000 +0100
   3 +++ isakmpd.new/GNUmakefile     2006-09-03 17:33:03.000000000 +0200
   4 @@ -40,12 +40,12 @@
   5  # integrated, freebsd/netbsd means FreeBSD/NetBSD with KAME IPsec.
   6  # darwin means MacOS X 10.2 and later with KAME IPsec. linux means Linux-2.5
   7  # and later with native IPSec support.
   8 -OS=            openbsd
   9 +#OS=           openbsd
  10  #OS=           netbsd
  11  #OS=           freebsd
  12  #OS=           freeswan
  13  #OS=           darwin
  14 -#OS=           linux
  15 +OS=            linux
  16
  17  .CURDIR:=      $(shell pwd)
  18  VPATH=         ${.CURDIR}/sysdep/${OS}
  19 @@ -53,11 +53,11 @@
  20  PROG=          isakmpd
  21
  22  ifndef BINDIR
  23 -BINDIR=                /sbin
  24 -endif
  25 -ifndef LDSTATIC
  26 -LDSTATIC=      -static
  27 +BINDIR=                /usr/sbin
  28  endif
  29 +#ifndef LDSTATIC
  30 +#LDSTATIC=     -static
  31 +#endif
  32
  33  SRCS=          app.c attribute.c cert.c connection.c \
  34                 constants.c conf.c cookie.c crypto.c dh.c doi.c exchange.c \
  35 @@ -154,7 +154,7 @@
  36
  37  ifdef USE_KEYNOTE
  38  USE_LIBCRYPTO= yes
  39 -LDADD+=                -lkeynote -lm
  40 +LDADD+=                -L${LIBKEYNOTEDIR} -lkeynote -lm
  41  DPADD+=                ${LIBKEYNOTE} ${LIBM}
  42  POLICY=                policy.c
  43  CFLAGS+=       -DUSE_KEYNOTE
  44 @@ -238,3 +238,16 @@
  45
  46  realcleandepend:
  47         rm -f .depend tags
  48 +
  49 +# Install rules
  50 +install: install-bin install-man
  51 +
  52 +install-bin: isakmpd
  53 +       -mkdir -p $(DESTDIR)$(BINDIR)
  54 +       $(INSTALL) $(INSTALL_OPTS) -m 755 isakmpd $(DESTDIR)$(BINDIR)
  55 +
  56 +install-man:
  57 +       -mkdir -p $(DESTDIR)$(MANDIR)/man8
  58 +       $(INSTALL) $(INSTALL_OPTS) -m 444 isakmpd.8 $(DESTDIR)$(MANDIR)/man8
  59 +       -mkdir -p $(DESTDIR)$(MANDIR)/man5
  60 +       $(INSTALL) $(INSTALL_OPTS) -m 444 isakmpd.conf.5 isakmpd.policy.5 $(DESTDIR)$(MANDIR)/man5
  61 diff -urN isakmpd/samples/Makefile isakmpd.new/samples/Makefile
  62 --- isakmpd/samples/Makefile    2003-06-03 16:39:50.000000000 +0200
  63 +++ isakmpd.new/samples/Makefile        2006-09-03 17:07:24.000000000 +0200
  64 @@ -26,7 +26,7 @@
  65  #
  66
  67  FILES=         VPN-* policy singlehost-*
  68 -TARGETDIR=     /usr/share/ipsec/isakmpd
  69 +TARGETDIR=     /usr/share/isakmpd/samples
  70
  71  # The mkdir below is for installation on OpenBSD pre 2.7
  72  install:
  73 diff -urN isakmpd/sysdep/linux/GNUmakefile.sysdep isakmpd.new/sysdep/linux/GNUmakefile.sysdep
  74 --- isakmpd/sysdep/linux/GNUmakefile.sysdep     2004-01-16 13:36:42.000000000 +0100
  75 +++ isakmpd.new/sysdep/linux/GNUmakefile.sysdep 2006-09-03 17:16:48.000000000 +0200
  76 @@ -25,18 +25,20 @@
  77  # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  78  #
  79
  80 -LIBGMP:=       /usr/lib/libgmp.a
  81 -LIBCRYPTO:=    /usr/lib/libcrypto.a
  82 +LIBGMP:=       -lgmp
  83 +LIBCRYPTO:=    -lcrypto
  84  LIBSYSDEPDIR:= ${.CURDIR}/sysdep/common/libsysdep
  85  LIBSYSDEP:=    ${LIBSYSDEPDIR}/libsysdep.a
  86
  87 -LDADD+=                -lgmp ${LIBSYSDEP} ${LIBCRYPTO}
  88 +LIBKEYNOTEDIR:=        $(STAGING_DIR)/usr/include
  89 +
  90 +LDADD+=                -L$(STAGING_DIR)/usr/lib ${LIBGMP} ${LIBSYSDEP} ${LIBCRYPTO}
  91 -DPADD+=                ${LIBGMP} ${LIBSYSDEP}
  92 +DPADD+=                ${LIBSYSDEP}
  93
  94  CFLAGS+=       -DHAVE_GETNAMEINFO -DUSE_OLD_SOCKADDR -DHAVE_PCAP \
  95                 -DNEED_SYSDEP_APP -DMP_FLAVOUR=MP_FLAVOUR_GMP \
  96 -               -I/usr/src/linux/include -I${.CURDIR}/sysdep/common \
  97 -               -I/usr/include/openssl
  98 +               -I$(LINUX_DIR)/include -I${.CURDIR}/sysdep/common \
  99 +               -I$(STAGING_DIR)/usr/include/openssl -I${LIBKEYNOTEDIR}
 100
 101  FEATURES=      debug tripledes blowfish cast ec aggressive x509 policy
 102
 103 @@ -50,7 +52,7 @@
 104  # hack libsysdep.a dependenc
 105  ${LIBSYSDEPDIR}/.depend ${LIBSYSDEP}:
 106         cd ${LIBSYSDEPDIR} && \
 107 -               ${MAKE} --no-print-directory ${MAKEFLAGS} \
 108 +               ${MAKE} --no-print-directory \
 109                         CFLAGS="${CFLAGS}" MKDEP="${MKDEP}" ${MAKECMDGOALS}
 110
 111  ifeq ($(findstring clean,$(MAKECMDGOALS)),clean)
 112 diff -urN isakmpd/x509.c isakmpd.new/x509.c
 113 --- isakmpd/x509.c      2004-01-06 01:09:19.000000000 +0100
 114 +++ isakmpd.new/x509.c  2006-09-03 17:07:24.000000000 +0200
 115 @@ -969,14 +969,14 @@
 116     * trust.
 117     */
 118    X509_STORE_CTX_init (&csc, x509_cas, cert, NULL);
 119 -#if OPENSSL_VERSION_NUMBER >= 0x00907000L
 120 -  /* XXX See comment in x509_read_crls_from_dir.  */
 121 -  if (x509_cas->flags & X509_V_FLAG_CRL_CHECK)
 122 +//#if OPENSSL_VERSION_NUMBER >= 0x00907000L
 123 +    /* XXX See comment in x509_read_crls_from_dir.  */
 124 +   /*if (x509_cas->flags & X509_V_FLAG_CRL_CHECK)
 125      {
 126        X509_STORE_CTX_set_flags (&csc, X509_V_FLAG_CRL_CHECK);
 127        X509_STORE_CTX_set_flags (&csc, X509_V_FLAG_CRL_CHECK_ALL);
 128      }
 129 -#endif
 130 +#endif */
 131    res = X509_verify_cert (&csc);
 132    err = csc.error;
 133    X509_STORE_CTX_cleanup (&csc);