Compare commits

..

6 Commits

3 changed files with 57 additions and 26 deletions

View File

@@ -1,4 +1,3 @@
stages:
- build
- publish
@@ -36,9 +35,8 @@ publish-bookworm:
- tags
tags:
- docker-generic
image: debian-package-builder-bookworm:v1
image: debian-package-builder-trixie:v1
script:
- apt-get update && apt-get install -y curl
- ls -la build
- 'curl --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file build/pcapmirror_$VERSION-1_amd64.deb ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/pcapmirror/bookworm/pcapmirror_$VERSION-deb12_amd64.deb'
@@ -71,9 +69,8 @@ publish-trixie:
- tags
tags:
- docker-generic
image: debian-package-builder-bookworm:v1
image: debian-package-builder-trixie:v1
script:
- apt-get update && apt-get install -y curl
- ls -la build
- 'curl --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file build/pcapmirror_$VERSION-1_amd64.deb ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/pcapmirror/trixie/pcapmirror_$VERSION-deb13_amd64.deb'
@@ -106,12 +103,48 @@ publish-sid:
- tags
tags:
- docker-generic
image: debian-package-builder-bookworm:v1
image: debian-package-builder-trixie:v1
script:
- apt-get update && apt-get install -y curl
- ls -la build
- 'curl --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file build/pcapmirror_$VERSION-1_amd64.deb ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/pcapmirror/sid/pcapmirror_$VERSION-sid_amd64.deb'
build-rocky10:
stage: build
needs: []
only:
- tags
tags:
- docker-generic
image: rockylinux-package-builder-10:v1
script:
- dnf install -y libpcap-devel
- mkdir -p /root/rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
- tar -czf /root/rpmbuild/SOURCES/pcapmirror-v${VERSION}.tar.gz --exclude=debian --exclude=.git .
- cp -r * /root/rpmbuild/BUILD
- rpmbuild -ba pcapmirror.spec
- mkdir -p build
- mv /root/rpmbuild/RPMS/x86_64/pcapmirror*.* build/
- mv /root/rpmbuild/SRPMS/pcapmirror*.* build/
artifacts:
paths:
- build
publish-rocky10:
stage: publish
needs:
- build-rocky10
dependencies:
- build-rocky10
only:
- tags
tags:
- docker-generic
image: debian-package-builder-trixie:v1
script:
- ls -la build
- 'curl --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file build/pcapmirror-$VERSION-*.el10.x86_64.rpm ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/pcapmirror/rockylinux10/pcapmirror-$VERSION-1.el10.x86_64.rpm'
build-rocky9:
stage: build
needs: []
@@ -144,11 +177,10 @@ publish-rocky9:
- tags
tags:
- docker-generic
image: debian-package-builder-bookworm:v1
image: debian-package-builder-trixie:v1
script:
- apt-get update && apt-get install -y curl
- ls -la build
- 'curl --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file build/pcapmirror-$VERSION-*.el9.x86_64.rpm ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/pcapmirror/rockylinux9/pcapmirror-$VERSION-1.el8.x86_64.rpm'
- 'curl --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file build/pcapmirror-$VERSION-*.el9.x86_64.rpm ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/pcapmirror/rockylinux9/pcapmirror-$VERSION-1.el9.x86_64.rpm'
build-rocky8:
stage: build
@@ -182,9 +214,8 @@ publish-rocky8:
- tags
tags:
- docker-generic
image: debian-package-builder-bookworm:v1
image: debian-package-builder-trixie:v1
script:
- apt-get update && apt-get install -y curl
- ls -la build
- 'curl --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file build/pcapmirror-$VERSION-*.el8.x86_64.rpm ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/pcapmirror/rockylinux8/pcapmirror-$VERSION-1.el8.x86_64.rpm'
@@ -217,9 +248,8 @@ publish-pios12:
- tags
tags:
- docker-generic
image: debian-package-builder-bookworm:v1
image: debian-package-builder-trixie:v1
script:
- apt-get update && apt-get install -y curl
- ls -la build
- 'curl --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file build/pcapmirror_$VERSION-1_armhf.deb ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/pcapmirror/bookworm/pcapmirror_$VERSION-piso12_armhf.deb'
@@ -252,9 +282,8 @@ publish-pios12-64:
- tags
tags:
- docker-generic
image: debian-package-builder-bookworm:v1
image: debian-package-builder-trixie:v1
script:
- apt-get update && apt-get install -y curl
- ls -la build
- 'curl --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file build/pcapmirror_$VERSION-1_arm64.deb ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/pcapmirror/bookworm/pcapmirror_$VERSION-pios12_arm64.deb'
@@ -287,9 +316,8 @@ publish-plucky:
- tags
tags:
- docker-generic
image: debian-package-builder-bookworm:v1
image: debian-package-builder-trixie:v1
script:
- apt-get update && apt-get install -y curl
- ls -la build
- 'curl --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file build/pcapmirror_$VERSION-1_amd64.deb ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/pcapmirror/trixie/pcapmirror_$VERSION-ubu25.04_amd64.deb'
@@ -322,8 +350,8 @@ publish-noble:
- tags
tags:
- docker-generic
image: debian-package-builder-bookworm:v1
image: debian-package-builder-trixie:v1
script:
- apt-get update && apt-get install -y curl
- ls -la build
- 'curl --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file build/pcapmirror_$VERSION-1_amd64.deb ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/pcapmirror/trixie/pcapmirror_$VERSION-ubu24.04_amd64.deb'

View File

@@ -1,7 +1,7 @@
# Makefile for pcapmirror
# Compiler
CC = gcc
CC = cc
# Compiler flags
CFLAGS = -Wall -g
@@ -24,6 +24,9 @@ PREFIX = /usr
# Default rule
all: $(TARGET) man
static: $(OBJS)
$(CC) $(CFLAGS) -static $(OBJS) -o $(TARGET) $(LIBS) -ldbus-1 -lsystemd -lcap
# Create executable
$(TARGET): $(OBJS)
$(CC) $(CFLAGS) $(OBJS) -o $(TARGET) $(LIBS)
@@ -37,12 +40,12 @@ man:
# Clean up object files and executable
clean:
rm -f -f $(OBJS) $(TARGET)
rm -f -f $(OBJS) $(TARGET) pcapmirror.8.gz
# Install the executable
install: $(TARGET)
mkdir -p $(DESTDIR)$(PREFIX)/bin
install -D $(TARGET) $(DESTDIR)$(PREFIX)/bin/$(TARGET)
install -s -D $(TARGET) $(DESTDIR)$(PREFIX)/bin/$(TARGET)
install -D $(TARGET).8 $(DESTDIR)$(PREFIX)/share/man/man8/$(TARGET).8

View File

@@ -54,10 +54,10 @@ On the original download location you will also find several prebuilt packages.
### Supported Operating Systems
Source is tested to build and function on the following operating systems
* Debian Linux 12 + unstable (sid)
* Rocky Linux 8 + 9
* Debian Linux 12, 13 + unstable (sid)
* Rocky Linux 8, 9, 10
* PiOS 12 (bookworm)
* OpenBSD 7.6
* OpenBSD 7.6, 7.7
* MacOS 15
Compile the program: