[gentoo-commits] repo/gentoo:master commit in: net-libs/libtirpc/files/, net-libs/libtirpc/
commit: 6be44a813b7d5fd2c88a0e044578a5ed54c8ef64 Author: Sam James gentoo org> AuthorDate: Tue Aug 9 19:16:29 2022 + Commit: Sam James gentoo org> CommitDate: Tue Aug 9 20:05:46 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6be44a81 net-libs/libtirpc: add 1.3.3 Signed-off-by: Sam James gentoo.org> net-libs/libtirpc/Manifest | 1 + .../files/libtirpc-1.3.3-release-version.patch | 91 ++ net-libs/libtirpc/libtirpc-1.3.3.ebuild| 66 3 files changed, 158 insertions(+) diff --git a/net-libs/libtirpc/Manifest b/net-libs/libtirpc/Manifest index 7f745c7d4b75..84ccc63b4af4 100644 --- a/net-libs/libtirpc/Manifest +++ b/net-libs/libtirpc/Manifest @@ -1,2 +1,3 @@ DIST libtirpc-1.3.2.tar.bz2 513151 BLAKE2B 375b7bb046244f4666522c4f148428349fe1867b095dc5e268d037ba26982f88df70b0ad21fbe2b99150f644806a46651b524c3b9f7fe2499469806ea50b0331 SHA512 8664d5c4f842ee5acf83b9c1cadb7871f17b8157a7c4500e2236dcfb3a25768cab39f7c5123758dcd7381e30eb028ddfa26a28f458283f2dcea3426c9878c255 +DIST libtirpc-1.3.3.tar.bz2 562812 BLAKE2B e229869b05103d912b677f78648dce1f7fa7649bdf44b782a5fb97635eecf07f768bbc0ef25c0f065c8253fbe37c12b80934d9102b7345adfc4102897458b487 SHA512 df0781a74ff9ded2d3c4f5eb7e05496b9f58eac8060c02c68331dc14c4a00304dcd19f46836f5756fe0d9d27095fd463d42dd696fcdff891516711b7d63deabe DIST libtirpc-glibc-nfs.tar.xz 8948 BLAKE2B 7316623d9f2b6928e296137fe2bf6794b208d549c2ffba9e4a35b47f7b04bf023798a09f38c02d039debf6adc466d7689cf3c8274d71a22eaff08729642c0a28 SHA512 90255bf0a27af16164e0710dd940778609925d473f4343093ff19d98cc4f23023788bf4edf0178eae1961afc0ba8b69b273de95b7d7e2afdb706701d8ba6f7ba diff --git a/net-libs/libtirpc/files/libtirpc-1.3.3-release-version.patch b/net-libs/libtirpc/files/libtirpc-1.3.3-release-version.patch new file mode 100644 index ..e80b02245a4d --- /dev/null +++ b/net-libs/libtirpc/files/libtirpc-1.3.3-release-version.patch @@ -0,0 +1,91 @@ +https://git.linux-nfs.org/?p=steved/libtirpc.git;a=commitdiff;h=0fb94eef5062d2657d75eee686fa47238fafa312 + +From: Steve Dickson +Date: Sun, 7 Aug 2022 12:57:19 -0400 +Subject: [PATCH] Release: 1.3.3 + +Signed-off-by: Steve Dickson +--- a/configure b/configure +@@ -1,6 +1,6 @@ + #! /bin/sh + # Guess values for system-dependent variables and create Makefiles. +-# Generated by GNU Autoconf 2.71 for libtirpc 1.3.2. ++# Generated by GNU Autoconf 2.71 for libtirpc 1.3.3. + # + # + # Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation, +@@ -618,8 +618,8 @@ MAKEFLAGS= + # Identity of this package. + PACKAGE_NAME='libtirpc' + PACKAGE_TARNAME='libtirpc' +-PACKAGE_VERSION='1.3.2' +-PACKAGE_STRING='libtirpc 1.3.2' ++PACKAGE_VERSION='1.3.3' ++PACKAGE_STRING='libtirpc 1.3.3' + PACKAGE_BUGREPORT='' + PACKAGE_URL='' + +@@ -1373,7 +1373,7 @@ if test "$ac_init_help" = "long"; then + # Omit some internal or obsolete options to make the list less imposing. + # This message is too long to be a string in the A/UX 3.1 sh. + cat <<_ACEOF +-\`configure' configures libtirpc 1.3.2 to adapt to many kinds of systems. ++\`configure' configures libtirpc 1.3.3 to adapt to many kinds of systems. + + Usage: $0 [OPTION]... [VAR=VALUE]... + +@@ -1444,7 +1444,7 @@ fi + + if test -n "$ac_init_help"; then + case $ac_init_help in +- short | recursive ) echo "Configuration of libtirpc 1.3.2:";; ++ short | recursive ) echo "Configuration of libtirpc 1.3.3:";; +esac + cat <<\_ACEOF + +@@ -1559,7 +1559,7 @@ fi + test -n "$ac_init_help" && exit $ac_status + if $ac_init_version; then + cat <<\_ACEOF +-libtirpc configure 1.3.2 ++libtirpc configure 1.3.3 + generated by GNU Autoconf 2.71 + + Copyright (C) 2021 Free Software Foundation, Inc. +@@ -1815,7 +1815,7 @@ cat >config.log <<_ACEOF + This file contains any messages produced by compilers while + running configure, to aid debugging if configure makes a mistake. + +-It was created by libtirpc $as_me 1.3.2, which was ++It was created by libtirpc $as_me 1.3.3, which was + generated by GNU Autoconf 2.71. Invocation command line was + + $ $0$ac_configure_args_raw +@@ -3084,7 +3084,7 @@ fi + + # Define the identity of the package. + PACKAGE='libtirpc' +- VERSION='1.3.2' ++ VERSION='1.3.3' + + + printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h +@@ -14643,7 +14662,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + # report actual input values of CONFIG_FILES etc. instead of their + # values after options handling. + ac_log=" +-This file was extended by libtirpc $as_me 1.3.2, which was ++This file was extended by libtirpc $as_me 1.3.3, which was + generated by GNU Autoconf 2.71. Invocation command line was + + CONFIG_FILES= $CONFIG_FILES +@@ -14711,7 +14730,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/' + cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + ac_cs_config='$ac_cs_config_escaped' +
[gentoo-commits] repo/gentoo:master commit in: net-libs/libtirpc/files/, net-libs/libtirpc/
commit: 5cd60c98745f183e9327110469af3ae0c24c95a0 Author: Lars Wendler gentoo org> AuthorDate: Fri Dec 4 08:47:26 2020 + Commit: Lars Wendler gentoo org> CommitDate: Fri Dec 4 08:47:40 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cd60c98 net-libs/libtirpc: Removed old Package-Manager: Portage-3.0.11, Repoman-3.0.2 Signed-off-by: Lars Wendler gentoo.org> net-libs/libtirpc/Manifest | 1 - .../libtirpc-1.2.5-avoid-multiple-definition.patch | 44 --- .../libtirpc/files/libtirpc-1.2.5-endian.h.patch | 31 --- net-libs/libtirpc/libtirpc-1.2.5.ebuild| 65 -- 4 files changed, 141 deletions(-) diff --git a/net-libs/libtirpc/Manifest b/net-libs/libtirpc/Manifest index 5715978a610..ccb8c655851 100644 --- a/net-libs/libtirpc/Manifest +++ b/net-libs/libtirpc/Manifest @@ -1,4 +1,3 @@ -DIST libtirpc-1.2.5.tar.bz2 513146 BLAKE2B 732e4832f3440d9fa08c45c01c56135ff1b96564c55d33e9b3f16c8361a4f02e49a35638b73110bb72da4bfb78107ccb1b4d475d1ecbdd62dcc156529a372c3e SHA512 d31cd4e22301abe1baddd7e8f45aaaf056a40799e961646691d071084fed50563b5eecdd9b78062fe378be8db7a6d4b87597e21cb81ac925e447148684a2b002 DIST libtirpc-1.2.6.tar.bz2 513150 BLAKE2B 81ca8d1897b84897b31bd81c17e446213b798e00de80f03736f73eaf6b2e9e436b1569243bf9a8c5ad22de7da51339432decd2a8d3f1b8135151fd7e0f703e54 SHA512 bcb6b5c062c1301aa1246ec93ae0a5c1d221b8421126d020863517cb814b43ed038fb6c0c2faf4e68ff133b69abefe4f4d42bfc870671da6c27ca941a30b155a DIST libtirpc-1.3.1.tar.bz2 513399 BLAKE2B 8cc42292cdbde55a0095669bd9ccb3666b9e33d6ec9880ac79d034d42155d1b585f4181ff92f8290d7b5cce01bace2629d1ddfe0d61813f00851216f2be5ed0d SHA512 131f746800ac7280cc3900597018fc8dbc8da50c14e29dbaccf36a6d110eded117351108c6b069eaac90d77cfec17014b08e9afddcf153fda2d780ba64260cbc DIST libtirpc-glibc-nfs.tar.xz 8948 BLAKE2B 7316623d9f2b6928e296137fe2bf6794b208d549c2ffba9e4a35b47f7b04bf023798a09f38c02d039debf6adc466d7689cf3c8274d71a22eaff08729642c0a28 SHA512 90255bf0a27af16164e0710dd940778609925d473f4343093ff19d98cc4f23023788bf4edf0178eae1961afc0ba8b69b273de95b7d7e2afdb706701d8ba6f7ba diff --git a/net-libs/libtirpc/files/libtirpc-1.2.5-avoid-multiple-definition.patch b/net-libs/libtirpc/files/libtirpc-1.2.5-avoid-multiple-definition.patch deleted file mode 100644 index a5fecc54ced..000 --- a/net-libs/libtirpc/files/libtirpc-1.2.5-avoid-multiple-definition.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 69682de06816de9b9014441d23bda1918ee2e2fb Mon Sep 17 00:00:00 2001 -From: Mike Gilbert -Date: Sun, 19 Jan 2020 16:57:45 -0500 -Subject: [PATCH] Avoid multiple-definiton with gcc -fno-common - -GCC 10 enables -fno-common by default. - -Bug: https://bugs.gentoo.org/705896 - src/rpc_com.h | 3 +-- - src/svc.c | 3 +++ - 2 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/src/rpc_com.h b/src/rpc_com.h -index 10bec79..76badef 100644 a/src/rpc_com.h -+++ b/src/rpc_com.h -@@ -61,8 +61,7 @@ void __xprt_unregister_unlocked(SVCXPRT *); - void __xprt_set_raddr(SVCXPRT *, const struct sockaddr_storage *); - - --SVCXPRT **__svc_xports; --int __svc_maxrec; -+extern int __svc_maxrec; - - #ifdef __cplusplus - } -diff --git a/src/svc.c b/src/svc.c -index b59467b..6db164b 100644 a/src/svc.c -+++ b/src/svc.c -@@ -57,6 +57,9 @@ - - #define max(a, b) (a > b ? a : b) - -+static SVCXPRT **__svc_xports; -+int __svc_maxrec; -+ - /* - * The services list - * Each entry represents a set of procedures (an rpc program). --- -2.25.0 - diff --git a/net-libs/libtirpc/files/libtirpc-1.2.5-endian.h.patch b/net-libs/libtirpc/files/libtirpc-1.2.5-endian.h.patch deleted file mode 100644 index 8245d022bde..000 --- a/net-libs/libtirpc/files/libtirpc-1.2.5-endian.h.patch +++ /dev/null @@ -1,31 +0,0 @@ -From d04f4d6f0e682f16b0ce96839ab4eadade591eb1 Mon Sep 17 00:00:00 2001 -From: Rosen Penev -Date: Tue, 21 Jan 2020 11:51:16 -0500 -Subject: [PATCH] xdr_float: do not include bits/endian.h - -bits/endian.h is an internal header. endian.h should be included. - -Fixes compilation with recent musl. - -Signed-off-by: Rosen Penev -Signed-off-by: Steve Dickson - src/xdr_float.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/xdr_float.c b/src/xdr_float.c -index 26bc865..349d48f 100644 a/src/xdr_float.c -+++ b/src/xdr_float.c -@@ -83,7 +83,7 @@ static struct sgl_limits { - }; - #else - --#include -+#include - #define IEEEFP - - #endif /* vax */ --- -1.8.3.1 - diff --git a/net-libs/libtirpc/libtirpc-1.2.5.ebuild b/net-libs/libtirpc/libtirpc-1.2.5.ebuild deleted file mode 100644 index 632193139a1..000 --- a/net-libs/libtirpc/libtirpc-1.2.5.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools multilib-minimal toolchain-funcs usr-ldscript - -DESCRIPTION="Transport Independent RPC library
[gentoo-commits] repo/gentoo:master commit in: net-libs/libtirpc/files/, net-libs/libtirpc/
commit: 43dcada96a162e895af35ba7bc77b5acccfd8d3d Author: Lars Wendler gentoo org> AuthorDate: Tue Mar 20 12:22:17 2018 + Commit: Lars Wendler gentoo org> CommitDate: Tue Mar 20 13:36:43 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43dcada9 net-libs/libtirpc: Removed old. Package-Manager: Portage-2.3.24, Repoman-2.3.6 net-libs/libtirpc/Manifest | 1 - .../files/libtirpc-1.0.1-CVE-2017-8779.patch | 255 - net-libs/libtirpc/libtirpc-1.0.1-r1.ebuild | 60 - 3 files changed, 316 deletions(-) diff --git a/net-libs/libtirpc/Manifest b/net-libs/libtirpc/Manifest index 5133ab31777..95af0c27cb3 100644 --- a/net-libs/libtirpc/Manifest +++ b/net-libs/libtirpc/Manifest @@ -1,4 +1,3 @@ -DIST libtirpc-1.0.1.tar.bz2 495125 BLAKE2B bb282c6d0aa097840758b00b37c73f391aabc234b5a6e51282004c2c46b403e2ca66180b77810ec6009ea9c9a2a6aae7907a15102ff42f51e3e57e151124bf4c SHA512 c9b449e737bc2bd3d56e31e8352f312e89a7ec2a11b73b5ac314e7d82d3b644c611e422b623912453b67b668f86a6de7bb7f18c9495dd15de8e2798ec2ff41c8 DIST libtirpc-1.0.2.tar.bz2 509601 BLAKE2B 7ccf23ca200e2027a66a3105d9b3d0612ac66a08498931f66526a291be6ddef8e7df533af4d44a0e4a1178edd6d51ae39ca50c2536b9b1be7179e7f17cfd165e SHA512 6c819019a8e81d8263d3c509b2eee59ba1ef09c5a0a8d28f004c711afa252097eca7e6b0b919b2d780883dfd9ee7a363df4cee7fd2c9159a065257637cec DIST libtirpc-1.0.3.tar.bz2 509831 BLAKE2B 3f908471b3e10f88329793db2c832754b9bb838d115235d7c25256da883960de8d8c94a6941fc9c2a3cc4dca9a77c32b5cb85bb347cc182e5a6255636b79b06e SHA512 1f1cf7dd6f30c919e4caf6db926f1d532f78d5a93e8aaa2acde6b046be0650c4c46549da0ffd5fa7fb9e550af1a871ed6e02ededf504c6667d2e82eba2cc DIST libtirpc-glibc-nfs.tar.xz 8948 BLAKE2B 7316623d9f2b6928e296137fe2bf6794b208d549c2ffba9e4a35b47f7b04bf023798a09f38c02d039debf6adc466d7689cf3c8274d71a22eaff08729642c0a28 SHA512 90255bf0a27af16164e0710dd940778609925d473f4343093ff19d98cc4f23023788bf4edf0178eae1961afc0ba8b69b273de95b7d7e2afdb706701d8ba6f7ba diff --git a/net-libs/libtirpc/files/libtirpc-1.0.1-CVE-2017-8779.patch b/net-libs/libtirpc/files/libtirpc-1.0.1-CVE-2017-8779.patch deleted file mode 100644 index 91a50fad649..000 --- a/net-libs/libtirpc/files/libtirpc-1.0.1-CVE-2017-8779.patch +++ /dev/null @@ -1,255 +0,0 @@ -diff --git a/src/rpc_generic.c b/src/rpc_generic.c -index 2f09a8f..589cbd5 100644 a/src/rpc_generic.c -+++ b/src/rpc_generic.c -@@ -615,6 +615,9 @@ __rpc_taddr2uaddr_af(int af, const struct netbuf *nbuf) - - switch (af) { - case AF_INET: -+ if (nbuf->len < sizeof(*sin)) { -+ return NULL; -+ } - sin = nbuf->buf; - if (inet_ntop(af, >sin_addr, namebuf, sizeof namebuf) - == NULL) -@@ -626,6 +629,9 @@ __rpc_taddr2uaddr_af(int af, const struct netbuf *nbuf) - break; - #ifdef INET6 - case AF_INET6: -+ if (nbuf->len < sizeof(*sin6)) { -+ return NULL; -+ } - sin6 = nbuf->buf; - if (inet_ntop(af, >sin6_addr, namebuf6, sizeof namebuf6) - == NULL) -@@ -667,6 +673,8 @@ __rpc_uaddr2taddr_af(int af, const char *uaddr) - - port = 0; - sin = NULL; -+ if (uaddr == NULL) -+ return NULL; - addrstr = strdup(uaddr); - if (addrstr == NULL) - return NULL; -diff --git a/src/rpcb_prot.c b/src/rpcb_prot.c -index 43fd385..a923c8e 100644 a/src/rpcb_prot.c -+++ b/src/rpcb_prot.c -@@ -41,6 +41,7 @@ - #include - #include - #include -+#include "rpc_com.h" - - bool_t - xdr_rpcb(xdrs, objp) -@@ -53,13 +54,13 @@ xdr_rpcb(xdrs, objp) - if (!xdr_u_int32_t(xdrs, >r_vers)) { - return (FALSE); - } -- if (!xdr_string(xdrs, >r_netid, (u_int)~0)) { -+ if (!xdr_string(xdrs, >r_netid, RPC_MAXDATASIZE)) { - return (FALSE); - } -- if (!xdr_string(xdrs, >r_addr, (u_int)~0)) { -+ if (!xdr_string(xdrs, >r_addr, RPC_MAXDATASIZE)) { - return (FALSE); - } -- if (!xdr_string(xdrs, >r_owner, (u_int)~0)) { -+ if (!xdr_string(xdrs, >r_owner, RPC_MAXDATASIZE)) { - return (FALSE); - } - return (TRUE); -@@ -159,19 +160,19 @@ xdr_rpcb_entry(xdrs, objp) - XDR *xdrs; - rpcb_entry *objp; - { -- if (!xdr_string(xdrs, >r_maddr, (u_int)~0)) { -+ if (!xdr_string(xdrs, >r_maddr, RPC_MAXDATASIZE)) { - return (FALSE); - } -- if (!xdr_string(xdrs, >r_nc_netid, (u_int)~0)) { -+ if (!xdr_string(xdrs, >r_nc_netid, RPC_MAXDATASIZE)) { - return (FALSE); - } - if (!xdr_u_int32_t(xdrs, >r_nc_semantics)) { - return (FALSE); - } -- if (!xdr_string(xdrs, >r_nc_protofmly, (u_int)~0)) { -+ if (!xdr_string(xdrs, >r_nc_protofmly, RPC_MAXDATASIZE)) { - return (FALSE); -
[gentoo-commits] repo/gentoo:master commit in: net-libs/libtirpc/files/, net-libs/libtirpc/
commit: 25c725a0ae3e342731bdc9b02cd9e9d180831590 Author: Andreas K. Hüttel gentoo org> AuthorDate: Sat Sep 16 13:31:34 2017 + Commit: Andreas Hüttel gentoo org> CommitDate: Sat Sep 16 15:48:17 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25c725a0 net-libs/libtirpc: Add exported symbol bugfix from Arch; see the patch for links Package-Manager: Portage-2.3.8, Repoman-2.3.3 .../libtirpc/files/libtirpc-1.0.2-exports.patch| 17 ++ net-libs/libtirpc/libtirpc-1.0.2-r1.ebuild | 64 ++ 2 files changed, 81 insertions(+) diff --git a/net-libs/libtirpc/files/libtirpc-1.0.2-exports.patch b/net-libs/libtirpc/files/libtirpc-1.0.2-exports.patch new file mode 100644 index 000..174f4e3471f --- /dev/null +++ b/net-libs/libtirpc/files/libtirpc-1.0.2-exports.patch @@ -0,0 +1,17 @@ +See +https://bugs.alpinelinux.org/issues/7041 +https://git.alpinelinux.org/cgit/aports/commit/?id=9edb53cea056101c4963a04b747bf102de23f919 +(just hit this myself when building libnsl) +... dilfridge + +--- a/src/libtirpc.map b/src/libtirpc.map +@@ -298,7 +298,7 @@ + key_gendes; + key_get_conv; + key_setsecret; +-key_secret_is_set; ++key_secretkey_is_set; + key_setnet; + netname2host; + netname2user; diff --git a/net-libs/libtirpc/libtirpc-1.0.2-r1.ebuild b/net-libs/libtirpc/libtirpc-1.0.2-r1.ebuild new file mode 100644 index 000..e88a976324a --- /dev/null +++ b/net-libs/libtirpc/libtirpc-1.0.2-r1.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="5" + +inherit autotools multilib-minimal toolchain-funcs eutils + +DESCRIPTION="Transport Independent RPC library (SunRPC replacement)" +HOMEPAGE="http://libtirpc.sourceforge.net/; +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2 + mirror://gentoo/${PN}-glibc-nfs.tar.xz" + +LICENSE="GPL-2" +SLOT="0/3" # subslot matches SONAME major +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +IUSE="ipv6 kerberos static-libs" + +RDEPEND="kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )" +DEPEND="${RDEPEND} + app-arch/xz-utils + >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]" + +PATCHES=( + "${FILESDIR}/${PN}-1.0.2-bcopy-to-memmove.patch" + "${FILESDIR}/${PN}-1.0.2-bzero-to-memset.patch" + "${FILESDIR}/${PN}-1.0.2-glibc-2.26.patch" + "${FILESDIR}/${PN}-1.0.2-exports.patch" +) + +src_prepare() { + cp -r "${WORKDIR}"/tirpc "${S}"/ || die + epatch "${PATCHES[@]}" + epatch_user + eautoreconf +} + +multilib_src_configure() { + ECONF_SOURCE=${S} \ + econf \ + $(use_enable ipv6) \ + $(use_enable kerberos gssapi) \ + $(use_enable static-libs static) +} + +multilib_src_install() { + default + + # libtirpc replaces rpc support in glibc, so we need it in / + gen_usr_ldscript -a tirpc +} + +multilib_src_install_all() { + einstalldocs + + insinto /etc + doins doc/netconfig + + insinto /usr/include/tirpc + doins -r "${WORKDIR}"/tirpc/* + + # makes sure that the linking order for nfs-utils is proper, as + # libtool would inject a libgssglue dependency in the list. + use static-libs || prune_libtool_files +}
[gentoo-commits] repo/gentoo:master commit in: net-libs/libtirpc/files/, net-libs/libtirpc/
commit: a3ac427cc5cd7c20ba2593aac8413dd6c27ede56 Author: Andreas K. Hüttel gentoo org> AuthorDate: Tue Sep 5 20:22:27 2017 + Commit: Andreas Hüttel gentoo org> CommitDate: Tue Sep 5 20:24:58 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3ac427c net-libs/libtirpc: Add build fix for glibc-2.26, see bug 628752 Package-Manager: Portage-2.3.8, Repoman-2.3.3 net-libs/libtirpc/files/libtirpc-1.0.2-glibc-2.26.patch | 12 net-libs/libtirpc/libtirpc-1.0.2.ebuild | 1 + 2 files changed, 13 insertions(+) diff --git a/net-libs/libtirpc/files/libtirpc-1.0.2-glibc-2.26.patch b/net-libs/libtirpc/files/libtirpc-1.0.2-glibc-2.26.patch new file mode 100644 index 000..6d583e6149d --- /dev/null +++ b/net-libs/libtirpc/files/libtirpc-1.0.2-glibc-2.26.patch @@ -0,0 +1,12 @@ +diff --git a/src/xdr_sizeof.c b/src/xdr_sizeof.c +index d23fbd1..79d6707 100644 +--- a/src/xdr_sizeof.c b/src/xdr_sizeof.c +@@ -39,6 +39,7 @@ + #include + #include + #include ++#include + #include "un-namespace.h" + + /* ARGSUSED */ diff --git a/net-libs/libtirpc/libtirpc-1.0.2.ebuild b/net-libs/libtirpc/libtirpc-1.0.2.ebuild index 8aa9a82f54c..5ca80645095 100644 --- a/net-libs/libtirpc/libtirpc-1.0.2.ebuild +++ b/net-libs/libtirpc/libtirpc-1.0.2.ebuild @@ -23,6 +23,7 @@ DEPEND="${RDEPEND} PATCHES=( "${FILESDIR}/${PN}-1.0.2-bcopy-to-memmove.patch" "${FILESDIR}/${PN}-1.0.2-bzero-to-memset.patch" + "${FILESDIR}/${PN}-1.0.2-glibc-2.26.patch" ) src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: net-libs/libtirpc/files/, net-libs/libtirpc/
commit: bee3a8d385667f50753d725e6fa94e45a0dec7f7 Author: Joshua Kinard gentoo org> AuthorDate: Mon Jul 31 03:38:33 2017 + Commit: Joshua Kinard gentoo org> CommitDate: Mon Jul 31 03:38:33 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bee3a8d3 net-libs/libtirpc: Add libtirpc-1.0.2 Signed-off-by: Joshua Kinard gentoo.org> Package-Manager: Portage-2.3.6, Repoman-2.3.3 net-libs/libtirpc/Manifest | 1 + .../files/libtirpc-1.0.2-bcopy-to-memmove.patch| 49 + .../files/libtirpc-1.0.2-bzero-to-memset.patch | 36 + net-libs/libtirpc/libtirpc-1.0.2.ebuild| 62 ++ 4 files changed, 148 insertions(+) diff --git a/net-libs/libtirpc/Manifest b/net-libs/libtirpc/Manifest index 9d6a7415611..6c67c47e523 100644 --- a/net-libs/libtirpc/Manifest +++ b/net-libs/libtirpc/Manifest @@ -2,4 +2,5 @@ DIST libtirpc-0.2.4.tar.bz2 458544 SHA256 45c3e21dfc23a5ba501f9dfc6671678316fdfd DIST libtirpc-0.2.5.tar.bz2 459094 SHA256 62f9de7c2c8686c568757730e1fef66502a0e00d6cacf33546d0267984e002db SHA512 9f8afa1acb04a2c2c558018f2528f8caaa79994a2af2abeed947f914145872ef72988b241e11925c799db0de9ec51fd9baecd2b08150240b22f91e2e55a45194 WHIRLPOOL a2b4f1c4825f2b774c2290cccd9d552bb7566ec9eb5988d3ab619d7870a907600f67e7af39fbc3e245606db8534f114c990145789c383206d3a9cf96cf043d8c DIST libtirpc-0.3.1.tar.bz2 479721 SHA256 a8838fe180deb8a6f6e491ee665325a28dee4100ec6b1f0b86d611dbfe3a2bb8 SHA512 31b0a00a5390e418ab909e02fb67cbe31bef3326ee0105b2d9dc3ed93270a86e30d4cd618335af01be6b4da4bea215c111b9bead0d8d3e225c2e1d1b2f1e76a3 WHIRLPOOL 183f8ef45c381287e33f50c183c5fdb02ccf6e58dc69a80bbf31c46fcf990c422f3971ce40c9f6607a6be0daf015e412633b9e49ff77be41e6b804a21d6fc72c DIST libtirpc-1.0.1.tar.bz2 495125 SHA256 5156974f31be7ccbc8ab1de37c4739af6d9d42c87b1d5caf4835dda75fcbb89e SHA512 c9b449e737bc2bd3d56e31e8352f312e89a7ec2a11b73b5ac314e7d82d3b644c611e422b623912453b67b668f86a6de7bb7f18c9495dd15de8e2798ec2ff41c8 WHIRLPOOL cce6a4e69bd634b40d66594a81c23d2044b63eec16d6c96d6fcfaa7f2ca41fb9af99c8e2b964ec12be82682afa4090b218d7e14399fdfc9b32df6c2234bc3c9e +DIST libtirpc-1.0.2.tar.bz2 509601 SHA256 723c5ce92706cbb601a8db09110df1b4b69391643158f20ff587e20e7c5f90f5 SHA512 6c819019a8e81d8263d3c509b2eee59ba1ef09c5a0a8d28f004c711afa252097eca7e6b0b919b2d780883dfd9ee7a363df4cee7fd2c9159a065257637cec WHIRLPOOL 59306a645df28cfcfc1bf9e5215c59f0af7b8a01375ccef66c2ded4863e7183afd4b3ae0e7694f3eff78cc88f3978a4fd0c1b3375698fb90b59a08989021ebdc DIST libtirpc-glibc-nfs.tar.xz 8948 SHA256 2677cfedf626f3f5a8f6e507aed5bb8f79a7453b589d684dbbc086e755170d83 SHA512 90255bf0a27af16164e0710dd940778609925d473f4343093ff19d98cc4f23023788bf4edf0178eae1961afc0ba8b69b273de95b7d7e2afdb706701d8ba6f7ba WHIRLPOOL 06bcf3fd4e424a86071e5c4ddeb89aa571c862e765aae9382d9f9a55ab72cd1c623490555c1a9bd3380a2d04ecb10fb47a75a7dddf449d4368a1a01617226858 diff --git a/net-libs/libtirpc/files/libtirpc-1.0.2-bcopy-to-memmove.patch b/net-libs/libtirpc/files/libtirpc-1.0.2-bcopy-to-memmove.patch new file mode 100644 index 000..91619b7ac9f --- /dev/null +++ b/net-libs/libtirpc/files/libtirpc-1.0.2-bcopy-to-memmove.patch @@ -0,0 +1,49 @@ +diff -Naurp libtirpc-1.0.2.orig/src/auth_time.c libtirpc-1.0.2/src/auth_time.c +--- libtirpc-1.0.2.orig/src/auth_time.c2017-07-05 11:02:23.0 -0400 libtirpc-1.0.2/src/auth_time.c 2017-07-30 17:48:31.361420071 -0400 +@@ -104,7 +104,7 @@ static int uaddr_to_sockaddr(uaddr, sin) + p_bytes[1] = (unsigned char)a[5] & 0x00FF; + + sin->sin_family = AF_INET; /* always */ +- bcopy((char *)_bytes, (char *)>sin_port, 2); ++ memmove((char *)>sin_port, (char *)_bytes, 2); + + return (0); + } +diff -Naurp libtirpc-1.0.2.orig/src/crypt_client.c libtirpc-1.0.2/src/crypt_client.c +--- libtirpc-1.0.2.orig/src/crypt_client.c 2017-07-05 11:02:23.0 -0400 libtirpc-1.0.2/src/crypt_client.c 2017-07-30 17:49:57.911419445 -0400 +@@ -75,8 +75,8 @@ _des_crypt_call(buf, len, dparms) + des_crypt_1_arg.desbuf.desbuf_val = buf; + des_crypt_1_arg.des_dir = dparms->des_dir; + des_crypt_1_arg.des_mode = dparms->des_mode; +- bcopy(dparms->des_ivec, des_crypt_1_arg.des_ivec, 8); +- bcopy(dparms->des_key, des_crypt_1_arg.des_key, 8); ++ memmove(des_crypt_1_arg.des_ivec, dparms->des_ivec, 8); ++ memmove(des_crypt_1_arg.des_key, dparms->des_key, 8); + + result_1 = des_crypt_1(_crypt_1_arg, clnt); + if (result_1 == (desresp *) NULL) { +@@ -88,8 +88,8 @@ _des_crypt_call(buf, len, dparms) + + if (result_1->stat == DESERR_NONE || + result_1->stat == DESERR_NOHWDEVICE) { +- bcopy(result_1->desbuf.desbuf_val, buf, len); +- bcopy(result_1->des_ivec, dparms->des_ivec, 8); ++ memmove(buf, result_1->desbuf.desbuf_val, len); ++ memmove(dparms->des_ivec, result_1->des_ivec, 8); +
[gentoo-commits] repo/gentoo:master commit in: net-libs/libtirpc/files/, net-libs/libtirpc/
commit: ae6ad766ca854bf00c6cbe18beb6f7ea6b806c79 Author: Joshua Kinard gentoo org> AuthorDate: Wed Jul 5 10:21:38 2017 + Commit: Joshua Kinard gentoo org> CommitDate: Wed Jul 5 10:22:16 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae6ad766 net-libs/libtirpc: backport fixes for uclibc-ng userlands A number of patches from libtirpc git were backported from 1.0.2_rc3 to resolve compiliation errors when building under a sys-libs/uclibc-ng userland. Two patches are custom fixes -- see the top of each patch for a more detailed explanation. Tested on mips (both uclibc-ng and glibc) and amd64 glibc. Solves Bug #610846. Signed-off-by: Joshua Kinard gentoo.org> Package-Manager: Portage-2.3.6, Repoman-2.3.2 ...ibtirpc-1.0.1_add-des_impl-c-7f6bb9a3467a.patch | 29 + ...c-1.0.1_ifdef-out-yp-headers-742bbdff6ddf.patch | 30 + ...0.1_remove-des-deps-to-glibc-503ac2e9fa56.patch | 43 +++ ...tirpc-1.0.1_remove-nis-h-dep-5f00f8c78c5d.patch | 137 + ...tirpc-1.0.1_uclibc-dont-use-struct-rpcent.patch | 51 ...ibtirpc-1.0.1_uclibc-use-memset-not-bzero.patch | 21 net-libs/libtirpc/libtirpc-1.0.1-r2.ebuild | 66 ++ 7 files changed, 377 insertions(+) diff --git a/net-libs/libtirpc/files/libtirpc-1.0.1_add-des_impl-c-7f6bb9a3467a.patch b/net-libs/libtirpc/files/libtirpc-1.0.1_add-des_impl-c-7f6bb9a3467a.patch new file mode 100644 index 000..a62f23d87e9 --- /dev/null +++ b/net-libs/libtirpc/files/libtirpc-1.0.1_add-des_impl-c-7f6bb9a3467a.patch @@ -0,0 +1,29 @@ +From: Thorsten Kukuk+Date: Mon, 4 Apr 2016 13:48:04 + (-0400) +Subject: Compile des_crypt.c and des_impl.c +X-Git-Tag: libtirpc-1-0-2-rc3~1 +X-Git-Url: http://git.linux-nfs.org/?p=steved%2Flibtirpc.git;a=commitdiff_plain;h=7f6bb9a3467a57caf43425d213a06aeb7870086b + +Compile des_crypt.c and des_impl.c + +Add des_impl.c to become independent of deprecated functions of glibc + +Fixes: f17b44048003 ('Revert commit c0547c56dafb') +Signed-off-by: Thorsten Kukuk +Signed-off-by: Steve Dickson +--- + +diff --git a/src/Makefile.am b/src/Makefile.am +index e4ed8aa..fba2aa4 100644 +--- a/src/Makefile.am b/src/Makefile.am +@@ -24,7 +24,7 @@ libtirpc_la_SOURCES = auth_none.c auth_unix.c authunix_prot.c bindresvport.c cln + rpcb_st_xdr.c svc.c svc_auth.c svc_dg.c svc_auth_unix.c svc_auth_none.c \ + svc_auth_des.c \ + svc_generic.c svc_raw.c svc_run.c svc_simple.c svc_vc.c getpeereid.c \ +-auth_time.c auth_des.c authdes_prot.c debug.c ++auth_time.c auth_des.c authdes_prot.c debug.c des_crypt.c des_impl.c + + ## XDR + libtirpc_la_SOURCES += xdr.c xdr_rec.c xdr_array.c xdr_float.c xdr_mem.c xdr_reference.c xdr_stdio.c xdr_sizeof.c + diff --git a/net-libs/libtirpc/files/libtirpc-1.0.1_ifdef-out-yp-headers-742bbdff6ddf.patch b/net-libs/libtirpc/files/libtirpc-1.0.1_ifdef-out-yp-headers-742bbdff6ddf.patch new file mode 100644 index 000..481ace7e6fc --- /dev/null +++ b/net-libs/libtirpc/files/libtirpc-1.0.1_ifdef-out-yp-headers-742bbdff6ddf.patch @@ -0,0 +1,30 @@ +From: Thorsten Kukuk +Date: Mon, 4 Apr 2016 13:37:32 + (-0400) +Subject: getpublickey.c: ifdef out yp headers +X-Git-Tag: libtirpc-1-0-2-rc3~3 +X-Git-Url: http://git.linux-nfs.org/?p=steved%2Flibtirpc.git;a=commitdiff_plain;h=742bbdff6ddff4dde0d610a842cd8ac0408af0a0 + +getpublickey.c: ifdef out yp headers + +If we don't compile in YP support, don't include YP + +Signed-off-by: Thorsten Kukuk +Signed-off-by: Steve Dickson +--- + +diff --git a/src/getpublickey.c b/src/getpublickey.c +index 764a5f9..8cf4dc2 100644 +--- a/src/getpublickey.c b/src/getpublickey.c +@@ -38,8 +38,10 @@ + #include + #include + #include ++#ifdef YP + #include + #include ++#endif + #include + #include + + diff --git a/net-libs/libtirpc/files/libtirpc-1.0.1_remove-des-deps-to-glibc-503ac2e9fa56.patch b/net-libs/libtirpc/files/libtirpc-1.0.1_remove-des-deps-to-glibc-503ac2e9fa56.patch new file mode 100644 index 000..0ef15290ea1 --- /dev/null +++ b/net-libs/libtirpc/files/libtirpc-1.0.1_remove-des-deps-to-glibc-503ac2e9fa56.patch @@ -0,0 +1,43 @@ +From: Thorsten Kukuk +Date: Mon, 4 Apr 2016 13:51:15 + (-0400) +Subject: Remove des*.c dependencies to glibc +X-Git-Tag: libtirpc-1-0-2-rc3 +X-Git-Url: http://git.linux-nfs.org/?p=steved%2Flibtirpc.git;a=commitdiff_plain;h=503ac2e9fa569d95e366766202a7ca840e28b28a + +Remove des*.c dependencies to glibc + +Our des_impl.c has dependencies to glibc header files +and different arguments then our header file has. +Bring our own code in sync. + +Signed-off-by: Thorsten Kukuk +Signed-off-by: Steve Dickson +--- + +diff --git a/src/des_impl.c b/src/des_impl.c +index c5b7ed6..9dbccaf 100644 +--- a/src/des_impl.c
[gentoo-commits] repo/gentoo:master commit in: net-libs/libtirpc/files/, net-libs/libtirpc/
commit: d968a5aa9ebfa6bc766bed99370e164f08b9a0dc Author: Patrick McLean gentoo org> AuthorDate: Mon May 8 18:33:08 2017 + Commit: Patrick McLean gentoo org> CommitDate: Mon May 8 18:38:35 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d968a5aa net-libs/libtirpc: Revision bump to pull in patch for CVE-2017-8779 This also gets rid of the src_unpack definition, moves to src_prepare and adds a call to epatch_user to src_prepare. Gentoo-Bug: 617472 Package-Manager: Portage-2.3.5, Repoman-2.3.2 .../files/libtirpc-1.0.1-CVE-2017-8779.patch | 255 + net-libs/libtirpc/libtirpc-1.0.1-r1.ebuild | 60 + 2 files changed, 315 insertions(+) diff --git a/net-libs/libtirpc/files/libtirpc-1.0.1-CVE-2017-8779.patch b/net-libs/libtirpc/files/libtirpc-1.0.1-CVE-2017-8779.patch new file mode 100644 index 000..91a50fad649 --- /dev/null +++ b/net-libs/libtirpc/files/libtirpc-1.0.1-CVE-2017-8779.patch @@ -0,0 +1,255 @@ +diff --git a/src/rpc_generic.c b/src/rpc_generic.c +index 2f09a8f..589cbd5 100644 +--- a/src/rpc_generic.c b/src/rpc_generic.c +@@ -615,6 +615,9 @@ __rpc_taddr2uaddr_af(int af, const struct netbuf *nbuf) + + switch (af) { + case AF_INET: ++ if (nbuf->len < sizeof(*sin)) { ++ return NULL; ++ } + sin = nbuf->buf; + if (inet_ntop(af, >sin_addr, namebuf, sizeof namebuf) + == NULL) +@@ -626,6 +629,9 @@ __rpc_taddr2uaddr_af(int af, const struct netbuf *nbuf) + break; + #ifdef INET6 + case AF_INET6: ++ if (nbuf->len < sizeof(*sin6)) { ++ return NULL; ++ } + sin6 = nbuf->buf; + if (inet_ntop(af, >sin6_addr, namebuf6, sizeof namebuf6) + == NULL) +@@ -667,6 +673,8 @@ __rpc_uaddr2taddr_af(int af, const char *uaddr) + + port = 0; + sin = NULL; ++ if (uaddr == NULL) ++ return NULL; + addrstr = strdup(uaddr); + if (addrstr == NULL) + return NULL; +diff --git a/src/rpcb_prot.c b/src/rpcb_prot.c +index 43fd385..a923c8e 100644 +--- a/src/rpcb_prot.c b/src/rpcb_prot.c +@@ -41,6 +41,7 @@ + #include + #include + #include ++#include "rpc_com.h" + + bool_t + xdr_rpcb(xdrs, objp) +@@ -53,13 +54,13 @@ xdr_rpcb(xdrs, objp) + if (!xdr_u_int32_t(xdrs, >r_vers)) { + return (FALSE); + } +- if (!xdr_string(xdrs, >r_netid, (u_int)~0)) { ++ if (!xdr_string(xdrs, >r_netid, RPC_MAXDATASIZE)) { + return (FALSE); + } +- if (!xdr_string(xdrs, >r_addr, (u_int)~0)) { ++ if (!xdr_string(xdrs, >r_addr, RPC_MAXDATASIZE)) { + return (FALSE); + } +- if (!xdr_string(xdrs, >r_owner, (u_int)~0)) { ++ if (!xdr_string(xdrs, >r_owner, RPC_MAXDATASIZE)) { + return (FALSE); + } + return (TRUE); +@@ -159,19 +160,19 @@ xdr_rpcb_entry(xdrs, objp) + XDR *xdrs; + rpcb_entry *objp; + { +- if (!xdr_string(xdrs, >r_maddr, (u_int)~0)) { ++ if (!xdr_string(xdrs, >r_maddr, RPC_MAXDATASIZE)) { + return (FALSE); + } +- if (!xdr_string(xdrs, >r_nc_netid, (u_int)~0)) { ++ if (!xdr_string(xdrs, >r_nc_netid, RPC_MAXDATASIZE)) { + return (FALSE); + } + if (!xdr_u_int32_t(xdrs, >r_nc_semantics)) { + return (FALSE); + } +- if (!xdr_string(xdrs, >r_nc_protofmly, (u_int)~0)) { ++ if (!xdr_string(xdrs, >r_nc_protofmly, RPC_MAXDATASIZE)) { + return (FALSE); + } +- if (!xdr_string(xdrs, >r_nc_proto, (u_int)~0)) { ++ if (!xdr_string(xdrs, >r_nc_proto, RPC_MAXDATASIZE)) { + return (FALSE); + } + return (TRUE); +@@ -292,7 +293,7 @@ xdr_rpcb_rmtcallres(xdrs, p) + bool_t dummy; + struct r_rpcb_rmtcallres *objp = (struct r_rpcb_rmtcallres *)(void *)p; + +- if (!xdr_string(xdrs, >addr, (u_int)~0)) { ++ if (!xdr_string(xdrs, >addr, RPC_MAXDATASIZE)) { + return (FALSE); + } + if (!xdr_u_int(xdrs, >results.results_len)) { +@@ -312,6 +313,11 @@ xdr_netbuf(xdrs, objp) + if (!xdr_u_int32_t(xdrs, (u_int32_t *) >maxlen)) { + return (FALSE); + } ++ ++ if (objp->maxlen > RPC_MAXDATASIZE) { ++ return (FALSE); ++ } ++ + dummy = xdr_bytes(xdrs, (char **)&(objp->buf), + (u_int *)&(objp->len), objp->maxlen); + return (dummy); +diff --git a/src/rpcb_st_xdr.c b/src/rpcb_st_xdr.c +index 08db745..28e6a48 100644 +--- a/src/rpcb_st_xdr.c b/src/rpcb_st_xdr.c +@@ -37,6 +37,7 @@ + + + #include ++#include "rpc_com.h" + + /* Link list of all the stats about getport and getaddr */ + +@@ -58,7 +59,7 @@ xdr_rpcbs_addrlist(xdrs, objp) + if (!xdr_int(xdrs, >failure)) { + return (FALSE); +