Author: justin
Date: 2006-07-12 22:05:24 -0600 (Wed, 12 Jul 2006)
New Revision: 1627
Added:
branches/cross/packages/uuid/
branches/cross/packages/uuid/Makefile
Removed:
branches/cross/packages/openssl/vars/
branches/cross/packages/xfsprogs/xfsprogs-2.6.36-fix_compile-1.patch
Modified:
branches/cross/Makefile
branches/cross/packages/cairo/Makefile
branches/cross/packages/glib2/Makefile
branches/cross/packages/gtk2/Makefile
branches/cross/packages/nfs-utils/Makefile
branches/cross/packages/openssh/Makefile
branches/cross/packages/openssl/Makefile
branches/cross/packages/pango/Makefile
branches/cross/packages/xchat/Makefile
branches/cross/packages/xfsprogs/Makefile
Log:
Upgraded nfs-utils, gtk2, xchat, pango, cairo, glib2, xfsprogs (adding
dependancy uuid required since 2.6 according to INSTALL, dont know of any users
reporting if xfs worked or not) instructions and package version.
Modified: branches/cross/Makefile
===================================================================
--- branches/cross/Makefile 2006-07-13 03:24:54 UTC (rev 1626)
+++ branches/cross/Makefile 2006-07-13 04:05:24 UTC (rev 1627)
@@ -228,8 +228,9 @@
ch-psmisc ch-shadow ch-sysklogd ch-sysvinit ch-tar ch-texinfo ch-udev \
ch-util-linux ch-vim ch-bootscripts-clfs ch-udev-cross-lfs
final-environment
-blfs-common: stop-here ch-openssl ch-wget ch-reiserfsprogs ch-xfsprogs ch-nano
ch-joe \
- ch-screen ch-pkgconfig ch-libidn ch-curl ch-zip ch-unzip ch-lynx
ch-libxml2 ch-expat \
+blfs-common: stop-here ch-openssl ch-wget ch-reiserfsprogs ch-uuid ch-xfsprogs
ch-nano \
+ ch-joe ch-screen ch-pkgconfig ch-libidn ch-curl ch-zip ch-unzip ch-lynx
\
+ ch-libxml2 ch-expat \
ch-subversion ch-livecd-bootscripts ch-docbook-xml ch-libxslt \
ch-docbook-xsl ch-html_tidy ch-CLFS-BOOK ch-libpng ch-freetype \
ch-fontconfig ch-Xorg-modular ch-freefont ch-inputattach
ch-fonts-dejavu \
Modified: branches/cross/packages/cairo/Makefile
===================================================================
--- branches/cross/packages/cairo/Makefile 2006-07-13 03:24:54 UTC (rev
1626)
+++ branches/cross/packages/cairo/Makefile 2006-07-13 04:05:24 UTC (rev
1627)
@@ -5,7 +5,7 @@
DIR= $(NM)-$(VRS)
FILE= $(DIR).tar.gz
-URL-$(FILE)= http://cairographics.org/releases/$(FILE)
+URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
SHA-$(FILE)= 89e72202e5b51a8914fce60f52f7c51ecdea982a
# Targets
Modified: branches/cross/packages/glib2/Makefile
===================================================================
--- branches/cross/packages/glib2/Makefile 2006-07-13 03:24:54 UTC (rev
1626)
+++ branches/cross/packages/glib2/Makefile 2006-07-13 04:05:24 UTC (rev
1627)
@@ -1,12 +1,12 @@
# Glib Makefile
NM= glib
-VRS= 2.10.2
+VRS= 2.10.3
DIR= $(NM)-$(VRS)
FILE= $(DIR).tar.bz2
-URL-$(FILE)= http://ftp.gnome.org/pub/GNOME/sources/glib/2.10/$(FILE)
-SHA-$(FILE)= 14d055725a4fa347bc4c11d6f52ec5268da2454f
+URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
+SHA-$(FILE)= bba1dea73c4426f6a130c82e0b7a07b78dfc73ce
# Targets
Modified: branches/cross/packages/gtk2/Makefile
===================================================================
--- branches/cross/packages/gtk2/Makefile 2006-07-13 03:24:54 UTC (rev
1626)
+++ branches/cross/packages/gtk2/Makefile 2006-07-13 04:05:24 UTC (rev
1627)
@@ -1,12 +1,12 @@
# Gtk+ Makefile
NM= gtk+
-VRS= 2.8.17
+VRS= 2.8.18
DIR= $(NM)-$(VRS)
FILE= $(DIR).tar.bz2
-URL-$(FILE)= http://ftp.gnome.org/pub/GNOME/sources/gtk+/2.8/$(FILE)
-SHA-$(FILE)= a6c62ec016bc076a9938ba962f0dd4bcc1e74e16
+URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
+SHA-$(FILE)= e4f0231b943418d8bb17b3bf9d79aa902ab3eb13
# Targets
Modified: branches/cross/packages/nfs-utils/Makefile
===================================================================
--- branches/cross/packages/nfs-utils/Makefile 2006-07-13 03:24:54 UTC (rev
1626)
+++ branches/cross/packages/nfs-utils/Makefile 2006-07-13 04:05:24 UTC (rev
1627)
@@ -1,17 +1,13 @@
# NFS Utilities Makefile
NM= nfs-utils
-VRS= 1.0.7
+VRS= 1.0.8
DIR= $(NM)-$(VRS)
FILE= $(DIR).tar.bz2
URL-$(FILE)= $(HTTPBLFS)/$(NM)/$(FILE)
-SHA-$(FILE)= e216515f90f6ceb681f1527e5483d0ca53f8ac62
+SHA-$(FILE)= db21bf211150f84b462113b81e4d727afcaa6543
-PATCH1= $(DIR)-gcc4-1.patch
-URL-$(PATCH1)=
http://www.linuxfromscratch.org/patches/downloads/$(NM)/$(PATCH1)
-SHA-$(PATCH1)= 9ccb151f6270aff4c5346ccc6ba50d5e7577ca65
-
# Targets
include $(ROOT)/scripts/functions
@@ -20,11 +16,10 @@
chroot "$(MP)" $(chenv-blfs) \
'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
-stage2: Makefile $(FILE) $(PATCH1)
+stage2: Makefile $(FILE)
$(std_build)
compile-stage2:
- patch -Np1 -i ../$(PATCH1)
./configure --prefix=/usr --sysconfdir=/etc --disable-nfsv4 \
--disable-gss
make
Modified: branches/cross/packages/openssh/Makefile
===================================================================
--- branches/cross/packages/openssh/Makefile 2006-07-13 03:24:54 UTC (rev
1626)
+++ branches/cross/packages/openssh/Makefile 2006-07-13 04:05:24 UTC (rev
1627)
@@ -5,7 +5,7 @@
DIR= $(NM)-$(VRS)
FILE= $(DIR).tar.gz
-URL-$(FILE)= http://openbsd.md5.com.ar/pub/OpenBSD/OpenSSH/portable/$(FILE)
+URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
SHA-$(FILE)= 2b5b0751fd578283ba7b106025c0ba391fd72f1f
# Targets
@@ -23,7 +23,7 @@
install -v -d -m700 /var/lib/sshd
chown root:sys /var/lib/sshd
sed -i "s:-lcrypto:/usr/lib/libcrypto.a:g" configure
- ./configure --prefix=/usr --sysconfdir=/etc/ssh --libexecdir=/usr/sbin \
+ ./configure --prefix=/usr --sysconfdir=/etc/ssh
--libexecdir=/usr/lib/openssh \
--with-md5-passwords --with-privsep-path=/var/lib/sshd
make $(PM)
make install-nokeys
Modified: branches/cross/packages/openssl/Makefile
===================================================================
--- branches/cross/packages/openssl/Makefile 2006-07-13 03:24:54 UTC (rev
1626)
+++ branches/cross/packages/openssl/Makefile 2006-07-13 04:05:24 UTC (rev
1627)
@@ -1,26 +1,17 @@
# OpenSSL Makefile
NM= openssl
-VRS= 0.9.7i
+VRS= 0.9.8b
DIR= $(NM)-$(VRS)
FILE= $(DIR).tar.gz
URL-$(FILE)= $(HTTPBLFS)/$(NM)/$(FILE)
-SHA-$(FILE)= 4c23925744d43272fa19615454da44e01465eb06
+SHA-$(FILE)= 99565db630a044fa484d4f91006a31908f262246
PATCH1= $(DIR)-fix_manpages-1.patch
URL-$(PATCH1)= $(HTTPBLFS)/$(NM)/$(PATCH1)
-SHA-$(PATCH1)= 7640f69ecbe701fd4b71e0d0329d9fffbcc52607
+SHA-$(PATCH1)= 17a3fc451ab132178e2dc696f19dfe58f218cd4a
-PATCH40= $(NM)-0.9.7h-allow_lib64-1.patch
-URL-$(PATCH40)= http://linuxfromscratch.org/~thomasp/x86_64-livecd/$(PATCH40)
-SHA-$(PATCH40)= 26ce4198986c9c46b8ae2c85918f831f550cee88
-
-include $(CROSSVARS)
-
-CONFIG ?= ./config
-DEPS= $(FILE) $(PATCHES)
-
# Targets
include $(ROOT)/scripts/functions
@@ -29,19 +20,21 @@
chroot "$(MP)" $(chenv-blfs) \
'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
-stage2: Makefile $(DEPS)
+stage2: Makefile $(FILE) $(PATCH1)
$(std_build)
compile-stage2:
- for PATCH in $(PATCHES) ; do patch -Np1 -i ../$$PATCH ; done
- $(CONFIG) --openssldir=/etc/ssl --prefix=/usr $(SSL_TARGET) shared
+ patch -Np1 -i ../$(PATCH1)
+ ./config --openssldir=/etc/ssl --prefix=/usr shared
ifeq ($(LFS-ARCH),x86)
sed -i 's/mcpu=pentium/mtune=i486/' Configure
sed -i 's/mcpu=pentium/mtune=i486/' Makefile
endif
- make $(PM) $(LIBDIR_OVERRIDE) MANDIR=/usr/share/man
- make $(LIBDIR_OVERRIDE) MANDIR=/usr/share/man install
- cp -r certs /etc/ssl
+ make $(PM) MANDIR=/usr/share/man
+ make MANDIR=/usr/share/man install
+ cp -v -r certs /etc/ssl
+ install -v -d -m755 /usr/share/doc/$(DIR)
+ cp -v -r doc/{HOWTO,README,*.{txt,html,gif}} /usr/share/doc/$(DIR)
clean:
-rm -rf $(DIR)
Modified: branches/cross/packages/pango/Makefile
===================================================================
--- branches/cross/packages/pango/Makefile 2006-07-13 03:24:54 UTC (rev
1626)
+++ branches/cross/packages/pango/Makefile 2006-07-13 04:05:24 UTC (rev
1627)
@@ -1,12 +1,12 @@
# Pango Makefile
NM= pango
-VRS= 1.12.1
+VRS= 1.12.3
DIR= $(NM)-$(VRS)
FILE= $(DIR).tar.bz2
-URL-$(FILE)= http://ftp.gnome.org/pub/GNOME/sources/pango/1.12/$(FILE)
-SHA-$(FILE)= 26f3268eabeea8aa45b1286dc7af3149c8d544a1
+URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
+SHA-$(FILE)= ad493c4560c0ffd9dcdb8a1724d5bff058ef112c
# Targets
Added: branches/cross/packages/uuid/Makefile
===================================================================
--- branches/cross/packages/uuid/Makefile (rev 0)
+++ branches/cross/packages/uuid/Makefile 2006-07-13 04:05:24 UTC (rev
1627)
@@ -0,0 +1,30 @@
+# uuid Progs Makefile
+
+NM= uuid
+VRS= 1.4.2
+DIR= $(NM)-$(VRS)
+
+FILE= $(DIR).tar.gz
+URL-$(FILE)= ftp://ftp.ossp.org/pkg/lib/uuid/$(FILE)
+SHA-$(FILE)= 064b74dd9c72c5b4de914882926d5df36eda8f3b
+
+# Targets
+
+include $(ROOT)/scripts/functions
+
+chroot:
+ chroot "$(MP)" $(chenv-blfs) \
+ 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
+
+stage2: Makefile $(FILE)
+ $(std_build)
+
+compile-stage2:
+ ./configure --prefix=/usr
+ make
+ make install
+
+clean:
+ -rm -rf $(DIR)
+
+.PHONY: clean chroot compile-stage2
Modified: branches/cross/packages/xchat/Makefile
===================================================================
--- branches/cross/packages/xchat/Makefile 2006-07-13 03:24:54 UTC (rev
1626)
+++ branches/cross/packages/xchat/Makefile 2006-07-13 04:05:24 UTC (rev
1627)
@@ -1,12 +1,12 @@
# xchat Makefile
NM= xchat
-VRS= 2.6.2
+VRS= 2.6.4
DIR= $(NM)-$(VRS)
FILE= $(DIR).tar.bz2
URL-$(FILE)= http://xchat.org/files/source/2.6/$(FILE)
-SHA-$(FILE)= 1bf135b3947f75f1b6c8a60c436a7a1f2613a5ae
+SHA-$(FILE)= 84bb9e2b3f8eef03c199208c81520c20a172e825
# Targets
@@ -28,4 +28,4 @@
clean:
-rm -rf $(DIR)
-.PHONY: compile-stage1 clean chroot compile-stage2
+.PHONY: clean chroot compile-stage2
Modified: branches/cross/packages/xfsprogs/Makefile
===================================================================
--- branches/cross/packages/xfsprogs/Makefile 2006-07-13 03:24:54 UTC (rev
1626)
+++ branches/cross/packages/xfsprogs/Makefile 2006-07-13 04:05:24 UTC (rev
1627)
@@ -1,12 +1,12 @@
# XFS Progs Makefile
NM= xfsprogs
-VRS= 2.6.36
-DIR= $(NM)-$(VRS)
+VRS= 2.8.4-1
+DIR= $(NM)_$(VRS)
-FILE= $(DIR).src.tar.bz2
+FILE= $(DIR).tar.gz
URL-$(FILE)= $(HTTPBLFS)/$(NM)/$(FILE)
-SHA-$(FILE)= e05d9390bfdb53e34be0a30ae495afc02ca08bad
+SHA-$(FILE)= c020254d5cc3abae32c7f39534727b1ad0bb3950
# Targets
@@ -20,12 +20,7 @@
$(std_build)
compile-stage2:
- patch -Np1 -i ../$(DIR)-fix_compile-1.patch
-ifeq ($(LFS-ARCH),sparc64)
- OPTIMIZER="-Os" CC="gcc -m64 $(64FLAGS)" make
-else
OPTIMIZER="-Os" make
-endif
make install
clean:
Deleted: branches/cross/packages/xfsprogs/xfsprogs-2.6.36-fix_compile-1.patch
===================================================================
--- branches/cross/packages/xfsprogs/xfsprogs-2.6.36-fix_compile-1.patch
2006-07-13 03:24:54 UTC (rev 1626)
+++ branches/cross/packages/xfsprogs/xfsprogs-2.6.36-fix_compile-1.patch
2006-07-13 04:05:24 UTC (rev 1627)
@@ -1,18 +0,0 @@
-Submitted By: Jeremy Huntwork <jhuntwork at linuxfromscratch dot org>
-Date: 2005-01-21
-Initial Package Version: 2.6.25
-Upstream Status: Not submitted [Test version]
-Description: Allows xfsprogs to compile cleanly with gcc-3.4.3
-
-diff -Naur xfsprogs-2.6.25.orig/libxfs/xfs_bmap.c
xfsprogs-2.6.25/libxfs/xfs_bmap.c
---- xfsprogs-2.6.25.orig/libxfs/xfs_bmap.c 2004-10-13 00:26:05.000000000
+0000
-+++ xfsprogs-2.6.25/libxfs/xfs_bmap.c 2005-01-21 21:30:08.530616880 +0000
-@@ -196,8 +196,6 @@
- }
- done:
- #ifdef DEBUG
-- if (!error)
-- xfs_bmap_check_leaf_extents(*curp, ip, whichfork);
- #endif
- *logflagsp = logflags;
- return error;
--
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
