Merge branch 'grubba/patchsystem' into 6.2 * grubba/patchsystem: RoxenPatch: Added architecture rhel8_x86_64.
Merge branch 'grubba/patchsystem' into devel * grubba/patchsystem: RoxenPatch: Added architecture rhel8_x86_64.
RoxenPatch: Added architecture rhel8_x86_64.
Merge branch 'patches/ws550' into 6.1 * patches/ws550: Outgoing Proxy: Only send Proxy-Authorization when auth is configured.
Merge branch 'patches/ws550' into 6.2 * patches/ws550: Outgoing Proxy: Only send Proxy-Authorization when auth is configured.
Merge branch 'patches/ws562' into patches/ws558 * patches/ws562: (9454 commits) VFS: find_above(): Don't add to cache if no cache key. [WS-562] Perform negative caching of (typically) htaccess files for 5 seconds. Fixed request trace nesting inconsistency. FTP: Allow anonymous ftp without TLS even when TLS required. FTP: Added support for the CCC command. FTP: Default to PROT P for FTPS. FTP: Allow FEAT before login. FTP: Fixed bug in MLSD/MLST handling. FTP: Extended AUTH TLS config option. FTP: Fixed SSL data connection. Pike 8.0: Temporary workaround for SSL/TLS API change. FTP: Fixed typo in PBSZ error message. FTP: Support ending the TLS control connection with REIN. FTP: Added configuration flag to require AUTH TLS. FTP: Support AUTH TLS (RFC 4217). FTP: The ftp server is always the server side of TLS. FTP: Splitted send() into low_send() and send(). Pike 8.0: More SSL/TLS API changes. FTP: Prepare for supporting AUTH TLS (RFC 4217). Protocols: Added StartTLSProtocol. ...
Merge branch 'patches/ws550' into devel * patches/ws550: Outgoing Proxy: Only send Proxy-Authorization when auth is configured.
Outgoing Proxy: Only send Proxy-Authorization when auth is configured. Fixes [WS-550].
Merge branch 'grubba/patchsystem' into 6.2 * grubba/patchsystem: RoxenPatch: Added log message. RoxenPatch: Added workaround for bug in gnu-patch 2.7.4 and later.
Merge branch 'grubba/patchsystem' into devel * grubba/patchsystem: RoxenPatch: Added log message. RoxenPatch: Added workaround for bug in gnu-patch 2.7.4 and later.
RoxenPatch: Added log message.
RoxenPatch: Added workaround for bug in gnu-patch 2.7.4 and later. Gnu-patch attempts to allocate a hash table with a size depending on RLIMIT_NOFILE. When the limit is unlimited, it runs out of memory... Cf https://savannah.gnu.org/bugs/index.php?55797 Fixes [WS-416].
Merge branch 'grubba/patchsystem' into 6.2 * grubba/patchsystem: RoxenPatch: Added feature/save-orig.
Merge branch 'grubba/patchsystem' into devel * grubba/patchsystem: RoxenPatch: Added feature/save-orig.
RoxenPatch: Added feature/save-orig.
Merge branch 'grubba/patchsystem' into 6.2 * grubba/patchsystem: RoxenPatch: Restore CVS/Root.orig files before applying pataches.
Merge branch 'grubba/patchsystem' into devel * grubba/patchsystem: RoxenPatch: Restore CVS/Root.orig files before applying pataches.
RoxenPatch: Restore CVS/Root.orig files before applying pataches. Potential fix for [WS-393].
Merge branch 'devel' into ponost/admin-if-17 * devel: (60 commits) Version bumped to 6.3.7 by buildsystem. DBManager: Added --defaults-file directive in lots of places. DBManager: Added some line-breaks. DBs: Use query_mysql_config_file(). DBs: Added roxenloader.query_mysql_config_file(). MariaDB/MySQL: Support blacklisting of versions. MariaDB: Bump supported version to 10.3.*. DBManager: Added some (disabled) diagnostics. DBManager: Support upgrading to MariaDB 10.3.x. Adding .vscode to .gitignore Testsuite [WebDAV]: Test some kanji symbols. Testsuite [WebDAV]: Label the symbol test filenames. Testsuite [WebDAV]: Fix test_x_ls() some more for NT. Testsuite [WebDAV] [NT]: Potential fix for test_x_ls() failing on NT. Testsuite [WebDAV]: Added some diagnostics. Testsuite [WebDAV]: Added filesystem_behavior(). Discern between "failed on X" and "zero failures" for easier searching in the output log. WebDAV testsuite: use 127.0.0.1 as default IP, which works better on NT. Added an "Elasticsearch client" to test modules. Will be used by Archive and Print test (setup) code. [EP-809] Added etc/test/modules to path when running test setup scripts. [EP-809] ...
Merge branch 'grubba/patchsystem' into 6.2 * grubba/patchsystem: RoxenPatch: Added architecture ubuntu1804_x86_64.
Merge branch 'grubba/patchsystem' into devel * grubba/patchsystem: RoxenPatch: Added architecture ubuntu1804_x86_64.
RoxenPatch: Added architecture ubuntu1804_x86_64.
Merge branch 'devel' into kg/WS-168-webdav * devel: (1803 commits) Loader [MariaDB]: Set sql_mode in my.cnf. DBManager: Use CREATE USER with MariaDB 10.2 and later. WebDAV: Use urn:uuid: namespace for locks. Version bumped to 6.2.94 by buildsystem. APIs: Roxen.lookup_real_path_case_insens() now assumes utf-8 fs. APIs: Improved ambiguity recovery in lookup_real_path_case_insens(). APIs: Roxen.lookup_real_path_case_insens() now survives NFD. FTP: Normalize filenames to NFC. APIs: find_dir() now normalizes paths to NFC. HTTP: Normalize paths to Unicode NFC. Fixes bug [WS-172] where an empty initial prestate issued an internal server error. Loader: Remove the global __pragma_save_parent__. Version bumped to 6.2.93 by buildsystem. Use string_to_utf8 rather than Charset.Encoder when possible. Added more verifications in test base class. [WS-168] Adding support for copy and move between different mount points. [WS-168] Broke out parent class from RoxenTest_webdav.pike [WS-168] Version bumped to 6.2.92 by buildsystem. Fixed FIXME comment in RoxenTest_webdav.pike. [WS-168] Version bumped to 6.2.91 by buildsystem. ...
Merge branch 'feature/CMS-297-secure-sitebuilder-cookie' into patches/ws-135 * feature/CMS-297-secure-sitebuilder-cookie: (804 commits) ...
Merge branch 'devel' into ponost/admin-if-17
Merge commit '8468d07e63a61e80c5a7916ab61c0f25135ac2fc' into patches/ftp Synch with Roxen 6.0/6.1 split. * commit '8468d07e63a61e80c5a7916ab61c0f25135ac2fc': (428 commits)
Merge branch 'devel' into kg/archive-client
RoxenPatch: Make the module usable stand-alone again. This module is used by stand-alone scripts (like bin/rxnpatch.pike), ant that means that it MUST guard any use of Roxen-specific modules (like eg Roxen). Fixes testsuite failures, where bin/rxnpatch.pike won't compile.
Merge branch 'feature/CMS-205-js-css-cache-busting' into devel * feature/CMS-205-js-css-cache-busting: RoxenPatch: Make the module usable stand-alone again.
JS and CSS cache busting [CMS-205]
Removed trailing spaces.
Merge branch 'feature/CMS-205-js-css-cache-busting' into devel JS and CSS cache busting [CMS-205] 061d86d8eb5911d5f997f726ed7b72d11dc82547 2ac6921447a5d4fe951dafc8988e87711e1585fe 71bd5e0d9fa43773eb0624002e2f7d326ab16f22 a01b79f1b5e6e095439c06314f9482d08ab6ea3e
JS and CSS cache busting [CMS-205] Clear installed patches cache also on patch uninstall, and simplified some code.
JS and CSS cache busting [CMS-205] Added new function get_prestate_version() to class Patcher in RoxenPatch.pmod.
JS and CSS cache busting [CMS-205] First stab on this...
Merge branch 'grubba/patchsystem' into 6.1 * grubba/patchsystem: RoxenPatch: Fixed HTTPS URL validation check. PoxenPatch: Request and check cluster checksums.
Merge branch 'grubba/patchsystem' into devel * grubba/patchsystem: RoxenPatch: Fixed HTTPS URL validation check. PoxenPatch: Request and check cluster checksums.
RoxenPatch: Fixed HTTPS URL validation check. The wrong URL was checked...
PoxenPatch: Request and check cluster checksums. The automatic download of patch clusters now checks that the cluster files haven't been corrupted (ie usually truncated) during download. Fixes some of [WS-49].
Merge branch 'grubba/patchsystem' into 6.1 * grubba/patchsystem: RoxenPatch: Privs-related fixes.
Merge branch 'grubba/patchsystem' into devel * grubba/patchsystem: RoxenPatch: Privs-related fixes.
RoxenPatch: Privs-related fixes. It's now the caller's responsibility to take Privs before calling write_file_to_disk(). Potential fix for [WS-42].
Merge branch 'patches/bug7602' into grubba/patchsystem Note: This makes this branch no longer compatible with Roxen 5.2 and earlier. * patches/bug7602: (117 commits) RoxenPatch: Complain but proceed when the CA list is empty. RoxenPatch: The patch cluster is fetched over HTTPS... RoxenPatch: Support relative URLs from the HTTPS action. Config IF: Reordered settings somewhat. Config IF: Join the tabs "Auto {Restart,Patching}" to "Auto Maintenance". RoxenPatch: Revert the patch installation on manual restart option. RoxenPatch: Don't apply pending patches on signal exit. RoxenPatch: More permission filtering. RoxenPatch: Fixed some NULL-dereferences and calls. RoxenPatch: Complain if not running a dist. RoxenPatch: Use HTTPS to fetch the patch cluster. RoxenPatch: Added control of patch installation to the restart action. RoxenPatch: Added option to automatically install patches on restart. RoxenPatch: Throw proper errors instead of arrays with a single string. RoxenPatch: Clean up the debug log output somewhat. RoxenPatch: The refresh fetch now also tries If-Modified-Since. RoxenPatch: The ETag refresh fetch now actually works. RoxenPatch: Added support for automatic fetch of patch clusters. RoxenPatch: Perform refresh fetch of the patch cluster. RoxenPatch: Inhibit "Import from Roxen" without VERSION.DIST. ...
Merge branch 'grubba/patchsystem' into 6.1 * grubba/patchsystem: RoxenPatch: Improved support for non-gnu tar.
Merge branch 'grubba/patchsystem' into devel * grubba/patchsystem: RoxenPatch: Improved support for non-gnu tar.
RoxenPatch: Improved support for non-gnu tar. On eg Solaris, tar rf doesn't support creating tar files from scratch, so use tar cf instead if the tar file doesn't exist yet. Fixes [WS-38].
RoxenPatch: The installation log file is now in UTF-8. Fixes backtraces when attempting to write wide characters to the installation log. Fixes [WS-29].
Merge branch 'grubba/patchsystem' into 6.0 * grubba/patchsystem: RoxenPatch: The installation log file is now in UTF-8. git-rxnpatch: More fixes for release sync clusters. git-rxnpatch: Generate release sync clusters for all releases. git-rxnpatch: Added cluster --force. git-rxnpatch: Improved diagnostics. git-rxnpatch: Minor code clean up. git-rxnpatch: Don't attempt to cat the empty blob. RoxenPatch: New files may now force overwrites. git-rxnpatch: Log failed git command Read author info from environment git-rxnpatch: Identify patch clusters by the most recent patch. git-rxnpatch: Fixed name of release clusters. git-rxnpatch: Create separate clusters for different releases. git-rxnpatch: Moved parsing of metadata.txt to a separate function. git-rxnpatch [cluster]: Some code cleanup. git-rxnpatch: Fixed multiple issues with the ident verifier. git-rxnpatch: Fixed multiple patch message. git-rxnpatch: Validate $Id$ expansions. git-rxnpatch: Added option --subject for subcommand "new".
Merge branch 'grubba/patchsystem' into 6.1 * grubba/patchsystem: RoxenPatch: The installation log file is now in UTF-8.
Merge branch 'grubba/patchsystem' into devel * grubba/patchsystem: RoxenPatch: The installation log file is now in UTF-8.
Merge branch 'grubba/patchsystem' into 6.1 * grubba/patchsystem: RoxenPatch: New files may now force overwrites. git-rxnpatch: Log failed git command Read author info from environment git-rxnpatch: Identify patch clusters by the most recent patch. git-rxnpatch: Fixed name of release clusters. git-rxnpatch: Create separate clusters for different releases. git-rxnpatch: Moved parsing of metadata.txt to a separate function. git-rxnpatch [cluster]: Some code cleanup.
Merge branch 'grubba/patchsystem' into devel * grubba/patchsystem: RoxenPatch: New files may now force overwrites.
RoxenPatch: New files may now force overwrites. This is needed in order to support "blind" patches. Fixes some of [is-13].
Merge branch 'grubba/patchsystem' into 6.0 * grubba/patchsystem: Testsuite [RoxenPatch]: Updated the test patch with ubuntu1604_x86_64. RoxenPatch: Added architecture ubuntu1604_x86_64.
Merge branch 'grubba/patchsystem' into devel * grubba/patchsystem: Testsuite [RoxenPatch]: Updated the test patch with ubuntu1604_x86_64.
Testsuite [RoxenPatch]: Updated the test patch with ubuntu1604_x86_64. Fixes testsuite failures on Ubuntu 16.04/x86_64.
Merge branch 'grubba/patchsystem' into devel * grubba/patchsystem: RoxenPatch: Added architecture ubuntu1604_x86_64.
RoxenPatch: Added architecture ubuntu1604_x86_64.
Merge branch 'patches/bug7602' into 6.0 * patches/bug7602: RoxenPatch: Complain but proceed when the CA list is empty.
Merge branch 'patches/bug7602' into devel * patches/bug7602: RoxenPatch: Complain but proceed when the CA list is empty.
RoxenPatch: Complain but proceed when the CA list is empty.
Merge branch 'grubba/patchsystem' into 6.0 * grubba/patchsystem: Testsuite [RoxenPatch]: Added new sol11_x86_64 to 2009-02-25T1124.rxp. RoxenPatch: Add platform sol11_x86_64.
Merge branch 'grubba/patchsystem' into devel * grubba/patchsystem: Testsuite [RoxenPatch]: Added new sol11_x86_64 to 2009-02-25T1124.rxp. RoxenPatch: Add platform sol11_x86_64.
RoxenPatch: Add platform sol11_x86_64.
Merge branch 'patches/bug7602' into 6.0 * patches/bug7602: (28 commits) RoxenPatch: The patch cluster is fetched over HTTPS... RoxenPatch: Support relative URLs from the HTTPS action. Config IF: Reordered settings somewhat. Config IF: Join the tabs "Auto {Restart,Patching}" to "Auto Maintenance". RoxenPatch: Revert the patch installation on manual restart option. RoxenPatch: Don't apply pending patches on signal exit. RoxenPatch: More permission filtering. RoxenPatch: Fixed some NULL-dereferences and calls. RoxenPatch: Complain if not running a dist. RoxenPatch: Use HTTPS to fetch the patch cluster. RoxenPatch: Added control of patch installation to the restart action. RoxenPatch: Added option to automatically install patches on restart. RoxenPatch: Throw proper errors instead of arrays with a single string. RoxenPatch: Clean up the debug log output somewhat. RoxenPatch: The refresh fetch now also tries If-Modified-Since. RoxenPatch: The ETag refresh fetch now actually works. RoxenPatch: Added support for automatic fetch of patch clusters. RoxenPatch: Perform refresh fetch of the patch cluster. RoxenPatch: Inhibit "Import from Roxen" without VERSION.DIST. RoxenPatch: Fixed error handling issue. ...
Merge branch 'patches/bug7602' into devel * patches/bug7602: RoxenPatch: The patch cluster is fetched over HTTPS... RoxenPatch: Support relative URLs from the HTTPS action.
RoxenPatch: The patch cluster is fetched over HTTPS...
RoxenPatch: Support relative URLs from the HTTPS action. Also adds support for surrounding whitespace.
Merge branch 'patches/bug7602' into devel * patches/bug7602: RoxenPatch: Complain if not running a dist. RoxenPatch: Use HTTPS to fetch the patch cluster.
RoxenPatch: Complain if not running a dist.
RoxenPatch: Use HTTPS to fetch the patch cluster. Also make sure to validate the HTTPS certificate chain.
Merge branch 'patches/bug7602' into devel * patches/bug7602: RoxenPatch: Added control of patch installation to the restart action. RoxenPatch: Added option to automatically install patches on restart. RoxenPatch: Throw proper errors instead of arrays with a single string. RoxenPatch: Clean up the debug log output somewhat.
RoxenPatch: Throw proper errors instead of arrays with a single string. Also fixes a cut and paste typo in set_imported_path().
Merge branch 'patches/bug7602' into devel * patches/bug7602: RoxenPatch: The refresh fetch now also tries If-Modified-Since. RoxenPatch: The ETag refresh fetch now actually works. RoxenPatch: Added support for automatic fetch of patch clusters. RoxenPatch: Perform refresh fetch of the patch cluster. RoxenPatch: Inhibit "Import from Roxen" without VERSION.DIST. RoxenPatch: Fixed error handling issue. RoxenPatch: Added some html quoting. Core: Renamed the error log cleaning background process.
RoxenPatch: The refresh fetch now also tries If-Modified-Since. The Patch server doesn't provide etags for files that it deems too large, so let it fall back to If-Modified-Since in that case. Fixes refresh fetch from www.roxen-com.
RoxenPatch: The ETag refresh fetch now actually works.
RoxenPatch: Perform refresh fetch of the patch cluster. There's no reason to refetch the patch cluster if we already have imported it...
RoxenPatch: Fixed error handling issue.
Merge branch 'patches/bug7602' into devel * patches/bug7602: RoxenPatch: try_get_url() now supports etags. RoxenPatch: try_get_url() now falls back to Protocols.HTTP.get_url(). RoxenPatch: Renamed get_url_async() to try_get_url(). RoxenPatch: Improved types. RoxenPatch: Rename the "Update Client" permission to "Apply Patches". Updated locale ids.
RoxenPatch: try_get_url() now supports etags.
RoxenPatch: try_get_url() now falls back to Protocols.HTTP.get_url(). This also adds support for calling try_get_url() from the backend thread.
RoxenPatch: Renamed get_url_async() to try_get_url(). Renamed the function since the name was misleading.
RoxenPatch: Improved types. Also removes support for the unused dry_run argument to import_file_http().
Merge commit '5ee4d2b88e3e12d1622f9a161e9a29484cbf6e4c' into patches/bug7602 Bump base version to Roxen 5.2.335.
Merge branch 'patches/bug7589' into 6.0 * patches/bug7589: RoxenPatch: Fixed deprecation warning.
Merge branch 'patches/bug7589' into devel * patches/bug7589: RoxenPatch: Fixed deprecation warning.
RoxenPatch: Fixed deprecation warning. Fixes [bug 7589 (#7589)].
Merge commit '8a2ce4a87' into patches/bug7582 * commit '8a2ce4a87': (7413 commits)
Merge branch 'grubba/patchsystem' into 5.4 * grubba/patchsystem: Testsuite [RoxenPatch]: Added some more platforms to 2009-02-25T1124.rxp. RoxenPatch: Add platforms rhel7_x86_64 and win32_x86_64.
Make sure to get proper backtrace printouts on RoxenPatch errors. Previously an error message would be written without much context, which can be pretty confusing.
Merge branch 'grubba/patchsystem' into devel * grubba/patchsystem: RoxenPatch: Add platforms rhel7_x86_64 and win32_x86_64.
RoxenPatch: Add platforms rhel7_x86_64 and win32_x86_64. Fixes [bug 7452 (#7452)] comment #2.
Merge branch 'grubba/patchsystem' into 5.4 * grubba/patchsystem: RoxenPatch: Run patch in binary mode on WIN32.
Merge branch 'grubba/patchsystem' into devel * grubba/patchsystem: RoxenPatch: Run patch in binary mode on WIN32.
Merge branch 'patches/bug7244' into grubba/patchsystem * patches/bug7244: RoxenPatch: Run patch in binary mode on WIN32.
RoxenPatch: Run patch in binary mode on WIN32. The patch binary on WIN32 defaults to breaking the linefeeds in patches for files that use CRLF as EOL. Fix it by always opening the files in binary mode. Fixes [bug 7244 (#7244)].
Merge branch 'patches/pike8.0' into patches/bug4594 * patches/pike8.0: (230 commits) Pike 8.0: More SSL/TLS API changes. FTPS: Fixed support for Pike 8.0. Roxen: Use the current names for the ASN1 classes. SNMP: The LDAP private ASN.1 classes aren't available in Pike 8.0. SNMP: The fields tag and cls are variables in Pike 8.0. Pike 8.0: More SSL changes. Pike 8.0: Improved robustness when upgrading old certs. Pike 8.0: Upgrade old automatic X.509v1 certs to X.509v3. Pike 8.0: Fixed SSL port binding with new API. Pike 8.0: Take advantage of the improved SSL support. Pike 8.0: Add support for some new SSL features. Pike 8.0: #if efun() is obsolete since 10 years back. Pike 8.0: String.Buffer contains a sprintf(). Pike 8.0: Unset variables are UNDEFINED. Roxen 5.4.1. ABS: List the pending call_outs. Fix warnings generated by Pike 8.0. DB browser: add support for custom DB field formatters in owning modules. DBManager.module_table_info: Consider all module entries from the DB. Added transliteration module. ... Conflicts: server/base_server/roxen.pike
Merge commit '64ea9f116367427932716bbbb417bd3f20b99feb' into patches/pike8.0 * commit '64ea9f116367427932716bbbb417bd3f20b99feb': (904 commits) Roxen 5.4.1. ... Updates the base version for the Pike 8.0 patches to Roxen 5.4.1.
Merge branch 'grubba/patchsystem' into devel * grubba/patchsystem: RoxenPatch: Fix pike version deps on WIN32.
Merge branch 'grubba/patchsystem' into 5.4 * grubba/patchsystem: RoxenPatch: Fix pike version deps on WIN32.
RoxenPatch: Fix pike version deps on WIN32. For some reason the installation location of the version.h header file for Pike differs on WIN32. We now check that location if there's no file at the primary location. Fixes [bug 7101 (#7101)].
Merge branch 'grubba/patchsystem' into devel * grubba/patchsystem: RoxenPatch: Improved parsing of metadata file.
Merge branch 'grubba/patchsystem' into 5.2 * grubba/patchsystem: RoxenPatch: Improved parsing of metadata file.
Merge branch 'grubba/patchsystem' into 5.4 * grubba/patchsystem: RoxenPatch: Improved parsing of metadata file.
RoxenPatch: Improved parsing of metadata file. parse_metadata() now parses the <new/>, <replace/> and <delete/> metadata tags in the manner you would usually expect...
Merge branch 'grubba/patchsystem' into 5.2 * grubba/patchsystem: RoxenPatch: Add automatic feature dependency on "file-modes-2". RoxenPatch: Emit file-mode attribute where needed. RoxenPatch: Added support for explicit file-modes. RoxenPatch: Be more paranoid when copying mode bits.
Merge branch 'grubba/patchsystem' into devel * grubba/patchsystem: RoxenPatch: Add automatic feature dependency on "file-modes-2". RoxenPatch: Emit file-mode attribute where needed. RoxenPatch: Added support for explicit file-modes. RoxenPatch: Be more paranoid when copying mode bits.
Merge branch 'grubba/patchsystem' into 5.4 * grubba/patchsystem: RoxenPatch: Add automatic feature dependency on "file-modes-2". RoxenPatch: Emit file-mode attribute where needed. RoxenPatch: Added support for explicit file-modes. RoxenPatch: Be more paranoid when copying mode bits.
RoxenPatch: Add automatic feature dependency on "file-modes-2". When generating metadata files using the attribute "file-mode", also add a feature dependency on "file-modes-2".
RoxenPatch: Emit file-mode attribute where needed. Metadata <new/> and <replace/> tags now get the attribute "file-mode" set to "0755" for executable files.
RoxenPatch: Added support for explicit file-modes. The <new/> and <replace/> metadata tags now support the attribute "file-mode", which is a Pike literal expression (this means that eg octal notation is supported) containing the low order file mode bits. This feature is needed to support *old* versions of the patch system, that threw away file mode bits at import time. This new feature is available via the feature dependency "roxenpatch/file-modes-2".
RoxenPatch: Be more paranoid when copying mode bits.
Merge branch 'grubba/patchsystem' into devel * grubba/patchsystem: RoxenPatch: Fixed some more mode bits.
Merge branch 'grubba/patchsystem' into 5.4 * grubba/patchsystem: RoxenPatch: Fixed some more mode bits.
Merge branch 'grubba/patchsystem' into 5.2 * grubba/patchsystem: RoxenPatch: Fixed some more mode bits.
RoxenPatch: Fixed some more mode bits. cp() doesn't copy the mode bits, so we need to adjust them afterwards. Adds new virtual dependency "roxenpatch/file-modes-2".
RoxenPatch: No need to unixify anymore in create_patch().
RoxenPatch: Fixed some AutoDoc markup.
Merge branch 'grubba/patchsystem' into 5.2 * grubba/patchsystem: rxnpatch: Fixed multiple typos in write_list(). rxnpatch: list now supports listing unimported patches. RoxenPatch: Added field "file_list" in dry-run mode. RoxenPatch: Added describe_*_patch().
Merge branch 'grubba/patchsystem' into devel * grubba/patchsystem: rxnpatch: Fixed multiple typos in write_list(). rxnpatch: list now supports listing unimported patches. RoxenPatch: Added field "file_list" in dry-run mode. RoxenPatch: Added describe_*_patch().
RoxenPatch: Added field "file_list" in dry-run mode. extract_patch() in dry-run mode is useful to examine patches without importing them. Unfortunately the information about which files that are affected was lost.
RoxenPatch: Added describe_*_patch(). Broke out the inner loops from file_list_*() since they are useful to describe single patches as well.
Merge branch 'grubba/patchsystem' into devel * grubba/patchsystem: git-rxnpatch: Retain file mode for all blobs. RoxenPatch: Added virtual dependency roxenpatch/file-modes. RoxenPatch: Preserve exec bit when extracting tar files. git-rxnpatch: Retain exec bit in generated patch.
Merge branch 'grubba/patchsystem' into 5.2 * grubba/patchsystem: RoxenPatch: Added virtual dependency roxenpatch/file-modes. RoxenPatch: Preserve exec bit when extracting tar files. git-rxnpatch: Retain exec bit in generated patch.
RoxenPatch: Added virtual dependency roxenpatch/file-modes. This dependency is needed to force RoxenPatch to be patched and used before applying patches that require the feature working. Fixes some of [bug 6898 (#6898)] part 2.
RoxenPatch: Preserve exec bit when extracting tar files. Extracted files were always extracted with mode 0644. This is NOT a good idea when patching eg the start script. Fixes some of [bug 6898 (#6898)] parts 2 and 3.
git-rxnpatch: Retain exec bit in generated patch. The file protection mode bits were lost for new or binary files. They are now preserved in the generated rxp archive. Fixes [bug 6898 (#6898)] part 1.
Fix backtrace when running a non-dist installation.
Made HTTP patch import work also using bin/rxnpatch. Made HTTP patch import work both in the admin interface and via bin/rxnpatch, by moving the import functionality into RoxenPatch.pmod and implementing switch -e/--http for the import command.
Implements a patch manager button for downloading and importing patch clusters. Adds a button to the patch manger GUI that fetches and imports the latest rxp patch cluster that has been made available at www.roxen.com/rxp/. The correct patch cluster will be returned based on: - Product (cms/rep/webserver) - Dist version - Platform (rhel, mac etc.)
Merge branch 'grubba/patchsystem' into devel * grubba/patchsystem: RoxenPatch: Support roxenpatch feature dependencies.
Merge branch 'grubba/patchsystem' into 5.2 * grubba/patchsystem: RoxenPatch: Support roxenpatch feature dependencies.
RoxenPatch: Support roxenpatch feature dependencies. * Adds support for the virtual dependency "roxenpatch/pike-support", to ensure that RoxenPatch in use has the proper patch level before a pike/lib/* patch is applied. * git-rxnpatch now automatically adds the above dependency when needed.
Merge branch 'grubba/patchsystem' into devel * grubba/patchsystem: RoxenPatch: Fix include directory for generated master.
Merge branch 'grubba/patchsystem' into 5.2 * grubba/patchsystem: RoxenPatch: Fix include directory for generated master.
RoxenPatch: Fix include directory for generated master.
Merge branch 'grubba/patchsystem' into devel * grubba/patchsystem: RoxenPatch: Some post processing fixes.
Merge branch 'grubba/patchsystem' into 5.2 * grubba/patchsystem: RoxenPatch: Some post processing fixes.
RoxenPatch: Some post processing fixes. * The post processor always indicated a failure when it had actually done something non-trivial. * Avoid stacking of cflags in the master.pike generator. * Fix the include_prefix setting in the master.pike generator.
Merge branch 'grubba/patchsystem' into devel * grubba/patchsystem: RoxenPatch: Improved support for patching Pike. git-rxnpatch: Filter testsuite files.
Merge branch 'grubba/patchsystem' into 5.2 * grubba/patchsystem: RoxenPatch: Improved support for patching Pike. git-rxnpatch: Filter testsuite files.
RoxenPatch: Improved support for patching Pike. * Support patching of master.pike.in. * Remove dumped module files corresponding to patched files.
Merge branch 'grubba/patchsystem' into 5.2 * grubba/patchsystem: RoxenPatch: Fixed broken XML-quoting of description.
Merge branch 'grubba/patchsystem' into devel * grubba/patchsystem: RoxenPatch: Fixed broken XML-quoting of description.
RoxenPatch: Fixed broken XML-quoting of description.
Merge branch 'grubba/patchsystem' into devel * grubba/patchsystem: RoxenPatch: Fixed generation of mtime on old Pike. git-rxnpatch: Fixed cluster command whith existing clusters. git-rxnpatch: Ensure full blob sha1s. Fixes [bug 6853 (#6853)]. RoxenPatch: Reduce use of external binaries.
Merge branch 'grubba/patchsystem' into 5.2 * grubba/patchsystem: RoxenPatch: Fixed generation of mtime on old Pike.
RoxenPatch: Fixed generation of mtime on old Pike. Calendar.dwim_time() apparently doesn't support ISO timestamps in Pike 7.8 and earlier.
Merge branch 'grubba/patchsystem' into 5.2 * grubba/patchsystem: git-rxnpatch: Fixed cluster command whith existing clusters. git-rxnpatch: Ensure full blob sha1s. Fixes [bug 6853 (#6853)]. RoxenPatch: Reduce use of external binaries.
RoxenPatch: Reduce use of external binaries. The RoxenPatch system required a GNU-style tar command in the path to be able to generate RXP-files. Generate the RXP files by hand instead. This also has the added benefit of reducing the amount of temporary files used. Fixes building of RXPs on eg Solaris.
Merge branch 'grubba/patchsystem' into devel * grubba/patchsystem: RoxenPatch: Allow some formatting of the patch description. RoxenPatch: Support unimported patches in status. RoxenPatch: patch_status() now always returns metadata. RoxenPatch: Updated some stale documentation. RoxenPatch: Fix verify_patch_id() to work as intended.
Merge branch 'grubba/patchsystem' into 5.2 * grubba/patchsystem: RoxenPatch: Allow some formatting of the patch description. RoxenPatch: Support unimported patches in status. RoxenPatch: patch_status() now always returns metadata. RoxenPatch: Updated some stale documentation. RoxenPatch: Fix verify_patch_id() to work as intended.
RoxenPatch: Allow some formatting of the patch description. One of the most requested features. Plain text formatting of the patch description now survives patch generation and display. Some special handling of bullet lists has also been added.
RoxenPatch: patch_status() now always returns metadata. The returned mapping now contains a metadata member (with an almost empty PatchObject) even for status "unknown". This it to help streamlining code in other places.
RoxenPatch: Updated some stale documentation.
RoxenPatch: Fix verify_patch_id() to work as intended. verify_patch_id() now only accepts patch-ids that aren't embedded into paths.
Merge branch 'grubba/patchsystem' into 5.2 * grubba/patchsystem: (26 commits) git-rxnpatch: Fixed documentation miss. git-rxnpatch: Added stubs for the unimplemented commands. git-rxnpatch: Support generating patches for a subtree. git-rxnpatch: Push altered state to origin. git-rxnpatch: Added informational file affected-files.txt. git-rxnpatch: There's no need to commit when there's no change. git-rxnpatch: Separated patch subject from description. git-rxnpatch: Improved formatting of help text. git-rxnpatch: Fixed typo in handling of dependencies. git-rxnpatch: Improved generation of patch description some more. git-rxnpatch: Improved default patch description. git-rxnpatch: Fixed some options to rxnpatch. git-rxnpatch: Implement $Id$-expansion. git-rxnpatch: Fixed typo in generated patchid. git-rxnpatch: Disable use of fast-import feature "done". git-rxnpatch: Support Pikes without the Git module. git-rxnpatch: Track upstream. git-rxnpatch: Implemented some more options. git-rxnpatch: Improved validation of HEAD. git-rxnpatch: The rxnpatch/rxnpatch branch is now a normal branch ...
Merge branch 'grubba/patchsystem' into devel * grubba/patchsystem: (26 commits) git-rxnpatch: Fixed documentation miss. git-rxnpatch: Added stubs for the unimplemented commands. git-rxnpatch: Support generating patches for a subtree. git-rxnpatch: Push altered state to origin. git-rxnpatch: Added informational file affected-files.txt. git-rxnpatch: There's no need to commit when there's no change. git-rxnpatch: Separated patch subject from description. git-rxnpatch: Improved formatting of help text. git-rxnpatch: Fixed typo in handling of dependencies. git-rxnpatch: Improved generation of patch description some more. git-rxnpatch: Improved default patch description. git-rxnpatch: Fixed some options to rxnpatch. git-rxnpatch: Implement $Id$-expansion. git-rxnpatch: Fixed typo in generated patchid. git-rxnpatch: Disable use of fast-import feature "done". git-rxnpatch: Support Pikes without the Git module. git-rxnpatch: Track upstream. git-rxnpatch: Implemented some more options. git-rxnpatch: Improved validation of HEAD. git-rxnpatch: The rxnpatch/rxnpatch branch is now a normal branch ...
RoxenPatch: Extended syntax in parse_src_dest_path(). Support having different file names for source and destination. This allows for syntax like: rxnpatch create --new-file=hex.blob:modules/foo.pike
RoxenPatch: Support patchids with second resolution.
Merge branch 'grubba/patchsystem' into devel * grubba/patchsystem: RoxenPatch: Fixed bug in parse_metadata().
Merge branch 'grubba/patchsystem' into 5.2 * grubba/patchsystem: RoxenPatch: Fixed bug in parse_metadata().
RoxenPatch: Fixed bug in parse_metadata().
Merge branch 'grubba/patchsystem' into devel * grubba/patchsystem: RoxenPatch: The patcher action now knows about equvivalent patches. rxnpatch: Added support for creating fat patches. Actions: Improved presentation of platform-specific patches. RoxenPatch: PatchObject is now a class. RoxenPatch: Prepare for udiff attributes. RoxenPatch: Prepare for deletion attributes. RoxenPatch: Prepare for patch attributes. RoxenPatch: Improved forward compatibility of metadata parser. RoxenPatch: Improved detection of version of Pike. rxnpatch: Display the RXP file format version. rxnpatch: Support generation of RXP file format 1.1. RoxenPatch: Some documentation fixes. RoxenPatch: Added some special cases for Roxen and Pike. RoxenPatch: Implement RXP Fileformat 1.1 RoxenPatch: Do not complain about old rxp file versions.
Merge branch 'grubba/patchsystem' into 5.2 * grubba/patchsystem: RoxenPatch: The patcher action now knows about equvivalent patches. rxnpatch: Added support for creating fat patches. Actions: Improved presentation of platform-specific patches. RoxenPatch: PatchObject is now a class. RoxenPatch: Prepare for udiff attributes. RoxenPatch: Prepare for deletion attributes. RoxenPatch: Prepare for patch attributes. RoxenPatch: Improved forward compatibility of metadata parser. RoxenPatch: Improved detection of version of Pike. rxnpatch: Display the RXP file format version. rxnpatch: Support generation of RXP file format 1.1. RoxenPatch: Some documentation fixes. RoxenPatch: Added some special cases for Roxen and Pike. RoxenPatch: Implement RXP Fileformat 1.1 RoxenPatch: Do not complain about old rxp file versions.
Actions: Improved presentation of platform-specific patches.
RoxenPatch: PatchObject is now a class. This change improves type-checking when handling PatchObjects. Note that this change also initializes all fields, which means that the empty fields are no longer UNDEFINED, but empty arrays or multisets.
Merge branch 'patches/bug6737' into devel * patches/bug6737: RoxenPatch: Avoid ending single-line comments with backslash.
Merge branch 'patches/bug6737' into 5.2 * patches/bug6737: RoxenPatch: Avoid ending single-line comments with backslash.
RoxenPatch: Avoid ending single-line comments with backslash. The following line may get sucked into the comment, which will break the code. Fixes [bug 6737 (#6737)].
RoxenPatch: Prepare for udiff attributes. This patch changes the representation of the udiff literal patch in a PatchObject from a string to an array(mapping(string:string)), analogous to the ones for new and replace.
RoxenPatch: Prepare for deletion attributes. This patch changes the representation of the list of deleted files in a PatchObject from an array(string) to an array(mapping(string:string)), analogous to the ones for new and replace.
RoxenPatch: Prepare for patch attributes. This patch changes the representation of the list of patch files in a PatchObject from an array(string) to an array(mapping(string:string)), analogous to the ones for new and replace.
Merge branch 'patches/patchsystem-metadata' into grubba/patchsystem * patches/patchsystem-metadata: RoxenPatch: Improved forward compatibility of metadata parser.
RoxenPatch: Improved forward compatibility of metadata parser.
Merge branch 'patches/bug6036 (#6036)' into grubba/patchsystem * patches/bug6036 (#6036): Use privs in remove_patch(). Updates [bug 6036 (#6036)].
Merge branch 'patches/bug6036 (#6036)' into devel * patches/bug6036 (#6036): Use privs in remove_patch(). Updates [bug 6036 (#6036)].
Merge branch 'patches/bug6036 (#6036)' into 5.2 * patches/bug6036 (#6036): Use privs in remove_patch(). Updates [bug 6036 (#6036)].
Use privs in remove_patch(). Updates [bug 6036 (#6036)].
Language fixes.
RoxenPatch: Improved detection of version of Pike.
RoxenPatch: Some documentation fixes.
RoxenPatch: Added some special cases for Roxen and Pike.
RoxenPatch: Implement RXP Fileformat 1.1 This patch extends the dependency format with two new syntaxen: * Versions of submodules may be specified. eg "sitebuilder/5.2.200". * Multiple equivalent patches may be listed separated with "|".
RoxenPatch: Do not complain about old rxp file versions.
API documentation update.
Added Privs to remaining code interacting with the filesystem. Fixes [bug 6036 (#6036)].
Merge branch 'patch/patchprivs' into devel * patch/patchprivs: Added Privs to remaining code interacting with the filesystem. Fixes [bug 6036 (#6036)].
Merge branch 'patch/patchprivs' into 5.2 * patch/patchprivs: Added Privs to remaining code interacting with the filesystem. Fixes [bug 6036 (#6036)].
- Support any folder structure of rxp files withing tar files - Improved patch mgmt web gui documentation - Changed the "remove" link into an admin interface defacto-standard gbutton Rev: server/config_interface/actions/patcher.pike:1.28 Rev: server/etc/modules/RoxenPatch.pmod:1.40
Added support for .tgz file extension in addition to .tar and .tar.gz for multiple patch import/upload. Rev: server/etc/modules/RoxenPatch.pmod:1.39
Added rhel6_x86_64 to known platforms Rev: server/etc/modules/RoxenPatch.pmod:1.38
Importing an already imported patch will now overwrite the imported patch. Rev: server/etc/modules/RoxenPatch.pmod:1.37
Added support for importing tar files containing rxp files, via both admin interface GUI and rxnpatch command line tool. Rev: server/bin/rxnpatch.pike:1.20 Rev: server/config_interface/actions/patcher.pike:1.27 Rev: server/etc/modules/RoxenPatch.pmod:1.36
Added support for removing imported patches from disk. Rev: server/config_interface/actions/patcher.pike:1.26 Rev: server/etc/modules/RoxenPatch.pmod:1.35
RoxenPatch: Patcher::lsdiff() should now support git-style diffs as well. Fixes [bug 6166 (#6166)]. Rev: server/etc/modules/RoxenPatch.pmod:1.34
RoxenPatch: Use Privs when interacting with the filesystem. Fixes [bug 6036 (#6036)]. Rev: server/etc/modules/RoxenPatch.pmod:1.32
RoxenPatch: Use Privs when interacting with the filesystem. Fixes [bug 6036 (#6036)]. Rev: server/etc/modules/RoxenPatch.pmod:1.33
Use Process.Process instead of Process.create_process() where possible. Fixes [bug 6043 (#6043)]. Rev: server/base_server/disk_cache.pike:1.65 Rev: server/base_server/roxen.pike:1.1088 Rev: server/base_server/roxenloader.pike:1.456 Rev: server/bin/rxnpatch.pike:1.19 Rev: server/etc/env.d/nptl.pike:1.4 Rev: server/etc/modules/DBManager.pmod:1.102 Rev: server/etc/modules/ExtSQL.pmod:1.5 Rev: server/etc/modules/ExtScript.pmod:1.23 Rev: server/etc/modules/Roxen.pmod:1.315 Rev: server/etc/modules/RoxenPatch.pmod:1.32 Rev: server/etc/test/tests/patcher/RoxenTest_patcher.pike:1.10 Rev: server/etc/test/tests/pike_async_process_test_common.pike:1.6 Rev: server/modules/icecast/pl_common.pike:1.11 Rev: server/modules/scripting/cgi.pike:2.71 Rev: server/modules/scripting/fastcgi.pike:2.22 Rev: server/modules/scripting/php.pike:2.6 Rev: server/modules/tags/check_spelling.pike:1.38 Rev: server/modules/tags/emit_exec.pike:1.8
Safing for the Windows delay kludge. Since recursive_mv may finish halfway through, as opposed to mv. Rev: server/etc/modules/RoxenPatch.pmod:1.31
Use Stdio.recursive_mv to work across file systems. Fixes [bug 5924 (#5924)]. Note that this has to be combined with a fresh pike to avoid regression on Windows, since Stdio.cp (via recursive_mv) had a bug there where it could not handle directories. Rev: server/etc/modules/RoxenPatch.pmod:1.30
Don't barf if install fails and we want to undo before a backup has been created. Rev: server/etc/modules/RoxenPatch.pmod:1.29
Attempt to fix Windows file permission problem by closing files explicitly. Reported in [bug 5742 (#5742)]. Rev: server/etc/modules/RoxenPatch.pmod:1.28
Fixed typo. Rev: server/etc/modules/RoxenPatch.pmod:1.27
Improved diagnostics some more. Rev: server/etc/modules/RoxenPatch.pmod:1.26
Improved diagnostics for uninstall_patch(). Rev: server/etc/modules/RoxenPatch.pmod:1.25
Use Filesystem.Tar to extract the tar files. Fixes [bug 5474 (#5474)]. Rev: server/etc/modules/RoxenPatch.pmod:1.24
Don't preserve tar file users/permissions. Fixes [bug 5474 (#5474)]. Rev: server/etc/modules/RoxenPatch.pmod:1.23
Fixed that patches would succeed even if the diff wasn't applied [bug 4865 (#4865)] and also fixed the dependency checking. Rev: server/etc/modules/RoxenPatch.pmod:1.22
Fixed a quoting problem in Admin Interface. Rev: server/config_interface/actions/patcher.pike:1.15 Rev: server/etc/modules/RoxenPatch.pmod:1.21
Fixed listing of which files are affected by applying unified diffs. Rev: server/bin/rxnpatch.pike:1.14 Rev: server/etc/modules/RoxenPatch.pmod:1.20
Added some NT paranoia. Various minor fixes. Some minor documentation updates. Rev: server/etc/modules/RoxenPatch.pmod:1.19
Minor changes Rev: server/etc/modules/RoxenPatch.pmod:1.18
Formated version output Rev: server/bin/rxnpatch.pike:1.11 Rev: server/etc/modules/RoxenPatch.pmod:1.17
Fixed typo Rev: server/etc/modules/RoxenPatch.pmod:1.16
Fixed bug when removing files. Rev: server/etc/modules/RoxenPatch.pmod:1.15
Fixed version and platform checking Rev: server/bin/rxnpatch.pike:1.8 Rev: server/etc/modules/RoxenPatch.pmod:1.14
More error handling when creating patches Rev: server/bin/rxnpatch.pike:1.7 Rev: server/etc/modules/RoxenPatch.pmod:1.13
Fixed the path for external tools Rev: server/etc/modules/RoxenPatch.pmod:1.12
Adjustments to work with Windows Rev: server/bin/rxnpatch.pike:1.6 Rev: server/etc/modules/RoxenPatch.pmod:1.11
Adjustments to make the patch system work under Windows(R) Rev: server/etc/modules/RoxenPatch.pmod:1.10
Fixed typo Rev: server/etc/modules/RoxenPatch.pmod:1.9
Fixed patch listing when encountering unexpected directories. Rev: server/etc/modules/RoxenPatch.pmod:1.8
Rewritten dependency handling Rewritten feedback messages handling Added more autodoc comments Rev: server/etc/modules/RoxenPatch.pmod:1.7
Commented out a command line argument for patch(1) that is only supported on debian systems. Rev: server/etc/modules/RoxenPatch.pmod:1.6
Fixed tar extraction on Mac Rev: server/etc/modules/RoxenPatch.pmod:1.5
Fixed server version check. Rev: server/etc/modules/RoxenPatch.pmod:1.4
Fixed a problem with XML parsing Rev: server/etc/modules/RoxenPatch.pmod:1.3
Fixed a bad assignment. Rev: server/etc/modules/RoxenPatch.pmod:1.2
Support library for patch handler Rev: server/etc/modules/RoxenPatch.pmod:1.1