From 08a006d08a4c35d2c3ecc9a3d10cf7fd14661a84 Mon Sep 17 00:00:00 2001 From: Adam Weinberger Date: Tue, 29 Jul 2014 17:12:47 +0000 Subject: Rename all patches that contain '::' as a path separator, and use '__' instead. --- .../mysql51-server/files/patch-Docs::Makefile.in | 20 ------------ .../mysql51-server/files/patch-Docs__Makefile.in | 20 ++++++++++++ .../mysql51-server/files/patch-man::Makefile.in | 13 -------- .../mysql51-server/files/patch-man__Makefile.in | 13 ++++++++ .../files/patch-scripts::Makefile.in | 38 ---------------------- .../files/patch-scripts__Makefile.in | 38 ++++++++++++++++++++++ .../mysql51-server/files/patch-sql::mysqld.cc | 11 ------- .../mysql51-server/files/patch-sql__mysqld.cc | 11 +++++++ 8 files changed, 82 insertions(+), 82 deletions(-) delete mode 100644 databases/mysql51-server/files/patch-Docs::Makefile.in create mode 100644 databases/mysql51-server/files/patch-Docs__Makefile.in delete mode 100644 databases/mysql51-server/files/patch-man::Makefile.in create mode 100644 databases/mysql51-server/files/patch-man__Makefile.in delete mode 100644 databases/mysql51-server/files/patch-scripts::Makefile.in create mode 100644 databases/mysql51-server/files/patch-scripts__Makefile.in delete mode 100644 databases/mysql51-server/files/patch-sql::mysqld.cc create mode 100644 databases/mysql51-server/files/patch-sql__mysqld.cc (limited to 'databases/mysql51-server/files') diff --git a/databases/mysql51-server/files/patch-Docs::Makefile.in b/databases/mysql51-server/files/patch-Docs::Makefile.in deleted file mode 100644 index 51888b7712cc..000000000000 --- a/databases/mysql51-server/files/patch-Docs::Makefile.in +++ /dev/null @@ -1,20 +0,0 @@ ---- Docs/Makefile.in.orig 2008-01-29 22:43:40.000000000 +0100 -+++ Docs/Makefile.in 2008-02-14 08:21:57.000000000 +0100 -@@ -368,7 +368,7 @@ - yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@ - zlib_dir = @zlib_dir@ - EXTRA_DIST = mysql.info INSTALL-BINARY @extra_docs@ --all: all-am -+all: - - .SUFFIXES: - $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) -@@ -453,7 +453,7 @@ - install-data: install-data-am - uninstall: uninstall-am - --install-am: all-am -+install-am: - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - - installcheck: installcheck-am diff --git a/databases/mysql51-server/files/patch-Docs__Makefile.in b/databases/mysql51-server/files/patch-Docs__Makefile.in new file mode 100644 index 000000000000..51888b7712cc --- /dev/null +++ b/databases/mysql51-server/files/patch-Docs__Makefile.in @@ -0,0 +1,20 @@ +--- Docs/Makefile.in.orig 2008-01-29 22:43:40.000000000 +0100 ++++ Docs/Makefile.in 2008-02-14 08:21:57.000000000 +0100 +@@ -368,7 +368,7 @@ + yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@ + zlib_dir = @zlib_dir@ + EXTRA_DIST = mysql.info INSTALL-BINARY @extra_docs@ +-all: all-am ++all: + + .SUFFIXES: + $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +@@ -453,7 +453,7 @@ + install-data: install-data-am + uninstall: uninstall-am + +-install-am: all-am ++install-am: + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + + installcheck: installcheck-am diff --git a/databases/mysql51-server/files/patch-man::Makefile.in b/databases/mysql51-server/files/patch-man::Makefile.in deleted file mode 100644 index 0b15e2d4ca03..000000000000 --- a/databases/mysql51-server/files/patch-man::Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ ---- man/Makefile.in.orig Thu Oct 26 14:03:04 2006 -+++ man/Makefile.in Tue Nov 7 08:19:50 2006 -@@ -363,8 +363,8 @@ - yassl_libs = @yassl_libs@ - yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@ - zlib_dir = @zlib_dir@ --man1_MANS = @man1_files@ --man8_MANS = @man8_files@ -+man1_MANS = -+man8_MANS = - EXTRA_DIST = $(man1_MANS) $(man8_MANS) - all: all-am - diff --git a/databases/mysql51-server/files/patch-man__Makefile.in b/databases/mysql51-server/files/patch-man__Makefile.in new file mode 100644 index 000000000000..0b15e2d4ca03 --- /dev/null +++ b/databases/mysql51-server/files/patch-man__Makefile.in @@ -0,0 +1,13 @@ +--- man/Makefile.in.orig Thu Oct 26 14:03:04 2006 ++++ man/Makefile.in Tue Nov 7 08:19:50 2006 +@@ -363,8 +363,8 @@ + yassl_libs = @yassl_libs@ + yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@ + zlib_dir = @zlib_dir@ +-man1_MANS = @man1_files@ +-man8_MANS = @man8_files@ ++man1_MANS = ++man8_MANS = + EXTRA_DIST = $(man1_MANS) $(man8_MANS) + all: all-am + diff --git a/databases/mysql51-server/files/patch-scripts::Makefile.in b/databases/mysql51-server/files/patch-scripts::Makefile.in deleted file mode 100644 index 7881ee6f48dc..000000000000 --- a/databases/mysql51-server/files/patch-scripts::Makefile.in +++ /dev/null @@ -1,38 +0,0 @@ ---- scripts/Makefile.in.orig Tue May 8 11:42:25 2007 -+++ scripts/Makefile.in Thu May 17 09:30:48 2007 -@@ -399,21 +399,7 @@ - BUILT_SOURCES = mysql_fix_privilege_tables.sql \ - mysql_fix_privilege_tables_sql.c - --bin_SCRIPTS = @server_scripts@ \ -- msql2mysql \ -- mysql_config \ -- mysql_fix_privilege_tables \ -- mysql_fix_extensions \ -- mysql_setpermission \ -- mysql_secure_installation \ -- mysql_zap \ -- mysqlaccess \ -- mysqlbug \ -- mysql_convert_table_format \ -- mysql_find_rows \ -- mysqlhotcopy \ -- mysqldumpslow \ -- mysqld_multi -+bin_SCRIPTS = - - noinst_SCRIPTS = make_binary_distribution \ - make_sharedlib_distribution -@@ -445,11 +431,7 @@ - mysql_system_tables_fix.sql \ - CMakeLists.txt - --dist_pkgdata_DATA = fill_help_tables.sql \ -- mysql_fix_privilege_tables.sql \ -- mysql_system_tables.sql \ -- mysql_system_tables_data.sql \ -- mysql_test_data_timezone.sql -+dist_pkgdata_DATA = - - CLEANFILES = @server_scripts@ \ - make_binary_distribution \ diff --git a/databases/mysql51-server/files/patch-scripts__Makefile.in b/databases/mysql51-server/files/patch-scripts__Makefile.in new file mode 100644 index 000000000000..7881ee6f48dc --- /dev/null +++ b/databases/mysql51-server/files/patch-scripts__Makefile.in @@ -0,0 +1,38 @@ +--- scripts/Makefile.in.orig Tue May 8 11:42:25 2007 ++++ scripts/Makefile.in Thu May 17 09:30:48 2007 +@@ -399,21 +399,7 @@ + BUILT_SOURCES = mysql_fix_privilege_tables.sql \ + mysql_fix_privilege_tables_sql.c + +-bin_SCRIPTS = @server_scripts@ \ +- msql2mysql \ +- mysql_config \ +- mysql_fix_privilege_tables \ +- mysql_fix_extensions \ +- mysql_setpermission \ +- mysql_secure_installation \ +- mysql_zap \ +- mysqlaccess \ +- mysqlbug \ +- mysql_convert_table_format \ +- mysql_find_rows \ +- mysqlhotcopy \ +- mysqldumpslow \ +- mysqld_multi ++bin_SCRIPTS = + + noinst_SCRIPTS = make_binary_distribution \ + make_sharedlib_distribution +@@ -445,11 +431,7 @@ + mysql_system_tables_fix.sql \ + CMakeLists.txt + +-dist_pkgdata_DATA = fill_help_tables.sql \ +- mysql_fix_privilege_tables.sql \ +- mysql_system_tables.sql \ +- mysql_system_tables_data.sql \ +- mysql_test_data_timezone.sql ++dist_pkgdata_DATA = + + CLEANFILES = @server_scripts@ \ + make_binary_distribution \ diff --git a/databases/mysql51-server/files/patch-sql::mysqld.cc b/databases/mysql51-server/files/patch-sql::mysqld.cc deleted file mode 100644 index 4feed825cb11..000000000000 --- a/databases/mysql51-server/files/patch-sql::mysqld.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- sql/mysqld.cc.orig Sat Aug 6 03:39:41 2005 -+++ sql/mysqld.cc Sun Aug 28 20:41:38 2005 -@@ -3177,7 +3177,7 @@ - init_ssl(); - - #ifdef HAVE_LIBWRAP -- libwrapName= my_progname+dirname_length(my_progname); -+ libwrapName= (char *) my_progname+dirname_length(my_progname); - openlog(libwrapName, LOG_PID, LOG_AUTH); - #endif - diff --git a/databases/mysql51-server/files/patch-sql__mysqld.cc b/databases/mysql51-server/files/patch-sql__mysqld.cc new file mode 100644 index 000000000000..4feed825cb11 --- /dev/null +++ b/databases/mysql51-server/files/patch-sql__mysqld.cc @@ -0,0 +1,11 @@ +--- sql/mysqld.cc.orig Sat Aug 6 03:39:41 2005 ++++ sql/mysqld.cc Sun Aug 28 20:41:38 2005 +@@ -3177,7 +3177,7 @@ + init_ssl(); + + #ifdef HAVE_LIBWRAP +- libwrapName= my_progname+dirname_length(my_progname); ++ libwrapName= (char *) my_progname+dirname_length(my_progname); + openlog(libwrapName, LOG_PID, LOG_AUTH); + #endif + -- cgit v1.2.3