Author: alexander Date: 2007-01-29 09:05:35 -0700 (Mon, 29 Jan 2007) New Revision: 1814
Added: branches/6.2/packages/man-db/convert-mans Removed: branches/6.2/packages/seamonkey/seamonkey-1.0.2-pangocairo-1.patch branches/6.2/packages/shadow/convert-mans Modified: branches/6.2/doc/README branches/6.2/packages/LFS-BOOK/LFS-BOOK-6.2-XML-update-1.patch branches/6.2/packages/grub/Makefile branches/6.2/packages/linux/Makefile branches/6.2/packages/linux64/Makefile branches/6.2/packages/man-db/Makefile branches/6.2/packages/man-pages-es/Makefile branches/6.2/packages/mc/Makefile branches/6.2/packages/shadow/Makefile branches/6.2/vars/vars.ppc branches/6.2/vars/vars.sparc branches/6.2/vars/vars.x86 Log: 6.2-5 release Modified: branches/6.2/doc/README =================================================================== --- branches/6.2/doc/README 2006-12-19 13:37:27 UTC (rev 1813) +++ branches/6.2/doc/README 2007-01-29 16:05:35 UTC (rev 1814) @@ -73,7 +73,7 @@ =========================== The original LFS book recommends using "the latest available 2.6.16.x kernel version" and gives a link to linux-2.6.16.27. However, at the time of the -release of this CD, the latest linux-2.6.16.x version is 2.6.16.35. For the +release of this CD, the latest linux-2.6.16.x version is 2.6.16.38. For the convenience of jhalfs users, the LFS book on this CD has been patched to include this kernel version. Modified: branches/6.2/packages/LFS-BOOK/LFS-BOOK-6.2-XML-update-1.patch =================================================================== --- branches/6.2/packages/LFS-BOOK/LFS-BOOK-6.2-XML-update-1.patch 2006-12-19 13:37:27 UTC (rev 1813) +++ branches/6.2/packages/LFS-BOOK/LFS-BOOK-6.2-XML-update-1.patch 2007-01-29 16:05:35 UTC (rev 1814) @@ -6,11 +6,11 @@ <!ENTITY linux-dl-version "2.6"> -<!ENTITY linux-version "2.6.16.27"> -+<!ENTITY linux-version "2.6.16.35"> ++<!ENTITY linux-version "2.6.16.38"> <!ENTITY linux-size "39,886 KB"> <!ENTITY linux-url "&kernel;linux/kernel/v&linux-dl-version;/linux-&linux-version;.tar.bz2"> -<!ENTITY linux-md5 "ebedfe5376efec483ce12c1629c7a5b1"> -+<!ENTITY linux-md5 "87e383c1446a7e4cb4c919145eb918ce"> ++<!ENTITY linux-md5 "4ce97d0f4728d9864c91807f47128deb"> <!ENTITY linux-home "http://www.kernel.org/";> <!ENTITY linux-ch8-du "310 - 350 MB"> <!ENTITY linux-ch8-sbu "1.5 - 3 SBU"> Modified: branches/6.2/packages/grub/Makefile =================================================================== --- branches/6.2/packages/grub/Makefile 2006-12-19 13:37:27 UTC (rev 1813) +++ branches/6.2/packages/grub/Makefile 2007-01-29 16:05:35 UTC (rev 1814) @@ -34,7 +34,7 @@ # but this flag is already present on the CD. So ignore the reject. patch -Np1 -i ../$(PATCH1) || true autoreconf --force --install --verbose - ./configure --prefix=/usr + CFLAGS="-O1 -fno-strict-aliasing" ./configure --prefix=/usr make $(PM) make install Modified: branches/6.2/packages/linux/Makefile =================================================================== --- branches/6.2/packages/linux/Makefile 2006-12-19 13:37:27 UTC (rev 1813) +++ branches/6.2/packages/linux/Makefile 2007-01-29 16:05:35 UTC (rev 1814) @@ -1,12 +1,12 @@ # Linux Kernel Makefile NM= linux -VRS= 2.6.16.35 +VRS= 2.6.16.38 DIR= $(NM)-$(VRS) FILE= $(DIR).tar.bz2 URL-$(FILE)= http://www.kernel.org/pub/linux/kernel/v2.6/$(FILE) -SHA-$(FILE)= be52aa526bc3950709e4af67d9f87705b09fb2e9 +SHA-$(FILE)= af5c05666f7a182cc62046272aabbbb8a40be56e DIR1= loop-AES-v3.1d FILE1= $(DIR1).tar.bz2 Modified: branches/6.2/packages/linux64/Makefile =================================================================== --- branches/6.2/packages/linux64/Makefile 2006-12-19 13:37:27 UTC (rev 1813) +++ branches/6.2/packages/linux64/Makefile 2007-01-29 16:05:35 UTC (rev 1814) @@ -1,12 +1,12 @@ # Linux Kernel Makefile NM= linux -VRS= 2.6.16.35 +VRS= 2.6.16.38 DIR= $(NM)-$(VRS) FILE= $(DIR).tar.bz2 URL-$(FILE)= http://www.kernel.org/pub/linux/kernel/v2.6/$(FILE) -SHA-$(FILE)= be52aa526bc3950709e4af67d9f87705b09fb2e9 +SHA-$(FILE)= af5c05666f7a182cc62046272aabbbb8a40be56e DIR1= loop-AES-v3.1d FILE1= $(DIR1).tar.bz2 Modified: branches/6.2/packages/man-db/Makefile =================================================================== --- branches/6.2/packages/man-db/Makefile 2006-12-19 13:37:27 UTC (rev 1813) +++ branches/6.2/packages/man-db/Makefile 2007-01-29 16:05:35 UTC (rev 1814) @@ -34,6 +34,7 @@ ./configure --prefix=/usr --enable-mb-groff --disable-setuid make make install + install -m755 ../convert-mans /usr/bin clean: -rm -rf $(DIR) Copied: branches/6.2/packages/man-db/convert-mans (from rev 1797, branches/6.2/packages/shadow/convert-mans) =================================================================== --- branches/6.2/packages/man-db/convert-mans (rev 0) +++ branches/6.2/packages/man-db/convert-mans 2007-01-29 16:05:35 UTC (rev 1814) @@ -0,0 +1,11 @@ +#!/bin/sh -e +FROM="$1" +TO="$2" +shift ; shift +while [ $# -gt 0 ] +do + FILE="$1" + shift + iconv -f "$FROM" -t "$TO" "$FILE" >.tmp.iconv + mv .tmp.iconv "$FILE" +done Modified: branches/6.2/packages/man-pages-es/Makefile =================================================================== --- branches/6.2/packages/man-pages-es/Makefile 2006-12-19 13:37:27 UTC (rev 1813) +++ branches/6.2/packages/man-pages-es/Makefile 2007-01-29 16:05:35 UTC (rev 1814) @@ -20,12 +20,12 @@ $(std_build) compile-stage2: - find man? -type f | \ - grep -v 'man7/iso_8859-7.7' | \ - while read F ; do \ - iconv -f UTF-8 -t ISO-8859-1 $$F >tmp ; mv tmp $$F ; \ - done - cp -r man? /usr/share/man/es + mv man7/iso_8859-2.7{,X} + mv man7/iso_8859-7.7{,X} + convert-mans UTF-8 ISO-8859-1 man?/*.? + mv man7/iso_8859-2.7{X,} + mv man7/iso_8859-7.7{X,} + make install clean: -rm -rf $(DIR) Modified: branches/6.2/packages/mc/Makefile =================================================================== --- branches/6.2/packages/mc/Makefile 2006-12-19 13:37:27 UTC (rev 1813) +++ branches/6.2/packages/mc/Makefile 2007-01-29 16:05:35 UTC (rev 1814) @@ -8,10 +8,14 @@ URL-$(FILE)= http://www.ibiblio.org/pub/Linux/utils/file/managers/mc/$(FILE) SHA-$(FILE)= 92be0802143245e0fb7e3847d70da614cad7d5fb -PATCH1= $(NM)_$(VRS)-6.diff.gz -URL-$(PATCH1)= http://ftp.debian.org/debian/pool/main/m/mc/$(PATCH1) -SHA-$(PATCH1)= 5f25f69801d192ff806818c79121865abf8392f1 +PATCH1= $(DIR)-bash32-1.patch +URL-$(PATCH1)= http://www.linuxfromscratch.org/patches/blfs/svn/$(PATCH1) +SHA-$(PATCH1)= 7e516f2a5f1ce69884b8200da348c1d03c6dfe67 +PATCH2= $(DIR)-debian_fixes-1.patch +URL-$(PATCH2)= http://www.linuxfromscratch.org/patches/blfs/svn/$(PATCH2) +SHA-$(PATCH2)= 29a81f756d14ea7028ca3cbbef1bf1df35ed0739 + # Targets include $(ROOT)/scripts/functions @@ -20,45 +24,26 @@ chroot "$(MP)" $(chenv-blfs) \ 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)' -stage2: Makefile $(FILE) $(PATCH1) +stage2: Makefile $(FILE) $(PATCH1) $(PATCH2) $(std_build) compile-stage2: - zcat ../$(PATCH1) | patch -Np1 - rm debian/patches/01_mc.ext.in.mime.patch - rm debian/patches/02_debian_syntax.patch - rm debian/patches/08_awk.patch - rm debian/patches/36_developer_mode.patch - for a in debian/patches/*.patch ; do \ - if egrep -q '+++.*mc-4' $$a ; then \ - patch -Np1 -i $$a ; \ - else \ - patch -Np0 -i $$a ; \ - fi ; \ - done - CPPFLAGS="-DUTF8" ./configure --with-screen=slang --prefix=/usr \ - --enable-charset - iconv -f ISO-8859-1 -t UTF-8 lib/mc.hint > tmp && mv tmp lib/mc.hint - iconv -f ISO-8859-1 -t UTF-8 doc/xnc.hlp > tmp && mv tmp doc/xnc.hlp - iconv -f ISO-8859-1 -t UTF-8 lib/mc.hint.es > tmp && mv tmp lib/mc.hint.es - iconv -f ISO-8859-1 -t UTF-8 doc/es/xnc.hlp > tmp && mv tmp doc/es/xnc.hlp - iconv -f ISO-8859-1 -t UTF-8 lib/mc.hint.it > tmp && mv tmp lib/mc.hint.it - iconv -f ISO-8859-1 -t UTF-8 doc/it/xnc.hlp > tmp && mv tmp doc/it/xnc.hlp - iconv -f ISO-8859-1 -t UTF-8 lib/mc.hint.nl > tmp && mv tmp lib/mc.hint.nl - iconv -f ISO-8859-2 -t UTF-8 lib/mc.hint.cs > tmp && mv tmp lib/mc.hint.cs - iconv -f ISO-8859-2 -t UTF-8 lib/mc.hint.hu > tmp && mv tmp lib/mc.hint.hu - iconv -f ISO-8859-2 -t UTF-8 doc/hu/xnc.hlp > tmp && mv tmp doc/hu/xnc.hlp - iconv -f ISO-8859-2 -t UTF-8 lib/mc.hint.pl > tmp && mv tmp lib/mc.hint.pl - iconv -f ISO-8859-2 -t UTF-8 doc/pl/xnc.hlp > tmp && mv tmp doc/pl/xnc.hlp - iconv -f ISO-8859-5 -t UTF-8 lib/mc.hint.sr > tmp && mv tmp lib/mc.hint.sr - iconv -f ISO-8859-5 -t UTF-8 doc/sr/xnc.hlp > tmp && mv tmp doc/sr/xnc.hlp - iconv -f ISO-8859-5 -t UTF-8 lib/mc.menu.sr > tmp && mv tmp lib/mc.menu.sr - iconv -f koi8-r -t UTF-8 lib/mc.hint.ru > tmp && mv tmp lib/mc.hint.ru - iconv -f koi8-r -t UTF-8 doc/ru/xnc.hlp > tmp && mv tmp doc/ru/xnc.hlp - iconv -f koi8-u -t UTF-8 lib/mc.hint.uk > tmp && mv tmp lib/mc.hint.uk - iconv -f big5 -t UTF-8 lib/mc.hint.zh > tmp && mv tmp lib/mc.hint.zh + patch -Np1 -i ../$(PATCH1) + patch -Np1 -i ../$(PATCH2) + CPPFLAGS="-DUTF8" ./configure --prefix=/usr --enable-charset make + convert-mans ISO-8859-1 UTF-8 lib/mc.hint{,.es,.it,.nl} + convert-mans ISO-8859-2 UTF-8 lib/mc.hint{.cs,.hu,.pl} + convert-mans ISO-8859-5 UTF-8 lib/mc.hint.sr + convert-mans KOI8-R UTF-8 lib/mc.hint.ru + convert-mans KOI8-U UTF-8 lib/mc.hint.uk + convert-mans BIG5 UTF-8 lib/mc.hint.zh + convert-mans ISO-8859-1 UTF-8 doc/{es,it}/mc.hlp.* + convert-mans ISO-8859-2 UTF-8 doc/{hu,pl}/mc.hlp.* + convert-mans ISO-8859-5 UTF-8 doc/sr/mc.hlp.sr + convert-mans KOI8-R UTF-8 doc/ru/mc.hlp.ru make install + chmod 1755 /usr/lib/mc/cons.saver clean: -rm -rf $(DIR) Deleted: branches/6.2/packages/seamonkey/seamonkey-1.0.2-pangocairo-1.patch =================================================================== --- branches/6.2/packages/seamonkey/seamonkey-1.0.2-pangocairo-1.patch 2006-12-19 13:37:27 UTC (rev 1813) +++ branches/6.2/packages/seamonkey/seamonkey-1.0.2-pangocairo-1.patch 2007-01-29 16:05:35 UTC (rev 1814) @@ -1,27 +0,0 @@ -Submitted By: Alexander E. Patrakov -Date: 2006-06-25 -Initial Package Version: 1.0.2 -Origin: http://crux.nu/portdb/?command=viewfile&repo=predatorfreak&port=seamonkey&file=seamonkey-1.0-pangocairo.patch -Upstream Status: unknown -Description: Fixes build issue in pango-enabled seamonkey - ---- mozilla/gfx/src/gtk/mozilla-decoder.cpp.noxft 2005-08-18 22:41:26.000000000 -0400 -+++ mozilla/gfx/src/gtk/mozilla-decoder.cpp 2005-08-18 22:38:01.000000000 -0400 -@@ -40,7 +40,7 @@ - #define PANGO_ENABLE_ENGINE - - #include "mozilla-decoder.h" --#include <pango/pangoxft.h> -+#include <pango/pangocairo.h> - #include <pango/pangofc-fontmap.h> - #include <pango/pangofc-font.h> - #include <gdk/gdkx.h> -@@ -208,7 +208,7 @@ - } - } - -- pango_fc_font_map_add_decoder_find_func(PANGO_FC_FONT_MAP(pango_xft_get_font_map(GDK_DISPLAY(),gdk_x11_get_default_screen())), -+ pango_fc_font_map_add_decoder_find_func(PANGO_FC_FONT_MAP(pango_cairo_font_map_get_default()), - mozilla_find_decoder, - NULL, - NULL); Modified: branches/6.2/packages/shadow/Makefile =================================================================== --- branches/6.2/packages/shadow/Makefile 2006-12-19 13:37:27 UTC (rev 1813) +++ branches/6.2/packages/shadow/Makefile 2007-01-29 16:05:35 UTC (rev 1814) @@ -25,22 +25,17 @@ sed -i 's/groups$$(EXEEXT) //' src/Makefile find man -name Makefile -exec sed -i '/groups/d' {} \; sed -i -e 's/ ko//' -e 's/ zh_CN zh_TW//' man/Makefile - ../convert-mans UTF-8 ISO-8859-2 man/cs/*.? - ../convert-mans UTF-8 ISO-8859-1 man/de/*.? - ../convert-mans UTF-8 ISO-8859-1 man/es/*.? - ../convert-mans UTF-8 ISO-8859-1 man/fi/*.? - ../convert-mans UTF-8 ISO-8859-1 man/fr/*.? - ../convert-mans UTF-8 ISO-8859-2 man/hu/*.? - ../convert-mans UTF-8 ISO-8859-1 man/id/*.? - ../convert-mans UTF-8 ISO-8859-1 man/it/*.? - ../convert-mans UTF-8 EUC-JP man/ja/*.? - # ../convert-mans UTF-8 EUC-KR man/ko/*.? - ../convert-mans UTF-8 ISO-8859-2 man/pl/*.? - ../convert-mans UTF-8 ISO-8859-1 man/pt_BR/*.? - ../convert-mans UTF-8 KOI8-R man/ru/*.? - ../convert-mans UTF-8 ISO-8859-9 man/tr/*.? - # ../convert-mans UTF-8 GB2312 man/zh_CN/*.? - # ../convert-mans UTF-8 BIG5 man/zh_TW/*.? + for i in de es fi fr id it pt_BR; do \ + convert-mans UTF-8 ISO-8859-1 man/$$i/*.? ; \ + done + + for i in cs hu pl; do \ + convert-mans UTF-8 ISO-8859-2 man/$$i/*.? ; \ + done + + convert-mans UTF-8 EUC-JP man/ja/*.? + convert-mans UTF-8 KOI8-R man/ru/*.? + convert-mans UTF-8 ISO-8859-9 man/tr/*.? make $(PM) make install cp etc/{limits,login.access} /etc Deleted: branches/6.2/packages/shadow/convert-mans =================================================================== --- branches/6.2/packages/shadow/convert-mans 2006-12-19 13:37:27 UTC (rev 1813) +++ branches/6.2/packages/shadow/convert-mans 2007-01-29 16:05:35 UTC (rev 1814) @@ -1,11 +0,0 @@ -#!/bin/sh -e -FROM="$1" -TO="$2" -shift ; shift -while [ $# -gt 0 ] -do - FILE="$1" - shift - iconv -f "$FROM" -t "$TO" "$FILE" >.tmp.iconv - mv .tmp.iconv "$FILE" -done Modified: branches/6.2/vars/vars.ppc =================================================================== --- branches/6.2/vars/vars.ppc 2006-12-19 13:37:27 UTC (rev 1813) +++ branches/6.2/vars/vars.ppc 2007-01-29 16:05:35 UTC (rev 1814) @@ -1,4 +1,4 @@ -export VERSION := ppc-6.2-4 +export VERSION := ppc-6.2-5 export CFLAGS := -Os -s -fno-strict-aliasing export LINKER := ld.so.1 export LFS_TARGET := powerpc-unknown-linux-gnu Modified: branches/6.2/vars/vars.sparc =================================================================== --- branches/6.2/vars/vars.sparc 2006-12-19 13:37:27 UTC (rev 1813) +++ branches/6.2/vars/vars.sparc 2007-01-29 16:05:35 UTC (rev 1814) @@ -1,3 +1,3 @@ -export VERSION := sparc-6.2-4 +export VERSION := sparc-6.2-5 export CFLAGS := -Os -s -fno-strict-aliasing export LFS_TARGET := sparc-unknown-linux-gnu Modified: branches/6.2/vars/vars.x86 =================================================================== --- branches/6.2/vars/vars.x86 2006-12-19 13:37:27 UTC (rev 1813) +++ branches/6.2/vars/vars.x86 2007-01-29 16:05:35 UTC (rev 1814) @@ -1,4 +1,4 @@ -export VERSION := x86-6.2-4 +export VERSION := x86-6.2-5 export CFLAGS := -Os -s -fno-strict-aliasing -mtune=i686 export LINKER := ld-linux.so.2 export LFS_TARGET := i486-pc-linux-gnu -- http://linuxfromscratch.org/mailman/listinfo/livecd FAQ: http://www.linuxfromscratch.org/faq/ Unsubscribe: See the above information page
