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

ntopng: update for dsm 7 and debian 12 dev env #6218

Merged
merged 2 commits into from
Sep 1, 2024

Conversation

hgy59
Copy link
Contributor

@hgy59 hgy59 commented Sep 1, 2024

Description

Cleanup of ntopng package as prerequisite of #6216

  • ntopng: avoid patching the generated configure file (file content depends on version of autoconf)
  • make patching of generated Makefile independent of number of white spaces
  • patch Makefile.in to avoid some patches of generated Makefile
  • update paths in start-stop-status.sh and ntopng.conf for DSM 7 compatibility
  • install ntopng.conf file into var folder (instead of etc folder)
  • fix mysql_config by cross/mysql-connector-c

Fixes #

Checklist

  • Build rule all-supported completed successfully (except unrelated packages ffsync and python311)
  • New installation of package completed successfully
  • Package upgrade completed successfully (Manually install the package again)
  • Package functionality was tested
  • Any needed documentation is updated/created

Type of change

  • Bug fix
  • Fix to build ntopng with debian 11 and debian 12 dev env.

TODO

  • Add wizard page for DSM 7 with instructions for privilege file patch

- ntopng: avoid patching the generated configure file (file content depends on version of autoconf)
- make patching of generated Makefile independent of number of white spaces
- patch Makefile.in to avoid some patches of generated Makefile
- update paths in start-stop-status.sh and ntopng.conf for DSM 7 compatibility
- install ntopng.conf file into var folder (instead of etc folder)
- fix mysql_config by cross/mysql-connector-c
@hgy59 hgy59 merged commit a4274e1 into SynoCommunity:master Sep 1, 2024
5 of 17 checks passed
@hgy59 hgy59 deleted the update_ntopng_for_dsm7 branch September 1, 2024 21:47
@th0ma7
Copy link
Contributor

th0ma7 commented Sep 2, 2024

really well done, thnx!

@hgy59
Copy link
Contributor Author

hgy59 commented Sep 2, 2024

@th0ma7 If you don't mind I would like to create a new PR for ntopng 6.2 (or do you prefer to rebase #6216 and solve the conflicts...)

BTW ntopng does not depend on xz (xz is an optional dependency via curl, when BUILD_CURL_WITH contains zstd.

@th0ma7
Copy link
Contributor

th0ma7 commented Sep 2, 2024

I don't mind at all. Given my pr was a proof of concept. Use and abuse as you see fit.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants