[netfilter-cvslog] [iptables] Merge branch 'master' of vishnu.netfilter.org:/data/git/iptables

[Patrick McHardy]

Gitweb:		http://git.netfilter.org/cgi-bin/gitweb.cgi?p=iptables.git;a=commit;h=c41860c4dda30c5cb067510e20618906ba840960
commit c41860c4dda30c5cb067510e20618906ba840960
Merge: 1ffad1b... 1d52dd5...
Author:     Patrick McHardy <kaber at trash.net>
AuthorDate: Tue May 20 17:18:38 2008 +0200
Commit:     Patrick McHardy <kaber at trash.net>
CommitDate: Tue May 20 17:18:38 2008 +0200

    Merge branch 'master' of vishnu.netfilter.org:/data/git/iptables

commit 1ffad1bf3f02d8797e3af05711d2c8c67b86cf16
Author:     Thomas Jacob <jacob at internet24.de>
AuthorDate: Tue May 20 17:17:02 2008 +0200
Commit:     Patrick McHardy <kaber at trash.net>
CommitDate: Tue May 20 17:17:02 2008 +0200

    Don't assume /bin/sh is bash
    
    The new iptables git version assumes /bin/sh is always GNU bash,
    that's not the case (Ubuntu 8.04 uses dash), see attachment
    for a fix.
    
    Signed-off-by: Patrick McHardy <kaber at trash.net>
       via  c41860c4dda30c5cb067510e20618906ba840960 (commit)
       via  1ffad1bf3f02d8797e3af05711d2c8c67b86cf16 (commit)
      from  1d52dd57e36ec7e95309c2b3cc5a6f84c31425e6 (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 c41860c4dda30c5cb067510e20618906ba840960
Merge: 1ffad1bf3f02d8797e3af05711d2c8c67b86cf16 1d52dd57e36ec7e95309c2b3cc5a6f84c31425e6
Author: Patrick McHardy <kaber at trash.net>
Date:   Tue May 20 17:18:38 2008 +0200

    Merge branch 'master' of vishnu.netfilter.org:/data/git/iptables

commit 1ffad1bf3f02d8797e3af05711d2c8c67b86cf16
Author: Thomas Jacob <jacob at internet24.de>
Date:   Tue May 20 17:17:02 2008 +0200

    Don't assume /bin/sh is bash
    
    The new iptables git version assumes /bin/sh is always GNU bash,
    that's not the case (Ubuntu 8.04 uses dash), see attachment
    for a fix.
    
    Signed-off-by: Patrick McHardy <kaber at trash.net>

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

 extensions/GNUmakefile.in |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)
The new iptables git version assumes /bin/sh is always GNU bash,
that's not the case (Ubuntu 8.04 uses dash), see attachment
for a fix.

Signed-off-by: Patrick McHardy <kaber at trash.net>

diff --git a/extensions/GNUmakefile.in b/extensions/GNUmakefile.in
index 9c46ab1..9419574 100644
--- a/extensions/GNUmakefile.in
+++ b/extensions/GNUmakefile.in
@@ -124,10 +124,11 @@ initext4.c: .initext4.dd
 	for i in ${initext_func}; do \
 		echo "extern void lib$${i}_init(void);" >>$@; \
 	done; \
-	echo -en "void init_extensions(void);\n" >>$@; \
-	echo -en "void init_extensions(void)\n""{\n" >>$@; \
+	echo "void init_extensions(void);" >>$@; \
+	echo "void init_extensions(void)" >>$@; \
+	echo "{" >>$@; \
 	for i in ${initext_func}; do \
-		echo -e "\t""lib$${i}_init();" >>$@; \
+		echo  " ""lib$${i}_init();" >>$@; \
 	done; \
 	echo "}" >>$@; \
 	);
@@ -139,10 +140,11 @@ initext6.c: .initext6.dd
 	for i in ${initext6_func}; do \
 		echo "extern void lib$${i}_init(void);" >>$@; \
 	done; \
-	echo -en "void init_extensions(void);\n" >>$@; \
-	echo -en "void init_extensions(void)\n""{\n" >>$@; \
+	echo "void init_extensions(void);" >>$@; \
+	echo "void init_extensions(void)" >>$@; \
+	echo "{" >>$@; \
 	for i in ${initext6_func}; do \
-		echo -e "\t""lib$${i}_init();" >>$@; \
+		echo " ""lib$${i}_init();" >>$@; \
 	done; \
 	echo "}" >>$@; \
 	);