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 | diff -Nru init-system-helpers-1.22ubuntu5/debian/changelog init-system-helpers-1.22ubuntu6/debian/changelog
--- init-system-helpers-1.22ubuntu5/debian/changelog 2015-03-23 04:44:34.000000000 -0500
+++ init-system-helpers-1.22ubuntu6/debian/changelog 2015-04-02 11:21:51.000000000 -0500
@@ -1,3 +1,13 @@
+init-system-helpers (1.22ubuntu6) 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.
+ (LP: #1432683)
+
+ -- Robie Basak <robie.basak@ubuntu.com> Thu, 02 Apr 2015 11:13:36 -0500
+
init-system-helpers (1.22ubuntu5) vivid; urgency=medium
* Depend on upstart-sysv instead of upstart (LP: #1422681)
diff -Nru init-system-helpers-1.22ubuntu5/debian/control init-system-helpers-1.22ubuntu6/debian/control
--- init-system-helpers-1.22ubuntu5/debian/control 2015-03-23 04:44:03.000000000 -0500
+++ init-system-helpers-1.22ubuntu6/debian/control 2015-04-02 11:28:13.000000000 -0500
@@ -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.22ubuntu5/debian/init-system-helpers.install init-system-helpers-1.22ubuntu6/debian/init-system-helpers.install
--- init-system-helpers-1.22ubuntu5/debian/init-system-helpers.install 2014-11-17 13:44:50.000000000 -0600
+++ init-system-helpers-1.22ubuntu6/debian/init-system-helpers.install 2015-04-02 11:15:17.000000000 -0500
@@ -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.22ubuntu5/script/apparmor-profile-load init-system-helpers-1.22ubuntu6/script/apparmor-profile-load
--- init-system-helpers-1.22ubuntu5/script/apparmor-profile-load 1969-12-31 18:00:00.000000000 -0600
+++ init-system-helpers-1.22ubuntu6/script/apparmor-profile-load 2015-04-02 11:16:08.000000000 -0500
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+[ -x /lib/apparmor/profile-load ] && exec /lib/apparmor/profile-load "$@"
diff -Nru squid3-3.3.8/debian/changelog squid3-3.3.8/debian/changelog
--- squid3-3.3.8/debian/changelog 2015-03-06 08:44:16.000000000 -0600
+++ squid3-3.3.8/debian/changelog 2015-04-02 11:23:19.000000000 -0500
@@ -1,3 +1,10 @@
+squid3 (3.3.8-1ubuntu14) vivid; urgency=medium
+
+ * Add versioned dependency on init-system-helpers (>> 1.22ubuntu5) to ensure
+ we have the apparmor-profile-load script at boot time. (LP: #1432683)
+
+ -- Serge Hallyn <serge.hallyn@ubuntu.com> Thu, 02 Apr 2015 11:12:27 -0500
+
squid3 (3.3.8-1ubuntu13) vivid; urgency=medium
* d/squid3.prerm: Removed redundant upstart-only code. Equivalent
diff -Nru squid3-3.3.8/debian/control squid3-3.3.8/debian/control
--- squid3-3.3.8/debian/control 2014-11-24 11:40:59.000000000 -0600
+++ squid3-3.3.8/debian/control 2015-04-02 11:12:23.000000000 -0500
@@ -10,7 +10,7 @@
Package: squid3
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, netbase, adduser, logrotate (>= 3.5.4-1), squid3-common (= ${source:Version}), lsb-base, ssl-cert (>= 1.0-11ubuntu1)
+Depends: ${shlibs:Depends}, ${misc:Depends}, init-system-helpers (>> 1.22ubuntu5), netbase, adduser, logrotate (>= 3.5.4-1), squid3-common (= ${source:Version}), lsb-base, ssl-cert (>= 1.0-11ubuntu1)
Suggests: squidclient, squid-cgi, squid-purge, resolvconf (>= 0.40), smbclient, ufw, winbindd, apparmor (>= 2.3)
Description: Full featured Web Proxy cache (HTTP proxy)
Squid is a high-performance proxy caching server for web clients, supporting
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,11 @@
+upstart (1.13.2-0ubuntu11) vivid; urgency=medium
+
+ * Remove /lib/init/apparmor-profile-load, as it is being moved to the
+ init-system-helpers package. Add new dependency on init-system-helpers
+ to transition all current systems. (LP: #1432683)
+
+ -- Serge Hallyn <serge.hallyn@ubuntu.com> Thu, 02 Apr 2015 11:21:23 -0500
+
upstart (1.13.2-0ubuntu10) vivid; urgency=medium
* Add upstart-sysv to mirror systemd-sysv behavior if upstart is chosen
diff -u upstart-1.13.2/debian/control upstart-1.13.2/debian/control
--- upstart-1.13.2/debian/control
+++ upstart-1.13.2/debian/control
@@ -15,7 +15,7 @@
Package: upstart
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, sysvinit-utils, initscripts, mountall, ifupdown (>= 0.6.10ubuntu5), libjson0 (>= 0.10-1.1ubuntu1), debianutils (>= 4)
+Depends: ${shlibs:Depends}, ${misc:Depends}, sysvinit-utils, init-system-helpers (>= 1.22ubuntu6), initscripts, mountall, ifupdown (>= 0.6.10ubuntu5), libjson0 (>= 0.10-1.1ubuntu1), debianutils (>= 4)
Suggests: python3, graphviz, bash-completion, upstart-monitor
Replaces: upstart-job, sysvinit, startup-tasks, system-services, upstart-bin (<< 1.13.2-0ubuntu10~)
Conflicts: upstart-job, sysvinit, startup-tasks, system-services, lxcguest
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/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.install upstart-1.13.2/debian/upstart.install
--- upstart-1.13.2/debian/upstart.install
+++ upstart-1.13.2/debian/upstart.install
@@ -1,6 +1,5 @@
bin/init-checkconf usr/bin/
bin/initctl2dot usr/bin/
-debian/apparmor-profile-load lib/init/
debian/conf/*.conf etc/init/
debian/migrate-inittab.pl usr/lib/upstart/
debian/running-in-container bin/
|