Up to [cvs.NetBSD.org] / pkgsrc / databases / postgresql91-docs
Request diff between arbitrary revisions
Default branch: MAIN
Revision 1.15, Wed May 24 19:51:13 2017 UTC (6 years, 6 months ago) by adam
Branch: MAIN
CVS Tags: HEAD
Changes since 1.14: +1 -1
lines
FILE REMOVED
Removed databases/postgresql91
Revision 1.14 / (download) - annotate - [select for diffs], Tue Aug 23 06:28:15 2016 UTC (7 years, 3 months ago) by adam
Branch: MAIN
CVS Tags: pkgsrc-2017Q1-base,
pkgsrc-2017Q1,
pkgsrc-2016Q4-base,
pkgsrc-2016Q4,
pkgsrc-2016Q3-base,
pkgsrc-2016Q3
Changes since 1.13: +1 -2
lines
Diff to previous 1.13 (colored)
The PostgreSQL Global Development Group has released an update to all supported versions of our database system, including 9.5.4, 9.4.9, 9.3.14, 9.2.18 and 9.1.23. This release fixes two security issues. It also patches a number of other bugs reported over the last three months. Users who rely on security isolation between database users should update as soon as possible. Other users should plan to update at the next convenient downtime. Security Issues --------------- Two security holes have been closed by this release: CVE-2016-5423: certain nested CASE expressions can cause the server to crash. CVE-2016-5424: database and role names with embedded special characters can allow code injection during administrative operations like pg_dumpall. The fix for the second issue also adds an option, -reuse-previous, to psql's \connect command. pg_dumpall will also refuse to handle database and role names containing line breaks after the update. For more information on these issues and how they affect backwards-compatibility, see the Release Notes. Bug Fixes and Improvements -------------------------- This update also fixes a number of bugs reported in the last few months. Some of these issues affect only version 9.5, but many affect all supported versions: Fix misbehaviors of IS NULL/IS NOT NULL with composite values Fix three areas where INSERT ... ON CONFLICT failed to work properly with other SQL features. Make INET and CIDR data types properly reject bad IPv6 values Prevent crash in "point ## lseg" operator for NaN input Avoid possible crash in pg_get_expr() Fix several one-byte buffer over-reads in to_number() Don't needlessly plan query if WITH NO DATA is specified Avoid crash-unsafe state in expensive heap_update() paths Fix hint bit update during WAL replay of row locking operations Avoid unnecessary "could not serialize access" with FOR KEY SHARE Avoid crash in postgres -C when the specified variable is a null string Fix two issues with logical decoding and subtransactions Ensure that backends see up-to-date statistics for shared catalogs Prevent possible failure when vacuuming multixact IDs in an upgraded database When a manual ANALYZE specifies columns, don't reset changes_since_analyze Fix ANALYZE's overestimation of n_distinct for columns with nulls Fix bug in b-tree mark/restore processing Fix building of large (bigger than shared_buffers) hash indexes Prevent infinite loop in GiST index build with NaN values Fix possible crash during a nearest-neighbor indexscan Fix "PANIC: failed to add BRIN tuple" error Prevent possible crash during background worker shutdown Many fixes for issues in parallel pg_dump and pg_restore Make pg_basebackup accept -Z 0 as no compression Make regression tests safe for Danish and Welsh locales
Revision 1.13 / (download) - annotate - [select for diffs], Sat Jul 9 06:38:02 2016 UTC (7 years, 4 months ago) by wiz
Branch: MAIN
Changes since 1.12: +2 -1
lines
Diff to previous 1.12 (colored)
Bump PKGREVISION for perl-5.24.0 for everything mentioning perl.
Revision 1.12 / (download) - annotate - [select for diffs], Thu Jun 18 14:46:14 2015 UTC (8 years, 5 months ago) by adam
Branch: MAIN
CVS Tags: pkgsrc-2016Q2-base,
pkgsrc-2016Q2,
pkgsrc-2016Q1-base,
pkgsrc-2016Q1,
pkgsrc-2015Q4-base,
pkgsrc-2015Q4,
pkgsrc-2015Q3-base,
pkgsrc-2015Q3,
pkgsrc-2015Q2-base,
pkgsrc-2015Q2
Changes since 1.11: +1 -2
lines
Diff to previous 1.11 (colored)
Changes: This release primarily fixes issues not successfully fixed in prior releases. It should be applied as soon as possible all users of major versions 9.3 and 9.4. Other users should apply at the next available downtime. Crash Recovery Fixes: Earlier update releases attempted to fix an issue in PostgreSQL 9.3 and 9.4 with "multixact wraparound", but failed to account for issues doing multixact cleanup during crash recovery. This could cause servers to be unable to restart after a crash. As such, all users of 9.3 and 9.4 should apply this update as soon as possible.
Revision 1.11 / (download) - annotate - [select for diffs], Fri Jun 12 10:48:45 2015 UTC (8 years, 5 months ago) by wiz
Branch: MAIN
Changes since 1.10: +2 -1
lines
Diff to previous 1.10 (colored)
Recursive PKGREVISION bump for all packages mentioning 'perl', having a PKGNAME of p5-*, or depending such a package, for perl-5.22.0.
Revision 1.10 / (download) - annotate - [select for diffs], Fri Jul 25 22:14:56 2014 UTC (9 years, 4 months ago) by adam
Branch: MAIN
CVS Tags: pkgsrc-2015Q1-base,
pkgsrc-2015Q1,
pkgsrc-2014Q4-base,
pkgsrc-2014Q4,
pkgsrc-2014Q3-base,
pkgsrc-2014Q3
Changes since 1.9: +1 -2
lines
Diff to previous 1.9 (colored)
The PostgreSQL Global Development Group has released an update to all supported version of the database system, including versions 9.3.5, 9.2.9, 9.1.14, 9.0.18, and 8.4.22. This minor release fixes a number of issues discovered and reported by users over the last four months, including some data corruption issues, and is the last update of version 8.4. Users of version 9.3 will want to update at the earliest opportunity; users of version 8.4 will want to schedule an upgrade to a supported PostgreSQL version.
Revision 1.9 / (download) - annotate - [select for diffs], Thu May 29 23:35:32 2014 UTC (9 years, 6 months ago) by wiz
Branch: MAIN
CVS Tags: pkgsrc-2014Q2-base,
pkgsrc-2014Q2
Changes since 1.8: +2 -1
lines
Diff to previous 1.8 (colored)
Bump for perl-5.20.0. Do it for all packages that * mention perl, or * have a directory name starting with p5-*, or * depend on a package starting with p5- like last time, for 5.18, where this didn't lead to complaints. Let me know if you have any this time.
Revision 1.8 / (download) - annotate - [select for diffs], Sat Oct 12 20:39:43 2013 UTC (10 years, 1 month ago) by adam
Branch: MAIN
CVS Tags: pkgsrc-2014Q1-base,
pkgsrc-2014Q1,
pkgsrc-2013Q4-base,
pkgsrc-2013Q4
Changes since 1.7: +1 -2
lines
Diff to previous 1.7 (colored)
Changes Guarantee transmission of all WAL files before replica failover Prevent downcasing of non-ASCII identifiers Fix several minor memory leaks Correct overcommit behavior when using more than 24GB of work memory Improve planner cost estimates for choosing generic plans Fix estimates of NULL rows in boolean columns Make UNION ALL and inheritance query plans recheck parameterized paths Correct pg_dump bugs for foreign tables, views, and extensions Prevent a parallel pg_restore failure on certain indexes Make REINDEX revalidate constraints Prevent two deadlock issues in SP-GIST and REINDEX CONCURRENTLY Prevent GiST index lookup crash Fix several regular expression failures Allow ALTER DEFAULT PRIVILEGES to work on all schemas Loosen restrictions on keywords Allow various spellings of infinity Expand ability to compare rows to records and arrays Prevent psql client crash on bad PSQLRC file Add spinlock support for ARM64
Revision 1.7 / (download) - annotate - [select for diffs], Fri May 31 12:39:56 2013 UTC (10 years, 6 months ago) by wiz
Branch: MAIN
CVS Tags: pkgsrc-2013Q3-base,
pkgsrc-2013Q3,
pkgsrc-2013Q2-base,
pkgsrc-2013Q2
Changes since 1.6: +2 -1
lines
Diff to previous 1.6 (colored)
Bump all packages for perl-5.18, that a) refer 'perl' in their Makefile, or b) have a directory name of p5-*, or c) have any dependency on any p5-* package Like last time, where this caused no complaints.
Revision 1.6 / (download) - annotate - [select for diffs], Sat Feb 9 11:19:15 2013 UTC (10 years, 9 months ago) by adam
Branch: MAIN
CVS Tags: pkgsrc-2013Q1-base,
pkgsrc-2013Q1
Changes since 1.5: +1 -2
lines
Diff to previous 1.5 (colored)
The PostgreSQL Global Development Group has released a security update to all current versions of the PostgreSQL database system, including versions 9.2.3, 9.1.8, 9.0.12, 8.4.16, and 8.3.23. This update fixes a denial-of-service (DOS) vulnerability. All users should update their PostgreSQL installations as soon as possible. The security issue fixed in this release, CVE-2013-0255, allows a previously authenticated user to crash the server by calling an internal function with invalid arguments. This issue was discovered by independent security researcher Sumit Soni this week and reported via Secunia SVCRP, and we are grateful for their efforts in making PostgreSQL more secure. Today's update also fixes a performance regression which caused a decrease in throughput when using dynamic queries in stored procedures in version 9.2. Applications which use PL/pgSQL's EXECUTE are strongly affected by this regression and should be updated. Additionally, we have fixed intermittent crashes caused by CREATE/DROP INDEX CONCURRENTLY, and multiple minor issues with replication. This release is expected to be the final update for version 8.3, which is now End-of-Life (EOL). Users of version 8.3 should plan to upgrade to a later version of PostgreSQL immediately. For more information, see our Versioning Policy. This update release also contains fixes for many minor issues discovered and patched by the PostgreSQL community in the last two months, including: * Prevent unnecessary table scans during vacuuming * Prevent spurious cached plan error in PL/pgSQL * Allow sub-SELECTs to be subscripted * Prevent DROP OWNED from dropping databases or tablespaces * Make ECPG use translated messages * Allow PL/Python to use multi-table trigger functions (again) in 9.1 and 9.2 * Fix several activity log management issues on Windows * Prevent autovacuum file truncation from being cancelled by deadlock_timeout * Make extensions build with the .exe suffix automatically on Windows * Fix concurrency issues with CREATE/DROP DATABASE * Reject out-of-range values in to_date() conversion function * Revert cost estimation for large indexes back to pre-9.2 behavior * Make pg_basebackup tolerate timeline switches * Cleanup leftover temp table entries during crash recovery * Prevent infinite loop when COPY inserts a large tuple into a table with a large fillfactor * Prevent integer overflow in dynahash creation * Make pg_upgrade work with INVALID indexes * Fix bugs in TYPE privileges * Allow Contrib installchecks to run in their own databases * Many documentation updates * Add new timezone "FET".
Revision 1.5 / (download) - annotate - [select for diffs], Sun Dec 16 01:52:06 2012 UTC (10 years, 11 months ago) by obache
Branch: MAIN
CVS Tags: pkgsrc-2012Q4-base,
pkgsrc-2012Q4
Changes since 1.4: +2 -1
lines
Diff to previous 1.4 (colored)
recursive bump from cyrus-sasl libsasl2 shlib major bump.
Revision 1.4 / (download) - annotate - [select for diffs], Tue Oct 2 21:25:47 2012 UTC (11 years, 2 months ago) by asau
Branch: MAIN
Changes since 1.3: +1 -3
lines
Diff to previous 1.3 (colored)
Drop superfluous PKG_DESTDIR_SUPPORT, "user-destdir" is default these days.
Revision 1.2.2.1 / (download) - annotate - [select for diffs], Tue Jul 3 23:23:07 2012 UTC (11 years, 5 months ago) by tron
Branch: pkgsrc-2012Q2
Changes since 1.2: +1 -2
lines
Diff to previous 1.2 (colored) next main 1.3 (colored)
Pullup ticket #3844 - requested by morr databases/postgresql91: security update databases/postgresql91-adminpack: security update databases/postgresql91-client: security update databases/postgresql91-datatypes: security update databases/postgresql91-dblink: security update databases/postgresql91-docs: security update databases/postgresql91-fuzzystrmatch: security update databases/postgresql91-monitoring: security update databases/postgresql91-pgcrypto: security update databases/postgresql91-plperl: security update databases/postgresql91-plpython: security update databases/postgresql91-pltcl: security update databases/postgresql91-replicationtools: security update databases/postgresql91-server: security update databases/postgresql91-upgrade: security update Revisions pulled up: - databases/postgresql91-adminpack/Makefile 1.3 - databases/postgresql91-client/Makefile 1.7 - databases/postgresql91-datatypes/Makefile 1.3 - databases/postgresql91-dblink/Makefile 1.3 - databases/postgresql91-docs/Makefile 1.3 - databases/postgresql91-docs/PLIST 1.6 - databases/postgresql91-fuzzystrmatch/Makefile 1.3 - databases/postgresql91-monitoring/Makefile 1.3 - databases/postgresql91-pgcrypto/Makefile 1.3 - databases/postgresql91-plperl/Makefile 1.3 - databases/postgresql91-plpython/Makefile 1.4 - databases/postgresql91-pltcl/Makefile 1.3 - databases/postgresql91-replicationtools/Makefile 1.3 - databases/postgresql91-server/Makefile 1.3 - databases/postgresql91-server/PLIST 1.5 - databases/postgresql91-upgrade/Makefile 1.3 - databases/postgresql91/Makefile 1.3 - databases/postgresql91/Makefile.common 1.7 - databases/postgresql91/distinfo 1.6 --- Module Name: pkgsrc Committed By: morr Date: Sun Jul 1 19:49:26 UTC 2012 Modified Files: pkgsrc/databases/postgresql91: Makefile Makefile.common distinfo pkgsrc/databases/postgresql91-adminpack: Makefile pkgsrc/databases/postgresql91-client: Makefile pkgsrc/databases/postgresql91-datatypes: Makefile pkgsrc/databases/postgresql91-dblink: Makefile pkgsrc/databases/postgresql91-docs: Makefile PLIST pkgsrc/databases/postgresql91-fuzzystrmatch: Makefile pkgsrc/databases/postgresql91-monitoring: Makefile pkgsrc/databases/postgresql91-pgcrypto: Makefile pkgsrc/databases/postgresql91-plperl: Makefile pkgsrc/databases/postgresql91-plpython: Makefile pkgsrc/databases/postgresql91-pltcl: Makefile pkgsrc/databases/postgresql91-replicationtools: Makefile pkgsrc/databases/postgresql91-server: Makefile PLIST pkgsrc/databases/postgresql91-upgrade: Makefile Log Message: Security update to version 9.1.4. Changes: * Fix incorrect password transformation in contrib/pgcrypto's DES crypt() function (Solar Designer) * Ignore SECURITY DEFINER and SET attributes for a procedural language's call handler (Tom Lane) * Make contrib/citext's upgrade script fix collations of citext arrays and domains over citext (Tom Lane) * Allow numeric timezone offsets in timestamp input to be up to 16 hours away from UTC (Tom Lane) * Fix timestamp conversion to cope when the given time is exactly the last DST transition time for the current timezone (Tom Lane) * Fix text to name and char to name casts to perform string truncation correctly in multibyte encodings (Karl Schnaitter) * Fix memory copying bug in to_tsquery() (Heikki Linnakangas) * Ensure txid_current() reports the correct epoch when executed in hot standby (Simon Riggs) * Fix planner's handling of outer PlaceHolderVars within subqueries (Tom Lane) * Fix planning of UNION ALL subqueries with output columns that are not simple variables (Tom Lane) * Fix slow session startup when pg_attribute is very large (Tom Lane) * Ensure sequential scans check for query cancel reasonably often (Merlin Moncure) * Ensure the Windows implementation of PGSemaphoreLock() clears ImmediateInterruptOK before returning (Tom Lane) * Show whole-row variables safely when printing views or rules (Abbas Butt, Tom Lane) * Fix COPY FROM to properly handle null marker strings that correspond to invalid encoding (Tom Lane) * Fix EXPLAIN VERBOSE for writable CTEs containing RETURNING clauses (Tom Lane) * Fix PREPARE TRANSACTION to work correctly in the presence of advisory locks (Tom Lane) * Fix truncation of unlogged tables (Robert Haas) * Ignore missing schemas during non-interactive assignments of search_path (Tom Lane) * Fix bugs with temporary or transient tables used in extension scripts (Tom Lane) * Ensure autovacuum worker processes perform stack depth checking properly (Heikki Linnakangas) * Fix logging collector to not lose log coherency under high load (Andrew Dunstan) * Fix logging collector to ensure it will restart file rotation after receiving SIGHUP (Tom Lane) * Fix "too many LWLocks taken" failure in GiST indexes (Heikki Linnakangas) * Fix WAL replay logic for GIN indexes to not fail if the index was subsequently dropped (Tom Lane) * Correctly detect SSI conflicts of prepared transactions after a crash (Dan Ports) * Avoid synchronous replication delay when committing a transaction that only modified temporary tables (Heikki Linnakangas) * Fix error handling in pg_basebackup (Thomas Ogrisegg, Fujii Masao) * Fix walsender to not go into a busy loop if connection is terminated (Fujii Masao) * Fix memory leak in PL/pgSQL's RETURN NEXT command (Joe Conway) * Fix PL/pgSQL's GET DIAGNOSTICS command when the target is the function's first variable (Tom Lane) * Ensure that PL/Perl package-qualifies the _TD variable (Alex Hunsaker) * Fix PL/Python functions returning composite types to accept a string for their result value (Jan Urbanski) * Fix potential access off the end of memory in psql's expanded display (\x) mode (Peter Eisentraut) * Fix several performance problems in pg_dump when the database contains many objects (Jeff Janes, Tom Lane) * Fix memory and file descriptor leaks in pg_restore when reading a directory-format archive (Peter Eisentraut) * Fix pg_upgrade for the case that a database stored in a non-default tablespace contains a table in the cluster's default tablespace (Bruce Momjian) * In ecpg, fix rare memory leaks and possible overwrite of one byte after the sqlca_t structure (Peter Eisentraut) * Fix contrib/dblink's dblink_exec() to not leak temporary database connections upon error (Tom Lane) * Fix contrib/dblink to report the correct connection name in error messages (Kyotaro Horiguchi) * Fix contrib/vacuumlo to use multiple transactions when dropping many large objects (Tim Lewis, Robert Haas, Tom Lane) * Update time zone data files to tzdata release 2012c for DST law changes in Antarctica, Armenia, Chile, Cuba, Falkland Islands, Gaza, Haiti, Hebron, Morocco, Syria, and Tokelau Islands;
Revision 1.3 / (download) - annotate - [select for diffs], Sun Jul 1 19:49:25 2012 UTC (11 years, 5 months ago) by morr
Branch: MAIN
CVS Tags: pkgsrc-2012Q3-base,
pkgsrc-2012Q3
Changes since 1.2: +1 -2
lines
Diff to previous 1.2 (colored)
Security update to version 9.1.4. Changes: * Fix incorrect password transformation in contrib/pgcrypto's DES crypt() function (Solar Designer) * Ignore SECURITY DEFINER and SET attributes for a procedural language's call handler (Tom Lane) * Make contrib/citext's upgrade script fix collations of citext arrays and domains over citext (Tom Lane) * Allow numeric timezone offsets in timestamp input to be up to 16 hours away from UTC (Tom Lane) * Fix timestamp conversion to cope when the given time is exactly the last DST transition time for the current timezone (Tom Lane) * Fix text to name and char to name casts to perform string truncation correctly in multibyte encodings (Karl Schnaitter) * Fix memory copying bug in to_tsquery() (Heikki Linnakangas) * Ensure txid_current() reports the correct epoch when executed in hot standby (Simon Riggs) * Fix planner's handling of outer PlaceHolderVars within subqueries (Tom Lane) * Fix planning of UNION ALL subqueries with output columns that are not simple variables (Tom Lane) * Fix slow session startup when pg_attribute is very large (Tom Lane) * Ensure sequential scans check for query cancel reasonably often (Merlin Moncure) * Ensure the Windows implementation of PGSemaphoreLock() clears ImmediateInterruptOK before returning (Tom Lane) * Show whole-row variables safely when printing views or rules (Abbas Butt, Tom Lane) * Fix COPY FROM to properly handle null marker strings that correspond to invalid encoding (Tom Lane) * Fix EXPLAIN VERBOSE for writable CTEs containing RETURNING clauses (Tom Lane) * Fix PREPARE TRANSACTION to work correctly in the presence of advisory locks (Tom Lane) * Fix truncation of unlogged tables (Robert Haas) * Ignore missing schemas during non-interactive assignments of search_path (Tom Lane) * Fix bugs with temporary or transient tables used in extension scripts (Tom Lane) * Ensure autovacuum worker processes perform stack depth checking properly (Heikki Linnakangas) * Fix logging collector to not lose log coherency under high load (Andrew Dunstan) * Fix logging collector to ensure it will restart file rotation after receiving SIGHUP (Tom Lane) * Fix "too many LWLocks taken" failure in GiST indexes (Heikki Linnakangas) * Fix WAL replay logic for GIN indexes to not fail if the index was subsequently dropped (Tom Lane) * Correctly detect SSI conflicts of prepared transactions after a crash (Dan Ports) * Avoid synchronous replication delay when committing a transaction that only modified temporary tables (Heikki Linnakangas) * Fix error handling in pg_basebackup (Thomas Ogrisegg, Fujii Masao) * Fix walsender to not go into a busy loop if connection is terminated (Fujii Masao) * Fix memory leak in PL/pgSQL's RETURN NEXT command (Joe Conway) * Fix PL/pgSQL's GET DIAGNOSTICS command when the target is the function's first variable (Tom Lane) * Ensure that PL/Perl package-qualifies the _TD variable (Alex Hunsaker) * Fix PL/Python functions returning composite types to accept a string for their result value (Jan Urbanski) * Fix potential access off the end of memory in psql's expanded display (\x) mode (Peter Eisentraut) * Fix several performance problems in pg_dump when the database contains many objects (Jeff Janes, Tom Lane) * Fix memory and file descriptor leaks in pg_restore when reading a directory-format archive (Peter Eisentraut) * Fix pg_upgrade for the case that a database stored in a non-default tablespace contains a table in the cluster's default tablespace (Bruce Momjian) * In ecpg, fix rare memory leaks and possible overwrite of one byte after the sqlca_t structure (Peter Eisentraut) * Fix contrib/dblink's dblink_exec() to not leak temporary database connections upon error (Tom Lane) * Fix contrib/dblink to report the correct connection name in error messages (Kyotaro Horiguchi) * Fix contrib/vacuumlo to use multiple transactions when dropping many large objects (Tim Lewis, Robert Haas, Tom Lane) * Update time zone data files to tzdata release 2012c for DST law changes in Antarctica, Armenia, Chile, Cuba, Falkland Islands, Gaza, Haiti, Hebron, Morocco, Syria, and Tokelau Islands;
Revision 1.2 / (download) - annotate - [select for diffs], Thu Jun 14 07:45:34 2012 UTC (11 years, 5 months ago) by sbd
Branch: MAIN
CVS Tags: pkgsrc-2012Q2-base
Branch point for: pkgsrc-2012Q2
Changes since 1.1: +2 -1
lines
Diff to previous 1.1 (colored)
Recursive PKGREVISION bump for libxml2 buildlink addition.
Revision 1.1.1.1 / (download) - annotate - [select for diffs] (vendor branch), Thu Sep 15 08:28:56 2011 UTC (12 years, 2 months ago) by adam
Branch: TNF
CVS Tags: pkgsrc-base,
pkgsrc-2012Q1-base,
pkgsrc-2012Q1,
pkgsrc-2011Q4-base,
pkgsrc-2011Q4,
pkgsrc-2011Q3-base,
pkgsrc-2011Q3
Changes since 1.1: +0 -0
lines
Diff to previous 1.1 (colored)
Version 9.1 delivers several features which users have been requesting for years, removing roadblocks to deploying new or ported applications on PostgreSQL. These include: * Synchronous Replication: enable high-availability with consistency across multiple servers * Per-Column Collations: support linguistically-correct sorting per database, table or column. * Unlogged Tables: greatly improves performance for ephemeral data Our community of contributors innovates with cutting-edge features. Version 9.1 includes several which are new to the database industry, such as: * K-Nearest-Neighbor Indexing: index on "distance" for faster location and text search queries * Serializable Snapshot Isolation: keeps concurrent transactions consistent without blocking, using "true serializability" * Writeable Common Table Expressions: execute complex multi-stage data updates in a single query * Security-Enhanced Postgres: deploy military-grade security and Mandatory Access Control
Revision 1.1 / (download) - annotate - [select for diffs], Thu Sep 15 08:28:56 2011 UTC (12 years, 2 months ago) by adam
Branch: MAIN
Initial revision