openSUSE Commits
Threads by month
- ----- 2024 -----
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
October 2024
- 1 participants
- 1410 discussions
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package bitwarden for openSUSE:Factory checked in at 2024-10-27 11:25:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/bitwarden (Old)
and /work/SRC/openSUSE:Factory/.bitwarden.new.2020 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "bitwarden"
Sun Oct 27 11:25:37 2024 rev:35 rq:1218451 version:2024.10.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/bitwarden/bitwarden.changes 2024-09-20 17:12:32.569058885 +0200
+++ /work/SRC/openSUSE:Factory/.bitwarden.new.2020/bitwarden.changes 2024-10-27 11:26:10.788654783 +0100
@@ -1,0 +2,9 @@
+Fri Oct 25 20:27:27 UTC 2024 - Bruno Pitrus <brunopitrus(a)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
+
+-------------------------------------------------------------------
Old:
----
bitwarden-2024.9.0.obscpio
New:
----
bitwarden-2024.10.0.obscpio
native-messaging.main-fix-path.patch
remove-sdk-internal.patch
BETA DEBUG BEGIN:
New: * 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)
New:- Remove a temporarily-nonfree new dependency that is currently dead code (gh#bitwarden/clients#11611)
* add remove-sdk-internal.patch
BETA DEBUG END:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ bitwarden.spec ++++++
--- /var/tmp/diff_new_pack.SMiwfN/_old 2024-10-27 11:26:13.552769362 +0100
+++ /var/tmp/diff_new_pack.SMiwfN/_new 2024-10-27 11:26:13.552769362 +0100
@@ -22,7 +22,7 @@
Name: bitwarden
-Version: 2024.9.0
+Version: 2024.10.0
Release: 0
Summary: A secure and free password manager for all of your devices
Group: Productivity/Security
@@ -61,7 +61,10 @@
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
@@ -127,6 +130,9 @@
%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
@@ -187,6 +193,7 @@
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
@@ -197,6 +204,7 @@
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/(a)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/
@@ -258,6 +266,7 @@
#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
++++++ _service ++++++
--- /var/tmp/diff_new_pack.SMiwfN/_old 2024-10-27 11:26:13.600771352 +0100
+++ /var/tmp/diff_new_pack.SMiwfN/_new 2024-10-27 11:26:13.604771518 +0100
@@ -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.9.0</param>
- <param name="version">2024.9.0</param>
+ <param name="revision">desktop-v2024.10.0</param>
+ <param name="version">2024.10.0</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.9.0.obscpio -> bitwarden-2024.10.0.obscpio ++++++
/work/SRC/openSUSE:Factory/bitwarden/bitwarden-2024.9.0.obscpio /work/SRC/openSUSE:Factory/.bitwarden.new.2020/bitwarden-2024.10.0.obscpio differ: char 48, line 1
++++++ bitwarden.obsinfo ++++++
--- /var/tmp/diff_new_pack.SMiwfN/_old 2024-10-27 11:26:13.648773341 +0100
+++ /var/tmp/diff_new_pack.SMiwfN/_new 2024-10-27 11:26:13.652773507 +0100
@@ -1,5 +1,5 @@
name: bitwarden
-version: 2024.9.0
-mtime: 1726620110
-commit: 601c13ae1b5ea45c1a47426c9adf190a14ebbd59
+version: 2024.10.0
+mtime: 1729194341
+commit: 0074d2f49ef4712920a13755ab07217ea1e57fd6
++++++ main-getPath-exe.patch ++++++
--- /var/tmp/diff_new_pack.SMiwfN/_old 2024-10-27 11:26:13.688774999 +0100
+++ /var/tmp/diff_new_pack.SMiwfN/_new 2024-10-27 11:26:13.692775165 +0100
@@ -1,12 +1,12 @@
---- bitwarden-2024.8.2/apps/desktop/src/main.ts.orig 2024-09-05 19:34:54.000000000 +0200
-+++ bitwarden-2024.8.2/apps/desktop/src/main.ts 2024-09-12 16:26:40.135229235 +0200
-@@ -218,7 +218,7 @@ export class Main {
+--- clients/apps/desktop/src/main.ts.orig 2024-10-17 19:47:51.775405137 +0200
++++ clients/apps/desktop/src/main.ts 2024-10-17 21:04:06.768260922 +0200
+@@ -231,7 +231,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 ++++++
--- 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 ++++++
--- /var/tmp/diff_new_pack.SMiwfN/_old 2024-10-27 11:26:13.728776658 +0100
+++ /var/tmp/diff_new_pack.SMiwfN/_new 2024-10-27 11:26:13.728776658 +0100
@@ -2,32 +2,32 @@
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.
---- bitwarden/apps/desktop/webpack.renderer.js.old 2023-02-15 19:02:44.000000000 +0100
-+++ bitwarden/apps/desktop/webpack.renderer.js 2023-02-18 18:41:53.074156675 +0100
-@@ -40,11 +40,6 @@
+--- clients/apps/desktop/webpack.renderer.js.orig 2024-10-17 19:47:51.805420136 +0200
++++ clients/apps/desktop/webpack.renderer.js 2024-10-17 21:00:08.105664818 +0200
+@@ -41,11 +41,6 @@ const common = {
},
type: "asset/resource",
},
- {
-- test: /\.wasm$/,
+- test: /argon2(-simd)?\.wasm$/,
- loader: "base64-loader",
- type: "javascript/auto",
- },
],
},
plugins: [],
-@@ -127,11 +122,6 @@
+@@ -142,11 +137,6 @@ const renderer = {
test: /[\/\\](a)angular[\/\\].+\.js$/,
parser: { system: true },
},
- {
-- test: /\.wasm$/,
+- test: /argon2(-simd)?\.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 ++++++
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 ++++++
--- /var/tmp/diff_new_pack.SMiwfN/_old 2024-10-27 11:26:13.752777652 +0100
+++ /var/tmp/diff_new_pack.SMiwfN/_new 2024-10-27 11:26:13.756777818 +0100
@@ -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.9.0/package.json.orig
-+++ clients-desktop-v2024.9.0/package.json
+--- clients-desktop-v2024.10.0/package.json.orig 2024-10-17 19:25:36.768284926 +0200
++++ clients-desktop-v2024.10.0/package.json 2024-10-17 19:42:05.732483029 +0200
@@ -13,7 +13,6 @@
},
"homepage": "https://bitwarden.com",
@@ -32,7 +32,7 @@
"@babel/core": "7.24.9",
"@babel/preset-env": "7.24.8",
- "@compodoc/compodoc": "1.1.25",
-- "@electron/notarize": "2.4.0",
+- "@electron/notarize": "2.5.0",
- "@electron/rebuild": "3.6.0",
"@ngtools/webpack": "16.2.14",
- "@storybook/addon-a11y": "8.2.9",
@@ -45,8 +45,8 @@
- "@storybook/manager-api": "8.2.9",
- "@storybook/theming": "8.2.9",
- "@types/argon2-browser": "1.18.4",
-- "@types/chrome": "0.0.270",
-- "@types/firefox-webext-browser": "111.0.5",
+- "@types/chrome": "0.0.272",
+- "@types/firefox-webext-browser": "120.0.4",
- "@types/inquirer": "8.2.10",
"@types/jest": "29.5.12",
- "@types/jquery": "3.5.30",
@@ -58,7 +58,7 @@
- "@types/koa-json": "2.0.23",
- "@types/lowdb": "1.0.15",
"@types/lunr": "2.3.7",
- "@types/node": "20.16.4",
+ "@types/node": "20.16.10",
- "@types/node-fetch": "2.6.4",
"@types/node-forge": "1.3.11",
"@types/node-ipc": "9.2.3",
@@ -70,17 +70,17 @@
- "@typescript-eslint/eslint-plugin": "7.16.1",
- "@typescript-eslint/parser": "7.16.1",
- "@webcomponents/custom-elements": "1.6.0",
-- "@yao-pkg/pkg": "5.12.1",
+- "@yao-pkg/pkg": "5.14.0",
"autoprefixer": "10.4.20",
- "babel-loader": "9.1.3",
- "base64-loader": "1.0.0",
- "browserslist": "4.23.2",
-- "chromatic": "11.7.1",
- "concurrently": "8.2.2",
+- "chromatic": "11.10.2",
+ "concurrently": "9.0.1",
"copy-webpack-plugin": "12.0.2",
"cross-env": "7.0.3",
"css-loader": "7.1.2",
- "electron": "32.0.1",
+ "electron": "32.1.1",
- "electron-builder": "24.13.3",
"electron-log": "5.0.1",
- "electron-reload": "2.0.0-alpha.1",
@@ -108,30 +108,30 @@
"jest-mock-extended": "3.0.7",
- "jest-preset-angular": "14.1.1",
- "lint-staged": "15.2.8",
- "mini-css-extract-plugin": "2.8.1",
+ "mini-css-extract-plugin": "2.9.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.6",
+- "prettier-plugin-tailwindcss": "0.6.8",
- "process": "0.11.10",
- "regedit": "^3.0.3",
+ "regedit": "3.0.3",
- "remark-gfm": "4.0.0",
"rimraf": "6.0.1",
"sass": "1.74.1",
- "sass-loader": "14.2.1",
+ "sass-loader": "16.0.1",
- "storybook": "8.2.9",
- "style-loader": "3.3.4",
-- "tailwindcss": "3.4.10",
+- "tailwindcss": "3.4.11",
- "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.3",
+ "url": "0.11.4",
- "util": "0.12.5",
-- "wait-on": "8.0.0",
+- "wait-on": "8.0.1",
"webpack": "5.94.0",
- "webpack-cli": "5.1.4",
- "webpack-dev-server": "5.0.4",
@@ -140,10 +140,12 @@
},
"dependencies": {
"@angular/animations": "16.2.12",
-@@ -157,55 +84,28 @@
+@@ -157,57 +84,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",
@@ -151,7 +153,7 @@
"@ng-select/ng-select": "11.2.0",
"argon2": "0.40.1",
- "argon2-browser": "1.18.0",
- "big-integer": "1.6.51",
+ "big-integer": "1.6.52",
- "bootstrap": "4.6.0",
- "braintree-web-drop-in": "1.43.0",
"buffer": "6.0.3",
@@ -160,10 +162,10 @@
"commander": "11.1.0",
- "core-js": "3.36.1",
- "form-data": "4.0.0",
-- "https-proxy-agent": "7.0.2",
+- "https-proxy-agent": "7.0.5",
- "inquirer": "8.2.6",
- "jquery": "3.7.1",
-- "jsdom": "24.1.3",
+- "jsdom": "25.0.1",
"jszip": "3.10.1",
- "koa": "2.15.0",
- "koa-bodyparser": "4.4.1",
@@ -186,7 +188,7 @@
- "qrious": "4.0.2",
"rxjs": "7.8.1",
- "tabbable": "6.2.0",
- "tldts": "6.1.41",
+ "tldts": "6.1.48",
"utf-8-validate": "6.0.4",
"zone.js": "0.13.3",
"zxcvbn": "4.4.2"
@@ -196,14 +198,14 @@
"@storybook/angular": {
"zone.js": "$zone.js"
},
---- clients/apps/desktop/desktop_native/napi/package.json.orig 2024-07-15 19:10:33.919215714 +0200
-+++ clients/apps/desktop/desktop_native/napi/package.json 2024-07-15 19:25:13.322024338 +0200
-@@ -10,9 +10,6 @@
+--- clients-desktop-v2024.10.0/apps/desktop/desktop_native/napi/package.json.orig 2024-10-17 19:25:31.222180130 +0200
++++ clients-desktop-v2024.10.0/apps/desktop/desktop_native/napi/package.json 2024-10-17 19:43:45.262219326 +0200
+@@ -8,9 +8,6 @@
},
"author": "",
"license": "GPL-3.0",
- "devDependencies": {
-- "@napi-rs/cli": "2.16.2"
+- "@napi-rs/cli": "2.18.4"
- },
"napi": {
"name": "desktop_napi",
++++++ vendor.tar.zst ++++++
/work/SRC/openSUSE:Factory/bitwarden/vendor.tar.zst /work/SRC/openSUSE:Factory/.bitwarden.new.2020/vendor.tar.zst differ: char 7, line 1
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package trufflehog for openSUSE:Factory checked in at 2024-10-27 11:25:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/trufflehog (Old)
and /work/SRC/openSUSE:Factory/.trufflehog.new.2020 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "trufflehog"
Sun Oct 27 11:25:31 2024 rev:55 rq:1218439 version:3.82.13
Changes:
--------
--- /work/SRC/openSUSE:Factory/trufflehog/trufflehog.changes 2024-10-23 21:11:22.857451632 +0200
+++ /work/SRC/openSUSE:Factory/.trufflehog.new.2020/trufflehog.changes 2024-10-27 11:26:06.784488803 +0100
@@ -1,0 +2,19 @@
+Fri Oct 25 19:54:55 UTC 2024 - felix.niederwanger(a)suse.com
+
+- Update to version 3.82.13:
+ * Adds a logging section in the contributing guidelines (#3509)
+ * fix: fixed verifcation pattern logic for `bulksms` (#3478)
+ * Extend `algoliaadminkey` with additional checks (#3459)
+ * fix(deps): update module google.golang.org/api to v0.203.0 (#3497)
+ * fix: added correct api endpoint for verification & logic for Aeroworkflow (#3435)
+ * remove debug log (#3505)
+ * delete unused code (#3504)
+ * fix: added correct verification endpoint & validation logic for alegra (#3437)
+ * fix(deps): update module google.golang.org/api to v0.202.0 (#3496)
+ * chore: re-order log context fields (#3430)
+ * fix(deps): update module github.com/fatih/color to v1.18.0 (#3492)
+ * feat: validation & verification fix for apiscience to apimetrics (#3475)
+ * fix: fixed validation logic for `cannyio` (#3482)
+ * update error messages (#3490)
+
+-------------------------------------------------------------------
Old:
----
trufflehog-3.82.12.obscpio
New:
----
trufflehog-3.82.13.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ trufflehog.spec ++++++
--- /var/tmp/diff_new_pack.j4eg0y/_old 2024-10-27 11:26:07.752528930 +0100
+++ /var/tmp/diff_new_pack.j4eg0y/_new 2024-10-27 11:26:07.752528930 +0100
@@ -17,7 +17,7 @@
Name: trufflehog
-Version: 3.82.12
+Version: 3.82.13
Release: 0
Summary: CLI tool to find exposed secrets in source and archives
License: AGPL-3.0-or-later
++++++ _service ++++++
--- /var/tmp/diff_new_pack.j4eg0y/_old 2024-10-27 11:26:07.788530422 +0100
+++ /var/tmp/diff_new_pack.j4eg0y/_new 2024-10-27 11:26:07.792530588 +0100
@@ -3,7 +3,7 @@
<param name="url">https://github.com/trufflesecurity/trufflehog.git</param>
<param name="scm">git</param>
<param name="revision">main</param>
- <param name="version">v3.82.12</param>
+ <param name="version">v3.82.13</param>
<param name="versionrewrite-pattern">v(.*)</param>
<param name="changesgenerate">enable</param>
</service>
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.j4eg0y/_old 2024-10-27 11:26:07.816531583 +0100
+++ /var/tmp/diff_new_pack.j4eg0y/_new 2024-10-27 11:26:07.820531749 +0100
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/trufflesecurity/trufflehog.git</param>
- <param name="changesrevision">2d1dc73c9eb29d1a533fec59687df1ddcfc8a4c5</param></service></servicedata>
+ <param name="changesrevision">e5d138d824cac29d3e99d41ffcda9e2b7397d12d</param></service></servicedata>
(No newline at EOF)
++++++ trufflehog-3.82.12.obscpio -> trufflehog-3.82.13.obscpio ++++++
/work/SRC/openSUSE:Factory/trufflehog/trufflehog-3.82.12.obscpio /work/SRC/openSUSE:Factory/.trufflehog.new.2020/trufflehog-3.82.13.obscpio differ: char 46, line 1
++++++ trufflehog.obsinfo ++++++
--- /var/tmp/diff_new_pack.j4eg0y/_old 2024-10-27 11:26:07.864533573 +0100
+++ /var/tmp/diff_new_pack.j4eg0y/_new 2024-10-27 11:26:07.868533739 +0100
@@ -1,5 +1,5 @@
name: trufflehog
-version: 3.82.12
-mtime: 1729565646
-commit: 2d1dc73c9eb29d1a533fec59687df1ddcfc8a4c5
+version: 3.82.13
+mtime: 1729876274
+commit: e5d138d824cac29d3e99d41ffcda9e2b7397d12d
++++++ vendor.tar.gz ++++++
/work/SRC/openSUSE:Factory/trufflehog/vendor.tar.gz /work/SRC/openSUSE:Factory/.trufflehog.new.2020/vendor.tar.gz differ: char 5, line 1
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package labwc for openSUSE:Factory checked in at 2024-10-27 11:25:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/labwc (Old)
and /work/SRC/openSUSE:Factory/.labwc.new.2020 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "labwc"
Sun Oct 27 11:25:30 2024 rev:9 rq:1218441 version:0.8.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/labwc/labwc.changes 2024-08-26 22:13:11.357430842 +0200
+++ /work/SRC/openSUSE:Factory/.labwc.new.2020/labwc.changes 2024-10-27 11:26:05.680443038 +0100
@@ -1,0 +2,10 @@
+Fri Oct 25 20:07:15 UTC 2024 - Muhammad Akbar Yanuar Mantari <mantarimay(a)pm.me>
+
+- Update to version 0.8.1
+ * Add titlebar window icons and layout configuration
+ * Support for the cosmic-workspace protocol and the openbox
+ inspired client-list-combined-menu for a better user experience
+ with workspaces.
+- add libsfdo submodule: to enable titlebar window icons and layout
+
+-------------------------------------------------------------------
Old:
----
labwc-0.8.0.tar.gz
New:
----
labwc-0.8.1.tar.gz
libsfdo-v0.1.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ labwc.spec ++++++
--- /var/tmp/diff_new_pack.99i15o/_old 2024-10-27 11:26:06.288468242 +0100
+++ /var/tmp/diff_new_pack.99i15o/_new 2024-10-27 11:26:06.288468242 +0100
@@ -18,17 +18,20 @@
%bcond_with warp
%bcond_without xwayland
-%define sname wlroots
-%define sver 0.17.4
+%define swname wlroots
+%define swver 0.17.4
+%define slname libsfdo
+%define slver 0.1.3
Name: labwc
-Version: 0.8.0
+Version: 0.8.1
Release: 0
Summary: A Wayland window-stacking compositor
License: GPL-2.0-only
URL: https://github.com/labwc/labwc
Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
+Source1: https://gitlab.freedesktop.org/vyivel/libsfdo/-/archive/v%{slver}/%{slname}…
%if %{with warp}
-Source1: https://gitlab.freedesktop.org/wlroots/wlroots/-/archive/%{sver}/%{sname}-%…
+Source2: https://gitlab.freedesktop.org/wlroots/wlroots/-/archive/%{swver}/%{swname}…
Provides: bundled(wlroots)
BuildRequires: glslang-devel
BuildRequires: pkgconfig(egl)
@@ -87,12 +90,14 @@
%prep
%autosetup
-
%if %{with warp}
-mkdir subprojects/%{sname}
-tar -xf %{SOURCE1} --strip-components 1 -C subprojects/%{sname}
+mkdir subprojects/%{swname}
+tar -xf %{SOURCE2} --strip-components 1 -C subprojects/%{swname}
%endif
+mkdir subprojects/%{slname}
+tar -xf %{SOURCE1} --strip-components 1 -C subprojects/%{slname}
+
%build
%meson \
-Dman-pages=enabled \
@@ -118,6 +123,7 @@
%config(noreplace) %{_sysconfdir}/xdg/%{name}/menu.xml
%config(noreplace) %{_sysconfdir}/xdg/%{name}/rc.xml
%dir %{_datadir}/wayland-sessions
+%{_datadir}/xdg-desktop-portal
%{_datadir}/wayland-sessions/%{name}.desktop
%{_datadir}/icons/hicolor/scalable/apps/labwc*.svg
%{_mandir}/man?/%{name}*.?%{?ext_man}
++++++ labwc-0.8.0.tar.gz -> labwc-0.8.1.tar.gz ++++++
++++ 17246 lines of diff (skipped)
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package nvidia-jetson for openSUSE:Factory checked in at 2024-10-27 11:25:25
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/nvidia-jetson (Old)
and /work/SRC/openSUSE:Factory/.nvidia-jetson.new.2020 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nvidia-jetson"
Sun Oct 27 11:25:25 2024 rev:2 rq:1218417 version:36.4.0_20240912212859
Changes:
--------
--- /work/SRC/openSUSE:Factory/nvidia-jetson/nvidia-jetson.changes 2024-09-03 13:38:39.193539728 +0200
+++ /work/SRC/openSUSE:Factory/.nvidia-jetson.new.2020/nvidia-jetson.changes 2024-10-27 11:25:51.463853732 +0100
@@ -1,0 +2,240 @@
+Fri Oct 25 17:33:06 UTC 2024 - Stefan Dirsch <sndirsch(a)suse.com>
+
+- removed obsolete nv_repackager-no-sudo-use-bzip2.patch
+
+-------------------------------------------------------------------
+Fri Oct 25 16:20:26 UTC 2024 - Stefan Dirsch <sndirsch(a)suse.com>
+
+- splitted off packaging firmware to a separate source package
+ kernel-firmware-nvidia-jetson in order to separate license files
+- minor cleanup in specfile
+
+-------------------------------------------------------------------
+Fri Oct 25 12:39:21 UTC 2024 - Stefan Dirsch <sndirsch(a)suse.com>
+
+- 'nvethernet' considered stable now; instead blacklist upstream
+ 'dwmac_tegra'; use a separate modprobe.d snippet for this and
+ move it to -extra KMP, since 'nvethernet' is part of -extra
+ package
+
+-------------------------------------------------------------------
+Fri Oct 25 10:33:26 UTC 2024 - Stefan Dirsch <sndirsch(a)suse.com>
+
+- modprobe.d snippet
+ * on SLE Micro 6.0 remove 'tegra_drm' before loading 'nvidia'
+ module, then load it again (using systemd service file for
+ loading "nvidia-drm" doesn't work on SLE Micro 6.0 for some
+ reason)
+- use SUSE-Firmware as license tag for firmware package
+
+-------------------------------------------------------------------
+Wed Oct 23 11:25:42 UTC 2024 - Stefan Dirsch <sndirsch(a)suse.com>
+
+- dracut-crash-fix.patch
+ * fix for tegra-se module, which triggered dracut to crash
+
+-------------------------------------------------------------------
+Tue Oct 15 19:56:03 UTC 2024 - Stefan Dirsch <sndirsch(a)suse.com>
+
+- fixed sed command syntax in %post
+
+-------------------------------------------------------------------
+Tue Oct 15 19:29:00 UTC 2024 - Stefan Dirsch <sndirsch(a)suse.com>
+
+- fixed preset file
+
+-------------------------------------------------------------------
+Tue Oct 15 17:24:18 UTC 2024 - Stefan Dirsch <sndirsch(a)suse.com>
+
+- exclude systemd service and preset files for loading
+ "nvidia-drm" from firmware package file section to avoid a
+ conflict between firmware package and KMPs
+
+-------------------------------------------------------------------
+Tue Oct 15 17:08:55 UTC 2024 - Stefan Dirsch <sndirsch(a)suse.com>
+
+- removed modules-load.d snippet, which loaded "nvidia" already
+ in initrd
+- use systemd service file for loading "nvidia-drm" and all
+ depending modules before desktop starts
+- enable above systemd service by a systemd preset file
+- nvidia-drm options:
+ * switch from "modeset=0" to "modeset=1 fbdev=1"
+ * stay with "modeset=0" for IGX (patched during installation
+ using dmidecode to detect IGX hardware)
+- dracut.d snippet: keep nvidia modules out of initrd
+- removed obsolete micro6-kernel.patch
+
+-------------------------------------------------------------------
+Fri Oct 11 11:33:53 UTC 2024 - Stefan Dirsch <sndirsch(a)suse.com>
+
+- 36.3.0/Jetpack 6.1 release (36.4.0-20240912212859)
+- updated source tarballs to git tag l4t-l4t-r36.4_eng_2024-09-12
+ * nvidia-oot
+ + drivers: spi: update misc register programming.
+ + rtl8822ce: Disable debug prints
+ + crypto: fix crypto_engine_ctx build error
+ + crypto: tegra: Fix size of buffer allocated
+ + rtl8822ce: Add Nvidia changes on v5.14.0.4-250
+ + rtl8822ce: Add driver version v5.14.0.4-250
+ + driver: platform: tegra: remove pfn_valid usage
+ + crypto: tegra: Align with upstream
+ + driver: platform: tegra: handle error path
+ + camera: Fix v4l2-compliance test fails
+ + vi5: camera: move allow_signal to dequeue
+ + scripts: conftest: Fix of_property_for_each_u32 test
+ + host1x-fence: Remove callback and cancel fence
+ + misc: mods: Disable MODS for Linux v6.11
+ + drivers: Fix bus->match for Linux v6.11
+ + drivers: pva: Fix build for Linux v6.11
+ + hwmon: f75308: Fix build for Linux v6.11
+ + block: virtual-storage: Disable for Linux v6.11
+ + ASoC: tegra: Fix redefinition error for Linux v6.11
+ + ASoC: tegra: Fix build for Linux v6.11
+ + nvmap: Implement nvmap_page_mapcount()
+ + gpu: host1x: Increase pushbuffer slots to 1023
+ + media: i2c: fix IMX390 SDR mode corruption
+ + host1x-fence:Free the kzalloc mem
+ + net: nvethernet: Fix build for Linux v6.11
+ + media: camera: Use of_pwm_xlate_with_flags()
+ + camera: add SBGGR12 color format
+ + vi5: camera: add ovrride capture timeout control
+ + nvethernet:Fix cbb error when ifconfig down
+ + media: camera: Fix crash in sensor drivers
+ + pci: Port pci-epf-tegra-vnet to support 5.14.0
+ + net: realtek: Add option to disable drivers
+ + trace: Fix build for Linux v6.10
+ + bt: realtek: Fix potential buffer overflow in cfg_list_item struct
+ + rtcpu: Port IVC bus driver to use iosys-map utils
+ + r8126: Enable support for RSS
+ + ethernet: Add dummy driver for r8126
+ + r8126: Add r8126 driver version 10.013.00-NAPI-PTP
+ + ethernet: Add dummy driver for r8126
+ + r8126: Change file permissions of source files
+ + r8126: Add r8126 driver version 10.013.00
+ + ethernet: Add dummy driver for r8168
+ + PCI: EPF: tvnet: disable the edma interrupt
+ + nvethernet: macsec: Add module param for macsec.
+ + gpu: host1x: Handle CDMA wraparound when debug printing
+ + r8168: Replace kernel version checks with conftest
+ + r8168: Disable 10M EEE
+ + r8168: Fix -20C 10mbps failure in Mods test
+ + r8168: Change file permissions of source files
+ + r8168: update driver to 8.053.00
+ + media: camera: Add missing conftest.h
+ + media: i2c: Fix build for Linux v6.1+
+ + media: i2c: enable IMX390 WDR mode
+ + tegra: tsec: port init_comms property to oot tree
+ + video: tsec: Set tsec state before power_on/off
+ + video: tsec: add support to reboot tsec fw with context
+ + net: nvethernet: Fix support for Linux v6.9
+ + cam_cdi_tsc: Fix Fsync IOCTL fail sometimes
+ + media: virtual-i2c-mux: Fix build for Linux v6.10
+ + media: camera: Fix build for Linux v6.10
+ + pwm: tachometer: Fix build for Linux v6.10
+ + block: virtual-storage: Allow build for Linux v6.10
+ + conftest: Fix tests for Linux v6.10
+ + nv-virtio-poc: Add missing header
+ + media: camera: Fix v4l2-subdev for Linux v6.10
+ + drivers: Fix missing vmalloc.h for Linux v6.10
+ + drivers: mttcan: fix bus-off restart txfer
+ + thermal: Fix build for Linux v6.10
+ + camera:driver: Fix the race condition of setting bypass mode.
+ + t23x:tpg:[WAR] Disable gain control to avoid insmod fail.
+ + net: nvethernet: Drop adjfreq support
+ + pci: endpoint: use conftest for pci-epf-tegra-vnet.c
+ + PCI: Fix endpoint DMA test for Linux v6.9
+ + pci: Use conftest to find if pci_epc_event_ops struct has core_deinit
+ + pcie: Enable core_deinit only when core has implemented it
+ + drivers: misc: fix implicit function
+ + drivers: misc: fix implicit conversion
+ + drivers: misc: Fix the argument of iommu_map() for Linux v6.3
+ + misc: nvscic2c-pcie: Drop usage of enum pci_epc_irq_type from Linux 6.8
+ + net: ethernet: build realtek ethernet driver only for k5.15
+ + tsec: Fix build with -Werror=old-style-declaration
+ + rtl8822ce: Initialize spinlock before usage
+ + rtl8822ce: Remove pr_debug redefinition
+ + net: nvethernet: Fix build for Linux v6.9
+ + nvmap: Fix build for Linux v6.9
+ + drivers: spi: remove spi_master_put() in probe
+ + spi: Fix build for Linux v6.9
+ + conftest: Fix test for SLAB_MEM_SPREAD
+ + net: nvethernet: Fix build for Linux v6.9
+ + media: camera: Ensure gpio_device_get_chip is present
+ + media: camera: Fix build for Linux v6.9
+ + media: camera: Update conftest for gpio_device_find
+ + video: tegra: virt: Fix build for Linux v6.9
+ + soc/tegra: bpmp: Fix build for Linux v6.9
+ + block: virtual-storage: Fix build for Linux v6.9
+ + rtl8822ce: Add Nvidia changes on v5.14.0.4-217
+ + rtl8822ce: Fix TLP/EAPOL/TXFIFO issues
+ + csi5:add error config
+ + drm/tegra: nvdec: Enable SLCG/PG
+ * nvgpu
+ + gpu: nvgpu: Fix build for Linux v6.11
+ + gpu: nvgpu: Use conftest for VM flags
+ + gpu: nvgpu: Fix missing vmalloc.h
+ * hwpm
+ + tegra: hwpm: Fix build for Linux v6.11
+ * nvdisplay
+ + Updating prebuilts and/or headers
+ * hardware/nvidia/t23x/nv-public
+ + nv-platform: Add PEX WAKE GPIO interrupt for C1 controller
+ + t23x: overlay: add no-map to vpr carveout
+ + dts: optee: Update fTPM v2.0 nodes
+ + nv-platform: Add edge safety services
+ + p3768: dts: disable PCIe C8 in p3767 0000 PX1
+ + nv-platform: Rename se nodes to crypto
+ + nv-platform: Remove duplicate PCIe nodes
+ + t23x: p3701-0000-as-p3767-000*: Update CPU Fmax
+ + t23x:P3783: Fix failed to read 2nd Hawk EEPROM serial number.
+ + t23x: nv-public: tegra: fix typo in dce fabric compatible
+ + t23x: nv-public: Disable hot surface alert for IGX
+ + overlay: t23x: fix IMX390 SDR mode corruption
+ + t23x: nv-public: tegra: disable sce fabric node
+ + tegra234: Add smmu_test node
+ + Revert "nv-public: arm64: tegra: disable sce fabric node"
+ + Revert "tegra234: Add smmu_test node"
+ + tegra234: Add smmu_test node
+ + nv-public: qspi: update prod entries for qspi.
+ + nv-soc: Remove redundant properties of eth node
+ + t23x: Remove override of clock speed for SBSA UART
+ + arm64: tegra: Add missing current-speed for SBSA UART
+ + nv-soc: Rename security engine nodes
+ + UPSTREAM: arm64: tegra: Add Tegra Security Engine DT nodes
+ + arm64: tegra: Add dmas and dma-names for Tegra234 UARTE
+ + arm64: tegra: Mark Tegra234 SPI as compatible with Tegra114
+ + arm64: tegra: Use correct format for clocks property
+ + nv-public:P3783: Fix probe fail of Hawks during boot.
+ + tegra234-camera: Update DT property for VI HW.
+ + t23x: nv-soc: Disable nvidia,macsec-enable
+ + t23x: Add Hawk & Owl overlays for P3762
+ + nv-public: arm64: tegra: disable sce fabric node
+ + nv-platform: unregister tmp451 from thermal zone
+ + Revert "Revert "concord: add display hdcp property
+ + tegra234: Correct the PCIE prefetch memory range
+ + [UPSTREAM] arm64: tegra: Remove Jetson Orin NX and Jetson Orin Nano DTSI
+ + [UPSTREAM] arm64: tegra: Add audio support for Jetson Orin NX and Jetson Orin Nano
+ + [UPSTREAM] arm64: tegra: Define missing IO ports
+ + [UPSTREAM] arm64: tegra: Move AHUB ports to SoC DTSI
+ + nv-public: p3767: Remove change from mainline DT
+ + Revert "concord: add display hdcp property"
+ + overlay: t23x: enable IMX390 WDR mode
+ + nv-public: p3740: fix cvb eeprom bus id
+ + t23x: overlay: Remove legacy Sidecar overlay
+ + t234:[P3762/P3783]:Increase i2cbus-8 freq to 400khz.
+ + dt: soc: t234: add iommu mappings for vi&isp units
+ + tegra234: overlay: Add fTPM node
+ + t23x: optee-dts: Fix the TPM event log addr DT
+ + nv-platform: add support for p3767 0000 PX1
+ + soc: tegra234: Enable USB remote wakeup support
+ + nv-public:P3762: Fix probe fail of Hawks during boot.
+- supersedes df9e50c.diff, micro6-kernel.patch
+- updated firmware tarball (release 36.4.0-20240912212859)
+
+-------------------------------------------------------------------
+Mon Sep 23 15:11:15 UTC 2024 - Stefan Dirsch <sndirsch(a)suse.com>
+
+- use better URL in specfile (boo#1222604, comment#87)
+
+-------------------------------------------------------------------
Old:
----
df9e50c.diff
hardware_nvidia_t23x_nv-public-l4t-l4t-r36.3.1_eng_2024-05-29.tar.bz2
hardware_nvidia_tegra_nv-public-l4t-l4t-r36.3.1_eng_2024-05-29.tar.bz2
hwpm-l4t-l4t-r36.3.1_eng_2024-05-29.tar.bz2
micro6-kernel.patch
nv_repackager-no-sudo-use-bzip2.patch
nvdisplay-l4t-l4t-r36.3.1_eng_2024-05-29.tar.bz2
nvethernetrm-l4t-l4t-r36.3.1_eng_2024-05-29.tar.bz2
nvgpu-l4t-l4t-r36.3.1_eng_2024-05-29.tar.bz2
nvidia-l4t-firmware_36.3.1-20240516220919_arm64.tbz2
nvidia-oot-l4t-l4t-r36.3.1_eng_2024-05-29.tar.bz2
New:
----
dracut-crash-fix.patch
hardware_nvidia_t23x_nv-public-l4t-l4t-r36.4_eng_2024-09-12.tar.bz2
hardware_nvidia_tegra_nv-public-l4t-l4t-r36.4_eng_2024-09-12.tar.bz2
hwpm-l4t-l4t-r36.4_eng_2024-09-12.tar.bz2
load-nvidia-drm.service
nvdisplay-l4t-l4t-r36.4_eng_2024-09-12.tar.bz2
nvethernetrm-l4t-l4t-r36.4_eng_2024-09-12.tar.bz2
nvgpu-l4t-l4t-r36.4_eng_2024-09-12.tar.bz2
nvidia-oot-l4t-l4t-r36.4_eng_2024-09-12.tar.bz2
BETA DEBUG BEGIN:
Old: + nv-public:P3762: Fix probe fail of Hawks during boot.
- supersedes df9e50c.diff, micro6-kernel.patch
- updated firmware tarball (release 36.4.0-20240912212859)
Old:- dracut.d snippet: keep nvidia modules out of initrd
- removed obsolete micro6-kernel.patch
Old:
- removed obsolete nv_repackager-no-sudo-use-bzip2.patch
BETA DEBUG END:
BETA DEBUG BEGIN:
New:
- dracut-crash-fix.patch
* fix for tegra-se module, which triggered dracut to crash
BETA DEBUG END:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ nvidia-jetson.spec ++++++
--- /var/tmp/diff_new_pack.4Nwarc/_old 2024-10-27 11:25:52.259886729 +0100
+++ /var/tmp/diff_new_pack.4Nwarc/_new 2024-10-27 11:25:52.263886895 +0100
@@ -1,7 +1,7 @@
#
# spec file for package nvidia-jetson
#
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -15,6 +15,7 @@
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
+
%if %{undefined kernel_module_directory}
%if 0%{?usrmerged}
%define kernel_module_directory /usr/lib/modules
@@ -25,13 +26,13 @@
%define compress_modules zstd
Name: nvidia-jetson
-Version: 36.3.1_20240516220919
+Version: 36.4.0_20240912212859
Release: 0
Summary: Open-Source NVIDIA Jetson Orin graphics drivers
License: GPL-2.0-only AND MIT
Group: System/Kernel
-URL: https://partners.nvidia.com/
-Source0: nvidia-oot-l4t-l4t-r36.3.1_eng_2024-05-29.tar.bz2
+URL: https://developer.nvidia.com/embedded/jetson-linux-r363
+Source0: nvidia-oot-l4t-l4t-r36.4_eng_2024-09-12.tar.bz2
Source1: kmp-post-extra.sh
Source2: kmp-postun-extra.sh
Source3: kmp-filelist
@@ -40,26 +41,23 @@
Source7: preamble
Source8: kmp-filelist-extra
Source9: preamble-extra
+Source10: load-nvidia-drm.service
Source14: _constraints
-Source22: nvgpu-l4t-l4t-r36.3.1_eng_2024-05-29.tar.bz2
-Source23: hwpm-l4t-l4t-r36.3.1_eng_2024-05-29.tar.bz2
-Source24: nvdisplay-l4t-l4t-r36.3.1_eng_2024-05-29.tar.bz2
-Source25: nvethernetrm-l4t-l4t-r36.3.1_eng_2024-05-29.tar.bz2
-Source26: hardware_nvidia_t23x_nv-public-l4t-l4t-r36.3.1_eng_2024-05-29.tar.bz2
-Source27: hardware_nvidia_tegra_nv-public-l4t-l4t-r36.3.1_eng_2024-05-29.tar.bz2
+Source22: nvgpu-l4t-l4t-r36.4_eng_2024-09-12.tar.bz2
+Source23: hwpm-l4t-l4t-r36.4_eng_2024-09-12.tar.bz2
+Source24: nvdisplay-l4t-l4t-r36.4_eng_2024-09-12.tar.bz2
+Source25: nvethernetrm-l4t-l4t-r36.4_eng_2024-09-12.tar.bz2
+Source26: hardware_nvidia_t23x_nv-public-l4t-l4t-r36.4_eng_2024-09-12.tar.bz2
+Source27: hardware_nvidia_tegra_nv-public-l4t-l4t-r36.4_eng_2024-09-12.tar.bz2
Source28: Makefile-NVIDIA-BUG-4460318
-#Source30: https://developer.nvidia.com/downloads/igx/v1.0.0/jetson_linux_r36.3.1_aarc…
-Source30: nvidia-l4t-firmware_36.3.1-20240516220919_arm64.tbz2
# Create on SolidDriver Program build service with ...
# osc buildlog SLE_15_SP6 aarch64 | grep "missing supported flag" | sed -E 's|.*/([^/]+\.ko).*|\1 external|' | sort | uniq > Module.supported
# Unfortunately this is currently not working when building on build.suse.de
# But dracut file below could be used for information as well ...
Source29: Module.supported
-Patch0: micro6-kernel.patch
Patch1: reimplement-v4l2_match_dv_timings.patch
Patch2: persistent-nvidia-id-string.patch
-Patch3: nv_repackager-no-sudo-use-bzip2.patch
-Patch4: df9e50c.diff
+Patch4: dracut-crash-fix.patch
BuildRequires: %{kernel_module_package_buildreqs}
BuildRequires: fdupes
BuildRequires: gcc-c++
@@ -68,6 +66,7 @@
BuildRequires: perl-Bootloader
BuildRequires: pesign-obs-integration
BuildRequires: zstd
+BuildRequires: pkgconfig(systemd)
ExclusiveArch: aarch64
%if 0%{!?kmp_template_name:1}
@@ -88,6 +87,7 @@
### needs to be set in preamble-extra
#Summary: Open-Source NVIDIA Jetson Orin drivers
+
%description -n nvidia-jetson-extra-kmp-default
This package provides additional Open-Source NVIDIA Jetson Orin drivers,
which are also required by the NVIDIA Jetson Orin graphics drivers
@@ -95,19 +95,12 @@
### needs to be set in preamble-extra
#Summary: Open-Source NVIDIA Jetson Orin drivers
+
%description -n nvidia-jetson-extra-kmp-64kb
This package provides additional Open-Source NVIDIA Jetson Orin drivers,
which are also required by the NVIDIA Jetson Orin graphics drivers
(nvidia-jetson KMP).
-%package -n kernel-firmware-nvidia-jetson
-Summary: Firmware files for NVIDIA Jetson Orin (graphics) drivers
-Group: System/Kernel
-
-%description -n kernel-firmware-nvidia-jetson
-This package includes the needed firmware files for NVIDIA Jetson
-Orin (graphics) drivers.
-
%prep
echo suse_version: %suse_version
echo sle_version: %sle_version
@@ -117,11 +110,6 @@
tar xf %{SOURCE25}
popd
cp $RPM_SOURCE_DIR/Makefile-NVIDIA-BUG-4460318 Makefile
-# needed for SL Micro 6.0 (SUSE:ALP:Source:Standard:1.0) Kernel, but not for
-# sle15-sp6 Kernel !!!
-%if 0%{?suse_version} == 1600
-%patch0 -p0
-%endif
%patch1 -p1
%patch2 -p1
pushd nvidia-oot
@@ -140,11 +128,6 @@
mkdir obj
pushd ..
-#tar xf %{SOURCE30}
-#cd Linux_for_Tegra
-#%patch3 -p1
-#./nv_tools/scripts/nv_repackager.sh -o ./nv_tegra/l4t_tar_packages --convert-all
-#popd
%build
# -Wall is upstream default
@@ -181,16 +164,26 @@
mkdir -p $MODPROBE_DIR
for flavor in %flavors_to_build; do
cat > $MODPROBE_DIR/50-nvidia-$flavor.conf << EOF
-options nvidia-drm modeset=0
-blacklist nvethernet
+# IGX needs 0 for modeset; patched during installation
+options nvidia-drm modeset=1 fbdev=1
options nvidia NVreg_DeviceFileUID=0 NVreg_DeviceFileGID=REALGID NVreg_DeviceFileMode=0660 rm_firmware_active="all" NVreg_RegistryDwords="RMHdcpKeyglobZero=1"
-install nvidia /sbin/modprobe tegra_drm; /sbin/modprobe --ignore-install nvidia; /sbin/modprobe nvidia-modeset
+EOF
+ ### Using systemd service file for loading "nvidia-drm" doesn't
+ ### work on SLE Micro 6.0 for some reason, but apparently this
+ ### line helps
+%if 0%{?suse_version} == 1600
+ cat >> $MODPROBE_DIR/50-nvidia-$flavor.conf << EOF
+install nvidia /sbin/rmmod tegra_drm; /sbin/modprobe --ignore-install nvidia; /sbin/modprobe tegra_drm
+EOF
+%endif
+ cat > $MODPROBE_DIR/50-nvidia-extra-$flavor.conf << EOF
+blacklist dwmac_tegra
EOF
mkdir -p %{buildroot}/usr/lib/dracut/dracut.conf.d
dracutfile=%{buildroot}/usr/lib/dracut/dracut.conf.d/60-nvidia-jetson-$flavor.conf
dracutfile_extra=%{buildroot}/usr/lib/dracut/dracut.conf.d/60-nvidia-jetson-extra-$flavor.conf
cat > ${dracutfile} << EOF
-add_drivers+=" nvidia-drm nvidia-modeset nvidia "
+omit_drivers+=" nvidia-drm nvidia-modeset nvidia "
EOF
cat > ${dracutfile_extra}
# SL Micro 6.0 (SUSE:ALP:Source:Standard:1.0)
@@ -207,40 +200,11 @@
echo "omit_drivers+=${dname}" >> ${dracutfile_extra}
fi
done
- mkdir -p %{buildroot}/usr/lib/modules-load.d/
- cat > %{buildroot}/usr/lib/modules-load.d/nvidia-load-${flavor}.conf << EOF
-nvidia
+ mkdir -p %{buildroot}/usr/lib/systemd/system
+ install -m 644 %{SOURCE10} %{buildroot}/usr/lib/systemd/system/load-nvidia-drm-$flavor.service
+ mkdir -p %{buildroot}%{_systemd_util_dir}/system-preset
+ cat > %{buildroot}%{_systemd_util_dir}/system-preset/70-nvidia-jetson-kmp-${flavor}.preset << EOF
+enable load-nvidia-drm-${flavor}.service
EOF
done
-#pushd ../Linux_for_Tegra/nv_tegra/l4t_tar_packages
-# tar xjf nvidia-l4t-firmware_*_arm64.tbz2 -C $RPM_BUILD_ROOT/
-#popd
-tar xjf $RPM_SOURCE_DIR/nvidia-l4t-firmware_*_arm64.tbz2 -C $RPM_BUILD_ROOT/
-
-pushd $RPM_BUILD_ROOT/
-# etc/systemd/
-mkdir -p usr/lib/systemd
-mv etc/systemd/* usr/lib/systemd
-sed -i 's+/etc+/usr/lib+g' usr/lib/systemd/system/nvwifibt.service
-rmdir etc/systemd
-rmdir etc
-# lib/systemd/system/bluetooth.service/
-mv lib/systemd/system/bluetooth.service.d usr/lib/systemd/system
-rmdir lib/systemd/system
-rmdir lib/systemd
-# usr/share/doc
-mkdir -p usr/share/doc/packages/kernel-firmware-nvidia-jetson
-mv usr/share/doc/{bluez,nvidia-l4t-firmware,nvidia-tegra} usr/share/doc/packages/kernel-firmware-nvidia-jetson
-ln -snf service usr/sbin/rcnvwifibt
-popd
-
-%fdupes -s %{buildroot}/lib/firmware
-
-%files -n kernel-firmware-nvidia-jetson
-%doc /usr/share/doc/packages/kernel-firmware-nvidia-jetson/
-/lib/firmware/
-/usr/lib/systemd/
-/usr/sbin/brcm_patchram_plus
-/usr/sbin/rcnvwifibt
-
++++++ dracut-crash-fix.patch ++++++
From 3415677f0fe7c8b971bd2d41b9e9f4b78f88233f Mon Sep 17 00:00:00 2001
From: Akhil R <akhilrajeev(a)nvidia.com>
Date: Mon, 21 Oct 2024 11:33:32 +0530
Subject: [PATCH] crypto: tegra: Fix size of buffer allocated
Allocate the buffer based on the request instead of a fixed buffer
length. In operations which may require larger buffer size, a fixed
buffer may fail. Similar patch was added for AES algorithms. Fix the
same for HASH algorithms as well.
Bug 4908156
Signed-off-by: Akhil R <akhilrajeev(a)nvidia.com>
---
diff --git a/drivers/crypto/tegra/tegra-se-aes.c b/drivers/crypto/tegra/tegra-se-aes.c
index 155754e..a7c972b 100644
--- a/drivers/crypto/tegra/tegra-se-aes.c
+++ b/drivers/crypto/tegra/tegra-se-aes.c
@@ -1572,6 +1572,11 @@
return 0;
}
+ rctx->datbuf.buf = dma_alloc_coherent(se->dev, rctx->datbuf.size,
+ &rctx->datbuf.addr, GFP_KERNEL);
+ if (!rctx->datbuf.buf)
+ return -ENOMEM;
+
/* Copy the previous residue first */
if (rctx->residue.size)
memcpy(rctx->datbuf.buf, rctx->residue.buf, rctx->residue.size);
@@ -1618,14 +1623,26 @@
if (!req->nbytes && !rctx->total_len && ctx->fallback_tfm) {
return crypto_shash_tfm_digest(ctx->fallback_tfm,
- rctx->datbuf.buf, 0, req->result);
+ NULL, 0, req->result);
}
- memcpy(rctx->datbuf.buf, rctx->residue.buf, rctx->residue.size);
rctx->datbuf.size = rctx->residue.size;
rctx->total_len += rctx->residue.size;
rctx->config = tegra234_aes_cfg(SE_ALG_CMAC, 0);
+ if (rctx->residue.size) {
+ rctx->datbuf.buf = dma_alloc_coherent(se->dev, rctx->residue.size,
+ &rctx->datbuf.addr, GFP_KERNEL);
+ if (!rctx->datbuf.buf) {
+ ret = -ENOMEM;
+ goto out_free;
+ }
+
+ memcpy(rctx->datbuf.buf, rctx->residue.buf, rctx->residue.size);
+ }
+
+ memcpy(rctx->datbuf.buf, rctx->residue.buf, rctx->residue.size);
+
/* Prepare command and submit */
cmdlen = tegra_cmac_prep_cmd(se, rctx);
ret = tegra_se_host1x_submit(se, cmdlen);
@@ -1640,8 +1657,10 @@
writel(0, se->base + se->hw->regs->result + (i * 4));
out:
- dma_free_coherent(se->dev, SE_SHA_BUFLEN,
- rctx->datbuf.buf, rctx->datbuf.addr);
+ if (rctx->residue.size)
+ dma_free_coherent(se->dev, rctx->datbuf.size,
+ rctx->datbuf.buf, rctx->datbuf.addr);
+out_free:
dma_free_coherent(se->dev, crypto_ahash_blocksize(tfm) * 2,
rctx->residue.buf, rctx->residue.addr);
return ret;
@@ -1757,15 +1776,9 @@
rctx->residue.buf = dma_alloc_coherent(se->dev, rctx->blk_size * 2,
&rctx->residue.addr, GFP_KERNEL);
if (!rctx->residue.buf)
- goto resbuf_fail;
+ return -ENOMEM;
rctx->residue.size = 0;
-
- rctx->datbuf.buf = dma_alloc_coherent(se->dev, SE_SHA_BUFLEN,
- &rctx->datbuf.addr, GFP_KERNEL);
- if (!rctx->datbuf.buf)
- goto datbuf_fail;
-
rctx->datbuf.size = 0;
/* Clear any previous result */
@@ -1773,12 +1786,6 @@
writel(0, se->base + se->hw->regs->result + (i * 4));
return 0;
-
-datbuf_fail:
- dma_free_coherent(se->dev, rctx->blk_size, rctx->residue.buf,
- rctx->residue.addr);
-resbuf_fail:
- return -ENOMEM;
}
static int tegra_cmac_setkey(struct crypto_ahash *tfm, const u8 *key,
diff --git a/drivers/crypto/tegra/tegra-se-hash.c b/drivers/crypto/tegra/tegra-se-hash.c
index f86b65b..bdcc323 100644
--- a/drivers/crypto/tegra/tegra-se-hash.c
+++ b/drivers/crypto/tegra/tegra-se-hash.c
@@ -335,6 +335,11 @@
return 0;
}
+ rctx->datbuf.buf = dma_alloc_coherent(ctx->se->dev, rctx->datbuf.size,
+ &rctx->datbuf.addr, GFP_KERNEL);
+ if (!rctx->datbuf.buf)
+ return -ENOMEM;
+
/* Copy the previous residue first */
if (rctx->residue.size)
memcpy(rctx->datbuf.buf, rctx->residue.buf, rctx->residue.size);
@@ -371,6 +376,9 @@
if (!(rctx->task & SHA_FINAL))
tegra_sha_copy_hash_result(ctx->se, rctx);
+ dma_free_coherent(ctx->se->dev, rctx->datbuf.size,
+ rctx->datbuf.buf, rctx->datbuf.addr);
+
return ret;
}
@@ -383,15 +391,24 @@
u32 *cpuvaddr = se->cmdbuf->addr;
int size, ret = 0;
- memcpy(rctx->datbuf.buf, rctx->residue.buf, rctx->residue.size);
rctx->datbuf.size = rctx->residue.size;
rctx->total_len += rctx->residue.size;
rctx->config = tegra_sha_get_config(rctx->alg) |
SE_SHA_DST_MEMORY;
- size = tegra_sha_prep_cmd(se, cpuvaddr, rctx);
+ if (rctx->residue.size) {
+ rctx->datbuf.buf = dma_alloc_coherent(se->dev, rctx->residue.size,
+ &rctx->datbuf.addr, GFP_KERNEL);
+ if (!rctx->datbuf.buf) {
+ ret = -ENOMEM;
+ goto out_free;
+ }
+ memcpy(rctx->datbuf.buf, rctx->residue.buf, rctx->residue.size);
+ }
+
+ size = tegra_sha_prep_cmd(se, cpuvaddr, rctx);
ret = tegra_se_host1x_submit(se, size);
if (ret)
goto out;
@@ -400,8 +417,10 @@
memcpy(req->result, rctx->digest.buf, rctx->digest.size);
out:
- dma_free_coherent(se->dev, SE_SHA_BUFLEN,
- rctx->datbuf.buf, rctx->datbuf.addr);
+ if (rctx->residue.size)
+ dma_free_coherent(se->dev, rctx->datbuf.size,
+ rctx->datbuf.buf, rctx->datbuf.addr);
+out_free:
dma_free_coherent(se->dev, crypto_ahash_blocksize(tfm),
rctx->residue.buf, rctx->residue.addr);
dma_free_coherent(se->dev, rctx->digest.size, rctx->digest.buf,
@@ -540,19 +559,11 @@
if (!rctx->residue.buf)
goto resbuf_fail;
- rctx->datbuf.buf = dma_alloc_coherent(se->dev, SE_SHA_BUFLEN,
- &rctx->datbuf.addr, GFP_KERNEL);
- if (!rctx->datbuf.buf)
- goto datbuf_fail;
-
return 0;
-datbuf_fail:
- dma_free_coherent(se->dev, rctx->blk_size, rctx->residue.buf,
- rctx->residue.addr);
resbuf_fail:
- dma_free_coherent(se->dev, SE_SHA_BUFLEN, rctx->datbuf.buf,
- rctx->datbuf.addr);
+ dma_free_coherent(se->dev, rctx->digest.size, rctx->digest.buf,
+ rctx->digest.addr);
digbuf_fail:
return -ENOMEM;
}
diff --git a/drivers/crypto/tegra/tegra-se.h b/drivers/crypto/tegra/tegra-se.h
index ec5768f..900d6bf 100644
--- a/drivers/crypto/tegra/tegra-se.h
+++ b/drivers/crypto/tegra/tegra-se.h
@@ -342,7 +342,6 @@
#define SE_CRYPTO_CTR_REG_COUNT 4
#define SE_MAX_KEYSLOT 15
#define SE_MAX_MEM_ALLOC SZ_4M
-#define SE_SHA_BUFLEN 0x2000
#define SHA_FIRST BIT(0)
#define SHA_UPDATE BIT(1)
++++++ hardware_nvidia_t23x_nv-public-l4t-l4t-r36.3.1_eng_2024-05-29.tar.bz2 -> hardware_nvidia_t23x_nv-public-l4t-l4t-r36.4_eng_2024-09-12.tar.bz2 ++++++
++++ 10937 lines of diff (skipped)
++++++ hardware_nvidia_tegra_nv-public-l4t-l4t-r36.3.1_eng_2024-05-29.tar.bz2 -> hardware_nvidia_tegra_nv-public-l4t-l4t-r36.4_eng_2024-09-12.tar.bz2 ++++++
++++++ hwpm-l4t-l4t-r36.3.1_eng_2024-05-29.tar.bz2 -> hwpm-l4t-l4t-r36.4_eng_2024-09-12.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwpm/drivers/tegra/hwpm/os/linux/driver.c new/hwpm/drivers/tegra/hwpm/os/linux/driver.c
--- old/hwpm/drivers/tegra/hwpm/os/linux/driver.c 2024-06-03 02:55:42.509546896 +0200
+++ new/hwpm/drivers/tegra/hwpm/os/linux/driver.c 2024-10-11 12:57:52.196435498 +0200
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
- * Copyright (c) 2021-2023 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+ * Copyright (c) 2021-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify it
* under the terms and conditions of the GNU General Public License,
@@ -251,9 +251,21 @@
return 0;
}
+#if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
+static inline void tegra_hwpm_remove_wrapper(struct platform_device *pdev)
+{
+ tegra_hwpm_remove(pdev);
+}
+#else
+static inline int tegra_hwpm_remove_wrapper(struct platform_device *pdev)
+{
+ return tegra_hwpm_remove(pdev);
+}
+#endif
+
static struct platform_driver tegra_soc_hwpm_pdrv = {
.probe = tegra_hwpm_probe,
- .remove = tegra_hwpm_remove,
+ .remove = tegra_hwpm_remove_wrapper,
.driver = {
.name = TEGRA_SOC_HWPM_MODULE_NAME,
.of_match_table = of_match_ptr(tegra_soc_hwpm_of_match),
++++++ kmp-filelist ++++++
--- /var/tmp/diff_new_pack.4Nwarc/_old 2024-10-27 11:25:52.811909611 +0100
+++ /var/tmp/diff_new_pack.4Nwarc/_new 2024-10-27 11:25:52.815909777 +0100
@@ -9,6 +9,7 @@
%dir /usr/lib/dracut
%dir /usr/lib/dracut/dracut.conf.d
/usr/lib/dracut/dracut.conf.d/60-nvidia-jetson-%1.conf
-%dir /usr/lib/modules-load.d
-/usr/lib/modules-load.d/nvidia-load-%1.conf
+%{_unitdir}/load-nvidia-drm-%1.service
+%dir %{_systemd_util_dir}/system-preset
+%{_systemd_util_dir}/system-preset/70-nvidia-jetson-kmp-%1.preset
++++++ kmp-filelist-extra ++++++
--- /var/tmp/diff_new_pack.4Nwarc/_old 2024-10-27 11:25:52.839910772 +0100
+++ /var/tmp/diff_new_pack.4Nwarc/_new 2024-10-27 11:25:52.843910938 +0100
@@ -5,6 +5,8 @@
%exclude %{kernel_module_directory}/%2-%1/updates/nvidia-drm.ko*
%exclude %{kernel_module_directory}/%2-%1/updates/nvidia-modeset.ko*
%exclude %{kernel_module_directory}/%2-%1/updates/nvidia.ko*
+%dir /lib/modprobe.d
+/lib/modprobe.d/50-nvidia-extra-%1.conf
%dir /usr/lib/dracut
%dir /usr/lib/dracut/dracut.conf.d
/usr/lib/dracut/dracut.conf.d/60-nvidia-jetson-extra-%1.conf
++++++ kmp-post.sh ++++++
--- /var/tmp/diff_new_pack.4Nwarc/_old 2024-10-27 11:25:52.883912597 +0100
+++ /var/tmp/diff_new_pack.4Nwarc/_new 2024-10-27 11:25:52.887912762 +0100
@@ -16,4 +16,9 @@
GID=$(getent group video | cut -d: -f3)
sed -i "s/REALGID/$GID/" /lib/modprobe.d/50-nvidia-$flavor.conf
+# IGX needs 0 for modeset
+if dmidecode |grep "Product Name"|grep -q IGX; then
+ sed -i "s/modeset=1/modeset=0/" /lib/modprobe.d/50-nvidia-$flavor.conf
+fi
+
++++++ load-nvidia-drm.service ++++++
[Unit]
Description=Load nvidia-drm
Before=xdm.service
After=systemd-user-sessions.service systemd-logind.service
[Service]
Type=oneshot
ExecStart=/sbin/modprobe nvidia-drm
RemainAfterExit=yes
[Install]
WantedBy=graphical.target
++++++ nvdisplay-l4t-l4t-r36.3.1_eng_2024-05-29.tar.bz2 -> nvdisplay-l4t-l4t-r36.4_eng_2024-09-12.tar.bz2 ++++++
++++ 6213 lines of diff (skipped)
++++++ nvethernetrm-l4t-l4t-r36.3.1_eng_2024-05-29.tar.bz2 -> nvethernetrm-l4t-l4t-r36.4_eng_2024-09-12.tar.bz2 ++++++
++++++ nvgpu-l4t-l4t-r36.3.1_eng_2024-05-29.tar.bz2 -> nvgpu-l4t-l4t-r36.4_eng_2024-09-12.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nvgpu/drivers/gpu/nvgpu/os/linux/debug_gr.c new/nvgpu/drivers/gpu/nvgpu/os/linux/debug_gr.c
--- old/nvgpu/drivers/gpu/nvgpu/os/linux/debug_gr.c 2024-06-03 02:55:39.933494062 +0200
+++ new/nvgpu/drivers/gpu/nvgpu/os/linux/debug_gr.c 2024-10-11 12:57:49.464380167 +0200
@@ -1,18 +1,9 @@
-/*
- * Copyright (c) 2017-2023, NVIDIA CORPORATION. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: Copyright (c) 2017-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+
+#if defined(CONFIG_NVIDIA_CONFTEST)
+#include <nvidia/conftest.h>
+#endif
#include <nvgpu/gk20a.h>
#include <nvgpu/gr/ctx.h>
@@ -250,7 +241,7 @@
err = -EINVAL;
goto done;
}
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 3, 0)
+#if defined(NV_VM_AREA_STRUCT_HAS_CONST_VM_FLAGS) /* Linux v6.3 */
vm_flags_set(vma, VM_DONTCOPY | VM_DONTEXPAND | VM_NORESERVE |
VM_DONTDUMP | VM_PFNMAP);
vm_flags_clear(vma, VM_MAYWRITE);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nvgpu/drivers/gpu/nvgpu/os/linux/dmabuf_nvs.c new/nvgpu/drivers/gpu/nvgpu/os/linux/dmabuf_nvs.c
--- old/nvgpu/drivers/gpu/nvgpu/os/linux/dmabuf_nvs.c 2024-06-03 02:55:39.933494062 +0200
+++ new/nvgpu/drivers/gpu/nvgpu/os/linux/dmabuf_nvs.c 2024-10-11 12:57:49.464380167 +0200
@@ -1,18 +1,9 @@
-/*
- * Copyright (c) 2022-2023, NVIDIA CORPORATION. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: Copyright (c) 2022-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+
+#if defined(CONFIG_NVIDIA_CONFTEST)
+#include <nvidia/conftest.h>
+#endif
#include <linux/version.h>
#include <linux/dma-buf.h>
@@ -144,7 +135,7 @@
nvgpu_nvs_ctrl_fifo_lock_queues(g);
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 3, 0)
+#if defined(NV_VM_AREA_STRUCT_HAS_CONST_VM_FLAGS) /* Linux v6.3 */
vm_flags_set(vma, VM_DONTCOPY | VM_DONTEXPAND | VM_NORESERVE |
VM_DONTDUMP);
#else
@@ -153,7 +144,7 @@
#endif
if (buf->mask == NVGPU_NVS_CTRL_FIFO_QUEUE_CLIENT_EVENTS_READ) {
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 3, 0)
+#if defined(NV_VM_AREA_STRUCT_HAS_CONST_VM_FLAGS) /* Linux v6.3 */
vm_flags_set(vma, VM_SHARED);
#else
vma->vm_flags |= VM_SHARED;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nvgpu/drivers/gpu/nvgpu/os/linux/fecs_trace_linux.c new/nvgpu/drivers/gpu/nvgpu/os/linux/fecs_trace_linux.c
--- old/nvgpu/drivers/gpu/nvgpu/os/linux/fecs_trace_linux.c 2024-06-03 02:55:39.933494062 +0200
+++ new/nvgpu/drivers/gpu/nvgpu/os/linux/fecs_trace_linux.c 2024-10-11 12:57:49.464380167 +0200
@@ -1,23 +1,11 @@
-/*
- * Copyright (c) 2016-2020, NVIDIA CORPORATION. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: Copyright (c) 2016-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
#include <linux/wait.h>
#include <linux/ktime.h>
#include <linux/uaccess.h>
#include <linux/poll.h>
+#include <linux/vmalloc.h>
#include <nvgpu/trace.h>
#include <uapi/linux/nvgpu.h>
#include <nvgpu/kmem.h>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nvgpu/drivers/gpu/nvgpu/os/linux/ioctl_ctrl.c new/nvgpu/drivers/gpu/nvgpu/os/linux/ioctl_ctrl.c
--- old/nvgpu/drivers/gpu/nvgpu/os/linux/ioctl_ctrl.c 2024-06-03 02:55:39.933494062 +0200
+++ new/nvgpu/drivers/gpu/nvgpu/os/linux/ioctl_ctrl.c 2024-10-11 12:57:49.468380248 +0200
@@ -1,6 +1,10 @@
// SPDX-License-Identifier: GPL-2.0-only
// SPDX-FileCopyrightText: Copyright (c) 2011-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+#if defined(CONFIG_NVIDIA_CONFTEST)
+#include <nvidia/conftest.h>
+#endif
+
#include <linux/version.h>
#include <linux/uaccess.h>
#include <linux/cdev.h>
@@ -2853,7 +2857,7 @@
nvgpu_mutex_acquire(&l->ctrl_privs_lock);
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 3, 0)
+#if defined(NV_VM_AREA_STRUCT_HAS_CONST_VM_FLAGS) /* Linux v6.3 */
vm_flags_set(vma, VM_IO | VM_DONTCOPY | VM_DONTEXPAND | VM_NORESERVE |
VM_DONTDUMP | VM_PFNMAP);
#else
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nvgpu/drivers/gpu/nvgpu/os/linux/linux-dma.c new/nvgpu/drivers/gpu/nvgpu/os/linux/linux-dma.c
--- old/nvgpu/drivers/gpu/nvgpu/os/linux/linux-dma.c 2024-06-03 02:55:39.937494146 +0200
+++ new/nvgpu/drivers/gpu/nvgpu/os/linux/linux-dma.c 2024-10-11 12:57:49.468380248 +0200
@@ -1,9 +1,10 @@
// SPDX-License-Identifier: GPL-2.0-only
-// SPDX-FileCopyrightText: Copyright (c) 2017-2023 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+// SPDX-FileCopyrightText: Copyright (c) 2017-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
#include <linux/dma-mapping.h>
#include <linux/slab.h>
#include <linux/iommu.h>
+#include <linux/vmalloc.h>
#include <nvgpu/log.h>
#include <nvgpu/dma.h>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nvgpu/drivers/gpu/nvgpu/os/linux/module.c new/nvgpu/drivers/gpu/nvgpu/os/linux/module.c
--- old/nvgpu/drivers/gpu/nvgpu/os/linux/module.c 2024-06-03 02:55:39.937494146 +0200
+++ new/nvgpu/drivers/gpu/nvgpu/os/linux/module.c 2024-10-11 12:57:49.468380248 +0200
@@ -1,10 +1,14 @@
// SPDX-License-Identifier: GPL-2.0-only
-// SPDX-FileCopyrightText: Copyright (c) 2011-2023 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+// SPDX-FileCopyrightText: Copyright (c) 2011-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
/*
* GK20A Graphics
*/
+#if defined(CONFIG_NVIDIA_CONFTEST)
+#include <nvidia/conftest.h>
+#endif
+
#include <linux/module.h>
#include <linux/of.h>
#include <linux/of_device.h>
@@ -2073,9 +2077,21 @@
return err;
}
+#if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
+static inline void __exit gk20a_remove_wrapper(struct platform_device *pdev)
+{
+ gk20a_remove(pdev);
+}
+#else
+static inline int __exit gk20a_remove_wrapper(struct platform_device *pdev)
+{
+ return gk20a_remove(pdev);
+}
+#endif
+
static struct platform_driver gk20a_driver = {
.probe = gk20a_probe,
- .remove = __exit_p(gk20a_remove),
+ .remove = __exit_p(gk20a_remove_wrapper),
.shutdown = gk20a_pm_shutdown,
.driver = {
.owner = THIS_MODULE,
++++++ nvidia-oot-l4t-l4t-r36.3.1_eng_2024-05-29.tar.bz2 -> nvidia-oot-l4t-l4t-r36.4_eng_2024-09-12.tar.bz2 ++++++
++++ 113519 lines of diff (skipped)
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package nfpm for openSUSE:Factory checked in at 2024-10-27 11:25:24
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/nfpm (Old)
and /work/SRC/openSUSE:Factory/.nfpm.new.2020 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nfpm"
Sun Oct 27 11:25:24 2024 rev:5 rq:1218408 version:2.41.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/nfpm/nfpm.changes 2024-09-16 17:43:04.977074721 +0200
+++ /work/SRC/openSUSE:Factory/.nfpm.new.2020/nfpm.changes 2024-10-27 11:25:48.863745952 +0100
@@ -1,0 +2,27 @@
+Fri Oct 25 16:53:37 UTC 2024 - opensuse_buildservice(a)ojkastl.de
+
+- Update to version 2.41.0:
+ * docs: fix bad documentation
+ * fix: improve init
+ * chore(deps): bump anchore/sbom-action from 0.17.2 to 0.17.3
+ (#867)
+ * feat(deps): bump github.com/klauspost/compress from 1.17.10 to
+ 1.17.11 (#868)
+ * chore(deps): bump actions/cache from 4.1.0 to 4.1.1 (#866)
+ * chore(deps): bump sigstore/cosign-installer from 3.6.0 to 3.7.0
+ (#865)
+ * chore(deps): bump actions/cache from 4.0.2 to 4.1.0 (#864)
+ * chore(deps): bump cachix/install-nix-action from 29 to 30
+ (#863)
+ * docs: fix arch and platform env var examples (#862)
+ * chore(deps): bump cachix/install-nix-action from V28 to 29
+ (#861)
+ * feat(deps): bump github.com/klauspost/compress from 1.17.9 to
+ 1.17.10 (#860)
+ * feat(rpm): support %config(missingok) (#854)
+ * fix: undefined variable 'staging-pkgs' (#858)
+ * chore(deps): bump cachix/install-nix-action from V27 to 28
+ (#855)
+ * docs: update cmd docs
+
+-------------------------------------------------------------------
Old:
----
nfpm-2.40.0.obscpio
New:
----
nfpm-2.41.0.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ nfpm.spec ++++++
--- /var/tmp/diff_new_pack.tLXyWv/_old 2024-10-27 11:25:49.615777126 +0100
+++ /var/tmp/diff_new_pack.tLXyWv/_new 2024-10-27 11:25:49.619777292 +0100
@@ -16,17 +16,18 @@
#
-%define __arch_install_post export NO_BRP_STRIP_DEBUG=true
-
Name: nfpm
-Version: 2.40.0
+Version: 2.41.0
Release: 0
Summary: Simple deb, rpm, apk and arch linux packager written in Go
License: MIT
URL: https://github.com/goreleaser/nfpm
Source: %{name}-%{version}.tar.gz
Source1: vendor.tar.gz
+BuildRequires: bash-completion
+BuildRequires: fish
BuildRequires: go >= 1.22
+BuildRequires: zsh
%description
nFPM is a simple and 0-dependencies deb, rpm, apk and arch linux packager
@@ -95,8 +96,8 @@
%{buildroot}/%{_bindir}/%{name} completion fish > %{buildroot}%{_datarootdir}/fish/vendor_completions.d/%{name}.fish
# create the zsh completion file
-mkdir -p %{buildroot}%{_datarootdir}/zsh_completion.d/
-%{buildroot}/%{_bindir}/%{name} completion zsh > %{buildroot}%{_datarootdir}/zsh_completion.d/_%{name}
+mkdir -p %{buildroot}%{_datarootdir}/zsh/site-functions/
+%{buildroot}/%{_bindir}/%{name} completion zsh > %{buildroot}%{_datarootdir}/zsh/site-functions/_%{name}
%files
%doc README.md
@@ -104,16 +105,11 @@
%{_bindir}/%{name}
%files -n %{name}-bash-completion
-%dir %{_datarootdir}/bash-completion/completions/
%{_datarootdir}/bash-completion/completions/%{name}
%files -n %{name}-fish-completion
-%dir %{_datarootdir}/fish
-%dir %{_datarootdir}/fish/vendor_completions.d
%{_datarootdir}/fish/vendor_completions.d/%{name}.fish
%files -n %{name}-zsh-completion
-%defattr(-,root,root)
-%dir %{_datarootdir}/zsh_completion.d/
-%{_datarootdir}/zsh_completion.d/_%{name}
+%{_datarootdir}/zsh/site-functions/_%{name}
++++++ _service ++++++
--- /var/tmp/diff_new_pack.tLXyWv/_old 2024-10-27 11:25:49.655778783 +0100
+++ /var/tmp/diff_new_pack.tLXyWv/_new 2024-10-27 11:25:49.659778949 +0100
@@ -3,10 +3,10 @@
<param name="url">https://github.com/goreleaser/nfpm</param>
<param name="scm">git</param>
<param name="exclude">.git</param>
- <param name="revision">v2.40.0</param>
+ <param name="revision">v2.41.0</param>
<param name="versionformat">@PARENT_TAG@</param>
- <param name="changesgenerate">enable</param>
<param name="versionrewrite-pattern">v(.*)</param>
+ <param name="changesgenerate">enable</param>
</service>
<service name="set_version" mode="manual">
</service>
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.tLXyWv/_old 2024-10-27 11:25:49.683779944 +0100
+++ /var/tmp/diff_new_pack.tLXyWv/_new 2024-10-27 11:25:49.687780110 +0100
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/goreleaser/nfpm</param>
- <param name="changesrevision">db338d012a43be3c7f9c5a450eca2e279c973de4</param></service></servicedata>
+ <param name="changesrevision">fec4263cb2da9554b4dffaecc606b6392a244c03</param></service></servicedata>
(No newline at EOF)
++++++ nfpm-2.40.0.obscpio -> nfpm-2.41.0.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nfpm-2.40.0/.github/workflows/docs.yml new/nfpm-2.41.0/.github/workflows/docs.yml
--- old/nfpm-2.40.0/.github/workflows/docs.yml 2024-08-29 13:36:48.000000000 +0200
+++ new/nfpm-2.41.0/.github/workflows/docs.yml 2024-10-25 16:32:34.000000000 +0200
@@ -20,7 +20,7 @@
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- - uses: cachix/install-nix-action@V27
+ - uses: cachix/install-nix-action@v30
with:
nix_path: nixpkgs=channel:nixos-unstable
github_access_token: ${{ secrets.GITHUB_TOKEN }}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nfpm-2.40.0/.github/workflows/release.yml new/nfpm-2.41.0/.github/workflows/release.yml
--- old/nfpm-2.40.0/.github/workflows/release.yml 2024-08-29 13:36:48.000000000 +0200
+++ new/nfpm-2.41.0/.github/workflows/release.yml 2024-10-25 16:32:34.000000000 +0200
@@ -34,11 +34,11 @@
- uses: arduino/setup-task@v2
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
- - uses: sigstore/cosign-installer(a)v3.6.0
- - uses: anchore/sbom-action/download-syft(a)v0.17.2
+ - uses: sigstore/cosign-installer(a)v3.7.0
+ - uses: anchore/sbom-action/download-syft(a)v0.17.3
- uses: docker/setup-qemu-action@v3
- uses: docker/setup-buildx-action@v3
- - uses: cachix/install-nix-action@V27
+ - uses: cachix/install-nix-action@v30
with:
github_access_token: ${{ secrets.GITHUB_TOKEN }}
- run: task setup
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nfpm-2.40.0/.github/workflows/windows.yml new/nfpm-2.41.0/.github/workflows/windows.yml
--- old/nfpm-2.40.0/.github/workflows/windows.yml 2024-08-29 13:36:48.000000000 +0200
+++ new/nfpm-2.41.0/.github/workflows/windows.yml 2024-10-25 16:32:34.000000000 +0200
@@ -51,7 +51,7 @@
- shell: bash
run: |
echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
- - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4
+ - uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8 # v4
with:
path: dist/
key: ${{ env.sha_short }}
@@ -69,7 +69,7 @@
- shell: bash
run: |
echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
- - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4
+ - uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8 # v4
with:
path: dist/
key: ${{ env.sha_short }}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nfpm-2.40.0/apk/apk_test.go new/nfpm-2.41.0/apk/apk_test.go
--- old/nfpm-2.40.0/apk/apk_test.go 2024-08-29 13:36:48.000000000 +0200
+++ new/nfpm-2.41.0/apk/apk_test.go 2024-10-25 16:32:34.000000000 +0200
@@ -82,6 +82,11 @@
Type: files.TypeConfigNoReplace,
},
{
+ Source: "../testdata/whatever.conf",
+ Destination: "/etc/fake/fake3.conf",
+ Type: files.TypeConfigMissingOK,
+ },
+ {
Destination: "/var/log/whatever",
Type: files.TypeDir,
},
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nfpm-2.40.0/arch/arch.go new/nfpm-2.41.0/arch/arch.go
--- old/nfpm-2.40.0/arch/arch.go 2024-08-29 13:36:48.000000000 +0200
+++ new/nfpm-2.41.0/arch/arch.go 2024-10-25 16:32:34.000000000 +0200
@@ -359,7 +359,7 @@
}
for _, content := range info.Contents {
- if content.Type == files.TypeConfig || content.Type == files.TypeConfigNoReplace {
+ if content.Type == files.TypeConfig || content.Type == files.TypeConfigNoReplace || content.Type == files.TypeConfigMissingOK {
path := files.AsRelativePath(content.Destination)
if err := writeKVPair(buf, "backup", path); err != nil {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nfpm-2.40.0/deb/deb.go new/nfpm-2.41.0/deb/deb.go
--- old/nfpm-2.40.0/deb/deb.go 2024-08-29 13:36:48.000000000 +0200
+++ new/nfpm-2.41.0/deb/deb.go 2024-10-25 16:32:34.000000000 +0200
@@ -681,7 +681,7 @@
var confs []string
for _, file := range info.Contents {
switch file.Type {
- case files.TypeConfig, files.TypeConfigNoReplace:
+ case files.TypeConfig, files.TypeConfigNoReplace, files.TypeConfigMissingOK:
confs = append(confs, files.NormalizeAbsoluteFilePath(file.Destination))
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nfpm-2.40.0/deb/deb_test.go new/nfpm-2.41.0/deb/deb_test.go
--- old/nfpm-2.40.0/deb/deb_test.go 2024-08-29 13:36:48.000000000 +0200
+++ new/nfpm-2.41.0/deb/deb_test.go 2024-10-25 16:32:34.000000000 +0200
@@ -86,6 +86,11 @@
Type: files.TypeConfigNoReplace,
},
{
+ Source: "../testdata/whatever.conf",
+ Destination: "/etc/fake/fake3.conf",
+ Type: files.TypeConfigMissingOK,
+ },
+ {
Destination: "/var/log/whatever",
Type: files.TypeDir,
},
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nfpm-2.40.0/files/files.go new/nfpm-2.41.0/files/files.go
--- old/nfpm-2.40.0/files/files.go 2024-08-29 13:36:48.000000000 +0200
+++ new/nfpm-2.41.0/files/files.go 2024-10-25 16:32:34.000000000 +0200
@@ -32,9 +32,13 @@
// user of the package.
TypeConfig = "config"
// TypeConfigNoReplace is like TypeConfig with an added noreplace directive
- // that is respected by RPM-based distributions. For all other packages it
- // is handled exactly like TypeConfig.
+ // that is respected by RPM-based distributions.
+ // For all other package formats it is handled exactly like TypeConfig.
TypeConfigNoReplace = "config|noreplace"
+ // TypeConfigMissingOK is like TypeConfig with an added missingok directive
+ // that is respected by RPM-based distributions.
+ // For all other package formats it is handled exactly like TypeConfig.
+ TypeConfigMissingOK = "config|missingok"
// TypeGhost is the type of an RPM ghost file which is ignored by other packagers.
TypeRPMGhost = "ghost"
// TypeRPMDoc is the type of an RPM doc file which is ignored by other packagers.
@@ -289,7 +293,7 @@
if err != nil {
return nil, fmt.Errorf("add tree: %w", err)
}
- case TypeConfig, TypeConfigNoReplace, TypeFile, "":
+ case TypeConfig, TypeConfigNoReplace, TypeConfigMissingOK, TypeFile, "":
globbed, err := glob.Glob(
filepath.ToSlash(content.Source),
filepath.ToSlash(content.Destination),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nfpm-2.40.0/flake.nix new/nfpm-2.41.0/flake.nix
--- old/nfpm-2.40.0/flake.nix 2024-08-29 13:36:48.000000000 +0200
+++ new/nfpm-2.41.0/flake.nix 2024-10-25 16:32:34.000000000 +0200
@@ -43,7 +43,7 @@
# nix develop .#docs
devShells.docs = pkgs.mkShell {
- packages = with pkgs; with staging-pkgs.python311Packages; [
+ packages = with pkgs; with pkgs.python311Packages; [
(pkgs.writeScriptBin "ci-docs" "task docs:test")
go-task
htmltest
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nfpm-2.40.0/go.mod new/nfpm-2.41.0/go.mod
--- old/nfpm-2.40.0/go.mod 2024-08-29 13:36:48.000000000 +0200
+++ new/nfpm-2.41.0/go.mod 2024-10-25 16:32:34.000000000 +0200
@@ -14,7 +14,7 @@
github.com/goreleaser/chglog v0.6.1
github.com/goreleaser/fileglob v1.3.0
github.com/invopop/jsonschema v0.12.0
- github.com/klauspost/compress v1.17.9
+ github.com/klauspost/compress v1.17.11
github.com/klauspost/pgzip v1.2.6
github.com/muesli/mango-cobra v1.2.0
github.com/muesli/roff v0.1.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nfpm-2.40.0/go.sum new/nfpm-2.41.0/go.sum
--- old/nfpm-2.40.0/go.sum 2024-08-29 13:36:48.000000000 +0200
+++ new/nfpm-2.41.0/go.sum 2024-10-25 16:32:34.000000000 +0200
@@ -99,8 +99,8 @@
github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4=
github.com/kevinburke/ssh_config v1.2.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM=
-github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA=
-github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
+github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc=
+github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0=
github.com/klauspost/pgzip v1.2.6 h1:8RXeL5crjEUFnR2/Sn6GJNWtSQ3Dk8pq4CL3jvdDyjU=
github.com/klauspost/pgzip v1.2.6/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs=
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nfpm-2.40.0/internal/cmd/example.yml new/nfpm-2.41.0/internal/cmd/example.yml
--- old/nfpm-2.40.0/internal/cmd/example.yml 1970-01-01 01:00:00.000000000 +0100
+++ new/nfpm-2.41.0/internal/cmd/example.yml 2024-10-25 16:32:34.000000000 +0200
@@ -0,0 +1,56 @@
+# This is an example nfpm configuration file.
+# Make sure to check the documentation at https://nfpm.goreleaser.com
+#
+# The lines below are called `modelines`. See `:help modeline`
+# Feel free to remove those if you don't want/need to use them.
+# yaml-language-server: $schema=https://nfpm.goreleaser.com/static/schema.json
+# vim: set ts=2 sw=2 tw=0 fo=cnqoj
+
+name: "foo"
+arch: "amd64"
+platform: "linux"
+version: "1.0.0"
+section: "default"
+priority: "extra"
+replaces:
+ - foobar
+provides:
+ - bar
+depends:
+ - foo
+ - bar
+recommends:
+ - whatever
+suggests:
+ - something-else
+conflicts:
+ - not-foo
+ - not-bar
+maintainer: "John Doe <john(a)example.com>"
+description: |
+ FooBar is the great foo and bar software.
+ And this can be in multiple lines!
+vendor: "FooBarCorp"
+homepage: "http://example.com"
+license: "MIT"
+changelog: "changelog.yaml"
+contents:
+ - src: ./foo
+ dst: /usr/bin/foo
+ - src: ./bar
+ dst: /usr/bin/bar
+ - src: ./foobar.conf
+ dst: /etc/foobar.conf
+ type: config
+ - src: /usr/bin/foo
+ dst: /sbin/foo
+ type: symlink
+overrides:
+ rpm:
+ scripts:
+ preinstall: ./scripts/preinstall.sh
+ postremove: ./scripts/postremove.sh
+ deb:
+ scripts:
+ postinstall: ./scripts/postinstall.sh
+ preremove: ./scripts/preremove.sh
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nfpm-2.40.0/internal/cmd/init.go new/nfpm-2.41.0/internal/cmd/init.go
--- old/nfpm-2.40.0/internal/cmd/init.go 2024-08-29 13:36:48.000000000 +0200
+++ new/nfpm-2.41.0/internal/cmd/init.go 2024-10-25 16:32:34.000000000 +0200
@@ -1,12 +1,16 @@
package cmd
import (
+ _ "embed"
"fmt"
"os"
"github.com/spf13/cobra"
)
+//go:embed example.yml
+var example []byte
+
type initCmd struct {
cmd *cobra.Command
config string
@@ -23,7 +27,7 @@
Args: cobra.NoArgs,
ValidArgsFunction: cobra.NoFileCompletions,
RunE: func(_ *cobra.Command, _ []string) error {
- if err := os.WriteFile(root.config, []byte(example), 0o666); err != nil {
+ if err := os.WriteFile(root.config, example, 0o666); err != nil {
return fmt.Errorf("failed to create example file: %w", err)
}
return nil
@@ -36,57 +40,3 @@
root.cmd = cmd
return root
}
-
-const example = `# nfpm example configuration file
-#
-# check https://nfpm.goreleaser.com/configuration for detailed usage
-#
-name: "foo"
-arch: "amd64"
-platform: "linux"
-version: "1.0.0"
-section: "default"
-priority: "extra"
-replaces:
-- foobar
-provides:
-- bar
-depends:
-- foo
-- bar
-recommends:
-- whatever
-suggests:
-- something-else
-conflicts:
-- not-foo
-- not-bar
-maintainer: "John Doe <john(a)example.com>"
-description: |
- FooBar is the great foo and bar software.
- And this can be in multiple lines!
-vendor: "FooBarCorp"
-homepage: "http://example.com"
-license: "MIT"
-changelog: "changelog.yaml"
-contents:
-- src: ./foo
- dst: /usr/bin/foo
-- src: ./bar
- dst: /usr/bin/bar
-- src: ./foobar.conf
- dst: /etc/foobar.conf
- type: config
-- src: /usr/bin/foo
- dst: /sbin/foo
- type: symlink
-overrides:
- rpm:
- scripts:
- preinstall: ./scripts/preinstall.sh
- postremove: ./scripts/postremove.sh
- deb:
- scripts:
- postinstall: ./scripts/postinstall.sh
- preremove: ./scripts/preremove.sh
-`
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nfpm-2.40.0/ipk/ipk.go new/nfpm-2.41.0/ipk/ipk.go
--- old/nfpm-2.40.0/ipk/ipk.go 2024-08-29 13:36:48.000000000 +0200
+++ new/nfpm-2.41.0/ipk/ipk.go 2024-10-25 16:32:34.000000000 +0200
@@ -205,7 +205,7 @@
ModTime: modtime.Get(info.MTime),
Linkname: file.Source,
})
- case files.TypeFile, files.TypeTree, files.TypeConfig, files.TypeConfigNoReplace:
+ case files.TypeFile, files.TypeTree, files.TypeConfig, files.TypeConfigNoReplace, files.TypeConfigMissingOK:
size, err = writeFile(tw, file)
default:
// ignore everything else
@@ -293,7 +293,7 @@
var confs []string
for _, file := range info.Contents {
switch file.Type {
- case files.TypeConfig, files.TypeConfigNoReplace:
+ case files.TypeConfig, files.TypeConfigNoReplace, files.TypeConfigMissingOK:
confs = append(confs, files.NormalizeAbsoluteFilePath(file.Destination))
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nfpm-2.40.0/ipk/ipk_test.go new/nfpm-2.41.0/ipk/ipk_test.go
--- old/nfpm-2.40.0/ipk/ipk_test.go 2024-08-29 13:36:48.000000000 +0200
+++ new/nfpm-2.41.0/ipk/ipk_test.go 2024-10-25 16:32:34.000000000 +0200
@@ -72,6 +72,11 @@
Type: files.TypeConfigNoReplace,
},
{
+ Source: "../testdata/whatever.conf",
+ Destination: "/etc/fake/fake3.conf",
+ Type: files.TypeConfigNoReplace,
+ },
+ {
Destination: "/var/log/whatever",
Type: files.TypeDir,
},
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nfpm-2.40.0/rpm/rpm.go new/nfpm-2.41.0/rpm/rpm.go
--- old/nfpm-2.40.0/rpm/rpm.go 2024-08-29 13:36:48.000000000 +0200
+++ new/nfpm-2.41.0/rpm/rpm.go 2024-10-25 16:32:34.000000000 +0200
@@ -373,6 +373,8 @@
file, err = asRPMFile(content, rpmpack.ConfigFile)
case files.TypeConfigNoReplace:
file, err = asRPMFile(content, rpmpack.ConfigFile|rpmpack.NoReplaceFile)
+ case files.TypeConfigMissingOK:
+ file, err = asRPMFile(content, rpmpack.ConfigFile|rpmpack.MissingOkFile)
case files.TypeRPMGhost:
if content.FileInfo.Mode == 0 {
content.FileInfo.Mode = os.FileMode(0o644)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nfpm-2.40.0/rpm/rpm_test.go new/nfpm-2.41.0/rpm/rpm_test.go
--- old/nfpm-2.40.0/rpm/rpm_test.go 2024-08-29 13:36:48.000000000 +0200
+++ new/nfpm-2.41.0/rpm/rpm_test.go 2024-10-25 16:32:34.000000000 +0200
@@ -595,6 +595,42 @@
})
}
+func TestConfigMissingOK(t *testing.T) {
+ var (
+ buildConfigFile = "../testdata/whatever.conf"
+ packageConfigFile = "/etc/fake/fake.conf"
+ )
+
+ info := &nfpm.Info{
+ Name: "symlink-in-files",
+ Arch: "amd64",
+ Description: "This package's config references a file via symlink.",
+ Version: "1.0.0",
+ Maintainer: "maintainer",
+ Overridables: nfpm.Overridables{
+ Contents: []*files.Content{
+ {
+ Source: buildConfigFile,
+ Destination: packageConfigFile,
+ Type: files.TypeConfigMissingOK,
+ },
+ },
+ },
+ }
+
+ var rpmFileBuffer bytes.Buffer
+ err := Default.Package(info, &rpmFileBuffer)
+ require.NoError(t, err)
+
+ expectedConfigContent, err := os.ReadFile(buildConfigFile)
+ require.NoError(t, err)
+
+ packageConfigContent, err := extractFileFromRpm(rpmFileBuffer.Bytes(), packageConfigFile)
+ require.NoError(t, err)
+
+ require.Equal(t, expectedConfigContent, packageConfigContent)
+}
+
func TestConfigNoReplace(t *testing.T) {
var (
buildConfigFile = "../testdata/whatever.conf"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nfpm-2.40.0/www/docs/configuration.md new/nfpm-2.41.0/www/docs/configuration.md
--- old/nfpm-2.40.0/www/docs/configuration.md 2024-08-29 13:36:48.000000000 +0200
+++ new/nfpm-2.41.0/www/docs/configuration.md 2024-10-25 16:32:34.000000000 +0200
@@ -2,23 +2,23 @@
## Reference
-A commented `nfpm.yaml` config file example:
+A commented `nfpm.yaml` configuration file example:
```yaml
# Name. (required)
name: foo
# Architecture. (required)
-# This will expand any env var you set in the field, e.g. version: ${GOARCH}
+# This will expand any env var you set in the field, e.g. arch: ${GOARCH}
# The architecture is specified using Go nomenclature (GOARCH) and translated
# to the platform specific equivalent. In order to manually set the architecture
-# to a platform specific value, use deb_arch, rpm_arch and apk_arch.
+# to a platform specific value, set `{format}.arch`.
# Examples: `all`, `amd64`, `386`, `arm5`, `arm6`, `arm7`, `arm64`, `mips`,
# `mipsle`, `mips64le`, `ppc64le`, `s390`
arch: amd64
# Platform.
-# This will expand any env var you set in the field, e.g. version: ${GOOS}
+# This will expand any env var you set in the field, e.g. platform: ${GOOS}
# This is only used by the rpm and deb packagers.
# Examples: `linux` (default), `darwin`
platform: linux
@@ -209,6 +209,12 @@
dst: /etc/bar.conf
type: config|noreplace
+ # Corresponds to `%config(missingok)` if the packager is rpm, otherwise it
+ # is just a config file
+ - src: path/to/local/bar.conf
+ dst: /etc/bar.conf
+ type: config|missingok
+
# These files are not actually present in the package, but the file names
# are added to the package header. From the RPM directives documentation:
#
@@ -320,7 +326,7 @@
rpm:
# rpm specific architecture name that overrides "arch" without performing any
# replacements.
- rpm_arch: ia64
+ arch: ia64
# RPM specific scripts.
scripts:
@@ -369,7 +375,7 @@
# Custom configuration applied only to the Deb packager.
deb:
# deb specific architecture name that overrides "arch" without performing any replacements.
- deb_arch: arm
+ arch: arm
# Custom deb special files.
scripts:
@@ -437,7 +443,7 @@
apk:
# apk specific architecture name that overrides "arch" without performing any replacements.
- apk_arch: armhf
+ arch: armhf
# The package is signed if a key_file is set
signature:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nfpm-2.40.0/www/docs/index.md new/nfpm-2.41.0/www/docs/index.md
--- old/nfpm-2.40.0/www/docs/index.md 2024-08-29 13:36:48.000000000 +0200
+++ new/nfpm-2.41.0/www/docs/index.md 2024-10-25 16:32:34.000000000 +0200
@@ -21,7 +21,7 @@
This is a subtle way of saying it won't have all features, nor all
formats that `fpm` has: it is supposed to be simpler.
-And that's OK!, most of us don't need all those features most of the time.
+And that's OK! Most of us don't need all those features most of the time.
[fpm]: https://github.com/jordansissel/fpm
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nfpm-2.40.0/www/docs/static/latest new/nfpm-2.41.0/www/docs/static/latest
--- old/nfpm-2.40.0/www/docs/static/latest 2024-08-29 13:36:48.000000000 +0200
+++ new/nfpm-2.41.0/www/docs/static/latest 2024-10-25 16:32:34.000000000 +0200
@@ -1 +1 @@
-v2.39.0
+v2.40.0
++++++ nfpm.obsinfo ++++++
--- /var/tmp/diff_new_pack.tLXyWv/_old 2024-10-27 11:25:49.955791220 +0100
+++ /var/tmp/diff_new_pack.tLXyWv/_new 2024-10-27 11:25:49.959791385 +0100
@@ -1,5 +1,5 @@
name: nfpm
-version: 2.40.0
-mtime: 1724931408
-commit: db338d012a43be3c7f9c5a450eca2e279c973de4
+version: 2.41.0
+mtime: 1729866754
+commit: fec4263cb2da9554b4dffaecc606b6392a244c03
++++++ vendor.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/github.com/klauspost/compress/.goreleaser.yml new/vendor/github.com/klauspost/compress/.goreleaser.yml
--- old/vendor/github.com/klauspost/compress/.goreleaser.yml 2024-09-14 18:26:01.000000000 +0200
+++ new/vendor/github.com/klauspost/compress/.goreleaser.yml 2024-10-25 18:53:41.000000000 +0200
@@ -1,5 +1,5 @@
-# This is an example goreleaser.yaml file with some sane defaults.
-# Make sure to check the documentation at http://goreleaser.com
+version: 2
+
before:
hooks:
- ./gen.sh
@@ -99,7 +99,7 @@
checksum:
name_template: 'checksums.txt'
snapshot:
- name_template: "{{ .Tag }}-next"
+ version_template: "{{ .Tag }}-next"
changelog:
sort: asc
filters:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/github.com/klauspost/compress/README.md new/vendor/github.com/klauspost/compress/README.md
--- old/vendor/github.com/klauspost/compress/README.md 2024-09-14 18:26:02.000000000 +0200
+++ new/vendor/github.com/klauspost/compress/README.md 2024-10-25 18:53:41.000000000 +0200
@@ -16,6 +16,27 @@
# changelog
+* Sep 23rd, 2024 - [1.17.10](https://github.com/klauspost/compress/releases/tag/v1.17.10)
+ * gzhttp: Add TransportAlwaysDecompress option. https://github.com/klauspost/compress/pull/978
+ * gzhttp: Add supported decompress request body by @mirecl in https://github.com/klauspost/compress/pull/1002
+ * s2: Add EncodeBuffer buffer recycling callback https://github.com/klauspost/compress/pull/982
+ * zstd: Improve memory usage on small streaming encodes https://github.com/klauspost/compress/pull/1007
+ * flate: read data written with partial flush by @vajexal in https://github.com/klauspost/compress/pull/996
+
+* Jun 12th, 2024 - [1.17.9](https://github.com/klauspost/compress/releases/tag/v1.17.9)
+ * s2: Reduce ReadFrom temporary allocations https://github.com/klauspost/compress/pull/949
+ * flate, zstd: Shave some bytes off amd64 matchLen by @greatroar in https://github.com/klauspost/compress/pull/963
+ * Upgrade zip/zlib to 1.22.4 upstream https://github.com/klauspost/compress/pull/970 https://github.com/klauspost/compress/pull/971
+ * zstd: BuildDict fails with RLE table https://github.com/klauspost/compress/pull/951
+
+* Apr 9th, 2024 - [1.17.8](https://github.com/klauspost/compress/releases/tag/v1.17.8)
+ * zstd: Reject blocks where reserved values are not 0 https://github.com/klauspost/compress/pull/885
+ * zstd: Add RLE detection+encoding https://github.com/klauspost/compress/pull/938
+
+* Feb 21st, 2024 - [1.17.7](https://github.com/klauspost/compress/releases/tag/v1.17.7)
+ * s2: Add AsyncFlush method: Complete the block without flushing by @Jille in https://github.com/klauspost/compress/pull/927
+ * s2: Fix literal+repeat exceeds dst crash https://github.com/klauspost/compress/pull/930
+
* Feb 5th, 2024 - [1.17.6](https://github.com/klauspost/compress/releases/tag/v1.17.6)
* zstd: Fix incorrect repeat coding in best mode https://github.com/klauspost/compress/pull/923
* s2: Fix DecodeConcurrent deadlock on errors https://github.com/klauspost/compress/pull/925
@@ -81,7 +102,7 @@
* zstd: Various minor improvements by @greatroar in https://github.com/klauspost/compress/pull/788 https://github.com/klauspost/compress/pull/794 https://github.com/klauspost/compress/pull/795
* s2: Fix huge block overflow https://github.com/klauspost/compress/pull/779
* s2: Allow CustomEncoder fallback https://github.com/klauspost/compress/pull/780
- * gzhttp: Suppport ResponseWriter Unwrap() in gzhttp handler by @jgimenez in https://github.com/klauspost/compress/pull/799
+ * gzhttp: Support ResponseWriter Unwrap() in gzhttp handler by @jgimenez in https://github.com/klauspost/compress/pull/799
* Mar 13, 2023 - [v1.16.1](https://github.com/klauspost/compress/releases/tag/v1.16.1)
* zstd: Speed up + improve best encoder by @greatroar in https://github.com/klauspost/compress/pull/776
@@ -136,7 +157,7 @@
* zstd: Add [WithDecodeAllCapLimit](https://pkg.go.dev/github.com/klauspost/compress@v1.… https://github.com/klauspost/compress/pull/649
* Add Go 1.19 - deprecate Go 1.16 https://github.com/klauspost/compress/pull/651
* flate: Improve level 5+6 compression https://github.com/klauspost/compress/pull/656
- * zstd: Improve "better" compresssion https://github.com/klauspost/compress/pull/657
+ * zstd: Improve "better" compression https://github.com/klauspost/compress/pull/657
* s2: Improve "best" compression https://github.com/klauspost/compress/pull/658
* s2: Improve "better" compression. https://github.com/klauspost/compress/pull/635
* s2: Slightly faster non-assembly decompression https://github.com/klauspost/compress/pull/646
@@ -339,7 +360,7 @@
* s2: Fix binaries.
* Feb 25, 2021 (v1.11.8)
- * s2: Fixed occational out-of-bounds write on amd64. Upgrade recommended.
+ * s2: Fixed occasional out-of-bounds write on amd64. Upgrade recommended.
* s2: Add AMD64 assembly for better mode. 25-50% faster. [#315](https://github.com/klauspost/compress/pull/315)
* s2: Less upfront decoder allocation. [#322](https://github.com/klauspost/compress/pull/322)
* zstd: Faster "compression" of incompressible data. [#314](https://github.com/klauspost/compress/pull/314)
@@ -518,7 +539,7 @@
* Feb 19, 2016: Faster bit writer, level -2 is 15% faster, level 1 is 4% faster.
* Feb 19, 2016: Handle small payloads faster in level 1-3.
* Feb 19, 2016: Added faster level 2 + 3 compression modes.
-* Feb 19, 2016: [Rebalanced compression levels](https://blog.klauspost.com/rebalancing-deflate-compression-levels/), so there is a more even progresssion in terms of compression. New default level is 5.
+* Feb 19, 2016: [Rebalanced compression levels](https://blog.klauspost.com/rebalancing-deflate-compression-levels/), so there is a more even progression in terms of compression. New default level is 5.
* Feb 14, 2016: Snappy: Merge upstream changes.
* Feb 14, 2016: Snappy: Fix aggressive skipping.
* Feb 14, 2016: Snappy: Update benchmark.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/github.com/klauspost/compress/flate/deflate.go new/vendor/github.com/klauspost/compress/flate/deflate.go
--- old/vendor/github.com/klauspost/compress/flate/deflate.go 2024-09-14 18:26:02.000000000 +0200
+++ new/vendor/github.com/klauspost/compress/flate/deflate.go 2024-10-25 18:53:41.000000000 +0200
@@ -861,7 +861,7 @@
}
switch d.compressionLevel.chain {
case 0:
- // level was NoCompression or ConstantCompresssion.
+ // level was NoCompression or ConstantCompression.
d.windowEnd = 0
default:
s := d.state
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/github.com/klauspost/compress/flate/inflate.go new/vendor/github.com/klauspost/compress/flate/inflate.go
--- old/vendor/github.com/klauspost/compress/flate/inflate.go 2024-09-14 18:26:02.000000000 +0200
+++ new/vendor/github.com/klauspost/compress/flate/inflate.go 2024-10-25 18:53:41.000000000 +0200
@@ -298,6 +298,14 @@
huffmanGenericReader
)
+// flushMode tells decompressor when to return data
+type flushMode uint8
+
+const (
+ syncFlush flushMode = iota // return data after sync flush block
+ partialFlush // return data after each block
+)
+
// Decompress state.
type decompressor struct {
// Input source.
@@ -332,6 +340,8 @@
nb uint
final bool
+
+ flushMode flushMode
}
func (f *decompressor) nextBlock() {
@@ -618,7 +628,10 @@
}
if n == 0 {
- f.toRead = f.dict.readFlush()
+ if f.flushMode == syncFlush {
+ f.toRead = f.dict.readFlush()
+ }
+
f.finishBlock()
return
}
@@ -657,8 +670,12 @@
if f.dict.availRead() > 0 {
f.toRead = f.dict.readFlush()
}
+
f.err = io.EOF
+ } else if f.flushMode == partialFlush && f.dict.availRead() > 0 {
+ f.toRead = f.dict.readFlush()
}
+
f.step = nextBlock
}
@@ -789,15 +806,25 @@
return nil
}
-// NewReader returns a new ReadCloser that can be used
-// to read the uncompressed version of r.
-// If r does not also implement io.ByteReader,
-// the decompressor may read more data than necessary from r.
-// It is the caller's responsibility to call Close on the ReadCloser
-// when finished reading.
-//
-// The ReadCloser returned by NewReader also implements Resetter.
-func NewReader(r io.Reader) io.ReadCloser {
+type ReaderOpt func(*decompressor)
+
+// WithPartialBlock tells decompressor to return after each block,
+// so it can read data written with partial flush
+func WithPartialBlock() ReaderOpt {
+ return func(f *decompressor) {
+ f.flushMode = partialFlush
+ }
+}
+
+// WithDict initializes the reader with a preset dictionary
+func WithDict(dict []byte) ReaderOpt {
+ return func(f *decompressor) {
+ f.dict.init(maxMatchOffset, dict)
+ }
+}
+
+// NewReaderOpts returns new reader with provided options
+func NewReaderOpts(r io.Reader, opts ...ReaderOpt) io.ReadCloser {
fixedHuffmanDecoderInit()
var f decompressor
@@ -806,9 +833,26 @@
f.codebits = new([numCodes]int)
f.step = nextBlock
f.dict.init(maxMatchOffset, nil)
+
+ for _, opt := range opts {
+ opt(&f)
+ }
+
return &f
}
+// NewReader returns a new ReadCloser that can be used
+// to read the uncompressed version of r.
+// If r does not also implement io.ByteReader,
+// the decompressor may read more data than necessary from r.
+// It is the caller's responsibility to call Close on the ReadCloser
+// when finished reading.
+//
+// The ReadCloser returned by NewReader also implements Resetter.
+func NewReader(r io.Reader) io.ReadCloser {
+ return NewReaderOpts(r)
+}
+
// NewReaderDict is like NewReader but initializes the reader
// with a preset dictionary. The returned Reader behaves as if
// the uncompressed data stream started with the given dictionary,
@@ -817,13 +861,5 @@
//
// The ReadCloser returned by NewReader also implements Resetter.
func NewReaderDict(r io.Reader, dict []byte) io.ReadCloser {
- fixedHuffmanDecoderInit()
-
- var f decompressor
- f.r = makeReader(r)
- f.bits = new([maxNumLit + maxNumDist]int)
- f.codebits = new([numCodes]int)
- f.step = nextBlock
- f.dict.init(maxMatchOffset, dict)
- return &f
+ return NewReaderOpts(r, WithDict(dict))
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/github.com/klauspost/compress/fse/decompress.go new/vendor/github.com/klauspost/compress/fse/decompress.go
--- old/vendor/github.com/klauspost/compress/fse/decompress.go 2024-09-14 18:26:02.000000000 +0200
+++ new/vendor/github.com/klauspost/compress/fse/decompress.go 2024-10-25 18:53:41.000000000 +0200
@@ -15,7 +15,7 @@
// It is possible, but by no way guaranteed that corrupt data will
// return an error.
// It is up to the caller to verify integrity of the returned data.
-// Use a predefined Scrach to set maximum acceptable output size.
+// Use a predefined Scratch to set maximum acceptable output size.
func Decompress(b []byte, s *Scratch) ([]byte, error) {
s, err := s.prepare(b)
if err != nil {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/github.com/klauspost/compress/huff0/decompress.go new/vendor/github.com/klauspost/compress/huff0/decompress.go
--- old/vendor/github.com/klauspost/compress/huff0/decompress.go 2024-09-14 18:26:02.000000000 +0200
+++ new/vendor/github.com/klauspost/compress/huff0/decompress.go 2024-10-25 18:53:41.000000000 +0200
@@ -1136,7 +1136,7 @@
errs++
}
if errs > 0 {
- fmt.Fprintf(w, "%d errros in base, stopping\n", errs)
+ fmt.Fprintf(w, "%d errors in base, stopping\n", errs)
continue
}
// Ensure that all combinations are covered.
@@ -1152,7 +1152,7 @@
errs++
}
if errs > 20 {
- fmt.Fprintf(w, "%d errros, stopping\n", errs)
+ fmt.Fprintf(w, "%d errors, stopping\n", errs)
break
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/github.com/klauspost/compress/zstd/blockdec.go new/vendor/github.com/klauspost/compress/zstd/blockdec.go
--- old/vendor/github.com/klauspost/compress/zstd/blockdec.go 2024-09-14 18:26:02.000000000 +0200
+++ new/vendor/github.com/klauspost/compress/zstd/blockdec.go 2024-10-25 18:53:41.000000000 +0200
@@ -598,7 +598,9 @@
printf("RLE set to 0x%x, code: %v", symb, v)
}
case compModeFSE:
- println("Reading table for", tableIndex(i))
+ if debugDecoder {
+ println("Reading table for", tableIndex(i))
+ }
if seq.fse == nil || seq.fse.preDefined {
seq.fse = fseDecoderPool.Get().(*fseDecoder)
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/github.com/klauspost/compress/zstd/enc_better.go new/vendor/github.com/klauspost/compress/zstd/enc_better.go
--- old/vendor/github.com/klauspost/compress/zstd/enc_better.go 2024-09-14 18:26:02.000000000 +0200
+++ new/vendor/github.com/klauspost/compress/zstd/enc_better.go 2024-10-25 18:53:41.000000000 +0200
@@ -179,9 +179,9 @@
if repIndex >= 0 && load3232(src, repIndex) == uint32(cv>>(repOff*8)) {
// Consider history as well.
var seq seq
- lenght := 4 + e.matchlen(s+4+repOff, repIndex+4, src)
+ length := 4 + e.matchlen(s+4+repOff, repIndex+4, src)
- seq.matchLen = uint32(lenght - zstdMinMatch)
+ seq.matchLen = uint32(length - zstdMinMatch)
// We might be able to match backwards.
// Extend as long as we can.
@@ -210,12 +210,12 @@
// Index match start+1 (long) -> s - 1
index0 := s + repOff
- s += lenght + repOff
+ s += length + repOff
nextEmit = s
if s >= sLimit {
if debugEncoder {
- println("repeat ended", s, lenght)
+ println("repeat ended", s, length)
}
break encodeLoop
@@ -241,9 +241,9 @@
if false && repIndex >= 0 && load6432(src, repIndex) == load6432(src, s+repOff) {
// Consider history as well.
var seq seq
- lenght := 8 + e.matchlen(s+8+repOff2, repIndex+8, src)
+ length := 8 + e.matchlen(s+8+repOff2, repIndex+8, src)
- seq.matchLen = uint32(lenght - zstdMinMatch)
+ seq.matchLen = uint32(length - zstdMinMatch)
// We might be able to match backwards.
// Extend as long as we can.
@@ -270,11 +270,11 @@
}
blk.sequences = append(blk.sequences, seq)
- s += lenght + repOff2
+ s += length + repOff2
nextEmit = s
if s >= sLimit {
if debugEncoder {
- println("repeat ended", s, lenght)
+ println("repeat ended", s, length)
}
break encodeLoop
@@ -708,9 +708,9 @@
if repIndex >= 0 && load3232(src, repIndex) == uint32(cv>>(repOff*8)) {
// Consider history as well.
var seq seq
- lenght := 4 + e.matchlen(s+4+repOff, repIndex+4, src)
+ length := 4 + e.matchlen(s+4+repOff, repIndex+4, src)
- seq.matchLen = uint32(lenght - zstdMinMatch)
+ seq.matchLen = uint32(length - zstdMinMatch)
// We might be able to match backwards.
// Extend as long as we can.
@@ -738,12 +738,12 @@
blk.sequences = append(blk.sequences, seq)
// Index match start+1 (long) -> s - 1
- s += lenght + repOff
+ s += length + repOff
nextEmit = s
if s >= sLimit {
if debugEncoder {
- println("repeat ended", s, lenght)
+ println("repeat ended", s, length)
}
break encodeLoop
@@ -772,9 +772,9 @@
if false && repIndex >= 0 && load6432(src, repIndex) == load6432(src, s+repOff) {
// Consider history as well.
var seq seq
- lenght := 8 + e.matchlen(s+8+repOff2, repIndex+8, src)
+ length := 8 + e.matchlen(s+8+repOff2, repIndex+8, src)
- seq.matchLen = uint32(lenght - zstdMinMatch)
+ seq.matchLen = uint32(length - zstdMinMatch)
// We might be able to match backwards.
// Extend as long as we can.
@@ -801,11 +801,11 @@
}
blk.sequences = append(blk.sequences, seq)
- s += lenght + repOff2
+ s += length + repOff2
nextEmit = s
if s >= sLimit {
if debugEncoder {
- println("repeat ended", s, lenght)
+ println("repeat ended", s, length)
}
break encodeLoop
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/github.com/klauspost/compress/zstd/enc_dfast.go new/vendor/github.com/klauspost/compress/zstd/enc_dfast.go
--- old/vendor/github.com/klauspost/compress/zstd/enc_dfast.go 2024-09-14 18:26:02.000000000 +0200
+++ new/vendor/github.com/klauspost/compress/zstd/enc_dfast.go 2024-10-25 18:53:41.000000000 +0200
@@ -138,9 +138,9 @@
if repIndex >= 0 && load3232(src, repIndex) == uint32(cv>>(repOff*8)) {
// Consider history as well.
var seq seq
- lenght := 4 + e.matchlen(s+4+repOff, repIndex+4, src)
+ length := 4 + e.matchlen(s+4+repOff, repIndex+4, src)
- seq.matchLen = uint32(lenght - zstdMinMatch)
+ seq.matchLen = uint32(length - zstdMinMatch)
// We might be able to match backwards.
// Extend as long as we can.
@@ -166,11 +166,11 @@
println("repeat sequence", seq, "next s:", s)
}
blk.sequences = append(blk.sequences, seq)
- s += lenght + repOff
+ s += length + repOff
nextEmit = s
if s >= sLimit {
if debugEncoder {
- println("repeat ended", s, lenght)
+ println("repeat ended", s, length)
}
break encodeLoop
@@ -798,9 +798,9 @@
if repIndex >= 0 && load3232(src, repIndex) == uint32(cv>>(repOff*8)) {
// Consider history as well.
var seq seq
- lenght := 4 + e.matchlen(s+4+repOff, repIndex+4, src)
+ length := 4 + e.matchlen(s+4+repOff, repIndex+4, src)
- seq.matchLen = uint32(lenght - zstdMinMatch)
+ seq.matchLen = uint32(length - zstdMinMatch)
// We might be able to match backwards.
// Extend as long as we can.
@@ -826,11 +826,11 @@
println("repeat sequence", seq, "next s:", s)
}
blk.sequences = append(blk.sequences, seq)
- s += lenght + repOff
+ s += length + repOff
nextEmit = s
if s >= sLimit {
if debugEncoder {
- println("repeat ended", s, lenght)
+ println("repeat ended", s, length)
}
break encodeLoop
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/github.com/klauspost/compress/zstd/encoder.go new/vendor/github.com/klauspost/compress/zstd/encoder.go
--- old/vendor/github.com/klauspost/compress/zstd/encoder.go 2024-09-14 18:26:02.000000000 +0200
+++ new/vendor/github.com/klauspost/compress/zstd/encoder.go 2024-10-25 18:53:41.000000000 +0200
@@ -6,6 +6,7 @@
import (
"crypto/rand"
+ "errors"
"fmt"
"io"
"math"
@@ -149,6 +150,9 @@
// and write CRC if requested.
func (e *Encoder) Write(p []byte) (n int, err error) {
s := &e.state
+ if s.eofWritten {
+ return 0, ErrEncoderClosed
+ }
for len(p) > 0 {
if len(p)+len(s.filling) < e.o.blockSize {
if e.o.crc {
@@ -202,7 +206,7 @@
return nil
}
if final && len(s.filling) > 0 {
- s.current = e.EncodeAll(s.filling, s.current[:0])
+ s.current = e.encodeAll(s.encoder, s.filling, s.current[:0])
var n2 int
n2, s.err = s.w.Write(s.current)
if s.err != nil {
@@ -288,6 +292,9 @@
s.filling, s.current, s.previous = s.previous[:0], s.filling, s.current
s.nInput += int64(len(s.current))
s.wg.Add(1)
+ if final {
+ s.eofWritten = true
+ }
go func(src []byte) {
if debugEncoder {
println("Adding block,", len(src), "bytes, final:", final)
@@ -303,9 +310,6 @@
blk := enc.Block()
enc.Encode(blk, src)
blk.last = final
- if final {
- s.eofWritten = true
- }
// Wait for pending writes.
s.wWg.Wait()
if s.writeErr != nil {
@@ -401,12 +405,20 @@
if len(s.filling) > 0 {
err := e.nextBlock(false)
if err != nil {
+ // Ignore Flush after Close.
+ if errors.Is(s.err, ErrEncoderClosed) {
+ return nil
+ }
return err
}
}
s.wg.Wait()
s.wWg.Wait()
if s.err != nil {
+ // Ignore Flush after Close.
+ if errors.Is(s.err, ErrEncoderClosed) {
+ return nil
+ }
return s.err
}
return s.writeErr
@@ -422,6 +434,9 @@
}
err := e.nextBlock(true)
if err != nil {
+ if errors.Is(s.err, ErrEncoderClosed) {
+ return nil
+ }
return err
}
if s.frameContentSize > 0 {
@@ -459,6 +474,11 @@
}
_, s.err = s.w.Write(frame)
}
+ if s.err == nil {
+ s.err = ErrEncoderClosed
+ return nil
+ }
+
return s.err
}
@@ -469,6 +489,15 @@
// Data compressed with EncodeAll can be decoded with the Decoder,
// using either a stream or DecodeAll.
func (e *Encoder) EncodeAll(src, dst []byte) []byte {
+ e.init.Do(e.initialize)
+ enc := <-e.encoders
+ defer func() {
+ e.encoders <- enc
+ }()
+ return e.encodeAll(enc, src, dst)
+}
+
+func (e *Encoder) encodeAll(enc encoder, src, dst []byte) []byte {
if len(src) == 0 {
if e.o.fullZero {
// Add frame header.
@@ -491,13 +520,7 @@
}
return dst
}
- e.init.Do(e.initialize)
- enc := <-e.encoders
- defer func() {
- // Release encoder reference to last block.
- // If a non-single block is needed the encoder will reset again.
- e.encoders <- enc
- }()
+
// Use single segments when above minimum window and below window size.
single := len(src) <= e.o.windowSize && len(src) > MinWindowSize
if e.o.single != nil {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/github.com/klauspost/compress/zstd/framedec.go new/vendor/github.com/klauspost/compress/zstd/framedec.go
--- old/vendor/github.com/klauspost/compress/zstd/framedec.go 2024-09-14 18:26:02.000000000 +0200
+++ new/vendor/github.com/klauspost/compress/zstd/framedec.go 2024-10-25 18:53:41.000000000 +0200
@@ -146,7 +146,9 @@
}
return err
}
- printf("raw: %x, mantissa: %d, exponent: %d\n", wd, wd&7, wd>>3)
+ if debugDecoder {
+ printf("raw: %x, mantissa: %d, exponent: %d\n", wd, wd&7, wd>>3)
+ }
windowLog := 10 + (wd >> 3)
windowBase := uint64(1) << windowLog
windowAdd := (windowBase / 8) * uint64(wd&0x7)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/github.com/klauspost/compress/zstd/seqdec_amd64.go new/vendor/github.com/klauspost/compress/zstd/seqdec_amd64.go
--- old/vendor/github.com/klauspost/compress/zstd/seqdec_amd64.go 2024-09-14 18:26:02.000000000 +0200
+++ new/vendor/github.com/klauspost/compress/zstd/seqdec_amd64.go 2024-10-25 18:53:41.000000000 +0200
@@ -146,7 +146,7 @@
return true, fmt.Errorf("output bigger than max block size (%d)", maxBlockSize)
default:
- return true, fmt.Errorf("sequenceDecs_decode returned erronous code %d", errCode)
+ return true, fmt.Errorf("sequenceDecs_decode returned erroneous code %d", errCode)
}
s.seqSize += ctx.litRemain
@@ -292,7 +292,7 @@
return io.ErrUnexpectedEOF
}
- return fmt.Errorf("sequenceDecs_decode_amd64 returned erronous code %d", errCode)
+ return fmt.Errorf("sequenceDecs_decode_amd64 returned erroneous code %d", errCode)
}
if ctx.litRemain < 0 {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/github.com/klauspost/compress/zstd/seqdec_amd64.s new/vendor/github.com/klauspost/compress/zstd/seqdec_amd64.s
--- old/vendor/github.com/klauspost/compress/zstd/seqdec_amd64.s 2024-09-14 18:26:02.000000000 +0200
+++ new/vendor/github.com/klauspost/compress/zstd/seqdec_amd64.s 2024-10-25 18:53:41.000000000 +0200
@@ -1814,7 +1814,7 @@
MOVQ 40(SP), AX
ADDQ AX, 48(SP)
- // Calculate poiter to s.out[cap(s.out)] (a past-end pointer)
+ // Calculate pointer to s.out[cap(s.out)] (a past-end pointer)
ADDQ R10, 32(SP)
// outBase += outPosition
@@ -2376,7 +2376,7 @@
MOVQ 40(SP), CX
ADDQ CX, 48(SP)
- // Calculate poiter to s.out[cap(s.out)] (a past-end pointer)
+ // Calculate pointer to s.out[cap(s.out)] (a past-end pointer)
ADDQ R9, 32(SP)
// outBase += outPosition
@@ -2896,7 +2896,7 @@
MOVQ 40(SP), AX
ADDQ AX, 48(SP)
- // Calculate poiter to s.out[cap(s.out)] (a past-end pointer)
+ // Calculate pointer to s.out[cap(s.out)] (a past-end pointer)
ADDQ R10, 32(SP)
// outBase += outPosition
@@ -3560,7 +3560,7 @@
MOVQ 40(SP), CX
ADDQ CX, 48(SP)
- // Calculate poiter to s.out[cap(s.out)] (a past-end pointer)
+ // Calculate pointer to s.out[cap(s.out)] (a past-end pointer)
ADDQ R9, 32(SP)
// outBase += outPosition
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/github.com/klauspost/compress/zstd/zstd.go new/vendor/github.com/klauspost/compress/zstd/zstd.go
--- old/vendor/github.com/klauspost/compress/zstd/zstd.go 2024-09-14 18:26:02.000000000 +0200
+++ new/vendor/github.com/klauspost/compress/zstd/zstd.go 2024-10-25 18:53:41.000000000 +0200
@@ -88,6 +88,10 @@
// Close has been called.
ErrDecoderClosed = errors.New("decoder used after Close")
+ // ErrEncoderClosed will be returned if the Encoder was used after
+ // Close has been called.
+ ErrEncoderClosed = errors.New("encoder used after Close")
+
// ErrDecoderNilInput is returned when a nil Reader was provided
// and an operation other than Reset/DecodeAll/Close was attempted.
ErrDecoderNilInput = errors.New("nil input provided as reader")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/modules.txt new/vendor/modules.txt
--- old/vendor/modules.txt 2024-09-14 18:26:05.000000000 +0200
+++ new/vendor/modules.txt 2024-10-25 18:53:42.000000000 +0200
@@ -204,8 +204,8 @@
# github.com/kevinburke/ssh_config v1.2.0
## explicit
github.com/kevinburke/ssh_config
-# github.com/klauspost/compress v1.17.9
-## explicit; go 1.20
+# github.com/klauspost/compress v1.17.11
+## explicit; go 1.21
github.com/klauspost/compress
github.com/klauspost/compress/flate
github.com/klauspost/compress/fse
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package k0sctl for openSUSE:Factory checked in at 2024-10-27 11:25:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/k0sctl (Old)
and /work/SRC/openSUSE:Factory/.k0sctl.new.2020 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "k0sctl"
Sun Oct 27 11:25:22 2024 rev:7 rq:1218409 version:0.19.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/k0sctl/k0sctl.changes 2024-09-16 17:42:31.923708417 +0200
+++ /work/SRC/openSUSE:Factory/.k0sctl.new.2020/k0sctl.changes 2024-10-27 11:25:47.287680621 +0100
@@ -1,0 +2,25 @@
+Fri Oct 25 12:22:54 UTC 2024 - opensuse_buildservice(a)ojkastl.de
+
+- Update to version 0.19.2:
+ * Fix k0s CPLB config parsing interface conversion panic (#776)
+
+-------------------------------------------------------------------
+Wed Oct 23 08:40:19 UTC 2024 - opensuse_buildservice(a)ojkastl.de
+
+- Update to version 0.19.1:
+ * Use go1.23.2, update dependencies (#774)
+ * Extract etcd membership check into a separate phase (#770)
+ * Remove all SANs manipulation as k0s does it on its own
+ * Validate worker connectivity to cluster-internal addresses
+ * Consider k0s onlyBindToAddress option when building API URLs
+ * Fall back to CPLB virtual address in external API URL
+ * Make Apply action phase list modifiable before Run()
+ * Shortcut to get an UnlockPhase for a LockPhase
+ * Add phase manager SetPhases to allow overriding the whole list
+ * Convenience Phases type for []phase.Phase
+ * Expose phase.Phase
+ * Bump k8s.io/client-go from 0.31.0 to 0.31.1 (#765)
+ * Bump github.com/go-playground/validator/v10 from 10.22.0 to
+ 10.22.1 (#762)
+
+-------------------------------------------------------------------
Old:
----
k0sctl-0.19.0.obscpio
New:
----
k0sctl-0.19.2.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ k0sctl.spec ++++++
--- /var/tmp/diff_new_pack.MJwoD9/_old 2024-10-27 11:25:48.227719587 +0100
+++ /var/tmp/diff_new_pack.MJwoD9/_new 2024-10-27 11:25:48.231719753 +0100
@@ -17,10 +17,8 @@
#
-%define __arch_install_post export NO_BRP_STRIP_DEBUG=true
-
Name: k0sctl
-Version: 0.19.0
+Version: 0.19.2
Release: 0
Summary: A bootstrapping and management tool for k0s clusters
License: Apache-2.0
@@ -28,7 +26,10 @@
URL: https://github.com/k0sproject/k0sctl
Source0: %{name}-%{version}.tar.gz
Source1: vendor.tar.gz
-BuildRequires: go >= 1.22
+BuildRequires: bash-completion
+BuildRequires: fish
+BuildRequires: go >= 1.23.2
+BuildRequires: zsh
%description
k0sctl is a bootstrapping and management tool for k0s clusters.
@@ -95,9 +96,9 @@
sed -i '1d' %{buildroot}%{_datarootdir}/fish/vendor_completions.d/%{name}.fish
# create the zsh completion file
-mkdir -p %{buildroot}%{_datarootdir}/zsh_completion.d/
-%{buildroot}/%{_bindir}/%{name} completion zsh > %{buildroot}%{_datarootdir}/zsh_completion.d/_%{name}
-sed -i '1d' %{buildroot}%{_datarootdir}/zsh_completion.d/_%{name}
+mkdir -p %{buildroot}%{_datarootdir}/zsh/site-functions/
+%{buildroot}/%{_bindir}/%{name} completion zsh > %{buildroot}%{_datarootdir}/zsh/site-functions/_%{name}
+sed -i '1d' %{buildroot}%{_datarootdir}/zsh/site-functions/_%{name}
%check
@@ -107,16 +108,11 @@
%{_bindir}/%{name}
%files -n %{name}-bash-completion
-%dir %{_datarootdir}/bash-completion/completions/
%{_datarootdir}/bash-completion/completions/%{name}
%files -n %{name}-fish-completion
-%dir %{_datarootdir}/fish
-%dir %{_datarootdir}/fish/vendor_completions.d
%{_datarootdir}/fish/vendor_completions.d/%{name}.fish
%files -n %{name}-zsh-completion
-%defattr(-,root,root)
-%dir %{_datarootdir}/zsh_completion.d/
-%{_datarootdir}/zsh_completion.d/_%{name}
+%{_datarootdir}/zsh/site-functions/_%{name}
++++++ _service ++++++
--- /var/tmp/diff_new_pack.MJwoD9/_old 2024-10-27 11:25:48.259720914 +0100
+++ /var/tmp/diff_new_pack.MJwoD9/_new 2024-10-27 11:25:48.263721080 +0100
@@ -2,7 +2,7 @@
<service name="obs_scm" mode="manual">
<param name="url">https://github.com/k0sproject/k0sctl.git</param>
<param name="scm">git</param>
- <param name="revision">v0.19.0</param>
+ <param name="revision">v0.19.2</param>
<param name="versionformat">@PARENT_TAG@</param>
<param name="versionrewrite-pattern">v(.*)</param>
<param name="changesgenerate">enable</param>
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.MJwoD9/_old 2024-10-27 11:25:48.279721743 +0100
+++ /var/tmp/diff_new_pack.MJwoD9/_new 2024-10-27 11:25:48.283721909 +0100
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/k0sproject/k0sctl.git</param>
- <param name="changesrevision">9246ddc823198b572b51fb19bdf5effee4721a9d</param></service></servicedata>
+ <param name="changesrevision">081dfeb085418df4824e00778b092e77f84715ad</param></service></servicedata>
(No newline at EOF)
++++++ k0sctl-0.19.0.obscpio -> k0sctl-0.19.2.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/k0sctl-0.19.0/action/apply.go new/k0sctl-0.19.2/action/apply.go
--- old/k0sctl-0.19.0/action/apply.go 2024-09-11 08:57:50.000000000 +0200
+++ new/k0sctl-0.19.2/action/apply.go 2024-10-25 12:43:06.000000000 +0200
@@ -15,7 +15,7 @@
log "github.com/sirupsen/logrus"
)
-type Apply struct {
+type ApplyOptions struct {
// Manager is the phase manager
Manager *phase.Manager
// DisableDowngradeCheck skips the downgrade check
@@ -36,59 +36,81 @@
ConfigPath string
}
-func (a Apply) Run() error {
- start := time.Now()
-
- phase.NoWait = a.NoWait
- phase.Force = a.Force
+type Apply struct {
+ ApplyOptions
+ Phases phase.Phases
+}
+// NewApply creates a new Apply action. The list of phases can be modified via the Phases field, for example:
+//
+// apply := NewApply(opts)
+// gatherK0sFacts := &phase.GatherK0sFacts{} // advisable to get the title from the phase itself instead of hardcoding the title.
+// apply.Phases.InsertBefore(gatherK0sFacts.Title(), &myCustomPhase{}) // insert a custom phase before the GatherK0sFacts phase
+func NewApply(opts ApplyOptions) *Apply {
lockPhase := &phase.Lock{}
-
- a.Manager.AddPhase(
- &phase.DefaultK0sVersion{},
- &phase.Connect{},
- &phase.DetectOS{},
- lockPhase,
- &phase.PrepareHosts{},
- &phase.GatherFacts{},
- &phase.ValidateHosts{},
- &phase.GatherK0sFacts{},
- &phase.ValidateFacts{SkipDowngradeCheck: a.DisableDowngradeCheck},
-
- // if UploadBinaries: true
- &phase.DownloadBinaries{}, // downloads k0s binaries to local cache
- &phase.UploadK0s{}, // uploads k0s binaries to hosts from cache
-
- // if UploadBinaries: false
- &phase.DownloadK0s{}, // downloads k0s binaries directly from hosts
-
- &phase.UploadFiles{},
- &phase.InstallBinaries{},
- &phase.PrepareArm{},
- &phase.ConfigureK0s{},
- &phase.Restore{
- RestoreFrom: a.RestoreFrom,
+ unlockPhase := lockPhase.UnlockPhase()
+ apply := &Apply{
+ ApplyOptions: opts,
+ Phases: phase.Phases{
+ &phase.DefaultK0sVersion{},
+ &phase.Connect{},
+ &phase.DetectOS{},
+ lockPhase,
+ &phase.PrepareHosts{},
+ &phase.GatherFacts{},
+ &phase.ValidateHosts{},
+ &phase.GatherK0sFacts{},
+ &phase.ValidateFacts{SkipDowngradeCheck: opts.DisableDowngradeCheck},
+ &phase.ValidateEtcdMembers{},
+
+ // if UploadBinaries: true
+ &phase.DownloadBinaries{}, // downloads k0s binaries to local cache
+ &phase.UploadK0s{}, // uploads k0s binaries to hosts from cache
+
+ // if UploadBinaries: false
+ &phase.DownloadK0s{}, // downloads k0s binaries directly from hosts
+
+ &phase.UploadFiles{},
+ &phase.InstallBinaries{},
+ &phase.PrepareArm{},
+ &phase.ConfigureK0s{},
+ &phase.Restore{
+ RestoreFrom: opts.RestoreFrom,
+ },
+ &phase.RunHooks{Stage: "before", Action: "apply"},
+ &phase.InitializeK0s{},
+ &phase.InstallControllers{},
+ &phase.InstallWorkers{},
+ &phase.UpgradeControllers{},
+ &phase.UpgradeWorkers{NoDrain: opts.NoDrain},
+ &phase.Reinstall{},
+ &phase.ResetWorkers{NoDrain: opts.NoDrain},
+ &phase.ResetControllers{NoDrain: opts.NoDrain},
+ &phase.RunHooks{Stage: "after", Action: "apply"},
+ unlockPhase,
+ &phase.Disconnect{},
},
- &phase.RunHooks{Stage: "before", Action: "apply"},
- &phase.InitializeK0s{},
- &phase.InstallControllers{},
- &phase.InstallWorkers{},
- &phase.UpgradeControllers{},
- &phase.UpgradeWorkers{NoDrain: a.NoDrain},
- &phase.Reinstall{},
- &phase.ResetWorkers{NoDrain: a.NoDrain},
- &phase.ResetControllers{NoDrain: a.NoDrain},
- &phase.RunHooks{Stage: "after", Action: "apply"},
- )
+ }
+ if opts.KubeconfigOut != nil {
+ apply.Phases.InsertBefore(unlockPhase.Title(), &phase.GetKubeconfig{APIAddress: opts.KubeconfigAPIAddress})
+ }
- if a.KubeconfigOut != nil {
- a.Manager.AddPhase(&phase.GetKubeconfig{APIAddress: a.KubeconfigAPIAddress})
+ return apply
+}
+
+// Run the Apply action
+func (a Apply) Run() error {
+ if len(a.Phases) == 0 {
+ // for backwards compatibility with the old Apply struct without NewApply(..)
+ tmpApply := NewApply(a.ApplyOptions)
+ a.Phases = tmpApply.Phases
}
+ start := time.Now()
+
+ phase.NoWait = a.NoWait
+ phase.Force = a.Force
- a.Manager.AddPhase(
- &phase.Unlock{Cancel: lockPhase.Cancel},
- &phase.Disconnect{},
- )
+ a.Manager.SetPhases(a.Phases)
analytics.Client.Publish("apply-start", map[string]interface{}{})
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/k0sctl-0.19.0/cmd/apply.go new/k0sctl-0.19.2/cmd/apply.go
--- old/k0sctl-0.19.0/cmd/apply.go 2024-09-11 08:57:50.000000000 +0200
+++ new/k0sctl-0.19.2/cmd/apply.go 2024-10-25 12:43:06.000000000 +0200
@@ -72,7 +72,7 @@
kubeconfigOut = out
}
- applyAction := action.Apply{
+ applyOpts := action.ApplyOptions{
Force: ctx.Bool("force"),
Manager: ctx.Context.Value(ctxManagerKey{}).(*phase.Manager),
KubeconfigOut: kubeconfigOut,
@@ -84,6 +84,8 @@
ConfigPath: ctx.String("config"),
}
+ applyAction := action.NewApply(applyOpts)
+
if err := applyAction.Run(); err != nil {
return fmt.Errorf("apply failed - log file saved to %s: %w", ctx.Context.Value(ctxLogFileKey{}).(string), err)
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/k0sctl-0.19.0/go.mod new/k0sctl-0.19.2/go.mod
--- old/k0sctl-0.19.0/go.mod 2024-09-11 08:57:50.000000000 +0200
+++ new/k0sctl-0.19.2/go.mod 2024-10-25 12:43:06.000000000 +0200
@@ -1,22 +1,20 @@
module github.com/k0sproject/k0sctl
-go 1.22.0
-
-toolchain go1.22.4
+go 1.23.2
require (
github.com/AlecAivazis/survey/v2 v2.3.7
github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 // indirect
github.com/ChrisTrenkamp/goxpath v0.0.0-20210404020558-97928f7e12b6 // indirect
github.com/a8m/envsubst v1.4.2
- github.com/adrg/xdg v0.5.0
- github.com/bmatcuk/doublestar/v4 v4.6.1
+ github.com/adrg/xdg v0.5.1
+ github.com/bmatcuk/doublestar/v4 v4.7.1
github.com/creasty/defaults v1.8.0
github.com/denisbrodbeck/machineid v1.0.1
github.com/gofrs/uuid v4.4.0+incompatible // indirect
github.com/hashicorp/go-version v1.7.0 // indirect
github.com/k0sproject/dig v0.2.0
- github.com/k0sproject/rig v0.18.7
+ github.com/k0sproject/rig v0.18.8
github.com/logrusorgru/aurora v2.0.3+incompatible
github.com/masterzen/simplexml v0.0.0-20190410153822-31eea3082786 // indirect
github.com/masterzen/winrm v0.0.0-20240702205601-3fad6e106085 // indirect
@@ -26,24 +24,24 @@
github.com/shiena/ansicolor v0.0.0-20230509054315-a9deabde6e02
github.com/sirupsen/logrus v1.9.3
github.com/stretchr/testify v1.9.0
- github.com/urfave/cli/v2 v2.27.4
+ github.com/urfave/cli/v2 v2.27.5
github.com/xtgo/uuid v0.0.0-20140804021211-a0b114877d4c // indirect
- golang.org/x/crypto v0.26.0 // indirect
- golang.org/x/net v0.28.0 // indirect
- golang.org/x/sys v0.23.0 // indirect
- golang.org/x/term v0.23.0 // indirect
- golang.org/x/text v0.18.0
+ golang.org/x/crypto v0.28.0 // indirect
+ golang.org/x/net v0.30.0 // indirect
+ golang.org/x/sys v0.26.0 // indirect
+ golang.org/x/term v0.25.0 // indirect
+ golang.org/x/text v0.19.0
gopkg.in/yaml.v2 v2.4.0
)
require (
github.com/alessio/shellescape v1.4.2
github.com/carlmjohnson/versioninfo v0.22.5
- github.com/go-playground/validator/v10 v10.22.0
+ github.com/go-playground/validator/v10 v10.22.1
github.com/jellydator/validation v1.1.0
github.com/k0sproject/version v0.6.0
github.com/sergi/go-diff v1.3.1
- k8s.io/client-go v0.31.0
+ k8s.io/client-go v0.31.1
)
require (
@@ -52,11 +50,11 @@
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
github.com/bodgit/ntlmssp v0.0.0-20240506230425-31973bb52d9b // indirect
github.com/bodgit/windows v1.0.1 // indirect
- github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
+ github.com/cpuguy83/go-md2man/v2 v2.0.5 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/davidmz/go-pageant v1.0.2 // indirect
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
- github.com/gabriel-vasile/mimetype v1.4.4 // indirect
+ github.com/gabriel-vasile/mimetype v1.4.6 // indirect
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-playground/locales v0.14.1 // indirect
github.com/go-playground/universal-translator v0.18.1 // indirect
@@ -88,14 +86,14 @@
github.com/tidwall/transform v0.0.0-20201103190739-32f242e2dbde // indirect
github.com/x448/float16 v0.8.4 // indirect
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
- golang.org/x/oauth2 v0.21.0 // indirect
- golang.org/x/time v0.5.0 // indirect
+ golang.org/x/oauth2 v0.23.0 // indirect
+ golang.org/x/time v0.7.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
- k8s.io/apimachinery v0.31.0 // indirect
+ k8s.io/apimachinery v0.31.1 // indirect
k8s.io/klog/v2 v2.130.1 // indirect
- k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
- sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
+ k8s.io/utils v0.0.0-20240921022957-49e7df575cb6 // indirect
+ sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
sigs.k8s.io/yaml v1.4.0 // indirect
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/k0sctl-0.19.0/go.sum new/k0sctl-0.19.2/go.sum
--- old/k0sctl-0.19.0/go.sum 2024-09-11 08:57:50.000000000 +0200
+++ new/k0sctl-0.19.2/go.sum 2024-10-25 12:43:06.000000000 +0200
@@ -12,23 +12,23 @@
github.com/a8m/envsubst v1.4.2/go.mod h1:MVUTQNGQ3tsjOOtKCNd+fl8RzhsXcDvvAEzkhGtlsbY=
github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d h1:licZJFw2RwpHMqeKTCYkitsPqHNxTmd4SNR5r94FGM8=
github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d/go.mod h1:asat636LX7Bqt5lYEZ27JNDcqxfjdBQuJ/MM4CN/Lzo=
-github.com/adrg/xdg v0.5.0 h1:dDaZvhMXatArP1NPHhnfaQUqWBLBsmx1h1HXQdMoFCY=
-github.com/adrg/xdg v0.5.0/go.mod h1:dDdY4M4DF9Rjy4kHPeNL+ilVF+p2lK8IdM9/rTSGcI4=
+github.com/adrg/xdg v0.5.1 h1:Im8iDbEFARltY09yOJlSGu4Asjk2vF85+3Dyru8uJ0U=
+github.com/adrg/xdg v0.5.1/go.mod h1:nlTsY+NNiCBGCK2tpm09vRqfVzrc2fLmXGpBLF0zlTQ=
github.com/alessio/shellescape v1.4.2 h1:MHPfaU+ddJ0/bYWpgIeUnQUqKrlJ1S7BfEYPM4uEoM0=
github.com/alessio/shellescape v1.4.2/go.mod h1:PZAiSCk0LJaZkiCSkPv8qIobYglO3FPpyFjDCtHLS30=
github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw=
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3dyBCFEj5IhUbnKptjxatkF07cF2ak3yi77so=
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw=
-github.com/bmatcuk/doublestar/v4 v4.6.1 h1:FH9SifrbvJhnlQpztAx++wlkk70QBf0iBWDwNy7PA4I=
-github.com/bmatcuk/doublestar/v4 v4.6.1/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc=
+github.com/bmatcuk/doublestar/v4 v4.7.1 h1:fdDeAqgT47acgwd9bd9HxJRDmc9UAmPpc+2m0CXv75Q=
+github.com/bmatcuk/doublestar/v4 v4.7.1/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc=
github.com/bodgit/ntlmssp v0.0.0-20240506230425-31973bb52d9b h1:baFN6AnR0SeC194X2D292IUZcHDs4JjStpqtE70fjXE=
github.com/bodgit/ntlmssp v0.0.0-20240506230425-31973bb52d9b/go.mod h1:Ram6ngyPDmP+0t6+4T2rymv0w0BS9N8Ch5vvUJccw5o=
github.com/bodgit/windows v1.0.1 h1:tF7K6KOluPYygXa3Z2594zxlkbKPAOvqr97etrGNIz4=
github.com/bodgit/windows v1.0.1/go.mod h1:a6JLwrB4KrTR5hBpp8FI9/9W9jJfeQ2h4XDXU74ZCdM=
github.com/carlmjohnson/versioninfo v0.22.5 h1:O00sjOLUAFxYQjlN/bzYTuZiS0y6fWDQjMRvwtKgwwc=
github.com/carlmjohnson/versioninfo v0.22.5/go.mod h1:QT9mph3wcVfISUKd0i9sZfVrPviHuSF+cUtLjm2WSf8=
-github.com/cpuguy83/go-md2man/v2 v2.0.4 h1:wfIWP927BUkWJb2NmU/kNDYIBTh/ziUX91+lVfRxZq4=
-github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
+github.com/cpuguy83/go-md2man/v2 v2.0.5 h1:ZtcqGrnekaHpVLArFSe4HK5DoKx1T0rq2DwVB0alcyc=
+github.com/cpuguy83/go-md2man/v2 v2.0.5/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
github.com/creack/pty v1.1.17 h1:QeVUsEDNrLBW4tMgZHvxy18sKtr6VI492kBhUfhDJNI=
github.com/creack/pty v1.1.17/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4=
@@ -46,8 +46,8 @@
github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
github.com/fxamacker/cbor/v2 v2.7.0 h1:iM5WgngdRBanHcxugY4JySA0nk1wZorNOpTgCMedv5E=
github.com/fxamacker/cbor/v2 v2.7.0/go.mod h1:pxXPTn3joSm21Gbwsv0w9OSA2y1HFR9qXEeXQVeNoDQ=
-github.com/gabriel-vasile/mimetype v1.4.4 h1:QjV6pZ7/XZ7ryI2KuyeEDE8wnh7fHP9YnQy+R0LnH8I=
-github.com/gabriel-vasile/mimetype v1.4.4/go.mod h1:JwLei5XPtWdGiMFB5Pjle1oEeoSeEuJfJE+TtfvdB/s=
+github.com/gabriel-vasile/mimetype v1.4.6 h1:3+PzJTKLkvgjeTbts6msPJt4DixhT4YtFNf1gtGe3zc=
+github.com/gabriel-vasile/mimetype v1.4.6/go.mod h1:JX1qVKqZd40hUPpAfiNTe0Sne7hdfKSbOqqmkq8GCXc=
github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
github.com/go-openapi/jsonpointer v0.19.6 h1:eCs3fxoIi3Wh6vtgmLTOjdhSpiqphQ+DaPn38N2ZdrE=
@@ -62,8 +62,8 @@
github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY=
github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=
github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
-github.com/go-playground/validator/v10 v10.22.0 h1:k6HsTZ0sTnROkhS//R0O+55JgM8C4Bx7ia+JlgcnOao=
-github.com/go-playground/validator/v10 v10.22.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM=
+github.com/go-playground/validator/v10 v10.22.1 h1:40JcKH+bBNGFczGuoBYgX4I6m/i27HYW8P9FDk5PbgA=
+github.com/go-playground/validator/v10 v10.22.1/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM=
github.com/gofrs/uuid v4.4.0+incompatible h1:3qXRTX8/NbyulANqlc0lchS1gqAVxRgsuW1YrTJupqA=
github.com/gofrs/uuid v4.4.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
@@ -115,8 +115,8 @@
github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
github.com/k0sproject/dig v0.2.0 h1:cNxEIl96g9kqSMfPSZLhpnZ0P8bWXKv08nxvsMHop5w=
github.com/k0sproject/dig v0.2.0/go.mod h1:rBcqaQlJpcKdt2x/OE/lPvhGU50u/e95CSm5g/r4s78=
-github.com/k0sproject/rig v0.18.7 h1:MFLTVmhj+lGcCHbemwoWorlCD26CwzxhKckec+lGgdc=
-github.com/k0sproject/rig v0.18.7/go.mod h1:FS9xKO2a4hco2XthIcXnYBozKSLr/V3tlP+fWi7OVyE=
+github.com/k0sproject/rig v0.18.8 h1:Dudzljvztdk5f5DGV8f07eRZBIXRTxpIslEMhRthLNA=
+github.com/k0sproject/rig v0.18.8/go.mod h1:rV9v56TQ6e62jgpAO1kEuoMMczwNH/I1MIxiV8gsvmg=
github.com/k0sproject/version v0.6.0 h1:Wi8wu9j+H36+okIQA47o/YHbzNpKeIYj8IjGdJOdqsI=
github.com/k0sproject/version v0.6.0/go.mod h1:5/7Js62gDCLBP6mEs0mUcYEEkYneM5qXDKN/hyFlQTM=
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs=
@@ -196,8 +196,8 @@
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
github.com/tidwall/transform v0.0.0-20201103190739-32f242e2dbde h1:AMNpJRc7P+GTwVbl8DkK2I9I8BBUzNiHuH/tlxrpan0=
github.com/tidwall/transform v0.0.0-20201103190739-32f242e2dbde/go.mod h1:MvrEmduDUz4ST5pGZ7CABCnOU5f3ZiOAZzT6b1A6nX8=
-github.com/urfave/cli/v2 v2.27.4 h1:o1owoI+02Eb+K107p27wEX9Bb8eqIoZCfLXloLUSWJ8=
-github.com/urfave/cli/v2 v2.27.4/go.mod h1:m4QzxcD2qpra4z7WhzEGn74WZLViBnMpb1ToCAKdGRQ=
+github.com/urfave/cli/v2 v2.27.5 h1:WoHEJLdsXr6dDWoJgMq/CboDmyY/8HMMH1fTECbih+w=
+github.com/urfave/cli/v2 v2.27.5/go.mod h1:3Sevf16NykTbInEnD0yKkjDAeZDS0A6bzhBH5hrMvTQ=
github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 h1:gEOO8jv9F4OT7lGCjxCBTO/36wtF6j2nSip77qHd4x4=
@@ -213,8 +213,8 @@
golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8=
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
-golang.org/x/crypto v0.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw=
-golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54=
+golang.org/x/crypto v0.28.0 h1:GBDwsMXVQi34v5CCYUm2jkJvu4cbtru2U4TN2PSyQnw=
+golang.org/x/crypto v0.28.0/go.mod h1:rmgy+3RHxRZMyY0jjAJShp2zgEdOqj2AO7U0pYmeQ7U=
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
@@ -227,10 +227,10 @@
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
-golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE=
-golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg=
-golang.org/x/oauth2 v0.21.0 h1:tsimM75w1tF/uws5rbeHzIWxEqElMehnc+iW793zsZs=
-golang.org/x/oauth2 v0.21.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
+golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4=
+golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU=
+golang.org/x/oauth2 v0.23.0 h1:PbgcYx2W7i4LvjJWEbf0ngHV6qJYr86PkAV3bXdLEbs=
+golang.org/x/oauth2 v0.23.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -247,22 +247,22 @@
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.23.0 h1:YfKFowiIMvtgl1UERQoTPPToxltDeZfbj4H7dVUCwmM=
-golang.org/x/sys v0.23.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo=
+golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
-golang.org/x/term v0.23.0 h1:F6D4vR+EHoL9/sWAWgAR1H2DcHr4PareCbAaCo1RpuU=
-golang.org/x/term v0.23.0/go.mod h1:DgV24QBUrK6jhZXl+20l6UWznPlwAHm1Q1mGHtydmSk=
+golang.org/x/term v0.25.0 h1:WtHI/ltw4NvSUig5KARz9h521QvRC8RmF/cuYqifU24=
+golang.org/x/term v0.25.0/go.mod h1:RPyXicDX+6vLxogjjRxjgD2TKtmAO6NZBsBRfrOLu7M=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224=
-golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
-golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
-golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
+golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM=
+golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
+golang.org/x/time v0.7.0 h1:ntUhktv3OPE6TgYxXWv9vKvUSJyIFJlyohwbkEwPrKQ=
+golang.org/x/time v0.7.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
@@ -286,20 +286,20 @@
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-k8s.io/api v0.31.0 h1:b9LiSjR2ym/SzTOlfMHm1tr7/21aD7fSkqgD/CVJBCo=
-k8s.io/api v0.31.0/go.mod h1:0YiFF+JfFxMM6+1hQei8FY8M7s1Mth+z/q7eF1aJkTE=
-k8s.io/apimachinery v0.31.0 h1:m9jOiSr3FoSSL5WO9bjm1n6B9KROYYgNZOb4tyZ1lBc=
-k8s.io/apimachinery v0.31.0/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
-k8s.io/client-go v0.31.0 h1:QqEJzNjbN2Yv1H79SsS+SWnXkBgVu4Pj3CJQgbx0gI8=
-k8s.io/client-go v0.31.0/go.mod h1:Y9wvC76g4fLjmU0BA+rV+h2cncoadjvjjkkIGoTLcGU=
+k8s.io/api v0.31.1 h1:Xe1hX/fPW3PXYYv8BlozYqw63ytA92snr96zMW9gWTU=
+k8s.io/api v0.31.1/go.mod h1:sbN1g6eY6XVLeqNsZGLnI5FwVseTrZX7Fv3O26rhAaI=
+k8s.io/apimachinery v0.31.1 h1:mhcUBbj7KUjaVhyXILglcVjuS4nYXiwC+KKFBgIVy7U=
+k8s.io/apimachinery v0.31.1/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
+k8s.io/client-go v0.31.1 h1:f0ugtWSbWpxHR7sjVpQwuvw9a3ZKLXX0u0itkFXufb0=
+k8s.io/client-go v0.31.1/go.mod h1:sKI8871MJN2OyeqRlmA4W4KM9KBdBUpDLu/43eGemCg=
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7FjZpUb45WallggurYhKGag=
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340/go.mod h1:yD4MZYeKMBwQKVht279WycxKyM84kkAx2DPrTXaeb98=
-k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1J8+AsQnQCKsi8A=
-k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
-sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
-sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
+k8s.io/utils v0.0.0-20240921022957-49e7df575cb6 h1:MDF6h2H/h4tbzmtIKTuctcwZmY0tY9mD9fNT47QO6HI=
+k8s.io/utils v0.0.0-20240921022957-49e7df575cb6/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
+sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE=
+sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg=
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4=
sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08=
sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/k0sctl-0.19.0/phase/backup.go new/k0sctl-0.19.2/phase/backup.go
--- old/k0sctl-0.19.0/phase/backup.go 2024-09-11 08:57:50.000000000 +0200
+++ new/k0sctl-0.19.2/phase/backup.go 2024-10-25 12:43:06.000000000 +0200
@@ -14,7 +14,7 @@
log "github.com/sirupsen/logrus"
)
-var _ phase = &Backup{}
+var _ Phase = &Backup{}
var backupSinceVersion = version.MustConstraint(">= v1.21.0-rc.1+k0s.0")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/k0sctl-0.19.0/phase/configure_k0s.go new/k0sctl-0.19.2/phase/configure_k0s.go
--- old/k0sctl-0.19.0/phase/configure_k0s.go 2024-09-11 08:57:50.000000000 +0200
+++ new/k0sctl-0.19.2/phase/configure_k0s.go 2024-10-25 12:43:06.000000000 +0200
@@ -183,7 +183,7 @@
func (p *ConfigureK0s) Run() error {
controllers := p.Config.Spec.Hosts.Controllers().Filter(func(h *cluster.Host) bool {
return !h.Reset && len(h.Metadata.K0sNewConfig) > 0
- })
+ })
return p.parallelDo(controllers, p.configureK0s)
}
@@ -270,19 +270,6 @@
return nil
}
-func addUnlessExist(slice *[]string, s string) {
- var found bool
- for _, v := range *slice {
- if v == s {
- found = true
- break
- }
- }
- if !found {
- *slice = append(*slice, s)
- }
-}
-
func (p *ConfigureK0s) configFor(h *cluster.Host) (string, error) {
var cfg dig.Mapping
@@ -298,40 +285,12 @@
cfg = p.newBaseConfig.Dup()
}
- var sans []string
-
var addr string
if h.PrivateAddress != "" {
addr = h.PrivateAddress
} else {
addr = h.Address()
}
- cfg.DigMapping("spec", "api")["address"] = addr
- addUnlessExist(&sans, addr)
-
- oldsans := cfg.Dig("spec", "api", "sans")
- switch oldsans := oldsans.(type) {
- case []interface{}:
- for _, v := range oldsans {
- if s, ok := v.(string); ok {
- addUnlessExist(&sans, s)
- }
- }
- case []string:
- for _, v := range oldsans {
- addUnlessExist(&sans, v)
- }
- }
-
- var controllers cluster.Hosts = p.Config.Spec.Hosts.Controllers()
- for _, c := range controllers {
- addUnlessExist(&sans, c.Address())
- if c.PrivateAddress != "" {
- addUnlessExist(&sans, c.PrivateAddress)
- }
- }
- addUnlessExist(&sans, "127.0.0.1")
- cfg.DigMapping("spec", "api")["sans"] = sans
if cfg.Dig("spec", "storage", "etcd", "peerAddress") != nil || h.PrivateAddress != "" {
cfg.DigMapping("spec", "storage", "etcd")["peerAddress"] = addr
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/k0sctl-0.19.0/phase/get_kubeconfig.go new/k0sctl-0.19.2/phase/get_kubeconfig.go
--- old/k0sctl-0.19.0/phase/get_kubeconfig.go 2024-09-11 08:57:50.000000000 +0200
+++ new/k0sctl-0.19.2/phase/get_kubeconfig.go 2024-10-25 12:43:06.000000000 +0200
@@ -2,13 +2,10 @@
import (
"fmt"
- "strings"
"github.com/alessio/shellescape"
- "github.com/k0sproject/dig"
"github.com/k0sproject/k0sctl/pkg/apis/k0sctl.k0sproject.io/v1beta1/cluster"
"github.com/k0sproject/rig/exec"
- "gopkg.in/yaml.v2"
"k8s.io/client-go/tools/clientcmd"
)
@@ -31,24 +28,6 @@
return output, nil
}
-var k0sConfig = func(h *cluster.Host) (dig.Mapping, error) {
- cfgContent, err := h.Configurer.ReadFile(h, h.Configurer.K0sConfigPath())
- if err != nil {
- return nil, fmt.Errorf("read k0s config from host: %w", err)
- }
-
- var cfg dig.Mapping
- if err := yaml.Unmarshal([]byte(cfgContent), &cfg); err != nil {
- return nil, fmt.Errorf("unmarshal k0s config: %w", err)
- }
-
- if err != nil {
- return nil, fmt.Errorf("parse k0s config: %w", err)
- }
-
- return cfg, nil
-}
-
func (p *GetKubeconfig) DryRun() error {
p.DryMsg(p.Config.Spec.Hosts.Controllers()[0], "get admin kubeconfig")
return nil
@@ -58,34 +37,13 @@
func (p *GetKubeconfig) Run() error {
h := p.Config.Spec.Hosts.Controllers()[0]
- cfg, err := k0sConfig(h)
- if err != nil {
- return err
- }
-
output, err := readKubeconfig(h)
if err != nil {
return fmt.Errorf("read kubeconfig from host: %w", err)
}
if p.APIAddress == "" {
- // the controller admin.conf is aways pointing to localhost, thus we need to change the address
- // something usable from outside
- address := h.Address()
- if a, ok := cfg.Dig("spec", "api", "externalAddress").(string); ok && a != "" {
- address = a
- }
-
- port := 6443
- if p, ok := cfg.Dig("spec", "api", "port").(int); ok && p != 0 {
- port = p
- }
-
- if strings.Contains(address, ":") {
- p.APIAddress = fmt.Sprintf("https://[%s]:%d", address, port)
- } else {
- p.APIAddress = fmt.Sprintf("https://%s:%d", address, port)
- }
+ p.APIAddress = p.Config.Spec.KubeAPIURL()
}
cfgString, err := kubeConfig(output, p.Config.Metadata.Name, p.APIAddress)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/k0sctl-0.19.0/phase/get_kubeconfig_test.go new/k0sctl-0.19.2/phase/get_kubeconfig_test.go
--- old/k0sctl-0.19.0/phase/get_kubeconfig_test.go 2024-09-11 08:57:50.000000000 +0200
+++ new/k0sctl-0.19.2/phase/get_kubeconfig_test.go 2024-10-25 12:43:06.000000000 +0200
@@ -49,12 +49,6 @@
defer func() { readKubeconfig = origReadKubeconfig }()
readKubeconfig = fakeReader
- origK0sConfig := k0sConfig
- defer func() { k0sConfig = origK0sConfig }()
- k0sConfig = func(h *cluster.Host) (dig.Mapping, error) {
- return cfg.Spec.K0s.Config, nil
- }
-
p := GetKubeconfig{GenericPhase: GenericPhase{Config: cfg}}
require.NoError(t, p.Run())
conf, err := clientcmd.Load([]byte(cfg.Metadata.Kubeconfig))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/k0sctl-0.19.0/phase/initialize_k0s.go new/k0sctl-0.19.2/phase/initialize_k0s.go
--- old/k0sctl-0.19.0/phase/initialize_k0s.go 2024-09-11 08:57:50.000000000 +0200
+++ new/k0sctl-0.19.2/phase/initialize_k0s.go 2024-10-25 12:43:06.000000000 +0200
@@ -100,7 +100,6 @@
}
return nil
})
-
if err != nil {
return err
}
@@ -116,18 +115,13 @@
return err
}
- port := 6443
- if p, ok := p.Config.Spec.K0s.Config.Dig("spec", "api", "port").(int); ok {
- port = p
- }
log.Infof("%s: waiting for kubernetes api to respond", h)
- if err := retry.Timeout(context.TODO(), retry.DefaultTimeout, node.KubeAPIReadyFunc(h, port)); err != nil {
+ if err := retry.Timeout(context.TODO(), retry.DefaultTimeout, node.KubeAPIReadyFunc(h, p.Config)); err != nil {
return err
}
return nil
})
-
if err != nil {
return err
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/k0sctl-0.19.0/phase/install_controllers.go new/k0sctl-0.19.2/phase/install_controllers.go
--- old/k0sctl-0.19.0/phase/install_controllers.go 2024-09-11 08:57:50.000000000 +0200
+++ new/k0sctl-0.19.2/phase/install_controllers.go 2024-10-25 12:43:06.000000000 +0200
@@ -88,7 +88,7 @@
// Run the phase
func (p *InstallControllers) Run() error {
- url := p.Config.Spec.KubeAPIURL()
+ url := p.Config.Spec.InternalKubeAPIURL()
healthz := fmt.Sprintf("%s/healthz", url)
err := p.parallelDo(p.hosts, func(h *cluster.Host) error {
@@ -191,11 +191,6 @@
}
func (p *InstallControllers) waitJoined(h *cluster.Host) error {
- port := 6443
- if p, ok := p.Config.Spec.K0s.Config.Dig("spec", "api", "port").(int); ok {
- port = p
- }
-
log.Infof("%s: waiting for kubernetes api to respond", h)
- return retry.Timeout(context.TODO(), retry.DefaultTimeout, node.KubeAPIReadyFunc(h, port))
+ return retry.Timeout(context.TODO(), retry.DefaultTimeout, node.KubeAPIReadyFunc(h, p.Config))
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/k0sctl-0.19.0/phase/install_workers.go new/k0sctl-0.19.2/phase/install_workers.go
--- old/k0sctl-0.19.0/phase/install_workers.go 2024-09-11 08:57:50.000000000 +0200
+++ new/k0sctl-0.19.2/phase/install_workers.go 2024-10-25 12:43:06.000000000 +0200
@@ -98,7 +98,7 @@
// Run the phase
func (p *InstallWorkers) Run() error {
- url := p.Config.Spec.KubeAPIURL()
+ url := p.Config.Spec.InternalKubeAPIURL()
healthz := fmt.Sprintf("%s/healthz", url)
err := p.parallelDo(p.hosts, func(h *cluster.Host) error {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/k0sctl-0.19.0/phase/lock.go new/k0sctl-0.19.2/phase/lock.go
--- old/k0sctl-0.19.0/phase/lock.go 2024-09-11 08:57:50.000000000 +0200
+++ new/k0sctl-0.19.2/phase/lock.go 2024-10-25 12:43:06.000000000 +0200
@@ -52,6 +52,11 @@
p.Cancel()
}
+// UnlockPhase returns an unlock phase for this lock phase
+func (p *Lock) UnlockPhase() Phase {
+ return &Unlock{Cancel: p.Cancel}
+}
+
// Run the phase
func (p *Lock) Run() error {
if err := p.parallelDo(p.Config.Spec.Hosts, p.startLock); err != nil {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/k0sctl-0.19.0/phase/manager.go new/k0sctl-0.19.2/phase/manager.go
--- old/k0sctl-0.19.0/phase/manager.go 2024-09-11 08:57:50.000000000 +0200
+++ new/k0sctl-0.19.2/phase/manager.go 2024-10-25 12:43:06.000000000 +0200
@@ -19,11 +19,61 @@
// Colorize is an instance of "aurora", used to colorize the output
var Colorize = aurora.NewAurora(false)
-type phase interface {
+// Phase represents a runnable phase which can be added to Manager.
+type Phase interface {
Run() error
Title() string
}
+// Phases is a slice of Phases
+type Phases []Phase
+
+// Index returns the index of the first occurrence matching the given phase title or -1 if not found
+func (p Phases) Index(title string) int {
+ for i, phase := range p {
+ if phase.Title() == title {
+ return i
+ }
+ }
+ return -1
+}
+
+// Remove removes the first occurrence of a phase with the given title
+func (p *Phases) Remove(title string) {
+ i := p.Index(title)
+ if i == -1 {
+ return
+ }
+ *p = append((*p)[:i], (*p)[i+1:]...)
+}
+
+// InsertAfter inserts a phase after the first occurrence of a phase with the given title
+func (p *Phases) InsertAfter(title string, phase Phase) {
+ i := p.Index(title)
+ if i == -1 {
+ return
+ }
+ *p = append((*p)[:i+1], append(Phases{phase}, (*p)[i+1:]...)...)
+}
+
+// InsertBefore inserts a phase before the first occurrence of a phase with the given title
+func (p *Phases) InsertBefore(title string, phase Phase) {
+ i := p.Index(title)
+ if i == -1 {
+ return
+ }
+ *p = append((*p)[:i], append(Phases{phase}, (*p)[i:]...)...)
+}
+
+// Replace replaces the first occurrence of a phase with the given title
+func (p *Phases) Replace(title string, phase Phase) {
+ i := p.Index(title)
+ if i == -1 {
+ return
+ }
+ (*p)[i] = phase
+}
+
type withconfig interface {
Title() string
Prepare(*v1beta1.Cluster) error
@@ -60,7 +110,7 @@
// Manager executes phases to construct the cluster
type Manager struct {
- phases []phase
+ phases Phases
Config *v1beta1.Cluster
Concurrency int
ConcurrentUploads int
@@ -80,10 +130,15 @@
}
// AddPhase adds a Phase to Manager
-func (m *Manager) AddPhase(p ...phase) {
+func (m *Manager) AddPhase(p ...Phase) {
m.phases = append(m.phases, p...)
}
+// SetPhases sets the list of phases
+func (m *Manager) SetPhases(p Phases) {
+ m.phases = p
+}
+
type errorfunc func() error
// DryMsg prints a message in dry-run mode
@@ -124,7 +179,7 @@
// Run executes all the added Phases in order
func (m *Manager) Run() error {
- var ran []phase
+ var ran []Phase
var result error
defer func() {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/k0sctl-0.19.0/phase/runhooks.go new/k0sctl-0.19.2/phase/runhooks.go
--- old/k0sctl-0.19.0/phase/runhooks.go 2024-09-11 08:57:50.000000000 +0200
+++ new/k0sctl-0.19.2/phase/runhooks.go 2024-10-25 12:43:06.000000000 +0200
@@ -10,7 +10,7 @@
"github.com/k0sproject/k0sctl/pkg/apis/k0sctl.k0sproject.io/v1beta1/cluster"
)
-var _ phase = &RunHooks{}
+var _ Phase = &RunHooks{}
// RunHooks phase runs a set of hooks configured for the host
type RunHooks struct {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/k0sctl-0.19.0/phase/upgrade_controllers.go new/k0sctl-0.19.2/phase/upgrade_controllers.go
--- old/k0sctl-0.19.0/phase/upgrade_controllers.go 2024-09-11 08:57:50.000000000 +0200
+++ new/k0sctl-0.19.2/phase/upgrade_controllers.go 2024-10-25 12:43:06.000000000 +0200
@@ -131,13 +131,9 @@
if err != nil {
return err
}
- port := 6443
- if p, ok := p.Config.Spec.K0s.Config.Dig("spec", "api", "port").(int); ok {
- port = p
- }
if p.IsWet() {
- if err := retry.Timeout(context.TODO(), retry.DefaultTimeout, node.KubeAPIReadyFunc(h, port)); err != nil {
+ if err := retry.Timeout(context.TODO(), retry.DefaultTimeout, node.KubeAPIReadyFunc(h, p.Config)); err != nil {
return fmt.Errorf("kube api did not become ready: %w", err)
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/k0sctl-0.19.0/phase/validate_etcd_members.go new/k0sctl-0.19.2/phase/validate_etcd_members.go
--- old/k0sctl-0.19.0/phase/validate_etcd_members.go 1970-01-01 01:00:00.000000000 +0100
+++ new/k0sctl-0.19.2/phase/validate_etcd_members.go 2024-10-25 12:43:06.000000000 +0200
@@ -0,0 +1,90 @@
+package phase
+
+import (
+ "fmt"
+ "slices"
+
+ "github.com/k0sproject/k0sctl/pkg/apis/k0sctl.k0sproject.io/v1beta1"
+ "github.com/k0sproject/k0sctl/pkg/apis/k0sctl.k0sproject.io/v1beta1/cluster"
+ log "github.com/sirupsen/logrus"
+)
+
+// ValidateEtcdMembers checks for existing etcd members with the same IP as a new controller
+type ValidateEtcdMembers struct {
+ GenericPhase
+ hosts cluster.Hosts
+}
+
+// Title for the phase
+func (p *ValidateEtcdMembers) Title() string {
+ return "Validate etcd members"
+}
+
+// Prepare the phase
+func (p *ValidateEtcdMembers) Prepare(config *v1beta1.Cluster) error {
+ p.Config = config
+ p.hosts = p.Config.Spec.Hosts.Controllers().Filter(func(h *cluster.Host) bool {
+ return h.Metadata.K0sRunningVersion == nil // only check new controllers
+ })
+
+ return nil
+}
+
+// ShouldRun is true when there are new controllers and etcd
+func (p *ValidateEtcdMembers) ShouldRun() bool {
+ if p.Config.Spec.K0sLeader().Metadata.K0sRunningVersion == nil {
+ log.Debugf("%s: leader has no k0s running, assuming a fresh cluster", p.Config.Spec.K0sLeader())
+ return false
+ }
+
+ if p.Config.Spec.K0sLeader().Role == "single" {
+ log.Debugf("%s: leader is a single node, assuming no etcd", p.Config.Spec.K0sLeader())
+ return false
+ }
+
+ if len(p.Config.Spec.K0s.Config) > 0 {
+ storageType := p.Config.Spec.K0s.Config.DigString("spec", "storage", "type")
+ if storageType != "" && storageType != "etcd" {
+ log.Debugf("%s: storage type is %q, not k0s managed etcd", p.Config.Spec.K0sLeader(), storageType)
+ return false
+ }
+ }
+ return len(p.hosts) > 0
+}
+
+// Run the phase
+func (p *ValidateEtcdMembers) Run() error {
+ if err := p.validateControllerSwap(); err != nil {
+ return err
+ }
+
+ return nil
+}
+
+func (p *ValidateEtcdMembers) validateControllerSwap() error {
+ if len(p.Config.Metadata.EtcdMembers) > len(p.Config.Spec.Hosts.Controllers()) {
+ log.Warnf("there are more etcd members in the cluster than controllers listed in the configuration")
+ }
+
+ for _, h := range p.hosts {
+ log.Debugf("%s: host is new, checking if etcd members list already contains %s", h, h.PrivateAddress)
+ if slices.Contains(p.Config.Metadata.EtcdMembers, h.PrivateAddress) {
+ if Force {
+ log.Infof("%s: force used, running 'k0s etcd leave' for the host", h)
+ leader := p.Config.Spec.K0sLeader()
+ leaveCommand := leader.Configurer.K0sCmdf("etcd leave --peer-address %s", h.PrivateAddress)
+ err := p.Wet(h, fmt.Sprintf("remove host from etcd using %v", leaveCommand), func() error {
+ return leader.Exec(leaveCommand)
+ })
+ if err != nil {
+ return fmt.Errorf("controller %s is listed as an existing etcd member but k0s is not found installed on it, the host may have been replaced. attempted etcd leave for the address %s but it failed: %w", h, h.PrivateAddress, err)
+ }
+ continue
+ }
+ return fmt.Errorf("controller %s is listed as an existing etcd member but k0s is not found installed on it, the host may have been replaced. check the host and use `k0s etcd leave --peer-address %s on a controller or re-run apply with --force", h, h.PrivateAddress)
+ }
+ log.Debugf("%s: no match, assuming its safe to install", h)
+ }
+
+ return nil
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/k0sctl-0.19.0/phase/validate_facts.go new/k0sctl-0.19.2/phase/validate_facts.go
--- old/k0sctl-0.19.0/phase/validate_facts.go 2024-09-11 08:57:50.000000000 +0200
+++ new/k0sctl-0.19.2/phase/validate_facts.go 2024-10-25 12:43:06.000000000 +0200
@@ -2,7 +2,6 @@
import (
"fmt"
- "slices"
log "github.com/sirupsen/logrus"
)
@@ -28,10 +27,6 @@
return err
}
- if err := p.validateControllerSwap(); err != nil {
- return err
- }
-
return nil
}
@@ -73,48 +68,4 @@
}
return nil
-}
-
-func (p *ValidateFacts) validateControllerSwap() error {
- log.Debugf("validating controller list vs etcd member list")
- if p.Config.Spec.K0sLeader().Metadata.K0sRunningVersion == nil {
- log.Debugf("%s: leader has no k0s running, assuming a fresh cluster", p.Config.Spec.K0sLeader())
- return nil
- }
-
- if p.Config.Spec.K0sLeader().Role == "single" {
- log.Debugf("%s: leader is a single node, assuming no etcd", p.Config.Spec.K0sLeader())
- return nil
- }
-
- if len(p.Config.Metadata.EtcdMembers) > len(p.Config.Spec.Hosts.Controllers()) {
- log.Warnf("there are more etcd members in the cluster than controllers listed in the k0sctl configuration")
- }
-
- for _, h := range p.Config.Spec.Hosts.Controllers() {
- if h.Metadata.K0sRunningVersion != nil {
- log.Debugf("%s: host has k0s running, no need to check if it was replaced", h)
- continue
- }
-
- log.Debugf("%s: host is new, checking if etcd members list already contains %s", h, h.PrivateAddress)
- if slices.Contains(p.Config.Metadata.EtcdMembers, h.PrivateAddress) {
- if Force {
- log.Infof("%s: force used, running 'k0s etcd leave' for the host", h)
- leader := p.Config.Spec.K0sLeader()
- leaveCommand := leader.Configurer.K0sCmdf("etcd leave --peer-address %s", h.PrivateAddress)
- err := p.Wet(h, fmt.Sprintf("remove host from etcd using %v", leaveCommand), func() error {
- return leader.Exec(leaveCommand)
- })
- if err != nil {
- return fmt.Errorf("controller %s is listed as an existing etcd member but k0s is not found installed on it, the host may have been replaced. attempted etcd leave for the address %s but it failed: %w", h, h.PrivateAddress, err)
- }
- continue
- }
- return fmt.Errorf("controller %s is listed as an existing etcd member but k0s is not found installed on it, the host may have been replaced. check the host and use `k0s etcd leave --peer-address %s on a controller or re-run apply with --force", h, h.PrivateAddress)
- }
- log.Debugf("%s: no match, assuming its safe to install", h)
- }
-
- return nil
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/k0sctl-0.19.0/pkg/apis/k0sctl.k0sproject.io/v1beta1/cluster/spec.go new/k0sctl-0.19.2/pkg/apis/k0sctl.k0sproject.io/v1beta1/cluster/spec.go
--- old/k0sctl-0.19.0/pkg/apis/k0sctl.k0sproject.io/v1beta1/cluster/spec.go 2024-09-11 08:57:50.000000000 +0200
+++ new/k0sctl-0.19.2/pkg/apis/k0sctl.k0sproject.io/v1beta1/cluster/spec.go 2024-10-25 12:43:06.000000000 +0200
@@ -2,9 +2,11 @@
import (
"fmt"
+ "strings"
"github.com/creasty/defaults"
"github.com/jellydator/validation"
+ "github.com/k0sproject/dig"
)
// Spec defines cluster config spec section
@@ -80,24 +82,72 @@
)
}
-// KubeAPIURL returns an url to the cluster's kube api
-func (s *Spec) KubeAPIURL() string {
- var caddr string
+func (s *Spec) clusterExternalAddress() string {
if a := s.K0s.Config.DigString("spec", "api", "externalAddress"); a != "" {
- caddr = a
- } else {
- leader := s.K0sLeader()
- if leader.PrivateAddress != "" {
- caddr = leader.PrivateAddress
- } else {
- caddr = leader.Address()
+ return a
+ }
+
+ if cplb, ok := s.K0s.Config.Dig("spec", "network", "controlPlaneLoadBalancing").(dig.Mapping); ok {
+ if enabled, ok := cplb.Dig("enabled").(bool); ok && enabled && cplb.DigString("type") == "Keepalived" {
+ if vrrpAddresses, ok := cplb.Dig("keepalived", "virtualServers").([]dig.Mapping); ok && len(vrrpAddresses) > 0 {
+ if addr, ok := vrrpAddresses[0]["ipAddress"].(string); ok && addr != "" {
+ return addr
+ }
+ }
}
}
- cport := 6443
+ return s.K0sLeader().Address()
+}
+
+func (s *Spec) clusterInternalAddress() string {
+ leader := s.K0sLeader()
+ if leader.PrivateAddress != "" {
+ return leader.PrivateAddress
+ } else {
+ return leader.Address()
+ }
+}
+
+const defaultAPIPort = 6443
+
+func (s *Spec) APIPort() int {
if p, ok := s.K0s.Config.Dig("spec", "api", "port").(int); ok {
- cport = p
+ return p
}
+ return defaultAPIPort
+}
- return fmt.Sprintf("https://%s:%d", caddr, cport)
+// KubeAPIURL returns an external url to the cluster's kube API
+func (s *Spec) KubeAPIURL() string {
+ return fmt.Sprintf("https://%s:%d", formatIPV6(s.clusterExternalAddress()), s.APIPort())
+}
+
+// InternalKubeAPIURL returns a cluster internal url to the cluster's kube API
+func (s *Spec) InternalKubeAPIURL() string {
+ return fmt.Sprintf("https://%s:%d", formatIPV6(s.clusterInternalAddress()), s.APIPort())
+}
+
+// NodeInternalKubeAPIURL returns a cluster internal url to the node's kube API
+func (s *Spec) NodeInternalKubeAPIURL(h *Host) string {
+ addr := "127.0.0.1"
+
+ // spec.api.onlyBindToAddress was introduced in k0s 1.30. Setting it to true will make the API server only
+ // listen on the IP address configured by the `address` option.
+ if onlyBindAddr, ok := s.K0s.Config.Dig("spec", "api", "onlyBindToAddress").(bool); ok && onlyBindAddr {
+ if h.PrivateAddress != "" {
+ addr = h.PrivateAddress
+ } else {
+ addr = h.Address()
+ }
+ }
+
+ return fmt.Sprintf("https://%s:%d", formatIPV6(addr), s.APIPort())
+}
+
+func formatIPV6(address string) string {
+ if strings.Contains(address, ":") {
+ return fmt.Sprintf("[%s]", address)
+ }
+ return address
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/k0sctl-0.19.0/pkg/node/statusfunc.go new/k0sctl-0.19.2/pkg/node/statusfunc.go
--- old/k0sctl-0.19.0/pkg/node/statusfunc.go 2024-09-11 08:57:50.000000000 +0200
+++ new/k0sctl-0.19.2/pkg/node/statusfunc.go 2024-10-25 12:43:06.000000000 +0200
@@ -7,6 +7,7 @@
"strings"
"time"
+ "github.com/k0sproject/k0sctl/pkg/apis/k0sctl.k0sproject.io/v1beta1"
"github.com/k0sproject/k0sctl/pkg/apis/k0sctl.k0sproject.io/v1beta1/cluster"
"github.com/k0sproject/rig/exec"
@@ -195,8 +196,8 @@
}
// KubeAPIReadyFunc returns a function that returns an error unless the host's local kube api responds to /version
-func KubeAPIReadyFunc(h *cluster.Host, port int) retryFunc {
+func KubeAPIReadyFunc(h *cluster.Host, config *v1beta1.Cluster) retryFunc {
// If the anon-auth is disabled on kube api the version endpoint will give 401
// thus we need to accept both 200 and 401 as valid statuses when checking kube api
- return HTTPStatusFunc(h, fmt.Sprintf("https://localhost:%d/version", port), 200, 401)
+ return HTTPStatusFunc(h, fmt.Sprintf("%s/version", config.Spec.NodeInternalKubeAPIURL(h)), 200, 401)
}
++++++ k0sctl.obsinfo ++++++
--- /var/tmp/diff_new_pack.MJwoD9/_old 2024-10-27 11:25:48.443728541 +0100
+++ /var/tmp/diff_new_pack.MJwoD9/_new 2024-10-27 11:25:48.447728707 +0100
@@ -1,5 +1,5 @@
name: k0sctl
-version: 0.19.0
-mtime: 1726037870
-commit: 9246ddc823198b572b51fb19bdf5effee4721a9d
+version: 0.19.2
+mtime: 1729852986
+commit: 081dfeb085418df4824e00778b092e77f84715ad
++++++ vendor.tar.gz ++++++
/work/SRC/openSUSE:Factory/k0sctl/vendor.tar.gz /work/SRC/openSUSE:Factory/.k0sctl.new.2020/vendor.tar.gz differ: char 5, line 1
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package marvin for openSUSE:Factory checked in at 2024-10-27 11:25:21
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/marvin (Old)
and /work/SRC/openSUSE:Factory/.marvin.new.2020 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "marvin"
Sun Oct 27 11:25:21 2024 rev:3 rq:1218406 version:0.2.7
Changes:
--------
--- /work/SRC/openSUSE:Factory/marvin/marvin.changes 2024-09-29 18:11:02.530632886 +0200
+++ /work/SRC/openSUSE:Factory/.marvin.new.2020/marvin.changes 2024-10-27 11:25:45.519607331 +0100
@@ -1,0 +2,6 @@
+Fri Oct 25 16:53:11 UTC 2024 - opensuse_buildservice(a)ojkastl.de
+
+- Update to version 0.2.7:
+ * bump alpine base image version from 3.19.1 to 3.20.3 (#66)
+
+-------------------------------------------------------------------
Old:
----
marvin-0.2.6.obscpio
New:
----
marvin-0.2.7.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ marvin.spec ++++++
--- /var/tmp/diff_new_pack.jEKhbd/_old 2024-10-27 11:25:46.263638173 +0100
+++ /var/tmp/diff_new_pack.jEKhbd/_new 2024-10-27 11:25:46.267638338 +0100
@@ -16,22 +16,28 @@
#
-%define __arch_install_post export NO_BRP_STRIP_DEBUG=true
-
Name: marvin
-Version: 0.2.6
+Version: 0.2.7
Release: 0
Summary: Scans a k8s cluster for misconfigurations and vulnerabilities
License: Apache-2.0
URL: https://github.com/undistro/marvin
Source: marvin-%{version}.tar.gz
Source1: vendor.tar.gz
+BuildRequires: bash-completion
+BuildRequires: fish
BuildRequires: go >= 1.22
+BuildRequires: zsh
%description
-Marvin is a CLI tool designed to help Kubernetes cluster administrators ensure the security and reliability of their environments.
+Marvin is a CLI tool designed to help Kubernetes cluster administrators ensure
+the security and reliability of their environments.
-Using a comprehensive set of CEL (Common Expression Language) expressions, Marvin performs extensive checks on cluster resources, identifying potential issues, misconfigurations, and vulnerabilities that could pose a risk to the system. It helps ensure that your Kubernetes clusters are always in compliance with best practices and industry standards.
+Using a comprehensive set of CEL (Common Expression Language) expressions,
+Marvin performs extensive checks on cluster resources, identifying potential
+issues, misconfigurations, and vulnerabilities that could pose a risk to the
+system. It helps ensure that your Kubernetes clusters are always in compliance
+with best practices and industry standards.
Marvin is also used as a plugin in Zora.
@@ -83,7 +89,7 @@
%install
# Install the binary.
-install -D -m 0755 bin/%{name} "%{buildroot}/%{_bindir}/%{name}"
+install -D -m 0755 bin/%{name} %{buildroot}/%{_bindir}/%{name}
# create the bash completion file
mkdir -p %{buildroot}%{_datarootdir}/bash-completion/completions/
@@ -94,8 +100,8 @@
%{buildroot}/%{_bindir}/%{name} completion fish > %{buildroot}%{_datarootdir}/fish/vendor_completions.d/%{name}.fish
# create the zsh completion file
-mkdir -p %{buildroot}%{_datarootdir}/zsh_completion.d/
-%{buildroot}/%{_bindir}/%{name} completion zsh > %{buildroot}%{_datarootdir}/zsh_completion.d/_%{name}
+mkdir -p %{buildroot}%{_datarootdir}/zsh/site-functions/
+%{buildroot}/%{_bindir}/%{name} completion zsh > %{buildroot}%{_datarootdir}/zsh/site-functions/_%{name}
%files
%doc README.md
@@ -103,16 +109,11 @@
%{_bindir}/%{name}
%files -n %{name}-bash-completion
-%dir %{_datarootdir}/bash-completion/completions/
%{_datarootdir}/bash-completion/completions/%{name}
%files -n %{name}-fish-completion
-%dir %{_datarootdir}/fish
-%dir %{_datarootdir}/fish/vendor_completions.d
%{_datarootdir}/fish/vendor_completions.d/%{name}.fish
%files -n %{name}-zsh-completion
-%defattr(-,root,root)
-%dir %{_datarootdir}/zsh_completion.d/
-%{_datarootdir}/zsh_completion.d/_%{name}
+%{_datarootdir}/zsh/site-functions/_%{name}
++++++ _service ++++++
--- /var/tmp/diff_new_pack.jEKhbd/_old 2024-10-27 11:25:46.299639665 +0100
+++ /var/tmp/diff_new_pack.jEKhbd/_new 2024-10-27 11:25:46.303639831 +0100
@@ -3,10 +3,10 @@
<param name="url">https://github.com/undistro/marvin</param>
<param name="scm">git</param>
<param name="exclude">.git</param>
- <param name="revision">v0.2.6</param>
+ <param name="revision">v0.2.7</param>
<param name="versionformat">@PARENT_TAG@</param>
- <param name="changesgenerate">enable</param>
<param name="versionrewrite-pattern">v(.*)</param>
+ <param name="changesgenerate">enable</param>
</service>
<service name="set_version" mode="manual">
</service>
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.jEKhbd/_old 2024-10-27 11:25:46.319640494 +0100
+++ /var/tmp/diff_new_pack.jEKhbd/_new 2024-10-27 11:25:46.323640660 +0100
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/undistro/marvin</param>
- <param name="changesrevision">70da7ad5cded412b46441bda987c49cf078565e3</param></service></servicedata>
+ <param name="changesrevision">c50d9eabfb02ead05c13b17cc4d5b005a6b2bc6c</param></service></servicedata>
(No newline at EOF)
++++++ marvin-0.2.6.obscpio -> marvin-0.2.7.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/marvin-0.2.6/Dockerfile new/marvin-0.2.7/Dockerfile
--- old/marvin-0.2.6/Dockerfile 2024-08-08 16:35:46.000000000 +0200
+++ new/marvin-0.2.7/Dockerfile 2024-10-25 15:58:49.000000000 +0200
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM golang:1.22 as builder
+FROM golang:1.22 AS builder
ARG TARGETOS
ARG TARGETARCH
ARG VERSION
@@ -34,7 +34,7 @@
-X github.com/undistro/marvin/pkg/version.commit=${COMMIT} \
-X github.com/undistro/marvin/pkg/version.date=${DATE}" -a -o marvin main.go
-FROM alpine:3.19.1
+FROM alpine:3.20.3
RUN apk upgrade && rm /var/cache/apk/*
RUN addgroup -g 8494 -S nonroot && adduser -u 8494 -D -S nonroot -G nonroot
USER 8494:8494
++++++ marvin.obsinfo ++++++
--- /var/tmp/diff_new_pack.jEKhbd/_old 2024-10-27 11:25:46.475646961 +0100
+++ /var/tmp/diff_new_pack.jEKhbd/_new 2024-10-27 11:25:46.479647126 +0100
@@ -1,5 +1,5 @@
name: marvin
-version: 0.2.6
-mtime: 1723127746
-commit: 70da7ad5cded412b46441bda987c49cf078565e3
+version: 0.2.7
+mtime: 1729864729
+commit: c50d9eabfb02ead05c13b17cc4d5b005a6b2bc6c
++++++ vendor.tar.gz ++++++
/work/SRC/openSUSE:Factory/marvin/vendor.tar.gz /work/SRC/openSUSE:Factory/.marvin.new.2020/vendor.tar.gz differ: char 5, line 1
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package hcloud-cli for openSUSE:Factory checked in at 2024-10-27 11:25:20
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/hcloud-cli (Old)
and /work/SRC/openSUSE:Factory/.hcloud-cli.new.2020 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hcloud-cli"
Sun Oct 27 11:25:20 2024 rev:2 rq:1218411 version:1.48.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/hcloud-cli/hcloud-cli.changes 2024-10-11 17:03:56.414765337 +0200
+++ /work/SRC/openSUSE:Factory/.hcloud-cli.new.2020/hcloud-cli.changes 2024-10-27 11:25:42.051463569 +0100
@@ -1,0 +2,33 @@
+Fri Oct 25 16:55:05 UTC 2024 - opensuse_buildservice(a)ojkastl.de
+
+- Update to version 1.48.0:
+ * chore(main): release 1.48.0 (#867)
+ * deps: update module github.com/hetznercloud/hcloud-go/v2 to
+ v2.14.0 (#882)
+ * deps: update module github.com/fatih/color to v1.18.0 (#884)
+ * fix(primary-ip): labels ignored in create command (#885)
+ * deps: update module github.com/jedib0t/go-pretty/v6 to v6.6.1
+ (#876)
+ * deps: update module github.com/boumenot/gocover-cobertura to
+ v1.3.0 (#881)
+ * test(e2e): add back check for uniqueness_error in network test
+ (#879)
+ * deps: update module golang.org/x/crypto to v0.28.0 (#878)
+ * deps: update dependency go to v1.23.2
+ * test(e2e): use builder for regexes (#872)
+ * chore: delete unused workflow file (#873)
+ * test(e2e): add end to end testing (#785)
+ * ci: build and test with Go 1.23 (#871)
+ * refactor: prepare for e2e tests (#870)
+ * feat: allow auto-completing context flag (#861)
+ * refactor: re-enable linters, use presets (#866)
+ * feat(primary-ip): allow setting auto-delete on create (#860)
+ * deps: update dependency golangci/golangci-lint
+ * fix(image): only use numerical IDs for label auto-completion
+ (#865)
+ * add comment
+ * disable bugged gosec rule
+ * deps: update dependency golangci/golangci-lint to v1.60.3
+ * deps: update module golang.org/x/crypto to v0.27.0 (#858)
+
+-------------------------------------------------------------------
Old:
----
hcloud-cli-1.47.0.obscpio
New:
----
hcloud-cli-1.48.0.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ hcloud-cli.spec ++++++
--- /var/tmp/diff_new_pack.fErd98/_old 2024-10-27 11:25:43.131508339 +0100
+++ /var/tmp/diff_new_pack.fErd98/_new 2024-10-27 11:25:43.135508506 +0100
@@ -19,14 +19,17 @@
%define executable_name hcloud
Name: hcloud-cli
-Version: 1.47.0
+Version: 1.48.0
Release: 0
Summary: A command-line interface for Hetzner Cloud
License: MIT
URL: https://github.com/hetznercloud/cli
Source: %{name}-%{version}.tar.gz
Source1: vendor.tar.gz
+BuildRequires: bash-completion
+BuildRequires: fish
BuildRequires: go >= 1.22
+BuildRequires: zsh
Provides: hcloud = %{version}
%description
@@ -89,12 +92,12 @@
%{buildroot}/%{_bindir}/%{executable_name} completion fish > %{buildroot}%{_datarootdir}/fish/vendor_completions.d/%{executable_name}.fish
# create the zsh completion file
-mkdir -p %{buildroot}%{_datarootdir}/zsh_completion.d/
-%{buildroot}/%{_bindir}/%{executable_name} completion zsh > %{buildroot}%{_datarootdir}/zsh_completion.d/_%{executable_name}
+mkdir -p %{buildroot}%{_datarootdir}/zsh/site-functions/
+%{buildroot}/%{_bindir}/%{executable_name} completion zsh > %{buildroot}%{_datarootdir}/zsh/site-functions/_%{executable_name}
%check
%{buildroot}/%{_bindir}/%{executable_name} version
-%{buildroot}/%{_bindir}/%{executable_name} version | grep "%{version}"
+%{buildroot}/%{_bindir}/%{executable_name} version | grep %{version}
%files
%doc README.md
@@ -102,15 +105,11 @@
%{_bindir}/%{executable_name}
%files -n %{name}-bash-completion
-%dir %{_datarootdir}/bash-completion/completions/
%{_datarootdir}/bash-completion/completions/%{executable_name}
%files -n %{name}-fish-completion
-%dir %{_datarootdir}/fish
-%dir %{_datarootdir}/fish/vendor_completions.d
%{_datarootdir}/fish/vendor_completions.d/%{executable_name}.fish
%files -n %{name}-zsh-completion
-%dir %{_datarootdir}/zsh_completion.d/
-%{_datarootdir}/zsh_completion.d/_%{executable_name}
+%{_datarootdir}/zsh/site-functions/_%{executable_name}
++++++ _service ++++++
--- /var/tmp/diff_new_pack.fErd98/_old 2024-10-27 11:25:43.167509832 +0100
+++ /var/tmp/diff_new_pack.fErd98/_new 2024-10-27 11:25:43.171509997 +0100
@@ -3,10 +3,10 @@
<param name="url">https://github.com/hetznercloud/cli</param>
<param name="scm">git</param>
<param name="exclude">.git</param>
- <param name="revision">v1.47.0</param>
+ <param name="revision">v1.48.0</param>
<param name="versionformat">@PARENT_TAG@</param>
- <param name="changesgenerate">enable</param>
<param name="versionrewrite-pattern">v(.*)</param>
+ <param name="changesgenerate">enable</param>
<param name="filename">hcloud-cli</param>
</service>
<service name="set_version" mode="manual">
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.fErd98/_old 2024-10-27 11:25:43.191510827 +0100
+++ /var/tmp/diff_new_pack.fErd98/_new 2024-10-27 11:25:43.195510993 +0100
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/hetznercloud/cli</param>
- <param name="changesrevision">b59cfbfdb338bad3a7b80c0569248a8e3abaad01</param></service></servicedata>
+ <param name="changesrevision">0ea077a9a334c6e6a620ea46a5e224dfc7ef901a</param></service></servicedata>
(No newline at EOF)
++++++ hcloud-cli-1.47.0.obscpio -> hcloud-cli-1.48.0.obscpio ++++++
++++ 8300 lines of diff (skipped)
++++++ hcloud-cli.obsinfo ++++++
--- /var/tmp/diff_new_pack.fErd98/_old 2024-10-27 11:25:43.431520775 +0100
+++ /var/tmp/diff_new_pack.fErd98/_new 2024-10-27 11:25:43.435520941 +0100
@@ -1,5 +1,5 @@
name: hcloud-cli
-version: 1.47.0
-mtime: 1725018131
-commit: b59cfbfdb338bad3a7b80c0569248a8e3abaad01
+version: 1.48.0
+mtime: 1729861062
+commit: 0ea077a9a334c6e6a620ea46a5e224dfc7ef901a
++++++ vendor.tar.gz ++++++
++++ 47466 lines of diff (skipped)
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package lowdown for openSUSE:Factory checked in at 2024-10-27 11:25:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/lowdown (Old)
and /work/SRC/openSUSE:Factory/.lowdown.new.2020 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lowdown"
Sun Oct 27 11:25:19 2024 rev:2 rq:1218397 version:1.2.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/lowdown/lowdown.changes 2024-07-29 21:52:34.829192866 +0200
+++ /work/SRC/openSUSE:Factory/.lowdown.new.2020/lowdown.changes 2024-10-27 11:25:40.707407856 +0100
@@ -1,0 +2,78 @@
+Fri Oct 25 11:22:02 UTC 2024 - mrueckert(a)suse.de
+
+- Update to version 1.2.0:
+ * Restructure.
+ * Update images.
+ * Simplify language.
+ * Update coverage.
+ * Get ready for version.
+ * Add --nroff-endnotes for -tms.
+ * Linked footnotes now enabled.
+ * Ignore footnotes in headers.
+ * Proper printing of -tms footnotes.
+ * Ongoing version notes.
+ * Use lowdown_get_meta() for -tfodt.
+ * Use lowdown_get_meta().
+ * Use lowdown_add_meta() instead of repeating.
+ * Move shared metadata node->buffer into utility.
+ * Document newly-recognised metadata.
+ * Add msheader and manheader metadata and fix.
+ * Initialise value.
+ * Fix -thtml special characters in metadata.
+ * Add regression test.
+ * Version notes.
+ * Add "latex header" and clean up.
+ * Initialise no-escape statement.
+ * Allow arbitrary HTML header content from metadata.
+ * Update coverage.
+ * Keep running version notes.
+ * --nroff-no-groff -> nroff-traditional
+ * Use UR/UE and MT/ME for -man links.
+ * Remove unused.
+ * Support OSC8 hyperlinking in -tterm.
+ * More regression tests.
+ * Be explicit about disallowing nested links.
+ * Tweak style.
+
+-------------------------------------------------------------------
+Wed Oct 02 18:15:56 UTC 2024 - mrueckert(a)suse.de
+
+- Update to version 1.1.2:
+ * Bump version.
+ * Exercise entities, remove dead function.
+ * Exercise RCS convention conversions.
+ * Add html regressions to bundle.
+ * More regressions (coverage).
+ * Document --html-titleblock and tweak.
+ * Github link in coverage table.
+ * Fix regress/standalone invocation and add HTML.
+ * DOS regressions.
+ * More pandoc metadata testing (coverage).
+ * More rigorous metadata testing (coverage).
+ * More regressions (test coverage).
+ * Introduce test coverage.
+ * Tweak.
+
+-------------------------------------------------------------------
+Wed Sep 25 08:51:01 UTC 2024 - Marcus Rueckert <mrueckert(a)suse.de>
+
+- Update to version 1.1.1:
+ * Tweak website, bump version.
+ * Silence compiler warning.
+ * Document code fences.
+ * Improve Mac OS X buggy SH handling.
+ * Synchronise source/man for --term-all-metadata.
+ * Add regressions for tighter utf8 handling.
+ * Tweak previous.
+ * Don't output a newline after `.SH`
+ * Ignore `test-*.dSYM` directories for macOS configure
+ * Fix `iscntrl` on macOS
+
+- cleanup the _service file:
+ - Given we only package taged releases change the version to use
+ the PARENT_TAG only and provide a better pattern as a comment
+ in case we ever need a snapshot
+ - instead of hardcoding the match and rewrite string actually use
+ a regexp
+
+-------------------------------------------------------------------
Old:
----
lowdown-1.1.0+git20231119.1200b9f.tar.gz
New:
----
lowdown-1.2.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ lowdown.spec ++++++
--- /var/tmp/diff_new_pack.X9hW19/_old 2024-10-27 11:25:41.215428914 +0100
+++ /var/tmp/diff_new_pack.X9hW19/_new 2024-10-27 11:25:41.215428914 +0100
@@ -15,11 +15,12 @@
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
+
%global soname liblowdown1
#%%global version_string VERSION_1_1_0
Name: lowdown
-Version: 1.1.0+git20231119.1200b9f
+Version: 1.2.0
Release: 0
Summary: Simple markdown translator
License: ISC
@@ -28,6 +29,7 @@
#Source: %%{name}-%%{version_string}.tar.gz
Source: %{name}-%{version}.tar.gz
BuildRequires: fdupes
+
%description
lowdown is a Markdown translator producing HTML5, roff documents in the ms and
man formats, LaTeX, gemini, OpenDocument, and terminal output.
++++++ _service ++++++
--- /var/tmp/diff_new_pack.X9hW19/_old 2024-10-27 11:25:41.247430241 +0100
+++ /var/tmp/diff_new_pack.X9hW19/_new 2024-10-27 11:25:41.251430407 +0100
@@ -2,12 +2,16 @@
<service name="obs_scm" mode="manual">
<param name="url">https://github.com/kristapsdz/lowdown</param>
<param name="scm">git</param>
- <param name="versionformat">@PARENT_TAG@+git%cd.%h</param>
+ <param name="revision">VERSION_1_2_0</param>
+ <param name="versionformat">@PARENT_TAG@</param>
+ <!-- If we ever have to package a snapshot, use this format pattern:
+ <param name="versionformat">@PARENT_TAG@+git@TAG_OFFSET@.%h</param>
+ -->
<!-- Default rewrite-pattern
<param name="versionrewrite-pattern">v(.*)</param>
-->
- <param name="versionrewrite-pattern">VERSION_1_1_0</param>
- <param name="versionrewrite-replacement">1.1.0</param>
+ <param name="versionrewrite-pattern">VERSION_(\d+)_(\d+)_(\d+)</param>
+ <param name="versionrewrite-replacement">\1.\2.\3</param>
<param name="changesgenerate">enable</param>
</service>
<service name="set_version" mode="manual"/>
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.X9hW19/_old 2024-10-27 11:25:41.271431235 +0100
+++ /var/tmp/diff_new_pack.X9hW19/_new 2024-10-27 11:25:41.275431401 +0100
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/kristapsdz/lowdown</param>
- <param name="changesrevision">1200b9f4ceceb5795ccc0a02a2105310f0819222</param></service></servicedata>
+ <param name="changesrevision">8fdb02cf6a8404e3396a1a99e84e9ab932fdb410</param></service></servicedata>
(No newline at EOF)
++++++ lowdown-1.1.0+git20231119.1200b9f.tar.gz -> lowdown-1.2.0.tar.gz ++++++
++++ 5738 lines of diff (skipped)
++++++ lowdown.obsinfo ++++++
--- /var/tmp/diff_new_pack.X9hW19/_old 2024-10-27 11:25:41.507441019 +0100
+++ /var/tmp/diff_new_pack.X9hW19/_new 2024-10-27 11:25:41.511441185 +0100
@@ -1,5 +1,5 @@
name: lowdown
-version: 1.1.0+git20231119.1200b9f
-mtime: 1700431489
-commit: 1200b9f4ceceb5795ccc0a02a2105310f0819222
+version: 1.2.0
+mtime: 1729828159
+commit: 8fdb02cf6a8404e3396a1a99e84e9ab932fdb410
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package mcds for openSUSE:Factory checked in at 2024-10-27 11:25:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mcds (Old)
and /work/SRC/openSUSE:Factory/.mcds.new.2020 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mcds"
Sun Oct 27 11:25:17 2024 rev:2 rq:1218387 version:1.7
Changes:
--------
--- /work/SRC/openSUSE:Factory/mcds/mcds.changes 2020-01-16 18:21:38.700988529 +0100
+++ /work/SRC/openSUSE:Factory/.mcds.new.2020/mcds.changes 2024-10-27 11:25:39.967377180 +0100
@@ -1,0 +2,16 @@
+Sun Oct 20 20:29:41 UTC 2024 - Martin Hauke <mardnh(a)gmx.de>
+
+- Update to version 1.7
+ * Updating po file.
+ * Fixing a printf() argument types.
+ * Fail query on HTTP error
+ * Ability to run `-V` and `-h` before `decrypt()`.
+ * Bugfix in rc.c
+ * Fixing unveil.
+ * Remove generated files
+ * Update mcds.1 copyright
+ * fix lintian-found typos
+ * Remove obsolete autoconf macros
+ * Add example URL for Baikal
+
+-------------------------------------------------------------------
Old:
----
mcds-1.6.tar.gz
New:
----
mcds-1.7.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mcds.spec ++++++
--- /var/tmp/diff_new_pack.T9JZL7/_old 2024-10-27 11:25:40.395394922 +0100
+++ /var/tmp/diff_new_pack.T9JZL7/_new 2024-10-27 11:25:40.395394922 +0100
@@ -1,7 +1,8 @@
#
# spec file for package mcds
#
-# Copyright (c) 2019, Martin Hauke <mardnh(a)gmx.de>
+# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2019-2024, Martin Hauke <mardnh(a)gmx.de>
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +18,7 @@
Name: mcds
-Version: 1.6
+Version: 1.7
Release: 0
Summary: Mutt Carddav search program
License: GPL-3.0-or-later
@@ -26,11 +27,11 @@
Source: https://github.com/t-brown/mcds/archive/v%{version}.tar.gz#/%{name}-%{versi…
BuildRequires: autoconf
BuildRequires: automake
+BuildRequires: libgpgme-devel
BuildRequires: libtool
BuildRequires: pkgconfig
BuildRequires: pkgconfig(libcurl)
BuildRequires: pkgconfig(libxml-2.0)
-BuildRequires: libgpgme-devel
%description
mcds is a command line tool primarily used as a search query plugin
++++++ mcds-1.6.tar.gz -> mcds-1.7.tar.gz ++++++
++++ 6659 lines of diff (skipped)
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package nextcloud-desktop for openSUSE:Factory checked in at 2024-10-27 11:25:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/nextcloud-desktop (Old)
and /work/SRC/openSUSE:Factory/.nextcloud-desktop.new.2020 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nextcloud-desktop"
Sun Oct 27 11:25:15 2024 rev:73 rq:1218386 version:3.14.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/nextcloud-desktop/nextcloud-desktop.changes 2024-10-02 21:36:36.954442634 +0200
+++ /work/SRC/openSUSE:Factory/.nextcloud-desktop.new.2020/nextcloud-desktop.changes 2024-10-27 11:25:39.063339706 +0100
@@ -1,0 +2,45 @@
+Tue Oct 22 15:08:57 UTC 2024 - RN <R_Nik_C(a)proton.me>
+
+- Some qt5 libraries replaced to qt6
+- Removed unneeded qt5 library
+
+-------------------------------------------------------------------
+Tue Oct 22 11:20:37 UTC 2024 - Atri Bhattacharya <badshah400(a)gmail.com>
+
+- Update to version 3.14.2:
+ * Bugfix/fix log issues (gh#nextcloud/desktop#7267).
+ * Remove too verbose logs during discovery
+ (gh#nextcloud/desktop#7272).
+ * Add support for the new craft blueprint options relating to
+ override server urls (gh#nextcloud/desktop#7276).
+ * Properly catch std::filesystem exceptions
+ (gh#nextcloud/desktop#7283).
+ * remove extra argument from QString::arg: string has only 1
+ placeholder (gh#nextcloud/desktop#7292).
+ * Cleaning logs (gh#nextcloud/desktop#7295).
+ * Properly check for webdav or dav path in provided host url for
+ cmd.cpp (gh#nextcloud/desktop#7301).
+ * Count the files deletion and warn if threshold is exceeded
+ (gh#nextcloud/desktop#7304).
+ * Message should say many not all: would be triggered by 200
+ files (gh#nextcloud/desktop#7306).
+ * Cleaning logs (gh#nextcloud/desktop#7308).
+ * Improve wordings of confirmation dialog when many files are
+ deleted (gh#nextcloud/desktop#7329).
+ * Fix crash caused due to null accountstate in
+ FileProviderSocketController (gh#nextcloud/desktop#7332).
+ * Bugfix/signature (gh#nextcloud/desktop#7335).
+ * Better logs to understand when a folder is locally discovered
+ (gh#nextcloud/desktop#7342).
+ * Bugfix/use file id to track renamed items
+ (gh#nextcloud/desktop#7343).
+ * Fix: On receiving reply of a remote MOVE: always record it
+ (gh#nextcloud/desktop#7352).
+ * remove ownCloud wording in logging
+ (gh#nextcloud/desktop#7358).
+ * Fix opening of locally available groupfolders in web browser
+ from tray drop-down (gh#nextcloud/desktop#7363).
+ * Make shares distinguishable if there are sharees with the same
+ display name (gh#nextcloud/desktop#7364).
+
+-------------------------------------------------------------------
Old:
----
nextcloud-desktop-3.14.1.tar.gz
New:
----
nextcloud-desktop-3.14.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ nextcloud-desktop.spec ++++++
--- /var/tmp/diff_new_pack.x7ow6B/_old 2024-10-27 11:25:39.775369221 +0100
+++ /var/tmp/diff_new_pack.x7ow6B/_new 2024-10-27 11:25:39.779369387 +0100
@@ -25,7 +25,7 @@
%define gcc_ver 9
%endif
Name: nextcloud-desktop
-Version: 3.14.1
+Version: 3.14.2
Release: 0
Summary: Nextcloud desktop synchronisation client
License: GPL-2.0-or-later AND LGPL-3.0-or-later
@@ -42,10 +42,9 @@
BuildRequires: gobject-introspection-devel
BuildRequires: hicolor-icon-theme
BuildRequires: kf6-extra-cmake-modules
-BuildRequires: libQt5Gui-private-headers-devel
-BuildRequires: libqt5-linguist-devel
BuildRequires: ninja
BuildRequires: pkgconfig
+BuildRequires: qt6-gui-private-devel
BuildRequires: rsvg-convert
BuildRequires: update-desktop-files
BuildRequires: cmake(KF6Archive)
++++++ nextcloud-desktop-3.14.1.tar.gz -> nextcloud-desktop-3.14.2.tar.gz ++++++
/work/SRC/openSUSE:Factory/nextcloud-desktop/nextcloud-desktop-3.14.1.tar.gz /work/SRC/openSUSE:Factory/.nextcloud-desktop.new.2020/nextcloud-desktop-3.14.2.tar.gz differ: char 27, line 1
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package gsequencer for openSUSE:Factory checked in at 2024-10-27 11:25:13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gsequencer (Old)
and /work/SRC/openSUSE:Factory/.gsequencer.new.2020 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gsequencer"
Sun Oct 27 11:25:13 2024 rev:145 rq:1218615 version:7.0.8
Changes:
--------
--- /work/SRC/openSUSE:Factory/gsequencer/gsequencer.changes 2024-10-13 17:34:30.696316551 +0200
+++ /work/SRC/openSUSE:Factory/.gsequencer.new.2020/gsequencer.changes 2024-10-27 11:25:37.291266250 +0100
@@ -1,0 +2,19 @@
+Sat Oct 26 08:07:45 UTC 2024 - Joël Krähemann <jkraehemann(a)gmail.com>
+
+- new upstream v7.0.8 fixed missing keyboard input of AgsSyncsynth,
+ AgsFMSyncsynth, AgsFFPlayer and AgsPitchSampler.
+- fixed broken unit test
+- minor improvements
+
+-------------------------------------------------------------------
+Fri Oct 25 14:33:23 UTC 2024 - Joël Krähemann <jkraehemann(a)gmail.com>
+
+- new major release version 7.0.6 fixed MIDI version 2 support,
+ prior had wrong byte order.
+- implemented ags_midi_ci_util_is_*() functions to test for
+ specific MIDI-CI message.
+- implemented ags-fx-notation MIDI version 2 support.
+- implemented MIDI 1 and 2 control change parsing functions as
+ ags_recall_midi[1-2]_control_change().
+
+-------------------------------------------------------------------
Old:
----
gsequencer-6.16.22.tar.gz
New:
----
gsequencer-7.0.8.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gsequencer.spec ++++++
--- /var/tmp/diff_new_pack.ABxoS1/_old 2024-10-27 11:25:38.163302397 +0100
+++ /var/tmp/diff_new_pack.ABxoS1/_new 2024-10-27 11:25:38.167302563 +0100
@@ -16,19 +16,19 @@
#
-%define libagssonumber 6
+%define libagssonumber 7
%define libgsequencersonumber 0
# The condition is run functional tests; defaulted off and needs to be
# activated with --with run_functional_tests command line switch.
%bcond_with run_functional_tests
Name: gsequencer
-Version: 6.16.22
+Version: 7.0.8
Release: 0
Summary: Audio processing engine
License: AGPL-3.0-or-later AND GPL-3.0-or-later AND GFDL-1.3-only
Group: Productivity/Multimedia/Sound/Midi
URL: https://nongnu.org/gsequencer
-Source0: https://download.savannah.gnu.org/releases/gsequencer/6.16.x/%{name}-%{vers…
+Source0: https://download.savannah.gnu.org/releases/gsequencer/7.0.x/%{name}-%{versi…
# improve glib-2.0 compatibility to version 2.54
Patch1: gsequencer.1-improved-glib-compatibility.patch
BuildRequires: gcc-c++
@@ -155,11 +155,11 @@
Advanced Gtk+ Sequencer is an audio sequencer application.
This subpackage contains part of its library set.
-%package -n typelib-1_0-Libags-6_0
+%package -n typelib-1_0-Libags-7_0
Summary: Introspection bindings for GSequencer's core libraries
Group: System/Libraries
-%description -n typelib-1_0-Libags-6_0
+%description -n typelib-1_0-Libags-7_0
Advanced Gtk+ Sequencer is an audio sequencer application.
This package provides the GObject Introspection bindings for Libags.
@@ -216,10 +216,10 @@
#%{_libdir}/libags_vst.so.%{libagssonumber}*
%{_libdir}/libags_audio.so.%{libagssonumber}*
-%files -n typelib-1_0-Libags-6_0
-%{_libdir}/girepository-1.0/Ags-6.0.typelib
-%{_libdir}/girepository-1.0/AgsGui-6.0.typelib
-%{_libdir}/girepository-1.0/AgsAudio-6.0.typelib
+%files -n typelib-1_0-Libags-7_0
+%{_libdir}/girepository-1.0/Ags-7.0.typelib
+%{_libdir}/girepository-1.0/AgsGui-7.0.typelib
+%{_libdir}/girepository-1.0/AgsAudio-7.0.typelib
%files -n libgsequencer%{libgsequencersonumber}
%{_libdir}/libgsequencer.so.%{libgsequencersonumber}*
++++++ gsequencer-6.16.22.tar.gz -> gsequencer-7.0.8.tar.gz ++++++
/work/SRC/openSUSE:Factory/gsequencer/gsequencer-6.16.22.tar.gz /work/SRC/openSUSE:Factory/.gsequencer.new.2020/gsequencer-7.0.8.tar.gz differ: char 13, line 1
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package aws-c-common for openSUSE:Factory checked in at 2024-10-27 11:25:12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/aws-c-common (Old)
and /work/SRC/openSUSE:Factory/.aws-c-common.new.2020 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "aws-c-common"
Sun Oct 27 11:25:12 2024 rev:14 rq:1218384 version:0.10.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/aws-c-common/aws-c-common.changes 2024-09-24 17:32:19.878705720 +0200
+++ /work/SRC/openSUSE:Factory/.aws-c-common.new.2020/aws-c-common.changes 2024-10-27 11:25:34.211138572 +0100
@@ -1,0 +2,14 @@
+Thu Oct 24 11:48:38 UTC 2024 - John Paul Adrian Glaubitz <adrian.glaubitz(a)suse.com>
+
+- Update to version 0.10.0
+ * Update CMake to 3.9 by @waahm7 in (#1159)
+- from version 0.9.31
+ * Support Swift CXX Interop by @waahm7 in (#1160)
+- from version 0.9.30
+ * Improve condition_variable documentation by @jmklix in (#1157)
+ * Fix Cmake Prebuild Remove -S Option by @waahm7 in (#1158)
+- from version 0.9.29
+ * Add comment about tuning for "neoverse-v1" by @graebm in (#1153)
+ * [fix] prebuild set CMAKE_PREFIX_PATH properly by @TingDaoK in (#1154)
+
+-------------------------------------------------------------------
Old:
----
v0.9.28.tar.gz
New:
----
v0.10.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ aws-c-common.spec ++++++
--- /var/tmp/diff_new_pack.Va4N2T/_old 2024-10-27 11:25:35.499191965 +0100
+++ /var/tmp/diff_new_pack.Va4N2T/_new 2024-10-27 11:25:35.511192462 +0100
@@ -19,7 +19,7 @@
%define library_version 1.0.0
%define library_soversion 1
Name: aws-c-common
-Version: 0.9.28
+Version: 0.10.0
Release: 0
Summary: Core C99 package for AWS SDK for C
License: Apache-2.0
++++++ v0.9.28.tar.gz -> v0.10.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aws-c-common-0.9.28/AWSCRTAndroidTestRunner/app/src/main/cpp/CMakeLists.txt new/aws-c-common-0.10.0/AWSCRTAndroidTestRunner/app/src/main/cpp/CMakeLists.txt
--- old/aws-c-common-0.9.28/AWSCRTAndroidTestRunner/app/src/main/cpp/CMakeLists.txt 2024-09-06 21:07:00.000000000 +0200
+++ new/aws-c-common-0.10.0/AWSCRTAndroidTestRunner/app/src/main/cpp/CMakeLists.txt 2024-10-23 18:56:03.000000000 +0200
@@ -3,7 +3,7 @@
# Sets the minimum version of CMake required to build the native library.
-cmake_minimum_required(VERSION 3.4.1)
+cmake_minimum_required(VERSION 3.9)
# AWS lib
set(path_to_common "${CMAKE_CURRENT_LIST_DIR}/../../../../..")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aws-c-common-0.9.28/CMakeLists.txt new/aws-c-common-0.10.0/CMakeLists.txt
--- old/aws-c-common-0.9.28/CMakeLists.txt 2024-09-06 21:07:00.000000000 +0200
+++ new/aws-c-common-0.10.0/CMakeLists.txt 2024-10-23 18:56:03.000000000 +0200
@@ -1,17 +1,15 @@
# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
# SPDX-License-Identifier: Apache-2.0.
-cmake_minimum_required(VERSION 3.0)
+# As of October 2024, we picked 3.9 as our version because internally we still support RHEL5 and AL2012, and CMake 3.9
+# was the latest version available on those platforms.
+cmake_minimum_required(VERSION 3.9)
option(ALLOW_CROSS_COMPILED_TESTS "Allow tests to be compiled via cross compile, for use with qemu" OFF)
project(aws-c-common LANGUAGES C VERSION 0.1.0)
message(STATUS "CMake ${CMAKE_VERSION}")
-if (POLICY CMP0069)
- cmake_policy(SET CMP0069 NEW) # Enable LTO/IPO if available in the compiler, see AwsCFlags
-endif()
-
if (POLICY CMP0077)
cmake_policy(SET CMP0077 OLD) # Enable options to get their values from normal variables
endif()
@@ -189,7 +187,6 @@
${AWS_COMMON_EXTERNAL_SRC}
)
-
add_library(${PROJECT_NAME} ${COMMON_SRC})
aws_set_common_properties(${PROJECT_NAME} NO_WEXTRA)
aws_prepare_symbol_visibility_args(${PROJECT_NAME} "AWS_COMMON")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aws-c-common-0.9.28/cmake/AwsCFlags.cmake new/aws-c-common-0.10.0/cmake/AwsCFlags.cmake
--- old/aws-c-common-0.9.28/cmake/AwsCFlags.cmake 2024-09-06 21:07:00.000000000 +0200
+++ new/aws-c-common-0.10.0/cmake/AwsCFlags.cmake 2024-10-23 18:56:03.000000000 +0200
@@ -4,7 +4,6 @@
include(CheckCCompilerFlag)
include(CheckIncludeFile)
include(CheckSymbolExists)
-include(CMakeParseArguments) # needed for CMake v3.4 and lower
option(AWS_ENABLE_LTO "Enables LTO on libraries. Ensure this is set on all consumed targets, or linking will fail" OFF)
option(LEGACY_COMPILER_SUPPORT "This enables builds with compiler versions such as gcc 4.1.2. This is not a 'supported' feature; it's just a best effort." OFF)
@@ -173,6 +172,7 @@
set_property(TARGET ${target} APPEND_STRING PROPERTY LINK_FLAGS " -Wl,--exclude-libs,libcrypto.a")
endif()
+
endif()
check_include_file(stdint.h HAS_STDINT)
@@ -230,30 +230,18 @@
set(_ENABLE_LTO_EXPR $<NOT:$<CONFIG:Debug>>)
# try to check whether compiler supports LTO/IPO
- if (POLICY CMP0069)
- cmake_policy(SET CMP0069 NEW)
- include(CheckIPOSupported OPTIONAL RESULT_VARIABLE ipo_check_exists)
- if (ipo_check_exists)
- check_ipo_supported(RESULT ipo_supported)
- if (ipo_supported)
- message(STATUS "Enabling IPO/LTO for Release builds")
- else()
- message(STATUS "AWS_ENABLE_LTO is enabled, but cmake/compiler does not support it, disabling")
- set(_ENABLE_LTO_EXPR OFF)
- endif()
- endif()
+ include(CheckIPOSupported)
+ check_ipo_supported(RESULT ipo_supported)
+ if (ipo_supported)
+ message(STATUS "Enabling IPO/LTO for Release builds")
+ else()
+ message(STATUS "AWS_ENABLE_LTO is enabled, but cmake/compiler does not support it, disabling")
+ set(_ENABLE_LTO_EXPR OFF)
endif()
else()
set(_ENABLE_LTO_EXPR OFF)
endif()
- if(BUILD_SHARED_LIBS)
- if (NOT MSVC)
- # this should only be set when building shared libs.
- list(APPEND AWS_C_FLAGS "-fvisibility=hidden")
- endif()
- endif()
-
if(AWS_ENABLE_TRACING)
target_link_libraries(${target} PRIVATE ittnotify)
else()
@@ -264,4 +252,11 @@
target_compile_definitions(${target} PRIVATE ${AWS_C_DEFINES_PRIVATE} PUBLIC ${AWS_C_DEFINES_PUBLIC})
set_target_properties(${target} PROPERTIES LINKER_LANGUAGE C C_STANDARD 99 C_STANDARD_REQUIRED ON)
set_target_properties(${target} PROPERTIES INTERPROCEDURAL_OPTIMIZATION ${_ENABLE_LTO_EXPR}>)
+
+ # Don't hide symbols in Debug builds.
+ # We do this so that backtraces are more likely to show function names.
+ # We mostly use backtraces to diagnose memory leaks.
+ if (NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
+ set_target_properties(${target} PROPERTIES C_VISIBILITY_PRESET hidden CXX_VISIBILITY_PRESET hidden VISIBILITY_INLINES_HIDDEN ON)
+ endif ()
endfunction()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aws-c-common-0.9.28/cmake/AwsPrebuildDependency.cmake new/aws-c-common-0.10.0/cmake/AwsPrebuildDependency.cmake
--- old/aws-c-common-0.9.28/cmake/AwsPrebuildDependency.cmake 2024-09-06 21:07:00.000000000 +0200
+++ new/aws-c-common-0.10.0/cmake/AwsPrebuildDependency.cmake 2024-10-23 18:56:03.000000000 +0200
@@ -25,11 +25,13 @@
set(depInstallDir ${depBinaryDir}/install)
file(MAKE_DIRECTORY ${depBinaryDir})
+ # Convert prefix path from list to escaped string, to be passed on command line
+ string(REPLACE ";" "\\\\;" ESCAPED_PREFIX_PATH "${CMAKE_PREFIX_PATH}")
# For execute_process to accept a dynamically constructed command, it should be passed in a list format.
- set(cmakeCommand "COMMAND" "${CMAKE_COMMAND}")
- list(APPEND cmakeCommand -S ${AWS_PREBUILD_SOURCE_DIR})
+ set(cmakeCommand "${CMAKE_COMMAND}")
+ list(APPEND cmakeCommand ${AWS_PREBUILD_SOURCE_DIR})
list(APPEND cmakeCommand -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE})
- list(APPEND cmakeCommand -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH})
+ list(APPEND cmakeCommand -DCMAKE_PREFIX_PATH=${ESCAPED_PREFIX_PATH})
list(APPEND cmakeCommand -DCMAKE_INSTALL_PREFIX=${depInstallDir})
list(APPEND cmakeCommand -DCMAKE_INSTALL_RPATH=${CMAKE_INSTALL_RPATH})
list(APPEND cmakeCommand -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS})
@@ -39,11 +41,13 @@
list(APPEND cmakeCommand ${AWS_PREBUILD_CMAKE_ARGUMENTS})
endif()
- list(APPEND cmakeCommand WORKING_DIRECTORY ${depBinaryDir})
- list(APPEND cmakeCommand RESULT_VARIABLE result)
-
# Configure dependency project.
- execute_process(${cmakeCommand})
+ execute_process(
+ COMMAND ${cmakeCommand}
+ WORKING_DIRECTORY ${depBinaryDir}
+ RESULT_VARIABLE result
+ )
+
if (NOT ${result} EQUAL 0)
message(FATAL_ERROR "Configuration failed for dependency project ${AWS_PREBUILD_DEPENDENCY_NAME}")
endif()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aws-c-common-0.9.28/cmake/AwsSIMD.cmake new/aws-c-common-0.10.0/cmake/AwsSIMD.cmake
--- old/aws-c-common-0.9.28/cmake/AwsSIMD.cmake 2024-09-06 21:07:00.000000000 +0200
+++ new/aws-c-common-0.10.0/cmake/AwsSIMD.cmake 2024-10-23 18:56:03.000000000 +0200
@@ -19,6 +19,7 @@
set(AWS_CLMUL_FLAG "-mpclmul")
set(AWS_SSE4_2_FLAG "-msse4.2")
+ # AWS Graviton3 processors use neoverse-v1
check_c_compiler_flag("-mtune=neoverse-v1" HAVE_MTUNE_NEOVERSE_V1)
if (HAVE_MTUNE_NEOVERSE_V1)
set(AWS_ARMv8_1_FLAG "-march=armv8-a+crc+crypto -mtune=neoverse-v1")
@@ -58,7 +59,7 @@
_mm256_permutevar8x32_epi32(vec, vec);
return 0;
- }" AWS_HAVE_AVX2_INTRINSICS)
+ }" AWS_HAVE_AVX2_INTRINSICS)
check_c_source_compiles("
#include <immintrin.h>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aws-c-common-0.9.28/cmake/AwsTestHarness.cmake new/aws-c-common-0.10.0/cmake/AwsTestHarness.cmake
--- old/aws-c-common-0.9.28/cmake/AwsTestHarness.cmake 2024-09-06 21:07:00.000000000 +0200
+++ new/aws-c-common-0.10.0/cmake/AwsTestHarness.cmake 2024-10-23 18:56:03.000000000 +0200
@@ -39,9 +39,9 @@
add_executable(${driver_exe_name} ${CMAKE_CURRENT_BINARY_DIR}/test_runner.c ${TESTS})
aws_set_common_properties(${driver_exe_name} NO_WEXTRA NO_PEDANTIC)
- # Some versions of CMake (3.9-3.11) generate a test_runner.c file with
- # a strncpy() call that triggers the "stringop-overflow" warning in GCC 8.1+
- # This warning doesn't exist until GCC 7 though, so test for it before disabling.
+ # Some versions of CMake (3.9-3.11) generate a test_runner.c file with
+ # a strncpy() call that triggers the "stringop-overflow" warning in GCC 8.1+
+ # This warning doesn't exist until GCC 7 though, so test for it before disabling.
if (NOT MSVC)
check_c_compiler_flag(-Wno-stringop-overflow HAS_WNO_STRINGOP_OVERFLOW)
if (HAS_WNO_STRINGOP_OVERFLOW)
@@ -57,6 +57,9 @@
target_compile_definitions(${driver_exe_name} PRIVATE AWS_UNSTABLE_TESTING_API=1)
target_include_directories(${driver_exe_name} PRIVATE ${CMAKE_CURRENT_LIST_DIR})
+ # Export symbols so that backtraces are more likely to show function names.
+ set_target_properties(${driver_exe_name} PROPERTIES ENABLE_EXPORTS ON)
+
foreach(name IN LISTS TEST_CASES)
add_test(${name} ${driver_exe_name} "${name}")
set_tests_properties("${name}" PROPERTIES SKIP_RETURN_CODE ${SKIP_RETURN_CODE_VALUE})
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aws-c-common-0.9.28/include/aws/common/array_list.h new/aws-c-common-0.10.0/include/aws/common/array_list.h
--- old/aws-c-common-0.9.28/include/aws/common/array_list.h 2024-09-06 21:07:00.000000000 +0200
+++ new/aws-c-common-0.10.0/include/aws/common/array_list.h 2024-10-23 18:56:03.000000000 +0200
@@ -231,11 +231,11 @@
AWS_COMMON_API
void aws_array_list_sort(struct aws_array_list *AWS_RESTRICT list, aws_array_list_comparator_fn *compare_fn);
+AWS_EXTERN_C_END
#ifndef AWS_NO_STATIC_IMPL
# include <aws/common/array_list.inl>
#endif /* AWS_NO_STATIC_IMPL */
-AWS_EXTERN_C_END
AWS_POP_SANE_WARNING_LEVEL
#endif /* AWS_COMMON_ARRAY_LIST_H */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aws-c-common-0.9.28/include/aws/common/atomics.h new/aws-c-common-0.10.0/include/aws/common/atomics.h
--- old/aws-c-common-0.9.28/include/aws/common/atomics.h 2024-09-06 21:07:00.000000000 +0200
+++ new/aws-c-common-0.10.0/include/aws/common/atomics.h 2024-10-23 18:56:03.000000000 +0200
@@ -318,11 +318,12 @@
AWS_STATIC_IMPL
void aws_atomic_thread_fence(enum aws_memory_order order);
+AWS_EXTERN_C_END
+
#ifndef AWS_NO_STATIC_IMPL
# include <aws/common/atomics.inl>
#endif /* AWS_NO_STATIC_IMPL */
-AWS_EXTERN_C_END
AWS_POP_SANE_WARNING_LEVEL
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aws-c-common-0.9.28/include/aws/common/atomics.inl new/aws-c-common-0.10.0/include/aws/common/atomics.inl
--- old/aws-c-common-0.9.28/include/aws/common/atomics.inl 2024-09-06 21:07:00.000000000 +0200
+++ new/aws-c-common-0.10.0/include/aws/common/atomics.inl 2024-10-23 18:56:03.000000000 +0200
@@ -127,6 +127,7 @@
size_t aws_atomic_fetch_xor(volatile struct aws_atomic_var *var, size_t n) {
return aws_atomic_fetch_xor_explicit(var, n, aws_memory_order_seq_cst);
}
+AWS_EXTERN_C_END
/* Include the backend implementation now, because we'll use its typedefs and #defines below */
#if defined(__GNUC__) || defined(__clang__)
@@ -143,6 +144,4 @@
#include <aws/common/atomics_fallback.inl>
-AWS_EXTERN_C_END
-
#endif /* AWS_COMMON_ATOMICS_INL */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aws-c-common-0.9.28/include/aws/common/byte_order.h new/aws-c-common-0.10.0/include/aws/common/byte_order.h
--- old/aws-c-common-0.9.28/include/aws/common/byte_order.h 2024-09-06 21:07:00.000000000 +0200
+++ new/aws-c-common-0.10.0/include/aws/common/byte_order.h 2024-10-23 18:56:03.000000000 +0200
@@ -66,11 +66,11 @@
*/
AWS_STATIC_IMPL uint16_t aws_ntoh16(uint16_t x);
+AWS_EXTERN_C_END
#ifndef AWS_NO_STATIC_IMPL
# include <aws/common/byte_order.inl>
#endif /* AWS_NO_STATIC_IMPL */
-AWS_EXTERN_C_END
AWS_POP_SANE_WARNING_LEVEL
#endif /* AWS_COMMON_BYTE_ORDER_H */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aws-c-common-0.9.28/include/aws/common/clock.h new/aws-c-common-0.10.0/include/aws/common/clock.h
--- old/aws-c-common-0.9.28/include/aws/common/clock.h 2024-09-06 21:07:00.000000000 +0200
+++ new/aws-c-common-0.10.0/include/aws/common/clock.h 2024-10-23 18:56:03.000000000 +0200
@@ -54,11 +54,12 @@
AWS_COMMON_API
int aws_sys_clock_get_ticks(uint64_t *timestamp);
+AWS_EXTERN_C_END
+
#ifndef AWS_NO_STATIC_IMPL
# include <aws/common/clock.inl>
#endif /* AWS_NO_STATIC_IMPL */
-AWS_EXTERN_C_END
AWS_POP_SANE_WARNING_LEVEL
#endif /* AWS_COMMON_CLOCK_H */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aws-c-common-0.9.28/include/aws/common/condition_variable.h new/aws-c-common-0.10.0/include/aws/common/condition_variable.h
--- old/aws-c-common-0.9.28/include/aws/common/condition_variable.h 2024-09-06 21:07:00.000000000 +0200
+++ new/aws-c-common-0.10.0/include/aws/common/condition_variable.h 2024-10-23 18:56:03.000000000 +0200
@@ -69,14 +69,17 @@
int aws_condition_variable_notify_all(struct aws_condition_variable *condition_variable);
/**
- * Waits the calling thread on a notification from another thread.
+ * Waits the calling thread on a notification from another thread. This function must be called with the mutex locked
+ * by the calling thread otherwise the behavior is undefined. Spurious wakeups can occur and to avoid this causing
+ * any problems use the _pred version of this function.
*/
AWS_COMMON_API
int aws_condition_variable_wait(struct aws_condition_variable *condition_variable, struct aws_mutex *mutex);
/**
* Waits the calling thread on a notification from another thread. If predicate returns false, the wait is reentered,
- * otherwise control returns to the caller.
+ * otherwise control returns to the caller. This function must be called with the mutex locked by the calling thread
+ * otherwise the behavior is undefined.
*/
AWS_COMMON_API
int aws_condition_variable_wait_pred(
@@ -87,7 +90,8 @@
/**
* Waits the calling thread on a notification from another thread. Times out after time_to_wait. time_to_wait is in
- * nanoseconds.
+ * nanoseconds. This function must be called with the mutex locked by the calling thread otherwise the behavior is
+ * undefined. Spurious wakeups can occur and to avoid this causing any problems use the _pred version of this function.
*/
AWS_COMMON_API
int aws_condition_variable_wait_for(
@@ -97,7 +101,8 @@
/**
* Waits the calling thread on a notification from another thread. Times out after time_to_wait. time_to_wait is in
- * nanoseconds. If predicate returns false, the wait is reentered, otherwise control returns to the caller.
+ * nanoseconds. If predicate returns false, the wait is reentered, otherwise control returns to the caller. This
+ * function must be called with the mutex locked by the calling thread otherwise the behavior is undefined.
*/
AWS_COMMON_API
int aws_condition_variable_wait_for_pred(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aws-c-common-0.9.28/include/aws/common/encoding.h new/aws-c-common-0.10.0/include/aws/common/encoding.h
--- old/aws-c-common-0.9.28/include/aws/common/encoding.h 2024-09-06 21:07:00.000000000 +0200
+++ new/aws-c-common-0.10.0/include/aws/common/encoding.h 2024-10-23 18:56:03.000000000 +0200
@@ -224,11 +224,12 @@
*/
AWS_COMMON_API int aws_utf8_decoder_finalize(struct aws_utf8_decoder *decoder);
+AWS_EXTERN_C_END
+
#ifndef AWS_NO_STATIC_IMPL
# include <aws/common/encoding.inl>
#endif /* AWS_NO_STATIC_IMPL */
-AWS_EXTERN_C_END
AWS_POP_SANE_WARNING_LEVEL
#endif /* AWS_COMMON_ENCODING_H */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aws-c-common-0.9.28/include/aws/common/error.h new/aws-c-common-0.10.0/include/aws/common/error.h
--- old/aws-c-common-0.9.28/include/aws/common/error.h 2024-09-06 21:07:00.000000000 +0200
+++ new/aws-c-common-0.10.0/include/aws/common/error.h 2024-10-23 18:56:03.000000000 +0200
@@ -149,12 +149,11 @@
AWS_COMMON_API
int aws_translate_and_raise_io_error(int error_no);
+AWS_EXTERN_C_END
#ifndef AWS_NO_STATIC_IMPL
# include <aws/common/error.inl>
#endif /* AWS_NO_STATIC_IMPL */
-AWS_EXTERN_C_END
-
enum aws_common_error {
AWS_ERROR_SUCCESS = AWS_ERROR_ENUM_BEGIN_RANGE(AWS_C_COMMON_PACKAGE_ID),
AWS_ERROR_OOM,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aws-c-common-0.9.28/include/aws/common/linked_list.h new/aws-c-common-0.10.0/include/aws/common/linked_list.h
--- old/aws-c-common-0.9.28/include/aws/common/linked_list.h 2024-09-06 21:07:00.000000000 +0200
+++ new/aws-c-common-0.10.0/include/aws/common/linked_list.h 2024-10-23 18:56:03.000000000 +0200
@@ -186,11 +186,11 @@
* Returns true if the node is currently in a list, false otherwise.
*/
AWS_STATIC_IMPL bool aws_linked_list_node_is_in_list(struct aws_linked_list_node *node);
+AWS_EXTERN_C_END
#ifndef AWS_NO_STATIC_IMPL
# include <aws/common/linked_list.inl>
#endif /* AWS_NO_STATIC_IMPL */
-AWS_EXTERN_C_END
AWS_POP_SANE_WARNING_LEVEL
#endif /* AWS_COMMON_LINKED_LIST_H */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aws-c-common-0.9.28/include/aws/common/math.h new/aws-c-common-0.10.0/include/aws/common/math.h
--- old/aws-c-common-0.9.28/include/aws/common/math.h 2024-09-06 21:07:00.000000000 +0200
+++ new/aws-c-common-0.10.0/include/aws/common/math.h 2024-10-23 18:56:03.000000000 +0200
@@ -200,11 +200,11 @@
AWS_STATIC_IMPL double aws_min_double(double a, double b);
AWS_STATIC_IMPL double aws_max_double(double a, double b);
+AWS_EXTERN_C_END
#ifndef AWS_NO_STATIC_IMPL
# include <aws/common/math.inl>
#endif /* AWS_NO_STATIC_IMPL */
-AWS_EXTERN_C_END
AWS_POP_SANE_WARNING_LEVEL
#endif /* AWS_COMMON_MATH_H */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aws-c-common-0.9.28/include/aws/common/math.inl new/aws-c-common-0.10.0/include/aws/common/math.inl
--- old/aws-c-common-0.9.28/include/aws/common/math.inl 2024-09-06 21:07:00.000000000 +0200
+++ new/aws-c-common-0.10.0/include/aws/common/math.inl 2024-10-23 18:56:03.000000000 +0200
@@ -13,8 +13,6 @@
#include <limits.h>
#include <stdlib.h>
-AWS_EXTERN_C_BEGIN
-
#if defined(AWS_HAVE_GCC_OVERFLOW_MATH_EXTENSIONS) && (defined(__clang__) || !defined(__cplusplus))
/*
* GCC and clang have these super convenient overflow checking builtins...
@@ -48,6 +46,8 @@
# include <aws/common/math.gcc_builtin.inl>
#endif
+AWS_EXTERN_C_BEGIN
+
#ifdef _MSC_VER
# pragma warning(push)
# pragma warning(disable : 4127) /*Disable "conditional expression is constant" */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aws-c-common-0.9.28/include/aws/common/ring_buffer.h new/aws-c-common-0.10.0/include/aws/common/ring_buffer.h
--- old/aws-c-common-0.9.28/include/aws/common/ring_buffer.h 2024-09-06 21:07:00.000000000 +0200
+++ new/aws-c-common-0.10.0/include/aws/common/ring_buffer.h 2024-10-23 18:56:03.000000000 +0200
@@ -93,11 +93,12 @@
const struct aws_ring_buffer *ring_buffer,
const struct aws_byte_buf *buf);
+AWS_EXTERN_C_END
+
#ifndef AWS_NO_STATIC_IMPL
# include <aws/common/ring_buffer.inl>
#endif /* AWS_NO_STATIC_IMPL */
-AWS_EXTERN_C_END
AWS_POP_SANE_WARNING_LEVEL
#endif /* AWS_COMMON_RING_BUFFER_H */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aws-c-common-0.9.28/include/aws/common/string.h new/aws-c-common-0.10.0/include/aws/common/string.h
--- old/aws-c-common-0.9.28/include/aws/common/string.h 2024-09-06 21:07:00.000000000 +0200
+++ new/aws-c-common-0.10.0/include/aws/common/string.h 2024-10-23 18:56:03.000000000 +0200
@@ -373,11 +373,12 @@
AWS_STATIC_IMPL
bool aws_char_is_space(uint8_t c);
+AWS_EXTERN_C_END
+
#ifndef AWS_NO_STATIC_IMPL
# include <aws/common/string.inl>
#endif /* AWS_NO_STATIC_IMPL */
-AWS_EXTERN_C_END
AWS_POP_SANE_WARNING_LEVEL
#endif /* AWS_COMMON_STRING_H */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aws-c-common-0.9.28/include/aws/common/zero.h new/aws-c-common-0.10.0/include/aws/common/zero.h
--- old/aws-c-common-0.9.28/include/aws/common/zero.h 2024-09-06 21:07:00.000000000 +0200
+++ new/aws-c-common-0.10.0/include/aws/common/zero.h 2024-10-23 18:56:03.000000000 +0200
@@ -56,11 +56,12 @@
AWS_COMMON_API
void aws_secure_zero(void *pBuf, size_t bufsize);
+AWS_EXTERN_C_END
+
#ifndef AWS_NO_STATIC_IMPL
# include <aws/common/zero.inl>
#endif /* AWS_NO_STATIC_IMPL */
-AWS_EXTERN_C_END
AWS_POP_SANE_WARNING_LEVEL
#endif /* AWS_COMMON_ZERO_H */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aws-c-common-0.9.28/tests/memtrace_test.c new/aws-c-common-0.10.0/tests/memtrace_test.c
--- old/aws-c-common-0.9.28/tests/memtrace_test.c 2024-09-06 21:07:00.000000000 +0200
+++ new/aws-c-common-0.10.0/tests/memtrace_test.c 2024-10-23 18:56:03.000000000 +0200
@@ -101,7 +101,7 @@
/* only bother to run this test if the platform can do a backtrace */
void *probe_stack[1];
if (!aws_backtrace(probe_stack, 1)) {
- return 0;
+ return AWS_OP_SKIP;
}
test_logger_init(&s_test_logger, allocator, AWS_LL_TRACE, 0);
@@ -146,27 +146,26 @@
/* if this is not a debug build, there may not be symbols, so the test cannot
* verify if a best effort was made */
#if defined(DEBUG_BUILD)
- /* fprintf(stderr, "%s\n", test_logger->log_buffer.buffer); */
+ fprintf(stderr, "%s\n", test_logger->log_buffer.buffer);
char s_alloc_1_addr[32];
char s_alloc_2_addr[32];
char s_alloc_3_addr[32];
char s_alloc_4_addr[32];
# if defined(_MSC_VER)
-# pragma warning(push)
# pragma warning(disable : 4054) /* type cast function pointer to data pointer */
+# endif
+
snprintf(s_alloc_1_addr, AWS_ARRAY_SIZE(s_alloc_1_addr), "0x%tx", (uintptr_t)(void *)s_alloc_1);
snprintf(s_alloc_2_addr, AWS_ARRAY_SIZE(s_alloc_2_addr), "0x%tx", (uintptr_t)(void *)s_alloc_2);
snprintf(s_alloc_3_addr, AWS_ARRAY_SIZE(s_alloc_3_addr), "0x%tx", (uintptr_t)(void *)s_alloc_3);
snprintf(s_alloc_4_addr, AWS_ARRAY_SIZE(s_alloc_4_addr), "0x%tx", (uintptr_t)(void *)s_alloc_4);
-# pragma warning(pop)
-# endif /* defined(_MSC_VER) */
const char *log_buffer = (const char *)test_logger->log_buffer.buffer;
ASSERT_TRUE(strstr(log_buffer, "s_alloc_1") || strstr(log_buffer, s_alloc_1_addr));
ASSERT_TRUE(strstr(log_buffer, "s_alloc_2") || strstr(log_buffer, s_alloc_2_addr));
ASSERT_TRUE(strstr(log_buffer, "s_alloc_3") || strstr(log_buffer, s_alloc_3_addr));
ASSERT_TRUE(strstr(log_buffer, "s_alloc_4") || strstr(log_buffer, s_alloc_4_addr));
-#endif
+#endif /* DEBUG_BUILD */
/* reset log */
aws_byte_buf_reset(&test_logger->log_buffer, true);
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package aws-crt-cpp for openSUSE:Factory checked in at 2024-10-27 11:25:11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/aws-crt-cpp (Old)
and /work/SRC/openSUSE:Factory/.aws-crt-cpp.new.2020 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "aws-crt-cpp"
Sun Oct 27 11:25:11 2024 rev:17 rq:1218383 version:0.29.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/aws-crt-cpp/aws-crt-cpp.changes 2024-09-24 17:32:11.438352384 +0200
+++ /work/SRC/openSUSE:Factory/.aws-crt-cpp.new.2020/aws-crt-cpp.changes 2024-10-27 11:25:29.766954352 +0100
@@ -1,0 +2,11 @@
+Thu Oct 24 11:57:53 UTC 2024 - John Paul Adrian Glaubitz <adrian.glaubitz(a)suse.com>
+
+- Update to version 0.29.0
+ * Update CMake to 3.9 by @waahm7 in (#666)
+- from version 0.28.5
+ * Latest submodules by @waahm7 in (#668)
+- from version 0.28.4
+ * Prebuild aws-lc by @sfod in (#648)
+ * Prebuild s2n by @TingDaoK in (#665)
+
+-------------------------------------------------------------------
Old:
----
v0.28.3.tar.gz
New:
----
v0.29.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ aws-crt-cpp.spec ++++++
--- /var/tmp/diff_new_pack.32wfyr/_old 2024-10-27 11:25:32.887083687 +0100
+++ /var/tmp/diff_new_pack.32wfyr/_new 2024-10-27 11:25:32.903084351 +0100
@@ -20,7 +20,7 @@
%define library_soversion 1
Name: aws-crt-cpp
-Version: 0.28.3
+Version: 0.29.0
Release: 0
Summary: AWS C++ wrapper for AWS SDK C libraries
License: Apache-2.0
++++++ v0.28.3.tar.gz -> v0.29.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aws-crt-cpp-0.28.3/.github/workflows/ci.yml new/aws-crt-cpp-0.29.0/.github/workflows/ci.yml
--- old/aws-crt-cpp-0.28.3/.github/workflows/ci.yml 2024-09-13 23:54:18.000000000 +0200
+++ new/aws-crt-cpp-0.29.0/.github/workflows/ci.yml 2024-10-23 19:56:23.000000000 +0200
@@ -40,6 +40,7 @@
linux-compat:
runs-on: ubuntu-22.04 # latest
strategy:
+ fail-fast: false
matrix:
image:
- manylinux2014-x64
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aws-crt-cpp-0.28.3/CMakeLists.txt new/aws-crt-cpp-0.29.0/CMakeLists.txt
--- old/aws-crt-cpp-0.28.3/CMakeLists.txt 2024-09-13 23:54:18.000000000 +0200
+++ new/aws-crt-cpp-0.29.0/CMakeLists.txt 2024-10-23 19:56:23.000000000 +0200
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.9)
if(POLICY CMP0077)
cmake_policy(SET CMP0077 NEW)
@@ -83,40 +83,47 @@
add_subdirectory(crt/aws-c-common)
if(UNIX AND NOT APPLE AND NOT BYO_CRYPTO)
+ include(AwsPrebuildDependency)
if(NOT USE_OPENSSL)
- set(DISABLE_PERL ON CACHE BOOL "Disable Perl for AWS-LC.")
- set(DISABLE_GO ON CACHE BOOL "Disable Go for AWS-LC.")
- set(BUILD_LIBSSL OFF CACHE BOOL "Build libssl for AWS-LC.")
- # temporarily disable certain warnings as errors for the aws-lc build
- set(OLD_CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
+ set(AWSLC_CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
+ # temporarily disable certain warnings as errors for the aws-lc build
if(NOT MSVC)
check_c_compiler_flag(-Wno-stringop-overflow HAS_WNO_STRINGOP_OVERFLOW)
if(HAS_WNO_STRINGOP_OVERFLOW)
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-stringop-overflow")
+ set(AWSLC_CMAKE_C_FLAGS "${AWSLC_CMAKE_C_FLAGS} -Wno-stringop-overflow")
endif()
check_c_compiler_flag(-Wno-array-parameter HAS_WNO_ARRAY_PARAMETER)
if(HAS_WNO_ARRAY_PARAMETER)
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-array-parameter")
+ set(AWSLC_CMAKE_C_FLAGS "${AWSLC_CMAKE_C_FLAGS} -Wno-array-parameter")
endif()
endif()
- add_subdirectory(crt/aws-lc)
-
- # restore previous build flags
- set(CMAKE_C_FLAGS "${OLD_CMAKE_C_FLAGS}")
-
- set(SEARCH_LIBCRYPTO OFF CACHE BOOL "Let S2N use libcrypto from AWS-LC.")
- else()
- set(SEARCH_LIBCRYPTO ON CACHE BOOL "Let S2N search libcrypto in the system.")
+ # s2n-tls uses libcrypto during its configuration, so we need to prebuild aws-lc.
+ aws_prebuild_dependency(
+ DEPENDENCY_NAME AWSLC
+ SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/crt/aws-lc
+ CMAKE_ARGUMENTS
+ -DDISABLE_GO=ON
+ -DDISABLE_PERL=ON
+ -DBUILD_LIBSSL=OFF
+ -DBUILD_TESTING=OFF
+ -DCMAKE_C_FLAGS=${AWSLC_CMAKE_C_FLAGS}
+ )
endif()
- set(UNSAFE_TREAT_WARNINGS_AS_ERRORS OFF CACHE BOOL "Disable warnings-as-errors when building S2N")
- add_subdirectory(crt/s2n)
+ # prebuild s2n-tls.
+ aws_prebuild_dependency(
+ DEPENDENCY_NAME S2N
+ SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/crt/s2n
+ CMAKE_ARGUMENTS
+ -DUNSAFE_TREAT_WARNINGS_AS_ERRORS=OFF
+ -DBUILD_TESTING=OFF
+ )
endif()
add_subdirectory(crt/aws-c-sdkutils)
@@ -295,6 +302,7 @@
set_target_properties(${PROJECT_NAME} PROPERTIES LINKER_LANGUAGE CXX)
set_target_properties(${PROJECT_NAME} PROPERTIES CXX_STANDARD ${CMAKE_CXX_STANDARD})
+set_target_properties(${PROJECT_NAME} PROPERTIES CXX_VISIBILITY_PRESET hidden VISIBILITY_INLINES_HIDDEN ON)
aws_prepare_symbol_visibility_args(${PROJECT_NAME} "AWS_CRT_CPP")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aws-crt-cpp-0.28.3/VERSION new/aws-crt-cpp-0.29.0/VERSION
--- old/aws-crt-cpp-0.28.3/VERSION 2024-09-13 23:54:18.000000000 +0200
+++ new/aws-crt-cpp-0.29.0/VERSION 2024-10-23 19:56:23.000000000 +0200
@@ -1 +1 @@
-0.28.3
+0.29.0
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package aws-c-auth for openSUSE:Factory checked in at 2024-10-27 11:25:10
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/aws-c-auth (Old)
and /work/SRC/openSUSE:Factory/.aws-c-auth.new.2020 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "aws-c-auth"
Sun Oct 27 11:25:10 2024 rev:13 rq:1218381 version:0.8.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/aws-c-auth/aws-c-auth.changes 2024-09-24 17:32:21.790785766 +0200
+++ /work/SRC/openSUSE:Factory/.aws-c-auth.new.2020/aws-c-auth.changes 2024-10-27 11:25:27.958879404 +0100
@@ -1,0 +2,6 @@
+Thu Oct 24 12:02:55 UTC 2024 - John Paul Adrian Glaubitz <adrian.glaubitz(a)suse.com>
+
+- Update to version 0.8.0
+ * Update CMake to 3.9 by @waahm7 in (#255)
+
+-------------------------------------------------------------------
Old:
----
v0.7.31.tar.gz
New:
----
v0.8.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ aws-c-auth.spec ++++++
--- /var/tmp/diff_new_pack.1xvxcN/_old 2024-10-27 11:25:29.126927822 +0100
+++ /var/tmp/diff_new_pack.1xvxcN/_new 2024-10-27 11:25:29.130927987 +0100
@@ -20,7 +20,7 @@
%define library_pkg 1_0_0
%define library_soversion 1
Name: aws-c-auth
-Version: 0.7.31
+Version: 0.8.0
Release: 0
Summary: AWS C99 library implementation of AWS client-side authentication
License: Apache-2.0
++++++ v0.7.31.tar.gz -> v0.8.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aws-c-auth-0.7.31/CMakeLists.txt new/aws-c-auth-0.8.0/CMakeLists.txt
--- old/aws-c-auth-0.7.31/CMakeLists.txt 2024-09-17 01:28:54.000000000 +0200
+++ new/aws-c-auth-0.8.0/CMakeLists.txt 2024-10-23 19:05:03.000000000 +0200
@@ -1,11 +1,7 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.9)
project(aws-c-auth C)
-if (POLICY CMP0069)
- cmake_policy(SET CMP0069 NEW) # Enable LTO/IPO if available in the compiler, see AwsCFlags
-endif()
-
if (DEFINED CMAKE_PREFIX_PATH)
file(TO_CMAKE_PATH "${CMAKE_PREFIX_PATH}" CMAKE_PREFIX_PATH)
endif()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aws-c-auth-0.7.31/README.md new/aws-c-auth-0.8.0/README.md
--- old/aws-c-auth-0.7.31/README.md 2024-09-17 01:28:54.000000000 +0200
+++ new/aws-c-auth-0.8.0/README.md 2024-10-23 19:05:03.000000000 +0200
@@ -13,7 +13,7 @@
### Building
-CMake 3.1+ is required to build.
+CMake 3.9+ is required to build.
`<install-path>` must be an absolute path in the following instructions.
@@ -62,7 +62,7 @@
### Testing
Certain tests require a specific environment setup in order to run successfully. This may be a specific execution
environment (EC2, ECS, etc...) or it may require certain environment variables to be set that configure properties
-(often sensitive materials, like keys). Whether or not these tests are enabled is controlled by certain CMAKE
+(often sensitive materials, like keys). Whether or not these tests are enabled is controlled by certain CMAKE
properties:
* AWS_BUILDING_ON_EC2 - indicates real IMDS credentials provider test(s) should run
* AWS_BUILDING_ON_ECS - indciates real ECS credentials provider tests(s) should run
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package aws-checksums for openSUSE:Factory checked in at 2024-10-27 11:25:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/aws-checksums (Old)
and /work/SRC/openSUSE:Factory/.aws-checksums.new.2020 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "aws-checksums"
Sun Oct 27 11:25:09 2024 rev:4 rq:1218380 version:0.2.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/aws-checksums/aws-checksums.changes 2024-09-24 17:32:13.882454701 +0200
+++ /work/SRC/openSUSE:Factory/.aws-checksums.new.2020/aws-checksums.changes 2024-10-27 11:25:25.790789532 +0100
@@ -1,0 +2,6 @@
+Thu Oct 24 12:11:32 UTC 2024 - John Paul Adrian Glaubitz <adrian.glaubitz(a)suse.com>
+
+- Update to version 0.2.0
+ * Update CMake to 3.9 by @waahm7 in (#98)
+
+-------------------------------------------------------------------
Old:
----
v0.1.20.tar.gz
New:
----
v0.2.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ aws-checksums.spec ++++++
--- /var/tmp/diff_new_pack.mqDZ7E/_old 2024-10-27 11:25:27.182847235 +0100
+++ /var/tmp/diff_new_pack.mqDZ7E/_new 2024-10-27 11:25:27.182847235 +0100
@@ -19,7 +19,7 @@
%define library_version 1.0.0
%define library_soversion 1
Name: aws-checksums
-Version: 0.1.20
+Version: 0.2.0
Release: 0
Summary: Checksums package for AWS SDK for C
License: Apache-2.0
++++++ v0.1.20.tar.gz -> v0.2.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aws-checksums-0.1.20/CMakeLists.txt new/aws-checksums-0.2.0/CMakeLists.txt
--- old/aws-checksums-0.1.20/CMakeLists.txt 2024-09-13 20:19:34.000000000 +0200
+++ new/aws-checksums-0.2.0/CMakeLists.txt 2024-10-23 19:04:04.000000000 +0200
@@ -1,13 +1,9 @@
-cmake_minimum_required (VERSION 3.1)
+cmake_minimum_required(VERSION 3.9)
option(STATIC_CRT "Windows specific option that to specify static/dynamic run-time library" OFF)
project (aws-checksums C)
-if (POLICY CMP0069)
- cmake_policy(SET CMP0069 NEW) # Enable LTO/IPO if available in the compiler, see AwsCFlags
-endif()
-
if (DEFINED CMAKE_PREFIX_PATH)
file(TO_CMAKE_PATH "${CMAKE_PREFIX_PATH}" CMAKE_PREFIX_PATH)
endif()
@@ -64,7 +60,6 @@
${AWS_CHECKSUMS_PLATFORM_SOURCE}
)
-
add_library(${PROJECT_NAME} ${CHECKSUMS_COMBINED_HEADERS} ${CHECKSUMS_COMBINED_SRC})
aws_set_common_properties(${PROJECT_NAME})
@@ -118,7 +113,7 @@
if (AWS_HAVE_CLMUL)
simd_append_source_and_features(${PROJECT_NAME} "source/intel/intrin/crc64nvme_clmul.c" ${AWS_AVX2_FLAG} ${AWS_CLMUL_FLAG} ${AWS_SSE4_2_FLAG})
endif()
-
+
elseif(AWS_ARCH_ARM64 OR (AWS_ARCH_ARM32 AND AWS_HAVE_ARM32_CRC))
simd_append_source_and_features(${PROJECT_NAME} "source/arm/crc32c_arm.c" ${AWS_ARMv8_1_FLAG})
@@ -129,7 +124,7 @@
"source/arm/*.c"
)
source_group("Source Files\\arm" FILES ${AWS_ARCH_SRC})
- endif()
+ endif()
endif()
endif()
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package aws-c-compression for openSUSE:Factory checked in at 2024-10-27 11:25:07
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/aws-c-compression (Old)
and /work/SRC/openSUSE:Factory/.aws-c-compression.new.2020 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "aws-c-compression"
Sun Oct 27 11:25:07 2024 rev:3 rq:1218378 version:0.3.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/aws-c-compression/aws-c-compression.changes 2024-02-21 17:59:07.781190149 +0100
+++ /work/SRC/openSUSE:Factory/.aws-c-compression.new.2020/aws-c-compression.changes 2024-10-27 11:25:23.706703142 +0100
@@ -1,0 +2,6 @@
+Thu Oct 24 12:15:37 UTC 2024 - John Paul Adrian Glaubitz <adrian.glaubitz(a)suse.com>
+
+- Update to version 0.3.0
+ * Update CMake to 3.9 by @waahm7 in (#70)
+
+-------------------------------------------------------------------
Old:
----
v0.2.18.tar.gz
New:
----
v0.3.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ aws-c-compression.spec ++++++
--- /var/tmp/diff_new_pack.jZrT1M/_old 2024-10-27 11:25:24.350729838 +0100
+++ /var/tmp/diff_new_pack.jZrT1M/_new 2024-10-27 11:25:24.350729838 +0100
@@ -19,7 +19,7 @@
%define library_version 1.0.0
%define library_soversion 1_0_0
Name: aws-c-compression
-Version: 0.2.18
+Version: 0.3.0
Release: 0
Summary: C99 implementation of Huffman encoding/decoding
License: Apache-2.0
++++++ v0.2.18.tar.gz -> v0.3.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aws-c-compression-0.2.18/.github/workflows/ci.yml new/aws-c-compression-0.3.0/.github/workflows/ci.yml
--- old/aws-c-compression-0.2.18/.github/workflows/ci.yml 2024-02-12 18:24:08.000000000 +0100
+++ new/aws-c-compression-0.3.0/.github/workflows/ci.yml 2024-10-23 19:03:04.000000000 +0200
@@ -6,7 +6,7 @@
- 'main'
env:
- BUILDER_VERSION: v0.9.55
+ BUILDER_VERSION: v0.9.62
BUILDER_SOURCE: releases
BUILDER_HOST: https://d19elf31gohf1l.cloudfront.net
PACKAGE_NAME: aws-c-compression
@@ -120,8 +120,17 @@
run: |
python .\aws-c-compression\build\deps\aws-c-common\scripts\appverifier_ctest.py --build_directory .\aws-c-compression\build\aws-c-compression
- osx:
- runs-on: macos-12 # latest
+ macos:
+ runs-on: macos-14 # latest
+ steps:
+ - name: Build ${{ env.PACKAGE_NAME }} + consumers
+ run: |
+ python3 -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder')"
+ chmod a+x builder
+ ./builder build -p ${{ env.PACKAGE_NAME }}
+
+ macos-x64:
+ runs-on: macos-14-large # latest
steps:
- name: Build ${{ env.PACKAGE_NAME }} + consumers
run: |
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aws-c-compression-0.2.18/.github/workflows/clang-format.yml new/aws-c-compression-0.3.0/.github/workflows/clang-format.yml
--- old/aws-c-compression-0.2.18/.github/workflows/clang-format.yml 2024-02-12 18:24:08.000000000 +0100
+++ new/aws-c-compression-0.3.0/.github/workflows/clang-format.yml 2024-10-23 19:03:04.000000000 +0200
@@ -5,14 +5,12 @@
jobs:
clang-format:
- runs-on: ubuntu-20.04 # latest
+ runs-on: ubuntu-24.04 # latest
steps:
- name: Checkout Sources
- uses: actions/checkout@v1
+ uses: actions/checkout@v4
- name: clang-format lint
- uses: DoozyX/clang-format-lint-action(a)v0.3.1
- with:
- # List of extensions to check
- extensions: c,h
+ run: |
+ ./format-check.py
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aws-c-compression-0.2.18/CMakeLists.txt new/aws-c-compression-0.3.0/CMakeLists.txt
--- old/aws-c-compression-0.2.18/CMakeLists.txt 2024-02-12 18:24:08.000000000 +0100
+++ new/aws-c-compression-0.3.0/CMakeLists.txt 2024-10-23 19:03:04.000000000 +0200
@@ -1,10 +1,6 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.9)
project(aws-c-compression C)
-if (POLICY CMP0069)
- cmake_policy(SET CMP0069 NEW) # Enable LTO/IPO if available in the compiler, see AwsCFlags
-endif()
-
if (DEFINED CMAKE_PREFIX_PATH)
file(TO_CMAKE_PATH "${CMAKE_PREFIX_PATH}" CMAKE_PREFIX_PATH)
endif()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aws-c-compression-0.2.18/format-check.py new/aws-c-compression-0.3.0/format-check.py
--- old/aws-c-compression-0.2.18/format-check.py 1970-01-01 01:00:00.000000000 +0100
+++ new/aws-c-compression-0.3.0/format-check.py 2024-10-23 19:03:04.000000000 +0200
@@ -0,0 +1,47 @@
+#!/usr/bin/env python3
+import argparse
+import os
+from pathlib import Path
+import re
+from subprocess import list2cmdline, run
+from tempfile import NamedTemporaryFile
+
+CLANG_FORMAT_VERSION = '18.1.6'
+
+INCLUDE_REGEX = re.compile(
+ r'^(include|source|tests|verification)/.*\.(c|h|inl)$')
+EXCLUDE_REGEX = re.compile(r'^$')
+
+arg_parser = argparse.ArgumentParser(description="Check with clang-format")
+arg_parser.add_argument('-i', '--inplace-edit', action='store_true',
+ help="Edit files inplace")
+args = arg_parser.parse_args()
+
+os.chdir(Path(__file__).parent)
+
+# create file containing list of all files to format
+filepaths_file = NamedTemporaryFile(delete=False)
+for dirpath, dirnames, filenames in os.walk('.'):
+ for filename in filenames:
+ # our regexes expect filepath to use forward slash
+ filepath = Path(dirpath, filename).as_posix()
+ if not INCLUDE_REGEX.match(filepath):
+ continue
+ if EXCLUDE_REGEX.match(filepath):
+ continue
+
+ filepaths_file.write(f"{filepath}\n".encode())
+filepaths_file.close()
+
+# use pipx to run clang-format from PyPI
+# this is a simple way to run the same clang-format version regardless of OS
+cmd = ['pipx', 'run', f'clang-format=={CLANG_FORMAT_VERSION}',
+ f'--files={filepaths_file.name}']
+if args.inplace_edit:
+ cmd += ['-i']
+else:
+ cmd += ['--Werror', '--dry-run']
+
+print(f"{Path.cwd()}$ {list2cmdline(cmd)}")
+if run(cmd).returncode:
+ exit(1)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aws-c-compression-0.2.18/format-check.sh new/aws-c-compression-0.3.0/format-check.sh
--- old/aws-c-compression-0.2.18/format-check.sh 2024-02-12 18:24:08.000000000 +0100
+++ new/aws-c-compression-0.3.0/format-check.sh 1970-01-01 01:00:00.000000000 +0100
@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-
-if [[ -z $CLANG_FORMAT ]] ; then
- CLANG_FORMAT=clang-format
-fi
-
-if NOT type $CLANG_FORMAT 2> /dev/null ; then
- echo "No appropriate clang-format found."
- exit 1
-fi
-
-FAIL=0
-SOURCE_FILES=`find source include tests -type f \( -name '*.h' -o -name '*.c' \) -not -name 'test_huffman_static.c'`
-for i in $SOURCE_FILES
-do
- $CLANG_FORMAT -output-replacements-xml $i | grep -c "<replacement " > /dev/null
- if [ $? -ne 1 ]
- then
- echo "$i failed clang-format check."
- FAIL=1
- fi
-done
-
-exit $FAIL
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aws-c-compression-0.2.18/source/compression.c new/aws-c-compression-0.3.0/source/compression.c
--- old/aws-c-compression-0.2.18/source/compression.c 2024-02-12 18:24:08.000000000 +0100
+++ new/aws-c-compression-0.3.0/source/compression.c 2024-10-23 19:03:04.000000000 +0200
@@ -6,7 +6,7 @@
#include <aws/compression/compression.h>
#define DEFINE_ERROR_INFO(CODE, STR) \
- [(CODE)-AWS_ERROR_ENUM_BEGIN_RANGE(AWS_C_COMPRESSION_PACKAGE_ID)] = \
+ [(CODE) - AWS_ERROR_ENUM_BEGIN_RANGE(AWS_C_COMPRESSION_PACKAGE_ID)] = \
AWS_DEFINE_ERROR_INFO(CODE, STR, "aws-c-compression")
/* clang-format off */
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package aws-c-sdkutils for openSUSE:Factory checked in at 2024-10-27 11:25:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/aws-c-sdkutils (Old)
and /work/SRC/openSUSE:Factory/.aws-c-sdkutils.new.2020 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "aws-c-sdkutils"
Sun Oct 27 11:25:06 2024 rev:6 rq:1218377 version:0.2.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/aws-c-sdkutils/aws-c-sdkutils.changes 2024-08-09 16:15:21.544672329 +0200
+++ /work/SRC/openSUSE:Factory/.aws-c-sdkutils.new.2020/aws-c-sdkutils.changes 2024-10-27 11:25:22.678660528 +0100
@@ -1,0 +2,6 @@
+Thu Oct 24 12:39:30 UTC 2024 - John Paul Adrian Glaubitz <adrian.glaubitz(a)suse.com>
+
+- Update to version 0.2.0
+ * Update CMake to 3.9 by @waahm7 in (#47)
+
+-------------------------------------------------------------------
Old:
----
v0.1.19.tar.gz
New:
----
v0.2.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ aws-c-sdkutils.spec ++++++
--- /var/tmp/diff_new_pack.0B1qJT/_old 2024-10-27 11:25:23.338687887 +0100
+++ /var/tmp/diff_new_pack.0B1qJT/_new 2024-10-27 11:25:23.338687887 +0100
@@ -20,7 +20,7 @@
%define library_pkg 1_0_0
%define library_soversion 1
Name: aws-c-sdkutils
-Version: 0.1.19
+Version: 0.2.0
Release: 0
Summary: AWS C SDK Utils
License: Apache-2.0
++++++ v0.1.19.tar.gz -> v0.2.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aws-c-sdkutils-0.1.19/CMakeLists.txt new/aws-c-sdkutils-0.2.0/CMakeLists.txt
--- old/aws-c-sdkutils-0.1.19/CMakeLists.txt 2024-08-03 00:36:14.000000000 +0200
+++ new/aws-c-sdkutils-0.2.0/CMakeLists.txt 2024-10-23 19:02:07.000000000 +0200
@@ -1,13 +1,9 @@
# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
# SPDX-License-Identifier: Apache-2.0.
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.9)
project(aws-c-sdkutils LANGUAGES C VERSION 0.1.0)
-if (POLICY CMP0069)
- cmake_policy(SET CMP0069 NEW) # Enable LTO/IPO if available in the compiler, see AwsCFlags
-endif()
-
if (DEFINED CMAKE_PREFIX_PATH)
file(TO_CMAKE_PATH "${CMAKE_PREFIX_PATH}" CMAKE_PREFIX_PATH)
endif()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aws-c-sdkutils-0.1.19/README.md new/aws-c-sdkutils-0.2.0/README.md
--- old/aws-c-sdkutils-0.1.19/README.md 2024-08-03 00:36:14.000000000 +0200
+++ new/aws-c-sdkutils-0.2.0/README.md 2024-10-23 19:02:07.000000000 +0200
@@ -11,7 +11,7 @@
### Building
-CMake 3.0+ is required to build.
+CMake 3.9+ is required to build.
`<install-path>` must be an absolute path in the following instructions.
@@ -26,4 +26,4 @@
git clone git@github.com:awslabs/aws-c-sdkutils.git
cmake -S aws-c-sdkutils -B aws-c-sdkutils/build -DCMAKE_INSTALL_PREFIX=<install-path> -DCMAKE_PREFIX_PATH=<install-path>
cmake --build aws-c-sdkutils/build --target install
-```
\ No newline at end of file
+```
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package aws-c-mqtt for openSUSE:Factory checked in at 2024-10-27 11:25:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/aws-c-mqtt (Old)
and /work/SRC/openSUSE:Factory/.aws-c-mqtt.new.2020 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "aws-c-mqtt"
Sun Oct 27 11:25:05 2024 rev:7 rq:1218375 version:0.11.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/aws-c-mqtt/aws-c-mqtt.changes 2024-09-25 21:56:04.135213720 +0200
+++ /work/SRC/openSUSE:Factory/.aws-c-mqtt.new.2020/aws-c-mqtt.changes 2024-10-27 11:25:20.730579776 +0100
@@ -1,0 +2,6 @@
+Thu Oct 24 12:50:36 UTC 2024 - John Paul Adrian Glaubitz <adrian.glaubitz(a)suse.com>
+
+- Update to version 0.11.0
+ * Update CMake to 3.9 by @waahm7 in (#376)
+
+-------------------------------------------------------------------
Old:
----
v0.10.6.tar.gz
New:
----
v0.11.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ aws-c-mqtt.spec ++++++
--- /var/tmp/diff_new_pack.QCjs1p/_old 2024-10-27 11:25:21.306603653 +0100
+++ /var/tmp/diff_new_pack.QCjs1p/_new 2024-10-27 11:25:21.310603820 +0100
@@ -18,7 +18,7 @@
%global library_version 1_0_0
Name: aws-c-mqtt
-Version: 0.10.6
+Version: 0.11.0
Release: 0
Summary: AWS C99 implementation of the MQTT 3.1.1 specification
License: Apache-2.0
++++++ v0.10.6.tar.gz -> v0.11.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aws-c-mqtt-0.10.6/CMakeLists.txt new/aws-c-mqtt-0.11.0/CMakeLists.txt
--- old/aws-c-mqtt-0.10.6/CMakeLists.txt 2024-09-19 22:54:19.000000000 +0200
+++ new/aws-c-mqtt-0.11.0/CMakeLists.txt 2024-10-23 18:58:22.000000000 +0200
@@ -1,10 +1,6 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.9)
project(aws-c-mqtt C)
-if (POLICY CMP0069)
- cmake_policy(SET CMP0069 NEW) # Enable LTO/IPO if available in the compiler, see AwsCFlags
-endif()
-
option(ASSERT_LOCK_HELD "Enable ASSERT_SYNCED_DATA_LOCK_HELD for checking thread issue" OFF)
if (ASSERT_LOCK_HELD)
add_definitions(-DASSERT_LOCK_HELD)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aws-c-mqtt-0.10.6/README.md new/aws-c-mqtt-0.11.0/README.md
--- old/aws-c-mqtt-0.10.6/README.md 2024-09-19 22:54:19.000000000 +0200
+++ new/aws-c-mqtt-0.11.0/README.md 2024-10-23 18:58:22.000000000 +0200
@@ -4,13 +4,13 @@
## License
-This library is licensed under the Apache 2.0 License.
+This library is licensed under the Apache 2.0 License.
## Usage
### Building
-CMake 3.1+ is required to build.
+CMake 3.9+ is required to build.
`<install-path>` must be an absolute path in the following instructions.
@@ -203,6 +203,6 @@
```c
int aws_mqtt_client_connection_ping(struct aws_mqtt_client_connection *connection);
```
-Sends a PINGREQ packet to the server.
+Sends a PINGREQ packet to the server.
[aws-c-io]: https://github.com/awslabs/aws-c-io
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package aws-c-cal for openSUSE:Factory checked in at 2024-10-27 11:25:03
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/aws-c-cal (Old)
and /work/SRC/openSUSE:Factory/.aws-c-cal.new.2020 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "aws-c-cal"
Sun Oct 27 11:25:03 2024 rev:11 rq:1218374 version:0.8.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/aws-c-cal/aws-c-cal.changes 2024-09-01 19:22:01.101468398 +0200
+++ /work/SRC/openSUSE:Factory/.aws-c-cal.new.2020/aws-c-cal.changes 2024-10-27 11:25:19.630534177 +0100
@@ -1,0 +2,6 @@
+Thu Oct 24 12:54:03 UTC 2024 - John Paul Adrian Glaubitz <adrian.glaubitz(a)suse.com>
+
+- Update to version 0.8.0
+ * Update CMake to 3.9 by @waahm7 in (#200)
+
+-------------------------------------------------------------------
Old:
----
v0.7.4.tar.gz
New:
----
v0.8.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ aws-c-cal.spec ++++++
--- /var/tmp/diff_new_pack.zbr4ex/_old 2024-10-27 11:25:20.202557888 +0100
+++ /var/tmp/diff_new_pack.zbr4ex/_new 2024-10-27 11:25:20.206558055 +0100
@@ -19,7 +19,7 @@
%define library_version 1.0.0
%define library_soversion 0unstable
Name: aws-c-cal
-Version: 0.7.4
+Version: 0.8.0
Release: 0
Summary: AWS C99 wrapper for cryptography primitives
License: Apache-2.0
++++++ v0.7.4.tar.gz -> v0.8.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aws-c-cal-0.7.4/CMakeLists.txt new/aws-c-cal-0.8.0/CMakeLists.txt
--- old/aws-c-cal-0.7.4/CMakeLists.txt 2024-08-23 23:35:42.000000000 +0200
+++ new/aws-c-cal-0.8.0/CMakeLists.txt 2024-10-23 18:57:41.000000000 +0200
@@ -1,14 +1,10 @@
# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
# SPDX-License-Identifier: Apache-2.0.
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.9)
project(aws-c-cal LANGUAGES C VERSION 0.1.0)
-if (POLICY CMP0069)
- cmake_policy(SET CMP0069 NEW) # Enable LTO/IPO if available in the compiler, see AwsCFlags
-endif()
-
set(CMAKE_FIND_PACKAGE_PREFER_CONFIG TRUE)
option(BYO_CRYPTO "Set this if you want to provide your own cryptography implementation. This will cause the defaults to not be compiled." OFF)
@@ -80,7 +76,7 @@
message(FATAL_ERROR "Security Framework not found")
endif ()
-
+
find_library(COREFOUNDATION_LIB CoreFoundation)
if(NOT COREFOUNDATION_LIB)
message(FATAL_ERROR "CoreFoundation Framework not found")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aws-c-cal-0.7.4/README.md new/aws-c-cal-0.8.0/README.md
--- old/aws-c-cal-0.7.4/README.md 2024-08-23 23:35:42.000000000 +0200
+++ new/aws-c-cal-0.8.0/README.md 2024-10-23 18:57:41.000000000 +0200
@@ -13,7 +13,7 @@
## Build Instructions
-CMake 3.0+ is required to build.
+CMake 3.9+ is required to build.
`<install-path>` must be an absolute path in the following instructions.
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package s2n for openSUSE:Factory checked in at 2024-10-27 11:25:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/s2n (Old)
and /work/SRC/openSUSE:Factory/.s2n.new.2020 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "s2n"
Sun Oct 27 11:25:02 2024 rev:14 rq:1218373 version:1.5.6
Changes:
--------
--- /work/SRC/openSUSE:Factory/s2n/s2n.changes 2024-09-01 19:21:57.509321329 +0200
+++ /work/SRC/openSUSE:Factory/.s2n.new.2020/s2n.changes 2024-10-27 11:25:16.794416614 +0100
@@ -1,0 +2,92 @@
+Thu Oct 24 12:58:26 UTC 2024 - John Paul Adrian Glaubitz <adrian.glaubitz(a)suse.com>
+
+- Update to version 1.5.6
+ * chore: Fix failing OIDC workflows; cleanup unused actions (#4848)
+ * chore(GHA): Update duvet arguments (#4850)
+ * chore: remove unused compile definition (#4815)
+ * Add new MLKEM TLS Policies (#4830)
+ * fix: fix opened AF_UNIX sockets that didn't call s2n_io_pair_close (#4833)
+ * bindings: pin openssl crate to 0.10.66 (#4849)
+ * chore: flip 2 GHAs to use short lived creds. (#4839)
+ * fix: fix s2n_io_pair_close_one_end (#4841)
+ * ci: Re-enable asan and ubsan for fuzz tests (#4840)
+ * fix: some open AF_UNIX sockets in forked child processes (#4834)
+ * Update FIPS rules for ML-KEM (#4829)
+ * ci: update ubuntu versions (#4828)
+ * Add initial support for MLKEM768 (without any new Security Policies) (#4816)
+ * chore: Adds print statements to help debug s2n_dynamic_load_test (#4836)
+ * ci: add more libcryptos for fuzz batch & follow cmake idioms (#4795)
+ * feature: bump cert authorities max size to 20kb (#4832)
+ * ci: Add ubuntu24 with a new cmake buildspec (#4824)
+ * Add ML-KEM Feature Probe and Test (#4823)
+ * docs: update stateful resumption doc (#4818)
+ * chore: remove make fuzz and AFL fuzz (#4808)
+- from version 1.5.5
+ * chore: bump awslc(non FIPS) to 1.36.0 (#4821)
+ * chore: bindings release 0.3.4 (#4819)
+ * feat: add s2n_cleanup_thread (#4584)
+ * feat(bindings): add set receive buffering to the rust bindings (#4817)
+- from version 1.5.4
+ * refactor: make s2n_array_len constant (#4801)
+ * feature(bindings): scheduled renegotiation via poll_recv (#4764)
+ * Update PQ code to be generic over EVP_KEM API's (#4810)
+ * refactor(bindings): add general bindings error context (#4811)
+ * ci: adding CTest memcheck to CodeBuild (#4776)
+ * Revert "test: disallow explict use of "default" policy in tests (#4750)" (#4812)
+ * ci: check for s2n_array_len in loop bounds (#4802)
+ * ci: use clang to build awslc (#4794)
+ * ci: run clippy on all features (#4809)
+ * docs: Update certificate loading documentation (#4790)
+ * test: only build requested unit tests in nix (#4770)
+ * refactor: clean up CMakelists.txt (#4779)
+ * fix: pem parsing should allow single dashes in comments (#4787)
+ * ci: use temporary directory for s2n_head build (#4771)
+ * fix(bindings): handle failures from wipe (#4798)
+ * fix: don't iterate over certs if not validating certs (#4797)
+ * ci: add buildspec file for scheduled fuzzing (#4763)
+ * Al2023 codebuild (#4756)
+ * test: disallow explict use of "default" policy in tests (#4750)
+ * chore: bindings release 0.3.3 (#4791)
+ * docs: clarify pre-TLS1.2 support (#4780)
+ * fix: update ja4 compliance (#4773)
+ * chore(bindings): pin unicode-width (#4785)
+- from version 1.5.3
+ * ci: refactor fuzz buildspec (#4783)
+ * docs(bindings): example for Policy::from_version (#4731)
+ * test: refactor pcap test to use version from rtshark (#4774)
+ * test: use seccomp on handshake test (#4768)
+ * ci: use newer version of libFuzzer (#4762)
+ * test: avoid mutating static configs in tests (#4749)
+ * chore(bindings): release 0.3.2 (#4760)
+ * ci: Emit CloudWatch metrics from rust benchmarks (#4742)
+ * CI: enable fuzz test build with cmake (#4743)
+ * fix: update handling of ja4 alpn edge cases (#4755)
+ * fix(bindings): update cc and unpin jobserver (#4758)
+ * fix: add missing null-checks in s2n_connection.c (#4754)
+- from version 1.5.2
+ * refactor: replace memcmp to s2n_constant_time_equals (#4709)
+ * tests(pcap): fix support for older tshark versions (#4744)
+ * refactor: move s2n_result functions inline (#4739)
+ * refactor: make s2n_stuffer_read_hex match s2n_stuffer_read (#4726)
+ * ci:Al2023 CodeBuild script (#4737)
+ * Update to CBMC 6.2.0 (#4746)
+ * docs: add test readme (#4718)
+ * tests(pcaps): download additional pcaps (#4728)
+ * ci: Add UBSAN test to the sanitizer (#4740)
+ * chore(integrationv2): add license header (#4732)
+ * fix: Cleanup libcrypto errors (#4733)
+ * fix(ci): update CBMC proofs' Makefile.common (#4703)
+ * ci: add separate license check (#4727)
+ * chore: cleanup old docker dev build (#4729)
+ * fix: resolve UBSAN violations in the codebase (#4722)
+ * refactor: minor fixes for common fingerprint code (#4712)
+ * tests: add JA4 pcap tests (#4714)
+ * fix: correct JA4 alpn parsing (#4721)
+ * chore: bump versions of aws-lc and aws-lc-fips (#4716)
+ * fix: Reorder PR and Mainline in Regression Test Runner (#4720)
+ * docs: Add a supported platforms section (#4695)
+ * chore(bindings): release 0.3.1 (#4719)
+ * test: add a harness for session resumption in regression test (#4706)
+ * fix(bindings): ConfigPool should always yield associated connections (#4708)
+
+-------------------------------------------------------------------
Old:
----
v1.5.1.tar.gz
New:
----
v1.5.6.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ s2n.spec ++++++
--- /var/tmp/diff_new_pack.rFJf9x/_old 2024-10-27 11:25:17.886461882 +0100
+++ /var/tmp/diff_new_pack.rFJf9x/_new 2024-10-27 11:25:17.886461882 +0100
@@ -19,7 +19,7 @@
%define library_version 1.0.0
%define library_soversion 0unstable
Name: s2n
-Version: 1.5.1
+Version: 1.5.6
Release: 0
Summary: AWS implementation of the TLS/SSL protocols
License: Apache-2.0
++++++ v1.5.1.tar.gz -> v1.5.6.tar.gz ++++++
++++ 17007 lines of diff (skipped)
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package rng-tools for openSUSE:Factory checked in at 2024-10-27 11:25:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rng-tools (Old)
and /work/SRC/openSUSE:Factory/.rng-tools.new.2020 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rng-tools"
Sun Oct 27 11:25:00 2024 rev:55 rq:1218372 version:6.17
Changes:
--------
--- /work/SRC/openSUSE:Factory/rng-tools/rng-tools.changes 2024-10-23 21:15:10.530956281 +0200
+++ /work/SRC/openSUSE:Factory/.rng-tools.new.2020/rng-tools.changes 2024-10-27 11:25:15.330355926 +0100
@@ -1,0 +2,5 @@
+Thu Oct 24 15:49:23 UTC 2024 - Andreas Schwab <schwab(a)suse.de>
+
+- Enable build on risc64
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rng-tools.spec ++++++
--- /var/tmp/diff_new_pack.EAlFh3/_old 2024-10-27 11:25:16.022384612 +0100
+++ /var/tmp/diff_new_pack.EAlFh3/_new 2024-10-27 11:25:16.022384612 +0100
@@ -70,7 +70,7 @@
Supplements: modalias(pci:v00008086d000027B9sv*sd*bc*sc*i*)
Supplements: modalias(pci:v00008086d000027BDsv*sd*bc*sc*i*)
Supplements: modalias(virtio:d00000004v*)
-ExclusiveArch: aarch64 %{ix86} ia64 x86_64 %{arm} ppc64 ppc64le
+ExclusiveArch: aarch64 %{ix86} ia64 x86_64 %{arm} ppc64 ppc64le riscv64
%{?systemd_requires}
%description
1
0
27 Oct '24
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package owncloud-client-desktop-integration for openSUSE:Factory checked in at 2024-10-27 11:24:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/owncloud-client-desktop-integration (Old)
and /work/SRC/openSUSE:Factory/.owncloud-client-desktop-integration.new.2020 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "owncloud-client-desktop-integration"
Sun Oct 27 11:24:58 2024 rev:3 rq:1218367 version:6.0.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/owncloud-client-desktop-integration/owncloud-client-desktop-integration.changes 2024-05-09 12:15:01.133444293 +0200
+++ /work/SRC/openSUSE:Factory/.owncloud-client-desktop-integration.new.2020/owncloud-client-desktop-integration.changes 2024-10-27 11:25:13.446277827 +0100
@@ -1,0 +2,9 @@
+Fri Oct 25 06:35:53 UTC 2024 - Atri Bhattacharya <badshah400(a)gmail.com>
+
+- Update to version 6.0.0:
+ * Don't depend on ecm and Qt
+ (gh#owncloud/client-desktop-shell-integration-nautilus#2).
+ * Depend on resoruces
+ (gh#owncloud/client-desktop-shell-integration-nautilus#3).
+
+-------------------------------------------------------------------
Old:
----
owncloud-client-desktop-integration-5.0.0.tar.gz
New:
----
owncloud-client-desktop-integration-6.0.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ owncloud-client-desktop-integration.spec ++++++
--- /var/tmp/diff_new_pack.y6Vifi/_old 2024-10-27 11:25:14.038302368 +0100
+++ /var/tmp/diff_new_pack.y6Vifi/_new 2024-10-27 11:25:14.038302368 +0100
@@ -17,7 +17,7 @@
Name: owncloud-client-desktop-integration
-Version: 5.0.0
+Version: 6.0.0
Release: 0
Summary: Integration for the ownCloud desktop client with various file managers
License: GPL-2.0-or-later
@@ -78,7 +78,7 @@
%autosetup -p1 -n client-desktop-shell-integration-nautilus-%{version}
%build
-%cmake
+%cmake -DREQUIRE_OWNCLOUD_RESOURCES=OFF
%cmake_build
%install
@@ -88,16 +88,16 @@
%files -n nautilus-extension-owncloud
%license COPYING
-%doc README
+%doc README.md
%{_datadir}/nautilus-python/extensions/*.py
%files -n caja-extension-owncloud
%license COPYING
-%doc README
+%doc README.md
%{_datadir}/caja-python/extensions/*.py
%files -n nemo-extension-owncloud
%license COPYING
-%doc README
+%doc README.md
%{_datadir}/nemo-python/extensions/*.py
++++++ owncloud-client-desktop-integration-5.0.0.tar.gz -> owncloud-client-desktop-integration-6.0.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/client-desktop-shell-integration-nautilus-5.0.0/.github/workflows/main.yml new/client-desktop-shell-integration-nautilus-6.0.0/.github/workflows/main.yml
--- old/client-desktop-shell-integration-nautilus-5.0.0/.github/workflows/main.yml 2023-10-17 12:36:38.000000000 +0200
+++ new/client-desktop-shell-integration-nautilus-6.0.0/.github/workflows/main.yml 2024-10-15 12:26:06.000000000 +0200
@@ -5,13 +5,29 @@
jobs:
build:
name: Build plugins
- runs-on: ubuntu-22.04
+ runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v2
+ - name: Checkout
+ uses: actions/checkout@v4
+
+ - name: Checkout resources
+ uses: actions/checkout@v4
+ with:
+ repository: owncloud/client-desktop-shell-integration-resources
+ path: resources
+
- name: Install dependencies
run: |
sudo apt-get update
- sudo apt-get install -y --no-install-recommends cmake ninja-build extra-cmake-modules qt5-qmake qtbase5-dev libsqlite3-dev libkf5kio-dev tree
+ sudo apt-get install -y --no-install-recommends cmake ninja-build extra-cmake-modules tree
+
+ - name: Install resources
+ run: |
+ mkdir resources/build
+ pushd resources/build
+ cmake .. -DCMAKE_BUILD_TYPE=RelWithDebInfo -G Ninja
+ sudo ninja install
+
- name: Build
run: |
mkdir build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/client-desktop-shell-integration-nautilus-5.0.0/CMakeLists.txt new/client-desktop-shell-integration-nautilus-6.0.0/CMakeLists.txt
--- old/client-desktop-shell-integration-nautilus-5.0.0/CMakeLists.txt 2023-10-17 12:36:38.000000000 +0200
+++ new/client-desktop-shell-integration-nautilus-6.0.0/CMakeLists.txt 2024-10-15 12:26:06.000000000 +0200
@@ -1,34 +1,22 @@
cmake_minimum_required(VERSION 3.16)
-project(owncloud-client-shell-integration-nautilus)
+# we need at least one language for GNUInstallDirs
+project(owncloud-client-shell-integration-nautilus VERSION 6.0.0 LANGUAGES C)
-include(FeatureSummary)
-
-set(KF5_MIN_VERSION "5.52.0")
+option(REQUIRE_OWNCLOUD_RESOURCES "We depend on the ownCloud resources, if your distribution does provide alternative icons you can disable this requirement" ON)
-find_package(ECM ${KF5_MIN_VERSION} REQUIRED CONFIG)
-set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+include(FeatureSummary)
+include(GNUInstallDirs)
-set_package_properties(DolphinVcs PROPERTIES
- DESCRIPTION "the Dolphin plugin library"
- URL "http://dolphin.kde.org/"
- TYPE REQUIRED
- PURPOSE "Provides plugin interfaces for Dolphin."
-)
-
-set(KDE_INSTALL_DIRS_NO_DEPRECATED TRUE)
-include(KDEInstallDirs)
-# kcoreaddons_add_plugin uses deprecated VAR PLUGIN_INSTALL_DIR
-# when that is fixed and you want to remove this workaround,
-# you need to _require_ the new enough kcoreaddons
-set(PLUGIN_INSTALL_DIR "${KDE_INSTALL_PLUGINDIR}")
-include(KDECMakeSettings)
-include(KDECompilerSettings)
-include(ECMMarkNonGuiExecutable)
-include(GenerateExportHeader)
+if (REQUIRE_OWNCLOUD_RESOURCES)
+ find_package(ownCloudShellResources 1.0.0 REQUIRED)
+ set_package_properties(ownCloudShellResources PROPERTIES TYPE REQUIRED DESCRIPTION "Required ownCloud resources and icons" URL "https://github.com/owncloud/client-desktop-shell-integration-resources")
+endif()
set(APPLICATION_NAME "ownCloud" CACHE STRING "Branding parameter")
set(APPLICATION_SHORTNAME "ownCloud" CACHE STRING "Branding parameter")
set(APPLICATION_EXECUTABLE "owncloud" CACHE STRING "Branding parameter")
add_subdirectory(src)
+
+feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/client-desktop-shell-integration-nautilus-5.0.0/README new/client-desktop-shell-integration-nautilus-6.0.0/README
--- old/client-desktop-shell-integration-nautilus-5.0.0/README 2023-10-17 12:36:38.000000000 +0200
+++ new/client-desktop-shell-integration-nautilus-6.0.0/README 1970-01-01 01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-# client-shell-integration-nautilus
-
-This repository contains a Python extension for Nautilus and its forks Nemo and Caja to provide shell integration for the ownCloud desktop client for the GNOME, Cinnamon and MATE desktop environments.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/client-desktop-shell-integration-nautilus-5.0.0/README.md new/client-desktop-shell-integration-nautilus-6.0.0/README.md
--- old/client-desktop-shell-integration-nautilus-5.0.0/README.md 1970-01-01 01:00:00.000000000 +0100
+++ new/client-desktop-shell-integration-nautilus-6.0.0/README.md 2024-10-15 12:26:06.000000000 +0200
@@ -0,0 +1,3 @@
+# client-shell-integration-nautilus
+
+This repository contains a Python extension for Nautilus and its forks Nemo and Caja to provide shell integration for the ownCloud desktop client for the GNOME, Cinnamon and MATE desktop environments.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/client-desktop-shell-integration-nautilus-5.0.0/src/CMakeLists.txt new/client-desktop-shell-integration-nautilus-6.0.0/src/CMakeLists.txt
--- old/client-desktop-shell-integration-nautilus-5.0.0/src/CMakeLists.txt 2023-10-17 12:36:38.000000000 +0200
+++ new/client-desktop-shell-integration-nautilus-6.0.0/src/CMakeLists.txt 2024-10-15 12:26:06.000000000 +0200
@@ -29,6 +29,6 @@
OUTPUT_VARIABLE out
)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/syncstate.py DESTINATION ${KDE_INSTALL_DATADIR}/nautilus-python/extensions RENAME syncstate-${APPLICATION_SHORTNAME}.py)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/syncstate_nemo.py DESTINATION ${KDE_INSTALL_DATADIR}/nemo-python/extensions RENAME syncstate-${APPLICATION_SHORTNAME}.py)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/syncstate_caja.py DESTINATION ${KDE_INSTALL_DATADIR}/caja-python/extensions RENAME syncstate-${APPLICATION_SHORTNAME}.py)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/syncstate.py DESTINATION ${CMAKE_INSTALL_DATADIR}/nautilus-python/extensions RENAME syncstate-${APPLICATION_SHORTNAME}.py)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/syncstate_nemo.py DESTINATION ${CMAKE_INSTALL_DATADIR}/nemo-python/extensions RENAME syncstate-${APPLICATION_SHORTNAME}.py)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/syncstate_caja.py DESTINATION ${CMAKE_INSTALL_DATADIR}/caja-python/extensions RENAME syncstate-${APPLICATION_SHORTNAME}.py)
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-pytest-pycodestyle for openSUSE:Factory checked in at 2024-10-27 11:24:57
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-pytest-pycodestyle (Old)
and /work/SRC/openSUSE:Factory/.python-pytest-pycodestyle.new.2020 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-pytest-pycodestyle"
Sun Oct 27 11:24:57 2024 rev:6 rq:1218370 version:2.3.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-pytest-pycodestyle/python-pytest-pycodestyle.changes 2022-11-30 15:01:16.817814354 +0100
+++ /work/SRC/openSUSE:Factory/.python-pytest-pycodestyle.new.2020/python-pytest-pycodestyle.changes 2024-10-27 11:25:12.914255773 +0100
@@ -1,0 +2,5 @@
+Thu Sep 26 22:38:15 UTC 2024 - Guang Yee <gyee(a)suse.com>
+
+- Enable python-pytest-pycodestyle.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-pytest-pycodestyle.spec ++++++
--- /var/tmp/diff_new_pack.Gd8r3R/_old 2024-10-27 11:25:13.322272687 +0100
+++ /var/tmp/diff_new_pack.Gd8r3R/_new 2024-10-27 11:25:13.322272687 +0100
@@ -16,6 +16,7 @@
#
+%{?sle15_python_module_pythons}
%define skip_python2 1
Name: python-pytest-pycodestyle
Version: 2.3.1
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-pytest-mypy for openSUSE:Factory checked in at 2024-10-27 11:24:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-pytest-mypy (Old)
and /work/SRC/openSUSE:Factory/.python-pytest-mypy.new.2020 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-pytest-mypy"
Sun Oct 27 11:24:56 2024 rev:3 rq:1218368 version:0.10.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-pytest-mypy/python-pytest-mypy.changes 2023-02-08 17:20:41.638061209 +0100
+++ /work/SRC/openSUSE:Factory/.python-pytest-mypy.new.2020/python-pytest-mypy.changes 2024-10-27 11:25:11.954215980 +0100
@@ -1,0 +2,5 @@
+Thu Sep 26 20:45:09 UTC 2024 - Yogalakshmi Arunachalam <yarunachalam(a)suse.com>
+
+- Fixed %{?sle15_python_module_pythons}
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-pytest-mypy.spec ++++++
--- /var/tmp/diff_new_pack.MrcNZU/_old 2024-10-27 11:25:12.390234053 +0100
+++ /var/tmp/diff_new_pack.MrcNZU/_new 2024-10-27 11:25:12.390234053 +0100
@@ -15,7 +15,7 @@
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
-
+%{?sle15_python_module_pythons}
Name: python-pytest-mypy
Version: 0.10.3
Release: 0
1
0