Befator-Inc-Firmen-Netzwerk/MSYS2-packages
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

libtirpc: Update to 1.3.6 (#5402)

Browse Source 
sync patches with cygwin
This commit is contained in:
Christoph Reiter 2025-05-20 08:09:32 +02:00 committed by GitHub
parent dc17e6ed9e
commit c53aee4bf4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 85 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libtirpc/0.2.4-cygwin-pthread.patch
View File

@ -1,11 +0,0 @@
--- origsrc/libtirpc-0.2.4/tirpc/reentrant.h 2014-06-09 17:08:42.522558900 -0500
+++ src/libtirpc-0.2.4/tirpc/reentrant.h 2014-06-09 17:08:43.133636500 -0500
@@ -36,7 +36,7 @@
* These definitions are only guaranteed to be valid on Linux.
*/
-#if defined(__linux__)
+#if defined(__linux__) || defined(__CYGWIN__)
#include <pthread.h>

53
libtirpc/1.3.3-cygwin-bindresvport.patch
View File

@ -1,53 +0,0 @@
--- origsrc/libtirpc-1.3.3/configure.ac 2022-08-10 08:25:16.416044500 +0200
+++ configure.ac 2022-08-10 12:19:20.214909400 +0200
@@ -100,9 +100,9 @@ AC_HEADER_DIRENT
AC_PREFIX_DEFAULT(/usr)
AC_CHECK_HEADERS([arpa/inet.h fcntl.h libintl.h limits.h locale.h netdb.h netinet/in.h stddef.h stdint.h stdlib.h string.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h syslog.h unistd.h features.h gssapi/gssapi_ext.h])
AX_PTHREAD
-AC_CHECK_FUNCS([getrpcbyname getrpcbynumber setrpcent endrpcent getrpcent])
+AC_CHECK_FUNCS([bindresvport getrpcbyname getrpcbynumber setrpcent endrpcent getrpcent])
-AC_CONFIG_FILES([Makefile src/Makefile man/Makefile doc/Makefile])
+AC_CONFIG_FILES([Makefile tirpc/Makefile src/Makefile man/Makefile doc/Makefile])
AC_OUTPUT(libtirpc.pc)
--- origsrc/libtirpc-1.3.3/src/bindresvport.c 2022-08-02 20:55:33.000000000 +0200
+++ src/bindresvport.c 2022-08-10 12:14:00.218916600 +0200
@@ -33,6 +33,10 @@
* Portions Copyright(C) 1996, Jason Downs. All rights reserved.
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <sys/types.h>
#include <sys/socket.h>
@@ -51,6 +55,8 @@
#include <string.h>
#include <reentrant.h>
+#if !HAVE_BINDRESVPORT
+
extern pthread_mutex_t port_lock;
/*
@@ -335,3 +341,4 @@ bindresvport_sa(sd, sa)
return (error);
}
#endif
+#endif /* !HAVE_BINDRESVPORT */
--- origsrc/libtirpc-1.3.3/config.h.in 2022-08-07 18:59:28.000000000 +0200
+++ config.h.in 2022-08-10 12:20:15.639463600 +0200
@@ -6,6 +6,9 @@
/* Define to 1 if you have the <arpa/inet.h> header file. */
#undef HAVE_ARPA_INET_H
+/* Define to 1 if you have the `bindresvport' function. */
+#undef HAVE_BINDRESVPORT
+
/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
*/
#undef HAVE_DIRENT_H

8
libtirpc/1.3.3-includedir.patch → libtirpc/1.3.6-Makefile-am.patch
View File

@ -1,5 +1,5 @@
--- origsrc/libtirpc-1.3.3/Makefile.am 2022-08-02 20:55:33.000000000 +0200
+++ Makefile.am 2022-08-10 08:33:43.851108700 +0200
--- origsrc/libtirpc-1.3.6/Makefile.am 2024-10-17 09:50:55.000000000 +0200
+++ Makefile.am 2025-01-07 12:34:00.320378900 +0100
@@ -1,50 +1,6 @@
-SUBDIRS = src man doc
+SUBDIRS = tirpc src man doc
@ -52,8 +52,8 @@
pkgconfigdir=$(libdir)/pkgconfig
pkgconfig_DATA = libtirpc.pc
--- origsrc/libtirpc-1.3.3/tirpc/Makefile.am 1970-01-01 01:00:00.000000000 +0100
+++ tirpc/Makefile.am 2022-08-10 08:23:59.200552000 +0200
--- origsrc/libtirpc-1.3.6/tirpc/Makefile.am 1970-01-01 01:00:00.000000000 +0100
+++ tirpc/Makefile.am 2025-01-07 12:38:01.531431500 +0100
@@ -0,0 +1,43 @@
+noinst_HEADERS = reentrant.h \
+ getpeereid.h \

49
libtirpc/1.3.6-cygwin-bindresvport.patch Normal file
View File

@ -0,0 +1,49 @@
--- origsrc/libtirpc-1.3.6/configure.ac 2025-01-04 07:40:56.946598800 +0100
+++ configure.ac 2025-01-07 08:07:56.571653800 +0100
@@ -162,16 +162,13 @@ AC_CONFIG_HEADERS([config.h])
LT_INIT
AC_HEADER_DIRENT
AC_PREFIX_DEFAULT(/usr)
-AC_CHECK_HEADERS([arpa/inet.h fcntl.h libintl.h limits.h locale.h
-netdb.h netinet/in.h stddef.h stdint.h stdlib.h string.h sys/ioctl.h
-sys/param.h sys/socket.h sys/time.h syslog.h unistd.h features.h
-gssapi/gssapi_ext.h endian.h machine/endian.h])
+AC_CHECK_HEADERS([arpa/inet.h fcntl.h libintl.h limits.h locale.h netdb.h netinet/in.h stddef.h stdint.h stdlib.h string.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h syslog.h unistd.h features.h gssapi/gssapi_ext.h endian.h machine/endian.h])
AX_PTHREAD
-AC_CHECK_FUNCS([getpeereid getrpcbyname getrpcbynumber setrpcent endrpcent getrpcent])
+AC_CHECK_FUNCS([bindresvport getpeereid getrpcbyname getrpcbynumber setrpcent endrpcent getrpcent])
-AC_CHECK_TYPES(struct rpcent,,, [
+AC_CHECK_TYPES([struct rpcent],,, [
#include <netdb.h>])
-AC_CONFIG_FILES([Makefile src/Makefile man/Makefile doc/Makefile])
+AC_CONFIG_FILES([Makefile tirpc/Makefile src/Makefile man/Makefile doc/Makefile])
AC_CONFIG_FILES([libtirpc.pc])
AC_OUTPUT
--- origsrc/libtirpc-1.3.6/src/bindresvport.c 2024-10-17 09:50:55.000000000 +0200
+++ src/bindresvport.c 2025-01-04 08:04:11.718558400 +0100
@@ -33,6 +33,10 @@
* Portions Copyright(C) 1996, Jason Downs. All rights reserved.
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <sys/types.h>
#include <sys/socket.h>
@@ -51,6 +55,7 @@
#include <string.h>
#include <reentrant.h>
+#if !HAVE_BINDRESVPORT
extern pthread_mutex_t port_lock;
/*
@@ -336,3 +341,4 @@ bindresvport_sa(sd, sa)
return (error);
}
#endif
+#endif /* !HAVE_BINDRESVPORT */

11
libtirpc/1.3.6-cygwin-pthread.patch Normal file
View File

@ -0,0 +1,11 @@
--- origsrc/libtirpc-1.3.6/tirpc/reentrant.h 2024-10-17 09:50:55.000000000 +0200
+++ tirpc/reentrant.h 2025-01-04 07:56:20.282001700 +0100
@@ -36,7 +36,7 @@
* These definitions are only guaranteed to be valid on Linux.
*/
-#if defined(__linux__) || defined(__APPLE__)
+#if defined(__linux__) || defined(__APPLE__) || defined(__CYGWIN__)
#include <pthread.h>

10
libtirpc/1.3.2-cygwin-rpcent.patch → libtirpc/1.3.6-cygwin-rpcent.patch
View File

@ -1,11 +1,11 @@
--- origsrc/libtirpc-1.3.2/tirpc/rpc/rpcent.h 2021-05-10 19:59:15.000000000 +0200
+++ src/libtirpc-1.3.2/tirpc/rpc/rpcent.h 2022-01-26 21:48:15.398905000 +0100
--- origsrc/libtirpc-1.3.6/tirpc/rpc/rpcent.h 2024-10-17 09:50:55.000000000 +0200
+++ tirpc/rpc/rpcent.h 2025-01-04 07:58:48.923970800 +0100
@@ -50,7 +50,7 @@ extern "C" {
/* These are defined in /usr/include/rpc/netdb.h, unless we are using
the C library without RPC support. */
-#if defined(__UCLIBC__) && !defined(__UCLIBC_HAS_RPC__) || !defined(__GLIBC__)
+#if defined(__UCLIBC__) && !defined(__UCLIBC_HAS_RPC__) || !defined(__GLIBC__) && !defined(__CYGWIN__)
-#if defined(__UCLIBC__) && !defined(__UCLIBC_HAS_RPC__) || !defined(__GLIBC__) && !defined(HAVE_STRUCT_RPCENT)
+#if defined(__UCLIBC__) && !defined(__UCLIBC_HAS_RPC__) || !defined(__GLIBC__) && !defined(HAVE_STRUCT_RPCENT) && !defined(__CYGWIN__)
struct rpcent {
char *r_name; /* name of server for this rpc program */
char **r_aliases; /* alias list */

13
libtirpc/1000-disable-linux-only.patch
View File

@ -1,13 +0,0 @@
--- libtirpc-1.3.2/src/clnt_dg.c.orig 2021-05-10 19:59:15.000000000 +0200
+++ libtirpc-1.3.2/src/clnt_dg.c 2022-12-29 09:32:39.778869700 +0100
@@ -55,6 +55,10 @@
#include "rpc_com.h"
#include "clnt_fd_locks.h"
+#ifdef __CYGWIN__
+#undef IP_RECVERR
+#endif
+
#ifdef IP_RECVERR
#include <asm/types.h>
#include <linux/errqueue.h>

32
libtirpc/PKGBUILD
View File

@ -2,7 +2,7 @@
pkgbase=libtirpc
pkgname=('libtirpc' 'libtirpc-devel')
pkgver=1.3.4
pkgver=1.3.6
pkgrel=1
pkgdesc="A port of Sun's Transport-Independent RPC library"
arch=('i686' 'x86_64')
@ -16,25 +16,25 @@ makedepends=('gcc' 'patch' 'heimdal-devel' 'autotools')
source=(https://downloads.sourceforge.net/libtirpc/libtirpc-${pkgver}.tar.bz2
0.2.4-cygwin-ipv6.patch
0.2.4-cygwin-poll.patch
0.2.4-cygwin-pthread.patch
0.2.4-cygwin-rpc-types.patch
0.3.2-no-undefined.patch
1.3.2-cygwin-rpcent.patch
1.3.2-cygwin-types.patch
1.3.3-cygwin-bindresvport.patch
1.3.3-includedir.patch
1.3.4-no-errqueue.patch)
sha256sums=('1e0b0c7231c5fa122e06c0609a76723664d068b0dba3b8219b63e6340b347860'
1.3.4-no-errqueue.patch
1.3.6-Makefile-am.patch
1.3.6-cygwin-bindresvport.patch
1.3.6-cygwin-pthread.patch
1.3.6-cygwin-rpcent.patch)
sha256sums=('bbd26a8f0df5690a62a47f6aa30f797f3ef8d02560d1bc449a83066b5a1d3508'
'24d8f179812434e3be91800eb4387fec38d9050f3d1902ee1e66246c776fac11'
'90cedf3f930bf44dbbed2e520305df1a53daddac464d1d68edf501466578ac0c'
'd45ae803c401ca5a37e5084da822ff7f448241be38d457ef981692322e7fd057'
'c247c94a431c0548610c6e97b620a3f81767a31f894b14027737b8afbade95f8'
'19f6c539781476c5ac7fd58f080ca587c4c70c69dd82d57e30d69d39b9c7ac9f'
'46039746d183cc7d8c26f87ed6529578720589d0257f4bb3305318073d0b7964'
'6a93776a8a1a40c67455b35ebec9452d36da6752ab9defbc84e147e3edb33150'
'e7e3eea865c48638d86a91d56a1b1626173f542b86367b82222a04b6b9c15db0'
'46ee748de1794775f03f049f6e8cfb24f9f2760b0efae8a4258c13bc3ec80f6d'
'56b25ddbfbee6eaa204151c77ce15d897ed4e9fb938e91048998127cb3deb373')
'56b25ddbfbee6eaa204151c77ce15d897ed4e9fb938e91048998127cb3deb373'
'cef6d53e47504d23a69a77c82088ebba5a7094e3f208e93e6ccabbc2b59d6c8c'
'71d266bb7d22c0293ef8bf8f78960b130bf26bd94eea57d72469595fa1ab9068'
'630254c38fe8598d9c6e59a96bcd4ec2b548240057c868a1f54d0bc6f206ab18'
'9c9b7d00518b614f7695805396a8f1703c523513b4ef9a54f381a5bec4cd4456')
prepare() {
cd libtirpc-${pkgver}
@ -42,14 +42,14 @@ prepare() {
# from cygwin: https://cygwin.com/cgit/cygwin-packages/libtirpc
patch -p2 -i ${srcdir}/0.2.4-cygwin-ipv6.patch
patch -p2 -i ${srcdir}/0.2.4-cygwin-poll.patch
patch -p2 -i ${srcdir}/0.2.4-cygwin-pthread.patch
patch -p2 -i ${srcdir}/0.2.4-cygwin-rpc-types.patch
patch -p2 -i ${srcdir}/0.3.2-no-undefined.patch
patch -p2 -i ${srcdir}/1.3.2-cygwin-rpcent.patch
patch -p2 -i ${srcdir}/1.3.2-cygwin-types.patch
patch -p2 -i ${srcdir}/1.3.3-cygwin-bindresvport.patch
patch -p2 -i ${srcdir}/1.3.3-includedir.patch
patch -p2 -i ${srcdir}/1.3.4-no-errqueue.patch
patch -p2 -i ${srcdir}/1.3.6-Makefile-am.patch
patch -p2 -i ${srcdir}/1.3.6-cygwin-bindresvport.patch
patch -p2 -i ${srcdir}/1.3.6-cygwin-pthread.patch
patch -p2 -i ${srcdir}/1.3.6-cygwin-rpcent.patch
autoreconf -fiv
}