0.4 build test

2025-12-31 12:00:40 +01:00 · 2025-03-24 13:43:41 +01:00
parent c6caf71afd
commit b1ba8412cf
5 changed files with 35 additions and 15 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,9 +3,9 @@ stages:
  - build
  - publish
  
-  
 variables:
  DEBIAN_FRONTEND: noninteractive
+  VERSION: 0.4

 build-bookworm:
  stage: build
@@ -15,7 +15,7 @@ build-bookworm:
  tags:
    - bookworm
  script:
-    - tar -czf ../pcapmirror_0.3.orig.tar.gz --exclude=debian .
+    - tar -czf ../pcapmirror_$VERSION.orig.tar.gz --exclude=debian .
    - apt-get update && apt-get install -y libpcap-dev
    - dpkg-buildpackage -uc -us
    - mkdir -p build
@@ -38,7 +38,7 @@ publish-bookworm:
  script:
    - apt-get update && apt-get install -y curl
    - ls -la build
-    - 'curl --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file build/pcapmirror_0.3-1_amd64.deb ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/pcapmirror/bookworm/pcapmirror_0.3-1_amd64.deb'
+    - '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-1_amd64.deb'

 build-sid:
  stage: build
@@ -48,7 +48,7 @@ build-sid:
  tags:
    - sid
  script:
-    - tar -czf ../pcapmirror_0.3.orig.tar.gz --exclude=debian .
+    - tar -czf ../pcapmirror_$VERSION.orig.tar.gz --exclude=debian .
    - apt-get update && apt-get install -y libpcap-dev
    - dpkg-buildpackage -uc -us
    - mkdir -p build
@@ -71,7 +71,7 @@ publish-sid:
  script:
    - apt-get update && apt-get install -y curl
    - ls -la build
-    - 'curl --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file build/pcapmirror_0.3-1_amd64.deb ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/pcapmirror/sid/pcapmirror_0.3-1_amd64.deb'
+    - '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-1_amd64.deb'

 build-rocky9:
  stage: build
@@ -83,7 +83,7 @@ build-rocky9:
  script:
    - dnf install -y libpcap-devel
    - mkdir -p /root/rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
-    - tar -czf /root/rpmbuild/SOURCES/pcapmirror-v0.3.tar.gz --exclude=debian --exclude=.git .
+    - 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
@@ -107,7 +107,7 @@ publish-rocky9:
  script:
    - apt-get update && apt-get install -y curl
    - ls -la build
-    - 'curl --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file build/pcapmirror-0.3-*.el9.x86_64.rpm ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/pcapmirror/rockylinux9/pcapmirror-0.3-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.el8.x86_64.rpm'

 build-rocky8:
  stage: build
@@ -119,7 +119,7 @@ build-rocky8:
  script:
    - dnf install -y libpcap-devel
    - mkdir -p /root/rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
-    - tar -czf /root/rpmbuild/SOURCES/pcapmirror-v0.3.tar.gz --exclude=debian --exclude=.git .
+    - 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
@@ -143,7 +143,7 @@ publish-rocky8:
  script:
    - apt-get update && apt-get install -y curl
    - ls -la build
-    - 'curl --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file build/pcapmirror-0.3-*.el8.x86_64.rpm ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/pcapmirror/rockylinux8/pcapmirror-0.3-1.el8.x86_64.rpm'
+    - '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'

 build-pios12:
  stage: build
@@ -153,7 +153,7 @@ build-pios12:
  tags:
    - pios12
  script:
-    - tar -czf ../pcapmirror_0.3.orig.tar.gz --exclude=debian .
+    - tar -czf ../pcapmirror_$VERSION.orig.tar.gz --exclude=debian .
    - apt-get update && apt-get install -y libpcap-dev
    - dpkg-buildpackage -uc -us
    - mkdir -p build
@@ -176,7 +176,7 @@ publish-pios12:
  script:
    - apt-get update && apt-get install -y curl
    - ls -la build
-    - 'curl --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file build/pcapmirror_0.3-1_armhf.deb ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/pcapmirror/bookworm/pcapmirror_0.3-1_armhf.deb'
+    - '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-1_armhf.deb'

 build-pios12-64:
  stage: build
@@ -186,7 +186,7 @@ build-pios12-64:
  tags:
    - pios12-64
  script:
-    - tar -czf ../pcapmirror_0.3.orig.tar.gz --exclude=debian .
+    - tar -czf ../pcapmirror_$VERSION.orig.tar.gz --exclude=debian .
    - apt-get update && apt-get install -y libpcap-dev
    - dpkg-buildpackage -uc -us
    - mkdir -p build
@@ -209,4 +209,4 @@ publish-pios12-64:
  script:
    - apt-get update && apt-get install -y curl
    - ls -la build
-    - 'curl --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file build/pcapmirror_0.3-1_arm64.deb ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/pcapmirror/bookworm/pcapmirror_0.3-1_arm64.deb'
+    - '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-1_arm64.deb'
--- a/README.md
+++ b/README.md
@@ -36,6 +36,14 @@ With this tool, you can mirror traffic directly to a running [Wireshark](https:/

 To avoid capturing traffic from your own monitoring machine, configure Wireshark with a capture filter of udp port 37008 or udp dst port 37008. Also, verify that your firewall permits this UDP traffic.

+## Original Download Location
+
+[https://git.freestone.net/cramer/pcapmirror](https://git.freestone.net/cramer/pcapmirror)
+
+## Packages
+
+On the original download location you will also find several prebuilt packages.
+
 ## Compile and Install

 Compile the program:
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+pcapmirror (0.4-1) unstable; urgency=medium
+
+  * IPv6 support for remote destination
+  * remote destination can now also be hostname
+  * added option to enforce IPv4 and IPv6 for remote destination
+
+ -- Matthias Cramer <cramer@freestone.net>  Fri, 24 Mar 2025 13:40:00 +0100
+
 pcapmirror (0.3-1) unstable; urgency=medium

  * added manpage
--- a/pcapmirror.8
+++ b/pcapmirror.8
@@ -1,4 +1,4 @@
-.TH PCAPMIRROR 1 "March 22, 2025" "pcapmirror 0.3" "User Commands"
+.TH PCAPMIRROR 1 "March 24, 2025" "pcapmirror 0.4" "User Commands"
 .SH NAME
 pcapmirror \- A command-line tool for capturing and mirroring network traffic

--- a/pcapmirror.spec
+++ b/pcapmirror.spec
@@ -1,5 +1,5 @@
 Name:     pcapmirror
-Version:  0.3
+Version:  0.4
 Release:  %(perl -e 'print time()')%{?dist}
 Summary:  A simple packet capture mirror
 License:  BSD 3-Clause License
@@ -26,6 +26,10 @@ pcapmirror is a command-line tool for capturing and mirroring network traffic us


 %changelog
+* Sat Mar 24 2025 Matthias Cramer <cramer@freesone.net> 0.4-1
+- IPv6 support for remote destination
+- remote destination can now also be hostname
+- added option to enforce IPv4 and IPv6 for remote destination
 * Sat Mar 22 2025 Matthias Cramer <cramer@freesone.net> 0.3-1
 - added manpage
 * Sat Mar 22 2025 Matthias Cramer <cramer@freesone.net> 0.2-1