Ubuntu
selinux-basics package

Merge lp:~bilalakhtar/ubuntu/maverick/selinux-basics/merge-603595 into lp:ubuntu/maverick/selinux-basics

  1. Maverick (10.10)
  2. merge-603595
  3. Merge into maverick
Proposed by Bilal Akhtar
Status: Superseded
Proposed branch: lp:~bilalakhtar/ubuntu/maverick/selinux-basics/merge-603595
Merge into: lp:ubuntu/maverick/selinux-basics
Diff against target: 158 lines (+52/-29)
6 files modified
debian/changelog (+36/-0)
debian/control (+1/-2)
debian/rules (+1/-0)
debian/selinux-basics.init (+1/-1)
debian/selinux-basics.preinst (+0/-21)
selinux-activate (+13/-5)
To merge this branch: bzr merge lp:~bilalakhtar/ubuntu/maverick/selinux-basics/merge-603595
Reviewer Review Type Date Requested Status
Stefano Rivera Needs Fixing
Review via email: mp+29547@code.launchpad.net

This proposal has been superseded by a proposal from 2010-07-21.

Description of the change

Merge of package selinux-basics from debian (version 0.3.6).

Build succeeded in maverick chroot. Package installed and worked well after the build.

To post a comment you must log in.
Revision history for this message
Stefano Rivera (stefanor) wrote :

The changelog doesn't describe the contents very well. Please remove the things that aren't remaining changes.

review: Needs Fixing
Revision history for this message
Bilal Akhtar (bilalakhtar) wrote :

Stefano,
I have reworded the lines in changelog. Please check now.

Revision history for this message
Stefano Rivera (stefanor) wrote :

Err whoops, I might have just been reading this diff, rather than comparing to debian. I didn't notice it was a merge. I'll look again this evening

Revision history for this message
Stefano Rivera (stefanor) wrote :

Sorry I didn't get to this sooner.

We've been carrying most of these changes for a while, and some of them are no longer needed, because everyone using maverick has to have upgraded through lucid already:
* Breaks - udev 236 is ancient history. You won't find that on a post-hardy machine.
* preinst - That situation can't arise any more.

Please re-run update-maintainer. We don't use "MOTU Developers" any more.

review: Needs Fixing
Revision history for this message
Bilal Akhtar (bilalakhtar) wrote :

Could you please see the diffs now?

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2009-01-13 15:35:30 +0000
3+++ debian/changelog 2010-07-15 06:25:57 +0000
4@@ -1,3 +1,39 @@
5+selinux-basics (0.3.6ubuntu1) maverick; urgency=low
6+
7+ * Merge from Debian unstable (LP: #603595), remaining changes:
8+ - debian/rules: Used dh_installudev to install udev rule.
9+ - debian/selinux-basics.dirs: Removed rule to create directory
10+ - debian/selinux-basics.install: Removed rule to install other rules in this
11+ file.
12+ - debian/selinux-basics.postinst: Removed rule to create symlink.
13+ - debian/selinux-basics.postrm: No symlink to remove to remove here.
14+ - Bump build-depend on debhelper to install udev rules into
15+ /lib/udev/rules.d.
16+
17+ -- Bilal Akhtar <bilalakhtar96@yahoo.com> Thu, 15 Jul 2010 11:16:05 +0530
18+
19+selinux-basics (0.3.6) unstable; urgency=low
20+
21+ * selinux-activate no longer touches /etc/pam.d/login - the default should
22+ be OK. Also made it update the configuration of grub2.
23+
24+ -- Russell Coker <russell@coker.com.au> Fri, 16 Apr 2010 15:58:52 +1000
25+
26+selinux-basics (0.3.5+nmu2) unstable; urgency=low
27+
28+ * Non-maintainer upload.
29+ * Fix "fails to install" by calling dh_installdirs in debian/rules,
30+ otherwise the directory for the symlink is missing (closes: #566576).
31+
32+ -- gregor herrmann <gregoa@debian.org> Sat, 13 Feb 2010 16:41:47 +0100
33+
34+selinux-basics (0.3.5+nmu1) unstable; urgency=low
35+
36+ * Non-maintainer upload to fix release goal.
37+ * Add $remote_fs as init.d script dependency (Closes: #541765).
38+
39+ -- Petter Reinholdtsen <pere@debian.org> Sat, 10 Oct 2009 23:00:06 +0200
40+
41 selinux-basics (0.3.5ubuntu1) jaunty; urgency=low
42
43 * debian/rules: Use dh_installudev to install udev rule.
44
45=== modified file 'debian/control'
46--- debian/control 2009-01-13 15:35:30 +0000
47+++ debian/control 2010-07-15 06:25:57 +0000
48@@ -1,7 +1,7 @@
49 Source: selinux-basics
50 Section: admin
51 Priority: optional
52-Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
53+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
54 XSBC-Original-Maintainer: Russell Coker <russell@coker.com.au>
55 Uploaders: Ulisses Castro <uss.thebug@gmail.com>
56 Build-Depends: debhelper (>= 7.0.17ubuntu2)
57@@ -15,7 +15,6 @@
58 Depends: checkpolicy, policycoreutils, selinux-utils, python
59 Recommends: setools, selinux-policy-default
60 Suggests: logcheck, syslog-summary
61-Breaks: udev (<< 136-1)
62 Description: SELinux basic support
63 This package will pull in basic SELinux stuff to ease installation, as well
64 as provide scripts and helpers to work around common problems.
65
66=== modified file 'debian/rules'
67--- debian/rules 2009-01-13 15:35:30 +0000
68+++ debian/rules 2010-07-15 06:25:57 +0000
69@@ -14,6 +14,7 @@
70 dh_installchangelogs
71 dh_installdocs
72 dh_installexamples
73+ dh_installdirs
74 dh_install
75 dh_installinit --update-rcd-params="start 36 S ." --no-start
76 dh_installudev
77
78=== modified file 'debian/selinux-basics.init'
79--- debian/selinux-basics.init 2008-09-15 11:46:00 +0000
80+++ debian/selinux-basics.init 2010-07-15 06:25:57 +0000
81@@ -1,7 +1,7 @@
82 #! /bin/sh
83 ### BEGIN INIT INFO
84 # Provides: selinux-basics
85-# Required-Start: checkfs
86+# Required-Start: $remote_fs
87 # Required-Stop:
88 # Default-Start: S
89 # Default-Stop:
90
91=== removed file 'debian/selinux-basics.preinst'
92--- debian/selinux-basics.preinst 2009-01-13 15:35:30 +0000
93+++ debian/selinux-basics.preinst 1970-01-01 00:00:00 +0000
94@@ -1,21 +0,0 @@
95-#!/bin/sh
96-
97-set -e
98-
99-if [ "$1" = install ] || [ "$1" = upgrade ]; then
100- if [ -L "/etc/udev/rules.d/010-no-legacy-ptys.rules" ]; then
101- rm -f "/etc/udev/rules.d/010-no-legacy-ptys.rules"
102- fi
103-
104- if [ -e "/etc/udev/no-legacy-ptys.rules" ]; then
105- if [ "`md5sum \"/etc/udev/no-legacy-ptys.rules\" | sed -e \"s/ .*//\"`" = \
106- "`dpkg-query -W -f='${Conffiles}' selinux-basics | sed -n -e \"\\\\' /etc/udev/no-legacy-ptys.rules's/.* //p\"`" ]
107- then
108- rm -f "/etc/udev/no-legacy-ptys.rules"
109- else
110- mv "/etc/udev/no-legacy-ptys.rules" "/etc/udev/rules.d/40-selinux-basics.rules"
111- fi
112- fi
113-fi
114-
115-#DEBHELPER#
116
117=== modified file 'selinux-activate'
118--- selinux-activate 2008-09-15 11:46:00 +0000
119+++ selinux-activate 2010-07-15 06:25:57 +0000
120@@ -1,7 +1,7 @@
121 #!/bin/sh -e
122
123 GRUB_CONF=/boot/grub/menu.lst
124-PAM_LOGIN=/etc/pam.d/login
125+GRUB2_CONF=/etc/default/grub
126
127 if [ "$1" != "disable" ]; then
128 echo "Activating SE Linux"
129@@ -12,8 +12,11 @@
130 update-grub
131 fi
132 fi
133- sed -e "s/^# \(.*selinux.*$\)/\1/" < $PAM_LOGIN > $PAM_LOGIN.new
134- mv $PAM_LOGIN.new $PAM_LOGIN
135+ if [ -e $GRUB2_CONF ]; then
136+ sed -e "s/ \?selinux=1//g" -e "s/\(^GRUB_CMDLINE_LINUX=.*\)\"$/\1 selinux=1\"/" < $GRUB2_CONF > $GRUB2_CONF.new
137+ mv $GRUB2_CONF.new $GRUB2_CONF
138+ update-grub
139+ fi
140 for n in kdm wdm ; do
141 FILE=/etc/pam.d/$n
142 if [ -e $FILE ]; then
143@@ -36,8 +39,13 @@
144 sed -e "s/ selinux=1//" < $GRUB_CONF > $GRUB_CONF.new
145 mv $GRUB_CONF.new $GRUB_CONF
146 fi
147- sed -e "s/\(^.*selinux.*$\)/# \1/" < $PAM_LOGIN > $PAM_LOGIN.new
148- mv $PAM_LOGIN.new $PAM_LOGIN
149+ if [ -e $GRUB2_CONF ]; then
150+ if grep -q selinux $GRUB2_CONF 2> /dev/null ; then
151+ sed -e "s/ \?selinux=1//" < $GRUB2_CONF > $GRUB2_CONF.new
152+ mv $GRUB2_CONF.new $GRUB2_CONF
153+ update-grub
154+ fi
155+ fi
156 for n in gdm kdm ; do
157 FILE=/etc/pam.d/$n
158 if grep -q selinux $FILE 2> /dev/null ; then

Subscribers

People subscribed via source and target branches