ipcop-svn Mailing List for IPCop Firewall

Revision: 6203
          http://ipcop.svn.sourceforge.net/ipcop/?rev=6203&view=rev
Author:   gespinasse
Date:     2011-12-29 21:40:57 +0000 (Thu, 29 Dec 2011)
Log Message:
-----------
Fix detection of libc.so.6* and libc.a on Ubuntu Natty and later

Modified Paths:
--------------
    ipcop/trunk/make.sh

Modified: ipcop/trunk/make.sh
===================================================================
--- ipcop/trunk/make.sh	2011-12-28 20:41:49 UTC (rev 6202)
+++ ipcop/trunk/make.sh	2011-12-29 21:40:57 UTC (rev 6203)
@@ -1223,17 +1223,20 @@
 		SUCCESS=$[ ${SUCCESS} - 1 ]
 	fi
 
-	check_version "GNU libc" ${REQUIRED_GLIBC} `/lib/libc.so.6* | head -n1 | sed "s,.*version \([0-9]*\.[0-9]*\).*$,\1,g"`
+	# run first libc found, another match if any, is given as parameter to the first and ignored
+	# 2>/dev/null hide empty path that may happen (at least on 32-bits host)
+	check_version "GNU libc" ${REQUIRED_GLIBC} $($(find /lib /lib64 -name libc.so.6* 2>/dev/null) | head -n1 | sed "s,.*version \([0-9]*\.[0-9]*\).*$,\1,g")
 	RESULT=${?}
 	SUCCESS=$[ ${SUCCESS} - ${RESULT} ]
 	report_result ${RESULT}
-	echo -n "Checking static /usr/lib/glibc.a"
-	if [ -f /usr/lib/libc.a -o -f /usr/lib64/libc.a ]; then
+	echo -n "Checking static libc.a found on /usr/lib"
+	# Contrary to LFS, a static libc is needed to compile a portable toolchain (with a static ccache)
+	if ( find /usr/lib -name libc.a > /dev/null 2>&1); then
 		beautify message DONE
 	else
 		beautify message FAIL
 		SUCCESS=$[ ${SUCCESS} - 1 ]
-		echo " missing /usr/lib/glibc.a, install a glibc-static package" | tee -a ${LOGFILE}
+		echo " missing libc.a, install a glibc-static package" | tee -a ${LOGFILE}
 	fi
 
 	if bash +h -c "type grep" > /dev/null 2>&1; then

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6202
          http://ipcop.svn.sourceforge.net/ipcop/?rev=6202&view=rev
Author:   gespinasse
Date:     2011-12-28 20:41:49 +0000 (Wed, 28 Dec 2011)
Log Message:
-----------
Trusted too much the inacurate dev/ comment, when in fact it was dev/console and dev/null
Fix that

Modified Paths:
--------------
    ipcop/trunk/config/rootfiles/common/stage2
    ipcop/trunk/lfs/stage2

Modified: ipcop/trunk/config/rootfiles/common/stage2
===================================================================
--- ipcop/trunk/config/rootfiles/common/stage2	2011-12-28 20:30:57 UTC (rev 6201)
+++ ipcop/trunk/config/rootfiles/common/stage2	2011-12-28 20:41:49 UTC (rev 6202)
@@ -1,5 +1,6 @@
 #boot
-dev
+dev/console
+dev/null
 #etc
 etc/certparams
 etc/dhcpcd.conf

Modified: ipcop/trunk/lfs/stage2
===================================================================
--- ipcop/trunk/lfs/stage2	2011-12-28 20:30:57 UTC (rev 6201)
+++ ipcop/trunk/lfs/stage2	2011-12-28 20:41:49 UTC (rev 6202)
@@ -152,6 +152,6 @@
 	# Here stage2 rootfile is hacked, so no manual change is needed
 	# Cheat : pretend /dev, /proc and /sys are created here, when in fact they are already mounted before stage2 start
 	# Can't simply suppress them after PREBUILD as /dev, /proc and /sys are excluded from FIND_FILES path
-	grep '^dev$$' $(TARGET) || sed -i -e 's|#boot|&\ndev|;s|mnt|&\nproc|;s|#sbin|&\nsys|' $(TARGET)
+	grep '^dev/console$$' $(TARGET) || sed -i -e 's|#boot|&\ndev/console|;s|#boot|&\ndev/null|;s|mnt|&\nproc|;s|#sbin|&\nsys|' $(TARGET)
 	# Cheat : pretend bin/{cat,echo,pwd}, usr/{bin/perl,lib/libgcc_s.so*,lib/libstdc++.so* are not installed here (only as symlink here, replaced later)
 	sed -i 	-e '/bin\/cat$$/d;/bin\/echo$$/d;/bin\/pwd$$/d;/usr\/bin\/perl$$/d;/usr\/lib\/libgcc_s.so.*/d;/usr\/lib\/libstdc++.so.*/d' $(TARGET)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6201
          http://ipcop.svn.sourceforge.net/ipcop/?rev=6201&view=rev
Author:   gespinasse
Date:     2011-12-28 20:30:57 +0000 (Wed, 28 Dec 2011)
Log Message:
-----------
No more need of black magic when updating stage2 rootfile.

lfs/stage2 has needed hack that create stage2 rootfile without manual change required
- /dev, /proc and /sys look installed here (they need to appear somewhere to be include in iso)
- symlinks made here are not referenced on rootfile (bin/{cat,echo,pwd}, usr/{bin/perl,lib/libgcc_s.so*,lib/libstdc++.so*)
 So a file should not appear more than once in rootfile, there is no enforcement on that rule, just try  to be cleaner

Modified Paths:
--------------
    ipcop/trunk/config/rootfiles/common/stage2
    ipcop/trunk/lfs/stage2

Modified: ipcop/trunk/config/rootfiles/common/stage2
===================================================================
--- ipcop/trunk/config/rootfiles/common/stage2	2011-12-27 22:34:24 UTC (rev 6200)
+++ ipcop/trunk/config/rootfiles/common/stage2	2011-12-28 20:30:57 UTC (rev 6201)
@@ -1,8 +1,5 @@
-## stage2, we cheat for /dev, /proc and /sys here
-##
 #boot
-dev/console
-dev/null
+dev
 #etc
 etc/certparams
 etc/dhcpcd.conf
@@ -38,15 +35,10 @@
 #sbin
 sys
 #usr/bin
-#usr/bin/perl
 #usr/doc
 #usr/include
 #usr/info
 #usr/lib
-#usr/lib/libgcc_s.so
-#usr/lib/libgcc_s.so.1
-#usr/lib/libstdc++.so
-#usr/lib/libstdc++.so.6
 #usr/local
 #usr/local/bin
 #usr/local/bin/install-diff.pl

Modified: ipcop/trunk/lfs/stage2
===================================================================
--- ipcop/trunk/lfs/stage2	2011-12-27 22:34:24 UTC (rev 6200)
+++ ipcop/trunk/lfs/stage2	2011-12-28 20:30:57 UTC (rev 6201)
@@ -149,3 +149,9 @@
 	env
 
 	@$(POSTBUILD)
+	# Here stage2 rootfile is hacked, so no manual change is needed
+	# Cheat : pretend /dev, /proc and /sys are created here, when in fact they are already mounted before stage2 start
+	# Can't simply suppress them after PREBUILD as /dev, /proc and /sys are excluded from FIND_FILES path
+	grep '^dev$$' $(TARGET) || sed -i -e 's|#boot|&\ndev|;s|mnt|&\nproc|;s|#sbin|&\nsys|' $(TARGET)
+	# Cheat : pretend bin/{cat,echo,pwd}, usr/{bin/perl,lib/libgcc_s.so*,lib/libstdc++.so* are not installed here (only as symlink here, replaced later)
+	sed -i 	-e '/bin\/cat$$/d;/bin\/echo$$/d;/bin\/pwd$$/d;/usr\/bin\/perl$$/d;/usr\/lib\/libgcc_s.so.*/d;/usr\/lib\/libstdc++.so.*/d' $(TARGET)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6200
          http://ipcop.svn.sourceforge.net/ipcop/?rev=6200&view=rev
Author:   gespinasse
Date:     2011-12-27 22:34:24 +0000 (Tue, 27 Dec 2011)
Log Message:
-----------
As a now faster check_files is run on each build, remove ./make.sh check_files option

Use ALL_NODIR as the start list to run check all files md5
Use xargs md5sum as much faster than starting md5sum for each file

Run scanelf only once with all features check, we will split interesting informations later with awk
Produce with awk and grep -v a log for
-not-PIE files
-not-NOW files
files with RPATH
files with executable-stack
files installed already stripped

Add a check for 'No such file or directory' on configure.log

Sort warnings count per package on decreasing order

Modified Paths:
--------------
    ipcop/trunk/doc/make.sh-usage
    ipcop/trunk/lfs/check_files
    ipcop/trunk/make.sh

Modified: ipcop/trunk/doc/make.sh-usage
===================================================================
--- ipcop/trunk/doc/make.sh-usage	2011-12-27 22:13:18 UTC (rev 6199)
+++ ipcop/trunk/doc/make.sh-usage	2011-12-27 22:34:24 UTC (rev 6200)
@@ -21,7 +21,6 @@
 check_versions: Compare the versions of packages used in LFS and IPCop
          dist : Mainly produce a diff from previous version to track wich
 		files have been updated. Export IPCop sources in a .tgz
-  check_files : Calculate md5 of include files, check various ELF properties
      othersrc : Build a .tgz with all source packages necessary to compile
     toolchain : Create our own toolchain package to speed next rebuild
      language : Search for all lang entries in source, get translations from 

Modified: ipcop/trunk/lfs/check_files
===================================================================
--- ipcop/trunk/lfs/check_files	2011-12-27 22:13:18 UTC (rev 6199)
+++ ipcop/trunk/lfs/check_files	2011-12-27 22:34:24 UTC (rev 6200)
@@ -30,16 +30,16 @@
 # Definitions
 ###############################################################################
 
+include Config
+
 PKG_NAME   = check_files
 HOST_ARCH  = all
 
 THISAPP    = $(PKG_NAME)
 
-ALLFILES  := ${NAME}-${VERSION}-all-files-list.${MACHINE}.txt
+TMPFILE := $(shell mktemp)
+LOG_PREFIX:= /usr/src/log_${MACHINE}/$(PKG_NAME)
 
-# where we find ELF exec code to check
-EXEC_PATH  := /{bin,sbin} /lib/{,iptables,udev} /usr/{bin,lib,libexec,local,sbin} /etc/Conexant
-
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -58,37 +58,45 @@
 # Produce the md5 of installed files
 install :
 
-	echo "Generating md5 for each file include in $(NAME)" >> $(LOGFILE)
-	-mv -f /usr/src/doc/${ALLFILES}.md5 /usr/src/doc/${ALLFILES}.md5.bak
-	# remove dev/console (and dev/null) from the list or md5sum hang
-	# skip directories to avoid error message and don't care of symlink
-	for myfile in `cat /usr/src/doc/${ALLFILES} | sed 's|^dev.*||'`; do \
-		if [ -f /$${myfile} ]; then \
-			md5sum /$$myfile >> /usr/src/doc/${ALLFILES}.md5; \
-		fi; \
-	done
+	# Adjust the list of files we care
+	# Remove dev/{,console,null} from the list or md5sum hang
+	# Use the list with directories removed to avoid md5sum and scanelf related error messages
+	sed -e '/^dev.*/d' ${ALL_NODIR} >${TMPFILE}
 
-	# TEXTEREL
-	cd / && find ${EXEC_PATH} -type f -exec scanelf -qt {} \; > /usr/src/log_${MACHINE}/$(PKG_NAME)-textrel.log
+	# Generating md5 for each file include
+	# Result is not in _NODIR.md5 as tools/comp_md5.pl look in ALLFILES
+	xargs md5sum < ${TMPFILE} > ${ALLFILES}.md5
 
+	# Checking everything with scanelf only once is faster, but result is not that easy to read
+	# A bit better with those changes : remove trailing space, split STK/REL/PTL title in 3 columns, replace one or more spaces with 1 tab
+	scanelf -f ${TMPFILE} -a | sed -e 's| *$$||' -e 's|STK/REL/PTL|STK REL PTL|' -e 's| TYPE|TYPE|' -e 's| \{1,\}|\t|g' > $(LOG_PREFIX)-scanelf.log
+
+	cat $(LOG_PREFIX)-scanelf.log | awk '{ printf "%s\t%s\n", $$1, $$11 }' | grep -v ET_DYN > $(LOG_PREFIX)-not-PIE.log
+	cat $(LOG_PREFIX)-scanelf.log | awk '{ printf "%s\t%s\n", $$10, $$11 }' | grep -v NOW > $(LOG_PREFIX)-not-NOW.log
 	# RPATH (I consider log good enought to my understanding)
-	cd / && find ${EXEC_PATH} -type f -exec scanelf -qr {} \; > /usr/src/log_${MACHINE}/$(PKG_NAME)-rpath.log
+	cat $(LOG_PREFIX)-scanelf.log | awk '{ printf "%s\t%s\n", $$9, $$11 }' | grep -v "\-\t" > $(LOG_PREFIX)-RPATH.log
 
 	# executable stack	http://www.gentoo.org/proj/en/hardened/gnu-stack.xml
-	cd / && find ${EXEC_PATH} -type f -exec scanelf -qe {} \; > /usr/src/log_${MACHINE}/$(PKG_NAME)-executable-stack.log
+	# klibc related code is compiled without hardening (to save space) and allow execstack, but that code is not installed, so not checked on ALL_NODIR
+	cat $(LOG_PREFIX)-scanelf.log | awk '{ printf "%s\t%s\n", $$5, $$11 }' | grep -v 'RW-' > $(LOG_PREFIX)-execstack.log
 
+	# check already stripped code (that may drive to lib reduction failure for initramfs with mklibs)
+	scanelf -k '!.symtab' -f ${TMPFILE} -q -F%F#k > $(LOG_PREFIX)-stripped.log
+
+	# Our modified gcc is made to stop on TEXTEREL, so no need to check that
+
 	# TODO
-	# check not-pie code
-	# check already stripped code (that drive to lib reduction failure for initramfs with mklibs)
 	# check for old hash (not using our LDFLAG), probably just matter for size if we have both
 
+	rm ${TMPFILE} ${ALL_NODIR}
+
 	# find warnings and count them, configure emit WARNING, perl Makefile.PL emit Warning
-	-cd /usr/src/log_${MACHINE} && egrep ': WARNING:|Warning:' 0[1-4]*/* >/usr/src/log_${MACHINE}/$(PKG_NAME)-configure_warnings.log
+	-cd /usr/src/log_${MACHINE} && egrep ' error:|No such file or|: WARNING:|Warning:' 0[1-4]*/* >/usr/src/log_${MACHINE}/$(PKG_NAME)-configure_warnings.log
 	-cd /usr/src/log_${MACHINE} && grep ': warning:' 0[1-4]*/* >/usr/src/log_${MACHINE}/$(PKG_NAME)-compilation_warnings_all.log
 	-cd /usr/src/log_${MACHINE} && \
 		for f in $$(ls 0[1-4]*/*); do \
 			[ -f $$f ] && echo -ne "$$f :\t";grep ': warning:' $$f | wc -l; \
-		done >/usr/src/log_${MACHINE}/$(PKG_NAME)-compilation-warnings_per_package_count.log
+		done | sort -k 3,3nr >/usr/src/log_${MACHINE}/$(PKG_NAME)-compilation-warnings_per_package_count.log
 	# remove lucky 0 warnings from the list
 	-sed -i '/\t0$$/d' /usr/src/log_${MACHINE}/$(PKG_NAME)-compilation-warnings_per_package_count.log
 

Modified: ipcop/trunk/make.sh
===================================================================
--- ipcop/trunk/make.sh	2011-12-27 22:13:18 UTC (rev 6199)
+++ ipcop/trunk/make.sh	2011-12-27 22:34:24 UTC (rev 6200)
@@ -2290,30 +2290,6 @@
 	echo
 	echo "Verify the release 'marker' in doc/ChangeLog and commit doc/ChangeLog to update SVN"
 	;;
-check_files)
-	# Check if we have yet build
-	if [ ! -f ${BASEDIR}/doc/${NAME}-${VERSION}-all-files-list.${MACHINE}.txt ]; then
-		beautify message FAIL "${NAME}-${VERSION}-all-files-list.${MACHINE}.txt not found, you need to build first"
-		exit 1
-	fi
-	if [ ! -d ${BASEDIR}/log_${MACHINE}/05_packages ]; then
-		beautify message FAIL "log_${MACHINE}/05_packages not found, you need to build first"
-		exit 1
-	fi
-	prepareenv
-	export PATH=${PATH_CH6}
-	STAGE_ORDER=05; STAGE=packages # needed for logfile name
-	chroot_make check_files
-	if [ -f ${BASEDIR}/doc/${NAME}-${PREVIOUSVERSION}-all-files-list.${MACHINE}.txt.md5 ]; then
-		echo -ne "Running MD5 compare"
-		${BASEDIR}/tools/comp_md5.pl ${BASEDIR} ${VERSION} ${PREVIOUSVERSION} ${MACHINE} ${KVER} ${PERLVER} ${VERSIONSTEP}
-		beautify message DONE
-		echo "See ${BASEDIR}/doc/${NAME}-${VERSION}-diff-list.${MACHINE}.txt for result"
-	else
-		beautify message INFO "No MD5 all-files-list for ${PREVIOUSVERSION} found, no comparison."
-	fi
-	stdumount
-	;;
 check_url)
 	echo "Checking sources files availability on the web"
 	if [ ! -d ${DIR_CHK} ]; then

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6199
          http://ipcop.svn.sourceforge.net/ipcop/?rev=6199&view=rev
Author:   gespinasse
Date:     2011-12-27 22:13:18 +0000 (Tue, 27 Dec 2011)
Log Message:
-----------
Remove packages_list cruft and do better stripping and checking files

Strip ELF code using xargs strip as this faster than running strip for each file 

Integrate package_list (pass 1 and 2) on lf/cdrom
For pass-1 packages-list file creation :
- hide -pass and 'stage|adjust-toolchain|strip' words that mean nothing outside of our build
- sort packages for the file include in cdrom and sort -u to remove duplicate.

For pass-2, list of all files creation :
- it is faster to create the list from the fs with find, than to tar tzf the final package
  there is one difference with no consequence on the produced all-files.txt
  tar tzf extract non empty directories names with a final /, find never have a final /

Add a comment why we create a tar, that we expand and suppress

Stop keeping ROOTFILES.txt in doc, we already have all-files.txt
I created an all-no-dir.txt, variant from all-files (without directories this time) for md5sum and scanelf usage.
I don't feel we need both, so all-no-dir.txt is deleted after usage.

Modified Paths:
--------------
    ipcop/trunk/lfs/cdrom
    ipcop/trunk/make.sh

Removed Paths:
-------------
    ipcop/trunk/lfs/packages_list

Modified: ipcop/trunk/lfs/cdrom
===================================================================
--- ipcop/trunk/lfs/cdrom	2011-12-27 13:28:12 UTC (rev 6198)
+++ ipcop/trunk/lfs/cdrom	2011-12-27 22:13:18 UTC (rev 6199)
@@ -44,6 +44,8 @@
 # A common name for the ISO on all architectures
 IPCOP_ISO = $(SNAME)-$(VERSION)-install-cd.$(MACHINE).iso
 
+PACKAGE_LIST := $(LFS_BASEDIR)/doc/$(NAME)-$(VERSION)-packages-list.$(MACHINE).txt
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -108,6 +110,13 @@
 	rm -rf /$(INSTALLER_DIR)/cdrom /tmp/*
 	mkdir -p /$(INSTALLER_DIR)/cdrom/{doc,dosutils,images}
 
+	# Create list of packages include in cdrom doc
+	# Add title on top
+	echo "List of software packages used to build $(NAME) Version: $(VERSION) for $(MACHINE)" > $(PACKAGE_LIST)
+	# Then add content with filter for strings without mean outside of our build system
+	for i in `ls -1tr $(DIR_INFO)/0{1,2,3,4}*/* | sed 's/-pass.*$$//' | egrep -v 'stage|adjust-toolchain|strip'`; do \
+		echo " * `basename $$i`"; done | sort -u >> $(PACKAGE_LIST)
+
 	# Create the global include list from each package rootfile
 	find $(DIR_SRC)/config/rootfiles/common -maxdepth 1 -type f | grep -v SKIP | xargs cat >> /tmp/ROOTFILES
 	find $(DIR_SRC)/config/rootfiles/arch_$(MACHINE) -maxdepth 1 -type f | grep -v SKIP | xargs cat >>/tmp/ROOTFILES
@@ -122,23 +131,29 @@
 			--exclude=tmp/$(SNAME).tar \
 			-f /tmp/$(SNAME).tar
 
-	mv /tmp/ROOTFILES /usr/src/doc/ROOTFILES.txt
+	# A file may be include more than once in tar (directly by file name and by directory inclusion)
+	# Avoid that, creating again tar from fs
 	tar -x -C /tmp -f /tmp/$(SNAME).tar
-	rm -f /tmp/$(SNAME).tar
+	rm -f /tmp/$(SNAME).tar /tmp/ROOTFILES
 
+	# Build list of everything include, removing '.' line, './' prefix for all-files to stay the same
+	cd /tmp && find . | sed -e '/^\.$$/d' -e 's|^\./||' | sort > ${ALLFILES}
+	# Create a list of files only (no directories) for md5sum and scanelf usage later
+	# Keep '/' prefix as that's what we need for md5sum and scanelf
+	cd /tmp && find . -type f | sed -e '/^\.$$/d' -e 's|^\.||' | sort >${ALL_NODIR}
+
 	# These used to be done in the installer - no more....
 	cd /tmp/lib/modules/$(KVER) && touch modules.dep
 
 	# We do the stripping here because we don't want to destroy our development tree by stripping all symbols
-	# Instead we strip all binaries and libraries as we create the ISO.  It's quite safe to do strip --strip-all
-	# on libraries if they will not be used for development.
-	# kernel modules are compressed, so no risk actually to strip them
-	cd /tmp && find ./{bin,sbin}				-type f -exec /$(TOOLS_DIR)/bin/strip --strip-all {} \;
-	cd /tmp && find ./lib/{.,iptables,udev}	-maxdepth 1	-type f -exec /$(TOOLS_DIR)/bin/strip --strip-all {} \;
-	cd /tmp && find ./usr/{bin,lib,libexec,local,sbin}	-type f -exec /$(TOOLS_DIR)/bin/strip --strip-all {} \;
-ifeq "$(MACHINE)" "i486"
-	cd /tmp && find ./etc/Conexant				-type f -exec /$(TOOLS_DIR)/bin/strip --strip-all {} \;
-endif
+	# Instead we strip all binaries and libraries as we create the ISO.
+	# It's safe to do strip --strip-all even on libraries as those files will not be used for compilation.
+	# kernel modules are compressed, strip does not yet no to handle that
+	# Using xargs strip, we need to allow failure that happen with non elf files
+	# Filter non elf files error
+	# Similar code is in lfs/update
+	cd /tmp && find ${EXEC_PATH} -type f | xargs /$(TOOLS_DIR)/bin/strip --strip-all 2>&1 | \
+		grep -v 'File format not recognized' || true
 
 	# Create a tmp directory
 	cd /tmp && mkdir -p tmp

Deleted: ipcop/trunk/lfs/packages_list
===================================================================
--- ipcop/trunk/lfs/packages_list	2011-12-27 13:28:12 UTC (rev 6198)
+++ ipcop/trunk/lfs/packages_list	2011-12-27 22:13:18 UTC (rev 6199)
@@ -1,80 +0,0 @@
-###############################################################################
-# This file is part of the IPCop Firewall.                                    #
-#                                                                             #
-# IPCop is free software; you can redistribute it and/or modify               #
-# it under the terms of the GNU General Public License as published by        #
-# the Free Software Foundation; either version 2 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# IPCop is distributed in the hope that it will be useful,                    #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
-# GNU General Public License for more details.                                #
-#                                                                             #
-# You should have received a copy of the GNU General Public License           #
-# along with IPCop; if not, write to the Free Software                        #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA    #
-#                                                                             #
-# Makefiles are based on LFSMake, which is                                    #
-# Copyright (C) 2002 Rod Roard <ro...@su...>                        #
-#                                                                             #
-# Modifications by:                                                           #
-# ??-12-2003 Mark Wormgoor < ma...@wo...>                               #
-#          - Modified Makefile for IPCop build                                #
-#                                                                             #
-# $Id$
-#                                                                             #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-PKG_NAME   = packages_list
-HOST_ARCH  = all
-
-THISAPP    = packages_list
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-check :
-
-download :
-
-md5 :
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-install :
-
-ifeq "$(PASS)" "1"
-	# this is include in cdrom doc
-	echo "Generating list of packages needed to compile ipcop." >> $(LOGFILE)
-	-rm -f $(LFS_BASEDIR)/doc/$(NAME)-$(VERSION)-packages-list.$(MACHINE).txt
-	for i in `ls -1tr $(DIR_INFO)/0{2,3,4}*/*`; do \
-		if [ -n $$i ]; then \
-			echo " * `basename $$i`" >> $(LFS_BASEDIR)/doc/$(NAME)-$(VERSION)-packages-list.$(MACHINE).txt; \
-		fi \
-	done
-endif
-
-ifeq "$(PASS)" "2"
-	echo "List of software packages used to build $(NAME) Version: $(VERSION) for $(MACHINE)" \
-		> $(LFS_BASEDIR)/doc/$(NAME)-$(VERSION)-packages-list.$(MACHINE).tmp
-	cat $(LFS_BASEDIR)/doc/$(NAME)-$(VERSION)-packages-list.$(MACHINE).txt  | sort \
-		>> $(LFS_BASEDIR)/doc/$(NAME)-$(VERSION)-packages-list.$(MACHINE).tmp
-	mv $(LFS_BASEDIR)/doc/$(NAME)-$(VERSION)-packages-list.$(MACHINE).tmp \
-		$(LFS_BASEDIR)/doc/$(NAME)-$(VERSION)-packages-list.$(MACHINE).txt
-	# packages-list is ready to be displayed for Trac wiki page
-
-	# ROOTFILES.txt does not allow to refer to files include by directory
-	echo "Generating files list from logs" >> $(LOGFILE)
-	tar tzf /installer/cdrom/ipcop-$(VERSION).tar.gz | \
-		sed -e 's|^\.\/||' -e '/^$$/d' | sort > $(LFS_BASEDIR)/doc/${NAME}-${VERSION}-all-files-list.${MACHINE}.txt
-endif

Modified: ipcop/trunk/make.sh
===================================================================
--- ipcop/trunk/make.sh	2011-12-27 13:28:12 UTC (rev 6198)
+++ ipcop/trunk/make.sh	2011-12-27 22:13:18 UTC (rev 6199)
@@ -1953,8 +1953,6 @@
 		echo "Skip avm drivers"
 	fi
 
-	PASS=1
-	chroot_make packages_list
 	if [ "${VERSIONSTEP}" ]; then
 		PASS="${VERSIONSTEP}"
 		chroot_make update
@@ -1964,15 +1962,28 @@
 	PASS=""
 	chroot_make cdrom
 	chroot_make netboot
-	PASS=2
-	chroot_make packages_list
-	PASS=""
+	chroot_make check_files
 
 	if [ x"${SKIP_USB_IMAGES}" != x"yes" ]; then
 		chroot_make usb-key
 	else
 		echo "Skip usb images to save time"
 	fi
+
+	# Our tools directory is not mounted inside chroot, so done outside
+	if [ ! -f ${BASEDIR}/doc/${NAME}-${PREVIOUSVERSION}-all-files-list.${MACHINE}.txt.md5 ]; then
+		beautify message INFO "No MD5 all-files-list for ${PREVIOUSVERSION} found, no comparison."
+	else
+		echo -ne "Running MD5 compare"
+		${BASEDIR}/tools/comp_md5.pl ${BASEDIR} ${VERSION} ${PREVIOUSVERSION} ${MACHINE} ${KVER} ${PERLVER} ${VERSIONSTEP}
+		if [ $? -ne 0 ]; then
+			beautify message FAIL
+		else
+			beautify message DONE
+			echo "See ${BASEDIR}/doc/${NAME}-${VERSION}-diff-list.${MACHINE}.txt for result"
+		fi
+	fi
+
 } # End of packages_build()
 
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6198
          http://ipcop.svn.sourceforge.net/ipcop/?rev=6198&view=rev
Author:   owes
Date:     2011-12-27 13:28:12 +0000 (Tue, 27 Dec 2011)
Log Message:
-----------
Update squid to 3.1.18

Modified Paths:
--------------
    ipcop/trunk/lfs/squid
    ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3
    ipcop/trunk/updates/2.0.3/information.xml
    ipcop/trunk/updates/2.0.3/setup

Modified: ipcop/trunk/lfs/squid
===================================================================
--- ipcop/trunk/lfs/squid	2011-12-27 11:32:48 UTC (rev 6197)
+++ ipcop/trunk/lfs/squid	2011-12-27 13:28:12 UTC (rev 6198)
@@ -33,7 +33,7 @@
 include Config
 
 PKG_NAME   = squid
-VER        = 3.1.16
+VER        = 3.1.18
 HOST_ARCH  = all
 OTHER_SRC  = yes
 
@@ -46,8 +46,8 @@
 
 # Used to include same timestamp for all
 # This is the release date
-DATESTAMP = "Oct 13 2011"
-TIMESTAMP = "02:28:51"
+DATESTAMP = "Dec 03 2011"
+TIMESTAMP = "08:05:00"
 
 ###############################################################################
 # Top-level Rules
@@ -57,7 +57,7 @@
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 675aef4411d41f5b55b15a29ad6e5261
+$(DL_FILE)_MD5 = b53f8fb6e22551c2a7376292df5b6ec7
 
 install : $(TARGET)
 

Modified: ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3
===================================================================
--- ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3	2011-12-27 11:32:48 UTC (rev 6197)
+++ ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3	2011-12-27 13:28:12 UTC (rev 6198)
@@ -117,6 +117,16 @@
 ## solos-pci-1.03
 /usr/sbin/soloscli
 ##
+## squid-3.1.18
+/usr/lib/squid/msnt_auth
+/usr/lib/squid/ncsa_auth
+/usr/lib/squid/ntlm_smb_lm_auth
+/usr/lib/squid/squid_ldap_auth
+/usr/lib/squid/squid_ldap_group
+/usr/lib/squid/squid_radius_auth
+/usr/lib/squid/unlinkd
+/usr/sbin/squid
+##
 ## squid-langpack
 /usr/lib/squid/errors.ipcop
 /usr/lib/squid/errors

Modified: ipcop/trunk/updates/2.0.3/information.xml
===================================================================
--- ipcop/trunk/updates/2.0.3/information.xml	2011-12-27 11:32:48 UTC (rev 6197)
+++ ipcop/trunk/updates/2.0.3/information.xml	2011-12-27 13:28:12 UTC (rev 6198)
@@ -11,8 +11,8 @@
             Upgrade acpid to 2.0.13, bash to 4.2.20, DBD-SQLite to 1.35, diffutils to 3.2,
             freetype to 2.4.8, gmp to 5.0.2, grep to 2.10, iproute2 to 3.1.0,
             kbd to 1.15.3, kernel to 2.6.32.51, libpcap to 1.2.0, ntp to 4.2.6p5,
-            smartmontools to 5.42, sqlite to 3.7.9, Solos PCI to 1.03, tcpdump to 4.2.0,
-            usb-modeswitch to 1.2.1.
+            smartmontools to 5.42, Solos PCI to 1.03, sqlite to 3.7.9, squid to 3.1.18,
+            tcpdump to 4.2.0, usb-modeswitch to 1.2.1.
             <br />
             <b>Mandatory reboot after upgrade.</b>
         </description>

Modified: ipcop/trunk/updates/2.0.3/setup
===================================================================
--- ipcop/trunk/updates/2.0.3/setup	2011-12-27 11:32:48 UTC (rev 6197)
+++ ipcop/trunk/updates/2.0.3/setup	2011-12-27 13:28:12 UTC (rev 6198)
@@ -81,6 +81,9 @@
     /usr/local/bin/restartntpd
 fi
 
+# restart squid (helper checks whether squid is enabled)
+/usr/local/bin/restartsquid
+
 # Readd serial console, removed by 2.0.1 update
 TMP=`grep "console=" /proc/cmdline`
 if [ "x$TMP" != "x" ]; then

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6197
          http://ipcop.svn.sourceforge.net/ipcop/?rev=6197&view=rev
Author:   owes
Date:     2011-12-27 11:32:48 +0000 (Tue, 27 Dec 2011)
Log Message:
-----------
Readd the serial console that got removed by the 2.0.1 update. Needs a serious test before release.

Modified Paths:
--------------
    ipcop/trunk/updates/2.0.3/setup

Modified: ipcop/trunk/updates/2.0.3/setup
===================================================================
--- ipcop/trunk/updates/2.0.3/setup	2011-12-27 10:16:28 UTC (rev 6196)
+++ ipcop/trunk/updates/2.0.3/setup	2011-12-27 11:32:48 UTC (rev 6197)
@@ -81,6 +81,19 @@
     /usr/local/bin/restartntpd
 fi
 
+# Readd serial console, removed by 2.0.1 update
+TMP=`grep "console=" /proc/cmdline`
+if [ "x$TMP" != "x" ]; then
+    TMP=`grep "^7" /etc/inittab`
+    if [ "x$TMP" == "x" ]; then
+        # Pull needed information from /proc/cmdline
+        CONSOLE=`cat /proc/cmdline | sed 's/.*console=\([^ ]*\).*/\1/'`
+        TTY=`echo $CONSOLE | cut -d ',' -f 1`
+        BAUDRATE=`echo $CONSOLE | sed 's/.*,\([0-9]*\).*/\1/'`
+        echo "7:2345:respawn:/sbin/agetty -I '\033(K' $TTY $BAUDRATE vt102" >> /etc/inittab
+    fi
+fi
+
 #####
 #
 # End of version specific handling. Continue with universal stuff.

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6196
          http://ipcop.svn.sourceforge.net/ipcop/?rev=6196&view=rev
Author:   owes
Date:     2011-12-27 10:16:28 +0000 (Tue, 27 Dec 2011)
Log Message:
-----------
Update usb-modeswitch to 1.2.1, includes the modification from Gilles.

Modified Paths:
--------------
    ipcop/trunk/lfs/usb-modeswitch
    ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3
    ipcop/trunk/updates/2.0.3/information.xml

Modified: ipcop/trunk/lfs/usb-modeswitch
===================================================================
--- ipcop/trunk/lfs/usb-modeswitch	2011-12-27 08:45:37 UTC (rev 6195)
+++ ipcop/trunk/lfs/usb-modeswitch	2011-12-27 10:16:28 UTC (rev 6196)
@@ -33,7 +33,7 @@
 include Config
 
 PKG_NAME   = usb-modeswitch
-VER        = 1.2.0
+VER        = 1.2.1
 HOST_ARCH  = all
 OTHER_SRC  = yes
 
@@ -52,7 +52,7 @@
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 1932ab96d6e3c5e0a6bdfac863338627
+$(DL_FILE)_MD5 = d228f74e4045e1ba05d80db4fe0f4144
 
 install : $(TARGET)
 
@@ -82,8 +82,6 @@
 $(TARGET) : $(firstword $(MAKEFILE_LIST)) $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) $(DIR_DATAAPP) && cd $(DIR_SRC) && tar xf $(DIR_DL)/$(DL_FILE)
-	# Fix /usr/include/bits/string3.h:154: warning call to __builtin___strncat_chk might overflow destination buffer
-	cd $(DIR_APP) && sed -i -e 's/MAX_ARGSIZE)/MAX_ARGSIZE-1)/' dispatcher.c
 
 	# Use usb_modeswitch_dispatcher statically linked with TCL interpreter
 	cd $(DIR_APP) && make install-static

Modified: ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3
===================================================================
--- ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3	2011-12-27 08:45:37 UTC (rev 6195)
+++ ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3	2011-12-27 10:16:28 UTC (rev 6196)
@@ -54,9 +54,6 @@
 /bin/egrep
 /bin/grep
 ##
-## gnupg-1.4.11 compiled as pie, with -fno-strict-aliasing and --disable-asm
-/usr/bin/gpg
-##
 ## iproute2-3.1.0
 /sbin/ip
 /sbin/rtmon
@@ -108,7 +105,10 @@
 /usr/lib/libsqlite3.so.0
 /usr/lib/libsqlite3.so.0.8.6
 ##
-## usb-modeswitch-1.9.2 fix to 'call to __builtin___strncat_chk might overflow destination buffer'
+## usb-modeswitch-1.2.1
+/etc/usb_modeswitch.conf
+/lib/udev/usb_modeswitch
+/usr/sbin/usb_modeswitch
 /usr/sbin/usb_modeswitch_dispatcher
 ##
 ## smartmontools-5.42

Modified: ipcop/trunk/updates/2.0.3/information.xml
===================================================================
--- ipcop/trunk/updates/2.0.3/information.xml	2011-12-27 08:45:37 UTC (rev 6195)
+++ ipcop/trunk/updates/2.0.3/information.xml	2011-12-27 10:16:28 UTC (rev 6196)
@@ -6,13 +6,13 @@
         <description>Add again capi4k-utils plugins. Add wget.&lt;br /&gt;
             Disable traffic accounting with detail level High, always use Low.&lt;br /&gt;
             Patch krb5-1.9.2 against MITKRB5-SA-2011-007.&lt;br /&gt;
-            Fix _builtin___strncat_chk might overflow in usb-modemswitch-1.2.0.&lt;br /&gt;
             More gnupg-1.4.11 hardening.&lt;br /&gt;
             Language updates.&lt;br /&gt;
             Upgrade acpid to 2.0.13, bash to 4.2.20, DBD-SQLite to 1.35, diffutils to 3.2,
             freetype to 2.4.8, gmp to 5.0.2, grep to 2.10, iproute2 to 3.1.0,
             kbd to 1.15.3, kernel to 2.6.32.51, libpcap to 1.2.0, ntp to 4.2.6p5,
-            smartmontools to 5.42, sqlite to 3.7.9, Solos PCI to 1.03, tcpdump to 4.2.0.
+            smartmontools to 5.42, sqlite to 3.7.9, Solos PCI to 1.03, tcpdump to 4.2.0,
+            usb-modeswitch to 1.2.1.
             &lt;br /&gt;
             &lt;b&gt;Mandatory reboot after upgrade.&lt;/b&gt;
         </description>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6195
          http://ipcop.svn.sourceforge.net/ipcop/?rev=6195&view=rev
Author:   owes
Date:     2011-12-27 08:45:37 +0000 (Tue, 27 Dec 2011)
Log Message:
-----------
Upgrade freetype to 2.4.8

Modified Paths:
--------------
    ipcop/trunk/config/rootfiles/common/freetype
    ipcop/trunk/lfs/freetype
    ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3
    ipcop/trunk/updates/2.0.3/information.xml
    ipcop/trunk/updates/2.0.3/setup

Modified: ipcop/trunk/config/rootfiles/common/freetype
===================================================================
--- ipcop/trunk/config/rootfiles/common/freetype	2011-12-27 08:04:26 UTC (rev 6194)
+++ ipcop/trunk/config/rootfiles/common/freetype	2011-12-27 08:45:37 UTC (rev 6195)
@@ -1,4 +1,4 @@
-## freetype-2.4.7
+## freetype-2.4.8
 ##
 #usr/bin/freetype-config
 #usr/include/freetype2
@@ -52,10 +52,9 @@
 #usr/include/freetype2/freetype/tttags.h
 #usr/include/freetype2/freetype/ttunpat.h
 #usr/include/ft2build.h
-#usr/lib/libfreetype.a
 #usr/lib/libfreetype.la
 usr/lib/libfreetype.so
 usr/lib/libfreetype.so.6
-usr/lib/libfreetype.so.6.7.2
+usr/lib/libfreetype.so.6.8.0
 #usr/lib/pkgconfig/freetype2.pc
 #usr/share/aclocal/freetype2.m4

Modified: ipcop/trunk/lfs/freetype
===================================================================
--- ipcop/trunk/lfs/freetype	2011-12-27 08:04:26 UTC (rev 6194)
+++ ipcop/trunk/lfs/freetype	2011-12-27 08:45:37 UTC (rev 6195)
@@ -33,7 +33,7 @@
 include Config
 
 PKG_NAME   = freetype
-VER        = 2.4.7
+VER        = 2.4.8
 HOST_ARCH  = all
 OTHER_SRC  = yes
 
@@ -51,7 +51,7 @@
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = dbadce8f0c5e70a0b7c51eadf2dd9394
+$(DL_FILE)_MD5 = dbf2caca1d3afd410a29217a9809d397
 
 install : $(TARGET)
 
@@ -83,7 +83,8 @@
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
 
 	cd $(DIR_APP) && sed -i -r 's:.*(#.*BYTE.*) .*:\1:' include/freetype/config/ftoption.h
-	cd $(DIR_APP) && ./configure --prefix=/usr
+	cd $(DIR_APP) && ./configure --prefix=/usr \
+					--disable-static
 	cd $(DIR_APP) && make -j $(PARALLELISM)
 	cd $(DIR_APP) && make install
 

Modified: ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3
===================================================================
--- ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3	2011-12-27 08:04:26 UTC (rev 6194)
+++ ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3	2011-12-27 08:45:37 UTC (rev 6195)
@@ -32,6 +32,19 @@
 /usr/bin/cmp
 /usr/bin/diff
 ##
+## freetype-2.4.8
+/usr/lib/libfreetype.so
+/usr/lib/libfreetype.so.6
+/usr/lib/libfreetype.so.6.8.0
+##
+## libraries linked to freetype
+/usr/lib/libcairo.so
+/usr/lib/libcairo.so.2
+/usr/lib/libcairo.so.2.11000.2
+/usr/lib/libfontconfig.so
+/usr/lib/libfontconfig.so.1
+/usr/lib/libfontconfig.so.1.4.4
+##
 ## gmp-5.0.2
 /usr/lib/libgmp.so
 /usr/lib/libgmp.so.10

Modified: ipcop/trunk/updates/2.0.3/information.xml
===================================================================
--- ipcop/trunk/updates/2.0.3/information.xml	2011-12-27 08:04:26 UTC (rev 6194)
+++ ipcop/trunk/updates/2.0.3/information.xml	2011-12-27 08:45:37 UTC (rev 6195)
@@ -10,7 +10,7 @@
             More gnupg-1.4.11 hardening.<br />
             Language updates.<br />
             Upgrade acpid to 2.0.13, bash to 4.2.20, DBD-SQLite to 1.35, diffutils to 3.2,
-            gmp to 5.0.2, grep to 2.10, iproute2 to 3.1.0,
+            freetype to 2.4.8, gmp to 5.0.2, grep to 2.10, iproute2 to 3.1.0,
             kbd to 1.15.3, kernel to 2.6.32.51, libpcap to 1.2.0, ntp to 4.2.6p5,
             smartmontools to 5.42, sqlite to 3.7.9, Solos PCI to 1.03, tcpdump to 4.2.0.
             <br />

Modified: ipcop/trunk/updates/2.0.3/setup
===================================================================
--- ipcop/trunk/updates/2.0.3/setup	2011-12-27 08:04:26 UTC (rev 6194)
+++ ipcop/trunk/updates/2.0.3/setup	2011-12-27 08:45:37 UTC (rev 6195)
@@ -62,6 +62,7 @@
 /usr/local/bin/upgrade.sh
 
 # Remove old libraries (version specific)
+/bin/rm -f /usr/lib/libfreetype.so.6.7.2
 /bin/rm -f /usr/lib/libgmp.so.10.0.1
 /bin/rm -f /usr/lib/libpcap.so.1.2.0
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6194
          http://ipcop.svn.sourceforge.net/ipcop/?rev=6194&view=rev
Author:   gespinasse
Date:     2011-12-27 08:04:26 +0000 (Tue, 27 Dec 2011)
Log Message:
-----------
Prefer gpg compiled as pie, even we need to disable asm part of the code (as there is not enought register free on i486)

Modified Paths:
--------------
    ipcop/trunk/lfs/gnupg
    ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3
    ipcop/trunk/updates/2.0.3/information.xml

Modified: ipcop/trunk/lfs/gnupg
===================================================================
--- ipcop/trunk/lfs/gnupg	2011-12-27 07:24:44 UTC (rev 6193)
+++ ipcop/trunk/lfs/gnupg	2011-12-27 08:04:26 UTC (rev 6194)
@@ -43,7 +43,8 @@
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
 
-CFLAGS    += -nopie
+# Only needed with --disable-asm
+CFLAGS    += -fno-strict-aliasing
 
 ###############################################################################
 # Top-level Rules
@@ -89,12 +90,14 @@
 	cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)_call-gcc.patch
 
 	rm -rf /home/nobody/.gnupg /root/.gnupg
+	# To not disable -PIE compilation, it is needed to disable asm (not enought register free on i486)
+	# --enable-noexecstack only help when asm code is compiled
 	cd $(DIR_APP) && autoreconf # because call-gcc patch is against Makefile.am and configure.ac
 	cd $(DIR_APP) && ./configure	--prefix=/usr \
 					--build=$(TARGET_2) \
 					--disable-nls \
 					--enable-minimal \
-					--enable-noexecstack
+					--disable-asm
 	cd $(DIR_APP) && make -j $(PARALLELISM)
 
 ifeq "$(RUNNING_TEST)" "yes"

Modified: ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3
===================================================================
--- ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3	2011-12-27 07:24:44 UTC (rev 6193)
+++ ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3	2011-12-27 08:04:26 UTC (rev 6194)
@@ -41,6 +41,9 @@
 /bin/egrep
 /bin/grep
 ##
+## gnupg-1.4.11 compiled as pie, with -fno-strict-aliasing and --disable-asm
+/usr/bin/gpg
+##
 ## iproute2-3.1.0
 /sbin/ip
 /sbin/rtmon

Modified: ipcop/trunk/updates/2.0.3/information.xml
===================================================================
--- ipcop/trunk/updates/2.0.3/information.xml	2011-12-27 07:24:44 UTC (rev 6193)
+++ ipcop/trunk/updates/2.0.3/information.xml	2011-12-27 08:04:26 UTC (rev 6194)
@@ -5,7 +5,9 @@
         <size>0</size>
         <description>Add again capi4k-utils plugins. Add wget.&lt;br /&gt;
             Disable traffic accounting with detail level High, always use Low.&lt;br /&gt;
+            Patch krb5-1.9.2 against MITKRB5-SA-2011-007.&lt;br /&gt;
             Fix _builtin___strncat_chk might overflow in usb-modemswitch-1.2.0.&lt;br /&gt;
+            More gnupg-1.4.11 hardening.&lt;br /&gt;
             Language updates.&lt;br /&gt;
             Upgrade acpid to 2.0.13, bash to 4.2.20, DBD-SQLite to 1.35, diffutils to 3.2,
             gmp to 5.0.2, grep to 2.10, iproute2 to 3.1.0,

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6193
          http://ipcop.svn.sourceforge.net/ipcop/?rev=6193&view=rev
Author:   gespinasse
Date:     2011-12-27 07:24:44 +0000 (Tue, 27 Dec 2011)
Log Message:
-----------
Add a note that we should remove the special CFLAGS on next openssl upgrade.
Actually, there is no execstack file when removing the flag, but that change libcrypto binary so should be done only on next upgrade

Modified Paths:
--------------
    ipcop/trunk/lfs/openssl

Modified: ipcop/trunk/lfs/openssl
===================================================================
--- ipcop/trunk/lfs/openssl	2011-12-26 21:58:12 UTC (rev 6192)
+++ ipcop/trunk/lfs/openssl	2011-12-27 07:24:44 UTC (rev 6193)
@@ -44,7 +44,7 @@
 TARGET     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
 
 # does not work if passed to ./config
-# fix exec stack with special CFLAGS
+# fix exec stack with special CFLAGS before 1.0.0e	no more needed, remove on upgrade after 1.0.0e, change libcrypto binary
 CFLAGS    += -Wa,--noexecstack
 
 ###############################################################################

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6192
          http://ipcop.svn.sourceforge.net/ipcop/?rev=6192&view=rev
Author:   gespinasse
Date:     2011-12-26 21:58:12 +0000 (Mon, 26 Dec 2011)
Log Message:
-----------
Adjust rm lib*.la to just match the files installed by openldap.
Or that create noise on installed files on another package when it is recompiled

Modified Paths:
--------------
    ipcop/trunk/lfs/openldap

Modified: ipcop/trunk/lfs/openldap
===================================================================
--- ipcop/trunk/lfs/openldap	2011-12-26 17:38:23 UTC (rev 6191)
+++ ipcop/trunk/lfs/openldap	2011-12-26 21:58:12 UTC (rev 6192)
@@ -98,7 +98,7 @@
 endif
 
 	cd $(DIR_APP) && make install
-	rm /usr/lib/lib*.la	# not needed, shorter list
+	rm /usr/lib/{liblber,libldap,libldap_r}.la	# not needed, shorter list
 
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6191
          http://ipcop.svn.sourceforge.net/ipcop/?rev=6191&view=rev
Author:   gespinasse
Date:     2011-12-26 17:38:23 +0000 (Mon, 26 Dec 2011)
Log Message:
-----------
Update mailing list for libpng

Modified Paths:
--------------
    ipcop/trunk/doc/Packages-monitoring-urls

Modified: ipcop/trunk/doc/Packages-monitoring-urls
===================================================================
--- ipcop/trunk/doc/Packages-monitoring-urls	2011-12-26 14:26:13 UTC (rev 6190)
+++ ipcop/trunk/doc/Packages-monitoring-urls	2011-12-26 17:38:23 UTC (rev 6191)
@@ -80,7 +80,7 @@
 libcap	 (1/3)Check: http://www.kernel.org/pub/linux/libs/security/linux-privs/kernel-2.4/libcap-1.10.tar.gz
 libnet	 (1/3)Check: http://fresh.t-systems-sfr.com/unix/src/privat2//libnet-1.1.2.1.tar.gz
 libpcap			https://cod.sandelman.ca/cgi-bin/mj_wwwusr/domain=lists.tcpdump.org
-libpng			http://sourceforge.net/project/filemodule_monitor.php?filemodule_id=5683
+libpng			https://lists.sourceforge.net/lists/listinfo/png-mng-announce
 libusb			http://sourceforge.net/project/filemodule_monitor.php?filemodule_id=1632
 libwww-perl	 (1/3)Check: http://www.cpan.org/modules/by-module/Net/libwww-perl-5.805.tar.gz
 libxml2  (1/3)Check: http://xmlsoft.org/sources/libxml2-2.7.1.tar.gz

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6190
          http://ipcop.svn.sourceforge.net/ipcop/?rev=6190&view=rev
Author:   gespinasse
Date:     2011-12-26 14:26:13 +0000 (Mon, 26 Dec 2011)
Log Message:
-----------
Learn to find a file include by directory.
This is in fact very simple, just search too ^#file$

Simplify always replacing MACHINE and PERLVER form the file we search.
That would be twice faster for CPAN files only.

Adjust a few comments

Modified Paths:
--------------
    ipcop/trunk/tools/comp_md5.pl

Modified: ipcop/trunk/tools/comp_md5.pl
===================================================================
--- ipcop/trunk/tools/comp_md5.pl	2011-12-26 13:23:31 UTC (rev 6189)
+++ ipcop/trunk/tools/comp_md5.pl	2011-12-26 14:26:13 UTC (rev 6190)
@@ -162,26 +162,19 @@
 #        }
 #    }
 
-    # Hello, major hack. Find the package that causes the difference.
+    # Find the package the file come from : could be directly include or by directory in which case file is found with '#' prefix
     my $file_in_rootfile = substr($file, 1);
-    if ($file_in_rootfile eq 'usr/bin/[') { $file_in_rootfile = 'usr/bin/\['; } # simple escape
-    my $rootfile = `grep -l "^${file_in_rootfile}\$" $BASEDIR/config/rootfiles/common/* $BASEDIR/config/rootfiles/arch_$MACHINE/*`;
+    if ($file_in_rootfile eq 'usr/bin/[') { $file_in_rootfile = 'usr/bin/\['; } # simple escape for [
+    # Try with MACHINE and PERLVER replaced to find CPAN packages
+    $file_in_rootfile =~ s/$MACHINE/MACHINE/;
+    $file_in_rootfile =~ s/$PERLVER/PERLVER/;
+    #print "Searching for $file_in_rootfile package\n";
+    my $rootfile = `egrep -l "^${file_in_rootfile}\$|^#${file_in_rootfile}\$" $BASEDIR/config/rootfiles/common/* $BASEDIR/config/rootfiles/arch_$MACHINE/*`;
     chomp($rootfile);
     if (-e "$rootfile") {
         $rootfile = `basename $rootfile`;
         chomp($rootfile);
     }
-    else {
-        # Try again with MACHINE and PERLVER replaced to find CPAN packages
-        $file_in_rootfile =~ s/$MACHINE/MACHINE/;
-        $file_in_rootfile =~ s/$PERLVER/PERLVER/;
-        $rootfile = `grep -l "^${file_in_rootfile}\$" $BASEDIR/config/rootfiles/common/* $BASEDIR/config/rootfiles/arch_$MACHINE/*`;
-        chomp($rootfile);
-        if (-e "$rootfile") {
-            $rootfile = `basename $rootfile`;
-            chomp($rootfile);
-        }
-    }
     printf OUTLIST "DIFF    %-60s %s\n", $file, $rootfile;
 }
 close (OUTLIST);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6189
          http://ipcop.svn.sourceforge.net/ipcop/?rev=6189&view=rev
Author:   gespinasse
Date:     2011-12-26 13:23:31 +0000 (Mon, 26 Dec 2011)
Log Message:
-----------
Fix msgfmt: error while opening "/usr/src/langs/list_progress/ipcop.po"
Unfortunately list_progress match *_* and was processed.

Filter what found *_* with a sed to avoid that.

cd to $(DIR_SRC)/langs before processing avoid multiple basename.

Add display of directories processed in both GUI and installer cases.

It would have been cleaner to rename list_progress but I can't test that actually as ./make.sh language is broken actually.

Modified Paths:
--------------
    ipcop/trunk/lfs/ipcop-lang

Modified: ipcop/trunk/lfs/ipcop-lang
===================================================================
--- ipcop/trunk/lfs/ipcop-lang	2011-12-26 10:08:54 UTC (rev 6188)
+++ ipcop/trunk/lfs/ipcop-lang	2011-12-26 13:23:31 UTC (rev 6189)
@@ -64,14 +64,18 @@
 	cp $(DIR_SRC)/langs/list /var/ipcop/main/language.lst
 
 	# Locale files for GUI
-	for i in $(DIR_SRC)/langs/*_* ; do \
-		mkdir -p /usr/share/locale/`basename $$i`/LC_MESSAGES; \
-		msgfmt $$i/ipcop.po -o /usr/share/locale/`basename $$i`/LC_MESSAGES/ipcop.mo; \
-		localedef -i `basename $$i` -f UTF-8 `basename $$i.utf8` --no-archive; \
+	# Unfortunately, list_progress match langs/*_*, so filter that name for now with sed.
+	# Replace with *_* after in, once list_progress is renamed
+	cd $(DIR_SRC)/langs && for i in `ls -d *_* | sed "s|list_progress||"`; do \
+		echo "Processing $$i for GUI"; \
+		mkdir -p /usr/share/locale/$$i/LC_MESSAGES; \
+		msgfmt $(DIR_SRC)/langs/$$i/ipcop.po -o /usr/share/locale/$$i/LC_MESSAGES/ipcop.mo; \
+		localedef -i $$i -f UTF-8 $$i.utf8 --no-archive; \
 	done
 
 	# Locale files for installer, only create .mo files that will be used
 	for i in `grep -v "no-installer" $(DIR_SRC)/langs/list | cut -d ':' -f 2` ; do \
+		echo "Processing $$i for installer"; \
 		mkdir -p /usr/share/locale/$$i/LC_MESSAGES; \
 		msgfmt $(DIR_SRC)/langs/$$i/install.po -o /usr/share/locale/$$i/LC_MESSAGES/install.mo; \
 	done

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6188
          http://ipcop.svn.sourceforge.net/ipcop/?rev=6188&view=rev
Author:   gespinasse
Date:     2011-12-26 10:08:54 +0000 (Mon, 26 Dec 2011)
Log Message:
-----------
Hide strip error message with non ELF files using grep -v 'File format not recognized'

Use xargs strip as this is faster than starting strip for each file
Gain is not so visible on update as there is usually not a big number of files to stripe.

As xargs strip know strip fail for non ELF files, use '|| true' to hide that.
Use same '|| true' construction for tar as that avoid an 'Error 1 (ignored)' message in cas update is still empty.

Modified Paths:
--------------
    ipcop/trunk/lfs/update

Modified: ipcop/trunk/lfs/update
===================================================================
--- ipcop/trunk/lfs/update	2011-12-26 09:59:15 UTC (rev 6187)
+++ ipcop/trunk/lfs/update	2011-12-26 10:08:54 UTC (rev 6188)
@@ -66,16 +66,12 @@
 	tar -c --files-from=$(IPCOP_UPDATE_DIR)/ROOTFILES.${MACHINE}-${PASS} \
 		-f /tmp/patch.tar --exclude='#*'
 	cd /tmp && tar -xf /tmp/patch.tar && rm /tmp/patch.tar
-	# same code as cdrom except allow find to fail as files are not necessary present
-	-cd /tmp && find ./{bin,sbin}				-type f -exec /$(TOOLS_DIR)/bin/strip --strip-all {} \;
-	# kernel modules are compressed, so no risk actually to strip them
-	-cd /tmp && find ./lib/{.,iptables,udev} -maxdepth 1	-type f -exec /$(TOOLS_DIR)/bin/strip --strip-all {} \;
-	-cd /tmp && find ./usr/{bin,lib,libexec,local,sbin}	-type f -exec /$(TOOLS_DIR)/bin/strip --strip-all {} \;
-ifeq "$(MACHINE)" "i486"
-	-cd /tmp && find ./etc/Conexant				-type f -exec /$(TOOLS_DIR)/bin/strip --strip-all {} \;
-endif
+	# Same stripping code as lfs/cdrom plus hide empty path from find that may happen
+	cd /tmp && find ${EXEC_PATH} -type f 2>/dev/null | xargs /$(TOOLS_DIR)/bin/strip --strip-all 2>&1 | \
+		grep -v 'File format not recognized' || true
+
 	# allow tar to fail when nothing yet is include in update
-	-cd /tmp && tar -cz --exclude=/tmp/patch.tar.gz -f /tmp/patch.tar.gz *
+	cd /tmp && tar -cz --exclude=/tmp/patch.tar.gz -f /tmp/patch.tar.gz * || true
 	# now remove everything except the package as other files are inside
 	find /tmp/* -not -name patch.tar.gz -delete
 	

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6187
          http://ipcop.svn.sourceforge.net/ipcop/?rev=6187&view=rev
Author:   gespinasse
Date:     2011-12-26 09:59:15 +0000 (Mon, 26 Dec 2011)
Log Message:
-----------
Add 3 new variables that will be shared on various lfs files

Modified Paths:
--------------
    ipcop/trunk/lfs/Config

Modified: ipcop/trunk/lfs/Config
===================================================================
--- ipcop/trunk/lfs/Config	2011-12-26 09:42:17 UTC (rev 6186)
+++ ipcop/trunk/lfs/Config	2011-12-26 09:59:15 UTC (rev 6187)
@@ -45,6 +45,13 @@
 
 FLOPPY_ROOT_DIR	= /tmp/floppy_root
 
+ALLFILES  := /usr/src/doc/${NAME}-${VERSION}-all-files-list.${MACHINE}.txt
+ALL_NODIR := /usr/src/doc/${NAME}-${VERSION}-all-no-dir.${MACHINE}.txt
+
+# Path where ELF exec code is found to strip, check compiled code
+# Mandatory used from /tmp for strip (don't try to strip from / or you will broke compilation)
+EXEC_PATH  := ./{bin,sbin} ./lib/{,iptables,udev} ./usr/{bin,lib,libexec,local,sbin} ./etc/Conexant
+
 ###############################################################################
 # Common Macro Definitions
 ###############################################################################

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6186
          http://ipcop.svn.sourceforge.net/ipcop/?rev=6186&view=rev
Author:   gespinasse
Date:     2011-12-26 09:42:17 +0000 (Mon, 26 Dec 2011)
Log Message:
-----------
This was done twice, once at end of package_build, once after package_build.
Keep only the second.

Modified Paths:
--------------
    ipcop/trunk/make.sh

Modified: ipcop/trunk/make.sh
===================================================================
--- ipcop/trunk/make.sh	2011-12-26 09:38:09 UTC (rev 6185)
+++ ipcop/trunk/make.sh	2011-12-26 09:42:17 UTC (rev 6186)
@@ -1973,11 +1973,6 @@
 	else
 		echo "Skip usb images to save time"
 	fi
-
-	# Cleanup
-	stdumount
-	${SUDO} ${RM} ${LFS}/tmp/*
-
 } # End of packages_build()
 
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6185
          http://ipcop.svn.sourceforge.net/ipcop/?rev=6185&view=rev
Author:   gespinasse
Date:     2011-12-26 09:38:09 +0000 (Mon, 26 Dec 2011)
Log Message:
-----------
This script is run from make.sh after echo -ne message.
So if dying after an error, print the die message on next line.

Modified Paths:
--------------
    ipcop/trunk/tools/comp_md5.pl

Modified: ipcop/trunk/tools/comp_md5.pl
===================================================================
--- ipcop/trunk/tools/comp_md5.pl	2011-12-25 21:56:29 UTC (rev 6184)
+++ ipcop/trunk/tools/comp_md5.pl	2011-12-26 09:38:09 UTC (rev 6185)
@@ -44,14 +44,15 @@
     $file_known = "$BASEDIR/doc/files-with-different-md5";
 }
 else {
-    die "Parameters missing";
+    # print to next line if dying, as usually this script is called after echo -en message
+    die "\nParameters missing";
 }
 
 # Check whether files exist
-die "$file_version not found" unless (-e $file_version);
-die "$file_previousversion not found" unless (-e $file_previousversion);
-die "$file_update not found" unless (-e $file_update);
-die "$file_known not found" unless (-e $file_known);
+die "\n$file_version not found" unless (-e $file_version);
+die "\n$file_previousversion not found" unless (-e $file_previousversion);
+die "\n$file_update not found" unless (-e $file_update);
+die "\n$file_known not found" unless (-e $file_known);
 
 open (LIST, "$file_update") or die "Unable to open $file_update";
 while (<LIST>) {
@@ -68,7 +69,7 @@
 # Parameter 7 is optional, when used we have update split into 2 packages
 if (defined($ARGV[6])) {
     $file_update = "$BASEDIR/updates/$ARGV[6]/ROOTFILES.$MACHINE-$ARGV[6]";
-    open (LIST, "$file_update") or die "Unable to open $file_update";
+    open (LIST, "$file_update") or die "\nUnable to open $file_update";
     while (<LIST>) {
         next if $_ =~ m/^#/;
         chomp($_);
@@ -81,7 +82,7 @@
     close (LIST);
 }
 
-open (LIST, "$file_version") or die "Unable to open $file_version";
+open (LIST, "$file_version") or die "\nUnable to open $file_version";
 while (<LIST>) {
     next if $_ =~ m/^#/;
     chomp($_);
@@ -92,7 +93,7 @@
 }
 close (LIST);
 
-open (LIST, "$file_previousversion") or die "Unable to open $file_previousversion";
+open (LIST, "$file_previousversion") or die "\nUnable to open $file_previousversion";
 while (<LIST>) {
     next if $_ =~ m/^#/;
     chomp($_);
@@ -101,7 +102,7 @@
 }
 close (LIST);
 
-open (LIST, "$file_known") or die "Unable to open $file_known";
+open (LIST, "$file_known") or die "\nUnable to open $file_known";
 while (<LIST>) {
     next if $_ =~ m/^#/;
     chomp($_);
@@ -122,7 +123,7 @@
     }
 }
 
-open (OUTLIST, ">diff.tmp") or die "Unable to create diff list";
+open (OUTLIST, ">diff.tmp") or die "\nUnable to create diff list";
 print OUTLIST "# Comparing md5 for each file in $ARGV[1] to $ARGV[2]\n";
 print OUTLIST "UPDATEK $kernel_update\n" if ($kernel_update ne 'ABCnevermatches');
 print OUTLIST "UPDATESLP $squid_langpack_update\n" if ($squid_langpack_update ne 'ABCnevermatches');

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6184
          http://ipcop.svn.sourceforge.net/ipcop/?rev=6184&view=rev
Author:   gespinasse
Date:     2011-12-25 21:56:29 +0000 (Sun, 25 Dec 2011)
Log Message:
-----------
Prefer ignoring xargs strip errors with '|| true' instead of '-cd' as that save us on one 'Error 1 (ignored) message

Comment copying ide and cdrom module for floppy as that's too big for now

Modified Paths:
--------------
    ipcop/trunk/lfs/initramfs

Modified: ipcop/trunk/lfs/initramfs
===================================================================
--- ipcop/trunk/lfs/initramfs	2011-12-25 21:50:54 UTC (rev 6183)
+++ ipcop/trunk/lfs/initramfs	2011-12-25 21:56:29 UTC (rev 6184)
@@ -281,8 +281,8 @@
 	# cp /usr/sbin/smartctl $(INITRAMFS_DIR)/usr/bin
 
 	# Strip the installer binaries, ignore xargs strip error on non elf code, and filter non-elf code message
-	-cd $(INITRAMFS_DIR) && find {bin,sbin} usr/{bin,sbin} lib/udev -type f | \
-		xargs /$(TOOLS_DIR)/bin/strip --strip-all 2>&1 | grep -v 'File format not recognized'
+	cd $(INITRAMFS_DIR) && find {bin,sbin} usr/{bin,sbin} lib/udev -type f | \
+		xargs /$(TOOLS_DIR)/bin/strip --strip-all 2>&1 | grep -v 'File format not recognized' || true
 
 	# Install a shrinked glibc and other libs required by the programs we put on bin and usr/bin.
 	# mklibs does both the shrinking and the stripping, so we don't have to strip libs separately
@@ -694,17 +694,18 @@
 	cp /lib/modules/$(KVER)/kernel/drivers/block/floppy.ko.gz \
 		/$(INSTALLER_DIR)/mini-initramfs/lib/modules/$(KVER)/kernel/drivers/block
 
+	# Following lines are commented as there is not enought space remaining on first floppy
 	# Copy the ide-core, ide-generic, and ide-cd modules into the mini-initramfs
-	mkdir -p /$(INSTALLER_DIR)/mini-initramfs/lib/modules/$(KVER)/kernel/drivers/ide
-	cp -a	/lib/modules/$(KVER)/kernel/drivers/ide/ide-core.ko.gz \
-		/lib/modules/$(KVER)/kernel/drivers/ide/ide-generic.ko.gz \
-		/lib/modules/$(KVER)/kernel/drivers/ide/ide-cd_mod.ko.gz \
-			/$(INSTALLER_DIR)/mini-initramfs/lib/modules/$(KVER)/kernel/drivers/ide/
+	#mkdir -p /$(INSTALLER_DIR)/mini-initramfs/lib/modules/$(KVER)/kernel/drivers/ide
+	#cp -a	/lib/modules/$(KVER)/kernel/drivers/ide/ide-core.ko.gz \
+	#	/lib/modules/$(KVER)/kernel/drivers/ide/ide-generic.ko.gz \
+	#	/lib/modules/$(KVER)/kernel/drivers/ide/ide-cd_mod.ko.gz \
+	#		/$(INSTALLER_DIR)/mini-initramfs/lib/modules/$(KVER)/kernel/drivers/ide/
 
 	# Copy the cdrom module
-	mkdir -p /$(INSTALLER_DIR)/mini-initramfs/lib/modules/$(KVER)/kernel/drivers/cdrom
-	cp -a	/lib/modules/$(KVER)/kernel/drivers/cdrom/cdrom.ko.gz \
-			/$(INSTALLER_DIR)/mini-initramfs/lib/modules/$(KVER)/kernel/drivers/cdrom/
+	#mkdir -p /$(INSTALLER_DIR)/mini-initramfs/lib/modules/$(KVER)/kernel/drivers/cdrom
+	#cp -a	/lib/modules/$(KVER)/kernel/drivers/cdrom/cdrom.ko.gz \
+	#		/$(INSTALLER_DIR)/mini-initramfs/lib/modules/$(KVER)/kernel/drivers/cdrom/
 
 	# Copy nls_cp437.ko.gz -- not mandatory but since it's so small it's ok to include it to avoid a warning
 	# message when booting the mini-initramfs floppy

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6183
          http://ipcop.svn.sourceforge.net/ipcop/?rev=6183&view=rev
Author:   gespinasse
Date:     2011-12-25 21:50:54 +0000 (Sun, 25 Dec 2011)
Log Message:
-----------
Prefer ignoring the error with 'rm -f ' instead of '-rm ' as that avoid Error 1 (ignored) message

Modified Paths:
--------------
    ipcop/trunk/lfs/gdb

Modified: ipcop/trunk/lfs/gdb
===================================================================
--- ipcop/trunk/lfs/gdb	2011-12-25 12:29:06 UTC (rev 6182)
+++ ipcop/trunk/lfs/gdb	2011-12-25 21:50:54 UTC (rev 6183)
@@ -86,7 +86,7 @@
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xf $(DIR_DL)/$(DL_FILE)
 	# See WARNING, if we stop before tweaked spec removal
-	-rm `dirname $$(gcc --print-libgcc-file-name)`/specs
+	rm -f `dirname $$(gcc --print-libgcc-file-name)`/specs
 
 	# Static build with LDFLAGS='-static' and hardened glibc fail.
 	# Compiling hardened would need patching glibc (http://bugs.gentoo.org/293637 ).

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6182
          http://ipcop.svn.sourceforge.net/ipcop/?rev=6182&view=rev
Author:   eoberlander
Date:     2011-12-25 12:29:06 +0000 (Sun, 25 Dec 2011)
Log Message:
-----------
Update ntp to 4.2.6p5

Modified Paths:
--------------
    ipcop/trunk/lfs/ntp
    ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3
    ipcop/trunk/updates/2.0.3/information.xml
    ipcop/trunk/updates/2.0.3/setup

Modified: ipcop/trunk/lfs/ntp
===================================================================
--- ipcop/trunk/lfs/ntp	2011-12-24 11:26:24 UTC (rev 6181)
+++ ipcop/trunk/lfs/ntp	2011-12-25 12:29:06 UTC (rev 6182)
@@ -33,7 +33,7 @@
 include Config
 
 PKG_NAME   = ntp
-VER        = 4.2.6p4
+VER        = 4.2.6p5
 HOST_ARCH  = all
 OTHER_SRC  = yes
 
@@ -45,7 +45,7 @@
 
 # Used to include same timestamp for all
 # This is the release date
-DATESTAMP = "Sep 23 2011"
+DATESTAMP = "Dec 24 2011"
 
 ###############################################################################
 # Top-level Rules
@@ -55,7 +55,7 @@
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 1447121a07b49361677ffda4f6e29527
+$(DL_FILE)_MD5 = 00df80a84ec9528fcfb09498075525bc
 
 install : $(TARGET)
 

Modified: ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3
===================================================================
--- ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3	2011-12-24 11:26:24 UTC (rev 6181)
+++ ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3	2011-12-25 12:29:06 UTC (rev 6182)
@@ -82,6 +82,11 @@
 /lib/modules/2.6.32-6/extra/solos-pci.ko.gz
 /lib/modules/2.6.32-6/kernel
 ##
+## ntp-4.2.6p5
+/usr/bin/ntpd
+/usr/bin/ntpdate
+/usr/bin/ntpq
+##
 ## sqlite-3.7.9
 /usr/bin/sqlite3
 /usr/lib/libsqlite3.so.0

Modified: ipcop/trunk/updates/2.0.3/information.xml
===================================================================
--- ipcop/trunk/updates/2.0.3/information.xml	2011-12-24 11:26:24 UTC (rev 6181)
+++ ipcop/trunk/updates/2.0.3/information.xml	2011-12-25 12:29:06 UTC (rev 6182)
@@ -9,8 +9,10 @@
             Language updates.<br />
             Upgrade acpid to 2.0.13, bash to 4.2.20, DBD-SQLite to 1.35, diffutils to 3.2,
             gmp to 5.0.2, grep to 2.10, iproute2 to 3.1.0,
-            kbd to 1.15.3, kernel to 2.6.32.51, libpcap to 1.2.0,
+            kbd to 1.15.3, kernel to 2.6.32.51, libpcap to 1.2.0, ntp to 4.2.6p5,
             smartmontools to 5.42, sqlite to 3.7.9, Solos PCI to 1.03, tcpdump to 4.2.0.
+            <br />
+            <b>Mandatory reboot after upgrade.</b>
         </description>
         <previousversion>2.0.2</previousversion>
         <installdate>INSTALLDATE</installdate>

Modified: ipcop/trunk/updates/2.0.3/setup
===================================================================
--- ipcop/trunk/updates/2.0.3/setup	2011-12-24 11:26:24 UTC (rev 6181)
+++ ipcop/trunk/updates/2.0.3/setup	2011-12-25 12:29:06 UTC (rev 6182)
@@ -75,8 +75,11 @@
 #
 #####
 
+# Restart ntp daemon
+if [ -e /var/run/ntpd.pid ]; then
+    /usr/local/bin/restartntpd
+fi
 
-
 #####
 #
 # End of version specific handling. Continue with universal stuff.

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6181
          http://ipcop.svn.sourceforge.net/ipcop/?rev=6181&view=rev
Author:   gespinasse
Date:     2011-12-24 11:26:24 +0000 (Sat, 24 Dec 2011)
Log Message:
-----------
Remove the unhardened kernel build trick for floppy
If that build, that didn't run or we would need modules compiled the same way.

Modified Paths:
--------------
    ipcop/trunk/lfs/boot.img
    ipcop/trunk/lfs/linux

Modified: ipcop/trunk/lfs/boot.img
===================================================================
--- ipcop/trunk/lfs/boot.img	2011-12-24 11:18:01 UTC (rev 6180)
+++ ipcop/trunk/lfs/boot.img	2011-12-24 11:26:24 UTC (rev 6181)
@@ -66,7 +66,7 @@
 	sed -e 's/boot IPCop/boot IPCop $(VERSION)/' $(DIR_SRC)/config/arch/$(MACHINE)/install-message \
 		| mcopy - i:message
 	mcopy $(DIR_SRC)/config/arch/$(MACHINE)/syslinux-fdinitrd.cfg i:syslinux.cfg
-	mcopy /boot/vmlinuz_unhardened-$(KVER) i:vmlinuz
+	mcopy /boot/vmlinuz-$(KVER) i:vmlinuz
 	mcopy /$(INSTALLER_DIR)/images/$(SNAME)-$(VERSION)-mini-initramfs.img i:initrd.img
 	mcopy $(DIR_SRC)/config/arch/$(MACHINE)/splash.rle i:splash.rle
 

Modified: ipcop/trunk/lfs/linux
===================================================================
--- ipcop/trunk/lfs/linux	2011-12-24 11:18:01 UTC (rev 6180)
+++ ipcop/trunk/lfs/linux	2011-12-24 11:26:24 UTC (rev 6181)
@@ -138,17 +138,6 @@
 	cd $(DIR_APP) && make clean
 
 ifeq "$(MACHINE)" "i486"
-ifneq "${SKIP_FLOPPY_IMAGES}" "yes"
-	# compile a non hardened vmlinuz for floppy as size is smaller unhardened
-	# CFLAGS_KERNEL is defined empty on Makefile, LDFLAGS value is not defined, only used
-	cd $(DIR_APP) && sed -i -e 's/^CFLAGS_KERNEL.*/CFLAGS_KERNEL = -fno-PIE -fno-PIC -fno-stack-protector -U_FORTIFY_SOURCE -nopie -norelro -nonow -nocombreloc/' Makefile
-	cd $(DIR_APP) && make -j $(PARALLELISM) bzImage
-	cd $(DIR_APP) && cp -f arch/x86/boot/bzImage /boot/vmlinuz_unhardened-$(KVER)
-	cd $(DIR_APP) && make clean
-	# and remove our special hack for normal compilation
-	cd $(DIR_APP) && sed -i 's/^CFLAGS_KERNEL.*/CFLAGS_KERNEL	=/' Makefile
-endif # neq skip floppy
-
 	cd $(DIR_APP) && make -j $(PARALLELISM) all
 	cd $(DIR_APP) && cp -f arch/x86/boot/bzImage /boot/vmlinuz-$(KVER)
 	cd $(DIR_APP) && cp -f System.map /boot/System.map-$(KVER)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6180
          http://ipcop.svn.sourceforge.net/ipcop/?rev=6180&view=rev
Author:   gespinasse
Date:     2011-12-24 11:18:01 +0000 (Sat, 24 Dec 2011)
Log Message:
-----------
It's look I forgot make.sh change related to slqite. Commit that unbreak the build

No need to 'cat FILE | grep' when 'grep FILE' is enought

Modified Paths:
--------------
    ipcop/trunk/make.sh

Modified: ipcop/trunk/make.sh
===================================================================
--- ipcop/trunk/make.sh	2011-12-24 11:08:53 UTC (rev 6179)
+++ ipcop/trunk/make.sh	2011-12-24 11:18:01 UTC (rev 6180)
@@ -454,7 +454,7 @@
 	# Take care of garbage
 	sed -i "s@^ .*@#& ## DISABLED by make.sh@g" ${IPCOP_CONFIG}
 
-	for LINE in `cat ${IPCOP_CONFIG} | grep -v "^#"`
+	for LINE in `grep -v '^#' ${IPCOP_CONFIG}`
 	do
 		VARIABLE=`echo "${LINE}" | cut -d= -f 1`
 		VALUE=`echo "${LINE}" | cut -d= -f 2-`
@@ -1836,6 +1836,7 @@
 	chroot_make misc-progs
 	chroot_make nano
 	chroot_make nasm		# only used in case we patch and fully compile syslinux
+	chroot_make sqlite		# before DBD-SQLite and ulogd that depend on it
 	# PERL CPAN packages
 	chroot_make Archive-Zip		# OpenVPN
 	chroot_make URI
@@ -1865,7 +1866,6 @@
 	chroot_make sendEmail
 	chroot_make setserial
 	chroot_make smartmontools
-	chroot_make sqlite
 	chroot_make cppunit		# for squid tests
 	chroot_make squid
 	chroot_make squid-graph

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6179
          http://ipcop.svn.sourceforge.net/ipcop/?rev=6179&view=rev
Author:   gespinasse
Date:     2011-12-24 11:08:53 +0000 (Sat, 24 Dec 2011)
Log Message:
-----------
No need to 'cat FILE | grep' when 'grep FILE' is enought

Modified Paths:
--------------
    ipcop/trunk/lfs/net-tools
    ipcop/trunk/lfs/perl

Modified: ipcop/trunk/lfs/net-tools
===================================================================
--- ipcop/trunk/lfs/net-tools	2011-12-24 08:23:34 UTC (rev 6178)
+++ ipcop/trunk/lfs/net-tools	2011-12-24 11:08:53 UTC (rev 6179)
@@ -87,7 +87,7 @@
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
 
 	cd $(DIR_APP) && gzip -dc $(DIR_DL)/$(PATCH1) | patch -Np1
-	cd $(DIR_APP) && for patch in `cat debian/patches/series | grep -v ^#` ; do \
+	cd $(DIR_APP) && for patch in `grep -v ^# debian/patches/series` ; do \
 		patch -Np1 -i debian/patches/$$patch; \
 	done
 

Modified: ipcop/trunk/lfs/perl
===================================================================
--- ipcop/trunk/lfs/perl	2011-12-24 08:23:34 UTC (rev 6178)
+++ ipcop/trunk/lfs/perl	2011-12-24 11:08:53 UTC (rev 6179)
@@ -97,7 +97,7 @@
 	cd $(DIR_APP) && sed -i 's/ -p1//' debian/patches/series
 	# debian/patches/debian contains Debian specific patches
 	# debian/patches/fixes contains 'generic' patches, usually from upstream
-	cd $(DIR_APP) && for patch in `cat debian/patches/series | grep -v '^debian'` ; do \
+	cd $(DIR_APP) && for patch in `grep -v '^debian' debian/patches/series` ; do \
 		patch -Np1 -i debian/patches/$$patch; \
 	done
 	# patchlevel contain reference to applied patches visible with perl-V

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.