Attachment #122574 for bug #165796

View | Details | Raw Unified | Return to bug 165796
Collapse All | Expand All




#

PORTNAME=		miredo
PORTVERSION=	 	1.2.5
PORTREVISION=	3
CATEGORIES=		net ipv6
MASTER_SITES=		http://www.remlab.net/files/miredo/archive/



LIB_DEPENDS=		Judy.1:${PORTSDIR}/devel/judy

USE_XZ=			yes
GNU_CONFIGURE=		yes
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

Lines 1-2 Link Here

(-)net/miredo/distinfo (-2 / +2 lines)
1	SHA256 (miredo-1.2.2.tar.bz2) = c0f597e3272975544c4d6f6296494ab17ff1e2dbdf58bd28d54e7fe1be365f9a	1	SHA256 (miredo-1.2.5.tar.xz) = 9d6c6aacfbde0e152481273cda4dc9a62f8724c4c941fa8e0806e89ab9992262
2	SIZE (miredo-1.2.2.tar.bz2) = 529200	2	SIZE (miredo-1.2.5.tar.xz) = 474236




--- ./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:
 

Lines 1-20 Link Here

(-)net/miredo/files/patch-src-main.c (-20 lines)
1	--- src/main.c~ 2009-12-02 11:09:42.000000000 +0900
2	+++ src/main.c 2009-12-02 11:10:23.000000000 +0900
3	@@ -218,15 +218,13 @@
4	* Those last 3 handles will be opened as /dev/null
5	* by later daemon().
6	*/
7	- errno = 0;
8	- if (closefrom (3) && (errno != EBADF))
9	- return -1;
10	+ closefrom (3);
11
12	/*
13	* Make sure 0, 1 and 2 are open.
14	*/
15	val = dup (2);
16	- if (val < 3)
17	+ if (val != 3)
18	return -1;
19	close (val);
20




bin/teredo-mire
lib/miredo/miredo-privproc
sbin/miredo
sbin/miredo-server
sbin/miredo-checkconf
libexec/miredo/miredo-privproc
@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
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
@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
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
@dirrm libexec/miredo
@dirrm %%EXAMPLESDIR%%
%%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
@dirrm %%DOCSDIR%%/examples
@dirrm %%DOCSDIR%%
@dirrmtry etc/miredo
@dirrm include/libtun6
@dirrm include/libteredo
@dirrm lib/miredo
%%POLICYTABLE%%@cwd /
%%POLICYTABLE%%/etc/ip6addrctl.conf

Return to bug 165796

Lines 6-13 Link Here

(-)net/miredo/Makefile (-5 / +4 lines)
6	#	6	#
7		7
8	PORTNAME= miredo	8	PORTNAME= miredo
9	PORTVERSION= 1.2.2	9	PORTVERSION= 1.2.5
10	PORTREVISION= 3
11	CATEGORIES= net ipv6	10	CATEGORIES= net ipv6
12	MASTER_SITES= http://www.remlab.net/files/miredo/archive/	11	MASTER_SITES= http://www.remlab.net/files/miredo/archive/
13		12
Lines 16-29 Link Here
16		15
17	LIB_DEPENDS= Judy.1:${PORTSDIR}/devel/judy	16	LIB_DEPENDS= Judy.1:${PORTSDIR}/devel/judy
18		17
19	USE_BZIP2= yes	18	USE_XZ= yes
20	GNU_CONFIGURE= yes	19	GNU_CONFIGURE= yes
21	CONFIGURE_ARGS= --localstatedir=/var	20	CONFIGURE_ARGS= --localstatedir=/var \
		21	--enable-examplesdir=$(EXAMPLESDIR)
22	USE_LDCONFIG= yes	22	USE_LDCONFIG= yes
23		23
24	OPTIONS= POLICYTABLE "Install policy table to support teredo" off	24	OPTIONS= POLICYTABLE "Install policy table to support teredo" off
25		25
26	MAN1= teredo-mire.1
27	MAN5= miredo-server.conf.5 miredo.conf.5	26	MAN5= miredo-server.conf.5 miredo.conf.5
28	MAN8= miredo-server.8 miredo.8 miredo-checkconf.8	27	MAN8= miredo-server.8 miredo.8 miredo-checkconf.8
29	USE_RC_SUBR= miredo_server miredo	28	USE_RC_SUBR= miredo_server miredo

Line 0 Link Here

(-)net/miredo/files/patch-misc__Makefile.in (+30 lines)
	1	--- ./misc/Makefile.in.orig 2012-03-03 12:07:43.000000000 +0100
	2	+++ ./misc/Makefile.in 2012-03-06 21:44:16.210698683 +0100
	3	@@ -367,24 +367,11 @@
	4	@list='$(examples_DATA)'; test -n "$(examplesdir)" \|\| list=; \
	5	files=`for p in $$list; do echo $$p; done \| sed -e 's\|^.*/\|\|'`; \
	6	dir='$(DESTDIR)$(examplesdir)'; $(am__uninstall_files_from_dir)
	7	-install-systemdDATA: $(systemd_DATA)
	8	- @$(NORMAL_INSTALL)
	9	- test -z "$(systemddir)" \|\| $(MKDIR_P) "$(DESTDIR)$(systemddir)"
	10	- @list='$(systemd_DATA)'; test -n "$(systemddir)" \|\| list=; \
	11	- for p in $$list; do \
	12	- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
	13	- echo "$$d$$p"; \
	14	- done \| $(am__base_list) \| \
	15	- while read files; do \
	16	- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(systemddir)'"; \
	17	- $(INSTALL_DATA) $$files "$(DESTDIR)$(systemddir)" \|\| exit $$?; \
	18	- done
	19	+
	20	+install-systemdDATA:
	21
	22	uninstall-systemdDATA:
	23	- @$(NORMAL_UNINSTALL)
	24	- @list='$(systemd_DATA)'; test -n "$(systemddir)" \|\| list=; \
	25	- files=`for p in $$list; do echo $$p; done \| sed -e 's\|^.*/\|\|'`; \
	26	- dir='$(DESTDIR)$(systemddir)'; $(am__uninstall_files_from_dir)
	27	+
	28	tags: TAGS
	29	TAGS:
	30

Lines 1-33 Link Here

(-)net/miredo/pkg-plist (-25 / +9 lines)
1	bin/teredo-mire
2	lib/miredo/miredo-privproc
3	sbin/miredo	1	sbin/miredo
4	sbin/miredo-server	2	sbin/miredo-server
5	sbin/miredo-checkconf	3	sbin/miredo-checkconf
6	lib/libteredo.so.5	4	libexec/miredo/miredo-privproc
7	lib/libteredo.a	5	@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
8	lib/libteredo.la
9	lib/libteredo.so
10	lib/libtun6.so.1
11	lib/libtun6.a
12	lib/libtun6.la
13	lib/libtun6.so
14	include/libteredo/teredo.h
15	include/libteredo/teredo-udp.h
16	include/libteredo/tunnel.h
17	include/libtun6/tun6.h
18	@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
19	etc/miredo/client-hook	6	etc/miredo/client-hook
		7	%%EXAMPLESDIR%%/miredo.conf
		8	%%EXAMPLESDIR%%/miredo-server.conf
		9	%%NLS%%/share/locale/en/LC_MESSAGES/miredo.mo
		10	%%NLS%%/share/locale/en_GB/LC_MESSAGES/miredo.mo
		11	%%NLS%%/share/locale/fr/LC_MESSAGES/miredo.mo
20	@exec [ -f %B/miredo/miredo.conf ] \|\| cp %F %B/miredo/miredo.conf	12	@exec [ -f %B/miredo/miredo.conf ] \|\| cp %F %B/miredo/miredo.conf
21	%%DOCSDIR%%/examples/miredo-server.conf	13	@dirrm libexec/miredo
22	%%DOCSDIR%%/examples/miredo.conf	14	@dirrm %%EXAMPLESDIR%%
23	%%NLS%%share/locale/en/LC_MESSAGES/miredo.mo
24	%%NLS%%share/locale/en_GB/LC_MESSAGES/miredo.mo
25	%%NLS%%share/locale/fr/LC_MESSAGES/miredo.mo
26	@dirrm %%DOCSDIR%%/examples
27	@dirrm %%DOCSDIR%%
28	@dirrmtry etc/miredo	15	@dirrmtry etc/miredo
29	@dirrm include/libtun6
30	@dirrm include/libteredo
31	@dirrm lib/miredo
32	%%POLICYTABLE%%@cwd /	16	%%POLICYTABLE%%@cwd /
33	%%POLICYTABLE%%/etc/ip6addrctl.conf	17	%%POLICYTABLE%%/etc/ip6addrctl.conf