Revision: 7357
http://sourceforge.net/p/ipcop/svn/7357
Author: owes
Date: 2014-03-21 21:30:59 +0000 (Fri, 21 Mar 2014)
Log Message:
-----------
Update bash to 4.3
Modified Paths:
--------------
ipcop/trunk/config/rootfiles/common/bash
ipcop/trunk/lfs/bash
ipcop/trunk/updates/2.1.3/ROOTFILES.i486-2.1.3
ipcop/trunk/updates/2.1.3/information.xml
Removed Paths:
-------------
ipcop/trunk/src/patches/bash-4.1_hardening-formatstring.patch
Modified: ipcop/trunk/config/rootfiles/common/bash
===================================================================
--- ipcop/trunk/config/rootfiles/common/bash 2014-03-21 21:26:50 UTC (rev
7356)
+++ ipcop/trunk/config/rootfiles/common/bash 2014-03-21 21:30:59 UTC (rev
7357)
@@ -1,8 +1,16 @@
## bash-4.2 (we cheat for sh and bash here)
##
+bin/bash
bin/sh
-bin/bash
-#bin/bashbug
#usr/share/info/bash.info
-#usr/share/man/man1/bash.1
-#usr/share/man/man1/bashbug.1
+#usr/share/doc/bash
+#usr/share/doc/bash/CHANGES
+#usr/share/doc/bash/COMPAT
+#usr/share/doc/bash/FAQ
+#usr/share/doc/bash/INTRO
+#usr/share/doc/bash/NEWS
+#usr/share/doc/bash/POSIX
+#usr/share/doc/bash/RBASH
+#usr/share/doc/bash/README
+#usr/share/doc/bash/bash.html
+#usr/share/doc/bash/bashref.html
Modified: ipcop/trunk/lfs/bash
===================================================================
--- ipcop/trunk/lfs/bash 2014-03-21 21:26:50 UTC (rev 7356)
+++ ipcop/trunk/lfs/bash 2014-03-21 21:30:59 UTC (rev 7357)
@@ -33,7 +33,7 @@
include Config
PKG_NAME = bash
-VER = 4.2
+VER = 4.3
HOST_ARCH = all
OTHER_SRC = yes
@@ -46,171 +46,20 @@
# patches 1 to 7 are together
PATCH1 := $(THISAPP)-fixes-1.patch
PATCH08 := $(PKG_NAME)42-008
-PATCH09 := $(PKG_NAME)42-009
-PATCH10 := $(PKG_NAME)42-010
-PATCH11 := $(PKG_NAME)42-011
-PATCH12 := $(PKG_NAME)42-012
-PATCH13 := $(PKG_NAME)42-013
-PATCH14 := $(PKG_NAME)42-014
-PATCH15 := $(PKG_NAME)42-015
-PATCH16 := $(PKG_NAME)42-016
-PATCH17 := $(PKG_NAME)42-017
-PATCH18 := $(PKG_NAME)42-018
-PATCH19 := $(PKG_NAME)42-019
-PATCH20 := $(PKG_NAME)42-020
-PATCH21 := $(PKG_NAME)42-021
-PATCH22 := $(PKG_NAME)42-022
-PATCH23 := $(PKG_NAME)42-023
-PATCH24 := $(PKG_NAME)42-024
-PATCH25 := $(PKG_NAME)42-025
-PATCH26 := $(PKG_NAME)42-026
-PATCH27 := $(PKG_NAME)42-027
-PATCH28 := $(PKG_NAME)42-028
-PATCH29 := $(PKG_NAME)42-029
-PATCH30 := $(PKG_NAME)42-030
-PATCH31 := $(PKG_NAME)42-031
-PATCH32 := $(PKG_NAME)42-032
-PATCH33 := $(PKG_NAME)42-033
-PATCH34 := $(PKG_NAME)42-034
-PATCH35 := $(PKG_NAME)42-035
-PATCH36 := $(PKG_NAME)42-036
-PATCH37 := $(PKG_NAME)42-037
-PATCH38 := $(PKG_NAME)42-038
-PATCH39 := $(PKG_NAME)42-039
-PATCH40 := $(PKG_NAME)42-040
-PATCH41 := $(PKG_NAME)42-041
-PATCH42 := $(PKG_NAME)42-042
-PATCH43 := $(PKG_NAME)42-043
-PATCH44 := $(PKG_NAME)42-044
-PATCH45 := $(PKG_NAME)42-045
###############################################################################
# Top-level Rules
###############################################################################
-objects = $(DL_FILE) \
- $(PATCH1) \
- $(PATCH08).patch \
- $(PATCH09).patch \
- $(PATCH10).patch \
- $(PATCH11).patch \
- $(PATCH12).patch \
- $(PATCH13).patch \
- $(PATCH14).patch \
- $(PATCH15).patch \
- $(PATCH16).patch \
- $(PATCH17).patch \
- $(PATCH18).patch \
- $(PATCH19).patch \
- $(PATCH20).patch \
- $(PATCH21).patch \
- $(PATCH22).patch \
- $(PATCH23).patch \
- $(PATCH24).patch \
- $(PATCH25).patch \
- $(PATCH26).patch \
- $(PATCH27).patch \
- $(PATCH28).patch \
- $(PATCH29).patch \
- $(PATCH30).patch \
- $(PATCH31).patch \
- $(PATCH32).patch \
- $(PATCH33).patch \
- $(PATCH34).patch \
- $(PATCH35).patch \
- $(PATCH36).patch \
- $(PATCH37).patch \
- $(PATCH38).patch \
- $(PATCH39).patch \
- $(PATCH40).patch \
- $(PATCH41).patch \
- $(PATCH42).patch \
- $(PATCH43).patch \
- $(PATCH44).patch \
- $(PATCH45).patch \
+objects = $(DL_FILE)
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(PATCH1) = $(URL_LFS)/$(PKG_NAME)/$(PATCH1)
-$(PATCH08).patch = $(DL_FROM)/$(THISAPP)-patches/$(PATCH08)
-$(PATCH09).patch = $(DL_FROM)/$(THISAPP)-patches/$(PATCH09)
-$(PATCH10).patch = $(DL_FROM)/$(THISAPP)-patches/$(PATCH10)
-$(PATCH11).patch = $(DL_FROM)/$(THISAPP)-patches/$(PATCH11)
-$(PATCH12).patch = $(DL_FROM)/$(THISAPP)-patches/$(PATCH12)
-$(PATCH13).patch = $(DL_FROM)/$(THISAPP)-patches/$(PATCH13)
-$(PATCH14).patch = $(DL_FROM)/$(THISAPP)-patches/$(PATCH14)
-$(PATCH15).patch = $(DL_FROM)/$(THISAPP)-patches/$(PATCH15)
-$(PATCH16).patch = $(DL_FROM)/$(THISAPP)-patches/$(PATCH16)
-$(PATCH17).patch = $(DL_FROM)/$(THISAPP)-patches/$(PATCH17)
-$(PATCH18).patch = $(DL_FROM)/$(THISAPP)-patches/$(PATCH18)
-$(PATCH19).patch = $(DL_FROM)/$(THISAPP)-patches/$(PATCH19)
-$(PATCH20).patch = $(DL_FROM)/$(THISAPP)-patches/$(PATCH20)
-$(PATCH21).patch = $(DL_FROM)/$(THISAPP)-patches/$(PATCH21)
-$(PATCH22).patch = $(DL_FROM)/$(THISAPP)-patches/$(PATCH22)
-$(PATCH23).patch = $(DL_FROM)/$(THISAPP)-patches/$(PATCH23)
-$(PATCH24).patch = $(DL_FROM)/$(THISAPP)-patches/$(PATCH24)
-$(PATCH25).patch = $(DL_FROM)/$(THISAPP)-patches/$(PATCH25)
-$(PATCH26).patch = $(DL_FROM)/$(THISAPP)-patches/$(PATCH26)
-$(PATCH27).patch = $(DL_FROM)/$(THISAPP)-patches/$(PATCH27)
-$(PATCH28).patch = $(DL_FROM)/$(THISAPP)-patches/$(PATCH28)
-$(PATCH29).patch = $(DL_FROM)/$(THISAPP)-patches/$(PATCH29)
-$(PATCH30).patch = $(DL_FROM)/$(THISAPP)-patches/$(PATCH30)
-$(PATCH31).patch = $(DL_FROM)/$(THISAPP)-patches/$(PATCH31)
-$(PATCH32).patch = $(DL_FROM)/$(THISAPP)-patches/$(PATCH32)
-$(PATCH33).patch = $(DL_FROM)/$(THISAPP)-patches/$(PATCH33)
-$(PATCH34).patch = $(DL_FROM)/$(THISAPP)-patches/$(PATCH34)
-$(PATCH35).patch = $(DL_FROM)/$(THISAPP)-patches/$(PATCH35)
-$(PATCH36).patch = $(DL_FROM)/$(THISAPP)-patches/$(PATCH36)
-$(PATCH37).patch = $(DL_FROM)/$(THISAPP)-patches/$(PATCH37)
-$(PATCH38).patch = $(DL_FROM)/$(THISAPP)-patches/$(PATCH38)
-$(PATCH39).patch = $(DL_FROM)/$(THISAPP)-patches/$(PATCH39)
-$(PATCH40).patch = $(DL_FROM)/$(THISAPP)-patches/$(PATCH40)
-$(PATCH41).patch = $(DL_FROM)/$(THISAPP)-patches/$(PATCH41)
-$(PATCH42).patch = $(DL_FROM)/$(THISAPP)-patches/$(PATCH42)
-$(PATCH43).patch = $(DL_FROM)/$(THISAPP)-patches/$(PATCH43)
-$(PATCH44).patch = $(DL_FROM)/$(THISAPP)-patches/$(PATCH44)
-$(PATCH45).patch = $(DL_FROM)/$(THISAPP)-patches/$(PATCH45)
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+$(PATCH1) = $(URL_LFS)/$(PKG_NAME)/$(PATCH1)
+$(PATCH08).patch = $(DL_FROM)/$(THISAPP)-patches/$(PATCH08)
-$(DL_FILE)_MD5 = 3fb927c7c33022f1c327f14a81c0d4b0
-$(PATCH1)_MD5 = abae789c2807cb7c7c4c452fa3986f85
-$(PATCH08).patch_MD5 = 24c574bf6d6a581e300823d9c1276af6
-$(PATCH09).patch_MD5 = 4c5835f2fbab36c4292bb334977e5b6d
-$(PATCH10).patch_MD5 = 0a51602b535ef661ee707be6c8bdb373
-$(PATCH11).patch_MD5 = 58deacf3d57cbd75575444ff6a3b0806
-$(PATCH12).patch_MD5 = 72d5059820015231483bb7415d09e9db
-$(PATCH13).patch_MD5 = 608336ebe215984ef126e3c29d2d3409
-$(PATCH14).patch_MD5 = ed19da878e3f630834c62b9d9dcc6fce
-$(PATCH15).patch_MD5 = 2d07daba0b8ca8f876d2aa052ff594b4
-$(PATCH16).patch_MD5 = 53d246537e1fffd1aaa02ba5c056211c
-$(PATCH17).patch_MD5 = 304fd129a58fee2d8a34f8b4704db0aa
-$(PATCH18).patch_MD5 = 6921a0b4228fe89b6537a5c29f027c89
-$(PATCH19).patch_MD5 = 1195d85447f3d048d2c9bcd075fa765c
-$(PATCH20).patch_MD5 = b09000bba08da6ac753124593850cdf7
-$(PATCH21).patch_MD5 = 09d3f96a16b881334cfaee0cf320b47e
-$(PATCH22).patch_MD5 = 597bf71a2aac6feb510b7505cdd3d4f7
-$(PATCH23).patch_MD5 = 3fab459b4e09daea529cacad025b13b3
-$(PATCH24).patch_MD5 = 4ad8d11e72afc6090e701073ff034cf4
-$(PATCH25).patch_MD5 = c7d2493e44490f01dd20bdc8feb0a6a7
-$(PATCH26).patch_MD5 = 9f19c199dd8d1fa9254eebe738759272
-$(PATCH27).patch_MD5 = a6ed82daf034587aee2f2581ba5fe829
-$(PATCH28).patch_MD5 = da9265aa2527fd4a7481baa3e0550287
-$(PATCH29).patch_MD5 = ec444d229e8899fbaaf6fc7de2d82ae6
-$(PATCH30).patch_MD5 = b4bc1c4dc1b508ff9cdfc44f1a5039b5
-$(PATCH31).patch_MD5 = 89390ff6a3c2ef7e09dd4b8b097a8e56
-$(PATCH32).patch_MD5 = eee08003395c417f677d1a4bf8c548ee
-$(PATCH33).patch_MD5 = 2fe070dd6d75d8ff16f269184a16e9c4
-$(PATCH34).patch_MD5 = 4e610506c1711bf3483b965800ac3d5d
-$(PATCH35).patch_MD5 = 7cd9bfdf7cbfd45274d07620ee94c8d9
-$(PATCH36).patch_MD5 = 9c3142956064d175a880bcb186e51ef9
-$(PATCH37).patch_MD5 = c10692f447d4966c879f8fb8d7c8ebc9
-$(PATCH38).patch_MD5 = 9ef3c308cde413e95866c1266cfb4e98
-$(PATCH39).patch_MD5 = cd48f57a404498d4e5c73a3501c4b1a5
-$(PATCH40).patch_MD5 = 00a2371b6c05acbfce6bc850c6d982f8
-$(PATCH41).patch_MD5 = 7bc4942a66ca4024ee964db7ede07896
-$(PATCH42).patch_MD5 = 1cf7701017ebfc8e129de92c8f8b798c
-$(PATCH43).patch_MD5 = 9e61168fca692d8d1a733c389a63712e
-$(PATCH44).patch_MD5 = b4b11d64b45ea9ec50dcc74c6c3861f6
-$(PATCH45).patch_MD5 = 1661bcc83c4715f54368877452ff2247
+$(DL_FILE)_MD5 = 81348932d5da294953e15d4814c74dd1
+$(PATCH1)_MD5 = abae789c2807cb7c7c4c452fa3986f85
+$(PATCH08).patch_MD5 = 24c574bf6d6a581e300823d9c1276af6
-
install : $(TARGET)
check : $(patsubst %,$(DIR_CHK)/%,$(objects))
@@ -239,17 +88,14 @@
$(TARGET) : $(firstword $(MAKEFILE_LIST)) $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && patch -p1 -i $(DIR_DL)/$(PATCH1)
+
+ # No patches yet, leave mechanism for future
+ #cd $(DIR_APP) && patch -p1 -i $(DIR_DL)/$(PATCH1)
# For patch numbers with leading 00
- cd $(DIR_APP) && patch -p0 -i $(DIR_DL)/$(PATCH08).patch
- cd $(DIR_APP) && patch -p0 -i $(DIR_DL)/$(PATCH09).patch
- # Ubuntu lucid bash version 4.1.5(1) do nothing with $(seq 10 36), use
instead ``.
+ #cd $(DIR_APP) && patch -p0 -i $(DIR_DL)/$(PATCH08).patch
# Same bash version doesn't like the variable evaluation, use a
separate patch var
- cd $(DIR_APP) && for nb in `seq 10 45`; do
patch="$(DIR_DL)/$(PKG_NAME)42-0$$nb.patch";echo "using $$patch"; patch -p0 -i
$$patch; done
+ #cd $(DIR_APP) && for nb in `seq 10 45`; do
patch="$(DIR_DL)/$(PKG_NAME)42-0$$nb.patch";echo "using $$patch"; patch -p0 -i
$$patch; done
- # Fix not a string literal and no format arguments, debian borrowed
- cd $(DIR_APP) && patch -p2 -i
$(DIR_PATCHES)/$(PKG_NAME)-4.1_hardening-formatstring.patch
-
# In bash-3.2, configure and configure.in are patched in that order
# if they are not in the same second, autoconf is called.
# Toolchain compilation fail if autoconf is not available on the
building machine
Deleted: ipcop/trunk/src/patches/bash-4.1_hardening-formatstring.patch
===================================================================
--- ipcop/trunk/src/patches/bash-4.1_hardening-formatstring.patch
2014-03-21 21:26:50 UTC (rev 7356)
+++ ipcop/trunk/src/patches/bash-4.1_hardening-formatstring.patch
2014-03-21 21:30:59 UTC (rev 7357)
@@ -1,15 +0,0 @@
-Author: Pierre Chifflier
-Description: Fix build error with -Werror=format-security hardening flag.
-
-diff -ruN bash-4.1.orig/print_cmd.c bash-4.1/print_cmd.c
---- a/bash/print_cmd.c 2009-09-16 21:32:26.000000000 +0200
-+++ b/bash/print_cmd.c 2011-09-16 11:38:40.000000000 +0200
-@@ -1374,7 +1374,7 @@
- for (i = 0; amount > 0; amount--)
- indentation_string[i++] = ' ';
- indentation_string[i] = '\0';
-- cprintf (indentation_string);
-+ cprintf ("%s", indentation_string);
- }
-
- static void
Modified: ipcop/trunk/updates/2.1.3/ROOTFILES.i486-2.1.3
===================================================================
--- ipcop/trunk/updates/2.1.3/ROOTFILES.i486-2.1.3 2014-03-21 21:26:50 UTC
(rev 7356)
+++ ipcop/trunk/updates/2.1.3/ROOTFILES.i486-2.1.3 2014-03-21 21:30:59 UTC
(rev 7357)
@@ -30,6 +30,10 @@
/usr/lib/perl5/site_perl/5.14.2/Archive/Zip/Tree.pm
/usr/lib/perl5/site_perl/5.14.2/Archive/Zip/ZipFileMember.pm
##
+## bash-4.3
+/bin/bash
+/bin/sh
+##
## bind-9.9.5
/usr/bin/dig
/usr/bin/host
Modified: ipcop/trunk/updates/2.1.3/information.xml
===================================================================
--- ipcop/trunk/updates/2.1.3/information.xml 2014-03-21 21:26:50 UTC (rev
7356)
+++ ipcop/trunk/updates/2.1.3/information.xml 2014-03-21 21:30:59 UTC (rev
7357)
@@ -6,7 +6,7 @@
<isoimages>no</isoimages>
<description>Language updates.<br />
Add harfbuzz.<br />
- Upgrade apcid to 2.0.22, Archive-Zip to 1.37, bind to 9.9.5, cairo to
1.12.16, coreutils to 8.22,
+ Upgrade apcid to 2.0.22, Archive-Zip to 1.37, bash to 4.3, bind to
9.9.5, cairo to 1.12.16, coreutils to 8.22,
db to 6.0.30, e2fsprogs to 1.42.9, ethtool to 3.13,
fcron to 3.1.2, freetype to 2.5.3, glib to 2.38.2, gnupg to 1.4.16,
iproute2 to 3.12.0, libgcrypt to 1.6.1, libgpg-error to 1.12, libnl to
3.2.24, libpng to 1.6.10, logrotate to 3.8.7,
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Learn Graph Databases - Download FREE O'Reilly Book
"Graph Databases" is the definitive new guide to graph databases and their
applications. Written by three acclaimed leaders in the field,
this first edition is now available. Download your free book today!
http://p.sf.net/sfu/13534_NeoTech
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
