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 42df4334881e7e78db24973bf3e312f2e7d28003 (commit) via 047244874620d4abf1c6b3a25da94cccf8928aad (commit) via fa9814a28eadb39fa5bb67b7a2913785af6010a1 (commit) via 8a072ca95ab0fb833222b848657d2fa1e78d44bb (commit) via 84fab2f675fc677549fe164bdcfe86b04b672523 (commit) via 004d2e14c168282514142d0fcb4da69229072399 (commit) via ea015c36c0f060c5188084f7833f9fc59610e336 (commit) via 98d0d55975f4ff36d7a4b0194ebb414dca0d8f68 (commit) via 6bc8f2b5e53f8f64cffda5e0d8261bce8f758cf6 (commit) from 24d6e24365a4a2ed63adb5fbd5515e02d26a9cc6 (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 42df4334881e7e78db24973bf3e312f2e7d28003 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Feb 16 20:52:03 2012 +0100

module-init-tools: Remove package in favor of kmod.

commit 047244874620d4abf1c6b3a25da94cccf8928aad Merge: fa9814a 24d6e24 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Feb 16 00:14:01 2012 +0100

Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x

commit fa9814a28eadb39fa5bb67b7a2913785af6010a1 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Feb 16 00:11:17 2012 +0100

linux-firmware: This package is noarch.

Actually it contains binary data, but it is all the same for every architecture.

commit 8a072ca95ab0fb833222b848657d2fa1e78d44bb Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Feb 15 00:30:34 2012 +0100

kmod: Ship tools like lsmod, modprobe, etc.

The kmod package does now ship all tools that were usually provided by module-init-tools. So kmod replaces the module-init-tools package.

commit 84fab2f675fc677549fe164bdcfe86b04b672523 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Feb 12 17:55:39 2012 +0100

dracut: Update to 015.

commit 004d2e14c168282514142d0fcb4da69229072399 Merge: ea015c3 6bc8f2b Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Feb 12 17:27:06 2012 +0100

Merge remote-tracking branch 'trikolon/libvirt-0.9.9'

commit ea015c36c0f060c5188084f7833f9fc59610e336 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Feb 12 17:18:06 2012 +0100

expect: Update to 5.45.

Multiple improvements, because this package is mess.

commit 98d0d55975f4ff36d7a4b0194ebb414dca0d8f68 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Feb 12 17:16:56 2012 +0100

tcl: Update to 5.8.11.

Adds the tclstub library and a development package with all the header files that are needed to use tcl.

commit 6bc8f2b5e53f8f64cffda5e0d8261bce8f758cf6 Author: Ben Schweikert trikolon@ipfire.org Date: Sun Feb 12 16:40:53 2012 +0100

libvirt: New Version 0.9.9.

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

Summary of changes: dracut/dracut.nm | 8 +- expect/expect.nm | 38 ++-- expect/patches/expect-5.32.2-random.patch | 8 +- expect/patches/expect-5.38.0-lib-spec.patch | 12 - expect/patches/expect-5.39.0-libdir.patch | 12 - expect/patches/expect-5.43.0-log_file.patch | 12 + .../expect-5.43.0-override_default_prefix.patch | 12 - expect/patches/expect-5.43.0-pkgpath.patch | 46 ++++ expect/patches/expect-5.43.0-spawn-1.patch | 217 -------------------- expect/patches/expect-5.43.0-tcl_8.5.8_fix-1.patch | 125 ----------- expect/patches/expect-5.45-check-telnet.patch | 29 +++ expect/patches/expect-5.45-man-page.patch | 13 ++ .../expect-5.45-match-gt-numchars-segfault.patch | 17 ++ expect/patches/expect-5.45-mkpasswd-dash.patch | 13 ++ .../expect-5.45-passmass-su-full-path.patch | 12 + kmod/kmod.nm | 19 ++- libvirt/libvirt.nm | 4 +- linux-firmware/linux-firmware.nm | 8 +- module-init-tools/modprobe.d/modprobe.conf | 167 --------------- module-init-tools/module-init-tools.nm | 52 ----- ...5.8-autopath.patch => tcl-8.5.1-autopath.patch} | 0 ...{tcl-8.5.8-conf.patch => tcl-8.5.10-conf.patch} | 0 tcl/patches/tcl-8.5.9-hidden.patch | 33 +++ tcl/tcl.nm | 71 +++++-- 24 files changed, 276 insertions(+), 652 deletions(-) delete mode 100644 expect/patches/expect-5.38.0-lib-spec.patch delete mode 100644 expect/patches/expect-5.39.0-libdir.patch create mode 100644 expect/patches/expect-5.43.0-log_file.patch delete mode 100644 expect/patches/expect-5.43.0-override_default_prefix.patch create mode 100644 expect/patches/expect-5.43.0-pkgpath.patch delete mode 100644 expect/patches/expect-5.43.0-spawn-1.patch delete mode 100644 expect/patches/expect-5.43.0-tcl_8.5.8_fix-1.patch create mode 100644 expect/patches/expect-5.45-check-telnet.patch create mode 100644 expect/patches/expect-5.45-man-page.patch create mode 100644 expect/patches/expect-5.45-match-gt-numchars-segfault.patch create mode 100644 expect/patches/expect-5.45-mkpasswd-dash.patch create mode 100644 expect/patches/expect-5.45-passmass-su-full-path.patch delete mode 100644 module-init-tools/modprobe.d/modprobe.conf delete mode 100644 module-init-tools/module-init-tools.nm rename tcl/patches/{tcl-8.5.8-autopath.patch => tcl-8.5.1-autopath.patch} (100%) rename tcl/patches/{tcl-8.5.8-conf.patch => tcl-8.5.10-conf.patch} (100%) create mode 100644 tcl/patches/tcl-8.5.9-hidden.patch

Difference in files: diff --git a/dracut/dracut.nm b/dracut/dracut.nm index 8b49f4d..d24abd6 100644 --- a/dracut/dracut.nm +++ b/dracut/dracut.nm @@ -4,8 +4,8 @@ ###############################################################################

name = dracut -version = 010 -release = 5 +version = 015 +release = 1 arch = noarch

groups = System/Boot @@ -17,8 +17,8 @@ description dracut is a new, event-driven initramfs infrastructure based around udev. end

-source_dl = -sources = %{thisapp}.tar.bz2 +source_dl = http://www.kernel.org/pub/linux/utils/boot/dracut/ +sources = %{thisapp}.tar.xz

build requires diff --git a/expect/expect.nm b/expect/expect.nm index 0648f33..59b4871 100644 --- a/expect/expect.nm +++ b/expect/expect.nm @@ -4,8 +4,9 @@ ###############################################################################

name = expect -version = 5.43 +version = 5.45 release = 1 +thisapp = %{name}%{version}

groups = Development/Languages url = http://expect.nist.gov/ @@ -13,36 +14,40 @@ license = Public Domain summary = A program-script interaction and testing utility.

description - xpect is a tcl application for automating and testing \ - interactive applications such as telnet, ftp, passwd, fsck, \ - rlogin, tip, etc. Expect makes it easy for a script to \ + expect is a tcl application for automating and testing + interactive applications such as telnet, ftp, passwd, fsck, + rlogin, tip, etc. Expect makes it easy for a script to control another program and interact with it. end

-source_dl = -sources = %{thisapp}.0.tar.gz +source_dl = http://downloads.sourceforge.net/project/expect/Expect/%%7Bversion%7D/

build requires autoconf automake - tcl + tcl-devel end

- configure_options = \ - --mandir=/usr/share/man \ - --with-tcl=/usr/lib \ - --with-tclinclude=/usr/include/ \ - --with-x=no \ + prepare_cmds + aclocal + autoconf + + cd testsuite + autoconf -I.. + end + + configure_options += \ + --mandir=%{mandir} \ + --with-tcl=%{libdir} \ + --with-tclinclude=%{includedir} \ --enable-shared

test make test end

- install - make install INSTALL_ROOT=%{BUILDROOT} - + install_cmds # remove cryptdir/decryptdir, as Linux has no crypt command rm -f %{BUILDROOT}/usr/bin/{cryptdir,decryptdir} rm -f %{BUILDROOT}/usr/share/man1/{cryptdir,decryptdir}.1* @@ -52,6 +57,9 @@ end

packages package %{name} + + package %{name}-devel + template DEVEL end

package %{name}-debuginfo diff --git a/expect/patches/expect-5.32.2-random.patch b/expect/patches/expect-5.32.2-random.patch index 94afc42..0cac294 100644 --- a/expect/patches/expect-5.32.2-random.patch +++ b/expect/patches/expect-5.32.2-random.patch @@ -1,12 +1,12 @@ -diff -up expect-5.43/example/mkpasswd.random expect-5.43/example/mkpasswd ---- expect-5.43/example/mkpasswd.random 2004-12-07 00:38:21.000000000 +0100 -+++ expect-5.43/example/mkpasswd 2008-09-25 12:27:19.000000000 +0200 +diff -up expect-5.44.1.15/example/mkpasswd.orig expect-5.44.1.15/example/mkpasswd +--- expect-5.44.1.15/example/mkpasswd.orig 2010-03-08 16:01:05.518378075 +0100 ++++ expect-5.44.1.15/example/mkpasswd 2010-03-08 16:01:27.408388162 +0100 @@ -92,7 +92,14 @@ proc insert {pvar char} { }

proc rand {m} { - expr {int($m*rand())} -+ set device /dev/urandom ;# /dev/random can block ++ set device /dev/urandom ;# /dev/random can block + set fileId [open $device r] + binary scan [read $fileId 4] i1 number + set clipped [expr $number % $m] diff --git a/expect/patches/expect-5.38.0-lib-spec.patch b/expect/patches/expect-5.38.0-lib-spec.patch deleted file mode 100644 index 803f858..0000000 --- a/expect/patches/expect-5.38.0-lib-spec.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up expect-5.43/configure.in.lib-spec expect-5.43/configure.in ---- expect-5.43/configure.in.lib-spec 2005-02-08 02:45:06.000000000 +0100 -+++ expect-5.43/configure.in 2008-09-25 12:23:26.000000000 +0200 -@@ -1141,7 +1141,7 @@ if test $ac_cv_sys_long_file_names = no; - fi - - EXP_BUILD_LIB_SPEC="-L`pwd` -lexpect${EXP_LIB_VERSION}${DBGX}" --EXP_LIB_SPEC="-L${INSTALL_ROOT}${exec_prefix}/lib -lexpect${EXP_LIB_VERSION}${DBGX}" -+EXP_LIB_SPEC="-L${libdir}/../.. -lexpect${EXP_LIB_VERSION}${DBGX}" - EXP_UNSHARED_LIB_FILE=libexpect${EXP_LIB_VERSION}${DBGX}.a - - # The TCL_SHARED_LIB_SUFFIX macro below relies on the DBGX macro, diff --git a/expect/patches/expect-5.39.0-libdir.patch b/expect/patches/expect-5.39.0-libdir.patch deleted file mode 100644 index 8546c90..0000000 --- a/expect/patches/expect-5.39.0-libdir.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up expect-5.43/Makefile.in.libdir expect-5.43/Makefile.in ---- expect-5.43/Makefile.in.libdir 2004-05-07 20:10:30.000000000 +0200 -+++ expect-5.43/Makefile.in 2008-09-25 12:24:08.000000000 +0200 -@@ -317,7 +317,7 @@ EXP_AND_TK_LIBS = $(LDFLAGS) @EXP_AND_TK - CFLAGS_INT = $(MH_CFLAGS) $(CPPFLAGS) $(XCFLAGS) - - LIB_INSTALL_DIR = $(tcl_libdir) --LIB_RUNTIME_DIR = $(tcl_libdir) -+LIB_RUNTIME_DIR = $(subst $(INSTALL_ROOT),,$(tcl_libdir)) - # I don't understand why Tcl splits these up, but it does. LIB_RUNTIME_DIR - # can appear as part of the LD_SEARCH_FLAGS inherited by configure. - diff --git a/expect/patches/expect-5.43.0-log_file.patch b/expect/patches/expect-5.43.0-log_file.patch new file mode 100644 index 0000000..8a2c93d --- /dev/null +++ b/expect/patches/expect-5.43.0-log_file.patch @@ -0,0 +1,12 @@ +diff -up expect-5.44.1.15/exp_log.c.orig expect-5.44.1.15/exp_log.c +--- expect-5.44.1.15/exp_log.c.orig 2010-03-08 15:45:20.581378309 +0100 ++++ expect-5.44.1.15/exp_log.c 2010-03-08 15:45:38.838398279 +0100 +@@ -374,7 +374,7 @@ expDiagChannelOpen(interp,filename) + Tcl_DStringAppend(&tsdPtr->diagFilename,filename,-1); + } + +- tsdPtr->diagChannel = Tcl_OpenFileChannel(interp,newfilename,"a",0777); ++ tsdPtr->diagChannel = Tcl_OpenFileChannel(interp,newfilename,"a",0666); + if (!tsdPtr->diagChannel) { + Tcl_DStringFree(&tsdPtr->diagFilename); + return TCL_ERROR; diff --git a/expect/patches/expect-5.43.0-override_default_prefix.patch b/expect/patches/expect-5.43.0-override_default_prefix.patch deleted file mode 100644 index 54fe1e8..0000000 --- a/expect/patches/expect-5.43.0-override_default_prefix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur expect-5.43_old/configure expect-5.43_new/configure ---- expect-5.43_old/configure 2010-03-10 10:11:41.000000000 +0100 -+++ expect-5.43_new/configure 2010-03-10 10:12:01.000000000 +0100 -@@ -9,7 +9,7 @@ - - # Defaults: - ac_help= --ac_default_prefix=/usr/local -+ac_default_prefix=/usr - # Any additions from configure.in: - ac_help="$ac_help - --enable-threads build with threads (not supported)" diff --git a/expect/patches/expect-5.43.0-pkgpath.patch b/expect/patches/expect-5.43.0-pkgpath.patch new file mode 100644 index 0000000..0c32a1f --- /dev/null +++ b/expect/patches/expect-5.43.0-pkgpath.patch @@ -0,0 +1,46 @@ +diff -up expect5.45/configure.in.orig expect5.45/configure.in +--- expect5.45/configure.in.orig 2011-01-18 16:58:14.860806442 +0100 ++++ expect5.45/configure.in 2011-01-18 16:58:30.378753210 +0100 +@@ -977,6 +977,7 @@ AC_SUBST(EXP_CC_SEARCH_FLAGS) + AC_SUBST(SETUID) + AC_SUBST(SETPGRP_VOID) + AC_SUBST(DEFAULT_STTY_ARGS) ++AC_SUBST(TCL_VERSION) + # Expect uses these from tclConfig.sh to make the main executable + AC_SUBST(TCL_DL_LIBS) + AC_SUBST(TCL_CC_SEARCH_FLAGS) +diff -up expect5.45/Makefile.in.orig expect5.45/Makefile.in +--- expect5.45/Makefile.in.orig 2011-01-18 16:58:37.787723824 +0100 ++++ expect5.45/Makefile.in 2011-01-18 17:05:10.697636907 +0100 +@@ -121,8 +121,8 @@ includedir = @includedir@ + DESTDIR = + + PKG_DIR = $(PACKAGE_NAME)$(PACKAGE_VERSION) +-pkgdatadir = $(datadir)/$(PKG_DIR) +-pkglibdir = $(libdir)/$(PKG_DIR) ++pkgdatadir = $(datadir)/tcl@TCL_VERSION@/$(PKG_DIR) ++pkglibdir = $(libdir)/tcl@TCL_VERSION@/$(PKG_DIR) + pkgincludedir = $(includedir)/$(PKG_DIR) + + top_builddir = . +@@ -263,7 +263,7 @@ install-doc: doc + else true; fi ; \ + done + +-test: binaries libraries ++test: binaries libraries pkgIndex.tcl-test + $(TCLSH) `@CYGPATH@ $(srcdir)/tests/all.tcl` $(TESTFLAGS) + + shell: binaries libraries +@@ -331,6 +331,11 @@ pkgIndex.tcl: + pkgIndex.tcl-hand: + (echo 'if {![package vsatisfies [package provide Tcl] @TCL_VERSION@]} {return}' ; \ + echo 'package ifneeded Expect $(PACKAGE_VERSION) \ ++ [list load [file join $$dir .. .. $(PKG_LIB_FILE)]]'\ ++ ) > pkgIndex.tcl ++ ++pkgIndex.tcl-test: ++ (echo 'package ifneeded Expect $(PACKAGE_VERSION) \ + [list load [file join $$dir $(PKG_LIB_FILE)]]'\ + ) > pkgIndex.tcl + diff --git a/expect/patches/expect-5.43.0-spawn-1.patch b/expect/patches/expect-5.43.0-spawn-1.patch deleted file mode 100644 index c2033c0..0000000 --- a/expect/patches/expect-5.43.0-spawn-1.patch +++ /dev/null @@ -1,217 +0,0 @@ -Submitted By: LFS Book lfs-book@linuxfromscratch.org -Date: 2003-10-05 -Initial Package Version: 5.38 -Origin: Redhat RPM (Patch by HJ Lu) -Description: NA -diff -uNr expect-5.38.orig/exp_chan.c expect-5.38/exp_chan.c ---- expect-5.38.orig/exp_chan.c 2002-02-12 13:00:55.000000000 +1100 -+++ expect-5.38/exp_chan.c 2003-03-01 10:36:18.000000000 +1100 -@@ -519,6 +519,7 @@ - esPtr->buffer = Tcl_NewStringObj("",0); - Tcl_IncrRefCount(esPtr->buffer); - esPtr->umsize = exp_default_match_max; -+ esPtr->umsize_changed = exp_default_match_max_changed; - /* this will reallocate object with an appropriate sized buffer */ - expAdjust(esPtr); - -diff -uNr expect-5.38.orig/exp_command.h expect-5.38/exp_command.h ---- expect-5.38.orig/exp_command.h 2002-04-08 08:57:20.000000000 +1000 -+++ expect-5.38/exp_command.h 2003-03-01 10:36:18.000000000 +1100 -@@ -25,6 +25,7 @@ - EXTERN char * exp_get_var _ANSI_ARGS_((Tcl_Interp *,char *)); - - EXTERN int exp_default_match_max; -+EXTERN int exp_default_match_max_changed; - EXTERN int exp_default_parity; - EXTERN int exp_default_rm_nulls; - -@@ -97,6 +98,7 @@ - int msize; /* # of bytes that buffer can hold (max) */ - int umsize; /* # of bytes (min) that is guaranteed to match */ - /* this comes from match_max command */ -+ int umsize_changed; /* is umsize changed by user? */ - int printed; /* # of bytes written to stdout (if logging on) */ - /* but not actually returned via a match yet */ - int echoed; /* additional # of bytes (beyond "printed" above) */ -diff -uNr expect-5.38.orig/expect.c expect-5.38/expect.c ---- expect-5.38.orig/expect.c 2002-04-08 09:00:33.000000000 +1000 -+++ expect-5.38/expect.c 2003-03-01 10:36:18.000000000 +1100 -@@ -41,8 +41,17 @@ - #include "tcldbg.h" - #endif - -+/* The initial length is 2000. We increment it by 2000. The maximum -+ is 8MB (0x800000). */ -+#define EXP_MATCH_MAX 2000 -+#define EXP_MATCH_INC 2000 -+#define EXP_MATCH_STEP_LIMIT 0x700000 -+#define EXP_MATCH_LIMIT 0x800000 -+#define EXP_MATCH_LIMIT_QUOTE "0x800000" -+ - /* initial length of strings that we can guarantee patterns can match */ --int exp_default_match_max = 2000; -+int exp_default_match_max = EXP_MATCH_MAX; -+int exp_default_match_max_changed = 0; - #define INIT_EXPECT_TIMEOUT_LIT "10" /* seconds */ - #define INIT_EXPECT_TIMEOUT 10 /* seconds */ - int exp_default_parity = TRUE; -@@ -1618,6 +1627,76 @@ - return newsize; - } - -+/* returns # of bytes until we see a newline at the end or EOF. */ -+/*ARGSUSED*/ -+static int -+expReadNewLine(interp,esPtr,save_flags) /* INTL */ -+Tcl_Interp *interp; -+ExpState *esPtr; -+int save_flags; -+{ -+ int size; -+ int exp_size; -+ int full_size; -+ int count; -+ char *str; -+ -+ count = 0; -+ for (;;) { -+ exp_size = expSizeGet(esPtr); -+ -+ /* When we reach the limit, we will only read one char at a -+ time. */ -+ if (esPtr->umsize >= EXP_MATCH_STEP_LIMIT) -+ size = TCL_UTF_MAX; -+ else -+ size = exp_size; -+ -+ if (exp_size + TCL_UTF_MAX >= esPtr->msize) { -+ if (esPtr->umsize >= EXP_MATCH_LIMIT) { -+ expDiagLogU("WARNING: interact buffer is full. probably your program\r\n"); -+ expDiagLogU("is not interactive or has a very long output line. The\r\n"); -+ expDiagLogU("current limit is " EXP_MATCH_LIMIT_QUOTE ".\r\n"); -+ expDiagLogU("Dumping first half of buffer in order to continue\r\n"); -+ expDiagLogU("Recommend you enlarge the buffer.\r\n"); -+ exp_buffer_shuffle(interp,esPtr,save_flags,EXPECT_OUT,"expect"); -+ return count; -+ } -+ else { -+ esPtr->umsize += EXP_MATCH_INC; -+ expAdjust(esPtr); -+ } -+ } -+ -+ full_size = esPtr->msize - (size / TCL_UTF_MAX); -+ size = Tcl_ReadChars(esPtr->channel, -+ esPtr->buffer, -+ full_size, -+ 1 /* append */); -+ if (size > 0) { -+ count += size; -+ /* We try again if there are more to read and we haven't -+ seen a newline at the end. */ -+ if (size == full_size) { -+ str = Tcl_GetStringFromObj(esPtr->buffer, &size); -+ if (str[size - 1] != '\n') -+ continue; -+ } -+ } -+ else { -+ /* It is even trickier. We got an error from read. We have -+ to recover from it. Let's make sure the size of -+ buffer is correct. It can be corrupted. */ -+ str = Tcl_GetString(esPtr->buffer); -+ Tcl_SetObjLength(esPtr->buffer, strlen(str)); -+ } -+ -+ break; -+ } -+ -+ return count; -+} -+ - /* returns # of bytes read or (non-positive) error of form EXP_XXX */ - /* returns 0 for end of file */ - /* If timeout is non-zero, set an alarm before doing the read, else assume */ -@@ -1632,6 +1711,8 @@ - { - int cc = EXP_TIMEOUT; - int size = expSizeGet(esPtr); -+ int full_size; -+ int count; - - if (size + TCL_UTF_MAX >= esPtr->msize) - exp_buffer_shuffle(interp,esPtr,save_flags,EXPECT_OUT,"expect"); -@@ -1648,11 +1729,43 @@ - } - #endif - -- -+ /* FIXME: If we ask less than what is available in the tcl buffer -+ when tcl has seen EOF, we will throw away the remaining data -+ since the next read will get EOF. Since expect is line-oriented, -+ we exand our buffer to get EOF or the next newline at the end of -+ the input buffer. I don't know if it is the right fix. H.J. */ -+ count = 0; -+ full_size = esPtr->msize - (size / TCL_UTF_MAX); - cc = Tcl_ReadChars(esPtr->channel, -- esPtr->buffer, -- esPtr->msize - (size / TCL_UTF_MAX), -- 1 /* append */); -+ esPtr->buffer, -+ full_size, -+ 1 /* append */); -+ if (cc > 0) { -+ count += cc; -+ /* It gets very tricky. There are more to read. We will expand -+ our buffer and get EOF or a newline at the end unless the -+ buffer length has been changed. */ -+ if (cc == full_size) { -+ char *str; -+ str = Tcl_GetStringFromObj(esPtr->buffer, &size); -+ if (str[size - 1] != '\n') { -+ if (esPtr->umsize_changed) { -+ char buf[20]; /* big enough for 64bit int in hex. */ -+ snprintf(buf,sizeof(buf),"0x%x", esPtr->umsize); -+ expDiagLogU("WARNING: interact buffer is not large enough to hold\r\n"); -+ expDiagLogU("all output. probably your program is not interactive or\r\n"); -+ expDiagLogU("has a very long output line. The current limit is "); -+ expDiagLogU(buf); -+ expDiagLogU(".\r\n"); -+ } -+ else { -+ cc = expReadNewLine(interp,esPtr,save_flags); -+ if (cc > 0) -+ count += cc; -+ } -+ } -+ } -+ } - i_read_errno = errno; - - #ifdef SIMPLE_EVENT -@@ -1673,7 +1786,7 @@ - } - } - #endif -- return cc; -+ return count > 0 ? count : cc; - } - - /* -@@ -2746,8 +2859,14 @@ - return(TCL_ERROR); - } - -- if (Default) exp_default_match_max = size; -- else esPtr->umsize = size; -+ if (Default) { -+ exp_default_match_max = size; -+ exp_default_match_max_changed = 1; -+ } -+ else { -+ esPtr->umsize = size; -+ esPtr->umsize_changed = 1; -+ } - - return(TCL_OK); - } diff --git a/expect/patches/expect-5.43.0-tcl_8.5.8_fix-1.patch b/expect/patches/expect-5.43.0-tcl_8.5.8_fix-1.patch deleted file mode 100644 index 5b9596a..0000000 --- a/expect/patches/expect-5.43.0-tcl_8.5.8_fix-1.patch +++ /dev/null @@ -1,125 +0,0 @@ -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 *, diff --git a/expect/patches/expect-5.45-check-telnet.patch b/expect/patches/expect-5.45-check-telnet.patch new file mode 100644 index 0000000..0b67dc6 --- /dev/null +++ b/expect/patches/expect-5.45-check-telnet.patch @@ -0,0 +1,29 @@ +diff -up expect5.45/example/passmass.orig expect5.45/example/passmass +--- expect5.45/example/passmass.orig 2011-07-27 16:09:31.013843393 +0200 ++++ expect5.45/example/passmass 2011-07-27 16:10:55.667843578 +0200 +@@ -107,6 +107,10 @@ for {set i 0} {$i<$argc} {incr i} { + set login "ssh" + continue + } "-telnet" { ++ if {[file executable /usr/bin/telnet] == 0} { ++ send_user "It seems that telnet is not installed. Please install telnet in order to use the script with this option.\n" ++ exit 1 ++ } + set login "telnet" + continue + } "-program" { +diff -up expect5.45/example/weather.orig expect5.45/example/weather +--- expect5.45/example/weather.orig 2011-07-27 15:49:57.878843862 +0200 ++++ expect5.45/example/weather 2011-07-27 16:08:48.067843491 +0200 +@@ -33,6 +33,11 @@ set timeout 60 + + set env(TERM) vt100 ;# actual value doesn't matter, just has to be set + ++if {[file executable /usr/bin/telnet] == 0} { ++ send_user "It seems that telnet is not installed. Please install telnet in order to use this script.\n" ++ exit 1 ++} ++ + spawn telnet rainmaker.wunderground.com 3000 + while {1} { + expect timeout { diff --git a/expect/patches/expect-5.45-man-page.patch b/expect/patches/expect-5.45-man-page.patch new file mode 100644 index 0000000..1a55251 --- /dev/null +++ b/expect/patches/expect-5.45-man-page.patch @@ -0,0 +1,13 @@ +diff -up expect5.45/expect.man.orig expect5.45/expect.man +--- expect5.45/expect.man.orig 2011-09-06 13:15:57.081827720 +0200 ++++ expect5.45/expect.man 2011-09-06 13:16:19.463826364 +0200 +@@ -173,7 +173,8 @@ way, use the + .B -b + flag. + (When using Expectk, this option is specified as +-.BR -buffer .) Note that stdio-buffering may still take place however this shouldn't cause problems when reading from a fifo or stdin. ++.BR -buffer .) ++Note that stdio-buffering may still take place however this shouldn't cause problems when reading from a fifo or stdin. + .PP + If the string "-" is supplied as a filename, standard input is read instead. + (Use "./-" to read from a file actually named "-".) diff --git a/expect/patches/expect-5.45-match-gt-numchars-segfault.patch b/expect/patches/expect-5.45-match-gt-numchars-segfault.patch new file mode 100644 index 0000000..1abd424 --- /dev/null +++ b/expect/patches/expect-5.45-match-gt-numchars-segfault.patch @@ -0,0 +1,17 @@ +diff -up expect5.45/expect.c.orig expect5.45/expect.c +--- expect5.45/expect.c.orig 2012-02-06 14:15:13.469490744 +0100 ++++ expect5.45/expect.c 2012-02-06 14:16:23.596837896 +0100 +@@ -2363,7 +2363,12 @@ expMatchProcess( + + /* "!e" means no case matched - transfer by default */ + if (!e || e->transfer) { +- int remainder = numchars-match; ++ int remainder; ++ if (match > numchars) { ++ match = numchars; ++ eo->matchlen = match; ++ } ++ remainder = numchars-match; + /* delete matched chars from input buffer */ + esPtr->printed -= match; + if (numchars != 0) { diff --git a/expect/patches/expect-5.45-mkpasswd-dash.patch b/expect/patches/expect-5.45-mkpasswd-dash.patch new file mode 100644 index 0000000..fbdecde --- /dev/null +++ b/expect/patches/expect-5.45-mkpasswd-dash.patch @@ -0,0 +1,13 @@ +diff -up expect5.45/example/mkpasswd.orig expect5.45/example/mkpasswd +--- expect5.45/example/mkpasswd.orig 2011-03-16 13:23:23.125480017 +0100 ++++ expect5.45/example/mkpasswd 2011-03-16 13:24:08.739353139 +0100 +@@ -202,7 +202,8 @@ if {[info exists user]} { + expect { + "assword*:" { + # some systems say "Password (again):" +- send "$password\r" ++ send -- "$password\r" ++ # "--" because of passwords beginning with dash + exp_continue + } + } diff --git a/expect/patches/expect-5.45-passmass-su-full-path.patch b/expect/patches/expect-5.45-passmass-su-full-path.patch new file mode 100644 index 0000000..6febf94 --- /dev/null +++ b/expect/patches/expect-5.45-passmass-su-full-path.patch @@ -0,0 +1,12 @@ +diff -up expect5.45/example/passmass.orig expect5.45/example/passmass +--- expect5.45/example/passmass.orig 2011-09-06 13:04:41.439875491 +0200 ++++ expect5.45/example/passmass 2011-09-06 13:04:54.663874571 +0200 +@@ -178,7 +178,7 @@ for {set i 0} {$i<$argc} {incr i} { + } + + if ($su) { +- send "su -\r" ++ send "/bin/su -\r" + expect -nocase "password:" + send "$password(old)\r" + expect "# " diff --git a/kmod/kmod.nm b/kmod/kmod.nm index 926ef42..b6f1326 100644 --- a/kmod/kmod.nm +++ b/kmod/kmod.nm @@ -5,8 +5,9 @@

name = kmod version = 5 -release = 1 +release = 2

+maintainer = Michael Tremer michael.tremer@ipfire.org groups = System/Kernel url = http://modules.wiki.kernel.org/ license = GPLv2+ @@ -25,7 +26,6 @@ sources = %{thisapp}.tar.xz

build requires - chrpath xz-devel zlib-devel end @@ -40,9 +40,6 @@ build # The testsuite does generate lots of errors.

install_cmds - # Remove RPATH from /bin/kmod - chrpath --delete %{BUILDROOT}/bin/kmod - # Remove all man pages (because there are not corresponding # binaries, yet). rm -rvf %{BUILDROOT}%{mandir} @@ -50,11 +47,23 @@ build mkdir -pv %{BUILDROOT}/lib/modprobe.d mkdir -pv %{BUILDROOT}%{sysconfdir}/modprobe.d mkdir -pv %{BUILDROOT}%{sysconfdir}/depmod.d + + mkdir -pv %{BUILDROOT}/sbin + ln -svf ../bin/kmod %{BUILDROOT}/sbin/modprobe + ln -svf ../bin/kmod %{BUILDROOT}/sbin/modinfo + ln -svf ../bin/kmod %{BUILDROOT}/sbin/insmod + ln -svf ../bin/kmod %{BUILDROOT}/sbin/rmmod + ln -svf ../bin/kmod %{BUILDROOT}/sbin/depmod + ln -svf ../bin/kmod %{BUILDROOT}/sbin/lsmod + ln -svf kmod %{BUILDROOT}/bin/lsmod end end

packages package %{name} + provides = module-init-tools = 4.0-1 + obsoletes = module-init-tools < 4.0-1 + end

package %{name}-libs template LIBS diff --git a/libvirt/libvirt.nm b/libvirt/libvirt.nm index 6785581..3ec47d8 100644 --- a/libvirt/libvirt.nm +++ b/libvirt/libvirt.nm @@ -4,8 +4,8 @@ ###############################################################################

name = libvirt -version = 0.9.6 -release = 2 +version = 0.9.9 +release = 1

maintainer = Ben Schweikert ben.schweikert@ipfire.org groups = Applications/Virtualization diff --git a/linux-firmware/linux-firmware.nm b/linux-firmware/linux-firmware.nm index d1ac240..ec5766d 100644 --- a/linux-firmware/linux-firmware.nm +++ b/linux-firmware/linux-firmware.nm @@ -5,7 +5,8 @@

name = linux-firmware version = 20110311 -release = 1 +release = 2 +arch = noarch

maintainer = Arne Fitzenreiter arne.fitzenreiter@ipfire.org groups = System/Libraries @@ -35,9 +36,4 @@ end

packages package %{name} - end - - package %{name}-debuginfo - template DEBUGINFO - end end diff --git a/module-init-tools/modprobe.d/modprobe.conf b/module-init-tools/modprobe.d/modprobe.conf deleted file mode 100644 index 2f053cc..0000000 --- a/module-init-tools/modprobe.d/modprobe.conf +++ /dev/null @@ -1,167 +0,0 @@ -# default modutils aliases -alias binfmt-204 binfmt_aout -alias binfmt-263 binfmt_aout -alias binfmt-264 binfmt_aout -alias binfmt-267 binfmt_aout -alias binfmt-387 binfmt_aout -alias block-major-1-* rd -alias block-major-3-* ide-probe-mod -alias block-major-8-* sd_mod -alias block-major-9-* md -alias block-major-11-* sr_mod -alias block-major-13-* xd -alias block-major-15-* cdu31a -alias block-major-16-* gscd -alias block-major-17-* optcd -alias block-major-18-* sjcd -alias block-major-20-* mcdx -alias block-major-22-* ide-probe-mod -alias block-major-23-* mcd -alias block-major-24-* sonycd535 -alias block-major-25-* sbpcd -alias block-major-26-* sbpcd -alias block-major-27-* sbpcd -alias block-major-29-* aztcd -alias block-major-32-* cm206 -alias block-major-33-* ide-probe-mod -alias block-major-34-* ide-probe-mod -alias block-major-37-* ide-tape -alias block-major-44-* ftl -alias block-major-46-* pcd -alias block-major-47-* pf -alias block-major-56-* ide-probe-mod -alias block-major-57-* ide-probe-mod -alias block-major-88-* ide-probe-mod -alias block-major-89-* ide-probe-mod -alias block-major-90-* ide-probe-mod -alias block-major-91-* ide-probe-mod -alias block-major-93-* nftl -alias block-major-113-* viocd -alias char-major-4-* serial -alias char-major-5-* serial -alias char-major-9-* st -alias char-major-10-2 msbusmouse -alias char-major-10-3 atixlmouse -alias char-major-10-135 rtc -alias char-major-10-139 openprom -alias char-major-10-157 applicom -alias char-major-10-175 agpgart -alias char-major-10-250 hci_vhci -alias char-major-13-* input -alias char-major-13-0 joydev -alias char-major-13-32 mousedev -alias char-major-19-* cyclades -alias char-major-20-* cyclades -alias char-major-22-* pcxx -alias char-major-23-* pcxx -alias char-major-27-* zftape -alias char-major-34-* scc -alias char-major-35-* tclmidi -alias char-major-36-* netlink -alias char-major-48-* riscom8 -alias char-major-49-* riscom8 -alias char-major-57-* esp -alias char-major-58-* esp -alias char-major-63-* kdebug -alias char-major-90-* mtdchar -alias char-major-96-* pt -alias char-major-97-* pg -alias char-major-107-* 3dfx -alias char-major-109-* lvm-mod -alias char-major-188-* usbserial -alias char-major-200-* vxspec -alias char-major-206-* osst -alias char-major-216-* rfcomm -alias dos msdos -alias dummy0 dummy -alias dummy1 dummy -alias iso9660 isofs -alias net-pf-1 unix -alias net-pf-2 ipv4 -alias net-pf-17 af_packet -alias netalias-2 ip_alias -alias irlan0 irlan -alias irda-dongle-0 tekram -alias irda-dongle-1 esi -alias irda-dongle-2 actisys -alias irda-dongle-3 actisys -alias irda-dongle-4 girbil -alias irda-dongle-5 litelink -alias irda-dongle-6 airport -alias irda-dongle-7 old_belkin -alias plip0 plip -alias plip1 plip -alias tunl0 ipip -alias cipcb0 cipcb -alias cipcb1 cipcb -alias cipcb2 cipcb -alias cipcb3 cipcb -alias slip0 slip -alias slip1 slip -alias tty-ldisc-1 slip -alias tty-ldisc-3 ppp_async -alias tty-ldisc-11 irtty-sir -alias tty-ldisc-14 ppp_synctty -alias tty-ldisc-15 hci_uart -alias ppp-compress-18 ppp_mppe -install ppp-compress-21 /bin/true -alias ppp-compress-24 ppp_deflate -alias ppp-compress-26 ppp_deflate -alias parport_lowlevel parport_pc -alias usbdevfs usbcore -alias xfrm-type-2-50 esp4 -alias xfrm-type-2-51 ah4 -alias xfrm-type-2-108 ipcomp -alias xfrm-type-10-50 esp6 -alias xfrm-type-10-51 ah6 -alias xfrm-type-10-108 ipcomp6 -alias cipher_null crypto_null -alias digest_null crypto_null -alias compress_null crypto_null -alias sha384 sha512 -install binfmt-0000 /bin/true -install binfmt_misc /sbin/modprobe --first-time --ignore-install binfmt_misc && { /bin/mount -t binfmt_misc none /proc/sys/fs/binfmt_misc > /dev/null 2>&1 || :; } -install nfsd /sbin/modprobe --first-time --ignore-install nfsd && { /bin/mount -t nfsd nfsd /proc/fs/nfsd > /dev/null 2>&1 || :; } -install sunrpc /sbin/modprobe --first-time --ignore-install sunrpc && { /bin/mount -t rpc_pipefs sunrpc /var/lib/nfs/rpc_pipefs > /dev/null 2>&1 || :; } -install char-major-10 /bin/true -install char-major-10-1 /bin/true -install dummy0 /sbin/modprobe -o dummy0 --ignore-install dummy -install dummy1 /sbin/modprobe -o dummy1 --ignore-install dummy -install net-pf-19 /bin/true -install net-pf-3 /bin/true -install net-pf-6 /bin/true -install ov518_decomp { /sbin/modprobe ov511; } ; /sbin/modprobe --first-time --ignore-install ov518_decomp -install scsi_hostadapter /bin/true -install usbmouse /sbin/modprobe --first-time --ignore-install usbmouse && { /sbin/modprobe hid; /bin/true; } -remove binfmt_misc { /bin/umount /proc/sys/fs/binfmt_misc > /dev/null 2>&1 || :; } ; /sbin/modprobe -r --first-time --ignore-remove binfmt_misc -remove ov518_decomp /sbin/modprobe -r --first-time --ignore-remove ov518_decomp && { /sbin/modprobe -r ov511; /bin/true; } -remove usbmouse { /sbin/modprobe -r hid; } ; /sbin/modprobe -r --first-time --ignore-remove usbmouse -remove sunrpc { /bin/umount /var/lib/nfs/rpc_pipefs > /dev/null 2>&1 || :; } ; /sbin/modprobe -r --ignore-remove sunrpc -remove nfsd { /bin/umount /proc/fs/nfsd > /dev/null 2>&1 || :; } ; /sbin/modprobe -r --first-time --ignore-remove nfsd - - -alias usb-uhci uhci-hcd -alias usb-ohci ohci-hcd -alias uhci uhci-hcd - -alias char-major-116-* snd -alias sound-service-*-0 snd-mixer-oss -alias sound-service-*-1 snd-seq-oss -alias sound-service-*-3 snd-pcm-oss -alias sound-service-*-8 snd-seq-oss -alias sound-service-*-12 snd-pcm-oss - -install sound-slot-* /sbin/modprobe snd-card-${MODPROBE_MODULE##sound[_-]slot[_-]} - -install snd-pcm /sbin/modprobe --ignore-install snd-pcm && /sbin/modprobe snd-pcm-oss && /sbin/modprobe snd-seq-device && /sbin/modprobe snd-seq-oss - -alias nfs4 nfs -alias rpc_pipefs sunrpc -alias rpc_svc_gss_pipefs sunrpc - -install eth1394 /bin/true - -install snd-emu10k1 /sbin/modprobe --ignore-install snd-emu10k1 && /sbin/modprobe snd-emu10k1-synth - -alias gre0 ip_gre -alias char-major-89-* i2c-dev diff --git a/module-init-tools/module-init-tools.nm b/module-init-tools/module-init-tools.nm deleted file mode 100644 index af61c1b..0000000 --- a/module-init-tools/module-init-tools.nm +++ /dev/null @@ -1,52 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = module-init-tools -version = 3.16 -release = 3 - -groups = System/Base -url = http://ftp.kernel.org/pub/linux/utils/kernel/module-init-tools/ -license = GPLv2+ -summary = Kernel module management utilities. - -description - The module-init-tools package includes various programs needed - for automatic loading and unloading of modules under 2.6 and - later kernels, as well as other module management programs. - Device drivers and filesystems are two examples of loaded and - unloaded modules. -end - -source_dl = http://ftp.kernel.org/pub/linux/utils/kernel/module-init-tools/ - -build - requires - docbook-utils - zlib-devel - end - - CFLAGS += -DCONFIG_NO_BACKWARDS_COMPAT=1 - - configure_options += \ - --bindir=/bin \ - --sbindir=/sbin \ - --mandir=/usr/share/man \ - --enable-zlib-dynamic \ - --disable-static-utils - - install_cmds - mkdir -pv %{BUILDROOT}/etc/modprobe.d - cp -av %{DIR_SOURCE}/modprobe.d/* %{BUILDROOT}/etc/modprobe.d/ - end -end - -packages - package %{name} - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/tcl/patches/tcl-8.5.1-autopath.patch b/tcl/patches/tcl-8.5.1-autopath.patch new file mode 100644 index 0000000..87317d3 --- /dev/null +++ b/tcl/patches/tcl-8.5.1-autopath.patch @@ -0,0 +1,53 @@ +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 + } + ++ # 2a. As a sibling of Tcl's script directory ++ if {[catch { ++ ::tcl::pkgconfig get scriptdir,runtime ++ } value] == 0} { ++ lappend dirs [file join [file dirname $value] $basename$version] ++ } ++ + # 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 +@@ -48,16 +48,11 @@ if {![info exists auto_path]} { + } + namespace eval tcl { + variable Dir +- foreach Dir [list $::tcl_library [file dirname $::tcl_library]] { ++ foreach Dir [list $::tcl_library] { + if {$Dir ni $::auto_path} { + lappend ::auto_path $Dir + } + } +- set Dir [file join [file dirname [file dirname \ +- [info nameofexecutable]]] lib] +- if {$Dir ni $::auto_path} { +- lappend ::auto_path $Dir +- } + 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 +@@ -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 ${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 ${libdir}/tk8.5 ${prefix}/share/tk8.5 ${TCL_PACKAGE_PATH}" + fi + + #-------------------------------------------------------------------- diff --git a/tcl/patches/tcl-8.5.10-conf.patch b/tcl/patches/tcl-8.5.10-conf.patch new file mode 100644 index 0000000..dd90b06 --- /dev/null +++ b/tcl/patches/tcl-8.5.10-conf.patch @@ -0,0 +1,26 @@ +--- 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" + +- SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}' ++ SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS} -fPIC -Wl,-soname,${@}' + DL_OBJS="tclLoadDl.o" + DL_LIBS="-ldl" + LDFLAGS="$LDFLAGS -Wl,--export-dynamic" + AS_IF([test $doRpath = yes], [ +- CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}']) ++ CC_SEARCH_FLAGS='']) + LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} + 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_CFLAGS="-fPIC" + SHLIB_SUFFIX=".so" + +- SHLIB_LD='${CC} -shared' ++ SHLIB_LD='${CC} ${CFLAGS} -shared -fPIC' + DL_OBJS="" + DL_LIBS="-ldl" + LDFLAGS="$LDFLAGS -Wl,--export-dynamic" diff --git a/tcl/patches/tcl-8.5.8-autopath.patch b/tcl/patches/tcl-8.5.8-autopath.patch deleted file mode 100644 index 87317d3..0000000 --- a/tcl/patches/tcl-8.5.8-autopath.patch +++ /dev/null @@ -1,53 +0,0 @@ -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 - } - -+ # 2a. As a sibling of Tcl's script directory -+ if {[catch { -+ ::tcl::pkgconfig get scriptdir,runtime -+ } value] == 0} { -+ lappend dirs [file join [file dirname $value] $basename$version] -+ } -+ - # 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 -@@ -48,16 +48,11 @@ if {![info exists auto_path]} { - } - namespace eval tcl { - variable Dir -- foreach Dir [list $::tcl_library [file dirname $::tcl_library]] { -+ foreach Dir [list $::tcl_library] { - if {$Dir ni $::auto_path} { - lappend ::auto_path $Dir - } - } -- set Dir [file join [file dirname [file dirname \ -- [info nameofexecutable]]] lib] -- if {$Dir ni $::auto_path} { -- lappend ::auto_path $Dir -- } - 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 -@@ -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 ${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 ${libdir}/tk8.5 ${prefix}/share/tk8.5 ${TCL_PACKAGE_PATH}" - fi - - #-------------------------------------------------------------------- diff --git a/tcl/patches/tcl-8.5.8-conf.patch b/tcl/patches/tcl-8.5.8-conf.patch deleted file mode 100644 index dd90b06..0000000 --- a/tcl/patches/tcl-8.5.8-conf.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- 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" - -- SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}' -+ SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS} -fPIC -Wl,-soname,${@}' - DL_OBJS="tclLoadDl.o" - DL_LIBS="-ldl" - LDFLAGS="$LDFLAGS -Wl,--export-dynamic" - AS_IF([test $doRpath = yes], [ -- CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}']) -+ CC_SEARCH_FLAGS='']) - LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} - 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_CFLAGS="-fPIC" - SHLIB_SUFFIX=".so" - -- SHLIB_LD='${CC} -shared' -+ SHLIB_LD='${CC} ${CFLAGS} -shared -fPIC' - DL_OBJS="" - DL_LIBS="-ldl" - LDFLAGS="$LDFLAGS -Wl,--export-dynamic" diff --git a/tcl/patches/tcl-8.5.9-hidden.patch b/tcl/patches/tcl-8.5.9-hidden.patch new file mode 100644 index 0000000..451cda2 --- /dev/null +++ b/tcl/patches/tcl-8.5.9-hidden.patch @@ -0,0 +1,33 @@ +diff -up tcl8.5.6/generic/tclPort.h.old tcl8.5.6/generic/tclPort.h +--- tcl8.5.6/generic/tclPort.h.old 2009-02-09 16:40:08.000000000 +0100 ++++ tcl8.5.6/generic/tclPort.h 2009-02-09 16:40:26.000000000 +0100 +@@ -24,7 +24,7 @@ + #endif + #include "tcl.h" + #if !defined(_WIN32) +-# include "tclUnixPort.h" ++# include "../unix/tclUnixPort.h" + #endif + + #if defined(__CYGWIN__) +diff -up tcl8.5.6/generic/tclInt.h.bbb tcl8.5.6/generic/tclInt.h +--- tcl8.5.6/generic/tclInt.h.bbb 2008-11-14 01:22:39.000000000 +0100 ++++ tcl8.5.6/generic/tclInt.h 2009-02-11 13:05:13.000000000 +0100 +@@ -2773,7 +2773,7 @@ MODULE_SCOPE void TclClockInit(Tcl_Inter + MODULE_SCOPE int TclClockOldscanObjCmd( + ClientData clientData, Tcl_Interp *interp, + int objc, Tcl_Obj *const objv[]); +-MODULE_SCOPE int Tcl_CloseObjCmd(ClientData clientData, ++extern int Tcl_CloseObjCmd(ClientData clientData, + Tcl_Interp *interp, int objc, + Tcl_Obj *const objv[]); + MODULE_SCOPE int Tcl_ConcatObjCmd(ClientData clientData, +@@ -2934,7 +2934,7 @@ MODULE_SCOPE int Tcl_RegsubObjCmd(Client + MODULE_SCOPE int Tcl_RenameObjCmd(ClientData clientData, + Tcl_Interp *interp, int objc, + Tcl_Obj *const objv[]); +-MODULE_SCOPE int Tcl_ReturnObjCmd(ClientData clientData, ++extern int Tcl_ReturnObjCmd(ClientData clientData, + Tcl_Interp *interp, int objc, + Tcl_Obj *const objv[]); + MODULE_SCOPE int Tcl_ScanObjCmd(ClientData clientData, diff --git a/tcl/tcl.nm b/tcl/tcl.nm index 0ce3438..11a9287 100644 --- a/tcl/tcl.nm +++ b/tcl/tcl.nm @@ -4,8 +4,10 @@ ###############################################################################

name = tcl -version = 8.5.10 -release = 2 +major_ver = 8.5 +version = %{major_ver}.11 +release = 1 +thisapp = tcl%{version}

groups = Development/Languages url = http://tcl.sourceforge.net/ @@ -18,47 +20,78 @@ description applications, protocols, devices, and frameworks. end

-source_dl = http://downloads.sourceforge.net/project/%%7Bname%7D/%%7Bname%7D/%%7Bthisapp... +source_dl = http://downloads.sourceforge.net/project/%%7Bname%7D/Tcl/%%7Bversion%7D/ sources = tcl%{version}-src.tar.gz

build requires - perl>=5.14.2-9.ip3 autoconf automake + perl >= 5.14.2-9.ip3 end

- DIR_APP = %{DIR_SRC}/tcl%{version}/unix CFLAGS += -DTCL_NO_STACK_CHECK=1 + make_extra = TCL_LIBRARY=%{datadir}/%{name}%{major_ver}

- configure_options +=\ + configure_options += \ + --disable-threads \ + --enable-symbols \ --enable-shared

- prepare - cd %{DIR_SRC} && %{MACRO_EXTRACT} %{DIR_DL}/${source}/%{sources} - cd %{DIR_APP} && cd .. + prepare_cmds + cd unix && autoconf + end

- %{MACRO_PATCHES} + build + cd unix + ./configure \ + %{configure_options}

- cd %{DIR_APP} && autoconf + make %{PARALLELISMFLAGS} %{make_extra} end

- test - # Skip remote tests http, httpold and socket. - # Also skip unixInit-1.1. This test fails because "kill -PIPE" - # will be executed and we don't support that. - make test TESTFLAGS="-skip 'http* socket* unixInit-1.1'" + install + cd unix + make install %{make_extra} INSTALL_ROOT=%{BUILDROOT} + cd .. + + ln -svf tclsh%{major_ver} %{BUILDROOT}/usr/bin/tclsh + + # for linking with -lib%{name} + ln -svf lib%{name}%{major_ver}.so %{BUILDROOT}%{libdir}/lib%{name}.so + + # paths don't look at /usr/lib for efficiency, so we symlink into tcl8.5 for now + mkdir -pv %{BUILDROOT}%{libdir}/%{name}%{major_ver} + ln -svf ../%{name}Config.sh %{BUILDROOT}%{libdir}/%{name}%{major_ver}/%{name}Config.sh + + mkdir -pv %{BUILDROOT}%{includedir}/%{name}-private/{generic,unix} + find generic unix -name "*.h" -exec cp -p '{}' %{BUILDROOT}%{includedir}/%{name}-private/'{}' ';' + ( + cd %{BUILDROOT}%{includedir} + for i in *.h; do + [ -f %{BUILDROOT}%{includedir}/%{name}-private/generic/${i} ] && ln -sf ../../${i} \ + %{BUILDROOT}%{includedir}/%{name}-private/generic; + done + ) + + # remove buildroot traces + sed -i -e "s|$PWD/unix|%{libdir}|; s|$PWD|%{includedir}/%{name}-private|" %{BUILDROOT}%{libdir}/%{name}Config.sh + rm -rf %{BUILDROOT}%{datadir}/%{name}%{major_ver}/ldAix end

- install_cmds - cd %{DIR_APP} && make install-private-headers DESTDIR=%{BUILDROOT} - ln -sf tclsh8.5 %{BUILDROOT}/usr/bin/tclsh + # Keep libtclstub*.a. + keep_libraries + %{libdir}/lib%{name}stub%{major_ver}.a end end

packages package %{name}

+ package %{name}-devel + template DEVEL + end + package %{name}-debuginfo template DEBUGINFO end

hooks/post-receive -- IPFire 3.x development tree