summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD36
-rw-r--r--cgproxy.install9
3 files changed, 20 insertions, 30 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 80fe8fe3c9e1..0ce91b0b1bc7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -3,10 +3,8 @@ pkgbase = cgproxy
pkgver = 0.20
pkgrel = 1
url = https://github.com/springzfx/cgproxy
- install = cgproxy.install
arch = x86_64
- groups =
- license = GPL
+ license = GPL-2.0-or-later
makedepends = cmake
makedepends = nlohmann-json
makedepends = clang
@@ -16,7 +14,6 @@ pkgbase = cgproxy
depends = iproute2
depends = which
provides = cgproxy
- conflicts = cgproxy
backup = etc/cgproxy/config.json
source = cgproxy::git+https://github.com/springzfx/cgproxy#tag=v0.20
md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 93da0ef1a9b6..df2cdb942933 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,35 +1,37 @@
-# Maintainer: Fancy Zhang <springzfx@gmail.com>
+# Maintainer: Kimiblock
+# Contributor: Fancy Zhang <springzfx@gmail.com>
+
pkgname=cgproxy
pkgver=0.20
pkgrel=1
pkgdesc="A transparent proxy program powered by cgroup2 and tproxy"
arch=('x86_64')
url="https://github.com/springzfx/cgproxy"
-license=('GPL')
-groups=('')
+license=('GPL-2.0-or-later')
+groups=()
makedepends=('cmake' 'nlohmann-json' 'clang' 'bpf' 'libbpf')
depends=('libbpf' 'iproute2' 'which')
provides=('cgproxy')
-conflicts=('cgproxy')
source=("${pkgname}::git+https://github.com/springzfx/cgproxy#tag=v${pkgver}")
md5sums=('SKIP')
backup=('etc/cgproxy/config.json')
-install='cgproxy.install'
-build(){
- mkdir -p "${srcdir}/${pkgname}/build"
- cd "${srcdir}/${pkgname}/build"
- cmake -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -Dbuild_execsnoop_dl=ON \
- -Dbuild_static=OFF \
- ..
- make
+function build() {
+ mkdir -p "${srcdir}/${pkgname}/build"
+ cd "${srcdir}/${pkgname}/build"
+ cmake -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -Dbuild_execsnoop_dl=ON \
+ -Dbuild_static=OFF \
+ ..
+ make
}
-package_cgproxy(){
- cd "${srcdir}/$pkgname"/build
- make DESTDIR=$pkgdir install
+function package() {
+ cd "${srcdir}/${pkgname}"/build
+ make DESTDIR="${pkgdir}" install
}
+
+
diff --git a/cgproxy.install b/cgproxy.install
deleted file mode 100644
index 4c822d55d3cb..000000000000
--- a/cgproxy.install
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-post_install(){
-cat <<'DOC'
- to start service:
- systemctl enable --now cgproxy.service
-DOC
-}
-