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

26 Jul 2011

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  f3ee8a0fa545fbe65c2244821183b7625eaf1fff (commit)
       via  aefc2d04c3ff68cf02ba9471e9c062522bad9091 (commit)
       via  3b0b3ed0b61e73deed4900385a011ba253a9f75a (commit)
       via  5d58c20816104135b77fd4167e69bf446a7ade77 (commit)
       via  8638a3d2d1f6f9f9c6c3630f58e88c59346a0816 (commit)
       via  3adc1c16f60aa4fc3ef74b733d92aa9030d1f930 (commit)
      from  96732a3ccf65072dbfa760f5eee123a718e3d403 (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 f3ee8a0fa545fbe65c2244821183b7625eaf1fff
Merge: aefc2d0 96732a3
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Tue Jul 26 14:48:56 2011 +0200
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x
commit aefc2d04c3ff68cf02ba9471e9c062522bad9091
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Tue Jul 26 14:47:50 2011 +0200
network: Remove dependency to upstart.
This package is pretty much outdated already but I do not
    want to have some upstart dependencies lying around here
    any more.
commit 3b0b3ed0b61e73deed4900385a011ba253a9f75a
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Tue Jul 26 14:45:53 2011 +0200
python-pycurl: Fix build dependency to libcurl-devel.
commit 5d58c20816104135b77fd4167e69bf446a7ade77
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Tue Jul 26 14:42:02 2011 +0200
tcl: Fix build. Patches were not accepted by patch command.
commit 8638a3d2d1f6f9f9c6c3630f58e88c59346a0816
Merge: 3adc1c1 1309829
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Mon Jul 25 22:34:17 2011 +0200
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x
commit 3adc1c16f60aa4fc3ef74b733d92aa9030d1f930
Merge: afc6dda b5fa638
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Fri Jul 22 22:41:18 2011 +0200
Merge remote-tracking branch 'stevee/hostapd'
-----------------------------------------------------------------------
Summary of changes:
 pkgs/network/network.nm                   |    4 ++--
 pkgs/python-pycurl/python-pycurl.nm       |    5 ++---
 pkgs/tcl/patches/tcl-8.5.8-autopath.patch |   22 +++++++++++-----------
 pkgs/tcl/patches/tcl-8.5.8-conf.patch     |    6 +++---
 pkgs/tcl/patches/tcl-8.5.8-pic.patch      |   12 ------------
 pkgs/tcl/tcl.nm                           |   11 +++++++++--
 6 files changed, 27 insertions(+), 33 deletions(-)
 delete mode 100644 pkgs/tcl/patches/tcl-8.5.8-pic.patch
Difference in files:

diff --git a/pkgs/network/network.nm b/pkgs/network/network.nm
index 6ea02f4..149298c 100644
--- a/pkgs/network/network.nm
+++ b/pkgs/network/network.nm
@@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME       = network
 PKG_VER        = 0.99.0
-PKG_REL        = 5
+PKG_REL        = 6
 PKG_ARCH       = noarch
PKG_MAINTAINER = Michael Tremer michael.tremer@ipfire.org
@@ -37,7 +37,7 @@ PKG_SUMMARY    = The IPFire Networking Scripts.
PKG_BUILD_DEPS = # Need no gcc
 PKG_DEPS      += bash bridge-utils dhcp ebtables iproute2 ppp rstp \
-	sqlite upstart vlan
+	sqlite systemd vlan
define PKG_DESCRIPTION
    This script installs the IPFire Networking Scripts.
diff --git a/pkgs/python-pycurl/python-pycurl.nm b/pkgs/python-pycurl/python-pycurl.nm
index 85cbc80..d78f031 100644
--- a/pkgs/python-pycurl/python-pycurl.nm
+++ b/pkgs/python-pycurl/python-pycurl.nm
@@ -26,8 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME       = pycurl
 PKG_VER        = 7.19.0
-PKG_REL        = 1
-PKG_ARCH       = noarch
+PKG_REL        = 2
PKG_MAINTAINER =
 PKG_GROUPS     = Development/Languages
@@ -37,7 +36,7 @@ PKG_SUMMARY    = A Python interface to libcurl.
CFLAGS        += -DHAVE_CURL_OPENSSL
-PKG_BUILD_DEPS+= curl-devel openssl-devel python-devel
+PKG_BUILD_DEPS+= libcurl-devel openssl-devel python-devel
define PKG_DESCRIPTION
    PycURL is a Python interface to libcurl. PycURL can be used to fetch \
diff --git a/pkgs/tcl/patches/tcl-8.5.8-autopath.patch b/pkgs/tcl/patches/tcl-8.5.8-autopath.patch
index 4e5c7fb..87317d3 100644
--- a/pkgs/tcl/patches/tcl-8.5.8-autopath.patch
+++ b/pkgs/tcl/patches/tcl-8.5.8-autopath.patch
@@ -1,6 +1,6 @@
-diff -up tcl8.5.7/../library/auto.tcl.old tcl8.5.7/library/auto.tcl
---- tcl8.5.7/../library/auto.tcl.old	2006-11-03 01:34:52.000000000 +0100
-+++ tcl8.5.7/../library/auto.tcl	2009-05-18 10:28:16.337102378 +0200
+diff -up tcl8.5.7/library/auto.tcl.old tcl8.5.7/library/auto.tcl
+--- tcl8.5.7/library/auto.tcl.old	2006-11-03 01:34:52.000000000 +0100
++++ tcl8.5.7/library/auto.tcl	2009-05-18 10:28:16.337102378 +0200
 @@ -85,6 +85,13 @@ proc tcl_findLibrary {basename version p
        lappend dirs $value
    }
@@ -15,9 +15,9 @@ diff -up tcl8.5.7/../library/auto.tcl.old tcl8.5.7/library/auto.tcl
    # 3. Relative to auto_path directories.  This checks relative to the
    # Tcl library as well as allowing loading of libraries added to the
    # auto_path that is not relative to the core library or binary paths.
-diff -up tcl8.5.7/../library/init.tcl.old tcl8.5.7/library/init.tcl
---- tcl8.5.7/../library/init.tcl.old	2009-04-10 18:54:51.000000000 +0200
-+++ tcl8.5.7/../library/init.tcl	2009-05-18 10:25:25.904853164 +0200
+diff -up tcl8.5.7/library/init.tcl.old tcl8.5.7/library/init.tcl
+--- tcl8.5.7/library/init.tcl.old	2009-04-10 18:54:51.000000000 +0200
++++ tcl8.5.7/library/init.tcl	2009-05-18 10:25:25.904853164 +0200
 @@ -48,16 +48,11 @@ if {![info exists auto_path]} {
  }
  namespace eval tcl {
@@ -36,18 +36,18 @@ diff -up tcl8.5.7/../library/init.tcl.old tcl8.5.7/library/init.tcl
      catch {
    foreach Dir $::tcl_pkgPath {
        if {$Dir ni $::auto_path} {
-diff -up tcl8.5.7/../unix/configure.in.old tcl8.5.7/unix/configure.in
---- tcl8.5.7/../unix/configure.in.old	2009-04-15 21:30:05.000000000 +0200
-+++ tcl8.5.7/../unix/configure.in	2009-05-18 10:21:30.987855050 +0200
+diff -up tcl8.5.7/unix/configure.in.old tcl8.5.7/unix/configure.in
+--- tcl8.5.7/unix/configure.in.old	2009-04-15 21:30:05.000000000 +0200
++++ tcl8.5.7/unix/configure.in	2009-05-18 10:21:30.987855050 +0200
 @@ -833,9 +833,9 @@ if test "$FRAMEWORK_BUILD" = "1" ; then
      test -z "$TCL_MODULE_PATH"  && \
    TCL_MODULE_PATH="~/Library/Tcl /Library/Tcl /System/Library/Tcl"
  elif test "$prefix/lib" != "$libdir"; then
 -    TCL_PACKAGE_PATH="${libdir} ${prefix}/lib ${TCL_PACKAGE_PATH}"
-+    TCL_PACKAGE_PATH="${libdir}/tcl8.5 ${prefix}/share/tcl8.5 ${TCL_PACKAGE_PATH}"
++    TCL_PACKAGE_PATH="${libdir}/tcl8.5 ${prefix}/share/tcl8.5 ${libdir}/tk8.5 ${prefix}/share/tk8.5 ${TCL_PACKAGE_PATH}"
  else
 -    TCL_PACKAGE_PATH="${prefix}/lib ${TCL_PACKAGE_PATH}"
-+    TCL_PACKAGE_PATH="${libdir}/tcl8.5 ${prefix}/share/tcl8.5 ${TCL_PACKAGE_PATH}"
++    TCL_PACKAGE_PATH="${libdir}/tcl8.5 ${prefix}/share/tcl8.5 ${libdir}/tk8.5 ${prefix}/share/tk8.5 ${TCL_PACKAGE_PATH}"
  fi
#--------------------------------------------------------------------
diff --git a/pkgs/tcl/patches/tcl-8.5.8-conf.patch b/pkgs/tcl/patches/tcl-8.5.8-conf.patch
index 5381e70..dd90b06 100644
--- a/pkgs/tcl/patches/tcl-8.5.8-conf.patch
+++ b/pkgs/tcl/patches/tcl-8.5.8-conf.patch
@@ -1,5 +1,5 @@
---- tcl8.5.0/../unix/tcl.m4.conf	2007-12-20 10:48:05.000000000 +0100
-+++ tcl8.5.0/../unix/tcl.m4	2007-12-20 10:48:52.000000000 +0100
+--- tcl8.5.0/unix/tcl.m4.conf	2007-12-20 10:48:05.000000000 +0100
++++ tcl8.5.0/unix/tcl.m4	2007-12-20 10:48:52.000000000 +0100
 @@ -1427,12 +1427,12 @@ dnl AC_CHECK_TOOL(AR, ar)
        # get rid of the warnings.
        #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
@@ -16,7 +16,7 @@
        AS_IF([test "`uname -m`" = "alpha"], [CFLAGS="$CFLAGS -mieee"])
        AS_IF([test $do64bit = yes], [
 @@ -1464,7 +1464,7 @@ dnl AC_CHECK_TOOL(AR, ar)
- 	    SHLIB_LD_LIBS='${LIBS}'
+ 	    SHLIB_CFLAGS="-fPIC"
        SHLIB_SUFFIX=".so"
-	    SHLIB_LD='${CC} -shared'
diff --git a/pkgs/tcl/patches/tcl-8.5.8-pic.patch b/pkgs/tcl/patches/tcl-8.5.8-pic.patch
deleted file mode 100644
index 1d34912..0000000
--- a/pkgs/tcl/patches/tcl-8.5.8-pic.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up tcl8.5.7/../unix/Makefile.in.old tcl8.5.7/unix/Makefile.in
---- tcl8.5.7/../unix//Makefile.in.old	2009-04-15 21:30:05.000000000 +0200
-+++ tcl8.5.7/../unix/Makefile.in	2009-07-16 08:27:32.758444459 +0200
-@@ -569,7 +569,7 @@ objs: ${OBJS}
- 
- 
- tclsh: ${TCLSH_OBJS} ${TCL_LIB_FILE}
--	${CC} ${CFLAGS} ${LDFLAGS} ${TCLSH_OBJS} @TCL_BUILD_LIB_SPEC@ ${LIBS} @EXTRA_TCLSH_LIBS@ \
-+	${CC} ${CFLAGS} ${LDFLAGS} -fPIC ${TCLSH_OBJS} @TCL_BUILD_LIB_SPEC@ ${LIBS} @EXTRA_TCLSH_LIBS@ \
- 		${CC_SEARCH_FLAGS} -o tclsh
- 
- # Resetting the LIB_RUNTIME_DIR below is required so that the generated
diff --git a/pkgs/tcl/tcl.nm b/pkgs/tcl/tcl.nm
index d80f4f3..20deaa0 100644
--- a/pkgs/tcl/tcl.nm
+++ b/pkgs/tcl/tcl.nm
@@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME       = tcl
 PKG_VER        = 8.5.8
-PKG_REL        = 0
+PKG_REL        = 1
PKG_MAINTAINER =
 PKG_GROUPS     = Development/Languages
@@ -47,9 +47,16 @@ PKG_TARBALL    = tcl$(PKG_VER)-src.tar.gz
 CONFIGURE_OPTIONS += \
    --enable-shared
+CFLAGS        += -DTCL_NO_STACK_CHECK=1
+
 DIR_APP = $(DIR_SRC)/tcl$(PKG_VER)/unix
-define STAGE_PREPARE_CMDS
+define STAGE_PREPARE
+	cd $(DIR_SRC) && $(DO_EXTRACT) $(DIR_DL)/$(PKG_TARBALL)
+
+	cd $(DIR_APP) && cd .. && $(BUILD_TOOLS)/patch \
+		$(foreach patch,$(PKG_PATCHES),$(DIR_PATCHES)/$(patch))
+
    cd $(DIR_APP) && autoconf
 endef
hooks/post-receive
--
IPFire 3.x development tree

    