[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 77c48fbe35e59957036b9533db0ec5b88a7a1e3d
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 77c48fbe35e59957036b9533db0ec5b88a7a1e3d (commit) via f443b4cba7fbd22723e1716355ee921e289907ab (commit) via 962fade2d4714d4c8d5e26b841e4a87c96f92845 (commit) via 28ef7a6a9e782410811e7733f27ec85b4ba0fe19 (commit) via 86b759785b24acd678450f639424b81798e329ab (commit) from efd02229ae5402bad762a20c9ce75607267e3309 (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 77c48fbe35e59957036b9533db0ec5b88a7a1e3d Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Feb 24 22:13:36 2016 -0800
core99: Ship updated xz
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit f443b4cba7fbd22723e1716355ee921e289907ab Author: Marcel Lorenz lorenz.marcel@web.de Date: Tue Feb 23 08:49:27 2016 +0100
bison: update to 3.0.4
Update bison to the last version from Linux from Scratch.
Signed-off-by: Marcel Lorenz marcel.lorenz@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 962fade2d4714d4c8d5e26b841e4a87c96f92845 Author: Marcel Lorenz lorenz.marcel@web.de Date: Tue Feb 23 09:37:28 2016 +0100
xz: update to 5.2.2
Update xz to last version from Linux from Scratch.
Signed-off-by: Marcel Lorenz marcel.lorenz@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 28ef7a6a9e782410811e7733f27ec85b4ba0fe19 Author: Marcel Lorenz lorenz.marcel@web.de Date: Tue Feb 23 08:46:23 2016 +0100
m4: update to 1.4.17
Update m4 to last version from Linux from Scratch.
Signed-off-by: Marcel Lorenz marcel.lorenz@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 86b759785b24acd678450f639424b81798e329ab Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Feb 23 09:44:40 2016 -0800
make.sh: Update source upload URL
There is no longer a SSH service on source.ipfire.org.
The usual login on git.ipfire.org should be used instead.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/common/bison | 21 +++++++++++++++++++++ config/rootfiles/common/xz | 2 +- .../rootfiles/{oldcore/90 => core/99}/filelists/xz | 0 lfs/Config | 2 +- lfs/bison | 12 +++++------- lfs/m4 | 12 +++++------- lfs/xz | 5 +++-- 7 files changed, 36 insertions(+), 18 deletions(-) copy config/rootfiles/{oldcore/90 => core/99}/filelists/xz (100%)
Difference in files: diff --git a/config/rootfiles/common/bison b/config/rootfiles/common/bison index ca8d5ee..2304eca 100644 --- a/config/rootfiles/common/bison +++ b/config/rootfiles/common/bison @@ -8,6 +8,7 @@ #usr/share/bison/bison.m4 #usr/share/bison/c++-skel.m4 #usr/share/bison/c++.m4 +#usr/share/bison/c-like.m4 #usr/share/bison/c-skel.m4 #usr/share/bison/c.m4 #usr/share/bison/glr.c @@ -21,12 +22,32 @@ #usr/share/bison/m4sugar/foreach.m4 #usr/share/bison/m4sugar/m4sugar.m4 #usr/share/bison/stack.hh +#usr/share/bison/variant.hh #usr/share/bison/xslt #usr/share/bison/xslt/bison.xsl #usr/share/bison/xslt/xml2dot.xsl #usr/share/bison/xslt/xml2text.xsl #usr/share/bison/xslt/xml2xhtml.xsl #usr/share/bison/yacc.c +#usr/share/doc/bison-3.0.4 +#usr/share/doc/bison-3.0.4/AUTHORS +#usr/share/doc/bison-3.0.4/COPYING +#usr/share/doc/bison-3.0.4/NEWS +#usr/share/doc/bison-3.0.4/README +#usr/share/doc/bison-3.0.4/THANKS +#usr/share/doc/bison-3.0.4/TODO +#usr/share/doc/bison-3.0.4/examples +#usr/share/doc/bison-3.0.4/examples/calc++ +#usr/share/doc/bison-3.0.4/examples/calc++/calc++-driver.cc +#usr/share/doc/bison-3.0.4/examples/calc++/calc++-driver.hh +#usr/share/doc/bison-3.0.4/examples/calc++/calc++-parser.yy +#usr/share/doc/bison-3.0.4/examples/calc++/calc++-scanner.ll +#usr/share/doc/bison-3.0.4/examples/calc++/calc++.cc +#usr/share/doc/bison-3.0.4/examples/mfcalc +#usr/share/doc/bison-3.0.4/examples/mfcalc/calc.h +#usr/share/doc/bison-3.0.4/examples/mfcalc/mfcalc.y +#usr/share/doc/bison-3.0.4/examples/rpcalc +#usr/share/doc/bison-3.0.4/examples/rpcalc/rpcalc.y #usr/share/info/bison.info #usr/share/man/man1/bison.1 #usr/share/man/man1/yacc.1 diff --git a/config/rootfiles/common/xz b/config/rootfiles/common/xz index b4053d9..8b71758 100644 --- a/config/rootfiles/common/xz +++ b/config/rootfiles/common/xz @@ -41,7 +41,7 @@ usr/bin/xzmore #usr/lib/liblzma.la usr/lib/liblzma.so usr/lib/liblzma.so.5 -usr/lib/liblzma.so.5.2.1 +usr/lib/liblzma.so.5.2.2 #usr/lib/pkgconfig/liblzma.pc #usr/share/doc/xz #usr/share/doc/xz/AUTHORS diff --git a/config/rootfiles/core/99/filelists/xz b/config/rootfiles/core/99/filelists/xz new file mode 120000 index 0000000..734e926 --- /dev/null +++ b/config/rootfiles/core/99/filelists/xz @@ -0,0 +1 @@ +../../../common/xz \ No newline at end of file diff --git a/lfs/Config b/lfs/Config index e239645..75867ff 100644 --- a/lfs/Config +++ b/lfs/Config @@ -35,7 +35,7 @@ # URL_IPFIRE = http://source.ipfire.org/source-2.x URL_TOOLCHAIN = http://source.ipfire.org/toolchains -URL_SOURCE = source.ipfire.org:/pub/source/source-2.x +URL_SOURCE = git.ipfire.org:/pub/source/source-2.x
# Don't change this; it will be overridden by other makefiles where necessary. # diff --git a/lfs/bison b/lfs/bison index 6b84f41..322dd26 100644 --- a/lfs/bison +++ b/lfs/bison @@ -24,10 +24,10 @@
include Config
-VER = 2.5.1 +VER = 3.0.4
THISAPP = bison-$(VER) -DL_FILE = $(THISAPP).tar.gz +DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -40,7 +40,7 @@ objects =$(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 8fedf916f1aa2c4a31441d8f8bbc603c +$(DL_FILE)_MD5 = c342201de104cc9ce0a21e0ad10d4021
install : $(TARGET)
@@ -69,10 +69,8 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls - # Disable NLS - #cd $(DIR_APP) && echo '#define YYENABLE_NLS 1' >> config.h + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls --docdir=/usr/share/doc/$(THISAPP) cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make $(EXTRA_INSTALL) install @rm -rf $(DIR_APP) diff --git a/lfs/m4 b/lfs/m4 index 4620221..932cb6d 100644 --- a/lfs/m4 +++ b/lfs/m4 @@ -24,10 +24,10 @@
include Config
-VER = 1.4.16 +VER = 1.4.17
THISAPP = m4-$(VER) -DL_FILE = $(THISAPP).tar.bz2 +DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP)
@@ -37,12 +37,10 @@ ifeq "$(ROOT)" "" TARGET = $(DIR_INFO)/$(THISAPP) EXTRA_CONFIG = --prefix=/usr --disable-nls EXTRA_MAKE = - EXTRA_INSTALL = else TARGET = $(DIR_INFO)/$(THISAPP)-tools EXTRA_CONFIG = --prefix=/tools --disable-nls EXTRA_MAKE = - EXTRA_INSTALL = endif
############################################################################### @@ -53,7 +51,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 8a7cef47fecab6272eb86a6be6363b2f +$(DL_FILE)_MD5 = 12a3c829301a4fd6586a57d3fcf196dc
install : $(TARGET)
@@ -82,9 +80,9 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && ./configure $(EXTRA_CONFIG) cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) - cd $(DIR_APP) && make $(EXTRA_INSTALL) install + cd $(DIR_APP) && make install @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/xz b/lfs/xz index c1d3ef7..c09cb34 100644 --- a/lfs/xz +++ b/lfs/xz @@ -24,7 +24,7 @@
include Config
-VER = 5.2.1 +VER = 5.2.2
THISAPP = xz-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -47,7 +47,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = b5e2dd95dc8498cea5354377ed89aa65 +$(DL_FILE)_MD5 = e26772b69940085c0632589ab1d52e64
install : $(TARGET)
@@ -77,6 +77,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && sed -e '/mf.buffer = NULL/a next->coder->mf.size = 0;' -i src/liblzma/lz/lz_encoder.c cd $(DIR_APP) && ./configure --prefix=$(PREFIX) cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install
hooks/post-receive -- IPFire 2.x development tree
-
git＠ipfire.org