[PR PATCH] New packages: sing geoip & geosite

[PR PATCH] New packages: sing geoip & geosite

[hesam-init]

[-- Attachment #1: Type: text/plain, Size: 1239 bytes --]

There is a new pull request by hesam-init against master on the void-packages repository

https://github.com/void-land/void-packages master
https://github.com/void-linux/void-packages/pull/51326

New packages: sing geoip & geosite
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**


#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
<!--
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/51326.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-51326.patch --]
[-- Type: text/x-diff, Size: 2912 bytes --]

From e356800e28feac85c5c14fcbdb3b0492a574a006 Mon Sep 17 00:00:00 2001
From: hesam-init <hesam.init@gmail.com>
Date: Thu, 18 Jul 2024 19:03:38 +0330
Subject: [PATCH] New packages: sing geoip & geosite

---
 srcpkgs/sing-geoip/template   | 35 +++++++++++++++++++++++++++++++++++
 srcpkgs/sing-geosite/template | 35 +++++++++++++++++++++++++++++++++++
 2 files changed, 70 insertions(+)
 create mode 100644 srcpkgs/sing-geoip/template
 create mode 100644 srcpkgs/sing-geosite/template

diff --git a/srcpkgs/sing-geoip/template b/srcpkgs/sing-geoip/template
new file mode 100644
index 00000000000000..7fc1c28cb613fe
--- /dev/null
+++ b/srcpkgs/sing-geoip/template
@@ -0,0 +1,35 @@
+# Template file for 'sing-geoip'
+pkgname=sing-geoip
+version=20240712
+revision=1
+build_style=go
+build_helper=qemu
+go_import_path="github.com/sagernet/sing-geoip"
+short_desc="Geoip database and rule sets for sing-box"
+maintainer="hesam-init <hesam.init@gmail.com>"
+license="GPL-3.0-or-later, LGPL-3.0-or-later"
+homepage="https://github.com/SagerNet/sing-geoip"
+changelog="https://github.com/SagerNet/sing-geoip/releases"
+distfiles="https://github.com/SagerNet/sing-geoip/archive/refs/tags/${version}.tar.gz"
+checksum="17545df533aa2f4d577c01eb3c29969e3cf6ea018ffc3dc250ba5c09ae12dc01"
+
+post_build() {
+	for f in ${GOPATH}/bin/* ${GOPATH}/bin/**/*; do
+		if [ -f "$f" ] && [ -x "$f" ]; then
+			NO_SKIP=true vtargetrun "$f"
+		fi
+	done
+}
+
+do_install() {
+	vmkdir usr/share/${pkgname}
+	vmkdir usr/share/${pkgname}/rule-set
+
+	for file in *.db; do
+		vinstall $file 644 usr/share/${pkgname}
+	done
+
+	for file in rule-set/*; do
+		vinstall $file 644 usr/share/${pkgname}/rule-set
+	done
+}
diff --git a/srcpkgs/sing-geosite/template b/srcpkgs/sing-geosite/template
new file mode 100644
index 00000000000000..120b6629eb5372
--- /dev/null
+++ b/srcpkgs/sing-geosite/template
@@ -0,0 +1,35 @@
+# Template file for 'sing-geosite'
+pkgname=sing-geosite
+version=20240713050854
+revision=1
+build_style=go
+build_helper=qemu
+go_import_path="github.com/sagernet/sing-geosite"
+short_desc="Geosite database and rule sets for sing-box"
+maintainer="hesam-init <hesam.init@gmail.com>"
+license="GPL-3.0-or-later, LGPL-3.0-or-later"
+homepage="https://github.com/SagerNet/sing-geosite"
+changelog="https://github.com/SagerNet/sing-geosite/releases"
+distfiles="https://github.com/SagerNet/sing-geosite/archive/refs/tags/${version}.tar.gz"
+checksum="2913b0d12304caf96a7a204b53028e95ff37215518876594a83ff829930aa6e3"
+
+post_build() {
+	for f in ${GOPATH}/bin/* ${GOPATH}/bin/**/*; do
+		if [ -f "$f" ] && [ -x "$f" ]; then
+			NO_SKIP=true vtargetrun "$f"
+		fi
+	done
+}
+
+do_install() {
+	vmkdir usr/share/${pkgname}
+	vmkdir usr/share/${pkgname}/rule-set
+
+	for file in *.db; do
+		vinstall $file 644 usr/share/${pkgname}
+	done
+
+	for file in rule-set/*; do
+		vinstall $file 644 usr/share/${pkgname}/rule-set
+	done
+}

Re: [PR REVIEW] New packages: sing geoip & geosite

[sgn]

[-- Attachment #1: Type: text/plain, Size: 220 bytes --]

New review comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/51326#discussion_r1683614830

Comment:
This version breaks our version scheme, we don't support this large version!

Re: [PR PATCH] [Updated] New packages: sing geoip & geosite

[hesam-init]

[-- Attachment #1: Type: text/plain, Size: 1244 bytes --]

There is an updated pull request by hesam-init against master on the void-packages repository

https://github.com/void-land/void-packages master
https://github.com/void-linux/void-packages/pull/51326

New packages: sing geoip & geosite
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**


#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
<!--
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/51326.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-51326.patch --]
[-- Type: text/x-diff, Size: 4097 bytes --]

From e356800e28feac85c5c14fcbdb3b0492a574a006 Mon Sep 17 00:00:00 2001
From: hesam-init <hesam.init@gmail.com>
Date: Thu, 18 Jul 2024 19:03:38 +0330
Subject: [PATCH 1/2] New packages: sing geoip & geosite

---
 srcpkgs/sing-geoip/template   | 35 +++++++++++++++++++++++++++++++++++
 srcpkgs/sing-geosite/template | 35 +++++++++++++++++++++++++++++++++++
 2 files changed, 70 insertions(+)
 create mode 100644 srcpkgs/sing-geoip/template
 create mode 100644 srcpkgs/sing-geosite/template

diff --git a/srcpkgs/sing-geoip/template b/srcpkgs/sing-geoip/template
new file mode 100644
index 00000000000000..7fc1c28cb613fe
--- /dev/null
+++ b/srcpkgs/sing-geoip/template
@@ -0,0 +1,35 @@
+# Template file for 'sing-geoip'
+pkgname=sing-geoip
+version=20240712
+revision=1
+build_style=go
+build_helper=qemu
+go_import_path="github.com/sagernet/sing-geoip"
+short_desc="Geoip database and rule sets for sing-box"
+maintainer="hesam-init <hesam.init@gmail.com>"
+license="GPL-3.0-or-later, LGPL-3.0-or-later"
+homepage="https://github.com/SagerNet/sing-geoip"
+changelog="https://github.com/SagerNet/sing-geoip/releases"
+distfiles="https://github.com/SagerNet/sing-geoip/archive/refs/tags/${version}.tar.gz"
+checksum="17545df533aa2f4d577c01eb3c29969e3cf6ea018ffc3dc250ba5c09ae12dc01"
+
+post_build() {
+	for f in ${GOPATH}/bin/* ${GOPATH}/bin/**/*; do
+		if [ -f "$f" ] && [ -x "$f" ]; then
+			NO_SKIP=true vtargetrun "$f"
+		fi
+	done
+}
+
+do_install() {
+	vmkdir usr/share/${pkgname}
+	vmkdir usr/share/${pkgname}/rule-set
+
+	for file in *.db; do
+		vinstall $file 644 usr/share/${pkgname}
+	done
+
+	for file in rule-set/*; do
+		vinstall $file 644 usr/share/${pkgname}/rule-set
+	done
+}
diff --git a/srcpkgs/sing-geosite/template b/srcpkgs/sing-geosite/template
new file mode 100644
index 00000000000000..120b6629eb5372
--- /dev/null
+++ b/srcpkgs/sing-geosite/template
@@ -0,0 +1,35 @@
+# Template file for 'sing-geosite'
+pkgname=sing-geosite
+version=20240713050854
+revision=1
+build_style=go
+build_helper=qemu
+go_import_path="github.com/sagernet/sing-geosite"
+short_desc="Geosite database and rule sets for sing-box"
+maintainer="hesam-init <hesam.init@gmail.com>"
+license="GPL-3.0-or-later, LGPL-3.0-or-later"
+homepage="https://github.com/SagerNet/sing-geosite"
+changelog="https://github.com/SagerNet/sing-geosite/releases"
+distfiles="https://github.com/SagerNet/sing-geosite/archive/refs/tags/${version}.tar.gz"
+checksum="2913b0d12304caf96a7a204b53028e95ff37215518876594a83ff829930aa6e3"
+
+post_build() {
+	for f in ${GOPATH}/bin/* ${GOPATH}/bin/**/*; do
+		if [ -f "$f" ] && [ -x "$f" ]; then
+			NO_SKIP=true vtargetrun "$f"
+		fi
+	done
+}
+
+do_install() {
+	vmkdir usr/share/${pkgname}
+	vmkdir usr/share/${pkgname}/rule-set
+
+	for file in *.db; do
+		vinstall $file 644 usr/share/${pkgname}
+	done
+
+	for file in rule-set/*; do
+		vinstall $file 644 usr/share/${pkgname}/rule-set
+	done
+}

From ac92a2cff05040594232af8f56f7eb628a7f7331 Mon Sep 17 00:00:00 2001
From: hesam-init <hesam.init@gmail.com>
Date: Fri, 19 Jul 2024 14:43:14 +0330
Subject: [PATCH 2/2] fix: sing geosite version

---
 srcpkgs/sing-geosite/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sing-geosite/template b/srcpkgs/sing-geosite/template
index 120b6629eb5372..b338dfd321254c 100644
--- a/srcpkgs/sing-geosite/template
+++ b/srcpkgs/sing-geosite/template
@@ -1,6 +1,7 @@
 # Template file for 'sing-geosite'
 pkgname=sing-geosite
-version=20240713050854
+version=0.1.0
+_pkg_version=20240713050854
 revision=1
 build_style=go
 build_helper=qemu
@@ -10,7 +11,7 @@ maintainer="hesam-init <hesam.init@gmail.com>"
 license="GPL-3.0-or-later, LGPL-3.0-or-later"
 homepage="https://github.com/SagerNet/sing-geosite"
 changelog="https://github.com/SagerNet/sing-geosite/releases"
-distfiles="https://github.com/SagerNet/sing-geosite/archive/refs/tags/${version}.tar.gz"
+distfiles="https://github.com/SagerNet/sing-geosite/archive/refs/tags/${_pkg_version}.tar.gz"
 checksum="2913b0d12304caf96a7a204b53028e95ff37215518876594a83ff829930aa6e3"
 
 post_build() {

Re: [PR REVIEW] New packages: sing geoip & geosite

[hesam-init]

[-- Attachment #1: Type: text/plain, Size: 257 bytes --]

New review comment by hesam-init on void-packages repository

https://github.com/void-linux/void-packages/pull/51326#discussion_r1684226871

Comment:
I wasn't aware that this version would cause a break, so I went ahead and changed the version of the file.

Re: New packages: sing geoip & geosite

[hesam-init]

[-- Attachment #1: Type: text/plain, Size: 270 bytes --]

New comment by hesam-init on void-packages repository

https://github.com/void-linux/void-packages/pull/51326#issuecomment-2337733219

Comment:
@classabbyamp, please merge if possible, as these packages are required for [Nekoray](https://github.com/MatsuriDayo/nekoray)

Re: [PR PATCH] [Updated] New packages: sing geoip & geosite

[hesam-init]

[-- Attachment #1: Type: text/plain, Size: 1244 bytes --]

There is an updated pull request by hesam-init against master on the void-packages repository

https://github.com/void-land/void-packages master
https://github.com/void-linux/void-packages/pull/51326

New packages: sing geoip & geosite
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**


#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
<!--
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/51326.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-51326.patch --]
[-- Type: text/x-diff, Size: 4097 bytes --]

From e356800e28feac85c5c14fcbdb3b0492a574a006 Mon Sep 17 00:00:00 2001
From: hesam-init <hesam.init@gmail.com>
Date: Thu, 18 Jul 2024 19:03:38 +0330
Subject: [PATCH 1/2] New packages: sing geoip & geosite

---
 srcpkgs/sing-geoip/template   | 35 +++++++++++++++++++++++++++++++++++
 srcpkgs/sing-geosite/template | 35 +++++++++++++++++++++++++++++++++++
 2 files changed, 70 insertions(+)
 create mode 100644 srcpkgs/sing-geoip/template
 create mode 100644 srcpkgs/sing-geosite/template

diff --git a/srcpkgs/sing-geoip/template b/srcpkgs/sing-geoip/template
new file mode 100644
index 00000000000000..7fc1c28cb613fe
--- /dev/null
+++ b/srcpkgs/sing-geoip/template
@@ -0,0 +1,35 @@
+# Template file for 'sing-geoip'
+pkgname=sing-geoip
+version=20240712
+revision=1
+build_style=go
+build_helper=qemu
+go_import_path="github.com/sagernet/sing-geoip"
+short_desc="Geoip database and rule sets for sing-box"
+maintainer="hesam-init <hesam.init@gmail.com>"
+license="GPL-3.0-or-later, LGPL-3.0-or-later"
+homepage="https://github.com/SagerNet/sing-geoip"
+changelog="https://github.com/SagerNet/sing-geoip/releases"
+distfiles="https://github.com/SagerNet/sing-geoip/archive/refs/tags/${version}.tar.gz"
+checksum="17545df533aa2f4d577c01eb3c29969e3cf6ea018ffc3dc250ba5c09ae12dc01"
+
+post_build() {
+	for f in ${GOPATH}/bin/* ${GOPATH}/bin/**/*; do
+		if [ -f "$f" ] && [ -x "$f" ]; then
+			NO_SKIP=true vtargetrun "$f"
+		fi
+	done
+}
+
+do_install() {
+	vmkdir usr/share/${pkgname}
+	vmkdir usr/share/${pkgname}/rule-set
+
+	for file in *.db; do
+		vinstall $file 644 usr/share/${pkgname}
+	done
+
+	for file in rule-set/*; do
+		vinstall $file 644 usr/share/${pkgname}/rule-set
+	done
+}
diff --git a/srcpkgs/sing-geosite/template b/srcpkgs/sing-geosite/template
new file mode 100644
index 00000000000000..120b6629eb5372
--- /dev/null
+++ b/srcpkgs/sing-geosite/template
@@ -0,0 +1,35 @@
+# Template file for 'sing-geosite'
+pkgname=sing-geosite
+version=20240713050854
+revision=1
+build_style=go
+build_helper=qemu
+go_import_path="github.com/sagernet/sing-geosite"
+short_desc="Geosite database and rule sets for sing-box"
+maintainer="hesam-init <hesam.init@gmail.com>"
+license="GPL-3.0-or-later, LGPL-3.0-or-later"
+homepage="https://github.com/SagerNet/sing-geosite"
+changelog="https://github.com/SagerNet/sing-geosite/releases"
+distfiles="https://github.com/SagerNet/sing-geosite/archive/refs/tags/${version}.tar.gz"
+checksum="2913b0d12304caf96a7a204b53028e95ff37215518876594a83ff829930aa6e3"
+
+post_build() {
+	for f in ${GOPATH}/bin/* ${GOPATH}/bin/**/*; do
+		if [ -f "$f" ] && [ -x "$f" ]; then
+			NO_SKIP=true vtargetrun "$f"
+		fi
+	done
+}
+
+do_install() {
+	vmkdir usr/share/${pkgname}
+	vmkdir usr/share/${pkgname}/rule-set
+
+	for file in *.db; do
+		vinstall $file 644 usr/share/${pkgname}
+	done
+
+	for file in rule-set/*; do
+		vinstall $file 644 usr/share/${pkgname}/rule-set
+	done
+}

From ac92a2cff05040594232af8f56f7eb628a7f7331 Mon Sep 17 00:00:00 2001
From: hesam-init <hesam.init@gmail.com>
Date: Fri, 19 Jul 2024 14:43:14 +0330
Subject: [PATCH 2/2] fix: sing geosite version

---
 srcpkgs/sing-geosite/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sing-geosite/template b/srcpkgs/sing-geosite/template
index 120b6629eb5372..b338dfd321254c 100644
--- a/srcpkgs/sing-geosite/template
+++ b/srcpkgs/sing-geosite/template
@@ -1,6 +1,7 @@
 # Template file for 'sing-geosite'
 pkgname=sing-geosite
-version=20240713050854
+version=0.1.0
+_pkg_version=20240713050854
 revision=1
 build_style=go
 build_helper=qemu
@@ -10,7 +11,7 @@ maintainer="hesam-init <hesam.init@gmail.com>"
 license="GPL-3.0-or-later, LGPL-3.0-or-later"
 homepage="https://github.com/SagerNet/sing-geosite"
 changelog="https://github.com/SagerNet/sing-geosite/releases"
-distfiles="https://github.com/SagerNet/sing-geosite/archive/refs/tags/${version}.tar.gz"
+distfiles="https://github.com/SagerNet/sing-geosite/archive/refs/tags/${_pkg_version}.tar.gz"
 checksum="2913b0d12304caf96a7a204b53028e95ff37215518876594a83ff829930aa6e3"
 
 post_build() {

Re: [PR PATCH] [Closed]: New packages: sing geoip & geosite

[void-land]

[-- Attachment #1: Type: text/plain, Size: 1084 bytes --]

There's a closed pull request on the void-packages repository

New packages: sing geoip & geosite
https://github.com/void-linux/void-packages/pull/51326

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**


#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
<!--
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->

Re: New packages: sing geoip & geosite

[hesam-init]

[-- Attachment #1: Type: text/plain, Size: 270 bytes --]

New comment by hesam-init on void-packages repository

https://github.com/void-linux/void-packages/pull/51326#issuecomment-2337733219

Comment:
@classabbyamp, please merge if possible, as these packages are required for [Nekoray](https://github.com/MatsuriDayo/nekoray)