summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2017-09-17 12:27:57 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2017-09-17 12:27:57 +0200
commit67785120a503ac636631a798d1cda127e4386d2d (patch)
tree46900f5d06a103a9e969460ac1af458a01fcc8db
parent95444b27abfb723db6c66c08dc6c12c7e1128e2e (diff)
aiccu: remove, sixxs service is no longer available
-rw-r--r--package/aiccu/Makefile39
-rw-r--r--package/aiccu/files/aiccu.conffiles1
-rw-r--r--package/aiccu/files/aiccu.init29
-rw-r--r--package/aiccu/files/aiccu.postinst3
-rw-r--r--package/aiccu/patches/patch-common_common_h12
-rw-r--r--package/aiccu/patches/patch-common_resolver_c30
-rw-r--r--package/aiccu/patches/patch-unix-console_Makefile193
-rw-r--r--package/aiccu/src/common/dn_skipname.c51
8 files changed, 0 insertions, 358 deletions
diff --git a/package/aiccu/Makefile b/package/aiccu/Makefile
deleted file mode 100644
index 7585d093d..000000000
--- a/package/aiccu/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-include $(ADK_TOPDIR)/rules.mk
-
-PKG_NAME:= aiccu
-PKG_VERSION:= 20070115
-PKG_RELEASE:= 11
-PKG_HASH:= 2260f426c13471169ccff8cb4a3908dc5f79fda18ddb6a55363e7824e6c4c760
-PKG_DESCR:= sixxs automatic ipv6 connectivity client utility
-PKG_SECTION:= net/ipv6
-PKG_KDEPENDS:= tun
-PKG_NEEDS:= threads
-PKG_URL:= http://www.sixxs.net/
-PKG_SITES:= http://www.sixxs.net/archive/sixxs/aiccu/unix/
-
-PKG_LIBC_DEPENDS:= uclibc-ng glibc
-
-DISTFILES:= $(PKG_NAME)_$(PKG_VERSION).tar.gz
-WRKDIST= ${WRKDIR}/$(PKG_NAME)
-
-include $(ADK_TOPDIR)/mk/package.mk
-
-$(eval $(call PKG_template,AICCU,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-
-CONFIG_STYLE:= manual
-INSTALL_STYLE:= manual
-
-TARGET_CPPFLAGS+= -D_REENTRANT -D_GNU_SOURCE -DAICCU_CONSOLE \
- -D_LINUX -DHAS_IFHEAD -DAICCU_TYPE=\"linux\"
-TARGET_LDFLAGS+= -pthread -lresolv
-MAKE_FLAGS+= CC='${TARGET_CC}' CFLAGS='${TARGET_CFLAGS}' LDFLAGS='${TARGET_LDFLAGS}'
-
-do-install:
- $(INSTALL_DIR) $(IDIR_AICCU)/usr/sbin $(IDIR_AICCU)/etc
- $(INSTALL_BIN) $(WRKBUILD)/unix-console/aiccu $(IDIR_AICCU)/usr/sbin/
- $(INSTALL_DATA) $(WRKBUILD)/doc/aiccu.conf $(IDIR_AICCU)/etc/aiccu.conf
-
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/aiccu/files/aiccu.conffiles b/package/aiccu/files/aiccu.conffiles
deleted file mode 100644
index 79c42f998..000000000
--- a/package/aiccu/files/aiccu.conffiles
+++ /dev/null
@@ -1 +0,0 @@
-/etc/aiccu.conf
diff --git a/package/aiccu/files/aiccu.init b/package/aiccu/files/aiccu.init
deleted file mode 100644
index c3d3d5b4b..000000000
--- a/package/aiccu/files/aiccu.init
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-#PKG aiccu
-#INIT 60
-. /etc/rc.conf
-
-case $1 in
-autostop) ;;
-autostart)
- test x"${aiccu:-NO}" = x"NO" && exit 0
- test x"$aiccu" = x"DAEMON" && test -x /bin/mksh && exec mksh -T- $0 start
- exec sh $0 start
- ;;
-start)
- aiccu start
- ;;
-stop)
- aiccu stop
- ;;
-
-restart)
- sh $0 stop
- sh $0 start
- ;;
-*)
- echo "Usage: $0 {start | stop | restart}"
- exit 1
- ;;
-esac
-exit $?
diff --git a/package/aiccu/files/aiccu.postinst b/package/aiccu/files/aiccu.postinst
deleted file mode 100644
index 3c63b535e..000000000
--- a/package/aiccu/files/aiccu.postinst
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf aiccu NO
diff --git a/package/aiccu/patches/patch-common_common_h b/package/aiccu/patches/patch-common_common_h
deleted file mode 100644
index 42cd7b5a2..000000000
--- a/package/aiccu/patches/patch-common_common_h
+++ /dev/null
@@ -1,12 +0,0 @@
---- aiccu.orig/common/common.h 2007-01-11 15:50:51.000000000 +0100
-+++ aiccu/common/common.h 2014-03-16 21:47:28.000000000 +0100
-@@ -91,7 +91,9 @@
- #include <sys/select.h>
-
- #include <net/if.h>
-+#ifdef __GLIBC__
- #include <netinet/if_ether.h>
-+#endif
- #ifdef linux
- #include <netpacket/packet.h>
- #include <linux/if_tun.h>
diff --git a/package/aiccu/patches/patch-common_resolver_c b/package/aiccu/patches/patch-common_resolver_c
deleted file mode 100644
index b0ec0d99c..000000000
--- a/package/aiccu/patches/patch-common_resolver_c
+++ /dev/null
@@ -1,30 +0,0 @@
-$Id$
---- aiccu.orig/common/resolver.c Sun Jul 23 14:54:51 2006
-+++ aiccu/common/resolver.c Mon Jun 25 13:18:22 2007
-@@ -26,7 +26,7 @@
-
- int getrrs(const char *label, int rrtype, void gotrec(unsigned int num, int type, const char *record))
- {
--#ifdef _LINUX
-+#if defined(_LINUX) && !defined(__UCLIBC__)
- struct __res_state res;
- #endif
- unsigned char answer[8192];
-@@ -38,7 +38,7 @@ int getrrs(const char *label, int rrtype
- uint16_t type = 0, class = 0;
- uint32_t ttl = 0;
-
--#ifdef _LINUX
-+#if defined(_LINUX) && !defined(__UCLIBC__)
- memset(&res, 0, sizeof(res));
- res.options = RES_DEBUG;
- res_ninit(&res);
-@@ -47,7 +47,7 @@ int getrrs(const char *label, int rrtype
- #endif
-
- memset(answer, 0, sizeof(answer));
--#ifdef _LINUX
-+#if defined(_LINUX) && !defined(__UCLIBC__)
- ret = res_nquery(&res, label, C_IN, rrtype, answer, sizeof(answer));
- #else
- ret = res_query(label, C_IN, rrtype, answer, sizeof(answer));
diff --git a/package/aiccu/patches/patch-unix-console_Makefile b/package/aiccu/patches/patch-unix-console_Makefile
deleted file mode 100644
index c3e508121..000000000
--- a/package/aiccu/patches/patch-unix-console_Makefile
+++ /dev/null
@@ -1,193 +0,0 @@
-$Id$
---- aiccu.orig/unix-console/Makefile 2007-01-15 12:04:27.000000000 +0100
-+++ aiccu/unix-console/Makefile 2010-06-17 10:59:40.000000000 +0200
-@@ -10,9 +10,9 @@
- # $Date: 2007-01-15 11:04:27 $
- # **********************************************************/
-
--SRCS = main.c ../common/tun.c ../common/aiccu.c ../common/hash_md5.c ../common/hash_sha1.c ../common/common.c ../common/heartbeat.c ../common/tic.c ../common/ayiya.c ../common/aiccu_test.c ../common/resolver.c
-+SRCS = main.c ../common/tun.c ../common/aiccu.c ../common/hash_md5.c ../common/hash_sha1.c ../common/common.c ../common/heartbeat.c ../common/tic.c ../common/ayiya.c ../common/aiccu_test.c ../common/resolver.c ../common/dn_skipname.c
- INCS = ../common/tun.h ../common/aiccu.h ../common/hash_md5.h ../common/hash_sha1.h ../common/common.h ../common/heartbeat.h ../common/tic.h ../common/ayiya.h ../common/resolver.h
--OBJS = main.o ../common/tun.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 ../common/resolver.o
-+OBJS = main.o ../common/tun.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 ../common/resolver.o ../common/dn_skipname.o
-
- # New features not fully implemented and thus disabled for now
- #CFLAGS += -D NEWSTUFF_TSP -D NEWSTUFF_TEEPEE
-@@ -46,110 +46,103 @@ LDFLAGS += -lgnutls
- endif
-
- # Linux
--ifeq ($(shell uname | grep -c "Linux"),1)
- CFLAGS += -D_LINUX -D HAS_IFHEAD -D AICCU_TYPE="\"linux\""
- SRCS += ../common/aiccu_linux.c
- OBJS += ../common/aiccu_linux.o
--LDFLAGS += -lpthread -lresolv
--endif
-+LDFLAGS += -pthread -lresolv
-
- # FreeBSD
--ifeq ($(shell uname | grep -c "FreeBSD"),1)
--CFLAGS += -D_FREEBSD
-+#ifeq ($(shell uname | grep -c "FreeBSD"),1)
-+#CFLAGS += -D_FREEBSD
-
- # FreeBSD 4.x
--ifeq ($(shell uname -r | cut -c 1),4)
--CFLAGS += -D AICCU_TYPE="\"freebsd4\""
--SRCS += ../common/aiccu_freebsd4.c
--OBJS += ../common/aiccu_freebsd4.o
--else
-+#ifeq ($(shell uname -r | cut -c 1),4)
-+#CFLAGS += -D AICCU_TYPE="\"freebsd4\""
-+#SRCS += ../common/aiccu_freebsd4.c
-+#OBJS += ../common/aiccu_freebsd4.o
-+#else
- # FreeBSD 5.x/6.x/7.x
--CFLAGS += -D NEED_IFHEAD -D AICCU_TYPE="\"kame\""
--SRCS += ../common/aiccu_kame.c
--OBJS += ../common/aiccu_kame.o
--endif
--endif
-+#CFLAGS += -D NEED_IFHEAD -D AICCU_TYPE="\"kame\""
-+#SRCS += ../common/aiccu_kame.c
-+#OBJS += ../common/aiccu_kame.o
-+#endif
-+#endif
-
- # DragonFlyBSD
--ifeq ($(shell uname | grep -c "DragonFly"),1)
--CFLAGS += -D_DFBSD -D NEED_IFHEAD -D AICCU_TYPE="\"dragonfly\""
--SRCS += ../common/aiccu_freebsd4.c
--OBJS += ../common/aiccu_freebsd4.o
--CFLAGS += -pthread
--endif
-+#ifeq ($(shell uname | grep -c "DragonFly"),1)
-+#CFLAGS += -D_DFBSD -D NEED_IFHEAD -D AICCU_TYPE="\"dragonfly\""
-+#SRCS += ../common/aiccu_freebsd4.c
-+#OBJS += ../common/aiccu_freebsd4.o
-+#CFLAGS += -pthread
-+#endif
-
- # NetBSD
--ifeq ($(shell uname | grep -c "NetBSD"),1)
--CFLAGS += -D_NETBSD -D AICCU_TYPE="\"kame\""
--
-+#ifeq ($(shell uname | grep -c "NetBSD"),1)
-+#CFLAGS += -D_NETBSD -D AICCU_TYPE="\"kame\""
-+#
- # Check if net/if_tun.h has TUNSIFHEAD and enable support for it
--ifneq ($(shell grep -c TUNSIFHEAD /usr/include/net/if_tun.h 2>/dev/null),1)
-+#ifneq ($(shell grep -c TUNSIFHEAD /usr/include/net/if_tun.h 2>/dev/null),1)
- # Supports TUNSIFHEAD -> AYIYA/l2tp available
--CFLAGS += -D NEED_IFHEAD
--else
-+#CFLAGS += -D NEED_IFHEAD
-+#else
- # Doesn't support TUNSIFHEAD -> No AYIYA/l2tp available
--CFLAGS += -D NO_IFHEAD
--endif
-+#CFLAGS += -D NO_IFHEAD
-+#endif
-
--SRCS += ../common/aiccu_kame.c
--OBJS += ../common/aiccu_kame.o
--CFLAGS += -pthread -D_NETBSD_SOURCE
--endif
-+#SRCS += ../common/aiccu_kame.c
-+#OBJS += ../common/aiccu_kame.o
-+#CFLAGS += -pthread -D_NETBSD_SOURCE
-+#endif
-
- # OpenBSD
--ifeq ($(shell uname | grep -c "OpenBSD"),1)
--CFLAGS += -D_OPENBSD -D HAS_IFHEAD
--# 2.7-2.9
--ifeq ($(shell uname -r | cut -c 1),2)
--CFLAGS += -D AICCU_TYPE="\"openbsd2\""
--SRCS += ../common/aiccu_openbsd2.c
--OBJS += ../common/aiccu_openbsd2.o
--else
--# 3.x-4.x etc
--CFLAGS += -D AICCU_TYPE="\"openbsd\""
--SRCS += ../common/aiccu_openbsd.c
--OBJS += ../common/aiccu_openbsd.o
--endif
--CFLAGS += -pthread
--endif
-+#ifeq ($(shell uname | grep -c "OpenBSD"),1)
-+#CFLAGS += -D_OPENBSD -D HAS_IFHEAD
-+## 2.7-2.9
-+#ifeq ($(shell uname -r | cut -c 1),2)
-+#CFLAGS += -D AICCU_TYPE="\"openbsd2\""
-+#SRCS += ../common/aiccu_openbsd2.c
-+#OBJS += ../common/aiccu_openbsd2.o
-+#else
-+## 3.x-4.x etc
-+#CFLAGS += -D AICCU_TYPE="\"openbsd\""
-+#SRCS += ../common/aiccu_openbsd.c
-+#OBJS += ../common/aiccu_openbsd.o
-+#endif
-+#CFLAGS += -pthread
-+#endif
-
- # Darwin
--ifeq ($(shell uname | grep -c "Darwin"),1)
--CFLAGS += -D_DARWIN -D NEED_IFHEAD -D AICCU_TYPE="\"darwin\""
--SRCS += ../common/aiccu_darwin.c
--OBJS += ../common/aiccu_darwin.o
--LDFLAGS += -lresolv
--endif
-+#ifeq ($(shell uname | grep -c "Darwin"),1)
-+#CFLAGS += -D_DARWIN -D NEED_IFHEAD -D AICCU_TYPE="\"darwin\""
-+#SRCS += ../common/aiccu_darwin.c
-+#OBJS += ../common/aiccu_darwin.o
-+#LDFLAGS += -lresolv
-+#endif
-
- # SunOS / Solaris
--ifeq ($(shell uname | grep -c "SunOS"),1)
--CFLAGS += -D_SUNOS -D AICCU_TYPE="\"sunos\""
--SRCS += ../common/aiccu_sunos.c
--OBJS += ../common/aiccu_sunos.o
--LDFLAGS += -lsocket -lnsl -lresolv
--endif
-+#ifeq ($(shell uname | grep -c "SunOS"),1)
-+#CFLAGS += -D_SUNOS -D AICCU_TYPE="\"sunos\""
-+#SRCS += ../common/aiccu_sunos.c
-+#OBJS += ../common/aiccu_sunos.o
-+#LDFLAGS += -lsocket -lnsl -lresolv
-+#endif
-
- # AIX
--ifeq ($(shell uname | grep -c "AIX"),1)
--CC = @/usr/vac/bin/xlc_r
--CFLAGS = -qthreaded -q64 -qlanglvl=stdc99 -bmaxdata:0xD0000000 -D_64BIT -g -qdbxextra -qfullpath -qheapdebug -qformat=all -qcheck=all
--CFLAGS += -D AICCU_CONSOLE
--CFLAGS += -D_AIX -D AICCU_TYPE="\"aix\""
--SRCS += ../common/aiccu_aix.c
--OBJS += ../common/aiccu_aix.o
--LDFLAGS += -lpthread
--endif
-+#ifeq ($(shell uname | grep -c "AIX"),1)
-+#CC = @/usr/vac/bin/xlc_r
-+#CFLAGS = -qthreaded -q64 -qlanglvl=stdc99 -bmaxdata:0xD0000000 -D_64BIT -g -qdbxextra -qfullpath -qheapdebug -qformat=all -qcheck=all
-+#CFLAGS += -D AICCU_CONSOLE
-+#CFLAGS += -D_AIX -D AICCU_TYPE="\"aix\""
-+#SRCS += ../common/aiccu_aix.c
-+#OBJS += ../common/aiccu_aix.o
-+#LDFLAGS += -lpthread
-+#endif
-
-
- all: aiccu
-
- aiccu: $(OBJS) ${SRCS} ${INCS}
- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS)
--ifeq ($(shell echo $(CFLAGS) | grep -c "DEBUG"),0)
--ifeq ($(shell echo "$(RPM_OPT_FLAGS)" | wc -c),1)
-- strip $@
--endif
--endif
-
- clean:
- $(RM) -f $(OBJS) aiccu
diff --git a/package/aiccu/src/common/dn_skipname.c b/package/aiccu/src/common/dn_skipname.c
deleted file mode 100644
index 3b4a756b9..000000000
--- a/package/aiccu/src/common/dn_skipname.c
+++ /dev/null
@@ -1,51 +0,0 @@
-#include <errno.h>
-#include <resolv.h>
-
-/* Ripped from glibc 2.4 sources. */
-
-/*
- * ns_name_skip(ptrptr, eom)
- * Advance *ptrptr to skip over the compressed name it points at.
- * return:
- * 0 on success, -1 (with errno set) on failure.
- */
-int ns_name_skip(const unsigned char **ptrptr, const unsigned char *eom)
-{
- const unsigned char *cp;
- unsigned int n;
-
- cp = *ptrptr;
- while (cp < eom && (n = *cp++) != 0)
- {
- /* Check for indirection. */
- switch (n & NS_CMPRSFLGS) {
- case 0: /* normal case, n == len */
- cp += n;
- continue;
- case NS_CMPRSFLGS: /* indirection */
- cp++;
- break;
- default: /* illegal type */
- errno = EMSGSIZE;
- return (-1);
- }
- break;
- }
- if (cp > eom)
- {
- errno = EMSGSIZE;
- return (-1);
- }
- *ptrptr = cp;
- return (0);
-}
-
-int dn_skipname(const unsigned char *ptr, const unsigned char *eom)
-{
- const unsigned char *saveptr = ptr;
-
- if(ns_name_skip(&ptr, eom) == -1)
- return (-1);
- return (ptr - saveptr);
-}
-