smf-init (4.3) unstable; urgency=medium

  * Use recent sources
  * Refreshed patches
  * Install /etc/default/init in postint with CMASK only

10 files changed, 40 insertions, 25 deletions

diff --git a/smf-init/debian/changelog b/smf-init/debian/changelog
index cafd802..d488bce 100644
--- a/smf-init/debian/changelog
+++ b/smf-init/debian/changelog
@@ -1,3 +1,11 @@
+smf-init (4.3) unstable; urgency=medium
+
+  * Use recent sources
+  * Refreshed patches
+  * Install /etc/default/init in postint with CMASK only
+
+ -- Igor Pashev <pashev.igor@gmail.com>  Fri, 27 Mar 2015 17:18:42 +0300
+
 smf-init (2.10+5) unstable; urgency=medium
 
   * Fixed patch mess
diff --git a/smf-init/debian/control b/smf-init/debian/control
index 162b322..6cdfe89 100644
--- a/smf-init/debian/control
+++ b/smf-init/debian/control
@@ -4,7 +4,7 @@ Priority: required
 Maintainer: Igor Pashev <pashev.igor@gmail.com>
 Build-Depends:
  dh-illumos,
- illumos-source-2.10,
+ illumos-source-4.3,
  libscf-dev,
  libbsm-dev,
  libcontract-dev,
diff --git a/smf-init/debian/patches/halt-amd64.patch b/smf-init/debian/patches/halt-amd64.patch
index 57a681c..5ef5306 100644
--- a/smf-init/debian/patches/halt-amd64.patch
+++ b/smf-init/debian/patches/halt-amd64.patch
@@ -1,8 +1,8 @@
 Index: smf-init/usr/src/cmd/halt/halt.c
 ===================================================================
---- smf-init.orig/usr/src/cmd/halt/halt.c	2013-01-25 09:05:46.836909693 +0000
-+++ smf-init/usr/src/cmd/halt/halt.c	2013-01-25 09:06:36.031341509 +0000
-@@ -87,7 +87,7 @@
+--- smf-init.orig/usr/src/cmd/halt/halt.c
++++ smf-init/usr/src/cmd/halt/halt.c
+@@ -90,7 +90,7 @@
  
  #if defined(__sparc)
  #define	CUR_ELFDATA	ELFDATA2MSB
diff --git a/smf-init/debian/patches/halt-no-grub.patch b/smf-init/debian/patches/halt-no-grub.patch
index 8a2b897..f1c6d25 100644
--- a/smf-init/debian/patches/halt-no-grub.patch
+++ b/smf-init/debian/patches/halt-no-grub.patch
@@ -1,8 +1,8 @@
 Index: smf-init/usr/src/cmd/halt/halt.c
 ===================================================================
---- smf-init.orig/usr/src/cmd/halt/halt.c	2012-10-08 00:25:24.000000000 +0000
-+++ smf-init/usr/src/cmd/halt/halt.c	2013-01-25 08:56:16.092106335 +0000
-@@ -80,9 +80,6 @@
+--- smf-init.orig/usr/src/cmd/halt/halt.c
++++ smf-init/usr/src/cmd/halt/halt.c
+@@ -83,9 +83,6 @@
  #include <spawn.h>
  
  #include <libzfs.h>
@@ -12,7 +12,7 @@ Index: smf-init/usr/src/cmd/halt/halt.c
  
  #if !defined(TEXT_DOMAIN)
  #define	TEXT_DOMAIN	"SYS_TEST"
-@@ -131,12 +128,6 @@
+@@ -134,12 +131,6 @@ static ctid_t startdct = -1;
   */
  static char	fastboot_mounted[MAXPATHLEN];
  
@@ -25,7 +25,7 @@ Index: smf-init/usr/src/cmd/halt/halt.c
  static int validate_ufs_disk(char *, char *);
  static int validate_zfs_pool(char *, char *);
  
-@@ -1041,49 +1032,6 @@
+@@ -1044,49 +1035,6 @@ parse_fastboot_args(char *bootargs_buf,
  	if (*is_dryrun)
  		return (rc);
  
@@ -75,7 +75,7 @@ Index: smf-init/usr/src/cmd/halt/halt.c
  
  	/* Zero out the boot argument buffer as we will reconstruct it */
  	bzero(bootargs_buf, buf_size);
-@@ -1667,10 +1615,6 @@
+@@ -1657,10 +1605,6 @@ fail:
  
  		} else if (strlen(fastboot_mounted) != 0) {
  			(void) umount(fastboot_mounted);
@@ -88,9 +88,9 @@ Index: smf-init/usr/src/cmd/halt/halt.c
  
 Index: smf-init/usr/src/cmd/halt/Makefile
 ===================================================================
---- smf-init.orig/usr/src/cmd/halt/Makefile	2012-10-08 00:25:24.000000000 +0000
-+++ smf-init/usr/src/cmd/halt/Makefile	2013-01-25 08:56:32.960004565 +0000
-@@ -50,7 +50,6 @@
+--- smf-init.orig/usr/src/cmd/halt/Makefile
++++ smf-init/usr/src/cmd/halt/Makefile
+@@ -50,7 +50,6 @@ CPPFLAGS += -I../../uts/common/fs/zfs
  CERRWARN += -_gcc=-Wno-unused-label
  
  LDLIBS += -lbsm -lscf -lzfs -lgen
diff --git a/smf-init/debian/patches/halt-pointers.patch b/smf-init/debian/patches/halt-pointers.patch
index 9b50ca0..cb0ccae 100644
--- a/smf-init/debian/patches/halt-pointers.patch
+++ b/smf-init/debian/patches/halt-pointers.patch
@@ -1,8 +1,8 @@
 Index: smf-init/usr/src/cmd/halt/halt.c
 ===================================================================
---- smf-init.orig/usr/src/cmd/halt/halt.c	2013-01-25 08:56:16.092106335 +0000
-+++ smf-init/usr/src/cmd/halt/halt.c	2013-01-25 09:05:46.836909693 +0000
-@@ -459,7 +459,7 @@
+--- smf-init.orig/usr/src/cmd/halt/halt.c
++++ smf-init/usr/src/cmd/halt/halt.c
+@@ -462,7 +462,7 @@ halt_zones()
  {
  	pid_t pid;
  	zoneid_t *zones;
@@ -11,7 +11,7 @@ Index: smf-init/usr/src/cmd/halt/halt.c
  	int i;
  	char zname[ZONENAME_MAX];
  
-@@ -545,7 +545,7 @@
+@@ -548,7 +548,7 @@ static void
  check_zones_haltedness()
  {
  	int t = 0, t_prog = 0;
@@ -20,7 +20,7 @@ Index: smf-init/usr/src/cmd/halt/halt.c
  
  	do {
  		last_nz = nz;
-@@ -1204,7 +1204,7 @@
+@@ -1205,7 +1205,7 @@ main(int argc, char *argv[])
  	int qflag = 0, needlog = 1, nosync = 0;
  	int fast_reboot = 0;
  	int prom_reboot = 0;
@@ -29,7 +29,7 @@ Index: smf-init/usr/src/cmd/halt/halt.c
  	int cmd, fcn, c, aval, r;
  	const char *usage;
  	const char *optstring;
-@@ -1568,7 +1568,7 @@
+@@ -1558,7 +1558,7 @@ main(int argc, char *argv[])
  	}
  
  	if (cmd == A_DUMP && nosync != 0)
diff --git a/smf-init/debian/patches/init-dont-set-timezone.patch b/smf-init/debian/patches/init-dont-set-timezone.patch
index 1524039..06d05d6 100644
--- a/smf-init/debian/patches/init-dont-set-timezone.patch
+++ b/smf-init/debian/patches/init-dont-set-timezone.patch
@@ -3,7 +3,7 @@ Index: smf-init/usr/src/cmd/init/init.c
 ===================================================================
 --- smf-init.orig/usr/src/cmd/init/init.c
 +++ smf-init/usr/src/cmd/init/init.c
-@@ -2015,6 +2015,11 @@ init_env()
+@@ -2021,6 +2021,11 @@ init_env()
  					(void) umask(cmask);
  					continue;
  				}
diff --git a/smf-init/debian/patches/init-linux-pam.patch b/smf-init/debian/patches/init-linux-pam.patch
index 7498e40..126b598 100644
--- a/smf-init/debian/patches/init-linux-pam.patch
+++ b/smf-init/debian/patches/init-linux-pam.patch
@@ -1,8 +1,8 @@
 Index: smf-init/usr/src/cmd/init/init.c
 ===================================================================
---- smf-init.orig/usr/src/cmd/init/init.c	2012-10-08 00:25:24.000000000 +0000
-+++ smf-init/usr/src/cmd/init/init.c	2013-01-20 01:07:37.743398218 +0000
-@@ -2602,6 +2602,7 @@
+--- smf-init.orig/usr/src/cmd/init/init.c
++++ smf-init/usr/src/cmd/init/init.c
+@@ -2610,6 +2610,7 @@ waitproc(struct PROC_TABLE *process)
  /*
   * notify_pam_dead(): calls into the PAM framework to close the given session.
   */
@@ -10,7 +10,7 @@ Index: smf-init/usr/src/cmd/init/init.c
  static void
  notify_pam_dead(struct utmpx *up)
  {
-@@ -2617,7 +2618,7 @@
+@@ -2625,7 +2626,7 @@ notify_pam_dead(struct utmpx *up)
  	(void) snprintf(ttyn, sizeof (ttyn), "%s", up->ut_line);
  	(void) snprintf(host, sizeof (host), "%s", up->ut_host);
  
diff --git a/smf-init/debian/patches/init-sulogin.patch b/smf-init/debian/patches/init-sulogin.patch
index 95fdcb9..8446904 100644
--- a/smf-init/debian/patches/init-sulogin.patch
+++ b/smf-init/debian/patches/init-sulogin.patch
@@ -2,7 +2,7 @@ Index: smf-init/usr/src/cmd/init/init.c
 ===================================================================
 --- smf-init.orig/usr/src/cmd/init/init.c
 +++ smf-init/usr/src/cmd/init/init.c
-@@ -482,7 +482,7 @@ static char *SYSTTY	 = "/dev/systty";	/*
+@@ -485,7 +485,7 @@ static char *SYSTTY	 = "/dev/systty";	/*
  static char *SYSCON	 = "/dev/syscon";	/* Virtual System console */
  static char *IOCTLSYSCON = "/etc/ioctl.syscon";	/* Last syscon modes */
  static char *ENVFILE	 = "/etc/default/init";	/* Default env. */
diff --git a/smf-init/debian/smf-init.dirs b/smf-init/debian/smf-init.dirs
index c8a3f23..a1ad5dc 100644
--- a/smf-init/debian/smf-init.dirs
+++ b/smf-init/debian/smf-init.dirs
@@ -1 +1,2 @@
+etc/default
 etc/svc/volatile
diff --git a/smf-init/debian/smf-init.postinst b/smf-init/debian/smf-init.postinst
index c60be7c..cd446ce 100644
--- a/smf-init/debian/smf-init.postinst
+++ b/smf-init/debian/smf-init.postinst
@@ -10,6 +10,12 @@ configure() {
         cp /usr/share/smf-init/inittab "$t"
     fi
 
+    i=/etc/default/init
+    if ! [ -e "$i" ]; then
+        echo "Installing default $i"
+        echo "CMASK=022" > "$i"
+    fi
+
     io=/etc/ioctl.syscon
     if ! [ -e "$io" ]; then
         echo "Installing default $io"