diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 0d9475f..0000000 --- a/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -miredo-1.1.7.tar.bz2 -/miredo-1.2.5.tar.xz -/miredo-1.2.6.tar.xz diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..bdaf85c --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Properly retiring for https://pagure.io/fedora-infrastructure/issue/7536 diff --git a/miredo-client.init b/miredo-client.init deleted file mode 100644 index 9ffda2a..0000000 --- a/miredo-client.init +++ /dev/null @@ -1,118 +0,0 @@ -#!/bin/sh -# -# miredo Teredo IPv6 tunneling client -# -# chkconfig: - 12 88 -# description: miredo is a daemon program providing a Teredo tunnel \ -# client compatible with the "Teredo: Tunneling IPv6 over \ -# UDP through NATs" Internet proposed standard (RFC \ -# 4380). This service implements a Teredo client that \ -# allows the local IPv6-enabled host which is located \ -# behind an IPv4-only Network Address Translator \ -# (a.k.a. NAT) to encapsulate its IPv6 traffic inside UDP \ -# over IPv4 packets. - -### BEGIN INIT INFO -# Provides: miredo teredo-client -# Required-Start: $network -# Required-Stop: $network -# Default-Start: -# Default-Stop: 0 1 6 -# Short-Description: Teredo IPv6 tunneling client -# Description: miredo is a daemon program providing a Teredo tunnel -# client compatible with the "Teredo: Tunneling IPv6 over -# UDP through NATs" Internet proposed standard (RFC -# 4380). This service implements a Teredo client that -# allows the local IPv6-enabled host which is located -# behind an IPv4-only Network Address Translator -# (a.k.a. NAT) to encapsulate its IPv6 traffic inside UDP -# over IPv4 packets. -### END INIT INFO - -# Source function library. -. /etc/rc.d/init.d/functions - -exec="/usr/sbin/miredo" -prog="miredo" -config="/etc/miredo/miredo.conf" - -[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog - -lockfile=/var/lock/subsys/$prog - -start() { - [ -x $exec ] || exit 5 - [ -f $config ] || exit 6 - echo -n $"Starting $prog: " - # if not running, start it up here, usually something like "daemon $exec" - daemon $exec - retval=$? - echo - [ $retval -eq 0 ] && touch $lockfile - return $retval -} - -stop() { - echo -n $"Stopping $prog: " - # stop it here, often "killproc $prog" - killproc $prog - retval=$? - echo - [ $retval -eq 0 ] && rm -f $lockfile - return $retval -} - -restart() { - stop - start -} - -reload() { - restart -} - -force_reload() { - restart -} - -rh_status() { - # run checks to determine if the service is running or use generic status - status $prog -} - -rh_status_q() { - rh_status >/dev/null 2>&1 -} - - -case "$1" in - start) - rh_status_q && exit 0 - $1 - ;; - stop) - rh_status_q || exit 0 - $1 - ;; - restart) - $1 - ;; - reload) - rh_status_q || exit 7 - $1 - ;; - force-reload) - force_reload - ;; - status) - rh_status - ;; - condrestart|try-restart) - rh_status_q || exit 0 - restart - ;; - *) - echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}" - exit 2 -esac -exit $? diff --git a/miredo-client.service b/miredo-client.service deleted file mode 100644 index 9ff5aaa..0000000 --- a/miredo-client.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Miredo - Teredo IPv6 Tunneling Client For Unix -After=network.target - -[Service] -Type=forking -PIDFile=/run/miredo.pid -ExecStart=/usr/sbin/miredo - -[Install] -WantedBy=multi-user.target diff --git a/miredo-config-not-exec b/miredo-config-not-exec deleted file mode 100644 index c4c5a31..0000000 --- a/miredo-config-not-exec +++ /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-server.init b/miredo-server.init deleted file mode 100644 index 4b7adf3..0000000 --- a/miredo-server.init +++ /dev/null @@ -1,120 +0,0 @@ -#!/bin/sh -# -# miredo-server Teredo IPv6 tunneling server -# -# chkconfig: - 12 88 -# description: miredo-server is a daemon program providing a Teredo \ -# tunnel server compatible with the "Teredo: Tunneling \ -# IPv6 over UDP through NATs" Internet proposed standard \ -# (RFC 4380). This service implements a Teredo server \ -# that allows Teredo clients to setup their IPv6 \ -# connectivity through Teredo. A Teredo server must have \ -# two global static subsequent IPv4 addresses. It \ -# receives packets from Teredo clients and Teredo relays \ -# on UDP port 3544. - -### BEGIN INIT INFO -# Provides: miredo-server teredo-server -# Required-Start: $network -# Required-Stop: $network -# Default-Start: -# Default-Stop: 0 1 6 -# Short-Description: Teredo IPv6 tunneling server -# Description: miredo-server is a daemon program providing a Teredo -# tunnel server compatible with the "Teredo: Tunneling -# IPv6 over UDP through NATs" Internet proposed standard -# (RFC 4380). This service implements a Teredo server -# that allows Teredo clients to setup their IPv6 -# connectivity through Teredo. A Teredo server must have -# two global static subsequent IPv4 addresses. It -# receives packets from Teredo clients and Teredo relays -# on UDP port 3544. -### END INIT INFO - -# Source function library. -. /etc/rc.d/init.d/functions - -exec="/usr/sbin/miredo-server" -prog="miredo-server" -config="/etc/miredo/miredo-server.conf" - -[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog - -lockfile=/var/lock/subsys/$prog - -start() { - [ -x $exec ] || exit 5 - [ -f $config ] || exit 6 - echo -n $"Starting $prog: " - # if not running, start it up here, usually something like "daemon $exec" - daemon $exec - retval=$? - echo - [ $retval -eq 0 ] && touch $lockfile - return $retval -} - -stop() { - echo -n $"Stopping $prog: " - # stop it here, often "killproc $prog" - killproc $prog - retval=$? - echo - [ $retval -eq 0 ] && rm -f $lockfile - return $retval -} - -restart() { - stop - start -} - -reload() { - restart -} - -force_reload() { - restart -} - -rh_status() { - # run checks to determine if the service is running or use generic status - status $prog -} - -rh_status_q() { - rh_status >/dev/null 2>&1 -} - - -case "$1" in - start) - rh_status_q && exit 0 - $1 - ;; - stop) - rh_status_q || exit 0 - $1 - ;; - restart) - $1 - ;; - reload) - rh_status_q || exit 7 - $1 - ;; - force-reload) - force_reload - ;; - status) - rh_status - ;; - condrestart|try-restart) - rh_status_q || exit 0 - restart - ;; - *) - echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}" - exit 2 -esac -exit $? diff --git a/miredo-server.service b/miredo-server.service deleted file mode 100644 index e6d4d44..0000000 --- a/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/miredo.spec b/miredo.spec deleted file mode 100644 index 972b8cb..0000000 --- a/miredo.spec +++ /dev/null @@ -1,345 +0,0 @@ -# vim: expandtab - -%if 0%{?rhel} -%define withjudy 0 -%else -%define withjudy 1 -%endif - -%global _hardened_build 1 - -Name: miredo -Version: 1.2.6 -Release: 10%{?dist} -Summary: Tunneling of IPv6 over UDP through NATs - -Group: Applications/Internet -License: GPLv2+ -URL: http://www.remlab.net/miredo/ -Source0: http://www.remlab.net/files/miredo/miredo-%{version}.tar.xz -Source1: miredo-client.service -Source2: miredo-server.service -Patch0: miredo-config-not-exec -Patch1: reread-resolv-before-resolv-ipv4.patch - -BuildRequires: gcc -BuildRequires: libcap-devel -BuildRequires: systemd-units -BuildRequires: autoconf -%if %{withjudy} -BuildRequires: Judy-devel -%endif - -%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 appropriately. -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). - -%package libs -Summary: Tunneling of IPv6 over UDP through NATs -Group: Applications/Internet -Requires(post): /sbin/ldconfig -Requires(postun): /sbin/ldconfig -Requires(pre): shadow-utils - - -%description libs -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 appropriately. -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). -This libs package provides the files necessary for both server and client. - - -%package devel -Summary: Header files, libraries and development documentation for %{name} -Group: Development/Libraries -Requires: %{name}-libs = %{version}-%{release} - -%description devel -This package contains the header files, development libraries and development -documentation for %{name}. If you would like to develop programs using %{name}, -you will need to install %{name}-devel. - -%package server -Summary: Tunneling server for IPv6 over UDP through NATs -Group: Applications/Internet -Requires: %{name}-libs = %{version}-%{release} -Requires(post): systemd-units -Requires(preun): systemd-units -Requires(postun): systemd-units -# For triggerun -Requires(post): systemd-sysv -%description server -Miredo is an implementation of the "Teredo: Tunneling IPv6 over UDP -through NATs" proposed Internet standard (RFC4380). This offers the server -part of miredo. Most people will need only the client part. - -%package client -Summary: Tunneling client for IPv6 over UDP through NATs -Group: Applications/Internet -Requires: %{name}-libs = %{version}-%{release} -Requires(post): systemd-units -Requires(preun): systemd-units -Requires(postun): systemd-units -# For triggerun -Requires(post): systemd-sysv -Provides: %{name} = %{version}-%{release} -Obsoletes: %{name} <= 1.1.6 - - -%description client -Miredo is an implementation of the "Teredo: Tunneling IPv6 over UDP -through NATs" proposed Internet standard (RFC4380). This offers the client -part of miredo. Most people only need the client part. - -%prep -%setup -q -%patch0 -p1 -%patch1 -p1 -autoconf - -%build -%configure \ - --disable-static \ - --disable-rpath \ - --enable-miredo-user \ -%if %{withjudy} == 0 - --without-Judy \ -%endif - - -# rpath does not really work -sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool -sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool -make %{?_smp_mflags} - - -%install -rm -rf %{buildroot} -make install DESTDIR=%{buildroot} INSTALL='install -p' -%find_lang %{name} -mkdir rpmdocs -mv %{buildroot}%{_docdir}/miredo/examples rpmdocs/ -mkdir -p %{buildroot}%{_unitdir} -install -p -m 644 %{SOURCE1} %{buildroot}%{_unitdir}/miredo-client.service -install -p -m 644 %{SOURCE2} %{buildroot}%{_unitdir}/miredo-server.service -rm -f %{buildroot}%{_libdir}/lib*.la -# We use our own service file -rm -f %{buildroot}/usr/lib*/systemd/system/miredo.service -touch %{buildroot}%{_sysconfdir}/miredo/miredo-server.conf - - -%pre libs -getent group miredo >/dev/null || groupadd -r miredo -getent passwd miredo >/dev/null || useradd -r -g miredo -d /etc/miredo \ - -s /sbin/nologin -c "Miredo Daemon" miredo -exit 0 - - -%post libs -p /sbin/ldconfig - -%post client -if [ $1 -eq 1 ] ; then - # Initial installation - /bin/systemctl daemon-reload >/dev/null 2>&1 || : -fi - - -%post server -if [ $1 -eq 1 ] ; then - # Initial installation - /bin/systemctl daemon-reload >/dev/null 2>&1 || : -fi - - -%preun client -if [ $1 -eq 0 ] ; then - # Package removal, not upgrade - /bin/systemctl --no-reload disable miredo-client.service > /dev/null 2>&1 || : - /bin/systemctl stop miredo-client.service > /dev/null 2>&1 || : -fi - -%preun server -if [ $1 -eq 0 ] ; then - # Package removal, not upgrade - /bin/systemctl --no-reload disable miredo-server.service > /dev/null 2>&1 || : - /bin/systemctl stop miredo-server.service > /dev/null 2>&1 || : -fi - - -%postun libs -p /sbin/ldconfig - -%postun client -/bin/systemctl daemon-reload >/dev/null 2>&1 || : -if [ $1 -ge 1 ] ; then - # Package upgrade, not uninstall - /bin/systemctl try-restart miredo-client.service >/dev/null 2>&1 || : -fi - - -%postun server -/bin/systemctl daemon-reload >/dev/null 2>&1 || : -if [ $1 -ge 1 ] ; then - # Package upgrade, not uninstall - /bin/systemctl try-restart miredo-server.service >/dev/null 2>&1 || : -fi - -%triggerun -- miredo-client < 1.1.7-8 -# Save the current service runlevel info -# User must manually run systemd-sysv-convert --apply miredo-client -# to migrate them to systemd targets -/usr/bin/systemd-sysv-convert --save miredo-client >/dev/null 2>&1 ||: - -# Run these because the SysV package being removed won't do them -/sbin/chkconfig --del miredo-client >/dev/null 2>&1 || : -/bin/systemctl try-restart miredo-client.service >/dev/null 2>&1 || : - -%triggerun -- miredo-server < 1.1.7-8 -# Save the current service runlevel info -# User must manually run systemd-sysv-convert --apply miredo-server -# to migrate them to systemd targets -/usr/bin/systemd-sysv-convert --save miredo-server >/dev/null 2>&1 ||: - -# Run these because the SysV package being removed won't do them -/sbin/chkconfig --del miredo-server >/dev/null 2>&1 || : -/bin/systemctl try-restart miredo-server.service >/dev/null 2>&1 || : - - -%files libs -f %{name}.lang -%doc AUTHORS ChangeLog COPYING NEWS README THANKS TODO rpmdocs/* -%{_libdir}/libteredo.so.* -%{_libdir}/libtun6.so.* - -%files devel -%{_includedir}/libteredo/ -%{_includedir}/libtun6/ -%{_libdir}/libteredo.so -%{_libdir}/libtun6.so - -%files server -%ghost %config(noreplace,missingok) %{_sysconfdir}/miredo/miredo-server.conf -%{_bindir}/teredo-mire -%{_sbindir}/miredo-server -%{_sbindir}/miredo-checkconf -%{_unitdir}/miredo-server.service -%doc %{_mandir}/man1/teredo-mire* -%doc %{_mandir}/man?/miredo-server* -%doc %{_mandir}/man?/miredo-checkconf* - - -%files client -%config(noreplace) %{_sysconfdir}/miredo/miredo.conf -%config(noreplace) %{_sysconfdir}/miredo/client-hook -%{_unitdir}/miredo-client.service -%{_sbindir}/miredo -%{_libexecdir}/miredo/miredo-privproc -%doc %{_mandir}/man?/miredo.* - - -%changelog -* Fri Jul 13 2018 Fedora Release Engineering - 1.2.6-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Thu Feb 08 2018 Fedora Release Engineering - 1.2.6-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Aug 03 2017 Fedora Release Engineering - 1.2.6-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 1.2.6-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 1.2.6-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Thu Feb 04 2016 Fedora Release Engineering - 1.2.6-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Jun 17 2015 Fedora Release Engineering - 1.2.6-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sun Aug 17 2014 Fedora Release Engineering - 1.2.6-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sat Jun 07 2014 Fedora Release Engineering - 1.2.6-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Mon Aug 05 2013 Jens - 1.2.6-1 -- upgrade to 1.2.6 -- fix missing buildreq systemd-units - -* Sat Aug 03 2013 Fedora Release Engineering - 1.2.5-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Tue Apr 23 2013 Jens - 1.2.5-4 -- Add PIE Compilier Flag - -* Mon Mar 25 2013 Jens - 1.2.5-3 -- add autoconf for aarch64 support - -* Fri Mar 22 2013 Jens - 1.2.5-2 -- Fix deletion of mirdeo.service file for 32bit - -* Thu Mar 21 2013 Jens Kuehnel - 1.2.5-1 -- Update to 1.2.5 - -* Thu Feb 14 2013 Fedora Release Engineering - 1.1.7-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Fri Jul 20 2012 Fedora Release Engineering - 1.1.7-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Tue Apr 24 2012 Jon Ciesla - 1.1.7-8 -- Migrate to systemd, BZ 789782. - -* Fri Jan 13 2012 Fedora Release Engineering - 1.1.7-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Tue Feb 08 2011 Fedora Release Engineering - 1.1.7-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Wed Aug 04 2010 "Jens Kuehnel " - 1.1.7-5 -- Fixed BZ#606106 - miredo-client fails to notice resolv.conf changes - -* Thu Jul 30 2009 Jens Kuehnel - 1.1.7-4 -- Fix Obsoletes for smooth upgrade - -* Tue Jul 28 2009 Jens Kuehnel - 1.1.7-3 -- without July as optional, hopefully the last EL fix - -* Sun Jul 19 2009 Jens Kuehnel - 1.1.7-2 -- rename miredo to miredo-libs -- fixes EL - -* Tue Jul 14 2009 Jens Kuehnel - 1.1.7-1 -- split into server and client package -- update to upstream 1.1.7 - -* Sun Jun 28 2009 Jens Kuehnel - 1.1.6-2 -- renamed miredo startscript to miredo-client -- preliminary preperation for EL -- miredo-server.conf ghosted -- removed .la files instead excluding of them -- fixed ldconfig requires - -* Sat Jun 27 2009 Jens Kuehnel - 1.1.6-1 -- ReInitiate Fedora package review -- update to 1.1.6 -- removed isatap stuff -- don't start it by default - -* Sun Oct 05 2008 Charles R. Anderson - 1.1.5-1 -- Initial Fedora package based on Dries miredo.spec 5059 -- Updated to 1.1.5 -- disable-static libs -- remove hardcoded rpaths -- create initscripts for client, server, and isatap daemon -- create system user miredo for daemon to setid to diff --git a/reread-resolv-before-resolv-ipv4.patch b/reread-resolv-before-resolv-ipv4.patch deleted file mode 100644 index 4d7d9e1..0000000 --- a/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/sources b/sources deleted file mode 100644 index ca73a46..0000000 --- a/sources +++ /dev/null @@ -1,2 +0,0 @@ -5114debbf9fcab5d292176e4548f8cd1 miredo-1.2.5.tar.xz -5bcdbaced54f40b6cb1e9c9a8dbac411 miredo-1.2.6.tar.xz