Author: justin
Date: 2005-11-12 13:51:39 -0700 (Sat, 12 Nov 2005)
New Revision: 1064
Modified:
branches/dm/packages/file/Makefile
branches/dm/packages/m4/Makefile
branches/dm/packages/procps/Makefile
branches/dm/packages/shadow/Makefile
branches/dm/packages/vim/Makefile
Log:
Synced m4, file, shadow, vim and procps from trunk to dm branch.
Modified: branches/dm/packages/file/Makefile
===================================================================
--- branches/dm/packages/file/Makefile 2005-11-12 20:30:23 UTC (rev 1063)
+++ branches/dm/packages/file/Makefile 2005-11-12 20:51:39 UTC (rev 1064)
@@ -1,12 +1,12 @@
# File Makefile
NM= file
-VRS= 4.15
+VRS= 4.16
DIR= $(NM)-$(VRS)
FILE= $(DIR).tar.bz2
URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= 067947db9ad03ffd128214019d209927c93b0d16
+SHA-$(FILE)= aa99ab8e29d5833787e63d6380a4a03104df2554
# Targets
Modified: branches/dm/packages/m4/Makefile
===================================================================
--- branches/dm/packages/m4/Makefile 2005-11-12 20:30:23 UTC (rev 1063)
+++ branches/dm/packages/m4/Makefile 2005-11-12 20:51:39 UTC (rev 1064)
@@ -1,12 +1,12 @@
# M4 Makefile
NM= m4
-VRS= 1.4.3
+VRS= 1.4.4
DIR= $(NM)-$(VRS)
FILE= $(DIR).tar.bz2
URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= 51a4d360e5c22b7c0a849759079905b5a1fdcaa4
+SHA-$(FILE)= 47f8118e87cc31021c167ad6f92a0d5133a84046
# Targets
Modified: branches/dm/packages/procps/Makefile
===================================================================
--- branches/dm/packages/procps/Makefile 2005-11-12 20:30:23 UTC (rev
1063)
+++ branches/dm/packages/procps/Makefile 2005-11-12 20:51:39 UTC (rev
1064)
@@ -1,12 +1,12 @@
# Procps Makefile
NM= procps
-VRS= 3.2.5
+VRS= 3.2.6
DIR= $(NM)-$(VRS)
FILE= $(DIR).tar.bz2
URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= 188d0ccd6c7a655ae556fe1078c346cda1aca164
+SHA-$(FILE)= 74fe5e5fdb84d6dad6688d007a276c5c1e18a0be
# Targets
Modified: branches/dm/packages/shadow/Makefile
===================================================================
--- branches/dm/packages/shadow/Makefile 2005-11-12 20:30:23 UTC (rev
1063)
+++ branches/dm/packages/shadow/Makefile 2005-11-12 20:51:39 UTC (rev
1064)
@@ -1,13 +1,17 @@
# Shadow Makefile
NM= shadow
-VRS= 4.0.12
+VRS= 4.0.13
DIR= $(NM)-$(VRS)
FILE= $(DIR).tar.bz2
URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= cf54e6803d35a55ab8ed2df649f07c82d3a75b2c
+SHA-$(FILE)= 0f605460c7826d7974089faf793ee2a973c9a176
+PATCH1= $(DIR)-configure_fix-1.patch
+URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1)
+SHA-$(PATCH1)= e1bebfb21e574985db2433cbf2606ea13cd6972f
+
# Targets
include $(ROOT)/scripts/functions
@@ -16,12 +20,13 @@
chroot "$(MP)" $(chenv-post-bash) \
'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
-stage2: Makefile $(FILE)
+stage2: Makefile $(FILE) $(PATCH1)
$(std_build)
- cp $(SRC)/$(FILE) $(LFSSRC)
+ cp $(SRC)/{$(FILE),$(PATCH1)} $(LFSSRC)
compile-stage2:
ifndef CROSS
+ patch -Np1 -i ../$(PATCH1)
./configure --libdir=/lib --enable-shared
else
CC="gcc $(64FLAGS)" ./configure --libdir=/lib64 \
@@ -35,7 +40,7 @@
sed -e '[EMAIL PROTECTED]@MD5_CRYPT_ENAB yes@' \
-e 's@/var/spool/mail@/var/mail@' \
-e '[EMAIL PROTECTED]@MAIL_CHECK_ENAB no@' \
- etc/login.defs.linux > /etc/login.defs
+ etc/login.defs > /etc/login.defs
mv /usr/bin/passwd /bin
ifndef CROSS
mv /lib/libshadow.*a /usr/lib
Modified: branches/dm/packages/vim/Makefile
===================================================================
--- branches/dm/packages/vim/Makefile 2005-11-12 20:30:23 UTC (rev 1063)
+++ branches/dm/packages/vim/Makefile 2005-11-12 20:51:39 UTC (rev 1064)
@@ -1,21 +1,17 @@
# Vim Makefile
NM= vim
-VRS= 6.3
-DIR= $(NM)63
+VRS= 6.4
+DIR= $(NM)64
FILE= $(NM)-$(VRS).tar.bz2
URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= 76f663277140d314ecfafecb0307e832bdbbaf06
+SHA-$(FILE)= 4ecc16d704b303db25c52c6bc33ab65e661ace93
FILE2= $(NM)-$(VRS)-lang.tar.bz2
URL-$(FILE2)= $(HTTP)/$(NM)/$(FILE2)
-SHA-$(FILE2)= de6df42164d875ff0cf8b1fb16fb210fd21b6938
+SHA-$(FILE2)= 91ac269d6dbeff880b38d6b955a112bb591b62d7
-PATCH1= $(NM)-$(VRS)-security_fix-2.patch
-URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1)
-SHA-$(PATCH1)= 97c323f0c6ff807d89e8e3ce64f20101a097f281
-
# Targets
include $(ROOT)/scripts/functions
@@ -28,14 +24,13 @@
chroot "$(MP)" $(chenv-blfs) \
'cd $(ROOT) && make chroot-gvim $(chbash-post-bash)'
-stage2: Makefile $(FILE) $(FILE2) $(PATCH1)
+stage2: Makefile $(FILE) $(FILE2)
$(std_build)
- cp $(SRC)/{$(FILE),$(FILE2),$(PATCH1)} $(LFSSRC)
+ cp $(SRC)/{$(FILE),$(FILE2)} $(LFSSRC)
compile-stage2:
unpack ../$(FILE2) --strip-components=1
echo '#define SYS_VIMRC_FILE "/etc/vimrc"' >> src/feature.h
- patch -Np1 -i ../$(PATCH1)
ifndef CROSS
./configure --prefix=/usr --enable-multibyte
else
@@ -54,7 +49,6 @@
unpack ../$(FILE2) --strip-components=1
echo '#define SYS_VIMRC_FILE "/etc/vimrc"' >> src/feature.h
echo '#define SYS_GVIMRC_FILE "/etc/gvimrc"' >> src/feature.h
- patch -Np1 -i ../$(PATCH1)
./configure --prefix=/usr --with-features=huge
make $(PM)
make install
--
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
