From 4fd71c809b1c31e2dabe93e116948b7526106936 Mon Sep 17 00:00:00 2001 From: Jason Manley 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 " +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 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 " +maintainer="Jason Manley " 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 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 " From fe345d6bef848046987c4c8c131dd9d61944cfb9 Mon Sep 17 00:00:00 2001 From: Jason Manley 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 " +maintainer="Orphaned " 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 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 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 " @@ -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() {