diff --git a/backport-patch.log b/backport-patch.log new file mode 100644 index 0000000000000000000000000000000000000000..a4c3ca12f42442bec8ae0c94d9125316c7b4e2a0 --- /dev/null +++ b/backport-patch.log @@ -0,0 +1,62 @@ +Patch6000: backport-correctly-use-3-parameters-for-clise-range.patch +Patch6001: backport-fix-a-memory-leak.patch +Patch6002: backport-gfileenumerator-fix-leak-in-error-path.patch +Patch6003: backport-gdbusobjectmanagerservice-fix-leak-in-error-path.patch +Patch6004: backport-gdbusauth-fix-error-leak.patch +Patch6005: backport-gapplication-fix-arguments-leak-in-error-path.patch +Patch6006: backport-gsocks5proxy-Handle-EOF-when-reading-from-a-stream.patch +Patch6007: backport-application-Unset-the-registered-state-after-shutting-down.patch +Patch6008: backport-gdtlsconnection-Fix-a-check-for-a-vfunc-being-implemented.patch +Patch6009: backport-gthread-posix-Free-a-memory-leak-on-error-path.patch +Patch6010: backport-gutils-Avoid-segfault-in-g_get_user_database_entry.patch +Patch6011: backport-glocalfileinfo-Fix-atime-mtime-mix.patch +Patch6012: backport-gopenuriportal-Fix-GVariantBuilder-and-string-leakage.patch +Patch6013: backport-gproxyaddressenumerator-Fix-string-leakage-on-an-invalid-input.patch +Patch6014: backport-gsocks5proxy-Fix-buffer-overflow-on-a-really-long-domain-name.patch +Patch6015: backport-gvariant-Fix-memory-leak-on-a-TYPE-CHECK-failure.patch +Patch6016: backport-gvariant-Fix-pointers-being-dereferenced-despite-NULL-checks.patch +Patch6017: backport-gtype-Fix-pointer-being-dereferenced-despite-NULL-check.patch +Patch6018: backport-add-OOM-handling-in-mimemagic.patch +Patch6019: backport-garray-buffer-overflow-fix.patch +Patch6020: backport-gdbusconnection-Move-ExportedSubtree-definition.patch +Patch6021: backport-gdbusconnection-Add-some-ownership-annotations.patch +Patch6022: backport-gdbusconnection-Make-ExportedInterface-ExportedSubtree-refcounted.patch +Patch6023: backport-gdbusconnection-Fix-race-between-method-calls-and-object-unregistration.patch +Patch6024: backport-gdbusconnection-Fix-race-between-subtree-method-call-and-unregistration.patch +Patch6025: backport-Add-D-Bus-object-subtree-unregistration-tests.patch +Patch6026: backport-gutf8-add-string-length-check.patch +Patch6027: backport-garray-Fix-integer-overflows-in-element-capacity-calculations.patch +Patch6028: backport-gdbusmessage-Disallow-zero-length-elements-in-arrays.patch +Patch6029: backport-gvariant-serialiser-Prevent-unbounded-recursion.patch +Patch6030: backport-gutils-Fix-g_find_program_in_path-to-return-an-absolute-path.patch +Patch6031: backport-Fix-memory-leak-in-gdbusauthmechanismsha1.patch +Patch6032: backport-gprintf-Fix-a-memory-leak-with-an-invalid-format.patch +Patch6033: backport-tests-Add-some-tests-for-g_vasprintf-invalid-format-strings.patch +Patch6034: backport-tests-Add-some-tests-for-g_string_append_vprintf.patch +Patch6035: backport-gdbusmethodinvocation-Fix-a-leak-on-an-early-return-path.patch +Patch6036: backport-gdbusmethodinvocation-Fix-dead-code-for-type-checking-GetAll.patch +Patch6037: backport-gdbusmethodinvocation-Drop-redundant-quote-from-warning.patch +Patch6038: backport-tests-Add-unit-tests-for-GDBusMethodInvocation.patch +Patch6039: backport-gtestdbus-Print-the-dbus-address-on-a-specific-FD-intead-of-stdout.patch +Patch6040: backport-gopenuriportal-Fix-a-use-after-free-on-an-error-path.patch +Patch6041: backport-gio-tool-Fix-a-minor-memory-leak.patch +Patch6042: backport-gsocketclient-Fix-still-reachable-references-to-cancellables.patch +Patch6043: backport-gunixmounts-Add-cache-to-g_unix_mount_points_get.patch +Patch6044: backport-Add-lock-in-_g_get_unix_mount_points-around-fsent-functions.patch +Patch6045: backport-g_get_unix_mount_points-reduce-syscalls-inside-loop.patch +Patch6046: backport-xdgmime-fix-double-free.patch +Patch6047: backport-Implement-GFileIface.set_display_name-for-resource-files.patch +Patch6048: backport-tests-dbus-appinfo-Add-test-case-for-flatpak-opening-an-invalid-file.patch +Patch6049: backport-documentportal-Fix-small-leak-in-add_documents-with-empty-URI-list.patch +Patch6050: backport-gio-tests-gdbus-proxy-threads-Unref-GVariant-s-that-we-own.patch +Patch6051: backport-gio-tests-gdbus-peer-Unref-cached-property-GVariant-value.patch +Patch6052: backport-gdesktopappinfo-Unref-the-GDBus-call-results.patch +Patch6053: backport-Handling-collision-between-standard-i-o-file-descriptors-and-newly-created-ones.patch +Patch6054: backport-glocalfileoutputstream-Do-not-double-close-an-fd-on-unlink-error.patch +Patch6055: backport-tests-Make-the-642026-test-take-100x-less-time.patch +Patch6056: backport-gmessages-Add-missing-trailing-newline-in-fallback-log-hander.patch +Patch6057: backport-Revert-Handling-collision-between-standard-i-o-filedescriptors-and-newly-created-ones.patch +patch6058: backport-gdbusinterfaceskeleton-Fix-a-use-after-free-of-a-GDBusMethodInvocation.patch +patch6059: backport-CVE-2023-24593_CVE-2023-25180-1.patch +patch6060: backport-CVE-2023-24593_CVE-2023-25180-2.patch +patch9000: backport-lib-openharmony-glib.patch diff --git a/glib2.spec b/glib2.spec index ce6f0857cd3d2b9ec86cac0e2f437f8896c53268..53a344c7a51859e09742426dd18dcf013db81d5a 100644 --- a/glib2.spec +++ b/glib2.spec @@ -8,6 +8,66 @@ Source0: http://download.gnome.org/sources/glib/2.68/glib-%{version}.tar. Patch6000: backport-correctly-use-3-parameters-for-clise-range.patch Patch6001: backport-fix-a-memory-leak.patch +Patch6002: backport-gfileenumerator-fix-leak-in-error-path.patch +Patch6003: backport-gdbusobjectmanagerservice-fix-leak-in-error-path.patch +Patch6004: backport-gdbusauth-fix-error-leak.patch +Patch6005: backport-gapplication-fix-arguments-leak-in-error-path.patch +Patch6006: backport-gsocks5proxy-Handle-EOF-when-reading-from-a-stream.patch +Patch6007: backport-application-Unset-the-registered-state-after-shutting-down.patch +Patch6008: backport-gdtlsconnection-Fix-a-check-for-a-vfunc-being-implemented.patch +Patch6009: backport-gthread-posix-Free-a-memory-leak-on-error-path.patch +Patch6010: backport-gutils-Avoid-segfault-in-g_get_user_database_entry.patch +Patch6011: backport-glocalfileinfo-Fix-atime-mtime-mix.patch +Patch6012: backport-gopenuriportal-Fix-GVariantBuilder-and-string-leakage.patch +Patch6013: backport-gproxyaddressenumerator-Fix-string-leakage-on-an-invalid-input.patch +Patch6014: backport-gsocks5proxy-Fix-buffer-overflow-on-a-really-long-domain-name.patch +Patch6015: backport-gvariant-Fix-memory-leak-on-a-TYPE-CHECK-failure.patch +Patch6016: backport-gvariant-Fix-pointers-being-dereferenced-despite-NULL-checks.patch +Patch6017: backport-gtype-Fix-pointer-being-dereferenced-despite-NULL-check.patch +Patch6018: backport-add-OOM-handling-in-mimemagic.patch +Patch6019: backport-garray-buffer-overflow-fix.patch +Patch6020: backport-gdbusconnection-Move-ExportedSubtree-definition.patch +Patch6021: backport-gdbusconnection-Add-some-ownership-annotations.patch +Patch6022: backport-gdbusconnection-Make-ExportedInterface-ExportedSubtree-refcounted.patch +Patch6023: backport-gdbusconnection-Fix-race-between-method-calls-and-object-unregistration.patch +Patch6024: backport-gdbusconnection-Fix-race-between-subtree-method-call-and-unregistration.patch +Patch6025: backport-Add-D-Bus-object-subtree-unregistration-tests.patch +Patch6026: backport-gutf8-add-string-length-check.patch +Patch6027: backport-garray-Fix-integer-overflows-in-element-capacity-calculations.patch +Patch6028: backport-gdbusmessage-Disallow-zero-length-elements-in-arrays.patch +Patch6029: backport-gvariant-serialiser-Prevent-unbounded-recursion.patch +Patch6030: backport-gutils-Fix-g_find_program_in_path-to-return-an-absolute-path.patch +Patch6031: backport-Fix-memory-leak-in-gdbusauthmechanismsha1.patch +Patch6032: backport-gprintf-Fix-a-memory-leak-with-an-invalid-format.patch +Patch6033: backport-tests-Add-some-tests-for-g_vasprintf-invalid-format-strings.patch +Patch6034: backport-tests-Add-some-tests-for-g_string_append_vprintf.patch +Patch6035: backport-gdbusmethodinvocation-Fix-a-leak-on-an-early-return-path.patch +Patch6036: backport-gdbusmethodinvocation-Fix-dead-code-for-type-checking-GetAll.patch +Patch6037: backport-gdbusmethodinvocation-Drop-redundant-quote-from-warning.patch +Patch6038: backport-tests-Add-unit-tests-for-GDBusMethodInvocation.patch +Patch6039: backport-gtestdbus-Print-the-dbus-address-on-a-specific-FD-intead-of-stdout.patch +Patch6040: backport-gopenuriportal-Fix-a-use-after-free-on-an-error-path.patch +Patch6041: backport-gio-tool-Fix-a-minor-memory-leak.patch +Patch6042: backport-gsocketclient-Fix-still-reachable-references-to-cancellables.patch +Patch6043: backport-gunixmounts-Add-cache-to-g_unix_mount_points_get.patch +Patch6044: backport-Add-lock-in-_g_get_unix_mount_points-around-fsent-functions.patch +Patch6045: backport-g_get_unix_mount_points-reduce-syscalls-inside-loop.patch +Patch6046: backport-xdgmime-fix-double-free.patch +Patch6047: backport-Implement-GFileIface.set_display_name-for-resource-files.patch +Patch6048: backport-tests-dbus-appinfo-Add-test-case-for-flatpak-opening-an-invalid-file.patch +Patch6049: backport-documentportal-Fix-small-leak-in-add_documents-with-empty-URI-list.patch +Patch6050: backport-gio-tests-gdbus-proxy-threads-Unref-GVariant-s-that-we-own.patch +Patch6051: backport-gio-tests-gdbus-peer-Unref-cached-property-GVariant-value.patch +Patch6052: backport-gdesktopappinfo-Unref-the-GDBus-call-results.patch +Patch6053: backport-Handling-collision-between-standard-i-o-file-descriptors-and-newly-created-ones.patch +Patch6054: backport-glocalfileoutputstream-Do-not-double-close-an-fd-on-unlink-error.patch +Patch6055: backport-tests-Make-the-642026-test-take-100x-less-time.patch +Patch6056: backport-gmessages-Add-missing-trailing-newline-in-fallback-log-hander.patch +Patch6057: backport-Revert-Handling-collision-between-standard-i-o-filedescriptors-and-newly-created-ones.patch +patch6058: backport-gdbusinterfaceskeleton-Fix-a-use-after-free-of-a-GDBusMethodInvocation.patch +patch6059: backport-CVE-2023-24593_CVE-2023-25180-1.patch +patch6060: backport-CVE-2023-24593_CVE-2023-25180-2.patch +patch9000: backport-lib-openharmony-glib.patch BuildRequires: chrpath gcc gcc-c++ gettext perl-interpreter BUildRequires: glibc-devel libattr-devel libselinux-devel meson diff --git a/install.sh b/install.sh index eb0efd13332a87d2e27331cd2ef9f5a3ac4b23b1..4b03fd8c6b41159312ba9d81d2e60e1778f90c9c 100755 --- a/install.sh +++ b/install.sh @@ -8,6 +8,7 @@ set -e cd $1 +tar -zcvf patch.tar.gz *.patch find . ! -path "*/\.*" ! \( -name patch.tar.gz -o -name glib-2.68.1.tar.xz\ -o -name BUILD.gn\ -o -name config.gni\ @@ -17,14 +18,22 @@ find . ! -path "*/\.*" ! \( -name patch.tar.gz -o -name glib-2.68.1.tar.xz\ -o -name README.OpenSource\ -o -name glib2.spec\ -o -name COPYING\ + -o -name backport-patch.log\ -o -name ".*" \)\ -prune -print -exec rm -rf {} \; tar -zxvf patch.tar.gz tar -xvf glib-2.68.1.tar.xz mv glib-2.68.1/* . rm -rf glib-2.68.1 -patch -p1 < backport-lib-openharmony-glib.patch -patch -p1 < backport-correctly-use-3-parameters-for-clise-range.patch -patch -p1 < backport-fix-a-memory-leak.patch +echo "reset working dir success" +file="backport-patch.log" +exec < $file +while read line +do + line=${line:15} + echo $line + patch -p1 < $line --fuzz=0 --no-backup-if-mismatch +done +echo "all file patch success!" exit 0 diff --git a/patch.tar.gz b/patch.tar.gz index 2ecb8d193e9deaf1db3192ba072a1d45459d178a..4815725d3baaed3cf1b0df2d4070e921fb6a3490 100644 Binary files a/patch.tar.gz and b/patch.tar.gz differ