← Back to branch summary

~ubuntu-branches/ubuntu/trusty/mariadb-5.5/trusty-proposed

« back to all changes in this revision

Viewing changes to cmake/install_layout.cmake

  • Committer: Package Import Robot
  • Author(s): James Page, Otto Kekäläinen
  • Date: 2014-02-17 16:51:52 UTC
  • mfrom: (2.1.1 sid)
  • Revision ID: package-import@ubuntu.com-20140217165152-k315d3175g865kkx
Tags: 5.5.35-1
http://bugs.debian.org/737597
http://bugs.debian.org/733002
http://bugs.debian.org/734426
http://bugs.debian.org/735284
http://bugs.debian.org/736480
http://bugs.debian.org/732967
[ Otto Kekäläinen ]
* New upstream release, fixing the following security issues:
  - Buffer overflow in client/mysql.cc (Closes: #737597).
    - CVE-2014-0001
  - http://www.oracle.com/technetwork/topics/security/cpujan2014-1972949.html
    - CVE-2013-5891
    - CVE-2013-5908
    - CVE-2014-0386
    - CVE-2014-0393
    - CVE-2014-0401
    - CVE-2014-0402
    - CVE-2014-0412
    - CVE-2014-0420
    - CVE-2014-0437
* Upstream https://mariadb.atlassian.net/browse/MDEV-4902
  fixes compatibility with Bison 3.0 (Closes: #733002)
* Updated Russian debconf translation (Closes: #734426)
* Updated Japanese debconf translation (Closes: #735284)
* Updated French debconf translation (Closes: #736480)
* Renamed SONAME properly (Closes: #732967)

Show diffs side-by-side

added added

removed removed

Lines of Context:
cmake/install_layout.cmake
41
41
# - INSTALL_BINDIR          (directory with client executables and scripts)
42
42
# - INSTALL_SBINDIR         (directory with mysqld)
43
43
# - INSTALL_SCRIPTDIR       (several scripts, rarely used)
44
 
# - INSTALL_SYSCONFDIR      (config files. Usually /etc or nothing)
 
44
# - INSTALL_SYSCONFDIR      (my.cnf config file. Usually /etc or nothing)
 
45
# - INSTALL_SYSCONF2DIR     (additional config files, e.g. /etc/mysql/conf.d)
45
46
#
46
47
# - INSTALL_LIBDIR          (directory with client end embedded libraries)
47
48
# - INSTALL_PLUGINDIR       (directory for plugins)
145
146
SET(INSTALL_SBINDIR_RPM                 "sbin")
146
147
SET(INSTALL_SCRIPTDIR_RPM               "bin")
147
148
SET(INSTALL_SYSCONFDIR_RPM              "/etc")
 
149
SET(INSTALL_SYSCONF2DIR_RPM             "/etc/my.cnf.d")
148
150
#
149
151
IF(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
150
152
  SET(INSTALL_LIBDIR_RPM                "lib64")
156
158
#
157
159
SET(INSTALL_INCLUDEDIR_RPM              "include/mysql")
158
160
#
159
 
SET(INSTALL_DOCDIR_RPM                  "share/doc/${CPACK_SOURCE_PACKAGE_FILE_NAME}")
160
 
SET(INSTALL_DOCREADMEDIR_RPM            "share/doc/${CPACK_SOURCE_PACKAGE_FILE_NAME}")
 
161
SET(INSTALL_DOCDIR_RPM                  "share/doc")
 
162
SET(INSTALL_DOCREADMEDIR_RPM            "share/doc")
161
163
SET(INSTALL_INFODIR_RPM                 "share/info")
162
164
SET(INSTALL_MANDIR_RPM                  "share/man")
163
165
#
178
180
SET(INSTALL_BINDIR_DEB                  "bin")
179
181
SET(INSTALL_SBINDIR_DEB                 "sbin")
180
182
SET(INSTALL_SCRIPTDIR_DEB               "bin")
 
183
SET(INSTALL_SYSCONF2DIR_DEB             "/etc/mysql/conf.d")
181
184
#
182
185
SET(INSTALL_LIBDIR_DEB                  "lib")
183
186
SET(INSTALL_PLUGINDIR_DEB               "lib/mysql/plugin")
184
187
#
185
188
SET(INSTALL_INCLUDEDIR_DEB              "include/mysql")
186
189
#
187
 
SET(INSTALL_DOCDIR_DEB                  "docs")
188
 
SET(INSTALL_DOCREADMEDIR_DEB            ".")
 
190
SET(INSTALL_DOCDIR_DEB                  "share/doc")
 
191
SET(INSTALL_DOCREADMEDIR_DEB            "share/doc")
189
192
SET(INSTALL_MANDIR_DEB                  "share/man")
190
193
SET(INSTALL_INFODIR_DEB                 "share/info")
191
194
#
238
241
# Set INSTALL_FOODIR variables for chosen layout (for example, INSTALL_BINDIR
239
242
# will be defined  as ${INSTALL_BINDIR_STANDALONE} by default if STANDALONE
240
243
# layout is chosen)
241
 
FOREACH(var BIN SBIN LIB MYSQLSHARE SHARE PLUGIN INCLUDE SCRIPT DOC MAN SYSCONF
 
244
FOREACH(var BIN SBIN LIB MYSQLSHARE SHARE PLUGIN INCLUDE SCRIPT DOC MAN SYSCONF SYSCONF2
242
245
    INFO MYSQLTEST SQLBENCH DOCREADME SUPPORTFILES MYSQLDATA PLUGINTEST UNIX_ADDR)
243
246
  SET(INSTALL_${var}DIR  ${INSTALL_${var}DIR_${INSTALL_LAYOUT}}
244
247
  CACHE STRING "${var} installation directory" ${FORCE})