diff --git a/.cvsignore b/.cvsignore index e69de29..03ae52e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +aiccu_2005.01.31.tar.gz diff --git a/aiccu-cflags.patch b/aiccu-cflags.patch new file mode 100644 index 0000000..78b9778 --- /dev/null +++ b/aiccu-cflags.patch @@ -0,0 +1,24 @@ +diff -urNp --exclude-from=/home/mdomsch/excludes --minimal aiccu.orig/Makefile aiccu/Makefile +--- aiccu.orig/Makefile 2006-06-28 13:30:33.000000000 -0500 ++++ aiccu/Makefile 2006-06-28 13:38:58.000000000 -0500 +@@ -61,6 +61,7 @@ export dirbin + export diretc + export dirdoc + export RPM_OPT_FLAGS ++export CFLAGS + + #################### + ## Makefile Targets +diff -urNp --exclude-from=/home/mdomsch/excludes --minimal aiccu.orig/unix-console/Makefile aiccu/unix-console/Makefile +--- aiccu.orig/unix-console/Makefile 2006-06-28 13:30:33.000000000 -0500 ++++ aiccu/unix-console/Makefile 2006-06-28 13:40:44.000000000 -0500 +@@ -15,7 +15,8 @@ INCS = ../common/aiccu.h ../common/hash_ + OBJS = main.o ../common/aiccu.o ../common/hash_md5.o ../common/hash_sha1.o ../common/common.o ../common/heartbeat.o ../common/tic.o ../common/ayiya.o ../common/aiccu_test.o + CWARNS = -pedantic -W -Wall -Wshadow -Wcast-align + #CFLAGS += $(CWARNS) -D_GNU_SOURCE -D_DEBUG -g3 -O0 +-CFLAGS += $(CWARNS) -D_GNU_SOURCE -O3 ++#CFLAGS += $(CWARNS) -D_GNU_SOURCE -O3 ++CFLAGS += $(CWARNS) -D_GNU_SOURCE + CC = gcc + RM = rm + diff --git a/aiccu-chkconfig.patch b/aiccu-chkconfig.patch new file mode 100644 index 0000000..4b616ef --- /dev/null +++ b/aiccu-chkconfig.patch @@ -0,0 +1,11 @@ +--- aiccu.orig/doc/aiccu.init.rpm 2006-06-28 08:24:59.000000000 -0500 ++++ aiccu/doc/aiccu.init.rpm 2006-06-28 08:25:59.000000000 -0500 +@@ -6,7 +6,7 @@ + # description: hearbeat daemon for IPv6-in-IPv4 (Proto-41, AYIYA, Tinc) tunnels + # pidfile: /var/run/aiccu.pid + # config: /etc/aiccu.conf +-# chkconfig: 345 15 85 ++# chkconfig: - 59 73 + # processname: aiccu + + # Source function library. diff --git a/aiccu-no-strip.patch b/aiccu-no-strip.patch new file mode 100644 index 0000000..dd4ace7 --- /dev/null +++ b/aiccu-no-strip.patch @@ -0,0 +1,12 @@ +--- aiccu.orig/unix-console/Makefile 2006-06-28 08:24:59.000000000 -0500 ++++ aiccu/unix-console/Makefile 2006-06-28 08:26:48.000000000 -0500 +@@ -86,9 +86,6 @@ + + aiccu: $(OBJS) ${INCS} + $(CC) $(CFLAGS) -o $@ $(OBJS) $(LDFLAGS); +-ifeq ($(shell echo $(CFLAGS) | grep -c "DEBUG"),0) +- strip $@ +-endif + + clean: + $(RM) -f $(OBJS) aiccu diff --git a/aiccu-reload.patch b/aiccu-reload.patch new file mode 100644 index 0000000..4c4ae41 --- /dev/null +++ b/aiccu-reload.patch @@ -0,0 +1,21 @@ +--- doc/aiccu.init.rpm.orig 2006-04-22 16:09:38.000000000 -0500 ++++ doc/aiccu.init.rpm 2006-04-22 16:10:07.000000000 -0500 +@@ -87,6 +87,9 @@ + restart) + restart + ;; ++ reload) ++ restart ++ ;; + status) + rhstatus + ;; +@@ -94,7 +97,7 @@ + [ -f /var/lock/subsys/aiccu ] && restart || : + ;; + *) +- echo $"Usage: $0 {start|stop|restart|status|condrestart}" ++ echo $"Usage: $0 {start|stop|restart|reload|status|condrestart}" + exit 1 + esac + diff --git a/aiccu.spec b/aiccu.spec new file mode 100644 index 0000000..1437a44 --- /dev/null +++ b/aiccu.spec @@ -0,0 +1,93 @@ +############################################################ +# AICCU - Automatic IPv6 Connectivity Client Utility +# by Jeroen Massar +# (c) Copyright 2003-2005 SixXS +############################################################ +# AICCU RPM Spec File +############################################################ + +Summary: AICCU - SixXS Automatic IPv6 Connectivity Client Utility +Name: aiccu +Version: 2005.01.31 +Release: 4%{?dist} +License: BSDish +Group: System Environment/Daemons +URL: http://www.sixxs.net/tools/aiccu/ +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Source: http://www.sixxs.net/archive/sixxs/aiccu/unix/aiccu_%{version}.tar.gz +Patch1: aiccu-reload.patch +Patch2: aiccu-chkconfig.patch +Patch3: aiccu-no-strip.patch +Patch4: aiccu-cflags.patch +Requires: iproute +Requires(post): chkconfig +Requires(preun): chkconfig, initscripts +Requires(postun): initscripts + +%description +This client automatically gives one IPv6 connectivity +without having to manually configure interfaces etc. +One does need a SixXS account and at least a tunnel. These +can be freely & gratis requested from the SixXS website. +For more information about SixXS check http://www.sixxs.net + +%prep +%setup -q -n %{name} +%patch1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +# fix executable permissions on non-executable content +# so debuginfo can pick them up properly +find . -type f -not -name rules -and -not -name *init* -exec chmod a-x \{\} \; + +%build +make %{?_smp_mflags} RPM_OPT_FLAGS="$RPM_OPT_FLAGS" + +%install +rm -rf $RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT + +%post +if [ "$1" = "1" ]; then + /sbin/chkconfig --add aiccu +fi + +%preun +if [ "$1" = "0" ]; then + /sbin/service aiccu stop >/dev/null 2>&1 + /sbin/chkconfig --del aiccu +fi + +%postun +/sbin/service aiccu condrestart > /dev/null 2>&1 || : + +%clean +make clean +[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root) +%doc doc/README doc/LICENSE +%{_sbindir}/aiccu +# aiccu.conf contains the users's SixXS password, so don't +# make it readable by non-root +%attr(600, root,root) %config(noreplace) %{_sysconfdir}/aiccu.conf +%{_sysconfdir}/init.d/aiccu + +%changelog +* Wed Jun 28 2006 Matt Domsch 2005.01.31-4 +- export CFLAGS properly, fix permissions on files for debuginfo + +* Wed Jun 28 2006 Matt Domsch 2005.01.31-3 +- cleanups per Fedora Extras review + +* Sat Apr 22 2006 Matt Domsch 2005.01.31-2 +- match Fedora Extras spec guidelines +- add postun condrestart +- add reload initscript arg to satisfy rpmlint + +* Sun Aug 29 2004 Jeroen Massar 2004.08.29 +- Beta2 with TIC, 6in4, 6in4-heartbeat and AYIYA support + diff --git a/sources b/sources index e69de29..14b5f16 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +7c3da5feab3d59fb5a99a45203e0ca56 aiccu_2005.01.31.tar.gz