builder: Correct the RPM packaging script

Signed-off-by: cfc4n <cfc4n.cs@gmail.com>

Author: cfc4n

.github/workflows/release.yml

@@ -52,7 +52,7 @@ jobs:
         make env
         make -f builder/Makefile.release release SNAPSHOT_VERSION=${{ steps.get_tags.outputs.VERSION }}
 
-  build-on-ubuntu2004-arm64:
+  build-on-ubuntu2204-arm64:
     runs-on: ubuntu-22.04
     name: build on ubuntu-22.04 arm64
     # Run steps on a matrix of 3 arch/distro combinations

Makefile

@@ -134,6 +134,7 @@ TAG := $(shell git describe --abbrev=0 --tags ${TAG_COMMIT} 2>/dev/null || true)
 COMMIT := $(shell git rev-parse --short HEAD)
 DATE := $(shell git log -1 --format=%cd --date=format:"%Y%m%d")
 LAST_GIT_TAG := $(TAG:v%=%)-$(DATE)-$(COMMIT)
+RPM_RELEASE := $(DATE).$(COMMIT)
 #ifneq ($(COMMIT), $(TAG_COMMIT))
 #	LAST_GIT_TAG := $(LAST_GIT_TAG)-prev-$(TAG_COMMIT)
 #endif
@@ -251,13 +252,13 @@ env:
 	@echo ---------------------------------------
 
 ECAPTURE_NAME = $(shell $(CMD_GREP) "Name:" builder/rpmBuild.spec | $(CMD_AWK) '{print $$2}')
-RPM_SOURCE0 = $(ECAPTURE_NAME)-$(ECAPTURE_VERSION).tar.gz
+RPM_SOURCE0 = $(ECAPTURE_NAME)-$(TAG).tar.gz
 
 .PHONY:rpm
 rpm:
 	@$(CMD_RPM_SETUP_TREE)
-	$(CMD_SED) -i '0,/^Version:.*$$/s//Version:    $(VERSION)/' builder/rpmBuild.spec
-	$(CMD_SED) -i '0,/^Release:.*$$/s//Release:    $(RELEASE)/' builder/rpmBuild.spec
+	$(CMD_SED) -i '0,/^Version:.*$$/s//Version:    $(TAG)/' builder/rpmBuild.spec
+	$(CMD_SED) -i '0,/^Release:.*$$/s//Release:    $(RPM_RELEASE)/' builder/rpmBuild.spec
 	$(CMD_TAR) zcvf ~/rpmbuild/SOURCES/$(RPM_SOURCE0) ./
 	$(CMD_RPMBUILD) -ba builder/rpmBuild.spec
 

builder/rpmBuild.spec

@@ -1,6 +1,6 @@
 Name:       ecapture
-Version:
-Release:
+Version:    v0.0.1
+Release:    2023%{?dist}
 Summary:    capture SSL/TLS text content without CA cert using eBPF
 License:    AGPL-3.0
 URL:        https://ecapture.cc
@@ -11,6 +11,9 @@ Source0:    %{name}-%{version}.tar.gz
 
 BuildRequires: make
 BuildRequires: clang
+BuildRequires: golang
+BuildRequires: elfutils
+
 
 %description
 SSL/TLS plaintext capture,
@@ -34,13 +37,24 @@ make
 rm -rf %{buildroot}
 mkdir -p %{buildroot}/usr/local/bin/
 install -m 755 bin/ecapture %{buildroot}/usr/local/bin/ecapture
+eu-strip %{buildroot}/usr/local/bin/ecapture
+
+%post
+echo "eCapture has been installed in the /usr/local/bin directory."
+echo "Please ensure that /usr/local/bin is in your \$PATH.Or used /usr/local/bin/ecapture instead."
 
 %files
 /usr/local/bin/ecapture
 
 %changelog
-* Sun Apr 2 2023 BellaZhang <bella@cclinux.org> - 0.5.0-1
-- Support for capturing plaintext communication of TLS/HTTPS encrypted 
-  programs written in Golang.
-- Refactored the way parameters are obtained from Golang 
-  ABI (supports two types of ABI on registers-based and stack-based).
+* Sat Dec 30 2023 CFC4N <cfc4ncs@gmail.com> - 0.7.0-1
+- Split `nss/gnutls/openssl` into three separate submodules. Corresponding to the `./ecapture nss`, `./ecapture gnutls`, `ecapture tls` commands.
+- Support `keylog` mode, equivalent to the functionality of the `SSLKEYLOGFILE` environment variable. Captures SSL/TLS communication keys directly without the need for changes in the target process.
+- Refactor the mode parameters supported by the `openssl`(aka tls) module using the `-m`parameter, with values `text`, `pcap`,`keylog`.
+  - `pcap` mode: Set with `-m pcap` or `-m pcapng` parameters. When using this mode, it is necessary to specify `--pcapfile` and `-i` parameters. The default value for the `--pcapfile` parameter is `ecapture_openssl.pcapng`.
+  - `keylog` mode: Set with `-m keylog` or `-m key` parameters. When using this mode, it is necessary to specify `--keylogfile`, defaulting to `ecapture_masterkey.log`.
+  - `text` mode: Default mode when `-m` parameter is unspecified. Outputs all plaintext packets in text form. (As of v0.7.0, no longer captures communication keys, please use `keylog` mode instead.)
+- Refactor the mode parameters supported by the `gotls` module, similar to the `openssl` module, without further details.
+- Optimize the memory size of eBPF Map, specify with the `--mapsize` parameter, defaulting to 5120 KB.
+- Remove the `-w` parameter, use `--pcapfile` parameter instead.
+- Change `log-addr` parameter to `logaddr`, with unchanged functionality.