pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/security/racoon2 switch to using github as upstream, a...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/6c7607380e07
branches:  trunk
changeset: 309958:6c7607380e07
user:      christos <christos%pkgsrc.org@localhost>
date:      Sun Jul 01 15:47:17 2018 +0000

description:
switch to using github as upstream, and enable nat-t
(all patches have been included in the github version)

diffstat:

 security/racoon2/Makefile                              |   18 +-
 security/racoon2/distinfo                              |   40 +-
 security/racoon2/patches/patch-aa                      |   16 -
 security/racoon2/patches/patch-ab                      |   22 -
 security/racoon2/patches/patch-ac                      |   21 -
 security/racoon2/patches/patch-ad                      |   25 -
 security/racoon2/patches/patch-ae                      |   23 -
 security/racoon2/patches/patch-iked_crypto__impl.h     |   15 -
 security/racoon2/patches/patch-iked_crypto__openssl.c  |  714 -----------------
 security/racoon2/patches/patch-iked_ike__conf.c        |   36 -
 security/racoon2/patches/patch-iked_ikev1_ikev1.c      |   24 -
 security/racoon2/patches/patch-iked_ikev1_ipsec__doi.c |   48 -
 security/racoon2/patches/patch-iked_ikev1_oakley.c     |   91 --
 security/racoon2/patches/patch-iked_ikev1_pfkey.c      |   71 -
 security/racoon2/patches/patch-iked_ikev2.c            |   78 -
 security/racoon2/patches/patch-iked_ikev2__child.c     |   26 -
 security/racoon2/patches/patch-iked_ikev2__notify.c    |   24 -
 security/racoon2/patches/patch-kinkd-crypto__openssl.c |  117 --
 security/racoon2/patches/patch-kinkd-ipsec__doi.c      |   34 -
 security/racoon2/patches/patch-kinkd_bbkk__heimdal.c   |  310 -------
 security/racoon2/patches/patch-kinkd_isakmp__quick.c   |   61 -
 security/racoon2/patches/patch-kinkd_session.c         |   15 -
 security/racoon2/patches/patch-lib_cfparse.y           |   15 -
 security/racoon2/patches/patch-lib_cfsetup.c           |   23 -
 security/racoon2/patches/patch-lib_cftoken.l           |   24 -
 security/racoon2/patches/patch-lib_if__pfkeyv2.c       |   26 -
 security/racoon2/patches/patch-lib_if__spmd.c          |   68 -
 security/racoon2/patches/patch-spmd_fqdn__query.c      |   29 -
 security/racoon2/patches/patch-spmd_main.c             |   21 -
 security/racoon2/patches/patch-spmd_shell.c            |   61 -
 security/racoon2/patches/patch-spmd_spmd__pfkey.c      |   22 -
 security/racoon2/patches/patch-spmd_spmdctl.c          |  366 --------
 32 files changed, 17 insertions(+), 2467 deletions(-)

diffs (truncated from 2626 to 300 lines):

diff -r bc9692c44bdb -r 6c7607380e07 security/racoon2/Makefile
--- a/security/racoon2/Makefile Sun Jul 01 09:38:30 2018 +0000
+++ b/security/racoon2/Makefile Sun Jul 01 15:47:17 2018 +0000
@@ -1,11 +1,17 @@
-# $NetBSD: Makefile,v 1.12 2018/05/29 01:22:50 christos Exp $
+# $NetBSD: Makefile,v 1.13 2018/07/01 15:47:17 christos Exp $
 #
 
-DISTNAME=              racoon2-20100526a
-PKGREVISION=           10
 CATEGORIES=            security net
-MASTER_SITES=          ftp://ftp.racoon2.wide.ad.jp/pub/racoon2/
-EXTRACT_SUFX=          .tgz
+#DISTNAME=             racoon2-20100526a
+#PKGREVISION=          10
+#MASTER_SITES=         ftp://ftp.racoon2.wide.ad.jp/pub/racoon2/
+#EXTRACT_SUFX=         .tgz
+
+DISTNAME=              racoon2
+PKGNAME=               racoon2-20180701
+MASTER_SITES=          ${MASTER_SITE_GITHUB:=zoulasc/}
+GITHUB_PROJECT=                racoon2
+GITHUB_TAG=            b2a193fc9875d1fb89c0a51690745379bc135fcf
 
 MAINTAINER=            kamada%nanohz.org@localhost
 HOMEPAGE=              http://www.racoon2.wide.ad.jp/
@@ -55,7 +61,7 @@
                                ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 600
 CONF_FILES_PERMS+=     ${EGDIR}/vals.conf ${PKG_SYSCONFDIR}/vals.conf \
                                ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 600
-CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR} --enable-natt
 
 MAKE_DIRS_PERMS+=      ${VARBASE}/run/racoon2 ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0700
 
diff -r bc9692c44bdb -r 6c7607380e07 security/racoon2/distinfo
--- a/security/racoon2/distinfo Sun Jul 01 09:38:30 2018 +0000
+++ b/security/racoon2/distinfo Sun Jul 01 15:47:17 2018 +0000
@@ -1,36 +1,6 @@
-$NetBSD: distinfo,v 1.6 2018/05/29 01:22:50 christos Exp $
+$NetBSD: distinfo,v 1.7 2018/07/01 15:47:17 christos Exp $
 
-SHA1 (racoon2-20100526a.tgz) = 268429af8a031dbbc279580cf98ea18331f0e2d9
-RMD160 (racoon2-20100526a.tgz) = 014cdcf78cc82ab21235a21491850cdcd1f883bf
-SHA512 (racoon2-20100526a.tgz) = 0a75fe0338c5747e3ecd7d68e28adc6d4a66ad2d33210d3d027de72bad6712068a92506caaaf8f6c6f81b204db9be2a1779cb3b1bb8bd75445210cfa746eb88a
-Size (racoon2-20100526a.tgz) = 1017077 bytes
-SHA1 (patch-aa) = e3bc810f72dac266bec992f0430572b00768cc22
-SHA1 (patch-ab) = eb6d901108ebcca90571851817137b4b3f3c594b
-SHA1 (patch-ac) = 081a2d3d694d4c20cf1fa2d9718577577280288e
-SHA1 (patch-ad) = 0d04dc7027c100de6bc04db00eddb30a12fd8715
-SHA1 (patch-ae) = 937cf84a2b6f1e8f8d288703a0556faf500bab95
-SHA1 (patch-iked_crypto__impl.h) = e6b274258eb7428cbd01cefc33ae85e001260542
-SHA1 (patch-iked_crypto__openssl.c) = 0a013e5aa5ce9747da61b8095440a16ee78de4e9
-SHA1 (patch-iked_ike__conf.c) = 82e09465e69b082abb12b3fead16eae8a7bc103b
-SHA1 (patch-iked_ikev1_ikev1.c) = ce9b22b2be12bc4cd5fa0e171cbd39c0d88d5406
-SHA1 (patch-iked_ikev1_ipsec__doi.c) = 3673d0643359eb8a68bbd867e941e1a1aae02b01
-SHA1 (patch-iked_ikev1_oakley.c) = 8823a898ec8190d177d3eda8d6c474040b08d2a1
-SHA1 (patch-iked_ikev1_pfkey.c) = 064df06b876504b611008a8a20b44266a83c5789
-SHA1 (patch-iked_ikev2.c) = 857805c92e3c78ec5f05a9068acbba03e91030b3
-SHA1 (patch-iked_ikev2__child.c) = f7f268f3e7666a3e23efd3b71c4474eeb9f8a046
-SHA1 (patch-iked_ikev2__notify.c) = 688d5b46451912b00dbf1500e7ff66f4290d7d8a
-SHA1 (patch-kinkd-crypto__openssl.c) = 4acd36a5462d3296a53966f85fb39e8888650d5a
-SHA1 (patch-kinkd-ipsec__doi.c) = f72d62de7dce9e02d4de77162926491fef3761d1
-SHA1 (patch-kinkd_bbkk__heimdal.c) = 55a4e8121df28272d2838376823bc85ec108d93f
-SHA1 (patch-kinkd_isakmp__quick.c) = 1b177838621336bfabf0416d9fc09d6e581b8c05
-SHA1 (patch-kinkd_session.c) = 6b2ec8329d0fda0b850116c21bda2a4d06634f0d
-SHA1 (patch-lib_cfparse.y) = 9e0b8ec9c09c315edde171103b97a8c403ba748e
-SHA1 (patch-lib_cfsetup.c) = 70c2409bc69ff85cef6d2e2b4e222e12537c323e
-SHA1 (patch-lib_cftoken.l) = cbda1153f7fd34713248d3d7d188a50b27d9ddcd
-SHA1 (patch-lib_if__pfkeyv2.c) = 9eb969ff0f289bc7c4aa1fa234c221b4d70d1da7
-SHA1 (patch-lib_if__spmd.c) = 0b5e5412afb826f502c040153ca5b0e50ad3d682
-SHA1 (patch-spmd_fqdn__query.c) = d44af49981bfc503fe097a40a0448215ff2367d8
-SHA1 (patch-spmd_main.c) = 7ee34b1a5b18d938806f490abe2d8cdf25caa426
-SHA1 (patch-spmd_shell.c) = 37a52cb9062fd44e0d358c7ae1605481a3604f71
-SHA1 (patch-spmd_spmd__pfkey.c) = 2bf3e70f41a779989d63d7099b2e7031a7441a27
-SHA1 (patch-spmd_spmdctl.c) = 26cd17a8b9932bbc5af8aa5d476eb0a5fad8e323
+SHA1 (racoon2-b2a193fc9875d1fb89c0a51690745379bc135fcf.tar.gz) = 5f36bf656682f794d933584485296c2556500536
+RMD160 (racoon2-b2a193fc9875d1fb89c0a51690745379bc135fcf.tar.gz) = ad6c26b5a2f818bc38989bf687f4a623b995c0df
+SHA512 (racoon2-b2a193fc9875d1fb89c0a51690745379bc135fcf.tar.gz) = b3dcbe43f7f2454f0befd4434a9335df6063e4468924d8c6ab22c960dc45802c7733f0e8720b2674666fbe953309668221352ee25c6bb1ffaafc7eab4666ce49
+Size (racoon2-b2a193fc9875d1fb89c0a51690745379bc135fcf.tar.gz) = 1144364 bytes
diff -r bc9692c44bdb -r 6c7607380e07 security/racoon2/patches/patch-aa
--- a/security/racoon2/patches/patch-aa Sun Jul 01 09:38:30 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2012/01/11 20:08:39 drochner Exp $
-
-Don't mess up user's configuration files.
-
---- samples/Makefile.in.orig   2007-12-27 10:08:52.000000000 +0900
-+++ samples/Makefile.in        2007-12-27 10:08:52.000000000 +0900
-@@ -11,8 +11,7 @@
- # empty
- all:
- 
--install: all install-startup-@startup_scripts@ install-samples install-hook
--      $(INSTALL) -d -o 0 -g 0 -m 700 /var/run/racoon2
-+install: all install-startup-@startup_scripts@
- 
- install-samples:
-       $(INSTALL) -d $(sysconfdir)
diff -r bc9692c44bdb -r 6c7607380e07 security/racoon2/patches/patch-ab
--- a/security/racoon2/patches/patch-ab Sun Jul 01 09:38:30 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2012/01/11 20:08:39 drochner Exp $
-
-This should be done when installing the package (Makefile when
-"make install" or PLIST when "pkg_add").
-
---- pskgen/Makefile.in.orig    2007-12-12 07:12:22.000000000 +0000
-+++ pskgen/Makefile.in
-@@ -17,11 +17,9 @@ PROG=pskgen
- all:
- 
- install: all
--      $(INSTALL) -d $(sbindir)
--      $(INSTALL_SCRIPT) $(PROG) $(sbindir)
--      $(INSTALL_DATA) $(PROG).8 $(mandir)/man8
--      $(INSTALL) -d $(prefix)/etc/racoon2
--      sh ./autogen.spmd.pwd
-+      $(INSTALL) -d $(DESTDIR)$(sbindir)
-+      $(INSTALL_SCRIPT) $(PROG) $(DESTDIR)$(sbindir)
-+      $(INSTALL_DATA) $(PROG).8 $(DESTDIR)$(mandir)/man8
- 
- depend:
- 
diff -r bc9692c44bdb -r 6c7607380e07 security/racoon2/patches/patch-ac
--- a/security/racoon2/patches/patch-ac Sun Jul 01 09:38:30 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2012/01/11 20:08:39 drochner Exp $
-
---- spmd/Makefile.in.orig      2006-06-23 10:21:59.000000000 +0000
-+++ spmd/Makefile.in
-@@ -38,11 +38,11 @@ spmdctl: spmdctl.o ../lib/libracoon.a
- spmdctl.o: spmd_internal.h
- 
- install: all
--      $(INSTALL_DIR) $(sbindir)
--      $(INSTALL_PROGRAM) $(DAEMON) $(sbindir)
--      $(INSTALL_PROGRAM) $(COMMAND) $(sbindir)
--      $(INSTALL_DIR) $(man8dir)
--      $(INSTALL_DATA) $(MANFILES) $(man8dir)
-+      $(INSTALL_DIR) $(DESTDIR)$(sbindir)
-+      $(INSTALL_PROGRAM) $(DAEMON) $(DESTDIR)$(sbindir)
-+      $(INSTALL_PROGRAM) $(COMMAND) $(DESTDIR)$(sbindir)
-+      $(INSTALL_DIR) $(DESTDIR)$(man8dir)
-+      $(INSTALL_DATA) $(MANFILES) $(DESTDIR)$(man8dir)
- 
- clean:
-       -rm -f $(TARGET) *.o $(COMMAND)
diff -r bc9692c44bdb -r 6c7607380e07 security/racoon2/patches/patch-ad
--- a/security/racoon2/patches/patch-ad Sun Jul 01 09:38:30 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2012/01/11 20:08:39 drochner Exp $
-
---- iked/Makefile.in.orig      2009-03-27 07:24:26.000000000 +0000
-+++ iked/Makefile.in
-@@ -66,16 +66,16 @@ all:  $(PROG) $(TESTPROG)
- install: install-prog install-doc
- 
- install-prog: $(PROG)
--      $(INSTALL) -d $(sbindir)
--      $(INSTALL_PROGRAM) $(PROG) $(sbindir)
-+      $(INSTALL) -d $(DESTDIR)$(sbindir)
-+      $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(sbindir)
- 
- install-doc:
--      $(INSTALL) -d $(mandir)/man8
-+      $(INSTALL) -d $(DESTDIR)$(mandir)/man8
- # not friendly with -n  :-(
-       sysconfdir="$$(echo '$(sysconfdir)' | sed 's/%/\\\%/g')"; \
-       for f in $(MAN); do \
-               sed -e s%\@sysconfdir\@%"$$sysconfdir"%g < $$f > $${f}.tmp; \
--              $(INSTALL_DATA) $${f}.tmp $(mandir)/man$${f##*.}/$$f; \
-+              $(INSTALL_DATA) $${f}.tmp $(DESTDIR)$(mandir)/man$${f##*.}/$$f; \
-               rm $${f}.tmp; \
-       done
- 
diff -r bc9692c44bdb -r 6c7607380e07 security/racoon2/patches/patch-ae
--- a/security/racoon2/patches/patch-ae Sun Jul 01 09:38:30 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2012/01/11 20:08:39 drochner Exp $
-
---- kinkd/Makefile.in.orig     2010-05-07 18:42:30.000000000 +0000
-+++ kinkd/Makefile.in
-@@ -49,14 +49,14 @@ $(PROG): ../lib/libracoon.a
- ../lib/libracoon.a:           # check its timestamp only when there is.
- 
- install: all
--      $(INSTALL) -d $(sbindir)
--      $(INSTALL_PROGRAM) $(PROG) $(sbindir)
--      $(INSTALL) -d $(mandir)/man8
-+      $(INSTALL) -d $(DESTDIR)$(sbindir)
-+      $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(sbindir)
-+      $(INSTALL) -d $(DESTDIR)$(mandir)/man8
- # not friendly with -n  :-(
-       sysconfdir="$$(echo '$(sysconfdir)' | sed 's/%/\\\%/g')"; \
-       for f in $(MAN); do \
-               sed -e s%\@sysconfdir\@%"$$sysconfdir"%g < $$f > $${f}.tmp; \
--              $(INSTALL_DATA) $${f}.tmp $(mandir)/man$${f##*.}/$$f; \
-+              $(INSTALL_DATA) $${f}.tmp $(DESTDIR)$(mandir)/man$${f##*.}/$$f; \
-               rm $${f}.tmp; \
-       done
- 
diff -r bc9692c44bdb -r 6c7607380e07 security/racoon2/patches/patch-iked_crypto__impl.h
--- a/security/racoon2/patches/patch-iked_crypto__impl.h        Sun Jul 01 09:38:30 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-iked_crypto__impl.h,v 1.1 2018/05/29 01:22:50 christos Exp $
-
-Make unmodified argument const
-
---- iked/crypto_impl.h 2010-02-01 05:30:51.000000000 -0500
-+++ iked/crypto_impl.h 2018-05-28 16:44:16.016528535 -0400
-@@ -246,7 +246,7 @@
- extern int eay_revbnl (rc_vchar_t *);
- #include <openssl/bn.h>
- extern int eay_v2bn (BIGNUM **, rc_vchar_t *);
--extern int eay_bn2v (rc_vchar_t **, BIGNUM *);
-+extern int eay_bn2v (rc_vchar_t **, const BIGNUM *);
- 
- extern const char *eay_version (void);
- 
diff -r bc9692c44bdb -r 6c7607380e07 security/racoon2/patches/patch-iked_crypto__openssl.c
--- a/security/racoon2/patches/patch-iked_crypto__openssl.c     Sun Jul 01 09:38:30 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,714 +0,0 @@
-$NetBSD: patch-iked_crypto__openssl.c,v 1.1 2018/05/29 01:22:50 christos Exp $
-
-Adjust for openssl-1.1
-
---- iked/crypto_openssl.c      2010-02-01 05:30:51.000000000 -0500
-+++ iked/crypto_openssl.c      2018-05-28 17:08:27.806906241 -0400
-@@ -324,16 +324,17 @@
- {
-       char buf[256];
-       int log_tag;
-+      int ctx_error, ctx_error_depth;
- 
-       if (!ok) {
--              X509_NAME_oneline(X509_get_subject_name(ctx->current_cert),
--                                buf, 256);
-+              X509_NAME_oneline(X509_get_subject_name(
-+                  X509_STORE_CTX_get0_cert(ctx)), buf, 256);
-               /*
-                * since we are just checking the certificates, it is
-                * ok if they are self signed. But we should still warn
-                * the user.
-                */
--              switch (ctx->error) {
-+              switch (ctx_error = X509_STORE_CTX_get_error(ctx)) {
-               case X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT:
- #if OPENSSL_VERSION_NUMBER >= 0x00905100L
-               case X509_V_ERR_INVALID_CA:
-@@ -347,16 +348,17 @@
-               default:
-                       log_tag = PLOG_PROTOERR;
-               }
-+              ctx_error_depth = X509_STORE_CTX_get_error_depth(ctx);
- #ifndef EAYDEBUG
-               plog(log_tag, PLOGLOC, NULL,
-                    "%s(%d) at depth:%d SubjectName:%s\n",
--                   X509_verify_cert_error_string(ctx->error),
--                   ctx->error, ctx->error_depth, buf);
-+                   X509_verify_cert_error_string(ctx_error),
-+                   ctx_error, ctx_error_depth, buf);
- #else
-               printf("%d: %s(%d) at depth:%d SubjectName:%s\n",
-                      log_tag,
--                     X509_verify_cert_error_string(ctx->error),
--                     ctx->error, ctx->error_depth, buf);
-+                     X509_verify_cert_error_string(ctx_error),
-+                     ctx_error, ctx_error_depth, buf);
- #endif
-       }
-       ERR_clear_error();
-@@ -991,6 +993,7 @@
-       BPP_const unsigned char *bp;
-       rc_vchar_t *sig = NULL;
-       int len;
-+      RSA *rsa;
-       int pad = RSA_PKCS1_PADDING;
- 
-       bp = (unsigned char *)privkey->v;
-@@ -1002,14 +1005,15 @@
-       /* XXX: to be handled EVP_dss() */
-       /* XXX: Where can I get such parameters ?  From my cert ? */
- 
--      len = RSA_size(evp->pkey.rsa);
-+      rsa = EVP_PKEY_get0_RSA(evp);
-+      len = RSA_size(rsa);
- 
-       sig = rc_vmalloc(len);
-       if (sig == NULL)
-               return NULL;
- 
-       len = RSA_private_encrypt(src->l, (unsigned char *)src->v,



Home | Main Index | Thread Index | Old Index