Skip to contentSkip to conversation

package/libtirpc: Bump to version 1.2.5

PATCH New Petr Vorel 2 participants 5 messages Dec 20, 2019 – Dec 26, 2019

lore
Share & tools
lore

Petr Vorel

author
#0 lore raw

PATCH 1/1 package/libtirpc: Bump to version 1.2.5

Rebased 0001-Disable-parts-of-TIRPC-requiring-NIS-support.patch, dropped 3 patches accepted upstream.

---
Tested locally (intel on glibc) + via test-pkg:

$ ./utils/test-pkg -p libtirpc
                             br-arm-full [1/6]: OK
                  br-arm-cortex-a9-glibc [2/6]: OK
                   br-arm-cortex-m4-full [3/6]: OK
                          br-x86-64-musl [4/6]: OK
                      br-arm-full-static [5/6]: OK
                            sourcery-arm [6/6]: OK

Kind regards,
Petr

 ...parts-of-TIRPC-requiring-NIS-support.patch |  26 ++--
 ...t-and-musl-does-not-install-rpcent.h.patch |  35 -----
 ...Disable-DES-authentification-support.patch | 142 ------------------
 .../0006-rpc-types.h-fix-musl-build.patch     |  31 ----
 package/libtirpc/libtirpc.hash                |   3 +-
 package/libtirpc/libtirpc.mk                  |   2 +-
 6 files changed, 16 insertions(+), 223 deletions(-)
 delete mode 100644 package/libtirpc/0002-uClibc-without-RPC-support-and-musl-does-not-install-rpcent.h.patch
 delete mode 100644 package/libtirpc/0005-Disable-DES-authentification-support.patch
 delete mode 100644 package/libtirpc/0006-rpc-types.h-fix-musl-build.patch
package/libtirpc/0001-Disable-parts-of-TIRPC-requiring-NIS-support.patch +14 -12
index eb1bef3dc1..101a779ade 100644
@@ -1,7 +1,7 @@
-From 15adb318818f5d0ac609ef2b87643dd760487cb6 Mon Sep 17 00:00:00 2001
+From cb30579c9195ae29c82545c934e0bd9677262bce Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?J=C3=B6rg=20Krause?= <[email protected]>
-Date: Mon, 20 Jul 2015 20:30:11 +0200
-Subject: [PATCH 1/1] Disable parts of TIRPC requiring NIS support
+Date: Fri, 20 Dec 2019 17:58:17 +0100
+Subject: [PATCH] Disable parts of TIRPC requiring NIS support
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -15,24 +15,26 @@ Signed-off-by: J?rg Krause <[email protected]>
 Signed-off-by: Peter Rosin <[email protected]>
 [bernd.kuhls at t-online.de: update for 1.0.2]
 Signed-off-by: Bernd Kuhls <[email protected]>
+[pvorel: update for 1.2.5]
+Signed-off-by: Petr Vorel <[email protected]>
 ---
  src/Makefile.am | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/src/Makefile.am b/src/Makefile.am
-index 6cc567a..9834f9a 100644
+index b2d5436..864f984 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
+@@ -24,7 +24,7 @@ libtirpc_la_SOURCES = auth_none.c auth_unix.c authunix_prot.c \
+         rpc_callmsg.c rpc_generic.c rpc_soc.c rpcb_clnt.c rpcb_prot.c \
          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 des_crypt.c des_impl.c
-+        auth_des.c authdes_prot.c debug.c des_crypt.c des_impl.c
+-        auth_time.c debug.c 
++        debug.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
-@@ -41,8 +41,8 @@ if GSS
+ if AUTHDES
+ libtirpc_la_SOURCES += auth_des.c  authdes_prot.c  des_crypt.c  des_impl.c  des_soft.c  svc_auth_des.c
+@@ -45,8 +45,8 @@ if GSS
      libtirpc_la_CFLAGS = -DHAVE_RPCSEC_GSS $(GSSAPI_CFLAGS)
  endif
  
@@ -44,5 +46,5 @@ index 6cc567a..9834f9a 100644
  CLEANFILES	       = cscope.* *~
  DISTCLEANFILES	       = Makefile.in
 -- 
-2.4.6
+2.24.0
 
package/libtirpc/0002-uClibc-without-RPC-support-and-musl-does-not-install-rpcent.h.patch deleted +0 -35
deleted file mode 100644
index 51229a024d..0000000000
@@ -1,35 +0,0 @@
-From 7aa1fe6a0f9280571117c30c03c2cc521cd86ec3 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <[email protected]>
-Date: Sat, 23 Jun 2012 21:58:07 +0200
-Subject: [PATCH] uClibc without RPC support and musl does not install rpcent.h
-
-Signed-off-by: Thomas Petazzoni <[email protected]>
-[yann.morin.1998 at free.fr: update for 0.3.1]
-Signed-off-by: "Yann E. MORIN" <[email protected]>
-[joerg.krause at embedded.rocks: musl fix]
-Signed-off-by: J?rg Krause <[email protected]>
-[bernd.kuhls at t-online.de: update for 1.0.2]
-Signed-off-by: Bernd Kuhls <[email protected]>
----
- tirpc/rpc/rpcent.h | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/tirpc/rpc/rpcent.h b/tirpc/rpc/rpcent.h
-index 147f909..4a58180 100644
---- a/tirpc/rpc/rpcent.h
-+++ b/tirpc/rpc/rpcent.h
-@@ -48,8 +48,9 @@
- extern "C" {
- #endif
- 
--/* These are defined in /usr/include/rpc/netdb.h */
--#if !defined(__GLIBC__) || defined(__UCLIBC__)
-+/* 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__)
- struct rpcent {
- 	char	*r_name;	/* name of server for this rpc program */
- 	char	**r_aliases;	/* alias list */
--- 
-1.9.1
-
package/libtirpc/0005-Disable-DES-authentification-support.patch deleted +0 -142

142 lines not on this page · raw message

package/libtirpc/0006-rpc-types.h-fix-musl-build.patch deleted +0 -31
deleted file mode 100644
index d4bcd80991..0000000000
@@ -1,31 +0,0 @@
-From 238f0a870f577e8fffd92820e1c1a88d4fc6d35f Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <[email protected]>
-Date: Sun, 10 Jun 2018 19:48:21 +0200
-Subject: [PATCH] rpc/types.h: fix musl build
-
-Don't redefine existing typedef (u_char, u_long, ...) on musl
-
-Fixes:
- - http://autobuild.buildroot.net/results/dbc07e383605a84eb19a2fd1899668612212518a
-
-Signed-off-by: Fabrice Fontaine <[email protected]>
----
- tirpc/rpc/types.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tirpc/rpc/types.h b/tirpc/rpc/types.h
-index f069efa..0153a5c 100644
---- a/tirpc/rpc/types.h
-+++ b/tirpc/rpc/types.h
-@@ -66,7 +66,7 @@ typedef   int32_t rpc_inline_t;
- #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
--- 
-2.14.1
-
package/libtirpc/libtirpc.hash +1 -2
index eacc94d1de..84880290f1 100644
@@ -1,5 +1,4 @@
 # From sourceforge's info on download page:
-sha1 d85717035cb9bd6c45557a1eb1351d3af9a69ff7  libtirpc-1.1.4.tar.bz2
 # Locally computed
-sha256 2ca529f02292e10c158562295a1ffd95d2ce8af97820e3534fe1b0e3aec7561d  libtirpc-1.1.4.tar.bz2
+sha256 f3b6350c7e9c3cd9c58fc7a5e5f8e6be469cc571bb5eb31eb9790b3e675186ca  libtirpc-1.2.5.tar.bz2
 sha256 17cf6098f95bdbb269f0bbc68e76c88fe20487ca7ec53f454923ab4256ecd2e7  COPYING
package/libtirpc/libtirpc.mk +1 -1
index 1e1905b713..879b21e665 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBTIRPC_VERSION = 1.1.4
+LIBTIRPC_VERSION = 1.2.5
 LIBTIRPC_SOURCE = libtirpc-$(LIBTIRPC_VERSION).tar.bz2
 LIBTIRPC_SITE = http://downloads.sourceforge.net/project/libtirpc/libtirpc/$(LIBTIRPC_VERSION)
 LIBTIRPC_LICENSE = BSD-3-Clause
Signature · 1 line
2.24.0
#1 lore raw

PATCH 1/1 package/libtirpc: Bump to version 1.2.5

Hello Petr,

Quoted 4 lines · On Fri, 20 Dec 2019 18:45:37 +0100 Petr Vorel <[email protected]> wrote:

Rebased 0001-Disable-parts-of-TIRPC-requiring-NIS-support.patch, dropped 3 patches accepted upstream.

Thanks for this version bump!

package/libtirpc/libtirpc.hash line 2

Quoted 7 lines
package/libtirpc/libtirpc.hash +0 -1
index eacc94d1de..84880290f1 100644
@@ -1,5 +1,4 @@
 # From sourceforge's info on download page:
-sha1 d85717035cb9bd6c45557a1eb1351d3af9a69ff7  libtirpc-1.1.4.tar.bz2

Removing just this line leaves the "From sourceforge's info on download page" comment a bit "alone".

Also, Sourceforge does have the SHA1 hash for the 1.2.5 tarball, so instead I've re-added that line with the correct SHA1 provided by Sourceforge.

Applied with this change. Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
author
#2 lore raw

PATCH 1/1 package/libtirpc: Bump to version 1.2.5

Hi Thomas,

...

Quoted 8 lines

package/libtirpc/libtirpc.hash line 2

Quoted 4 lines

+++ b/package/libtirpc/libtirpc.hash

package/libtirpc/libtirpc.hash +0 -1
@@ -1,5 +1,4 @@
 # From sourceforge's info on download page:
-sha1 d85717035cb9bd6c45557a1eb1351d3af9a69ff7  libtirpc-1.1.4.tar.bz2

Removing just this line leaves the "From sourceforge's info on download page" comment a bit "alone".

Quoted 5 lines

Also, Sourceforge does have the SHA1 hash for the 1.2.5 tarball, so instead I've re-added that line with the correct SHA1 provided by Sourceforge.

Applied with this change. Thanks!

Thanks a lot for merge and sorry to keep small errors in my patches. BTW I tried hard to search + google SHA1 hash on sourceforge, please where it is? (for next time)

Kind regards,
Petr

#3 lore raw

PATCH 1/1 package/libtirpc: Bump to version 1.2.5

Hello Petr,

Quoted 3 lines · On Sun, 22 Dec 2019 11:32:27 +0100 Petr Vorel <[email protected]> wrote:

Thanks a lot for merge and sorry to keep small errors in my patches. BTW I tried hard to search + google SHA1 hash on sourceforge, please where it is? (for next time)

Go to https://sourceforge.net/projects/libtirpc/files/libtirpc/1.2.5/

Next to each file there is an "i" inside a circle, on the right-most column of the table of files. Click on it, and you'll see the MD5 and SHA1.

And, yes, the SourceForge UI sucks :-)

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
author
#4 lore raw

PATCH 1/1 package/libtirpc: Bump to version 1.2.5

Quoted 9 lines
Quoted 3 lines

Thanks a lot for merge and sorry to keep small errors in my patches. BTW I tried hard to search + google SHA1 hash on sourceforge, please where it is? (for next time)

Go to https://sourceforge.net/projects/libtirpc/files/libtirpc/1.2.5/

Next to each file there is an "i" inside a circle, on the right-most column of the table of files. Click on it, and you'll see the MD5 and SHA1.

Thanks a lot, Thomas!

Quoted 1 line

And, yes, the SourceForge UI sucks :-)

+1.

Petr