From 1fd9ea2cdc68c494faac972ec1c424dbbfc9519e Mon Sep 17 00:00:00 2001 From: Jeremy Katz Date: Mon, 23 Oct 2006 14:36:24 +0000 Subject: [PATCH 1/6] Initialize branch FC-6 for aiccu --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..d5b6362 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +FC-6 From d49abeec47d330f177c7da3d9a5ac25867c14a9d Mon Sep 17 00:00:00 2001 From: Matt Domsch Date: Mon, 8 Jan 2007 03:19:12 +0000 Subject: [PATCH 2/6] aiccu-reload.patch rolled into upstream --- .cvsignore | 2 +- aiccu-reload.patch | 11 ----------- aiccu.spec | 21 +++++++++++++-------- sources | 2 +- 4 files changed, 15 insertions(+), 21 deletions(-) delete mode 100644 aiccu-reload.patch diff --git a/.cvsignore b/.cvsignore index c8ef622..54dff82 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -aiccu_2006.07.25.tar.gz +aiccu_20070107.tar.gz diff --git a/aiccu-reload.patch b/aiccu-reload.patch deleted file mode 100644 index 17ae30a..0000000 --- a/aiccu-reload.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- aiccu_2006.07.25/doc/aiccu.init.rpm.orig 2006-09-03 15:05:44.000000000 -0500 -+++ aiccu_2006.07.25/doc/aiccu.init.rpm 2006-09-03 15:05:59.000000000 -0500 -@@ -85,6 +85,8 @@ case "$1" in - stop - ;; - restart) -+ restart -+ ;; - reload) - restart - ;; diff --git a/aiccu.spec b/aiccu.spec index 98f77f8..067a4a4 100644 --- a/aiccu.spec +++ b/aiccu.spec @@ -8,15 +8,13 @@ Summary: AICCU - SixXS Automatic IPv6 Connectivity Client Utility Name: aiccu -Version: 2006.07.25 -Release: 2%{?dist} -License: BSDish -Group: System Environment/Daemons +Version: 2007.01.07 +Release: 1%{?dist} +License: BSD +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 -# upstream author acks this patch, will include in a future release -Patch1: aiccu-reload.patch +Source: http://www.sixxs.net/archive/sixxs/aiccu/unix/aiccu_20070107.tar.gz BuildRequires: gnutls-devel Requires: iproute Requires(post): chkconfig @@ -32,7 +30,6 @@ For more information about SixXS check http://www.sixxs.net %prep %setup -q -n %{name} -%patch1 -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 \{\} \; @@ -73,6 +70,14 @@ make clean %{_sysconfdir}/init.d/aiccu %changelog +* Sun Jan 07 2007 Matt Domsch 2007.01.07-1 +- upgrade to latest upstream 2007.01.07 + - license change to BSD 3-clause + - Fixed up silly linux bug, adding LL address to tunnels but not to tun/taps. + - local_ipv4_override option so one can use AICCU behind a NAT that + has been configured correctly to do proto-41 forwarding. This is + usually called a DMZ setup. + * Mon Oct 02 2006 Matt Domsch 2006.07.25-2 - rebuilt diff --git a/sources b/sources index 50c08ea..f4140a2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0df76e92eb34f4ce8aa3cfcf6896f271 aiccu_2006.07.25.tar.gz +60c203fa33cad3db9fba2a871e3d9381 aiccu_20070107.tar.gz From b487d5379ac7c48b6c0548f4d5c0c9050fe17cf8 Mon Sep 17 00:00:00 2001 From: Matt Domsch Date: Sat, 13 Jan 2007 15:10:32 +0000 Subject: [PATCH 3/6] upstream had an incorrect tarball posted originally, updating to new tarball --- aiccu.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/aiccu.spec b/aiccu.spec index 067a4a4..41b5279 100644 --- a/aiccu.spec +++ b/aiccu.spec @@ -9,7 +9,7 @@ Summary: AICCU - SixXS Automatic IPv6 Connectivity Client Utility Name: aiccu Version: 2007.01.07 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD Group: System Environment/Daemons URL: http://www.sixxs.net/tools/aiccu/ @@ -70,6 +70,9 @@ make clean %{_sysconfdir}/init.d/aiccu %changelog +* Sat Jan 13 2007 Matt Domsch 2007.01.07-2 +- upstream respun their release with the same version number to fix AYIYA. + * Sun Jan 07 2007 Matt Domsch 2007.01.07-1 - upgrade to latest upstream 2007.01.07 - license change to BSD 3-clause diff --git a/sources b/sources index f4140a2..bef5c4d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -60c203fa33cad3db9fba2a871e3d9381 aiccu_20070107.tar.gz +67a6d55ef2d6e88a3f17bcb5eec02c61 aiccu_20070107.tar.gz From a06f0cb241e952dcd29bd75748ea4f69e210a842 Mon Sep 17 00:00:00 2001 From: Matt Domsch Date: Wed, 31 Jan 2007 15:59:44 +0000 Subject: [PATCH 4/6] upgrade to latest upstream --- .cvsignore | 2 +- aiccu.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index 54dff82..5d6cc2a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -aiccu_20070107.tar.gz +aiccu_20070115.tar.gz diff --git a/aiccu.spec b/aiccu.spec index 41b5279..78e2a7c 100644 --- a/aiccu.spec +++ b/aiccu.spec @@ -8,13 +8,13 @@ Summary: AICCU - SixXS Automatic IPv6 Connectivity Client Utility Name: aiccu -Version: 2007.01.07 -Release: 2%{?dist} +Version: 2007.01.15 +Release: 1%{?dist} License: BSD 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_20070107.tar.gz +Source: http://www.sixxs.net/archive/sixxs/aiccu/unix/aiccu_20070115.tar.gz BuildRequires: gnutls-devel Requires: iproute Requires(post): chkconfig @@ -70,6 +70,9 @@ make clean %{_sysconfdir}/init.d/aiccu %changelog +* Wed Jan 31 2007 Matt Domsch 2007.01.15-1 +- upgrade to latest upstream + * Sat Jan 13 2007 Matt Domsch 2007.01.07-2 - upstream respun their release with the same version number to fix AYIYA. diff --git a/sources b/sources index bef5c4d..66058a1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -67a6d55ef2d6e88a3f17bcb5eec02c61 aiccu_20070107.tar.gz +c9bcc83644ed788e22a7c3f3d4021350 aiccu_20070115.tar.gz From 3d74bde32bcd4083922911da61882126ecab53ce Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:25:35 +0000 Subject: [PATCH 5/6] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 22b1e54..ef0c3b9 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := aiccu SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From cea452cf141740525bb7536cc5f59886d6972933 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:38:41 +0000 Subject: [PATCH 6/6] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index ef0c3b9..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: aiccu -# $Id$ -NAME := aiccu -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index d5b6362..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -FC-6