From 02ad89482fdde62dfc7cc2efb353c80e85341ad2 Mon Sep 17 00:00:00 2001 From: Ørjan Malde Date: Sep 25 2020 17:33:00 +0000 Subject: groups/251.native_packages_lib.group: libtirpc: bump to v1.2.6 Signed-off-by: Lucio Andrés Illanes Albornoz --- diff --git a/groups/251.native_packages_lib.group b/groups/251.native_packages_lib.group index 2567bd8..68931d7 100644 --- a/groups/251.native_packages_lib.group +++ b/groups/251.native_packages_lib.group @@ -187,9 +187,9 @@ libxslt libz libzip wolfssl")"; : ${PKG_LIBTHEORA_IN_TREE:=1}; : ${PKG_LIBTHEORA_MAKEFLAGS_BUILD:=-j1}; : ${PKG_LIBTIRPC_DEPENDS:="musl_compat"}; -: ${PKG_LIBTIRPC_SHA256SUM:=2ca529f02292e10c158562295a1ffd95d2ce8af97820e3534fe1b0e3aec7561d}; -: ${PKG_LIBTIRPC_VERSION:=1.1.4}; -: ${PKG_LIBTIRPC_URL:=https://sourceforge.mirrorservice.org/l/li/libtirpc/libtirpc/${PKG_LIBTIRPC_VERSION}/libtirpc-${PKG_LIBTIRPC_VERSION}.tar.bz2}; +: ${PKG_LIBTIRPC_SHA256SUM:=4278e9a5181d5af9cd7885322fdecebc444f9a3da87c526e7d47f7a12a37d1cc}; +: ${PKG_LIBTIRPC_VERSION:=1.2.6}; +: ${PKG_LIBTIRPC_URL:=https://ftp.osuosl.org/pub/blfs/conglomeration/libtirpc/libtirpc-${PKG_LIBTIRPC_VERSION}.tar.bz2}; : ${PKG_LIBTIRPC_CONFIGURE_ARGS_EXTRA:="--disable-gssapi"}; : ${PKG_LIBUDNS_URLS_GIT:=libudns=https://github.com/shadowsocks/libudns.git@master}; : ${PKG_LIBUNISTRING_SHA256SUM:=eb8fb2c3e4b6e2d336608377050892b54c3c983b646c561836550863003c05d7}; diff --git a/patches/libtirpc-1.1.4.local.patch b/patches/libtirpc-1.1.4.local.patch deleted file mode 100644 index 535880f..0000000 --- a/patches/libtirpc-1.1.4.local.patch +++ /dev/null @@ -1,90 +0,0 @@ -diff -ru libtirpc-1.0.3.orig/src/bindresvport.c libtirpc-1.0.3/src/bindresvport.c ---- libtirpc-1.0.3.orig/src/bindresvport.c 2018-03-14 14:55:12.000000000 +0100 -+++ libtirpc-1.0.3/src/bindresvport.c 2018-08-04 19:37:31.972078008 +0200 -@@ -61,7 +61,7 @@ - return bindresvport_sa(sd, (struct sockaddr *)sin); - } - --#ifdef __linux__ -+#if defined(__linux__) || defined(__midipix__) - - #define STARTPORT 600 - #define LOWPORT 512 -diff -ru libtirpc-1.0.3.orig/src/clnt_dg.c libtirpc-1.0.3/src/clnt_dg.c ---- libtirpc-1.0.3.orig/src/clnt_dg.c 2018-03-14 14:55:12.000000000 +0100 -+++ libtirpc-1.0.3/src/clnt_dg.c 2018-08-04 19:41:06.325266026 +0200 -@@ -54,12 +54,16 @@ - #include - #include "rpc_com.h" - --#ifdef IP_RECVERR -+#if defined(IP_RECVERR) && !defined(__midipix__) - #include - #include - #include - #endif - -+#ifdef __midipix__ -+#include -+#endif -+ - - #define MAX_DEFAULT_FDS 20000 - -@@ -421,7 +425,7 @@ - } - break; - } --#ifdef IP_RECVERR -+#if defined(IP_RECVERR) && !defined(__midipix__) - if (fd.revents & POLLERR) - { - struct msghdr msg; -diff -ru libtirpc-1.0.3.orig/src/rtime.c libtirpc-1.0.3/src/rtime.c ---- libtirpc-1.0.3.orig/src/rtime.c 2018-03-14 14:55:12.000000000 +0100 -+++ libtirpc-1.0.3/src/rtime.c 2018-08-04 19:47:49.089270334 +0200 -@@ -46,7 +46,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include -diff -ru libtirpc-1.0.3.orig/src/svc_run.c libtirpc-1.0.3/src/svc_run.c ---- libtirpc-1.0.3.orig/src/svc_run.c 2018-03-14 14:55:12.000000000 +0100 -+++ libtirpc-1.0.3/src/svc_run.c 2018-08-04 19:48:02.569155655 +0200 -@@ -37,7 +37,7 @@ - #include - #include - #include --#include -+#include - - - #include -diff -ru libtirpc-1.0.3.orig/tirpc/reentrant.h libtirpc-1.0.3/tirpc/reentrant.h ---- libtirpc-1.0.3.orig/tirpc/reentrant.h 2018-03-14 14:55:12.000000000 +0100 -+++ libtirpc-1.0.3/tirpc/reentrant.h 2018-08-04 19:23:48.165632436 +0200 -@@ -36,7 +36,7 @@ - * These definitions are only guaranteed to be valid on Linux. - */ - --#if defined(__linux__) -+#if defined(__linux__) || defined(__midipix__) - - #include - -diff -ru libtirpc-1.0.3.orig/tirpc/rpc/types.h libtirpc-1.0.3/tirpc/rpc/types.h ---- libtirpc-1.0.3.orig/tirpc/rpc/types.h 2018-03-14 14:55:12.000000000 +0100 -+++ libtirpc-1.0.3/tirpc/rpc/types.h 2018-08-04 19:18:35.415064046 +0200 -@@ -66,7 +66,7 @@ - #define mem_free(ptr, bsize) free(ptr) - - --#if defined __APPLE_CC__ || defined __FreeBSD__ -+#if defined __APPLE_CC__ || defined __FreeBSD__ || !defined(__GLIBC__) - # define __u_char_defined - # define __daddr_t_defined - #endif diff --git a/patches/libtirpc-1.2.6.local.patch b/patches/libtirpc-1.2.6.local.patch new file mode 100644 index 0000000..55b2194 --- /dev/null +++ b/patches/libtirpc-1.2.6.local.patch @@ -0,0 +1,78 @@ +diff -ru libtirpc-1.0.3.orig/src/bindresvport.c libtirpc-1.0.3/src/bindresvport.c +--- libtirpc-1.0.3.orig/src/bindresvport.c 2018-03-14 14:55:12.000000000 +0100 ++++ libtirpc-1.0.3/src/bindresvport.c 2018-08-04 19:37:31.972078008 +0200 +@@ -61,7 +61,7 @@ + return bindresvport_sa(sd, (struct sockaddr *)sin); + } + +-#ifdef __linux__ ++#if defined(__linux__) || defined(__midipix__) + + #define STARTPORT 600 + #define LOWPORT 512 +diff -ru libtirpc-1.0.3.orig/src/clnt_dg.c libtirpc-1.0.3/src/clnt_dg.c +--- libtirpc-1.0.3.orig/src/clnt_dg.c 2018-03-14 14:55:12.000000000 +0100 ++++ libtirpc-1.0.3/src/clnt_dg.c 2018-08-04 19:41:06.325266026 +0200 +@@ -54,12 +54,16 @@ + #include + #include "rpc_com.h" + +-#ifdef IP_RECVERR ++#if defined(IP_RECVERR) && !defined(__midipix__) + #include + #include + #include + #endif + ++#ifdef __midipix__ ++#include ++#endif ++ + + #define MAX_DEFAULT_FDS 20000 + +@@ -421,7 +425,7 @@ + } + break; + } +-#ifdef IP_RECVERR ++#if defined(IP_RECVERR) && !defined(__midipix__) + if (fd.revents & POLLERR) + { + struct msghdr msg; +diff -ru libtirpc-1.0.3.orig/src/rtime.c libtirpc-1.0.3/src/rtime.c +--- libtirpc-1.0.3.orig/src/rtime.c 2018-03-14 14:55:12.000000000 +0100 ++++ libtirpc-1.0.3/src/rtime.c 2018-08-04 19:47:49.089270334 +0200 +@@ -46,7 +46,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +diff -ru libtirpc-1.0.3.orig/src/svc_run.c libtirpc-1.0.3/src/svc_run.c +--- libtirpc-1.0.3.orig/src/svc_run.c 2018-03-14 14:55:12.000000000 +0100 ++++ libtirpc-1.0.3/src/svc_run.c 2018-08-04 19:48:02.569155655 +0200 +@@ -37,7 +37,7 @@ + #include + #include + #include +-#include ++#include + + + #include +diff -ru libtirpc-1.0.3.orig/tirpc/reentrant.h libtirpc-1.0.3/tirpc/reentrant.h +--- libtirpc-1.0.3.orig/tirpc/reentrant.h 2018-03-14 14:55:12.000000000 +0100 ++++ libtirpc-1.0.3/tirpc/reentrant.h 2018-08-04 19:23:48.165632436 +0200 +@@ -36,7 +36,7 @@ + * These definitions are only guaranteed to be valid on Linux. + */ + +-#if defined(__linux__) ++#if defined(__linux__) || defined(__midipix__) + + #include +