rpms/miredo/devel import.log, NONE, 1.1 miredo-client.init, NONE, 1.1 miredo-config-not-exec, NONE, 1.1 miredo-server.init, NONE, 1.1 miredo.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
jens
jens at fedoraproject.org
Wed Jul 1 05:22:18 UTC 2009
- Previous message (by thread): rpms/ibus-table-cangjie/devel ibus-table-cangjie.spec,1.4,1.5
- Next message (by thread): rpms/xscope/F-10 import.log, NONE, 1.1 xscope-1.1-diff_to_git.patch, NONE, 1.1 xscope-1.1-lessmacros.patch, NONE, 1.1 xscope.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: jens
Update of /cvs/pkgs/rpms/miredo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22137/devel
Modified Files:
.cvsignore sources
Added Files:
import.log miredo-client.init miredo-config-not-exec
miredo-server.init miredo.spec
Log Message:
* Sat Jun 28 2009 Jens Kuehnel <fedora-package at jens.kuehnel.org> 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
--- NEW FILE import.log ---
miredo-1_1_6-2_fc11:HEAD:miredo-1.1.6-2.fc11.src.rpm:1246425622
--- NEW FILE miredo-client.init ---
#!/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 $?
--- NEW FILE miredo-config-not-exec ---
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
--- NEW FILE miredo-server.init ---
#!/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 $?
--- NEW FILE miredo.spec ---
# vim: expandtab
Name: miredo
Version: 1.1.6
Release: 2%{?dist}
Summary: Tunneling of IPv6 over UDP through NATs
Group: Applications/Internet
License: GPLv2+
URL: http://www.simphalempin.com/dev/miredo/
Source0: http://www.remlab.net/files/miredo/miredo-%{version}.tar.bz2
Source1: miredo-client.init
Source2: miredo-server.init
%if 0%{?rhel}
Source3: isatapd.init
%endif
Patch0: miredo-config-not-exec
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libcap-devel Judy-devel
Requires(pre): shadow-utils
Requires(post): chkconfig, /sbin/ldconfig
# This is for /sbin/service
Requires(preun): chkconfig, initscripts
Requires(postun): initscripts, /sbin/ldconfig
%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. 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 devel
Summary: Header files, libraries and development documentation for %{name}
Group: Development/Libraries
Requires: %{name} = %{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.
%prep
%setup -q
%patch0 -p1
%build
%configure \
--disable-static \
--disable-rpath \
--with-Judy \
--enable-miredo-user
# 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}%{_initrddir}
install -p -m 755 %{SOURCE1} %{buildroot}%{_initrddir}/miredo-client
install -p -m 755 %{SOURCE2} %{buildroot}%{_initrddir}/miredo-server
%if 0%{?rhel}
install -p -m 755 %{SOURCE3} %{buildroot}%{_initrddir}/isatapd
%endif
rm -f %{buildroot}%{_libdir}/lib*.la
touch %{buildroot}%{_sysconfdir}/miredo/miredo-server.conf
%pre
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
/sbin/ldconfig
/sbin/chkconfig --add miredo-client
/sbin/chkconfig --add miredo-server
%if 0%{?rhel}
/sbin/chkconfig --add isatapd
%endif
%preun
if [ $1 = 0 ] ; then
%if 0%{?rhel}
/sbin/service isatapd stop >/dev/null 2>&1
%endif
/sbin/service miredo-server stop >/dev/null 2>&1
/sbin/service miredo-client stop >/dev/null 2>&1
/sbin/chkconfig --del miredo-client
/sbin/chkconfig --del miredo-server
%if 0%{?rhel}
/sbin/chkconfig --del isatapd
%endif
fi
%postun
/sbin/ldconfig
if [ "$1" -ge "1" ] ; then
%if 0%{?rhel}
/sbin/service isatapd condrestart >/dev/null 2>&1 || :
%endif
/sbin/service miredo-server condrestart >/dev/null 2>&1 || :
/sbin/service miredo-client condrestart >/dev/null 2>&1 || :
fi
%clean
rm -rf %{buildroot}
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README THANKS TODO rpmdocs/*
%doc %{_mandir}/man?/miredo*
%doc %{_mandir}/man1/teredo-mire*
%dir %{_sysconfdir}/miredo
%config(noreplace) %{_sysconfdir}/miredo/miredo.conf
%config(noreplace) %{_sysconfdir}/miredo/client-hook
%ghost %config(noreplace,missingok) %{_sysconfdir}/miredo/miredo-server.conf
%{_sbindir}/miredo
%{_sbindir}/miredo-checkconf
%{_sbindir}/miredo-server
%{_bindir}/teredo-mire
%{_libdir}/libteredo.so.*
%{_libdir}/libtun6.so.*
%{_initrddir}/miredo-client
%{_initrddir}/miredo-server
%if 0%{?rhel}
%{_sbindir}/isatapd
%doc %{_mandir}/man5/isatapd.conf*
%doc %{_mandir}/man8/isatapd*
%{_initrddir}/isatapd
%endif
%files devel
%defattr(-,root,root,-)
%{_includedir}/libteredo/
%{_includedir}/libtun6/
%{_libdir}/libteredo.so
%{_libdir}/libtun6.so
%changelog
* Sat Jun 28 2009 Jens Kuehnel <fedora-package at jens.kuehnel.org> 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 <fedora-package at jens.kuehnel.org> 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 <cra at wpi.edu> 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
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/miredo/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore 1 Jul 2009 02:39:06 -0000 1.1
+++ .cvsignore 1 Jul 2009 05:21:48 -0000 1.2
@@ -0,0 +1 @@
+miredo-1.1.6.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/miredo/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources 1 Jul 2009 02:39:06 -0000 1.1
+++ sources 1 Jul 2009 05:21:48 -0000 1.2
@@ -0,0 +1 @@
+bf49c1ddc068746760787d0cf76e40de miredo-1.1.6.tar.bz2
- Previous message (by thread): rpms/ibus-table-cangjie/devel ibus-table-cangjie.spec,1.4,1.5
- Next message (by thread): rpms/xscope/F-10 import.log, NONE, 1.1 xscope-1.1-diff_to_git.patch, NONE, 1.1 xscope-1.1-lessmacros.patch, NONE, 1.1 xscope.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list