diff options
Diffstat (limited to 'ports-mgmt/tinderbox/files')
7 files changed, 26 insertions, 94 deletions
diff --git a/ports-mgmt/tinderbox/files/extra-patch-webui__core__TinderboxDS.php b/ports-mgmt/tinderbox/files/extra-patch-webui__core__TinderboxDS.php new file mode 100644 index 000000000000..829a9c7847a5 --- /dev/null +++ b/ports-mgmt/tinderbox/files/extra-patch-webui__core__TinderboxDS.php @@ -0,0 +1,13 @@ +--- ./webui/core/TinderboxDS.php.orig 2008-11-12 17:35:47.000000000 +0200 ++++ ./webui/core/TinderboxDS.php 2008-11-12 17:36:48.000000000 +0200 +@@ -378,6 +378,10 @@ + if ($sortby == "") $sortby = "port_directory"; + if ($sortby == "port_directory") $sortbytable = "p"; + if ($sortby == "port_maintainer") $sortbytable = "p"; ++ if ($sortby == "last_built") { ++ $sortbytable = "bp"; ++ $sortby = "last_built desc"; ++ } + $query = "SELECT p.*, + bp.last_built, + bp.last_status, diff --git a/ports-mgmt/tinderbox/files/extra-patch-webui__module__moduleBuildPorts.php b/ports-mgmt/tinderbox/files/extra-patch-webui__module__moduleBuildPorts.php new file mode 100644 index 000000000000..b852f64427e9 --- /dev/null +++ b/ports-mgmt/tinderbox/files/extra-patch-webui__module__moduleBuildPorts.php @@ -0,0 +1,11 @@ +--- ./webui/module/moduleBuildPorts.php.orig 2008-11-12 17:38:36.000000000 +0200 ++++ ./webui/module/moduleBuildPorts.php 2008-11-12 17:38:01.000000000 +0200 +@@ -168,7 +168,7 @@ + $build_id = false; + } + +- $ports = $this->TinderboxDS->getLatestPorts( $build_id, 20 ); ++ $ports = $this->TinderboxDS->getLatestPorts( $build_id, 30 ); + + if( is_array( $ports ) && count( $ports ) > 0 ) { + $this->template_assign( 'data', $this->modulePorts->get_list_data( $build_name, $ports ) ); diff --git a/ports-mgmt/tinderbox/files/patch-lib__Tinderbox__TinderboxDS.pm b/ports-mgmt/tinderbox/files/patch-lib__Tinderbox__TinderboxDS.pm deleted file mode 100644 index a20f37b4824d..000000000000 --- a/ports-mgmt/tinderbox/files/patch-lib__Tinderbox__TinderboxDS.pm +++ /dev/null @@ -1,33 +0,0 @@ ---- ./lib/Tinderbox/TinderboxDS.pm.orig 2008-08-07 07:27:49.000000000 +0300 -+++ ./lib/Tinderbox/TinderboxDS.pm 2008-09-07 09:37:07.000000000 +0300 -@@ -23,7 +23,7 @@ - # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - # SUCH DAMAGE. - # --# $MCom: portstools/tinderbox/lib/Tinderbox/TinderboxDS.pm,v 1.88 2008/08/07 04:27:49 marcus Exp $ -+# $MCom: portstools/tinderbox/lib/Tinderbox/TinderboxDS.pm,v 1.88.2.2 2008/09/05 21:07:14 marcus Exp $ - # - - package Tinderbox::TinderboxDS; -@@ -42,6 +42,7 @@ - use DBI; - use Carp; - use Digest::MD5 qw(md5_hex); -+use POSIX qw(strftime); - use vars qw( - $DB_DRIVER - $DB_HOST -@@ -362,8 +363,12 @@ - sub reorgBuildPortsQueue { - my $self = shift; - -+ my $enq_time = time - 25200; -+ my $enq_sql = strftime("%Y-%m-%d %H:%M:%S", localtime($enq_time)); -+ - my $rc = $self->_doQuery( -- "DELETE FROM build_ports_queue WHERE enqueue_date<=NOW()-25200 AND status != 'ENQUEUED'" -+ "DELETE FROM build_ports_queue WHERE enqueue_date<=? AND status != 'ENQUEUED'", -+ [$enq_sql] - ); - - return $rc; diff --git a/ports-mgmt/tinderbox/files/patch-lib__tc_command.pl b/ports-mgmt/tinderbox/files/patch-lib__tc_command.pl deleted file mode 100644 index e57dc27820a1..000000000000 --- a/ports-mgmt/tinderbox/files/patch-lib__tc_command.pl +++ /dev/null @@ -1,20 +0,0 @@ ---- ./lib/tc_command.pl.orig 2008-08-15 20:23:07.000000000 +0300 -+++ ./lib/tc_command.pl 2008-09-07 09:37:07.000000000 +0300 -@@ -24,7 +24,7 @@ - # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - # SUCH DAMAGE. - # --# $MCom: portstools/tinderbox/lib/tc_command.pl,v 1.150 2008/08/15 17:23:07 marcus Exp $ -+# $MCom: portstools/tinderbox/lib/tc_command.pl,v 1.150.2.1 2008/09/05 21:52:24 marcus Exp $ - # - - my $pb; -@@ -1668,7 +1668,7 @@ - . "\n"); - } else { - cleanup($ds, 1, -- "There is no BuildPortsQueue configured in the datastore.\n" -+ "There are no more queued ports for this host in the datastore.\n" - ); - } - } diff --git a/ports-mgmt/tinderbox/files/patch-sql__genschema b/ports-mgmt/tinderbox/files/patch-sql__genschema deleted file mode 100644 index 59a008d3086b..000000000000 --- a/ports-mgmt/tinderbox/files/patch-sql__genschema +++ /dev/null @@ -1,19 +0,0 @@ ---- ./sql/genschema.orig 2008-07-25 02:52:33.000000000 +0300 -+++ ./sql/genschema 2008-09-07 09:37:07.000000000 +0300 -@@ -24,7 +24,7 @@ - # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - # SUCH DAMAGE. - # --# $MCom: portstools/tinderbox/sql/genschema,v 1.1 2008/07/24 23:52:33 ade Exp $ -+# $MCom: portstools/tinderbox/sql/genschema,v 1.1.2.1 2008/09/05 11:16:29 beat Exp $ - # - # Create a full-blown schema from a series of files, reducing duplication - # -@@ -48,6 +48,6 @@ - # Kick out the generated schema - # - cat schema.${dbtype}.pre \ -- values.config values.hooks values.pfp values.pfr \ -+ values.config values.hooks values.pfr values.pfp \ - schema.${dbtype}.post - exit 0 diff --git a/ports-mgmt/tinderbox/files/patch-sql__schema.pgsql.pre b/ports-mgmt/tinderbox/files/patch-sql__schema.pgsql.pre deleted file mode 100644 index 5d516eb2b046..000000000000 --- a/ports-mgmt/tinderbox/files/patch-sql__schema.pgsql.pre +++ /dev/null @@ -1,20 +0,0 @@ ---- ./sql/schema.pgsql.pre.orig 2008-08-05 02:18:10.000000000 +0300 -+++ ./sql/schema.pgsql.pre 2008-09-07 09:37:07.000000000 +0300 -@@ -99,7 +99,7 @@ - -- DROP TABLE port_dependencies CASCADE; - CREATE TABLE port_dependencies ( - port_dependency_id SERIAL PRIMARY KEY, -- build_port_id INTEGER REFERENCES build_port(build_port_id) ON UPDATE CASCADE ON DELETE CASCADE, -+ build_port_id INTEGER REFERENCES build_ports(build_port_id) ON UPDATE CASCADE ON DELETE CASCADE, - port_id INTEGER REFERENCES ports(port_id) ON UPDATE CASCADE ON DELETE CASCADE, - dependency_type VARCHAR(16) CHECK (dependency_type IN ('UNKNOWN', 'EXTRACT_DEPENDS', 'PATCH_DEPENDS', 'FETCH_DEPENDS', 'BUILD_DEPENDS', 'LIB_DEPENDS', 'DEPENDS', 'RUN_DEPENDS')) DEFAULT 'UNKNOWN' - ); -@@ -109,7 +109,7 @@ - -- DROP TABLE config CASCADE; - CREATE TABLE config ( - config_option_name VARCHAR(255) NOT NULL PRIMARY KEY, -- config_option_value TEXT, -+ config_option_value TEXT - ); - - -- DROP TABLE build_ports_queue CASCADE; diff --git a/ports-mgmt/tinderbox/files/pkg-message.in b/ports-mgmt/tinderbox/files/pkg-message.in index f1af49cc1714..ef714324b6ea 100644 --- a/ports-mgmt/tinderbox/files/pkg-message.in +++ b/ports-mgmt/tinderbox/files/pkg-message.in @@ -13,7 +13,7 @@ The following walkthrough is the webserver setup: Alias /tb/logs/ "%%PREFIX%%/tinderbox/logs/" Alias /tb/packages/ "%%PREFIX%%/tinderbox/packages/" Alias /tb/errors/ "%%PREFIX%%/tinderbox/errors/" - Alias /tb/ "%%PREFIX%%/tinderbox/scripts/www-exp/" + Alias /tb/ "%%PREFIX%%/tinderbox/scripts/webui/" <Directory "%%PREFIX%%/tinderbox/"> Order allow,deny Allow from all @@ -26,7 +26,7 @@ Turn on "mod_alias" and add the following lines: alias.url = ( "/tb/logs/" => "%%PREFIX%%/tinderbox/logs/", "/tb/packages/" => "%%PREFIX%%/tinderbox/packages/", "/tb/errors/" => "%%PREFIX%%/tinderbox/errors/", - "/tb/" => "%%PREFIX%%/tinderbox/scripts/www-exp/" ) + "/tb/" => "%%PREFIX%%/tinderbox/scripts/webui/" ) dir-listing.activate = "enable" Check your system by going to http://localhost/tb/ |