- added some new patches

- fixed some old ones :)
- modified README
- supplied example mod_vhost_alias.conf for apache

Changed files:
    SourceForge-PLD.patch -> 1.2
    SourceForge-README.PLD -> 1.2
    SourceForge-cache.patch -> 1.1
    SourceForge-config.patch -> 1.1
    SourceForge-mod_vhost_alias.conf -> 1.1
    SourceForge-mysql.patch -> 1.1

diff --git a/SourceForge-PLD.patch b/SourceForge-PLD.patch
index cdb4e41847264b71067c7e39112869d6f9956a49..4071f4d7012a99b4018b8d1487b4916d51b5c2ae 100644 (file)
--- a/SourceForge-PLD.patch
+++ b/SourceForge-PLD.patch
@@ -10,18 +10,6 @@ diff -Naur SF2.0/backend/include.pl SF2.0-p/backend/include.pl
  $config{'lock_file'}          = '/tmp/sf-backend';            # lockfile location
  $config{'log_file'}           = '/home/dummy/backend.log';    # logfile location
  $config{'group_dir_prefix'}   = '/home/groups';               # prefix for group directories
-diff -Naur SF2.0/db/SourceForge.sql SF2.0-p/db/SourceForge.sql
---- SF2.0/db/SourceForge.sql   Thu Sep  7 23:39:37 2000
-+++ SF2.0-p/db/SourceForge.sql Tue Sep 19 20:49:25 2000
-@@ -526,7 +526,7 @@
- 
- CREATE TABLE frs_file (
-   file_id int(11) NOT NULL auto_increment,
--  filename text,
-+  filename char(255) NOT NULL,
-   release_id int(11) DEFAULT '0' NOT NULL,
-   type_id int(11) DEFAULT '0' NOT NULL,
-   processor_id int(11) DEFAULT '0' NOT NULL,
 diff -Naur SF2.0/docs/Install_Guide.html SF2.0-p/docs/Install_Guide.html
 --- SF2.0/docs/Install_Guide.html      Thu Sep  7 23:37:52 2000
 +++ SF2.0-p/docs/Install_Guide.html    Tue Sep 19 20:55:26 2000

diff --git a/SourceForge-README.PLD b/SourceForge-README.PLD
index 5dc94105c1351760ca4f2706d8e87d0290a4bead..ca090d2068710fda1065434b047c79498043aecd 100644 (file)
--- a/SourceForge-README.PLD
+++ b/SourceForge-README.PLD
@@ -15,7 +15,8 @@ $ mysql -p -u sourceforge sourceforge < /home/httpd/SourceForge/db/SourceForge.s
 4. Set up DocumentRoot (for main server, or virtual host), in httpd.conf
 (or mod_vhost_alias.conf). DocumentRoot should point to
 /home/httpd/SourceForge/www. Remember about setting both unsecure and secure
-connections.
+connections. You can find an example sourceforge.conf file in
+documentation directory.
 
 5. Edit php.ini and add /home/httpd/SourceForge/www/include to
 include_path variable

diff --git a/SourceForge-cache.patch b/SourceForge-cache.patch
new file mode 100644 (file)
index 0000000..b836c1e
--- /dev/null
+++ b/SourceForge-cache.patch
@@ -0,0 +1,13 @@
+diff -Naur SF2.0/www/include/cache.php SF2.0-p/www/include/cache.php
+--- SF2.0/www/include/cache.php        Thu Sep  7 23:37:53 2000
++++ SF2.0-p/www/include/cache.php      Mon Sep 25 20:45:34 2000
+@@ -59,7 +59,8 @@
+ }
+ 
+ function cache_get_new_data($function) {
+-      $furl=fopen("http://localhost/write_cache.php?sys_themeid=".$GLOBALS['sys_themeid']."&function=".urlencode($function),'r');
++      GLOBAL $sys_default_domain;
++      $furl=fopen("http://".$sys_default_domain."/write_cache.php?sys_themeid=".$GLOBALS['sys_themeid']."&function=".urlencode($function),'r');
+       return stripslashes(fread($furl,200000));
+ }
+ ?>

diff --git a/SourceForge-config.patch b/SourceForge-config.patch
new file mode 100644 (file)
index 0000000..7461098
--- /dev/null
+++ b/SourceForge-config.patch
@@ -0,0 +1,39 @@
+diff -Naur SF2.0/etc/local.inc SF2.0-p/etc/local.inc
+--- SF2.0/etc/local.inc        Thu Sep  7 23:37:53 2000
++++ SF2.0-p/etc/local.inc      Mon Sep 25 20:53:22 2000
+@@ -62,16 +62,16 @@
+ 
+ // Part II - Databases, html/php/other paths
+ $sys_dbhost="localhost";
+-$sys_dbname="alexandria";
+-$sys_dbuser="www";
+-$sys_dbpasswd="";
++$sys_dbname="sourceforge";
++$sys_dbuser="sourceforge";
++$sys_dbpasswd="mypass";
+ $sys_server="mysql";
+  
+ // Where files are placed when uploaded
+-$FTPINCOMING_DIR = "/nfs/remission/u7/ftp/incoming";
++$FTPINCOMING_DIR = "/home/ftp/pub/Incoming";
+ 
+ // Where the released files are located
+-$FTPFILES_DIR = "/nfs/garbage/sourceforge";
++$FTPFILES_DIR = "/home/ftp/pub";
+  
+ // Where the SourceForge files are placed
+ // *** IMPORTANT: sys_urlroot *MUST* be an ABSOLUTE FILEYSTEM PATH NAME
+@@ -79,11 +79,11 @@
+ //             installation.  If you use ANY form of relative path
+ //             you will break the html_image function in include/html.php
+ //
+-$sys_urlroot="/alexandria/www/";
++$sys_urlroot="/home/httpd/SourceForge/www";
+  
+ // Cache location -- this is needed by include/cache.php
+ // This directory must be world reachable, but writable only by the web-server
+-$sf_cache_dir = "/sfcache";
++$sf_cache_dir = "/home/httpd/SourceForge/cache";
+ // Name of the system as a whole (needed by various utils and titles)
+ $sys_name="prodigy";
+  

diff --git a/SourceForge-mod_vhost_alias.conf b/SourceForge-mod_vhost_alias.conf
new file mode 100644 (file)
index 0000000..6cb12cf
--- /dev/null
+++ b/SourceForge-mod_vhost_alias.conf
@@ -0,0 +1,27 @@
+# VirtualHost: Allows the daemon to respond to requests for more than one
+# server address, if your server machine is configured to accept IP packets
+# for multiple addresses. This can be accomplished with the ifconfig 
+# alias flag, or through kernel patches like VIF.
+
+NameVirtualHost 192.168.0.1:80
+NameVirtualHost [::192.168.0.1]:80
+
+<VirtualHost _default_:80>
+ServerName www.company.com
+ServerAdmin webmaster@company.com
+DocumentRoot /home/httpd/html
+</VirtualHost>
+
+<VirtualHost 192.168.0.1:80 [::192.168.0.1]:80>
+ServerName www.company.com
+ServerAdmin webmaster@company.com
+DocumentRoot /home/httpd/html
+</VirtualHost>
+
+<VirtualHost 192.168.0.1:80 [::192.168.0.1]:80>
+ServerName sourceforge.company.com
+ServerAdmin webmaster@sourceforge.company.com
+DocumentRoot /home/httpd/SourceForge/www
+ErrorLog /var/log/httpd/sf.err
+TransferLog /var/log/httpd/sf.log
+</VirtualHost>

diff --git a/SourceForge-mysql.patch b/SourceForge-mysql.patch
new file mode 100644 (file)
index 0000000..2e59bb4
--- /dev/null
+++ b/SourceForge-mysql.patch
@@ -0,0 +1,24 @@
+diff -Naur SF2.0/db/SourceForge.sql SF2.0-p/db/SourceForge.sql
+--- SF2.0/db/SourceForge.sql   Thu Sep  7 23:39:37 2000
++++ SF2.0-p/db/SourceForge.sql Tue Sep 19 20:49:25 2000
+@@ -526,7 +526,7 @@
+ 
+ CREATE TABLE frs_file (
+   file_id int(11) NOT NULL auto_increment,
+-  filename text,
++  filename char(255) NOT NULL,
+   release_id int(11) DEFAULT '0' NOT NULL,
+   type_id int(11) DEFAULT '0' NOT NULL,
+   processor_id int(11) DEFAULT '0' NOT NULL,
+diff -Naur SF2.0/www/include/database.php SF2.0-p/www/include/database.php
+--- SF2.0/www/include/database.php     Thu Sep  7 23:37:53 2000
++++ SF2.0-p/www/include/database.php   Mon Sep 25 20:47:57 2000
+@@ -21,6 +21,8 @@
+ //    if ($GLOBALS[IS_DEBUG]) $GLOBALS[G_DEBUGQUERY] .= $qstring . "<BR>\n";
+       global $sys_dbname;
+       $GLOBALS['db_qhandle'] = @mysql($sys_dbname,$qstring);
++      if (!$GLOBALS['db_qhandle'] && !mysql_errno())
++              return true;
+       return $GLOBALS['db_qhandle'];
+ }
+