← Back to branch summary

~ubuntu-branches/ubuntu/utopic/mariadb-5.5/utopic-security

« back to all changes in this revision

Viewing changes to debian/rules

  • Committer: Package Import Robot
  • Author(s): Otto Kekäläinen
  • Date: 2014-04-17 20:55:22 UTC
  • mfrom: (2.1.3 sid)
  • Revision ID: package-import@ubuntu.com-20140417205522-wof4l36nxhlkn89m
http://bugs.debian.org/745330
* New upstream release, fixing the following security issues:
  * Corresponding MariaDB CVEs for Oracle SPU April 2014 (Closes: #745330)
    - CVE-2014-0384 
    - CVE-2014-2419 
    - CVE-2014-2430 
    - CVE-2014-2431 
    - CVE-2014-2432 
    - CVE-2014-2436 
    - CVE-2014-2438 
    - CVE-2014-2440
* Re-enabled TokuDB with "if arch amd64" in d/rules
* Applied patch to log init output better
  (Closes https://mariadb.atlassian.net/browse/MDEV-5957)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/rules
16
16
    TAOCRYPT_OPT="-DTAOCRYPT_DISABLE_X86ASM"
17
17
endif
18
18
 
 
19
# Skip TokuDB if arch is not amd64
 
20
ifneq ($(ARCH), amd64)
 
21
    TOKUDB_OPT="-DWITHOUT_TOKUDB=true"
 
22
endif
 
23
 
19
24
export MYSQL_BUILD_CC=$(DEB_HOST_GNU_TYPE)-gcc
20
25
export MYSQL_BUILD_CXX=$(DEB_HOST_GNU_TYPE)-g++
21
26
 
95
100
                $(USE_STATIC_MYSQLD) \
96
101
            -DCOMPILATION_COMMENT="($(DISTRIBUTION))" \
97
102
            -DMYSQL_SERVER_SUFFIX="-$(DEBVERSION)" \
98
 
            -DSYSTEM_TYPE="debian-$(DEB_BUILD_GNU_SYSTEM)" \
99
 
            -DWITHOUT_TOKUDB=true \
 
103
            -DSYSTEM_TYPE="debian-$(DEB_BUILD_GNU_SYSTEM)" $(TOKUDB_OPT) \
100
104
            -DBUILD_CONFIG=mysql_release \
101
105
            -DINSTALL_LIBDIR=lib/$(DEB_HOST_MULTIARCH) \
102
106
            -DINSTALL_PLUGINDIR=lib/mysql/plugin \
104
108
                -DDEB=1 ..'
105
109
        touch $@
106
110
 
107
 
# Disable TokuDB above due to
108
 
# * i386 does not work and CMakeLists.txt check for processor does not detect
109
 
#   correct ARCH in chroot
110
 
# * Build errors in Trusty: https://mariadb.atlassian.net/browse/MDEV-5618
111
 
# * There was ugly code in CMakeLists.txt that touched stuff in debian/*
112
 
#   that needs to be re-written
113
 
 
114
111
override_dh_auto_build: build-stamp
115
112
 
116
113
build-stamp:
131
128
        dh_testdir
132
129
        dh_testroot
133
130
        
 
131
        # If TokuDB plugin was built
 
132
        # add it to the server install list.
 
133
        [ ! -f $(BUILDDIR)/usr/lib/mysql/plugin/ha_tokudb.so ] || echo 'usr/lib/mysql/plugin/ha_tokudb.so\netc/mysql/conf.d/tokudb.cnf\nusr/bin/tokuftdump\nusr/share/doc/mariadb-server-5.5/README-TOKUDB\nusr/share/doc/mariadb-server-5.5/README.md' >> debian/mariadb-server-5.5.install
 
134
        
134
135
        # some self written manpages which hopefully
135
136
        # gets overwritten sooner or later with upstreams
136
137
        mkdir -p $(TMP)/usr/share/man/man1/
180
181
        install -m 0644 $(builddir)/Docs/INFO_SRC $(TMP)/usr/share/doc/mariadb-server-5.5/INFO_SRC
181
182
        install -m 0644 $(builddir)/Docs/INFO_BIN $(TMP)/usr/share/doc/mariadb-server-5.5/INFO_BIN
182
183
        
 
184
        # install AppArmor profile
 
185
        install -D -m 644 debian/apparmor-profile $(TMP)/etc/apparmor.d/usr.sbin.mysqld
 
186
        
 
187
        # install Apport hook
 
188
        install -D -m 644 debian/mariadb-server-5.5.py $(TMP)/usr/share/apport/package-hooks/source_mariadb-5.5.py
 
189
        
183
190
        # mariadb-test
184
191
        mv $(TMP)/usr/mysql-test $(TMP)/usr/share/mysql
185
192
        touch $@