Skip to content

xorg: batch of updates, bump luit #57778

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
Merged
merged 13 commits into from
Mar 27, 2019
Merged

xorg: batch of updates, bump luit #57778

merged 13 commits into from
Mar 27, 2019
+261 −256

Conversation

dtzWill
Copy link
Member

@dtzWill dtzWill commented Mar 17, 2019

Announcements with details of changes
can be found on the mailing list,
and since IIRC these are all from
this month they all are listed here:

https://lists.x.org/archives/xorg-announce/2019-March/thread.html

Grab luit from mirror because our fetcher's
default behavior doesn't get along with
invisible-island's FTP server apparently (?).

Or perhaps server is problematic, not sure.

Example URL:
ftp://ftp.invisible-island.net/luit/luit-20190106.tgz

  • Using curl or wget:
    "Server denied you to change to the given directory"
    (or so)
  • Using curl with --ftp-mode nocwd: success

curl's manpage suggests this is less-compliant behavior
used for speed, offering a third option that's more
likely to work but not quite as fast.
So it seems like the more compliant behavior is
rejected but the fast behavior is accepted.
Dunno, hopefully it'll be on a content-addressed
server soon enough so it doesn't matter as much :).

Hash used here matches manually-fetched from official URL
as well as from the mirror.

Motivation for this change
Things done

I have not tested this on staging yet,
but on my tree which is generally pretty close :).

  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

Sorry, something went wrong.

@dtzWill
xorg: batch of updates, bump luit

Verified

This commit was signed with the committer’s verified signature.
codetheweb Max Isom
GPG key ID: C7631086E1E5F289
Verified
Learn about vigilant mode
542908c 
Announcements with details of changes
can be found on the mailing list,
and since IIRC these are all from
this month they all are listed here:

https://lists.x.org/archives/xorg-announce/2019-March/thread.html

-----

Grab luit from mirror because our fetcher's
default behavior doesn't get along with
invisible-island's FTP server apparently (?).

Or perhaps server is problematic, not sure.

Example URL:
ftp://ftp.invisible-island.net/luit/luit-20190106.tgz
* Using curl or wget:
  "Server denied you to change to the given directory"
  (or so)
* Using curl with `--ftp-mode nocwd`: success

curl's manpage suggests this is less-compliant behavior
used for speed, offering a third option that's more
likely to work but not quite as fast.
So it seems like the more compliant behavior is
rejected but the fast behavior is accepted.
Dunno, hopefully it'll be on a content-addressed
server soon enough so it doesn't matter as much :).

Hash used here matches manually-fetched from official URL
as well as from the mirror.
@dtzWill dtzWill mentioned this pull request Mar 17, 2019
Closed
10 tasks
@GrahamcOfBorg GrahamcOfBorg requested a review from lovek323 March 17, 2019 05:55
@dtzWill
Copy link
Member Author

dtzWill commented Mar 17, 2019

libXdmcp contains security fix, although the issue itself has been known (with patch to fix) for some time.. but I don't think we were doing so.

See: https://lists.x.org/archives/xorg-announce/2019-March/002974.html

@dtzWill
Copy link
Member Author

dtzWill commented Mar 17, 2019

Also noteworthy AMD/ATI driver updates, which look rather exciting:

FWIW the update script dependency magic added mesa_noglu and libGL to the ATI driver,
they were already on the AMD one? Dunno :).

@dtzWill dtzWill requested review from ryantm and vcunat March 18, 2019 08:00
@grahamc
Copy link
Member

grahamc commented Mar 18, 2019

cc @lovek323 who is a maintainer on some of these

@worldofpeace
Copy link
Contributor

I've noticed that these xorg updates can stall a little longer than in other distros.

I think it would be a welcome improvement if we could streamline them more since this is obviously important.

dtzWill added 9 commits March 18, 2019 22:57
@dtzWill
xorg.mkfontdir: replace with mkfontscale, which now includes mkfontdir

Verified

This commit was signed with the committer’s verified signature.
codetheweb Max Isom
GPG key ID: C7631086E1E5F289
Verified
Learn about vigilant mode
0e44d14 
See:
https://lists.x.org/archives/xorg-announce/2019-March/002960.html
@dtzWill
xorg/tarballs.list: +{xfd,xmore} -mkfontdir

Verified

This commit was signed with the committer’s verified signature.
codetheweb Max Isom
GPG key ID: C7631086E1E5F289
Verified
Learn about vigilant mode
79592e9
@dtzWill
generate-exprs-from-tarballs.pl: support few more deps automatically

Verified

This commit was signed with the committer’s verified signature.
novemberborn Mark Wubben
SSH Key Fingerprint: vMGPTCc4s8qHvUbwn+BG4sx8ahyNN/1R52XsxINSNVk
Verified
Learn about vigilant mode
c01c821
@dtzWill
xorg/default.nix: regen!

Verified

This commit was signed with the committer’s verified signature.
codetheweb Max Isom
GPG key ID: C7631086E1E5F289
Verified
Learn about vigilant mode
061f656
@dtzWill
xorg: detect deps on libxkbfile from ${XKBMODULE}

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
GPG key ID: 4AEE18F83AFDEB23
Expired
Verified
Learn about vigilant mode
29f4526
@dtzWill
generate-expr-from-tarballs.pl: more detection, detect gettext usage
9e39ab6
@dtzWill
xorg: font utilities should be nativeBuildInputs
108ab95 
They provide programs executed by the builder.
@dtzWill
xorg: simplify overrides now handled automatically, GL -> libGL
8d31888
@dtzWill
xf86inputsynaptics: deps handled now
1be6087 
And drop `mtdev`, which appears to have been added unnecessarily.
@dtzWill
Copy link
Member Author

dtzWill commented Mar 19, 2019

Started "just" fixing uses of mkfontdir package to use mkfontscale package instead,
and one thing led to another. Some overdue fixups to the generate script, which makes it possible to avoid the problems resulting in reported issues manually fixed previously, such as:

Also, fix various dependencies (mostly font utils) to be nativeBuildInputs since they (only) provide binaries used by the builder.

@GrahamcOfBorg GrahamcOfBorg added the 8.has: package (new) This PR adds a new package label Mar 19, 2019
@dtzWill dtzWill requested a review from abbradar March 25, 2019 02:46
@dtzWill
Copy link
Member Author

dtzWill commented Mar 25, 2019

(eval failure unrelated, darwin hfsevents which I believe has been fixed now)
@GrahamcOfBorg eval

@dtzWill
Copy link
Member Author

dtzWill commented Mar 26, 2019

Inclined to go ahead with this, it works on my machines and doesn't look like there are any problems with the updates in other distributions "yet" :).

Sound okay?

@dtzWill dtzWill merged commit 1aa5dc9 into NixOS:staging Mar 27, 2019
@dtzWill dtzWill deleted the update/xorg-misc-2019-03 branch March 27, 2019 13:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lovek323 lovek323

@ryantm ryantm

@vcunat vcunat

@abbradar abbradar

Assignees
No one assigned
Labels
8.has: package (new) This PR adds a new package 10.rebuild-darwin: 501+ 10.rebuild-darwin: 1001-2500 10.rebuild-linux: 501+ 10.rebuild-linux: 5001+
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@dtzWill @grahamc @worldofpeace @GrahamcOfBorg