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 2.x development tree".

The branch, next has been updated via a99de963c9f272ec8850002a734dca4aa1f77dae (commit) via f3905bf8173bfc407dba284aae52034195766f84 (commit) via 211ca1f52bb9591ece685a123527c8390ff20b91 (commit) via d05c4e8f5ce93e85310f43fc71cb495a63d4f0ec (commit) from 713a08524620fd24fbebdf1691508d12ad23fc72 (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 a99de963c9f272ec8850002a734dca4aa1f77dae Merge: 713a085 f3905bf Author: Arne Fitzenreiter arne_f@ipfire.org Date: Fri May 6 12:33:44 2011 +0200

Merge branch 'master' into next

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

Summary of changes: config/rootfiles/packages/mc | 29 +++++++------------ config/rootfiles/packages/vdradmin | 1 + lfs/mc | 6 ++-- lfs/perl | 2 +- lfs/vdradmin | 3 +- ...5.8.8-libc-2.patch => perl-5.12.3-libc-2.patch} | 0 6 files changed, 18 insertions(+), 23 deletions(-) rename src/patches/{perl-5.8.8-libc-2.patch => perl-5.12.3-libc-2.patch} (100%)

Difference in files: diff --git a/config/rootfiles/packages/mc b/config/rootfiles/packages/mc index 4cb6efa..bb7e6d7 100644 --- a/config/rootfiles/packages/mc +++ b/config/rootfiles/packages/mc @@ -1,25 +1,20 @@ usr/bin/mc usr/bin/mcdiff usr/bin/mcedit -usr/bin/mcmfmt usr/bin/mcview usr/etc usr/etc/mc -usr/etc/mc/Syntax usr/etc/mc/cedit.menu usr/etc/mc/edit.indent.rc usr/etc/mc/edit.spell.rc usr/etc/mc/filehighlight.ini -usr/etc/mc/mc.charsets usr/etc/mc/mc.ext usr/etc/mc/mc.keymap usr/etc/mc/mc.keymap.default usr/etc/mc/mc.keymap.emacs -usr/etc/mc/mc.lib usr/etc/mc/mc.menu usr/etc/mc/mc.menu.sr usr/etc/mc/sfs.ini -#usr/libexec #usr/libexec/mc usr/libexec/mc/cons.saver #usr/libexec/mc/extfs.d @@ -79,27 +74,24 @@ usr/libexec/mc/mc.sh #usr/share/man/man1/mcedit.1 #usr/share/man/man1/mcview.1 #usr/share/mc -usr/share/mc/mc.hint -#usr/share/mc/mc.hint.cs -#usr/share/mc/mc.hint.es -#usr/share/mc/mc.hint.hu -#usr/share/mc/mc.hint.it -#usr/share/mc/mc.hint.nl -#usr/share/mc/mc.hint.pl -#usr/share/mc/mc.hint.ru -#usr/share/mc/mc.hint.sr -#usr/share/mc/mc.hint.uk -#usr/share/mc/mc.hint.zh -usr/share/mc/mc.hlp -usr/share/mc/skins +#usr/share/mc/help +usr/share/mc/help/mc.hlp +#usr/share/mc/hints +usr/share/mc/hints/mc.hint +usr/share/mc/mc.charsets +usr/share/mc/mc.lib +#usr/share/mc/skins +usr/share/mc/skins/dark.ini usr/share/mc/skins/darkfar.ini usr/share/mc/skins/default.ini usr/share/mc/skins/double-lines.ini usr/share/mc/skins/featured.ini usr/share/mc/skins/gotar.ini +usr/share/mc/skins/mc46.ini usr/share/mc/skins/nicedark.ini #usr/share/mc/syntax usr/share/mc/syntax/PKGBUILD.syntax +usr/share/mc/syntax/Syntax usr/share/mc/syntax/ada95.syntax usr/share/mc/syntax/aspx.syntax usr/share/mc/syntax/assembler.syntax @@ -110,6 +102,7 @@ usr/share/mc/syntax/changelog.syntax usr/share/mc/syntax/cs.syntax usr/share/mc/syntax/css.syntax usr/share/mc/syntax/cxx.syntax +usr/share/mc/syntax/cython.syntax usr/share/mc/syntax/d.syntax usr/share/mc/syntax/debian-changelog.syntax usr/share/mc/syntax/debian-control.syntax diff --git a/config/rootfiles/packages/vdradmin b/config/rootfiles/packages/vdradmin index 17be5a7..20ea7d5 100644 --- a/config/rootfiles/packages/vdradmin +++ b/config/rootfiles/packages/vdradmin @@ -180,5 +180,6 @@ etc/rc.d/rc6.d/K01vdradmin etc/rc.d/rc3.d/S99vdradmin #usr/share/locale/de_DE.utf8/LC_MESSAGES/vdradmin.mo #usr/share/locale/en_US.utf8/LC_MESSAGES/vdradmin.mo +var/cache/vdradmin var/log/vdradmin var/run/vdradmin diff --git a/lfs/mc b/lfs/mc index d6badb5..25a949e 100644 --- a/lfs/mc +++ b/lfs/mc @@ -24,7 +24,7 @@

include Config

-VER = 4.7.3 +VER = 4.7.5.2

THISAPP = mc-$(VER) DL_FILE = $(THISAPP).tar.lzma @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = mc -PAK_VER = 4 +PAK_VER = 5

DEPS = "glib"

@@ -44,7 +44,7 @@ objects = $(DL_FILE)

$(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = 15b017b370668683aa8cbf6730667510 +$(DL_FILE)_MD5 = 9fede28ed63ced53f1beeba2f95473da

install : $(TARGET)

diff --git a/lfs/perl b/lfs/perl index 822249f..f507544 100644 --- a/lfs/perl +++ b/lfs/perl @@ -88,7 +88,7 @@ ifeq "$(ROOT)" "" cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install else - cd $(DIR_APP) && ./configure.gnu --prefix=/tools -Dstatic_ext='Data/Dumper Fcntl IO POSIX' + cd $(DIR_APP) && ./configure.gnu --prefix=/tools -Dstatic_ext='Data/Dumper Fcntl IO' cd $(DIR_APP) && sed -i 's/^0$$//' makefile cd $(DIR_APP) && sed -i 's/^0$$//' x2p/makefile cd $(DIR_APP) && make perl utilities diff --git a/lfs/vdradmin b/lfs/vdradmin index 43c2a08..3bd788f 100644 --- a/lfs/vdradmin +++ b/lfs/vdradmin @@ -33,7 +33,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = vdradmin -PAK_VER = 3 +PAK_VER = 4

DEPS = "perl-gettext vdr"

@@ -85,5 +85,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) /etc/vdradmin/vdradmind.conf mkdir /var/log/vdradmin mkdir /var/run/vdradmin + mkdir /var/cache/vdradmin @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/src/patches/perl-5.12.3-libc-2.patch b/src/patches/perl-5.12.3-libc-2.patch new file mode 100644 index 0000000..f31910b --- /dev/null +++ b/src/patches/perl-5.12.3-libc-2.patch @@ -0,0 +1,32 @@ +Submitted By: Anderson Lizardo <andersonlizardo(at)yahoo(dot)com(dot)br> +Date: 2006-02-15 +Initial Package Version: 5.8.8 +Origin: based on current LFS-BOOK patch (perl-5.8.0-libc-2.patch) +Description: this patch adapts some hard-wired paths to the C library. + It uses the $prefix variable to locate the correct libc. + +diff -Naur perl-5.8.8.orig/hints/linux.sh perl-5.8.8/hints/linux.sh +--- perl-5.8.8.orig/hints/linux.sh 2005-11-18 01:18:45.000000000 +0000 ++++ perl-5.8.8/hints/linux.sh 2006-02-12 12:20:32.000000000 +0000 +@@ -52,9 +52,9 @@ + # We don't use __GLIBC__ and __GLIBC_MINOR__ because they + # are insufficiently precise to distinguish things like + # libc-2.0.6 and libc-2.0.7. +-if test -L /lib/libc.so.6; then +- libc=`ls -l /lib/libc.so.6 | awk '{print $NF}'` +- libc=/lib/$libc ++if test -L ${prefix}/lib/libc.so.6; then ++ libc=`ls -l ${prefix}/lib/libc.so.6 | awk '{print $NF}'` ++ libc=${prefix}/lib/$libc + fi + + # Configure may fail to find lstat() since it's a static/inline +@@ -330,3 +330,8 @@ + libswanted="$*" + ;; + esac ++ ++locincpth="" ++loclibpth="" ++glibpth="${prefix}/lib" ++usrinc="${prefix}/include" diff --git a/src/patches/perl-5.8.8-libc-2.patch b/src/patches/perl-5.8.8-libc-2.patch deleted file mode 100644 index f31910b..0000000 --- a/src/patches/perl-5.8.8-libc-2.patch +++ /dev/null @@ -1,32 +0,0 @@ -Submitted By: Anderson Lizardo <andersonlizardo(at)yahoo(dot)com(dot)br> -Date: 2006-02-15 -Initial Package Version: 5.8.8 -Origin: based on current LFS-BOOK patch (perl-5.8.0-libc-2.patch) -Description: this patch adapts some hard-wired paths to the C library. - It uses the $prefix variable to locate the correct libc. - -diff -Naur perl-5.8.8.orig/hints/linux.sh perl-5.8.8/hints/linux.sh ---- perl-5.8.8.orig/hints/linux.sh 2005-11-18 01:18:45.000000000 +0000 -+++ perl-5.8.8/hints/linux.sh 2006-02-12 12:20:32.000000000 +0000 -@@ -52,9 +52,9 @@ - # We don't use __GLIBC__ and __GLIBC_MINOR__ because they - # are insufficiently precise to distinguish things like - # libc-2.0.6 and libc-2.0.7. --if test -L /lib/libc.so.6; then -- libc=`ls -l /lib/libc.so.6 | awk '{print $NF}'` -- libc=/lib/$libc -+if test -L ${prefix}/lib/libc.so.6; then -+ libc=`ls -l ${prefix}/lib/libc.so.6 | awk '{print $NF}'` -+ libc=${prefix}/lib/$libc - fi - - # Configure may fail to find lstat() since it's a static/inline -@@ -330,3 +330,8 @@ - libswanted="$*" - ;; - esac -+ -+locincpth="" -+loclibpth="" -+glibpth="${prefix}/lib" -+usrinc="${prefix}/include"

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