From 19dec673258e20633d472ef5f8d8c34e893d9146 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Tue, 19 Dec 2006 10:46:50 +0000 Subject: portmap: unified, added 5-24, dropped 5-7 - portmap 5-7 was used before Debian 'sarge' - not fetchable - portmap 5-24 will be in Debian 'etch' so will be fetchable for next 1-2 years - portmap-unslung not updated - it has other packaging --- packages/portmap/portmap-5-24/.mtn2git_empty | 0 packages/portmap/portmap-5-24/make.patch | 73 ++++++++++++++++++++++++++++ packages/portmap/portmap-unslung_5-7.bb | 23 --------- packages/portmap/portmap.inc | 32 ++++++++++++ packages/portmap/portmap_5-24.bb | 1 + packages/portmap/portmap_5-7.bb | 33 ------------- packages/portmap/portmap_5-9.bb | 34 +------------ 7 files changed, 108 insertions(+), 88 deletions(-) create mode 100644 packages/portmap/portmap-5-24/.mtn2git_empty create mode 100644 packages/portmap/portmap-5-24/make.patch delete mode 100644 packages/portmap/portmap-unslung_5-7.bb create mode 100644 packages/portmap/portmap.inc create mode 100644 packages/portmap/portmap_5-24.bb delete mode 100644 packages/portmap/portmap_5-7.bb (limited to 'packages/portmap') diff --git a/packages/portmap/portmap-5-24/.mtn2git_empty b/packages/portmap/portmap-5-24/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/portmap/portmap-5-24/make.patch b/packages/portmap/portmap-5-24/make.patch new file mode 100644 index 0000000000..6dacd828c6 --- /dev/null +++ b/packages/portmap/portmap-5-24/make.patch @@ -0,0 +1,73 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +Index: portmap_5beta/Makefile +=================================================================== +--- portmap_5beta.orig/Makefile 2006-12-19 10:32:58.000000000 +0000 ++++ portmap_5beta/Makefile 2006-12-19 10:35:54.000000000 +0000 +@@ -110,6 +110,13 @@ + # + #CONST = -Dconst= + ++DESTDIR = ++prefix = /usr ++sbindir = /sbin ++datadir = $(prefix)/share ++mandir = $(datadir)/man ++docdir = $(datadir)/doc/portmap ++ + ### End of configurable stuff. + ############################## + +@@ -127,7 +134,7 @@ + COPT = $(CONST) $(HOSTS_ACCESS) $(CHECK_PORT) \ + $(SYS) -DFACILITY=$(FACILITY) $(ULONG) $(ZOMBIES) $(BROKEN_PIPE) \ + $(SA_LEN) $(LOOPBACK) $(SETPGRP) +-CFLAGS = -Wall $(COPT) -O2 $(NSARCHS) ++CFLAGS = -Wall -O2 $(NSARCHS) + OBJECTS = portmap.o pmap_check.o from_local.o $(AUX) + + all: portmap pmap_dump pmap_set +@@ -142,20 +149,23 @@ + $(CC) $(CFLAGS) -o $@ $? $(LIBS) + + from_local: from_local.c +- cc $(CFLAGS) -DTEST -o $@ from_local.c ++ $(CC) $(COPT) -DTEST $(CFLAGS) $(LDFLAGS) -o $@ from_local.c + + get_myaddress: get_myaddress.c +- cc $(CFLAGS) -DTEST -o $@ get_myaddress.c $(LIBS) ++ $(CC) $(COPT) -DTEST $(CFLAGS) $(LDFLAGS) -o $@ get_myaddress.c $(LIBS) + + 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.8 ${BASEDIR}/usr/share/man/man8 +- 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 +- cat BLURB >${BASEDIR}/usr/share/doc/portmap/portmapper.txt +- gzip -9f ${BASEDIR}/usr/share/doc/portmap/portmapper.txt ++ install -d $(DESTDIR)/$(sbindir) \ ++ $(DESTDIR)/$(docdir) \ ++ $(DESTDIR)/$(mandir)/man8 ++ install -m 0755 -s portmap ${DESTDIR}/sbin ++ install -m 0755 -s pmap_dump ${DESTDIR}/sbin ++ install -m 0755 -s pmap_set ${DESTDIR}/sbin ++ install -m 0644 portmap.8 ${DESTDIR}/usr/share/man/man8 ++ install -m 0644 pmap_dump.8 ${DESTDIR}/usr/share/man/man8 ++ install -m 0644 pmap_set.8 ${DESTDIR}/usr/share/man/man8 ++ cat BLURB >${DESTDIR}/usr/share/doc/portmap/portmapper.txt ++ gzip -9f ${DESTDIR}/usr/share/doc/portmap/portmapper.txt + + + lint: +@@ -181,3 +191,6 @@ + portmap.o: portmap.c + portmap.o: pmap_check.h Makefile + strerror.o: strerror.c ++ ++%.o: %.c ++ $(CC) $(COPT) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c $*.c -o $*.o diff --git a/packages/portmap/portmap-unslung_5-7.bb b/packages/portmap/portmap-unslung_5-7.bb deleted file mode 100644 index ee6c648e9b..0000000000 --- a/packages/portmap/portmap-unslung_5-7.bb +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION = "RPC program number mapper." -SECTION = "console/network" -LICENSE = "GPL" -PR = "r2" -COMPATIBLE_MACHINE = "nslu2" - -SRC_URI = "http://www.uk.debian.org/debian/pool/main/p/portmap/portmap_5.orig.tar.gz \ - http://www.uk.debian.org/debian/pool/main/p/portmap/portmap_${PV}.diff.gz;patch=1 \ - file://no-libwrap.patch;patch=1;pnum=0 \ - file://portmap.init \ - file://make.patch;patch=1" -S = "${WORKDIR}/portmap_5beta" - -sbindir = "/sbin" - -do_compile() { - oe_runmake -} - -do_install() { - oe_runmake 'docdir=${datadir}/doc/portmap' \ - 'DESTDIR=${D}' install -} diff --git a/packages/portmap/portmap.inc b/packages/portmap/portmap.inc new file mode 100644 index 0000000000..ad477828fb --- /dev/null +++ b/packages/portmap/portmap.inc @@ -0,0 +1,32 @@ +DESCRIPTION = "RPC program number mapper." +SECTION = "console/network" +LICENSE = "GPL" + +SRC_URI = "http://www.uk.debian.org/debian/pool/main/p/portmap/portmap_5.orig.tar.gz \ + http://www.uk.debian.org/debian/pool/main/p/portmap/portmap_${PV}.diff.gz;patch=1 \ + file://no-libwrap.patch;patch=1;pnum=0 \ + file://portmap.init \ + file://make.patch;patch=1" +S = "${WORKDIR}/portmap_5beta" + +PACKAGES =+ "portmap-utils" +FILES_portmap-utils = "/sbin/pmap_set /sbin/pmap_dump" +FILES_${PN}-doc += "${docdir}" + +INITSCRIPT_NAME = "portmap" +INITSCRIPT_PARAMS = "start 43 S . start 32 0 6 . stop 81 1 ." + +inherit update-rc.d + +sbindir = "/sbin" + +do_compile() { + oe_runmake +} + +do_install() { + install -d ${D}${sysconfdir}/init.d + 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_5-24.bb b/packages/portmap/portmap_5-24.bb new file mode 100644 index 0000000000..064679e7f0 --- /dev/null +++ b/packages/portmap/portmap_5-24.bb @@ -0,0 +1 @@ +require portmap.inc diff --git a/packages/portmap/portmap_5-7.bb b/packages/portmap/portmap_5-7.bb deleted file mode 100644 index 0e6e2ab6a5..0000000000 --- a/packages/portmap/portmap_5-7.bb +++ /dev/null @@ -1,33 +0,0 @@ -DESCRIPTION = "RPC program number mapper." -SECTION = "console/network" -LICENSE = "GPL" -PR = "r2" - -SRC_URI = "http://www.uk.debian.org/debian/pool/main/p/portmap/portmap_5.orig.tar.gz \ - http://www.uk.debian.org/debian/pool/main/p/portmap/portmap_${PV}.diff.gz;patch=1 \ - file://no-libwrap.patch;patch=1;pnum=0 \ - file://portmap.init \ - file://make.patch;patch=1" -S = "${WORKDIR}/portmap_5beta" - -PACKAGES =+ "portmap-utils" -FILES_portmap-utils = "/sbin/pmap_set /sbin/pmap_dump" -FILES_${PN}-doc += "${docdir}" - -INITSCRIPT_NAME = "portmap" -INITSCRIPT_PARAMS = "start 43 S . start 32 0 6 . start 18 2 3 4 5 . stop 81 1 ." - -inherit update-rc.d - -sbindir = "/sbin" - -do_compile() { - oe_runmake -} - -do_install() { - install -d ${D}${sysconfdir}/init.d - 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_5-9.bb b/packages/portmap/portmap_5-9.bb index 76d66e9ad9..348a3060e4 100644 --- a/packages/portmap/portmap_5-9.bb +++ b/packages/portmap/portmap_5-9.bb @@ -1,33 +1,3 @@ -DESCRIPTION = "RPC program number mapper." -SECTION = "console/network" -LICENSE = "GPL" -PR = "r5" - -SRC_URI = "http://www.uk.debian.org/debian/pool/main/p/portmap/portmap_5.orig.tar.gz \ - http://www.uk.debian.org/debian/pool/main/p/portmap/portmap_${PV}.diff.gz;patch=1 \ - file://no-libwrap.patch;patch=1;pnum=0 \ - file://portmap.init \ - file://make.patch;patch=1" -S = "${WORKDIR}/portmap_5beta" - -PACKAGES =+ "portmap-utils" -FILES_portmap-utils = "/sbin/pmap_set /sbin/pmap_dump" -FILES_${PN}-doc += "${docdir}" - -INITSCRIPT_NAME = "portmap" -INITSCRIPT_PARAMS = "start 43 S . start 32 0 6 . stop 81 1 ." +require portmap.inc -inherit update-rc.d - -sbindir = "/sbin" - -do_compile() { - oe_runmake -} - -do_install() { - install -d ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/portmap.init ${D}${sysconfdir}/init.d/portmap - oe_runmake 'docdir=${docdir}/portmap' \ - 'DESTDIR=${D}' install -} +PR = "r5" -- cgit 1.2.3-korg