Date: Fri, 31 Mar 2006 20:03:49 -0500 (EST) From: Rod Taylor <ports@rbt.ca> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/95183: [maintainer-update] www/bricolage upgrade to 1.10.1 Message-ID: <200604010103.k3113nAW063984@home.rbt.ca> Resent-Message-ID: <200604010110.k311AEHa091460@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 95183
>Category: ports
>Synopsis: [maintainer-update] www/bricolage upgrade to 1.10.1
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sat Apr 01 01:10:14 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Rod Taylor
>Release: FreeBSD 6.0-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD home 6.0-RELEASE FreeBSD 6.0-RELEASE #13: Sat Nov 5 00:19:49 EST 2005 root@home:/usr/obj/usr/src/sys/HOME amd64
>Description:
Update bricolage from 1.10.0 to 1.10.1.
Note the removal of many patches under files/.
>How-To-Repeat:
>Fix:
--- bricolage.patch begins here ---
diff -crN bricolage.orig/Makefile bricolage/Makefile
*** bricolage.orig/Makefile Sat Feb 11 20:59:05 2006
--- bricolage/Makefile Fri Mar 31 19:47:22 2006
***************
*** 6,12 ****
#
PORTNAME= bricolage
! PORTVERSION= 1.10.0
CATEGORIES= www perl5
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= bricolage
--- 6,12 ----
#
PORTNAME= bricolage
! PORTVERSION= 1.10.1
CATEGORIES= www perl5
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= bricolage
***************
*** 64,74 ****
# in the same order as found within inst/versions.txt
#
# Skip 1.8.5
! PREVIOUS_VERSIONS= 1.8.0 1.8.1 1.8.2 1.8.3 1.8.4 1.8.6 1.8.7 1.8.8 1.8.9 1.9.0 1.9.1 1.10.0
- USE_REINPLACE= yes
PERL_CONFIGURE= yes
PKGMESSAGE= ${WRKDIR}/pkg-message
.include <bsd.port.pre.mk>
--- 64,75 ----
# in the same order as found within inst/versions.txt
#
# Skip 1.8.5
! PREVIOUS_VERSIONS= 1.8.0 1.8.1 1.8.2 1.8.3 1.8.4 1.8.6 1.8.7 1.8.8 1.8.9 1.9.0 1.9.1 1.10.0 1.10.1
PERL_CONFIGURE= yes
PKGMESSAGE= ${WRKDIR}/pkg-message
+
+ INSTALL_TARGET= install_files
.include <bsd.port.pre.mk>
diff -crN bricolage.orig/distinfo bricolage/distinfo
*** bricolage.orig/distinfo Sat Feb 11 16:50:01 2006
--- bricolage/distinfo Fri Mar 31 18:30:36 2006
***************
*** 1,3 ****
! MD5 (bricolage-1.10.0.tar.gz) = 5bbdc7906d00e74e444c17c6113500ea
! SHA256 (bricolage-1.10.0.tar.gz) = 6e1e42a0c868047b75a87cb907fae04a3dee310f6d355b4540f98a2449c96862
! SIZE (bricolage-1.10.0.tar.gz) = 2678377
--- 1,3 ----
! MD5 (bricolage-1.10.1.tar.gz) = 530150a73a2b42f4e635400099d97913
! SHA256 (bricolage-1.10.1.tar.gz) = c9947a8b033b217b7ff181471cc0345d035543e1b8c1ddfc8572ba95ded3ba0b
! SIZE (bricolage-1.10.1.tar.gz) = 2697406
diff -crN bricolage.orig/files/bric_upgrade.sh bricolage/files/bric_upgrade.sh
*** bricolage.orig/files/bric_upgrade.sh Sat Feb 11 16:50:01 2006
--- bricolage/files/bric_upgrade.sh Fri Mar 31 19:48:06 2006
***************
*** 12,18 ****
# Ensure the old version exists at the end of the argument list
OLDVERSION=`echo "$*" | sed -e "s/^.* \([^ ]*\)/\1/"`
! VTEST=`echo "$OLDVERSION" | sed -e "s/^1\.8\.[01234678]$/OKAY/"`
if [ "${VTEST}" != "OKAY" ]
then
echo "Version $OLDVERSION unknown."
--- 12,18 ----
# Ensure the old version exists at the end of the argument list
OLDVERSION=`echo "$*" | sed -e "s/^.* \([^ ]*\)/\1/"`
! VTEST=`echo "$OLDVERSION" | sed -e 's/^1\.8\.[01234678]$/OKAY/' -e 's/^1\.10\.[0]$/OKAY/'`
if [ "${VTEST}" != "OKAY" ]
then
echo "Version $OLDVERSION unknown."
diff -crN bricolage.orig/files/patch-Makefile bricolage/files/patch-Makefile
*** bricolage.orig/files/patch-Makefile Sat Feb 11 16:50:01 2006
--- bricolage/files/patch-Makefile Fri Mar 31 18:35:55 2006
***************
*** 1,7 ****
! *** Makefile.orig Tue Jan 17 19:09:49 2006
! --- Makefile Tue Jan 31 23:12:14 2006
***************
! *** 18,24 ****
#
# Set the location of Perl.
--- 1,7 ----
! *** Makefile.orig Fri Mar 17 19:26:34 2006
! --- Makefile Fri Mar 31 18:35:33 2006
***************
! *** 19,25 ****
#
# Set the location of Perl.
***************
*** 9,15 ****
# Blank by default, but set to QUIET to ask essential questions only
INSTALL_VERBOSITY?= STANDARD
! --- 18,24 ----
#
# Set the location of Perl.
--- 9,15 ----
# Blank by default, but set to QUIET to ask essential questions only
INSTALL_VERBOSITY?= STANDARD
! --- 19,25 ----
#
# Set the location of Perl.
***************
*** 18,41 ****
# Blank by default, but set to QUIET to ask essential questions only
INSTALL_VERBOSITY?= STANDARD
***************
! *** 161,167 ****
! # installation rules #
! ##########################
!
! ! install : all is_root cpan lib bin files db db_grant done
!
! is_root : inst/is_root.pl
! $(PERL) inst/is_root.pl
! --- 161,167 ----
! # installation rules #
! ##########################
!
! ! install : all is_root cpan lib bin files done
!
! is_root : inst/is_root.pl
! $(PERL) inst/is_root.pl
! ***************
! *** 171,190 ****
lib :
-rm -f lib/Makefile
--- 18,24 ----
# Blank by default, but set to QUIET to ask essential questions only
INSTALL_VERBOSITY?= STANDARD
***************
! *** 184,203 ****
lib :
-rm -f lib/Makefile
***************
*** 56,62 ****
done : bconf/bricolage.conf db files bin lib cpan
$(PERL) inst/done.pl
! --- 171,190 ----
lib :
-rm -f lib/Makefile
--- 39,45 ----
done : bconf/bricolage.conf db files bin lib cpan
$(PERL) inst/done.pl
! --- 184,203 ----
lib :
-rm -f lib/Makefile
diff -crN bricolage.orig/files/patch-inst::db_upgrade.pl bricolage/files/patch-inst::db_upgrade.pl
*** bricolage.orig/files/patch-inst::db_upgrade.pl Sat Feb 11 16:50:01 2006
--- bricolage/files/patch-inst::db_upgrade.pl Wed Dec 31 19:00:00 1969
***************
*** 1,19 ****
- *** inst/db_upgrade.pl.orig Fri Sep 16 19:50:20 2005
- --- inst/db_upgrade.pl Fri Feb 3 19:47:06 2006
- ***************
- *** 73,79 ****
- next unless -d $dir;
-
- opendir(DIR, $dir) or die "can't opendir $dir: $!";
- ! my @scripts = grep { -f $_ } map { catfile($dir, $_) } sort readdir(DIR);
- closedir DIR;
-
- foreach my $script (@scripts) {
- --- 73,79 ----
- next unless -d $dir;
-
- opendir(DIR, $dir) or die "can't opendir $dir: $!";
- ! my @scripts = grep { -f $_ and $_ =~ /\.pl$/ } map { catfile($dir, $_) } sort readdir(DIR);
- closedir DIR;
-
- foreach my $script (@scripts) {
--- 0 ----
diff -crN bricolage.orig/files/patch-inst::defaults::freebsd bricolage/files/patch-inst::defaults::freebsd
*** bricolage.orig/files/patch-inst::defaults::freebsd Sat Feb 11 16:50:01 2006
--- bricolage/files/patch-inst::defaults::freebsd Wed Dec 31 19:00:00 1969
***************
*** 1,65 ****
- *** inst/defaults/freebsd.orig Sat Jan 28 14:09:16 2006
- --- inst/defaults/freebsd Sat Jan 28 14:06:59 2006
- ***************
- *** 0 ****
- --- 1,60 ----
- + # Required programs. PG_CONFIG_PATH is the location of PostgreSQL's pg_config
- + # script. APACHE_PATH is the path to the Apache 1.3 executable. APACHE_EXE is
- + # the filename of the executable itself. EXPAT_PATH is the path to the Expat
- + # library libexpat.so (also looks in library paths that Perl knows about), and
- + # EXPAT_FILE is the filename of the library.
- +
- + PG_CONFIG_PATH = /usr/local/pgsql/bin, /usr/local/postgres/bin, /usr/lib/postgresql/bin, /opt/pgsql/bin, /usr/local/bin, /usr/local/sbin, /usr/bin, /usr/sbin, /bin
- + APACHE_PATH = /usr/local/apache/bin, /usr/local/bin, /usr/local/sbin, /usr/bin, /usr/sbin, /bin
- + APACHE_EXE = httpd, httpsd, apache-perl, apache
- + EXPAT_PATH = /sw/lib
- + EXPAT_FILE = libexpat.so, libexpat.so.0, libexpat.so.0.0.1, libexpat.dylib, libexpat.0.dylib, libexpat.0.0.1.dylib, libexpat.a, libexpat.la
- +
- + # Apache settings. APACHE_USER and APACHE_GROUP are the user and group that
- + # the Apache process will run as. APACHE_PORT is the port that Apache will
- + # listen on. APACHE_SSL_PORT is the port that will listen for https requests.
- + # APACHE_HOSTNAME is the server's hostname; only set this if you want to
- + # override the value returned by the "hostname" command.
- +
- + APACHE_USER = www
- + APACHE_GROUP = www
- + APACHE_PORT = 80
- + APACHE_SSL_PORT = 443
- + # APACHE_HOSTNAME = localhost
- +
- + # PostgreSQL settings. POSTGRES_SUPERUSER is the username of the Postgres
- + # superuser (typically "postgres"). POSTGRES_BRICUSER is the username that
- + # Bricolage will use when connecting to the database. This can be anything
- + # you want, but "bric" is typical. POSTGRES_DB is the name of the database
- + # Bricolage will use.
- + #
- + # In most installations, Postgres allows local users to access the
- + # server without a username. If your server requires a password, pass the
- + # POSTGRES_SUPERPASS environment variable during "make," e.g.:
- + #
- + # make POSTGRES_SUPERPASS=abcdef
- + #
- + # The Bricolage Postgres Password (the password used by Bricolage to
- + # connect to the database) is randomly generated during a silent install. If
- + # you need it, it'll be in bricolage.conf after installation.
- + #
- + # If PostgreSQL is running on a separate box, you must pass a host name or
- + # IP address to "make" through the POSTGRES_HOSTNAME environment variable.
- + # If it's running on a port other than the default port (5432), pass the
- + # appropriate port number with POSTGRES_HOSTPORT.
- +
- + POSTGRES_SUPERUSER = pgsql
- + POSTGRES_BRICUSER = bric
- + POSTGRES_DB = bric
- +
- + # Installation locations.
- +
- + BRICOLAGE_ROOT_DIR = /usr/local/bricolage # Bricolage Root Directory
- + BRICOLAGE_TMP_DIR = /usr/local/bricolage/tmp # Temporary Directory
- + BRICOLAGE_PERL_DIR = /usr/local/bricolage/lib # Perl Module Directory
- + BRICOLAGE_BIN_DIR = /usr/local/bricolage/bin # Executable Directory
- + BRICOLAGE_MAN_DIR = /usr/local/bricolage/man # Man-Page Directory (! to skip)
- + BRICOLAGE_LOG_DIR = /usr/local/bricolage/log # Log Directory
- + BRICOLAGE_PID = /usr/local/bricolage/log/httpd.pid # PID File Location
- + BRICOLAGE_COMP_DIR = /usr/local/bricolage/comp # Mason Component Directory
- + BRICOLAGE_DATA_DIR = /usr/local/bricolage/data # Mason Data Directory
--- 0 ----
diff -crN bricolage.orig/files/patch-inst::upgrade::1.8.9::add_element_member_fks.pl bricolage/files/patch-inst::upgrade::1.8.9::add_element_member_fks.pl
*** bricolage.orig/files/patch-inst::upgrade::1.8.9::add_element_member_fks.pl Sat Feb 11 16:50:01 2006
--- bricolage/files/patch-inst::upgrade::1.8.9::add_element_member_fks.pl Wed Dec 31 19:00:00 1969
***************
*** 1,19 ****
- *** inst/upgrade/1.8.9/add_element_member_fks.pl.orig Mon Oct 31 13:31:35 2005
- --- inst/upgrade/1.8.9/add_element_member_fks.pl Fri Feb 3 18:06:48 2006
- ***************
- *** 7,13 ****
- use bric_upgrade qw(:all);
-
- exit unless test_table 'element_member';
- ! exit if test_constraint 'element_member', 'fk_member__at_member';
-
- do_sql
- q{ DELETE FROM element_member
- --- 7,13 ----
- use bric_upgrade qw(:all);
-
- exit unless test_table 'element_member';
- ! exit if test_foreign_key 'element_member', 'fk_member__at_member';
-
- do_sql
- q{ DELETE FROM element_member
--- 0 ----
diff -crN bricolage.orig/files/patch-inst::upgrade::1.8.9::fix_publish_status.pl bricolage/files/patch-inst::upgrade::1.8.9::fix_publish_status.pl
*** bricolage.orig/files/patch-inst::upgrade::1.8.9::fix_publish_status.pl Sat Feb 11 16:50:01 2006
--- bricolage/files/patch-inst::upgrade::1.8.9::fix_publish_status.pl Wed Dec 31 19:00:00 1969
***************
*** 1,69 ****
- *** inst/upgrade/1.8.9/fix_publish_status.pl.orig Thu Jan 19 16:07:05 2006
- --- inst/upgrade/1.8.9/fix_publish_status.pl Fri Feb 3 18:05:32 2006
- ***************
- *** 6,17 ****
- use lib catdir $FindBin::Bin, updir, 'lib';
- use bric_upgrade qw(:all);
-
- for my $thing (qw(story media)) {
- do_sql
- qq{UPDATE $thing
- ! SET publish_status = '1'
- WHERE published_version IS NOT NULL
- ! AND publish_status = '0'
- },
-
- # We have no idea what version was actually published, so
- --- 6,23 ----
- use lib catdir $FindBin::Bin, updir, 'lib';
- use bric_upgrade qw(:all);
-
- + # Later versions will have booleans instead of NUMERIC.
- + my ($true, $false)
- + = test_column('story', 'publish_status', undef, undef, 'boolean')
- + ? qw(TRUE FALSE)
- + : qw( 1 0 );
- +
- for my $thing (qw(story media)) {
- do_sql
- qq{UPDATE $thing
- ! SET publish_status = $true
- WHERE published_version IS NOT NULL
- ! AND publish_status = $false
- },
-
- # We have no idea what version was actually published, so
- ***************
- *** 19,25 ****
- qq{UPDATE $thing
- SET published_version = current_version
- WHERE published_version IS NULL
- ! AND publish_status = '1'
- },
-
- # We don't know if it has been published since the first
- --- 25,31 ----
- qq{UPDATE $thing
- SET published_version = current_version
- WHERE published_version IS NULL
- ! AND publish_status = $true
- },
-
- # We don't know if it has been published since the first
- ***************
- *** 39,45 ****
-
- # Remove the publish_status when there are no publish dates.
- qq{UPDATE $thing
- ! SET publish_status = '0'
- WHERE publish_date IS NULL
- },
- ;
- --- 45,51 ----
-
- # Remove the publish_status when there are no publish dates.
- qq{UPDATE $thing
- ! SET publish_status = $false
- WHERE publish_date IS NULL
- },
- ;
--- 0 ----
diff -crN bricolage.orig/files/patch-inst::upgrade::1.8.9::update_publish_status_check.pl bricolage/files/patch-inst::upgrade::1.8.9::update_publish_status_check.pl
*** bricolage.orig/files/patch-inst::upgrade::1.8.9::update_publish_status_check.pl Sat Feb 11 16:50:01 2006
--- bricolage/files/patch-inst::upgrade::1.8.9::update_publish_status_check.pl Wed Dec 31 19:00:00 1969
***************
*** 1,78 ****
- *** inst/upgrade/1.8.9/update_publish_status_check.pl.orig Thu Jan 19 16:07:05 2006
- --- inst/upgrade/1.8.9/update_publish_status_check.pl Fri Feb 3 18:05:49 2006
- ***************
- *** 9,35 ****
- # Skip it for later versions of Bricolage.
- exit unless test_constraint 'story', 'ck_story__publish_status';
-
- for my $thing (qw(story media)) {
- do_sql
- qq{ALTER TABLE $thing DROP CONSTRAINT ck_$thing\__publish_status},
-
- ! qq{ALTER TABLE $thing
- ! ADD CONSTRAINT ck_$thing\__publish_status CHECK (
- ! publish_status IN (0,1)
- ! AND (
- (
- ! publish_status = 0
- AND publish_date IS NULL
- AND first_publish_date IS NULL
- )
- OR (
- ! publish_status = 1
- AND publish_date IS NOT NULL
- AND first_publish_date IS NOT NULL
- )
- )
- ! )
- ! },
- ;
- }
-
- --- 9,54 ----
- # Skip it for later versions of Bricolage.
- exit unless test_constraint 'story', 'ck_story__publish_status';
-
- + # Later versions will have booleans instead of NUMERIC.
- + my $bool = test_column('story', 'publish_status', undef, undef, 'boolean');
- +
- for my $thing (qw(story media)) {
- do_sql
- qq{ALTER TABLE $thing DROP CONSTRAINT ck_$thing\__publish_status},
-
- ! ($bool
- ! ? qq{ALTER TABLE $thing
- ! ADD CONSTRAINT ck_$thing\__publish_status CHECK (
- (
- ! publish_status = FALSE
- AND publish_date IS NULL
- AND first_publish_date IS NULL
- )
- OR (
- ! publish_status = TRUE
- AND publish_date IS NOT NULL
- AND first_publish_date IS NOT NULL
- )
- )
- ! }
- ! : qq{ALTER TABLE $thing
- ! ADD CONSTRAINT ck_$thing\__publish_status CHECK (
- ! publish_status IN (0, 1)
- ! AND (
- ! (
- ! publish_status = 0
- ! AND publish_date IS NULL
- ! AND first_publish_date IS NULL
- ! )
- ! OR (
- ! publish_status = 1
- ! AND publish_date IS NOT NULL
- ! AND first_publish_date IS NOT NULL
- ! )
- ! )
- ! )
- ! }
- ! )
- ;
- }
-
--- 0 ----
diff -crN bricolage.orig/files/patch-inst::upgrade::1.9.0::no_more_numeric.pl bricolage/files/patch-inst::upgrade::1.9.0::no_more_numeric.pl
*** bricolage.orig/files/patch-inst::upgrade::1.9.0::no_more_numeric.pl Sat Feb 11 16:50:01 2006
--- bricolage/files/patch-inst::upgrade::1.9.0::no_more_numeric.pl Wed Dec 31 19:00:00 1969
***************
*** 1,17 ****
- *** inst/upgrade/1.9.0/no_more_numeric.pl.orig Wed Aug 17 18:20:34 2005
- --- inst/upgrade/1.9.0/no_more_numeric.pl Fri Feb 3 19:44:17 2006
- ***************
- *** 101,106 ****
- --- 101,112 ----
- $last =~ s/,$// if $_ =~ /^\);/;
- }
-
- + # Fix incompatible checks.
- + if (/ck_(?:story|media)__publish_status/) {
- + s/\(0\)::integer/FALSE/g;
- + s/\(1\)::integer/TRUE/g;
- + }
- +
- # Print the previouis line.
- print NEW $last;
- $last = $_;
--- 0 ----
diff -crN bricolage.orig/files/patch-inst::upgrade::1.9.1::rename_element_table.pl bricolage/files/patch-inst::upgrade::1.9.1::rename_element_table.pl
*** bricolage.orig/files/patch-inst::upgrade::1.9.1::rename_element_table.pl Sat Feb 11 16:50:01 2006
--- bricolage/files/patch-inst::upgrade::1.9.1::rename_element_table.pl Wed Dec 31 19:00:00 1969
***************
*** 1,19 ****
- *** inst/upgrade/1.9.1/rename_element_table.pl.orig Mon Dec 19 15:37:14 2005
- --- inst/upgrade/1.9.1/rename_element_table.pl Fri Feb 3 18:51:54 2006
- ***************
- *** 123,129 ****
- q{ALTER TABLE element_type__site ALTER COLUMN id
- SET DEFAULT NEXTVAL('seq_element_type__site')},
- q{ALTER TABLE element_type__site DROP CONSTRAINT } . (
- ! test_primary_key('element__site_pkey', 'element_type__site')
- ? 'element__site_pkey'
- : 'pk_element__site__id'
- ),
- --- 123,129 ----
- q{ALTER TABLE element_type__site ALTER COLUMN id
- SET DEFAULT NEXTVAL('seq_element_type__site')},
- q{ALTER TABLE element_type__site DROP CONSTRAINT } . (
- ! test_primary_key('element_type__site', 'element__site_pkey')
- ? 'element__site_pkey'
- : 'pk_element__site__id'
- ),
--- 0 ----
diff -crN bricolage.orig/files/patch-inst::upgrade::1.9.1::rename_instance_column.pl bricolage/files/patch-inst::upgrade::1.9.1::rename_instance_column.pl
*** bricolage.orig/files/patch-inst::upgrade::1.9.1::rename_instance_column.pl Sat Feb 11 16:50:01 2006
--- bricolage/files/patch-inst::upgrade::1.9.1::rename_instance_column.pl Wed Dec 31 19:00:00 1969
***************
*** 1,19 ****
- *** inst/upgrade/1.9.1/rename_instance_column.pl.orig Mon Oct 3 15:30:43 2005
- --- inst/upgrade/1.9.1/rename_instance_column.pl Fri Feb 3 17:04:48 2006
- ***************
- *** 49,55 ****
- ALTER TABLE media_container_tile
- ADD CONSTRAINT fk_mc_tile__related_story
- FOREIGN KEY (related_story__id)
- ! REFERENCES media(id) ON DELETE CASCADE
- },
-
- # Add FK constraint for mediacontainer_tile.related_media__id
- --- 49,55 ----
- ALTER TABLE media_container_tile
- ADD CONSTRAINT fk_mc_tile__related_story
- FOREIGN KEY (related_story__id)
- ! REFERENCES story(id) ON DELETE CASCADE
- },
-
- # Add FK constraint for mediacontainer_tile.related_media__id
--- 0 ----
diff -crN bricolage.orig/files/patch-inst::upgrade::1.9.1::ze_job_iz_versioned.pl bricolage/files/patch-inst::upgrade::1.9.1::ze_job_iz_versioned.pl
*** bricolage.orig/files/patch-inst::upgrade::1.9.1::ze_job_iz_versioned.pl Sat Feb 11 16:50:01 2006
--- bricolage/files/patch-inst::upgrade::1.9.1::ze_job_iz_versioned.pl Wed Dec 31 19:00:00 1969
***************
*** 1,40 ****
- *** inst/upgrade/1.9.1/ze_job_iz_versioned.pl.orig Sat Feb 4 10:09:39 2006
- --- inst/upgrade/1.9.1/ze_job_iz_versioned.pl Sat Feb 4 10:13:13 2006
- ***************
- *** 18,24 ****
- # set, even though they've been published.
- q{UPDATE story
- SET published_version = COALESCE(s.published_version, s.current_version),
- ! publish_status = '1'
- FROM job j, story s
- WHERE story.id = s.id
- AND j.story_instance__id = s.id
- --- 18,26 ----
- # set, even though they've been published.
- q{UPDATE story
- SET published_version = COALESCE(s.published_version, s.current_version),
- ! publish_status = '1',
- ! first_publish_date = COALESCE(s.first_publish_date, s.publish_date, CURRENT_TIMESTAMP),
- ! publish_date = COALESCE(s.publish_date, s.first_publish_date, CURRENT_TIMESTAMP)
- FROM job j, story s
- WHERE story.id = s.id
- AND j.story_instance__id = s.id
- ***************
- *** 30,36 ****
-
- q{UPDATE media
- SET published_version = COALESCE(m.published_version, m.current_version),
- ! publish_status = '1'
- FROM job j, media m
- WHERE media.id = m.id
- AND j.media_instance__id = m.id
- --- 32,40 ----
-
- q{UPDATE media
- SET published_version = COALESCE(m.published_version, m.current_version),
- ! publish_status = '1',
- ! first_publish_date = COALESCE(m.first_publish_date, m.publish_date, CURRENT_TIMESTAMP),
- ! publish_date = COALESCE(m.publish_date, m.first_publish_date, CURRENT_TIMESTAMP)
- FROM job j, media m
- WHERE media.id = m.id
- AND j.media_instance__id = m.id
--- 0 ----
diff -crN bricolage.orig/files/patch-inst::upgrade::lib::bric_upgrade.pm bricolage/files/patch-inst::upgrade::lib::bric_upgrade.pm
*** bricolage.orig/files/patch-inst::upgrade::lib::bric_upgrade.pm Sat Feb 11 16:50:01 2006
--- bricolage/files/patch-inst::upgrade::lib::bric_upgrade.pm Wed Dec 31 19:00:00 1969
***************
*** 1,12 ****
- *** inst/upgrade/lib/bric_upgrade.pm.orig Mon Dec 19 15:37:14 2005
- --- inst/upgrade/lib/bric_upgrade.pm Fri Feb 3 18:06:02 2006
- ***************
- *** 288,293 ****
- --- 288,294 ----
- exit if test_column $table_name, $column_name, $min_size;
- exit if test_column $table_name, $column_name, undef, $not_null;
- exit if test_column $table_name, $column_name, $min_size, $not_null;
- + exit if test_column $table_name, $column_name, $min_size, $not_null, $type;
-
- This function returns true if the specified column exists in specified table
- in the Bricolage database, and false if it does not. Use C<test_column()> in
--- 0 ----
diff -crN bricolage.orig/files/patch-inst_db_upgrade.pl bricolage/files/patch-inst_db_upgrade.pl
*** bricolage.orig/files/patch-inst_db_upgrade.pl Sat Feb 11 21:06:54 2006
--- bricolage/files/patch-inst_db_upgrade.pl Wed Dec 31 19:00:00 1969
***************
*** 1,19 ****
- *** inst/db_upgrade.pl.orig Fri Sep 16 19:50:20 2005
- --- inst/db_upgrade.pl Fri Feb 3 19:47:06 2006
- ***************
- *** 73,79 ****
- next unless -d $dir;
-
- opendir(DIR, $dir) or die "can't opendir $dir: $!";
- ! my @scripts = grep { -f $_ } map { catfile($dir, $_) } sort readdir(DIR);
- closedir DIR;
-
- foreach my $script (@scripts) {
- --- 73,79 ----
- next unless -d $dir;
-
- opendir(DIR, $dir) or die "can't opendir $dir: $!";
- ! my @scripts = grep { -f $_ and $_ =~ /\.pl$/ } map { catfile($dir, $_) } sort readdir(DIR);
- closedir DIR;
-
- foreach my $script (@scripts) {
--- 0 ----
diff -crN bricolage.orig/files/patch-inst_defaults_freebsd bricolage/files/patch-inst_defaults_freebsd
*** bricolage.orig/files/patch-inst_defaults_freebsd Sat Feb 11 21:06:54 2006
--- bricolage/files/patch-inst_defaults_freebsd Wed Dec 31 19:00:00 1969
***************
*** 1,65 ****
- *** inst/defaults/freebsd.orig Sat Jan 28 14:09:16 2006
- --- inst/defaults/freebsd Sat Jan 28 14:06:59 2006
- ***************
- *** 0 ****
- --- 1,60 ----
- + # Required programs. PG_CONFIG_PATH is the location of PostgreSQL's pg_config
- + # script. APACHE_PATH is the path to the Apache 1.3 executable. APACHE_EXE is
- + # the filename of the executable itself. EXPAT_PATH is the path to the Expat
- + # library libexpat.so (also looks in library paths that Perl knows about), and
- + # EXPAT_FILE is the filename of the library.
- +
- + PG_CONFIG_PATH = /usr/local/pgsql/bin, /usr/local/postgres/bin, /usr/lib/postgresql/bin, /opt/pgsql/bin, /usr/local/bin, /usr/local/sbin, /usr/bin, /usr/sbin, /bin
- + APACHE_PATH = /usr/local/apache/bin, /usr/local/bin, /usr/local/sbin, /usr/bin, /usr/sbin, /bin
- + APACHE_EXE = httpd, httpsd, apache-perl, apache
- + EXPAT_PATH = /sw/lib
- + EXPAT_FILE = libexpat.so, libexpat.so.0, libexpat.so.0.0.1, libexpat.dylib, libexpat.0.dylib, libexpat.0.0.1.dylib, libexpat.a, libexpat.la
- +
- + # Apache settings. APACHE_USER and APACHE_GROUP are the user and group that
- + # the Apache process will run as. APACHE_PORT is the port that Apache will
- + # listen on. APACHE_SSL_PORT is the port that will listen for https requests.
- + # APACHE_HOSTNAME is the server's hostname; only set this if you want to
- + # override the value returned by the "hostname" command.
- +
- + APACHE_USER = www
- + APACHE_GROUP = www
- + APACHE_PORT = 80
- + APACHE_SSL_PORT = 443
- + # APACHE_HOSTNAME = localhost
- +
- + # PostgreSQL settings. POSTGRES_SUPERUSER is the username of the Postgres
- + # superuser (typically "postgres"). POSTGRES_BRICUSER is the username that
- + # Bricolage will use when connecting to the database. This can be anything
- + # you want, but "bric" is typical. POSTGRES_DB is the name of the database
- + # Bricolage will use.
- + #
- + # In most installations, Postgres allows local users to access the
- + # server without a username. If your server requires a password, pass the
- + # POSTGRES_SUPERPASS environment variable during "make," e.g.:
- + #
- + # make POSTGRES_SUPERPASS=abcdef
- + #
- + # The Bricolage Postgres Password (the password used by Bricolage to
- + # connect to the database) is randomly generated during a silent install. If
- + # you need it, it'll be in bricolage.conf after installation.
- + #
- + # If PostgreSQL is running on a separate box, you must pass a host name or
- + # IP address to "make" through the POSTGRES_HOSTNAME environment variable.
- + # If it's running on a port other than the default port (5432), pass the
- + # appropriate port number with POSTGRES_HOSTPORT.
- +
- + POSTGRES_SUPERUSER = pgsql
- + POSTGRES_BRICUSER = bric
- + POSTGRES_DB = bric
- +
- + # Installation locations.
- +
- + BRICOLAGE_ROOT_DIR = /usr/local/bricolage # Bricolage Root Directory
- + BRICOLAGE_TMP_DIR = /usr/local/bricolage/tmp # Temporary Directory
- + BRICOLAGE_PERL_DIR = /usr/local/bricolage/lib # Perl Module Directory
- + BRICOLAGE_BIN_DIR = /usr/local/bricolage/bin # Executable Directory
- + BRICOLAGE_MAN_DIR = /usr/local/bricolage/man # Man-Page Directory (! to skip)
- + BRICOLAGE_LOG_DIR = /usr/local/bricolage/log # Log Directory
- + BRICOLAGE_PID = /usr/local/bricolage/log/httpd.pid # PID File Location
- + BRICOLAGE_COMP_DIR = /usr/local/bricolage/comp # Mason Component Directory
- + BRICOLAGE_DATA_DIR = /usr/local/bricolage/data # Mason Data Directory
--- 0 ----
diff -crN bricolage.orig/files/patch-inst_postgres.pl bricolage/files/patch-inst_postgres.pl
*** bricolage.orig/files/patch-inst_postgres.pl Sat Feb 11 20:59:06 2006
--- bricolage/files/patch-inst_postgres.pl Wed Dec 31 19:00:00 1969
***************
*** 1,17 ****
- --- inst/postgres.pl.orig Sun Feb 12 12:39:15 2006
- +++ inst/postgres.pl Sun Feb 12 12:39:32 2006
- @@ -133,14 +133,9 @@
- ask_password("Postgres Root Password (leave empty for no password)",
- \$PG{root_pass}, $QUIET);
-
- - while(1) {
- $PG{system_user} = $PG{root_user};
- ask_confirm("Postgres System Username", \$PG{system_user}, $QUIET);
- $PG{system_user_uid} = (getpwnam($PG{system_user}))[2];
- - last if defined $PG{system_user_uid};
- - print "User \"$PG{system_user}\" not found! This user must exist ".
- - "on your system.\n";
- - }
-
- while(1) {
- ask_confirm("Bricolage Postgres Username", \$PG{sys_user}, $QUIET);
--- 0 ----
diff -crN bricolage.orig/files/patch-inst_upgrade_1.8.9_add_element_member_fks.pl bricolage/files/patch-inst_upgrade_1.8.9_add_element_member_fks.pl
*** bricolage.orig/files/patch-inst_upgrade_1.8.9_add_element_member_fks.pl Sat Feb 11 20:59:06 2006
--- bricolage/files/patch-inst_upgrade_1.8.9_add_element_member_fks.pl Wed Dec 31 19:00:00 1969
***************
*** 1,11 ****
- --- inst/upgrade/1.8.9/add_element_member_fks.pl.orig Tue Nov 1 05:31:35 2005
- +++ inst/upgrade/1.8.9/add_element_member_fks.pl Thu Feb 9 02:17:16 2006
- @@ -7,7 +7,7 @@ use lib catdir $FindBin::Bin, updir, 'li
- use bric_upgrade qw(:all);
-
- exit unless test_table 'element_member';
- -exit if test_constraint 'element_member', 'fk_member__at_member';
- +exit if test_foreign_key 'element_member', 'fk_member__at_member';
-
- do_sql
- q{ DELETE FROM element_member
--- 0 ----
diff -crN bricolage.orig/files/patch-inst_upgrade_1.8.9_fix_publish_status.pl bricolage/files/patch-inst_upgrade_1.8.9_fix_publish_status.pl
*** bricolage.orig/files/patch-inst_upgrade_1.8.9_fix_publish_status.pl Sat Feb 11 20:59:06 2006
--- bricolage/files/patch-inst_upgrade_1.8.9_fix_publish_status.pl Wed Dec 31 19:00:00 1969
***************
*** 1,41 ****
- --- inst/upgrade/1.8.9/fix_publish_status.pl.orig Fri Jan 20 08:07:05 2006
- +++ inst/upgrade/1.8.9/fix_publish_status.pl Thu Feb 9 02:17:16 2006
- @@ -6,12 +6,18 @@ use FindBin;
- use lib catdir $FindBin::Bin, updir, 'lib';
- use bric_upgrade qw(:all);
-
- +# Later versions will have booleans instead of NUMERIC.
- +my ($true, $false)
- + = test_column('story', 'publish_status', undef, undef, 'boolean')
- + ? qw(TRUE FALSE)
- + : qw( 1 0 );
- +
- for my $thing (qw(story media)) {
- do_sql
- qq{UPDATE $thing
- - SET publish_status = '1'
- + SET publish_status = $true
- WHERE published_version IS NOT NULL
- - AND publish_status = '0'
- + AND publish_status = $false
- },
-
- # We have no idea what version was actually published, so
- @@ -19,7 +25,7 @@ for my $thing (qw(story media)) {
- qq{UPDATE $thing
- SET published_version = current_version
- WHERE published_version IS NULL
- - AND publish_status = '1'
- + AND publish_status = $true
- },
-
- # We don't know if it has been published since the first
- @@ -39,7 +45,7 @@ for my $thing (qw(story media)) {
-
- # Remove the publish_status when there are no publish dates.
- qq{UPDATE $thing
- - SET publish_status = '0'
- + SET publish_status = $false
- WHERE publish_date IS NULL
- },
- ;
--- 0 ----
diff -crN bricolage.orig/files/patch-inst_upgrade_1.8.9_update_publish_status_check.pl bricolage/files/patch-inst_upgrade_1.8.9_update_publish_status_check.pl
*** bricolage.orig/files/patch-inst_upgrade_1.8.9_update_publish_status_check.pl Sat Feb 11 20:59:06 2006
--- bricolage/files/patch-inst_upgrade_1.8.9_update_publish_status_check.pl Wed Dec 31 19:00:00 1969
***************
*** 1,57 ****
- --- inst/upgrade/1.8.9/update_publish_status_check.pl.orig Fri Jan 20 08:07:05 2006
- +++ inst/upgrade/1.8.9/update_publish_status_check.pl Thu Feb 9 02:17:16 2006
- @@ -9,27 +9,46 @@ use bric_upgrade qw(:all);
- # Skip it for later versions of Bricolage.
- exit unless test_constraint 'story', 'ck_story__publish_status';
-
- +# Later versions will have booleans instead of NUMERIC.
- +my $bool = test_column('story', 'publish_status', undef, undef, 'boolean');
- +
- for my $thing (qw(story media)) {
- do_sql
- qq{ALTER TABLE $thing DROP CONSTRAINT ck_$thing\__publish_status},
-
- - qq{ALTER TABLE $thing
- - ADD CONSTRAINT ck_$thing\__publish_status CHECK (
- - publish_status IN (0,1)
- - AND (
- + ($bool
- + ? qq{ALTER TABLE $thing
- + ADD CONSTRAINT ck_$thing\__publish_status CHECK (
- (
- - publish_status = 0
- + publish_status = FALSE
- AND publish_date IS NULL
- AND first_publish_date IS NULL
- )
- OR (
- - publish_status = 1
- + publish_status = TRUE
- AND publish_date IS NOT NULL
- AND first_publish_date IS NOT NULL
- )
- )
- - )
- - },
- + }
- + : qq{ALTER TABLE $thing
- + ADD CONSTRAINT ck_$thing\__publish_status CHECK (
- + publish_status IN (0, 1)
- + AND (
- + (
- + publish_status = 0
- + AND publish_date IS NULL
- + AND first_publish_date IS NULL
- + )
- + OR (
- + publish_status = 1
- + AND publish_date IS NOT NULL
- + AND first_publish_date IS NOT NULL
- + )
- + )
- + )
- + }
- + )
- ;
- }
-
--- 0 ----
diff -crN bricolage.orig/files/patch-inst_upgrade_1.9.0_no_more_numeric.pl bricolage/files/patch-inst_upgrade_1.9.0_no_more_numeric.pl
*** bricolage.orig/files/patch-inst_upgrade_1.9.0_no_more_numeric.pl Sat Feb 11 20:59:06 2006
--- bricolage/files/patch-inst_upgrade_1.9.0_no_more_numeric.pl Wed Dec 31 19:00:00 1969
***************
*** 1,15 ****
- --- inst/upgrade/1.9.0/no_more_numeric.pl.orig Thu Aug 18 08:20:34 2005
- +++ inst/upgrade/1.9.0/no_more_numeric.pl Thu Feb 9 02:17:16 2006
- @@ -101,6 +101,12 @@ while (<OLD>) {
- $last =~ s/,$// if $_ =~ /^\);/;
- }
-
- + # Fix incompatible checks.
- + if (/ck_(?:story|media)__publish_status/) {
- + s/\(0\)::integer/FALSE/g;
- + s/\(1\)::integer/TRUE/g;
- + }
- +
- # Print the previouis line.
- print NEW $last;
- $last = $_;
--- 0 ----
diff -crN bricolage.orig/files/patch-inst_upgrade_1.9.1_rename_element_table.pl bricolage/files/patch-inst_upgrade_1.9.1_rename_element_table.pl
*** bricolage.orig/files/patch-inst_upgrade_1.9.1_rename_element_table.pl Sat Feb 11 20:59:06 2006
--- bricolage/files/patch-inst_upgrade_1.9.1_rename_element_table.pl Wed Dec 31 19:00:00 1969
***************
*** 1,11 ****
- --- inst/upgrade/1.9.1/rename_element_table.pl.orig Tue Dec 20 07:37:14 2005
- +++ inst/upgrade/1.9.1/rename_element_table.pl Thu Feb 9 02:17:16 2006
- @@ -123,7 +123,7 @@ do_sql
- q{ALTER TABLE element_type__site ALTER COLUMN id
- SET DEFAULT NEXTVAL('seq_element_type__site')},
- q{ALTER TABLE element_type__site DROP CONSTRAINT } . (
- - test_primary_key('element__site_pkey', 'element_type__site')
- + test_primary_key('element_type__site', 'element__site_pkey')
- ? 'element__site_pkey'
- : 'pk_element__site__id'
- ),
--- 0 ----
diff -crN bricolage.orig/files/patch-inst_upgrade_1.9.1_rename_instance_column.pl bricolage/files/patch-inst_upgrade_1.9.1_rename_instance_column.pl
*** bricolage.orig/files/patch-inst_upgrade_1.9.1_rename_instance_column.pl Sat Feb 11 20:59:06 2006
--- bricolage/files/patch-inst_upgrade_1.9.1_rename_instance_column.pl Wed Dec 31 19:00:00 1969
***************
*** 1,11 ****
- --- inst/upgrade/1.9.1/rename_instance_column.pl.orig Tue Oct 4 05:30:43 2005
- +++ inst/upgrade/1.9.1/rename_instance_column.pl Thu Feb 9 02:17:16 2006
- @@ -49,7 +49,7 @@ do_sql
- ALTER TABLE media_container_tile
- ADD CONSTRAINT fk_mc_tile__related_story
- FOREIGN KEY (related_story__id)
- - REFERENCES media(id) ON DELETE CASCADE
- + REFERENCES story(id) ON DELETE CASCADE
- },
-
- # Add FK constraint for mediacontainer_tile.related_media__id
--- 0 ----
diff -crN bricolage.orig/files/patch-inst_upgrade_1.9.1_ze_job_iz_versioned.pl bricolage/files/patch-inst_upgrade_1.9.1_ze_job_iz_versioned.pl
*** bricolage.orig/files/patch-inst_upgrade_1.9.1_ze_job_iz_versioned.pl Sat Feb 11 20:59:06 2006
--- bricolage/files/patch-inst_upgrade_1.9.1_ze_job_iz_versioned.pl Wed Dec 31 19:00:00 1969
***************
*** 1,24 ****
- --- inst/upgrade/1.9.1/ze_job_iz_versioned.pl.orig Tue Dec 20 07:37:14 2005
- +++ inst/upgrade/1.9.1/ze_job_iz_versioned.pl Thu Feb 9 02:17:16 2006
- @@ -18,7 +18,9 @@ do_sql
- # set, even though they've been published.
- q{UPDATE story
- SET published_version = COALESCE(s.published_version, s.current_version),
- - publish_status = '1'
- + publish_status = '1',
- + first_publish_date = COALESCE(s.first_publish_date, s.publish_date, CURRENT_TIMESTAMP),
- + publish_date = COALESCE(s.publish_date, s.first_publish_date, CURRENT_TIMESTAMP)
- FROM job j, story s
- WHERE story.id = s.id
- AND j.story_instance__id = s.id
- @@ -30,7 +32,9 @@ do_sql
-
- q{UPDATE media
- SET published_version = COALESCE(m.published_version, m.current_version),
- - publish_status = '1'
- + publish_status = '1',
- + first_publish_date = COALESCE(m.first_publish_date, m.publish_date, CURRENT_TIMESTAMP),
- + publish_date = COALESCE(m.publish_date, m.first_publish_date, CURRENT_TIMESTAMP)
- FROM job j, media m
- WHERE media.id = m.id
- AND j.media_instance__id = m.id
--- 0 ----
diff -crN bricolage.orig/files/patch-inst_upgrade_lib_bric_upgrade.pm bricolage/files/patch-inst_upgrade_lib_bric_upgrade.pm
*** bricolage.orig/files/patch-inst_upgrade_lib_bric_upgrade.pm Sat Feb 11 20:59:06 2006
--- bricolage/files/patch-inst_upgrade_lib_bric_upgrade.pm Wed Dec 31 19:00:00 1969
***************
*** 1,10 ****
- --- inst/upgrade/lib/bric_upgrade.pm.orig Tue Dec 20 07:37:14 2005
- +++ inst/upgrade/lib/bric_upgrade.pm Thu Feb 9 02:17:16 2006
- @@ -288,6 +288,7 @@ sub test_table($) {
- exit if test_column $table_name, $column_name, $min_size;
- exit if test_column $table_name, $column_name, undef, $not_null;
- exit if test_column $table_name, $column_name, $min_size, $not_null;
- + exit if test_column $table_name, $column_name, $min_size, $not_null, $type;
-
- This function returns true if the specified column exists in specified table
- in the Bricolage database, and false if it does not. Use C<test_column()> in
--- 0 ----
diff -crN bricolage.orig/pkg-plist bricolage/pkg-plist
*** bricolage.orig/pkg-plist Sat Feb 11 16:50:01 2006
--- bricolage/pkg-plist Fri Mar 31 18:32:02 2006
***************
*** 91,96 ****
--- 91,99 ----
bricolage/upgrade/1.10.0/delete_old_stuff.pl
bricolage/upgrade/1.10.0/rm_old_sort_prefs.pl
bricolage/upgrade/1.10.0/update_publish_status_check.pl
+ bricolage/upgrade/1.10.1/fix_media_related_story_fk.pl
+ bricolage/upgrade/1.10.1/fix_reverted_docs.pl
+ bricolage/upgrade/1.10.1/textify_field_type.pl
bricolage/comp/admin/alerts/dhandler
bricolage/comp/admin/alerts/recip
bricolage/comp/admin/control/publish/category.html
***************
*** 2795,2800 ****
--- 2798,2804 ----
@dirrm %%SITE_PERL%%/Bric
@dirrm %%SITE_PERL%%/mach/auto/Bric
@dirrm %%SITE_PERL%%/mach/auto/bric_bin
+ @dirrm bricolage/upgrade/1.10.1
@dirrm bricolage/upgrade/1.10.0
@dirrm bricolage/upgrade/1.9.1
@dirrm bricolage/upgrade/1.9.0
--- bricolage.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200604010103.k3113nAW063984>