January 2024 - openSUSE Commits - openSUSE Mailing Lists

commit symbols-only-nerd-fonts for openSUSE:Factory
by Source-Sync 30 Jan '24

30 Jan '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package symbols-only-nerd-fonts for openSUSE:Factory checked in at 2024-01-30 18:25:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/symbols-only-nerd-fonts (Old) and /work/SRC/openSUSE:Factory/.symbols-only-nerd-fonts.new.1815 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "symbols-only-nerd-fonts" Tue Jan 30 18:25:12 2024 rev:2 rq:1142606 version:3.1.1 Changes: -------- --- /work/SRC/openSUSE:Factory/symbols-only-nerd-fonts/symbols-only-nerd-fonts.changes 2023-07-24 18:26:03.770184099 +0200 +++ /work/SRC/openSUSE:Factory/.symbols-only-nerd-fonts.new.1815/symbols-only-nerd-fonts.changes 2024-01-30 18:25:25.709971123 +0100 @@ -1,0 +2,12 @@ +Mon Jan 29 17:05:57 UTC 2024 - Gordon Leung <pirateclip(a)protonmail.com> + +- Update to 3.1.1 + * New icons + - Add Common Lisp and Scheme icon + - Add Fennel icon @Grazfather + - Add Neovim icon @georgeguimaraes + - Add TOML icon @cpea2506 + - Update Font Logos to v1.1.1 + * Features + - Update Windows icon to Windows 11 +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ symbols-only-nerd-fonts.spec ++++++ --- /var/tmp/diff_new_pack.uv7132/_old 2024-01-30 18:25:26.397995945 +0100 +++ /var/tmp/diff_new_pack.uv7132/_new 2024-01-30 18:25:26.401996090 +0100 @@ -1,7 +1,7 @@ # # spec file for package symbols-only-nerd-fonts # -# 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,8 +15,9 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # + Name: symbols-only-nerd-fonts -Version: 3.0.2 +Version: 3.1.1 Release: 0 Summary: A glyphs-only version of Nerd Fonts License: MIT @@ -42,7 +43,6 @@ install -m644 README.md %{buildroot}%{_docdir}/%{name} install -m644 LICENSE %{buildroot}%{_licensedir}/%{name} - %reconfigure_fonts_scriptlets %files ++++++ NerdFontsSymbolsOnly.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/README.md new/README.md --- old/README.md 2023-06-04 18:45:05.000000000 +0200 +++ new/README.md 2023-11-26 16:39:11.000000000 +0100 @@ -1,3 +1,11 @@ +# Nerd Fonts + +This is an archived font from the Nerd Fonts release v3.1.1. + +For more information see: +* https://github.com/ryanoasis/nerd-fonts/ +* https://github.com/ryanoasis/nerd-fonts/releases/latest/ + # Symbols Only This font contains (in the patched-fonts folder) all symbols and is intended to be used Binary files old/SymbolsNerdFont-Regular.ttf and new/SymbolsNerdFont-Regular.ttf differ Binary files old/SymbolsNerdFontMono-Regular.ttf and new/SymbolsNerdFontMono-Regular.ttf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/readme.md new/readme.md --- old/readme.md 2023-06-04 18:45:05.000000000 +0200 +++ new/readme.md 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ - -# Nerd Fonts - -This is an archived font from a Nerd Fonts release. - -For more information see: -* https://github.com/ryanoasis/nerd-fonts/ -* https://github.com/ryanoasis/nerd-fonts/releases/latest/

1 0

commit minio-client for openSUSE:Factory
by Source-Sync 30 Jan '24

30 Jan '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package minio-client for openSUSE:Factory checked in at 2024-01-30 18:25:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/minio-client (Old) and /work/SRC/openSUSE:Factory/.minio-client.new.1815 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "minio-client" Tue Jan 30 18:25:09 2024 rev:67 rq:1142616 version:20240128T162314Z Changes: -------- --- /work/SRC/openSUSE:Factory/minio-client/minio-client.changes 2024-01-22 20:33:03.690669832 +0100 +++ /work/SRC/openSUSE:Factory/.minio-client.new.1815/minio-client.changes 2024-01-30 18:25:23.557893485 +0100 @@ -1,0 +2,12 @@ +Mon Jan 29 17:40:18 UTC 2024 - opensuse_buildservice(a)ojkastl.de + +- Update to version 20240128T162314Z: + * fix: remove prometheus metrics arbitrary body limit (#4832) + * feat: service restart/update provides now per node status + (#4827) + * Bump github.com/lestrrat-go/jwx from 1.2.27 to 1.2.28 (#4830) + * feat: add skip-errors to mc mirror (#4831) + * fix: allow -q by turning of pipe progress bar (#4828) + * Adding screen-256color to pager enabled terms (#4829) + +------------------------------------------------------------------- Old: ---- mc-20240118T070339Z.obscpio New: ---- mc-20240128T162314Z.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ minio-client.spec ++++++ --- /var/tmp/diff_new_pack.eDoctX/_old 2024-01-30 18:25:25.033946735 +0100 +++ /var/tmp/diff_new_pack.eDoctX/_new 2024-01-30 18:25:25.033946735 +0100 @@ -22,7 +22,7 @@ %define binary_name minio-client Name: minio-client -Version: 20240118T070339Z +Version: 20240128T162314Z Release: 0 Summary: Client for MinIO License: AGPL-3.0-only ++++++ _service ++++++ --- /var/tmp/diff_new_pack.eDoctX/_old 2024-01-30 18:25:25.061947746 +0100 +++ /var/tmp/diff_new_pack.eDoctX/_new 2024-01-30 18:25:25.065947890 +0100 @@ -5,7 +5,7 @@ <param name="exclude">.git</param> <param name="changesgenerate">enable</param> <param name="versionformat">@PARENT_TAG@</param> - <param name="revision">RELEASE.2024-01-18T07-03-39Z</param> + <param name="revision">RELEASE.2024-01-28T16-23-14Z</param> <param name="match-tag">RELEASE.*</param> <param name="versionrewrite-pattern">RELEASE\.(.*)-(.*)-(.*)-(.*)-(.*)</param> <param name="versionrewrite-replacement">\1\2\3\4\5</param> @@ -19,7 +19,7 @@ <param name="compression">gz</param> </service> <service name="go_modules" mode="manual"> - <param name="archive">mc-20240118T070339Z.obscpio</param> + <param name="archive">mc-20240128T162314Z.obscpio</param> </service> </services> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.eDoctX/_old 2024-01-30 18:25:25.081948467 +0100 +++ /var/tmp/diff_new_pack.eDoctX/_new 2024-01-30 18:25:25.085948611 +0100 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/minio/mc</param> - <param name="changesrevision">bb25267eaadc0e025243b443a94ff33bde6302ad</param></service></servicedata> + <param name="changesrevision">ba9fc6a3075df6d8a413cc7e423645706aaefae1</param></service></servicedata> (No newline at EOF) ++++++ mc-20240118T070339Z.obscpio -> mc-20240128T162314Z.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mc-20240118T070339Z/cmd/admin-prometheus-metrics.go new/mc-20240128T162314Z/cmd/admin-prometheus-metrics.go --- old/mc-20240118T070339Z/cmd/admin-prometheus-metrics.go 2024-01-18 08:03:39.000000000 +0100 +++ new/mc-20240128T162314Z/cmd/admin-prometheus-metrics.go 2024-01-28 17:23:14.000000000 +0100 @@ -18,15 +18,16 @@ package cmd import ( + "errors" "io" "net/http" + "os" "time" "github.com/minio/cli" json "github.com/minio/colorjson" + "github.com/minio/madmin-go/v3" "github.com/minio/mc/pkg/probe" - dto "github.com/prometheus/client_model/go" - "github.com/prometheus/prom2json" ) var adminPrometheusMetricsCmd = cli.Command{ @@ -62,10 +63,7 @@ `, } -const ( - metricsRespBodyLimit = 10 << 20 // 10 MiB - metricsEndPointRoot = "/minio/v2/metrics/" -) +const metricsEndPointRoot = "/minio/v2/metrics/" // checkSupportMetricsSyntax - validate arguments passed by a user func checkSupportMetricsSyntax(ctx *cli.Context) { @@ -105,7 +103,11 @@ if e != nil { return e } - req.Header.Add("Authorization", "Bearer "+token) + + if token != "" { + req.Header.Add("Authorization", "Bearer "+token) + } + client := httpClient(60 * time.Second) resp, e := client.Do(req) if e != nil { @@ -115,32 +117,29 @@ defer resp.Body.Close() if resp.StatusCode == http.StatusOK { - printMsg(prometheusMetricsReader{Reader: io.LimitReader(resp.Body, metricsRespBodyLimit)}) + printMsg(prometheusMetricsReader{Reader: resp.Body}) } - return nil + + return errors.New(resp.Status) } // JSON returns jsonified message func (pm prometheusMetricsReader) JSON() string { - mfChan := make(chan *dto.MetricFamily) - go func() { - fatalIf(probe.NewError(prom2json.ParseReader(pm.Reader, mfChan)), "Unable to parse Prometheus metrics.") - }() - result := []*prom2json.Family{} - for mf := range mfChan { - result = append(result, prom2json.NewFamily(mf)) - } - jsonMessageBytes, e := json.MarshalIndent(result, "", " ") + results, e := madmin.ParsePrometheusResults(pm.Reader) + fatalIf(probe.NewError(e), "Unable to parse Prometheus metrics.") + + jsonMessageBytes, e := json.MarshalIndent(results, "", " ") fatalIf(probe.NewError(e), "Unable to marshal into JSON.") return string(jsonMessageBytes) } // String - returns the string representation of the prometheus metrics func (pm prometheusMetricsReader) String() string { - respBytes, e := io.ReadAll(pm.Reader) + _, e := io.Copy(os.Stdout, pm.Reader) + fatalIf(probe.NewError(e), "Unable to read Prometheus metrics.") - return string(respBytes) + return "" } // prometheusMetricsReader mirrors the MetricFamily proto message. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mc-20240118T070339Z/cmd/admin-service-freeze.go new/mc-20240128T162314Z/cmd/admin-service-freeze.go --- old/mc-20240118T070339Z/cmd/admin-service-freeze.go 2024-01-18 08:03:39.000000000 +0100 +++ new/mc-20240128T162314Z/cmd/admin-service-freeze.go 2024-01-28 17:23:14.000000000 +0100 @@ -90,7 +90,7 @@ fatalIf(err, "Unable to initialize admin connection.") // Freeze the specified MinIO server - fatalIf(probe.NewError(client.ServiceFreeze(globalContext)), "Unable to freeze the server.") + fatalIf(probe.NewError(client.ServiceFreezeV2(globalContext)), "Unable to freeze the server.") // Success.. printMsg(serviceFreezeCommand{Status: "success", ServerURL: aliasedURL}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mc-20240118T070339Z/cmd/admin-service-restart.go new/mc-20240128T162314Z/cmd/admin-service-restart.go --- old/mc-20240118T070339Z/cmd/admin-service-restart.go 2024-01-18 08:03:39.000000000 +0100 +++ new/mc-20240128T162314Z/cmd/admin-service-restart.go 2024-01-28 17:23:14.000000000 +0100 @@ -20,9 +20,12 @@ import ( "context" "fmt" + "strings" "time" "github.com/fatih/color" + "github.com/jedib0t/go-pretty/v6/table" + "github.com/jedib0t/go-pretty/v6/text" "github.com/minio/cli" json "github.com/minio/colorjson" "github.com/minio/madmin-go/v3" @@ -30,13 +33,20 @@ "github.com/minio/pkg/v2/console" ) +var serviceRestartFlag = []cli.Flag{ + cli.BoolFlag{ + Name: "dry-run", + Usage: "do not attempt a restart, however verify the peer status", + }, +} + var adminServiceRestartCmd = cli.Command{ Name: "restart", Usage: "restart a MinIO cluster", Action: mainAdminServiceRestart, OnUsageError: onUsageError, Before: setGlobalsFromContext, - Flags: globalFlags, + Flags: append(serviceRestartFlag, globalFlags...), CustomHelpTemplate: `NAME: {{.HelpName}} - {{.Usage}} @@ -54,13 +64,40 @@ // serviceRestartCommand is container for service restart command success and failure messages. type serviceRestartCommand struct { - Status string `json:"status"` - ServerURL string `json:"serverURL"` + Status string `json:"status"` + ServerURL string `json:"serverURL"` + Result madmin.ServiceActionResult `json:"result"` } // String colorized service restart command message. func (s serviceRestartCommand) String() string { - return console.Colorize("ServiceRestart", "Restart command successfully sent to `"+s.ServerURL+"`. Type Ctrl-C to quit or wait to follow the status of the restart process.") + var s1 strings.Builder + s1.WriteString("Restart command successfully sent to `" + s.ServerURL + "`. Type Ctrl-C to quit or wait to follow the status of the restart process.") + + if len(s.Result.Results) > 0 { + s1.WriteString("\n") + var rows []table.Row + for _, peerRes := range s.Result.Results { + errStr := tickCell + if peerRes.Err != "" { + errStr = peerRes.Err + } else if len(peerRes.WaitingDrives) > 0 { + errStr = fmt.Sprintf("%d drives are waiting for I/O and are offline, manual restart of OS is recommended", len(peerRes.WaitingDrives)) + } + rows = append(rows, table.Row{peerRes.Host, errStr}) + } + + t := table.NewWriter() + t.SetOutputMirror(&s1) + t.SetColumnConfigs([]table.ColumnConfig{{Align: text.AlignCenter}}) + + t.AppendHeader(table.Row{"Host", "Status"}) + t.AppendRows(rows) + t.SetStyle(table.StyleLight) + t.Render() + } + + return console.Colorize("ServiceRestart", s1.String()) } // JSON jsonified service restart command message. @@ -123,10 +160,19 @@ fatalIf(err, "Unable to initialize admin connection.") // Restart the specified MinIO server - fatalIf(probe.NewError(client.ServiceRestart(ctxt)), "Unable to restart the server.") + result, e := client.ServiceAction(ctxt, madmin.ServiceActionOpts{ + Action: madmin.ServiceActionRestart, + DryRun: ctx.Bool("dry-run"), + }) + if e != nil { + // Attempt an older API server might be old + //lint:ignore SA1019 Ignore the deprecation warnings + e = client.ServiceRestart(ctxt) + } + fatalIf(probe.NewError(e), "Unable to restart the server.") // Success.. - printMsg(serviceRestartCommand{Status: "success", ServerURL: aliasedURL}) + printMsg(serviceRestartCommand{Status: "success", ServerURL: aliasedURL, Result: result}) // Start pinging the service until it is ready @@ -146,36 +192,35 @@ printProgress() mark = "." - timer := time.NewTimer(time.Second) - defer timer.Stop() - t := time.Now() for { + healthCtx, healthCancel := context.WithTimeout(ctxt, 2*time.Second) + + // Fetch the health status of the specified MinIO server + healthResult, healthErr := anonClient.Healthy(healthCtx, madmin.HealthOpts{}) + healthCancel() + + switch { + case healthErr == nil && healthResult.Healthy: + printMsg(serviceRestartMessage{ + Status: "success", + ServerURL: aliasedURL, + TimeTaken: time.Since(t), + }) + return nil + case healthErr == nil && !healthResult.Healthy: + coloring = color.New(color.FgYellow) + mark = "!" + fallthrough + default: + printProgress() + } + select { case <-ctxt.Done(): return ctxt.Err() - case <-timer.C: - healthCtx, healthCancel := context.WithTimeout(ctxt, 3*time.Second) - // Fetch the health status of the specified MinIO server - healthResult, healthErr := anonClient.Healthy(healthCtx, madmin.HealthOpts{}) - healthCancel() - switch { - case healthErr == nil && healthResult.Healthy: - printMsg(serviceRestartMessage{ - Status: "success", - ServerURL: aliasedURL, - TimeTaken: time.Since(t), - }) - return nil - case healthErr == nil && !healthResult.Healthy: - coloring = color.New(color.FgYellow) - mark = "!" - fallthrough - default: - printProgress() - } - - timer.Reset(time.Second) + default: + time.Sleep(500 * time.Millisecond) } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mc-20240118T070339Z/cmd/admin-service-stop.go new/mc-20240128T162314Z/cmd/admin-service-stop.go --- old/mc-20240118T070339Z/cmd/admin-service-stop.go 2024-01-18 08:03:39.000000000 +0100 +++ new/mc-20240128T162314Z/cmd/admin-service-stop.go 2024-01-28 17:23:14.000000000 +0100 @@ -32,6 +32,7 @@ OnUsageError: onUsageError, Before: setGlobalsFromContext, Flags: globalFlags, + Hidden: true, // this command is hidden on purpose, please do not enable it. CustomHelpTemplate: `NAME: {{.HelpName}} - {{.Usage}} @@ -88,7 +89,7 @@ fatalIf(err, "Unable to initialize admin connection.") // Stop the specified MinIO server - fatalIf(probe.NewError(client.ServiceStop(globalContext)), "Unable to stop the server.") + fatalIf(probe.NewError(client.ServiceStopV2(globalContext)), "Unable to stop the server.") // Success.. printMsg(serviceStopMessage{Status: "success", ServerURL: aliasedURL}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mc-20240118T070339Z/cmd/admin-service-unfreeze.go new/mc-20240128T162314Z/cmd/admin-service-unfreeze.go --- old/mc-20240118T070339Z/cmd/admin-service-unfreeze.go 2024-01-18 08:03:39.000000000 +0100 +++ new/mc-20240128T162314Z/cmd/admin-service-unfreeze.go 2024-01-28 17:23:14.000000000 +0100 @@ -89,6 +89,7 @@ fatalIf(err, "Unable to initialize admin connection.") // Unfreeze the specified MinIO server + //lint:ignore SA1019 Ignore the deprecation warnings fatalIf(probe.NewError(client.ServiceUnfreeze(globalContext)), "Unable to unfreeze the server.") // Success.. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mc-20240118T070339Z/cmd/admin-update.go new/mc-20240128T162314Z/cmd/admin-update.go --- old/mc-20240118T070339Z/cmd/admin-update.go 2024-01-18 08:03:39.000000000 +0100 +++ new/mc-20240128T162314Z/cmd/admin-update.go 2024-01-28 17:23:14.000000000 +0100 @@ -24,8 +24,11 @@ "strings" "github.com/fatih/color" + "github.com/jedib0t/go-pretty/v6/table" + "github.com/jedib0t/go-pretty/v6/text" "github.com/minio/cli" json "github.com/minio/colorjson" + "github.com/minio/madmin-go/v3" "github.com/minio/mc/pkg/probe" "github.com/minio/pkg/v2/console" ) @@ -64,22 +67,37 @@ // serverUpdateMessage is container for ServerUpdate success and failure messages. type serverUpdateMessage struct { - Status string `json:"status"` - ServerURL string `json:"serverURL"` - CurrentVersion string `json:"currentVersion"` - UpdatedVersion string `json:"updatedVersion"` + Status string `json:"status"` + ServerURL string `json:"serverURL"` + ServerUpdateStatus madmin.ServerUpdateStatusV2 `json:"serverUpdateStatus"` } // String colorized serverUpdate message. func (s serverUpdateMessage) String() string { - if s.CurrentVersion != s.UpdatedVersion { - return console.Colorize("ServerUpdate", - fmt.Sprintf("Server `%s` updated successfully from %s to %s", - s.ServerURL, s.CurrentVersion, s.UpdatedVersion)) + var rows []table.Row + for _, peerRes := range s.ServerUpdateStatus.Results { + errStr := fmt.Sprintf("upgraded server from %s to %s: %s", peerRes.CurrentVersion, peerRes.UpdatedVersion, tickCell) + if peerRes.Err != "" { + errStr = peerRes.Err + } else if len(peerRes.WaitingDrives) > 0 { + errStr = fmt.Sprintf("%d drives are hung, process was upgraded. However OS reboot is recommended.", len(peerRes.WaitingDrives)) + } + rows = append(rows, table.Row{peerRes.Host, errStr}) } - return console.Colorize("ServerUpdate", - fmt.Sprintf("Server `%s` already running the most recent version %s of MinIO", - s.ServerURL, s.CurrentVersion)) + + t := table.NewWriter() + var s1 strings.Builder + s1.WriteString("Server update request sent successfully `" + s.ServerURL + "`\n") + + t.SetOutputMirror(&s1) + t.SetColumnConfigs([]table.ColumnConfig{{Align: text.AlignCenter}}) + + t.AppendHeader(table.Row{"Host", "Status"}) + t.AppendRows(rows) + t.SetStyle(table.StyleLight) + t.Render() + + return console.Colorize("ServiceRestart", s1.String()) } // JSON jsonified server update message. @@ -128,15 +146,17 @@ // Update the specified MinIO server, optionally also // with the provided update URL. - us, e := client.ServerUpdate(globalContext, updateURL) + us, e := client.ServerUpdateV2(globalContext, madmin.ServerUpdateOpts{ + DryRun: ctx.Bool("dry-run"), + UpdateURL: updateURL, + }) fatalIf(probe.NewError(e), "Unable to update the server.") // Success.. printMsg(serverUpdateMessage{ - Status: "success", - ServerURL: aliasedURL, - CurrentVersion: us.CurrentVersion, - UpdatedVersion: us.UpdatedVersion, + Status: "success", + ServerURL: aliasedURL, + ServerUpdateStatus: us, }) return nil } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mc-20240118T070339Z/cmd/globals.go new/mc-20240128T162314Z/cmd/globals.go --- old/mc-20240118T070339Z/cmd/globals.go 2024-01-18 08:03:39.000000000 +0100 +++ new/mc-20240128T162314Z/cmd/globals.go 2024-01-28 17:23:14.000000000 +0100 @@ -90,10 +90,11 @@ globalPagerDisabled = false globalHelpPager *termPager globalPagerEnabledTerms = map[string]bool{ - "xterm": true, - "xterm-256color": true, - "tmux": true, - "tmux-256color": true, + "screen-256color": true, + "xterm": true, + "xterm-256color": true, + "tmux": true, + "tmux-256color": true, } // CA root certificates, a nil value means system certs pool will be used diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mc-20240118T070339Z/cmd/humanized-duration.go new/mc-20240128T162314Z/cmd/humanized-duration.go --- old/mc-20240118T070339Z/cmd/humanized-duration.go 2024-01-18 08:03:39.000000000 +0100 +++ new/mc-20240128T162314Z/cmd/humanized-duration.go 2024-01-28 17:23:14.000000000 +0100 @@ -25,16 +25,19 @@ // humanizedDuration container to capture humanized time. type humanizedDuration struct { - Days int64 `json:"days,omitempty"` - Hours int64 `json:"hours,omitempty"` - Minutes int64 `json:"minutes,omitempty"` - Seconds int64 `json:"seconds,omitempty"` + Days int64 `json:"days,omitempty"` + Hours int64 `json:"hours,omitempty"` + Minutes int64 `json:"minutes,omitempty"` + Seconds int64 `json:"seconds,omitempty"` + MilliSeconds int64 `json:"milliSeconds,omitempty"` } // StringShort() humanizes humanizedDuration to human readable short format. // This does not print at seconds. func (r humanizedDuration) StringShort() string { switch { + case r.Days == 0 && r.Hours == 0 && r.Minutes == 0 && r.Seconds == 0: + return fmt.Sprintf("%d milliseconds", r.MilliSeconds) case r.Days == 0 && r.Hours == 0 && r.Minutes == 0: return fmt.Sprintf("%d seconds", r.Seconds) case r.Days == 0 && r.Hours == 0: @@ -50,6 +53,10 @@ // String() humanizes humanizedDuration to human readable, func (r humanizedDuration) String() string { + if r.Days == 0 && r.Hours == 0 && r.Minutes == 0 && r.Seconds == 0 { + return fmt.Sprintf("%d milliseconds", r.MilliSeconds) + } + if r.Days == 0 && r.Hours == 0 && r.Minutes == 0 { return fmt.Sprintf("%d seconds", r.Seconds) } @@ -65,6 +72,10 @@ // timeDurationToHumanizedDuration convert golang time.Duration to a custom more readable humanizedDuration. func timeDurationToHumanizedDuration(duration time.Duration) humanizedDuration { r := humanizedDuration{} + if duration.Milliseconds() < 1000 { + r.MilliSeconds = int64(duration.Milliseconds()) + return r + } if duration.Seconds() < 60.0 { r.Seconds = int64(duration.Seconds()) return r diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mc-20240118T070339Z/cmd/mirror-main.go new/mc-20240128T162314Z/cmd/mirror-main.go --- old/mc-20240118T070339Z/cmd/mirror-main.go 2024-01-18 08:03:39.000000000 +0100 +++ new/mc-20240128T162314Z/cmd/mirror-main.go 2024-01-28 17:23:14.000000000 +0100 @@ -133,6 +133,10 @@ Name: "summary", Usage: "print a summary of the mirror session", }, + cli.BoolFlag{ + Name: "skip-errors", + Usage: "skip any errors when mirroring", + }, } ) @@ -545,8 +549,12 @@ ignoreErr = true } if !ignoreErr { - errorIf(sURLs.Error.Trace(sURLs.SourceContent.URL.String()), - fmt.Sprintf("Failed to copy `%s`.", sURLs.SourceContent.URL.String())) + if !mj.opts.skipErrors { + errorIf(sURLs.Error.Trace(sURLs.SourceContent.URL.String()), + fmt.Sprintf("Failed to copy `%s`.", sURLs.SourceContent.URL.String())) + } else { + console.Infof("[Warn] Failed to copy `%s`. %s", sURLs.SourceContent.URL.String(), sURLs.Error.Trace(sURLs.SourceContent.URL.String())) + } } } case sURLs.TargetContent != nil: @@ -569,7 +577,7 @@ mirrorFailedOps.Inc() errDuringMirror = true // Quit mirroring if --watch and --active-active are not passed - if !mj.opts.activeActive && !mj.opts.isWatch { + if !mj.opts.skipErrors && !mj.opts.activeActive && !mj.opts.isWatch { cancel() cancelInProgress = true } @@ -955,6 +963,7 @@ isRetriable: cli.Bool("retry"), md5: cli.Bool("md5"), disableMultipart: cli.Bool("disable-multipart"), + skipErrors: cli.Bool("skip-errors"), excludeOptions: cli.StringSlice("exclude"), excludeStorageClasses: cli.StringSlice("exclude-storageclass"), olderThan: cli.String("older-than"), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mc-20240118T070339Z/cmd/mirror-url.go new/mc-20240128T162314Z/cmd/mirror-url.go --- old/mc-20240118T070339Z/cmd/mirror-url.go 2024-01-18 08:03:39.000000000 +0100 +++ new/mc-20240128T162314Z/cmd/mirror-url.go 2024-01-28 17:23:14.000000000 +0100 @@ -229,6 +229,7 @@ isWatch, isRemove, isMetadata bool isRetriable bool isSummary bool + skipErrors bool excludeOptions, excludeStorageClasses []string encKeyDB map[string][]prefixSSEPair md5, disableMultipart bool diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mc-20240118T070339Z/cmd/pipe-main.go new/mc-20240128T162314Z/cmd/pipe-main.go --- old/mc-20240118T070339Z/cmd/pipe-main.go 2024-01-18 08:03:39.000000000 +0100 +++ new/mc-20240128T162314Z/cmd/pipe-main.go 2024-01-28 17:23:14.000000000 +0100 @@ -109,7 +109,7 @@ `, } -func pipe(ctx *cli.Context, targetURL string, encKeyDB map[string][]prefixSSEPair, meta map[string]string) *probe.Error { +func pipe(ctx *cli.Context, targetURL string, encKeyDB map[string][]prefixSSEPair, meta map[string]string, quiet bool) *probe.Error { // If possible increase the pipe buffer size if e := increasePipeBufferSize(os.Stdin, ctx.Int("pipe-max-size")); e != nil { fatalIf(probe.NewError(e), "Unable to increase custom pipe-max-size") @@ -151,9 +151,15 @@ concurrentStream: ctx.IsSet("concurrent"), } - pg := newProgressBar(0) + var reader io.Reader + if !quiet { + pg := newProgressBar(0) + reader = io.TeeReader(os.Stdin, pg) + } else { + reader = os.Stdin + } - _, err := putTargetStreamWithURL(targetURL, io.TeeReader(os.Stdin, pg), -1, opts) + _, err := putTargetStreamWithURL(targetURL, reader, -1, opts) // TODO: See if this check is necessary. switch e := err.ToGoError().(type) { case *os.PathError: @@ -183,6 +189,9 @@ // validate pipe input arguments. checkPipeSyntax(ctx) + // globalQuiet is true for no window size to get. We just need --quiet here. + quiet := ctx.IsSet("quiet") + meta := map[string]string{} if attr := ctx.String("attr"); attr != "" { meta, err = getMetaDataEntry(attr) @@ -192,12 +201,12 @@ meta["X-Amz-Tagging"] = tags } if len(ctx.Args()) == 0 { - err = pipe(ctx, "", nil, meta) + err = pipe(ctx, "", nil, meta, quiet) fatalIf(err.Trace("stdout"), "Unable to write to one or more targets.") } else { // extract URLs. URLs := ctx.Args() - err = pipe(ctx, URLs[0], encKeyDB, meta) + err = pipe(ctx, URLs[0], encKeyDB, meta, quiet) fatalIf(err.Trace(URLs[0]), "Unable to write to one or more targets.") } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mc-20240118T070339Z/go.mod new/mc-20240128T162314Z/go.mod --- old/mc-20240118T070339Z/go.mod 2024-01-18 08:03:39.000000000 +0100 +++ new/mc-20240128T162314Z/go.mod 2024-01-28 17:23:14.000000000 +0100 @@ -46,7 +46,7 @@ github.com/gdamore/tcell/v2 v2.7.0 github.com/golang-jwt/jwt/v4 v4.5.0 github.com/juju/ratelimit v1.0.2 - github.com/minio/madmin-go/v3 v3.0.37 + github.com/minio/madmin-go/v3 v3.0.41 github.com/minio/pkg/v2 v2.0.7 github.com/muesli/reflow v0.3.0 github.com/navidys/tvxwidgets v0.4.1 @@ -92,7 +92,7 @@ github.com/lestrrat-go/blackmagic v1.0.2 // indirect github.com/lestrrat-go/httpcc v1.0.1 // indirect github.com/lestrrat-go/iter v1.0.2 // indirect - github.com/lestrrat-go/jwx v1.2.27 // indirect + github.com/lestrrat-go/jwx v1.2.28 // indirect github.com/lestrrat-go/option v1.0.1 // indirect github.com/lucasb-eyer/go-colorful v1.2.0 // indirect github.com/lufia/plan9stats v0.0.0-20231016141302-07b5767bb0ed // indirect diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mc-20240118T070339Z/go.sum new/mc-20240128T162314Z/go.sum --- old/mc-20240118T070339Z/go.sum 2024-01-18 08:03:39.000000000 +0100 +++ new/mc-20240128T162314Z/go.sum 2024-01-28 17:23:14.000000000 +0100 @@ -104,8 +104,8 @@ github.com/lestrrat-go/httpcc v1.0.1/go.mod h1:qiltp3Mt56+55GPVCbTdM9MlqhvzyuL6W/NMDA8vA5E= github.com/lestrrat-go/iter v1.0.2 h1:gMXo1q4c2pHmC3dn8LzRhJfP1ceCbgSiT9lUydIzltI= github.com/lestrrat-go/iter v1.0.2/go.mod h1:Momfcq3AnRlRjI5b5O8/G5/BvpzrhoFTZcn06fEOPt4= -github.com/lestrrat-go/jwx v1.2.27 h1:cvnTnda/YzdyFuWdEAMkI6BsLtItSrASEVCI3C/IUEQ= -github.com/lestrrat-go/jwx v1.2.27/go.mod h1:Stob9LjSqR3lOmNdxF0/TvZo60V3hUGv8Fr7Bwzla3k= +github.com/lestrrat-go/jwx v1.2.28 h1:uadI6o0WpOVrBSf498tRXZIwPpEtLnR9CvqPFXeI5sA= +github.com/lestrrat-go/jwx v1.2.28/go.mod h1:nF+91HEMh/MYFVwKPl5HHsBGMPscqbQb+8IDQdIazP8= github.com/lestrrat-go/option v1.0.0/go.mod h1:5ZHFbivi4xwXxhxY9XHDe2FHo6/Z7WWmtT7T5nBBp3I= github.com/lestrrat-go/option v1.0.1 h1:oAzP2fvZGQKWkvHa1/SAcFolBEca1oN+mQ7eooNBEYU= github.com/lestrrat-go/option v1.0.1/go.mod h1:5ZHFbivi4xwXxhxY9XHDe2FHo6/Z7WWmtT7T5nBBp3I= @@ -142,8 +142,8 @@ github.com/minio/colorjson v1.0.6/go.mod h1:LUXwS5ZGNb6Eh9f+t+3uJiowD3XsIWtsvTriUBeqgYs= github.com/minio/filepath v1.0.0 h1:fvkJu1+6X+ECRA6G3+JJETj4QeAYO9sV43I79H8ubDY= github.com/minio/filepath v1.0.0/go.mod h1:/nRZA2ldl5z6jT9/KQuvZcQlxZIMQoFFQPvEXx9T/Bw= -github.com/minio/madmin-go/v3 v3.0.37 h1:u8gl6xg6Vt+LLwes/8rJhAq2wtpIRWRULptNVQtH9JE= -github.com/minio/madmin-go/v3 v3.0.37/go.mod h1:4QN2NftLSV7MdlT50dkrenOMmNVHluxTvlqJou3hte8= +github.com/minio/madmin-go/v3 v3.0.41 h1:9pU7xW51cn8Ixy8ftaRfp4SbHtnhEPlwU6mMA9KwwB8= +github.com/minio/madmin-go/v3 v3.0.41/go.mod h1:4QN2NftLSV7MdlT50dkrenOMmNVHluxTvlqJou3hte8= github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34= github.com/minio/md5-simd v1.1.2/go.mod h1:MzdKDxYpY2BT9XQFocsiZf/NKVtR7nkE4RoEpN+20RM= github.com/minio/minio-go/v7 v7.0.66 h1:bnTOXOHjOqv/gcMuiVbN9o2ngRItvqE774dG9nq0Dzw= @@ -278,7 +278,6 @@ golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20211209193657-4570a0811e8b/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.16.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k= golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= ++++++ mc.obsinfo ++++++ --- /var/tmp/diff_new_pack.eDoctX/_old 2024-01-30 18:25:25.421960733 +0100 +++ /var/tmp/diff_new_pack.eDoctX/_new 2024-01-30 18:25:25.421960733 +0100 @@ -1,5 +1,5 @@ name: mc -version: 20240118T070339Z -mtime: 1705561419 -commit: bb25267eaadc0e025243b443a94ff33bde6302ad +version: 20240128T162314Z +mtime: 1706458994 +commit: ba9fc6a3075df6d8a413cc7e423645706aaefae1 ++++++ vendor.tar.gz ++++++ /work/SRC/openSUSE:Factory/minio-client/vendor.tar.gz /work/SRC/openSUSE:Factory/.minio-client.new.1815/vendor.tar.gz differ: char 5, line 1

1 0

commit openssl for openSUSE:Factory
by Source-Sync 30 Jan '24

30 Jan '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package openssl for openSUSE:Factory checked in at 2024-01-30 18:25:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openssl (Old) and /work/SRC/openSUSE:Factory/.openssl.new.1815 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openssl" Tue Jan 30 18:25:03 2024 rev:170 rq:1142585 version:3.1.4 Changes: -------- --- /work/SRC/openSUSE:Factory/openssl/openssl.changes 2023-10-27 22:26:59.648875891 +0200 +++ /work/SRC/openSUSE:Factory/.openssl.new.1815/openssl.changes 2024-01-30 18:25:16.897653207 +0100 @@ -1,0 +2,5 @@ +Mon Jan 29 15:17:22 UTC 2024 - Pedro Monreal <pmonreal(a)suse.com> + +- New libopenssl-fips-provider package. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openssl.spec ++++++ --- /var/tmp/diff_new_pack.nJNntI/_old 2024-01-30 18:25:17.541676441 +0100 +++ /var/tmp/diff_new_pack.nJNntI/_new 2024-01-30 18:25:17.541676441 +0100 @@ -1,7 +1,7 @@ # # spec file for package openssl # -# 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 @@ -62,6 +62,16 @@ This package contains all necessary include files and libraries needed to develop applications that require these. +%package -n libopenssl-fips-provider +Summary: Include Files and Libraries mandatory for Development +Group: Development/Libraries/C and C++ +Requires: %{name} >= 3.0.0 +Requires: libopenssl%{_sonum} >= 3.0.0 +Requires: pkgconfig + +%description -n libopenssl-fips-provider +This package contains OpenSSL FIPS provider. + %prep cp %{SOURCE0} . @@ -77,3 +87,6 @@ %files -n libopenssl-devel %doc README.SUSE +%files -n libopenssl-fips-provider +%doc README.SUSE +

1 0

commit apache-ivy for openSUSE:Factory
by Source-Sync 30 Jan '24

30 Jan '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package apache-ivy for openSUSE:Factory checked in at 2024-01-30 18:24:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/apache-ivy (Old) and /work/SRC/openSUSE:Factory/.apache-ivy.new.1815 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "apache-ivy" Tue Jan 30 18:24:55 2024 rev:24 rq:1142746 version:2.5.2 Changes: -------- --- /work/SRC/openSUSE:Factory/apache-ivy/apache-ivy.changes 2023-09-21 22:13:23.075822306 +0200 +++ /work/SRC/openSUSE:Factory/.apache-ivy.new.1815/apache-ivy.changes 2024-01-30 18:25:08.073334858 +0100 @@ -1,0 +2,8 @@ +Mon Oct 30 15:24:39 UTC 2023 - Fridrich Strba <fstrba(a)suse.com> + +- Added patch: + * apache-ivy-pack200.patch + + conditionally apply to allow building against standalone + pack200 implementation + +------------------------------------------------------------------- New: ---- apache-ivy-pack200.patch BETA DEBUG BEGIN: New:- Added patch: * apache-ivy-pack200.patch + conditionally apply to allow building against standalone BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apache-ivy.spec ++++++ --- /var/tmp/diff_new_pack.8r7W2K/_old 2024-01-30 18:25:08.689357082 +0100 +++ /var/tmp/diff_new_pack.8r7W2K/_new 2024-01-30 18:25:08.689357082 +0100 @@ -20,6 +20,7 @@ %bcond_without oro %bcond_without sftp %bcond_without vfs +%bcond_with pack200 Name: apache-ivy Version: 2.5.2 Release: 0 @@ -32,6 +33,7 @@ Source2: https://repo1.maven.org/maven2/org/apache/ivy/ivy/%{version}/ivy-%{version}… Patch0: apache-ivy-global-settings.patch Patch1: apache-ivy-publication-date.patch +Patch2: apache-ivy-pack200.patch BuildRequires: ant BuildRequires: bouncycastle-pg BuildRequires: fdupes @@ -39,10 +41,14 @@ BuildRequires: javapackages-local >= 6 BuildRequires: jsch BuildRequires: oro -BuildConflicts: java-devel >= 14 Provides: ivy = %{version}-%{release} Obsoletes: ivy < %{version}-%{release} BuildArch: noarch +%if %{with pack200} +BuildRequires: pack200 +%else +BuildConflicts: java-devel >= 14 +%endif %if %{with vfs} BuildRequires: apache-commons-vfs2 %endif @@ -117,21 +123,26 @@ rm src/java/org/apache/ivy/plugins/resolver/SshResolver.java %endif +%if %{with pack200} +%pom_add_dep io.pack200:pack200:14:provided +%patch2 -p1 +%endif + %build # Craft class path mkdir -p lib build-jar-repository -s lib ant ant/ant-nodeps jsch bcprov bcpg export CLASSPATH=$(build-classpath ant ant/ant-nodeps jsch httpcomponents bcprov bcpg) %if %{with httpclient} -build-jar-repository lib httpcomponents +build-jar-repository -s lib httpcomponents export CLASSPATH=${CLASSPATH}:$(build-classpath httpcomponents) %endif %if %{with oro} -build-jar-repository lib oro +build-jar-repository -s lib oro export CLASSPATH=${CLASSPATH}:$(build-classpath oro) %endif %if %{with vfs} -build-jar-repository lib commons-vfs2 +build-jar-repository -s lib commons-vfs2 export CLASSPATH=${CLASSPATH}:$(build-classpath commons-vfs2) %endif %if %{with sftp} @@ -140,6 +151,10 @@ jsch.agentproxy.jsch export CLASSPATH=${CLASSPATH}:$(build-classpath jsch.agentproxy.core jsch.agentproxy.connector-factory jsch.agentproxy.jsch) %endif +%if %{with pack200} +build-jar-repository -s lib pack200 +export CLASSPATH=${CLASSPATH}:$(build-classpath pack200) +%endif # Build %{ant} -v -Dtarget.ivy.version=%{version} -Dbundle.version=%{version} /localivy /offline jar javadoc ++++++ apache-ivy-pack200.patch ++++++ --- apache-ivy-2.5.2/build.xml 2023-10-30 16:09:23.892302634 +0100 +++ apache-ivy-2.5.2/build.xml 2023-10-30 16:12:01.143389848 +0100 @@ -185,6 +185,7 @@ <javac srcdir="${src.dir}" destdir="${core.classes.build.dir}" sourcepath="" + classpathref="lib.classpath" source="${ivy.minimum.javaversion}" target="${ivy.minimum.javaversion}" debug="${debug.mode}" --- apache-ivy-2.5.2/src/java/org/apache/ivy/util/FileUtil.java 2023-10-30 16:09:23.928969555 +0100 +++ apache-ivy-2.5.2/src/java/org/apache/ivy/util/FileUtil.java 2023-10-30 16:13:35.547375897 +0100 @@ -46,7 +46,7 @@ import java.util.zip.GZIPInputStream; import java.util.zip.ZipInputStream; -import static java.util.jar.Pack200.newUnpacker; +import static io.pack200.Pack200.newUnpacker; /** * Utility class used to deal with file related operations, like copy, full reading, symlink, ...

1 0

commit xdg-utils for openSUSE:Factory
by Source-Sync 30 Jan '24

30 Jan '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package xdg-utils for openSUSE:Factory checked in at 2024-01-30 18:24:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xdg-utils (Old) and /work/SRC/openSUSE:Factory/.xdg-utils.new.1815 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xdg-utils" Tue Jan 30 18:24:52 2024 rev:61 rq:1142707 version:1.2.0+20240130 Changes: -------- --- /work/SRC/openSUSE:Factory/xdg-utils/xdg-utils.changes 2023-10-01 21:22:05.684186159 +0200 +++ /work/SRC/openSUSE:Factory/.xdg-utils.new.1815/xdg-utils.changes 2024-01-30 18:25:02.281125896 +0100 @@ -1,0 +2,33 @@ +Tue Jan 30 03:49:59 UTC 2024 - Simon Lees <sflees(a)suse.de> + +- Update to Version 1.2.0 (Lining up with the upstream release) + * all: Add xdg-realpath to better handle Canonicalizing filenames (#66) + * xdg-open: Use url.dll as url opener on wsl (#242) + * tests: Fix quoting issues in t-xdg-open.sh + * xdg-open: Added a reporting issues section to xdg-open in the hopes + that more issues will be attributed correctly + * xdg-mime: Added a secutity note on xdg-mime default to warn against confusing + openers and runners + * xdg-open: Added paragraph explaining the wiered return behaviour of xdg-open + * xdg-email: shellcheck + * xdg-mime: shellcheck + * xdg-settings: Add support for deeping-desktop browser setting in + xdg-settings. + * all: Fix config.status warning about ignored --datarootdir setting + * all: Shellchecked xdg-utils-common.in + * xdg-open: shellcheck + * xdg-mime: Create a generic implementation for KDE + * all: Move to markdown for README's + * xdg-mime: Improve Documentation around query file/default + * xdg-open: Document not handling '-' at the start of filenames + * xdg-open: Deduplicate URL recognition + * xdg-open: remove unused open_generic_xdg_file_mime + * xdg-open: use LC_ALL=C with URLs + * xdg-open: Fix URI/URL handling + * xdg-email: Remove default BROWSER logic, no longer needed + * xdg-mime: Improve synopsis + * xdg-settings: read KDE browser settings the right way around + * xdg-open: Improve WSL support + * xdg-mime: actually handle lists in mimeapps.list correctly + +------------------------------------------------------------------- Old: ---- xdg-utils-1.2.0~beta1+20230929.obscpio xdg-utils-1.2.0~beta1+20230929.tar.xz New: ---- xdg-utils-1.2.0+20240130.obscpio xdg-utils-1.2.0+20240130.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xdg-utils.spec ++++++ --- /var/tmp/diff_new_pack.knJRTY/_old 2024-01-30 18:25:03.541171354 +0100 +++ /var/tmp/diff_new_pack.knJRTY/_new 2024-01-30 18:25:03.541171354 +0100 @@ -1,7 +1,7 @@ # # spec file for package xdg-utils # -# 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 @@ -17,7 +17,7 @@ Name: xdg-utils -Version: 1.2.0~beta1+20230929 +Version: 1.2.0+20240130 Release: 0 Summary: Utilities to uniformly interface desktop environments License: MIT @@ -70,7 +70,7 @@ %files %defattr(-,root,root) -%doc ChangeLog README TODO +%doc ChangeLog README.md TODO %license LICENSE %{_bindir}/call-browser %{_bindir}/desktop-launch ++++++ _service ++++++ --- /var/tmp/diff_new_pack.knJRTY/_old 2024-01-30 18:25:03.569172364 +0100 +++ /var/tmp/diff_new_pack.knJRTY/_new 2024-01-30 18:25:03.573172509 +0100 @@ -4,7 +4,7 @@ <param name="scm">git</param> <param name="changesgenerate">enable</param> <param name="filename">xdg-utils</param> - <param name="versionformat">1.2.0~beta1+%cd</param> + <param name="versionformat">1.2.0+%cd</param> <param name="versionrewrite-pattern">v(.*)</param> <param name="versionrewrite-replacement">\1</param> </service> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.knJRTY/_old 2024-01-30 18:25:03.593173230 +0100 +++ /var/tmp/diff_new_pack.knJRTY/_new 2024-01-30 18:25:03.597173374 +0100 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://gitlab.freedesktop.org/xdg/xdg-utils.git</param> - <param name="changesrevision">f8bc7454112899413a60996b7b5d9aebfa4e6864</param></service></servicedata> + <param name="changesrevision">b5188f34647c6ff76402e3d907879264e9bc3409</param></service></servicedata> (No newline at EOF) ++++++ xdg-utils-1.2.0~beta1+20230929.obscpio -> xdg-utils-1.2.0+20240130.obscpio ++++++ ++++ 2603 lines of diff (skipped) ++++++ xdg-utils-1.2.0~beta1+20230929.tar.xz -> xdg-utils-1.2.0+20240130.tar.xz ++++++ ++++ 2603 lines of diff (skipped) ++++++ xdg-utils.obsinfo ++++++ --- /var/tmp/diff_new_pack.knJRTY/_old 2024-01-30 18:25:03.897184198 +0100 +++ /var/tmp/diff_new_pack.knJRTY/_new 2024-01-30 18:25:03.901184342 +0100 @@ -1,5 +1,5 @@ name: xdg-utils -version: 1.2.0~beta1+20230929 -mtime: 1695970624 -commit: f8bc7454112899413a60996b7b5d9aebfa4e6864 +version: 1.2.0+20240130 +mtime: 1706584738 +commit: b5188f34647c6ff76402e3d907879264e9bc3409

1 0

commit virtualbox for openSUSE:Factory
by Source-Sync 30 Jan '24

30 Jan '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package virtualbox for openSUSE:Factory checked in at 2024-01-30 18:24:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/virtualbox (Old) and /work/SRC/openSUSE:Factory/.virtualbox.new.1815 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "virtualbox" Tue Jan 30 18:24:47 2024 rev:268 rq:1142682 version:7.0.14 Changes: -------- --- /work/SRC/openSUSE:Factory/virtualbox/virtualbox.changes 2024-01-29 22:26:46.056555443 +0100 +++ /work/SRC/openSUSE:Factory/.virtualbox.new.1815/virtualbox.changes 2024-01-30 18:24:55.432878836 +0100 @@ -12,0 +13,23 @@ +Wed Jan 16 15:40:02 UTC 2024 - Larry Rainey <llrainey15(a)gmail.com> + +- Version bump to VirtualBox 7.0.14 (released January 16, 2024 by Oracle) + +This is a maintenance release. The following items were fixed and/or added: + + Audio: Added more fixes for switching host audio devices on Windows hosts using the WAS backend + 3D: Added general improvements + OCI: Fixed wrong guest RAM unit usage in VirtualSystemDescription, memory is provided in bytes, "Byte" is the base unit + Main: OVF Import/Export: Added support for importing and exporting VMs containing NVMe storage controllers (bug #19320) + Main: OVF Import/Export: Added support for exporting a VM which contains a medium inserted into a virtual CD/DVD drive which is attached to a Virtio-SCSI controller + Devices: Fixed a problem where Windows guests "forget" in-progress touch events when the user holds down a finger without moving it for a period of time. + macOS Host USB: Added support for newer storage devices + macOS Host: Fixed memory Leak in the VBoxIntNetSwitch process when VM was configured to use 'Internal Networking' (bug #21752) + Linux Host and Guest: Added initial support for RHEL 9.4 kernel + Linux Guest Additions: Fixed kernel panic on RHEL 8.9 kernel caused by vboxvideo (bugs #10381 and #21911) + Solaris Guest Additions: Added support for the Additions to be installed into an alternate root path ('pkgadd -R') + Solaris Guest Additions: Removed requirement to reboot VM after uninstalling GAs + RDP: Fix possible crash when connecting with the Apple Silicon variant of the Microsoft Remote Desktop application (bug #21820). + BIOS: Fixed handle number used for DMI OEM table (bug #19781) + +======= +------------------------------------------------------------------- @@ -16,0 +40 @@ +>>>>>>> ./virtualbox.changes.new Old: ---- VirtualBox-7.0.12-patched.tar.bz2 New: ---- VirtualBox-7.0.14-patched.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ virtualbox.spec ++++++ --- /var/tmp/diff_new_pack.tuqHJe/_old 2024-01-30 18:25:00.129048257 +0100 +++ /var/tmp/diff_new_pack.tuqHJe/_new 2024-01-30 18:25:00.129048257 +0100 @@ -49,7 +49,7 @@ %endif # ********* If the VB version exceeds 6.1.x, notify the libvirt maintainer!! Name: virtualbox%{?dash}%{?name_suffix} -Version: 7.0.12 +Version: 7.0.14 Release: 0 Summary: %{package_summary} License: GPL-2.0-or-later ++++++ UserManual.pdf ++++++ (binary differes) ++++++ VirtualBox-5.2.10-xclient.patch ++++++ --- /var/tmp/diff_new_pack.tuqHJe/_old 2024-01-30 18:25:00.181050133 +0100 +++ /var/tmp/diff_new_pack.tuqHJe/_new 2024-01-30 18:25:00.185050277 +0100 @@ -1,7 +1,7 @@ -Index: VirtualBox-7.0.12/src/VBox/Additions/x11/Installer/98vboxadd-xclient +Index: VirtualBox-7.0.14/src/VBox/Additions/x11/Installer/98vboxadd-xclient =================================================================== ---- VirtualBox-7.0.12.orig/src/VBox/Additions/x11/Installer/98vboxadd-xclient -+++ VirtualBox-7.0.12/src/VBox/Additions/x11/Installer/98vboxadd-xclient +--- VirtualBox-7.0.14.orig/src/VBox/Additions/x11/Installer/98vboxadd-xclient ++++ VirtualBox-7.0.14/src/VBox/Additions/x11/Installer/98vboxadd-xclient @@ -31,15 +31,9 @@ for i in $HOME/.vboxclient-*.pid; do test -w $i || rm -f $i done ++++++ VirtualBox-7.0.12-patched.tar.bz2 -> VirtualBox-7.0.14-patched.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/virtualbox/VirtualBox-7.0.12-patched.tar.bz2 /work/SRC/openSUSE:Factory/.virtualbox.new.1815/VirtualBox-7.0.14-patched.tar.bz2 differ: char 11, line 1 ++++++ fix-missing-includes-with-qt-5.15.patch ++++++ --- /var/tmp/diff_new_pack.tuqHJe/_old 2024-01-30 18:25:00.257052875 +0100 +++ /var/tmp/diff_new_pack.tuqHJe/_new 2024-01-30 18:25:00.261053019 +0100 @@ -1,7 +1,7 @@ -Index: VirtualBox-7.0.12/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp +Index: VirtualBox-7.0.14/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp =================================================================== ---- VirtualBox-7.0.12.orig/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp -+++ VirtualBox-7.0.12/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp +--- VirtualBox-7.0.14.orig/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp ++++ VirtualBox-7.0.14/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp @@ -28,6 +28,7 @@ /* Qt includes: */ #include <QApplication> @@ -10,10 +10,10 @@ #include <QPaintEvent> #include <QStyle> #include <QVBoxLayout> -Index: VirtualBox-7.0.12/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h +Index: VirtualBox-7.0.14/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h =================================================================== ---- VirtualBox-7.0.12.orig/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h -+++ VirtualBox-7.0.12/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h +--- VirtualBox-7.0.14.orig/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h ++++ VirtualBox-7.0.14/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h @@ -47,7 +47,6 @@ class QIcon; class QLabel; class QMouseEvent; ++++++ fix_7.0.6_locking_problems.patch ++++++ --- /var/tmp/diff_new_pack.tuqHJe/_old 2024-01-30 18:25:00.273053452 +0100 +++ /var/tmp/diff_new_pack.tuqHJe/_new 2024-01-30 18:25:00.277053597 +0100 @@ -1,7 +1,7 @@ -Index: VirtualBox-7.0.12/src/VBox/HostDrivers/Support/SUPDrvGip.cpp +Index: VirtualBox-7.0.14/src/VBox/HostDrivers/Support/SUPDrvGip.cpp =================================================================== ---- VirtualBox-7.0.12.orig/src/VBox/HostDrivers/Support/SUPDrvGip.cpp -+++ VirtualBox-7.0.12/src/VBox/HostDrivers/Support/SUPDrvGip.cpp +--- VirtualBox-7.0.14.orig/src/VBox/HostDrivers/Support/SUPDrvGip.cpp ++++ VirtualBox-7.0.14/src/VBox/HostDrivers/Support/SUPDrvGip.cpp @@ -4537,9 +4537,11 @@ static int supdrvTscDeltaThreadWait(PSUP */ static void supdrvTscDeltaThreadStartMeasurement(PSUPDRVDEVEXT pDevExt, bool fForceAll) ++++++ fix_conflict_between_host_and_guest.patch ++++++ --- /var/tmp/diff_new_pack.tuqHJe/_old 2024-01-30 18:25:00.289054030 +0100 +++ /var/tmp/diff_new_pack.tuqHJe/_new 2024-01-30 18:25:00.293054174 +0100 @@ -1,7 +1,7 @@ -Index: VirtualBox-7.0.12/src/VBox/Additions/common/VBoxGuest/VBoxGuest-haiku.c +Index: VirtualBox-7.0.14/src/VBox/Additions/common/VBoxGuest/VBoxGuest-haiku.c =================================================================== ---- VirtualBox-7.0.12.orig/src/VBox/Additions/common/VBoxGuest/VBoxGuest-haiku.c -+++ VirtualBox-7.0.12/src/VBox/Additions/common/VBoxGuest/VBoxGuest-haiku.c +--- VirtualBox-7.0.14.orig/src/VBox/Additions/common/VBoxGuest/VBoxGuest-haiku.c ++++ VirtualBox-7.0.14/src/VBox/Additions/common/VBoxGuest/VBoxGuest-haiku.c @@ -140,7 +140,7 @@ static struct vboxguest_module_info g_VB RTMemAllocExTag, RTMemContAlloc, ++++++ fix_sdl_build.patch ++++++ --- /var/tmp/diff_new_pack.tuqHJe/_old 2024-01-30 18:25:00.305054607 +0100 +++ /var/tmp/diff_new_pack.tuqHJe/_new 2024-01-30 18:25:00.309054751 +0100 @@ -1,7 +1,7 @@ -Index: VirtualBox-7.0.12/configure +Index: VirtualBox-7.0.14/configure =================================================================== ---- VirtualBox-7.0.12.orig/configure -+++ VirtualBox-7.0.12/configure +--- VirtualBox-7.0.14.orig/configure ++++ VirtualBox-7.0.14/configure @@ -1191,21 +1191,19 @@ check_sdl() fail fi @@ -50,10 +50,10 @@ [ $WITH_SDL_TTF -eq 1 -a $OSE -eq 0 ] && check_sdl_ttf [ $WITH_X11 -eq 1 ] && check_x # TODO check for xcomposite-dev (X11/extensions/Xcomposite.h, additions only) -Index: VirtualBox-7.0.12/src/VBox/Frontends/VBoxSDL/Makefile.kmk +Index: VirtualBox-7.0.14/src/VBox/Frontends/VBoxSDL/Makefile.kmk =================================================================== ---- VirtualBox-7.0.12.orig/src/VBox/Frontends/VBoxSDL/Makefile.kmk -+++ VirtualBox-7.0.12/src/VBox/Frontends/VBoxSDL/Makefile.kmk +--- VirtualBox-7.0.14.orig/src/VBox/Frontends/VBoxSDL/Makefile.kmk ++++ VirtualBox-7.0.14/src/VBox/Frontends/VBoxSDL/Makefile.kmk @@ -51,7 +51,7 @@ if !defined(VBOX_WITH_HARDENING) || "$(K PROGRAMS += VBoxSDL endif ++++++ fixes_for_gcc13.patch ++++++ --- /var/tmp/diff_new_pack.tuqHJe/_old 2024-01-30 18:25:00.325055328 +0100 +++ /var/tmp/diff_new_pack.tuqHJe/_new 2024-01-30 18:25:00.329055472 +0100 @@ -1,7 +1,7 @@ -Index: VirtualBox-7.0.12/src/libs/dxvk-native-1.9.2a/src/util/util_bit.h +Index: VirtualBox-7.0.14/src/libs/dxvk-native-1.9.2a/src/util/util_bit.h =================================================================== ---- VirtualBox-7.0.12.orig/src/libs/dxvk-native-1.9.2a/src/util/util_bit.h -+++ VirtualBox-7.0.12/src/libs/dxvk-native-1.9.2a/src/util/util_bit.h +--- VirtualBox-7.0.14.orig/src/libs/dxvk-native-1.9.2a/src/util/util_bit.h ++++ VirtualBox-7.0.14/src/libs/dxvk-native-1.9.2a/src/util/util_bit.h @@ -13,6 +13,7 @@ #include <intrin.h> #endif @@ -10,10 +10,10 @@ #include "util_likely.h" #include "util_math.h" -Index: VirtualBox-7.0.12/src/VBox/Additions/x11/x11include/XFree86-4.3/Xserver/misc.h +Index: VirtualBox-7.0.14/src/VBox/Additions/x11/x11include/XFree86-4.3/Xserver/misc.h =================================================================== ---- VirtualBox-7.0.12.orig/src/VBox/Additions/x11/x11include/XFree86-4.3/Xserver/misc.h -+++ VirtualBox-7.0.12/src/VBox/Additions/x11/x11include/XFree86-4.3/Xserver/misc.h +--- VirtualBox-7.0.14.orig/src/VBox/Additions/x11/x11include/XFree86-4.3/Xserver/misc.h ++++ VirtualBox-7.0.14/src/VBox/Additions/x11/x11include/XFree86-4.3/Xserver/misc.h @@ -66,6 +66,9 @@ TORTIOUS ACTION, ARISING OUT OF OR IN CO OF THIS SOFTWARE. ++++++ fixes_for_leap.patch ++++++ --- /var/tmp/diff_new_pack.tuqHJe/_old 2024-01-30 18:25:00.341055905 +0100 +++ /var/tmp/diff_new_pack.tuqHJe/_new 2024-01-30 18:25:00.345056050 +0100 @@ -1,8 +1,8 @@ -Index: VirtualBox-7.0.12/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c +Index: VirtualBox-7.0.14/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c =================================================================== ---- VirtualBox-7.0.12.orig/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c -+++ VirtualBox-7.0.12/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c -@@ -89,6 +89,17 @@ +--- VirtualBox-7.0.14.orig/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c ++++ VirtualBox-7.0.14/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c +@@ -89,6 +89,21 @@ #define VBOXNETFLT_OS_SPECFIC 1 #include "../VBoxNetFltInternal.h" @@ -13,17 +13,21 @@ +# define OPENSUSE_155 +# endif + -+#if RTLNX_SUSE_MAJ_PREREQ(15, 6) ++#if !defined(skb_gso_segment) ++#if defined(CONFIG_SUSE_VERSION) && (CONFIG_SUSE_VERSION == 15) ++//#include <config/net/mpls/gso.h> ++#else +#include <net/gso.h> +#endif ++#endif + typedef struct VBOXNETFLTNOTIFIER { struct notifier_block Notifier; PVBOXNETFLTINS pThis; -Index: VirtualBox-7.0.12/src/VBox/Additions/linux/drm/vbox_drv.c +Index: VirtualBox-7.0.14/src/VBox/Additions/linux/drm/vbox_drv.c =================================================================== ---- VirtualBox-7.0.12.orig/src/VBox/Additions/linux/drm/vbox_drv.c -+++ VirtualBox-7.0.12/src/VBox/Additions/linux/drm/vbox_drv.c +--- VirtualBox-7.0.14.orig/src/VBox/Additions/linux/drm/vbox_drv.c ++++ VirtualBox-7.0.14/src/VBox/Additions/linux/drm/vbox_drv.c @@ -39,6 +39,7 @@ #include "vbox_drv.h" @@ -51,26 +55,10 @@ #else /* >= 5.4.0 && RHEL >= 8.3 && SLES >= 15-SP3 */ .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_HAVE_IRQ, #endif /* < 5.4.0 */ -@@ -389,13 +393,13 @@ static struct drm_driver driver = { - #elif RTLNX_VER_MAX(5,12,0) && !RTLNX_RHEL_MAJ_PREREQ(8,5) - .dumb_destroy = drm_gem_dumb_destroy, - #endif --#if RTLNX_VER_MAX(6,6,0) -+#if RTLNX_VER_MAX(6,6,0) && !RTLNX_SUSE_MAJ_PREREQ(15, 5) - .prime_handle_to_fd = drm_gem_prime_handle_to_fd, - .prime_fd_to_handle = drm_gem_prime_fd_to_handle, - #endif - .gem_prime_import = drm_gem_prime_import, - .gem_prime_import_sg_table = vbox_gem_prime_import_sg_table, --#if RTLNX_VER_MAX(6,6,0) -+#if RTLNX_VER_MAX(6,6,0) && !RTLNX_SUSE_MAJ_PREREQ(15, 5) - .gem_prime_mmap = vbox_gem_prime_mmap, - #endif - -Index: VirtualBox-7.0.12/src/VBox/Additions/linux/drm/vbox_main.c +Index: VirtualBox-7.0.14/src/VBox/Additions/linux/drm/vbox_main.c =================================================================== ---- VirtualBox-7.0.12.orig/src/VBox/Additions/linux/drm/vbox_main.c -+++ VirtualBox-7.0.12/src/VBox/Additions/linux/drm/vbox_main.c +--- VirtualBox-7.0.14.orig/src/VBox/Additions/linux/drm/vbox_main.c ++++ VirtualBox-7.0.14/src/VBox/Additions/linux/drm/vbox_main.c @@ -663,8 +663,12 @@ static inline u64 vbox_bo_mmap_offset(st #elif RTLNX_VER_MAX(3,12,0) && !RTLNX_RHEL_MAJ_PREREQ(7,0) return bo->bo.addr_space_offset; @@ -84,10 +72,10 @@ } int -Index: VirtualBox-7.0.12/include/iprt/cdefs.h +Index: VirtualBox-7.0.14/include/iprt/cdefs.h =================================================================== ---- VirtualBox-7.0.12.orig/include/iprt/cdefs.h -+++ VirtualBox-7.0.12/include/iprt/cdefs.h +--- VirtualBox-7.0.14.orig/include/iprt/cdefs.h ++++ VirtualBox-7.0.14/include/iprt/cdefs.h @@ -1399,14 +1399,15 @@ #if RT_CLANG_PREREQ(4, 0) && RT_CPLUSPLUS_PREREQ(201100) # define RT_FALL_THROUGH() [[clang::fallthrough]] @@ -107,10 +95,10 @@ /** @def RT_IPRT_FORMAT_ATTR -Index: VirtualBox-7.0.12/kBuild/header.kmk +Index: VirtualBox-7.0.14/kBuild/header.kmk =================================================================== ---- VirtualBox-7.0.12.orig/kBuild/header.kmk -+++ VirtualBox-7.0.12/kBuild/header.kmk +--- VirtualBox-7.0.14.orig/kBuild/header.kmk ++++ VirtualBox-7.0.14/kBuild/header.kmk @@ -764,7 +764,7 @@ RMDIR_EXT := $(KBUILD_BIN_PATH)/kmk_rm RMDIR_INT := kmk_builtin_rmdir RMDIR := $(RMDIR_INT) @@ -120,10 +108,10 @@ SED_INT := $(SED_EXT) SED := $(SED_EXT) -Index: VirtualBox-7.0.12/configure +Index: VirtualBox-7.0.14/configure =================================================================== ---- VirtualBox-7.0.12.orig/configure -+++ VirtualBox-7.0.12/configure +--- VirtualBox-7.0.14.orig/configure ++++ VirtualBox-7.0.14/configure @@ -2039,7 +2039,7 @@ check_kbuild() fi echo "export KBUILD_PATH KBUILD_DEVTOOLS PATH" >> $ENV @@ -142,10 +130,10 @@ else fail fi -Index: VirtualBox-7.0.12/tools/bin/backport-commit.sh +Index: VirtualBox-7.0.14/tools/bin/backport-commit.sh =================================================================== ---- VirtualBox-7.0.12.orig/tools/bin/backport-commit.sh -+++ VirtualBox-7.0.12/tools/bin/backport-commit.sh +--- VirtualBox-7.0.14.orig/tools/bin/backport-commit.sh ++++ VirtualBox-7.0.14/tools/bin/backport-commit.sh @@ -29,7 +29,7 @@ # # Determin script dir so we can source the common bits. @@ -155,10 +143,10 @@ MY_SCRIPT_DIR=`echo "$0" | "${MY_SED}" -e 's|\\\|/|g' -e 's|^$.*$/[^/][^/]*$|\1|'` # \ -> / is for windows. if test "${MY_SCRIPT_DIR}" = "$0"; then MY_SCRIPT_DIR=`pwd -L` -Index: VirtualBox-7.0.12/tools/bin/backport-common.sh +Index: VirtualBox-7.0.14/tools/bin/backport-common.sh =================================================================== ---- VirtualBox-7.0.12.orig/tools/bin/backport-common.sh -+++ VirtualBox-7.0.12/tools/bin/backport-common.sh +--- VirtualBox-7.0.14.orig/tools/bin/backport-common.sh ++++ VirtualBox-7.0.14/tools/bin/backport-common.sh @@ -1,4 +1,4 @@ -# $Id: backport-common.sh $ + $Id: backport-common.sh $ @@ -174,10 +162,10 @@ # # Functions. -Index: VirtualBox-7.0.12/tools/bin/backport-merge-and-commit.sh +Index: VirtualBox-7.0.14/tools/bin/backport-merge-and-commit.sh =================================================================== ---- VirtualBox-7.0.12.orig/tools/bin/backport-merge-and-commit.sh -+++ VirtualBox-7.0.12/tools/bin/backport-merge-and-commit.sh +--- VirtualBox-7.0.14.orig/tools/bin/backport-merge-and-commit.sh ++++ VirtualBox-7.0.14/tools/bin/backport-merge-and-commit.sh @@ -29,7 +29,7 @@ # # Determin script dir so we can invoke the two worker scripts. @@ -187,10 +175,10 @@ MY_SCRIPT_DIR=`echo "$0" | "${MY_SED}" -e 's|\\\|/|g' -e 's|^$.*$/[^/][^/]*$|\1|'` # \ -> / is for windows. if test "${MY_SCRIPT_DIR}" = "$0"; then MY_SCRIPT_DIR=`pwd -L` -Index: VirtualBox-7.0.12/tools/bin/backport-merge.sh +Index: VirtualBox-7.0.14/tools/bin/backport-merge.sh =================================================================== ---- VirtualBox-7.0.12.orig/tools/bin/backport-merge.sh -+++ VirtualBox-7.0.12/tools/bin/backport-merge.sh +--- VirtualBox-7.0.14.orig/tools/bin/backport-merge.sh ++++ VirtualBox-7.0.14/tools/bin/backport-merge.sh @@ -29,7 +29,7 @@ # # Determin script dir so we can source the common bits. @@ -200,10 +188,10 @@ MY_SCRIPT_DIR=`echo "$0" | "${MY_SED}" -e 's|\\\|/|g' -e 's|^$.*$/[^/][^/]*$|\1|'` # \ -> / is for windows. if test "${MY_SCRIPT_DIR}" = "$0"; then MY_SCRIPT_DIR=`pwd -L` -Index: VirtualBox-7.0.12/src/VBox/Main/Makefile.kmk +Index: VirtualBox-7.0.14/src/VBox/Main/Makefile.kmk =================================================================== ---- VirtualBox-7.0.12.orig/src/VBox/Main/Makefile.kmk -+++ VirtualBox-7.0.12/src/VBox/Main/Makefile.kmk +--- VirtualBox-7.0.14.orig/src/VBox/Main/Makefile.kmk ++++ VirtualBox-7.0.14/src/VBox/Main/Makefile.kmk @@ -264,7 +264,7 @@ $(VBOX_XIDL_FILE).ts +| $(VBOX_XIDL_FILE | $$(dir $$@) $(call KB_FN_AUTO_CMD_DEPS_COMMANDS) @@ -213,10 +201,10 @@ $(QUIET)$(RM) -- $(VBOX_XIDL_FILE).ts-tmp $(QUIET)$(CP) --changed -fv -- $(VBOX_XIDL_FILE).ts $(VBOX_XIDL_FILE) -Index: VirtualBox-7.0.12/src/VBox/Runtime/Makefile.kmk +Index: VirtualBox-7.0.14/src/VBox/Runtime/Makefile.kmk =================================================================== ---- VirtualBox-7.0.12.orig/src/VBox/Runtime/Makefile.kmk -+++ VirtualBox-7.0.12/src/VBox/Runtime/Makefile.kmk +--- VirtualBox-7.0.14.orig/src/VBox/Runtime/Makefile.kmk ++++ VirtualBox-7.0.14/src/VBox/Runtime/Makefile.kmk @@ -4421,6 +4421,7 @@ $(foreach lib,RuntimeR3 RuntimeBldProg V # # Generate the status code data. @@ -225,10 +213,10 @@ $(IPRT_OUT_DIR)/errmsgdata.h: \ $(VBOX_PATH_RUNTIME_SRC)/common/err/errmsg.sed \ $(PATH_ROOT)/include/iprt/err.h \ -Index: VirtualBox-7.0.12/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h +Index: VirtualBox-7.0.14/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h =================================================================== ---- VirtualBox-7.0.12.orig/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h -+++ VirtualBox-7.0.12/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h +--- VirtualBox-7.0.14.orig/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h ++++ VirtualBox-7.0.14/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h @@ -147,9 +147,9 @@ #include <linux/interrupt.h> #include <linux/completion.h> @@ -241,10 +229,10 @@ #if !defined(HAVE_UNLOCKED_IOCTL) && RTLNX_VER_MAX(2,6,38) # include <linux/smp_lock.h> #endif -Index: VirtualBox-7.0.12/src/libs/xpcom18a4/python/src/PyXPCOM.h +Index: VirtualBox-7.0.14/src/libs/xpcom18a4/python/src/PyXPCOM.h =================================================================== ---- VirtualBox-7.0.12.orig/src/libs/xpcom18a4/python/src/PyXPCOM.h -+++ VirtualBox-7.0.12/src/libs/xpcom18a4/python/src/PyXPCOM.h +--- VirtualBox-7.0.14.orig/src/libs/xpcom18a4/python/src/PyXPCOM.h ++++ VirtualBox-7.0.14/src/libs/xpcom18a4/python/src/PyXPCOM.h @@ -191,7 +191,7 @@ extern "C" PyAPI_FUNC(const char *) PyUn # endif @@ -254,10 +242,10 @@ DECLINLINE(int) PyRun_SimpleString(const char *pszCode) { -Index: VirtualBox-7.0.12/src/libs/xpcom18a4/python/src/ErrorUtils.cpp +Index: VirtualBox-7.0.14/src/libs/xpcom18a4/python/src/ErrorUtils.cpp =================================================================== ---- VirtualBox-7.0.12.orig/src/libs/xpcom18a4/python/src/ErrorUtils.cpp -+++ VirtualBox-7.0.12/src/libs/xpcom18a4/python/src/ErrorUtils.cpp +--- VirtualBox-7.0.14.orig/src/libs/xpcom18a4/python/src/ErrorUtils.cpp ++++ VirtualBox-7.0.14/src/libs/xpcom18a4/python/src/ErrorUtils.cpp @@ -121,7 +121,7 @@ void DoLogMessage(const char *methodName #if PY_MAJOR_VERSION <= 2 c += PyString_AsString(repr); @@ -298,10 +286,10 @@ #endif result = (char *)PyMem_Malloc(strlen(tempResult)+1); if (result==NULL) -Index: VirtualBox-7.0.12/src/libs/xpcom18a4/python/src/PyGBase.cpp +Index: VirtualBox-7.0.14/src/libs/xpcom18a4/python/src/PyGBase.cpp =================================================================== ---- VirtualBox-7.0.12.orig/src/libs/xpcom18a4/python/src/PyGBase.cpp -+++ VirtualBox-7.0.12/src/libs/xpcom18a4/python/src/PyGBase.cpp +--- VirtualBox-7.0.14.orig/src/libs/xpcom18a4/python/src/PyGBase.cpp ++++ VirtualBox-7.0.14/src/libs/xpcom18a4/python/src/PyGBase.cpp @@ -117,7 +117,7 @@ PyG_Base::PyG_Base(PyObject *instance, c #if PY_MAJOR_VERSION <= 2 szRepr = PyString_AsString(r); @@ -311,10 +299,10 @@ #endif if (szRepr==NULL) szRepr = ""; int reprOffset = *szRepr=='<' ? 1 : 0; -Index: VirtualBox-7.0.12/src/libs/xpcom18a4/python/src/PyIID.cpp +Index: VirtualBox-7.0.14/src/libs/xpcom18a4/python/src/PyIID.cpp =================================================================== ---- VirtualBox-7.0.12.orig/src/libs/xpcom18a4/python/src/PyIID.cpp -+++ VirtualBox-7.0.12/src/libs/xpcom18a4/python/src/PyIID.cpp +--- VirtualBox-7.0.14.orig/src/libs/xpcom18a4/python/src/PyIID.cpp ++++ VirtualBox-7.0.14/src/libs/xpcom18a4/python/src/PyIID.cpp @@ -137,7 +137,7 @@ Py_nsIID::IIDFromPyObject(PyObject *ob, ok = iid.Parse(PyString_AsString(ob)); #else @@ -324,10 +312,10 @@ #endif if (!ok) { PyXPCOM_BuildPyException(NS_ERROR_ILLEGAL_VALUE); -Index: VirtualBox-7.0.12/src/libs/xpcom18a4/python/src/VariantUtils.cpp +Index: VirtualBox-7.0.14/src/libs/xpcom18a4/python/src/VariantUtils.cpp =================================================================== ---- VirtualBox-7.0.12.orig/src/libs/xpcom18a4/python/src/VariantUtils.cpp -+++ VirtualBox-7.0.12/src/libs/xpcom18a4/python/src/VariantUtils.cpp +--- VirtualBox-7.0.14.orig/src/libs/xpcom18a4/python/src/VariantUtils.cpp ++++ VirtualBox-7.0.14/src/libs/xpcom18a4/python/src/VariantUtils.cpp @@ -141,7 +141,7 @@ PyObject *PyObject_FromNSString( const n #if PY_MAJOR_VERSION <= 2 char* dest = (char *)PyString_AS_STRING(ret); @@ -373,10 +361,10 @@ BREAK_FALSE; const char *sz = PyBytes_AS_STRING(val_use); -Index: VirtualBox-7.0.12/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp +Index: VirtualBox-7.0.14/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp =================================================================== ---- VirtualBox-7.0.12.orig/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp -+++ VirtualBox-7.0.12/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp +--- VirtualBox-7.0.14.orig/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp ++++ VirtualBox-7.0.14/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp @@ -710,7 +710,7 @@ static const char *keyModToStr(unsigned RT_CASE_RET_STR(KMOD_NUM); RT_CASE_RET_STR(KMOD_CAPS); @@ -386,10 +374,10 @@ default: break; } -Index: VirtualBox-7.0.12/src/VBox/Additions/linux/drm/vbox_drv.h +Index: VirtualBox-7.0.14/src/VBox/Additions/linux/drm/vbox_drv.h =================================================================== ---- VirtualBox-7.0.12.orig/src/VBox/Additions/linux/drm/vbox_drv.h -+++ VirtualBox-7.0.12/src/VBox/Additions/linux/drm/vbox_drv.h +--- VirtualBox-7.0.14.orig/src/VBox/Additions/linux/drm/vbox_drv.h ++++ VirtualBox-7.0.14/src/VBox/Additions/linux/drm/vbox_drv.h @@ -39,6 +39,7 @@ # pragma once #endif @@ -398,10 +386,10 @@ #include <linux/version.h> /* iprt/linux/version.h copy - start */ -Index: VirtualBox-7.0.12/src/VBox/Additions/linux/drm/vbox_ttm.c +Index: VirtualBox-7.0.14/src/VBox/Additions/linux/drm/vbox_ttm.c =================================================================== ---- VirtualBox-7.0.12.orig/src/VBox/Additions/linux/drm/vbox_ttm.c -+++ VirtualBox-7.0.12/src/VBox/Additions/linux/drm/vbox_ttm.c +--- VirtualBox-7.0.14.orig/src/VBox/Additions/linux/drm/vbox_ttm.c ++++ VirtualBox-7.0.14/src/VBox/Additions/linux/drm/vbox_ttm.c @@ -38,6 +38,10 @@ # include <drm/ttm/ttm_tt.h> #endif @@ -425,10 +413,10 @@ return tt; } -Index: VirtualBox-7.0.12/src/VBox/Additions/linux/drm/vbox_fb.c +Index: VirtualBox-7.0.14/src/VBox/Additions/linux/drm/vbox_fb.c =================================================================== ---- VirtualBox-7.0.12.orig/src/VBox/Additions/linux/drm/vbox_fb.c -+++ VirtualBox-7.0.12/src/VBox/Additions/linux/drm/vbox_fb.c +--- VirtualBox-7.0.14.orig/src/VBox/Additions/linux/drm/vbox_fb.c ++++ VirtualBox-7.0.14/src/VBox/Additions/linux/drm/vbox_fb.c @@ -47,6 +47,7 @@ #include <drm/drm_crtc.h> #include <drm/drm_fb_helper.h> @@ -437,19 +425,10 @@ #include <VBoxVideo.h> -@@ -196,7 +197,7 @@ static struct fb_ops vboxfb_ops = { - .owner = THIS_MODULE, - .fb_check_var = drm_fb_helper_check_var, - .fb_set_par = drm_fb_helper_set_par, --#if RTLNX_VER_MIN(6,5,0) -+#if RTLNX_VER_MIN(6,5,0) || RTLNX_SUSE_MAJ_PREREQ(15, 6) - .fb_read = fb_sys_read, - .fb_write = fb_sys_write, - .fb_fillrect = sys_fillrect, -Index: VirtualBox-7.0.12/src/VBox/Additions/linux/drm/vbox_mode.c +Index: VirtualBox-7.0.14/src/VBox/Additions/linux/drm/vbox_mode.c =================================================================== ---- VirtualBox-7.0.12.orig/src/VBox/Additions/linux/drm/vbox_mode.c -+++ VirtualBox-7.0.12/src/VBox/Additions/linux/drm/vbox_mode.c +--- VirtualBox-7.0.14.orig/src/VBox/Additions/linux/drm/vbox_mode.c ++++ VirtualBox-7.0.14/src/VBox/Additions/linux/drm/vbox_mode.c @@ -53,6 +53,7 @@ #if RTLNX_VER_MIN(6,0,0) || RTLNX_RHEL_RANGE(8,8, 8,99) || RTLNX_RHEL_MAJ_PREREQ(9,2) || RTLNX_SUSE_MAJ_PREREQ(15,5) # include <drm/drm_edid.h> @@ -458,10 +437,10 @@ #include "VBoxVideo.h" -Index: VirtualBox-7.0.12/src/VBox/HostDrivers/VBoxNetAdp/linux/VBoxNetAdp-linux.c +Index: VirtualBox-7.0.14/src/VBox/HostDrivers/VBoxNetAdp/linux/VBoxNetAdp-linux.c =================================================================== ---- VirtualBox-7.0.12.orig/src/VBox/HostDrivers/VBoxNetAdp/linux/VBoxNetAdp-linux.c -+++ VirtualBox-7.0.12/src/VBox/HostDrivers/VBoxNetAdp/linux/VBoxNetAdp-linux.c +--- VirtualBox-7.0.14.orig/src/VBox/HostDrivers/VBoxNetAdp/linux/VBoxNetAdp-linux.c ++++ VirtualBox-7.0.14/src/VBox/HostDrivers/VBoxNetAdp/linux/VBoxNetAdp-linux.c @@ -77,7 +77,7 @@ #define VBOXNETADP_FROM_IFACE(iface) ((PVBOXNETADP) ifnet_softc(iface)) @@ -471,26 +450,4 @@ # define VBOX_DEV_ADDR_SET(dev, addr, len) dev_addr_mod(dev, 0, addr, len) #else /* < 5.17.0 */ # define VBOX_DEV_ADDR_SET(dev, addr, len) memcpy(dev->dev_addr, addr, len) -Index: VirtualBox-7.0.12/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c -=================================================================== ---- VirtualBox-7.0.12.orig/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c -+++ VirtualBox-7.0.12/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c -@@ -1342,7 +1342,7 @@ DECLHIDDEN(int) rtR0MemObjNativeLockUser - fWrite, /* force write access. */ - # endif - &pMemLnx->apPages[0] /* Page array. */ --# if GET_USER_PAGES_API < KERNEL_VERSION(6, 5, 0) -+# if GET_USER_PAGES_API < KERNEL_VERSION(6, 5, 0) && !RTLNX_SUSE_MAJ_PREREQ(15, 6) - , papVMAs /* vmas */ - # endif - ); -@@ -1389,7 +1389,7 @@ DECLHIDDEN(int) rtR0MemObjNativeLockUser - fWrite, /* force write access. */ - # endif - &pMemLnx->apPages[0] /* Page array. */ --# if GET_USER_PAGES_API < KERNEL_VERSION(6, 5, 0) -+# if GET_USER_PAGES_API < KERNEL_VERSION(6, 5, 0) && !RTLNX_SUSE_MAJ_PREREQ(15, 6) - , papVMAs /* vmas */ - # endif - ); ++++++ fixes_for_makefile.patch ++++++ --- /var/tmp/diff_new_pack.tuqHJe/_old 2024-01-30 18:25:00.357056483 +0100 +++ /var/tmp/diff_new_pack.tuqHJe/_new 2024-01-30 18:25:00.361056627 +0100 @@ -1,7 +1,7 @@ -Index: VirtualBox-7.0.12/src/VBox/HostDrivers/linux/Makefile +Index: VirtualBox-7.0.14/src/VBox/HostDrivers/linux/Makefile =================================================================== ---- VirtualBox-7.0.12.orig/src/VBox/HostDrivers/linux/Makefile -+++ VirtualBox-7.0.12/src/VBox/HostDrivers/linux/Makefile +--- VirtualBox-7.0.14.orig/src/VBox/HostDrivers/linux/Makefile ++++ VirtualBox-7.0.14/src/VBox/HostDrivers/linux/Makefile @@ -43,11 +43,8 @@ obj-m = vboxdrv/ obj-m += vboxnetflt/ endif @@ -140,10 +140,10 @@ if test -f $$module.ko; then \ echo "Installing $$module module"; \ $(SUDO) /sbin/insmod $$module.ko; \ -Index: VirtualBox-7.0.12/src/VBox/Additions/linux/Makefile +Index: VirtualBox-7.0.14/src/VBox/Additions/linux/Makefile =================================================================== ---- VirtualBox-7.0.12.orig/src/VBox/Additions/linux/Makefile -+++ VirtualBox-7.0.12/src/VBox/Additions/linux/Makefile +--- VirtualBox-7.0.14.orig/src/VBox/Additions/linux/Makefile ++++ VirtualBox-7.0.14/src/VBox/Additions/linux/Makefile @@ -34,6 +34,7 @@ obj-m = vboxguest/ vboxsf/ vboxvideo/ else # ! KERNELRELEASE @@ -184,11 +184,11 @@ $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxvideo install; \ fi -Index: VirtualBox-7.0.12/include/iprt/x86.h +Index: VirtualBox-7.0.14/include/iprt/x86.h =================================================================== ---- VirtualBox-7.0.12.orig/include/iprt/x86.h -+++ VirtualBox-7.0.12/include/iprt/x86.h -@@ -895,37 +895,59 @@ typedef const X86CPUIDFEATEDX *PCX86CPUI +--- VirtualBox-7.0.14.orig/include/iprt/x86.h ++++ VirtualBox-7.0.14/include/iprt/x86.h +@@ -937,37 +937,59 @@ typedef const X86CPUIDFEATEDX *PCX86CPUI * reserved flags. * @{ */ /** Bit 0 - PE - Protection Enabled */ @@ -248,7 +248,7 @@ #define X86_CR0_PAGING RT_BIT_32(31) #define X86_CR0_BIT_PG 31 /**< Bit number of X86_CR0_PG */ /** @} */ -@@ -934,9 +956,13 @@ typedef const X86CPUIDFEATEDX *PCX86CPUI +@@ -976,9 +998,13 @@ typedef const X86CPUIDFEATEDX *PCX86CPUI /** @name CR3 * @{ */ /** Bit 3 - PWT - Page-level Writes Transparent. */ @@ -262,7 +262,7 @@ /** Bits 12-31 - - Page directory page number. */ #define X86_CR3_PAGE_MASK (0xfffff000) /** Bits 5-31 - - PAE Page directory page number. */ -@@ -955,46 +981,84 @@ typedef const X86CPUIDFEATEDX *PCX86CPUI +@@ -997,46 +1023,84 @@ typedef const X86CPUIDFEATEDX *PCX86CPUI /** @name CR4 * @{ */ /** Bit 0 - VME - Virtual-8086 Mode Extensions. */ @@ -347,7 +347,7 @@ /** Bit 23 - CET - Control-flow Enhancement Technology enabled. */ #define X86_CR4_CET RT_BIT_32(23) /** @} */ -@@ -1225,12 +1289,16 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C +@@ -1267,12 +1331,16 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C /** Machine check type register (P5). */ #define MSR_P5_MC_TYPE UINT32_C(0x00000001) /** Time Stamp Counter. */ @@ -364,7 +364,7 @@ #ifndef MSR_IA32_APICBASE /* qemu cpu.h kludge */ # define MSR_IA32_APICBASE 0x1b -@@ -1256,7 +1324,9 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C +@@ -1298,7 +1366,9 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C #define MSR_CORE_THREAD_COUNT 0x35 /** CPU Feature control. */ @@ -374,7 +374,7 @@ /** Feature control - Lock MSR from writes (R/W0). */ #define MSR_IA32_FEATURE_CONTROL_LOCK RT_BIT_64(0) /** Feature control - Enable VMX inside SMX operation (R/WL). */ -@@ -1281,11 +1351,15 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C +@@ -1323,11 +1393,15 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C #define MSR_IA32_FEATURE_CONTROL_LMCE RT_BIT_64(20) /** Per-processor TSC adjust MSR. */ @@ -390,7 +390,7 @@ /** IBRS - Indirect branch restricted speculation. */ #define MSR_IA32_SPEC_CTRL_F_IBRS RT_BIT_32(0) /** STIBP - Single thread indirect branch predictors. */ -@@ -1295,7 +1369,9 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C +@@ -1337,7 +1411,9 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C /** Prediction command register. * Write only, logical processor scope, no state since write only. */ @@ -400,7 +400,7 @@ /** IBPB - Indirect branch prediction barrie when written as 1. */ #define MSR_IA32_PRED_CMD_F_IBPB RT_BIT_32(0) -@@ -1306,7 +1382,9 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C +@@ -1348,7 +1424,9 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C #define MSR_IA32_BIOS_SIGN_ID 0x8B /** SMM monitor control. */ @@ -410,7 +410,7 @@ /** SMM control - Valid. */ #define MSR_IA32_SMM_MONITOR_VALID RT_BIT_64(0) /** SMM control - VMXOFF unblocks SMI. */ -@@ -1315,10 +1393,14 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C +@@ -1357,10 +1435,14 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C #define MSR_IA32_SMM_MONITOR_MSGEG_PHYSADDR(a) (((a) >> 12) & UINT64_C(0xfffff)) /** SMBASE - Base address of SMRANGE image (Read-only, SMM only). */ @@ -425,7 +425,7 @@ /** General performance counter no. 1. */ #define MSR_IA32_PMC1 0xC2 /** General performance counter no. 2. */ -@@ -1341,18 +1423,26 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C +@@ -1383,18 +1465,26 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C #define MSR_IA32_FSB_CLOCK_STS 0xCD /** C-State configuration control. Intel specific: Nehalem, Sandy Bridge. */ @@ -452,7 +452,7 @@ /** CPU is no subject to meltdown problems. */ #define MSR_IA32_ARCH_CAP_F_RDCL_NO RT_BIT_32(0) /** CPU has better IBRS and you can leave it on all the time. */ -@@ -1366,7 +1456,9 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C +@@ -1408,7 +1498,9 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C #define MSR_IA32_ARCH_CAP_F_MDS_NO RT_BIT_32(4) /** Flush command register. */ @@ -462,7 +462,7 @@ /** Flush the level 1 data cache when this bit is written. */ #define MSR_IA32_FLUSH_CMD_F_L1D RT_BIT_32(0) -@@ -1387,14 +1479,20 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C +@@ -1429,14 +1521,20 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C #endif /** Machine Check Global Capabilities Register. */ @@ -483,7 +483,7 @@ /** Default PAT MSR value on processor powerup / reset (see Intel spec. 11.12.4 * "Programming the PAT", AMD spec. 7.8.2 "PAT Indexing") */ #define MSR_IA32_CR_PAT_INIT_VAL UINT64_C(0x0007040600070406) -@@ -1413,36 +1511,58 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C +@@ -1455,36 +1553,58 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C #define MSR_FLEX_RATIO 0x194 /** Performance state value and starting with Intel core more. * Apple uses the >=core features to determine TSC granularity on older CPUs. */ @@ -542,7 +542,7 @@ /** Trace/Profile Resource Control (R/W) */ #define MSR_IA32_DEBUGCTL UINT32_C(0x000001d9) -@@ -1623,7 +1743,9 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C +@@ -1665,7 +1785,9 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C /** @} */ /** Intel TSX (Transactional Synchronization Extensions) control MSR. */ @@ -552,7 +552,7 @@ /** Variable range MTRRs. * @{ */ -@@ -1673,93 +1795,171 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C +@@ -1715,93 +1837,171 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C #define MSR_IA32_PERF_GLOBAL_OVF_CTRL 0x390 /** Precise Event Based sampling (Intel only). */ @@ -724,7 +724,7 @@ /** X2APIC MSR range start. */ #define MSR_IA32_X2APIC_START 0x800 -@@ -1894,23 +2094,47 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C +@@ -1936,23 +2136,47 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C /** The mask which give the SYSCALL EIP. */ #define MSR_K6_STAR_SYSCALL_EIP_MASK UINT32_C(0xffffffff) /** K6 WHCR - Write Handling Control Register. */ @@ -772,7 +772,7 @@ /** K8 LSTAR - Long mode SYSCALL target (RIP). */ #define MSR_K8_LSTAR UINT32_C(0xc0000082) -@@ -1926,14 +2150,20 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C +@@ -1968,14 +2192,20 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C #define MSR_K8_KERNEL_GS_BASE UINT32_C(0xc0000102) /** K8 TSC_AUX - Used with RDTSCP. */ #define MSR_K8_TSC_AUX UINT32_C(0xc0000103) @@ -793,10 +793,10 @@ /** SMM MSRs. */ #define MSR_K7_SMBASE UINT32_C(0xc0010111) -Index: VirtualBox-7.0.12/include/VBox/vmm/hm_vmx.h +Index: VirtualBox-7.0.14/include/VBox/vmm/hm_vmx.h =================================================================== ---- VirtualBox-7.0.12.orig/include/VBox/vmm/hm_vmx.h -+++ VirtualBox-7.0.12/include/VBox/vmm/hm_vmx.h +--- VirtualBox-7.0.14.orig/include/VBox/vmm/hm_vmx.h ++++ VirtualBox-7.0.14/include/VBox/vmm/hm_vmx.h @@ -1633,7 +1633,9 @@ AssertCompileSize(VMXABORT, 4); /** VMCS (and related regions) memory type - Uncacheable. */ #define VMX_BASIC_MEM_TYPE_UC 0 @@ -807,10 +807,10 @@ /** Width of physical addresses used for VMCS and associated memory regions * (1=32-bit, 0=processor's physical address width). */ #define VMX_BASIC_PHYSADDR_WIDTH_32BIT RT_BIT_64(48) -Index: VirtualBox-7.0.12/src/VBox/Additions/linux/drm/vbox_drv.h +Index: VirtualBox-7.0.14/src/VBox/Additions/linux/drm/vbox_drv.h =================================================================== ---- VirtualBox-7.0.12.orig/src/VBox/Additions/linux/drm/vbox_drv.h -+++ VirtualBox-7.0.12/src/VBox/Additions/linux/drm/vbox_drv.h +--- VirtualBox-7.0.14.orig/src/VBox/Additions/linux/drm/vbox_drv.h ++++ VirtualBox-7.0.14/src/VBox/Additions/linux/drm/vbox_drv.h @@ -87,6 +87,12 @@ #else # define RTLNX_RHEL_MAX(a_iMajor, a_iMinor) (0) ++++++ fixes_for_python.patch ++++++ --- /var/tmp/diff_new_pack.tuqHJe/_old 2024-01-30 18:25:00.377057204 +0100 +++ /var/tmp/diff_new_pack.tuqHJe/_new 2024-01-30 18:25:00.381057348 +0100 @@ -6,10 +6,10 @@ Larry Finger -Index: VirtualBox-7.0.12/src/VBox/Frontends/VBoxShell/vboxshell.py +Index: VirtualBox-7.0.14/src/VBox/Frontends/VBoxShell/vboxshell.py =================================================================== ---- VirtualBox-7.0.12.orig/src/VBox/Frontends/VBoxShell/vboxshell.py -+++ VirtualBox-7.0.12/src/VBox/Frontends/VBoxShell/vboxshell.py +--- VirtualBox-7.0.14.orig/src/VBox/Frontends/VBoxShell/vboxshell.py ++++ VirtualBox-7.0.14/src/VBox/Frontends/VBoxShell/vboxshell.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 ++++++ fixes_for_qt5.13.patch ++++++ --- /var/tmp/diff_new_pack.tuqHJe/_old 2024-01-30 18:25:00.393057781 +0100 +++ /var/tmp/diff_new_pack.tuqHJe/_new 2024-01-30 18:25:00.401058070 +0100 @@ -1,7 +1,7 @@ -Index: VirtualBox-7.0.12/include/VBox/VBoxGL2D.h +Index: VirtualBox-7.0.14/include/VBox/VBoxGL2D.h =================================================================== ---- VirtualBox-7.0.12.orig/include/VBox/VBoxGL2D.h -+++ VirtualBox-7.0.12/include/VBox/VBoxGL2D.h +--- VirtualBox-7.0.14.orig/include/VBox/VBoxGL2D.h ++++ VirtualBox-7.0.14/include/VBox/VBoxGL2D.h @@ -123,7 +123,7 @@ typedef GLvoid (APIENTRY *PFNVBOXVHWA_UN /* GL_ARB_pixel_buffer_object*/ #ifndef Q_WS_MAC @@ -11,10 +11,10 @@ #endif #ifndef GL_READ_ONLY -Index: VirtualBox-7.0.12/src/VBox/Additions/3D/mesa/mesa-21.3.8/include/GL/glext.h +Index: VirtualBox-7.0.14/src/VBox/Additions/3D/mesa/mesa-21.3.8/include/GL/glext.h =================================================================== ---- VirtualBox-7.0.12.orig/src/VBox/Additions/3D/mesa/mesa-21.3.8/include/GL/glext.h -+++ VirtualBox-7.0.12/src/VBox/Additions/3D/mesa/mesa-21.3.8/include/GL/glext.h +--- VirtualBox-7.0.14.orig/src/VBox/Additions/3D/mesa/mesa-21.3.8/include/GL/glext.h ++++ VirtualBox-7.0.14/src/VBox/Additions/3D/mesa/mesa-21.3.8/include/GL/glext.h @@ -466,7 +466,12 @@ GLAPI void APIENTRY glBlendEquation (GLe #ifndef GL_VERSION_1_5 @@ -28,10 +28,10 @@ typedef khronos_intptr_t GLintptr; #define GL_BUFFER_SIZE 0x8764 #define GL_BUFFER_USAGE 0x8765 -Index: VirtualBox-7.0.12/src/VBox/Devices/Graphics/vmsvga_glext/glext.h +Index: VirtualBox-7.0.14/src/VBox/Devices/Graphics/vmsvga_glext/glext.h =================================================================== ---- VirtualBox-7.0.12.orig/src/VBox/Devices/Graphics/vmsvga_glext/glext.h -+++ VirtualBox-7.0.12/src/VBox/Devices/Graphics/vmsvga_glext/glext.h +--- VirtualBox-7.0.14.orig/src/VBox/Devices/Graphics/vmsvga_glext/glext.h ++++ VirtualBox-7.0.14/src/VBox/Devices/Graphics/vmsvga_glext/glext.h @@ -4680,6 +4680,14 @@ GLAPI void APIENTRY glWeightuivARB (GLin GLAPI void APIENTRY glWeightPointerARB (GLint size, GLenum type, GLsizei stride, const void *pointer); GLAPI void APIENTRY glVertexBlendARB (GLint count); ++++++ fixes_for_sle12.patch ++++++ --- /var/tmp/diff_new_pack.tuqHJe/_old 2024-01-30 18:25:00.413058503 +0100 +++ /var/tmp/diff_new_pack.tuqHJe/_new 2024-01-30 18:25:00.417058647 +0100 @@ -1,7 +1,7 @@ -Index: VirtualBox-7.0.12/src/VBox/Additions/linux/drm/vbox_drv.c +Index: VirtualBox-7.0.14/src/VBox/Additions/linux/drm/vbox_drv.c =================================================================== ---- VirtualBox-7.0.12.orig/src/VBox/Additions/linux/drm/vbox_drv.c -+++ VirtualBox-7.0.12/src/VBox/Additions/linux/drm/vbox_drv.c +--- VirtualBox-7.0.14.orig/src/VBox/Additions/linux/drm/vbox_drv.c ++++ VirtualBox-7.0.14/src/VBox/Additions/linux/drm/vbox_drv.c @@ -362,7 +362,9 @@ static struct drm_driver driver = { .master_drop = vbox_master_drop, #if RTLNX_VER_MIN(3,18,0) || RTLNX_RHEL_MAJ_PREREQ(7,2) @@ -12,10 +12,10 @@ # endif #endif -Index: VirtualBox-7.0.12/src/VBox/Additions/linux/drm/vbox_main.c +Index: VirtualBox-7.0.14/src/VBox/Additions/linux/drm/vbox_main.c =================================================================== ---- VirtualBox-7.0.12.orig/src/VBox/Additions/linux/drm/vbox_main.c -+++ VirtualBox-7.0.12/src/VBox/Additions/linux/drm/vbox_main.c +--- VirtualBox-7.0.14.orig/src/VBox/Additions/linux/drm/vbox_main.c ++++ VirtualBox-7.0.14/src/VBox/Additions/linux/drm/vbox_main.c @@ -626,11 +626,13 @@ int vbox_dumb_destroy(struct drm_file *f #endif @@ -30,10 +30,10 @@ void vbox_gem_free_object(struct drm_gem_object *obj) { -Index: VirtualBox-7.0.12/src/VBox/Additions/linux/drm/vbox_ttm.c +Index: VirtualBox-7.0.14/src/VBox/Additions/linux/drm/vbox_ttm.c =================================================================== ---- VirtualBox-7.0.12.orig/src/VBox/Additions/linux/drm/vbox_ttm.c -+++ VirtualBox-7.0.12/src/VBox/Additions/linux/drm/vbox_ttm.c +--- VirtualBox-7.0.14.orig/src/VBox/Additions/linux/drm/vbox_ttm.c ++++ VirtualBox-7.0.14/src/VBox/Additions/linux/drm/vbox_ttm.c @@ -302,7 +302,7 @@ static struct ttm_backend_func vbox_tt_b }; #endif @@ -124,10 +124,10 @@ ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false); # else ret = ttm_bo_validate(&bo->bo, &bo->placement, &ctx); -Index: VirtualBox-7.0.12/src/VBox/Additions/linux/drm/vbox_drv.h +Index: VirtualBox-7.0.14/src/VBox/Additions/linux/drm/vbox_drv.h =================================================================== ---- VirtualBox-7.0.12.orig/src/VBox/Additions/linux/drm/vbox_drv.h -+++ VirtualBox-7.0.12/src/VBox/Additions/linux/drm/vbox_drv.h +--- VirtualBox-7.0.14.orig/src/VBox/Additions/linux/drm/vbox_drv.h ++++ VirtualBox-7.0.14/src/VBox/Additions/linux/drm/vbox_drv.h @@ -87,6 +87,9 @@ #else # define RTLNX_RHEL_MAX(a_iMajor, a_iMinor) (0) @@ -138,10 +138,10 @@ /** @def RTLNX_RHEL_RANGE * Check that it's a RedHat kernel in the given version range. -Index: VirtualBox-7.0.12/src/VBox/Additions/linux/drm/vbox_mode.c +Index: VirtualBox-7.0.14/src/VBox/Additions/linux/drm/vbox_mode.c =================================================================== ---- VirtualBox-7.0.12.orig/src/VBox/Additions/linux/drm/vbox_mode.c -+++ VirtualBox-7.0.12/src/VBox/Additions/linux/drm/vbox_mode.c +--- VirtualBox-7.0.14.orig/src/VBox/Additions/linux/drm/vbox_mode.c ++++ VirtualBox-7.0.14/src/VBox/Additions/linux/drm/vbox_mode.c @@ -557,7 +557,8 @@ static void vbox_set_edid(struct drm_con for (i = 0; i < EDID_SIZE - 1; ++i) sum += edid[i]; ++++++ gcc5-real-support.patch ++++++ --- /var/tmp/diff_new_pack.tuqHJe/_old 2024-01-30 18:25:00.429059080 +0100 +++ /var/tmp/diff_new_pack.tuqHJe/_new 2024-01-30 18:25:00.433059225 +0100 @@ -1,7 +1,7 @@ -Index: VirtualBox-7.0.12/configure +Index: VirtualBox-7.0.14/configure =================================================================== ---- VirtualBox-7.0.12.orig/configure -+++ VirtualBox-7.0.12/configure +--- VirtualBox-7.0.14.orig/configure ++++ VirtualBox-7.0.14/configure @@ -475,8 +475,13 @@ check_gcc() log_failure "cannot execute '$CXX -dumpversion'" fail really ++++++ handle_gsoap_208103.patch ++++++ --- /var/tmp/diff_new_pack.tuqHJe/_old 2024-01-30 18:25:00.445059658 +0100 +++ /var/tmp/diff_new_pack.tuqHJe/_new 2024-01-30 18:25:00.449059802 +0100 @@ -1,7 +1,7 @@ -Index: VirtualBox-7.0.12/src/VBox/Main/webservice/vboxweb.cpp +Index: VirtualBox-7.0.14/src/VBox/Main/webservice/vboxweb.cpp =================================================================== ---- VirtualBox-7.0.12.orig/src/VBox/Main/webservice/vboxweb.cpp -+++ VirtualBox-7.0.12/src/VBox/Main/webservice/vboxweb.cpp +--- VirtualBox-7.0.14.orig/src/VBox/Main/webservice/vboxweb.cpp ++++ VirtualBox-7.0.14/src/VBox/Main/webservice/vboxweb.cpp @@ -955,9 +955,9 @@ static void doQueuesLoop() continue; // timeout, not necessary to bother gsoap // r < 0, errno ++++++ modify_for_4_8_bo_move.patch ++++++ --- /var/tmp/diff_new_pack.tuqHJe/_old 2024-01-30 18:25:00.461060235 +0100 +++ /var/tmp/diff_new_pack.tuqHJe/_new 2024-01-30 18:25:00.465060379 +0100 @@ -1,7 +1,7 @@ -Index: VirtualBox-7.0.12/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c +Index: VirtualBox-7.0.14/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c =================================================================== ---- VirtualBox-7.0.12.orig/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c -+++ VirtualBox-7.0.12/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c +--- VirtualBox-7.0.14.orig/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c ++++ VirtualBox-7.0.14/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c @@ -45,7 +45,7 @@ #include <iprt/assert.h> #include <iprt/errcore.h> ++++++ python311.patch ++++++ --- /var/tmp/diff_new_pack.tuqHJe/_old 2024-01-30 18:25:00.473060668 +0100 +++ /var/tmp/diff_new_pack.tuqHJe/_new 2024-01-30 18:25:00.477060812 +0100 @@ -1,7 +1,7 @@ -Index: VirtualBox-7.0.12/configure +Index: VirtualBox-7.0.14/configure =================================================================== ---- VirtualBox-7.0.12.orig/configure -+++ VirtualBox-7.0.12/configure +--- VirtualBox-7.0.14.orig/configure ++++ VirtualBox-7.0.14/configure @@ -2178,7 +2178,7 @@ extern "C" int main(void) } EOF @@ -11,10 +11,10 @@ for p in $PYTHONDIR; do for d in $SUPPYTHONLIBS; do for b in lib/x86_64-linux-gnu lib/i386-linux-gnu lib64 lib/64 lib; do -Index: VirtualBox-7.0.12/src/VBox/Installer/linux/routines.sh +Index: VirtualBox-7.0.14/src/VBox/Installer/linux/routines.sh =================================================================== ---- VirtualBox-7.0.12.orig/src/VBox/Installer/linux/routines.sh -+++ VirtualBox-7.0.12/src/VBox/Installer/linux/routines.sh +--- VirtualBox-7.0.14.orig/src/VBox/Installer/linux/routines.sh ++++ VirtualBox-7.0.14/src/VBox/Installer/linux/routines.sh @@ -444,7 +444,7 @@ maybe_run_python_bindings_installer() { # the VirtualBox API bindings. Needs to prevent double installs which waste # quite a bit of time. ++++++ remove_vbox_video_build.patch ++++++ --- /var/tmp/diff_new_pack.tuqHJe/_old 2024-01-30 18:25:00.489061245 +0100 +++ /var/tmp/diff_new_pack.tuqHJe/_new 2024-01-30 18:25:00.493061389 +0100 @@ -1,7 +1,7 @@ -Index: VirtualBox-7.0.12/Makefile.kmk +Index: VirtualBox-7.0.14/Makefile.kmk =================================================================== ---- VirtualBox-7.0.12.orig/Makefile.kmk -+++ VirtualBox-7.0.12/Makefile.kmk +--- VirtualBox-7.0.14.orig/Makefile.kmk ++++ VirtualBox-7.0.14/Makefile.kmk @@ -824,7 +824,6 @@ VBOX_CORE_DOXYFILE_INPUT_DIRS = \ src/VBox/Additions/x11/vboxmouse \ src/VBox/Additions/x11/vboxmouse/xorg70 \ @@ -10,10 +10,10 @@ src/VBox/NetworkServices \ src/VBox/NetworkServices/Dhcpd \ src/VBox/NetworkServices/NAT \ -Index: VirtualBox-7.0.12/src/VBox/Additions/x11/vboxvideo/Makefile.kmk +Index: VirtualBox-7.0.14/src/VBox/Additions/x11/vboxvideo/Makefile.kmk =================================================================== ---- VirtualBox-7.0.12.orig/src/VBox/Additions/x11/vboxvideo/Makefile.kmk -+++ VirtualBox-7.0.12/src/VBox/Additions/x11/vboxvideo/Makefile.kmk +--- VirtualBox-7.0.14.orig/src/VBox/Additions/x11/vboxvideo/Makefile.kmk ++++ VirtualBox-7.0.14/src/VBox/Additions/x11/vboxvideo/Makefile.kmk @@ -404,7 +404,8 @@ vboxvideo_drv_118_INCS += $(PATH_ROOT)/s vboxvideo_drv_118_SOURCES := $(vboxvideo_drv_17_SOURCES) vboxvideo_drv_118_LIBS += $(vboxvideo_drv_70_LIBS) @@ -24,10 +24,10 @@ # Build using local X.Org headers. We assume X.Org Server 1.7 or later. DLLS := $(filter-out vboxvideo_drv_%,$(DLLS)) vboxvideo_drv_system SYSMODS := $(filter-out vboxvideo_drv%,$(SYSMODS)) -Index: VirtualBox-7.0.12/src/VBox/Additions/x11/Makefile.kmk +Index: VirtualBox-7.0.14/src/VBox/Additions/x11/Makefile.kmk =================================================================== ---- VirtualBox-7.0.12.orig/src/VBox/Additions/x11/Makefile.kmk -+++ VirtualBox-7.0.12/src/VBox/Additions/x11/Makefile.kmk +--- VirtualBox-7.0.14.orig/src/VBox/Additions/x11/Makefile.kmk ++++ VirtualBox-7.0.14/src/VBox/Additions/x11/Makefile.kmk @@ -32,7 +32,7 @@ include $(KBUILD_PATH)/subheader.kmk if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris) include $(PATH_SUB_CURRENT)/VBoxClient/Makefile.kmk ++++++ security_fixes.patch ++++++ --- /var/tmp/diff_new_pack.tuqHJe/_old 2024-01-30 18:25:00.505061822 +0100 +++ /var/tmp/diff_new_pack.tuqHJe/_new 2024-01-30 18:25:00.505061822 +0100 @@ -5,10 +5,10 @@ # # January 31, 2019 - Larry Finger # -Index: VirtualBox-7.0.12/src/VBox/Additions/linux/installer/vboxadd.sh +Index: VirtualBox-7.0.14/src/VBox/Additions/linux/installer/vboxadd.sh =================================================================== ---- VirtualBox-7.0.12.orig/src/VBox/Additions/linux/installer/vboxadd.sh -+++ VirtualBox-7.0.12/src/VBox/Additions/linux/installer/vboxadd.sh +--- VirtualBox-7.0.14.orig/src/VBox/Additions/linux/installer/vboxadd.sh ++++ VirtualBox-7.0.14/src/VBox/Additions/linux/installer/vboxadd.sh @@ -1228,9 +1228,11 @@ dmnstatus() fi } @@ -24,10 +24,10 @@ case "$1" in # Does setup without clean-up first and marks all kernels currently found on the # system so that we can see later if any were added. -Index: VirtualBox-7.0.12/src/VBox/Installer/linux/vboxdrv.sh +Index: VirtualBox-7.0.14/src/VBox/Installer/linux/vboxdrv.sh =================================================================== ---- VirtualBox-7.0.12.orig/src/VBox/Installer/linux/vboxdrv.sh -+++ VirtualBox-7.0.12/src/VBox/Installer/linux/vboxdrv.sh +--- VirtualBox-7.0.14.orig/src/VBox/Installer/linux/vboxdrv.sh ++++ VirtualBox-7.0.14/src/VBox/Installer/linux/vboxdrv.sh @@ -48,6 +48,9 @@ DEVICE=/dev/vboxdrv MODPROBE=/sbin/modprobe SCRIPTNAME=vboxdrv.sh ++++++ smap.diff ++++++ --- /var/tmp/diff_new_pack.tuqHJe/_old 2024-01-30 18:25:00.517062255 +0100 +++ /var/tmp/diff_new_pack.tuqHJe/_new 2024-01-30 18:25:00.521062399 +0100 @@ -1,7 +1,7 @@ -Index: VirtualBox-7.0.12/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c +Index: VirtualBox-7.0.14/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c =================================================================== ---- VirtualBox-7.0.12.orig/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c -+++ VirtualBox-7.0.12/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c +--- VirtualBox-7.0.14.orig/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c ++++ VirtualBox-7.0.14/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c @@ -61,6 +61,12 @@ # include <iprt/power.h> # define VBOX_WITH_SUSPEND_NOTIFICATION ++++++ turn_off_cloud_net.patch ++++++ --- /var/tmp/diff_new_pack.tuqHJe/_old 2024-01-30 18:25:00.533062832 +0100 +++ /var/tmp/diff_new_pack.tuqHJe/_new 2024-01-30 18:25:00.537062977 +0100 @@ -1,7 +1,7 @@ -Index: VirtualBox-7.0.12/Config.kmk +Index: VirtualBox-7.0.14/Config.kmk =================================================================== ---- VirtualBox-7.0.12.orig/Config.kmk -+++ VirtualBox-7.0.12/Config.kmk +--- VirtualBox-7.0.14.orig/Config.kmk ++++ VirtualBox-7.0.14/Config.kmk @@ -981,11 +981,9 @@ if1of ($(KBUILD_TARGET), freebsd linux) endif # Use new VBoxNetDhcpd instead of old VBoxNetDHCP ++++++ vbox-default-os-type.diff ++++++ --- /var/tmp/diff_new_pack.tuqHJe/_old 2024-01-30 18:25:00.569064131 +0100 +++ /var/tmp/diff_new_pack.tuqHJe/_new 2024-01-30 18:25:00.573064275 +0100 @@ -1,7 +1,7 @@ -Index: VirtualBox-7.0.12/src/VBox/Frontends/VirtualBox/src/settings/editors/UINameAndSystemEditor.cpp +Index: VirtualBox-7.0.14/src/VBox/Frontends/VirtualBox/src/settings/editors/UINameAndSystemEditor.cpp =================================================================== ---- VirtualBox-7.0.12.orig/src/VBox/Frontends/VirtualBox/src/settings/editors/UINameAndSystemEditor.cpp -+++ VirtualBox-7.0.12/src/VBox/Frontends/VirtualBox/src/settings/editors/UINameAndSystemEditor.cpp +--- VirtualBox-7.0.14.orig/src/VBox/Frontends/VirtualBox/src/settings/editors/UINameAndSystemEditor.cpp ++++ VirtualBox-7.0.14/src/VBox/Frontends/VirtualBox/src/settings/editors/UINameAndSystemEditor.cpp @@ -397,15 +397,15 @@ void UINameAndSystemEditor::sltFamilyCha if (iIndexWin10 != -1) m_pComboType->setCurrentIndex(iIndexWin10); ++++++ vbox-deprec-gsoap-service-proxies.diff ++++++ --- /var/tmp/diff_new_pack.tuqHJe/_old 2024-01-30 18:25:00.589064853 +0100 +++ /var/tmp/diff_new_pack.tuqHJe/_new 2024-01-30 18:25:00.593064997 +0100 @@ -1,7 +1,7 @@ -Index: VirtualBox-7.0.12/src/VBox/Main/webservice/Makefile.kmk +Index: VirtualBox-7.0.14/src/VBox/Main/webservice/Makefile.kmk =================================================================== ---- VirtualBox-7.0.12.orig/src/VBox/Main/webservice/Makefile.kmk -+++ VirtualBox-7.0.12/src/VBox/Main/webservice/Makefile.kmk +--- VirtualBox-7.0.14.orig/src/VBox/Main/webservice/Makefile.kmk ++++ VirtualBox-7.0.14/src/VBox/Main/webservice/Makefile.kmk @@ -848,7 +848,7 @@ ifdef VBOX_GSOAP_INSTALLED $(RECOMPILE_ON_MAKEFILE_CURRENT) | $$(dir $$@) $(call MSG_GENERATE,,lots of files,$(GSOAPH_RELEVANT)) ++++++ vbox-disable-updates.diff ++++++ --- /var/tmp/diff_new_pack.tuqHJe/_old 2024-01-30 18:25:00.609065574 +0100 +++ /var/tmp/diff_new_pack.tuqHJe/_new 2024-01-30 18:25:00.621066007 +0100 @@ -1,7 +1,7 @@ -Index: VirtualBox-7.0.12/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp +Index: VirtualBox-7.0.14/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp =================================================================== ---- VirtualBox-7.0.12.orig/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp -+++ VirtualBox-7.0.12/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp +--- VirtualBox-7.0.14.orig/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp ++++ VirtualBox-7.0.14/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp @@ -99,8 +99,6 @@ void UISettingsDialogGlobal::retranslate m_pSelector->setItemText(GlobalSettingsPageType_Input, tr("Input")); ++++++ vbox-fpie.diff ++++++ --- /var/tmp/diff_new_pack.tuqHJe/_old 2024-01-30 18:25:00.645066873 +0100 +++ /var/tmp/diff_new_pack.tuqHJe/_new 2024-01-30 18:25:00.649067017 +0100 @@ -1,8 +1,8 @@ -Index: VirtualBox-7.0.12/Config.kmk +Index: VirtualBox-7.0.14/Config.kmk =================================================================== ---- VirtualBox-7.0.12.orig/Config.kmk -+++ VirtualBox-7.0.12/Config.kmk -@@ -6778,6 +6778,9 @@ TEMPLATE_VBoxR3HardenedExe_LDFLAGS.darwi +--- VirtualBox-7.0.14.orig/Config.kmk ++++ VirtualBox-7.0.14/Config.kmk +@@ -6777,6 +6777,9 @@ TEMPLATE_VBoxR3HardenedExe_LDFLAGS.darwi ifeq ($(KBUILD_TARGET),linux) # not necessary except USE_LIB_PCAP is defined in SUPR3HardenedMain.cpp # TEMPLATE_VBoxR3HardenedExe_LIBS += cap @@ -12,7 +12,7 @@ endif ifeq ($(KBUILD_TARGET),win) # No CRT! TEMPLATE_VBoxR3HardenedExe_SDKS = VBoxNtDll $(TEMPLATE_VBoxR3Exe_SDKS) -@@ -6810,8 +6813,8 @@ ifeq ($(KBUILD_TARGET),win) # No CRT! +@@ -6809,8 +6812,8 @@ ifeq ($(KBUILD_TARGET),win) # No CRT! TEMPLATE_VBoxR3HardenedExe_VBOX_IMPORT_CHECKER.win = noimports else ifn1of ($(KBUILD_TARGET), os2) ifneq ($(KBUILD_TYPE),asan) # Keep RPATH in asan builds so we can find libasan.so.X and libubsan.so.Y. ++++++ vbox-gsoapssl-deps.diff ++++++ --- /var/tmp/diff_new_pack.tuqHJe/_old 2024-01-30 18:25:00.669067739 +0100 +++ /var/tmp/diff_new_pack.tuqHJe/_new 2024-01-30 18:25:00.669067739 +0100 @@ -1,7 +1,7 @@ -Index: VirtualBox-7.0.12/src/VBox/Main/webservice/Makefile.kmk +Index: VirtualBox-7.0.14/src/VBox/Main/webservice/Makefile.kmk =================================================================== ---- VirtualBox-7.0.12.orig/src/VBox/Main/webservice/Makefile.kmk -+++ VirtualBox-7.0.12/src/VBox/Main/webservice/Makefile.kmk +--- VirtualBox-7.0.14.orig/src/VBox/Main/webservice/Makefile.kmk ++++ VirtualBox-7.0.14/src/VBox/Main/webservice/Makefile.kmk @@ -412,11 +412,12 @@ ifdef VBOX_GSOAP_INSTALLED endif endif ++++++ vbox-no-build-dates.diff ++++++ --- /var/tmp/diff_new_pack.tuqHJe/_old 2024-01-30 18:25:00.681068172 +0100 +++ /var/tmp/diff_new_pack.tuqHJe/_new 2024-01-30 18:25:00.685068316 +0100 @@ -1,7 +1,7 @@ -Index: VirtualBox-7.0.12/src/VBox/Frontends/VBoxFB/VBoxFB.cpp +Index: VirtualBox-7.0.14/src/VBox/Frontends/VBoxFB/VBoxFB.cpp =================================================================== ---- VirtualBox-7.0.12.orig/src/VBox/Frontends/VBoxFB/VBoxFB.cpp -+++ VirtualBox-7.0.12/src/VBox/Frontends/VBoxFB/VBoxFB.cpp +--- VirtualBox-7.0.14.orig/src/VBox/Frontends/VBoxFB/VBoxFB.cpp ++++ VirtualBox-7.0.14/src/VBox/Frontends/VBoxFB/VBoxFB.cpp @@ -72,7 +72,7 @@ int main(int argc, char *argv[]) printf("VirtualBox DirectFB GUI built %s %s\n" @@ -11,10 +11,10 @@ fputs("\nWARNING! Unmaintained code.\nWARNING! Needs fixing & debugging!\n\n", stdout); -Index: VirtualBox-7.0.12/src/VBox/Runtime/common/string/uniread.cpp +Index: VirtualBox-7.0.14/src/VBox/Runtime/common/string/uniread.cpp =================================================================== ---- VirtualBox-7.0.12.orig/src/VBox/Runtime/common/string/uniread.cpp -+++ VirtualBox-7.0.12/src/VBox/Runtime/common/string/uniread.cpp +--- VirtualBox-7.0.14.orig/src/VBox/Runtime/common/string/uniread.cpp ++++ VirtualBox-7.0.14/src/VBox/Runtime/common/string/uniread.cpp @@ -1049,7 +1049,7 @@ int PrintHeader(const char *argv0, const " * IPRT - Unicode Tables.\n" " *\n" @@ -24,10 +24,10 @@ " */\n" "\n" "/*\n" -Index: VirtualBox-7.0.12/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c +Index: VirtualBox-7.0.14/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c =================================================================== ---- VirtualBox-7.0.12.orig/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c -+++ VirtualBox-7.0.12/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c +--- VirtualBox-7.0.14.orig/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c ++++ VirtualBox-7.0.14/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c @@ -42,16 +42,13 @@ /**************************IDENTITY AND VERSIONING***********************/ /************************************************************************/ @@ -50,10 +50,10 @@ #if !defined(_PRODUCTION) #define _PRODUCTION "" #endif -Index: VirtualBox-7.0.12/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c +Index: VirtualBox-7.0.14/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c =================================================================== ---- VirtualBox-7.0.12.orig/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c -+++ VirtualBox-7.0.12/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c +--- VirtualBox-7.0.14.orig/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c ++++ VirtualBox-7.0.14/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c @@ -44,16 +44,10 @@ #ifndef XP_MAC #include "_pr_bld.h" @@ -73,10 +73,10 @@ #if !defined(_PRODUCTION) #define _PRODUCTION "" #endif -Index: VirtualBox-7.0.12/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c +Index: VirtualBox-7.0.14/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c =================================================================== ---- VirtualBox-7.0.12.orig/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c -+++ VirtualBox-7.0.12/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c +--- VirtualBox-7.0.14.orig/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c ++++ VirtualBox-7.0.14/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c @@ -42,16 +42,13 @@ /**************************IDENTITY AND VERSIONING***********************/ /************************************************************************/ @@ -99,10 +99,10 @@ #if !defined(_PRODUCTION) #define _PRODUCTION "" #endif -Index: VirtualBox-7.0.12/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c +Index: VirtualBox-7.0.14/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c =================================================================== ---- VirtualBox-7.0.12.orig/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c -+++ VirtualBox-7.0.12/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c +--- VirtualBox-7.0.14.orig/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c ++++ VirtualBox-7.0.14/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c @@ -42,16 +42,13 @@ /**************************IDENTITY AND VERSIONING***********************/ /************************************************************************/ @@ -125,10 +125,10 @@ #if !defined(_PRODUCTION) #define _PRODUCTION "" #endif -Index: VirtualBox-7.0.12/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTestApp.cpp +Index: VirtualBox-7.0.14/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTestApp.cpp =================================================================== ---- VirtualBox-7.0.12.orig/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTestApp.cpp -+++ VirtualBox-7.0.12/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTestApp.cpp +--- VirtualBox-7.0.14.orig/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTestApp.cpp ++++ VirtualBox-7.0.14/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTestApp.cpp @@ -327,7 +327,7 @@ static int vboxInitLogging(const char *p #endif "Log opened %s\n", @@ -138,10 +138,10 @@ vrc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szTmp, sizeof(szTmp)); if (RT_SUCCESS(vrc) || vrc == VERR_BUFFER_OVERFLOW) -Index: VirtualBox-7.0.12/src/VBox/Devices/PC/BIOS/bios.c +Index: VirtualBox-7.0.14/src/VBox/Devices/PC/BIOS/bios.c =================================================================== ---- VirtualBox-7.0.12.orig/src/VBox/Devices/PC/BIOS/bios.c -+++ VirtualBox-7.0.12/src/VBox/Devices/PC/BIOS/bios.c +--- VirtualBox-7.0.14.orig/src/VBox/Devices/PC/BIOS/bios.c ++++ VirtualBox-7.0.14/src/VBox/Devices/PC/BIOS/bios.c @@ -164,7 +164,7 @@ void set_mode(uint8_t mode); #define BX_PCIBIOS 1 @@ -151,10 +151,10 @@ //-------------------------------------------------------------------------- // print_bios_banner // displays a the bios version -Index: VirtualBox-7.0.12/src/VBox/Additions/common/VBoxService/VBoxService.cpp +Index: VirtualBox-7.0.14/src/VBox/Additions/common/VBoxService/VBoxService.cpp =================================================================== ---- VirtualBox-7.0.12.orig/src/VBox/Additions/common/VBoxService/VBoxService.cpp -+++ VirtualBox-7.0.12/src/VBox/Additions/common/VBoxService/VBoxService.cpp +--- VirtualBox-7.0.14.orig/src/VBox/Additions/common/VBoxService/VBoxService.cpp ++++ VirtualBox-7.0.14/src/VBox/Additions/common/VBoxService/VBoxService.cpp @@ -255,7 +255,7 @@ static DECLCALLBACK(void) vgsvcLogHeader "VBoxService %s r%s (verbosity: %u) %s (%s %s) release log\n" "Log opened %s\n", @@ -164,10 +164,10 @@ int vrc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szTmp, sizeof(szTmp)); if (RT_SUCCESS(vrc) || vrc == VERR_BUFFER_OVERFLOW) -Index: VirtualBox-7.0.12/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk +Index: VirtualBox-7.0.14/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk =================================================================== ---- VirtualBox-7.0.12.orig/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk -+++ VirtualBox-7.0.12/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk +--- VirtualBox-7.0.14.orig/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk ++++ VirtualBox-7.0.14/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk @@ -193,7 +193,7 @@ $(VBOX_PATH_PACKAGES)/$(VBOX_BUSMOUSE_MA $(VBoxBusMouseIns_0_OUTDIR)/Stage/ExtPack.manifest \ $(VBoxBusMouseIns_0_OUTDIR)/Stage/ExtPack.signature @@ -177,10 +177,10 @@ # Clean up $(RM) -Rf $(VBoxBusMouseIns_0_OUTDIR)/Stage/ -Index: VirtualBox-7.0.12/src/VBox/ExtPacks/Skeleton/Makefile.kmk +Index: VirtualBox-7.0.14/src/VBox/ExtPacks/Skeleton/Makefile.kmk =================================================================== ---- VirtualBox-7.0.12.orig/src/VBox/ExtPacks/Skeleton/Makefile.kmk -+++ VirtualBox-7.0.12/src/VBox/ExtPacks/Skeleton/Makefile.kmk +--- VirtualBox-7.0.14.orig/src/VBox/ExtPacks/Skeleton/Makefile.kmk ++++ VirtualBox-7.0.14/src/VBox/ExtPacks/Skeleton/Makefile.kmk @@ -161,7 +161,7 @@ $(VBOX_PATH_PACKAGES)/$(VBOX_SKELETON_MA $(VBoxSkeletonIns_0_OUTDIR)/Stage/ExtPack.manifest \ $(VBoxSkeletonIns_0_OUTDIR)/Stage/ExtPack.signature @@ -190,10 +190,10 @@ # Clean up $(RM) -Rf $(VBoxSkeletonIns_0_OUTDIR)/Stage/ -Index: VirtualBox-7.0.12/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk +Index: VirtualBox-7.0.14/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk =================================================================== ---- VirtualBox-7.0.12.orig/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk -+++ VirtualBox-7.0.12/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk +--- VirtualBox-7.0.14.orig/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk ++++ VirtualBox-7.0.14/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk @@ -354,7 +354,7 @@ if defined(VBOX_WITH_EXTPACK_VBOXDTRACE) $(VBoxDTraceIns_0_OUTDIR)/Stage/ExtPack.manifest \ $(VBoxDTraceIns_0_OUTDIR)/Stage/ExtPack.signature @@ -203,10 +203,10 @@ # Clean up $(RM) -Rf $(VBoxDTraceIns_0_OUTDIR)/Stage/ -Index: VirtualBox-7.0.12/src/VBox/ExtPacks/VNC/Makefile.kmk +Index: VirtualBox-7.0.14/src/VBox/ExtPacks/VNC/Makefile.kmk =================================================================== ---- VirtualBox-7.0.12.orig/src/VBox/ExtPacks/VNC/Makefile.kmk -+++ VirtualBox-7.0.12/src/VBox/ExtPacks/VNC/Makefile.kmk +--- VirtualBox-7.0.14.orig/src/VBox/ExtPacks/VNC/Makefile.kmk ++++ VirtualBox-7.0.14/src/VBox/ExtPacks/VNC/Makefile.kmk @@ -164,7 +164,7 @@ $(VBOX_PATH_PACKAGES)/$(VBOX_VNC_MANGLED $(VBoxVNCIns_0_OUTDIR)/Stage/ExtPack.manifest \ $(VBoxVNCIns_0_OUTDIR)/Stage/ExtPack.signature @@ -216,10 +216,10 @@ # Clean up $(RM) -Rf $(VBoxVNCIns_0_OUTDIR)/Stage/ -Index: VirtualBox-7.0.12/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp +Index: VirtualBox-7.0.14/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp =================================================================== ---- VirtualBox-7.0.12.orig/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp -+++ VirtualBox-7.0.12/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp +--- VirtualBox-7.0.14.orig/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp ++++ VirtualBox-7.0.14/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp @@ -329,7 +329,7 @@ NTSTATUS DriverEntry(PDRIVER_OBJECT pDrv } VGDrvCommonInitLoggers(); @@ -229,10 +229,10 @@ /* * Check if the NT version is supported and initialize g_enmVGDrvNtVer. -Index: VirtualBox-7.0.12/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp +Index: VirtualBox-7.0.14/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp =================================================================== ---- VirtualBox-7.0.12.orig/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp -+++ VirtualBox-7.0.12/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp +--- VirtualBox-7.0.14.orig/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp ++++ VirtualBox-7.0.14/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp @@ -882,7 +882,7 @@ static DECLCALLBACK(void) vboxGreeterLog "vbox-greeter %s r%s (verbosity: %d) %s (%s %s) release log\n" "Log opened %s\n", @@ -242,10 +242,10 @@ int vrc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szTmp, sizeof(szTmp)); if (RT_SUCCESS(vrc) || vrc == VERR_BUFFER_OVERFLOW) -Index: VirtualBox-7.0.12/src/VBox/Additions/solaris/Mouse/vboxms.c +Index: VirtualBox-7.0.14/src/VBox/Additions/solaris/Mouse/vboxms.c =================================================================== ---- VirtualBox-7.0.12.orig/src/VBox/Additions/solaris/Mouse/vboxms.c -+++ VirtualBox-7.0.12/src/VBox/Additions/solaris/Mouse/vboxms.c +--- VirtualBox-7.0.14.orig/src/VBox/Additions/solaris/Mouse/vboxms.c ++++ VirtualBox-7.0.14/src/VBox/Additions/solaris/Mouse/vboxms.c @@ -266,7 +266,7 @@ static VBMSSTATE g_OpenNodeSt int _init(void) { @@ -255,10 +255,10 @@ mutex_init(&g_OpenNodeState.InitMtx, NULL, MUTEX_DRIVER, NULL); /* * Prevent module autounloading. -Index: VirtualBox-7.0.12/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInfo/VolInfo.c +Index: VirtualBox-7.0.14/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInfo/VolInfo.c =================================================================== ---- VirtualBox-7.0.12.orig/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInfo/VolInfo.c -+++ VirtualBox-7.0.12/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInfo/VolInfo.c +--- VirtualBox-7.0.14.orig/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInfo/VolInfo.c ++++ VirtualBox-7.0.14/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInfo/VolInfo.c @@ -251,10 +251,10 @@ Returns: UTILITY_NAME, UTILITY_MAJOR_VERSION, @@ -272,10 +272,10 @@ Usage (); return -1; } -Index: VirtualBox-7.0.12/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp +Index: VirtualBox-7.0.14/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp =================================================================== ---- VirtualBox-7.0.12.orig/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp -+++ VirtualBox-7.0.12/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp +--- VirtualBox-7.0.14.orig/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp ++++ VirtualBox-7.0.14/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp @@ -128,7 +128,7 @@ static NTSTATUS vboxUsbDdiAddDevice(PDRI static VOID vboxUsbDdiUnload(PDRIVER_OBJECT pDriverObject) { @@ -294,10 +294,10 @@ NTSTATUS Status = vboxUsbRtGlobalsInit(); Assert(Status == STATUS_SUCCESS); -Index: VirtualBox-7.0.12/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp +Index: VirtualBox-7.0.14/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp =================================================================== ---- VirtualBox-7.0.12.orig/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp -+++ VirtualBox-7.0.12/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp +--- VirtualBox-7.0.14.orig/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp ++++ VirtualBox-7.0.14/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp @@ -1518,7 +1518,7 @@ NTSTATUS _stdcall DriverEntry(PDRIVER_OB RTLogDestinations(0, "debugger"); #endif @@ -307,10 +307,10 @@ memset (&g_VBoxUsbMonGlobals, 0, sizeof (g_VBoxUsbMonGlobals)); -Index: VirtualBox-7.0.12/src/VBox/Main/glue/VBoxLogRelCreate.cpp +Index: VirtualBox-7.0.14/src/VBox/Main/glue/VBoxLogRelCreate.cpp =================================================================== ---- VirtualBox-7.0.12.orig/src/VBox/Main/glue/VBoxLogRelCreate.cpp -+++ VirtualBox-7.0.12/src/VBox/Main/glue/VBoxLogRelCreate.cpp +--- VirtualBox-7.0.14.orig/src/VBox/Main/glue/VBoxLogRelCreate.cpp ++++ VirtualBox-7.0.14/src/VBox/Main/glue/VBoxLogRelCreate.cpp @@ -71,7 +71,7 @@ static DECLCALLBACK(void) vboxHeaderFoot #endif "Log opened %s\n", @@ -320,10 +320,10 @@ pfnLog(pReleaseLogger, "Build Type: %s\n", KBUILD_TYPE); int vrc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szTmp, sizeof(szTmp)); -Index: VirtualBox-7.0.12/src/libs/xpcom18a4/nsprpub/pr/tests/depend.c +Index: VirtualBox-7.0.14/src/libs/xpcom18a4/nsprpub/pr/tests/depend.c =================================================================== ---- VirtualBox-7.0.12.orig/src/libs/xpcom18a4/nsprpub/pr/tests/depend.c -+++ VirtualBox-7.0.12/src/libs/xpcom18a4/nsprpub/pr/tests/depend.c +--- VirtualBox-7.0.14.orig/src/libs/xpcom18a4/nsprpub/pr/tests/depend.c ++++ VirtualBox-7.0.14/src/libs/xpcom18a4/nsprpub/pr/tests/depend.c @@ -141,7 +141,7 @@ int main(int argc, char **argv) { PRIntn tab = 0; @@ -333,10 +333,10 @@ printf("Depend.c build time is %s %s\n", buildDate, buildTime); -Index: VirtualBox-7.0.12/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/profile_main.cpp +Index: VirtualBox-7.0.14/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/profile_main.cpp =================================================================== ---- VirtualBox-7.0.12.orig/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/profile_main.cpp -+++ VirtualBox-7.0.12/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/profile_main.cpp +--- VirtualBox-7.0.14.orig/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/profile_main.cpp ++++ VirtualBox-7.0.14/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/profile_main.cpp @@ -458,7 +458,7 @@ int main() { @@ -346,10 +346,10 @@ #ifdef TEST_STD_STRING cout << "Testing std::string." << endl; #else -Index: VirtualBox-7.0.12/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/test_main.cpp +Index: VirtualBox-7.0.14/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/test_main.cpp =================================================================== ---- VirtualBox-7.0.12.orig/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/test_main.cpp -+++ VirtualBox-7.0.12/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/test_main.cpp +--- VirtualBox-7.0.14.orig/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/test_main.cpp ++++ VirtualBox-7.0.14/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/test_main.cpp @@ -425,7 +425,7 @@ int main() { @@ -359,10 +359,10 @@ #if 0 { -Index: VirtualBox-7.0.12/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp +Index: VirtualBox-7.0.14/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp =================================================================== ---- VirtualBox-7.0.12.orig/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp -+++ VirtualBox-7.0.12/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp +--- VirtualBox-7.0.14.orig/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp ++++ VirtualBox-7.0.14/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp @@ -102,7 +102,7 @@ class test_message public: test_message() @@ -372,10 +372,10 @@ } ~test_message() -Index: VirtualBox-7.0.12/src/VBox/Additions/3D/mesa/mesa-21.3.8/src/util/build_id.c +Index: VirtualBox-7.0.14/src/VBox/Additions/3D/mesa/mesa-21.3.8/src/util/build_id.c =================================================================== ---- VirtualBox-7.0.12.orig/src/VBox/Additions/3D/mesa/mesa-21.3.8/src/util/build_id.c -+++ VirtualBox-7.0.12/src/VBox/Additions/3D/mesa/mesa-21.3.8/src/util/build_id.c +--- VirtualBox-7.0.14.orig/src/VBox/Additions/3D/mesa/mesa-21.3.8/src/util/build_id.c ++++ VirtualBox-7.0.14/src/VBox/Additions/3D/mesa/mesa-21.3.8/src/util/build_id.c @@ -30,9 +30,8 @@ #include "build_id.h" #include "macros.h" @@ -387,10 +387,10 @@ #ifndef ElfW #define ElfW(type) Elf_##type -Index: VirtualBox-7.0.12/src/VBox/Additions/x11/VBoxClient/logging.cpp +Index: VirtualBox-7.0.14/src/VBox/Additions/x11/VBoxClient/logging.cpp =================================================================== ---- VirtualBox-7.0.12.orig/src/VBox/Additions/x11/VBoxClient/logging.cpp -+++ VirtualBox-7.0.12/src/VBox/Additions/x11/VBoxClient/logging.cpp +--- VirtualBox-7.0.14.orig/src/VBox/Additions/x11/VBoxClient/logging.cpp ++++ VirtualBox-7.0.14/src/VBox/Additions/x11/VBoxClient/logging.cpp @@ -328,10 +328,10 @@ static DECLCALLBACK(void) vbClLogHeaderF case RTLOGPHASE_BEGIN: { ++++++ vbox-permissions_warning.diff ++++++ --- /var/tmp/diff_new_pack.tuqHJe/_old 2024-01-30 18:25:00.697068749 +0100 +++ /var/tmp/diff_new_pack.tuqHJe/_new 2024-01-30 18:25:00.701068894 +0100 @@ -1,7 +1,7 @@ -Index: VirtualBox-7.0.12/src/apps/Makefile.kmk +Index: VirtualBox-7.0.14/src/apps/Makefile.kmk =================================================================== ---- VirtualBox-7.0.12.orig/src/apps/Makefile.kmk -+++ VirtualBox-7.0.12/src/apps/Makefile.kmk +--- VirtualBox-7.0.14.orig/src/apps/Makefile.kmk ++++ VirtualBox-7.0.14/src/apps/Makefile.kmk @@ -28,5 +28,7 @@ SUB_DEPTH = ../.. include $(KBUILD_PATH)/subheader.kmk @@ -10,10 +10,10 @@ + include $(FILE_KBUILD_SUB_FOOTER) -Index: VirtualBox-7.0.12/src/apps/VBoxPermissionMessage/Makefile.kmk +Index: VirtualBox-7.0.14/src/apps/VBoxPermissionMessage/Makefile.kmk =================================================================== --- /dev/null -+++ VirtualBox-7.0.12/src/apps/VBoxPermissionMessage/Makefile.kmk ++++ VirtualBox-7.0.14/src/apps/VBoxPermissionMessage/Makefile.kmk @@ -0,0 +1,32 @@ +# $Id: Makefile.kmk 28800 2010-04-27 08:22:32Z vboxsync $ +## @file @@ -47,10 +47,10 @@ + +include $(KBUILD_PATH)/subfooter.kmk + -Index: VirtualBox-7.0.12/src/apps/VBoxPermissionMessage/VBoxPermissionMessage.cpp +Index: VirtualBox-7.0.14/src/apps/VBoxPermissionMessage/VBoxPermissionMessage.cpp =================================================================== --- /dev/null -+++ VirtualBox-7.0.12/src/apps/VBoxPermissionMessage/VBoxPermissionMessage.cpp ++++ VirtualBox-7.0.14/src/apps/VBoxPermissionMessage/VBoxPermissionMessage.cpp @@ -0,0 +1,12 @@ +#include <QtWidgets/QApplication> +#include <QtWidgets/QMessageBox> ++++++ vbox-python-py310.patch ++++++ --- /var/tmp/diff_new_pack.tuqHJe/_old 2024-01-30 18:25:00.713069327 +0100 +++ /var/tmp/diff_new_pack.tuqHJe/_new 2024-01-30 18:25:00.717069471 +0100 @@ -1,9 +1,9 @@ # https://www.virtualbox.org/changeset/90537/vbox -Index: VirtualBox-7.0.12/src/libs/xpcom18a4/python/Makefile.kmk +Index: VirtualBox-7.0.14/src/libs/xpcom18a4/python/Makefile.kmk =================================================================== ---- VirtualBox-7.0.12.orig/src/libs/xpcom18a4/python/Makefile.kmk -+++ VirtualBox-7.0.12/src/libs/xpcom18a4/python/Makefile.kmk +--- VirtualBox-7.0.14.orig/src/libs/xpcom18a4/python/Makefile.kmk ++++ VirtualBox-7.0.14/src/libs/xpcom18a4/python/Makefile.kmk @@ -642,11 +642,57 @@ ifndef VBOX_ONLY_SDK VBoxPython3_12_x86_LIBS = $(VBOX_PYTHON312_LIB_X86) endif ++++++ vbox-python-selection.patch ++++++ --- /var/tmp/diff_new_pack.tuqHJe/_old 2024-01-30 18:25:00.729069903 +0100 +++ /var/tmp/diff_new_pack.tuqHJe/_new 2024-01-30 18:25:00.733070048 +0100 @@ -1,7 +1,7 @@ -Index: VirtualBox-7.0.12/src/bldprogs/scm.cpp +Index: VirtualBox-7.0.14/src/bldprogs/scm.cpp =================================================================== ---- VirtualBox-7.0.12.orig/src/bldprogs/scm.cpp -+++ VirtualBox-7.0.12/src/bldprogs/scm.cpp +--- VirtualBox-7.0.14.orig/src/bldprogs/scm.cpp ++++ VirtualBox-7.0.14/src/bldprogs/scm.cpp @@ -2367,7 +2367,7 @@ static int scmProcessFileInner(PSCMRWSTA pszTreatAs = "shell"; else if ( (cchFirst >= 15 && strncmp(pchFirst, "/usr/bin/python", 15) == 0) @@ -11,10 +11,10 @@ else if ( (cchFirst >= 13 && strncmp(pchFirst, "/usr/bin/perl", 13) == 0) || (cchFirst >= 17 && strncmp(pchFirst, "/usr/bin/env perl", 17) == 0) ) pszTreatAs = "perl"; -Index: VirtualBox-7.0.12/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec +Index: VirtualBox-7.0.14/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec =================================================================== ---- VirtualBox-7.0.12.orig/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec -+++ VirtualBox-7.0.12/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec +--- VirtualBox-7.0.14.orig/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec ++++ VirtualBox-7.0.14/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec @@ -32,6 +32,9 @@ %define VBOXDOCDIR %{_defaultdocdir}/%NAME% %global __requires_exclude_from ^/usr/lib/virtualbox/VBoxPython.*$|^/usr/lib/python.*$|^.*\\.py$ @@ -25,10 +25,10 @@ Summary: Oracle VM VirtualBox Name: %NAME% -Index: VirtualBox-7.0.12/src/libs/libxml2-2.9.14/libxml.spec.in +Index: VirtualBox-7.0.14/src/libs/libxml2-2.9.14/libxml.spec.in =================================================================== ---- VirtualBox-7.0.12.orig/src/libs/libxml2-2.9.14/libxml.spec.in -+++ VirtualBox-7.0.12/src/libs/libxml2-2.9.14/libxml.spec.in +--- VirtualBox-7.0.14.orig/src/libs/libxml2-2.9.14/libxml.spec.in ++++ VirtualBox-7.0.14/src/libs/libxml2-2.9.14/libxml.spec.in @@ -1,3 +1,4 @@ +%global with_python2 0 %global with_python3 1 @@ -93,10 +93,10 @@ %if 0%{?with_python3} %files -n python3-%{name} -Index: VirtualBox-7.0.12/src/libs/xpcom18a4/python/src/ErrorUtils.cpp +Index: VirtualBox-7.0.14/src/libs/xpcom18a4/python/src/ErrorUtils.cpp =================================================================== ---- VirtualBox-7.0.12.orig/src/libs/xpcom18a4/python/src/ErrorUtils.cpp -+++ VirtualBox-7.0.12/src/libs/xpcom18a4/python/src/ErrorUtils.cpp +--- VirtualBox-7.0.14.orig/src/libs/xpcom18a4/python/src/ErrorUtils.cpp ++++ VirtualBox-7.0.14/src/libs/xpcom18a4/python/src/ErrorUtils.cpp @@ -438,7 +438,9 @@ char *PyTraceback_AsString(PyObject *exc { // a temp scope so I can use temp locals. @@ -108,10 +108,10 @@ #else /* PyUnicode_AsUTF8() is const char * as of Python 3.7, char * earlier. */ const char *tempResult = (const char *)PyUnicode_AsUTF8(obResult); -Index: VirtualBox-7.0.12/src/libs/xpcom18a4/python/src/PyGBase.cpp +Index: VirtualBox-7.0.14/src/libs/xpcom18a4/python/src/PyGBase.cpp =================================================================== ---- VirtualBox-7.0.12.orig/src/libs/xpcom18a4/python/src/PyGBase.cpp -+++ VirtualBox-7.0.12/src/libs/xpcom18a4/python/src/PyGBase.cpp +--- VirtualBox-7.0.14.orig/src/libs/xpcom18a4/python/src/PyGBase.cpp ++++ VirtualBox-7.0.14/src/libs/xpcom18a4/python/src/PyGBase.cpp @@ -183,7 +183,11 @@ PyG_Base::~PyG_Base() // Get the correct interface pointer for this object given the IID. void *PyG_Base::ThisAsIID( const nsIID &iid ) @@ -125,10 +125,10 @@ if (iid.Equals(NS_GET_IID(nsISupports))) return (nsISupports *)(nsIInternalPython *)this; if (iid.Equals(NS_GET_IID(nsISupportsWeakReference))) -Index: VirtualBox-7.0.12/src/libs/xpcom18a4/python/gen_python_deps.py +Index: VirtualBox-7.0.14/src/libs/xpcom18a4/python/gen_python_deps.py =================================================================== ---- VirtualBox-7.0.12.orig/src/libs/xpcom18a4/python/gen_python_deps.py -+++ VirtualBox-7.0.12/src/libs/xpcom18a4/python/gen_python_deps.py +--- VirtualBox-7.0.14.orig/src/libs/xpcom18a4/python/gen_python_deps.py ++++ VirtualBox-7.0.14/src/libs/xpcom18a4/python/gen_python_deps.py @@ -96,7 +96,7 @@ def main(argv): else: multi = 1 ++++++ vbox-smc-napa.diff ++++++ --- /var/tmp/diff_new_pack.tuqHJe/_old 2024-01-30 18:25:00.749070625 +0100 +++ /var/tmp/diff_new_pack.tuqHJe/_new 2024-01-30 18:25:00.749070625 +0100 @@ -1,7 +1,7 @@ -Index: VirtualBox-7.0.12/src/VBox/Devices/PC/vbox.dsl +Index: VirtualBox-7.0.14/src/VBox/Devices/PC/vbox.dsl =================================================================== ---- VirtualBox-7.0.12.orig/src/VBox/Devices/PC/vbox.dsl -+++ VirtualBox-7.0.12/src/VBox/Devices/PC/vbox.dsl +--- VirtualBox-7.0.14.orig/src/VBox/Devices/PC/vbox.dsl ++++ VirtualBox-7.0.14/src/VBox/Devices/PC/vbox.dsl @@ -1225,7 +1225,7 @@ DefinitionBlock ("DSDT.aml", "DSDT", 2, Device (SMC) { ++++++ vbox-suid-warning.diff ++++++ --- /var/tmp/diff_new_pack.tuqHJe/_old 2024-01-30 18:25:00.765071202 +0100 +++ /var/tmp/diff_new_pack.tuqHJe/_new 2024-01-30 18:25:00.769071347 +0100 @@ -1,7 +1,7 @@ -Index: VirtualBox-7.0.12/src/apps/Makefile.kmk +Index: VirtualBox-7.0.14/src/apps/Makefile.kmk =================================================================== ---- VirtualBox-7.0.12.orig/src/apps/Makefile.kmk -+++ VirtualBox-7.0.12/src/apps/Makefile.kmk +--- VirtualBox-7.0.14.orig/src/apps/Makefile.kmk ++++ VirtualBox-7.0.14/src/apps/Makefile.kmk @@ -32,5 +32,7 @@ include $(PATH_SUB_CURRENT)/VBoxPermissi include $(PATH_SUB_CURRENT)/VBoxUSB_DevRules/Makefile.kmk @@ -10,10 +10,10 @@ + include $(FILE_KBUILD_SUB_FOOTER) -Index: VirtualBox-7.0.12/src/apps/VBoxSUIDMessage/Makefile.kmk +Index: VirtualBox-7.0.14/src/apps/VBoxSUIDMessage/Makefile.kmk =================================================================== --- /dev/null -+++ VirtualBox-7.0.12/src/apps/VBoxSUIDMessage/Makefile.kmk ++++ VirtualBox-7.0.14/src/apps/VBoxSUIDMessage/Makefile.kmk @@ -0,0 +1,33 @@ +# $Id: Makefile.kmk 28800 2010-04-27 08:22:32Z vboxsync $ +## @file @@ -48,10 +48,10 @@ +include $(KBUILD_PATH)/subfooter.kmk + + -Index: VirtualBox-7.0.12/src/apps/VBoxSUIDMessage/VBoxSUIDMessage.cpp +Index: VirtualBox-7.0.14/src/apps/VBoxSUIDMessage/VBoxSUIDMessage.cpp =================================================================== --- /dev/null -+++ VirtualBox-7.0.12/src/apps/VBoxSUIDMessage/VBoxSUIDMessage.cpp ++++ VirtualBox-7.0.14/src/apps/VBoxSUIDMessage/VBoxSUIDMessage.cpp @@ -0,0 +1,15 @@ +#include <QtWidgets/QApplication> +#include <QtWidgets/QMessageBox> ++++++ vbox-usb-warning.diff ++++++ --- /var/tmp/diff_new_pack.tuqHJe/_old 2024-01-30 18:25:00.785071924 +0100 +++ /var/tmp/diff_new_pack.tuqHJe/_new 2024-01-30 18:25:00.789072068 +0100 @@ -1,7 +1,7 @@ -Index: VirtualBox-7.0.12/src/apps/Makefile.kmk +Index: VirtualBox-7.0.14/src/apps/Makefile.kmk =================================================================== ---- VirtualBox-7.0.12.orig/src/apps/Makefile.kmk -+++ VirtualBox-7.0.12/src/apps/Makefile.kmk +--- VirtualBox-7.0.14.orig/src/apps/Makefile.kmk ++++ VirtualBox-7.0.14/src/apps/Makefile.kmk @@ -30,5 +30,7 @@ include $(KBUILD_PATH)/subheader.kmk include $(PATH_SUB_CURRENT)/VBoxPermissionMessage/Makefile.kmk @@ -10,10 +10,10 @@ + include $(FILE_KBUILD_SUB_FOOTER) -Index: VirtualBox-7.0.12/src/apps/VBoxUSB_DevRules/Makefile.kmk +Index: VirtualBox-7.0.14/src/apps/VBoxUSB_DevRules/Makefile.kmk =================================================================== --- /dev/null -+++ VirtualBox-7.0.12/src/apps/VBoxUSB_DevRules/Makefile.kmk ++++ VirtualBox-7.0.14/src/apps/VBoxUSB_DevRules/Makefile.kmk @@ -0,0 +1,30 @@ +# $Id: Makefile.kmk 28800 2010-04-27 08:22:32Z vboxsync $ +## @file @@ -45,10 +45,10 @@ +include $(KBUILD_PATH)/subfooter.kmk + + -Index: VirtualBox-7.0.12/src/apps/VBoxUSB_DevRules/VBoxUSB_DevRules.cpp +Index: VirtualBox-7.0.14/src/apps/VBoxUSB_DevRules/VBoxUSB_DevRules.cpp =================================================================== --- /dev/null -+++ VirtualBox-7.0.12/src/apps/VBoxUSB_DevRules/VBoxUSB_DevRules.cpp ++++ VirtualBox-7.0.14/src/apps/VBoxUSB_DevRules/VBoxUSB_DevRules.cpp @@ -0,0 +1,25 @@ +#include <QtWidgets/QApplication> +#include <QtWidgets/QMessageBox> ++++++ vbox-vboxadd-init-script.diff ++++++ --- /var/tmp/diff_new_pack.tuqHJe/_old 2024-01-30 18:25:00.801072501 +0100 +++ /var/tmp/diff_new_pack.tuqHJe/_new 2024-01-30 18:25:00.801072501 +0100 @@ -1,7 +1,7 @@ -Index: VirtualBox-7.0.12/src/VBox/Additions/linux/installer/vboxadd.sh +Index: VirtualBox-7.0.14/src/VBox/Additions/linux/installer/vboxadd.sh =================================================================== ---- VirtualBox-7.0.12.orig/src/VBox/Additions/linux/installer/vboxadd.sh -+++ VirtualBox-7.0.12/src/VBox/Additions/linux/installer/vboxadd.sh +--- VirtualBox-7.0.14.orig/src/VBox/Additions/linux/installer/vboxadd.sh ++++ VirtualBox-7.0.14/src/VBox/Additions/linux/installer/vboxadd.sh @@ -36,11 +36,14 @@ # Provides: vboxadd # Required-Start: @@ -133,10 +133,10 @@ fi rm -f /sbin/mount.vboxsf 2>/dev/null rm -f /etc/udev/rules.d/60-vboxadd.rules 2>/dev/null -Index: VirtualBox-7.0.12/src/VBox/Additions/linux/installer/vboxadd-service.sh +Index: VirtualBox-7.0.14/src/VBox/Additions/linux/installer/vboxadd-service.sh =================================================================== ---- VirtualBox-7.0.12.orig/src/VBox/Additions/linux/installer/vboxadd-service.sh -+++ VirtualBox-7.0.12/src/VBox/Additions/linux/installer/vboxadd-service.sh +--- VirtualBox-7.0.14.orig/src/VBox/Additions/linux/installer/vboxadd-service.sh ++++ VirtualBox-7.0.14/src/VBox/Additions/linux/installer/vboxadd-service.sh @@ -36,7 +36,7 @@ # Provides: vboxadd-service # Required-Start: vboxadd @@ -146,10 +146,10 @@ # Default-Stop: 0 1 6 # X-Conflicts-With: systemd-timesyncd.service # Description: VirtualBox Additions Service -Index: VirtualBox-7.0.12/src/VBox/Installer/linux/vboxautostart-service.sh +Index: VirtualBox-7.0.14/src/VBox/Installer/linux/vboxautostart-service.sh =================================================================== ---- VirtualBox-7.0.12.orig/src/VBox/Installer/linux/vboxautostart-service.sh -+++ VirtualBox-7.0.12/src/VBox/Installer/linux/vboxautostart-service.sh +--- VirtualBox-7.0.14.orig/src/VBox/Installer/linux/vboxautostart-service.sh ++++ VirtualBox-7.0.14/src/VBox/Installer/linux/vboxautostart-service.sh @@ -33,7 +33,7 @@ # Provides: vboxautostart-service # Required-Start: vboxdrv @@ -159,10 +159,10 @@ # Default-Stop: 0 1 6 # Description: VirtualBox autostart service ### END INIT INFO -Index: VirtualBox-7.0.12/src/VBox/Installer/linux/vboxballoonctrl-service.sh +Index: VirtualBox-7.0.14/src/VBox/Installer/linux/vboxballoonctrl-service.sh =================================================================== ---- VirtualBox-7.0.12.orig/src/VBox/Installer/linux/vboxballoonctrl-service.sh -+++ VirtualBox-7.0.12/src/VBox/Installer/linux/vboxballoonctrl-service.sh +--- VirtualBox-7.0.14.orig/src/VBox/Installer/linux/vboxballoonctrl-service.sh ++++ VirtualBox-7.0.14/src/VBox/Installer/linux/vboxballoonctrl-service.sh @@ -33,7 +33,7 @@ # Provides: vboxballoonctrl-service # Required-Start: vboxdrv @@ -172,10 +172,10 @@ # Default-Stop: 0 1 6 # Description: VirtualBox watchdog daemon ### END INIT INFO -Index: VirtualBox-7.0.12/src/VBox/ValidationKit/testboxscript/linux/testboxscript-service.sh +Index: VirtualBox-7.0.14/src/VBox/ValidationKit/testboxscript/linux/testboxscript-service.sh =================================================================== ---- VirtualBox-7.0.12.orig/src/VBox/ValidationKit/testboxscript/linux/testboxscript-service.sh -+++ VirtualBox-7.0.12/src/VBox/ValidationKit/testboxscript/linux/testboxscript-service.sh +--- VirtualBox-7.0.14.orig/src/VBox/ValidationKit/testboxscript/linux/testboxscript-service.sh ++++ VirtualBox-7.0.14/src/VBox/ValidationKit/testboxscript/linux/testboxscript-service.sh @@ -41,7 +41,7 @@ # Provides: testboxscript-service # Required-Start: $network @@ -185,10 +185,10 @@ # Default-Stop: 0 1 6 # Description: TestBoxScript service ### END INIT INFO -Index: VirtualBox-7.0.12/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs-nat.sh +Index: VirtualBox-7.0.14/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs-nat.sh =================================================================== ---- VirtualBox-7.0.12.orig/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs-nat.sh -+++ VirtualBox-7.0.12/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs-nat.sh +--- VirtualBox-7.0.14.orig/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs-nat.sh ++++ VirtualBox-7.0.14/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs-nat.sh @@ -41,7 +41,7 @@ # Provides: vboxtxs # Required-Start: $network @@ -198,10 +198,10 @@ # Default-Stop: 0 1 6 # Description: VirtualBox Test Execution Service ### END INIT INFO -Index: VirtualBox-7.0.12/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs.sh +Index: VirtualBox-7.0.14/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs.sh =================================================================== ---- VirtualBox-7.0.12.orig/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs.sh -+++ VirtualBox-7.0.12/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs.sh +--- VirtualBox-7.0.14.orig/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs.sh ++++ VirtualBox-7.0.14/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs.sh @@ -41,7 +41,7 @@ # Provides: vboxtxs # Required-Start: $network ++++++ vbox-vboxdrv-init-script.diff ++++++ --- /var/tmp/diff_new_pack.tuqHJe/_old 2024-01-30 18:25:00.817073078 +0100 +++ /var/tmp/diff_new_pack.tuqHJe/_new 2024-01-30 18:25:00.817073078 +0100 @@ -1,7 +1,7 @@ -Index: VirtualBox-7.0.12/src/VBox/Installer/linux/vboxdrv.sh +Index: VirtualBox-7.0.14/src/VBox/Installer/linux/vboxdrv.sh =================================================================== ---- VirtualBox-7.0.12.orig/src/VBox/Installer/linux/vboxdrv.sh -+++ VirtualBox-7.0.12/src/VBox/Installer/linux/vboxdrv.sh +--- VirtualBox-7.0.14.orig/src/VBox/Installer/linux/vboxdrv.sh ++++ VirtualBox-7.0.14/src/VBox/Installer/linux/vboxdrv.sh @@ -29,11 +29,12 @@ # ### BEGIN INIT INFO @@ -66,10 +66,10 @@ # Sign kernel modules if kernel configuration requires it. if test "$(kernel_requires_module_signature)" = "1"; then -Index: VirtualBox-7.0.12/Config.kmk +Index: VirtualBox-7.0.14/Config.kmk =================================================================== ---- VirtualBox-7.0.12.orig/Config.kmk -+++ VirtualBox-7.0.12/Config.kmk +--- VirtualBox-7.0.14.orig/Config.kmk ++++ VirtualBox-7.0.14/Config.kmk @@ -3084,6 +3084,9 @@ else endif VBOX_MACOSX_ICON_FILE ?= $(PATH_ROOT)/src/VBox/Artwork/darwin/NonOSE/VirtualBox.icns ++++++ virtualbox-sed-params.patch ++++++ --- /var/tmp/diff_new_pack.tuqHJe/_old 2024-01-30 18:25:01.009080005 +0100 +++ /var/tmp/diff_new_pack.tuqHJe/_new 2024-01-30 18:25:01.013080150 +0100 @@ -1,7 +1,7 @@ -Index: VirtualBox-7.0.12/src/VBox/Main/Makefile.kmk +Index: VirtualBox-7.0.14/src/VBox/Main/Makefile.kmk =================================================================== ---- VirtualBox-7.0.12.orig/src/VBox/Main/Makefile.kmk -+++ VirtualBox-7.0.12/src/VBox/Main/Makefile.kmk +--- VirtualBox-7.0.14.orig/src/VBox/Main/Makefile.kmk ++++ VirtualBox-7.0.14/src/VBox/Main/Makefile.kmk @@ -1895,7 +1895,7 @@ $(VBoxAPIWrap_0_OUTDIR)/VBoxAPI.d.ts \ $(QUIET)$(VBOX_XSLTPROC) --stringparam KBUILD_HOST $(KBUILD_HOST) \ --stringparam generating "dtrace-probes" \ @@ -11,10 +11,10 @@ "$(VBOX_PATH_MAIN_SRC)/src-all/VBoxAPI-start$(if-expr "$(VBOX_HOST_DTRACE_VERSION)" == "dtrace: Sun D 1.6.2",-alternative,).d" \ "$@" \ "$(VBOX_PATH_MAIN_SRC)/src-all/VBoxAPI-end$(if-expr "$(VBOX_HOST_DTRACE_VERSION)" == "dtrace: Sun D 1.6.2",-alternative,).d" -Index: VirtualBox-7.0.12/src/VBox/Devices/Makefile.kmk +Index: VirtualBox-7.0.14/src/VBox/Devices/Makefile.kmk =================================================================== ---- VirtualBox-7.0.12.orig/src/VBox/Devices/Makefile.kmk -+++ VirtualBox-7.0.12/src/VBox/Devices/Makefile.kmk +--- VirtualBox-7.0.14.orig/src/VBox/Devices/Makefile.kmk ++++ VirtualBox-7.0.14/src/VBox/Devices/Makefile.kmk @@ -989,8 +989,7 @@ if !defined(VBOX_ONLY_EXTPACKS) && "$(in $(call MSG_TOOL,iasl,VBoxDD,$<,$@) $(QUIET)$(RM) -f $@ $@.tmp $@.pre

1 0

commit MozillaFirefox for openSUSE:Factory
by Source-Sync 30 Jan '24

30 Jan '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package MozillaFirefox for openSUSE:Factory checked in at 2024-01-30 18:24:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/MozillaFirefox (Old) and /work/SRC/openSUSE:Factory/.MozillaFirefox.new.1815 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "MozillaFirefox" Tue Jan 30 18:24:32 2024 rev:418 rq:1142680 version:122.0 Changes: -------- --- /work/SRC/openSUSE:Factory/MozillaFirefox/MozillaFirefox.changes 2024-01-26 22:45:51.953168799 +0100 +++ /work/SRC/openSUSE:Factory/.MozillaFirefox.new.1815/MozillaFirefox.changes 2024-01-30 18:24:48.496628601 +0100 @@ -1,0 +2,5 @@ +Sat Jan 27 23:12:05 UTC 2024 - Andreas Schwab <schwab(a)suse.de> + +- Fix file list + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MozillaFirefox.spec ++++++ --- /var/tmp/diff_new_pack.dakPFe/_old 2024-01-30 18:24:51.088722115 +0100 +++ /var/tmp/diff_new_pack.dakPFe/_new 2024-01-30 18:24:51.088722115 +0100 @@ -1,5 +1,5 @@ # -# spec file for package MozillaFirefox +# spec file # # Copyright (c) 2024 SUSE LLC # Copyright (c) 2006-2023 Wolfgang Rosenauer <wr(a)rosenauer.org> @@ -235,7 +235,7 @@ %endif BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires(post): coreutils shared-mime-info desktop-file-utils -Requires(postun): shared-mime-info desktop-file-utils +Requires(postun):shared-mime-info desktop-file-utils Requires: %{name}-branding >= 68 %requires_ge mozilla-nspr %requires_ge mozilla-nss @@ -717,10 +717,8 @@ %{progdir}/*.so %{progdir}/glxtest %if 0%{wayland_supported} -%ifarch %{arm} aarch64 %{ix86} x86_64 %{progdir}/vaapitest %endif -%endif %ifarch aarch64 riscv64 %arm %{progdir}/v4l2test %endif

1 0

commit strace for openSUSE:Factory
by Source-Sync 30 Jan '24

30 Jan '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package strace for openSUSE:Factory checked in at 2024-01-30 18:24:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/strace (Old) and /work/SRC/openSUSE:Factory/.strace.new.1815 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "strace" Tue Jan 30 18:24:30 2024 rev:103 rq:1142656 version:6.7 Changes: -------- --- /work/SRC/openSUSE:Factory/strace/strace.changes 2023-10-31 20:24:38.655613921 +0100 +++ /work/SRC/openSUSE:Factory/.strace.new.1815/strace.changes 2024-01-30 18:24:45.616524697 +0100 @@ -1,0 +2,15 @@ +Mon Jan 29 19:44:45 UTC 2024 - Andreas Schwab <schwab(a)linux-m68k.org> + +- Update to strace 6.7 + * Implemented -kk/--stack-traces=source option for libdw-based stack tracing. + * Implemented decoding of futex_wake, futex_wait, and sys_futex_requeue + syscalls. + * Updated lists of BPF_*, BTRFS_*, IORING_*, KVM_*, LANDLOCK_*, PR_*, + and TCP_* constants. + * Updated lists of ioctl commands from Linux 6.7. + * Fix strace -r during the first second after booting to show correct relative + timestamps. + * Fix strace -f entering deadlock on exit if there are tracee processes + spawned using vfork semantics. + +------------------------------------------------------------------- Old: ---- strace-6.6.tar.xz strace-6.6.tar.xz.asc New: ---- strace-6.7.tar.xz strace-6.7.tar.xz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ strace.spec ++++++ --- /var/tmp/diff_new_pack.dK4KLl/_old 2024-01-30 18:24:46.120542881 +0100 +++ /var/tmp/diff_new_pack.dK4KLl/_new 2024-01-30 18:24:46.124543025 +0100 @@ -17,7 +17,7 @@ Name: strace -Version: 6.6 +Version: 6.7 Release: 0 Summary: A utility to trace the system calls of a program License: BSD-3-Clause ++++++ strace-6.6.tar.xz -> strace-6.7.tar.xz ++++++ ++++ 13495 lines of diff (skipped)

1 0

commit python-pyOpenSSL for openSUSE:Factory
by Source-Sync 30 Jan '24

30 Jan '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-pyOpenSSL for openSUSE:Factory checked in at 2024-01-30 18:24:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-pyOpenSSL (Old) and /work/SRC/openSUSE:Factory/.python-pyOpenSSL.new.1815 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-pyOpenSSL" Tue Jan 30 18:24:28 2024 rev:53 rq:1142651 version:24.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-pyOpenSSL/python-pyOpenSSL.changes 2023-11-28 22:18:28.735743812 +0100 +++ /work/SRC/openSUSE:Factory/.python-pyOpenSSL.new.1815/python-pyOpenSSL.changes 2024-01-30 18:24:44.572487033 +0100 @@ -1,0 +2,7 @@ +Mon Jan 29 21:16:31 UTC 2024 - Dirk Müller <dmueller(a)suse.com> + +- update to 24.0.0: + * Added OpenSSL.SSL.Connection.get_selected_srtp_profile to + determine which SRTP profile was negotiated. #1279. + +------------------------------------------------------------------- Old: ---- pyOpenSSL-23.3.0.tar.gz New: ---- pyOpenSSL-24.0.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-pyOpenSSL.spec ++++++ --- /var/tmp/diff_new_pack.uPI4NT/_old 2024-01-30 18:24:45.312513730 +0100 +++ /var/tmp/diff_new_pack.uPI4NT/_new 2024-01-30 18:24:45.312513730 +0100 @@ -1,7 +1,7 @@ # -# spec file +# spec file for package python-pyOpenSSL # -# 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 @@ -26,7 +26,7 @@ %endif %{?sle15_python_module_pythons} Name: python-pyOpenSSL%{psuffix} -Version: 23.3.0 +Version: 24.0.0 Release: 0 Summary: Python wrapper module around the OpenSSL library License: Apache-2.0 @@ -39,8 +39,12 @@ BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros +Requires: python-cffi +Requires: (python-cryptography >= 41.0.5 with python-cryptography < 43) +Provides: pyOpenSSL = %{version} +BuildArch: noarch %if %{with test} -BuildRequires: %{python_module cryptography >= 41.0.5 with %python-cryptography < 42} +BuildRequires: %{python_module cryptography >= 41.0.5 with %python-cryptography < 43} BuildRequires: %{python_module flaky} BuildRequires: %{python_module pretend} BuildRequires: %{python_module pyOpenSSL >= %version} @@ -48,10 +52,6 @@ BuildRequires: ca-certificates-mozilla BuildRequires: openssl %endif -Requires: python-cffi -Requires: (python-cryptography >= 41.0.5 with python-cryptography < 42) -Provides: pyOpenSSL = %{version} -BuildArch: noarch %python_subpackages %description ++++++ pyOpenSSL-23.3.0.tar.gz -> pyOpenSSL-24.0.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyOpenSSL-23.3.0/.coveragerc new/pyOpenSSL-24.0.0/.coveragerc --- old/pyOpenSSL-23.3.0/.coveragerc 2023-10-20 00:18:27.000000000 +0200 +++ new/pyOpenSSL-24.0.0/.coveragerc 1970-01-01 01:00:00.000000000 +0100 @@ -1,14 +0,0 @@ -[run] -branch = True -source = - OpenSSL - tests/ - -[paths] -source = - src/OpenSSL - .tox/*/lib/python*/site-packages/OpenSSL - .tox/pypy/site-packages/OpenSSL - -[report] -show_missing = True diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyOpenSSL-23.3.0/CHANGELOG.rst new/pyOpenSSL-24.0.0/CHANGELOG.rst --- old/pyOpenSSL-23.3.0/CHANGELOG.rst 2023-10-26 05:04:18.000000000 +0200 +++ new/pyOpenSSL-24.0.0/CHANGELOG.rst 2024-01-23 02:41:32.000000000 +0100 @@ -4,6 +4,21 @@ Versions are year-based with a strict backward-compatibility policy. The third digit is only for regressions. +24.0.0 (2024-01-22) +------------------- + +Backward-incompatible changes: +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +Deprecations: +^^^^^^^^^^^^^ + +Changes: +^^^^^^^^ + +- Added ``OpenSSL.SSL.Connection.get_selected_srtp_profile`` to determine which SRTP profile was negotiated. + `#1279 <https://github.com/pyca/pyopenssl/pull/1279>`_. + 23.3.0 (2023-10-25) ------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyOpenSSL-23.3.0/INSTALL.rst new/pyOpenSSL-24.0.0/INSTALL.rst --- old/pyOpenSSL-23.3.0/INSTALL.rst 2023-10-20 00:18:27.000000000 +0200 +++ new/pyOpenSSL-24.0.0/INSTALL.rst 2023-11-30 19:20:30.000000000 +0100 @@ -7,7 +7,7 @@ If you are installing in order to *develop* on pyOpenSSL, move to the root directory of a pyOpenSSL checkout, and run:: - $ pip install -e . + $ pip install -e .[test] .. warning:: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyOpenSSL-23.3.0/PKG-INFO new/pyOpenSSL-24.0.0/PKG-INFO --- old/pyOpenSSL-23.3.0/PKG-INFO 2023-10-26 05:05:07.202564500 +0200 +++ new/pyOpenSSL-24.0.0/PKG-INFO 2024-01-23 02:42:33.705136500 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: pyOpenSSL -Version: 23.3.0 +Version: 24.0.0 Summary: Python wrapper module around the OpenSSL library Home-page: https://pyopenssl.org/ Author: The pyOpenSSL developers @@ -27,7 +27,7 @@ Classifier: Topic :: System :: Networking Requires-Python: >=3.7 License-File: LICENSE -Requires-Dist: cryptography<42,>=41.0.5 +Requires-Dist: cryptography<43,>=41.0.5 Provides-Extra: test Requires-Dist: flaky; extra == "test" Requires-Dist: pretend; extra == "test" @@ -87,6 +87,21 @@ Release Information =================== +24.0.0 (2024-01-22) +------------------- + +Backward-incompatible changes: +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +Deprecations: +^^^^^^^^^^^^^ + +Changes: +^^^^^^^^ + +- Added ``OpenSSL.SSL.Connection.get_selected_srtp_profile`` to determine which SRTP profile was negotiated. + `#1279 <https://github.com/pyca/pyopenssl/pull/1279>`_. + 23.3.0 (2023-10-25) ------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyOpenSSL-23.3.0/pyproject.toml new/pyOpenSSL-24.0.0/pyproject.toml --- old/pyOpenSSL-23.3.0/pyproject.toml 2023-10-20 00:18:27.000000000 +0200 +++ new/pyOpenSSL-24.0.0/pyproject.toml 2023-12-06 00:28:11.000000000 +0100 @@ -1,6 +1,47 @@ -[tool.black] -line-length = 79 -target-version = ["py37"] +[tool.coverage.run] +branch = true +source = ["OpenSSL", "tests/"] + +[tool.coverage.paths] +source = [ + "src/OpenSSL", + ".tox/*/lib/python*/site-packages/OpenSSL", + ".tox/pypy/site-packages/OpenSSL", +] + +[tool.coverage.report] +show_missing = true + +[tool.mypy] +warn_unused_configs = true +follow_imports = "skip" +strict = true +exclude = ['SSL\.py$'] + +[[tool.mypy.overrides]] +module = "OpenSSL.crypto" +warn_return_any = false +disallow_any_expr = false + +[[tool.mypy.overrides]] +module = "OpenSSL.rand" +warn_return_any = false + +[[tool.mypy.overrides]] +module = "OpenSSL._util" +warn_return_any = false + +[[tool.mypy.overrides]] +module = "cryptography.*" +ignore_missing_imports = true + +[[tool.mypy.overrides]] +module = "cffi.*" +ignore_missing_imports = true + +[tool.pytest.ini_options] +addopts = "-r s --strict-markers" +testpaths = ["tests"] [tool.ruff] select = ['E', 'F', 'I', 'W', 'UP', 'RUF'] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyOpenSSL-23.3.0/setup.cfg new/pyOpenSSL-24.0.0/setup.cfg --- old/pyOpenSSL-23.3.0/setup.cfg 2023-10-26 05:05:07.202891800 +0200 +++ new/pyOpenSSL-24.0.0/setup.cfg 2024-01-23 02:42:33.705550200 +0100 @@ -1,7 +1,3 @@ -[tool:pytest] -addopts = "-r s --strict-markers" -testpaths = tests - [metadata] license_file = LICENSE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyOpenSSL-23.3.0/setup.py new/pyOpenSSL-24.0.0/setup.py --- old/pyOpenSSL-23.3.0/setup.py 2023-10-25 14:03:05.000000000 +0200 +++ new/pyOpenSSL-24.0.0/setup.py 2024-01-23 02:41:32.000000000 +0100 @@ -93,7 +93,7 @@ packages=find_packages(where="src"), package_dir={"": "src"}, install_requires=[ - "cryptography>=41.0.5,<42", + "cryptography>=41.0.5,<43", ], extras_require={ "test": ["flaky", "pretend", "pytest>=3.0.1"], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyOpenSSL-23.3.0/src/OpenSSL/SSL.py new/pyOpenSSL-24.0.0/src/OpenSSL/SSL.py --- old/pyOpenSSL-23.3.0/src/OpenSSL/SSL.py 2023-10-20 00:18:27.000000000 +0200 +++ new/pyOpenSSL-24.0.0/src/OpenSSL/SSL.py 2024-01-12 14:40:26.000000000 +0100 @@ -2858,6 +2858,19 @@ return _ffi.buffer(data[0], data_len[0])[:] + def get_selected_srtp_profile(self): + """ + Get the SRTP protocol which was negotiated. + + :returns: A bytestring of the SRTP profile name. If no profile has been + negotiated yet, returns an empty bytestring. + """ + profile = _lib.SSL_get_selected_srtp_profile(self._ssl) + if not profile: + return b"" + + return _ffi.string(profile.name) + def request_ocsp(self): """ Called to request that the server sends stapled OCSP data, if diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyOpenSSL-23.3.0/src/OpenSSL/crypto.py new/pyOpenSSL-24.0.0/src/OpenSSL/crypto.py --- old/pyOpenSSL-23.3.0/src/OpenSSL/crypto.py 2023-10-25 14:03:05.000000000 +0200 +++ new/pyOpenSSL-24.0.0/src/OpenSSL/crypto.py 2024-01-12 14:40:26.000000000 +0100 @@ -1881,12 +1881,6 @@ of a certificate in a described context. For describing such a context, see :class:`X509Store`. - :ivar _store_ctx: The underlying X509_STORE_CTX structure used by this - instance. It is dynamically allocated and automatically garbage - collected. - :ivar _store: See the ``store`` ``__init__`` parameter. - :ivar _cert: See the ``certificate`` ``__init__`` parameter. - :ivar _chain: See the ``chain`` ``__init__`` parameter. :param X509Store store: The certificates which will be trusted for the purposes of any verifications. :param X509 certificate: The certificate to be verified. @@ -1901,15 +1895,9 @@ certificate: X509, chain: Optional[Sequence[X509]] = None, ) -> None: - store_ctx = _lib.X509_STORE_CTX_new() - self._store_ctx = _ffi.gc(store_ctx, _lib.X509_STORE_CTX_free) self._store = store self._cert = certificate self._chain = self._build_certificate_stack(chain) - # Make the store context available for use after instantiating this - # class by initializing it now. Per testing, subsequent calls to - # :meth:`_init` have no adverse affect. - self._init() @staticmethod def _build_certificate_stack( @@ -1941,28 +1929,8 @@ return stack - def _init(self) -> None: - """ - Set up the store context for a subsequent verification operation. - - Calling this method more than once without first calling - :meth:`_cleanup` will leak memory. - """ - ret = _lib.X509_STORE_CTX_init( - self._store_ctx, self._store._store, self._cert._x509, self._chain - ) - if ret <= 0: - _raise_current_error() - - def _cleanup(self) -> None: - """ - Internally cleans up the store context. - - The store context can then be reused with a new call to :meth:`_init`. - """ - _lib.X509_STORE_CTX_cleanup(self._store_ctx) - - def _exception_from_context(self) -> X509StoreContextError: + @staticmethod + def _exception_from_context(store_ctx: Any) -> X509StoreContextError: """ Convert an OpenSSL native context error failure into a Python exception. @@ -1972,21 +1940,45 @@ """ message = _ffi.string( _lib.X509_verify_cert_error_string( - _lib.X509_STORE_CTX_get_error(self._store_ctx) + _lib.X509_STORE_CTX_get_error(store_ctx) ) ).decode("utf-8") errors = [ - _lib.X509_STORE_CTX_get_error(self._store_ctx), - _lib.X509_STORE_CTX_get_error_depth(self._store_ctx), + _lib.X509_STORE_CTX_get_error(store_ctx), + _lib.X509_STORE_CTX_get_error_depth(store_ctx), message, ] # A context error should always be associated with a certificate, so we # expect this call to never return :class:`None`. - _x509 = _lib.X509_STORE_CTX_get_current_cert(self._store_ctx) + _x509 = _lib.X509_STORE_CTX_get_current_cert(store_ctx) _cert = _lib.X509_dup(_x509) pycert = X509._from_raw_x509_ptr(_cert) return X509StoreContextError(message, errors, pycert) + def _verify_certificate(self) -> Any: + """ + Verifies the certificate and runs an X509_STORE_CTX containing the + results. + + :raises X509StoreContextError: If an error occurred when validating a + certificate in the context. Sets ``certificate`` attribute to + indicate which certificate caused the error. + """ + store_ctx = _lib.X509_STORE_CTX_new() + _openssl_assert(store_ctx != _ffi.NULL) + store_ctx = _ffi.gc(store_ctx, _lib.X509_STORE_CTX_free) + + ret = _lib.X509_STORE_CTX_init( + store_ctx, self._store._store, self._cert._x509, self._chain + ) + _openssl_assert(ret == 1) + + ret = _lib.X509_verify_cert(store_ctx) + if ret <= 0: + raise self._exception_from_context(store_ctx) + + return store_ctx + def set_store(self, store: X509Store) -> None: """ Set the context's X.509 store. @@ -2008,17 +2000,7 @@ certificate in the context. Sets ``certificate`` attribute to indicate which certificate caused the error. """ - # Always re-initialize the store context in case - # :meth:`verify_certificate` is called multiple times. - # - # :meth:`_init` is called in :meth:`__init__` so _cleanup is called - # before _init to ensure memory is not leaked. - self._cleanup() - self._init() - ret = _lib.X509_verify_cert(self._store_ctx) - self._cleanup() - if ret <= 0: - raise self._exception_from_context() + self._verify_certificate() def get_verified_chain(self) -> List[X509]: """ @@ -2031,20 +2013,10 @@ .. versionadded:: 20.0 """ - # Always re-initialize the store context in case - # :meth:`verify_certificate` is called multiple times. - # - # :meth:`_init` is called in :meth:`__init__` so _cleanup is called - # before _init to ensure memory is not leaked. - self._cleanup() - self._init() - ret = _lib.X509_verify_cert(self._store_ctx) - if ret <= 0: - self._cleanup() - raise self._exception_from_context() + store_ctx = self._verify_certificate() # Note: X509_STORE_CTX_get1_chain returns a deep copy of the chain. - cert_stack = _lib.X509_STORE_CTX_get1_chain(self._store_ctx) + cert_stack = _lib.X509_STORE_CTX_get1_chain(store_ctx) _openssl_assert(cert_stack != _ffi.NULL) result = [] @@ -2056,7 +2028,6 @@ # Free the stack but not the members which are freed by the X509 class. _lib.sk_X509_free(cert_stack) - self._cleanup() return result @@ -3191,7 +3162,7 @@ utils.deprecated( sign, __name__, - "sign() is deprecated. Use the equivilant APIs in cryptography.", + "sign() is deprecated. Use the equivalent APIs in cryptography.", DeprecationWarning, name="sign", ) @@ -3238,7 +3209,7 @@ utils.deprecated( verify, __name__, - "verify() is deprecated. Use the equivilant APIs in cryptography.", + "verify() is deprecated. Use the equivalent APIs in cryptography.", DeprecationWarning, name="verify", ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyOpenSSL-23.3.0/src/OpenSSL/version.py new/pyOpenSSL-24.0.0/src/OpenSSL/version.py --- old/pyOpenSSL-23.3.0/src/OpenSSL/version.py 2023-10-26 05:04:18.000000000 +0200 +++ new/pyOpenSSL-24.0.0/src/OpenSSL/version.py 2024-01-23 02:41:32.000000000 +0100 @@ -17,7 +17,7 @@ "__version__", ] -__version__ = "23.3.0" +__version__ = "24.0.0" __title__ = "pyOpenSSL" __uri__ = "https://pyopenssl.org/" @@ -25,4 +25,4 @@ __author__ = "The pyOpenSSL developers" __email__ = "cryptography-dev(a)python.org" __license__ = "Apache License, Version 2.0" -__copyright__ = f"Copyright 2001-2023 {__author__}" +__copyright__ = f"Copyright 2001-2024 {__author__}" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyOpenSSL-23.3.0/src/pyOpenSSL.egg-info/PKG-INFO new/pyOpenSSL-24.0.0/src/pyOpenSSL.egg-info/PKG-INFO --- old/pyOpenSSL-23.3.0/src/pyOpenSSL.egg-info/PKG-INFO 2023-10-26 05:05:07.000000000 +0200 +++ new/pyOpenSSL-24.0.0/src/pyOpenSSL.egg-info/PKG-INFO 2024-01-23 02:42:33.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: pyOpenSSL -Version: 23.3.0 +Version: 24.0.0 Summary: Python wrapper module around the OpenSSL library Home-page: https://pyopenssl.org/ Author: The pyOpenSSL developers @@ -27,7 +27,7 @@ Classifier: Topic :: System :: Networking Requires-Python: >=3.7 License-File: LICENSE -Requires-Dist: cryptography<42,>=41.0.5 +Requires-Dist: cryptography<43,>=41.0.5 Provides-Extra: test Requires-Dist: flaky; extra == "test" Requires-Dist: pretend; extra == "test" @@ -87,6 +87,21 @@ Release Information =================== +24.0.0 (2024-01-22) +------------------- + +Backward-incompatible changes: +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +Deprecations: +^^^^^^^^^^^^^ + +Changes: +^^^^^^^^ + +- Added ``OpenSSL.SSL.Connection.get_selected_srtp_profile`` to determine which SRTP profile was negotiated. + `#1279 <https://github.com/pyca/pyopenssl/pull/1279>`_. + 23.3.0 (2023-10-25) ------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyOpenSSL-23.3.0/src/pyOpenSSL.egg-info/SOURCES.txt new/pyOpenSSL-24.0.0/src/pyOpenSSL.egg-info/SOURCES.txt --- old/pyOpenSSL-23.3.0/src/pyOpenSSL.egg-info/SOURCES.txt 2023-10-26 05:05:07.000000000 +0200 +++ new/pyOpenSSL-24.0.0/src/pyOpenSSL.egg-info/SOURCES.txt 2024-01-23 02:42:33.000000000 +0100 @@ -1,4 +1,3 @@ -.coveragerc CHANGELOG.rst CODE_OF_CONDUCT.rst CONTRIBUTING.rst diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyOpenSSL-23.3.0/src/pyOpenSSL.egg-info/requires.txt new/pyOpenSSL-24.0.0/src/pyOpenSSL.egg-info/requires.txt --- old/pyOpenSSL-23.3.0/src/pyOpenSSL.egg-info/requires.txt 2023-10-26 05:05:07.000000000 +0200 +++ new/pyOpenSSL-24.0.0/src/pyOpenSSL.egg-info/requires.txt 2024-01-23 02:42:33.000000000 +0100 @@ -1,4 +1,4 @@ -cryptography<42,>=41.0.5 +cryptography<43,>=41.0.5 [docs] sphinx!=5.2.0,!=5.2.0.post0,!=7.2.5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyOpenSSL-23.3.0/tests/test_crypto.py new/pyOpenSSL-24.0.0/tests/test_crypto.py --- old/pyOpenSSL-23.3.0/tests/test_crypto.py 2023-10-25 14:03:05.000000000 +0200 +++ new/pyOpenSSL-24.0.0/tests/test_crypto.py 2024-01-12 14:40:26.000000000 +0100 @@ -770,7 +770,7 @@ """ # Basic setup stuff to generate a certificate pkey = PKey() - pkey.generate_key(TYPE_RSA, 512) + pkey.generate_key(TYPE_RSA, 2048) req = X509Req() req.set_pubkey(pkey) # Authority good you have. @@ -1123,7 +1123,7 @@ `PKey.generate_key` generates an RSA key when passed `TYPE_RSA` as a type and a reasonable number of bits. """ - bits = 512 + bits = 2048 key = PKey() key.generate_key(TYPE_RSA, bits) assert key.type() == TYPE_RSA @@ -1152,7 +1152,7 @@ generate new keys. """ key = PKey() - for type, bits in [(TYPE_RSA, 512), (TYPE_DSA, 576)]: + for type, bits in [(TYPE_RSA, 2048), (TYPE_DSA, 576)]: key.generate_key(type, bits) assert key.type() == type assert key.bits() == bits @@ -1173,7 +1173,7 @@ """ # A trick to get a public-only key key = PKey() - key.generate_key(TYPE_RSA, 512) + key.generate_key(TYPE_RSA, 2048) cert = X509() cert.set_pubkey(key) pub = cert.get_pubkey() @@ -1487,7 +1487,7 @@ """ request = self.signable() key = PKey() - key.generate_key(TYPE_RSA, 512) + key.generate_key(TYPE_RSA, 2048) request.set_pubkey(key) pub = request.get_pubkey() with pytest.raises(ValueError): @@ -1500,7 +1500,7 @@ """ request = self.signable() key = PKey() - key.generate_key(TYPE_RSA, 512) + key.generate_key(TYPE_RSA, 2048) with pytest.raises(ValueError): request.sign(key, BAD_DIGEST) @@ -1512,7 +1512,7 @@ """ request = self.signable() key = PKey() - key.generate_key(TYPE_RSA, 512) + key.generate_key(TYPE_RSA, 2048) request.set_pubkey(key) request.sign(key, GOOD_DIGEST) # If the type has a verify method, cover that too. @@ -1521,7 +1521,7 @@ assert request.verify(pub) # Make another key that won't verify. key = PKey() - key.generate_key(TYPE_RSA, 512) + key.generate_key(TYPE_RSA, 2048) with pytest.raises(Error): request.verify(key) @@ -2773,7 +2773,7 @@ argument but no `passphrase` argument. """ key = PKey() - key.generate_key(TYPE_RSA, 512) + key.generate_key(TYPE_RSA, 2048) with pytest.raises(TypeError): dump_privatekey(FILETYPE_PEM, key, cipher=GOOD_CIPHER) @@ -2797,7 +2797,7 @@ cipher name. """ key = PKey() - key.generate_key(TYPE_RSA, 512) + key.generate_key(TYPE_RSA, 2048) with pytest.raises(ValueError): dump_privatekey(FILETYPE_PEM, key, BAD_CIPHER, "passphrase") @@ -2807,7 +2807,7 @@ is neither a `str` nor a callable. """ key = PKey() - key.generate_key(TYPE_RSA, 512) + key.generate_key(TYPE_RSA, 2048) with pytest.raises(TypeError): dump_privatekey(FILETYPE_PEM, key, GOOD_CIPHER, object()) @@ -2817,7 +2817,7 @@ filetype. """ key = PKey() - key.generate_key(TYPE_RSA, 512) + key.generate_key(TYPE_RSA, 2048) with pytest.raises(ValueError): dump_privatekey(100, key) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyOpenSSL-23.3.0/tests/test_ssl.py new/pyOpenSSL-24.0.0/tests/test_ssl.py --- old/pyOpenSSL-23.3.0/tests/test_ssl.py 2023-10-25 14:03:05.000000000 +0200 +++ new/pyOpenSSL-24.0.0/tests/test_ssl.py 2024-01-12 14:40:26.000000000 +0100 @@ -4380,7 +4380,7 @@ # Arbitrary number larger than any conceivable handshake volley. LARGE_BUFFER = 65536 - def test_it_works_at_all(self): + def _test_handshake_and_data(self, srtp_profile): s_ctx = Context(DTLS_METHOD) def generate_cookie(ssl): @@ -4394,11 +4394,15 @@ s_ctx.use_privatekey(load_privatekey(FILETYPE_PEM, server_key_pem)) s_ctx.use_certificate(load_certificate(FILETYPE_PEM, server_cert_pem)) s_ctx.set_options(OP_NO_QUERY_MTU) + if srtp_profile is not None: + s_ctx.set_tlsext_use_srtp(srtp_profile) s = Connection(s_ctx) s.set_accept_state() c_ctx = Context(DTLS_METHOD) c_ctx.set_options(OP_NO_QUERY_MTU) + if srtp_profile is not None: + c_ctx.set_tlsext_use_srtp(srtp_profile) c = Connection(c_ctx) c.set_connect_state() @@ -4480,6 +4484,14 @@ pump() assert s.read(100) == b"goodbye" + # Check whether SRTP was negotiated + if srtp_profile is not None: + assert s.get_selected_srtp_profile() == srtp_profile + assert c.get_selected_srtp_profile() == srtp_profile + else: + assert s.get_selected_srtp_profile() == b"" + assert c.get_selected_srtp_profile() == b"" + # Check that the MTU set/query functions are doing *something* c.set_ciphertext_mtu(1000) try: @@ -4492,6 +4504,12 @@ except NotImplementedError: # OpenSSL 1.1.0 and earlier pass + def test_it_works_at_all(self): + self._test_handshake_and_data(srtp_profile=None) + + def test_it_works_with_srtp(self): + self._test_handshake_and_data(srtp_profile=b"SRTP_AES128_CM_SHA1_80") + def test_timeout(self, monkeypatch): c_ctx = Context(DTLS_METHOD) c = Connection(c_ctx) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyOpenSSL-23.3.0/tox.ini new/pyOpenSSL-24.0.0/tox.ini --- old/pyOpenSSL-23.3.0/tox.ini 2023-10-25 14:03:05.000000000 +0200 +++ new/pyOpenSSL-24.0.0/tox.ini 2023-12-06 00:28:11.000000000 +0100 @@ -44,12 +44,11 @@ [testenv:lint] basepython = python3 deps = - black - ruff==0.0.284 + ruff skip_install = true commands = - black --check . ruff . + ruff format --check . [testenv:py311-mypy] deps = @@ -72,7 +71,7 @@ sphinx-build -W -b html doc doc/_build/html {posargs} [testenv:coverage-report] -deps = coverage>=4.2 +deps = coverage[toml]>=4.2 skip_install = true commands = coverage combine ++++++ skip-networked-test.patch ++++++ --- /var/tmp/diff_new_pack.uPI4NT/_old 2024-01-30 18:24:45.424517770 +0100 +++ /var/tmp/diff_new_pack.uPI4NT/_new 2024-01-30 18:24:45.424517770 +0100 @@ -1,8 +1,8 @@ -Index: pyOpenSSL-23.2.0/tests/test_ssl.py +Index: pyOpenSSL-24.0.0/tests/test_ssl.py =================================================================== ---- pyOpenSSL-23.2.0.orig/tests/test_ssl.py -+++ pyOpenSSL-23.2.0/tests/test_ssl.py -@@ -1252,6 +1252,7 @@ class TestContext: +--- pyOpenSSL-24.0.0.orig/tests/test_ssl.py ++++ pyOpenSSL-24.0.0/tests/test_ssl.py +@@ -1250,6 +1250,7 @@ class TestContext: reason="set_default_verify_paths appears not to work on Windows. " "See LP#404343 and LP#404344.", ) @@ -10,22 +10,27 @@ def test_set_default_verify_paths(self): """ `Context.set_default_verify_paths` causes the platform-specific CA -Index: pyOpenSSL-23.2.0/setup.cfg +Index: pyOpenSSL-24.0.0/setup.cfg =================================================================== ---- pyOpenSSL-23.2.0.orig/setup.cfg -+++ pyOpenSSL-23.2.0/setup.cfg -@@ -1,6 +1,8 @@ - [tool:pytest] - addopts = "-r s --strict-markers" - testpaths = tests -+markers = -+ network: test case requires network connection - - [metadata] - license_file = LICENSE -@@ -15,4 +17,3 @@ doc_files = doc/_build/html +--- pyOpenSSL-24.0.0.orig/setup.cfg ++++ pyOpenSSL-24.0.0/setup.cfg +@@ -11,4 +11,3 @@ doc_files = doc/_build/html [egg_info] tag_build = tag_date = 0 - +Index: pyOpenSSL-24.0.0/pyproject.toml +=================================================================== +--- pyOpenSSL-24.0.0.orig/pyproject.toml ++++ pyOpenSSL-24.0.0/pyproject.toml +@@ -42,6 +42,9 @@ ignore_missing_imports = true + [tool.pytest.ini_options] + addopts = "-r s --strict-markers" + testpaths = ["tests"] ++markers = [ ++ "network: test case requires network connection", ++] + + [tool.ruff] + select = ['E', 'F', 'I', 'W', 'UP', 'RUF']

1 0

commit python-wsproto for openSUSE:Factory
by Source-Sync 30 Jan '24

30 Jan '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-wsproto for openSUSE:Factory checked in at 2024-01-30 18:24:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-wsproto (Old) and /work/SRC/openSUSE:Factory/.python-wsproto.new.1815 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-wsproto" Tue Jan 30 18:24:25 2024 rev:15 rq:1142646 version:1.2.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-wsproto/python-wsproto.changes 2023-04-22 21:58:51.452641463 +0200 +++ /work/SRC/openSUSE:Factory/.python-wsproto.new.1815/python-wsproto.changes 2024-01-30 18:24:42.736420794 +0100 @@ -1,0 +2,5 @@ +Mon Jan 29 21:14:17 UTC 2024 - Dirk Müller <dmueller(a)suse.com> + +- spec file cleanup + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-wsproto.spec ++++++ --- /var/tmp/diff_new_pack.csi67u/_old 2024-01-30 18:24:43.208437822 +0100 +++ /var/tmp/diff_new_pack.csi67u/_new 2024-01-30 18:24:43.208437822 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-wsproto # -# 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 @@ -16,8 +16,6 @@ # -%{?!python_module:%define python_module() python-%{**} python3-%{**}} -%define skip_python2 1 %{?sle15_python_module_pythons} Name: python-wsproto Version: 1.2.0 @@ -69,5 +67,6 @@ %files %{python_files} %doc README.rst %license LICENSE -%{python_sitelib}/* +%{python_sitelib}/wsproto +%{python_sitelib}/wsproto-%{version}*-info

1 0