1
=== modified file 'debian/changelog'
2
--- debian/changelog	2010-08-25 14:04:57 +0000
3
+++ debian/changelog	2010-09-15 17:54:52 +0000
4
@@ -1,3 +1,11 @@
5
1
php5 (5.3.3-1ubuntu7) maverick; urgency=low
6
2
7
3
  * debian/setup-mysql.sh: Copy mysqld to local dir during build to avoid 
8
4
    apparmor restrictions (LP: #638401)
9
5
  * debian/rules: stop mysql instance on clean just in case we failed in tests
10
6
11
7
 -- Clint Byrum <clint@ubuntu.com>  Wed, 15 Sep 2010 10:48:32 -0700
12
8
13
1
php5 (5.3.3-1ubuntu6) maverick; urgency=low
9
php5 (5.3.3-1ubuntu6) maverick; urgency=low
14
2
10
15
3
  * Undo sybase debugging libraries split: keeping a smaller delta with Debian
11
  * Undo sybase debugging libraries split: keeping a smaller delta with Debian
16
4
12
17
=== modified file 'debian/rules'
18
--- debian/rules	2010-08-25 14:04:57 +0000
19
+++ debian/rules	2010-09-15 17:54:52 +0000
20
@@ -406,6 +406,8 @@
21
406
	rm -rf fpm-build
406
	rm -rf fpm-build
22
407
	rm -rf pear-build pear-build-download
407
	rm -rf pear-build pear-build-download
23
408
	rm -f debian/copyright
408
	rm -f debian/copyright
24
409
    # just in case the build tests failed, kill the running mysqld
25
410
	$(SHELL) debian/setup-mysql.sh $(MYSQL_PORT) $(MYSQL_DATA_DIR) stop > /dev/null 2>&1 || exit 0
26
409
	rm -rf test-results.txt $(MYSQL_DATA_DIR)
411
	rm -rf test-results.txt $(MYSQL_DATA_DIR)
27
410
	dh_clean -Xorig
412
	dh_clean -Xorig
28
411
413
29
412
414
30
=== modified file 'debian/setup-mysql.sh'
31
--- debian/setup-mysql.sh	2010-07-18 15:35:06 +0000
32
+++ debian/setup-mysql.sh	2010-09-15 17:54:52 +0000
33
@@ -12,25 +12,36 @@
34
12
datadir=$2
12
datadir=$2
35
13
action=${3:-start}
13
action=${3:-start}
36
14
14
37
15
localbase=`dirname $datadir`/mysql_base
38
16
39
15
# Some vars #
17
# Some vars #
40
16
18
41
17
socket=$datadir/mysql.sock
19
socket=$datadir/mysql.sock
42
18
# Commands:
20
# Commands:
43
19
mysqladmin="mysqladmin -u root -P $port -h localhost --socket=$socket"
21
mysqladmin="mysqladmin -u root -P $port -h localhost --socket=$socket"
45
20
mysqld="/usr/sbin/mysqld --no-defaults --bind-address=localhost --port=$port --socket=$socket --datadir=$datadir"
22
mysqld="$localbase/bin/mysqld --no-defaults --bind-address=localhost --port=$port --socket=$socket --datadir=$datadir"
46
21
23
47
22
# Main code #
24
# Main code #
48
23
25
49
24
if [ "$action" = "stop" ]; then
26
if [ "$action" = "stop" ]; then
50
25
    $mysqladmin shutdown
27
    $mysqladmin shutdown
51
28
    rm -rf $localbase
52
26
    exit
29
    exit
53
27
fi
30
fi
54
28
31
55
32
# Copy the necessary pieces of mysql to a local dir to avoid apparmor restrictions
56
33
rm -rf $localbase
57
34
mkdir -p $localbase/bin
58
35
mkdir -p $localbase/share
59
36
cp /usr/sbin/mysqld $localbase/bin
60
37
cp /usr/bin/my_print_defaults $localbase/bin
61
38
cp -r /usr/share/mysql $localbase/share
62
39
63
29
rm -rf $datadir
40
rm -rf $datadir
64
30
mkdir -p $datadir
41
mkdir -p $datadir
65
31
chmod go-rx $datadir
42
chmod go-rx $datadir
66
32
43
68
33
mysql_install_db --datadir=$datadir --rpm --force >> $datadir/bootstrap.log 2>&1
44
mysql_install_db --basedir=$localbase --datadir=$datadir --rpm --force --tmpdir=/tmp >> $datadir/bootstrap.log 2>&1
69
34
45
70
35
tmpf=$(mktemp)
46
tmpf=$(mktemp)
71
36
cat > "$tmpf" <<EOF
47
cat > "$tmpf" <<EOF
Status:	Merged
Merge reported by:	Mathias Gug
Merged at revision:	not available
Proposed branch:	lp:~clint-fewbar/ubuntu/maverick/php5/fix-mysql-tests-apparmor
Merge into:	lp:ubuntu/maverick/php5
Diff against target:	71 lines (+23/-2) 3 files modified debian/changelog (+8/-0) debian/rules (+2/-0) debian/setup-mysql.sh (+13/-2)
To merge this branch:	bzr merge lp:~clint-fewbar/ubuntu/maverick/php5/fix-mysql-tests-apparmor
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Mathias Gug		2010-09-15	Pending
Review via email: mp+35562@code.launchpad.net