Bug(s) fixed: 154431

Bug Description: Security package requests from Cert Team
Reviewed by: Nathan (Thanks!)
Fix Description: Exclude the nssckbi file from shared32/lib; Create the shell script wrappers for shlibsign and shared32 modutil.
Platforms tested: RHEL3
Flag Day: no
Doc impact: no
QA impact: should be covered by regular nightly and manual testing
New Tests integrated into TET: none

internal_comp_deps.mk

@@ -97,7 +97,8 @@ ifeq ($(USE_64), 1)
 # all other files go under shared32/bin or /lib
   PACKAGE_SRC_DEST += $(SHARED32_BUILD_DIR)/bin/modutil shared32/bin
 
-  NSS32_NSPR32_SRC_LIBS =$(wildcard $(SHARED32_BUILD_DIR)/lib/*)
+# do not need redundant copy of nssckbi
+  NSS32_NSPR32_SRC_LIBS = $(filter-out $(SHARED32_BUILD_DIR)/lib/$(NSSCKBI32_FILE),$(wildcard $(SHARED32_BUILD_DIR)/lib/*))
   PACKAGE_SRC_DEST += $(addsuffix $(SPACE)shared32/lib,$(NSS32_NSPR32_SRC_LIBS))
 endif # USE_64
 

ldap/cm/newinst/ns-update

@@ -41,7 +41,7 @@ install_nsperl()
 wrap_security_tools()
 {
 	cwd=`pwd`
-	SECURITY_BINNAMES="certutil derdump modutil pk12util pp ssltap"
+	SECURITY_BINNAMES="certutil derdump modutil pk12util pp ssltap shlibsign"
 	arch=`uname`
 	if [ $arch = HP-UX ]; then
 		env_ld_library_path=SHLIB_PATH
@@ -62,6 +62,21 @@ wrap_security_tools()
 			chmod 755 $file
 		fi
 	done
+
+	if [ -d $sroot/shared32/bin ] ; then
+		cd $sroot/shared32/bin
+		for file in modutil
+		do
+			if [ -f $file -a ! -f $file-bin ]; then
+				mv $file $file-bin
+				echo "#!/bin/sh" > $file
+				echo $env_ld_library_path=$sroot/shared32/lib >> $file
+				echo "export $env_ld_library_path" >> $file
+				echo "$sroot/shared32/bin/$file-bin " '${1+"$@"}' >> $file
+				chmod 755 $file
+			fi
+		done
+	fi
 	cd $cwd
 }