[IPCop-cvs] CVS: ipcop make.sh,1.18.2.47,1.18.2.48

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

Update of /cvsroot/ipcop/ipcop
In directory sc8-pr-cvs1:/tmp/cvs-serv3232a

Modified Files:
      Tag: IPCOP_v1
	make.sh 
Log Message:
- Updated version to 1.3alpha2
- Fixed modules.tgz size
- Updated to kernel 2.4.20
- Added h323 masquerading module and pptp module


Index: make.sh
===================================================================
RCS file: /cvsroot/ipcop/ipcop/make.sh,v
retrieving revision 1.18.2.47
retrieving revision 1.18.2.48
diff -C2 -d -r1.18.2.47 -r1.18.2.48
*** make.sh	26 Nov 2002 21:18:06 -0000	1.18.2.47
--- make.sh	30 Nov 2002 16:35:57 -0000	1.18.2.48
***************
*** 20,26 ****
    SNAME="ipcop"					# Short name
    # VERSION=`date '+%Y%m%d'`			# Version number
!   VERSION=1.3alpha1
    SLOGAN="The Bad Packets Stop Here"		# Software slogan
!   KERNEL_VERSION=2.4.19				# Kernel version number
    CONFIG_ROOT=/var/ipcop			# Configuration rootdir
    NICE=10					# Nice level for building
--- 20,26 ----
    SNAME="ipcop"					# Short name
    # VERSION=`date '+%Y%m%d'`			# Version number
!   VERSION=1.3alpha2
    SLOGAN="The Bad Packets Stop Here"		# Software slogan
!   KERNEL_VERSION=2.4.20				# Kernel version number
    CONFIG_ROOT=/var/ipcop			# Configuration rootdir
    NICE=10					# Nice level for building
***************
*** 882,906 ****
    make insert >> $LOGFILE 2>&1
    
-   echo "`date '+%b %e %T'`: Applying kernel pptp masquerading patches" | tee -a $LOGFILE
-   cd $TMPDIR
-   cp $IPCOP_FILE_CACHE/netfilter_pptp_patch*.gz .
-   gzip -d netfilter_pptp_patch*.gz
-   cd $TMPDIR/linux
-   patch -p1 <$TMPDIR/netfilter_pptp* >>$LOGFILE 2>&1
- 
-   echo "`date '+%b %e %T'`: Applying kernel ISDN DOV patch" | tee -a $LOGFILE
-   cd $TMPDIR/linux/drivers/isdn
-   patch -p0 <$BASEDIR/config/kernel/isdn_net.c.diff >> $LOGFILE 2>&1
- 
-   echo "`date '+%b %e %T'`: Applying kernel ISDN netjet patch" | tee -a $LOGFILE
-   cd $TMPDIR/linux/drivers/isdn/hisax
-   patch -p0 <$BASEDIR/config/kernel/netjet.c.diff >> $LOGFILE 2>&1
- 
    echo "`date '+%b %e %T'`: Applying netfilter patch-o-matic patches" | tee -a $LOGFILE
    cd $TMPDIR
    tar xfj $IPCOP_FILE_CACHE/patch-o-matic-*.tar.bz2
    cd patch-o-matic*
!   yes '' | KERNEL_DIR=$TMPDIR/linux/ ./runme pending >> $LOGFILE 2>&1
!   yes '' | KERNEL_DIR=$TMPDIR/linux/ ./runme base    >> $LOGFILE 2>&1
  
    echo "`date '+%b %e %T'`: Building Linux kernel $KERNEL_VERSION" | tee -a $LOGFILE
--- 882,900 ----
    make insert >> $LOGFILE 2>&1
    
    echo "`date '+%b %e %T'`: Applying netfilter patch-o-matic patches" | tee -a $LOGFILE
    cd $TMPDIR
    tar xfj $IPCOP_FILE_CACHE/patch-o-matic-*.tar.bz2
    cd patch-o-matic*
!   mv runme runme.bak
!   cat runme.bak | sed s'/^.*echo -n "No more patches.*$/exit 0/' > runme
!   chmod 755 runme
!   rm -f submitted/ip_conntrack_protocol_destroy.patch
!   yes 'y ' | KERNEL_DIR=$TMPDIR/linux/ ./runme pending >> $LOGFILE 2>&1
!   yes 'y ' | KERNEL_DIR=$TMPDIR/linux/ ./runme base    >> $LOGFILE 2>&1
!   yes 'y' | KERNEL_DIR=$TMPDIR/linux/ ./runme extra/h323-conntrack-nat.patch >> $LOGFILE 2>&1
!   mv extra/pptp-conntrack-nat.patch extra/pptp-conntrack-nat.patch.bak
!   cat extra/pptp-conntrack-nat.patch.bak | sed '/^.*MUST_BE_READ_LOCKED(&ip_conntrack_lock).*$/a\
!  	WRITE_LOCK(&ip_conntrack_expect_tuple_lock);'> extra/pptp-conntrack-nat.patch
!   yes 'y' | KERNEL_DIR=$TMPDIR/linux/ ./runme extra/pptp-conntrack-nat.patch >> $LOGFILE 2>&1
  
    echo "`date '+%b %e %T'`: Building Linux kernel $KERNEL_VERSION" | tee -a $LOGFILE
***************
*** 1062,1066 ****
    cp $BASEDIR/doc/CHANGES $TMPDIR/cdrom/
    mv -f $TMPDIR/$SNAME.tgz $TMPDIR/cdrom/
!   cd $TMPDIR/build/; tar cf - lib/modules/ | gzip -9 > $TMPDIR/cdrom/modules.tgz
  
    mkdir -p $TMPDIR/cdrom/dosutils
--- 1056,1061 ----
    cp $BASEDIR/doc/CHANGES $TMPDIR/cdrom/
    mv -f $TMPDIR/$SNAME.tgz $TMPDIR/cdrom/
!   cd $TMPDIR/build/; tar cf - lib/modules/ --exclude=lib/modules/$KERNEL_VERSION/kernel/net/* | \
! 	gzip -9 > $TMPDIR/cdrom/modules.tgz
  
    mkdir -p $TMPDIR/cdrom/dosutils