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

chore(deps): bump libpcap from 1.10.4 to 1.10.5 #130

Merged
merged 1 commit into from
Sep 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
- run:
name: install deps
command: |
sudo apt-get update && sudo apt-get install -y gcc flex bison make libelf-dev
sudo apt-get update && sudo apt-get install -y gcc flex bison make libelf-dev autoconf
make libpcap

- run:
Expand Down Expand Up @@ -113,7 +113,7 @@ jobs:
- run:
name: install deps
command: |
sudo apt-get update && sudo apt-get install -y gcc flex bison make libelf-dev
sudo apt-get update && sudo apt-get install -y gcc flex bison make libelf-dev autoconf
make libpcap
- run:
name: build
Expand Down Expand Up @@ -167,7 +167,7 @@ jobs:
- run:
name: install deps
command: |
sudo apt-get update && sudo apt-get install -y gcc flex bison make libelf-dev
sudo apt-get update && sudo apt-get install -y gcc flex bison make libelf-dev autoconf
make libpcap
- run:
name: build
Expand Down Expand Up @@ -228,7 +228,7 @@ jobs:
- run:
name: install deps
command: |
sudo apt-get update && sudo apt-get install -y gcc flex bison make libelf-dev
sudo apt-get update && sudo apt-get install -y gcc flex bison make libelf-dev autoconf
make libpcap
- run:
name: build
Expand Down
2 changes: 1 addition & 1 deletion .github/build.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM golang:1.23-bookworm
RUN apt update && apt install -y clang gcc flex bison make \
RUN apt update && apt install -y clang gcc flex bison make autoconf \
libelf-dev gcc-aarch64-linux-gnu libc6-dev-arm64-cross git && \
git config --global --add safe.directory /app
WORKDIR /app
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:

- name: Set up deps
run: |
sudo apt-get install -y gcc flex bison make libelf-dev
sudo apt-get install -y gcc flex bison make libelf-dev autoconf

- name: Build
run: make build
Expand Down
2 changes: 1 addition & 1 deletion .goreleaser.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
before:
hooks:
- sudo apt-get install -y gcc flex bison make libelf-dev gcc-aarch64-linux-gnu libc6-dev-arm64-cross
- sudo apt-get install -y gcc flex bison make autoconf libelf-dev gcc-aarch64-linux-gnu libc6-dev-arm64-cross
- git submodule update --init --recursive

builds:
Expand Down
5 changes: 3 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,15 @@ IMAGE_BUILD ?= quay.io/ptcpdump/develop:latest
.PHONY: libpcap
libpcap: $(LIBPCAP_OBJ)

$(LIBPCAP_OBJ): $(LIBPCAP_SRC)/configure $(wildcard $(LIBPCAP_SRC)/*.[ch]) | $(LIBPCAP_DIST_DIR)
$(LIBPCAP_OBJ): $(LIBPCAP_SRC)/pcap.h $(wildcard $(LIBPCAP_SRC)/*.[ch]) | $(LIBPCAP_DIST_DIR)
cd $(LIBPCAP_SRC) && \
sh autogen.sh && \
CC=$(LIBPCAP_CC) ./configure --disable-shared --disable-usb --disable-netmap --disable-bluetooth --disable-dbus --without-libnl \
--host=$(LIBPCAP_ARCH) && \
$(MAKE) && \
$(MAKE) install prefix=$(LIBPCAP_DIST_DIR)

$(LIBPCAP_SRC)/configure:
$(LIBPCAP_SRC)/pcap.h:
ifeq ($(wildcard $@), )
echo "INFO: updating submodule 'libpcap'"
$(GIT) submodule update --init --recursive
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -329,6 +329,7 @@ Flags:
* Lex/Flex >= 2.6
* GCC
* GNU make
* autoconf


### Building
Expand Down
2 changes: 1 addition & 1 deletion lib/libpcap
Submodule libpcap updated 162 files
Loading