From 0bf1b4e0503bf2e53b765cccf74ea818900b15db Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 10 Jan 2019 18:53:27 +0100 Subject: [PATCH 1/6] icu4c: Convert to versionless bee file --- icu4c-53.1-1.bee => icu4c.be0 | 2 ++ 1 file changed, 2 insertions(+) rename icu4c-53.1-1.bee => icu4c.be0 (94%) diff --git a/icu4c-53.1-1.bee b/icu4c.be0 similarity index 94% rename from icu4c-53.1-1.bee rename to icu4c.be0 index 6404af076..fe4da7540 100755 --- a/icu4c-53.1-1.bee +++ b/icu4c.be0 @@ -1,5 +1,7 @@ #!/bin/env beesh +# BEE_VERSION icu4c-53.1-1 + #neu gebaut wegen neuen gcc und firefox #SRCURL[0]="http://download.icu-project.org/files/icu4c/4.2.1/icu4c-4_2_1-src.tgz" SRCURL[0]="http://download.icu-project.org/files/icu4c/53.1/icu4c-53_1-src.tgz" From 630a83dd1477a58fdb789ad19b04f0bf77601a73 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 10 Jan 2019 18:54:29 +0100 Subject: [PATCH 2/6] icu4c: Update version from 53.1 to 63.1 mozjs 52.2.1 requires at least version 58.1, so upgrade to the latest one. checking for icu-i18n >= 58.1... Requested 'icu-i18n >= 58.1' but version of icu-i18n is 53.1 configure: error: Library requirements (icu-i18n >= 58.1) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them. --- icu4c.be0 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/icu4c.be0 b/icu4c.be0 index fe4da7540..42a154093 100755 --- a/icu4c.be0 +++ b/icu4c.be0 @@ -1,10 +1,10 @@ #!/bin/env beesh -# BEE_VERSION icu4c-53.1-1 +# BEE_VERSION icu4c-63.1-0 #neu gebaut wegen neuen gcc und firefox #SRCURL[0]="http://download.icu-project.org/files/icu4c/4.2.1/icu4c-4_2_1-src.tgz" -SRCURL[0]="http://download.icu-project.org/files/icu4c/53.1/icu4c-53_1-src.tgz" +SRCURL[0]="http://download.icu-project.org/files/icu4c/63.1/icu4c-63_1-src.tgz" build_in_sourcedir From e6daf1a911236e8758417ce88b38179a05539072 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 10 Jan 2019 18:40:44 +0100 Subject: [PATCH 3/6] js: Update version from 38.2.1 to 52.2.1 Polkit 0.115 requires this version. --- js.be0 | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/js.be0 b/js.be0 index e9136b551..a853c09f1 100755 --- a/js.be0 +++ b/js.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION js-38.2.1-0 +# BEE_VERSION js-52.2.1gnome1-0 ## this file was created by bee init and should be executed to build a ## bee-package. (Additional hints are located at the end of this file.) @@ -9,13 +9,13 @@ ## The source URL(s) define the location of the sources that will be ## downloaded. Version variables may be used to simplify reuse of this bee-file. -SRCURL[0]="http://anduin.linuxfromscratch.org/BLFS/mozjs/mozjs-${PKGVERSION}.rc0.tar.bz2" +SRCURL[0]="http://ftp.gnome.org/pub/gnome/teams/releng/tarballs-needing-help/mozjs/mozjs-${PKGVERSION}.tar.gz" ############################################################################### ## Add URLs/pathes to patch files to the PATCHURL array. ## The sources will be patched in the order of the array. -# PATCHURL+=(/src/mariux/patches/js38-38.2.1-upstream_fixes-2.patch) +# PATCHURL+=() ############################################################################### ## Add filename patterns to the EXCLUDE array of files that should not @@ -38,6 +38,7 @@ SRCURL[0]="http://anduin.linuxfromscratch.org/BLFS/mozjs/mozjs-${PKGVERSION}.rc0 sourcesubdir_append js/src +BEE_BUILDTYPE=autotools ############################################################################### ## Change the default (auto-detected) steps to @@ -49,17 +50,14 @@ sourcesubdir_append js/src # bee_extract "${@}" #} -mee_patch() { - # Work around sourcesubdir_append and paths in patch - start_cmd cd ../.. ; patch -N -p1 -i /src/mariux/patches/js38-38.2.1-upstream_fixes-2.patch - bee_patch "${@}" -} +#mee_patch() { +# bee_patch "${@}" +#} mee_configure() { bee_configure \ --with-intl-api \ --with-system-zlib \ - --with-system-ffi \ --with-system-nspr \ --with-system-icu \ --enable-threadsafe \ From 980754706798ffb89ed5cb3cdb53acab4b0753a4 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 10 Jan 2019 18:23:48 +0100 Subject: [PATCH 4/6] polkit: Update version from 0.113+ to 0.114 Also, add security patch mentioned in the [BLFS book][1]. The release notes are available [on-line][2]. [1]: http://www.linuxfromscratch.org/blfs/view/systemd/postlfs/polkit.html [2]: https://gitlab.freedesktop.org/polkit/polkit/blob/master/NEWS --- polkit.be0 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/polkit.be0 b/polkit.be0 index 3a95ac2db..c9654477a 100755 --- a/polkit.be0 +++ b/polkit.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION polkit-0.113_lfs-0 +# BEE_VERSION polkit-0.115-0 ## this file was created by bee init and should be executed to build a ## bee-package. (Additional hints are located at the end of this file.) @@ -9,13 +9,13 @@ ## The source URL(s) define the location of the sources that will be ## downloaded. Version variables may be used to simplify reuse of this bee-file. -SRCURL[0]="http://anduin.linuxfromscratch.org/BLFS/polkit/polkit-0.113+git_2919920+js38.tar.xz" +SRCURL[0]=" https://www.freedesktop.org/software/polkit/releases/polkit-${PKGVERSION}.tar.gz" ############################################################################### ## Add URLs/pathes to patch files to the PATCHURL array. ## The sources will be patched in the order of the array. -# PATCHURL+=() +PATCHURL+=(/src/mariux/patches/polkit-0.115-security_patch-2.patch) ############################################################################### ## Add filename patterns to the EXCLUDE array of files that should not From b1c48c1f03269d5fae487945d8e51a314a6a8eab Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 10 Jan 2019 18:32:39 +0100 Subject: [PATCH 5/6] polkit: Remove unneeded rules file There is no group *wheel* in MarIuX, so this rule is not needed. We have to discuss if group *edv* could be used. This gets rid of the message below. polkitd[782]: Identity `unix-group:wheel' is not valid, ignoring ret strs unix-group:wheel --- polkit.be0 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/polkit.be0 b/polkit.be0 index c9654477a..9a7ac18d8 100755 --- a/polkit.be0 +++ b/polkit.be0 @@ -68,6 +68,10 @@ mee_configure() { #} ## by default this may be 'make install DESTDIR="${D}"' +mee_install_post() { + rm -v ${D}/etc/polkit-1/rules.d/50-default.rules +} + ############################################################################### ## ## Additional hints: From 2f8431d90e407856f382ca3e1b490667771d5c74 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 10 Jan 2019 19:18:26 +0100 Subject: [PATCH 6/6] polkit: Update `/etc/pam.d/polkit-1` for Linux PAM support [1]: http://www.linuxfromscratch.org/blfs/view/systemd/postlfs/polkit.html --- polkit.be0 | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/polkit.be0 b/polkit.be0 index 9a7ac18d8..5bbfd34eb 100755 --- a/polkit.be0 +++ b/polkit.be0 @@ -70,6 +70,22 @@ mee_configure() { mee_install_post() { rm -v ${D}/etc/polkit-1/rules.d/50-default.rules + + # If you have built Polkit with Linux PAM support, you need to modify the + # default PAM configuration file which was installed by default to get + # Polkit to work correctly with BLFS. Issue the following commands as the + # root user to create the configuration file for Linux PAM: + + start_cmd cat > /etc/pam.d/polkit-1 << "EOF" + # Begin /etc/pam.d/polkit-1 + + auth include system-auth + account include system-account + password include system-password + session include system-session + + # End /etc/pam.d/polkit-1 +EOF } ###############################################################################