Revision: 7804
http://sourceforge.net/p/ipcop/svn/7804
Author: owes
Date: 2015-01-09 11:06:20 +0000 (Fri, 09 Jan 2015)
Log Message:
-----------
Megre latest trunk changes
Modified Paths:
--------------
ipcop/branches/toolchain/config/rootfiles/common/bash
ipcop/branches/toolchain/config/rootfiles/common/gawk
ipcop/branches/toolchain/lfs/bash
ipcop/branches/toolchain/lfs/gawk
ipcop/branches/toolchain/lfs/openssl
ipcop/branches/toolchain/make.sh
ipcop/branches/toolchain/updates/2.1.8/ROOTFILES.i486-2.1.8
ipcop/branches/toolchain/updates/2.1.8/information.xml
Property Changed:
----------------
ipcop/branches/toolchain/
Index: ipcop/branches/toolchain
===================================================================
--- ipcop/branches/toolchain 2015-01-09 11:04:08 UTC (rev 7803)
+++ ipcop/branches/toolchain 2015-01-09 11:06:20 UTC (rev 7804)
Property changes on: ipcop/branches/toolchain
___________________________________________________________________
Modified: svn:mergeinfo
## -1,2 +1,2 ##
/ipcop/tags/release-2.0.3:6791-6796,6799-6804
-/ipcop/trunk:7773-7798
+/ipcop/trunk:7773-7803
\ No newline at end of property
Modified: ipcop/branches/toolchain/config/rootfiles/common/bash
===================================================================
--- ipcop/branches/toolchain/config/rootfiles/common/bash 2015-01-09
11:04:08 UTC (rev 7803)
+++ ipcop/branches/toolchain/config/rootfiles/common/bash 2015-01-09
11:06:20 UTC (rev 7804)
@@ -1,8 +1,8 @@
## bash-4.2 (we cheat for sh and bash here)
##
bin/bash
+#bin/bashbug
bin/sh
-#usr/share/info/bash.info
#usr/share/doc/bash
#usr/share/doc/bash/CHANGES
#usr/share/doc/bash/COMPAT
@@ -14,3 +14,6 @@
#usr/share/doc/bash/README
#usr/share/doc/bash/bash.html
#usr/share/doc/bash/bashref.html
+#usr/share/info/bash.info
+#usr/share/man/man1/bash.1
+#usr/share/man/man1/bashbug.1
Modified: ipcop/branches/toolchain/config/rootfiles/common/gawk
===================================================================
--- ipcop/branches/toolchain/config/rootfiles/common/gawk 2015-01-09
11:04:08 UTC (rev 7803)
+++ ipcop/branches/toolchain/config/rootfiles/common/gawk 2015-01-09
11:06:20 UTC (rev 7804)
@@ -1,10 +1,7 @@
usr/bin/awk
-#usr/bin/dgawk
usr/bin/gawk
-#usr/bin/gawk-4.0.2
+#usr/bin/gawk-4.1.1
#usr/bin/igawk
-#usr/bin/pgawk
-#usr/bin/pgawk-4.0.2
#usr/lib/awk
#usr/lib/awk/grcat
#usr/lib/awk/pwcat
@@ -17,6 +14,7 @@
#usr/share/awk/getopt.awk
#usr/share/awk/gettime.awk
#usr/share/awk/group.awk
+#usr/share/awk/inplace.awk
#usr/share/awk/join.awk
#usr/share/awk/libintl.awk
#usr/share/awk/noassign.awk
@@ -24,6 +22,7 @@
#usr/share/awk/passwd.awk
#usr/share/awk/quicksort.awk
#usr/share/awk/readable.awk
+#usr/share/awk/readfile.awk
#usr/share/awk/rewind.awk
#usr/share/awk/round.awk
#usr/share/awk/strtonum.awk
Modified: ipcop/branches/toolchain/lfs/bash
===================================================================
--- ipcop/branches/toolchain/lfs/bash 2015-01-09 11:04:08 UTC (rev 7803)
+++ ipcop/branches/toolchain/lfs/bash 2015-01-09 11:06:20 UTC (rev 7804)
@@ -34,6 +34,9 @@
PKG_NAME = bash
VER = 4.3
+# Unfortunately need to manually add individual patches in several places.
+# PATCHLEVEL for version comparing only.
+PATCHLEVEL = 4.3.33
HOST_ARCH = all
OTHER_SRC = yes
@@ -51,13 +54,17 @@
PATCH28 = $(PKG_NAME)43-028
PATCH29 = $(PKG_NAME)43-029
PATCH30 = $(PKG_NAME)43-030
+PATCH31 = $(PKG_NAME)43-031
+PATCH32 = $(PKG_NAME)43-032
+PATCH33 = $(PKG_NAME)43-033
###############################################################################
# Top-level Rules
###############################################################################
objects = $(DL_FILE) \
$(PATCH1) \
- $(PATCH25).patch $(PATCH26).patch $(PATCH27).patch $(PATCH28).patch
$(PATCH29).patch $(PATCH30).patch
+ $(PATCH25).patch $(PATCH26).patch $(PATCH27).patch $(PATCH28).patch
$(PATCH29).patch \
+ $(PATCH30).patch $(PATCH31).patch $(PATCH32).patch $(PATCH33).patch
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
@@ -68,6 +75,9 @@
$(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)
$(DL_FILE)_MD5 = 81348932d5da294953e15d4814c74dd1
$(PATCH1)_MD5 = 3266ce3d2f0aa647d4ef068e46899246
@@ -77,6 +87,9 @@
$(PATCH28).patch_MD5 = dd51fa67913b5dca45a702b672b3323f
$(PATCH29).patch_MD5 = 0729364c977ef4271e9f8dfafadacf67
$(PATCH30).patch_MD5 = efb709fdb1368945513de23ccbfae053
+$(PATCH31).patch_MD5 = 236df1ac1130a033ed0dbe2d2115f28f
+$(PATCH32).patch_MD5 = 2360f7e79cfb28526f80021025ea5909
+$(PATCH33).patch_MD5 = b551c4ee7b8713759e4143499d0bbd48
install : $(TARGET)
@@ -111,7 +124,7 @@
cd $(DIR_APP) && patch -p1 -i $(DIR_DL)/$(PATCH1)
# For patches directly from GNU bash
# Same bash version doesn't like the variable evaluation, use a
separate patch var
- cd $(DIR_APP) && for nb in `seq 25 30`; do
patch="$(DIR_DL)/$(PKG_NAME)43-0$$nb.patch";echo "using $$patch"; patch -p0 -i
$$patch; done
+ cd $(DIR_APP) && for nb in `seq 25 33`; do
patch="$(DIR_DL)/$(PKG_NAME)43-0$$nb.patch";echo "using $$patch"; patch -p0 -i
$$patch; done
# In bash-3.2, configure and configure.in are patched in that order
# if they are not in the same second, autoconf is called.
Modified: ipcop/branches/toolchain/lfs/gawk
===================================================================
--- ipcop/branches/toolchain/lfs/gawk 2015-01-09 11:04:08 UTC (rev 7803)
+++ ipcop/branches/toolchain/lfs/gawk 2015-01-09 11:06:20 UTC (rev 7804)
@@ -33,7 +33,7 @@
include Config
PKG_NAME = gawk
-VER = 4.0.2
+VER = 4.1.1
HOST_ARCH = all
OTHER_SRC = yes
@@ -49,9 +49,9 @@
objects = $(DL_FILE)
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 8a9b2f1170ac9dcd3eb13716b5ec4021
+$(DL_FILE)_MD5 = a2a26543ce410eb74bc4a508349ed09a
install : $(TARGET)
@@ -85,16 +85,18 @@
ifeq "$(STAGE)" "toolchain"
# use --disable-nls just to be smaller
- cd $(DIR_APP) && ./configure --prefix=/$(TOOLS_DIR) --disable-nls
+ cd $(DIR_APP) && ./configure --prefix=/$(TOOLS_DIR) \
+ --disable-nls --without-mpfr
cd $(DIR_APP) && make -j $(PARALLELISM)
endif
ifeq "$(STAGE)" "base"
- cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls
--libexecdir=/usr/lib
+ cd $(DIR_APP) && ./configure --prefix=/usr --libexecdir=/usr/lib \
+ --disable-nls --without-mpfr
cd $(DIR_APP) && make -j $(PARALLELISM)
ifeq "$(RUNNING_TEST)" "yes"
# no test should fail
- cd $(DIR_APP) && make check &> $(DIR_TEST)/$(THISAPP)-$(STAGE_ORDER).log
+ -cd $(DIR_APP) && make check &>
$(DIR_TEST)/$(THISAPP)-$(STAGE_ORDER).log
endif
endif
Modified: ipcop/branches/toolchain/lfs/openssl
===================================================================
--- ipcop/branches/toolchain/lfs/openssl 2015-01-09 11:04:08 UTC (rev
7803)
+++ ipcop/branches/toolchain/lfs/openssl 2015-01-09 11:06:20 UTC (rev
7804)
@@ -33,7 +33,7 @@
include Config
PKG_NAME = openssl
-VER = 1.0.1j
+VER = 1.0.1k
HOST_ARCH = all
OTHER_SRC = yes
@@ -51,7 +51,7 @@
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = f7175c9cd3c39bb1907ac8bba9df8ed3
+$(DL_FILE)_MD5 = d4f002bd22a56881340105028842ae1f
install : $(TARGET)
Modified: ipcop/branches/toolchain/make.sh
===================================================================
--- ipcop/branches/toolchain/make.sh 2015-01-09 11:04:08 UTC (rev 7803)
+++ ipcop/branches/toolchain/make.sh 2015-01-09 11:06:20 UTC (rev 7804)
@@ -711,7 +711,7 @@
#########################################################################################################
get_pkg_ver()
{
- if echo ${1} | grep -q "lfs/linux$" ; then
+ if grep -q "^PATCHLEVEL" ${1} ; then
PKG_VER=`grep ^PATCHLEVEL ${1} | awk '{print $3}'`
else
PKG_VER=`grep ^VER ${1} | awk '{print $3}'`
@@ -2459,14 +2459,10 @@
# Listed as Xz Utils in LFS
PKG_LFS=`echo ${LINE} | cut -d"
" -f3`
fi
- if [ x"${PKG_NAME}" == x"linux" ]; then
- PKG_IPCOP=`grep ^PATCHLEVEL
${BASEDIR}/lfs/${PKG_NAME}|awk '{print $3}'`
- else
- PKG_IPCOP=`grep ^VER
${BASEDIR}/lfs/${PKG_NAME} | awk '{print $3}'`
- fi
+ get_pkg_ver ${BASEDIR}/lfs/${PKG_NAME}
- check_version "${PKG_NAME}" ${PKG_LFS}
${PKG_IPCOP}
- unset PKG_NAME PKG_LFS PKG_IPCOP
+ check_version "${PKG_NAME}" ${PKG_LFS}
${PKG_VER}
+ unset PKG_NAME PKG_LFS PKG_VER
fi
done
@@ -2488,15 +2484,11 @@
if [ -f "${BASEDIR}/lfs/${PKG_NAME}" ]; then
IFS= read -r LINE
PKG_DISTRO=`echo ${LINE} | sed -e
's#.*">\(.*\)<\/a.*#\1#g'`
- if [ x"${PKG_NAME}" == x"linux" ]; then
- PKG_IPCOP=`grep ^PATCHLEVEL
${BASEDIR}/lfs/${PKG_NAME}|awk '{print $3}'`
- else
- PKG_IPCOP=`grep ^VER ${BASEDIR}/lfs/${PKG_NAME} |
awk '{print $3}'`
- fi
+ get_pkg_ver ${BASEDIR}/lfs/${PKG_NAME}
- check_version "${PKG_NAME}" ${PKG_DISTRO} ${PKG_IPCOP}
+ check_version "${PKG_NAME}" ${PKG_DISTRO} ${PKG_VER}
fi
- unset PKG_NAME PKG_DISTRO PKG_IPCOP
+ unset PKG_NAME PKG_DISTRO PKG_VER
fi
done
Modified: ipcop/branches/toolchain/updates/2.1.8/ROOTFILES.i486-2.1.8
===================================================================
--- ipcop/branches/toolchain/updates/2.1.8/ROOTFILES.i486-2.1.8 2015-01-09
11:04:08 UTC (rev 7803)
+++ ipcop/branches/toolchain/updates/2.1.8/ROOTFILES.i486-2.1.8 2015-01-09
11:06:20 UTC (rev 7804)
@@ -17,6 +17,9 @@
/usr/lib/libapr-1.so.0
/usr/lib/libapr-1.so.0.5.1
##
+## bash-4.3.33
+/bin/bash
+##
## bind-9.10.1-P1
/usr/bin/dig
/usr/bin/host
@@ -55,6 +58,10 @@
/usr/lib/libfreetype.so.6
/usr/lib/libfreetype.so.6.11.4
##
+## gawk-4.1.1
+/usr/bin/awk
+/usr/bin/gawk
+##
## grep-2.21
/bin/grep
##
@@ -114,6 +121,14 @@
/usr/lib/libldap-2.4.so.2
/usr/lib/libldap-2.4.so.2.10.3
##
+## openssl-1.0.1k
+/usr/bin/openssl
+/usr/lib/engines/libpadlock.so
+/usr/lib/libcrypto.so
+/usr/lib/libcrypto.so.1.0.0
+/usr/lib/libssl.so
+/usr/lib/libssl.so.1.0.0
+##
## openvpn-2.3.6
/usr/sbin/openvpn
##
Modified: ipcop/branches/toolchain/updates/2.1.8/information.xml
===================================================================
--- ipcop/branches/toolchain/updates/2.1.8/information.xml 2015-01-09
11:04:08 UTC (rev 7803)
+++ ipcop/branches/toolchain/updates/2.1.8/information.xml 2015-01-09
11:06:20 UTC (rev 7804)
@@ -5,11 +5,12 @@
<size>0</size>
<isoimages>no</isoimages>
<description>
- Upgrade acpid to 2.0.23, apache to 2.2.29, bind to 9.10.1-P1, cairo to
1.14.0, db to 6.1.19, dhcpcd to 6.6.7,
- ethtool to 3.16, fontconfig to 2.11.1, freetype to 2.5.5, grep to 2.21,
+ Upgrade acpid to 2.0.23, apache to 2.2.29, bash to 4.3.33, bind to
9.10.1-P1,
+ cairo to 1.14.0, db to 6.1.19, dhcpcd to 6.6.7, ethtool to 3.16,
+ fontconfig to 2.11.1, freetype to 2.5.5, gawk to 4.1.1, grep to 2.21,
harfbuzz to 0.9.37, hdparm to 9.45, iproute2 to 3.18.0, iw to 3.17,
krb5 to 1.12.2,
libpcap to 1.6.2, libpng to 1.6.16, libxml2 to 2.9.2, lsof to 4.88,
- ntp to 4.2.8, openvpn to 2.3.6, openldap to 2.4.40,
+ ntp to 4.2.8, openssl to 1.0.1k, openvpn to 2.3.6, openldap to 2.4.40,
pango to 1.36.8, pciutils to 3.3.0, pcre to 8.36, pixman to 0.32.6,
procps to 3.3.10,
rrdtool to 1.4.9, smartmontools to 6.3, sqlite to 3.8.7.2, squid to
3.4.10, squid-langpack to 20141030,
tar to 1.28, tcpdump to 4.6.2, traceroute to 2.0.21,
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Dive into the World of Parallel Programming! The Go Parallel Website,
sponsored by Intel and developed in partnership with Slashdot Media, is your
hub for all things parallel software development, from weekly thought
leadership blogs to news, videos, case studies, tutorials and more. Take a
look and join the conversation now. http://goparallel.sourceforge.net
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
