knock: new package
PATCH 1/2 knock: new package
A port knocking implementation with daemon and user application.
---
Added the dependency on libpcap to the .mk file
--- package/Config.in | 1 + package/knock/Config.in | 13 +++++++++++++ package/knock/knock.mk | 14 ++++++++++++++ 3 files changed, 28 insertions(+) create mode 100644 package/knock/Config.in create mode 100644 package/knock/knock.mk
package/Config.in +1 -0
@@ -765,6 +765,7 @@ source "package/ipset/Config.in" source "package/iptables/Config.in" source "package/iw/Config.in" source "package/kismet/Config.in" +source "package/knock/Config.in" source "package/lighttpd/Config.in" source "package/linknx/Config.in" source "package/links/Config.in"
package/knock/Config.in new file +13 -0
@@ -0,0 +1,13 @@ +config BR2_PACKAGE_KNOCK + bool "knock" + select BR2_PACKAGE_LIBPCAP + help + A port knocking implementation. + Provides a daemon and a user application. Port knocking can be + used to run an arbitrary application, once the daemon detects + a predefined sequence of incoming TCP/UDP packets on a network + interface. This can be used, e.g. to open up ports in a + firewall. + + http://www.zeroflux.org/projects/knock +
package/knock/knock.mk new file +14 -0
@@ -0,0 +1,14 @@ +################################################################################ +# +# knock +# +################################################################################ + +KNOCK_VERSION = 7666f2e86e +KNOCK_SITE = https://github.com/jvinet/knock/tarball/master +KNOCK_LICENSE = GPLv2+ +KNOCK_LICENSE_FILES = COPYING +KNOCK_AUTORECONF = YES +KNOCK_DEPENDENCIES = libpcap + +$(eval $(autotools-package))
Signature · 1 line
1.7.9.5
PATCH 2/2 aiccu: new package
Automatic IPv6 Connectivity Configuration Utility for users of a IPv6 tunnel broker, developed by sixxs.net
---
Implemented the suggested patch to use the TARGET_STRIP command.
--- package/Config.in | 1 + package/aiccu/Config.in | 21 ++++ .../aiccu/aiccu-0001-gnutls-and-uclibc-fixes.patch | 104 ++++++++++++++++++++ .../aiccu/aiccu-0002-makefile-target-strip.patch | 19 ++++ package/aiccu/aiccu.mk | 32 ++++++ 5 files changed, 177 insertions(+) create mode 100644 package/aiccu/Config.in create mode 100644 package/aiccu/aiccu-0001-gnutls-and-uclibc-fixes.patch create mode 100644 package/aiccu/aiccu-0002-makefile-target-strip.patch create mode 100644 package/aiccu/aiccu.mk
package/Config.in +1 -0
@@ -716,6 +716,7 @@ source "package/sound-theme-freedesktop/Config.in" endmenu menu "Networking applications" +source "package/aiccu/Config.in" source "package/aircrack-ng/Config.in" source "package/argus/Config.in" source "package/arptables/Config.in"
package/aiccu/Config.in new file +21 -0
@@ -0,0 +1,21 @@ +config BR2_PACKAGE_AICCU + bool "aiccu" + depends on BR2_INET_IPV6 + depends on BR2_USE_WCHAR + 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 requires a toolchain with IPv6 and WCHAR support" + depends on !(BR2_INET_IPV6 && BR2_USE_WCHAR)
package/aiccu/aiccu-0001-gnutls-and-uclibc-fixes.patch new file +104 -0
104 lines not on this page · raw message
package/aiccu/aiccu-0002-makefile-target-strip.patch new file +19 -0
@@ -0,0 +1,19 @@ +--- aiccu_20070115.orig/unix-console/Makefile 2007-01-15 12:04:27.000000000 +0100 ++++ aiccu_20070115/unix-console/Makefile 2013-09-08 17:00:33.004727305 +0200 +@@ -28,6 +28,7 @@ CWARNS += -W -Wall -Wshadow -Wpointer-ar + CFLAGS += $(CWARNS) -D_GNU_SOURCE + CC = @gcc + RM = rm ++STRIP = strip + + # Add -O3 when nothing is specified yet + ifeq ($(shell echo $(CFLAGS) | grep -c "\-O"),0) +@@ -147,7 +148,7 @@ 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 $@ ++ $(STRIP) $@ + endif + endif +
package/aiccu/aiccu.mk new file +32 -0
@@ -0,0 +1,32 @@ +################################################################################ +# +# 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 + +define AICCU_BUILD_CMDS + $(MAKE) CC="$(TARGET_CC)" LD="$(TARGET_LD)" STRIP="$(TARGET_STRIP)" -C $(@D) all +endef + +define AICCU_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 0755 $(@D)/unix-console/aiccu \ + $(TARGET_DIR)/usr/sbin/aiccu + [ -f $(TARGET_DIR)/etc/aiccu.conf ] || \ + $(INSTALL) -D -m 0644 $(@D)/doc/aiccu.conf \ + $(TARGET_DIR)/etc/aiccu.conf +endef + +define AICCU_INSTALL_INIT_SYSV + [ -f $(TARGET_DIR)/etc/init.d/S50aiccu ] || \ + $(INSTALL) -D -m 0755 $(@D)/doc/aiccu.init \ + $(TARGET_DIR)/etc/init.d/S50aiccu +endef + +$(eval $(generic-package))
Signature · 1 line
1.7.9.5
PATCH 2/2 aiccu: new package
Hang on, I need to sign-off that second patch :-( Sigh...
Signature · 1 line
Michael Rommel, Erlangen, Germany
Quoted 237 lines · Michael Rommel
Automatic IPv6 Connectivity Configuration Utility for users of a IPv6 tunnel broker, developed by sixxs.net
Signed-off-by Michael Rommel <[email protected]>---
Implemented the suggested patch to use the
TARGET_STRIPcommand.---
package/Config.in | 1 + package/aiccu/Config.in | 21 ++++ .../aiccu/aiccu-0001-gnutls-and-uclibc-fixes.patch | 104 ++++++++++++++++++++ .../aiccu/aiccu-0002-makefile-target-strip.patch | 19 ++++ package/aiccu/aiccu.mk | 32 ++++++ 5 files changed, 177 insertions(+)create mode 100644 package/aiccu/Config.in
create mode 100644package/aiccu/aiccu-0001-gnutls-and-uclibc-fixes.patchcreate mode 100644package/aiccu/aiccu-0002-makefile-target-strip.patchcreate mode 100644package/aiccu/aiccu.mkpackage/Config.in +0
-0@@ -716,6 +716,7 @@ source "package/sound-theme-freedesktop/Config.in"endmenu
menu "Networking applications"
+source "package/aiccu/Config.in"
source "package/aircrack-ng/Config.in"
source "package/argus/Config.in"
source "package/arptables/Config.in"package/aiccu/Config.in new file +21
-0@@ -0,0 +1,21 @@ +config BR2_PACKAGE_AICCU + bool "aiccu" + depends on BR2_INET_IPV6 + depends on BR2_USE_WCHAR + 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 requires a toolchain with IPv6 and WCHAR support" + depends on !(BR2_INET_IPV6 && BR2_USE_WCHAR)package/aiccu/aiccu-0001-gnutls-and-uclibc-fixes.patch new file +104
-0@@ -0,0 +1,104 @@ +aiccu.h, common.c, common.h: fixes for deprecated GNUTLS functions and types +resolver.c: fixes for selection of wrong resolver function under uclibc + +Signed-off-by: Michael Rommel <[email protected]> + +diff -purN aiccu_20070115.orig/common/aiccu.h aiccu_20070115/common/aiccu.h +--- aiccu_20070115.orig/common/aiccu.h 2007-01-15 13:01:43.000000000 +0100 ++++ aiccu_20070115/common/aiccu.h 2013-08-31 23:50:53.651936146 +0200 +@@ -111,7 +111,7 @@ struct AICCU_conf + #endif + + #ifdef AICCU_GNUTLS +- gnutls_certificate_credentials tls_cred; /* GNUTLS credentials */ ++ gnutls_certificate_credentials_t tls_cred; /* GNUTLS credentials */ + #endif + + bool daemonize; /* Daemonize? */ +diff -purN aiccu_20070115.orig/common/common.c aiccu_20070115/common/common.c +--- aiccu_20070115.orig/common/common.c 2006-12-21 15:08:50.000000000 +0100 ++++ aiccu_20070115/common/common.c 2013-09-01 01:21:36.031396740 +0200 +@@ -271,9 +271,8 @@ TLSSOCKET sock_alloc(void); + TLSSOCKET sock_alloc(void) + { + #ifdef AICCU_GNUTLS +- /* Allow connections to servers that have OpenPGP keys as well */ +- const int cert_type_priority[3] = { GNUTLS_CRT_X509, GNUTLS_CRT_OPENPGP, 0 }; + int ret; ++ const char *err; + #endif /* AICCU_GNUTLS*/ + + TLSSOCKET sock; +@@ -297,11 +296,16 @@ TLSSOCKET sock_alloc(void) + } + + /* Use default priorities */ +- gnutls_set_default_priority(sock->session); +- /* XXX: Return value is not documented in GNUTLS documentation! */ +- +- gnutls_certificate_type_set_priority(sock->session, cert_type_priority); +- /* XXX: Return value is not documented in GNUTLS documentation! */ ++ ret = gnutls_priority_set_direct(sock->session, "NORMAL", &err); ++ if (ret < 0) ++ { ++ if (ret == GNUTLS_E_INVALID_REQUEST) ++ { ++ dolog( LOG_ERR, "TLS set priority failed, syntax error at: %s\n", err); ++ } ++ free(sock); ++ return NULL; ++ } + + /* Configure the x509 credentials for the current session */ + gnutls_credentials_set(sock->session, GNUTLS_CRD_CERTIFICATE, g_aiccu->tls_cred); +@@ -474,7 +478,7 @@ bool sock_gotls(TLSSOCKET sock) + } + + /* Set the transport */ +- gnutls_transport_set_ptr(sock->session, (gnutls_transport_ptr)sock->socket); ++ gnutls_transport_set_ptr(sock->session, (gnutls_transport_ptr_t) sock->socket); + + /* Perform the TLS handshake */ + ret = gnutls_handshake(sock->session); +diff -purN aiccu_20070115.orig/common/common.h aiccu_20070115/common/common.h +--- aiccu_20070115.orig/common/common.h 2007-01-11 15:50:51.000000000 +0100 ++++ aiccu_20070115/common/common.h 2013-08-31 23:26:13.683659455 +0200 +@@ -381,7 +381,7 @@ struct tlssocket + SOCKET socket; + #ifdef AICCU_GNUTLS + bool tls_active; /* TLS active? */ +- gnutls_session session; /* The GnuTLS sesision */ ++ gnutls_session_t session; /* The GnuTLS sesision */ + #endif + }; + +diff -purN aiccu_20070115.orig/common/resolver.c aiccu_20070115/common/resolver.c +--- aiccu_20070115.orig/common/resolver.c 2006-07-23 16:55:14.000000000 +0200 ++++ aiccu_20070115/common/resolver.c 2013-08-31 23:44:31.574866862 +0200 +@@ -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));package/aiccu/aiccu-0002-makefile-target-strip.patch new file +19
-0@@ -0,0 +1,19 @@ +--- aiccu_20070115.orig/unix-console/Makefile 2007-01-15 12:04:27.000000000 +0100 ++++ aiccu_20070115/unix-console/Makefile 2013-09-08 17:00:33.004727305 +0200 +@@ -28,6 +28,7 @@ CWARNS += -W -Wall -Wshadow -Wpointer-ar + CFLAGS += $(CWARNS) -D_GNU_SOURCE + CC = @gcc + RM = rm ++STRIP = strip + + # Add -O3 when nothing is specified yet + ifeq ($(shell echo $(CFLAGS) | grep -c "\-O"),0) +@@ -147,7 +148,7 @@ 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 $@ ++ $(STRIP) $@ + endif + endif +package/aiccu/aiccu.mk new file +32
-0@@ -0,0 +1,32 @@ +################################################################################ +# +# 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 + +define AICCU_BUILD_CMDS + $(MAKE) CC="$(TARGET_CC)" LD="$(TARGET_LD)" STRIP="$(TARGET_STRIP)" -C $(@D) all +endef + +define AICCU_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 0755 $(@D)/unix-console/aiccu \ + $(TARGET_DIR)/usr/sbin/aiccu + [ -f $(TARGET_DIR)/etc/aiccu.conf ] || \ + $(INSTALL) -D -m 0644 $(@D)/doc/aiccu.conf \ + $(TARGET_DIR)/etc/aiccu.conf +endef + +define AICCU_INSTALL_INIT_SYSV + [ -f $(TARGET_DIR)/etc/init.d/S50aiccu ] || \ + $(INSTALL) -D -m 0755 $(@D)/doc/aiccu.init \ + $(TARGET_DIR)/etc/init.d/S50aiccu +endef + +$(eval $(generic-package))Signature · 1 line
1.7.9.5
PATCH 1/2 knock: new package
In reply to Michael RommelQuoted 3 lines · Michael Rommel
A port knocking implementation with daemon and user application.
Signed-off-by Michael Rommel <[email protected]>
Michael, when sending subsequent revisions of patches, please provide the appropriate v1, v2, ... flags in the subject line. This makes it much easier for reviewers.
Best regards,
Thomas
PATCH 1/2 knock: new package
In reply to Michael RommelQuoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Michael" == Michael Rommel <[email protected]> writes:
Michael> A port knocking implementation with daemon and user application. Michael> Signed-off-by: Michael Rommel <[email protected]> Michael> ---
Michael> Added the dependency on libpcap to the .mk file
Committed with a minor change (see below), thanks.
Michael> +++ b/package/knock/Config.in
Michael> @@ -0,0 +1,13 @@
Michael> +config BR2_PACKAGE_KNOCK
Michael> + bool "knock"
Michael> + select BR2_PACKAGE_LIBPCAP
Michael> + help
Michael> + A port knocking implementation. Michael> + Provides a daemon and a user application. Port knocking can be Michael> + used to run an arbitrary application, once the daemon detects Michael> + a predefined sequence of incoming TCP/UDP packets on a network Michael> + interface. This can be used, e.g. to open up ports in a Michael> + firewall.
Michael> +
Michael> + http://www.zeroflux.org/projects/knock
Michael> +
You shouldn't add an empty line after the URL.
Signature · 1 line
Bye, Peter Korsgaard