From 93e15c3aeab3b43d9492fa48b0b0ebcedcd394fa Mon Sep 17 00:00:00 2001
From: Ørjan Malde <red@foxi.me>
Date: May 25 2021 11:14:39 +0000
Subject: groups/241.native_packages_inet.group: adds ngircd v26.1


Signed-off-by: Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de>

---

diff --git a/groups/241.native_packages_inet.group b/groups/241.native_packages_inet.group
index 20534c1..06d4a14 100644
--- a/groups/241.native_packages_inet.group
+++ b/groups/241.native_packages_inet.group
@@ -5,7 +5,7 @@ GROUP_TARGET="native_packages";
 NATIVE_PACKAGES_PACKAGES="$(rtl_lconcat "${NATIVE_PACKAGES_PACKAGES}" "
 apk_tools aria2 bind ca_certificates curl dropbear fetchmail git gnupg gpgme
 gnutls httpd icecast inetutils irssi isync ldns lighttpd links lynx mailutils
-microsocks mtr mutt nginx nullmailer openlitespeed opensmtpd openssh
+microsocks mtr mutt nginx ngircd nullmailer openlitespeed opensmtpd openssh
 proxytunnel rsync socat thttpd w3m weechat wget whois")";
 : ${PKG_APK_TOOLS_DEPENDS:="libfetch libressl libz"};
 : ${PKG_APK_TOOLS_SHA256SUM:=def2b2c23cd12fd2a9c19be49653b0d1bf9d81a26dac5a0ee79a1351d674f93b};
@@ -149,6 +149,11 @@ proxytunnel rsync socat thttpd w3m weechat wget whois")";
 : ${PKG_NGINX_CONFIGURE_ARGS:="--prefix="};
 : ${PKG_NGINX_ENV_VARS_EXTRA:=CC=${DEFAULT_TARGET}-gcc};
 : ${PKG_NGINX_IN_TREE:=1};
+: ${PKG_NGIRCD_DEPENDS:="gnutls"};
+: ${PKG_NGIRCD_SHA256SUM:=55c16fd26009f6fc6a007df4efac87a02e122f680612cda1ce26e17a18d86254};
+: ${PKG_NGIRCD_VERSION:=26.1};
+: ${PKG_NGIRCD_URL:=https://arthur.barton.de/pub/ngircd/ngircd-${PKG_NGIRCD_VERSION}.tar.xz};
+: ${PKG_NGIRCD_CONFIGURE_ARGS_EXTRA:="--with-gnutls"};
 : ${PKG_NULLMAILER_DEPENDS:="gnutls"};
 : ${PKG_NULLMAILER_SHA256SUM:=6d277f69f1999c86df0ca9a97a4f14f9bb431c50fd4e016918290b84ff679241}
 : ${PKG_NULLMAILER_VERSION:=2.2}
diff --git a/patches/ngircd-26.1.local.patch b/patches/ngircd-26.1.local.patch
new file mode 100644
index 0000000..be2f3ea
--- /dev/null
+++ b/patches/ngircd-26.1.local.patch
@@ -0,0 +1,28 @@
+diff -ru ngircd-26.1.orig/src/ngircd/ngircd.c ngircd-26.1/src/ngircd/ngircd.c
+--- ngircd-26.1.orig/src/ngircd/ngircd.c	2021-01-01 14:59:34.000000000 +0000
++++ ngircd-26.1/src/ngircd/ngircd.c	2021-05-22 11:09:21.450145200 +0000
+@@ -574,7 +574,7 @@
+ {
+ 	struct passwd *pwd;
+ 
+-#ifdef __CYGWIN__
++#if defined(__CYGWIN__) || defined(__midipix__)
+ 	/* Cygwin kludge.
+ 	 * It can return EINVAL instead of EPERM
+ 	 * so, if we are already unprivileged,
+@@ -739,6 +739,7 @@
+ 	}
+ #endif
+ 
++#ifndef __midipix__
+ 	/* Change user ID */
+ 	if (getuid() != Conf_UID) {
+ 		if (setuid(Conf_UID) != 0) {
+@@ -751,6 +752,7 @@
+ 				goto out;
+ 		}
+ 	}
++#endif
+ 
+ 	initialized = true;
+ 
diff --git a/patches/ngircd-26.1_pre.local.patch b/patches/ngircd-26.1_pre.local.patch
new file mode 100644
index 0000000..9edee27
--- /dev/null
+++ b/patches/ngircd-26.1_pre.local.patch
@@ -0,0 +1,62 @@
+diff -ru ngircd-26.1.orig/configure ngircd-26.1/configure
+--- ngircd-26.1.orig/configure	2021-01-02 14:21:14.000000000 +0000
++++ ngircd-26.1/configure	2021-05-25 11:07:06.800708600 +0000
+@@ -6269,56 +6269,9 @@
+ if test "x$ac_cv_func_getaddrinfo" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_GETADDRINFO 1
++#define HAVE_WORKING_GETADDRINFO 1
+ _ACEOF
+ 
+-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether getaddrinfo() works" >&5
+-$as_echo_n "checking whether getaddrinfo() works... " >&6; }
+-		if test "$cross_compiling" = yes; then :
+-
+-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-
+-else
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-#include <stdio.h>
+-#include <sys/types.h>
+-#include <sys/socket.h>
+-#include <netdb.h>
+-int
+-main(int argc, char **argv)
+-{
+-	struct addrinfo hints, *ai;
+-	memset(&hints, 0, sizeof(hints));
+-	hints.ai_flags = AI_PASSIVE;
+-	hints.ai_socktype = SOCK_STREAM;
+-	hints.ai_family = PF_UNSPEC;
+-	if(getaddrinfo(NULL, "0", &hints, &ai) != 0)
+-		return 1;
+-	return 0;
+-}
+-
+-_ACEOF
+-if ac_fn_c_try_run "$LINENO"; then :
+-
+-
+-$as_echo "#define HAVE_WORKING_GETADDRINFO 1" >>confdefs.h
+-
+-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-
+-else
+-
+-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-
+-fi
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+-fi
+-
+-
+ fi
+ done
+ 
+