updated

2026-01-27 18:20:07 +00:00 · 2018-02-01 23:24:43 +08:00
parent 3416000a7a
commit 615ede7d34
33 changed files with 1857 additions and 1339 deletions
--- a/core/REPO
+++ b/core/REPO
--- a/core/bc/bc.install
+++ b/core/bc/bc.install
@@ -1,14 +0,0 @@
-pre_install() {
-	if [ -d /tools ]; then
-		if [ ! -e /usr/lib/libncursesw.so.6 ]; then
-			ln -sv /tools/lib/libncursesw.so.6 /usr/lib/libncursesw.so.6
-		fi
-		ln -sfv libncurses.so.6 /usr/lib/libncurses.so
-	fi
-}
-
-post_install() {
-	if [ -d /tools ]; then
-		rm /usr/lib/{libncurses.so,libncursesw.so.6}
-	fi
-}
--- a/core/binutils/.md5sum
+++ b/core/binutils/.md5sum
@@ -1 +1 @@
-9af59a2ca3488823e453bb356fe0f113
+ffc476dd46c96f932875d1b2e27e929f
--- a/core/binutils/spkgbuild
+++ b/core/binutils/spkgbuild
@@ -4,9 +4,9 @@
 # depends	: glibc zlib

 name=binutils
-version=2.29.1
+version=2.30
 release=1
-source=(http://ftp.gnu.org/gnu/binutils/$name-$version.tar.bz2)
+source=(http://ftp.gnu.org/gnu/binutils/$name-$version.tar.xz)

 build() {
 	cd $name-$version
--- a/core/bzip2/bzip2-1.0.6-install_docs-1.patch
+++ b/core/bzip2/bzip2-1.0.6-install_docs-1.patch
@@ -0,0 +1,42 @@
+Submitted By:            Matthew Burgess <matthew@linuxfromscratch.org>
+Date:                    2007-01-31
+Initial Package Version: 1.0.4
+Upstream Status:         Not submitted
+Origin:                  Randy McMurchy & Steve Crosby
+Description:             Installs pre-formatted documentation
+
+diff -Naur bzip2-1.0.4.orig/Makefile bzip2-1.0.4/Makefile
+--- bzip2-1.0.4.orig/Makefile	2007-01-03 03:49:21.000000000 +0000
+++ bzip2-1.0.4/Makefile	2007-01-26 20:00:01.000000000 +0000
+@@ -25,7 +25,7 @@
+ 
+ # Where you want it installed when you do 'make install'
+ PREFIX=/usr/local
+-
+DOCDIR=share/doc/$(DISTNAME)
+ 
+ OBJS= blocksort.o  \
+       huffman.o    \
+@@ -74,6 +74,7 @@
+ 	if ( test ! -d $(PREFIX)/lib ) ; then mkdir -p $(PREFIX)/lib ; fi
+ 	if ( test ! -d $(PREFIX)/man ) ; then mkdir -p $(PREFIX)/man ; fi
+ 	if ( test ! -d $(PREFIX)/man/man1 ) ; then mkdir -p $(PREFIX)/man/man1 ; fi
+	if ( test ! -d $(PREFIX)/$(DOCDIR) ) ; then mkdir -p $(PREFIX)/$(DOCDIR); fi
+ 	if ( test ! -d $(PREFIX)/include ) ; then mkdir -p $(PREFIX)/include ; fi
+ 	cp -f bzip2 $(PREFIX)/bin/bzip2
+ 	cp -f bzip2 $(PREFIX)/bin/bunzip2
+@@ -107,6 +108,14 @@
+ 	echo ".so man1/bzgrep.1" > $(PREFIX)/man/man1/bzfgrep.1
+ 	echo ".so man1/bzmore.1" > $(PREFIX)/man/man1/bzless.1
+ 	echo ".so man1/bzdiff.1" > $(PREFIX)/man/man1/bzcmp.1
+	cp -f manual.html $(PREFIX)/$(DOCDIR)
+	cp -f manual.pdf $(PREFIX)/$(DOCDIR)
+	cp -f manual.ps $(PREFIX)/$(DOCDIR)
+	cp -f bzip2.txt $(PREFIX)/$(DOCDIR)
+	chmod a+r $(PREFIX)/$(DOCDIR)/manual.html
+	chmod a+r $(PREFIX)/$(DOCDIR)/manual.pdf
+	chmod a+r $(PREFIX)/$(DOCDIR)/manual.ps
+	chmod a+r $(PREFIX)/$(DOCDIR)/bzip2.txt
+ 
+ clean: 
+ 	rm -f *.o libbz2.a bzip2 bzip2recover \
--- a/core/bzip2/spkgbuild
+++ b/core/bzip2/spkgbuild
@@ -7,7 +7,7 @@ name=bzip2
 version=1.0.6
 release=1
 source=(http://www.bzip.org/$version/$name-$version.tar.gz
-	http://www.linuxfromscratch.org/patches/lfs/8.1/$name-$version-install_docs-1.patch)
+	$name-$version-install_docs-1.patch)

 build() {
 	cd $name-$version
--- a/core/expat/.md5sum
+++ b/core/expat/.md5sum
@@ -1 +1 @@
-6e3980aba29a224a9f478d88ac7ec207
+789e297f547980fc9ecc036f9a070d49
--- a/core/expat/spkgbuild
+++ b/core/expat/spkgbuild
@@ -4,7 +4,7 @@
 # depends	: glibc

 name=expat
-version=2.2.4
+version=2.2.5
 release=1
 source=(http://prdownloads.sourceforge.net/$name/$name-$version.tar.bz2)

--- a/core/gcc/.md5sum
+++ b/core/gcc/.md5sum
@@ -1 +1 @@
-ff370482573133a7fcdd96cd2f552292
+be2da21680f27624f3a87055c4ba5af2
--- a/core/gcc/spkgbuild
+++ b/core/gcc/spkgbuild
@@ -4,19 +4,15 @@
 # depends	: binutils glibc

 name=gcc
-version=7.2.0
+version=7.3.0
 release=1
 source=(http://ftp.gnu.org/gnu/$name/$name-$version/$name-$version.tar.xz)

 build() {
 	cd $name-$version

-	case $(uname -m) in
-	  x86_64)
-	    sed -e '/m64=/s/lib64/lib/' \
-	        -i.orig gcc/config/i386/t-linux64
-	  ;;
-	esac
+	sed -e '/m64=/s/lib64/lib/' \
+	    -i.orig gcc/config/i386/t-linux64

 	mkdir -v build
 	cd       build
--- a/core/glibc/.md5sum
+++ b/core/glibc/.md5sum
@@ -1,2 +1,3 @@
 102f637c3812f81111f48f2427611be1
 9a5997c3452909b1769918c759eff8a2
+1377e4f5422c6672ff48d430c07b245c
--- a/core/glibc/glibc-2.26-fhs-1.patch
+++ b/core/glibc/glibc-2.26-fhs-1.patch
@@ -0,0 +1,72 @@
+Submitted By:            Armin K. <krejzi at email dot com>
+Date:                    2013-02-11
+Initial Package Version: 2.17
+Upstream Status:         Not Applicable
+Origin:                  Self
+Description:             This patch removes references to /var/db directory which is not part
+                         of FHS and replaces them with more suitable directories in /var
+                         hierarchy - /var/cache/nscd for nscd and /var/lib/nss_db for nss_db.
+
+--- a/Makeconfig	2012-12-25 04:02:13.000000000 +0100
+++ b/Makeconfig	2013-02-11 01:32:32.500667439 +0100
+@@ -250,7 +250,7 @@
+ 
+ # Directory for the database files and Makefile for nss_db.
+ ifndef vardbdir
+-vardbdir = $(localstatedir)/db
+vardbdir = $(localstatedir)/lib/nss_db
+ endif
+ inst_vardbdir = $(install_root)$(vardbdir)
+ 
+--- a/nscd/nscd.h	2012-12-25 04:02:13.000000000 +0100
+++ b/nscd/nscd.h	2013-02-11 01:32:32.500667439 +0100
+@@ -112,11 +112,11 @@
+ 
+ 
+ /* Paths of the file for the persistent storage.  */
+-#define _PATH_NSCD_PASSWD_DB	"/var/db/nscd/passwd"
+-#define _PATH_NSCD_GROUP_DB	"/var/db/nscd/group"
+-#define _PATH_NSCD_HOSTS_DB	"/var/db/nscd/hosts"
+-#define _PATH_NSCD_SERVICES_DB	"/var/db/nscd/services"
+-#define _PATH_NSCD_NETGROUP_DB	"/var/db/nscd/netgroup"
+#define _PATH_NSCD_PASSWD_DB	"/var/cache/nscd/passwd"
+#define _PATH_NSCD_GROUP_DB	"/var/cache/nscd/group"
+#define _PATH_NSCD_HOSTS_DB	"/var/cache/nscd/hosts"
+#define _PATH_NSCD_SERVICES_DB	"/var/cache/nscd/services"
+#define _PATH_NSCD_NETGROUP_DB	"/var/cache/nscd/netgroup"
+ 
+ /* Path used when not using persistent storage.  */
+ #define _PATH_NSCD_XYZ_DB_TMP	"/var/run/nscd/dbXXXXXX"
+--- a/nss/db-Makefile	2012-12-25 04:02:13.000000000 +0100
+++ b/nss/db-Makefile	2013-02-11 01:32:32.500667439 +0100
+@@ -22,7 +22,7 @@
+ 		       /etc/rpc /etc/services /etc/shadow /etc/gshadow \
+ 		       /etc/netgroup)
+ 
+-VAR_DB = /var/db
+VAR_DB = /var/lib/nss_db
+ 
+ AWK = awk
+ MAKEDB = makedb --quiet
+--- a/sysdeps/generic/paths.h	2012-12-25 04:02:13.000000000 +0100
+++ b/sysdeps/generic/paths.h	2013-02-11 01:32:32.500667439 +0100
+@@ -68,7 +68,7 @@
+ /* Provide trailing slash, since mostly used for building pathnames. */
+ #define	_PATH_DEV	"/dev/"
+ #define	_PATH_TMP	"/tmp/"
+-#define	_PATH_VARDB	"/var/db/"
+#define	_PATH_VARDB	"/var/lib/nss_db/"
+ #define	_PATH_VARRUN	"/var/run/"
+ #define	_PATH_VARTMP	"/var/tmp/"
+ 
+--- a/sysdeps/unix/sysv/linux/paths.h	2012-12-25 04:02:13.000000000 +0100
+++ b/sysdeps/unix/sysv/linux/paths.h	2013-02-11 01:32:32.504000831 +0100
+@@ -68,7 +68,7 @@
+ /* Provide trailing slash, since mostly used for building pathnames. */
+ #define	_PATH_DEV	"/dev/"
+ #define	_PATH_TMP	"/tmp/"
+-#define	_PATH_VARDB	"/var/db/"
+#define	_PATH_VARDB	"/var/lib/nss_db/"
+ #define	_PATH_VARRUN	"/var/run/"
+ #define	_PATH_VARTMP	"/var/tmp/"
+ 
--- a/core/glibc/glibc-2.26-local_glob_exploits-2.patch
+++ b/core/glibc/glibc-2.26-local_glob_exploits-2.patch
@@ -0,0 +1,58 @@
+Submitted by:            DJ Lucas (dj_AT_linuxfromscratch_DOT_org)
+Date:                    2017-12-24
+Initial Package Version: 2.26
+Upstream Status:         Comitted
+Origin:                  https://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=c369d66e5426a30e4725b100d5cd28e372754f90
+                         and https://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=a159b53fa059947cc2548e3b0d5bdcf7b9630ba8
+Description:             Fixes local-only exploits in glob functions idetified
+                         in CVE-2017-15670 and CVE-2017-15671
+
+diff -Naurp glibc-2.26-orig/ChangeLog glibc-2.26/ChangeLog
+--- glibc-2.26-orig/ChangeLog	2017-12-23 23:16:40.669052891 -0600
+++ glibc-2.26/ChangeLog	2017-12-23 23:30:21.240500323 -0600
+@@ -1,3 +1,19 @@
+2017-10-21  Paul Eggert <eggert@cs.ucla.edu>
+
+	glob: fix another heap buffer overflow
+	Problem reported by Tim Rühsen in:
+	https://sourceware.org/bugzilla/show_bug.cgi?id=22332
+	* lib/glob.c (glob): Avoid buffer overrun when unescaping.
+
+2017-10-19  Paul Eggert  <eggert@cs.ucla.edu>
+
+	glob: fix heap buffer overflow
+	* lib/glob.c (glob): Fix off-by-one error introduced into
+	glibc in commit dd7d45e838a42b0ed470c44b55901ea98d0c2bab
+	dated 1997-10-29 20:33:40.  Problem reported by Tim Rühsen in:
+	https://sourceware.org/bugzilla/show_bug.cgi?id=22320
+	Fix suggested by Bruno Haible.
+
+ 2017-08-02  Siddhesh Poyarekar  <siddhesh@sourceware.org>
+ 
+ 	* version.h (RELEASE): Set to "stable"
+diff -Naurp glibc-2.26-orig/posix/glob.c glibc-2.26/posix/glob.c
+--- glibc-2.26-orig/posix/glob.c	2017-12-23 23:16:40.803052829 -0600
+++ glibc-2.26/posix/glob.c	2017-12-24 12:59:03.197896628 -0600
+@@ -823,11 +823,11 @@ glob (const char *pattern, int flags, in
+ 		  char *p = mempcpy (newp, dirname + 1,
+ 				     unescape - dirname - 1);
+ 		  char *q = unescape;
+-		  while (*q != '\0')
+		  while (q != end_name)
+ 		    {
+ 		      if (*q == '\\')
+ 			{
+-			  if (q[1] == '\0')
+			  if (q + 1 == end_name)
+ 			    {
+ 			      /* "~fo\\o\\" unescape to user_name "foo\\",
+ 				 but "~fo\\o\\/" unescape to user_name
+@@ -843,7 +843,7 @@ glob (const char *pattern, int flags, in
+ 		  *p = '\0';
+ 		}
+ 	      else
+-		*((char *) mempcpy (newp, dirname + 1, end_name - dirname))
+		*((char *) mempcpy (newp, dirname + 1, end_name - dirname - 1))
+ 		  = '\0';
+ 	      user_name = newp;
+ 	    }
--- a/core/glibc/glibc.install
+++ b/core/glibc/glibc.install
@@ -1,30 +0,0 @@
-post_install() {
-
-	if [ -d /tools ] && [ ! -f /tools/bin/ld-old ]; then
-		mv -v /tools/bin/{ld,ld-old}
-		mv -v /tools/$(uname -m)-pc-linux-gnu/bin/{ld,ld-old}
-		mv -v /tools/bin/{ld-new,ld}
-		ln -sv /tools/bin/ld /tools/$(uname -m)-pc-linux-gnu/bin/ld
-
-		gcc -dumpspecs | sed -e 's@/tools@@g'                   \
-			-e '/\*startfile_prefix_spec:/{n;s@.*@/usr/lib/ @}' \
-			-e '/\*cpp:/{n;s@$@ -isystem /usr/include@}' >      \
-			`dirname $(gcc --print-libgcc-file-name)`/specs
-
-	echo 'int main(){}' > dummy.c
-	cc dummy.c -v -Wl,--verbose &> dummy.log
-	readelf -l a.out | grep ': /lib'
-
-	grep -o '/usr/lib.*/crt[1in].*succeeded' dummy.log
-
-	grep -B1 '^ /usr/include' dummy.log
-
-	grep 'SEARCH.*/usr/lib' dummy.log |sed 's|; |\n|g'
-
-	grep "/lib.*/libc.so.6 " dummy.log
-
-	grep found dummy.log
-
-	rm -v dummy.c a.out dummy.log
-	fi
-}
--- a/core/glibc/spkgbuild
+++ b/core/glibc/spkgbuild
@@ -7,28 +7,23 @@ name=glibc
 version=2.26
 release=1
 source=(http://ftp.gnu.org/gnu/$name/$name-$version.tar.xz
-	http://www.linuxfromscratch.org/patches/lfs/development/$name-$version-fhs-1.patch)
+	$name-$version-fhs-1.patch
+	$name-$version-local_glob_exploits-2.patch)

 build() {
 	cd $name-$version

 	patch -Np1 -i ../$name-$version-fhs-1.patch
+	patch -Np1 -i ../$name-$version-local_glob_exploits-2.patch

 	mkdir -p $PKG/usr/lib
 	ln -sfv /tools/lib/gcc $PKG/usr/lib

-	case $(uname -m) in
-	    i?86)    GCC_INCDIR=$PKG/usr/lib/gcc/$(uname -m)-pc-linux-gnu/7.2.0/include
-	            mkdir $PKG/lib
-		    ln -sfv ld-linux.so.2 $PKG/lib/ld-lsb.so.3
-	    ;;
-	    x86_64) GCC_INCDIR=$PKG/usr/lib/gcc/x86_64-pc-linux-gnu/7.2.0/include
-		    mkdir $PKG/lib64
-	            ln -sfv ../lib/ld-linux-x86-64.so.2 $PKG/lib64
-	            ln -sfv ../lib/ld-linux-x86-64.so.2 $PKG/lib64/ld-lsb-x86-64.so.3
-	    ;;
-	esac
-
+	GCC_INCDIR=$PKG/usr/lib/gcc/x86_64-pc-linux-gnu/7.3.0/include
+	mkdir $PKG/lib64
+	ln -sfv ../lib/ld-linux-x86-64.so.2 $PKG/lib64
+	ln -sfv ../lib/ld-linux-x86-64.so.2 $PKG/lib64/ld-lsb-x86-64.so.3
+	
 	rm -f $PKG/usr/include/limits.h

 	mkdir -v build
--- a/core/kbd/kbd-2.0.4-backspace-1.patch
+++ b/core/kbd/kbd-2.0.4-backspace-1.patch
@@ -0,0 +1,250 @@
+Submitted By: Matt Burgess
+Date: 2008-12-06
+Initial Package Version: 1.15
+Upstream Status: Not submitted, possibly incomplete
+Description: Makes Backspace and Delete keys consistent in all i386 keymaps.
+Makes the Backspace key send character code 127, and Delete send a well known
+escape sequence. Obsoletes the /etc/kbd/bs-sends-del file for i386.
+
+Original patch for 1.12 by Alexander Patrakov.
+Updated for 1.13 (drop ru.map, the change is upstream, and add ru_win.map,
+ru-cp1251.map) by Ken Moffat <ken at linuxfromscratch dot org>.
+Re-diffed against 1.15 by Matt Burgess <matthew at linuxfromscratch.org>.
+
+diff -Naur kbd-1.15.orig/data/keymaps/i386/dvorak/dvorak-l.map kbd-1.15/data/keymaps/i386/dvorak/dvorak-l.map
+--- kbd-1.15.orig/data/keymaps/i386/dvorak/dvorak-l.map	2008-06-20 12:36:01.000000000 +0100
+++ kbd-1.15/data/keymaps/i386/dvorak/dvorak-l.map	2008-12-03 22:27:55.000000000 +0000
+@@ -43,7 +43,7 @@
+ 		keycode  11 = three		numbersign
+ 		keycode  12 = two		at
+ 		keycode  13 = one		exclam
+-		keycode  14 = BackSpace		Delete
+		keycode  14 = Delete		Delete
+ ! --------------------------------------------------------------------------
+ ! Row 3
+ ! --------------------------------------------------------------------------
+diff -Naur kbd-1.15.orig/data/keymaps/i386/dvorak/dvorak-r.map kbd-1.15/data/keymaps/i386/dvorak/dvorak-r.map
+--- kbd-1.15.orig/data/keymaps/i386/dvorak/dvorak-r.map	2008-06-20 12:36:01.000000000 +0100
+++ kbd-1.15/data/keymaps/i386/dvorak/dvorak-r.map	2008-12-03 22:28:13.000000000 +0000
+@@ -43,7 +43,7 @@
+ 		keycode  11 = slash		question
+ 		keycode  12 = bracketleft	braceleft
+ 		keycode  13 = bracketright	braceright
+-		keycode  14 = BackSpace		Delete
+		keycode  14 = Delete		Delete
+ ! --------------------------------------------------------------------------
+ ! Row 3
+ ! --------------------------------------------------------------------------
+diff -Naur kbd-1.15.orig/data/keymaps/i386/fgGIod/tr_f-latin5.map kbd-1.15/data/keymaps/i386/fgGIod/tr_f-latin5.map
+--- kbd-1.15.orig/data/keymaps/i386/fgGIod/tr_f-latin5.map	2008-10-23 20:03:58.000000000 +0100
+++ kbd-1.15/data/keymaps/i386/fgGIod/tr_f-latin5.map	2008-12-03 22:40:32.000000000 +0000
+@@ -51,7 +51,7 @@
+ 	alt     keycode  12 = Meta_minus      
+ keycode  13 = minus            underscore      
+ 	alt     keycode  13 = Meta_equal      
+-keycode  14 = BackSpace           Delete          
+keycode  14 = Delete           Delete          
+ 	alt     keycode  14 = Meta_Delete     
+ keycode  15 = Tab              Meta_Tab             
+ 	alt     keycode  15 = Meta_Tab        
+diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/lt.l4.map kbd-1.15/data/keymaps/i386/qwerty/lt.l4.map
+--- kbd-1.15.orig/data/keymaps/i386/qwerty/lt.l4.map	2008-10-23 20:03:59.000000000 +0100
+++ kbd-1.15/data/keymaps/i386/qwerty/lt.l4.map	2008-12-03 22:42:14.000000000 +0000
+@@ -205,7 +205,7 @@
+ #	edit this if you want the key above <Enter> to delete symbols above
+ # cursor, not before.
+ keycode  14 = \
+-	      BackSpace	       BackSpace	BackSpace	 BackSpace  \
+	      Delete	       Delete		Delete		 Delete	     \
+ 	      Delete	       Delete		Delete		 Delete	     \
+ 	      Meta_BackSpace   Meta_BackSpace	Meta_BackSpace Meta_BackSpace \
+ 	      Meta_Delete      Meta_Delete	Meta_Delete	 Meta_Delete  
+@@ -506,7 +506,7 @@
+ 
+ # Edit this if you want strict VT100 emulation.
+ string F111 = "\033[3$"
+-keycode 111 = Delete	       F111		Delete		 F111	   \
+keycode 111 = Remove	       F111		Remove		 F111	   \
+ 	      Remove	       Remove		Remove		 Remove	    \
+ 	      Meta_Delete      Meta_Delete	Meta_Delete	 Meta_Delete \
+ 	      Boot	       Boot		Boot		 Boot
+diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/lt.map kbd-1.15/data/keymaps/i386/qwerty/lt.map
+--- kbd-1.15.orig/data/keymaps/i386/qwerty/lt.map	2008-10-23 20:03:59.000000000 +0100
+++ kbd-1.15/data/keymaps/i386/qwerty/lt.map	2008-12-03 22:42:58.000000000 +0000
+@@ -204,7 +204,7 @@
+ #	edit this if you want the key above <Enter> to delete symbols above
+ # cursor, not before.
+ keycode  14 = \
+-	      BackSpace	       BackSpace	BackSpace	 BackSpace  \
+	      Delete	       Delete		Delete		 Delete	     \
+ 	      Delete	       Delete		Delete		 Delete	     \
+ 	      Meta_BackSpace   Meta_BackSpace	Meta_BackSpace Meta_BackSpace \
+ 	      Meta_Delete      Meta_Delete	Meta_Delete	 Meta_Delete  
+@@ -505,7 +505,7 @@
+ 
+ # Edit this if you want strict VT100 emulation.
+ string F111 = "\033[3$"
+-keycode 111 = Delete	       F111		Delete		 F111	   \
+keycode 111 = Remove	       F111		Remove		 F111	   \
+ 	      Remove	       Remove		Remove		 Remove	    \
+ 	      Meta_Delete      Meta_Delete	Meta_Delete	 Meta_Delete \
+ 	      Boot	       Boot		Boot		 Boot
+diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/no-latin1.map kbd-1.15/data/keymaps/i386/qwerty/no-latin1.map
+--- kbd-1.15.orig/data/keymaps/i386/qwerty/no-latin1.map	2008-06-20 12:36:00.000000000 +0100
+++ kbd-1.15/data/keymaps/i386/qwerty/no-latin1.map	2008-12-03 22:44:25.000000000 +0000
+@@ -3,7 +3,7 @@
+ # Send comments to Kjetil T. Homme <kjetilho@ifi.uio.no>
+ include "linux-with-alt-and-altgr"
+ 	plain keycode  83 = KP_Comma
+-	plain keycode 111 = Delete		# "Remove" originally, weird...
+	plain keycode 111 = Remove
+ strings as usual
+ 
+ 	keycode   1 = Escape
+diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ru1.map kbd-1.15/data/keymaps/i386/qwerty/ru1.map
+--- kbd-1.15.orig/data/keymaps/i386/qwerty/ru1.map	2008-10-23 20:03:59.000000000 +0100
+++ kbd-1.15/data/keymaps/i386/qwerty/ru1.map	2008-12-03 22:45:32.000000000 +0000
+@@ -143,8 +143,8 @@
+ 
+ # The keycode "0xFF" is too dangerous for many programs (including emacs).
+ # So let it be bracket instead of Hard Sign.
+-# altgr		keycode  27 = 	+0xDF
+-# altgr	shift 	keycode  27 = 	+0xFF
+altgr		keycode  27 = 	+0xDF
+altgr	shift 	keycode  27 = 	+0xFF
+ 	control	keycode  27 =	Control_bracketright
+ altgr	control	keycode  27 =	Control_bracketright
+ 	alt	keycode  27 =	Meta_bracketright
+diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ru2.map kbd-1.15/data/keymaps/i386/qwerty/ru2.map
+--- kbd-1.15.orig/data/keymaps/i386/qwerty/ru2.map	2008-10-23 20:03:59.000000000 +0100
+++ kbd-1.15/data/keymaps/i386/qwerty/ru2.map	2008-12-03 22:46:15.000000000 +0000
+@@ -46,7 +46,7 @@
+ 	alt	keycode  12 =	Meta_minus
+ 		keycode  13 =	equal	plus		equal	plus
+ 	alt	keycode  13 =	Meta_equal
+-		keycode  14 =	BackSpace BackSpace	BackSpace BackSpace
+		keycode  14 =	Delete Delete	Delete Delete
+ 	alt	keycode  14 =	Meta_Delete
+ 		keycode  15 =	Tab	Tab		Tab	Tab	
+ 	alt	keycode  15 =	Meta_Tab	
+diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ru-cp1251.map kbd-1.15/data/keymaps/i386/qwerty/ru-cp1251.map
+--- kbd-1.15.orig/data/keymaps/i386/qwerty/ru-cp1251.map	2008-10-23 20:03:59.000000000 +0100
+++ kbd-1.15/data/keymaps/i386/qwerty/ru-cp1251.map	2008-12-03 22:47:12.000000000 +0000
+@@ -39,7 +39,7 @@
+ 	alt	keycode  12 =	Meta_minus
+ 		keycode  13 =	equal	plus		equal	plus
+ 	alt	keycode  13 =	Meta_equal
+-		keycode  14 =	BackSpace
+		keycode  14 =	Delete
+ 	alt	keycode  14 =	Meta_Delete
+ 		keycode  15 =	Tab
+ 	alt	keycode  15 =	Meta_Tab	
+diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ru-ms.map kbd-1.15/data/keymaps/i386/qwerty/ru-ms.map
+--- kbd-1.15.orig/data/keymaps/i386/qwerty/ru-ms.map	2008-10-23 20:03:59.000000000 +0100
+++ kbd-1.15/data/keymaps/i386/qwerty/ru-ms.map	2008-12-03 22:48:10.000000000 +0000
+@@ -89,8 +89,8 @@
+ altgr	alt     keycode  13 =    Meta_equal
+ 	shift alt keycode  13 = 	Meta_plus
+ altgr	shift alt keycode  13 = 	Meta_plus
+-		keycode  14 = 	BackSpace  BackSpace  BackSpace  BackSpace
+-#		keycode  14 = 	Delete  Delete  Delete  Delete
+#		keycode  14 = 	BackSpace  BackSpace  BackSpace  BackSpace
+		keycode  14 = 	Delete  Delete  Delete  Delete
+ 	alt	keycode  14 =	Meta_Delete
+ altgr	alt     keycode  14 = 	Meta_Delete
+ 		keycode  15 =	Tab	Tab		Tab	Tab	
+diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ru_win.map kbd-1.15/data/keymaps/i386/qwerty/ru_win.map
+--- kbd-1.15.orig/data/keymaps/i386/qwerty/ru_win.map	2008-10-23 20:03:59.000000000 +0100
+++ kbd-1.15/data/keymaps/i386/qwerty/ru_win.map	2008-12-03 22:49:17.000000000 +0000
+@@ -42,7 +42,7 @@
+ 	alt	keycode  12 =	Meta_minus
+ 		keycode  13 =	equal	plus		equal	plus
+ 	alt	keycode  13 =	Meta_equal
+-		keycode  14 =	BackSpace BackSpace	BackSpace BackSpace
+		keycode  14 =	Delete Delete	Delete Delete
+ 	alt	keycode  14 =	Meta_Delete
+ 		keycode  15 =	Tab	Tab		Tab	Tab	
+ 	alt	keycode  15 =	Meta_Tab	
+diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/se-ir209.map kbd-1.15/data/keymaps/i386/qwerty/se-ir209.map
+--- kbd-1.15.orig/data/keymaps/i386/qwerty/se-ir209.map	2008-10-23 20:03:59.000000000 +0100
+++ kbd-1.15/data/keymaps/i386/qwerty/se-ir209.map	2008-12-03 22:50:18.000000000 +0000
+@@ -345,7 +345,7 @@
+ 	keycode 109 = Next	Scroll_Forward
+ 	keycode 110 = Insert
+ 
+-	keycode 111 = Delete		# "Remove" originally, weird...
+	keycode 111 = Remove
+ control alt	keycode 111 = Boot
+ control altgr	keycode 111 = Boot
+ 
+diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/se-lat6.map kbd-1.15/data/keymaps/i386/qwerty/se-lat6.map
+--- kbd-1.15.orig/data/keymaps/i386/qwerty/se-lat6.map	2008-10-23 20:03:59.000000000 +0100
+++ kbd-1.15/data/keymaps/i386/qwerty/se-lat6.map	2008-12-03 22:50:44.000000000 +0000
+@@ -374,6 +374,6 @@
+ 	keycode 109 = Next	Scroll_Forward
+ 	keycode 110 = Insert
+ 
+-	keycode 111 = Delete		# "Remove" originally, weird...
+	keycode 111 = Remove
+ control alt	keycode 111 = Boot
+ control altgr	keycode 111 = Boot
+diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/tr_q-latin5.map kbd-1.15/data/keymaps/i386/qwerty/tr_q-latin5.map
+--- kbd-1.15.orig/data/keymaps/i386/qwerty/tr_q-latin5.map	2008-10-23 20:03:59.000000000 +0100
+++ kbd-1.15/data/keymaps/i386/qwerty/tr_q-latin5.map	2008-12-03 22:52:09.000000000 +0000
+@@ -49,7 +49,7 @@
+ 	alt     keycode  12 = Meta_minus
+ keycode  13 = minus            underscore
+ 	alt     keycode  13 = Meta_equal
+-keycode  14 = BackSpace           Delete
+keycode  14 = Delete           Delete
+ 	alt     keycode  14 = Meta_Delete
+ keycode  15 = Tab              Meta_Tab
+ 	alt     keycode  15 = Meta_Tab
+diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ua.map kbd-1.15/data/keymaps/i386/qwerty/ua.map
+--- kbd-1.15.orig/data/keymaps/i386/qwerty/ua.map	2008-10-23 20:03:59.000000000 +0100
+++ kbd-1.15/data/keymaps/i386/qwerty/ua.map	2008-12-03 22:52:52.000000000 +0000
+@@ -249,7 +249,7 @@
+ 	shift ctrll ctrlr keycode  13 = plus
+ 	alt ctrll ctrlr keycode  13 = Meta_equal
+ 	shift alt ctrll ctrlr keycode  13 = Meta_plus
+-keycode  14 = BackSpace           Delete          
+keycode  14 = Delete           Delete          
+ 	control	keycode  14 = BackSpace       
+ 	alt	keycode  14 = Meta_Delete     
+ 	ctrlr	keycode  14 = BackSpace
+diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ua-utf.map kbd-1.15/data/keymaps/i386/qwerty/ua-utf.map
+--- kbd-1.15.orig/data/keymaps/i386/qwerty/ua-utf.map	2008-10-23 20:03:59.000000000 +0100
+++ kbd-1.15/data/keymaps/i386/qwerty/ua-utf.map	2008-12-03 22:53:36.000000000 +0000
+@@ -250,7 +250,7 @@
+ 	shift ctrll ctrlr keycode  13 = plus
+ 	alt ctrll ctrlr keycode  13 = Meta_equal
+ 	shift alt ctrll ctrlr keycode  13 = Meta_plus
+-keycode  14 = BackSpace           Delete          
+keycode  14 = Delete           Delete          
+ 	control	keycode  14 = BackSpace       
+ 	alt	keycode  14 = Meta_Delete     
+ 	ctrlr	keycode  14 = BackSpace
+diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ua-utf-ws.map kbd-1.15/data/keymaps/i386/qwerty/ua-utf-ws.map
+--- kbd-1.15.orig/data/keymaps/i386/qwerty/ua-utf-ws.map	2008-10-23 20:03:59.000000000 +0100
+++ kbd-1.15/data/keymaps/i386/qwerty/ua-utf-ws.map	2008-12-03 22:54:06.000000000 +0000
+@@ -260,7 +260,7 @@
+ 	shift ctrll ctrlr keycode  13 = plus
+ 	alt ctrll ctrlr keycode  13 = Meta_equal
+ 	shift alt ctrll ctrlr keycode  13 = Meta_plus
+-keycode  14 = BackSpace           Delete          
+keycode  14 = Delete           Delete          
+ 	control	keycode  14 = BackSpace       
+ 	alt	keycode  14 = Meta_Delete     
+ 	ctrlr	keycode  14 = BackSpace
+diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ua-ws.map kbd-1.15/data/keymaps/i386/qwerty/ua-ws.map
+--- kbd-1.15.orig/data/keymaps/i386/qwerty/ua-ws.map	2008-10-23 20:03:59.000000000 +0100
+++ kbd-1.15/data/keymaps/i386/qwerty/ua-ws.map	2008-12-03 22:54:23.000000000 +0000
+@@ -260,7 +260,7 @@
+ 	shift ctrll ctrlr keycode  13 = plus
+ 	alt ctrll ctrlr keycode  13 = Meta_equal
+ 	shift alt ctrll ctrlr keycode  13 = Meta_plus
+-keycode  14 = BackSpace           Delete          
+keycode  14 = Delete           Delete          
+ 	control	keycode  14 = BackSpace       
+ 	alt	keycode  14 = Meta_Delete     
+ 	ctrlr	keycode  14 = BackSpace
--- a/core/kbd/spkgbuild
+++ b/core/kbd/spkgbuild
@@ -7,7 +7,7 @@ name=kbd
 version=2.0.4
 release=2
 source=(https://www.kernel.org/pub/linux/utils/$name/$name-$version.tar.xz
-	http://www.linuxfromscratch.org/patches/lfs/8.1/$name-$version-backspace-1.patch)
+	$name-$version-backspace-1.patch)

 build() {
 	cd $name-$version
--- a/core/libmpc/.md5sum
+++ b/core/libmpc/.md5sum
@@ -1 +1 @@
-d6a1d5f8ddea3abd2cc3e98f58352d26
+4125404e41e482ec68282a2e687f6c73
--- a/core/libmpc/spkgbuild
+++ b/core/libmpc/spkgbuild
@@ -4,7 +4,7 @@
 # depdends	: mpfr

 name=libmpc
-version=1.0.3
+version=1.1.0
 release=1
 source=(http://www.multiprecision.org/mpc/download/mpc-$version.tar.gz)

--- a/core/linux-api-headers/.md5sum
+++ b/core/linux-api-headers/.md5sum
@@ -1 +1 @@
-14121b587ba1a526c0ca4c42f4ea98d3
+0d701ac1e2a67d47ce7127432df2c32b
--- a/core/linux-api-headers/spkgbuild
+++ b/core/linux-api-headers/spkgbuild
@@ -2,7 +2,7 @@
 # depends	: bc inetutils kmod

 name=linux-api-headers
-version=4.13.8
+version=4.15
 release=1
 source=(https://www.kernel.org/pub/linux/kernel/v4.x/linux-$version.tar.xz)

--- a/core/mpfr/.md5sum
+++ b/core/mpfr/.md5sum
@@ -1 +1 @@
-51bfdbf81553966c8d43808122cc81b3
+94c67b3cfbee10605a5e59d0ed9161db
--- a/core/mpfr/spkgbuild
+++ b/core/mpfr/spkgbuild
@@ -4,7 +4,7 @@
 # depends	: gmp

 name=mpfr
-version=3.1.6
+version=4.0.0
 release=1
 source=(http://www.mpfr.org/$name-$version/$name-$version.tar.xz)

--- a/core/ncurses/.md5sum
+++ b/core/ncurses/.md5sum
@@ -1 +1 @@
-ee13d052e1ead260d7c28071f46eefb1
+98c889aaf8d23910d2b92d65be2e737a
--- a/core/ncurses/spkgbuild
+++ b/core/ncurses/spkgbuild
@@ -4,7 +4,7 @@
 # depends	: glibc gcc

 name=ncurses
-version=6.0
+version=6.1
 release=1
 source=(http://ftp.gnu.org/gnu//$name/$name-$version.tar.gz)

--- a/core/perl/perl.install
+++ b/core/perl/perl.install
@@ -1,12 +0,0 @@
-pre_install() {
-	if [ ! -f /etc/hosts ]; then
-		echo "#tmp perl hosts file
-127.0.0.1 localhost $(hostname)" > /etc/hosts
-	fi
-}
-
-post_install() {
-	if [ -f /etc/hosts ] && [ "$(grep ^'#tmp perl hosts file' /etc/hosts)" ]; then
-		rm /etc/hosts
-	fi
-}
--- a/core/rc-init/.md5sum
+++ b/core/rc-init/.md5sum
@@ -0,0 +1 @@
+93c2476b6aa7b8805d343a4f7046da3d
--- a/core/rc-init/spkgbuild
+++ b/core/rc-init/spkgbuild
@@ -0,0 +1,14 @@
+# description	: BSD-style init-script
+# backup	: etc/rc.conf
+
+name=rc-init
+version=20180121
+_commit=50bdc9a318e6bd512b165b67790885ee1d05da9a
+release=1
+source=($name-$version.tar.gz::https://github.com/emmett1/rc-init/archive/${_commit}.tar.gz)
+
+build() {
+	cd $name-${_commit}
+
+	DESTDIR=$PKG ./INSTALL.sh
+}
--- a/core/sysvinit/spkgbuild
+++ b/core/sysvinit/spkgbuild
@@ -6,7 +6,7 @@ name=sysvinit
 version=2.88dsf
 release=1
 source=(http://download.savannah.gnu.org/releases/$name/$name-$version.tar.bz2
-	http://www.linuxfromscratch.org/patches/lfs/8.1/$name-$version-consolidated-1.patch)
+	$name-$version-consolidated-1.patch)

 build() {
 	cd $name-$version
--- a/core/sysvinit/sysvinit-2.88dsf-consolidated-1.patch
+++ b/core/sysvinit/sysvinit-2.88dsf-consolidated-1.patch
@@ -0,0 +1,136 @@
+Submitted By: Bruce Dubbs <bdubbs at linuxfromscratch dot org>
+Date: 2013-12-12
+Initial Package Version: 2.88
+Upstream Status: Not Submitted
+Origin: Accumulation if changes in LFS and new changes.
+Description: 
+ 1. Update messages sent at termination.
+ 2. Remove programs superceeded by other packages: wall, mountpoint, 
+    last, lastb, mesg, sulogin, and utmpdump.
+ 3. Clean up a compiler warning in shutdown.c.
+
+diff -Naur sysvinit-2.88dsf.orig/src/Makefile sysvinit-2.88dsf/src/Makefile
+--- sysvinit-2.88dsf.orig/src/Makefile	2010-04-11 04:30:27.000000000 -0500
+++ sysvinit-2.88dsf/src/Makefile	2013-12-12 16:17:43.930749763 -0600
+@@ -16,27 +16,20 @@
+ # For some known distributions we do not build all programs, otherwise we do.
+ BIN	=
+ SBIN	= init halt shutdown runlevel killall5 fstab-decode
+-USRBIN	= last mesg
+ 
+-MAN1	= last.1 lastb.1 mesg.1
+ MAN5	= initscript.5 inittab.5
+-MAN8	= halt.8 init.8 killall5.8 pidof.8 poweroff.8 reboot.8 runlevel.8
+MAN8	= halt.8 init.8 killall5.8  poweroff.8 reboot.8 runlevel.8
+ MAN8	+= shutdown.8 telinit.8 fstab-decode.8
+ 
+ ifeq ($(DISTRO),)
+-BIN	+= mountpoint
+-SBIN	+= sulogin bootlogd
+-USRBIN	+= utmpdump wall
+-MAN1	+= utmpdump.1 mountpoint.1 wall.1
+-MAN8	+= sulogin.8 bootlogd.8
+SBIN	+= bootlogd
+MAN8	+= bootlogd.8
+ endif
+ 
+ ifeq ($(DISTRO),Debian)
+ CPPFLAGS+= -DACCTON_OFF
+-BIN	+= mountpoint
+-SBIN	+= sulogin bootlogd
+-MAN1	+= mountpoint.1
+-MAN8	+= sulogin.8 bootlogd.8
+SBIN	+= bootlogd
+MAN8	+= bootlogd.8
+ endif
+ 
+ ifeq ($(DISTRO),Owl)
+@@ -46,11 +39,8 @@
+ 
+ ifeq ($(DISTRO),SuSE)
+ CPPFLAGS+= -DUSE_SYSFS -DSANE_TIO -DSIGINT_ONLYONCE -DUSE_ONELINE
+-BIN	+= mountpoint
+-SBIN	+= sulogin
+-USRBIN	+= utmpdump
+-MAN1	+= utmpdump.1 mountpoint.1
+-MAN8	+= sulogin.8
+SBIN	+=
+MAN8	+=
+ endif
+ 
+ ID		= $(shell id -u)
+@@ -96,11 +86,8 @@
+ 
+ last:		last.o oldutmp.h
+ 
+-mesg:		mesg.o
+ 
+-mountpoint:	mountpoint.o
+ 
+-utmpdump:	utmpdump.o
+ 
+ runlevel:	runlevel.o
+ 
+@@ -138,8 +125,7 @@
+ distclean:	clobber
+ 
+ install:
+-		$(INSTALL_DIR) $(ROOT)/bin/ $(ROOT)/sbin/
+-		$(INSTALL_DIR) $(ROOT)/usr/bin/
+		$(INSTALL_DIR)  $(ROOT)/sbin/
+ 		for i in $(BIN); do \
+ 			$(INSTALL_EXEC) $$i $(ROOT)/bin/ ; \
+ 		done
+@@ -154,13 +140,8 @@
+ 		ln -sf halt $(ROOT)/sbin/reboot
+ 		ln -sf halt $(ROOT)/sbin/poweroff
+ 		ln -sf init $(ROOT)/sbin/telinit
+-		ln -sf /sbin/killall5 $(ROOT)/bin/pidof
+-		if [ ! -f $(ROOT)/usr/bin/lastb ]; then \
+-			ln -sf last $(ROOT)/usr/bin/lastb; \
+-		fi
+ 		$(INSTALL_DIR) $(ROOT)/usr/include/
+ 		$(INSTALL_DATA) initreq.h $(ROOT)/usr/include/
+-		$(INSTALL_DIR) $(ROOT)$(MANDIR)/man1/
+ 		$(INSTALL_DIR) $(ROOT)$(MANDIR)/man5/
+ 		$(INSTALL_DIR) $(ROOT)$(MANDIR)/man8/
+ 		for i in $(MAN1); do \
+diff -Naur sysvinit-2.88dsf.orig/src/init.c sysvinit-2.88dsf/src/init.c
+--- sysvinit-2.88dsf.orig/src/init.c	2010-04-13 04:48:54.000000000 -0500
+++ sysvinit-2.88dsf/src/init.c	2013-12-12 16:17:34.292881603 -0600
+@@ -1498,14 +1498,14 @@
+ 		case 0: /* Send TERM signal */
+ 			if (talk)
+ 				initlog(L_CO,
+-					"Sending processes the TERM signal");
+					"Sending processes configured via /etc/inittab the TERM signal");
+ 			kill(-(ch->pid), SIGTERM);
+ 			foundOne = 1;
+ 			break;
+ 		case 1: /* Send KILL signal and collect status */
+ 			if (talk)
+ 				initlog(L_CO,
+-					"Sending processes the KILL signal");
+					"Sending processes configured via /etc/inittab the KILL signal");
+ 			kill(-(ch->pid), SIGKILL);
+ 			break;
+ 	}
+diff -Naur sysvinit-2.88dsf.orig/src/shutdown.c sysvinit-2.88dsf/src/shutdown.c
+--- sysvinit-2.88dsf.orig/src/shutdown.c	2010-03-23 09:37:01.000000000 -0500
+++ sysvinit-2.88dsf/src/shutdown.c	2013-12-12 16:17:50.225663849 -0600
+@@ -482,7 +482,6 @@
+ 	struct stat		st;
+ 	struct utmp		*ut;
+ 	time_t			t;
+-	uid_t			realuid;
+ 	char			*halttype;
+ 	char			*downusers[32];
+ 	char			buf[128];
+@@ -498,7 +497,6 @@
+ 	int			user_ok = 0;
+ 
+ 	/* We can be installed setuid root (executable for a special group) */
+-	realuid = getuid();
+ 	setuid(geteuid());
+ 
+ 	if (getuid() != 0) {
--- a/core/tzdata/.md5sum
+++ b/core/tzdata/.md5sum
@@ -1 +1 @@
-1e751e7e08f8b68530674f04619d894d
+c412b1531adef1be7a645ab734f86acc
--- a/core/tzdata/spkgbuild
+++ b/core/tzdata/spkgbuild
@@ -2,7 +2,7 @@
 # depends	: glibc

 name=tzdata
-version=2017c
+version=2018c
 release=1
 source=(http://www.iana.org/time-zones/repository/releases/${name}${version}.tar.gz)

--- a/core/vim/spkgbuild
+++ b/core/vim/spkgbuild
@@ -32,9 +32,13 @@ build() {
 cat > $PKG/etc/vimrc << "EOF"
 " Begin /etc/vimrc

+" Ensure defaults are set before customizing settings, not after
+source $VIMRUNTIME/defaults.vim
+let skip_defaults_vim=1 
+
 set nocompatible
 set backspace=2
-set mouse=r
+set mouse=
 syntax on
 if (&term == "xterm") || (&term == "putty")
  set background=dark