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

salt: update to version 3000.3 #7161

Merged
merged 2 commits into from
Jun 14, 2020
Merged

salt: update to version 3000.3 #7161

merged 2 commits into from
Jun 14, 2020

Conversation

aphor
Copy link
Contributor

@aphor aphor commented May 20, 2020

Description

major version bump, long awaited

Note the current port version has a remote execution vulnerability.
https://nvd.nist.gov/vuln/detail/CVE-2020-11651

Closes: https://trac.macports.org/ticket/60527

Tested on

macOS 10.14.6 18G4032
Xcode 11.3.1 11C504

Verification

Have you

  • checked your Portfile with port lint?
  • tried existing tests with sudo port test?
  • tried a full install with sudo port -vst install?
  • tested basic functionality of all binary files?

@macportsbot
Copy link

Travis Build #11706 Errored.

Lint results
--->  Verifying Portfile for salt
--->  0 errors and 0 warnings found.

The build timed out.

sysutils/salt/Portfile Outdated Show resolved Hide resolved
sysutils/salt/Portfile Outdated Show resolved Hide resolved
@mf2k
Copy link
Contributor

mf2k commented May 20, 2020

In the commit message, you need to reference the Trac ticket that you (unnecessarily) created.

sysutils/salt/Portfile Outdated Show resolved Hide resolved
sysutils/salt/Portfile Outdated Show resolved Hide resolved
@aphor aphor requested a review from mf2k May 31, 2020 16:42
@macportsbot
Copy link

Travis Build #11936 Errored.

Lint results
--->  Verifying Portfile for salt
--->  0 errors and 0 warnings found.

Port salt's dependencies fail on xcode10.3. Log
Port salt's dependencies fail on xcode7.3. Log
Port salt-api's dependencies fail on xcode7.3. Log
Port salt-master's dependencies fail on xcode7.3. Log
Port salt-minion's dependencies fail on xcode7.3. Log
Port salt-syndic's dependencies fail on xcode7.3. Log

The build timed out.

Copy link
Contributor

@reneeotten reneeotten left a comment

Choose a reason for hiding this comment

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

@aphor the PRs on which this depends have been all merged or the changes committed. I think there are a few more things left here to fix.

sysutils/salt/Portfile Show resolved Hide resolved
sysutils/salt/Portfile Outdated Show resolved Hide resolved
sysutils/salt/Portfile Outdated Show resolved Hide resolved
sysutils/salt/Portfile Outdated Show resolved Hide resolved
@aphor aphor requested a review from reneeotten June 8, 2020 21:07
@aphor
Copy link
Contributor Author

aphor commented Jun 8, 2020

Thanks for being so patient.

If you could review this, after we all like it, I will squash and force-push it so that you can have a squashed merge.

@reneeotten
Copy link
Contributor

@aphor you added an extra revision line and set that to 0, but then later on you still have a line revision 1. That's of course not going to work.

Also, you should really make it a habit to build things locally before submitting/updating a PR. In this case adding a python38 / python37 variant of course requires all dependencies to have a subport for these versions, which isn't the case. It needs at least a py37/py38 subport for py-gnupg and it is also missing dependencies for the python35 variant. Please make sure to check with port lint --nitpick salt +variant, which you should do for each variant. So either you have to add the missing subports, or you cannot add these variants as of yet - either way is fine with me, I have no preference and don't use this port.

You can squash the commits when you make these final changes, just make sure to keep the "whitespace changes" separate and add separate commit for each py-port if you're going to add subports.

@macportsbot
Copy link

Travis Build #12081 Failed.

Lint results
--->  Verifying Portfile for salt
Error: Unknown dependency: py38-gnupg
--->  1 errors and 0 warnings found.

Port salt's dependencies fail on xcode10.3. Log
Port salt-api's dependencies fail on xcode10.3. Log
Port salt-master's dependencies fail on xcode10.3. Log
Port salt-minion's dependencies fail on xcode10.3. Log
Port salt-syndic's dependencies fail on xcode10.3. Log
Port salt's dependencies fail on xcode9.4. Log
Port salt-api's dependencies fail on xcode9.4. Log
Port salt-master's dependencies fail on xcode9.4. Log
Port salt-minion's dependencies fail on xcode9.4. Log
Port salt-syndic's dependencies fail on xcode9.4. Log
Port salt's dependencies fail on xcode8.3. Log
Port salt-api's dependencies fail on xcode8.3. Log
Port salt-master's dependencies fail on xcode8.3. Log
Port salt-minion's dependencies fail on xcode8.3. Log
Port salt-syndic's dependencies fail on xcode8.3. Log
Port salt's dependencies fail on xcode7.3. Log
Port salt-api's dependencies fail on xcode7.3. Log
Port salt-master's dependencies fail on xcode7.3. Log
Port salt-minion's dependencies fail on xcode7.3. Log
Port salt-syndic's dependencies fail on xcode7.3. Log

@aphor
Copy link
Contributor Author

aphor commented Jun 9, 2020

Thanks @reneeotten.

I broke my build test setup and needed to fix that, so I'm sorry for relying on the Macports builder system. I discovered a missing dependency once I had cleaned up. Sandboxing these builds is hard!

@reneeotten
Copy link
Contributor

Sandboxing these builds is hard!

I assume that you're aware of the -t flag, which will do a build in trace-mode that disallows the use of any dependency other than the ones listed in your Portfile even if you have them installed on your system. But in this case you would see the missing dependencies already by just running port lint without building anything.

@aphor
Copy link
Contributor Author

aphor commented Jun 9, 2020

Also depends on #7385

@macportsbot
Copy link

Travis Build #12106 Failed.

Lint results
--->  Verifying Portfile for salt
Error: Unknown dependency: py38-gnupg
--->  1 errors and 0 warnings found.

Port salt's dependencies fail on xcode10.3. Log
Port salt-api's dependencies fail on xcode10.3. Log
Port salt-master's dependencies fail on xcode10.3. Log
Port salt-minion's dependencies fail on xcode10.3. Log
Port salt-syndic's dependencies fail on xcode10.3. Log
Port salt's dependencies fail on xcode9.4. Log
Port salt-api's dependencies fail on xcode9.4. Log
Port salt-master's dependencies fail on xcode9.4. Log
Port salt-minion's dependencies fail on xcode9.4. Log
Port salt-syndic's dependencies fail on xcode9.4. Log
Port salt's dependencies fail on xcode8.3. Log
Port salt-api's dependencies fail on xcode8.3. Log
Port salt-master's dependencies fail on xcode8.3. Log
Port salt-minion's dependencies fail on xcode8.3. Log
Port salt-syndic's dependencies fail on xcode8.3. Log
Port salt's dependencies fail on xcode7.3. Log
Port salt-api's dependencies fail on xcode7.3. Log
Port salt-master's dependencies fail on xcode7.3. Log
Port salt-minion's dependencies fail on xcode7.3. Log
Port salt-syndic's dependencies fail on xcode7.3. Log

@aphor
Copy link
Contributor Author

aphor commented Jun 9, 2020

Sandboxing these builds is hard!

I assume that you're aware of the -t flag, which will do a build in trace-mode that disallows the use of any dependency other than the ones listed in your Portfile even if you have them installed on your system. But in this case you would see the missing dependencies already by just running port lint without building anything.

This was a build error I didn't catch before because my macports test environment had some pip installed python components that I missed during cleanup of another test. This was never a salt dependency before, but is now. :( Totally my bad.

What would really be nice is a packaging system with an open-to-root file registry for tracking external packages and add-on junk.

@macportsbot
Copy link

Travis Build #12160 Errored.

Lint results
--->  Verifying Portfile for salt
--->  0 errors and 0 warnings found.

Port salt's dependencies fail on xcode7.3. Log
Port salt-api's dependencies fail on xcode7.3. Log

The build timed out.

@aphor
Copy link
Contributor Author

aphor commented Jun 14, 2020

Travis:
Installing dependency (10 of 157) 'pkgconfig' with variants '' (requesting '')
-->
Error: Portfile is from the future - check date and time of your system

Copy link
Member

@neverpanic neverpanic left a comment

Choose a reason for hiding this comment

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

lg2m

@neverpanic neverpanic merged commit 5f5bd04 into macports:master Jun 14, 2020
@reneeotten
Copy link
Contributor

thanks @aphor @neverpanic and sorry, I forgot about this...

@aphor aphor deleted the salt-3000 branch June 14, 2020 16:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Development

Successfully merging this pull request may close these issues.

6 participants