r1373 - in trunk/packages: lynx sudo unzip

justin at linuxfromscratch.org justin at linuxfromscratch.org
Mon Jan 23 16:00:59 PST 2006


Author: justin
Date: 2006-01-23 17:00:57 -0700 (Mon, 23 Jan 2006)
New Revision: 1373

Modified:
   trunk/packages/lynx/Makefile
   trunk/packages/sudo/Makefile
   trunk/packages/unzip/Makefile
Log:
[trunk] Adjusted instructions for lynx (install full documentation), unzip (support large zip files) and sudo (added envvar_fix patch for security).

Modified: trunk/packages/lynx/Makefile
===================================================================
--- trunk/packages/lynx/Makefile	2006-01-23 23:46:58 UTC (rev 1372)
+++ trunk/packages/lynx/Makefile	2006-01-24 00:00:57 UTC (rev 1373)
@@ -26,11 +26,9 @@
 	make $(PM)
 	make install
 	sed -i 's/#LOCALE_CHARSET:FALSE/LOCALE_CHARSET:TRUE/' /etc/lynx.cfg
-	make docdir=/usr/share/doc/$(NM)-$(VRS)/lynx_doc \
-	 helpdir=/usr/share/doc/$(NM)-$(VRS)/lynx_help install-doc
-	make docdir=/usr/share/doc/$(NM)-$(VRS)/lynx_doc \
-	 helpdir=/usr/share/doc/$(NM)-$(VRS)/lynx_help install-help
-	chgrp -R root /usr/share/doc/$(NM)-$(VRS)/lynx_doc
+	make docdir=/usr/share/doc/$(NM)-$(VRS)/doc \
+	 helpdir=/usr/share/doc/$(NM)-$(VRS)/help install-full
+	chgrp -R root /usr/share/doc/$(NM)-$(VRS)/doc
 
 clean:
 	-rm -rf $(DIR)

Modified: trunk/packages/sudo/Makefile
===================================================================
--- trunk/packages/sudo/Makefile	2006-01-23 23:46:58 UTC (rev 1372)
+++ trunk/packages/sudo/Makefile	2006-01-24 00:00:57 UTC (rev 1373)
@@ -8,6 +8,10 @@
 URL-$(FILE)= $(HTTPBLFS)/$(NM)/$(FILE)
 SHA-$(FILE)= a8a2bfaf3912717cad30805e2debf58f5f95244b
 
+PATCH1= $(DIR)-envvar_fix-1.patch
+URL-$(PATCH1)= $(HTTPBLFS)/$(NM)/$(PATCH1)
+SHA-$(PATCH1)= 08d7579c7ca96a330e5eb7108b0d40bf689a751f
+
 # Targets
 
 include $(ROOT)/scripts/functions
@@ -16,12 +20,14 @@
 	chroot "$(MP)" $(chenv-blfs) \
 	'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
-stage2: Makefile $(FILE)
+stage2: Makefile $(FILE) $(PATCH1)
 	$(std_build)
 
 compile-stage2:
+	patch -Np1 -i ../$(PATCH1)
 	./configure --prefix=/usr --libexecdir=/usr/lib \
-	 --enable-noargs-shell --with-ignore-dot --with-all-insults
+	 --enable-noargs-shell --with-ignore-dot --with-all-insults \
+	 --enable-shell-sets-home
 	make
 	env -i PATH=$$PATH make install
 

Modified: trunk/packages/unzip/Makefile
===================================================================
--- trunk/packages/unzip/Makefile	2006-01-23 23:46:58 UTC (rev 1372)
+++ trunk/packages/unzip/Makefile	2006-01-24 00:00:57 UTC (rev 1373)
@@ -37,12 +37,12 @@
 	patch -Np1 -i ../$(PATCH3)
 	cp unix/Makefile .
 ifneq ($(LFS-ARCH),x86)
-	make prefix=/usr LOCAL_UNZIP=-DUSE_UNSHRINK linux_noasm
+	make prefix=/usr LOCAL_UNZIP=-D_FILE_OFFSET_BITS=64 linux_noasm
 else
-	make prefix=/usr LOCAL_UNZIP=-DUSE_UNSHRINK linux
-	make prefix=/usr LOCAL_UNZIP=-DUSE_UNSHRINK linux_shlibz
+	make prefix=/usr LOCAL_UNZIP=-D_FILE_OFFSET_BITS=64 linux
+	make prefix=/usr LOCAL_UNZIP=-D_FILE_OFFSET_BITS=64 linux_shlibz
 endif
-	make prefix=/usr LOCAL_UNZIP=-DUSE_UNSHRINK install
+	make prefix=/usr install
 ifeq ($(LFS-ARCH),x86)
 	cp -d libunzip.so* /usr/lib
 endif




More information about the livecd mailing list