Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

v5.18.1 #5618

Merged
merged 3 commits into from
Mar 27, 2024
Merged

v5.18.1 #5618

merged 3 commits into from
Mar 27, 2024

Conversation

PromoFaux
Copy link
Member

Release PR

@PromoFaux
Sync master back into development (#5616)
7442454
@PromoFaux
Fix file permission check in gravity.sh. Remove quotes that were adde…
eb7daf4 
…d after complaints from shellcheck, this stopped the comparisson from working

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
@PromoFaux
Remove double quotes that prevented _any_ local files from being read…
32c640e 
… by gravity (#5617)
@dschaper dschaper requested a review from a team March 27, 2024 19:17
dschaper
dschaper approved these changes Mar 27, 2024
View reviewed changes
Copy link
Member

@dschaper dschaper left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

dan@Viking:~$ bash -x a.sh
+ file_path=./me.txt
++ stat -c %a ./me.txt
+ permissions=1666
+ [[ 1666 == *4 ]]
+ [[ 1666 == *5 ]]
+ [[ 1666 == *6 ]]
+ echo -e mememe
mememe

@PromoFaux PromoFaux merged commit 74a44ca into master Mar 27, 2024
16 checks passed
@akhepcat
Copy link

akhepcat commented Mar 27, 2024 •
edited
Loading

That is a really awkward way to test for a single bit.

use math:

dperm=$((8#$permissions))
global_read=$(( $dperm & 4))
if [ $global_read -eq 4 ]; then printf "readable\n"; fi

DL6ER added a commit that referenced this pull request Mar 28, 2024
@DL6ER
Port most recent changes of PRs #5615, #5618 amd #5620 to v6
b595b3b 
Signed-off-by: DL6ER <dl6er@dl6er.de>
@DL6ER DL6ER mentioned this pull request Mar 28, 2024
Merged
5 tasks
mgziminsky added a commit to mgziminsky/pi-hole-alpine that referenced this pull request Apr 7, 2024
@mgziminsky
Squashed commit of the following:
27dbc6d 
commit 5490a6e
Merge: 74a44ca 8cfccf9
Author: Adam Warner <me@adamwarner.co.uk>
Date:   Sun Mar 31 19:46:24 2024 +0100

    Release 5.18.2 (pi-hole#5629)

commit 8cfccf9
Merge: 47998e1 d80fcf2
Author: Dan Schaper <dan.schaper@pi-hole.net>
Date:   Thu Mar 28 09:44:51 2024 -0700

    More checks when downloading from file:// scheme (pi-hole#5620)

commit 47998e1
Merge: 7879f07 eb23fbf
Author: Dan Schaper <dan.schaper@pi-hole.net>
Date:   Wed Mar 27 16:31:40 2024 -0700

    Bump actions/checkout from 4.1.1 to 4.1.2 (pi-hole#5604)

commit d80fcf2
Author: Orazio <22700499+orazioedoardo@users.noreply.github.com>
Date:   Wed Mar 27 22:10:12 2024 +0100

    More checks when downloading from file:// scheme

    Signed-off-by: Orazio <22700499+orazioedoardo@users.noreply.github.com>

commit 7879f07
Merge: 32c640e 74a44ca
Author: Adam Warner <me@adamwarner.co.uk>
Date:   Wed Mar 27 20:15:28 2024 +0000

    Sync master back into development (pi-hole#5619)

commit 74a44ca
Merge: 3c7a6ce 32c640e
Author: Adam Warner <me@adamwarner.co.uk>
Date:   Wed Mar 27 19:18:09 2024 +0000

    v5.18.1 (pi-hole#5618)

commit 32c640e
Merge: 7442454 eb7daf4
Author: Adam Warner <me@adamwarner.co.uk>
Date:   Wed Mar 27 19:16:25 2024 +0000

    Remove double quotes that prevented _any_ local files from being read by gravity (pi-hole#5617)

commit eb7daf4
Author: Adam Warner <me@adamwarner.co.uk>
Date:   Wed Mar 27 19:12:59 2024 +0000

    Fix file permission check in gravity.sh. Remove quotes that were added after complaints from shellcheck, this stopped the comparisson from working

    Signed-off-by: Adam Warner <me@adamwarner.co.uk>

commit 7442454
Merge: f3af031 3c7a6ce
Author: Adam Warner <me@adamwarner.co.uk>
Date:   Wed Mar 27 18:25:47 2024 +0000

    Sync master back into development (pi-hole#5616)

commit 3c7a6ce
Merge: 19bfa08 f3af031
Author: Adam Warner <me@adamwarner.co.uk>
Date:   Wed Mar 27 18:11:12 2024 +0000

    Release 5.18 (pi-hole#5615)

commit f3af031
Merge: eaa878e 9dd138b
Author: Adam Warner <github@adamwarner.co.uk>
Date:   Wed Mar 27 18:02:44 2024 +0000

    Merge pull request from GHSA-95g6-7q26-mp9x

    Only use local files (file://) when they have explicit permissions a+r

commit eb23fbf
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Sat Mar 16 10:08:27 2024 +0000

    Bump actions/checkout from 4.1.1 to 4.1.2

    Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.1 to 4.1.2.
    - [Release notes](https://github.com/actions/checkout/releases)
    - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
    - [Commits](actions/checkout@v4.1.1...v4.1.2)

    ---
    updated-dependencies:
    - dependency-name: actions/checkout
      dependency-type: direct:production
      update-type: version-update:semver-patch
    ...

    Signed-off-by: dependabot[bot] <support@github.com>

commit eaa878e
Merge: 0597128 8042d9e
Author: yubiuser <ckoenig@posteo.de>
Date:   Sat Mar 9 12:03:35 2024 +0100

    Bump tox from 4.13.0 to 4.14.1 in /test (pi-hole#5602)

commit 8042d9e
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Sat Mar 9 10:21:53 2024 +0000

    Bump tox from 4.13.0 to 4.14.1 in /test

    Bumps [tox](https://github.com/tox-dev/tox) from 4.13.0 to 4.14.1.
    - [Release notes](https://github.com/tox-dev/tox/releases)
    - [Changelog](https://github.com/tox-dev/tox/blob/main/docs/changelog.rst)
    - [Commits](tox-dev/tox@4.13.0...4.14.1)

    ---
    updated-dependencies:
    - dependency-name: tox
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...

    Signed-off-by: dependabot[bot] <support@github.com>

commit 9dd138b
Author: DL6ER <dl6er@dl6er.de>
Date:   Mon Mar 4 19:38:13 2024 +0100

    Only use local files (file://) when they have explicit permissions a+r

    Signed-off-by: DL6ER <dl6er@dl6er.de>

commit 0597128
Merge: e03ddf5 0fdd959
Author: yubiuser <ckoenig@posteo.de>
Date:   Sat Mar 2 12:56:52 2024 +0100

    Bump pytest-testinfra from 10.0.0 to 10.1.0 in /test (pi-hole#5579)

commit 0fdd959
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Sat Mar 2 11:52:21 2024 +0000

    Bump pytest-testinfra from 10.0.0 to 10.1.0 in /test

    Bumps [pytest-testinfra](https://github.com/pytest-dev/pytest-testinfra) from 10.0.0 to 10.1.0.
    - [Release notes](https://github.com/pytest-dev/pytest-testinfra/releases)
    - [Changelog](https://github.com/pytest-dev/pytest-testinfra/blob/main/CHANGELOG.rst)
    - [Commits](pytest-dev/pytest-testinfra@10.0.0...10.1.0)

    ---
    updated-dependencies:
    - dependency-name: pytest-testinfra
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...

    Signed-off-by: dependabot[bot] <support@github.com>

commit e03ddf5
Merge: b57cf27 cb3e448
Author: yubiuser <ckoenig@posteo.de>
Date:   Sat Mar 2 12:51:31 2024 +0100

    Bump pytest from 8.0.0 to 8.0.2 in /test (pi-hole#5598)

commit cb3e448
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Sat Mar 2 10:18:47 2024 +0000

    Bump pytest from 8.0.0 to 8.0.2 in /test

    Bumps [pytest](https://github.com/pytest-dev/pytest) from 8.0.0 to 8.0.2.
    - [Release notes](https://github.com/pytest-dev/pytest/releases)
    - [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst)
    - [Commits](pytest-dev/pytest@8.0.0...8.0.2)

    ---
    updated-dependencies:
    - dependency-name: pytest
      dependency-type: direct:production
      update-type: version-update:semver-patch
    ...

    Signed-off-by: dependabot[bot] <support@github.com>

commit b57cf27
Merge: 3ba6ab5 5b75cb1
Author: yubiuser <ckoenig@posteo.de>
Date:   Sat Feb 24 13:44:20 2024 +0100

    Bump tox from 4.12.1 to 4.13.0 in /test (pi-hole#5581)

commit 5b75cb1
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Sat Feb 17 10:29:46 2024 +0000

    Bump tox from 4.12.1 to 4.13.0 in /test

    Bumps [tox](https://github.com/tox-dev/tox) from 4.12.1 to 4.13.0.
    - [Release notes](https://github.com/tox-dev/tox/releases)
    - [Changelog](https://github.com/tox-dev/tox/blob/main/docs/changelog.rst)
    - [Commits](tox-dev/tox@4.12.1...4.13.0)

    ---
    updated-dependencies:
    - dependency-name: tox
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...

    Signed-off-by: dependabot[bot] <support@github.com>

commit 3ba6ab5
Merge: 2009fa8 f0878c0
Author: yubiuser <ckoenig@posteo.de>
Date:   Mon Feb 5 13:53:45 2024 +0100

    Bump pytest from 7.4.4 to 8.0.0 in /test (pi-hole#5566)

commit f0878c0
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Sun Feb 4 21:39:17 2024 +0000

    Bump pytest from 7.4.4 to 8.0.0 in /test

    Bumps [pytest](https://github.com/pytest-dev/pytest) from 7.4.4 to 8.0.0.
    - [Release notes](https://github.com/pytest-dev/pytest/releases)
    - [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst)
    - [Commits](pytest-dev/pytest@7.4.4...8.0.0)

    ---
    updated-dependencies:
    - dependency-name: pytest
      dependency-type: direct:production
      update-type: version-update:semver-major
    ...

    Signed-off-by: dependabot[bot] <support@github.com>

commit 2009fa8
Merge: 37c6b35 7b6f0d1
Author: Adam Warner <me@adamwarner.co.uk>
Date:   Sun Feb 4 21:36:37 2024 +0000

    Fedora (pi-hole#5568)

commit 7b6f0d1
Author: Christian König <ckoenig@posteo.de>
Date:   Sun Jan 28 16:56:57 2024 +0100

    Also remove Fedora 37

    Signed-off-by: Christian König <ckoenig@posteo.de>

commit f8bfd59
Author: Christian König <ckoenig@posteo.de>
Date:   Tue Nov 7 22:24:34 2023 +0100

    Drop Fedora 36 and add Fedora 39 to the test suite

    Signed-off-by: Christian König <ckoenig@posteo.de>

commit 37c6b35
Merge: e773d03 ba2682c
Author: yubiuser <ckoenig@posteo.de>
Date:   Sat Jan 20 12:23:35 2024 +0100

    Bump tox from 4.12.0 to 4.12.1 in /test (pi-hole#5555)

commit ba2682c
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Sat Jan 20 10:38:21 2024 +0000

    Bump tox from 4.12.0 to 4.12.1 in /test

    Bumps [tox](https://github.com/tox-dev/tox) from 4.12.0 to 4.12.1.
    - [Release notes](https://github.com/tox-dev/tox/releases)
    - [Changelog](https://github.com/tox-dev/tox/blob/main/docs/changelog.rst)
    - [Commits](tox-dev/tox@4.12.0...4.12.1)

    ---
    updated-dependencies:
    - dependency-name: tox
      dependency-type: direct:production
      update-type: version-update:semver-patch
    ...

    Signed-off-by: dependabot[bot] <support@github.com>

commit e773d03
Merge: aa4ceb4 9eb4731
Author: yubiuser <ckoenig@posteo.de>
Date:   Sat Jan 13 20:42:30 2024 +0100

    Bump tox from 4.11.4 to 4.12.0 in /test (pi-hole#5547)

commit 9eb4731
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Sat Jan 13 10:32:36 2024 +0000

    Bump tox from 4.11.4 to 4.12.0 in /test

    Bumps [tox](https://github.com/tox-dev/tox) from 4.11.4 to 4.12.0.
    - [Release notes](https://github.com/tox-dev/tox/releases)
    - [Changelog](https://github.com/tox-dev/tox/blob/main/docs/changelog.rst)
    - [Commits](tox-dev/tox@4.11.4...4.12.0)

    ---
    updated-dependencies:
    - dependency-name: tox
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...

    Signed-off-by: dependabot[bot] <support@github.com>

commit aa4ceb4
Merge: 7eb69a5 19bfa08
Author: Adam Warner <me@adamwarner.co.uk>
Date:   Sun Jan 7 21:17:15 2024 +0000

    Sync master back into development (pi-hole#5537)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dschaper dschaper dschaper approved these changes

@DL6ER DL6ER DL6ER approved these changes

Assignees
No one assigned
Labels
internal
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@PromoFaux @akhepcat @dschaper @DL6ER