Merge branch 'master' of ssh://nagiosplug.git.sourceforge.net/gitroot/nagiosplug/nagiosplug

3 files changed, 48 insertions, 4 deletions

diff --git a/pkg/solaris/pkginfo.in b/pkg/solaris/pkginfo.in
index c9dcced0..3bed3464 100644
--- a/pkg/solaris/pkginfo.in
+++ b/pkg/solaris/pkginfo.in
@@ -1,4 +1,4 @@
-PKG="NAGplugin"
+PKG="NGOSplugin"
 NAME="nagios-plugins"
 DESC="Nagios network monitoring plugins"
 ARCH="@PKG_ARCH@"
diff --git a/pkg/solaris/preinstall b/pkg/solaris/preinstall
new file mode 100755
index 00000000..c4cc2690
--- /dev/null
+++ b/pkg/solaris/preinstall
@@ -0,0 +1,35 @@
+#!/usr/bin/sh
+
+user="nagios"
+uid=-1
+group="nagios"
+gid=-1
+
+/usr/bin/getent group $group > /dev/null 2> /dev/null
+result=$?
+if [ $result -eq 2 ] ; then
+        echo "Group $group does not exist. Creating..."
+        if [ $gid -ne -1 ] ; then
+                /usr/sbin/groupadd -g $gid $group
+        else
+                /usr/sbin/groupadd $group
+        fi
+elif [ $result -ne 0 ] ; then
+        echo "An error occurred determining the existence of the groug $group. Terminating."
+        exit 1;
+fi
+
+/usr/bin/getent passwd $user > /dev/null 2> /dev/null
+result=$?
+if [ $result -eq 2 ] ; then
+        echo "User $user does not exist. Creating..."
+        if [ $uid -ne -1 ] ; then
+                /usr/sbin/useradd -u $uid -g $group $user
+        else
+                /usr/sbin/useradd -g $group $user
+        fi
+elif [ $result -ne 0 ] ; then
+        echo "An error occurred determining the existence of the user $user. Terminating."
+        exit 1;
+fi
+
diff --git a/pkg/solaris/solpkg b/pkg/solaris/solpkg
index 41d8e177..a21176e4 100755
--- a/pkg/solaris/solpkg
+++ b/pkg/solaris/solpkg
@@ -8,6 +8,7 @@ $pkgmk = "/usr/bin/pkgmk";
 $pkgtrans = "/usr/bin/pkgtrans";
 $prototype = "prototype";
 $pkginfo = "pkginfo";
+$preinstall = "preinstall";
 $egrep = "/usr/bin/egrep";
 
 # Sanity check
@@ -24,17 +25,24 @@ open (PREPROTO,"$find . -print |$egrep -v \"^\.(/usr(/local)?|/opt)?\$\" | $pkgp
 open (PROTO,">$prototype") ||
         die "Unable to write file prototype ($!)\n";
 print PROTO "i pkginfo=./$pkginfo\n";
+print PROTO "i preinstall=./$preinstall\n";
 while (<PREPROTO>) {
         # Read in the prototype information
         chomp;
         $thisline = $_;
         if ($thisline =~ " prototype "
-          or $thisline =~ " pkginfo ") {
+          or $thisline =~ " pkginfo "
+          or $thisline =~ " preinstall ") {
             # Don't do anything as they aren't important
+        } elsif ($thisline =~ "pst3") {
+                # Needs to be installed SUID root
+          ($dir, $none, $file, $mode, $user, $group) = split / /,$thisline;
+          print PROTO "$dir $none $file 4755 root bin\n";
+                
         } elsif ($thisline =~ "^[fd] ") {
           # Change the ownership of files and directories
           ($dir, $none, $file, $mode, $user, $group) = split / /,$thisline;
-          print PROTO "$dir $none $file $mode bin bin\n";
+          print PROTO "$dir $none $file $mode $user bin\n";
         } else {
           # Symlinks and other stuff should be printed also
           print PROTO "$thisline\n";
@@ -58,6 +66,7 @@ while (<PKGINFO>) {
         $thisline = $_;
         ($var,$value) = split /=/,$thisline;
         if ("$var" eq "NAME" 
+          or "$var" eq "PKG"
           or "$var" eq "VERSION"
           or "$var" eq "ARCH") {
                 $tmp = lc($var);
@@ -77,5 +86,5 @@ $packagename = "$name-$version-$os-$arch-local";
 
 print "Building package\n";
 system ("$pkgmk -o -r `pwd` -d $pkgdevice");
-system ("(cd $pkgdevice && $pkgtrans -s `pwd` ../$packagename)");
+system ("(cd $pkgdevice && $pkgtrans -s `pwd` ../$packagename $pkg)");
 print "Done. ($packagename)\n";