[gentoo-commits] proj/hardened-dev:uclibc commit in: net-nds/rpcbind/, net-nds/rpcbind/files/

[Anthony G. Basile]

commit:     089c4646f1ecfc2dcbf6939ca0d69fa4a4c256b0
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  1 23:12:53 2012 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Jul  1 23:12:53 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=089c4646

net-nds/rpcbind: remove hacky approach

---
 .../rpcbind/files/rpcbind-0.2.0-pkgconfig.patch    |   65 --------------------
 .../rpcbind/files/rpcbind-uclibc-nss-rpcsvc.patch  |   64 -------------------
 net-nds/rpcbind/files/rpcbind.confd                |    4 -
 net-nds/rpcbind/files/rpcbind.initd                |   22 -------
 net-nds/rpcbind/metadata.xml                       |    5 --
 net-nds/rpcbind/rpcbind-0.2.0-r99.ebuild           |   42 -------------
 6 files changed, 0 insertions(+), 202 deletions(-)

diff --git a/net-nds/rpcbind/files/rpcbind-0.2.0-pkgconfig.patch b/net-nds/rpcbind/files/rpcbind-0.2.0-pkgconfig.patch
deleted file mode 100644
index e0339af..0000000
--- a/net-nds/rpcbind/files/rpcbind-0.2.0-pkgconfig.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From afd71b8fc0df036a884b3af14ddb875674a49a85 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Diego=20Elio=20Petten=F2?= <flameeyes@×××××.com>
-Date: Mon, 29 Nov 2010 16:28:38 -0500
-Subject: [PATCH] Use pkg-config to find libtirpc
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This allows to properly cross-compile rpcbind, as /usr/include/tirpc is
-no longer a valid path in that case.
-
-Signed-off-by: Diego Elio Pettenò <flameeyes@×××××.com>
-Signed-off-by: Steve Dickson <steved@××××××.com>
----
- configure.in    |    4 +++-
- src/Makefile.am |   13 +++++++------
- 2 files changed, 10 insertions(+), 7 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index de1c730..7d43fd4 100644
---- a/configure.in
-+++ b/configure.in
-@@ -51,7 +51,9 @@ AC_CHECK_HEADERS([arpa/inet.h fcntl.h netdb.h \
-                   unistd.h nss.h])
- 
- AC_CHECK_LIB([pthread], [pthread_create])
--AC_CHECK_LIB([tirpc], [clnt_create])
-+
-+PKG_CHECK_MODULES([TIRPC], [libtirpc])
-+
- AC_ARG_ENABLE(libwrap,[ --enable-libwrap  Enables host name checking], 
- 	[case "${enableval}" in
- 		yes) libwarp=true 
-diff --git a/src/Makefile.am b/src/Makefile.am
-index cc0a85b..a2f3e34 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -1,4 +1,4 @@
--INCLUDES = -I$(srcdir)/tirpc -DPORTMAP -DINET6 -DVERSION="\"$(VERSION)\"" \
-+INCLUDES = $(TIRPC_CFLAGS) -DPORTMAP -DINET6 -DVERSION="\"$(VERSION)\"" \
-                                                 -D_GNU_SOURCE -Wall -pipe
- if DEBUG
- INCLUDES +=	-DRPCBIND_DEBUG -DSVC_RUN_DEBUG -DDEBUG_RMTCALL
-@@ -23,12 +23,13 @@ rpcbind_SOURCES =       check_bound.c rpcbind.c \
-                         rpcbind.h
- 
- rpcinfo_SOURCES =       rpcinfo.c
--rpcinfo_LDFLAGS =       -lpthread -ltirpc
--rpcinfo_LDADD   =       $(LIB_TIRPC)
-+rpcinfo_LDFLAGS =       -lpthread
-+rpcinfo_LDADD   =       $(TIRPC_LIBS)
- 
- 
--rpcbind_LDFLAGS = -lpthread -ltirpc
--rpcbind_LDADD = $(LIB_TIRPC)
--AM_CPPFLAGS = -I/usr/include/tirpc -DCHECK_LOCAL -DPORTMAP \
-+rpcbind_LDFLAGS = -lpthread
-+rpcbind_CFLAGS = $(TIRPC_CFLAGS)
-+rpcbind_LDADD = $(TIRPC_LIBS)
-+AM_CPPFLAGS = -DCHECK_LOCAL -DPORTMAP \
-                        -DFACILITY=LOG_MAIL -DSEVERITY=LOG_INFO
-      
--- 
-1.7.6
-

diff --git a/net-nds/rpcbind/files/rpcbind-uclibc-nss-rpcsvc.patch b/net-nds/rpcbind/files/rpcbind-uclibc-nss-rpcsvc.patch
deleted file mode 100644
index c46dd2d..0000000
--- a/net-nds/rpcbind/files/rpcbind-uclibc-nss-rpcsvc.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-See: http://git.alpinelinux.org/cgit/aports/tree/main/rpcbind/0001-uclibc-nss.patch
-and  http://git.alpinelinux.org/cgit/aports/tree/main/rpcbind/0002-uclibc-rpcsvc-defines.patch
-diff --git a/src/rpcbind.c b/src/rpcbind.c
-index 525ffba..1fe1a60 100644
---- a/src/rpcbind.c
-+++ b/src/rpcbind.c
-@@ -67,7 +67,11 @@
- #include <pwd.h>
- #include <string.h>
- #include <errno.h>
-+#if defined(__UCLIBC__)
-+#define __nss_configure_lookup(x,y)
-+#else
- #include <nss.h>
-+#endif
- #include "config.h"
- #include "rpcbind.h"
-
-diff --git a/src/security.c b/src/security.c
-index 0edeac6..e9fed55 100644
---- a/src/security.c
-+++ b/src/security.c
-@@ -20,6 +20,32 @@
- /*
-  * XXX for special case checks in check_callit.
-  */
-+#if defined(__UCLIBC__)
-+
-+#define MOUNTPROC_MNT 1
-+#define MOUNTPROC_UMNT 3
-+
-+#define NFS_PROGRAM	100003
-+#define YPPROG		100004
-+#define MOUNTPROG	100005
-+#define YPBINDPROG	100007
-+#define YPPASSWDPROG	100009
-+#define RQUOTAPROG	100011
-+
-+#define YPPROC_NULL	0
-+#define YPPROC_DOMAIN 	1
-+#define YPPROC_DOMAIN_NONACK 2
-+#define YPPROC_MATCH	3
-+#define YPPROC_FIRST	4
-+#define YPPROC_NEXT	5
-+#define YPPROC_XFR	6
-+#define YPPROC_CLEAR	7
-+#define YPPROC_ALL	8
-+
-+#define YPBINDPROC_SETDOM	2
-+
-+#else
-+
- #include <rpcsvc/mount.h>
- #include <rpcsvc/rquota.h>
- #include <rpcsvc/nfs_prot.h>
-@@ -27,6 +53,8 @@
- #include <rpcsvc/ypclnt.h>
- #include <rpcsvc/yppasswd.h>
- 
-+#endif
-+
- #include "rpcbind.h"
- 
- #ifdef LIBWRAP

diff --git a/net-nds/rpcbind/files/rpcbind.confd b/net-nds/rpcbind/files/rpcbind.confd
deleted file mode 100755
index ddc0917..0000000
--- a/net-nds/rpcbind/files/rpcbind.confd
+++ /dev/null
@@ -1,4 +0,0 @@
-# /etc/conf.d/rpcbind
- 
-# Options for `rpcbind`.
-#RPCBIND_OPTS="-l"

diff --git a/net-nds/rpcbind/files/rpcbind.initd b/net-nds/rpcbind/files/rpcbind.initd
deleted file mode 100755
index 995ca71..0000000
--- a/net-nds/rpcbind/files/rpcbind.initd
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/rpcbind/files/rpcbind.initd,v 1.1 2007/12/29 09:13:55 vapier Exp $
-
-depend() {
-	use net
-	before inetd xinetd
-	provide portmap
-}
-
-start() {
-	ebegin "Starting rpcbind"
-	start-stop-daemon --start --quiet --exec /sbin/rpcbind -- ${RPCBIND_OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping rpcbind"
-	start-stop-daemon --stop --quiet --exec /sbin/rpcbind
-	eend $?
-}

diff --git a/net-nds/rpcbind/metadata.xml b/net-nds/rpcbind/metadata.xml
deleted file mode 100644
index ca66751..0000000
--- a/net-nds/rpcbind/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>net-fs</herd>
-</pkgmetadata>

diff --git a/net-nds/rpcbind/rpcbind-0.2.0-r99.ebuild b/net-nds/rpcbind/rpcbind-0.2.0-r99.ebuild
deleted file mode 100644
index 4dce3ac..0000000
--- a/net-nds/rpcbind/rpcbind-0.2.0-r99.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/rpcbind/rpcbind-0.2.0.ebuild,v 1.13 2012/01/26 01:02:24 vapier Exp $
-
-EAPI="4"
-
-inherit autotools
-
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-KEYWORDS="amd64 x86 mips"
-
-DESCRIPTION="portmap replacement which supports RPC over various protocols"
-HOMEPAGE="http://sourceforge.net/projects/rpcbind/"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="tcpd"
-
-RDEPEND="net-libs/libtirpc
-	tcpd? ( sys-apps/tcp-wrappers )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-pkgconfig.patch
-	epatch "${FILESDIR}"/${PN}-uclibc-nss-rpcsvc.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--bindir=/sbin \
-		$(use_enable tcpd libwrap)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	doman man/rpc{bind,info}.8
-	dodoc AUTHORS ChangeLog NEWS README
-	newinitd "${FILESDIR}"/rpcbind.initd rpcbind || die
-	newconfd "${FILESDIR}"/rpcbind.confd rpcbind || die
-}