[IPCop-cvs] CVS: ipcop make.sh,1.18.2.35,1.18.2.36

[Mark W. <ri...@us...>]

Update of /cvsroot/ipcop/ipcop
In directory usw-pr-cvs1:/tmp/cvs-serv26750

Modified Files:
      Tag: IPCOP_v0_1
	make.sh 
Log Message:
Updated mod_ssl package, according to RedHat advisory

Index: make.sh
===================================================================
RCS file: /cvsroot/ipcop/ipcop/make.sh,v
retrieving revision 1.18.2.35
retrieving revision 1.18.2.36
diff -C2 -d -r1.18.2.35 -r1.18.2.36
*** make.sh	11 Jul 2002 12:42:00 -0000	1.18.2.35
--- make.sh	17 Jul 2002 14:01:13 -0000	1.18.2.36
***************
*** 25,33 ****
    CONFIG_ROOT=/var/ipcop			# Configuration rootdir
  
    PWD=`pwd`
-   FULLPATH=`which $0`
    BASENAME=`basename $0`
    BASEDIR=`echo $FULLPATH | sed "s/\/$BASENAME//g"`
!   TMPDIR=/tmp/$SNAME.build.$$
    LOGFILE=$TMPDIR/$SNAME.build.log
  
--- 25,40 ----
    CONFIG_ROOT=/var/ipcop			# Configuration rootdir
  
+   # Debian specific settings
+   if [ ! -e /etc/debian_version ]; then
+ 	FULLPATH=`which $0`
+   else
+ 	FULLPATH=`realpath $0`
+   fi
+ 
+   # Other settings
    PWD=`pwd`
    BASENAME=`basename $0`
    BASEDIR=`echo $FULLPATH | sed "s/\/$BASENAME//g"`
!   TMPDIR=/var/tmp/$SNAME.build.$$
    LOGFILE=$TMPDIR/$SNAME.build.log
  
***************
*** 38,41 ****
--- 45,55 ----
    MKE2FS=/sbin/mke2fs
  
+   # Debian specific settings
+   if [ ! -e /etc/debian_version ]; then
+ 	BUILDDIR=""
+   else
+ 	BUILDDIR="$TMPDIR/build"
+   fi
+ 
  # See what we're supposed to do
  case "$1" in 
***************
*** 277,281 ****
    $TMPDIR/build/dev/MAKEDEV -m 8 -d $TMPDIR/build/dev -c $BUILDDIR/etc/makedev.d \
  	pty ide usb ipfilter isdn >> $LOGFILE 2>&1
!   chgrp nobody $TMPDIR/build/dev/tty[A-Z]* $TMPDIR/build/dev/isdn*
    chmod 660 $TMPDIR/build/dev/tty[A-Z]* $TMPDIR/build/dev/isdn*
  
--- 291,295 ----
    $TMPDIR/build/dev/MAKEDEV -m 8 -d $TMPDIR/build/dev -c $BUILDDIR/etc/makedev.d \
  	pty ide usb ipfilter isdn >> $LOGFILE 2>&1
!   chgrp 99 $TMPDIR/build/dev/tty[A-Z]* $TMPDIR/build/dev/isdn*
    chmod 660 $TMPDIR/build/dev/tty[A-Z]* $TMPDIR/build/dev/isdn*
  
***************
*** 966,971 ****
    done
  
!   chown -R nobody:nobody $TMPDIR/build/var/patches/
!   chown -R nobody:nobody $TMPDIR/build/$CONFIG_ROOT
    for i in	$TMPDIR/build/$CONFIG_ROOT/backup \
  		$TMPDIR/build/$CONFIG_ROOT/ethernet \
--- 980,985 ----
    done
  
!   chown -R 99:99 $TMPDIR/build/var/patches/
!   chown -R 99:99 $TMPDIR/build/$CONFIG_ROOT
    for i in	$TMPDIR/build/$CONFIG_ROOT/backup \
  		$TMPDIR/build/$CONFIG_ROOT/ethernet \
***************
*** 976,980 ****
  	chown -R root:root $i
    done
!   chown -R nobody:nobody $TMPDIR/build/$CONFIG_ROOT/ethernet/aliases
  
    for i in 	$TMPDIR/build/etc/ppp/ppp-on \
--- 990,994 ----
  	chown -R root:root $i
    done
!   chown -R 99:99 $TMPDIR/build/$CONFIG_ROOT/ethernet/aliases
  
    for i in 	$TMPDIR/build/etc/ppp/ppp-on \
***************
*** 1002,1006 ****
                  $TMPDIR/build/usr/local/bin/timecheck \
                  $TMPDIR/build/usr/local/bin/setdmzholes ; do
! 	chown root:nobody $i
  	chmod 4750 $i
    done
--- 1016,1020 ----
                  $TMPDIR/build/usr/local/bin/timecheck \
                  $TMPDIR/build/usr/local/bin/setdmzholes ; do
! 	chown root:99 $i
  	chmod 4750 $i
    done