From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1S15Xf-0001Vd-5h for garchives@archives.gentoo.org; Sat, 25 Feb 2012 00:31:18 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D9070E0CBC; Sat, 25 Feb 2012 00:31:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 90C82E0CBC for ; Sat, 25 Feb 2012 00:31:06 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CF2971B4005 for ; Sat, 25 Feb 2012 00:31:05 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 97C7BE53FF for ; Sat, 25 Feb 2012 00:31:04 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: <1330129856.c7d00f3f54baeadfc21aa12fef0df3e514f8a446.blueness@gentoo> Subject: [gentoo-commits] proj/hardened-dev:uclibc commit in: net-libs/libtirpc/, net-libs/libtirpc/files/ X-VCS-Repository: proj/hardened-dev X-VCS-Files: net-libs/libtirpc/files/libtirpc-allow-all-arch.patch net-libs/libtirpc/files/libtirpc-enable-fullfunc.patch net-libs/libtirpc/files/libtirpc-no-des.patch net-libs/libtirpc/libtirpc-0.2.2-r99.ebuild X-VCS-Directories: net-libs/libtirpc/ net-libs/libtirpc/files/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: c7d00f3f54baeadfc21aa12fef0df3e514f8a446 X-VCS-Branch: uclibc Date: Sat, 25 Feb 2012 00:31:04 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 0fe25bdd-7a2f-41ee-9396-20b30ffd5c46 X-Archives-Hash: 6f7975009901b2a342836a1f9e7610dd commit: c7d00f3f54baeadfc21aa12fef0df3e514f8a446 Author: Anthony G. Basile gentoo org> AuthorDate: Sat Feb 25 00:30:56 2012 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Sat Feb 25 00:30:56 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/hardened-dev.= git;a=3Dcommit;h=3Dc7d00f3f net-libs/libtirpc: reintroduce alpine linux fix --- .../libtirpc/files/libtirpc-allow-all-arch.patch | 12 ++++++ .../libtirpc/files/libtirpc-enable-fullfunc.patch | 14 ------- net-libs/libtirpc/files/libtirpc-no-des.patch | 40 ++++++++++++++= ++++++ net-libs/libtirpc/libtirpc-0.2.2-r99.ebuild | 4 +- 4 files changed, 54 insertions(+), 16 deletions(-) diff --git a/net-libs/libtirpc/files/libtirpc-allow-all-arch.patch b/net-= libs/libtirpc/files/libtirpc-allow-all-arch.patch new file mode 100644 index 0000000..46009be --- /dev/null +++ b/net-libs/libtirpc/files/libtirpc-allow-all-arch.patch @@ -0,0 +1,12 @@ +diff -Naur libtirpc-0.2.2.orig/src/key_call.c libtirpc-0.2.2/src/key_cal= l.c +--- libtirpc-0.2.2.orig/src/key_call.c 2011-05-02 12:10:40.000000000 +00= 00 ++++ libtirpc-0.2.2/src/key_call.c 2012-02-24 04:16:07.000000000 +0000 +@@ -359,7 +359,7 @@ + #elif defined(sparc) + if (uname(&u) =3D=3D -1) + #else +-#error Unknown architecture! ++ if (uname(&u) =3D=3D -1) + #endif + #endif + { diff --git a/net-libs/libtirpc/files/libtirpc-enable-fullfunc.patch b/net= -libs/libtirpc/files/libtirpc-enable-fullfunc.patch deleted file mode 100644 index 7f6f8d1..0000000 --- a/net-libs/libtirpc/files/libtirpc-enable-fullfunc.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Naur libtirpc-0.2.2.orig//src/Makefile.am libtirpc-0.2.2/src/Makef= ile.am ---- libtirpc-0.2.2.orig//src/Makefile.am 2011-05-02 08:10:40.000000000 -= 0400 -+++ libtirpc-0.2.2/src/Makefile.am 2012-02-23 21:32:57.000000000 -0500 -@@ -63,7 +63,6 @@ - libtirpc_la_CFLAGS =3D -DHAVE_RPCSEC_GSS $(GSSGLUE_CFLAGS) - endif -=20 --## libtirpc_a_SOURCES +=3D key_call.c key_prot_xdr.c getpublickey.c --## libtirpc_a_SOURCES +=3D netname.c netnamer.c rpcdname.c \ --## libtirpc_a_SOURCES +=3D rtime.c \ --## auth_time.c auth_des.c authdes_prot.c=20 -+libtirpc_la_SOURCES +=3D key_prot_xdr.c getpublickey.c -+libtirpc_la_SOURCES +=3D netname.c netnamer.c rpcdname.c -+libtirpc_la_SOURCES +=3D rtime.c diff --git a/net-libs/libtirpc/files/libtirpc-no-des.patch b/net-libs/lib= tirpc/files/libtirpc-no-des.patch new file mode 100644 index 0000000..16c6cd0 --- /dev/null +++ b/net-libs/libtirpc/files/libtirpc-no-des.patch @@ -0,0 +1,40 @@ +See: http://git.alpinelinux.org/cgit/aports/tree/main/libtirpc/libtirpc-= no-des.patch + +--- libtirpc-0.2.2.orig/src/Makefile.am ++++ libtirpc-0.2.2/src/Makefile.am +@@ -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 =3D -lnsl -lpthread -version-info 1:10:0 ++libtirpc_la_LDFLAGS =3D -lpthread -version-info 1:10:0 +=20 + libtirpc_la_SOURCES =3D auth_none.c auth_unix.c authunix_prot.c bindres= vport.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_gen= eric.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 +=20 + ## XDR + libtirpc_la_SOURCES +=3D xdr.c xdr_rec.c xdr_array.c xdr_float.c xdr_me= m.c xdr_reference.c xdr_stdio.c +--- libtirpc-0.2.2.orig/src/rpc_soc.c ++++ libtirpc-0.2.2/src/rpc_soc.c +@@ -515,6 +515,7 @@ + (resultproc_t) rpc_wrap_bcast, "udp"); + } +=20 ++#if 0 + /* + * Create the client des authentication object. Obsoleted by + * authdes_seccreate(). +@@ -546,6 +547,7 @@ + dummy =3D authdes_seccreate(servername, window, NULL, ckey); + return (dummy); + } ++#endif +=20 + /* + * Create a client handle for a unix connection. Obsoleted by clnt_vc_c= reate() diff --git a/net-libs/libtirpc/libtirpc-0.2.2-r99.ebuild b/net-libs/libti= rpc/libtirpc-0.2.2-r99.ebuild index 248f9d7..9ccd955 100644 --- a/net-libs/libtirpc/libtirpc-0.2.2-r99.ebuild +++ b/net-libs/libtirpc/libtirpc-0.2.2-r99.ebuild @@ -29,8 +29,8 @@ src_unpack() { src_prepare() { epatch "${FILESDIR}"/${PN}-0.2.1-fortify.patch epatch "${FILESDIR}"/${PN}-0.2.2-rpc-des-prot.patch - epatch "${FILESDIR}"/${PN}-enable-fullfunc.patch - > src/des_crypt.c #370713 + epatch "${FILESDIR}"/${PN}-allow-all-arch.patch + epatch "${FILESDIR}"/${PN}-no-des.patch autoreconf } =20