* [Buildroot] [PATCH 1/5] package/ngircd: bump version to 24
@ 2017-09-13 12:29 Bernd Kuhls
2017-09-13 12:29 ` [Buildroot] [PATCH 2/5] package/ngircd: add optional dependency to openssl Bernd Kuhls
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: Bernd Kuhls @ 2017-09-13 12:29 UTC (permalink / raw)
To: buildroot
Switched _SITE to https, added patch to fix compile error.
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/ngircd/0001-Fix-Get_error-usage.patch | 44 +++++++++++++++++++++++++++
package/ngircd/ngircd.hash | 2 +-
package/ngircd/ngircd.mk | 4 +--
3 files changed, 47 insertions(+), 3 deletions(-)
create mode 100644 package/ngircd/0001-Fix-Get_error-usage.patch
diff --git a/package/ngircd/0001-Fix-Get_error-usage.patch b/package/ngircd/0001-Fix-Get_error-usage.patch
new file mode 100644
index 0000000000..3724e46d89
--- /dev/null
+++ b/package/ngircd/0001-Fix-Get_error-usage.patch
@@ -0,0 +1,44 @@
+From 543f44bff8d56785dc13a74a14d4eaa96465bf05 Mon Sep 17 00:00:00 2001
+From: Bernd Kuhls <bernd.kuhls@t-online.de>
+Date: Wed, 13 Sep 2017 14:07:11 +0200
+Subject: [PATCH] Fix Get_error usage
+
+The usage of Get_Error is guarded by "ifdef h_errno" in this file, the
+definition of this function should follow the same rules.
+
+Fixes a build error when cross-compiling:
+https://github.com/ngircd/ngircd/issues/223
+
+Patch sent upstream: https://github.com/ngircd/ngircd/pull/240
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ src/ngircd/resolve.c | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/src/ngircd/resolve.c b/src/ngircd/resolve.c
+index 32791901..e1903254 100644
+--- a/src/ngircd/resolve.c
++++ b/src/ngircd/resolve.c
+@@ -108,9 +108,7 @@ Resolve_Name( PROC_STAT *s, const char *Host, void (*cbfunc)(int, short))
+ return false;
+ } /* Resolve_Name */
+
+-
+-#if !defined(HAVE_GETADDRINFO) || !defined(HAVE_GETNAMEINFO)
+-#if !defined(WANT_IPV6) && defined(h_errno)
++#ifdef h_errno
+ static char *
+ Get_Error( int H_Error )
+ {
+@@ -128,7 +126,6 @@ Get_Error( int H_Error )
+ return "unknown error";
+ }
+ #endif
+-#endif
+
+
+ /* Do "IDENT" (aka "AUTH") lookup and append result to resolved_addr array */
+--
+2.11.0
+
diff --git a/package/ngircd/ngircd.hash b/package/ngircd/ngircd.hash
index 45e2d9e825..128867bfd8 100644
--- a/package/ngircd/ngircd.hash
+++ b/package/ngircd/ngircd.hash
@@ -1,2 +1,2 @@
# Locally calculated after checking pgp signature
-sha256 93f953b2785ff0e6e29b8b3794ba5a64754b86251ce71bf39fc27f4f5074eada ngircd-20.3.tar.xz
+sha256 173fa0ea10788a8ba08ef2f7e64ea8951d7c88862e744128c8b87bae424b1008 ngircd-24.tar.xz
diff --git a/package/ngircd/ngircd.mk b/package/ngircd/ngircd.mk
index f7857e85dd..5f03b66001 100644
--- a/package/ngircd/ngircd.mk
+++ b/package/ngircd/ngircd.mk
@@ -4,9 +4,9 @@
#
################################################################################
-NGIRCD_VERSION = 20.3
+NGIRCD_VERSION = 24
NGIRCD_SOURCE = ngircd-$(NGIRCD_VERSION).tar.xz
-NGIRCD_SITE = http://arthur.barton.de/pub/ngircd
+NGIRCD_SITE = https://arthur.barton.de/pub/ngircd
NGIRCD_DEPENDENCIES = zlib
NGIRCD_LICENSE = GPL-2.0+
NGIRCD_LICENSE_FILES = COPYING
--
2.11.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 2/5] package/ngircd: add optional dependency to openssl
2017-09-13 12:29 [Buildroot] [PATCH 1/5] package/ngircd: bump version to 24 Bernd Kuhls
@ 2017-09-13 12:29 ` Bernd Kuhls
2017-09-13 12:29 ` [Buildroot] [PATCH 3/5] package/ngircd: add optional support for gnutls Bernd Kuhls
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Bernd Kuhls @ 2017-09-13 12:29 UTC (permalink / raw)
To: buildroot
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/ngircd/ngircd.mk | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/package/ngircd/ngircd.mk b/package/ngircd/ngircd.mk
index 5f03b66001..2ab9187c8e 100644
--- a/package/ngircd/ngircd.mk
+++ b/package/ngircd/ngircd.mk
@@ -11,4 +11,11 @@ NGIRCD_DEPENDENCIES = zlib
NGIRCD_LICENSE = GPL-2.0+
NGIRCD_LICENSE_FILES = COPYING
+ifeq ($(BR2_PACKAGE_OPENSSL),y)
+NGIRCD_CONF_OPTS += --with-openssl=$(STAGING_DIR)/usr
+NGIRCD_DEPENDENCIES += openssl
+else
+NGIRCD_CONF_OPTS += --without-openssl
+endif
+
$(eval $(autotools-package))
--
2.11.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 3/5] package/ngircd: add optional support for gnutls
2017-09-13 12:29 [Buildroot] [PATCH 1/5] package/ngircd: bump version to 24 Bernd Kuhls
2017-09-13 12:29 ` [Buildroot] [PATCH 2/5] package/ngircd: add optional dependency to openssl Bernd Kuhls
@ 2017-09-13 12:29 ` Bernd Kuhls
2017-09-13 12:29 ` [Buildroot] [PATCH 4/5] package/ngircd: make zlib an optional dependency Bernd Kuhls
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Bernd Kuhls @ 2017-09-13 12:29 UTC (permalink / raw)
To: buildroot
openssl and gnutls can not be enabled at the same time:
https://github.com/ngircd/ngircd/blob/master/configure.ng#L449
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/ngircd/ngircd.mk | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/package/ngircd/ngircd.mk b/package/ngircd/ngircd.mk
index 2ab9187c8e..06318a9df3 100644
--- a/package/ngircd/ngircd.mk
+++ b/package/ngircd/ngircd.mk
@@ -16,6 +16,12 @@ NGIRCD_CONF_OPTS += --with-openssl=$(STAGING_DIR)/usr
NGIRCD_DEPENDENCIES += openssl
else
NGIRCD_CONF_OPTS += --without-openssl
+ifeq ($(BR2_PACKAGE_GNUTLS),y)
+NGIRCD_CONF_OPTS += --with-gnutls=$(STAGING_DIR)/usr
+NGIRCD_DEPENDENCIES += gnutls
+else
+NGIRCD_CONF_OPTS += --without-gnutls
+endif
endif
$(eval $(autotools-package))
--
2.11.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 4/5] package/ngircd: make zlib an optional dependency
2017-09-13 12:29 [Buildroot] [PATCH 1/5] package/ngircd: bump version to 24 Bernd Kuhls
2017-09-13 12:29 ` [Buildroot] [PATCH 2/5] package/ngircd: add optional dependency to openssl Bernd Kuhls
2017-09-13 12:29 ` [Buildroot] [PATCH 3/5] package/ngircd: add optional support for gnutls Bernd Kuhls
@ 2017-09-13 12:29 ` Bernd Kuhls
2017-09-13 12:29 ` [Buildroot] [PATCH 5/5] package/ngircd: add optional support for linux-pam Bernd Kuhls
2017-09-24 11:57 ` [Buildroot] [PATCH 1/5] package/ngircd: bump version to 24 Arnout Vandecappelle
4 siblings, 0 replies; 6+ messages in thread
From: Bernd Kuhls @ 2017-09-13 12:29 UTC (permalink / raw)
To: buildroot
zlib is not a hard dependency:
https://github.com/ngircd/ngircd/blob/master/configure.ng#L256
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/ngircd/Config.in | 1 -
package/ngircd/ngircd.mk | 8 +++++++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/package/ngircd/Config.in b/package/ngircd/Config.in
index f1d8bea904..9b3d430922 100644
--- a/package/ngircd/Config.in
+++ b/package/ngircd/Config.in
@@ -1,7 +1,6 @@
config BR2_PACKAGE_NGIRCD
bool "ngircd"
depends on BR2_USE_MMU # fork()
- select BR2_PACKAGE_ZLIB
help
Next Generation IRC server deamon.
diff --git a/package/ngircd/ngircd.mk b/package/ngircd/ngircd.mk
index 06318a9df3..9fa30da24c 100644
--- a/package/ngircd/ngircd.mk
+++ b/package/ngircd/ngircd.mk
@@ -7,7 +7,6 @@
NGIRCD_VERSION = 24
NGIRCD_SOURCE = ngircd-$(NGIRCD_VERSION).tar.xz
NGIRCD_SITE = https://arthur.barton.de/pub/ngircd
-NGIRCD_DEPENDENCIES = zlib
NGIRCD_LICENSE = GPL-2.0+
NGIRCD_LICENSE_FILES = COPYING
@@ -24,4 +23,11 @@ NGIRCD_CONF_OPTS += --without-gnutls
endif
endif
+ifeq ($(BR2_PACKAGE_ZLIB),y)
+NGIRCD_CONF_OPTS += --with-zlib=$(STAGING_DIR)/usr
+NGIRCD_DEPENDENCIES += zlib
+else
+NGIRCD_CONF_OPTS += --without-zlib
+endif
+
$(eval $(autotools-package))
--
2.11.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 5/5] package/ngircd: add optional support for linux-pam
2017-09-13 12:29 [Buildroot] [PATCH 1/5] package/ngircd: bump version to 24 Bernd Kuhls
` (2 preceding siblings ...)
2017-09-13 12:29 ` [Buildroot] [PATCH 4/5] package/ngircd: make zlib an optional dependency Bernd Kuhls
@ 2017-09-13 12:29 ` Bernd Kuhls
2017-09-24 11:57 ` [Buildroot] [PATCH 1/5] package/ngircd: bump version to 24 Arnout Vandecappelle
4 siblings, 0 replies; 6+ messages in thread
From: Bernd Kuhls @ 2017-09-13 12:29 UTC (permalink / raw)
To: buildroot
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/ngircd/ngircd.mk | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/package/ngircd/ngircd.mk b/package/ngircd/ngircd.mk
index 9fa30da24c..37c4f87d43 100644
--- a/package/ngircd/ngircd.mk
+++ b/package/ngircd/ngircd.mk
@@ -10,6 +10,13 @@ NGIRCD_SITE = https://arthur.barton.de/pub/ngircd
NGIRCD_LICENSE = GPL-2.0+
NGIRCD_LICENSE_FILES = COPYING
+ifeq ($(BR2_PACKAGE_LINUX_PAM),y)
+NGIRCD_CONF_OPTS += --with-pam=$(STAGING_DIR)/usr
+NGIRCD_DEPENDENCIES += linux-pam
+else
+NGIRCD_CONF_OPTS += --with-pam
+endif
+
ifeq ($(BR2_PACKAGE_OPENSSL),y)
NGIRCD_CONF_OPTS += --with-openssl=$(STAGING_DIR)/usr
NGIRCD_DEPENDENCIES += openssl
--
2.11.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 1/5] package/ngircd: bump version to 24
2017-09-13 12:29 [Buildroot] [PATCH 1/5] package/ngircd: bump version to 24 Bernd Kuhls
` (3 preceding siblings ...)
2017-09-13 12:29 ` [Buildroot] [PATCH 5/5] package/ngircd: add optional support for linux-pam Bernd Kuhls
@ 2017-09-24 11:57 ` Arnout Vandecappelle
4 siblings, 0 replies; 6+ messages in thread
From: Arnout Vandecappelle @ 2017-09-24 11:57 UTC (permalink / raw)
To: buildroot
On 13-09-17 14:29, Bernd Kuhls wrote:
> Switched _SITE to https, added patch to fix compile error.
>
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Series applied to master, thanks.
Regards,
Arnout
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-09-24 11:57 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-09-13 12:29 [Buildroot] [PATCH 1/5] package/ngircd: bump version to 24 Bernd Kuhls
2017-09-13 12:29 ` [Buildroot] [PATCH 2/5] package/ngircd: add optional dependency to openssl Bernd Kuhls
2017-09-13 12:29 ` [Buildroot] [PATCH 3/5] package/ngircd: add optional support for gnutls Bernd Kuhls
2017-09-13 12:29 ` [Buildroot] [PATCH 4/5] package/ngircd: make zlib an optional dependency Bernd Kuhls
2017-09-13 12:29 ` [Buildroot] [PATCH 5/5] package/ngircd: add optional support for linux-pam Bernd Kuhls
2017-09-24 11:57 ` [Buildroot] [PATCH 1/5] package/ngircd: bump version to 24 Arnout Vandecappelle
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.