diff --git a/x/lib/webkitgtk2.xml b/archive/webkitgtk2.xml-again similarity index 100% rename from x/lib/webkitgtk2.xml rename to archive/webkitgtk2.xml-again diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml index ba91eebe6c..888fbeb87b 100644 --- a/introduction/welcome/changelog.xml +++ b/introduction/welcome/changelog.xml @@ -45,6 +45,9 @@ February 5th, 2017 + + [bdubbs] - Update to shadow-4.4. + [dj] - Update to Chromium-56.0.2924.87. Fixes #8845. diff --git a/packages.ent b/packages.ent index eaed75e5b9..dd1742079b 100644 --- a/packages.ent +++ b/packages.ent @@ -37,7 +37,7 @@ - + diff --git a/postlfs/security/shadow.xml b/postlfs/security/shadow.xml index e904d75b81..3eda678aa6 100644 --- a/postlfs/security/shadow.xml +++ b/postlfs/security/shadow.xml @@ -6,9 +6,9 @@ - - - + + + ]> @@ -120,14 +120,17 @@ sed -i 's/groups$(EXEEXT) //' src/Makefile.in && -find man -name Makefile.in -exec sed -i 's/groups\.1 / /' {} \; && + +find man -name Makefile.in -exec sed -i 's/groups\.1 / /' {} \; && find man -name Makefile.in -exec sed -i 's/getspnam\.3 / /' {} \; && find man -name Makefile.in -exec sed -i 's/passwd\.5 / /' {} \; && sed -i -e 's@#ENCRYPT_METHOD DES@ENCRYPT_METHOD SHA512@' \ -e 's@/var/spool/mail@/var/mail@' etc/login.defs && -sed -i 's/1000/999/' etc/useradd && +sed -i 's/1000/999/' etc/useradd && +sed -i -e '/snprintf/s@_msg,@_msg, 256,@' src/su.c && +sed -i -e '47 d' -e '60,65 d' libmisc/myname.c && ./configure --sysconfdir=/etc --with-group-name-max-length=32 && make @@ -177,6 +180,17 @@ mv -v /usr/bin/passwd /bin to make the default useradd consistent with the LFS groups file. + + sed -i -e '/snprintf/s@_msg,@_msg, 256,@' src/su.c: Fix + a build error that only occurs if is detected + by configure. + + + + sed -i '47 d' -e '60,65 d' libmisc/myname.c: Apply + a security fix from upstream. + + --with-group-name-max-length=32: The maximum user name is 32 characters. Make the maximum group name the same. diff --git a/x/lib/lib.xml b/x/lib/lib.xml index 5a818f8694..d4659f6bf6 100644 --- a/x/lib/lib.xml +++ b/x/lib/lib.xml @@ -68,8 +68,8 @@ $Date$ - - + + diff --git a/xfce/apps/midori.xml b/xfce/apps/midori.xml index 4da71e9f95..2d2651d31f 100644 --- a/xfce/apps/midori.xml +++ b/xfce/apps/midori.xml @@ -91,7 +91,8 @@ Optional , - , and + + WebKitGTK+-2.4.11 , and Zeitgeist @@ -145,11 +146,11 @@ make -DHALF_BRO_INCOM_WEBKIT2=ON: Links to instead of WebKitGTK+-2.4.x.. Strictly + linkend="webkitgtk"/> instead of WebKitGTK+-2.4.x. Strictly speaking, is not required and Midori could - be linked to WebKitGTK+-2.4.x. The former is deemed - experimental by upstream, but seems to work well. The latter is - an older API and less secure. + be linked to WebKitGTK+-2.4.x. The former used to be considered + experimental by upstream, but now is considered stable. However + the syntax has not yet been updated. diff --git a/xsoft/other/gimp.xml b/xsoft/other/gimp.xml index 5bd4ca4fb2..14326015d4 100644 --- a/xsoft/other/gimp.xml +++ b/xsoft/other/gimp.xml @@ -145,7 +145,8 @@ an (that provides a sendmail program), , - , and + + webkitgtk-2.4.11, and libwmf @@ -302,12 +303,14 @@ chown -R root:root /usr/share/gimp/2.0/help - The GIMP uses either a plugin (if you have installed ) or a browser for its help system. To set up the help system to - work with the default browser, use Edit -> Preferences -> Help System - and select 'Web Browser' for the 'Help Browser to use' setting. + The GIMP uses either a plugin (if you have installed the external + package webkitgtk-2.4.11) or a + browser for its help system. To + set up the help system to work with the default browser, use Edit -> + Preferences -> Help System and select 'Web Browser' for the 'Help + Browser to use' setting.