summaryrefslogtreecommitdiffstats
path: root/meta/packages/portmap
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openedhand.com>2007-08-27 13:06:02 +0000
committerMarcin Juszkiewicz <hrw@openedhand.com>2007-08-27 13:06:02 +0000
commit4aa6b1451f5afbc4861561c96777b039eaec4fc3 (patch)
tree5134478faeb7b3331ea77e5303a909d987f2bf03 /meta/packages/portmap
parent3cd1a09ce251838a2e6cecf1706cffcd34bf6304 (diff)
downloadpoky-4aa6b1451f5afbc4861561c96777b039eaec4fc3.tar.gz
portmap: missing patches
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2563 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/portmap')
-rw-r--r--meta/packages/portmap/portmap-6.0/destdir-no-strip.patch44
-rw-r--r--meta/packages/portmap/portmap-6.0/no-libwrap.patch15
-rw-r--r--meta/packages/portmap/portmap-6.0/no-tcpd-support.patch28
3 files changed, 87 insertions, 0 deletions
diff --git a/meta/packages/portmap/portmap-6.0/destdir-no-strip.patch b/meta/packages/portmap/portmap-6.0/destdir-no-strip.patch
new file mode 100644
index 0000000000..a1563c7141
--- /dev/null
+++ b/meta/packages/portmap/portmap-6.0/destdir-no-strip.patch
@@ -0,0 +1,44 @@
1From: Mike Frysinger <vapier@gentoo.org>
2Date: Sun, 13 May 2007 21:15:12 +0000 (-0400)
3Subject: respect DESTDIR and dont use -s with install
4X-Git-Url: http://neil.brown.name/git?p=portmap;a=commitdiff_plain;h=603c59b978c04df2354f68d4a2dc676a758ff46d
5
6respect DESTDIR and dont use -s with install
7
8$(DESTDIR) is the standard for installing into other trees, not $(BASEDIR) ...
9so I've converted the Makefile to use that. I've also left in $(BASEDIR) as a
10default to support old installs; not sure if you'd just cut it.
11
12Stripping should be left to the person to handle, not automatically done by
13the install step. Also, `install -s` always calls `strip` which is
14wrong/undesired in cross-compiling scenarios.
15
16Signed-off-by: Mike Frysinger <vapier@gentoo.org>
17Signed-off-by: Neil Brown <neilb@suse.de>
18---
19
20diff --git a/Makefile b/Makefile
21index 9e9a4b4..5343428 100644
22--- a/Makefile
23+++ b/Makefile
24@@ -135,13 +135,14 @@ from_local: CPPFLAGS += -DTEST
25 portmap.man : portmap.8
26 sed $(MAN_SED) < portmap.8 > portmap.man
27
28+DESTDIR = $(BASEDIR)
29 install: all
30- install -o root -g root -m 0755 -s portmap ${BASEDIR}/sbin
31- install -o root -g root -m 0755 -s pmap_dump ${BASEDIR}/sbin
32- install -o root -g root -m 0755 -s pmap_set ${BASEDIR}/sbin
33- install -o root -g root -m 0644 portmap.man ${BASEDIR}/usr/share/man/man8/portmap.8
34- install -o root -g root -m 0644 pmap_dump.8 ${BASEDIR}/usr/share/man/man8
35- install -o root -g root -m 0644 pmap_set.8 ${BASEDIR}/usr/share/man/man8
36+ install -o root -g root -m 0755 portmap $(DESTDIR)/sbin
37+ install -o root -g root -m 0755 pmap_dump $(DESTDIR)/sbin
38+ install -o root -g root -m 0755 pmap_set $(DESTDIR)/sbin
39+ install -o root -g root -m 0644 portmap.man $(DESTDIR)/usr/share/man/man8/portmap.8
40+ install -o root -g root -m 0644 pmap_dump.8 $(DESTDIR)/usr/share/man/man8
41+ install -o root -g root -m 0644 pmap_set.8 $(DESTDIR)/usr/share/man/man8
42
43 clean:
44 rm -f *.o portmap pmap_dump pmap_set from_local \
diff --git a/meta/packages/portmap/portmap-6.0/no-libwrap.patch b/meta/packages/portmap/portmap-6.0/no-libwrap.patch
new file mode 100644
index 0000000000..a880da6253
--- /dev/null
+++ b/meta/packages/portmap/portmap-6.0/no-libwrap.patch
@@ -0,0 +1,15 @@
1Index: Makefile
2===================================================================
3--- Makefile.orig 2007-05-15 16:00:17.000000000 +0200
4+++ Makefile 2007-05-15 16:00:55.000000000 +0200
5@@ -19,8 +19,8 @@
6 # USE_DNS to add hostname tests in hosts.allow/deny.
7
8 ifeq ($(NO_TCP_WRAPPER),)
9-CPPFLAGS += -DHOSTS_ACCESS
10-WRAP_LIB = -lwrap
11+#CPPFLAGS += -DHOSTS_ACCESS
12+#WRAP_LIB = -lwrap
13 ifdef USE_DNS
14 CPPFLAGS += -DENABLE_DNS
15 MAN_SED += -e 's/USE_DNS/yes/'
diff --git a/meta/packages/portmap/portmap-6.0/no-tcpd-support.patch b/meta/packages/portmap/portmap-6.0/no-tcpd-support.patch
new file mode 100644
index 0000000000..da55f3799d
--- /dev/null
+++ b/meta/packages/portmap/portmap-6.0/no-tcpd-support.patch
@@ -0,0 +1,28 @@
1From: Mike Frysinger <vapier@gentoo.org>
2Date: Sun, 13 May 2007 21:17:32 +0000 (-0400)
3Subject: fix building with tcpd support disabled
4X-Git-Url: http://neil.brown.name/git?p=portmap;a=commitdiff_plain;h=7847207aed1b44faf077eed14a9ac9c68244eba5
5
6fix building with tcpd support disabled
7
8Make sure pmap_check.c only includes tcpd.h when HOSTS_ACCESS is defined.
9
10Signed-off-by: Timothy Redaelli <drizzt@gentoo.org>
11Signed-off-by: Mike Frysinger <vapier@gentoo.org>
12Signed-off-by: Neil Brown <neilb@suse.de>
13---
14
15diff --git a/pmap_check.c b/pmap_check.c
16index 84f2c12..443a822 100644
17--- a/pmap_check.c
18+++ b/pmap_check.c
19@@ -44,7 +44,9 @@
20 #include <netinet/in.h>
21 #include <rpc/rpcent.h>
22 #endif
23+#ifdef HOSTS_ACCESS
24 #include <tcpd.h>
25+#endif
26 #include <arpa/inet.h>
27 #include <grp.h>
28