aports: refactor and freya-base

25 files changed, 493 insertions, 114 deletions

diff --git a/.gitignore b/.gitignore
index ab65508..59e90f5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
 out
-key.rsa
-key.rsa.pub
+aports.rsa
+aports.rsa.pub
diff --git a/Dockerfile b/Dockerfile
index 4893fd6..23eacb4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,48 @@
-FROM alpine
+ARG UID="1000"
+ARG GID="1000"
+ARG ALPINE_VERSION="3.22"
+FROM alpine:${ALPINE_VERSION}
+
+# set environment
+ARG ALPINE_VERSION
+ARG UID
+ARG GID
+
+# add repos
+RUN cat <<EOF > /etc/apk/repositories
+http://dl-cdn.alpinelinux.org/alpine/v${ALPINE_VERSION}/main
+http://dl-cdn.alpinelinux.org/alpine/v${ALPINE_VERSION}/community
+EOF
+
+# install packages
 RUN apk -U add alpine-sdk doas
 RUN echo "permit nopass :wheel" >> /etc/doas.d/doas.conf
-RUN adduser -D user && adduser user abuild && adduser user wheel
-USER user
-CMD ["/bin/sh", "-c", "for port in /aports/*; do cd \"$port\" && abuild -r; done"]
+
+# create build user
+RUN <<EOF
+getent group ${GID} || addgroup -g ${GID} builder
+adduser -u ${UID} -G $(getent group ${GID} | cut -d: -f1) -D builder
+adduser builder abuild
+adduser builder wheel
+EOF
+
+# create scripts
+RUN <<EOF
+cat <<CAT > /bin/aports-build
+#!/bin/sh
+for port in \$APORTS; do
+	cd "/aports/\$port"
+	abuild -r
+done
+CAT
+chmod +x /bin/aports-build
+
+cat <<CAT > /bin/aports-keygen
+#!/bin/sh
+echo \$PACKAGER_PRIVKEY | abuild-keygen
+CAT
+chmod +x /bin/aports-keygen
+EOF
+
+# set user
+USER builder
diff --git a/Makefile b/Makefile
index 9e9fba3..0518b88 100644
--- a/Makefile
+++ b/Makefile
@@ -1,17 +1,72 @@
-include ./build.env
-OUT=./out
+# ============================================================ BUILD OPTIONS ==
 
-.PHONY: build
+# path to build aports directory
+OUT      := ./out
 
-build:
-	mkdir -p $(OUT)
-	chown 1000:1000 $(OUT)
-	docker build -t g.freya.cat/freya/aports .
-	docker run --rm -it \
-		-v $(shell pwd)/freya:/aports \
-		-v $(OUT):/home/user/packages \
-		-v $(KEY):/key \
-		-v $(KEY_PUB):/key.pub \
-		-e PACKAGER_PRIVKEY=/key \
-		--ulimit "nofile=1024:1048576" \
-		g.freya.cat/freya/aports
+# signing key for each package
+KEY      := aports.rsa
+KEY_PUB  := aports.rsa.pub
+
+# name of docker image
+IMAGE    := g.freya.cat/freya/aports
+
+# alpine version to build the packages on
+ALPINE_VERSION := 3.22
+
+# order of packages to build
+APORTS   := apk-conf \
+			caddy-conf \
+			openssh-conf \
+			zsh-conf \
+			freya-certs \
+			freya-keys \
+			freya-base
+
+# location to publish aports
+REPO     := shun.freya.cat:/static/cdn/
+
+# =============================================================================
+
+.PHONY: publish aports image clean realclean ALWAYS
+
+# docker run arguments
+DOCKER_ARGS := -v ./aports:/aports \
+			   -v $(OUT):/home/builder/packages \
+			   -v ./$(KEY):/etc/apk/keys/$(KEY) \
+			   -v ./$(KEY_PUB):/etc/apk/keys/$(KEY_PUB) \
+				--ulimit "nofile=1024:1048576" \
+				-e PACKAGER_PRIVKEY=/etc/apk/keys/$(KEY) \
+				-e APORTS="$(APORTS)" \
+				$(IMAGE)
+
+# docker run command
+DOCKER := docker run --rm -it $(DOCKER_ARGS)
+
+aports: image $(KEY) clean ALWAYS
+	mkdir -p $(OUT)/aports
+	$(DOCKER) /bin/aports-build
+	cp $(KEY_PUB) $(OUT)/aports
+
+image: Dockerfile
+	docker build . \
+		--build-arg "UID=$(shell id -u)" \
+		--build-arg "GID=$(shell id -g)" \
+		--build-arg "ALPINE_VERSION=$(ALPINE_VERSION)" \
+		-t $(IMAGE)
+
+$(KEY):
+	touch $(KEY) $(KEY_PUB)
+	$(DOCKER) /bin/aports-keygen
+
+clean:
+	rm -fr $(OUT)
+	rm -fr $(patsubst %,./aports/%/src,$(APORTS))
+
+realclean: clean
+	rm -f $(KEY) $(KEY_PUB)
+	docker image rm $(IMAGE)
+
+all: aports publish
+
+publish:
+	scp -r $(OUT)/aports/ $(REPO)
diff --git a/README.md b/README.md
index f4f30ea..ca2acc3 100644
--- a/README.md
+++ b/README.md
@@ -1,27 +1,22 @@
 ## aports
 
-my own alpine aport packages
+packages managing the baseline for my alpine systems
 
 ### requirements
 
 only docker is needed, since the build environment is run inside docker
 
-### signing keys
+### building
 
-to build aports, you first need a signing key pair (if you dont have one).
-```
-openssl genrsa -out key.rsa 2048
-openssl rsa -in key.rsa -pubout > key.rsa.pub
-```
+to compile the APKs, set the variables in the Makefile and run `make aports`
 
-if you already have keys, or you generated them somewhere else, make sure to update their locations in `build.env`
+### usage
 
-### building
+to add this baseline to an alpine system run the following on a new install
 
-to compile the APKs run
-
-```
-make build
+```sh
+sed -i 's/#//' /etc/apk/repositories
+apk add --no-cache --allow-untrusted --repository http://f.freya.cat/aports freya-base
+echo freya-base > /etc/apk/world
+apk update && apk upgrade
 ```
-
-the packages should not be outputed in the ./out folder
diff --git a/aports/apk-conf/APKBUILD b/aports/apk-conf/APKBUILD
new file mode 100644
index 0000000..2436f90
--- /dev/null
+++ b/aports/apk-conf/APKBUILD
@@ -0,0 +1,28 @@
+# Contributor: Freya Murphy <freya@freyacat.org>
+# Maintainer: Freya Murphy <freya@freyacat.org>
+pkgname=apk-conf
+pkgver=0.0.1
+pkgrel=0
+pkgdesc="Managed apk configuration"
+url="https://g.freya.cat/freya/aports/"
+arch="noarch"
+license="MIT"
+depends=
+options="!check !strip"
+makedepends=
+checkdepends=
+install="$pkgname.post-install"
+source="repositories"
+
+build() {
+    ALPINE_VERSION=$(cat /etc/apk/repositories | awk -F/ '{print $5}' | head -n1)
+    sed -i "s/ALPINE_VERSION/$ALPINE_VERSION/" "$srcdir"/repositories
+}
+
+package() {
+    install -Dm644 "$srcdir"/repositories "$pkgdir"/usr/share/conf/repositories
+}
+
+sha512sums="
+026e5d6d62e9a966051465db149522bd543e631a1855d15ee766752bd9e7483fdf347d07016dc04598010b7a12bb0f2b704403c750ef2011319c2529b151257b  repositories
+"
diff --git a/aports/apk-conf/apk-conf.post-install b/aports/apk-conf/apk-conf.post-install
new file mode 100644
index 0000000..05017db
--- /dev/null
+++ b/aports/apk-conf/apk-conf.post-install
@@ -0,0 +1,3 @@
+#!/bin/sh
+rm -f /etc/apk/repositories
+ln -sf /usr/share/conf/repositories /etc/apk/repositories
diff --git a/aports/apk-conf/repositories b/aports/apk-conf/repositories
new file mode 100644
index 0000000..dfd9988
--- /dev/null
+++ b/aports/apk-conf/repositories
@@ -0,0 +1,3 @@
+http://dl-cdn.alpinelinux.org/alpine/ALPINE_VERSION/main
+http://dl-cdn.alpinelinux.org/alpine/ALPINE_VERSION/community
+http://f.freya.cat/aports
diff --git a/aports/caddy-conf/APKBUILD b/aports/caddy-conf/APKBUILD
new file mode 100644
index 0000000..6eb87f2
--- /dev/null
+++ b/aports/caddy-conf/APKBUILD
@@ -0,0 +1,23 @@
+# Contributor: Freya Murphy <freya@freyacat.org>
+# Maintainer: Freya Murphy <freya@freyacat.org>
+pkgname=caddy-conf
+pkgver=0.0.1
+pkgrel=0
+pkgdesc="Managed caddy configuration"
+url="https://g.freya.cat/freya/aports/"
+arch="noarch"
+license="MIT"
+depends="caddy"
+options="!check !strip"
+makedepends=
+checkdepends=
+install="$pkgname.post-install"
+source="Caddyfile"
+
+package() {
+    install -Dm644 "$srcdir"/Caddyfile "$pkgdir"/usr/share/conf/Caddyfile
+}
+
+sha512sums="
+d12cd67a48fd6eed5d3f361cb4f3d2dd13b0b724eaffe8e992ba023aa73f1802b45e0640c53980acee249f2adf37a9fa3b35c541400c51bda92a85e39cb58952  Caddyfile
+"
diff --git a/aports/caddy-conf/Caddyfile b/aports/caddy-conf/Caddyfile
new file mode 100644
index 0000000..84cad64
--- /dev/null
+++ b/aports/caddy-conf/Caddyfile
@@ -0,0 +1,73 @@
+{
+	http_port 80
+	https_port 443
+
+    email freya@freyacat.org
+    acme_ca https://ca.in.freya.cat/acme/acme/directory
+}
+
+(logs) {
+	log {
+		output file /var/log/caddy {
+			roll_size 10mb
+			roll_keep 7
+			roll_keep_for 720h
+		}
+	}
+}
+
+(headers) {
+	#header ?Access-Control-Allow-Origin "*"
+	header ?X-Content-Type-Options "nosniff"
+	header Permissions-Policy "interest-cohort=()"
+	header Referrer-Policy "same-origin"
+	header Strict-Transport-Security "max-age=31536000"
+}
+
+(compression) {
+	encode {
+		gzip 6
+		zstd
+	}
+}
+
+(acme) {
+	redir /.well-known/acme-challenge /.well-known/acme-challenge/
+	handle_path /.well-known/acme-challenge/* {
+		file_server browse
+		root * /var/www/html/.well-known/acme-challenge
+	}
+}
+
+(base) {
+	import logs
+	import headers
+	import compression
+	import acme
+}
+
+(http) {
+	try_files {path}.html {path}
+	file_server
+}
+
+(wellknown) {
+	header ?Access-Control-Allow-Origin "*"
+	redir /.well-known /.well-known/
+	handle_path /.well-known/* {
+		file_server browse
+		root * /static/wellknown
+	}
+}
+
+(protect) {
+	forward_auth https://forward.auth.in.freya.cat {
+		uri /
+		header_up Host forward.auth.in.freya.cat
+		copy_headers {
+			X-Webauth-Username X-Webauth-Email X-Webauth-First-Name X-Webauth-Last-Name
+		}
+	}
+}
+
+import /etc/caddy/*.conf
diff --git a/aports/caddy-conf/caddy-conf.post-install b/aports/caddy-conf/caddy-conf.post-install
new file mode 100644
index 0000000..492bbc7
--- /dev/null
+++ b/aports/caddy-conf/caddy-conf.post-install
@@ -0,0 +1,5 @@
+#!/bin/sh
+rm -f /etc/caddy/Caddyfile
+ln -sf /usr/share/conf/Caddyfile /etc/caddy/Caddyfile
+touch /var/log/caddy
+chown caddy:caddy /var/log/caddy
diff --git a/aports/freya-base/APKBUILD b/aports/freya-base/APKBUILD
new file mode 100644
index 0000000..521a76e
--- /dev/null
+++ b/aports/freya-base/APKBUILD
@@ -0,0 +1,49 @@
+# Contributor: Freya Murphy <freya@freyacat.org>
+# Maintainer: Freya Murphy <freya@freyacat.org>
+pkgname=freya-base
+pkgver=0.0.1
+pkgrel=0
+pkgdesc="Custom baseline for alpine linux vms"
+url="https://g.freya.cat/freya/aports/"
+arch="noarch"
+license="MIT"
+depends="
+apk-conf
+caddy-conf
+openssh-conf
+zsh-conf
+
+freya-certs
+freya-keys
+
+alpine-base
+bash
+bind-tools
+busybox-mdev-openrc
+chrony
+coreutils
+curl
+git
+htop
+linux-firmware-none
+linux-virt
+lsblk
+man-db
+man-pages
+neovim
+openssl
+ripgrep
+rsync
+sed
+shadow
+syslinux
+xauth
+"
+options="!check !strip"
+makedepends=
+checkdepends=
+install="$pkgname.post-install"
+
+package() {
+    mkdir -p "$pkgdir"
+}
diff --git a/aports/freya-base/freya-base.post-install b/aports/freya-base/freya-base.post-install
new file mode 100755
index 0000000..d4b60e1
--- /dev/null
+++ b/aports/freya-base/freya-base.post-install
@@ -0,0 +1,2 @@
+#!/bin/sh
+chsh root -s /bin/zsh
diff --git a/aports/freya-certs/APKBUILD b/aports/freya-certs/APKBUILD
new file mode 100644
index 0000000..3f249bf
--- /dev/null
+++ b/aports/freya-certs/APKBUILD
@@ -0,0 +1,23 @@
+# Contributor: Freya Murphy <freya@freyacat.org>
+# Maintainer: Freya Murphy <freya@freyacat.org>
+pkgname=freya-certs
+pkgver=0.0.1
+pkgrel=0
+pkgdesc="FreyaNET CA Certificates"
+url="https://g.freya.cat/freya/aports/"
+arch="noarch"
+license="MIT"
+depends="ca-certificates"
+options="!check !strip"
+makedepends=
+checkdepends=
+install="$pkgname.post-install"
+source="freyanet.crt"
+
+package() {
+	install -Dm644 "$srcdir/freyanet.crt" "$pkgdir/usr/share/ca-certificates/freya/freyanet.crt"
+}
+
+sha512sums="
+97ec7a4a5ecc284bfd5112f5a27d4946aaf3aec5fd40302e77795ace1eb1062558baf0c7e81448d6e43a1c2886681897d5c28ed25deae6cdbdbf0b0acbfa2874  freyanet.crt
+"
diff --git a/aports/freya-certs/freya-certs.post-install b/aports/freya-certs/freya-certs.post-install
new file mode 100755
index 0000000..1eb1771
--- /dev/null
+++ b/aports/freya-certs/freya-certs.post-install
@@ -0,0 +1,3 @@
+#!/bin/sh
+echo "freya/freyanet.crt" >> /etc/ca-certificates.conf
+update-ca-certificates
diff --git a/aports/freya-certs/freyanet.crt b/aports/freya-certs/freyanet.crt
new file mode 100644
index 0000000..bc0d55a
--- /dev/null
+++ b/aports/freya-certs/freyanet.crt
@@ -0,0 +1,11 @@
+-----BEGIN CERTIFICATE-----

+MIIBnDCCAUKgAwIBAgIRAPVH+EAJd7BV1oocsZ1LQLEwCgYIKoZIzj0EAwIwLDEQ

+MA4GA1UEChMHZnJleWFDQTEYMBYGA1UEAxMPZnJleWFDQSBSb290IENBMB4XDTIz

+MTAyODEzNDAzNVoXDTMzMTAyNTEzNDAzNVowLDEQMA4GA1UEChMHZnJleWFDQTEY

+MBYGA1UEAxMPZnJleWFDQSBSb290IENBMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcD

+QgAEvVC5H2UQZQxMJxKnWkNF7kKNXVDpY2N81yFXRb+K/MKw3aQTI1ukJ6A3AmZP

+P9urbt/wOHI2zBuodGi4gaLBSaNFMEMwDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB

+/wQIMAYBAf8CAQEwHQYDVR0OBBYEFGYaattGlZxu5noFWxAnLtpMqJvJMAoGCCqG

+SM49BAMCA0gAMEUCIQCCyubbf8AUq+PPrnBRQ/WFYKH3mwUXcDT7VZoLm+/q+gIg

+YdSLl4AnWfDLlaTTZspft2fq5rEFCB5N+4p/67vSsmY=

+-----END CERTIFICATE-----

diff --git a/aports/freya-keys/APKBUILD b/aports/freya-keys/APKBUILD
new file mode 100644
index 0000000..824f6b6
--- /dev/null
+++ b/aports/freya-keys/APKBUILD
@@ -0,0 +1,20 @@
+# Contributor: Freya Murphy <freya@freyacat.org>
+# Maintainer: Freya Murphy <freya@freyacat.org>
+pkgname=freya-keys
+pkgver=0.0.1
+pkgrel=0
+pkgdesc="APKBUILD signing keys for freya aports"
+url="https://g.freya.cat/freya/aports/"
+arch="noarch"
+license="MIT"
+depends=
+options="!check !strip"
+makedepends=
+checkdepends=
+source=
+
+package() {
+    install -Dm644 "$PACKAGER_PRIVKEY".pub "$pkgdir"/etc/apk/keys/"$(basename "$PACKAGER_PRIVKEY")".pub
+}
+
+sha512sums=
diff --git a/aports/openssh-conf/APKBUILD b/aports/openssh-conf/APKBUILD
new file mode 100644
index 0000000..3e675c4
--- /dev/null
+++ b/aports/openssh-conf/APKBUILD
@@ -0,0 +1,26 @@
+# Contributor: Freya Murphy <freya@freyacat.org>
+# Maintainer: Freya Murphy <freya@freyacat.org>
+pkgname=openssh-conf
+pkgver=0.0.1
+pkgrel=0
+pkgdesc="Managed openssh configuration"
+url="https://g.freya.cat/freya/aports/"
+arch="noarch"
+license="MIT"
+depends="openssh"
+options="!check !strip"
+makedepends=
+checkdepends=
+install=
+source="sshd.conf
+        authorized_keys"
+
+package() {
+    install -Dm644 "$srcdir"/sshd.conf "$pkgdir"/etc/ssh/sshd_config.d/freya.conf
+    install -Dm644 "$srcdir"/authorized_keys "$pkgdir"/etc/ssh/authorized_keys
+}
+
+sha512sums="
+6b60b6ce5f8fd7887e1f2803c01221ed2e19820b569bad17088b6fd2c517095d6e2746eeb921cd88e9a3177d0a426bd7721dd01672865f4707ce21c52c2de231  sshd.conf
+fd1ec121493d4a8f0a870b87d5cea0f1003b3264babae2fff6c543b47bde292ee87d60748785cc6bb16c44c102dbec1cabef5b7271e8e81d3628aa803710df80  authorized_keys
+"
diff --git a/aports/openssh-conf/authorized_keys b/aports/openssh-conf/authorized_keys
new file mode 100644
index 0000000..649d43a
--- /dev/null
+++ b/aports/openssh-conf/authorized_keys
@@ -0,0 +1,2 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPTZhIaet4Sxb9n7W/LJezqb5XmgAXWzjS907rUdeukq freya@freyacat.org
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEzMST2uiVueyaMfF/BdnOCwdkmHa0lSjh2U6hByUHlj backup
diff --git a/aports/openssh-conf/sshd.conf b/aports/openssh-conf/sshd.conf
new file mode 100644
index 0000000..f2ec50e
--- /dev/null
+++ b/aports/openssh-conf/sshd.conf
@@ -0,0 +1,15 @@
+StrictModes yes
+Port 22
+PasswordAuthentication no
+KbdInteractiveAuthentication no
+PermitRootLogin yes
+AuthorizedKeysFile	.ssh/authorized_keys /etc/ssh/authorized_keys
+AllowTcpForwarding no
+GatewayPorts no
+X11Forwarding yes
+PrintMotd no
+AcceptEnv LANG LC_*
+Subsystem	sftp	internal-sftp
+
+Match Address 10.*
+	PasswordAuthentication yes
diff --git a/aports/zsh-conf/APKBUILD b/aports/zsh-conf/APKBUILD
new file mode 100644
index 0000000..c95dd24
--- /dev/null
+++ b/aports/zsh-conf/APKBUILD
@@ -0,0 +1,23 @@
+# Contributor: Freya Murphy <freya@freyacat.org>
+# Maintainer: Freya Murphy <freya@freyacat.org>
+pkgname=zsh-conf
+pkgver=0.0.1
+pkgrel=0
+pkgdesc="Managed zsh configuration"
+url="https://g.freya.cat/freya/aports/"
+arch="noarch"
+license="MIT"
+depends="zsh shadow"
+options="!check !strip"
+makedepends=
+checkdepends=
+install="$pkgname.post-install"
+source="zshrc"
+
+package() {
+    install -Dm644 "$srcdir"/zshrc "$pkgdir"/etc/zsh/zshrc.d/freya.zsh
+}
+
+sha512sums="
+c05704c7ea129a863c5482f37098c9f80fdb971e16d8ca0f69b1e638caf1d8f5338ea07a121eb56e1e6bd372082ba212a5dbdfe76f7b0d8efeb45fabf8bf7f19  zshrc
+"
diff --git a/aports/zsh-conf/zsh-conf.post-install b/aports/zsh-conf/zsh-conf.post-install
new file mode 100644
index 0000000..9b72f50
--- /dev/null
+++ b/aports/zsh-conf/zsh-conf.post-install
@@ -0,0 +1,2 @@
+#!/bin/sh
+chsh root -s "/bin/zsh"
diff --git a/aports/zsh-conf/zshrc b/aports/zsh-conf/zshrc
new file mode 100644
index 0000000..fc01188
--- /dev/null
+++ b/aports/zsh-conf/zshrc
@@ -0,0 +1,54 @@
+# zsh shell initalization file
+
+# export 'SHELL' and 'TERM' to child processes
+export SHELL
+export TERM
+
+# check for non-interactive shell.
+if [[ $- != *i* ]]; then
+    # We are being invoked from a non-interactive shell.  If this
+    # is an SSH session (as in "ssh host command"), source
+    # /etc/profile so we get PATH and other essential variables.
+    [[ -n "$SSH_CLIENT" ]] && source /etc/profile
+
+    # Don't do anything else.
+    return
+fi
+
+# load zsh plugins
+setopt extendedglob
+bindkey -e
+autoload -U compinit
+compinit
+autoload -U colors && colors
+setopt promptsubst
+
+# prompt
+function prompt_char {
+    if [ $UID -eq 0 ]; then echo "#"; else echo "$"; fi
+}
+PROMPT='%(!.%F{9}.%F{10})%n@%m: %F{15}%c%F{12}$(prompt_char)%F{7} '
+PROMPT2='%_%F{12}:%F{15} '
+
+# aliases
+alias ls='ls --color=auto'
+alias rf="rm -fr" # remove le french hon hon hon
+alias vim="nvim"
+
+# manpages
+export LESS_TERMCAP_md=$'\e[1;36m'
+export LESS_TERMCAP_me=$'\e[0m'
+export LESS_TERMCAP_se=$'\e[0m'
+export LESS_TERMCAP_so=$'\e[1;92m'
+export LESS_TERMCAP_ue=$'\e[0m'
+export LESS_TERMCAP_us=$'\e[1;35m'
+export GROFF_NO_SGR=1
+
+# keybinds
+bindkey "\e[1;5D" backward-word
+bindkey "\e[1;5C" forward-word
+bindkey "\e[3;5~" kill-word
+bindkey "\C-_"    backward-kill-word
+bindkey "\e[3~" delete-char
+bindkey "\e[H"  beginning-of-line
+bindkey "\e[F"  end-of-li
diff --git a/build.env b/build.env
deleted file mode 100644
index ff3a6e0..0000000
--- a/build.env
+++ /dev/null
@@ -1,2 +0,0 @@
-KEY=./key.rsa
-KEY_PUB=./key.rsa.pub
diff --git a/freya/iksemel/0001-fix-texi.patch b/freya/iksemel/0001-fix-texi.patch
deleted file mode 100644
index be00398..0000000
--- a/freya/iksemel/0001-fix-texi.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From de24c7b0d310b582183288bdf8e98c617c7cd42e Mon Sep 17 00:00:00 2001
-From: Freya <freya@freyacat.org>
-Date: Sun, 17 Mar 2024 04:18:59 +0000
-Subject: [PATCH] fix texi
-
----
- doc/iksemel.texi | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/doc/iksemel.texi b/doc/iksemel.texi
-index fd683e2..bfad102 100644
---- a/doc/iksemel.texi
-+++ b/doc/iksemel.texi
-@@ -1,7 +1,6 @@
- \input texinfo @c -*-texinfo-*-
- @c %**start of header
- @setfilename iksemel
--@setcontentsaftertitlepage
- @settitle Iksemel Programmers Manual
- @set VERSION 1.2
- @c %**end of header
--- 
-2.43.0
-
diff --git a/freya/iksemel/APKBUILD b/freya/iksemel/APKBUILD
deleted file mode 100644
index 7e7cf39..0000000
--- a/freya/iksemel/APKBUILD
+++ /dev/null
@@ -1,52 +0,0 @@
-pkgname=iksemel
-pkgver=1.6.1
-commit=978b733462e41efd5db72bc9974cb3b0d1d5f6fa
-pkgrel=0
-pkgdesc="XML parser library designed for Jabber applications."
-url="https://pypi.org/project/iksemel/"
-arch="all"
-license="GPL-2.0-only"
-depends=""
-makedepends="
-	autoconf
-	automake
-	libtool
-	texinfo
-	make
-	fakeroot
-	"
-checkdepends=""
-install=""
-subpackages=""
-source="$pkgname-$commit.tar.gz::https://f.freya.cat/source/$pkgname/$pkgname-978b733.tar.gz
-		0001-fix-texi.patch
-		"
-builddir="$srcdir/iksemel"
-
-build() {
-	./autogen.sh
-	./configure \
-		--with-gnutls=yes \
-		--without-openssl \
-		--disable-python \
-		--prefix "/usr"
-	make
-}
-
-
-check() {
-    :
-}
-
-package() {
-	make DESTDIR="$pkgdir" install
-
-	install -d "$pkgdir/usr/bin"
-	install -d "$pkgdir/usr/lib"
-	install -d "$pkgdir/usr/share"
-}
-
-sha512sums="
-4ab636d3cea7d70dc949ea2a3968ad5d9d9b75f77860b43b756ace2753d173b10563fb1c0794abf26ce8c43036a04a96d8210000383d35fff4c203188cade3f2  $pkgname-$commit.tar.gz
-60578cbbf836db5af044a9becd390a790c3026224493968de71c88f1cdf5c0cf858b0fed617d22fa175f96f7e6522bc9b590cc5f4675e14c03fa518fea784ce9  0001-fix-texi.patch
-"