From: TinfoilSubmarine <TinfoilSubmarine@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] New packages: akkoma-3.2.0, meilisearch-0.28.1
Date: Fri, 16 Sep 2022 20:45:21 +0200 [thread overview]
Message-ID: <20220916184521.g1YGLU4PR-5qA88rYESSW73UebDh2B5an3I27v_M7O0@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-39299@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1326 bytes --]
There is an updated pull request by TinfoilSubmarine against master on the void-packages repository
https://github.com/TinfoilSubmarine/void-packages maint/akkoma
https://github.com/void-linux/void-packages/pull/39299
New packages: akkoma-3.2.0, meilisearch-0.28.1
- New package: meilisearch-0.28.1
- New package: akkoma-3.2.0
<!-- 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**|**NO**
-->
<!-- 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, (ARCH-LIBC)
- 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/39299.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-maint/akkoma-39299.patch --]
[-- Type: text/x-diff, Size: 9300 bytes --]
From 9fb49aaf29e10c3052bb326458ad1d378ee012f2 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Fri, 22 Jul 2022 13:29:30 -0400
Subject: [PATCH 1/2] New package: meilisearch-0.28.1
---
srcpkgs/meilisearch/template | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
create mode 100644 srcpkgs/meilisearch/template
diff --git a/srcpkgs/meilisearch/template b/srcpkgs/meilisearch/template
new file mode 100644
index 000000000000..2f0fc517ee3d
--- /dev/null
+++ b/srcpkgs/meilisearch/template
@@ -0,0 +1,20 @@
+# Template file for 'meilisearch'
+pkgname=meilisearch
+version=0.28.1
+revision=1
+build_style=cargo
+short_desc="Powerful, fast, open-source, easy to use and deploy search engine"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="MIT"
+homepage="https://www.meilisearch.com"
+distfiles="https://github.com/meilisearch/meilisearch/archive/refs/tags/v${version}.tar.gz"
+checksum=1854d219df7829c3b1de107f63f4f3a125954dcaf13a71b36630cd996d286177
+
+do_install() {
+ if [ "$CROSS_BUILD" ]; then
+ vbin "target/${XBPS_CROSS_RUST_TARGET}/release/meilisearch"
+ else
+ vbin "target/${XBPS_RUST_TARGET}/release/meilisearch"
+ fi
+ vlicense LICENSE
+}
From 533f730ac483606fa76e3cbe59d90e8161f9b987 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Mon, 27 Jun 2022 11:39:02 -0400
Subject: [PATCH 2/2] New package: akkoma-3.2.1
---
srcpkgs/akkoma/INSTALL | 7 ++
srcpkgs/akkoma/files/akkoma/finish | 2 +
srcpkgs/akkoma/files/akkoma/log/run | 1 +
srcpkgs/akkoma/files/akkoma/run | 3 +
srcpkgs/akkoma/patches/append_flags.patch | 19 +++++
srcpkgs/akkoma/patches/config.patch | 20 +++++
.../akkoma/patches/include_system_erts.patch | 14 ++++
srcpkgs/akkoma/template | 75 +++++++++++++++++++
srcpkgs/akkoma/update | 2 +
9 files changed, 143 insertions(+)
create mode 100644 srcpkgs/akkoma/INSTALL
create mode 100755 srcpkgs/akkoma/files/akkoma/finish
create mode 120000 srcpkgs/akkoma/files/akkoma/log/run
create mode 100755 srcpkgs/akkoma/files/akkoma/run
create mode 100644 srcpkgs/akkoma/patches/append_flags.patch
create mode 100644 srcpkgs/akkoma/patches/config.patch
create mode 100644 srcpkgs/akkoma/patches/include_system_erts.patch
create mode 100644 srcpkgs/akkoma/template
create mode 100644 srcpkgs/akkoma/update
diff --git a/srcpkgs/akkoma/INSTALL b/srcpkgs/akkoma/INSTALL
new file mode 100644
index 000000000000..90b2456396e6
--- /dev/null
+++ b/srcpkgs/akkoma/INSTALL
@@ -0,0 +1,7 @@
+if [ "${UPDATE}" = "no" ] && [ "${ACTION}" = "post" ]; then
+ if [ ! -e /etc/akkoma/COOKIE ]; then
+ dd if=/dev/urandom bs=40 count=1 | base64 > /etc/akkoma/COOKIE
+ fi
+ chmod 600 /etc/akkoma/COOKIE
+ chown _akkoma:_akkoma /etc/akkoma/COOKIE
+fi
diff --git a/srcpkgs/akkoma/files/akkoma/finish b/srcpkgs/akkoma/files/akkoma/finish
new file mode 100755
index 000000000000..d7c930355f9a
--- /dev/null
+++ b/srcpkgs/akkoma/files/akkoma/finish
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec chpst -u _akkoma:_akkoma akkoma stop
diff --git a/srcpkgs/akkoma/files/akkoma/log/run b/srcpkgs/akkoma/files/akkoma/log/run
new file mode 120000
index 000000000000..3a5b4a586051
--- /dev/null
+++ b/srcpkgs/akkoma/files/akkoma/log/run
@@ -0,0 +1 @@
+/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/akkoma/files/akkoma/run b/srcpkgs/akkoma/files/akkoma/run
new file mode 100755
index 000000000000..8f618070c078
--- /dev/null
+++ b/srcpkgs/akkoma/files/akkoma/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+chpst -u _akkoma:_akkoma akkoma_ctl migrate
+exec chpst -u _akkoma:_akkoma akkoma start
diff --git a/srcpkgs/akkoma/patches/append_flags.patch b/srcpkgs/akkoma/patches/append_flags.patch
new file mode 100644
index 000000000000..23acb9804830
--- /dev/null
+++ b/srcpkgs/akkoma/patches/append_flags.patch
@@ -0,0 +1,19 @@
+diff --git a/deps/crypt/c_src/Makefile b/deps/crypt/c_src/Makefile
+index 03d6380..bfc9f5f 100644
+--- a/deps/crypt/c_src/Makefile
++++ b/deps/crypt/c_src/Makefile
+@@ -24,12 +24,12 @@ else ifeq ($(UNAME_SYS), Linux)
+ CFLAGS ?= -O3 -std=c99 -finline-functions -Wall -Wmissing-prototypes
+ LDFLAGS ?= -lcrypt
+ else
+- CFLAGS ?= -DHAVE_CRYPT_R -O3 -std=c99 -finline-functions -Wall -Wmissing-prototypes \
++ CFLAGS += -DHAVE_CRYPT_R -O3 -std=c99 -finline-functions -Wall -Wmissing-prototypes \
+ -pedantic -fwrapv -D_FORTIFY_SOURCE=2 \
+ -fstack-protector-strong -Wformat -Werror=format-security \
+ -fno-strict-aliasing -Wconversion -Wshadow -Wpointer-arith \
+ -Wcast-qual
+- LDFLAGS ?= -lpthread -lcrypt -Wl,-z,relro,-z,now -Wl,-z,noexecstack
++ LDFLAGS += -lpthread -lcrypt -Wl,-z,relro,-z,now -Wl,-z,noexecstack
+ endif
+ else ifneq (,$(wildcard /usr/lib/libcrypt.*))
+ CFLAGS ?= -O3 -std=c99 -finline-functions -Wall -Wmissing-prototypes
diff --git a/srcpkgs/akkoma/patches/config.patch b/srcpkgs/akkoma/patches/config.patch
new file mode 100644
index 000000000000..bfbd4c1cecc4
--- /dev/null
+++ b/srcpkgs/akkoma/patches/config.patch
@@ -0,0 +1,20 @@
+diff --git a/config/config.exs b/config/config.exs
+index b50c910..9cf622b 100644
+--- a/config/config.exs
++++ b/config/config.exs
+@@ -852,6 +852,8 @@
+ {Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicy, [max_running: 5, max_waiting: 5]}
+ ]
+
++config :tzdata, :data_dir, "/var/lib/akkoma/elixir_tzdata_data"
++
+ # Import environment specific config. This must remain at the bottom
+ # of this file so it overrides the configuration defined above.
+ import_config "#{Mix.env()}.exs"
+diff --git a/config/prod.secret.exs b/config/prod.secret.exs
+new file mode 100644
+index 0000000..23fd9f1
+--- /dev/null
++++ b/config/prod.secret.exs
+@@ -0,0 +1 @@
++import Mix.Config
diff --git a/srcpkgs/akkoma/patches/include_system_erts.patch b/srcpkgs/akkoma/patches/include_system_erts.patch
new file mode 100644
index 000000000000..4e0d4a7e9961
--- /dev/null
+++ b/srcpkgs/akkoma/patches/include_system_erts.patch
@@ -0,0 +1,14 @@
+diff --git a/mix.exs b/mix.exs
+index db2f1f0..115817c 100644
+--- a/mix.exs
++++ b/mix.exs
+@@ -38,7 +38,8 @@ def project do
+ include_executables_for: [:unix],
+ applications: [ex_syslogger: :load, syslog: :load, eldap: :transient],
+ steps: [:assemble, &put_otp_version/1, ©_files/1, ©_nginx_config/1],
+- config_providers: [{Pleroma.Config.ReleaseRuntimeProvider, []}]
++ config_providers: [{Pleroma.Config.ReleaseRuntimeProvider, []}],
++ include_erts: "/usr/lib/erlang/erts-13.0.4"
+ ]
+ ]
+ ]
diff --git a/srcpkgs/akkoma/template b/srcpkgs/akkoma/template
new file mode 100644
index 000000000000..ba4363d6b8b8
--- /dev/null
+++ b/srcpkgs/akkoma/template
@@ -0,0 +1,75 @@
+# Template file for 'akkoma'
+pkgname=akkoma
+version=3.2.1
+revision=1
+wrksrc="akkoma"
+hostmakedepends="cmake elixir rebar3 git"
+makedepends="file-devel erlang"
+short_desc="Social networking software compatible with other Fediverse software"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="AGPL-3.0-only,CC-BY-4.0,CC-BY-SA-4.0,custom:Unsplash"
+homepage="https://akkoma.dev/AkkomaGang/akkoma"
+distfiles="https://akkoma.dev/AkkomaGang/akkoma/archive/v${version}.tar.gz"
+checksum=94c892862e472e703b48c8adfd7992fce9699a70e5e5c8b31d7d6d566f34c82f
+
+system_accounts="_akkoma"
+_akkoma_homedir="/var/lib/akkoma"
+
+make_dirs="/var/lib/akkoma 0700 _akkoma _akkoma
+ /etc/akkoma 0755 _akkoma _akkoma
+ /etc/akkoma/static 0755 _akkoma _akkoma"
+
+export MIX_ENV=prod
+export MIX_REBAR3=/usr/bin/rebar3
+
+if [ "$CROSS_BUILD" ]; then
+ # fixes linking syslog dependency
+ LDFLAGS+=" -L${XBPS_CROSS_BASE}/usr/lib/erlang/usr/lib"
+fi
+
+post_extract() {
+ mix local.hex --force
+ mix deps.get --only prod
+}
+
+do_configure() {
+ if [ "$CROSS_BUILD" ]; then
+ # fixes building fast_html
+ _erts_path="$(cd ${XBPS_CROSS_BASE}/usr/lib/erlang/erts-* && pwd)"
+ vsed -i "s,ERLANG_PATH =.*,ERLANG_PATH = ${_erts_path}," deps/fast_html/Makefile
+ # additional adjustment to include target erts instead of host erts
+ vsed -i "s,include_erts: \"/usr,include_erts: \"${XBPS_CROSS_BASE}," mix.exs
+ fi
+}
+
+do_build() {
+ # without the DEBUG flag, mix gives unhelpful errors for diagnosing c library
+ # issues
+ DEBUG=1 mix release
+}
+
+do_install() {
+ vlicense COPYING
+ vlicense AGPL-3
+
+ cd _build/prod/rel/pleroma
+ vmkdir usr/lib/akkoma
+ vcopy erts-* usr/lib/akkoma
+ vcopy lib usr/lib/akkoma
+ # the Erlang Distribution cookie needs to be unique to each installation
+ rm -f releases/COOKIE
+ vcopy releases usr/lib/akkoma
+ ln -sf /etc/akkoma/COOKIE ${DESTDIR}/usr/lib/akkoma/releases
+
+ # make entrypoint look in standard location instead of cwd
+ vsed -i 's,^RELEASE_ROOT=.*,RELEASE_ROOT="/usr/lib/akkoma",' bin/pleroma
+ vcopy bin usr/lib/akkoma
+
+ vmkdir usr/bin
+ ln -sf /usr/lib/akkoma/bin/pleroma ${DESTDIR}/usr/bin/akkoma
+ ln -sf /usr/lib/akkoma/bin/pleroma_ctl ${DESTDIR}/usr/bin/akkoma_ctl
+
+ vsconf installation/akkoma.nginx
+
+ vsv akkoma
+}
diff --git a/srcpkgs/akkoma/update b/srcpkgs/akkoma/update
new file mode 100644
index 000000000000..998e8e187e1d
--- /dev/null
+++ b/srcpkgs/akkoma/update
@@ -0,0 +1,2 @@
+site="https://akkoma.dev/AkkomaGang/akkoma/tags"
+pkgname="v"
next prev parent reply other threads:[~2022-09-16 18:45 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-15 13:34 [PR PATCH] " TinfoilSubmarine
2022-09-15 13:35 ` TinfoilSubmarine
2022-09-16 18:45 ` TinfoilSubmarine [this message]
2022-09-23 21:25 ` [PR PATCH] [Updated] New packages: akkoma-3.2.1, meilisearch-0.28.1 TinfoilSubmarine
2022-10-04 16:01 ` [PR PATCH] [Updated] New packages: akkoma-3.2.3, meilisearch-0.28.1 TinfoilSubmarine
2022-10-04 16:30 ` [PR PATCH] [Updated] New packages: akkoma-3.2.3, meilisearch-0.29.0 TinfoilSubmarine
2022-10-04 17:15 ` TinfoilSubmarine
2022-10-19 18:28 ` TinfoilSubmarine
2022-11-16 14:05 ` [PR PATCH] [Updated] New packages: akkoma-3.3.1, meilisearch-0.29.1 TinfoilSubmarine
2022-11-16 14:07 ` [PR PATCH] [Updated] New package: akkoma-3.4.0 TinfoilSubmarine
2022-12-12 14:28 ` TinfoilSubmarine
2023-03-13 1:58 ` New package: akkoma-3.5.0 github-actions
2023-03-28 1:55 ` [PR PATCH] [Closed]: " github-actions
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220916184521.g1YGLU4PR-5qA88rYESSW73UebDh2B5an3I27v_M7O0@z \
--to=tinfoilsubmarine@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).