* [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 79f79385e2873337ad01d3a9e1dfdb15f99be763
@ 2014-12-05 23:18 git
0 siblings, 0 replies; only message in thread
From: git @ 2014-12-05 23:18 UTC (permalink / raw)
To: ipfire-scm
[-- Attachment #1: Type: text/plain, Size: 12544 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".
The branch, master has been updated
via 79f79385e2873337ad01d3a9e1dfdb15f99be763 (commit)
via 943e1f3c3d68e928a01fc9f8c352981ab025ac97 (commit)
from 583c4f6c03848eba8c7be5e1eb463ea3a88c7c95 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 79f79385e2873337ad01d3a9e1dfdb15f99be763
Merge: 943e1f3 583c4f6
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Dec 6 00:18:54 2014 +0100
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x
commit 943e1f3c3d68e928a01fc9f8c352981ab025ac97
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Dec 6 00:16:17 2014 +0100
Remove miredo
This is an implementation of Teredo which is not widely deployed
so far and wouldn't get any support any more since native IPv6
support is on the way
-----------------------------------------------------------------------
Summary of changes:
gnutls/gnutls.nm | 2 +-
miredo/client-hook | 32 -----
miredo/miredo.nm | 145 ---------------------
miredo/patches/miredo-1.2.5-libteredo-header.patch | 10 --
miredo/patches/miredo-config-not-exec.patch | 17 ---
.../patches/reread-resolv-before-resolv-ipv4.patch | 16 ---
miredo/systemd/miredo-client(a).service | 12 --
miredo/systemd/miredo-server.service | 11 --
network/network.nm | 3 +-
9 files changed, 2 insertions(+), 246 deletions(-)
delete mode 100644 miredo/client-hook
delete mode 100644 miredo/miredo.nm
delete mode 100644 miredo/patches/miredo-1.2.5-libteredo-header.patch
delete mode 100644 miredo/patches/miredo-config-not-exec.patch
delete mode 100644 miredo/patches/reread-resolv-before-resolv-ipv4.patch
delete mode 100644 miredo/systemd/miredo-client(a).service
delete mode 100644 miredo/systemd/miredo-server.service
Difference in files:
diff --git a/gnutls/gnutls.nm b/gnutls/gnutls.nm
index b8e6b17..f3160f6 100644
--- a/gnutls/gnutls.nm
+++ b/gnutls/gnutls.nm
@@ -6,7 +6,7 @@
name = gnutls
version = %{ver_maj}.%{ver_min}
ver_maj = 3.3
-ver_min = 4
+ver_min = 10
release = 1
groups = System/Libraries
diff --git a/miredo/client-hook b/miredo/client-hook
deleted file mode 100644
index 4ae8b0c..0000000
--- a/miredo/client-hook
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash
-###############################################################################
-# #
-# IPFire.org - A linux based firewall #
-# Copyright (C) 2012 IPFire Network Development Team #
-# #
-# This program is free software: you can redistribute it and/or modify #
-# it under the terms of the GNU General Public License as published by #
-# the Free Software Foundation, either version 3 of the License, or #
-# (at your option) any later version. #
-# #
-# This program is distributed in the hope that it will be useful, #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
-# GNU General Public License for more details. #
-# #
-# You should have received a copy of the GNU General Public License #
-# along with this program. If not, see <http://www.gnu.org/licenses/>. #
-# #
-###############################################################################
-
-# This is a proxy script which is started instead of the real helper.
-# However, the only thing this script does it to call the actual helper script.
-
-script="/usr/lib/network/helpers/miredo-helper"
-
-if [ -x "${script}" ]; then
- exec ${script}
-fi
-
-echo "${script} could not be found." >&2
-exit 1
diff --git a/miredo/miredo.nm b/miredo/miredo.nm
deleted file mode 100644
index 3499993..0000000
--- a/miredo/miredo.nm
+++ /dev/null
@@ -1,145 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = miredo
-version = 1.2.5
-release = 2
-
-groups = Network/VPN
-url = http://www.remlab.net/miredo/
-license = GPLv2+
-summary = Tunneling of IPv6 over UDP through NATs.
-
-description
- Miredo is an implementation of the "Teredo: Tunneling IPv6 over UDP
- through NATs" proposed Internet standard (RFC4380). It can serve
- either as a Teredo client, a stand-alone Teredo relay, or a Teredo
- server, please install the miredo-server or miredo-client aproprietly.
- It is meant to provide IPv6 connectivity to hosts behind NAT
- devices, most of which do not support IPv6, and not even
- IPv6-over-IPv4 (including 6to4).
-end
-
-source_dl = http://www.remlab.net/files/miredo/
-sources = %{thisapp}.tar.xz
-
-build
- requires
- libcap-devel
- shadow-utils
- systemd-units
- end
-
- configure_options += \
- --disable-static \
- --disable-rpath \
- --enable-miredo-user
-
- install_cmds
- install -v -m 755 %{DIR_SOURCE}/client-hook \
- %{BUILDROOT}%{sysconfdir}/miredo/client-hook
-
- touch %{BUILDROOT}%{sysconfdir}/miredo/miredo-server.conf
- end
-end
-
-packages
- package %{name}-client
- summary = This is the client part of miredo.
-
- # There is not "miredo" package, so the -client
- # package has an alias for it.
- provides = miredo = %{thisver}
-
- requires
- %{name}-libs = %{thisver}
- network
- end
-
- script postin
- systemctl daemon-reload >/dev/null 2>&1 || :
- end
-
- script postup
- systemctl daemon-reload >/dev/null 2>&1 || :
- end
-
- script postun
- systemctl daemon-reload >/dev/null 2>&1 || :
- end
-
- configfiles
- %{sysconfdir}/miredo/miredo.conf
- end
-
- files
- %{sysconfdir}/miredo/client-hook
- %{sysconfdir}/miredo/miredo.conf
- %{sbindir}/miredo
- %{unitdir}/miredo-client(a).service
- %{mandir}/man?/miredo.*
- end
- end
-
- package %{name}-server
- summary = This is the server part of miredo.
-
- requires = %{name}-libs = %{thisver}
-
- script postin
- systemctl daemon-reload >/dev/null 2>&1 || :
- end
-
- script postup
- systemctl daemon-reload >/dev/null 2>&1 || :
- systemctl try-restart miredo-server.service >/dev/null 2>&1 || :
- end
-
- script preun
- systemctl --no-reload disable miredo-server.service >/dev/null 2>&1 || :
- systemctl stop miredo-server.service >/dev/null 2>&1 || :
- end
-
- script postun
- systemctl daemon-reload >/dev/null 2>&1 || :
- end
-
- configfiles
- %{sysconfdir}/miredo/miredo-server.conf
- end
-
- files
- %{bindir}/teredo-mire
- %{sbindir}/miredo-server
- %{sbindir}/miredo-checkconf
- %{unitdir}/miredo-server.service
- %{mandir}/man?/teredo-mire*
- %{mandir}/man?/miredo-server*
- %{mandir}/man?/miredo-checkconf*
- end
- end
-
- package %{name}-libs
- template LIBS
-
- files += %{prefix}/lib/miredo
-
- script prein
- getent group miredo >/dev/null || groupadd -r miredo
- getent passwd miredo >/dev/null || useradd -r -g miredo \
- -d %{sysconfdir}/miredo -s /sbin/nologin -c "Miredo Daemon" miredo
- end
- end
-
- package %{name}-devel
- template DEVEL
-
- requires = %{name}-libs = %{thisver}
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/miredo/patches/miredo-1.2.5-libteredo-header.patch b/miredo/patches/miredo-1.2.5-libteredo-header.patch
deleted file mode 100644
index 6d7dc38..0000000
--- a/miredo/patches/miredo-1.2.5-libteredo-header.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- miredo-1.2.5/libteredo/tunnel.h.orig 2012-05-30 14:59:00.742600216 +0000
-+++ miredo-1.2.5/libteredo/tunnel.h 2012-05-30 14:59:05.760760580 +0000
-@@ -32,6 +32,7 @@
- # define LIBTEREDO_TUNNEL_H
-
- # include <stdbool.h>
-+# include <stddef.h>
-
- # ifdef __cplusplus
- extern "C" {
diff --git a/miredo/patches/miredo-config-not-exec.patch b/miredo/patches/miredo-config-not-exec.patch
deleted file mode 100644
index c4c5a31..0000000
--- a/miredo/patches/miredo-config-not-exec.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -ru miredo-1.1.6/misc/client-hook.iproute miredo-1.1.6-new/misc/client-hook.iproute
---- miredo-1.1.6/misc/client-hook.iproute 2008-12-17 16:14:23.000000000 +0100
-+++ miredo-1.1.6-new/misc/client-hook.iproute 2009-06-28 01:24:22.000000000 +0200
-@@ -1,4 +1,4 @@
--#! /bin/sh
-+#!/bin/sh
- #
- # Miredo client hook script for Linux/iproute2
- # Copyright © 2007 Rémi Denis-Courmont.
-diff -ru miredo-1.1.6/misc/miredo.conf-in miredo-1.1.6-new/misc/miredo.conf-in
---- miredo-1.1.6/misc/miredo.conf-in 2009-04-09 18:31:30.000000000 +0200
-+++ miredo-1.1.6-new/misc/miredo.conf-in 2009-06-28 01:24:29.000000000 +0200
-@@ -1,4 +1,3 @@
--#! @sbindir@/miredo -f -c
- #
- # Sample configuration file for Miredo
-
diff --git a/miredo/patches/reread-resolv-before-resolv-ipv4.patch b/miredo/patches/reread-resolv-before-resolv-ipv4.patch
deleted file mode 100644
index 4d7d9e1..0000000
--- a/miredo/patches/reread-resolv-before-resolv-ipv4.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-@@ -, +, @@
- libteredo/maintain.c | 3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
---- a/libteredo/maintain.c
-+++ a/libteredo/maintain.c
-@@ -262,6 +262,9 @@ void maintenance_thread (teredo_maintenance *m)
- /* Resolve server IPv4 addresses */
- while (server_ip == 0)
- {
-+ /* Reread resolv.conf, it could have changed */
-+ res_init();
-+
- /* FIXME: mutex kept while resolving - very bad */
- int val = getipv4byname (m->server, &server_ip);
- gettime (&deadline);
-
diff --git a/miredo/systemd/miredo-client(a).service b/miredo/systemd/miredo-client(a).service
deleted file mode 100644
index b55e214..0000000
--- a/miredo/systemd/miredo-client(a).service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Miredo - Teredo IPv6 Tunneling Client For Unix on %I
-BindTo=dev-%I.device
-After=dev-%I.device
-
-[Service]
-ExecStartPre=/usr/lib/network/helpers/miredo-config-helper create %I
-ExecStart=/usr/sbin/miredo -f -c /run/network/miredo/%I/client.conf -p /run/network/miredo/%I/client.pid
-ExecStopPost=/usr/lib/network/helpers/miredo-config-helper remove %I
-Restart=always
-UtmpIdentifier=%I
-KillMode=process
diff --git a/miredo/systemd/miredo-server.service b/miredo/systemd/miredo-server.service
deleted file mode 100644
index e6d4d44..0000000
--- a/miredo/systemd/miredo-server.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Miredo - Teredo IPv6 tunneling Server For Unix
-After=network.target
-
-[Service]
-Type=forking
-PIDFile=/run/miredo-server.pid
-ExecStart=/usr/sbin/miredo-server
-
-[Install]
-WantedBy=multi-user.target
diff --git a/network/network.nm b/network/network.nm
index 148cfa4..17e7c04 100644
--- a/network/network.nm
+++ b/network/network.nm
@@ -6,7 +6,7 @@
name = network
epoch = 1
version = 006
-release = 1
+release = 2
arch = noarch
maintainer = Michael Tremer <michael.tremer(a)ipfire.org>
@@ -52,7 +52,6 @@ packages
iproute2
iw
man
- miredo-client
ppp >= 2.4.5-4
radvd
rp-pppoe
hooks/post-receive
--
IPFire 3.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2014-12-05 23:18 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-12-05 23:18 [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 79f79385e2873337ad01d3a9e1dfdb15f99be763 git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox