* Re: [PR REVIEW] New package: yacy-1.922
2020-07-21 21:39 [PR PATCH] New package: yacy-1.922 jason1987d
@ 2020-07-21 21:55 ` ericonr
2020-07-21 21:55 ` ericonr
` (39 subsequent siblings)
40 siblings, 0 replies; 46+ messages in thread
From: ericonr @ 2020-07-21 21:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 177 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/23695#discussion_r458411128
Comment:
why is it restriced to x86_64?
^ permalink raw reply [flat|nested] 46+ messages in thread
* Re: [PR REVIEW] New package: yacy-1.922
2020-07-21 21:39 [PR PATCH] New package: yacy-1.922 jason1987d
2020-07-21 21:55 ` [PR REVIEW] " ericonr
@ 2020-07-21 21:55 ` ericonr
2020-07-21 21:55 ` ericonr
` (38 subsequent siblings)
40 siblings, 0 replies; 46+ messages in thread
From: ericonr @ 2020-07-21 21:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 218 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/23695#discussion_r458411377
Comment:
I believe it's preferred to have the homedir in `/var` (could be wrong)
^ permalink raw reply [flat|nested] 46+ messages in thread
* Re: [PR REVIEW] New package: yacy-1.922
2020-07-21 21:39 [PR PATCH] New package: yacy-1.922 jason1987d
2020-07-21 21:55 ` [PR REVIEW] " ericonr
2020-07-21 21:55 ` ericonr
@ 2020-07-21 21:55 ` ericonr
2020-07-21 21:57 ` ericonr
` (37 subsequent siblings)
40 siblings, 0 replies; 46+ messages in thread
From: ericonr @ 2020-07-21 21:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 163 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/23695#discussion_r458410302
Comment:
indent with tabs
^ permalink raw reply [flat|nested] 46+ messages in thread
* Re: New package: yacy-1.922
2020-07-21 21:39 [PR PATCH] New package: yacy-1.922 jason1987d
` (2 preceding siblings ...)
2020-07-21 21:55 ` ericonr
@ 2020-07-21 21:57 ` ericonr
2020-07-21 22:38 ` [PR PATCH] [Updated] " jason1987d
` (36 subsequent siblings)
40 siblings, 0 replies; 46+ messages in thread
From: ericonr @ 2020-07-21 21:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 203 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/23695#issuecomment-662127289
Comment:
https://github.com/yacy/yacy_search_server#compile-from-source
^ permalink raw reply [flat|nested] 46+ messages in thread
* Re: [PR PATCH] [Updated] New package: yacy-1.922
2020-07-21 21:39 [PR PATCH] New package: yacy-1.922 jason1987d
` (3 preceding siblings ...)
2020-07-21 21:57 ` ericonr
@ 2020-07-21 22:38 ` jason1987d
2020-07-21 23:09 ` jason1987d
` (35 subsequent siblings)
40 siblings, 0 replies; 46+ messages in thread
From: jason1987d @ 2020-07-21 22:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 318 bytes --]
There is an updated pull request by jason1987d against master on the void-packages repository
https://github.com/jason1987d/void-packages master
https://github.com/void-linux/void-packages/pull/23695
New package: yacy-1.922
A patch file from https://github.com/void-linux/void-packages/pull/23695.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-23695.patch --]
[-- Type: text/x-diff, Size: 2897 bytes --]
From 4fd71c809b1c31e2dabe93e116948b7526106936 Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Tue, 21 Jul 2020 16:38:46 -0500
Subject: [PATCH 1/2] New package: yacy-1.922
---
srcpkgs/yacy/files/yacy/run | 2 ++
srcpkgs/yacy/template | 30 ++++++++++++++++++++++++++++++
2 files changed, 32 insertions(+)
create mode 100644 srcpkgs/yacy/files/yacy/run
create mode 100644 srcpkgs/yacy/template
diff --git a/srcpkgs/yacy/files/yacy/run b/srcpkgs/yacy/files/yacy/run
new file mode 100644
index 00000000000..594bcc2a3c8
--- /dev/null
+++ b/srcpkgs/yacy/files/yacy/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec chpst -u yacy:yacy /opt/yacy/startYACY.sh -f
diff --git a/srcpkgs/yacy/template b/srcpkgs/yacy/template
new file mode 100644
index 00000000000..02b9259024b
--- /dev/null
+++ b/srcpkgs/yacy/template
@@ -0,0 +1,30 @@
+# Template file for 'yacy'
+pkgname=yacy
+version=1.922
+revision=1
+archs="x86_64"
+depends="openjdk-jre"
+short_desc="YaCy p2p decentralized search engine"
+maintainer="Jason Manley <jason@jasondavid.tv>"
+license="GPL-3.0-or-later"
+homepage="https://yacy.net"
+distfiles="http://latest.yacy.net/yacy_v${version}_20191013_9964.tar.gz"
+checksum=@99af963642dafaeab2657ad59315e7b7896bf4c1e7091f8f67e95e71802d44df
+
+system_accounts="yacy"
+yacy_homedir="/opt/yacy"
+yacy_shell="/bin/bash"
+make_dirs="/opt/yacy 0755 yacy yacy"
+
+post_extract() {
+mv ${XBPS_BUILDDIR}/{yacy,yacy-1.922}
+}
+
+do_install() {
+vmkdir opt/yacy
+vcopy $XBPS_BUILDDIR/yacy-1.922/* opt/yacy
+}
+
+post_install() {
+vsv yacy
+}
From 4f6c60fd783f918a095444a32c6d637bf612fcc4 Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Tue, 21 Jul 2020 17:36:20 -0500
Subject: [PATCH 2/2] google-earth-pro: update to 7.3.3.7721
---
srcpkgs/google-earth-pro/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/google-earth-pro/template b/srcpkgs/google-earth-pro/template
index 41763ae7d25..68927d21731 100644
--- a/srcpkgs/google-earth-pro/template
+++ b/srcpkgs/google-earth-pro/template
@@ -1,18 +1,18 @@
# Template file for 'google-earth-pro'
pkgname=google-earth-pro
-version=7.3.2.5494
+version=7.3.3.7721
revision=1
archs="x86_64"
depends="alsa-lib desktop-file-utils fontconfig glu gst-plugins-base1
hicolor-icon-theme libSM libXi libXrender libcups libproxy nss"
short_desc="Explore the far reaches of the world"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Jason Manley <jason@jasondavid.tv>"
license="Google"
repository=nonfree
restricted=yes
homepage="https://www.google.com/earth/index.html"
distfiles="https://dl.google.com/linux/earth/deb/pool/main/g/${pkgname}-stable/${pkgname}-stable_${version}-r0_amd64.deb"
-checksum=86df2e14c94c1776f5fb5ff8d88a82620b74cdeb0c5e0e0df78c23b549f75618
+checksum=db3f4b224426789ffb8d76a5f64126f8a2822bc42d30da162ac05d039047a152
nostrip=yes
^ permalink raw reply [flat|nested] 46+ messages in thread
* Re: [PR PATCH] [Updated] New package: yacy-1.922
2020-07-21 21:39 [PR PATCH] New package: yacy-1.922 jason1987d
` (4 preceding siblings ...)
2020-07-21 22:38 ` [PR PATCH] [Updated] " jason1987d
@ 2020-07-21 23:09 ` jason1987d
2020-07-21 23:15 ` jason1987d
` (34 subsequent siblings)
40 siblings, 0 replies; 46+ messages in thread
From: jason1987d @ 2020-07-21 23:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 318 bytes --]
There is an updated pull request by jason1987d against master on the void-packages repository
https://github.com/jason1987d/void-packages master
https://github.com/void-linux/void-packages/pull/23695
New package: yacy-1.922
A patch file from https://github.com/void-linux/void-packages/pull/23695.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-23695.patch --]
[-- Type: text/x-diff, Size: 3514 bytes --]
From 4fd71c809b1c31e2dabe93e116948b7526106936 Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Tue, 21 Jul 2020 16:38:46 -0500
Subject: [PATCH 1/3] New package: yacy-1.922
---
srcpkgs/yacy/files/yacy/run | 2 ++
srcpkgs/yacy/template | 30 ++++++++++++++++++++++++++++++
2 files changed, 32 insertions(+)
create mode 100644 srcpkgs/yacy/files/yacy/run
create mode 100644 srcpkgs/yacy/template
diff --git a/srcpkgs/yacy/files/yacy/run b/srcpkgs/yacy/files/yacy/run
new file mode 100644
index 00000000000..594bcc2a3c8
--- /dev/null
+++ b/srcpkgs/yacy/files/yacy/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec chpst -u yacy:yacy /opt/yacy/startYACY.sh -f
diff --git a/srcpkgs/yacy/template b/srcpkgs/yacy/template
new file mode 100644
index 00000000000..02b9259024b
--- /dev/null
+++ b/srcpkgs/yacy/template
@@ -0,0 +1,30 @@
+# Template file for 'yacy'
+pkgname=yacy
+version=1.922
+revision=1
+archs="x86_64"
+depends="openjdk-jre"
+short_desc="YaCy p2p decentralized search engine"
+maintainer="Jason Manley <jason@jasondavid.tv>"
+license="GPL-3.0-or-later"
+homepage="https://yacy.net"
+distfiles="http://latest.yacy.net/yacy_v${version}_20191013_9964.tar.gz"
+checksum=@99af963642dafaeab2657ad59315e7b7896bf4c1e7091f8f67e95e71802d44df
+
+system_accounts="yacy"
+yacy_homedir="/opt/yacy"
+yacy_shell="/bin/bash"
+make_dirs="/opt/yacy 0755 yacy yacy"
+
+post_extract() {
+mv ${XBPS_BUILDDIR}/{yacy,yacy-1.922}
+}
+
+do_install() {
+vmkdir opt/yacy
+vcopy $XBPS_BUILDDIR/yacy-1.922/* opt/yacy
+}
+
+post_install() {
+vsv yacy
+}
From 4f6c60fd783f918a095444a32c6d637bf612fcc4 Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Tue, 21 Jul 2020 17:36:20 -0500
Subject: [PATCH 2/3] google-earth-pro: update to 7.3.3.7721
---
srcpkgs/google-earth-pro/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/google-earth-pro/template b/srcpkgs/google-earth-pro/template
index 41763ae7d25..68927d21731 100644
--- a/srcpkgs/google-earth-pro/template
+++ b/srcpkgs/google-earth-pro/template
@@ -1,18 +1,18 @@
# Template file for 'google-earth-pro'
pkgname=google-earth-pro
-version=7.3.2.5494
+version=7.3.3.7721
revision=1
archs="x86_64"
depends="alsa-lib desktop-file-utils fontconfig glu gst-plugins-base1
hicolor-icon-theme libSM libXi libXrender libcups libproxy nss"
short_desc="Explore the far reaches of the world"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Jason Manley <jason@jasondavid.tv>"
license="Google"
repository=nonfree
restricted=yes
homepage="https://www.google.com/earth/index.html"
distfiles="https://dl.google.com/linux/earth/deb/pool/main/g/${pkgname}-stable/${pkgname}-stable_${version}-r0_amd64.deb"
-checksum=86df2e14c94c1776f5fb5ff8d88a82620b74cdeb0c5e0e0df78c23b549f75618
+checksum=db3f4b224426789ffb8d76a5f64126f8a2822bc42d30da162ac05d039047a152
nostrip=yes
From f7ef58a73d1635afcc9734a27439b677ea165b43 Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Tue, 21 Jul 2020 18:08:51 -0500
Subject: [PATCH 3/3] yacy: remove arch restriction
---
srcpkgs/yacy/template | 1 -
1 file changed, 1 deletion(-)
diff --git a/srcpkgs/yacy/template b/srcpkgs/yacy/template
index 02b9259024b..5f8534c21ef 100644
--- a/srcpkgs/yacy/template
+++ b/srcpkgs/yacy/template
@@ -2,7 +2,6 @@
pkgname=yacy
version=1.922
revision=1
-archs="x86_64"
depends="openjdk-jre"
short_desc="YaCy p2p decentralized search engine"
maintainer="Jason Manley <jason@jasondavid.tv>"
^ permalink raw reply [flat|nested] 46+ messages in thread
* Re: [PR PATCH] [Updated] New package: yacy-1.922
2020-07-21 21:39 [PR PATCH] New package: yacy-1.922 jason1987d
` (5 preceding siblings ...)
2020-07-21 23:09 ` jason1987d
@ 2020-07-21 23:15 ` jason1987d
2020-07-21 23:17 ` [PR REVIEW] " jason1987d
` (33 subsequent siblings)
40 siblings, 0 replies; 46+ messages in thread
From: jason1987d @ 2020-07-21 23:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 318 bytes --]
There is an updated pull request by jason1987d against master on the void-packages repository
https://github.com/jason1987d/void-packages master
https://github.com/void-linux/void-packages/pull/23695
New package: yacy-1.922
A patch file from https://github.com/void-linux/void-packages/pull/23695.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-23695.patch --]
[-- Type: text/x-diff, Size: 4929 bytes --]
From 4fd71c809b1c31e2dabe93e116948b7526106936 Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Tue, 21 Jul 2020 16:38:46 -0500
Subject: [PATCH 1/4] New package: yacy-1.922
---
srcpkgs/yacy/files/yacy/run | 2 ++
srcpkgs/yacy/template | 30 ++++++++++++++++++++++++++++++
2 files changed, 32 insertions(+)
create mode 100644 srcpkgs/yacy/files/yacy/run
create mode 100644 srcpkgs/yacy/template
diff --git a/srcpkgs/yacy/files/yacy/run b/srcpkgs/yacy/files/yacy/run
new file mode 100644
index 00000000000..594bcc2a3c8
--- /dev/null
+++ b/srcpkgs/yacy/files/yacy/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec chpst -u yacy:yacy /opt/yacy/startYACY.sh -f
diff --git a/srcpkgs/yacy/template b/srcpkgs/yacy/template
new file mode 100644
index 00000000000..02b9259024b
--- /dev/null
+++ b/srcpkgs/yacy/template
@@ -0,0 +1,30 @@
+# Template file for 'yacy'
+pkgname=yacy
+version=1.922
+revision=1
+archs="x86_64"
+depends="openjdk-jre"
+short_desc="YaCy p2p decentralized search engine"
+maintainer="Jason Manley <jason@jasondavid.tv>"
+license="GPL-3.0-or-later"
+homepage="https://yacy.net"
+distfiles="http://latest.yacy.net/yacy_v${version}_20191013_9964.tar.gz"
+checksum=@99af963642dafaeab2657ad59315e7b7896bf4c1e7091f8f67e95e71802d44df
+
+system_accounts="yacy"
+yacy_homedir="/opt/yacy"
+yacy_shell="/bin/bash"
+make_dirs="/opt/yacy 0755 yacy yacy"
+
+post_extract() {
+mv ${XBPS_BUILDDIR}/{yacy,yacy-1.922}
+}
+
+do_install() {
+vmkdir opt/yacy
+vcopy $XBPS_BUILDDIR/yacy-1.922/* opt/yacy
+}
+
+post_install() {
+vsv yacy
+}
From 4f6c60fd783f918a095444a32c6d637bf612fcc4 Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Tue, 21 Jul 2020 17:36:20 -0500
Subject: [PATCH 2/4] google-earth-pro: update to 7.3.3.7721
---
srcpkgs/google-earth-pro/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/google-earth-pro/template b/srcpkgs/google-earth-pro/template
index 41763ae7d25..68927d21731 100644
--- a/srcpkgs/google-earth-pro/template
+++ b/srcpkgs/google-earth-pro/template
@@ -1,18 +1,18 @@
# Template file for 'google-earth-pro'
pkgname=google-earth-pro
-version=7.3.2.5494
+version=7.3.3.7721
revision=1
archs="x86_64"
depends="alsa-lib desktop-file-utils fontconfig glu gst-plugins-base1
hicolor-icon-theme libSM libXi libXrender libcups libproxy nss"
short_desc="Explore the far reaches of the world"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Jason Manley <jason@jasondavid.tv>"
license="Google"
repository=nonfree
restricted=yes
homepage="https://www.google.com/earth/index.html"
distfiles="https://dl.google.com/linux/earth/deb/pool/main/g/${pkgname}-stable/${pkgname}-stable_${version}-r0_amd64.deb"
-checksum=86df2e14c94c1776f5fb5ff8d88a82620b74cdeb0c5e0e0df78c23b549f75618
+checksum=db3f4b224426789ffb8d76a5f64126f8a2822bc42d30da162ac05d039047a152
nostrip=yes
From f7ef58a73d1635afcc9734a27439b677ea165b43 Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Tue, 21 Jul 2020 18:08:51 -0500
Subject: [PATCH 3/4] yacy: remove arch restriction
---
srcpkgs/yacy/template | 1 -
1 file changed, 1 deletion(-)
diff --git a/srcpkgs/yacy/template b/srcpkgs/yacy/template
index 02b9259024b..5f8534c21ef 100644
--- a/srcpkgs/yacy/template
+++ b/srcpkgs/yacy/template
@@ -2,7 +2,6 @@
pkgname=yacy
version=1.922
revision=1
-archs="x86_64"
depends="openjdk-jre"
short_desc="YaCy p2p decentralized search engine"
maintainer="Jason Manley <jason@jasondavid.tv>"
From fe345d6bef848046987c4c8c131dd9d61944cfb9 Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Tue, 21 Jul 2020 18:14:56 -0500
Subject: [PATCH 4/4] Revert "google-earth-pro: update to 7.3.3.7721"
This reverts commit 4f6c60fd783f918a095444a32c6d637bf612fcc4.
---
srcpkgs/google-earth-pro/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/google-earth-pro/template b/srcpkgs/google-earth-pro/template
index 68927d21731..41763ae7d25 100644
--- a/srcpkgs/google-earth-pro/template
+++ b/srcpkgs/google-earth-pro/template
@@ -1,18 +1,18 @@
# Template file for 'google-earth-pro'
pkgname=google-earth-pro
-version=7.3.3.7721
+version=7.3.2.5494
revision=1
archs="x86_64"
depends="alsa-lib desktop-file-utils fontconfig glu gst-plugins-base1
hicolor-icon-theme libSM libXi libXrender libcups libproxy nss"
short_desc="Explore the far reaches of the world"
-maintainer="Jason Manley <jason@jasondavid.tv>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="Google"
repository=nonfree
restricted=yes
homepage="https://www.google.com/earth/index.html"
distfiles="https://dl.google.com/linux/earth/deb/pool/main/g/${pkgname}-stable/${pkgname}-stable_${version}-r0_amd64.deb"
-checksum=db3f4b224426789ffb8d76a5f64126f8a2822bc42d30da162ac05d039047a152
+checksum=86df2e14c94c1776f5fb5ff8d88a82620b74cdeb0c5e0e0df78c23b549f75618
nostrip=yes
^ permalink raw reply [flat|nested] 46+ messages in thread
* Re: [PR REVIEW] New package: yacy-1.922
2020-07-21 21:39 [PR PATCH] New package: yacy-1.922 jason1987d
` (6 preceding siblings ...)
2020-07-21 23:15 ` jason1987d
@ 2020-07-21 23:17 ` jason1987d
2020-07-21 23:17 ` [PR PATCH] [Updated] " jason1987d
` (32 subsequent siblings)
40 siblings, 0 replies; 46+ messages in thread
From: jason1987d @ 2020-07-21 23:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 416 bytes --]
New review comment by jason1987d on void-packages repository
https://github.com/void-linux/void-packages/pull/23695#discussion_r458442779
Comment:
It works perfectly well in this case of not building from source. I removed the arch restriction too. I did do some testing with "ant clean all" in do_install but can't figure out what java package is needed in makedepends. It keeps erroring out trying to find java.
^ permalink raw reply [flat|nested] 46+ messages in thread
* Re: [PR PATCH] [Updated] New package: yacy-1.922
2020-07-21 21:39 [PR PATCH] New package: yacy-1.922 jason1987d
` (7 preceding siblings ...)
2020-07-21 23:17 ` [PR REVIEW] " jason1987d
@ 2020-07-21 23:17 ` jason1987d
2020-07-21 23:22 ` [PR REVIEW] " ericonr
` (31 subsequent siblings)
40 siblings, 0 replies; 46+ messages in thread
From: jason1987d @ 2020-07-21 23:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 318 bytes --]
There is an updated pull request by jason1987d against master on the void-packages repository
https://github.com/jason1987d/void-packages master
https://github.com/void-linux/void-packages/pull/23695
New package: yacy-1.922
A patch file from https://github.com/void-linux/void-packages/pull/23695.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-23695.patch --]
[-- Type: text/x-diff, Size: 5753 bytes --]
From 4fd71c809b1c31e2dabe93e116948b7526106936 Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Tue, 21 Jul 2020 16:38:46 -0500
Subject: [PATCH 1/5] New package: yacy-1.922
---
srcpkgs/yacy/files/yacy/run | 2 ++
srcpkgs/yacy/template | 30 ++++++++++++++++++++++++++++++
2 files changed, 32 insertions(+)
create mode 100644 srcpkgs/yacy/files/yacy/run
create mode 100644 srcpkgs/yacy/template
diff --git a/srcpkgs/yacy/files/yacy/run b/srcpkgs/yacy/files/yacy/run
new file mode 100644
index 00000000000..594bcc2a3c8
--- /dev/null
+++ b/srcpkgs/yacy/files/yacy/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec chpst -u yacy:yacy /opt/yacy/startYACY.sh -f
diff --git a/srcpkgs/yacy/template b/srcpkgs/yacy/template
new file mode 100644
index 00000000000..02b9259024b
--- /dev/null
+++ b/srcpkgs/yacy/template
@@ -0,0 +1,30 @@
+# Template file for 'yacy'
+pkgname=yacy
+version=1.922
+revision=1
+archs="x86_64"
+depends="openjdk-jre"
+short_desc="YaCy p2p decentralized search engine"
+maintainer="Jason Manley <jason@jasondavid.tv>"
+license="GPL-3.0-or-later"
+homepage="https://yacy.net"
+distfiles="http://latest.yacy.net/yacy_v${version}_20191013_9964.tar.gz"
+checksum=@99af963642dafaeab2657ad59315e7b7896bf4c1e7091f8f67e95e71802d44df
+
+system_accounts="yacy"
+yacy_homedir="/opt/yacy"
+yacy_shell="/bin/bash"
+make_dirs="/opt/yacy 0755 yacy yacy"
+
+post_extract() {
+mv ${XBPS_BUILDDIR}/{yacy,yacy-1.922}
+}
+
+do_install() {
+vmkdir opt/yacy
+vcopy $XBPS_BUILDDIR/yacy-1.922/* opt/yacy
+}
+
+post_install() {
+vsv yacy
+}
From 4f6c60fd783f918a095444a32c6d637bf612fcc4 Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Tue, 21 Jul 2020 17:36:20 -0500
Subject: [PATCH 2/5] google-earth-pro: update to 7.3.3.7721
---
srcpkgs/google-earth-pro/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/google-earth-pro/template b/srcpkgs/google-earth-pro/template
index 41763ae7d25..68927d21731 100644
--- a/srcpkgs/google-earth-pro/template
+++ b/srcpkgs/google-earth-pro/template
@@ -1,18 +1,18 @@
# Template file for 'google-earth-pro'
pkgname=google-earth-pro
-version=7.3.2.5494
+version=7.3.3.7721
revision=1
archs="x86_64"
depends="alsa-lib desktop-file-utils fontconfig glu gst-plugins-base1
hicolor-icon-theme libSM libXi libXrender libcups libproxy nss"
short_desc="Explore the far reaches of the world"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Jason Manley <jason@jasondavid.tv>"
license="Google"
repository=nonfree
restricted=yes
homepage="https://www.google.com/earth/index.html"
distfiles="https://dl.google.com/linux/earth/deb/pool/main/g/${pkgname}-stable/${pkgname}-stable_${version}-r0_amd64.deb"
-checksum=86df2e14c94c1776f5fb5ff8d88a82620b74cdeb0c5e0e0df78c23b549f75618
+checksum=db3f4b224426789ffb8d76a5f64126f8a2822bc42d30da162ac05d039047a152
nostrip=yes
From f7ef58a73d1635afcc9734a27439b677ea165b43 Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Tue, 21 Jul 2020 18:08:51 -0500
Subject: [PATCH 3/5] yacy: remove arch restriction
---
srcpkgs/yacy/template | 1 -
1 file changed, 1 deletion(-)
diff --git a/srcpkgs/yacy/template b/srcpkgs/yacy/template
index 02b9259024b..5f8534c21ef 100644
--- a/srcpkgs/yacy/template
+++ b/srcpkgs/yacy/template
@@ -2,7 +2,6 @@
pkgname=yacy
version=1.922
revision=1
-archs="x86_64"
depends="openjdk-jre"
short_desc="YaCy p2p decentralized search engine"
maintainer="Jason Manley <jason@jasondavid.tv>"
From fe345d6bef848046987c4c8c131dd9d61944cfb9 Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Tue, 21 Jul 2020 18:14:56 -0500
Subject: [PATCH 4/5] Revert "google-earth-pro: update to 7.3.3.7721"
This reverts commit 4f6c60fd783f918a095444a32c6d637bf612fcc4.
---
srcpkgs/google-earth-pro/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/google-earth-pro/template b/srcpkgs/google-earth-pro/template
index 68927d21731..41763ae7d25 100644
--- a/srcpkgs/google-earth-pro/template
+++ b/srcpkgs/google-earth-pro/template
@@ -1,18 +1,18 @@
# Template file for 'google-earth-pro'
pkgname=google-earth-pro
-version=7.3.3.7721
+version=7.3.2.5494
revision=1
archs="x86_64"
depends="alsa-lib desktop-file-utils fontconfig glu gst-plugins-base1
hicolor-icon-theme libSM libXi libXrender libcups libproxy nss"
short_desc="Explore the far reaches of the world"
-maintainer="Jason Manley <jason@jasondavid.tv>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="Google"
repository=nonfree
restricted=yes
homepage="https://www.google.com/earth/index.html"
distfiles="https://dl.google.com/linux/earth/deb/pool/main/g/${pkgname}-stable/${pkgname}-stable_${version}-r0_amd64.deb"
-checksum=db3f4b224426789ffb8d76a5f64126f8a2822bc42d30da162ac05d039047a152
+checksum=86df2e14c94c1776f5fb5ff8d88a82620b74cdeb0c5e0e0df78c23b549f75618
nostrip=yes
From 5180ee51bb32f9468c6dba0d9939ad9b1145450f Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Tue, 21 Jul 2020 18:17:31 -0500
Subject: [PATCH 5/5] Add indentation to do_install step.
---
srcpkgs/yacy/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/yacy/template b/srcpkgs/yacy/template
index 5f8534c21ef..86b2adc23c8 100644
--- a/srcpkgs/yacy/template
+++ b/srcpkgs/yacy/template
@@ -16,14 +16,14 @@ yacy_shell="/bin/bash"
make_dirs="/opt/yacy 0755 yacy yacy"
post_extract() {
-mv ${XBPS_BUILDDIR}/{yacy,yacy-1.922}
+ mv ${XBPS_BUILDDIR}/{yacy,yacy-1.922}
}
do_install() {
-vmkdir opt/yacy
-vcopy $XBPS_BUILDDIR/yacy-1.922/* opt/yacy
+ vmkdir opt/yacy
+ vcopy $XBPS_BUILDDIR/yacy-1.922/* opt/yacy
}
post_install() {
-vsv yacy
+ vsv yacy
}
^ permalink raw reply [flat|nested] 46+ messages in thread
* Re: [PR REVIEW] New package: yacy-1.922
2020-07-21 21:39 [PR PATCH] New package: yacy-1.922 jason1987d
` (8 preceding siblings ...)
2020-07-21 23:17 ` [PR PATCH] [Updated] " jason1987d
@ 2020-07-21 23:22 ` ericonr
2020-07-21 23:23 ` ericonr
` (30 subsequent siblings)
40 siblings, 0 replies; 46+ messages in thread
From: ericonr @ 2020-07-21 23:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 294 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/23695#discussion_r458444438
Comment:
You need the actual development kit to build something with java, so add `openjdk` to `hostmakedepends`. You might need to set `JAVA_HOME` as well.
^ permalink raw reply [flat|nested] 46+ messages in thread
* Re: New package: yacy-1.922
2020-07-21 21:39 [PR PATCH] New package: yacy-1.922 jason1987d
` (9 preceding siblings ...)
2020-07-21 23:22 ` [PR REVIEW] " ericonr
@ 2020-07-21 23:23 ` ericonr
2020-07-21 23:25 ` [PR REVIEW] " jason1987d
` (29 subsequent siblings)
40 siblings, 0 replies; 46+ messages in thread
From: ericonr @ 2020-07-21 23:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 186 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/23695#issuecomment-662155987
Comment:
Squash your commits when you're done, please.
^ permalink raw reply [flat|nested] 46+ messages in thread
* Re: [PR REVIEW] New package: yacy-1.922
2020-07-21 21:39 [PR PATCH] New package: yacy-1.922 jason1987d
` (10 preceding siblings ...)
2020-07-21 23:23 ` ericonr
@ 2020-07-21 23:25 ` jason1987d
2020-07-21 23:28 ` ericonr
` (28 subsequent siblings)
40 siblings, 0 replies; 46+ messages in thread
From: jason1987d @ 2020-07-21 23:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 292 bytes --]
New review comment by jason1987d on void-packages repository
https://github.com/void-linux/void-packages/pull/23695#discussion_r458445230
Comment:
I did try with openjdk as a makedepends (in addition of course to apache-ant), but I'm not too familiar with how JAVA_HOME should be set here.
^ permalink raw reply [flat|nested] 46+ messages in thread
* Re: [PR REVIEW] New package: yacy-1.922
2020-07-21 21:39 [PR PATCH] New package: yacy-1.922 jason1987d
` (11 preceding siblings ...)
2020-07-21 23:25 ` [PR REVIEW] " jason1987d
@ 2020-07-21 23:28 ` ericonr
2020-07-21 23:29 ` ericonr
` (27 subsequent siblings)
40 siblings, 0 replies; 46+ messages in thread
From: ericonr @ 2020-07-21 23:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 197 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/23695#discussion_r458446218
Comment:
Take a look at how lightzone does it, for example.
^ permalink raw reply [flat|nested] 46+ messages in thread
* Re: [PR REVIEW] New package: yacy-1.922
2020-07-21 21:39 [PR PATCH] New package: yacy-1.922 jason1987d
` (12 preceding siblings ...)
2020-07-21 23:28 ` ericonr
@ 2020-07-21 23:29 ` ericonr
2020-07-21 23:32 ` jason1987d
` (26 subsequent siblings)
40 siblings, 0 replies; 46+ messages in thread
From: ericonr @ 2020-07-21 23:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 317 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/23695#discussion_r458446802
Comment:
Are there other options users could pass to the start script? You can include a check for a conf file and source it if available. Several other services have this option.
^ permalink raw reply [flat|nested] 46+ messages in thread
* Re: [PR REVIEW] New package: yacy-1.922
2020-07-21 21:39 [PR PATCH] New package: yacy-1.922 jason1987d
` (13 preceding siblings ...)
2020-07-21 23:29 ` ericonr
@ 2020-07-21 23:32 ` jason1987d
2020-07-21 23:32 ` jason1987d
` (25 subsequent siblings)
40 siblings, 0 replies; 46+ messages in thread
From: jason1987d @ 2020-07-21 23:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1658 bytes --]
New review comment by jason1987d on void-packages repository
https://github.com/void-linux/void-packages/pull/23695#discussion_r458447664
Comment:
Maybe the -s switch here below has some potential. could set to ~/.yacy or something.
`/opt/yacy/startYACY.sh --help
startscript for YaCy on UNIX-like systems
Options
-h, --help show this help
-t, --tail-log show the output of "tail -f DATA/LOG/yacy00.log" after starting YaCy
-l, --logging save the output of YaCy to yacy.log
-d, --debug show the output of YaCy on the console and enable remote monitoring with JMX
-f, --foreground run as a foreground process, showing the output of YaCy on the console
-p, --print-out only print the command, which would be executed to start YaCy
-s, --startup [data-path] start YaCy using the specified data folder path, relative to the current user home
-g, --gui start a gui for YaCy
[jason@box ~]$ ls /opt/yacy
addon build.properties DATA gpl.txt killYACY.sh libbuild reconfigureYACY.sh startYACY.bat stopYACY.bat updateYACY.sh
AUTHORS build.xml defaults htroot langdetect locales skins startYACY_debug.bat stopYACY.sh yacy.yellow
bin COPYRIGHT getWin32MaxHeap.bat installYaCyWindowsService.bat lib NOTICE source startYACY.sh uninstallYaCyWindowsService.bat
[jason@box ~]$ ls /opt/yacy/DATA/
ARCHIVE CLASSIFICATION DICTIONARIES HTCACHE HTDOCS INDEX LISTS LOG RELEASE SETTINGS SKINS SURROGATES WORK yacy.running`
^ permalink raw reply [flat|nested] 46+ messages in thread
* Re: [PR REVIEW] New package: yacy-1.922
2020-07-21 21:39 [PR PATCH] New package: yacy-1.922 jason1987d
` (14 preceding siblings ...)
2020-07-21 23:32 ` jason1987d
@ 2020-07-21 23:32 ` jason1987d
2020-07-21 23:33 ` jason1987d
` (24 subsequent siblings)
40 siblings, 0 replies; 46+ messages in thread
From: jason1987d @ 2020-07-21 23:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1658 bytes --]
New review comment by jason1987d on void-packages repository
https://github.com/void-linux/void-packages/pull/23695#discussion_r458447664
Comment:
Maybe the -s switch here below has some potential. could set to ~/.yacy or something.
`/opt/yacy/startYACY.sh --help
startscript for YaCy on UNIX-like systems
Options
-h, --help show this help
-t, --tail-log show the output of "tail -f DATA/LOG/yacy00.log" after starting YaCy
-l, --logging save the output of YaCy to yacy.log
-d, --debug show the output of YaCy on the console and enable remote monitoring with JMX
-f, --foreground run as a foreground process, showing the output of YaCy on the console
-p, --print-out only print the command, which would be executed to start YaCy
-s, --startup [data-path] start YaCy using the specified data folder path, relative to the current user home
-g, --gui start a gui for YaCy
[jason@box ~]$ ls /opt/yacy
addon build.properties DATA gpl.txt killYACY.sh libbuild reconfigureYACY.sh startYACY.bat stopYACY.bat updateYACY.sh
AUTHORS build.xml defaults htroot langdetect locales skins startYACY_debug.bat stopYACY.sh yacy.yellow
bin COPYRIGHT getWin32MaxHeap.bat installYaCyWindowsService.bat lib NOTICE source startYACY.sh uninstallYaCyWindowsService.bat
[jason@box ~]$ ls /opt/yacy/DATA/
ARCHIVE CLASSIFICATION DICTIONARIES HTCACHE HTDOCS INDEX LISTS LOG RELEASE SETTINGS SKINS SURROGATES WORK yacy.running`
^ permalink raw reply [flat|nested] 46+ messages in thread
* Re: [PR REVIEW] New package: yacy-1.922
2020-07-21 21:39 [PR PATCH] New package: yacy-1.922 jason1987d
` (15 preceding siblings ...)
2020-07-21 23:32 ` jason1987d
@ 2020-07-21 23:33 ` jason1987d
2020-07-21 23:34 ` jason1987d
` (23 subsequent siblings)
40 siblings, 0 replies; 46+ messages in thread
From: jason1987d @ 2020-07-21 23:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1573 bytes --]
New review comment by jason1987d on void-packages repository
https://github.com/void-linux/void-packages/pull/23695#discussion_r458447818
Comment:
`/opt/yacy/startYACY.sh --help
startscript for YaCy on UNIX-like systems
Options
-h, --help show this help
-t, --tail-log show the output of "tail -f DATA/LOG/yacy00.log" after starting YaCy
-l, --logging save the output of YaCy to yacy.log
-d, --debug show the output of YaCy on the console and enable remote monitoring with JMX
-f, --foreground run as a foreground process, showing the output of YaCy on the console
-p, --print-out only print the command, which would be executed to start YaCy
-s, --startup [data-path] start YaCy using the specified data folder path, relative to the current user home
-g, --gui start a gui for YaCy
[jason@box ~]$ ls /opt/yacy
addon build.properties DATA gpl.txt killYACY.sh libbuild reconfigureYACY.sh startYACY.bat stopYACY.bat updateYACY.sh
AUTHORS build.xml defaults htroot langdetect locales skins startYACY_debug.bat stopYACY.sh yacy.yellow
bin COPYRIGHT getWin32MaxHeap.bat installYaCyWindowsService.bat lib NOTICE source startYACY.sh uninstallYaCyWindowsService.bat
[jason@box ~]$ ls /opt/yacy/DATA/
ARCHIVE CLASSIFICATION DICTIONARIES HTCACHE HTDOCS INDEX LISTS LOG RELEASE SETTINGS SKINS SURROGATES WORK yacy.running`
^ permalink raw reply [flat|nested] 46+ messages in thread
* Re: [PR REVIEW] New package: yacy-1.922
2020-07-21 21:39 [PR PATCH] New package: yacy-1.922 jason1987d
` (16 preceding siblings ...)
2020-07-21 23:33 ` jason1987d
@ 2020-07-21 23:34 ` jason1987d
2020-07-21 23:34 ` jason1987d
` (22 subsequent siblings)
40 siblings, 0 replies; 46+ messages in thread
From: jason1987d @ 2020-07-21 23:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1652 bytes --]
New review comment by jason1987d on void-packages repository
https://github.com/void-linux/void-packages/pull/23695#discussion_r458447818
Comment:
Maybe -s has potential, I could set to ~/.yacy or something.
`[jason@box ~]$ /opt/yacy/startYACY.sh --help
startscript for YaCy on UNIX-like systems
Options
-h, --help show this help
-t, --tail-log show the output of "tail -f DATA/LOG/yacy00.log" after starting YaCy
-l, --logging save the output of YaCy to yacy.log
-d, --debug show the output of YaCy on the console and enable remote monitoring with JMX
-f, --foreground run as a foreground process, showing the output of YaCy on the console
-p, --print-out only print the command, which would be executed to start YaCy
-s, --startup [data-path] start YaCy using the specified data folder path, relative to the current user home
-g, --gui start a gui for YaCy
[jason@box ~]$ ls /opt/yacy
addon build.properties DATA gpl.txt killYACY.sh libbuild reconfigureYACY.sh startYACY.bat stopYACY.bat updateYACY.sh
AUTHORS build.xml defaults htroot langdetect locales skins startYACY_debug.bat stopYACY.sh yacy.yellow
bin COPYRIGHT getWin32MaxHeap.bat installYaCyWindowsService.bat lib NOTICE source startYACY.sh uninstallYaCyWindowsService.bat
[jason@box ~]$ ls /opt/yacy/DATA/
ARCHIVE CLASSIFICATION DICTIONARIES HTCACHE HTDOCS INDEX LISTS LOG RELEASE SETTINGS SKINS SURROGATES WORK yacy.running`
^ permalink raw reply [flat|nested] 46+ messages in thread
* Re: [PR REVIEW] New package: yacy-1.922
2020-07-21 21:39 [PR PATCH] New package: yacy-1.922 jason1987d
` (17 preceding siblings ...)
2020-07-21 23:34 ` jason1987d
@ 2020-07-21 23:34 ` jason1987d
2020-07-21 23:35 ` jason1987d
` (21 subsequent siblings)
40 siblings, 0 replies; 46+ messages in thread
From: jason1987d @ 2020-07-21 23:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1616 bytes --]
New review comment by jason1987d on void-packages repository
https://github.com/void-linux/void-packages/pull/23695#discussion_r458447818
Comment:
Maybe -s has potential ?
`[jason@box ~]$ /opt/yacy/startYACY.sh --help
startscript for YaCy on UNIX-like systems
Options
-h, --help show this help
-t, --tail-log show the output of "tail -f DATA/LOG/yacy00.log" after starting YaCy
-l, --logging save the output of YaCy to yacy.log
-d, --debug show the output of YaCy on the console and enable remote monitoring with JMX
-f, --foreground run as a foreground process, showing the output of YaCy on the console
-p, --print-out only print the command, which would be executed to start YaCy
-s, --startup [data-path] start YaCy using the specified data folder path, relative to the current user home
-g, --gui start a gui for YaCy
[jason@box ~]$ ls /opt/yacy
addon build.properties DATA gpl.txt killYACY.sh libbuild reconfigureYACY.sh startYACY.bat stopYACY.bat updateYACY.sh
AUTHORS build.xml defaults htroot langdetect locales skins startYACY_debug.bat stopYACY.sh yacy.yellow
bin COPYRIGHT getWin32MaxHeap.bat installYaCyWindowsService.bat lib NOTICE source startYACY.sh uninstallYaCyWindowsService.bat
[jason@box ~]$ ls /opt/yacy/DATA/
ARCHIVE CLASSIFICATION DICTIONARIES HTCACHE HTDOCS INDEX LISTS LOG RELEASE SETTINGS SKINS SURROGATES WORK yacy.running`
^ permalink raw reply [flat|nested] 46+ messages in thread
* Re: [PR REVIEW] New package: yacy-1.922
2020-07-21 21:39 [PR PATCH] New package: yacy-1.922 jason1987d
` (18 preceding siblings ...)
2020-07-21 23:34 ` jason1987d
@ 2020-07-21 23:35 ` jason1987d
2020-07-21 23:53 ` fosslinux
` (20 subsequent siblings)
40 siblings, 0 replies; 46+ messages in thread
From: jason1987d @ 2020-07-21 23:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1721 bytes --]
New review comment by jason1987d on void-packages repository
https://github.com/void-linux/void-packages/pull/23695#discussion_r458447818
Comment:
Maybe -s has potential ? Though probably not too useful as I have this run as its own user with home dir set as /opt/yacy anyway.
`[jason@box ~]$ /opt/yacy/startYACY.sh --help
startscript for YaCy on UNIX-like systems
Options
-h, --help show this help
-t, --tail-log show the output of "tail -f DATA/LOG/yacy00.log" after starting YaCy
-l, --logging save the output of YaCy to yacy.log
-d, --debug show the output of YaCy on the console and enable remote monitoring with JMX
-f, --foreground run as a foreground process, showing the output of YaCy on the console
-p, --print-out only print the command, which would be executed to start YaCy
-s, --startup [data-path] start YaCy using the specified data folder path, relative to the current user home
-g, --gui start a gui for YaCy
[jason@box ~]$ ls /opt/yacy
addon build.properties DATA gpl.txt killYACY.sh libbuild reconfigureYACY.sh startYACY.bat stopYACY.bat updateYACY.sh
AUTHORS build.xml defaults htroot langdetect locales skins startYACY_debug.bat stopYACY.sh yacy.yellow
bin COPYRIGHT getWin32MaxHeap.bat installYaCyWindowsService.bat lib NOTICE source startYACY.sh uninstallYaCyWindowsService.bat
[jason@box ~]$ ls /opt/yacy/DATA/
ARCHIVE CLASSIFICATION DICTIONARIES HTCACHE HTDOCS INDEX LISTS LOG RELEASE SETTINGS SKINS SURROGATES WORK yacy.running`
^ permalink raw reply [flat|nested] 46+ messages in thread
* Re: New package: yacy-1.922
2020-07-21 21:39 [PR PATCH] New package: yacy-1.922 jason1987d
` (19 preceding siblings ...)
2020-07-21 23:35 ` jason1987d
@ 2020-07-21 23:53 ` fosslinux
2020-07-22 0:01 ` jason1987d
` (19 subsequent siblings)
40 siblings, 0 replies; 46+ messages in thread
From: fosslinux @ 2020-07-21 23:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 202 bytes --]
New comment by fosslinux on void-packages repository
https://github.com/void-linux/void-packages/pull/23695#issuecomment-662164178
Comment:
Remove the google-earth-pro stuff from this PR too, please.
^ permalink raw reply [flat|nested] 46+ messages in thread
* Re: New package: yacy-1.922
2020-07-21 21:39 [PR PATCH] New package: yacy-1.922 jason1987d
` (20 preceding siblings ...)
2020-07-21 23:53 ` fosslinux
@ 2020-07-22 0:01 ` jason1987d
2020-07-22 0:01 ` [PR REVIEW] " fosslinux
` (18 subsequent siblings)
40 siblings, 0 replies; 46+ messages in thread
From: jason1987d @ 2020-07-22 0:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 210 bytes --]
New comment by jason1987d on void-packages repository
https://github.com/void-linux/void-packages/pull/23695#issuecomment-662166161
Comment:
How would I remove those commits?
git rebase -i <commit id>
???
^ permalink raw reply [flat|nested] 46+ messages in thread
* Re: [PR REVIEW] New package: yacy-1.922
2020-07-21 21:39 [PR PATCH] New package: yacy-1.922 jason1987d
` (21 preceding siblings ...)
2020-07-22 0:01 ` jason1987d
@ 2020-07-22 0:01 ` fosslinux
2020-07-22 0:02 ` jason1987d
` (17 subsequent siblings)
40 siblings, 0 replies; 46+ messages in thread
From: fosslinux @ 2020-07-22 0:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 318 bytes --]
New review comment by fosslinux on void-packages repository
https://github.com/void-linux/void-packages/pull/23695#discussion_r458454962
Comment:
`/var/lib` is probably the correct place. for example https://github.com/void-linux/void-packages/blob/master/srcpkgs/gitea/template#L38
`/opt` is defiantly not right
^ permalink raw reply [flat|nested] 46+ messages in thread
* Re: New package: yacy-1.922
2020-07-21 21:39 [PR PATCH] New package: yacy-1.922 jason1987d
` (22 preceding siblings ...)
2020-07-22 0:01 ` [PR REVIEW] " fosslinux
@ 2020-07-22 0:02 ` jason1987d
2020-07-22 0:17 ` [PR PATCH] [Updated] " jason1987d
` (16 subsequent siblings)
40 siblings, 0 replies; 46+ messages in thread
From: jason1987d @ 2020-07-22 0:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 598 bytes --]
New comment by jason1987d on void-packages repository
https://github.com/void-linux/void-packages/pull/23695#issuecomment-662166614
Comment:
> This should be compiled from source. I don't see any reason for this not to be compiled from source...
>
> Resources:
>
> https://github.com/yacy/yacy_search_server#compile-from-source
> https://github.com/yacy/yacy_search_server/archive/Release_1.92.tar.gz
I am testing building from source and will have this PR up to date with that shortly. /var/lib may be the better place for this as well (I think similar to packages like transmission).
^ permalink raw reply [flat|nested] 46+ messages in thread
* Re: [PR PATCH] [Updated] New package: yacy-1.922
2020-07-21 21:39 [PR PATCH] New package: yacy-1.922 jason1987d
` (23 preceding siblings ...)
2020-07-22 0:02 ` jason1987d
@ 2020-07-22 0:17 ` jason1987d
2020-07-22 0:19 ` jason1987d
` (15 subsequent siblings)
40 siblings, 0 replies; 46+ messages in thread
From: jason1987d @ 2020-07-22 0:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 318 bytes --]
There is an updated pull request by jason1987d against master on the void-packages repository
https://github.com/jason1987d/void-packages master
https://github.com/void-linux/void-packages/pull/23695
New package: yacy-1.922
A patch file from https://github.com/void-linux/void-packages/pull/23695.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-23695.patch --]
[-- Type: text/x-diff, Size: 7478 bytes --]
From 4fd71c809b1c31e2dabe93e116948b7526106936 Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Tue, 21 Jul 2020 16:38:46 -0500
Subject: [PATCH 1/6] New package: yacy-1.922
---
srcpkgs/yacy/files/yacy/run | 2 ++
srcpkgs/yacy/template | 30 ++++++++++++++++++++++++++++++
2 files changed, 32 insertions(+)
create mode 100644 srcpkgs/yacy/files/yacy/run
create mode 100644 srcpkgs/yacy/template
diff --git a/srcpkgs/yacy/files/yacy/run b/srcpkgs/yacy/files/yacy/run
new file mode 100644
index 00000000000..594bcc2a3c8
--- /dev/null
+++ b/srcpkgs/yacy/files/yacy/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec chpst -u yacy:yacy /opt/yacy/startYACY.sh -f
diff --git a/srcpkgs/yacy/template b/srcpkgs/yacy/template
new file mode 100644
index 00000000000..02b9259024b
--- /dev/null
+++ b/srcpkgs/yacy/template
@@ -0,0 +1,30 @@
+# Template file for 'yacy'
+pkgname=yacy
+version=1.922
+revision=1
+archs="x86_64"
+depends="openjdk-jre"
+short_desc="YaCy p2p decentralized search engine"
+maintainer="Jason Manley <jason@jasondavid.tv>"
+license="GPL-3.0-or-later"
+homepage="https://yacy.net"
+distfiles="http://latest.yacy.net/yacy_v${version}_20191013_9964.tar.gz"
+checksum=@99af963642dafaeab2657ad59315e7b7896bf4c1e7091f8f67e95e71802d44df
+
+system_accounts="yacy"
+yacy_homedir="/opt/yacy"
+yacy_shell="/bin/bash"
+make_dirs="/opt/yacy 0755 yacy yacy"
+
+post_extract() {
+mv ${XBPS_BUILDDIR}/{yacy,yacy-1.922}
+}
+
+do_install() {
+vmkdir opt/yacy
+vcopy $XBPS_BUILDDIR/yacy-1.922/* opt/yacy
+}
+
+post_install() {
+vsv yacy
+}
From 4f6c60fd783f918a095444a32c6d637bf612fcc4 Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Tue, 21 Jul 2020 17:36:20 -0500
Subject: [PATCH 2/6] google-earth-pro: update to 7.3.3.7721
---
srcpkgs/google-earth-pro/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/google-earth-pro/template b/srcpkgs/google-earth-pro/template
index 41763ae7d25..68927d21731 100644
--- a/srcpkgs/google-earth-pro/template
+++ b/srcpkgs/google-earth-pro/template
@@ -1,18 +1,18 @@
# Template file for 'google-earth-pro'
pkgname=google-earth-pro
-version=7.3.2.5494
+version=7.3.3.7721
revision=1
archs="x86_64"
depends="alsa-lib desktop-file-utils fontconfig glu gst-plugins-base1
hicolor-icon-theme libSM libXi libXrender libcups libproxy nss"
short_desc="Explore the far reaches of the world"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Jason Manley <jason@jasondavid.tv>"
license="Google"
repository=nonfree
restricted=yes
homepage="https://www.google.com/earth/index.html"
distfiles="https://dl.google.com/linux/earth/deb/pool/main/g/${pkgname}-stable/${pkgname}-stable_${version}-r0_amd64.deb"
-checksum=86df2e14c94c1776f5fb5ff8d88a82620b74cdeb0c5e0e0df78c23b549f75618
+checksum=db3f4b224426789ffb8d76a5f64126f8a2822bc42d30da162ac05d039047a152
nostrip=yes
From f7ef58a73d1635afcc9734a27439b677ea165b43 Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Tue, 21 Jul 2020 18:08:51 -0500
Subject: [PATCH 3/6] yacy: remove arch restriction
---
srcpkgs/yacy/template | 1 -
1 file changed, 1 deletion(-)
diff --git a/srcpkgs/yacy/template b/srcpkgs/yacy/template
index 02b9259024b..5f8534c21ef 100644
--- a/srcpkgs/yacy/template
+++ b/srcpkgs/yacy/template
@@ -2,7 +2,6 @@
pkgname=yacy
version=1.922
revision=1
-archs="x86_64"
depends="openjdk-jre"
short_desc="YaCy p2p decentralized search engine"
maintainer="Jason Manley <jason@jasondavid.tv>"
From fe345d6bef848046987c4c8c131dd9d61944cfb9 Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Tue, 21 Jul 2020 18:14:56 -0500
Subject: [PATCH 4/6] Revert "google-earth-pro: update to 7.3.3.7721"
This reverts commit 4f6c60fd783f918a095444a32c6d637bf612fcc4.
---
srcpkgs/google-earth-pro/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/google-earth-pro/template b/srcpkgs/google-earth-pro/template
index 68927d21731..41763ae7d25 100644
--- a/srcpkgs/google-earth-pro/template
+++ b/srcpkgs/google-earth-pro/template
@@ -1,18 +1,18 @@
# Template file for 'google-earth-pro'
pkgname=google-earth-pro
-version=7.3.3.7721
+version=7.3.2.5494
revision=1
archs="x86_64"
depends="alsa-lib desktop-file-utils fontconfig glu gst-plugins-base1
hicolor-icon-theme libSM libXi libXrender libcups libproxy nss"
short_desc="Explore the far reaches of the world"
-maintainer="Jason Manley <jason@jasondavid.tv>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="Google"
repository=nonfree
restricted=yes
homepage="https://www.google.com/earth/index.html"
distfiles="https://dl.google.com/linux/earth/deb/pool/main/g/${pkgname}-stable/${pkgname}-stable_${version}-r0_amd64.deb"
-checksum=db3f4b224426789ffb8d76a5f64126f8a2822bc42d30da162ac05d039047a152
+checksum=86df2e14c94c1776f5fb5ff8d88a82620b74cdeb0c5e0e0df78c23b549f75618
nostrip=yes
From 5180ee51bb32f9468c6dba0d9939ad9b1145450f Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Tue, 21 Jul 2020 18:17:31 -0500
Subject: [PATCH 5/6] Add indentation to do_install step.
---
srcpkgs/yacy/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/yacy/template b/srcpkgs/yacy/template
index 5f8534c21ef..86b2adc23c8 100644
--- a/srcpkgs/yacy/template
+++ b/srcpkgs/yacy/template
@@ -16,14 +16,14 @@ yacy_shell="/bin/bash"
make_dirs="/opt/yacy 0755 yacy yacy"
post_extract() {
-mv ${XBPS_BUILDDIR}/{yacy,yacy-1.922}
+ mv ${XBPS_BUILDDIR}/{yacy,yacy-1.922}
}
do_install() {
-vmkdir opt/yacy
-vcopy $XBPS_BUILDDIR/yacy-1.922/* opt/yacy
+ vmkdir opt/yacy
+ vcopy $XBPS_BUILDDIR/yacy-1.922/* opt/yacy
}
post_install() {
-vsv yacy
+ vsv yacy
}
From 81598c4dba58cb2ab6f554c899dac50ccd551dfe Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Tue, 21 Jul 2020 19:17:04 -0500
Subject: [PATCH 6/6] yacy: change path to /var/lib/yacy and other fixes.
---
srcpkgs/yacy/files/yacy/run | 2 +-
srcpkgs/yacy/template | 14 ++++++++++----
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/yacy/files/yacy/run b/srcpkgs/yacy/files/yacy/run
index 594bcc2a3c8..c5544513c35 100644
--- a/srcpkgs/yacy/files/yacy/run
+++ b/srcpkgs/yacy/files/yacy/run
@@ -1,2 +1,2 @@
#!/bin/sh
-exec chpst -u yacy:yacy /opt/yacy/startYACY.sh -f
+exec chpst -u yacy:yacy /var/lib/yacy/startYACY.sh -f
diff --git a/srcpkgs/yacy/template b/srcpkgs/yacy/template
index 86b2adc23c8..3d3ad7e438f 100644
--- a/srcpkgs/yacy/template
+++ b/srcpkgs/yacy/template
@@ -2,6 +2,7 @@
pkgname=yacy
version=1.922
revision=1
+hostmakedepends="openjdk apache-ant"
depends="openjdk-jre"
short_desc="YaCy p2p decentralized search engine"
maintainer="Jason Manley <jason@jasondavid.tv>"
@@ -11,17 +12,22 @@ distfiles="http://latest.yacy.net/yacy_v${version}_20191013_9964.tar.gz"
checksum=@99af963642dafaeab2657ad59315e7b7896bf4c1e7091f8f67e95e71802d44df
system_accounts="yacy"
-yacy_homedir="/opt/yacy"
+yacy_homedir="/var/lib/yacy"
yacy_shell="/bin/bash"
-make_dirs="/opt/yacy 0755 yacy yacy"
+make_dirs="/var/lib/yacy 0755 yacy yacy"
post_extract() {
mv ${XBPS_BUILDDIR}/{yacy,yacy-1.922}
}
+do_build() {
+ export JAVA_HOME=/usr/lib/jvm/java-1.8-openjdk
+ ant clean all
+}
+
do_install() {
- vmkdir opt/yacy
- vcopy $XBPS_BUILDDIR/yacy-1.922/* opt/yacy
+ vmkdir var/lib/yacy
+ vcopy $XBPS_BUILDDIR/yacy-1.922/* var/lib/yacy
}
post_install() {
^ permalink raw reply [flat|nested] 46+ messages in thread
* Re: [PR PATCH] [Updated] New package: yacy-1.922
2020-07-21 21:39 [PR PATCH] New package: yacy-1.922 jason1987d
` (24 preceding siblings ...)
2020-07-22 0:17 ` [PR PATCH] [Updated] " jason1987d
@ 2020-07-22 0:19 ` jason1987d
2020-07-22 0:28 ` jason1987d
` (14 subsequent siblings)
40 siblings, 0 replies; 46+ messages in thread
From: jason1987d @ 2020-07-22 0:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 318 bytes --]
There is an updated pull request by jason1987d against master on the void-packages repository
https://github.com/jason1987d/void-packages master
https://github.com/void-linux/void-packages/pull/23695
New package: yacy-1.922
A patch file from https://github.com/void-linux/void-packages/pull/23695.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-23695.patch --]
[-- Type: text/x-diff, Size: 7478 bytes --]
From 4fd71c809b1c31e2dabe93e116948b7526106936 Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Tue, 21 Jul 2020 16:38:46 -0500
Subject: [PATCH 1/6] New package: yacy-1.922
---
srcpkgs/yacy/files/yacy/run | 2 ++
srcpkgs/yacy/template | 30 ++++++++++++++++++++++++++++++
2 files changed, 32 insertions(+)
create mode 100644 srcpkgs/yacy/files/yacy/run
create mode 100644 srcpkgs/yacy/template
diff --git a/srcpkgs/yacy/files/yacy/run b/srcpkgs/yacy/files/yacy/run
new file mode 100644
index 00000000000..594bcc2a3c8
--- /dev/null
+++ b/srcpkgs/yacy/files/yacy/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec chpst -u yacy:yacy /opt/yacy/startYACY.sh -f
diff --git a/srcpkgs/yacy/template b/srcpkgs/yacy/template
new file mode 100644
index 00000000000..02b9259024b
--- /dev/null
+++ b/srcpkgs/yacy/template
@@ -0,0 +1,30 @@
+# Template file for 'yacy'
+pkgname=yacy
+version=1.922
+revision=1
+archs="x86_64"
+depends="openjdk-jre"
+short_desc="YaCy p2p decentralized search engine"
+maintainer="Jason Manley <jason@jasondavid.tv>"
+license="GPL-3.0-or-later"
+homepage="https://yacy.net"
+distfiles="http://latest.yacy.net/yacy_v${version}_20191013_9964.tar.gz"
+checksum=@99af963642dafaeab2657ad59315e7b7896bf4c1e7091f8f67e95e71802d44df
+
+system_accounts="yacy"
+yacy_homedir="/opt/yacy"
+yacy_shell="/bin/bash"
+make_dirs="/opt/yacy 0755 yacy yacy"
+
+post_extract() {
+mv ${XBPS_BUILDDIR}/{yacy,yacy-1.922}
+}
+
+do_install() {
+vmkdir opt/yacy
+vcopy $XBPS_BUILDDIR/yacy-1.922/* opt/yacy
+}
+
+post_install() {
+vsv yacy
+}
From 4f6c60fd783f918a095444a32c6d637bf612fcc4 Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Tue, 21 Jul 2020 17:36:20 -0500
Subject: [PATCH 2/6] google-earth-pro: update to 7.3.3.7721
---
srcpkgs/google-earth-pro/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/google-earth-pro/template b/srcpkgs/google-earth-pro/template
index 41763ae7d25..68927d21731 100644
--- a/srcpkgs/google-earth-pro/template
+++ b/srcpkgs/google-earth-pro/template
@@ -1,18 +1,18 @@
# Template file for 'google-earth-pro'
pkgname=google-earth-pro
-version=7.3.2.5494
+version=7.3.3.7721
revision=1
archs="x86_64"
depends="alsa-lib desktop-file-utils fontconfig glu gst-plugins-base1
hicolor-icon-theme libSM libXi libXrender libcups libproxy nss"
short_desc="Explore the far reaches of the world"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Jason Manley <jason@jasondavid.tv>"
license="Google"
repository=nonfree
restricted=yes
homepage="https://www.google.com/earth/index.html"
distfiles="https://dl.google.com/linux/earth/deb/pool/main/g/${pkgname}-stable/${pkgname}-stable_${version}-r0_amd64.deb"
-checksum=86df2e14c94c1776f5fb5ff8d88a82620b74cdeb0c5e0e0df78c23b549f75618
+checksum=db3f4b224426789ffb8d76a5f64126f8a2822bc42d30da162ac05d039047a152
nostrip=yes
From f7ef58a73d1635afcc9734a27439b677ea165b43 Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Tue, 21 Jul 2020 18:08:51 -0500
Subject: [PATCH 3/6] yacy: remove arch restriction
---
srcpkgs/yacy/template | 1 -
1 file changed, 1 deletion(-)
diff --git a/srcpkgs/yacy/template b/srcpkgs/yacy/template
index 02b9259024b..5f8534c21ef 100644
--- a/srcpkgs/yacy/template
+++ b/srcpkgs/yacy/template
@@ -2,7 +2,6 @@
pkgname=yacy
version=1.922
revision=1
-archs="x86_64"
depends="openjdk-jre"
short_desc="YaCy p2p decentralized search engine"
maintainer="Jason Manley <jason@jasondavid.tv>"
From fe345d6bef848046987c4c8c131dd9d61944cfb9 Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Tue, 21 Jul 2020 18:14:56 -0500
Subject: [PATCH 4/6] Revert "google-earth-pro: update to 7.3.3.7721"
This reverts commit 4f6c60fd783f918a095444a32c6d637bf612fcc4.
---
srcpkgs/google-earth-pro/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/google-earth-pro/template b/srcpkgs/google-earth-pro/template
index 68927d21731..41763ae7d25 100644
--- a/srcpkgs/google-earth-pro/template
+++ b/srcpkgs/google-earth-pro/template
@@ -1,18 +1,18 @@
# Template file for 'google-earth-pro'
pkgname=google-earth-pro
-version=7.3.3.7721
+version=7.3.2.5494
revision=1
archs="x86_64"
depends="alsa-lib desktop-file-utils fontconfig glu gst-plugins-base1
hicolor-icon-theme libSM libXi libXrender libcups libproxy nss"
short_desc="Explore the far reaches of the world"
-maintainer="Jason Manley <jason@jasondavid.tv>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="Google"
repository=nonfree
restricted=yes
homepage="https://www.google.com/earth/index.html"
distfiles="https://dl.google.com/linux/earth/deb/pool/main/g/${pkgname}-stable/${pkgname}-stable_${version}-r0_amd64.deb"
-checksum=db3f4b224426789ffb8d76a5f64126f8a2822bc42d30da162ac05d039047a152
+checksum=86df2e14c94c1776f5fb5ff8d88a82620b74cdeb0c5e0e0df78c23b549f75618
nostrip=yes
From 5180ee51bb32f9468c6dba0d9939ad9b1145450f Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Tue, 21 Jul 2020 18:17:31 -0500
Subject: [PATCH 5/6] Add indentation to do_install step.
---
srcpkgs/yacy/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/yacy/template b/srcpkgs/yacy/template
index 5f8534c21ef..86b2adc23c8 100644
--- a/srcpkgs/yacy/template
+++ b/srcpkgs/yacy/template
@@ -16,14 +16,14 @@ yacy_shell="/bin/bash"
make_dirs="/opt/yacy 0755 yacy yacy"
post_extract() {
-mv ${XBPS_BUILDDIR}/{yacy,yacy-1.922}
+ mv ${XBPS_BUILDDIR}/{yacy,yacy-1.922}
}
do_install() {
-vmkdir opt/yacy
-vcopy $XBPS_BUILDDIR/yacy-1.922/* opt/yacy
+ vmkdir opt/yacy
+ vcopy $XBPS_BUILDDIR/yacy-1.922/* opt/yacy
}
post_install() {
-vsv yacy
+ vsv yacy
}
From 81598c4dba58cb2ab6f554c899dac50ccd551dfe Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Tue, 21 Jul 2020 19:17:04 -0500
Subject: [PATCH 6/6] yacy: change path to /var/lib/yacy and other fixes.
---
srcpkgs/yacy/files/yacy/run | 2 +-
srcpkgs/yacy/template | 14 ++++++++++----
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/yacy/files/yacy/run b/srcpkgs/yacy/files/yacy/run
index 594bcc2a3c8..c5544513c35 100644
--- a/srcpkgs/yacy/files/yacy/run
+++ b/srcpkgs/yacy/files/yacy/run
@@ -1,2 +1,2 @@
#!/bin/sh
-exec chpst -u yacy:yacy /opt/yacy/startYACY.sh -f
+exec chpst -u yacy:yacy /var/lib/yacy/startYACY.sh -f
diff --git a/srcpkgs/yacy/template b/srcpkgs/yacy/template
index 86b2adc23c8..3d3ad7e438f 100644
--- a/srcpkgs/yacy/template
+++ b/srcpkgs/yacy/template
@@ -2,6 +2,7 @@
pkgname=yacy
version=1.922
revision=1
+hostmakedepends="openjdk apache-ant"
depends="openjdk-jre"
short_desc="YaCy p2p decentralized search engine"
maintainer="Jason Manley <jason@jasondavid.tv>"
@@ -11,17 +12,22 @@ distfiles="http://latest.yacy.net/yacy_v${version}_20191013_9964.tar.gz"
checksum=@99af963642dafaeab2657ad59315e7b7896bf4c1e7091f8f67e95e71802d44df
system_accounts="yacy"
-yacy_homedir="/opt/yacy"
+yacy_homedir="/var/lib/yacy"
yacy_shell="/bin/bash"
-make_dirs="/opt/yacy 0755 yacy yacy"
+make_dirs="/var/lib/yacy 0755 yacy yacy"
post_extract() {
mv ${XBPS_BUILDDIR}/{yacy,yacy-1.922}
}
+do_build() {
+ export JAVA_HOME=/usr/lib/jvm/java-1.8-openjdk
+ ant clean all
+}
+
do_install() {
- vmkdir opt/yacy
- vcopy $XBPS_BUILDDIR/yacy-1.922/* opt/yacy
+ vmkdir var/lib/yacy
+ vcopy $XBPS_BUILDDIR/yacy-1.922/* var/lib/yacy
}
post_install() {
^ permalink raw reply [flat|nested] 46+ messages in thread
* Re: New package: yacy-1.922
2020-07-21 21:39 [PR PATCH] New package: yacy-1.922 jason1987d
` (25 preceding siblings ...)
2020-07-22 0:19 ` jason1987d
@ 2020-07-22 0:28 ` jason1987d
2020-07-22 0:35 ` fosslinux
` (13 subsequent siblings)
40 siblings, 0 replies; 46+ messages in thread
From: jason1987d @ 2020-07-22 0:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 278 bytes --]
New comment by jason1987d on void-packages repository
https://github.com/void-linux/void-packages/pull/23695#issuecomment-662173998
Comment:
I made some updates such as to the path. I hope I didn't botch the commit trail trying to remove my mistaken google-earth-pro commits.
^ permalink raw reply [flat|nested] 46+ messages in thread
* Re: New package: yacy-1.922
2020-07-21 21:39 [PR PATCH] New package: yacy-1.922 jason1987d
` (26 preceding siblings ...)
2020-07-22 0:28 ` jason1987d
@ 2020-07-22 0:35 ` fosslinux
2020-07-22 16:30 ` jason1987d
` (12 subsequent siblings)
40 siblings, 0 replies; 46+ messages in thread
From: fosslinux @ 2020-07-22 0:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 279 bytes --]
New comment by fosslinux on void-packages repository
https://github.com/void-linux/void-packages/pull/23695#issuecomment-662175903
Comment:
Ok, looking better. I'll test this soon ish. The merge commit should not be kept, use rebase instead. Not sure how to remove that though
^ permalink raw reply [flat|nested] 46+ messages in thread
* Re: New package: yacy-1.922
2020-07-21 21:39 [PR PATCH] New package: yacy-1.922 jason1987d
` (27 preceding siblings ...)
2020-07-22 0:35 ` fosslinux
@ 2020-07-22 16:30 ` jason1987d
2020-07-22 16:41 ` ericonr
` (11 subsequent siblings)
40 siblings, 0 replies; 46+ messages in thread
From: jason1987d @ 2020-07-22 16:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 274 bytes --]
New comment by jason1987d on void-packages repository
https://github.com/void-linux/void-packages/pull/23695#issuecomment-662555187
Comment:
Anything new on this? Do you want me to close out and start a new pull request since this one has dirty commit history? Thank you.
^ permalink raw reply [flat|nested] 46+ messages in thread
* Re: New package: yacy-1.922
2020-07-21 21:39 [PR PATCH] New package: yacy-1.922 jason1987d
` (28 preceding siblings ...)
2020-07-22 16:30 ` jason1987d
@ 2020-07-22 16:41 ` ericonr
2020-07-22 17:01 ` jason1987d
` (10 subsequent siblings)
40 siblings, 0 replies; 46+ messages in thread
From: ericonr @ 2020-07-22 16:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 369 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/23695#issuecomment-662561129
Comment:
@jason1987d you can run `git rebase -i HEAD~9` (where 9 is the number of commits you have here) and replace `pick` with `squash` for all of them. Then you just need to fix the final commit message and force push the branch here.
^ permalink raw reply [flat|nested] 46+ messages in thread
* Re: New package: yacy-1.922
2020-07-21 21:39 [PR PATCH] New package: yacy-1.922 jason1987d
` (29 preceding siblings ...)
2020-07-22 16:41 ` ericonr
@ 2020-07-22 17:01 ` jason1987d
2020-07-22 17:25 ` ericonr
` (9 subsequent siblings)
40 siblings, 0 replies; 46+ messages in thread
From: jason1987d @ 2020-07-22 17:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 431 bytes --]
New comment by jason1987d on void-packages repository
https://github.com/void-linux/void-packages/pull/23695#issuecomment-662571517
Comment:
> @jason1987d you can run `git rebase -i HEAD~9` (where 9 is the number of commits you have here) and replace `pick` with `squash` for all of them. Then you just need to fix the final commit message and force push the branch here.
That did not work.
fatal: invalid upstream 'HEAD-9'
^ permalink raw reply [flat|nested] 46+ messages in thread
* Re: New package: yacy-1.922
2020-07-21 21:39 [PR PATCH] New package: yacy-1.922 jason1987d
` (30 preceding siblings ...)
2020-07-22 17:01 ` jason1987d
@ 2020-07-22 17:25 ` ericonr
2020-07-22 17:35 ` jason1987d
` (8 subsequent siblings)
40 siblings, 0 replies; 46+ messages in thread
From: ericonr @ 2020-07-22 17:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 158 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/23695#issuecomment-662583018
Comment:
It's `~`, not `-`
^ permalink raw reply [flat|nested] 46+ messages in thread
* Re: New package: yacy-1.922
2020-07-21 21:39 [PR PATCH] New package: yacy-1.922 jason1987d
` (31 preceding siblings ...)
2020-07-22 17:25 ` ericonr
@ 2020-07-22 17:35 ` jason1987d
2020-07-22 17:35 ` jason1987d
` (7 subsequent siblings)
40 siblings, 0 replies; 46+ messages in thread
From: jason1987d @ 2020-07-22 17:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 290 bytes --]
New comment by jason1987d on void-packages repository
https://github.com/void-linux/void-packages/pull/23695#issuecomment-662587914
Comment:
Didn't see that ~ vs - at first, thank you. I have done plenty of squashing, but nothing seems to change here on the commits in this pull request.
^ permalink raw reply [flat|nested] 46+ messages in thread
* Re: New package: yacy-1.922
2020-07-21 21:39 [PR PATCH] New package: yacy-1.922 jason1987d
` (32 preceding siblings ...)
2020-07-22 17:35 ` jason1987d
@ 2020-07-22 17:35 ` jason1987d
2020-07-22 17:37 ` ericonr
` (6 subsequent siblings)
40 siblings, 0 replies; 46+ messages in thread
From: jason1987d @ 2020-07-22 17:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 384 bytes --]
New comment by jason1987d on void-packages repository
https://github.com/void-linux/void-packages/pull/23695#issuecomment-662587914
Comment:
Didn't see that ~ vs - at first, thank you. I have done plenty of squashing, but nothing seems to change here on the commits in this pull request. I also see below here the mssage "This branch cannot be rebased due to conflicts".... normal?
^ permalink raw reply [flat|nested] 46+ messages in thread
* Re: New package: yacy-1.922
2020-07-21 21:39 [PR PATCH] New package: yacy-1.922 jason1987d
` (33 preceding siblings ...)
2020-07-22 17:35 ` jason1987d
@ 2020-07-22 17:37 ` ericonr
2020-07-22 17:39 ` jason1987d
` (5 subsequent siblings)
40 siblings, 0 replies; 46+ messages in thread
From: ericonr @ 2020-07-22 17:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 328 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/23695#issuecomment-662589114
Comment:
Not exactly. Can you check if `git log` shows all the commits that are in https://github.com/void-linux/void-packages/pull/23695/commits ? If not, you can run `git push -f origin master`.
^ permalink raw reply [flat|nested] 46+ messages in thread
* Re: New package: yacy-1.922
2020-07-21 21:39 [PR PATCH] New package: yacy-1.922 jason1987d
` (34 preceding siblings ...)
2020-07-22 17:37 ` ericonr
@ 2020-07-22 17:39 ` jason1987d
2020-07-22 17:44 ` [PR PATCH] [Updated] " jason1987d
` (4 subsequent siblings)
40 siblings, 0 replies; 46+ messages in thread
From: jason1987d @ 2020-07-22 17:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 188 bytes --]
New comment by jason1987d on void-packages repository
https://github.com/void-linux/void-packages/pull/23695#issuecomment-662590095
Comment:
Looking at git log does show these commits.
^ permalink raw reply [flat|nested] 46+ messages in thread
* Re: [PR PATCH] [Updated] New package: yacy-1.922
2020-07-21 21:39 [PR PATCH] New package: yacy-1.922 jason1987d
` (35 preceding siblings ...)
2020-07-22 17:39 ` jason1987d
@ 2020-07-22 17:44 ` jason1987d
2020-07-22 17:49 ` jason1987d
` (3 subsequent siblings)
40 siblings, 0 replies; 46+ messages in thread
From: jason1987d @ 2020-07-22 17:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 318 bytes --]
There is an updated pull request by jason1987d against master on the void-packages repository
https://github.com/jason1987d/void-packages master
https://github.com/void-linux/void-packages/pull/23695
New package: yacy-1.922
A patch file from https://github.com/void-linux/void-packages/pull/23695.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-23695.patch --]
[-- Type: text/x-diff, Size: 11810 bytes --]
From 4fd71c809b1c31e2dabe93e116948b7526106936 Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Tue, 21 Jul 2020 16:38:46 -0500
Subject: [PATCH 1/9] New package: yacy-1.922
---
srcpkgs/yacy/files/yacy/run | 2 ++
srcpkgs/yacy/template | 30 ++++++++++++++++++++++++++++++
2 files changed, 32 insertions(+)
create mode 100644 srcpkgs/yacy/files/yacy/run
create mode 100644 srcpkgs/yacy/template
diff --git a/srcpkgs/yacy/files/yacy/run b/srcpkgs/yacy/files/yacy/run
new file mode 100644
index 00000000000..594bcc2a3c8
--- /dev/null
+++ b/srcpkgs/yacy/files/yacy/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec chpst -u yacy:yacy /opt/yacy/startYACY.sh -f
diff --git a/srcpkgs/yacy/template b/srcpkgs/yacy/template
new file mode 100644
index 00000000000..02b9259024b
--- /dev/null
+++ b/srcpkgs/yacy/template
@@ -0,0 +1,30 @@
+# Template file for 'yacy'
+pkgname=yacy
+version=1.922
+revision=1
+archs="x86_64"
+depends="openjdk-jre"
+short_desc="YaCy p2p decentralized search engine"
+maintainer="Jason Manley <jason@jasondavid.tv>"
+license="GPL-3.0-or-later"
+homepage="https://yacy.net"
+distfiles="http://latest.yacy.net/yacy_v${version}_20191013_9964.tar.gz"
+checksum=@99af963642dafaeab2657ad59315e7b7896bf4c1e7091f8f67e95e71802d44df
+
+system_accounts="yacy"
+yacy_homedir="/opt/yacy"
+yacy_shell="/bin/bash"
+make_dirs="/opt/yacy 0755 yacy yacy"
+
+post_extract() {
+mv ${XBPS_BUILDDIR}/{yacy,yacy-1.922}
+}
+
+do_install() {
+vmkdir opt/yacy
+vcopy $XBPS_BUILDDIR/yacy-1.922/* opt/yacy
+}
+
+post_install() {
+vsv yacy
+}
From 4f6c60fd783f918a095444a32c6d637bf612fcc4 Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Tue, 21 Jul 2020 17:36:20 -0500
Subject: [PATCH 2/9] google-earth-pro: update to 7.3.3.7721
---
srcpkgs/google-earth-pro/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/google-earth-pro/template b/srcpkgs/google-earth-pro/template
index 41763ae7d25..68927d21731 100644
--- a/srcpkgs/google-earth-pro/template
+++ b/srcpkgs/google-earth-pro/template
@@ -1,18 +1,18 @@
# Template file for 'google-earth-pro'
pkgname=google-earth-pro
-version=7.3.2.5494
+version=7.3.3.7721
revision=1
archs="x86_64"
depends="alsa-lib desktop-file-utils fontconfig glu gst-plugins-base1
hicolor-icon-theme libSM libXi libXrender libcups libproxy nss"
short_desc="Explore the far reaches of the world"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Jason Manley <jason@jasondavid.tv>"
license="Google"
repository=nonfree
restricted=yes
homepage="https://www.google.com/earth/index.html"
distfiles="https://dl.google.com/linux/earth/deb/pool/main/g/${pkgname}-stable/${pkgname}-stable_${version}-r0_amd64.deb"
-checksum=86df2e14c94c1776f5fb5ff8d88a82620b74cdeb0c5e0e0df78c23b549f75618
+checksum=db3f4b224426789ffb8d76a5f64126f8a2822bc42d30da162ac05d039047a152
nostrip=yes
From f7ef58a73d1635afcc9734a27439b677ea165b43 Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Tue, 21 Jul 2020 18:08:51 -0500
Subject: [PATCH 3/9] yacy: remove arch restriction
---
srcpkgs/yacy/template | 1 -
1 file changed, 1 deletion(-)
diff --git a/srcpkgs/yacy/template b/srcpkgs/yacy/template
index 02b9259024b..5f8534c21ef 100644
--- a/srcpkgs/yacy/template
+++ b/srcpkgs/yacy/template
@@ -2,7 +2,6 @@
pkgname=yacy
version=1.922
revision=1
-archs="x86_64"
depends="openjdk-jre"
short_desc="YaCy p2p decentralized search engine"
maintainer="Jason Manley <jason@jasondavid.tv>"
From fe345d6bef848046987c4c8c131dd9d61944cfb9 Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Tue, 21 Jul 2020 18:14:56 -0500
Subject: [PATCH 4/9] Revert "google-earth-pro: update to 7.3.3.7721"
This reverts commit 4f6c60fd783f918a095444a32c6d637bf612fcc4.
---
srcpkgs/google-earth-pro/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/google-earth-pro/template b/srcpkgs/google-earth-pro/template
index 68927d21731..41763ae7d25 100644
--- a/srcpkgs/google-earth-pro/template
+++ b/srcpkgs/google-earth-pro/template
@@ -1,18 +1,18 @@
# Template file for 'google-earth-pro'
pkgname=google-earth-pro
-version=7.3.3.7721
+version=7.3.2.5494
revision=1
archs="x86_64"
depends="alsa-lib desktop-file-utils fontconfig glu gst-plugins-base1
hicolor-icon-theme libSM libXi libXrender libcups libproxy nss"
short_desc="Explore the far reaches of the world"
-maintainer="Jason Manley <jason@jasondavid.tv>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="Google"
repository=nonfree
restricted=yes
homepage="https://www.google.com/earth/index.html"
distfiles="https://dl.google.com/linux/earth/deb/pool/main/g/${pkgname}-stable/${pkgname}-stable_${version}-r0_amd64.deb"
-checksum=db3f4b224426789ffb8d76a5f64126f8a2822bc42d30da162ac05d039047a152
+checksum=86df2e14c94c1776f5fb5ff8d88a82620b74cdeb0c5e0e0df78c23b549f75618
nostrip=yes
From 5180ee51bb32f9468c6dba0d9939ad9b1145450f Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Tue, 21 Jul 2020 18:17:31 -0500
Subject: [PATCH 5/9] Add indentation to do_install step.
---
srcpkgs/yacy/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/yacy/template b/srcpkgs/yacy/template
index 5f8534c21ef..86b2adc23c8 100644
--- a/srcpkgs/yacy/template
+++ b/srcpkgs/yacy/template
@@ -16,14 +16,14 @@ yacy_shell="/bin/bash"
make_dirs="/opt/yacy 0755 yacy yacy"
post_extract() {
-mv ${XBPS_BUILDDIR}/{yacy,yacy-1.922}
+ mv ${XBPS_BUILDDIR}/{yacy,yacy-1.922}
}
do_install() {
-vmkdir opt/yacy
-vcopy $XBPS_BUILDDIR/yacy-1.922/* opt/yacy
+ vmkdir opt/yacy
+ vcopy $XBPS_BUILDDIR/yacy-1.922/* opt/yacy
}
post_install() {
-vsv yacy
+ vsv yacy
}
From 81598c4dba58cb2ab6f554c899dac50ccd551dfe Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Tue, 21 Jul 2020 19:17:04 -0500
Subject: [PATCH 6/9] yacy: change path to /var/lib/yacy and other fixes.
---
srcpkgs/yacy/files/yacy/run | 2 +-
srcpkgs/yacy/template | 14 ++++++++++----
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/yacy/files/yacy/run b/srcpkgs/yacy/files/yacy/run
index 594bcc2a3c8..c5544513c35 100644
--- a/srcpkgs/yacy/files/yacy/run
+++ b/srcpkgs/yacy/files/yacy/run
@@ -1,2 +1,2 @@
#!/bin/sh
-exec chpst -u yacy:yacy /opt/yacy/startYACY.sh -f
+exec chpst -u yacy:yacy /var/lib/yacy/startYACY.sh -f
diff --git a/srcpkgs/yacy/template b/srcpkgs/yacy/template
index 86b2adc23c8..3d3ad7e438f 100644
--- a/srcpkgs/yacy/template
+++ b/srcpkgs/yacy/template
@@ -2,6 +2,7 @@
pkgname=yacy
version=1.922
revision=1
+hostmakedepends="openjdk apache-ant"
depends="openjdk-jre"
short_desc="YaCy p2p decentralized search engine"
maintainer="Jason Manley <jason@jasondavid.tv>"
@@ -11,17 +12,22 @@ distfiles="http://latest.yacy.net/yacy_v${version}_20191013_9964.tar.gz"
checksum=@99af963642dafaeab2657ad59315e7b7896bf4c1e7091f8f67e95e71802d44df
system_accounts="yacy"
-yacy_homedir="/opt/yacy"
+yacy_homedir="/var/lib/yacy"
yacy_shell="/bin/bash"
-make_dirs="/opt/yacy 0755 yacy yacy"
+make_dirs="/var/lib/yacy 0755 yacy yacy"
post_extract() {
mv ${XBPS_BUILDDIR}/{yacy,yacy-1.922}
}
+do_build() {
+ export JAVA_HOME=/usr/lib/jvm/java-1.8-openjdk
+ ant clean all
+}
+
do_install() {
- vmkdir opt/yacy
- vcopy $XBPS_BUILDDIR/yacy-1.922/* opt/yacy
+ vmkdir var/lib/yacy
+ vcopy $XBPS_BUILDDIR/yacy-1.922/* var/lib/yacy
}
post_install() {
From dccc228f282f23d5a26e7fa04dbb2188e7769dda Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Tue, 21 Jul 2020 18:17:31 -0500
Subject: [PATCH 7/9] Add indentation to do_install step.
---
srcpkgs/yacy/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/yacy/template b/srcpkgs/yacy/template
index 5f8534c21ef..86b2adc23c8 100644
--- a/srcpkgs/yacy/template
+++ b/srcpkgs/yacy/template
@@ -16,14 +16,14 @@ yacy_shell="/bin/bash"
make_dirs="/opt/yacy 0755 yacy yacy"
post_extract() {
-mv ${XBPS_BUILDDIR}/{yacy,yacy-1.922}
+ mv ${XBPS_BUILDDIR}/{yacy,yacy-1.922}
}
do_install() {
-vmkdir opt/yacy
-vcopy $XBPS_BUILDDIR/yacy-1.922/* opt/yacy
+ vmkdir opt/yacy
+ vcopy $XBPS_BUILDDIR/yacy-1.922/* opt/yacy
}
post_install() {
-vsv yacy
+ vsv yacy
}
From e87c8ecf609017c3a7b4ae9327177732b8a80ddd Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Tue, 21 Jul 2020 19:17:04 -0500
Subject: [PATCH 8/9] yacy: change path to /var/lib/yacy and other fixes.
---
srcpkgs/yacy/files/yacy/run | 2 +-
srcpkgs/yacy/template | 14 ++++++++++----
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/yacy/files/yacy/run b/srcpkgs/yacy/files/yacy/run
index 594bcc2a3c8..c5544513c35 100644
--- a/srcpkgs/yacy/files/yacy/run
+++ b/srcpkgs/yacy/files/yacy/run
@@ -1,2 +1,2 @@
#!/bin/sh
-exec chpst -u yacy:yacy /opt/yacy/startYACY.sh -f
+exec chpst -u yacy:yacy /var/lib/yacy/startYACY.sh -f
diff --git a/srcpkgs/yacy/template b/srcpkgs/yacy/template
index 86b2adc23c8..3d3ad7e438f 100644
--- a/srcpkgs/yacy/template
+++ b/srcpkgs/yacy/template
@@ -2,6 +2,7 @@
pkgname=yacy
version=1.922
revision=1
+hostmakedepends="openjdk apache-ant"
depends="openjdk-jre"
short_desc="YaCy p2p decentralized search engine"
maintainer="Jason Manley <jason@jasondavid.tv>"
@@ -11,17 +12,22 @@ distfiles="http://latest.yacy.net/yacy_v${version}_20191013_9964.tar.gz"
checksum=@99af963642dafaeab2657ad59315e7b7896bf4c1e7091f8f67e95e71802d44df
system_accounts="yacy"
-yacy_homedir="/opt/yacy"
+yacy_homedir="/var/lib/yacy"
yacy_shell="/bin/bash"
-make_dirs="/opt/yacy 0755 yacy yacy"
+make_dirs="/var/lib/yacy 0755 yacy yacy"
post_extract() {
mv ${XBPS_BUILDDIR}/{yacy,yacy-1.922}
}
+do_build() {
+ export JAVA_HOME=/usr/lib/jvm/java-1.8-openjdk
+ ant clean all
+}
+
do_install() {
- vmkdir opt/yacy
- vcopy $XBPS_BUILDDIR/yacy-1.922/* opt/yacy
+ vmkdir var/lib/yacy
+ vcopy $XBPS_BUILDDIR/yacy-1.922/* var/lib/yacy
}
post_install() {
From 8072211874efd4019a74316c725edd01ae4598d5 Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Tue, 21 Jul 2020 16:38:46 -0500
Subject: [PATCH 9/9] New package: yacy-1.922
---
srcpkgs/yacy/files/yacy/run | 2 ++
srcpkgs/yacy/template | 40 +++++++++++++++++++++++++++++++++++++
2 files changed, 42 insertions(+)
create mode 100644 srcpkgs/yacy/files/yacy/run
create mode 100644 srcpkgs/yacy/template
diff --git a/srcpkgs/yacy/files/yacy/run b/srcpkgs/yacy/files/yacy/run
new file mode 100644
index 00000000000..c5544513c35
--- /dev/null
+++ b/srcpkgs/yacy/files/yacy/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec chpst -u yacy:yacy /var/lib/yacy/startYACY.sh -f
diff --git a/srcpkgs/yacy/template b/srcpkgs/yacy/template
new file mode 100644
index 00000000000..a6472017379
--- /dev/null
+++ b/srcpkgs/yacy/template
@@ -0,0 +1,40 @@
+# Template file for 'yacy'
+pkgname=yacy
+version=1.922
+revision=1
+hostmakedepends="openjdk apache-ant"
+depends="openjdk-jre"
+short_desc="YaCy p2p decentralized search engine"
+maintainer="Jason Manley <jason@jasondavid.tv>"
+license="GPL-3.0-or-later"
+homepage="https://yacy.net"
+distfiles="http://latest.yacy.net/yacy_v${version}_20191013_9964.tar.gz"
+checksum=@99af963642dafaeab2657ad59315e7b7896bf4c1e7091f8f67e95e71802d44df
+
+system_accounts="yacy"
+yacy_homedir="/var/lib/yacy"
+yacy_shell="/bin/bash"
+make_dirs="/var/lib/yacy 0755 yacy yacy"
+
+post_extract() {
+ mv ${XBPS_BUILDDIR}/{yacy,yacy-1.922}
+}
+
+do_build() {
+ export JAVA_HOME=/usr/lib/jvm/java-1.8-openjdk
+ ant clean all
+}
+
+do_install() {
+ vmkdir var/lib/yacy
+ vcopy $XBPS_BUILDDIR/yacy-1.922/* var/lib/yacy
+}
+
+do_install() {
+ vmkdir var/lib/yacy
+ vcopy $XBPS_BUILDDIR/yacy-1.922/* var/lib/yacy
+}
+
+post_install() {
+ vsv yacy
+}
^ permalink raw reply [flat|nested] 46+ messages in thread
* Re: New package: yacy-1.922
2020-07-21 21:39 [PR PATCH] New package: yacy-1.922 jason1987d
` (36 preceding siblings ...)
2020-07-22 17:44 ` [PR PATCH] [Updated] " jason1987d
@ 2020-07-22 17:49 ` jason1987d
2020-07-22 18:01 ` ericonr
` (2 subsequent siblings)
40 siblings, 0 replies; 46+ messages in thread
From: jason1987d @ 2020-07-22 17:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 418 bytes --]
New comment by jason1987d on void-packages repository
https://github.com/void-linux/void-packages/pull/23695#issuecomment-662595022
Comment:
Each attempt at a squash just mangles the main template file with random git gibberish. What am I doing wrong here? Is it okay if I close this pull request and start fresh with just the one commit now that we've discussed and fixed what was actually wrong with the template?
^ permalink raw reply [flat|nested] 46+ messages in thread
* Re: New package: yacy-1.922
2020-07-21 21:39 [PR PATCH] New package: yacy-1.922 jason1987d
` (37 preceding siblings ...)
2020-07-22 17:49 ` jason1987d
@ 2020-07-22 18:01 ` ericonr
2020-07-22 18:02 ` [PR PATCH] [Closed]: " jason1987d
2020-07-23 20:53 ` Chocimier
40 siblings, 0 replies; 46+ messages in thread
From: ericonr @ 2020-07-22 18:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 146 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/23695#issuecomment-662601037
Comment:
Sure.
^ permalink raw reply [flat|nested] 46+ messages in thread
* Re: [PR PATCH] [Closed]: New package: yacy-1.922
2020-07-21 21:39 [PR PATCH] New package: yacy-1.922 jason1987d
` (38 preceding siblings ...)
2020-07-22 18:01 ` ericonr
@ 2020-07-22 18:02 ` jason1987d
2020-07-23 20:53 ` Chocimier
40 siblings, 0 replies; 46+ messages in thread
From: jason1987d @ 2020-07-22 18:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 157 bytes --]
There's a closed pull request on the void-packages repository
New package: yacy-1.922
https://github.com/void-linux/void-packages/pull/23695
Description:
^ permalink raw reply [flat|nested] 46+ messages in thread
* Re: New package: yacy-1.922
2020-07-21 21:39 [PR PATCH] New package: yacy-1.922 jason1987d
` (39 preceding siblings ...)
2020-07-22 18:02 ` [PR PATCH] [Closed]: " jason1987d
@ 2020-07-23 20:53 ` Chocimier
40 siblings, 0 replies; 46+ messages in thread
From: Chocimier @ 2020-07-23 20:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 337 bytes --]
New comment by Chocimier on void-packages repository
https://github.com/void-linux/void-packages/pull/23695#issuecomment-663226818
Comment:
> Is it okay if I close this pull request and start fresh with just the one commit
It is preferred to make changes as for new PR, then `git push --force FORK NEW_BRANCH:BRANCH_OF_EXISTING_PR`
^ permalink raw reply [flat|nested] 46+ messages in thread