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

adblock2privoxy: Bugfix destroot issue, allow config initialization #5180

Merged
merged 1 commit into from
Sep 14, 2019
Merged

adblock2privoxy: Bugfix destroot issue, allow config initialization #5180

merged 1 commit into from
Sep 14, 2019

Conversation

essandess
Copy link
Contributor

adblock2privoxy: Bugfix destroot issue, allow config initialization

Description

Type(s)
  • bugfix
  • enhancement
  • security fix
Tested on

macOS 10.14.6 18G87
Xcode 10.3 10G8

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?

@essandess
Copy link
Contributor Author

essandess commented Sep 1, 2019 •
edited
Loading

@neverpanic FYI this Portfile shows a decent IMO approach to handling stack's current lack of DESTDIR/PREFIX. See the linked issues above.

If stack ever compiles a package that includes a data-files in the packagename.cabal file, as this one does, add the --datadir configuration setting to stack.yaml and hack in a symbolic link between the ultimate destination and ${destroot} during the build phase, then remove the link and the destroot phase will take care of the rest. to prevent hardcoded paths of the stack build directory in the binary, specify the prefix-ed datadir In the file src/Paths_packagename.hs, which is ordinarily automatically generated by cabal (and placed elsewhere within .stack-work ). Also see commercialhaskell/stack#5026.

@macportsbot
Copy link

Travis Build #8021 Passed.

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

Port adblock2privoxy success on xcode10.3. Log
Port adblock2privoxy success on xcode9.4. Log
Port adblock2privoxy success on xcode8.3. Log

@essandess essandess mentioned this pull request Sep 2, 2019
Closed
11 tasks
neverpanic
neverpanic requested changes Sep 2, 2019
View reviewed changes
www/adblock2privoxy/Portfile Outdated Show resolved Hide resolved
@essandess essandess force-pushed the adblock2privoxy branch 2 times, most recently from cdaf163 to 36dcf6c Compare September 2, 2019 20:33
@macportsbot
Copy link

Travis Build #8041 Passed.

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

Port adblock2privoxy success on xcode10.3. Log
Port adblock2privoxy success on xcode9.4. Log
Port adblock2privoxy success on xcode8.3. Log
Port adblock2privoxy success on xcode7.3. Log

@essandess essandess force-pushed the adblock2privoxy branch 3 times, most recently from e224b70 to 3b48a2f Compare September 3, 2019 14:24
This was referenced Sep 3, 2019
Merged
Closed
Open
Open
@macportsbot
Copy link

Travis Build #8071 Passed.

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

Port adblock2privoxy success on xcode10.3. Log
Port adblock2privoxy success on xcode9.4. Log
Port adblock2privoxy success on xcode8.3. Log

@macportsbot
Copy link

Travis Build #8106 Failed.

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

Port adblock2privoxy success on xcode10.3. Log
Port adblock2privoxy success on xcode9.4. Log
Port adblock2privoxy fail on xcode7.3. Log

@macportsbot
Copy link

Travis Build #8150 Passed.

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

Port adblock2privoxy success on xcode10.3. Log
Port adblock2privoxy success on xcode9.4. Log
Port adblock2privoxy success on xcode8.3. Log

@essandess
adblock2privoxy: Bugfix destroot issue, allow config initialization
c17dfe0 
* Fix destroot issue in binary caused by datadir in stack_root
* Fix stack/cabal data-files hardcoded path issue with Paths_${name}.hs file
* Allow initialization of proxy configuration files
* See commercialhaskell/stack#848
* See commercialhaskell/stack#4857
@macportsbot
Copy link

Travis Build #8178 Passed.

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

Port adblock2privoxy success on xcode10.3. Log
Port adblock2privoxy success on xcode9.4. Log
Port adblock2privoxy success on xcode7.3. Log

@essandess
Copy link
Contributor Author

@neverpanic

Would you please merge this bug fix?

neverpanic
neverpanic approved these changes Sep 14, 2019
View reviewed changes
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.

Looking much better now. See my comment for a question and then you can let me know whether you want to change this or merge as-is.

www/adblock2privoxy/Portfile Show resolved Hide resolved
@neverpanic neverpanic merged commit 649cd45 into macports:master Sep 14, 2019
@essandess essandess deleted the adblock2privoxy branch September 15, 2019 00:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@neverpanic neverpanic neverpanic approved these changes

Assignees
No one assigned
Labels
maintainer type: bugfix type: enhancement
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@essandess @macportsbot @neverpanic