ports/128785: [patch] ports-mgmt/tinderbox: update to version 3.1.1

Boris Samorodov bsam at FreeBSD.org
Tue Nov 11 13:00:14 UTC 2008 

>Number:         128785
>Category:       ports
>Synopsis:       [patch] ports-mgmt/tinderbox: update to version 3.1.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Nov 11 13:00:13 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Boris Samorodov
>Release:        FreeBSD 8.0-CURRENT i386
>Organization:
InPharmtech, Co.
>Environment:
System: FreeBSD bb.ipt.ru 8.0-CURRENT FreeBSD 8.0-CURRENT #2: Sun Nov 2 02:38:00 MSK 2008 root at bb.ipt.ru:/usr/obj/usr/src/sys/BB i386

>Description:
	A new version of ports-mgmt/tinderbox is available.
>How-To-Repeat:
>Fix:
	All files/patch-* files were removed.
	I didn't change MASTER_SITES, it's up to MAINTAINER either to change it or
	to put a distro at current one. ;-)

--- tinderbox.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/ports-mgmt/tinderbox/Makefile,v
retrieving revision 1.48
diff -u -r1.48 Makefile
--- Makefile	7 Sep 2008 22:29:28 -0000	1.48
+++ Makefile	11 Nov 2008 12:07:34 -0000
@@ -6,8 +6,7 @@
 
 PORTNAME=	tinderbox
 #DISTVERSION=	${PORTVERSION}-${PORTREVISION}
-PORTVERSION=	3.0.0
-PORTREVISION=	2
+PORTVERSION=	3.1.1
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	http://T32.TecNik93.com/FreeBSD/ports/${PORTNAME}/sources/
 #DIST_SUBDIR=	tinderbox
@@ -89,19 +88,13 @@
 	@${RM} -R ${WRKSRC}/webui
 .endif
 
-post-patch:
-	${RM} ${WRKSRC}/lib/Tinderbox/TinderboxDS.pm.orig \
-		${WRKSRC}/lib/tc_command.pl.orig \
-		${WRKSRC}/sql/schema.pgsql.pre.orig \
-		${WRKSRC}/sql/genschema.orig
-
 do-install:
 	@${MKDIR} ${PREFIX}/tinderbox/scripts
 	@${ECHO_CMD} "Installing man pages ..."
 	cd ${WRKSRC}/man/man1 && ${INSTALL_MAN} ${MAN1} ${MAN1PREFIX}/man/man1 && \
 		cd ${WRKSRC} && ${RM} -r ${WRKSRC}/man
 	@${ECHO_CMD} "Installing rc script ..."
-	${INSTALL_SCRIPT} ${WRKSRC}/etc/rc.d/tinderd.sh ${PREFIX}/etc/rc.d/${PORTNAME}
+	${INSTALL_SCRIPT} ${WRKSRC}/etc/rc.d/tinderd ${PREFIX}/etc/rc.d/${PORTNAME}
 	@${ECHO_CMD} "Installing tinderbox ..."
 	${CP} -R ${WRKSRC}/* ${PREFIX}/tinderbox/scripts
 	@${ECHO_CMD} "All Done"
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/ports-mgmt/tinderbox/distinfo,v
retrieving revision 1.19
diff -u -r1.19 distinfo
--- distinfo	3 Sep 2008 12:29:01 -0000	1.19
+++ distinfo	11 Nov 2008 12:07:34 -0000
@@ -1,3 +1,3 @@
-MD5 (tinderbox-3.0.0.tar.gz) = f798417a2a150b6374588846f2658a3e
-SHA256 (tinderbox-3.0.0.tar.gz) = 5c4e66be67c6bf2a5e3efd526b6e6c8dfe020d2c261820436e7c9952cce1b62c
-SIZE (tinderbox-3.0.0.tar.gz) = 118144
+MD5 (tinderbox-3.1.1.tar.gz) = 05fd88070ed603e5ffa10d1d652be886
+SHA256 (tinderbox-3.1.1.tar.gz) = bafffa963ebabf17e52a67fd498925ac39168dfb961aaed0c3e2ed6f8423f950
+SIZE (tinderbox-3.1.1.tar.gz) = 118201
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/ports-mgmt/tinderbox/pkg-plist,v
retrieving revision 1.18
diff -u -r1.18 pkg-plist
--- pkg-plist	7 Sep 2008 22:29:28 -0000	1.18
+++ pkg-plist	11 Nov 2008 12:07:34 -0000
@@ -2,7 +2,7 @@
 tinderbox/scripts/README
 tinderbox/scripts/ds.ph.dist
 tinderbox/scripts/etc/env/.keep_me
-tinderbox/scripts/etc/rc.d/tinderd.sh
+tinderbox/scripts/etc/rc.d/tinderd
 tinderbox/scripts/lib/Tinderbox/Build.pm
 tinderbox/scripts/lib/Tinderbox/BuildPortsQueue.pm
 tinderbox/scripts/lib/Tinderbox/Config.pm
@@ -40,13 +40,14 @@
 tinderbox/scripts/tc
 tinderbox/scripts/tinderbox.ph.dist
 tinderbox/scripts/tinderd
-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_pgsql_tinderbox-3.0_to_3.1.sql
 tinderbox/scripts/upgrade/order.lst
 tinderbox/scripts/upgrade/user_permissions.map
 %%WEBUI%%tinderbox/scripts/webui/core/Build.php
@@ -63,7 +64,6 @@
 %%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
@@ -86,6 +86,7 @@
 %%WEBUI%%tinderbox/scripts/webui/templates/default/list_tinderd_queue.tpl
 %%WEBUI%%tinderbox/scripts/webui/templates/default/messages.inc
 %%WEBUI%%tinderbox/scripts/webui/templates/default/please_login.tpl
+%%WEBUI%%tinderbox/scripts/webui/templates/default/rss.tpl
 %%WEBUI%%tinderbox/scripts/webui/templates/default/tinderstyle.css
 %%WEBUI%%tinderbox/scripts/webui/templates/default/user_admin.tpl
 %%WEBUI%%tinderbox/scripts/webui/templates/default/user_permissions.tpl
Index: files/patch-lib__Tinderbox__TinderboxDS.pm
===================================================================
RCS file: files/patch-lib__Tinderbox__TinderboxDS.pm
diff -N files/patch-lib__Tinderbox__TinderboxDS.pm
--- files/patch-lib__Tinderbox__TinderboxDS.pm	7 Sep 2008 07:41:41 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,33 +0,0 @@
---- ./lib/Tinderbox/TinderboxDS.pm.orig	2008-08-07 07:27:49.000000000 +0300
-+++ ./lib/Tinderbox/TinderboxDS.pm	2008-09-07 09:37:07.000000000 +0300
-@@ -23,7 +23,7 @@
- # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- # SUCH DAMAGE.
- #
--# $MCom: portstools/tinderbox/lib/Tinderbox/TinderboxDS.pm,v 1.88 2008/08/07 04:27:49 marcus Exp $
-+# $MCom: portstools/tinderbox/lib/Tinderbox/TinderboxDS.pm,v 1.88.2.2 2008/09/05 21:07:14 marcus Exp $
- #
- 
- package Tinderbox::TinderboxDS;
-@@ -42,6 +42,7 @@
- use DBI;
- use Carp;
- use Digest::MD5 qw(md5_hex);
-+use POSIX qw(strftime);
- use vars qw(
-     $DB_DRIVER
-     $DB_HOST
-@@ -362,8 +363,12 @@
- sub reorgBuildPortsQueue {
-         my $self = shift;
- 
-+        my $enq_time = time - 25200;
-+        my $enq_sql = strftime("%Y-%m-%d %H:%M:%S", localtime($enq_time));
-+
-         my $rc = $self->_doQuery(
--                "DELETE FROM build_ports_queue WHERE enqueue_date<=NOW()-25200 AND status != 'ENQUEUED'"
-+                "DELETE FROM build_ports_queue WHERE enqueue_date<=? AND status != 'ENQUEUED'",
-+                [$enq_sql]
-         );
- 
-         return $rc;
Index: files/patch-lib__tc_command.pl
===================================================================
RCS file: files/patch-lib__tc_command.pl
diff -N files/patch-lib__tc_command.pl
--- files/patch-lib__tc_command.pl	7 Sep 2008 07:41:41 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
---- ./lib/tc_command.pl.orig	2008-08-15 20:23:07.000000000 +0300
-+++ ./lib/tc_command.pl	2008-09-07 09:37:07.000000000 +0300
-@@ -24,7 +24,7 @@
- # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- # SUCH DAMAGE.
- #
--# $MCom: portstools/tinderbox/lib/tc_command.pl,v 1.150 2008/08/15 17:23:07 marcus Exp $
-+# $MCom: portstools/tinderbox/lib/tc_command.pl,v 1.150.2.1 2008/09/05 21:52:24 marcus Exp $
- #
- 
- my $pb;
-@@ -1668,7 +1668,7 @@
-                             . "\n");
-         } else {
-                 cleanup($ds, 1,
--                        "There is no BuildPortsQueue configured in the datastore.\n"
-+                        "There are no more queued ports for this host in the datastore.\n"
-                 );
-         }
- }
Index: files/patch-sql__genschema
===================================================================
RCS file: files/patch-sql__genschema
diff -N files/patch-sql__genschema
--- files/patch-sql__genschema	7 Sep 2008 07:41:41 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
---- ./sql/genschema.orig	2008-07-25 02:52:33.000000000 +0300
-+++ ./sql/genschema	2008-09-07 09:37:07.000000000 +0300
-@@ -24,7 +24,7 @@
- # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- # SUCH DAMAGE.
- #
--# $MCom: portstools/tinderbox/sql/genschema,v 1.1 2008/07/24 23:52:33 ade Exp $
-+# $MCom: portstools/tinderbox/sql/genschema,v 1.1.2.1 2008/09/05 11:16:29 beat Exp $
- #
- # Create a full-blown schema from a series of files, reducing duplication
- #
-@@ -48,6 +48,6 @@
- # Kick out the generated schema
- #
- cat schema.${dbtype}.pre \
--    values.config values.hooks values.pfp values.pfr \
-+    values.config values.hooks values.pfr values.pfp \
-     schema.${dbtype}.post
- exit 0
Index: files/patch-sql__schema.pgsql.pre
===================================================================
RCS file: files/patch-sql__schema.pgsql.pre
diff -N files/patch-sql__schema.pgsql.pre
--- files/patch-sql__schema.pgsql.pre	7 Sep 2008 07:41:41 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
---- ./sql/schema.pgsql.pre.orig	2008-08-05 02:18:10.000000000 +0300
-+++ ./sql/schema.pgsql.pre	2008-09-07 09:37:07.000000000 +0300
-@@ -99,7 +99,7 @@
- -- DROP TABLE port_dependencies CASCADE;
- CREATE TABLE port_dependencies (
- 	port_dependency_id SERIAL PRIMARY KEY,
--	build_port_id INTEGER REFERENCES build_port(build_port_id) ON UPDATE CASCADE ON DELETE CASCADE,
-+	build_port_id INTEGER REFERENCES build_ports(build_port_id) ON UPDATE CASCADE ON DELETE CASCADE,
- 	port_id INTEGER REFERENCES ports(port_id) ON UPDATE CASCADE ON DELETE CASCADE,
- 	dependency_type VARCHAR(16) CHECK (dependency_type IN ('UNKNOWN', 'EXTRACT_DEPENDS', 'PATCH_DEPENDS', 'FETCH_DEPENDS', 'BUILD_DEPENDS', 'LIB_DEPENDS', 'DEPENDS', 'RUN_DEPENDS')) DEFAULT 'UNKNOWN'
- );
-@@ -109,7 +109,7 @@
- -- DROP TABLE config CASCADE;
- CREATE TABLE config (
- 	config_option_name VARCHAR(255) NOT NULL PRIMARY KEY,
--	config_option_value TEXT,
-+	config_option_value TEXT
- );
- 
- -- DROP TABLE build_ports_queue CASCADE;
--- tinderbox.diff ends here ---

WBR
-- 
bsam
>Release-Note:
>Audit-Trail:
>Unformatted:

More information about the freebsd-ports-bugs mailing list