From c0ff6185e623a40a7378a01d45b2c641ca3fa79d Mon Sep 17 00:00:00 2001 From: Cristian Iorga Date: Wed, 20 Feb 2013 18:51:47 +0200 Subject: 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. Signed-off-by: Cristian Iorga Signed-off-by: Saul Wold --- .../libtirpc-0.2.2/libtirpc-0.2.1-fortify.patch | 26 ------------ .../libtirpc-0.2.2-rpc-des-prot.patch | 39 ------------------ .../libtirpc-0.2.2/obsolete_automake_macros.patch | 15 ------- .../libtirpc/libtirpc-0.2.2/remove-des-crypt.patch | 17 -------- .../libtirpc-0.2.2/remove-des-uclibc.patch | 47 ---------------------- .../libtirpc-0.2.3/libtirpc-0.2.1-fortify.patch | 26 ++++++++++++ .../libtirpc-0.2.3/obsolete_automake_macros.patch | 15 +++++++ .../libtirpc-0.2.3/remove-des-uclibc.patch | 47 ++++++++++++++++++++++ meta/recipes-extended/libtirpc/libtirpc_0.2.2.bb | 36 ----------------- meta/recipes-extended/libtirpc/libtirpc_0.2.3.bb | 34 ++++++++++++++++ 10 files changed, 122 insertions(+), 180 deletions(-) delete mode 100644 meta/recipes-extended/libtirpc/libtirpc-0.2.2/libtirpc-0.2.1-fortify.patch delete mode 100644 meta/recipes-extended/libtirpc/libtirpc-0.2.2/libtirpc-0.2.2-rpc-des-prot.patch delete mode 100644 meta/recipes-extended/libtirpc/libtirpc-0.2.2/obsolete_automake_macros.patch delete mode 100644 meta/recipes-extended/libtirpc/libtirpc-0.2.2/remove-des-crypt.patch delete mode 100644 meta/recipes-extended/libtirpc/libtirpc-0.2.2/remove-des-uclibc.patch create mode 100644 meta/recipes-extended/libtirpc/libtirpc-0.2.3/libtirpc-0.2.1-fortify.patch create mode 100644 meta/recipes-extended/libtirpc/libtirpc-0.2.3/obsolete_automake_macros.patch create mode 100644 meta/recipes-extended/libtirpc/libtirpc-0.2.3/remove-des-uclibc.patch delete mode 100644 meta/recipes-extended/libtirpc/libtirpc_0.2.2.bb create mode 100644 meta/recipes-extended/libtirpc/libtirpc_0.2.3.bb (limited to 'meta/recipes-extended/libtirpc') 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 deleted file mode 100644 index 4a785d344a..0000000000 --- a/meta/recipes-extended/libtirpc/libtirpc-0.2.2/libtirpc-0.2.1-fortify.patch +++ /dev/null @@ -1,26 +0,0 @@ -Fix a possible overflow (reported by _FORTIFY_SOURCE=2) - -Ported from Gentoo - -Upstream-Status: Pending - -Signed-off-by: Khem Raj - -Index: libtirpc-0.2.1/src/getrpcport.c -=================================================================== ---- libtirpc-0.2.1.orig/src/getrpcport.c -+++ libtirpc-0.2.1/src/getrpcport.c -@@ -54,11 +54,11 @@ getrpcport(host, prognum, versnum, proto - - if ((hp = gethostbyname(host)) == NULL) - return (0); -+ if (hp->h_length != sizeof(addr.sin_addr.s_addr)) -+ return (0); - memset(&addr, 0, sizeof(addr)); - addr.sin_family = AF_INET; - addr.sin_port = 0; -- if (hp->h_length > sizeof(addr)) -- hp->h_length = sizeof(addr); - memcpy(&addr.sin_addr.s_addr, hp->h_addr, (size_t)hp->h_length); - /* Inconsistent interfaces need casts! :-( */ - 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 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 @@ -From f2f43212b33dea42635061c82645287454a70107 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Sat, 11 Jun 2011 15:21:55 -0400 -Subject: [PATCH] add multiple inclusion protection to rpc/des.h - -If you try to include this file multiple times, you get a build failure -due to redefinitions of enums and such. - -Signed-off-by: Mike Frysinger ---- - tirpc/rpc/des.h | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) - - -Upstream-Status: Backport - -diff --git a/tirpc/rpc/des.h b/tirpc/rpc/des.h -index e3d6897..d2881ad 100644 ---- a/tirpc/rpc/des.h -+++ b/tirpc/rpc/des.h -@@ -33,6 +33,9 @@ - * Copyright (c) 1986 by Sun Microsystems, Inc. - */ - -+#ifndef _RPC_DES_H_ -+#define _RPC_DES_H_ -+ - #define DES_MAXLEN 65536 /* maximum # of bytes to encrypt */ - #define DES_QUICKLEN 16 /* maximum # of bytes to encrypt quickly */ - -@@ -80,3 +83,5 @@ struct desparams { - * Software DES. - */ - extern int _des_crypt( char *, int, struct desparams * ); -+ -+#endif --- -1.7.5.3 - diff --git a/meta/recipes-extended/libtirpc/libtirpc-0.2.2/obsolete_automake_macros.patch b/meta/recipes-extended/libtirpc/libtirpc-0.2.2/obsolete_automake_macros.patch deleted file mode 100644 index 88d759fde6..0000000000 --- a/meta/recipes-extended/libtirpc/libtirpc-0.2.2/obsolete_automake_macros.patch +++ /dev/null @@ -1,15 +0,0 @@ -Upstream-Status: Submitted [libtirpc-devel@lists.sourceforge.net] - -Signed-off-by: Marko Lindqvist -diff -Nurd libtirpc-0.2.2/configure.ac libtirpc-0.2.2/configure.ac ---- libtirpc-0.2.2/configure.ac 2011-05-02 15:10:40.000000000 +0300 -+++ libtirpc-0.2.2/configure.ac 2013-01-11 15:11:24.275000030 +0200 -@@ -17,7 +17,7 @@ - fi - - AC_PROG_CC --AM_CONFIG_HEADER(config.h) -+AC_CONFIG_HEADERS(config.h) - AC_PROG_LIBTOOL - AC_HEADER_DIRENT - AC_PREFIX_DEFAULT(/usr) 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 @@ -http://sourceforge.net/mailarchive/message.php?msg_id=27636466 - -Upstream-Status: Backport - -Index: libtirpc-0.2.2/src/Makefile.am -=================================================================== ---- libtirpc-0.2.2.orig/src/Makefile.am -+++ libtirpc-0.2.2/src/Makefile.am -@@ -50,7 +50,7 @@ libtirpc_la_SOURCES = auth_none.c auth_u - 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_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 des_crypt.c -+ auth_time.c auth_des.c authdes_prot.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 diff --git a/meta/recipes-extended/libtirpc/libtirpc-0.2.2/remove-des-uclibc.patch b/meta/recipes-extended/libtirpc/libtirpc-0.2.2/remove-des-uclibc.patch deleted file mode 100644 index 4e828f6998..0000000000 --- a/meta/recipes-extended/libtirpc/libtirpc-0.2.2/remove-des-uclibc.patch +++ /dev/null @@ -1,47 +0,0 @@ -uclibc does not provide des functionality unlike eglibc so lets disable ssl support - -Upstream-Status: Inappropriate [uclibc specific] -Signed-off-by: Khem Raj - -Index: libtirpc-0.2.2/src/Makefile.am -=================================================================== ---- libtirpc-0.2.2.orig/src/Makefile.am 2013-01-23 14:08:58.802143165 -0800 -+++ libtirpc-0.2.2/src/Makefile.am 2013-01-23 18:06:22.970410357 -0800 -@@ -40,7 +40,7 @@ - # release number of your package. This is an abuse that only fosters - # misunderstanding of the purpose of library versions." - # --libtirpc_la_LDFLAGS = -lnsl -lpthread -version-info 1:10:0 -+libtirpc_la_LDFLAGS = -lpthread -version-info 1:10:0 - - libtirpc_la_SOURCES = auth_none.c auth_unix.c authunix_prot.c bindresvport.c clnt_bcast.c \ - clnt_dg.c clnt_generic.c clnt_perror.c clnt_raw.c clnt_simple.c \ -@@ -50,7 +50,7 @@ - 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_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 -+ auth_time.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 -Index: libtirpc-0.2.2/src/rpc_soc.c -=================================================================== ---- libtirpc-0.2.2.orig/src/rpc_soc.c 2011-05-02 05:10:40.000000000 -0700 -+++ libtirpc-0.2.2/src/rpc_soc.c 2013-01-23 18:07:28.894410317 -0800 -@@ -515,6 +515,7 @@ - (resultproc_t) rpc_wrap_bcast, "udp"); - } - -+#if 0 - /* - * Create the client des authentication object. Obsoleted by - * authdes_seccreate(). -@@ -546,6 +547,7 @@ - dummy = authdes_seccreate(servername, window, NULL, ckey); - return (dummy); - } -+#endif - - /* - * Create a client handle for a unix connection. Obsoleted by clnt_vc_create() diff --git a/meta/recipes-extended/libtirpc/libtirpc-0.2.3/libtirpc-0.2.1-fortify.patch b/meta/recipes-extended/libtirpc/libtirpc-0.2.3/libtirpc-0.2.1-fortify.patch new file mode 100644 index 0000000000..4a785d344a --- /dev/null +++ b/meta/recipes-extended/libtirpc/libtirpc-0.2.3/libtirpc-0.2.1-fortify.patch @@ -0,0 +1,26 @@ +Fix a possible overflow (reported by _FORTIFY_SOURCE=2) + +Ported from Gentoo + +Upstream-Status: Pending + +Signed-off-by: Khem Raj + +Index: libtirpc-0.2.1/src/getrpcport.c +=================================================================== +--- libtirpc-0.2.1.orig/src/getrpcport.c ++++ libtirpc-0.2.1/src/getrpcport.c +@@ -54,11 +54,11 @@ getrpcport(host, prognum, versnum, proto + + if ((hp = gethostbyname(host)) == NULL) + return (0); ++ if (hp->h_length != sizeof(addr.sin_addr.s_addr)) ++ return (0); + memset(&addr, 0, sizeof(addr)); + addr.sin_family = AF_INET; + addr.sin_port = 0; +- if (hp->h_length > sizeof(addr)) +- hp->h_length = sizeof(addr); + memcpy(&addr.sin_addr.s_addr, hp->h_addr, (size_t)hp->h_length); + /* Inconsistent interfaces need casts! :-( */ + return (pmap_getport(&addr, (u_long)prognum, (u_long)versnum, diff --git a/meta/recipes-extended/libtirpc/libtirpc-0.2.3/obsolete_automake_macros.patch b/meta/recipes-extended/libtirpc/libtirpc-0.2.3/obsolete_automake_macros.patch new file mode 100644 index 0000000000..88d759fde6 --- /dev/null +++ b/meta/recipes-extended/libtirpc/libtirpc-0.2.3/obsolete_automake_macros.patch @@ -0,0 +1,15 @@ +Upstream-Status: Submitted [libtirpc-devel@lists.sourceforge.net] + +Signed-off-by: Marko Lindqvist +diff -Nurd libtirpc-0.2.2/configure.ac libtirpc-0.2.2/configure.ac +--- libtirpc-0.2.2/configure.ac 2011-05-02 15:10:40.000000000 +0300 ++++ libtirpc-0.2.2/configure.ac 2013-01-11 15:11:24.275000030 +0200 +@@ -17,7 +17,7 @@ + fi + + AC_PROG_CC +-AM_CONFIG_HEADER(config.h) ++AC_CONFIG_HEADERS(config.h) + AC_PROG_LIBTOOL + AC_HEADER_DIRENT + AC_PREFIX_DEFAULT(/usr) diff --git a/meta/recipes-extended/libtirpc/libtirpc-0.2.3/remove-des-uclibc.patch b/meta/recipes-extended/libtirpc/libtirpc-0.2.3/remove-des-uclibc.patch new file mode 100644 index 0000000000..4e828f6998 --- /dev/null +++ b/meta/recipes-extended/libtirpc/libtirpc-0.2.3/remove-des-uclibc.patch @@ -0,0 +1,47 @@ +uclibc does not provide des functionality unlike eglibc so lets disable ssl support + +Upstream-Status: Inappropriate [uclibc specific] +Signed-off-by: Khem Raj + +Index: libtirpc-0.2.2/src/Makefile.am +=================================================================== +--- libtirpc-0.2.2.orig/src/Makefile.am 2013-01-23 14:08:58.802143165 -0800 ++++ libtirpc-0.2.2/src/Makefile.am 2013-01-23 18:06:22.970410357 -0800 +@@ -40,7 +40,7 @@ + # release number of your package. This is an abuse that only fosters + # misunderstanding of the purpose of library versions." + # +-libtirpc_la_LDFLAGS = -lnsl -lpthread -version-info 1:10:0 ++libtirpc_la_LDFLAGS = -lpthread -version-info 1:10:0 + + libtirpc_la_SOURCES = auth_none.c auth_unix.c authunix_prot.c bindresvport.c clnt_bcast.c \ + clnt_dg.c clnt_generic.c clnt_perror.c clnt_raw.c clnt_simple.c \ +@@ -50,7 +50,7 @@ + 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_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 ++ auth_time.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 +Index: libtirpc-0.2.2/src/rpc_soc.c +=================================================================== +--- libtirpc-0.2.2.orig/src/rpc_soc.c 2011-05-02 05:10:40.000000000 -0700 ++++ libtirpc-0.2.2/src/rpc_soc.c 2013-01-23 18:07:28.894410317 -0800 +@@ -515,6 +515,7 @@ + (resultproc_t) rpc_wrap_bcast, "udp"); + } + ++#if 0 + /* + * Create the client des authentication object. Obsoleted by + * authdes_seccreate(). +@@ -546,6 +547,7 @@ + dummy = authdes_seccreate(servername, window, NULL, ckey); + return (dummy); + } ++#endif + + /* + * Create a client handle for a unix connection. Obsoleted by clnt_vc_create() diff --git a/meta/recipes-extended/libtirpc/libtirpc_0.2.2.bb b/meta/recipes-extended/libtirpc/libtirpc_0.2.2.bb deleted file mode 100644 index 36591bf8cb..0000000000 --- a/meta/recipes-extended/libtirpc/libtirpc_0.2.2.bb +++ /dev/null @@ -1,36 +0,0 @@ -SUMMARY = "Transport-Independent RPC library" -DESCRIPTION = "Libtirpc is a port of Suns Transport-Independent RPC library to Linux" -SECTION = "libs/network" -HOMEPAGE = "http://sourceforge.net/projects/libtirpc/" -BUGTRACKER = "http://sourceforge.net/tracker/?group_id=183075&atid=903784" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://COPYING;md5=f835cce8852481e4b2bbbdd23b5e47f3 \ - file://src/netname.c;beginline=1;endline=27;md5=f8a8cd2cb25ac5aa16767364fb0e3c24" -PR = "r1" - -DEPENDS += "xz-native" -PROVIDES = "virtual/librpc" - -SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2;name=libtirpc \ - ${GENTOO_MIRROR}/${BPN}-glibc-nfs.tar.xz;name=glibc-nfs \ - file://libtirpc-0.2.1-fortify.patch \ - file://libtirpc-0.2.2-rpc-des-prot.patch \ - file://remove-des-crypt.patch \ - file://obsolete_automake_macros.patch \ - " - -SRC_URI_append_libc-uclibc = " file://remove-des-uclibc.patch" - -SRC_URI[libtirpc.md5sum] = "74c41c15c2909f7d11d9c7bfa7db6273" -SRC_URI[libtirpc.sha256sum] = "f05eb17c85d62423858b8f74512cfe66a9ae1cedf93f03c2a0a32e04f0a33705" -SRC_URI[glibc-nfs.md5sum] = "5ae500b9d0b6b72cb875bc04944b9445" -SRC_URI[glibc-nfs.sha256sum] = "2677cfedf626f3f5a8f6e507aed5bb8f79a7453b589d684dbbc086e755170d83" -inherit autotools pkgconfig - -do_configure_prepend () { - cp -r ${S}/../tirpc ${S} -} - -do_install_append() { - chown root:root ${D}${sysconfdir}/netconfig -} diff --git a/meta/recipes-extended/libtirpc/libtirpc_0.2.3.bb b/meta/recipes-extended/libtirpc/libtirpc_0.2.3.bb new file mode 100644 index 0000000000..ed838b7545 --- /dev/null +++ b/meta/recipes-extended/libtirpc/libtirpc_0.2.3.bb @@ -0,0 +1,34 @@ +SUMMARY = "Transport-Independent RPC library" +DESCRIPTION = "Libtirpc is a port of Suns Transport-Independent RPC library to Linux" +SECTION = "libs/network" +HOMEPAGE = "http://sourceforge.net/projects/libtirpc/" +BUGTRACKER = "http://sourceforge.net/tracker/?group_id=183075&atid=903784" +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://COPYING;md5=f835cce8852481e4b2bbbdd23b5e47f3 \ + file://src/netname.c;beginline=1;endline=27;md5=f8a8cd2cb25ac5aa16767364fb0e3c24" +PR = "r0" + +DEPENDS += "xz-native" +PROVIDES = "virtual/librpc" + +SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2;name=libtirpc \ + ${GENTOO_MIRROR}/${BPN}-glibc-nfs.tar.xz;name=glibc-nfs \ + file://libtirpc-0.2.1-fortify.patch \ + file://obsolete_automake_macros.patch \ + " + +SRC_URI_append_libc-uclibc = " file://remove-des-uclibc.patch" + +SRC_URI[libtirpc.md5sum] = "b70e6c12a369a91e69fcc3b9feb23d61" +SRC_URI[libtirpc.sha256sum] = "4f29ea0491b4ca4c29f95f3c34191b857757873bbbf4b069f9dd4da01a6a923c" +SRC_URI[glibc-nfs.md5sum] = "5ae500b9d0b6b72cb875bc04944b9445" +SRC_URI[glibc-nfs.sha256sum] = "2677cfedf626f3f5a8f6e507aed5bb8f79a7453b589d684dbbc086e755170d83" +inherit autotools pkgconfig + +do_configure_prepend () { + cp -r ${S}/../tirpc ${S} +} + +do_install_append() { + chown root:root ${D}${sysconfdir}/netconfig +} -- cgit 1.2.3-korg