summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2009-06-01 22:36:34 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2009-06-01 22:36:34 +0200
commite00bf1d2b054c3f2280c63c23bc682c67a25d1b2 (patch)
tree56940b263839fb66df95cd9a95961544a923410f
parentb44b3799ca9fa6c744fc079b96a9c062e4bdd077 (diff)
remove dhcpv6
- too many issues, use isc dhcp ipv6 support - update BUGS and TODO
-rw-r--r--BUGS2
-rw-r--r--TODO6
-rw-r--r--package/Config.in2
-rw-r--r--package/Makefile1
-rw-r--r--package/dhcpv6/Config.in15
-rw-r--r--package/dhcpv6/Makefile27
-rw-r--r--package/dhcpv6/patches/patch-configure26
-rw-r--r--package/dhcpv6/patches/patch-configure.orig25
-rw-r--r--package/dhcpv6/patches/patch-configure_ac21
-rw-r--r--package/dhcpv6/patches/patch-configure_ac.orig21
-rw-r--r--package/dhcpv6/patches/patch-src_relay6_socket_c48
11 files changed, 2 insertions, 192 deletions
diff --git a/BUGS b/BUGS
index 4ed83a61c..34bd9f135 100644
--- a/BUGS
+++ b/BUGS
@@ -1,7 +1,5 @@
-- lvm package and device-mapper combine and shared
- use kmod-template for external kernel modules
- optimize iptables package (libdirs depending on choosen kernel features)
- checksum for toolchain packages
- network scripts for wireless client / ap
-- x11 support completion
- disable platforms zaurus / qemu etrax
diff --git a/TODO b/TODO
index 3a7df863c..686f1a38e 100644
--- a/TODO
+++ b/TODO
@@ -1,13 +1,11 @@
-- remove $Id$ lines
+- rescue initramfs image (more archs, generic kernel config )
+ - usb boot via stick
- combine lvm2 + devicemapper package
- squid package update
- bind isc 9.6.1
-- CONFIGURE_FILTER for unusual configure scripts, mplayer f.e.
- eglibc support
- check mips -mno-abicalls
- check ac_cv_func_setpgrp_void=no
-- rescue initramfs image (more archs, generic kernel config )
- - usb boot via stick
- kernel 2.6.30
- freebsd build
- win cygwin build
diff --git a/package/Config.in b/package/Config.in
index f21fa822e..24aa8a510 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -203,8 +203,6 @@ menu "IPv6"
depends ADK_IPV6
source "package/6tunnel/Config.in"
source "package/aiccu/Config.in"
-# timeb.h / dn_comp issues
-#source "package/dhcpv6/Config.in"
source "package/miredo/Config.in"
source "package/mrd6/Config.in"
source "package/ndisc/Config.in"
diff --git a/package/Makefile b/package/Makefile
index 22cb18748..968357339 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -64,7 +64,6 @@ package-$(ADK_PACKAGE_DECO) += deco
package-$(ADK_PACKAGE_DEVICE_MAPPER) += device-mapper
package-$(ADK_COMPILE_DHCP) += dhcp
package-$(ADK_PACKAGE_DHCP_FORWARDER) += dhcp-forwarder
-package-$(ADK_COMPILE_DHCPV6) += dhcpv6
package-$(ADK_PACKAGE_DIGITEMP) += digitemp
package-$(ADK_PACKAGE_DNSMASQ) += dnsmasq
package-$(ADK_PACKAGE_DOSFSTOOLS) += dosfstools
diff --git a/package/dhcpv6/Config.in b/package/dhcpv6/Config.in
deleted file mode 100644
index 569320f0c..000000000
--- a/package/dhcpv6/Config.in
+++ /dev/null
@@ -1,15 +0,0 @@
-config ADK_COMPILE_DHCPV6
- depends on ADK_IPV6
- depends ADK_PACKAGE_DHCPV6_SERVER
- tristate
- default n
-
-config ADK_PACKAGE_DHCPV6_SERVER
- prompt "dhcpv6-server........................ IPv6 DHCP server"
- tristate
- default n
- select ADK_COMPILE_DHCPV6
- select ADK_PACKAGE_LIBNCURSES
- select ADK_PACKAGE_LIBNL
- help
- IPv6 DHCP server
diff --git a/package/dhcpv6/Makefile b/package/dhcpv6/Makefile
deleted file mode 100644
index d96af2674..000000000
--- a/package/dhcpv6/Makefile
+++ /dev/null
@@ -1,27 +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 ${TOPDIR}/rules.mk
-
-PKG_NAME:= dhcpv6
-PKG_VERSION:= 1.2.0
-PKG_RELEASE:= 1
-PKG_MD5SUM:= d537416b33002f56912b7f27477d8d35
-PKG_DESCR:= Dynamic Host Configuration Protocol for IPv6 (DHCPv6) server
-PKG_SECTION:= net
-PKG_DEPENDS:= libncurses libnl
-PKG_URL:= https://fedorahosted.org/dhcpv6
-PKG_SITES:= https://fedorahosted.org/releases/d/h/dhcpv6/
-
-include ${TOPDIR}/mk/package.mk
-
-$(eval $(call PKG_template,DHCPV6_SERVER,dhcpv6-server,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-
-CONFIGURE_STYLE:= autoconf gnu
-BUILD_STYLE:= auto
-INSTALL_STYLE:= auto
-
-post-install:
- ${INSTALL_DIR} ${IDIR_DHCP6_SERVER}/usr/sbin
-
-include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/dhcpv6/patches/patch-configure b/package/dhcpv6/patches/patch-configure
deleted file mode 100644
index 2ef218d4a..000000000
--- a/package/dhcpv6/patches/patch-configure
+++ /dev/null
@@ -1,26 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- dhcpv6-1.2.0.orig/configure 2009-04-03 04:45:15.000000000 +0200
-+++ dhcpv6-1.2.0/configure 2009-05-28 23:10:48.955142356 +0200
-@@ -12654,10 +12654,9 @@ done
-
-
-
--
- for ac_header in arpa/inet.h err.h errno.h getopt.h fcntl.h ifaddrs.h \
- libgen.h net/if.h net/if_arp.h netdb.h netinet/in.h \
-- sys/ioctl.h sys/timeb.h syslog.h
-+ sys/ioctl.h syslog.h
- do
- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-@@ -15942,9 +15941,7 @@ fi
-
-
-
--
--
--for ac_func in bzero ftime gettimeofday memset select socket strchr strdup \
-+for ac_func in gettimeofday memset select socket strchr strdup \
- strerror strrchr strstr strtol strtoul
- do
- as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
diff --git a/package/dhcpv6/patches/patch-configure.orig b/package/dhcpv6/patches/patch-configure.orig
deleted file mode 100644
index 8ba5a08ed..000000000
--- a/package/dhcpv6/patches/patch-configure.orig
+++ /dev/null
@@ -1,25 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- dhcpv6-1.2.0.orig/configure 2009-04-03 04:45:15.000000000 +0200
-+++ dhcpv6-1.2.0/configure 2009-05-28 23:09:45.591183981 +0200
-@@ -12654,10 +12654,9 @@ done
-
-
-
--
- for ac_header in arpa/inet.h err.h errno.h getopt.h fcntl.h ifaddrs.h \
- libgen.h net/if.h net/if_arp.h netdb.h netinet/in.h \
-- sys/ioctl.h sys/timeb.h syslog.h
-+ sys/ioctl.h syslog.h
- do
- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-@@ -15943,8 +15942,7 @@ fi
-
-
-
--
--for ac_func in bzero ftime gettimeofday memset select socket strchr strdup \
-+for ac_func in ftime gettimeofday memset select socket strchr strdup \
- strerror strrchr strstr strtol strtoul
- do
- as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
diff --git a/package/dhcpv6/patches/patch-configure_ac b/package/dhcpv6/patches/patch-configure_ac
deleted file mode 100644
index 3ca204c05..000000000
--- a/package/dhcpv6/patches/patch-configure_ac
+++ /dev/null
@@ -1,21 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- dhcpv6-1.2.0.orig/configure.ac 2009-04-03 04:33:56.000000000 +0200
-+++ dhcpv6-1.2.0/configure.ac 2009-05-28 23:10:31.256646671 +0200
-@@ -45,7 +45,7 @@ AC_CHECK_HEADERS([sys/types.h sys/socket
- # Check for headers we must have on the system
- AC_CHECK_HEADERS([arpa/inet.h err.h errno.h getopt.h fcntl.h ifaddrs.h \
- libgen.h net/if.h net/if_arp.h netdb.h netinet/in.h \
-- sys/ioctl.h sys/timeb.h syslog.h],
-+ sys/ioctl.h syslog.h],
- [],
- [AC_MSG_FAILURE([*** Header file $ac_header not found.])],
- [[#ifdef HAVE_SYS_TYPES_H
-@@ -97,7 +97,7 @@ AC_FUNC_REALLOC
- AC_FUNC_SELECT_ARGTYPES
- AC_TYPE_SIGNAL
- AC_FUNC_STAT
--AC_CHECK_FUNCS([bzero ftime gettimeofday memset select socket strchr strdup \
-+AC_CHECK_FUNCS([gettimeofday memset select socket strchr strdup \
- strerror strrchr strstr strtol strtoul],
- [],
- [AC_MSG_FAILURE([*** Required function $ac_func not found.])])
diff --git a/package/dhcpv6/patches/patch-configure_ac.orig b/package/dhcpv6/patches/patch-configure_ac.orig
deleted file mode 100644
index b5ad3d3c8..000000000
--- a/package/dhcpv6/patches/patch-configure_ac.orig
+++ /dev/null
@@ -1,21 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- dhcpv6-1.2.0.orig/configure.ac 2009-04-03 04:33:56.000000000 +0200
-+++ dhcpv6-1.2.0/configure.ac 2009-05-28 23:09:25.701939971 +0200
-@@ -45,7 +45,7 @@ AC_CHECK_HEADERS([sys/types.h sys/socket
- # Check for headers we must have on the system
- AC_CHECK_HEADERS([arpa/inet.h err.h errno.h getopt.h fcntl.h ifaddrs.h \
- libgen.h net/if.h net/if_arp.h netdb.h netinet/in.h \
-- sys/ioctl.h sys/timeb.h syslog.h],
-+ sys/ioctl.h syslog.h],
- [],
- [AC_MSG_FAILURE([*** Header file $ac_header not found.])],
- [[#ifdef HAVE_SYS_TYPES_H
-@@ -97,7 +97,7 @@ AC_FUNC_REALLOC
- AC_FUNC_SELECT_ARGTYPES
- AC_TYPE_SIGNAL
- AC_FUNC_STAT
--AC_CHECK_FUNCS([bzero ftime gettimeofday memset select socket strchr strdup \
-+AC_CHECK_FUNCS([ftime gettimeofday memset select socket strchr strdup \
- strerror strrchr strstr strtol strtoul],
- [],
- [AC_MSG_FAILURE([*** Required function $ac_func not found.])])
diff --git a/package/dhcpv6/patches/patch-src_relay6_socket_c b/package/dhcpv6/patches/patch-src_relay6_socket_c
deleted file mode 100644
index c5f37d926..000000000
--- a/package/dhcpv6/patches/patch-src_relay6_socket_c
+++ /dev/null
@@ -1,48 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- dhcpv6-1.2.0.orig/src/relay6_socket.c 2009-04-03 00:53:38.000000000 +0200
-+++ dhcpv6-1.2.0/src/relay6_socket.c 2009-05-28 23:09:11.155499136 +0200
-@@ -399,7 +399,7 @@ int send_message() {
- if (mesg->sent == 1)
- return 0;
-
-- bzero((char *) &sin6, sizeof(struct sockaddr_in6));
-+ memset((char *) &sin6, 0, sizeof(struct sockaddr_in6));
- sin6.sin6_family = AF_INET6;
- sin6.sin6_flowinfo = 0;
- sin6.sin6_scope_id = 0;
-@@ -494,7 +494,7 @@ int send_message() {
- if (mesg->msg_type == DH6_RELAY_FORW) {
- for (ipv6uni = IPv6_uniaddr_list.next; ipv6uni != &IPv6_uniaddr_list;
- ipv6uni = ipv6uni->next) {
-- bzero((char *) &sin6, sizeof(struct sockaddr_in6));
-+ memset((char *) &sin6, 0, sizeof(struct sockaddr_in6));
- sin6.sin6_family = AF_INET6;
-
- memset(dest_addr, 0, INET6_ADDRSTRLEN);
-@@ -564,7 +564,7 @@ int send_message() {
- iface = iface->next) {
- uservers = iface->sname;
- while (uservers != NULL) {
-- bzero((char *) &sin6, sizeof(struct sockaddr_in6));
-+ memset((char *) &sin6, 0, sizeof(struct sockaddr_in6));
- sin6.sin6_family = AF_INET6;
-
- memset(dest_addr, 0, INET6_ADDRSTRLEN);
-@@ -644,7 +644,7 @@ int send_message() {
-
- for (si = sifaces_list.next; si != &sifaces_list; si = si->next) {
- *(mesg->hc_pointer) = MAXHOPCOUNT;
-- bzero((char *) &sin6, sizeof(struct sockaddr_in6));
-+ memset((char *) &sin6, 0, sizeof(struct sockaddr_in6));
- sin6.sin6_family = AF_INET6;
-
- memset(dest_addr, 0, INET6_ADDRSTRLEN);
-@@ -734,7 +734,7 @@ int send_message() {
- continue;
-
- *(mesg->hc_pointer) = MAXHOPCOUNT;
-- bzero((char *) &sin6, sizeof(struct sockaddr_in6));
-+ memset((char *) &sin6, 0, sizeof(struct sockaddr_in6));
- sin6.sin6_family = AF_INET6;
-
- memset(dest_addr, 0, INET6_ADDRSTRLEN);