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
=== modified file 'debian/changelog'
--- debian/changelog 2009-01-13 15:35:30 +0000
+++ debian/changelog 2010-07-15 06:25:57 +0000
@@ -1,3 +1,39 @@
1selinux-basics (0.3.6ubuntu1) maverick; urgency=low
2
3 * Merge from Debian unstable (LP: #603595), remaining changes:
4 - debian/rules: Used dh_installudev to install udev rule.
5 - debian/selinux-basics.dirs: Removed rule to create directory
6 - debian/selinux-basics.install: Removed rule to install other rules in this
7 file.
8 - debian/selinux-basics.postinst: Removed rule to create symlink.
9 - debian/selinux-basics.postrm: No symlink to remove to remove here.
10 - Bump build-depend on debhelper to install udev rules into
11 /lib/udev/rules.d.
12
13 -- Bilal Akhtar <bilalakhtar96@yahoo.com> Thu, 15 Jul 2010 11:16:05 +0530
14
15selinux-basics (0.3.6) unstable; urgency=low
16
17 * selinux-activate no longer touches /etc/pam.d/login - the default should
18 be OK. Also made it update the configuration of grub2.
19
20 -- Russell Coker <russell@coker.com.au> Fri, 16 Apr 2010 15:58:52 +1000
21
22selinux-basics (0.3.5+nmu2) unstable; urgency=low
23
24 * Non-maintainer upload.
25 * Fix "fails to install" by calling dh_installdirs in debian/rules,
26 otherwise the directory for the symlink is missing (closes: #566576).
27
28 -- gregor herrmann <gregoa@debian.org> Sat, 13 Feb 2010 16:41:47 +0100
29
30selinux-basics (0.3.5+nmu1) unstable; urgency=low
31
32 * Non-maintainer upload to fix release goal.
33 * Add $remote_fs as init.d script dependency (Closes: #541765).
34
35 -- Petter Reinholdtsen <pere@debian.org> Sat, 10 Oct 2009 23:00:06 +0200
36
1selinux-basics (0.3.5ubuntu1) jaunty; urgency=low37selinux-basics (0.3.5ubuntu1) jaunty; urgency=low
238
3 * debian/rules: Use dh_installudev to install udev rule.39 * debian/rules: Use dh_installudev to install udev rule.
440
=== modified file 'debian/control'
--- debian/control 2009-01-13 15:35:30 +0000
+++ debian/control 2010-07-15 06:25:57 +0000
@@ -1,7 +1,7 @@
1Source: selinux-basics1Source: selinux-basics
2Section: admin2Section: admin
3Priority: optional3Priority: optional
4Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>4Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
5XSBC-Original-Maintainer: Russell Coker <russell@coker.com.au>5XSBC-Original-Maintainer: Russell Coker <russell@coker.com.au>
6Uploaders: Ulisses Castro <uss.thebug@gmail.com>6Uploaders: Ulisses Castro <uss.thebug@gmail.com>
7Build-Depends: debhelper (>= 7.0.17ubuntu2)7Build-Depends: debhelper (>= 7.0.17ubuntu2)
@@ -15,7 +15,6 @@
15Depends: checkpolicy, policycoreutils, selinux-utils, python15Depends: checkpolicy, policycoreutils, selinux-utils, python
16Recommends: setools, selinux-policy-default16Recommends: setools, selinux-policy-default
17Suggests: logcheck, syslog-summary17Suggests: logcheck, syslog-summary
18Breaks: udev (<< 136-1)
19Description: SELinux basic support18Description: SELinux basic support
20 This package will pull in basic SELinux stuff to ease installation, as well19 This package will pull in basic SELinux stuff to ease installation, as well
21 as provide scripts and helpers to work around common problems.20 as provide scripts and helpers to work around common problems.
2221
=== modified file 'debian/rules'
--- debian/rules 2009-01-13 15:35:30 +0000
+++ debian/rules 2010-07-15 06:25:57 +0000
@@ -14,6 +14,7 @@
14 dh_installchangelogs 14 dh_installchangelogs
15 dh_installdocs15 dh_installdocs
16 dh_installexamples16 dh_installexamples
17 dh_installdirs
17 dh_install18 dh_install
18 dh_installinit --update-rcd-params="start 36 S ." --no-start19 dh_installinit --update-rcd-params="start 36 S ." --no-start
19 dh_installudev20 dh_installudev
2021
=== modified file 'debian/selinux-basics.init'
--- debian/selinux-basics.init 2008-09-15 11:46:00 +0000
+++ debian/selinux-basics.init 2010-07-15 06:25:57 +0000
@@ -1,7 +1,7 @@
1#! /bin/sh1#! /bin/sh
2### BEGIN INIT INFO2### BEGIN INIT INFO
3# Provides: selinux-basics3# Provides: selinux-basics
4# Required-Start: checkfs4# Required-Start: $remote_fs
5# Required-Stop:5# Required-Stop:
6# Default-Start: S6# Default-Start: S
7# Default-Stop:7# Default-Stop:
88
=== removed file 'debian/selinux-basics.preinst'
--- debian/selinux-basics.preinst 2009-01-13 15:35:30 +0000
+++ debian/selinux-basics.preinst 1970-01-01 00:00:00 +0000
@@ -1,21 +0,0 @@
1#!/bin/sh
2
3set -e
4
5if [ "$1" = install ] || [ "$1" = upgrade ]; then
6 if [ -L "/etc/udev/rules.d/010-no-legacy-ptys.rules" ]; then
7 rm -f "/etc/udev/rules.d/010-no-legacy-ptys.rules"
8 fi
9
10 if [ -e "/etc/udev/no-legacy-ptys.rules" ]; then
11 if [ "`md5sum \"/etc/udev/no-legacy-ptys.rules\" | sed -e \"s/ .*//\"`" = \
12 "`dpkg-query -W -f='${Conffiles}' selinux-basics | sed -n -e \"\\\\' /etc/udev/no-legacy-ptys.rules's/.* //p\"`" ]
13 then
14 rm -f "/etc/udev/no-legacy-ptys.rules"
15 else
16 mv "/etc/udev/no-legacy-ptys.rules" "/etc/udev/rules.d/40-selinux-basics.rules"
17 fi
18 fi
19fi
20
21#DEBHELPER#
220
=== modified file 'selinux-activate'
--- selinux-activate 2008-09-15 11:46:00 +0000
+++ selinux-activate 2010-07-15 06:25:57 +0000
@@ -1,7 +1,7 @@
1#!/bin/sh -e1#!/bin/sh -e
22
3GRUB_CONF=/boot/grub/menu.lst3GRUB_CONF=/boot/grub/menu.lst
4PAM_LOGIN=/etc/pam.d/login4GRUB2_CONF=/etc/default/grub
55
6if [ "$1" != "disable" ]; then6if [ "$1" != "disable" ]; then
7 echo "Activating SE Linux"7 echo "Activating SE Linux"
@@ -12,8 +12,11 @@
12 update-grub12 update-grub
13 fi13 fi
14 fi14 fi
15 sed -e "s/^# \(.*selinux.*$\)/\1/" < $PAM_LOGIN > $PAM_LOGIN.new15 if [ -e $GRUB2_CONF ]; then
16 mv $PAM_LOGIN.new $PAM_LOGIN16 sed -e "s/ \?selinux=1//g" -e "s/\(^GRUB_CMDLINE_LINUX=.*\)\"$/\1 selinux=1\"/" < $GRUB2_CONF > $GRUB2_CONF.new
17 mv $GRUB2_CONF.new $GRUB2_CONF
18 update-grub
19 fi
17 for n in kdm wdm ; do20 for n in kdm wdm ; do
18 FILE=/etc/pam.d/$n21 FILE=/etc/pam.d/$n
19 if [ -e $FILE ]; then22 if [ -e $FILE ]; then
@@ -36,8 +39,13 @@
36 sed -e "s/ selinux=1//" < $GRUB_CONF > $GRUB_CONF.new39 sed -e "s/ selinux=1//" < $GRUB_CONF > $GRUB_CONF.new
37 mv $GRUB_CONF.new $GRUB_CONF40 mv $GRUB_CONF.new $GRUB_CONF
38 fi41 fi
39 sed -e "s/\(^.*selinux.*$\)/# \1/" < $PAM_LOGIN > $PAM_LOGIN.new42 if [ -e $GRUB2_CONF ]; then
40 mv $PAM_LOGIN.new $PAM_LOGIN43 if grep -q selinux $GRUB2_CONF 2> /dev/null ; then
44 sed -e "s/ \?selinux=1//" < $GRUB2_CONF > $GRUB2_CONF.new
45 mv $GRUB2_CONF.new $GRUB2_CONF
46 update-grub
47 fi
48 fi
41 for n in gdm kdm ; do49 for n in gdm kdm ; do
42 FILE=/etc/pam.d/$n50 FILE=/etc/pam.d/$n
43 if grep -q selinux $FILE 2> /dev/null ; then51 if grep -q selinux $FILE 2> /dev/null ; then

Subscribers

People subscribed via source and target branches