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

modsecurity: 2.9.0 -> 2.9.2 #30349

Merged
merged 1 commit into from Oct 13, 2017
Merged

modsecurity: 2.9.0 -> 2.9.2 #30349

merged 1 commit into from Oct 13, 2017

Conversation

ghost
Copy link

@ghost ghost commented Oct 12, 2017 •
edited by ghost

Motivation for this change
  • Enable building on macOS
  • also fixes an issue where a system Lua install fooled the configure
    script into thinking it was enabled.
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-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/)
  • Fits CONTRIBUTING.md.

@eflanagan0
modsecurity: 2.9.0 -> 2.9.2
90594b8 
* Enable building on macOS
* also fixes an issue where a system Lua install fooled the configure
script into thinking it was enabled.
LnL7
LnL7 reviewed Oct 13, 2017
View reviewed changes
pkgs/tools/security/modsecurity/default.nix
--with-apr=${apr.dev}
--with-apu=${aprutil.dev}/bin/apu-1-config
--with-libxml=${libxml2.dev}
--with-lua=${luaValue}
Copy link
Member

Choose a reason for hiding this comment

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

Is this supposed to be --with-lua=no to disable it?

Copy link
Author

Choose a reason for hiding this comment

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

It is. I manually tested it against the makefile too.

Copy link
Author

Choose a reason for hiding this comment

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

I think these are the lines: https://github.com/SpiderLabs/ModSecurity/blob/master/build/find_lua.m4#L27-L28

@LnL7 LnL7 merged commit adc116b into NixOS:master Oct 13, 2017
@LnL7
Copy link
Member

LnL7 commented Oct 13, 2017

Thanks!

@ghost ghost deleted the topic-modsecurity-update branch October 13, 2017 20:01
@ghost
Copy link
Author

ghost commented Oct 13, 2017

sure thing, thanks for the reviews @LnL7 and @fpletz .

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@offlinehacker offlinehacker Awaiting requested review from offlinehacker

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

Successfully merging this pull request may close these issues.

None yet
3 participants
@LnL7 @fpletz @eflanagan0