_service

@@ -2,8 +2,8 @@
 	<service name="obs_scm" mode="manual">
 		<param name="scm">git</param>
 		<param name="url">https://github.com/bitwarden/clients.git</param>
-		<param name="revision">desktop-v2024.10.0</param>
+		<param name="revision">desktop-v2024.8.2</param>
-		<param name="version">2024.10.0</param>
+		<param name="version">2024.8.2</param>
 		<param name="filename">bitwarden</param>
 		<param name="exclude">bitwarden_license/*</param>
    <!-- The code in bitwarden_license MUST NOT be included in published tarballs as it is non-redistributable! -->

bitwarden-2024.10.0.obscpio

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:26b5c39cde7b9bc25a503ec8ef9fcfde7e262b00ebd01a2c9967a3c1e3ff3172
-size 43877901

bitwarden-2024.8.2.obscpio

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:69fdfe866a500de39e5044fe31b392ede84ddd8786d8f70f3ae358a2230126a5
+size 41812493

bitwarden.changes

@@ -1,18 +1,3 @@
--------------------------------------------------------------------
-Fri Oct 25 20:27:27 UTC 2024 - Bruno Pitrus <brunopitrus@hotmail.com>
-
-- New upstream release 2024.10.0
-  * no changelog provided
-- Add native-messaging.main-fix-path.patch
-- Remove a temporarily-nonfree new dependency that is currently dead code (gh#bitwarden/clients#11611)
-  * add remove-sdk-internal.patch
-
--------------------------------------------------------------------
-Thu Sep 19 17:13:10 UTC 2024 - Bruno Pitrus <brunopitrus@hotmail.com>
-
-- New upstream release 2024.9.0
-  * no changelog provided
-
 -------------------------------------------------------------------
 Thu Sep 12 14:39:24 UTC 2024 - Bruno Pitrus <brunopitrus@hotmail.com>
 

bitwarden.obsinfo

@@ -1,4 +1,4 @@
 name: bitwarden
-version: 2024.10.0
+version: 2024.8.2
-mtime: 1729194341
+mtime: 1725557694
-commit: 0074d2f49ef4712920a13755ab07217ea1e57fd6
+commit: 0a3cf4772e79f8acbc297adcae6b39802ebb9eae

bitwarden.spec

@@ -22,7 +22,7 @@
 
 
 Name:       bitwarden
-Version:    2024.10.0
+Version:    2024.8.2
 Release:    0
 Summary:    A secure and free password manager for all of your devices
 Group:      Productivity/Security
@@ -61,10 +61,7 @@ Patch5:    remove-argon2-browser.patch
 Patch7:    bug-reporting-url.patch
 Patch8:    no-sourcemaps.patch
 Patch9:    main-getPath-exe.patch
-Patch10:   native-messaging.main-fix-path.patch
 
-#patches to remove stuff we do not want
-Patch500:  remove-sdk-internal.patch
 
 #patches to use system libs
 Patch1000: system-libargon2.patch
@@ -130,9 +127,6 @@ Bitwarden is a free and open-source password management service that stores sens
 %prep
 %autosetup -p1 -a1
 
-#fix exe path
-sed -i 's[XXXLIBDIRXXX[%{_libdir}[g' apps/desktop/src/main/native-messaging.main.ts
-
 
 # Remove unused postinstall script (electron-rebuild)
 sed -i '/"postinstall":/d' apps/desktop/package.json
@@ -193,7 +187,6 @@ auditable='auditable -vv'
 cd apps/desktop
 pushd desktop_native
 cargo -vv $auditable rustc --offline --release --package desktop_napi --lib --crate-type cdylib
-RUSTFLAGS="$RUSTFLAGS -Crelocation-model=pie" cargo -vv $auditable rustc --offline --release --package desktop_proxy --bin desktop_proxy
 popd
 
 npm run build
@@ -204,7 +197,6 @@ cd build
 mkdir -pv node_modules/@bitwarden/desktop-napi
 cp -plv ../desktop_native/napi/{package.json,index.js} -t node_modules/@bitwarden/desktop-napi
 cp -plvT ../desktop_native/target/release/*.so node_modules/@bitwarden/desktop-napi/desktop_napi.node
-cp -plv -t . ../desktop_native/target/release/desktop_proxy
 rm -fv ../../../node_modules/argon2/build-tmp-napi-v3/node_gyp_bins/python3
 cp -plvr ../../../node_modules/argon2 -t node_modules/
 cp -plvr ../../../node_modules/node-gyp-build -t node_modules/
@@ -266,7 +258,6 @@ find -name '.gitignore' -type f -print -delete
 #Fix file mode
 find . -type f -exec chmod 644 {} \;
 find . -name '*.node' -exec chmod 755 {} \;
-chmod 755 desktop_proxy
 
 # Remove empty directories
 find . -type d -empty -print -delete

main-getPath-exe.patch

@@ -1,11 +1,11 @@
---- clients/apps/desktop/src/main.ts.orig	2024-10-17 19:47:51.775405137 +0200
+--- bitwarden-2024.8.2/apps/desktop/src/main.ts.orig	2024-09-05 19:34:54.000000000 +0200
-+++ clients/apps/desktop/src/main.ts	2024-10-17 21:04:06.768260922 +0200
++++ bitwarden-2024.8.2/apps/desktop/src/main.ts	2024-09-12 16:26:40.135229235 +0200
-@@ -231,7 +231,7 @@ export class Main {
+@@ -218,7 +218,7 @@ export class Main {
        this.logService,
        this.windowMain,
        app.getPath("userData"),
 -      app.getPath("exe"),
 +      '/usr/bin/bitwarden-desktop',
-       app.getAppPath(),
      );
  
+     this.desktopAutofillSettingsService = new DesktopAutofillSettingsService(stateProvider);

native-messaging.main-fix-path.patch

@@ -1,30 +0,0 @@
---- bitwarden-2024.10.0/apps/desktop/src/main/native-messaging.main.ts.orig	2024-10-17 21:45:41.000000000 +0200
-+++ bitwarden-2024.10.0/apps/desktop/src/main/native-messaging.main.ts	2024-10-25 22:25:27.180541673 +0200
-@@ -328,26 +328,7 @@ export class NativeMessagingMain {
-   }
- 
-   private binaryPath() {
--    const ext = process.platform === "win32" ? ".exe" : "";
--
--    if (isDev()) {
--      const devPath = path.join(
--        this.appPath,
--        "..",
--        "desktop_native",
--        "target",
--        "debug",
--        `desktop_proxy${ext}`,
--      );
--
--      // isDev() returns true when using a production build with ELECTRON_IS_DEV=1,
--      // so we need to fall back to the prod binary if the dev binary doesn't exist.
--      if (existsSync(devPath)) {
--        return devPath;
--      }
--    }
--
--    return path.join(path.dirname(this.exePath), `desktop_proxy${ext}`);
-+    return 'XXXLIBDIRXXX/bitwarden/desktop_proxy'
-   }
- 
-   private getRegeditInstance() {

remove-argon2-browser.patch

@@ -2,32 +2,32 @@ Remove dependency on argon-browser2 which should be dead code after https://gith
 We used to path this to use node_modules/argon2 but cannot anymore due to sandbox now being enabled; fortunately, upstream at the same time moved the crypto to main process.
 Therefore the WASM implementation in web-crypto-function should be dead code now and can be removed because we do not want to compile WASM.
 
---- clients/apps/desktop/webpack.renderer.js.orig	2024-10-17 19:47:51.805420136 +0200
+--- bitwarden/apps/desktop/webpack.renderer.js.old	2023-02-15 19:02:44.000000000 +0100
-+++ clients/apps/desktop/webpack.renderer.js	2024-10-17 21:00:08.105664818 +0200
++++ bitwarden/apps/desktop/webpack.renderer.js	2023-02-18 18:41:53.074156675 +0100
-@@ -41,11 +41,6 @@ const common = {
+@@ -40,11 +40,6 @@
          },
          type: "asset/resource",
        },
 -      {
--        test: /argon2(-simd)?\.wasm$/,
+-        test: /\.wasm$/,
 -        loader: "base64-loader",
 -        type: "javascript/auto",
 -      },
      ],
    },
    plugins: [],
-@@ -142,11 +137,6 @@ const renderer = {
+@@ -127,11 +122,6 @@
          test: /[\/\\]@angular[\/\\].+\.js$/,
          parser: { system: true },
        },
 -      {
--        test: /argon2(-simd)?\.wasm$/,
+-        test: /\.wasm$/,
 -        loader: "base64-loader",
 -        type: "javascript/auto",
 -      },
      ],
-     noParse: /argon2(-simd)?\.wasm$/,
    },
+   plugins: [
 --- a/libs/common/src/platform/services/web-crypto-function.service.ts
 +++ b/libs/common/src/platform/services/web-crypto-function.service.ts
 @@ -1,4 +1,3 @@

remove-sdk-internal.patch

@@ -1,106 +0,0 @@
-https://github.com/bitwarden/sdk-internal might be now free software
-but we currently don't want to build it as it's a huge WASM blob that is not currently used for anything.
-This patch will be removed once some _actual_ JS functionality gets migrated to wasm
-
---- bitwarden-2024.10.0/apps/desktop/config/base.json.orig	2024-10-17 21:45:41.000000000 +0200
-+++ bitwarden-2024.10.0/apps/desktop/config/base.json	2024-10-25 21:36:08.368540114 +0200
-@@ -1,6 +1,6 @@
- {
-   "flags": {
--    "sdk": true
-+    "sdk": false
-   },
-   "devFlags": {}
- }
---- bitwarden-2024.10.0/apps/desktop/src/app/services/services.module.ts.orig	2024-10-17 21:45:41.000000000 +0200
-+++ bitwarden-2024.10.0/apps/desktop/src/app/services/services.module.ts	2024-10-25 18:50:26.084318326 +0200
-@@ -61,7 +61,6 @@ import { Message, MessageListener, Messa
- import { SubjectMessageSender } from "@bitwarden/common/platform/messaging/internal";
- import { TaskSchedulerService } from "@bitwarden/common/platform/scheduling";
- import { MemoryStorageService } from "@bitwarden/common/platform/services/memory-storage.service";
--import { DefaultSdkClientFactory } from "@bitwarden/common/platform/services/sdk/default-sdk-client-factory";
- import { NoopSdkClientFactory } from "@bitwarden/common/platform/services/sdk/noop-sdk-client-factory";
- import { SystemService } from "@bitwarden/common/platform/services/system.service";
- import { GlobalStateProvider, StateProvider } from "@bitwarden/common/platform/state";
-@@ -308,7 +307,7 @@ const safeProviders: SafeProvider[] = [
-   }),
-   safeProvider({
-     provide: SdkClientFactory,
--    useClass: flagEnabled("sdk") ? DefaultSdkClientFactory : NoopSdkClientFactory,
-+    useClass: NoopSdkClientFactory,
-     deps: [],
-   }),
- ];
---- bitwarden-2024.10.0/libs/common/src/platform/abstractions/sdk/sdk.service.ts.orig	2024-10-17 21:45:41.000000000 +0200
-+++ bitwarden-2024.10.0/libs/common/src/platform/abstractions/sdk/sdk.service.ts	2024-10-25 21:29:50.614089204 +0200
-@@ -1,9 +1,8 @@
- import { Observable } from "rxjs";
- 
--import { BitwardenClient } from "@bitwarden/sdk-internal";
- 
- export abstract class SdkService {
--  client$: Observable<BitwardenClient>;
-+  client$: Observable<any>;
-   supported$: Observable<boolean>;
- 
-   abstract failedToInitialize(): Promise<void>;
---- bitwarden-2024.10.0/libs/common/src/platform/abstractions/sdk/sdk-client-factory.ts.orig	2024-10-17 21:45:41.000000000 +0200
-+++ bitwarden-2024.10.0/libs/common/src/platform/abstractions/sdk/sdk-client-factory.ts	2024-10-25 21:32:14.591461794 +0200
-@@ -1,10 +1,9 @@
--import type { BitwardenClient } from "@bitwarden/sdk-internal";
- 
- /**
-  * Factory for creating SDK clients.
-  */
- export abstract class SdkClientFactory {
-   abstract createSdkClient(
--    ...args: ConstructorParameters<typeof BitwardenClient>
--  ): Promise<BitwardenClient>;
-+    ...args: ConstructorParameters<any>
-+  ): Promise<any>;
- }
---- bitwarden-2024.10.0/libs/common/src/platform/services/sdk/noop-sdk-client-factory.ts.orig	2024-10-17 21:45:41.000000000 +0200
-+++ bitwarden-2024.10.0/libs/common/src/platform/services/sdk/noop-sdk-client-factory.ts	2024-10-25 21:41:45.940577943 +0200
-@@ -1,4 +1,3 @@
--import type { BitwardenClient } from "@bitwarden/sdk-internal";
- 
- import { SdkClientFactory } from "../../abstractions/sdk/sdk-client-factory";
- 
-@@ -9,8 +8,8 @@ import { SdkClientFactory } from "../../
-  */
- export class NoopSdkClientFactory implements SdkClientFactory {
-   createSdkClient(
--    ...args: ConstructorParameters<typeof BitwardenClient>
--  ): Promise<BitwardenClient> {
-+    ...args: ConstructorParameters<any>
-+  ): Promise<any> {
-     return Promise.reject(new Error("SDK not available"));
-   }
- }
---- bitwarden-2024.10.0/libs/common/src/platform/services/sdk/default-sdk.service.ts.orig	2024-10-17 21:45:41.000000000 +0200
-+++ bitwarden-2024.10.0/libs/common/src/platform/services/sdk/default-sdk.service.ts	2024-10-25 22:08:02.781934761 +0200
-@@ -1,6 +1,5 @@
- import { concatMap, firstValueFrom, shareReplay } from "rxjs";
- 
--import { LogLevel, DeviceType as SdkDeviceType } from "@bitwarden/sdk-internal";
- 
- import { ApiService } from "../../../abstractions/api.service";
- import { DeviceType } from "../../../enums/device-type.enum";
-@@ -19,7 +18,7 @@ export class DefaultSdkService implement
-         userAgent: this.userAgent ?? navigator.userAgent,
-       };
- 
--      return await this.sdkClientFactory.createSdkClient(settings, LogLevel.Info);
-+      return await this.sdkClientFactory.createSdkClient(settings, 'unused');
-     }),
-     shareReplay({ refCount: true, bufferSize: 1 }),
-   );
-@@ -52,7 +51,7 @@ export class DefaultSdkService implement
-     });
-   }
- 
--  private toDevice(device: DeviceType): SdkDeviceType {
-+  private toDevice(device: DeviceType): any {
-     switch (device) {
-       case DeviceType.Android:
-         return "Android";

remove-unnecessary-deps.patch

@@ -1,7 +1,7 @@
 @types/semver and path-browserify is normally included transitively by storybook which we delete, adding it here explicitely because it is needed for build
 
---- clients-desktop-v2024.10.0/package.json.orig	2024-10-17 19:25:36.768284926 +0200
+--- clients/package.json.orig	2024-07-15 19:10:38.711610685 +0200
-+++ clients-desktop-v2024.10.0/package.json	2024-10-17 19:42:05.732483029 +0200
++++ clients/package.json	2024-07-15 19:25:13.322024338 +0200
 @@ -13,7 +13,6 @@
    },
    "homepage": "https://bitwarden.com",
@@ -19,7 +19,7 @@
    },
    "workspaces": [
      "apps/*",
-@@ -35,117 +34,45 @@
+@@ -35,120 +34,44 @@
    ],
    "devDependencies": {
      "@angular-devkit/build-angular": "16.2.14",
@@ -29,24 +29,24 @@
 -    "@angular/cli": "16.2.14",
      "@angular/compiler-cli": "16.2.12",
 -    "@angular/elements": "16.2.12",
-     "@babel/core": "7.24.9",
+-    "@babel/core": "^7.24.6",
-     "@babel/preset-env": "7.24.8",
+     "@babel/preset-env": "^7.24.6",
 -    "@compodoc/compodoc": "1.1.25",
--    "@electron/notarize": "2.5.0",
+-    "@electron/notarize": "2.3.0",
 -    "@electron/rebuild": "3.6.0",
      "@ngtools/webpack": "16.2.14",
--    "@storybook/addon-a11y": "8.2.9",
+-    "@storybook/addon-a11y": "7.6.19",
--    "@storybook/addon-actions": "8.2.9",
+-    "@storybook/addon-actions": "7.6.19",
--    "@storybook/addon-designs": "8.0.3",
+-    "@storybook/addon-designs": "7.0.9",
--    "@storybook/addon-essentials": "8.2.9",
+-    "@storybook/addon-essentials": "7.6.19",
--    "@storybook/addon-interactions": "8.2.9",
+-    "@storybook/addon-interactions": "7.6.19",
--    "@storybook/addon-links": "8.2.9",
+-    "@storybook/addon-links": "7.6.19",
--    "@storybook/angular": "8.2.9",
+-    "@storybook/angular": "7.6.19",
--    "@storybook/manager-api": "8.2.9",
+-    "@storybook/jest": "0.2.3",
--    "@storybook/theming": "8.2.9",
+-    "@storybook/testing-library": "0.2.2",
 -    "@types/argon2-browser": "1.18.4",
--    "@types/chrome": "0.0.272",
+-    "@types/chrome": "0.0.262",
--    "@types/firefox-webext-browser": "120.0.4",
+-    "@types/firefox-webext-browser": "111.0.5",
 -    "@types/inquirer": "8.2.10",
      "@types/jest": "29.5.12",
 -    "@types/jquery": "3.5.30",
@@ -58,34 +58,35 @@
 -    "@types/koa-json": "2.0.23",
 -    "@types/lowdb": "1.0.15",
      "@types/lunr": "2.3.7",
-     "@types/node": "20.16.10",
+     "@types/node": "20.14.8",
 -    "@types/node-fetch": "2.6.4",
      "@types/node-forge": "1.3.11",
      "@types/node-ipc": "9.2.3",
      "@types/papaparse": "5.3.14",
 -    "@types/proper-lockfile": "4.1.4",
+-    "@types/react": "16.14.60",
 -    "@types/retry": "0.12.5",
 +    "@types/semver": "^7.3.4",
-     "@types/zxcvbn": "4.4.5",
+     "@types/zxcvbn": "4.4.4",
 -    "@typescript-eslint/eslint-plugin": "7.16.1",
 -    "@typescript-eslint/parser": "7.16.1",
 -    "@webcomponents/custom-elements": "1.6.0",
--    "@yao-pkg/pkg": "5.14.0",
+-    "@yao-pkg/pkg": "^5.12.0",
-     "autoprefixer": "10.4.20",
+     "autoprefixer": "10.4.19",
--    "babel-loader": "9.1.3",
+-    "babel-loader": "^9.1.3",
 -    "base64-loader": "1.0.0",
--    "browserslist": "4.23.2",
+-    "browserslist": "^4.23.0",
--    "chromatic": "11.10.2",
+-    "chromatic": "10.9.6",
-     "concurrently": "9.0.1",
+     "concurrently": "8.2.2",
      "copy-webpack-plugin": "12.0.2",
      "cross-env": "7.0.3",
-     "css-loader": "7.1.2",
+     "css-loader": "6.10.0",
-     "electron": "32.1.1",
+     "electron": "31.3.1",
 -    "electron-builder": "24.13.3",
      "electron-log": "5.0.1",
 -    "electron-reload": "2.0.0-alpha.1",
      "electron-store": "8.2.0",
-     "electron-updater": "6.3.4",
+     "electron-updater": "6.1.8",
 -    "eslint": "8.57.0",
 -    "eslint-config-prettier": "9.1.0",
 -    "eslint-import-resolver-typescript": "3.6.1",
@@ -108,31 +109,33 @@
      "jest-mock-extended": "3.0.7",
 -    "jest-preset-angular": "14.1.1",
 -    "lint-staged": "15.2.8",
-     "mini-css-extract-plugin": "2.9.1",
+     "mini-css-extract-plugin": "2.8.1",
      "node-ipc": "9.2.1",
 +    "path-browserify": "^1.0.1",
      "postcss": "8.4.38",
      "postcss-loader": "8.1.1",
 -    "prettier": "3.3.3",
--    "prettier-plugin-tailwindcss": "0.6.8",
+-    "prettier-plugin-tailwindcss": "0.6.5",
 -    "process": "0.11.10",
-     "regedit": "3.0.3",
+-    "react": "18.3.1",
--    "remark-gfm": "4.0.0",
+-    "react-dom": "18.3.1",
+     "regedit": "^3.0.3",
+-    "remark-gfm": "3.0.1",
      "rimraf": "6.0.1",
      "sass": "1.74.1",
-     "sass-loader": "16.0.1",
+     "sass-loader": "14.2.1",
--    "storybook": "8.2.9",
+-    "storybook": "7.6.19",
 -    "style-loader": "3.3.4",
--    "tailwindcss": "3.4.11",
+-    "tailwindcss": "3.4.3",
 -    "ts-jest": "29.2.2",
      "ts-loader": "9.5.1",
      "tsconfig-paths-webpack-plugin": "4.1.0",
 -    "type-fest": "2.19.0",
      "typescript": "5.1.6",
-     "url": "0.11.4",
+     "url": "0.11.3",
 -    "util": "0.12.5",
--    "wait-on": "8.0.1",
+-    "wait-on": "7.2.0",
-     "webpack": "5.94.0",
+     "webpack": "5.93.0",
 -    "webpack-cli": "5.1.4",
 -    "webpack-dev-server": "5.0.4",
 -    "webpack-node-externals": "3.0.0"
@@ -140,12 +143,10 @@
    },
    "dependencies": {
      "@angular/animations": "16.2.12",
-@@ -157,57 +84,28 @@
+@@ -160,55 +83,28 @@
      "@angular/platform-browser": "16.2.12",
      "@angular/platform-browser-dynamic": "16.2.12",
      "@angular/router": "16.2.12",
--    "@bitwarden/sdk-internal": "0.1.3",
--    "@electron/fuses": "1.8.0",
 -    "@koa/multer": "3.0.2",
 -    "@koa/router": "12.0.1",
      "@microsoft/signalr": "8.0.7",
@@ -153,19 +154,19 @@
      "@ng-select/ng-select": "11.2.0",
      "argon2": "0.40.1",
 -    "argon2-browser": "1.18.0",
-     "big-integer": "1.6.52",
+     "big-integer": "1.6.51",
 -    "bootstrap": "4.6.0",
--    "braintree-web-drop-in": "1.43.0",
+-    "braintree-web-drop-in": "1.42.0",
      "buffer": "6.0.3",
 -    "bufferutil": "4.0.8",
 -    "chalk": "4.1.2",
      "commander": "11.1.0",
 -    "core-js": "3.36.1",
 -    "form-data": "4.0.0",
--    "https-proxy-agent": "7.0.5",
+-    "https-proxy-agent": "7.0.2",
 -    "inquirer": "8.2.6",
 -    "jquery": "3.7.1",
--    "jsdom": "25.0.1",
+-    "jsdom": "24.1.1",
      "jszip": "3.10.1",
 -    "koa": "2.15.0",
 -    "koa-bodyparser": "4.4.1",
@@ -188,7 +189,7 @@
 -    "qrious": "4.0.2",
      "rxjs": "7.8.1",
 -    "tabbable": "6.2.0",
-     "tldts": "6.1.48",
+     "tldts": "6.1.38",
      "utf-8-validate": "6.0.4",
      "zone.js": "0.13.3",
      "zxcvbn": "4.4.2"
@@ -198,14 +199,14 @@
      "@storybook/angular": {
        "zone.js": "$zone.js"
      },
---- clients-desktop-v2024.10.0/apps/desktop/desktop_native/napi/package.json.orig	2024-10-17 19:25:31.222180130 +0200
+--- clients/apps/desktop/desktop_native/napi/package.json.orig	2024-07-15 19:10:33.919215714 +0200
-+++ clients-desktop-v2024.10.0/apps/desktop/desktop_native/napi/package.json	2024-10-17 19:43:45.262219326 +0200
++++ clients/apps/desktop/desktop_native/napi/package.json	2024-07-15 19:25:13.322024338 +0200
-@@ -8,9 +8,6 @@
+@@ -10,9 +10,6 @@
    },
    "author": "",
    "license": "GPL-3.0",
 -  "devDependencies": {
--    "@napi-rs/cli": "2.18.4"
+-    "@napi-rs/cli": "2.16.2"
 -  },
    "napi": {
      "name": "desktop_napi",

vendor.tar.zst

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a7d9a45904752aa44bff0ad0f79f1d055b9b264ec6ee72e14a1bbe334ea6119e
+oid sha256:f336dcd548f1fdb65092ee8a86923674ff41284044c96835b5e9693f1e89f9bf
-size 43653045
+size 43032335