All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/2] package/knock: bump to version 0.8
@ 2021-10-10 19:49 Fabrice Fontaine
  2021-10-10 19:49 ` [Buildroot] [PATCH 2/2] package/knock: add knockd option Fabrice Fontaine
  2021-10-10 20:55 ` [Buildroot] [PATCH 1/2] package/knock: bump to version 0.8 Yann E. MORIN
  0 siblings, 2 replies; 3+ messages in thread
From: Fabrice Fontaine @ 2021-10-10 19:49 UTC (permalink / raw)
  To: buildroot; +Cc: Michael Rommel, Fabrice Fontaine

Use official tarball and so drop autoreconf

https://github.com/jvinet/knock/blob/v0.8/ChangeLog

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/knock/knock.hash | 4 +++-
 package/knock/knock.mk   | 5 ++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/package/knock/knock.hash b/package/knock/knock.hash
index 0b9a0918fc..3dc971b4a1 100644
--- a/package/knock/knock.hash
+++ b/package/knock/knock.hash
@@ -1,3 +1,5 @@
+# Hash from: https://zeroflux.org/projects/knock
+sha256  698d8c965624ea2ecb1e3df4524ed05afe387f6d20ded1e8a231209ad48169c7  knock-0.8.tar.gz
+
 # locally computed hash
-sha256  940a8de61b4b3530560805c3b9310a077c28c99173c2ccb07ff96720b0e93c58  knock-258a27e5a47809f97c2b9f2751a88c2f94aae891.tar.gz
 sha256  d747e19206e41702e40822dd91d37cbf40edd86f364ea416d667a0e3013f7189  COPYING
diff --git a/package/knock/knock.mk b/package/knock/knock.mk
index 55f5bfdf36..02811540bf 100644
--- a/package/knock/knock.mk
+++ b/package/knock/knock.mk
@@ -4,9 +4,8 @@
 #
 ################################################################################
 
-KNOCK_VERSION = 258a27e5a47809f97c2b9f2751a88c2f94aae891
-KNOCK_SITE = $(call github,jvinet,knock,$(KNOCK_VERSION))
-KNOCK_AUTORECONF = YES
+KNOCK_VERSION = 0.8
+KNOCK_SITE = http://www.zeroflux.org/proj/knock/files
 KNOCK_LICENSE = GPL-2.0+
 KNOCK_LICENSE_FILES = COPYING
 KNOCK_DEPENDENCIES = libpcap
-- 
2.33.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [Buildroot] [PATCH 2/2] package/knock: add knockd option
  2021-10-10 19:49 [Buildroot] [PATCH 1/2] package/knock: bump to version 0.8 Fabrice Fontaine
@ 2021-10-10 19:49 ` Fabrice Fontaine
  2021-10-10 20:55 ` [Buildroot] [PATCH 1/2] package/knock: bump to version 0.8 Yann E. MORIN
  1 sibling, 0 replies; 3+ messages in thread
From: Fabrice Fontaine @ 2021-10-10 19:49 UTC (permalink / raw)
  To: buildroot; +Cc: Michael Rommel, Fabrice Fontaine

Add knockd option to make libpcap and MMU optional and enable it by
default for backward compatibility

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/knock/Config.in | 14 ++++++++++++--
 package/knock/knock.mk  |  9 +++++++--
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/package/knock/Config.in b/package/knock/Config.in
index 0060ad07ce..5a4c00d9e8 100644
--- a/package/knock/Config.in
+++ b/package/knock/Config.in
@@ -1,7 +1,5 @@
 config BR2_PACKAGE_KNOCK
 	bool "knock"
-	depends on BR2_USE_MMU # fork()
-	select BR2_PACKAGE_LIBPCAP
 	help
 	  A port knocking implementation.
 	  Provides a daemon and a user application. Port knocking can be
@@ -11,3 +9,15 @@ config BR2_PACKAGE_KNOCK
 	  firewall.
 
 	  http://www.zeroflux.org/projects/knock
+
+if BR2_PACKAGE_KNOCK
+
+config BR2_PACKAGE_KNOCK_KNOCKD
+	bool "knockd"
+	default y
+	depends on BR2_USE_MMU # fork()
+	select BR2_PACKAGE_LIBPCAP
+	help
+	  Enable knockd
+
+endif
diff --git a/package/knock/knock.mk b/package/knock/knock.mk
index 02811540bf..8a909b2dc3 100644
--- a/package/knock/knock.mk
+++ b/package/knock/knock.mk
@@ -8,10 +8,15 @@ KNOCK_VERSION = 0.8
 KNOCK_SITE = http://www.zeroflux.org/proj/knock/files
 KNOCK_LICENSE = GPL-2.0+
 KNOCK_LICENSE_FILES = COPYING
-KNOCK_DEPENDENCIES = libpcap
 
+ifeq ($(BR2_PACKAGE_KNOCK_KNOCKD),y)
+KNOCK_DEPENDENCIES = libpcap
+KNOCK_CONF_OPTS += --enable-knockd
 ifeq ($(BR2_STATIC_LIBS),y)
-KNOCK_CONF_OPTS = LIBS="`$(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs`"
+KNOCK_CONF_OPTS += LIBS="`$(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs`"
+endif
+else
+KNOCK_CONF_OPTS += --disable-knockd
 endif
 
 $(eval $(autotools-package))
-- 
2.33.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 3+ messages in thread
* Re: [Buildroot] [PATCH 1/2] package/knock: bump to version 0.8
  2021-10-10 19:49 [Buildroot] [PATCH 1/2] package/knock: bump to version 0.8 Fabrice Fontaine
  2021-10-10 19:49 ` [Buildroot] [PATCH 2/2] package/knock: add knockd option Fabrice Fontaine
@ 2021-10-10 20:55 ` Yann E. MORIN
  1 sibling, 0 replies; 3+ messages in thread
From: Yann E. MORIN @ 2021-10-10 20:55 UTC (permalink / raw)
  To: Fabrice Fontaine; +Cc: Michael Rommel, buildroot

Fabrice, All,

On 2021-10-10 21:49 +0200, Fabrice Fontaine spake thusly:
> Use official tarball and so drop autoreconf

This is not very nice, in fact, because that tarball is a complete git
working copy... :-/

Even though this is reproducible (it's a tarball. after all, I do not
like it much that we carry a complete git tree.

I would prefer that we do explicitly use a git tree, or that we use the
github download helper instead. We just lose the upstream-provided
sha256sum of the archive...

Thoughts?

> https://github.com/jvinet/knock/blob/v0.8/ChangeLog

Since we had a commit hash, we don't really know where we're updating
from. That commit was from almost 6 years ago, and was already marked
as a 0.7.8 version. Meh...

Regards,
Yann E. MORIN.

> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
>  package/knock/knock.hash | 4 +++-
>  package/knock/knock.mk   | 5 ++---
>  2 files changed, 5 insertions(+), 4 deletions(-)
> 
> diff --git a/package/knock/knock.hash b/package/knock/knock.hash
> index 0b9a0918fc..3dc971b4a1 100644
> --- a/package/knock/knock.hash
> +++ b/package/knock/knock.hash
> @@ -1,3 +1,5 @@
> +# Hash from: https://zeroflux.org/projects/knock
> +sha256  698d8c965624ea2ecb1e3df4524ed05afe387f6d20ded1e8a231209ad48169c7  knock-0.8.tar.gz
> +
>  # locally computed hash
> -sha256  940a8de61b4b3530560805c3b9310a077c28c99173c2ccb07ff96720b0e93c58  knock-258a27e5a47809f97c2b9f2751a88c2f94aae891.tar.gz
>  sha256  d747e19206e41702e40822dd91d37cbf40edd86f364ea416d667a0e3013f7189  COPYING
> diff --git a/package/knock/knock.mk b/package/knock/knock.mk
> index 55f5bfdf36..02811540bf 100644
> --- a/package/knock/knock.mk
> +++ b/package/knock/knock.mk
> @@ -4,9 +4,8 @@
>  #
>  ################################################################################
>  
> -KNOCK_VERSION = 258a27e5a47809f97c2b9f2751a88c2f94aae891
> -KNOCK_SITE = $(call github,jvinet,knock,$(KNOCK_VERSION))
> -KNOCK_AUTORECONF = YES
> +KNOCK_VERSION = 0.8
> +KNOCK_SITE = http://www.zeroflux.org/proj/knock/files
>  KNOCK_LICENSE = GPL-2.0+
>  KNOCK_LICENSE_FILES = COPYING
>  KNOCK_DEPENDENCIES = libpcap
> -- 
> 2.33.0
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-10-10 20:55 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-10 19:49 [Buildroot] [PATCH 1/2] package/knock: bump to version 0.8 Fabrice Fontaine
2021-10-10 19:49 ` [Buildroot] [PATCH 2/2] package/knock: add knockd option Fabrice Fontaine
2021-10-10 20:55 ` [Buildroot] [PATCH 1/2] package/knock: bump to version 0.8 Yann E. MORIN

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.