diff options
author | itetcu <itetcu@FreeBSD.org> | 2009-05-11 14:19:40 +0800 |
---|---|---|
committer | itetcu <itetcu@FreeBSD.org> | 2009-05-11 14:19:40 +0800 |
commit | 87a494860e8defd945f27c1091a389c4fc3cd256 (patch) | |
tree | fc540499de072c620b4f14bf730ba052ff308267 /ports-mgmt | |
parent | 9f2dcca629202932754209445206a47a897c8283 (diff) | |
download | freebsd-ports-gnome-87a494860e8defd945f27c1091a389c4fc3cd256.tar.gz freebsd-ports-gnome-87a494860e8defd945f27c1091a389c4fc3cd256.tar.zst freebsd-ports-gnome-87a494860e8defd945f27c1091a389c4fc3cd256.zip |
Bring more fixes, optimizations and changes from CVS (PORTREVISION bumped):
- Add a disclaimer to the addJail usage line so that users know to use
createJail instead.
- Trim leading and trailing spaces from the descriptions for Jails,
Builds, and PortsTrees.
- Add /proc to the list of ignored paths. This fixes a race condition
which can occur when multiple builds are run in parallel.
- Run the postPortsTreeUpdate and postJailUpdate Hooks while the file
systems are still mounted. This has the side effect of running the
hooks when an update fails.
- Die if the postPortsTreeUpdate Hook fails.
- Die if a port could not be added to the BuildPortsQueue.
Webui:
- Save some screen space by reducing space between top menu and content.
- Add link to RSS feed to the latest_buildports view.
- Generate RSS feeds per maintainer and add drop down menu for feeds to
homepage.
- Make headers of columns on buildport pages clickable to sort the table.
- Rename All really Build Failures to All Failures.
- Add link to All Build Failures and All Failures on latest_buildports
page.
- To limit the number of shown ports per page a new variable
list_limit_nr could be set in inc_tinderbox.php. This limitation is
disabled by default.
Diffstat (limited to 'ports-mgmt')
24 files changed, 1140 insertions, 44 deletions
diff --git a/ports-mgmt/tinderbox-devel/Makefile b/ports-mgmt/tinderbox-devel/Makefile index 1396de2b6dea..b93b270c1d25 100644 --- a/ports-mgmt/tinderbox-devel/Makefile +++ b/ports-mgmt/tinderbox-devel/Makefile @@ -6,7 +6,7 @@ PORTNAME= tinderbox PORTVERSION= 3.2 -PORTREVISION= 3 # 2009-04-11 +PORTREVISION= 4 # 2009-05-10 18:02:34 UTC CATEGORIES= ports-mgmt MASTER_SITES= http://tinderbox.marcuscom.com/ \ http://T32.TecNik93.com/FreeBSD/ports/${PORTNAME}/sources/ diff --git a/ports-mgmt/tinderbox-devel/files/patch-lib__buildscript b/ports-mgmt/tinderbox-devel/files/patch-lib__buildscript new file mode 100644 index 000000000000..cf031bcba87f --- /dev/null +++ b/ports-mgmt/tinderbox-devel/files/patch-lib__buildscript @@ -0,0 +1,28 @@ +Index: portstools/tinderbox/lib/buildscript +diff -u portstools/tinderbox/lib/buildscript:1.51.2.2 portstools/tinderbox/lib/buildscript:1.51.2.3 +--- portstools/tinderbox/lib/buildscript:1.51.2.2 Fri Dec 26 19:52:59 2008 ++++ portstools/tinderbox/lib/buildscript Sat May 9 14:42:30 2009 +@@ -156,6 +156,7 @@ + ./etc/rc.conf + ./work/* + ./compat/linux/proc ++./proc + ./usr/share/man/cat*/* + ./${L}/etc/apache + ./${L}/etc/apache2 +@@ -221,6 +222,7 @@ + ./tmp/* + ./work/* + ./compat/linux/proc ++./proc + ./root/* + ./var/mail/* + ./var/tmp/* +@@ -293,6 +295,7 @@ + ./etc/rc.conf + ./work/* + ./compat/linux/proc ++./proc + EOF + mtree -X /tmp/mtree.exclude -xcn -k uid,gid,mode -p / > /tmp/mtree + diff --git a/ports-mgmt/tinderbox-devel/files/patch-lib__tc_command.pl b/ports-mgmt/tinderbox-devel/files/patch-lib__tc_command.pl index d94a58dc7b01..a1e4c535c91f 100644 --- a/ports-mgmt/tinderbox-devel/files/patch-lib__tc_command.pl +++ b/ports-mgmt/tinderbox-devel/files/patch-lib__tc_command.pl @@ -1,13 +1,13 @@ Index: portstools/tinderbox/lib/tc_command.pl -diff -u portstools/tinderbox/lib/tc_command.pl:1.150.2.12 portstools/tinderbox/lib/tc_command.pl:1.150.2.14 +diff -u portstools/tinderbox/lib/tc_command.pl:1.150.2.12 portstools/tinderbox/lib/tc_command.pl:1.150.2.16 --- portstools/tinderbox/lib/tc_command.pl:1.150.2.12 Wed Feb 11 03:50:34 2009 -+++ portstools/tinderbox/lib/tc_command.pl Sat Mar 28 13:28:23 2009 ++++ portstools/tinderbox/lib/tc_command.pl Sat Apr 25 15:42:13 2009 @@ -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.2.12 2009/02/11 08:50:34 beat Exp $ -+# $MCom: portstools/tinderbox/lib/tc_command.pl,v 1.150.2.14 2009/03/28 17:28:23 marcus Exp $ ++# $MCom: portstools/tinderbox/lib/tc_command.pl,v 1.150.2.16 2009/04/25 19:42:13 marcus Exp $ # my $pb; @@ -19,7 +19,95 @@ diff -u portstools/tinderbox/lib/tc_command.pl:1.150.2.12 portstools/tinderbox/l use vars qw( %COMMANDS $TINDERBOX_HOST -@@ -3090,7 +3091,7 @@ +@@ -178,7 +179,8 @@ + }, + "addJail" => { + func => \&addJail, +- help => "Add a jail to the datastore", ++ help => ++ "Add a jail to the datastore (do NOT call this directly; use createJail instead)", + usage => + "-j <jail name> -u CSUP|CVSUP|USER|NONE -t <jail tag> [-d <jail description>] [-m <src mount source>] [-a <arch>]", + optstr => 'm:j:t:u:d:a:', +@@ -678,6 +680,15 @@ + cleanup($ds, 1, undef); + } + ++sub trimstr { ++ my $str = shift; ++ ++ $str =~ s/^\s+//; ++ $str =~ s/\s+$//; ++ ++ return $str; ++} ++ + #--------------------------------------------------------------------------- + # Main dispatching function + #--------------------------------------------------------------------------- +@@ -1302,8 +1313,11 @@ + $build->setName($name); + $build->setJailId($jCls->getId()); + $build->setPortsTreeId($pCls->getId()); +- $build->setDescription($opts->{'d'}) if ($opts->{'d'}); ++ if ($opts->{'d'}) { ++ my $descr = trimstr($opts->{'d'}); + ++ $build->setDescription($descr); ++ } + my $rc = $ds->addBuild($build); + + if (!$rc) { +@@ -1341,8 +1355,12 @@ + $jail->setArch($arch); + $jail->setTag($tag); + $jail->setUpdateCmd($ucmd); +- $jail->setDescription($opts->{'d'}) if ($opts->{'d'}); +- $jail->setSrcMount($opts->{'m'}) if ($opts->{'m'}); ++ if ($opts->{'d'}) { ++ my $descr = trimstr($opts->{'d'}); ++ ++ $jail->setDescription($descr); ++ } ++ $jail->setSrcMount($opts->{'m'}) if ($opts->{'m'}); + + my $rc = $ds->addJail($jail); + +@@ -1372,9 +1390,13 @@ + + $portstree->setName($name); + $portstree->setUpdateCmd($ucmd); +- $portstree->setDescription($opts->{'d'}) if ($opts->{'d'}); +- $portstree->setPortsMount($opts->{'m'}) if ($opts->{'m'}); +- $portstree->setCVSwebURL($opts->{'w'}) if ($opts->{'w'}); ++ if ($opts->{'d'}) { ++ my $descr = trimstr($opts->{'d'}); ++ ++ $portstree->setDescription($descr); ++ } ++ $portstree->setPortsMount($opts->{'m'}) if ($opts->{'m'}); ++ $portstree->setCVSwebURL($opts->{'w'}) if ($opts->{'w'}); + $portstree->setLastBuilt($ds->getTime()); + + my $rc = $ds->addPortsTree($portstree); +@@ -1487,7 +1509,15 @@ + } + } + +- $ds->addBuildPortsQueueEntry($build, $opts->{'d'}, $priority, $user_id); ++ my $rc = $ds->addBuildPortsQueueEntry($build, $opts->{'d'}, $priority, $user_id); ++ if (!$rc) { ++ cleanup($ds, 1, ++ "Failed to add port " ++ . $opts->{'d'} ++ . " to the datastore: " ++ . $ds->getError() ++ . ".\n"); ++ } + } + + sub addPortFailPattern { +@@ -3090,7 +3120,7 @@ } $rc = @@ -28,7 +116,7 @@ diff -u portstools/tinderbox/lib/tc_command.pl:1.150.2.12 portstools/tinderbox/l $ds->getPortLastBuiltStatus($port, $src)); if (!$rc) { warn -@@ -3217,6 +3218,10 @@ +@@ -3217,6 +3247,10 @@ my $portdir = $ENV{'PORTSDIR'} . "/" . $port; return if (!-d $portdir); diff --git a/ports-mgmt/tinderbox-devel/files/patch-lib__tc_command.sh b/ports-mgmt/tinderbox-devel/files/patch-lib__tc_command.sh index 12fe22163c99..ee126d74bb0d 100644 --- a/ports-mgmt/tinderbox-devel/files/patch-lib__tc_command.sh +++ b/ports-mgmt/tinderbox-devel/files/patch-lib__tc_command.sh @@ -1,13 +1,13 @@ Index: portstools/tinderbox/lib/tc_command.sh -diff -u portstools/tinderbox/lib/tc_command.sh:1.101.2.14 portstools/tinderbox/lib/tc_command.sh:1.101.2.16 +diff -u portstools/tinderbox/lib/tc_command.sh:1.101.2.14 portstools/tinderbox/lib/tc_command.sh:1.101.2.18 --- portstools/tinderbox/lib/tc_command.sh:1.101.2.14 Sun Feb 15 12:22:28 2009 -+++ portstools/tinderbox/lib/tc_command.sh Sat Mar 28 13:24:33 2009 ++++ portstools/tinderbox/lib/tc_command.sh Sun May 10 14:02:34 2009 @@ -24,10 +24,10 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $MCom: portstools/tinderbox/lib/tc_command.sh,v 1.101.2.14 2009/02/15 17:22:28 marcus Exp $ -+# $MCom: portstools/tinderbox/lib/tc_command.sh,v 1.101.2.16 2009/03/28 17:24:33 marcus Exp $ ++# $MCom: portstools/tinderbox/lib/tc_command.sh,v 1.101.2.18 2009/05/10 18:02:34 marcus Exp $ # -export _defaultUpdateHost="cvsup12.FreeBSD.org" @@ -15,7 +15,38 @@ diff -u portstools/tinderbox/lib/tc_command.sh:1.101.2.14 portstools/tinderbox/l export _defaultUpdateType="CSUP" #--------------------------------------------------------------------------- -@@ -247,8 +247,9 @@ +@@ -160,16 +160,11 @@ + + if [ ! -x ${dir}/update.sh ]; then + echo "updateTree: ${what} ${name}: missing update script!" +- exit 1 ++ return 1 + fi + + echo "${name}: updating ${what} with ${updateCmd}" + +- if ! requestMount -t ${what} ${flag} ${name}; then +- echo "updateTree: ${what} ${name}: mount failed" +- exit 1 +- fi +- + if [ "${updateCmd}" = "USER" ]; then + eval ${dir}/update.sh ${name} > ${dir}/update.log 2>&1 + else +@@ -178,11 +173,8 @@ + if [ $? -ne 0 ]; then + echo "updateTree: ${what} ${name}: update failed" + echo " see ${dir}/update.log for more details" +- cleanupMounts -t ${what} ${flag} ${name} +- exit 1 ++ return 1 + fi +- +- cleanupMounts -t ${what} ${flag} ${name} + } + + #--------------------------------------------------------------------------- +@@ -247,8 +239,9 @@ do_load=0 db_driver=$(getDbDriver) dbinfo=$(getDbInfo ${db_driver}) @@ -26,3 +57,50 @@ diff -u portstools/tinderbox/lib/tc_command.sh:1.101.2.14 portstools/tinderbox/l db_admin_host_name=${dbinfo%:*} db_admin_host=${db_admin_host_name%:*} db_name=${db_admin_host_name##*:} +@@ -575,9 +568,20 @@ + echo "updateJail: hook preJailUpdate failed. Terminating." + return 1 + fi ++ if ! requestMount -t jail -j ${jailName}; then ++ echo "updateJail: ${jailName}: mount failed" ++ exit 1 ++ fi + updateTree jail ${jailName} -j $(tinderLoc jail ${jailName}) + rc=$? + execute_hook "postJailUpdate" "JAIL=${jailName} RC=${rc} PB=${pb}" ++ ++ cleanupMounts -t jail -j ${jailName} ++ ++ if [ ${rc} -ne 0 ]; then ++ exit ${rc} ++ fi ++ + return 0 + } + +@@ -925,10 +929,25 @@ + echo "${portsTreeName}: hook prePortsTreeUpdate failed. Terminating." + return 1 + fi ++ if ! requestMount -t portstree -p ${portsTreeName}; then ++ echo "updatePortsTree: ${portsTreeName}: mount failed" ++ exit 1 ++ fi + updateTree portstree ${portsTreeName} \ + -p $(tinderLoc portstree ${portsTreeName}) + rc=$? + execute_hook "postPortsTreeUpdate" "PORTSTREE=${portsTreeName} \"UPDATE_CMD=${updateCmd}\" PB=${pb} RC=${rc}" ++ if [ $? -ne 0 ]; then ++ echo "updatePortsTree: ${portsTreeName}: hook postPortsTreeUpdate failed. Terminating." ++ cleanupMounts -t portstree -p ${portsTreeName} ++ return 1 ++ fi ++ ++ cleanupMounts -t portstree -p ${portsTreeName} ++ ++ if [ ${rc} -ne 0 ]; then ++ exit ${rc} ++ fi + + # Update the last-built time + ${tc} updatePortsTreeLastBuilt -p ${portsTreeName} diff --git a/ports-mgmt/tinderbox-devel/files/patch-sql__values.pfp b/ports-mgmt/tinderbox-devel/files/patch-sql__values.pfp index 97d6f74f0f9d..99fd683cff37 100644 --- a/ports-mgmt/tinderbox-devel/files/patch-sql__values.pfp +++ b/ports-mgmt/tinderbox-devel/files/patch-sql__values.pfp @@ -1,30 +1,58 @@ Index: portstools/tinderbox/sql/values.pfp -diff -u /dev/null portstools/tinderbox/sql/values.pfp:1.3.2.1 ---- /dev/null Sun Apr 12 03:14:53 2009 +diff -u portstools/tinderbox/sql/values.pfp:1.3 portstools/tinderbox/sql/values.pfp:1.3.2.1 +--- portstools/tinderbox/sql/values.pfp:1.3 Fri Aug 15 13:18:23 2008 +++ portstools/tinderbox/sql/values.pfp Sat Mar 28 15:10:24 2009 -@@ -0,0 +1,71 @@ -+/* -+ Port failure patterns. Port error logs are searched for matches to these -+ patterns in an attempt to put a simple reason behind why a port failed -+ to build correctly. Order is important here. The order number field -+ is the first field, and there should be a difference of 100 between -+ patterns. Changes here require a micro version bump to __DSVERSION__. -+*/ -+ -+INSERT INTO port_fail_patterns VALUES (0, '.*', '__parent__', 0); -+INSERT INTO port_fail_patterns VALUES (100, '(Error: mtree file ./etc/mtree/BSD.local.dist. is missing|error in pkg_delete|filesystem was touched prior to .make install|list of extra files and directories|list of files present before this port was installed|list of filesystem changes from before and after)', 'mtree', 0); -+INSERT INTO port_fail_patterns VALUES (200, 'Configuration .* not supported', 'arch', 0); -+INSERT INTO port_fail_patterns VALUES (300, '(configure: error:|Script.*configure.*failed unexpectedly|script.*failed: here are the contents of)', '__parent__', 0); -+INSERT INTO port_fail_patterns VALUES (400, 'configure: error: cpu .* not supported', 'arch', 300); -+INSERT INTO port_fail_patterns VALUES (500, 'configure: error: [Pp]erl (5.* required|version too old)', 'perl', 300); -+INSERT INTO port_fail_patterns VALUES (600, '.*', 'configure_error', 300); -+INSERT INTO port_fail_patterns VALUES (700, 'Couldn.t fetch it - please try', 'fetch', 0); -+INSERT INTO port_fail_patterns VALUES (800, 'Error: shared library ".*" does not exist', 'LIB_DEPENDS', 0); -+INSERT INTO port_fail_patterns VALUES (900, '\\.(c|cc|cxx|cpp|h|y)[1-9:]+ .+\\.h: No such file', '__parent__', 0); -+INSERT INTO port_fail_patterns VALUES (1000, '(X11/.*|Xosdefs)\\.h: No such file', '__parent__', 900); -+INSERT INTO port_fail_patterns VALUES (1100, 'XFree86-.*\\.tgz', 'missing_header', 1000); -+INSERT INTO port_fail_patterns VALUES (1200, '.*', 'USE_XLIB', 1000); -+INSERT INTO port_fail_patterns VALUES (1300, '.*', 'missing_header', 900); +@@ -20,51 +20,52 @@ + INSERT INTO port_fail_patterns VALUES (1100, 'XFree86-.*\\.tgz', 'missing_header', 1000); + INSERT INTO port_fail_patterns VALUES (1200, '.*', 'USE_XLIB', 1000); + INSERT INTO port_fail_patterns VALUES (1300, '.*', 'missing_header', 900); +-INSERT INTO port_fail_patterns VALUES (1400, '(parse error|too (many|few) arguments to|argument.*doesn.*prototype|incompatible type for argument|conflicting types for|undeclared \\(first use (in |)this function\\)|incorrect number of parameters|has incomplete type and cannot be initialized|error: storage size.* isn.t known)', 'compiler_error', 0); +-INSERT INTO port_fail_patterns VALUES (1500, '(ANSI C.. forbids|is a contravariance violation|changed for new ANSI .for. scoping|[0-9]: passing .* changes signedness|lacks a cast|redeclared as different kind of symbol|invalid type .* for default argument to|wrong type argument to unary exclamation mark|duplicate explicit instantiation of|incompatible types in assignment|assuming . on overloaded member function|call of overloaded .* is ambiguous|declaration of C function .* conflicts with|initialization of non-const reference type|using typedef-name .* after|[0-9]: size of array .* is too large|fixed or forbidden register .* for class|assignment of read-only variable|error: label at end of compound statement|error:.*(has no|is not a) member|error:.*is (private|protected)|error: uninitialized member|error: unrecognized command line option)', 'new_compiler_error', 0); +-INSERT INTO port_fail_patterns VALUES (1600, '(syntax error before|friend declaration|no matching function for call to|.main. must return .int.|invalid conversion from|cannot be used as a macro name as it is an operator in C\\+\\+|is not a member of type|after previous specification in|no class template named|because worst conversion for the former|better than worst conversion|no match for.*operator|no match for call to|undeclared in namespace|is used as a type. but is not|error: array bound forbidden|error: class definition|error: expected constructor|error: there are no arguments|error:.*cast.*loses precision|ISO C\\+\\+ does not support)', 'bad_C++_code', 0); +-INSERT INTO port_fail_patterns VALUES (1700, 'error: (array type has incomplete element type|extra qualification .* on member|invalid cast from type .* to type|invalid lvalue in (assignment|decrement|increment|unary)|invalid storage class for function|static declaration of.*follows non-static declaration|two or more data types in declaration specifiers|.* was not declared in this scope)', 'gcc4_error', 0); +-INSERT INTO port_fail_patterns VALUES (1800, '(/usr/libexec/elf/ld: cannot find|undefined reference to|cannot open -l.*: No such file)', 'linker_error', 0); +-INSERT INTO port_fail_patterns VALUES (1900, 'install: .*: No such file', 'install_error', 0); +-INSERT INTO port_fail_patterns VALUES (2000, '(conflicts with installed package|is already installed - perhaps an older version|You may wish to ..make deinstall.. and install this port again)', 'depend_object', 0); +-INSERT INTO port_fail_patterns VALUES (2100, 'core dumped', 'coredump', 0); +-INSERT INTO port_fail_patterns VALUES (2200, '(.s: Assembler messages:|Cannot (determine .* target|find the byte order) for this architecture|^cc1: bad value.*for -mcpu.*switch|could not read symbols: File in wrong format|[Ee]rror: [Uu]nknown opcode|error.*Unsupported architecture|ENDIAN must be defined 0 or 1|failed to merge target-specific data|(file not recognized|failed to set dynamic section sizes): File format not recognized|impossible register constraint|inconsistent operand constraints in an .asm|Invalid configuration.*unknown.*machine.*unknown not recognized|invalid lvalue in asm statement|is only for.*. and you are running|not a valid 64 bit base/index expression|relocation R_X86_64_32.*can not be used when making a shared object|relocation truncated to fit: |shminit failed: Function not implemented|The target cpu. .*. is not currently supported.|This architecture seems to be neither big endian nor little endian|unknown register name|Unable to correct byte order|Unsupported platform. sorry|won.t run on this architecture)', 'arch', 0); +-INSERT INTO port_fail_patterns VALUES (2300, 'autoconf([0-9\\-\\.]*): (not found|No such file or directory)', 'autoconf', 0); +-INSERT INTO port_fail_patterns VALUES (2400, 'autoheader: not found', 'autoheader', 0); +-INSERT INTO port_fail_patterns VALUES (2500, 'automake(.*): not found', 'automake', 0); +-INSERT INTO port_fail_patterns VALUES (2600, 'Checksum mismatch', 'checksum', 0); +-INSERT INTO port_fail_patterns VALUES (2700, 'chown:.*[Ii]nvalid argument', 'chown', 0); +-INSERT INTO port_fail_patterns VALUES (2800, 'Shared object \\"libc.so.6\\" not found, required by', 'compat6x', 0); +-INSERT INTO port_fail_patterns VALUES (2900, 'error in dependency .*, exiting', 'depend_package', 0); +-INSERT INTO port_fail_patterns VALUES (3000, 'pkg_(add|create):.*(can.t find enough temporary space|projected size of .* exceeds available free space)', 'disk_full', 0); +-INSERT INTO port_fail_patterns VALUES (3100, '((Can.t|unable to) open display|Cannot open /dev/tty for read|RuntimeError: cannot open display|You must run this program under the X-Window System)', 'DISPLAY', 0); +-INSERT INTO port_fail_patterns VALUES (3200, '(No checksum recorded for|(Maybe|Either) .* is out of date. or)', 'distinfo_update', 0); +-INSERT INTO port_fail_patterns VALUES (3300, 'Member name contains .\\.\\./', 'fetch', 0); +-INSERT INTO port_fail_patterns VALUES (3400, '(pnohang: killing make checksum|fetch: transfer timed out)', 'fetch_timeout', 0); +-INSERT INTO port_fail_patterns VALUES (3500, '(f77: not found|f77:No such file or directory|Unable to find a fortran compiler)', 'f77', 0); +-INSERT INTO port_fail_patterns VALUES (3600, 'See <URL:http://gcc.gnu.org/bugs.html> for instructions.', 'gcc_bug', 0); +-INSERT INTO port_fail_patterns VALUES (3700, '(Run-time system build failed for some reason|tar: Error opening archive: Failed to open.*No such file or directory)', 'install_error', 0); +-INSERT INTO port_fail_patterns VALUES (3800, '(cc: .*libintl.*: No such file or directory|cc: ndbm\\.so: No such file or directory|error: The X11 shared library could not be loaded|libtool: link: cannot find the library|relocation against dynamic symbol|Shared object.*not found. required by)', 'linker_error', 0); +-INSERT INTO port_fail_patterns VALUES (3900, 'Could not create Makefile', 'makefile', 0); +-INSERT INTO port_fail_patterns VALUES (4000, 'make.*(cannot open [Mm]akefile|don.t know how to make|fatal errors encountered|No rule to make target|built-in)(?!\\s*regression-test.continuing)', 'makefile', 0); +-INSERT INTO port_fail_patterns VALUES (4100, '/usr/.*/man/.*: No such file or directory', 'manpage', 0); +-INSERT INTO port_fail_patterns VALUES (4200, 'out of .* hunks .*--saving rejects to', 'patch', 0); +-INSERT INTO port_fail_patterns VALUES (4300, '(/usr/local/bin/(perl|perl5.6.1):.*(not found|No such file or directory)|cp:.*site_perl: No such file or directory|perl(.*): Perl is not installed. try .pkg_add -r perl|Perl .* required--this is only version)', 'perl', 0); +-INSERT INTO port_fail_patterns VALUES (4400, 'BEGIN failed--compilation aborted at ..Makefile.PL line', 'perl', 0); +-INSERT INTO port_fail_patterns VALUES (4500, '(Abort trap|Bus error|Signal 1[01])', 'process_failed', 0); +-INSERT INTO port_fail_patterns VALUES (4600, 'python: not found', 'python', 0); +-INSERT INTO port_fail_patterns VALUES (4700, '(USER PID PPID PGID.*JOBC STAT TT TIME COMMAND|pnohang: killing make package)', 'runaway_process', 0); +-INSERT INTO port_fail_patterns VALUES (4800, 'Segmentation fault', 'segfault', 0); +-INSERT INTO port_fail_patterns VALUES (4900, 'initializer element is not constant', 'stdio', 0); +-INSERT INTO port_fail_patterns VALUES (5000, 'structure has no member named', 'struct_changes', 0); +-INSERT INTO port_fail_patterns VALUES (5100, 'shminit failed: Permission denied', 'sysvipc', 0); +-INSERT INTO port_fail_patterns VALUES (5200, '(/usr/bin/ld: cannot find -l(pthread|XThrStub)|cannot find -lc_r|checking for.*lc_r\\.\\.\\. no|Error: pthreads are required to build this package|Please install/update your POSIX threads (pthreads) library|requires.*thread support|: The -pthread option is deprecated)', 'threads', 0); +-INSERT INTO port_fail_patterns VALUES (5300, '<varargs.h> is obsolete with this version of GCC', 'varargs', 0); +-INSERT INTO port_fail_patterns VALUES (5400, '[Rr]ead-[Oo]nly [Ff]ile [Ss]ystem', 'WRKDIR', 0); +-INSERT INTO port_fail_patterns VALUES (5500, 'cc1.*warnings being treated as errors', 'compiler_error', 0); +-INSERT INTO port_fail_patterns VALUES (5600, 'pkg_create: make_dist: tar command failed with code', 'PLIST', 0); +-INSERT INTO port_fail_patterns VALUES (5700, 'Cannot stat: ', 'configure_error', 0); +-INSERT INTO port_fail_patterns VALUES (5800, '/usr/bin/ld: cannot find -l', 'linker_error', 0); +-INSERT INTO port_fail_patterns VALUES (5900, 'cd: can.t cd to', 'NFS', 0); +-INSERT INTO port_fail_patterns VALUES (6000, 'tar: Error exit delayed from previous errors', 'install_error', 0); +INSERT INTO port_fail_patterns VALUES (1400, '(nested function.*declared but never defined|warning: nested extern declaration)', 'nested_declaration', 0); +INSERT INTO port_fail_patterns VALUES (1500, '(parse error|too (many|few) arguments to|argument.*doesn.*prototype|incompatible type for argument|conflicting types for|undeclared \\(first use (in |)this function\\)|incorrect number of parameters|has incomplete type and cannot be initialized|error: storage size.* isn.t known)', 'compiler_error', 0); +INSERT INTO port_fail_patterns VALUES (1600, '(ANSI C.. forbids|is a contravariance violation|changed for new ANSI .for. scoping|[0-9]: passing .* changes signedness|lacks a cast|redeclared as different kind of symbol|invalid type .* for default argument to|wrong type argument to unary exclamation mark|duplicate explicit instantiation of|incompatible types in assignment|assuming . on overloaded member function|call of overloaded .* is ambiguous|declaration of C function .* conflicts with|initialization of non-const reference type|using typedef-name .* after|[0-9]: size of array .* is too large|fixed or forbidden register .* for class|assignment of read-only variable|error: label at end of compound statement|error:.*(has no|is not a) member|error:.*is (private|protected)|error: uninitialized member|error: unrecognized command line option)', 'new_compiler_error', 0); @@ -73,4 +101,4 @@ diff -u /dev/null portstools/tinderbox/sql/values.pfp:1.3.2.1 +INSERT INTO port_fail_patterns VALUES (5900, '/usr/bin/ld: cannot find -l', 'linker_error', 0); +INSERT INTO port_fail_patterns VALUES (6000, 'cd: can.t cd to', 'NFS', 0); +INSERT INTO port_fail_patterns VALUES (6100, 'tar: Error exit delayed from previous errors', 'install_error', 0); -+INSERT INTO port_fail_patterns VALUES (2147483647, '.*', '???', 0); + INSERT INTO port_fail_patterns VALUES (2147483647, '.*', '???', 0); diff --git a/ports-mgmt/tinderbox-devel/files/patch-webui__core__TinderboxDS.php b/ports-mgmt/tinderbox-devel/files/patch-webui__core__TinderboxDS.php index df99fabba214..3b21111759ae 100644 --- a/ports-mgmt/tinderbox-devel/files/patch-webui__core__TinderboxDS.php +++ b/ports-mgmt/tinderbox-devel/files/patch-webui__core__TinderboxDS.php @@ -1,16 +1,25 @@ Index: portstools/tinderbox/webui/core/TinderboxDS.php -diff -u portstools/tinderbox/webui/core/TinderboxDS.php:1.36.2.6 portstools/tinderbox/webui/core/TinderboxDS.php:1.36.2.7 +diff -u portstools/tinderbox/webui/core/TinderboxDS.php:1.36.2.6 portstools/tinderbox/webui/core/TinderboxDS.php:1.36.2.12 --- portstools/tinderbox/webui/core/TinderboxDS.php:1.36.2.6 Sun Feb 1 14:43:27 2009 -+++ portstools/tinderbox/webui/core/TinderboxDS.php Fri Mar 13 03:57:24 2009 ++++ portstools/tinderbox/webui/core/TinderboxDS.php Thu May 7 03:08:03 2009 @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $MCom: portstools/tinderbox/webui/core/TinderboxDS.php,v 1.36.2.6 2009/02/01 19:43:27 beat Exp $ -+# $MCom: portstools/tinderbox/webui/core/TinderboxDS.php,v 1.36.2.7 2009/03/13 07:57:24 beat Exp $ ++# $MCom: portstools/tinderbox/webui/core/TinderboxDS.php,v 1.36.2.12 2009/05/07 07:08:03 beat Exp $ # require_once 'DB.php'; +@@ -377,7 +377,7 @@ + return $results[0]; + } + +- function getPortsForBuild( $build, $sortby = 'port_directory', $port_name = '' ) { ++ function getPortsForBuild( $build, $sortby = 'port_directory', $port_name = '', $limit = 0 , $limit_offset = 0 ) { + $sortbytable = "bp"; + if ($sortby == "") $sortby = "port_directory"; + if ($sortby == "port_directory") $sortbytable = "p"; @@ -388,7 +388,7 @@ } $query = "SELECT p.port_id, @@ -20,3 +29,79 @@ diff -u portstools/tinderbox/webui/core/TinderboxDS.php:1.36.2.6 portstools/tind p.port_name, p.port_comment, bp.last_built, +@@ -409,6 +409,8 @@ + if ( $port_name ) + $query .= " AND p.port_name LIKE '%" . $this->db->escapeSimple( $port_name ) . "%'"; + $query .= " ORDER BY " . $this->db->escapeSimple( $sortbytable ) . "." . $this->db->escapeSimple( $sortby ); ++ if( $limit != 0 ) ++ $query .= " LIMIT " . $this->db->escapeSimple( $limit_offset ) . "," . $this->db->escapeSimple( $limit ); + + $rc = $this->_doQueryHashRef($query, $results, $build->getId()); + +@@ -421,7 +423,7 @@ + return $ports; + } + +- function getLatestPorts($build_id,$limit="") { ++ function getLatestPorts( $build_id, $limit = '', $maintainer = '' ) { + $query = "SELECT p.*, + bp.build_id, + bp.last_built, +@@ -441,6 +443,8 @@ + AND bp.last_built IS NOT NULL "; + if($build_id) + $query .= "AND bp.build_id=" . $this->db->escapeSimple( $build_id ); ++ if( $maintainer ) ++ $query .= " AND p.port_maintainer='" . $this->db->escapeSimple( $maintainer ) . "' "; + $query .= " ORDER BY bp.last_built DESC "; + if($limit) + $query .= " LIMIT " . $this->db->escapeSimple( $limit ); +@@ -483,7 +487,15 @@ + } + + +- function getPortsByStatus($build_id,$maintainer,$status,$notstatus) { ++ function getPortsByStatus( $build_id, $maintainer, $status, $notstatus, $limit = 0 , $limit_offset = 0, $sortby = 'last_built' ) { ++ $sortbytable = 'bp'; ++ 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.build_id, + bp.last_built, +@@ -509,7 +521,9 @@ + $query .= "AND bp.last_status<>'" . $this->db->escapeSimple( $notstatus ) . "' AND bp.last_status<>'UNKNOWN' "; + if($maintainer) + $query .= "AND p.port_maintainer='" . $this->db->escapeSimple( $maintainer ) . "' "; +- $query .= " ORDER BY bp.last_built DESC "; ++ $query .= " ORDER BY " . $this->db->escapeSimple( $sortbytable ) . "." . $this->db->escapeSimple( $sortby ); ++ if( $limit != 0 ) ++ $query .= " LIMIT " . $this->db->escapeSimple( $limit_offset ) . "," . $limit; + + $rc = $this->_doQueryHashRef($query, $results, array()); + +@@ -540,7 +554,7 @@ + function getPortById($id) { + $results = $this->getPorts(array( 'port_id' => $id )); + +- if (is_null($results)) { ++ if ( is_null( $results ) || empty( $results ) ) { + return null; + } + +@@ -561,6 +575,11 @@ + $query = 'SELECT port_id AS id FROM build_ports WHERE build_id = ? AND currently_building = \'1\''; + $rc = $this->_doQueryHashRef($query, $results, array($build_id)); + if (!$rc) return null; ++ ++ if ( empty( $results ) ) { ++ return null; ++ } ++ + $port = $this->getPortById($results[0]['id']); + + return $port; diff --git a/ports-mgmt/tinderbox-devel/files/patch-webui__inc_tinderbox.php.dist b/ports-mgmt/tinderbox-devel/files/patch-webui__inc_tinderbox.php.dist new file mode 100644 index 000000000000..ac557f33de08 --- /dev/null +++ b/ports-mgmt/tinderbox-devel/files/patch-webui__inc_tinderbox.php.dist @@ -0,0 +1,13 @@ +Index: portstools/tinderbox/webui/inc_tinderbox.php.dist +diff -u portstools/tinderbox/webui/inc_tinderbox.php.dist:1.10.2.2 portstools/tinderbox/webui/inc_tinderbox.php.dist:1.10.2.3 +--- portstools/tinderbox/webui/inc_tinderbox.php.dist:1.10.2.2 Wed Dec 10 18:03:28 2008 ++++ portstools/tinderbox/webui/inc_tinderbox.php.dist Wed May 6 15:48:32 2009 +@@ -13,6 +13,8 @@ + # reload interval for "Current And Latest Builds" page while a port is building + # in miliseconds + $reload_interval_current='60000'; ++# Define number of shown ports per page ++#$list_limit_nr='1000'; + + $wwwrootdir = dirname( __FILE__ ); + $rootdir = realpath( $wwwrootdir . '/../..' ); diff --git a/ports-mgmt/tinderbox-devel/files/patch-webui__index.php b/ports-mgmt/tinderbox-devel/files/patch-webui__index.php new file mode 100644 index 000000000000..49a868634206 --- /dev/null +++ b/ports-mgmt/tinderbox-devel/files/patch-webui__index.php @@ -0,0 +1,107 @@ +Index: portstools/tinderbox/webui/index.php +diff -u portstools/tinderbox/webui/index.php:1.24.2.7 portstools/tinderbox/webui/index.php:1.24.2.12 +--- portstools/tinderbox/webui/index.php:1.24.2.7 Sun Feb 1 08:32:15 2009 ++++ portstools/tinderbox/webui/index.php Thu May 7 16:02:52 2009 +@@ -24,7 +24,7 @@ + # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + # SUCH DAMAGE. + # +-# $MCom: portstools/tinderbox/webui/index.php,v 1.24.2.7 2009/02/01 13:32:15 beat Exp $ ++# $MCom: portstools/tinderbox/webui/index.php,v 1.24.2.12 2009/05/07 20:02:52 beat Exp $ + # + + $starttimer = explode( ' ', microtime() ); +@@ -65,44 +65,48 @@ + + $display_login = $moduleUsers->display_login(); + +-$action = $_REQUEST['action']; ++$action = isset( $_REQUEST['action'] ) ? $_REQUEST['action'] : ''; + + switch( $action ) { + case 'describe_port': $port_id = $_REQUEST['id']; + $display = $modulePorts->display_describe_port( $port_id ); + break; +- case 'failed_buildports': $build = $_REQUEST['build']; +- $maintainer = $_REQUEST['maintainer']; +- $display = $moduleBuildPorts->display_failed_buildports( $build, $maintainer, null, null ); ++ case 'failed_buildports': $build = isset ( $_REQUEST['build'] ) ? $_REQUEST['build'] : ''; ++ $maintainer = isset ( $_REQUEST['maintainer'] ) ? $_REQUEST['maintainer'] : ''; ++ $sort = isset ( $_REQUEST['sort'] ) ? $_REQUEST['sort'] : ''; ++ $list_limit_offset = isset ( $_REQUEST['list_limit_offset'] ) ? $_REQUEST['list_limit_offset'] : '0'; ++ $display = $moduleBuildPorts->display_failed_buildports( $build, $maintainer, null, null, $list_limit_offset, $sort ); + break; + case 'buildports_by_reason': $build = $_REQUEST['build']; +- $maintainer = $_REQUEST['maintainer']; ++ $maintainer = isset ( $_REQUEST['maintainer'] ) ? $_REQUEST['maintainer'] : ''; + $reason = $_REQUEST['reason']; +- $display = $moduleBuildPorts->display_failed_buildports( $build, $maintainer, null, $reason ); ++ $sort = isset ( $_REQUEST['sort'] ) ? $_REQUEST['sort'] : ''; ++ $list_limit_offset = isset ( $_REQUEST['list_limit_offset'] ) ? $_REQUEST['list_limit_offset'] : '0'; ++ $display = $moduleBuildPorts->display_failed_buildports( $build, $maintainer, null, $reason, $list_limit_offset, $sort ); ++ break; ++ case 'bad_buildports': $build = isset ( $_REQUEST['build'] ) ? $_REQUEST['build'] : ''; ++ $maintainer = isset ( $_REQUEST['maintainer'] ) ? $_REQUEST['maintainer'] : ''; ++ $sort = isset ( $_REQUEST['sort'] ) ? $_REQUEST['sort'] : ''; ++ $list_limit_offset = isset ( $_REQUEST['list_limit_offset'] ) ? $_REQUEST['list_limit_offset'] : '0'; ++ $display = $moduleBuildPorts->display_failed_buildports( $build, $maintainer, 'foo', null, $list_limit_offset, $sort ); + break; +- case 'bad_buildports': $build = $_REQUEST['build']; +- $maintainer = $_REQUEST['maintainer']; +- $display = $moduleBuildPorts->display_failed_buildports( $build, $maintainer, 'foo', null ); +- break; +- case 'latest_buildports': $build = $_REQUEST['build']; ++ case 'latest_buildports': $build = isset ( $_REQUEST['build'] ) ? $_REQUEST['build'] : ''; + $display = $moduleBuildPorts->display_latest_buildports( $build ); + break; + case 'list_buildports': $build = $_REQUEST['build']; +- $sort = ''; +- if (isset($_REQUEST['sort'])) { +- $sort = $_REQUEST['sort']; +- } +- $search = $_REQUEST['search_port_name']; +- $display = $moduleBuildPorts->display_list_buildports( $build, $sort, $search ); ++ $sort = isset ( $_REQUEST['sort'] ) ? $_REQUEST['sort'] : ''; ++ $search = isset ( $_REQUEST['search_port_name'] ) ? $_REQUEST['search_port_name'] : ''; ++ $list_limit_offset = isset ( $_REQUEST['list_limit_offset'] ) ? $_REQUEST['list_limit_offset'] : '0'; ++ $display = $moduleBuildPorts->display_list_buildports( $build, $sort, $search, $list_limit_offset ); + break; +- case 'list_tinderd_queue': $build_id = $_REQUEST['filter_build_id']; ++ case 'list_tinderd_queue': $build_id = isset ( $_REQUEST['filter_build_id'] ) ? $_REQUEST['filter_build_id'] : ''; + $display = $moduleTinderd->list_tinderd_queue( $build_id ); + break; + case 'change_tinderd_queue': $ctinderdq = $_REQUEST['change_tinderd_queue']; + $entry_id = $_REQUEST['entry_id']; + $build_id = $_REQUEST['build_id']; + $priority = $_REQUEST['priority']; +- $emailoc = $_REQUEST['email_on_completion']; ++ $emailoc = isset ( $_REQUEST['new_email_on_completion'] ) ? $_REQUEST['new_email_on_completion'] : ''; + $moduleTinderd->change_tinderd_queue( $ctinderdq, $entry_id, $build_id, $priority, $emailoc ); + $build_id = $_REQUEST['filter_build_id']; + $display = $moduleTinderd->list_tinderd_queue( $build_id ); +@@ -111,13 +115,13 @@ + $build_id = $_REQUEST['new_build_id']; + $priority = $_REQUEST['new_priority']; + $directory = $_REQUEST['new_port_directory']; +- $emailoc = $_REQUEST['new_email_on_completion']; ++ $emailoc = isset ( $_REQUEST['new_email_on_completion'] ) ? $_REQUEST['new_email_on_completion'] : ''; + $moduleTinderd->add_tinderd_queue( $atinderdq, $build_id, $priority, $directory, $emailoc ); + $build_id = $_REQUEST['filter_build_id']; + $display = $moduleTinderd->list_tinderd_queue( $build_id ); + break; + case 'delete_tinderd_queue': $dtinderdq = $_REQUEST['delete_tinderd_queue']; +- $build_id = $_REQUEST['filter_build_id']; ++ $build_id = isset ( $_REQUEST['filter_build_id'] ) ? $_REQUEST['filter_build_id'] : ''; + $moduleTinderd->delete_tinderd_queue( $dtinderdq, $build_id ); + $display = $moduleTinderd->list_tinderd_queue( $build_id ); + break; +@@ -156,7 +160,8 @@ + case 'config': $display = $moduleConfig->display_config(); + break; + case 'latest_buildports_rss': +- $display = $moduleRss->display_latest_buildports(); ++ $maintainer = isset ( $_REQUEST['maintainer'] ) ? $_REQUEST['maintainer'] : ''; ++ $display = $moduleRss->display_latest_buildports( $maintainer ); + break; + case 'display_markup_log': $build = $_REQUEST['build']; + $id = $_REQUEST['id']; diff --git a/ports-mgmt/tinderbox-devel/files/patch-webui__module__moduleBuildPorts.php b/ports-mgmt/tinderbox-devel/files/patch-webui__module__moduleBuildPorts.php new file mode 100644 index 000000000000..4b4d925fa1f7 --- /dev/null +++ b/ports-mgmt/tinderbox-devel/files/patch-webui__module__moduleBuildPorts.php @@ -0,0 +1,139 @@ +Index: portstools/tinderbox/webui/module/moduleBuildPorts.php +diff -u portstools/tinderbox/webui/module/moduleBuildPorts.php:1.16.2.5 portstools/tinderbox/webui/module/moduleBuildPorts.php:1.16.2.7 +--- portstools/tinderbox/webui/module/moduleBuildPorts.php:1.16.2.5 Sun Feb 1 08:32:16 2009 ++++ portstools/tinderbox/webui/module/moduleBuildPorts.php Wed May 6 16:37:53 2009 +@@ -24,7 +24,7 @@ + # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + # SUCH DAMAGE. + # +-# $MCom: portstools/tinderbox/webui/module/moduleBuildPorts.php,v 1.16.2.5 2009/02/01 13:32:16 beat Exp $ ++# $MCom: portstools/tinderbox/webui/module/moduleBuildPorts.php,v 1.16.2.7 2009/05/06 20:37:53 beat Exp $ + # + + require_once 'module/module.php'; +@@ -37,8 +37,8 @@ + $this->modulePorts = $modulePorts; + } + +- function display_list_buildports( $build_name, $sort, $search_port_name ) { +- global $starttimer, $with_timer; ++ function display_list_buildports( $build_name, $sort, $search_port_name, $list_limit_offset ) { ++ global $list_limit_nr, $starttimer, $with_timer; + + $build = $this->TinderboxDS->getBuildByName( $build_name ); + if ( ! $build ) { +@@ -46,7 +46,7 @@ + $this->template_assign( 'no_list', true ); + return $this->template_parse( 'list_buildports.tpl' ); + } +- $ports = $this->TinderboxDS->getPortsForBuild( $build, $sort, $search_port_name ); ++ $ports = $this->TinderboxDS->getPortsForBuild( $build, $sort, $search_port_name, $list_limit_nr, $list_limit_offset ); + $ports_tree = $this->TinderboxDS->getPortsTreeById( $build->getPortsTreeId() ); + $jail = $this->TinderboxDS->getJailById( $build->getJailId() ); + +@@ -82,6 +82,23 @@ + $qs[$kv[0]] = $kv[1]; + } + ++ if ( !isset( $list_limit_nr ) || $list_limit_nr == '0' ) { ++ $list_limit_nr = 0; ++ $list_nr_prev = -1; ++ $list_nr_next = 0; ++ } else { ++ if ( ( $list_limit_offset - $list_limit_nr ) < 0 ) { ++ $list_nr_prev = -1; ++ } else { ++ $list_nr_prev = $list_limit_offset - $list_limit_nr; ++ } ++ if ( count( $ports ) < $list_limit_nr ) { ++ $list_nr_next = 0; ++ } else { ++ $list_nr_next = $list_limit_offset + $list_limit_nr; ++ } ++ } ++ + $this->template_assign( 'port_fail_reasons', $port_fail_reasons ); + $this->template_assign( 'maintainers', $this->TinderboxDS->getAllMaintainers() ); + $this->template_assign( 'build_description', $build->getDescription() ); +@@ -93,6 +110,8 @@ + $this->template_assign( 'ports_tree_lastbuilt', prettyDatetime( $ports_tree->getLastBuilt() ) ); + $this->template_assign( 'local_time', prettyDatetime( date( 'Y-m-d H:i:s' ) ) ); + $this->template_assign( 'search_port_name', htmlentities( $search_port_name ) ); ++ $this->template_assign( 'list_nr_prev', $list_nr_prev ); ++ $this->template_assign( 'list_nr_next', $list_nr_next ); + $elapsed_time = ''; + if (isset($with_timer) && $with_timer == 1) { + $elapsed_time = get_ui_elapsed_time($starttimer); +@@ -103,8 +122,8 @@ + return $this->template_parse( 'list_buildports.tpl' ); + } + +- function display_failed_buildports( $build_name, $maintainer, $all, $wanted_reason ) { +- global $with_timer, $starttimer; ++ function display_failed_buildports( $build_name, $maintainer, $all, $wanted_reason, $list_limit_offset, $sort ) { ++ global $list_limit_nr, $with_timer, $starttimer; + + if( $build_name ) { + $build = $this->TinderboxDS->getBuildByName( $build_name ); +@@ -119,13 +138,13 @@ + } + + if ($wanted_reason) { +- $ports = $this->TinderboxDS->getPortsByStatus( $build_id, NULL, $wanted_reason, '' ); ++ $ports = $this->TinderboxDS->getPortsByStatus( $build_id, NULL, $wanted_reason, '', $list_limit_nr, $list_limit_offset, $sort ); + } + else { + if ($all) { +- $ports = $this->TinderboxDS->getPortsByStatus( $build_id, $maintainer, '', 'SUCCESS' ); ++ $ports = $this->TinderboxDS->getPortsByStatus( $build_id, $maintainer, '', 'SUCCESS', $list_limit_nr, $list_limit_offset, $sort ); + } else { +- $ports = $this->TinderboxDS->getPortsByStatus( $build_id, $maintainer, 'FAIL', '' ); ++ $ports = $this->TinderboxDS->getPortsByStatus( $build_id, $maintainer, 'FAIL', '', $list_limit_nr, $list_limit_offset, $sort ); + } + } + +@@ -153,16 +172,44 @@ + } + } + ++ $qs = array(); ++ $qkvs = explode( '&', $_SERVER['QUERY_STRING'] ); ++ foreach ( $qkvs as $qkv ) { ++ $kv = explode( '=', $qkv ); ++ $qs[$kv[0]] = $kv[1]; ++ } ++ ++ if ( !isset( $list_limit_nr ) || $list_limit_nr == '0' ) { ++ $list_limit_nr = 0; ++ $list_nr_prev = -1; ++ $list_nr_next = 0; ++ } else { ++ if ( ( $list_limit_offset - $list_limit_nr ) < 0 ) { ++ $list_nr_prev = -1; ++ } else { ++ $list_nr_prev = $list_limit_offset - $list_limit_nr; ++ } ++ ++ if ( count( $ports ) < $list_limit_nr ) { ++ $list_nr_next = 0; ++ } else { ++ $list_nr_next = $list_limit_offset + $list_limit_nr; ++ } ++ } ++ + $this->template_assign( 'port_fail_reasons', $port_fail_reasons ); + $this->template_assign( 'build_name', $build_name ); + $this->template_assign( 'maintainer', $maintainer ); + $this->template_assign( 'local_time', prettyDatetime( date( 'Y-m-d H:i:s' ) ) ); ++ $this->template_assign( 'querystring',$qs ); + $elapsed_time = ''; + if (isset($with_timer) && $with_timer == 1) { + $elapsed_time = get_ui_elapsed_time($starttimer); + } + $this->template_assign( 'ui_elapsed_time', $elapsed_time); + $this->template_assign( 'reason', $wanted_reason ); ++ $this->template_assign( 'list_nr_prev', $list_nr_prev ); ++ $this->template_assign( 'list_nr_next', $list_nr_next ); + + return $this->template_parse( 'failed_buildports.tpl' ); + } diff --git a/ports-mgmt/tinderbox-devel/files/patch-webui__module__modulePorts.php b/ports-mgmt/tinderbox-devel/files/patch-webui__module__modulePorts.php new file mode 100644 index 000000000000..392ee9e12be9 --- /dev/null +++ b/ports-mgmt/tinderbox-devel/files/patch-webui__module__modulePorts.php @@ -0,0 +1,30 @@ +Index: portstools/tinderbox/webui/module/modulePorts.php +diff -u portstools/tinderbox/webui/module/modulePorts.php:1.12.2.4 portstools/tinderbox/webui/module/modulePorts.php:1.12.2.5 +--- portstools/tinderbox/webui/module/modulePorts.php:1.12.2.4 Sun Feb 1 14:43:27 2009 ++++ portstools/tinderbox/webui/module/modulePorts.php Wed May 6 15:07:01 2009 +@@ -24,7 +24,7 @@ + # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + # SUCH DAMAGE. + # +-# $MCom: portstools/tinderbox/webui/module/modulePorts.php,v 1.12.2.4 2009/02/01 19:43:27 beat Exp $ ++# $MCom: portstools/tinderbox/webui/module/modulePorts.php,v 1.12.2.5 2009/05/06 19:07:01 beat Exp $ + # + + require_once 'module/module.php'; +@@ -57,8 +57,14 @@ + $ports_tree = $this->TinderboxDS->getPortsTreeForBuild( $build ); + if( empty( $ports_tree_ids[$ports_tree->getId()] ) ) { + $ports_tree_ids[$ports_tree->getId()] = 1; +- +- list( $cvsweb, $cvsweb_querystr ) = explode( '?', $ports_tree->getCVSwebURL(), 2 ); ++ ++ $cvsweb_arr = explode( '?', $ports_tree->getCVSwebURL(), 2 ); ++ if ( count( $cvsweb_arr ) == 1 ) { ++ list( $cvsweb ) = $cvsweb_arr; ++ $cvsweb_querystr = ''; ++ } else { ++ list( $cvsweb, $cvsweb_querystr ) = $cvsweb_arr; ++ } + + if ( $cvsweb_querystr ) { + $cvsweb = rtrim( $cvsweb, '/' ); diff --git a/ports-mgmt/tinderbox-devel/files/patch-webui__module__moduleRss.php b/ports-mgmt/tinderbox-devel/files/patch-webui__module__moduleRss.php new file mode 100644 index 000000000000..a391ad5478ec --- /dev/null +++ b/ports-mgmt/tinderbox-devel/files/patch-webui__module__moduleRss.php @@ -0,0 +1,19 @@ +Index: portstools/tinderbox/webui/module/moduleRss.php +diff -u portstools/tinderbox/webui/module/moduleRss.php:1.1.2.2 portstools/tinderbox/webui/module/moduleRss.php:1.1.2.3 +--- portstools/tinderbox/webui/module/moduleRss.php:1.1.2.2 Sun Feb 1 08:32:16 2009 ++++ portstools/tinderbox/webui/module/moduleRss.php Wed May 6 15:21:54 2009 +@@ -36,12 +36,12 @@ + $this->modulePorts = $modulePorts; + } + +- function display_latest_buildports( $limit = 20 ) { ++ function display_latest_buildports( $maintainer, $limit = 20 ) { + global $wwwrooturi; + + $ports = array(); + +- foreach ( $this->TinderboxDS->getLatestPorts( false, $limit ) as $port ) { ++ foreach ( $this->TinderboxDS->getLatestPorts( false, $limit, $maintainer ) as $port ) { + $build = $this->TinderboxDS->getBuildById( $port->getBuildId() ); + $jail = $this->TinderboxDS->getJailById( $build->getJailId() ); + diff --git a/ports-mgmt/tinderbox-devel/files/patch-webui__templates__default__failed_buildports.tpl b/ports-mgmt/tinderbox-devel/files/patch-webui__templates__default__failed_buildports.tpl new file mode 100644 index 000000000000..95d2f1ffe2c5 --- /dev/null +++ b/ports-mgmt/tinderbox-devel/files/patch-webui__templates__default__failed_buildports.tpl @@ -0,0 +1,74 @@ +Index: portstools/tinderbox/webui/templates/default/failed_buildports.tpl +diff -u portstools/tinderbox/webui/templates/default/failed_buildports.tpl:1.8.2.3 portstools/tinderbox/webui/templates/default/failed_buildports.tpl:1.8.2.5 +--- portstools/tinderbox/webui/templates/default/failed_buildports.tpl:1.8.2.3 Sun Jan 18 15:09:29 2009 ++++ portstools/tinderbox/webui/templates/default/failed_buildports.tpl Wed May 6 16:37:53 2009 +@@ -1,7 +1,7 @@ + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> + <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"> + <head> +-<!-- $MCom: portstools/tinderbox/webui/templates/default/failed_buildports.tpl,v 1.8.2.3 2009/01/18 20:09:29 beat Exp $ //--> ++<!-- $MCom: portstools/tinderbox/webui/templates/default/failed_buildports.tpl,v 1.8.2.5 2009/05/06 20:37:53 beat Exp $ //--> + <title><?php echo $tinderbox_name?></title> + <link href="<?php echo $templatesuri?>/tinderstyle.css" rel="stylesheet" type="text/css" /> + </head> +@@ -34,14 +34,26 @@ + <?php if(!$no_list){?> + <table> + <tr> +- <th>Build</th> +- <th>Port Directory</th> +- <th>Version</th> ++ <th> ++ <a href="<?php echo build_query_string($_SERVER['PHP_SELF'], $querystring, "sort", "build_id") ?>">Build</a> ++ </th> ++ <th> ++ <a href="<?php echo build_query_string($_SERVER['PHP_SELF'], $querystring, "sort", "port_directory") ?>">Port Directory</a> ++ </th> ++ <th> ++ <a href="<?php echo build_query_string($_SERVER['PHP_SELF'], $querystring, "sort", "last_built_version") ?>">Version</a> ++ </th> + <th style="width: 20px"> </th> +- <th>Reason</th> ++ <th> ++ <a href="<?php echo build_query_string($_SERVER['PHP_SELF'], $querystring, "sort", "last_fail_reason") ?>">Reason</a> ++ </th> + <th> </th> +- <th>Last Build Attempt</th> +- <th>Last Successful Build</th> ++ <th> ++ <a href="<?php echo build_query_string($_SERVER['PHP_SELF'], $querystring, "sort", "last_built") ?>">Last Build Attempt</a> ++ </th> ++ <th> ++ <a href="<?php echo build_query_string($_SERVER['PHP_SELF'], $querystring, "sort", "last_successful_built") ?>">Last Successful Build</a> ++ </th> + </tr> + + <?php foreach($data as $row) {?> +@@ -51,9 +63,9 @@ + <td><?php echo $row['port_last_built_version']?></td> + <td class="<?php echo $row['status_field_class']?>"><?php echo $row['status_field_letter']?></td> + <?php $reason=$row['port_last_fail_reason']?> +- <td class="<?php echo "fail_reason_".$port_fail_reasons[$reason]['type']?>"> +- <?php $href=($port_fail_reasons[$reason]['link']) ? "index.php?action=display_failure_reasons&failure_reason_tag=$reason#$reason" : "#"?> +- <a href="<?php echo $href?>" class="<?php echo "fail_reason_".$port_fail_reasons[$reason]['type']?>" title="<?php echo $port_fail_reasons[$reason]['descr']?>"><?php echo $reason?></a> ++ <td class="<?php if(!empty($port_fail_reasons[$reason]['type']))echo "fail_reason_".$port_fail_reasons[$reason]['type']?>"> ++ <?php $href=isset($port_fail_reasons[$reason]['link']) ? "index.php?action=display_failure_reasons&failure_reason_tag=$reason#$reason" : "#"?> ++ <a href="<?php echo $href?>" class="<?php if(!empty($port_fail_reasons[$reason]['type']))echo "fail_reason_".$port_fail_reasons[$reason]['type']?>" title="<?php if(!empty($port_fail_reasons[$reason]['descr']))echo $port_fail_reasons[$reason]['descr']?>"><?php echo $reason?></a> + </td> + <td> + <?php if($row['port_link_logfile']){?> +@@ -69,6 +81,14 @@ + </tr> + <?php }?> + </table> ++ <p> ++ <?php if($list_nr_prev!=-1){?> ++ <a href="<?php echo build_query_string($_SERVER['PHP_SELF'], $querystring, "list_limit_offset", $list_nr_prev ) ?>">prev</a> ++ <?php }?> ++ <?php if($list_nr_next!=0){?> ++ <a href="<?php echo build_query_string($_SERVER['PHP_SELF'], $querystring, "list_limit_offset", $list_nr_next ) ?>">next</a> ++ <?php }?> ++ </p> + <?php }else{?> + <?php if(!$errors){?> + <p>There are no build failures at the moment.</p> diff --git a/ports-mgmt/tinderbox-devel/files/patch-webui__templates__default__latest_buildports.tpl b/ports-mgmt/tinderbox-devel/files/patch-webui__templates__default__latest_buildports.tpl new file mode 100644 index 000000000000..81cd3e83b8c8 --- /dev/null +++ b/ports-mgmt/tinderbox-devel/files/patch-webui__templates__default__latest_buildports.tpl @@ -0,0 +1,38 @@ +Index: portstools/tinderbox/webui/templates/default/latest_buildports.tpl +diff -u portstools/tinderbox/webui/templates/default/latest_buildports.tpl:1.10.2.4 portstools/tinderbox/webui/templates/default/latest_buildports.tpl:1.10.2.7 +--- portstools/tinderbox/webui/templates/default/latest_buildports.tpl:1.10.2.4 Sun Jan 18 15:09:29 2009 ++++ portstools/tinderbox/webui/templates/default/latest_buildports.tpl Wed May 6 16:52:29 2009 +@@ -1,7 +1,7 @@ + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> + <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"> + <head> +-<!-- $MCom: portstools/tinderbox/webui/templates/default/latest_buildports.tpl,v 1.10.2.4 2009/01/18 20:09:29 beat Exp $ //--> ++<!-- $MCom: portstools/tinderbox/webui/templates/default/latest_buildports.tpl,v 1.10.2.7 2009/05/06 20:52:29 beat Exp $ //--> + <script language="JavaScript"> + function reloadpage() { + document.location.reload(); +@@ -48,9 +48,9 @@ + <td><?php echo $row['port_last_built_version']?></td> + <td class="<?php echo $row['status_field_class']?>"><?php echo $row['status_field_letter']?></td> + <?php $reason=$row['port_last_fail_reason']?> +- <td class="<?php echo "fail_reason_".$port_fail_reasons[$reason]['type']?>"> +- <?php $href=($port_fail_reasons[$reason]['link']) ? "index.php?action=display_failure_reasons&failure_reason_tag=$reason#$reason" : "#"?> +- <a href="<?php echo $href?>" class="<?php echo "fail_reason_".$port_fail_reasons[$reason]['type']?>" title="<?php echo $port_fail_reasons[$reason]['descr']?>"><?php echo $reason?></a> ++ <td class="<?php if(!empty($port_fail_reasons[$reason]['type']))echo "fail_reason_".$port_fail_reasons[$reason]['type']?>"> ++ <?php $href=isset($port_fail_reasons[$reason]['link']) ? "index.php?action=display_failure_reasons&failure_reason_tag=$reason#$reason" : "#"?> ++ <a href="<?php echo $href?>" class="<?php if(!empty($port_fail_reasons[$reason]['type']))echo "fail_reason_".$port_fail_reasons[$reason]['type']?>" title="<?php if(!empty($port_fail_reasons[$reason]['descr']))echo $port_fail_reasons[$reason]['descr']?>"><?php $reason?></a> + </td> + <td> + <?php if($row['port_link_logfile']){?> +@@ -73,6 +73,11 @@ + <?php }?> + <?php }?> + ++<p> ++<a href="index.php?action=failed_buildports">All Build Failures</a><br /> ++<a href="index.php?action=bad_buildports">All Failures</a><br /> ++<a href="index.php?action=latest_buildports_rss">RSS Feed</a><br /> ++<p> + <p>Local time: <?php echo $local_time?></p> + <p style="color:#FF0000;font-size:10px;"><?php echo $ui_elapsed_time?></p> + <?php echo $display_login?> diff --git a/ports-mgmt/tinderbox-devel/files/patch-webui__templates__default__list_buildports.tpl b/ports-mgmt/tinderbox-devel/files/patch-webui__templates__default__list_buildports.tpl new file mode 100644 index 000000000000..cc8f9b42edd7 --- /dev/null +++ b/ports-mgmt/tinderbox-devel/files/patch-webui__templates__default__list_buildports.tpl @@ -0,0 +1,26 @@ +Index: portstools/tinderbox/webui/templates/default/list_buildports.tpl +diff -u portstools/tinderbox/webui/templates/default/list_buildports.tpl:1.11.2.5 portstools/tinderbox/webui/templates/default/list_buildports.tpl:1.11.2.6 +--- portstools/tinderbox/webui/templates/default/list_buildports.tpl:1.11.2.5 Sun Jan 18 15:09:29 2009 ++++ portstools/tinderbox/webui/templates/default/list_buildports.tpl Wed May 6 15:07:01 2009 +@@ -1,7 +1,7 @@ + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> + <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"> + <head> +-<!-- $MCom: portstools/tinderbox/webui/templates/default/list_buildports.tpl,v 1.11.2.5 2009/01/18 20:09:29 beat Exp $ //--> ++<!-- $MCom: portstools/tinderbox/webui/templates/default/list_buildports.tpl,v 1.11.2.6 2009/05/06 19:07:01 beat Exp $ //--> + <title><?php echo $tinderbox_name?></title> + <link href="<?php echo $templatesuri?>/tinderstyle.css" rel="stylesheet" type="text/css" /> + <link rel="alternate" type="application/rss+xml" title="<?php echo $tinderbox_name?> (RSS)" href="index.php?action=latest_buildports_rss" /> +@@ -89,9 +89,9 @@ + <td><?php echo $row['port_last_built_version']?></td> + <td class="<?php echo $row['status_field_class']?>"><?php echo $row['status_field_letter']?></td> + <?php $reason=$row['port_last_fail_reason']?> +- <td class="<?php echo "fail_reason_".$port_fail_reasons[$reason]['type']?>"> +- <?php $href=($port_fail_reasons[$reason]['link']) ? "index.php?action=display_failure_reasons&failure_reason_tag=$reason#$reason" : "#"?> +- <a href="<?php echo $href?>" class="<?php echo "fail_reason_".$port_fail_reasons[$reason]['type']?>" title="<?php echo $port_fail_reasons[$reason]['descr']?>"><?php echo $reason?></a> ++ <td class="<?php if(!empty($port_fail_reasons[$reason]['type']))echo "fail_reason_".$port_fail_reasons[$reason]['type']?>"> ++ <?php $href=isset($port_fail_reasons[$reason]['link']) ? "index.php?action=display_failure_reasons&failure_reason_tag=$reason#$reason" : "#"?> ++ <a href="<?php echo $href?>" class="<?php if(!empty($port_fail_reasons[$reason]['type']))echo "fail_reason_".$port_fail_reasons[$reason]['type']?>" title="<?php if(!empty($port_fail_reasons[$reason]['descr']))echo $port_fail_reasons[$reason]['descr']?>"><?php echo $reason?></a> + </td> + <td> + <?php if($row['port_link_logfile']){?> diff --git a/ports-mgmt/tinderbox-devel/files/patch-webui__templates__default__list_builds.tpl b/ports-mgmt/tinderbox-devel/files/patch-webui__templates__default__list_builds.tpl new file mode 100644 index 000000000000..e2815b68ca9c --- /dev/null +++ b/ports-mgmt/tinderbox-devel/files/patch-webui__templates__default__list_builds.tpl @@ -0,0 +1,47 @@ +Index: portstools/tinderbox/webui/templates/default/list_builds.tpl +diff -u portstools/tinderbox/webui/templates/default/list_builds.tpl:1.10.2.4 portstools/tinderbox/webui/templates/default/list_builds.tpl:1.10.2.7 +--- portstools/tinderbox/webui/templates/default/list_builds.tpl:1.10.2.4 Wed Feb 11 03:33:12 2009 ++++ portstools/tinderbox/webui/templates/default/list_builds.tpl Wed May 6 16:52:29 2009 +@@ -12,7 +12,7 @@ + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> + <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"> + <head> +-<!-- $MCom: portstools/tinderbox/webui/templates/default/list_builds.tpl,v 1.10.2.4 2009/02/11 08:33:12 beat Exp $ //--> ++<!-- $MCom: portstools/tinderbox/webui/templates/default/list_builds.tpl,v 1.10.2.7 2009/05/06 20:52:29 beat Exp $ //--> + <title><?php echo $tinderbox_name?></title> + <link href="<?php echo $templatesuri?>/tinderstyle.css" rel="stylesheet" type="text/css" /> + <link rel="alternate" type="application/rss+xml" title="<?php echo $tinderbox_name?> (RSS)" href="index.php?action=latest_buildports_rss" /> +@@ -120,7 +120,7 @@ + <p> + <a href="index.php?action=latest_buildports">Current And Latest Builds</a><br /> + <a href="index.php?action=failed_buildports">All Build Failures</a><br /> +-<a href="index.php?action=bad_buildports">All (really) Build Failures</a><br /> ++<a href="index.php?action=bad_buildports">All Failures</a><br /> + <input type="hidden" name="action" value="failed_buildports" /> + All Build Failures for the maintainer <select name="maintainer"> + <option></option> +@@ -140,10 +140,23 @@ + <option value="<?php echo $row['name']?>"><?php echo $row['name']?></option> + <?php }?> + </select> +-<input type="text" name="search_port_name" value="<?php echo $search_port_name?>" /> ++<input type="text" name="search_port_name" value="<?php if(isset($search_port_name))echo $search_port_name?>" /> + <input type="submit" name="Go" value="Go" /> + </form> + </p> ++<p> ++<form method="get" action="index.php"> ++RSS feed for the maintainer ++<input type="hidden" name="action" value="latest_buildports_rss" /> ++<select name="maintainer"> ++<option></option> ++<?php foreach($maintainers as $maintainer) {?> ++ <option><?php echo $maintainer?></option> ++<?php }?> ++</select> ++<input type="submit" name="Go" value="Go" /> ++</form> ++<p> + <br /> + <?php echo $display_login?> + </body> diff --git a/ports-mgmt/tinderbox-devel/files/patch-webui__templates__default__list_tinderd_queue.tpl b/ports-mgmt/tinderbox-devel/files/patch-webui__templates__default__list_tinderd_queue.tpl new file mode 100644 index 000000000000..75f8b2d2cc7d --- /dev/null +++ b/ports-mgmt/tinderbox-devel/files/patch-webui__templates__default__list_tinderd_queue.tpl @@ -0,0 +1,22 @@ +Index: portstools/tinderbox/webui/templates/default/list_tinderd_queue.tpl +diff -u portstools/tinderbox/webui/templates/default/list_tinderd_queue.tpl:1.11.2.4 portstools/tinderbox/webui/templates/default/list_tinderd_queue.tpl:1.11.2.5 +--- portstools/tinderbox/webui/templates/default/list_tinderd_queue.tpl:1.11.2.4 Wed Feb 11 03:41:21 2009 ++++ portstools/tinderbox/webui/templates/default/list_tinderd_queue.tpl Wed May 6 15:07:01 2009 +@@ -1,7 +1,7 @@ + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> + <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"> + <head> +-<!-- $MCom: portstools/tinderbox/webui/templates/default/list_tinderd_queue.tpl,v 1.11.2.4 2009/02/11 08:41:21 beat Exp $ //--> ++<!-- $MCom: portstools/tinderbox/webui/templates/default/list_tinderd_queue.tpl,v 1.11.2.5 2009/05/06 19:07:01 beat Exp $ //--> + <title><?php echo $tinderbox_name?></title> + <link href="<?php echo $templatesuri?>/tinderstyle.css" rel="stylesheet" type="text/css" /> + </head> +@@ -61,7 +61,7 @@ + + <form method="post" action="index.php"> + <input type="hidden" name="action" value="add_tinderd_queue" /> +- <input type="hidden" name="entry_id" value="<?php echo $row['entry_id']?>" /> ++ <input type="hidden" name="entry_id" value="<?php if(!empty($row['entry_id']))echo $row['entry_id']?>" /> + <input type="hidden" name="filter_build_id" value="<?php echo $build_id?>" /> + <tr> + <td> diff --git a/ports-mgmt/tinderbox-devel/files/patch-webui__templates__paefchen__display_markup_log.tpl b/ports-mgmt/tinderbox-devel/files/patch-webui__templates__paefchen__display_markup_log.tpl new file mode 100644 index 000000000000..6bcd49cd2764 --- /dev/null +++ b/ports-mgmt/tinderbox-devel/files/patch-webui__templates__paefchen__display_markup_log.tpl @@ -0,0 +1,11 @@ +Index: portstools/tinderbox/webui/templates/paefchen/display_markup_log.tpl +diff -u portstools/tinderbox/webui/templates/paefchen/display_markup_log.tpl:1.3.2.2 portstools/tinderbox/webui/templates/paefchen/display_markup_log.tpl:1.3.2.3 +--- portstools/tinderbox/webui/templates/paefchen/display_markup_log.tpl:1.3.2.2 Sun Jan 18 15:09:30 2009 ++++ portstools/tinderbox/webui/templates/paefchen/display_markup_log.tpl Wed May 6 15:07:02 2009 +@@ -1,5 +1,5 @@ + <?php +-$header_title = "$directory log"; ++$header_title = $data['port_directory'] . " log"; + $topmenu = array( + $data['port_directory'] => "index.php?action=describe_port&id=$id", + 'raw log' => $data['port_link_logfile'] diff --git a/ports-mgmt/tinderbox-devel/files/patch-webui__templates__paefchen__failed_buildports.tpl b/ports-mgmt/tinderbox-devel/files/patch-webui__templates__paefchen__failed_buildports.tpl new file mode 100644 index 000000000000..58960d377d3a --- /dev/null +++ b/ports-mgmt/tinderbox-devel/files/patch-webui__templates__paefchen__failed_buildports.tpl @@ -0,0 +1,65 @@ +Index: portstools/tinderbox/webui/templates/paefchen/failed_buildports.tpl +diff -u portstools/tinderbox/webui/templates/paefchen/failed_buildports.tpl:1.2.2.3 portstools/tinderbox/webui/templates/paefchen/failed_buildports.tpl:1.2.2.6 +--- portstools/tinderbox/webui/templates/paefchen/failed_buildports.tpl:1.2.2.3 Sun Jan 18 15:09:30 2009 ++++ portstools/tinderbox/webui/templates/paefchen/failed_buildports.tpl Wed May 6 16:37:54 2009 +@@ -20,14 +20,26 @@ + <?php if(!$no_list){?> + <table> + <tr> +- <th>Build</th> +- <th>Port Directory</th> +- <th>Version</th> ++ <th> ++ <a href="<?php echo build_query_string($_SERVER['PHP_SELF'], $querystring, "sort", "build_id") ?>">Build</a> ++ </th> ++ <th> ++ <a href="<?php echo build_query_string($_SERVER['PHP_SELF'], $querystring, "sort", "port_directory") ?>">Port Directory</a> ++ </th> ++ <th> ++ <a href="<?php echo build_query_string($_SERVER['PHP_SELF'], $querystring, "sort", "last_built_version") ?>">Version</a> ++ </th> + <th style="width: 20px"> </th> +- <th>Reason</th> ++ <th> ++ <a href="<?php echo build_query_string($_SERVER['PHP_SELF'], $querystring, "sort", "last_fail_reason") ?>">Reason</a> ++ </th> + <th> </th> +- <th>Last Build Attempt</th> +- <th>Last Successful Build</th> ++ <th> ++ <a href="<?php echo build_query_string($_SERVER['PHP_SELF'], $querystring, "sort", "last_built") ?>">Last Build Attempt</a> ++ </th> ++ <th> ++ <a href="<?php echo build_query_string($_SERVER['PHP_SELF'], $querystring, "sort", "last_successful_built") ?>">Last Successful Build</a> ++ </th> + </tr> + <?php foreach($data as $row) {?> + <tr> +@@ -36,9 +48,9 @@ + <td><?php echo $row['port_last_built_version']?></td> + <td class="<?php echo $row['status_field_class']?>"><?php echo $row['status_field_letter']?></td> + <?php $reason=$row['port_last_fail_reason']?> +- <td class="<?php echo "fail_reason_".$port_fail_reasons[$reason]['type']?>"> +- <?php $href=($port_fail_reasons[$reason]['link']) ? "index.php?action=display_failure_reasons&failure_reason_tag=$reason#$reason" : "#"?> +- <a href="<?php echo $href?>" class="<?php echo "fail_reason_".$port_fail_reasons[$reason]['type']?>" title="<?php echo $port_fail_reasons[$reason]['descr']?>"><?php echo $reason?></a> ++ <td class="<?php if(!empty($reason)) echo "fail_reason_".$port_fail_reasons[$reason]['type']?>"> ++ <?php $href=isset($port_fail_reasons[$reason]['link']) ? "index.php?action=display_failure_reasons&failure_reason_tag=$reason#$reason" : "#"?> ++ <a href="<?php echo $href?>" class="<?php if(!empty($reason)) echo "fail_reason_".$port_fail_reasons[$reason]['type']?>" title="<?php if(!empty($reason)) $port_fail_reasons[$reason]['descr']?>"><?php echo $reason?></a> + </td> + <td> + <?php if($row['port_link_logfile']){?> +@@ -54,6 +66,14 @@ + </tr> + <?php }?> + </table> ++<p> ++ <?php if($list_nr_prev!=-1){?> ++ <a href="<?php echo build_query_string($_SERVER['PHP_SELF'], $querystring, "list_limit_offset", $list_nr_prev ) ?>">prev</a> ++ <?php }?> ++ <?php if($list_nr_next!=0){?> ++ <a href="<?php echo build_query_string($_SERVER['PHP_SELF'], $querystring, "list_limit_offset", $list_nr_next ) ?>">next</a> ++ <?php }?> ++</p> + <?php }else{?> + <?php if(!$errors){?> + <p>There are no build failures at the moment.</p> diff --git a/ports-mgmt/tinderbox-devel/files/patch-webui__templates__paefchen__footer.inc.tpl b/ports-mgmt/tinderbox-devel/files/patch-webui__templates__paefchen__footer.inc.tpl new file mode 100644 index 000000000000..db85751ba6ba --- /dev/null +++ b/ports-mgmt/tinderbox-devel/files/patch-webui__templates__paefchen__footer.inc.tpl @@ -0,0 +1,23 @@ +Index: portstools/tinderbox/webui/templates/paefchen/footer.inc.tpl +diff -u portstools/tinderbox/webui/templates/paefchen/footer.inc.tpl:1.2.2.1 portstools/tinderbox/webui/templates/paefchen/footer.inc.tpl:1.2.2.2 +--- portstools/tinderbox/webui/templates/paefchen/footer.inc.tpl:1.2.2.1 Thu Dec 18 16:06:37 2008 ++++ portstools/tinderbox/webui/templates/paefchen/footer.inc.tpl Wed May 6 15:07:02 2009 +@@ -1,4 +1,9 @@ + <!-- $Paefchen: FreeBSD/tinderbox/webui/templates/paefchen/footer.inc.tpl,v 1.1 2008/01/05 12:25:17 as Exp $ //--> ++<?php ++if ( empty ( $ui_elapsed_time ) ) { ++ $ui_elapsed_time = ''; ++} ++?> + <?php echo $display_login?> + </div> + <div id="footer"> +@@ -12,7 +17,7 @@ + </ul> + </div> + <div class="right"> +-<?php if (is_array($footer_legend)) { ?> ++<?php if (isset($footer_legend) && is_array($footer_legend)) { ?> + <?php foreach($footer_legend as $css_class => $legend_title) { ?> + <table> + <tr> diff --git a/ports-mgmt/tinderbox-devel/files/patch-webui__templates__paefchen__header.inc.tpl b/ports-mgmt/tinderbox-devel/files/patch-webui__templates__paefchen__header.inc.tpl new file mode 100644 index 000000000000..fc98bafc3f25 --- /dev/null +++ b/ports-mgmt/tinderbox-devel/files/patch-webui__templates__paefchen__header.inc.tpl @@ -0,0 +1,22 @@ +Index: portstools/tinderbox/webui/templates/paefchen/header.inc.tpl +diff -u portstools/tinderbox/webui/templates/paefchen/header.inc.tpl:1.2.2.3 portstools/tinderbox/webui/templates/paefchen/header.inc.tpl:1.2.2.4 +--- portstools/tinderbox/webui/templates/paefchen/header.inc.tpl:1.2.2.3 Sun Dec 21 12:27:30 2008 ++++ portstools/tinderbox/webui/templates/paefchen/header.inc.tpl Wed May 6 15:07:02 2009 +@@ -28,7 +28,7 @@ + <div id="topmenu"> + <a id="top"></a> + <div class="left"> +-<?php if (is_array($topmenu) && count($topmenu) > 0) { ?> ++<?php if (isset($topmenu) && is_array($topmenu) && count($topmenu) > 0) { ?> + <ul> + <?php foreach ($topmenu as $menu_title => $menu_url) { ?> + <li><a href="<?php echo $menu_url?>"><?php echo $menu_title?></a></li> +@@ -52,7 +52,7 @@ + <?php } ?> + </div> + </div> +- <?php if (is_array($legend) && count($legend) > 0) { ?> ++ <?php if ( isset($legend) && is_array($legend) && count($legend) > 0) { ?> + <div id="legend"> + <ul> + <?php foreach ($legend as $items) { ?> diff --git a/ports-mgmt/tinderbox-devel/files/patch-webui__templates__paefchen__latest_buildports.tpl b/ports-mgmt/tinderbox-devel/files/patch-webui__templates__paefchen__latest_buildports.tpl new file mode 100644 index 000000000000..0d49f6e3d2d1 --- /dev/null +++ b/ports-mgmt/tinderbox-devel/files/patch-webui__templates__paefchen__latest_buildports.tpl @@ -0,0 +1,29 @@ +Index: portstools/tinderbox/webui/templates/paefchen/latest_buildports.tpl +diff -u portstools/tinderbox/webui/templates/paefchen/latest_buildports.tpl:1.1.2.4 portstools/tinderbox/webui/templates/paefchen/latest_buildports.tpl:1.1.2.7 +--- portstools/tinderbox/webui/templates/paefchen/latest_buildports.tpl:1.1.2.4 Sun Jan 18 15:09:30 2009 ++++ portstools/tinderbox/webui/templates/paefchen/latest_buildports.tpl Wed May 6 16:52:30 2009 +@@ -4,7 +4,10 @@ + $header_title .= " in $build_name"; + $topmenu = array( + 'Current' => '#current', +- 'Latest' => '#latest' ++ 'Latest' => '#latest', ++ 'All Build Failures' => 'index.php?action=failed_buildports', ++ 'All Failures' => 'index.php?action=bad_buildports', ++ 'RSS Feed' => 'index.php?action=latest_buildports_rss' + ); + include 'header.inc.tpl' + ?> +@@ -47,9 +50,9 @@ + <td><?php echo $row['port_last_built_version']?></td> + <td class="<?php echo $row['status_field_class']?>"><?php echo $row['status_field_letter']?></td> + <?php $reason=$row['port_last_fail_reason']?> +- <td class="<?php echo "fail_reason_".$port_fail_reasons[$reason]['type']?>"> +- <?php $href=($port_fail_reasons[$reason]['link']) ? "index.php?action=display_failure_reasons&failure_reason_tag=$reason#$reason" : "#"?> +- <a href="<?php echo $href?>" class="<?php echo "fail_reason_".$port_fail_reasons[$reason]['type']?>" title="<?php echo $port_fail_reasons[$reason]['descr']?>"><?php echo $reason?></a> ++ <td class="<?php if(!empty($reason)) echo "fail_reason_".$port_fail_reasons[$reason]['type']?>"> ++ <?php $href=isset($port_fail_reasons[$reason]['link']) ? "index.php?action=display_failure_reasons&failure_reason_tag=$reason#$reason" : "#"?> ++ <a href="<?php echo $href?>" class="<?php if(!empty($reason)) echo "fail_reason_".$port_fail_reasons[$reason]['type']?>" title="<?php if(!empty($reason)) echo $port_fail_reasons[$reason]['descr']?>"><?php echo $reason?></a> + </td> + <td> + <?php if($row['port_link_logfile']){?> diff --git a/ports-mgmt/tinderbox-devel/files/patch-webui__templates__paefchen__list_buildports.tpl b/ports-mgmt/tinderbox-devel/files/patch-webui__templates__paefchen__list_buildports.tpl new file mode 100644 index 000000000000..3cbd6dc1b998 --- /dev/null +++ b/ports-mgmt/tinderbox-devel/files/patch-webui__templates__paefchen__list_buildports.tpl @@ -0,0 +1,32 @@ +Index: portstools/tinderbox/webui/templates/paefchen/list_buildports.tpl +diff -u portstools/tinderbox/webui/templates/paefchen/list_buildports.tpl:1.2.2.5 portstools/tinderbox/webui/templates/paefchen/list_buildports.tpl:1.2.2.7 +--- portstools/tinderbox/webui/templates/paefchen/list_buildports.tpl:1.2.2.5 Sun Jan 18 15:09:30 2009 ++++ portstools/tinderbox/webui/templates/paefchen/list_buildports.tpl Wed May 6 15:48:33 2009 +@@ -116,9 +116,9 @@ + <td><?php echo $row['port_last_built_version']?></td> + <td class="<?php echo $row['status_field_class']?>"><?php echo $row['status_field_letter']?></td> + <?php $reason=$row['port_last_fail_reason']?> +- <td class="<?php echo "fail_reason_".$port_fail_reasons[$reason]['type']?>"> +- <?php $href=($port_fail_reasons[$reason]['link']) ? "index.php?action=display_failure_reasons&failure_reason_tag=$reason#$reason" : "#"?> +- <a href="<?php echo $href?>" class="<?php echo "fail_reason_".$port_fail_reasons[$reason]['type']?>" title="<?php echo $port_fail_reasons[$reason]['descr']?>"><?php echo $reason?></a> ++ <td class="<?php if(!empty($reason))echo "fail_reason_".$port_fail_reasons[$reason]['type']?>"> ++ <?php $href=isset($port_fail_reasons[$reason]['link']) ? "index.php?action=display_failure_reasons&failure_reason_tag=$reason#$reason" : "#"?> ++ <a href="<?php echo $href?>" class="<?php if(!empty($reason))echo "fail_reason_".$port_fail_reasons[$reason]['type']?>" title="<?php if(!empty($reason))echo $port_fail_reasons[$reason]['descr']?>"><?php echo $reason?></a> + </td> + <td> + <?php if($row['port_link_logfile']){?> +@@ -135,6 +135,14 @@ + <?php }?> + </table> + <p>Total: <?php echo count($data)?></p> ++<p> ++ <?php if($list_nr_prev!=-1){?> ++ <a href="index.php?action=<?php echo $_REQUEST['action'] ?>&build=<?php if (isset($_REQUEST['build']))echo $_REQUEST['build'] ?>&sort=<?php if (isset($_REQUEST['sort']))echo $_REQUEST['sort'] ?>&search_port_name=<?php if (isset($_REQUEST['search_port_name']))echo $_REQUEST['search_port_name'] ?>&list_limit_offset=<?php echo $list_nr_prev ?> ">prev</a> ++ <?php }?> ++ <?php if($list_nr_next!=0){?> ++ <a href="index.php?action=<?php echo $_REQUEST['action'] ?>&build=<?php if (isset($_REQUEST['build']))echo $_REQUEST['build'] ?>&sort=<?php if (isset($_REQUEST['sort']))echo $_REQUEST['sort'] ?>&search_port_name=<?php if (isset($_REQUEST['search_port_name']))echo $_REQUEST['search_port_name'] ?>&list_limit_offset=<?php echo $list_nr_next ?> ">next</a> ++ <?php }?> ++</p> + <?php }else{?> + <?php if(!$errors){?> + <p>No ports are being built.</p> diff --git a/ports-mgmt/tinderbox-devel/files/patch-webui__templates__paefchen__list_builds.tpl b/ports-mgmt/tinderbox-devel/files/patch-webui__templates__paefchen__list_builds.tpl new file mode 100644 index 000000000000..98025c59cd66 --- /dev/null +++ b/ports-mgmt/tinderbox-devel/files/patch-webui__templates__paefchen__list_builds.tpl @@ -0,0 +1,89 @@ +Index: portstools/tinderbox/webui/templates/paefchen/list_builds.tpl +diff -u portstools/tinderbox/webui/templates/paefchen/list_builds.tpl:1.5.2.3 portstools/tinderbox/webui/templates/paefchen/list_builds.tpl:1.5.2.6 +--- portstools/tinderbox/webui/templates/paefchen/list_builds.tpl:1.5.2.3 Wed Feb 11 03:33:12 2009 ++++ portstools/tinderbox/webui/templates/paefchen/list_builds.tpl Wed May 6 16:52:30 2009 +@@ -2,7 +2,7 @@ + $topmenu = array( + "Current And Latest Builds" => "index.php?action=latest_buildports", + "Failed builds in this build" => "index.php?action=failed_buildports", +- "All (really) Build Failures" => "index.php?action=bad_buildports" ++ "All Failures" => "index.php?action=bad_buildports" + ); + + $legend = array( +@@ -15,6 +15,10 @@ + "T = Total" + ); + ++if ( empty ( $search_port_name ) ) { ++ $search_port_name = ''; ++} ++ + include 'header.inc.tpl'; + ?> + <!-- $Paefchen: FreeBSD/tinderbox/webui/templates/paefchen/list_builds.tpl,v 1.2 2008/01/07 03:53:59 as Exp $ //--> +@@ -108,21 +112,6 @@ + <?php }?> + <div class="subcontent"> + <form method="get" action="index.php"> +- <fieldset> +- <label>All Build Failures for the maintainer</label> +- +- <input type="hidden" name="action" value="failed_buildports" /> +- <select name="maintainer"> +- <option></option> +-<?php foreach($maintainers as $maintainer) {?> +- <option><?php echo $maintainer?></option> +-<?php }?> +- </select> +- <input type="submit" name="Go" value="Go" /> +- </fieldset> +- </form> +- <br /> +- <form method="get" action="index.php"> + <fieldset> + <label>Find ports by name</label> + <input type="hidden" name="action" value="list_buildports" /> +@@ -135,6 +124,42 @@ + <input type="submit" name="Go" value="Go" /> + </fieldset> + </form> ++ <br /> ++ <fieldset> ++ <label>Maintainer</label> ++ <table> ++ <tr> ++ <th>All Build Failures for the maintainer</th> ++ <th>RSS feed for the maintainer</th> ++ </tr> ++ <tr> ++ <td> ++ <form method="get" action="index.php"> ++ <input type="hidden" name="action" value="failed_buildports" /> ++ <select name="maintainer"> ++ <option></option> ++ <?php foreach($maintainers as $maintainer) {?> ++ <option><?php echo $maintainer?></option> ++ <?php }?> ++ </select> ++ <input type="submit" name="Go" value="Go" /> ++ </form> ++ </td> ++ <td> ++ <form method="get" action="index.php"> ++ <input type="hidden" name="action" value="latest_buildports_rss" /> ++ <select name="maintainer"> ++ <option></option> ++ <?php foreach($maintainers as $maintainer) {?> ++ <option><?php echo $maintainer?></option> ++ <?php }?> ++ </select> ++ <input type="submit" name="Go" value="Go" /> ++ </form> ++ </td> ++ </tr> ++ </table> ++ </fieldset> + </div> + <?php + $footer_legend = array( diff --git a/ports-mgmt/tinderbox-devel/files/patch-webui__templates__paefchen__list_tinderd_queue.tpl b/ports-mgmt/tinderbox-devel/files/patch-webui__templates__paefchen__list_tinderd_queue.tpl index 1dbd064f6126..0a81c8f4e03a 100644 --- a/ports-mgmt/tinderbox-devel/files/patch-webui__templates__paefchen__list_tinderd_queue.tpl +++ b/ports-mgmt/tinderbox-devel/files/patch-webui__templates__paefchen__list_tinderd_queue.tpl @@ -1,7 +1,7 @@ Index: portstools/tinderbox/webui/templates/paefchen/list_tinderd_queue.tpl -diff -u portstools/tinderbox/webui/templates/paefchen/list_tinderd_queue.tpl:1.6 portstools/tinderbox/webui/templates/paefchen/list_tinderd_queue.tpl:1.7 ---- portstools/tinderbox/webui/templates/paefchen/list_tinderd_queue.tpl:1.6 Wed Feb 11 03:39:26 2009 -+++ portstools/tinderbox/webui/templates/paefchen/list_tinderd_queue.tpl Sun Apr 5 17:35:38 2009 +diff -u portstools/tinderbox/webui/templates/paefchen/list_tinderd_queue.tpl:1.2.2.4 portstools/tinderbox/webui/templates/paefchen/list_tinderd_queue.tpl:1.2.2.6 +--- portstools/tinderbox/webui/templates/paefchen/list_tinderd_queue.tpl:1.2.2.4 Wed Feb 11 03:41:22 2009 ++++ portstools/tinderbox/webui/templates/paefchen/list_tinderd_queue.tpl Wed May 6 15:07:02 2009 @@ -4,12 +4,13 @@ ?> <!-- $Paefchen: FreeBSD/tinderbox/webui/templates/paefchen/list_tinderd_queue.tpl,v 1.1 2008/01/05 12:25:17 as Exp $ //--> @@ -70,14 +70,17 @@ diff -u portstools/tinderbox/webui/templates/paefchen/list_tinderd_queue.tpl:1.6 <table> <tr> <th>Build</th> -@@ -52,6 +66,7 @@ +@@ -52,8 +66,9 @@ <th> </th> </tr> <form method="post" action="index.php"> + <fieldset> <input type="hidden" name="action" value="add_tinderd_queue" /> - <input type="hidden" name="entry_id" value="<?php echo $row['entry_id']?>" /> +- <input type="hidden" name="entry_id" value="<?php echo $row['entry_id']?>" /> ++ <input type="hidden" name="entry_id" value="<?php if(!empty($row['entry_id']))echo $row['entry_id']?>" /> <input type="hidden" name="filter_build_id" value="<?php echo $build_id?>" /> + <tr> + <td> @@ -78,11 +93,13 @@ </td> <td colspan="3"><input type="submit" name="add_tinderd_queue" value="add" /></td> |