1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172 | diff -Nru apparmor-2.9.1/debian/apparmor.install apparmor-2.9.1/debian/apparmor.install
--- apparmor-2.9.1/debian/apparmor.install 2014-10-10 06:59:17.000000000 +0100
+++ apparmor-2.9.1/debian/apparmor.install 2015-03-19 10:10:13.000000000 +0000
@@ -1,5 +1,6 @@
debian/apport/source_apparmor.py /usr/share/apport/package-hooks/
debian/lib/apparmor/functions /lib/apparmor/
+debian/lib/apparmor/profile-load /lib/apparmor/
etc/apparmor/parser.conf
etc/apparmor/subdomain.conf
sbin/apparmor_parser
diff -Nru apparmor-2.9.1/debian/changelog apparmor-2.9.1/debian/changelog
--- apparmor-2.9.1/debian/changelog 2015-03-06 12:28:50.000000000 +0000
+++ apparmor-2.9.1/debian/changelog 2015-03-19 10:16:29.000000000 +0000
@@ -1,3 +1,11 @@
+apparmor (2.9.1-0ubuntu8) vivid; urgency=medium
+
+ * Add /lib/apparmor/profile-load; moved from
+ /lib/init/apparmor-profile-load from the upstart package. A wrapper at
+ the original path is now provided by init-system-helpers.
+
+ -- Robie Basak <robie.basak@ubuntu.com> Thu, 19 Mar 2015 10:16:29 +0000
+
apparmor (2.9.1-0ubuntu7) vivid; urgency=medium
* systemd-dev-log-lp1413232.patch: Allow writes to the systemd journal
diff -Nru apparmor-2.9.1/debian/lib/apparmor/profile-load apparmor-2.9.1/debian/lib/apparmor/profile-load
--- apparmor-2.9.1/debian/lib/apparmor/profile-load 1970-01-01 01:00:00.000000000 +0100
+++ apparmor-2.9.1/debian/lib/apparmor/profile-load 2015-03-19 10:08:39.000000000 +0000
@@ -0,0 +1,30 @@
+#!/bin/sh
+# apparmor-profile-load
+#
+# Helper for loading an AppArmor profile in pre-start scripts.
+
+[ -z "$1" ] && exit 1 # require a profile name
+
+# do not load in a container
+[ -x /bin/running-in-container ] && /bin/running-in-container >/dev/null 2>&1 && exit 0
+
+[ -d /rofs/etc/apparmor.d ] && exit 0 # do not load if running liveCD
+
+profile=/etc/apparmor.d/"$1"
+[ -e "$profile" ] || exit 0 # skip when missing profile
+
+module=/sys/module/apparmor
+[ -d $module ] || exit 0 # do not load without AppArmor in kernel
+
+[ -x /sbin/apparmor_parser ] || exit 0 # do not load without parser
+
+aafs=/sys/kernel/security/apparmor
+[ -d $aafs ] || exit 0 # do not load if unmounted
+[ -w $aafs/.load ] || exit 1 # fail if cannot load profiles
+
+params=$module/parameters
+[ -r $params/enabled ] || exit 0 # do not load if missing
+read enabled < $params/enabled || exit 1 # if this fails, something went wrong
+[ "$enabled" = "Y" ] || exit 0 # do not load if disabled
+
+/sbin/apparmor_parser -r -W "$profile" || exit 0 # LP: #1058356
diff -Nru init-system-helpers-1.22ubuntu4/debian/changelog init-system-helpers-1.22ubuntu5/debian/changelog
--- init-system-helpers-1.22ubuntu4/debian/changelog 2015-03-08 11:26:48.000000000 +0000
+++ init-system-helpers-1.22ubuntu5/debian/changelog 2015-03-19 10:15:49.000000000 +0000
@@ -1,3 +1,12 @@
+init-system-helpers (1.22ubuntu5) vivid; urgency=medium
+
+ * Add /lib/init/apparmor-profile-load; moved from the upstart package to the
+ apparmor package and wrapped here under the old path. This name can
+ continue to be used by init scripts to save them individually testing if
+ apparmor is installed, as this wrapper performs this task.
+
+ -- Robie Basak <robie.basak@ubuntu.com> Thu, 19 Mar 2015 10:15:49 +0000
+
init-system-helpers (1.22ubuntu4) vivid; urgency=medium
* init: Switch preferred alternative to systemd, and update package
diff -Nru init-system-helpers-1.22ubuntu4/debian/control init-system-helpers-1.22ubuntu5/debian/control
--- init-system-helpers-1.22ubuntu4/debian/control 2015-03-08 11:26:20.000000000 +0000
+++ init-system-helpers-1.22ubuntu5/debian/control 2015-03-19 10:07:01.000000000 +0000
@@ -15,7 +15,8 @@
Architecture: all
Multi-Arch: foreign
Depends: perl-base (>= 5.20.1-3), ${perl:Depends}, ${misc:Depends}
-Breaks: systemd (<< 44-12)
+Breaks: systemd (<< 44-12), upstart (<< 1.13.2-0ubuntu10)
+Replaces: upstart (<< 1.13.2-0ubuntu10)
Description: helper tools for all init systems
This package contains helper tools that are necessary for switching between
the various init systems that Debian contains (e.g. sysvinit, upstart,
diff -Nru init-system-helpers-1.22ubuntu4/debian/init-system-helpers.install init-system-helpers-1.22ubuntu5/debian/init-system-helpers.install
--- init-system-helpers-1.22ubuntu4/debian/init-system-helpers.install 2014-11-17 19:44:50.000000000 +0000
+++ init-system-helpers-1.22ubuntu5/debian/init-system-helpers.install 2015-03-19 10:06:16.000000000 +0000
@@ -1,2 +1,3 @@
script/deb-systemd-helper usr/bin
script/deb-systemd-invoke usr/bin
+script/apparmor-profile-load lib/init
diff -Nru init-system-helpers-1.22ubuntu4/script/apparmor-profile-load init-system-helpers-1.22ubuntu5/script/apparmor-profile-load
--- init-system-helpers-1.22ubuntu4/script/apparmor-profile-load 1970-01-01 01:00:00.000000000 +0100
+++ init-system-helpers-1.22ubuntu5/script/apparmor-profile-load 2015-03-19 10:12:57.000000000 +0000
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+[ -x /lib/apparmor/profile-load ] && exec /lib/apparmor/profile-load "$@"
reverted:
--- upstart-1.13.2/debian/apparmor-profile-load
+++ upstart-1.13.2.orig/debian/apparmor-profile-load
@@ -1,30 +0,0 @@
-#!/bin/sh
-# apparmor-profile-load
-#
-# Helper for loading an AppArmor profile in pre-start scripts.
-
-[ -z "$1" ] && exit 1 # require a profile name
-
-# do not load in a container
-[ -x /bin/running-in-container ] && /bin/running-in-container >/dev/null 2>&1 && exit 0
-
-[ -d /rofs/etc/apparmor.d ] && exit 0 # do not load if running liveCD
-
-profile=/etc/apparmor.d/"$1"
-[ -e "$profile" ] || exit 0 # skip when missing profile
-
-module=/sys/module/apparmor
-[ -d $module ] || exit 0 # do not load without AppArmor in kernel
-
-[ -x /sbin/apparmor_parser ] || exit 0 # do not load without parser
-
-aafs=/sys/kernel/security/apparmor
-[ -d $aafs ] || exit 0 # do not load if unmounted
-[ -w $aafs/.load ] || exit 1 # fail if cannot load profiles
-
-params=$module/parameters
-[ -r $params/enabled ] || exit 0 # do not load if missing
-read enabled < $params/enabled || exit 1 # if this fails, something went wrong
-[ "$enabled" = "Y" ] || exit 0 # do not load if disabled
-
-/sbin/apparmor_parser -r -W "$profile" || exit 0 # LP: #1058356
diff -u upstart-1.13.2/debian/changelog upstart-1.13.2/debian/changelog
--- upstart-1.13.2/debian/changelog
+++ upstart-1.13.2/debian/changelog
@@ -1,3 +1,10 @@
+upstart (1.13.2-0ubuntu10) vivid; urgency=medium
+
+ * Remove /lib/init/apparmor-profile-load, as it is being moved to the
+ init-system-helpers package.
+
+ -- Robie Basak <robie.basak@ubuntu.com> Thu, 19 Mar 2015 10:05:25 +0000
+
upstart (1.13.2-0ubuntu9) vivid; urgency=medium
* debian/upstart-bin.upstart.cron.daily: Ensure the session uid matches that
diff -u upstart-1.13.2/debian/rules upstart-1.13.2/debian/rules
--- upstart-1.13.2/debian/rules
+++ upstart-1.13.2/debian/rules
@@ -39,7 +39,6 @@
override_dh_fixperms:
dh_fixperms
chmod 755 debian/upstart/lib/init/upstart-job
- chmod 755 debian/upstart-bin/lib/init/apparmor-profile-load
chmod 755 debian/upstart/usr/lib/upstart/migrate-inittab.pl
override_dh_auto_install:
diff -u upstart-1.13.2/debian/upstart-bin.install upstart-1.13.2/debian/upstart-bin.install
--- upstart-1.13.2/debian/upstart-bin.install
+++ upstart-1.13.2/debian/upstart-bin.install
@@ -14,7 +14,6 @@
sbin/upstart-local-bridge
sbin/upstart-udev-bridge
debian/running-in-container bin/
-debian/apparmor-profile-load lib/init/
usr/share/upstart/sessions/*
debian/user-conf/*.conf usr/share/upstart/sessions/
debian/xsession.d/* etc/X11/Xsession.d/
|