mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-20 18:32:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

portmap: missing patches

Browse Source 
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2563 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Marcin Juszkiewicz
2007-08-27 13:06:02 +00:00
parent 3cd1a09ce2
commit 4aa6b1451f
3 changed files with 87 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
meta/packages/portmap/portmap-6.0/destdir-no-strip.patch vendored Normal file
View File

@@ -0,0 +1,44 @@
From: Mike Frysinger <vapier@gentoo.org>
Date: Sun, 13 May 2007 21:15:12 +0000 (-0400)
Subject: respect DESTDIR and dont use -s with install
X-Git-Url: http://neil.brown.name/git?p=portmap;a=commitdiff_plain;h=603c59b978c04df2354f68d4a2dc676a758ff46d
respect DESTDIR and dont use -s with install
$(DESTDIR) is the standard for installing into other trees, not $(BASEDIR) ...
so I've converted the Makefile to use that. I've also left in $(BASEDIR) as a
default to support old installs; not sure if you'd just cut it.
Stripping should be left to the person to handle, not automatically done by
the install step. Also, `install -s` always calls `strip` which is
wrong/undesired in cross-compiling scenarios.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Neil Brown <neilb@suse.de>
---
diff --git a/Makefile b/Makefile
index 9e9a4b4..5343428 100644
--- a/Makefile
+++ b/Makefile
@@ -135,13 +135,14 @@ from_local: CPPFLAGS += -DTEST
portmap.man : portmap.8
sed $(MAN_SED) < portmap.8 > portmap.man
+DESTDIR = $(BASEDIR)
install: all
- install -o root -g root -m 0755 -s portmap ${BASEDIR}/sbin
- install -o root -g root -m 0755 -s pmap_dump ${BASEDIR}/sbin
- install -o root -g root -m 0755 -s pmap_set ${BASEDIR}/sbin
- install -o root -g root -m 0644 portmap.man ${BASEDIR}/usr/share/man/man8/portmap.8
- install -o root -g root -m 0644 pmap_dump.8 ${BASEDIR}/usr/share/man/man8
- install -o root -g root -m 0644 pmap_set.8 ${BASEDIR}/usr/share/man/man8
+ install -o root -g root -m 0755 portmap $(DESTDIR)/sbin
+ install -o root -g root -m 0755 pmap_dump $(DESTDIR)/sbin
+ install -o root -g root -m 0755 pmap_set $(DESTDIR)/sbin
+ install -o root -g root -m 0644 portmap.man $(DESTDIR)/usr/share/man/man8/portmap.8
+ install -o root -g root -m 0644 pmap_dump.8 $(DESTDIR)/usr/share/man/man8
+ install -o root -g root -m 0644 pmap_set.8 $(DESTDIR)/usr/share/man/man8
clean:
rm -f *.o portmap pmap_dump pmap_set from_local \

15
meta/packages/portmap/portmap-6.0/no-libwrap.patch vendored Normal file
View File

@@ -0,0 +1,15 @@
Index: Makefile
===================================================================
--- Makefile.orig 2007-05-15 16:00:17.000000000 +0200
+++ Makefile 2007-05-15 16:00:55.000000000 +0200
@@ -19,8 +19,8 @@
# USE_DNS to add hostname tests in hosts.allow/deny.
ifeq ($(NO_TCP_WRAPPER),)
-CPPFLAGS += -DHOSTS_ACCESS
-WRAP_LIB = -lwrap
+#CPPFLAGS += -DHOSTS_ACCESS
+#WRAP_LIB = -lwrap
ifdef USE_DNS
CPPFLAGS += -DENABLE_DNS
MAN_SED += -e 's/USE_DNS/yes/'

28
meta/packages/portmap/portmap-6.0/no-tcpd-support.patch vendored Normal file
View File

@@ -0,0 +1,28 @@
From: Mike Frysinger <vapier@gentoo.org>
Date: Sun, 13 May 2007 21:17:32 +0000 (-0400)
Subject: fix building with tcpd support disabled
X-Git-Url: http://neil.brown.name/git?p=portmap;a=commitdiff_plain;h=7847207aed1b44faf077eed14a9ac9c68244eba5
fix building with tcpd support disabled
Make sure pmap_check.c only includes tcpd.h when HOSTS_ACCESS is defined.
Signed-off-by: Timothy Redaelli <drizzt@gentoo.org>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Neil Brown <neilb@suse.de>
---
diff --git a/pmap_check.c b/pmap_check.c
index 84f2c12..443a822 100644
--- a/pmap_check.c
+++ b/pmap_check.c
@@ -44,7 +44,9 @@
#include <netinet/in.h>
#include <rpc/rpcent.h>
#endif
+#ifdef HOSTS_ACCESS
#include <tcpd.h>
+#endif
#include <arpa/inet.h>
#include <grp.h>