[vhffs-dev] [svn] commit: r86 - trunk/vhffs-api/src/Vhffs/Robots trunk/vhffs-packages trunk/vhffs-packages/mysql40 trunk/vhffs-packages/mysql41 trunk/vhffs-packages/php trunk/vhffs-packages/pure-ftpd trunk/vhffs-packages/suphp trunk/vhffs-robots/src

[vhffs-dev@xxxxxxxxx]

Author: soda
Date: Tue Aug  2 20:34:03 2005
New Revision: 86

Log:
Commit some fix for svn and a complete build system


Added:
    trunk/vhffs-packages/buildall.sh   (with props)
    trunk/vhffs-packages/oldbuildwithdput.pl
      - copied unchanged from r85, trunk/vhffs-packages/build.pl
Removed:
    trunk/vhffs-packages/build.pl
Modified:
    trunk/vhffs-api/src/Vhffs/Robots/Svn.pm
    trunk/vhffs-packages/mysql40/build
    trunk/vhffs-packages/mysql41/build
    trunk/vhffs-packages/php/build
    trunk/vhffs-packages/pure-ftpd/build
    trunk/vhffs-packages/suphp/build
    trunk/vhffs-robots/src/svn_public.pl
    trunk/vhffs-robots/src/svn_websvn.pl

Modified: trunk/vhffs-api/src/Vhffs/Robots/Svn.pm
==============================================================================
--- trunk/vhffs-api/src/Vhffs/Robots/Svn.pm (original)
+++ trunk/vhffs-api/src/Vhffs/Robots/Svn.pm Tue Aug  2 20:34:03 2005
@@ -44,7 +44,7 @@
 			}
 			else
 			{
-				$line = "#anon-access = read\n";
+				$line = "anon-access = none\n";
 			}
 		}
 		if( $line =~ /.*\[general\].*/ )

Modified: trunk/vhffs-packages/mysql40/build
==============================================================================
--- trunk/vhffs-packages/mysql40/build (original)
+++ trunk/vhffs-packages/mysql40/build Tue Aug  2 20:34:03 2005
@@ -1,13 +1,18 @@
 #!/bin/sh
 CURRENTDIR=`pwd`
-TMPBUILD=/data/packages/build/
+
+
+if [ -z "$TMPBUILD" ]; then
+	TMPBUILD="/tmp/build/"
+fi
+
 rm -rf $TMPBUILD
-mkdir $TMPBUILD
+mkdir -p $TMPBUILD
 cd $TMPBUILD
 
 apt-get source mysql-server
 
-PKG_DIR=`find -type d -name "*mysql*" -maxdepth 1`
+PKG_DIR=`find -name "*mysql*" -maxdepth 1 -type d`
 cd $PKG_DIR
 
 # change debian manager name
@@ -20,6 +25,6 @@
 
 dpkg-buildpackage -uc -us -rfakeroot
 
-mv $TMPBUILD/*.deb $CURRENTDIR/output
-mv $TMPBUILD/*.changes $CURRENTDIR/output
-mv $TMPBUILD/*.dsc $CURRENTDIR/output
+mv -f $TMPBUILD/*.deb $CURRENTDIR/output
+mv -f $TMPBUILD/*.changes $CURRENTDIR/output
+mv -f $TMPBUILD/*.dsc $CURRENTDIR/output

Modified: trunk/vhffs-packages/mysql41/build
==============================================================================
--- trunk/vhffs-packages/mysql41/build (original)
+++ trunk/vhffs-packages/mysql41/build Tue Aug  2 20:34:03 2005
@@ -1,14 +1,18 @@
 #!/bin/sh
 
 CURRENTDIR=`pwd`
-TMPBUILD=/data/second/temp
+if [ -z "$TMPBUILD" ]; then
+    TMPBUILD="/tmp/build"
+fi  
+
+
 rm -rf $TMPBUILD 2>/dev/null
-mkdir $TMPBUILD
+mkdir -p $TMPBUILD
 cd $TMPBUILD
 
 apt-get source mysql-server-4.1
 
-PKG_DIR=`find -type d -name "*mysql*" -maxdepth 1`
+PKG_DIR=`find -name "*mysql*" -maxdepth 1 -type d`
 cd $PKG_DIR
 
 # change debian manager name
@@ -21,6 +25,6 @@
 
 dpkg-buildpackage -uc -us -rfakeroot
 
-mv $TMPBUILD/*.deb $CURRENTDIR/output
-mv $TMPBUILD/*.changes $CURRENTDIR/output
-mv $TMPBUILD/*.dsc $CURRENTDIR/output
+mv -f $TMPBUILD/*.deb $CURRENTDIR/output
+mv -f $TMPBUILD/*.changes $CURRENTDIR/output
+mv -f $TMPBUILD/*.dsc $CURRENTDIR/output

Modified: trunk/vhffs-packages/php/build
==============================================================================
--- trunk/vhffs-packages/php/build (original)
+++ trunk/vhffs-packages/php/build Tue Aug  2 20:34:03 2005
@@ -1,17 +1,21 @@
 #!/bin/sh
 CURRENTDIR=`pwd`
-TMPBUILD=/data/packages/build/
+
+if [ -z "$TMPBUILD" ]; then
+    TMPBUILD="/tmp/build/"
+fi  
+
 
 #We don't build php, debian packages are also good
 exit 0
 
 rm -rf $TMPBUILD
-mkdir $TMPBUILD
+mkdir -p $TMPBUILD
 cd $TMPBUILD
 
 apt-get source php4
 
-PKG_DIR=`find -type d -name "*php*" -maxdepth 1`
+PKG_DIR=`find -name "*php*" -maxdepth 1 -type d`
 cd $PKG_DIR
 
 # change debian manager name
@@ -23,6 +27,6 @@
 
 dpkg-buildpackage -uc -us -rfakeroot
 
-mv $TMPBUILD/*.deb $CURRENTDIR/output
-mv $TMPBUILD/*.changes $CURRENTDIR/output
-mv $TMPBUILD/*.dsc $CURRENTDIR/output
+mv -f $TMPBUILD/*.deb $CURRENTDIR/output
+mv -f $TMPBUILD/*.changes $CURRENTDIR/output
+mv -f $TMPBUILD/*.dsc $CURRENTDIR/output

Modified: trunk/vhffs-packages/pure-ftpd/build
==============================================================================
--- trunk/vhffs-packages/pure-ftpd/build (original)
+++ trunk/vhffs-packages/pure-ftpd/build Tue Aug  2 20:34:03 2005
@@ -1,14 +1,18 @@
 #!/bin/sh
 
 CURRENTDIR=`pwd`
-TMPBUILD=/tmp/build
+
+if [ -z "$TMPBUILD" ]; then
+    TMPBUILD="/tmp/build/"
+fi  
+
 rm -rf $TMPBUILD
-mkdir $TMPBUILD
+mkdir -p $TMPBUILD
 cd $TMPBUILD
 
 apt-get source pure-ftpd-postgresql
 
-PKG_DIR=`find -type d -name "*pure-ftpd*" -maxdepth 1`
+PKG_DIR=`find -name "*pure-ftpd*" -maxdepth 1 -type d`
 cd $PKG_DIR
 
 # change debian manager name
@@ -22,7 +26,7 @@
 
 dpkg-buildpackage -uc -us -rfakeroot
 
-mv $TMPBUILD/*.deb $CURRENTDIR/output
-mv $TMPBUILD/*.changes $CURRENTDIR/output
-mv $TMPBUILD/*.dsc $CURRENTDIR/output
+mv -f $TMPBUILD/*.deb $CURRENTDIR/output
+mv -f $TMPBUILD/*.changes $CURRENTDIR/output
+mv -f $TMPBUILD/*.dsc $CURRENTDIR/output
 

Modified: trunk/vhffs-packages/suphp/build
==============================================================================
--- trunk/vhffs-packages/suphp/build (original)
+++ trunk/vhffs-packages/suphp/build Tue Aug  2 20:34:03 2005
@@ -1,13 +1,17 @@
 #!/bin/sh
 CURRENTDIR=`pwd`
-TMPBUILD=/data/second/temp/
+
+if [ -z "$TMPBUILD" ]; then
+    TMPBUILD="/tmp/build/"
+fi
+
 rm -rf $TMPBUILD
-mkdir $TMPBUILD
+mkdir -p $TMPBUILD
 cd $TMPBUILD
 
 apt-get source suphp
 
-PKG_DIR=`find -type d -name "*suphp*" -maxdepth 1`
+PKG_DIR=`find -name "*suphp*" -maxdepth 1 -type d`
 cd $PKG_DIR
 
 # change debian manager name
@@ -23,6 +27,6 @@
 
 dpkg-buildpackage -uc -us -rfakeroot
 
-mv $TMPBUILD/*.deb $CURRENTDIR/output
-mv $TMPBUILD/*.changes $CURRENTDIR/output
-mv $TMPBUILD/*.dsc $CURRENTDIR/output
+mv -f $TMPBUILD/*.deb $CURRENTDIR/output
+mv -f $TMPBUILD/*.changes $CURRENTDIR/output
+mv -f $TMPBUILD/*.dsc $CURRENTDIR/output

Modified: trunk/vhffs-robots/src/svn_public.pl
==============================================================================
--- trunk/vhffs-robots/src/svn_public.pl (original)
+++ trunk/vhffs-robots/src/svn_public.pl Tue Aug  2 20:34:03 2005
@@ -12,7 +12,15 @@
 {
 	if( $svn->fetch >= 0)
 	{
-		print $svn->get_dir;
+		if( $svn->is_public == 1 )
+		{
+			Vhffs::Functions::chmod_recur( $svn->get_dir , 0664 , 02775 );
+		}
+		else
+		{
+			Vhffs::Functions::chmod_recur( $svn->get_dir , 0660 , 02770 );
+		}
+
 		Vhffs::Robots::Svn::change_conf( $svn );
 		$svn->set_status( Vhffs::Constants::ACTIVATED );
 		

Modified: trunk/vhffs-robots/src/svn_websvn.pl
==============================================================================
--- trunk/vhffs-robots/src/svn_websvn.pl (original)
+++ trunk/vhffs-robots/src/svn_websvn.pl Tue Aug  2 20:34:03 2005
@@ -10,18 +10,20 @@
 my $svnss = Vhffs::Services::Svn::getall( $vhffs , Vhffs::Constants::ACTIVATED );
 my $svn;
 my $svnconfdir = $vhffs->get_config->get_datadir . "/svn/conf/";
-print $svnconfdir;
 mkdir( $svnconfdir ) if( ! -d $svnconfdir );
 
 open( FILE , ">$svnconfdir/websvn.inc" );
 print FILE  "<?php\n";
 foreach $svn ( @{$svnss} )
 {
-	print FILE  "\$config->addRepository(\"";
-	print FILE  $svn->get_reponame . " (".$svn->get_group->get_groupname .")";
-	print FILE  "\",\"";
-	print FILE $svn->get_dir;
-	print FILE  "\");\n";
+	if( $svn->is_public == 1 )
+	{
+		print FILE  "\$config->addRepository(\"";
+		print FILE  $svn->get_reponame . " (".$svn->get_group->get_groupname .")";
+		print FILE  "\",\"";
+		print FILE $svn->get_dir;
+		print FILE  "\");\n";
+	}
 }
 print FILE  "\$config->setSedPath(\"/bin\");\n";
 print FILE  "?>\n";