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.

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

[pull] master from NixOS:master #84

Merged
merged 241 commits into from
Nov 19, 2023
Merged

[pull] master from NixOS:master #84

merged 241 commits into from
Nov 19, 2023

Conversation

pull[bot]
Copy link

@pull pull bot commented Nov 19, 2023

See Commits and Changes for more details.


Created by pull[bot]

Can you help keep this open source service alive? 💖 Please sponsor : )

nalves599 and others added 30 commits August 29, 2023 11:43
The web UI directory was renamed from transmission/web in 3.00 [1] to
transmission/public_html in 4.0.0 [2]. This change updates the AppArmor
rules to fix the web UI when AppArmor is enabled.

[1]: https://github.com/transmission/transmission/blob/3.00/libtransmission/platform.c#L627
[2]: https://github.com/transmission/transmission/blob/4.0.x/libtransmission/platform.cc#L324
This change adds an extraAppArmorPaths option to the transmission_4
derivation to allow additional read-only paths to be added to the
ppArmor rules. This can be combined with the TRANSMISSION_WEB_HOME
environment variable to override the web UI.
With the update to libtiff 4.6 in
0a74a54 ,
many tiff-processing utility executables got dropped:

http://www.simplesystems.org/libtiff/releases/v4.6.0.html

Some of these executables can still be "restored" with
the configure switch `--enable-tools-unsupported`,
but unfortunatelly,
at least hylafaxplus (maybe more packages) relies on
utilities that even cannot be restored with this switch.

The commit at hand reintroduces the old libtiff
version 4.5.1 as `libtiff_4_5` into nixpkgs.
It restores the old build recipe with the following changes:

* passthru.updateScript is dropped as it is of no use here
* passthru.tests is dropped as it only contains
  packages that now build with the new libtiff version
* patches are applied for the two CVEs that are fixed in 4.6.0

As libtiff 4.5 is no longer supported by libtiff developers,
new vulnerabilities will likely go unnoticed
unless they also affect the current version.
To not disable hydra builds, we don't add
`knownVulnerabilities` *for now*, but add comments to alert
updaters of the current libtiff version so patches can
be backported or the situation be reevaluated as a whole.
libtiff 4.6.0 (updated with
0a74a54)
drops many tiff-processing utility executables, like
tiff2ps and fax2ps, that are needed by hylafaxplus.
As a result, the build fails with

> FATAL ERROR: /nix/store/5i80biwsgjb4yhp4z81nsk3kp5rivd8f-libtiff-4.6.0-bin/bin/tiff2ps does not exist or is not an executable program!

see https://hydra.nixos.org/build/239580858 .

The commit at hand fixes the package by using libtiff_4_5
which got introduced in the previous commit.

Note on long-term prospect for this situation:
According to hylafaxplus developer Lee Howard,
it might take months before one of these options
(or a combination thereof) might be implemented:

* a new package "tifftools" with the utility executables emerges
* The hylafaxplus package incorporates the source
  of these executables and builds them by itself
* hylafaxplus is rewritten so as to not use these programs
* libtiff reincorporates the programs, maybe after fixing them

Cf. https://sourceforge.net/p/hylafax/mailman/message/38259441/

Another reference: a discussion on the libtiff mailing list:
https://www.asmail.be/msg0054915176.html
kashw2 and others added 28 commits November 20, 2023 03:33
rio: fix Darwin build and move cmake to Linux nativeBuildInputs
python311Packages.kombu: 5.3.3 -> 5.3.4
Bump Typst tools and VSCode extension
python311Packages.nettigo-air-monitor: refactor
terragrunt: 0.53.2 -> 0.53.4
turso-cli: 0.87.2 -> 0.87.4
buildMozillaMach: add options to disable signing requirement and to enable addon sideloading
…s.weasel

python310Packages.weasel: 0.3.3 -> 0.3.4
…s.umap-learn

python311Packages.umap-learn: 0.5.4 -> 0.5.5
…s.pvextractor

python310Packages.pvextractor: 0.3 -> 0.4
nixos/dockerTools: fixup proot/fakeroot code (fixes dockertools nixos test)
@pull pull bot added the ⤵️ pull label Nov 19, 2023
@pull pull bot merged commit 2834c0c into khaneliman:master Nov 19, 2023
10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.