Merge lp:~abychko/percona-server/bug1099809 into lp:percona-server/5.5

[Alexey Bychko]

[+] new cmake option WITH_PAM default OFF
[*] fixed build scripts for using WITH_PAM cmake option
[*] fixed rpm spec, added pam-devel as build dependency
[*] fixed debian rules for using WITH_PAM cmake option

[Alexey Kopytov (akopytov)]

Alexey,

The patch looks good except two minor things:

- I suggest "Build with Percona PAM plugin" instead of "Compiling
  Percona PAM AUTH libraries" as the option description.

- please revert all unrelated changes to the .spec file. Some of them
  are not safe, and other ones should be reported and fixed separately.

review: Needs Fixing

[Alexey Kopytov (akopytov)]

review: Approve

=== modified file 'Percona-Server/CMakeLists.txt'
--- Percona-Server/CMakeLists.txt	2013-01-09 23:45:25 +0000
+++ Percona-Server/CMakeLists.txt	2013-01-21 07:36:24 +0000
@@ -50,6 +50,8 @@
   MARK_AS_ADVANCED(MANUFACTURER)
 ENDIF()
 
+#PAM build Handling
+OPTION(WITH_PAM "Build with Percona PAM plugin" OFF)
 # We choose to provide WITH_DEBUG as alias to standard CMAKE_BUILD_TYPE=Debug
 # which turns out to be not trivial, as this involves synchronization 
 # between CMAKE_BUILD_TYPE and WITH_DEBUG. Besides, we have to deal with cases
 
=== modified file 'Percona-Server/plugin/percona-pam-for-mysql/CMakeLists.txt'
--- Percona-Server/plugin/percona-pam-for-mysql/CMakeLists.txt	2012-06-22 06:57:40 +0000
+++ Percona-Server/plugin/percona-pam-for-mysql/CMakeLists.txt	2013-01-21 07:36:24 +0000
@@ -13,8 +13,12 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #
+IF(WITH_PAM)
 INCLUDE (CheckLibraryExists)
 CHECK_LIBRARY_EXISTS(pam pam_authenticate "" HAVE_PAM) 
+IF(NOT HAVE_PAM)
+	MESSAGE(FATAL_ERROR "Required PAM dev library not found. Please install PAM development files!")
+ENDIF(NOT HAVE_PAM)
 CHECK_SYMBOL_EXISTS(getpwnam_r "pwd.h" HAVE_GETPWNAM_R)
 CHECK_SYMBOL_EXISTS(getgrgid_r "grp.h" HAVE_GETGRGID_R)
 IF(HAVE_PAM AND HAVE_GETPWNAM_R AND HAVE_GETGRGID_R)
@@ -27,3 +31,4 @@
   MYSQL_ADD_PLUGIN(auth_pam_compat ${AUTH_PAM_COMPAT_SOURCES} LINK_LIBRARIES pam MODULE_ONLY)
   MYSQL_ADD_PLUGIN(dialog src/dialog.c LINK_LIBRARIES mysqlclient MODULE_ONLY)
 ENDIF(HAVE_PAM AND HAVE_GETPWNAM_R AND HAVE_GETGRGID_R)
+ENDIF(WITH_PAM)
 
=== modified file 'build/build-binary.sh'
--- build/build-binary.sh	2012-10-23 18:24:36 +0000
+++ build/build-binary.sh	2013-01-21 07:36:24 +0000
@@ -127,7 +127,8 @@
         -DCMAKE_INSTALL_PREFIX="/usr/local/$PRODUCT_FULL" \
         -DMYSQL_DATADIR="/usr/local/$PRODUCT_FULL/data" \
         -DMYSQL_SERVER_SUFFIX="-$PERCONA_SERVER_VERSION" \
-        -DCOMPILATION_COMMENT="$COMMENT"
+        -DCOMPILATION_COMMENT="$COMMENT" \
+	-DWITH_PAM=ON
 
     make $MAKE_JFLAG $QUIET
     make DESTDIR="$INSTALLDIR" install
 
=== modified file 'build/debian/rules'
--- build/debian/rules	2013-01-18 03:34:53 +0000
+++ build/debian/rules	2013-01-21 07:36:24 +0000
@@ -32,7 +32,8 @@
 	   -DMYSQL_UNIX_ADDR="/var/run/mysqld/mysqld.sock" \
 	   -DFEATURE_SET=$(feature_set) \
 	   -DCOMPILATION_COMMENT=$(compilation_comment_debug) \
-	   -DMYSQL_SERVER_SUFFIX=$(server_suffix)
+	   -DMYSQL_SERVER_SUFFIX=$(server_suffix) \
+	   -DWITH_PAM=ON
 endif
 
 	mkdir release
@@ -43,7 +44,8 @@
            -DMYSQL_UNIX_ADDR="/var/run/mysqld/mysqld.sock" \
            -DFEATURE_SET=$(feature_set) \
            -DCOMPILATION_COMMENT=$(compilation_comment_release) \
-           -DMYSQL_SERVER_SUFFIX=$(server_suffix)
+           -DMYSQL_SERVER_SUFFIX=$(server_suffix) \
+	   -DWITH_PAM=ON
 
 override_dh_auto_build:
 ifneq ($(BUILD_DEBUG_BINARY),)
 
=== modified file 'build/percona-server.spec'
--- build/percona-server.spec	2013-01-18 03:34:53 +0000
+++ build/percona-server.spec	2013-01-21 07:36:24 +0000
@@ -232,8 +232,13 @@
 Packager:       Percona MySQL Development Team <[e-mail]>
 Vendor:         %{percona_server_vendor}
 Provides:       mysql-server
+#
+%if %{rhel}
+BuildRequires: pam-devel
+%endif
+#
 BuildRequires:  %{distro_buildreq}
-
+#
 # Think about what you use here since the first step is to
 # run a rm -rf
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
@@ -411,7 +416,8 @@
            -DMYSQL_UNIX_ADDR="/var/lib/mysql/mysql.sock" \
            -DFEATURE_SET="%{feature_set}" \
            -DCOMPILATION_COMMENT="%{compilation_comment_debug}" \
-           -DMYSQL_SERVER_SUFFIX="%{server_suffix}"
+           -DMYSQL_SERVER_SUFFIX="%{server_suffix}" \
+	   -DWITH_PAM=ON
   echo BEGIN_DEBUG_CONFIG ; egrep '^#define' include/config.h ; echo END_DEBUG_CONFIG
   make ${MAKE_JFLAG}
 )
@@ -427,7 +433,8 @@
            -DMYSQL_UNIX_ADDR="/var/lib/mysql/mysql.sock" \
            -DFEATURE_SET="%{feature_set}" \
            -DCOMPILATION_COMMENT="%{compilation_comment_release}" \
-           -DMYSQL_SERVER_SUFFIX="%{server_suffix}"
+           -DMYSQL_SERVER_SUFFIX="%{server_suffix}" \
+           -DWITH_PAM=ON
   echo BEGIN_NORMAL_CONFIG ; egrep '^#define' include/config.h ; echo END_NORMAL_CONFIG
   make ${MAKE_JFLAG}
   cd ../%{src_dir}