[oe-commits] org.oe.dev portmap: added 6.0 from Poky

Mon Aug 27 13:12:32 UTC 2007

portmap: added 6.0 from Poky

Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: 98112d31a1f0f9886148b2ee9fa467b31e2525a1
ViewMTN: http://monotone.openembedded.org/revision.psp?id=98112d31a1f0f9886148b2ee9fa467b31e2525a1
Files:
1
packages/portmap/portmap-6.0
packages/portmap/portmap-6.0/destdir-no-strip.patch
packages/portmap/portmap-6.0/no-libwrap.patch
packages/portmap/portmap-6.0/no-tcpd-support.patch
packages/portmap/portmap_6.0.bb
packages/portmap/portmap.inc
Diffs:

#
# mt diff -r8cd13341787d14b59697fde2c26e69501e2666f4 -r98112d31a1f0f9886148b2ee9fa467b31e2525a1
#
# 
# 
# add_dir "packages/portmap/portmap-6.0"
# 
# add_file "packages/portmap/portmap-6.0/destdir-no-strip.patch"
#  content [f8c1fc10af211a706c2d9e98872ddaaeef1c165e]
# 
# add_file "packages/portmap/portmap-6.0/no-libwrap.patch"
#  content [fc32321b7bf0534d84414d6f1aac381c2ff2475f]
# 
# add_file "packages/portmap/portmap-6.0/no-tcpd-support.patch"
#  content [e0c8679553ae5264003fc7b888634771ed4c4f3d]
# 
# add_file "packages/portmap/portmap_6.0.bb"
#  content [ca392f1e64fd7197d9e3a2fda7b4573b8ca5f289]
# 
# patch "packages/portmap/portmap.inc"
#  from [fe3c7fd20199a597bf47cca11fec9bcafa5bc049]
#    to [03a075d623238bc9402ae2882f8f05d638c80ab6]
# 
============================================================

--- packages/portmap/portmap-6.0/destdir-no-strip.patch	f8c1fc10af211a706c2d9e98872ddaaeef1c165e
+++ packages/portmap/portmap-6.0/destdir-no-strip.patch	f8c1fc10af211a706c2d9e98872ddaaeef1c165e
@@ -0,0 +1,44 @@
+From: Mike Frysinger <vapier at 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 at gentoo.org>
+Signed-off-by: Neil Brown <neilb at 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 \
============================================================
--- packages/portmap/portmap-6.0/no-libwrap.patch	fc32321b7bf0534d84414d6f1aac381c2ff2475f
+++ packages/portmap/portmap-6.0/no-libwrap.patch	fc32321b7bf0534d84414d6f1aac381c2ff2475f
@@ -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/'
============================================================
--- packages/portmap/portmap-6.0/no-tcpd-support.patch	e0c8679553ae5264003fc7b888634771ed4c4f3d
+++ packages/portmap/portmap-6.0/no-tcpd-support.patch	e0c8679553ae5264003fc7b888634771ed4c4f3d
@@ -0,0 +1,28 @@
+From: Mike Frysinger <vapier at 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 at gentoo.org>
+Signed-off-by: Mike Frysinger <vapier at gentoo.org>
+Signed-off-by: Neil Brown <neilb at 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>
+ 
============================================================
--- packages/portmap/portmap_6.0.bb	ca392f1e64fd7197d9e3a2fda7b4573b8ca5f289
+++ packages/portmap/portmap_6.0.bb	ca392f1e64fd7197d9e3a2fda7b4573b8ca5f289
@@ -0,0 +1,18 @@
+require portmap.inc
+
+SRC_URI = "http://neil.brown.name/portmap/portmap-6.0.tgz \
+           file://destdir-no-strip.patch;patch=1 \
+	   file://no-tcpd-support.patch;patch=1 \
+           file://no-libwrap.patch;patch=1;pnum=0 \
+           file://portmap.init "
+
+S = "${WORKDIR}/${PN}_${PV}/"
+
+CPPFLAGS += "-DFACILITY=LOG_DAEMON -DENABLE_DNS"
+
+fakeroot do_install() {
+        install -d ${D}${sysconfdir}/init.d
+        install -m 0755 ${WORKDIR}/portmap.init ${D}${sysconfdir}/init.d/portmap
+        install -d ${D}${mandir}/man8/ ${D}${base_sbindir}
+        oe_runmake install DESTDIR=${D}
+}
============================================================
--- packages/portmap/portmap.inc	fe3c7fd20199a597bf47cca11fec9bcafa5bc049
+++ packages/portmap/portmap.inc	03a075d623238bc9402ae2882f8f05d638c80ab6
@@ -20,8 +20,9 @@ do_compile() {
 	oe_runmake
 }
 
-do_install() {
+fakeroot do_install() {
 	install -d ${D}${sysconfdir}/init.d
+	install -d ${D}${base_sbindir}
 	install -m 0755 ${WORKDIR}/portmap.init ${D}${sysconfdir}/init.d/portmap
 	oe_runmake 'docdir=${docdir}/portmap' 'DESTDIR=${D}' install
 }




