From abac44de250c0fd1944aa4dc2c2d74fb5a044886 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 8 Dec 2016 12:09:07 +0100 Subject: [PATCH 01/97] Fix typo in directory name *Documentation* Reported-by: Thomas Kreitler --- {Documenation => Documentation}/SubmittingPatches.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {Documenation => Documentation}/SubmittingPatches.md (100%) diff --git a/Documenation/SubmittingPatches.md b/Documentation/SubmittingPatches.md similarity index 100% rename from Documenation/SubmittingPatches.md rename to Documentation/SubmittingPatches.md From 7531ceb030f9195a8ade733ec861a98555b0a2d3 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Sat, 15 Jul 2017 11:30:41 +0200 Subject: [PATCH 02/97] evince: Update version from 3.22.0 to 3.24.0 --- evince.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evince.be0 b/evince.be0 index 04e5ba29e..98c622256 100755 --- a/evince.be0 +++ b/evince.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION evince-3.22.0-0 +# BEE_VERSION evince-3.24.0-0 BEE_BUILDTYPE=configure From 734452208b958de63e5873f3b68b703c233f4a68 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 9 Nov 2017 16:45:17 +0100 Subject: [PATCH 03/97] xorg-server: Remove patch already applied upstream --- xorg-server.be0 | 2 -- 1 file changed, 2 deletions(-) diff --git a/xorg-server.be0 b/xorg-server.be0 index 159f181be..7bc0ab1e7 100755 --- a/xorg-server.be0 +++ b/xorg-server.be0 @@ -17,8 +17,6 @@ SRCURL[0]="https://ftp.x.org/pub/individual/xserver/xorg-server-${PKGVERSION}.ta # PATCHURL[0]="/src/mariux/download/xorg-xinerama.patch" -PATCHURL+=(/src/mariux/patches/0001-os-Handle-SIGABRT.patch) - ############################################################################### ## Add filename patterns to the EXCLUDE array of files that should not ## be added to you package but may be present in the image directory. From 0b93a5f33c5634d3c0a2b0c8615a25a45d51b6d0 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Tue, 14 Nov 2017 17:53:01 +0100 Subject: [PATCH 04/97] java: Update version from 8u141 to 9.0.1 Java 9 was released in September 2017. It supports HiDPI displays [1]. Most changes are detaled in the *Java Platform, Standard Edition Oracle JDK 9 Migration Guide* [2]. Switch to the new version scheme. > ### New Version-String Scheme ### > > JDK 9 provides a new simplified version-string format. If your code > relies on the version-string format to distinguish major, minor, > security, and patch update releases, then you may need to update it. > > The format of the new version-string is: > > $MAJOR.$MINOR.$SECURITY.$PATCH > > For example, under the old scheme, the Java 9u5 security release would > have the version string 1.9.0_5-b20. > > Under the new scheme, the short version of the same release is 9.0.1, > and the long version is 9.0.1+20. > > This change affects java -version and related system properties, such > as java.runtime.version, java.vm.version, java.specification.version, > and java.vm.specification.version. > > A simple Java API to parse, validate, and compare version strings has > been added. See java.lang.Runtime.Version. > > See Version String Format in Java Platform, Standard Edition > Installation Guide, and JEP 223: New Version-String Scheme. Additionally, JCE Jurisdiction Policy File default is now unlimited, meaning the installation can be removed from the bee file. > ### JCE Jurisdiction Policy File Default is Unlimited ### > > If your application previously required the Java Cryptography > Extension (JCE) Unlimited Strength Jurisdiction Policy Files, then you > no longer need to download or install them. They are included in the > JDK and are activated by default. > > If your country or usage requires a more restrictive policy, the > limited Java cryptographic policy files are still available. > > If you have requirements that are not met by either of the policy > files provided by default, then you can customize these policy files > to meet your needs. > > See the `crypto.policy` Security property in the > `/conf/security/java.security` file, or Cryptographic > Strength Configuration in the Java Platform, Standard Edition Security > Developer's Guide. > > You are advised to consult your export/import control counsel or > attorney to determine the exact requirements. [1] http://openjdk.java.net/jeps/263 [2] https://docs.oracle.com/javase/9/migrate/ --- java.be0 | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/java.be0 b/java.be0 index ffa398e27..0d4ce2a6f 100755 --- a/java.be0 +++ b/java.be0 @@ -1,25 +1,20 @@ #!/bin/env beesh -# BEE_VERSION java-1.8.0_141-0 +# BEE_VERSION java-9.0.1-0 # http://www.oracle.com/technetwork/java/javase/downloads/index.html -SRCURL[0]="file:///src/mariux/download/jdk-8u${PKGEXTRAVERSION}-linux-x64.tar.gz" -#SRCURL[1]="/src/mariux/download/UnlimitedJCEPolicyJDK7.zip" +SRCURL[0]="file:///src/mariux/download/jdk-${PKGVERSION}_linux-x64_bin.tar.gz" PATCHURL[0]="" BEE_EXTRACT_STRIP=0 -mee_patch() { - unzip /src/mariux/download/jce_policy-8.zip -} - mee_install() { mkdir -p ${D}/usr/local/bin - mv ${S}/jdk${PKGFULLVERSION} ${D}/usr/local/java + mv ${S}/jdk-${PKGVERSION} ${D}/usr/local/java for i in $(ls ${D}/usr/local/java/bin) ; do ln -s /usr/local/java/bin/${i} ${D}/usr/local/bin/${i} @@ -28,10 +23,3 @@ mee_install() { mkdir -p ${D}/usr/lib/mozilla/plugins ln -s /usr/local/java/jre/lib/amd64/libnpjp2.so ${D}/usr/lib/mozilla/plugins/libnpjp2.so } - -mee_install_post() { - cp -v \ - ${S}/UnlimitedJCEPolicyJDK8/US_export_policy.jar \ - ${S}/UnlimitedJCEPolicyJDK8/local_policy.jar \ - ${D}/usr/local/java/jre/lib/security/ -} From bd9484f0931a4e4b50a76fed0fb1c6a4831b902d Mon Sep 17 00:00:00 2001 From: david Date: Fri, 17 Nov 2017 10:26:53 +0100 Subject: [PATCH 05/97] cargo: Remove now part of the rustc pkg look here https://github.com/rust-lang/cargo/pull/4113 --- cargo.be0 | 40 ---------------------------------------- 1 file changed, 40 deletions(-) delete mode 100755 cargo.be0 diff --git a/cargo.be0 b/cargo.be0 deleted file mode 100755 index 43616ed3e..000000000 --- a/cargo.be0 +++ /dev/null @@ -1,40 +0,0 @@ -#!/usr/bin/env beesh - -# BEE_VERSION cargo-0.17.0-0 - -SRCURL[0]="https://github.com/rust-lang/cargo/archive/${PKGVERSION}.tar.gz" -SRCURL[1]="https://static.rust-lang.org/dist/cargo-0.16.0-x86_64-unknown-linux-gnu.tar.gz" -SRCURL[2]="http://anduin.linuxfromscratch.org/BLFS/rust/rust-installer-20161004.tar.xz" -# PATCHURL+=() - -EXCLUDE+=(/usr/lib/rustlib) - -# build_in_sourcedir - -# sourcesubdir_append src - -BEE_BUILDTYPE=autotools - -#mee_extract() { -# bee_extract "${@}" -#} - -#mee_patch() { -# bee_patch "${@}" -#} - -mee_configure() { - export HOME=${S} - bee_configure --cargo=${S}/cargo-nightly-x86_64-unknown-linux-gnu/cargo/bin/cargo \ - --disable-option-checking -} - -#mee_build() { -# bee_build -#} - -mee_install() { - mv ${S}/rust-installer-20161004/* ${S}/src/rust-installer - start_cmd make install DESTDIR=${D} -} -## by default this may be 'make install DESTDIR="${D}"' From a6b6624be05a1f37e387a8f8fba26053ca71d5ae Mon Sep 17 00:00:00 2001 From: david Date: Fri, 17 Nov 2017 10:36:14 +0100 Subject: [PATCH 06/97] rustc: Update from version 1.16.0 to 1.21.0 needed for Firefox revision 1: build with cargo and snapshot system revision 2: rebuild with system rustc --- rustc.be0 | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/rustc.be0 b/rustc.be0 index 18d7c51d4..a8ceed211 100755 --- a/rustc.be0 +++ b/rustc.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION rustc-1.16.0-0 +# BEE_VERSION rustc-1.21.0-2 SRCURL[0]="https://static.rust-lang.org/dist/rustc-${PKGVERSION}-src.tar.gz" @@ -26,11 +26,17 @@ export RUST_BACKTRACE=1 mee_configure() { #rust creates .cargo dir in your home export HOME=${S} - ${S}/configure --prefix=${PREFIX} + ${S}/configure --prefix=${PREFIX} \ + --mandir=${MANDIR} \ + --libdir=${LIBDIR} \ + --enable-local-rust \ + --disable-rpath \ + --enable-extended \ + --disable-codegen-tests } mee_build() { - start_cmd make ${BEE_MAKEFLAGS} + CC=clang CXX=clang++ start_cmd make ${BEE_MAKEFLAGS} } mee_install() { From f059d1817eaab20dd02e9c4641c55adae27077c8 Mon Sep 17 00:00:00 2001 From: david Date: Fri, 17 Nov 2017 10:44:18 +0100 Subject: [PATCH 07/97] Firefox: Update from version 55.0.3 to 57.0 maybe some add-ons/extensions stop working release notes: https://www.mozilla.org/en-US/firefox/57.0/releasenotes/ make firefox fast again :-) --- firefox.be0 | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/firefox.be0 b/firefox.be0 index 37f65fc19..7480983d0 100755 --- a/firefox.be0 +++ b/firefox.be0 @@ -2,7 +2,7 @@ #export BEE_TMP_TMPDIR=/dev/shm BEE_TMP_BUILDROOT=/dev/shm/bee-root BEE_MAKEFLAGS='-j80' -# BEE_VERSION firefox-55.0.3-0 +# BEE_VERSION firefox-57.0-0 SRCURL[0]="https://ftp.mozilla.org/pub/firefox/releases/${PKGVERSION}/source/firefox-${PKGVERSION}.source.tar.xz" @@ -19,8 +19,7 @@ mee_configure() { --disable-dbus \ --disable-crashreporter \ --disable-tests \ - --enable-optimize \ - --enable-safe-browsing + --enable-optimize } mee_build_post() { From 242f375d6b5a8ed35bbe03714e4fc640271671de Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 17 Nov 2017 12:20:14 +0100 Subject: [PATCH 08/97] libXrandr: Strip trailing space --- libXrandr-1.4.2-0.bee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libXrandr-1.4.2-0.bee b/libXrandr-1.4.2-0.bee index fac371256..15e79b4b3 100755 --- a/libXrandr-1.4.2-0.bee +++ b/libXrandr-1.4.2-0.bee @@ -52,7 +52,7 @@ SRCURL[0]="http://xorg.freedesktop.org/releases/individual/lib/libXrandr-${PKGVE #} #mee_configure() { -# bee_configure +# bee_configure #} #mee_build() { From 76fafb85c7510033395724be1eefab5a75594ced Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 17 Nov 2017 12:20:52 +0100 Subject: [PATCH 09/97] libXrandr: Convert to versionless bee file --- libXrandr-1.4.2-0.bee => libXrandr.be0 | 2 ++ 1 file changed, 2 insertions(+) rename libXrandr-1.4.2-0.bee => libXrandr.be0 (98%) diff --git a/libXrandr-1.4.2-0.bee b/libXrandr.be0 similarity index 98% rename from libXrandr-1.4.2-0.bee rename to libXrandr.be0 index 15e79b4b3..6862c372a 100755 --- a/libXrandr-1.4.2-0.bee +++ b/libXrandr.be0 @@ -1,5 +1,7 @@ #!/usr/bin/env beesh +# BEE_VERSION libXrandr-1.4.2-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.) From 01b4d2d5ecdd1d24a886d9e772d452e8a0f3324f Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 17 Nov 2017 12:22:44 +0100 Subject: [PATCH 10/97] libXrandr: Use new, secure source URL The current URL moved permanently. ``` $ curl -I http://xorg.freedesktop.org/releases/individual/lib/ HTTP/1.1 301 Moved Permanently Date: Fri, 17 Nov 2017 11:21:44 GMT Server: Apache/2.4.10 (Debian) Location: https://www.x.org/releases/individual/lib/ Content-Type: text/html; charset=iso-8859-1 ``` --- libXrandr.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libXrandr.be0 b/libXrandr.be0 index 6862c372a..fbed7fec6 100755 --- a/libXrandr.be0 +++ b/libXrandr.be0 @@ -9,7 +9,7 @@ ## 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://xorg.freedesktop.org/releases/individual/lib/libXrandr-${PKGVERSION}.tar.bz2" +SRCURL[0]="https://www.x.org/releases/individual/lib/libXrandr-${PKGVERSION}.tar.bz2" ############################################################################### ## Add URLs/pathes to patch files to the PATCHURL array. From 2173935283e30dcfe14ce30aaca10392e024d912 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 17 Nov 2017 12:23:12 +0100 Subject: [PATCH 11/97] libXrandr: Update version from 1.4.2 to 1.5.1 Version 1.5.0 adds support for monitor objects, needed for tiled displays, that means displays with more than one panel (MST, Multi-Stream Transport) like the Dell UP3214Q [1]. Announcement [1]: > Add support for monitors and fixes requires on libX11. > > Keith Packard (2): > libXrandr: Clean up compiler warnings > Add monitors, update to version 1.5 (v2) > > Michael Joost (1): > Remove fallback for _XEatDataWords, require libX11 1.6 for it [1] https://en.wikipedia.org/wiki/DisplayPort#Multiple_displays_on_single_DisplayPort_connector [2] https://lists.x.org/archives/xorg-announce/2015-May/002606.html --- libXrandr.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libXrandr.be0 b/libXrandr.be0 index fbed7fec6..f2e9be912 100755 --- a/libXrandr.be0 +++ b/libXrandr.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION libXrandr-1.4.2-0 +# BEE_VERSION libXrandr-1.5.1-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.) From fbca595f9535ca192042978455dc44c1c6cbcf99 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 17 Nov 2017 12:13:14 +0100 Subject: [PATCH 12/97] xrandr: Strip trailing space --- xrandr-1.4.1-0.bee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xrandr-1.4.1-0.bee b/xrandr-1.4.1-0.bee index 1c96ca49d..909006a9c 100755 --- a/xrandr-1.4.1-0.bee +++ b/xrandr-1.4.1-0.bee @@ -52,7 +52,7 @@ SRCURL[0]="http://xorg.freedesktop.org/releases/individual/app/xrandr-${PKGVERSI #} #mee_configure() { -# bee_configure +# bee_configure #} #mee_build() { From 0bf27ee18c063fab89da01aee9f2c6e9de3dbff6 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 17 Nov 2017 12:13:58 +0100 Subject: [PATCH 13/97] xrandr: Convert to versionless bee file --- xrandr-1.4.1-0.bee => xrandr.be0 | 2 ++ 1 file changed, 2 insertions(+) rename xrandr-1.4.1-0.bee => xrandr.be0 (98%) diff --git a/xrandr-1.4.1-0.bee b/xrandr.be0 similarity index 98% rename from xrandr-1.4.1-0.bee rename to xrandr.be0 index 909006a9c..8767ba8ff 100755 --- a/xrandr-1.4.1-0.bee +++ b/xrandr.be0 @@ -1,5 +1,7 @@ #!/usr/bin/env beesh +# BEE_VERSION xrandr-1.4.1-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.) From 760f800cf9999037e12fbd269bc93bf09dbadf24 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 17 Nov 2017 12:16:45 +0100 Subject: [PATCH 14/97] xrandr: Use new, secure source URL The current URL moved permanently. ``` $ curl -I http://xorg.freedesktop.org/releases/individual/app/ HTTP/1.1 301 Moved Permanently Date: Fri, 17 Nov 2017 11:16:23 GMT Server: Apache/2.4.10 (Debian) Location: https://www.x.org/releases/individual/app/ Content-Type: text/html; charset=iso-8859-1 ``` --- xrandr.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xrandr.be0 b/xrandr.be0 index 8767ba8ff..735cbfc7e 100755 --- a/xrandr.be0 +++ b/xrandr.be0 @@ -9,7 +9,7 @@ ## 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://xorg.freedesktop.org/releases/individual/app/xrandr-${PKGVERSION}.tar.bz2" +SRCURL[0]="https://www.x.org/releases/individual/app/xrandr-${PKGVERSION}.tar.bz2" ############################################################################### ## Add URLs/pathes to patch files to the PATCHURL array. From e5ac742e7cf79bffde318cc1b61e85c432a5cd88 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 17 Nov 2017 12:18:06 +0100 Subject: [PATCH 15/97] xrandr: Update version from 1.4.1 to 1.5.0 Announcement [1]: > xrandr is a command line interface to the X11 Resize, Rotate, and Reflect > (RandR) extension. > > This release adds support for the new monitor objects added in RandR 1.5, and > fixes a few bugs. > > > Aaron Plattner (2): > Split verbose mode printing into a helper function > xrandr 1.5.0 > > Chris Wilson (3): > Mark disabling an output as a change in its CRTC > Mark all CRTC as currently unused for second picking CRTC pass > Only use the current information when setting modes > > Dave Airlie (2): > xrandr: parse property returns correctly. > xrandr: don't return NULL from a void > > Keith Packard (3): > Increase keystone.5c default window size > keystone: Report matrix error. Deal with "primary" in xrandr output > Add monitor support (v2) [1] https://lists.freedesktop.org/archives/xorg-announce/2016-February/002677.html --- xrandr.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xrandr.be0 b/xrandr.be0 index 735cbfc7e..7810f5f5b 100755 --- a/xrandr.be0 +++ b/xrandr.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION xrandr-1.4.1-0 +# BEE_VERSION xrandr-1.5.0-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.) From 82bd40918422b44f084bb3d6a3c6c981a2ace583 Mon Sep 17 00:00:00 2001 From: Peter Marquardt Date: Wed, 22 Nov 2017 11:36:35 +0100 Subject: [PATCH 16/97] [keepassxc] add keepassxc 2.2.2 keepassxc password wallet. 'xc' is the continuation project of 'x', which is almost dead. see https://github.com/keepassxreboot/keepassxc --- keepassxc.be0 | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100755 keepassxc.be0 diff --git a/keepassxc.be0 b/keepassxc.be0 new file mode 100755 index 000000000..2092628a6 --- /dev/null +++ b/keepassxc.be0 @@ -0,0 +1,36 @@ +#!/usr/bin/env beesh + +# BEE_VERSION keepassxc-2.2.2-0 + +# bee download https://github.com/keepassxreboot/keepassxc.git + +SRCURL[0]="/src/mariux/beeroot/downloads/keepassxc-${PKGVERSION}_p182_b0e6bcfa.tar.bz2" + +PATH=/usr/local/qt5/bin:$PATH + +# remove buggy cmake git ref settings +PATCHURL[0]='/src/mariux/beeroot/downloads/keepassxc-2.2.2_p182_b0e6bcfa-git-get-refs.patch' + +# build_in_sourcedir + +# sourcesubdir_append src + +#mee_extract() { +# bee_extract "${@}" +#} + +#mee_patch() { +# bee_patch "${@}" +#} + +#mee_configure() { +# bee_configure +#} + +#mee_build() { +# bee_build +#} + +#mee_install() { +# bee_install +#} From aafacfebabef49d63ce9556a2a42504adb0356fd Mon Sep 17 00:00:00 2001 From: david Date: Wed, 22 Nov 2017 15:20:33 +0100 Subject: [PATCH 17/97] Firefox: Add some security/privacy configuration as inspiration I use this https://github.com/ghacksuserjs/ghacks-user.js --- firefox.be0 | 112 ++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 105 insertions(+), 7 deletions(-) diff --git a/firefox.be0 b/firefox.be0 index 7480983d0..2f0bc8f5f 100755 --- a/firefox.be0 +++ b/firefox.be0 @@ -2,7 +2,7 @@ #export BEE_TMP_TMPDIR=/dev/shm BEE_TMP_BUILDROOT=/dev/shm/bee-root BEE_MAKEFLAGS='-j80' -# BEE_VERSION firefox-57.0-0 +# BEE_VERSION firefox-57.0-1 SRCURL[0]="https://ftp.mozilla.org/pub/firefox/releases/${PKGVERSION}/source/firefox-${PKGVERSION}.source.tar.xz" @@ -62,10 +62,6 @@ mee_install_post() { start_cmd mkdir -p ${D}${DATADIR}/applications start_cmd desktop-file-install --dir ${D}${DATADIR}/applications ${B}/firefox.desktop - cat <<-EOF >${D}${LIBDIR}/firefox-${PKGVERSION}/defaults/pref/mariux64.js - pref("storage.nfs_filesystem", true); - EOF - cat <<-EOF >${D}${LIBDIR}/firefox-${PKGVERSION}/defaults/pref/autoconfig.js // Any comment. You must start the file with a comment! pref("general.config.filename", "default_config_mariux.cfg"); @@ -74,11 +70,36 @@ EOF cat <<-EOF >${D}${LIBDIR}/firefox-${PKGVERSION}/default_config_mariux.cfg // Any comment. You must start the file with a comment! +pref("storage.nfs_filesystem", true); pref("network.captive-portal-service.enabled",false); // Don't show WhatsNew on first run after every update pref("browser.startup.homepage_override.mstone","ignore"); +//disable slowStartup Notification +pref("browser.slowStartup.notificationDisabled", true); +pref("browser.slowStartup.maxSamples", 0); +pref("browser.slowStartup.samples", 0); +pref("browser.rights.3.shown", true); +pref("startup.homepage_welcome_url", ""); +pref("startup.homepage_welcome_url.additional", ""); +pref("startup.homepage_override_url", ""); +pref("browser.laterrun.enabled", false); +pref("browser.shell.checkDefaultBrowser", false); + +//disable daily pings to Mozilla about extensions and recent startup +lockPref("extensions.getAddons.cache.enabled", false); + +//disable sending the URL of the website where a plugin crashed +lockPref("dom.ipc.plugins.reportCrashURL", false); + +//disable auto update for extensions +lockPref("extensions.update.autoUpdateDefault", false); + +//disable about:addons' Get Add-ons panel (uses Google-Analytics) +pref("extensions.getAddons.showPane", false); // hidden pref +pref("extensions.webservice.discoverURL", ""); + // Set default homepage - users can change // Requires a complex preference defaultPref("browser.startup.homepage","data:text/plain,browser.startup.homepage=http://twiki.molgen.mpg.de/foswiki/Main/WebHome"); @@ -86,10 +107,87 @@ defaultPref("browser.startup.homepage","data:text/plain,browser.startup.homepage // Don't ask to install the Flash plugin pref("plugins.notifyMissingFlash", false); -// Disable health reporter -lockPref("datareporting.healthreport.service.enabled", false); +// Disable upload of health reports +lockPref("datareporting.healthreport.uploadEnabled", false); +//disable about:healthreport page (which connects to Mozilla for locale/css+js+json) +pref("datareporting.healthreport.about.reportUrl", "data:text/plain,"); // Disable all data upload (Telemetry and FHR) +lockPref("toolkit.telemetry.unified", false); +lockPref("toolkit.telemetry.enabled", false); +lockPref("toolkit.telemetry.server", ""); +lockPref("toolkit.telemetry.newProfilePing.enabled", false); +lockPref("toolkit.telemetry.shutdownPingSender.enabled", false); +lockPref("toolkit.telemetry.updatePing.enabled", false); +lockPref("toolkit.telemetry.bhrPing.enabled", false); +lockPref("toolkit.telemetry.firstShutdownPing.enabled", false); +lockPref("toolkit.telemetry.cachedClientID", ""); +lockPref("toolkit.telemetry.archive.enabled", false); lockPref("datareporting.policy.dataSubmissionEnabled", false); +lockPref("browser.ping-centre.telemetry", false); + +//disable "Snippets" (Mozilla content shown on about:home screen) +lockPref("browser.aboutHomeSnippets.updateUrl", "https://127.0.0.1"); //test + +//disable experiments https://wiki.mozilla.org/Telemetry/Experiments +lockPref("experiments.enabled", false); +lockPref("experiments.manifest.uri", ""); +lockPref("experiments.supported", false); +lockPref("experiments.activeExperiment", false); +// disable Mozilla permission to silently opt you into tests +lockPref("network.allow-experiments", false); + +//disable pocket +lockPref("extensions.pocket.enabled", false); + +//disable flyweb https://flyweb.github.io/ +pref("dom.flyweb.enabled", false); + +//disable Shield https://wiki.mozilla.org/Firefox/Shield +lockPref("extensions.shield-recipe-client.enabled", false); +lockPref("extensions.shield-recipe-client.api_url", ""); + +//disable Follow on Search and Activity Stream +lockPref("browser.newtabpage.activity-stream.enabled", false); +lockPref("browser.library.activity-stream.enabled", false); + +//disable link-mouseover opening connection to linked server +lockPref("network.http.speculative-parallel-limit", 0); + +//disable pings (but enforce same host in case) +lockPref("browser.send_pings", false); +lockPref("browser.send_pings.require_same_host", true); + +//disable location bar using search - PRIVACY test +lockPref("keyword.enabled", false); + +//disable location bar domain guessing - PRIVACY/SECURITY +lockPref("browser.fixup.alternate.enabled", false); + +//display all parts of the url in the location bar - helps SECURITY +lockPref("browser.urlbar.trimURLs", false); + +//disable location bar making speculative connections (FF56+) +lockPref("browser.urlbar.speculativeConnect.enabled", false); + +//disable SSL session tracking test +lockPref("security.ssl.disable_session_identifiers", true); + +//disable SSL Error Reporting +lockPref("security.ssl.errorReporting.automatic", false); +lockPref("security.ssl.errorReporting.enabled", false); +lockPref("security.ssl.errorReporting.url", ""); + +//disable the DNT HTTP header, which is essentially USELESS +lockPref("privacy.donottrackheader.enabled", false); + +//set max popups from a single non-click event - default is 20! +lockPref("dom.popup_maximum", 3); + +//limit events that can cause a popup default is "change click dblclick mouseup pointerup notificationclick reset submit touchend" +lockPref("dom.popup_allowed_events", "click dblclick"); + +//enable Firefox's built-in PDF reader +defaultPref("pdfjs.disabled", false); EOF } From c4a49b1aa9f162893378422a01cf8ecdfa345cc5 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 6 Nov 2017 19:37:03 +0100 Subject: [PATCH 18/97] libreoffice: Update version from 5.4.2.2 to 5.4.3.2 This release contains several bug fixes. ``` $ git log --oneline --reverse libreoffice-5.4.2.2...libreoffice-5.4.3.2 733927233810 Branch libreoffice-5-4-2 5a2a45eda20f bump product version to 5.4.3.0.0+ 269d22cceebe bump product version to 5.4.2.1.0+ 6ac9555d133a sax: Check if it starts with 5 bytes of " Date: Mon, 27 Nov 2017 16:27:29 +0100 Subject: [PATCH 19/97] go: build go with cgo support - cgo support added - building from bootstrap inside bee - install files clean up --- go.be0 | 73 ++++++++++++++++++++++++++++++++++------------------------ 1 file changed, 43 insertions(+), 30 deletions(-) diff --git a/go.be0 b/go.be0 index 163eb58e1..c28c35bf2 100755 --- a/go.be0 +++ b/go.be0 @@ -1,8 +1,9 @@ #!/usr/bin/env beesh -# BEE_VERSION go-1.9.2-0 +# BEE_VERSION go-1.9.2-1 -SRCURL[0]="https://redirector.gvt1.com/edgedl/go/go${PKGVERSION}.src.tar.gz" +SRCURL[0]="https://storage.googleapis.com/golang/go1.4-bootstrap-20170531.tar.gz" +SRCURL[1]="https://redirector.gvt1.com/edgedl/go/go${PKGVERSION}.src.tar.gz" # PATCHURL+=() @@ -12,10 +13,13 @@ build_in_sourcedir sourcesubdir_append src - -#mee_extract() { -# bee_extract "${@}" -#} +mee_extract() { + # extract bootstrap version of go-1.4 to arbitrary location + mkdir ${S}/bootstrap + bee_extract_do_tar "${1}" ${S}/bootstrap --strip-components 1 + shift + bee_extract "${@}" +} #mee_patch() { # bee_patch "${@}" @@ -26,39 +30,48 @@ sourcesubdir_append src #} mee_build() { - export GOROOT_BOOTSTRAP=${PREFIX} \ - GOROOT_FINAL=${LIBDIR}/go-${PKGVERSION} - start_cmd ${S}/make.bash #${BEE_MAKEFLAGS} - exit + + cd ${S}/../bootstrap/src + ./make.bash + + cd ${S} + + export GOROOT_BOOTSTRAP=${S}/../bootstrap + export GOROOT_FINAL=${LIBDIR}/go + + ./make.bash } + mee_install() { - # Install Binaries - start_cmd mkdir -p ${D}${BINDIR} - start_cmd mkdir -p ${D}${LIBDIR}/go-${PKGVERSION} - start_cmd cp -r ${S}/../bin ${D}${LIBDIR}/go-${PKGVERSION} - cd ${D}${BINDIR} - start_cmd ln -s ../lib/go-${PKGVERSION}/bin/go go - start_cmd ln -s ../lib/go-${PKGVERSION}/bin/gofmt gofmt + # The binaries expect /scratch/local/bee-root/go/go-1.9.2-1/source to be copied or moved to /usr/lib/go + mkdir -p ${D}${BINDIR} + + cp -r ${S}/../bin/. ${D}${BINDIR} + + mkdir -p ${D}${LIBDIR}/go + + # strace -s 200 -e file ${S}/../bin/go install -buildmode=shared std # Install standardlibs https://golang.org/pkg/#stdlib - LIBS="archive bufio builtin bytes compress container context crypto database \ - debug encoding errors expvar flag fmt go hash html image index internal io \ - log math mime net os path plugin reflect regexp runtime sort strconv strings \ - sync syscall testing text time unicode unsafe" - start_cmd ${S}/../bin/go install -buildmode=shared std + LIBS="builtin context debug expvar go image io math \ + path runtime strings testing unicode bufio bytes \ + compress crypto encoding flag hash index mime net plugin reflect \ + sort sync text unsafe archive cmd container database errors \ + fmt html internal log os regexp strconv syscall time vendor" - start_cmd mkdir -p ${D}${LIBDIR}/go-${PKGVERSION}/src + echo "LIBS=${LIBS}" + + mkdir -p ${D}${LIBDIR}/go/src for i in $LIBS; do - start_cmd cp -r ${S}/${i} ${D}${LIBDIR}/go-${PKGVERSION}/src + cp -r ${S}/${i} ${D}${LIBDIR}/go/src done #Install tools for go - start_cmd mkdir -p ${D}${LIBDIR}/go-${PKGVERSION}/pkg - start_cmd cp -r ${S}/../pkg/tool ${D}${LIBDIR}/go-${PKGVERSION}/pkg - start_cmd cp -r ${S}/../pkg/include ${D}${LIBDIR}/go-${PKGVERSION}/pkg - start_cmd cp -r ${S}/../pkg/linux_amd64 ${D}${LIBDIR}/go-${PKGVERSION}/pkg - start_cmd cp -r ${S}/../pkg/linux_amd64_dynlink ${D}${LIBDIR}/go-${PKGVERSION}/pkg + mkdir -p ${D}${LIBDIR}/go/pkg + cp -r ${S}/../pkg/tool ${D}${LIBDIR}/go/pkg + cp -r ${S}/../pkg/include ${D}${LIBDIR}/go/pkg + cp -r ${S}/../pkg/linux_amd64 ${D}${LIBDIR}/go/pkg + } -## by default this may be 'make install DESTDIR="${D}"' From e98beb5376af43c1ab952cb37a0b0a34aa71c2eb Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Tue, 28 Nov 2017 12:09:59 +0100 Subject: [PATCH 20/97] thunderbird: Update version from 52.4.0 to 52.5.0 The release notes are available [online][1]. [Several security issues were fixed][2]. [1]: https://www.mozilla.org/en-US/thunderbird/52.5.0/releasenotes/ [2]: https://www.mozilla.org/en-US/security/advisories/mfsa2017-26/ --- thunderbird.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/thunderbird.be0 b/thunderbird.be0 index a0d71a2df..eb0f3c92b 100755 --- a/thunderbird.be0 +++ b/thunderbird.be0 @@ -2,7 +2,7 @@ #export BEE_TMP_TMPDIR=/dev/shm BEE_TMP_BUILDROOT=/dev/shm/bee-root BEE_MAKEFLAGS='-j80' -# BEE_VERSION thunderbird-52.4.0-0 +# BEE_VERSION thunderbird-52.5.0-0 SRCURL[0]="https://ftp.mozilla.org/pub/thunderbird/releases/${PKGVERSION}/source/thunderbird-${PKGVERSION}.source.tar.xz" From fb1510fb43fc7df3552a2a33d96a667f9375730f Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 1 Dec 2017 11:50:11 +0100 Subject: [PATCH 21/97] evince: Update version from 3.24.0 to 3.26.0 Evince 3.24.0 is susceptible to a command injection attack [1][2], which is fixed since 3.24.1, so also in 3.26.0. So update to that version. [1] http://www.cvedetails.com/cve/CVE-2017-1000083/ [2] https://bugzilla.gnome.org/show_bug.cgi?id=784947 --- evince.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evince.be0 b/evince.be0 index 98c622256..1385ea4f4 100755 --- a/evince.be0 +++ b/evince.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION evince-3.24.0-0 +# BEE_VERSION evince-3.26.0-0 BEE_BUILDTYPE=configure From 81eb8da043f89ae04408315acd5766b3832f38f0 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 4 Dec 2017 09:07:53 +0100 Subject: [PATCH 22/97] adwaita-icon-theme: Convert to versionless bee file --- adwaita-icon-theme-3.18.0-1.bee => adwaita-icon-theme.be0 | 2 ++ 1 file changed, 2 insertions(+) rename adwaita-icon-theme-3.18.0-1.bee => adwaita-icon-theme.be0 (98%) diff --git a/adwaita-icon-theme-3.18.0-1.bee b/adwaita-icon-theme.be0 similarity index 98% rename from adwaita-icon-theme-3.18.0-1.bee rename to adwaita-icon-theme.be0 index 2e5e6b77f..b6eaf895c 100755 --- a/adwaita-icon-theme-3.18.0-1.bee +++ b/adwaita-icon-theme.be0 @@ -1,5 +1,7 @@ #!/usr/bin/env beesh +# BEE_VERSION adwaita-icon-theme-3.18.0-1 + ## 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.) From a52aa0e8599c0b65c0fa44ecc17e3f59800605d7 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 4 Dec 2017 09:08:15 +0100 Subject: [PATCH 23/97] adwaita-icon-theme: Strip trailing space --- adwaita-icon-theme.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adwaita-icon-theme.be0 b/adwaita-icon-theme.be0 index b6eaf895c..fd7393f0a 100755 --- a/adwaita-icon-theme.be0 +++ b/adwaita-icon-theme.be0 @@ -54,7 +54,7 @@ SRCURL[0]="http://ftp.gnome.org/pub/gnome/sources/adwaita-icon-theme/${PKGVERSIO #} #mee_configure() { -# bee_configure +# bee_configure #} #mee_build() { From 49038712fb948c8f1f766be370c1a208221503e7 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 4 Dec 2017 09:08:55 +0100 Subject: [PATCH 24/97] adwaita-icon-theme: Securely download source archive Use HTTPS to securely download the source archive. --- adwaita-icon-theme.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adwaita-icon-theme.be0 b/adwaita-icon-theme.be0 index fd7393f0a..14cad96cc 100755 --- a/adwaita-icon-theme.be0 +++ b/adwaita-icon-theme.be0 @@ -9,7 +9,7 @@ ## 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://ftp.gnome.org/pub/gnome/sources/adwaita-icon-theme/${PKGVERSION[2]}/adwaita-icon-theme-${PKGVERSION}.tar.xz" +SRCURL[0]="https://ftp.gnome.org/pub/gnome/sources/adwaita-icon-theme/${PKGVERSION[2]}/adwaita-icon-theme-${PKGVERSION}.tar.xz" ############################################################################### ## Add URLs/pathes to patch files to the PATCHURL array. From 47ad7126d93e8416efb599b2d6daabdb6f478177 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 4 Dec 2017 09:09:39 +0100 Subject: [PATCH 25/97] adwaita-icon-theme: Update version from 3.18.0 to 3.26.0 --- adwaita-icon-theme.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adwaita-icon-theme.be0 b/adwaita-icon-theme.be0 index 14cad96cc..b06ee13f3 100755 --- a/adwaita-icon-theme.be0 +++ b/adwaita-icon-theme.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION adwaita-icon-theme-3.18.0-1 +# BEE_VERSION adwaita-icon-theme-3.26.0-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.) From 2f094d1582df542c5b2253d18028dff8168b5333 Mon Sep 17 00:00:00 2001 From: david Date: Mon, 4 Dec 2017 14:43:06 +0100 Subject: [PATCH 26/97] Firefox: Update from version 57.0 to 57.0.1 change some prefs from lock to default release notes: https://www.mozilla.org/en-US/firefox/57.0.1/releasenotes/?utm_source=firefox-browser&utm_medium=firefox-browser&utm_campaign=whatsnew --- firefox.be0 | 45 ++++++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/firefox.be0 b/firefox.be0 index 2f0bc8f5f..de533cdb2 100755 --- a/firefox.be0 +++ b/firefox.be0 @@ -2,7 +2,7 @@ #export BEE_TMP_TMPDIR=/dev/shm BEE_TMP_BUILDROOT=/dev/shm/bee-root BEE_MAKEFLAGS='-j80' -# BEE_VERSION firefox-57.0-1 +# BEE_VERSION firefox-57.0.1-0 SRCURL[0]="https://ftp.mozilla.org/pub/firefox/releases/${PKGVERSION}/source/firefox-${PKGVERSION}.source.tar.xz" @@ -110,7 +110,7 @@ pref("plugins.notifyMissingFlash", false); // Disable upload of health reports lockPref("datareporting.healthreport.uploadEnabled", false); //disable about:healthreport page (which connects to Mozilla for locale/css+js+json) -pref("datareporting.healthreport.about.reportUrl", "data:text/plain,"); +lockPref("datareporting.healthreport.about.reportUrl", "data:text/plain,"); // Disable all data upload (Telemetry and FHR) lockPref("toolkit.telemetry.unified", false); @@ -127,18 +127,18 @@ lockPref("datareporting.policy.dataSubmissionEnabled", false); lockPref("browser.ping-centre.telemetry", false); //disable "Snippets" (Mozilla content shown on about:home screen) -lockPref("browser.aboutHomeSnippets.updateUrl", "https://127.0.0.1"); //test +defaultPref("browser.aboutHomeSnippets.updateUrl", "https://127.0.0.1"); //test //disable experiments https://wiki.mozilla.org/Telemetry/Experiments -lockPref("experiments.enabled", false); -lockPref("experiments.manifest.uri", ""); -lockPref("experiments.supported", false); -lockPref("experiments.activeExperiment", false); +defaultPref("experiments.enabled", false); +defaultPref("experiments.manifest.uri", ""); +defaultPref("experiments.supported", false); +defaultPref("experiments.activeExperiment", false); // disable Mozilla permission to silently opt you into tests -lockPref("network.allow-experiments", false); +defaultPref("network.allow-experiments", false); //disable pocket -lockPref("extensions.pocket.enabled", false); +defaultPref("extensions.pocket.enabled", false); //disable flyweb https://flyweb.github.io/ pref("dom.flyweb.enabled", false); @@ -148,8 +148,8 @@ lockPref("extensions.shield-recipe-client.enabled", false); lockPref("extensions.shield-recipe-client.api_url", ""); //disable Follow on Search and Activity Stream -lockPref("browser.newtabpage.activity-stream.enabled", false); -lockPref("browser.library.activity-stream.enabled", false); +defaultPref("browser.newtabpage.activity-stream.enabled", false); +defaultPref("browser.library.activity-stream.enabled", false); //disable link-mouseover opening connection to linked server lockPref("network.http.speculative-parallel-limit", 0); @@ -158,11 +158,11 @@ lockPref("network.http.speculative-parallel-limit", 0); lockPref("browser.send_pings", false); lockPref("browser.send_pings.require_same_host", true); -//disable location bar using search - PRIVACY test -lockPref("keyword.enabled", false); +//disable location bar using search - PRIVACY +defaultPref("keyword.enabled", false); //disable location bar domain guessing - PRIVACY/SECURITY -lockPref("browser.fixup.alternate.enabled", false); +defaultPref("browser.fixup.alternate.enabled", false); //display all parts of the url in the location bar - helps SECURITY lockPref("browser.urlbar.trimURLs", false); @@ -171,23 +171,26 @@ lockPref("browser.urlbar.trimURLs", false); lockPref("browser.urlbar.speculativeConnect.enabled", false); //disable SSL session tracking test -lockPref("security.ssl.disable_session_identifiers", true); +defaultPref("security.ssl.disable_session_identifiers", true); //disable SSL Error Reporting -lockPref("security.ssl.errorReporting.automatic", false); -lockPref("security.ssl.errorReporting.enabled", false); -lockPref("security.ssl.errorReporting.url", ""); +defaultPref("security.ssl.errorReporting.automatic", false); +defaultPref("security.ssl.errorReporting.enabled", false); +defaultPref("security.ssl.errorReporting.url", ""); //disable the DNT HTTP header, which is essentially USELESS -lockPref("privacy.donottrackheader.enabled", false); +defaultPref("privacy.donottrackheader.enabled", false); //set max popups from a single non-click event - default is 20! -lockPref("dom.popup_maximum", 3); +defaultPref("dom.popup_maximum", 3); //limit events that can cause a popup default is "change click dblclick mouseup pointerup notificationclick reset submit touchend" -lockPref("dom.popup_allowed_events", "click dblclick"); +defaultPref("dom.popup_allowed_events", "click dblclick"); //enable Firefox's built-in PDF reader defaultPref("pdfjs.disabled", false); + +//enable legacy extensions +defaultPref("extensions.legacy.enabled",true); EOF } From 1b56184a48bfa280041dcd293f8aeb0875b4b4a8 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 4 Dec 2017 17:08:59 +0100 Subject: [PATCH 27/97] exo: Strip trailing space --- exo.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/exo.be0 b/exo.be0 index 33dc5e2b5..2327daa83 100755 --- a/exo.be0 +++ b/exo.be0 @@ -45,7 +45,7 @@ SRCURL[0]="http://archive.xfce.org/src/xfce/exo/${PKGVERSION[2]}/exo-${PKGVERSIO #} #mee_configure() { -# bee_configure +# bee_configure #} #mee_build() { From 3f02fa77cb1a7552f1c9f6348b3e410e9c3901b1 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 4 Dec 2017 17:14:49 +0100 Subject: [PATCH 28/97] exo: Use correct existing icon name for *Mail Reader* Currently, no icon for the mail reader is shown in the application menu. Add the patch to fix that [1]. Increment revision. [1] https://bugzilla.xfce.org/show_bug.cgi?id=13711 --- exo.be0 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/exo.be0 b/exo.be0 index 2327daa83..9756b9b57 100755 --- a/exo.be0 +++ b/exo.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION exo-0.10.7-0 +# BEE_VERSION exo-0.10.7-1 ## 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.) @@ -15,7 +15,7 @@ SRCURL[0]="http://archive.xfce.org/src/xfce/exo/${PKGVERSION[2]}/exo-${PKGVERSIO ## 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/0001-Use-freedesktop.org-mail-icon-name-compliant-Bug-137.patch) ############################################################################### ## Add filename patterns to the EXCLUDE array of files that should not From be0c01ed80ead77f86ac3fb7f96ef762adbfa102 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Thu, 7 Dec 2017 15:25:16 +0100 Subject: [PATCH 29/97] clusterd: Update version from 1.107 to 1.109 https://github.molgen.mpg.de/mariux64/clusterd/releases/tag/v1.109 --- clusterd.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clusterd.be0 b/clusterd.be0 index 7f2b1899a..58837221d 100755 --- a/clusterd.be0 +++ b/clusterd.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION clusterd-1.107-0 +# BEE_VERSION clusterd-1.109-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.) From 9bccf6b6d508d6330744af85a56c8f91d7421768 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 7 Dec 2017 14:51:50 +0100 Subject: [PATCH 30/97] wayland: Add version 1.14.0 From [1]: > Wayland is a project to define a protocol for a compositor to talk to > its clients as well as a library implementation of the protocol. Create the versionless bee file with the commands below. ``` $ bee init https://wayland.freedesktop.org/releases/wayland-1.14.0.tar.xz creating wayland-1.14.0-0.bee from template '/etc/default/bee/templates/fallback' $ mv wayland-1.14.0-0.bee wayland.be0 $ vim wayland.be0 $ git add $_ ``` [1] http://www.linuxfromscratch.org/blfs/view/svn/general/wayland.html --- wayland.be0 | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) create mode 100755 wayland.be0 diff --git a/wayland.be0 b/wayland.be0 new file mode 100755 index 000000000..4a741bb22 --- /dev/null +++ b/wayland.be0 @@ -0,0 +1,85 @@ +#!/usr/bin/env beesh + +# BEE_VERSION wayland-1.14.0-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.) + +############################################################################### +## 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]="https://wayland.freedesktop.org/releases/wayland-${PKGVERSION}.tar.xz" + +############################################################################### +## Add URLs/pathes to patch files to the PATCHURL array. +## The sources will be patched in the order of the array. + +# PATCHURL+=() + +############################################################################### +## Add filename patterns to the EXCLUDE array of files that should not +## be added to you package but may be present in the image directory. + +# EXCLUDE+=() + +############################################################################### +## Uncomment the next statement, if the software may not be able to be built +## outside the source directory and needs to be built inside the source +## directory. + +# build_in_sourcedir + +############################################################################### +## bee cannot detect buildtypes specified in subdirectories. +## Sometimes packages "hide" the real sources in a subdirectory named +## 'src' or 'cmake' or .. +## use 'sourcesubdir_append' to specify this directory if known. + +# sourcesubdir_append src + + +############################################################################### +## Change the default (auto-detected) steps to +## extract, patch, configure/setup, build and install the software. +## Make sure the mee_install function does install everything to the +## image directory "${D}" + +#mee_extract() { +# bee_extract "${@}" +#} + +#mee_patch() { +# bee_patch "${@}" +#} + +#mee_configure() { +# bee_configure +#} + +#mee_build() { +# bee_build +#} + +#mee_install() { +# bee_install +#} +## by default this may be 'make install DESTDIR="${D}"' + +############################################################################### +## +## Additional hints: +## +## The name of this bee-file should follow the following naming convention: +## pkgname-pkgversion-pkgrevision.bee +## +## You may remove all comments as long as SRCURL[0] is set. +## +## Everything in this file will be executed in a bash environment. +## +## Build the package by executing +## './pkg-version-N.bee' or +## 'beesh ./pkg-version-N.bee' +## +## see http://beezinga.org/ +## From 432df23a7da82c8666a6e411b3ef932bc9024ca6 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 7 Dec 2017 15:44:14 +0100 Subject: [PATCH 31/97] wayland: Prevent installation of static versions of libraries --- wayland.be0 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/wayland.be0 b/wayland.be0 index 4a741bb22..f6d75a8de 100755 --- a/wayland.be0 +++ b/wayland.be0 @@ -53,9 +53,10 @@ SRCURL[0]="https://wayland.freedesktop.org/releases/wayland-${PKGVERSION}.tar.xz # bee_patch "${@}" #} -#mee_configure() { -# bee_configure -#} +mee_configure() { + bee_configure \ + --disable-static +} #mee_build() { # bee_build From 0d666ddb0a35f7676eea97cc4f701044f8c471c3 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 7 Dec 2017 14:55:59 +0100 Subject: [PATCH 32/97] wayland-protocols: Add version 1.12 From [1]: > The Wayland-Protocols package contains additional Wayland protocols > that add functionality outside of protocols already in the Wayland > core. Create the versionless bee file with the commands below. ``` $ bee init https://wayland.freedesktop.org/releases/wayland-protocols-1.12.tar.xz creating wayland-protocols-1.12-0.bee from template '/etc/default/bee/templates/fallback' $ mv wayland-protocols-1.12-0.bee wayland-protocols.be0 $ git add $_ $ vim $_ $ git commit -a ``` [1] http://www.linuxfromscratch.org/blfs/view/svn/general/wayland-protocols.html --- wayland-protocols.be0 | 85 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) create mode 100755 wayland-protocols.be0 diff --git a/wayland-protocols.be0 b/wayland-protocols.be0 new file mode 100755 index 000000000..4bf6692f0 --- /dev/null +++ b/wayland-protocols.be0 @@ -0,0 +1,85 @@ +#!/usr/bin/env beesh + +# BEE_VERSION wayland-protocols-1.12-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.) + +############################################################################### +## 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]="https://wayland.freedesktop.org/releases/wayland-protocols-${PKGVERSION}.tar.xz" + +############################################################################### +## Add URLs/pathes to patch files to the PATCHURL array. +## The sources will be patched in the order of the array. + +# PATCHURL+=() + +############################################################################### +## Add filename patterns to the EXCLUDE array of files that should not +## be added to you package but may be present in the image directory. + +# EXCLUDE+=() + +############################################################################### +## Uncomment the next statement, if the software may not be able to be built +## outside the source directory and needs to be built inside the source +## directory. + +# build_in_sourcedir + +############################################################################### +## bee cannot detect buildtypes specified in subdirectories. +## Sometimes packages "hide" the real sources in a subdirectory named +## 'src' or 'cmake' or .. +## use 'sourcesubdir_append' to specify this directory if known. + +# sourcesubdir_append src + + +############################################################################### +## Change the default (auto-detected) steps to +## extract, patch, configure/setup, build and install the software. +## Make sure the mee_install function does install everything to the +## image directory "${D}" + +#mee_extract() { +# bee_extract "${@}" +#} + +#mee_patch() { +# bee_patch "${@}" +#} + +#mee_configure() { +# bee_configure +#} + +#mee_build() { +# bee_build +#} + +#mee_install() { +# bee_install +#} +## by default this may be 'make install DESTDIR="${D}"' + +############################################################################### +## +## Additional hints: +## +## The name of this bee-file should follow the following naming convention: +## pkgname-pkgversion-pkgrevision.bee +## +## You may remove all comments as long as SRCURL[0] is set. +## +## Everything in this file will be executed in a bash environment. +## +## Build the package by executing +## './pkg-version-N.bee' or +## 'beesh ./pkg-version-N.bee' +## +## see http://beezinga.org/ +## From 07041e50a58a5f43ebfb950c4613ef00d82d582c Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 7 Dec 2017 15:51:29 +0100 Subject: [PATCH 33/97] mesalib: Correct configure switch `--with-platforms` Fixes: 08b94dfb (mesalib: Replace deprecated switch name) --- mesalib.be0 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mesalib.be0 b/mesalib.be0 index b11e717c4..e6d99a047 100755 --- a/mesalib.be0 +++ b/mesalib.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION mesalib-17.2.4-0 +# BEE_VERSION mesalib-17.2.6-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.) @@ -62,7 +62,7 @@ mee_configure() { --enable-xa \ --enable-glx-tls \ --with-llvm-shared-libs \ - --with--platforms="drm,x11" \ + --with-platforms="drm,x11" \ --with-gallium-drivers="nouveau,r600,radeonsi,svga,swrast" \ --with-vulkan-drivers="intel,radeon" } From 7d82da98309e7ca97f562214d5c04d195d01c84e Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 7 Dec 2017 15:52:19 +0100 Subject: [PATCH 34/97] mesalib: Enable Wayland backend --- mesalib.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mesalib.be0 b/mesalib.be0 index e6d99a047..afb5a0977 100755 --- a/mesalib.be0 +++ b/mesalib.be0 @@ -62,7 +62,7 @@ mee_configure() { --enable-xa \ --enable-glx-tls \ --with-llvm-shared-libs \ - --with-platforms="drm,x11" \ + --with-platforms="drm,x11,wayland" \ --with-gallium-drivers="nouveau,r600,radeonsi,svga,swrast" \ --with-vulkan-drivers="intel,radeon" } From ae81f7384e050f95929a2b947d45bb1bf86cd658 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 7 Dec 2017 17:22:45 +0100 Subject: [PATCH 35/97] mesalib: Remove deprecated configure option --- mesalib.be0 | 1 - 1 file changed, 1 deletion(-) diff --git a/mesalib.be0 b/mesalib.be0 index afb5a0977..4650aa94c 100755 --- a/mesalib.be0 +++ b/mesalib.be0 @@ -61,7 +61,6 @@ mee_configure() { --enable-osmesa \ --enable-xa \ --enable-glx-tls \ - --with-llvm-shared-libs \ --with-platforms="drm,x11,wayland" \ --with-gallium-drivers="nouveau,r600,radeonsi,svga,swrast" \ --with-vulkan-drivers="intel,radeon" From dbf2ca28537b9784a23bb40e5c90ce56e64cadb1 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 7 Dec 2017 15:21:03 +0100 Subject: [PATCH 36/97] glib2: Convert to versionless bee file --- glib2-2.44.1-0.bee => glib2.be0 | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename glib2-2.44.1-0.bee => glib2.be0 (100%) diff --git a/glib2-2.44.1-0.bee b/glib2.be0 similarity index 100% rename from glib2-2.44.1-0.bee rename to glib2.be0 From 93a181a9db14169a92ff75072bfb9101f95698bb Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 7 Dec 2017 15:22:24 +0100 Subject: [PATCH 37/97] glib2: Update version from 2.44.1 to 2.54.2 GTK+ 3.22.26 requires a newer GLIB version, so update it. Change-log is available online [1]. [1] https://git.gnome.org/browse/glib/tree/NEWS?h=glib-2-54 --- glib2.be0 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/glib2.be0 b/glib2.be0 index a2f34e009..82b629b5c 100755 --- a/glib2.be0 +++ b/glib2.be0 @@ -1,8 +1,10 @@ #!/usr/bin/env beesh +# BEE_VERSION glib2-2.54.2-0 + SRCURL[0]="http://ftp.acc.umu.se/pub/gnome/sources/glib/${PKGVERSION[2]}/glib-${PKGVERSION}.tar.xz" -PATCHURL+=(/src/mariux/download/mariux64-glib-2.44.0-0001-g_get_current_dir-use-get_current_dir_name-if-_GNU_S.patch) +# PATCHURL+=() # BEE_CONFIGURE=compat From b85d4c3b7de91ce94bd745cc73fb56970e13f526 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 7 Dec 2017 15:29:47 +0100 Subject: [PATCH 38/97] libxkbcommon: Add version 0.7.2 From [1]: > libxkbcommon is a keymap compiler and support library which processes > a reduced subset of keymaps as defined by the XKB specification. Create the versionless bee file with the commands below. ``` $ bee init https://xkbcommon.org/download/libxkbcommon-0.7.2.tar.xz creating libxkbcommon-0.7.2-0.bee from template '/etc/default/bee/templates/fallback' $ mv libxkbcommon-0.7.2-0.bee libxkbcommon.be0 $ git add $_ $ vim $_ ``` [1] http://www.linuxfromscratch.org/blfs/view/svn/general/libxkbcommon.html --- libxkbcommon.be0 | 85 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) create mode 100755 libxkbcommon.be0 diff --git a/libxkbcommon.be0 b/libxkbcommon.be0 new file mode 100755 index 000000000..a2045d7d9 --- /dev/null +++ b/libxkbcommon.be0 @@ -0,0 +1,85 @@ +#!/usr/bin/env beesh + +# BEE_VERSION libxkbcommon-0.7.2-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.) + +############################################################################### +## 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]="https://xkbcommon.org/download/libxkbcommon-${PKGVERSION}.tar.xz" + +############################################################################### +## Add URLs/pathes to patch files to the PATCHURL array. +## The sources will be patched in the order of the array. + +# PATCHURL+=() + +############################################################################### +## Add filename patterns to the EXCLUDE array of files that should not +## be added to you package but may be present in the image directory. + +# EXCLUDE+=() + +############################################################################### +## Uncomment the next statement, if the software may not be able to be built +## outside the source directory and needs to be built inside the source +## directory. + +# build_in_sourcedir + +############################################################################### +## bee cannot detect buildtypes specified in subdirectories. +## Sometimes packages "hide" the real sources in a subdirectory named +## 'src' or 'cmake' or .. +## use 'sourcesubdir_append' to specify this directory if known. + +# sourcesubdir_append src + + +############################################################################### +## Change the default (auto-detected) steps to +## extract, patch, configure/setup, build and install the software. +## Make sure the mee_install function does install everything to the +## image directory "${D}" + +#mee_extract() { +# bee_extract "${@}" +#} + +#mee_patch() { +# bee_patch "${@}" +#} + +#mee_configure() { +# bee_configure +#} + +#mee_build() { +# bee_build +#} + +#mee_install() { +# bee_install +#} +## by default this may be 'make install DESTDIR="${D}"' + +############################################################################### +## +## Additional hints: +## +## The name of this bee-file should follow the following naming convention: +## pkgname-pkgversion-pkgrevision.bee +## +## You may remove all comments as long as SRCURL[0] is set. +## +## Everything in this file will be executed in a bash environment. +## +## Build the package by executing +## './pkg-version-N.bee' or +## 'beesh ./pkg-version-N.bee' +## +## see http://beezinga.org/ +## From 25fe5e8c64f2f823d41660e58cf028be75df3a04 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 7 Dec 2017 13:47:07 +0100 Subject: [PATCH 39/97] gtk3: Securely download source archive Use HTTPS to securely download the source archive. --- gtk3-3.16.6-0.bee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gtk3-3.16.6-0.bee b/gtk3-3.16.6-0.bee index 145467991..82b543347 100755 --- a/gtk3-3.16.6-0.bee +++ b/gtk3-3.16.6-0.bee @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -SRCURL[0]="http://ftp.acc.umu.se/pub/gnome/sources/gtk+/${PKGVERSION[2]}/gtk+-${PKGVERSION}.tar.xz" +SRCURL[0]="https://ftp.acc.umu.se/pub/gnome/sources/gtk+/${PKGVERSION[2]}/gtk+-${PKGVERSION}.tar.xz" PATCHURL[0]="" From 8409aacdce8cc308f614ca4d927379e8362832a8 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 7 Dec 2017 13:48:00 +0100 Subject: [PATCH 40/97] gtk3: Convert to versionless bee file --- gtk3-3.16.6-0.bee => gtk3.be0 | 2 ++ 1 file changed, 2 insertions(+) rename gtk3-3.16.6-0.bee => gtk3.be0 (94%) diff --git a/gtk3-3.16.6-0.bee b/gtk3.be0 similarity index 94% rename from gtk3-3.16.6-0.bee rename to gtk3.be0 index 82b543347..d51864c73 100755 --- a/gtk3-3.16.6-0.bee +++ b/gtk3.be0 @@ -1,5 +1,7 @@ #!/usr/bin/env beesh +# BEE_VERSION gtk3-3.16.6-0 + SRCURL[0]="https://ftp.acc.umu.se/pub/gnome/sources/gtk+/${PKGVERSION[2]}/gtk+-${PKGVERSION}.tar.xz" PATCHURL[0]="" From 9bc6afa63e17bfdaa0af77112554e3bc124aa28f Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 7 Dec 2017 14:17:16 +0100 Subject: [PATCH 41/97] gtk3: Update version from 3.16.6 to 3.22.26 Update to GTK+ 3.22.26 fixing [\[Bug 114281\] AutoFilter drop-down menu items invisible] (https://bugs.documentfoundation.org/show_bug.cgi?id=114281) reported by Thomas R.. Announcement from September 2016 [1]: > What's new in 3.22 > ================== > > The 3.22 release is the last development release in the GTK+ 3. series. > GTK+ 3.22 will be maintained as the long-term stable version of GTK+ 3, > and new development will move to the GTK+ 3.90.x releases. To learn more > about the GTK+ roadmap, read: > > https://blog.gtk.org/2016/09/01/versioning-and-long-term-stability-promise-in-gtk > > Major new features include: > > * The Wayland backend has support for drawing tablets > > * The Wayland backend requires xdg-shell v6 > > * We have a gesture API for tablet support, GtkPadController > > * GdkMonitor offers an API for richer information about connected outputs > > * GdkGLContext supports GLES > > * GtkScrolledWindow has new max-content-width/height properties that can > affect the sizing behavior > > * GtkShortcutLabel is a new widget that can display keyboard shortcuts > in the same way that GtkShortcutWindow does > > * A number of GTK+ APIs will now transparently use portals when used > in a Flatpak sandbox, including GtkFileChooserNative, GtkPrintOperation, > gtk_show_uri. > > For more details and lists of fixed bugs, see the NEWS file that is > included in the tarball, or see: > > http://git.gnome.org/browse/gtk+/plain/NEWS?id=3.22.0 > > For concerns about porting from older GTK+ releases, see the README file > that is included in the tarball, or see: > > http://git.gnome.org/browse/gtk+/plain/README.in?id=3.22.0 GTK+ 3.22.26 was released in November 2017. [1] https://mail.gnome.org/archives/gnome-announce-list/2016-September/msg00044.html --- gtk3.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gtk3.be0 b/gtk3.be0 index d51864c73..241173585 100755 --- a/gtk3.be0 +++ b/gtk3.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION gtk3-3.16.6-0 +# BEE_VERSION gtk3-3.22.26-0 SRCURL[0]="https://ftp.acc.umu.se/pub/gnome/sources/gtk+/${PKGVERSION[2]}/gtk+-${PKGVERSION}.tar.xz" From 1c25aa826b08ed1fea326fda7c5f3f27efb88897 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 11 Dec 2017 10:49:45 +0100 Subject: [PATCH 42/97] Revert "Merge pull request #531 from mariux64/update-java-from-8u141-to-9.0.1" This reverts commit 215784b77786656ce763ee2bd2d5cb36a6782817, reversing changes made to 69eadc31902206b0f7786b72d22c09c116a83238. It was decided, that this update is too early, and Java 9 should be put under `/pkg`. --- java.be0 | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/java.be0 b/java.be0 index 0d4ce2a6f..ffa398e27 100755 --- a/java.be0 +++ b/java.be0 @@ -1,20 +1,25 @@ #!/bin/env beesh -# BEE_VERSION java-9.0.1-0 +# BEE_VERSION java-1.8.0_141-0 # http://www.oracle.com/technetwork/java/javase/downloads/index.html -SRCURL[0]="file:///src/mariux/download/jdk-${PKGVERSION}_linux-x64_bin.tar.gz" +SRCURL[0]="file:///src/mariux/download/jdk-8u${PKGEXTRAVERSION}-linux-x64.tar.gz" +#SRCURL[1]="/src/mariux/download/UnlimitedJCEPolicyJDK7.zip" PATCHURL[0]="" BEE_EXTRACT_STRIP=0 +mee_patch() { + unzip /src/mariux/download/jce_policy-8.zip +} + mee_install() { mkdir -p ${D}/usr/local/bin - mv ${S}/jdk-${PKGVERSION} ${D}/usr/local/java + mv ${S}/jdk${PKGFULLVERSION} ${D}/usr/local/java for i in $(ls ${D}/usr/local/java/bin) ; do ln -s /usr/local/java/bin/${i} ${D}/usr/local/bin/${i} @@ -23,3 +28,10 @@ mee_install() { mkdir -p ${D}/usr/lib/mozilla/plugins ln -s /usr/local/java/jre/lib/amd64/libnpjp2.so ${D}/usr/lib/mozilla/plugins/libnpjp2.so } + +mee_install_post() { + cp -v \ + ${S}/UnlimitedJCEPolicyJDK8/US_export_policy.jar \ + ${S}/UnlimitedJCEPolicyJDK8/local_policy.jar \ + ${D}/usr/local/java/jre/lib/security/ +} From cf164fea3f0aee2771983f25d4a2bb1114866fa8 Mon Sep 17 00:00:00 2001 From: david Date: Mon, 11 Dec 2017 16:10:56 +0100 Subject: [PATCH 43/97] Firefox: Update from version 57.0.1 to 57.0.2 release Notes: https://www.mozilla.org/en-US/firefox/57.0.2/releasenotes/?utm_source=firefox-browser&utm_medium=firefox-browser&utm_campaign=whatsnew --- firefox.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/firefox.be0 b/firefox.be0 index de533cdb2..42f2dd88b 100755 --- a/firefox.be0 +++ b/firefox.be0 @@ -2,7 +2,7 @@ #export BEE_TMP_TMPDIR=/dev/shm BEE_TMP_BUILDROOT=/dev/shm/bee-root BEE_MAKEFLAGS='-j80' -# BEE_VERSION firefox-57.0.1-0 +# BEE_VERSION firefox-57.0.2-0 SRCURL[0]="https://ftp.mozilla.org/pub/firefox/releases/${PKGVERSION}/source/firefox-${PKGVERSION}.source.tar.xz" From b522a1e89f31884a3ac6c32f3a20f0add4dd1231 Mon Sep 17 00:00:00 2001 From: david Date: Tue, 12 Dec 2017 13:09:05 +0100 Subject: [PATCH 44/97] Firefox: new Revision activate Crashreporter --- firefox.be0 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/firefox.be0 b/firefox.be0 index 42f2dd88b..7a54347f0 100755 --- a/firefox.be0 +++ b/firefox.be0 @@ -2,7 +2,7 @@ #export BEE_TMP_TMPDIR=/dev/shm BEE_TMP_BUILDROOT=/dev/shm/bee-root BEE_MAKEFLAGS='-j80' -# BEE_VERSION firefox-57.0.2-0 +# BEE_VERSION firefox-57.0.2-1 SRCURL[0]="https://ftp.mozilla.org/pub/firefox/releases/${PKGVERSION}/source/firefox-${PKGVERSION}.source.tar.xz" @@ -17,7 +17,6 @@ mee_configure() { --without-system-icu \ --without-system-nspr \ --disable-dbus \ - --disable-crashreporter \ --disable-tests \ --enable-optimize } From 5adf4a07249e6c2a6b2c5bffdbc404285a66dba0 Mon Sep 17 00:00:00 2001 From: david Date: Tue, 12 Dec 2017 13:10:03 +0100 Subject: [PATCH 45/97] Firefox: new revision unlock preference --- firefox.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/firefox.be0 b/firefox.be0 index 7a54347f0..7614ef304 100755 --- a/firefox.be0 +++ b/firefox.be0 @@ -90,7 +90,7 @@ pref("browser.shell.checkDefaultBrowser", false); lockPref("extensions.getAddons.cache.enabled", false); //disable sending the URL of the website where a plugin crashed -lockPref("dom.ipc.plugins.reportCrashURL", false); +pref("dom.ipc.plugins.reportCrashURL", false); //disable auto update for extensions lockPref("extensions.update.autoUpdateDefault", false); From 20150dac78bf5d547101d9292e6a33a21b091543 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Wed, 13 Dec 2017 11:27:35 +0100 Subject: [PATCH 46/97] libreoffice: Update version from 5.4.3.2 to 5.4.4.1 This release contains several bug fixes. ``` git log --oneline --reverse libreoffice-5.4.3.2...libreoffice-5.4.4.1 bf29f0a603d6 Branch libreoffice-5-4-3 b84cd7fb7610 bump product version to 5.4.4.0.0+ 6509c58b493b bump product version to 5.4.3.1.0+ 366beabc786c tdf#104079 RTF import: fix handling fields inside TOC fields a429282ee081 tdf#112808 Disable "Edit Region" command while cursor in an index. 26074f8ffacd tdf#99537 set expand for re-used sidebar panels 5355e3a4c12e Avoid throwing C++ exception across libjpeg C frames a2cd7c7a1015 Resolves: tdf#109282: a11y crash in use after dispose 8b66ed9ca462 Again, no -fstack-protector-strong for gcc3_linux_aarch64/cpp2uno.cxx 561d25301bf2 gpg4libre fix tdf#113190 don't show expired/invalid keys 8d357a851f7d Resolves: tdf#113214 change back to previous entry after 'more' is dispatcher d175cdf0194b Disable CppunitTset_sc_*_functions_test for linux_aarch64 for now, too bc12c38f0c8f potential deref of empty xStateSet 226e6b1c4e91 Resolves: tdf#113230 crash in finishParagraph 451fcee7f7c2 tdf#97630 xmloff: ODF extended draw:fit-to-size mess 3e250d0a392c tdf#112633 oox: Save backup images to proper path in document bb14f6413114 Resolves: tdf#113253 graphics change shape after ppt roundtrip a9534d12f861 tdf#113225 - hold the solar mutex when entering from UNO. 99fdaf683e64 Resolves: tdf#113179 merge language attributes early, tdf#108795 follow-up :...skipping... bf29f0a603d6 Branch libreoffice-5-4-3 b84cd7fb7610 bump product version to 5.4.4.0.0+ 6509c58b493b bump product version to 5.4.3.1.0+ 366beabc786c tdf#104079 RTF import: fix handling fields inside TOC fields a429282ee081 tdf#112808 Disable "Edit Region" command while cursor in an index. 26074f8ffacd tdf#99537 set expand for re-used sidebar panels 5355e3a4c12e Avoid throwing C++ exception across libjpeg C frames a2cd7c7a1015 Resolves: tdf#109282: a11y crash in use after dispose 8b66ed9ca462 Again, no -fstack-protector-strong for gcc3_linux_aarch64/cpp2uno.cxx 561d25301bf2 gpg4libre fix tdf#113190 don't show expired/invalid keys 8d357a851f7d Resolves: tdf#113214 change back to previous entry after 'more' is dispatcher d175cdf0194b Disable CppunitTset_sc_*_functions_test for linux_aarch64 for now, too bc12c38f0c8f potential deref of empty xStateSet 226e6b1c4e91 Resolves: tdf#113230 crash in finishParagraph 451fcee7f7c2 tdf#97630 xmloff: ODF extended draw:fit-to-size mess 3e250d0a392c tdf#112633 oox: Save backup images to proper path in document bb14f6413114 Resolves: tdf#113253 graphics change shape after ppt roundtrip a9534d12f861 tdf#113225 - hold the solar mutex when entering from UNO. 99fdaf683e64 Resolves: tdf#113179 merge language attributes early, tdf#108795 follow-up 000fbca70516 tdf#110431: Fixed losing listbos entries on opening .ods file 3cd91be80f82 Resolves: tdf#113336 avoid crash during teardown 3c6ce662b444 tdf#112928: don't use "magic statics" for 5.4 (fails on WinXP) 6a1a4699ed8c update credits d17c1496f3e5 update credits d8522a7e0f98 tdf#112928: don't use "magic statics" for 5.4 (fails on WinXP) ba0909f83e65 tdf#113227 FILESAVE: PPT: bullets disappear after RT fecc328cc658 ofz#3745 Bad-cast 2851316853b6 ofz#3759 check for valid starting dash index :...skipping... bf29f0a603d6 Branch libreoffice-5-4-3 b84cd7fb7610 bump product version to 5.4.4.0.0+ 6509c58b493b bump product version to 5.4.3.1.0+ 366beabc786c tdf#104079 RTF import: fix handling fields inside TOC fields a429282ee081 tdf#112808 Disable "Edit Region" command while cursor in an index. 26074f8ffacd tdf#99537 set expand for re-used sidebar panels 5355e3a4c12e Avoid throwing C++ exception across libjpeg C frames a2cd7c7a1015 Resolves: tdf#109282: a11y crash in use after dispose 8b66ed9ca462 Again, no -fstack-protector-strong for gcc3_linux_aarch64/cpp2uno.cxx 561d25301bf2 gpg4libre fix tdf#113190 don't show expired/invalid keys 8d357a851f7d Resolves: tdf#113214 change back to previous entry after 'more' is dispatcher d175cdf0194b Disable CppunitTset_sc_*_functions_test for linux_aarch64 for now, too bc12c38f0c8f potential deref of empty xStateSet 226e6b1c4e91 Resolves: tdf#113230 crash in finishParagraph 451fcee7f7c2 tdf#97630 xmloff: ODF extended draw:fit-to-size mess 3e250d0a392c tdf#112633 oox: Save backup images to proper path in document bb14f6413114 Resolves: tdf#113253 graphics change shape after ppt roundtrip a9534d12f861 tdf#113225 - hold the solar mutex when entering from UNO. 99fdaf683e64 Resolves: tdf#113179 merge language attributes early, tdf#108795 follow-up 000fbca70516 tdf#110431: Fixed losing listbos entries on opening .ods file 3cd91be80f82 Resolves: tdf#113336 avoid crash during teardown 3c6ce662b444 tdf#112928: don't use "magic statics" for 5.4 (fails on WinXP) 6a1a4699ed8c update credits d17c1496f3e5 update credits d8522a7e0f98 tdf#112928: don't use "magic statics" for 5.4 (fails on WinXP) ba0909f83e65 tdf#113227 FILESAVE: PPT: bullets disappear after RT fecc328cc658 ofz#3745 Bad-cast 2851316853b6 ofz#3759 check for valid starting dash index 630541035703 tdf#113202 RTF import: fix lack of expected contextual spacing c2af4edf5e25 tdf#107643 Fix paragraph preview line spacing 9a6966c913e5 tdf#112830 measure test with ApplySettings applied e13650902068 tdf#113368: fix crash when closing dialog opened with Basic d9525910e183 Resolves: tdf#113328 crash in color replacer if parent closed before it 662d3d140470 Resolves: tdf#113378 wrong table border preset icons 3ddbaa413220 Avoid race between DbusIpcThread::close and DbusIpcThread::execute 49562e70b72d ...and one more fix for DbusIpcThread, 2e19422859f6 tdf#113225 - reset framebuffer count when resetting OpenGLContext d78b60fc7b7a ofz#2947 check for input stream end b6c4cdf639d3 Avoid throwing C++ exception across libjpeg C frames f88341e87d74 Again, no -fstack-protector-strong for gcc3_linux_aarch64/cpp2uno.cxx 39e0a8bb79ed Disable CppunitTset_sc_*_functions_test for linux_aarch64 for now, too 671182b8f59e tdf#109343 Fix paste as .RTF on Mac 493d2870cfad tdf#113446 Make EditStyle appear in customization dialog f95ec59f035e fix memory leak 6b51d804949b tdf#113353 gtk2: No decoration for floating toolbars 27b4c48e63d9 SmartArt: export text rotation in the PPTX 19ec0aac7791 Resolves: tdf#113455 Impossible to clear width/height in pages 3cf88ce3ac2a Updated core Project: translations 540114dbce535a42b1c6c76488d8b5920455c385 ccb435e3ee93 Updated core Project: translations 38e1a1d1be83c70482b2f56e1f6527d0be003784 801a761c4f9a tdf#113408 RTF import style dedup: separate paragraph and character handling 6a69400f3e21 Resolves: tdf#113253 graphics change shape after ppt roundtrip 7deb50c02814 tdf#109343 Fix paste as .RTF on Mac ae039c48cc61 tdf#97630 xmloff: ODF extended draw:fit-to-size mess 208f2b1b3093 tdf#113227 FILESAVE: PPT: bullets disappear after RT 67940d53fd68 tdf#108580 ship universal crts with the program as workaround 2c5875485dd5 tdf#108580 ship universal crts with the program as workaround a674d73119d4 tdf#113225 - reset framebuffer count when resetting OpenGLContext dc34b649e821 tdf#113225 - hold the solar mutex when entering from UNO. 72ca169691c4 update credits 9c667c959036 update credits a6dc83081d95 Infinite loop in ooo32227-1.rtf with calc rtf filter 82173efd8e63 crash on loading tdf77861-3.rtf in calc rtf filter a43f6bf0f63a bump product version to 5.4.3.2 facb27803286 (tag: libreoffice-5.4.3.2) Version 5.4.3.2, tag libreoffice-5.4.3.2 39285d362167 tdf#108124 fix: crash during redo, when document contains images Redo action fixed to reinsert images to document correctly. de811bb23597 Related: tdf#113347: properly check HRESULT value 76c54edc8ee9 Resolves: tdf#111428 swap ScColumn::mnBlkCountFormula 75c1e4bc411c PPTX export: remember color schemes in theme 1fb9195131c1 tdf#58186 Update Navigator after promote/demote undo 0e0274ecb5ec Finally make DbusIpcThread terminate 5b9c9ad69d58 Resolves: rtl: tdf#60315 slide pane context menu misplaced 0edc289c7660 sw: ODF import: default as-char shapes to vertical-pos="top" 4428c6627654 ofz#4076 bad palette READ 08fa0c2d549a tdf#113592 LibreLogo: add fallback localization to fix platform issues 25470a3cf04c PPTX export: correct position of rotated groups d30010c7f691 ODP: export TextPreRotateAngle f0074dd8c6e0 ofz#4066 Bad-cast 4e5e00dad259 Seems that testMiscOLEStuff() works only as 64-bit on a current Windows 10 54c1066d3f98 tdf#113550 RTF import: fix incorrect text indent 1649d5dfaca6 tdf#103978 textboxhelper: syncProperty OPAQUE (wrap in background) f17640a95b4c ofz: bad mnRangeOpPosInSymbol 7637c1534b81 Add ICU changeset-40324 fix for CVE-2017-14952 49c7359e8510 gtk3: fix popover placement in RTL 5025a70cae87 sw: ODF import: prevent shapes from inheriting paragraph default margins 00bb70abc909 Resolves: rhbz#1505379 gtk3+X: open comboboxes block session 65cb71759fa9 Fix chart dump test recent failures on MAC 86707e80c32c tdf#113428: Fix glyph positions in PDF export 0673cd4e4e8f vcl: CppunitTest_vcl_complextext requires DejaVu fonts b3639544d55b gitignore: compile_commands.json a7523f5b4d29 tdf#112435 Scroll to navigated position dab3722d7a09 tdf#112352 ooxmlimport: ALWAYS treat 1st nextpage w/cols as cont 0958cd79545a tdf#112547 element p to draw:object, import expects it there 9a1ffec3207a tdf#113591 Fix crash when switching between Calc and other LO window 11e6f0d7e1b9 slideshow: clip shapes in secondary screen window 8959754d2617 ofz+valgrind: Conditional jump or move depends on uninitialised value 9f8429d81c08 Apparent fix for what seems like a copy-paste error by me in 2014 d7c3298fcf1b tdf#108916: uno:LanguageStatus shouldn't appear in the customize dialog 0a03336a6870 Only do kashida insertion with fonts that have non-zero width kashidas 327ad42f4b64 Don't bother with unoinfo either in the sandboxed app bundle a4713560e3b4 tdf#107111: DOCX export: restore HideTabLeader... attribute after TOX 6ba9b72cff5a ofz#4123 do not read past end of file 701e1ec3a2e3 ofz: special case max index for cSymbol 2a63ffd4d51d tdf#113284 Check vector length before use a0527cf1105c Resolves: tdf#112943 don't close popups on resize if size didn't change 33b194c2b8eb Related: tdf#112549 gtk3 hide/show menubar on enter/exit fullscreen e02f068b9719 ofz: XPMReader::ImplGetColKey short read 7e3572833b8c ofz: compare against available data len 3cb4ddd70e4b Make sure there is a org.libreoffice.LibreOffice.desktop again in the Flatpak e9def9676ba4 Resolves: tdf#113695 crash in color picker after parent is closed 19a50ab61549 tdf#113647 set parent for modal gallery dialog f835c36a254c tdf#113894 release ctrl of ctrl+v in input line should strip formatting 01632a5ee892 tdf#113790: skip charfmt grabbag items existing in autofmt grabbag 985523eee724 Resolves: tdf#113889 no date particle reordering when exporting to Excel ad07d83af2a2 Resolves: tdf#103234 undo replacing text with formula a9ed411b4ad9 ofz#4335 verify sprmTDefTable length 1c93732e98c4 ASan heap-buffer-overflow f2eb40825cf6 Resolves: tdf#113615 wrong SwXShape from three possibilities returned 439a6e7c7e32 tdf#111894: fix leak memory with PaletteManager (take 2) 530a587f232e tdf#113935 Switching from read-only to edit mode slow f781a5faae64 gbuild: CliAssembly: clean everything 8be272b66426 tdf#114011 limit/truncate date, not only year 2c3a33bb9927 tdf#113787: always require version file with config for CLI assemblies 6d1d4ebb8b5b tdf#113787: gbuild: fix the version of cli_cppuhelper assembly 7a53f646df5d tdf#113918: Workaround: Load 1bpp indexed PNG as 8bpp indexed Bitmap 13511a077bb8 Resolves: tdf#113562 desired window didn't get the input 479719b1f53c tdf#113657: fix crash when trying to format empty paragraph e977aad341f1 ofz#4414 set new nWwCols after verifying legal size 765ff6064262 ofz#4436 check if seek succeeded cd1613eb5fcd ofz#4435 Bad-cast f42d1a7788dc tdf#113875: Properly export 1bpp greylevel (but not B&W) PNG images to PDF 35376a21e6bd keep track of available data 9a110b6a2846 ofz: fix mem leak e3dc0612e1e7 ofz: ensure aCoordList has required elements 0541dd30d3c8 ofz: check sprm bounds 3278c8f9bb04 tdf#113271 Fix order of color's attributes import. 86207ca7eed9 ofz: avoid invalid short hashValues d2d4e0b7ceaa sd: BestFittingCacheComparer must be irreflexive aa0f44de5b26 curl: fix CVE-2017-8816 2ed722a7a49e tdf#111967 translate offsets so it is relative to v origin 0498b983cc62 ofz: handle bad key len and subsequent PK11_ImportSymKey failure ffe8c1aa9ea6 ofz#4481: move Path2DContext body to onEndElement d100a7c38bbf ofz: handle empty paragraphs case 26cd0bb46559 Resolves: tdf#114112 sort 'select' list 0c528ae1589e tdf#114025 framework: avoid deadlock between Desktop init ... c958c8311366 fix build error 351104c0bf67 tdf#113647 bullet dialog has wrong modal parent abcfe9bef8f2 Resolves: tdf#112549 use gtk3 to set gtk2 window fullscreen... d48ab02bd3bd ofz: handle empty Gradient Stops 011dc2d0ecfa Compensate for loss of Type 1 "Standard Symbols L" substitute for "Symbol" 8ef56abfba1f Updated core Project: translations f14dbe367fbd95092538121400fbeb029336fdfa 845bcfdcede2 ofz#4406 limit escher object cell area to calc's limits 6d67cc8299f1 ofz#4484 don't set mnRangeOpPosInSymbol on StringOverflow case ba0dad96cdaa update credits 2ce7b8c097bd update emoji autocorrect files from po-files 7f81a748d286 ofz: check col/row bounds 4bb69973a66e ofz#4491 Bad-Cast 6cf99dfd0c97 fix installset packaging after fc_local.conf move 531f8785d96e Branch libreoffice-5-4-4 b7c4d67b4ef6 bump product version to 5.4.4.1 da790616461e (tag: libreoffice-5.4.4.1) Version 5.4.4.1, tag libreoffice-5.4.4.1 ``` --- libreoffice.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libreoffice.be0 b/libreoffice.be0 index 4c95243eb..124f6645f 100755 --- a/libreoffice.be0 +++ b/libreoffice.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION libreoffice-5.4.3.2-0 +# BEE_VERSION libreoffice-5.4.4.1-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.) From aa86d5e0c9f27bbb4e98b7b99d8d1b128f2de33e Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 7 Dec 2017 14:38:17 +0100 Subject: [PATCH 47/97] gtk3: Use current bee file template Recreate bee file with the command below, and convert it to a versionless bee file. ``` $ bee init https://ftp.acc.umu.se/pub/gnome/sources/gtk+/3.22/gtk+-3.22.26.tar.xz creating gtk+-3.22.26-0.bee from template '/etc/default/bee/templates/fallback' ``` Add the configure switches back. --- gtk3.be0 | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 52 insertions(+), 6 deletions(-) diff --git a/gtk3.be0 b/gtk3.be0 index 241173585..e68e51197 100755 --- a/gtk3.be0 +++ b/gtk3.be0 @@ -2,28 +2,55 @@ # BEE_VERSION gtk3-3.22.26-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.) + +############################################################################### +## 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]="https://ftp.acc.umu.se/pub/gnome/sources/gtk+/${PKGVERSION[2]}/gtk+-${PKGVERSION}.tar.xz" -PATCHURL[0]="" +############################################################################### +## Add URLs/pathes to patch files to the PATCHURL array. +## The sources will be patched in the order of the array. + +# PATCHURL+=() -# BEE_CONFIGURE=compat +############################################################################### +## Add filename patterns to the EXCLUDE array of files that should not +## be added to you package but may be present in the image directory. -# BEE_BUILDTYPE= +# EXCLUDE+=() -# EXCLUDE="" +############################################################################### +## Uncomment the next statement, if the software may not be able to be built +## outside the source directory and needs to be built inside the source +## directory. # build_in_sourcedir +############################################################################### +## bee cannot detect buildtypes specified in subdirectories. +## Sometimes packages "hide" the real sources in a subdirectory named +## 'src' or 'cmake' or .. +## use 'sourcesubdir_append' to specify this directory if known. +# sourcesubdir_append src +############################################################################### +## Change the default (auto-detected) steps to +## extract, patch, configure/setup, build and install the software. +## Make sure the mee_install function does install everything to the +## image directory "${D}" #mee_extract() { -# bee_extract ${@} +# bee_extract "${@}" #} #mee_patch() { -# bee_patch ${@} +# bee_patch "${@}" #} mee_configure() { @@ -37,3 +64,22 @@ mee_configure() { #mee_install() { # bee_install #} +## by default this may be 'make install DESTDIR="${D}"' + +############################################################################### +## +## Additional hints: +## +## The name of this bee-file should follow the following naming convention: +## pkgname-pkgversion-pkgrevision.bee +## +## You may remove all comments as long as SRCURL[0] is set. +## +## Everything in this file will be executed in a bash environment. +## +## Build the package by executing +## './pkg-version-N.bee' or +## 'beesh ./pkg-version-N.bee' +## +## see http://beezinga.org/ +## From ae7b68eb2b149acb8578e835d0aeb5f4b6c1022d Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 7 Dec 2017 14:41:23 +0100 Subject: [PATCH 48/97] gtk3: Use GNOME domain name MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use the domain name used in the book *Linux from Scratch* [1]. It’s the same system. ``` $ host ftp.acc.umu.se ftp.acc.umu.se has address 194.71.11.165 ftp.acc.umu.se has address 194.71.11.173 ftp.acc.umu.se has IPv6 address 2001:6b0:19::173 ftp.acc.umu.se has IPv6 address 2001:6b0:19::165 ftp.acc.umu.se mail is handled by 0 mail.acc.umu.se. $ host ftp.gnome.org ftp.gnome.org is an alias for ftp.acc.umu.se. ftp.acc.umu.se has address 194.71.11.165 ftp.acc.umu.se has address 194.71.11.173 ftp.acc.umu.se has IPv6 address 2001:6b0:19::173 ftp.acc.umu.se has IPv6 address 2001:6b0:19::165 ftp.acc.umu.se mail is handled by 0 mail.acc.umu.se. ``` [1] http://www.linuxfromscratch.org/blfs/view/svn/x/gtk3.html --- gtk3.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gtk3.be0 b/gtk3.be0 index e68e51197..17138c89f 100755 --- a/gtk3.be0 +++ b/gtk3.be0 @@ -9,7 +9,7 @@ ## 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]="https://ftp.acc.umu.se/pub/gnome/sources/gtk+/${PKGVERSION[2]}/gtk+-${PKGVERSION}.tar.xz" +SRCURL[0]="https://ftp.gnome.org/pub/gnome/sources/gtk+/${PKGVERSION[2]}/gtk+-${PKGVERSION}.tar.xz" ############################################################################### ## Add URLs/pathes to patch files to the PATCHURL array. From 823f34cc8377e1e3d74c9d9cf79f851c0d3ab117 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 7 Dec 2017 14:45:29 +0100 Subject: [PATCH 49/97] gtk3: Put each configure switch on its own line --- gtk3.be0 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gtk3.be0 b/gtk3.be0 index 17138c89f..cbe44c5bc 100755 --- a/gtk3.be0 +++ b/gtk3.be0 @@ -54,7 +54,9 @@ SRCURL[0]="https://ftp.gnome.org/pub/gnome/sources/gtk+/${PKGVERSION[2]}/gtk+-${ #} mee_configure() { - bee_configure --enable-introspection --enable-xinerama + bee_configure \ + --enable-introspection \ + --enable-xinerama } #mee_build() { From b68b69036329dcb3d3f387348251cb9ed7b29a86 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 7 Dec 2017 14:58:54 +0100 Subject: [PATCH 50/97] gtk3: Enable Wayland backend Because we can. > This switch enables the Wayland GDK backend. Replace with > --disable-wayland-backend if you do not have Wayland-1.14.0 and > wayland-protocols-1.12 or you do not wish to build GNOME with Wayland > support. Other changes may be needed to allow the build to complete > without the wayland-backend enabled. [1] http://www.linuxfromscratch.org/blfs/view/svn/x/gtk3.html --- gtk3.be0 | 1 + 1 file changed, 1 insertion(+) diff --git a/gtk3.be0 b/gtk3.be0 index cbe44c5bc..dfa3c59ac 100755 --- a/gtk3.be0 +++ b/gtk3.be0 @@ -56,6 +56,7 @@ SRCURL[0]="https://ftp.gnome.org/pub/gnome/sources/gtk+/${PKGVERSION[2]}/gtk+-${ mee_configure() { bee_configure \ --enable-introspection \ + --enable-wayland-backend \ --enable-xinerama } From 7bfb98b9358c8def54b91ef607b22922c7b122ab Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 7 Dec 2017 15:00:19 +0100 Subject: [PATCH 51/97] gtk3: Explicitly enable X11 backend --- gtk3.be0 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gtk3.be0 b/gtk3.be0 index dfa3c59ac..45eaf57fb 100755 --- a/gtk3.be0 +++ b/gtk3.be0 @@ -57,7 +57,8 @@ mee_configure() { bee_configure \ --enable-introspection \ --enable-wayland-backend \ - --enable-xinerama + --enable-xinerama \ + --enable-x11-backend } #mee_build() { From f5cab444525b29939ceff34741c79d1a7ecf8a3d Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 11 Dec 2017 16:25:28 +0100 Subject: [PATCH 52/97] colord: Strip trailing space --- colord-0.1.19-0.bee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/colord-0.1.19-0.bee b/colord-0.1.19-0.bee index e43319a32..6c8232ae0 100755 --- a/colord-0.1.19-0.bee +++ b/colord-0.1.19-0.bee @@ -25,7 +25,7 @@ PATCHURL[0]="" #} #mee_configure() { -# bee_configure +# bee_configure #} #mee_build() { From 15efea2f49d361a86cdb75d44deac6e32a9830c5 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 11 Dec 2017 16:25:37 +0100 Subject: [PATCH 53/97] colord: Securely download source archive Use HTTPS to securely download the source archive. --- colord-0.1.19-0.bee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/colord-0.1.19-0.bee b/colord-0.1.19-0.bee index 6c8232ae0..e81bf388b 100755 --- a/colord-0.1.19-0.bee +++ b/colord-0.1.19-0.bee @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -SRCURL[0]="http://www.freedesktop.org/software/colord/releases/colord-${PKGVERSION}.tar.xz" +SRCURL[0]="https://www.freedesktop.org/software/colord/releases/colord-${PKGVERSION}.tar.xz" PATCHURL[0]="" From 17c174f3e42abf120887b361407e689b4aab179e Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 11 Dec 2017 16:26:37 +0100 Subject: [PATCH 54/97] colord: Convert to versionless bee file --- colord-0.1.19-0.bee => colord.be0 | 2 ++ 1 file changed, 2 insertions(+) rename colord-0.1.19-0.bee => colord.be0 (93%) diff --git a/colord-0.1.19-0.bee b/colord.be0 similarity index 93% rename from colord-0.1.19-0.bee rename to colord.be0 index e81bf388b..6dd2778cd 100755 --- a/colord-0.1.19-0.bee +++ b/colord.be0 @@ -1,5 +1,7 @@ #!/usr/bin/env beesh +# BEE_VERSION colord-0.1.19-0 + SRCURL[0]="https://www.freedesktop.org/software/colord/releases/colord-${PKGVERSION}.tar.xz" PATCHURL[0]="" From c3872dd7167dbd15b7aac2d200369f864b74e759 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 11 Dec 2017 16:27:40 +0100 Subject: [PATCH 55/97] colord: Update version from 0.1.19 to 1.3.5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently, updating to GTK+ 3.22.26, the GTK+ printer dialog doesn’t list any printers. ``` (evince:7186): Gtk-WARNING **: libcolord.so.2: cannot open shared object file: No such file or directory ``` So, update colord. Do not use colord 1.4.1 as that requires Meson. --- colord.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/colord.be0 b/colord.be0 index 6dd2778cd..3b47305d4 100755 --- a/colord.be0 +++ b/colord.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION colord-0.1.19-0 +# BEE_VERSION colord-1.3.5-0 SRCURL[0]="https://www.freedesktop.org/software/colord/releases/colord-${PKGVERSION}.tar.xz" From b1ca332b550789c9dabc21c9e4bb3c7ee3c24519 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 11 Dec 2017 16:31:14 +0100 Subject: [PATCH 56/97] colord: Disable GUSB MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ``` […] checking for GUSB... no configure: error: Package requirements (gusb >= 0.2.7) were not met: No package 'gusb' found Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. Alternatively, you may set the environment variables GUSB_CFLAGS and GUSB_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. […] ``` --- colord.be0 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/colord.be0 b/colord.be0 index 3b47305d4..61127d107 100755 --- a/colord.be0 +++ b/colord.be0 @@ -26,9 +26,10 @@ PATCHURL[0]="" # bee_patch "${@}" #} -#mee_configure() { -# bee_configure -#} +mee_configure() { + bee_configure \ + --disable-gusb +} #mee_build() { # bee_build From d902dfae7751d39f3ff06a5cb40b3d892202923d Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 11 Dec 2017 16:33:56 +0100 Subject: [PATCH 57/97] colord: Disable systemd seat-tracking support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ``` […] checking for LIBSYSTEMD... no checking for LIBSYSTEMD_LOGIN... no configure: error: Package requirements (libsystemd-login >= 44) were not met: No package 'libsystemd-login' found Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. Alternatively, you may set the environment variables LIBSYSTEMD_LOGIN_CFLAGS and LIBSYSTEMD_LOGIN_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. […] ``` --- colord.be0 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/colord.be0 b/colord.be0 index 61127d107..20a064ee7 100755 --- a/colord.be0 +++ b/colord.be0 @@ -28,7 +28,8 @@ PATCHURL[0]="" mee_configure() { bee_configure \ - --disable-gusb + --disable-gusb \ + --disable-systemd-login } #mee_build() { From ff62e3a512d94d89e63fa7cb186e1538850641e3 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 11 Dec 2017 16:35:44 +0100 Subject: [PATCH 58/97] colord: Disable ArgllCMS sensor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ``` […] checking for spotread... no configure: error: argyllcms sensor requires spotread, not found […] ``` --- colord.be0 | 1 + 1 file changed, 1 insertion(+) diff --git a/colord.be0 b/colord.be0 index 20a064ee7..572c600e6 100755 --- a/colord.be0 +++ b/colord.be0 @@ -28,6 +28,7 @@ PATCHURL[0]="" mee_configure() { bee_configure \ + --disable-argyllcms-sensor \ --disable-gusb \ --disable-systemd-login } From ed6a5eef497d4d307763fcbec34845a9f59c459f Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 11 Dec 2017 16:40:10 +0100 Subject: [PATCH 59/97] colord: Prevent installation of static versions of libraries --- colord.be0 | 1 + 1 file changed, 1 insertion(+) diff --git a/colord.be0 b/colord.be0 index 572c600e6..8fc0c8fa6 100755 --- a/colord.be0 +++ b/colord.be0 @@ -30,6 +30,7 @@ mee_configure() { bee_configure \ --disable-argyllcms-sensor \ --disable-gusb \ + --disable-static \ --disable-systemd-login } From 86b37b58170d457a92424b8343c90c4b4f800fa4 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 11 Dec 2017 16:41:03 +0100 Subject: [PATCH 60/97] colord: Disable GUDEV support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The build currently fails with the errors below. So disable GUDEV support. ``` […] CC libcolord_la-cd-sensor-sync.lo /dev/shm/bee-root/colord/colord-1.3.5-0/source/lib/colord/cd-edid.c: In function ‘cd_edid_convert_pnp_id_to_string’: /dev/shm/bee-root/colord/colord-1.3.5-0/source/lib/colord/cd-edid.c:126:9: error: implicit declaration of function ‘udev_hwdb_new’ [-Werror=implicit-function-declaration] hwdb = udev_hwdb_new (udev); ^ /dev/shm/bee-root/colord/colord-1.3.5-0/source/lib/colord/cd-edid.c:126:2: warning: nested extern declaration of ‘udev_hwdb_new’ [-Wnested-externs] hwdb = udev_hwdb_new (udev); ^ /dev/shm/bee-root/colord/colord-1.3.5-0/source/lib/colord/cd-edid.c:126:7: warning: assignment makes pointer from integer without a cast [-Wint-conversion] hwdb = udev_hwdb_new (udev); ^ /dev/shm/bee-root/colord/colord-1.3.5-0/source/lib/colord/cd-edid.c:132:6: error: implicit declaration of function ‘udev_hwdb_get_properties_list_entry’ [-Werror=implicit-function-declaration] e = udev_hwdb_get_properties_list_entry (hwdb, modalias, 0); ^ /dev/shm/bee-root/colord/colord-1.3.5-0/source/lib/colord/cd-edid.c:132:2: warning: nested extern declaration of ‘udev_hwdb_get_properties_list_entry’ [-Wnested-externs] e = udev_hwdb_get_properties_list_entry (hwdb, modalias, 0); ^ /dev/shm/bee-root/colord/colord-1.3.5-0/source/lib/colord/cd-edid.c:132:4: warning: assignment makes pointer from integer without a cast [-Wint-conversion] e = udev_hwdb_get_properties_list_entry (hwdb, modalias, 0); ^ /dev/shm/bee-root/colord/colord-1.3.5-0/source/lib/colord/cd-edid.c:145:3: error: implicit declaration of function ‘udev_hwdb_unref’ [-Werror=implicit-function-declaration] udev_hwdb_unref (hwdb); ^ /dev/shm/bee-root/colord/colord-1.3.5-0/source/lib/colord/cd-edid.c:145:3: warning: nested extern declaration of ‘udev_hwdb_unref’ [-Wnested-externs] cc1: some warnings being treated as errors Makefile:1171: recipe for target 'libcolordprivate_la-cd-edid.lo' failed […] ``` --- colord.be0 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/colord.be0 b/colord.be0 index 8fc0c8fa6..b747cd050 100755 --- a/colord.be0 +++ b/colord.be0 @@ -31,7 +31,8 @@ mee_configure() { --disable-argyllcms-sensor \ --disable-gusb \ --disable-static \ - --disable-systemd-login + --disable-systemd-login \ + --disable-udev } #mee_build() { From dae34d84b2049dde44133d9c13d590f5682f546b Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 11 Dec 2017 16:50:45 +0100 Subject: [PATCH 61/97] colord: Set daemon user to *colord* [1] > --with-daemon-user=colord: This switch is used so the colord daemon > will run as an unprivileged user instead of root user. [1] http://www.linuxfromscratch.org/blfs/view/8.1/general/colord.html --- colord.be0 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/colord.be0 b/colord.be0 index b747cd050..6ea3be805 100755 --- a/colord.be0 +++ b/colord.be0 @@ -32,7 +32,8 @@ mee_configure() { --disable-gusb \ --disable-static \ --disable-systemd-login \ - --disable-udev + --disable-udev \ + --with-daemon-user=colord } #mee_build() { From 43cbd6d548ec55144fceff93e9d2bc339df06844 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 11 Dec 2017 16:51:51 +0100 Subject: [PATCH 62/97] colord: Do not install systemd service unit [1] > --with-systemdsystemunitdir=no: Disables attempting to build with > systemd libraries. [1] http://www.linuxfromscratch.org/blfs/view/8.1/general/colord.html --- colord.be0 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/colord.be0 b/colord.be0 index 6ea3be805..2d285a1dd 100755 --- a/colord.be0 +++ b/colord.be0 @@ -33,7 +33,8 @@ mee_configure() { --disable-static \ --disable-systemd-login \ --disable-udev \ - --with-daemon-user=colord + --with-daemon-user=colord \ + --without-systemdsystemunitdir } #mee_build() { From 818f71f2dae91e45bd2cb12cf48c5a28222ab59a Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 11 Dec 2017 17:06:24 +0100 Subject: [PATCH 63/97] colord: Use current bee file template Recreate bee file with the command below, and convert it to a versionless bee file. ``` $ bee init https://www.freedesktop.org/software/colord/releases/colord-1.3.5.tar.xz creating colord-1.3.5-0.bee from template '/etc/default/bee/templates/fallback' $ mv colord-1.3.5-0.bee colord.be0 $ vim colord.be0 $ git add colord.be0 ``` --- colord.be0 | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 50 insertions(+), 4 deletions(-) diff --git a/colord.be0 b/colord.be0 index 2d285a1dd..d7843b6ae 100755 --- a/colord.be0 +++ b/colord.be0 @@ -2,21 +2,48 @@ # BEE_VERSION colord-1.3.5-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.) + +############################################################################### +## 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]="https://www.freedesktop.org/software/colord/releases/colord-${PKGVERSION}.tar.xz" -PATCHURL[0]="" +############################################################################### +## Add URLs/pathes to patch files to the PATCHURL array. +## The sources will be patched in the order of the array. + +# PATCHURL+=() -# BEE_CONFIGURE=compat +############################################################################### +## Add filename patterns to the EXCLUDE array of files that should not +## be added to you package but may be present in the image directory. -# BEE_BUILDTYPE= +# EXCLUDE+=() -# EXCLUDE="" +############################################################################### +## Uncomment the next statement, if the software may not be able to be built +## outside the source directory and needs to be built inside the source +## directory. # build_in_sourcedir +############################################################################### +## bee cannot detect buildtypes specified in subdirectories. +## Sometimes packages "hide" the real sources in a subdirectory named +## 'src' or 'cmake' or .. +## use 'sourcesubdir_append' to specify this directory if known. +# sourcesubdir_append src +############################################################################### +## Change the default (auto-detected) steps to +## extract, patch, configure/setup, build and install the software. +## Make sure the mee_install function does install everything to the +## image directory "${D}" #mee_extract() { # bee_extract "${@}" @@ -44,3 +71,22 @@ mee_configure() { #mee_install() { # bee_install #} +## by default this may be 'make install DESTDIR="${D}"' + +############################################################################### +## +## Additional hints: +## +## The name of this bee-file should follow the following naming convention: +## pkgname-pkgversion-pkgrevision.bee +## +## You may remove all comments as long as SRCURL[0] is set. +## +## Everything in this file will be executed in a bash environment. +## +## Build the package by executing +## './pkg-version-N.bee' or +## 'beesh ./pkg-version-N.bee' +## +## see http://beezinga.org/ +## From b4ec018bc19370745a09c80dea1e62e2a28343a2 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 14 Dec 2017 08:27:12 +0100 Subject: [PATCH 64/97] xfce4-panel: Update version from 4.12.1 to 4.12.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Release notes [1]: > Release notes for 4.12.2 > ======================== > - Feature: Support for RandR's 'primary monitor' > - Translation updates: Arabic, Asturian, Basque, Bengali, Bulgarian, > Catalan, Chinese (China), Chinese (Hong Kong), Chinese (Taiwan), > Croatian, Czech, Danish, Dutch (Flemish), English (Australia), > English (Great Britain), Estonian, Finnish, French, Galician, > German, Greek, Hebrew, Hungarian, Icelandic, Indonesian, > Italian, Japanese, Kazakh, Korean, Lithuanian, Malay, > Norwegian Bokmål, Norwegian Nynorsk, Occitan, Panjabi, Polish, > Portuguese, Portuguese (Brazilian), Romanian, Russian, Serbian, > Slovak, Slovenian, Spanish, Swedish, Telugu, Thai, > Turkish, Ukrainian, Uyghur, Vietnamese [1] https://mail.xfce.org/pipermail/xfce-announce/2017-December/000564.html --- xfce4-panel.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xfce4-panel.be0 b/xfce4-panel.be0 index 07bf50d24..01067d96f 100755 --- a/xfce4-panel.be0 +++ b/xfce4-panel.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION xfce4-panel-4.12.1-1 +# BEE_VERSION xfce4-panel-4.12.2-0 SRCURL[0]="http://archive.xfce.org/src/xfce/xfce4-panel/${PKGVERSION[2]}/xfce4-panel-${PKGVERSION}.tar.bz2" PATCHURL[0]="/src/mariux/beeroot/downloads/xfce4-panel.patch" From c8858d3829536abd70501e508060c48f764ed884 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 15 Dec 2017 12:07:09 +0100 Subject: [PATCH 65/97] Revert "colord: Do not install systemd service unit [1]" This reverts commit 43cbd6d548ec55144fceff93e9d2bc339df06844. Programs using the GTK+ printing dialog print warnings to the terminal about the missing service file. ``` ** (evince:4561): WARNING **: failed to contact colord: Error calling StartServiceByName for org.freedesktop.ColorManager: GDBus.Error:org.freedesktop.systemd1.LoadFailed: Unit colord.service failed to load: No such file or directory. See system logs and 'systemctl status' for details. ``` --- colord.be0 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/colord.be0 b/colord.be0 index d7843b6ae..6c61121ce 100755 --- a/colord.be0 +++ b/colord.be0 @@ -60,8 +60,7 @@ mee_configure() { --disable-static \ --disable-systemd-login \ --disable-udev \ - --with-daemon-user=colord \ - --without-systemdsystemunitdir + --with-daemon-user=colord } #mee_build() { From 6b2721589768318b73944345341d3d6eb9bcea93 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Mon, 18 Dec 2017 11:33:55 +0100 Subject: [PATCH 66/97] bee: Update version from 1.2.13 to 1.2.14 https://github.molgen.mpg.de/mariux64/bee/releases/tag/bee-1.2.14 --- bee.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bee.be0 b/bee.be0 index 2ae35b653..9787185aa 100755 --- a/bee.be0 +++ b/bee.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION bee-1.2.13-0 +# BEE_VERSION bee-1.2.14-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.) From 1ed83085811e9af60e4fd65efdbc49fd754433b8 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Tue, 12 Dec 2017 11:31:58 +0100 Subject: [PATCH 67/97] linux: Add LTS version 4.9.68 --- linux-4.9.68-193.bee | 83 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) create mode 100755 linux-4.9.68-193.bee diff --git a/linux-4.9.68-193.bee b/linux-4.9.68-193.bee new file mode 100755 index 000000000..0d14f9df8 --- /dev/null +++ b/linux-4.9.68-193.bee @@ -0,0 +1,83 @@ +#!/bin/env beesh + +# note: CONFIG=/boot/config-WHATEVER BEE_MAKEFLAGS='-j 40' ./linux-xxx.bee + +KERNELVERSION=${PKGVERSION} +if [ -z "${PKGVERSION[3]}" ] ; then + KERNELVERSION=${KERNELVERSION}.0 +fi + +# append extra version to get for example 4.8.0-rc4 +KERNELVERSION=${KERNELVERSION}${PKGEXTRAVERSION_DASH} + +echo $KERNELVERSION + +SRCURL[0]="https://cdn.kernel.org/pub/linux/kernel/v${PKGVERSION[1]}.x/linux-${PKGVERSION}${PKGEXTRAVERSION_DASH}.tar.xz" + +PATCHURL+=(/src/mariux/patches/0001-iomap-fix-integer-truncation-issues-in-the-zeroing-a.patch) +PATCHURL+=(/src/mariux/patches/linux-0001-SUNRPC-Refactor-svc_set_num_threads.patch) +PATCHURL+=(/src/mariux/patches/linux-0002-NFSv4-Fix-callback-server-shutdown.patch) + +# EXCLUDE="" + +#CONFIG= + +KERNELLOCAL=".mx64.${PKGREVISION}" +FULLKERNELVERSION="${KERNELVERSION}${KERNELLOCAL}" + +B=${S} + +mee_patch() { + echo "PATCH $@" + bee_patch $@ +} + +mee_configure() { + echo "configure $@" + if [ -e /proc/config.gz ] ; then + zcat /proc/config.gz >config-current + RUNNING=config-current + else + RUNNING=/boot/config-$(uname -r) + fi + + : ${CONFIG:=${RUNNING}} + + if [ ! -e ${CONFIG} ] ; then + echo "can't find config '${CONFIG}'" + exit 1 + fi + + cp -v ${CONFIG} .config + + LOCALVERSION="\"${KERNELLOCAL}\"" + sed -i -e "s@CONFIG_LOCALVERSION=.*@CONFIG_LOCALVERSION=${LOCALVERSION}@" .config + + echo "doing make -C ${S} olddefconfig in ${PWD} .." + + make olddefconfig + + echo "doing make -C ${S} menuconfig in ${PWD} .." + + make menuconfig +} + +mee_build() { + echo "build $@" + make ${BEE_MAKEFLAGS} +} + +mee_install() { + echo "install $@" + + make modules_install INSTALL_MOD_PATH=${D} + make install INSTALL_PATH=${D}/boot +# make firmware_install INSTALL_MOD_PATH=${D} + + rm -v ${D}/lib/modules/${FULLKERNELVERSION}/{source,build} + + ln -sv /usr/src/linux/${PKGALLPKG}/source ${D}/lib/modules/${FULLKERNELVERSION}/source + ln -sv /usr/src/linux/${PKGALLPKG}/build ${D}/lib/modules/${FULLKERNELVERSION}/build + + ln -sv bzImage-${FULLKERNELVERSION} ${D}/boot/mariux.${PKGREVISION} +} From 16c1f90b2e80179fe0f1a57d48db63300bf88b5d Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Tue, 12 Dec 2017 11:35:40 +0100 Subject: [PATCH 68/97] linux-4.9.68: Remove obsolete patches These three backported patches are already included in 4.9.68. --- linux-4.9.68-193.bee | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/linux-4.9.68-193.bee b/linux-4.9.68-193.bee index 0d14f9df8..43758ac59 100755 --- a/linux-4.9.68-193.bee +++ b/linux-4.9.68-193.bee @@ -14,9 +14,7 @@ echo $KERNELVERSION SRCURL[0]="https://cdn.kernel.org/pub/linux/kernel/v${PKGVERSION[1]}.x/linux-${PKGVERSION}${PKGEXTRAVERSION_DASH}.tar.xz" -PATCHURL+=(/src/mariux/patches/0001-iomap-fix-integer-truncation-issues-in-the-zeroing-a.patch) -PATCHURL+=(/src/mariux/patches/linux-0001-SUNRPC-Refactor-svc_set_num_threads.patch) -PATCHURL+=(/src/mariux/patches/linux-0002-NFSv4-Fix-callback-server-shutdown.patch) +PATCHURL+=() # EXCLUDE="" From 82d52fd7ce8106c191aa89037f026d5ea94a8da3 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Tue, 12 Dec 2017 11:59:04 +0100 Subject: [PATCH 69/97] linux-4.9.68: Check for existing revision number We want our kernel revision numbers to be unique over all linux kernel packages. Avoid conflicts by doing a quick check against the available bee files. Patch by Thomas Kreitler --- linux-4.9.68-193.bee | 3 +++ 1 file changed, 3 insertions(+) diff --git a/linux-4.9.68-193.bee b/linux-4.9.68-193.bee index 43758ac59..b7e25db05 100755 --- a/linux-4.9.68-193.bee +++ b/linux-4.9.68-193.bee @@ -25,6 +25,9 @@ FULLKERNELVERSION="${KERNELVERSION}${KERNELLOCAL}" B=${S} +ls ${BEE_PKGDIR}/linux-[0-9].[0-9]*-${PKGREVISION}.x86_64.bee.* 2>/dev/null \ + && echo "A kernel with revision ${PKGREVISION} has already been build." && exit + mee_patch() { echo "PATCH $@" bee_patch $@ From ce979440eff09cf6f14b2290430131d775dc3e66 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Thu, 14 Dec 2017 14:40:13 +0100 Subject: [PATCH 70/97] linux-4.9.68: Improve error message for existing kernel revision Include the names of the conflicting files in the error message. --- linux-4.9.68-193.bee | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/linux-4.9.68-193.bee b/linux-4.9.68-193.bee index b7e25db05..6eb8f4bc4 100755 --- a/linux-4.9.68-193.bee +++ b/linux-4.9.68-193.bee @@ -25,8 +25,9 @@ FULLKERNELVERSION="${KERNELVERSION}${KERNELLOCAL}" B=${S} -ls ${BEE_PKGDIR}/linux-[0-9].[0-9]*-${PKGREVISION}.x86_64.bee.* 2>/dev/null \ - && echo "A kernel with revision ${PKGREVISION} has already been build." && exit +same_revision_files=$(ls ${BEE_PKGDIR}/linux-[0-9].[0-9]*-${PKGREVISION}.x86_64.bee.* 2>/dev/null) \ + && echo "A kernel with revision ${PKGREVISION} has already been build: $same_revision_files" \ + && exit mee_patch() { echo "PATCH $@" From 4e28d881875bd004d700f1569fd48a87031b20a9 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Wed, 13 Dec 2017 16:37:37 +0100 Subject: [PATCH 71/97] linux-4.9.68: Import config Include kernel config in the bee file, so that we can better track config changes. The set of non-default config options was generated with `make savedefconfig`. --- linux-4.9.68-193.bee | 795 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 770 insertions(+), 25 deletions(-) diff --git a/linux-4.9.68-193.bee b/linux-4.9.68-193.bee index 6eb8f4bc4..ed611abfa 100755 --- a/linux-4.9.68-193.bee +++ b/linux-4.9.68-193.bee @@ -36,32 +36,777 @@ mee_patch() { mee_configure() { echo "configure $@" - if [ -e /proc/config.gz ] ; then - zcat /proc/config.gz >config-current - RUNNING=config-current - else - RUNNING=/boot/config-$(uname -r) - fi - - : ${CONFIG:=${RUNNING}} - - if [ ! -e ${CONFIG} ] ; then - echo "can't find config '${CONFIG}'" - exit 1 - fi - - cp -v ${CONFIG} .config - - LOCALVERSION="\"${KERNELLOCAL}\"" - sed -i -e "s@CONFIG_LOCALVERSION=.*@CONFIG_LOCALVERSION=${LOCALVERSION}@" .config - - echo "doing make -C ${S} olddefconfig in ${PWD} .." - + cat >.config <<-EOF + CONFIG_LOCALVERSION="$KERNELLOCAL" + CONFIG_KERNEL_BZIP2=y + CONFIG_SYSVIPC=y + CONFIG_POSIX_MQUEUE=y + CONFIG_AUDIT=y + CONFIG_HIGH_RES_TIMERS=y + CONFIG_BSD_PROCESS_ACCT=y + CONFIG_BSD_PROCESS_ACCT_V3=y + CONFIG_TASK_XACCT=y + CONFIG_TASK_IO_ACCOUNTING=y + CONFIG_IKCONFIG=y + CONFIG_IKCONFIG_PROC=y + CONFIG_CGROUPS=y + CONFIG_MEMCG=y + CONFIG_MEMCG_SWAP=y + CONFIG_BLK_CGROUP=y + CONFIG_CGROUP_SCHED=y + CONFIG_CFS_BANDWIDTH=y + CONFIG_RT_GROUP_SCHED=y + CONFIG_CGROUP_PIDS=y + CONFIG_CGROUP_FREEZER=y + CONFIG_CGROUP_HUGETLB=y + CONFIG_CPUSETS=y + CONFIG_CGROUP_DEVICE=y + CONFIG_CGROUP_CPUACCT=y + CONFIG_CGROUP_PERF=y + CONFIG_CGROUP_DEBUG=y + CONFIG_USER_NS=y + CONFIG_BLK_DEV_INITRD=y + CONFIG_SLAB=y + CONFIG_MODULES=y + CONFIG_MODULE_UNLOAD=y + CONFIG_MODULE_FORCE_UNLOAD=y + CONFIG_MODVERSIONS=y + CONFIG_BLK_DEV_INTEGRITY=y + CONFIG_BLK_DEV_THROTTLING=y + CONFIG_PARTITION_ADVANCED=y + CONFIG_MAC_PARTITION=y + CONFIG_BSD_DISKLABEL=y + CONFIG_LDM_PARTITION=y + CONFIG_CFQ_GROUP_IOSCHED=y + CONFIG_SMP=y + CONFIG_IOSF_MBI=m + CONFIG_GART_IOMMU=y + CONFIG_NR_CPUS=256 + CONFIG_PREEMPT_VOLUNTARY=y + CONFIG_MICROCODE_AMD=y + CONFIG_NUMA=y + CONFIG_TRANSPARENT_HUGEPAGE=y + CONFIG_HZ_1000=y + CONFIG_KEXEC=y + CONFIG_KEXEC_FILE=y + # CONFIG_RELOCATABLE is not set + CONFIG_PHYSICAL_ALIGN=0x1000000 + CONFIG_COMPAT_VDSO=y + CONFIG_CMDLINE_BOOL=y + CONFIG_CMDLINE="init=/bin/systemd" + # CONFIG_ACPI_AC is not set + # CONFIG_ACPI_BATTERY is not set + CONFIG_ACPI_DOCK=y + CONFIG_CPU_IDLE_GOV_MENU=y + CONFIG_PCI_MMCONFIG=y + CONFIG_PCIEPORTBUS=y + CONFIG_PCI_IOV=y + # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set + CONFIG_BINFMT_MISC=y + CONFIG_IA32_EMULATION=y + CONFIG_IA32_AOUT=y + CONFIG_NET=y + CONFIG_PACKET=m + CONFIG_PACKET_DIAG=m + CONFIG_UNIX=m + CONFIG_UNIX_DIAG=m + CONFIG_XFRM_USER=m + CONFIG_INET=y + CONFIG_IP_MULTICAST=y + CONFIG_IP_ADVANCED_ROUTER=y + CONFIG_IP_FIB_TRIE_STATS=y + CONFIG_IP_MULTIPLE_TABLES=y + CONFIG_IP_ROUTE_MULTIPATH=y + CONFIG_IP_ROUTE_VERBOSE=y + CONFIG_NET_IPIP=m + CONFIG_NET_IPGRE_DEMUX=m + CONFIG_NET_IPGRE=m + CONFIG_NET_IPGRE_BROADCAST=y + CONFIG_IP_MROUTE=y + CONFIG_IP_MROUTE_MULTIPLE_TABLES=y + CONFIG_IP_PIMSM_V1=y + CONFIG_IP_PIMSM_V2=y + CONFIG_NET_IPVTI=m + CONFIG_NET_FOU_IP_TUNNELS=y + CONFIG_INET_AH=m + CONFIG_INET_ESP=m + CONFIG_INET_IPCOMP=m + CONFIG_INET_XFRM_MODE_TRANSPORT=m + CONFIG_INET_XFRM_MODE_TUNNEL=m + CONFIG_INET_XFRM_MODE_BEET=m + CONFIG_INET_DIAG=m + CONFIG_INET_UDP_DIAG=m + CONFIG_TCP_CONG_ADVANCED=y + CONFIG_TCP_CONG_HSTCP=m + CONFIG_TCP_CONG_HYBLA=m + CONFIG_TCP_CONG_SCALABLE=m + CONFIG_TCP_CONG_LP=m + CONFIG_TCP_CONG_VENO=m + CONFIG_TCP_CONG_YEAH=m + CONFIG_TCP_CONG_ILLINOIS=m + CONFIG_TCP_CONG_DCTCP=m + CONFIG_TCP_CONG_CDG=m + CONFIG_TCP_MD5SIG=y + CONFIG_IPV6=m + CONFIG_IPV6_ROUTER_PREF=y + CONFIG_IPV6_ROUTE_INFO=y + CONFIG_IPV6_OPTIMISTIC_DAD=y + CONFIG_INET6_AH=m + CONFIG_INET6_ESP=m + CONFIG_INET6_IPCOMP=m + CONFIG_IPV6_MIP6=m + CONFIG_IPV6_ILA=m + CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m + CONFIG_IPV6_VTI=m + CONFIG_IPV6_SIT_6RD=y + CONFIG_IPV6_GRE=m + CONFIG_IPV6_MULTIPLE_TABLES=y + CONFIG_IPV6_SUBTREES=y + CONFIG_IPV6_MROUTE=y + CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y + CONFIG_IPV6_PIMSM_V2=y + CONFIG_NETFILTER=y + CONFIG_NF_CONNTRACK=m + CONFIG_NF_CONNTRACK_ZONES=y + CONFIG_NF_CONNTRACK_EVENTS=y + CONFIG_NF_CONNTRACK_TIMEOUT=y + CONFIG_NF_CONNTRACK_TIMESTAMP=y + CONFIG_NF_CT_PROTO_UDPLITE=m + CONFIG_NF_CONNTRACK_AMANDA=m + CONFIG_NF_CONNTRACK_FTP=m + CONFIG_NF_CONNTRACK_H323=m + CONFIG_NF_CONNTRACK_IRC=m + CONFIG_NF_CONNTRACK_NETBIOS_NS=m + CONFIG_NF_CONNTRACK_SNMP=m + CONFIG_NF_CONNTRACK_PPTP=m + CONFIG_NF_CONNTRACK_SANE=m + CONFIG_NF_CONNTRACK_SIP=m + CONFIG_NF_CONNTRACK_TFTP=m + CONFIG_NF_CT_NETLINK=m + CONFIG_NF_CT_NETLINK_TIMEOUT=m + CONFIG_NF_CT_NETLINK_HELPER=m + CONFIG_NETFILTER_NETLINK_GLUE_CT=y + CONFIG_NF_TABLES=m + CONFIG_NF_TABLES_INET=m + CONFIG_NF_TABLES_NETDEV=m + CONFIG_NFT_EXTHDR=m + CONFIG_NFT_META=m + CONFIG_NFT_CT=m + CONFIG_NFT_COUNTER=m + CONFIG_NFT_LOG=m + CONFIG_NFT_LIMIT=m + CONFIG_NFT_MASQ=m + CONFIG_NFT_REDIR=m + CONFIG_NFT_NAT=m + CONFIG_NFT_QUEUE=m + CONFIG_NFT_REJECT=m + CONFIG_NFT_COMPAT=m + CONFIG_NFT_HASH=m + CONFIG_NETFILTER_XTABLES=y + CONFIG_NETFILTER_XT_SET=m + CONFIG_NETFILTER_XT_TARGET_AUDIT=m + CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m + CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m + CONFIG_NETFILTER_XT_TARGET_CONNMARK=m + CONFIG_NETFILTER_XT_TARGET_DSCP=m + CONFIG_NETFILTER_XT_TARGET_HMARK=m + CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m + CONFIG_NETFILTER_XT_TARGET_LOG=m + CONFIG_NETFILTER_XT_TARGET_MARK=m + CONFIG_NETFILTER_XT_TARGET_NFLOG=m + CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m + CONFIG_NETFILTER_XT_TARGET_NOTRACK=m + CONFIG_NETFILTER_XT_TARGET_TEE=m + CONFIG_NETFILTER_XT_TARGET_TPROXY=m + CONFIG_NETFILTER_XT_TARGET_TRACE=m + CONFIG_NETFILTER_XT_TARGET_TCPMSS=m + CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m + CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m + CONFIG_NETFILTER_XT_MATCH_BPF=m + CONFIG_NETFILTER_XT_MATCH_CGROUP=m + CONFIG_NETFILTER_XT_MATCH_CLUSTER=m + CONFIG_NETFILTER_XT_MATCH_COMMENT=m + CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m + CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m + CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m + CONFIG_NETFILTER_XT_MATCH_CONNMARK=m + CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m + CONFIG_NETFILTER_XT_MATCH_CPU=m + CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m + CONFIG_NETFILTER_XT_MATCH_DSCP=m + CONFIG_NETFILTER_XT_MATCH_ECN=y + CONFIG_NETFILTER_XT_MATCH_ESP=m + CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m + CONFIG_NETFILTER_XT_MATCH_HELPER=m + CONFIG_NETFILTER_XT_MATCH_HL=y + CONFIG_NETFILTER_XT_MATCH_IPCOMP=m + CONFIG_NETFILTER_XT_MATCH_IPRANGE=m + CONFIG_NETFILTER_XT_MATCH_IPVS=m + CONFIG_NETFILTER_XT_MATCH_LENGTH=m + CONFIG_NETFILTER_XT_MATCH_LIMIT=m + CONFIG_NETFILTER_XT_MATCH_MAC=m + CONFIG_NETFILTER_XT_MATCH_MARK=m + CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m + CONFIG_NETFILTER_XT_MATCH_NFACCT=m + CONFIG_NETFILTER_XT_MATCH_OSF=m + CONFIG_NETFILTER_XT_MATCH_OWNER=m + CONFIG_NETFILTER_XT_MATCH_POLICY=m + CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m + CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m + CONFIG_NETFILTER_XT_MATCH_QUOTA=m + CONFIG_NETFILTER_XT_MATCH_RATEEST=m + CONFIG_NETFILTER_XT_MATCH_REALM=m + CONFIG_NETFILTER_XT_MATCH_RECENT=m + CONFIG_NETFILTER_XT_MATCH_SOCKET=m + CONFIG_NETFILTER_XT_MATCH_STATE=m + CONFIG_NETFILTER_XT_MATCH_STATISTIC=m + CONFIG_NETFILTER_XT_MATCH_STRING=m + CONFIG_NETFILTER_XT_MATCH_TCPMSS=m + CONFIG_NETFILTER_XT_MATCH_TIME=m + CONFIG_NETFILTER_XT_MATCH_U32=y + CONFIG_IP_SET=m + CONFIG_IP_SET_BITMAP_IP=m + CONFIG_IP_SET_BITMAP_IPMAC=m + CONFIG_IP_SET_BITMAP_PORT=m + CONFIG_IP_SET_HASH_IP=m + CONFIG_IP_SET_HASH_IPMARK=m + CONFIG_IP_SET_HASH_IPPORT=m + CONFIG_IP_SET_HASH_IPPORTIP=m + CONFIG_IP_SET_HASH_IPPORTNET=m + CONFIG_IP_SET_HASH_MAC=m + CONFIG_IP_SET_HASH_NETPORTNET=m + CONFIG_IP_SET_HASH_NET=m + CONFIG_IP_SET_HASH_NETNET=m + CONFIG_IP_SET_HASH_NETPORT=m + CONFIG_IP_SET_HASH_NETIFACE=m + CONFIG_IP_SET_LIST_SET=m + CONFIG_IP_VS=m + CONFIG_IP_VS_RR=m + CONFIG_IP_VS_NFCT=y + CONFIG_NF_CONNTRACK_IPV4=m + CONFIG_NFT_CHAIN_ROUTE_IPV4=m + CONFIG_NFT_DUP_IPV4=m + CONFIG_NF_TABLES_ARP=m + CONFIG_NF_LOG_ARP=m + CONFIG_NFT_CHAIN_NAT_IPV4=m + CONFIG_NFT_MASQ_IPV4=m + CONFIG_NFT_REDIR_IPV4=m + CONFIG_IP_NF_IPTABLES=m + CONFIG_IP_NF_MATCH_AH=m + CONFIG_IP_NF_MATCH_ECN=m + CONFIG_IP_NF_MATCH_RPFILTER=m + CONFIG_IP_NF_MATCH_TTL=m + CONFIG_IP_NF_FILTER=m + CONFIG_IP_NF_TARGET_REJECT=m + CONFIG_IP_NF_TARGET_SYNPROXY=m + CONFIG_IP_NF_NAT=m + CONFIG_IP_NF_TARGET_MASQUERADE=m + CONFIG_IP_NF_TARGET_NETMAP=m + CONFIG_IP_NF_TARGET_REDIRECT=m + CONFIG_IP_NF_MANGLE=m + CONFIG_IP_NF_TARGET_CLUSTERIP=m + CONFIG_IP_NF_TARGET_ECN=m + CONFIG_IP_NF_TARGET_TTL=m + CONFIG_IP_NF_RAW=m + CONFIG_IP_NF_ARPTABLES=m + CONFIG_IP_NF_ARPFILTER=m + CONFIG_IP_NF_ARP_MANGLE=m + CONFIG_NF_CONNTRACK_IPV6=m + CONFIG_NFT_CHAIN_ROUTE_IPV6=m + CONFIG_NFT_DUP_IPV6=m + CONFIG_NFT_CHAIN_NAT_IPV6=m + CONFIG_NFT_MASQ_IPV6=m + CONFIG_NFT_REDIR_IPV6=m + CONFIG_IP6_NF_IPTABLES=m + CONFIG_IP6_NF_MATCH_AH=m + CONFIG_IP6_NF_MATCH_EUI64=m + CONFIG_IP6_NF_MATCH_FRAG=m + CONFIG_IP6_NF_MATCH_OPTS=m + CONFIG_IP6_NF_MATCH_HL=m + CONFIG_IP6_NF_MATCH_IPV6HEADER=m + CONFIG_IP6_NF_MATCH_MH=m + CONFIG_IP6_NF_MATCH_RPFILTER=m + CONFIG_IP6_NF_MATCH_RT=m + CONFIG_IP6_NF_TARGET_HL=m + CONFIG_IP6_NF_FILTER=m + CONFIG_IP6_NF_TARGET_REJECT=m + CONFIG_IP6_NF_TARGET_SYNPROXY=m + CONFIG_IP6_NF_MANGLE=m + CONFIG_IP6_NF_RAW=m + CONFIG_IP6_NF_NAT=m + CONFIG_IP6_NF_TARGET_MASQUERADE=m + CONFIG_IP6_NF_TARGET_NPT=m + CONFIG_NF_TABLES_BRIDGE=m + CONFIG_BRIDGE_NF_EBTABLES=m + CONFIG_IP_DCCP=m + CONFIG_RDS=m + CONFIG_RDS_TCP=m + CONFIG_TIPC=m + CONFIG_L2TP=m + CONFIG_L2TP_V3=y + CONFIG_L2TP_IP=m + CONFIG_L2TP_ETH=m + CONFIG_BRIDGE=m + CONFIG_BRIDGE_VLAN_FILTERING=y + CONFIG_VLAN_8021Q=m + CONFIG_VLAN_8021Q_GVRP=y + CONFIG_VLAN_8021Q_MVRP=y + CONFIG_NET_SCHED=y + CONFIG_NET_SCH_CBQ=m + CONFIG_NET_SCH_HTB=m + CONFIG_NET_SCH_HFSC=m + CONFIG_NET_SCH_PRIO=m + CONFIG_NET_SCH_MULTIQ=m + CONFIG_NET_SCH_RED=m + CONFIG_NET_SCH_SFB=m + CONFIG_NET_SCH_SFQ=m + CONFIG_NET_SCH_TEQL=m + CONFIG_NET_SCH_TBF=m + CONFIG_NET_SCH_GRED=m + CONFIG_NET_SCH_DSMARK=m + CONFIG_NET_SCH_NETEM=m + CONFIG_NET_SCH_DRR=m + CONFIG_NET_SCH_MQPRIO=m + CONFIG_NET_SCH_CHOKE=m + CONFIG_NET_SCH_QFQ=m + CONFIG_NET_SCH_CODEL=m + CONFIG_NET_SCH_FQ_CODEL=m + CONFIG_NET_SCH_FQ=m + CONFIG_NET_SCH_HHF=m + CONFIG_NET_SCH_PIE=m + CONFIG_NET_SCH_PLUG=m + CONFIG_NET_CLS_BASIC=m + CONFIG_NET_CLS_TCINDEX=m + CONFIG_NET_CLS_ROUTE4=m + CONFIG_NET_CLS_FW=m + CONFIG_NET_CLS_U32=m + CONFIG_CLS_U32_PERF=y + CONFIG_CLS_U32_MARK=y + CONFIG_NET_CLS_RSVP=m + CONFIG_NET_CLS_RSVP6=m + CONFIG_NET_CLS_FLOW=m + CONFIG_NET_CLS_CGROUP=m + CONFIG_NET_CLS_BPF=m + CONFIG_NET_CLS_FLOWER=m + CONFIG_NET_EMATCH=y + CONFIG_NET_EMATCH_CMP=m + CONFIG_NET_EMATCH_NBYTE=m + CONFIG_NET_EMATCH_U32=m + CONFIG_NET_EMATCH_META=m + CONFIG_NET_EMATCH_TEXT=m + CONFIG_NET_CLS_ACT=y + CONFIG_NET_ACT_POLICE=m + CONFIG_NET_ACT_GACT=m + CONFIG_GACT_PROB=y + CONFIG_NET_ACT_MIRRED=m + CONFIG_NET_ACT_IPT=m + CONFIG_NET_ACT_NAT=m + CONFIG_NET_ACT_PEDIT=m + CONFIG_NET_ACT_SIMP=m + CONFIG_NET_ACT_SKBEDIT=m + CONFIG_NET_ACT_CSUM=m + CONFIG_NET_ACT_VLAN=m + CONFIG_NET_ACT_BPF=m + CONFIG_NET_ACT_CONNMARK=m + CONFIG_NET_CLS_IND=y + CONFIG_DNS_RESOLVER=y + CONFIG_NETLINK_DIAG=m + CONFIG_CGROUP_NET_PRIO=y + CONFIG_BT=m + CONFIG_BT_HCIBTUSB=m + CONFIG_BT_HCIUART=m + CONFIG_BT_HCIUART_BCSP=y + CONFIG_BT_HCIUART_ATH3K=y + CONFIG_BT_HCIUART_LL=y + CONFIG_BT_HCIUART_3WIRE=y + CONFIG_BT_HCIUART_INTEL=y + CONFIG_BT_HCIUART_BCM=y + CONFIG_BT_HCIUART_QCA=y + CONFIG_BT_HCIBCM203X=m + CONFIG_BT_HCIBPA10X=m + CONFIG_BT_HCIBFUSB=m + CONFIG_BT_HCIVHCI=m + CONFIG_BT_MRVL=m + CONFIG_BT_ATH3K=m + # CONFIG_WIRELESS is not set + CONFIG_DEVTMPFS=y + CONFIG_DEVTMPFS_MOUNT=y + CONFIG_CONNECTOR=y + CONFIG_PARPORT=y + CONFIG_PARPORT_PC=y + CONFIG_BLK_DEV_FD=y + CONFIG_BLK_DEV_LOOP=y + CONFIG_BLK_DEV_CRYPTOLOOP=y + CONFIG_BLK_DEV_DRBD=y + CONFIG_BLK_DEV_NBD=y + CONFIG_BLK_DEV_RAM=y + CONFIG_CDROM_PKTCDVD=y + CONFIG_ENCLOSURE_SERVICES=y + CONFIG_IDE=y + CONFIG_BLK_DEV_IDECD=y + CONFIG_IDE_GENERIC=y + CONFIG_BLK_DEV_CMD640=y + CONFIG_BLK_DEV_GENERIC=y + CONFIG_BLK_DEV_RZ1000=y + CONFIG_BLK_DEV_AMD74XX=y + CONFIG_BLK_DEV_JMICRON=y + CONFIG_BLK_DEV_SIS5513=y + CONFIG_BLK_DEV_SD=y + CONFIG_BLK_DEV_SR=y + CONFIG_BLK_DEV_SR_VENDOR=y + CONFIG_CHR_DEV_SG=y + CONFIG_SCSI_ENCLOSURE=y + CONFIG_SCSI_CONSTANTS=y + CONFIG_SCSI_LOGGING=y + CONFIG_SCSI_SCAN_ASYNC=y + CONFIG_SCSI_FC_ATTRS=y + CONFIG_SCSI_SAS_LIBSAS=y + CONFIG_SCSI_SAS_ATA=y + CONFIG_ISCSI_TCP=m + CONFIG_BLK_DEV_3W_XXXX_RAID=m + CONFIG_SCSI_HPSA=y + CONFIG_SCSI_3W_9XXX=m + CONFIG_SCSI_3W_SAS=m + CONFIG_SCSI_AACRAID=m + CONFIG_SCSI_AIC7XXX=y + CONFIG_AIC7XXX_RESET_DELAY_MS=15000 + # CONFIG_AIC7XXX_DEBUG_ENABLE is not set + CONFIG_SCSI_AIC79XX=y + CONFIG_AIC79XX_RESET_DELAY_MS=15000 + # CONFIG_AIC79XX_DEBUG_ENABLE is not set + CONFIG_SCSI_AIC94XX=m + # CONFIG_AIC94XX_DEBUG is not set + CONFIG_SCSI_MVSAS=m + CONFIG_SCSI_DPT_I2O=m + CONFIG_SCSI_ARCMSR=m + CONFIG_MEGARAID_NEWGEN=y + CONFIG_MEGARAID_MM=y + CONFIG_MEGARAID_MAILBOX=y + CONFIG_MEGARAID_LEGACY=y + CONFIG_MEGARAID_SAS=y + CONFIG_SCSI_MPT2SAS=y + CONFIG_SCSI_BUSLOGIC=y + CONFIG_SCSI_GDTH=m + CONFIG_SCSI_QLOGIC_1280=y + CONFIG_SCSI_DH=y + CONFIG_ATA=y + CONFIG_SATA_AHCI=y + CONFIG_SATA_SIL24=y + CONFIG_ATA_PIIX=y + CONFIG_SATA_NV=y + CONFIG_SATA_PROMISE=y + CONFIG_SATA_SIL=y + CONFIG_SATA_SIS=y + CONFIG_SATA_SVW=y + CONFIG_SATA_VIA=y + CONFIG_PATA_ATIIXP=y + CONFIG_PATA_JMICRON=y + CONFIG_PATA_MPIIX=y + CONFIG_MD=y + CONFIG_BLK_DEV_MD=y + CONFIG_MD_LINEAR=y + CONFIG_MD_RAID0=y + CONFIG_MD_RAID1=y + CONFIG_MD_RAID456=y + CONFIG_MD_MULTIPATH=y + CONFIG_BLK_DEV_DM=m + CONFIG_DM_CRYPT=m + CONFIG_DM_SNAPSHOT=m + CONFIG_DM_THIN_PROVISIONING=m + CONFIG_DM_MIRROR=m + CONFIG_DM_LOG_USERSPACE=m + CONFIG_DM_RAID=m + CONFIG_DM_ZERO=m + CONFIG_DM_MULTIPATH=m + CONFIG_DM_UEVENT=y + CONFIG_TARGET_CORE=m + CONFIG_ISCSI_TARGET=m + CONFIG_FUSION=y + CONFIG_FUSION_SPI=y + CONFIG_FUSION_FC=y + CONFIG_FUSION_SAS=y + CONFIG_FUSION_CTL=y + CONFIG_NETDEVICES=y + CONFIG_BONDING=m + CONFIG_DUMMY=y + CONFIG_MACVLAN=y + CONFIG_MACVTAP=y + CONFIG_VXLAN=m + CONFIG_NETCONSOLE=m + CONFIG_NETCONSOLE_DYNAMIC=y + CONFIG_TUN=y + CONFIG_VETH=y + CONFIG_NLMON=m + CONFIG_VORTEX=y + CONFIG_TYPHOON=y + CONFIG_ACENIC=y + CONFIG_ATL1=y + CONFIG_BNX2=y + CONFIG_TIGON3=y + CONFIG_BNX2X=y + CONFIG_CHELSIO_T1=y + CONFIG_CHELSIO_T3=y + CONFIG_NET_TULIP=y + CONFIG_DE2104X=y + CONFIG_TULIP=y + CONFIG_TULIP_MMIO=y + CONFIG_TULIP_NAPI=y + CONFIG_TULIP_NAPI_HW_MITIGATION=y + CONFIG_DE4X5=y + CONFIG_DL2K=y + CONFIG_S2IO=y + CONFIG_E100=y + CONFIG_E1000=y + CONFIG_E1000E=y + CONFIG_IGB=y + CONFIG_IGBVF=y + CONFIG_IXGB=m + CONFIG_IXGBE=m + CONFIG_SKGE=y + CONFIG_SKY2=y + CONFIG_FORCEDETH=y + # CONFIG_NET_PACKET_ENGINE is not set + CONFIG_NETXEN_NIC=m + CONFIG_8139CP=y + CONFIG_8139TOO=y + CONFIG_R8169=y + CONFIG_SIS900=y + CONFIG_SIS190=y + CONFIG_VIA_RHINE=y + CONFIG_VIA_VELOCITY=y + # CONFIG_WLAN is not set + CONFIG_INPUT_POLLDEV=y + CONFIG_INPUT_EVDEV=y + # CONFIG_SERIO_SERPORT is not set + CONFIG_SERIAL_8250=y + CONFIG_SERIAL_8250_CONSOLE=y + CONFIG_PRINTER=y + CONFIG_IPMI_HANDLER=y + CONFIG_IPMI_DEVICE_INTERFACE=y + CONFIG_IPMI_SI=y + CONFIG_IPMI_WATCHDOG=y + CONFIG_IPMI_POWEROFF=y + CONFIG_HPET=y + CONFIG_I2C_AMD756=y + CONFIG_I2C_AMD756_S4882=y + CONFIG_I2C_AMD8111=y + CONFIG_I2C_ISCH=y + CONFIG_I2C_PIIX4=y + CONFIG_I2C_NFORCE2=y + CONFIG_I2C_NFORCE2_S4985=y + CONFIG_I2C_SIS5595=y + CONFIG_I2C_SIS630=y + CONFIG_I2C_SIS96X=y + CONFIG_I2C_VIA=y + CONFIG_I2C_VIAPRO=y + CONFIG_WATCHDOG=y + CONFIG_I6300ESB_WDT=y + CONFIG_ITCO_WDT=y + CONFIG_ITCO_VENDOR_SUPPORT=y + CONFIG_HP_WATCHDOG=y + CONFIG_NV_TCO=y + CONFIG_MEDIA_SUPPORT=y + CONFIG_AGP=y + CONFIG_AGP_AMD64=y + CONFIG_AGP_INTEL=m + CONFIG_DRM=y + CONFIG_DRM_AMDGPU=m + CONFIG_DRM_AMDGPU_SI=y + CONFIG_DRM_AMDGPU_CIK=y + CONFIG_DRM_AMDGPU_USERPTR=y + CONFIG_DRM_I915=m + CONFIG_FB_VESA=y + CONFIG_BACKLIGHT_CLASS_DEVICE=y + CONFIG_VGACON_SOFT_SCROLLBACK=y + CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=256 + CONFIG_SOUND=y + CONFIG_SND=y + CONFIG_SND_MIXER_OSS=y + CONFIG_SND_PCM_OSS=y + CONFIG_SND_DYNAMIC_MINORS=y + CONFIG_SND_CTXFI=y + CONFIG_SND_EMU10K1=y + CONFIG_SND_EMU10K1X=y + CONFIG_SND_ENS1370=y + CONFIG_SND_ENS1371=y + CONFIG_SND_ES1938=y + CONFIG_SND_ES1968=y + CONFIG_SND_INTEL8X0=y + CONFIG_SND_SONICVIBES=y + CONFIG_SND_VIA82XX=y + CONFIG_SND_VIA82XX_MODEM=y + CONFIG_SND_YMFPCI=y + CONFIG_SND_HDA_INTEL=y + CONFIG_SND_HDA_CODEC_REALTEK=y + CONFIG_SND_HDA_CODEC_ANALOG=y + CONFIG_SND_HDA_CODEC_SIGMATEL=y + CONFIG_SND_HDA_CODEC_VIA=y + CONFIG_SND_HDA_CODEC_HDMI=y + CONFIG_SND_HDA_CODEC_CIRRUS=y + CONFIG_SND_HDA_CODEC_CONEXANT=y + CONFIG_SND_HDA_CODEC_CA0110=y + CONFIG_SND_HDA_CODEC_CA0132=y + CONFIG_SND_HDA_CODEC_CMEDIA=y + CONFIG_SND_HDA_CODEC_SI3054=y + # CONFIG_SND_USB is not set + CONFIG_HIDRAW=y + CONFIG_HID_DRAGONRISE=y + CONFIG_HID_KYE=y + CONFIG_HID_GYRATION=y + CONFIG_HID_TWINHAN=y + CONFIG_HID_LOGITECH_DJ=m + CONFIG_HID_NTRIG=y + CONFIG_HID_ORTEK=y + CONFIG_HID_PANTHERLORD=y + CONFIG_HID_PETALYNX=y + CONFIG_HID_SAMSUNG=y + CONFIG_HID_SUNPLUS=y + CONFIG_HID_GREENASIA=y + CONFIG_HID_SMARTJOYPLUS=y + CONFIG_HID_TOPSEED=y + CONFIG_HID_THRUSTMASTER=y + CONFIG_HID_ZEROPLUS=y + CONFIG_USB=y + CONFIG_USB_XHCI_HCD=y + CONFIG_USB_EHCI_HCD=y + # CONFIG_USB_EHCI_TT_NEWSCHED is not set + CONFIG_USB_OHCI_HCD=y + CONFIG_USB_UHCI_HCD=y + CONFIG_USB_SL811_HCD=y + CONFIG_USB_STORAGE=y + CONFIG_USB_SERIAL=y + CONFIG_USB_SERIAL_FTDI_SIO=y + CONFIG_USB_SERIAL_OMNINET=y + CONFIG_USB_CHAOSKEY=m + CONFIG_EDAC=y + CONFIG_EDAC_MM_EDAC=y + CONFIG_EDAC_AMD64=y + CONFIG_EDAC_E752X=y + CONFIG_EDAC_I82975X=y + CONFIG_EDAC_I3000=y + CONFIG_EDAC_I3200=y + CONFIG_EDAC_IE31200=y + CONFIG_EDAC_X38=y + CONFIG_EDAC_I5400=y + CONFIG_EDAC_I7CORE=y + CONFIG_EDAC_I5000=y + CONFIG_EDAC_I5100=y + CONFIG_EDAC_I7300=y + CONFIG_EDAC_SBRIDGE=y + CONFIG_RTC_CLASS=y + # CONFIG_RTC_INTF_PROC is not set + CONFIG_AMD_IOMMU=y + CONFIG_EXT2_FS=y + CONFIG_EXT3_FS=y + CONFIG_EXT3_FS_POSIX_ACL=y + CONFIG_EXT4_FS_SECURITY=y + CONFIG_REISERFS_FS=y + CONFIG_REISERFS_PROC_INFO=y + CONFIG_REISERFS_FS_XATTR=y + CONFIG_REISERFS_FS_POSIX_ACL=y + CONFIG_JFS_FS=y + CONFIG_JFS_POSIX_ACL=y + CONFIG_JFS_STATISTICS=y + CONFIG_XFS_FS=y + CONFIG_XFS_QUOTA=y + CONFIG_XFS_POSIX_ACL=y + CONFIG_XFS_RT=y + CONFIG_BTRFS_FS=m + CONFIG_BTRFS_FS_POSIX_ACL=y + CONFIG_FANOTIFY=y + CONFIG_QUOTA=y + CONFIG_QUOTA_NETLINK_INTERFACE=y + # CONFIG_PRINT_QUOTA_WARNING is not set + CONFIG_QFMT_V2=m + CONFIG_AUTOFS4_FS=m + CONFIG_FUSE_FS=m + CONFIG_OVERLAY_FS=m + CONFIG_FSCACHE=y + CONFIG_FSCACHE_STATS=y + CONFIG_FSCACHE_HISTOGRAM=y + CONFIG_FSCACHE_DEBUG=y + CONFIG_CACHEFILES=y + CONFIG_CACHEFILES_DEBUG=y + CONFIG_CACHEFILES_HISTOGRAM=y + CONFIG_ISO9660_FS=m + CONFIG_JOLIET=y + CONFIG_ZISOFS=y + CONFIG_UDF_FS=m + CONFIG_MSDOS_FS=m + CONFIG_VFAT_FS=m + CONFIG_NTFS_FS=m + CONFIG_PROC_KCORE=y + CONFIG_TMPFS_POSIX_ACL=y + CONFIG_HUGETLBFS=y + CONFIG_ECRYPT_FS=m + CONFIG_ECRYPT_FS_MESSAGING=y + CONFIG_SQUASHFS=m + CONFIG_SQUASHFS_XATTR=y + CONFIG_SQUASHFS_LZ4=y + CONFIG_SQUASHFS_LZO=y + CONFIG_SQUASHFS_XZ=y + CONFIG_SQUASHFS_4K_DEVBLK_SIZE=y + CONFIG_SQUASHFS_EMBEDDED=y + CONFIG_NFS_FS=m + CONFIG_NFS_V3_ACL=y + CONFIG_NFS_V4=m + CONFIG_NFS_SWAP=y + CONFIG_NFS_V4_1=y + CONFIG_NFS_FSCACHE=y + CONFIG_NFSD=m + CONFIG_NFSD_V3_ACL=y + CONFIG_NFSD_V4=y + CONFIG_CEPH_FS=m + CONFIG_CEPH_FSCACHE=y + CONFIG_CEPH_FS_POSIX_ACL=y + CONFIG_CIFS=m + CONFIG_CIFS_STATS=y + CONFIG_CIFS_XATTR=y + CONFIG_CIFS_POSIX=y + CONFIG_NLS_CODEPAGE_437=m + CONFIG_NLS_CODEPAGE_850=m + CONFIG_NLS_CODEPAGE_852=m + CONFIG_NLS_ISO8859_1=m + CONFIG_NLS_UTF8=m + CONFIG_DLM=m + CONFIG_PRINTK_TIME=y + CONFIG_DEBUG_INFO=y + CONFIG_MAGIC_SYSRQ=y + CONFIG_DEBUG_KERNEL=y + CONFIG_RCU_CPU_STALL_TIMEOUT=60 + CONFIG_FUNCTION_TRACER=y + CONFIG_FTRACE_SYSCALLS=y + CONFIG_BLK_DEV_IO_TRACE=y + CONFIG_MEMTEST=y + CONFIG_EARLY_PRINTK_DBGP=y + CONFIG_SECURITYFS=y + CONFIG_CRYPTO_GCM=m + CONFIG_CRYPTO_ECB=y + CONFIG_CRYPTO_PCBC=y + CONFIG_CRYPTO_CMAC=y + CONFIG_CRYPTO_HMAC=y + CONFIG_CRYPTO_MD4=y + CONFIG_CRYPTO_SHA1=y + CONFIG_CRYPTO_SHA256=y + CONFIG_CRYPTO_ARC4=y + CONFIG_CRYPTO_DES=y + CONFIG_KVM=m + CONFIG_KVM_INTEL=m + CONFIG_KVM_AMD=m + CONFIG_KVM_DEVICE_ASSIGNMENT=y + CONFIG_CRC_ITU_T=y + CONFIG_FONTS=y + CONFIG_FONT_8x8=y + CONFIG_FONT_8x16=y + CONFIG_FONT_7x14=y + CONFIG_FONT_PEARL_8x8=y + CONFIG_FONT_ACORN_8x8=y + CONFIG_FONT_MINI_4x6=y + CONFIG_FONT_SUN8x16=y + CONFIG_FONT_SUN12x22=y + CONFIG_FONT_10x18=y +EOF make olddefconfig - - echo "doing make -C ${S} menuconfig in ${PWD} .." - - make menuconfig } mee_build() { From cf291fd770b6b8c038631683ab52c939e579e8ed Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Tue, 12 Dec 2017 12:06:54 +0100 Subject: [PATCH 72/97] linux-4.9.68: Build out-of-tree aacraid driver Compile the aacraid driver supplied by Adaptec, because the in-tree aacraid driver lacks support for async mode. We want version 54013 for now, because it has been tested here. Patch by Thomas Kreitler --- linux-4.9.68-193.bee | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/linux-4.9.68-193.bee b/linux-4.9.68-193.bee index ed611abfa..3d9091717 100755 --- a/linux-4.9.68-193.bee +++ b/linux-4.9.68-193.bee @@ -29,6 +29,35 @@ same_revision_files=$(ls ${BEE_PKGDIR}/linux-[0-9].[0-9]*-${PKGREVISION}.x86_64. && echo "A kernel with revision ${PKGREVISION} has already been build: $same_revision_files" \ && exit +# aacraid +# https://storage.microsemi.com/en-us/downloads/linux_source/linux_source_code/productid=aha-1000-8e&dn=microsemi+adaptec+hba+1000-8e.php +# http://download.adaptec.com/raid/aac/linux/aacraid-linux-src-1.2.1-55022.tgz +# http://twiki.molgen.mpg.de/foswiki/Medv/SoftwareRaid +# CONFIG_SCSI_AACRAID=m +# +build_aacraid_driver_update_and_do_depmod() { + local DRIVERBUILD=54013 + + pushd . + + echo "aacraid driver" + + mkdir -pv ${B}/aacraid_update + cd ${B}/aacraid_update + tar -xf /src/mariux/beeroot/downloads/aacraid_source_1.2.1-${DRIVERBUILD}.tgz + cd aacraid-1.2.1-${DRIVERBUILD} + chmod -x * + make -C ${B} M=${B}/aacraid_update/aacraid-1.2.1-${DRIVERBUILD} modules + + mkdir -pv ${D}/lib/modules/${FULLKERNELVERSION}/updates/drivers/scsi/aacraid + cp -v aacraid.ko ${D}/lib/modules/${FULLKERNELVERSION}/updates/drivers/scsi/aacraid + + cd ${D}/lib/modules/${FULLKERNELVERSION} + depmod -a -b ${D} ${FULLKERNELVERSION} + + popd +} + mee_patch() { echo "PATCH $@" bee_patch $@ @@ -821,6 +850,8 @@ mee_install() { make install INSTALL_PATH=${D}/boot # make firmware_install INSTALL_MOD_PATH=${D} + build_aacraid_driver_update_and_do_depmod + rm -v ${D}/lib/modules/${FULLKERNELVERSION}/{source,build} ln -sv /usr/src/linux/${PKGALLPKG}/source ${D}/lib/modules/${FULLKERNELVERSION}/source From f822640819da7131e51c760ccf26723ed1398124 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Thu, 14 Dec 2017 14:38:09 +0100 Subject: [PATCH 73/97] linux-4.9.68: Add spl/zfs modules Add kernel modules required for the ZFS filesystem. http://zfsonlinux.org/ Patch by Thomas Kreitler --- linux-4.9.68-193.bee | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/linux-4.9.68-193.bee b/linux-4.9.68-193.bee index 3d9091717..50f5be668 100755 --- a/linux-4.9.68-193.bee +++ b/linux-4.9.68-193.bee @@ -58,6 +58,49 @@ build_aacraid_driver_update_and_do_depmod() { popd } +plaininstall_for_modules() { + local dir=$1 + local tar=$2 + local url=$3 + local xflags=$4 + ( + test -e $tar || wget $url + test -d $dir || tar xvf $tar + cd $dir + ./configure \ + --prefix=/usr \ + --with-linux=${S} \ + --with-linux-obj=${B} \ + $xflags + cd module + # depmod call fails when build as user, and would eventually mess up system dirs when run as root + sed -i -e 's/depmod/echo skipping depmod/' Makefile + make ${BEE_MAKEFLAGS} + make modules_install INSTALL_MOD_PATH=${D} + ) +} + +build_spl_zfs_extra_modules_and_do_depmod() { + pushd . + + echo "spl/zfs" + + mkdir -pv ${B}/spl_zfs_extra + cd ${B}/spl_zfs_extra + + plaininstall_for_modules spl-0.7.3 spl-0.7.3.tar.gz \ + https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.3/spl-0.7.3.tar.gz + + plaininstall_for_modules zfs-0.7.3 zfs-0.7.3.tar.gz \ + https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.3/zfs-0.7.3.tar.gz \ + "--with-spl=${B}/spl_zfs_extra/spl-0.7.3" + + cd ${D}/lib/modules/${FULLKERNELVERSION} + depmod -a -b ${D} ${FULLKERNELVERSION} + + popd +} + mee_patch() { echo "PATCH $@" bee_patch $@ @@ -851,6 +894,7 @@ mee_install() { # make firmware_install INSTALL_MOD_PATH=${D} build_aacraid_driver_update_and_do_depmod + build_spl_zfs_extra_modules_and_do_depmod rm -v ${D}/lib/modules/${FULLKERNELVERSION}/{source,build} From 49c1e1219689c2f1e4c6a5a8a6ac0ac90c1bfae2 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Thu, 14 Dec 2017 12:29:40 +0100 Subject: [PATCH 74/97] linux-4.9.68: Set CONFIG_SND_USB_AUDIO=m As requested by Paul. --- linux-4.9.68-193.bee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux-4.9.68-193.bee b/linux-4.9.68-193.bee index 50f5be668..15d95a5be 100755 --- a/linux-4.9.68-193.bee +++ b/linux-4.9.68-193.bee @@ -720,7 +720,7 @@ mee_configure() { CONFIG_SND_HDA_CODEC_CA0132=y CONFIG_SND_HDA_CODEC_CMEDIA=y CONFIG_SND_HDA_CODEC_SI3054=y - # CONFIG_SND_USB is not set + CONFIG_SND_USB_AUDIO=m CONFIG_HIDRAW=y CONFIG_HID_DRAGONRISE=y CONFIG_HID_KYE=y From f32f399dad00ae85779e098f7a2d760bf1da2b92 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Thu, 14 Dec 2017 14:29:22 +0100 Subject: [PATCH 75/97] linux-4.9.68: Add CONFIG_DRM_NOUVEAU As requested by Thomas: * Add CONFIG_DRM_NOUVEAU=m * Change CONFIG_DRM=y to CONFIG_DRM=m When CONFIG_DRM_NOUVEAU ist set, CONFIG_FB_VESA is implied. Note, that nvidia_drm.ko requires the modules drm and drm_kms_helper. Because we select differenct nvidia modules depending on the graphics card found at boot time, we don't have that dependency in modules.dep and need to explicitly load the drm modules for nvidia. --- linux-4.9.68-193.bee | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/linux-4.9.68-193.bee b/linux-4.9.68-193.bee index 15d95a5be..497732226 100755 --- a/linux-4.9.68-193.bee +++ b/linux-4.9.68-193.bee @@ -681,13 +681,13 @@ mee_configure() { CONFIG_AGP=y CONFIG_AGP_AMD64=y CONFIG_AGP_INTEL=m - CONFIG_DRM=y + CONFIG_DRM=m CONFIG_DRM_AMDGPU=m CONFIG_DRM_AMDGPU_SI=y CONFIG_DRM_AMDGPU_CIK=y CONFIG_DRM_AMDGPU_USERPTR=y + CONFIG_DRM_NOUVEAU=m CONFIG_DRM_I915=m - CONFIG_FB_VESA=y CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_VGACON_SOFT_SCROLLBACK=y CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=256 From feb6d90c1213c4976367260b62235afea7d6f655 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Fri, 15 Dec 2017 12:10:34 +0100 Subject: [PATCH 76/97] linux-4.9.68: Add nvidia drivers --- nvidia_linux-4.9.68-193-340.102-0.bee | 90 +++++++++++++++++++++++++++ nvidia_linux-4.9.68-193-375.39-0.bee | 87 ++++++++++++++++++++++++++ 2 files changed, 177 insertions(+) create mode 100755 nvidia_linux-4.9.68-193-340.102-0.bee create mode 100755 nvidia_linux-4.9.68-193-375.39-0.bee diff --git a/nvidia_linux-4.9.68-193-340.102-0.bee b/nvidia_linux-4.9.68-193-340.102-0.bee new file mode 100755 index 000000000..bad3ecf51 --- /dev/null +++ b/nvidia_linux-4.9.68-193-340.102-0.bee @@ -0,0 +1,90 @@ +#!/bin/env beesh + +# calculate package extra versions and legacy level +# - use extraversions to define nvidia extraversion and/or legacy level +# - legacy level should be the last part of extraversion +# - legacy level 2 to 5 will be calculated from version number.. + +mxnvversion=${PKGEXTRAVERSION##*_} +: ${mxnvversion=current} + +nvextraversion="${PKGEXTRAVERSION_DASH}" + +if [ "${mxnvversion:0:6}" = "legacy" -o "${mxnvversion}" = "current" ] ; then + nvextraversion="${nvextraversion%_*}" + nvextraversion="${nvextraversion#-${mxnvversion}}" +else + if [ "${PKGVERSION:0:4}" = "340." ] ; then + mxnvversion="legacy5" + elif [ "${PKGVERSION:0:4}" = "304." ] ; then + mxnvversion="legacy4" + elif [ "${PKGVERSION:0:7}" = "173.14." ] ; then + mxnvversion="legacy3" + elif [ "${PKGVERSION:0:6}" = "96.43." ] ; then + mxnvversion="legacy2" + else + mxnvversion="current" + fi +fi + +print_info "calculated mxnvversion = '${mxnvversion}'" +print_info "calculated nvextraversion = '${nvextraversion}'" + +NVIDIA_ARCHIVE="NVIDIA-Linux-x86_64-${PKGVERSION}${nvextraversion}.run" + +SRCURL[0]="https://download.nvidia.com/XFree86/Linux-x86_64/${PKGVERSION}/${NVIDIA_ARCHIVE}" +PATCHURL+=('/src/mariux/patches/nvidia_340_runtimefix_for_kernel_4.9.patch') + +LINUXPKG=${PKGEXTRANAME}.${ARCH} + +LINUXKLOCALVER=$(beeversion --format "%v%-e.mx64.%r" "${LINUXPKG}") + +# '4.4.mx64.75' to '4.4.0.mx64.75' +# '4.8.6.mx64.115' to '4.8.6.mx64.115' +# '4.8-rc2.mx64.95' to '4.8.0-rc2.mx64.95' +if [[ $LINUXKLOCALVER =~ ^([0-9]+\.[0-9]+)(-rc[0-9]{1,2})?(\.mx64.*) ]]; then + LINUXKLOCALVER="${BASH_REMATCH[1]}.0${BASH_REMATCH[2]}${BASH_REMATCH[3]}" +fi + + +build_in_sourcedir +sourcesubdir_append kernel + +: ${BEE_TMP_TMPDIR:=/tmp} + +mee_extract() { + LINUXBUILDARCHIVE="${BEE_BUILDARCHIVEDIR}/${LINUXPKG}.beebuild.tar.bz2" + + print_info "extracting nvidia archive .." + + start_cmd rmdir ${S} + start_cmd sh ${F}/${NVIDIA_ARCHIVE} -x --target ${S} + + if [ -d "/usr/src/linux/${LINUXPKG}/source" ] ; then + LINUXSRCDIR="/usr/src/linux/${LINUXPKG}/source" + elif [ -d "${BEE_TMP_TMPDIR}/${LINUXPKG}/source" ] ; then + LINUXSRCDIR="${BEE_TMP_TMPDIR}/${LINUXPKG}/source" + else + print_info "extracting linux build ${LINUXPKG} .." + start_cmd gtar -xf "${LINUXBUILDARCHIVE}" -C ${BEE_TMP_TMPDIR} + LINUXSRCDIR="${BEE_TMP_TMPDIR}/${LINUXPKG}/source" + fi + + print_info "using kernel sources from ${LINUXSRCDIR} .." +} + +mee_build_pre() { + ln -s ${LINUXSRCDIR}/include ${S}/include +} + +mee_build() { + start_cmd make SYSSRC=${LINUXSRCDIR} module +} + +mee_install() { + mkdir -pv ${D}${DATAROOTDIR}/nvidia/kernel/${LINUXKLOCALVER}/${PKGVERSION} + + cp -v *.ko ${D}${DATAROOTDIR}/nvidia/kernel/${LINUXKLOCALVER}/${PKGVERSION}/ + + ln -s ${PKGVERSION} ${D}${DATAROOTDIR}/nvidia/kernel/${LINUXKLOCALVER}/${mxnvversion} +} diff --git a/nvidia_linux-4.9.68-193-375.39-0.bee b/nvidia_linux-4.9.68-193-375.39-0.bee new file mode 100755 index 000000000..7657b8ef1 --- /dev/null +++ b/nvidia_linux-4.9.68-193-375.39-0.bee @@ -0,0 +1,87 @@ +#!/bin/env beesh + +# calculate package extra versions and legacy level +# - use extraversions to define nvidia extraversion and/or legacy level +# - legacy level should be the last part of extraversion +# - legacy level 2 to 5 will be calculated from version number.. + +mxnvversion=${PKGEXTRAVERSION##*_} +: ${mxnvversion=current} + +nvextraversion="${PKGEXTRAVERSION_DASH}" + +if [ "${mxnvversion:0:6}" = "legacy" -o "${mxnvversion}" = "current" ] ; then + nvextraversion="${nvextraversion%_*}" + nvextraversion="${nvextraversion#-${mxnvversion}}" +else + if [ "${PKGVERSION:0:4}" = "340." ] ; then + mxnvversion="legacy5" + elif [ "${PKGVERSION:0:4}" = "304." ] ; then + mxnvversion="legacy4" + elif [ "${PKGVERSION:0:7}" = "173.14." ] ; then + mxnvversion="legacy3" + elif [ "${PKGVERSION:0:6}" = "96.43." ] ; then + mxnvversion="legacy2" + else + mxnvversion="current" + fi +fi + +print_info "calculated mxnvversion = '${mxnvversion}'" +print_info "calculated nvextraversion = '${nvextraversion}'" + +NVIDIA_ARCHIVE="NVIDIA-Linux-x86_64-${PKGVERSION}${nvextraversion}.run" + +SRCURL[0]="https://download.nvidia.com/XFree86/Linux-x86_64/${PKGVERSION}/${NVIDIA_ARCHIVE}" + +LINUXPKG=${PKGEXTRANAME}.${ARCH} + +LINUXKLOCALVER=$(beeversion --format "%v.mx64.%r" "${LINUXPKG}") + +# '4.4.mx64.75' to '4.4.0.mx64.75' +if [[ $LINUXKLOCALVER =~ ^([0-9]+\.[0-9]+)(\.mx64.*) ]]; then + LINUXKLOCALVER="${BASH_REMATCH[1]}.0${BASH_REMATCH[2]}" +fi + + +build_in_sourcedir +sourcesubdir_append kernel + +: ${BEE_TMP_TMPDIR:=/tmp} + +mee_extract() { + LINUXBUILDARCHIVE="${BEE_BUILDARCHIVEDIR}/${LINUXPKG}.beebuild.tar.bz2" + + print_info "extracting nvidia archive .." + + start_cmd rmdir ${S} + start_cmd sh ${F}/${NVIDIA_ARCHIVE} -x --target ${S} + + if [ -d "/usr/src/linux/${LINUXPKG}/source" ] ; then + LINUXSRCDIR="/usr/src/linux/${LINUXPKG}/source" + elif [ -d "${BEE_TMP_TMPDIR}/${LINUXPKG}/source" ] ; then + LINUXSRCDIR="${BEE_TMP_TMPDIR}/${LINUXPKG}/source" + else + print_info "extracting linux build ${LINUXPKG} .." + start_cmd gtar -xf "${LINUXBUILDARCHIVE}" -C ${BEE_TMP_TMPDIR} + LINUXSRCDIR="${BEE_TMP_TMPDIR}/${LINUXPKG}/source" + fi + + print_info "using kernel sources from ${LINUXSRCDIR} .." +} + +mee_build_pre() { + ln -s ${LINUXSRCDIR}/include ${S}/include +} + +mee_build() { + start_cmd make SYSSRC=${LINUXSRCDIR} module +} + +mee_install() { + mkdir -pv ${D}${DATAROOTDIR}/nvidia/kernel/${LINUXKLOCALVER}/${PKGVERSION} + + cp -v *.ko ${D}${DATAROOTDIR}/nvidia/kernel/${LINUXKLOCALVER}/${PKGVERSION}/ + + ln -s ${PKGVERSION} ${D}${DATAROOTDIR}/nvidia/kernel/${LINUXKLOCALVER}/${mxnvversion} +} From fa0fd5944b90c3644358686abd7179d891e712db Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Mon, 18 Dec 2017 14:54:35 +0100 Subject: [PATCH 77/97] linux: Add LTS version 4.9.70 Add 4.9.70 from 4.9.68 and remove 4.9.68. --- linux-4.9.68-193.bee => linux-4.9.70-195.bee | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename linux-4.9.68-193.bee => linux-4.9.70-195.bee (100%) diff --git a/linux-4.9.68-193.bee b/linux-4.9.70-195.bee similarity index 100% rename from linux-4.9.68-193.bee rename to linux-4.9.70-195.bee From 19f81d63990fe92a3a0c369d7d23a0a427de5065 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Mon, 18 Dec 2017 15:00:42 +0100 Subject: [PATCH 78/97] linux-4.9.70: Add nvidia drivers Add drivers for linux 4.9.70 from drivers for 4.9.68 and remove drivers for 4.9.68. --- ....68-193-340.102-0.bee => nvidia_linux-4.9.70-195-340.102-0.bee | 0 ....9.68-193-375.39-0.bee => nvidia_linux-4.9.70-195-375.39-0.bee | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename nvidia_linux-4.9.68-193-340.102-0.bee => nvidia_linux-4.9.70-195-340.102-0.bee (100%) rename nvidia_linux-4.9.68-193-375.39-0.bee => nvidia_linux-4.9.70-195-375.39-0.bee (100%) diff --git a/nvidia_linux-4.9.68-193-340.102-0.bee b/nvidia_linux-4.9.70-195-340.102-0.bee similarity index 100% rename from nvidia_linux-4.9.68-193-340.102-0.bee rename to nvidia_linux-4.9.70-195-340.102-0.bee diff --git a/nvidia_linux-4.9.68-193-375.39-0.bee b/nvidia_linux-4.9.70-195-375.39-0.bee similarity index 100% rename from nvidia_linux-4.9.68-193-375.39-0.bee rename to nvidia_linux-4.9.70-195-375.39-0.bee From ceab5450a820279b57b632f1574cb7daf0c66d31 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 18 Dec 2017 17:00:22 +0100 Subject: [PATCH 79/97] ethtool: Convert to versionless bee file --- ethtool-4.5-0.bee => ethtool.be0 | 2 ++ 1 file changed, 2 insertions(+) rename ethtool-4.5-0.bee => ethtool.be0 (93%) diff --git a/ethtool-4.5-0.bee b/ethtool.be0 similarity index 93% rename from ethtool-4.5-0.bee rename to ethtool.be0 index 2916030de..c9a7c8499 100755 --- a/ethtool-4.5-0.bee +++ b/ethtool.be0 @@ -1,5 +1,7 @@ #!/usr/bin/env beesh +# BEE_VERSION ethtool-4.5-0 + SRCURL[0]="https://www.kernel.org/pub/software/network/ethtool/ethtool-${PKGVERSION}.tar.xz" PATCHURL[0]="" From 5903a7fc437edc13ec6f69668531161830264342 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 18 Dec 2017 17:01:00 +0100 Subject: [PATCH 80/97] ethtool: Update version from 4.5 to 4.13 Change-log [1]: > Version 4.13 - October 27, 2017 > > * Fix: Do not return error code if no changes were attempted. > * Fix: Fix formatting of advertise bitmask > * Feature: Document 56000 advertise link modes > * Fix: fix the rx vs tx mixup in set channel message > * Feature: add support for HWTSTAMP_FILTER_NTP_ALL > * Feature: Add DMA Coalescing support > * Feature: Remove UDP Fragmentation Offload error prints > * Feature: stmmac: Add macros for number of registers > * Feature: stmmac: Add DMA HW Feature Register > > Version 4.11 - June 2, 2017 > > * Feature: Support for configurable RSS hash function > * Feature: support queue and VF fields for rxclass filters > * Feature: Add support for 2500baseT/5000baseT link modes > * Fix: Fix SFF 8079 cable technology bit parsing > * Fix: sync help output for -x/-X with man page > > Version 4.10 - March 24, 2017 > > * Fix: Fix the "advertise" parameter logic. > * Feature: Implement ETHTOOL_PHY_GTUNABLE/ETHTOOL_PHY_STUNABLE and PHY downshift > * Feature: add register dump support for fjes driver (-d option) > > Version 4.8 - October 3, 2016 > > * Feature: QSFP Plus/QSFP28 Diagnostics Information Support > * Feature: Enhancing link mode bits to support 25G/50G/100G > * Feature: add support for 1000BaseX and missing 10G link mode > * Fixes: address Coverity issues 1363118 - 1363125 > > Version 4.6 - June 26, 2016 > > * Feature: Support register dump on Intel X550 NICs (-d option) > * Fix: Correct some reported register offsets on Intel 10GbE NICs > (-d option) > * Feature: Add IPv6 support to NFC (-n, -N, -u and -U options) > * Feature: Add support for ETHTOOL_xLINKSETTINGS ioctls (no option > and -s option) > * Feature: Use netlink socket when AF_INET not available [1] https://git.kernel.org/pub/scm/network/ethtool/ethtool.git/tree/NEWS --- ethtool.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ethtool.be0 b/ethtool.be0 index c9a7c8499..9b11d4026 100755 --- a/ethtool.be0 +++ b/ethtool.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION ethtool-4.5-0 +# BEE_VERSION ethtool-4.13-0 SRCURL[0]="https://www.kernel.org/pub/software/network/ethtool/ethtool-${PKGVERSION}.tar.xz" From 7d2eee3e726479bcfa5ad11eaf3acd935994fdb0 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Tue, 19 Dec 2017 09:28:31 +0100 Subject: [PATCH 81/97] ethtool: Remove trailing space --- ethtool.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ethtool.be0 b/ethtool.be0 index 9b11d4026..f556d24e9 100755 --- a/ethtool.be0 +++ b/ethtool.be0 @@ -25,7 +25,7 @@ PATCHURL[0]="" #} #mee_configure() { -# bee_configure +# bee_configure #} #mee_build() { From 483bf6c7e5769bdaa15f6a9286d54ffc41b40248 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Tue, 19 Dec 2017 09:29:42 +0100 Subject: [PATCH 82/97] ethtool: Use current bee file template Recreate bee file with the command below, and convert it to a versionless bee file. ``` $ bee init https://www.kernel.org/pub/software/network/ethtool/ethtool-4.13.tar.xz creating ethtool-4.13-0.bee from template '/etc/default/bee/templates/fallback' $ mv ethtool-4.13-0.bee ethtool.be0 $ vim ethtool.be0 ``` --- ethtool.be0 | 60 +++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 54 insertions(+), 6 deletions(-) diff --git a/ethtool.be0 b/ethtool.be0 index f556d24e9..331ecff28 100755 --- a/ethtool.be0 +++ b/ethtool.be0 @@ -2,26 +2,55 @@ # BEE_VERSION ethtool-4.13-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.) + +############################################################################### +## 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]="https://www.kernel.org/pub/software/network/ethtool/ethtool-${PKGVERSION}.tar.xz" -PATCHURL[0]="" +############################################################################### +## Add URLs/pathes to patch files to the PATCHURL array. +## The sources will be patched in the order of the array. + +# PATCHURL+=() -# BEE_CONFIGURE=compat +############################################################################### +## Add filename patterns to the EXCLUDE array of files that should not +## be added to you package but may be present in the image directory. -# BEE_BUILDTYPE= +# EXCLUDE+=() -# EXCLUDE="" +############################################################################### +## Uncomment the next statement, if the software may not be able to be built +## outside the source directory and needs to be built inside the source +## directory. # build_in_sourcedir +############################################################################### +## bee cannot detect buildtypes specified in subdirectories. +## Sometimes packages "hide" the real sources in a subdirectory named +## 'src' or 'cmake' or .. +## use 'sourcesubdir_append' to specify this directory if known. +# sourcesubdir_append src + + +############################################################################### +## Change the default (auto-detected) steps to +## extract, patch, configure/setup, build and install the software. +## Make sure the mee_install function does install everything to the +## image directory "${D}" #mee_extract() { -# bee_extract ${@} +# bee_extract "${@}" #} #mee_patch() { -# bee_patch ${@} +# bee_patch "${@}" #} #mee_configure() { @@ -35,3 +64,22 @@ PATCHURL[0]="" #mee_install() { # bee_install #} +## by default this may be 'make install DESTDIR="${D}"' + +############################################################################### +## +## Additional hints: +## +## The name of this bee-file should follow the following naming convention: +## pkgname-pkgversion-pkgrevision.bee +## +## You may remove all comments as long as SRCURL[0] is set. +## +## Everything in this file will be executed in a bash environment. +## +## Build the package by executing +## './pkg-version-N.bee' or +## 'beesh ./pkg-version-N.bee' +## +## see http://beezinga.org/ +## From e488a617eb9e16bd64984dac885f433727609ef9 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Tue, 19 Dec 2017 12:44:09 +0100 Subject: [PATCH 83/97] wireshark: Remove trailing space --- wireshark-2.0.2-0.bee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wireshark-2.0.2-0.bee b/wireshark-2.0.2-0.bee index b7fa0bffe..07170cf9f 100755 --- a/wireshark-2.0.2-0.bee +++ b/wireshark-2.0.2-0.bee @@ -22,7 +22,7 @@ build_in_sourcedir #} #mee_configure() { -# bee_configure +# bee_configure #} #mee_build() { From 3938d0e9957411c6f2cb82c99fde8633064c87c0 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Tue, 19 Dec 2017 12:44:39 +0100 Subject: [PATCH 84/97] wireshark: Convert to versionless bee file --- wireshark-2.0.2-0.bee => wireshark.be0 | 2 ++ 1 file changed, 2 insertions(+) rename wireshark-2.0.2-0.bee => wireshark.be0 (93%) diff --git a/wireshark-2.0.2-0.bee b/wireshark.be0 similarity index 93% rename from wireshark-2.0.2-0.bee rename to wireshark.be0 index 07170cf9f..abca6f264 100755 --- a/wireshark-2.0.2-0.bee +++ b/wireshark.be0 @@ -1,5 +1,7 @@ #!/usr/bin/env beesh +# BEE_VERSION wireshark-2.0.2-0 + SRCURL[0]="https://2.na.dl.wireshark.org/src/wireshark-${PKGVERSION}.tar.bz2" #SRCURL[0]="http://wiresharkdownloads.riverbed.com/wireshark/src/wireshark-${PKGVERSION}.tar.bz2" From f7ab0f5c30883a500f484c0b108bf654c2a8671b Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Tue, 19 Dec 2017 12:49:00 +0100 Subject: [PATCH 85/97] wireshark: Use current bee file template Recreate bee file with the command below, and convert it to a versionless bee file. ``` $ bee init https://2.na.dl.wireshark.org/src/wireshark-2.0.2.tar.bz2 creating wireshark-2.0.2-0.bee from template '/etc/default/bee/templates/fallback' $ mv wireshark-2.0.2-0.bee wireshark.be0 $ vim wireshark.be0 ``` --- wireshark.be0 | 59 +++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 55 insertions(+), 4 deletions(-) diff --git a/wireshark.be0 b/wireshark.be0 index abca6f264..daac1f87f 100755 --- a/wireshark.be0 +++ b/wireshark.be0 @@ -2,19 +2,51 @@ # BEE_VERSION wireshark-2.0.2-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.) + +############################################################################### +## 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]="https://2.na.dl.wireshark.org/src/wireshark-${PKGVERSION}.tar.bz2" #SRCURL[0]="http://wiresharkdownloads.riverbed.com/wireshark/src/wireshark-${PKGVERSION}.tar.bz2" -PATCHURL[0]="" +############################################################################### +## Add URLs/pathes to patch files to the PATCHURL array. +## The sources will be patched in the order of the array. -# BEE_CONFIGURE=compat +# PATCHURL+=() -BEE_BUILDTYPE=configure +############################################################################### +## Add filename patterns to the EXCLUDE array of files that should not +## be added to you package but may be present in the image directory. -# EXCLUDE=() +# EXCLUDE+=() + +############################################################################### +## Uncomment the next statement, if the software may not be able to be built +## outside the source directory and needs to be built inside the source +## directory. build_in_sourcedir +############################################################################### +## bee cannot detect buildtypes specified in subdirectories. +## Sometimes packages "hide" the real sources in a subdirectory named +## 'src' or 'cmake' or .. +## use 'sourcesubdir_append' to specify this directory if known. + +# sourcesubdir_append src + +BEE_BUILDTYPE='autotools' + +############################################################################### +## Change the default (auto-detected) steps to +## extract, patch, configure/setup, build and install the software. +## Make sure the mee_install function does install everything to the +## image directory "${D}" + #mee_extract() { # bee_extract "${@}" #} @@ -34,3 +66,22 @@ build_in_sourcedir #mee_install() { # bee_install #} +## by default this may be 'make install DESTDIR="${D}"' + +############################################################################### +## +## Additional hints: +## +## The name of this bee-file should follow the following naming convention: +## pkgname-pkgversion-pkgrevision.bee +## +## You may remove all comments as long as SRCURL[0] is set. +## +## Everything in this file will be executed in a bash environment. +## +## Build the package by executing +## './pkg-version-N.bee' or +## 'beesh ./pkg-version-N.bee' +## +## see http://beezinga.org/ +## From 675efdfa549a156804757c6b6b49528d77c63d65 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Tue, 19 Dec 2017 12:51:50 +0100 Subject: [PATCH 86/97] wireshark: Update download URL The old sources are in the directory `all-versions`. --- wireshark.be0 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wireshark.be0 b/wireshark.be0 index daac1f87f..c13a24be9 100755 --- a/wireshark.be0 +++ b/wireshark.be0 @@ -9,8 +9,8 @@ ## 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]="https://2.na.dl.wireshark.org/src/wireshark-${PKGVERSION}.tar.bz2" -#SRCURL[0]="http://wiresharkdownloads.riverbed.com/wireshark/src/wireshark-${PKGVERSION}.tar.bz2" +SRCURL[0]="https://2.na.dl.wireshark.org/src/all-versions/wireshark-${PKGVERSION}.tar.bz2" +#SRCURL[0]="http://wiresharkdownloads.riverbed.com/wireshark/src/all-versions/wireshark-${PKGVERSION}.tar.bz2" ############################################################################### ## Add URLs/pathes to patch files to the PATCHURL array. From a6875d20a3b65a9f2803a7cb7451ea24d6cdceab Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Tue, 19 Dec 2017 12:59:36 +0100 Subject: [PATCH 87/97] wireshark: Update version from 2.0.2 to 2.0.16 Version 2.0.16 was released on October 10th, 2017. The release notes are available online [1]. [1] https://www.wireshark.org/docs/relnotes/ --- wireshark.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wireshark.be0 b/wireshark.be0 index c13a24be9..06252c438 100755 --- a/wireshark.be0 +++ b/wireshark.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION wireshark-2.0.2-0 +# BEE_VERSION wireshark-2.0.16-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.) From c57ede6a02caa2d716feb55b0ba61774ae341057 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Tue, 19 Dec 2017 13:07:30 +0100 Subject: [PATCH 88/97] wireshark: Patch source to enable Lua bindings with Lua 5.3.3 From [1]: > Optional patch: > http://www.linuxfromscratch.org/patches/blfs/7.10/wireshark-2.0.5-lua_5_3_1-1.patch > (allows building the LUA bindings if Lua-5.3.3 is installed and LUA is > not disabled by passing --without-lua to configure) Applies with a little offset. ``` [BEE] patch -N -p1 -i /dev/shm/bee-root/wireshark/files/wireshark-2.0.5-lua_5_3_1-1.patch patching file configure Hunk #1 succeeded at 38870 (offset 1275 lines). Hunk #2 succeeded at 38974 (offset 1275 lines). Hunk #3 succeeded at 38998 (offset 1275 lines). Hunk #4 succeeded at 39022 (offset 1275 lines). patching file epan/wslua/lua_bitop.c patching file epan/wslua/wslua_byte_array.c patching file epan/wslua/wslua_file.c Hunk #1 succeeded at 347 (offset 10 lines). patching file epan/wslua/wslua.h patching file epan/wslua/wslua_int64.c patching file epan/wslua/wslua_internals.c patching file epan/wslua/wslua_listener.c patching file epan/wslua/wslua_nstime.c patching file epan/wslua/wslua_struct.c patching file epan/wslua/wslua_tvb.c Hunk #3 succeeded at 223 (offset -1 lines). Hunk #4 succeeded at 241 (offset -1 lines). Hunk #5 succeeded at 836 (offset -1 lines). Hunk #6 succeeded at 917 (offset -1 lines). Hunk #7 succeeded at 961 (offset -1 lines). Hunk #8 succeeded at 1008 (offset -1 lines). Hunk #9 succeeded at 1108 (offset -1 lines). ``` With this patch, `Use Lua library : yes` is seen in the configure option summary. [1] http://www.linuxfromscratch.org/blfs/view/7.10/basicnet/wireshark.html --- wireshark.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wireshark.be0 b/wireshark.be0 index 06252c438..1159b7af3 100755 --- a/wireshark.be0 +++ b/wireshark.be0 @@ -16,7 +16,7 @@ SRCURL[0]="https://2.na.dl.wireshark.org/src/all-versions/wireshark-${PKGVERSION ## Add URLs/pathes to patch files to the PATCHURL array. ## The sources will be patched in the order of the array. -# PATCHURL+=() +PATCHURL+=(http://www.linuxfromscratch.org/patches/blfs/7.10/wireshark-2.0.5-lua_5_3_1-1.patch) ############################################################################### ## Add filename patterns to the EXCLUDE array of files that should not From 11671b55bde014fd56f4e825e45dd8936fee8fa6 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Wed, 20 Dec 2017 08:44:08 +0100 Subject: [PATCH 89/97] accountsservice: Convert to versionless bee file --- accountsservice-0.6.13-0.bee => accountsservice.be0 | 2 ++ 1 file changed, 2 insertions(+) rename accountsservice-0.6.13-0.bee => accountsservice.be0 (90%) diff --git a/accountsservice-0.6.13-0.bee b/accountsservice.be0 similarity index 90% rename from accountsservice-0.6.13-0.bee rename to accountsservice.be0 index 8a41bced2..21c36cefa 100755 --- a/accountsservice-0.6.13-0.bee +++ b/accountsservice.be0 @@ -1,5 +1,7 @@ #!/bin/env beesh +# BEE_VERSION accountsservice-0.6.13-0 + SRCURL[0]="http://www.freedesktop.org/software/accountsservice/accountsservice-${PKGVERSION}.tar.xz" PATCHURL[0]="" From 76cadc575594faef0fb2cbe0acbe72d6a7ddf9b2 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Wed, 20 Dec 2017 08:45:43 +0100 Subject: [PATCH 90/97] accountsservice: Use current bee file template --- accountsservice.be0 | 90 +++++++++++++++++++++++++++++++++++---------- 1 file changed, 70 insertions(+), 20 deletions(-) diff --git a/accountsservice.be0 b/accountsservice.be0 index 21c36cefa..dbcb3ae73 100755 --- a/accountsservice.be0 +++ b/accountsservice.be0 @@ -1,35 +1,85 @@ -#!/bin/env beesh +#!/usr/bin/env beesh # BEE_VERSION accountsservice-0.6.13-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.) + +############################################################################### +## 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://www.freedesktop.org/software/accountsservice/accountsservice-${PKGVERSION}.tar.xz" -PATCHURL[0]="" +############################################################################### +## Add URLs/pathes to patch files to the PATCHURL array. +## The sources will be patched in the order of the array. + +# PATCHURL+=() + +############################################################################### +## Add filename patterns to the EXCLUDE array of files that should not +## be added to you package but may be present in the image directory. + +# EXCLUDE+=() + +############################################################################### +## Uncomment the next statement, if the software may not be able to be built +## outside the source directory and needs to be built inside the source +## directory. + +# build_in_sourcedir -# BEE_CONFIGURE=compat +############################################################################### +## bee cannot detect buildtypes specified in subdirectories. +## Sometimes packages "hide" the real sources in a subdirectory named +## 'src' or 'cmake' or .. +## use 'sourcesubdir_append' to specify this directory if known. -# EXCLUDE="" +# sourcesubdir_append src -build_in_sourcedir +############################################################################### +## Change the default (auto-detected) steps to +## extract, patch, configure/setup, build and install the software. +## Make sure the mee_install function does install everything to the +## image directory "${D}" +#mee_extract() { +# bee_extract "${@}" +#} -mee_extract() { - bee_extract ${@} -} +#mee_patch() { +# bee_patch "${@}" +#} -mee_patch() { - bee_patch ${@} -} +#mee_configure() { +# bee_configure +#} -mee_configure() { - bee_configure -} +#mee_build() { +# bee_build +#} -mee_build() { - bee_build -} +#mee_install() { +# bee_install +#} +## by default this may be 'make install DESTDIR="${D}"' -mee_install() { - bee_install -} +############################################################################### +## +## Additional hints: +## +## The name of this bee-file should follow the following naming convention: +## pkgname-pkgversion-pkgrevision.bee +## +## You may remove all comments as long as SRCURL[0] is set. +## +## Everything in this file will be executed in a bash environment. +## +## Build the package by executing +## './pkg-version-N.bee' or +## 'beesh ./pkg-version-N.bee' +## +## see http://beezinga.org/ +## From 895ec63ad46e7a3471a5d7623e7fba8854da26a6 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Wed, 20 Dec 2017 08:56:08 +0100 Subject: [PATCH 91/97] accountsservice: Add patch to disable user preload This is a mitigation to a yet unresolved nic problem with OptiPlex 990 workstations. If we have a local passwd, the accountsservice daemon will query shadow.byname over udp for each account. Because of the network problem, we sometimes loose packets and run into rpc timeouts, which are not properly handled and prevent gdm to display the login window. Avoid this mess by disabling the loading of user information. We don't need it, because we don't present a list of users to pick from anyway. -- --- accountsservice.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/accountsservice.be0 b/accountsservice.be0 index dbcb3ae73..63405f382 100755 --- a/accountsservice.be0 +++ b/accountsservice.be0 @@ -15,7 +15,7 @@ SRCURL[0]="http://www.freedesktop.org/software/accountsservice/accountsservice-$ ## 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/accountsservice-disable-userload.patch) ############################################################################### ## Add filename patterns to the EXCLUDE array of files that should not From d5ab620e15acdec5508bc9f5899055c413936316 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Wed, 20 Dec 2017 08:57:42 +0100 Subject: [PATCH 92/97] accountsservice: Increment revision --- accountsservice.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/accountsservice.be0 b/accountsservice.be0 index 63405f382..6815509c8 100755 --- a/accountsservice.be0 +++ b/accountsservice.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION accountsservice-0.6.13-0 +# BEE_VERSION accountsservice-0.6.13-1 ## 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.) From e55d088239c7c46389202904fc44d1a53bd3bc68 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Thu, 21 Dec 2017 11:27:21 +0100 Subject: [PATCH 93/97] linux: Update LTS version from 4.9.70 to 4.9.71 --- linux-4.9.70-195.bee => linux-4.9.71-196.bee | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename linux-4.9.70-195.bee => linux-4.9.71-196.bee (100%) diff --git a/linux-4.9.70-195.bee b/linux-4.9.71-196.bee similarity index 100% rename from linux-4.9.70-195.bee rename to linux-4.9.71-196.bee From 2ccc897af9b0dd4455df27b1fc0d671caa898048 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Thu, 21 Dec 2017 11:32:15 +0100 Subject: [PATCH 94/97] linux-4.9.71: Add nvidia drivers Add drivers for linux 4.9.71 from drivers for 4.9.70 and remove drivers for 4.9.70. --- ....70-195-340.102-0.bee => nvidia_linux-4.9.71-196-340.102-0.bee | 0 ....9.70-195-375.39-0.bee => nvidia_linux-4.9.71-196-375.39-0.bee | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename nvidia_linux-4.9.70-195-340.102-0.bee => nvidia_linux-4.9.71-196-340.102-0.bee (100%) rename nvidia_linux-4.9.70-195-375.39-0.bee => nvidia_linux-4.9.71-196-375.39-0.bee (100%) diff --git a/nvidia_linux-4.9.70-195-340.102-0.bee b/nvidia_linux-4.9.71-196-340.102-0.bee similarity index 100% rename from nvidia_linux-4.9.70-195-340.102-0.bee rename to nvidia_linux-4.9.71-196-340.102-0.bee diff --git a/nvidia_linux-4.9.70-195-375.39-0.bee b/nvidia_linux-4.9.71-196-375.39-0.bee similarity index 100% rename from nvidia_linux-4.9.70-195-375.39-0.bee rename to nvidia_linux-4.9.71-196-375.39-0.bee From cf9639615ad7bbc31b506ab38b332814d76393e2 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Tue, 19 Dec 2017 13:15:06 +0100 Subject: [PATCH 95/97] wireshark: Update version from 2.0.16 to 2.4.3 Version 2.4.3 was released on November 30th, 2017. The release notes are available online [1], where the notes for 2.4.0 [2] describe the changes in the latest major release. Due to [bug #14283 (Link against wrong libwiretap.so.5 and libwsutil.so.6)][3], you need to remove the installed Wireshark package before building this version. The archive is now compressed with LZMA, so change the suffix. [1]: https://www.wireshark.org/docs/relnotes/ [2]: https://www.wireshark.org/docs/relnotes/wireshark-2.4.0.html [3]: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=14283 --- wireshark.be0 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/wireshark.be0 b/wireshark.be0 index 1159b7af3..45eeb032a 100755 --- a/wireshark.be0 +++ b/wireshark.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION wireshark-2.0.16-0 +# BEE_VERSION wireshark-2.4.3-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,14 +9,14 @@ ## 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]="https://2.na.dl.wireshark.org/src/all-versions/wireshark-${PKGVERSION}.tar.bz2" -#SRCURL[0]="http://wiresharkdownloads.riverbed.com/wireshark/src/all-versions/wireshark-${PKGVERSION}.tar.bz2" +SRCURL[0]="https://2.na.dl.wireshark.org/src/all-versions/wireshark-${PKGVERSION}.tar.xz" +#SRCURL[0]="http://wiresharkdownloads.riverbed.com/wireshark/src/all-versions/wireshark-${PKGVERSION}.tar.xz" ############################################################################### ## Add URLs/pathes to patch files to the PATCHURL array. ## The sources will be patched in the order of the array. -PATCHURL+=(http://www.linuxfromscratch.org/patches/blfs/7.10/wireshark-2.0.5-lua_5_3_1-1.patch) +PATCHURL+=(http://www.linuxfromscratch.org/patches/blfs/svn/wireshark-2.4.3-lua_5_3-1.patch) ############################################################################### ## Add filename patterns to the EXCLUDE array of files that should not From 12eadb6f3e3876e34d62e500f5b64fd0bc3f9a5f Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Tue, 19 Dec 2017 13:35:17 +0100 Subject: [PATCH 96/97] wireshark: Store patch file locally --- wireshark.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wireshark.be0 b/wireshark.be0 index 45eeb032a..96419ca8f 100755 --- a/wireshark.be0 +++ b/wireshark.be0 @@ -16,7 +16,7 @@ SRCURL[0]="https://2.na.dl.wireshark.org/src/all-versions/wireshark-${PKGVERSION ## Add URLs/pathes to patch files to the PATCHURL array. ## The sources will be patched in the order of the array. -PATCHURL+=(http://www.linuxfromscratch.org/patches/blfs/svn/wireshark-2.4.3-lua_5_3-1.patch) +PATCHURL+=(/src/mariux/patches/wireshark-2.4.3-lua_5_3-1.patch) ############################################################################### ## Add filename patterns to the EXCLUDE array of files that should not From 34f2144f0cf07f11e57e35a0a9309b5067284293 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Tue, 19 Dec 2017 13:39:26 +0100 Subject: [PATCH 97/97] wireshark: Build outside of source directory --- wireshark.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wireshark.be0 b/wireshark.be0 index 96419ca8f..cda4e81f0 100755 --- a/wireshark.be0 +++ b/wireshark.be0 @@ -29,7 +29,7 @@ PATCHURL+=(/src/mariux/patches/wireshark-2.4.3-lua_5_3-1.patch) ## outside the source directory and needs to be built inside the source ## directory. -build_in_sourcedir +# build_in_sourcedir ############################################################################### ## bee cannot detect buildtypes specified in subdirectories.