diff --git a/.osc/_apiurl b/.osc/_apiurl new file mode 100644 index 0000000000000000000000000000000000000000..d9fc0e9298d5764bef6ca71b67b61e83f3111e75 --- /dev/null +++ b/.osc/_apiurl @@ -0,0 +1 @@ +https://build.openeuler.org diff --git a/.osc/_build_repositories b/.osc/_build_repositories new file mode 100644 index 0000000000000000000000000000000000000000..cd0e41041103e46f27edb9f13bf8ae8496e2bb83 --- /dev/null +++ b/.osc/_build_repositories @@ -0,0 +1,2 @@ +standard_x86_64 x86_64 +standard_aarch64 aarch64 diff --git a/.osc/_buildconfig-standard_aarch64-aarch64 b/.osc/_buildconfig-standard_aarch64-aarch64 new file mode 100644 index 0000000000000000000000000000000000000000..0c3d1e0f9f7dd1de3ef6d7868e31969209ddefa6 --- /dev/null +++ b/.osc/_buildconfig-standard_aarch64-aarch64 @@ -0,0 +1,412 @@ +%define _project home:liwu123:branches:openEuler:Mainlinemysql + +### from openEuler:selfbuild:BaseOS +%define _repository mainline_standard_aarch64 + +Macros: +%vendor obs://private/home:liwu123:branches:openEuler:Mainlinemysql +%_project home:liwu123:branches:openEuler:Mainlinemysql + +### from openEuler:selfbuild:BaseOS + +%_repository mainline_standard_aarch64 +:Macros + +Preinstall: acl attr bash bzip2 coreutils diffutils python3-pygments uname-build-checks +Preinstall: filesystem glibc grep dbus lvm2 +Preinstall: libgcc m4 ncurses pam nspr sudo +Preinstall: popt readline sed tar zlib +Preinstall: pcre pcre2 info libselinux sqlite +Preinstall: findutils openssl xz zstd +Preinstall: libcap libdb elfutils krb5 sqlite +Preinstall: chkconfig util-linux lua dbus +Preinstall: filesystem libxcrypt libacl systemd-libs rpm-libs dbus-libs openssl-libs xz-libs perl-libs +Preinstall: nss nss-util nss-softokn audit +Preinstall: perl-Exporter perl-Data-Dumper openssl file device-mapper +Preinstall: perl-constant perl-Getopt-Long perl-Carp perl-Digest-MD5 +Preinstall: systemd rpm lz4 libgcrypt-devel libgcrypt libgpg-error shadow cryptsetup libsemanage + +Order: filesystem:glibc +Order: filesystem:vim-filesystem +Order: filesystem:emacs-filesystem +Order: filesystem:acl +Order: filesystem:attr +Order: filesystem:libgcc +Order: filesystem:setup +Order: filesystem:bash + +#VMinstall: device-mapper libblkid libuuid libmount libsmartcols + +Required: gcc-c++ autoconf automake binutils bzip2 gcc gdbm gettext glibc gdb ncurses perl rpm zlib rpm-build make + +FileProvides: /usr/bin/fipscheck fipscheck +FileProvides: /usr/bin/db_stat libdb-utils +FileProvides: /usr/bin/gdb-add-index gdb +FileProvides: /usr/bin/gpg2 gnupg2 +FileProvides: /usr/bin/ruby ruby +FileProvides: /usr/bin/python python2 +FileProvides: /usr/bin/python2 python2 +FileProvides: /usr/bin/python3 python3 +FileProvides: /usr/bin/dtrace systemtap-sdt-devel +FileProvides: /usr/sbin/ifconfig net-tools +FileProvides: /usr/bin/execstack execstack + +Prefer: libseccomp python2-pip wqy-zenhei-fonts openssl-devel gobject-introspection +Conflict: nss-softokn nss-softokn-freebl + +Support: uname-build-checks obs-env gcc_secure +Support: rpm-build git gcc chrpath + +Prefer: openEuler-rpm-config +Prefer: openEuler-release +Prefer: openEuler-logos euleros-logos +Prefer: openEuler-repos +Prefer: openEuler-indexhtml + +#custom prefer for openEuler +Prefer: autogen texinfo glx-utils +Prefer: jbig2dec java-1.8.0-openjdk-devel +Prefer: mesa-devel fontpackages-filesystem +#end +# 解决postgresql和libpq冲突，两个包同时提供libpq.so.5(64bit) +Prefer: postgresql-lib +Prefer: java-1.7.0-openjdk-javadoc lxpolkit rubygem-minitest python3-capstone python2-webtest python-mock +Prefer: sblim-sfcb crda clamav-data java-1.8.0-openjdk-javadoc pkcs11-helper-devel atlas +Prefer: Lmod +Prefer: lua +Prefer: selinux-policy-mls perl-Archive-Extract-Z-Compress-Zlib perl-Archive-Extract-bz2-IO-Uncompress-Bunzip2 +Prefer: binutils-devel python2-fabric perl-Archive-Extract-gz-Compress-Zlib perl-Archive-Extract-lzma-IO-Uncompress-UnLzma perl-Archive-Extract-zip-Archive-Zip +Prefer: perl-Archive-Extract-lzma-IO-Uncompress-UnLzma perl-Archive-Extract-tar-Archive-Tar perl-Archive-Extract-tar-tar perl-Archive-Extract-tar-Archive-Tar +Prefer: perl-Archive-Extract-tbz-Archive-Tar-IO-Uncompress-Bunzip2 perl-Archive-Extract-txz-Archive-Tar-IO-Uncompress-UnXz perl-Archive-Extract-xz-IO-Uncompress-UnXz +Prefer: postfix +Prefer: selinux-policy-mls +Prefer: libverto-tevent java-1.7.0-openjdk-devel kernel-devel +Prefer: postfix selinux-policy-minimum +Prefer: atlas-sse3 +Prefer: python-setuptools +Prefer: elinks +Prefer: libverto-libev +Prefer: lua +Prefer: kernel +Prefer: rubygem-rspec +Prefer: emacs +Prefer: perl-Archive-Extract-tgz-Archive-Tar-Compress-Zlib +Prefer: php-symfony3-options-resolver +Prefer: golang-gopkg-check-devel +Prefer: kernel-devel +Prefer: rust-serde_derive-devel +Prefer: openni-devel +Prefer: perl-Archive-Extract-tgz-Archive-Tar-Compress-Zlib perl-Archive-Extract-Z-Compress-Zlib perl-Archive-Extract-bz2-IO-Uncompress-Bunzip2 +Prefer: perl-Archive-Extract-gz-Compress-Zlib rubygem-minitest rubygem-rspec gnuplot +Prefer: perl-Archive-Extract-lzma-IO-Uncompress-UnLzma perl-Archive-Extract-tar-Archive-Tar perl-Archive-Extract-tbz-Archive-Tar-IO-Uncompress-Bunzip2 +Prefer: perl-Archive-Extract-txz-Archive-Tar-IO-Uncompress-UnXz perl-Archive-Extract-xz-IO-Uncompress-UnXz perl-Archive-Extract-zip-Archive-Zip +Prefer: gnome-themes-standard +Prefer: jbigkit-libs +Prefer: libcdio-paranoia libcdio +Prefer: java-1.8.0-openjdk + +Substitute: /usr/bin/protoc protobuf +Substitute: %{_bindir}/pathfix.py python3-devel +Substitute: %{_bindir}/sgml2xml opensp +Substitute: %{_bindir}/nsgmls opensp +Substitute: %{_bindir}/ps procps-ng + +Substitute: %{_bindir}/sgml2xml opensp +Substitute: python-dbus python2-dbus +Substitute: /usr/sbin/useradd shadow +Substitute: /usr/sbin/groupadd shadow +Substitute: /usr/sbin/userdel shadow +Substitute: /usr/sbin/groupdel shadow +Substitute: /usr/bin/pod2man perl-podlators +Substitute: %{_bindir}/dtrace systemtap +Substitute: %{_bindir}/cmake cmake +Substitute: %{_bindir}/dtrace systemtap-sdt-devel +Substitute: %{_bindir}/cmake cmake +Substitute: %{_bindir}/checksec checksec +Substitute: %{_bindir}/sphinx-build python2-sphinx +Substitute: /usr/sbin/sendmail sendmail +Substitute: /usr/bin/pod2man perl-podlators +Substitute: /usr/bin/pdflatex texlive-latex-bin-bin +Substitute: /usr/bin/makeindex texlive-makeindex-bin +Substitute: /lib/libc.so.6 glibc +Substitute: /usr/lib/libc.so glibc +Substitute: /lib64/libc.so.6 glibc +Substitute: /usr/lib64/libc.so glibc +Substitute: /usr/bin/xsltproc libxslt +Substitute: /etc/init.d chkconfig +Substitute: %{_includedir}/linux/if.h kernel-headers +Substitute: /usr/bin/yelp-build yelp-tools +Substitute: /usr/bin/ducktype python3-mallard-ducktype +Substitute: /usr/bin/chrpath chrpath +Substitute: /usr/bin/tclsh tcl +Substitute: /usr/bin/file file +Substitute: /usr/bin/base64 coreutils +Substitute: /usr/bin/head coreutils +Substitute: /usr/bin/sha256sum coreutils +Substitute: /usr/bin/tr coreutils +Substitute: /usr/bin/jq jq +Substitute: %{_bindir}/pkg-config pkgconf-pkg-config +Substitute: /usr/bin/gtk-update-icon-cache gtk-update-icon-cache +Substitute: /usr/bin/c++ c++ +Substitute: %{_bindir}/sphinx-build-3 python3-sphinx +Substitute: /usr/bin/awk gawk +Substitute: /usr/bin/pathfix.py python3-devel +Substitute: /usr/bin/doxygen doxygen +Substitute: /usr/bin/execstack execstack +Substitute: /usr/bin/g-ir-scanner gobject-introspection-devel +Substitute: %{_bindir}/phpab php-theseer-autoload +Substitute: %{_bindir}/phpunit php-phpunit-PHPUnit + +Substitute: %{_bindir}/rst2html python3-docutils +Substitute: %{_bindir}/sphinx-build-2 python2-sphinx +Substitute: %{_bindir}/valac vala + +Substitute: /usr/bin/pygmentize python3-pygments +Substitute: /usr/bin/perl perl +Substitute: /usr/bin/iconv glibc-common +Substitute: %{_bindir}/hostname hostname +Substitute: %{_bindir}/a2x asciidoc +Substitute: /usr/bin/certtool gnutls-utils +Substitute: /usr/bin/socat socat +Substitute: /usr/sbin/ss iproute +Substitute: /usr/bin/cmp diffutils +Substitute: /usr/bin/rename util-linux +Substitute: /usr/sbin/sysctl procps-ng +Substitute: %{_bindir}/libgcrypt-config libgcrypt-devel +Substitute: /usr/bin/man man-db +Substitute: /usr/bin/dtrace systemtap-sdt-devel +Substitute: /usr/sbin/ifconfig net-tools +Substitute: %{_bindir}/sphinx-build python2-sphinx +Substitute: /usr/include/gnu/stubs-32.h glibc32 +Substitute: /usr/bin/dbus-launch dbus-x11 +Substitute: /usr/bin/2to3 python3-devel +Substitute: %{_bindir}/xsltproc libxslt +Substitute: %{_bindir}/sed sed +Substitute: %{_bindir}/sphinx-build-2 python2-sphinx +Substitute: %{_bindir}/sphinx-build-3 python3-sphinx +Substitute: python%{python3_pkgversion}-devel python3-devel +Substitute: python%{python3_pkgversion}-setuptools python3-setuptools +Substitute: python%{python3_pkgversion}-chardet python3-chardet +Substitute: python%{python3_pkgversion}-urllib3 python3-urllib3 +Substitute: python%{python3_pkgversion}-idna python3-idna +Substitute: python%{python3_pkgversion}-pytest python3-pytest +Substitute: python%{python3_pkgversion}-pytest-cov python3-pytest-cov +Substitute: python%{python3_pkgversion}-pytest-httpbin python3-pytest-httpbin +Substitute: python%{python3_pkgversion}-pytest-mock python3-pytest-mock +Substitute: python%{python3_pkgversion}-pip python3-pip +Substitute: python%{python3_pkgversion}-wheel python3-wheel +Substitute: /usr/bin/dnf dnf +Substitute: /usr/bin/zip zip +Substitute: pkgconfig(libsystemd-journal) systemd-devel +Substitute: %{_prefix}/share/i18n/locales/de_DE glibc-locale-source +Substitute: /usr/bin/ssh-add openssh-clients +Substitute: /usr/bin/ssh-agent openssh-clients +Substitute: /usr/bin/ssh openssh-clients +Substitute: /usr/bin/appstream-util libappstream-glib +Substitute: /usr/bin/xmlto xmlto +Substitute: /etc/init.d chkconfig +Substitute: %{_includedir}/linux/if.h kernel-headers +Substitute: /usr/bin/dbus-launch dbus-x11 +Substitute: /lib/libc.so.6 glibc32 +Substitute: /usr/lib/libc.so glibc32 +Substitute: /lib64/libc.so.6 glibc +Substitute: /usr/lib64/libc.so glibc +Substitute: /usr/bin/qemu-img qemu +Substitute: /usr/bin/pod2man perl-podlators +Substitute: /usr/bin/appstream-util libappstream-glib +Substitute: /usr/bin/xmlto xmlto +Substitute: /usr/bin/pod2html perl +Substitute: /usr/sbin/mke2fs e2fsprogs +Substitute: %{_libdir}/krb5/plugins/kdb/db2.so krb5-libs +Substitute: /usr/bin/gtk-encode-symbolic-svg gtk3-devel +Substitute: /usr/bin/dos2unix dos2unix +Substitute: /usr/bin/unix2dos dos2unix +Substitute: /usr/bin/which which +Substitute: /usr/bin/epstopdf texlive-epstopdf +Substitute: /usr/bin/desktop-file-validate desktop-file-utils +#Substitute: pkgconfig(libavcodec) ffmpeg-devel +Substitute: /usr/bin/valac vala +Substitute: %{_bindir}/xsltproc libxslt +Substitute: %{_bindir}/desktop-file-validate desktop-file-utils +Substitute: %{_bindir}/appstream-util libappstream-glib +Substitute: /usr/bin/ssh-agent openssh-clients +Substitute: /usr/bin/ssh-add openssh-clients +Substitute: /usr/bin/2to3 python3-devel +Substitute: /usr/bin/texi2dvi texinfo-tex +Substitute: /usr/bin/ssh openssh-clients +Substitute: %{_bindir}/pod2html perl-podlators +Substitute: %{_bindir}/pod2man perl-podlators +Substitute: /usr/bin/pod2text perl-podlators +Substitute: /usr/bin/ping iputils +Substitute: /usr/bin/wget wget +Substitute: /usr/bin/qemu-img qemu-img +Substitute: /usr/bin/kreadconfig5 kf5-kconfig-core +Substitute: /usr/bin/xmllint libxml2 +Substitute: /usr/bin/nc nmap-ncat +Substitute: /usr/bin/lsof lsof +Substitute: /usr/bin/ps procps-ng +Substitute: %{__perl} perl +Substitute: /usr/bin/rpcgen rpcgen +Substitute: %{_bindir}/latex texlive-latex +Substitute: /usr/bin/sphinx-build python2-sphinx +Substitute: %{_bindir}/sphinx-build python2-sphinx +Substitute: %{_bindir}/memcached memcached +Substitute: /usr/bin/tox python3-tox +Substitute: %{_bindir}/2to3 python3-devel +Substitute: %{_bindir}/mongod mongodb-server +Substitute: %{_bindir}/redis-server redis +Substitute: %{_bindir}/pkill procps-ng +Substitute: %{_bindir}/netstat net-tools +Substitute: %{_bindir}/gpg gnupg +Substitute: %{__make} make +Substitute: %{_datadir}/a2ps/afm/phvr.afm a2ps +Substitute: %{_bindir}/podselect perl-Pod-Parser +Substitute: /usr/bin/autopoint gettext-devel +Substitute: %{_bindir}/perl perl +Substitute: %{_bindir}/openssl openssl +Substitute: %{_bindir}/man man-db +Substitute: /usr/bin/zip zip +Substitute: /usr/bin/c++ gcc +Substitute: /usr/bin/makeinfo texinfo +Substitute: %{_includedir}/magic.h file-devel +Substitute: python2dist(markdown) python2-markdown +Substitute: %{_bindir}/python python-unversioned-command +Substitute: %{_includedir}/gnu/stubs-32.h glibc32 +Substitute: /usr/bin/dnf dnf +Substitute: /usr/bin/getopt util-linux +Substitute: mysql-devel mariadb-connector-c-devel +Substitute: gnupg gnupg2 +Substitute: audiofile{?_isa} audiofile +Substitute: /etc/pki/tls/certs/ca-bundle.crt ca-certificates + +Release: %{?release} + +Macros: +%openeuler 1 +%openEuler 1 +%_specdir %{_topdir}/SOURCES +%openblas_arches aarch64 x86_64 + +%_vendor openEuler +%_isa %{?__isa:(%{__isa})}%{!?__isa:%{nil}} +%vendor http://openeuler.org +%distribution Huawei openEuler +%packager http://openeuler.org + +#for sign +%_signature gpg +%_gpg_path /home/abuild/.gnupg +%_gpg_name private OBS +%__gpg_sign_cmd %{__gpg} \ + gpg --no-verbose --no-armor \ + %{?_gpg_digest_algo:--digest-algo %{_gpg_digest_algo}} \ + --batch --pinentry-mode=loopback --passphrase="" \ + --no-secmem-warning \ + %{?_gpg_sign_cmd_extra_args:%{_gpg_sign_cmd_extra_args}} \ + -u "%{_gpg_name}" -sbo %{__signature_filename} %{__plaintext_filename} + +%kernel_module_package_buildreqs kernel-devel openEuler-rpm-config + +%with_python3 1 +%with_python2 1 +%python3_pkgversion 3 +#%__os_install_post %{nil} +%python3_pkgversion 3 +%golang_arches %{ix86} x86_64 %{arm} aarch64 ppc64le s390x +%efi_arch aa64 +%efi_vendor openEuler +%efi aarch64 x86_64 +%unsignedaa64 shim-unsigned-aarch64 +%unsignedx64 shim-unsigned-x64 +%unsignedia32 shim-unsigned-ia32 +%shimveraa64 15 +%shimverx64 15 +%shimveria32 15 +%valgrind_arches %{ix86} x86_64 %{arm} aarch64 ppc64le s390x +%mono_arches %{ix86} x86_64 %{arm} aarch64 ppc64le s390x +%openblas_arches %{ix86} x86_64 %{arm} aarch64 ppc64le s390x +%with_ocaml 1 +%dist .oe1 + +%ext_info .gz +%ext_man .gz +#%_unpackaged_files_terminate_build 0 + +%info_add(:-:) test -x /sbin/install-info -a -f %{?2}%{?!2:%{_infodir}}/%{1}%ext_info && /sbin/install-info --info-dir=%{?2}%{?!2:%{_infodir}} %{?2}%{?!2:%{_infodir}}/%{1}%ext_info \ +%{nil} + +%info_del(:-:) test -x /sbin/install-info -a ! -f %{?2}%{?!2:%{_infodir}}/%{1}%ext_info && /sbin/install-info --quiet --delete --info-dir=%{?2}%{?!2:%{_infodir}} %{?2}%{?!2:%{_infodir}}/%{1}%ext_info \ +%{nil} + +%gcc_secure_exclude "podman.spec|gcc.spec|arm-trusted-firmware.spec|docker-engine-openeuler.spec|arts.spec|runc-openeuler.spec|kata-containers.spec|dyninst.spec|ipxe.spec|tboot.spec|syslinux.spec|gcc-libraries.spec|kpatch.spec|gdb.spec|xorg-x11-server.spec|xorg-x11-drv-fbdev.spec|xorg-x11-drv-vesa.spec|xorg-x11-drv-ati.spec|xorg-x11-drv-dummy.spec|xorg-x11-drv-intel.spec|xorg-x11-drv-nouveau.spec|xorg-x11-drv-qxl.spec|xorg-x11-drv-v4l.spec|xorg-x11-drv-vmware.spec|xorg-x11-drv-evdev.spec|xorg-x11-drv-synaptics.spec|xorg-x11-drv-vmmouse.spec|xorg-x11-drv-void.spec|xorg-x11-drv-wacom.spec|hivex.spec|gimp.spec|memstomp.spec|supermin.spec|system-config-firewall.spec|isdn4k-utils.spec|emacs.spec|graphviz.spec|buildah.spec|rhash.spec" + +%_build_id_links none + +#custom macros +%openEuler 1 +%disable_rpath \ +sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool \ +sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool + +%delete_la_and_a \ +find $RPM_BUILD_ROOT -type f -name "*.la" -delete \ +find $RPM_BUILD_ROOT -type f -name "*.a" -delete + +%delete_la find $RPM_BUILD_ROOT -type f -name "*.la" -delete + +%chrpath_delete find $RPM_BUILD_ROOT/ -type f -exec file {} ';' | grep "\" | awk -F ':' '{print $1}' | xargs -i chrpath --delete {} + +%package_help \ +%package help \ +Summary: Documents for %{name} \ +Buildarch: noarch \ +Requires: man info \ +\ +%description help \ +Man pages and other related documents for %{name}. + +#%sbin_installinfo_rm bc.info +#%sbin_installinfo_rm bc.info.gz + +%install_info() \ +/sbin/install-info %1 %{_infodir}/dir || : + +%install_info_rm() \ +/sbin/install-info --remove %1 %{_infodir}/dir || : +:Macros +### from openEuler:Mainline +%define _repository standard_aarch64 + +Macros: + +### from openEuler:Mainline + +%_repository standard_aarch64 +:Macros + +Preinstall: libacl systemd-libs rpm-libs dbus-libs +Preinstall: perl-libs ncurses-libs +Preinstall: pesign-obs-integration +Preinstall: digest-list-tools selinux-policy-targeted +Prefer: perl-libs fonts-filesystem apr libnghttp2 dnf dnf-plugins-core mozjs60 gstreamer1-plugins-base jboss-websocket-1.0-api +Prefer: nodejs-nan0 uglify-js boost-devel protobuf-java protobuf-devel +##%ifarch x86_64 +##Preinstall: !libacl +##%endif +Prefer: ccid libglvnd-devel device-mapper-persistent-data dbus-libs rpm-libs +Prefer: libffi7 libffi6 ima-evm-utils +Prefer: maven pipewire +Prefer: jetty-http jetty-io jetty-security jetty-server jetty-servlet jetty-util + +Substitute: librpm.so.8()(64bit) rpm-libs +Substitute: "python(abi) = 3.7" "python(abi) = 3.8" + +Macros: +%nocheck_exclude qt5-qtbase +%__brp_digest_list /usr/lib/rpm/brp-digest-list %{buildroot} +%nodejs_arches aarch64 x86_64 +:Macros +Macros: + +%distribution home:liwu123:branches:openEuler:Mainlinemysql / standard_aarch64 +%_project home:liwu123:branches:openEuler:Mainlinemysql diff --git a/.osc/_buildinfo-standard_aarch64-aarch64.xml b/.osc/_buildinfo-standard_aarch64-aarch64.xml new file mode 100644 index 0000000000000000000000000000000000000000..501afcaa1b421ded11f505507041d1785f97f04c --- /dev/null +++ b/.osc/_buildinfo-standard_aarch64-aarch64.xml @@ -0,0 +1,407 @@ + + aarch64 + 0 + mysql + mysql-common + mysql-config + mysql-devel + mysql-errmsg + mysql-help + mysql-libs + mysql-server + mysql-test + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.osc/_files b/.osc/_files new file mode 100644 index 0000000000000000000000000000000000000000..9d5018b16ad2a1f0a907076da6275fc99bbfe973 --- /dev/null +++ b/.osc/_files @@ -0,0 +1,4 @@ + + + + diff --git a/.osc/_meta b/.osc/_meta new file mode 100644 index 0000000000000000000000000000000000000000..abd5d68c1809841db3d114ffdf221f37b6fa858b --- /dev/null +++ b/.osc/_meta @@ -0,0 +1,11 @@ + + + <description/> + <publish> + <enable/> + </publish> + <useforbuild> + <enable/> + </useforbuild> +</package> + diff --git a/.osc/_osclib_version b/.osc/_osclib_version new file mode 100644 index 0000000000000000000000000000000000000000..d3827e75a5cadb9fe4a27e1cb9b6d192e7323120 --- /dev/null +++ b/.osc/_osclib_version @@ -0,0 +1 @@ +1.0 diff --git a/.osc/_package b/.osc/_package new file mode 100644 index 0000000000000000000000000000000000000000..0eaebf1275b3a93779cc8c24dbd1e1dc0a9cc40c --- /dev/null +++ b/.osc/_package @@ -0,0 +1 @@ +mysql diff --git a/.osc/_project b/.osc/_project new file mode 100644 index 0000000000000000000000000000000000000000..615a7f35101b9e32396b32c01f87d5e9a8f5fcf7 --- /dev/null +++ b/.osc/_project @@ -0,0 +1 @@ +home:liwu123:branches:openEuler:Mainlinemysql diff --git a/.osc/_service b/.osc/_service new file mode 100644 index 0000000000000000000000000000000000000000..ed9d5621ddf125456f0ca6f0dee414881cf57933 --- /dev/null +++ b/.osc/_service @@ -0,0 +1,6 @@ +<services> + <service name="tar_scm_kernel_repo"> + <param name="scm">repo</param> + <param name="url">next/openEuler/mysql</param> + </service> +</services> diff --git a/.osc/_to_be_added b/.osc/_to_be_added new file mode 100644 index 0000000000000000000000000000000000000000..33dd880d8522119a437440968a1f5a4640961f1e --- /dev/null +++ b/.osc/_to_be_added @@ -0,0 +1,30 @@ +mysql-scripts.patch +mysql-check-socket.sh +my.cnf.in +mysql-paths.patch +disable-moutline-atomics-for-aarch64.patch +README.mysql-license +mysql-boost-8.0.26.tar.gz +mysql.spec +boost-1.57.0-mpl-print.patch +mysql-scripts-common.sh +mysql-prepare-db-dir.sh +mysql-boost-8.0.24.tar.gz +mysql-sharedir.patch +server.cnf.in +mysql-s390-tsc.patch +mysql-install-test.patch +mysql.tmpfiles.d.in +mysql@.service.in +mysql_config_multilib.sh +mysql-fix-includes-robin-hood.patch +mysql-file-contents.patch +mysql.yaml +boost-1.58.0-pool.patch +mysql-arm32-timer.patch +mysql.rpmlintrc +README.mysql-docs +mysql-rpath.patch +mysql.service.in +mysql-wait-stop.sh +mysql-chain-certs.patch diff --git a/.osc/_to_be_deleted b/.osc/_to_be_deleted new file mode 100644 index 0000000000000000000000000000000000000000..78db8c5a5fccf64cdb6f4820751044612ac82df2 --- /dev/null +++ b/.osc/_to_be_deleted @@ -0,0 +1 @@ +_service diff --git a/mysql-boost-8.0.24.tar.gz b/mysql-boost-8.0.26.tar.gz similarity index 91% rename from mysql-boost-8.0.24.tar.gz rename to mysql-boost-8.0.26.tar.gz index 7f63a29a29c86dc6b3596e9e89a8d00a0fbc0d99..e48b2c877aac6211f955fce0f8bac4ecbc8d75b8 100644 Binary files a/mysql-boost-8.0.24.tar.gz and b/mysql-boost-8.0.26.tar.gz differ diff --git a/mysql.spec b/mysql.spec index 7b7f8abe9e10877ef8043f10cd2b6875a35bf560..03f6b103a30f3202bcdb2627f04f3258fdd1de05 100644 --- a/mysql.spec +++ b/mysql.spec @@ -29,12 +29,12 @@ %bcond_without conflicts %global sameevr %{?epoch:%{epoch}:}%{version}-%{release} Name: mysql -Version: 8.0.24 -Release: 1 +Version: 8.0.26 +Release: 3 Summary: MySQL client programs and shared libraries URL: http://www.mysql.com License: GPLv2 with exceptions and LGPLv2 and BSD -Source0: https://cdn.mysql.com/Downloads/MySQL-8.0/mysql-boost-%{version}.tar.gz +Source0: https://dev.mysql.com/get/Downloads/MySQL-8.0/mysql-boost-%{version}.tar.gz Source2: mysql_config_multilib.sh Source3: my.cnf.in Source6: README.mysql-docs @@ -78,7 +78,7 @@ BuildRequires: perl(Getopt::Long) perl(if) perl(IO::File) perl(IO::Handle) BuildRequires: perl(IO::Socket::INET) perl(IPC::Open3) perl(JSON) perl(lib) perl(LWP::Simple) BuildRequires: perl(Memoize) perl(Net::Ping) perl(POSIX) perl(Socket) perl(strict) BuildRequires: perl(Sys::Hostname) perl(Test::More) perl(Time::HiRes) perl(Time::localtime) -BuildRequires: perl(warnings) systemd +BuildRequires: perl(warnings) systemd m4 Requires: bash coreutils grep %{name}-common%{?_isa} = %{sameevr} Provides: bundled(boost) = %{boost_bundled_version} %if %{with mysql_names} @@ -536,6 +536,14 @@ fi %{_mandir}/man1/mysql_config.1* %changelog +* Mon Aug 2 2021 liwu <liwu13@huawei.com> - 8.0.26-1 +- Upgrade mysql to 8.0.26,fix CVES:CVE-2021-2356 CVE-2021-2339 CVE-2021-2354 + CVE-2021-2352 CVE-2021-2340 + +* Wed Jun 16 2021 zhaoyao <zhaoyao32@huawei.com> - 8.0.24-2 +- Fix buiding error: Built target mysqlgcs error +- Add m4 in BuildRequires + * Thu May 8 2021 wutao <wutao61@huawei.com> - 8.0.24-1 - Upgrade mysql to 8.0.24, fix CVES: CVE-2021-2166 CVE-2021-2146 CVE-2021-2162 CVE-2021-2212 CVE-2021-2299 CVE-2021-2293 CVE-2021-2215