aiccu: delete package

PATCH New Alexander Mukhin 4 participants 8 messages Sep 9, 2017 – Sep 11, 2017

lore

Share & tools

lore

Alexander Mukhin

author

2017-09-09 09:25 UTC #0 lore raw

PATCH 1/1 aiccu: delete package

As SixXS project has ceased its operation on 2017-06-06, consider removing aiccu package.

---
 DEVELOPERS                                         |  1 -
 package/Config.in                                  |  1 -
 package/aiccu/0001-gnutls.patch                    | 73 ----------------------
 .../0002-makefile-reorder-linked-libraries.patch   | 15 -----
 package/aiccu/0003-if-ether-header.patch           | 23 -------
 package/aiccu/0005-res-ninit.patch                 | 33 ----------
 package/aiccu/Config.in                            | 25 --------
 package/aiccu/aiccu.hash                           |  2 -
 package/aiccu/aiccu.mk                             | 40 ------------
 9 files changed, 213 deletions(-)
 delete mode 100644 package/aiccu/0001-gnutls.patch
 delete mode 100644 package/aiccu/0002-makefile-reorder-linked-libraries.patch
 delete mode 100644 package/aiccu/0003-if-ether-header.patch
 delete mode 100644 package/aiccu/0005-res-ninit.patch
 delete mode 100644 package/aiccu/Config.in
 delete mode 100644 package/aiccu/aiccu.hash
 delete mode 100644 package/aiccu/aiccu.mk

DEVELOPERS +0 -1

index 79e7202a8..26634992c 100644
@@ -1236,7 +1236,6 @@ N:	Maxime Ripard <[email protected]>
 F:	package/kmsxx/
 
 N:	Michael Rommel <[email protected]>
-F:	package/aiccu/
 F:	package/knock/
 F:	package/python-crc16/
 F:	package/python-pyzmq/

package/Config.in +0 -1

index d926f7e02..7a277d75c 100644
@@ -1562,7 +1562,6 @@ menu "Miscellaneous"
 endmenu
 
 menu "Networking applications"
-	source "package/aiccu/Config.in"
 	source "package/aircrack-ng/Config.in"
 	source "package/apache/Config.in"
 	source "package/argus/Config.in"

package/aiccu/0001-gnutls.patch deleted +0 ~~-73~~

73 lines not on this page · raw message

package/aiccu/0002-makefile-reorder-linked-libraries.patch deleted +0 ~~-15~~

deleted file mode 100644
index 22f04a91a..000000000
@@ -1,15 +0,0 @@
-Makefile: change LDFLAGS order on the compile line for --static
-
-Signed-off-by: Michael Rommel <[email protected]>
-
---- aiccu_20070115.orig/unix-console/Makefile	2007-01-15 12:04:27.000000000 +0100
-+++ aiccu_20070115/unix-console/Makefile	2013-09-29 22:54:42.742963861 +0200
-@@ -144,7 +144,7 @@ endif
- all: aiccu
- 
- aiccu:	$(OBJS) ${SRCS} ${INCS}
--	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS)
-+	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LDFLAGS)
- ifeq ($(shell echo $(CFLAGS) | grep -c "DEBUG"),0)
- ifeq ($(shell echo "$(RPM_OPT_FLAGS)" | wc -c),1)
- 	strip $@

package/aiccu/0003-if-ether-header.patch deleted +0 ~~-23~~

deleted file mode 100644
index 48e8ceb6b..000000000
@@ -1,23 +0,0 @@
-musl does not allow using <netinet/*> together with <linux/*> headers.
-Since there are both netinet/if_ether.h and linux/if_ether.h providing
-the same definitions, use linux/if_ether.h whenever other linux/*
-headers are included.
-
-Signed-off-by: Alex Suykov <[email protected]>
-
---- aiccu/common/common.h
-+++ aiccu/common/common.h
-@@ -91,11 +91,12 @@
- 	#include <sys/select.h>
- 
- 	#include <net/if.h>
--	#include <netinet/if_ether.h>
- #ifdef linux
- 	#include <netpacket/packet.h>
-+	#include <linux/if_ether.h>
- 	#include <linux/if_tun.h>
- #else
-+	#include <netinet/if_ether.h>
- #ifdef _DFBSD
- 	#include <net/tun/if_tun.h>
- #else

package/aiccu/0005-res-ninit.patch deleted +0 ~~-33~~

deleted file mode 100644
index faf38df08..000000000
@@ -1,33 +0,0 @@
-res_ninit is available in glibc but not in uclibc or musl.
-
-Signed-off-by: Alex Suykov <[email protected]>
-
---- aiccu/common/resolver.c
-+++ aiccu/common/resolver.c
-@@ -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(__GLIBC__) && !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(__GLIBC__) && !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(__GLIBC__) && !defined(__UCLIBC__)
- 	ret = res_nquery(&res, label, C_IN, rrtype, answer, sizeof(answer));
- #else
- 	ret = res_query(label, C_IN, rrtype, answer, sizeof(answer));

package/aiccu/Config.in deleted +0 ~~-25~~

deleted file mode 100644
index a2d610017..000000000
@@ -1,25 +0,0 @@
-config BR2_PACKAGE_AICCU
-	bool "aiccu"
-	depends on !BR2_STATIC_LIBS # gnutls
-	depends on BR2_USE_WCHAR
-	depends on BR2_TOOLCHAIN_HAS_THREADS
-	depends on BR2_USE_MMU # fork()
-	select BR2_PACKAGE_GNUTLS
-	help
-	  SixXS Automatic IPv6 Connectivity Client Utility
-
-	  AICCU (Automatic IPv6 Connectivity Client Utility) makes it
-	  easy for users to get IPv6 connectivity. After having
-	  requested an account, tunnel and optionally a subnet, AICCU
-	  can be used to automatically configure the tunnel. AICCU
-	  supports TIC (Tunnel Information & Control protocol), which it
-	  uses for retrieving the tunnel configuration information,
-	  AYIYA, which allows tunnels to be created even behind
-	  firewalls and NAT's.
-
-	  http://www.sixxs.net/tools/aiccu/
-
-comment "aiccu needs a toolchain w/ wchar, threads, dynamic library"
-	depends on BR2_USE_MMU
-	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS \
-		|| BR2_STATIC_LIBS

package/aiccu/aiccu.hash deleted +0 -2

deleted file mode 100644
index 26c4081fe..000000000
@@ -1,2 +0,0 @@
-# From https://www.sixxs.net/archive/sixxs/aiccu/unix/
-md5	c9bcc83644ed788e22a7c3f3d4021350  aiccu_20070115.tar.gz

package/aiccu/aiccu.mk deleted +0 ~~-40~~

deleted file mode 100644
index 60d65dd01..000000000
@@ -1,40 +0,0 @@
-################################################################################
-#
-# aiccu
-#
-################################################################################
-
-AICCU_VERSION = 20070115
-AICCU_SOURCE = aiccu_$(AICCU_VERSION).tar.gz
-AICCU_SITE = http://www.sixxs.net/archive/sixxs/aiccu/unix
-AICCU_LICENSE = SixXS License, concise redistribution license
-AICCU_LICENSE_FILES = doc/LICENSE
-AICCU_DEPENDENCIES = gnutls
-
-AICCU_LFDLAGS = $(TARGET_LDFLAGS)
-
-# aiccu forgets to link with gnutls' dependencies breaking the build when
-# linking statically
-ifeq ($(BR2_STATIC_LIBS),y)
-AICCU_LDFLAGS += `$(PKG_CONFIG_HOST_BINARY) --libs gnutls`
-endif
-
-# dummy RPM_OPT_FLAGS to disable stripping
-define AICCU_BUILD_CMDS
-	$(TARGET_CONFIGURE_OPTS) LDFLAGS="$(AICCU_LDFLAGS)" $(MAKE) \
-		CC="$(TARGET_CC)" RPM_OPT_FLAGS=1 -C $(@D)/unix-console all
-endef
-
-define AICCU_INSTALL_TARGET_CMDS
-	$(INSTALL) -D -m 0755 $(@D)/unix-console/aiccu \
-		$(TARGET_DIR)/usr/sbin/aiccu
-	$(INSTALL) -D -m 0644 $(@D)/doc/aiccu.conf \
-		$(TARGET_DIR)/etc/aiccu.conf
-endef
-
-define AICCU_INSTALL_INIT_SYSV
-	$(INSTALL) -D -m 0755 $(@D)/doc/aiccu.init \
-		$(TARGET_DIR)/etc/init.d/S50aiccu
-endef
-
-$(eval $(generic-package))

Signature · 1 line

2.11.0

Alexander Mukhin

author

2017-09-09 10:09 UTC #1 lore raw

PATCH 1/1 aiccu: delete package

(Forgot to sign the patch, sorry.)

As SixXS project has ceased its operation on 2017-06-06, consider removing aiccu package.

Signed-off-by Alexander Mukhin <[email protected]>

---

DEVELOPERS                                         |  1 -
package/Config.in                                  |  1 -
package/aiccu/0001-gnutls.patch                    | 73 ----------------------
.../0002-makefile-reorder-linked-libraries.patch   | 15 -----
package/aiccu/0003-if-ether-header.patch           | 23 -------
package/aiccu/0005-res-ninit.patch                 | 33 ----------
package/aiccu/Config.in                            | 25 --------
package/aiccu/aiccu.hash                           |  2 -
package/aiccu/aiccu.mk                             | 40 ------------
9 files changed, 213 deletions(-)

delete mode 100644 package/aiccu/0001-gnutls.patch
delete mode 100644 package/aiccu/0002-makefile-reorder-linked-libraries.patch delete mode 100644 package/aiccu/0003-if-ether-header.patch delete mode 100644 package/aiccu/0005-res-ninit.patch
delete mode 100644 package/aiccu/Config.in
delete mode 100644 package/aiccu/aiccu.hash
delete mode 100644 package/aiccu/aiccu.mk

DEVELOPERS +0 -0

index 79e7202a8..26634992c 100644
@@ -1236,7 +1236,6 @@ N:    Maxime Ripard <[email protected]>

F: package/kmsxx/

N: Michael Rommel <[email protected]>
-F: package/aiccu/

F:    package/knock/
F:    package/python-crc16/
F:    package/python-pyzmq/

package/Config.in +0 -0

index d926f7e02..7a277d75c 100644
@@ -1562,7 +1562,6 @@ menu "Miscellaneous"

endmenu

menu "Networking applications"
- source "package/aiccu/Config.in"
source "package/aircrack-ng/Config.in"
source "package/apache/Config.in"
source "package/argus/Config.in"

package/aiccu/0001-gnutls.patch deleted +0 ~~-73~~

73 lines not on this page · raw message

package/aiccu/0002-makefile-reorder-linked-libraries.patch deleted +0 ~~-15~~

deleted file mode 100644
index 22f04a91a..000000000
@@ -1,15 +0,0 @@
-Makefile: change LDFLAGS order on the compile line for --static
-
-Signed-off-by: Michael Rommel <[email protected]>
-
---- aiccu_20070115.orig/unix-console/Makefile    2007-01-15 12:04:27.000000000 +0100
-+++ aiccu_20070115/unix-console/Makefile    2013-09-29 22:54:42.742963861 +0200
-@@ -144,7 +144,7 @@ endif
- all: aiccu
- 
- aiccu:    $(OBJS) ${SRCS} ${INCS}
--    $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS)
-+    $(CC) $(CFLAGS) -o $@ $(OBJS) $(LDFLAGS)
- ifeq ($(shell echo $(CFLAGS) | grep -c "DEBUG"),0)
- ifeq ($(shell echo "$(RPM_OPT_FLAGS)" | wc -c),1)
-    strip $@

package/aiccu/0003-if-ether-header.patch deleted +0 ~~-23~~

deleted file mode 100644
index 48e8ceb6b..000000000
@@ -1,23 +0,0 @@
-musl does not allow using <netinet/*> together with <linux/*> headers.
-Since there are both netinet/if_ether.h and linux/if_ether.h providing
-the same definitions, use linux/if_ether.h whenever other linux/*
-headers are included.
-
-Signed-off-by: Alex Suykov <[email protected]>
-
---- aiccu/common/common.h
-+++ aiccu/common/common.h
-@@ -91,11 +91,12 @@
-    #include <sys/select.h>
- 
-    #include <net/if.h>
--    #include <netinet/if_ether.h>
- #ifdef linux
-    #include <netpacket/packet.h>
-+    #include <linux/if_ether.h>
-    #include <linux/if_tun.h>
- #else
-+    #include <netinet/if_ether.h>
- #ifdef _DFBSD
-    #include <net/tun/if_tun.h>
- #else

package/aiccu/0005-res-ninit.patch deleted +0 ~~-33~~

deleted file mode 100644
index faf38df08..000000000
@@ -1,33 +0,0 @@
-res_ninit is available in glibc but not in uclibc or musl.
-
-Signed-off-by: Alex Suykov <[email protected]>
-
---- aiccu/common/resolver.c
-+++ aiccu/common/resolver.c
-@@ -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(__GLIBC__) && !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(__GLIBC__) && !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(__GLIBC__) && !defined(__UCLIBC__)
-    ret = res_nquery(&res, label, C_IN, rrtype, answer, sizeof(answer));
- #else
-    ret = res_query(label, C_IN, rrtype, answer, sizeof(answer));

package/aiccu/Config.in deleted +0 ~~-25~~

deleted file mode 100644
index a2d610017..000000000
@@ -1,25 +0,0 @@
-config BR2_PACKAGE_AICCU
-    bool "aiccu"
-    depends on !BR2_STATIC_LIBS # gnutls
-    depends on BR2_USE_WCHAR
-    depends on BR2_TOOLCHAIN_HAS_THREADS
-    depends on BR2_USE_MMU # fork()
-    select BR2_PACKAGE_GNUTLS
-    help
-      SixXS Automatic IPv6 Connectivity Client Utility
-
-      AICCU (Automatic IPv6 Connectivity Client Utility) makes it
-      easy for users to get IPv6 connectivity. After having
-      requested an account, tunnel and optionally a subnet, AICCU
-      can be used to automatically configure the tunnel. AICCU
-      supports TIC (Tunnel Information & Control protocol), which it
-      uses for retrieving the tunnel configuration information,
-      AYIYA, which allows tunnels to be created even behind
-      firewalls and NAT's.
-
-      http://www.sixxs.net/tools/aiccu/
-
-comment "aiccu needs a toolchain w/ wchar, threads, dynamic library"
-    depends on BR2_USE_MMU
-    depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS \
-        || BR2_STATIC_LIBS

package/aiccu/aiccu.hash deleted +0 -2

deleted file mode 100644
index 26c4081fe..000000000
@@ -1,2 +0,0 @@
-# From https://www.sixxs.net/archive/sixxs/aiccu/unix/
-md5    c9bcc83644ed788e22a7c3f3d4021350  aiccu_20070115.tar.gz

package/aiccu/aiccu.mk deleted +0 ~~-40~~

deleted file mode 100644
index 60d65dd01..000000000
@@ -1,40 +0,0 @@
-################################################################################
-#
-# aiccu
-#
-################################################################################
-
-AICCU_VERSION = 20070115
-AICCU_SOURCE = aiccu_$(AICCU_VERSION).tar.gz
-AICCU_SITE = http://www.sixxs.net/archive/sixxs/aiccu/unix
-AICCU_LICENSE = SixXS License, concise redistribution license
-AICCU_LICENSE_FILES = doc/LICENSE
-AICCU_DEPENDENCIES = gnutls
-
-AICCU_LFDLAGS = $(TARGET_LDFLAGS)
-
-# aiccu forgets to link with gnutls' dependencies breaking the build when
-# linking statically
-ifeq ($(BR2_STATIC_LIBS),y)
-AICCU_LDFLAGS += `$(PKG_CONFIG_HOST_BINARY) --libs gnutls`
-endif
-
-# dummy RPM_OPT_FLAGS to disable stripping
-define AICCU_BUILD_CMDS
-    $(TARGET_CONFIGURE_OPTS) LDFLAGS="$(AICCU_LDFLAGS)" $(MAKE) \
-        CC="$(TARGET_CC)" RPM_OPT_FLAGS=1 -C $(@D)/unix-console all
-endef
-
-define AICCU_INSTALL_TARGET_CMDS
-    $(INSTALL) -D -m 0755 $(@D)/unix-console/aiccu \
-        $(TARGET_DIR)/usr/sbin/aiccu
-    $(INSTALL) -D -m 0644 $(@D)/doc/aiccu.conf \
-        $(TARGET_DIR)/etc/aiccu.conf
-endef
-
-define AICCU_INSTALL_INIT_SYSV
-    $(INSTALL) -D -m 0755 $(@D)/doc/aiccu.init \
-        $(TARGET_DIR)/etc/init.d/S50aiccu
-endef
-
-$(eval $(generic-package))

Signature · 4 lines

2.11.0
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20170909/cf542505/attachment.html>

Thomas Petazzoni

2017-09-09 14:00 UTC #2 lore raw

PATCH 1/1 aiccu: delete package

Hello,

Thanks for your patch, good to have someone noticing when packages no longer make sense.

Quoted 1 line · Alexander Mukhin

(Forgot to sign the patch, sorry.)

If you want to include such messages, it should be below the "---" below your Signed-off-by. Otherwise, it gets added permanently to the Git commit history of the project, which we don't want.

Quoted 2 lines

As SixXS project has ceased its operation on 2017-06-06, consider removing aiccu package.

Please wrap the commit log to 72 characters.

But above all, could you please with git send-email? Your patch sent by iPad Mail has been badly reformatted by your e-mail client, and cannot be applied.

Thanks!

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

Yann E. MORIN

2017-09-09 15:38 UTC #3 lore raw

PATCH 1/1 aiccu: delete package

In reply to Alexander Mukhin

Alexander, All,

On 2017-09-09 13:09 +0300, Alexander Mukhin spake thusly:

Quoted 2 lines

As SixXS project has ceased its operation on 2017-06-06, consider removing aiccu package.
Signed-off-by Alexander Mukhin <[email protected]>

[--SNIP--]

package/aiccu/Config.in line 2

Quoted 6 lines

index a2d610017..000000000
package/aiccu/Config.in deleted +0 -2
@@ -1,25 +0,0 @@
-config BR2_PACKAGE_AICCU
-    bool "aiccu"

Please add an entry in Config.in.legacy.

Regards,
Yann E. MORIN.

Signature · 6 lines

.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

Alexander Mukhin

author

2017-09-10 09:43 UTC #4 lore raw

PATCH 1/1 aiccu: remove package

Signed-off-by Alexander Mukhin <[email protected]>

---
 Config.in.legacy                                   | 10 +++
 DEVELOPERS                                         |  1 -
 package/Config.in                                  |  1 -
 package/aiccu/0001-gnutls.patch                    | 73 ----------------------
 .../0002-makefile-reorder-linked-libraries.patch   | 15 -----
 package/aiccu/0003-if-ether-header.patch           | 23 -------
 package/aiccu/0005-res-ninit.patch                 | 33 ----------
 package/aiccu/Config.in                            | 25 --------
 package/aiccu/aiccu.hash                           |  2 -
 package/aiccu/aiccu.mk                             | 40 ------------
 10 files changed, 10 insertions(+), 213 deletions(-)
 delete mode 100644 package/aiccu/0001-gnutls.patch
 delete mode 100644 package/aiccu/0002-makefile-reorder-linked-libraries.patch
 delete mode 100644 package/aiccu/0003-if-ether-header.patch
 delete mode 100644 package/aiccu/0005-res-ninit.patch
 delete mode 100644 package/aiccu/Config.in
 delete mode 100644 package/aiccu/aiccu.hash
 delete mode 100644 package/aiccu/aiccu.mk

Config.in.legacy +10 -0

index 44303a42b..d4befa864 100644
@@ -145,6 +145,16 @@ endif
 ###############################################################################
 comment "Legacy options removed in 2017.11"
 
+config BR2_PACKAGE_AICCU
+	bool "aiccu utility removed"
+	select BR2_LEGACY
+	help
+	  As the SixXS project has ceased its operation on 2017-06-06,
+	  the AICCU utility has no use anymore and has been removed.
+
+	  https://www.sixxs.net/sunset/
+
+
 config BR2_PACKAGE_UTIL_LINUX_LOGIN_UTILS
 	bool "util-linux login utilities option removed"
 	select BR2_LEGACY

DEVELOPERS +0 -1

index 2bd3aca45..b28faab35 100644
@@ -1241,7 +1241,6 @@ N:	Maxime Ripard <[email protected]>
 F:	package/kmsxx/
 
 N:	Michael Rommel <[email protected]>
-F:	package/aiccu/
 F:	package/knock/
 F:	package/python-crc16/
 F:	package/python-pyzmq/

package/Config.in +0 -1

index d926f7e02..7a277d75c 100644
@@ -1562,7 +1562,6 @@ menu "Miscellaneous"
 endmenu
 
 menu "Networking applications"
-	source "package/aiccu/Config.in"
 	source "package/aircrack-ng/Config.in"
 	source "package/apache/Config.in"
 	source "package/argus/Config.in"

package/aiccu/0001-gnutls.patch deleted +0 ~~-73~~

73 lines not on this page · raw message

package/aiccu/0002-makefile-reorder-linked-libraries.patch deleted +0 ~~-15~~

deleted file mode 100644
index 22f04a91a..000000000
@@ -1,15 +0,0 @@
-Makefile: change LDFLAGS order on the compile line for --static
-
-Signed-off-by: Michael Rommel <[email protected]>
-
---- aiccu_20070115.orig/unix-console/Makefile	2007-01-15 12:04:27.000000000 +0100
-+++ aiccu_20070115/unix-console/Makefile	2013-09-29 22:54:42.742963861 +0200
-@@ -144,7 +144,7 @@ endif
- all: aiccu
- 
- aiccu:	$(OBJS) ${SRCS} ${INCS}
--	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS)
-+	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LDFLAGS)
- ifeq ($(shell echo $(CFLAGS) | grep -c "DEBUG"),0)
- ifeq ($(shell echo "$(RPM_OPT_FLAGS)" | wc -c),1)
- 	strip $@

package/aiccu/0003-if-ether-header.patch deleted +0 ~~-23~~

deleted file mode 100644
index 48e8ceb6b..000000000
@@ -1,23 +0,0 @@
-musl does not allow using <netinet/*> together with <linux/*> headers.
-Since there are both netinet/if_ether.h and linux/if_ether.h providing
-the same definitions, use linux/if_ether.h whenever other linux/*
-headers are included.
-
-Signed-off-by: Alex Suykov <[email protected]>
-
---- aiccu/common/common.h
-+++ aiccu/common/common.h
-@@ -91,11 +91,12 @@
- 	#include <sys/select.h>
- 
- 	#include <net/if.h>
--	#include <netinet/if_ether.h>
- #ifdef linux
- 	#include <netpacket/packet.h>
-+	#include <linux/if_ether.h>
- 	#include <linux/if_tun.h>
- #else
-+	#include <netinet/if_ether.h>
- #ifdef _DFBSD
- 	#include <net/tun/if_tun.h>
- #else

package/aiccu/0005-res-ninit.patch deleted +0 ~~-33~~

deleted file mode 100644
index faf38df08..000000000
@@ -1,33 +0,0 @@
-res_ninit is available in glibc but not in uclibc or musl.
-
-Signed-off-by: Alex Suykov <[email protected]>
-
---- aiccu/common/resolver.c
-+++ aiccu/common/resolver.c
-@@ -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(__GLIBC__) && !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(__GLIBC__) && !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(__GLIBC__) && !defined(__UCLIBC__)
- 	ret = res_nquery(&res, label, C_IN, rrtype, answer, sizeof(answer));
- #else
- 	ret = res_query(label, C_IN, rrtype, answer, sizeof(answer));

package/aiccu/Config.in deleted +0 ~~-25~~

deleted file mode 100644
index a2d610017..000000000
@@ -1,25 +0,0 @@
-config BR2_PACKAGE_AICCU
-	bool "aiccu"
-	depends on !BR2_STATIC_LIBS # gnutls
-	depends on BR2_USE_WCHAR
-	depends on BR2_TOOLCHAIN_HAS_THREADS
-	depends on BR2_USE_MMU # fork()
-	select BR2_PACKAGE_GNUTLS
-	help
-	  SixXS Automatic IPv6 Connectivity Client Utility
-
-	  AICCU (Automatic IPv6 Connectivity Client Utility) makes it
-	  easy for users to get IPv6 connectivity. After having
-	  requested an account, tunnel and optionally a subnet, AICCU
-	  can be used to automatically configure the tunnel. AICCU
-	  supports TIC (Tunnel Information & Control protocol), which it
-	  uses for retrieving the tunnel configuration information,
-	  AYIYA, which allows tunnels to be created even behind
-	  firewalls and NAT's.
-
-	  http://www.sixxs.net/tools/aiccu/
-
-comment "aiccu needs a toolchain w/ wchar, threads, dynamic library"
-	depends on BR2_USE_MMU
-	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS \
-		|| BR2_STATIC_LIBS

package/aiccu/aiccu.hash deleted +0 -2

deleted file mode 100644
index 26c4081fe..000000000
@@ -1,2 +0,0 @@
-# From https://www.sixxs.net/archive/sixxs/aiccu/unix/
-md5	c9bcc83644ed788e22a7c3f3d4021350  aiccu_20070115.tar.gz

package/aiccu/aiccu.mk deleted +0 ~~-40~~

deleted file mode 100644
index 60d65dd01..000000000
@@ -1,40 +0,0 @@
-################################################################################
-#
-# aiccu
-#
-################################################################################
-
-AICCU_VERSION = 20070115
-AICCU_SOURCE = aiccu_$(AICCU_VERSION).tar.gz
-AICCU_SITE = http://www.sixxs.net/archive/sixxs/aiccu/unix
-AICCU_LICENSE = SixXS License, concise redistribution license
-AICCU_LICENSE_FILES = doc/LICENSE
-AICCU_DEPENDENCIES = gnutls
-
-AICCU_LFDLAGS = $(TARGET_LDFLAGS)
-
-# aiccu forgets to link with gnutls' dependencies breaking the build when
-# linking statically
-ifeq ($(BR2_STATIC_LIBS),y)
-AICCU_LDFLAGS += `$(PKG_CONFIG_HOST_BINARY) --libs gnutls`
-endif
-
-# dummy RPM_OPT_FLAGS to disable stripping
-define AICCU_BUILD_CMDS
-	$(TARGET_CONFIGURE_OPTS) LDFLAGS="$(AICCU_LDFLAGS)" $(MAKE) \
-		CC="$(TARGET_CC)" RPM_OPT_FLAGS=1 -C $(@D)/unix-console all
-endef
-
-define AICCU_INSTALL_TARGET_CMDS
-	$(INSTALL) -D -m 0755 $(@D)/unix-console/aiccu \
-		$(TARGET_DIR)/usr/sbin/aiccu
-	$(INSTALL) -D -m 0644 $(@D)/doc/aiccu.conf \
-		$(TARGET_DIR)/etc/aiccu.conf
-endef
-
-define AICCU_INSTALL_INIT_SYSV
-	$(INSTALL) -D -m 0755 $(@D)/doc/aiccu.init \
-		$(TARGET_DIR)/etc/init.d/S50aiccu
-endef
-
-$(eval $(generic-package))

Signature · 1 line

2.11.0

Yann E. MORIN

2017-09-10 09:55 UTC #5 lore raw

PATCH 1/1 aiccu: remove package

Alexander, All,

On 2017-09-10 12:43 +0300, Alexander Mukhin spake thusly:

Quoted 1 line

Signed-off-by Alexander Mukhin <[email protected]>

Thanks! :-)

Reviewed-by "Yann E. MORIN" <[email protected]>

Yet, a little nit-pick: why did you not add Michael in Cc of this patch, since he's (was!) declared as developper for aiccu?

Also, I would have kept the reason in the commit log itself, because for once, duplicating the info in the commit log and the help text does make sense.

But no need to respin. If the committer sees fit, they'll add it back.

[--SNIP--]

Quoted 6 lines

Config.in.legacy +0 -0

index 44303a42b..d4befa864 100644
@@ -145,6 +145,16 @@ endif
 ###############################################################################

Config.in.legacy endif · line 155

Quoted 10 lines

Config.in.legacy +8 -0

 comment "Legacy options removed in 2017.11"
 
+config BR2_PACKAGE_AICCU
+	bool "aiccu utility removed"
+	select BR2_LEGACY
+	help
+	  As the SixXS project has ceased its operation on 2017-06-06,
+	  the AICCU utility has no use anymore and has been removed.
+
+	  https://www.sixxs.net/sunset/

It's a bit sad they're not considering releasing the server part... :-/

Regards,
Yann E. MORIN.

Signature · 6 lines

.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

Alexander Mukhin

author

2017-09-10 10:21 UTC #6 lore raw

PATCH 1/1 aiccu: remove package

In reply to Yann E. MORIN

As the SixXS project has ceased its operation on 2017-06-06, the aiccu utility has been removed.

Signed-off-by Alexander Mukhin <[email protected]>

---
 Config.in.legacy                                   | 10 +++
 DEVELOPERS                                         |  1 -
 package/Config.in                                  |  1 -
 package/aiccu/0001-gnutls.patch                    | 73 ----------------------
 .../0002-makefile-reorder-linked-libraries.patch   | 15 -----
 package/aiccu/0003-if-ether-header.patch           | 23 -------
 package/aiccu/0005-res-ninit.patch                 | 33 ----------
 package/aiccu/Config.in                            | 25 --------
 package/aiccu/aiccu.hash                           |  2 -
 package/aiccu/aiccu.mk                             | 40 ------------
 10 files changed, 10 insertions(+), 213 deletions(-)
 delete mode 100644 package/aiccu/0001-gnutls.patch
 delete mode 100644 package/aiccu/0002-makefile-reorder-linked-libraries.patch
 delete mode 100644 package/aiccu/0003-if-ether-header.patch
 delete mode 100644 package/aiccu/0005-res-ninit.patch
 delete mode 100644 package/aiccu/Config.in
 delete mode 100644 package/aiccu/aiccu.hash
 delete mode 100644 package/aiccu/aiccu.mk

Config.in.legacy +10 -0

index 44303a42b..d4befa864 100644
@@ -145,6 +145,16 @@ endif
 ###############################################################################
 comment "Legacy options removed in 2017.11"
 
+config BR2_PACKAGE_AICCU
+	bool "aiccu utility removed"
+	select BR2_LEGACY
+	help
+	  As the SixXS project has ceased its operation on 2017-06-06,
+	  the AICCU utility has no use anymore and has been removed.
+
+	  https://www.sixxs.net/sunset/
+
+
 config BR2_PACKAGE_UTIL_LINUX_LOGIN_UTILS
 	bool "util-linux login utilities option removed"
 	select BR2_LEGACY

DEVELOPERS +0 -1

index 2bd3aca45..b28faab35 100644
@@ -1241,7 +1241,6 @@ N:	Maxime Ripard <[email protected]>
 F:	package/kmsxx/
 
 N:	Michael Rommel <[email protected]>
-F:	package/aiccu/
 F:	package/knock/
 F:	package/python-crc16/
 F:	package/python-pyzmq/

package/Config.in +0 -1

index d926f7e02..7a277d75c 100644
@@ -1562,7 +1562,6 @@ menu "Miscellaneous"
 endmenu
 
 menu "Networking applications"
-	source "package/aiccu/Config.in"
 	source "package/aircrack-ng/Config.in"
 	source "package/apache/Config.in"
 	source "package/argus/Config.in"

package/aiccu/0001-gnutls.patch deleted +0 ~~-73~~

73 lines not on this page · raw message

package/aiccu/0002-makefile-reorder-linked-libraries.patch deleted +0 ~~-15~~

deleted file mode 100644
index 22f04a91a..000000000
@@ -1,15 +0,0 @@
-Makefile: change LDFLAGS order on the compile line for --static
-
-Signed-off-by: Michael Rommel <[email protected]>
-
---- aiccu_20070115.orig/unix-console/Makefile	2007-01-15 12:04:27.000000000 +0100
-+++ aiccu_20070115/unix-console/Makefile	2013-09-29 22:54:42.742963861 +0200
-@@ -144,7 +144,7 @@ endif
- all: aiccu
- 
- aiccu:	$(OBJS) ${SRCS} ${INCS}
--	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS)
-+	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LDFLAGS)
- ifeq ($(shell echo $(CFLAGS) | grep -c "DEBUG"),0)
- ifeq ($(shell echo "$(RPM_OPT_FLAGS)" | wc -c),1)
- 	strip $@

package/aiccu/0003-if-ether-header.patch deleted +0 ~~-23~~

deleted file mode 100644
index 48e8ceb6b..000000000
@@ -1,23 +0,0 @@
-musl does not allow using <netinet/*> together with <linux/*> headers.
-Since there are both netinet/if_ether.h and linux/if_ether.h providing
-the same definitions, use linux/if_ether.h whenever other linux/*
-headers are included.
-
-Signed-off-by: Alex Suykov <[email protected]>
-
---- aiccu/common/common.h
-+++ aiccu/common/common.h
-@@ -91,11 +91,12 @@
- 	#include <sys/select.h>
- 
- 	#include <net/if.h>
--	#include <netinet/if_ether.h>
- #ifdef linux
- 	#include <netpacket/packet.h>
-+	#include <linux/if_ether.h>
- 	#include <linux/if_tun.h>
- #else
-+	#include <netinet/if_ether.h>
- #ifdef _DFBSD
- 	#include <net/tun/if_tun.h>
- #else

package/aiccu/0005-res-ninit.patch deleted +0 ~~-33~~

deleted file mode 100644
index faf38df08..000000000
@@ -1,33 +0,0 @@
-res_ninit is available in glibc but not in uclibc or musl.
-
-Signed-off-by: Alex Suykov <[email protected]>
-
---- aiccu/common/resolver.c
-+++ aiccu/common/resolver.c
-@@ -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(__GLIBC__) && !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(__GLIBC__) && !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(__GLIBC__) && !defined(__UCLIBC__)
- 	ret = res_nquery(&res, label, C_IN, rrtype, answer, sizeof(answer));
- #else
- 	ret = res_query(label, C_IN, rrtype, answer, sizeof(answer));

package/aiccu/Config.in deleted +0 ~~-25~~

deleted file mode 100644
index a2d610017..000000000
@@ -1,25 +0,0 @@
-config BR2_PACKAGE_AICCU
-	bool "aiccu"
-	depends on !BR2_STATIC_LIBS # gnutls
-	depends on BR2_USE_WCHAR
-	depends on BR2_TOOLCHAIN_HAS_THREADS
-	depends on BR2_USE_MMU # fork()
-	select BR2_PACKAGE_GNUTLS
-	help
-	  SixXS Automatic IPv6 Connectivity Client Utility
-
-	  AICCU (Automatic IPv6 Connectivity Client Utility) makes it
-	  easy for users to get IPv6 connectivity. After having
-	  requested an account, tunnel and optionally a subnet, AICCU
-	  can be used to automatically configure the tunnel. AICCU
-	  supports TIC (Tunnel Information & Control protocol), which it
-	  uses for retrieving the tunnel configuration information,
-	  AYIYA, which allows tunnels to be created even behind
-	  firewalls and NAT's.
-
-	  http://www.sixxs.net/tools/aiccu/
-
-comment "aiccu needs a toolchain w/ wchar, threads, dynamic library"
-	depends on BR2_USE_MMU
-	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS \
-		|| BR2_STATIC_LIBS

package/aiccu/aiccu.hash deleted +0 -2

deleted file mode 100644
index 26c4081fe..000000000
@@ -1,2 +0,0 @@
-# From https://www.sixxs.net/archive/sixxs/aiccu/unix/
-md5	c9bcc83644ed788e22a7c3f3d4021350  aiccu_20070115.tar.gz

package/aiccu/aiccu.mk deleted +0 ~~-40~~

deleted file mode 100644
index 60d65dd01..000000000
@@ -1,40 +0,0 @@
-################################################################################
-#
-# aiccu
-#
-################################################################################
-
-AICCU_VERSION = 20070115
-AICCU_SOURCE = aiccu_$(AICCU_VERSION).tar.gz
-AICCU_SITE = http://www.sixxs.net/archive/sixxs/aiccu/unix
-AICCU_LICENSE = SixXS License, concise redistribution license
-AICCU_LICENSE_FILES = doc/LICENSE
-AICCU_DEPENDENCIES = gnutls
-
-AICCU_LFDLAGS = $(TARGET_LDFLAGS)
-
-# aiccu forgets to link with gnutls' dependencies breaking the build when
-# linking statically
-ifeq ($(BR2_STATIC_LIBS),y)
-AICCU_LDFLAGS += `$(PKG_CONFIG_HOST_BINARY) --libs gnutls`
-endif
-
-# dummy RPM_OPT_FLAGS to disable stripping
-define AICCU_BUILD_CMDS
-	$(TARGET_CONFIGURE_OPTS) LDFLAGS="$(AICCU_LDFLAGS)" $(MAKE) \
-		CC="$(TARGET_CC)" RPM_OPT_FLAGS=1 -C $(@D)/unix-console all
-endef
-
-define AICCU_INSTALL_TARGET_CMDS
-	$(INSTALL) -D -m 0755 $(@D)/unix-console/aiccu \
-		$(TARGET_DIR)/usr/sbin/aiccu
-	$(INSTALL) -D -m 0644 $(@D)/doc/aiccu.conf \
-		$(TARGET_DIR)/etc/aiccu.conf
-endef
-
-define AICCU_INSTALL_INIT_SYSV
-	$(INSTALL) -D -m 0755 $(@D)/doc/aiccu.init \
-		$(TARGET_DIR)/etc/init.d/S50aiccu
-endef
-
-$(eval $(generic-package))

Signature · 1 line

2.11.0

Peter Korsgaard

2017-09-11 09:27 UTC #7 lore raw

PATCH 1/1 aiccu: remove package

Quoted 35 lines

Quoted 1 line

Quoted 1 line
Quoted 1 line
Quoted 1 line
"Alexander" == Alexander Mukhin <[email protected]> writes:

As the SixXS project has ceased its operation on 2017-06-06, the aiccu utility has been removed.

Signed-off-by Alexander Mukhin <[email protected]>

---
 Config.in.legacy                                   | 10 +++
 DEVELOPERS                                         |  1 -
 package/Config.in                                  |  1 -
 package/aiccu/0001-gnutls.patch                    | 73 ----------------------
 .../0002-makefile-reorder-linked-libraries.patch   | 15 -----
 package/aiccu/0003-if-ether-header.patch           | 23 -------
 package/aiccu/0005-res-ninit.patch                 | 33 ----------
 package/aiccu/Config.in                            | 25 --------
 package/aiccu/aiccu.hash                           |  2 -
 package/aiccu/aiccu.mk                             | 40 ------------
 10 files changed, 10 insertions(+), 213 deletions(-)
 delete mode 100644 package/aiccu/0001-gnutls.patch
 delete mode 100644 package/aiccu/0002-makefile-reorder-linked-libraries.patch
 delete mode 100644 package/aiccu/0003-if-ether-header.patch
 delete mode 100644 package/aiccu/0005-res-ninit.patch
 delete mode 100644 package/aiccu/Config.in
 delete mode 100644 package/aiccu/aiccu.hash
 delete mode 100644 package/aiccu/aiccu.mk

Config.in.legacy +0 -0

index 44303a42b..d4befa864 100644
@@ -145,6 +145,16 @@ endif
 ###############################################################################
 comment "Legacy options removed in 2017.11"

Config.in.legacy endif · line 157

Quoted 10 lines

Config.in.legacy +10 -0

+config BR2_PACKAGE_AICCU
+	bool "aiccu utility removed"
+	select BR2_LEGACY
+	help
+	  As the SixXS project has ceased its operation on 2017-06-06,
+	  the AICCU utility has no use anymore and has been removed.
+
+	  https://www.sixxs.net/sunset/
+
+

Committed after dropping the extra empty line, thanks.

Signature · 1 line

Bye, Peter Korsgaard