Bug 215574 - databases/mariadb55-server Applying patches fail
Summary: databases/mariadb55-server Applying patches fail
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Some People
Assignee: freebsd-ports-bugs (Nobody)
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2016-12-26 10:22 UTC by Ivan Rozhuk
Modified: 2017-01-28 22:39 UTC (History)
6 users (show)

See Also:
bugzilla: maintainer-feedback? (never)


Attachments
new working files/patch-scripts_mysqld_safe.sh (668 bytes, application/x-sh)
2016-12-29 13:47 UTC, Fabian Wenk
no flags Details
Possible fix (781 bytes, text/plain)
2016-12-29 17:11 UTC, Gary
no flags Details

Note You need to log in before you can comment on or make changes to this bug.
Description Ivan Rozhuk 2016-12-26 10:22:21 UTC
===>  Applying extra patch /usr/ports/databases/mariadb55-server/files/extra-patch-include_my_compare.h
===>  Applying FreeBSD patches for mariadb55-server-5.5.54
1 out of 2 hunks failed--saving rejects to scripts/mysqld_safe.sh.rej
=> Patch patch-scripts_mysqld_safe.sh failed to apply cleanly.
=> Patch(es) patch-client_CMakeLists.txt patch-cmake__jemalloc.cmake patch-CMakeLists.txt patch-extra_CMakeLists.txt patch-extra_yassl_taocrypt_src_integer.cpp patch-include_CMakeLists.txt patch-libmysql_CMakeLists.txt patch-libservices_CMakeLists.txt patch-man_CMakeLists.txt patch-mysys_default.c patch-regex_CMakeLists.txt patch-scripts_CMakeLists.txt patch-scripts_mysql_config.sh applied cleanly.
*** Error code 1

Stop.
make[1]: stopped in /usr/ports/databases/mariadb55-server
*** Error code 1


cat /tmp/ports/usr/ports/databases/mariadb55-server/work/mariadb-5.5.54/scripts/mysqld_safe.sh.rej
@@ -480,7 +480,7 @@
   then
     log_error "WARNING: Found $DATADIR/my.cnf
 The data directory is a deprecated location for my.cnf, please move it to
-$MY_BASEDIR_VERSION/my.cnf"
+$MY_BASEDIR_VERSION/etc/my.cnf"
     MYSQL_HOME=$DATADIR
   else
     MYSQL_HOME=$MY_BASEDIR_VERSION
Comment 1 Fabian Wenk 2016-12-29 13:47:04 UTC
Created attachment 178375 [details]
new working files/patch-scripts_mysqld_safe.sh

Here is an updated files/patch-scripts_mysqld_safe.sh. This has been tested on a FreeBSD 10.3 amd64.
Comment 2 Ivan Rozhuk 2016-12-29 14:59:53 UTC
It work. Thanks!
Comment 3 Gary 2016-12-29 17:11:08 UTC
Created attachment 178381 [details]
Possible fix

I suspect the attached replacement for the files/patch-scripts_mysqld_safe.sh file will fix the issue.  It certainly applies cleanly when running "make clean patch"
Comment 4 Gary 2016-12-29 17:13:27 UTC
sorry, hadn't refreshed bug web page before posting last comment
Comment 5 Gary 2017-01-02 14:59:20 UTC
Can someone fix the port please?  It's still broken
Comment 6 Gary 2017-01-09 22:31:28 UTC
Port fixed in SVN revision 430977.  Now builds for me
Comment 7 Tilman Keskinoz freebsd_committer freebsd_triage 2017-01-28 22:39:46 UTC
Fixed on Jan 9 by mat