From 4a9448cf0c3a293501ce16ffc9de8840575bc69b Mon Sep 17 00:00:00 2001 From: Michal Schorm Date: Wed, 8 Mar 2017 15:10:11 +0100 Subject: [PATCH] Removed strmov patch, it is no longer needed. The issue was fixed long ago in both MariaDB and MySQL Removed "After=syslog.target" from systemd unit files. This option is a default one --- mariadb-strmov.patch | 30 ------------------------------ mariadb.spec | 3 +-- mysql.service.in | 1 - mysql@.service.in | 1 - 4 files changed, 1 insertion(+), 34 deletions(-) delete mode 100644 mariadb-strmov.patch diff --git a/mariadb-strmov.patch b/mariadb-strmov.patch deleted file mode 100644 index c2350c4..0000000 --- a/mariadb-strmov.patch +++ /dev/null @@ -1,30 +0,0 @@ -Remove overly optimistic definition of strmov() as stpcpy(). - -mysql uses this macro with overlapping source and destination strings, -which is verboten per spec, and fails on some Red Hat platforms. -Deleting the definition is sufficient to make it fall back to a -byte-at-a-time copy loop, which should consistently give the -expected behavior. - -Note: the particular case that prompted this patch is reported and fixed -at http://bugs.mysql.com/bug.php?id=48864. However, my faith in upstream's -ability to detect this type of error is low, and I also see little evidence -of any real performance gain from optimizing these calls. So I'm keeping -this patch. - -diff -up mariadb-10.0.15/include/m_string.h.orig mariadb-10.0.15/include/m_string.h ---- mariadb-10.0.15/include/m_string.h.orig 2014-11-27 14:40:32.622032698 +0100 -+++ mariadb-10.0.15/include/m_string.h 2014-11-27 14:38:56.211864712 +0100 -@@ -73,12 +73,6 @@ extern void *(*my_str_malloc)(size_t); - extern void *(*my_str_realloc)(void *, size_t); - extern void (*my_str_free)(void *); - --#if defined(HAVE_STPCPY) && MY_GNUC_PREREQ(3, 4) && !defined(__INTEL_COMPILER) --#define strmov(A,B) __builtin_stpcpy((A),(B)) --#elif defined(HAVE_STPCPY) --#define strmov(A,B) stpcpy((A),(B)) --#endif -- - /* Declared in int2str() */ - extern const char _dig_vec_upper[]; - extern const char _dig_vec_lower[]; diff --git a/mariadb.spec b/mariadb.spec index fb6b256..2028424 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -159,7 +159,6 @@ Source72: mariadb-server-galera.te # Comments for these patches are in the patch files # Patches common for more mysql-like packages -Patch1: %{pkgnamepatch}-strmov.patch Patch2: %{pkgnamepatch}-install-test.patch Patch4: %{pkgnamepatch}-logrotate.patch Patch5: %{pkgnamepatch}-file-contents.patch @@ -585,7 +584,6 @@ MariaDB is a community developed branch of MySQL. %prep %setup -q -n mariadb-%{version} -%patch1 -p1 %patch2 -p1 %patch4 -p1 %patch5 -p1 @@ -1382,6 +1380,7 @@ fi %changelog * Tue Mar 07 2017 Michal Schorm - 3:10.1.21-4 - Cracklib plugin enabled +- Removed strmov patch, it is no longer needed. The issue was fixed long ago in both MariaDB and MySQL * Wed Feb 15 2017 Michal Schorm - 3:10.1.21-3 - Fix for some RPMLint issues diff --git a/mysql.service.in b/mysql.service.in index 3186a32..20bd97d 100644 --- a/mysql.service.in +++ b/mysql.service.in @@ -26,7 +26,6 @@ [Unit] Description=@NICE_PROJECT_NAME@ @MAJOR_VERSION@.@MINOR_VERSION@ database server -After=syslog.target After=network.target [Service] diff --git a/mysql@.service.in b/mysql@.service.in index ab9a7cd..9338c22 100644 --- a/mysql@.service.in +++ b/mysql@.service.in @@ -33,7 +33,6 @@ [Unit] Description=@NICE_PROJECT_NAME@ @MAJOR_VERSION@.@MINOR_VERSION@ database server -After=syslog.target After=network.target [Service]