summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
authorCristian Iorga <cristian.iorga@intel.com>2013-02-20 18:51:47 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-02-22 06:09:23 -0800
commitf1f054ef74b399c8263d278f0e023201149637a2 (patch)
tree9b74fbf89768d2d165f6ffdea9f57dcacb7a2b68 /meta/recipes-extended
parentb2e4a965f3b15ae25d45fbd5d05bb956a9d639aa (diff)
downloadpoky-f1f054ef74b399c8263d278f0e023201149637a2.tar.gz
libtirpc: upgrade to 0.2.3
- libtirpc-0.2.2-rpc-des-prot.patch removed; - remove-des-crypt.patch removed; both included in base distribution. (From OE-Core rev: c0ff6185e623a40a7378a01d45b2c641ca3fa79d) Signed-off-by: Cristian Iorga <cristian.iorga@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r--meta/recipes-extended/libtirpc/libtirpc-0.2.2/libtirpc-0.2.2-rpc-des-prot.patch39
-rw-r--r--meta/recipes-extended/libtirpc/libtirpc-0.2.2/remove-des-crypt.patch17
-rw-r--r--meta/recipes-extended/libtirpc/libtirpc-0.2.3/libtirpc-0.2.1-fortify.patch (renamed from meta/recipes-extended/libtirpc/libtirpc-0.2.2/libtirpc-0.2.1-fortify.patch)0
-rw-r--r--meta/recipes-extended/libtirpc/libtirpc-0.2.3/obsolete_automake_macros.patch (renamed from meta/recipes-extended/libtirpc/libtirpc-0.2.2/obsolete_automake_macros.patch)0
-rw-r--r--meta/recipes-extended/libtirpc/libtirpc-0.2.3/remove-des-uclibc.patch (renamed from meta/recipes-extended/libtirpc/libtirpc-0.2.2/remove-des-uclibc.patch)0
-rw-r--r--meta/recipes-extended/libtirpc/libtirpc_0.2.3.bb (renamed from meta/recipes-extended/libtirpc/libtirpc_0.2.2.bb)8
6 files changed, 3 insertions, 61 deletions
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
deleted file mode 100644
index c38a55b876..0000000000
--- a/meta/recipes-extended/libtirpc/libtirpc-0.2.2/libtirpc-0.2.2-rpc-des-prot.patch
+++ /dev/null
@@ -1,39 +0,0 @@
1From f2f43212b33dea42635061c82645287454a70107 Mon Sep 17 00:00:00 2001
2From: Mike Frysinger <vapier@gentoo.org>
3Date: Sat, 11 Jun 2011 15:21:55 -0400
4Subject: [PATCH] add multiple inclusion protection to rpc/des.h
5
6If you try to include this file multiple times, you get a build failure
7due to redefinitions of enums and such.
8
9Signed-off-by: Mike Frysinger <vapier@gentoo.org>
10---
11 tirpc/rpc/des.h | 5 +++++
12 1 files changed, 5 insertions(+), 0 deletions(-)
13
14
15Upstream-Status: Backport
16
17diff --git a/tirpc/rpc/des.h b/tirpc/rpc/des.h
18index 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--
381.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
deleted file mode 100644
index d94a5850ae..0000000000
--- a/meta/recipes-extended/libtirpc/libtirpc-0.2.2/remove-des-crypt.patch
+++ /dev/null
@@ -1,17 +0,0 @@
1http://sourceforge.net/mailarchive/message.php?msg_id=27636466
2
3Upstream-Status: Backport
4
5Index: 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
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.3/libtirpc-0.2.1-fortify.patch
index 4a785d344a..4a785d344a 100644
--- a/meta/recipes-extended/libtirpc/libtirpc-0.2.2/libtirpc-0.2.1-fortify.patch
+++ b/meta/recipes-extended/libtirpc/libtirpc-0.2.3/libtirpc-0.2.1-fortify.patch
diff --git a/meta/recipes-extended/libtirpc/libtirpc-0.2.2/obsolete_automake_macros.patch b/meta/recipes-extended/libtirpc/libtirpc-0.2.3/obsolete_automake_macros.patch
index 88d759fde6..88d759fde6 100644
--- a/meta/recipes-extended/libtirpc/libtirpc-0.2.2/obsolete_automake_macros.patch
+++ b/meta/recipes-extended/libtirpc/libtirpc-0.2.3/obsolete_automake_macros.patch
diff --git a/meta/recipes-extended/libtirpc/libtirpc-0.2.2/remove-des-uclibc.patch b/meta/recipes-extended/libtirpc/libtirpc-0.2.3/remove-des-uclibc.patch
index 4e828f6998..4e828f6998 100644
--- a/meta/recipes-extended/libtirpc/libtirpc-0.2.2/remove-des-uclibc.patch
+++ b/meta/recipes-extended/libtirpc/libtirpc-0.2.3/remove-des-uclibc.patch
diff --git a/meta/recipes-extended/libtirpc/libtirpc_0.2.2.bb b/meta/recipes-extended/libtirpc/libtirpc_0.2.3.bb
index 36591bf8cb..ed838b7545 100644
--- a/meta/recipes-extended/libtirpc/libtirpc_0.2.2.bb
+++ b/meta/recipes-extended/libtirpc/libtirpc_0.2.3.bb
@@ -6,7 +6,7 @@ BUGTRACKER = "http://sourceforge.net/tracker/?group_id=183075&atid=903784"
6LICENSE = "BSD" 6LICENSE = "BSD"
7LIC_FILES_CHKSUM = "file://COPYING;md5=f835cce8852481e4b2bbbdd23b5e47f3 \ 7LIC_FILES_CHKSUM = "file://COPYING;md5=f835cce8852481e4b2bbbdd23b5e47f3 \
8 file://src/netname.c;beginline=1;endline=27;md5=f8a8cd2cb25ac5aa16767364fb0e3c24" 8 file://src/netname.c;beginline=1;endline=27;md5=f8a8cd2cb25ac5aa16767364fb0e3c24"
9PR = "r1" 9PR = "r0"
10 10
11DEPENDS += "xz-native" 11DEPENDS += "xz-native"
12PROVIDES = "virtual/librpc" 12PROVIDES = "virtual/librpc"
@@ -14,15 +14,13 @@ PROVIDES = "virtual/librpc"
14SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2;name=libtirpc \ 14SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2;name=libtirpc \
15 ${GENTOO_MIRROR}/${BPN}-glibc-nfs.tar.xz;name=glibc-nfs \ 15 ${GENTOO_MIRROR}/${BPN}-glibc-nfs.tar.xz;name=glibc-nfs \
16 file://libtirpc-0.2.1-fortify.patch \ 16 file://libtirpc-0.2.1-fortify.patch \
17 file://libtirpc-0.2.2-rpc-des-prot.patch \
18 file://remove-des-crypt.patch \
19 file://obsolete_automake_macros.patch \ 17 file://obsolete_automake_macros.patch \
20 " 18 "
21 19
22SRC_URI_append_libc-uclibc = " file://remove-des-uclibc.patch" 20SRC_URI_append_libc-uclibc = " file://remove-des-uclibc.patch"
23 21
24SRC_URI[libtirpc.md5sum] = "74c41c15c2909f7d11d9c7bfa7db6273" 22SRC_URI[libtirpc.md5sum] = "b70e6c12a369a91e69fcc3b9feb23d61"
25SRC_URI[libtirpc.sha256sum] = "f05eb17c85d62423858b8f74512cfe66a9ae1cedf93f03c2a0a32e04f0a33705" 23SRC_URI[libtirpc.sha256sum] = "4f29ea0491b4ca4c29f95f3c34191b857757873bbbf4b069f9dd4da01a6a923c"
26SRC_URI[glibc-nfs.md5sum] = "5ae500b9d0b6b72cb875bc04944b9445" 24SRC_URI[glibc-nfs.md5sum] = "5ae500b9d0b6b72cb875bc04944b9445"
27SRC_URI[glibc-nfs.sha256sum] = "2677cfedf626f3f5a8f6e507aed5bb8f79a7453b589d684dbbc086e755170d83" 25SRC_URI[glibc-nfs.sha256sum] = "2677cfedf626f3f5a8f6e507aed5bb8f79a7453b589d684dbbc086e755170d83"
28inherit autotools pkgconfig 26inherit autotools pkgconfig