BUG#25719975 SHEBANG HARD CODED AS /USR/BIN/PERL IN SCRIPTS, BREAKS ON FREEBSD

trosten · trosten · commit 5d4cfb30e517 · 2017-03-28T13:22:32.000+02:00
Use cmake variable to adjust shebang to platform.
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -104,6 +104,13 @@ ELSE()
     "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
 ENDIF()
 
+
+IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
+  SET (PERL_PATH "/usr/local/bin/perl")
+ELSE()
+  SET (PERL_PATH "/usr/bin/perl")
+ENDIF()
+
 IF(UNIX)
   # SHELL_PATH, FIND_PROC, CHECK_PID are used by mysqld_safe
 IF(CMAKE_SYSTEM_NAME MATCHES "SunOS")
diff --git a/scripts/dheadgen.pl b/scripts/dheadgen.pl
@@ -1,10 +1,4 @@
-#!/usr/bin/perl -w
-
-#
-# Copyright (c) 2008, 2009 Sun Microsystems, Inc.
-# Use is subject to license terms.
-#
-
+# Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
diff --git a/scripts/mysql_config.pl.in b/scripts/mysql_config.pl.in
@@ -1,7 +1,7 @@
-#!/usr/bin/perl
+#!@PERL_PATH@
 # -*- cperl -*-
 #
-# Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/scripts/mysql_convert_table_format.sh b/scripts/mysql_convert_table_format.sh
@@ -1,6 +1,5 @@
-#!/usr/bin/perl
-# Copyright (c) 2000-2002, 2006, 2007 MySQL AB, 2009 Sun Microsystems, Inc.
-# Use is subject to license terms.
+#!@PERL_PATH@
+# Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/scripts/mysql_find_rows.sh b/scripts/mysql_find_rows.sh
@@ -1,6 +1,5 @@
-#!/usr/bin/perl
-# Copyright (c) 2000, 2004, 2006 MySQL AB, 2009 Sun Microsystems, Inc.
-# Use is subject to license terms.
+#!@PERL_PATH@
+# Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/scripts/mysql_fix_extensions.sh b/scripts/mysql_fix_extensions.sh
@@ -1,7 +1,6 @@
-#!/usr/bin/perl
+#!@PERL_PATH@
 
-# Copyright (c) 2001 MySQL AB, 2009 Sun Microsystems, Inc.
-# Use is subject to license terms.
+# Copyright (c) 2001, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Library General Public
diff --git a/scripts/mysql_install_db.pl.in b/scripts/mysql_install_db.pl.in
@@ -1,7 +1,7 @@
-#!/usr/bin/perl
+#!@PERL_PATH@
 # -*- cperl -*-
 #
-# Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/scripts/mysql_secure_installation.pl.in b/scripts/mysql_secure_installation.pl.in
@@ -1,7 +1,7 @@
-#!/usr/bin/perl
+#!@PERL_PATH@
 # -*- cperl -*-
 #
-# Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/scripts/mysql_setpermission.sh b/scripts/mysql_setpermission.sh
@@ -1,8 +1,7 @@
-#!/usr/bin/perl
+#!@PERL_PATH@
 ## Emacs, this is -*- perl -*- mode? :-)
 
-# Copyright (c) 2000, 2007 MySQL AB, 2009 Sun Microsystems, Inc.
-# Use is subject to license terms.
+# Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Library General Public
diff --git a/scripts/mysql_zap.sh b/scripts/mysql_zap.sh
@@ -1,6 +1,5 @@
-#!/usr/bin/perl
-# Copyright (c) 2000-2002, 2004, 2006 MySQL AB, 2009 Sun Microsystems, Inc.
-# Use is subject to license terms.
+#!@PERL_PATH@
+# Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/scripts/mysqlaccess.conf b/scripts/mysqlaccess.conf
diff --git a/scripts/mysqlaccess.sh b/scripts/mysqlaccess.sh
@@ -1,6 +1,6 @@
-#!/usr/bin/perl
+#!@PERL_PATH@
 
-# Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Library General Public
diff --git a/scripts/mysqld_multi.sh b/scripts/mysqld_multi.sh
@@ -1,6 +1,6 @@
-#!/usr/bin/perl
+#!@PERL_PATH@
 
-# Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Library General Public
diff --git a/scripts/mysqldumpslow.sh b/scripts/mysqldumpslow.sh
@@ -1,7 +1,6 @@
-#!/usr/bin/perl
+#!@PERL_PATH@
 
-# Copyright (c) 2000-2002, 2005-2008 MySQL AB, 2008, 2009 Sun Microsystems, Inc.
-# Use is subject to license terms.
+# Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Library General Public
diff --git a/scripts/mysqlhotcopy.sh b/scripts/mysqlhotcopy.sh
@@ -1,6 +1,6 @@
-#!/usr/bin/perl
+#!@PERL_PATH@
 
-# Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Library General Public

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`		`-#!/usr/bin/perl`
	`1`	`+#!@PERL_PATH@`
`2`	`2`	`# -- cperl --`
`3`	`3`	`#`
`4`		`-# Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.`
	`4`	`+# Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.`
`5`	`5`	`#`
`6`	`6`	`# This program is free software; you can redistribute it and/or modify`
`7`	`7`	`# it under the terms of the GNU General Public License as published by`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`		`-#!/usr/bin/perl`
`2`		`-# Copyright (c) 2000-2002, 2006, 2007 MySQL AB, 2009 Sun Microsystems, Inc.`
`3`		`-# Use is subject to license terms.`
	`1`	`+#!@PERL_PATH@`
	`2`	`+# Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.`
`4`	`3`	`#`
`5`	`4`	`# This program is free software; you can redistribute it and/or modify`
`6`	`5`	`# it under the terms of the GNU General Public License as published by`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`		`-#!/usr/bin/perl`
`2`		`-# Copyright (c) 2000, 2004, 2006 MySQL AB, 2009 Sun Microsystems, Inc.`
`3`		`-# Use is subject to license terms.`
	`1`	`+#!@PERL_PATH@`
	`2`	`+# Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.`
`4`	`3`	`#`
`5`	`4`	`# This program is free software; you can redistribute it and/or modify`
`6`	`5`	`# it under the terms of the GNU General Public License as published by`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`		`-#!/usr/bin/perl`
	`1`	`+#!@PERL_PATH@`
`2`	`2`
`3`		`-# Copyright (c) 2001 MySQL AB, 2009 Sun Microsystems, Inc.`
`4`		`-# Use is subject to license terms.`
	`3`	`+# Copyright (c) 2001, 2017, Oracle and/or its affiliates. All rights reserved.`
`5`	`4`	`#`
`6`	`5`	`# This program is free software; you can redistribute it and/or`
`7`	`6`	`# modify it under the terms of the GNU Library General Public`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`		`-#!/usr/bin/perl`
`2`		`-# Copyright (c) 2000-2002, 2004, 2006 MySQL AB, 2009 Sun Microsystems, Inc.`
`3`		`-# Use is subject to license terms.`
	`1`	`+#!@PERL_PATH@`
	`2`	`+# Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.`
`4`	`3`	`#`
`5`	`4`	`# This program is free software; you can redistribute it and/or modify`
`6`	`5`	`# it under the terms of the GNU General Public License as published by`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`		`-#!/usr/bin/perl`
	`1`	`+#!@PERL_PATH@`
`2`	`2`
`3`		`-# Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.`
	`3`	`+# Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.`
`4`	`4`	`#`
`5`	`5`	`# This program is free software; you can redistribute it and/or`
`6`	`6`	`# modify it under the terms of the GNU Library General Public`