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

darkstat package improvements #264

Merged
merged 3 commits into from Jan 24, 2017
Merged

darkstat package improvements #264

merged 3 commits into from Jan 24, 2017

Conversation

doktornotor
Copy link
Contributor

@doktornotor doktornotor commented Jan 24, 2017 •
edited

  • Fix service handling
  • Improve bootstrap conversion
  • Remove useless custom_add_php_command
  • Input validation clean up

doktornotor added 3 commits January 24, 2017 16:19
@doktornotor
darkstat package improvements
1ff1cf2 
- Fix service handling
- Improve bootstrap conversion
- Remove useless custom_add_php_command
@doktornotor
Clean up input validation, no need to use concatenation here
488e5a1
@doktornotor
Bump port version
716c58e
@doktornotor
Copy link
Contributor Author

BTW, looking at this, shouldn't the <custom_php_global_functions> have all the required includes for various functions used there? Doesn't seem to be an issue, so it somehow works in background, but still.

@jim-p
Copy link
Contributor

jim-p commented Jan 24, 2017

The custom_php_global_functions code is run before code like resync, deinstall, and so on. It's meant to be a place where functions can be defined for use in other parts of package code. It will inherit the includes of what called it (either pkg.php, pkg_edit.php, or pkg-utils.inc) at a minimum.

@doktornotor
Copy link
Contributor Author

OK, thanks... works for now. I'll split this to an .inc file when I have more time. (Also would like to get the port setting working, using some hack such as the redirect.php used in ntopng, but no time for that ATM.)

@jim-p jim-p requested a review from rbgarga January 24, 2017 17:27
@netgate-git-updates netgate-git-updates merged commit 716c58e into pfsense:devel Jan 24, 2017
netgate-git-updates pushed a commit that referenced this pull request Jan 24, 2017
@rbgarga
Merge pull request #264 from doktornotor/patch-1
ba31b78
@doktornotor doktornotor deleted the patch-1 branch January 24, 2017 18:43
netgate-git-updates pushed a commit that referenced this pull request Aug 17, 2017
@DonLewisFreeBSD
Upgrade protobuf-c to version 1.3.0:
4ea07d5 
  [ Robert Edmonds ]
  * Release 1.3.0.

  * Add test case for the issue in #220 (#254).

  * Fix issue #251, "Bad enums with multiple oneofs" (#256).

  * Add warning flags to my_CFLAGS (#257).

  * Fix namespace errors when compiled with latest protobuf (#280).

  * Bump minimum required header version for proto3 syntax (#282).

  [ Paolo Borelli ]
  * Turn the compiler into a protoc plugin (#206). This allows the protobuf-c
    compiler to be invoked as "protoc --c_out=...". For backwards
    compatibility, we still ship a protoc-c command, but it's a symlink to the
    protoc-gen-c binary.

  * proto3 support (#228).

  * Remove leftover FIXME comment (#258).

  * Fix proto3 "is zeroish" evaluation (#264).

  * Small cleanup in oneof handling (#265).

  * Rework is_zeroish one more time (#267).

  * proto3: make strings default to "" instead of NULL (#274).

  [ Tomek Wasilczyk ]
  * Fix -Wsign-compare warnings (#213).

  * Fix ISO C90 -Wdeclaration-after-statement warnings (#214).

  * Fix bigendian -Wunused-label warning (#215).

  [ Ilya Lipnitsky ]
  * protoc-c/c_message.cc: Force int size on oneof enums (#221). Fixes wrong
    enum generation and handling for onceof cases (#220).

  [ Adnan ]
  * Fix cmake build if built as part of an external project (#231).

  [ Gregory Detal ]
  * Remove .pb.{cc,h} in distdir instead of top_distdir in order to prevent
    removing files from other projects when protobuf-c is included as an
    autotools subproject (#232).

  [ Ben Farnham ]
  * Relax autoconf constraint from v2.64 to v2.63 so that it works on older
    Linux distros (#233).

  [ Thomas Koeckerbauer ]
  * rm argument fix for Solaris (#234).

  * Add 'const' qualifier to 'init_value' variable in generated files (#236).

  [ Richard Kettlewell ]
  * Document and extend the effect of passing NULL to ..._free_unpacked
    functions (#255).

  [ Alex Milich ]
  * CMake: Workaround for static builds that use MSVC (#243).

  [ Josh Junon ]
  * CMake: Allow protobuf-c to be included via include_subdirectory (#245).

  [ Alexei Kasatkin ]
  * CMake: Windows fixes (#266).

This fixes the build breakage with devel/protobuf 1.3.0 [1]

PR:		221572 [1]
Sponsored by:	Farsight Security, Inc.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rbgarga rbgarga rbgarga approved these changes

@jim-p jim-p jim-p approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
4 participants
@doktornotor @jim-p @rbgarga @netgate-git-updates