diff options
author | Khem Raj <raj.khem@gmail.com> | 2011-06-23 15:39:47 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-06-28 13:55:41 +0100 |
commit | 4c3691eb4ea4c84de01fb18972956b86445a3c40 (patch) | |
tree | 8acc4a067433c1ae35e645e0f9b4e611f747c179 /meta/recipes-extended/libtirpc/libtirpc-0.2.2 | |
parent | 1ac7d1cab89f32280db0f103dbfd02455fea5b92 (diff) | |
download | poky-4c3691eb4ea4c84de01fb18972956b86445a3c40.tar.gz |
libtirpc: Upgrade 0.2.1 -> 0.2.2
Additionally bring in the nis headers which will be
required when using eglibc 2.14 where rpc support
is removed.
Make it provide virtual/librpc
(From OE-Core rev: 42a521b28817cc8d905a93a82e02481a8968cd26)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/libtirpc/libtirpc-0.2.2')
3 files changed, 82 insertions, 0 deletions
diff --git a/meta/recipes-extended/libtirpc/libtirpc-0.2.2/libtirpc-0.2.1-fortify.patch b/meta/recipes-extended/libtirpc/libtirpc-0.2.2/libtirpc-0.2.1-fortify.patch new file mode 100644 index 0000000000..32644b5b72 --- /dev/null +++ b/meta/recipes-extended/libtirpc/libtirpc-0.2.2/libtirpc-0.2.1-fortify.patch | |||
@@ -0,0 +1,26 @@ | |||
1 | Fix a possible overflow (reported by _FORTIFY_SOURCE=2) | ||
2 | |||
3 | Ported from Gentoo | ||
4 | |||
5 | Upstream-Status: Unknown | ||
6 | |||
7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
8 | |||
9 | Index: libtirpc-0.2.1/src/getrpcport.c | ||
10 | =================================================================== | ||
11 | --- libtirpc-0.2.1.orig/src/getrpcport.c | ||
12 | +++ libtirpc-0.2.1/src/getrpcport.c | ||
13 | @@ -54,11 +54,11 @@ getrpcport(host, prognum, versnum, proto | ||
14 | |||
15 | if ((hp = gethostbyname(host)) == NULL) | ||
16 | return (0); | ||
17 | + if (hp->h_length != sizeof(addr.sin_addr.s_addr)) | ||
18 | + return (0); | ||
19 | memset(&addr, 0, sizeof(addr)); | ||
20 | addr.sin_family = AF_INET; | ||
21 | addr.sin_port = 0; | ||
22 | - if (hp->h_length > sizeof(addr)) | ||
23 | - hp->h_length = sizeof(addr); | ||
24 | memcpy(&addr.sin_addr.s_addr, hp->h_addr, (size_t)hp->h_length); | ||
25 | /* Inconsistent interfaces need casts! :-( */ | ||
26 | return (pmap_getport(&addr, (u_long)prognum, (u_long)versnum, | ||
diff --git a/meta/recipes-extended/libtirpc/libtirpc-0.2.2/libtirpc-0.2.2-rpc-des-prot.patch b/meta/recipes-extended/libtirpc/libtirpc-0.2.2/libtirpc-0.2.2-rpc-des-prot.patch new file mode 100644 index 0000000000..c38a55b876 --- /dev/null +++ b/meta/recipes-extended/libtirpc/libtirpc-0.2.2/libtirpc-0.2.2-rpc-des-prot.patch | |||
@@ -0,0 +1,39 @@ | |||
1 | From f2f43212b33dea42635061c82645287454a70107 Mon Sep 17 00:00:00 2001 | ||
2 | From: Mike Frysinger <vapier@gentoo.org> | ||
3 | Date: Sat, 11 Jun 2011 15:21:55 -0400 | ||
4 | Subject: [PATCH] add multiple inclusion protection to rpc/des.h | ||
5 | |||
6 | If you try to include this file multiple times, you get a build failure | ||
7 | due to redefinitions of enums and such. | ||
8 | |||
9 | Signed-off-by: Mike Frysinger <vapier@gentoo.org> | ||
10 | --- | ||
11 | tirpc/rpc/des.h | 5 +++++ | ||
12 | 1 files changed, 5 insertions(+), 0 deletions(-) | ||
13 | |||
14 | |||
15 | Upstream-Status: Backport | ||
16 | |||
17 | diff --git a/tirpc/rpc/des.h b/tirpc/rpc/des.h | ||
18 | index e3d6897..d2881ad 100644 | ||
19 | --- a/tirpc/rpc/des.h | ||
20 | +++ b/tirpc/rpc/des.h | ||
21 | @@ -33,6 +33,9 @@ | ||
22 | * Copyright (c) 1986 by Sun Microsystems, Inc. | ||
23 | */ | ||
24 | |||
25 | +#ifndef _RPC_DES_H_ | ||
26 | +#define _RPC_DES_H_ | ||
27 | + | ||
28 | #define DES_MAXLEN 65536 /* maximum # of bytes to encrypt */ | ||
29 | #define DES_QUICKLEN 16 /* maximum # of bytes to encrypt quickly */ | ||
30 | |||
31 | @@ -80,3 +83,5 @@ struct desparams { | ||
32 | * Software DES. | ||
33 | */ | ||
34 | extern int _des_crypt( char *, int, struct desparams * ); | ||
35 | + | ||
36 | +#endif | ||
37 | -- | ||
38 | 1.7.5.3 | ||
39 | |||
diff --git a/meta/recipes-extended/libtirpc/libtirpc-0.2.2/remove-des-crypt.patch b/meta/recipes-extended/libtirpc/libtirpc-0.2.2/remove-des-crypt.patch new file mode 100644 index 0000000000..d94a5850ae --- /dev/null +++ b/meta/recipes-extended/libtirpc/libtirpc-0.2.2/remove-des-crypt.patch | |||
@@ -0,0 +1,17 @@ | |||
1 | http://sourceforge.net/mailarchive/message.php?msg_id=27636466 | ||
2 | |||
3 | Upstream-Status: Backport | ||
4 | |||
5 | Index: libtirpc-0.2.2/src/Makefile.am | ||
6 | =================================================================== | ||
7 | --- libtirpc-0.2.2.orig/src/Makefile.am | ||
8 | +++ libtirpc-0.2.2/src/Makefile.am | ||
9 | @@ -50,7 +50,7 @@ libtirpc_la_SOURCES = auth_none.c auth_u | ||
10 | rpc_callmsg.c rpc_generic.c rpc_soc.c rpcb_clnt.c rpcb_prot.c \ | ||
11 | rpcb_st_xdr.c svc.c svc_auth.c svc_dg.c svc_auth_unix.c svc_generic.c \ | ||
12 | svc_raw.c svc_run.c svc_simple.c svc_vc.c getpeereid.c \ | ||
13 | - auth_time.c auth_des.c authdes_prot.c des_crypt.c | ||
14 | + auth_time.c auth_des.c authdes_prot.c | ||
15 | |||
16 | ## XDR | ||
17 | libtirpc_la_SOURCES += xdr.c xdr_rec.c xdr_array.c xdr_float.c xdr_mem.c xdr_reference.c xdr_stdio.c | ||