CVS commit: pkgsrc/net/miredo

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/net/miredo
From: "Amitai Schleier" <schmonz%netbsd.org@localhost>
Date: Sat, 5 Jan 2019 21:46:05 +0000

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Sat Jan  5 21:46:05 UTC 2019

Modified Files:
        pkgsrc/net/miredo: Makefile PLIST distinfo
        pkgsrc/net/miredo/patches: patch-ah
Added Files:
        pkgsrc/net/miredo/patches: patch-src_relayd.c
Removed Files:
        pkgsrc/net/miredo/patches: patch-libteredo_tunnel.h

Log Message:
Update to 1.2.6. From the changelog:

# Fix compilation on some systems.
# Add simplified Chinese localization.
# Fix compatibility with newer GNU/automake.
# Add systemd configuration file.
# Automatically load if_tun on FreeBSD.
# Use POSIX tree instead of linked list when libJudy is missing/disabled.
# Fix C pointer aliasing violations.
# Fix compilation with FreeBSD 7.2 or later.


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 pkgsrc/net/miredo/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/net/miredo/PLIST
cvs rdiff -u -r1.14 -r1.15 pkgsrc/net/miredo/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/net/miredo/patches/patch-ah
cvs rdiff -u -r1.1 -r0 pkgsrc/net/miredo/patches/patch-libteredo_tunnel.h
cvs rdiff -u -r0 -r1.1 pkgsrc/net/miredo/patches/patch-src_relayd.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/miredo/Makefile
diff -u pkgsrc/net/miredo/Makefile:1.24 pkgsrc/net/miredo/Makefile:1.25
--- pkgsrc/net/miredo/Makefile:1.24     Sun Sep  3 08:53:12 2017
+++ pkgsrc/net/miredo/Makefile  Sat Jan  5 21:46:05 2019
@@ -1,17 +1,16 @@
-# $NetBSD: Makefile,v 1.24 2017/09/03 08:53:12 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2019/01/05 21:46:05 schmonz Exp $
 
-DISTNAME=      miredo-1.2.2
-PKGREVISION=   2
+DISTNAME=      miredo-1.2.6
 CATEGORIES=    net
 MASTER_SITES=  http://www.remlab.net/files/miredo/
-EXTRACT_SUFX=  .tar.bz2
+EXTRACT_SUFX=  .tar.xz
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://www.remlab.net/miredo/
 COMMENT=       Teredo IPv6 tunneling
 LICENSE=       gnu-gpl-v2
 
-NOT_FOR_PLATFORM=      Interix-*-* NetBSD-[0-3]*-* SunOS-*-*
+NOT_FOR_PLATFORM=      Interix-*-* NetBSD-[0-3].*-* SunOS-*-*
 
 GNU_CONFIGURE= yes
 CONFIGURE_ARGS+=       --localstatedir=${VARBASE}
@@ -30,6 +29,8 @@ CONF_FILES+=  ${EGDIR}/client-hook ${PKG_
 
 RCD_SCRIPTS=   miredo
 
+BUILD_DEFS+=   VARBASE
+
 .include "../../net/libpcap/buildlink3.mk"
 .include "../../devel/libjudy/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"

Index: pkgsrc/net/miredo/PLIST
diff -u pkgsrc/net/miredo/PLIST:1.11 pkgsrc/net/miredo/PLIST:1.12
--- pkgsrc/net/miredo/PLIST:1.11        Tue May  6 14:59:18 2014
+++ pkgsrc/net/miredo/PLIST     Sat Jan  5 21:46:05 2019
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2014/05/06 14:59:18 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.12 2019/01/05 21:46:05 schmonz Exp $
 bin/teredo-mire
 include/libteredo/teredo-udp.h
 include/libteredo/teredo.h
@@ -6,7 +6,8 @@ include/libteredo/tunnel.h
 include/libtun6/tun6.h
 lib/libteredo.la
 lib/libtun6.la
-lib/miredo/miredo-privproc
+lib/systemd/system/miredo.service
+libexec/miredo/miredo-privproc
 man/man1/teredo-mire.1
 man/man5/miredo-server.conf.5
 man/man5/miredo.conf.5

Index: pkgsrc/net/miredo/distinfo
diff -u pkgsrc/net/miredo/distinfo:1.14 pkgsrc/net/miredo/distinfo:1.15
--- pkgsrc/net/miredo/distinfo:1.14     Wed Nov  4 00:35:11 2015
+++ pkgsrc/net/miredo/distinfo  Sat Jan  5 21:46:05 2019
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.14 2015/11/04 00:35:11 agc Exp $
+$NetBSD: distinfo,v 1.15 2019/01/05 21:46:05 schmonz Exp $
 
-SHA1 (miredo-1.2.2.tar.bz2) = 9facd2ef23ae7a9969dfbe179a6c3ebddd87a2cc
-RMD160 (miredo-1.2.2.tar.bz2) = 16c9ec08d5ae935027a49153dc44745e2cc916c7
-SHA512 (miredo-1.2.2.tar.bz2) = 26248e91c3ad4e6ab5a0aaceb00ad69d3a28f3ff2594788694625f5f932502fb90a14b5faa919ada0dc28c303ed8760c4782aa0e2dca818fe693c6fe83116622
-Size (miredo-1.2.2.tar.bz2) = 529200 bytes
+SHA1 (miredo-1.2.6.tar.xz) = 630c84e9919952f6f4792ceda54a12e0aef43bbf
+RMD160 (miredo-1.2.6.tar.xz) = b02b96f233df2211f45c0dad981f0a5ab6aa1789
+SHA512 (miredo-1.2.6.tar.xz) = 9cbc604aecde566f921834a220be7675981e1c603cbcc81c3e2e9c58fdcdae2e78ec6ffc180939d5b8f6d7598ba3967270532b2c0c04de8b688a86c436719caf
+Size (miredo-1.2.6.tar.xz) = 477668 bytes
 SHA1 (patch-ab) = b9b1ed3d47ebe992e3eb33dec46a7419273e7d3c
-SHA1 (patch-ah) = 306c1a289d5a0221231a25b427a754ffc308f814
-SHA1 (patch-libteredo_tunnel.h) = 0706d37f83d94b1b3b4dfedaf5e484a4dcc2eb4a
+SHA1 (patch-ah) = 90a095d0c2cb0fa20e1db0e4f31f39a45984a729
+SHA1 (patch-src_relayd.c) = 2bf2b2443938adf1873482abc52befcaab1e45e2

Index: pkgsrc/net/miredo/patches/patch-ah
diff -u pkgsrc/net/miredo/patches/patch-ah:1.3 pkgsrc/net/miredo/patches/patch-ah:1.4
--- pkgsrc/net/miredo/patches/patch-ah:1.3      Tue May  6 14:59:18 2014
+++ pkgsrc/net/miredo/patches/patch-ah  Sat Jan  5 21:46:05 2019
@@ -1,19 +1,21 @@
-$NetBSD: patch-ah,v 1.3 2014/05/06 14:59:18 jperkin Exp $
+$NetBSD: patch-ah,v 1.4 2019/01/05 21:46:05 schmonz Exp $
 
 Install client-hook to the correct location.
 
---- misc/Makefile.in.orig      2009-11-05 20:03:42.000000000 +0100
-+++ misc/Makefile.in   2010-06-08 23:15:53.000000000 +0200
-@@ -296,7 +296,7 @@
- $(am__aclocal_m4_deps):
- install-confSCRIPTS: $(conf_SCRIPTS)
+--- misc/Makefile.in.orig      2013-05-23 15:51:51.000000000 +0000
++++ misc/Makefile.in
+@@ -337,8 +337,8 @@ install-confSCRIPTS: $(conf_SCRIPTS)
        @$(NORMAL_INSTALL)
--      test -z "$(confdir)" || $(MKDIR_P) "$(DESTDIR)$(confdir)"
-+      test -z "$(examplesdir)" || $(MKDIR_P) "$(DESTDIR)$(examplesdir)"
        @list='$(conf_SCRIPTS)'; test -n "$(confdir)" || list=; \
+       if test -n "$$list"; then \
+-        echo " $(MKDIR_P) '$(DESTDIR)$(confdir)'"; \
+-        $(MKDIR_P) "$(DESTDIR)$(confdir)" || exit 1; \
++        echo " $(MKDIR_P) '$(DESTDIR)$(examplesdir)'"; \
++        $(MKDIR_P) "$(DESTDIR)$(examplesdir)" || exit 1; \
+       fi; \
        for p in $$list; do \
          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-@@ -315,8 +315,8 @@
+@@ -357,8 +357,8 @@ install-confSCRIPTS: $(conf_SCRIPTS)
        while read type dir files; do \
             if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
             test -z "$$files" || { \

Added files:

Index: pkgsrc/net/miredo/patches/patch-src_relayd.c
diff -u /dev/null pkgsrc/net/miredo/patches/patch-src_relayd.c:1.1
--- /dev/null   Sat Jan  5 21:46:05 2019
+++ pkgsrc/net/miredo/patches/patch-src_relayd.c        Sat Jan  5 21:46:05 2019
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_relayd.c,v 1.1 2019/01/05 21:46:05 schmonz Exp $
+
+Copy default MSG_NOSIGNAL from src/privproc.c.
+
+--- src/relayd.c.orig  2013-05-23 15:40:42.000000000 +0000
++++ src/relayd.c
+@@ -48,6 +48,9 @@
+ #ifdef HAVE_SYS_CAPABILITY_H
+ # include <sys/capability.h>
+ #endif
++#ifndef MSG_NOSIGNAL
++# define MSG_NOSIGNAL 0 /* Uho */
++#endif
+ #ifndef SOL_IPV6
+ # define SOL_IPV6 IPPROTO_IPV6
+ #endif

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/lang/rust
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/lang/rust
Indexes:

Home | Main Index | Thread Index | Old Index