Attachment 122574 Details for Bug 165796 – net-miredo-1.2.5.diff

[patch] net-miredo-1.2.5.diff

net-miredo-1.2.5.diff (text/plain), 4.98 KB, created by Tobias Rehbein on 2012-03-06 22:50:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tobias Rehbein

Created: 2012-03-06 22:50:07 UTC

Size: 4.98 KB

patch

obsolete

>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
>-@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
>+@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
>-@dirrm %%DOCSDIR%%/examples
>-@dirrm %%DOCSDIR%%
>+@dirrm libexec/miredo
>+@dirrm %%EXAMPLESDIR%%
> @dirrmtry etc/miredo
>-@dirrm include/libtun6
>-@dirrm include/libteredo
>-@dirrm lib/miredo
> %%POLICYTABLE%%@cwd /
> %%POLICYTABLE%%/etc/ip6addrctl.conf

Actions: View | Diff

Attachments on bug 165796: 122574