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

[Bilal Akhtar]

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

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

[Stefano Rivera (stefanor)]

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

review: Needs Fixing

[Bilal Akhtar (bilalakhtar)]

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

[Stefano Rivera (stefanor)]

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

[Stefano Rivera (stefanor)]

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

[Bilal Akhtar (bilalakhtar)]

Could you please see the diffs now?

Unmerged revisions

=== 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 @@
+selinux-basics (0.3.6ubuntu1) maverick; urgency=low
+
+  * Merge from Debian unstable (LP: #603595), remaining changes:
+    - debian/rules: Used dh_installudev to install udev rule.
+    - debian/selinux-basics.dirs: Removed rule to create directory 
+    - debian/selinux-basics.install: Removed rule to install other rules in this
+      file.
+    - debian/selinux-basics.postinst: Removed rule to create symlink.
+    - debian/selinux-basics.postrm: No symlink to remove to remove here.
+    - Bump build-depend on debhelper to install udev rules into
+      /lib/udev/rules.d.
+
+ -- Bilal Akhtar <[e-mail]>  Thu, 15 Jul 2010 11:16:05 +0530
+
+selinux-basics (0.3.6) unstable; urgency=low
+
+  * selinux-activate no longer touches /etc/pam.d/login - the default should
+    be OK.  Also made it update the configuration of grub2.
+
+ -- Russell Coker <[e-mail]>  Fri, 16 Apr 2010 15:58:52 +1000
+
+selinux-basics (0.3.5+nmu2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix "fails to install" by calling dh_installdirs in debian/rules,
+    otherwise the directory for the symlink is missing (closes: #566576).
+
+ -- gregor herrmann <[e-mail]>  Sat, 13 Feb 2010 16:41:47 +0100
+
+selinux-basics (0.3.5+nmu1) unstable; urgency=low
+
+  * Non-maintainer upload to fix release goal.
+  * Add $remote_fs as init.d script dependency (Closes: #541765).
+
+ -- Petter Reinholdtsen <[e-mail]>  Sat, 10 Oct 2009 23:00:06 +0200
+
 selinux-basics (0.3.5ubuntu1) jaunty; urgency=low
 
   * debian/rules: Use dh_installudev to install udev rule.

=== 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 @@
 Source: selinux-basics
 Section: admin
 Priority: optional
-Maintainer: Ubuntu MOTU Developers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Russell Coker <[e-mail]>
 Uploaders: Ulisses Castro <[e-mail]>
 Build-Depends: debhelper (>= 7.0.17ubuntu2)
@@ -15,7 +15,6 @@
 Depends: checkpolicy, policycoreutils, selinux-utils, python
 Recommends: setools, selinux-policy-default
 Suggests: logcheck, syslog-summary
-Breaks: udev (<< 136-1)
 Description: SELinux basic support
  This package will pull in basic SELinux stuff to ease installation, as well
  as provide scripts and helpers to work around common problems.

=== 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 @@
 	dh_installchangelogs 
 	dh_installdocs
 	dh_installexamples
+	dh_installdirs
 	dh_install
 	dh_installinit --update-rcd-params="start 36 S ." --no-start
 	dh_installudev

=== 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 @@
 #! /bin/sh
 ### BEGIN INIT INFO
 # Provides:          selinux-basics
-# Required-Start:    checkfs
+# Required-Start:    $remote_fs
 # Required-Stop:
 # Default-Start:     S
 # Default-Stop:

=== 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 @@
-#!/bin/sh
-
-set -e
-
-if [ "$1" = install ] || [ "$1" = upgrade ]; then
-	if [ -L "/etc/udev/rules.d/010-no-legacy-ptys.rules" ]; then
-		rm -f "/etc/udev/rules.d/010-no-legacy-ptys.rules"
-	fi
-
-	if [ -e "/etc/udev/no-legacy-ptys.rules" ]; then
-		if [ "`md5sum \"/etc/udev/no-legacy-ptys.rules\" | sed -e \"s/ .*//\"`" = \
-		     "`dpkg-query -W -f='${Conffiles}' selinux-basics | sed -n -e \"\\\\' /etc/udev/no-legacy-ptys.rules's/.* //p\"`" ]
-		then
-			rm -f "/etc/udev/no-legacy-ptys.rules"
-		else
-			mv "/etc/udev/no-legacy-ptys.rules" "/etc/udev/rules.d/40-selinux-basics.rules"
-		fi
-	fi
-fi
-
-#DEBHELPER#

=== 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 @@
 #!/bin/sh -e
 
 GRUB_CONF=/boot/grub/menu.lst
-PAM_LOGIN=/etc/pam.d/login
+GRUB2_CONF=/etc/default/grub
 
 if [ "$1" != "disable" ]; then
   echo "Activating SE Linux"
@@ -12,8 +12,11 @@
       update-grub
     fi
   fi
-  sed -e "s/^# \(.*selinux.*$\)/\1/" < $PAM_LOGIN > $PAM_LOGIN.new
-  mv $PAM_LOGIN.new $PAM_LOGIN
+  if [ -e $GRUB2_CONF ]; then
+    sed -e "s/ \?selinux=1//g" -e "s/\(^GRUB_CMDLINE_LINUX=.*\)\"$/\1 selinux=1\"/" < $GRUB2_CONF > $GRUB2_CONF.new
+    mv $GRUB2_CONF.new $GRUB2_CONF
+    update-grub
+  fi
   for n in kdm wdm ; do
     FILE=/etc/pam.d/$n
     if [ -e $FILE ]; then
@@ -36,8 +39,13 @@
     sed -e "s/ selinux=1//" < $GRUB_CONF > $GRUB_CONF.new
     mv $GRUB_CONF.new $GRUB_CONF
   fi
-  sed -e "s/\(^.*selinux.*$\)/# \1/" < $PAM_LOGIN > $PAM_LOGIN.new
-  mv $PAM_LOGIN.new $PAM_LOGIN
+  if [ -e $GRUB2_CONF ]; then
+    if grep -q selinux $GRUB2_CONF 2> /dev/null ; then
+      sed -e "s/ \?selinux=1//" < $GRUB2_CONF > $GRUB2_CONF.new
+      mv $GRUB2_CONF.new $GRUB2_CONF
+      update-grub
+    fi
+  fi
   for n in gdm kdm ; do
     FILE=/etc/pam.d/$n
     if grep -q selinux $FILE 2> /dev/null ; then