Skip to content

Commit df31159

Browse files
author
Akhil Mohan
committed
Bug #20387043 UPDATED DEBIAN AND UBUNTU PACKAGING SOURCE FOR MYSQL SERVER 5.6
Packaging source for following platforms has been updated: 1) Debian7 2) Ubuntu12.04 3) Ubuntu14.04 Packaging source for following platform has been added: 1) Ubuntu14.10
1 parent f6ea7bf commit df31159

File tree

144 files changed

+3429
-924
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

144 files changed

+3429
-924
lines changed

packaging/deb-precise/changelog

Lines changed: 47 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,58 @@
1+
mysql-community (5.6.23-1ubuntu12.04) precise; urgency=low
2+
3+
* new upstream release
4+
* dh_apparmor to now run before dh_installinit in d/rules
5+
* mysql-community-server now recommends mysql-client
6+
* mysql-community-server now depends on apparmor
7+
* removed template install-test-db; not installed by default
8+
* d/compat incremented to 9 from 8
9+
* d/control updated to build depend on debhelper 9
10+
* added d/*.lintian-overrides and d/source/lintian-overrides
11+
* d/rules updated to reflect correct file permissions
12+
13+
-- Akhil Mohan <akhil.mohan@oracle.com> Wed, 31 Dec 2014 10:51:07 +0530
14+
15+
mysql-community (5.6.22-1ubuntu12.04) precise; urgency=low
16+
17+
* new upstream release
18+
* fixed d/*server.postinst to allow dropping test db without
19+
setting root password
20+
* init script will now run my_i_db if data dir is not present or empty
21+
* updated init script to read app armor profile on startup
22+
* added more system resources to app armor profile
23+
24+
-- Akhil Mohan <akhil.mohan@oracle.com> Wed, 24 Sep 2014 14:48:07 +0530
25+
26+
mysql-community (5.6.21-1ubuntu12.04) precise; urgency=low
27+
28+
* new upstream release
29+
* updated d/rules to increment -j8 as make option
30+
* updated d/source/include-binaries to add mysql_no_login plugin
31+
* updated CMake option WITH_EXTRA_CHARSETS from complex to all
32+
33+
-- Akhil Mohan <akhil.mohan@oracle.com> Wed, 20 Aug 2014 19:12:30 +0530
34+
135
mysql-community (5.6.20-1ubuntu12.04) precise; urgency=low
236

337
* new upstream release
438
* added fakeroot as build-dep in d/control
539
* added d/*.dirs for bench, dev and test pkg
640
* updated d/rules to make compilation verbose
741
* removed default CFLAGS, CXXFLAGS in d/rules
42+
* added patch for testsuite search paths under d/patches
43+
* modified cmake option for testsuite in d/rules
44+
* updated patch d/fix-mysql_install_db.patch
45+
* enabled two patches in d/patches/series
46+
* removed extra permissions check in d/rules when fixed in source
47+
* modified d/mysql-*-server.postinst to stop removing /usr/my.cnf
48+
* modified d/*-test.* for updated location of testsuite
49+
* updated d/{mysql-*-server.install,rules} to include debug plugins
50+
* updated d/rules to remove storage engine cmake options
51+
* modified data dir permission in d/*server.{pre,post}inst
52+
* updated d/source/include-binaries to add debug plugins
53+
* updated d/rules to rename debug plugins
854

9-
-- Akhil Mohan <akhil.mohan@oracle.com> Mon, 26 Jun 2014 16:13:30 +0530
55+
-- Akhil Mohan <akhil.mohan@oracle.com> Wed, 02 Jul 2014 17:45:30 +0530
1056

1157
mysql-community (5.6.19-1ubuntu12.04) precise; urgency=low
1258

packaging/deb-precise/compat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
8
1+
9

packaging/deb-precise/control

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Section: database
44
Priority: optional
55
Standards-Version: 3.9.3
66
Homepage: http://www.mysql.com/
7-
Build-Depends: debhelper (>= 8.0.0), libaio-dev[linux-any], libncurses5-dev (>= 5.0-6), perl, zlib1g-dev (>= 1:1.1.3-5), po-debconf, psmisc, bison, dh-apparmor, lsb-release, cmake, fakeroot
7+
Build-Depends: debhelper (>= 9.0.0), libaio-dev[linux-any], libncurses5-dev (>= 5.0-6), perl, zlib1g-dev (>= 1:1.1.3-5), po-debconf, psmisc, bison, dh-apparmor, lsb-release, cmake, fakeroot
88

99
Package: mysql-server
1010
Architecture: any
@@ -20,21 +20,21 @@ Description: MySQL Server meta package depending on latest version
2020
Package: mysql-community-server
2121
Architecture: any
2222
Pre-depends: debconf (>= 0.2.17), adduser
23-
Depends: mysql-common (= ${binary:Version}),
23+
Depends: mysql-common (= ${binary:Version}), apparmor,
2424
${shlibs:Depends}, ${misc:Depends}
25-
Recommends: mysql-community-client (= ${binary:Version})
25+
Recommends: mysql-client (= ${binary:Version})
2626
Conflicts: mysql,
2727
mysql-server-5.0, mysql-server-core-5.0,
2828
mysql-server-5.1, mysql-server-core-5.1,
2929
mysql-server-5.5, mysql-server-core-5.5,
3030
mysql-server-5.6, mysql-server-core-5.6,
31-
mysql-enterprise-server
31+
mysql-commercial-server
3232
Replaces: mysql,
3333
mysql-server-5.0, mysql-server-core-5.0,
3434
mysql-server-5.1, mysql-server-core-5.1,
3535
mysql-server-5.5, mysql-server-core-5.5,
3636
mysql-server-5.6, mysql-server-core-5.6,
37-
mysql-enterprise-server
37+
mysql-commercial-server
3838
Provides: virtual-mysql-server, virtual-mysql-server-core,
3939
mysql-server-5.6, mysql-server-core-5.6
4040
Description: MySQL Server
@@ -65,13 +65,13 @@ Conflicts: mysql,
6565
mysql-client-5.1, mysql-client-core-5.1,
6666
mysql-client-5.5, mysql-client-core-5.5,
6767
mysql-client-5.6, mysql-client-core-5.6,
68-
mysql-enterprise-client
68+
mysql-commercial-client
6969
Replaces: mysql,
7070
mysql-client-5.0, mysql-client-core-5.0,
7171
mysql-client-5.1, mysql-client-core-5.1,
7272
mysql-client-5.5, mysql-client-core-5.5,
7373
mysql-client-5.6, mysql-client-core-5.6,
74-
mysql-enterprise-client
74+
mysql-commercial-client
7575
Provides: virtual-mysql-client, virtual-mysql-client-core,
7676
mysql-client-5.6, mysql-client-core-5.6
7777
Description: MySQL Client
@@ -156,7 +156,7 @@ Depends: mysql-community-server (= ${binary:Version}),
156156
${shlibs:Depends}, ${misc:Depends}
157157
Conflicts: mysql,
158158
mysql-testsuite-5.0, mysql-testsuite-5.1, mysql-testsuite-5.5,
159-
mysql-testsuite-5.6, mysql-enterprise-test
159+
mysql-testsuite-5.6, mysql-commercial-test
160160
Description: MySQL Test Run MTR - The MySQL testsuite
161161
The MySQL(TM) software delivers a very fast, multi-threaded, multi-user,
162162
and robust SQL (Structured Query Language) database server. MySQL Server
@@ -169,7 +169,7 @@ Package: mysql-community-bench
169169
Architecture: any
170170
Depends: mysql-community-server (= ${binary:Version}),
171171
${shlibs:Depends}, ${misc:Depends}
172-
Conflicts: mysql, mysql-enterprise-bench
172+
Conflicts: mysql, mysql-commercial-bench
173173
Description: MySQL Bench
174174
The MySQL(TM) software delivers a very fast, multi-threaded, multi-user,
175175
and robust SQL (Structured Query Language) database server. MySQL Server

packaging/deb-precise/extra/apparmor-profile

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,21 @@
77
#include <abstractions/nameservice>
88
#include <abstractions/user-tmp>
99

10+
# Allow system resource access
11+
/sys/devices/system/cpu/ r,
12+
capability sys_resource,
13+
capability dac_override,
14+
capability setuid,
15+
capability setgid,
16+
1017
# Allow config access
1118
/etc/mysql/conf.d/ r,
1219
/etc/mysql/conf.d/*.cnf r,
1320
/etc/mysql/*.cnf r,
1421

1522
# Allow pid and socket file access
1623
/run/mysqld/mysqld.pid rw,
17-
/run/mysqld/mysqld.sock w,
24+
/run/mysqld/mysqld.sock rw,
1825

1926
# Allow read/ write to /tmp
2027
/tmp/ r,
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
2+
#
3+
# This program is free software; you can redistribute it and/or modify
4+
# it under the terms of the GNU General Public License as published by
5+
# the Free Software Foundation; version 2 of the License.
6+
#
7+
# This program is distributed in the hope that it will be useful,
8+
# but WITHOUT ANY WARRANTY; without even the implied warranty of
9+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
10+
# GNU General Public License for more details.
11+
#
12+
# You should have received a copy of the GNU General Public License
13+
# along with this program; if not, write to the Free Software
14+
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
15+
16+
# Additional license file is needed so overriding this warning
17+
libmysqlclient-dev: extra-license-file usr/share/doc/libmysqlclient-dev/LICENSE.mysql
18+
libmysqlclient-dev: extra-license-file usr/share/doc/libmysqlclient-dev/COPYING.gz
19+
libmysqlclient-dev: copyright-should-refer-to-common-license-file-for-lgpl
20+
# Due to static linking this cannot be avoided and hence being overridden
21+
libmysqlclient-dev: embedded-library
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
2+
#
3+
# This program is free software; you can redistribute it and/or modify
4+
# it under the terms of the GNU General Public License as published by
5+
# the Free Software Foundation; version 2 of the License.
6+
#
7+
# This program is distributed in the hope that it will be useful,
8+
# but WITHOUT ANY WARRANTY; without even the implied warranty of
9+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
10+
# GNU General Public License for more details.
11+
#
12+
# You should have received a copy of the GNU General Public License
13+
# along with this program; if not, write to the Free Software
14+
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
15+
16+
# Additional license file is needed so overriding this warning
17+
libmysqlclient18: extra-license-file usr/share/doc/libmysqlclient18/LICENSE.mysql
18+
libmysqlclient18: extra-license-file usr/share/doc/libmysqlclient18/COPYING.gz
19+
libmysqlclient18: copyright-should-refer-to-common-license-file-for-lgpl
20+
# Due to static linking this cannot be avoided and hence being overridden
21+
libmysqlclient18: embedded-library
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
2+
#
3+
# This program is free software; you can redistribute it and/or modify
4+
# it under the terms of the GNU General Public License as published by
5+
# the Free Software Foundation; version 2 of the License.
6+
#
7+
# This program is distributed in the hope that it will be useful,
8+
# but WITHOUT ANY WARRANTY; without even the implied warranty of
9+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
10+
# GNU General Public License for more details.
11+
#
12+
# You should have received a copy of the GNU General Public License
13+
# along with this program; if not, write to the Free Software
14+
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
15+
16+
# Additional license file is needed so overriding this warning
17+
libmysqld-dev: extra-license-file usr/share/doc/libmysqld-dev/LICENSE.mysql
18+
libmysqld-dev: extra-license-file usr/share/doc/libmysqld-dev/COPYING.gz
19+
libmysqld-dev: copyright-should-refer-to-common-license-file-for-lgpl
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
2+
#
3+
# This program is free software; you can redistribute it and/or modify
4+
# it under the terms of the GNU General Public License as published by
5+
# the Free Software Foundation; version 2 of the License.
6+
#
7+
# This program is distributed in the hope that it will be useful,
8+
# but WITHOUT ANY WARRANTY; without even the implied warranty of
9+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
10+
# GNU General Public License for more details.
11+
#
12+
# You should have received a copy of the GNU General Public License
13+
# along with this program; if not, write to the Free Software
14+
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
15+
16+
# Additional license file is needed so overriding this warning
17+
mysql-client: extra-license-file usr/share/doc/mysql-client/LICENSE.mysql
18+
mysql-client: extra-license-file usr/share/doc/mysql-client/COPYING.gz
19+
mysql-client: copyright-should-refer-to-common-license-file-for-lgpl
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
2+
#
3+
# This program is free software; you can redistribute it and/or modify
4+
# it under the terms of the GNU General Public License as published by
5+
# the Free Software Foundation; version 2 of the License.
6+
#
7+
# This program is distributed in the hope that it will be useful,
8+
# but WITHOUT ANY WARRANTY; without even the implied warranty of
9+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
10+
# GNU General Public License for more details.
11+
#
12+
# You should have received a copy of the GNU General Public License
13+
# along with this program; if not, write to the Free Software
14+
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
15+
16+
# Additional license file is needed so overriding this warning
17+
mysql-common: extra-license-file usr/share/doc/mysql-common/LICENSE.mysql
18+
mysql-common: extra-license-file usr/share/doc/mysql-common/COPYING.gz
19+
mysql-common: copyright-should-refer-to-common-license-file-for-lgpl
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
2+
#
3+
# This program is free software; you can redistribute it and/or modify
4+
# it under the terms of the GNU General Public License as published by
5+
# the Free Software Foundation; version 2 of the License.
6+
#
7+
# This program is distributed in the hope that it will be useful,
8+
# but WITHOUT ANY WARRANTY; without even the implied warranty of
9+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
10+
# GNU General Public License for more details.
11+
#
12+
# You should have received a copy of the GNU General Public License
13+
# along with this program; if not, write to the Free Software
14+
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
15+
16+
# Additional license file is needed so overriding this warning
17+
mysql-community-bench: extra-license-file usr/share/doc/mysql-community-bench/LICENSE.mysql
18+
mysql-community-bench: extra-license-file usr/share/doc/mysql-community-bench/COPYING.gz
19+
mysql-community-bench: copyright-should-refer-to-common-license-file-for-lgpl

0 commit comments

Comments
 (0)