ports/165796: [PATCH] update net/miredo to 1.2.5
Tobias Rehbein
tobias.rehbein at web.de
Tue Mar 6 22:50:08 UTC 2012
>Number: 165796
>Category: ports
>Synopsis: [PATCH] update net/miredo to 1.2.5
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Tue Mar 06 22:50:07 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Tobias Rehbein
>Release: FreeBSD 9.0-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD oshi.local 9.0-RELEASE FreeBSD 9.0-RELEASE #2: Fri Feb 17 10:28:48 CET 2012 tobi at oshi:/usr/obj/usr/src/sys/OSHI amd64
>Description:
I updated the net/miredo port to the latest version. I had no problem with the version currently in ports but thought it might be a good idea to catch up.
1.2.5 works fine for me, but there is one little issue left: libtun6/tun6.c uses kldload to load the if_tun module unconditionally. That leads to a message
in the boot process telling that "if_tun is already loaded". I tried to work around that without success.
>How-To-Repeat:
>Fix:
--- net-miredo-1.2.5.diff begins here ---
diff -ruN net/miredo.orig/Makefile net/miredo/Makefile
--- net/miredo.orig/Makefile 2011-09-24 00:24:32.000000000 +0200
+++ net/miredo/Makefile 2012-03-06 23:31:31.556798430 +0100
@@ -6,8 +6,7 @@
#
PORTNAME= miredo
-PORTVERSION= 1.2.2
-PORTREVISION= 3
+PORTVERSION= 1.2.5
CATEGORIES= net ipv6
MASTER_SITES= http://www.remlab.net/files/miredo/archive/
@@ -16,14 +15,14 @@
LIB_DEPENDS= Judy.1:${PORTSDIR}/devel/judy
-USE_BZIP2= yes
+USE_XZ= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --localstatedir=/var
+CONFIGURE_ARGS= --localstatedir=/var \
+ --enable-examplesdir=$(EXAMPLESDIR)
USE_LDCONFIG= yes
OPTIONS= POLICYTABLE "Install policy table to support teredo" off
-MAN1= teredo-mire.1
MAN5= miredo-server.conf.5 miredo.conf.5
MAN8= miredo-server.8 miredo.8 miredo-checkconf.8
USE_RC_SUBR= miredo_server miredo
diff -ruN net/miredo.orig/distinfo net/miredo/distinfo
--- net/miredo.orig/distinfo 2011-01-05 06:02:23.000000000 +0100
+++ net/miredo/distinfo 2012-03-06 23:31:31.557799124 +0100
@@ -1,2 +1,2 @@
-SHA256 (miredo-1.2.2.tar.bz2) = c0f597e3272975544c4d6f6296494ab17ff1e2dbdf58bd28d54e7fe1be365f9a
-SIZE (miredo-1.2.2.tar.bz2) = 529200
+SHA256 (miredo-1.2.5.tar.xz) = 9d6c6aacfbde0e152481273cda4dc9a62f8724c4c941fa8e0806e89ab9992262
+SIZE (miredo-1.2.5.tar.xz) = 474236
diff -ruN net/miredo.orig/files/patch-misc__Makefile.in net/miredo/files/patch-misc__Makefile.in
--- net/miredo.orig/files/patch-misc__Makefile.in 1970-01-01 01:00:00.000000000 +0100
+++ net/miredo/files/patch-misc__Makefile.in 2012-03-06 23:31:31.551798941 +0100
@@ -0,0 +1,30 @@
+--- ./misc/Makefile.in.orig 2012-03-03 12:07:43.000000000 +0100
++++ ./misc/Makefile.in 2012-03-06 21:44:16.210698683 +0100
+@@ -367,24 +367,11 @@
+ @list='$(examples_DATA)'; test -n "$(examplesdir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ dir='$(DESTDIR)$(examplesdir)'; $(am__uninstall_files_from_dir)
+-install-systemdDATA: $(systemd_DATA)
+- @$(NORMAL_INSTALL)
+- test -z "$(systemddir)" || $(MKDIR_P) "$(DESTDIR)$(systemddir)"
+- @list='$(systemd_DATA)'; test -n "$(systemddir)" || list=; \
+- for p in $$list; do \
+- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- echo "$$d$$p"; \
+- done | $(am__base_list) | \
+- while read files; do \
+- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(systemddir)'"; \
+- $(INSTALL_DATA) $$files "$(DESTDIR)$(systemddir)" || exit $$?; \
+- done
++
++install-systemdDATA:
+
+ uninstall-systemdDATA:
+- @$(NORMAL_UNINSTALL)
+- @list='$(systemd_DATA)'; test -n "$(systemddir)" || list=; \
+- files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+- dir='$(DESTDIR)$(systemddir)'; $(am__uninstall_files_from_dir)
++
+ tags: TAGS
+ TAGS:
+
diff -ruN net/miredo.orig/files/patch-src-main.c net/miredo/files/patch-src-main.c
--- net/miredo.orig/files/patch-src-main.c 2009-12-02 03:25:46.000000000 +0100
+++ net/miredo/files/patch-src-main.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,20 +0,0 @@
---- src/main.c~ 2009-12-02 11:09:42.000000000 +0900
-+++ src/main.c 2009-12-02 11:10:23.000000000 +0900
-@@ -218,15 +218,13 @@
- * Those last 3 handles will be opened as /dev/null
- * by later daemon().
- */
-- errno = 0;
-- if (closefrom (3) && (errno != EBADF))
-- return -1;
-+ closefrom (3);
-
- /*
- * Make sure 0, 1 and 2 are open.
- */
- val = dup (2);
-- if (val < 3)
-+ if (val != 3)
- return -1;
- close (val);
-
diff -ruN net/miredo.orig/pkg-plist net/miredo/pkg-plist
--- net/miredo.orig/pkg-plist 2011-01-05 06:02:23.000000000 +0100
+++ net/miredo/pkg-plist 2012-03-06 23:31:31.568798657 +0100
@@ -1,33 +1,17 @@
-bin/teredo-mire
-lib/miredo/miredo-privproc
sbin/miredo
sbin/miredo-server
sbin/miredo-checkconf
-lib/libteredo.so.5
-lib/libteredo.a
-lib/libteredo.la
-lib/libteredo.so
-lib/libtun6.so.1
-lib/libtun6.a
-lib/libtun6.la
-lib/libtun6.so
-include/libteredo/teredo.h
-include/libteredo/teredo-udp.h
-include/libteredo/tunnel.h
-include/libtun6/tun6.h
- at unexec [ -f %D/etc/miredo/miredo.conf ] && cmp -s %D/etc/miredo/miredo.conf %D/%%DOCSDIR%%/examples/miredo.conf && rm %D/etc/miredo/miredo.conf || true
+libexec/miredo/miredo-privproc
+ at unexec [ -f %D/etc/miredo/miredo.conf ] && cmp -s %D/etc/miredo/miredo.conf %D/%%EXAMPLESDIR%%/miredo.conf && rm %D/etc/miredo/miredo.conf || true
etc/miredo/client-hook
+%%EXAMPLESDIR%%/miredo.conf
+%%EXAMPLESDIR%%/miredo-server.conf
+%%NLS%%/share/locale/en/LC_MESSAGES/miredo.mo
+%%NLS%%/share/locale/en_GB/LC_MESSAGES/miredo.mo
+%%NLS%%/share/locale/fr/LC_MESSAGES/miredo.mo
@exec [ -f %B/miredo/miredo.conf ] || cp %F %B/miredo/miredo.conf
-%%DOCSDIR%%/examples/miredo-server.conf
-%%DOCSDIR%%/examples/miredo.conf
-%%NLS%%share/locale/en/LC_MESSAGES/miredo.mo
-%%NLS%%share/locale/en_GB/LC_MESSAGES/miredo.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/miredo.mo
- at dirrm %%DOCSDIR%%/examples
- at dirrm %%DOCSDIR%%
+ at dirrm libexec/miredo
+ at dirrm %%EXAMPLESDIR%%
@dirrmtry etc/miredo
- at dirrm include/libtun6
- at dirrm include/libteredo
- at dirrm lib/miredo
%%POLICYTABLE%%@cwd /
%%POLICYTABLE%%/etc/ip6addrctl.conf
--- net-miredo-1.2.5.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list