August 2020 - openSUSE Commits - openSUSE Mailing Lists

commit python-autobahn for openSUSE:Factory
by root 31 Aug '20

31 Aug '20

Hello community, here is the log from the commit of package python-autobahn for openSUSE:Factory checked in at 2020-08-31 16:53:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-autobahn (Old) and /work/SRC/openSUSE:Factory/.python-autobahn.new.3399 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-autobahn" Mon Aug 31 16:53:19 2020 rev:14 rq:830724 version:20.7.1 Changes: -------- --- /work/SRC/openSUSE:Factory/python-autobahn/python-autobahn.changes 2020-08-20 22:31:34.824058539 +0200 +++ /work/SRC/openSUSE:Factory/.python-autobahn.new.3399/python-autobahn.changes 2020-08-31 16:53:40.068453838 +0200 @@ -1,0 +2,5 @@ +Mon Aug 31 10:06:55 UTC 2020 - Guillaume GARDET <guillaume.gardet(a)opensuse.org> + +- Fix installation path when NVX is not used (fix aarch64) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-autobahn.spec ++++++ --- /var/tmp/diff_new_pack.P4XQTK/_old 2020-08-31 16:53:40.860454222 +0200 +++ /var/tmp/diff_new_pack.P4XQTK/_new 2020-08-31 16:53:40.864454224 +0200 @@ -110,7 +110,11 @@ %python_install %python_clone -a %{buildroot}%{_bindir}/wamp %python_clone -a %{buildroot}%{_bindir}/xbrnetwork +%if %{with nvx_support} %python_expand %fdupes %{buildroot}%{$python_sitearch} +%else +%python_expand %fdupes %{buildroot}%{$python_sitelib} +%endif %if %{with nvx_support} # It tries to test NVX, even if disabled @@ -131,7 +135,11 @@ %files %{python_files} %license LICENSE %doc README.rst +%if %{with nvx_support} %{python_sitearch}/* +%else +%{python_sitelib}/* +%endif %python_alternative %{_bindir}/wamp %python_alternative %{_bindir}/xbrnetwork

1 0

commit xfce4-screensaver for openSUSE:Factory
by root 31 Aug '20

31 Aug '20

Hello community, here is the log from the commit of package xfce4-screensaver for openSUSE:Factory checked in at 2020-08-31 16:53:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xfce4-screensaver (Old) and /work/SRC/openSUSE:Factory/.xfce4-screensaver.new.3399 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xfce4-screensaver" Mon Aug 31 16:53:14 2020 rev:8 rq:830718 version:0.1.10 Changes: -------- --- /work/SRC/openSUSE:Factory/xfce4-screensaver/xfce4-screensaver.changes 2020-03-30 23:03:28.100178736 +0200 +++ /work/SRC/openSUSE:Factory/.xfce4-screensaver.new.3399/xfce4-screensaver.changes 2020-08-31 16:53:35.180451468 +0200 @@ -1,0 +2,5 @@ +Thu Aug 27 12:59:25 UTC 2020 - Callum Farmer <callumjfarmer13(a)gmail.com> + +- Fixes for %_libexecdir changing to /usr/libexec (bsc#1174075) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xfce4-screensaver.spec ++++++ --- /var/tmp/diff_new_pack.zK9KzT/_old 2020-08-31 16:53:36.728452219 +0200 +++ /var/tmp/diff_new_pack.zK9KzT/_new 2020-08-31 16:53:36.732452221 +0200 @@ -93,7 +93,7 @@ %license COPYING COPYING.LGPL COPYING.LIB %doc README.md NEWS TODO ChangeLog %dir %{_sysconfdir}/xdg/menus -%dir %{_prefix}/lib/xfce4-screensaver +%dir %{_libexecdir}/xfce4-screensaver %dir %{_datadir}/applications/screensavers %dir %{_datadir}/desktop-directories %config %{_sysconfdir}/xdg/autostart/xfce4-screensaver.desktop @@ -103,11 +103,11 @@ %{_bindir}/xfce4-screensaver-command %{_bindir}/xfce4-screensaver-configure %{_bindir}/xfce4-screensaver-preferences -%{_prefix}/lib/xfce4-screensaver-dialog -%{_prefix}/lib/xfce4-screensaver-gl-helper -%{_prefix}/lib/xfce4-screensaver/floaters -%{_prefix}/lib/%{name}/popsquares -%{_prefix}/lib/%{name}/slideshow +%{_libexecdir}/xfce4-screensaver-dialog +%{_libexecdir}/xfce4-screensaver-gl-helper +%{_libexecdir}/xfce4-screensaver/floaters +%{_libexecdir}/%{name}/popsquares +%{_libexecdir}/%{name}/slideshow %{_datadir}/applications/screensavers/xfce-floaters.desktop %{_datadir}/applications/xfce4-screensaver-preferences.desktop %{_datadir}/applications/screensavers/xfce-personal-slideshow.desktop

1 0

commit pcsx2 for openSUSE:Factory
by root 31 Aug '20

31 Aug '20

Hello community, here is the log from the commit of package pcsx2 for openSUSE:Factory checked in at 2020-08-31 16:53:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pcsx2 (Old) and /work/SRC/openSUSE:Factory/.pcsx2.new.3399 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "pcsx2" Mon Aug 31 16:53:01 2020 rev:15 rq:830699 version:1.6.0 Changes: -------- --- /work/SRC/openSUSE:Factory/pcsx2/pcsx2.changes 2020-06-23 21:05:04.553935544 +0200 +++ /work/SRC/openSUSE:Factory/.pcsx2.new.3399/pcsx2.changes 2020-08-31 16:53:22.516445329 +0200 @@ -1,0 +2,7 @@ +Thu Aug 27 10:13:26 UTC 2020 - Martin Hauke <mardnh(a)gmx.de> + +- Build with "-DDISABLE_ADVANCE_SIMD=ON" otherwise it builds with + "-march=native" and thus uses SIMD's that aren't available on all + systems. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pcsx2.spec ++++++ --- /var/tmp/diff_new_pack.lSjlvZ/_old 2020-08-31 16:53:24.536446308 +0200 +++ /var/tmp/diff_new_pack.lSjlvZ/_new 2020-08-31 16:53:24.536446308 +0200 @@ -289,6 +289,7 @@ -DUSER_CMAKE_CXX_FLAGS="-Wno-narrowing" \ -DXDG_STD=ON \ -DPACKAGE_MODE=ON \ + -DDISABLE_ADVANCE_SIMD=ON \ -DPLUGIN_DIR="%{_libdir}/%{name}" \ -DGAMEINDEX_DIR="%{_datadir}/%{name}" \ -DGLSL_SHADER_DIR="%{_datadir}/%{name}" \

1 0

commit wordnet for openSUSE:Factory
by root 31 Aug '20

31 Aug '20

Hello community, here is the log from the commit of package wordnet for openSUSE:Factory checked in at 2020-08-31 16:52:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/wordnet (Old) and /work/SRC/openSUSE:Factory/.wordnet.new.3399 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "wordnet" Mon Aug 31 16:52:57 2020 rev:15 rq:830702 version:3.0 Changes: -------- --- /work/SRC/openSUSE:Factory/wordnet/wordnet.changes 2017-06-01 16:34:56.792398543 +0200 +++ /work/SRC/openSUSE:Factory/.wordnet.new.3399/wordnet.changes 2020-08-31 16:53:17.488442891 +0200 @@ -1,0 +2,6 @@ +Fri Aug 28 21:43:28 UTC 2020 - Atri Bhattacharya <badshah400(a)gmail.com> + +- Disable LTO since it causes segmentation faults when running. +- Run spec-cleaner to clean up specfile. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wordnet.spec ++++++ --- /var/tmp/diff_new_pack.DXpr82/_old 2020-08-31 16:53:19.060443653 +0200 +++ /var/tmp/diff_new_pack.DXpr82/_new 2020-08-31 16:53:19.064443655 +0200 @@ -1,7 +1,7 @@ # # spec file for package wordnet # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,21 +12,21 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # %define dbver 3.1 %define sover 3 %define lib_name libWN%{sover} - +%define _lto_cflags %{nil} Name: wordnet Version: 3.0 Release: 0 Summary: A lexical database for the English language License: MIT Group: Productivity/Office/Dictionary -Url: http://wordnet.princeton.edu +URL: https://wordnet.princeton.edu Source0: http://wordnetcode.princeton.edu/3.0/WordNet-%{version}.tar.bz2 # Updated dict files as drop-in replacement Source1: http://wordnetcode.princeton.edu/wn%{dbver}.dict.tar.gz @@ -49,7 +49,6 @@ BuildRequires: xorg-x11-libXext-devel Requires: tcl Requires: tk -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description WordNet is a large lexical database of English. @@ -115,7 +114,7 @@ CFLAGS="%{optflags} -DUSE_INTERP_RESULT" %configure --enable-static=no --prefix=%{_datadir}/wordnet-%{version}/ -make %{?_smp_mflags} +%make_build %install %make_install DESTDIR=%{buildroot} @@ -137,23 +136,21 @@ %postun -n %{lib_name} -p /sbin/ldconfig %files -%defattr(-,root,root) -%doc AUTHORS COPYING ChangeLog README doc/{html,ps,pdf} +%license COPYING +%doc AUTHORS ChangeLog README doc/{html,ps,pdf} %{_bindir}/wishwn %{_bindir}/wn %{_bindir}/wnb -%{_mandir}/man1/*.1%{ext_man} -%{_mandir}/man5/*.5%{ext_man} -%{_mandir}/man7/*.7%{ext_man} +%{_mandir}/man1/*.1%{?ext_man} +%{_mandir}/man5/*.5%{?ext_man} +%{_mandir}/man7/*.7%{?ext_man} %{_datadir}/%{name}-%{version}/ %files -n %{lib_name} -%defattr(-,root,root) %{_libdir}/libWN.so.%{sover}* %files devel -%defattr(-,root,root,-) -%{_mandir}/man3/*.3%{ext_man} +%{_mandir}/man3/*.3%{?ext_man} %{_includedir}/wn.h %{_libdir}/libWN.so

1 0

commit borgmatic for openSUSE:Factory
by root 31 Aug '20

31 Aug '20

Hello community, here is the log from the commit of package borgmatic for openSUSE:Factory checked in at 2020-08-31 16:52:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/borgmatic (Old) and /work/SRC/openSUSE:Factory/.borgmatic.new.3399 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "borgmatic" Mon Aug 31 16:52:54 2020 rev:24 rq:830717 version:1.5.10 Changes: -------- --- /work/SRC/openSUSE:Factory/borgmatic/borgmatic.changes 2020-07-28 17:29:23.762180962 +0200 +++ /work/SRC/openSUSE:Factory/.borgmatic.new.3399/borgmatic.changes 2020-08-31 16:53:14.188441291 +0200 @@ -1,0 +2,16 @@ +Mon Aug 31 09:35:40 UTC 2020 - Antonio Larrosa <alarrosa(a)suse.com> + +- Update to 1.5.10 + * #347: Add hooks that run for the "extract" action: + "before_extract" and "after_extract". + * #350: Fix traceback when a configuration directory is + non-readable due to directory permissions. + * Add documentation navigation links on left side of all + documentation pages. + * Clarify documentation on configuration overrides, specifically + the portion about list syntax: + http://torsion.org/borgmatic/docs/how-to/make-per-application-backups/#conf… + * Clarify documentation overview of monitoring options: + http://torsion.org/borgmatic/docs/how-to/monitor-your-backups/ + +------------------------------------------------------------------- @@ -5,4 +21,4 @@ -* #300: Add “borgmatic export-tar” action to export an archive to a - tar-formatted file or stream. -* #339: Fix for intermittent timing-related test failure of logging - function. + * #300: Add “borgmatic export-tar” action to export an archive to + a tar-formatted file or stream. + * #339: Fix for intermittent timing-related test failure of + logging function. @@ -10,2 +26 @@ - character/block devices to prevent - hangs. + character/block devices to prevent hangs. Old: ---- borgmatic-1.5.9.tar.gz New: ---- borgmatic-1.5.10.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ borgmatic.spec ++++++ --- /var/tmp/diff_new_pack.jusBsI/_old 2020-08-31 16:53:15.036441702 +0200 +++ /var/tmp/diff_new_pack.jusBsI/_new 2020-08-31 16:53:15.044441706 +0200 @@ -17,7 +17,7 @@ Name: borgmatic -Version: 1.5.9 +Version: 1.5.10 Release: 0 Summary: Automation tool for borgbackup License: GPL-3.0-only ++++++ borgmatic-1.5.9.tar.gz -> borgmatic-1.5.10.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/borgmatic-1.5.9/.eleventy.js new/borgmatic-1.5.10/.eleventy.js --- old/borgmatic-1.5.9/.eleventy.js 2020-07-23 06:53:55.000000000 +0200 +++ new/borgmatic-1.5.10/.eleventy.js 2020-08-21 23:27:47.000000000 +0200 @@ -1,9 +1,11 @@ const pluginSyntaxHighlight = require("@11ty/eleventy-plugin-syntaxhighlight"); const inclusiveLangPlugin = require("@11ty/eleventy-plugin-inclusive-language"); +const navigationPlugin = require("@11ty/eleventy-navigation"); module.exports = function(eleventyConfig) { eleventyConfig.addPlugin(pluginSyntaxHighlight); eleventyConfig.addPlugin(inclusiveLangPlugin); + eleventyConfig.addPlugin(navigationPlugin); let markdownIt = require("markdown-it"); let markdownItAnchor = require("markdown-it-anchor"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/borgmatic-1.5.9/NEWS new/borgmatic-1.5.10/NEWS --- old/borgmatic-1.5.9/NEWS 2020-07-23 06:53:55.000000000 +0200 +++ new/borgmatic-1.5.10/NEWS 2020-08-21 23:27:47.000000000 +0200 @@ -1,3 +1,12 @@ +1.5.10 + * #347: Add hooks that run for the "extract" action: "before_extract" and "after_extract". + * #350: Fix traceback when a configuration directory is non-readable due to directory permissions. + * Add documentation navigation links on left side of all documentation pages. + * Clarify documentation on configuration overrides, specifically the portion about list syntax: + http://torsion.org/borgmatic/docs/how-to/make-per-application-backups/#conf… + * Clarify documentation overview of monitoring options: + http://torsion.org/borgmatic/docs/how-to/monitor-your-backups/ + 1.5.9 * #300: Add "borgmatic export-tar" action to export an archive to a tar-formatted file or stream. * #339: Fix for intermittent timing-related test failure of logging function. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/borgmatic-1.5.9/README.md new/borgmatic-1.5.10/README.md --- old/borgmatic-1.5.9/README.md 2020-07-23 06:53:55.000000000 +0200 +++ new/borgmatic-1.5.10/README.md 2020-08-21 23:27:47.000000000 +0200 @@ -22,8 +22,8 @@ # Paths of local or remote repositories to backup to. repositories: - - 1234@usw-s001.rsync.net:backups.borg - k8pDxu32@k8pDxu32.repo.borgbase.com:repo + - 1234@usw-s001.rsync.net:backups.borg - /var/lib/backups/local.borg retention: @@ -66,31 +66,19 @@ <a href="https://healthchecks.io/"><img src="docs/static/healthchecks.png" alt="Healthchecks" height="60px" style="margin-bottom:20px;"></a>      <a href="https://cronitor.io/"><img src="docs/static/cronitor.png" alt="Cronitor" height="60px" style="margin-bottom:20px;"></a>      <a href="https://cronhub.io/"><img src="docs/static/cronhub.png" alt="Cronhub" height="60px" style="margin-bottom:20px;"></a>      -<a href="https://www.pagerduty.com/"><img src="docs/static/pagerduty.png" alt="PagerDuty" height="60px" style="margin-bottom:20px;"></a>      -<a href="https://www.rsync.net/cgi-bin/borg.cgi?campaign=borg&adgroup=borgmatic"><img src="docs/static/rsyncnet.png" alt="rsync.net" height="60px" style="margin-bottom:20px;"></a>      +<a href="https://www.pagerduty.com/"><img src="docs/static/pagerduty.png" alt="PagerDuty" height="60px" style="margin-bottom:20px;"></a> <a href="https://www.borgbase.com/?utm_source=borgmatic"><img src="docs/static/borgbase.png" alt="BorgBase" height="60px" style="margin-bottom:20px;"></a>      +<img src="docs/static/rsyncnet.png" alt="rsync.net" height="60px" style="margin-bottom:20px;">      -## How-to guides - - * [Set up backups with borgmatic](https://torsion.org/borgmatic/docs/how-to/set-up-backups/) ⬅ *Start here!* - * [Make per-application backups](https://torsion.org/borgmatic/docs/how-to/make-per-application-bac… - * [Make backups redundant](https://torsion.org/borgmatic/docs/how-to/make-backups-redundant… - * [Deal with very large backups](https://torsion.org/borgmatic/docs/how-to/deal-with-very-large-bac… - * [Inspect your backups](https://torsion.org/borgmatic/docs/how-to/inspect-your-backups/) - * [Monitor your backups](https://torsion.org/borgmatic/docs/how-to/monitor-your-backups/) - * [Extract a backup](https://torsion.org/borgmatic/docs/how-to/extract-a-backup/) - * [Backup your databases](https://torsion.org/borgmatic/docs/how-to/backup-your-databases/) - * [Add preparation and cleanup steps to backups](https://torsion.org/borgmatic/docs/how-to/add-preparation-and-clea… - * [Backup to a removable drive or an intermittent server](https://torsion.org/borgmatic/docs/how-to/backup-to-a-removable-dri… - * [Upgrade borgmatic](https://torsion.org/borgmatic/docs/how-to/upgrade/) - * [Develop on borgmatic](https://torsion.org/borgmatic/docs/how-to/develop-on-borgmatic/) - +## Getting started -## Reference guides +Your first step is to [install and configure +borgmatic](https://torsion.org/borgmatic/docs/how-to/set-up-backups/). - * [borgmatic configuration reference](https://torsion.org/borgmatic/docs/reference/configuration/) - * [borgmatic command-line reference](https://torsion.org/borgmatic/docs/reference/command-line/) +For additional documentation, check out the links above for <a +href="https://torsion.org/borgmatic/#documentation">borgmatic how-to and +reference guides</a>. ## Hosting providers @@ -101,8 +89,8 @@ links, but without any tracking scripts or cookies.) <ul> - <li class="referral"><a href="https://www.rsync.net/cgi-bin/borg.cgi?campaign=borg&adgroup=borgmatic">rsync.net</a>: Cloud Storage provider with full support for borg and any other SSH/SFTP tool</li> <li class="referral"><a href="https://www.borgbase.com/?utm_source=borgmatic">BorgBase</a>: Borg hosting service with support for monitoring, 2FA, and append-only repos</li> + <li>rsync.net: Cloud Storage provider with full support for borg and any other SSH/SFTP tool</li> </ul> ## Support and contributing diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/borgmatic-1.5.9/borgmatic/commands/borgmatic.py new/borgmatic-1.5.10/borgmatic/commands/borgmatic.py --- old/borgmatic-1.5.9/borgmatic/commands/borgmatic.py 2020-07-23 06:53:55.000000000 +0200 +++ new/borgmatic-1.5.10/borgmatic/commands/borgmatic.py 2020-08-21 23:27:47.000000000 +0200 @@ -91,6 +91,14 @@ 'pre-check', global_arguments.dry_run, ) + if 'extract' in arguments: + command.execute_hook( + hooks.get('before_extract'), + hooks.get('umask'), + config_filename, + 'pre-extract', + global_arguments.dry_run, + ) if prune_create_or_check: dispatch.call_hooks( 'ping_monitor', @@ -165,6 +173,14 @@ 'post-check', global_arguments.dry_run, ) + if 'extract' in arguments: + command.execute_hook( + hooks.get('after_extract'), + hooks.get('umask'), + config_filename, + 'post-extract', + global_arguments.dry_run, + ) if prune_create_or_check: dispatch.call_hooks( 'ping_monitor', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/borgmatic-1.5.9/borgmatic/config/collect.py new/borgmatic-1.5.10/borgmatic/config/collect.py --- old/borgmatic-1.5.9/borgmatic/config/collect.py 2020-07-23 06:53:55.000000000 +0200 +++ new/borgmatic-1.5.10/borgmatic/config/collect.py 2020-08-21 23:27:47.000000000 +0200 @@ -44,6 +44,9 @@ yield path continue + if not os.access(path, os.R_OK): + continue + for filename in sorted(os.listdir(path)): full_filename = os.path.join(path, filename) matching_filetype = full_filename.endswith('.yaml') or full_filename.endswith('.yml') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/borgmatic-1.5.9/borgmatic/config/schema.yaml new/borgmatic-1.5.10/borgmatic/config/schema.yaml --- old/borgmatic-1.5.9/borgmatic/config/schema.yaml 2020-07-23 06:53:55.000000000 +0200 +++ new/borgmatic-1.5.10/borgmatic/config/schema.yaml 2020-08-21 23:27:47.000000000 +0200 @@ -123,7 +123,7 @@ patterns" for more details. example: - '*.pyc' - - ~/*/.cache + - /home/*/.cache - /etc/ssl exclude_from: seq: @@ -473,6 +473,14 @@ before consistency checks, run once per configuration file. example: - echo "Starting checks." + before_extract: + seq: + - type: str + desc: | + List of one or more shell commands or scripts to execute + before extracting a backup, run once per configuration file. + example: + - echo "Starting extracting." after_backup: seq: - type: str @@ -497,6 +505,14 @@ after consistency checks, run once per configuration file. example: - echo "Finished checks." + after_extract: + seq: + - type: str + desc: | + List of one or more shell commands or scripts to execute + after extracting a backup, run once per configuration file. + example: + - echo "Finished extracting." on_error: seq: - type: str @@ -506,6 +522,26 @@ "check" action or an associated before/after hook. example: - echo "Error during prune/create/check." + before_everything: + seq: + - type: str + desc: | + List of one or more shell commands or scripts to execute + before running all actions (if one of them is "create"). + These are collected from all configuration files and then + run once before all of them (prior to all actions). + example: + - echo "Starting actions." + after_everything: + seq: + - type: str + desc: | + List of one or more shell commands or scripts to execute + after running all actions (if one of them is "create"). + These are collected from all configuration files and then + run once after all of them (after any action). + example: + - echo "Completed actions." postgresql_databases: seq: - map: @@ -693,26 +729,6 @@ documentation for details. example: https://cronhub.io/start/1f5e3410-254c-11e8-b61d-55875966d01 - before_everything: - seq: - - type: str - desc: | - List of one or more shell commands or scripts to execute - before running all actions (if one of them is "create"). - These are collected from all configuration files and then - run once before all of them (prior to all actions). - example: - - echo "Starting actions." - after_everything: - seq: - - type: str - desc: | - List of one or more shell commands or scripts to execute - after running all actions (if one of them is "create"). - These are collected from all configuration files and then - run once before all of them (prior to all actions). - example: - - echo "Completed actions." umask: type: scalar desc: | diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/borgmatic-1.5.9/docs/Dockerfile new/borgmatic-1.5.10/docs/Dockerfile --- old/borgmatic-1.5.9/docs/Dockerfile 2020-07-23 06:53:55.000000000 +0200 +++ new/borgmatic-1.5.10/docs/Dockerfile 2020-08-21 23:27:47.000000000 +0200 @@ -16,6 +16,7 @@ RUN npm install @11ty/eleventy \ @11ty/eleventy-plugin-syntaxhighlight \ @11ty/eleventy-plugin-inclusive-language \ + @11ty/eleventy-navigation \ markdown-it \ markdown-it-anchor \ markdown-it-replace-link diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/borgmatic-1.5.9/docs/_includes/components/lists.css new/borgmatic-1.5.10/docs/_includes/components/lists.css --- old/borgmatic-1.5.9/docs/_includes/components/lists.css 2020-07-23 06:53:55.000000000 +0200 +++ new/borgmatic-1.5.10/docs/_includes/components/lists.css 2020-08-21 23:27:47.000000000 +0200 @@ -1,8 +1,7 @@ /* Buzzwords */ @keyframes rainbow { 0% { background-position: 0% 50%; } - 50% { background-position: 100% 50%; } - 100% { background-position: 0% 50%; } + 100% { background-position: 100% 50%; } } .buzzword-list, .inlinelist { @@ -25,6 +24,7 @@ margin: 4px 4px 4px 0; transition: .15s linear outline; } + .inlinelist .inlinelist-item.active { background-color: #222; color: #fff; @@ -36,6 +36,38 @@ } .inlinelist .inlinelist-item code { background-color: transparent; + font-size: 80%; + margin-left: 6px; + padding-left: 6px; + display: inline-block; + position: relative; +} +@media (max-width: 26.8125em) { /* 429px */ + .inlinelist .inlinelist-item { + overflow: hidden; + } + .inlinelist .inlinelist-item code { + float: right; + line-height: 1.75; + } +} +@media (min-width: 26.875em) { /* 430px */ + .inlinelist .inlinelist-item code { + float: none; + } + .inlinelist .inlinelist-item code:before { + content: " "; + border-left: 1px solid rgba(255,255,255,.8); + position: absolute; + left: -2px; + top: -2px; + bottom: 2px; + } + @media (prefers-color-scheme: dark) { + .inlinelist .inlinelist-item code:before { + border-left-color: rgba(0,0,0,.8); + } + } } a.buzzword { text-decoration: underline; @@ -59,44 +91,74 @@ .buzzword { background-color: #f7f7f7; } +@media (prefers-color-scheme: dark) { + .buzzword-list li, + .buzzword { + background-color: #080808; + } +} .inlinelist .inlinelist-item { background-color: #e9e9e9; } +@media (prefers-color-scheme: dark) { + .inlinelist .inlinelist-item { + background-color: #000; + } + .inlinelist .inlinelist-item a { + color: #fff; + } + .inlinelist .inlinelist-item code { + color: inherit; + } +} .inlinelist .inlinelist-item:hover, .inlinelist .inlinelist-item:focus, .buzzword-list li:hover, .buzzword-list li:focus, .buzzword:hover, -.buzzword:focus { +.buzzword:focus, +.rainbow-active:hover, +.rainbow-active:focus { position: relative; background-image: linear-gradient(238deg, #ff0000, #ff8000, #ffff00, #80ff00, #00ff00, #00ff80, #00ffff, #0080ff, #0000ff, #8000ff, #ff0080); background-size: 1200% 1200%; + background-position: 2% 80%; color: #fff; text-shadow: 0 0 2px rgba(0,0,0,.9); - animation: rainbow 1.6s infinite; + animation: rainbow 4s ease-out alternate infinite; +} +.rainbow-active-noanim { + animation: none !important; } .inlinelist .inlinelist-item:hover a, .inlinelist .inlinelist-item:focus a, .buzzword-list li:hover a, .buzzword-list li:focus a, a.buzzword:hover, -a.buzzword:focus { +a.buzzword:focus, +a.rainbow-active:hover, +a.rainbow-active:focus { color: #fff; text-decoration: none; } -/* -I wish there were a PE friendly way to do this but media queries don’t work work with @supports -@media (prefers-reduced-motion: no-preference) { +@media (prefers-reduced-motion: reduce) { + .inlinelist .inlinelist-item:hover, + .inlinelist .inlinelist-item:focus, + .buzzword-list li:hover, + .buzzword-list li:focus, .buzzword:hover, - .buzzword:focus { - animation: rainbow 1s infinite; + .buzzword:focus, + .rainbow-active:hover, + .rainbow-active:focus { + animation: none; } -}*/ +} + .buzzword-list li:hover:after, .buzzword-list li:focus:after, .buzzword:hover:after, .buzzword:focus:after { - font-family: system-ui, sans-serif; + font-family: system-ui, -apple-system, sans-serif; content: "Buzzword alert!!!"; position: absolute; left: 0; @@ -123,4 +185,94 @@ main h3 a.buzzword, main p a.buzzword { text-decoration: underline; -} \ No newline at end of file +} + +/* Small viewport */ +@media (max-width: 26.8125em) { /* 429px */ + .inlinelist .inlinelist-item { + display: block; + width: auto; + padding: 0; + line-height: 1.4; + } + .inlinelist .inlinelist-item > a { + display: block; + padding: .2em .5em; + } +} +@media (min-width: 26.875em) { /* 430px */ + .inlinelist .inlinelist-item > a { + display: inline-block; + white-space: nowrap; + } +} + +.numberflag { + display: inline-flex; + align-items: center; + justify-content: center; + background-color: #dff7ff; + border-radius: 50%; + width: 1.75em; + height: 1.75em; + font-weight: 600; +} +@media (prefers-color-scheme: dark) { + .numberflag { + background-color: #00bcd4; + color: #222; + } +} +h1 .numberflag, +h2 .numberflag, +h3 .numberflag, +h4 .numberflag, +h5 .numberflag { + width: 1.25em; + height: 1.25em; +} +h2 .numberflag { + position: relative; + margin-right: 0.25em; /* 10px /40 */ +} +h2 .numberflag:after { + content: " "; + position: absolute; + bottom: -1px; + left: 0; + height: 1px; + background-color: #fff; + width: calc(100% + 0.4em); /* 16px /40 */ +} +@media (prefers-color-scheme: dark) { + h2 .numberflag:after { + background-color: #222; + } +} + +/* Super featured list on home page */ +.list-superfeatured .avatar { + width: calc(30px + 5vw); + height: calc(30px + 5vw); + max-width: 60px; + max-height: 60px; + margin-left: 0; +} +@media (max-width: 26.8125em) { /* 429px */ + .list-superfeatured .inlinelist-item > a { + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + } +} +@media (min-width: 26.875em) { /* 430px */ + .list-superfeatured .inlinelist-item { + font-size: 110%; + } +} + +/* Only top level */ +.inlinelist-no-nest ul, +.inlinelist-no-nest ol { + display: none; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/borgmatic-1.5.9/docs/_includes/components/minilink.css new/borgmatic-1.5.10/docs/_includes/components/minilink.css --- old/borgmatic-1.5.9/docs/_includes/components/minilink.css 2020-07-23 06:53:55.000000000 +0200 +++ new/borgmatic-1.5.10/docs/_includes/components/minilink.css 2020-08-21 23:27:47.000000000 +0200 @@ -10,7 +10,20 @@ font-weight: 500; margin: 0 0.4285714285714em 0.07142857142857em 0; /* 0 6px 1px 0 /14 */ line-height: 1.285714285714; /* 18px /14 */ - font-family: system-ui, sans-serif; + font-family: system-ui, -apple-system, sans-serif; +} +@media (prefers-color-scheme: dark) { + .minilink { + background-color: #222; + /* + !important to override .elv-callout a + see _includes/components/callout.css + */ + color: #fff !important; + } +} +table .minilink { + margin-top: 6px; } .minilink[href] { box-shadow: 0 1px 1px 0 rgba(0,0,0,.5); @@ -19,6 +32,12 @@ .minilink[href]:focus { background-color: #bbb; } +@media (prefers-color-scheme: dark) { + .minilink[href]:hover, + .minilink[href]:focus { + background-color: #444; + } +} pre + .minilink { color: #fff; border-radius: 0 0 0.2857142857143em 0.2857142857143em; /* 4px /14 */ @@ -35,6 +54,54 @@ margin-left: 2em; margin-bottom: 2em; } +h1 .minilink, +h2 .minilink, +h3 .minilink, +h4 .minilink { + font-size: 0.9375rem; /* 15px /16 */ + vertical-align: middle; + margin-left: 1em; +} +h3 .minilink, +h4 .minilink { + font-size: 0.8125rem; /* 13px /16 */ +} .minilink + pre[class*=language-] { clear: both; -} \ No newline at end of file +} + +.minilink-addedin { + text-transform: none; + box-shadow: 0 0 0 1px rgba(0,0,0,0.3); +} +@media (prefers-color-scheme: dark) { + .minilink-addedin { + box-shadow: 0 0 0 1px rgba(255,255,255,0.3); + } +} +.minilink-addedin:not(:first-child) { + margin-left: .5em; +} +.minilink-addedin.minilink-inline { + margin: 0 4px; + background-color: #fff; +} + +.minilink-lower { + text-transform: none; + background-color: transparent; +} +.minilink-lower[href] { + box-shadow: 0 0 0 1px rgba(0,0,0,0.5); +} +.minilink-lower[href]:hover, +.minilink-lower[href]:focus { + background-color: #eee; +} + +.minilink > .minilink { + margin: -.125em .375em -.125em -.375em; + box-shadow: none; + border-top-right-radius: 0; + border-bottom-right-radius: 0; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/borgmatic-1.5.9/docs/_includes/components/toc.css new/borgmatic-1.5.10/docs/_includes/components/toc.css --- old/borgmatic-1.5.9/docs/_includes/components/toc.css 2020-07-23 06:53:55.000000000 +0200 +++ new/borgmatic-1.5.10/docs/_includes/components/toc.css 2020-08-21 23:27:47.000000000 +0200 @@ -1,63 +1,111 @@ .elv-toc { font-size: 1rem; /* Reset */ } +.elv-toc details { + --details-force-closed: (max-width: 63.9375em); /* 1023px */ +} +.elv-toc details > summary { + font-size: 1.375rem; /* 22px /16 */ + margin-bottom: .5em; +} @media (min-width: 64em) { /* 1024px */ .elv-toc { position: absolute; - left: -17rem; + left: 3rem; width: 16rem; + z-index: 1; + } + .elv-toc details > summary { + margin-top: 0; + } + .js .elv-toc details > summary { + display: none; } } - .elv-toc-list { + display: flex; + flex-wrap: wrap; + justify-content: space-between; padding-left: 0; padding-right: 0; + margin: 0 0 2.5em; list-style: none; } +.elv-toc-list li { + font-size: 0.9375em; /* 15px /16 */ + line-height: 1.466666666667; /* 22px /15 */ +} /* Nested lists */ .elv-toc-list ul { - padding: 0; - display: none; - margin-bottom: 1.5em; + padding: 0 0 .75em 0; + margin: 0; list-style: none; } -.elv-toc-list ul li { - padding-left: 0.875em; /* 14px /16 */ + +/* Menus nested 2 or more deep */ +.elv-toc-list ul ul { + padding-bottom: 0; + padding-left: 0.625rem; /* 10px /16 */ } -@media (min-width: 64em) and (min-height: 48em) { /* 1024 x 768px */ - .elv-toc-list ul { - display: block; - } +/* Hide inactive menus 3 or more deep */ +.elv-toc-list ul ul > li:not(.elv-toc-active) > ul > li:not(.elv-toc-active) { + display: none; } /* List items */ +.elv-toc summary, +.elv-toc-list a { + padding: .15em .25em; +} +.elv-toc-list a { + display: block; +} .elv-toc-list a:not(:hover) { text-decoration: none; } .elv-toc-list li { - padding-top: 0; - padding-bottom: 0; - margin: .1em 0 .5em; + margin: 0; + padding: 0; +} +.elv-toc-list > li { + flex-grow: 1; + flex-basis: 14.375rem; /* 230px /16 */ } /* Top level links */ .elv-toc-list > li > a { - font-weight: 400; - font-size: 1.0625em; /* 17px /16 */ color: #222; + font-weight: 600; + border-bottom: 1px solid #ddd; + margin-bottom: 0.25em; /* 4px /16 */ +} +@media (prefers-color-scheme: dark) { + .elv-toc-list > li > a { + color: #fff; + border-color: #444; + } } /* Active links */ .elv-toc-list li.elv-toc-active > a { - font-weight: 700; - text-decoration: underline; + background-color: #dff7ff; +} +@media (prefers-color-scheme: dark) { + .elv-toc-list li.elv-toc-active > a { + background-color: #353535; + } } -.elv-toc-active > a:after { - content: " ⬅"; - line-height: .5; +.elv-toc-list ul .elv-toc-active > a:after { + content: ""; } + /* Show only active nested lists */ .elv-toc-list ul.elv-toc-active, .elv-toc-list li.elv-toc-active > ul { display: block; -} \ No newline at end of file +} + +/* Footer catgory navigation */ +.elv-cat-list-active { + font-weight: 600; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/borgmatic-1.5.9/docs/_includes/index.css new/borgmatic-1.5.10/docs/_includes/index.css --- old/borgmatic-1.5.9/docs/_includes/index.css 2020-07-23 06:53:55.000000000 +0200 +++ new/borgmatic-1.5.10/docs/_includes/index.css 2020-08-21 23:27:47.000000000 +0200 @@ -234,6 +234,9 @@ max-width: 42rem; clear: both; } +header.elv-layout { + padding: 0 1rem; +} footer.elv-layout { margin-bottom: 5em; } @@ -242,7 +245,7 @@ } @media (min-width: 64em) { /* 1024px */ .elv-layout-toc { - margin-left: 18rem; + padding-left: 15rem; max-width: 60rem; margin-right: 1rem; position: relative; @@ -254,7 +257,6 @@ /* Header */ .elv-header { - color: #222; position: relative; } .elv-header-default { @@ -262,6 +264,13 @@ flex-direction: column; justify-content: center; align-items: center; + padding-top: 0; +} +.elv-header-c { + width: 100%; +} +.elv-header-docs .elv-header-c { + padding: 1rem 0; } .elv-header-docs:before, .elv-header-docs:after { @@ -272,53 +281,89 @@ clear: both; } /* Header Hero */ -.elv-hero img { - max-width: 80vw; - max-height: 60vh; +.elv-hero { + background-color: #222; +} +@media (prefers-color-scheme: dark) { + .elv-hero { + background-color: #292929; + } +} +.elv-hero img, +.elv-hero svg { + width: 42.95774646vh; + height: 60vh; +} +.elv-hero:hover img, +.elv-hero:hover svg { + background-color: inherit; +} +.elv-header-default .elv-hero { + display: flex; + justify-content: center; + width: calc(100% + 2rem); + margin-left: -1rem; + margin-right: -1rem; +} +.elv-hero:hover { + background-color: #333; } + .elv-header-docs .elv-hero { float: left; - margin-right: 1.5em; + margin-right: .5em; +} +.elv-header-default .elv-hero img, +.elv-header-default .elv-hero svg { + position: relative; + background-color: transparent; + z-index: 1; } -.elv-header-docs .elv-hero img { +.elv-header-docs .elv-hero img, +.elv-header-docs .elv-hero svg { + width: auto; height: 3em; } -@media (min-width: 37.5em) { /* 600px */ - .elv-header-docs .elv-hero img { +@media (min-width: 43.75em) { /* 700px */ + .elv-header-docs .elv-hero { + margin-right: 1em; + } + .elv-header-docs .elv-hero img, + .elv-header-docs .elv-hero svg { width: 4.303125em; /* 68.85px /16 */ height: 6em; } } /* Header Possum */ +.elv-possum-anchor { + display: block; +} .elv-possum { - display: none; position: absolute; - right: 1em; - top: 1em; - width: 16vmin; -} -@media (min-width: 31.25em) { /* 500px */ - .elv-possum { - display: block; - } + right: .5rem; + top: 1rem; + transition: .3s opacity ease-out; +} +.elv-header-docs .elv-possum { + width: 15vw; + max-width: 6.25rem; /* 100px /16 */ } - -/* Header Heading */ -.elv-hed { - font-size: 3em; - margin-top: 1.5em; - margin-bottom: .25em; - text-align: center; - text-transform: none; -} -.elv-header-docs .elv-hed { - font-size: 2.3em; - margin: 0; - text-align: left; -} -@media (min-width: 37.5em) { /* 600px */ - .elv-header-docs .elv-hed { - font-size: 3em; +.elv-header-default { + overflow: hidden; +} +.elv-header-default .elv-possum { + pointer-events: none; + width: auto; + height: calc((60vh - 2rem) / 1.6); + top: 36%; + left: 1vw; + right: auto; + animation-duration: 180s; + animation-name: balloonFloat; +} +@media (prefers-reduced-motion: reduce) { + .elv-header-default .elv-possum { + display: none; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/borgmatic-1.5.9/docs/_includes/layouts/main.njk new/borgmatic-1.5.10/docs/_includes/layouts/main.njk --- old/borgmatic-1.5.9/docs/_includes/layouts/main.njk 2020-07-23 06:53:55.000000000 +0200 +++ new/borgmatic-1.5.10/docs/_includes/layouts/main.njk 2020-08-21 23:27:47.000000000 +0200 @@ -6,9 +6,27 @@ {% include "header.njk" %} <main class="elv-layout{% if layoutClass %} {{ layoutClass }}{% endif %}"> - <article> - {{ content | safe }} + <div id="documentation" class="elv-toc"> + <div> + {% set navPages = collections.all | eleventyNavigation %} + {% macro renderNavListItem(entry) -%} + <li{% if entry.url == page.url %} class="elv-toc-active"{% endif %}> + <a {% if entry.url %}href="https://torsion.org/borgmatic/docs{{ entry.url | url }}"{% endif %}>{{ entry.title }}</a> + {%- if entry.children.length -%} + <ul> + {%- for child in entry.children %}{{ renderNavListItem(child) }}{% endfor -%} + </ul> + {%- endif -%} + </li> + {%- endmacro %} - {% include 'components/suggestion-form.html' %} - </article> + <ul class="elv-toc-list"> + {%- for entry in navPages %}{{ renderNavListItem(entry) }}{%- endfor -%} + </ul> + </div> + </div> + + {{ content | safe }} + + {% include 'components/suggestion-form.html' %} </main> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/borgmatic-1.5.9/docs/how-to/add-preparation-and-cleanup-steps-to-backups.md new/borgmatic-1.5.10/docs/how-to/add-preparation-and-cleanup-steps-to-backups.md --- old/borgmatic-1.5.9/docs/how-to/add-preparation-and-cleanup-steps-to-backups.md 2020-07-23 06:53:55.000000000 +0200 +++ new/borgmatic-1.5.10/docs/how-to/add-preparation-and-cleanup-steps-to-backups.md 2020-08-21 23:27:47.000000000 +0200 @@ -1,5 +1,9 @@ --- title: How to add preparation and cleanup steps to backups +eleventyNavigation: + key: Add preparation and cleanup steps + parent: How-to guides + order: 8 --- ## Preparation and cleanup hooks @@ -73,11 +77,3 @@ injection or privilege escalation, do not forget to set secure permissions on borgmatic configuration files (`chmod 0600`) and scripts (`chmod 0700`) invoked by hooks. - - -## Related documentation - - * [Set up backups with borgmatic](https://torsion.org/borgmatic/docs/how-to/set-up-backups/) - * [Backup your databases](https://torsion.org/borgmatic/docs/how-to/backup-your-databases/) - * [Inspect your backups](https://torsion.org/borgmatic/docs/how-to/inspect-your-backups/) - * [Monitor your backups](https://torsion.org/borgmatic/docs/how-to/monitor-your-backups/) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/borgmatic-1.5.9/docs/how-to/backup-to-a-removable-drive-or-an-intermittent-server.md new/borgmatic-1.5.10/docs/how-to/backup-to-a-removable-drive-or-an-intermittent-server.md --- old/borgmatic-1.5.9/docs/how-to/backup-to-a-removable-drive-or-an-intermittent-server.md 2020-07-23 06:53:55.000000000 +0200 +++ new/borgmatic-1.5.10/docs/how-to/backup-to-a-removable-drive-or-an-intermittent-server.md 2020-08-21 23:27:47.000000000 +0200 @@ -1,5 +1,9 @@ --- title: How to backup to a removable drive or an intermittent server +eleventyNavigation: + key: Backup to a removable drive or server + parent: How-to guides + order: 9 --- ## Occasional backups @@ -98,11 +102,3 @@ * The soft failure feature also works for `before_prune`, `after_prune`, `before_check`, and `after_check` hooks. But it is not implemented for `before_everything` or `after_everything`. - -## Related documentation - - * [Set up backups with borgmatic](https://torsion.org/borgmatic/docs/how-to/set-up-backups/) - * [Make per-application backups](https://torsion.org/borgmatic/docs/how-to/make-per-application-bac… - * [Make backups redundant](https://torsion.org/borgmatic/docs/how-to/make-backups-redundant… - * [Add preparation and cleanup steps to backups](https://torsion.org/borgmatic/docs/how-to/add-preparation-and-clea… - * [Monitor your backups](https://torsion.org/borgmatic/docs/how-to/monitor-your-backups/) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/borgmatic-1.5.9/docs/how-to/backup-your-databases.md new/borgmatic-1.5.10/docs/how-to/backup-your-databases.md --- old/borgmatic-1.5.9/docs/how-to/backup-your-databases.md 2020-07-23 06:53:55.000000000 +0200 +++ new/borgmatic-1.5.10/docs/how-to/backup-your-databases.md 2020-08-21 23:27:47.000000000 +0200 @@ -1,5 +1,9 @@ --- title: How to backup your databases +eleventyNavigation: + key: Backup your databases + parent: How-to guides + order: 7 --- ## Database dump hooks @@ -217,11 +221,3 @@ See Limitations above about `read_special`. You may need to exclude certain paths with named pipes, block devices, or character devices on which borgmatic is hanging. - - -## Related documentation - - * [Set up backups with borgmatic](https://torsion.org/borgmatic/docs/how-to/set-up-backups/) - * [Add preparation and cleanup steps to backups](https://torsion.org/borgmatic/docs/how-to/add-preparation-and-clea… - * [Inspect your backups](https://torsion.org/borgmatic/docs/how-to/inspect-your-backups/) - * [Extract a backup](https://torsion.org/borgmatic/docs/how-to/extract-a-backup/) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/borgmatic-1.5.9/docs/how-to/deal-with-very-large-backups.md new/borgmatic-1.5.10/docs/how-to/deal-with-very-large-backups.md --- old/borgmatic-1.5.9/docs/how-to/deal-with-very-large-backups.md 2020-07-23 06:53:55.000000000 +0200 +++ new/borgmatic-1.5.10/docs/how-to/deal-with-very-large-backups.md 2020-08-21 23:27:47.000000000 +0200 @@ -1,5 +1,9 @@ --- title: How to deal with very large backups +eleventyNavigation: + key: Deal with very large backups + parent: How-to guides + order: 3 --- ## Biggish data @@ -120,8 +124,3 @@ This should make the client keep the connection alive while validating backups. - - -## Related documentation - - * [Set up backups with borgmatic](https://torsion.org/borgmatic/docs/how-to/set-up-backups/) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/borgmatic-1.5.9/docs/how-to/develop-on-borgmatic.md new/borgmatic-1.5.10/docs/how-to/develop-on-borgmatic.md --- old/borgmatic-1.5.9/docs/how-to/develop-on-borgmatic.md 2020-07-23 06:53:55.000000000 +0200 +++ new/borgmatic-1.5.10/docs/how-to/develop-on-borgmatic.md 2020-08-21 23:27:47.000000000 +0200 @@ -1,5 +1,9 @@ --- title: How to develop on borgmatic +eleventyNavigation: + key: Develop on borgmatic + parent: How-to guides + order: 11 --- ## Source code @@ -139,7 +143,3 @@ To close the documentation server, ctrl-C the script. Note that it does not currently auto-reload, so you'll need to stop it and re-run it for any additional documentation changes to take effect. - -## Related documentation - - * [Inspect your backups](https://torsion.org/borgmatic/docs/how-to/inspect-your-backups/) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/borgmatic-1.5.9/docs/how-to/extract-a-backup.md new/borgmatic-1.5.10/docs/how-to/extract-a-backup.md --- old/borgmatic-1.5.9/docs/how-to/extract-a-backup.md 2020-07-23 06:53:55.000000000 +0200 +++ new/borgmatic-1.5.10/docs/how-to/extract-a-backup.md 2020-08-21 23:27:47.000000000 +0200 @@ -1,5 +1,9 @@ --- title: How to extract a backup +eleventyNavigation: + key: Extract a backup + parent: How-to guides + order: 6 --- ## Extract @@ -132,11 +136,3 @@ ```bash borgmatic umount --mount-point /mnt ``` - - -## Related documentation - - * [Set up backups with borgmatic](https://torsion.org/borgmatic/docs/how-to/set-up-backups/) - * [Inspect your backups](https://torsion.org/borgmatic/docs/how-to/inspect-your-backups/) - * [Monitor your backups](https://torsion.org/borgmatic/docs/how-to/monitor-your-backups/) - * [Backup your databases](https://torsion.org/borgmatic/docs/how-to/backup-your-databases/) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/borgmatic-1.5.9/docs/how-to/index.md new/borgmatic-1.5.10/docs/how-to/index.md --- old/borgmatic-1.5.9/docs/how-to/index.md 1970-01-01 01:00:00.000000000 +0100 +++ new/borgmatic-1.5.10/docs/how-to/index.md 2020-08-21 23:27:47.000000000 +0200 @@ -0,0 +1,5 @@ +--- +eleventyNavigation: + key: How-to guides +permalink: false +--- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/borgmatic-1.5.9/docs/how-to/inspect-your-backups.md new/borgmatic-1.5.10/docs/how-to/inspect-your-backups.md --- old/borgmatic-1.5.9/docs/how-to/inspect-your-backups.md 2020-07-23 06:53:55.000000000 +0200 +++ new/borgmatic-1.5.10/docs/how-to/inspect-your-backups.md 2020-08-21 23:27:47.000000000 +0200 @@ -1,5 +1,9 @@ --- title: How to inspect your backups +eleventyNavigation: + key: Inspect your backups + parent: How-to guides + order: 4 --- ## Backup progress @@ -98,11 +102,3 @@ the log file so it doesn't grow too large, for example with [logrotate](https://wiki.archlinux.org/index.php/Logrotate). Also, there is a `--log-file-verbosity` flag to customize the log file's log level. - - -## Related documentation - - * [Set up backups with borgmatic](https://torsion.org/borgmatic/docs/how-to/set-up-backups/) - * [Monitor your backups](https://torsion.org/borgmatic/docs/how-to/monitor-your-backups/) - * [Add preparation and cleanup steps to backups](https://torsion.org/borgmatic/docs/how-to/add-preparation-and-clea… - * [Develop on borgmatic](https://torsion.org/borgmatic/docs/how-to/develop-on-borgmatic/) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/borgmatic-1.5.9/docs/how-to/make-backups-redundant.md new/borgmatic-1.5.10/docs/how-to/make-backups-redundant.md --- old/borgmatic-1.5.9/docs/how-to/make-backups-redundant.md 2020-07-23 06:53:55.000000000 +0200 +++ new/borgmatic-1.5.10/docs/how-to/make-backups-redundant.md 2020-08-21 23:27:47.000000000 +0200 @@ -1,5 +1,9 @@ --- title: How to make backups redundant +eleventyNavigation: + key: Make backups redundant + parent: How-to guides + order: 2 --- ## Multiple repositories @@ -16,8 +20,8 @@ # Paths of local or remote repositories to backup to. repositories: - - 1234@usw-s001.rsync.net:backups.borg - k8pDxu32@k8pDxu32.repo.borgbase.com:repo + - 1234@usw-s001.rsync.net:backups.borg - /var/lib/backups/local.borg ``` @@ -28,8 +32,8 @@ Here's a way of visualizing what borgmatic does with the above configuration: -1. Backup `/home` and `/etc` to `1234@usw-s001.rsync.net:backups.borg` 2. Backup `/home` and `/etc` to `k8pDxu32@k8pDxu32.repo.borgbase.com:repo` +1. Backup `/home` and `/etc` to `1234@usw-s001.rsync.net:backups.borg` 3. Backup `/home` and `/etc` to `/var/lib/backups/local.borg` This gives you redundancy of your data across repositories and even @@ -38,10 +42,3 @@ See [Borg repository URLs documentation](https://borgbackup.readthedocs.io/en/stable/usage/general.html#repository-urls) for more information on how to specify local and remote repository paths. - - -## Related documentation - - * [Set up backups with borgmatic](https://torsion.org/borgmatic/docs/how-to/set-up-backups/) - * [Make per-application backups](https://torsion.org/borgmatic/docs/how-to/make-per-application-bac… - * [Backup to a removable drive or an intermittent server](https://torsion.org/borgmatic/docs/how-to/backup-to-a-removable-dri… diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/borgmatic-1.5.9/docs/how-to/make-per-application-backups.md new/borgmatic-1.5.10/docs/how-to/make-per-application-backups.md --- old/borgmatic-1.5.9/docs/how-to/make-per-application-backups.md 2020-07-23 06:53:55.000000000 +0200 +++ new/borgmatic-1.5.10/docs/how-to/make-per-application-backups.md 2020-08-21 23:27:47.000000000 +0200 @@ -1,5 +1,9 @@ --- title: How to make per-application backups +eleventyNavigation: + key: Make per-application backups + parent: How-to guides + order: 1 --- ## Multiple backup configurations @@ -129,12 +133,12 @@ command-line via the `--override` flag. Here's an example: ```bash -borgmatic create --override location.remote_path=borg1 +borgmatic create --override location.remote_path=/usr/local/bin/borg1 ``` What this does is load your configuration files, and for each one, disregard the configured value for the `remote_path` option in the `location` section, -and use the value of `borg1` instead. +and use the value of `/usr/local/bin/borg1` instead. Note that the value is parsed as an actual YAML string, so you can even set list values by using brackets. For instance: @@ -143,14 +147,21 @@ borgmatic create --override location.repositories=[test1.borg,test2.borg] ``` +Or even a single list element: + +```bash +borgmatic create --override location.repositories=[/root/test1.borg] +``` + There is not currently a way to override a single element of a list without replacing the whole list. +Note that if you override an option of the list type (like +`location.repositories`), you do need to use the `[ ]` list syntax. See the +[configuration +reference](https://torsion.org/borgmatic/docs/reference/configuration/) for +which options are list types. (YAML list values look like `- this` with an +indentation and a leading dash.) + Be sure to quote your overrides if they contain spaces or other characters that your shell may interpret. - - -## Related documentation - - * [Set up backups with borgmatic](https://torsion.org/borgmatic/docs/how-to/set-up-backups/) - * [Make backups redundant](https://torsion.org/borgmatic/docs/how-to/make-backups-redundant… diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/borgmatic-1.5.9/docs/how-to/monitor-your-backups.md new/borgmatic-1.5.10/docs/how-to/monitor-your-backups.md --- old/borgmatic-1.5.9/docs/how-to/monitor-your-backups.md 2020-07-23 06:53:55.000000000 +0200 +++ new/borgmatic-1.5.10/docs/how-to/monitor-your-backups.md 2020-08-21 23:27:47.000000000 +0200 @@ -1,5 +1,9 @@ --- title: How to monitor your backups +eleventyNavigation: + key: Monitor your backups + parent: How-to guides + order: 5 --- ## Monitoring and alerting @@ -10,48 +14,68 @@ There are several different ways you can monitor your backups and find out whether they're succeeding. Which of these you choose to do is up to you and -your particular infrastructure: +your particular infrastructure. -1. **Job runner alerts**: The easiest place to start is with failure alerts -from the [scheduled job -runner](https://torsion.org/borgmatic/docs/how-to/set-up-backups/#autopilot) (cron, -systemd, etc.) that's running borgmatic. But note that if the job doesn't even -get scheduled (e.g. due to the job runner not running), you probably won't get -an alert at all! Still, this is a decent first line of defense, especially -when combined with some of the other approaches below. -2. **borgmatic error hooks**: The `on_error` hook allows you to run an arbitrary -command or script when borgmatic itself encounters an error running your -backups. So for instance, you can run a script to send yourself a text message -alert. But note that if borgmatic doesn't actually run, this alert won't fire. -See [error +### Job runner alerts + +The easiest place to start is with failure alerts from the [scheduled job +runner](https://torsion.org/borgmatic/docs/how-to/set-up-backups/#autopilot) +(cron, systemd, etc.) that's running borgmatic. But note that if the job +doesn't even get scheduled (e.g. due to the job runner not running), you +probably won't get an alert at all! Still, this is a decent first line of +defense, especially when combined with some of the other approaches below. + +### Commands run on error + +The `on_error` hook allows you to run an arbitrary command or script when +borgmatic itself encounters an error running your backups. So for instance, +you can run a script to send yourself a text message alert. But note that if +borgmatic doesn't actually run, this alert won't fire. See [error hooks](https://torsion.org/borgmatic/docs/how-to/monitor-your-backups/#erro… below for how to configure this. -4. **borgmatic monitoring hooks**: This feature integrates with monitoring - services like [Healthchecks](https://healthchecks.io/), -[Cronitor](https://cronitor.io), [Cronhub](https://cronhub.io), and -[PagerDuty](https://www.pagerduty.com/) and pings these services whenever -borgmatic runs. That way, you'll receive an alert when something goes wrong or -(for certain hooks) the service doesn't hear from borgmatic for a configured -interval. See [Healthchecks -hook](https://torsion.org/borgmatic/docs/how-to/monitor-your-backups/#healthchecks-hook), [Cronitor -hook](https://torsion.org/borgmatic/docs/how-to/monitor-your-backups/#cronitor-hook), [Cronhub -hook](https://torsion.org/borgmatic/docs/how-to/monitor-your-backups/#cronhub-hook), and -[PagerDuty hook](https://torsion.org/borgmatic/docs/how-to/monitor-your-backups/#pager… + +### Third-party monitoring services + +borgmatic integrates with monitoring services like +[Healthchecks](https://healthchecks.io/), [Cronitor](https://cronitor.io), +[Cronhub](https://cronhub.io), and [PagerDuty](https://www.pagerduty.com/) and +pings these services whenever borgmatic runs. That way, you'll receive an +alert when something goes wrong or (for certain hooks) the service doesn't +hear from borgmatic for a configured interval. See [Healthchecks +hook](https://torsion.org/borgmatic/docs/how-to/monitor-your-backups/#healthchecks-hook), +[Cronitor +hook](https://torsion.org/borgmatic/docs/how-to/monitor-your-backups/#cronitor-hook), +[Cronhub +hook](https://torsion.org/borgmatic/docs/how-to/monitor-your-backups/#cronhub-hook), +and [PagerDuty +hook](https://torsion.org/borgmatic/docs/how-to/monitor-your-backups/#pagerduty-hook) below for how to configure this. -3. **Third-party monitoring software**: You can use traditional monitoring -software to consume borgmatic JSON output and track when the last -successful backup occurred. See [scripting + +While these services offer different features, you probably only need to use +one of them at most. + +### Third-party monitoring software + +You can use traditional monitoring software to consume borgmatic JSON output +and track when the last successful backup occurred. See [scripting borgmatic](https://torsion.org/borgmatic/docs/how-to/monitor-your-backups/#… -and [related software](https://torsion.org/borgmatic/docs/how-to/monitor-your-backups/#r… +and [related +software](https://torsion.org/borgmatic/docs/how-to/monitor-your-backups/#related-software) below for how to configure this. -5. **Borg hosting providers**: Most [Borg hosting + +### Borg hosting providers + +Most [Borg hosting providers](https://torsion.org/borgmatic/#hosting-providers) include monitoring and alerting as part of their offering. This gives you a dashboard to check on all of your backups, and can alert you if the service doesn't hear from borgmatic for a configured interval. -6. **borgmatic consistency checks**: While not strictly part of monitoring, if you -really want confidence that your backups are not only running but are -restorable as well, you can configure particular [consistency + +### Consistency checks + +While not strictly part of monitoring, if you really want confidence that your +backups are not only running but are restorable as well, you can configure +particular [consistency checks](https://torsion.org/borgmatic/docs/how-to/deal-with-very-large-back… or even script full [extract tests](https://torsion.org/borgmatic/docs/how-to/extract-a-backup/). @@ -289,12 +313,3 @@ ```bash borgmatic info --archive latest ``` - - -## Related documentation - - * [Set up backups with borgmatic](https://torsion.org/borgmatic/docs/how-to/set-up-backups/) - * [Inspect your backups](https://torsion.org/borgmatic/docs/how-to/inspect-your-backups/) - * [Add preparation and cleanup steps to backups](https://torsion.org/borgmatic/docs/how-to/add-preparation-and-clea… - * [Extract a backup](https://torsion.org/borgmatic/docs/how-to/extract-a-backup/) - * [Develop on borgmatic](https://torsion.org/borgmatic/docs/how-to/develop-on-borgmatic/) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/borgmatic-1.5.9/docs/how-to/set-up-backups.md new/borgmatic-1.5.10/docs/how-to/set-up-backups.md --- old/borgmatic-1.5.9/docs/how-to/set-up-backups.md 2020-07-23 06:53:55.000000000 +0200 +++ new/borgmatic-1.5.10/docs/how-to/set-up-backups.md 2020-08-21 23:27:47.000000000 +0200 @@ -1,5 +1,9 @@ --- -title: How to set up backups with borgmatic +title: How to set up backups +eleventyNavigation: + key: Set up backups + parent: How-to guides + order: 0 --- ## Installation @@ -65,8 +69,7 @@ The main downside of a global install is that borgmatic is less cleanly separated from the rest of your Python software, and there's the theoretical possibility of libary conflicts. But if you're okay with that, for instance -on a relatively dedicated system, then a global install can work out just -fine. +on a relatively dedicated system, then a global install can work out fine. ### Other ways to install @@ -96,8 +99,8 @@ links, but without any tracking scripts or cookies.) <ul> - <li class="referral"><a href="https://www.rsync.net/cgi-bin/borg.cgi?campaign=borg&adgroup=borgmatic">rsync.net</a>: Cloud Storage provider with full support for borg and any other SSH/SFTP tool</li> <li class="referral"><a href="https://www.borgbase.com/?utm_source=borgmatic">BorgBase</a>: Borg hosting service with support for monitoring, 2FA, and append-only repos</li> + <li>rsync.net: Cloud Storage provider with full support for borg and any other SSH/SFTP tool</li> </ul> ## Configuration @@ -135,9 +138,8 @@ ### Encryption -Note that if you plan to run borgmatic on a schedule with cron, and you -encrypt your Borg repository with a passphrase instead of a key file, you'll -either need to set the borgmatic `encryption_passphrase` configuration +If you encrypt your Borg repository with a passphrase instead of a key file, +you'll either need to set the borgmatic `encryption_passphrase` configuration variable or set the `BORG_PASSPHRASE` environment variable. See the [repository encryption section](https://borgbackup.readthedocs.io/en/stable/quickstart.html#repository-encryption) @@ -313,15 +315,3 @@ correctly even without the C YAML library. And borgmatic won't be any faster with the C library present, so you don't need to go out of your way to install it. - - -## Related documentation - - * [Make per-application backups](https://torsion.org/borgmatic/docs/how-to/make-per-application-bac… - * [Make backups redundant](https://torsion.org/borgmatic/docs/how-to/make-backups-redundant… - * [Deal with very large backups](https://torsion.org/borgmatic/docs/how-to/deal-with-very-large-bac… - * [Inspect your backups](https://torsion.org/borgmatic/docs/how-to/inspect-your-backups/) - * [Monitor your backups](https://torsion.org/borgmatic/docs/how-to/monitor-your-backups/) - * [Upgrade borgmatic](https://torsion.org/borgmatic/docs/how-to/upgrade/) - * [borgmatic configuration reference](https://torsion.org/borgmatic/docs/reference/configuration/) - * [borgmatic command-line reference](https://torsion.org/borgmatic/docs/reference/command-line/) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/borgmatic-1.5.9/docs/how-to/upgrade.md new/borgmatic-1.5.10/docs/how-to/upgrade.md --- old/borgmatic-1.5.9/docs/how-to/upgrade.md 2020-07-23 06:53:55.000000000 +0200 +++ new/borgmatic-1.5.10/docs/how-to/upgrade.md 2020-08-21 23:27:47.000000000 +0200 @@ -1,5 +1,9 @@ --- title: How to upgrade borgmatic +eleventyNavigation: + key: Upgrade borgmatic + parent: How-to guides + order: 10 --- ## Upgrading @@ -111,8 +115,3 @@ That's it! borgmatic will continue using your /etc/borgmatic configuration files. - - -## Related documentation - - * [Develop on borgmatic](https://torsion.org/borgmatic/docs/how-to/develop-on-borgmatic/) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/borgmatic-1.5.9/docs/reference/command-line.md new/borgmatic-1.5.10/docs/reference/command-line.md --- old/borgmatic-1.5.9/docs/reference/command-line.md 2020-07-23 06:53:55.000000000 +0200 +++ new/borgmatic-1.5.10/docs/reference/command-line.md 2020-08-21 23:27:47.000000000 +0200 @@ -1,5 +1,9 @@ --- -title: borgmatic command-line reference +title: Command-line reference +eleventyNavigation: + key: Command-line reference + parent: Reference guides + order: 1 --- ## borgmatic options diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/borgmatic-1.5.9/docs/reference/configuration.md new/borgmatic-1.5.10/docs/reference/configuration.md --- old/borgmatic-1.5.9/docs/reference/configuration.md 2020-07-23 06:53:55.000000000 +0200 +++ new/borgmatic-1.5.10/docs/reference/configuration.md 2020-08-21 23:27:47.000000000 +0200 @@ -1,5 +1,9 @@ --- -title: borgmatic configuration reference +title: Configuration reference +eleventyNavigation: + key: Configuration reference + parent: Reference guides + order: 0 --- ## Configuration file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/borgmatic-1.5.9/docs/reference/index.md new/borgmatic-1.5.10/docs/reference/index.md --- old/borgmatic-1.5.9/docs/reference/index.md 1970-01-01 01:00:00.000000000 +0100 +++ new/borgmatic-1.5.10/docs/reference/index.md 2020-08-21 23:27:47.000000000 +0200 @@ -0,0 +1,5 @@ +--- +eleventyNavigation: + key: Reference guides +permalink: false +--- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/borgmatic-1.5.9/setup.py new/borgmatic-1.5.10/setup.py --- old/borgmatic-1.5.9/setup.py 2020-07-23 06:53:55.000000000 +0200 +++ new/borgmatic-1.5.10/setup.py 2020-08-21 23:27:47.000000000 +0200 @@ -1,6 +1,6 @@ from setuptools import find_packages, setup -VERSION = '1.5.9' +VERSION = '1.5.10' setup( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/borgmatic-1.5.9/tests/unit/commands/test_borgmatic.py new/borgmatic-1.5.10/tests/unit/commands/test_borgmatic.py --- old/borgmatic-1.5.9/tests/unit/commands/test_borgmatic.py 2020-07-23 06:53:55.000000000 +0200 +++ new/borgmatic-1.5.10/tests/unit/commands/test_borgmatic.py 2020-08-21 23:27:47.000000000 +0200 @@ -54,6 +54,17 @@ list(module.run_configuration('test.yaml', config, arguments)) +def test_run_configuration_calls_hooks_for_extract_action(): + flexmock(module.borg_environment).should_receive('initialize') + flexmock(module.command).should_receive('execute_hook').twice() + flexmock(module.dispatch).should_receive('call_hooks').never() + flexmock(module).should_receive('run_actions').and_return([]) + config = {'location': {'repositories': ['foo']}} + arguments = {'global': flexmock(monitoring_verbosity=1, dry_run=False), 'extract': flexmock()} + + list(module.run_configuration('test.yaml', config, arguments)) + + def test_run_configuration_does_not_trigger_hooks_for_list_action(): flexmock(module.borg_environment).should_receive('initialize') flexmock(module.command).should_receive('execute_hook').never() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/borgmatic-1.5.9/tests/unit/config/test_collect.py new/borgmatic-1.5.10/tests/unit/config/test_collect.py --- old/borgmatic-1.5.9/tests/unit/config/test_collect.py 2020-07-23 06:53:55.000000000 +0200 +++ new/borgmatic-1.5.10/tests/unit/config/test_collect.py 2020-08-21 23:27:47.000000000 +0200 @@ -45,6 +45,7 @@ mock_path.should_receive('isdir').with_args('config.yaml').and_return(False) mock_path.should_receive('isdir').with_args('/etc/borgmatic.d').and_return(True) mock_path.should_receive('isdir').with_args('/etc/borgmatic.d/foo.yml').and_return(False) + flexmock(module.os).should_receive('access').and_return(True) flexmock(module.os).should_receive('listdir') flexmock(sys.modules['builtins']).should_receive('sorted').and_return(['foo.yml']) @@ -62,6 +63,7 @@ mock_path.should_receive('isdir').with_args('/etc/borgmatic.d/foo.yaml').and_return(False) mock_path.should_receive('isdir').with_args('/etc/borgmatic.d/bar').and_return(True) mock_path.should_receive('isdir').with_args('/etc/borgmatic.d/baz.yaml').and_return(False) + flexmock(module.os).should_receive('access').and_return(True) flexmock(module.os).should_receive('listdir') flexmock(sys.modules['builtins']).should_receive('sorted').and_return( ['foo.yaml', 'bar', 'baz.yaml'] @@ -84,6 +86,7 @@ mock_path.should_receive('isdir').with_args('/etc/borgmatic.d/foo.yaml').and_return(False) mock_path.should_receive('isdir').with_args('/etc/borgmatic.d/bar.yaml~').and_return(False) mock_path.should_receive('isdir').with_args('/etc/borgmatic.d/baz.txt').and_return(False) + flexmock(module.os).should_receive('access').and_return(True) flexmock(module.os).should_receive('listdir') flexmock(sys.modules['builtins']).should_receive('sorted').and_return( ['foo.yaml', 'bar.yaml~', 'baz.txt'] @@ -94,6 +97,21 @@ assert config_filenames == ('/etc/borgmatic.d/foo.yaml',) +def test_collect_config_filenames_skips_permission_denied_directories(): + config_paths = ('config.yaml', '/etc/borgmatic.d') + mock_path = flexmock(module.os.path) + mock_path.should_receive('exists').and_return(True) + mock_path.should_receive('isdir').with_args('config.yaml').and_return(False) + mock_path.should_receive('isdir').with_args('/etc/borgmatic.d').and_return(True) + flexmock(module.os).should_receive('access').and_return(False) + flexmock(module.os).should_receive('listdir') + flexmock(sys.modules['builtins']).should_receive('sorted').and_return(['config.yaml']) + + config_filenames = tuple(module.collect_config_filenames(config_paths)) + + assert config_filenames == ('config.yaml',) + + def test_collect_config_filenames_skips_etc_borgmatic_config_dot_yaml_if_it_does_not_exist(): config_paths = ('config.yaml', '/etc/borgmatic/config.yaml') mock_path = flexmock(module.os.path)

1 0

commit mingw64-filesystem for openSUSE:Factory
by root 31 Aug '20

31 Aug '20

Hello community, here is the log from the commit of package mingw64-filesystem for openSUSE:Factory checked in at 2020-08-31 16:52:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mingw64-filesystem (Old) and /work/SRC/openSUSE:Factory/.mingw64-filesystem.new.3399 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mingw64-filesystem" Mon Aug 31 16:52:50 2020 rev:6 rq:830627 version:20200825 Changes: -------- --- /work/SRC/openSUSE:Factory/mingw64-filesystem/mingw64-filesystem.changes 2020-08-29 20:39:11.065385481 +0200 +++ /work/SRC/openSUSE:Factory/.mingw64-filesystem.new.3399/mingw64-filesystem.changes 2020-08-31 16:53:10.640439570 +0200 @@ -1,0 +2,5 @@ +Fri Aug 28 18:59:36 UTC 2020 - Ralf Habacker <ralf.habacker(a)freenet.de> + +- Fix architecture in generating cmake provides + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mingw64-cmake.prov ++++++ --- /var/tmp/diff_new_pack.77xKh4/_old 2020-08-31 16:53:11.444439960 +0200 +++ /var/tmp/diff_new_pack.77xKh4/_new 2020-08-31 16:53:11.448439962 +0200 @@ -35,9 +35,9 @@ version = self.resolveCMakeModuleVersion(modulePath, cmakeModule, lowercase) if version: - print("mingw32(cmake:%s) = %s" % (cmakeModule, version)) + print("mingw64(cmake:%s) = %s" % (cmakeModule, version)) else: - print("mingw32(cmake:%s)" % cmakeModule) + print("mingw64(cmake:%s)" % cmakeModule) def parseCmakeModuleConfig(self, configFile): paths = configFile.rsplit("/", 3)

1 0

commit browserpass-native for openSUSE:Factory
by root 31 Aug '20

31 Aug '20

Hello community, here is the log from the commit of package browserpass-native for openSUSE:Factory checked in at 2020-08-31 16:52:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/browserpass-native (Old) and /work/SRC/openSUSE:Factory/.browserpass-native.new.3399 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "browserpass-native" Mon Aug 31 16:52:46 2020 rev:4 rq:830683 version:3.0.7 Changes: -------- --- /work/SRC/openSUSE:Factory/browserpass-native/browserpass-native.changes 2020-07-13 09:06:28.932236708 +0200 +++ /work/SRC/openSUSE:Factory/.browserpass-native.new.3399/browserpass-native.changes 2020-08-31 16:53:07.696438143 +0200 @@ -1,0 +2,5 @@ +Sat Aug 29 11:45:29 UTC 2020 - Marcel Kuehlhorn <tux93(a)opensuse.org> + +- Fix %{_libexecdir} misuse + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ browserpass-native.spec ++++++ --- /var/tmp/diff_new_pack.sgEQzS/_old 2020-08-31 16:53:08.840438698 +0200 +++ /var/tmp/diff_new_pack.sgEQzS/_new 2020-08-31 16:53:08.844438700 +0200 @@ -53,6 +53,6 @@ %license LICENSE %doc README.md %{_bindir}/browserpass -%{_libexecdir}/browserpass +%{_prefix}/lib/browserpass %changelog

1 0

commit pass-otp for openSUSE:Factory
by root 31 Aug '20

31 Aug '20

Hello community, here is the log from the commit of package pass-otp for openSUSE:Factory checked in at 2020-08-31 16:52:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pass-otp (Old) and /work/SRC/openSUSE:Factory/.pass-otp.new.3399 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "pass-otp" Mon Aug 31 16:52:39 2020 rev:3 rq:830606 version:1.2.0 Changes: -------- --- /work/SRC/openSUSE:Factory/pass-otp/pass-otp.changes 2018-11-19 23:34:12.711036897 +0100 +++ /work/SRC/openSUSE:Factory/.pass-otp.new.3399/pass-otp.changes 2020-08-31 16:53:01.668435221 +0200 @@ -1,0 +2,7 @@ +Sun Aug 30 08:04:00 UTC 2020 - Ismail Dönmez <idonmez(a)suse.com> + +- Fix library path where %{_libexecdir} points to %{_prefix}/libexec + like in Tumbleweed, instead use %{_prefix}/lib as library path since + pass looks for plugins under /usr/lib/password-store + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pass-otp.spec ++++++ --- /var/tmp/diff_new_pack.UFoVVl/_old 2020-08-31 16:53:03.200435964 +0200 +++ /var/tmp/diff_new_pack.UFoVVl/_new 2020-08-31 16:53:03.200435964 +0200 @@ -1,7 +1,7 @@ # # spec file for package pass-otp # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -43,7 +43,7 @@ %build %install -%make_install LIBDIR=%{_libexecdir} +%make_install LIBDIR=%{_prefix}/lib install -Dpm 0644 %{buildroot}%{_sysconfdir}/bash_completion.d/pass-otp \ %{buildroot}%{_datadir}/bash-completion/completions/pass-otp rm %{buildroot}%{_sysconfdir}/bash_completion.d/pass-otp @@ -52,7 +52,7 @@ %{_mandir}/man?/%{name}.?%{ext_man} %doc CHANGELOG.md README.md %license LICENSE -%{_libexecdir}/password-store +%{_prefix}/lib/password-store %{_datadir}/bash-completion/completions/pass-otp %changelog

1 0

commit keepassxc for openSUSE:Factory
by root 31 Aug '20

31 Aug '20

Hello community, here is the log from the commit of package keepassxc for openSUSE:Factory checked in at 2020-08-31 16:52:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/keepassxc (Old) and /work/SRC/openSUSE:Factory/.keepassxc.new.3399 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "keepassxc" Mon Aug 31 16:52:33 2020 rev:28 rq:830591 version:2.6.1 Changes: -------- --- /work/SRC/openSUSE:Factory/keepassxc/keepassxc.changes 2020-07-08 19:17:37.007992367 +0200 +++ /work/SRC/openSUSE:Factory/.keepassxc.new.3399/keepassxc.changes 2020-08-31 16:52:56.920432918 +0200 @@ -1,0 +2,53 @@ +Sun Aug 30 07:21:06 UTC 2020 - Carsten Ziepke <kieltux(a)gmail.com> + +- Update to version 2.6.1: + - Add menu entries for auto-typing only username or only + password [#4891] + - Browser: Add command for retrieving current TOTP [#5278] + - Improve man pages [#5010] + - Linux: Support Xfce screen lock signals [#4971] + - Linux: Add OARS metadata to AppStream markup [#5031] + - SSH Agent: Substitute tilde with %USERPROFILE% on Windows + [#5116] + - Improve password generator UI and UX [#5129] + - Do not prompt to restart if switching the theme back and + forth [#5084] + - Change actions for F1, F2, and F3 keys [#5082] + - Skip referenced passwords in health check report [#5056] + - Check system-wide Qt translations directory for downstream + - translations packaging [#5064] + - macOS: Change password visibility toggle shortcut to Ctrl+H to + - avoid conflict with system shortcut [#5114] + - Browser: Only display domain name in browser access confirm + dialog to avoid overly wide window sizes [#5214] + - Fix clipboard not being cleared when database is locked while + timeout is still active [#5184] + - Fix list of previous databases not being cleared in some + cases [#5123] + - Fix saving of non-data changes on database lock [#5210] + - Fix search results banner theming [#5197] + - Don’t enforce theme palette in Classic theme mode and add hover + effect for buttons [#5122, #5267] + - Fix label clipping in settings on high-DPI screens [#5227] + - Fix excessive memory usage by icons on systems with high-DPI + screens [#5266] + - Fix crash if number of TOTP digits exceeds ten [#5106] + - Fix slot detection when first YubiKey is configured on the second + slot [#5004] + - Prevent crash if focus widget gets deleted during saving [#5005] + - Always show buttons for opening or saving attachments [#4956] + - Update link to Auto-Type help [#5228] + - Fix build errors with Ninja [#5121] + - CLI: Fix db-info command wrongly labelled as db-show in + usage listing [#5140] + - Windows: Use Classic theme by default if high-contrast mode + is on [#5191] + - Linux: Add workaround for qt5ct bug, causing icons not to show + up [#5011] + - Linux: Correct high-DPI display by not allowing fractional + scaling [#5185] + - Browser: Consider subdomain and path when requesting only + “best-matching credentials” [#4832] + - SSH Agent: Always forget all keys on lock [#5115] + +------------------------------------------------------------------- Old: ---- keepassxc-2.6.0-src.tar.xz keepassxc-2.6.0-src.tar.xz.sig New: ---- keepassxc-2.6.1-src.tar.xz keepassxc-2.6.1-src.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ keepassxc.spec ++++++ --- /var/tmp/diff_new_pack.DcjT2K/_old 2020-08-31 16:52:58.828433844 +0200 +++ /var/tmp/diff_new_pack.DcjT2K/_new 2020-08-31 16:52:58.832433845 +0200 @@ -17,7 +17,7 @@ Name: keepassxc -Version: 2.6.0 +Version: 2.6.1 Release: 0 Summary: Qt5-based Password Manager License: GPL-2.0-only OR GPL-3.0-only ++++++ debian.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/debian/changelog new/debian/changelog --- old/debian/changelog 2020-07-08 01:33:35.472449517 +0200 +++ new/debian/changelog 2020-08-20 08:59:11.000000000 +0200 @@ -1,71 +1,81 @@ -keepassxc (2.6.0-1.1) stable; urgency=medium +keepassxc (2.6.1+dfsg.1-1) unstable; urgency=medium - * update to 2.6.0 - https://github.com/keepassxreboot/keepassxc/releases/tag/2.6.0 + * New upstream version 2.6.1+dfsg.1 - -- darix <darix+debian(a)nordisch.org> Thu, 09 Apr 2020 17:21:00 -0000 -keepassxc (2.5.4-1.1) stable; urgency=medium + -- Julian Andres Klode <jak(a)debian.org> Thu, 20 Aug 2020 08:59:11 +0200 - * update to 2.5.4 - https://github.com/keepassxreboot/keepassxc/releases/tag/2.5.4 +keepassxc (2.6.0+dfsg.1-1) unstable; urgency=medium - -- darix <darix+debian(a)nordisch.org> Thu, 09 Apr 2020 17:21:00 -0000 -keepassxc (2.5.3-1.1) stable; urgency=medium + * New upstream version 2.6.0+dfsg.1 (Closes: #962499) + * Add asciidoctor build-depends + * Use fonts-font-awesome for documentation instead of online version + * debian/source/lintian-overrides: Override spurious source-is-missing + * d/p/0002-Revert-Properly-stylize-the-...-name...: Drop, unneeded - * update to 2.5.3 - https://github.com/keepassxreboot/keepassxc/releases/tag/2.5.3 + -- Julian Andres Klode <jak(a)debian.org> Sun, 12 Jul 2020 20:04:15 +0200 - -- darix <darix+debian(a)nordisch.org> Sun, 19 Jan 2020 21:25:00 -0000 +keepassxc (2.6.0~beta1-1) unstable; urgency=medium -keepassxc (2.5.2-1.1) stable; urgency=medium + * New upstream version 2.6.0~beta1 + * debian/copyright: Merge with COPYING + * debian/copyright: OpVault reader test is good now, got a new db + * debian/control: Build-Depend on qtbase5-private-dev + * debian/patches: + - Rebase + - Drop testopvaultreader disablement, not needed anymore + - revert a commit that caused keepassxc to look into .config/KeePassXC + instead of .config/keepassxc - * update to 2.5.2 - https://github.com/keepassxreboot/keepassxc/releases/tag/2.5.2 + -- Julian Andres Klode <jak(a)debian.org> Mon, 08 Jun 2020 21:18:34 +0200 - -- droidmonkey <support(a)dmapps.us> Sat, 04 Jan 2020 14:00:00 -0000 +keepassxc (2.5.4+dfsg.1-1) unstable; urgency=medium -keepassxc (2.5.0-1.1) experimental; urgency=medium + [ Julian Andres Klode ] + * New upstream version 2.5.4+dfsg.1 (Closes: #946450) + * debian/copyright: Exclude tests/data/freddy-2013-12-04.opvault* + * Add Suggests: xclip (Closes: #935316) + * 2.5.4 prep: debian/copyright: Exclude *.pdf + * Exclude share/icons/application/32x32/actions/statistics.png from tarball + * debian/copyright: Update copyright + * debian/copyright: Merge with COPYING + * Disable testopvaultreader due to test database licensing - * update to 2.5.0 - https://github.com/keepassxreboot/keepassxc/releases/tag/2.5.0 + [ Bruno Kleinert ] + * Describe package differences to keepassx (Closes: #903594) - -- darix <darix+debian(a)nordisch.org> Sat, 26 Oct 2019 19:39:00 -0000 + [ John Scott ] + * Suggest the web browser extension package (Closes: #956389) -keepassxc (2.4.3-1.1) experimental; urgency=medium + [ Jonathan Rubenstein ] + * Remove debian manpage Upstream made their own + * Backport reproducibility fix from 4411 - * update to 2.4.3 - https://github.com/keepassxreboot/keepassxc/releases/tag/2.4.3 + -- Julian Andres Klode <jak(a)debian.org> Sun, 24 May 2020 15:06:51 +0200 - -- darix <darix+debian(a)nordisch.org> Wed, 12 Jun 2019 11:01:00 -0000 - -keepassxc (2.4.2-1.1) experimental; urgency=medium - - * update to 2.4.2 - https://github.com/keepassxreboot/keepassxc/releases/tag/2.4.2 - - -- darix <darix+debian(a)nordisch.org> Fri, 31 May 2019 24:00:00 -0000 - -keepassxc (2.4.1-1.1) experimental; urgency=medium - - * update to 2.4.1 - https://github.com/keepassxreboot/keepassxc/releases/tag/2.4.1 - * disable update check - - -- darix <darix+debian(a)nordisch.org> Fri, 12 Apr 2019 22:41:00 -0000 - -keepassxc (2.4.0-6.1) experimental; urgency=medium - - * update to 2.4.0 - https://github.com/keepassxreboot/keepassxc/releases/tag/2.4.0 - - -- darix <darix+debian(a)nordisch.org> Tue, 19 Mar 2019 00:19:00 -0000 - -keepassxc (2.3.4+dfsg.1-2) UNRELEASED; urgency=medium +keepassxc (2.4.3+dfsg.1-1) unstable; urgency=medium + [ Ondřej Nový ] * d/copyright: Use https protocol in Format field * d/changelog: Remove trailing whitespaces - -- Ondřej Nový <onovy(a)debian.org> Mon, 01 Oct 2018 10:16:08 +0200 + [ Julian Andres Klode ] + * Remove unused libmicrohttpd-dev build dependency + * New upstream version 2.4.3+dfsg.1 (Closes: #926509) + * Bump Standards-Version to 4.4.0 + * Rebase patches + * Remove debian/compat (10), use debhelper-compat (= 12) build-dep + * debian/control: Update libargon2-dev build dependency + * Build-Depend on libqt5svg5-dev + * Build-Depend on libqrencode-dev + * tests: Adjust entropy for system-wide zxcvbn + * debian/rules: Ignore test failures from testcli as well + * Disable entropy tests in testcli + * debian/rules: Pass -DWITH_XC_UPDATECHECK=OFF to cmake. + Thanks to Konstantin Demin for the hint + * debian/rules: Remove unneeded --parallel argument to dh + * Update debian/copyright + + -- Julian Andres Klode <jak(a)debian.org> Fri, 06 Sep 2019 22:56:33 +0200 keepassxc (2.3.4+dfsg.1-1) unstable; urgency=medium diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/debian/compat new/debian/compat --- old/debian/compat 2019-10-26 21:28:07.000000000 +0200 +++ new/debian/compat 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -10 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/debian/control new/debian/control --- old/debian/control 2020-07-08 01:41:53.451147394 +0200 +++ new/debian/control 2020-08-20 08:59:11.000000000 +0200 @@ -4,7 +4,7 @@ Maintainer: Julian Andres Klode <jak(a)debian.org> Build-Depends: asciidoctor, cmake, - debhelper (>= 10), + debhelper-compat (= 12), libargon2-dev | libargon2-0-dev, libcurl4-gnutls-dev, libgcrypt20-dev, @@ -20,11 +20,6 @@ qtbase5-private-dev, qttools5-dev, qttools5-dev-tools, - libqt5svg5-dev, - libqt5x11extras5-dev, - libqrencode-dev, - libquazip5-dev, - libreadline-dev, xauth, xvfb, zlib1g-dev @@ -36,6 +31,8 @@ Package: keepassxc Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends} +Recommends: fonts-font-awesome +Suggests: xclip, webext-keepassxc-browser Description: Cross Platform Password Manager KeePassXC is a free/open-source password manager or safe which helps you to manage your passwords in a secure way. You can put all your @@ -43,3 +40,7 @@ key-disk. So you only have to remember one single master password or insert the key-disk to unlock the whole database. The databases are encrypted using the algorithms AES or Twofish. + . + In contrast to KeePassX (package keepassx), KeePassXC is actively developed + and has more features, e.g., connectivity to a Web Browser plugin (package + webext-keepassxc-browser). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/debian/copyright new/debian/copyright --- old/debian/copyright 2019-10-26 21:28:07.000000000 +0200 +++ new/debian/copyright 2020-08-20 08:59:11.000000000 +0200 @@ -1,7 +1,7 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: KeePassXC Source: https://www.keepassxc.org/ -Files-Excluded: src/zxcvbn +Files-Excluded: src/zxcvbn *.pdf Files: * Copyright: 2010-2015, Felix Geyer <debfx(a)fobos.de> @@ -23,7 +23,11 @@ 2012, Tobias Tangemann 2016, Jonathan White <support(a)dmapps.us> 2013, Francois Ferrand - 2016-2018, KeePassXC Team <team(a)keepassxc.org> + 2016-2020, KeePassXC Team <team(a)keepassxc.org> + 2019, Aetf <aetf(a)unlimitedcodeworks.xyz> + 2017, Weslly Honorato <weslly(a)protonmail.com> + 2010, Michael Leupold <lemma(a)confuego.org> + 2010-2011, Valentin Rusu <valir(a)kde.org> License: GPL-2 or GPL-3 Comment: The "KeePassXC Team" in every copyright notice is formed by the following people: - droidmonkey @@ -50,168 +54,155 @@ Copyright: 2015 halex2005 <akharlov(a)gmail.com> License: Expat -Files: share/icons/application/*/apps/keepassxc.png - share/icons/application/scalable/apps/keepassxc.svg - share/icons/application/*/apps/keepassxc-dark.png +Files: share/icons/application/scalable/apps/keepassxc.svg share/icons/application/scalable/apps/keepassxc-dark.svg - share/icons/application/*/apps/keepassxc-locked.png share/icons/application/scalable/apps/keepassxc-locked.svg - share/icons/application/*/apps/keepassxc-unlocked.png share/icons/application/scalable/apps/keepassxc-unlocked.svg - share/icons/application/*/mimetypes/application-x-keepassxc.png share/icons/application/scalable/mimetypes/application-x-keepassxc.svg Copyright: 2016, Lorenzo Stella <lorenzo.stl(a)gmail.com> License: LGPL-2 -Files: share/icons/application/*/actions/auto-type.png - share/icons/application/*/actions/database-change-key.png - share/icons/application/*/actions/entry-clone.png - share/icons/application/*/actions/entry-edit.png - share/icons/application/*/actions/entry-new.png - share/icons/application/*/actions/group-empty-trash.png - share/icons/application/*/actions/help-about.png - share/icons/application/*/actions/password-generate.png - share/icons/database/C00_Password.png - share/icons/database/C01_Package_Network.png - share/icons/database/C02_MessageBox_Warning.png - share/icons/database/C03_Server.png - share/icons/database/C04_Klipper.png - share/icons/database/C05_Edu_Languages.png - share/icons/database/C06_KCMDF.png - share/icons/database/C07_Kate.png - share/icons/database/C08_Socket.png - share/icons/database/C09_Identity.png - share/icons/database/C10_Kontact.png - share/icons/database/C11_Camera.png - share/icons/database/C12_IRKickFlash.png - share/icons/database/C13_KGPG_Key3.png - share/icons/database/C14_Laptop_Power.png - share/icons/database/C15_Scanner.png - share/icons/database/C16_Mozilla_Firebird.png - share/icons/database/C17_CDROM_Unmount.png - share/icons/database/C18_Display.png - share/icons/database/C19_Mail_Generic.png - share/icons/database/C20_Misc.png - share/icons/database/C21_KOrganizer.png - share/icons/database/C22_ASCII.png - share/icons/database/C23_Icons.png - share/icons/database/C24_Connect_Established.png - share/icons/database/C25_Folder_Mail.png - share/icons/database/C26_FileSave.png - share/icons/database/C27_NFS_Unmount.png - share/icons/database/C28_QuickTime.png - share/icons/database/C29_KGPG_Term.png - share/icons/database/C30_Konsole.png - share/icons/database/C31_FilePrint.png - share/icons/database/C32_FSView.png - share/icons/database/C33_Run.png - share/icons/database/C34_Configure.png - share/icons/database/C35_KRFB.png - share/icons/database/C36_Ark.png - share/icons/database/C37_KPercentage.png - share/icons/database/C38_Samba_Unmount.png - share/icons/database/C39_History.png - share/icons/database/C40_Mail_Find.png - share/icons/database/C41_VectorGfx.png - share/icons/database/C42_KCMMemory.png - share/icons/database/C43_EditTrash.png - share/icons/database/C44_KNotes.png - share/icons/database/C45_Cancel.png - share/icons/database/C46_Help.png - share/icons/database/C47_KPackage.png - share/icons/database/C48_Folder.png - share/icons/database/C49_Folder_Blue_Open.png - share/icons/database/C50_Folder_Tar.png - share/icons/database/C51_Decrypted.png - share/icons/database/C52_Encrypted.png - share/icons/database/C53_Apply.png - share/icons/database/C54_Signature.png - share/icons/database/C55_Thumbnail.png - share/icons/database/C56_KAddressBook.png - share/icons/database/C57_View_Text.png - share/icons/database/C58_KGPG.png - share/icons/database/C59_Package_Development.png - share/icons/database/C60_KFM_Home.png - share/icons/database/C61_Services.png -Copyright: 2003-2004, David Vignoni <david(a)icon-king.com> -License: LGPL-2.1 -Comment: from Nuvola icon theme - -Files: share/icons/application/*/actions/entry-delete.png - share/icons/application/*/actions/group-delete.png - share/icons/application/*/actions/group-edit.png - share/icons/application/*/actions/group-new.png -Copyright: 2003-2004, David Vignoni <david(a)icon-king.com> - 2012, Felix Geyer <debfx(a)fobos.de> -License: LGPL-2.1 -Comment: based on Nuvola icon theme - -Files: share/icons/application/*/actions/favicon-download.png -Copyright: 2003-2004, David Vignoni <david(a)icon-king.com> - 2018, Kyle Kneitinger <kyle(a)kneit.in> -License: LGPL-2.1 -Comment: based on Nuvola icon theme - -Files: share/icons/application/*/actions/application-exit.png - share/icons/application/*/actions/chronometer.png - share/icons/application/*/actions/configure.png - share/icons/application/*/actions/dialog-close.png - share/icons/application/*/actions/dialog-ok.png - share/icons/application/*/actions/document-close.png - share/icons/application/*/actions/document-edit.png - share/icons/application/*/actions/document-encrypt.png - share/icons/application/*/actions/document-new.png - share/icons/application/*/actions/document-open.png - share/icons/application/*/actions/document-properties.png - share/icons/application/*/actions/document-save.png - share/icons/application/*/actions/document-save-as.png - share/icons/application/*/actions/edit-clear-locationbar-ltr.png - share/icons/application/*/actions/edit-clear-locationbar-rtl.png - share/icons/application/*/actions/key-enter.png - share/icons/application/*/actions/password-generator.png - share/icons/application/*/actions/password-copy.png - share/icons/application/*/actions/password-show-*.png - share/icons/application/*/actions/system-search.png - share/icons/application/*/actions/username-copy.png - share/icons/application/*/actions/view-history.png - share/icons/application/*/apps/internet-web-browser.png - share/icons/application/*/apps/preferences-desktop-icons.png - share/icons/application/*/apps/utilities-terminal.png - share/icons/application/*/categories/preferences-other.png - share/icons/application/*/status/dialog-error.png - share/icons/application/*/status/dialog-information.png - share/icons/application/*/status/dialog-warning.png - share/icons/application/*/status/security-high.png - share/icons/svg/*.svg -Copyright: 2007, Nuno Pinheiro <nuno(a)oxygen-icons.org> - 2007, David Vignoni <david(a)icon-king.com> - 2007, David Miller <miller(a)oxygen-icons.org> - 2007, Johann Ollivier Lapeyre <johann(a)oxygen-icons.org> - 2007, Kenneth Wimer <kwwii(a)bootsplash.org> - 2007, Riccardo Iaconelli <riccardo(a)oxygen-icons.org> -License: LGPL-3+ -Comment: from Oxygen icon theme (http://www.oxygen-icons.org/) +Files: share/icons/database/C00_Password.svg + share/icons/database/C01_Package_Network.svg + share/icons/database/C02_MessageBox_Warning.svg + share/icons/database/C03_Server.svg + share/icons/database/C04_Klipper.svg + share/icons/database/C05_Edu_Languages.svg + share/icons/database/C06_KCMDF.svg + share/icons/database/C08_Socket.svg + share/icons/database/C09_Identity.svg + share/icons/database/C10_Kontact.svg + share/icons/database/C11_Camera.svg + share/icons/database/C12_IRKickFlash.svg + share/icons/database/C13_KGPG_Key3.svg + share/icons/database/C14_Laptop_Power.svg + share/icons/database/C15_Scanner.svg + share/icons/database/C16_Mozilla_Firebird.svg + share/icons/database/C19_Mail_Generic.svg + share/icons/database/C20_Misc.svg + share/icons/database/C21_KOrganizer.svg + share/icons/database/C22_ASCII.svg + share/icons/database/C23_Icons.svg + share/icons/database/C24_Connect_Established.svg + share/icons/database/C25_Folder_Mail.svg + share/icons/database/C28_QuickTime.svg + share/icons/database/C29_KGPG_Term.svg + share/icons/database/C30_Konsole.svg + share/icons/database/C31_FilePrint.svg + share/icons/database/C32_FSView.svg + share/icons/database/C33_Run.svg + share/icons/database/C34_Configure.svg + share/icons/database/C36_Ark.svg + share/icons/database/C39_History.svg + share/icons/database/C40_Mail_Find.svg + share/icons/database/C41_VectorGfx.svg + share/icons/database/C42_KCMMemory.svg + share/icons/database/C43_EditTrash.svg + share/icons/database/C47_KPackage.svg + share/icons/database/C48_Folder.svg + share/icons/database/C49_Folder_Blue_Open.svg + share/icons/database/C50_Folder_Tar.svg + share/icons/database/C55_Thumbnail.svg + share/icons/database/C56_KAddressBook.svg + share/icons/database/C57_View_Text.svg + share/icons/database/C58_KGPG.svg + share/icons/database/C59_Package_Development.svg + share/icons/database/C60_KFM_Home.svg + share/icons/database/C62_Tux.svg + share/icons/database/C63_Feather.svg + share/icons/database/C65_W.svg + share/icons/database/C67_Certificate.svg + share/icons/database/C68_BlackBerry.svg +Copyright: none +License: Expat +Comment: Taken from https://github.com/icons8/flat-color-icons -Files: share/icons/database/C62_Tux.png - share/icons/database/C63_Feather.png - share/icons/database/C64_Apple.png - share/icons/database/C67_Certificate.png - share/icons/database/C68_BlackBerry.png -Copyright: Mairin Duffy - Sarah Owens - James Birkett - Dominik Reichl +Files: share/icons/badges/0_ShareActive.svg + share/icons/badges/1_ShareInactive.svg + share/icons/database/C07_Kate.svg + share/icons/database/C17_CDROM_Unmount.svg + share/icons/database/C18_Display.svg + share/icons/database/C26_FileSave.svg + share/icons/database/C27_NFS_Unmount.svg + share/icons/database/C35_KRFB.svg + share/icons/database/C38_Samba_Unmount.svg + share/icons/database/C44_KNotes.svg + share/icons/database/C51_Decrypted.svg + share/icons/database/C52_Encrypted.svg + share/icons/database/C54_Signature.svg + share/icons/database/C66_Money.svg +Copyright: none License: CC0 -Comment: C62_Tux.png from https://openclipart.org/detail/103855 - C63_Feather.png from http://openclipart.org/detail/122017 - C64_Apple.png based on http://openclipart.org/detail/24319 - C67_Certificate.png based on https://openclipart.org/detail/16729 - C68_BlackBerry.png from https://openclipart.org/detail/4465 +Comment: Taken from https://github.com/paomedia/small-n-flat -Files: share/icons/database/C65_W.png - share/icons/database/C66_Money.png -Copyright: none -License: public-domain +Files: share/icons/badges/2_Expired.svg + share/icons/database/C37_KPercentage.svg + share/icons/database/C45_Cancel.svg + share/icons/database/C46_Help.svg + share/icons/database/C53_Apply.svg + share/icons/database/C61_Services.svg +Copyright: 2020 KeePassXC Team <team(a)keepassxc.org> +License: Expat + +Files: share/icons/application/scalable/actions/document-close.svg + share/icons/application/scalable/actions/document-edit.svg + share/icons/application/scalable/actions/document-export.svg + share/icons/application/scalable/actions/document-import.svg + share/icons/application/scalable/actions/document-new.svg + share/icons/application/scalable/actions/document-open.svg + share/icons/application/scalable/actions/document-open-recent.svg + share/icons/application/scalable/actions/document-properties.svg + share/icons/application/scalable/actions/document-save.svg + share/icons/application/scalable/actions/document-save-as.svg + share/icons/application/scalable/actions/document-save-copy.svg + share/icons/application/scalable/actions/edit-clear-locationbar-ltr.svg + share/icons/application/scalable/actions/edit-clear-locationbar-rtl.svg + share/icons/application/scalable/actions/entry-clone.svg + share/icons/application/scalable/actions/entry-delete.svg + share/icons/application/scalable/actions/entry-edit.svg + share/icons/application/scalable/actions/entry-new.svg + share/icons/application/scalable/actions/favicon-download.svg + share/icons/application/scalable/actions/group-delete.svg + share/icons/application/scalable/actions/group-edit.svg + share/icons/application/scalable/actions/group-empty-trash.svg + share/icons/application/scalable/actions/group-new.svg + share/icons/application/scalable/actions/help-about.svg + share/icons/application/scalable/actions/key-enter.svg + share/icons/application/scalable/actions/message-close.svg + share/icons/application/scalable/actions/move-down.svg + share/icons/application/scalable/actions/move-up.svg + share/icons/application/scalable/actions/paperclip.svg + share/icons/application/scalable/actions/password-copy.svg + share/icons/application/scalable/actions/password-generate.svg + share/icons/application/scalable/actions/password-generator.svg + share/icons/application/scalable/actions/password-show-off.svg + share/icons/application/scalable/actions/password-show-on.svg + share/icons/application/scalable/actions/refresh.svg + share/icons/application/scalable/actions/reports.svg + share/icons/application/scalable/actions/reports-exclude.svg + share/icons/application/scalable/actions/statistics.svg + share/icons/application/scalable/actions/system-help.svg + share/icons/application/scalable/actions/system-search.svg + share/icons/application/scalable/actions/url-copy.svg + share/icons/application/scalable/actions/username-copy.svg + share/icons/application/scalable/actions/view-history.svg + share/icons/application/scalable/apps/internet-web-browser.svg + share/icons/application/scalable/apps/keepassxc.svg + share/icons/application/scalable/apps/keepassxc-dark.svg + share/icons/application/scalable/apps/keepassxc-locked.svg + share/icons/application/scalable/apps/keepassxc-unlocked.svg + share/icons/application/scalable/apps/preferences-desktop-icons.svg + share/icons/application/scalable/apps/preferences-system-network-sharing.svg + share/icons/application/scalable/apps/utilities-terminal.svg + share/icons/application/scalable/categories/preferences-other.svg + share/icons/application/scalable/mimetypes/application-x-keepassxc.svg + share/icons/application/scalable/status/dialog-error.svg + share/icons/application/scalable/status/dialog-information.svg + share/icons/application/scalable/status/dialog-warning.svg + share/icons/application/scalable/status/security-high.svg +Copyright: 2019 Austin Andrews <http://templarian.com/> +License: SIL-OFL-1.1 +Comment: Taken from Material Design icon set (https://github.com/templarian/MaterialDesign/) Files: src/streams/qtiocompressor.* src/streams/QtIOCompressor @@ -229,6 +220,17 @@ Copyright: Copyright 2017 KeePassXC Team <team(a)keepassxc.org> License: CC-BY-3.0 +Files: share/icons/application/scalable/apps/freedesktop.svg +License: GPL-2+ +Copyright: Unspecified +Comment: from Freedesktop.org website + +Files: share/icons/application/scalable/actions/object-locked.svg + share/icons/application/scalable/actions/object-unlocked.svg +Copyright: Unspecified +License: LGPL-3 +Comment: from Breeze icon theme (https://github.com/KDE/breeze-icons) + License: GPL-2 This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public @@ -250,6 +252,27 @@ License version 2 can be found in the file `/usr/share/common-licenses/GPL-2'. +License: GPL-2+ + This program is free software; you can redistribute it + and/or modify it under the terms of the GNU General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + . + This program is distributed in the hope that it will be + useful, but WITHOUT ANY WARRANTY; without even the implied + warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the GNU General Public License for more + details. + . + You should have received a copy of the GNU General Public + License along with this package; if not, write to the Free + Software Foundation, Inc., 51 Franklin St, Fifth Floor, + Boston, MA 02110-1301 USA + . + On Debian systems, the full text of the GNU General Public + License version 2 can be found in the file + `/usr/share/common-licenses/GPL-2'. + License: GPL-3 This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -326,6 +349,23 @@ License version 3 can be found in the file `/usr/share/common-licenses/LGPL-3'. +License: LGPL-3 + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; + version 3.0 of the License. + . + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + You should have received a copy of the GNU Lesser General Public + License along with this library. + . + On Debian systems, the full text of the GNU Lesser General Public + License version 3 can be found in the file + `/usr/share/common-licenses/LGPL-3'. + License: CC0 Creative Commons CC0 1.0 Universal . @@ -874,3 +914,95 @@ does not form part of this License. . Creative Commons may be contacted at https://creativecommons.org/. + +License: SIL-OFL-1.1 + This Font Software is licensed under the SIL Open Font License, Version 1.1. + This license is copied below, and is also available with a FAQ at: + http://scripts.sil.org/OFL + . + ----------------------------------------------------------- + SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 + ----------------------------------------------------------- + . + PREAMBLE + The goals of the Open Font License (OFL) are to stimulate worldwide + development of collaborative font projects, to support the font creation + efforts of academic and linguistic communities, and to provide a free and + open framework in which fonts may be shared and improved in partnership + with others. + . + The OFL allows the licensed fonts to be used, studied, modified and + redistributed freely as long as they are not sold by themselves. The + fonts, including any derivative works, can be bundled, embedded, + redistributed and/or sold with any software provided that any reserved + names are not used by derivative works. The fonts and derivatives, + however, cannot be released under any other type of license. The + requirement for fonts to remain under this license does not apply + to any document created using the fonts or their derivatives. + . + DEFINITIONS + "Font Software" refers to the set of files released by the Copyright + Holder(s) under this license and clearly marked as such. This may + include source files, build scripts and documentation. + . + "Reserved Font Name" refers to any names specified as such after the + copyright statement(s). + . + "Original Version" refers to the collection of Font Software components as + distributed by the Copyright Holder(s). + . + "Modified Version" refers to any derivative made by adding to, deleting, + or substituting -- in part or in whole -- any of the components of the + Original Version, by changing formats or by porting the Font Software to a + new environment. + . + "Author" refers to any designer, engineer, programmer, technical + writer or other person who contributed to the Font Software. + . + PERMISSION & CONDITIONS + Permission is hereby granted, free of charge, to any person obtaining + a copy of the Font Software, to use, study, copy, merge, embed, modify, + redistribute, and sell modified and unmodified copies of the Font + Software, subject to the following conditions: + . + 1) Neither the Font Software nor any of its individual components, + in Original or Modified Versions, may be sold by itself. + . + 2) Original or Modified Versions of the Font Software may be bundled, + redistributed and/or sold with any software, provided that each copy + contains the above copyright notice and this license. These can be + included either as stand-alone text files, human-readable headers or + in the appropriate machine-readable metadata fields within text or + binary files as long as those fields can be easily viewed by the user. + . + 3) No Modified Version of the Font Software may use the Reserved Font + Name(s) unless explicit written permission is granted by the corresponding + Copyright Holder. This restriction only applies to the primary font name as + presented to the users. + . + 4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font + Software shall not be used to promote, endorse or advertise any + Modified Version, except to acknowledge the contribution(s) of the + Copyright Holder(s) and the Author(s) or with their explicit written + permission. + . + 5) The Font Software, modified or unmodified, in part or in whole, + must be distributed entirely under this license, and must not be + distributed under any other license. The requirement for fonts to + remain under this license does not apply to any document created + using the Font Software. + . + TERMINATION + This license becomes null and void if any of the above conditions are + not met. + . + DISCLAIMER + THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT + OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE + COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL + DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM + OTHER DEALINGS IN THE FONT SOFTWARE. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/debian/patches/0001-Remove-code-references-to-source-directory.patch new/debian/patches/0001-Remove-code-references-to-source-directory.patch --- old/debian/patches/0001-Remove-code-references-to-source-directory.patch 2019-10-26 21:28:07.000000000 +0200 +++ new/debian/patches/0001-Remove-code-references-to-source-directory.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,35 +0,0 @@ -From: Julian Andres Klode <jak(a)debian.org> -Date: Thu, 30 Aug 2018 21:32:27 +0200 -Subject: Remove code references to source directory - -Bug-Debian: https://bugs.debian.org/890486 -Forwarded: not-needed ---- - src/core/FilePath.cpp | 7 ------- - 1 file changed, 7 deletions(-) - -diff --git a/src/core/FilePath.cpp b/src/core/FilePath.cpp -index 5b03227..e62d196 100644 ---- a/src/core/FilePath.cpp -+++ b/src/core/FilePath.cpp -@@ -219,10 +219,6 @@ FilePath::FilePath() - - if (false) { - } --#ifdef QT_DEBUG -- else if (testSetDir(QString(KEEPASSX_SOURCE_DIR) + "/share")) { -- } --#endif - #if defined(Q_OS_UNIX) && !(defined(Q_OS_MACOS) && defined(WITH_APP_BUNDLE)) - else if (isDataDirAbsolute && testSetDir(KEEPASSX_DATA_DIR)) { - } else if (!isDataDirAbsolute && testSetDir(QString("%1/../%2").arg(appDirPath, KEEPASSX_DATA_DIR))) { -@@ -237,9 +233,6 @@ FilePath::FilePath() - else if (testSetDir(appDirPath + "/share")) { - } - #endif -- // Last ditch test when running in the build directory (mainly for travis tests) -- else if (testSetDir(QString(KEEPASSX_SOURCE_DIR) + "/share")) { -- } - - if (m_dataPath.isEmpty()) { - qWarning("FilePath::DataPath: can't find data dir"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/debian/patches/0002-tests-Adjust-entropy-for-system-wide-zxcvbn.patch new/debian/patches/0002-tests-Adjust-entropy-for-system-wide-zxcvbn.patch --- old/debian/patches/0002-tests-Adjust-entropy-for-system-wide-zxcvbn.patch 2020-07-08 01:56:22.062028578 +0200 +++ new/debian/patches/0002-tests-Adjust-entropy-for-system-wide-zxcvbn.patch 2020-08-20 08:59:11.000000000 +0200 @@ -11,10 +11,10 @@ tests/gui/TestGui.cpp | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) -Index: keepassxc-2.6.0/tests/TestCli.cpp -=================================================================== ---- keepassxc-2.6.0.orig/tests/TestCli.cpp -+++ keepassxc-2.6.0/tests/TestCli.cpp +diff --git a/tests/TestCli.cpp b/tests/TestCli.cpp +index 348afb6..71b68fc 100644 +--- a/tests/TestCli.cpp ++++ b/tests/TestCli.cpp @@ -884,8 +884,8 @@ void TestCli::testEstimate() execCmd(estimateCmd, {"estimate", "-a"}); auto result = QString(m_stdout->readAll()); @@ -26,10 +26,10 @@ for (const auto& string : asConst(searchStrings)) { QVERIFY2(result.contains(string), qPrintable("String " + string + " missing")); } -Index: keepassxc-2.6.0/tests/gui/TestGui.cpp -=================================================================== ---- keepassxc-2.6.0.orig/tests/gui/TestGui.cpp -+++ keepassxc-2.6.0/tests/gui/TestGui.cpp +diff --git a/tests/gui/TestGui.cpp b/tests/gui/TestGui.cpp +index e59540a..da7d516 100644 +--- a/tests/gui/TestGui.cpp ++++ b/tests/gui/TestGui.cpp @@ -686,17 +686,17 @@ void TestGui::testPasswordEntryEntropy() generatedPassword->setText(""); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/debian/patches/series new/debian/patches/series --- old/debian/patches/series 2019-10-26 23:17:50.148450863 +0200 +++ new/debian/patches/series 2020-08-20 08:59:11.000000000 +0200 @@ -1,2 +1 @@ -# 0001-Remove-code-references-to-source-directory.patch 0002-tests-Adjust-entropy-for-system-wide-zxcvbn.patch diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/debian/rules new/debian/rules --- old/debian/rules 2019-10-26 21:28:08.042198941 +0200 +++ new/debian/rules 2020-08-20 08:59:11.000000000 +0200 @@ -1,7 +1,6 @@ #!/usr/bin/make -f # -*- makefile -*- -GITREV=$(shell dpkg-parsechangelog -S Version | sed -n 's/.*+git.*\.$.*$/\1/p') include /usr/share/dpkg/architecture.mk export DEB_BUILD_MAINT_OPTIONS=hardening=+all @@ -13,18 +12,19 @@ override_dh_auto_configure: if [ -e src/zxcvbn/ ]; then rm -r src/zxcvbn/ ; fi dh_auto_configure -- -DWITH_TESTS=ON \ - -DGIT_HEAD_OVERRIDE=${GITREV} \ - -DKEEPASSXC_BUILD_TYPE="PreRelease" \ - -DWITH_GUI_TESTS=OFF \ - -DWITH_XC_KEESHARE_SECURE=ON \ + -DWITH_GUI_TESTS=ON \ -DWITH_XC_UPDATECHECK=OFF \ -DWITH_XC_ALL=ON -#override_dh_auto_test: -# dh_auto_test -- ARGS+="-E 'test(cli|gui)'" -# # testcli and testgui use X, and have horrible X clipboard tests that -# # randomly fail, so ignore failures -# xvfb-run -a --server-args="-screen 0 800x600x24" dh_auto_test -- ARGS+="-R 'test(cli|gui)'" || true +override_dh_auto_install: + dh_auto_install + sed -i s#https://cdnjs.cloudflare.com/ajax/libs/font-awesome/.*/font-awesome.min.c… $$(find debian/keepassxc/ -name '*.html') + +override_dh_auto_test: + dh_auto_test -- ARGS+="-E 'test(cli|gui)'" + # testcli and testgui use X, and have horrible X clipboard tests that + # randomly fail, so ignore failures + xvfb-run -a --server-args="-screen 0 800x600x24" dh_auto_test -- ARGS+="-R 'test(cli|gui)'" || true override_dh_makeshlibs: # keepassx only ships plugins diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/debian/source/lintian-overrides new/debian/source/lintian-overrides --- old/debian/source/lintian-overrides 1970-01-01 01:00:00.000000000 +0100 +++ new/debian/source/lintian-overrides 2020-08-20 08:59:11.000000000 +0200 @@ -0,0 +1 @@ +source-is-missing tests/data/keepassxc.opvault/default/*.js * ++++++ keepassxc-2.6.0-src.tar.xz -> keepassxc-2.6.1-src.tar.xz ++++++ ++++ 26480 lines of diff (skipped) ++++++ keepassxc.dsc ++++++ --- /var/tmp/diff_new_pack.DcjT2K/_old 2020-08-31 16:53:00.548434678 +0200 +++ /var/tmp/diff_new_pack.DcjT2K/_new 2020-08-31 16:53:00.548434678 +0200 @@ -2,7 +2,7 @@ Source: keepassxc Binary: keepassxc Architecture: any -Version: 2.6.0-1.1 +Version: 2.6.1+dfsg.1-1 Maintainer: Julian Andres Klode <jak(a)debian.org> Homepage: https://www.keepassxc.org/ Standards-Version: 4.4.0 @@ -10,7 +10,7 @@ Vcs-Git: https://salsa.debian.org/debian/keepassxc.git Build-Depends: asciidoctor, cmake, - debhelper (>= 10), + debhelper-compat (= 12), libargon2-dev | libargon2-0-dev, libcurl4-gnutls-dev, libgcrypt20-dev, @@ -26,11 +26,6 @@ qtbase5-private-dev, qttools5-dev, qttools5-dev-tools, - libqt5svg5-dev, - libqt5x11extras5-dev, - libqrencode-dev, - libquazip5-dev, - libreadline-dev, xauth, xvfb, zlib1g-dev

1 0

commit coturn for openSUSE:Factory
by root 31 Aug '20

31 Aug '20

Hello community, here is the log from the commit of package coturn for openSUSE:Factory checked in at 2020-08-31 16:52:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/coturn (Old) and /work/SRC/openSUSE:Factory/.coturn.new.3399 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "coturn" Mon Aug 31 16:52:30 2020 rev:5 rq:830616 version:4.5.1.3 Changes: -------- --- /work/SRC/openSUSE:Factory/coturn/coturn.changes 2020-06-30 21:59:17.427283519 +0200 +++ /work/SRC/openSUSE:Factory/.coturn.new.3399/coturn.changes 2020-08-31 16:52:51.836430454 +0200 @@ -1,0 +2,5 @@ +Wed Aug 19 10:48:41 UTC 2020 - Callum Farmer <callumjfarmer13(a)gmail.com> + +- Fixes for %_libexecdir changing to /usr/libexec (bsc#1174075) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ coturn.spec ++++++ --- /var/tmp/diff_new_pack.L0QmUf/_old 2020-08-31 16:52:54.604431796 +0200 +++ /var/tmp/diff_new_pack.L0QmUf/_new 2020-08-31 16:52:54.608431798 +0200 @@ -119,7 +119,7 @@ install -Dpm 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/logrotate.d/%{name} install -Dpm 0644 %{SOURCE4} %{buildroot}%{_sysusersdir}/ install -Dpm 0644 %{SOURCE5} %{buildroot}%{_fillupdir}/sysconfig.%{name} -install -Dpm 0644 %{SOURCE6} %{buildroot}%{_libexecdir}/firewalld/services/%{name}.xml +install -Dpm 0644 %{SOURCE6} %{buildroot}%{_prefix}/lib/firewalld/services/%{name}.xml install -Dpm 0644 %{SOURCE7} %{buildroot}%{_docdir}/%{name}/ %if %{with apparmor} install -Dpm 0644 %{SOURCE8} %{buildroot}%{_sysconfdir}/apparmor.d/usr.bin.turnserver @@ -181,9 +181,9 @@ %{_sysusersdir}/%{name}-user.conf %{_sbindir}/rc%{name} %{_fillupdir}/sysconfig.coturn -%dir %{_libexecdir}/firewalld -%dir %{_libexecdir}/firewalld/services -%{_libexecdir}/firewalld/services/coturn.xml +%dir %{_prefix}/lib/firewalld +%dir %{_prefix}/lib/firewalld/services +%{_prefix}/lib/firewalld/services/coturn.xml %{_bindir}/turnserver %{_bindir}/turnadmin

1 0