Skip to content

GitHub macos/60x/v3 #9170

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

Closed
catenacyber wants to merge 2 commits into from
Closed

GitHub macos/60x/v3 #9170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3225939
ci: update to macos latest
catenacyber Jul 3, 2023
4345220
ci: fix macos build with libhtp libiconv
catenacyber Jul 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions .github/workflows/builds.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1391,8 +1391,7 @@ jobs:

macos-latest:
name: MacOS Latest
# use 10.15 for now. Build fails on macos-11 (aka macos-latest)
runs-on: macos-10.15
runs-on: macos-latest
needs: [prepare-deps]
steps:
# Cache Rust stuff.
Expand All @@ -1409,6 +1408,7 @@ jobs:
hiredis \
jansson \
jq \
libiconv \
libmagic \
libnet \
libtool \
Expand All @@ -1434,9 +1434,10 @@ jobs:
- run: tar xvf prep/libhtp.tar.gz
- run: tar xvf prep/suricata-update.tar.gz
- run: ./autogen.sh
- run: CFLAGS="${DEFAULT_CFLAGS}" ./configure --enable-unittests
- run: CFLAGS="${DEFAULT_CFLAGS}" CPPFLAGS="-I/usr/local/opt/libiconv/include" CXXFLAGS="-I/usr/local/opt/libiconv/include" LDFLAGS="-L/usr/local/opt/libiconv/lib" ./configure --enable-unittests
- run: make -j2
- run: make check
# somehow it gets included by some C++ stdlib header (case unsensitive)
- run: rm libhtp/VERSION && make check
- run: tar xf prep/suricata-verify.tar.gz
- name: Running suricata-verify
run: python3 ./suricata-verify/run.py
Expand Down
7 changes: 7 additions & 0 deletions src/util-daemon.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,14 @@ void Daemonize (void)
through conf file */

/* Creates a new process */
#if defined(OS_DARWIN) && defined(__clang__)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
#endif
pid = fork();
#if defined(OS_DARWIN) && defined(__clang__)
#pragma clang diagnostic pop
#endif

if (pid < 0) {
/* Fork error */
Expand Down