mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-26 09:46:09 +00:00
Code Issues Releases Activity

Update to 3.4-20100104

Browse Source 
Changes:

Fixes from upstream:
 - Remove X11BASE support it is now obsolete. (already in ports-mgmt/tinderbox)
 - Expand the glob to check for Perl so that it actually
   captures lang/perl5.10. (already in ports-mgmt/tinderbox)
 - Restore some of the leftover exceptions but use LOCALBASE instead of X11BASE.
 - Expand the MySQL glob to match on MySQL 5.4 and 5.5.
 - Adjust the SQL query to remove all entries from a BuildPortsQueue.  This
   makes things more compatible.

Two Experimental patches from Tim Bishop and beat@.

- Tim has added support for multiple tinderd instances at the same
  time.

  The parallel patch allows to run multiple tinderd instances at the
  same time. You can enable multiple tinderd instances via /etc/rc.conf
  with tinderd_instances="X"

- beat@ as added support for tmpfs to enable the usage of FreeBSD's
  tmpfs implementation.

Both patches are experimental and are not official supported by the Tinderbox
distribution.

Reviewed by:	itetcu, beat (thx!)
Approved by:	itetcu (maintainer implicit)
Obtained from:	tinderbox cvs (snapshot)
This commit is contained in:
Martin Wilke 2010-01-05 19:58:18 +00:00
parent 1312f748e0
commit e350196de9
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=247224
36 changed files with 232 additions and 1486 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
ports-mgmt/tinderbox-devel/Makefile
View File

@ -5,11 +5,9 @@
# $FreeBSD$
PORTNAME= tinderbox
PORTVERSION= 3.2
PORTREVISION= 5 # 2009-09-17 18:02:34 UTC
DISTVERSION= 3.4-${SNAP}
CATEGORIES= ports-mgmt
MASTER_SITES= http://tinderbox.marcuscom.com/ \
http://T32.TecNik93.com/FreeBSD/ports/${PORTNAME}/sources/
MASTER_SITES= http://freebsd.unixfreunde.de/${PORTNAME}/
PKGNAMESUFFIX= -devel
DIST_SUBDIR= ${PORTNAME}
@ -21,23 +19,24 @@ CONFLICTS= tinderbox-[0-9]*
OPTIONS= PGSQL "With pgsql" Off \
MYSQL "With mysql" On \
CSUP "Use csup for updates" On \
CVSUP "Use cvsup for updates" Off \
WEBUI "Install web interface" On \
APACHE "Use Apache for web interface" On \
LIGHTTPD "Use LightHTTPD for web interface" Off \
CHECK_FOR_ROOT "Check if ./tc is run by uid 0" On \
LSOF "For killMountProcesses() when using nullfs" On
LSOF "For killMountProcesses() when using nullfs" On \
TMPFS "Enable TMPFS extra patch" Off \
PARALLEL "Enable PARALLEL extra patch" Off
NO_BUILD= yes
WANT_PERL= yes
SUB_FILES= pkg-message
SNAP= 20100104 # 07:00 PM
MAN1= tc-configCcache.1 tc-configDistfile.1 tc-configGet.1 \
tc-configJail.1 tc-configTinderd.1 tc-init.1
IGNORE= please use ports-mgmt/tinderbox instand
PATCH_STRIP= -p2
.include <bsd.port.pre.mk>
.if !defined(WITH_PGSQL) && defined(WITHOUT_MYSQL)
@ -45,7 +44,6 @@ IGNORE= is useless without a database. Please (re)run 'make config' and choose o
.endif
.if defined(WITH_WEBUI)
RUN_DEPENDS+= ${LOCALBASE}/share/pear/DB.php:${PORTSDIR}/databases/pear-DB
WANT_PHP_WEB= yes
USE_PHP= session
PLIST_SUB+= WEBUI=""
@ -56,6 +54,7 @@ PLIST_SUB+= WEBUI="@comment "
.if defined(WITH_PGSQL)
USE_PGSQL= yes
.if defined(WITH_WEBUI)
RUN_DEPENDS+= ${LOCALBASE}/share/pear/MDB2/Driver/pgsql.php:${PORTSDIR}/databases/pear-MDB2_Driver_pgsql
USE_PHP+= pgsql
.endif
RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/DBD/Pg.pm:${PORTSDIR}/databases/p5-DBD-Pg
@ -63,6 +62,7 @@ RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/DBD/Pg.pm:${PORTSDIR}/databases/p5-DBD-P
.if !defined(WITHOUT_MYSQL)
.if defined(WITH_WEBUI)
RUN_DEPENDS+= ${LOCALBASE}/share/pear/MDB2/Driver/mysql.php:${PORTSDIR}/databases/pear-MDB2_Driver_mysql
USE_PHP+= mysql
.endif
USE_MYSQL= yes
@ -76,6 +76,10 @@ RUN_DEPENDS+= csup:${PORTSDIR}/net/csup
.endif
.endif
.if defined(WITH_CVSUP)
RUN_DEPENDS+= cvsup:${PORTSDIR}/net/cvsup-without-gui
.endif
.if !defined(WITHOUT_APACHE) && defined(WITH_WEBUI)
USE_APACHE= 1.3+
.elif defined(WITH_LIGHTTPD) && defined(WITH_WEBUI)
@ -86,6 +90,14 @@ RUN_DEPENDS+= lighttpd:${PORTSDIR}/www/lighttpd
RUN_DEPENDS+= lsof:${PORTSDIR}/sysutils/lsof
.endif
.if defined(WITH_TMPFS) && defined(WITH_PARALLEL)
EXTRA_PATCHES+= ${FILESDIR}/extra-tmpfs_para.patch
.elif defined(WITH_TMPFS) && !defined(WITH_PARALLEL)
EXTRA_PATCHES+= ${FILESDIR}/extra-tmpfs.patch
.elif defined(WITH_PARALLEL) && !defined(WITH_TMPFS)
EXTRA_PATCHES+= ${FILESDIR}/extra-parallel.patch
.endif
pre-everything::
.if (!defined(WITHOUT_APACHE) || defined(WITH_LIGHTTPD)) && !defined(WITH_WEBUI)
@${ECHO_CMD} "It doesn't make sense to depend on Apache or LightHTTPD if not using either web interface."
@ -113,7 +125,6 @@ do-install:
${INSTALL_SCRIPT} ${WRKSRC}/etc/rc.d/tinderd ${PREFIX}/etc/rc.d/${PORTNAME}
@${ECHO_CMD} "Installing tinderbox ..."
${CP} -R ${WRKSRC}/* ${PREFIX}/tinderbox/scripts
${CP} ${WRKSRC}/.version ${PREFIX}/tinderbox/scripts
@${ECHO_CMD} "All Done"
post-install:

6
ports-mgmt/tinderbox-devel/distinfo
View File

@ -1,3 +1,3 @@
MD5 (tinderbox/tinderbox-3.2.tar.gz) = 3a964f2d919d0d8c3e81d8d8ee35e903
SHA256 (tinderbox/tinderbox-3.2.tar.gz) = 47101dc078751867c9d9dfe9da4d471bc10755dad9d539ecaad066c12a039b22
SIZE (tinderbox/tinderbox-3.2.tar.gz) = 128293
MD5 (tinderbox/tinderbox-3.4-20100104.tar.gz) = 1feac7578b1854d48581d87b55967362
SHA256 (tinderbox/tinderbox-3.4-20100104.tar.gz) = 02a62cb91437d9fabeb163b2dcbde88e59069fc48c6d01cff66b6d0a6532330e
SIZE (tinderbox/tinderbox-3.4-20100104.tar.gz) = 134138

60
ports-mgmt/tinderbox-devel/files/extra-parallel.patch Normal file
View File

@ -0,0 +1,60 @@
diff -u etc/rc.d/tinderd.orig etc/rc.d/tinderd
--- etc/rc.d/tinderd.orig 2008-12-05 18:21:16.402721853 +0300
+++ etc/rc.d/tinderd 2008-12-06 01:08:58.000000000 +0300
@@ -24,6 +24,7 @@
: ${tinderd_directory="/space/scripts"}
: ${tinderd_flags=""}
: ${tinderd_debug="NO"}
+: ${tinderd_instances="1"}
# path to your executable, might be libexec, bin, sbin, ...
command="${tinderd_directory}/tinderd"
@@ -39,4 +40,13 @@
command_args=">/dev/null &"
fi
+start_cmd="${name}_start"
+
+tinderd_start()
+{
+ for i in `jot - 1 ${tinderd_instances}`; do
+ ${command} ${tinderd_flags} >/dev/null 2>&1 &
+ done
+}
+
run_rc_command "$1"
diff -u scripts/tinderd.orig scripts/tinderd
--- tinderd.orig 2008-12-05 18:21:16.412782070 +0300
+++ tinderd 2008-12-06 01:36:56.435417070 +0300
@@ -19,7 +19,22 @@
do
trap "" 1
- ENTRY=$(${pb}/scripts/tc listBuildPortsQueue -s ENQUEUED -r | head -1)
+ ENTRY=""
+
+ if mkdir /tmp/tinderdlock >/dev/null 2>&1; then
+ ${pb}/scripts/tc listBuildPortsQueue -s ENQUEUED -r > /tmp/tinderd.$$
+ while read line; do
+ BUILD=$(echo ${line} | cut -d: -f3)
+ if [ ! -f $pb/builds/$BUILD/tinderdlock -a ! -f $pb/builds/$BUILD/lock ]; then
+ touch $pb/builds/$BUILD/tinderdlock
+ ENTRY=$line
+ break
+ fi
+ done < /tmp/tinderd.$$
+ rm /tmp/tinderd.$$
+ rmdir /tmp/tinderdlock
+ fi
+
ID=$(echo ${ENTRY} | cut -d: -f1)
USER=$(echo ${ENTRY} | cut -d: -f2)
BUILD=$(echo ${ENTRY} | cut -d: -f3)
@@ -52,6 +67,7 @@
${pb}/scripts/tc reorgBuildPortsQueue
+ rm $pb/builds/$BUILD/tinderdlock
else
tinderEcho "INFO: Nothing to do. Sleeping ${TINDERD_SLEEPTIME} seconds."
trap main_loop 1

25
ports-mgmt/tinderbox-devel/files/extra-tmpfs.patch Normal file
View File

@ -0,0 +1,25 @@
--- tinderd.orgi 2010-01-04 21:12:37.000000000 +0100
+++ tinderd 2010-01-04 21:14:28.000000000 +0100
@@ -36,12 +36,14 @@
MAIL=$(echo ${ENTRY} | cut -d: -f5)
if [ -n "${BUILD}" -a -n "${PORT}" -a -n "${ID}" ] ; then
+ mount -t tmpfs tmpfs ${pb}/${BUILD}
tinderEcho "INFO: Going to build ${PORT} on ${BUILD}"
${pb}/scripts/tc updateBuildPortsQueueEntryStatus \
-i "${ID}" -s PROCESSING
if ! ${pb}/scripts/tc addPort -b "${BUILD}" -d "${PORT}"; then
${pb}/scripts/tc updateBuildPortsQueueEntryStatus \
-i "${ID}" -s FAIL
+ umount ${pb}/${BUILD}
continue
fi
@@ -64,6 +66,7 @@
fi
${pb}/scripts/tc reorgBuildPortsQueue
+ umount ${pb}/${BUILD}
else
tinderEcho "INFO: Nothing to do. Sleeping ${TINDERD_SLEEPTIME} seconds."

75
ports-mgmt/tinderbox-devel/files/extra-tmpfs_para.patch Normal file
View File

@ -0,0 +1,75 @@
--- tinderd.orig 2010-01-04 20:56:05.000000000 +0100
+++ tinderd 2010-01-05 20:13:58.000000000 +0100
@@ -28,7 +28,22 @@
do
trap "" 1
- ENTRY=$(${pb}/scripts/tc listBuildPortsQueue -s ENQUEUED -r | head -1)
+ ENTRY=""
+
+ if mkdir /tmp/tinderdlock >/dev/null 2>&1; then
+ ${pb}/scripts/tc listBuildPortsQueue -s ENQUEUED -r > /tmp/tinderd.$$
+ while read line; do
+ BUILD=$(echo ${line} | cut -d: -f3)
+ if [ ! -f $pb/builds/$BUILD/tinderdlock -a ! -f $pb/builds/$BUILD/lock ]; then
+ touch $pb/builds/$BUILD/tinderdlock
+ ENTRY=$line
+ break
+ fi
+ done < /tmp/tinderd.$$
+ rm /tmp/tinderd.$$
+ rmdir /tmp/tinderdlock
+ fi
+
ID=$(echo ${ENTRY} | cut -d: -f1)
USER=$(echo ${ENTRY} | cut -d: -f2)
BUILD=$(echo ${ENTRY} | cut -d: -f3)
@@ -36,12 +51,14 @@
MAIL=$(echo ${ENTRY} | cut -d: -f5)
if [ -n "${BUILD}" -a -n "${PORT}" -a -n "${ID}" ] ; then
+ mount -t tmpfs tmpfs ${pb}/${BUILD}
tinderEcho "INFO: Going to build ${PORT} on ${BUILD}"
${pb}/scripts/tc updateBuildPortsQueueEntryStatus \
-i "${ID}" -s PROCESSING
if ! ${pb}/scripts/tc addPort -b "${BUILD}" -d "${PORT}"; then
${pb}/scripts/tc updateBuildPortsQueueEntryStatus \
-i "${ID}" -s FAIL
+ umount ${pb}/${BUILD}
continue
fi
@@ -64,7 +81,9 @@
fi
${pb}/scripts/tc reorgBuildPortsQueue
+ umount ${pb}/${BUILD}
+ rm $pb/builds/$BUILD/tinderdlock
else
tinderEcho "INFO: Nothing to do. Sleeping ${TINDERD_SLEEPTIME} seconds."
trap main_loop 1
--- etc/rc.d/tinderd.orig 2010-01-04 20:56:05.000000000 +0100
+++ etc/rc.d/tinderd 2010-01-05 20:11:17.000000000 +0100
@@ -24,6 +24,7 @@
: ${tinderd_directory="/space/scripts"}
: ${tinderd_flags=""}
: ${tinderd_debug="NO"}
+: ${tinderd_instances="1"}
# path to your executable, might be libexec, bin, sbin, ...
command="${tinderd_directory}/tinderd"
@@ -39,4 +40,13 @@
command_args=">/dev/null &"
fi
+start_cmd="${name}_start"
+
+tinderd_start()
+{
+ for i in `jot - 1 ${tinderd_instances}`; do
+ ${command} ${tinderd_flags} >/dev/null 2>&1 &
+ done
+}
+
run_rc_command "$1"

28
ports-mgmt/tinderbox-devel/files/patch-lib__buildscript
View File

@ -1,28 +0,0 @@
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

129
ports-mgmt/tinderbox-devel/files/patch-lib__tc_command.pl
View File

@ -1,129 +0,0 @@
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.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 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.16 2009/04/25 19:42:13 marcus Exp $
#
my $pb;
@@ -46,6 +46,7 @@
use Tinderbox::MakeCache;
use Getopt::Std;
use Text::Wrap;
+use Cwd 'abs_path';
use vars qw(
%COMMANDS
$TINDERBOX_HOST
@@ -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 =
- $ds->updatePortLastBuiltStatus($port, $dest,
+ $ds->updatePortLastStatus($port, $dest,
$ds->getPortLastBuiltStatus($port, $src));
if (!$rc) {
warn
@@ -3217,6 +3247,10 @@
my $portdir = $ENV{'PORTSDIR'} . "/" . $port;
return if (!-d $portdir);
+ # Canonicalize the port directory.
+ $port = abs_path($portdir);
+ $port =~ s|$ENV{'PORTSDIR'}/||;
+
if (defined($deps)) {
my @list;
push @list, $cache->BuildDependsList($port);

113
ports-mgmt/tinderbox-devel/files/patch-lib__tc_command.sh
View File

@ -1,113 +0,0 @@
--- portstools/tinderbox/lib/tc_command.sh.orig 2009-02-24 20:36:38.000000000 +0100
+++ portstools/tinderbox/lib/tc_command.sh 2009-09-17 19:59:26.000000000 +0200
@@ -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.18 2009/05/10 18:02:34 marcus Exp $
#
-export _defaultUpdateHost="cvsup12.FreeBSD.org"
+export _defaultUpdateHost="cvsup17.FreeBSD.org"
export _defaultUpdateType="CSUP"
#---------------------------------------------------------------------------
@@ -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})
+ db_res=$?
genschema=$(tinderLoc scripts sql/genschema)
- if [ $? = 0 ]; then
+ if [ ${db_res} = 0 ]; then
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}
@@ -1649,7 +1668,7 @@
# Set up the chrooted environment
osmajor=$(echo ${jail} | sed -E -e 's|(^[[:digit:]]+).*$|\1|')
case ${osmajor} in
- 6|7|8) tinderbuild_setup;;
+ 6|7|8|9) tinderbuild_setup;;
*) echo "tinderbuild: unhandled OS version: ${osmajor}"
tinderbuild_cleanup 1
;;

13
ports-mgmt/tinderbox-devel/files/patch-lib__tinderbox.env
View File

@ -1,13 +0,0 @@
--- portstools/tinderbox/lib/tinderbox.env.orgi 2009-09-17 20:01:21.000000000 +0200
+++ portstools/tinderbox/lib/tinderbox.env 2009-09-17 20:01:41.000000000 +0200
@@ -17,6 +17,10 @@
#8PKGZIPCMD=bzip2
#8INDEXFILE=INDEX-8
#8X_WINDOW_SYSTEM=xorg
+#9PKGSUFFIX=.tbz
+#9PKGZIPCMD=bzip2
+#9INDEXFILE=INDEX-8
+#9X_WINDOW_SYSTEM=xorg
#
LOCALBASE=/usr/local
X11BASE=/usr/local

29
ports-mgmt/tinderbox-devel/files/patch-lib__tinderlib.sh
View File

@ -1,29 +0,0 @@
Index: portstools/tinderbox/lib/tinderlib.sh
diff -u portstools/tinderbox/lib/tinderlib.sh:1.55.2.4 portstools/tinderbox/lib/tinderlib.sh:1.55.2.5
--- portstools/tinderbox/lib/tinderlib.sh:1.55.2.4 Mon Nov 10 02:03:02 2008
+++ portstools/tinderbox/lib/tinderlib.sh Sat Mar 14 19:57:13 2009
@@ -23,7 +23,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $MCom: portstools/tinderbox/lib/tinderlib.sh,v 1.55.2.4 2008/11/10 07:03:02 marcus Exp $
+# $MCom: portstools/tinderbox/lib/tinderlib.sh,v 1.55.2.5 2009/03/14 23:57:13 marcus Exp $
#
tinderLocJail () {
@@ -131,7 +131,14 @@
pids="XXX"
while [ ! -z "${pids}" ]; do
- pids=$(fstat -f "${dir}" | tail +2 | awk '{print $3}' | sort -u)
+ # Lsof is more reliable when it comes to nullfs, so prefer it if
+ # found.
+ lsof=$(which lsof 2>/dev/null)
+ if [ -n "${lsof}" ]; then
+ pids=$(${lsof} | fgrep "${dir}" | awk '{print $2}' | sort -u)
+ else
+ pids=$(fstat -f "${dir}" | tail +2 | awk '{print $3}' | sort -u)
+ fi
if [ ! -z "${pids}" ]; then
echo "Killing off pids in ${dir}"

13
ports-mgmt/tinderbox-devel/files/patch-sql__schema.mysql.pre
View File

@ -1,13 +0,0 @@
Index: portstools/tinderbox/sql/schema.mysql.pre
diff -u portstools/tinderbox/sql/schema.mysql.pre:1.68.2.2 portstools/tinderbox/sql/schema.mysql.pre:1.68.2.3
--- portstools/tinderbox/sql/schema.mysql.pre:1.68.2.2 Sun Dec 21 12:27:29 2008
+++ portstools/tinderbox/sql/schema.mysql.pre Fri Mar 27 00:06:27 2009
@@ -37,7 +37,7 @@
DROP TABLE IF EXISTS builds;
CREATE TABLE builds (
build_id SERIAL PRIMARY KEY,
- build_name VARCHAR(32) UNIQUE NOT NULL,
+ build_name VARCHAR(255) UNIQUE NOT NULL,
jail_id INTEGER REFERENCES jails(jail_id) ON UPDATE CASCADE ON DELETE RESTRICT,
ports_tree_id INTEGER REFERENCES ports_trees(ports_tree_id) ON UPDATE CASCADE ON DELETE RESTRICT,
build_description TEXT,

13
ports-mgmt/tinderbox-devel/files/patch-sql__schema.pgsql.pre
View File

@ -1,13 +0,0 @@
Index: portstools/tinderbox/sql/schema.pgsql.pre
diff -u portstools/tinderbox/sql/schema.pgsql.pre:1.45.2.3 portstools/tinderbox/sql/schema.pgsql.pre:1.45.2.4
--- portstools/tinderbox/sql/schema.pgsql.pre:1.45.2.3 Sun Dec 21 12:27:29 2008
+++ portstools/tinderbox/sql/schema.pgsql.pre Fri Mar 27 00:06:27 2009
@@ -34,7 +34,7 @@
-- DROP TABLE builds CASCADE;
CREATE TABLE builds (
build_id SERIAL PRIMARY KEY,
- build_name VARCHAR(32) UNIQUE NOT NULL,
+ build_name VARCHAR(255) UNIQUE NOT NULL,
jail_id INTEGER REFERENCES jails(jail_id) ON UPDATE CASCADE ON DELETE RESTRICT,
ports_tree_id INTEGER REFERENCES ports_trees(ports_tree_id) ON UPDATE CASCADE ON DELETE RESTRICT,
build_description TEXT,

104
ports-mgmt/tinderbox-devel/files/patch-sql__values.pfp
View File

@ -1,104 +0,0 @@
Index: portstools/tinderbox/sql/values.pfp
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
@@ -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);
+INSERT INTO port_fail_patterns VALUES (1700, '(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|error: invalid pure specifier)', 'bad_C++_code', 0);
+INSERT INTO port_fail_patterns VALUES (1800, '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 (1900, '(/usr/libexec/elf/ld: cannot find|undefined reference to|cannot open -l.*: No such file)', 'linker_error', 0);
+INSERT INTO port_fail_patterns VALUES (2000, 'install: .*: No such file', 'install_error', 0);
+INSERT INTO port_fail_patterns VALUES (2100, '(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 (2200, 'core dumped', 'coredump', 0);
+INSERT INTO port_fail_patterns VALUES (2300, '(.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 (2400, 'autoconf([0-9\\-\\.]*): (not found|No such file or directory)', 'autoconf', 0);
+INSERT INTO port_fail_patterns VALUES (2500, 'autoheader: not found', 'autoheader', 0);
+INSERT INTO port_fail_patterns VALUES (2600, 'automake(.*): not found', 'automake', 0);
+INSERT INTO port_fail_patterns VALUES (2700, 'Checksum mismatch', 'checksum', 0);
+INSERT INTO port_fail_patterns VALUES (2800, 'chown:.*[Ii]nvalid argument', 'chown', 0);
+INSERT INTO port_fail_patterns VALUES (2900, 'Shared object \\"libc.so.6\\" not found, required by', 'compat6x', 0);
+INSERT INTO port_fail_patterns VALUES (3000, 'error in dependency .*, exiting', 'depend_package', 0);
+INSERT INTO port_fail_patterns VALUES (3100, '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 (3200, '((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 (3300, '(No checksum recorded for|(Maybe|Either) .* is out of date. or)', 'distinfo_update', 0);
+INSERT INTO port_fail_patterns VALUES (3400, 'Member name contains .\\.\\./', 'fetch', 0);
+INSERT INTO port_fail_patterns VALUES (3500, '(pnohang: killing make checksum|fetch: transfer timed out)', 'fetch_timeout', 0);
+INSERT INTO port_fail_patterns VALUES (3600, '(f77: not found|f77:No such file or directory|Unable to find a fortran compiler)', 'f77', 0);
+INSERT INTO port_fail_patterns VALUES (3700, 'See <URL:http://gcc.gnu.org/bugs.html> for instructions.', 'gcc_bug', 0);
+INSERT INTO port_fail_patterns VALUES (3800, '(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 (3900, '(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 (4000, 'Could not create Makefile', 'makefile', 0);
+INSERT INTO port_fail_patterns VALUES (4100, '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 (4200, '/usr/.*/man/.*: No such file or directory', 'manpage', 0);
+INSERT INTO port_fail_patterns VALUES (4300, 'out of .* hunks .*--saving rejects to', 'patch', 0);
+INSERT INTO port_fail_patterns VALUES (4400, '(/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 (4500, 'BEGIN failed--compilation aborted at ..Makefile.PL line', 'perl', 0);
+INSERT INTO port_fail_patterns VALUES (4600, '(Abort trap|Bus error|Signal 1[01])', 'process_failed', 0);
+INSERT INTO port_fail_patterns VALUES (4700, 'python: not found', 'python', 0);
+INSERT INTO port_fail_patterns VALUES (4800, '(USER PID PPID PGID.*JOBC STAT TT TIME COMMAND|pnohang: killing make package)', 'runaway_process', 0);
+INSERT INTO port_fail_patterns VALUES (4900, 'Segmentation fault', 'segfault', 0);
+INSERT INTO port_fail_patterns VALUES (5000, 'initializer element is not constant', 'stdio', 0);
+INSERT INTO port_fail_patterns VALUES (5100, 'structure has no member named', 'struct_changes', 0);
+INSERT INTO port_fail_patterns VALUES (5200, 'shminit failed: Permission denied', 'sysvipc', 0);
+INSERT INTO port_fail_patterns VALUES (5300, '(/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 (5400, '<varargs.h> is obsolete with this version of GCC', 'varargs', 0);
+INSERT INTO port_fail_patterns VALUES (5500, '[Rr]ead-[Oo]nly [Ff]ile [Ss]ystem', 'WRKDIR', 0);
+INSERT INTO port_fail_patterns VALUES (5600, 'cc1.*warnings being treated as errors', 'compiler_error', 0);
+INSERT INTO port_fail_patterns VALUES (5700, 'pkg_create: make_dist: tar command failed with code', 'PLIST', 0);
+INSERT INTO port_fail_patterns VALUES (5800, 'Cannot stat: ', 'configure_error', 0);
+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);

9
ports-mgmt/tinderbox-devel/files/patch-sql__values.pfr
View File

@ -1,9 +0,0 @@
Index: portstools/tinderbox/sql/values.pfr
diff -u portstools/tinderbox/sql/values.pfr:1.1 portstools/tinderbox/sql/values.pfr:1.1.2.1
--- portstools/tinderbox/sql/values.pfr:1.1 Thu Jul 24 19:52:33 2008
+++ portstools/tinderbox/sql/values.pfr Sat Mar 28 15:10:24 2009
@@ -55,3 +55,4 @@
INSERT INTO port_fail_reasons VALUES ('???', 'The automated script cannot even guess what is wrong with your port. Either the script is really stupid (more likely), or your port has ventured into unknown lands (congratulations!).', 'COMMON');
INSERT INTO port_fail_reasons VALUES ('hook', 'A pre-condition hook failed to execute successfully', 'RARE');
INSERT INTO port_fail_reasons VALUES ('f77', 'The Fortran 77 compiler is no longer installed in the base OS. This port requires USE_FORTRAN.', 'COMMON');
+INSERT INTO port_fail_reasons VALUES ('nested_declaration', 'A function is used before its prototype is defined; or a function is inlined incorrectly.', 'RARE');

107
ports-mgmt/tinderbox-devel/files/patch-webui__core__TinderboxDS.php
View File

@ -1,107 +0,0 @@
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.12
--- portstools/tinderbox/webui/core/TinderboxDS.php:1.36.2.6 Sun Feb 1 14:43:27 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.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,
p.port_directory,
- TRIM(TRAILING '@FreeBSD.org' FROM p.port_maintainer) as port_maintainer,
+ REPLACE(p.port_maintainer, '@FreeBSD.org', '') as port_maintainer,
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;

13
ports-mgmt/tinderbox-devel/files/patch-webui__inc_tinderbox.php.dist
View File

@ -1,13 +0,0 @@
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 . '/../..' );

107
ports-mgmt/tinderbox-devel/files/patch-webui__index.php
View File

@ -1,107 +0,0 @@
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'];

139
ports-mgmt/tinderbox-devel/files/patch-webui__module__moduleBuildPorts.php
View File

@ -1,139 +0,0 @@
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' );
}

30
ports-mgmt/tinderbox-devel/files/patch-webui__module__modulePorts.php
View File

@ -1,30 +0,0 @@
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, '/' );

19
ports-mgmt/tinderbox-devel/files/patch-webui__module__moduleRss.php
View File

@ -1,19 +0,0 @@
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() );

74
ports-mgmt/tinderbox-devel/files/patch-webui__templates__default__failed_buildports.tpl
View File

@ -1,74 +0,0 @@
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">&nbsp;</th>
- <th>Reason</th>
+ <th>
+ <a href="<?php echo build_query_string($_SERVER['PHP_SELF'], $querystring, "sort", "last_fail_reason") ?>">Reason</a>
+ </th>
<th>&nbsp;</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&amp;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&amp;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>

38
ports-mgmt/tinderbox-devel/files/patch-webui__templates__default__latest_buildports.tpl
View File

@ -1,38 +0,0 @@
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&amp;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&amp;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?>

26
ports-mgmt/tinderbox-devel/files/patch-webui__templates__default__list_buildports.tpl
View File

@ -1,26 +0,0 @@
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&amp;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&amp;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']){?>

47
ports-mgmt/tinderbox-devel/files/patch-webui__templates__default__list_builds.tpl
View File

@ -1,47 +0,0 @@
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>

22
ports-mgmt/tinderbox-devel/files/patch-webui__templates__default__list_tinderd_queue.tpl
View File

@ -1,22 +0,0 @@
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>

11
ports-mgmt/tinderbox-devel/files/patch-webui__templates__paefchen__display_markup_log.tpl
View File

@ -1,11 +0,0 @@
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&amp;id=$id",
'raw log' => $data['port_link_logfile']

65
ports-mgmt/tinderbox-devel/files/patch-webui__templates__paefchen__failed_buildports.tpl
View File

@ -1,65 +0,0 @@
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">&nbsp;</th>
- <th>Reason</th>
+ <th>
+ <a href="<?php echo build_query_string($_SERVER['PHP_SELF'], $querystring, "sort", "last_fail_reason") ?>">Reason</a>
+ </th>
<th>&nbsp;</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&amp;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&amp;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>

23
ports-mgmt/tinderbox-devel/files/patch-webui__templates__paefchen__footer.inc.tpl
View File

@ -1,23 +0,0 @@
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>

22
ports-mgmt/tinderbox-devel/files/patch-webui__templates__paefchen__header.inc.tpl
View File

@ -1,22 +0,0 @@
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) { ?>

29
ports-mgmt/tinderbox-devel/files/patch-webui__templates__paefchen__latest_buildports.tpl
View File

@ -1,29 +0,0 @@
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&amp;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&amp;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']){?>

32
ports-mgmt/tinderbox-devel/files/patch-webui__templates__paefchen__list_buildports.tpl
View File

@ -1,32 +0,0 @@
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&amp;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&amp;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>

89
ports-mgmt/tinderbox-devel/files/patch-webui__templates__paefchen__list_builds.tpl
View File

@ -1,89 +0,0 @@
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(

105
ports-mgmt/tinderbox-devel/files/patch-webui__templates__paefchen__list_tinderd_queue.tpl
View File

@ -1,105 +0,0 @@
Index: portstools/tinderbox/webui/templates/paefchen/list_tinderd_queue.tpl
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 $ //-->
<div class="subcontent">
- <form method="get" action="index.php">
- <input type="hidden" name="action" value="list_tinderd_queue" />
<table>
<tr>
<th>Build</th>
<td>
+ <form method="get" action="index.php">
+ <fieldset>
+ <input type="hidden" name="action" value="list_tinderd_queue" />
<select name="filter_build_id">
<option></option>
<?php foreach($all_builds as $build) {?>
@@ -17,11 +18,30 @@
<?php }?>
</select>
<input type="submit" name="display" value="display" />
+ </fieldset>
+ </form>
+ </td>
+ <td style="background-color: #FFFFFF; width: 20px">&nbsp;</td>
+ <td>
+ <form method="post" action="index.php">
+ <fieldset>
+ <input type="hidden" name="action" value="delete_tinderd_queue" />
+ <input type="hidden" name="filter_build_id" value="<?php echo $build_id?>" />
+ <input type="submit" name="delete_tinderd_queue" value="delete all built" />
+ </fieldset>
+ </form>
+ </td>
+ <td style="background-color: #FFFFFF; width: 20px">&nbsp;</td>
+ <td>
+ <form method="post" action="index.php">
+ <fieldset>
+ <input type="hidden" name="action" value="delete_tinderd_queue" />
+ <input type="submit" name="delete_tinderd_queue" value="delete all" />
+ </fieldset>
+ </form>
</td>
</tr>
</table>
- </form>
-</div>
<?php if($errors){?>
<p style="color:#FF0000">
@@ -30,15 +50,9 @@
<?php }?>
</p>
<?php }?>
-<p>
- <form method="post" action="index.php">
- <input type="hidden" name="action" value="delete_tinderd_queue" />
- <input type="hidden" name="filter_build_id" value="<?php echo $build_id?>" />
- <input type="submit" name="delete_tinderd_queue" value="delete all built" />
- <input type="submit" name="delete_tinderd_queue" value="delete all" />
- </form>
-</p>
-<br />
+
+</div>
+
<table>
<tr>
<th>Build</th>
@@ -52,8 +66,9 @@
<th>&nbsp;</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 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>
</tr>
+ </fieldset>
</form>
<?php if(!$no_list){?>
<?php foreach($entries as $row) {?>
<form method="post" action="index.php">
+ <fieldset>
<input type="hidden" name="action" value="change_tinderd_queue" />
<input type="hidden" name="entry_id" value="<?php echo $row['entry_id']?>" />
<input type="hidden" name="filter_build_id" value="<?php echo $build_id?>" />
@@ -135,6 +152,7 @@
<?php }?>
</td>
</tr>
+ </fieldset>
</form>
<?php }?>
<?php }?>

17
ports-mgmt/tinderbox-devel/files/pkg-message.in
View File

@ -33,3 +33,20 @@ dir-listing.activate = "enable"
=============================================================================
tmpfs options:
To enable the usage of FreeBSD's tmpfs implementation
you need to add the tmpfs kernel module to your
loader.conf
tmpfs_load="YES"
parallels options:
The parallel patch allows to run multiple tinderd instances at the same time.
You can enable multiple tinderd instances via /etc/rc.conf with
tinderd_instances="X"
Both patches are experimental and are not official supported by the Tinderbox
distribution.
=============================================================================

32
ports-mgmt/tinderbox-devel/pkg-descr
View File

@ -1,23 +1,21 @@
Tinderbox is a package building system for FreeBSD ports, based on official
Portbuild scripts used on pointyhat building cluster.
Tinderbox is a package building system for FreeBSD ports, based on
official Portbuild scripts used on pointyhat building cluster.
Tinderbox was written by Joe Marcus Clarke.
You can define multiple jails (base system versions) and multiple portstrees.
The combination of jail and portstree is called a build.
A Tinderbox jail is not what is understood as a jail in FreeBSD, it is in fact
a given world in a chroot. Tinderbox supports automatic tracking of
dependencies and only rebuilds packages that changed since last run. Tinderbox
has support for email notification of failed builds. Tinderbox also integrates
well with ccache.
You can define multiple jails (base system versions) and multiple
portstrees. The combination of jail and portstree is called a build.
A Tinderbox jail is not what is understood as a jail in FreeBSD,
it is in fact a given world in a chroot. Tinderbox supports automatic
tracking of dependencies and only rebuilds packages that changed
since last run. Tinderbox has support for email notification of
failed builds. Tinderbox also integrates well with ccache.
Tinderbox is designed to easily provide package sets of ports you need, for
platforms and architectures you need. Tinderbox is also excellent tool for
testing new ports and port upgrades, especially for testing dependencies and
packing lists. It's also useful for testing ports on various releases of
FreeBSD, since you can run FreeBSD 6.X world as a jail on FreeBSD 7.X/8.X host.
This port contains the devel version (either on the same branch as
ports-mgmt/tinderbox or from HEAD, depending on the status of those branches).
Tinderbox is designed to easily provide package sets of ports you
need, for platforms and architectures you need. Tinderbox is also
excellent tool for testing new ports and port upgrades, especially
for testing dependencies and packing lists. It's also useful for
testing ports on various releases of FreeBSD, since you can run
FreeBSD 6.X world as a jail on FreeBSD 7.X/8.X host.
WWW: http://tinderbox.marcuscom.com/
Author: Joe Marcus Clarke.

21
ports-mgmt/tinderbox-devel/pkg-plist
View File

@ -1,6 +1,11 @@
etc/rc.d/tinderbox
tinderbox/scripts/.version
tinderbox/scripts/Makefile
tinderbox/scripts/README
tinderbox/scripts/contrib/hooks/kse-fix/README.txt
tinderbox/scripts/contrib/hooks/kse-fix/kse-fix.sh
tinderbox/scripts/contrib/hooks/kse-fix/libmap.conf
tinderbox/scripts/contrib/hooks/make-jobs-safe/README.txt
tinderbox/scripts/contrib/hooks/make-jobs-safe/make-jobs-safe.sh
tinderbox/scripts/ds.ph.dist
tinderbox/scripts/etc/env/.keep_me
tinderbox/scripts/etc/rc.d/tinderd
@ -42,18 +47,17 @@ tinderbox/scripts/sql/values.pfr
tinderbox/scripts/tc
tinderbox/scripts/tinderbox.ph.dist
tinderbox/scripts/tinderd
tinderbox/scripts/tools/genpat.pl
tinderbox/scripts/upgrade/.keep_me
tinderbox/scripts/upgrade/build_ports.map
tinderbox/scripts/upgrade/build_ports_queue.map
tinderbox/scripts/upgrade/builds.map
tinderbox/scripts/upgrade/config.map
tinderbox/scripts/upgrade/hooks.map
tinderbox/scripts/upgrade/jails.map
tinderbox/scripts/upgrade/mig_mysql_tinderbox-3.0_to_3.1.sql
tinderbox/scripts/upgrade/mig_mysql_tinderbox-3.1_to_3.2.sql
tinderbox/scripts/upgrade/mig_pgsql_tinderbox-3.0_to_3.1.sql
tinderbox/scripts/upgrade/mig_pgsql_tinderbox-3.1_to_3.2.sql
tinderbox/scripts/upgrade/order.lst
tinderbox/scripts/upgrade/user_permissions.map
%%WEBUI%%tinderbox/scripts/webui/.cvsignore
%%WEBUI%%tinderbox/scripts/webui/core/Build.php
%%WEBUI%%tinderbox/scripts/webui/core/BuildPortsQueue.php
%%WEBUI%%tinderbox/scripts/webui/core/Config.php
@ -67,10 +71,10 @@ tinderbox/scripts/upgrade/user_permissions.map
%%WEBUI%%tinderbox/scripts/webui/core/TinderboxDS.php
%%WEBUI%%tinderbox/scripts/webui/core/User.php
%%WEBUI%%tinderbox/scripts/webui/core/functions.php
%%WEBUI%%tinderbox/scripts/webui/favicon.ico
%%WEBUI%%tinderbox/scripts/webui/inc_ds.php.dist
%%WEBUI%%tinderbox/scripts/webui/inc_tinderbox.php.dist
%%WEBUI%%tinderbox/scripts/webui/index.php
%%WEBUI%%tinderbox/scripts/webui/favicon.ico
%%WEBUI%%tinderbox/scripts/webui/module/module.php
%%WEBUI%%tinderbox/scripts/webui/module/moduleBuildPorts.php
%%WEBUI%%tinderbox/scripts/webui/module/moduleBuilds.php
@ -131,11 +135,16 @@ tinderbox/scripts/upgrade/user_permissions.map
%%WEBUI%%@dirrm tinderbox/scripts/webui/core
%%WEBUI%%@dirrmtry tinderbox/scripts/webui
@dirrm tinderbox/scripts/upgrade
@dirrm tinderbox/scripts/tools
@dirrm tinderbox/scripts/sql
@dirrm tinderbox/scripts/lib/Tinderbox
@dirrm tinderbox/scripts/lib
@dirrm tinderbox/scripts/etc/rc.d
@dirrm tinderbox/scripts/etc/env
@dirrm tinderbox/scripts/etc
@dirrm tinderbox/scripts/contrib/hooks/make-jobs-safe
@dirrm tinderbox/scripts/contrib/hooks/kse-fix
@dirrm tinderbox/scripts/contrib/hooks
@dirrm tinderbox/scripts/contrib
@dirrm tinderbox/scripts
@dirrmtry tinderbox