#62 libre/iceweasel: 103.0-1.parabola1
Closed 2 years ago by billauger. Opened 2 years ago by grizzlyuser.

pcr: remove lcov
Denis 'GNUtoo' Carikli • 2 years ago  
libre: epiphany: armv7h: build with libportal-gtk3
Denis 'GNUtoo' Carikli • 2 years ago  
libre: epiphany: unbreak armv7h and i686 builds
Denis 'GNUtoo' Carikli • 2 years ago  
pcr: libreboot-utils: Add intelmetool
Denis 'GNUtoo' Carikli • 2 years ago  
deprecate notsystemd
David P • 2 years ago  
drop openrc-security
David P • 2 years ago  
libre: linux-libre-64: Add rationale for the package
Denis 'GNUtoo' Carikli • 2 years ago  
file modified
+13 -9
@@ -14,8 +14,8 @@ 

  #  - pin to sodeps

  

  pkgname=epiphany

- pkgver=41.3

- pkgrel=1

+ pkgver=42.3

+ pkgrel=3

  pkgrel+=.parabola1

  pkgdesc="A GNOME web browser based on the WebKit rendering engine"

  pkgdesc+=", with DuckDuckGo-HTML search"
@@ -24,23 +24,23 @@ 

  arch+=(i686 armv7h)

  license=(GPL)

  depends=(webkit2gtk-4.1 gcr icu libdazzle libhandy libarchive)

+ # we don't have libportal-gtk3 yet on i686

+ depends_armv7h+=(libportal-gtk3)

+ depends_x86_64+=(libportal-gtk3)

  depends=( $( sed 's| icu | |' <<<${depends[@]} ) )

  depends+=(libhogweed.so)

  makedepends=(docbook-xml startup-notification lsb-release gobject-introspection

               yelp-tools git meson)

- makedepends=( ${makedepends[*]/meson/meson<0.61.0} ) # FIXME: FTBS with meson 0.61.x

-                                                      #        "epiphany/data/meson.build:18:0: ERROR: Function does not take positional arguments."

-                                                      #        possibly related: https://cgit.freebsd.org/ports/commit/?id=299348602e6d75b6f85b2e7303a0bea5f37541b6

  checkdepends=(xorg-server-xvfb aspell hspell hunspell nuspell libvoikko)

  groups=(gnome)

- _commit=ce3713dfd4f69275c2c46a6687c24deb8b8aa367  # tags/41.3^0

+ _commit=6cdf86702e747867b2f4b338429733f84f554f80  # tags/42.3^0

  source=("git+https://gitlab.gnome.org/GNOME/epiphany.git#commit=$_commit")

  source+=(libre.patch)

  sha256sums=('SKIP')

- sha256sums+=('2ef991ade98fbe9a3a6cd80220d3348e69007abff5141bea42bbdf1c72836689')

+ sha256sums+=('bf1dd1692ec9f94f8fc669a5ee71dd811d6083465dbb197e3fcc64e2aaf2f709')

  

  # check() requires networking

- _run_check=1

+ _run_check=0

  

  

  pkgver() {
@@ -56,7 +56,11 @@ 

  }

  

  build() {

-   arch-meson $pkgname build -D soup2=disabled -D libportal=disabled

+   if [ "${CARCH}" != "i686" ] ; then

+     arch-meson $pkgname build -D soup2=disabled

+   else

+     arch-meson $pkgname build -D soup2=disabled -D libportal=disabled

+   fi

    meson compile -C build 

  }

  

file modified
+38 -21
@@ -1,24 +1,41 @@ 

- --- epiphany.orig/data/org.gnome.epiphany.gschema.xml	2019-04-27 00:17:50.060428000 -0500

- +++ epiphany/data/org.gnome.epiphany.gschema.xml	2019-04-27 00:17:50.360428000 -0500

- @@ -26,9 +26,7 @@

+ From f5240f67aa9f00277570b3b28b726311c32d7843 Mon Sep 17 00:00:00 2001

+ From: =?UTF-8?q?Iv=C3=A1n=20=C3=81valos?= <avalos@disroot.org>

+ Date: Sun, 24 Jul 2022 02:07:05 -0500

+ Subject: [PATCH] libre

+ 

+ ---

+  data/org.gnome.epiphany.gschema.xml | 4 +---

+  lib/ephy-search-engine-manager.h    | 2 +-

+  2 files changed, 2 insertions(+), 4 deletions(-)

+ 

+ diff --git a/data/org.gnome.epiphany.gschema.xml b/data/org.gnome.epiphany.gschema.xml

+ index 7fcac67b3..6f1444167 100644

+ --- a/data/org.gnome.epiphany.gschema.xml

+ +++ b/data/org.gnome.epiphany.gschema.xml

+ @@ -53,9 +53,7 @@

   			<default l10n="messages">

-                                   <!-- TRANSLATORS: These are the prepopulated search engines. You should

-                                        add country-specific URL query parameters if appropriate. -->

- -                                 [('DuckDuckGo', 'https://duckduckgo.com/?q=%s&amp;t=epiphany', '!ddg'),

- -				  ('Google', 'https://www.google.com/search?q=%s', '!g'),

- -				  ('Bing', 'https://www.bing.com/search?q=%s', '!b')]

- +                                 [('DuckDuckGo', 'https://duckduckgo.com/html/?q=%s&amp;t=epiphany', '!ddg')]

-  			</default>

-  			<summary>Default search engines.</summary>

-  			<description>List of the default search engines. It is an array in which each search engine is described by a name, an address, and a bang (shortcut).</description>

- --- epiphany.orig/lib/ephy-search-engine-manager.c	2019-04-27 00:17:49.860428000 -0500

- +++ epiphany/lib/ephy-search-engine-manager.c	2019-04-27 00:55:14.840404975 -0500

- @@ -27,7 +27,7 @@

-  #include "ephy-settings.h"

-  #include "ephy-prefs.h"

+  				<![CDATA[

+  				[

+ -					{'name': <'DuckDuckGo'>, 'url': <'https://duckduckgo.com/?q=%s&t=epiphany'>, 'bang': <'!ddg'>},

+ -					{'name': <'Google'>, 'url': <'https://www.google.com/search?q=%s'>, 'bang': <'!g'>},

+ -					{'name': <'Bing'>, 'url': <'https://www.bing.com/search?q=%s'>, 'bang': <'!b'>}

+ +					{'name': <'DuckDuckGo'>, 'url': <'https://duckduckgo.com/html/?q=%s&t=epiphany'>, 'bang': <'!ddg'>}

+  				]

+  			]]></default>

+  			<summary>List of the search engines.</summary>

+ diff --git a/lib/ephy-search-engine-manager.h b/lib/ephy-search-engine-manager.h

+ index c1939d31f..d29bb78c2 100644

+ --- a/lib/ephy-search-engine-manager.h

+ +++ b/lib/ephy-search-engine-manager.h

+ @@ -32,7 +32,7 @@ G_BEGIN_DECLS

+   * the version used in your country. For example for the french version :

+   * replace the ".com" with ".fr" :  "https://duckduckgo.fr/?q=%s&amp;t=epiphany"

+  */

+ -#define EPHY_SEARCH_ENGINE_DEFAULT_ADDRESS _("https://duckduckgo.com/?q=%s&amp;t=epiphany")

+ +#define EPHY_SEARCH_ENGINE_DEFAULT_ADDRESS _("https://duckduckgo.com/html/?q=%s&amp;t=epiphany")

   

- -#define FALLBACK_ADDRESS "https://duckduckgo.com/?q=%s&t=epiphany"

- +#define FALLBACK_ADDRESS "https://duckduckgo.com/html/?q=%s&t=epiphany"

+  #define EPHY_TYPE_SEARCH_ENGINE_MANAGER (ephy_search_engine_manager_get_type ())

   

-  enum {

-    SEARCH_ENGINES_CHANGED,

+ -- 

+ 2.37.1

+ 

@@ -1,4 +1,4 @@ 

- From e2e22a52ee5e5cf9f7c55854b828bb65a919b563 Mon Sep 17 00:00:00 2001

+ From e63cc6359790ab8d7139bf9cdf8e3b527ba780e6 Mon Sep 17 00:00:00 2001

  From: grizzlyuser <grizzlyuser@protonmail.com>

  Date: Wed, 30 Dec 2020 17:20:39 +0200

  Subject: [PATCH 01/13] Point to local omni.ja files, not remote server
@@ -47,10 +47,10 @@ 

                     >

                       nimbus-desktop-experiments

  diff --git a/browser/components/newtab/data/content/activity-stream.bundle.js b/browser/components/newtab/data/content/activity-stream.bundle.js

- index 3439547610..e4b170454c 100644

+ index cb7c26e729..696813dd53 100644

  --- a/browser/components/newtab/data/content/activity-stream.bundle.js

  +++ b/browser/components/newtab/data/content/activity-stream.bundle.js

- @@ -1577,7 +1577,7 @@ class ASRouterAdminInner extends (external_React_default()).PureComponent {

+ @@ -1576,7 +1576,7 @@ class ASRouterAdminInner extends (external_React_default()).PureComponent {

           label = /*#__PURE__*/external_React_default().createElement("span", null, "remote settings (", /*#__PURE__*/external_React_default().createElement("a", {

             className: "providerUrl",

             target: "_blank",
@@ -60,10 +60,10 @@ 

           }, "nimbus-desktop-experiments"), ")");

         }

  diff --git a/services/settings/Utils.jsm b/services/settings/Utils.jsm

- index 31ad77d286..9f2e97f14c 100644

+ index 23d6bf1a20..6f87bfa812 100644

  --- a/services/settings/Utils.jsm

  +++ b/services/settings/Utils.jsm

- @@ -106,7 +106,7 @@ var Utils = {

+ @@ -108,7 +108,7 @@ var Utils = {

         : AppConstants.REMOTE_SETTINGS_SERVER_URL;

     },

   
@@ -86,10 +86,10 @@ 

     # 1. List remote settings collections from server.

     echo "INFO: fetch remote settings list from server"

  diff --git a/toolkit/components/search/SearchUtils.jsm b/toolkit/components/search/SearchUtils.jsm

- index 0bf60e5f16..5561b885f6 100644

+ index a3100fac89..3720829575 100644

  --- a/toolkit/components/search/SearchUtils.jsm

  +++ b/toolkit/components/search/SearchUtils.jsm

- @@ -158,13 +158,13 @@ var SearchUtils = {

+ @@ -157,13 +157,13 @@ var SearchUtils = {

   

     ENGINES_URLS: {

       "prod-main":
@@ -129,10 +129,10 @@ 

  +.. _viewed live: resource://app/defaults/settings/main/search-config.json

   .. _Normandy: /toolkit/components/normandy/normandy/services.html

  diff --git a/toolkit/modules/AppConstants.jsm b/toolkit/modules/AppConstants.jsm

- index 7f8ac95dd9..fc34169ea5 100644

+ index 9311d06758..fd87704d83 100644

  --- a/toolkit/modules/AppConstants.jsm

  +++ b/toolkit/modules/AppConstants.jsm

- @@ -420,9 +420,9 @@ this.AppConstants = Object.freeze({

+ @@ -423,9 +423,9 @@ var AppConstants = Object.freeze({

   

     REMOTE_SETTINGS_SERVER_URL:

   #ifdef MOZ_THUNDERBIRD
@@ -158,10 +158,10 @@ 

   #define PROD_CID "windows-default-browser-agent"

   #define PROD_ID "state"

  -- 

- 2.37.0

+ 2.37.1

  

  

- From 9329ba8b85b542759a089818d70ba86d0a5b9a60 Mon Sep 17 00:00:00 2001

+ From 1b75c1b90928d362b6b7723b57c3c0d501145807 Mon Sep 17 00:00:00 2001

  From: grizzlyuser <grizzlyuser@protonmail.com>

  Date: Wed, 30 Dec 2020 17:34:08 +0200

  Subject: [PATCH 02/13] Remove polling triggered by push broadcasts
@@ -174,11 +174,11 @@ 

  service.

  ---

   dom/push/PushBroadcastService.jsm    | 13 +++++++++++++

-  services/settings/remote-settings.js |  7 ++-----

-  2 files changed, 15 insertions(+), 5 deletions(-)

+  services/settings/remote-settings.js | 11 ++---------

+  2 files changed, 15 insertions(+), 9 deletions(-)

  

  diff --git a/dom/push/PushBroadcastService.jsm b/dom/push/PushBroadcastService.jsm

- index 1ee7986f6a..db73413b1a 100644

+ index 85c1bf6634..d2094ebb9c 100644

  --- a/dom/push/PushBroadcastService.jsm

  +++ b/dom/push/PushBroadcastService.jsm

  @@ -179,6 +179,19 @@ var BroadcastService = class {
@@ -202,19 +202,23 @@ 

      * Call the listeners of the specified broadcasts.

      *

  diff --git a/services/settings/remote-settings.js b/services/settings/remote-settings.js

- index f7e8e24748..57d11d71b3 100644

+ index bfe9226f88..01abff0fb1 100644

  --- a/services/settings/remote-settings.js

  +++ b/services/settings/remote-settings.js

- @@ -533,7 +533,7 @@ function remoteSettingsFunction() {

+ @@ -580,11 +580,7 @@ function remoteSettingsFunction() {

         moduleURI: __URI__,

         symbolName: "remoteSettingsBroadcastHandler",

       };

- -    pushBroadcastService.addListener(BROADCAST_ID, currentVersion, moduleInfo);

- +    pushBroadcastService.deleteListener(BROADCAST_ID);

+ -    lazy.pushBroadcastService.addListener(

+ -      BROADCAST_ID,

+ -      currentVersion,

+ -      moduleInfo

+ -    );

+ +    lazy.pushBroadcastService.deleteListener(BROADCAST_ID);

     };

   

     return remoteSettings;

- @@ -553,9 +553,6 @@ var remoteSettingsBroadcastHandler = {

+ @@ -604,9 +600,6 @@ var remoteSettingsBroadcastHandler = {

         `Push notification received (version=${version} phase=${phase})`

       );

   
@@ -226,10 +230,10 @@ 

     },

   };

  -- 

- 2.37.0

+ 2.37.1

  

  

- From 11631dd36d3eeecc5f22171d5e059fbe7662c77c Mon Sep 17 00:00:00 2001

+ From 8b367f58916f12d73a392fa629673e3a797a1a64 Mon Sep 17 00:00:00 2001

  From: grizzlyuser <grizzlyuser@protonmail.com>

  Date: Wed, 30 Dec 2020 17:41:54 +0200

  Subject: [PATCH 03/13] Remove timer that triggers polling for changes
@@ -270,10 +274,10 @@ 

  -# see syntax https://searchfox.org/mozilla-central/rev/cc280c4be94ff8cf64a27cc9b3d6831ffa49fa45/toolkit/components/timermanager/UpdateTimerManager.jsm#155

  -category update-timer RemoteSettingsComponents @mozilla.org/services/settings;1,getService,services-settings-poll-changes,services.settings.poll_interval,86400,259200

  -- 

- 2.37.0

+ 2.37.1

  

  

- From d720d5680fa97ad53998b6050bc28df4503f0c39 Mon Sep 17 00:00:00 2001

+ From ea39895fee8e1dcf71b8779d33ae641a30dca384 Mon Sep 17 00:00:00 2001

  From: grizzlyuser <grizzlyuser@protonmail.com>

  Date: Wed, 30 Dec 2020 17:47:41 +0200

  Subject: [PATCH 04/13] Utils: fetch timestamps of each collection locally
@@ -304,10 +308,10 @@ 

   

   ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325)

  diff --git a/services/settings/Utils.jsm b/services/settings/Utils.jsm

- index 9f2e97f14c..4e140f0fdd 100644

+ index 6f87bfa812..8f878754a5 100644

  --- a/services/settings/Utils.jsm

  +++ b/services/settings/Utils.jsm

- @@ -377,7 +377,7 @@ var Utils = {

+ @@ -380,7 +380,7 @@ var Utils = {

     async fetchLatestChanges(serverUrl, options = {}) {

       const { expectedTimestamp, lastEtag = "", filters = {} } = options;

   
@@ -316,7 +320,7 @@ 

       const params = {

         ...filters,

         _expected: expectedTimestamp ?? 0,

- @@ -392,7 +392,11 @@ var Utils = {

+ @@ -395,7 +395,11 @@ var Utils = {

             .map(([k, v]) => `${k}=${encodeURIComponent(v)}`)

             .join("&");

       }
@@ -329,7 +333,7 @@ 

   

       if (response.status >= 500) {

         throw new Error(`Server error ${response.status} ${response.statusText}`);

- @@ -427,7 +431,15 @@ var Utils = {

+ @@ -430,7 +434,15 @@ var Utils = {

         }

       }

   
@@ -373,10 +377,10 @@ 

   ]

   

  -- 

- 2.37.0

+ 2.37.1

  

  

- From 98496943d01589201771f69e14ba6b3cb7395e48 Mon Sep 17 00:00:00 2001

+ From 442dd6b2fff0cd43c9e7e43d1d2bd63269ddc3c2 Mon Sep 17 00:00:00 2001

  From: grizzlyuser <grizzlyuser@protonmail.com>

  Date: Wed, 30 Dec 2020 17:52:10 +0200

  Subject: [PATCH 05/13] Utils: disable offline checking
@@ -384,22 +388,23 @@ 

  Since only local data is read now, it should always return false for the

  current and any future code that relies on it.

  ---

-  services/settings/Utils.jsm | 9 ---------

-  1 file changed, 9 deletions(-)

+  services/settings/Utils.jsm | 10 ----------

+  1 file changed, 10 deletions(-)

  

  diff --git a/services/settings/Utils.jsm b/services/settings/Utils.jsm

- index 4e140f0fdd..5d448da54c 100644

+ index 8f878754a5..fdf7181c14 100644

  --- a/services/settings/Utils.jsm

  +++ b/services/settings/Utils.jsm

- @@ -192,15 +192,6 @@ var Utils = {

+ @@ -194,16 +194,6 @@ var Utils = {

      * @return {bool} Whether network is down or not.

      */

     get isOffline() {

  -    try {

  -      return (

  -        Services.io.offline ||

- -        CaptivePortalService.state == CaptivePortalService.LOCKED_PORTAL ||

- -        !gNetworkLinkService.isLinkUp

+ -        lazy.CaptivePortalService.state ==

+ -          lazy.CaptivePortalService.LOCKED_PORTAL ||

+ -        !lazy.gNetworkLinkService.isLinkUp

  -      );

  -    } catch (ex) {

  -      log.warn("Could not determine network status.", ex);
@@ -408,10 +413,10 @@ 

     },

   

  -- 

- 2.37.0

+ 2.37.1

  

  

- From 738c1836a53ead5253ab3e0f9750aec94192dff0 Mon Sep 17 00:00:00 2001

+ From c2f06f79b0d5d78ab3a81ec7f85053d7b3e761af Mon Sep 17 00:00:00 2001

  From: grizzlyuser <grizzlyuser@protonmail.com>

  Date: Wed, 30 Dec 2020 17:56:02 +0200

  Subject: [PATCH 06/13] Refactor hashing logic to a separate function
@@ -424,25 +429,25 @@ 

   2 files changed, 11 insertions(+), 2 deletions(-)

  

  diff --git a/services/settings/RemoteSettingsWorker.jsm b/services/settings/RemoteSettingsWorker.jsm

- index 147ebb6b13..c86e218fd3 100644

+ index 9fc1794f90..50e69f56a0 100644

  --- a/services/settings/RemoteSettingsWorker.jsm

  +++ b/services/settings/RemoteSettingsWorker.jsm

- @@ -189,6 +189,10 @@ class Worker {

+ @@ -191,6 +191,10 @@ class Worker {

       // task on the current thread instead of the worker thread.

-      return SharedUtils.checkContentHash(buffer, size, hash);

+      return lazy.SharedUtils.checkContentHash(buffer, size, hash);

     }

  +

  +  async getContentHash(bytes) {

- +    return SharedUtils.getContentHash(bytes);

+ +    return lazy.SharedUtils.getContentHash(bytes);

  +  }

   }

   

   // Now, first add a shutdown blocker. If that fails, we must have

  diff --git a/services/settings/SharedUtils.jsm b/services/settings/SharedUtils.jsm

- index 5d32fb38bd..753a1b1393 100644

+ index 9804e80c91..de67b0fb6f 100644

  --- a/services/settings/SharedUtils.jsm

  +++ b/services/settings/SharedUtils.jsm

- @@ -28,11 +28,16 @@ var SharedUtils = {

+ @@ -23,11 +23,16 @@ var SharedUtils = {

         return false;

       }

       // Has expected content?
@@ -462,10 +467,10 @@ 

   

     /**

  -- 

- 2.37.0

+ 2.37.1

  

  

- From fa07a0a3fbd62a0d973a4ca07fdc3a5cf2209841 Mon Sep 17 00:00:00 2001

+ From f9aa27662b2018a543d71e2443397beecc73ee5e Mon Sep 17 00:00:00 2001

  From: grizzlyuser <grizzlyuser@protonmail.com>

  Date: Wed, 30 Dec 2020 18:05:02 +0200

  Subject: [PATCH 07/13] Client: Fetch and hash records from local dump
@@ -500,16 +505,16 @@ 

   1 file changed, 27 insertions(+), 36 deletions(-)

  

  diff --git a/services/settings/RemoteSettingsClient.jsm b/services/settings/RemoteSettingsClient.jsm

- index eee1487491..90e82772c4 100644

+ index 2b07a06b26..77da7304b6 100644

  --- a/services/settings/RemoteSettingsClient.jsm

  +++ b/services/settings/RemoteSettingsClient.jsm

- @@ -592,11 +592,9 @@ class RemoteSettingsClient extends EventEmitter {

+ @@ -668,11 +668,9 @@ class RemoteSettingsClient extends EventEmitter {

   

             // If the data is up-to-date but don't have metadata (records loaded from dump),

             // we fetch them and validate the signature immediately.

- -          if (this.verifySignature && ObjectUtils.isEmpty(localMetadata)) {

- +          if (this.verifySignature && ObjectUtils.isEmpty(localMetadata?.json_dump_metadata)) {

-              console.debug(`${this.identifier} pull collection metadata`);

+ -          if (this.verifySignature && lazy.ObjectUtils.isEmpty(localMetadata)) {

+ +          if (this.verifySignature && lazy.ObjectUtils.isEmpty(localMetadata?.json_dump_metadata)) {

+              lazy.console.debug(`${this.identifier} pull collection metadata`);

  -            const metadata = await this.httpClient().getData({

  -              query: { _expected: expectedTimestamp },

  -            });
@@ -517,7 +522,7 @@ 

               await this.db.importChanges(metadata);

               // We don't bother validating the signature if the dump was just loaded. We do

               // if the dump was loaded at some other point (eg. from .get()).

- @@ -825,33 +823,23 @@ class RemoteSettingsClient extends EventEmitter {

+ @@ -935,33 +933,23 @@ class RemoteSettingsClient extends EventEmitter {

      * @returns {Promise}

      */

     async _validateCollectionSignature(records, timestamp, metadata) {
@@ -537,9 +542,9 @@ 

  -      signature: { x5u, signature },

  +      json_dump_metadata: { hash, size },

       } = metadata;

- -    const certChain = await (await Utils.fetch(x5u)).text();

+ -    const certChain = await (await lazy.Utils.fetch(x5u)).text();

       // Merge remote records with local ones and serialize as canonical JSON.

-      const serialized = await RemoteSettingsWorker.canonicalStringify(

+      const serialized = await lazy.RemoteSettingsWorker.canonicalStringify(

         records,

         timestamp

       );
@@ -549,15 +554,15 @@ 

  -        "p384ecdsa=" + signature,

  -        certChain,

  -        this.signerName,

- -        Utils.CERT_CHAIN_ROOT_IDENTIFIER

- +      !(await RemoteSettingsWorker.checkContentHash(

+ -        lazy.Utils.CERT_CHAIN_ROOT_IDENTIFIER

+ +      !(await lazy.RemoteSettingsWorker.checkContentHash(

  +        new TextEncoder().encode(serialized),

  +        size,

  +        hash

         ))

       ) {

         throw new InvalidSignatureError(this.identifier);

- @@ -1024,24 +1012,27 @@ class RemoteSettingsClient extends EventEmitter {

+ @@ -1134,24 +1122,27 @@ class RemoteSettingsClient extends EventEmitter {

      * @param since timestamp of last sync (optional)

      */

     async _fetchChangeset(expectedTimestamp, since) {
@@ -576,21 +581,21 @@ 

  -          _since: since,

  -        },

  -      }

- +    const { data } = await SharedUtils.loadJSONDump(

+ +    const { data } = await lazy.SharedUtils.loadJSONDump(

  +      this.bucketName,

  +      this.collectionName

-      );

+ +    );

  +    const remoteRecords = data ?? [];

  +

- +    const serialized = await RemoteSettingsWorker.canonicalStringify(

+ +    const serialized = await lazy.RemoteSettingsWorker.canonicalStringify(

  +      remoteRecords,

  +      expectedTimestamp

- +    );

+      );

  +    const bytes = new TextEncoder().encode(serialized);

  +    const metadata = {

  +      app_build_id: Services.appinfo.appBuildID,

  +      json_dump_metadata: {

- +        hash: await RemoteSettingsWorker.getContentHash(bytes),

+ +        hash: await lazy.RemoteSettingsWorker.getContentHash(bytes),

  +        size: bytes.length,

  +      },

  +    }
@@ -602,10 +607,10 @@ 

         remoteRecords,

       };

  -- 

- 2.37.0

+ 2.37.1

  

  

- From 9e4840347d561c7dc98ab6f84e3c3a195297c29e Mon Sep 17 00:00:00 2001

+ From aa6967b7f10899464253074271f27180ca4069fe Mon Sep 17 00:00:00 2001

  From: grizzlyuser <grizzlyuser@protonmail.com>

  Date: Wed, 30 Dec 2020 18:42:56 +0200

  Subject: [PATCH 08/13] Client: start deferred sync on get() or on()
@@ -623,45 +628,42 @@ 

  correctly synchronized with the dump, so that no metadata checking

  occurs during the session.

  ---

-  services/settings/RemoteSettingsClient.jsm | 30 +++++++++++++++++++++-

-  1 file changed, 29 insertions(+), 1 deletion(-)

+  services/settings/RemoteSettingsClient.jsm | 27 +++++++++++++++++++++-

+  1 file changed, 26 insertions(+), 1 deletion(-)

  

  diff --git a/services/settings/RemoteSettingsClient.jsm b/services/settings/RemoteSettingsClient.jsm

- index 90e82772c4..2a009eca7c 100644

+ index 77da7304b6..81404d9801 100644

  --- a/services/settings/RemoteSettingsClient.jsm

  +++ b/services/settings/RemoteSettingsClient.jsm

- @@ -16,6 +16,7 @@ XPCOMUtils.defineLazyModuleGetters(this, {

+ @@ -23,6 +23,7 @@ XPCOMUtils.defineLazyModuleGetters(lazy, {

     ClientEnvironmentBase:

       "resource://gre/modules/components-utils/ClientEnvironment.jsm",

     Database: "resource://services-settings/Database.jsm",

  +  DeferredTask: "resource://gre/modules/DeferredTask.jsm",

-    Downloader: "resource://services-settings/Attachments.jsm",

     IDBHelpers: "resource://services-settings/IDBHelpers.jsm",

     KintoHttpClient: "resource://services-common/kinto-http-client.js",

- @@ -27,6 +28,7 @@ XPCOMUtils.defineLazyModuleGetters(this, {

+    ObjectUtils: "resource://gre/modules/ObjectUtils.jsm",

+ @@ -33,6 +34,7 @@ XPCOMUtils.defineLazyModuleGetters(lazy, {

   });

   

   const TELEMETRY_COMPONENT = "remotesettings";

  +const DEFERRED_SYNC_DELAY_MILLISECONDS = 1000;

   

-  XPCOMUtils.defineLazyGetter(this, "console", () => Utils.log);

+  XPCOMUtils.defineLazyGetter(lazy, "console", () => lazy.Utils.log);

   

- @@ -249,6 +251,14 @@ class RemoteSettingsClient extends EventEmitter {

+ @@ -320,6 +322,11 @@ class RemoteSettingsClient extends EventEmitter {

       this._lastCheckTimePref = lastCheckTimePref;

       this._verifier = null;

       this._syncRunning = false;

- +    this._deferredSync = new DeferredTask(

- +      async () => {

- +        if (!this._syncRunning && !(await this._isSynced())) {

- +          await this.sync();

- +        }

- +      },

- +      DEFERRED_SYNC_DELAY_MILLISECONDS

- +    );

+ +    this._deferredSync = new lazy.DeferredTask(async () => {

+ +      if (!this._syncRunning && !(await this._isSynced())) {

+ +        await this.sync();

+ +      }

+ +    }, DEFERRED_SYNC_DELAY_MILLISECONDS);

   

       // This attribute allows signature verification to be disabled, when running tests

       // or when pulling data from a dev server.

- @@ -278,6 +288,11 @@ class RemoteSettingsClient extends EventEmitter {

+ @@ -349,6 +356,11 @@ class RemoteSettingsClient extends EventEmitter {

       this.db.identifier = this.identifier;

     }

   
@@ -673,7 +675,7 @@ 

     get identifier() {

       return `${this.bucketName}/${this.collectionName}`;

     }

- @@ -346,6 +361,10 @@ class RemoteSettingsClient extends EventEmitter {

+ @@ -417,6 +429,10 @@ class RemoteSettingsClient extends EventEmitter {

         let lastModified = await this.db.getLastModified();

         let hasLocalData = lastModified !== null;

   
@@ -684,7 +686,7 @@ 

         if (syncIfEmpty && !hasLocalData) {

           // .get() was called before we had the chance to synchronize the local database.

           // We'll try to avoid returning an empty list.

- @@ -444,7 +463,10 @@ class RemoteSettingsClient extends EventEmitter {

+ @@ -517,7 +533,10 @@ class RemoteSettingsClient extends EventEmitter {

         // No need to verify signature on JSON dumps.

         // If local DB cannot be read, then we don't even try to do anything,

         // we return results early.
@@ -695,14 +697,14 @@ 

  +      return filtered;

       }

   

-      console.debug(

- @@ -484,6 +506,12 @@ class RemoteSettingsClient extends EventEmitter {

+      lazy.console.debug(

+ @@ -557,6 +576,12 @@ class RemoteSettingsClient extends EventEmitter {

       return final;

     }

   

  +  async _isSynced() {

  +    this._synced ||=

- +      Services.appinfo.appBuildID === (await this.db.getMetadata())?.app_build_id;

+ +      Services.appinfo.appBuildID === (await this.db?.getMetadata())?.app_build_id;

  +    return this._synced;

  +  }

  +
@@ -710,10 +712,10 @@ 

      * Synchronize the local database with the remote server.

      *

  -- 

- 2.37.0

+ 2.37.1

  

  

- From 72de3dbe162430638a58838b714f1872c2dd8195 Mon Sep 17 00:00:00 2001

+ From d38df88747ef8df356af5178fde18bf3a25836b6 Mon Sep 17 00:00:00 2001

  From: grizzlyuser <grizzlyuser@protonmail.com>

  Date: Wed, 30 Dec 2020 18:53:51 +0200

  Subject: [PATCH 09/13] Client: deep compare records if timestamps match
@@ -735,34 +737,34 @@ 

   1 file changed, 5 insertions(+), 1 deletion(-)

  

  diff --git a/services/settings/RemoteSettingsClient.jsm b/services/settings/RemoteSettingsClient.jsm

- index 2a009eca7c..dbcdb559df 100644

+ index 81404d9801..c06650e2d8 100644

  --- a/services/settings/RemoteSettingsClient.jsm

  +++ b/services/settings/RemoteSettingsClient.jsm

- @@ -13,6 +13,7 @@ const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");

+ @@ -20,6 +20,7 @@ const { Downloader } = ChromeUtils.import(

+  const lazy = {};

   

-  XPCOMUtils.defineLazyModuleGetters(this, {

-    AppConstants: "resource://gre/modules/AppConstants.jsm",

+  XPCOMUtils.defineLazyModuleGetters(lazy, {

  +  CanonicalJSON: "resource://gre/modules/CanonicalJSON.jsm",

     ClientEnvironmentBase:

       "resource://gre/modules/components-utils/ClientEnvironment.jsm",

     Database: "resource://services-settings/Database.jsm",

- @@ -1015,7 +1016,10 @@ class RemoteSettingsClient extends EventEmitter {

+ @@ -1122,7 +1123,10 @@ class RemoteSettingsClient extends EventEmitter {

           const old = oldById.get(r.id);

           if (old) {

             oldById.delete(r.id);

  -          if (r.last_modified != old.last_modified) {

  +          if (

  +            r.last_modified != old.last_modified ||

- +            CanonicalJSON.stringify(r) != CanonicalJSON.stringify(old)

+ +            lazy.CanonicalJSON.stringify(r) != lazy.CanonicalJSON.stringify(old)

  +          ) {

               syncResult.updated.push({ old, new: r });

             }

           } else {

  -- 

- 2.37.0

+ 2.37.1

  

  

- From 0ddc970c40569ca7b20ec67a413519589e7c52f6 Mon Sep 17 00:00:00 2001

+ From f746bdc4a82e8a29ea8a5470cb5cdedba6594dbc Mon Sep 17 00:00:00 2001

  From: grizzlyuser <grizzlyuser@protonmail.com>

  Date: Wed, 30 Dec 2020 19:01:39 +0200

  Subject: [PATCH 10/13] Client: delete more data on cleanup
@@ -780,10 +782,10 @@ 

   1 file changed, 9 insertions(+), 3 deletions(-)

  

  diff --git a/services/settings/RemoteSettingsClient.jsm b/services/settings/RemoteSettingsClient.jsm

- index dbcdb559df..c20ce412b2 100644

+ index c06650e2d8..d5d934447a 100644

  --- a/services/settings/RemoteSettingsClient.jsm

  +++ b/services/settings/RemoteSettingsClient.jsm

- @@ -207,7 +207,7 @@ class AttachmentDownloader extends Downloader {

+ @@ -257,7 +257,7 @@ class AttachmentDownloader extends Downloader {

         allRecords

           .filter(r => !!r.attachment)

           .map(r =>
@@ -792,16 +794,16 @@ 

           )

       );

     }

- @@ -975,7 +975,7 @@ class RemoteSettingsClient extends EventEmitter {

+ @@ -1082,7 +1082,7 @@ class RemoteSettingsClient extends EventEmitter {

             // Signature failed, clear local DB because it contains

             // bad data (local + remote changes).

-            console.debug(`${this.identifier} clear local data`);

+            lazy.console.debug(`${this.identifier} clear local data`);

  -          await this.db.clear();

  +          await this._clearAll();

             // Local data was tampered, throw and it will retry from empty DB.

-            console.error(`${this.identifier} local data was corrupted`);

+            lazy.console.error(`${this.identifier} local data was corrupted`);

             throw new CorruptedDataError(this.identifier);

- @@ -997,7 +997,7 @@ class RemoteSettingsClient extends EventEmitter {

+ @@ -1104,7 +1104,7 @@ class RemoteSettingsClient extends EventEmitter {

               // _importJSONDump() only clears DB if dump is available,

               // therefore do it here!

               if (imported < 0) {
@@ -810,7 +812,7 @@ 

               }

             }

           }

- @@ -1037,6 +1037,12 @@ class RemoteSettingsClient extends EventEmitter {

+ @@ -1144,6 +1144,12 @@ class RemoteSettingsClient extends EventEmitter {

       return syncResult;

     }

   
@@ -824,10 +826,10 @@ 

      * Fetch information from changeset endpoint.

      *

  -- 

- 2.37.0

+ 2.37.1

  

  

- From 00e45ee5b33b5e6030fa2d3b589cce5418822a3e Mon Sep 17 00:00:00 2001

+ From 3e2487052231283079591eb158d6f45b43f1c091 Mon Sep 17 00:00:00 2001

  From: grizzlyuser <grizzlyuser@protonmail.com>

  Date: Wed, 30 Dec 2020 19:07:56 +0200

  Subject: [PATCH 11/13] Client: remove comparison of collection timestamps
@@ -842,16 +844,16 @@ 

   1 file changed, 5 deletions(-)

  

  diff --git a/services/settings/RemoteSettingsClient.jsm b/services/settings/RemoteSettingsClient.jsm

- index c20ce412b2..79ec40ee9e 100644

+ index d5d934447a..9a25d5103d 100644

  --- a/services/settings/RemoteSettingsClient.jsm

  +++ b/services/settings/RemoteSettingsClient.jsm

- @@ -917,14 +917,9 @@ class RemoteSettingsClient extends EventEmitter {

+ @@ -1024,14 +1024,9 @@ class RemoteSettingsClient extends EventEmitter {

         updated: [],

         deleted: [],

       };

  -    // If data wasn't changed, return empty sync result.

  -    // This can happen when we update the signature but not the data.

-      console.debug(

+      lazy.console.debug(

         `${this.identifier} local timestamp: ${localTimestamp}, remote: ${remoteTimestamp}`

       );

  -    if (localTimestamp && remoteTimestamp < localTimestamp) {
@@ -861,20 +863,20 @@ 

       await this.db.importChanges(metadata, remoteTimestamp, remoteRecords, {

         clear: retry,

  -- 

- 2.37.0

+ 2.37.1

  

  

- From 37d74c55d8c1d852666f179fe6ea45fd99ff83ca Mon Sep 17 00:00:00 2001

+ From ba7f771d057358ae0575f0f392116b4406b6c1a5 Mon Sep 17 00:00:00 2001

  From: grizzlyuser <grizzlyuser@protonmail.com>

  Date: Wed, 30 Dec 2020 19:15:44 +0200

  Subject: [PATCH 12/13] Attachments: load only from dump and drop cached

  

  ---

-  services/settings/Attachments.jsm | 35 +++++++------------------------

-  1 file changed, 8 insertions(+), 27 deletions(-)

+  services/settings/Attachments.jsm | 37 +++++++------------------------

+  1 file changed, 8 insertions(+), 29 deletions(-)

  

  diff --git a/services/settings/Attachments.jsm b/services/settings/Attachments.jsm

- index 2bf846e4e1..542f34f97e 100644

+ index 5ac6249f67..9dc7bcdbf0 100644

  --- a/services/settings/Attachments.jsm

  +++ b/services/settings/Attachments.jsm

  @@ -151,9 +151,10 @@ class Downloader {
@@ -915,7 +917,7 @@ 

       const {

         attachment: { filename, size, hash },

       } = record;

- @@ -357,31 +359,10 @@ class Downloader {

+ @@ -359,33 +361,10 @@ class Downloader {

      */

     async downloadAsBytes(record, options = {}) {

       const {
@@ -934,7 +936,9 @@ 

  -        if (!checkHash) {

  -          return buffer;

  -        }

- -        if (await RemoteSettingsWorker.checkContentHash(buffer, size, hash)) {

+ -        if (

+ -          await lazy.RemoteSettingsWorker.checkContentHash(buffer, size, hash)

+ -        ) {

  -          return buffer;

  -        }

  -        // Content is corrupted.
@@ -951,10 +955,10 @@ 

   

     /**

  -- 

- 2.37.0

+ 2.37.1

  

  

- From 5f475d79389de681e2eac63527a6d497b0b0da77 Mon Sep 17 00:00:00 2001

+ From 1c0858235dd0f65b00ed622eac269d35c24ee458 Mon Sep 17 00:00:00 2001

  From: grizzlyuser <grizzlyuser@protonmail.com>

  Date: Wed, 30 Dec 2020 19:22:20 +0200

  Subject: [PATCH 13/13] Disable CRLite entirely for now
@@ -979,10 +983,10 @@ 

   2 files changed, 2 insertions(+), 1 deletion(-)

  

  diff --git a/modules/libpref/init/StaticPrefList.yaml b/modules/libpref/init/StaticPrefList.yaml

- index c487b04a35..b0808338ef 100644

+ index 79267cded6..d67f43052a 100644

  --- a/modules/libpref/init/StaticPrefList.yaml

  +++ b/modules/libpref/init/StaticPrefList.yaml

- @@ -12269,7 +12269,7 @@

+ @@ -12446,7 +12446,7 @@

   # 3: Consult CRLite and enforce "Not Revoked" results, but defer to OCSP for "Revoked".

   - name: security.pki.crlite_mode

     type: RelaxedAtomicUint32
@@ -992,10 +996,10 @@ 

   

   - name: security.tls.version.min

  diff --git a/security/manager/ssl/nsNSSComponent.cpp b/security/manager/ssl/nsNSSComponent.cpp

- index 12da07c56f..39f85cf5b3 100644

+ index 0996c198d2..f8525a9325 100644

  --- a/security/manager/ssl/nsNSSComponent.cpp

  +++ b/security/manager/ssl/nsNSSComponent.cpp

- @@ -1453,6 +1453,7 @@ void nsNSSComponent::setValidationOptions(

+ @@ -1434,6 +1434,7 @@ void nsNSSComponent::setValidationOptions(

     CRLiteMode defaultCRLiteMode = CRLiteMode::Disabled;

     CRLiteMode crliteMode =

         static_cast<CRLiteMode>(StaticPrefs::security_pki_crlite_mode());
@@ -1004,5 +1008,5 @@ 

       case CRLiteMode::Disabled:

       case CRLiteMode::TelemetryOnly:

  -- 

- 2.37.0

+ 2.37.1

  

@@ -122,14 +122,6 @@ 

  index 4c59b84a7c..44d36d3b28 100644

  --- a/browser/base/content/test/static/browser_all_files_referenced.js

  +++ b/browser/base/content/test/static/browser_all_files_referenced.js

- @@ -33,7 +33,6 @@ var gExceptionPaths = [

-    "chrome://browser/content/assets/moz-vpn.svg",

-    "chrome://browser/content/assets/vpn-logo.svg",

-    "chrome://browser/content/assets/focus-promo.png",

- -  "chrome://browser/content/preferences/more-from-mozilla-qr-code-advanced.svg",

-    "chrome://browser/content/assets/klar-qr-code.svg",

-  

-    // These app marketplace icons are referenced based on the user's locale

  @@ -136,17 +135,6 @@ var whitelist = [

     // extensions/pref/autoconfig/src/nsReadConfig.cpp

     { file: "resource://gre/defaults/autoconfig/prefcalls.js" },
@@ -149,10 +141,10 @@ 

   

     // layout/mathml/nsMathMLChar.cpp

  diff --git a/browser/components/preferences/jar.mn b/browser/components/preferences/jar.mn

- index 912d9edf08..dd4697a368 100644

+ index 2131a15cee..dd4697a368 100644

  --- a/browser/components/preferences/jar.mn

  +++ b/browser/components/preferences/jar.mn

- @@ -14,12 +14,8 @@ browser.jar:

+ @@ -14,11 +14,8 @@ browser.jar:

      content/browser/preferences/containers.js

      content/browser/preferences/sync.js

      content/browser/preferences/experimental.js
@@ -162,20 +154,8 @@ 

      content/browser/preferences/findInPage.js

  -   content/browser/preferences/more-from-mozilla-qr-code-simple.svg

  -   content/browser/preferences/more-from-mozilla-qr-code-simple-cn.svg

- -   content/browser/preferences/more-from-mozilla-qr-code-advanced.svg

      content/browser/preferences/web-appearance-dark.svg

      content/browser/preferences/web-appearance-light.svg

- diff --git a/browser/components/preferences/more-from-mozilla-qr-code-advanced.svg b/browser/components/preferences/more-from-mozilla-qr-code-advanced.svg

- deleted file mode 100644

- index 4848d3e20c..0000000000

- --- a/browser/components/preferences/more-from-mozilla-qr-code-advanced.svg

- +++ /dev/null

- @@ -1,4 +0,0 @@

- -<!-- This Source Code Form is subject to the terms of the Mozilla Public

- -   - License, v. 2.0. If a copy of the MPL was not distributed with this

- -   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->

- -<svg width="113" height="113" fill="content" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M4 2h105a2 2 0 0 1 2 2v105a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2ZM0 4a4 4 0 0 1 4-4h105a4 4 0 0 1 4 4v105a4 4 0 0 1-4 4H4a4 4 0 0 1-4-4V4Zm10 6h22.448v22.448H10V10Zm6.414 3.207h-3.207V29.24H29.24V13.207H16.414ZM38.862 10h6.414v3.207h3.207v3.207h-3.207v3.207h3.207v-3.207h3.207V10h6.413v3.207h3.207V10h3.207v6.414h-9.62v6.414h3.206v3.207h3.207v-3.207h3.207V19.62h3.207v-3.207h3.207v3.207h3.207v-6.414h3.207V22.828h-3.207v3.207H70.93v6.413h-3.207v-3.207h-3.207v6.414H61.31v-6.414h-3.207v3.207h-3.206v-6.413h-6.414v-3.207h-6.414v3.207h-3.207v-3.207h-3.207v-6.414h6.414v-3.207h-3.207V10Zm6.414 22.448h-3.207v-6.413h3.207v6.413Zm-9.62 9.621h6.413v-3.207h-3.207v-3.207h6.414v-3.207h3.207v-3.207h3.207v3.207h3.207v6.414H51.69v-3.207h-3.207v3.207h3.207v3.207h-6.414v3.207h-3.207V54.897h-3.207v3.206h-3.207v-3.206h-3.207V51.69h-3.207v-3.207h3.207v-3.207h3.207v3.207h3.207v-3.207h-3.207v-3.207Zm-3.208 0v3.207h-3.207v-3.207h3.207Zm-3.207-3.207v-3.207h6.414v6.414h-3.207v-3.207h-3.207Zm-9.62 0v-3.207h6.414v3.207h3.206v3.207h-6.413v-3.207H19.62Zm0 0v3.207h-3.207v3.207h-3.207v-3.207H10v-3.207H19.621Zm6.414 19.241V51.69h3.206v3.207h3.207v3.206h-6.413Zm0 3.207v-3.207h-3.207V48.483h3.207v-3.207H19.62v3.207h-6.414v6.414h6.414v3.206h3.207v3.207h-6.414v-3.207H10v19.242h12.828v-3.207H19.62V70.93h6.414v6.414h6.413v-3.207h3.207V83.759h3.207v-3.207h3.207v16.034h16.034v3.207H48.483V103h9.62v-3.207h3.207V103h16.035v-3.207H67.724v-3.207H61.31V93.38H70.931v-3.207h12.828v6.414h-3.207V93.38h-6.414v3.207h6.414V103H93.379v-3.207h3.207v-3.207h3.207v3.207H103V93.38h-3.207v-3.207H90.172v-3.206h3.207v-3.207h3.207V70.93h-9.62v-3.207H96.586v-3.207H93.38V61.31h3.207v-3.207H93.38v-3.206h3.207V51.69h3.207V64.517H103V51.69h-3.207v-3.207H103v-3.207h-3.207v3.207h-3.207v3.207H93.38v-3.207h-3.207v3.207h-3.206v3.207h-3.207v-6.414h3.207v-3.207H96.586v-3.207h3.207v-3.207h-3.207v-3.207h-6.414v3.207H83.76v3.207h-6.414v-3.207h-3.207v6.414H70.93v3.207h3.207v-3.207H83.759v3.207h-6.414v3.207h3.207v3.207H70.93v3.206H80.552v3.207h3.207v-3.207h3.207v3.207h3.206v3.207h-3.206v3.207h-3.207v-3.207h-6.414V61.31H70.93v3.207h3.207v3.207h-6.414v6.414h-3.207V70.93H61.31v3.207h-3.207V70.93h-3.206v3.207H51.69V83.759h-3.207v3.207h-3.207v-6.414h-3.207v-3.207h3.207v-3.207h-3.207v3.207h-3.207V70.93h-3.207v-6.414h3.207v3.207h3.207V61.31h-6.414v-3.207h-3.207v3.207h-6.413Zm0 3.207V61.31h-3.207v3.207H19.62v3.207h3.207v-3.207h3.207Zm3.206 6.414h3.207v3.207h-3.207V70.93Zm0 0v-3.207h3.207v-3.207h-6.413v6.414h3.206Zm25.656 16.035h-6.414v3.206h-3.207v3.207H58.103v-3.207h3.207v-3.206h3.207v-3.207h3.207v6.413h3.207V83.76h-3.207v-3.207h-3.207v-3.207H61.31v3.207h-3.207v3.207h-3.206v3.207Zm3.206 0h3.207v-3.207h3.207v-3.207H61.31v3.207h-3.207v3.207Zm0 0h-3.206v3.206h3.206v-3.206Zm-3.206-12.828v3.207h3.206v-3.207h-3.206Zm28.862-3.207v-3.207h-6.414v3.207H70.93v3.207h6.414V70.93h6.414Zm0 0v3.207h3.207V70.93h-3.207Zm6.413-16.034h-3.206v3.206h3.206v-3.206Zm-6.413 3.206v-3.206h-3.207v3.206h3.207Zm6.413-19.24v3.206h3.207v-3.207h-3.207Zm0 16.034V51.69h3.207v3.207h-3.207Zm3.207 28.862v-3.207h-3.207v3.207h3.207Zm-3.207 9.62v6.414h3.207V93.38h-3.207Zm0 0v-3.207h-3.206v3.207h3.206Zm-6.413 3.207v3.207h3.207v-3.207h-3.207ZM54.897 38.862H64.517v3.207h-9.62v-3.207Zm19.24-25.655h-6.413V10h6.414v3.207Zm-12.827 9.62h-3.207v-3.206h3.207v3.207ZM80.552 10H103v22.448H80.552V10Zm6.413 3.207H83.76V29.24H99.793V13.207H86.966Zm-70.551 3.207H26.035V26.035H16.414V16.414Zm70.552 0H96.586V26.035h-9.62V16.414ZM35.656 29.24h3.206v3.207h-3.207v-3.207Zm38.482 0h3.207v6.414h-3.207v-6.414Zm-6.414 6.414h3.207v3.207h-3.207v-3.207Zm32.07 32.07H103V77.344h-3.207V67.724Zm-6.415 6.413h-3.207v3.207h3.207v-3.207Zm-19.241 3.207H70.93v3.207h3.207v-3.207Zm6.414 0h-3.207V86.966H86.966V77.345h-6.414ZM10 80.552h22.448V103H10V80.552Zm6.414 3.207h-3.207V99.793H29.24V83.76H16.414Zm64.138-3.207h3.207v3.207h-3.207v-3.207Zm-64.138 6.413H26.035V96.587H16.414v-9.62Zm19.241 0h3.207v6.414h-3.207v-6.413Zm6.414 12.828h3.207V103h-3.207v-3.207Z" fill="#141422"/><path d="M65.068 53.042c-.403-.968-1.219-2.014-1.858-2.344.456.882.772 1.83.938 2.81l.002.015c-1.048-2.609-2.822-3.663-4.273-5.954a11.08 11.08 0 0 1-.218-.355 2.928 2.928 0 0 1-.102-.19 1.685 1.685 0 0 1-.144-.383.024.024 0 0 0-.015-.008.032.032 0 0 0-.017 0l-.005.002-.007.004.004-.006c-2.326 1.361-3.116 3.882-3.187 5.144a4.633 4.633 0 0 0-2.55.982 2.782 2.782 0 0 0-.239-.181 4.295 4.295 0 0 1-.026-2.264c-.854.414-1.613 1-2.229 1.723h-.004c-.367-.465-.341-1.999-.32-2.32a1.656 1.656 0 0 0-.31.165c-.323.231-.626.49-.904.775a8.089 8.089 0 0 0-.866 1.039v.001-.002a7.821 7.821 0 0 0-1.242 2.806l-.013.06c-.017.082-.08.49-.091.579l-.002.02a8.82 8.82 0 0 0-.15 1.277v.048a9.26 9.26 0 0 0 18.385 1.566c.016-.12.029-.238.042-.359a9.523 9.523 0 0 0-.6-4.652v.002ZM54.395 60.29c.043.02.083.043.128.063l.006.004a5.116 5.116 0 0 1-.134-.067Zm9.755-6.765v-.01l.001.01h-.001Z" fill="url(#a)"/><path d="M65.068 53.042c-.403-.968-1.219-2.014-1.858-2.344.456.883.772 1.83.938 2.81v.009l.002.01a8.387 8.387 0 0 1-.289 6.25c-1.061 2.277-3.629 4.611-7.65 4.497-4.344-.123-8.172-3.348-8.886-7.57-.13-.666 0-1.003.065-1.544-.089.42-.139.848-.148 1.277v.048a9.26 9.26 0 0 0 18.385 1.566c.016-.12.029-.238.042-.358a9.525 9.525 0 0 0-.6-4.652h-.001Z" fill="url(#b)"/><path d="M65.068 53.042c-.403-.968-1.219-2.014-1.858-2.344.456.883.772 1.83.938 2.81v.009l.002.01a8.387 8.387 0 0 1-.289 6.25c-1.061 2.277-3.629 4.611-7.65 4.497-4.344-.123-8.172-3.348-8.886-7.57-.13-.666 0-1.003.065-1.544-.089.42-.139.848-.148 1.277v.048a9.26 9.26 0 0 0 18.385 1.566c.016-.12.029-.238.042-.358a9.525 9.525 0 0 0-.6-4.652h-.001Z" fill="url(#c)"/><path d="m60.566 54.129.058.042a5.043 5.043 0 0 0-.86-1.121c-2.88-2.88-.755-6.241-.397-6.413l.004-.006c-2.326 1.362-3.116 3.883-3.187 5.145.108-.008.215-.017.325-.017a4.673 4.673 0 0 1 4.057 2.37Z" fill="url(#d)"/><path d="M56.514 54.705c-.015.23-.83 1.025-1.114 1.025-2.633 0-3.06 1.593-3.06 1.593.116 1.341 1.05 2.446 2.18 3.03.052.026.105.05.157.074.09.04.181.077.272.111a4.12 4.12 0 0 0 1.205.233c4.616.216 5.51-5.52 2.179-7.185a3.196 3.196 0 0 1 2.233.542 4.673 4.673 0 0 0-4.058-2.37c-.11 0-.217.01-.325.017a4.633 4.633 0 0 0-2.55.982c.142.12.301.28.637.61.628.62 2.24 1.26 2.243 1.336l.001.002Z" fill="url(#e)"/><path d="M56.514 54.705c-.015.23-.83 1.025-1.114 1.025-2.633 0-3.06 1.593-3.06 1.593.116 1.341 1.05 2.446 2.18 3.03.052.026.105.05.157.074.09.04.181.077.272.111a4.12 4.12 0 0 0 1.205.233c4.616.216 5.51-5.52 2.179-7.185a3.196 3.196 0 0 1 2.233.542 4.673 4.673 0 0 0-4.058-2.37c-.11 0-.217.01-.325.017a4.633 4.633 0 0 0-2.55.982c.142.12.301.28.637.61.628.62 2.24 1.26 2.243 1.336l.001.002Z" fill="url(#f)"/><path d="M53.202 52.452c.075.047.137.09.192.127a4.295 4.295 0 0 1-.026-2.264c-.855.414-1.614 1-2.23 1.723.046-.001 1.389-.025 2.064.414Z" fill="url(#g)"/><path d="M47.323 56.705c.715 4.222 4.542 7.447 8.886 7.57 4.021.113 6.59-2.222 7.65-4.498a8.387 8.387 0 0 0 .289-6.25v-.009c0-.007-.002-.01 0-.009l.002.016c.328 2.145-.763 4.222-2.469 5.629l-.005.012c-3.324 2.707-6.504 1.633-7.146 1.195a4.961 4.961 0 0 1-.135-.067c-1.938-.927-2.738-2.69-2.566-4.206a2.379 2.379 0 0 1-2.194-1.38 3.493 3.493 0 0 1 3.405-.136 4.611 4.611 0 0 0 3.476.136c-.003-.075-1.615-.716-2.243-1.335-.336-.331-.495-.49-.637-.61a2.78 2.78 0 0 0-.238-.181c-.055-.038-.117-.078-.192-.127-.675-.44-2.018-.415-2.063-.414h-.004c-.367-.465-.341-2-.32-2.32a1.66 1.66 0 0 0-.31.165c-.323.23-.626.49-.904.775-.319.32-.61.667-.87 1.036v.002-.002a7.82 7.82 0 0 0-1.242 2.805c-.005.019-.334 1.457-.172 2.203h.002Z" fill="url(#h)"/><path d="M59.763 53.05c.339.331.628.71.86 1.122.052.039.099.077.14.114 2.099 1.935.999 4.67.917 4.864 1.705-1.405 2.795-3.483 2.468-5.629-1.047-2.611-2.824-3.665-4.272-5.956a11.265 11.265 0 0 1-.218-.355 2.923 2.923 0 0 1-.102-.191 1.686 1.686 0 0 1-.144-.383.024.024 0 0 0-.015-.008.035.035 0 0 0-.018 0l-.004.003-.007.004c-.358.17-2.483 3.533.397 6.41l-.002.004Z" fill="url(#i)"/><path d="M60.762 54.287a1.93 1.93 0 0 0-.139-.114l-.057-.042a3.196 3.196 0 0 0-2.233-.542c3.33 1.665 2.437 7.4-2.179 7.184a4.12 4.12 0 0 1-1.205-.232 4.906 4.906 0 0 1-.428-.186l.007.004c.643.44 3.822 1.513 7.146-1.195l.005-.012c.083-.193 1.183-2.929-.917-4.864v-.001Z" fill="url(#j)"/><path d="M52.34 57.321s.427-1.593 3.06-1.593c.285 0 1.1-.794 1.114-1.025a4.612 4.612 0 0 1-3.476-.136 3.492 3.492 0 0 0-3.405.136 2.378 2.378 0 0 0 2.194 1.38c-.172 1.514.629 3.278 2.566 4.206.043.02.084.043.128.063-1.13-.585-2.065-1.69-2.181-3.03Z" fill="url(#k)"/><path d="M65.068 53.042c-.403-.968-1.219-2.014-1.858-2.344.456.882.772 1.83.938 2.81l.002.015c-1.048-2.609-2.822-3.663-4.273-5.954a11.265 11.265 0 0 1-.218-.355 2.923 2.923 0 0 1-.102-.19 1.685 1.685 0 0 1-.144-.383.024.024 0 0 0-.015-.008.033.033 0 0 0-.017 0l-.005.002-.007.004.004-.006c-2.326 1.361-3.116 3.882-3.187 5.144.108-.008.215-.017.325-.017a4.673 4.673 0 0 1 4.057 2.37 3.197 3.197 0 0 0-2.233-.542c3.331 1.665 2.437 7.4-2.178 7.184a4.117 4.117 0 0 1-1.205-.232 4.828 4.828 0 0 1-.429-.186l.007.004a4.825 4.825 0 0 1-.135-.067c.043.02.084.043.128.063-1.13-.584-2.064-1.69-2.18-3.03 0 0 .427-1.593 3.06-1.593.285 0 1.099-.794 1.114-1.024-.004-.076-1.616-.717-2.244-1.336-.336-.331-.495-.49-.636-.61a2.765 2.765 0 0 0-.24-.181 4.293 4.293 0 0 1-.025-2.264c-.855.414-1.614 1-2.23 1.723h-.004c-.366-.465-.34-1.999-.32-2.32a1.653 1.653 0 0 0-.309.165 6.75 6.75 0 0 0-.905.775 8.08 8.08 0 0 0-.866 1.039v.001-.002a7.82 7.82 0 0 0-1.242 2.805l-.013.062c-.017.081-.095.495-.106.584-.072.427-.117.858-.137 1.29v.049a9.261 9.261 0 0 0 18.386 1.566l.042-.359a9.525 9.525 0 0 0-.6-4.652Zm-.919.475.002.01-.002-.01Z" fill="url(#l)"/><defs><radialGradient id="b" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(63.247 48.782) scale(19.3057)"><stop offset=".129" stop-color="#FFBD4F"/><stop offset=".186" stop-color="#FFAC31"/><stop offset=".247" stop-color="#FF9D17"/><stop offset=".283" stop-color="#FF980E"/><stop offset=".403" stop-color="#FF563B"/><stop offset=".467" stop-color="#FF3750"/><stop offset=".71" stop-color="#F5156C"/><stop offset=".782" stop-color="#EB0878"/><stop offset=".86" stop-color="#E50080"/></radialGradient><radialGradient id="c" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(56.08 56.666) scale(19.3057)"><stop offset=".3" stop-color="#960E18"/><stop offset=".351" stop-color="#B11927" stop-opacity=".74"/><stop offset=".435" stop-color="#DB293D" stop-opacity=".343"/><stop offset=".497" stop-color="#F5334B" stop-opacity=".094"/><stop offset=".53" stop-color="#FF3750" stop-opacity="0"/></radialGradient><radialGradient id="d" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(58.468 44.481) scale(13.9847)"><stop offset=".132" stop-color="#FFF44F"/><stop offset=".252" stop-color="#FFDC3E"/><stop offset=".506" stop-color="#FF9D12"/><stop offset=".526" stop-color="#FF980E"/></radialGradient><radialGradient id="e" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(53.929 61.684) scale(9.19171)"><stop offset=".353" stop-color="#3A8EE6"/><stop offset=".472" stop-color="#5C79F0"/><stop offset=".669" stop-color="#9059FF"/><stop offset="1" stop-color="#C139E6"/></radialGradient><radialGradient id="f" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="matrix(4.73773 -1.14544 1.34103 5.5467 57.013 55.01)"><stop offset=".206" stop-color="#9059FF" stop-opacity="0"/><stop offset=".278" stop-color="#8C4FF3" stop-opacity=".064"/><stop offset=".747" stop-color="#7716A8" stop-opacity=".45"/><stop offset=".975" stop-color="#6E008B" stop-opacity=".6"/></radialGradient><radialGradient id="g" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(55.84 48.065) scale(6.61363)"><stop stop-color="#FFE226"/><stop offset=".121" stop-color="#FFDB27"/><stop offset=".295" stop-color="#FFC82A"/><stop offset=".502" stop-color="#FFA930"/><stop offset=".732" stop-color="#FF7E37"/><stop offset=".792" stop-color="#FF7139"/></radialGradient><radialGradient id="h" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(61.097 43.764) scale(28.2178)"><stop offset=".113" stop-color="#FFF44F"/><stop offset=".456" stop-color="#FF980E"/><stop offset=".622" stop-color="#FF5634"/><stop offset=".716" stop-color="#FF3647"/><stop offset=".904" stop-color="#E31587"/></radialGradient><radialGradient id="i" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="matrix(2.1701 20.56421 -13.49616 1.42422 58.751 45.329)"><stop stop-color="#FFF44F"/><stop offset=".06" stop-color="#FFE847"/><stop offset=".168" stop-color="#FFC830"/><stop offset=".304" stop-color="#FF980E"/><stop offset=".356" stop-color="#FF8B16"/><stop offset=".455" stop-color="#FF672A"/><stop offset=".57" stop-color="#FF3647"/><stop offset=".737" stop-color="#E31587"/></radialGradient><radialGradient id="j" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(55.84 50.454) scale(17.614)"><stop offset=".137" stop-color="#FFF44F"/><stop offset=".48" stop-color="#FF980E"/><stop offset=".592" stop-color="#FF5634"/><stop offset=".655" stop-color="#FF3647"/><stop offset=".904" stop-color="#E31587"/></radialGradient><radialGradient id="k" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(60.38 51.41) scale(19.2794)"><stop offset=".094" stop-color="#FFF44F"/><stop offset=".231" stop-color="#FFE141"/><stop offset=".509" stop-color="#FFAF1E"/><stop offset=".626" stop-color="#FF980E"/></radialGradient><linearGradient id="a" x1="63.842" y1="49.59" x2="48.468" y2="64.423" gradientUnits="userSpaceOnUse"><stop offset=".048" stop-color="#FFF44F"/><stop offset=".111" stop-color="#FFE847"/><stop offset=".225" stop-color="#FFC830"/><stop offset=".368" stop-color="#FF980E"/><stop offset=".401" stop-color="#FF8B16"/><stop offset=".462" stop-color="#FF672A"/><stop offset=".534" stop-color="#FF3647"/><stop offset=".705" stop-color="#E31587"/></linearGradient><linearGradient id="l" x1="63.656" y1="49.512" x2="50.577" y2="62.593" gradientUnits="userSpaceOnUse"><stop offset=".167" stop-color="#FFF44F" stop-opacity=".8"/><stop offset=".266" stop-color="#FFF44F" stop-opacity=".634"/><stop offset=".489" stop-color="#FFF44F" stop-opacity=".217"/><stop offset=".6" stop-color="#FFF44F" stop-opacity="0"/></linearGradient></defs></svg>

- \ No newline at end of file

  diff --git a/browser/components/preferences/more-from-mozilla-qr-code-simple-cn.svg b/browser/components/preferences/more-from-mozilla-qr-code-simple-cn.svg

  deleted file mode 100644

  index 5052db9702..0000000000
@@ -1066,10 +1046,10 @@ 

                 </p>

               </div>

               <a target="_blank" id="get-vpn-link" data-l10n-id="get-vpn-link"></a>

- diff --git a/browser/components/protections/content/vpn-card.js b/browser/components/protections/content/vpn-card.js

+ diff --git a/browser/components/protections/content/vpn-card.mjs b/browser/components/protections/content/vpn-card.mjs

  index 2417f1a641..698c48ccc3 100644

- --- a/browser/components/protections/content/vpn-card.js

- +++ b/browser/components/protections/content/vpn-card.js

+ --- a/browser/components/protections/content/vpn-card.mjs

+ +++ b/browser/components/protections/content/vpn-card.mjs

  @@ -23,22 +23,6 @@ export default class VPNCard {

       vpnLink.addEventListener("click", () => {

         this.doc.sendTelemetryEvent("click", "vpn_card_link");

file modified
+5 -4
@@ -60,7 +60,7 @@ 

  

  pkgname=iceweasel

  epoch=1

- pkgver=102.0

+ pkgver=103.0

  pkgrel=1

  pkgrel+=.parabola1

  _brandingver=102.0-1
@@ -99,16 +99,16 @@ 

  source_i686=('avoid-libxul-OOM-python-check.patch'

               'rust-static-disable-network-test-on-static-libraries.patch'

               'firefox-99.0.1-fdlibm-double.patch')

- sha256sums=('01797f04bd8d65f4c7f628d7ce832bf52a0874433886e4d0d78ef33c1ca66abf'

+ sha256sums=('acc41d050560db4c4177ea86e2d00e47d74229041fea4c02c0e9e87e64093773'

              'SKIP'

              'a6857ad2f2e2091c6c4fdcde21a59fbeb0138914c0e126df64b50a5af5ff63be'

              '9cdc2602661717712092d28bb494e5b48e518cb930898aca85eaf21f91f7ef58')

  sha256sums+=('d29c194ed7b3b4fa0f511866723118938c2be40077b4e9aadf8b3e6bfff91049'

               'SKIP'

-              '77b79ce95a560d371b08925a4f8c005b38e45936f61c8e4a4378d5ac56313cba'

+              '1c385fa5b2e2dd1cb7404c2d101de499a6b4b1324ddc051c5fb94aea6c24b42a'

               'a2c71759290dd48c87bf8aacb681040dcaefdabe0d57317de361d2d2d509664b'

               'e192458a2a9878483984e1400bb3c66df369adfbf6f144b90445f80973c32ed1'

-              'a6a0bf8296d42a0ea2664efd45e9131df1f19fc6199724ec78d66119589850dd'

+              '2697d54f827a493f7d74b8b8b01a10c70fd286a02924faae0d09c5f432a841a8'

               '6a0250c20a6f4cbf0ff1320c194342fe691ece56959d87de41be8f82a8feca65'

               'c93ce98e1cb64033079343ff1f3037fab6a3bc6d3eb5bc14c5edb70e2d45965d')

  sha256sums_armv7h=('2d4d91f7e35d0860225084e37ec320ca6cae669f6c9c8fe7735cdbd542e3a7c9')
@@ -467,6 +467,7 @@ 

    echo "applying 9004-FSDG-misc.patch"

    patch -Np1 --no-backup-if-mismatch -i "${srcdir}"/9004-FSDG-misc.patch

    rm toolkit/crashreporter/tools/upload_symbols.py

+   rm -frv third_party/rust/winapi-{i686,x86_64}-pc-windows-gnu/**/*.a

  

  

    ## patching sanity checks ##

@@ -1,5 +1,55 @@ 

  # Maintainers: Parabola hackers <dev@lists.parabola.nu>

  

+ # Rationale: This package enables to run 64bit kernels with 32bit rootfs.

+ #

+ # For armv7k/aarch64, we have no aarch64 port yet, and the 32bit

+ # kernels don't work for 64bit computers (for instance the dtb for

+ # 64bit computers are not shipped).

+ #

+ # In turn if we can boot Parabola on these computers, it enables

+ # people to work on an aarch64 port more easily as chrooting in 64bit

+ # rootfs from 32bit rootfs work when we have a 64bit kernel (tested on

+ # an x86_64 computer with a Parabola i686 rootfs and a Parabola x86_64

+ # chroot).

+ #

+ # This enable to make rootfs that work on both 64bit and 32bit

+ # computers. In that case the user will still need to select the right

+ # kernel at boot.

+ #

+ # Generally speaking it also enable users to benefit from many of the

+ # improvements of 64bit kernels (ability to chroot in 64bit rootfs,

+ # better security, 4GiB address space per process instead of 3GiB for

+ # 32bit rootfs, etc) without having to reinstall everything. In

+ # addition, there was and is still no conversion guide to convert a

+ # 32bit Parabola installation to 64bit), and in some cases (lot of

+ # self-built software in /usr/local, PostgreSQL database, etc) the

+ # migration to 64bit requires some work.

+ #

+ # As for using i686 for new installation on x86_64 computers, it can

+ # enable people doing that to find and fix bugs on Parabola i686 to

+ # enable people with 32bit-only computers (like Libreboot compatible

+ # I945 Thinkpads) to still be able to use Parabola.

+ #

+ # Having both architectures (arm and x86) in the same PKGBUILD enables

+ # to more widely test this package (if we find issues on x86, they'll

+ # most likely apply to arm as well). Though it can become a problem if

+ # we need different kernel versions for both architectures.

+ #

+ # Status:

+ # - Tested on both arm and x86.

+ # - The build is currently broken on ARM due to a missing cross

+ #   compiler for armv7h (it was accidentally removed and it doesn't

+ #   build anymore).

+ # - External modules (like Wireguard or tp_smapi) also need to be

+ #   cross compiled. So modules for linux-libre-64 need to be added

+ #   (like tp_smapi-64) and dkms packages need to be adapted to also

+ #   work for this kernel.

+ # - Some software (like building Guix) break with 32bit rootfs and

+ #   64bit kernels due to wrong assumption about the number of bits,

+ #   through other software (like building rust with mrustc) work

+ #   better (here because we have 3GiB instead of 3GiB of memory per

+ #   process). Most software is not affected though.

+ 

  # Based on the linux-libre package

  

  _replacesarchkernel=('linux%') # '%' gets replaced with kernel suffix

@@ -9,7 +9,7 @@ 

  _replacesoldmodules=() # '%' gets replaced with kernel suffix

  

  pkgbase=linux-libre-hardened

- pkgver=5.18.5.hardened1

+ pkgver=5.18.12.hardened1

  pkgrel=1

  pkgdesc='Security-Hardened Linux-libre'

  url='https://linux-libre.fsfla.org/'
@@ -27,7 +27,6 @@ 

    "https://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver%.*}-gnu/patch-${_srcname##*-}-gnu-${pkgver%.*}-gnu.xz"{,.sign}

    "https://github.com/anthraxx/linux-hardened/releases/download/${_srctag}/linux-hardened-${_srctag}.patch"{,.sig}

    "https://repo.parabola.nu/other/linux-libre/logos/logo_linux_"{clut224.ppm,vga16.ppm,mono.pbm}{,.sig}

-   ALSA-memalloc-Drop-x86-specific-hack-for-WC-allocations.patch::https://lore.kernel.org/all/87bkur1nil.wl-tiwai@suse.de/raw

    config         # the main kernel config file

  

    # maintain the TTY over USB disconnects
@@ -46,9 +45,9 @@ 

  )

  sha512sums=('13be3762fffd74c63eeb23b0d34b994a3e5198bfdbda4f013b38f8d3edd24b9bbebe5a4bfde0f5191aa1cf2678e4517f3b5540a40b30ebc05da1f6708cbb98bb'

              'SKIP'

-             '9355c0f22606c0401e8a01d6e22f0fa6e97b69a9fce6d991235da6430907fb6a788fca30bd48e5cbb743cc4a211a40806c896f660db7432e7bc85ba7634b5d06'

+             '8093255d5508830de397707ad492cdb90c205d8a2eebb3f9b5a2eb32a51493dbfaf27f8fb546faa1bee41b3632c635e9e24b702f54ad4a28ebb10c0b4a7cb196'

              'SKIP'

-             'f871eb1e68a382e183951f8e3ddc59b7cf09ddc44e1506282404dc2de11885dca6e21ef998d16cb1b3dd829e0da9096b0d02524939e7290591b52695879f6e0d'

+             '1bd6ae6b24bdabe56c37cc6fac7c6d43bcb2c62acaa8b80710482a94251528e91f6c85ab177f7a49fb7c3e591c64cc2976312e1ba9cd37c6139bd4f44ef1d53e'

              'SKIP'

              '13cb5bc42542e7b8bb104d5f68253f6609e463b6799800418af33eb0272cc269aaa36163c3e6f0aacbdaaa1d05e2827a4a7c4a08a029238439ed08b89c564bb3'

              'SKIP'
@@ -56,8 +55,7 @@ 

              'SKIP'

              '267295aa0cea65684968420c68b32f1a66a22d018b9d2b2c1ef14267bcf4cb68aaf7099d073cbfefe6c25c8608bdcbbd45f7ac8893fdcecbf1e621abdfe9ecc1'

              'SKIP'

-             'd52c195b0d2ca63238e61f019b392840ad6c163223897e781056f5ac4f78eb8587bed30494729b54329313da525fd4f605b367da420c4a2ef1aaaa1aef5efdbb'

-             '903228a7ddb6b504a91125e1af2d89ef3264803731cdd1bc16adab809ac39a42b99c14e360b912cbcc8a61c02a02c5b589aa37d1a8d611adb8c488f4dd1a5fd4'

+             'db147db1f15f82a365275e9042a47617bb32d4bf9c25575d1151d478a90668b604c26ab415c5438c11a32777d2f63f7fc63ab9d61148b13751470a9971223896'

              '02af4dd2a007e41db0c63822c8ab3b80b5d25646af1906dc85d0ad9bb8bbf5236f8e381d7f91cf99ed4b0978c50aee37cb9567cdeef65b7ec3d91b882852b1af'

              'b8fe56e14006ab866970ddbd501c054ae37186ddc065bb869cf7d18db8c0d455118d5bda3255fb66a0dde38b544655cfe9040ffe46e41d19830b47959b2fb168')

    
@@ -108,8 +106,7 @@ 

  

  build() {

    cd $_srcname

-   make all

-   make htmldocs

+   make htmldocs all

  }

  

  _package() {

@@ -1,6 +1,6 @@ 

  #

  # Automatically generated file; DO NOT EDIT.

- # Linux/x86 5.18.5-gnu-hardened1 Kernel Configuration

+ # Linux/x86 5.18.12-gnu-hardened1 Kernel Configuration

  #

  CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.1.0"

  CONFIG_CC_IS_GCC=y
@@ -194,6 +194,8 @@ 

  CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y

  CONFIG_CC_HAS_INT128=y

  CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5"

+ CONFIG_GCC12_NO_ARRAY_BOUNDS=y

+ CONFIG_CC_NO_ARRAY_BOUNDS=y

  CONFIG_ARCH_SUPPORTS_INT128=y

  CONFIG_NUMA_BALANCING=y

  CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
@@ -10314,6 +10316,7 @@ 

  CONFIG_CRYPTO_LIB_SM4=m

  # end of Crypto library routines

  

+ CONFIG_LIB_MEMNEQ=y

  CONFIG_CRC_CCITT=y

  CONFIG_CRC16=m

  CONFIG_CRC_T10DIF=y

@@ -1,7 +1,7 @@ 

- From 4f6107494a5c5840961a246d8de3c7441d75c6b1 Mon Sep 17 00:00:00 2001

+ From 63cec1d1efdb31caeef17411c7560e8b0f941073 Mon Sep 17 00:00:00 2001

  From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>

  Date: Mon, 16 Sep 2019 04:53:20 +0200

- Subject: [PATCH 1/7] ZEN: Add sysctl and CONFIG to disallow unprivileged

+ Subject: [PATCH 1/3] ZEN: Add sysctl and CONFIG to disallow unprivileged

   CLONE_NEWUSER

  

  Our default behavior continues to match the vanilla kernel.
@@ -36,10 +36,10 @@ 

   {

   	return &init_user_ns;

  diff --git a/init/Kconfig b/init/Kconfig

- index e9119bf54b1f..a1a5a68aea07 100644

+ index fa63cc019ebf..5aa29feccae3 100644

  --- a/init/Kconfig

  +++ b/init/Kconfig

- @@ -1231,6 +1231,22 @@ config USER_NS

+ @@ -1249,6 +1249,22 @@ config USER_NS

   

   	  If unsure, say N.

   
@@ -63,12 +63,12 @@ 

   	bool "PID Namespaces"

   	default y

  diff --git a/kernel/fork.c b/kernel/fork.c

- index f1e89007f228..49144b49a3d1 100644

+ index 0d8abfb9e0f4..bd7c215e315f 100644

  --- a/kernel/fork.c

  +++ b/kernel/fork.c

- @@ -98,6 +98,10 @@

-  #include <linux/io_uring.h>

+ @@ -99,6 +99,10 @@

   #include <linux/bpf.h>

+  #include <linux/sched/mm.h>

   

  +#ifdef CONFIG_USER_NS

  +#include <linux/user_namespace.h>
@@ -77,7 +77,7 @@ 

   #include <asm/pgalloc.h>

   #include <linux/uaccess.h>

   #include <asm/mmu_context.h>

- @@ -1922,6 +1926,10 @@ static __latent_entropy struct task_struct *copy_process(

+ @@ -1992,6 +1996,10 @@ static __latent_entropy struct task_struct *copy_process(

   	if ((clone_flags & (CLONE_NEWUSER|CLONE_FS)) == (CLONE_NEWUSER|CLONE_FS))

   		return ERR_PTR(-EINVAL);

   
@@ -88,7 +88,7 @@ 

   	/*

   	 * Thread groups must share signals as well, and detached threads

   	 * can only be started up within the thread group.

- @@ -3036,6 +3044,12 @@ int ksys_unshare(unsigned long unshare_flags)

+ @@ -3128,6 +3136,12 @@ int ksys_unshare(unsigned long unshare_flags)

   	if (unshare_flags & CLONE_NEWNS)

   		unshare_flags |= CLONE_FS;

   
@@ -102,7 +102,7 @@ 

   	if (err)

   		goto bad_unshare_out;

  diff --git a/kernel/sysctl.c b/kernel/sysctl.c

- index 730ab56d9e92..6cf4e5c36ec9 100644

+ index c42ba2d669dc..a6ddbf02a809 100644

  --- a/kernel/sysctl.c

  +++ b/kernel/sysctl.c

  @@ -91,6 +91,9 @@
@@ -115,7 +115,7 @@ 

   

   #if defined(CONFIG_SYSCTL)

   

- @@ -1814,6 +1817,15 @@ static struct ctl_table kern_table[] = {

+ @@ -1806,6 +1809,15 @@ static struct ctl_table kern_table[] = {

   		.mode		= 0644,

   		.proc_handler	= proc_dointvec,

   	},
@@ -150,5 +150,5 @@ 

   static DEFINE_MUTEX(userns_state_mutex);

   

  -- 

- 2.36.1

+ 2.37.1

  

@@ -0,0 +1,107 @@ 

+ From 4b81eecd4c636d953aaf4ebafd8171716f4c61fe Mon Sep 17 00:00:00 2001

+ From: Bryan Cain <bryancain3@gmail.com>

+ Date: Thu, 5 May 2022 13:12:21 -0600

+ Subject: [PATCH 2/3] HID: apple: Properly handle function keys on Keychron

+  keyboards

+ MIME-Version: 1.0

+ Content-Type: text/plain; charset=UTF-8

+ Content-Transfer-Encoding: 8bit

+ 

+ Keychron's C-series and K-series of keyboards copy the vendor and

+ product IDs of an Apple keyboard, but only behave like that device when

+ set to "Mac" mode. In "Windows" mode, the Fn key doesn't generate a

+ scancode, so it's impossible to use the F1-F12 keys when fnmode is set

+ to its default value of 1.

+ 

+ To fix this, make fnmode default to the new value of 3, which behaves

+ like fnmode=2 for Keychron keyboards and like fnmode=1 for actual Apple

+ keyboards. This way, Keychron devices are fully usable in both "Windows"

+ and "Mac" modes, while behavior is unchanged for everything else.

+ 

+ Signed-off-by: Bryan Cain <bryancain3@gmail.com>

+ Reviewed-by: Hans de Goede <hdegoede@redhat.com>

+ Tested-by: José Expósito <jose.exposito89@gmail.com>

+ Signed-off-by: Jiri Kosina <jkosina@suse.cz>

+ ---

+  drivers/hid/hid-apple.c | 22 ++++++++++++++++++----

+  1 file changed, 18 insertions(+), 4 deletions(-)

+ 

+ diff --git a/drivers/hid/hid-apple.c b/drivers/hid/hid-apple.c

+ index 0cf35caee9fa..42a568902f49 100644

+ --- a/drivers/hid/hid-apple.c

+ +++ b/drivers/hid/hid-apple.c

+ @@ -21,6 +21,7 @@

+  #include <linux/module.h>

+  #include <linux/slab.h>

+  #include <linux/timer.h>

+ +#include <linux/string.h>

+  

+  #include "hid-ids.h"

+  

+ @@ -35,16 +36,17 @@

+  #define APPLE_NUMLOCK_EMULATION	BIT(8)

+  #define APPLE_RDESC_BATTERY	BIT(9)

+  #define APPLE_BACKLIGHT_CTL	BIT(10)

+ +#define APPLE_IS_KEYCHRON	BIT(11)

+  

+  #define APPLE_FLAG_FKEY		0x01

+  

+  #define HID_COUNTRY_INTERNATIONAL_ISO	13

+  #define APPLE_BATTERY_TIMEOUT_MS	60000

+  

+ -static unsigned int fnmode = 1;

+ +static unsigned int fnmode = 3;

+  module_param(fnmode, uint, 0644);

+  MODULE_PARM_DESC(fnmode, "Mode of fn key on Apple keyboards (0 = disabled, "

+ -		"[1] = fkeyslast, 2 = fkeysfirst)");

+ +		"1 = fkeyslast, 2 = fkeysfirst, [3] = auto)");

+  

+  static int iso_layout = -1;

+  module_param(iso_layout, int, 0644);

+ @@ -349,6 +351,7 @@ static int hidinput_apple_event(struct hid_device *hid, struct input_dev *input,

+  	const struct apple_key_translation *trans, *table;

+  	bool do_translate;

+  	u16 code = 0;

+ +	unsigned int real_fnmode;

+  

+  	u16 fn_keycode = (swap_fn_leftctrl) ? (KEY_LEFTCTRL) : (KEY_FN);

+  

+ @@ -359,7 +362,13 @@ static int hidinput_apple_event(struct hid_device *hid, struct input_dev *input,

+  		return 1;

+  	}

+  

+ -	if (fnmode) {

+ +	if (fnmode == 3) {

+ +		real_fnmode = (asc->quirks & APPLE_IS_KEYCHRON) ? 2 : 1;

+ +	} else {

+ +		real_fnmode = fnmode;

+ +	}

+ +

+ +	if (real_fnmode) {

+  		if (hid->product == USB_DEVICE_ID_APPLE_ALU_WIRELESS_ANSI ||

+  		    hid->product == USB_DEVICE_ID_APPLE_ALU_WIRELESS_ISO ||

+  		    hid->product == USB_DEVICE_ID_APPLE_ALU_WIRELESS_JIS ||

+ @@ -406,7 +415,7 @@ static int hidinput_apple_event(struct hid_device *hid, struct input_dev *input,

+  

+  			if (!code) {

+  				if (trans->flags & APPLE_FLAG_FKEY) {

+ -					switch (fnmode) {

+ +					switch (real_fnmode) {

+  					case 1:

+  						do_translate = !asc->fn_on;

+  						break;

+ @@ -660,6 +669,11 @@ static int apple_input_configured(struct hid_device *hdev,

+  		asc->quirks &= ~APPLE_HAS_FN;

+  	}

+  

+ +	if (strncmp(hdev->name, "Keychron", 8) == 0) {

+ +		hid_info(hdev, "Keychron keyboard detected; function keys will default to fnmode=2 behavior\n");

+ +		asc->quirks |= APPLE_IS_KEYCHRON;

+ +	}

+ +

+  	return 0;

+  }

+  

+ -- 

+ 2.37.1

+ 

@@ -1,94 +0,0 @@ 

- From 5e79fc7d70e5c6e409254060066e7ab1b1d1a768 Mon Sep 17 00:00:00 2001

- From: "Jason A. Donenfeld" <Jason@zx2c4.com>

- Date: Wed, 23 Mar 2022 23:09:30 -0600

- Subject: [PATCH 2/7] random: treat bootloader trust toggle the same way as cpu

-  trust toggle

- 

- If CONFIG_RANDOM_TRUST_CPU is set, the RNG initializes using RDRAND.

- But, the user can disable (or enable) this behavior by setting

- `random.trust_cpu=0/1` on the kernel command line. This allows system

- builders to do reasonable things while avoiding howls from tinfoil

- hatters. (Or vice versa.)

- 

- CONFIG_RANDOM_TRUST_BOOTLOADER is basically the same thing, but regards

- the seed passed via EFI or device tree, which might come from RDRAND or

- a TPM or somewhere else. In order to allow distros to more easily enable

- this while avoiding those same howls (or vice versa), this commit adds

- the corresponding `random.trust_bootloader=0/1` toggle.

- 

- Cc: Theodore Ts'o <tytso@mit.edu>

- Cc: Graham Christensen <graham@grahamc.com>

- Reviewed-by: Ard Biesheuvel <ardb@kernel.org>

- Reviewed-by: Dominik Brodowski <linux@dominikbrodowski.net>

- Link: https://github.com/NixOS/nixpkgs/pull/165355

- Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

- ---

-  Documentation/admin-guide/kernel-parameters.txt | 6 ++++++

-  drivers/char/Kconfig                            | 3 ++-

-  drivers/char/random.c                           | 8 +++++++-

-  3 files changed, 15 insertions(+), 2 deletions(-)

- 

- diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt

- index 59f881f36779..bdc733c2561d 100644

- --- a/Documentation/admin-guide/kernel-parameters.txt

- +++ b/Documentation/admin-guide/kernel-parameters.txt

- @@ -4355,6 +4355,12 @@

-  			fully seed the kernel's CRNG. Default is controlled

-  			by CONFIG_RANDOM_TRUST_CPU.

-  

- +	random.trust_bootloader={on,off}

- +			[KNL] Enable or disable trusting the use of the

- +			a seed passed by the bootloader (if available) to

- +			fully seed the kernel's CRNG. Default is controlled

- +			by CONFIG_RANDOM_TRUST_BOOTLOADER.

- +

-  	randomize_kstack_offset=

-  			[KNL] Enable or disable kernel stack offset

-  			randomization, which provides roughly 5 bits of

- diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig

- index 740811893c57..55f48375e3fe 100644

- --- a/drivers/char/Kconfig

- +++ b/drivers/char/Kconfig

- @@ -449,6 +449,7 @@ config RANDOM_TRUST_BOOTLOADER

-  	device randomness. Say Y here to assume the entropy provided by the

-  	booloader is trustworthy so it will be added to the kernel's entropy

-  	pool. Otherwise, say N here so it will be regarded as device input that

- -	only mixes the entropy pool.

- +	only mixes the entropy pool. This can also be configured at boot with

- +	"random.trust_bootloader=on/off".

-  

-  endmenu

- diff --git a/drivers/char/random.c b/drivers/char/random.c

- index 3404a91edf29..19bf14e253f7 100644

- --- a/drivers/char/random.c

- +++ b/drivers/char/random.c

- @@ -738,11 +738,17 @@ static void invalidate_batched_entropy(void);

-  static void numa_crng_init(void);

-  

-  static bool trust_cpu __ro_after_init = IS_ENABLED(CONFIG_RANDOM_TRUST_CPU);

- +static bool trust_bootloader __ro_after_init = IS_ENABLED(CONFIG_RANDOM_TRUST_BOOTLOADER);

-  static int __init parse_trust_cpu(char *arg)

-  {

-  	return kstrtobool(arg, &trust_cpu);

-  }

- +static int __init parse_trust_bootloader(char *arg)

- +{

- +	return kstrtobool(arg, &trust_bootloader);

- +}

-  early_param("random.trust_cpu", parse_trust_cpu);

- +early_param("random.trust_bootloader", parse_trust_bootloader);

-  

-  static bool crng_init_try_arch(struct crng_state *crng)

-  {

- @@ -2229,7 +2235,7 @@ EXPORT_SYMBOL_GPL(add_hwgenerator_randomness);

-   */

-  void add_bootloader_randomness(const void *buf, unsigned int size)

-  {

- -	if (IS_ENABLED(CONFIG_RANDOM_TRUST_BOOTLOADER))

- +	if (trust_bootloader)

-  		add_hwgenerator_randomness(buf, size, size * 8);

-  	else

-  		add_device_randomness(buf, size);

- -- 

- 2.36.1

- 

@@ -0,0 +1,26 @@ 

+ From 2da21cf28e573b84e5a5baecc1eda7372322375d Mon Sep 17 00:00:00 2001

+ From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>

+ Date: Sat, 23 Jul 2022 11:14:46 +0200

+ Subject: [PATCH 3/3] soundwire: Raise DEFAULT_PROBE_TIMEOUT to 10000 ms

+ 

+ See: https://github.com/thesofproject/linux/issues/3777#issuecomment-1192655300

+ ---

+  drivers/soundwire/bus.h | 2 +-

+  1 file changed, 1 insertion(+), 1 deletion(-)

+ 

+ diff --git a/drivers/soundwire/bus.h b/drivers/soundwire/bus.h

+ index 7631ef5e71fb..d3ed828daac0 100644

+ --- a/drivers/soundwire/bus.h

+ +++ b/drivers/soundwire/bus.h

+ @@ -5,7 +5,7 @@

+  #define __SDW_BUS_H

+  

+  #define DEFAULT_BANK_SWITCH_TIMEOUT 3000

+ -#define DEFAULT_PROBE_TIMEOUT       2000

+ +#define DEFAULT_PROBE_TIMEOUT       10000

+  

+  u64 sdw_dmi_override_adr(struct sdw_bus *bus, u64 addr);

+  

+ -- 

+ 2.37.1

+ 

@@ -1,86 +0,0 @@ 

- From 03b70547975933214e3edcbb3c99e05142172266 Mon Sep 17 00:00:00 2001

- From: Frederic Weisbecker <frederic@kernel.org>

- Date: Wed, 2 Feb 2022 01:01:07 +0100

- Subject: [PATCH 3/7] tick: Detect and fix jiffies update stall

- 

- On some rare cases, the timekeeper CPU may be delaying its jiffies

- update duty for a while. Known causes include:

- 

- * The timekeeper is waiting on stop_machine in a MULTI_STOP_DISABLE_IRQ

-   or MULTI_STOP_RUN state. Disabled interrupts prevent from timekeeping

-   updates while waiting for the target CPU to complete its

-   stop_machine() callback.

- 

- * The timekeeper vcpu has VMEXIT'ed for a long while due to some overload

-   on the host.

- 

- Detect and fix these situations with emergency timekeeping catchups.

- 

- Original-patch-by: Paul E. McKenney <paulmck@kernel.org>

- Signed-off-by: Frederic Weisbecker <frederic@kernel.org>

- Cc: Thomas Gleixner <tglx@linutronix.de>

- ---

-  kernel/time/tick-sched.c | 17 +++++++++++++++++

-  kernel/time/tick-sched.h |  4 ++++

-  2 files changed, 21 insertions(+)

- 

- diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c

- index 5e80ee44c32a..0578c9301b17 100644

- --- a/kernel/time/tick-sched.c

- +++ b/kernel/time/tick-sched.c

- @@ -169,6 +169,8 @@ static ktime_t tick_init_jiffy_update(void)

-  	return period;

-  }

-  

- +#define MAX_STALLED_JIFFIES 5

- +

-  static void tick_sched_do_timer(struct tick_sched *ts, ktime_t now)

-  {

-  	int cpu = smp_processor_id();

- @@ -196,6 +198,21 @@ static void tick_sched_do_timer(struct tick_sched *ts, ktime_t now)

-  	if (tick_do_timer_cpu == cpu)

-  		tick_do_update_jiffies64(now);

-  

- +	/*

- +	 * If jiffies update stalled for too long (timekeeper in stop_machine()

- +	 * or VMEXIT'ed for several msecs), force an update.

- +	 */

- +	if (ts->last_tick_jiffies != jiffies) {

- +		ts->stalled_jiffies = 0;

- +		ts->last_tick_jiffies = READ_ONCE(jiffies);

- +	} else {

- +		if (++ts->stalled_jiffies == MAX_STALLED_JIFFIES) {

- +			tick_do_update_jiffies64(now);

- +			ts->stalled_jiffies = 0;

- +			ts->last_tick_jiffies = READ_ONCE(jiffies);

- +		}

- +	}

- +

-  	if (ts->inidle)

-  		ts->got_idle_tick = 1;

-  }

- diff --git a/kernel/time/tick-sched.h b/kernel/time/tick-sched.h

- index d952ae393423..504649513399 100644

- --- a/kernel/time/tick-sched.h

- +++ b/kernel/time/tick-sched.h

- @@ -49,6 +49,8 @@ enum tick_nohz_mode {

-   * @timer_expires_base:	Base time clock monotonic for @timer_expires

-   * @next_timer:		Expiry time of next expiring timer for debugging purpose only

-   * @tick_dep_mask:	Tick dependency mask - is set, if someone needs the tick

- + * @last_tick_jiffies:	Value of jiffies seen on last tick

- + * @stalled_jiffies:	Number of stalled jiffies detected across ticks

-   */

-  struct tick_sched {

-  	struct hrtimer			sched_timer;

- @@ -77,6 +79,8 @@ struct tick_sched {

-  	u64				next_timer;

-  	ktime_t				idle_expires;

-  	atomic_t			tick_dep_mask;

- +	unsigned long			last_tick_jiffies;

- +	unsigned int			stalled_jiffies;

-  };

-  

-  extern struct tick_sched *tick_get_tick_sched(int cpu);

- -- 

- 2.36.1

- 

@@ -1,101 +0,0 @@ 

- From 1f17192df29b2410380147075754e8f40dc7af5b Mon Sep 17 00:00:00 2001

- From: Frederic Weisbecker <frederic@kernel.org>

- Date: Tue, 8 Feb 2022 17:16:33 +0100

- Subject: [PATCH 4/7] tick/rcu: Remove obsolete rcu_needs_cpu() parameters

- 

- With the removal of CONFIG_RCU_FAST_NO_HZ, the parameters in

- rcu_needs_cpu() are not necessary anymore. Simply remove them.

- 

- Signed-off-by: Frederic Weisbecker <frederic@kernel.org>

- Cc: Thomas Gleixner <tglx@linutronix.de>

- Cc: Peter Zijlstra <peterz@infradead.org>

- Cc: Paul E. McKenney <paulmck@kernel.org>

- Cc: Paul Menzel <pmenzel@molgen.mpg.de>

- ---

-  include/linux/rcutiny.h  |  3 +--

-  include/linux/rcutree.h  |  2 +-

-  kernel/rcu/tree.c        |  3 +--

-  kernel/time/tick-sched.c | 10 ++++------

-  4 files changed, 7 insertions(+), 11 deletions(-)

- 

- diff --git a/include/linux/rcutiny.h b/include/linux/rcutiny.h

- index 858f4d429946..5fed476f977f 100644

- --- a/include/linux/rcutiny.h

- +++ b/include/linux/rcutiny.h

- @@ -64,9 +64,8 @@ static inline void rcu_softirq_qs(void)

-  		rcu_tasks_qs(current, (preempt)); \

-  	} while (0)

-  

- -static inline int rcu_needs_cpu(u64 basemono, u64 *nextevt)

- +static inline int rcu_needs_cpu(void)

-  {

- -	*nextevt = KTIME_MAX;

-  	return 0;

-  }

-  

- diff --git a/include/linux/rcutree.h b/include/linux/rcutree.h

- index 53209d669400..6cc91291d078 100644

- --- a/include/linux/rcutree.h

- +++ b/include/linux/rcutree.h

- @@ -19,7 +19,7 @@

-  

-  void rcu_softirq_qs(void);

-  void rcu_note_context_switch(bool preempt);

- -int rcu_needs_cpu(u64 basem, u64 *nextevt);

- +int rcu_needs_cpu(void);

-  void rcu_cpu_stall_reset(void);

-  

-  /*

- diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c

- index 73a4c9d07b86..5dae0da879ae 100644

- --- a/kernel/rcu/tree.c

- +++ b/kernel/rcu/tree.c

- @@ -1086,9 +1086,8 @@ void rcu_irq_enter_irqson(void)

-   * Just check whether or not this CPU has non-offloaded RCU callbacks

-   * queued.

-   */

- -int rcu_needs_cpu(u64 basemono, u64 *nextevt)

- +int rcu_needs_cpu(void)

-  {

- -	*nextevt = KTIME_MAX;

-  	return !rcu_segcblist_empty(&this_cpu_ptr(&rcu_data)->cblist) &&

-  		!rcu_rdp_is_offloaded(this_cpu_ptr(&rcu_data));

-  }

- diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c

- index 0578c9301b17..4c62fa0f70f1 100644

- --- a/kernel/time/tick-sched.c

- +++ b/kernel/time/tick-sched.c

- @@ -785,7 +785,7 @@ static inline bool local_timer_softirq_pending(void)

-  

-  static ktime_t tick_nohz_next_event(struct tick_sched *ts, int cpu)

-  {

- -	u64 basemono, next_tick, next_tmr, next_rcu, delta, expires;

- +	u64 basemono, next_tick, delta, expires;

-  	unsigned long basejiff;

-  	unsigned int seq;

-  

- @@ -808,7 +808,7 @@ static ktime_t tick_nohz_next_event(struct tick_sched *ts, int cpu)

-  	 * minimal delta which brings us back to this place

-  	 * immediately. Lather, rinse and repeat...

-  	 */

- -	if (rcu_needs_cpu(basemono, &next_rcu) || arch_needs_cpu() ||

- +	if (rcu_needs_cpu() || arch_needs_cpu() ||

-  	    irq_work_needs_cpu() || local_timer_softirq_pending()) {

-  		next_tick = basemono + TICK_NSEC;

-  	} else {

- @@ -819,10 +819,8 @@ static ktime_t tick_nohz_next_event(struct tick_sched *ts, int cpu)

-  		 * disabled this also looks at the next expiring

-  		 * hrtimer.

-  		 */

- -		next_tmr = get_next_timer_interrupt(basejiff, basemono);

- -		ts->next_timer = next_tmr;

- -		/* Take the next rcu event into account */

- -		next_tick = next_rcu < next_tmr ? next_rcu : next_tmr;

- +		next_tick = get_next_timer_interrupt(basejiff, basemono);

- +		ts->next_timer = next_tick;

-  	}

-  

-  	/*

- -- 

- 2.36.1

- 

@@ -1,119 +0,0 @@ 

- From 68deadf9632ac7c3044f20ad630f13dc11cb66ab Mon Sep 17 00:00:00 2001

- From: Frederic Weisbecker <frederic@kernel.org>

- Date: Tue, 8 Feb 2022 17:16:34 +0100

- Subject: [PATCH 5/7] tick/rcu: Stop allowing RCU_SOFTIRQ in idle

- 

- RCU_SOFTIRQ used to be special in that it could be raised on purpose

- within the idle path to prevent from stopping the tick. Some code still

- prevents from unnecessary warnings related to this specific behaviour

- while entering in dynticks-idle mode.

- 

- However the nohz layout has changed quite a bit in ten years, and the

- removal of CONFIG_RCU_FAST_NO_HZ has been the final straw to this

- safe-conduct. Now the RCU_SOFTIRQ vector is expected to be raised from

- sane places.

- 

- A remaining corner case is admitted though when the vector is invoked

- in fragile hotplug path.

- 

- Signed-off-by: Frederic Weisbecker <frederic@kernel.org>

- Cc: Thomas Gleixner <tglx@linutronix.de>

- Cc: Peter Zijlstra <peterz@infradead.org>

- Cc: Paul E. McKenney <paulmck@kernel.org>

- Cc: Paul Menzel <pmenzel@molgen.mpg.de>

- ---

-  include/linux/interrupt.h |  8 ++++++-

-  kernel/time/tick-sched.c  | 50 +++++++++++++++++++++++++++++++--------

-  2 files changed, 47 insertions(+), 11 deletions(-)

- 

- diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h

- index 9367f1cb2e3c..9613326d2f8a 100644

- --- a/include/linux/interrupt.h

- +++ b/include/linux/interrupt.h

- @@ -579,7 +579,13 @@ enum

-  	NR_SOFTIRQS

-  };

-  

- -#define SOFTIRQ_STOP_IDLE_MASK (~(1 << RCU_SOFTIRQ))

- +/*

- + * Ignoring the RCU vector after ksoftirqd is parked is fine

- + * because:

- + * 	1) rcutree_migrate_callbacks() takes care of the queue.

- + * 	2) rcu_report_dead() reports the final quiescent states.

- + */

- +#define SOFTIRQ_HOTPLUG_SAFE_MASK (BIT(RCU_SOFTIRQ))

-  

-  /* map softirq index to softirq name. update 'softirq_to_name' in

-   * kernel/softirq.c when adding a new softirq.

- diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c

- index 4c62fa0f70f1..3506f6ed790c 100644

- --- a/kernel/time/tick-sched.c

- +++ b/kernel/time/tick-sched.c

- @@ -999,6 +999,45 @@ static void tick_nohz_full_update_tick(struct tick_sched *ts)

-  	__tick_nohz_full_update_tick(ts, ktime_get());

-  }

-  

- +/*

- + * A pending softirq outside an IRQ (or softirq disabled section) context

- + * should be waiting for ksoftirqd to handle it. Therefore we shouldn't

- + * reach here due to the need_resched() early check in can_stop_idle_tick().

- + *

- + * However if we are between CPUHP_AP_SMPBOOT_THREADS and CPU_TEARDOWN_CPU on the

- + * cpu_down() process, softirqs can still be raised while ksoftirqd is parked,

- + * triggering the below since wakep_softirqd() is ignored.

- + *

- + */

- +static bool report_idle_softirq(void)

- +{

- +	static int ratelimit;

- +	unsigned int pending = local_softirq_pending();

- +

- +	if (likely(!pending))

- +		return false;

- +

- +	/* Some softirqs claim to be safe against hotplug and ksoftirqd parking */

- +	if (!cpu_active(smp_processor_id())) {

- +		pending &= ~SOFTIRQ_HOTPLUG_SAFE_MASK;

- +		if (!pending)

- +			return false;

- +	}

- +

- +	if (ratelimit < 10)

- +		return false;

- +

- +	/* On RT, softirqs handling may be waiting on some lock */

- +	if (!local_bh_blocked())

- +		return false;

- +

- +	pr_warn("NOHZ tick-stop error: local softirq work is pending, handler #%02x!!!\n",

- +		pending);

- +	ratelimit++;

- +

- +	return true;

- +}

- +

-  static bool can_stop_idle_tick(int cpu, struct tick_sched *ts)

-  {

-  	/*

- @@ -1025,17 +1064,8 @@ static bool can_stop_idle_tick(int cpu, struct tick_sched *ts)

-  	if (need_resched())

-  		return false;

-  

- -	if (unlikely(local_softirq_pending())) {

- -		static int ratelimit;

- -

- -		if (ratelimit < 10 && !local_bh_blocked() &&

- -		    (local_softirq_pending() & SOFTIRQ_STOP_IDLE_MASK)) {

- -			pr_warn("NOHZ tick-stop error: Non-RCU local softirq work is pending, handler #%02x!!!\n",

- -				(unsigned int) local_softirq_pending());

- -			ratelimit++;

- -		}

- +	if (unlikely(report_idle_softirq()))

-  		return false;

- -	}

-  

-  	if (tick_nohz_full_enabled()) {

-  		/*

- -- 

- 2.36.1

- 

@@ -1,55 +0,0 @@ 

- From c4d817dfd4c11840db24143aa39e9e437f05bc33 Mon Sep 17 00:00:00 2001

- From: Frederic Weisbecker <frederic@kernel.org>

- Date: Tue, 8 Feb 2022 17:16:35 +0100

- Subject: [PATCH 6/7] lib/irq_poll: Declare IRQ_POLL softirq vector as

-  ksoftirqd-parking safe

- 

- The following warning may appear while setting a CPU down:

- 

- 	NOHZ tick-stop error: Non-RCU local softirq work is pending, handler #20!!!

- 

- The IRQ_POLL_SOFTIRQ vector can be raised during the hotplug cpu_down()

- path after ksoftirqd is parked and before the CPU actually dies. However

- this is handled afterward at the CPUHP_IRQ_POLL_DEAD stage where the

- queue gets migrated.

- 

- Hence this warning can be considered spurious and the vector can join

- the "hotplug-safe" list.

- 

- Reported-and-tested-by: Paul Menzel <pmenzel@molgen.mpg.de>

- Signed-off-by: Frederic Weisbecker <frederic@kernel.org>

- Cc: Thomas Gleixner <tglx@linutronix.de>

- Cc: Peter Zijlstra <peterz@infradead.org>

- Cc: Paul E. McKenney <paulmck@kernel.org>

- Cc: Paul Menzel <pmenzel@molgen.mpg.de>

- ---

-  include/linux/interrupt.h | 11 +++++++----

-  1 file changed, 7 insertions(+), 4 deletions(-)

- 

- diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h

- index 9613326d2f8a..f40754caaefa 100644

- --- a/include/linux/interrupt.h

- +++ b/include/linux/interrupt.h

- @@ -580,12 +580,15 @@ enum

-  };

-  

-  /*

- - * Ignoring the RCU vector after ksoftirqd is parked is fine

- - * because:

- - * 	1) rcutree_migrate_callbacks() takes care of the queue.

- + * The following vectors can be safely ignored after ksoftirqd is parked:

- + *

- + * _ RCU:

- + * 	1) rcutree_migrate_callbacks() migrates the queue.

-   * 	2) rcu_report_dead() reports the final quiescent states.

- + *

- + * _ IRQ_POLL: irq_poll_cpu_dead() migrates the queue

-   */

- -#define SOFTIRQ_HOTPLUG_SAFE_MASK (BIT(RCU_SOFTIRQ))

- +#define SOFTIRQ_HOTPLUG_SAFE_MASK (BIT(RCU_SOFTIRQ) | BIT(IRQ_POLL_SOFTIRQ))

-  

-  /* map softirq index to softirq name. update 'softirq_to_name' in

-   * kernel/softirq.c when adding a new softirq.

- -- 

- 2.36.1

- 

@@ -1,81 +0,0 @@ 

- From cf8e6ac5eabd91ea2ed8eb7dbf12718bfd5cb9b8 Mon Sep 17 00:00:00 2001

- From: Olga Kornievskaia <kolga@netapp.com>

- Date: Wed, 16 Mar 2022 18:24:26 -0400

- Subject: [PATCH 7/7] NFSv4.1 provide mount option to toggle trunking discovery

- 

- Introduce a new mount option -- trunkdiscovery,notrunkdiscovery -- to

- toggle whether or not the client will engage in actively discovery

- of trunking locations.

- 

- v2 make notrunkdiscovery default

- 

- Signed-off-by: Olga Kornievskaia <kolga@netapp.com>

- Cherry-picked-for: https://bugs.archlinux.org/task/74272

- ---

-  fs/nfs/client.c           | 3 ++-

-  fs/nfs/fs_context.c       | 8 ++++++++

-  include/linux/nfs_fs_sb.h | 1 +

-  3 files changed, 11 insertions(+), 1 deletion(-)

- 

- diff --git a/fs/nfs/client.c b/fs/nfs/client.c

- index d1f34229e11a..e828504cc396 100644

- --- a/fs/nfs/client.c

- +++ b/fs/nfs/client.c

- @@ -857,7 +857,8 @@ static int nfs_probe_fsinfo(struct nfs_server *server, struct nfs_fh *mntfh, str

-  	}

-  

-  	if (clp->rpc_ops->discover_trunking != NULL &&

- -			(server->caps & NFS_CAP_FS_LOCATIONS)) {

- +			(server->caps & NFS_CAP_FS_LOCATIONS &&

- +			 (server->flags & NFS_MOUNT_TRUNK_DISCOVERY))) {

-  		error = clp->rpc_ops->discover_trunking(server, mntfh);

-  		if (error < 0)

-  			return error;

- diff --git a/fs/nfs/fs_context.c b/fs/nfs/fs_context.c

- index d20891162145..9a16897e8dc6 100644

- --- a/fs/nfs/fs_context.c

- +++ b/fs/nfs/fs_context.c

- @@ -80,6 +80,7 @@ enum nfs_param {

-  	Opt_source,

-  	Opt_tcp,

-  	Opt_timeo,

- +	Opt_trunkdiscovery,

-  	Opt_udp,

-  	Opt_v,

-  	Opt_vers,

- @@ -180,6 +181,7 @@ static const struct fs_parameter_spec nfs_fs_parameters[] = {

-  	fsparam_string("source",	Opt_source),

-  	fsparam_flag  ("tcp",		Opt_tcp),

-  	fsparam_u32   ("timeo",		Opt_timeo),

- +	fsparam_flag_no("trunkdiscovery", Opt_trunkdiscovery),

-  	fsparam_flag  ("udp",		Opt_udp),

-  	fsparam_flag  ("v2",		Opt_v),

-  	fsparam_flag  ("v3",		Opt_v),

- @@ -529,6 +531,12 @@ static int nfs_fs_context_parse_param(struct fs_context *fc,

-  		else

-  			ctx->flags &= ~NFS_MOUNT_NOCTO;

-  		break;

- +	case Opt_trunkdiscovery:

- +		if (result.negated)

- +			ctx->flags &= ~NFS_MOUNT_TRUNK_DISCOVERY;

- +		else

- +			ctx->flags |= NFS_MOUNT_TRUNK_DISCOVERY;

- +		break;

-  	case Opt_ac:

-  		if (result.negated)

-  			ctx->flags |= NFS_MOUNT_NOAC;

- diff --git a/include/linux/nfs_fs_sb.h b/include/linux/nfs_fs_sb.h

- index ca0959e51e81..b0e3fd550122 100644

- --- a/include/linux/nfs_fs_sb.h

- +++ b/include/linux/nfs_fs_sb.h

- @@ -151,6 +151,7 @@ struct nfs_server {

-  #define NFS_MOUNT_SOFTREVAL		0x800000

-  #define NFS_MOUNT_WRITE_EAGER		0x01000000

-  #define NFS_MOUNT_WRITE_WAIT		0x02000000

- +#define NFS_MOUNT_TRUNK_DISCOVERY	0x04000000

-  

-  	unsigned int		fattr_valid;	/* Valid attributes */

-  	unsigned int		caps;		/* server capabilities */

- -- 

- 2.36.1

- 

file modified
+11 -20
@@ -9,7 +9,7 @@ 

  _replacesoldmodules=() # '%' gets replaced with kernel suffix

  

  pkgbase=linux-libre-pae

- pkgver=5.17.9

+ pkgver=5.18.14

  pkgrel=1

  pkgdesc='Linux-libre PAE (physical address extension)'

  url='https://linux-libre.fsfla.org/'
@@ -20,7 +20,7 @@ 

    xmlto python-sphinx python-sphinx_rtd_theme graphviz imagemagick texlive-latexextra

  )

  options=('!strip')

- _srcname=linux-5.17

+ _srcname=linux-5.18

  source=(

    "https://linux-libre.fsfla.org/pub/linux-libre/releases/${_srcname##*-}-gnu/linux-libre-${_srcname##*-}-gnu.tar.xz"{,.sign}

    "https://linux-libre.fsfla.org/pub/linux-libre/releases/$pkgver-gnu/patch-${_srcname##*-}-gnu-$pkgver-gnu.xz"{,.sign}
@@ -36,12 +36,8 @@ 

    0002-fix-Atmel-maXTouch-touchscreen-support.patch

    # Arch Linux patches

    0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch

-   0002-random-treat-bootloader-trust-toggle-the-same-way-as.patch

-   0003-tick-Detect-and-fix-jiffies-update-stall.patch

-   0004-tick-rcu-Remove-obsolete-rcu_needs_cpu-parameters.patch

-   0005-tick-rcu-Stop-allowing-RCU_SOFTIRQ-in-idle.patch

-   0006-lib-irq_poll-Declare-IRQ_POLL-softirq-vector-as-ksof.patch

-   0007-NFSv4.1-provide-mount-option-to-toggle-trunking-disc.patch

+   0002-HID-apple-Properly-handle-function-keys-on-Keychron-.patch

+   0003-soundwire-Raise-DEFAULT_PROBE_TIMEOUT-to-10000-ms.patch

    # Arch Linux 32 patches

    no-ultra-zstd.patch

  )
@@ -49,9 +45,9 @@ 

    '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva

    '6DB9C4B4F0D8C0DC432CF6E4227CA7C556B2BA78' # David P.

  )

- sha512sums=('565de7f956e40a931858cb29b61619f25fc57ce588b8762bef806e470d20bbbdf98a6e1c55eccae61a7365c0ecaae4825d81f7eec8689911710949ba5b34ce0c'

+ sha512sums=('13be3762fffd74c63eeb23b0d34b994a3e5198bfdbda4f013b38f8d3edd24b9bbebe5a4bfde0f5191aa1cf2678e4517f3b5540a40b30ebc05da1f6708cbb98bb'

              'SKIP'

-             '921c4e1eca023c3a0f756ec788188e0d8c5b0622c832516c32e87f964e90769c7072f41785f1bfde1344fcd829332834a959313fd4db69cab20227eeba4141aa'

+             '9016e87060d3ddbf4bad5adee54f07cba3930a23a5c2a7ca32338a98d0c51676228f3d97405c624f2f48a67849f9b40a5dc670e10fbc02bc75cc4d47deab4c34'

              'SKIP'

              '13cb5bc42542e7b8bb104d5f68253f6609e463b6799800418af33eb0272cc269aaa36163c3e6f0aacbdaaa1d05e2827a4a7c4a08a029238439ed08b89c564bb3'

              'SKIP'
@@ -59,16 +55,12 @@ 

              'SKIP'

              '267295aa0cea65684968420c68b32f1a66a22d018b9d2b2c1ef14267bcf4cb68aaf7099d073cbfefe6c25c8608bdcbbd45f7ac8893fdcecbf1e621abdfe9ecc1'

              'SKIP'

-             '55fdec0555ef18aaaba22ff6cdad477c6c80b5dd3b0477b39e7099b3838376f8c3b42e44f579758d8e764d5a4750f6fc8378e2d5b05536cdebb17c13f734c695'

+             '145f8eb30125ee4bf1e2b37027ec762d2a15511dcf7eae3ad09472a682492d8f38fb606b2e81acac557de318a71b6d988b03c8680208b75c2be9bc1483b43e10'

              '02af4dd2a007e41db0c63822c8ab3b80b5d25646af1906dc85d0ad9bb8bbf5236f8e381d7f91cf99ed4b0978c50aee37cb9567cdeef65b7ec3d91b882852b1af'

              'b8fe56e14006ab866970ddbd501c054ae37186ddc065bb869cf7d18db8c0d455118d5bda3255fb66a0dde38b544655cfe9040ffe46e41d19830b47959b2fb168'

-             '9543379c1feba5585196396cc3ca6b9b957b967bdac29c502867ffb502743e1793c4a9ccdca4c30226120793df7bf887fb0cdf365d9304594777c16a0addd63b'

-             '37719ac336936ba70ef58d63e409a3df36a06f885205595ee55a20bdb6a801c698cb5412fa19398f375c111634713c4bee1619bf08429830ab02ff5fe257ef6c'

-             '44acd1454ad7faa4e993597bff67899a14e85e030f948db8590d12fc4eb05fb732e53e9a96bb59972ec319e54c160bbbee7c1568cdc199342afa4088b4a5eee3'

-             '0e1ea62e127883826655fa74c232ef3b8537fe0a1a2c7b89a710f43ce0b7b483e1b5bc14fa44cffae5aaadfd9c5b88b5e326d5feca9bf2fb922844bd6309f855'

-             '0c40c8a99e202dd869c54964495fd8005efbbd74679901bd976fa297b8d65554a8071345da3b171ef95d7fd2515588d05f09cf2ca6c86b0bcc9ff0468c997482'

-             'b0c2bef3e76a25640539a6814bf8a120d000995d1d88c80b667b9bd1e489a452da47ee01b96cd0104f0a7627d5ff7ff916506f137f6cd6fb4df4f666bf2d92be'

-             '251d94b05ba7b252eef738efd8a5d75ec26df11bcd4e99b468db89cb370f56cc56e949b2fb1a7d00c61ded49fa0e0355551ea98f46662d4220cddacf5640e40b'

+             '671ab29fb1858c3898792164ac49d57103ecdeff220d7b262efb0c74ee270a670cf40f746a76f400513019989d858326fb3da507a0159418215e0b645011c406'

+             '2fecb2fb31981af21e17ce08c8352236f8817e6000f7e542f7479eaa7300238c4581f992b4da4d49dd2657d3e3c038eb0369954559f233b2913c382ef25b5753'

+             '816ad9cb93a473376487234d4bf255f7d081c37186b1715e914c2c30dcdcfaee7b6db4eeb427969190d0cffa7499bc99c95ef58fb8c632d27e51d0350990f0ce'

              'bca15cc96f64c38adcd13a46752866b5b30555ac21e19b3f7afcd20fcb7ec585c9d990fe8f842f44d5f69d477d72867fe6a9102729f26f93f5a80b372e41ce85')

  

  _replacesarchkernel=("${_replacesarchkernel[@]/\%/${pkgbase#linux-libre}}")
@@ -116,8 +108,7 @@ 

  

  build() {

    cd $_srcname

-   make all

-   make htmldocs

+   make htmldocs all

  }

  

  _package() {

file modified
+531 -384
@@ -1,6 +1,6 @@ 

  #

  # Automatically generated file; DO NOT EDIT.

- # Linux/x86 5.17.8-gnu Kernel Configuration

+ # Linux/x86 5.18.14-gnu Kernel Configuration

  #

  CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.1.0"

  CONFIG_CC_IS_GCC=y
@@ -15,8 +15,10 @@ 

  CONFIG_CC_CAN_LINK_STATIC=y

  CONFIG_CC_HAS_ASM_GOTO=y

  CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y

+ CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y

  CONFIG_CC_HAS_ASM_INLINE=y

  CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y

+ CONFIG_PAHOLE_VERSION=123

  CONFIG_IRQ_WORK=y

  CONFIG_BUILDTIME_TABLE_SORT=y

  CONFIG_THREAD_INFO_IN_TASK=y
@@ -100,6 +102,7 @@ 

  CONFIG_NO_HZ_IDLE=y

  CONFIG_NO_HZ=y

  CONFIG_HIGH_RES_TIMERS=y

+ CONFIG_CLOCKSOURCE_WATCHDOG_MAX_SKEW_US=100

  # end of Timers subsystem

  

  CONFIG_BPF=y
@@ -179,6 +182,8 @@ 

  

  CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y

  CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5"

+ CONFIG_GCC12_NO_ARRAY_BOUNDS=y

+ CONFIG_CC_NO_ARRAY_BOUNDS=y

  CONFIG_CGROUPS=y

  CONFIG_PAGE_COUNTER=y

  CONFIG_MEMCG=y
@@ -309,11 +314,9 @@ 

  CONFIG_ARCH_MAY_HAVE_PC_FDC=y

  CONFIG_GENERIC_CALIBRATE_DELAY=y

  CONFIG_ARCH_HAS_CPU_RELAX=y

- CONFIG_ARCH_HAS_FILTER_PGPROT=y

  CONFIG_ARCH_HIBERNATION_POSSIBLE=y

  CONFIG_ARCH_NR_GPIO=512

  CONFIG_ARCH_SUSPEND_POSSIBLE=y

- CONFIG_ARCH_WANT_GENERAL_HUGETLB=y

  CONFIG_HAVE_INTEL_TXT=y

  CONFIG_X86_32_SMP=y

  CONFIG_ARCH_SUPPORTS_UPROBES=y
@@ -328,8 +331,6 @@ 

  CONFIG_X86_FEATURE_NAMES=y

  CONFIG_X86_MPPARSE=y

  # CONFIG_GOLDFISH is not set

- CONFIG_RETPOLINE=y

- CONFIG_CC_HAS_SLS=y

  CONFIG_X86_CPU_RESCTRL=y

  CONFIG_X86_BIGSMP=y

  # CONFIG_X86_EXTENDED_PLATFORM is not set
@@ -432,7 +433,6 @@ 

  # CONFIG_X86_LEGACY_VM86 is not set

  CONFIG_X86_IOPL_IOPERM=y

  CONFIG_TOSHIBA=m

- CONFIG_I8K=m

  CONFIG_X86_REBOOTFIXUPS=y

  CONFIG_MICROCODE=y

  # CONFIG_MICROCODE_INTEL is not set
@@ -455,7 +455,6 @@ 

  CONFIG_NODES_SHIFT=3

  CONFIG_ARCH_SPARSEMEM_ENABLE=y

  CONFIG_ARCH_SPARSEMEM_DEFAULT=y

- CONFIG_ARCH_SELECT_MEMORY_MODEL=y

  CONFIG_ILLEGAL_POINTER_VALUE=0

  # CONFIG_X86_PMEM_LEGACY is not set

  # CONFIG_HIGHPTE is not set
@@ -470,6 +469,7 @@ 

  CONFIG_ARCH_RANDOM=y

  CONFIG_X86_SMAP=y

  CONFIG_X86_UMIP=y

+ CONFIG_CC_HAS_IBT=y

  CONFIG_X86_INTEL_TSX_MODE_OFF=y

  # CONFIG_X86_INTEL_TSX_MODE_ON is not set

  # CONFIG_X86_INTEL_TSX_MODE_AUTO is not set
@@ -498,6 +498,15 @@ 

  # CONFIG_STRICT_SIGALTSTACK_SIZE is not set

  # end of Processor type and features

  

+ CONFIG_CC_HAS_SLS=y

+ CONFIG_CC_HAS_RETURN_THUNK=y

+ CONFIG_SPECULATION_MITIGATIONS=y

+ CONFIG_PAGE_TABLE_ISOLATION=y

+ CONFIG_RETPOLINE=y

+ CONFIG_RETHUNK=y

+ CONFIG_CPU_UNRET_ENTRY=y

+ CONFIG_CPU_IBPB_ENTRY=y

+ CONFIG_CPU_IBRS_ENTRY=y

  CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=y

  

  #
@@ -711,7 +720,6 @@ 

  CONFIG_KVM_INTEL=m

  CONFIG_KVM_AMD=m

  # CONFIG_KVM_XEN is not set

- CONFIG_KVM_MMU_AUDIT=y

  CONFIG_AS_AVX512=y

  CONFIG_AS_SHA1_NI=y

  CONFIG_AS_SHA256_NI=y
@@ -734,6 +742,7 @@ 

  CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y

  CONFIG_ARCH_USE_BUILTIN_BSWAP=y

  CONFIG_KRETPROBES=y

+ CONFIG_KRETPROBE_ON_RETHOOK=y

  CONFIG_USER_RETURN_NOTIFIER=y

  CONFIG_HAVE_IOREMAP_PROT=y

  CONFIG_HAVE_KPROBES=y
@@ -808,6 +817,7 @@ 

  CONFIG_OLD_SIGACTION=y

  CONFIG_COMPAT_32BIT_TIME=y

  CONFIG_HAVE_ARCH_RANDOMIZE_KSTACK_OFFSET=y

+ CONFIG_RANDOMIZE_KSTACK_OFFSET=y

  # CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT is not set

  CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y

  CONFIG_STRICT_KERNEL_RWX=y
@@ -819,6 +829,7 @@ 

  CONFIG_ARCH_HAS_MEM_ENCRYPT=y

  CONFIG_HAVE_STATIC_CALL=y

  CONFIG_HAVE_PREEMPT_DYNAMIC=y

+ CONFIG_HAVE_PREEMPT_DYNAMIC_CALL=y

  CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y

  CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y

  CONFIG_ARCH_SPLIT_ARG64=y
@@ -858,6 +869,7 @@ 

  # CONFIG_TRIM_UNUSED_KSYMS is not set

  CONFIG_MODULES_TREE_LOOKUP=y

  CONFIG_BLOCK=y

+ CONFIG_BLOCK_LEGACY_AUTOLOAD=y

  CONFIG_BLK_CGROUP_RWSTAT=y

  CONFIG_BLK_DEV_BSG_COMMON=y

  CONFIG_BLK_ICQ=y
@@ -909,6 +921,7 @@ 

  CONFIG_BLK_MQ_RDMA=y

  CONFIG_BLK_PM=y

  CONFIG_BLOCK_HOLDER_DEPRECATED=y

+ CONFIG_BLK_MQ_STACKING=y

  

  #

  # IO Schedulers
@@ -951,8 +964,6 @@ 

  #

  # Memory Management options

  #

- CONFIG_SELECT_MEMORY_MODEL=y

- CONFIG_SPARSEMEM_MANUAL=y

  CONFIG_SPARSEMEM=y

  CONFIG_SPARSEMEM_STATIC=y

  CONFIG_HAVE_FAST_GUP=y
@@ -975,6 +986,7 @@ 

  CONFIG_TRANSPARENT_HUGEPAGE=y

  # CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set

  CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y

+ CONFIG_ARCH_WANT_GENERAL_HUGETLB=y

  CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y

  CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y

  CONFIG_USE_PERCPU_NUMA_NODE_ID=y
@@ -1006,6 +1018,8 @@ 

  CONFIG_GENERIC_EARLY_IOREMAP=y

  # CONFIG_IDLE_PAGE_TRACKING is not set

  CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y

+ CONFIG_ARCH_HAS_CURRENT_STACK_POINTER=y

+ CONFIG_ARCH_HAS_FILTER_PGPROT=y

  CONFIG_ARCH_HAS_ZONE_DMA_SET=y

  CONFIG_ZONE_DMA=y

  CONFIG_HMM_MIRROR=y
@@ -2045,6 +2059,7 @@ 

  CONFIG_NET_SOCK_MSG=y

  CONFIG_NET_DEVLINK=y

  CONFIG_PAGE_POOL=y

+ # CONFIG_PAGE_POOL_STATS is not set

  CONFIG_FAILOVER=m

  CONFIG_ETHTOOL_NETLINK=y

  
@@ -2088,6 +2103,8 @@ 

  # CONFIG_PCIE_BUS_SAFE is not set

  # CONFIG_PCIE_BUS_PERFORMANCE is not set

  # CONFIG_PCIE_BUS_PEER2PEER is not set

+ CONFIG_VGA_ARB=y

+ CONFIG_VGA_ARB_MAX_GPUS=10

  CONFIG_HOTPLUG_PCI=y

  CONFIG_HOTPLUG_PCI_COMPAQ=m

  # CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set
@@ -2294,6 +2311,7 @@ 

  CONFIG_EFI_DEV_PATH_PARSER=y

  CONFIG_EFI_EARLYCON=y

  CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y

+ # CONFIG_EFI_DISABLE_RUNTIME is not set

  

  #

  # Tegra firmware driver
@@ -2461,6 +2479,7 @@ 

  CONFIG_MTD_NAND_ECC_SW_HAMMING=y

  # CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set

  # CONFIG_MTD_NAND_ECC_SW_BCH is not set

+ CONFIG_MTD_NAND_ECC_MXIC=y

  # end of ECC engine support

  # end of NAND

  
@@ -2476,9 +2495,6 @@ 

  # CONFIG_MTD_SPI_NOR_SWP_DISABLE is not set

  CONFIG_MTD_SPI_NOR_SWP_DISABLE_ON_VOLATILE=y

  # CONFIG_MTD_SPI_NOR_SWP_KEEP is not set

- CONFIG_SPI_INTEL_SPI=m

- CONFIG_SPI_INTEL_SPI_PCI=m

- CONFIG_SPI_INTEL_SPI_PLATFORM=m

  CONFIG_MTD_UBI=m

  CONFIG_MTD_UBI_WL_THRESHOLD=4096

  CONFIG_MTD_UBI_BEB_LIMIT=20
@@ -2554,6 +2570,7 @@ 

  CONFIG_NVME_CORE=y

  CONFIG_BLK_DEV_NVME=y

  CONFIG_NVME_MULTIPATH=y

+ # CONFIG_NVME_VERBOSE_ERRORS is not set

  # CONFIG_NVME_HWMON is not set

  CONFIG_NVME_FABRICS=m

  CONFIG_NVME_RDMA=m
@@ -3202,6 +3219,8 @@ 

  CONFIG_ENIC=m

  CONFIG_NET_VENDOR_CORTINA=y

  CONFIG_GEMINI_ETHERNET=m

+ CONFIG_NET_VENDOR_DAVICOM=y

+ # CONFIG_DM9051 is not set

  CONFIG_DNET=m

  CONFIG_NET_VENDOR_DEC=y

  CONFIG_NET_TULIP=y
@@ -3234,6 +3253,8 @@ 

  CONFIG_EZCHIP_NPS_MANAGEMENT_ENET=m

  CONFIG_NET_VENDOR_FUJITSU=y

  CONFIG_PCMCIA_FMVJ18X=m

+ CONFIG_NET_VENDOR_FUNGIBLE=y

+ # CONFIG_FUN_ETH is not set

  CONFIG_NET_VENDOR_GOOGLE=y

  CONFIG_GVE=m

  CONFIG_NET_VENDOR_HUAWEI=y
@@ -3819,6 +3840,7 @@ 

  # CONFIG_MT7915E is not set

  # CONFIG_MT7921E is not set

  # CONFIG_MT7921S is not set

+ # CONFIG_MT7921U is not set

  CONFIG_WLAN_VENDOR_MICROCHIP=y

  CONFIG_WILC1000=m

  CONFIG_WILC1000_SDIO=m
@@ -3978,6 +4000,7 @@ 

  CONFIG_INPUT_FF_MEMLESS=m

  CONFIG_INPUT_SPARSEKMAP=m

  CONFIG_INPUT_MATRIXKMAP=m

+ CONFIG_INPUT_VIVALDIFMAP=m

  

  #

  # Userland interfaces
@@ -4158,6 +4181,7 @@ 

  CONFIG_TOUCHSCREEN_MELFAS_MIP4=m

  # CONFIG_TOUCHSCREEN_MSG2638 is not set

  CONFIG_TOUCHSCREEN_MTOUCH=m

+ # CONFIG_TOUCHSCREEN_IMAGIS is not set

  CONFIG_TOUCHSCREEN_IMX6UL_TSC=m

  CONFIG_TOUCHSCREEN_INEXIO=m

  CONFIG_TOUCHSCREEN_MK712=m
@@ -4395,7 +4419,6 @@ 

  CONFIG_SERIAL_SC16IS7XX_I2C=y

  CONFIG_SERIAL_SC16IS7XX_SPI=y

  # CONFIG_SERIAL_TIMBERDALE is not set

- # CONFIG_SERIAL_BCM63XX is not set

  CONFIG_SERIAL_ALTERA_JTAGUART=m

  CONFIG_SERIAL_ALTERA_UART=m

  CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4
@@ -4541,6 +4564,7 @@ 

  #

  # PC SMBus host controller drivers

  #

+ CONFIG_I2C_CCGX_UCSI=m

  CONFIG_I2C_ALI1535=m

  CONFIG_I2C_ALI1563=m

  CONFIG_I2C_ALI15X3=m
@@ -4574,6 +4598,7 @@ 

  CONFIG_I2C_DESIGNWARE_CORE=y

  CONFIG_I2C_DESIGNWARE_SLAVE=y

  CONFIG_I2C_DESIGNWARE_PLATFORM=y

+ # CONFIG_I2C_DESIGNWARE_AMDPSP is not set

  CONFIG_I2C_DESIGNWARE_BAYTRAIL=y

  CONFIG_I2C_DESIGNWARE_PCI=m

  CONFIG_I2C_EG20T=m
@@ -4649,6 +4674,8 @@ 

  CONFIG_SPI_FSI=m

  CONFIG_SPI_NXP_FLEXSPI=m

  CONFIG_SPI_GPIO=m

+ # CONFIG_SPI_INTEL_PCI is not set

+ # CONFIG_SPI_INTEL_PLATFORM is not set

  CONFIG_SPI_LM70_LLP=m

  CONFIG_SPI_FSL_LIB=m

  CONFIG_SPI_FSL_SPI=m
@@ -4980,6 +5007,7 @@ 

  CONFIG_POWER_SUPPLY_HWMON=y

  CONFIG_PDA_POWER=m

  CONFIG_GENERIC_ADC_BATTERY=m

+ # CONFIG_IP5XXX_POWER is not set

  CONFIG_MAX8925_POWER=m

  CONFIG_WM831X_BACKUP=m

  CONFIG_WM831X_POWER=m
@@ -4994,6 +5022,7 @@ 

  CONFIG_BATTERY_DS2780=m

  CONFIG_BATTERY_DS2781=m

  CONFIG_BATTERY_DS2782=m

+ # CONFIG_BATTERY_SAMSUNG_SDI is not set

  CONFIG_BATTERY_SBS=m

  CONFIG_CHARGER_SBS=m

  CONFIG_MANAGER_SBS=m
@@ -5053,6 +5082,7 @@ 

  CONFIG_CHARGER_UCS1002=m

  # CONFIG_CHARGER_BD99954 is not set

  CONFIG_CHARGER_WILCO=m

+ # CONFIG_BATTERY_UG3105 is not set

  CONFIG_HWMON=y

  CONFIG_HWMON_VID=m

  # CONFIG_HWMON_DEBUG_CHIP is not set
@@ -5097,6 +5127,7 @@ 

  CONFIG_SENSORS_DS620=m

  CONFIG_SENSORS_DS1621=m

  CONFIG_SENSORS_DELL_SMM=m

+ # CONFIG_I8K is not set

  CONFIG_SENSORS_DA9052_ADC=m

  CONFIG_SENSORS_DA9055=m

  CONFIG_SENSORS_I5K_AMB=m
@@ -5199,6 +5230,7 @@ 

  CONFIG_SENSORS_IRPS5401=m

  CONFIG_SENSORS_ISL68137=m

  CONFIG_SENSORS_LM25066=m

+ # CONFIG_SENSORS_LM25066_REGULATOR is not set

  CONFIG_SENSORS_LTC2978=m

  # CONFIG_SENSORS_LTC2978_REGULATOR is not set

  CONFIG_SENSORS_LTC3815=m
@@ -5214,6 +5246,7 @@ 

  # CONFIG_SENSORS_MP2975 is not set

  # CONFIG_SENSORS_MP5023 is not set

  # CONFIG_SENSORS_PIM4328 is not set

+ # CONFIG_SENSORS_PLI1209BC is not set

  # CONFIG_SENSORS_PM6764TR is not set

  CONFIG_SENSORS_PXE1610=m

  # CONFIG_SENSORS_Q54SJ108A2 is not set
@@ -5223,6 +5256,7 @@ 

  CONFIG_SENSORS_UCD9000=m

  CONFIG_SENSORS_UCD9200=m

  CONFIG_SENSORS_XDPE122=m

+ # CONFIG_SENSORS_XDPE122_REGULATOR is not set

  CONFIG_SENSORS_ZL6100=m

  CONFIG_SENSORS_PWM_FAN=m

  # CONFIG_SENSORS_SBTSI is not set
@@ -5233,6 +5267,7 @@ 

  # CONFIG_SENSORS_SHT4x is not set

  CONFIG_SENSORS_SHTC1=m

  CONFIG_SENSORS_SIS5595=m

+ # CONFIG_SENSORS_SY7636A is not set

  CONFIG_SENSORS_DME1737=m

  CONFIG_SENSORS_EMC1403=m

  CONFIG_SENSORS_EMC2103=m
@@ -5260,6 +5295,7 @@ 

  CONFIG_SENSORS_TMP108=m

  CONFIG_SENSORS_TMP401=m

  CONFIG_SENSORS_TMP421=m

+ # CONFIG_SENSORS_TMP464 is not set

  # CONFIG_SENSORS_TMP513 is not set

  CONFIG_SENSORS_VIA_CPUTEMP=m

  CONFIG_SENSORS_VIA686A=m
@@ -5287,6 +5323,7 @@ 

  CONFIG_SENSORS_ATK0110=m

  # CONFIG_SENSORS_ASUS_WMI is not set

  # CONFIG_SENSORS_ASUS_WMI_EC is not set

+ # CONFIG_SENSORS_ASUS_EC is not set

  CONFIG_THERMAL=y

  # CONFIG_THERMAL_NETLINK is not set

  # CONFIG_THERMAL_STATISTICS is not set
@@ -5329,6 +5366,7 @@ 

  CONFIG_INTEL_PCH_THERMAL=m

  # CONFIG_INTEL_TCC_COOLING is not set

  CONFIG_INTEL_MENLOW=m

+ # CONFIG_INTEL_HFI_THERMAL is not set

  # end of Intel thermal drivers

  

  # CONFIG_TI_SOC_THERMAL is not set
@@ -5527,6 +5565,7 @@ 

  CONFIG_MFD_MAX77650=m

  CONFIG_MFD_MAX77686=m

  CONFIG_MFD_MAX77693=m

+ # CONFIG_MFD_MAX77714 is not set

  CONFIG_MFD_MAX77843=y

  CONFIG_MFD_MAX8907=m

  CONFIG_MFD_MAX8925=y
@@ -5552,6 +5591,7 @@ 

  CONFIG_MFD_RN5T618=m

  CONFIG_MFD_SEC_CORE=y

  CONFIG_MFD_SI476X_CORE=m

+ # CONFIG_MFD_SIMPLE_MFD_I2C is not set

  CONFIG_MFD_SM501=m

  CONFIG_MFD_SM501_GPIO=y

  CONFIG_MFD_SKY81452=m
@@ -5723,6 +5763,7 @@ 

  CONFIG_REGULATOR_ROHM=m

  # CONFIG_REGULATOR_RT4801 is not set

  CONFIG_REGULATOR_RT5033=m

+ # CONFIG_REGULATOR_RT5190A is not set

  # CONFIG_REGULATOR_RT6160 is not set

  # CONFIG_REGULATOR_RT6245 is not set

  # CONFIG_REGULATOR_RTQ2134 is not set
@@ -5734,12 +5775,14 @@ 

  CONFIG_REGULATOR_SKY81452=m

  CONFIG_REGULATOR_SLG51000=m

  CONFIG_REGULATOR_STPMIC1=m

+ # CONFIG_REGULATOR_SY7636A is not set

  CONFIG_REGULATOR_SY8106A=m

  CONFIG_REGULATOR_SY8824X=m

  CONFIG_REGULATOR_SY8827N=m

  CONFIG_REGULATOR_TPS51632=m

  CONFIG_REGULATOR_TPS6105X=m

  CONFIG_REGULATOR_TPS62360=m

+ # CONFIG_REGULATOR_TPS6286X is not set

  CONFIG_REGULATOR_TPS65023=m

  CONFIG_REGULATOR_TPS6507X=m

  CONFIG_REGULATOR_TPS65086=m
@@ -5759,45 +5802,45 @@ 

  CONFIG_REGULATOR_WM8994=m

  CONFIG_REGULATOR_QCOM_LABIBB=m

  CONFIG_RC_CORE=m

- CONFIG_RC_MAP=m

  CONFIG_LIRC=y

+ CONFIG_RC_MAP=m

  CONFIG_RC_DECODERS=y

+ CONFIG_IR_IMON_DECODER=m

+ CONFIG_IR_JVC_DECODER=m

+ CONFIG_IR_MCE_KBD_DECODER=m

  CONFIG_IR_NEC_DECODER=m

  CONFIG_IR_RC5_DECODER=m

  CONFIG_IR_RC6_DECODER=m

- CONFIG_IR_JVC_DECODER=m

- CONFIG_IR_SONY_DECODER=m

+ CONFIG_IR_RCMM_DECODER=m

  CONFIG_IR_SANYO_DECODER=m

  CONFIG_IR_SHARP_DECODER=m

- CONFIG_IR_MCE_KBD_DECODER=m

+ CONFIG_IR_SONY_DECODER=m

  CONFIG_IR_XMP_DECODER=m

- CONFIG_IR_IMON_DECODER=m

- CONFIG_IR_RCMM_DECODER=m

  CONFIG_RC_DEVICES=y

- CONFIG_RC_ATI_REMOTE=m

  CONFIG_IR_ENE=m

+ CONFIG_IR_FINTEK=m

+ CONFIG_IR_GPIO_CIR=m

+ CONFIG_IR_GPIO_TX=m

  CONFIG_IR_HIX5HD2=m

+ CONFIG_IR_IGORPLUGUSB=m

+ CONFIG_IR_IGUANA=m

  CONFIG_IR_IMON=m

  CONFIG_IR_IMON_RAW=m

- CONFIG_IR_MCEUSB=m

  CONFIG_IR_ITE_CIR=m

- CONFIG_IR_FINTEK=m

+ CONFIG_IR_MCEUSB=m

  CONFIG_IR_NUVOTON=m

+ CONFIG_IR_PWM_TX=m

  CONFIG_IR_REDRAT3=m

+ CONFIG_IR_SERIAL=m

+ CONFIG_IR_SERIAL_TRANSMITTER=y

  CONFIG_IR_SPI=m

  CONFIG_IR_STREAMZAP=m

- CONFIG_IR_WINBOND_CIR=m

- CONFIG_IR_IGORPLUGUSB=m

- CONFIG_IR_IGUANA=m

+ CONFIG_IR_TOY=m

  CONFIG_IR_TTUSBIR=m

+ CONFIG_IR_WINBOND_CIR=m

+ CONFIG_RC_ATI_REMOTE=m

  CONFIG_RC_LOOPBACK=m

- CONFIG_IR_GPIO_CIR=m

- CONFIG_IR_GPIO_TX=m

- CONFIG_IR_PWM_TX=m

- CONFIG_IR_SERIAL=m

- CONFIG_IR_SERIAL_TRANSMITTER=y

  CONFIG_RC_XBOX_DVD=m

- CONFIG_IR_TOY=m

  CONFIG_CEC_CORE=m

  CONFIG_CEC_NOTIFIER=y

  CONFIG_CEC_PIN=y
@@ -5843,7 +5886,6 @@ 

  #

  # Video4Linux options

  #

- CONFIG_VIDEO_V4L2=m

  CONFIG_VIDEO_V4L2_I2C=y

  CONFIG_VIDEO_V4L2_SUBDEV_API=y

  # CONFIG_VIDEO_ADV_DEBUG is not set
@@ -5879,17 +5921,17 @@ 

  #

  # Media drivers

  #

+ 

+ #

+ # Media drivers

+ #

  CONFIG_MEDIA_USB_SUPPORT=y

  

  #

  # Webcam devices

  #

- CONFIG_USB_VIDEO_CLASS=m

- CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y

+ CONFIG_VIDEO_CPIA2=m

  CONFIG_USB_GSPCA=m

- CONFIG_USB_M5602=m

- CONFIG_USB_STV06XX=m

- CONFIG_USB_GL860=m

  CONFIG_USB_GSPCA_BENQ=m

  CONFIG_USB_GSPCA_CONEX=m

  CONFIG_USB_GSPCA_CPIA1=m
@@ -5914,13 +5956,13 @@ 

  CONFIG_USB_GSPCA_SN9C20X=m

  CONFIG_USB_GSPCA_SONIXB=m

  CONFIG_USB_GSPCA_SONIXJ=m

+ CONFIG_USB_GSPCA_SPCA1528=m

  CONFIG_USB_GSPCA_SPCA500=m

  CONFIG_USB_GSPCA_SPCA501=m

  CONFIG_USB_GSPCA_SPCA505=m

  CONFIG_USB_GSPCA_SPCA506=m

  CONFIG_USB_GSPCA_SPCA508=m

  CONFIG_USB_GSPCA_SPCA561=m

- CONFIG_USB_GSPCA_SPCA1528=m

  CONFIG_USB_GSPCA_SQ905=m

  CONFIG_USB_GSPCA_SQ905C=m

  CONFIG_USB_GSPCA_SQ930X=m
@@ -5936,29 +5978,33 @@ 

  CONFIG_USB_GSPCA_VICAM=m

  CONFIG_USB_GSPCA_XIRLINK_CIT=m

  CONFIG_USB_GSPCA_ZC3XX=m

+ CONFIG_USB_GL860=m

+ CONFIG_USB_M5602=m

+ CONFIG_USB_STV06XX=m

  CONFIG_USB_PWC=m

  # CONFIG_USB_PWC_DEBUG is not set

  CONFIG_USB_PWC_INPUT_EVDEV=y

- CONFIG_VIDEO_CPIA2=m

- CONFIG_USB_ZR364XX=m

- CONFIG_USB_STKWEBCAM=m

  CONFIG_USB_S2255=m

+ CONFIG_USB_STKWEBCAM=m

  CONFIG_VIDEO_USBTV=m

+ CONFIG_USB_VIDEO_CLASS=m

+ CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y

+ CONFIG_USB_ZR364XX=m

  

  #

  # Analog TV USB devices

  #

+ CONFIG_VIDEO_GO7007=m

+ CONFIG_VIDEO_GO7007_USB=m

+ CONFIG_VIDEO_GO7007_LOADER=m

+ CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m

+ CONFIG_VIDEO_HDPVR=m

  CONFIG_VIDEO_PVRUSB2=m

  CONFIG_VIDEO_PVRUSB2_SYSFS=y

  CONFIG_VIDEO_PVRUSB2_DVB=y

  # CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set

- CONFIG_VIDEO_HDPVR=m

  CONFIG_VIDEO_STK1160_COMMON=m

  CONFIG_VIDEO_STK1160=m

- CONFIG_VIDEO_GO7007=m

- CONFIG_VIDEO_GO7007_USB=m

- CONFIG_VIDEO_GO7007_LOADER=m

- CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m

  

  #

  # Analog/digital TV USB devices
@@ -5977,34 +6023,9 @@ 

  #

  # Digital TV USB devices

  #

- CONFIG_DVB_USB=m

- # CONFIG_DVB_USB_DEBUG is not set

- CONFIG_DVB_USB_DIB3000MC=m

- CONFIG_DVB_USB_A800=m

- CONFIG_DVB_USB_DIBUSB_MB=m

- CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y

- CONFIG_DVB_USB_DIBUSB_MC=m

- CONFIG_DVB_USB_DIB0700=m

- CONFIG_DVB_USB_UMT_010=m

- CONFIG_DVB_USB_CXUSB=m

- # CONFIG_DVB_USB_CXUSB_ANALOG is not set

- CONFIG_DVB_USB_M920X=m

- CONFIG_DVB_USB_DIGITV=m

- CONFIG_DVB_USB_VP7045=m

- CONFIG_DVB_USB_VP702X=m

- CONFIG_DVB_USB_GP8PSK=m

- CONFIG_DVB_USB_NOVA_T_USB2=m

- CONFIG_DVB_USB_TTUSB2=m

- CONFIG_DVB_USB_DTT200U=m

- CONFIG_DVB_USB_OPERA1=m

- CONFIG_DVB_USB_AF9005=m

- CONFIG_DVB_USB_AF9005_REMOTE=m

- CONFIG_DVB_USB_PCTV452E=m

- CONFIG_DVB_USB_DW2102=m

- CONFIG_DVB_USB_CINERGY_T2=m

- CONFIG_DVB_USB_DTV5100=m

- CONFIG_DVB_USB_AZ6027=m

- CONFIG_DVB_USB_TECHNISAT_USB2=m

+ CONFIG_DVB_AS102=m

+ CONFIG_DVB_B2C2_FLEXCOP_USB=m

+ # CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set

  CONFIG_DVB_USB_V2=m

  CONFIG_DVB_USB_AF9015=m

  CONFIG_DVB_USB_AF9035=m
@@ -6012,19 +6033,44 @@ 

  CONFIG_DVB_USB_AU6610=m

  CONFIG_DVB_USB_AZ6007=m

  CONFIG_DVB_USB_CE6230=m

+ CONFIG_DVB_USB_DVBSKY=m

  CONFIG_DVB_USB_EC168=m

  CONFIG_DVB_USB_GL861=m

  CONFIG_DVB_USB_LME2510=m

  CONFIG_DVB_USB_MXL111SF=m

  CONFIG_DVB_USB_RTL28XXU=m

- CONFIG_DVB_USB_DVBSKY=m

  CONFIG_DVB_USB_ZD1301=m

+ CONFIG_DVB_USB=m

+ # CONFIG_DVB_USB_DEBUG is not set

+ CONFIG_DVB_USB_A800=m

+ CONFIG_DVB_USB_AF9005=m

+ CONFIG_DVB_USB_AF9005_REMOTE=m

+ CONFIG_DVB_USB_AZ6027=m

+ CONFIG_DVB_USB_CINERGY_T2=m

+ CONFIG_DVB_USB_CXUSB=m

+ # CONFIG_DVB_USB_CXUSB_ANALOG is not set

+ CONFIG_DVB_USB_DIB0700=m

+ CONFIG_DVB_USB_DIB3000MC=m

+ CONFIG_DVB_USB_DIBUSB_MB=m

+ CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y

+ CONFIG_DVB_USB_DIBUSB_MC=m

+ CONFIG_DVB_USB_DIGITV=m

+ CONFIG_DVB_USB_DTT200U=m

+ CONFIG_DVB_USB_DTV5100=m

+ CONFIG_DVB_USB_DW2102=m

+ CONFIG_DVB_USB_GP8PSK=m

+ CONFIG_DVB_USB_M920X=m

+ CONFIG_DVB_USB_NOVA_T_USB2=m

+ CONFIG_DVB_USB_OPERA1=m

+ CONFIG_DVB_USB_PCTV452E=m

+ CONFIG_DVB_USB_TECHNISAT_USB2=m

+ CONFIG_DVB_USB_TTUSB2=m

+ CONFIG_DVB_USB_UMT_010=m

+ CONFIG_DVB_USB_VP702X=m

+ CONFIG_DVB_USB_VP7045=m

+ CONFIG_SMS_USB_DRV=m

  CONFIG_DVB_TTUSB_BUDGET=m

  CONFIG_DVB_TTUSB_DEC=m

- CONFIG_SMS_USB_DRV=m

- CONFIG_DVB_B2C2_FLEXCOP_USB=m

- # CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set

- CONFIG_DVB_AS102=m

  

  #

  # Webcam, TV (analog/digital) USB devices
@@ -6055,6 +6101,7 @@ 

  #

  # Media capture/analog TV support

  #

+ CONFIG_VIDEO_DT3155=m

  CONFIG_VIDEO_IVTV=m

  CONFIG_VIDEO_IVTV_ALSA=m

  CONFIG_VIDEO_FB_IVTV=m
@@ -6062,11 +6109,12 @@ 

  CONFIG_VIDEO_HEXIUM_GEMINI=m

  CONFIG_VIDEO_HEXIUM_ORION=m

  CONFIG_VIDEO_MXB=m

- CONFIG_VIDEO_DT3155=m

  

  #

  # Media capture/analog/hybrid TV support

  #

+ CONFIG_VIDEO_BT848=m

+ CONFIG_DVB_BT8XX=m

  CONFIG_VIDEO_CX18=m

  CONFIG_VIDEO_CX18_ALSA=m

  CONFIG_VIDEO_CX23885=m
@@ -6080,8 +6128,6 @@ 

  CONFIG_VIDEO_CX88_ENABLE_VP3054=y

  CONFIG_VIDEO_CX88_VP3054=m

  CONFIG_VIDEO_CX88_MPEG=m

- CONFIG_VIDEO_BT848=m

- CONFIG_DVB_BT8XX=m

  CONFIG_VIDEO_SAA7134=m

  CONFIG_VIDEO_SAA7134_ALSA=m

  CONFIG_VIDEO_SAA7134_RC=y
@@ -6092,221 +6138,202 @@ 

  #

  # Media digital TV PCI Adapters

  #

- CONFIG_DVB_BUDGET_CORE=m

- CONFIG_DVB_BUDGET=m

- CONFIG_DVB_BUDGET_CI=m

- CONFIG_DVB_BUDGET_AV=m

  CONFIG_DVB_B2C2_FLEXCOP_PCI=m

  # CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set

- CONFIG_DVB_PLUTO2=m

+ CONFIG_DVB_DDBRIDGE=m

+ # CONFIG_DVB_DDBRIDGE_MSIENABLE is not set

  CONFIG_DVB_DM1105=m

- CONFIG_DVB_PT1=m

- CONFIG_DVB_PT3=m

  CONFIG_MANTIS_CORE=m

  CONFIG_DVB_MANTIS=m

  CONFIG_DVB_HOPPER=m

+ CONFIG_DVB_NETUP_UNIDVB=m

  CONFIG_DVB_NGENE=m

- CONFIG_DVB_DDBRIDGE=m

- # CONFIG_DVB_DDBRIDGE_MSIENABLE is not set

+ CONFIG_DVB_PLUTO2=m

+ CONFIG_DVB_PT1=m

+ CONFIG_DVB_PT3=m

  CONFIG_DVB_SMIPCIE=m

- CONFIG_DVB_NETUP_UNIDVB=m

+ CONFIG_DVB_BUDGET_CORE=m

+ CONFIG_DVB_BUDGET=m

+ CONFIG_DVB_BUDGET_CI=m

+ CONFIG_DVB_BUDGET_AV=m

  CONFIG_VIDEO_IPU3_CIO2=m

  # CONFIG_CIO2_BRIDGE is not set

- CONFIG_RADIO_ADAPTERS=y

+ CONFIG_RADIO_ADAPTERS=m

+ CONFIG_RADIO_MAXIRADIO=m

+ CONFIG_RADIO_SAA7706H=m

+ CONFIG_RADIO_SHARK=m

+ CONFIG_RADIO_SHARK2=m

+ CONFIG_RADIO_SI4713=m

+ CONFIG_RADIO_SI476X=m

  CONFIG_RADIO_TEA575X=m

+ CONFIG_RADIO_TEA5764=m

+ CONFIG_RADIO_TEF6862=m

+ CONFIG_RADIO_WL1273=m

+ CONFIG_USB_DSBR=m

+ CONFIG_USB_KEENE=m

+ CONFIG_USB_MA901=m

+ CONFIG_USB_MR800=m

+ CONFIG_USB_RAREMONO=m

  CONFIG_RADIO_SI470X=m

  CONFIG_USB_SI470X=m

  CONFIG_I2C_SI470X=m

- CONFIG_RADIO_SI4713=m

  CONFIG_USB_SI4713=m

  CONFIG_PLATFORM_SI4713=m

  CONFIG_I2C_SI4713=m

- CONFIG_RADIO_SI476X=m

- CONFIG_USB_MR800=m

- CONFIG_USB_DSBR=m

- CONFIG_RADIO_MAXIRADIO=m

- CONFIG_RADIO_SHARK=m

- CONFIG_RADIO_SHARK2=m

- CONFIG_USB_KEENE=m

- CONFIG_USB_RAREMONO=m

- CONFIG_USB_MA901=m

- CONFIG_RADIO_TEA5764=m

- CONFIG_RADIO_SAA7706H=m

- CONFIG_RADIO_TEF6862=m

- CONFIG_RADIO_WL1273=m

  CONFIG_RADIO_WL128X=m

  # CONFIG_V4L_RADIO_ISA_DRIVERS is not set

- CONFIG_MEDIA_COMMON_OPTIONS=y

- 

- #

- # common driver options

- #

- CONFIG_VIDEO_CX2341X=m

- CONFIG_VIDEO_TVEEPROM=m

- CONFIG_TTPCI_EEPROM=m

- CONFIG_CYPRESS_FIRMWARE=m

- CONFIG_VIDEOBUF2_CORE=m

- CONFIG_VIDEOBUF2_V4L2=m

- CONFIG_VIDEOBUF2_MEMOPS=m

- CONFIG_VIDEOBUF2_DMA_CONTIG=m

- CONFIG_VIDEOBUF2_VMALLOC=m

- CONFIG_VIDEOBUF2_DMA_SG=m

- CONFIG_VIDEOBUF2_DVB=m

- CONFIG_DVB_B2C2_FLEXCOP=m

- CONFIG_VIDEO_SAA7146=m

- CONFIG_VIDEO_SAA7146_VV=m

- CONFIG_SMS_SIANO_MDTV=m

- CONFIG_SMS_SIANO_RC=y

- # CONFIG_SMS_SIANO_DEBUGFS is not set

- CONFIG_VIDEO_V4L2_TPG=m

+ CONFIG_MEDIA_PLATFORM_DRIVERS=y

  CONFIG_V4L_PLATFORM_DRIVERS=y

- CONFIG_VIDEO_CAFE_CCIC=m

- # CONFIG_VIDEO_CADENCE is not set

- CONFIG_VIDEO_ASPEED=m

- CONFIG_VIDEO_MUX=m

- CONFIG_VIDEO_XILINX=m

- CONFIG_VIDEO_XILINX_CSI2RXSS=m

- CONFIG_VIDEO_XILINX_TPG=m

- CONFIG_VIDEO_XILINX_VTC=m

+ CONFIG_SDR_PLATFORM_DRIVERS=y

+ CONFIG_DVB_PLATFORM_DRIVERS=y

  CONFIG_V4L_MEM2MEM_DRIVERS=y

  CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m

- CONFIG_DVB_PLATFORM_DRIVERS=y

- CONFIG_SDR_PLATFORM_DRIVERS=y

+ CONFIG_VIDEO_MUX=m

  

  #

- # MMC/SDIO DVB adapters

+ # Allegro DVT media platform drivers

  #

- CONFIG_SMS_SDIO_DRV=m

- CONFIG_V4L_TEST_DRIVERS=y

- CONFIG_VIDEO_VIMC=m

- CONFIG_VIDEO_VIVID=m

- CONFIG_VIDEO_VIVID_CEC=y

- CONFIG_VIDEO_VIVID_MAX_DEVS=64

- CONFIG_VIDEO_VIM2M=m

- CONFIG_VIDEO_VICODEC=m

- # CONFIG_DVB_TEST_DRIVERS is not set

  

  #

- # FireWire (IEEE 1394) Adapters

+ # Amlogic media platform drivers

  #

- CONFIG_DVB_FIREDTV=m

- CONFIG_DVB_FIREDTV_INPUT=y

- # end of Media drivers

  

  #

- # Media ancillary drivers

+ # Amphion drivers

  #

- CONFIG_MEDIA_ATTACH=y

  

  #

- # IR I2C driver auto-selected by 'Autoselect ancillary drivers'

+ # Aspeed media platform drivers

  #

- CONFIG_VIDEO_IR_I2C=m

+ CONFIG_VIDEO_ASPEED=m

  

  #

- # Audio decoders, processors and mixers

+ # Atmel media platform drivers

  #

- CONFIG_VIDEO_TVAUDIO=m

- CONFIG_VIDEO_TDA7432=m

- CONFIG_VIDEO_TDA9840=m

- CONFIG_VIDEO_TDA1997X=m

- CONFIG_VIDEO_TEA6415C=m

- CONFIG_VIDEO_TEA6420=m

- CONFIG_VIDEO_MSP3400=m

- CONFIG_VIDEO_CS3308=m

- CONFIG_VIDEO_CS5345=m

- CONFIG_VIDEO_CS53L32A=m

- CONFIG_VIDEO_TLV320AIC23B=m

- CONFIG_VIDEO_UDA1342=m

- CONFIG_VIDEO_WM8775=m

- CONFIG_VIDEO_WM8739=m

- CONFIG_VIDEO_VP27SMPX=m

- CONFIG_VIDEO_SONY_BTF_MPX=m

- # end of Audio decoders, processors and mixers

  

  #

- # RDS decoders

+ # Cadence media platform drivers

  #

- CONFIG_VIDEO_SAA6588=m

- # end of RDS decoders

+ # CONFIG_VIDEO_CADENCE_CSI2RX is not set

+ # CONFIG_VIDEO_CADENCE_CSI2TX is not set

  

  #

- # Video decoders

+ # Chips&Media media platform drivers

  #

- CONFIG_VIDEO_ADV7180=m

- CONFIG_VIDEO_ADV7183=m

- CONFIG_VIDEO_ADV748X=m

- CONFIG_VIDEO_ADV7604=m

- # CONFIG_VIDEO_ADV7604_CEC is not set

- CONFIG_VIDEO_ADV7842=m

- # CONFIG_VIDEO_ADV7842_CEC is not set

- CONFIG_VIDEO_BT819=m

- CONFIG_VIDEO_BT856=m

- CONFIG_VIDEO_BT866=m

- CONFIG_VIDEO_KS0127=m

- CONFIG_VIDEO_ML86V7667=m

- CONFIG_VIDEO_SAA7110=m

- CONFIG_VIDEO_SAA711X=m

- CONFIG_VIDEO_TC358743=m

- # CONFIG_VIDEO_TC358743_CEC is not set

- CONFIG_VIDEO_TVP514X=m

- CONFIG_VIDEO_TVP5150=m

- CONFIG_VIDEO_TVP7002=m

- CONFIG_VIDEO_TW2804=m

- CONFIG_VIDEO_TW9903=m

- CONFIG_VIDEO_TW9906=m

- CONFIG_VIDEO_TW9910=m

- CONFIG_VIDEO_VPX3220=m

- CONFIG_VIDEO_MAX9286=m

  

  #

- # Video and audio decoders

+ # Intel media platform drivers

  #

- CONFIG_VIDEO_SAA717X=m

- CONFIG_VIDEO_CX25840=m

- # end of Video decoders

  

  #

- # Video encoders

+ # Marvell media platform drivers

  #

- CONFIG_VIDEO_SAA7127=m

- CONFIG_VIDEO_SAA7185=m

- CONFIG_VIDEO_ADV7170=m

- CONFIG_VIDEO_ADV7175=m

- CONFIG_VIDEO_ADV7343=m

- CONFIG_VIDEO_ADV7393=m

- CONFIG_VIDEO_AD9389B=m

- CONFIG_VIDEO_AK881X=m

- CONFIG_VIDEO_THS8200=m

- # end of Video encoders

+ CONFIG_VIDEO_CAFE_CCIC=m

  

  #

- # Video improvement chips

+ # Mediatek media platform drivers

  #

- CONFIG_VIDEO_UPD64031A=m

- CONFIG_VIDEO_UPD64083=m

- # end of Video improvement chips

  

  #

- # Audio/Video compression chips

+ # NVidia media platform drivers

  #

- CONFIG_VIDEO_SAA6752HS=m

- # end of Audio/Video compression chips

  

  #

- # SDR tuner chips

+ # NXP media platform drivers

  #

- CONFIG_SDR_MAX2175=m

- # end of SDR tuner chips

  

  #

- # Miscellaneous helper chips

+ # Qualcomm media platform drivers

  #

- CONFIG_VIDEO_THS7303=m

- CONFIG_VIDEO_M52790=m

- CONFIG_VIDEO_I2C=m

- CONFIG_VIDEO_ST_MIPID02=m

- # end of Miscellaneous helper chips

+ 

+ #

+ # Renesas media platform drivers

+ #

+ 

+ #

+ # Rockchip media platform drivers

+ #

+ 

+ #

+ # Samsung media platform drivers

+ #

+ 

+ #

+ # STMicroelectronics media platform drivers

+ #

+ 

+ #

+ # Sunxi media platform drivers

+ #

+ 

+ #

+ # Texas Instruments drivers

+ #

+ 

+ #

+ # VIA media platform drivers

+ #

+ 

+ #

+ # Xilinx media platform drivers

+ #

+ CONFIG_VIDEO_XILINX=m

+ CONFIG_VIDEO_XILINX_CSI2RXSS=m

+ CONFIG_VIDEO_XILINX_TPG=m

+ CONFIG_VIDEO_XILINX_VTC=m

+ 

+ #

+ # MMC/SDIO DVB adapters

+ #

+ CONFIG_SMS_SDIO_DRV=m

+ CONFIG_V4L_TEST_DRIVERS=y

+ CONFIG_VIDEO_VIM2M=m

+ CONFIG_VIDEO_VICODEC=m

+ CONFIG_VIDEO_VIMC=m

+ CONFIG_VIDEO_VIVID=m

+ CONFIG_VIDEO_VIVID_CEC=y

+ CONFIG_VIDEO_VIVID_MAX_DEVS=64

+ # CONFIG_DVB_TEST_DRIVERS is not set

+ 

+ #

+ # FireWire (IEEE 1394) Adapters

+ #

+ CONFIG_DVB_FIREDTV=m

+ CONFIG_DVB_FIREDTV_INPUT=y

+ CONFIG_MEDIA_COMMON_OPTIONS=y

+ 

+ #

+ # common driver options

+ #

+ CONFIG_CYPRESS_FIRMWARE=m

+ CONFIG_TTPCI_EEPROM=m

+ CONFIG_VIDEO_CX2341X=m

+ CONFIG_VIDEO_TVEEPROM=m

+ CONFIG_DVB_B2C2_FLEXCOP=m

+ CONFIG_VIDEO_SAA7146=m

+ CONFIG_VIDEO_SAA7146_VV=m

+ CONFIG_SMS_SIANO_MDTV=m

+ CONFIG_SMS_SIANO_RC=y

+ # CONFIG_SMS_SIANO_DEBUGFS is not set

+ CONFIG_VIDEO_V4L2_TPG=m

+ CONFIG_VIDEOBUF2_CORE=m

+ CONFIG_VIDEOBUF2_V4L2=m

+ CONFIG_VIDEOBUF2_MEMOPS=m

+ CONFIG_VIDEOBUF2_DMA_CONTIG=m

+ CONFIG_VIDEOBUF2_VMALLOC=m

+ CONFIG_VIDEOBUF2_DMA_SG=m

+ CONFIG_VIDEOBUF2_DVB=m

+ # end of Media drivers

+ 

+ #

+ # Media ancillary drivers

+ #

+ CONFIG_MEDIA_ATTACH=y

+ 

+ #

+ # IR I2C driver auto-selected by 'Autoselect ancillary drivers'

+ #

+ CONFIG_VIDEO_IR_I2C=m

  

  #

  # Camera sensor devices
@@ -6314,6 +6341,7 @@ 

  CONFIG_VIDEO_APTINA_PLL=m

  # CONFIG_VIDEO_HI556 is not set

  # CONFIG_VIDEO_HI846 is not set

+ # CONFIG_VIDEO_HI847 is not set

  # CONFIG_VIDEO_IMX208 is not set

  CONFIG_VIDEO_IMX214=m

  CONFIG_VIDEO_IMX219=m
@@ -6325,7 +6353,22 @@ 

  # CONFIG_VIDEO_IMX335 is not set

  CONFIG_VIDEO_IMX355=m

  # CONFIG_VIDEO_IMX412 is not set

+ CONFIG_VIDEO_MAX9271_LIB=m

+ CONFIG_VIDEO_MT9M001=m

+ CONFIG_VIDEO_MT9M032=m

+ CONFIG_VIDEO_MT9M111=m

+ CONFIG_VIDEO_MT9P031=m

+ CONFIG_VIDEO_MT9T001=m

+ CONFIG_VIDEO_MT9T112=m

+ CONFIG_VIDEO_MT9V011=m

+ CONFIG_VIDEO_MT9V032=m

+ CONFIG_VIDEO_MT9V111=m

+ CONFIG_VIDEO_NOON010PC30=m

+ # CONFIG_VIDEO_OG01A1B is not set

  # CONFIG_VIDEO_OV02A10 is not set

+ # CONFIG_VIDEO_OV08D10 is not set

+ CONFIG_VIDEO_OV13858=m

+ # CONFIG_VIDEO_OV13B10 is not set

  CONFIG_VIDEO_OV2640=m

  CONFIG_VIDEO_OV2659=m

  CONFIG_VIDEO_OV2680=m
@@ -6335,15 +6378,15 @@ 

  CONFIG_VIDEO_OV5645=m

  CONFIG_VIDEO_OV5647=m

  # CONFIG_VIDEO_OV5648 is not set

- CONFIG_VIDEO_OV6650=m

  CONFIG_VIDEO_OV5670=m

  CONFIG_VIDEO_OV5675=m

  # CONFIG_VIDEO_OV5693 is not set

  CONFIG_VIDEO_OV5695=m

+ CONFIG_VIDEO_OV6650=m

  CONFIG_VIDEO_OV7251=m

- CONFIG_VIDEO_OV772X=m

  CONFIG_VIDEO_OV7640=m

  CONFIG_VIDEO_OV7670=m

+ CONFIG_VIDEO_OV772X=m

  CONFIG_VIDEO_OV7740=m

  CONFIG_VIDEO_OV8856=m

  # CONFIG_VIDEO_OV8865 is not set
@@ -6351,32 +6394,19 @@ 

  CONFIG_VIDEO_OV9640=m

  CONFIG_VIDEO_OV9650=m

  # CONFIG_VIDEO_OV9734 is not set

- CONFIG_VIDEO_OV13858=m

- # CONFIG_VIDEO_OV13B10 is not set

- CONFIG_VIDEO_VS6624=m

- CONFIG_VIDEO_MT9M001=m

- CONFIG_VIDEO_MT9M032=m

- CONFIG_VIDEO_MT9M111=m

- CONFIG_VIDEO_MT9P031=m

- CONFIG_VIDEO_MT9T001=m

- CONFIG_VIDEO_MT9T112=m

- CONFIG_VIDEO_MT9V011=m

- CONFIG_VIDEO_MT9V032=m

- CONFIG_VIDEO_MT9V111=m

- CONFIG_VIDEO_SR030PC30=m

- CONFIG_VIDEO_NOON010PC30=m

- CONFIG_VIDEO_M5MOLS=m

- CONFIG_VIDEO_MAX9271_LIB=m

  CONFIG_VIDEO_RDACM20=m

  # CONFIG_VIDEO_RDACM21 is not set

  CONFIG_VIDEO_RJ54N1=m

- CONFIG_VIDEO_S5K6AA=m

- CONFIG_VIDEO_S5K6A3=m

+ CONFIG_VIDEO_S5C73M3=m

  CONFIG_VIDEO_S5K4ECGX=m

  CONFIG_VIDEO_S5K5BAF=m

+ CONFIG_VIDEO_S5K6A3=m

+ CONFIG_VIDEO_S5K6AA=m

+ CONFIG_VIDEO_SR030PC30=m

+ CONFIG_VIDEO_VS6624=m

  # CONFIG_VIDEO_CCS is not set

  CONFIG_VIDEO_ET8EK8=m

- CONFIG_VIDEO_S5C73M3=m

+ CONFIG_VIDEO_M5MOLS=m

  # end of Camera sensor devices

  

  #
@@ -6398,15 +6428,116 @@ 

  # end of Flash devices

  

  #

- # SPI helper chips

+ # Audio decoders, processors and mixers

  #

- CONFIG_VIDEO_GS1662=m

- # end of SPI helper chips

+ CONFIG_VIDEO_CS3308=m

+ CONFIG_VIDEO_CS5345=m

+ CONFIG_VIDEO_CS53L32A=m

+ CONFIG_VIDEO_MSP3400=m

+ CONFIG_VIDEO_SONY_BTF_MPX=m

+ CONFIG_VIDEO_TDA1997X=m

+ CONFIG_VIDEO_TDA7432=m

+ CONFIG_VIDEO_TDA9840=m

+ CONFIG_VIDEO_TEA6415C=m

+ CONFIG_VIDEO_TEA6420=m

+ CONFIG_VIDEO_TLV320AIC23B=m

+ CONFIG_VIDEO_TVAUDIO=m

+ CONFIG_VIDEO_UDA1342=m

+ CONFIG_VIDEO_VP27SMPX=m

+ CONFIG_VIDEO_WM8739=m

+ CONFIG_VIDEO_WM8775=m

+ # end of Audio decoders, processors and mixers

+ 

+ #

+ # RDS decoders

+ #

+ CONFIG_VIDEO_SAA6588=m

+ # end of RDS decoders

+ 

+ #

+ # Video decoders

+ #

+ CONFIG_VIDEO_ADV7180=m

+ CONFIG_VIDEO_ADV7183=m

+ CONFIG_VIDEO_ADV748X=m

+ CONFIG_VIDEO_ADV7604=m

+ # CONFIG_VIDEO_ADV7604_CEC is not set

+ CONFIG_VIDEO_ADV7842=m

+ # CONFIG_VIDEO_ADV7842_CEC is not set

+ CONFIG_VIDEO_BT819=m

+ CONFIG_VIDEO_BT856=m

+ CONFIG_VIDEO_BT866=m

+ # CONFIG_VIDEO_ISL7998X is not set

+ CONFIG_VIDEO_KS0127=m

+ CONFIG_VIDEO_MAX9286=m

+ CONFIG_VIDEO_ML86V7667=m

+ CONFIG_VIDEO_SAA7110=m

+ CONFIG_VIDEO_SAA711X=m

+ CONFIG_VIDEO_TC358743=m

+ # CONFIG_VIDEO_TC358743_CEC is not set

+ CONFIG_VIDEO_TVP514X=m

+ CONFIG_VIDEO_TVP5150=m

+ CONFIG_VIDEO_TVP7002=m

+ CONFIG_VIDEO_TW2804=m

+ CONFIG_VIDEO_TW9903=m

+ CONFIG_VIDEO_TW9906=m

+ CONFIG_VIDEO_TW9910=m

+ CONFIG_VIDEO_VPX3220=m

+ 

+ #

+ # Video and audio decoders

+ #

+ CONFIG_VIDEO_SAA717X=m

+ CONFIG_VIDEO_CX25840=m

+ # end of Video decoders

+ 

+ #

+ # Video encoders

+ #

+ CONFIG_VIDEO_AD9389B=m

+ CONFIG_VIDEO_ADV7170=m

+ CONFIG_VIDEO_ADV7175=m

+ CONFIG_VIDEO_ADV7343=m

+ CONFIG_VIDEO_ADV7393=m

+ CONFIG_VIDEO_AK881X=m

+ CONFIG_VIDEO_SAA7127=m

+ CONFIG_VIDEO_SAA7185=m

+ CONFIG_VIDEO_THS8200=m

+ # end of Video encoders

+ 

+ #

+ # Video improvement chips

+ #

+ CONFIG_VIDEO_UPD64031A=m

+ CONFIG_VIDEO_UPD64083=m

+ # end of Video improvement chips

+ 

+ #

+ # Audio/Video compression chips

+ #

+ CONFIG_VIDEO_SAA6752HS=m

+ # end of Audio/Video compression chips

+ 

+ #

+ # SDR tuner chips

+ #

+ CONFIG_SDR_MAX2175=m

+ # end of SDR tuner chips

+ 

+ #

+ # Miscellaneous helper chips

+ #

+ CONFIG_VIDEO_I2C=m

+ CONFIG_VIDEO_M52790=m

+ CONFIG_VIDEO_ST_MIPID02=m

+ CONFIG_VIDEO_THS7303=m

+ # end of Miscellaneous helper chips

  

  #

  # Media SPI Adapters

  #

  CONFIG_CXD2880_SPI_DRV=m

+ CONFIG_VIDEO_GS1662=m

  # end of Media SPI Adapters

  

  CONFIG_MEDIA_TUNER=m
@@ -6414,43 +6545,43 @@ 

  #

  # Customize TV tuners

  #

- CONFIG_MEDIA_TUNER_SIMPLE=m

- CONFIG_MEDIA_TUNER_TDA18250=m

- CONFIG_MEDIA_TUNER_TDA8290=m

- CONFIG_MEDIA_TUNER_TDA827X=m

- CONFIG_MEDIA_TUNER_TDA18271=m

- CONFIG_MEDIA_TUNER_TDA9887=m

- CONFIG_MEDIA_TUNER_TEA5761=m

- CONFIG_MEDIA_TUNER_TEA5767=m

+ CONFIG_MEDIA_TUNER_E4000=m

+ CONFIG_MEDIA_TUNER_FC0011=m

+ CONFIG_MEDIA_TUNER_FC0012=m

+ CONFIG_MEDIA_TUNER_FC0013=m

+ CONFIG_MEDIA_TUNER_FC2580=m

+ CONFIG_MEDIA_TUNER_IT913X=m

+ CONFIG_MEDIA_TUNER_M88RS6000T=m

+ CONFIG_MEDIA_TUNER_MAX2165=m

+ CONFIG_MEDIA_TUNER_MC44S803=m

  CONFIG_MEDIA_TUNER_MSI001=m

- CONFIG_MEDIA_TUNER_MT20XX=m

  CONFIG_MEDIA_TUNER_MT2060=m

  CONFIG_MEDIA_TUNER_MT2063=m

- CONFIG_MEDIA_TUNER_MT2266=m

+ CONFIG_MEDIA_TUNER_MT20XX=m

  CONFIG_MEDIA_TUNER_MT2131=m

- CONFIG_MEDIA_TUNER_QT1010=m

- CONFIG_MEDIA_TUNER_XC2028=m

- CONFIG_MEDIA_TUNER_XC5000=m

- CONFIG_MEDIA_TUNER_XC4000=m

+ CONFIG_MEDIA_TUNER_MT2266=m

+ CONFIG_MEDIA_TUNER_MXL301RF=m

  CONFIG_MEDIA_TUNER_MXL5005S=m

  CONFIG_MEDIA_TUNER_MXL5007T=m

- CONFIG_MEDIA_TUNER_MC44S803=m

- CONFIG_MEDIA_TUNER_MAX2165=m

- CONFIG_MEDIA_TUNER_TDA18218=m

- CONFIG_MEDIA_TUNER_FC0011=m

- CONFIG_MEDIA_TUNER_FC0012=m

- CONFIG_MEDIA_TUNER_FC0013=m

+ CONFIG_MEDIA_TUNER_QM1D1B0004=m

+ CONFIG_MEDIA_TUNER_QM1D1C0042=m

+ CONFIG_MEDIA_TUNER_QT1010=m

+ CONFIG_MEDIA_TUNER_R820T=m

+ CONFIG_MEDIA_TUNER_SI2157=m

+ CONFIG_MEDIA_TUNER_SIMPLE=m

  CONFIG_MEDIA_TUNER_TDA18212=m

- CONFIG_MEDIA_TUNER_E4000=m

- CONFIG_MEDIA_TUNER_FC2580=m

- CONFIG_MEDIA_TUNER_M88RS6000T=m

+ CONFIG_MEDIA_TUNER_TDA18218=m

+ CONFIG_MEDIA_TUNER_TDA18250=m

+ CONFIG_MEDIA_TUNER_TDA18271=m

+ CONFIG_MEDIA_TUNER_TDA827X=m

+ CONFIG_MEDIA_TUNER_TDA8290=m

+ CONFIG_MEDIA_TUNER_TDA9887=m

+ CONFIG_MEDIA_TUNER_TEA5761=m

+ CONFIG_MEDIA_TUNER_TEA5767=m

  CONFIG_MEDIA_TUNER_TUA9001=m

- CONFIG_MEDIA_TUNER_SI2157=m

- CONFIG_MEDIA_TUNER_IT913X=m

- CONFIG_MEDIA_TUNER_R820T=m

- CONFIG_MEDIA_TUNER_MXL301RF=m

- CONFIG_MEDIA_TUNER_QM1D1C0042=m

- CONFIG_MEDIA_TUNER_QM1D1B0004=m

+ CONFIG_MEDIA_TUNER_XC2028=m

+ CONFIG_MEDIA_TUNER_XC4000=m

+ CONFIG_MEDIA_TUNER_XC5000=m

  # end of Customize TV tuners

  

  #
@@ -6460,126 +6591,126 @@ 

  #

  # Multistandard (satellite) frontends

  #

+ CONFIG_DVB_M88DS3103=m

+ CONFIG_DVB_MXL5XX=m

  CONFIG_DVB_STB0899=m

  CONFIG_DVB_STB6100=m

  CONFIG_DVB_STV090x=m

  CONFIG_DVB_STV0910=m

  CONFIG_DVB_STV6110x=m

  CONFIG_DVB_STV6111=m

- CONFIG_DVB_MXL5XX=m

- CONFIG_DVB_M88DS3103=m

  

  #

  # Multistandard (cable + terrestrial) frontends

  #

  CONFIG_DVB_DRXK=m

- CONFIG_DVB_TDA18271C2DD=m

- CONFIG_DVB_SI2165=m

  CONFIG_DVB_MN88472=m

  CONFIG_DVB_MN88473=m

+ CONFIG_DVB_SI2165=m

+ CONFIG_DVB_TDA18271C2DD=m

  

  #

  # DVB-S (satellite) frontends

  #

  CONFIG_DVB_CX24110=m

+ CONFIG_DVB_CX24116=m

+ CONFIG_DVB_CX24117=m

+ CONFIG_DVB_CX24120=m

  CONFIG_DVB_CX24123=m

+ CONFIG_DVB_DS3000=m

+ CONFIG_DVB_MB86A16=m

  CONFIG_DVB_MT312=m

- CONFIG_DVB_ZL10036=m

- CONFIG_DVB_ZL10039=m

  CONFIG_DVB_S5H1420=m

- CONFIG_DVB_STV0288=m

+ CONFIG_DVB_SI21XX=m

  CONFIG_DVB_STB6000=m

+ CONFIG_DVB_STV0288=m

  CONFIG_DVB_STV0299=m

- CONFIG_DVB_STV6110=m

  CONFIG_DVB_STV0900=m

- CONFIG_DVB_TDA8083=m

+ CONFIG_DVB_STV6110=m

+ CONFIG_DVB_TDA10071=m

  CONFIG_DVB_TDA10086=m

+ CONFIG_DVB_TDA8083=m

  CONFIG_DVB_TDA8261=m

- CONFIG_DVB_VES1X93=m

- CONFIG_DVB_TUNER_ITD1000=m

- CONFIG_DVB_TUNER_CX24113=m

  CONFIG_DVB_TDA826X=m

- CONFIG_DVB_TUA6100=m

- CONFIG_DVB_CX24116=m

- CONFIG_DVB_CX24117=m

- CONFIG_DVB_CX24120=m

- CONFIG_DVB_SI21XX=m

  CONFIG_DVB_TS2020=m

- CONFIG_DVB_DS3000=m

- CONFIG_DVB_MB86A16=m

- CONFIG_DVB_TDA10071=m

+ CONFIG_DVB_TUA6100=m

+ CONFIG_DVB_TUNER_CX24113=m

+ CONFIG_DVB_TUNER_ITD1000=m

+ CONFIG_DVB_VES1X93=m

+ CONFIG_DVB_ZL10036=m

+ CONFIG_DVB_ZL10039=m

  

  #

  # DVB-T (terrestrial) frontends

  #

- CONFIG_DVB_SP887X=m

+ CONFIG_DVB_AF9013=m

+ CONFIG_DVB_AS102_FE=m

  CONFIG_DVB_CX22700=m

  CONFIG_DVB_CX22702=m

- CONFIG_DVB_S5H1432=m

- CONFIG_DVB_DRXD=m

- CONFIG_DVB_L64781=m

- CONFIG_DVB_TDA1004X=m

- CONFIG_DVB_NXT6000=m

- CONFIG_DVB_MT352=m

- CONFIG_DVB_ZL10353=m

+ CONFIG_DVB_CXD2820R=m

+ CONFIG_DVB_CXD2841ER=m

  CONFIG_DVB_DIB3000MB=m

  CONFIG_DVB_DIB3000MC=m

  CONFIG_DVB_DIB7000M=m

  CONFIG_DVB_DIB7000P=m

  CONFIG_DVB_DIB9000=m

- CONFIG_DVB_TDA10048=m

- CONFIG_DVB_AF9013=m

+ CONFIG_DVB_DRXD=m

  CONFIG_DVB_EC100=m

- CONFIG_DVB_STV0367=m

- CONFIG_DVB_CXD2820R=m

- CONFIG_DVB_CXD2841ER=m

+ CONFIG_DVB_GP8PSK_FE=m

+ CONFIG_DVB_L64781=m

+ CONFIG_DVB_MT352=m

+ CONFIG_DVB_NXT6000=m

  CONFIG_DVB_RTL2830=m

  CONFIG_DVB_RTL2832=m

  CONFIG_DVB_RTL2832_SDR=m

+ CONFIG_DVB_S5H1432=m

  CONFIG_DVB_SI2168=m

- CONFIG_DVB_AS102_FE=m

+ CONFIG_DVB_SP887X=m

+ CONFIG_DVB_STV0367=m

+ CONFIG_DVB_TDA10048=m

+ CONFIG_DVB_TDA1004X=m

  CONFIG_DVB_ZD1301_DEMOD=m

- CONFIG_DVB_GP8PSK_FE=m

+ CONFIG_DVB_ZL10353=m

  CONFIG_DVB_CXD2880=m

  

  #

  # DVB-C (cable) frontends

  #

- CONFIG_DVB_VES1820=m

+ CONFIG_DVB_STV0297=m

  CONFIG_DVB_TDA10021=m

  CONFIG_DVB_TDA10023=m

- CONFIG_DVB_STV0297=m

+ CONFIG_DVB_VES1820=m

  

  #

  # ATSC (North American/Korean Terrestrial/Cable DTV) frontends

  #

- CONFIG_DVB_NXT200X=m

- CONFIG_DVB_OR51211=m

- CONFIG_DVB_OR51132=m

+ CONFIG_DVB_AU8522=m

+ CONFIG_DVB_AU8522_DTV=m

+ CONFIG_DVB_AU8522_V4L=m

  CONFIG_DVB_BCM3510=m

- CONFIG_DVB_LGDT330X=m

+ CONFIG_DVB_LG2160=m

  CONFIG_DVB_LGDT3305=m

  CONFIG_DVB_LGDT3306A=m

- CONFIG_DVB_LG2160=m

+ CONFIG_DVB_LGDT330X=m

+ CONFIG_DVB_MXL692=m

+ CONFIG_DVB_NXT200X=m

+ CONFIG_DVB_OR51132=m

+ CONFIG_DVB_OR51211=m

  CONFIG_DVB_S5H1409=m

- CONFIG_DVB_AU8522=m

- CONFIG_DVB_AU8522_DTV=m

- CONFIG_DVB_AU8522_V4L=m

  CONFIG_DVB_S5H1411=m

- CONFIG_DVB_MXL692=m

  

  #

  # ISDB-T (terrestrial) frontends

  #

- CONFIG_DVB_S921=m

  CONFIG_DVB_DIB8000=m

  CONFIG_DVB_MB86A20S=m

+ CONFIG_DVB_S921=m

  

  #

  # ISDB-S (satellite) & ISDB-T (terrestrial) frontends

  #

- CONFIG_DVB_TC90522=m

  CONFIG_DVB_MN88443X=m

+ CONFIG_DVB_TC90522=m

  

  #

  # Digital terrestrial only tuners/PLL
@@ -6591,25 +6722,25 @@ 

  #

  # SEC control devices for DVB-S

  #

- CONFIG_DVB_DRX39XYJ=m

- CONFIG_DVB_LNBH25=m

- CONFIG_DVB_LNBH29=m

- CONFIG_DVB_LNBP21=m

- CONFIG_DVB_LNBP22=m

+ CONFIG_DVB_A8293=m

+ CONFIG_DVB_AF9033=m

+ CONFIG_DVB_ASCOT2E=m

+ CONFIG_DVB_ATBM8830=m

+ CONFIG_DVB_HELENE=m

+ CONFIG_DVB_HORUS3A=m

  CONFIG_DVB_ISL6405=m

  CONFIG_DVB_ISL6421=m

  CONFIG_DVB_ISL6423=m

- CONFIG_DVB_A8293=m

+ CONFIG_DVB_IX2505V=m

  CONFIG_DVB_LGS8GL5=m

  CONFIG_DVB_LGS8GXX=m

- CONFIG_DVB_ATBM8830=m

- CONFIG_DVB_TDA665x=m

- CONFIG_DVB_IX2505V=m

+ CONFIG_DVB_LNBH25=m

+ CONFIG_DVB_LNBH29=m

+ CONFIG_DVB_LNBP21=m

+ CONFIG_DVB_LNBP22=m

  CONFIG_DVB_M88RS2000=m

- CONFIG_DVB_AF9033=m

- CONFIG_DVB_HORUS3A=m

- CONFIG_DVB_ASCOT2E=m

- CONFIG_DVB_HELENE=m

+ CONFIG_DVB_TDA665x=m

+ CONFIG_DVB_DRX39XYJ=m

  

  #

  # Common Interface (EN50221) controller drivers
@@ -6639,8 +6770,6 @@ 

  CONFIG_AGP_VIA=m

  CONFIG_AGP_EFFICEON=m

  CONFIG_INTEL_GTT=m

- CONFIG_VGA_ARB=y

- CONFIG_VGA_ARB_MAX_GPUS=10

  CONFIG_VGA_SWITCHEROO=y

  CONFIG_DRM=m

  CONFIG_DRM_MIPI_DBI=m
@@ -6648,6 +6777,7 @@ 

  CONFIG_DRM_DP_AUX_BUS=m

  CONFIG_DRM_DP_AUX_CHARDEV=y

  CONFIG_DRM_DEBUG_SELFTEST=m

+ CONFIG_DRM_DP_HELPER=m

  CONFIG_DRM_KMS_HELPER=m

  # CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS is not set

  # CONFIG_DRM_DEBUG_MODESET_LOCK is not set
@@ -6657,6 +6787,7 @@ 

  CONFIG_DRM_LOAD_EDID_FIRMWARE=y

  CONFIG_DRM_DP_CEC=y

  CONFIG_DRM_TTM=m

+ CONFIG_DRM_BUDDY=m

  CONFIG_DRM_VRAM_HELPER=m

  CONFIG_DRM_TTM_HELPER=m

  CONFIG_DRM_GEM_CMA_HELPER=m
@@ -6790,6 +6921,7 @@ 

  CONFIG_DRM_PANEL_LG_LG4573=m

  CONFIG_DRM_PANEL_NEC_NL8048HL11=m

  CONFIG_DRM_PANEL_NOVATEK_NT35510=m

+ # CONFIG_DRM_PANEL_NOVATEK_NT35560 is not set

  # CONFIG_DRM_PANEL_NOVATEK_NT35950 is not set

  # CONFIG_DRM_PANEL_NOVATEK_NT36672A is not set

  CONFIG_DRM_PANEL_NOVATEK_NT39016=m
@@ -6822,7 +6954,6 @@ 

  CONFIG_DRM_PANEL_SITRONIX_ST7701=m

  CONFIG_DRM_PANEL_SITRONIX_ST7703=m

  CONFIG_DRM_PANEL_SITRONIX_ST7789V=m

- CONFIG_DRM_PANEL_SONY_ACX424AKP=m

  CONFIG_DRM_PANEL_SONY_ACX565AKM=m

  # CONFIG_DRM_PANEL_SONY_TULIP_TRULY_NT35521 is not set

  # CONFIG_DRM_PANEL_TDO_TL070WSH30 is not set
@@ -6846,6 +6977,7 @@ 

  # CONFIG_DRM_CHRONTEL_CH7033 is not set

  # CONFIG_DRM_CROS_EC_ANX7688 is not set

  CONFIG_DRM_DISPLAY_CONNECTOR=m

+ # CONFIG_DRM_ITE_IT6505 is not set

  # CONFIG_DRM_LONTIUM_LT8912B is not set

  # CONFIG_DRM_LONTIUM_LT9611 is not set

  # CONFIG_DRM_LONTIUM_LT9611UXC is not set
@@ -6892,6 +7024,7 @@ 

  CONFIG_DRM_BOCHS=m

  CONFIG_DRM_CIRRUS_QEMU=m

  CONFIG_DRM_GM12U320=m

+ # CONFIG_DRM_PANEL_MIPI_DBI is not set

  # CONFIG_DRM_SIMPLEDRM is not set

  CONFIG_TINYDRM_HX8357D=m

  # CONFIG_TINYDRM_ILI9163 is not set
@@ -6904,6 +7037,7 @@ 

  CONFIG_TINYDRM_ST7735R=m

  CONFIG_DRM_VBOXVIDEO=m

  # CONFIG_DRM_GUD is not set

+ # CONFIG_DRM_SSD130X is not set

  # CONFIG_DRM_HYPERV is not set

  CONFIG_DRM_LEGACY=y

  CONFIG_DRM_TDFX=m
@@ -7386,6 +7520,7 @@ 

  # CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC is not set

  CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m

  CONFIG_SND_SOC_ACPI_INTEL_MATCH=m

+ # CONFIG_SND_SOC_INTEL_AVS is not set

  CONFIG_SND_SOC_INTEL_MACH=y

  # CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES is not set

  CONFIG_SND_SOC_INTEL_HDA_DSP_COMMON=m
@@ -7417,7 +7552,6 @@ 

  CONFIG_SND_SOC_SOF_PCI=m

  CONFIG_SND_SOC_SOF_ACPI=m

  CONFIG_SND_SOC_SOF_OF=m

- # CONFIG_SND_SOC_SOF_DEBUG_PROBES is not set

  # CONFIG_SND_SOC_SOF_AMD_TOPLEVEL is not set

  # CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL is not set

  
@@ -7457,6 +7591,7 @@ 

  CONFIG_SND_SOC_AK5386=m

  CONFIG_SND_SOC_AK5558=m

  CONFIG_SND_SOC_ALC5623=m

+ # CONFIG_SND_SOC_AW8738 is not set

  CONFIG_SND_SOC_BD28623=m

  # CONFIG_SND_SOC_BT_SCO is not set

  CONFIG_SND_SOC_CPCAP=m
@@ -7592,6 +7727,7 @@ 

  CONFIG_SND_SOC_TAS5086=m

  CONFIG_SND_SOC_TAS571X=m

  CONFIG_SND_SOC_TAS5720=m

+ # CONFIG_SND_SOC_TAS5805M is not set

  CONFIG_SND_SOC_TAS6424=m

  CONFIG_SND_SOC_TDA7419=m

  CONFIG_SND_SOC_TFA9879=m
@@ -7716,6 +7852,7 @@ 

  CONFIG_HID_GLORIOUS=m

  CONFIG_HID_HOLTEK=m

  CONFIG_HOLTEK_FF=y

+ CONFIG_HID_VIVALDI_COMMON=m

  CONFIG_HID_GOOGLE_HAMMER=m

  # CONFIG_HID_VIVALDI is not set

  CONFIG_HID_GT683R=m
@@ -7765,12 +7902,14 @@ 

  CONFIG_HID_PICOLCD_CIR=y

  CONFIG_HID_PLANTRONICS=m

  # CONFIG_HID_PLAYSTATION is not set

+ # CONFIG_HID_RAZER is not set

  CONFIG_HID_PRIMAX=m

  CONFIG_HID_RETRODE=m

  CONFIG_HID_ROCCAT=m

  CONFIG_HID_SAITEK=m

  CONFIG_HID_SAMSUNG=m

  # CONFIG_HID_SEMITEK is not set

+ # CONFIG_HID_SIGMAMICRO is not set

  CONFIG_HID_SONY=m

  CONFIG_SONY_FF=y

  CONFIG_HID_SPEEDLINK=m
@@ -8209,8 +8348,10 @@ 

  CONFIG_UCSI_CCG=m

  CONFIG_UCSI_ACPI=m

  CONFIG_TYPEC_TPS6598X=m

+ # CONFIG_TYPEC_RT1719 is not set

  # CONFIG_TYPEC_HD3SS3220 is not set

  # CONFIG_TYPEC_STUSB160X is not set

+ # CONFIG_TYPEC_WUSB3801 is not set

  

  #

  # USB Type-C Multiplexer/DeMultiplexer Switch support
@@ -8727,9 +8868,11 @@ 

  CONFIG_VFIO_PCI=m

  CONFIG_VFIO_PCI_VGA=y

  CONFIG_VFIO_PCI_IGD=y

+ # CONFIG_MLX5_VFIO_PCI is not set

  CONFIG_VFIO_MDEV=m

  CONFIG_IRQ_BYPASS_MANAGER=m

  CONFIG_VIRT_DRIVERS=y

+ CONFIG_VMGENID=y

  CONFIG_VBOXGUEST=m

  # CONFIG_NITRO_ENCLAVES is not set

  CONFIG_VIRTIO=m
@@ -8944,7 +9087,6 @@ 

  # Analog to digital converters

  #

  CONFIG_AD7816=m

- CONFIG_AD7280=m

  # end of Analog to digital converters

  

  #
@@ -9000,18 +9142,11 @@ 

  CONFIG_DVB_AV7110_OSD=y

  CONFIG_DVB_BUDGET_PATCH=m

  CONFIG_DVB_SP8870=m

- 

- #

- # Android

- #

- # end of Android

- 

  CONFIG_STAGING_BOARD=y

  CONFIG_LTE_GDM724X=m

  CONFIG_FIREWIRE_SERIAL=m

  CONFIG_FWTTY_MAX_TOTAL_PORTS=64

  CONFIG_FWTTY_MAX_CARD_PORTS=32

- CONFIG_GS_FPGABOOT=m

  CONFIG_UNISYSSPAR=y

  # CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set

  # CONFIG_FB_TFT is not set
@@ -9077,7 +9212,6 @@ 

  CONFIG_INTEL_ATOMISP2_LED=m

  CONFIG_INTEL_ATOMISP2_PM=m

  # CONFIG_INTEL_SAR_INT1092 is not set

- CONFIG_INTEL_CHT_INT33FE=m

  # CONFIG_INTEL_SKL_INT3472 is not set

  CONFIG_INTEL_PMC_CORE=y

  CONFIG_INTEL_WMI=y
@@ -9088,6 +9222,7 @@ 

  CONFIG_INTEL_INT0002_VGPIO=m

  CONFIG_INTEL_OAKTRAIL=m

  CONFIG_INTEL_CHTDC_TI_PWRBTN=m

+ # CONFIG_INTEL_CHTWC_INT33FE is not set

  CONFIG_INTEL_PUNIT_IPC=m

  CONFIG_INTEL_RST=m

  CONFIG_INTEL_SMARTCONNECT=m
@@ -9110,7 +9245,7 @@ 

  CONFIG_SONYPI_COMPAT=y

  # CONFIG_SYSTEM76_ACPI is not set

  CONFIG_TOPSTAR_LAPTOP=m

- CONFIG_I2C_MULTI_INSTANTIATE=m

+ # CONFIG_SERIAL_MULTI_INSTANTIATE is not set

  CONFIG_MLX_PLATFORM=m

  CONFIG_TOUCHSCREEN_DMI=y

  # CONFIG_X86_ANDROID_TABLETS is not set
@@ -9139,6 +9274,7 @@ 

  CONFIG_CROS_EC_TYPEC=m

  CONFIG_CROS_USBPD_LOGGER=m

  CONFIG_CROS_USBPD_NOTIFY=m

+ # CONFIG_CHROMEOS_PRIVACY_SCREEN is not set

  CONFIG_WILCO_EC=m

  CONFIG_WILCO_EC_DEBUGFS=m

  CONFIG_WILCO_EC_EVENTS=m
@@ -9149,7 +9285,6 @@ 

  # CONFIG_MLXREG_LC is not set

  CONFIG_SURFACE_PLATFORMS=y

  CONFIG_SURFACE3_WMI=m

- CONFIG_SURFACE_3_BUTTON=m

  CONFIG_SURFACE_3_POWER_OPREGION=m

  # CONFIG_SURFACE_GPE is not set

  # CONFIG_SURFACE_HOTPLUG is not set
@@ -9171,12 +9306,12 @@ 

  CONFIG_COMMON_CLK_CDCE706=m

  CONFIG_COMMON_CLK_CDCE925=m

  CONFIG_COMMON_CLK_CS2000_CP=m

- # CONFIG_COMMON_CLK_LAN966X is not set

  CONFIG_COMMON_CLK_S2MPS11=m

  CONFIG_CLK_TWL6040=m

  # CONFIG_COMMON_CLK_AXI_CLKGEN is not set

  CONFIG_COMMON_CLK_PALMAS=m

  CONFIG_COMMON_CLK_PWM=m

+ # CONFIG_COMMON_CLK_RS9_PCIE is not set

  CONFIG_COMMON_CLK_VC5=m

  CONFIG_COMMON_CLK_BD718XX=m

  # CONFIG_COMMON_CLK_FIXED_MMIO is not set
@@ -9234,6 +9369,7 @@ 

  #

  CONFIG_RPMSG=m

  CONFIG_RPMSG_CHAR=m

+ # CONFIG_RPMSG_CTRL is not set

  CONFIG_RPMSG_NS=m

  CONFIG_RPMSG_QCOM_GLINK=m

  CONFIG_RPMSG_QCOM_GLINK_RPM=m
@@ -9357,6 +9493,8 @@ 

  # CONFIG_ADXL313_SPI is not set

  # CONFIG_ADXL355_I2C is not set

  # CONFIG_ADXL355_SPI is not set

+ # CONFIG_ADXL367_SPI is not set

+ # CONFIG_ADXL367_I2C is not set

  CONFIG_ADXL372=m

  CONFIG_ADXL372_SPI=m

  CONFIG_ADXL372_I2C=m
@@ -9409,6 +9547,7 @@ 

  CONFIG_AD7124=m

  CONFIG_AD7192=m

  CONFIG_AD7266=m

+ CONFIG_AD7280=m

  CONFIG_AD7291=m

  # CONFIG_AD7292 is not set

  CONFIG_AD7298=m
@@ -9499,6 +9638,7 @@ 

  # Amplifiers

  #

  CONFIG_AD8366=m

+ # CONFIG_ADA4250 is not set

  CONFIG_HMC425=m

  # end of Amplifiers

  
@@ -9575,6 +9715,7 @@ 

  CONFIG_AD5593R=m

  CONFIG_AD5504=m

  CONFIG_AD5624R_SPI=m

+ # CONFIG_LTC2688 is not set

  CONFIG_AD5686=m

  CONFIG_AD5686_SPI=m

  CONFIG_AD5696_I2C=m
@@ -9631,6 +9772,7 @@ 

  CONFIG_ADF4350=m

  CONFIG_ADF4371=m

  # CONFIG_ADMV1013 is not set

+ # CONFIG_ADMV4420 is not set

  # CONFIG_ADRF6780 is not set

  # end of Phase-Locked Loop (PLL) frequency synthesizers

  # end of Frequency Synthesizers DDS/PLL
@@ -9900,6 +10042,8 @@ 

  CONFIG_RFD77402=m

  CONFIG_SRF04=m

  # CONFIG_SX9310 is not set

+ # CONFIG_SX9324 is not set

+ # CONFIG_SX9360 is not set

  CONFIG_SX9500=m

  CONFIG_SRF08=m

  # CONFIG_VCNL3020 is not set
@@ -10008,11 +10152,9 @@ 

  

  CONFIG_PHY_CADENCE_TORRENT=m

  CONFIG_PHY_CADENCE_DPHY=m

+ # CONFIG_PHY_CADENCE_DPHY_RX is not set

  CONFIG_PHY_CADENCE_SIERRA=m

  # CONFIG_PHY_CADENCE_SALVO is not set

- CONFIG_PHY_FSL_IMX8MQ_USB=m

- CONFIG_PHY_MIXEL_MIPI_DPHY=m

- # CONFIG_PHY_FSL_IMX8M_PCIE is not set

  CONFIG_PHY_PXA_28NM_HSIC=m

  CONFIG_PHY_PXA_28NM_USB2=m

  # CONFIG_PHY_LAN966X_SERDES is not set
@@ -10143,6 +10285,7 @@ 

  CONFIG_MOST_USB_HDM=m

  CONFIG_MOST_CDEV=m

  # CONFIG_MOST_SND is not set

+ # CONFIG_PECI is not set

  # end of Device Drivers

  

  #
@@ -10206,8 +10349,8 @@ 

  # CONFIG_F2FS_FAULT_INJECTION is not set

  # CONFIG_F2FS_FS_COMPRESSION is not set

  CONFIG_F2FS_IOSTAT=y

+ # CONFIG_F2FS_UNFAIR_RWSEM is not set

  CONFIG_ZONEFS_FS=m

- CONFIG_FS_DAX=y

  CONFIG_FS_POSIX_ACL=y

  CONFIG_EXPORTFS=y

  CONFIG_EXPORTFS_BLOCK_OPS=y
@@ -10233,7 +10376,6 @@ 

  CONFIG_FUSE_FS=m

  CONFIG_CUSE=m

  CONFIG_VIRTIO_FS=m

- CONFIG_FUSE_DAX=y

  CONFIG_OVERLAY_FS=m

  CONFIG_OVERLAY_FS_REDIRECT_DIR=y

  # CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW is not set
@@ -10416,7 +10558,6 @@ 

  # CONFIG_NFS_V4_2_READ_PLUS is not set

  CONFIG_NFSD=m

  CONFIG_NFSD_V2_ACL=y

- CONFIG_NFSD_V3=y

  CONFIG_NFSD_V3_ACL=y

  CONFIG_NFSD_V4=y

  CONFIG_NFSD_PNFS=y
@@ -10532,19 +10673,18 @@ 

  CONFIG_PERSISTENT_KEYRINGS=y

  CONFIG_TRUSTED_KEYS=m

  CONFIG_ENCRYPTED_KEYS=m

+ # CONFIG_USER_DECRYPTED_DATA is not set

  CONFIG_KEY_DH_OPERATIONS=y

  # CONFIG_SECURITY_DMESG_RESTRICT is not set

  CONFIG_SECURITY=y

  CONFIG_SECURITYFS=y

  CONFIG_SECURITY_NETWORK=y

- CONFIG_PAGE_TABLE_ISOLATION=y

  CONFIG_SECURITY_INFINIBAND=y

  CONFIG_SECURITY_NETWORK_XFRM=y

  CONFIG_SECURITY_PATH=y

  # CONFIG_INTEL_TXT is not set

  CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y

  CONFIG_HARDENED_USERCOPY=y

- # CONFIG_HARDENED_USERCOPY_PAGESPAN is not set

  CONFIG_FORTIFY_SOURCE=y

  # CONFIG_STATIC_USERMODEHELPER is not set

  # CONFIG_SECURITY_SMACK is not set
@@ -10627,6 +10767,7 @@ 

  #

  CONFIG_CRYPTO_RSA=y

  CONFIG_CRYPTO_DH=y

+ # CONFIG_CRYPTO_DH_RFC7919_GROUPS is not set

  CONFIG_CRYPTO_ECC=m

  CONFIG_CRYPTO_ECDH=m

  # CONFIG_CRYPTO_ECDSA is not set
@@ -10680,6 +10821,7 @@ 

  CONFIG_CRYPTO_BLAKE2B=m

  # CONFIG_CRYPTO_BLAKE2S is not set

  CONFIG_CRYPTO_CRCT10DIF=y

+ CONFIG_CRYPTO_CRC64_ROCKSOFT=y

  CONFIG_CRYPTO_GHASH=y

  CONFIG_CRYPTO_POLY1305=m

  CONFIG_CRYPTO_MD4=m
@@ -10779,10 +10921,8 @@ 

  # CONFIG_CRYPTO_DEV_AMLOGIC_GXL is not set

  CONFIG_ASYMMETRIC_KEY_TYPE=y

  CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y

- CONFIG_ASYMMETRIC_TPM_KEY_SUBTYPE=m

  CONFIG_X509_CERTIFICATE_PARSER=y

  CONFIG_PKCS8_PRIVATE_KEY_PARSER=m

- CONFIG_TPM_KEY_PARSER=m

  CONFIG_PKCS7_MESSAGE_PARSER=y

  # CONFIG_PKCS7_TEST_KEY is not set

  CONFIG_SIGNED_PE_FILE_VERIFICATION=y
@@ -10836,12 +10976,15 @@ 

  CONFIG_CRYPTO_LIB_POLY1305=m

  CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m

  CONFIG_CRYPTO_LIB_SHA256=y

+ CONFIG_CRYPTO_LIB_SM3=m

  CONFIG_CRYPTO_LIB_SM4=m

  # end of Crypto library routines

  

+ CONFIG_LIB_MEMNEQ=y

  CONFIG_CRC_CCITT=y

  CONFIG_CRC16=m

  CONFIG_CRC_T10DIF=y

+ CONFIG_CRC64_ROCKSOFT=y

  CONFIG_CRC_ITU_T=m

  CONFIG_CRC32=y

  # CONFIG_CRC32_SELFTEST is not set
@@ -10849,7 +10992,7 @@ 

  # CONFIG_CRC32_SLICEBY4 is not set

  # CONFIG_CRC32_SARWATE is not set

  # CONFIG_CRC32_BIT is not set

- CONFIG_CRC64=m

+ CONFIG_CRC64=y

  CONFIG_CRC4=m

  CONFIG_CRC7=m

  CONFIG_LIBCRC32C=m
@@ -10986,10 +11129,16 @@ 

  CONFIG_DEBUG_BUGVERBOSE=y

  # end of printk and dmesg options

  

+ CONFIG_DEBUG_KERNEL=y

+ CONFIG_DEBUG_MISC=y

+ 

  #

  # Compile-time checks and compiler options

  #

- # CONFIG_DEBUG_INFO is not set

+ CONFIG_DEBUG_INFO_NONE=y

+ # CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set

+ # CONFIG_DEBUG_INFO_DWARF4 is not set

+ # CONFIG_DEBUG_INFO_DWARF5 is not set

  CONFIG_FRAME_WARN=1024

  CONFIG_STRIP_ASM_SYMS=y

  # CONFIG_READABLE_ASM is not set
@@ -11019,9 +11168,6 @@ 

  CONFIG_HAVE_KCSAN_COMPILER=y

  # end of Generic Kernel Debugging Instruments

  

- CONFIG_DEBUG_KERNEL=y

- CONFIG_DEBUG_MISC=y

- 

  #

  # Networking Debugging

  #
@@ -11154,6 +11300,8 @@ 

  CONFIG_LATENCYTOP=y

  CONFIG_USER_STACKTRACE_SUPPORT=y

  CONFIG_NOP_TRACER=y

+ CONFIG_HAVE_RETHOOK=y

+ CONFIG_RETHOOK=y

  CONFIG_HAVE_FUNCTION_TRACER=y

  CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y

  CONFIG_HAVE_DYNAMIC_FTRACE=y
@@ -11180,6 +11328,7 @@ 

  CONFIG_DYNAMIC_FTRACE=y

  CONFIG_DYNAMIC_FTRACE_WITH_REGS=y

  CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS=y

+ # CONFIG_FPROBE is not set

  CONFIG_FUNCTION_PROFILER=y

  CONFIG_STACK_TRACER=y

  # CONFIG_IRQSOFF_TRACER is not set
@@ -11283,7 +11432,6 @@ 

  # CONFIG_TEST_BITMAP is not set

  # CONFIG_TEST_UUID is not set

  CONFIG_TEST_XARRAY=m

- CONFIG_TEST_OVERFLOW=m

  # CONFIG_TEST_RHASHTABLE is not set

  # CONFIG_TEST_SIPHASH is not set

  CONFIG_TEST_IDA=m
@@ -11302,7 +11450,6 @@ 

  # CONFIG_TEST_KMOD is not set

  CONFIG_TEST_MEMCAT_P=m

  CONFIG_TEST_OBJAGG=m

- CONFIG_TEST_STACKINIT=m

  CONFIG_TEST_MEMINIT=m

  CONFIG_TEST_FREE_PAGES=m

  CONFIG_TEST_FPU=m

@@ -1,7 +1,7 @@ 

- From 9baf57b4c2d9348bd5adecbb893870d1d79fade1 Mon Sep 17 00:00:00 2001

+ From 63cec1d1efdb31caeef17411c7560e8b0f941073 Mon Sep 17 00:00:00 2001

  From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>

  Date: Mon, 16 Sep 2019 04:53:20 +0200

- Subject: [PATCH 1/2] ZEN: Add sysctl and CONFIG to disallow unprivileged

+ Subject: [PATCH 1/3] ZEN: Add sysctl and CONFIG to disallow unprivileged

   CLONE_NEWUSER

  

  Our default behavior continues to match the vanilla kernel.
@@ -36,10 +36,10 @@ 

   {

   	return &init_user_ns;

  diff --git a/init/Kconfig b/init/Kconfig

- index b19e2eeaae80..2c2e01d76076 100644

+ index fa63cc019ebf..5aa29feccae3 100644

  --- a/init/Kconfig

  +++ b/init/Kconfig

- @@ -1240,6 +1240,22 @@ config USER_NS

+ @@ -1249,6 +1249,22 @@ config USER_NS

   

   	  If unsure, say N.

   
@@ -102,7 +102,7 @@ 

   	if (err)

   		goto bad_unshare_out;

  diff --git a/kernel/sysctl.c b/kernel/sysctl.c

- index 830aaf8ca08e..af4c0806bd8e 100644

+ index c42ba2d669dc..a6ddbf02a809 100644

  --- a/kernel/sysctl.c

  +++ b/kernel/sysctl.c

  @@ -91,6 +91,9 @@
@@ -115,7 +115,7 @@ 

   

   #if defined(CONFIG_SYSCTL)

   

- @@ -1803,6 +1806,15 @@ static struct ctl_table kern_table[] = {

+ @@ -1806,6 +1809,15 @@ static struct ctl_table kern_table[] = {

   		.mode		= 0644,

   		.proc_handler	= proc_dointvec,

   	},
@@ -150,5 +150,5 @@ 

   static DEFINE_MUTEX(userns_state_mutex);

   

  -- 

- 2.36.1

+ 2.37.1

  

@@ -1,7 +1,7 @@ 

- From e410435c977a01e386fda83b5215540365a0086f Mon Sep 17 00:00:00 2001

+ From 4b81eecd4c636d953aaf4ebafd8171716f4c61fe Mon Sep 17 00:00:00 2001

  From: Bryan Cain <bryancain3@gmail.com>

  Date: Thu, 5 May 2022 13:12:21 -0600

- Subject: [PATCH 2/2] HID: apple: Properly handle function keys on Keychron

+ Subject: [PATCH 2/3] HID: apple: Properly handle function keys on Keychron

   keyboards

  MIME-Version: 1.0

  Content-Type: text/plain; charset=UTF-8
@@ -103,5 +103,5 @@ 

   }

   

  -- 

- 2.36.1

+ 2.37.1

  

@@ -0,0 +1,26 @@ 

+ From 2da21cf28e573b84e5a5baecc1eda7372322375d Mon Sep 17 00:00:00 2001

+ From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>

+ Date: Sat, 23 Jul 2022 11:14:46 +0200

+ Subject: [PATCH 3/3] soundwire: Raise DEFAULT_PROBE_TIMEOUT to 10000 ms

+ 

+ See: https://github.com/thesofproject/linux/issues/3777#issuecomment-1192655300

+ ---

+  drivers/soundwire/bus.h | 2 +-

+  1 file changed, 1 insertion(+), 1 deletion(-)

+ 

+ diff --git a/drivers/soundwire/bus.h b/drivers/soundwire/bus.h

+ index 7631ef5e71fb..d3ed828daac0 100644

+ --- a/drivers/soundwire/bus.h

+ +++ b/drivers/soundwire/bus.h

+ @@ -5,7 +5,7 @@

+  #define __SDW_BUS_H

+  

+  #define DEFAULT_BANK_SWITCH_TIMEOUT 3000

+ -#define DEFAULT_PROBE_TIMEOUT       2000

+ +#define DEFAULT_PROBE_TIMEOUT       10000

+  

+  u64 sdw_dmi_override_adr(struct sdw_bus *bus, u64 addr);

+  

+ -- 

+ 2.37.1

+ 

file modified
+14 -13
@@ -14,11 +14,11 @@ 

  _replacesoldmodules=() # '%' gets replaced with kernel suffix

  

  pkgbase=linux-libre

- pkgver=5.18.5

+ pkgver=5.18.14

  pkgrel=1

  pkgdesc='Linux-libre'

- rcnver=5.18.2

- rcnrel=armv7-x6

+ rcnver=5.18.12

+ rcnrel=armv7-x8

  url='https://linux-libre.fsfla.org/'

  arch=(i686 x86_64 armv7h)

  license=(GPL2)
@@ -47,6 +47,7 @@ 

    # Arch Linux patches

    0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch

    0002-HID-apple-Properly-handle-function-keys-on-Keychron-.patch

+   0003-soundwire-Raise-DEFAULT_PROBE_TIMEOUT-to-10000-ms.patch

  )

  source_i686=(

    # avoid using zstd compression in ultra mode (exhausts virtual memory)
@@ -72,7 +73,7 @@ 

  )

  sha512sums=('13be3762fffd74c63eeb23b0d34b994a3e5198bfdbda4f013b38f8d3edd24b9bbebe5a4bfde0f5191aa1cf2678e4517f3b5540a40b30ebc05da1f6708cbb98bb'

              'SKIP'

-             '9355c0f22606c0401e8a01d6e22f0fa6e97b69a9fce6d991235da6430907fb6a788fca30bd48e5cbb743cc4a211a40806c896f660db7432e7bc85ba7634b5d06'

+             '9016e87060d3ddbf4bad5adee54f07cba3930a23a5c2a7ca32338a98d0c51676228f3d97405c624f2f48a67849f9b40a5dc670e10fbc02bc75cc4d47deab4c34'

              'SKIP'

              '13cb5bc42542e7b8bb104d5f68253f6609e463b6799800418af33eb0272cc269aaa36163c3e6f0aacbdaaa1d05e2827a4a7c4a08a029238439ed08b89c564bb3'

              'SKIP'
@@ -80,8 +81,8 @@ 

              'SKIP'

              '267295aa0cea65684968420c68b32f1a66a22d018b9d2b2c1ef14267bcf4cb68aaf7099d073cbfefe6c25c8608bdcbbd45f7ac8893fdcecbf1e621abdfe9ecc1'

              'SKIP'

-             'bcec71d3bd1daaa27bdf4c9a10f0b302b915e8236ef47b5e6d6eaf65bfd0b34644d8d3ff6c25d894ae21dedbece3c1f1ff152fbf8525b77100bc790d0541f3f1'

-             'e141c387e8045030278d683a1294bfd3d13197bf3466a9c89c4f72a53aafed606acc8e42e528479527c638af895bce2303944b5d8b8a29040f5aae8a9581dd5a'

+             '9833a9caf788aa928b7c4fab85205259459cc65ccf2b1ef1af8f9dfecf8804829aa4c1f0571a1a0819c6e838ab3f32a5322df9ddb07a201bc43c66ad6c3b2f3b'

+             '9112373138102b14ca900156afc6292334fc2b9ee542f1f5264ff2b6dc82073f761e9caf35aff56fb47cb285fbc2c4421f6d89c1d417f823f38b1e3f287d9294'

              '47d16ffc94510d4a8773146a46cfb35aca8cfdae38d17283334cd62d92de36250fbec90e9892357033398ecc7d970127b1a41b703a8372972422ca4af7c90c70'

              '53103bf55b957b657039510527df0df01279dec59cda115a4d6454e4135025d4546167fa30bdc99107f232561c1e096d8328609ab5a876cf7017176f92ad3e0b'

              'f10af02f0cb2d31259d9633e1ba845f555f525789f750fc2ddc51bd18c5ff64fcdd242dae801623887f5ce5cdb5528bce890459f0fab9fd31a28868bb7f6bba5'
@@ -89,10 +90,11 @@ 

              '143dea30c6da00e504c99984a98a0eb2411f558fcdd9dfa7f607d6c14e9e7dffff9cb00121d9317044b07e3e210808286598c785ee854084b993ec9cb14d8232'

              '02af4dd2a007e41db0c63822c8ab3b80b5d25646af1906dc85d0ad9bb8bbf5236f8e381d7f91cf99ed4b0978c50aee37cb9567cdeef65b7ec3d91b882852b1af'

              'b8fe56e14006ab866970ddbd501c054ae37186ddc065bb869cf7d18db8c0d455118d5bda3255fb66a0dde38b544655cfe9040ffe46e41d19830b47959b2fb168'

-             '1b6c3108d5628ca6db20c2bc3431e560ab2a274aaf863e7a796f1931a35982d175247f47cbfbb7d643ffc6b742442806755bb10339e5b0577c3f232b38288891'

-             'bf6d9a66be49c2cc67b0a0f3cfb61734adf7a3b032b5ed133e1e0afbf4a6ddbd3e8231e4b85fef2e3aeb7274a60f7572a4469c057ff13d81134613f01767d3b2')

+             '671ab29fb1858c3898792164ac49d57103ecdeff220d7b262efb0c74ee270a670cf40f746a76f400513019989d858326fb3da507a0159418215e0b645011c406'

+             '2fecb2fb31981af21e17ce08c8352236f8817e6000f7e542f7479eaa7300238c4581f992b4da4d49dd2657d3e3c038eb0369954559f233b2913c382ef25b5753'

+             '816ad9cb93a473376487234d4bf255f7d081c37186b1715e914c2c30dcdcfaee7b6db4eeb427969190d0cffa7499bc99c95ef58fb8c632d27e51d0350990f0ce')

  sha512sums_i686=('bca15cc96f64c38adcd13a46752866b5b30555ac21e19b3f7afcd20fcb7ec585c9d990fe8f842f44d5f69d477d72867fe6a9102729f26f93f5a80b372e41ce85')

- sha512sums_armv7h=('5a75b12dd386940a0bf1be630d45a514ef3c32289ec5976988764baa8483b254e5dcc879337556bfa041b6dbf9ac16debbe4b57bf86db30089661e9536ffaa0a'

+ sha512sums_armv7h=('94c6243d23bc995dec3edcb1dd5cc7d5e7d30fec70fc32b9be5f3e7d934da7035e9152fea3cce58a53b0f35f29060bdef2a3a2dac3c46f520adf1088897362f9'

                     'SKIP'

                     '8da996a42249672893fa532ccbd096347580a0dc1698c45e9c865646e2765789553b1bb42793e721de30aea70340fdc116d2e4a50580fef999ca5fc627aaf4c3'

                     '0e6ddc24011d77a2e422b642c4507317fc2d26b20f5649818a2f11acac165ccab2cf2e64ab50d44ce7affcfe12c2ef5158790e499058831e7995400b2087df78'
@@ -175,8 +177,7 @@ 

  

  build() {

    cd $_srcname

-   make all

-   make htmldocs

+   make htmldocs all

  }

  

  _package() {
@@ -236,7 +237,7 @@ 

      localversion.* version vmlinux

    install -Dt "$builddir/kernel" -m644 kernel/Makefile

    install -Dt "$builddir/arch/$KARCH" -m644 arch/$KARCH/Makefile

-   if [[ $CARCH = i686 ]]; then

+   if [ "$CARCH" = i686 ]; then

      install -Dt "$builddir/arch/$KARCH" -m644 arch/$KARCH/Makefile_32.cpu

    fi

    cp -t "$builddir" -a scripts
@@ -379,7 +380,7 @@ 

  }

  

  pkgname=("$pkgbase" "$pkgbase-headers" "$pkgbase-docs")

- [[ $CARCH = armv7h ]] && pkgname+=("$pkgbase-chromebook")

+ [ "$CARCH" = armv7h ] && pkgname+=("$pkgbase-chromebook")

  for _p in "${pkgname[@]}"; do

    eval "package_$_p() {

      $(declare -f "_package${_p#$pkgbase}")

file modified
+31 -8
@@ -1,6 +1,6 @@ 

  #

  # Automatically generated file; DO NOT EDIT.

- # Linux/x86 5.18.5-gnu Kernel Configuration

+ # Linux/x86 5.18.14-gnu Kernel Configuration

  #

  CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.1.0"

  CONFIG_CC_IS_GCC=y
@@ -18,7 +18,7 @@ 

  CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y

  CONFIG_CC_HAS_ASM_INLINE=y

  CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y

- CONFIG_PAHOLE_VERSION=0

+ CONFIG_PAHOLE_VERSION=123

  CONFIG_IRQ_WORK=y

  CONFIG_BUILDTIME_TABLE_SORT=y

  CONFIG_THREAD_INFO_IN_TASK=y
@@ -187,6 +187,8 @@ 

  

  CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y

  CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5"

+ CONFIG_GCC12_NO_ARRAY_BOUNDS=y

+ CONFIG_CC_NO_ARRAY_BOUNDS=y

  CONFIG_CGROUPS=y

  CONFIG_PAGE_COUNTER=y

  CONFIG_MEMCG=y
@@ -332,8 +334,6 @@ 

  CONFIG_X86_FEATURE_NAMES=y

  CONFIG_X86_MPPARSE=y

  # CONFIG_GOLDFISH is not set

- CONFIG_RETPOLINE=y

- CONFIG_CC_HAS_SLS=y

  CONFIG_X86_CPU_RESCTRL=y

  CONFIG_X86_BIGSMP=y

  # CONFIG_X86_EXTENDED_PLATFORM is not set
@@ -493,6 +493,14 @@ 

  # CONFIG_STRICT_SIGALTSTACK_SIZE is not set

  # end of Processor type and features

  

+ CONFIG_CC_HAS_SLS=y

+ CONFIG_CC_HAS_RETURN_THUNK=y

+ CONFIG_SPECULATION_MITIGATIONS=y

+ CONFIG_RETPOLINE=y

+ CONFIG_RETHUNK=y

+ CONFIG_CPU_UNRET_ENTRY=y

+ CONFIG_CPU_IBPB_ENTRY=y

+ CONFIG_CPU_IBRS_ENTRY=y

  CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=y

  

  #
@@ -10478,14 +10486,24 @@ 

  # CONFIG_LOCK_DOWN_KERNEL_FORCE_INTEGRITY is not set

  # CONFIG_LOCK_DOWN_KERNEL_FORCE_CONFIDENTIALITY is not set

  CONFIG_SECURITY_LANDLOCK=y

- # CONFIG_INTEGRITY is not set

+ CONFIG_INTEGRITY=y

+ CONFIG_INTEGRITY_SIGNATURE=y

+ CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y

+ CONFIG_INTEGRITY_TRUSTED_KEYRING=y

+ CONFIG_INTEGRITY_PLATFORM_KEYRING=y

+ CONFIG_INTEGRITY_MACHINE_KEYRING=y

+ CONFIG_LOAD_UEFI_KEYS=y

+ CONFIG_INTEGRITY_AUDIT=y

+ # CONFIG_IMA is not set

+ # CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY is not set

  # CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT is not set

+ # CONFIG_EVM is not set

  # CONFIG_DEFAULT_SECURITY_SELINUX is not set

  # CONFIG_DEFAULT_SECURITY_SMACK is not set

  # CONFIG_DEFAULT_SECURITY_TOMOYO is not set

  # CONFIG_DEFAULT_SECURITY_APPARMOR is not set

  CONFIG_DEFAULT_SECURITY_DAC=y

- CONFIG_LSM="landlock,lockdown,yama,bpf"

+ CONFIG_LSM="landlock,lockdown,yama,integrity,bpf"

  

  #

  # Kernel hardening options
@@ -10496,9 +10514,9 @@ 

  #

  CONFIG_CC_HAS_AUTO_VAR_INIT_PATTERN=y

  CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO=y

- # CONFIG_INIT_STACK_NONE is not set

+ CONFIG_INIT_STACK_NONE=y

  # CONFIG_INIT_STACK_ALL_PATTERN is not set

- CONFIG_INIT_STACK_ALL_ZERO=y

+ # CONFIG_INIT_STACK_ALL_ZERO is not set

  # CONFIG_GCC_PLUGIN_STACKLEAK is not set

  CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y

  # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
@@ -10769,6 +10787,7 @@ 

  CONFIG_CRYPTO_LIB_SM4=m

  # end of Crypto library routines

  

+ CONFIG_LIB_MEMNEQ=y

  CONFIG_CRC_CCITT=y

  CONFIG_CRC16=m

  CONFIG_CRC_T10DIF=y
@@ -10861,6 +10880,7 @@ 

  CONFIG_CLZ_TAB=y

  CONFIG_IRQ_POLL=y

  CONFIG_MPILIB=y

+ CONFIG_SIGNATURE=y

  CONFIG_DIMLIB=y

  CONFIG_OID_REGISTRY=y

  CONFIG_UCS2_STRING=y
@@ -10928,6 +10948,9 @@ 

  # CONFIG_DEBUG_INFO_COMPRESSED is not set

  # CONFIG_DEBUG_INFO_SPLIT is not set

  CONFIG_DEBUG_INFO_BTF=y

+ CONFIG_PAHOLE_HAS_SPLIT_BTF=y

+ CONFIG_DEBUG_INFO_BTF_MODULES=y

+ # CONFIG_MODULE_ALLOW_BTF_MISMATCH is not set

  # CONFIG_GDB_SCRIPTS is not set

  CONFIG_FRAME_WARN=1024

  CONFIG_STRIP_ASM_SYMS=y

@@ -1,6 +1,6 @@ 

  #

  # Automatically generated file; DO NOT EDIT.

- # Linux/x86 5.18.5-gnu Kernel Configuration

+ # Linux/x86 5.18.14-gnu Kernel Configuration

  #

  CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.1.0"

  CONFIG_CC_IS_GCC=y
@@ -197,6 +197,8 @@ 

  CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y

  CONFIG_CC_HAS_INT128=y

  CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5"

+ CONFIG_GCC12_NO_ARRAY_BOUNDS=y

+ CONFIG_CC_NO_ARRAY_BOUNDS=y

  CONFIG_ARCH_SUPPORTS_INT128=y

  CONFIG_NUMA_BALANCING=y

  CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
@@ -351,9 +353,6 @@ 

  CONFIG_X86_X2APIC=y

  CONFIG_X86_MPPARSE=y

  # CONFIG_GOLDFISH is not set

- CONFIG_RETPOLINE=y

- CONFIG_CC_HAS_SLS=y

- CONFIG_SLS=y

  CONFIG_X86_CPU_RESCTRL=y

  # CONFIG_X86_EXTENDED_PLATFORM is not set

  CONFIG_X86_INTEL_LPSS=y
@@ -497,7 +496,9 @@ 

  CONFIG_KEXEC=y

  CONFIG_KEXEC_FILE=y

  CONFIG_ARCH_HAS_KEXEC_PURGATORY=y

- # CONFIG_KEXEC_SIG is not set

+ CONFIG_KEXEC_SIG=y

+ # CONFIG_KEXEC_SIG_FORCE is not set

+ CONFIG_KEXEC_BZIMAGE_VERIFY_SIG=y

  CONFIG_CRASH_DUMP=y

  CONFIG_KEXEC_JUMP=y

  CONFIG_PHYSICAL_START=0x1000000
@@ -522,6 +523,16 @@ 

  # CONFIG_LIVEPATCH is not set

  # end of Processor type and features

  

+ CONFIG_CC_HAS_SLS=y

+ CONFIG_CC_HAS_RETURN_THUNK=y

+ CONFIG_SPECULATION_MITIGATIONS=y

+ CONFIG_PAGE_TABLE_ISOLATION=y

+ CONFIG_RETPOLINE=y

+ CONFIG_RETHUNK=y

+ CONFIG_CPU_UNRET_ENTRY=y

+ CONFIG_CPU_IBPB_ENTRY=y

+ CONFIG_CPU_IBRS_ENTRY=y

+ CONFIG_SLS=y

  CONFIG_ARCH_HAS_ADD_PAGES=y

  CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=y

  
@@ -10159,7 +10170,6 @@ 

  CONFIG_SECURITY=y

  CONFIG_SECURITYFS=y

  CONFIG_SECURITY_NETWORK=y

- CONFIG_PAGE_TABLE_ISOLATION=y

  CONFIG_SECURITY_INFINIBAND=y

  CONFIG_SECURITY_NETWORK_XFRM=y

  CONFIG_SECURITY_PATH=y
@@ -10219,7 +10229,7 @@ 

  # CONFIG_DEFAULT_SECURITY_TOMOYO is not set

  # CONFIG_DEFAULT_SECURITY_APPARMOR is not set

  CONFIG_DEFAULT_SECURITY_DAC=y

- CONFIG_LSM="landlock,lockdown,yama,bpf"

+ CONFIG_LSM="landlock,lockdown,yama,integrity,bpf"

  

  #

  # Kernel hardening options
@@ -10533,6 +10543,7 @@ 

  CONFIG_CRYPTO_LIB_SM4=m

  # end of Crypto library routines

  

+ CONFIG_LIB_MEMNEQ=y

  CONFIG_CRC_CCITT=y

  CONFIG_CRC16=m

  CONFIG_CRC_T10DIF=y

file modified
-15
@@ -10,7 +10,6 @@ 

  

  # parabola changes and rationale:

  #  - adapt config files to support multiple arches

- #  - install keyring updater service files

  #  - allow pacstrap to create cross-arch chroots

  

  
@@ -171,18 +170,4 @@ 

      install -m644 "$srcdir/pacman.conf.$carch" "$pkgdir/usr/share/pacman/defaults/"

      install -m644 "$srcdir/makepkg.conf.$carch" "$pkgdir/usr/share/pacman/defaults/"

    done

- 

-   # systemd service

-   install -dm755 "$pkgdir/usr/lib/systemd/system"

-   install -dm755 "$pkgdir/usr/lib/systemd/system-preset"

-   install -m644 "$srcdir/pacman-keyring.service" "$pkgdir/usr/lib/systemd/system/"

-   install -m644 "$srcdir/pacman-keyring.timer" "$pkgdir/usr/lib/systemd/system/"

-   install -m644 /dev/stdin "$pkgdir/usr/lib/systemd/system-preset/90-pacman.preset" \

-                 <<<"enable pacman-keyring.timer"

- 

-   # openrc service

-   install -dm755 "$pkgdir/etc/init.d"

-   install -dm755 "$pkgdir/etc/runlevels/default"

-   install -m755 "$srcdir/pacman-keyring.initd" "$pkgdir/etc/init.d/pacman-keyring"

-   ln -s /etc/init.d/pacman-keyring "$pkgdir/etc/runlevels/default/pacman-keyring"

  }

file modified
+2 -1
@@ -1,1 +1,2 @@ 

- # parabola's pacman.conf expects at least 1 file matching /etc/pacman.d/*.conf

+ # if the '# Over-rides #' include in pacman.conf is enabled,

+ # there must exist at least 1 file matching /etc/pacman.d/*.conf

@@ -1,26 +0,0 @@ 

- #!/sbin/openrc-run

- 

- # This is not a daemon; but a short-lived process,

- # which only needs to run occasionally.

- # Running it as a pseudo-service,

- # simplifies the install (rather than requiring a cron deamon).

- # Users must only add it to the 'default' runlevel.

- 

- 

- name="pacman-keyring"

- description="Refresh pacman keyring"

- 

- 

- depend() {

-   need net

-   after logger

- }

- 

- # Custom start() function with wrapper, to always exit "success" status.

- # The command will exit non-zero upon any failed key retrieval;

- # which is common if not likely, due to the large number of keys it fetches.

- start() {

-   ebegin "Starting ${RC_SVCNAME}"

-   start-stop-daemon --start --exec /usr/bin/bash -- -c '/usr/bin/pacman-key --refresh-keys || :'

-   eend $?

- }

@@ -1,7 +0,0 @@ 

- [Unit]

- Description=Refresh pacman keyring

- Documentation=man:pacman-key

- 

- [Service]

- Type=oneshot

- ExecStart=/usr/bin/pacman-key --refresh-keys

@@ -1,11 +0,0 @@ 

- [Unit]

- Description=Refresh pacman keyring once a week

- Documentation=man:pacman-key

- 

- [Timer]

- OnCalendar=weekly

- AccuracySec=1h

- Persistent=true

- 

- [Install]

- WantedBy=timers.target

@@ -14,8 +14,8 @@ 

  

  

  pkgname=parabola-keyring

- pkgver=20220322

- _gitver=af4575f5afbdca6b556d182dab149e181edbd4b4

+ pkgver=20220714

+ _gitver=374d9b5b110ddfe715419b10caa4de2972aed162 

  pkgrel=1

  pkgdesc='Parabola GNU/Linux-libre PGP keyring'

  arch=('any')
@@ -42,6 +42,7 @@ 

    #       but that build currently has a problem - the autobuilder handles

    #       this now, via an un-published kludge in the autobuild.sh script

    # TODO: remove this note, after 'parabola-hackers' has been rebuilt

+   # NOTE: the rebuilt 'parabola-hackers' is now in [libre-testing]

    /usr/lib/parabola-hackers/pacman-make-keyring \

      V="$pkgver"                                 \

      keyserver='hkp://pgp.cyberbits.eu:11371'    \

file modified
+4 -4
@@ -4,14 +4,14 @@ 

  # Maintainer: David P. <megver83@parabola.nu>

  

  pkgname=parabolaiso

- pkgver=64

+ pkgver=65

  pkgrel=1

  pkgdesc="Tools for creating Parabola GNU/Linux-libre live and install iso images"

  arch=(any)

  license=(GPL3)

  url="https://git.parabola.nu/parabolaiso.git/"

- depends=(arch-install-scripts bash dosfstools e2fsprogs erofs-utils

- libarchive libisoburn mtools squashfs-tools grub)

+ depends=(arch-install-scripts bash dosfstools e2fsprogs erofs-utils grub

+ libarchive libisoburn mtools squashfs-tools)

  makedepends=(git)

  checkdepends=(shellcheck)

  optdepends=(
@@ -20,7 +20,7 @@ 

    'qemu-desktop: for run_parabolaiso'

    'qemu-user-static: for armv7h support when building in bootstrap mode from x86'

  )

- source=("git+https://git.parabola.nu/packages/parabolaiso.git#tag=v${pkgver}?signed")

+ source=(git+https://git.parabola.nu/packages/parabolaiso.git#tag=v${pkgver}?signed)

  sha256sums=('SKIP')

  validpgpkeys=(6DB9C4B4F0D8C0DC432CF6E4227CA7C556B2BA78) # David P. <megver83@parabola.nu>

  

@@ -0,0 +1,27 @@ 

+ # Maintainer: David P. <megver83@parabola.nu>

+ # Maintainer (Artix): Rafli Akmal <rafliakmaltejakusuma@gmail.com>

+ # Contributor (Artix): artoo <artoo@artixlinux.org>

+ # Contributor (Artix): Oscar Campos <damnwidget@artixlinux.org>

+ 

+ 

+ pkgname=acpid-openrc

+ pkgver=20210506

+ pkgrel=1

+ pkgdesc="OpenRC acpid init script"

+ arch=('any')

+ url="https://gitea.artixlinux.org/packagesA/acpid-openrc"

+ license=('GPL2')

+ groups=('openrc-galaxy')

+ provides=('init-acpid')

+ conflicts=('init-acpid')

+ backup=('etc/conf.d/acpid')

+ source=("acpid.confd"

+         "acpid.initd")

+ sha256sums=('3755d4eb8bb64a1304e5defedb949305ac550565da36fe4f94d5f31beee821ba'

+             'c784a8b8ceceb3a453808a860a8dd9e0f8847f96cc82a7cc8410bc682aaadb06')

+ 

+ package() {

+     depends=('openrc' 'acpid')

+     install -Dm755 "$srcdir/acpid.initd" "$pkgdir/etc/init.d/acpid"

+     install -Dm644 "$srcdir/acpid.confd" "$pkgdir/etc/conf.d/acpid"

+ }

nonsystemd/acpid-openrc/acpid.confd nonsystemd/openrc-desktop/acpid.confd
file renamed
file was moved with no change to the file
nonsystemd/acpid-openrc/acpid.initd nonsystemd/openrc-desktop/acpid.initd
file renamed
+6 -3
@@ -1,11 +1,14 @@ 

- #!/sbin/openrc-run

+ #!/usr/bin/openrc-run

  # Copyright 1999-2016 Gentoo Foundation

  # Distributed under the terms of the GNU General Public License v2

  

  extra_started_commands="reload"

- command="/usr/sbin/acpid"

+ command="/usr/bin/acpid"

  command_args="${ACPID_ARGS}"

  description="Daemon for Advanced Configuration and Power Interface"

+ supervisor="supervise-daemon"

+ command_args_foreground="--foreground"

+ #pidfile="/run/acpid.pid"

  

  depend() {

  	need localmount
@@ -14,6 +17,6 @@ 

  

  reload() {

  	ebegin "Reloading acpid configuration"

- 	start-stop-daemon --exec $command --signal HUP

+ 	${supervisor} ${RC_SVCNAME} --signal HUP --pidfile /run/acpid.pid

  	eend $?

  }

@@ -0,0 +1,25 @@ 

+ # Maintainer: David P. <megver83@parabola.nu>

+ # Maintainer (Artix): artoo <artoo@artixlinux.org>

+ 

+ pkgname=alsa-utils-openrc

+ pkgver=20210505

+ pkgrel=2

+ pkgdesc="OpenRC alsa-utils init script"

+ arch=('any')

+ url="https://gitea.artixlinux.org/packagesA/alsa-utils-openrc"

+ license=('GPL2')

+ groups=('openrc-world')

+ provides=('init-alsa-utils')

+ conflicts=('init-alsa-utils')

+ backup=('etc/conf.d/alsasound')

+ source=("alsasound.confd"

+         "alsasound.initd")

+ sha256sums=('d1c55400b701a72dcb8bb85e016b5013fa3eb6a2766ffc20dae278d0ee4c1a43'

+             '40c9f0e8d00b88ebd28bba9dcd91323549a77aeda12a5a86c532bddca7dae8d1')

+ 

+ package() {

+     depends=('openrc' 'alsa-utils')

+     install -Dm755 "${srcdir}"/alsasound.initd "${pkgdir}"/etc/init.d/alsasound

+     install -Dm644 "${srcdir}"/alsasound.confd "${pkgdir}"/etc/conf.d/alsasound

+ }

+ 

@@ -0,0 +1,15 @@ 

+ # RESTORE_ON_START:

+ # Do you want to restore your mixer settings?  If not, your cards will be

+ # muted.

+ # no - Do not restore state

+ # yes - Restore state

+ 

+ RESTORE_ON_START="yes"

+ 

+ # SAVE_ON_STOP:

+ # Do you want to save changes made to your mixer volumes when alsasound

+ # stops? 

+ # no - Do not save state

+ # yes - Save state

+ 

+ SAVE_ON_STOP="yes"

@@ -0,0 +1,87 @@ 

+ #!/usr/bin/openrc-run

+ # Copyright 1999-2019 Gentoo Authors

+ # Distributed under the terms of the GNU General Public License v2

+ 

+ alsastatedir=/var/lib/alsa

+ alsascrdir=/etc/alsa.d

+ alsahomedir=/run/alsasound

+ 

+ extra_commands="save restore"

+ 

+ depend() {

+ 	need localmount

+ 	after bootmisc modules isapnp coldplug hotplug

+ }

+ 

+ restore() {

+ 	ebegin "Restoring Mixer Levels"

+ 

+ 	checkpath -q -d -m 0700 -o root:root ${alsahomedir} || return 1

+ 

+ 	if [ ! -r "${alsastatedir}/asound.state" ] ; then

+ 		ewarn "No mixer config in ${alsastatedir}/asound.state, you have to unmute your card!"

+ 		eend 0

+ 		return 0

+ 	fi

+ 

+ 	local cards="$(sed -n -e 's/^ *\([[:digit:]]*\) .*/\1/p' /proc/asound/cards)"

+ 	local CARDNUM

+ 	for cardnum in ${cards}; do

+ 		[ -e /dev/snd/controlC${cardnum} ] || sleep 2

+ 		[ -e /dev/snd/controlC${cardnum} ] || sleep 2

+ 		[ -e /dev/snd/controlC${cardnum} ] || sleep 2

+ 		[ -e /dev/snd/controlC${cardnum} ] || sleep 2

+ 		alsactl -E HOME="${alsahomedir}" -I -f "${alsastatedir}/asound.state" restore ${cardnum} \

+ 			|| ewarn "Errors while restoring defaults, ignoring"

+ 	done

+ 

+ 	for ossfile in "${alsastatedir}"/oss/card*_pcm* ; do

+ 		[ -e "${ossfile}" ] || continue

+ 		# We use cat because I'm not sure if cp works properly on /proc

+ 		local procfile=${ossfile##${alsastatedir}/oss}

+ 		procfile="$(echo "${procfile}" | sed -e 's,_,/,g')"

+ 		if [ -e /proc/asound/"${procfile}"/oss ] ; then

+ 		    cat "${ossfile}" > /proc/asound/"${procfile}"/oss 

+ 		fi

+ 	done

+ 

+ 	eend 0

+ }

+ 

+ save() {

+ 	ebegin "Storing ALSA Mixer Levels"

+ 

+ 	checkpath -q -d -m 0700 -o root:root ${alsahomedir} || return 1

+ 

+ 	mkdir -p "${alsastatedir}"

+ 	if ! alsactl -E HOME="${alsahomedir}" -f "${alsastatedir}/asound.state" store; then

+ 		eerror "Error saving levels."

+ 		eend 1

+ 		return 1

+ 	fi

+ 

+ 	for ossfile in /proc/asound/card*/pcm*/oss; do

+ 		[ -e "${ossfile}" ] || continue

+ 		local device=${ossfile##/proc/asound/} ; device=${device%%/oss}

+ 		device="$(echo "${device}" | sed -e 's,/,_,g')"

+ 		mkdir -p "${alsastatedir}/oss/"

+ 		cp "${ossfile}" "${alsastatedir}/oss/${device}"

+ 	done

+ 

+ 	eend 0

+ }

+ 

+ start() {

+ 	if [ "${RESTORE_ON_START}" = "yes" ]; then

+ 		restore

+ 	fi

+ 

+ 	return 0

+ }

+ 

+ stop() {

+ 	if [ "${SAVE_ON_STOP}" = "yes" ]; then

+ 		save

+ 	fi

+ 	return 0

+ }

@@ -0,0 +1,20 @@ 

+ # Maintainer: David P. <megver83@parabola.nu>

+ # Maintainer (Artix): artoo <artoo@artixlinux.org>

+ 

+ pkgname=apparmor-openrc

+ pkgver=20210506

+ pkgrel=1

+ pkgdesc="OpenRC apparmor init script"

+ arch=('any')

+ url="https://gitea.artixlinux.org/packagesA/apparmor-openrc"

+ license=('GPL2')

+ groups=('openrc-world')

+ provides=('init-apparmor')

+ conflicts=('init-apparmor')

+ source=("apparmor.initd")

+ sha256sums=('ba7601a738761a3f27278a7508ae32463f7097c597f0806931983ef6af2a5d3a')

+ 

+ package() {

+ 	depends=('openrc' 'apparmor')

+ 	install -Dm755 "${srcdir}"/apparmor.initd "${pkgdir}"/etc/init.d/apparmor

+ }

@@ -0,0 +1,91 @@ 

+ #!/usr/bin/openrc-run

+ # Copyright 1999-2013 Gentoo Foundation

+ # Distributed under the terms of the GNU General Public License v2

+ 

+ description="Load all configured profiles for the AppArmor security module."

+ description_reload="Reload all profiles"

+ 

+ extra_started_commands="reload"

+ 

+ aa_action() {

+ 	local arg=$1

+ 	local return

+ 

+ 	shift

+ 	$*

+ 	return=$?

+ 

+ 	if [ ${return} -eq 0 ]; then

+ 		aa_log_success_msg $arg

+ 	else

+ 		aa_log_failure_msg arg

+ 	fi

+ 

+ 	return $return

+ }

+ 

+ aa_log_action_start() {

+ 	ebegin $1

+ }

+ 

+ aa_log_action_end() {

+ 	eend $1

+ }

+ 

+ aa_log_success_msg() {

+ 	einfo $1

+ }

+ 

+ aa_log_warning_msg() {

+ 	ewarn $1

+ }

+ 

+ aa_log_failure_msg() {

+ 	eerror $1

+ }

+ 

+ aa_log_skipped_msg() {

+ 	einfo $1

+ }

+ 

+ aa_log_daemon_msg() {

+ 	einfo $1

+ }

+ 

+ aa_log_end_msg() {

+ 	eend $1

+ }

+ 

+ . /usr/lib/apparmor/rc.apparmor.functions

+ 

+ start() {

+ 	ebegin "Starting AppArmor"

+ 	eindent

+ 

+ 	if ! is_apparmor_loaded ; then

+ 		load_module

+ 		if [ $? -ne 0 ]; then

+ 			eerror "AppArmor kernel support is not present"

+ 			eend 1

+ 			return 1

+ 		fi

+ 	fi

+ 

+ 	parse_profiles load

+ 

+ 	eoutdent

+ }

+ 

+ stop() {

+ 	ebegin "Stopping AppArmor"

+ 	eindent

+ 	apparmor_stop

+ 	eoutdent

+ }

+ 

+ reload() {

+ 	# todo: split out clean_profiles into its own function upstream

+ 	# so we can do parse_profiles reload && clean_profiles

+ 	# and do a proper reload instead of restart

+ 	apparmor_restart

+ }

@@ -0,0 +1,27 @@ 

+ # Maintainer: David P. <megver83@parabola.nu>

+ # Maintainer (Artix): artoo <artoo@artixlinux.org>

+ 

+ pkgname=avahi-openrc

+ pkgver=20210505

+ pkgrel=2

+ pkgdesc="OpenRC avahi init script"

+ arch=('any')

+ url="https://gitea.artixlinux.org/packagesA/avahi-openrc"

+ license=('GPL2')

+ groups=('openrc-world')

+ provides=('init-avahi')

+ conflicts=('init-avahi')

+ source=('avahi-daemon.initd'

+         'avahi-dnsconfd.initd'

+         'autoipd-openrc.sh')

+ sha256sums=('0e6513b19d79edfe8d3a124e15fe48ee3cfa073fa93971c2265d82c4df7caa10'

+             'a359e718f6c0be654ded4f27e2215067564358d43e17d9a99d5d65c8379eb815'

+             '064a4cedc00f67e93a6f2ef99489e2614305a673a75a2135010283e99da6d6bf')

+ 

+ package() {

+ 	depends=('avahi' 'openrc')

+ 	install -Dm755 "${srcdir}"/avahi-daemon.initd   "${pkgdir}"/etc/init.d/avahi-daemon

+ 	install -Dm755 "${srcdir}"/avahi-dnsconfd.initd "${pkgdir}"/etc/init.d/avahi-dnsconfd

+ 

+ 	install -Dm755 autoipd-openrc.sh "${pkgdir}"/usr/lib/netifrc/net/autoipd.sh

+ }

nonsystemd/avahi-openrc/autoipd-openrc.sh nonsystemd/openrc-desktop/autoipd-openrc.sh
file renamed
file was moved with no change to the file
nonsystemd/avahi-openrc/avahi-daemon.initd nonsystemd/openrc-desktop/avahi-daemon.initd
file renamed
+14 -12
@@ -3,6 +3,8 @@ 

  # Distributed under the terms of the GNU General Public License v2

  

  extra_started_commands="reload"

+ command="/usr/sbin/avahi-daemon"

+ supervisor="supervise-daemon"

  

  depend() {

  	before netmount nfsmount
@@ -10,20 +12,20 @@ 

  	need dbus

  }

  

- start() {

- 	ebegin "Starting avahi-daemon"

- 	/usr/bin/avahi-daemon -D

- 	eend $?

- }

- 

- stop() {

- 	ebegin "Stopping avahi-daemon"

- 	/usr/bin/avahi-daemon -k

- 	eend $?

- }

+ # start() {

+ # 	ebegin "Starting avahi-daemon"

+ # 	/usr/bin/avahi-daemon -D

+ # 	eend $?

+ # }

+ #

+ # stop() {

+ # 	ebegin "Stopping avahi-daemon"

+ # 	/usr/bin/avahi-daemon -k

+ # 	eend $?

+ # }

  

  reload() {

  	ebegin "Reloading avahi-daemon"

- 	/usr/bin/avahi-daemon -r

+ 	${command} -r

  	eend $?

  }

@@ -0,0 +1,30 @@ 

+ #!/usr/bin/openrc-run

+ # Copyright 1999-2007 Gentoo Foundation

+ # Distributed under the terms of the GNU General Public License v2

+ 

+ extra_started_commands="reload"

+ supervisor="supervise-daemon"

+ command="/usr/bin/avahi-dnsconfd"

+ 

+ depend() {

+ 	need avahi-daemon

+ 	use net

+ }

+ 

+ # start() {

+ # 	ebegin "Starting avahi-dnsconfd"

+ # 	/usr/bin/avahi-dnsconfd -D

+ # 	eend $?

+ # }

+ #

+ # stop() {

+ # 	ebegin "Stopping avahi-dnsconfd"

+ # 	/usr/bin/avahi-dnsconfd -k

+ # 	eend $?

+ # }

+ 

+ reload() {

+ 	ebegin "Reloading avahi-dnsconfd"

+ 	${command} -r

+ 	eend $?

+ }

@@ -0,0 +1,20 @@ 

+ # Maintainer: David P. <megver83@parabola.nu>

+ # Maintainer (Artix): artoo <artoo@artixlinux.org>

+ 

+ pkgname=bluez-openrc

+ pkgver=20210506

+ pkgrel=1

+ pkgdesc="OpenRC bluez init script"

+ arch=('any')

+ url="https://gitea.artixlinux.org/packagesB/bluez-openrc"

+ license=('GPL2')

+ groups=('openrc-world')

+ provides=('init-bluez')

+ conflicts=('init-bluez')

+ source=("bluetoothd.initd")

+ sha256sums=('b99147767d339b0d6707bbd8cd4da51e795835b7519e7d6d2fcf70dabcaeeb9a')

+ 

+ package() {

+     depends=('bluez' 'openrc')

+     install -Dm755 "${srcdir}"/bluetoothd.initd "${pkgdir}"/etc/init.d/bluetoothd

+ }

nonsystemd/bluez-openrc/bluetoothd.initd nonsystemd/openrc-desktop/bluetoothd.initd
file renamed
+3 -2
@@ -2,9 +2,10 @@ 

  # Copyright 1999-2019 Gentoo Authors

  # Distributed under the terms of the GNU General Public License v2

  

- pidfile="/run/bluetoothd.pid"

+ supervisor="supervise-daemon"

+ #pidfile="/run/bluetoothd.pid"

  command="/usr/lib/bluetooth/bluetoothd"

- command_background=1

+ #command_background=1

  

  depend() {

      after coldplug

@@ -0,0 +1,27 @@ 

+ # Maintainer: David P. <megver83@parabola.nu>

+ # Maintainer (Artix): Nathan Owens <ndowens@artixlinux.org>

+ 

+ pkgname=chrony-openrc

+ pkgver=20210506

+ pkgrel=2

+ pkgdesc="OpenRC chrony init"

+ arch=('any')

+ url="https://gitea.artixlinux.org/packagesC/chrony-openrc"

+ license=('GPL2')

+ groups=('openrc-galaxy')

+ provides=('init-chrony' 'init-timed')

+ conflicts=('init-chrony' 'init-timed')

+ backup=('etc/conf.d/chrony')

+ source=("chrony.confd"

+         "chrony.initd")

+ sha256sums=('e65e4cf13bf00d6e7378f86f4513b5b3312b1d8b181bedbef6d8f55e8037f1de'

+             '149b12adabd0ab5358de1b3d8674dd5ecde7acd7d14310ee83dae4a72bc84f0b')

+ b2sums=('496483539b15a55c15287178b7df730fe33fe8d7ceda164f362c0dd6cd833bbee84a0a0496586489659075fc10aafed0f221fb78d60804ddd9edd24e71f6d49b'

+         '4e8f80b060bcc7f6f3b0d702f1b85387f6e545c31f315232574bf8ebd5ad2a6604a80a994ba629ffe419776a29339d894f0c1c7db78e9cd6fb4dc4761cf2c398')

+ 

+ 

+ package() {

+     depends=('openrc' 'chrony')

+     install -Dm755 "${srcdir}"/chrony.initd "${pkgdir}"/etc/init.d/chrony

+     install -Dm644 "${srcdir}"/chrony.confd "${pkgdir}"/etc/conf.d/chrony

+ }

@@ -0,0 +1,17 @@ 

+ # /etc/conf.d/chronyd

+ 

+ CFGFILE="/etc/chrony.conf"

+ 

+ # chronyd takes some time to perform a second fork, by enabling this

+ # option chronyd is deamonized through start-stop-daemon(1) thereby

+ # significantly reducing the startup time.

+ FAST_STARTUP=yes

+ 

+ # Configuration dependant options :

+ #      -s - Set system time from RTC if rtcfile directive present

+ #      -r - Reload sample histories if dumponexit directive present

+ #

+ # The combination of "-s -r" allows chronyd to perform long term averaging of

+ # the gain or loss rate across system reboots and shutdowns.

+ 

+ ARGS=""

@@ -0,0 +1,78 @@ 

+ #!/usr/bin/openrc-run

+ # Copyright 1999-2007 Gentoo Foundation

+ # Distributed under the terms of the GNU General Public License v2

+ # $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/files/chronyd.rc,v 1.8 2007/03/22 14:32:09 tove Exp $

+ 

+ command="/usr/bin/chronyd"

+ description="NTP daemon"

+ pidfile="/run/chrony/chronyd.pid"

+ 

+ depend() {

+ 	need net

+ 	after firewall

+ 	provide ntp-client ntp-server

+ 	use dns

+ }

+ 

+ checkconfig() {

+ 	# Note that /etc/chrony/chrony.keys is *NOT* checked. This

+ 	# is because the user may have specified another key

+ 	# file, and we don't want to force the user to use that

+ 	# exact name for the key file.

+ 	if [ ! -f "${CFGFILE}" ] ; then

+ 		eerror "Please create ${CFGFILE} and the"

+ 		eerror "chrony key file (usually /etc/chrony/chrony.keys)"

+ 		eerror "by using the"

+ 		eerror ""

+ 		eerror "        chrony.conf.example"

+ 		eerror "        chrony.keys.example"

+ 		eerror ""

+ 		eerror "files (from the documentation directory)"

+ 		eerror "as templates."

+ 		return 1

+ 	else

+ 		# Actually, I tried it, and chrony seems to ignore the pidfile

+ 		# option. I'm going to leave it here anyway, since you never

+ 		# know if it might be handy

+ 		_cfg_pidfile=`awk '/^ *pidfile/{print $2}' "${CFGFILE}"`

+ 		if [ -n "$_cfg_pidfile" ] ; then

+ 			pidfile="$_cfg_pidfile"

+ 		fi

+ 	fi

+ 	return 0

+ }

+ 

+ setxtrarg() {

+ 	if [ -c /dev/rtc ]; then

+ 		grep -q '^rtcfile' "${CFGFILE}" && ARGS="${ARGS} -s"

+ 	fi

+ 	grep -q '^dumponexit$' "${CFGFILE}" && ARGS="${ARGS} -r"

+ 	return 0

+ }

+ 

+ start() {

+ 	checkconfig || return $?

+ 	setxtrarg

+ 

+ 	local daemon_args=

+ 	if yesno "$FAST_STARTUP"; then

+ 		ARGS="${ARGS} -n"

+ 		daemon_args="--background"

+ 	fi

+ 

+ 	ebegin "Starting chronyd"

+ 	start-stop-daemon $daemon_args --start --quiet \

+ 		--exec "${command}" \

+ 		--pidfile "${pidfile}" \

+ 		-- -f "${CFGFILE}" ${ARGS}

+ 	eend $? "Failed to start chronyd"

+ }

+ 

+ stop() {

+ 	checkconfig || return $?

+ 

+ 	ebegin "Stopping chronyd"

+ 	start-stop-daemon --stop --quiet \

+ 		--pidfile "${pidfile}"

+ 	eend $? "Failed to stop chronyd"

+ }

@@ -0,0 +1,12 @@ 

+ #!/bin/bash

+ 

+ # launches a session dbus instance

+ 

+ dbuslaunch="$(which dbus-launch 2>/dev/null)"

+ if [ -n "$dbuslaunch" ] && [ -x "$dbuslaunch" ] && [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then

+     if [ -n "$command" ]; then

+         command="$dbuslaunch --exit-with-session $command"

+     else

+         eval $($dbuslaunch --sh-syntax --exit-with-session)

+     fi

+ fi

@@ -0,0 +1,30 @@ 

+ # Maintainer: David P. <megver83@parabola.nu>

+ # Maintainer (Artix): artoo <artoo@artixlinux.org>

+ 

+ pkgname=dbus-openrc

+ pkgver=20210418

+ pkgrel=2

+ pkgdesc="OpenRC dbus init script"

+ arch=('any')

+ url="https://gitea.artixlinux.org/packagesD/dbus-openrc"

+ license=('GPL2')

+ provides=('init-dbus')

+ conflicts=('init-dbus')

+ source=('dbus.initd'

+         'dbus-reload.hook'

+         '80-dbus')

+ sha256sums=('3801358d1fe65db3711851c4a2d7c491c8750c899d8effdf37eb64d34683e91b'

+             '517cb12a30f84ba9580532d5485ce219ad96668480db99fcd4954c7017a0ea47'

+             '6d637acae40368db9e7c005b2e53483882014caef281fe9e801633ba7cc3b7dd')

+ 

+ package() {

+     depends=('dbus' 'openrc')

+     install -Dm755 "${srcdir}"/dbus.initd "${pkgdir}"/etc/init.d/dbus

+ 

+     install -d "${pkgdir}"/etc/runlevels/default

+     ln -sf /etc/init.d/dbus "${pkgdir}"/etc/runlevels/default/dbus

+ 

+     install -Dt "${pkgdir}"/usr/share/libalpm/hooks -m644 *.hook

+ 

+     install -Dm755 "${srcdir}"/80-dbus "${pkgdir}"/etc/X11/xinit/xinitrc.d/80-dbus.sh

+ }

nonsystemd/dbus-openrc/dbus-reload.hook nonsystemd/dbus/dbus-reload.hook
file renamed
+1 -1
@@ -1,5 +1,5 @@ 

  [Trigger]

- Type = File

+ Type = Path

  Operation = Install

  Operation = Upgrade

  Operation = Remove

nonsystemd/dbus-openrc/dbus.initd nonsystemd/dbus/dbus.initd
file renamed
+3 -3
@@ -2,12 +2,12 @@ 

  # Copyright 1999-2019 Gentoo Authors

  # Distributed under the terms of the GNU General Public License, v2 or later

  

- extra_started_commands="reload"

- 

+ supervisor=supervise-daemon

  description="An IPC message bus daemon"

- pidfile="/run/dbus/pid"

  command="/usr/bin/dbus-daemon"

  command_args="--system"

+ command_args_foreground="--nofork --nopidfile"

+ extra_started_commands="reload"

  

  dbus_socket="/run/dbus/system_bus_socket"

  

file modified
+34 -29
@@ -1,40 +1,33 @@ 

- # Maintainer: David P. <megver83@parabola.nu>

- # Maintainer (Arch): Jan Alexander Steffens (heftig) <heftig@archlinux.org>

- # Contributor (Arch): Jan de Groot <jgc@archlinux.org>

- # Contributor (Arch): Tom Gundersen <teg@jklm.no>

- # Contributor (Arch): Link Dupont <link@subpop.net>

- 

- pkgname=dbus

- pkgver=1.12.20

+ # Maintainer: Jan Alexander Steffens (heftig) <heftig@archlinux.org>

+ # Contributor: Jan de Groot <jgc@archlinux.org>

+ # Contributor: Tom Gundersen <teg@jklm.no>

+ # Contributor: Link Dupont <link@subpop.net>

+ 

+ pkgbase=dbus

+ pkgname=(dbus dbus-docs)

+ pkgver=1.14.0

  pkgrel=1

- pkgrel+=.nonsystemd2

+ pkgrel+=.nonsystemd1

  pkgdesc="Freedesktop.org message bus system"

  url="https://wiki.freedesktop.org/www/Software/dbus/"

  arch=(x86_64)

  arch+=(i686 armv7h)

  license=(GPL custom)

  depends=(libx11 libelogind expat audit)

- depends+=(libelogind.so libaudit.so)

  makedepends=(elogind xmlto docbook-xsl python yelp-tools doxygen git autoconf-archive)

- provides=(libdbus libdbus-1.so)

- provides+=(dbus-elogind dbus-openrc)

- conflicts=(libdbus dbus-elogind dbus-openrc)

- replaces=(${conflicts[@]})

  source=("git+https://gitlab.freedesktop.org/dbus/dbus.git?signed#tag=dbus-$pkgver"

          dbus-enable-elogind.patch

-         no-fatal-warnings.diff

-         dbus-reload.hook

-         dbus.initd)

+         no-fatal-warnings.diff)

  sha256sums=('SKIP'

              'faffcaa5b295f49fcedeed2c9ece5298949096be3062fd99a4bf1a6ac3ad1ea0'

-             '6958eeec07557b92a28419eb1702331ee2f0a6fd17285e37dfb6130b9fa4cf6e'

-             '1335a86bb5eb68614bf13af314f1a7f5f6f68253584986e9c5b492a4585ab722'

-             '9964aa935b4a7d64f5970bcfcd561b06013a85ae2712444bc4c5f644364dab3b')

+             'c10395be67e1127a58d7173b587fbbf16f8a8b271c41293558fcf9e27c185478')

  validpgpkeys=('DA98F25C0871C49A59EAFF2C4DE8FF2A63C7CC90') # Simon McVittie <simon.mcvittie@collabora.co.uk>

  

  prepare() {

    cd dbus

+ 

    patch -Np 1 -i ../dbus-enable-elogind.patch

+ 

    # Allow us to enable checks without them being fatal

    patch -Np1 -i ../no-fatal-warnings.diff

  
@@ -48,6 +41,7 @@ 

      --sysconfdir=/etc \

      --localstatedir=/var \

      --libexecdir=/usr/lib/dbus-1.0 \

+     --runstatedir=/run \

      --with-console-auth-dir=/run/console/ \

      --with-dbus-user=dbus \

      --with-system-pid-file=/run/dbus/pid \
@@ -67,10 +61,15 @@ 

  }

  

  check() {

-   make -C dbus check

+   make -C dbus -j1 check

  }

  

- package() {

+ package_dbus() {

+   depends+=(libelogind.so libaudit.so)

+   provides=(libdbus libdbus-1.so)

+   conflicts=(libdbus)

+   replaces=(libdbus)

+ 

    DESTDIR="$pkgdir" make -C dbus install

  

    rm -r "$pkgdir"/{etc,var}
@@ -79,14 +78,20 @@ 

    echo 'u dbus 81 "System Message Bus"' |

      install -Dm644 /dev/stdin "$pkgdir/usr/lib/sysusers.d/dbus.conf"

  

+   # Split docs

+   mkdir -p doc/usr/share

+   mv {"$pkgdir",doc}/usr/share/doc

+ 

    install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 dbus/COPYING

+ }

+ 

+ package_dbus-docs() {

+   pkgdesc+=" (documentation)"

+   depends=()

  

-   # Remove docs

-   rm -r "$pkgdir/usr/share/doc"

+   mv doc/* "$pkgdir"

  

-   # Init script

-   install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 *.hook

-   install -Dm755 "$srcdir/dbus.initd" "$pkgdir/etc/init.d/dbus"

-   install -d "${pkgdir}/etc/runlevels/default"

-   ln -sf "/etc/init.d/dbus" "${pkgdir}/etc/runlevels/default/dbus"

+   install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 dbus/COPYING

  }

+ 

+ # vim:set sw=2 et:

@@ -1,10 +1,10 @@ 

  diff --git i/dbus/dbus-internals.c w/dbus/dbus-internals.c

- index 267aef97..b1064e85 100644

+ index ab498b15..cf86f4ae 100644

  --- i/dbus/dbus-internals.c

  +++ w/dbus/dbus-internals.c

- @@ -185,7 +185,7 @@ const char *_dbus_no_memory_message = "Not enough memory";

-  

-  static dbus_bool_t warn_initted = FALSE;

+ @@ -193,7 +193,7 @@ static dbus_bool_t warn_initted = FALSE;

+   * threads, the worst that will happen is that warnings get their default

+   * fatal/non-fatal nature. */

   static dbus_bool_t fatal_warnings = FALSE;

  -static dbus_bool_t fatal_warnings_on_check_failed = TRUE;

  +static dbus_bool_t fatal_warnings_on_check_failed = FALSE;

@@ -0,0 +1,26 @@ 

+ # Maintainer: David P. <megver83@parabola.nu>

+ # Maintainer (Artix): Rafli Akmal <rafliakmaltejakusuma@gmail.com>

+ # Contributor (Artix): artoo <artoo@artixlinux.org>

+ # Contributor (Artix): Oscar Campos <damnwidget@artixlinux.org>

+ 

+ pkgname=docker-openrc

+ pkgver=20210505

+ pkgrel=1

+ pkgdesc="OpenRC docker init script"

+ arch=('any')

+ url="https://gitea.artixlinux.org/packagesD/docker-openrc"

+ license=('GPL2')

+ groups=('openrc-galaxy')

+ provides=('init-docker')

+ conflicts=('init-docker')

+ backup=('etc/conf.d/docker')

+ source=("docker.confd"

+         "docker.initd")

+ sha256sums=('3f661c0032dda93d448f138308b1d70b35ef9297bc43816891bbcd1ab5d7cc5e'

+             'd891f5ba66b5a8dd472b7b19db774af7a22a7a1c0766cb57c3422c098a82c493')

+ 

+ package() {

+     depends=('openrc' 'docker')

+     install -Dm755 "$srcdir/docker.initd" "$pkgdir/etc/init.d/docker"

+     install -Dm644 "$srcdir/docker.confd" "$pkgdir/etc/conf.d/docker"

+ }

@@ -0,0 +1,29 @@ 

+ # /etc/conf.d/docker: config file for /etc/init.d/docker

+ 

+ # where the docker daemon output gets piped

+ # this contains both stdout and stderr. If  you need to separate them,

+ # see the settings below

+ #DOCKER_LOGFILE="/var/log/docker.log"

+ 

+ # where the docker daemon stdout gets piped

+ # if this is not set, DOCKER_LOGFILE is used

+ #DOCKER_OUTFILE="/var/log/docker-out.log"

+ 

+ # where the docker daemon stderr gets piped

+ # if this is not set, DOCKER_LOGFILE is used

+ #DOCKER_ERRFILE="/var/log/docker-err.log"

+ 

+ # where docker's pid get stored

+ #DOCKER_PIDFILE="/run/docker.pid"

+ 

+ # Settings for process limits (ulimit)

+ #DOCKER_ULIMIT="-c unlimited -n 1048576 -u unlimited"

+ 

+ # seconds to wait for sending SIGTERM and SIGKILL signals when stopping docker

+ #DOCKER_RETRY="TERM/60/KILL/10"

+ 

+ # where the docker daemon itself is run from

+ #DOCKERD_BINARY="/usr/bin/dockerd"

+ 

+ # any other random options you want to pass to docker

+ DOCKER_OPTS=""

@@ -0,0 +1,28 @@ 

+ #!/usr/bin/openrc-run

+ # Copyright 1999-2013 Gentoo Foundation

+ # Distributed under the terms of the GNU General Public License v2

+ 

+ command="${DOCKERD_BINARY:-/usr/bin/dockerd}"

+ pidfile="${DOCKER_PIDFILE:-/run/${RC_SVCNAME}.pid}"

+ command_args="-p \"${pidfile}\" ${DOCKER_OPTS}"

+ DOCKER_LOGFILE="${DOCKER_LOGFILE:-/var/log/${RC_SVCNAME}.log}"

+ DOCKER_ERRFILE="${DOCKER_ERRFILE:-${DOCKER_LOGFILE}}"

+ DOCKER_OUTFILE="${DOCKER_OUTFILE:-${DOCKER_LOGFILE}}"

+ start_stop_daemon_args="--background \

+ 	--stderr \"${DOCKER_ERRFILE}\" --stdout \"${DOCKER_OUTFILE}\""

+ 

+ extra_started_commands="reload"

+ 

+ rc_ulimit="${DOCKER_ULIMIT:--c unlimited -n 1048576 -u unlimited}"

+ 

+ retry="${DOCKER_RETRY:-TERM/60/KILL/10}"

+ 

+ start_pre() {

+ 	checkpath -f -m 0644 -o root:docker "$DOCKER_LOGFILE"

+ }

+ 

+ reload() {

+ 	ebegin "Reloading ${RC_SVCNAME}"

+ 	start-stop-daemon --signal HUP --pidfile "${pidfile}"

+ 	eend $? "Failed to stop ${RC_SVCNAME}"

+ }

@@ -0,0 +1,24 @@ 

+ # Maintainer: David P. <megver83@parabola.nu>

+ # Maintainer (Artix): artoo <artoo@artixlinux.org>

+ 

+ pkgname=elogind-openrc

+ pkgver=20210704

+ pkgrel=1

+ pkgdesc="OpenRC elogind init script"

+ arch=('any')

+ url="https://gitea.artixlinux.org/packagesE/elogind-openrc"

+ license=('GPL2')

+ provides=('init-logind' 'init-elogind')

+ conflicts=('init-logind' 'init-elogind')

+ source=(#"elogind.confd"

+         "elogind.sv.initd")

+ sha256sums=('b4097e85f81f37d8529eb57563813e94b7c7afb9931d892907d805093187761b')

+ 

+ package() {

+     depends=('elogind' 'dbus-openrc')

+ #     install -Dm755 "${srcdir}"/elogind.confd "${pkgdir}"/etc/conf.d/elogind

+     install -Dm755 "${srcdir}"/elogind.sv.initd "${pkgdir}"/etc/init.d/elogind

+ 

+     install -d "${pkgdir}"/etc/runlevels/boot

+     ln -sf /etc/init.d/elogind "${pkgdir}"/etc/runlevels/boot/elogind

+ }

nonsystemd/elogind-openrc/elogind.sv.initd nonsystemd/elogind/elogind.sv.initd
file renamed
file was moved with no change to the file
file modified
+25 -31
@@ -1,20 +1,10 @@ 

- # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>

  # Maintainer: David P. <megver83@parabola.nu>

- # Contributor: Luke Shumaker <lukeshu@parabola.nu>

  # Maintainer (Artix): artoo <artoo@artixlinux.org>

  

- # This package comes from Artix

- # Parabola changes:

- # - elogind and libelogind: do not provide {lib,}elogind=$pkgver, it's ridiculous

- # - libelogind: make libsystemd.so a copy of libelogind.so instead of linking it,

- #   so in that way it will provide the correct version according to the

- #   architecture (libsystemd.so=0-64 or libsystemd.so=0-32)

- # - remove prepare()

- 

  pkgbase=elogind

  pkgname=('elogind' 'libelogind')

  pkgver=246.10

- pkgrel=2

+ pkgrel=7

  pkgdesc="The systemd project's logind, extracted to a standalone package"

  arch=('x86_64')

  arch+=('i686' 'armv7h')
@@ -24,10 +14,17 @@ 

              'libseccomp' 'meson' 'kexec-tools' 'openrc' 'libcap')

  options=('!libtool')

  source=("${pkgbase}-${pkgver}.tar.gz::https://github.com/elogind/elogind/archive/v${pkgver}.tar.gz"

-         #'elogind.confd' 'elogind.initd'

-         'elogind.sv.initd')

+         dbus-exit.patch::https://github.com/pierre-labastie/elogind/commit/04d76bc0f087640bedc6ee52525529ccfdc6ae78.patch

+         fix-p-opt.patch::https://github.com/njhanley/elogind/commit/850797eaf482d7f1ada051730eeeca53676ca43e.patch)

  sha256sums=('c490dc158c8f5bca8d00ecfcc7ad5af24d1c7b9e59990a0b3b1323996221a922'

-             'b4097e85f81f37d8529eb57563813e94b7c7afb9931d892907d805093187761b')

+             'cccbbe6bf6603d81c307ad670994fe058ff630b37c218041c4ca877ef0486843'

+             '5d39f9d9edd6fb0e9e93bae004ca47bb0973c7570c8dd840f98cda3348bddd7f')

+ 

+ prepare() {

+     cd ${pkgbase}-${pkgver}

+     patch -Np 1 -i ../dbus-exit.patch

+     patch -Np 1 -i ../fix-p-opt.patch

+ }

  

  build() {

      local meson_options=(
@@ -43,7 +40,7 @@ 

  

      arch-meson "$pkgbase-${pkgver}" build "${meson_options[@]}"

  

-     ninja -C build

+     meson compile -C build

  }

  

  check(){
@@ -52,14 +49,14 @@ 

  

  package_elogind() {

      pkgdesc="The systemd project's logind, extracted to a standalone package"

-     provides=("systemd=${pkgver}" 'logind')

+     provides=('logind')

      depends=('acl' 'dbus' 'libseccomp' 'libelogind' 'kexec-tools' 'udev')

      optdepends=('polkit: polkit support')

      backup=('etc/elogind/logind.conf')

  

-     provides+=("${pkgname}-openrc")

-     conflicts=('systemd-udev' "${pkgname}-openrc")

-     replaces=("${pkgname}-openrc")

+     # systemd compatibility

+     provides+=("systemd=$pkgver")

+     conflicts+=('systemd')

  

      DESTDIR="$pkgdir" meson install -C build

  
@@ -69,29 +66,26 @@ 

      mv -v "${pkgdir}"/usr/lib/libelogind*.so* "${srcdir}"/_libelogind

  

      install -d "${pkgdir}"/{etc,usr/lib}/elogind/{logind,sleep}.conf.d

- 

-     # Init script

-     #install -Dm755 "${srcdir}"/elogind.initd "${pkgdir}"/etc/init.d/elogind

-     #install -Dm755 "${srcdir}"/elogind.confd "${pkgdir}"/etc/conf.d/elogind

-     install -Dm755 "${srcdir}"/elogind.sv.initd "${pkgdir}"/etc/init.d/elogind

- 

-     install -d "${pkgdir}"/etc/runlevels/boot

-     ln -sf /etc/init.d/elogind "${pkgdir}"/etc/runlevels/boot/elogind

  }

  

  package_libelogind(){

      pkgdesc="elogind client libraries"

      provides=('libelogind.so' 'liblogind')

-     provides+=("libsystemd=${pkgver}" "systemd-libs=${pkgver}"

-              'libsystemd.so')

-     conflicts=('libsystemd.so')

      depends=('libcap' 'libudev')

  

+     # libsystemd compatibility

+     provides+=('libsystemd.so' "libsystemd=${pkgver}" "systemd-libs=${pkgver}")

+     conflicts+=('libsystemd.so' 'libsystemd' 'systemd-libs')

+ 

      cd "${pkgbase}-${pkgver}"

  

      install -dm755 "${pkgdir}"/usr/lib

      mv "${srcdir}"/_libelogind/libelogind*.so* "${pkgdir}"/usr/lib

  

-     install -m755 "${pkgdir}"/usr/lib/libelogind.so "${pkgdir}"/usr/lib/libsystemd.so

+     #ln -sfv libelogind.so "${pkgdir}"/usr/lib/libsystemd.so

      ln -sfv libsystemd.so "${pkgdir}"/usr/lib/libsystemd.so.0

+ 

+     # libsystemd compatibility

+     # HACK: (re)install libelogind.so as libsystemd.so so their lib versions match

+     install -m755 "${pkgdir}"/usr/lib/libelogind.so "${pkgdir}"/usr/lib/libsystemd.so

  }

@@ -0,0 +1,21 @@ 

+ # Maintainer: David P. <megver83@parabola.nu>

+ # Maintainer (Artix): Nathan Owens <ndowens @ artixlinux.org>

+ # Submitter (Artix): alium@artixlinux.org

+ 

+ pkgname=firewalld-openrc

+ pkgver=20210505

+ pkgrel=1

+ pkgdesc="OpenRC firewalld init script"

+ arch=('any')

+ url="https://gitea.artixlinux.org/packagesF/firewalld-openrc"

+ license=('GPL2')

+ groups=('openrc-galaxy')

+ provides=('init-firewalld')

+ conflicts=('init-firewalld')

+ source=("firewalld.initd")

+ sha256sums=('53ed08a1e2a45fae27e3dd30022b91f71801092332d158af0467f78723d56fd1')

+ 

+ package() {

+ 	depends=('openrc' 'firewalld')

+ 	install -Dm755 "$srcdir/firewalld.initd" "$pkgdir/etc/init.d/firewalld"

+ }

@@ -0,0 +1,14 @@ 

+ #!/usr/bin/openrc-run

+ # Copyright 1999-2018 Gentoo Authors

+ # Distributed under the terms of the GNU General Public License v2

+ 

+ description="FirewallD"

+ 

+ supervisor=supervise-daemon

+ command=/usr/sbin/firewalld

+ command_args="--nofork"

+ 

+ depend() {

+ 	need dbus

+ 	provide firewall

+ }

@@ -0,0 +1,20 @@ 

+ # Maintainer: David P. <megver83@parabola.nu>

+ # Maintainer (Artix): artoo <artoo@artixlinux.org>

+ 

+ pkgname=gdm-openrc

+ pkgver=20220104

+ pkgrel=1

+ pkgdesc="OpenRC gdm init script"

+ arch=('any')

+ url="https://gitea.artixlinux.org/packagesG/gdm-openrc"

+ license=('GPL2')

+ groups=('openrc-world')

+ provides=('init-displaymanager')

+ conflicts=('init-displaymanager')

+ source=("gdm.initd")

+ sha256sums=('b46bb53bf9eb0c8d292133216af3c451060e8acc278e837d2bb5a58d548baec0')

+ 

+ package() {

+     depends=('gdm' 'openrc')

+     install -Dm755 "$srcdir/gdm.initd" "$pkgdir/etc/init.d/gdm"

+ }

@@ -0,0 +1,17 @@ 

+ #!/usr/bin/openrc-run

+ 

+ supervisor=supervise-daemon

+ command="/usr/bin/gdm"

+ 

+ depend() {

+     need localmount

+ 

+     after bootmisc consolefont modules netmount

+     after readahead-list ypbind autofs openvpn gpm lircmd

+     after quota keymaps

+     before alsasound

+     want logind

+     use xfs

+ 

+     provide xdm display-manager

+ }

@@ -0,0 +1,24 @@ 

+ # Maintainer: David P. <megver83@parabola.nu>

+ # Maintainer (Artix): artoo <artoo@artixlinux.org>

+ 

+ pkgname=gpm-openrc

+ pkgver=20210505

+ pkgrel=2

+ pkgdesc="OpenRC gpm init script"

+ arch=('any')

+ url="https://gitea.artixlinux.org/packagesG/gpm-openrc"

+ license=('GPL2')

+ groups=('openrc-system')

+ provides=('init-gpm')

+ conflicts=('init-gpm')

+ backup=('etc/conf.d/gpm')

+ source=("gpm.confd"

+         "gpm.initd")

+ sha256sums=('73e7483fdc4b12ab4225a4cb13bbe7da71b07b9e69b17e3a6a4c63cb5e2287c8'

+             'b0a698c19a699b66375b39ad10e59a1e565c67b4c2dbf281f571d185654cf711')

+ 

+ package() {

+     depends=('openrc' 'gpm')

+     install -Dm755 "${srcdir}"/gpm.initd "${pkgdir}"/etc/init.d/gpm

+     install -Dm755 "${srcdir}"/gpm.confd "${pkgdir}"/etc/conf.d/gpm

+ }

@@ -0,0 +1,23 @@ 

+ # /etc/init.d/gpm

+ 

+ # Please uncomment the type of mouse you have and the appropriate MOUSEDEV entry

+ 

+ MOUSE=ps2

+ #MOUSE=imps2

+ #MOUSEDEV=/dev/psaux

+ MOUSEDEV=/dev/input/mice

+ 

+ # Extra settings

+ 

+ #RESPONSIVENESS=

+ #REPEAT_TYPE=raw

+ 

+ # Please uncomment this line if you want gpm to understand charsets used

+ # in URLs and names with ~ or : in them, etc. This is a good idea to turn on!

+ 

+ #APPEND="-l \"a-zA-Z0-9_.:~/\300-\326\330-\366\370-\377\""

+ 

+ # Various other options, see gpm(8) manpage for more.

+ 

+ #APPEND="-g 1 -A60"

+ #APPEND="-l \"a-zA-Z0-9_.:~/\300-\326\330-\366\370-\377\" -g 1 -A60"

@@ -0,0 +1,28 @@ 

+ #!/usr/bin/openrc-run

+ # Copyright 1999-2012 Gentoo Foundation

+ # Distributed under the terms of the GNU General Public License v2

+ 

+ #NB: Config is in /etc/conf.d/gpm

+ 

+ command=/usr/bin/gpm

+ command_args="

+ 	-m ${MOUSEDEV}

+ 	-t ${MOUSE}

+ 	${RESPONSIVENESS:+ -r ${RESPONSIVENESS}}

+ 	${REPEAT_TYPE:+ -R${REPEAT_TYPE}}

+ 	${APPEND}

+ "

+ 

+ pidfile=/var/run/gpm.pid

+ 

+ depend() {

+ 	need localmount

+ 	use hotplug logger

+ }

+ 

+ start_pre() {

+ 	if [ -z "${MOUSEDEV}" ] || [ -z "${MOUSE}" ] ; then

+ 		eerror "You need to setup MOUSEDEV and MOUSE in /etc/conf.d/gpm first"

+ 		return 1

+ 	fi

+ }

@@ -0,0 +1,39 @@ 

+ # Maintainer: David P. <megver83@parabola.nu>

+ # Maintainer (Artix): artoo <artoo@artixlinux.org>

+ 

+ pkgname=iptables-openrc

+ pkgver=20210505

+ pkgrel=2

+ pkgdesc="OpenRC iptables init script"

+ arch=('any')

+ url="https://gitea.artixlinux.org/artixlinux/packagesI/iptables-openrc"

+ license=('GPL2')

+ groups=('openrc-system')

+ provides=('init-iptables' 'ebtables-openrc')

+ conflicts=('init-iptables' 'ebtables-openrc')

+ backup=('etc/conf.d/iptables'

+         'etc/conf.d/ip6tables')

+ source=("iptables.confd"

+         "ip6tables.confd"

+         "iptables.initd"

+         "ebtables.confd"

+         "ebtables.initd")

+ sha256sums=('7e2341211ca14997b7a8a1f930f94db855291af597c568f680f80031c20d45b6'

+             'c1f5bb4ea36bb7c0a7b7abeb8169cb8547f43d348faef70c61f2daa9033c318b'

+             'e5c6164a0ffa24501d5b3fa6425f0e24a2da73891b4dd62a25b083f9f5b731af'

+             'c05a6c1ba6add3881068584074681b04bfb2ad43284d7bdd67f47f3da842de58'

+             '6eb00de3cf18f36f909cb95f1aa345de16d1cd9c8b92acb944691ac720bf3cb5')

+ 

+ package() {

+     depends=('openrc' 'iptables')

+ 

+     for f in iptables ebtables; do

+         install -Dm755 "${srcdir}"/"$f".initd "${pkgdir}"/etc/init.d/"$f"

+         install -Dm644 "${srcdir}"/"$f".confd "${pkgdir}"/etc/conf.d/"$f"

+     done

+ 

+     install -Dm644 "${srcdir}"/ip6tables.confd "${pkgdir}"/etc/conf.d/ip6tables

+ 

+     install -Dm755 "${srcdir}"/iptables.initd "${pkgdir}"/etc/init.d/ip6tables

+ 

+ }

@@ -0,0 +1,11 @@ 

+ # /etc/conf.d/ebtables

+ 

+ # Location in which ebtables initscript will save set rules on 

+ # service shutdown

+ EBTABLES_SAVE="/var/lib/ebtables/rules-save"

+ 

+ # Options to pass to ebtables-save and ebtables-restore 

+ SAVE_RESTORE_OPTIONS=""

+ 

+ # Save state on stopping ebtables

+ SAVE_ON_STOP="yes"

@@ -0,0 +1,101 @@ 

+ #!/sbin/openrc-run

+ # Copyright 1999-2020 Gentoo Authors

+ # Distributed under the terms of the GNU General Public License v2

+ 

+ extra_commands="save panic"

+ extra_started_commands="reload"

+ 

+ ebtables_bin="/sbin/ebtables"

+ ebtables_save=${EBTABLES_SAVE}

+ 

+ depend() {

+ 	before net

+ 	use logger

+ }

+ 

+ ebtables_tables() {

+ 	for table in filter nat broute; do

+ 		if ${ebtables_bin} -t ${table} -L > /dev/null 2>&1; then

+ 			printf '%s' "${table} "

+ 		fi

+ 	done

+ }

+ 

+ set_table_policy() {

+ 	local chains table=$1 policy=$2

+ 	case ${table} in

+ 		nat)    chains="PREROUTING POSTROUTING OUTPUT";;

+ 		broute) chains="BROUTING";;

+ 		filter) chains="INPUT FORWARD OUTPUT";;

+ 		*)      chains="";;

+ 	esac

+ 	local chain

+ 	for chain in ${chains} ; do

+ 		${ebtables_bin} -t ${table} -P ${chain} ${policy}

+ 	done

+ }

+ 

+ checkconfig() {

+ 	if [ ! -f ${ebtables_save} ] ; then

+ 		eerror "Not starting ebtables.  First create some rules then run:"

+ 		eerror "/etc/init.d/ebtables save"

+ 		return 1

+ 	fi

+ 	return 0

+ }

+ 

+ start() {

+ 	checkconfig || return 1

+ 	ebegin "Loading ebtables state and starting bridge firewall"

+ 	${ebtables_bin}-restore ${SAVE_RESTORE_OPTIONS} < "${ebtables_save}"

+ 	eend $?

+ }

+ 

+ stop() {

+ 	if [ "${SAVE_ON_STOP}" = "yes" ] ; then

+ 		save || return 1

+ 	fi

+ 	ebegin "Stopping bridge firewall"

+ 	local a

+ 	for a in $(ebtables_tables); do

+ 		set_table_policy $a ACCEPT

+ 

+ 		${ebtables_bin} -t $a -F

+ 		${ebtables_bin} -t $a -X

+ 	done

+ 	eend $?

+ }

+ 

+ reload() {

+ 	ebegin "Flushing bridge firewall"

+ 	local a

+ 	for a in $(ebtables_tables); do

+ 		${ebtables_bin} -t $a -F

+ 		${ebtables_bin} -t $a -X

+ 	done

+ 	eend $?

+ 

+ 	start

+ }

+ 

+ save() {

+ 	ebegin "Saving ebtables state"

+ 	touch "${ebtables_save}"

+ 	chmod 0600 "${ebtables_save}"

+ 	${ebtables_bin}-save $(ebtables_tables) ${SAVE_RESTORE_OPTIONS} > "${ebtables_save}"

+ 	eend $?

+ }

+ 

+ panic() {

+ 	service_started ebtables && svc_stop

+ 

+ 	local a

+ 	ebegin "Dropping all packets forwarded on bridges"

+ 	for a in $(ebtables_tables); do

+ 		${ebtables_bin} -t $a -F

+ 		${ebtables_bin} -t $a -X

+ 

+ 		set_table_policy $a DROP

+ 	done

+ 	eend $?

+ }

@@ -0,0 +1,27 @@ 

+ # /etc/conf.d/ip6tables

+ 

+ # Set wait option for xtables lock in seconds

+ # DEFAULT: 60

+ #IPTABLES_LOCK_WAIT_TIME="60"

+ 

+ # Set wait interval option for xtables lock in microseconds

+ # DEFAULT: 1000

+ #IPTABLES_LOCK_WAIT_INTERVAL="1000"

+ 

+ # Location in which ip6tables initscript will save set rules on

+ # service shutdown

+ IP6TABLES_SAVE="/var/lib/ip6tables/rules-save"

+ 

+ # Options to pass to ip6tables-save and ip6tables-restore 

+ SAVE_RESTORE_OPTIONS="-c"

+ 

+ # Save state on stopping ip6tables

+ SAVE_ON_STOP="yes"

+ 

+ # If you need to log ip6tables messages as soon as ip6tables starts,

+ # AND your logger does NOT depend on the network, then you may wish

+ # to uncomment the next line.

+ # If your logger depends on the network, and you uncomment this line

+ # you will create an unresolvable circular dependency during startup.

+ # After commenting or uncommenting this line, you must run 'rc-update -u'.

+ #rc_use="logger"

@@ -0,0 +1,19 @@ 

+ # /etc/conf.d/iptables

+ 

+ # Location in which iptables initscript will save set rules on 

+ # service shutdown

+ IPTABLES_SAVE="/var/lib/iptables/rules-save"

+ 

+ # Options to pass to iptables-save and iptables-restore 

+ SAVE_RESTORE_OPTIONS="-c"

+ 

+ # Save state on stopping iptables

+ SAVE_ON_STOP="yes"

+ 

+ # If you need to log iptables messages as soon as iptables starts,

+ # AND your logger does NOT depend on the network, then you may wish

+ # to uncomment the next line.

+ # If your logger depends on the network, and you uncomment this line

+ # you will create an unresolvable circular dependency during startup.

+ # After commenting or uncommenting this line, you must run 'rc-update -u'.

+ #rc_use="logger"

@@ -0,0 +1,165 @@ 

+ #!/sbin/openrc-run

+ # Copyright 1999-2018 Gentoo Authors

+ # Distributed under the terms of the GNU General Public License v2

+ 

+ extra_commands="check save panic"

+ extra_started_commands="reload"

+ 

+ iptables_lock_wait_time=${IPTABLES_LOCK_WAIT_TIME:-"60"}

+ iptables_lock_wait_interval=${IPTABLES_LOCK_WAIT_INTERVAL:-"1000"}

+ 

+ iptables_name=${SVCNAME}

+ case ${iptables_name} in

+ 	iptables|ip6tables) ;;

+ 	*) iptables_name="iptables" ;;

+ esac

+ 

+ iptables_bin="/sbin/${iptables_name}"

+ case ${iptables_name} in

+ 	iptables)  iptables_proc="/proc/net/ip_tables_names"

+ 	           iptables_save=${IPTABLES_SAVE};;

+ 	ip6tables) iptables_proc="/proc/net/ip6_tables_names"

+ 	           iptables_save=${IP6TABLES_SAVE};;

+ esac

+ 

+ depend() {

+ 	need localmount #434774

+ 	before net

+ }

+ 

+ set_table_policy() {

+ 	local has_errors=0 chains table=$1 policy=$2

+ 	case ${table} in

+ 		nat)    chains="PREROUTING POSTROUTING OUTPUT";;

+ 		mangle) chains="PREROUTING INPUT FORWARD OUTPUT POSTROUTING";;

+ 		filter) chains="INPUT FORWARD OUTPUT";;

+ 		*)      chains="";;

+ 	esac

+ 

+ 	local chain

+ 	for chain in ${chains} ; do

+ 		${iptables_bin} --wait ${iptables_lock_wait_time} --wait-interval ${iptables_lock_wait_interval} -t ${table} -P ${chain} ${policy}

+ 		[ $? -ne 0 ] && has_errors=1

+ 	done

+ 

+ 	return ${has_errors}

+ }

+ 

+ checkkernel() {

+ 	if [ ! -e ${iptables_proc} ] ; then

+ 		eerror "Your kernel lacks ${iptables_name} support, please load"

+ 		eerror "appropriate modules and try again."

+ 		return 1

+ 	fi

+ 	return 0

+ }

+ 

+ checkconfig() {

+ 	if [ -z "${iptables_save}" -o ! -f "${iptables_save}" ] ; then

+ 		eerror "Not starting ${iptables_name}.  First create some rules then run:"

+ 		eerror "/etc/init.d/${iptables_name} save"

+ 		return 1

+ 	fi

+ 	return 0

+ }

+ 

+ start_pre() {

+ 	checkconfig || return 1

+ }

+ 

+ start() {

+ 	ebegin "Loading ${iptables_name} state and starting firewall"

+ 	${iptables_bin}-restore --wait ${iptables_lock_wait_time} --wait-interval ${iptables_lock_wait_interval} ${SAVE_RESTORE_OPTIONS} < "${iptables_save}"

+ 	eend $?

+ }

+ 

+ stop_pre() {

+ 	checkkernel || return 1

+ }

+ 

+ stop() {

+ 	if [ "${SAVE_ON_STOP}" = "yes" ] ; then

+ 		save || return 1

+ 	fi

+ 

+ 	ebegin "Stopping firewall"

+ 	local has_errors=0 a

+ 	for a in $(cat ${iptables_proc}) ; do

+ 		set_table_policy $a ACCEPT

+ 		[ $? -ne 0 ] && has_errors=1

+ 

+ 		${iptables_bin} --wait ${iptables_lock_wait_time} --wait-interval ${iptables_lock_wait_interval} -F -t $a

+ 		[ $? -ne 0 ] && has_errors=1

+ 

+ 		${iptables_bin} --wait ${iptables_lock_wait_time} --wait-interval ${iptables_lock_wait_interval} -X -t $a

+ 		[ $? -ne 0 ] && has_errors=1

+ 	done

+ 	eend ${has_errors}

+ }

+ 

+ reload() {

+ 	checkkernel || return 1

+ 	checkrules || return 1

+ 	ebegin "Flushing firewall"

+ 	local has_errors=0 a

+ 	for a in $(cat ${iptables_proc}) ; do

+ 		${iptables_bin} --wait ${iptables_lock_wait_time} --wait-interval ${iptables_lock_wait_interval} -F -t $a

+ 		[ $? -ne 0 ] && has_errors=1

+ 

+ 		${iptables_bin} --wait ${iptables_lock_wait_time} --wait-interval ${iptables_lock_wait_interval} -X -t $a

+ 		[ $? -ne 0 ] && has_errors=1

+ 	done

+ 	eend ${has_errors}

+ 

+ 	start

+ }

+ 

+ checkrules() {

+ 	ebegin "Checking rules"

+ 	${iptables_bin}-restore --test ${SAVE_RESTORE_OPTIONS} < "${iptables_save}"

+ 	eend $?

+ }

+ 

+ check() {

+ 	# Short name for users of init.d script.

+ 	checkrules

+ }

+ 

+ save() {

+ 	ebegin "Saving ${iptables_name} state"

+ 	checkpath -q -d "$(dirname "${iptables_save}")"

+ 	checkpath -q -m 0600 -f "${iptables_save}"

+ 	${iptables_bin}-save ${SAVE_RESTORE_OPTIONS} > "${iptables_save}"

+ 	eend $?

+ }

+ 

+ panic() {

+ 	# use iptables autoload capability to load at least all required

+ 	# modules and filter table

+ 	${iptables_bin} --wait ${iptables_lock_wait_time} --wait-interval ${iptables_lock_wait_interval} -S >/dev/null

+ 	if [ $? -ne 0 ] ; then

+ 		eerror "${iptables_bin} failed to load"

+ 		return 1

+ 	fi

+ 

+ 	if service_started ${iptables_name}; then

+ 		rc-service ${iptables_name} stop

+ 	fi

+ 

+ 	local has_errors=0 a

+ 	ebegin "Dropping all packets"

+ 	for a in $(cat ${iptables_proc}) ; do

+ 		${iptables_bin} --wait ${iptables_lock_wait_time} --wait-interval ${iptables_lock_wait_interval} -F -t $a

+ 		[ $? -ne 0 ] && has_errors=1

+ 

+ 		${iptables_bin} --wait ${iptables_lock_wait_time} --wait-interval ${iptables_lock_wait_interval} -X -t $a

+ 		[ $? -ne 0 ] && has_errors=1

+ 

+ 		if [ "${a}" != "nat" ]; then

+ 			# The "nat" table is not intended for filtering, the use of DROP is therefore inhibited.

+ 			set_table_policy $a DROP

+ 			[ $? -ne 0 ] && has_errors=1

+ 		fi

+ 	done

+ 	eend ${has_errors}

+ }

@@ -0,0 +1,20 @@ 

+ # Maintainer: David P. <megver83@parabola.nu>

+ # Maintainer (Artix): artoo <artoo@artixlinux.org>

+ 

+ pkgname=lightdm-openrc

+ pkgver=20220104

+ pkgrel=1

+ pkgdesc="OpenRC lightdm init script"

+ arch=('any')

+ url="https://gitea.artixlinux.org/packagesL/lightdm-openrc"

+ license=('GPL2')

+ groups=('openrc-world')

+ provides=('init-displaymanager')

+ conflicts=('init-displaymanager')

+ source=("lightdm.initd")

+ sha256sums=('a33a505b49088a5d5c8388da03c826e40699694fcbfd22775b15a957a07880dc')

+ 

+ package() {

+     depends=('lightdm' 'openrc')

+     install -Dm755 "$srcdir/lightdm.initd" "$pkgdir/etc/init.d/lightdm"

+ }

@@ -0,0 +1,16 @@ 

+ #!/usr/bin/openrc-run

+ 

+ supervisor=supervise-daemon

+ command="/usr/bin/lightdm"

+ 

+ depend() {

+     need localmount

+ 

+     after bootmisc consolefont modules netmount

+     after ypbind autofs openvpn gpm lircmd

+     after quota keymaps acpid

+     before alsasound

+     want logind

+     use xfs

+     provide xdm display-manager

+ }

@@ -0,0 +1,20 @@ 

+ # Maintainer: David P. <megver83@parabola.nu>

+ # Maintainer (Artix): artoo <artoo@artixlinux.org>

+ 

+ pkgname=lxdm-openrc

+ pkgver=20220104

+ pkgrel=1

+ pkgdesc="OpenRC lxdm init script"

+ arch=('any')

+ url="https://gitea.artixlinux.org/packagesL/lxdm-openrc"

+ license=('GPL2')

+ groups=('openrc-galaxy')

+ provides=('init-displaymanager')

+ conflicts=('init-displaymanager')

+ source=("lxdm.initd")

+ sha256sums=('57ec70f482e606961971978565fc268fba9388b277ce751c2d0a16f44d081e42')

+ 

+ package() {

+     depends=('lxdm-gtk3' 'openrc')

+     install -Dm755 "$srcdir/lxdm.initd" "$pkgdir/etc/init.d/lxdm"

+ }

@@ -0,0 +1,18 @@ 

+ #!/usr/bin/openrc-run

+ 

+ command="/usr/bin/lxdm-binary"

+ command_args="-d"

+ pidfile="/run/${RC_SVCNAME}.pid"

+ 

+ depend() {

+     need localmount dbus logind

+ 

+     after bootmisc consolefont modules netmount

+     after readahead-list ypbind autofs openvpn gpm lircmd

+     after quota keymaps

+     before alsasound

+ 

+     use xfs

+ 

+     provide xdm display-manager

+ }

nonsystemd/networkmanager-openrc/10-openrc-status nonsystemd/networkmanager/10-openrc-status
file renamed
file was moved with no change to the file
nonsystemd/networkmanager-openrc/NetworkManager.confd nonsystemd/networkmanager/NetworkManager.confd
file renamed
file was moved with no change to the file
nonsystemd/networkmanager-openrc/NetworkManager.initd nonsystemd/networkmanager/NetworkManager.initd
file renamed
file was moved with no change to the file
@@ -0,0 +1,27 @@ 

+ # Maintainer: David P. <megver83@parabola.nu>

+ # Maintainer (Artix): artoo <artoo@artixlinux.org>

+ 

+ pkgname=networkmanager-openrc

+ pkgver=20210505

+ pkgrel=6

+ pkgdesc="OpenRC networkmanager init script"

+ arch=('any')

+ url="https://gitea.artixlinux.org/packagesN/networkmanager-openrc"

+ license=('GPL2')

+ groups=('openrc-world')

+ provides=('init-networkmanager')

+ conflicts=('init-networkmanager')

+ backup=('etc/conf.d/NetworkManager')

+ source=("NetworkManager".{initd,confd}

+         '10-openrc-status')

+ sha256sums=('eaf7d210540ed9f4c6b4ba81ddbb30a2aa5ce8b528057f7d64ce3478981f88e4'

+             '4594573f01fe5e04b6dde4525796acf909158591bdcefd662ec23fe0d1c3e1bd'

+             'd32a21c0683cf7a09370b35b7e3d3b3f28f5d4d242ecde2c866cfb400b94bcbe')

+ 

+ package() {

+     depends=('openrc' 'networkmanager')

+     install -Dm755 "${srcdir}"/NetworkManager.initd "${pkgdir}"/etc/init.d/NetworkManager

+     install -Dm644 "${srcdir}"/NetworkManager.confd "${pkgdir}"/etc/conf.d/NetworkManager

+ 

+     install -Dm755 "${srcdir}"/10-openrc-status "${pkgdir}"/etc/NetworkManager/dispatcher.d/10-openrc-status

+ }

@@ -1,39 +1,35 @@ 

- # Maintainer: David P. <megver83@parabola.nu>

- # Maintainer (Arch): Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>

- # Maintainer (Arch): Jan de Groot <jgc@archlinxu.org>

- # Contributor (Arch): Wael Nasreddine <gandalf@siemens-mobiles.org>

- # Contributor (Arch): Tor Krill <tor@krill.nu>

- # Contributor (Arch): Will Rea <sillywilly@gmail.com>

- # Contributor (Arch): Valentine Sinitsyn <e_val@inbox.ru>

+ # Maintainer: Nathan Owens <ndowens@artixlinux.org>

+ # Contributor: Jan de Groot <jgc@archlinxu.org>

+ # Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org>

+ # Contributor: Tor Krill <tor@krill.nu>

+ # Contributor: Will Rea <sillywilly@gmail.com>

+ # Contributor: Valentine Sinitsyn <e_val@inbox.ru>

  

  pkgbase=networkmanager

  pkgname=(networkmanager libnm nm-cloud-setup)

- pkgver=1.32.2

- pkgrel=1

+ pkgver=1.38.2

+ pkgrel=2

  pkgrel+=.nonsystemd1

  pkgdesc="Network connection manager and user applications"

- url="https://wiki.gnome.org/Projects/NetworkManager"

+ url="https://networkmanager.dev/"

  arch=(x86_64)

  arch+=(i686 armv7h)

- license=(GPL2)

+ license=(GPL)

  _pppver=2.4.9

  makedepends=(intltool dhclient dhcpcd iptables-nft gobject-introspection gtk-doc

               "ppp=$_pppver" modemmanager iproute2 nss polkit wpa_supplicant curl

-              logind libmm-glib libnewt libndp libteam nftables vala perl-yaml

+              elogind libmm-glib libnewt libndp libteam nftables vala perl-yaml

               python-gobject git vala jansson bluez-libs glib2-docs iwd dnsmasq

               openresolv libpsl audit meson)

  checkdepends=(libx11 python-dbus)

- _commit=bf1b09702ed442a3efe426c8ceba4ef1e6bb1902  # tags/1.20.6^0

- source=("git+https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git#commit=$_commit"

-         NetworkManager.{confd,initd} 10-openrc-status)

- sha256sums=('SKIP'

-             '4594573f01fe5e04b6dde4525796acf909158591bdcefd662ec23fe0d1c3e1bd'

-             'eaf7d210540ed9f4c6b4ba81ddbb30a2aa5ce8b528057f7d64ce3478981f88e4'

-             'd32a21c0683cf7a09370b35b7e3d3b3f28f5d4d242ecde2c866cfb400b94bcbe')

+ options=(debug)

+ _commit=abfd2d6ea729926bff0ddafa1367a54f6d6f4230  # tags/1.38.2^0

+ source=("git+https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git#commit=$_commit")

+ b2sums=('SKIP')

  

  pkgver() {

    cd NetworkManager

-   git describe --abbrev=10 | sed 's/-dev/dev/;s/-rc/rc/;s/-/+/g'

+   git describe --tags | sed 's/-dev/dev/;s/-rc/rc/;s/[^-]*-g/r&/;s/-/+/g'

  }

  

  prepare() {
@@ -41,7 +37,7 @@ 

  }

  

  build() {

-   local meson_args=(

+   local meson_options=(

      # system paths

      -D dbus_conf_dir=/usr/share/dbus-1/system.d

  
@@ -50,7 +46,6 @@ 

      -D session_tracking_consolekit=false

      -D suspend_resume=elogind

      -D modify_system=true

-     -D polkit_agent=true

      -D selinux=false

      -D systemdsystemunitdir=no

      -D session_tracking=elogind
@@ -79,7 +74,7 @@ 

      -D qt=false

    )

  

-   arch-meson NetworkManager build "${meson_args[@]}"

+   arch-meson NetworkManager build "${meson_options[@]}"

    meson compile -C build

  }

  
@@ -98,21 +93,22 @@ 

  }

  

  package_networkmanager() {

-   depends=(libnm iproute2 polkit wpa_supplicant libmm-glib libnewt libndp libteam curl

+   depends=(libnm iproute2 wpa_supplicant libmm-glib libnewt libndp libteam curl

             bluez-libs libpsl audit mobile-broadband-provider-info elogind)

-   optdepends=('dnsmasq: connection sharing'

-               'nftables: connection sharing'

-               'iptables: connection sharing'

-               'bluez: Bluetooth support'

-               'ppp: dialup connection support'

-               'modemmanager: cellular network support'

-               'iwd: wpa_supplicant alternative'

-               'dhclient: alternative DHCP client'

-               'dhcpcd: alternative DHCP client'

-               'openresolv: alternative resolv.conf manager'

-               'firewalld: firewall support')

-   provides=($pkgname-{elogind,openrc})

-   replaces=($pkgname-{elogind,openrc})

+   optdepends=(

+     'polkit: let non-root users control networking'

+     'dnsmasq: connection sharing'

+     'nftables: connection sharing'

+     'iptables: connection sharing'

+     'bluez: Bluetooth support'

+     'ppp: dialup connection support'

+     'modemmanager: cellular network support'

+     'iwd: wpa_supplicant alternative'

+     'dhclient: alternative DHCP client'

+     'dhcpcd: alternative DHCP client'

+     'openresolv: alternative resolv.conf manager'

+     'firewalld: firewall support'

+   )

    backup=(etc/NetworkManager/NetworkManager.conf)

  

    meson install -C build --destdir "$pkgdir"
@@ -125,6 +121,9 @@ 

    install -m644 /dev/stdin etc/NetworkManager/NetworkManager.conf <<END

  # Configuration file for NetworkManager.

  # See "man 5 NetworkManager.conf" for details.

+ [main]

+ plugins=keyfile

+ hostname-node=none

  END

  

    # packaged configuration
@@ -144,16 +143,10 @@ 

    _pick libnm usr/share/vala/vapi/libnm.*

  

    _pick nm-cloud-setup "$pkgdir"/usr/lib/**/*nm-cloud-setup*

- #  _pick nm-cloud-setup "$pkgdir"/usr/share/man/*/nm-cloud-setup* (Parabola)

+ #  _pick nm-cloud-setup "$pkgdir"/usr/share/man/*/nm-cloud-setup* (Artix)

  

    # Restore empty dir

- # mkdir "$pkgdir/usr/lib/NetworkManager/dispatcher.d/no-wait.d" (Parabola)

- 

-   # Init script

-   install -Dm755 ${srcdir}/NetworkManager.confd ${pkgdir}/etc/conf.d/NetworkManager

-   install -Dm755 ${srcdir}/NetworkManager.initd ${pkgdir}/etc/init.d/NetworkManager

-   install -Dm755 "${srcdir}/10-openrc-status" "${pkgdir}/etc/NetworkManager/dispatcher.d/10-openrc-status"

- 

+ # mkdir "$pkgdir/usr/lib/NetworkManager/dispatcher.d/no-wait.d" (Artix)

  }

  

  package_libnm() {

@@ -0,0 +1,34 @@ 

+ # Maintainer: David P. <megver83@parabola.nu>

+ # Maintainer (Artix): artoo <artoo@artixlinux.org>

+ 

+ pkgname=nftables-openrc

+ pkgver=20210505

+ pkgrel=2

+ pkgdesc="OpenRC nftables init script"

+ arch=('any')

+ url="https://gitea.artixlinux.org/packagesN/nftables-openrc"

+ license=('GPL2')

+ groups=('openrc-world')

+ provides=('init-nftables')

+ conflicts=('init-nftables')

+ backup=('etc/conf.d/nftables'

+         'etc/conf.d/nftables-mk')

+ source=("nftables"{,-mk}.{initd,confd}

+         "nftables"{,-mk}.sh)

+ sha256sums=('d99250bf4e54545d978041819b94ea27634ee1812e9b56f15f287ca68640dec8'

+             'd5e3077345dfea02849a70aea220396322a10c3808f0303b988119adbc56fdbd'

+             '155be88ef6cddf95841f629264d8d4b42d15b4f7e8e572e5159e2cc17f8258b1'

+             '5ea765fce16e2ee6a760760a1cfde9994bef24e9a788ab83750e96ac2bc9533a'

+             'e3b1423f877871c649e7da15352f2abb489900f05b022a87292ff92d36203b67'

+             '041b5fb2d42d6245459fd581a3b7ad39aa898caaefb2178595606b38391fc4db')

+ 

+ package() {

+     depends=('openrc' 'nftables')

+ 

+     for _i in nftables-mk nftables ; do

+         install -Dm755 "$srcdir/$_i.initd" "$pkgdir/etc/init.d/$_i"

+         install -Dm644 "$srcdir/$_i.confd" "$pkgdir/etc/conf.d/$_i"

+     done

+     install -Dm755 "$srcdir"/nftables-mk.sh "$pkgdir"/usr/lib/nftables/nftables-mk.sh

+     install -Dm755 "$srcdir"/nftables.sh "$pkgdir"/usr/lib/nftables/nftables.sh

+ }

@@ -0,0 +1,26 @@ 

+ # /etc/conf.d/nftables

+ 

+ # Location in which nftables initscript will save set rules on

+ # service shutdown

+ NFTABLES_SAVE="/var/lib/nftables/rules-save"

+ 

+ # Options to pass to nft on save

+ SAVE_OPTIONS="-n"

+ 

+ # Save state on stopping nftables

+ SAVE_ON_STOP="yes"

+ 

+ # Only for OpenRC systems.

+ # Set to "hard" or "soft" to panic when stopping instead of

+ # clearing the rules

+ # Soft panic loads a ruleset dropping any new or invalid connections

+ # Hard panic loads a ruleset dropping all traffic

+ PANIC_ON_STOP=""

+ 

+ # If you need to log nftables messages as soon as nftables starts,

+ # AND your logger does NOT depend on the network, then you may wish

+ # to uncomment the next line.

+ # If your logger depends on the network, and you uncomment this line

+ # you will create an unresolvable circular dependency during startup.

+ # After commenting or uncommenting this line, you must run 'rc-update -u'.

+ #rc_use="logger"

@@ -0,0 +1,104 @@ 

+ #!/usr/bin/openrc-run

+ # Copyright 1999-2019 Gentoo Authors

+ # Distributed under the terms of the GNU General Public License v2

+ 

+ extra_commands="check clear list panic save soft_panic"

+ extra_started_commands="reload"

+ 

+ depend() {

+     need localmount #434774

+     before net

+ }

+ 

+ checkkernel() {

+     if ! /sbin/nft list ruleset >/dev/null 2>/dev/null ; then

+         eerror "Your kernel lacks nftables support, please load"

+         eerror "appropriate modules and try again."

+         return 1

+     fi

+     return 0

+ }

+ 

+ checkconfig() {

+     if [ -z "${NFTABLES_SAVE}" -o ! -f "${NFTABLES_SAVE}" ] ; then

+         eerror "Not starting nftables. First create some rules then run:"

+         eerror "/etc/init.d/${SVCNAME} save"

+         return 1

+     fi

+     return 0

+ }

+ 

+ start_pre() {

+     checkconfig || return 1

+     checkkernel || return 1

+     check || return 1

+ }

+ 

+ start() {

+     ebegin "Loading ${SVCNAME} state and starting firewall"

+     /usr/lib/nftables/nftables.sh load "${NFTABLES_SAVE}"

+     eend $?

+ }

+ 

+ stop() {

+     if [ "${SAVE_ON_STOP}" = "yes" ] ; then

+         save || return 1

+     fi

+ 

+     ebegin "Stopping firewall"

+     if [ "${PANIC_ON_STOP}" = "hard" ]; then

+         /usr/lib/nftables/nftables.sh panic

+     elif [ "${PANIC_ON_STOP}" = "soft" ]; then

+         /usr/lib/nftables/nftables.sh soft_panic

+     else

+         /usr/lib/nftables/nftables.sh clear

+     fi

+     eend $?

+ }

+ 

+ reload() {

+     start_pre || return 1

+     start

+ }

+ 

+ clear() {

+     ebegin "Clearing rules"

+     /usr/lib/nftables/nftables.sh clear

+     eend $?

+ }

+ 

+ list() {

+     /usr/lib/nftables/nftables.sh list

+ }

+ 

+ check() {

+     ebegin "Checking rules"

+     /usr/lib/nftables/nftables.sh check "${NFTABLES_SAVE}"

+     eend $?

+ }

+ 

+ save() {

+     ebegin "Saving ${SVCNAME} state"

+     checkpath -q -d "$(dirname "${NFTABLES_SAVE}")"

+     checkpath -q -m 0600 -f "${NFTABLES_SAVE}"

+     /usr/lib/nftables/nftables.sh store "${NFTABLES_SAVE}"

+     eend $?

+ }

+ 

+ panic() {

+     if service_started ${SVCNAME}; then

+         rc-service ${SVCNAME} zap

+     fi

+     ebegin "Dropping all packets"

+     /usr/lib/nftables/nftables.sh panic

+     eend $?

+ }

+ 

+ soft_panic() {

+     if service_started ${SVCNAME}; then

+         rc-service ${SVCNAME} zap

+     fi

+     ebegin "Dropping new connections"

+     /usr/lib/nftables/nftables.sh soft_panic

+     eend $?

+ }

@@ -0,0 +1,60 @@ 

+ #!/bin/sh

+ 

+ main() {

+ 	local NFTABLES_SAVE=${2:-'/var/lib/nftables/rules-save'}

+ 	case "$1" in

+ 		"check")

+ 			nft -c -f "${NFTABLES_SAVE}"

+ 		;;

+ 		"clear")

+ 			nft flush ruleset

+ 		;;

+ 		"list")

+ 			nft ${SAVE_OPTIONS} list ruleset

+ 		;;

+ 		"load")

+ 			# We use an include because cat fails with long rulesets see #675188

+ 			printf 'flush ruleset\ninclude "%s"\n' "${NFTABLES_SAVE}" | nft -f -

+ 		;;

+ 		"panic")

+ 			panic hard | nft -f -

+ 		;;

+ 		"soft_panic")

+ 			panic soft | nft -f -

+ 		;;

+ 		"store")

+ 			local tmp_save="${NFTABLES_SAVE}.tmp"

+ 			umask 177

+ 			(

+ 				printf '#!/sbin/nft -f\nflush ruleset\n'

+ 				nft ${SAVE_OPTIONS} list ruleset

+ 			) > "$tmp_save" && mv ${tmp_save} ${NFTABLES_SAVE}

+ 		;;

+ 	esac

+ }

+ 

+ panic() {

+ 	local erule;

+ 	[ "$1" = soft ] && erule="ct state established,related accept;" || erule="";

+ 	cat <<EOF

+ flush ruleset

+ table inet filter {

+ 	chain input {

+ 		type filter hook input priority 0;

+ 		$erule

+ 		drop

+ 	}

+ 	chain forward {

+ 		type filter hook forward priority 0;

+ 		drop

+ 	}

+ 	chain output {

+ 		type filter hook output priority 0;

+ 		$erule

+ 		drop

+ 	}

+ }

+ EOF

+ }

+ 

+ main "$@"

@@ -0,0 +1,19 @@ 

+ # /etc/conf.d/nftables

+ 

+ # Location in which nftables initscript will save set rules on 

+ # service shutdown

+ NFTABLES_SAVE="/var/lib/nftables/rules-save"

+ 

+ # Options to pass to nft on save

+ SAVE_OPTIONS="-n"

+ 

+ # Save state on stopping nftables

+ SAVE_ON_STOP="yes"

+ 

+ # If you need to log nftables messages as soon as nftables starts,

+ # AND your logger does NOT depend on the network, then you may wish

+ # to uncomment the next line.

+ # If your logger depends on the network, and you uncomment this line

+ # you will create an unresolvable circular dependency during startup.

+ # After commenting or uncommenting this line, you must run 'rc-update -u'.

+ #rc_use="logger"

@@ -0,0 +1,124 @@ 

+ #!/usr/bin/openrc-run

+ # Copyright 2014-2017 Nicholas Vinson

+ # Copyright 1999-2017 Gentoo Foundation

+ # Distributed under the terms of the GNU General Public License v2

+ 

+ extra_commands="clear list panic save"

+ extra_started_commands="reload"

+ depend() {

+     need localmount #434774

+     before net

+ }

+ 

+ start_pre() {

+     checkkernel || return 1

+     checkconfig || return 1

+     return 0

+ }

+ 

+ clear() {

+     /usr/lib/nftables/nftables.sh clear || return 1

+     return 0

+ }

+ 

+ list() {

+     /usr/lib/nftables/nftables.sh list || return 1

+     return 0

+ }

+ 

+ panic() {

+     checkkernel || return 1

+     if service_started ${RC_SVCNAME}; then

+         rc-service ${RC_SVCNAME} stop

+     fi

+ 

+     ebegin "Dropping all packets"

+     clear

+     if nft create table ip filter >/dev/null 2>&1; then

+ 	nft -f /dev/stdin <<-EOF

+ 	    table ip filter {

+ 	                    chain input {

+ 	                                    type filter hook input priority 0;

+ 	                                    drop

+ 	                    }

+ 	                    chain forward {

+ 	                                    type filter hook forward priority 0;

+ 	                                    drop

+ 	                    }

+ 	                    chain output {

+ 	                                    type filter hook output priority 0;

+ 	                                    drop

+ 	                    }

+ 	    }

+ 	EOF

+     fi

+     if nft create table ip6 filter >/dev/null 2>&1; then

+ 	nft -f /dev/stdin <<-EOF

+ 	    table ip6 filter {

+ 	                    chain input {

+ 	                                    type filter hook input priority 0;

+ 	                                    drop

+ 	                    }

+ 	                    chain forward {

+ 	                                    type filter hook forward priority 0;

+ 	                                    drop

+ 	                    }

+ 	                    chain output {

+ 	                                    type filter hook output priority 0;

+ 	                                    drop

+ 	                    }

+ 	    }

+ 	EOF

+     fi

+ }

+ 

+ reload() {

+     checkkernel || return 1

+     ebegin "Flushing firewall"

+     clear

+     start

+ }

+ 

+ save() {

+     ebegin "Saving nftables state"

+     checkpath -q -d "$(dirname "${NFTABLES_SAVE}")"

+     checkpath -q -m 0600 -f "${NFTABLES_SAVE}"

+     export SAVE_OPTIONS

+     /usr/lib/nftables/nftables.sh store ${NFTABLES_SAVE}

+     return $?

+ }

+ 

+ start() {

+     ebegin "Loading nftables state and starting firewall"

+     clear

+     /usr/lib/nftables/nftables.sh load ${NFTABLES_SAVE}

+     eend $?

+ }

+ 

+ stop() {

+     if yesno ${SAVE_ON_STOP:-yes}; then

+         save || return 1

+     fi

+ 

+     ebegin "Stopping firewall"

+     clear

+     eend $?

+ }

+ 

+ checkconfig() {

+     if [ ! -f ${NFTABLES_SAVE} ]; then

+         eerror "Not starting nftables.  First create some rules then run:"

+         eerror "rc-service nftables save"

+         return 1

+     fi

+     return 0

+ }

+ 

+ checkkernel() {

+     if ! nft list tables >/dev/null 2>&1; then

+         eerror "Your kernel lacks nftables support, please load"

+         eerror "appropriate modules and try again."

+         return 1

+     fi

+     return 0

+ }

@@ -0,0 +1,150 @@ 

+ #! /bin/sh

+ 

+ main() {

+     local NFTABLES_SAVE=${2:-'/var/lib/nftables/rules-save'}

+     local retval

+     case "$1" in

+         "clear")

+             if ! use_legacy; then

+                 nft flush ruleset

+             else

+                 clear_legacy

+             fi

+             retval=$?

+         ;;

+         "list")

+             if ! use_legacy; then

+                 nft list ruleset

+             else

+                 list_legacy

+             fi

+             retval=$?

+         ;;

+         "load")

+             nft -f ${NFTABLES_SAVE}

+             retval=$?

+         ;;

+         "store")

+             umask 177

+             local tmp_save="${NFTABLES_SAVE}.tmp"

+             if ! use_legacy; then

+                 nft ${SAVE_OPTIONS} list ruleset > ${tmp_save}

+             else

+                 save_legacy ${tmp_save}

+             fi

+             retval=$?

+             if [ ${retval} ]; then

+                 mv ${tmp_save} ${NFTABLES_SAVE}

+             fi

+         ;;

+     esac

+     return ${retval}

+ }

+ 

+ clear_legacy() {

+     local l3f line table chain first_line

+ 

+     first_line=1

+     if manualwalk; then

+         for l3f in $(getfamilies); do

+             nft list tables ${l3f} | while read line; do

+                 table=$(echo ${line} | sed "s/table[ \t]*//")

+                 deletetable ${l3f} ${table}

+             done

+         done

+     else

+         nft list tables | while read line; do

+             l3f=$(echo ${line} | cut -d ' ' -f2)

+             table=$(echo ${line} | cut -d ' ' -f3)

+             deletetable ${l3f} ${table}

+         done

+     fi

+ }

+ 

+ list_legacy() {

+     local l3f

+ 

+     if manualwalk; then

+         for l3f in $(getfamilies); do

+             nft list tables ${l3f} | while read line; do

+                 line=$(echo ${line} | sed "s/table/table ${l3f}/")

+                 echo "$(nft list ${line})"

+             done

+         done

+     else

+         nft list tables | while read line; do

+             echo "$(nft list ${line})"

+         done

+     fi

+ }

+ 

+ save_legacy() {

+     tmp_save=$1

+     touch "${tmp_save}"

+     if manualwalk; then

+         for l3f in $(getfamilies); do

+             nft list tables ${l3f} | while read line; do

+                 line=$(echo ${line} | sed "s/table/table ${l3f}/")

+                 nft ${SAVE_OPTIONS} list ${line} >> ${tmp_save}

+             done

+         done

+     else

+         nft list tables | while read line; do

+             nft ${SAVE_OPTIONS} list ${line} >> "${tmp_save}"

+         done

+     fi

+ }

+ 

+ use_legacy() {

+     local major_ver minor_ver

+ 

+     major_ver=$(uname -r | cut -d '.' -f1)

+     minor_ver=$(uname -r | cut -d '.' -f2)

+ 

+     [ $major_ver -ge 4 -o $major_ver -eq 3 -a $minor_ver -ge 18 ] && return 1

+     return 0

+ }

+ 

+ CHECK_TABLE_NAME="GENTOO_CHECK_TABLE"

+ 

+ getfamilies() {

+     local l3f families

+ 

+     for l3f in ip arp ip6 bridge inet; do

+         if nft create table ${l3f} ${CHECK_TABLE_NAME} > /dev/null 2>&1; then

+             families="${families}${l3f} "

+             nft delete table ${l3f} ${CHECK_TABLE_NAME}

+         fi

+     done

+     echo ${families}

+ }

+ 

+ manualwalk() {

+     local result l3f=`getfamilies | cut -d ' ' -f1`

+ 

+     nft create table ${l3f} ${CHECK_TABLE_NAME}

+     nft list tables | read line

+     if [ $(echo $line | wc -w) -lt 3 ]; then

+         result=0

+     fi

+     result=1

+     nft delete table ${l3f} ${CHECK_TABLE_NAME}

+ 

+     return $result

+ }

+ 

+ deletetable() {

+     # family is $1

+     # table name is $2

+     nft flush table $1 $2

+     nft list table $1 $2 | while read l; do

+         chain=$(echo $l | grep -o 'chain [^[:space:]]\+' | cut -d ' ' -f2)

+         if [ -n "${chain}" ]; then

+             nft flush chain $1 $2 ${chain}

+             nft delete chain $1 $2 ${chain}

+         fi

+     done

+     nft delete table $1 $2

+ }

+ 

+ main "$@"

@@ -1,243 +0,0 @@ 

- From dec7ae52e9352345e5627d02676b51f2facdd488 Mon Sep 17 00:00:00 2001

- From: Luke Shumaker <lukeshu@parabola.nu>

- Date: Wed, 25 May 2016 12:19:20 -0400

- Subject: [PATCH 1/7] FSDG: man/: Refer to the operating system as GNU/Linux

- 

- This is not a blind replacement of "Linux" with "GNU/Linux".  In some

- cases, "Linux" is (correctly) used to refer to just the kernel.  In others,

- it is in a string for which code must also be adjusted; these instances

- are not included in this commit.

- ---

-  man/daemon.xml                   | 4 ++--

-  man/journald.conf.xml            | 2 +-

-  man/machinectl.xml               | 2 +-

-  man/sd-bus-errors.xml            | 2 +-

-  man/sd-login.xml                 | 2 +-

-  man/sd_bus_error_add_map.xml     | 2 +-

-  man/sd_uid_get_state.xml         | 2 +-

-  man/systemd-detect-virt.xml      | 4 ++--

-  man/systemd-machine-id-setup.xml | 2 +-

-  man/systemd-resolved.service.xml | 6 +++---

-  man/systemd.exec.xml             | 2 +-

-  man/systemd.socket.xml           | 2 +-

-  man/systemd.xml                  | 6 +++---

-  13 files changed, 19 insertions(+), 19 deletions(-)

- 

- diff --git a/man/daemon.xml b/man/daemon.xml

- index 36c7c09db1..730507ed7e 100644

- --- a/man/daemon.xml

- +++ b/man/daemon.xml

- @@ -144,7 +144,7 @@

-      <refsect2>

-        <title>New-Style Daemons</title>

-  

- -      <para>Modern services for Linux should be implemented as

- +      <para>Modern services for GNU/Linux should be implemented as

-        new-style daemons. This makes it easier to supervise and control

-        them at runtime and simplifies their implementation.</para>

-  

- @@ -285,7 +285,7 @@

-        as detailed in the <ulink

-        url="http://refspecs.linuxbase.org/LSB_3.1.1/LSB-Core-generic/LSB-Core-generic/iniscrptact.html">LSB

-        Linux Standard Base Core Specification</ulink>. This method of

- -      activation is supported ubiquitously on Linux init systems, both

- +      activation is supported ubiquitously on GNU/Linux init systems, both

-        old-style and new-style systems. Among other issues, SysV init

-        scripts have the disadvantage of involving shell scripts in the

-        boot process. New-style init systems generally employ updated

- diff --git a/man/journald.conf.xml b/man/journald.conf.xml

- index ee8e8b7faf..28324ac102 100644

- --- a/man/journald.conf.xml

- +++ b/man/journald.conf.xml

- @@ -111,7 +111,7 @@

-          <term><varname>SplitMode=</varname></term>

-  

-          <listitem><para>Controls whether to split up journal files per user, either <literal>uid</literal> or

- -        <literal>none</literal>. Split journal files are primarily useful for access control: on UNIX/Linux access

- +        <literal>none</literal>. Split journal files are primarily useful for access control: on GNU/Linux access

-          control is managed per file, and the journal daemon will assign users read access to their journal files. If

-          <literal>uid</literal>, all regular users will each get their own journal files, and system users will log to

-          the system journal. If <literal>none</literal>, journal files are not split up by user and all messages are

- diff --git a/man/machinectl.xml b/man/machinectl.xml

- index affca1dec1..278ca8d677 100644

- --- a/man/machinectl.xml

- +++ b/man/machinectl.xml

- @@ -867,7 +867,7 @@

-      <para>The <command>machinectl</command> tool operates on machines

-      and images whose names must be chosen following strict

-      rules. Machine names must be suitable for use as host names

- -    following a conservative subset of DNS and UNIX/Linux

- +    following a conservative subset of DNS and GNU/Linux

-      semantics. Specifically, they must consist of one or more

-      non-empty label strings, separated by dots. No leading or trailing

-      dots are allowed. No sequences of multiple dots are allowed. The

- diff --git a/man/sd-bus-errors.xml b/man/sd-bus-errors.xml

- index c834bde292..fdd2261fe9 100644

- --- a/man/sd-bus-errors.xml

- +++ b/man/sd-bus-errors.xml

- @@ -102,7 +102,7 @@

-  

-      <para>In addition to this list, in sd-bus, the special error

-      namespace <literal>System.Error.</literal> is used to map

- -    arbitrary Linux system errors (as defined by <citerefentry

- +    arbitrary GNU/Linux system errors (as defined by <citerefentry

-      project='man-pages'><refentrytitle>errno</refentrytitle><manvolnum>3</manvolnum></citerefentry>)

-      to D-Bus errors and back. For example, the error

-      <constant>EUCLEAN</constant> is mapped to

- diff --git a/man/sd-login.xml b/man/sd-login.xml

- index 83ef0b7307..93fd9ea782 100644

- --- a/man/sd-login.xml

- +++ b/man/sd-login.xml

- @@ -244,7 +244,7 @@

-  

-      <para>

-        <ulink url="https://www.freedesktop.org/wiki/Software/systemd/multiseat">Multi-Seat on Linux</ulink>

- -      for an introduction to multi-seat support on Linux and the background for this set of APIs.

- +      for an introduction to multi-seat support on GNU/Linux and the background for this set of APIs.

-      </para>

-    </refsect1>

-  

- diff --git a/man/sd_bus_error_add_map.xml b/man/sd_bus_error_add_map.xml

- index 3eacbab660..b4b3b1bd17 100644

- --- a/man/sd_bus_error_add_map.xml

- +++ b/man/sd_bus_error_add_map.xml

- @@ -58,7 +58,7 @@

-  

-      <para>The <function>sd_bus_error_add_map()</function> call may be

-      used to register additional mappings for converting D-Bus errors

- -    to Linux <varname>errno</varname>-style errors. The mappings

- +    to GNU/Linux <varname>errno</varname>-style errors. The mappings

-      defined with this call are consulted by calls such as

-      <citerefentry><refentrytitle>sd_bus_error_set</refentrytitle><manvolnum>3</manvolnum></citerefentry>

-      or

- diff --git a/man/sd_uid_get_state.xml b/man/sd_uid_get_state.xml

- index 02670e1bce..6f4ff77130 100644

- --- a/man/sd_uid_get_state.xml

- +++ b/man/sd_uid_get_state.xml

- @@ -174,7 +174,7 @@

-          <listitem><para>An input parameter was invalid (out of range,

-          or NULL, where that is not accepted). This is also returned if

-          the passed user ID is 0xFFFF or 0xFFFFFFFF, which are

- -        undefined on Linux.</para></listitem>

- +        undefined on GNU/Linux.</para></listitem>

-        </varlistentry>

-  

-        <varlistentry>

- diff --git a/man/systemd-detect-virt.xml b/man/systemd-detect-virt.xml

- index c4763fd561..54bba23666 100644

- --- a/man/systemd-detect-virt.xml

- +++ b/man/systemd-detect-virt.xml

- @@ -133,12 +133,12 @@

-  

-            <row>

-              <entry><varname>lxc</varname></entry>

- -            <entry>Linux container implementation by LXC</entry>

- +            <entry>Container implementation by LXC</entry>

-            </row>

-  

-            <row>

-              <entry><varname>lxc-libvirt</varname></entry>

- -            <entry>Linux container implementation by libvirt</entry>

- +            <entry>Container implementation by libvirt</entry>

-            </row>

-  

-            <row>

- diff --git a/man/systemd-machine-id-setup.xml b/man/systemd-machine-id-setup.xml

- index 9e84fd8ccb..7f0dcd14d7 100644

- --- a/man/systemd-machine-id-setup.xml

- +++ b/man/systemd-machine-id-setup.xml

- @@ -58,7 +58,7 @@

-        and is different for every booted instance of the

-        VM.</para></listitem>

-  

- -      <listitem><para>Similarly, if run inside a Linux container

- +      <listitem><para>Similarly, if run inside a container

-        environment and a UUID is configured for the container, this is

-        used to initialize the machine ID. For details, see the

-        documentation of the <ulink

- diff --git a/man/systemd-resolved.service.xml b/man/systemd-resolved.service.xml

- index c895adaaf3..d2dc0538ca 100644

- --- a/man/systemd-resolved.service.xml

- +++ b/man/systemd-resolved.service.xml

- @@ -47,7 +47,7 @@

-        <citerefentry project='man-pages'><refentrytitle>getaddrinfo</refentrytitle><manvolnum>3</manvolnum></citerefentry> API as defined

-        by <ulink url="https://tools.ietf.org/html/rfc3493">RFC3493</ulink> and its related resolver functions,

-        including <citerefentry project='man-pages'><refentrytitle>gethostbyname</refentrytitle><manvolnum>3</manvolnum></citerefentry>. This

- -      API is widely supported, including beyond the Linux platform. In its current form it does not expose DNSSEC

- +      API is widely supported, including beyond the GNU/Linux platform. In its current form it does not expose DNSSEC

-        validation status information however, and is synchronous only. This API is backed by the glibc Name Service

-        Switch (<citerefentry project='man-pages'><refentrytitle>nss</refentrytitle><manvolnum>5</manvolnum></citerefentry>). Usage of the

-        glibc NSS module <citerefentry><refentrytitle>nss-resolve</refentrytitle><manvolnum>8</manvolnum></citerefentry>

- @@ -153,7 +153,7 @@

-  

-      <itemizedlist>

-        <listitem><para><command>systemd-resolved</command> maintains the

- -      <filename>/run/systemd/resolve/stub-resolv.conf</filename> file for compatibility with traditional Linux

- +      <filename>/run/systemd/resolve/stub-resolv.conf</filename> file for compatibility with traditional GNU/Linux

-        programs. This file may be symlinked from <filename>/etc/resolv.conf</filename>. This file lists the 127.0.0.53

-        DNS stub (see above) as the only DNS server. It also contains a list of search domains that are in use by

-        systemd-resolved. The list of search domains is always kept up-to-date. Note that

- @@ -169,7 +169,7 @@

-        <command>systemd-resolved</command>. This file does not contain any search domains.</para></listitem>

-  

-        <listitem><para><command>systemd-resolved</command> maintains the

- -      <filename>/run/systemd/resolve/resolv.conf</filename> file for compatibility with traditional Linux

- +      <filename>/run/systemd/resolve/resolv.conf</filename> file for compatibility with traditional GNU/Linux

-        programs. This file may be symlinked from <filename>/etc/resolv.conf</filename> and is always kept up-to-date,

-        containing information about all known DNS servers. Note the file format's limitations: it does not know a

-        concept of per-interface DNS servers and hence only contains system-wide DNS server definitions. Note that

- diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml

- index 3bd790b485..a532b74a6e 100644

- --- a/man/systemd.exec.xml

- +++ b/man/systemd.exec.xml

- @@ -191,7 +191,7 @@

-          which must be one of a-z, A-Z or <literal>_</literal> (i.e. numbers and <literal>-</literal> are not permitted

-          as first character). The user/group name must have at least one character, and at most 31. These restrictions

-          are enforced in order to avoid ambiguities and to ensure user/group names and unit files remain portable among

- -        Linux systems.</para>

- +        GNU/Linux systems.</para>

-  

-          <para>When used in conjunction with <varname>DynamicUser=</varname> the user/group name specified is

-          dynamically allocated at the time the service is started, and released at the time the service is stopped —

- diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml

- index 19c2ca9907..5fd6c1598f 100644

- --- a/man/systemd.socket.xml

- +++ b/man/systemd.socket.xml

- @@ -280,7 +280,7 @@

-          <listitem><para>Specifies a POSIX message queue name to listen

-          on. This expects a valid message queue name (i.e. beginning

-          with /). Behavior otherwise is very similar to the

- -        <varname>ListenFIFO=</varname> directive above. On Linux

- +        <varname>ListenFIFO=</varname> directive above. On GNU/Linux

-          message queue descriptors are actually file descriptors and

-          can be inherited between processes.</para></listitem>

-        </varlistentry>

- diff --git a/man/systemd.xml b/man/systemd.xml

- index 17ab59beb5..89086558c7 100644

- --- a/man/systemd.xml

- +++ b/man/systemd.xml

- @@ -40,7 +40,7 @@

-    <refsect1>

-      <title>Description</title>

-  

- -    <para>systemd is a system and service manager for Linux operating

- +    <para>systemd is a system and service manager for GNU/Linux operating

-      systems. When run as first process on boot (as PID 1), it acts as

-      init system that brings up and maintains userspace

-      services.</para>

- @@ -888,10 +888,10 @@

-      <title>Kernel Command Line</title>

-  

-      <para>When run as system instance systemd parses a number of

- -    kernel command line arguments<footnote><para>If run inside a Linux

- +    kernel command line arguments<footnote><para>If run inside a

-      container these arguments may be passed as command line arguments

-      to systemd itself, next to any of the command line options listed

- -    in the Options section above. If run outside of Linux containers,

- +    in the Options section above. If run outside of a container,

-      these arguments are parsed from <filename>/proc/cmdline</filename>

-      instead.</para></footnote>:</para>

-  

- -- 

- 2.18.0

- 

@@ -1,75 +0,0 @@ 

- From 34e4b4953cb99642e9144d97823edf32b06ffe93 Mon Sep 17 00:00:00 2001

- Message-Id: <34e4b4953cb99642e9144d97823edf32b06ffe93.1520376078.git.jan.steffens@gmail.com>

- From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>

- Date: Tue, 6 Mar 2018 23:39:47 +0100

- Subject: [PATCH] Use Arch Linux' device access groups

- MIME-Version: 1.0

- Content-Type: text/plain; charset=UTF-8

- Content-Transfer-Encoding: 8bit

- 

-   cdrom   → optical

-   dialout → uucp

-   tape    → storage

- ---

-  rules/50-udev-default.rules.in | 14 +++++++-------

-  sysusers.d/basic.conf.in       |  6 +++---

-  2 files changed, 10 insertions(+), 10 deletions(-)

- 

- diff --git a/rules/50-udev-default.rules.in b/rules/50-udev-default.rules.in

- index 191f56f42..f81c4d0fc 100644

- --- a/rules/50-udev-default.rules.in

- +++ b/rules/50-udev-default.rules.in

- @@ -22,7 +22,7 @@ SUBSYSTEM=="tty", KERNEL=="sclp_line[0-9]*", GROUP="tty", MODE="0620"

-  SUBSYSTEM=="tty", KERNEL=="ttysclp[0-9]*", GROUP="tty", MODE="0620"

-  SUBSYSTEM=="tty", KERNEL=="3270/tty[0-9]*", GROUP="tty", MODE="0620"

-  SUBSYSTEM=="vc", KERNEL=="vcs*|vcsa*", GROUP="tty"

- -KERNEL=="tty[A-Z]*[0-9]|ttymxc[0-9]*|pppox[0-9]*|ircomm[0-9]*|noz[0-9]*|rfcomm[0-9]*", GROUP="dialout"

- +KERNEL=="tty[A-Z]*[0-9]|ttymxc[0-9]*|pppox[0-9]*|ircomm[0-9]*|noz[0-9]*|rfcomm[0-9]*", GROUP="uucp"

-  

-  SUBSYSTEM=="mem", KERNEL=="mem|kmem|port", GROUP="kmem", MODE="0640"

-  

- @@ -57,13 +57,13 @@ KERNEL=="irlpt[0-9]*", GROUP="lp"

-  SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ENV{ID_USB_INTERFACES}=="*:0701??:*", GROUP="lp"

-  

-  SUBSYSTEM=="block", GROUP="disk"

- -SUBSYSTEM=="block", KERNEL=="sr[0-9]*", GROUP="cdrom"

- -SUBSYSTEM=="scsi_generic", SUBSYSTEMS=="scsi", ATTRS{type}=="4|5", GROUP="cdrom"

- -KERNEL=="sch[0-9]*", GROUP="cdrom"

- -KERNEL=="pktcdvd[0-9]*", GROUP="cdrom"

- -KERNEL=="pktcdvd", GROUP="cdrom"

- +SUBSYSTEM=="block", KERNEL=="sr[0-9]*", GROUP="optical"

- +SUBSYSTEM=="scsi_generic", SUBSYSTEMS=="scsi", ATTRS{type}=="4|5", GROUP="optical"

- +KERNEL=="sch[0-9]*", GROUP="optical"

- +KERNEL=="pktcdvd[0-9]*", GROUP="optical"

- +KERNEL=="pktcdvd", GROUP="optical"

-  

- -SUBSYSTEM=="scsi_generic|scsi_tape", SUBSYSTEMS=="scsi", ATTRS{type}=="1|8", GROUP="tape"

- +SUBSYSTEM=="scsi_generic|scsi_tape", SUBSYSTEMS=="scsi", ATTRS{type}=="1|8", GROUP="storage"

-  SUBSYSTEM=="scsi_generic", SUBSYSTEMS=="scsi", ATTRS{type}=="0", GROUP="disk"

-  KERNEL=="qft[0-9]*|nqft[0-9]*|zqft[0-9]*|nzqft[0-9]*|rawqft[0-9]*|nrawqft[0-9]*", GROUP="disk"

-  KERNEL=="loop-control", GROUP="disk", OPTIONS+="static_node=loop-control"

- diff --git a/sysusers.d/basic.conf.in b/sysusers.d/basic.conf.in

- index 8e358c02d..33e513a36 100644

- --- a/sysusers.d/basic.conf.in

- +++ b/sysusers.d/basic.conf.in

- @@ -24,14 +24,14 @@ g utmp    -     -            -

-  

-  # Hardware access groups

-  g audio   -     -            -

- -g cdrom   -     -            -

- -g dialout -     -            -

-  g disk    -     -            -

-  g input   -     -            -

-  g kvm     -     -            -

-  g lp      -     -            -

- +g optical -     -            -

-  g render  -     -            -

- -g tape    -     -            -

- +g storage -     -            -

- +g uucp    -     -            -

-  g video   -     -            -

-  

-  # Default group for normal users

- -- 

- 2.16.2

- 

@@ -1,101 +0,0 @@ 

- From 301445311b5161c61270163c8921b729ab9e10d8 Mon Sep 17 00:00:00 2001

- From: Luke Shumaker <lukeshu@parabola.nu>

- Date: Wed, 25 May 2016 12:23:40 -0400

- Subject: [PATCH 2/7] FSDG: os-release: Default PRETTY_NAME to "GNU/Linux"

-  instead of "Linux"

- 

- ---

-  man/kernel-install.xml                    | 2 +-

-  man/os-release.xml                        | 2 +-

-  src/analyze/analyze.c                     | 2 +-

-  src/core/main.c                           | 4 ++--

-  src/firstboot/firstboot.c                 | 2 +-

-  src/kernel-install/90-loaderentry.install | 2 +-

-  6 files changed, 7 insertions(+), 7 deletions(-)

- 

- diff --git a/man/kernel-install.xml b/man/kernel-install.xml

- index cd9756662a..9ead6ea39b 100644

- --- a/man/kernel-install.xml

- +++ b/man/kernel-install.xml

- @@ -88,7 +88,7 @@

-            <replaceable>PRETTY_NAME</replaceable> parameter specified

-            in <filename>/etc/os-release</filename> or

-            <filename>/usr/lib/os-release</filename> (if the former is

- -          missing), or "Linux

- +          missing), or "GNU/Linux

-            <replaceable>KERNEL-VERSION</replaceable>", if unset.  If

-            the file <filename>initrd</filename> is found next to the

-            <filename>linux</filename> file, the initrd will be added to

- diff --git a/man/os-release.xml b/man/os-release.xml

- index a51edf3b8a..9ff4b7e8c2 100644

- --- a/man/os-release.xml

- +++ b/man/os-release.xml

- @@ -187,7 +187,7 @@

-          suitable for presentation to the user. May or may not contain

-          a release code name or OS version of some kind, as suitable.

-          If not set, defaults to

- -        <literal>PRETTY_NAME="Linux"</literal>. Example:

- +        <literal>PRETTY_NAME="GNU/Linux"</literal>. Example:

-          <literal>PRETTY_NAME="Fedora 17 (Beefy

-          Miracle)"</literal>.</para></listitem>

-        </varlistentry>

- diff --git a/src/analyze/analyze.c b/src/analyze/analyze.c

- index de0fe6eba8..9f239c8eeb 100644

- --- a/src/analyze/analyze.c

- +++ b/src/analyze/analyze.c

- @@ -712,7 +712,7 @@ static int analyze_plot(int argc, char *argv[], void *userdata) {

-          svg("<text x=\"20\" y=\"50\">%s</text>", pretty_times);

-          if (use_full_bus)

-                  svg("<text x=\"20\" y=\"30\">%s %s (%s %s %s) %s %s</text>",

- -                    isempty(host->os_pretty_name) ? "Linux" : host->os_pretty_name,

- +                    isempty(host->os_pretty_name) ? "GNU/Linux" : host->os_pretty_name,

-                      strempty(host->hostname),

-                      strempty(host->kernel_name),

-                      strempty(host->kernel_release),

- diff --git a/src/core/main.c b/src/core/main.c

- index 44dd8348be..9a4fc26425 100644

- --- a/src/core/main.c

- +++ b/src/core/main.c

- @@ -1234,11 +1234,11 @@ static int status_welcome(void) {

-                  return status_printf(NULL, false, false,

-                                       "\nWelcome to \x1B[%sm%s\x1B[0m!\n",

-                                       isempty(ansi_color) ? "1" : ansi_color,

- -                                     isempty(pretty_name) ? "Linux" : pretty_name);

- +                                     isempty(pretty_name) ? "GNU/Linux" : pretty_name);

-          else

-                  return status_printf(NULL, false, false,

-                                       "\nWelcome to %s!\n",

- -                                     isempty(pretty_name) ? "Linux" : pretty_name);

- +                                     isempty(pretty_name) ? "GNU/Linux" : pretty_name);

-  }

-  

-  static int write_container_id(void) {

- diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c

- index a98e53b3a3..41b212e32d 100644

- --- a/src/firstboot/firstboot.c

- +++ b/src/firstboot/firstboot.c

- @@ -87,7 +87,7 @@ static void print_welcome(void) {

-                                 "Failed to read os-release file, ignoring: %m");

-  

-          printf("\nWelcome to your new installation of %s!\nPlease configure a few basic system settings:\n\n",

- -               isempty(pretty_name) ? "Linux" : pretty_name);

- +               isempty(pretty_name) ? "GNU/Linux" : pretty_name);

-  

-          press_any_key();

-  

- diff --git a/src/kernel-install/90-loaderentry.install b/src/kernel-install/90-loaderentry.install

- index a271cdb8a0..29047ccbff 100644

- --- a/src/kernel-install/90-loaderentry.install

- +++ b/src/kernel-install/90-loaderentry.install

- @@ -40,7 +40,7 @@ elif [[ -f /usr/lib/os-release ]]; then

-  fi

-  

-  if ! [[ $PRETTY_NAME ]]; then

- -    PRETTY_NAME="Linux $KERNEL_VERSION"

- +    PRETTY_NAME="GNU/Linux $KERNEL_VERSION"

-  fi

-  

-  declare -a BOOT_OPTIONS

- -- 

- 2.18.0

- 

@@ -1,40 +0,0 @@ 

- From a6be5d2b2cd02f302ef70c76b601e7af912c3022 Mon Sep 17 00:00:00 2001

- From: Luke Shumaker <lukeshu@parabola.nu>

- Date: Wed, 25 May 2016 12:24:56 -0400

- Subject: [PATCH 3/7] FSDG: os-release: Default NAME to "GNU/Linux" instead of

-  "Linux"

- 

- ---

-  man/os-release.xml                    | 2 +-

-  src/journal-remote/journal-gatewayd.c | 2 +-

-  2 files changed, 2 insertions(+), 2 deletions(-)

- 

- diff --git a/man/os-release.xml b/man/os-release.xml

- index 9ff4b7e8c2..1c069275c8 100644

- --- a/man/os-release.xml

- +++ b/man/os-release.xml

- @@ -98,7 +98,7 @@

-          <listitem><para>A string identifying the operating system,

-          without a version component, and suitable for presentation to

-          the user. If not set, defaults to

- -        <literal>NAME=Linux</literal>. Example:

- +        <literal>NAME=GNU/Linux</literal>. Example:

-          <literal>NAME=Fedora</literal> or <literal>NAME="Debian

-          GNU/Linux"</literal>.</para></listitem>

-        </varlistentry>

- diff --git a/src/journal-remote/journal-gatewayd.c b/src/journal-remote/journal-gatewayd.c

- index 9e77e314ff..3d0c3aafd7 100644

- --- a/src/journal-remote/journal-gatewayd.c

- +++ b/src/journal-remote/journal-gatewayd.c

- @@ -788,7 +788,7 @@ static int request_handler_machine(

-                       SD_ID128_FORMAT_VAL(mid),

-                       SD_ID128_FORMAT_VAL(bid),

-                       hostname_cleanup(hostname),

- -                     os_name ? os_name : "Linux",

- +                     os_name ? os_name : "GNU/Linux",

-                       v ? v : "bare",

-                       usage,

-                       cutoff_from,

- -- 

- 2.18.0

- 

@@ -1,28 +0,0 @@ 

- From 8dab19e27e7d8c81cf3fec4413172a7597c9da44 Mon Sep 17 00:00:00 2001

- From: Luke Shumaker <lukeshu@parabola.nu>

- Date: Wed, 25 May 2016 12:28:30 -0400

- Subject: [PATCH 4/7] FSDG: os-release: Default ID to "gnu-linux" instead of

-  "linux"

- 

- As far as I can tell, no code in this repository actually uses the ID

- field, so this is just a man page change.

- ---

-  man/os-release.xml | 2 +-

-  1 file changed, 1 insertion(+), 1 deletion(-)

- 

- diff --git a/man/os-release.xml b/man/os-release.xml

- index 1c069275c8..272258b4e1 100644

- --- a/man/os-release.xml

- +++ b/man/os-release.xml

- @@ -122,7 +122,7 @@

-          the operating system, excluding any version information and

-          suitable for processing by scripts or usage in generated

-          filenames. If not set, defaults to

- -        <literal>ID=linux</literal>. Example:

- +        <literal>ID=gnu-linux</literal>. Example:

-          <literal>ID=fedora</literal> or

-          <literal>ID=debian</literal>.</para></listitem>

-        </varlistentry>

- -- 

- 2.18.0

- 

@@ -1,30 +0,0 @@ 

- From 50b001e3d034825142c03e612af9d4a5a307472f Mon Sep 17 00:00:00 2001

- From: Luke Shumaker <lukeshu@parabola.nu>

- Date: Wed, 25 May 2016 12:31:20 -0400

- Subject: [PATCH 5/7] FSDG: systemd-resolved: Fallback hostname to "gnu-linux"

-  instead of "linux"

- 

- ---

-  src/resolve/resolved-manager.c | 4 ++--

-  1 file changed, 2 insertions(+), 2 deletions(-)

- 

- diff --git a/src/resolve/resolved-manager.c b/src/resolve/resolved-manager.c

- index 01372fc66b..9155ce5c2e 100644

- --- a/src/resolve/resolved-manager.c

- +++ b/src/resolve/resolved-manager.c

- @@ -387,10 +387,10 @@ static int determine_hostname(char **full_hostname, char **llmnr_hostname, char

-  static const char *fallback_hostname(void) {

-  

-          /* Determine the fall back hostname. For exposing this system to the outside world, we cannot have it to be

- -         * "localhost" even if that's the compiled in hostname. In this case, let's revert to "linux" instead. */

- +         * "localhost" even if that's the compiled in hostname. In this case, let's revert to "gnu-linux" instead. */

-  

-          if (is_localhost(FALLBACK_HOSTNAME))

- -                return "linux";

- +                return "gnu-linux";

-  

-          return FALLBACK_HOSTNAME;

-  }

- -- 

- 2.18.0

- 

@@ -1,248 +0,0 @@ 

- From 35af892f1dffbb0daa9aa721f908f7c38b064ebe Mon Sep 17 00:00:00 2001

- From: Luke Shumaker <lukeshu@parabola.nu>

- Date: Wed, 25 May 2016 12:32:21 -0400

- Subject: [PATCH 6/7] FSDG: man/: Use FSDG operating systems as examples

- 

- ---

-  man/os-release.xml     | 49 +++++++++++++++++++++--------------------

-  man/systemd-nspawn.xml | 50 +++++++++++++++++++++++-------------------

-  2 files changed, 52 insertions(+), 47 deletions(-)

- 

- diff --git a/man/os-release.xml b/man/os-release.xml

- index 272258b4e1..6cea40cb99 100644

- --- a/man/os-release.xml

- +++ b/man/os-release.xml

- @@ -99,7 +99,7 @@

-          without a version component, and suitable for presentation to

-          the user. If not set, defaults to

-          <literal>NAME=GNU/Linux</literal>. Example:

- -        <literal>NAME=Fedora</literal> or <literal>NAME="Debian

- +        <literal>NAME=BLAG</literal> or <literal>NAME="gNewSense

-          GNU/Linux"</literal>.</para></listitem>

-        </varlistentry>

-  

- @@ -110,8 +110,8 @@

-          version, excluding any OS name information, possibly including

-          a release code name, and suitable for presentation to the

-          user. This field is optional. Example:

- -        <literal>VERSION=17</literal> or <literal>VERSION="17 (Beefy

- -        Miracle)"</literal>.</para></listitem>

- +        <literal>VERSION=210k</literal> or <literal>VERSION="210k

- +        (Spartakus)"</literal>.</para></listitem>

-        </varlistentry>

-  

-        <varlistentry>

- @@ -123,8 +123,8 @@

-          suitable for processing by scripts or usage in generated

-          filenames. If not set, defaults to

-          <literal>ID=gnu-linux</literal>. Example:

- -        <literal>ID=fedora</literal> or

- -        <literal>ID=debian</literal>.</para></listitem>

- +        <literal>ID=blag</literal> or

- +        <literal>ID=gnewsense</literal>.</para></listitem>

-        </varlistentry>

-  

-        <varlistentry>

- @@ -145,9 +145,9 @@

-          should be listed in order of how closely the local operating

-          system relates to the listed ones, starting with the closest.

-          This field is optional. Example: for an operating system with

- -        <literal>ID=centos</literal>, an assignment of

- +        <literal>ID=blag</literal>, an assignment of

-          <literal>ID_LIKE="rhel fedora"</literal> would be appropriate.

- -        For an operating system with <literal>ID=ubuntu</literal>, an

- +        For an operating system with <literal>ID=gnewsense</literal>, an

-          assignment of <literal>ID_LIKE=debian</literal> is

-          appropriate.</para></listitem>

-        </varlistentry>

- @@ -176,8 +176,8 @@

-          identifying the operating system version, excluding any OS

-          name information or release code name, and suitable for

-          processing by scripts or usage in generated filenames. This

- -        field is optional. Example: <literal>VERSION_ID=17</literal>

- -        or <literal>VERSION_ID=11.04</literal>.</para></listitem>

- +        field is optional. Example: <literal>VERSION_ID=210k</literal>

- +        or <literal>VERSION_ID=7.0</literal>.</para></listitem>

-        </varlistentry>

-  

-        <varlistentry>

- @@ -188,8 +188,8 @@

-          a release code name or OS version of some kind, as suitable.

-          If not set, defaults to

-          <literal>PRETTY_NAME="GNU/Linux"</literal>. Example:

- -        <literal>PRETTY_NAME="Fedora 17 (Beefy

- -        Miracle)"</literal>.</para></listitem>

- +        <literal>PRETTY_NAME="BLAG 210k

- +        (Spartakus)"</literal>.</para></listitem>

-        </varlistentry>

-  

-        <varlistentry>

- @@ -212,7 +212,7 @@

-          <ulink url="http://scap.nist.gov/specifications/cpe/">Common

-          Platform Enumeration Specification</ulink> as proposed by the

-          NIST. This field is optional. Example:

- -        <literal>CPE_NAME="cpe:/o:fedoraproject:fedora:17"</literal>

- +        <literal>CPE_NAME="cpe:/o:blagblagblag:blag:210k"</literal>

-          </para></listitem>

-        </varlistentry>

-  

- @@ -247,8 +247,8 @@

-          one URL shall be listed in each setting. If multiple resources

-          need to be referenced, it is recommended to provide an online

-          landing page linking all available resources. Examples:

- -        <literal>HOME_URL="https://fedoraproject.org/"</literal> and

- -        <literal>BUG_REPORT_URL="https://bugzilla.redhat.com/"</literal></para></listitem>

- +        <literal>HOME_URL="https://www.blagblagblag.org/"</literal> and

- +        <literal>BUG_REPORT_URL="https://blag.fsf.org/"</literal></para></listitem>

-        </varlistentry>

-  

-        <varlistentry>

- @@ -323,21 +323,22 @@

-      recommended to prefix new fields with an OS specific

-      name in order to avoid name clashes. Applications

-      reading this file must ignore unknown fields. Example:

- -    <literal>DEBIAN_BTS="debbugs://bugs.debian.org/"</literal></para>

- +    <literal>DEBIAN_BTS="debbugs://bugs.gnewsense.org/"</literal></para>

-    </refsect1>

-  

-    <refsect1>

-      <title>Example</title>

-  

- -    <programlisting>NAME=Fedora

- -VERSION="17 (Beefy Miracle)"

- -ID=fedora

- -VERSION_ID=17

- -PRETTY_NAME="Fedora 17 (Beefy Miracle)"

- -ANSI_COLOR="0;34"

- -CPE_NAME="cpe:/o:fedoraproject:fedora:17"

- -HOME_URL="https://fedoraproject.org/"

- -BUG_REPORT_URL="https://bugzilla.redhat.com/"</programlisting>

- +    <programlisting>NAME=Parabola

- +VERSION="rolling-release"

- +ID=parabola

- +ID_LIKE=arch

- +VERSION_ID=rolling-release

- +PRETTY_NAME="Parabola GNU/Linux-libre"

- +ANSI_COLOR="1;35"

- +CPE_NAME="cpe:/o:parabola:parabola:rolling-release"

- +HOME_URL="https://www.parabola.nu/"

- +BUG_REPORT_URL="https://labs.parabola.nu/"</programlisting>

-    </refsect1>

-  

-    <refsect1>

- diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml

- index 284c9b294b..7b3d211161 100644

- --- a/man/systemd-nspawn.xml

- +++ b/man/systemd-nspawn.xml

- @@ -1,7 +1,7 @@

-  <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->

-  <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"

-    "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [

- -<!ENTITY fedora_latest_version "28">

- +<!ENTITY blag_latest_version "140">

-  <!ENTITY fedora_cloud_release "1.1">

-  ]>

-  

- @@ -1176,11 +1176,12 @@

-    <refsect1>

-      <title>Examples</title>

-  

- +<!-- TODO: This example needs switched to an FSDG OS; but I'm not sure of a good machinectl-compatible image to use.

-      <example>

-        <title>Download a

-        <ulink url="https://getfedora.org">Fedora</ulink> image and start a shell in it</title>

-  

- -      <programlisting># machinectl pull-raw --verify=no \

- +      <programlisting># machinectl pull-raw -&2D;verify=no \

-        https://download.fedoraproject.org/pub/fedora/linux/releases/&fedora_latest_version;/Cloud/x86_64/images/Fedora-Cloud-Base-&fedora_latest_version;-&fedora_cloud_release;.x86_64.raw.xz

-  # systemd-nspawn -M Fedora-Cloud-Base-&fedora_latest_version;-&fedora_cloud_release;.x86_64.raw</programlisting>

-  

- @@ -1188,31 +1189,32 @@

-        <citerefentry><refentrytitle>machinectl</refentrytitle><manvolnum>1</manvolnum></citerefentry>

-        and opens a shell in it.</para>

-      </example>

- +-->

-  

-      <example>

- -      <title>Build and boot a minimal Fedora distribution in a container</title>

- +      <title>Build and boot a minimal BLAG distribution in a container</title>

-  

- -      <programlisting># dnf -y --releasever=&fedora_latest_version; --installroot=/var/lib/machines/f&fedora_latest_version; \

- -      --disablerepo='*' --enablerepo=fedora --enablerepo=updates install \

- -      systemd passwd dnf fedora-release vim-minimal

- -# systemd-nspawn -bD /var/lib/machines/f&fedora_latest_version;</programlisting>

- +      <programlisting># dnf -y --releasever=&blag_latest_version;k --installroot=/var/lib/machines/blag&blag_latest_version; \

- +      --disablerepo='*' --enablerepo=blag --enablerepo=updates install \

- +      systemd passwd dnf blag-release vim-minimal

- +# systemd-nspawn -bD /var/lib/machines/blag&blag_latest_version;</programlisting>

-  

- -      <para>This installs a minimal Fedora distribution into the

- -      directory <filename noindex='true'>/var/lib/machines/f&fedora_latest_version;</filename>

- +      <para>This installs a minimal BLAG distribution into the

- +      directory <filename noindex='true'>/var/lib/machines/blag&blag_latest_version;</filename>

-        and then boots an OS in a namespace container in it. Because the installation

-        is located underneath the standard <filename>/var/lib/machines/</filename>

-        directory, it is also possible to start the machine using

- -      <command>systemd-nspawn -M f&fedora_latest_version;</command>.</para>

- +      <command>systemd-nspawn -M blag&blag_latest_version;</command>.</para>

-      </example>

-  

-      <example>

- -      <title>Spawn a shell in a container of a minimal Debian unstable distribution</title>

- +      <title>Spawn a shell in a container of a minimal gNewSense Ucclia distribution</title>

-  

- -      <programlisting># debootstrap unstable ~/debian-tree/

- -# systemd-nspawn -D ~/debian-tree/</programlisting>

- +      <programlisting># debootstrap ucclia ~/gnewsense-tree/

- +# systemd-nspawn -D ~/gnewsense-tree/</programlisting>

-  

- -      <para>This installs a minimal Debian unstable distribution into

- -      the directory <filename>~/debian-tree/</filename> and then

- +      <para>This installs a minimal gNewSense unstable distribution into

- +      the directory <filename>~/gnewsense-tree/</filename> and then

-        spawns a shell in a namespace container in it.</para>

-  

-        <para><command>debootstrap</command> supports

- @@ -1227,29 +1229,31 @@

-  

-      <example>

-        <title>Boot a minimal

- -      <ulink url="https://www.archlinux.org">Arch Linux</ulink> distribution in a container</title>

- +      <ulink url="https://www.parabola.nu">Parabola GNU/Linux-libre</ulink> distribution in a container</title>

-  

- -      <programlisting># pacstrap -c -d ~/arch-tree/ base

- -# systemd-nspawn -bD ~/arch-tree/</programlisting>

- +      <programlisting># pacstrap -c -d ~/parabola-tree/ base

- +# systemd-nspawn -bD ~/parabola-tree/</programlisting>

-  

- -      <para>This installs a minimal Arch Linux distribution into the

- -      directory <filename>~/arch-tree/</filename> and then boots an OS

- +      <para>This installs a minimal Parabola distribution into the

- +      directory <filename>~/parabola-tree/</filename> and then boots an OS

-        in a namespace container in it.</para>

-      </example>

-  

- +<!-- TODO: This example needs switched to an FSDG OS

-      <example>

-        <title>Install the

-        <ulink url="https://software.opensuse.org/distributions/tumbleweed">OpenSUSE Tumbleweed</ulink>

-        rolling distribution</title>

-  

- -      <programlisting># zypper --root=/var/lib/machines/tumbleweed ar -c \

- +      <programlisting># zypper -&2Droot=/var/lib/machines/tumbleweed ar -c \

-        https://download.opensuse.org/tumbleweed/repo/oss tumbleweed

- -# zypper --root=/var/lib/machines/tumbleweed refresh

- -# zypper --root=/var/lib/machines/tumbleweed install --no-recommends \

- +# zypper -&2Droot=/var/lib/machines/tumbleweed refresh

- +# zypper -&2Droot=/var/lib/machines/tumbleweed install -&2Dno-recommends \

-        systemd shadow zypper openSUSE-release vim

-  # systemd-nspawn -M tumbleweed passwd root

-  # systemd-nspawn -M tumbleweed -b</programlisting>

-      </example>

- +-->

-  

-      <example>

-        <title>Boot into an ephemeral snapshot of the host system</title>

- -- 

- 2.18.0

- 

@@ -1,33 +0,0 @@ 

- From 31e5d50f17d3993839d8f7c9f344a620e3871812 Mon Sep 17 00:00:00 2001

- From: Luke Shumaker <lukeshu@parabola.nu>

- Date: Sat, 17 Dec 2016 00:56:43 -0500

- Subject: [PATCH 7/7] FSDG: bootctl: Say "Systemd Boot Manager" instead of

-  "Linux Boot Manager"

- 

- ---

-  src/boot/bootctl.c | 4 ++--

-  1 file changed, 2 insertions(+), 2 deletions(-)

- 

- diff --git a/src/boot/bootctl.c b/src/boot/bootctl.c

- index 2832a39dd7..534870ee50 100644

- --- a/src/boot/bootctl.c

- +++ b/src/boot/bootctl.c

- @@ -665,13 +665,13 @@ static int install_variables(const char *esp_path,

-                                         "Failed to determine current boot order: %m");

-  

-          if (first || r == 0) {

- -                r = efi_add_boot_option(slot, "Linux Boot Manager",

- +                r = efi_add_boot_option(slot, "Systemd Boot Manager",

-                                          part, pstart, psize,

-                                          uuid, path);

-                  if (r < 0)

-                          return log_error_errno(r, "Failed to create EFI Boot variable entry: %m");

-  

- -                log_info("Created EFI boot entry \"Linux Boot Manager\".");

- +                log_info("Created EFI boot entry \"Systemd Boot Manager\".");

-          }

-  

-          return insert_into_order(slot, first);

- -- 

- 2.18.0

- 

@@ -1,334 +0,0 @@ 

- # Maintainer (Arch:systemd): Christian Hesse <mail@eworm.de>

- # Maintainer (Arch:systemd): Dave Reisner <dreisner@archlinux.org>

- # Maintainer (Arch:systemd): Tom Gundersen <teg@jklm.no>

- # Maintainer: Luke Shumaker <lukeshu@parabola.nu>

- # Contributor: Omar Vega Ramos <ovruni@gnu.org.pe>

- 

- # Justification for being in [libre]: Potential dependency of

- # libretools.

- 

- _pkgbase=systemd

- # Can be from either systemd or systemd-stable

- _commit='de7436b02badc82200dc127ff190b8155769b8e7'

- _pkgver=239.0

- 

- pkgbase=notsystemd

- # Include only split packages that link against libsystemd-shared-XXX.so

- pkgname=('notsystemd' 'notsystemd-udev' 'notsystemd-common')

- pkgver=239.1

- pkgrel=3

- arch=('x86_64')

- arch+=('i686' 'armv7h')

- url="https://repo.parabola.nu/other/${pkgname}"

- makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf'

-              'intltool' 'iptables' 'kmod' 'libcap' 'libidn' 'libgcrypt'

-              'libmicrohttpd' 'libxslt' 'util-linux' 'linux-api-headers'

-              'python-lxml' 'quota-tools' 'shadow' 'git'

-              'meson' 'libseccomp' 'pcre2')

- makedepends_i686=('gnu-efi-libs')

- makedepends_x86_64=('gnu-efi-libs')

- options=('strip')

- validpgpkeys=('63CDA1E5D3FC22B998D20DD6327F26951A015CC4'  # Lennart Poettering <lennart@poettering.net>

-               '5C251B5FC54EB2F80F407AAAC54CA336CFEB557E'  # Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>

-               '99195DD3BB6FE10A2F36ED8445698744D4FFBFC9') # Luke Shumaker

- source=(# fragment is latest tag for source verification, final merge in prepare()

-         "git+https://github.com/systemd/systemd-stable#tag=v${_pkgver%.*}?signed"

-         "git+https://github.com/systemd/systemd#tag=v${_pkgver%.*}?signed"

-         '0001-Use-Arch-Linux-device-access-groups.patch'

- 	"https://repo.parabola.nu/other/${pkgname}/${pkgbase}-${pkgver}.tar.gz"{,.sig}

-         'initcpio-hook-udev'

-         'initcpio-install-systemd'

-         'initcpio-install-udev'

-         'parabola.conf'

-         'loader.conf'

-         'splash-parabola.bmp'

-         'systemd-user.pam'

-         'systemd-hook'

-         'udev-hook'

-         'systemd-binfmt.hook'

-         'systemd-catalog.hook'

-         'systemd-daemon-reload.hook'

-         'systemd-hwdb.hook'

-         'systemd-sysctl.hook'

-         'systemd-sysusers.hook'

-         'systemd-tmpfiles.hook'

-         'systemd-udev-reload.hook'

-         'systemd-update.hook'

-         '0001-FSDG-man-Refer-to-the-operating-system-as-GNU-Linux.patch'

-         '0002-FSDG-os-release-Default-PRETTY_NAME-to-GNU-Linux-ins.patch'

-         '0003-FSDG-os-release-Default-NAME-to-GNU-Linux-instead-of.patch'

-         '0004-FSDG-os-release-Default-ID-to-gnu-linux-instead-of-l.patch'

-         '0005-FSDG-systemd-resolved-Fallback-hostname-to-gnu-linux.patch'

-         '0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch'

-         '0007-FSDG-bootctl-Say-Systemd-Boot-Manager-instead-of-Lin.patch')

- sha512sums=('SKIP'

-             'SKIP'

-             '9348683829190628e25b7b3300fd880c426d555bde330d5fc5150a9a54b3ad9d4d1f2e69ea1dc6d6f086693dacc53c5af30f1fa7ad9b479791fd77bcdafa430e'

-             'b51d9ac5b6dd9893f2b6654cf0ae96a5576b1ae0a5e03b9a491d6ca51a4ba6138e0839396c8526ab293091ec1c8e02e3ec0ef80f67c965d94bfaa47b6ac20319'

-             'SKIP'

-             'f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73'

-             '01de24951a05d38eca6b615a7645beb3677ca0e0f87638d133649f6dc14dcd2ea82594a60b793c31b14493a286d1d11a0d25617f54dbfa02be237652c8faa691'

-             'a25b28af2e8c516c3a2eec4e64b8c7f70c21f974af4a955a4a9d45fd3e3ff0d2a98b4419fe425d47152d5acae77d64e69d8d014a7209524b75a81b0edb10bf3a'

-             '70b3f1d6aaa9cd4b6b34055a587554770c34194100b17b2ef3aaf4f16f68da0865f6b3ae443b3252d395e80efabd412b763259ffb76c902b60e23b6b522e3cc8'

-             '6c6f579644ea2ebb6b46ee274ab15110718b0de40def8c30173ba8480b045d403f2aedd15b50ad9b96453f4ad56920d1350ff76563755bb9a80b10fa7f64f1d9'

-             'a50bc85061a9a16d776235099867bc1a17c17dddb74c1ecf5614c849735a9779c5e34e5ddca8ca6af4b59a40f57c08ecf219b98cab09476ddb0f110e6a35e45c'

-             'b90c99d768dc2a4f020ba854edf45ccf1b86a09d2f66e475de21fe589ff7e32c33ef4aa0876d7f1864491488fd7edb2682fc0d68e83a6d4890a0778dc2d6fe19'

-             '12abea62121f4e0867ffbcf6ba96bb1540dd7d86775556fc180ae6c844abfd13310b6782ff6d0e665c8d875446c17b40495d6c2fbc7ddcb42f9a13e1b57a8c40'

-             'b7ee4f212c910df62c3472103a64a3cdf0d31292bc2f8fa839e5c86f34faa3ef1a3693601f5716779c4552a0d2b1d57538d45610f4c2e1c80e155ffbf0af187d'

-             '5a6b6beef8c31c79018884d948de840f4d3dfb07d9a87081ebf65e2b8fe595bc8c96dbd7742920ccf948c233213ed0026abc913650cefd77ad90c6f8c89bddb8'

-             '4cff2ebd962e26e2f516d8b4ac45c839dbfa54dd0588b423c224a328b9f7c62306ca7b2f6cb55240c564caf9972d5bcd2e0efaf2de49d64729aeb3bc1560c9eb'

-             '872de70325e9798f0b5a77e991c85bd2ab6de24d9b9ba4e35002d2dd5df15f8b30739a0042a624776177ffc14a838cde7ee98622016ed41df3efda9a659730b2'

-             '96bb157de6921086a2bfc45a650414fbffa787bccff2cbd838cbe05c6fc635cbabd533360608eb7ca2f80ab7df795065a27abf4a1b1ea2b406612a3fcf420bdc'

-             'da783e3bfc6469b92dee4064a13e2b427520d3d96b57c95a4e07aaca3e844d95210a8b16122b022080f5452d65096f274dd1c1467725bbdb2e40ef304b78774a'

-             '08a590d08043a21f30f04252164b94df972b1ff1022a0469d6aef713e14484a3a037cce290a2a582851e6fac3e64add69d6cc8fc130bbeeaea08626ebf3e1763'

-             '577e33a1c50b4b41157a67f64162b035dd0c4a541e19cee55a100048bdb50cb2c82852741b1372989a0fe4c4782ba477522747fcc81d72aed99b3db512a86447'

-             'c4463fdd25e14a836ac3b874109861a55a0169c4206b6356b53974dd4621f645652087ebf4c738b18734a718fe7fd9ec6b700ce8dd9736525274eb16b10385e6'

-             '209b01b044877cc986757fa4009a92ea98f480306c2530075d153203c3cd2b3afccab6aacc1453dee8857991e04270572f1700310705d7a0f4d5bed27fab8c67'

-             'a40678af1cd677535fb71084f70a10b74e61592c48a7f3901d6b51429c0bae179208b4aebd6700871fdf334d67703c955f01a0cd5165571f53435783c457d568'

-             'ae00ccf95c8cf5b6051d7c316eed36a450939d40d0d2c62aaa0ba16eb6fe3a3b1d703ea73593ff2e73f2268d30fb3dce3810528b15c9259353c3a4c158b0cc38'

-             'fd0df3d365892d4d461a78bb0b728201e81c1269af07a38e134fadfc0ffb29aade7642142d128abcf88803b86494d7629ff5990359ef067feea3d476c7238a67'

-             'e9e884015a40dc796fd8cbd8f79b3b9eebc7e48a332b22d52104c21c492be9982b35b7dd30bc29f2c2d274707ffd043eda059659844a4cd50eb433b8a3f7648c'

-             '0d6b894149ec8d0612d1be1dee5daa1768345232e450435ddc750e36a8309dd96782a92f0220169c69103b1c4632af708e4a737cb7ba817944c92dcb61379a30'

-             'cf0dd60f56160f6add80ecebf698632bde55ed25e54ffa6cd0fa18da4aa2d446d3e4394295446555db22d32bf3b5f563c7e77a52eeb342a8ddaabd1347032e83'

-             '28a5b3fc9e2c5cec9267bb96725c73ee77788514f140c0cf8df765af64bc8130dd02f4863d9128ac45d54256b2ab4f2b06d1a3f65660ce1dfba5727618cd1839')

- 

- _backports=(

-   '75720bff62a84896e9a0654afc7cf9408cf89a38' # (for glibc 2.28) build-sys: Detect whether struct statx is defined in sys/stat.h

- )

- 

- _reverts=(

- )

- 

- prepare() {

-   cd "$_pkgbase-stable"

- 

-   # add upstream repository for cherry-picking

-   git remote add -f upstream ../systemd

-   # merge the latest stable commit (fast-foward only to make sure

-   # the verified tag is in)

-   git merge --ff-only "${_commit}"

- 

-   local c

-   for c in "${_backports[@]}"; do

-     git cherry-pick -n "$c"

-   done

-   for c in "${_reverts[@]}"; do

-     git revert -n "$c"

-   done

- 

-   # Replace cdrom/dialout/tape groups with optical/uucp/storage

-   patch -Np1 -i ../0001-Use-Arch-Linux-device-access-groups.patch

- 

-   # apply FSDG patches

-   local _patch

-   for _patch in "$srcdir"/????-FSDG-*.patch; do

-     patch -Np1 -i "$_patch"

-   done

- 

-   # apply notsystemd patches

-   for _patch in "$srcdir/$pkgname-$pkgver"/????-*.patch; do

-     patch -Np1 -i "$_patch"

-   done

- }

- 

- build() {

-   local timeservers=({0..3}.arch.pool.ntp.org)

- 

-   if [ "$CARCH" = "armv7h" ]; then

-     LDFLAGS+=" -Wl,-fuse-ld=bfd"

-     CFLAGS+=" -fno-lto"

-     CXXFLAGS+=" -fno-lto"

-   fi

- 

-   local meson_options=(

-     -Daudit=false

-     -Dima=false

-     -Dlz4=true

- 

-     -Ddbuspolicydir=/usr/share/dbus-1/system.d

-     -Ddefault-dnssec=no

-     # TODO(dreisner): consider changing this to unified

-     -Ddefault-hierarchy=hybrid

-     -Ddefault-kill-user-processes=false

-     -Dfallback-hostname='parabola'

-     -Dntp-servers="${timeservers[*]}"

-     -Drpmmacrosdir=no

-     -Dsysvinit-path=

-     -Dsysvrcnd-path=

-   )

-   if [ "$CARCH" != "armv7h" ]; then

-     meson_options+=(-Dgnuefi=true)

-   fi

- 

-   arch-meson "$_pkgbase-stable" build "${meson_options[@]}"

- 

-   ninja -C build

- 

-   # Go ahead and split the package now.  It's easier this way, because

-   # we can use mv instead of awkward, error-prone rm/cp pairs.

-   rm -rf "$srcdir/dest"

- 

-   # Put things in the main systemd package by default

-   DESTDIR="$srcdir/dest/systemd" ninja -C build install

- 

-   install -dm755 "$srcdir/dest/common"/usr/lib/systemd

-   mv -T "$srcdir/dest"/{systemd,common}/usr/lib/systemd/libsystemd-shared-${pkgver%%.*}.so

- 

-   install -dm755 "$srcdir/dest/libsystemd"/usr/{lib/pkgconfig,share/man/man3,include}

-   mv -T "$srcdir/dest"/{systemd,libsystemd}/usr/include/systemd

-   mv -T "$srcdir/dest"/{systemd,libsystemd}/usr/lib/pkgconfig/libsystemd.pc

-   mv "$srcdir/dest"/systemd/usr/lib/libsystemd.so*      -t "$srcdir/dest"/libsystemd/usr/lib/

-   mv "$srcdir/dest"/systemd/usr/share/man/man3/{SD,sd}* -t "$srcdir/dest"/libsystemd/usr/share/man/man3/

- 

-   install -dm755 "$srcdir/dest/libudev"/usr/{lib/pkgconfig,share/man/man3,include}

-   mv -T "$srcdir/dest"/{systemd,libudev}/usr/include/libudev.h

-   mv -T "$srcdir/dest"/{systemd,libudev}/usr/lib/pkgconfig/libudev.pc

-   mv "$srcdir/dest"/systemd/usr/lib/libudev.so*       -t "$srcdir/dest"/libudev/usr/lib/

-   mv "$srcdir/dest"/systemd/usr/share/man/man3/*udev* -t "$srcdir/dest"/libudev/usr/share/man/man3/

- 

-   install -dm755 "$srcdir/dest/udev"/{etc,usr/lib}

-   mv -T "$srcdir/dest"/{systemd,udev}/etc/udev/

-   mv -T "$srcdir/dest"/{systemd,udev}/usr/lib/udev/

-   while read -d '' -r file; do

-     install -dm755 "$srcdir/dest/udev/${file%/*}"

-     mv -T "$srcdir/dest/systemd/$file" "$srcdir/dest/udev/$file"

-   done < <(find "$srcdir/dest/systemd" \( -name '*udev*' -o -name '*hwdb*' \) -printf '%P\0')

- 

-   local nssmodule

-   for nssmodule in systemd myhostname mymachines resolve; do

-     install -dm755 "$srcdir/dest/nss-$nssmodule"/usr/{lib,share/man/man8}

-     mv -t "$srcdir/dest"/nss-$nssmodule/usr/share/man/man8/ -- \

-        "$srcdir/dest"/systemd/usr/share/man/man8/nss-$nssmodule.8 \

-        "$srcdir/dest"/systemd/usr/share/man/man8/libnss_$nssmodule.*.8

-     mv "$srcdir/dest"/systemd/usr/lib/libnss_$nssmodule.so* -t "$srcdir/dest"/nss-$nssmodule/usr/lib/

-   done

- 

-   install -dm755 "$srcdir/dest/systemd-sysvcompat"/usr/share/man/man8

-   mv "$srcdir/dest/systemd"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \

-      -t "$srcdir/dest/systemd-sysvcompat"/usr/share/man/man8

- 

-   rmdir "$srcdir/dest"/systemd/usr/{share/man/man3,lib/pkgconfig,include}

- }

- 

- check() {

-   cd build

-   meson test

- }

- 

- package_notsystemd() {

-   pkgdesc='system and service manager'

-   license=('LGPL2.1')

-   depends=('bash' 'dbus' 'kbd' 'kmod'

-            'libsystemd' 'pam' 'libelf'

-            'util-linux' 'pcre2')

-   depends+=("notsystemd-common=$pkgver-$pkgrel" 'udev')

-   provides=("systemd-tools=$_pkgver")

-   conflicts=('systemd-tools')

-   optdepends=('libmicrohttpd: remote journald capabilities'

-               'quota-tools: kernel-level quota management'

-               'systemd-sysvcompat: symlink package to provide sysvinit binaries'

-               'polkit: allow administration as unprivileged user')

-   backup=(etc/pam.d/systemd-user

-           etc/systemd/coredump.conf

-           etc/systemd/journald.conf

-           etc/systemd/journal-remote.conf

-           etc/systemd/journal-upload.conf

-           etc/systemd/logind.conf

-           etc/systemd/system.conf

-           etc/systemd/timesyncd.conf

-           etc/systemd/resolved.conf

-           etc/systemd/user.conf)

-   install=systemd.install

- 

-   pkgdesc+=", modified to work with other init systems"

-   provides+=("${pkgname#not}=$_pkgver")

-   conflicts+=("${pkgname#not}")

- 

-   cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/${pkgname#not}" "$pkgdir"

- 

-   # don't write units to /etc by default. some of these will be re-enabled on

-   # post_install.

-   rm -rv "$pkgdir"/etc/systemd/system/*

- 

-   # we'll create this on installation

-   rmdir "$pkgdir"/var/log/journal/remote

- 

-   # executable (symlinks) shipped with systemd-sysvcompat

-   rm "$pkgdir"/usr/bin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit}

- 

-   # files shipped with systemd-resolvconf

-   rm "$pkgdir"/usr/{bin/resolvconf,share/man/man1/resolvconf.1}

- 

-   # avoid a potential conflict with [core]/filesystem

-   rm "$pkgdir"/usr/share/factory/etc/nsswitch.conf

-   sed -i '/^C \/etc\/nsswitch\.conf/d' "$pkgdir"/usr/lib/tmpfiles.d/etc.conf

- 

-   # add back tmpfiles.d/legacy.conf, normally omitted without sysv-compat

-   install -m0644 $_pkgbase-stable/tmpfiles.d/legacy.conf "$pkgdir"/usr/lib/tmpfiles.d

- 

-   # ship default policy to leave services disabled

-   echo 'disable *' >"$pkgdir"/usr/lib/systemd/system-preset/99-default.preset

- 

-   # add mkinitcpio hooks

-   install -D -m0644 initcpio-install-systemd "$pkgdir"/usr/lib/initcpio/install/systemd

- 

-   # ensure proper permissions for /var/log/journal

-   # The permissions are stored with named group by tar, so this works with

-   # users and groups populated by systemd-sysusers. This is only to prevent a

-   # warning from pacman as permissions are set by systemd-tmpfiles anyway.

-   install -d -o root -g systemd-journal -m 2755 "$pkgdir"/var/log/journal

- 

-   # match directory owner/group and mode from [extra]/polkit

-   install -d -o root -g 102 -m 0750 "$pkgdir"/usr/share/polkit-1/rules.d

- 

-   # add example bootctl configuration

-   install -D -m0644 parabola.conf "$pkgdir"/usr/share/systemd/bootctl/parabola.conf

-   install -D -m0644 loader.conf "$pkgdir"/usr/share/systemd/bootctl/loader.conf

-   install -D -m0644 splash-parabola.bmp "$pkgdir"/usr/share/systemd/bootctl/splash-parabola.bmp

- 

-   # pacman hooks

-   install -D -m0755 systemd-hook "$pkgdir"/usr/share/libalpm/scripts/systemd-hook

-   install -D -m0644 -t "$pkgdir"/usr/share/libalpm/hooks *.hook

-   rm -- "$pkgdir"/usr/share/libalpm/hooks/*{udev,hwdb}*

- 

-   # overwrite the systemd-user PAM configuration with our own

-   install -D -m0644 systemd-user.pam "$pkgdir"/etc/pam.d/systemd-user

- }

- 

- package_notsystemd-common() {

-   pkgdesc='systemd files shared between split packages'

-   license=('LGPL2.1')

-   depends=('acl' 'cryptsetup' 'libdbus' 'glibc' 'iptables' 'libcap'

-            'libgcrypt' 'libidn' 'libseccomp' 'libsystemd.so'

-            'libudev.so' 'libblkid.so' 'libmount.so' 'libuuid.so' 'lz4'

-            'xz')

- 

-   pkgdesc="not${pkgdesc}"

-   conflicts+=("${pkgname#not}")

- 

-   cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/${pkgname#notsystemd-}" "$pkgdir"

- }

- 

- package_notsystemd-udev() {

-   pkgdesc='Userspace device file manager'

-   license=('GPL2') # NB: different than the rest

-   depends=("notsystemd-common=$pkgver-$pkgrel" 'systemd-libudev'

-            'hwids' 'kmod' 'util-linux' 'zlib')

-   backup=(etc/udev/udev.conf)

- 

-   provides+=("${pkgname#notsystemd-}=$_pkgver")

-   conflicts+=("${pkgname#notsystemd-}")

- 

-   provides+=("${pkgname#not}=$_pkgver")

-   conflicts+=("${pkgname#not}")

- 

-   cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/${pkgname#notsystemd-}" "$pkgdir"

- 

-   # add mkinitcpio hooks

-   install -D -m0644 initcpio-install-udev "$pkgdir"/usr/lib/initcpio/install/udev

-   install -D -m0644 initcpio-hook-udev "$pkgdir"/usr/lib/initcpio/hooks/udev

- 

-   # pacman hooks

-   install -D -m0755 udev-hook "$pkgdir"/usr/share/libalpm/scripts/udev-hook

-   install -D -m0644 -t "$pkgdir"/usr/share/libalpm/hooks *{udev,hwdb}*.hook

- }

@@ -1,22 +0,0 @@ 

- #!/usr/bin/ash

- 

- run_earlyhook() {

-     kmod static-nodes --format=tmpfiles --output=/run/tmpfiles.d/kmod.conf

-     systemd-tmpfiles --prefix=/dev --create --boot

-     /usr/lib/systemd/systemd-udevd --daemon --resolve-names=never

-     udevd_running=1

- }

- 

- run_hook() {

-     msg ":: Triggering uevents..."

-     udevadm trigger --action=add --type=subsystems

-     udevadm trigger --action=add --type=devices

-     udevadm settle

- }

- 

- run_cleanuphook() {

-     udevadm control --exit

-     udevadm info --cleanup-db

- }

- 

- # vim: set ft=sh ts=4 sw=4 et:

@@ -1,202 +0,0 @@ 

- #!/bin/bash

- 

- strip_quotes() {

-   local len=${#1} quotes=$'[\'"]' str=${!1}

- 

-   if [[ ${str:0:1} = ${str: -1} && ${str:0:1} = $quotes ]]; then

-     printf -v "$1" %s "${str:1:-1}"

-   fi

- }

- 

- add_udev_rule() {

-     # Add an udev rules file to the initcpio image. Dependencies on binaries

-     # will be discovered and added.

-     #   $1: path to rules file (or name of rules file)

- 

-     local rules= rule= key= value= binary=

- 

-     rules=$(PATH=/usr/lib/udev/rules.d:/lib/udev/rules.d type -P "$1")

-     if [[ -z $rules ]]; then

-         # complain about not found rules

-         return 1

-     fi

- 

-     add_file "$rules"

- 

-     while IFS=, read -ra rule; do

-         # skip empty lines, comments

-         [[ -z $rule || $rule = @(+([[:space:]])|#*) ]] && continue

- 

-         for pair in "${rule[@]}"; do

-             IFS=' =' read -r key value <<< "$pair"

-             case $key in

-                 RUN@({program}|+)|IMPORT{program}|ENV{REMOVE_CMD})

-                     strip_quotes 'value'

-                     # just take the first word as the binary name

-                     binary=${value%% *}

-                     [[ ${binary:0:1} == '$' ]] && continue

-                     if [[ ${binary:0:1} != '/' ]]; then

-                         binary=$(PATH=/usr/lib/udev:/lib/udev type -P "$binary")

-                     fi

-                     add_binary "$binary"

-                     ;;

-             esac

-         done

-     done <"$rules"

- }

- 

- add_systemd_unit() {

-     # Add a systemd unit file to the initcpio image. Hard dependencies on binaries

-     # and other unit files will be discovered and added.

-     #   $1: path to rules file (or name of rules file)

- 

-     local unit= rule= entry= key= value= binary= dep=

- 

-     unit=$(PATH=/usr/lib/systemd/system:/lib/systemd/system type -P "$1")

-     if [[ -z $unit ]]; then

-         # complain about not found unit file

-         return 1

-     fi

- 

-     add_file "$unit"

- 

-     while IFS='=' read -r key values; do

-         read -ra values <<< "$values"

- 

-         case $key in

-             Requires|OnFailure)

-                 # only add hard dependencies (not Wants)

-                 map add_systemd_unit "${values[@]}"

-                 ;;

-             Exec*)

-                 # don't add binaries unless they are required

-                 if [[ ${values[0]:0:1} != '-' ]]; then

-                     add_binary "${values[0]}"

-                 fi

-                 ;;

-         esac

- 

-     done <"$unit"

- 

-     # preserve reverse soft dependency

-     for dep in {/usr,}/lib/systemd/system/*.wants/${unit##*/}; do

-         if [[ -L $dep ]]; then

-             add_symlink "$dep"

-         fi

-     done

- 

-     # add hard dependencies

-     if [[ -d $unit.requires ]]; then

-         for dep in "$unit".requires/*; do

-             add_systemd_unit ${dep##*/}

-         done

-     fi

- }

- 

- add_systemd_drop_in() {

-     local unit=$1 dropin_name=$2

- 

-     mkdir -p "$BUILDROOT/etc/systemd/system/$unit.d"

-     cat >"$BUILDROOT/etc/systemd/system/$unit.d/$2.conf"

- }

- 

- build() {

-     local rules unit

- 

-     # from base

-     add_binary /bin/mount

-     add_binary /usr/bin/kmod /usr/bin/modprobe

-     add_binary /usr/lib/systemd/systemd /init

-     add_binary /usr/bin/sulogin

- 

-     map add_binary \

-         /usr/bin/systemd-tmpfiles \

-         /usr/lib/systemd/systemd-hibernate-resume \

-         /usr/lib/systemd/systemd-shutdown \

-         /usr/lib/systemd/systemd-sulogin-shell \

-         /usr/lib/systemd/system-generators/systemd-fstab-generator \

-         /usr/lib/systemd/system-generators/systemd-gpt-auto-generator \

-         /usr/lib/systemd/system-generators/systemd-hibernate-resume-generator

- 

-     # for journalctl in emergency shell

-     add_binary journalctl

- 

-     # udev rules and systemd units

-     map add_udev_rule "$rules" \

-             50-udev-default.rules \

-             60-persistent-storage.rules \

-             64-btrfs.rules \

-             80-drivers.rules \

-             99-systemd.rules

- 

-     map add_systemd_unit \

-             initrd-cleanup.service \

-             initrd-fs.target \

-             initrd-parse-etc.service \

-             initrd-root-fs.target \

-             initrd-root-device.target \

-             initrd-switch-root.service \

-             initrd-switch-root.target \

-             initrd-udevadm-cleanup-db.service \

-             initrd.target \

-             kmod-static-nodes.service \

-             local-fs.target \

-             local-fs-pre.target \

-             paths.target \

-             reboot.target \

-             slices.target \

-             sockets.target \

-             swap.target \

-             systemd-fsck@.service \

-             systemd-hibernate-resume@.service \

-             systemd-journald.service \

-             systemd-journald-audit.socket \

-             systemd-journald-dev-log.socket \

-             systemd-modules-load.service \

-             systemd-tmpfiles-setup-dev.service \

-             systemd-udev-trigger.service \

-             systemd-udevd-control.socket \

-             systemd-udevd-kernel.socket \

-             systemd-udevd.service \

-             timers.target \

-             rescue.target \

-             emergency.target

- 

-     add_symlink "/usr/lib/systemd/system/default.target" "initrd.target"

-     add_symlink "/usr/lib/systemd/system/ctrl-alt-del.target" "reboot.target"

- 

-     add_binary "$(readlink -f /usr/lib/libnss_files.so)"

-     printf '%s\n' >"$BUILDROOT/etc/nsswitch.conf" \

-         'passwd: files' \

-         'group: files' \

-         'shadow: files'

- 

-     echo "root:x:0:0:root:/:/bin/sh" >"$BUILDROOT/etc/passwd"

-     echo "root:x:0:root" >"$BUILDROOT/etc/group"

-     echo "root::::::::" >"$BUILDROOT/etc/shadow"

- 

-     add_systemd_drop_in systemd-udevd.service resolve-names <<EOF

- [Service]

- ExecStart=

- ExecStart=/usr/lib/systemd/systemd-udevd --resolve-names=never

- EOF

- 

-     add_dir "/etc/modules-load.d"

-     (

-       . "$_f_config"

-       set -f

-       printf '%s\n' ${MODULES[@]} >"$BUILDROOT/etc/modules-load.d/MODULES.conf"

-     )

- }

- 

- help() {

-     cat <<HELPEOF

- This will install a basic systemd setup in your initramfs, and is meant to

- replace the 'base', 'usr', 'udev' and 'resume' hooks. Other hooks with runtime

- components will need to be ported, and will not work as intended. You also may

- wish to still include the 'base' hook (before this hook) to ensure that a

- rescue shell exists on your initramfs.

- HELPEOF

- }

- 

- # vim: set ft=sh ts=4 sw=4 et:

@@ -1,29 +0,0 @@ 

- #!/bin/bash

- 

- build() {

-     local rules tool

- 

-     add_binary /usr/lib/systemd/systemd-udevd

-     add_binary /usr/bin/udevadm

-     add_binary /usr/bin/systemd-tmpfiles

- 

-     for rules in 50-udev-default.rules 60-persistent-storage.rules 64-btrfs.rules 80-drivers.rules; do

-         add_file "/usr/lib/udev/rules.d/$rules"

-     done

-     for tool in ata_id scsi_id; do

-         add_file "/usr/lib/udev/$tool"

-     done

- 

-     add_runscript

- }

- 

- help() {

-     cat <<HELPEOF

- This hook adds the udev daemon to the initramfs, allowing for dynamic loading

- of modules and reliable detection of the root device via tags (e.g. UUID or

- LABEL). Do not remove this hook unless you are using the systemd hook, or you

- know what you're doing.

- HELPEOF

- }

- 

- # vim: set ft=sh ts=4 sw=4 et:

@@ -1,1 +0,0 @@ 

- default parabola

@@ -1,7 +0,0 @@ 

- ## This is just an example config file.

- ## Please edit the paths and kernel parameters according to your system.

- 

- title   Parabola GNU/Linux-libre

- linux   /vmlinuz-linux-libre

- initrd  /initramfs-linux-libre.img

- options root=PARTUUID=XXXX rootfstype=XXXX add_efi_memmap

@@ -1,10 +0,0 @@ 

- [Trigger]

- Type = File

- Operation = Install

- Operation = Upgrade

- Target = usr/lib/binfmt.d/*.conf

- 

- [Action]

- Description = Registering binary formats...

- When = PostTransaction

- Exec = /usr/share/libalpm/scripts/systemd-hook binfmt

@@ -1,11 +0,0 @@ 

- [Trigger]

- Type = File

- Operation = Install

- Operation = Upgrade

- Operation = Remove

- Target = usr/lib/systemd/catalog/*

- 

- [Action]

- Description = Updating journal message catalog...

- When = PostTransaction

- Exec = /usr/share/libalpm/scripts/systemd-hook catalog

@@ -1,11 +0,0 @@ 

- [Trigger]

- Type = File

- Operation = Install

- Operation = Upgrade

- Operation = Remove

- Target = usr/lib/systemd/system/*

- 

- [Action]

- Description = Reloading system manager configuration...

- When = PostTransaction

- Exec = /usr/share/libalpm/scripts/systemd-hook daemon-reload

@@ -1,23 +0,0 @@ 

- #!/bin/sh -e

- 

- systemd_live() {

-   if [ ! -d /run/systemd/system ]; then

-     echo >&2 "  Skipped: Current root is not booted."

-     exit 0

-   fi

- }

- 

- case $1 in

-   catalog)  /usr/bin/journalctl --update-catalog ;;

-   update)   touch -c /usr ;;

-   sysusers) /usr/bin/systemd-sysusers ;;

-   tmpfiles) /usr/bin/systemd-tmpfiles --create ;;

- 

-   daemon-reload) systemd_live; /usr/bin/systemctl daemon-reload ;;

-   binfmt)        systemd_live; /usr/lib/systemd/systemd-binfmt ;;

-   sysctl)        systemd_live; /usr/lib/systemd/systemd-sysctl ;;

- 

-   *) echo >&2 "  Invalid operation '$1'"; exit 1 ;;

- esac

- 

- exit 0

@@ -1,11 +0,0 @@ 

- [Trigger]

- Type = File

- Operation = Install

- Operation = Upgrade

- Operation = Remove

- Target = usr/lib/udev/hwdb.d/*

- 

- [Action]

- Description = Updating udev hardware database...

- When = PostTransaction

- Exec = /usr/share/libalpm/scripts/udev-hook hwdb

@@ -1,10 +0,0 @@ 

- [Trigger]

- Type = File

- Operation = Install

- Operation = Upgrade

- Target = usr/lib/sysctl.d/*.conf

- 

- [Action]

- Description = Applying kernel sysctl settings...

- When = PostTransaction

- Exec = /usr/share/libalpm/scripts/systemd-hook sysctl

@@ -1,10 +0,0 @@ 

- [Trigger]

- Type = File

- Operation = Install

- Operation = Upgrade

- Target = usr/lib/sysusers.d/*.conf

- 

- [Action]

- Description = Creating system user accounts...

- When = PostTransaction

- Exec = /usr/share/libalpm/scripts/systemd-hook sysusers

@@ -1,10 +0,0 @@ 

- [Trigger]

- Type = File

- Operation = Install

- Operation = Upgrade

- Target = usr/lib/tmpfiles.d/*.conf

- 

- [Action]

- Description = Creating temporary files...

- When = PostTransaction

- Exec = /usr/share/libalpm/scripts/systemd-hook tmpfiles

@@ -1,11 +0,0 @@ 

- [Trigger]

- Type = File

- Operation = Install

- Operation = Upgrade

- Operation = Remove

- Target = usr/lib/udev/rules.d/*

- 

- [Action]

- Description = Reloading device manager configuration...

- When = PostTransaction

- Exec = /usr/share/libalpm/scripts/udev-hook udev-reload

@@ -1,11 +0,0 @@ 

- [Trigger]

- Type = File

- Operation = Install

- Operation = Upgrade

- Operation = Remove

- Target = usr/

- 

- [Action]

- Description = Arming ConditionNeedsUpdate...

- When = PostTransaction

- Exec = /usr/share/libalpm/scripts/systemd-hook update

@@ -1,5 +0,0 @@ 

- # Used by systemd --user instances.

- 

- account  include system-login

- session  required pam_loginuid.so

- session  include system-login

@@ -1,99 +0,0 @@ 

- #!/bin/bash

- 

- sd_booted() {

-   [[ -d run/systemd/system && ! -L run/systemd/system ]]

- }

- 

- add_journal_acls() {

-   # ignore errors, since the filesystem might not support ACLs

-   setfacl -Rnm g:wheel:rx,d:g:wheel:rx,g:adm:rx,d:g:adm:rx var/log/journal/ 2>/dev/null

-   :

- }

- 

- post_common() {

-   systemd-sysusers

-   journalctl --update-catalog

- }

- 

- _216_2_changes() {

-   echo ':: Coredumps are handled by systemd by default. Collection behavior can be'

-   echo '   tuned in /etc/systemd/coredump.conf.'

- }

- 

- _219_2_changes() {

-   if mkdir -m2755 var/log/journal/remote 2>/dev/null; then

-     chgrp systemd-journal-remote var/log/journal/remote

-   fi

- }

- 

- _219_4_changes() {

-   if ! systemctl is-enabled -q remote-fs.target; then

-     systemctl enable -q remote-fs.target

-   fi

- }

- 

- _230_1_changes() {

-   echo ':: systemd-bootchart is no longer included with systemd'

- }

- 

- _232_8_changes() {

-   # paper over possible effects of CVE-2016-10156

-   local stamps=(/var/lib/systemd/timers/*.timer)

- 

-   if [[ -f ${stamps[0]} ]]; then

-     chmod 0644 "${stamps[@]}"

-   fi

- }

- 

- _233_75_3_changes() {

-   # upstream installs services to /etc, which we remove

-   # to keep bus activation we re-enable systemd-resolved

-   if systemctl is-enabled -q systemd-resolved.service; then

-     systemctl reenable systemd-resolved.service 2>/dev/null

-   fi

- }

- 

- post_install() {

-   systemd-machine-id-setup

- 

-   post_common "$@"

- 

-   add_journal_acls

- 

-   # enable some services by default, but don't track them

-   systemctl enable getty@tty1.service remote-fs.target

- 

-   echo ":: Append 'init=/usr/lib/systemd/systemd' to your kernel command line in your"

-   echo "   bootloader to replace sysvinit with systemd, or install systemd-sysvcompat"

- 

-   # group 'systemd-journal-remote' is created by systemd-sysusers

-   mkdir -m2755 var/log/journal/remote

-   chgrp systemd-journal-remote var/log/journal/remote

- }

- 

- post_upgrade() {

-   post_common "$@"

- 

-   # don't reexec if the old version is 231-1 or 231-2.

-   # https://github.com/systemd/systemd/commit/bd64d82c1c

-   if [[ $1 != 231-[12] ]] && sd_booted; then

-     systemctl --system daemon-reexec

-   fi

- 

-   local v upgrades=(

-     216-2

-     219-2

-     219-4

-     230-1

-     232-8

-     233.75-3

-   )

- 

-   for v in "${upgrades[@]}"; do

-     if [[ $(vercmp "$v" "$2") -eq 1 ]]; then

-       "_${v//[.-]/_}_changes"

-     fi

-   done

- }

- 

- # vim:set ts=2 sw=2 et:

@@ -1,18 +0,0 @@ 

- #!/bin/sh -e

- 

- udevd_live() {

-   if [ ! -d /run/udev ]; then

-     echo >&2 "  Skipped: Device manager is not running."

-     exit 0

-   fi

- }

- 

- case $1 in

-   hwdb)     /usr/bin/systemd-hwdb --usr update ;;

- 

-   udev-reload)   udevd_live;   /usr/bin/udevadm control --reload ;;

- 

-   *) echo >&2 "  Invalid operation '$1'"; exit 1 ;;

- esac

- 

- exit 0

@@ -1,174 +0,0 @@ 

- # Maintainer (Artix): artoo <artoo@cromnix.org>

- # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>

- # Maintainer: David P <megver83@parabola.nu>

- 

- pkgver=20201202 # date +%Y%m%d

- _commit=5cf13c1eee7fdb74078d79a2c85d1fe2fdde192c

- _url="https://raw.githubusercontent.com/gentoo/gentoo/${_commit}"

- 

- pkgbase=openrc-desktop

- pkgname=('acpid-openrc'

-          'alsa-utils-openrc'

-          'avahi-openrc'

-          'bluez-openrc'

-          'displaymanager-openrc'

-          'gpm-openrc'

-          'wpa_supplicant-openrc'

-          'chrony-openrc'

-          'tlp-openrc')

- pkgrel=1

- arch=('any')

- url='https://github.com/gentoo/gentoo'

- license=('GPL2')

- groups=('openrc-desktop')

- source=('acpid.confd'

-         'acpid.initd'

-         "alsasound.confd::${_url}/media-sound/alsa-utils/files/alsasound.confd-r4"

-         "alsasound.initd::${_url}/media-sound/alsa-utils/files/alsasound.initd-r8"

-         'avahi-daemon.initd'

-         'avahi-dnsconfd.initd'

-         'autoipd-openrc.sh'

-         'bluetoothd.initd'

-         'xdm.confd'

-         'xdm.initd'

-         'xdm-setup.initd'

-         'startDM.sh'

-         "gpm.confd::${_url}/sys-libs/gpm/files/gpm.conf.d"

-         "gpm.initd::${_url}/sys-libs/gpm/files/gpm.rc6-2"

-         "wpa_supplicant.confd::${_url}/net-wireless/wpa_supplicant/files/wpa_supplicant-conf.d"

-         "wpa_supplicant.initd::${_url}/net-wireless/wpa_supplicant/files/wpa_supplicant-init.d"

-         "${_url}/net-wireless/wpa_supplicant/files/wpa_cli.sh"

-         "chronyd.confd::${_url}/net-misc/chrony/files/chronyd.conf-r1"

-         "chronyd.initd::${_url}/net-misc/chrony/files/chronyd.init-r2"

-         "tlp.initd::https://git.hyperbola.info:50100/packages/community.git/plain/tlp/tlp.initd?id=241231d55f767d87e9cc883feb84b7f42a44434e")

- sha256sums=('3755d4eb8bb64a1304e5defedb949305ac550565da36fe4f94d5f31beee821ba'

-             '5dcf5721a129b3782c13fc453853c390c34e2ad4ee00706388ce014454b063ee'

-             'd1c55400b701a72dcb8bb85e016b5013fa3eb6a2766ffc20dae278d0ee4c1a43'

-             '37495f08f2aeb934180c1fb0ef6528f8108a41b614be1fe4f596c783871ce68b'

-             '876788303553fe773e64917f76f0208f5e8adf7b91d4af24aa9d6a68a147d646'

-             'e128576d72981e402ff106bb481108ab6d5ba941ab1b0f5f53e96a7831fc1d15'

-             '064a4cedc00f67e93a6f2ef99489e2614305a673a75a2135010283e99da6d6bf'

-             'b80a38737be3a1112bc52d2474e8ece3adb405a92623cfb36c3df5aed99ebf51'

-             '24dc07139087bd2261eb2de268ae5228a37a4db4fc695a7d9e647d95c36044df'

-             'a65d8c3a0210e4ec336f6b19900122d3a27c097893773aaf5c7de91d96399b36'

-             'cb49240e32b5bb22d7764890e765c94276ec66b597caeacd5121618f614c3bec'

-             '28dbefc67b332712273047ff0a5776b379217368f9a572665b43c2f486591058'

-             '73e7483fdc4b12ab4225a4cb13bbe7da71b07b9e69b17e3a6a4c63cb5e2287c8'

-             'b48fd8ef0c4e64ca3f3ada72e8e2148a276f86bf3cbb1a165504058bd15385c1'

-             '27833f60a091464612e74e6171cc98c3e3f994e2fde0ccc4535dd0d84ed041fa'

-             '98985142371d39ea6294d757e85a3d3fc9fc21718063afbf81869e1d2ca648a7'

-             'f3aa34b99a90213c53496f8ea014c487266338791f3526043a7fd97adc651fc6'

-             'a55216d5bc267004ebfd16f3371acaf04953b9cfdbc55518b26c80492584f647'

-             'fc2ff6922c4b64686bba9c6f482a64b2bebc1156d63e09f49adb0ffcfb240a1c'

-             '10428455ffe5812d45d9008f1cacbb5351b71566faf6329b8101ba71e213d36a')

- 

- _inst_initd(){

-     install -Dm755 ${srcdir}/$1.initd ${pkgdir}/etc/init.d/$1

- 

-     local _sed_args=()

-     sed -e 's|#!/sbin/openrc-run|#!/usr/bin/openrc-run|g' \

-         -e 's|/var/run|/run|g' \

-         -e 's|/usr/sbin|/usr/bin|g' \

-         -e 's|/sbin|/usr/bin|g' \

-         -i ${pkgdir}/etc/init.d/$1

- }

- 

- _inst_confd(){

-     install -Dm755 ${srcdir}/$1.confd ${pkgdir}/etc/conf.d/$1

- }

- 

- package_acpid-openrc() {

-     pkgdesc="OpenRC acpid init script"

-     depends=('openrc' 'acpid')

-     backup=('etc/conf.d/acpid')

- 

-     _inst_confd 'acpid'

-     _inst_initd 'acpid'

- }

- 

- package_alsa-utils-openrc() {

-     pkgdesc="OpenRC alsa-utils init script"

-     depends=('openrc' 'alsa-utils')

-     backup=('etc/conf.d/alsasound')

- 

-     _inst_confd 'alsasound'

-     _inst_initd 'alsasound'

- }

- 

- package_avahi-openrc() {

-     pkgdesc="OpenRC avahi init script"

-     depends=('avahi' 'dbus-openrc')

- 

-     _inst_initd 'avahi-daemon'

-     _inst_initd 'avahi-dnsconfd'

- 

-     install -Dm755 autoipd-openrc.sh ${pkgdir}/usr/lib/netifrc/net/autoipd.sh

- }

- 

- package_bluez-openrc() {

-     pkgdesc="OpenRC bluez init script"

-     depends=('bluez' 'openrc')

- 

-     _inst_initd 'bluetoothd'

- }

- 

- package_displaymanager-openrc() {

-     pkgdesc="OpenRC display manager init script"

-     depends=('xorg-server' 'xorg-xinit' 'openrc')

-     backup=('etc/conf.d/xdm')

-     install=displaymanager.install

- 

-     _inst_confd 'xdm'

-     _inst_initd 'xdm'

-     _inst_initd 'xdm-setup'

- 

-     install -Dm755 "${srcdir}/startDM.sh" "${pkgdir}/etc/X11/startDM.sh"

- }

- 

- package_gpm-openrc() {

-     pkgdesc="OpenRC gpm init script"

-     depends=('openrc' 'gpm')

-     backup=('etc/conf.d/gpm')

- 

-     _inst_confd 'gpm'

-     _inst_initd 'gpm'

- }

- 

- package_wpa_supplicant-openrc() {

-     pkgdesc="OpenRC wpa_supplicant init script"

-     depends=('openrc' 'wpa_supplicant')

-     backup=('etc/conf.d/wpa_supplicant')

- 

-     _inst_confd 'wpa_supplicant'

-     _inst_initd 'wpa_supplicant'

- 

-     install -Dm755 "${srcdir}/wpa_cli.sh" "${pkgdir}/etc/wpa_supplicant/wpa_cli.sh"

- 

-     sed -e "s|gentoo-release|parabola-release|" -i "${pkgdir}/etc/wpa_supplicant/wpa_cli.sh"

- }

- 

- package_chrony-openrc() {

-     pkgdesc="OpenRC chrony init script"

-     depends=('openrc' 'chrony')

-     backup=('etc/conf.d/chronyd')

- 

-     _inst_confd 'chronyd'

-     sed -e 's|ARGS=".*"|ARGS=""|' \

-         -e 's|CFGFILE=".*"|CFGFILE="/etc/chrony.conf"|' \

-         -i "${pkgdir}/etc/conf.d/chronyd"

- 

-     _inst_initd 'chronyd'

-     sed -e 's|/sbin|/usr/bin|' \

-         -e 's|/etc/chrony/|/etc/|' \

-         -i "${pkgdir}/etc/init.d/chronyd"

- }

- 

- package_tlp-openrc() {

-     pkgdesc="OpenRC tlp init script"

-     depends=('openrc' 'tlp')

- 

-     _inst_initd 'tlp'

-     sed -e 's|/usr/sbin|/usr/bin|' \

-         -e 's|/sbin/openrc-run|/usr/bin/openrc-run|' \

-         -i "${pkgdir}/etc/init.d/tlp"

- }

@@ -1,28 +0,0 @@ 

- #!/usr/bin/openrc-run

- # Copyright 1999-2007 Gentoo Foundation

- # Distributed under the terms of the GNU General Public License v2

- 

- extra_started_commands="reload"

- 

- depend() {

- 	need avahi-daemon

- 	use net

- }

- 

- start() {

- 	ebegin "Starting avahi-dnsconfd"

- 	/usr/bin/avahi-dnsconfd -D

- 	eend $?

- }

- 

- stop() {

- 	ebegin "Stopping avahi-dnsconfd"

- 	/usr/bin/avahi-dnsconfd -k

- 	eend $?

- }

- 

- reload() {

- 	ebegin "Reloading avahi-dnsconfd"

- 	/usr/bin/avahi-dnsconfd -r

- 	eend $?

- }

@@ -1,3 +0,0 @@ 

- post_install() {

- 	echo "	==> Edit /etc/conf.d/xdm to set DM."

- }

@@ -1,25 +0,0 @@ 

- #!/bin/sh

- # Copyright 1999-2011 Gentoo Foundation

- # Distributed under the terms of the GNU General Public License, v2

- 

- # We need to source /etc/profile for stuff like $LANG to work

- # bug #10190.

- . /etc/profile

- 

- . /etc/init.d/functions.sh

- 

- # Great new Gnome2 feature, AA

- # We enable this by default

- export GDK_USE_XFT=1

- 

- export SVCNAME=xdm

- EXEC="$(get_options service)"

- NAME="$(get_options name)"

- PIDFILE="$(get_options pidfile)"

- START_STOP_ARGS="$(get_options start_stop_args)"

- 

- start-stop-daemon --start --exec ${EXEC} \

- ${NAME:+--name} ${NAME} ${PIDFILE:+--pidfile} ${PIDFILE} ${START_STOP_ARGS} || \

- eerror "ERROR: could not start the Display Manager"

- 

- # vim:ts=4

@@ -1,13 +0,0 @@ 

- #!/usr/bin/openrc-run

- # Copyright 1999-2009 Gentoo Foundation

- # Distributed under the terms of the GNU General Public License v2

- 

- depend() {

- 	need localmount

- }

- 

- start() {

- 	if get_bootparam "nox" ; then

- 		touch /etc/.noxdm

- 	fi

- }

@@ -1,10 +0,0 @@ 

- # We always try and start X on a static VT. The various DMs normally default

- # to using VT7. If you wish to use the xdm init script, then you should ensure

- # that the VT checked is the same VT your DM wants to use. We do this check to

- # ensure that you haven't accidentally configured something to run on the VT

- # in your /etc/inittab file so that you don't get a dead keyboard.

- CHECKVT=7

- 

- # What display manager do you use ?  [ xdm | gdm | sddm | gpe | entrance | lightdm | lxdm ]

- # NOTE: If this is set in /etc/rc.conf, that setting will override this one.

- DISPLAYMANAGER="xdm"

@@ -1,132 +0,0 @@ 

- #!/usr/bin/openrc-run

- # Copyright 1999-2014 Gentoo Foundation

- # Distributed under the terms of the GNU General Public License, v2

- 

- depend() {

-     need localmount xdm-setup

- 

-     # this should start as early as possible

-     after bootmisc consolefont modules netmount

-     after readahead-list ypbind autofs openvpn gpm lircmd

-     after quota keymaps

-     before alsasound

- 

-     # Start before X

-     use elogind dbus xfs

- }

- 

- setup_dm() {

-     local MY_XDM

- 

-     MY_XDM=$(echo "${DISPLAYMANAGER}" | tr '[:upper:]' '[:lower:]')

- 

-     NAME=

-     case "${MY_XDM}" in

-         entrance*)

-             EXE=/usr/bin/entrance

-             PIDFILE=/run/entrance.pid

-             ;;

-         gdm|gnome)

-             EXE=/usr/bin/gdm

-             PIDFILE=/run/gdm/gdm.pid

-             START_STOP_ARGS="--background"

-             AUTOCLEAN_CGROUP="yes"

-             ;;

-         wdm)

-             EXE=/usr/bin/wdm

-             PIDFILE=

-             ;;

-         gpe)

-             EXE=/usr/bin/gpe-dm

-             PIDFILE=/run/gpe-dm.pid

-             ;;

-         lxdm)

-             EXE=/usr/bin/lxdm-binary

-             PIDFILE=/run/lxdm.pid

-             START_STOP_ARGS="--background"

-             ;;

-         lightdm)

-             EXE=/usr/bin/lightdm

-             PIDFILE=/run/lightdm.pid

-             START_STOP_ARGS="--background"

-             ;;

-         sddm)

-             EXE="/usr/bin/sddm"

-             START_STOP_ARGS="-m --background"

-             PIDFILE=/run/sddm.pid

-             ;;

-         *)

-             # first find out if there is such executable

-             EXE="$(command -v ${MY_XDM} 2>/dev/null)"

-             PIDFILE="/run/${MY_XDM}.pid"

- 

-             # warn user that he is doing sick things if the exe was not found

-             if [ -z "${EXE}" ]; then

-                 echo "ERROR: Your XDM value is invalid."

-                 echo "  No ${MY_XDM} executable could be found on your system."

-             fi

-             ;;

-     esac

- 

-     if ! [ -x "${EXE}" ]; then

-         EXE=/usr/bin/xdm

-         PIDFILE=/run/xdm.pid

-         if ! [ -x "/usr/bin/xdm" ]; then

-             echo "ERROR: Please set your DISPLAYMANAGER variable in /etc/conf.d/xdm,"

-             echo "	or install x11-apps/xdm package"

-             eend 255

-         fi

-     fi

- }

- 

- start() {

-     local EXE NAME PIDFILE AUTOCLEAN_CGROUP

-     setup_dm

- 

-     if [ -f /etc/.noxdm ]; then

-         einfo "Skipping ${EXE##*/}, /etc/.noxdm found or \"nox\" bootparam passed."

-         rm /etc/.noxdm

-         return 0

-     fi

- 

-     ebegin "Setting up ${EXE##*/}"

- 

-     # save the prefered DM

-     save_options "service" "${EXE}"

-     save_options "name"    "${NAME}"

-     save_options "pidfile" "${PIDFILE}"

-     save_options "start_stop_args" "${START_STOP_ARGS}"

-     save_options "autoclean_cgroup" "${AUTOCLEAN_CGROUP:-no}"

- 

-     /etc/X11/startDM.sh

-     eend 0

- }

- 

- stop() {

-     local retval

- 

-     retval=0

- 

-     local myexe myname mypidfile myservice

-     myexe=$(get_options "service")

-     myname=$(get_options "name")

-     mypidfile=$(get_options "pidfile")

-     myservice=${myexe##*/}

-     yesno "${rc_cgroup_cleanup:-no}" || rc_cgroup_cleanup=$(get_options "autoclean_cgroup")

- 

-     [ -z "${myexe}" ] && return 0

- 

-     ebegin "Stopping ${myservice}"

- 

-     if start-stop-daemon --quiet --test --stop --exec "${myexe}"; then

-         start-stop-daemon --stop --exec "${myexe}" --retry TERM/5/TERM/5 \

-             ${mypidfile:+--pidfile} ${mypidfile} \

-             ${myname:+--name} ${myname}

-         retval=${?}

-     fi

- 

-     eend ${retval} "Error stopping ${myservice}"

-     return ${retval}

- }

- 

- # vim: set ts=4 :

@@ -1,136 +0,0 @@ 

- # Maintainer: David P. <megver83@parabola.nu>

- # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>

- # Contributor: Luke Shumaker <lukeshu@parabola.nu>

- 

- pkgver=20201202

- _commit=bfce6ac47f7b46a3d89a73b9a24c196713914d83

- _url="https://raw.githubusercontent.com/gentoo/gentoo/${_commit}"

- 

- pkgbase=openrc-security

- pkgname=('apparmor-openrc'

-          'iptables-openrc'

-          'shorewall-openrc'

-          'shorewall6-openrc'

-          'firewalld-openrc'

-          'nftables-openrc')

- pkgrel=2

- pkgdesc="OpenRC init scripts"

- arch=('any')

- url="https://github.com/gentoo/gentoo"

- license=('GPL2')

- groups=('openrc-security')

- source=("iptables.confd::${_url}/net-firewall/iptables/files/iptables-1.4.13.confd"

-         "ip6tables.confd::${_url}/net-firewall/iptables/files/ip6tables-1.4.13.confd"

-         "iptables.initd::${_url}/net-firewall/iptables/files/iptables.init"

-         "ebtables.confd::${_url}/net-firewall/ebtables/files/ebtables.confd-r1"

-         "ebtables.initd::${_url}/net-firewall/ebtables/files/ebtables.initd-r1"

-         "firewalld.initd::${_url}/net-firewall/firewalld/files/firewalld.init"

-         "apparmor.initd::${_url}/sys-apps/apparmor/files/apparmor-init"

-         "shorewall.initd::${_url}/net-firewall/shorewall/files/shorewall.initd-r3"

-         "shorewall.confd::${_url}/net-firewall/shorewall/files/shorewall.confd-r1"

-         "shorewall6.initd::${_url}/net-firewall/shorewall/files/shorewall.initd-r3"

-         "shorewall6.confd::${_url}/net-firewall/shorewall/files/shorewall.confd-r1"

-         "nftables.shd::${_url}/net-firewall/nftables/files/libexec/nftables.sh"

-         "nftables.confd::${_url}/net-firewall/nftables/files/nftables.confd"

-         "nftables.initd::${_url}/net-firewall/nftables/files/nftables.init"

- )

- sha512sums=('bd67d53e997ea65755148ba071fe6e3856d6e604b9167c666900721bc3dc24f63d395bc33a1a34ae50f95e72760da630db1a8d35afc81ec5973e60ba5343dc70'

-             '8de9a5de4061bef217fbc07577688a8110f1116af7f3b936dfd18100a6a7a47ec6e70c456b24cf3432fb4f2034b741a487fe6af8d9740f174d51c6eb16945c6e'

-             '317c71bee98f5b1bbfd17ea961e5e268532c2320fc865b7876f7cc4e02a66b6a012fc336f8880045a83e101f161197c0a1d106220af6240407cebafbf38022db'

-             '088308eba077fcec35299c8aaad0492024173504a361c2ba7e29dce106888a78c72818a791f3d3655aed3f6df26a3319c42e2b2c54760cdbad036d46b89b97f3'

-             'ceceaf33d6f6bfa89a5d81932e3ec76a26d09d67150efd3de587520ea47984f618d4fc55e799c58a2e5e236caec5bd81e2fde31a7e5aa328e629cdabbd29339b'

-             '457cda01449f38563e98e1db937fe1c50745eab91797f52687e3ab9f5d94dd42d129740ae6669e99666a3f096d631dd3a44e66010b638b31b9c6ba798362403e'

-             '4ee4747ec98a0828beb690bf5e01bc112d958bff4c68d60fc0cbb9f0707bd8daecc011dba3916aa6e6368f460eedce7f2ce42aad9ccea49a5d898dcae3d01148'

-             '4cf71fd8087fa6c81a2ef4845da108df08f03c63f5a1312e79ec7f32cdae0d14d4d21a2af2ab696cc9be3c6d9215f097461b46b398db2a18067987cac00e5771'

-             'fee275ba8089b0abda5239edb06a3ab70c96acbbcd715c1a3aa5e92ba976294525c251b67b00d876e45f7c827767db45bd7623df42cc68c822234a7ea13d527b'

-             '4cf71fd8087fa6c81a2ef4845da108df08f03c63f5a1312e79ec7f32cdae0d14d4d21a2af2ab696cc9be3c6d9215f097461b46b398db2a18067987cac00e5771'

-             'fee275ba8089b0abda5239edb06a3ab70c96acbbcd715c1a3aa5e92ba976294525c251b67b00d876e45f7c827767db45bd7623df42cc68c822234a7ea13d527b'

-             '6cb1ac0928ae2da5c69764d45c52a661a6d72698bb9edd6a603580d2f9bd82b59f2a2661e7569ade3a3b729459d115004f251ad6a5eac8cdf1d38c65bfa9349e'

-             '8370abcdc89fcd9da5dc7d1620be6afb4633b8bcd0a8a120b464cc1a7e1fab6f34956c293da3f6d3cbe1f7a2e03038fd0c94a614137ae5657d29ffdb5f3fa144'

-             'ca761be0440945b21d5b002468baffb3299d0a3ac244aa895734dfdfaf442e7a73b757bcda99d958582064411d1b80b2cbcb4eb532bb219b4df407c9ed892661')

- 

- _inst_initd(){

-     install -Dm755 ${srcdir}/$1.initd ${pkgdir}/etc/init.d/$1

- 

-     local _sed_args=()

-     sed -e 's|#!/sbin/openrc-run|#!/usr/bin/openrc-run|g' \

-         -e 's|/var/run|/run|g' \

-         -e 's|/sbin|/usr/bin|g' \

-         -i ${pkgdir}/etc/init.d/$1

- }

- 

- _inst_confd(){

-     install -Dm755 ${srcdir}/$1.confd ${pkgdir}/etc/conf.d/$1

- }

- 

- package_iptables-openrc() {

- 	pkgdesc="OpenRC iptables init script"

- 	depends=('openrc' 'iptables')

- 	backup=('etc/conf.d/iptables'

- 		'etc/conf.d/ip6tables'

- 		'etc/conf.d/ebtables')

- 

- 	_inst_confd 'iptables'

-     _inst_initd 'iptables'

- 

-     _inst_confd 'ebtables'

-     _inst_initd 'ebtables'

- 

-     _inst_confd 'ip6tables'

- 

-     install -Dm755 "${srcdir}/iptables.initd" "${pkgdir}/etc/init.d/ip6tables"

- 

-     sed -e 's|#!/sbin/openrc-run|#!/usr/bin/openrc-run|g' \

-         -e 's|/var/run|/run|g' \

-         -e 's|/sbin|/usr/bin|g' \

-         -i ${pkgdir}/etc/init.d/ip6tables

- }

- 

- package_firewalld-openrc() {

- 	pkgdesc="OpenRC firewalld init script"

- 	depends=('firewalld' 'openrc')

- 

- 	_inst_initd 'firewalld'

- 	sed -e 's|/usr/sbin|/usr/bin|g' -i ${pkgdir}/etc/init.d/firewalld

- }

- 

- package_apparmor-openrc() {

-     pkgdesc="OpenRC apparmor init script"

-     depends=('apparmor' 'openrc')

- 

-    _inst_initd 'apparmor'

-    sed 's|libexec|lib/apparmor|' -i ${pkgdir}/etc/init.d/apparmor

- }

- 

- package_shorewall-openrc() {

-     pkgdes="OpenRC shorewall init script"

-     depends=('shorewall' 'openrc')

-     backup=('etc/conf.d/shorewall')

- 

-     _inst_initd 'shorewall'

-     _inst_confd 'shorewall'

- }

- 

- package_shorewall6-openrc() {

-     pkgdes="OpenRC shorewall6 init script"

-     depends=('shorewall6' 'openrc')

-     backup=('etc/conf.d/shorewall6')

- 

-     _inst_initd 'shorewall6'

-     _inst_confd 'shorewall6'

-     sed -e 's|/usr/sbin|/usr/bin|g' -i ${pkgdir}/etc/init.d/shorewall6

- }

- 

- package_nftables-openrc() {

-     pkgdes="OpenRC nftables init script"

-     depends=('nftables' 'openrc')

-     backup=('etc/conf.d/nftables')

- 

-     _inst_confd 'nftables'

- 

-     install -Dm755 "${srcdir}/nftables.shd" "${pkgdir}/usr/lib/nftables/nftables.sh"

-     _inst_initd 'nftables'

-     sed -e 's|/sbin|/usr/bin|g' \

-         -e 's|libexec|lib|g' \

-         -i "${pkgdir}/etc/init.d/nftables"

- }

file modified
+37 -36
@@ -1,64 +1,62 @@ 

- # Maintainer: David P. <megver83@parabola.nu>

- # Maintainer (Arch): Jan de Groot <jgc@archlinux.org>

+ # Maintainer: Nathan Owens <ndowens@artixlinux.org>

+ # Contributor: Jan de Groot <jgc@archlinux.org>

  

  pkgname=polkit

- pkgver=0.118

+ pkgver=121

  pkgrel=1

  pkgrel+=.nonsystemd1

  pkgdesc="Application development toolkit for controlling system-wide privileges"

- arch=(x86_64 i686 armv7h)

+ url="https://gitlab.freedesktop.org/polkit/polkit"

+ arch=(x86_64)

+ arch+=(i686 armv7h)

  license=(LGPL)

- url="https://www.freedesktop.org/wiki/Software/polkit/"

- depends=(glib2 pam expat elogind js78)

- makedepends=(intltool gtk-doc gobject-introspection git autoconf-archive)

+ depends=(glib2 pam expat elogind js78 duktape)

+ makedepends=(meson gtk-doc gobject-introspection git)

+ checkdepends=(python-dbusmock)

+ provides=(libpolkit-{agent,gobject}-1.so)

  backup=(etc/pam.d/polkit-1)

- provides=(polkit-elogind)

- replaces=(polkit-elogind polkit-consolekit)

- _commit=ff4c2144f0fb1325275887d9e254117fcd8a1b52 # git tag 0.118

+ options=(debug)

+ _commit=827b0ddac5b1ef00a47fca4526fcf057bee5f1db  # tags/121

  source=("git+https://gitlab.freedesktop.org/polkit/polkit.git#commit=$_commit"

          '99-parabola.rules'

-         'elogind-configure-fix.patch')

- sha256sums=('SKIP'

-             'd28d6ecaf7682860e2b3768bb266bd94313546b7cd0ef3c2eace7b1576c47adb'

-             'd90b2a95aa3e9e1ebf9369c038c144e04900e095c5405bc4ba4901c31bf3f59b')

+         meson-0.61.diff)

+ b2sums=('SKIP'

+         'd320d928b5480b5b8143717e6f88101912709020efc9583fbb233a2cc11aff51d36226b94cf69104db06f330e04d4dcfd6e4c7b027df75a3c72c43adec625fb2'

+         '29cef1cf9265ec0b70bf5a46655ee51b9855ce64e47636809b9704ca80edaf5777060d7469eea15a4126791d9290d44901726b6496acf83e41f46a96fe137ead')

  

  pkgver() {

-   cd $pkgname

-   git describe --tags | sed 's/-/+/g'

+   cd polkit

+   git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'

  }

  

  prepare() {

-   cd $pkgname

-   patch -Np 1 -i ${srcdir}/elogind-configure-fix.patch

-   NOCONFIGURE=1 ./autogen.sh

+   cd polkit

  }

  

  build() {

-   cd $pkgname

+   local meson_options=(

+     -D examples=true

+     -D gtk_doc=true

+     -D man=true

+     -D os_type=redhat

+     -D session_tracking=libelogind

+     -D tests=true

+     -D systemdsystemunitdir=foo

+   )

  

-   ./configure --prefix=/usr --sysconfdir=/etc \

-       --localstatedir=/var --libexecdir=/usr/lib \

-       --enable-libsystemd-login=no --disable-static \

-       --enable-libelogind=yes --with-systemdsystemunitdir=no \

-       --enable-gtk-doc --with-os-type=redhat

- 

-   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool

- 

-   make

+   arch-meson polkit build "${meson_options[@]}"

+   meson compile -C build

  }

  

  check() {

-   cd $pkgname

-   make -k check || :

+   meson test -C build --print-errorlogs -t 3

  }

  

  package() {

-   cd $pkgname

-   make DESTDIR="$pkgdir" install \

-       dbusconfdir=/usr/share/dbus-1/system.d \

-       rulesdir=/usr/share/polkit-1/rules.d

+   meson install -C build --destdir "$pkgdir"

  

    install -d -o root -g 102 -m 750 "$pkgdir"/{etc,usr/share}/polkit-1/rules.d

+   mv "$pkgdir"/{etc,usr/share}/polkit-1/rules.d/50-default.rules

  

    install -Dm644 /dev/stdin "$pkgdir/usr/lib/sysusers.d/$pkgname.conf" <<END

  u polkitd 102 "PolicyKit daemon"
@@ -66,6 +64,9 @@ 

  END

  

    install -m0644 "${srcdir}"/99-parabola.rules "${pkgdir}"/etc/polkit-1/rules.d

+ 

+   # workaround the unit enforcement, atm can't be disabled, needs patching

+   rm -rf "${pkgdir}"/usr/foo

  }

  

- # vim: ts=2 sw=2 et:

+ # vim:set sw=2 et:

@@ -1,28 +0,0 @@ 

- From 08bb656496cd3d6213bbe9473f63f2d4a110da6e Mon Sep 17 00:00:00 2001

- From: Rasmus Thomsen <cogitri@exherbo.org>

- Date: Wed, 11 Apr 2018 13:14:14 +0200

- Subject: [PATCH] configure: fix elogind support

- 

- HAVE_LIBSYSTEMD is used to determine which source files to use.

- We have to check if either have_libsystemd or have_libelogind is

- true, as both of these need the source files which are used when

- HAVE_LIBSYSTEMD is true.

- ---

-  configure.ac | 2 +-

-  1 file changed, 1 insertion(+), 1 deletion(-)

- 

- diff --git a/configure.ac b/configure.ac

- index 36df239..da47ecb 100644

- --- a/configure.ac

- +++ b/configure.ac

- @@ -221,7 +221,7 @@ AS_IF([test "x$cross_compiling" != "xyes" ], [

- 

-  AC_SUBST(LIBSYSTEMD_CFLAGS)

-  AC_SUBST(LIBSYSTEMD_LIBS)

- -AM_CONDITIONAL(HAVE_LIBSYSTEMD, [test "$have_libsystemd" = "yes"], [Using libsystemd])

- +AM_CONDITIONAL(HAVE_LIBSYSTEMD, [test "$have_libsystemd" = "yes" || test "$have_libelogind" = "yes" ], [Using libsystemd])

- 

-  dnl ---------------------------------------------------------------------------

-  dnl - systemd unit / service files

- --

- 2.17.0

@@ -0,0 +1,24 @@ 

+ diff --git i/actions/meson.build w/actions/meson.build

+ index 2abaaf3..1e3f370 100644

+ --- i/actions/meson.build

+ +++ w/actions/meson.build

+ @@ -1,7 +1,6 @@

+  policy = 'org.freedesktop.policykit.policy'

+  

+  i18n.merge_file(

+ -  policy,

+    input: policy + '.in',

+    output: '@BASENAME@',

+    po_dir: po_dir,

+ diff --git i/src/examples/meson.build w/src/examples/meson.build

+ index c6305ab..8c18de5 100644

+ --- i/src/examples/meson.build

+ +++ w/src/examples/meson.build

+ @@ -1,7 +1,6 @@

+  policy = 'org.freedesktop.policykit.examples.pkexec.policy'

+  

+  i18n.merge_file(

+ -  policy,

+    input: policy + '.in',

+    output: '@BASENAME@',

+    po_dir: po_dir,

@@ -0,0 +1,20 @@ 

+ # Maintainer: David P. <megver83@parabola.nu>

+ # Maintainer (Artix): artoo <artoo@artixlinux.org>

+ 

+ pkgname=sddm-openrc

+ pkgver=20220104

+ pkgrel=1

+ pkgdesc="OpenRC sddm init script"

+ arch=('any')

+ url="https://gitea.artixlinux.org/packagesS/sddm-openrc"

+ license=('GPL2')

+ groups=('openrc-world')

+ provides=('init-displaymanager')

+ conflicts=('init-displaymanager')

+ source=("sddm.initd")

+ sha256sums=('0d24660f022b3e5e1f8196a4022981045d9dd79eb74531d19d6981a5ba735f1e')

+ 

+ package() {

+     depends=('sddm' 'openrc')

+     install -Dm755 "$srcdir/sddm.initd" "$pkgdir/etc/init.d/sddm"

+ }

@@ -0,0 +1,17 @@ 

+ #!/usr/bin/openrc-run

+ 

+ supervisor=supervise-daemon

+ command="/usr/bin/sddm"

+ 

+ depend() {

+     need localmount

+ 

+     after bootmisc consolefont modules netmount

+     after ypbind autofs openvpn gpm lircmd

+     after quota keymaps

+     before alsasound

+     want logind

+     use xfs

+ 

+     provide xdm display-manager

+ }

@@ -0,0 +1,22 @@ 

+ # Maintainer: David P. <megver83@parabola.nu>

+ # Maintainer (Artix): Rafli Akmal <rafliakmaltejakusuma@gmail.com>

+ # Contributor (Artix): artoo <artoo@artixlinux.org>

+ # Contributor (Artix): Oscar Campos <damnwidget@artixlinux.org>

+ 

+ pkgname=tlp-openrc

+ pkgver=20210505

+ pkgrel=1

+ pkgdesc="OpenRC tlp init script"

+ arch=('any')

+ url="https://gitea.artixlinux.org/packagesT/tlp-openrc"

+ license=('GPL2')

+ groups=('openrc-galaxy')

+ provides=('init-tlp')

+ conflicts=('init-tlp')

+ source=('tlp.initd')

+ sha256sums=('4fc771f1ce9423b1f5facc006845d3ab5cbce3bfdf1aa0737b2ed8e7d6f8c3ac')

+ 

+ package() {

+     depends=('openrc' 'tlp')

+     install -Dm755 "$srcdir/tlp.initd" "$pkgdir/etc/init.d/tlp"

+ }

@@ -0,0 +1,25 @@ 

+ #!/usr/bin/openrc-run

+ # Copyright 1999-2015 Gentoo Foundation

+ # Distributed under the terms of the GNU General Public License v2

+ # $Header: $

+ 

+ description="TLP start/stop actions"

+ 

+ depend() {

+ 	after modules

+ 

+ 	# sysfs is required (bat thresholds); localmount:/usr

+ 	need sysfs localmount

+ 

+ 	# thinkpad-radiosw (USE=deprecated)

+ 	use acpid

+ 

+ 	after NetworkManager dbus bluetooth

+ 

+ 	# run after xdm to avoid bluetooth/wwan/... race-condition with gdm

+ 	after xdm

+ }

+ 

+ start()   { /usr/bin/tlp init start; }

+ stop()    { /usr/bin/tlp init stop; }

+ restart() { /usr/bin/tlp init restart; }

@@ -0,0 +1,30 @@ 

+ # Maintainer: David P. <megver83@parabola.nu>

+ # Maintainer (Artix): artoo <artoo@artixlinux.org>

+ 

+ pkgname=wpa_supplicant-openrc

+ pkgver=20210505

+ pkgrel=1

+ pkgdesc="OpenRC wpa_supplicant init script"

+ arch=('any')

+ url="https://gitea.artixlinux.org/packagesW/wpa_supplicant-openrc"

+ license=('GPL2')

+ groups=('openrc-system')

+ provides=('init-wpa_supplicant')

+ conflicts=('init-wpa_supplicant')

+ backup=('etc/conf.d/wpa_supplicant')

+ source=("wpa_supplicant.confd"

+         "wpa_supplicant.initd"

+         "wpa_cli.sh")

+ sha256sums=('27833f60a091464612e74e6171cc98c3e3f994e2fde0ccc4535dd0d84ed041fa'

+             '7789b54cabb7317d9368531f4832ae7b256e26ce0e5ac7ab8d0a251ade18342a'

+             '300d0b54280c2582e74f78087edad3b0da19b9e4e0440f7f320f523a46da8373')

+ 

+ package() {

+     depends=('openrc' 'wpa_supplicant')

+     install -Dm755 "${srcdir}"/wpa_supplicant.initd "${pkgdir}"/etc/init.d/wpa_supplicant

+     install -Dm644 "${srcdir}"/wpa_supplicant.confd "${pkgdir}"/etc/conf.d/wpa_supplicant

+ 

+     install -Dm755 "${srcdir}"/wpa_cli.sh "${pkgdir}"/etc/wpa_supplicant/wpa_cli.sh

+ }

+ 

+ 

@@ -0,0 +1,46 @@ 

+ #!/bin/sh

+ # Copyright 1999-2011 Gentoo Foundation

+ # Written by Roy Marples <uberlord@gentoo.org>

+ # Distributed under the terms of the GNU General Public License v2

+ # Alternatively, this file may be distributed under the terms of the BSD License

+ 

+ if [ -z "$1" -o -z "$2" ]; then

+ 	logger -t wpa_cli "Insufficient parameters"

+ 	exit 1

+ fi

+ 

+ INTERFACE="$1"

+ ACTION="$2"

+ 

+ # Note, the below action must NOT mark the interface down via ifconfig, ip or

+ # similar. Addresses can be removed, changed and daemons can be stopped, but

+ # the interface must remain up for wpa_supplicant to work.

+ 

+ if [ -f /etc/parabola-release ]; then

+ 	EXEC="/etc/init.d/net.${INTERFACE} --quiet"

+ else

+ 	logger -t wpa_cli "I don't know what to do with this distro!"

+ 	exit 1

+ fi

+ 

+ case ${ACTION} in

+ 	CONNECTED)

+ 		EXEC="${EXEC} start"

+ 		;;

+ 	DISCONNECTED)

+ 		# Deactivated, since stopping /etc/init.d/net.wlanX

+ 		# stops the network completly.

+ 		EXEC="false ${EXEC} stop"

+ 		;;

+ 	*)

+ 		logger -t wpa_cli "Unknown action ${ACTION}"

+ 		exit 1

+ 		;;

+ esac

+ 

+ # ${EXEC} can use ${IN_BACKGROUND} so that it knows that the user isn't

+ # stopping the interface and a background process - like wpa_cli - is.

+ export IN_BACKGROUND=true

+ 

+ logger -t wpa_cli "interface ${INTERFACE} ${ACTION}"

+ ${EXEC} || logger -t wpa_cli "executing '${EXEC}' failed"

@@ -0,0 +1,10 @@ 

+ # conf.d file for wpa_supplicant

+ 

+ # uncomment this if wpa_supplicant starts up before your network interface

+ # is ready and it causes issues

+ # rc_want="dev-settle"

+ 

+ # Please check man 8 wpa_supplicant for more information about the options

+ # wpa_supplicant accepts.

+ #

+ wpa_supplicant_args=""

@@ -0,0 +1,70 @@ 

+ #!/usr/bin/openrc-run

+ # Copyright (c) 2009 Roy Marples <roy@marples.name>

+ # All rights reserved. Released under the 2-clause BSD license.

+ 

+ command=/usr/bin/wpa_supplicant

+ : ${wpa_supplicant_conf:=/etc/wpa_supplicant/wpa_supplicant.conf}

+ wpa_supplicant_if=${wpa_supplicant_if:+-i}$wpa_supplicant_if

+ command_args="$wpa_supplicant_args -B -c$wpa_supplicant_conf $wpa_supplicant_if"

+ name="WPA Supplicant Daemon"

+ 

+ depend()

+ {

+ 	need localmount

+ 	use logger

+ 	after bootmisc modules

+ 	before dns dhcpcd net

+ 	keyword -shutdown

+ }

+ 

+ find_wireless()

+ {

+ 	local iface=

+ 

+ 	case "$RC_UNAME" in

+ 	Linux)

+ 		for iface in /sys/class/net/*; do

+ 			if [ -e "$iface"/wireless -o \

+ 				-e "$iface"/phy80211 ]

+ 			then

+ 				echo "${iface##*/}"

+ 				return 0

+ 			fi

+ 		done

+ 		;;

+ 	*)

+ 		for iface in /dev/net/* $(ifconfig -l 2>/dev/null); do

+ 			if ifconfig "${iface##*/}" 2>/dev/null | \

+ 				grep -q "[ ]*ssid "

+ 			then

+ 				echo "${iface##*/}"

+ 				return 0

+ 			fi

+ 		done

+ 		;;

+ 	esac

+ 

+ 	return 1

+ }

+ 

+ append_wireless()

+ {

+ 	local iface= i=

+ 

+ 	iface=$(find_wireless)

+ 	if [ -n "$iface" ]; then

+ 		for i in $iface; do

+ 			command_args="$command_args -i$i"

+ 		done

+ 	else

+ 		eerror "Could not find a wireless interface"

+ 	fi

+ }

+ 

+ start_pre()

+ {

+ 	case " $command_args" in

+ 	*" -i"*) ;;

+ 	*) append_wireless;;

+ 	esac

+ }

@@ -0,0 +1,20 @@ 

+ # Maintainer: David P. <megver83@parabola.nu>

+ # Maintainer (Artix): artoo <artoo@artixlinux.org>

+ 

+ pkgname=xdm-openrc

+ pkgver=20220104

+ pkgrel=1

+ pkgdesc="OpenRC xdm init script"

+ arch=('any')

+ url="https://gitea.artixlinux.org/packagesX/xdm-openrc"

+ license=('GPL2')

+ groups=('openrc-world')

+ provides=('init-xdm')

+ conflicts=('init-xdm')

+ source=("xdm.initd")

+ sha256sums=('d0ec3cf9ca3a010e3ef6e36b66c98bbb1102d9f203a595b642c554952f71d467')

+ 

+ package() {

+     depends=('xorg-xdm' 'openrc')

+     install -Dm755 "$srcdir/xdm.initd" "$pkgdir/etc/init.d/xdm"

+ }

@@ -0,0 +1,16 @@ 

+ #!/usr/bin/openrc-run

+ 

+ supervisor=supervise-daemon

+ command="/usr/bin/xdm"

+ 

+ depend() {

+     need localmount

+ 

+     after bootmisc consolefont modules netmount

+     after readahead-list ypbind autofs openvpn gpm lircmd

+     after quota keymaps

+     before alsasound

+ 

+     use logind dbus xfs

+     provide display-manager

+ }

@@ -4,16 +4,16 @@ 

  pkgdesc="This package conflicts with every package known to work only for/with systemd."

  license=('GPL3')

  url="https://git.parabola.nu/blacklist.git"

- pkgver=20210628

- _gitver=50cf92a24fa5e2a6e4d70b90fbabd161dc2554e3

+ pkgver=20220719

+ _gitver=daf9eebc77cc719c818165e256efd5e0d5dee7aa

  pkgrel=1

  

  arch=('any')

- install=${pkgname}.install

+ install="${pkgname}.install"

  

  makedepends=(librelib)

- source=(blacklist-${_gitver}.txt::https://git.parabola.nu/blacklist.git/plain/${pkgname}-blacklist.txt?id=${_gitver})

- sha512sums=('b0a421a21eedde392d77d1b2264e7d71f4725e89481bca7a01afb25e95a51edeb10a4e7f5fadd31bd243cfdfcdb40d32215f497c994d938c5907223ef8ce9e28')

+ source=("blacklist-${_gitver}.txt::https://git.parabola.nu/blacklist.git/plain/${pkgname}-blacklist.txt?id=${_gitver}")

+ sha512sums=('0060ebc516b1aee1149186e53a1c665d6790da2db7e43ade136731c8b5bd7ab24c4ce9431af8c5a06f3ad569ab73bcd2e5ff0179ac3c8f332ae78fdc266addeb')

  

  package() {

  	cd "$srcdir"

@@ -3,34 +3,33 @@ 

  

  # Maintainer: David P. <megver83@parabola.nu>

  # Contributor: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>

+ # Contributor: Wael Karram <wael@waelk.tech>

  

  # parabola changes and rationale:

  # no changes.

  

  pkgname=gajim-plugin-omemo

  _pkgname=omemo

- pkgver=2.7.13

+ pkgver=2.8.15

  pkgrel=1

- _pythonversion=3.9

+ _pythonversion=3.10

  pkgdesc='Gajim plugin for OMEMO Multi-End Message and Object Encryption.'

  arch=(any)

  url='https://dev.gajim.org/gajim/gajim-plugins/wikis/OmemoGajimPlugin'

  license=('GPL')

- depends=('gajim>=1.2.91' 'gajim<=1.3.90' 'python-qrcode' 'python-setuptools' 'python-cryptography' 'python-axolotl')

+ depends=('gajim>=1.4' 'gajim<=1.4.90' 'python-qrcode' 'python-setuptools' 'python-cryptography' 'python-axolotl')

  provides=('gajim-plugin-omemo')

  conflicts=('gajim-plugin-omemo-git')

- source=("https://ftp.gajim.org/plugins_releases/${_pkgname}_${pkgver}.zip")

- sha512sums=('33f7d1132ed9e218e17c8288ad2586b1a9c6d547db93b5b9bb97abcb8df2541bba35d9cc3fcef74d13b35353636cb4ef652805d69eda878d361b029e62fd9ee2')

+ source=("https://ftp.gajim.org/plugins/master/${_pkgname}/${_pkgname}_${pkgver}.zip")

+ sha512sums=('5c3322239a149512f96b35359f0f423070f2e16f660885f62485306aaf6baeade564c8e5ab2fcfb63c1554dca8624c5d6fda5c0435c83aaafb484c98092fce48')

  

  package() {

-   cd "${srcdir}/${_pkgname}"

+   cd "${srcdir}"

  

    # Remove unnecessary files

-   rm -r CHANGELOG COPYING

+   rm -f CHANGELOG COPYING

  

    # Install the plugin

    install -d "${pkgdir}/usr/lib/python${_pythonversion}/site-packages/gajim/data/plugins/${_pkgname}"

    cp -r * "${pkgdir}/usr/lib/python${_pythonversion}/site-packages/gajim/data/plugins/${_pkgname}/"

  }

- 

- # vim:set ts=2 sw=2 et:

pcr/gophernicus/PKGBUILD pcr-testing/gophernicus/PKGBUILD
file renamed
file was moved with no change to the file
pcr/gophernicus/fix-make-log-typo.patch pcr-testing/gophernicus/fix-make-log-typo.patch
file renamed
file was moved with no change to the file
pcr/gophernicus/gophernicus.install pcr-testing/gophernicus/gophernicus.install
file renamed
file was moved with no change to the file
pcr/gophernicus/preserve-existing-gophermap.patch pcr-testing/gophernicus/preserve-existing-gophermap.patch
file renamed
file was moved with no change to the file
pcr/gophernicus/remove-DESTDIR-from-initscripts.patch pcr-testing/gophernicus/remove-DESTDIR-from-initscripts.patch
file renamed
file was moved with no change to the file
pcr/gophernicus/xinetd-respect-custom-server-root.patch pcr-testing/gophernicus/xinetd-respect-custom-server-root.patch
file renamed
file was moved with no change to the file
file removed
-35
@@ -1,35 +0,0 @@ 

- # Maintainer: Luke Shumaker <lukeshu@parabola.nu>

- # Contributor (AUR): Jordi De Groof <jordi.degroof@gmail.com>

- # Contributor (AUR): Andre Klitzing <aklitzing@gmail.com>

- 

- pkgname=lcov

- pkgver=1.13

- pkgrel=2

- pkgdesc="front-end for GCC's coverage testing tool gcov"

- arch=('any')

- url="http://ltp.sourceforge.net/coverage/lcov.php"

- license=('GPL')

- depends=('perl')

- source=("http://downloads.sourceforge.net/ltp/$pkgname-$pkgver.tar.gz"

-         "handle-equals-signs.patch"

-         "fix-undef-behaviour.patch"

-         )

- 

- prepare()

- {

-   cd "$srcdir/$pkgname-$pkgver"

-   patch -p1 -i $srcdir/handle-equals-signs.patch

-   patch -p1 -i $srcdir/fix-undef-behaviour.patch

- }

- 

- 

- package()

- {

-  cd "$srcdir/$pkgname-$pkgver"

- 

-  make PREFIX="$pkgdir/usr" install

- }

- 

- sha256sums=('44972c878482cc06a05fe78eaa3645cbfcbad6634615c3309858b207965d8a23'

-             '54728aa4e244d3662c65ba91fb486dc1d5c64d9d55745ee334c4131109dc233c'

-             'ceaf41f7cc9cea5a6fc4b0385ffef10d1ab8812acd2a5b16dcd8d7bca7120488')

@@ -1,37 +0,0 @@ 

- Author: Alastair McKinstry <mckinstry@debian.org>

- Description: Fix for undefined behavior in perl5.20

- Origin: http://bugs.debian.org/761308

- Forwarded: no

- Last-Updated: 2014-09-13

- 

- Index: lcov-1.12/bin/lcov

- ===================================================================

- --- lcov-1.12.orig/bin/lcov

- +++ lcov-1.12/bin/lcov

- @@ -224,7 +224,9 @@ Getopt::Long::Configure("default");

-  	# Remove spaces around rc options

-  	my %new_opt_rc;

-  

- -	while (my ($key, $value) = each(%opt_rc)) {

- +	my @keys = keys %opt_rc;

- +	for my $key (@keys) {

- +	        my $value = $opt_rc{$key};

-  		$key =~ s/^\s+|\s+$//g;

-  		$value =~ s/^\s+|\s+$//g;

-  

- Index: lcov-1.12/bin/geninfo

- ===================================================================

- --- lcov-1.12.orig/bin/geninfo

- +++ lcov-1.12/bin/geninfo

- @@ -284,8 +284,9 @@ Getopt::Long::Configure("default");

-  {

-  	# Remove spaces around rc options

-  	my %new_opt_rc;

- -

- -	while (my ($key, $value) = each(%opt_rc)) {

- +	my @keys = keys %opt_rc;

- +	for my $key (@keys) {

- +		my $value = $opt_rc{$key};

-  		$key =~ s/^\s+|\s+$//g;

-  		$value =~ s/^\s+|\s+$//g;

-  

@@ -1,23 +0,0 @@ 

- Description: Handle "=====" as another form of zero.

-  gcov prints "=====" instead of "######" when an unexecuted line is

-  "reachable only by exceptional paths such as C++ exception handlers."

-  This should be handled the same as "######" for our purposes.

- Author: Zack Weinberg <zackw@panix.com>

- Last-Update: 2013-02-01

- 

- Index: lcov-1.12/bin/geninfo

- ===================================================================

- --- lcov-1.12.orig/bin/geninfo

- +++ lcov-1.12/bin/geninfo

- @@ -1771,8 +1771,9 @@ sub read_gcov_file($)

-  				$number = (split(" ",substr($_, 0, 16)))[0];

-  

-  				# Check for zero count which is indicated

- -				# by ######

- -				if ($number eq "######") { $number = 0;	}

- +				# by ###### or =====

- +				if ($number eq "######" or

- +				    $number eq "=====") { $number = 0; }

-  

-  				if ($exclude_line) {

-  					# Register uninstrumented line instead

file modified
+9 -1
@@ -4,7 +4,7 @@ 

  # Maintainers: Parabola hackers <dev@lists.parabola.nu>

  

  pkgname=libreboot-utils

- pkgrel=14

+ pkgrel=15

  _upstream_ver=20211122

  pkgver=4.15.libreboot${_upstream_ver}

  pkgdesc="Misc. Coreboot/Libreboot utils (bucts, cbfstool, ECtool, nvramtool, superiotool)"
@@ -39,6 +39,8 @@ 

  	sed 's#/sbin#/bin#' -i Makefile

  	cd "$srcdir/libreboot-${_upstream_ver}_src/coreboot/default/util/ectool/"

  	sed 's#/sbin#/bin#' -i Makefile

+ 	cd "$srcdir/libreboot-${_upstream_ver}_src/coreboot/default/util/intelmetool/"

+ 	sed 's#/sbin#/bin#' -i Makefile

  	cd "$srcdir/libreboot-${_upstream_ver}_src/coreboot/default/util/inteltool/"

  	sed 's#/sbin#/bin#' -i Makefile

  	cd "$srcdir/libreboot-${_upstream_ver}_src/coreboot/default/util/nvramtool/"
@@ -69,6 +71,9 @@ 

  		# Build ECtool.

  		make -C ectool

  

+ 		# Build intelmetool.

+ 		make -C intelmetool

+ 

  		# Build inteltool.

  		make -C inteltool

  
@@ -117,6 +122,9 @@ 

  		# Install ECtool.

  		make -C ectool install PREFIX="${pkgdir}"/usr

  

+ 		# Install intelmetool.

+ 		make -C intelmetool install DESTDIR="${pkgdir}" PREFIX=/usr

+ 

  		# Install inteltool.

  		make -C inteltool install DESTDIR="${pkgdir}" PREFIX=/usr

  

@@ -0,0 +1,85 @@ 

+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>

+ 

+ 

+ _pkgbase=rtl8812au

+ pkgname=rtl8812au-dkms

+ pkgver=5.6.4.2.20220606 # per upstream dkms.conf (see note in prepare())

+ _cid=cab4e4ec56884f65e0c279c1b5ceaf70dbe79be0

+ pkgrel=3

+ pkgdesc="RTL8812AU/21AU and RTL8814AU driver with monitor mode and frame injection"

+ url=https://github.com/aircrack-ng/rtl8812au

+ license=(GPL2)

+ arch=(armv7h i686 x86_64)

+ 

+ makedepends=()

+ depends=(dkms)

+ 

+ source=(${_pkgbase}-${pkgver}.tar.gz::https://github.com/aircrack-ng/rtl8812au/archive/${_cid}.tar.gz

+         dkms.conf)

+ 

+ sha256sums=(20b498bc597e5343ee6c240eabd45c36894db86c76f6bfc100448c8b9c420733

+             9f7c983df45db1938ee924b2dac8e8d98becef78822536b6c8f489a56a25c6a4)

+ 

+ case "${CARCH}" in

+ armv7h ) export KARCH=arm   ;;

+ aarch64) export KARCH=arm64 ;; # TODO: not yet supported

+ esac

+ 

+ 

+ prepare()

+ {

+   cd "${srcdir}"/${_pkgbase}-${_cid}

+ 

+   # version sanity check

+   # NOTE: The upstream does not publich versioned releases, nor use git tags.

+   #       However they are kind enough to version the dkms.conf.

+   #         eg: PACKAGE_VERSION="5.6.4.2~20220715"

+   #       This PKGBUILD attempts to version the package properly, based on

+   #       that version ID (aka: pkgver) and the VCS commit (aka: _cid) which defined it.

+   local upstream_ver=$(grep PACKAGE_VERSION= dkms.conf | sed 's|PACKAGE_VERSION="\(.*\)"|\1|')

+   [[ "${upstream_ver/\~/.}" == ${pkgver} ]] || ! echo "version mismatch in dkms.conf" || return 1

+ 

+   # we will use our dkms.conf though

+   cp "${srcdir}"/dkms.conf .

+ 

+   case "${CARCH}" in

+   armv7h)

+     sed -i 's|^CONFIG_PLATFORM_I386_PC = y|CONFIG_PLATFORM_I386_PC = n|'     Makefile

+     sed -i 's|^CONFIG_PLATFORM_ARM_SUN7I = n|CONFIG_PLATFORM_ARM_SUN7I = y|' Makefile

+     sed -i "s|^MAKE\[0\]=\"|MAKE[0]=\"ARCH=${KARCH} |"                       dkms.conf

+   ;;

+   aarch64)

+     sed -i "s|^MAKE\[0\]=\"|MAKE[0]=\"ARCH=${KARCH} |"                       dkms.conf

+   ;;

+   esac

+   sed -i -e "s/@PKGBASE@/${_pkgbase}/" -e "s/@PKGVER@/${pkgver}/"            dkms.conf

+ 

+   # cleanup some sources that we won't need

+   # the licensing of files under the tools/ directory is varied and unclear

+   # TODO: this could/should go into a mksource() function

+   rm -rf android/ tools/

+ }

+ 

+ package()

+ {

+   cd "${srcdir}"/${_pkgbase}-${_cid}

+ 

+   local dkms_srcdir="${pkgdir}"/usr/src/${_pkgbase}-${pkgver}

+ 

+   # Install

+   # Makefile does not respect DESTDIR

+   # make DESTDIR="${pkgdir}" install

+ 

+   # Copy dkms.conf

+   install -Dm644 dkms.conf "${dkms_srcdir}"/dkms.conf

+ 

+   # Set name and version

+   # already did that

+ 

+   # Copy sources (including Makefile)

+   cp -r ./* "${pkgdir}"/usr/src/${_pkgbase}-${pkgver}/

+ 

+   # install docs

+   install -Dm644 README.md "${pkgdir}"/usr/share/doc/${_pkgbase}/README.md

+   install -m644  docs/*    "${pkgdir}"/usr/share/doc/${_pkgbase}/

+ }

@@ -0,0 +1,9 @@ 

+ PACKAGE_NAME="@PKGBASE@"

+ PACKAGE_VERSION="@PKGVER@"

+ BUILT_MODULE_NAME="88XXau"

+ PROCS_NUM=$(nproc)

+ [ $PROCS_NUM -gt 16 ] && PROCS_NUM=16

+ MAKE="'make' -j$PROCS_NUM KVER=${kernelver} KSRC=/lib/modules/${kernelver}/build"

+ CLEAN="'make' clean"

+ DEST_MODULE_LOCATION="/kernel/drivers/net/wireless"

+ AUTOINSTALL="yes"

Build for x86_64 only, not for other architectures, sorry. Also did not check if Arch Linux 32 and Arch Linux ARM have some updates for their package.

As usual, only the latest commit is relevant in this PR.

Pull-Request has been closed by billauger

2 years ago
Metadata
Changes Summary 153
+13 -9
file changed
libre/epiphany/PKGBUILD
+38 -21
file changed
libre/epiphany/libre.patch
+125 -121
file changed
libre/iceweasel/9001-FSDG-sync-remote-settings-with-local-dump.patch
+5 -25
file changed
libre/iceweasel/9004-FSDG-misc.patch
+5 -4
file changed
libre/iceweasel/PKGBUILD
+50 -0
file changed
libre/linux-libre-64/PKGBUILD
+5 -8
file changed
libre/linux-libre-hardened/PKGBUILD
+4 -1
file changed
libre/linux-libre-hardened/config
+12 -12
file changed
libre/linux-libre-pae/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
+107
file added
libre/linux-libre-pae/0002-HID-apple-Properly-handle-function-keys-on-Keychron-.patch
-94
file removed
libre/linux-libre-pae/0002-random-treat-bootloader-trust-toggle-the-same-way-as.patch
+26
file added
libre/linux-libre-pae/0003-soundwire-Raise-DEFAULT_PROBE_TIMEOUT-to-10000-ms.patch
-86
file removed
libre/linux-libre-pae/0003-tick-Detect-and-fix-jiffies-update-stall.patch
-101
file removed
libre/linux-libre-pae/0004-tick-rcu-Remove-obsolete-rcu_needs_cpu-parameters.patch
-119
file removed
libre/linux-libre-pae/0005-tick-rcu-Stop-allowing-RCU_SOFTIRQ-in-idle.patch
-55
file removed
libre/linux-libre-pae/0006-lib-irq_poll-Declare-IRQ_POLL-softirq-vector-as-ksof.patch
-81
file removed
libre/linux-libre-pae/0007-NFSv4.1-provide-mount-option-to-toggle-trunking-disc.patch
+11 -20
file changed
libre/linux-libre-pae/PKGBUILD
+531 -384
file changed
libre/linux-libre-pae/config
+7 -7
file changed
libre/linux-libre/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
+3 -3
file changed
libre/linux-libre/0002-HID-apple-Properly-handle-function-keys-on-Keychron-.patch
+26
file added
libre/linux-libre/0003-soundwire-Raise-DEFAULT_PROBE_TIMEOUT-to-10000-ms.patch
+14 -13
file changed
libre/linux-libre/PKGBUILD
+31 -8
file changed
libre/linux-libre/config.i686
+18 -7
file changed
libre/linux-libre/config.x86_64
+0 -15
file changed
libre/pacman/PKGBUILD
+2 -1
file changed
libre/pacman/dummy.conf
-26
file removed
libre/pacman/pacman-keyring.initd
-7
file removed
libre/pacman/pacman-keyring.service
-11
file removed
libre/pacman/pacman-keyring.timer
+3 -2
file changed
libre/parabola-keyring/PKGBUILD
+4 -4
file changed
libre/parabolaiso/PKGBUILD
+27
file added
nonsystemd/acpid-openrc/PKGBUILD
+0 -0
file renamed
nonsystemd/openrc-desktop/acpid.confd
nonsystemd/acpid-openrc/acpid.confd
+6 -3
file renamed
nonsystemd/openrc-desktop/acpid.initd
nonsystemd/acpid-openrc/acpid.initd
+25
file added
nonsystemd/alsa-utils-openrc/PKGBUILD
+15
file added
nonsystemd/alsa-utils-openrc/alsasound.confd
+87
file added
nonsystemd/alsa-utils-openrc/alsasound.initd
+20
file added
nonsystemd/apparmor-openrc/PKGBUILD
+91
file added
nonsystemd/apparmor-openrc/apparmor.initd
+27
file added
nonsystemd/avahi-openrc/PKGBUILD
+0 -0
file renamed
nonsystemd/openrc-desktop/autoipd-openrc.sh
nonsystemd/avahi-openrc/autoipd-openrc.sh
+14 -12
file renamed
nonsystemd/openrc-desktop/avahi-daemon.initd
nonsystemd/avahi-openrc/avahi-daemon.initd
+30
file added
nonsystemd/avahi-openrc/avahi-dnsconfd.initd
+20
file added
nonsystemd/bluez-openrc/PKGBUILD
+3 -2
file renamed
nonsystemd/openrc-desktop/bluetoothd.initd
nonsystemd/bluez-openrc/bluetoothd.initd
+27
file added
nonsystemd/chrony-openrc/PKGBUILD
+17
file added
nonsystemd/chrony-openrc/chrony.confd
+78
file added
nonsystemd/chrony-openrc/chrony.initd
+12
file added
nonsystemd/dbus-openrc/80-dbus
+30
file added
nonsystemd/dbus-openrc/PKGBUILD
+1 -1
file renamed
nonsystemd/dbus/dbus-reload.hook
nonsystemd/dbus-openrc/dbus-reload.hook
+3 -3
file renamed
nonsystemd/dbus/dbus.initd
nonsystemd/dbus-openrc/dbus.initd
+34 -29
file changed
nonsystemd/dbus/PKGBUILD
+4 -4
file changed
nonsystemd/dbus/no-fatal-warnings.diff
+26
file added
nonsystemd/docker-openrc/PKGBUILD
+29
file added
nonsystemd/docker-openrc/docker.confd
+28
file added
nonsystemd/docker-openrc/docker.initd
+24
file added
nonsystemd/elogind-openrc/PKGBUILD
+0 -0
file renamed
nonsystemd/elogind/elogind.sv.initd
nonsystemd/elogind-openrc/elogind.sv.initd
+25 -31
file changed
nonsystemd/elogind/PKGBUILD
+21
file added
nonsystemd/firewalld-openrc/PKGBUILD
+14
file added
nonsystemd/firewalld-openrc/firewalld.initd
+20
file added
nonsystemd/gdm-openrc/PKGBUILD
+17
file added
nonsystemd/gdm-openrc/gdm.initd
+24
file added
nonsystemd/gpm-openrc/PKGBUILD
+23
file added
nonsystemd/gpm-openrc/gpm.confd
+28
file added
nonsystemd/gpm-openrc/gpm.initd
+39
file added
nonsystemd/iptables-openrc/PKGBUILD
+11
file added
nonsystemd/iptables-openrc/ebtables.confd
+101
file added
nonsystemd/iptables-openrc/ebtables.initd
+27
file added
nonsystemd/iptables-openrc/ip6tables.confd
+19
file added
nonsystemd/iptables-openrc/iptables.confd
+165
file added
nonsystemd/iptables-openrc/iptables.initd
+20
file added
nonsystemd/lightdm-openrc/PKGBUILD
+16
file added
nonsystemd/lightdm-openrc/lightdm.initd
+20
file added
nonsystemd/lxdm-openrc/PKGBUILD
+18
file added
nonsystemd/lxdm-openrc/lxdm.initd
+0 -0
file renamed
nonsystemd/networkmanager/10-openrc-status
nonsystemd/networkmanager-openrc/10-openrc-status
+0 -0
file renamed
nonsystemd/networkmanager/NetworkManager.confd
nonsystemd/networkmanager-openrc/NetworkManager.confd
+0 -0
file renamed
nonsystemd/networkmanager/NetworkManager.initd
nonsystemd/networkmanager-openrc/NetworkManager.initd
+27
file added
nonsystemd/networkmanager-openrc/PKGBUILD
+38 -45
file changed
nonsystemd/networkmanager/PKGBUILD
+34
file added
nonsystemd/nftables-openrc/PKGBUILD
+26
file added
nonsystemd/nftables-openrc/nftables-mk.confd
+104
file added
nonsystemd/nftables-openrc/nftables-mk.initd
+60
file added
nonsystemd/nftables-openrc/nftables-mk.sh
+19
file added
nonsystemd/nftables-openrc/nftables.confd
+124
file added
nonsystemd/nftables-openrc/nftables.initd
+150
file added
nonsystemd/nftables-openrc/nftables.sh
-243
file removed
nonsystemd/notsystemd/0001-FSDG-man-Refer-to-the-operating-system-as-GNU-Linux.patch
-75
file removed
nonsystemd/notsystemd/0001-Use-Arch-Linux-device-access-groups.patch
-101
file removed
nonsystemd/notsystemd/0002-FSDG-os-release-Default-PRETTY_NAME-to-GNU-Linux-ins.patch
-40
file removed
nonsystemd/notsystemd/0003-FSDG-os-release-Default-NAME-to-GNU-Linux-instead-of.patch
-28
file removed
nonsystemd/notsystemd/0004-FSDG-os-release-Default-ID-to-gnu-linux-instead-of-l.patch
-30
file removed
nonsystemd/notsystemd/0005-FSDG-systemd-resolved-Fallback-hostname-to-gnu-linux.patch
-248
file removed
nonsystemd/notsystemd/0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch
-33
file removed
nonsystemd/notsystemd/0007-FSDG-bootctl-Say-Systemd-Boot-Manager-instead-of-Lin.patch
-334
file removed
nonsystemd/notsystemd/PKGBUILD
-22
file removed
nonsystemd/notsystemd/initcpio-hook-udev
-202
file removed
nonsystemd/notsystemd/initcpio-install-systemd
-29
file removed
nonsystemd/notsystemd/initcpio-install-udev
-1
file removed
nonsystemd/notsystemd/loader.conf
-7
file removed
nonsystemd/notsystemd/parabola.conf
-0
file removed
nonsystemd/notsystemd/splash-parabola.bmp
-10
file removed
nonsystemd/notsystemd/systemd-binfmt.hook
-11
file removed
nonsystemd/notsystemd/systemd-catalog.hook
-11
file removed
nonsystemd/notsystemd/systemd-daemon-reload.hook
-23
file removed
nonsystemd/notsystemd/systemd-hook
-11
file removed
nonsystemd/notsystemd/systemd-hwdb.hook
-10
file removed
nonsystemd/notsystemd/systemd-sysctl.hook
-10
file removed
nonsystemd/notsystemd/systemd-sysusers.hook
-10
file removed
nonsystemd/notsystemd/systemd-tmpfiles.hook
-11
file removed
nonsystemd/notsystemd/systemd-udev-reload.hook
-11
file removed
nonsystemd/notsystemd/systemd-update.hook
-5
file removed
nonsystemd/notsystemd/systemd-user.pam
-99
file removed
nonsystemd/notsystemd/systemd.install
-18
file removed
nonsystemd/notsystemd/udev-hook
-174
file removed
nonsystemd/openrc-desktop/PKGBUILD
-28
file removed
nonsystemd/openrc-desktop/avahi-dnsconfd.initd
-3
file removed
nonsystemd/openrc-desktop/displaymanager.install
-25
file removed
nonsystemd/openrc-desktop/startDM.sh
-13
file removed
nonsystemd/openrc-desktop/xdm-setup.initd
-10
file removed
nonsystemd/openrc-desktop/xdm.confd
-132
file removed
nonsystemd/openrc-desktop/xdm.initd
-136
file removed
nonsystemd/openrc-security/PKGBUILD
+37 -36
file changed
nonsystemd/polkit/PKGBUILD
-28
file removed
nonsystemd/polkit/elogind-configure-fix.patch
+24
file added
nonsystemd/polkit/meson-0.61.diff
+20
file added
nonsystemd/sddm-openrc/PKGBUILD
+17
file added
nonsystemd/sddm-openrc/sddm.initd
+22
file added
nonsystemd/tlp-openrc/PKGBUILD
+25
file added
nonsystemd/tlp-openrc/tlp.initd
+30
file added
nonsystemd/wpa_supplicant-openrc/PKGBUILD
+46
file added
nonsystemd/wpa_supplicant-openrc/wpa_cli.sh
+10
file added
nonsystemd/wpa_supplicant-openrc/wpa_supplicant.confd
+70
file added
nonsystemd/wpa_supplicant-openrc/wpa_supplicant.initd
+20
file added
nonsystemd/xdm-openrc/PKGBUILD
+16
file added
nonsystemd/xdm-openrc/xdm.initd
+5 -5
file changed
nonsystemd/your-initfreedom/PKGBUILD
+8 -9
file changed
pcr/gajim-plugin-omemo/PKGBUILD
+0 -0
file renamed
pcr-testing/gophernicus/PKGBUILD
pcr/gophernicus/PKGBUILD
+0 -0
file renamed
pcr-testing/gophernicus/fix-make-log-typo.patch
pcr/gophernicus/fix-make-log-typo.patch
+0 -0
file renamed
pcr-testing/gophernicus/gophernicus.install
pcr/gophernicus/gophernicus.install
+0 -0
file renamed
pcr-testing/gophernicus/preserve-existing-gophermap.patch
pcr/gophernicus/preserve-existing-gophermap.patch
+0 -0
file renamed
pcr-testing/gophernicus/remove-DESTDIR-from-initscripts.patch
pcr/gophernicus/remove-DESTDIR-from-initscripts.patch
+0 -0
file renamed
pcr-testing/gophernicus/xinetd-respect-custom-server-root.patch
pcr/gophernicus/xinetd-respect-custom-server-root.patch
-35
file removed
pcr/lcov/PKGBUILD
-37
file removed
pcr/lcov/fix-undef-behaviour.patch
-23
file removed
pcr/lcov/handle-equals-signs.patch
+9 -1
file changed
pcr/libreboot-utils/PKGBUILD
+85
file added
pcr/rtl8812au/PKGBUILD
+9
file added
pcr/rtl8812au/dkms.conf