Merge branch '5.5' into 10.0

4 files changed, 17 insertions, 37 deletions

diff --git a/support-files/SELinux/CMakeLists.txt b/support-files/SELinux/CMakeLists.txt
index e3cdb26ca8f..996d56d6c05 100644
--- a/support-files/SELinux/CMakeLists.txt
+++ b/support-files/SELinux/CMakeLists.txt
@@ -20,7 +20,7 @@ MARK_AS_ADVANCED(CHECKMODULE SEMODULE_PACKAGE)
 SET(params DESTINATION ${INSTALL_SUPPORTFILESDIR}/SELinux COMPONENT SupportFiles)
 
 IF(CHECKMODULE AND SEMODULE_PACKAGE)
-  FOREACH(pol centos6-mariadb)
+  FOREACH(pol mariadb)
     SET(src ${CMAKE_CURRENT_SOURCE_DIR}/${pol}.te)
     SET(mod ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${pol}-pp.dir/${pol}.mod)
     SET(out ${CMAKE_CURRENT_BINARY_DIR}/${pol}.pp)
@@ -32,4 +32,4 @@ IF(CHECKMODULE AND SEMODULE_PACKAGE)
     INSTALL(FILES ${out} ${params})
   ENDFOREACH()
 ENDIF()
-INSTALL(FILES centos6-mariadb.te rhel4-mysql.fc rhel4-mysql.te ${params})
+INSTALL(FILES mariadb.te rhel4-mysql.fc rhel4-mysql.te ${params})
diff --git a/support-files/SELinux/centos6-mariadb.te b/support-files/SELinux/mariadb.te
index 1d3de52c700..1d3de52c700 100644
--- a/support-files/SELinux/centos6-mariadb.te
+++ b/support-files/SELinux/mariadb.te
diff --git a/support-files/build-tags b/support-files/build-tags
index 4b76e01907a..03b243ee8cc 100755
--- a/support-files/build-tags
+++ b/support-files/build-tags
@@ -1,9 +1,16 @@
 #! /bin/sh
 
 rm -f TAGS
-filter='\.cpp$\|\.cc$\|\.c$\|\.h$\|sql_yacc\.yy$\|\.hpp$\|\.ic$\|errmsg-utf8\.txt$'
 
-list="find . -type f"
-git rev-parse >/dev/null 2>/dev/null && list="git ls-files"
-
-$list |grep $filter | xargs etags -o TAGS --append
+if git rev-parse HEAD >/dev/null 2>&1
+then
+  cd `git rev-parse --show-toplevel`
+  echo client storage dbug libmysql sql-common \
+       sql extra mysys mysys_ssl strings regex pcre vio include \
+       tools unittest plugin libmysqld | \
+       xargs -n1 git ls-files | grep -v '\.jar$' | \
+       xargs etags -o TAGS --append
+else
+  find . -type f ! -name "*.jar" |
+       xargs etags -o TAGS --append
+fi
diff --git a/support-files/rpm/server-postin.sh b/support-files/rpm/server-postin.sh
index 377a752824d..139d9e3f700 100644
--- a/support-files/rpm/server-postin.sh
+++ b/support-files/rpm/server-postin.sh
@@ -55,36 +55,9 @@ fi
 SETARGETDIR=/etc/selinux/targeted/src/policy
 SEDOMPROG=$SETARGETDIR/domains/program
 SECONPROG=$SETARGETDIR/file_contexts/program
-if [ -f /etc/redhat-release ] ; then 
-   if grep '\(Red Hat Enterprise Linux ..\|CentOS\) release 4' \
-     /etc/redhat-release >/dev/null 2>&1; then
-     echo
-     echo
-     echo 'Notes regarding SELinux on this platform:'
-     echo '========================================='
-     echo
-     echo 'The default policy might cause server startup to fail because it is '
-     echo 'not allowed to access critical files. In this case, please update '
-     echo 'your installation. '
-     echo
-     echo 'The default policy might also cause inavailability of SSL related '
-     echo 'features because the server is not allowed to access /dev/random '
-     echo 'and /dev/urandom. If this is a problem, please do the following: '
-     echo 
-     echo '  1) install selinux-policy-targeted-sources from your OS vendor'
-     echo '  2) add the following two lines to '$SEDOMPROG/mysqld.te':'
-     echo '       allow mysqld_t random_device_t:chr_file read;'
-     echo '       allow mysqld_t urandom_device_t:chr_file read;'
-     echo '  3) cd to '$SETARGETDIR' and issue the following command:'
-     echo '       make load'
-     echo
-     echo
-   fi
-   if grep 'CentOS release 6' /etc/redhat-release >/dev/null 2>&1; then
-     if [ -x /usr/sbin/semodule ] ; then
-       /usr/sbin/semodule -i /usr/share/mysql/SELinux/centos6-mariadb.pp
-     fi
-   fi
+
+if [ -x /usr/sbin/semodule ] ; then
+  /usr/sbin/semodule -i /usr/share/mysql/SELinux/mariadb.pp
 fi
 
 if [ -x sbin/restorecon ] ; then