[Armadeus-commitlog] armadeus branch, master, updated. release-3.4-3-g031ee6d

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  031ee6d95f58b6142a8c3e687cc0b8d3e3d8e284 (commit)
      from  5087c6fa3cde785fdf6ab55c92c5ef3d1e3cf37a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 031ee6d95f58b6142a8c3e687cc0b8d3e3d8e284
Author: Fabien Marteau <fab...@ar...>
Date:   Mon Mar 21 10:51:39 2011 +0100

    [buildroot][package][portmap] Backport new portmap from buildroot today git trunk (2011.05) -- to fix S13pormap init script copy

-----------------------------------------------------------------------

Summary of changes:
 ...map-BACKPORT_BUILDROOT_2011.05_2011_03_21.patch |  292 ++++++++++++++++++++
 1 files changed, 292 insertions(+), 0 deletions(-)
 create mode 100644 patches/buildroot/2010.11/145-portmap-BACKPORT_BUILDROOT_2011.05_2011_03_21.patch

diff --git a/patches/buildroot/2010.11/145-portmap-BACKPORT_BUILDROOT_2011.05_2011_03_21.patch b/patches/buildroot/2010.11/145-portmap-BACKPORT_BUILDROOT_2011.05_2011_03_21.patch
new file mode 100644
index 0000000..07e179f
--- /dev/null
+++ b/patches/buildroot/2010.11/145-portmap-BACKPORT_BUILDROOT_2011.05_2011_03_21.patch
@@ -0,0 +1,292 @@
+Index: buildroot/package/portmap/portmap-6.0-0001-README-fix-typo-in-tcp-wrapper-doc.patch
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/portmap/portmap-6.0-0001-README-fix-typo-in-tcp-wrapper-doc.patch	2011-03-21 10:43:15.000000000 +0100
+@@ -0,0 +1,26 @@
++From af4a27a17bbdbe941f2462e116c2e4c8ade110e3 Mon Sep 17 00:00:00 2001
++From: Mike Frysinger <va...@ge...>
++Date: Fri, 19 Nov 2010 23:35:20 -0500
++Subject: [PATCH 1/4] README: fix typo in tcp wrapper doc
++
++Signed-off-by: Mike Frysinger <va...@ge...>
++---
++ README |    2 +-
++ 1 files changed, 1 insertions(+), 1 deletions(-)
++
++diff --git a/README b/README
++index 0da54cc..916de7e 100644
++--- a/README
+++++ b/README
++@@ -18,7 +18,7 @@ There is no "./configure", just use "make".
++ 
++ Some make variable can be used to control compilation.
++ 
++- NO_TCP_WRAPPER=  if non-empty, doen't use tcp_wrappers
+++ NO_TCP_WRAPPER=  if non-empty, don't use tcp_wrappers
++  USE_DNS=	  if set, tcp_wrappers can check peers based on hostname
++ 		  as well as IP address.  This should only be used if you
++ 		  are certain that gethostbyname will never trigger a
++-- 
++1.7.3.1
++
+Index: buildroot/package/portmap/portmap-6.0-0002-NO_PIE-make-PIE-support-controllable.patch
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/portmap/portmap-6.0-0002-NO_PIE-make-PIE-support-controllable.patch	2011-03-21 10:43:15.000000000 +0100
+@@ -0,0 +1,53 @@
++From 087874b15367a04fd482541d1832696d7163d1ac Mon Sep 17 00:00:00 2001
++From: Mike Frysinger <va...@ge...>
++Date: Fri, 19 Nov 2010 23:35:47 -0500
++Subject: [PATCH 2/4] NO_PIE: make PIE support controllable
++
++Signed-off-by: Mike Frysinger <va...@ge...>
++---
++ Makefile |    8 ++++++--
++ README   |    1 +
++ 2 files changed, 7 insertions(+), 2 deletions(-)
++
++diff --git a/Makefile b/Makefile
++index 5343428..cfcfdbb 100644
++--- a/Makefile
+++++ b/Makefile
++@@ -106,6 +106,10 @@ CPPFLAGS += -DIGNORE_SIGCHLD	# AIX 4.x, HP-UX 9.x
++ #
++ # LDLIBS	+= -m
++ # CFLAGS	+= -arch m68k -arch i386 -arch hppa
+++ifeq ($(NO_PIE),)
+++CFLAGS_PIE  = -fpie
+++LDFLAGS_PIE = -pie
+++endif
++ 
++ # Auxiliary libraries that you may have to specify
++ #
++@@ -125,9 +129,9 @@ CFLAGS   += -Wall -Wstrict-prototypes
++ all:	portmap pmap_dump pmap_set portmap.man
++ 
++ CPPFLAGS += $(HOSTS_ACCESS)
++-portmap: CFLAGS   += -fpie
+++portmap: CFLAGS   += $(CFLAGS_PIE)
++ portmap: LDLIBS   += $(WRAP_LIB)
++-portmap: LDFLAGS  += -pie
+++portmap: LDFLAGS  += $(LDFLAGS_PIE)
++ portmap: portmap.o pmap_check.o from_local.o
++ 
++ from_local: CPPFLAGS += -DTEST
++diff --git a/README b/README
++index 916de7e..e0b561a 100644
++--- a/README
+++++ b/README
++@@ -18,6 +18,7 @@ There is no "./configure", just use "make".
++ 
++ Some make variable can be used to control compilation.
++ 
+++ NO_PIE=	  if non-empty, don't build portmap as a PIE
++  NO_TCP_WRAPPER=  if non-empty, don't use tcp_wrappers
++  USE_DNS=	  if set, tcp_wrappers can check peers based on hostname
++ 		  as well as IP address.  This should only be used if you
++-- 
++1.7.3.1
++
+Index: buildroot/package/portmap/portmap-6.0-0003-NO_FORK-control-usage-of-fork-for-nommu-systems.patch
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/portmap/portmap-6.0-0003-NO_FORK-control-usage-of-fork-for-nommu-systems.patch	2011-03-21 10:43:15.000000000 +0100
+@@ -0,0 +1,95 @@
++From b3afea5757af1a7356ba30d2e0a7d5909ca18121 Mon Sep 17 00:00:00 2001
++From: Mike Frysinger <va...@ge...>
++Date: Fri, 19 Nov 2010 23:48:20 -0500
++Subject: [PATCH 3/4] NO_FORK: control usage of fork() for nommu systems
++
++nommu systems lack a fork() function, so add a NO_FORK flag to control
++its usage.  We don't lose a ton of functionality in doing so, and on an
++embedded system, this is OK.
++
++Signed-off-by: Mike Frysinger <va...@ge...>
++---
++ Makefile     |    5 +++++
++ README       |    1 +
++ pmap_check.c |    6 ++++--
++ portmap.c    |    6 ++++++
++ 4 files changed, 16 insertions(+), 2 deletions(-)
++
++diff --git a/Makefile b/Makefile
++index cfcfdbb..9df5574 100644
++--- a/Makefile
+++++ b/Makefile
++@@ -27,6 +27,11 @@ MAN_SED += -e 's/USE_DNS/yes/'
++ endif
++ endif
++ 
+++# For no-mmu systems, we have to disable the fork() functions.
+++ifneq ($(NO_FORK),)
+++CPPFLAGS += -DNO_FORK
+++endif
+++
++ # Comment out if your RPC library does not allocate privileged ports for
++ # requests from processes with root privilege, or the new portmap will
++ # always reject requests to register/unregister services on privileged
++diff --git a/README b/README
++index e0b561a..bda1707 100644
++--- a/README
+++++ b/README
++@@ -18,6 +18,7 @@ There is no "./configure", just use "make".
++ 
++ Some make variable can be used to control compilation.
++ 
+++ NO_FORK=	  if non-empty, don't use fork (good for nommu systems)
++  NO_PIE=	  if non-empty, don't build portmap as a PIE
++  NO_TCP_WRAPPER=  if non-empty, don't use tcp_wrappers
++  USE_DNS=	  if set, tcp_wrappers can check peers based on hostname
++diff --git a/pmap_check.c b/pmap_check.c
++index 6b3e490..983414e 100644
++--- a/pmap_check.c
+++++ b/pmap_check.c
++@@ -302,8 +302,10 @@ static void logit(int severity, struct sockaddr_in *addr,
++      * getrpcbynumber() or syslog() does its thing.
++      */
++ 
++-    if (fork() == 0) {
++-
+++#ifndef NO_FORK
+++    if (fork() == 0)
+++#endif
+++    {
++ 	/* Try to map program number to name. */
++ 
++ 	if (prognum == 0) {
++diff --git a/portmap.c b/portmap.c
++index 2a98881..94abc64 100644
++--- a/portmap.c
+++++ b/portmap.c
++@@ -753,6 +755,7 @@ static void callit(struct svc_req *rqstp, SVCXPRT *xprt)
++ 	if ((pml = find_service(a.rmt_prog, a.rmt_vers,
++ 	    (u_long)IPPROTO_UDP)) == NULL)
++ 		return;
+++#ifndef NO_FORK
++ 	/*
++ 	 * fork a child to do the work.  Parent immediately returns.
++ 	 * Child exits upon completion.
++@@ -763,6 +766,7 @@ static void callit(struct svc_req *rqstp, SVCXPRT *xprt)
++ 			    a.rmt_prog);
++ 		return;
++ 	}
+++#endif
++ 	port = pml->pml_map.pm_port;
++ 	get_myaddress(&me);
++ 	me.sin_port = htons(port);
++@@ -783,7 +787,9 @@ static void callit(struct svc_req *rqstp, SVCXPRT *xprt)
++ 		clnt_destroy(client);
++ 	}
++ 	(void)close(so);
+++#ifndef NO_FORK
++ 	exit(0);
+++#endif
++ }
++ 
++ #ifndef IGNORE_SIGCHLD			/* Lionel Cons <co...@dx...> */
++-- 
++1.7.3.1
++
+Index: buildroot/package/portmap/portmap-6.0-0004-NO_PERROR-control-overriding-of-perror-symbol.patch
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/portmap/portmap-6.0-0004-NO_PERROR-control-overriding-of-perror-symbol.patch	2011-03-21 10:43:15.000000000 +0100
+@@ -0,0 +1,65 @@
++From 8cea0778f0fb838a7bd764be08f15e1494e5a0b2 Mon Sep 17 00:00:00 2001
++From: Mike Frysinger <va...@ge...>
++Date: Fri, 19 Nov 2010 23:50:27 -0500
++Subject: [PATCH 4/4] NO_PERROR: control overriding of perror() symbol
++
++Doing static builds of portmap might fail when the C library's perror()
++function is pulled in and collides with portmap's definition.  So add a
++flag to control the local override.
++
++Signed-off-by: Mike Frysinger <va...@ge...>
++---
++ Makefile |    5 +++++
++ README   |    1 +
++ 2 files changed, 6 insertions(+), 0 deletions(-)
++
++diff --git a/Makefile b/Makefile
++index 9df5574..1635107 100644
++--- a/Makefile
+++++ b/Makefile
++@@ -32,6 +32,11 @@ ifneq ($(NO_FORK),)
++ CPPFLAGS += -DNO_FORK
++ endif
++ 
+++# For static builds, we might hit perror() symbol clashes
+++ifneq ($(NO_PERROR),)
+++CPPFLAGS += -DNO_PERROR
+++endif
+++
++ # Comment out if your RPC library does not allocate privileged ports for
++ # requests from processes with root privilege, or the new portmap will
++ # always reject requests to register/unregister services on privileged
++diff --git a/README b/README
++index bda1707..05861a8 100644
++--- a/README
+++++ b/README
++@@ -19,6 +19,7 @@ There is no "./configure", just use "make".
++ Some make variable can be used to control compilation.
++ 
++  NO_FORK=	  if non-empty, don't use fork (good for nommu systems)
+++ NO_PERROR=	  if non-empty, don't override the perror() func
++  NO_PIE=	  if non-empty, don't build portmap as a PIE
++  NO_TCP_WRAPPER=  if non-empty, don't use tcp_wrappers
++  USE_DNS=	  if set, tcp_wrappers can check peers based on hostname
++diff --git a/portmap.c b/portmap.c
++index 2a98881..94abc64 100644
++--- a/portmap.c
+++++ b/portmap.c
++@@ -391,12 +391,14 @@ main(int argc, char **argv)
++ 	abort();
++ }
++ 
+++#ifndef NO_PERROR
++ /* need to override perror calls in rpc library */
++ void perror(const char *what)
++ {
++ 
++ 	syslog(LOG_ERR, "%s: %m", what);
++ }
+++#endif
++ 
++ static struct pmaplist *
++ find_service(u_long prog, u_long vers, u_long prot)
++-- 
++1.7.3.1
++
+Index: buildroot/package/portmap/portmap.mk
+===================================================================
+--- buildroot.orig/package/portmap/portmap.mk	2011-03-21 10:39:27.000000000 +0100
++++ buildroot/package/portmap/portmap.mk	2011-03-21 10:43:15.000000000 +0100
+@@ -9,8 +9,18 @@
+ PORTMAP_SITE = http://neil.brown.name/portmap
+ PORTMAP_SBINS = portmap pmap_dump pmap_set
+ 
++PORTMAP_FLAGS = NO_TCP_WRAPPER=1 NO_PIE=1 NO_PERROR=1
++ifeq ($(BR2_USE_MMU),)
++PORTMAP_FLAGS += NO_FORK=1
++endif
++
+ define PORTMAP_BUILD_CMDS
+-	$(MAKE) CC="$(TARGET_CC)" -C $(@D) NO_TCP_WRAPPER=1
++	CFLAGS="$(TARGET_CFLAGS)" \
++	$(MAKE) CC="$(TARGET_CC)" -C $(@D) $(PORTMAP_FLAGS)
++endef
++
++define PORTMAP_CLEAN_CMDS
++	$(MAKE) -C $(@D) clean
+ endef
+ 
+ define PORTMAP_INSTALL_TARGET_CMDS
+@@ -23,6 +33,8 @@
+ 		$(TARGET_DIR)/usr/share/man/man8/pmap_dump.8
+ 	$(INSTALL) -D $(@D)/pmap_set.8 \
+ 		$(TARGET_DIR)/usr/share/man/man8/pmap_set.8
++	$(INSTALL) -m 0755 package/portmap/S13portmap \
++		$(TARGET_DIR)/etc/init.d
+ endef
+ 
+ define PORTMAP_UNINSTALL_TARGET_CMDS


hooks/post-receive
-- 
armadeus


