[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 0bbad22ef840764d9cb3fbc453f404e3920e9c89 - IPFire-SCM

19 Mar 2010

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 "IPFire 3.x development tree".
The branch, master has been updated
       via  0bbad22ef840764d9cb3fbc453f404e3920e9c89 (commit)
       via  cee45e8438e3734933abc58d31bb63c5dd0db00f (commit)
       via  cdbc3c2819e140c3c3a141daaa1f32748c980773 (commit)
       via  6b7d4f44d6a4a46f5a41858f02884212a7d31164 (commit)
       via  092e60f5a7b5fc866f74fb51f9e7e221a0c88711 (commit)
       via  51d2e4a977c59d01f62b0415c4ec195dc97aee13 (commit)
       via  3c2c1737645490df48528ba4a663e968c65478ce (commit)
       via  d1ece662305f6e778ce0ba2f0ebc03e058bcca1b (commit)
       via  698742c328b40c9037e85b4a258fd41a51e32108 (commit)
       via  f62fe495e237da299fa3beda87edbe9d196398a9 (commit)
       via  46c7e34e14394dff715c6cc49cecc45a5590a4a5 (commit)
      from  58a60fde7432a8276ec821019d401fa6e0e46dc4 (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 0bbad22ef840764d9cb3fbc453f404e3920e9c89
Merge: cee45e8438e3734933abc58d31bb63c5dd0db00f cdbc3c2819e140c3c3a141daaa1f32748c980773
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Fri Mar 19 15:40:53 2010 +0100
Merge commit 'stevee/toolchain'
commit cee45e8438e3734933abc58d31bb63c5dd0db00f
Merge: 51d2e4a977c59d01f62b0415c4ec195dc97aee13 58a60fde7432a8276ec821019d401fa6e0e46dc4
Author: Schantl Stefan Stevee@ipfire.org
Date:   Fri Mar 19 15:26:42 2010 +0100
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x into glibc-locale-fix
Conflicts:
    	pkgs/core/ccache/ccache.nm
commit cdbc3c2819e140c3c3a141daaa1f32748c980773
Author: Schantl Stefan Stevee@ipfire.org
Date:   Fri Mar 19 15:19:05 2010 +0100
expect: Remove broken patches from toolchain.
commit 6b7d4f44d6a4a46f5a41858f02884212a7d31164
Author: Schantl Stefan Stevee@ipfire.org
Date:   Fri Mar 19 15:15:20 2010 +0100
libpcap: Update to latest git revision.
commit 092e60f5a7b5fc866f74fb51f9e7e221a0c88711
Author: Schantl Stefan Stevee@ipfire.org
Date:   Fri Mar 19 15:14:23 2010 +0100
btrfs-progs: Clean naoki-makefile.
commit 51d2e4a977c59d01f62b0415c4ec195dc97aee13
Author: Schantl Stefan Stevee@ipfire.org
Date:   Fri Mar 19 14:58:02 2010 +0100
glibc: Fix broken locale files.
As a fact that we are only supporting a few languages atm I´ve disabled the other ones.
This fixes issure #589.
commit 3c2c1737645490df48528ba4a663e968c65478ce
Author: Schantl Stefan Stevee@ipfire.org
Date:   Fri Mar 19 14:48:23 2010 +0100
m4: Fix testsuite.
This fixes issure #588.
commit d1ece662305f6e778ce0ba2f0ebc03e058bcca1b
Merge: 698742c328b40c9037e85b4a258fd41a51e32108 865a945a4b5895c08b3a7aba885b7f7462e87c01
Author: Schantl Stefan Stevee@ipfire.org
Date:   Fri Mar 19 14:12:38 2010 +0100
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x into clean
commit 698742c328b40c9037e85b4a258fd41a51e32108
Author: Schantl Stefan Stevee@ipfire.org
Date:   Fri Mar 19 09:59:28 2010 +0100
ccache: Clean up naoki-makefile.
commit f62fe495e237da299fa3beda87edbe9d196398a9
Author: Schantl Stefan Stevee@ipfire.org
Date:   Fri Mar 19 09:55:03 2010 +0100
cairo: Build devel package.
commit 46c7e34e14394dff715c6cc49cecc45a5590a4a5
Author: Schantl Stefan Stevee@ipfire.org
Date:   Fri Mar 19 09:44:31 2010 +0100
bzip2: Clean up naoki-makefile.
-----------------------------------------------------------------------
Summary of changes:
 pkgs/core/btrfs-progs/btrfs-progs.nm               |   14 +-----
 pkgs/core/bzip2/bzip2.nm                           |    5 +--
 pkgs/core/cairo/cairo.nm                           |    2 +
 pkgs/core/ccache/ccache.nm                         |    7 +--
 pkgs/core/glibc/SUPPORTED.locales                  |   21 ++++++++++
 pkgs/core/glibc/glibc.nm                           |    4 ++
 pkgs/core/libpcap/libpcap.nm                       |    2 +-
 pkgs/core/m4/m4.nm                                 |    7 +--
 .../expect/patches/expect-5.43.0-tcl8.5.6.patch    |   42 --------------------
 .../expect/patches/expect-5.43.0-tcl8.5.patch      |   22 ----------
 .../patches/expect-5.43.0-tcl_8.5.8_fix-1.patch    |    0 
 11 files changed, 38 insertions(+), 88 deletions(-)
 create mode 100644 pkgs/core/glibc/SUPPORTED.locales
 delete mode 100644 pkgs/toolchain/expect/patches/expect-5.43.0-tcl8.5.6.patch
 delete mode 100644 pkgs/toolchain/expect/patches/expect-5.43.0-tcl8.5.patch
 copy pkgs/{core => toolchain}/expect/patches/expect-5.43.0-tcl_8.5.8_fix-1.patch (100%)
Difference in files:

diff --git a/pkgs/core/btrfs-progs/btrfs-progs.nm b/pkgs/core/btrfs-progs/btrfs-progs.nm
index cb3812d..0955f8d 100644
--- a/pkgs/core/btrfs-progs/btrfs-progs.nm
+++ b/pkgs/core/btrfs-progs/btrfs-progs.nm
@@ -43,14 +43,6 @@ endef
PKG_TARBALL    = $(THISAPP).tar.bz2
-###############################################################################
-# Installation Details
-###############################################################################
-
-define STAGE_BUILD
-	cd $(DIR_APP) && make CFLAGS="$(CFLAGS)" $(PARALLELISMFLAGS)
-endef
-
-define STAGE_INSTALL
-	cd $(DIR_APP) && make bindir=$(BUILDROOT)/sbin mandir=$(BUILDROOT)/usr/share install
-endef
+STAGE_INSTALL_TARGET += \
+	bindir=$(BUILDROOT)/sbin \
+	mandir=$(BUILDROOT)/usr/share
diff --git a/pkgs/core/bzip2/bzip2.nm b/pkgs/core/bzip2/bzip2.nm
index d206936..14e1f59 100644
--- a/pkgs/core/bzip2/bzip2.nm
+++ b/pkgs/core/bzip2/bzip2.nm
@@ -45,16 +45,13 @@ PKG_TARBALL    = $(THISAPP).tar.gz
CFLAGS        += -fPIC -D_FILE_OFFSET_BITS=64
-###############################################################################
-# Installation Details
-###############################################################################
-
 define STAGE_PREPARE_CMDS
    cd $(DIR_APP) && sed -i 's@(ln -s -f )$$(PREFIX)/bin/@\1@' Makefile
    cd $(DIR_APP) && sed -e "s/$$(CC) -shared/& $(CFLAGS)/" -i Makefile-libbz2_so
 endef
define STAGE_BUILD
+	$(DO_FIX_LIBTOOL)
    cd $(DIR_APP) && make -f Makefile-libbz2_so $(PARALLELISMFLAGS)
cd $(DIR_APP) && make clean
diff --git a/pkgs/core/cairo/cairo.nm b/pkgs/core/cairo/cairo.nm
index 473891e..c19359d 100644
--- a/pkgs/core/cairo/cairo.nm
+++ b/pkgs/core/cairo/cairo.nm
@@ -34,6 +34,8 @@ PKG_URL        = http://cairographics.org
 PKG_LICENSE    = LGPLv2 MPLv1.1
 PKG_SUMMARY    = A 2D graphics library.
+PKG_PACKAGES  += $(PKG_NAME_REAL)-devel
+
 PKG_BUILD_DEPS+= pkg-config
 PKG_DEPS      += fontconfig freetype libpng pixman zlib
diff --git a/pkgs/core/ccache/ccache.nm b/pkgs/core/ccache/ccache.nm
index 63a30b8..3e9c455 100644
--- a/pkgs/core/ccache/ccache.nm
+++ b/pkgs/core/ccache/ccache.nm
@@ -45,15 +45,14 @@ endef
PKG_TARBALL    = $(THISAPP).tar.gz
-CONFIGURE_OPTIONS += --mandir=/usr/share
+CONFIGURE_OPTIONS += \
+	--mandir=/usr/share
define STAGE_PREPARE_CMDS
    cd $(DIR_APP) && sed -e "s/hash_int(&hash, st.st_mtime);//g" -i ccache.c
 endef
-define STAGE_INSTALL
-	cd $(DIR_APP) && make install DESTDIR=$(BUILDROOT)
-
+define STAGE_INSTALL_CMDS
    mkdir -pv $(BUILDROOT)/usr/ccache/bin
    for i in gcc g++ cc c++; do \
    	ln -svf ../../bin/ccache $(BUILDROOT)/usr/ccache/bin/$${i}; \
diff --git a/pkgs/core/glibc/SUPPORTED.locales b/pkgs/core/glibc/SUPPORTED.locales
new file mode 100644
index 0000000..9003873
--- /dev/null
+++ b/pkgs/core/glibc/SUPPORTED.locales
@@ -0,0 +1,21 @@
+# This file names the currently supported and somewhat tested locales.
+# If you have any additions please file a glibc bug report.
+SUPPORTED-LOCALES=\
+da_DK.UTF-8/UTF-8 \
+da_DK/ISO-8859-1 \
+de_DE.UTF-8/UTF-8 \
+de_DE/ISO-8859-1 \
+de_DE@euro/ISO-8859-15 \
+en_GB.UTF-8/UTF-8 \
+en_GB/ISO-8859-1 \
+en_US.UTF-8/UTF-8 \
+en_US/ISO-8859-1 \
+es_ES.UTF-8/UTF-8 \
+es_ES/ISO-8859-1 \
+es_ES@euro/ISO-8859-15 \
+fr_FR.UTF-8/UTF-8 \
+fr_FR/ISO-8859-1 \
+fr_FR@euro/ISO-8859-15 \
+it_IT.UTF-8/UTF-8 \
+it_IT/ISO-8859-1 \
+it_IT@euro/ISO-8859-15 \
diff --git a/pkgs/core/glibc/glibc.nm b/pkgs/core/glibc/glibc.nm
index 9741527..d1a4f54 100644
--- a/pkgs/core/glibc/glibc.nm
+++ b/pkgs/core/glibc/glibc.nm
@@ -163,6 +163,10 @@ define STAGE_PREPARE
    # Fix a very weird issue with rpath
    cd $(DIR_APP) && sed -e "s/LDFLAGS-rpath-ORIGIN/LDFLAGS/g" \
    	-i iconvdata/Makefile
+
+	# Copy our customized SUPPORTED file to build localization files
+	# only for supported languages
+	cp -vf $(DIR_SOURCE)/SUPPORTED.locales $(DIR_APP)/localedata/SUPPORTED
 endef
define STAGE_BUILD
diff --git a/pkgs/core/libpcap/libpcap.nm b/pkgs/core/libpcap/libpcap.nm
index 89549c9..defe9bb 100644
--- a/pkgs/core/libpcap/libpcap.nm
+++ b/pkgs/core/libpcap/libpcap.nm
@@ -25,7 +25,7 @@
 include $(PKGROOT)/Include
PKG_NAME       = libpcap
-PKG_VER        = 1.0.0
+PKG_VER        = 1.0.0-5.20091201git117cb5
 PKG_REL        = 0
PKG_MAINTAINER =
diff --git a/pkgs/core/m4/m4.nm b/pkgs/core/m4/m4.nm
index 26000b5..ee51012 100644
--- a/pkgs/core/m4/m4.nm
+++ b/pkgs/core/m4/m4.nm
@@ -49,7 +49,6 @@ CONFIGURE_ENVIRONMENT += \
    CPPFLAGS="-D_GNU_SOURCE" \
    gl_cv_func_printf_directive_n=no \
-# fails
-#define STAGE_TEST
-#	cd $(DIR_APP) && make check
-#endef
+define STAGE_TEST
+	cd $(DIR_APP) && make check
+endef
diff --git a/pkgs/toolchain/expect/patches/expect-5.43.0-tcl8.5.6.patch b/pkgs/toolchain/expect/patches/expect-5.43.0-tcl8.5.6.patch
deleted file mode 100644
index fd75c0e..0000000
--- a/pkgs/toolchain/expect/patches/expect-5.43.0-tcl8.5.6.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -up expect-5.43/exp_command.c_old expect-5.43/exp_command.c
---- expect-5.43/exp_command.c_old	2009-02-10 16:23:48.000000000 +0100
-+++ expect-5.43/exp_command.c	2009-02-10 16:31:38.000000000 +0100
-@@ -2311,12 +2311,11 @@ Tcl_Obj *CONST objv[];	/* Argument objec
- 	/* Historical note: we used "close"  long before there was a */
- 	/* Tcl builtin by the same name. */
- 
--	Tcl_CmdInfo info;
-+	Tcl_CmdInfo* close_info;
- 	Tcl_ResetResult(interp);
--	if (0 == Tcl_GetCommandInfo(interp,"close",&info)) {
--	    info.clientData = 0;
--	}
--	return(Tcl_CloseObjCmd(info.clientData,interp,objc_orig,objv_orig));
-+
-+	close_info = (Tcl_CmdInfo*) Tcl_GetAssocData (interp, EXP_CMDINFO_CLOSE, NULL);
-+	return(close_info->objProc(close_info->objClientData,interp,objc,objv));
-     }
- 
-     if (chanName) {
-@@ -2961,7 +2960,10 @@ Tcl_Obj *CONST objv[];
-     /* if successful (i.e., TCL_RETURN is returned) */
-     /* modify the result, so that we will handle it specially */
- 
--    int result = Tcl_ReturnObjCmd(clientData,interp,objc,objv);
-+    Tcl_CmdInfo* return_info = (Tcl_CmdInfo*)
-+    Tcl_GetAssocData (interp, EXP_CMDINFO_RETURN, NULL);
-+
-+    int result = return_info->objProc(return_info->objClientData,interp,objc,objv);
-     if (result == TCL_RETURN)
-         result = EXP_TCL_RETURN;
-     return result;
-diff -up expect-5.43/exp_command.h_old expect-5.43/exp_command.h
---- expect-5.43/exp_command.h_old	2009-02-10 17:33:19.000000000 +0100
-+++ expect-5.43/exp_command.h	2009-02-10 17:33:46.000000000 +0100
-@@ -326,3 +326,6 @@ EXTERN ExpState *	expDevttyGet _ANSI_ARG
- /* generic functions that really should be provided by Tcl */
- EXTERN int		expSizeGet _ANSI_ARGS_((ExpState *));
- EXTERN int		expSizeZero _ANSI_ARGS_((ExpState *));
-+
-+#define EXP_CMDINFO_CLOSE  "expect/cmdinfo/close"
-+#define EXP_CMDINFO_RETURN "expect/cmdinfo/return"
diff --git a/pkgs/toolchain/expect/patches/expect-5.43.0-tcl8.5.patch b/pkgs/toolchain/expect/patches/expect-5.43.0-tcl8.5.patch
deleted file mode 100644
index b0c4bcb..0000000
--- a/pkgs/toolchain/expect/patches/expect-5.43.0-tcl8.5.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -up expect-5.43/Dbg.c.tcl8.5 expect-5.43/Dbg.c
---- expect-5.43/Dbg.c.tcl8.5	2002-03-23 05:11:54.000000000 +0100
-+++ expect-5.43/Dbg.c	2008-09-25 12:25:40.000000000 +0200
-@@ -10,6 +10,7 @@ would appreciate credit if this program 
- 
- #include <stdio.h>
- 
-+#include "expect_cf.h"
- #include "tcldbgcf.h"
- #if 0
- /* tclInt.h drags in stdlib.  By claiming no-stdlib, force it to drag in */
-diff -up expect-5.43/exp_inter.c.tcl8.5 expect-5.43/exp_inter.c
---- expect-5.43/exp_inter.c.tcl8.5	2004-08-18 04:03:00.000000000 +0200
-+++ expect-5.43/exp_inter.c	2008-09-25 12:25:40.000000000 +0200
-@@ -36,6 +36,7 @@ would appreciate credit if this program 
- #include <ctype.h>
- 
- #include "tcl.h"
-+#include "tclInt.h"
- #include "string.h"
- 
- #include "exp_tty_in.h"
diff --git a/pkgs/toolchain/expect/patches/expect-5.43.0-tcl_8.5.8_fix-1.patch b/pkgs/toolchain/expect/patches/expect-5.43.0-tcl_8.5.8_fix-1.patch
new file mode 100644
index 0000000..5b9596a
--- /dev/null
+++ b/pkgs/toolchain/expect/patches/expect-5.43.0-tcl_8.5.8_fix-1.patch
@@ -0,0 +1,125 @@
+Submitted By: DJ Lucas <dj_AT_linuxfromscratch_DOT_org>
+Date: 2008-09-28
+Initial Package Version: 5.43
+Upstream status: Not Submitted
+Origin: LFS ticket 2126 (http://wiki.linuxfromscratch.org/lfs/ticket/2126)
+        Bryan Kadzban bryan@kadzban.is-a-geek.net
+Description: Removes references to functions that Tcl 8.5 no longer exposes 
+             and correct other minor build problems WRT TCL-8.5.x.
+
+diff -Naur expect-5.43-orig/Dbg.c expect-5.43/Dbg.c
+--- expect-5.43-orig/Dbg.c	2002-03-22 22:11:54.000000000 -0600
++++ expect-5.43/Dbg.c	2008-08-24 01:30:15.000000000 -0500
+@@ -9,7 +9,7 @@
+ */
+ 
+ #include <stdio.h>
+-
++#include "expect_cf.h"
+ #include "tcldbgcf.h"
+ #if 0
+ /* tclInt.h drags in stdlib.  By claiming no-stdlib, force it to drag in */
+diff -Naur expect-5.43-orig/exp_inter.c expect-5.43/exp_inter.c
+--- expect-5.43-orig/exp_inter.c	2004-08-17 21:03:00.000000000 -0500
++++ expect-5.43/exp_inter.c	2008-08-24 01:28:59.000000000 -0500
+@@ -36,6 +36,7 @@
+ #include <ctype.h>
+ 
+ #include "tcl.h"
++#include "tclInt.h"
+ #include "string.h"
+ 
+ #include "exp_tty_in.h"
+diff -Naur expect-5.43/exp_command.c expect-5.43-patched/exp_command.c
+--- expect-5.43/exp_command.c	2004-08-20 13:18:01.000000000 -0400
++++ expect-5.43-patched/exp_command.c	2008-01-12 11:42:45.000000000 -0500
+@@ -2265,6 +2265,8 @@
+ 	/*NOTREACHED*/
+ }
+ 
++static struct exp_cmd_data cmd_data[];
++
+ /*ARGSUSED*/
+ static int
+ Exp_CloseObjCmd(clientData, interp, objc, objv)
+@@ -2311,12 +2313,23 @@
+ 	/* Historical note: we used "close"  long before there was a */
+ 	/* Tcl builtin by the same name. */
+ 
++	/* The code that registered this function as the handler for */
++	/* the "close" command stored away the old handler in the */
++	/* exp_cmd_data for the "close" command. */
++
++	struct exp_cmd_data *cmd_ptr;
+ 	Tcl_CmdInfo info;
++
++	for(cmd_ptr = &cmd_data[0]; cmd_ptr->name; cmd_ptr++) {
++	    if(strncmp(cmd_ptr->name, "close", 5) == 0)
++		break;
++	}
++
+ 	Tcl_ResetResult(interp);
+ 	if (0 == Tcl_GetCommandInfo(interp,"close",&info)) {
+ 	    info.clientData = 0;
+ 	}
+-	return(Tcl_CloseObjCmd(info.clientData,interp,objc_orig,objv_orig));
++	return(cmd_ptr->old_objProc(info.clientData,interp,objc_orig,objv_orig));
+     }
+ 
+     if (chanName) {
+@@ -2961,7 +2974,10 @@
+     /* if successful (i.e., TCL_RETURN is returned) */
+     /* modify the result, so that we will handle it specially */
+ 
+-    int result = Tcl_ReturnObjCmd(clientData,interp,objc,objv);
++    Tcl_CmdInfo info;
++    Tcl_GetCommandInfo(interp, "return", &info);
++
++    int result = info.objProc(clientData,interp,objc,objv);
+     if (result == TCL_RETURN)
+         result = EXP_TCL_RETURN;
+     return result;
+@@ -3062,8 +3078,7 @@
+ 
+ 	for (;c->name;c++) {
+ 		/* if already defined, don't redefine */
+-		if ((c->flags & EXP_REDEFINE) ||
+-		    !(Tcl_FindHashEntry(&globalNsPtr->cmdTable,c->name) ||
++		if (!(Tcl_FindHashEntry(&globalNsPtr->cmdTable,c->name) ||
+ 		      Tcl_FindHashEntry(&currNsPtr->cmdTable,c->name))) {
+ 			if (c->objproc)
+ 				Tcl_CreateObjCommand(interp,c->name,
+@@ -3072,6 +3087,21 @@
+ 				Tcl_CreateCommand(interp,c->name,c->proc,
+ 						  c->data,exp_deleteProc);
+ 		}
++		else if (c->flags & EXP_REDEFINE) { /* unless the REDEFINE flag is present */
++			Tcl_CmdInfo info;
++
++			if (Tcl_GetCommandInfo(interp, c->name, &info)) {
++				c->old_proc	= info.proc;
++				c->old_objProc	= info.objProc;
++			}
++
++			if (c->objproc)
++				Tcl_CreateObjCommand(interp,c->name,
++						     c->objproc,c->data,exp_deleteObjProc);
++			else
++				Tcl_CreateCommand(interp,c->name,c->proc,
++						  c->data,exp_deleteProc);
++		}
+ 		if (!(c->name[0] == 'e' &&
+ 		      c->name[1] == 'x' &&
+ 		      c->name[2] == 'p')
+diff -Naur expect-5.43/exp_command.h expect-5.43-patched/exp_command.h
+--- expect-5.43/exp_command.h	2008-01-12 11:44:11.000000000 -0500
++++ expect-5.43-patched/exp_command.h	2008-01-12 11:26:05.000000000 -0500
+@@ -297,6 +297,8 @@
+ 	Tcl_CmdProc	*proc;
+ 	ClientData	data;
+ 	int 		flags;
++	Tcl_CmdProc	*old_proc;     /* these store the procedure for the old command, */
++	Tcl_ObjCmdProc	*old_objProc;  /* if any */
+ };
+ 
+ EXTERN void		exp_create_commands _ANSI_ARGS_((Tcl_Interp *,
hooks/post-receive
--
IPFire 3.x development tree

    