diff options
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/portmap/portmap-6.0/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/portmap/portmap-6.0/destdir-no-strip.patch | 44 | ||||
| -rw-r--r-- | packages/portmap/portmap-6.0/no-libwrap.patch | 15 | ||||
| -rw-r--r-- | packages/portmap/portmap-6.0/no-tcpd-support.patch | 28 | ||||
| -rw-r--r-- | packages/portmap/portmap.inc | 3 | ||||
| -rw-r--r-- | packages/portmap/portmap_6.0.bb | 18 |
6 files changed, 107 insertions, 1 deletions
diff --git a/packages/portmap/portmap-6.0/.mtn2git_empty b/packages/portmap/portmap-6.0/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/portmap/portmap-6.0/.mtn2git_empty diff --git a/packages/portmap/portmap-6.0/destdir-no-strip.patch b/packages/portmap/portmap-6.0/destdir-no-strip.patch new file mode 100644 index 0000000000..a1563c7141 --- /dev/null +++ b/packages/portmap/portmap-6.0/destdir-no-strip.patch @@ -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 \ diff --git a/packages/portmap/portmap-6.0/no-libwrap.patch b/packages/portmap/portmap-6.0/no-libwrap.patch new file mode 100644 index 0000000000..a880da6253 --- /dev/null +++ b/packages/portmap/portmap-6.0/no-libwrap.patch @@ -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/' diff --git a/packages/portmap/portmap-6.0/no-tcpd-support.patch b/packages/portmap/portmap-6.0/no-tcpd-support.patch new file mode 100644 index 0000000000..da55f3799d --- /dev/null +++ b/packages/portmap/portmap-6.0/no-tcpd-support.patch @@ -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> + diff --git a/packages/portmap/portmap.inc b/packages/portmap/portmap.inc index bb9d2b6652..478a5ed357 100644 --- a/packages/portmap/portmap.inc +++ b/packages/portmap/portmap.inc @@ -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 } diff --git a/packages/portmap/portmap_6.0.bb b/packages/portmap/portmap_6.0.bb new file mode 100644 index 0000000000..4b8b8c8d5c --- /dev/null +++ b/packages/portmap/portmap_6.0.bb @@ -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} +} |