Author: alexander
Date: 2005-09-25 02:52:06 -0600 (Sun, 25 Sep 2005)
New Revision: 769
Added:
x86/branches/utf8-newmake/packages/mutt/mutt-1.4.2.1-gcc4_fixes-1.patch
Modified:
x86/branches/utf8-newmake/Makefile
x86/branches/utf8-newmake/packages/firefox/Makefile
x86/branches/utf8-newmake/packages/libxml2/Makefile
x86/branches/utf8-newmake/packages/libxslt/Makefile
x86/branches/utf8-newmake/packages/mdadm/Makefile
x86/branches/utf8-newmake/packages/mutt/Makefile
x86/branches/utf8-newmake/packages/openssh/Makefile
x86/branches/utf8-newmake/packages/thunderbird/Makefile
Log:
Version updates and fixes from trunk (libxml2, libxslt, mutt, mdadm, openssh)
Firefox updated to 1.0.7
Added patches to suppress garbage characters from Firefox
and Thunderbird dialogs.
Modified: x86/branches/utf8-newmake/Makefile
===================================================================
--- x86/branches/utf8-newmake/Makefile 2005-09-25 07:24:56 UTC (rev 768)
+++ x86/branches/utf8-newmake/Makefile 2005-09-25 08:52:06 UTC (rev 769)
@@ -212,8 +212,8 @@
ch-fontconfig ch-Xorg ch-inputattach ch-freefont ch-fonts-dejavu \
ch-fonts-kochi ch-fonts-arphic update-fontsdir ch-libjpeg ch-libtiff
ch-openssh \
ch-glib2 ch-libungif ch-imlib ch-imlib2 ch-gc ch-w3m ch-pango ch-atk
ch-gtk2 \
- ch-cvs ch-popt ch-samba ch-libIDL stop-here ch-firefox ch-thunderbird \
- ch-startup-notification chroot-gvim ch-xfce ch-lua ch-ion ch-irssi \
+ ch-cvs ch-popt ch-samba ch-libIDL ch-firefox ch-thunderbird \
+ ch-startup-notification stop-here chroot-gvim ch-xfce ch-lua ch-ion
ch-irssi \
ch-xchat ch-tcpwrappers ch-portmap ch-nfs-utils ch-traceroute \
ch-ncftp ch-pciutils ch-nALFS ch-device-mapper ch-LVM2 \
ch-dhcpcd ch-distcc ch-ppp ch-rp-pppoe ch-libaal ch-reiser4progs \
Modified: x86/branches/utf8-newmake/packages/firefox/Makefile
===================================================================
--- x86/branches/utf8-newmake/packages/firefox/Makefile 2005-09-25 07:24:56 UTC
(rev 768)
+++ x86/branches/utf8-newmake/packages/firefox/Makefile 2005-09-25 08:52:06 UTC
(rev 769)
@@ -1,17 +1,22 @@
# Firefox Makefile
NM= firefox
-VRS= 1.0.6
+VRS= 1.0.7
DIR= mozilla
FILE= $(NM)-$(VRS)-source.tar.bz2
-URL-$(FILE)= $(HTTPBLFS)/F-H/$(FILE)
-SHA-$(FILE)= 56183aa14a0185a27a6ab4337d2ade7d1d45c2a6
+URL-$(FILE)=
http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$(VRS)/source/$(FILE)
+SHA-$(FILE)= ac7549f609db8dbea6db33b2ffb3ae546eea64df
-PATCH1= $(NM)-$(VRS)-gcc4-1.patch
+# Still needed
+PATCH1= $(NM)-1.0.6-gcc4-1.patch
URL-$(PATCH1)=
http://www.linuxfromscratch.org/patches/downloads/$(NM)/$(PATCH1)
SHA-$(PATCH1)= c918d248059e4f5f2f60c2f87ed3c2ebe6a91f7f
+PATCH2= $(NM)-$(VRS)-locale-1.patch
+URL-$(PATCH2)= http://www.linuxfromscratch.org/~alexander/patches/$(PATCH2)
+SHA-$(PATCH2)= 0844835d2ed8c38fb7f34db3d1352b78399a24ce
+
# Targets
include $(ROOT)/scripts/functions
@@ -20,7 +25,7 @@
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:
@@ -30,9 +35,10 @@
sed -i '[EMAIL PROTECTED]"$$moz_libdir"@&\n
run_moz="$$dist_bin/run-mozilla.sh"@' \
browser/app/mozilla.in
patch -Np1 -i ../$(PATCH1)
+ patch -Np1 -i ../$(PATCH2)
make -f client.mk build
make -f client.mk install
- cd $(ROOT)/$(PKG)/$(NM) ; cp -ra $(ROOT)/root/.mozilla /root
+ cp -ra $(ROOT)/root/.mozilla /root
clean:
-rm -rf $(DIR)
Modified: x86/branches/utf8-newmake/packages/libxml2/Makefile
===================================================================
--- x86/branches/utf8-newmake/packages/libxml2/Makefile 2005-09-25 07:24:56 UTC
(rev 768)
+++ x86/branches/utf8-newmake/packages/libxml2/Makefile 2005-09-25 08:52:06 UTC
(rev 769)
@@ -1,12 +1,12 @@
# LibXML2 Makefile
NM= libxml2
-VRS= 2.6.20
+VRS= 2.6.21
DIR= $(NM)-$(VRS)
-FILE= $(DIR).tar.bz2
-URL-$(FILE)= $(HTTPBLFS)/L/$(FILE)
-SHA-$(FILE)= 3ed04f5f5ffffef5b8116da2b18fb06f73aa5f9e
+FILE= $(DIR).tar.gz
+URL-$(FILE)= http://xmlsoft.org/sources/$(FILE)
+SHA-$(FILE)= e8d572f53659561de03079af999a9c1134346c94
# Targets
Modified: x86/branches/utf8-newmake/packages/libxslt/Makefile
===================================================================
--- x86/branches/utf8-newmake/packages/libxslt/Makefile 2005-09-25 07:24:56 UTC
(rev 768)
+++ x86/branches/utf8-newmake/packages/libxslt/Makefile 2005-09-25 08:52:06 UTC
(rev 769)
@@ -1,12 +1,12 @@
# libxslt Makefile
NM= libxslt
-VRS= 1.1.14
+VRS= 1.1.15
DIR= $(NM)-$(VRS)
-FILE= $(DIR).tar.bz2
-URL-$(FILE)= $(HTTPBLFS)/L/$(FILE)
-SHA-$(FILE)= 9b6d3c417b943ad11abaa6fb8e2f936107e63899
+FILE= $(DIR).tar.gz
+URL-$(FILE)= http://xmlsoft.org/sources/$(FILE)
+SHA-$(FILE)= f0c8ef4809104bf59ebf5b23a637e7dff61a2aa4
# Targets
Modified: x86/branches/utf8-newmake/packages/mdadm/Makefile
===================================================================
--- x86/branches/utf8-newmake/packages/mdadm/Makefile 2005-09-25 07:24:56 UTC
(rev 768)
+++ x86/branches/utf8-newmake/packages/mdadm/Makefile 2005-09-25 08:52:06 UTC
(rev 769)
@@ -2,12 +2,12 @@
# Package versions
NM= mdadm
-VRS= 1.9.0
+VRS= 2.1
DIR= $(NM)-$(VRS)
FILE= $(DIR).tgz
URL-$(FILE)= http://www.cse.unsw.edu.au/~neilb/source/$(NM)/$(FILE)
-SHA-$(FILE)= 68b4ad16141f6f148126ded2ea78432dee0f5cd4
+SHA-$(FILE)= 75d25a58e8a4b99e7e3c8b3dc051d17e32f302dc
# Targets
Modified: x86/branches/utf8-newmake/packages/mutt/Makefile
===================================================================
--- x86/branches/utf8-newmake/packages/mutt/Makefile 2005-09-25 07:24:56 UTC
(rev 768)
+++ x86/branches/utf8-newmake/packages/mutt/Makefile 2005-09-25 08:52:06 UTC
(rev 769)
@@ -12,6 +12,8 @@
URL-$(PATCH1)= http://mutt.org.ua/download/mutt-$(VRS)/$(PATCH1)
SHA-$(PATCH1)= ac0ddf0831808b01c67ab27b3e3823ecf1ca131b
+PATCH2= $(DIR)-gcc4_fixes-1.patch
+
# Targets
include $(ROOT)/scripts/functions
@@ -25,8 +27,8 @@
compile-stage2:
groupadd mail
- gunzip -c ../$(PATCH1) > ../patch-$(VRS).vvv.nntp
- patch -Np1 -i ../patch-$(VRS).vvv.nntp
+ zcat ../$(PATCH1) | patch -Np1
+ patch -Np1 -i ../$(PATCH2)
./configure --prefix=/usr --sysconfdir=/etc --enable-imap \
--enable-pop --enable-nntp --with-ssl
make $(PM)
Copied: x86/branches/utf8-newmake/packages/mutt/mutt-1.4.2.1-gcc4_fixes-1.patch
(from rev 768, x86/trunk/packages/mutt/mutt-1.4.2.1-gcc4_fixes-1.patch)
Modified: x86/branches/utf8-newmake/packages/openssh/Makefile
===================================================================
--- x86/branches/utf8-newmake/packages/openssh/Makefile 2005-09-25 07:24:56 UTC
(rev 768)
+++ x86/branches/utf8-newmake/packages/openssh/Makefile 2005-09-25 08:52:06 UTC
(rev 769)
@@ -1,12 +1,12 @@
# OpenSSH Makefile
NM= openssh
-VRS= 4.1p1
+VRS= 4.2p1
DIR= $(NM)-$(VRS)
-FILE= $(DIR).tar.bz2
-URL-$(FILE)= $(HTTPBLFS)/M-P/$(FILE)
-SHA-$(FILE)= 7226920d228a2160a0ed1ccd9a607c6ca89f71e0
+FILE= $(DIR).tar.gz
+URL-$(FILE)= http://sunsite.ualberta.ca/pub/OpenBSD/OpenSSH/portable/$(FILE)
+SHA-$(FILE)= 5e7231cfa8ec673ea856ce291b78fac8b380eb78
# Targets
Modified: x86/branches/utf8-newmake/packages/thunderbird/Makefile
===================================================================
--- x86/branches/utf8-newmake/packages/thunderbird/Makefile 2005-09-25
07:24:56 UTC (rev 768)
+++ x86/branches/utf8-newmake/packages/thunderbird/Makefile 2005-09-25
08:52:06 UTC (rev 769)
@@ -14,9 +14,13 @@
SHA-$(PATCH1)= d26a28afe3ca418a2b005daf31a561175cb664eb
PATCH2= $(NM)-$(VRS)-fixes-1.patch
-URL-$(PATCH1)= http://www.linuxfromscratch.org/blfs/downloads/svn/$(PATCH2)
+URL-$(PATCH2)= http://www.linuxfromscratch.org/blfs/downloads/svn/$(PATCH2)
SHA-$(PATCH2)= 85108557c83d0feafba5e080fdf6247a717237c8
+PATCH3= $(NM)-$(VRS)-locale-1.patch
+URL-$(PATCH3)= http://www.linuxfromscratch.org/~alexander/patches/$(PATCH3)
+SHA-$(PATCH3)= c8ac0c5aaf5d98a5b0830ead6eb6e35a109f6b5b
+
# Targets
include $(ROOT)/scripts/functions
@@ -25,7 +29,7 @@
chroot "$(MP)" $(chenv-blfs) \
'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
-stage2: Makefile $(FILE) $(PATCH1) $(PATCH2)
+stage2: Makefile $(FILE) $(PATCH1) $(PATCH2) $(PATCH3)
$(std_build)
compile-stage2:
@@ -33,6 +37,7 @@
../.mozconfig > .mozconfig
patch -Np1 -i ../$(PATCH1)
patch -Np1 -i ../$(PATCH2)
+ patch -Np1 -i ../$(PATCH3)
make -f client.mk build
make -f client.mk install
cd $(ROOT)/$(PKG)/$(NM)
--
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
