summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.mailmap4
-rw-r--r--experimental/zfs-utils/APKBUILD4
-rw-r--r--experimental/zfs/APKBUILD4
-rw-r--r--legacy/which/APKBUILD2
-rw-r--r--system/abuild/APKBUILD2
-rw-r--r--system/apk-tools/APKBUILD38
-rw-r--r--system/apk-tools/apk.zsh-completion240
-rw-r--r--system/apk-tools/dash.patch14
-rw-r--r--system/apk-tools/pmmx.patch11
-rw-r--r--system/apk-tools/s6-linux-init.patch11
-rw-r--r--system/cxref/APKBUILD4
-rw-r--r--system/dash/APKBUILD2
-rw-r--r--system/execline/APKBUILD7
-rw-r--r--system/file/APKBUILD2
-rw-r--r--system/libcap-ng/APKBUILD8
-rw-r--r--system/libcap-ng/fix-includes.patch11
-rw-r--r--system/mdevd/APKBUILD6
-rw-r--r--system/ncurses/APKBUILD2
-rw-r--r--system/patch/APKBUILD2
-rw-r--r--system/pcre2/APKBUILD10
-rw-r--r--system/pcre2/CVE-2019-20454.patch50
-rw-r--r--system/perl-encode-eucjpascii/APKBUILD2
-rw-r--r--system/perl-encode-hanextra/APKBUILD2
-rw-r--r--system/perl-encode-iso2022/APKBUILD2
-rw-r--r--system/perl-encode-jisx0213/APKBUILD2
-rw-r--r--system/perl-http-message/APKBUILD2
-rw-r--r--system/perl-json/APKBUILD2
-rw-r--r--system/perl-mime-charset/APKBUILD2
-rw-r--r--system/perl-pod2-base/APKBUILD2
-rw-r--r--system/perl-sgmls/APKBUILD2
-rw-r--r--system/perl-test-fatal/APKBUILD2
-rw-r--r--system/perl-test-needs/APKBUILD2
-rw-r--r--system/perl-try-tiny/APKBUILD2
-rw-r--r--system/perl-unicode-linebreak/APKBUILD2
-rw-r--r--system/perl-uri/APKBUILD2
-rw-r--r--system/perl/APKBUILD6
-rw-r--r--system/psmisc/APKBUILD8
-rw-r--r--system/python3/APKBUILD2
-rw-r--r--system/rsync/APKBUILD2
-rw-r--r--system/s6-linux-init/APKBUILD9
-rw-r--r--system/s6-rc/APKBUILD8
-rw-r--r--system/s6/APKBUILD7
-rw-r--r--system/s6/s6.post-upgrade8
-rw-r--r--system/sed/APKBUILD2
-rw-r--r--system/shimmy/APKBUILD2
-rw-r--r--system/skalibs/APKBUILD4
-rw-r--r--system/sudo/APKBUILD8
-rw-r--r--system/sudo/CVE-2021-3156.patch165
-rw-r--r--system/sysvinit/APKBUILD7
-rw-r--r--system/sysvinit/s6-svscanboot2
-rw-r--r--system/utmps/APKBUILD11
-rw-r--r--system/uucp/APKBUILD4
-rw-r--r--system/vim/APKBUILD4
-rw-r--r--user/alpine/APKBUILD4
-rw-r--r--user/apache-httpd/APKBUILD4
-rw-r--r--user/apkvitrine/APKBUILD22
-rw-r--r--user/aspell-dict-af/APKBUILD4
-rw-r--r--user/aspell-dict-am/APKBUILD4
-rw-r--r--user/aspell-dict-ar/APKBUILD4
-rw-r--r--user/aspell-dict-ast/APKBUILD4
-rw-r--r--user/aspell-dict-az/APKBUILD4
-rw-r--r--user/aspell-dict-be/APKBUILD4
-rw-r--r--user/aspell-dict-bg/APKBUILD4
-rw-r--r--user/aspell-dict-bn/APKBUILD4
-rw-r--r--user/aspell-dict-br/APKBUILD4
-rw-r--r--user/aspell-dict-ca/APKBUILD4
-rw-r--r--user/aspell-dict-cs/APKBUILD4
-rw-r--r--user/aspell-dict-csb/APKBUILD4
-rw-r--r--user/aspell-dict-cy/APKBUILD4
-rw-r--r--user/aspell-dict-da/APKBUILD4
-rw-r--r--user/aspell-dict-de-alt/APKBUILD4
-rw-r--r--user/aspell-dict-de/APKBUILD4
-rw-r--r--user/aspell-dict-el/APKBUILD4
-rw-r--r--user/aspell-dict-en/APKBUILD4
-rw-r--r--user/aspell-dict-eo/APKBUILD4
-rw-r--r--user/aspell-dict-es/APKBUILD4
-rw-r--r--user/aspell-dict-et/APKBUILD4
-rw-r--r--user/aspell-dict-fa/APKBUILD4
-rw-r--r--user/aspell-dict-fi/APKBUILD4
-rw-r--r--user/aspell-dict-fo/APKBUILD4
-rw-r--r--user/aspell-dict-fr/APKBUILD4
-rw-r--r--user/aspell-dict-fy/APKBUILD4
-rw-r--r--user/aspell-dict-ga/APKBUILD4
-rw-r--r--user/aspell-dict-gd/APKBUILD4
-rw-r--r--user/aspell-dict-gl/APKBUILD4
-rw-r--r--user/aspell-dict-grc/APKBUILD4
-rw-r--r--user/aspell-dict-gu/APKBUILD4
-rw-r--r--user/aspell-dict-gv/APKBUILD4
-rw-r--r--user/aspell-dict-he/APKBUILD4
-rw-r--r--user/aspell-dict-hi/APKBUILD4
-rw-r--r--user/aspell-dict-hil/APKBUILD4
-rw-r--r--user/aspell-dict-hr/APKBUILD4
-rw-r--r--user/aspell-dict-hsb/APKBUILD4
-rw-r--r--user/aspell-dict-hu/APKBUILD4
-rw-r--r--user/aspell-dict-hus/APKBUILD4
-rw-r--r--user/aspell-dict-hy/APKBUILD4
-rw-r--r--user/aspell-dict-ia/APKBUILD4
-rw-r--r--user/aspell-dict-id/APKBUILD4
-rw-r--r--user/aspell-dict-is/APKBUILD4
-rw-r--r--user/aspell-dict-it/APKBUILD4
-rw-r--r--user/aspell-dict-kn/APKBUILD4
-rw-r--r--user/aspell-dict-ku/APKBUILD4
-rw-r--r--user/aspell-dict-ky/APKBUILD4
-rw-r--r--user/aspell-dict-la/APKBUILD4
-rw-r--r--user/aspell-dict-lt/APKBUILD4
-rw-r--r--user/aspell-dict-lv/APKBUILD4
-rw-r--r--user/aspell-dict-mg/APKBUILD4
-rw-r--r--user/aspell-dict-mi/APKBUILD4
-rw-r--r--user/aspell-dict-mk/APKBUILD4
-rw-r--r--user/aspell-dict-ml/APKBUILD4
-rw-r--r--user/aspell-dict-mn/APKBUILD4
-rw-r--r--user/aspell-dict-mr/APKBUILD4
-rw-r--r--user/aspell-dict-ms/APKBUILD4
-rw-r--r--user/aspell-dict-mt/APKBUILD4
-rw-r--r--user/aspell-dict-nb/APKBUILD4
-rw-r--r--user/aspell-dict-nds/APKBUILD4
-rw-r--r--user/aspell-dict-nl/APKBUILD4
-rw-r--r--user/aspell-dict-nn/APKBUILD4
-rw-r--r--user/aspell-dict-ny/APKBUILD4
-rw-r--r--user/aspell-dict-or/APKBUILD4
-rw-r--r--user/aspell-dict-pa/APKBUILD4
-rw-r--r--user/aspell-dict-pl/APKBUILD4
-rw-r--r--user/aspell-dict-pt_BR/APKBUILD4
-rw-r--r--user/aspell-dict-pt_PT/APKBUILD4
-rw-r--r--user/aspell-dict-qu/APKBUILD4
-rw-r--r--user/aspell-dict-ro/APKBUILD4
-rw-r--r--user/aspell-dict-ru/APKBUILD4
-rw-r--r--user/aspell-dict-rw/APKBUILD4
-rw-r--r--user/aspell-dict-sc/APKBUILD4
-rw-r--r--user/aspell-dict-sk/APKBUILD4
-rw-r--r--user/aspell-dict-sl/APKBUILD4
-rw-r--r--user/aspell-dict-sr/APKBUILD4
-rw-r--r--user/aspell-dict-sv/APKBUILD4
-rw-r--r--user/aspell-dict-sw/APKBUILD4
-rw-r--r--user/aspell-dict-ta/APKBUILD4
-rw-r--r--user/aspell-dict-te/APKBUILD4
-rw-r--r--user/aspell-dict-tet/APKBUILD4
-rw-r--r--user/aspell-dict-tk/APKBUILD4
-rw-r--r--user/aspell-dict-tl/APKBUILD4
-rw-r--r--user/aspell-dict-tn/APKBUILD4
-rw-r--r--user/aspell-dict-tr/APKBUILD4
-rw-r--r--user/aspell-dict-uk/APKBUILD4
-rw-r--r--user/aspell-dict-uz/APKBUILD4
-rw-r--r--user/aspell-dict-vi/APKBUILD4
-rw-r--r--user/aspell-dict-wa/APKBUILD4
-rw-r--r--user/aspell-dict-yi/APKBUILD4
-rw-r--r--user/aspell-dict-zu/APKBUILD4
-rw-r--r--user/atkmm/APKBUILD4
-rw-r--r--user/atril/APKBUILD4
-rw-r--r--user/ayatana-ido/APKBUILD4
-rw-r--r--user/bash-completion/APKBUILD2
-rw-r--r--user/bcnm/APKBUILD6
-rw-r--r--user/bitlbee/APKBUILD4
-rw-r--r--user/cairomm/APKBUILD4
-rw-r--r--user/caja-dropbox/APKBUILD4
-rw-r--r--user/caja-extensions/APKBUILD4
-rw-r--r--user/caja/APKBUILD4
-rw-r--r--user/catfish/APKBUILD4
-rw-r--r--user/cloc/APKBUILD4
-rw-r--r--user/clutter/APKBUILD4
-rw-r--r--user/cogl/APKBUILD4
-rw-r--r--user/compton-conf/APKBUILD4
-rw-r--r--user/compton/APKBUILD4
-rw-r--r--user/dconf/APKBUILD4
-rw-r--r--user/dina/APKBUILD4
-rw-r--r--user/dovecot/APKBUILD17
-rw-r--r--user/dovecot/apop.patch40
-rw-r--r--user/dovecot/test-file-cache-enomem.patch20
-rw-r--r--user/dovecot/time64.patch26
-rw-r--r--user/engrampa/APKBUILD4
-rw-r--r--user/eom/APKBUILD4
-rw-r--r--user/exo/APKBUILD4
-rw-r--r--user/featherpad/APKBUILD4
-rw-r--r--user/ffmpegthumbnailer/APKBUILD4
-rw-r--r--user/fish/APKBUILD2
-rw-r--r--user/flite/APKBUILD4
-rw-r--r--user/garcon/APKBUILD4
-rw-r--r--user/gcompat/APKBUILD2
-rw-r--r--user/gleam/APKBUILD4
-rw-r--r--user/glibmm/APKBUILD4
-rw-r--r--user/gtkmm+3.0/APKBUILD4
-rw-r--r--user/gtksourceview-3.0/APKBUILD4
-rw-r--r--user/gucharmap/APKBUILD4
-rw-r--r--user/gvim/APKBUILD2
-rw-r--r--user/hexchat/APKBUILD4
-rw-r--r--user/icewm/APKBUILD4
-rw-r--r--user/ido/APKBUILD4
-rw-r--r--user/irssi/APKBUILD4
-rw-r--r--user/json-glib/APKBUILD4
-rw-r--r--user/keybinder-3.0/APKBUILD4
-rw-r--r--user/libass/APKBUILD4
-rw-r--r--user/libayatana-indicator/APKBUILD4
-rw-r--r--user/libburn/APKBUILD4
-rw-r--r--user/libfakekey/APKBUILD4
-rw-r--r--user/libfm-qt/APKBUILD4
-rw-r--r--user/libglade/APKBUILD4
-rw-r--r--user/libgnome-keyring/APKBUILD4
-rw-r--r--user/libgtop/APKBUILD4
-rw-r--r--user/libindicator/APKBUILD4
-rw-r--r--user/libisofs/APKBUILD4
-rw-r--r--user/liblxqt/APKBUILD4
-rw-r--r--user/libmatekbd/APKBUILD4
-rw-r--r--user/libmatemixer/APKBUILD4
-rw-r--r--user/libmateweather/APKBUILD4
-rw-r--r--user/libmpd/APKBUILD4
-rw-r--r--user/libopenraw/APKBUILD4
-rw-r--r--user/libpeas/APKBUILD4
-rw-r--r--user/libpsl/APKBUILD4
-rw-r--r--user/libqtxdg/APKBUILD4
-rw-r--r--user/libsigc++/APKBUILD4
-rw-r--r--user/libsoup/APKBUILD4
-rw-r--r--user/libstatgrab/APKBUILD4
-rw-r--r--user/libsysstat/APKBUILD4
-rw-r--r--user/libwebp/APKBUILD2
-rw-r--r--user/libwnck/APKBUILD4
-rw-r--r--user/libxfce4ui/APKBUILD4
-rw-r--r--user/libxfce4util/APKBUILD4
-rw-r--r--user/libxklavier/APKBUILD4
-rw-r--r--user/lua-expat/APKBUILD2
-rw-r--r--user/lua-filesystem/APKBUILD2
-rw-r--r--user/lua-socket/APKBUILD2
-rw-r--r--user/luarocks/APKBUILD4
-rw-r--r--user/lximage-qt/APKBUILD4
-rw-r--r--user/lxmenu-data/APKBUILD4
-rw-r--r--user/lxqt-about/APKBUILD4
-rw-r--r--user/lxqt-admin/APKBUILD4
-rw-r--r--user/lxqt-archiver/APKBUILD4
-rw-r--r--user/lxqt-build-tools/APKBUILD4
-rw-r--r--user/lxqt-config/APKBUILD4
-rw-r--r--user/lxqt-desktop/APKBUILD4
-rw-r--r--user/lxqt-globalkeys/APKBUILD4
-rw-r--r--user/lxqt-l10n/APKBUILD4
-rw-r--r--user/lxqt-notificationd/APKBUILD4
-rw-r--r--user/lxqt-openssh-askpass/APKBUILD4
-rw-r--r--user/lxqt-panel/APKBUILD4
-rw-r--r--user/lxqt-policykit/APKBUILD4
-rw-r--r--user/lxqt-powermanagement/APKBUILD4
-rw-r--r--user/lxqt-qtplugin/APKBUILD4
-rw-r--r--user/lxqt-runner/APKBUILD4
-rw-r--r--user/lxqt-session/APKBUILD4
-rw-r--r--user/lxqt-sudo/APKBUILD4
-rw-r--r--user/lxqt-themes/APKBUILD4
-rw-r--r--user/lynx/APKBUILD4
-rw-r--r--user/marco/APKBUILD4
-rw-r--r--user/mate-applets/APKBUILD4
-rw-r--r--user/mate-backgrounds/APKBUILD4
-rw-r--r--user/mate-calc/APKBUILD4
-rw-r--r--user/mate-common/APKBUILD4
-rw-r--r--user/mate-complete/APKBUILD4
-rw-r--r--user/mate-control-center/APKBUILD4
-rw-r--r--user/mate-desktop/APKBUILD4
-rw-r--r--user/mate-icon-theme/APKBUILD4
-rw-r--r--user/mate-indicator-applet/APKBUILD4
-rw-r--r--user/mate-media/APKBUILD4
-rw-r--r--user/mate-menus/APKBUILD4
-rw-r--r--user/mate-netbook/APKBUILD4
-rw-r--r--user/mate-notification-daemon/APKBUILD4
-rw-r--r--user/mate-panel/APKBUILD4
-rw-r--r--user/mate-polkit/APKBUILD4
-rw-r--r--user/mate-power-manager/APKBUILD4
-rw-r--r--user/mate-screensaver/APKBUILD4
-rw-r--r--user/mate-sensors-applet/APKBUILD4
-rw-r--r--user/mate-session-manager/APKBUILD4
-rw-r--r--user/mate-settings-daemon/APKBUILD4
-rw-r--r--user/mate-system-monitor/APKBUILD4
-rw-r--r--user/mate-terminal/APKBUILD4
-rw-r--r--user/mate-user-guide/APKBUILD4
-rw-r--r--user/mate-user-share/APKBUILD4
-rw-r--r--user/mate-utils/APKBUILD4
-rw-r--r--user/mimetic/APKBUILD4
-rw-r--r--user/mksh/APKBUILD10
-rw-r--r--user/mousepad/APKBUILD4
-rw-r--r--user/mozo/APKBUILD4
-rw-r--r--user/mplayer/APKBUILD4
-rw-r--r--user/mpv/APKBUILD4
-rw-r--r--user/muparser/APKBUILD4
-rw-r--r--user/netsurf/APKBUILD4
-rw-r--r--user/nfs-utils/APKBUILD2
-rw-r--r--user/nfs-utils/rpc.statd.initd2
-rw-r--r--user/obconf-qt/APKBUILD4
-rw-r--r--user/openvpn/APKBUILD6
-rw-r--r--user/orage/APKBUILD4
-rw-r--r--user/otf-culmus/APKBUILD4
-rw-r--r--user/otf-exo/APKBUILD4
-rw-r--r--user/otf-office-code-pro/APKBUILD4
-rw-r--r--user/otf-proggy-vector/APKBUILD4
-rw-r--r--user/otf-source-code-pro/APKBUILD4
-rw-r--r--user/otf-source-sans-pro/APKBUILD4
-rw-r--r--user/otf-source-serif-pro/APKBUILD4
-rw-r--r--user/pangomm/APKBUILD4
-rw-r--r--user/parole/APKBUILD4
-rw-r--r--user/pavucontrol-qt/APKBUILD4
-rw-r--r--user/pavucontrol/APKBUILD4
-rw-r--r--user/pcmanfm-qt/APKBUILD4
-rw-r--r--user/pcmanfm/APKBUILD4
-rw-r--r--user/perl-app-licensecheck/APKBUILD2
-rw-r--r--user/perl-b-hooks-op-check/APKBUILD2
-rw-r--r--user/perl-bareword-filehandles/APKBUILD2
-rw-r--r--user/perl-cpan-changes/APKBUILD2
-rw-r--r--user/perl-data-dump/APKBUILD2
-rw-r--r--user/perl-data-section/APKBUILD2
-rw-r--r--user/perl-devel-hide/APKBUILD2
-rw-r--r--user/perl-importer/APKBUILD2
-rw-r--r--user/perl-indirect/APKBUILD2
-rw-r--r--user/perl-multidimensional/APKBUILD2
-rw-r--r--user/perl-net-dbus/APKBUILD2
-rw-r--r--user/perl-net-snmp/APKBUILD2
-rw-r--r--user/perl-number-range/APKBUILD2
-rw-r--r--user/perl-parallel-forkmanager/APKBUILD2
-rw-r--r--user/perl-path-iterator-rule/APKBUILD2
-rw-r--r--user/perl-pod-constants/APKBUILD2
-rw-r--r--user/perl-probe-perl/APKBUILD2
-rw-r--r--user/perl-regexp-common/APKBUILD2
-rw-r--r--user/perl-regexp-pattern-license/APKBUILD2
-rw-r--r--user/perl-regexp-pattern/APKBUILD2
-rw-r--r--user/perl-software-license/APKBUILD2
-rw-r--r--user/perl-sort-key/APKBUILD2
-rw-r--r--user/perl-strictures/APKBUILD2
-rw-r--r--user/perl-string-copyright/APKBUILD2
-rw-r--r--user/perl-string-escape/APKBUILD2
-rw-r--r--user/perl-sub-info/APKBUILD2
-rw-r--r--user/perl-term-size-any/APKBUILD2
-rw-r--r--user/perl-term-size-perl/APKBUILD2
-rw-r--r--user/perl-term-table/APKBUILD2
-rw-r--r--user/perl-test-command/APKBUILD2
-rw-r--r--user/perl-test-failwarnings/APKBUILD2
-rw-r--r--user/perl-test-filename/APKBUILD2
-rw-r--r--user/perl-test-more-utf8/APKBUILD2
-rw-r--r--user/perl-test-script/APKBUILD2
-rw-r--r--user/perl-test2-suite/APKBUILD2
-rw-r--r--user/perl-text-template/APKBUILD2
-rw-r--r--user/perl-xml-namespacesupport/APKBUILD2
-rw-r--r--user/perl-xml-simple/APKBUILD2
-rw-r--r--user/pluma/APKBUILD4
-rw-r--r--user/prosody/APKBUILD2
-rw-r--r--user/protobuf/APKBUILD2
-rw-r--r--user/py3-apkkit/APKBUILD25
-rw-r--r--user/py3-distutils-extra/APKBUILD4
-rw-r--r--user/py3-flup/APKBUILD24
-rw-r--r--user/py3-pexpect/APKBUILD4
-rw-r--r--user/py3-ptyprocess/APKBUILD4
-rw-r--r--user/py3-pycairo/APKBUILD4
-rw-r--r--user/py3-pygobject/APKBUILD4
-rw-r--r--user/qps/APKBUILD4
-rw-r--r--user/qt5-qtwayland/APKBUILD1
-rw-r--r--user/qt5ct/APKBUILD4
-rw-r--r--user/qterminal/APKBUILD4
-rw-r--r--user/qtermwidget/APKBUILD4
-rw-r--r--user/qtkeychain/APKBUILD4
-rw-r--r--user/ristretto/APKBUILD4
-rw-r--r--user/rofi/APKBUILD4
-rw-r--r--user/rpcbind/APKBUILD2
-rw-r--r--user/rubberband/APKBUILD4
-rw-r--r--user/s6-dns/APKBUILD6
-rw-r--r--user/s6-linux-utils/APKBUILD6
-rw-r--r--user/s6-networking/APKBUILD6
-rw-r--r--user/s6-portable-utils/APKBUILD6
-rw-r--r--user/samurai/APKBUILD4
-rw-r--r--user/screengrab/APKBUILD4
-rw-r--r--user/socat/APKBUILD4
-rw-r--r--user/spectrwm/APKBUILD4
-rw-r--r--user/tellico/APKBUILD6
-rw-r--r--user/tellico/modern-taglib.patch13
-rw-r--r--user/tf/APKBUILD4
-rw-r--r--user/thunar-volman/APKBUILD4
-rw-r--r--user/thunar/APKBUILD4
-rw-r--r--user/trojita/APKBUILD4
-rw-r--r--user/ttf-sudo/APKBUILD4
-rw-r--r--user/ttf-terminus/APKBUILD4
-rw-r--r--user/tumbler/APKBUILD4
-rw-r--r--user/uchardet/APKBUILD4
-rw-r--r--user/unicode-data/APKBUILD4
-rw-r--r--user/uptimed/APKBUILD2
-rw-r--r--user/vala/APKBUILD4
-rw-r--r--user/vamp-sdk/APKBUILD4
-rw-r--r--user/vte/APKBUILD4
-rw-r--r--user/weechat/APKBUILD2
-rw-r--r--user/wireguard-module/APKBUILD7
-rw-r--r--user/wireguard-tools/APKBUILD4
-rw-r--r--user/xdg-user-dirs/APKBUILD4
-rw-r--r--user/xfburn/APKBUILD4
-rw-r--r--user/xfce-desktop/APKBUILD4
-rw-r--r--user/xfce-plugins/APKBUILD4
-rw-r--r--user/xfce4-appfinder/APKBUILD4
-rw-r--r--user/xfce4-battery-plugin/APKBUILD4
-rw-r--r--user/xfce4-clipman-plugin/APKBUILD4
-rw-r--r--user/xfce4-cpugraph-plugin/APKBUILD4
-rw-r--r--user/xfce4-dict/APKBUILD4
-rw-r--r--user/xfce4-diskperf-plugin/APKBUILD4
-rw-r--r--user/xfce4-indicator-plugin/APKBUILD4
-rw-r--r--user/xfce4-netload-plugin/APKBUILD4
-rw-r--r--user/xfce4-notifyd/APKBUILD4
-rw-r--r--user/xfce4-panel-profiles/APKBUILD4
-rw-r--r--user/xfce4-panel/APKBUILD4
-rw-r--r--user/xfce4-power-manager/APKBUILD4
-rw-r--r--user/xfce4-pulseaudio-plugin/APKBUILD4
-rw-r--r--user/xfce4-screenshooter/APKBUILD4
-rw-r--r--user/xfce4-sensors-plugin/APKBUILD4
-rw-r--r--user/xfce4-session/APKBUILD4
-rw-r--r--user/xfce4-settings/APKBUILD4
-rw-r--r--user/xfce4-systemload-plugin/APKBUILD4
-rw-r--r--user/xfce4-taskmanager/APKBUILD4
-rw-r--r--user/xfce4-terminal/APKBUILD4
-rw-r--r--user/xfce4-time-out-plugin/APKBUILD4
-rw-r--r--user/xfce4-timer-plugin/APKBUILD4
-rw-r--r--user/xfce4-verve-plugin/APKBUILD4
-rw-r--r--user/xfce4-volumed-pulse/APKBUILD4
-rw-r--r--user/xfce4-whiskermenu-plugin/APKBUILD4
-rw-r--r--user/xfconf/APKBUILD4
-rw-r--r--user/xfdashboard/APKBUILD4
-rw-r--r--user/xfdesktop/APKBUILD4
-rw-r--r--user/xfmpc/APKBUILD4
-rw-r--r--user/xfwm4/APKBUILD4
-rw-r--r--user/xorg-gtest/APKBUILD4
-rw-r--r--user/xscreensaver/APKBUILD4
-rw-r--r--user/xterm/APKBUILD4
-rw-r--r--user/yubico-c/APKBUILD4
-rw-r--r--user/yubikey-personalization/APKBUILD4
-rw-r--r--user/zenity/APKBUILD4
419 files changed, 1334 insertions, 920 deletions
diff --git a/.mailmap b/.mailmap
index 2661c87e6..f21e40ed8 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,3 +1,7 @@
A. Wilcox <AWilcox@Wilcox-Tech.com>
Horst G. Burkhardt <mc@680x0.com>
Mira Ressel <aranea@aixah.de>
+Sheila Aman <sheila@vulpine.house> Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+Sheila Aman <sheila@vulpine.house> Kiyoshi Aman <adelie@aerdan.vulpine.house>
+Sheila Aman <sheila@vulpine.house> Kiyoshi Aman <kiyoshi.aman+apkfission@gmail.com>
+Sheila Aman <sheila@vulpine.house> Kiyoshi Aman <kiyoshi.aman@gmail.com>
diff --git a/experimental/zfs-utils/APKBUILD b/experimental/zfs-utils/APKBUILD
index dc985302e..71213e3d6 100644
--- a/experimental/zfs-utils/APKBUILD
+++ b/experimental/zfs-utils/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
# keep these in sync with kernel version
_kflavour=""
_kver="5.4.5-mc0"
diff --git a/experimental/zfs/APKBUILD b/experimental/zfs/APKBUILD
index 31991c44d..db467f0c5 100644
--- a/experimental/zfs/APKBUILD
+++ b/experimental/zfs/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
# keep these in sync with kernel version
_kflavour=""
_kver="5.4.5-mc0"
diff --git a/legacy/which/APKBUILD b/legacy/which/APKBUILD
index f8360b7b7..c150c3f1c 100644
--- a/legacy/which/APKBUILD
+++ b/legacy/which/APKBUILD
@@ -1,5 +1,5 @@
# Contributor: Stuart Cardall <developer@it-offshore.co.uk>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=which
pkgver=2.21
pkgrel=2
diff --git a/system/abuild/APKBUILD b/system/abuild/APKBUILD
index 1ec934da1..f3c5bef69 100644
--- a/system/abuild/APKBUILD
+++ b/system/abuild/APKBUILD
@@ -3,7 +3,7 @@ pkgname=abuild
pkgver=3.4.2
pkgrel=0
pkgdesc="Script to build APK packages"
-url="https://code.foxkit.us/adelie/abuild"
+url="https://git.adelielinux.org/adelie/abuild"
arch="all"
options="suid !check"
license="GPL-2.0-only"
diff --git a/system/apk-tools/APKBUILD b/system/apk-tools/APKBUILD
index cbbf3ceaf..d664340e0 100644
--- a/system/apk-tools/APKBUILD
+++ b/system/apk-tools/APKBUILD
@@ -1,28 +1,32 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Adelie Platform Group <adelie-devel@lists.adelielinux.org>
pkgname=apk-tools
-pkgver=2.10.5
+pkgver=2.12.0
pkgrel=0
pkgdesc="Alpine Package Keeper - package manager"
-url="https://git.alpinelinux.org/cgit/apk-tools/"
+url="https://git.adelielinux.org/adelie/apk-tools"
arch="all"
license="GPL-2.0-only"
depends="ca-certificates"
makedepends_build=""
makedepends_host="zlib-dev openssl openssl-dev linux-headers"
makedepends="$makedepends_build $makedepends_host"
-subpackages="$pkgname-static"
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz
- dash.patch
- pmmx.patch
+subpackages="$pkgname-dev $pkgname-static $pkgname-doc"
+source="https://dev.sick.bike/dist/$pkgname-v$pkgver+adelie.tar.gz
+ https://dev.sick.bike/dist/$pkgname-help-v$pkgver.tar.gz
+ apk.zsh-completion
+ s6-linux-init.patch
"
+builddir="$srcdir/$pkgname-v$pkgver"
prepare() {
default_prepare
sed -i -e 's:-Werror::' Make.rules
- echo "FULL_VERSION=$pkgver-r$pkgrel" > config.mk
- echo "LUAAPK=" >> config.mk
- echo "export LUAAPK" >> config.mk
+ cat >config.mk <<-EOF
+ FULL_VERSION=$pkgver-r$pkgrel
+ LUA=no
+ export LUA
+ EOF
}
build() {
@@ -40,13 +44,16 @@ package() {
"$pkgdir"/var/cache/misc \
"$pkgdir"/etc/apk/keys \
"$pkgdir"/etc/apk/protected_paths.d
- # the shipped README is empty
- rm -r "$pkgdir"/usr/share/
+ # the shipped README is not useful
+ rm -r "$pkgdir"/usr/share/doc
+
+ install -Dm644 "$srcdir"/apk.zsh-completion \
+ "$pkgdir"/usr/share/zsh/site-functions/_apk
}
static() {
pkgdesc="Alpine Package Keeper - static binary"
- install -Dm755 "$srcdir"/$pkgname-$pkgver/src/apk.static \
+ install -Dm755 "$builddir"/src/apk.static \
"$subpkgdir"/sbin/apk.static
# Sign the static binary so it can be vefified from distros
@@ -64,6 +71,7 @@ static() {
"$subpkgdir"/sbin/apk.static
}
-sha512sums="0f85ec7c734f2ffc671007fa029f3c96eacfb196c45e465e33aa65c32a6fbcd7523153b6441fdf826a5b4d2e66de02d338620474d333c28cb1ce0233f1120495 apk-tools-2.10.5.tar.xz
-5892ad7038c942e82b011a64484253a157711ad65cb754b884c2b9b6047dd4693b530b6639f6d8c35aa21f9c293ee01a3f36ead1d148f77a2012053766f75ee2 dash.patch
-edff13f21debc227c7448f0ac42744b2655f8f23ea23aefa04db7d2c44e8a91f77227e84ef090e65364f6999b6ee1138c98490530cb6b9b0594b7cfeeef25b61 pmmx.patch"
+sha512sums="739cbf487a9184aba56c87448d18acebf357b6eddb4852033cc0cd331fc910d425a5d01f7b0bf109f5cd62f78f10cca96ebcbdb4fa00d197edb90726998e1523 apk-tools-v2.12.0+adelie.tar.gz
+b8e6e6e9efe2fc3a900e5fea54ed2f047bbf8917c8c3e470e001865c2169167ce6a273869ba577aceb1a1580b7dd684de115a4d92250786958fa13b9e8abf28b apk-tools-help-v2.12.0.tar.gz
+cedda9bf11e0a516c9bf0fd1a239ffa345cdd236419cbd8b10273410610ae7d0f0f61fd36e1e9ccc3bbf32f895508cdca4fb57a0e04f78dd88469b33bf64a32a apk.zsh-completion
+f92e2e0c062b71e1e5cf95f0d4997166ccc7f7a5e45af8d1650f5951a1d552d89217c8c60d24f31fa626e8e0675c5e882e6b36ef1af8f7624e54627b22801381 s6-linux-init.patch"
diff --git a/system/apk-tools/apk.zsh-completion b/system/apk-tools/apk.zsh-completion
new file mode 100644
index 000000000..955d504be
--- /dev/null
+++ b/system/apk-tools/apk.zsh-completion
@@ -0,0 +1,240 @@
+#compdef apk
+
+function _apk {
+
+ local -a global_opts=(
+ "(-h --help)"{-h,--help}"[Print help information]"
+ "(-i --interactive)"{-i,--interactive}"[Ask confirmation before performing certain operations]"
+ "(-p --root)"{-p,--root}"[Manage file system at ROOT]"
+ "(-q --quiet)"{-q,--quiet}"[Print less information]"
+ "(-U --update-cache)"{-U,--update-cache}"[Alias for '--cache-max-age 1']"
+ "(-v --verbose)"{-v,--verbose}"[Print more information]"
+ "(-V --version)"{-V,--version}"[Print program version and exit]"
+ "(-X --repository)"{-X,--repository}"[Specify additional package repository]:repository:_host"
+ "--allow-untrusted[Install packages with untrusted signature or no signature]"
+ "--arch[Temporarily override architecture]:arch:(armhf mips64 s390x x86_64 x86 aarch64 ppc64le armv7)"
+ "--cache-dir[Temporarily override the cache directory]:directory:_dir_list"
+ "--cache-max-age[Maximum age for index in cache before it's refreshed]:minutes"
+ "--force-binary-stdout[Continue even if binary data will be printed to the terminal]"
+ "--force-broken-world[Continue even if world cannot be satisfied]"
+ "--force-non-repository[Continue even if packages may be lost on reboot]"
+ "--force-old-apk[Continue even if packages use unsupported features]"
+ "--force-overwrite[Overwrite files in other packages]"
+ "--force-refresh[Do not use cached files]"
+ "--keys-dir[Override directory of trusted keys]:directory:_dir_list"
+ "--no-cache[Do not use any local cache path]"
+ "--no-network[Do not use the network]"
+ "--no-progress[Disable progress bar even for TTYs]"
+ "--print-arch[Print default arch and exit]"
+ "--progress[Show progress]"
+ "--progress-fd[Write progress to the specified file descriptor]:file descriptor"
+ "--purge[Delete modified configuration files or uninstalled packages from cache]"
+ "--repositories-file[Override system repositories]:repository file:_files"
+ "--wait[Wait to get an exclusive repository lock before failing]:seconds"
+ )
+
+ local -a commit_opts=(
+ "(-s --simulate)"{-s,--simulate}"[Simulate the requested operation without making any changes]"
+ "--clean-protected[Do not create .apk-new files in configuration directories]"
+ "--overlay-from-stdin[Read list of overlay files from stdin]"
+ "--no-scripts[Do not execute any scripts]"
+ "--no-commit-hooks[Skip pre/post hook scripts]"
+ "--initramfs-diskless-boot[Enables selected force options, disables commit hooks and more]"
+ )
+
+ local -a latest_opt=("(-l --latest)"{-l,--latest}"[Always choose the latest package by version]")
+ local -a upgrade_opt=("(-u --upgrade)"{-u,--upgrade}"[Upgrade packages and it's dependencies]")
+
+ local context state state_descr line
+ typeset -A opt_args
+ local curcontext="$curcontext"
+ local ret=1
+
+ function _ccache_apk_world { [[ "$1" -ot /etc/apk/world ]] }
+ function _ccache_apk_avail {
+ for i in /etc/apk/cache/APKINDEX.*; do
+ [[ "$1" -ot "$i" ]] && return
+ done
+ }
+
+ function _apk_available_pkgs {
+ local -a _apk_available_packs
+ zstyle ":completion:${curcontext}:" cache-policy _ccache_apk_avail
+ local IFS=$'\n'
+ if _cache_invalid apk_index_packages_available || ! _retrieve_cache apk_index_packages_available; then
+ _apk_available_packs=(${$(/sbin/apk list -a 2>/dev/null)%-[[:digit:][:lower:]._]##-r[[:digit:]]## * \{*\} (*)})
+ _store_cache apk_index_packages_available _apk_available_packs
+ fi
+ _describe 'available packages' _apk_available_packs
+ }
+
+ function _apk_installed_pkgs {
+ local -a _apk_installed_packs
+ zstyle ":completion:${curcontext}:" cache-policy _ccache_apk_world
+ local IFS=$'\n'
+ if _cache_invalid apk_index_packages_installed || ! _retrieve_cache apk_index_packages_installed; then
+ _apk_installed_packs=(${$(/sbin/apk list -I 2>/dev/null)%-[[:digit:][:lower:]._]##-r[[:digit:]]## * \{*\} (*)})
+ _store_cache apk_index_packages_installed _apk_installed_packs
+ fi
+ _describe 'installed packages' _apk_installed_packs
+ }
+
+ function _apk_packages {
+ _alternative 'repo:available packages:_apk_available_pkgs' 'localpkgs:local packages:_files -g "*.apk"'
+ }
+
+ function _apk_cache {
+ local -a cache_subcmds=(
+ "clean:Remove package files which are no longer necessary"
+ "download:Fetch package files from the repositories and store them in the cache"
+ "sync:Clean and Download"
+ )
+ _describe 'subcommand' cache_subcmds
+ }
+
+ function _apk_subcmds {
+ local -a cmds=(
+ "add:Add packages to world and commit changes"
+ "del:Remove packages from world and commit changes"
+ "fix:Fix, reinstall or upgrade packages without modifying world"
+ "update:Update repository indexes"
+ "upgrade:Install upgrades available from repositories"
+ "cache:Manage the local package cache"
+ "info:Give detailed information about packages or repositories"
+ "list:List packages matching a pattern or other criteria"
+ "dot:Render dependencies as graphviz graphs"
+ "policy:Show repository policy for packages"
+ "index:Create repository index file from packages"
+ "fetch:Download packages from global repositories to a local directory"
+ "manifest:Show checksums of package contents"
+ "verify:Verify package integrity and signature"
+ "audit:Audit system for changes"
+ "stats:Show statistics about repositories and installations"
+ "version:Compare package versions or perform tests on version strings"
+ )
+ _describe 'subcommand' cmds
+ }
+
+ local -a completion_spec=($global_opts ':subcommand:_apk_subcmds')
+
+ case ${${words:#-*}[2]} in
+ (add)
+ completion_spec+=(
+ $commit_opts \
+ $latest_opt \
+ $upgrade_opt \
+ "--initdb[Initialize a new package database]" \
+ "(-t --virtual)"{-t,--virtual}"[Create virtual package with given dependencies]" \
+ "*:package:_apk_packages"
+ )
+ ;;
+ (del)
+ completion_spec+=(
+ $commit_opts \
+ "--rdepeds[Recursively delete all top-level reverse dependencies]" \
+ "*:installed package:_apk_installed_pkgs"
+ )
+ ;;
+ (fix)
+ completion_spec+=(
+ $commit_opts \
+ "(-d --depends)"{-d,--depends}"[Fix dependencies of specified packages]" \
+ "(-r --reinstall)"{-r,--reinstall}"[Reinstall packages]" \
+ "(-u --upgrade)"{-u,--upgrade}"[Upgrade if an upgrade is available and does not break dependencies]" \
+ "(-x --xattr)"{-x,--xattr}"[Fix packages with broken xattrs]" \
+ "--directory-permissions[Reset all directory permissions]" \
+ "*:package:_apk_packages"
+ )
+ ;;
+ (update) completion_spec+=($commit_opts);;
+ (upgrade)
+ completion_spec+=(
+ $commit_opts \
+ $latest_opt \
+ "(-a --available)"{-a,--available}"[Reset all packages to versions available from current repositories]" \
+ "--ignore[Upgrade all other packages than the ones listed]" \
+ "--no-self-upgrade[Do not do an early upgrade of the 'apk-tools' package]" \
+ "--prune[Remove packages which are no longer available from any configured repository]" \
+ "--self-upgrade-only[Only perform a self-upgrade of the 'apk-tools' package]" \
+ "*:package:_apk_packages"
+ )
+ ;;
+ (cache)
+ completion_spec+=(
+ $latest_opt \
+ $upgrade_opt \
+ '2:subcommand:_apk_cache'
+ )
+ ;;
+ (info)
+ completion_spec+=(
+ "(-a --all)"{-a,--all}"[List all information known about the package]" \
+ "(-d --description)"{-d,--descripton}"[Print the package description]" \
+ "(-e --installed)"{-e,--installed}"[Check package installed status]" \
+ "(-L --contents)"{-L,--contents}"[List files included in the package]" \
+ "(-i --install-if)"{-i,--install-if}"[List the package's install_if rule]" \
+ "(-I --rinstall-if)"{-I,--rinstall-if}"[List other packages whose install_if rules refer to this package]" \
+ "(-r --rdepends)"{-r,--rdepends}"[List reverse dependencies of the package]" \
+ "(-R --depends)"{-R,--depends}"[List the dependencies of the package]" \
+ "(-s --size)"{-s,--size}"[Print the package's installed size]" \
+ "(-w --webpage)"{-w,--webpage}"[Print the URL for the package's upstream webpage]" \
+ "(-W --who-owns)"{-W,--who-owns}"[Print the package which owns the specified file]:file:_files" \
+ "--license[Print the package SPDX license identifier]" \
+ "--replaces[List the other packages for which this package is marked as a replacement]" \
+ "--triggers[Print active triggers for the package]" \
+ "*:package:_apk_packages"
+ )
+ ;;
+ (list)
+ completion_spec+=(
+ "(-I --installed)"{-I,--installed}"[Consider only installed packages]" \
+ "(-O --orphaned)"{-O,--orphaned}"[Consider only orphaned packages]" \
+ "(-a --available)"{-a,--available}"[Consider only available packages]" \
+ "(-u --upgradeable)"{-u,--upgradeable}"[Consider only upgradable packages]" \
+ "(-o --origin)"{-o,--origin}"[List packages by origin]" \
+ "(-d --depends)"{-d,--depends}"[List packages by dependency]" \
+ "(-P --providers)"{-P,--providers}"[List packages by provider]" \
+ "*:pattern"
+ )
+ ;;
+ (dot)
+ completion_spec+=(
+ "--errors[Consider only packages with errors]" \
+ "--installed[Consider only installed packages]"
+ )
+ ;;
+ (index)
+ completion_spec+=(
+ "(-d --description)"{-d,--description}"[Add a description to the index]:description" \
+ "(-o --output)"{-o,--output}"[Output generated index to file]:output:_files" \
+ "(-x --index)"{-x,--index}"[Read an existing index to speed up the creation of the new index]" \
+ "--no-warnings[Disable warnings about missing dependencies]" \
+ "*:package:_apk_packages"
+ )
+ ;;
+ (fetch)
+ completion_spec+=(
+ "(-l --link)"{-l,--link}"[Create hard links if possible]" \
+ "(-o --output)"{-o,--output}"[Where to write the downloaded files]:directory:_dir_list" \
+ "(-r --recursive)"{-r,--recursive}"[Fetch packages and all of their dependencies]" \
+ "(-s --stdout)"{-s,--stdout}"[Dump the .apk file(s) to stdout]" \
+ "--simulate[Simulate the requested operation without making any changes]" \
+ "*:package:_apk_packages"
+ )
+ ;;
+ (manifest) completion_spec+=("*:package:_apk_packages");;
+ (verify) completion_spec+=("*:package:_apk_packages");;
+ (audit) completion_spec+=("*:files:_files");;
+ (version)
+ completion_spec+=(
+ "-a[Consider packages from all repository tags]" \
+ "-l[Limit to packages with output matching given operand]:operand" \
+ "*:package:_apk_packages"
+ )
+ ;;
+ (policy) completion_spec+=("*:package:_apk_packages");;
+ esac
+
+ _arguments -C -s $completion_spec && ret=0
+ return ret
+}
diff --git a/system/apk-tools/dash.patch b/system/apk-tools/dash.patch
deleted file mode 100644
index 5847d87df..000000000
--- a/system/apk-tools/dash.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- apk-tools-2.10.4/test/solver.sh
-+++ apk-tools-2.10.4/test/solver.sh
-@@ -10,9 +10,9 @@ TEST_TO_RUN="$@"
- fail=0
- pass=0
- for test in ${TEST_TO_RUN:-*.test}; do
-- get_block ARGS < $test | xargs $APK_TEST &> .$test.got
-+ get_block ARGS < $test | xargs $APK_TEST > .$test.got 2>&1
-
-- if ! get_block EXPECT < $test | cmp .$test.got &> /dev/null; then
-+ if ! get_block EXPECT < $test | cmp .$test.got > /dev/null 2>&1; then
- fail=$((fail+1))
- echo "FAIL: $test"
- get_block EXPECT < $test | diff -ru - .$test.got
diff --git a/system/apk-tools/pmmx.patch b/system/apk-tools/pmmx.patch
deleted file mode 100644
index 4891e5ddd..000000000
--- a/system/apk-tools/pmmx.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- apk-tools-2.10.1/src/apk_defines.h.old 2018-09-10 08:04:03.000000000 +0000
-+++ apk-tools-2.10.1/src/apk_defines.h 2019-01-04 03:31:41.900000000 +0000
-@@ -93,7 +93,7 @@
- #if defined(__x86_64__)
- #define APK_DEFAULT_ARCH "x86_64"
- #elif defined(__i386__)
--#define APK_DEFAULT_ARCH "x86"
-+#define APK_DEFAULT_ARCH "pmmx"
- #elif defined(__powerpc__) && !defined(__powerpc64__)
- #define APK_DEFAULT_ARCH "ppc"
- #elif defined(__powerpc64__) && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
diff --git a/system/apk-tools/s6-linux-init.patch b/system/apk-tools/s6-linux-init.patch
new file mode 100644
index 000000000..2dc3db924
--- /dev/null
+++ b/system/apk-tools/s6-linux-init.patch
@@ -0,0 +1,11 @@
+The s6-linux-init-common package has a FIFO which breaks with this.
+--- apk-tools-v2.12.0/src/database.c.old 2020-12-30 02:39:04.000000000 +0000
++++ apk-tools-v2.12.0/src/database.c 2021-01-27 01:47:04.680712750 +0000
+@@ -2592,7 +2592,6 @@
+ apk_warning(PKG_VER_FMT": support for packages without embedded "
+ "checksums will be dropped in apk-tools 3.",
+ PKG_VER_PRINTF(pkg));
+- ipkg->broken_files = 1;
+ ctx->missing_checksum = 1;
+ }
+ break;
diff --git a/system/cxref/APKBUILD b/system/cxref/APKBUILD
index f1bc75fb4..c9d05c608 100644
--- a/system/cxref/APKBUILD
+++ b/system/cxref/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=cxref
pkgver=1.6e
pkgrel=0
diff --git a/system/dash/APKBUILD b/system/dash/APKBUILD
index acf091602..f2f096ffd 100644
--- a/system/dash/APKBUILD
+++ b/system/dash/APKBUILD
@@ -1,5 +1,5 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=dash
pkgver=0.5.11.2
pkgrel=0
diff --git a/system/execline/APKBUILD b/system/execline/APKBUILD
index 9565e76d5..a0fcc2a88 100644
--- a/system/execline/APKBUILD
+++ b/system/execline/APKBUILD
@@ -1,14 +1,14 @@
# Contributor: Laurent Bercot <ska-adelie@skarnet.org>
# Maintainer: Laurent Bercot <ska-adelie@skarnet.org>
pkgname=execline
-pkgver=2.6.1.0
+pkgver=2.8.0.0
pkgrel=0
pkgdesc="A small scripting language for non-interactive scripts"
url="https://skarnet.org/software/$pkgname/"
arch="all"
options="!check" # No test suite.
license="ISC"
-_skalibs_version=2.9.2.1
+_skalibs_version=2.10.0.0
makedepends="skalibs-dev>=$_skalibs_version"
subpackages="$pkgname-libs $pkgname-dev $pkgname-libs-dev:libsdev $pkgname-doc"
source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz"
@@ -61,4 +61,5 @@ doc() {
mkdir -p "$subpkgdir/usr/share/doc"
cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname"
}
-sha512sums="5bddf400f4cddeb8ddf8c80415c426553f14c879feeb4e69d5e21adb517c76a781581e8b4769c8560b56dc6f89f10a8b38fcf296baa6989b86c73bdb2cd6603e execline-2.6.1.0.tar.gz"
+
+sha512sums="9250248ff3753806c05c99d8fd76b17f511413e691fcb2fe0907cbd16b691e17ff260b15f504a8c8bc279cd53360012f345af803fd48b0a27a1009c171a8ddf9 execline-2.8.0.0.tar.gz"
diff --git a/system/file/APKBUILD b/system/file/APKBUILD
index b2968c3ca..8955ca71c 100644
--- a/system/file/APKBUILD
+++ b/system/file/APKBUILD
@@ -1,6 +1,6 @@
# Contributor: Valery Kartel <valery.kartel@gmail.com>
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=file
pkgver=5.39
pkgrel=0
diff --git a/system/libcap-ng/APKBUILD b/system/libcap-ng/APKBUILD
index 507b87368..44479ae49 100644
--- a/system/libcap-ng/APKBUILD
+++ b/system/libcap-ng/APKBUILD
@@ -1,6 +1,6 @@
-# Maintainer:
+# Maintainer: Nathan <ndowens@artixlinux.org>
pkgname=libcap-ng
-pkgver=0.7.10
+pkgver=0.8
pkgrel=0
pkgdesc="POSIX capabilities library"
url="https://people.redhat.com/sgrubb/libcap-ng/index.html"
@@ -12,7 +12,6 @@ makedepends="python3 $depends_dev"
makedepends_host="$depends_dev"
subpackages="$pkgname-dev $pkgname-doc $pkgname-utils"
source="https://people.redhat.com/sgrubb/libcap-ng/libcap-ng-$pkgver.tar.gz
- fix-includes.patch
"
build() {
@@ -42,5 +41,4 @@ utils() {
mv "$pkgdir"/usr/bin/* "$subpkgdir"/usr/bin/
}
-sha512sums="1b93c7f5c20ae5cc705fe5244af3e299454e988388cda95f006e248d97c0713e77da2a81c67ecf15755f3958df373fc6d1ca14197d6357ab1f2d8c3a0fd12def libcap-ng-0.7.10.tar.gz
-8de98ce0fae63812cf7fd17e788343798b0cab63ba029f046ac9b89b2305da17432bafdd3dfa36046fc2cc0a453e0c889f6744c632f4617e0e5fc08e2823e324 fix-includes.patch"
+sha512sums="d410d66f46ad25765f35ffac17e0d36740329c334c6535d55a13fa218718a750763b7ad4610efa47efe7c256c143ead7dde7d37a29e99cb5c55161f577c40bb2 libcap-ng-0.8.tar.gz"
diff --git a/system/libcap-ng/fix-includes.patch b/system/libcap-ng/fix-includes.patch
deleted file mode 100644
index 8fbd984b8..000000000
--- a/system/libcap-ng/fix-includes.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ru libcap-ng-0.7.4.orig/src/cap-ng.c libcap-ng-0.7.4/src/cap-ng.c
---- libcap-ng-0.7.4.orig/src/cap-ng.c 2014-04-24 15:41:43.000000000 -0300
-+++ libcap-ng-0.7.4/src/cap-ng.c 2015-04-15 08:45:10.783335463 -0300
-@@ -34,6 +34,7 @@
- #include <stdarg.h>
- #include <errno.h>
- #include <fcntl.h>
-+#include <endian.h>
- #include <byteswap.h>
- #ifdef HAVE_SYSCALL_H
- #include <sys/syscall.h>
diff --git a/system/mdevd/APKBUILD b/system/mdevd/APKBUILD
index c0c9ac011..36128c5cb 100644
--- a/system/mdevd/APKBUILD
+++ b/system/mdevd/APKBUILD
@@ -1,14 +1,14 @@
# Contributor: Laurent Bercot <ska-adelie@skarnet.org>
# Maintainer: Laurent Bercot <ska-adelie@skarnet.org>
pkgname=mdevd
-pkgver=0.1.1.2
+pkgver=0.1.3.0
pkgrel=0
pkgdesc="A small uevent manager daemon"
url="https://skarnet.org/software/$pkgname/"
arch="all"
options="!check" # No test suite.
license="ISC"
-_skalibs_version=2.9.1.0
+_skalibs_version=2.10.0.0
makedepends="skalibs-dev>=$_skalibs_version"
subpackages="$pkgname-doc $pkgname-openrc"
source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz mdev.conf mdevd.run mdevd.initd"
@@ -47,7 +47,7 @@ openrc() {
ln -s ../../init.d/mdevd "$rldir/mdevd"
}
-sha512sums="7d7a25facde1291854f564e805cc2bf7e7e0b06aaa4b631a640cf999007a3ef063ec68e8973559ec69023f40bb6ed24937d4d8510fd697f34a97345a22ede5b5 mdevd-0.1.1.2.tar.gz
+sha512sums="8f7b922f6ce8b4dad2dd0e395034f068d950501fe166609da31b5fd7110e938e91e537f6c5e5271043cb24864955aff21f708b80aeea83c9502cce280376c17c mdevd-0.1.3.0.tar.gz
b237443837c3d76f8964e2b1a48c2278af7b4a4e7f735da6fc861b7598cbf50017e961e5a4fd1f20dd9cb7dd46f4cdf68144539d909b1f245e110b75c2d849db mdev.conf
31231b28d0b980dda634e8b043a2ee31960493d60c2c9aac8a4f3f68ca1d130342569af2acd0bc04d9d8008b8e234ba949b64d9ec3ff1bded64b4e4f0ce3786b mdevd.run
f6f9eebf49c2de6abde9cfb7a9d7b3a6b3afdd3e01ba4155f1b95dfa27e522363059b69cec19305881773d776ffeccf6c1106d537d01780468bd3b9846edb2cc mdevd.initd"
diff --git a/system/ncurses/APKBUILD b/system/ncurses/APKBUILD
index d2ad46900..e3c114a6d 100644
--- a/system/ncurses/APKBUILD
+++ b/system/ncurses/APKBUILD
@@ -1,4 +1,4 @@
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=ncurses
pkgver=6.2
_ver=${pkgver}-20200212
diff --git a/system/patch/APKBUILD b/system/patch/APKBUILD
index b299382c9..677dec208 100644
--- a/system/patch/APKBUILD
+++ b/system/patch/APKBUILD
@@ -1,4 +1,4 @@
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=patch
pkgver=2.7.6
pkgrel=4
diff --git a/system/pcre2/APKBUILD b/system/pcre2/APKBUILD
index 4120d0a7b..75affce0d 100644
--- a/system/pcre2/APKBUILD
+++ b/system/pcre2/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Jakub Jirutka <jakub@jirutka.cz>
# Maintainer:
pkgname=pcre2
-pkgver=10.33
-pkgrel=1
+pkgver=10.35
+pkgrel=0
pkgdesc="Perl-compatible regular expression library"
url="https://pcre.org"
arch="all"
@@ -13,12 +13,13 @@ makedepends="$depends_dev"
subpackages="$pkgname-dev $pkgname-doc $pkgname-tools
libpcre2-16:_libpcre libpcre2-32:_libpcre"
source="https://ftp.pcre.org/pub/pcre/$pkgname-$pkgver.tar.gz
- CVE-2019-20454.patch
"
# secfixes:
# 10.33-r1:
# - CVE-2019-20454
+# 10.35-r0:
+# - CVE-2019-20454
case "$CARCH" in
s390x) _enable_jit="";;
@@ -68,5 +69,4 @@ tools() {
mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
}
-sha512sums="649983c7725e2fd2451ba89243b4c08c408fc279b7be3b2d225045cced3b0667ff6da4c9dd37510eb9e5aed6478aff54c2dbd1d92f4d0f1174579df9ec2c1882 pcre2-10.33.tar.gz
-07c43ccf130c1ed2b4f97036671f92e9c1d0100fd32c053b448e5dbdf976543c12f74568e37b661db7fbd603e815f5683a59cb2a9f9c307505dca3cb36db8120 CVE-2019-20454.patch"
+sha512sums="f9386de9211919da68ad0882dbfb72b344306280b3c4515f496cff4e3ff5c11e29fb71539a357a43a71ef668a742a54cc327a1dc3a00c767fbd0264933beecee pcre2-10.35.tar.gz"
diff --git a/system/pcre2/CVE-2019-20454.patch b/system/pcre2/CVE-2019-20454.patch
deleted file mode 100644
index bdec87294..000000000
--- a/system/pcre2/CVE-2019-20454.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-Revision: 1091
-Author: ph10
-Date: Mon May 13 16:26:17 2019 UTC
-URL: https://vcs.pcre.org/pcre2?view=revision&revision=1091
-
-Fix crash when \X is used without UTF in JIT.
-
---- a/testdata/testinput4 2019/05/11 11:43:39 1090
-+++ b/testdata/testinput4 2019/05/13 16:26:17 1091
-@@ -2480,4 +2480,7 @@
- /^(?'אABC'...)(?&אABC)/utf
- 123123123456
-
-+/\X*/
-+ \xF3aaa\xE4\xEA\xEB\xFEa
-+
- # End of testinput4
---- a/testdata/testoutput4 2019/05/11 11:43:39 1090
-+++ b/testdata/testoutput4 2019/05/13 16:26:17 1091
-@@ -4012,4 +4012,8 @@
- 0: 123123
- 1: 123
-
-+/\X*/
-+ \xF3aaa\xE4\xEA\xEB\xFEa
-+ 0: \xf3aaa\xe4\xea\xeb\xfea
-+
- # End of testinput4
-
-Revision: 1092
-Author: ph10
-Date: Mon May 13 16:38:18 2019 UTC
-URL: https://vcs.pcre.org/pcre2?view=revision&revision=1092
-
-Forgot this file in previous commit. Fixes JIT non-UTF bug.
-
---- a/src/pcre2_jit_compile.c 2019/05/13 16:26:17 1091
-+++ b/src/pcre2_jit_compile.c 2019/05/13 16:38:18 1092
-@@ -8571,7 +8571,10 @@
- PCRE2_SPTR bptr;
- uint32_t c;
-
--GETCHARINC(c, cc);
-+/* Patch by PH */
-+/* GETCHARINC(c, cc); */
-+
-+c = *cc++;
- #if PCRE2_CODE_UNIT_WIDTH == 32
- if (c >= 0x110000)
- return NULL;
diff --git a/system/perl-encode-eucjpascii/APKBUILD b/system/perl-encode-eucjpascii/APKBUILD
index 02ed7b7e3..2e1a0a5cf 100644
--- a/system/perl-encode-eucjpascii/APKBUILD
+++ b/system/perl-encode-eucjpascii/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-encode-eucjpascii
_pkgreal=Encode-EUCJPASCII
diff --git a/system/perl-encode-hanextra/APKBUILD b/system/perl-encode-hanextra/APKBUILD
index 6d52e5647..5529f338b 100644
--- a/system/perl-encode-hanextra/APKBUILD
+++ b/system/perl-encode-hanextra/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-encode-hanextra
_pkgreal=Encode-HanExtra
diff --git a/system/perl-encode-iso2022/APKBUILD b/system/perl-encode-iso2022/APKBUILD
index b59b3a5cb..9e41c6a16 100644
--- a/system/perl-encode-iso2022/APKBUILD
+++ b/system/perl-encode-iso2022/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-encode-iso2022
_pkgreal=Encode-ISO2022
diff --git a/system/perl-encode-jisx0213/APKBUILD b/system/perl-encode-jisx0213/APKBUILD
index 5a956d1aa..809a06b25 100644
--- a/system/perl-encode-jisx0213/APKBUILD
+++ b/system/perl-encode-jisx0213/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-encode-jisx0213
_pkgreal=Encode-JISX0213
diff --git a/system/perl-http-message/APKBUILD b/system/perl-http-message/APKBUILD
index 839df093e..af9d236cf 100644
--- a/system/perl-http-message/APKBUILD
+++ b/system/perl-http-message/APKBUILD
@@ -1,5 +1,5 @@
# Automatically generated by apkbuild-cpan, template 1
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-http-message
_pkgreal=HTTP-Message
diff --git a/system/perl-json/APKBUILD b/system/perl-json/APKBUILD
index e3ce567bb..7b85dc2ca 100644
--- a/system/perl-json/APKBUILD
+++ b/system/perl-json/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-json
_pkgreal=JSON
diff --git a/system/perl-mime-charset/APKBUILD b/system/perl-mime-charset/APKBUILD
index 4a04e17e9..139766e3a 100644
--- a/system/perl-mime-charset/APKBUILD
+++ b/system/perl-mime-charset/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-mime-charset
_pkgreal=MIME-Charset
diff --git a/system/perl-pod2-base/APKBUILD b/system/perl-pod2-base/APKBUILD
index 05703bcf6..dc9fd74f0 100644
--- a/system/perl-pod2-base/APKBUILD
+++ b/system/perl-pod2-base/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-pod2-base
_pkgreal=POD2-Base
diff --git a/system/perl-sgmls/APKBUILD b/system/perl-sgmls/APKBUILD
index e6ceae295..e64291280 100644
--- a/system/perl-sgmls/APKBUILD
+++ b/system/perl-sgmls/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-sgmls
_pkgreal=SGMLSpm
diff --git a/system/perl-test-fatal/APKBUILD b/system/perl-test-fatal/APKBUILD
index e97893fda..a0b3b1e96 100644
--- a/system/perl-test-fatal/APKBUILD
+++ b/system/perl-test-fatal/APKBUILD
@@ -1,5 +1,5 @@
# Automatically generated by apkbuild-cpan, template 1
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-test-fatal
_pkgreal=Test-Fatal
diff --git a/system/perl-test-needs/APKBUILD b/system/perl-test-needs/APKBUILD
index 0d098b55c..f8d644f76 100644
--- a/system/perl-test-needs/APKBUILD
+++ b/system/perl-test-needs/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-test-needs
_pkgreal=Test-Needs
diff --git a/system/perl-try-tiny/APKBUILD b/system/perl-try-tiny/APKBUILD
index 4078a2f5e..14efc46ce 100644
--- a/system/perl-try-tiny/APKBUILD
+++ b/system/perl-try-tiny/APKBUILD
@@ -1,5 +1,5 @@
# Automatically generated by apkbuild-cpan, template 1
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-try-tiny
_pkgreal=Try-Tiny
diff --git a/system/perl-unicode-linebreak/APKBUILD b/system/perl-unicode-linebreak/APKBUILD
index 907b970b3..b14736fc0 100644
--- a/system/perl-unicode-linebreak/APKBUILD
+++ b/system/perl-unicode-linebreak/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-unicode-linebreak
_pkgreal=Unicode-LineBreak
diff --git a/system/perl-uri/APKBUILD b/system/perl-uri/APKBUILD
index 1f3cbec5c..0c8774c7e 100644
--- a/system/perl-uri/APKBUILD
+++ b/system/perl-uri/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-uri
_pkgreal=URI
diff --git a/system/perl/APKBUILD b/system/perl/APKBUILD
index 7e23f0a82..40277eb72 100644
--- a/system/perl/APKBUILD
+++ b/system/perl/APKBUILD
@@ -1,11 +1,11 @@
# Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
# Contributor: Valery Kartel <valery.kartel@gmail.com>
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
# Proxy-For: solar
pkgname=perl
pkgver=5.26.3
-pkgrel=1
+pkgrel=2
pkgdesc="Larry Wall's Practical Extraction and Report Language"
url="https://www.perl.org/"
arch="all"
@@ -41,7 +41,7 @@ prepare() {
default_prepare
sed -e 's/less -R/less/g' \
-e 's/libswanted="\(.*\) nsl\(.*\)"/libswanted="\1\2"/g' \
- -i ./Configure ||
+ -i ./Configure
# Ensure that we never accidentally bundle zlib or bzip2
rm -rf cpan/Compress-Raw-Zlib/zlib-src
diff --git a/system/psmisc/APKBUILD b/system/psmisc/APKBUILD
index 4414d28b9..0f53e5ffa 100644
--- a/system/psmisc/APKBUILD
+++ b/system/psmisc/APKBUILD
@@ -15,15 +15,13 @@ makedepends_build="autoconf>=2.69 automake"
makedepends_host="ncurses-dev"
subpackages="$pkgname-doc"
[ "$CBUILD" != "$CHOST" ] || subpackages="$subpackages $pkgname-lang"
-source="$pkgname-$pkgver.tar.bz2::https://gitlab.com/$pkgname/$pkgname/repository/archive.tar.bz2?ref=v$pkgver
+source="$pkgname-$pkgver.tar.bz2::https://gitlab.com/psmisc/psmisc/-/archive/v$pkgver/psmisc-v$pkgver.tar.bz2
fix-peekfd-on-ppc.patch
"
+builddir="$srcdir/$pkgname-v$pkgver"
prepare() {
- ln -fs $pkgname-v$pkgver-* "$builddir"
-
default_prepare
-
sh autogen.sh
}
@@ -51,5 +49,5 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="0571aadcd89ecbc89f991a80b02372b3cb881abed97313640bb23905e133473e1c7a51bf8d6c6dbd3d12a013b3aad88d7f94adfcdc3f6f22a53c57e1e0b33016 psmisc-23.3.tar.bz2
+sha512sums="78e8298b4cc2d888159f2689c7957ab5f17c782d6a64642b055a455579d79759a0f62d46e473d9c0dd4e026f4917226b8907afa6178a24a5615194d38b8aed1a psmisc-23.3.tar.bz2
a910611896368a088503f50a04a1c2af00d57ee20f3613e81c79cd89574805a505dff43e356ed833a464e3b59d7c1e11fd52cf0bbf32fcfece4dbd2380f23b71 fix-peekfd-on-ppc.patch"
diff --git a/system/python3/APKBUILD b/system/python3/APKBUILD
index e875d3941..a6d47495b 100644
--- a/system/python3/APKBUILD
+++ b/system/python3/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=python3
pkgver=3.6.10
diff --git a/system/rsync/APKBUILD b/system/rsync/APKBUILD
index 728a32fbc..f48b55099 100644
--- a/system/rsync/APKBUILD
+++ b/system/rsync/APKBUILD
@@ -1,5 +1,5 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=rsync
pkgver=3.1.3
pkgrel=2
diff --git a/system/s6-linux-init/APKBUILD b/system/s6-linux-init/APKBUILD
index 742ed3ff6..e7c6c86ce 100644
--- a/system/s6-linux-init/APKBUILD
+++ b/system/s6-linux-init/APKBUILD
@@ -1,15 +1,15 @@
# Contributor: Laurent Bercot <ska-adelie@skarnet.org>
# Maintainer: Laurent Bercot <ska-adelie@skarnet.org>
pkgname=s6-linux-init
-pkgver=1.0.5.1
+pkgver=1.0.6.1
pkgrel=0
pkgdesc="A s6-based init system"
url="https://skarnet.org/software/$pkgname/"
arch="all"
options="!check" # No test suite.
license="ISC"
-_skalibs_version=2.9.3.0
-_s6_version=2.9.2.0
+_skalibs_version=2.10.0.0
+_s6_version=2.10.0.0
depends="execline s6>=$_s6_version s6-linux-init-common"
makedepends="skalibs-dev>=$_skalibs_version execline-dev s6-dev utmps-dev"
subpackages="$pkgname-common:common:noarch $pkgname-early-getty:earlygetty:noarch $pkgname-libs $pkgname-dev $pkgname-libs-dev:libsdev $pkgname-doc"
@@ -119,7 +119,8 @@ doc() {
mkdir -p "$subpkgdir/usr/share/doc"
cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname"
}
-sha512sums="c23fff1f5f2433119cbcfceb8e69c2f5542c8377079010891f4147a056d66c23fc08e08ca20ce0236d40386aac187cefd7b38bccb1bd5395d01ef4716c7a7432 s6-linux-init-1.0.5.1.tar.gz
+
+sha512sums="0d18b96a70ef39e06e164bb391e22d7b1cce54f941c5526e6a107c7af5b6801b1dd257ba255bc07eff240d48f8ef7f096e180bade25490a86b6326290448d45c s6-linux-init-1.0.6.1.tar.gz
756b0cbbe5dabb4631380c3c7ea199cc213224b2e36e50a2d012a61948170078b78bf49b85d886319fecf59843087f937d3d804723b2553ac9f94d088a2f0fd8 rc.init
e73c3c32b118831074288d23fadace2158a2b15d5a13ffa73290b92a9e39c2a21c73d3b0eabea29bcbaa5f6381611fd8d0aaa6aa691ec7de91b8ef6ae404b6da runlevel
7bb050248a5c2ab6a56c50c35f87cde724f97ff9882f5e60b0f0f2f14bd93c1df7d99fedc3d81c8519cf1a1ed90e03f1cbb9bf891c7b3618aa9a5f5738d262f4 rc.shutdown
diff --git a/system/s6-rc/APKBUILD b/system/s6-rc/APKBUILD
index ae61b9a1a..bb11c9844 100644
--- a/system/s6-rc/APKBUILD
+++ b/system/s6-rc/APKBUILD
@@ -1,15 +1,15 @@
# Contributor: Laurent Bercot <ska-adelie@skarnet.org>
# Maintainer: Laurent Bercot <ska-adelie@skarnet.org>
pkgname=s6-rc
-pkgver=0.5.1.4
+pkgver=0.5.2.1
pkgrel=0
pkgdesc="skarnet.org's service manager, working on top of s6"
url="https://skarnet.org/software/s6-rc/"
arch="all"
options="!check"
license="ISC"
-_skalibs_version=2.9.2.1
-_s6_version=2.9.2.0
+_skalibs_version=2.10.0.0
+_s6_version=2.10.0.0
depends="execline"
makedepends="skalibs-dev>=$_skalibs_version execline-dev s6-dev>=$_s6_version"
subpackages="$pkgname-libs $pkgname-dev $pkgname-libs-dev:libsdev $pkgname-doc"
@@ -66,4 +66,4 @@ doc() {
cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname"
}
-sha512sums="3b5f6d8676e77e81f50faed314239cd98ff1094568fe415786a3c2176d8d1c9344a05cdca659482e5d5b573acc04c4ecc0d0793a2fd62ae9b2204cbf6e4c3658 s6-rc-0.5.1.4.tar.gz"
+sha512sums="0cbd48e79b7f0e24528b6dda1df6980ca3dcebca7aecf408ad69490aacced4a425b5bcdb1a68b5bfa46199b7a05364a80158db5722cd6506d8d833da125c1fec s6-rc-0.5.2.1.tar.gz"
diff --git a/system/s6/APKBUILD b/system/s6/APKBUILD
index 4909c3daf..489a8ef22 100644
--- a/system/s6/APKBUILD
+++ b/system/s6/APKBUILD
@@ -1,14 +1,14 @@
# Contributor: Laurent Bercot <ska-adelie@skarnet.org>
# Maintainer: Laurent Bercot <ska-adelie@skarnet.org>
pkgname=s6
-pkgver=2.9.2.0
+pkgver=2.10.0.2
pkgrel=0
pkgdesc="skarnet.org's small & secure supervision software suite"
url="https://skarnet.org/software/$pkgname/"
arch="all"
options="!check" # No test suite.
license="ISC"
-_skalibs_version=2.9.2.1
+_skalibs_version=2.10.0.0
depends="execline"
makedepends="skalibs-dev>=$_skalibs_version execline-dev"
install="$pkgname.post-upgrade"
@@ -66,4 +66,5 @@ doc() {
mkdir -p "$subpkgdir/usr/share/doc"
cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname"
}
-sha512sums="ef814c0426d00112c793d4f8bb99319cde8e4ab91c24e98401559bbd28eafdb11a66d446a31816a50f67d607ed1e8c55383362e9761abca21ca24b3598929eee s6-2.9.2.0.tar.gz"
+
+sha512sums="d3eb7e17f3eeb4250c734208a1e9a71b4da0ae3d5090e98c3b02749d42ab83c20f405f1d219293bc378223e31410f0cbfec497c64518235faad9c0ccc6a348dc s6-2.10.0.2.tar.gz"
diff --git a/system/s6/s6.post-upgrade b/system/s6/s6.post-upgrade
index 26d289c27..3188f031d 100644
--- a/system/s6/s6.post-upgrade
+++ b/system/s6/s6.post-upgrade
@@ -5,13 +5,14 @@ oldv="$2"
rm -f /etc/runlevels/default/s6
-if test `apk version -t "$oldv" 2.8` = "<" ; then
+if test `apk version -t "$oldv" 2.9` = "<" ; then
cat <<EOF
*
* The s6 package has been upgraded. To complete the upgrade, you need to
-* restart the supervision tree - with the following command, run as root:
+* restart the supervision tree. If you are using sysvinit, please use the
+* following command, run as root:
*
* s6-svscanctl -t /run/service
*
@@ -19,6 +20,9 @@ if test `apk version -t "$oldv" 2.8` = "<" ; then
* terminals that are listed in the GETTYS variable in /etc/conf.d/gettys
* - so please save your work first.
*
+* If you are using s6-linux-init, which is the default, please just
+* reboot your machine as soon as is convenient for you.
+*
EOF
fi
diff --git a/system/sed/APKBUILD b/system/sed/APKBUILD
index 17f50b841..cb4369afe 100644
--- a/system/sed/APKBUILD
+++ b/system/sed/APKBUILD
@@ -1,5 +1,5 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=sed
pkgver=4.8
pkgrel=0
diff --git a/system/shimmy/APKBUILD b/system/shimmy/APKBUILD
index ab9b55f64..d0d8470d3 100644
--- a/system/shimmy/APKBUILD
+++ b/system/shimmy/APKBUILD
@@ -4,7 +4,7 @@ pkgname=shimmy
pkgver=0.6
pkgrel=0
pkgdesc="Utilities for stricter POSIX conformance"
-url="https://code.foxkit.us/adelie/shimmy"
+url="https://git.adelielinux.org/adelie/shimmy"
arch="all"
options="!check" # No test suite.
license="NCSA"
diff --git a/system/skalibs/APKBUILD b/system/skalibs/APKBUILD
index ed0414589..ee8b7c95d 100644
--- a/system/skalibs/APKBUILD
+++ b/system/skalibs/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Laurent Bercot <ska-adelie@skarnet.org>
# Maintainer: Laurent Bercot <ska-adelie@skarnet.org>
pkgname=skalibs
-pkgver=2.9.3.0
+pkgver=2.10.0.2
pkgrel=0
pkgdesc="A set of general-purpose C programming libraries for skarnet.org software"
url="https://skarnet.org/software/skalibs/"
@@ -57,4 +57,4 @@ doc() {
cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname"
}
-sha512sums="41e867fcaf16da437840b796a41b2d34ea53aafedde8b4fc86d712934ec533e9f7f2a8b7902542570ea6b5bcba772569fc4f47bccef770b5dee4f9d113b3df11 skalibs-2.9.3.0.tar.gz"
+sha512sums="b36b7fefb9df63093f1bd775fe9d2bf7ed588404a99a55b1ecabfc0e3b6eac49989dfb736f7f69a9508e4dfeeb669d48e639964aef5c65c330043c543cd38801 skalibs-2.10.0.2.tar.gz"
diff --git a/system/sudo/APKBUILD b/system/sudo/APKBUILD
index 5ad968957..1305a61f3 100644
--- a/system/sudo/APKBUILD
+++ b/system/sudo/APKBUILD
@@ -9,7 +9,7 @@ if [ "${pkgver%_*}" != "$pkgver" ]; then
else
_realver=$pkgver
fi
-pkgrel=1
+pkgrel=2
pkgdesc="Give certain users the ability to run some commands as root"
url="https://www.sudo.ws/sudo/"
arch="all"
@@ -24,6 +24,7 @@ source="https://www.sudo.ws/dist/sudo-${_realver}.tar.gz
fix-cross-compile.patch
musl-fix-headers.patch
SIGUNUSED.patch
+ CVE-2021-3156.patch
"
builddir="$srcdir"/$pkgname-$_realver
somask="audit_json.so
@@ -42,6 +43,8 @@ somask="audit_json.so
# - CVE-2019-14287
# 1.9.0-r0:
# - CVE-2019-19232
+# 1.9.2-r2:
+# - CVE-2021-3156
build() {
./configure \
@@ -84,4 +87,5 @@ package() {
sha512sums="20afdf2604b1c93395157382b24f225cd1ff88d3a892362e2d69fecd240c4e7171f05032c08be1778cd1dea6e460025e4241f57272fac0ea3550e220b6d73d21 sudo-1.9.2.tar.gz
f0f462f40502da2194310fe4a72ec1a16ba40f95a821ba9aa6aabaa423d28c4ab26b684afa7fb81c2407cf60de9327bdab01de51b878c5d4de49b0d62645f53c fix-cross-compile.patch
dcc03abdd672c934f90dfd3683b3f81a8d39cfff91307d2dbd20a31a852022ab605d034c4fe11860ba99b78d391a9812fca1d6e052620b8ff2c42e4f0c7a1a62 musl-fix-headers.patch
-2733c220ccbdaf61a32d8c72a5bc0209673733014f0d71b568f1523b71416e9d1754dd8c95bc6cd99aa7f935ed6e93c5f19b1a1dbb7dfc2daf9917fd37f96e78 SIGUNUSED.patch"
+2733c220ccbdaf61a32d8c72a5bc0209673733014f0d71b568f1523b71416e9d1754dd8c95bc6cd99aa7f935ed6e93c5f19b1a1dbb7dfc2daf9917fd37f96e78 SIGUNUSED.patch
+7ef329edccbbd26ac55ff58d4c6c470bf2d829ff8ad1388d67b6ea8c2c8284fd362209cf11458787efaa4e301106bd3b49b8b7310c9d222ac3a3483a17b3ec0e CVE-2021-3156.patch"
diff --git a/system/sudo/CVE-2021-3156.patch b/system/sudo/CVE-2021-3156.patch
new file mode 100644
index 000000000..7cb492d61
--- /dev/null
+++ b/system/sudo/CVE-2021-3156.patch
@@ -0,0 +1,165 @@
+
+# HG changeset patch
+# User Todd C. Miller <Todd.Miller@sudo.ws>
+# Date 1611416639 25200
+# Node ID 049ad90590be1e5dfb7df2675d2eb3e37c96ab86
+# Parent a97dc92eae6b60ae285055441341d493c17262ff
+Fix potential buffer overflow when unescaping backslashes in user_args.
+Also, do not try to unescaping backslashes unless in run mode *and*
+we are running the command via a shell.
+Found by Qualys, this fixes CVE-2021-3156.
+
+diff -r a97dc92eae6b -r 049ad90590be plugins/sudoers/sudoers.c
+--- a/plugins/sudoers/sudoers.c Sat Jan 23 08:43:59 2021 -0700
++++ b/plugins/sudoers/sudoers.c Sat Jan 23 08:43:59 2021 -0700
+@@ -547,7 +547,7 @@
+
+ /* If run as root with SUDO_USER set, set sudo_user.pw to that user. */
+ /* XXX - causes confusion when root is not listed in sudoers */
+- if (sudo_mode & (MODE_RUN | MODE_EDIT) && prev_user != NULL) {
++ if (ISSET(sudo_mode, MODE_RUN|MODE_EDIT) && prev_user != NULL) {
+ if (user_uid == 0 && strcmp(prev_user, "root") != 0) {
+ struct passwd *pw;
+
+@@ -932,8 +932,8 @@
+ if (user_cmnd == NULL)
+ user_cmnd = NewArgv[0];
+
+- if (sudo_mode & (MODE_RUN | MODE_EDIT | MODE_CHECK)) {
+- if (ISSET(sudo_mode, MODE_RUN | MODE_CHECK)) {
++ if (ISSET(sudo_mode, MODE_RUN|MODE_EDIT|MODE_CHECK)) {
++ if (!ISSET(sudo_mode, MODE_EDIT)) {
+ if (def_secure_path && !user_is_exempt())
+ path = def_secure_path;
+ if (!set_perms(PERM_RUNAS))
+@@ -961,7 +961,8 @@
+ sudo_warnx(U_("%s: %s"), __func__, U_("unable to allocate memory"));
+ debug_return_int(NOT_FOUND_ERROR);
+ }
+- if (ISSET(sudo_mode, MODE_SHELL|MODE_LOGIN_SHELL)) {
++ if (ISSET(sudo_mode, MODE_SHELL|MODE_LOGIN_SHELL) &&
++ ISSET(sudo_mode, MODE_RUN)) {
+ /*
+ * When running a command via a shell, the sudo front-end
+ * escapes potential meta chars. We unescape non-spaces
+@@ -969,10 +970,22 @@
+ */
+ for (to = user_args, av = NewArgv + 1; (from = *av); av++) {
+ while (*from) {
+- if (from[0] == '\\' && !isspace((unsigned char)from[1]))
++ if (from[0] == '\\' && from[1] != '\0' &&
++ !isspace((unsigned char)from[1])) {
+ from++;
++ }
++ if (size - (to - user_args) < 1) {
++ sudo_warnx(U_("internal error, %s overflow"),
++ __func__);
++ debug_return_int(NOT_FOUND_ERROR);
++ }
+ *to++ = *from++;
+ }
++ if (size - (to - user_args) < 1) {
++ sudo_warnx(U_("internal error, %s overflow"),
++ __func__);
++ debug_return_int(NOT_FOUND_ERROR);
++ }
+ *to++ = ' ';
+ }
+ *--to = '\0';
+
+
+# HG changeset patch
+# User Todd C. Miller <Todd.Miller@sudo.ws>
+# Date 1611416639 25200
+# Node ID 9b97f1787804aedccaec63c379053b1a91a0e409
+# Parent 90aba6ba6e03f3bc33b4eabf16358396ed83642d
+Reset valid_flags to MODE_NONINTERACTIVE for sudoedit.
+This is consistent with how the -e option is handled.
+Also reject -H and -P flags for sudoedit as was done in sudo 1.7.
+Found by Qualys, this is part of the fix for CVE-2021-3156.
+
+diff -r 90aba6ba6e03 -r 9b97f1787804 src/parse_args.c
+--- a/src/parse_args.c Mon Jan 18 12:30:52 2021 +0100
++++ b/src/parse_args.c Sat Jan 23 08:43:59 2021 -0700
+@@ -117,7 +117,10 @@
+ /*
+ * Default flags allowed when running a command.
+ */
+-#define DEFAULT_VALID_FLAGS (MODE_BACKGROUND|MODE_PRESERVE_ENV|MODE_RESET_HOME|MODE_LOGIN_SHELL|MODE_NONINTERACTIVE|MODE_SHELL)
++#define DEFAULT_VALID_FLAGS (MODE_BACKGROUND|MODE_PRESERVE_ENV|MODE_RESET_HOME|MODE_LOGIN_SHELL|MODE_NONINTERACTIVE|MODE_PRESERVE_GROUPS|MODE_SHELL)
++#define EDIT_VALID_FLAGS MODE_NONINTERACTIVE
++#define LIST_VALID_FLAGS (MODE_NONINTERACTIVE|MODE_LONG_LIST)
++#define VALIDATE_VALID_FLAGS MODE_NONINTERACTIVE
+
+ /* Option number for the --host long option due to ambiguity of the -h flag. */
+ #define OPT_HOSTNAME 256
+@@ -262,6 +265,7 @@
+ progname = "sudoedit";
+ mode = MODE_EDIT;
+ sudo_settings[ARG_SUDOEDIT].value = "true";
++ valid_flags = EDIT_VALID_FLAGS;
+ }
+
+ /* Load local IP addresses and masks. */
+@@ -365,7 +369,7 @@
+ usage_excl();
+ mode = MODE_EDIT;
+ sudo_settings[ARG_SUDOEDIT].value = "true";
+- valid_flags = MODE_NONINTERACTIVE;
++ valid_flags = EDIT_VALID_FLAGS;
+ break;
+ case 'g':
+ assert(optarg != NULL);
+@@ -377,6 +381,7 @@
+ break;
+ case 'H':
+ sudo_settings[ARG_SET_HOME].value = "true";
++ SET(flags, MODE_RESET_HOME);
+ break;
+ case 'h':
+ if (optarg == NULL) {
+@@ -431,7 +436,7 @@
+ usage_excl();
+ }
+ mode = MODE_LIST;
+- valid_flags = MODE_NONINTERACTIVE|MODE_LONG_LIST;
++ valid_flags = LIST_VALID_FLAGS;
+ break;
+ case 'n':
+ SET(flags, MODE_NONINTERACTIVE);
+@@ -439,6 +444,7 @@
+ break;
+ case 'P':
+ sudo_settings[ARG_PRESERVE_GROUPS].value = "true";
++ SET(flags, MODE_PRESERVE_GROUPS);
+ break;
+ case 'p':
+ /* An empty prompt is allowed. */
+@@ -505,7 +511,7 @@
+ if (mode && mode != MODE_VALIDATE)
+ usage_excl();
+ mode = MODE_VALIDATE;
+- valid_flags = MODE_NONINTERACTIVE;
++ valid_flags = VALIDATE_VALID_FLAGS;
+ break;
+ case 'V':
+ if (mode && mode != MODE_VERSION)
+@@ -533,7 +539,7 @@
+ if (!mode) {
+ /* Defer -k mode setting until we know whether it is a flag or not */
+ if (sudo_settings[ARG_IGNORE_TICKET].value != NULL) {
+- if (argc == 0 && !(flags & (MODE_SHELL|MODE_LOGIN_SHELL))) {
++ if (argc == 0 && !ISSET(flags, MODE_SHELL|MODE_LOGIN_SHELL)) {
+ mode = MODE_INVALIDATE; /* -k by itself */
+ sudo_settings[ARG_IGNORE_TICKET].value = NULL;
+ valid_flags = 0;
+@@ -601,7 +607,7 @@
+ /*
+ * For shell mode we need to rewrite argv
+ */
+- if (ISSET(mode, MODE_RUN) && ISSET(flags, MODE_SHELL)) {
++ if (ISSET(flags, MODE_SHELL|MODE_LOGIN_SHELL) && ISSET(mode, MODE_RUN)) {
+ char **av, *cmnd = NULL;
+ int ac = 1;
+
+
diff --git a/system/sysvinit/APKBUILD b/system/sysvinit/APKBUILD
index 67ce05459..b3e912601 100644
--- a/system/sysvinit/APKBUILD
+++ b/system/sysvinit/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=sysvinit
pkgver=2.88
-pkgrel=7
+pkgrel=8
pkgdesc="System V-style init programs"
url="https://savannah.nongnu.org/projects/sysvinit"
arch="all"
@@ -53,7 +53,7 @@ _install_s6_stuff() {
mkdir -p -m 0755 "$pkgdir/sbin" "$svcimg/.s6-svscan" "$svcimg/s6-svscan-log"
{ echo '#!/bin/execlineb -P' ; echo 'false' ; } > "$svcimg/.s6-svscan/crash"
chmod 0755 "$svcimg/.s6-svscan/crash"
- { echo '#!/bin/execlineb -P' ; echo 's6-svc -X -- /run/service/s6-svscan-log' ; } > "$svcimg/.s6-svscan/finish"
+ { echo '#!/bin/execlineb -P' ; echo 's6-svc -x -- /run/service/s6-svscan-log' ; } > "$svcimg/.s6-svscan/finish"
chmod 0755 "$svcimg/.s6-svscan/finish"
{ echo '#!/bin/execlineb -P' ; echo 'redirfd -rnb 0 fifo' ; echo 's6-setuidgid catchlog' ; echo 's6-log -bd3 -- t /run/uncaught-logs' ; } > "$svcimg/s6-svscan-log/run"
chmod 0755 "$svcimg/s6-svscan-log/run"
@@ -67,9 +67,8 @@ package() {
_install_s6_stuff
}
-
sha512sums="0bd8eeb124e84fdfa8e621b05f796804ee69a9076b65f5115826bfa814ac1d5d28d31a5c22ebe77c86a93b2288edf4891adc0afaecc4de656c4ecda8a83807bf sysvinit-2.88dsf.tar.bz2
87668b49690091a227c0384fd2400f1006d24c27cc27a25efa7eba56839ccb1eead00b58ce4b654eab9c0208d68aa2cbb888fd5f2990905845aa9688442a69a0 inittab-2.88
27dfe089660a291cbcba06d8564bad11f7fd7c96629e72c2b005562689dc7d8bb479c760e980590906e98423b991ae0acd048713d3bc372174d55ed894abeb3f sysvinit-2.88-posix-header.patch
3605f88ac3faf7d12bf2269ca5d8625850d53e8583b573ab280fa17066c8e4e5217a0d17b94e47ea67a153ad3b88b433471a77544bd085f01f7d9d353ac16aae utmpx.patch
-30fc01b99350d9cb9e2d430f32c357fce571864e618f25fc2c82199f0ae36f3d81316b175af37ff779c0ef26780452877ff0355b3ea47e2ef4eadc823d085e98 s6-svscanboot"
+e52fd49daa5abfc583f1973f3428b1e00a71e7136a8bc6418e94b345d53ef250b3b3c3bee389fe37872b26a78d0957ae852e221428f33b2c728dfd3d50b59634 s6-svscanboot"
diff --git a/system/sysvinit/s6-svscanboot b/system/sysvinit/s6-svscanboot
index 8c134b485..adfdc8044 100644
--- a/system/sysvinit/s6-svscanboot
+++ b/system/sysvinit/s6-svscanboot
@@ -12,4 +12,4 @@ if
redirfd -w 3 /run/s6_ready
redirfd -wnb 1 /run/service/s6-svscan-log/fifo
fdmove -c 2 1
-s6-svscan -St0 -d3 /run/service
+s6-svscan -d3 /run/service
diff --git a/system/utmps/APKBUILD b/system/utmps/APKBUILD
index c78339725..cd7040973 100644
--- a/system/utmps/APKBUILD
+++ b/system/utmps/APKBUILD
@@ -1,15 +1,15 @@
# Contributor: Laurent Bercot <ska-adelie@skarnet.org>
# Maintainer: Laurent Bercot <ska-adelie@skarnet.org>
pkgname=utmps
-pkgver=0.0.3.2
-pkgrel=1
+pkgver=0.1.0.0
+pkgrel=0
pkgdesc="A secure utmp/wtmp implementation"
url="https://skarnet.org/software/$pkgname/"
arch="all"
options="!check" # No test suite
license="ISC"
depends="execline s6"
-_skalibs_version=2.9.2.1
+_skalibs_version=2.10.0.0
makedepends="skalibs-dev>=$_skalibs_version"
subpackages="$pkgname-libs $pkgname-dev $pkgname-libs-dev:libsdev $pkgname-doc"
install="$pkgname.post-upgrade"
@@ -25,7 +25,8 @@ build() {
--enable-static-libc \
--libdir=/usr/lib \
--libexecdir="/lib/$pkgname" \
- --with-dynlib=/lib
+ --with-dynlib=/lib \
+ --enable-libc-includes
make
}
@@ -75,6 +76,6 @@ doc() {
cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname"
}
-sha512sums="096615bf4ef4bf73af6128fcdebc0473c736a154fb3f1db89f6f2f2301fdaf2ea183b709991d4591e75e6e8c51426ac03ce602e2d8ce9cd4a5c360bc5b44003e utmps-0.0.3.2.tar.gz
+sha512sums="f8d246897690829fccc6e4a4e1bfbbbacd10d337863dacb6966f62cffc166d61c49db1ac83d51aa023e571a5d62f81cf030fa439eb8e3fe742e427764f18adcf utmps-0.1.0.0.tar.gz
0ec30284c64c6ea9f25142c5f4a643bd48b137fe85781b650104f5137ffa4dfc35ca7be3e41e3acd3403ebe1d8c5378073afa4e2f3607d3d794fcd9f98ed51c4 utmpd.run
cba4f2ec3b8f5becf3ae57eecf584745d783046ee6cf5d116322421ad5ffd074d2955da22d31d2b5b1d05f906378aae92f221d2ac95ac21b54a361fbdc0566e7 wtmpd.run"
diff --git a/system/uucp/APKBUILD b/system/uucp/APKBUILD
index 422f28ae5..71151e6f0 100644
--- a/system/uucp/APKBUILD
+++ b/system/uucp/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=uucp
pkgver=1.07
pkgrel=0
diff --git a/system/vim/APKBUILD b/system/vim/APKBUILD
index e9148fed1..cd4a39004 100644
--- a/system/vim/APKBUILD
+++ b/system/vim/APKBUILD
@@ -2,7 +2,7 @@
# Contributor: Łukasz Jendrysik <scadu@yandex.com>
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=vim
pkgver=8.2.1900
_pkgver=${pkgver%.*.*}${pkgver#*.}
@@ -49,7 +49,7 @@ build() {
--with-compiledby="Adélie Linux" \
vim_cv_toupper_broken=no \
vim_cv_terminfo=yes \
- vim_cv_tgent=zero \
+ vim_cv_tgetent=zero \
vim_cv_tty_group=world \
vim_cv_getcwd_broken=no \
vim_cv_stat_ignores_slash=no \
diff --git a/user/alpine/APKBUILD b/user/alpine/APKBUILD
index 2ac0989d2..476a56276 100644
--- a/user/alpine/APKBUILD
+++ b/user/alpine/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=alpine
pkgver=2.23
pkgrel=0
diff --git a/user/apache-httpd/APKBUILD b/user/apache-httpd/APKBUILD
index a14c25cc8..67b2bb577 100644
--- a/user/apache-httpd/APKBUILD
+++ b/user/apache-httpd/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=apache-httpd
_pkgreal=httpd
pkgver=2.4.46
diff --git a/user/apkvitrine/APKBUILD b/user/apkvitrine/APKBUILD
new file mode 100644
index 000000000..5ea799e72
--- /dev/null
+++ b/user/apkvitrine/APKBUILD
@@ -0,0 +1,22 @@
+# Maintainer: Max Rees <maxcrees@me.com>
+pkgname=apkvitrine
+pkgver=0.2
+pkgrel=0
+pkgdesc="Package tracker and analyzer for APK repositories"
+url="https://code.foxkit.us/sroracle/apkvitrine"
+arch="noarch"
+options="!check" # No test suite.
+license="NCSA"
+depends="apk-tools~2.12.0 py3-apkkit py3-flup py3-jinja2"
+makedepends=""
+source="https://dev.sick.bike/dist/$pkgname-$pkgver.tar.gz"
+
+build() {
+ make
+}
+
+package() {
+ make install DESTDIR="$pkgdir"
+}
+
+sha512sums="11ec7adfdaaa9c72735a53514457e690f285e415dddeaaefe35024a09f8e01e654628654f2e55c9b67712a42c898e3a864f38d7f60ae8fa435bd64ad04bfc883 apkvitrine-0.2.tar.gz"
diff --git a/user/aspell-dict-af/APKBUILD b/user/aspell-dict-af/APKBUILD
index 4aa8979d1..33771f7b8 100644
--- a/user/aspell-dict-af/APKBUILD
+++ b/user/aspell-dict-af/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=aspell-dict-af
pkgver=0.50.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-am/APKBUILD b/user/aspell-dict-am/APKBUILD
index 79e44d947..655453f04 100644
--- a/user/aspell-dict-am/APKBUILD
+++ b/user/aspell-dict-am/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=aspell-dict-am
pkgver=0.03.1
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-ar/APKBUILD b/user/aspell-dict-ar/APKBUILD
index 6880ae201..ab2fa8016 100644
--- a/user/aspell-dict-ar/APKBUILD
+++ b/user/aspell-dict-ar/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=aspell-dict-ar
pkgver=1.2.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-ast/APKBUILD b/user/aspell-dict-ast/APKBUILD
index 9e7c0320c..c3302a23f 100644
--- a/user/aspell-dict-ast/APKBUILD
+++ b/user/aspell-dict-ast/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=aspell-dict-ast
pkgver=0.01
pkgrel=0
diff --git a/user/aspell-dict-az/APKBUILD b/user/aspell-dict-az/APKBUILD
index 9854bcc48..a97386923 100644
--- a/user/aspell-dict-az/APKBUILD
+++ b/user/aspell-dict-az/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=aspell-dict-az
pkgver=0.02.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-be/APKBUILD b/user/aspell-dict-be/APKBUILD
index 8c0c67349..9846afced 100644
--- a/user/aspell-dict-be/APKBUILD
+++ b/user/aspell-dict-be/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=aspell-dict-be
pkgver=0.01
pkgrel=0
diff --git a/user/aspell-dict-bg/APKBUILD b/user/aspell-dict-bg/APKBUILD
index 809c98aab..7fdfb97e9 100644
--- a/user/aspell-dict-bg/APKBUILD
+++ b/user/aspell-dict-bg/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=aspell-dict-bg
pkgver=4.1.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-bn/APKBUILD b/user/aspell-dict-bn/APKBUILD
index 92b006733..62e396f3f 100644
--- a/user/aspell-dict-bn/APKBUILD
+++ b/user/aspell-dict-bn/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=aspell-dict-bn
pkgver=0.01.1.1
_pkgver=${pkgver%.*}-${pkgver#*.*.*.}
diff --git a/user/aspell-dict-br/APKBUILD b/user/aspell-dict-br/APKBUILD
index 0cc1b2057..8708d2806 100644
--- a/user/aspell-dict-br/APKBUILD
+++ b/user/aspell-dict-br/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=aspell-dict-br
pkgver=0.50.2
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-ca/APKBUILD b/user/aspell-dict-ca/APKBUILD
index 74a2c7a6d..d1dcf07d3 100644
--- a/user/aspell-dict-ca/APKBUILD
+++ b/user/aspell-dict-ca/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=aspell-dict-ca
pkgver=2.5.0
pkgrel=0
diff --git a/user/aspell-dict-cs/APKBUILD b/user/aspell-dict-cs/APKBUILD
index 31a59210c..0cddbb21d 100644
--- a/user/aspell-dict-cs/APKBUILD
+++ b/user/aspell-dict-cs/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=aspell-dict-cs
pkgver=20040614.1
_pkgver=${pkgver%.*}-${pkgver#*.}
diff --git a/user/aspell-dict-csb/APKBUILD b/user/aspell-dict-csb/APKBUILD
index 8e4be27dc..09f890e06 100644
--- a/user/aspell-dict-csb/APKBUILD
+++ b/user/aspell-dict-csb/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=aspell-dict-csb
pkgver=0.02.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-cy/APKBUILD b/user/aspell-dict-cy/APKBUILD
index e1f64d6c7..d357d42dd 100644
--- a/user/aspell-dict-cy/APKBUILD
+++ b/user/aspell-dict-cy/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=aspell-dict-cy
pkgver=0.50.3
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-da/APKBUILD b/user/aspell-dict-da/APKBUILD
index db515b3b9..e89c676ee 100644
--- a/user/aspell-dict-da/APKBUILD
+++ b/user/aspell-dict-da/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=aspell-dict-da
pkgver=1.4.42.1
_pkgver=${pkgver%.*}-${pkgver#*.*.*.}
diff --git a/user/aspell-dict-de-alt/APKBUILD b/user/aspell-dict-de-alt/APKBUILD
index 8140d5f0a..61fb0f6fd 100644
--- a/user/aspell-dict-de-alt/APKBUILD
+++ b/user/aspell-dict-de-alt/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=aspell-dict-de-alt
pkgver=2.1.1
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-de/APKBUILD b/user/aspell-dict-de/APKBUILD
index 7c0f5f834..0ae31545c 100644
--- a/user/aspell-dict-de/APKBUILD
+++ b/user/aspell-dict-de/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=aspell-dict-de
pkgver=20161207
pkgrel=0
diff --git a/user/aspell-dict-el/APKBUILD b/user/aspell-dict-el/APKBUILD
index e0a194d90..ad8db028a 100644
--- a/user/aspell-dict-el/APKBUILD
+++ b/user/aspell-dict-el/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=aspell-dict-el
pkgver=0.08.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-en/APKBUILD b/user/aspell-dict-en/APKBUILD
index bd3e44e93..3f5f2b8f7 100644
--- a/user/aspell-dict-en/APKBUILD
+++ b/user/aspell-dict-en/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=aspell-dict-en
pkgver=2019.10.06.0
_pkgver=${pkgver%.*}-${pkgver#*.*.*.}
diff --git a/user/aspell-dict-eo/APKBUILD b/user/aspell-dict-eo/APKBUILD
index cefd65d6d..5bf6ffd88 100644
--- a/user/aspell-dict-eo/APKBUILD
+++ b/user/aspell-dict-eo/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=aspell-dict-eo
pkgver=2.1.20000225.a2
_pkgver=${pkgver%.*}${pkgver#*.*.*.}
diff --git a/user/aspell-dict-es/APKBUILD b/user/aspell-dict-es/APKBUILD
index 80a8b2848..f9bafde42 100644
--- a/user/aspell-dict-es/APKBUILD
+++ b/user/aspell-dict-es/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=aspell-dict-es
pkgver=1.11.2
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-et/APKBUILD b/user/aspell-dict-et/APKBUILD
index 4e84a1f9c..bb7c77612 100644
--- a/user/aspell-dict-et/APKBUILD
+++ b/user/aspell-dict-et/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=aspell-dict-et
pkgver=0.1.21.1
_pkgver=${pkgver%.*}-${pkgver#*.*.*.}
diff --git a/user/aspell-dict-fa/APKBUILD b/user/aspell-dict-fa/APKBUILD
index 93def9869..e84e0c811 100644
--- a/user/aspell-dict-fa/APKBUILD
+++ b/user/aspell-dict-fa/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=aspell-dict-fa
pkgver=0.11.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-fi/APKBUILD b/user/aspell-dict-fi/APKBUILD
index 78a4fa207..67bc18365 100644
--- a/user/aspell-dict-fi/APKBUILD
+++ b/user/aspell-dict-fi/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=aspell-dict-fi
pkgver=0.7.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-fo/APKBUILD b/user/aspell-dict-fo/APKBUILD
index d9631bffd..c186949bd 100644
--- a/user/aspell-dict-fo/APKBUILD
+++ b/user/aspell-dict-fo/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=aspell-dict-fo
pkgver=0.2.16.1
_pkgver=${pkgver%.*}-${pkgver#*.*.*.}
diff --git a/user/aspell-dict-fr/APKBUILD b/user/aspell-dict-fr/APKBUILD
index bb0a14d2b..335931c8a 100644
--- a/user/aspell-dict-fr/APKBUILD
+++ b/user/aspell-dict-fr/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=aspell-dict-fr
pkgver=0.50.3
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-fy/APKBUILD b/user/aspell-dict-fy/APKBUILD
index 7331a46f9..d42f5fced 100644
--- a/user/aspell-dict-fy/APKBUILD
+++ b/user/aspell-dict-fy/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=aspell-dict-fy
pkgver=0.12.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-ga/APKBUILD b/user/aspell-dict-ga/APKBUILD
index 3ccdb1272..97433440a 100644
--- a/user/aspell-dict-ga/APKBUILD
+++ b/user/aspell-dict-ga/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=aspell-dict-ga
pkgver=5.0.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-gd/APKBUILD b/user/aspell-dict-gd/APKBUILD
index aff399a6b..29238c28c 100644
--- a/user/aspell-dict-gd/APKBUILD
+++ b/user/aspell-dict-gd/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=aspell-dict-gd
pkgver=0.1.1.1
_pkgver=${pkgver%.*}-${pkgver#*.*.*.}
diff --git a/user/aspell-dict-gl/APKBUILD b/user/aspell-dict-gl/APKBUILD
index 4001fd9cb..2e4f630d5 100644
--- a/user/aspell-dict-gl/APKBUILD
+++ b/user/aspell-dict-gl/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=aspell-dict-gl
pkgver=0.5.a2
_pkgver=${pkgver%.*}${pkgver#*.*.}
diff --git a/user/aspell-dict-grc/APKBUILD b/user/aspell-dict-grc/APKBUILD
index c5016e224..7ad9ac316 100644
--- a/user/aspell-dict-grc/APKBUILD
+++ b/user/aspell-dict-grc/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=aspell-dict-grc
pkgver=0.02.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-gu/APKBUILD b/user/aspell-dict-gu/APKBUILD
index feeadf574..95d3df597 100644
--- a/user/aspell-dict-gu/APKBUILD
+++ b/user/aspell-dict-gu/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=aspell-dict-gu
pkgver=0.03.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-gv/APKBUILD b/user/aspell-dict-gv/APKBUILD
index 513a9491d..022042c0a 100644
--- a/user/aspell-dict-gv/APKBUILD
+++ b/user/aspell-dict-gv/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=aspell-dict-gv
pkgver=0.50.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-he/APKBUILD b/user/aspell-dict-he/APKBUILD
index cac888171..5052052c5 100644
--- a/user/aspell-dict-he/APKBUILD
+++ b/user/aspell-dict-he/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=aspell-dict-he
pkgver=1.0.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-hi/APKBUILD b/user/aspell-dict-hi/APKBUILD
index 789b77dc2..7be1a71e8 100644
--- a/user/aspell-dict-hi/APKBUILD
+++ b/user/aspell-dict-hi/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=aspell-dict-hi
pkgver=0.02.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-hil/APKBUILD b/user/aspell-dict-hil/APKBUILD
index f634034b9..13be13861 100644
--- a/user/aspell-dict-hil/APKBUILD
+++ b/user/aspell-dict-hil/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=aspell-dict-hil
pkgver=0.11.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-hr/APKBUILD b/user/aspell-dict-hr/APKBUILD
index c4bc01e03..1b73b5274 100644
--- a/user/aspell-dict-hr/APKBUILD
+++ b/user/aspell-dict-hr/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=aspell-dict-hr
pkgver=0.51.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-hsb/APKBUILD b/user/aspell-dict-hsb/APKBUILD
index 8c8c85b1b..9c47957de 100644
--- a/user/aspell-dict-hsb/APKBUILD
+++ b/user/aspell-dict-hsb/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=aspell-dict-hsb
pkgver=0.02.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-hu/APKBUILD b/user/aspell-dict-hu/APKBUILD
index a118ce6a9..9973ca8ed 100644
--- a/user/aspell-dict-hu/APKBUILD
+++ b/user/aspell-dict-hu/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=aspell-dict-hu
pkgver=0.99.4.2.0
_pkgver=${pkgver%.*}-${pkgver#*.*.*.*.}
diff --git a/user/aspell-dict-hus/APKBUILD b/user/aspell-dict-hus/APKBUILD
index 33e998e30..a33f44136 100644
--- a/user/aspell-dict-hus/APKBUILD
+++ b/user/aspell-dict-hus/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=aspell-dict-hus
pkgver=0.03.1
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-hy/APKBUILD b/user/aspell-dict-hy/APKBUILD
index a88dbb382..da7a6ca99 100644
--- a/user/aspell-dict-hy/APKBUILD
+++ b/user/aspell-dict-hy/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=aspell-dict-hy
pkgver=0.10.0.0
_pkgver=${pkgver%.*}-${pkgver#*.*.*.}
diff --git a/user/aspell-dict-ia/APKBUILD b/user/aspell-dict-ia/APKBUILD
index fb8d26f62..908b26610 100644
--- a/user/aspell-dict-ia/APKBUILD
+++ b/user/aspell-dict-ia/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=aspell-dict-ia
pkgver=0.50.1
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-id/APKBUILD b/user/aspell-dict-id/APKBUILD
index 75b2839b9..28fce71e1 100644
--- a/user/aspell-dict-id/APKBUILD
+++ b/user/aspell-dict-id/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=aspell-dict-id
pkgver=1.2.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-is/APKBUILD b/user/aspell-dict-is/APKBUILD
index 83d58f2bc..6e096c434 100644
--- a/user/aspell-dict-is/APKBUILD
+++ b/user/aspell-dict-is/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=aspell-dict-is
pkgver=0.51.1.0
_pkgver=${pkgver%.*}-${pkgver#*.*.*.}
diff --git a/user/aspell-dict-it/APKBUILD b/user/aspell-dict-it/APKBUILD
index 23b5cc043..6b9acdfb8 100644
--- a/user/aspell-dict-it/APKBUILD
+++ b/user/aspell-dict-it/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=aspell-dict-it
pkgver=2.4.20070901.0
_pkgver=${pkgver%.*.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-kn/APKBUILD b/user/aspell-dict-kn/APKBUILD
index 6eefab144..a4885a08a 100644
--- a/user/aspell-dict-kn/APKBUILD
+++ b/user/aspell-dict-kn/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=aspell-dict-kn
pkgver=0.01.1
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-ku/APKBUILD b/user/aspell-dict-ku/APKBUILD
index 042c91bca..6fd0e03e0 100644
--- a/user/aspell-dict-ku/APKBUILD
+++ b/user/aspell-dict-ku/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=aspell-dict-ku
pkgver=0.20.1
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-ky/APKBUILD b/user/aspell-dict-ky/APKBUILD
index 0ec8c8552..68176d858 100644
--- a/user/aspell-dict-ky/APKBUILD
+++ b/user/aspell-dict-ky/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=aspell-dict-ky
pkgver=0.01.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-la/APKBUILD b/user/aspell-dict-la/APKBUILD
index 257624e08..24aa053c7 100644
--- a/user/aspell-dict-la/APKBUILD
+++ b/user/aspell-dict-la/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=aspell-dict-la
pkgver=20020503.0
_pkgver=${pkgver%.*}-${pkgver#*.}
diff --git a/user/aspell-dict-lt/APKBUILD b/user/aspell-dict-lt/APKBUILD
index 1f0f0c657..1eefd3d59 100644
--- a/user/aspell-dict-lt/APKBUILD
+++ b/user/aspell-dict-lt/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=aspell-dict-lt
pkgver=1.3
_pkgver=${pkgver%.*}-${pkgver#*.*.*.}
diff --git a/user/aspell-dict-lv/APKBUILD b/user/aspell-dict-lv/APKBUILD
index 1640813f6..4ad0da3a2 100644
--- a/user/aspell-dict-lv/APKBUILD
+++ b/user/aspell-dict-lv/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=aspell-dict-lv
pkgver=0.5.5.1
_pkgver=${pkgver%.*}-${pkgver#*.*.*.}
diff --git a/user/aspell-dict-mg/APKBUILD b/user/aspell-dict-mg/APKBUILD
index a93c2b691..fb04eb1e4 100644
--- a/user/aspell-dict-mg/APKBUILD
+++ b/user/aspell-dict-mg/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=aspell-dict-mg
pkgver=0.03.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-mi/APKBUILD b/user/aspell-dict-mi/APKBUILD
index aa6db01e1..8cea7a75d 100644
--- a/user/aspell-dict-mi/APKBUILD
+++ b/user/aspell-dict-mi/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=aspell-dict-mi
pkgver=0.50.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-mk/APKBUILD b/user/aspell-dict-mk/APKBUILD
index 324ab0c10..1d8960fb9 100644
--- a/user/aspell-dict-mk/APKBUILD
+++ b/user/aspell-dict-mk/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=aspell-dict-mk
pkgver=0.50.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-ml/APKBUILD b/user/aspell-dict-ml/APKBUILD
index 03562f30c..c296d6f41 100644
--- a/user/aspell-dict-ml/APKBUILD
+++ b/user/aspell-dict-ml/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=aspell-dict-ml
pkgver=0.04.1
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-mn/APKBUILD b/user/aspell-dict-mn/APKBUILD
index f71c509d1..a76245c20 100644
--- a/user/aspell-dict-mn/APKBUILD
+++ b/user/aspell-dict-mn/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=aspell-dict-mn
pkgver=0.06.2
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-mr/APKBUILD b/user/aspell-dict-mr/APKBUILD
index 583a1fb49..31f17d31d 100644
--- a/user/aspell-dict-mr/APKBUILD
+++ b/user/aspell-dict-mr/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=aspell-dict-mr
pkgver=0.10.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-ms/APKBUILD b/user/aspell-dict-ms/APKBUILD
index 25a29a229..9e66bdcc8 100644
--- a/user/aspell-dict-ms/APKBUILD
+++ b/user/aspell-dict-ms/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=aspell-dict-ms
pkgver=0.50.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-mt/APKBUILD b/user/aspell-dict-mt/APKBUILD
index 5d22c27c3..88b601f80 100644
--- a/user/aspell-dict-mt/APKBUILD
+++ b/user/aspell-dict-mt/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=aspell-dict-mt
pkgver=0.50.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-nb/APKBUILD b/user/aspell-dict-nb/APKBUILD
index 6db6e6fb5..cfc57385a 100644
--- a/user/aspell-dict-nb/APKBUILD
+++ b/user/aspell-dict-nb/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=aspell-dict-nb
pkgver=0.50.1.0
_pkgver=${pkgver%.*}-${pkgver#*.*.*.}
diff --git a/user/aspell-dict-nds/APKBUILD b/user/aspell-dict-nds/APKBUILD
index 9e4e26201..40ff55d26 100644
--- a/user/aspell-dict-nds/APKBUILD
+++ b/user/aspell-dict-nds/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=aspell-dict-nds
pkgver=0.01.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-nl/APKBUILD b/user/aspell-dict-nl/APKBUILD
index 87ffadacf..3d2a99759 100644
--- a/user/aspell-dict-nl/APKBUILD
+++ b/user/aspell-dict-nl/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=aspell-dict-nl
pkgver=0.50.2
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-nn/APKBUILD b/user/aspell-dict-nn/APKBUILD
index cf8a0aa21..2f5f6a8b1 100644
--- a/user/aspell-dict-nn/APKBUILD
+++ b/user/aspell-dict-nn/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=aspell-dict-nn
pkgver=0.50.1.1
_pkgver=${pkgver%.*}-${pkgver#*.*.*.}
diff --git a/user/aspell-dict-ny/APKBUILD b/user/aspell-dict-ny/APKBUILD
index f8f15a08d..cb998d970 100644
--- a/user/aspell-dict-ny/APKBUILD
+++ b/user/aspell-dict-ny/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=aspell-dict-ny
pkgver=0.01.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-or/APKBUILD b/user/aspell-dict-or/APKBUILD
index 4717c0f76..6f7a0790f 100644
--- a/user/aspell-dict-or/APKBUILD
+++ b/user/aspell-dict-or/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=aspell-dict-or
pkgver=0.03.1
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-pa/APKBUILD b/user/aspell-dict-pa/APKBUILD
index 67fc9ca9f..089033fcd 100644
--- a/user/aspell-dict-pa/APKBUILD
+++ b/user/aspell-dict-pa/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=aspell-dict-pa
pkgver=0.01.1
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-pl/APKBUILD b/user/aspell-dict-pl/APKBUILD
index ff226f2fe..209a45d47 100644
--- a/user/aspell-dict-pl/APKBUILD
+++ b/user/aspell-dict-pl/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=aspell-dict-pl
pkgver=20200619
pkgrel=0
diff --git a/user/aspell-dict-pt_BR/APKBUILD b/user/aspell-dict-pt_BR/APKBUILD
index e83fb61b4..7200d86de 100644
--- a/user/aspell-dict-pt_BR/APKBUILD
+++ b/user/aspell-dict-pt_BR/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=aspell-dict-pt_BR
pkgver=20090702.0
_pkgver=${pkgver%.*}-${pkgver#*.}
diff --git a/user/aspell-dict-pt_PT/APKBUILD b/user/aspell-dict-pt_PT/APKBUILD
index 412dd51c8..3b25dc636 100644
--- a/user/aspell-dict-pt_PT/APKBUILD
+++ b/user/aspell-dict-pt_PT/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=aspell-dict-pt_PT
pkgver=20190329.1.0
_pkgver=${pkgver%.*.*}-${pkgver#*.}
diff --git a/user/aspell-dict-qu/APKBUILD b/user/aspell-dict-qu/APKBUILD
index 10010ba13..f699cd6e4 100644
--- a/user/aspell-dict-qu/APKBUILD
+++ b/user/aspell-dict-qu/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=aspell-dict-qu
pkgver=0.02.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-ro/APKBUILD b/user/aspell-dict-ro/APKBUILD
index 449bf9276..76888dca9 100644
--- a/user/aspell-dict-ro/APKBUILD
+++ b/user/aspell-dict-ro/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=aspell-dict-ro
pkgver=3.3.10
pkgrel=0
diff --git a/user/aspell-dict-ru/APKBUILD b/user/aspell-dict-ru/APKBUILD
index 29dbbf43e..1605b63a6 100644
--- a/user/aspell-dict-ru/APKBUILD
+++ b/user/aspell-dict-ru/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=aspell-dict-ru
pkgver=0.99f7.1
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-rw/APKBUILD b/user/aspell-dict-rw/APKBUILD
index e9a28d063..9708ede9e 100644
--- a/user/aspell-dict-rw/APKBUILD
+++ b/user/aspell-dict-rw/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=aspell-dict-rw
pkgver=0.50.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-sc/APKBUILD b/user/aspell-dict-sc/APKBUILD
index 8649e338f..b0ea6622b 100644
--- a/user/aspell-dict-sc/APKBUILD
+++ b/user/aspell-dict-sc/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=aspell-dict-sc
pkgver=1.0
pkgrel=0
diff --git a/user/aspell-dict-sk/APKBUILD b/user/aspell-dict-sk/APKBUILD
index 466ee7cb7..ae5a93b65 100644
--- a/user/aspell-dict-sk/APKBUILD
+++ b/user/aspell-dict-sk/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=aspell-dict-sk
pkgver=2.02.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-sl/APKBUILD b/user/aspell-dict-sl/APKBUILD
index 2665c4a17..54fb43e88 100644
--- a/user/aspell-dict-sl/APKBUILD
+++ b/user/aspell-dict-sl/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=aspell-dict-sl
pkgver=0.50.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-sr/APKBUILD b/user/aspell-dict-sr/APKBUILD
index 3535a244c..fbebf7bcb 100644
--- a/user/aspell-dict-sr/APKBUILD
+++ b/user/aspell-dict-sr/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=aspell-dict-sr
pkgver=0.02
pkgrel=0
diff --git a/user/aspell-dict-sv/APKBUILD b/user/aspell-dict-sv/APKBUILD
index 05c6da187..44a508d69 100644
--- a/user/aspell-dict-sv/APKBUILD
+++ b/user/aspell-dict-sv/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=aspell-dict-sv
pkgver=0.51.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-sw/APKBUILD b/user/aspell-dict-sw/APKBUILD
index b6da8032d..72e531448 100644
--- a/user/aspell-dict-sw/APKBUILD
+++ b/user/aspell-dict-sw/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=aspell-dict-sw
pkgver=0.50.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-ta/APKBUILD b/user/aspell-dict-ta/APKBUILD
index d9afb81d6..a5044a9a2 100644
--- a/user/aspell-dict-ta/APKBUILD
+++ b/user/aspell-dict-ta/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=aspell-dict-ta
pkgver=20040424.1
_pkgver=${pkgver%.*}-${pkgver#*.}
diff --git a/user/aspell-dict-te/APKBUILD b/user/aspell-dict-te/APKBUILD
index 9544673a1..f03f054e2 100644
--- a/user/aspell-dict-te/APKBUILD
+++ b/user/aspell-dict-te/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=aspell-dict-te
pkgver=0.01.2
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-tet/APKBUILD b/user/aspell-dict-tet/APKBUILD
index fb58477b8..810cffb49 100644
--- a/user/aspell-dict-tet/APKBUILD
+++ b/user/aspell-dict-tet/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=aspell-dict-tet
pkgver=0.1.1
pkgrel=0
diff --git a/user/aspell-dict-tk/APKBUILD b/user/aspell-dict-tk/APKBUILD
index 11e465c99..dcaf12fcb 100644
--- a/user/aspell-dict-tk/APKBUILD
+++ b/user/aspell-dict-tk/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=aspell-dict-tk
pkgver=0.01.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-tl/APKBUILD b/user/aspell-dict-tl/APKBUILD
index 5e35eb565..f2e3782c7 100644
--- a/user/aspell-dict-tl/APKBUILD
+++ b/user/aspell-dict-tl/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=aspell-dict-tl
pkgver=0.4.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-tn/APKBUILD b/user/aspell-dict-tn/APKBUILD
index ae25e480b..439954c7f 100644
--- a/user/aspell-dict-tn/APKBUILD
+++ b/user/aspell-dict-tn/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=aspell-dict-tn
pkgver=1.0.1.0
_pkgver=${pkgver%.*}-${pkgver#*.*.*.}
diff --git a/user/aspell-dict-tr/APKBUILD b/user/aspell-dict-tr/APKBUILD
index 6bbb12b99..4683cd993 100644
--- a/user/aspell-dict-tr/APKBUILD
+++ b/user/aspell-dict-tr/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=aspell-dict-tr
pkgver=0.50.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-uk/APKBUILD b/user/aspell-dict-uk/APKBUILD
index d53c59b7c..f23364229 100644
--- a/user/aspell-dict-uk/APKBUILD
+++ b/user/aspell-dict-uk/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=aspell-dict-uk
pkgver=1.4.0.0
_pkgver=${pkgver%.*}-${pkgver#*.*.*.}
diff --git a/user/aspell-dict-uz/APKBUILD b/user/aspell-dict-uz/APKBUILD
index 801711845..28baeb118 100644
--- a/user/aspell-dict-uz/APKBUILD
+++ b/user/aspell-dict-uz/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=aspell-dict-uz
pkgver=0.6.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-vi/APKBUILD b/user/aspell-dict-vi/APKBUILD
index 680cdd9c0..7d767e987 100644
--- a/user/aspell-dict-vi/APKBUILD
+++ b/user/aspell-dict-vi/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=aspell-dict-vi
pkgver=0.01.1.1
_pkgver=${pkgver%.*}-${pkgver#*.*.*.}
diff --git a/user/aspell-dict-wa/APKBUILD b/user/aspell-dict-wa/APKBUILD
index 8ac0dc480..4dd5b0a0d 100644
--- a/user/aspell-dict-wa/APKBUILD
+++ b/user/aspell-dict-wa/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=aspell-dict-wa
pkgver=0.50.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-yi/APKBUILD b/user/aspell-dict-yi/APKBUILD
index 59f2eb444..30a5c12b6 100644
--- a/user/aspell-dict-yi/APKBUILD
+++ b/user/aspell-dict-yi/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=aspell-dict-yi
pkgver=0.01.1.1
_pkgver=${pkgver%.*}-${pkgver#*.*.*.}
diff --git a/user/aspell-dict-zu/APKBUILD b/user/aspell-dict-zu/APKBUILD
index 7e4846103..1d9108516 100644
--- a/user/aspell-dict-zu/APKBUILD
+++ b/user/aspell-dict-zu/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=aspell-dict-zu
pkgver=0.50.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/atkmm/APKBUILD b/user/atkmm/APKBUILD
index 448b2c8bb..87585bcc1 100644
--- a/user/atkmm/APKBUILD
+++ b/user/atkmm/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=atkmm
pkgver=2.28.0
pkgrel=0
diff --git a/user/atril/APKBUILD b/user/atril/APKBUILD
index ac1897170..35640633f 100644
--- a/user/atril/APKBUILD
+++ b/user/atril/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=atril
pkgver=1.22.3
pkgrel=0
diff --git a/user/ayatana-ido/APKBUILD b/user/ayatana-ido/APKBUILD
index 34effb0c0..24717fa8b 100644
--- a/user/ayatana-ido/APKBUILD
+++ b/user/ayatana-ido/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=ayatana-ido
pkgver=0.8.0
pkgrel=0
diff --git a/user/bash-completion/APKBUILD b/user/bash-completion/APKBUILD
index 44df1d5b1..0737141b1 100644
--- a/user/bash-completion/APKBUILD
+++ b/user/bash-completion/APKBUILD
@@ -1,5 +1,5 @@
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
# Contributor: zlg <zlg+adelie@zlg.space>
# Maintainer:
pkgname=bash-completion
diff --git a/user/bcnm/APKBUILD b/user/bcnm/APKBUILD
index c1f6e0b04..0c7fa9cb1 100644
--- a/user/bcnm/APKBUILD
+++ b/user/bcnm/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=bcnm
-pkgver=0.0.1.0
+pkgver=0.0.1.2
pkgrel=0
pkgdesc="Client network manager"
url="https://www.skarnet.org/software/bcnm/"
@@ -9,7 +9,7 @@ arch="all"
options="!check" # No test suite.
license="ISC"
depends=""
-makedepends="skalibs-dev"
+makedepends="skalibs-dev>=2.10"
subpackages="$pkgname-dev"
source="https://www.skarnet.org/software/bcnm/bcnm-$pkgver.tar.gz"
@@ -28,4 +28,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="abe37c2629baa3c583734c7f783565c52f376ff553c503b5666e081cce042efa2e4d2a219b4911b23ea1c437f1ab0d9d1a928cc5126d8efb65e2981b86b220e1 bcnm-0.0.1.0.tar.gz"
+sha512sums="41c69b4800dc347f12b06010fe6a64391ad18fc35f0171fdcedb7843725dc6308c1d1f0486b10618938f6f98c8ca63eb15567af64e271efffcf255a8b96c3add bcnm-0.0.1.2.tar.gz"
diff --git a/user/bitlbee/APKBUILD b/user/bitlbee/APKBUILD
index c8774acd6..fd06fefd7 100644
--- a/user/bitlbee/APKBUILD
+++ b/user/bitlbee/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=bitlbee
pkgver=3.6
pkgrel=0
diff --git a/user/cairomm/APKBUILD b/user/cairomm/APKBUILD
index 7e22d21fd..33abf8249 100644
--- a/user/cairomm/APKBUILD
+++ b/user/cairomm/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=cairomm
pkgver=1.12.2
pkgrel=0
diff --git a/user/caja-dropbox/APKBUILD b/user/caja-dropbox/APKBUILD
index 7f32ac1ab..a4a44ded3 100644
--- a/user/caja-dropbox/APKBUILD
+++ b/user/caja-dropbox/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=caja-dropbox
pkgver=1.24.0
pkgrel=0
diff --git a/user/caja-extensions/APKBUILD b/user/caja-extensions/APKBUILD
index 635e499fb..19895bfd4 100644
--- a/user/caja-extensions/APKBUILD
+++ b/user/caja-extensions/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=caja-extensions
pkgver=1.24.1
pkgrel=0
diff --git a/user/caja/APKBUILD b/user/caja/APKBUILD
index a29500eb0..fe126dc54 100644
--- a/user/caja/APKBUILD
+++ b/user/caja/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=caja
pkgver=1.24.0
pkgrel=0
diff --git a/user/catfish/APKBUILD b/user/catfish/APKBUILD
index a04ef7f61..d47dda0d0 100644
--- a/user/catfish/APKBUILD
+++ b/user/catfish/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=catfish
pkgver=1.4.13
pkgrel=0
diff --git a/user/cloc/APKBUILD b/user/cloc/APKBUILD
index 5018779fc..906f45751 100644
--- a/user/cloc/APKBUILD
+++ b/user/cloc/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=cloc
pkgver=1.88
pkgrel=0
diff --git a/user/clutter/APKBUILD b/user/clutter/APKBUILD
index ff3469b1e..671c84733 100644
--- a/user/clutter/APKBUILD
+++ b/user/clutter/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=clutter
pkgver=1.26.4
pkgrel=0
diff --git a/user/cogl/APKBUILD b/user/cogl/APKBUILD
index 5cb9f34ef..98330463e 100644
--- a/user/cogl/APKBUILD
+++ b/user/cogl/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=cogl
pkgver=1.22.8
pkgrel=0
diff --git a/user/compton-conf/APKBUILD b/user/compton-conf/APKBUILD
index 093054850..a93426d1c 100644
--- a/user/compton-conf/APKBUILD
+++ b/user/compton-conf/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=compton-conf
pkgver=0.15.0
_lxqt_build=0.7.0
diff --git a/user/compton/APKBUILD b/user/compton/APKBUILD
index 82b9cc638..e888fc31e 100644
--- a/user/compton/APKBUILD
+++ b/user/compton/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=compton
pkgver=4
pkgrel=0
diff --git a/user/dconf/APKBUILD b/user/dconf/APKBUILD
index 1a90131ba..ca2e18186 100644
--- a/user/dconf/APKBUILD
+++ b/user/dconf/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=dconf
pkgver=0.38.0
pkgrel=0
diff --git a/user/dina/APKBUILD b/user/dina/APKBUILD
index 0bce275b4..15654cc28 100644
--- a/user/dina/APKBUILD
+++ b/user/dina/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=dina
pkgver=2.93
pkgrel=0
diff --git a/user/dovecot/APKBUILD b/user/dovecot/APKBUILD
index 64ac365e5..6f9a8d145 100644
--- a/user/dovecot/APKBUILD
+++ b/user/dovecot/APKBUILD
@@ -5,10 +5,10 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Lee Starnes <lee@canned-death.us>
pkgname=dovecot
-pkgver=2.3.11.3
+pkgver=2.3.14
_pkgvermajor=2.3
pkgrel=0
-_pigeonholever=0.5.11
+_pigeonholever=0.5.14
_pigeonholevermajor=${_pigeonholever%.*}
pkgdesc="IMAP and POP3 server"
url="https://www.dovecot.org/"
@@ -35,14 +35,17 @@ source="https://www.dovecot.org/releases/$_pkgvermajor/dovecot-$pkgver.tar.gz
split-protocols.patch
default-config.patch
ssl-paths.patch
+ test-file-cache-enomem.patch
time64.patch
- apop.patch
dovecot.logrotate
dovecot.initd
"
_builddir_pigeonhole="$srcdir/$pkgname-$_pkgvermajor-pigeonhole-$_pigeonholever"
# secfixes:
+# 2.3.13-r0:
+# - CVE-2020-24386
+# - CVE-2020-25275
# 2.3.11.3-r0:
# - CVE-2020-12100
# - CVE-2020-12673
@@ -255,13 +258,13 @@ _submv() {
done
}
-sha512sums="d83e52a7faab918a8e6f6257acc5936b81733c10489affd042c3a043cb842db060286cba9978be378e4958e9ac2e60b55ce289d7f3a88df08e7637e4785e23bb dovecot-2.3.11.3.tar.gz
-793d93edc50192c52654e2f7244d3e01aaa4e69f786e3ecfcd658a4ab26a5099cc5319cb93221150db4ce94bc4515ffb38115b1d0eeb6e052b956efec680b33d dovecot-2.3-pigeonhole-0.5.11.tar.gz
+sha512sums="69df234cb739c7ee7ae3acfb9756bc22481e94c95463d32bfac315c7ec4b1ba0dfbff552b769f2ab7ee554087ca2ebbe331aa008d3af26417016612dc7cad103 dovecot-2.3.14.tar.gz
+c5d5d309769eabe2c0971646d0c14d166b6b524acf59e1069eca803f764544fa2535c09c9a630ca706aa70442b688ee26af831d29e674823bac7ea7c0e1f33cc dovecot-2.3-pigeonhole-0.5.14.tar.gz
fe4fbeaedb377d809f105d9dbaf7c1b961aa99f246b77189a73b491dc1ae0aa9c68678dde90420ec53ec877c08f735b42d23edb13117d7268420e001aa30967a skip-iconv-check.patch
794875dbf0ded1e82c5c3823660cf6996a7920079149cd8eed54231a53580d931b966dfb17185ab65e565e108545ecf6591bae82f935ab1b6ff65bb8ee93d7d5 split-protocols.patch
0d8f89c7ba6f884719b5f9fc89e8b2efbdc3e181de308abf9b1c1b0e42282f4df72c7bf62f574686967c10a8677356560c965713b9d146e2770aab17e95bcc07 default-config.patch
5e68a0042a7c11b3d8c411fc157f5960e2e3305dac11f4b6b880441e2b4105769ddf6c56f67a995af6e1a58f3bfa2c199ea51318a3a0e37c7ef0ae6c4109b13f ssl-paths.patch
-ee2e1916c712db77409567b4ded9c7fb7dfed295e044c19694bc369af3d4a7086caf14e97809531f76b630bc578271af6e5137985b7d4e8d2afb2a71f800912f time64.patch
-7831276d17386b204ca3aed7fdd9439f00230aa345b367567133d568c07a92bec80ca7512c20b80f692f7f6809cf4a27398c9915aae763e0c9f641650540a73b apop.patch
+277d0b55583908cd6c063fb190eb3d2a362a3a33306e35a069a0bca28968f11627c455887d82d01884313b7f7e18530c056bd7a4cda0a1f9c4be7065cd033aa9 test-file-cache-enomem.patch
+28e0e3efcb1dd06cd971f1a8caa88989a165dbf14fdebf26ec1ab083020c6831231fec08c2a9d363e6af74003deeeb27122d044eccd02cf7945b464758e04622 time64.patch
9f19698ab45969f1f94dc4bddf6de59317daee93c9421c81f2dbf8a7efe6acf89689f1d30f60f536737bb9526c315215d2bce694db27e7b8d7896036a59c31f0 dovecot.logrotate
d91951b81150d7a3ef6a674c0dc7b012f538164dac4b9d27a6801d31da6813b764995a438f69b6a680463e1b60a3b4f2959654f68e565fe116ea60312d5e5e70 dovecot.initd"
diff --git a/user/dovecot/apop.patch b/user/dovecot/apop.patch
deleted file mode 100644
index a75c770e5..000000000
--- a/user/dovecot/apop.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From d1c5d356f36aaf9c32708cc6960fcaebe1cf6e63 Mon Sep 17 00:00:00 2001
-From: Paul Howarth <paul@city-fan.org>
-Date: Sun, 16 Aug 2020 20:32:03 +0100
-Subject: [PATCH] Fix APOP test failure on 32-bit systems
-
-The challenge timestamp is read as a hex number in mech_apop_auth_initial()
-so it should be written as hex, not decimal.
-
-Also fix compiler warnings for 32-bit architectures.
----
- src/auth/test-mech.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/auth/test-mech.c b/src/auth/test-mech.c
-index cf05370035..db9f85ccfc 100644
---- a/src/auth/test-mech.c
-+++ b/src/auth/test-mech.c
-@@ -192,11 +192,11 @@ static void test_mech_handle_challenge(struct auth_request *request,
- }
-
- static inline const unsigned char *
--test_mech_construct_apop_challenge(unsigned int connect_uid, unsigned long *len_r)
-+test_mech_construct_apop_challenge(unsigned int connect_uid, size_t *len_r)
- {
- string_t *apop_challenge = t_str_new(128);
-
-- str_printfa(apop_challenge,"<%lx.%u.%"PRIdTIME_T"", (unsigned long) getpid(),
-+ str_printfa(apop_challenge,"<%lx.%u.%"PRIxTIME_T"", (unsigned long) getpid(),
- connect_uid, process_start_time+10);
- str_append_data(apop_challenge, "\0testuser\0responseoflen16-", 26);
- *len_r = apop_challenge->used;
-@@ -323,7 +323,7 @@ static void test_mechs(void)
- struct test_case *test_case = &tests[running_test];
- const struct mech_module *mech = test_case->mech;
- struct auth_request *request;
-- const char *testname = t_strdup_printf("auth mech %s %d/%lu",
-+ const char *testname = t_strdup_printf("auth mech %s %d/%zu",
- mech->mech_name,
- running_test+1,
- N_ELEMENTS(tests));
diff --git a/user/dovecot/test-file-cache-enomem.patch b/user/dovecot/test-file-cache-enomem.patch
new file mode 100644
index 000000000..536b857de
--- /dev/null
+++ b/user/dovecot/test-file-cache-enomem.patch
@@ -0,0 +1,20 @@
+--- a/src/lib/test-file-cache.c 2021-01-05 14:10:50.160000000 +0000
++++ b/src/lib/test-file-cache.c 2021-01-05 14:10:50.160000000 +0000
+@@ -263,7 +263,7 @@
+ };
+ const char *errstr =
+ t_strdup_printf("mmap_anon(.test_file_cache, %zu) failed: "
+- "Cannot allocate memory", page_size);
++ "Out of memory", page_size);
+ test_assert(setrlimit(RLIMIT_AS, &rl_new) == 0);
+ test_expect_error_string(errstr);
+ test_assert(file_cache_set_size(cache, 1024) == -1);
+@@ -271,7 +271,7 @@
+
+ /* same for mremap */
+ errstr = t_strdup_printf("mremap_anon(.test_file_cache, %zu) failed: "
+- "Cannot allocate memory", page_size*2);
++ "Out of memory", page_size*2);
+ test_assert(file_cache_set_size(cache, 1) == 0);
+ test_assert(setrlimit(RLIMIT_AS, &rl_new) == 0);
+ test_expect_error_string(errstr);
diff --git a/user/dovecot/time64.patch b/user/dovecot/time64.patch
index c6f8e6261..4cd5c46e1 100644
--- a/user/dovecot/time64.patch
+++ b/user/dovecot/time64.patch
@@ -1,27 +1,17 @@
---- dovecot-2.3.11.3/src/lib-oauth2/oauth2-jwt.c.old 2020-08-12 12:20:41.000000000 +0000
-+++ dovecot-2.3.11.3/src/lib-oauth2/oauth2-jwt.c 2020-09-15 14:21:24.285796733 +0000
-@@ -31,13 +31,13 @@
+--- dovecot-2.3.14.orig/src/lib-oauth2/oauth2-jwt.c 2021-03-13 23:56:53.250000000 +0000
++++ dovecot-2.3.14/src/lib-oauth2/oauth2-jwt.c 2021-03-13 23:57:23.640000000 +0000
+@@ -31,7 +31,7 @@
}
- static int get_time_field(const struct json_tree *tree, const char *key,
-- long *value_r)
-+ long long *value_r)
+ static int
+-get_time_field(const struct json_tree *tree, const char *key, long *value_r)
++get_time_field(const struct json_tree *tree, const char *key, long long *value_r)
{
const char *value = get_field(tree, key);
int tz_offset ATTR_UNUSED;
- if (value == NULL)
- return 0;
-- if ((str_to_long(value, value_r) < 0 &&
-+ if ((str_to_llong(value, value_r) < 0 &&
- !iso8601_date_parse((const unsigned char*)value, strlen(value),
- value_r, &tz_offset)) ||
- *value_r < 0)
-@@ -283,9 +283,9 @@
- const char *sub = get_field(tree, "sub");
-
+@@ -313,7 +313,7 @@
int ret;
-- long t0 = time(NULL);
-+ long long t0 = time(NULL);
+ long t0 = time(NULL);
/* default IAT and NBF to now */
- long iat, nbf, exp;
+ long long iat, nbf, exp;
diff --git a/user/engrampa/APKBUILD b/user/engrampa/APKBUILD
index f77911f28..2750a1841 100644
--- a/user/engrampa/APKBUILD
+++ b/user/engrampa/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=engrampa
pkgver=1.24.1
pkgrel=0
diff --git a/user/eom/APKBUILD b/user/eom/APKBUILD
index 2cef9aebf..894927a9f 100644
--- a/user/eom/APKBUILD
+++ b/user/eom/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=eom
pkgver=1.24.1
pkgrel=0
diff --git a/user/exo/APKBUILD b/user/exo/APKBUILD
index d3d135619..8657537fb 100644
--- a/user/exo/APKBUILD
+++ b/user/exo/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=exo
pkgver=0.12.11
pkgrel=0
diff --git a/user/featherpad/APKBUILD b/user/featherpad/APKBUILD
index bae2b7c71..c43f1b2dc 100644
--- a/user/featherpad/APKBUILD
+++ b/user/featherpad/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=featherpad
pkgver=0.15.0
pkgrel=0
diff --git a/user/ffmpegthumbnailer/APKBUILD b/user/ffmpegthumbnailer/APKBUILD
index b8f5f02a2..b788670d5 100644
--- a/user/ffmpegthumbnailer/APKBUILD
+++ b/user/ffmpegthumbnailer/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=ffmpegthumbnailer
pkgver=2.2.2
pkgrel=0
diff --git a/user/fish/APKBUILD b/user/fish/APKBUILD
index 08e2a6e47..91c779505 100644
--- a/user/fish/APKBUILD
+++ b/user/fish/APKBUILD
@@ -1,5 +1,5 @@
# Contributor: William Pitcock <nenolod@dereferenced.org>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=fish
pkgver=3.1.2
pkgrel=0
diff --git a/user/flite/APKBUILD b/user/flite/APKBUILD
index dcd9d98f2..db1aecdd3 100644
--- a/user/flite/APKBUILD
+++ b/user/flite/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=flite
pkgver=2.1
pkgrel=0
diff --git a/user/garcon/APKBUILD b/user/garcon/APKBUILD
index 54e045d2b..18a0fd9fc 100644
--- a/user/garcon/APKBUILD
+++ b/user/garcon/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=garcon
pkgver=0.6.4
pkgrel=0
diff --git a/user/gcompat/APKBUILD b/user/gcompat/APKBUILD
index b515cb6ef..ea2f13e15 100644
--- a/user/gcompat/APKBUILD
+++ b/user/gcompat/APKBUILD
@@ -3,7 +3,7 @@ pkgname=gcompat
pkgver=1.0.0
pkgrel=0
pkgdesc="The GNU C Library compatibility layer for musl"
-url="https://code.foxkit.us/adelie/gcompat"
+url="https://git.adelielinux.org/adelie/gcompat"
arch="all"
options="!check" # No test suite.
license="UoI-NCSA"
diff --git a/user/gleam/APKBUILD b/user/gleam/APKBUILD
index 65271ea38..ebab3492b 100644
--- a/user/gleam/APKBUILD
+++ b/user/gleam/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=gleam
pkgver=0.6.0
pkgrel=0
diff --git a/user/glibmm/APKBUILD b/user/glibmm/APKBUILD
index e404babdc..df19a6e1f 100644
--- a/user/glibmm/APKBUILD
+++ b/user/glibmm/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=glibmm
pkgver=2.64.2
pkgrel=0
diff --git a/user/gtkmm+3.0/APKBUILD b/user/gtkmm+3.0/APKBUILD
index e2ed4bb8a..ba2d3ccef 100644
--- a/user/gtkmm+3.0/APKBUILD
+++ b/user/gtkmm+3.0/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=gtkmm+3.0
pkgver=3.24.2
pkgrel=0
diff --git a/user/gtksourceview-3.0/APKBUILD b/user/gtksourceview-3.0/APKBUILD
index 82ae71d56..68c2a6e8b 100644
--- a/user/gtksourceview-3.0/APKBUILD
+++ b/user/gtksourceview-3.0/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=gtksourceview-3.0
pkgver=3.24.11
pkgrel=0
diff --git a/user/gucharmap/APKBUILD b/user/gucharmap/APKBUILD
index 4b8b298d6..53aeaf4f5 100644
--- a/user/gucharmap/APKBUILD
+++ b/user/gucharmap/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=gucharmap
pkgver=13.0.3
_unicode=13.0.0
diff --git a/user/gvim/APKBUILD b/user/gvim/APKBUILD
index bffe90b4e..7608d6817 100644
--- a/user/gvim/APKBUILD
+++ b/user/gvim/APKBUILD
@@ -2,7 +2,7 @@
# Contributor: Łukasz Jendrysik <scadu@yandex.com>
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=gvim
_pkgreal=vim
pkgver=8.2.1900
diff --git a/user/hexchat/APKBUILD b/user/hexchat/APKBUILD
index 8ba05d268..9ee927d14 100644
--- a/user/hexchat/APKBUILD
+++ b/user/hexchat/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=hexchat
pkgver=2.14.3
pkgrel=0
diff --git a/user/icewm/APKBUILD b/user/icewm/APKBUILD
index e7927e44b..48f90891e 100644
--- a/user/icewm/APKBUILD
+++ b/user/icewm/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=icewm
pkgver=1.8.3
pkgrel=0
diff --git a/user/ido/APKBUILD b/user/ido/APKBUILD
index 329b48ddd..dd3f36858 100644
--- a/user/ido/APKBUILD
+++ b/user/ido/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=ido
pkgver=13.10.0
pkgrel=0
diff --git a/user/irssi/APKBUILD b/user/irssi/APKBUILD
index 3e6319e30..67c18a1e7 100644
--- a/user/irssi/APKBUILD
+++ b/user/irssi/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=irssi
pkgver=1.2.2
pkgrel=0
diff --git a/user/json-glib/APKBUILD b/user/json-glib/APKBUILD
index bf5447aff..4bc9291b6 100644
--- a/user/json-glib/APKBUILD
+++ b/user/json-glib/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=json-glib
pkgver=1.6.0
pkgrel=0
diff --git a/user/keybinder-3.0/APKBUILD b/user/keybinder-3.0/APKBUILD
index 63d1a84ca..00cfdc438 100644
--- a/user/keybinder-3.0/APKBUILD
+++ b/user/keybinder-3.0/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=keybinder-3.0
pkgver=0.3.2
pkgrel=0
diff --git a/user/libass/APKBUILD b/user/libass/APKBUILD
index f39c95ee3..6fa67ae60 100644
--- a/user/libass/APKBUILD
+++ b/user/libass/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=libass
pkgver=0.14.0
pkgrel=0
diff --git a/user/libayatana-indicator/APKBUILD b/user/libayatana-indicator/APKBUILD
index f31ad1658..8fc848e1c 100644
--- a/user/libayatana-indicator/APKBUILD
+++ b/user/libayatana-indicator/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=libayatana-indicator
pkgver=0.8.2
pkgrel=0
diff --git a/user/libburn/APKBUILD b/user/libburn/APKBUILD
index e6ff9bc25..9521b129f 100644
--- a/user/libburn/APKBUILD
+++ b/user/libburn/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=libburn
pkgver=1.5.2
pkgrel=0
diff --git a/user/libfakekey/APKBUILD b/user/libfakekey/APKBUILD
index af08c494c..ea1eec3f8 100644
--- a/user/libfakekey/APKBUILD
+++ b/user/libfakekey/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=libfakekey
pkgver=0.3
pkgrel=0
diff --git a/user/libfm-qt/APKBUILD b/user/libfm-qt/APKBUILD
index 674621204..ac679104b 100644
--- a/user/libfm-qt/APKBUILD
+++ b/user/libfm-qt/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=libfm-qt
pkgver=0.15.1
pkgrel=0
diff --git a/user/libglade/APKBUILD b/user/libglade/APKBUILD
index 9b09c9104..e8dd25f21 100644
--- a/user/libglade/APKBUILD
+++ b/user/libglade/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=libglade
pkgver=2.6.4
pkgrel=0
diff --git a/user/libgnome-keyring/APKBUILD b/user/libgnome-keyring/APKBUILD
index 7ecb68377..fdc1af0dd 100644
--- a/user/libgnome-keyring/APKBUILD
+++ b/user/libgnome-keyring/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=libgnome-keyring
pkgver=3.12.0
pkgrel=0
diff --git a/user/libgtop/APKBUILD b/user/libgtop/APKBUILD
index 37b1ef0e2..a03e337e9 100644
--- a/user/libgtop/APKBUILD
+++ b/user/libgtop/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=libgtop
pkgver=2.40.0
pkgrel=0
diff --git a/user/libindicator/APKBUILD b/user/libindicator/APKBUILD
index 3c57d570c..a76c9b185 100644
--- a/user/libindicator/APKBUILD
+++ b/user/libindicator/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=libindicator
pkgver=16.10
pkgrel=0
diff --git a/user/libisofs/APKBUILD b/user/libisofs/APKBUILD
index b870b3be7..3671011b1 100644
--- a/user/libisofs/APKBUILD
+++ b/user/libisofs/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=libisofs
pkgver=1.5.2
pkgrel=0
diff --git a/user/liblxqt/APKBUILD b/user/liblxqt/APKBUILD
index 24ff091bf..d9cd7cfa5 100644
--- a/user/liblxqt/APKBUILD
+++ b/user/liblxqt/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=liblxqt
pkgver=0.15.1
pkgrel=0
diff --git a/user/libmatekbd/APKBUILD b/user/libmatekbd/APKBUILD
index cc3c030f6..871efed9d 100644
--- a/user/libmatekbd/APKBUILD
+++ b/user/libmatekbd/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=libmatekbd
pkgver=1.24.1
pkgrel=0
diff --git a/user/libmatemixer/APKBUILD b/user/libmatemixer/APKBUILD
index 50954203b..b2a791106 100644
--- a/user/libmatemixer/APKBUILD
+++ b/user/libmatemixer/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=libmatemixer
pkgver=1.24.1
pkgrel=0
diff --git a/user/libmateweather/APKBUILD b/user/libmateweather/APKBUILD
index 34839685c..4e29d4d8c 100644
--- a/user/libmateweather/APKBUILD
+++ b/user/libmateweather/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=libmateweather
pkgver=1.24.1
pkgrel=0
diff --git a/user/libmpd/APKBUILD b/user/libmpd/APKBUILD
index c1fa255fd..f15d1b0fd 100644
--- a/user/libmpd/APKBUILD
+++ b/user/libmpd/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=libmpd
pkgver=11.8.17
pkgrel=0
diff --git a/user/libopenraw/APKBUILD b/user/libopenraw/APKBUILD
index a03e7c089..f3cea249b 100644
--- a/user/libopenraw/APKBUILD
+++ b/user/libopenraw/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=libopenraw
pkgver=0.1.3
pkgrel=0
diff --git a/user/libpeas/APKBUILD b/user/libpeas/APKBUILD
index 8f4447b9c..9fc1333a4 100644
--- a/user/libpeas/APKBUILD
+++ b/user/libpeas/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=libpeas
pkgver=1.28.0
pkgrel=0
diff --git a/user/libpsl/APKBUILD b/user/libpsl/APKBUILD
index 2b842085b..a45b2876a 100644
--- a/user/libpsl/APKBUILD
+++ b/user/libpsl/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=libpsl
pkgver=0.21.1
pkgrel=0
diff --git a/user/libqtxdg/APKBUILD b/user/libqtxdg/APKBUILD
index 7b0e70656..76807b5bf 100644
--- a/user/libqtxdg/APKBUILD
+++ b/user/libqtxdg/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=libqtxdg
pkgver=3.5.0
pkgrel=0
diff --git a/user/libsigc++/APKBUILD b/user/libsigc++/APKBUILD
index 943216d01..393d18e77 100644
--- a/user/libsigc++/APKBUILD
+++ b/user/libsigc++/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=libsigc++
pkgver=2.10.2
pkgrel=0
diff --git a/user/libsoup/APKBUILD b/user/libsoup/APKBUILD
index 7992f7d22..dc5d4c132 100644
--- a/user/libsoup/APKBUILD
+++ b/user/libsoup/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=libsoup
pkgver=2.70.0
pkgrel=0
diff --git a/user/libstatgrab/APKBUILD b/user/libstatgrab/APKBUILD
index 45a2bc72d..c1724f0d8 100644
--- a/user/libstatgrab/APKBUILD
+++ b/user/libstatgrab/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=libstatgrab
pkgver=0.92
pkgrel=0
diff --git a/user/libsysstat/APKBUILD b/user/libsysstat/APKBUILD
index 6c4e0ffc4..9f20151ed 100644
--- a/user/libsysstat/APKBUILD
+++ b/user/libsysstat/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=libsysstat
pkgver=0.4.3
_lxqt_build=0.7.0
diff --git a/user/libwebp/APKBUILD b/user/libwebp/APKBUILD
index a003a6b92..215b3b850 100644
--- a/user/libwebp/APKBUILD
+++ b/user/libwebp/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
# Maintainer:
pkgname=libwebp
pkgver=1.0.3
diff --git a/user/libwnck/APKBUILD b/user/libwnck/APKBUILD
index 2a33337a0..bf38f30bd 100644
--- a/user/libwnck/APKBUILD
+++ b/user/libwnck/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=libwnck
pkgver=3.36.0
_pkgmaj=${pkgver%.*}
diff --git a/user/libxfce4ui/APKBUILD b/user/libxfce4ui/APKBUILD
index 62acc0a53..85300dd25 100644
--- a/user/libxfce4ui/APKBUILD
+++ b/user/libxfce4ui/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=libxfce4ui
pkgver=4.14.1
pkgrel=0
diff --git a/user/libxfce4util/APKBUILD b/user/libxfce4util/APKBUILD
index 823692e8e..1b3b0c22b 100644
--- a/user/libxfce4util/APKBUILD
+++ b/user/libxfce4util/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=libxfce4util
pkgver=4.14.0
pkgrel=0
diff --git a/user/libxklavier/APKBUILD b/user/libxklavier/APKBUILD
index 3effb3cba..a8ecb207c 100644
--- a/user/libxklavier/APKBUILD
+++ b/user/libxklavier/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=libxklavier
pkgver=5.4
pkgrel=2
diff --git a/user/lua-expat/APKBUILD b/user/lua-expat/APKBUILD
index 704f89173..55929a9f1 100644
--- a/user/lua-expat/APKBUILD
+++ b/user/lua-expat/APKBUILD
@@ -1,6 +1,6 @@
# Contributor: Mika Havela <mika.havela@gmail.com>
# Contribtor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=lua-expat
pkgver=1.3.3
pkgrel=0
diff --git a/user/lua-filesystem/APKBUILD b/user/lua-filesystem/APKBUILD
index c4449467b..40d6fd1a8 100644
--- a/user/lua-filesystem/APKBUILD
+++ b/user/lua-filesystem/APKBUILD
@@ -1,5 +1,5 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=lua-filesystem
_pkgname=luafilesystem
pkgver=1.8.0
diff --git a/user/lua-socket/APKBUILD b/user/lua-socket/APKBUILD
index 7c0197036..18db2ba8b 100644
--- a/user/lua-socket/APKBUILD
+++ b/user/lua-socket/APKBUILD
@@ -1,5 +1,5 @@
# Contributor: Mika Havela <mika.havela@gmail.com>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=lua-socket
_name=luasocket
pkgver=3.0_rc1_git20160306
diff --git a/user/luarocks/APKBUILD b/user/luarocks/APKBUILD
index 183fe20c5..7048a179b 100644
--- a/user/luarocks/APKBUILD
+++ b/user/luarocks/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=luarocks
pkgver=3.4.0
pkgrel=0
diff --git a/user/lximage-qt/APKBUILD b/user/lximage-qt/APKBUILD
index 1dce23e0f..185bb86bb 100644
--- a/user/lximage-qt/APKBUILD
+++ b/user/lximage-qt/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=lximage-qt
pkgver=0.15.0
pkgrel=0
diff --git a/user/lxmenu-data/APKBUILD b/user/lxmenu-data/APKBUILD
index 903ec3079..22de994d3 100644
--- a/user/lxmenu-data/APKBUILD
+++ b/user/lxmenu-data/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=lxmenu-data
pkgver=0.1.5
pkgrel=1
diff --git a/user/lxqt-about/APKBUILD b/user/lxqt-about/APKBUILD
index 799843b1c..4f65e7a69 100644
--- a/user/lxqt-about/APKBUILD
+++ b/user/lxqt-about/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=lxqt-about
pkgver=0.15.0
_lxqt_build=0.7.0
diff --git a/user/lxqt-admin/APKBUILD b/user/lxqt-admin/APKBUILD
index 5267f2663..b455996cf 100644
--- a/user/lxqt-admin/APKBUILD
+++ b/user/lxqt-admin/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=lxqt-admin
pkgver=0.15.0
_lxqt_build=0.7.0
diff --git a/user/lxqt-archiver/APKBUILD b/user/lxqt-archiver/APKBUILD
index b3a23905a..0dd3851c0 100644
--- a/user/lxqt-archiver/APKBUILD
+++ b/user/lxqt-archiver/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=lxqt-archiver
pkgver=0.2.0
_lxqt=0.15.0
diff --git a/user/lxqt-build-tools/APKBUILD b/user/lxqt-build-tools/APKBUILD
index 3439629fe..baf55aab0 100644
--- a/user/lxqt-build-tools/APKBUILD
+++ b/user/lxqt-build-tools/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=lxqt-build-tools
pkgver=0.7.0
pkgrel=0
diff --git a/user/lxqt-config/APKBUILD b/user/lxqt-config/APKBUILD
index 9f7b280df..2e7a56379 100644
--- a/user/lxqt-config/APKBUILD
+++ b/user/lxqt-config/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=lxqt-config
pkgver=0.15.0
_lxqt_build=0.7.0
diff --git a/user/lxqt-desktop/APKBUILD b/user/lxqt-desktop/APKBUILD
index af52254f2..4434caeb6 100644
--- a/user/lxqt-desktop/APKBUILD
+++ b/user/lxqt-desktop/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=lxqt-desktop
pkgver=0.15.0
pkgrel=0
diff --git a/user/lxqt-globalkeys/APKBUILD b/user/lxqt-globalkeys/APKBUILD
index 5e8f3d607..b15bcfdae 100644
--- a/user/lxqt-globalkeys/APKBUILD
+++ b/user/lxqt-globalkeys/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=lxqt-globalkeys
pkgver=0.15.0
_lxqt_build=0.7.0
diff --git a/user/lxqt-l10n/APKBUILD b/user/lxqt-l10n/APKBUILD
index 8b670254e..dc635ccf6 100644
--- a/user/lxqt-l10n/APKBUILD
+++ b/user/lxqt-l10n/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=lxqt-l10n
pkgver=0.13.0
pkgrel=1
diff --git a/user/lxqt-notificationd/APKBUILD b/user/lxqt-notificationd/APKBUILD
index 186659ef6..6b35346fc 100644
--- a/user/lxqt-notificationd/APKBUILD
+++ b/user/lxqt-notificationd/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=lxqt-notificationd
pkgver=0.15.0
_lxqt_build=0.7.0
diff --git a/user/lxqt-openssh-askpass/APKBUILD b/user/lxqt-openssh-askpass/APKBUILD
index 522c95b77..ead20c606 100644
--- a/user/lxqt-openssh-askpass/APKBUILD
+++ b/user/lxqt-openssh-askpass/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=lxqt-openssh-askpass
pkgver=0.15.0
_lxqt_build=0.7.0
diff --git a/user/lxqt-panel/APKBUILD b/user/lxqt-panel/APKBUILD
index 612652a82..a089cce0c 100644
--- a/user/lxqt-panel/APKBUILD
+++ b/user/lxqt-panel/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=lxqt-panel
pkgver=0.15.1
_lxqt_build=0.7.0
diff --git a/user/lxqt-policykit/APKBUILD b/user/lxqt-policykit/APKBUILD
index c1944f330..621c6a3de 100644
--- a/user/lxqt-policykit/APKBUILD
+++ b/user/lxqt-policykit/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=lxqt-policykit
pkgver=0.15.0
_lxqt_build=0.7.0
diff --git a/user/lxqt-powermanagement/APKBUILD b/user/lxqt-powermanagement/APKBUILD
index 775735e4c..d92980e83 100644
--- a/user/lxqt-powermanagement/APKBUILD
+++ b/user/lxqt-powermanagement/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=lxqt-powermanagement
pkgver=0.15.0
_lxqt_build=0.7.0
diff --git a/user/lxqt-qtplugin/APKBUILD b/user/lxqt-qtplugin/APKBUILD
index e9b2485d8..464689f9e 100644
--- a/user/lxqt-qtplugin/APKBUILD
+++ b/user/lxqt-qtplugin/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=lxqt-qtplugin
pkgver=0.15.1
pkgrel=0
diff --git a/user/lxqt-runner/APKBUILD b/user/lxqt-runner/APKBUILD
index 865c21555..4e9c876df 100644
--- a/user/lxqt-runner/APKBUILD
+++ b/user/lxqt-runner/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=lxqt-runner
pkgver=0.15.0
_lxqt_build=0.7.0
diff --git a/user/lxqt-session/APKBUILD b/user/lxqt-session/APKBUILD
index a10f61174..0fcd1a3b4 100644
--- a/user/lxqt-session/APKBUILD
+++ b/user/lxqt-session/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=lxqt-session
pkgver=0.15.0
_lxqt_build=0.7.0
diff --git a/user/lxqt-sudo/APKBUILD b/user/lxqt-sudo/APKBUILD
index 8014d2bd9..7ee30f853 100644
--- a/user/lxqt-sudo/APKBUILD
+++ b/user/lxqt-sudo/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=lxqt-sudo
pkgver=0.15.0
_lxqt_build=0.7.0
diff --git a/user/lxqt-themes/APKBUILD b/user/lxqt-themes/APKBUILD
index 63ff10079..83b049c99 100644
--- a/user/lxqt-themes/APKBUILD
+++ b/user/lxqt-themes/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=lxqt-themes
pkgver=0.15.0
_lxqt_build=0.7.0
diff --git a/user/lynx/APKBUILD b/user/lynx/APKBUILD
index 4bd75c160..011cf2822 100644
--- a/user/lynx/APKBUILD
+++ b/user/lynx/APKBUILD
@@ -1,6 +1,6 @@
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=lynx
pkgver=2.8.9_p1
_relver="${pkgver%_p*}rel.${pkgver#*_p}"
diff --git a/user/marco/APKBUILD b/user/marco/APKBUILD
index b138a4789..28dbba45c 100644
--- a/user/marco/APKBUILD
+++ b/user/marco/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=marco
pkgver=1.24.1
pkgrel=0
diff --git a/user/mate-applets/APKBUILD b/user/mate-applets/APKBUILD
index 5fdaee9b0..bf91290a6 100644
--- a/user/mate-applets/APKBUILD
+++ b/user/mate-applets/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=mate-applets
pkgver=1.24.1
pkgrel=0
diff --git a/user/mate-backgrounds/APKBUILD b/user/mate-backgrounds/APKBUILD
index 6fb270902..6f392b8f4 100644
--- a/user/mate-backgrounds/APKBUILD
+++ b/user/mate-backgrounds/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=mate-backgrounds
pkgver=1.24.2
pkgrel=0
diff --git a/user/mate-calc/APKBUILD b/user/mate-calc/APKBUILD
index 6b78e3749..ab8189e5f 100644
--- a/user/mate-calc/APKBUILD
+++ b/user/mate-calc/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=mate-calc
pkgver=1.24.1
pkgrel=0
diff --git a/user/mate-common/APKBUILD b/user/mate-common/APKBUILD
index 910f80563..4670f0a1f 100644
--- a/user/mate-common/APKBUILD
+++ b/user/mate-common/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=mate-common
pkgver=1.24.2
pkgrel=0
diff --git a/user/mate-complete/APKBUILD b/user/mate-complete/APKBUILD
index 1f2373aad..81e7a2590 100644
--- a/user/mate-complete/APKBUILD
+++ b/user/mate-complete/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=mate-complete
pkgver=1.22.0
pkgrel=1
diff --git a/user/mate-control-center/APKBUILD b/user/mate-control-center/APKBUILD
index 27f932025..5499e8ae3 100644
--- a/user/mate-control-center/APKBUILD
+++ b/user/mate-control-center/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=mate-control-center
pkgver=1.24.1
pkgrel=0
diff --git a/user/mate-desktop/APKBUILD b/user/mate-desktop/APKBUILD
index 725233d44..d62a2bb9d 100644
--- a/user/mate-desktop/APKBUILD
+++ b/user/mate-desktop/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=mate-desktop
pkgver=1.24.1
pkgrel=0
diff --git a/user/mate-icon-theme/APKBUILD b/user/mate-icon-theme/APKBUILD
index eb5431a39..8a7e7a4bf 100644
--- a/user/mate-icon-theme/APKBUILD
+++ b/user/mate-icon-theme/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=mate-icon-theme
pkgver=1.24.0
pkgrel=0
diff --git a/user/mate-indicator-applet/APKBUILD b/user/mate-indicator-applet/APKBUILD
index 1f16d683a..e717b48ec 100644
--- a/user/mate-indicator-applet/APKBUILD
+++ b/user/mate-indicator-applet/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=mate-indicator-applet
pkgver=1.24.0
pkgrel=0
diff --git a/user/mate-media/APKBUILD b/user/mate-media/APKBUILD
index 7fd9c64d9..e1b71d207 100644
--- a/user/mate-media/APKBUILD
+++ b/user/mate-media/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=mate-media
pkgver=1.24.1
pkgrel=0
diff --git a/user/mate-menus/APKBUILD b/user/mate-menus/APKBUILD
index ced3a050b..bbe2af97f 100644
--- a/user/mate-menus/APKBUILD
+++ b/user/mate-menus/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=mate-menus
pkgver=1.24.1
pkgrel=0
diff --git a/user/mate-netbook/APKBUILD b/user/mate-netbook/APKBUILD
index d2ef4243c..cfd970b41 100644
--- a/user/mate-netbook/APKBUILD
+++ b/user/mate-netbook/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=mate-netbook
pkgver=1.24.0
pkgrel=0
diff --git a/user/mate-notification-daemon/APKBUILD b/user/mate-notification-daemon/APKBUILD
index cc0831cf2..2f1981e3d 100644
--- a/user/mate-notification-daemon/APKBUILD
+++ b/user/mate-notification-daemon/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=mate-notification-daemon
pkgver=1.24.1
pkgrel=0
diff --git a/user/mate-panel/APKBUILD b/user/mate-panel/APKBUILD
index 946937eb2..73d5ec980 100644
--- a/user/mate-panel/APKBUILD
+++ b/user/mate-panel/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=mate-panel
pkgver=1.24.1
pkgrel=0
diff --git a/user/mate-polkit/APKBUILD b/user/mate-polkit/APKBUILD
index c634bcd6a..817c0f12a 100644
--- a/user/mate-polkit/APKBUILD
+++ b/user/mate-polkit/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=mate-polkit
pkgver=1.24.0
pkgrel=0
diff --git a/user/mate-power-manager/APKBUILD b/user/mate-power-manager/APKBUILD
index 916684668..9401b77d9 100644
--- a/user/mate-power-manager/APKBUILD
+++ b/user/mate-power-manager/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=mate-power-manager
pkgver=1.24.2
pkgrel=0
diff --git a/user/mate-screensaver/APKBUILD b/user/mate-screensaver/APKBUILD
index a42328976..f27fe8a28 100644
--- a/user/mate-screensaver/APKBUILD
+++ b/user/mate-screensaver/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=mate-screensaver
pkgver=1.24.1
pkgrel=0
diff --git a/user/mate-sensors-applet/APKBUILD b/user/mate-sensors-applet/APKBUILD
index 2f3afdd6b..2fe06db71 100644
--- a/user/mate-sensors-applet/APKBUILD
+++ b/user/mate-sensors-applet/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=mate-sensors-applet
pkgver=1.24.1
pkgrel=0
diff --git a/user/mate-session-manager/APKBUILD b/user/mate-session-manager/APKBUILD
index 315e957ff..1f2c4e890 100644
--- a/user/mate-session-manager/APKBUILD
+++ b/user/mate-session-manager/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=mate-session-manager
pkgver=1.24.1
pkgrel=0
diff --git a/user/mate-settings-daemon/APKBUILD b/user/mate-settings-daemon/APKBUILD
index 017a8cce7..f2a472f59 100644
--- a/user/mate-settings-daemon/APKBUILD
+++ b/user/mate-settings-daemon/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=mate-settings-daemon
pkgver=1.24.1
pkgrel=0
diff --git a/user/mate-system-monitor/APKBUILD b/user/mate-system-monitor/APKBUILD
index 2ed4de2f0..71951024f 100644
--- a/user/mate-system-monitor/APKBUILD
+++ b/user/mate-system-monitor/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=mate-system-monitor
pkgver=1.24.1
pkgrel=0
diff --git a/user/mate-terminal/APKBUILD b/user/mate-terminal/APKBUILD
index 24deabf94..afc127494 100644
--- a/user/mate-terminal/APKBUILD
+++ b/user/mate-terminal/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=mate-terminal
pkgver=1.24.1
pkgrel=0
diff --git a/user/mate-user-guide/APKBUILD b/user/mate-user-guide/APKBUILD
index c9ec36fe0..d0466f14f 100644
--- a/user/mate-user-guide/APKBUILD
+++ b/user/mate-user-guide/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=mate-user-guide
pkgver=1.24.0
pkgrel=0
diff --git a/user/mate-user-share/APKBUILD b/user/mate-user-share/APKBUILD
index d20aae02f..915fc7e52 100644
--- a/user/mate-user-share/APKBUILD
+++ b/user/mate-user-share/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=mate-user-share
pkgver=1.24.0
pkgrel=0
diff --git a/user/mate-utils/APKBUILD b/user/mate-utils/APKBUILD
index 710cfd1bf..1ecd284a0 100644
--- a/user/mate-utils/APKBUILD
+++ b/user/mate-utils/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=mate-utils
pkgver=1.24.0
pkgrel=0
diff --git a/user/mimetic/APKBUILD b/user/mimetic/APKBUILD
index 8913eecd8..843a382ee 100644
--- a/user/mimetic/APKBUILD
+++ b/user/mimetic/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=mimetic
pkgver=0.9.8
pkgrel=0
diff --git a/user/mksh/APKBUILD b/user/mksh/APKBUILD
index 695fdc5c2..8c0e47752 100644
--- a/user/mksh/APKBUILD
+++ b/user/mksh/APKBUILD
@@ -1,12 +1,12 @@
# Contributor: Marek Benc <dusxmt@gmx.com>
# Maintainer: Marek Benc <dusxmt@gmx.com>
pkgname=mksh
-pkgver=59b
+pkgver=59c
pkgrel=0
pkgdesc="MirBSD Korn Shell, a free Korn Shell interpreter"
url="http://mirbsd.de/mksh"
arch="all"
-license="MirOS OR ISC"
+license="MirOS AND Unicode-DFS-2016"
depends=""
checkdepends="ed perl"
makedepends=""
@@ -24,6 +24,9 @@ build() {
CFLAGS="$CFLAGS -DMKSH_BINSHPOSIX -DMKSH_BINSHREDUCED" \
/bin/sh ./Build.sh -r -L
mv test.sh test_lksh.sh
+
+ # Build the HTML FAQ:
+ /bin/sh ./FAQ2HTML.sh
}
check() {
@@ -45,6 +48,7 @@ package() {
mkdir -p "$pkgdir"/usr/share/doc/mksh/examples/
install -m 644 dot.mkshrc "$pkgdir"/usr/share/doc/mksh/examples/
+ install -m 644 FAQ.htm "$pkgdir"/usr/share/doc/mksh/
}
-sha512sums="4ae330a79a09d2dd989116b1a836ab7f179d920eb34c97ea5da7d1434361911a93ba77ca47c5e473e5a5ce1877f2a2e919a807bb6139ec6c89c87969054d021d mksh-R59b.tgz"
+sha512sums="f56b6956f9e1dd88ddce2294301a5eb698050d9d4f49286fdcd8f9df8554eabbcc71d37e2bf3eb7234e3968a17231cc6de8aa7efbf17768834a90b14e8cdf340 mksh-R59c.tgz"
diff --git a/user/mousepad/APKBUILD b/user/mousepad/APKBUILD
index f7e87a35d..489ab5cfb 100644
--- a/user/mousepad/APKBUILD
+++ b/user/mousepad/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=mousepad
pkgver=0.4.2
pkgrel=0
diff --git a/user/mozo/APKBUILD b/user/mozo/APKBUILD
index 717eff0f5..d6001e1e9 100644
--- a/user/mozo/APKBUILD
+++ b/user/mozo/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=mozo
pkgver=1.24.0
pkgrel=0
diff --git a/user/mplayer/APKBUILD b/user/mplayer/APKBUILD
index 4324b3565..7da337408 100644
--- a/user/mplayer/APKBUILD
+++ b/user/mplayer/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=mplayer
pkgver=1.4
pkgrel=2
diff --git a/user/mpv/APKBUILD b/user/mpv/APKBUILD
index 6f5c53558..115cede24 100644
--- a/user/mpv/APKBUILD
+++ b/user/mpv/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=mpv
pkgver=0.32.0
pkgrel=0
diff --git a/user/muparser/APKBUILD b/user/muparser/APKBUILD
index 5e5ebbd46..491855832 100644
--- a/user/muparser/APKBUILD
+++ b/user/muparser/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=muparser
pkgver=2.3.2
pkgrel=0
diff --git a/user/netsurf/APKBUILD b/user/netsurf/APKBUILD
index 8b95a338e..f2554aee4 100644
--- a/user/netsurf/APKBUILD
+++ b/user/netsurf/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=netsurf
pkgver=3.10
pkgrel=0
diff --git a/user/nfs-utils/APKBUILD b/user/nfs-utils/APKBUILD
index 2d42c60ff..e36cee7ff 100644
--- a/user/nfs-utils/APKBUILD
+++ b/user/nfs-utils/APKBUILD
@@ -70,5 +70,5 @@ f12e67728ac4e76357685e2fe38bd7f6fcd90064165758ffeca145e6962ac44d4ff9d8d57e18cc69
d9d7eeebbe153d3c4784112ed6d50734b5619b3315bb1454f8163de2b78ed8f958029a0e1088de58e9b1b8069184aeab2c8f19af4b957b6be25e4f138960aeac rpc.gssd.initd
f3e88038cb040ffcbca76166f4322d37e39da00d144bc0a17aed4467ab10c6e626fcde6c407d0911d135bfab55622ad2e38ed93788b11459c5882ce60577fb45 rpc.idmapd.initd
3d3fa6e7ae01e27d27d88aba1e307c5293dd1cbc9d555737e03c4f1e17988518f4f1e7f7a38a7337f8e8961e8378cc4611769b04db7368460589a3b218ac6d6b rpc.pipefs.initd
-7f6baea852fff91b88e15e432ba19f9da0a3e3510b6f550b553912cf3887ce176280367b62bcce2a044730a075e4c1f6d7df1a669556d42725dea6e6e8e967ac rpc.statd.initd
+a0fe91b4d7d288cb4793335c79e715b3726f573674ef29525bdab20c2053d1ae19e53a76852ef038aee0ad24fb18827a4ff333a0a179263b1ba47c9a6e2d337c rpc.statd.initd
819cce4ae0a0f26bc74ce546e149b98420584240a594c9bb4a0a49413750320bde050866f3753c499425ea8d8df094211fb1f7e020ce281791e1933e1bc6a47f rpc.svcgssd.initd"
diff --git a/user/nfs-utils/rpc.statd.initd b/user/nfs-utils/rpc.statd.initd
index ea78b9aef..bd0e9cb8f 100644
--- a/user/nfs-utils/rpc.statd.initd
+++ b/user/nfs-utils/rpc.statd.initd
@@ -4,7 +4,7 @@
[ -e /etc/conf.d/nfs ] && . /etc/conf.d/nfs
-rpc_bin=/sbin/rpc.statd
+rpc_bin=/usr/sbin/rpc.statd
rpc_pid=/var/run/rpc.statd.pid
depend() {
diff --git a/user/obconf-qt/APKBUILD b/user/obconf-qt/APKBUILD
index 5c24d7987..a52ef44ff 100644
--- a/user/obconf-qt/APKBUILD
+++ b/user/obconf-qt/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=obconf-qt
pkgver=0.15.0
_lxqt_build=0.7.0
diff --git a/user/openvpn/APKBUILD b/user/openvpn/APKBUILD
index e34112fc3..60c5f77f1 100644
--- a/user/openvpn/APKBUILD
+++ b/user/openvpn/APKBUILD
@@ -2,7 +2,7 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Lee Starnes <lee@canned-death.us>
pkgname=openvpn
-pkgver=2.4.9
+pkgver=2.4.11
pkgrel=0
pkgdesc="A robust, and highly configurable VPN (Virtual Private Network)"
url="https://openvpn.net/"
@@ -20,6 +20,8 @@ source="https://swupdate.openvpn.net/community/releases/$pkgname-$pkgver.tar.gz
"
# secfixes:
+# 2.4.11-r0:
+# - CVE-2020-15078
# 2.4.9-r0:
# - CVE-2020-11810
@@ -63,7 +65,7 @@ pam() {
"$subpkgdir"/usr/lib/openvpn/plugins/
}
-sha512sums="a05cbd6c73809f26cd1b68bd491ceb8fb4ddf2cde0407f73f4c16d97477a4853722a1618e6dcf0b111283f73d9499b593b25107bb1441d9b38c80e76d6bcc69b openvpn-2.4.9.tar.gz
+sha512sums="dc9500406b6f4d195d8039bce6ed39b091c2f46f8cdfd2cc8ca472cf609e70711269023cfff4ee91db27b3c194524bde79c14d39811687460702c0c76111c8a6 openvpn-2.4.11.tar.gz
3594937d4cc9d7b87ac6a3af433f651ed9695f41586994f9d9789554fbe3f87f054b997b89486eda4ae0b852d816aac9007222168d585910aa9f255073324bd9 openvpn.initd
6b2353aca9df7f43044e4e37990491b4ba077e259ebe13b8f2eb43e35ca7a617c1a65c5bfb8ab05e87cf12c4444184ae064f01f9abbb3c023dbbc07ff3f9c84e openvpn.confd
cdb73c9a5b1eb56e9cbd29955d94297ce5a87079419cd626d6a0b6680d88cbf310735a53f794886df02030b687eaea553c7c569a8ea1282a149441add1c65760 openvpn.up
diff --git a/user/orage/APKBUILD b/user/orage/APKBUILD
index 9681a20ae..2d14e41c3 100644
--- a/user/orage/APKBUILD
+++ b/user/orage/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=orage
pkgver=4.12.1
pkgrel=2
diff --git a/user/otf-culmus/APKBUILD b/user/otf-culmus/APKBUILD
index ffbf36df1..9c8b5a823 100644
--- a/user/otf-culmus/APKBUILD
+++ b/user/otf-culmus/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=otf-culmus
pkgver=0.133
pkgrel=0
diff --git a/user/otf-exo/APKBUILD b/user/otf-exo/APKBUILD
index c7ee2436a..4bde85eb7 100644
--- a/user/otf-exo/APKBUILD
+++ b/user/otf-exo/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=otf-exo
pkgver=2
pkgrel=0
diff --git a/user/otf-office-code-pro/APKBUILD b/user/otf-office-code-pro/APKBUILD
index 0f1ad30b2..d5f2cc7c2 100644
--- a/user/otf-office-code-pro/APKBUILD
+++ b/user/otf-office-code-pro/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=otf-office-code-pro
pkgver=1.004
pkgrel=0
diff --git a/user/otf-proggy-vector/APKBUILD b/user/otf-proggy-vector/APKBUILD
index 985c7f18e..618bad5d6 100644
--- a/user/otf-proggy-vector/APKBUILD
+++ b/user/otf-proggy-vector/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=otf-proggy-vector
pkgver=1.1.5
pkgrel=0
diff --git a/user/otf-source-code-pro/APKBUILD b/user/otf-source-code-pro/APKBUILD
index 5e96c1717..0b880690f 100644
--- a/user/otf-source-code-pro/APKBUILD
+++ b/user/otf-source-code-pro/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=otf-source-code-pro
pkgver=2.030
_pkgver=1.050
diff --git a/user/otf-source-sans-pro/APKBUILD b/user/otf-source-sans-pro/APKBUILD
index 765bfadf8..ef47f92e6 100644
--- a/user/otf-source-sans-pro/APKBUILD
+++ b/user/otf-source-sans-pro/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=otf-source-sans-pro
pkgver=3.028
_pkgver=${pkgver%.*}v${pkgver#*.}
diff --git a/user/otf-source-serif-pro/APKBUILD b/user/otf-source-serif-pro/APKBUILD
index e90f45cbd..bb92895c1 100644
--- a/user/otf-source-serif-pro/APKBUILD
+++ b/user/otf-source-serif-pro/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=otf-source-serif-pro
pkgver=3.001
pkgrel=0
diff --git a/user/pangomm/APKBUILD b/user/pangomm/APKBUILD
index ae190e40d..d7f6e4501 100644
--- a/user/pangomm/APKBUILD
+++ b/user/pangomm/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=pangomm
pkgver=2.42.1
pkgrel=0
diff --git a/user/parole/APKBUILD b/user/parole/APKBUILD
index cf55cd657..ad9967bfb 100644
--- a/user/parole/APKBUILD
+++ b/user/parole/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=parole
pkgver=1.0.5
pkgrel=0
diff --git a/user/pavucontrol-qt/APKBUILD b/user/pavucontrol-qt/APKBUILD
index 5b81f0c88..3dd65918d 100644
--- a/user/pavucontrol-qt/APKBUILD
+++ b/user/pavucontrol-qt/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=pavucontrol-qt
pkgver=0.15.0
_lxqt_build=0.7.0
diff --git a/user/pavucontrol/APKBUILD b/user/pavucontrol/APKBUILD
index 5c98d4f57..2e60cf25b 100644
--- a/user/pavucontrol/APKBUILD
+++ b/user/pavucontrol/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=pavucontrol
pkgver=4.0
pkgrel=0
diff --git a/user/pcmanfm-qt/APKBUILD b/user/pcmanfm-qt/APKBUILD
index a72c1e6ea..e3fd3540f 100644
--- a/user/pcmanfm-qt/APKBUILD
+++ b/user/pcmanfm-qt/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=pcmanfm-qt
pkgver=0.15.1
pkgrel=0
diff --git a/user/pcmanfm/APKBUILD b/user/pcmanfm/APKBUILD
index 806d8b65d..4b2025181 100644
--- a/user/pcmanfm/APKBUILD
+++ b/user/pcmanfm/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=pcmanfm
pkgver=1.3.1
pkgrel=0
diff --git a/user/perl-app-licensecheck/APKBUILD b/user/perl-app-licensecheck/APKBUILD
index d053ee8ee..88798a155 100644
--- a/user/perl-app-licensecheck/APKBUILD
+++ b/user/perl-app-licensecheck/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-app-licensecheck
_pkgreal=App-Licensecheck
diff --git a/user/perl-b-hooks-op-check/APKBUILD b/user/perl-b-hooks-op-check/APKBUILD
index b5dae3817..7a79656b2 100644
--- a/user/perl-b-hooks-op-check/APKBUILD
+++ b/user/perl-b-hooks-op-check/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-b-hooks-op-check
_pkgreal=B-Hooks-OP-Check
diff --git a/user/perl-bareword-filehandles/APKBUILD b/user/perl-bareword-filehandles/APKBUILD
index 7b67d3047..92c6b95be 100644
--- a/user/perl-bareword-filehandles/APKBUILD
+++ b/user/perl-bareword-filehandles/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-bareword-filehandles
_pkgreal=bareword-filehandles
diff --git a/user/perl-cpan-changes/APKBUILD b/user/perl-cpan-changes/APKBUILD
index 0a1f4ddd4..9a0dc30fb 100644
--- a/user/perl-cpan-changes/APKBUILD
+++ b/user/perl-cpan-changes/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-cpan-changes
_pkgreal=CPAN-Changes
diff --git a/user/perl-data-dump/APKBUILD b/user/perl-data-dump/APKBUILD
index 1ee807e32..6a6a10896 100644
--- a/user/perl-data-dump/APKBUILD
+++ b/user/perl-data-dump/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-data-dump
_pkgreal=Data-Dump
diff --git a/user/perl-data-section/APKBUILD b/user/perl-data-section/APKBUILD
index 48e7a8759..da9829a28 100644
--- a/user/perl-data-section/APKBUILD
+++ b/user/perl-data-section/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-data-section
_pkgreal=Data-Section
diff --git a/user/perl-devel-hide/APKBUILD b/user/perl-devel-hide/APKBUILD
index 2c41fb4d3..e81937122 100644
--- a/user/perl-devel-hide/APKBUILD
+++ b/user/perl-devel-hide/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-devel-hide
_pkgreal=Devel-Hide
diff --git a/user/perl-importer/APKBUILD b/user/perl-importer/APKBUILD
index 3aeb91912..789feb526 100644
--- a/user/perl-importer/APKBUILD
+++ b/user/perl-importer/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-importer
_pkgreal=Importer
diff --git a/user/perl-indirect/APKBUILD b/user/perl-indirect/APKBUILD
index d9fe7b5fa..0d7420f12 100644
--- a/user/perl-indirect/APKBUILD
+++ b/user/perl-indirect/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-indirect
_pkgreal=indirect
diff --git a/user/perl-multidimensional/APKBUILD b/user/perl-multidimensional/APKBUILD
index 4d7e17f53..90e7b2ba1 100644
--- a/user/perl-multidimensional/APKBUILD
+++ b/user/perl-multidimensional/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-multidimensional
_pkgreal=multidimensional
diff --git a/user/perl-net-dbus/APKBUILD b/user/perl-net-dbus/APKBUILD
index 7291dbaa2..58b69ad43 100644
--- a/user/perl-net-dbus/APKBUILD
+++ b/user/perl-net-dbus/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-net-dbus
_pkgreal=Net-DBus
diff --git a/user/perl-net-snmp/APKBUILD b/user/perl-net-snmp/APKBUILD
index ab5d1483c..05178b9e4 100644
--- a/user/perl-net-snmp/APKBUILD
+++ b/user/perl-net-snmp/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-net-snmp
_pkgreal=Net-SNMP
diff --git a/user/perl-number-range/APKBUILD b/user/perl-number-range/APKBUILD
index dd99a6970..083eb2070 100644
--- a/user/perl-number-range/APKBUILD
+++ b/user/perl-number-range/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-number-range
_pkgreal=Number-Range
diff --git a/user/perl-parallel-forkmanager/APKBUILD b/user/perl-parallel-forkmanager/APKBUILD
index fea0b4e57..2111c4d54 100644
--- a/user/perl-parallel-forkmanager/APKBUILD
+++ b/user/perl-parallel-forkmanager/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
# Maintainer: Adelie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-parallel-forkmanager
_pkgreal=Parallel-ForkManager
diff --git a/user/perl-path-iterator-rule/APKBUILD b/user/perl-path-iterator-rule/APKBUILD
index 785d2ee3c..ac6584335 100644
--- a/user/perl-path-iterator-rule/APKBUILD
+++ b/user/perl-path-iterator-rule/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-path-iterator-rule
_pkgreal=Path-Iterator-Rule
diff --git a/user/perl-pod-constants/APKBUILD b/user/perl-pod-constants/APKBUILD
index 69a0129eb..7994f9f2f 100644
--- a/user/perl-pod-constants/APKBUILD
+++ b/user/perl-pod-constants/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-pod-constants
_pkgreal=Pod-Constants
diff --git a/user/perl-probe-perl/APKBUILD b/user/perl-probe-perl/APKBUILD
index c495e0b8e..59e44b060 100644
--- a/user/perl-probe-perl/APKBUILD
+++ b/user/perl-probe-perl/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-probe-perl
_pkgreal=Probe-Perl
diff --git a/user/perl-regexp-common/APKBUILD b/user/perl-regexp-common/APKBUILD
index 114d16c3c..f8deb67d6 100644
--- a/user/perl-regexp-common/APKBUILD
+++ b/user/perl-regexp-common/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-regexp-common
_pkgreal=Regexp-Common
diff --git a/user/perl-regexp-pattern-license/APKBUILD b/user/perl-regexp-pattern-license/APKBUILD
index 7010d0b86..7c11a498b 100644
--- a/user/perl-regexp-pattern-license/APKBUILD
+++ b/user/perl-regexp-pattern-license/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-regexp-pattern-license
_pkgreal=Regexp-Pattern-License
diff --git a/user/perl-regexp-pattern/APKBUILD b/user/perl-regexp-pattern/APKBUILD
index 3c400e799..19c72e967 100644
--- a/user/perl-regexp-pattern/APKBUILD
+++ b/user/perl-regexp-pattern/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-regexp-pattern
_pkgreal=Regexp-Pattern
diff --git a/user/perl-software-license/APKBUILD b/user/perl-software-license/APKBUILD
index 0e28bc4a4..e8440c012 100644
--- a/user/perl-software-license/APKBUILD
+++ b/user/perl-software-license/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-software-license
_pkgreal=Software-License
diff --git a/user/perl-sort-key/APKBUILD b/user/perl-sort-key/APKBUILD
index c79e65b6c..e04e27823 100644
--- a/user/perl-sort-key/APKBUILD
+++ b/user/perl-sort-key/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-sort-key
_pkgreal=Sort-Key
diff --git a/user/perl-strictures/APKBUILD b/user/perl-strictures/APKBUILD
index 4593d1b79..7b4781597 100644
--- a/user/perl-strictures/APKBUILD
+++ b/user/perl-strictures/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-strictures
_pkgreal=strictures
diff --git a/user/perl-string-copyright/APKBUILD b/user/perl-string-copyright/APKBUILD
index ce456a524..600079375 100644
--- a/user/perl-string-copyright/APKBUILD
+++ b/user/perl-string-copyright/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-string-copyright
_pkgreal=String-Copyright
diff --git a/user/perl-string-escape/APKBUILD b/user/perl-string-escape/APKBUILD
index ce9e32862..c213c2ba6 100644
--- a/user/perl-string-escape/APKBUILD
+++ b/user/perl-string-escape/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-string-escape
_pkgreal=String-Escape
diff --git a/user/perl-sub-info/APKBUILD b/user/perl-sub-info/APKBUILD
index ad01d3757..5a056a5c9 100644
--- a/user/perl-sub-info/APKBUILD
+++ b/user/perl-sub-info/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-sub-info
_pkgreal=Sub-Info
diff --git a/user/perl-term-size-any/APKBUILD b/user/perl-term-size-any/APKBUILD
index 2cc51c4d1..6ac6fedfa 100644
--- a/user/perl-term-size-any/APKBUILD
+++ b/user/perl-term-size-any/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-term-size-any
_pkgreal=Term-Size-Any
diff --git a/user/perl-term-size-perl/APKBUILD b/user/perl-term-size-perl/APKBUILD
index 599757534..cd6a0c524 100644
--- a/user/perl-term-size-perl/APKBUILD
+++ b/user/perl-term-size-perl/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-term-size-perl
_pkgreal=Term-Size-Perl
diff --git a/user/perl-term-table/APKBUILD b/user/perl-term-table/APKBUILD
index 9faf22bf0..c88608e01 100644
--- a/user/perl-term-table/APKBUILD
+++ b/user/perl-term-table/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-term-table
_pkgreal=Term-Table
diff --git a/user/perl-test-command/APKBUILD b/user/perl-test-command/APKBUILD
index a1027ddd4..dd7d6676b 100644
--- a/user/perl-test-command/APKBUILD
+++ b/user/perl-test-command/APKBUILD
@@ -1,6 +1,6 @@
# Contributor: Francesco Colista <fcolista@alpinelinux.org>
# Contributor: A. Wilcox <awilfox@adelielinux.org>
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-test-command
_pkgreal=Test-Command
diff --git a/user/perl-test-failwarnings/APKBUILD b/user/perl-test-failwarnings/APKBUILD
index 1067e2e07..ba9b0ebf1 100644
--- a/user/perl-test-failwarnings/APKBUILD
+++ b/user/perl-test-failwarnings/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-test-failwarnings
_pkgreal=Test-FailWarnings
diff --git a/user/perl-test-filename/APKBUILD b/user/perl-test-filename/APKBUILD
index 2bb1a9fb6..8af0ec7ac 100644
--- a/user/perl-test-filename/APKBUILD
+++ b/user/perl-test-filename/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-test-filename
_pkgreal=Test-Filename
diff --git a/user/perl-test-more-utf8/APKBUILD b/user/perl-test-more-utf8/APKBUILD
index 330107c88..252149271 100644
--- a/user/perl-test-more-utf8/APKBUILD
+++ b/user/perl-test-more-utf8/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-test-more-utf8
_pkgreal=Test-More-UTF8
diff --git a/user/perl-test-script/APKBUILD b/user/perl-test-script/APKBUILD
index 75ce72031..47a095d43 100644
--- a/user/perl-test-script/APKBUILD
+++ b/user/perl-test-script/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-test-script
_pkgreal=Test-Script
diff --git a/user/perl-test2-suite/APKBUILD b/user/perl-test2-suite/APKBUILD
index 70b9ba7f1..ce26ed312 100644
--- a/user/perl-test2-suite/APKBUILD
+++ b/user/perl-test2-suite/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-test2-suite
_pkgreal=Test2-Suite
diff --git a/user/perl-text-template/APKBUILD b/user/perl-text-template/APKBUILD
index ff4bb9b8d..8c319a1cf 100644
--- a/user/perl-text-template/APKBUILD
+++ b/user/perl-text-template/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-text-template
_pkgreal=Text-Template
diff --git a/user/perl-xml-namespacesupport/APKBUILD b/user/perl-xml-namespacesupport/APKBUILD
index 4de6e775e..b65905d1e 100644
--- a/user/perl-xml-namespacesupport/APKBUILD
+++ b/user/perl-xml-namespacesupport/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-xml-namespacesupport
_pkgreal=XML-NamespaceSupport
diff --git a/user/perl-xml-simple/APKBUILD b/user/perl-xml-simple/APKBUILD
index 62d543912..cc081098e 100644
--- a/user/perl-xml-simple/APKBUILD
+++ b/user/perl-xml-simple/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-xml-simple
_pkgreal=XML-Simple
diff --git a/user/pluma/APKBUILD b/user/pluma/APKBUILD
index c90ce032f..ceb91b735 100644
--- a/user/pluma/APKBUILD
+++ b/user/pluma/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=pluma
pkgver=1.24.1
pkgrel=0
diff --git a/user/prosody/APKBUILD b/user/prosody/APKBUILD
index 0c5b872f1..2e8741301 100644
--- a/user/prosody/APKBUILD
+++ b/user/prosody/APKBUILD
@@ -1,6 +1,6 @@
# Contributor: Mika Havela <mika.havela@gmail.com>
# Contributor: Francesco Colista <fcolista@alpinelinux.org>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=prosody
pkgver=0.11.6
pkgrel=0
diff --git a/user/protobuf/APKBUILD b/user/protobuf/APKBUILD
index 382f3cfa3..fcaba3da2 100644
--- a/user/protobuf/APKBUILD
+++ b/user/protobuf/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Dan Theisen <djt@hxx.in>
pkgname=protobuf
diff --git a/user/py3-apkkit/APKBUILD b/user/py3-apkkit/APKBUILD
new file mode 100644
index 000000000..a407ba767
--- /dev/null
+++ b/user/py3-apkkit/APKBUILD
@@ -0,0 +1,25 @@
+# Maintainer: Max Rees <maxcrees@me.com>
+pkgname=py3-apkkit
+_pkgname=${pkgname#py3-}
+pkgver=0.6.0.1
+pkgrel=0
+pkgdesc="Python library for manipulating and verifying APK packages"
+url="https://git.adelielinux.org/adelie/apkkit"
+arch="noarch"
+options="!check" # No test suite.
+license="NCSA"
+depends="python3"
+makedepends=""
+source="https://files.pythonhosted.org/packages/source/a/$_pkgname/$_pkgname-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgname-$pkgver"
+
+build() {
+ python3 setup.py build
+}
+
+package() {
+ python3 setup.py install --prefix=/usr --root="$pkgdir"
+ rm "$pkgdir"/usr/README.rst
+}
+
+sha512sums="ef33047ce765d86872e0b4eb9204ec8741e1bbf3c93257797b2c7a0720bb090a90b83380e5f3194b3788557b9693dd32392e6be8235f82ab2eaf118cba8166e2 apkkit-0.6.0.1.tar.gz"
diff --git a/user/py3-distutils-extra/APKBUILD b/user/py3-distutils-extra/APKBUILD
index 5c0807786..3ecdd376c 100644
--- a/user/py3-distutils-extra/APKBUILD
+++ b/user/py3-distutils-extra/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=py3-distutils-extra
pkgver=2.45
pkgrel=0
diff --git a/user/py3-flup/APKBUILD b/user/py3-flup/APKBUILD
new file mode 100644
index 000000000..c9b0013f7
--- /dev/null
+++ b/user/py3-flup/APKBUILD
@@ -0,0 +1,24 @@
+# Maintainer: Max Rees <maxcrees@me.com>
+pkgname=py3-flup
+_pkgname=${pkgname#py3-}
+pkgver=1.0.3
+pkgrel=0
+pkgdesc="Python WSGI module collection"
+url="https://www.saddi.com/software/flup/"
+arch="noarch"
+options="!check" # No test suite.
+license="BSD-2-Clause"
+depends="python3"
+makedepends=""
+source="https://files.pythonhosted.org/packages/source/f/$_pkgname/$_pkgname-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgname-$pkgver"
+
+build() {
+ python3 setup.py build
+}
+
+package() {
+ python3 setup.py install --prefix=/usr --root="$pkgdir"
+}
+
+sha512sums="f165685b39a8539d29d48d0ad3c9c0495f428892b8935545a128730687c658a1e8b74a09c8084dd4a2490b1d26f1382b48c95ba43401171fd46876b068ba2f8e flup-1.0.3.tar.gz"
diff --git a/user/py3-pexpect/APKBUILD b/user/py3-pexpect/APKBUILD
index 234102cc4..45d40aaf7 100644
--- a/user/py3-pexpect/APKBUILD
+++ b/user/py3-pexpect/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=py3-pexpect
_pkgname=${pkgname#*-}
_p="${_pkgname#?}"
diff --git a/user/py3-ptyprocess/APKBUILD b/user/py3-ptyprocess/APKBUILD
index af121ab31..c9a5316a9 100644
--- a/user/py3-ptyprocess/APKBUILD
+++ b/user/py3-ptyprocess/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=py3-ptyprocess
pkgver=0.6.0
pkgrel=0
diff --git a/user/py3-pycairo/APKBUILD b/user/py3-pycairo/APKBUILD
index b316f74b7..a8012897e 100644
--- a/user/py3-pycairo/APKBUILD
+++ b/user/py3-pycairo/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=py3-pycairo
pkgver=1.19.1
pkgrel=0
diff --git a/user/py3-pygobject/APKBUILD b/user/py3-pygobject/APKBUILD
index 426485d5c..4ecdab9d1 100644
--- a/user/py3-pygobject/APKBUILD
+++ b/user/py3-pygobject/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=py3-pygobject
pkgver=3.38.0
pkgrel=0
diff --git a/user/qps/APKBUILD b/user/qps/APKBUILD
index 5f884fb45..44b3bd349 100644
--- a/user/qps/APKBUILD
+++ b/user/qps/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=qps
pkgver=2.1.0
_lxqt_build=0.7.0
diff --git a/user/qt5-qtwayland/APKBUILD b/user/qt5-qtwayland/APKBUILD
index 92e9e59db..482cc18df 100644
--- a/user/qt5-qtwayland/APKBUILD
+++ b/user/qt5-qtwayland/APKBUILD
@@ -12,6 +12,7 @@ license="LGPL-3.0-only WITH Qt-LGPL-exception-1.1 OR GPL-3.0-only WITH Qt-GPL-ex
depends=""
makedepends="libxkbcommon-dev mesa-dev qt5-qtbase-dev wayland-dev"
subpackages="$pkgname-dev $pkgname-client $pkgname-compositor $pkgname-tools"
+install_if="qt5-qtbase~$pkgver wayland"
source="https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/$_pkgname-$pkgver.tar.xz"
builddir="$srcdir"/$_pkgname-$pkgver
diff --git a/user/qt5ct/APKBUILD b/user/qt5ct/APKBUILD
index 462e54241..184dd4344 100644
--- a/user/qt5ct/APKBUILD
+++ b/user/qt5ct/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=qt5ct
pkgver=1.1
pkgrel=0
diff --git a/user/qterminal/APKBUILD b/user/qterminal/APKBUILD
index d9704ad7d..ef933d796 100644
--- a/user/qterminal/APKBUILD
+++ b/user/qterminal/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=qterminal
pkgver=0.15.0
_lxqt_build=0.7.0
diff --git a/user/qtermwidget/APKBUILD b/user/qtermwidget/APKBUILD
index 3af12cbca..27edbe5be 100644
--- a/user/qtermwidget/APKBUILD
+++ b/user/qtermwidget/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=qtermwidget
pkgver=0.15.0
_lxqt_build=0.7.0
diff --git a/user/qtkeychain/APKBUILD b/user/qtkeychain/APKBUILD
index a9501eb3f..659862db8 100644
--- a/user/qtkeychain/APKBUILD
+++ b/user/qtkeychain/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=qtkeychain
pkgver=0.11.1
pkgrel=0
diff --git a/user/ristretto/APKBUILD b/user/ristretto/APKBUILD
index 2beebf167..f324f365b 100644
--- a/user/ristretto/APKBUILD
+++ b/user/ristretto/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=ristretto
pkgver=0.10.0
pkgrel=0
diff --git a/user/rofi/APKBUILD b/user/rofi/APKBUILD
index f8e930a0a..014be95c4 100644
--- a/user/rofi/APKBUILD
+++ b/user/rofi/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=rofi
pkgver=1.6.0
pkgrel=0
diff --git a/user/rpcbind/APKBUILD b/user/rpcbind/APKBUILD
index a535b8c7a..383e98045 100644
--- a/user/rpcbind/APKBUILD
+++ b/user/rpcbind/APKBUILD
@@ -22,7 +22,7 @@ build() {
--build=$CBUILD \
--host=$CHOST \
--prefix=/usr \
- --bindir=/sbin \
+ --sbindir=/sbin \
--enable-warmstarts \
--with-statedir=/var/lib/rpcbind \
--with-rpcuser=rpc \
diff --git a/user/rubberband/APKBUILD b/user/rubberband/APKBUILD
index fdc14d6e2..054a90b11 100644
--- a/user/rubberband/APKBUILD
+++ b/user/rubberband/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=rubberband
pkgver=1.9.0
pkgrel=0
diff --git a/user/s6-dns/APKBUILD b/user/s6-dns/APKBUILD
index ef366ef0f..2adad7910 100644
--- a/user/s6-dns/APKBUILD
+++ b/user/s6-dns/APKBUILD
@@ -1,14 +1,14 @@
# Contributor: Laurent Bercot <ska-adelie@skarnet.org>
# Maintainer: Laurent Bercot <ska-adelie@skarnet.org>
pkgname=s6-dns
-pkgver=2.3.2.0
+pkgver=2.3.5.0
pkgrel=0
pkgdesc="skarnet.org's DNS client libraries and command-line DNS client utilities"
url="https://skarnet.org/software/s6-dns/"
arch="all"
options="!check"
license="ISC"
-_skalibs_version=2.9
+_skalibs_version=2.10.0.0
depends=""
makedepends="skalibs-dev>=$_skalibs_version skalibs-libs-dev>=$_skalibs_version"
subpackages="$pkgname-libs $pkgname-dev $pkgname-libs-dev:libsdev $pkgname-doc"
@@ -59,4 +59,4 @@ doc() {
cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname"
}
-sha512sums="c4b833a944e6c99f52283d7c27c4a4937995b99afb1e9a9d601bb20efec7b23e05fb8500b1653c3a1c045811087acd0bc800cebfdd2fb60c6eba2fd85cfd580d s6-dns-2.3.2.0.tar.gz"
+sha512sums="994a786b8d725cc98640be102e05a25f033624fbf8762fc53361555f4a721f5be819e282b907ceedaa0c1adbd670c80e1819096dc2ff7e2a2e476098bded3ade s6-dns-2.3.5.0.tar.gz"
diff --git a/user/s6-linux-utils/APKBUILD b/user/s6-linux-utils/APKBUILD
index 62103295d..2a4e8e8d6 100644
--- a/user/s6-linux-utils/APKBUILD
+++ b/user/s6-linux-utils/APKBUILD
@@ -1,14 +1,14 @@
# Contributor: Laurent Bercot <ska-adelie@skarnet.org>
# Maintainer: Laurent Bercot <ska-adelie@skarnet.org>
pkgname=s6-linux-utils
-pkgver=2.5.1.2
+pkgver=2.5.1.4
pkgrel=0
pkgdesc="skarnet.org's Linux-specific miscellaneous utilities"
url="https://skarnet.org/software/s6-linux-utils/"
arch="all"
options="!check"
license="ISC"
-_skalibs_version=2.9
+_skalibs_version=2.10
depends=""
makedepends="skalibs-dev>=$_skalibs_version skalibs-libs-dev>=$_skalibs_version"
subpackages="$pkgname-doc"
@@ -34,4 +34,4 @@ doc() {
cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname"
}
-sha512sums="4557148c3e739471a8846d3e0425da826d77ab3b7fc8d6c777d110152343596d17fde37fddcb099b107663138a5447866c3ff00a05f59d034379d26b1e147331 s6-linux-utils-2.5.1.2.tar.gz"
+sha512sums="e88ba46b63fc2823e4721c2d87bca128df5a7d44769c09fee19b5cc25bb9be334241262aba13c421c3211dc4dc47ec919f504af81a6f3ccfb80efa357b8b7549 s6-linux-utils-2.5.1.4.tar.gz"
diff --git a/user/s6-networking/APKBUILD b/user/s6-networking/APKBUILD
index 89ef875b6..6683aecdd 100644
--- a/user/s6-networking/APKBUILD
+++ b/user/s6-networking/APKBUILD
@@ -1,14 +1,14 @@
# Contributor: Laurent Bercot <ska-adelie@skarnet.org>
# Maintainer: Laurent Bercot <ska-adelie@skarnet.org>
pkgname=s6-networking
-pkgver=2.3.1.2
+pkgver=2.4.1.0
pkgrel=0
pkgdesc="skarnet.org's UCSPI TCP tools, access control tools, and network time management utilities."
url="https://skarnet.org/software/$pkgname/"
arch="all"
options="!check" # No test suite.
license="ISC"
-_skalibs_version=2.9
+_skalibs_version=2.10.0.0
depends="execline"
makedepends="skalibs-dev>=$_skalibs_version skalibs-libs-dev>=$_skalibs_version execline-dev s6-dev s6-libs-dev s6-dns-dev s6-dns-libs-dev bearssl-dev"
subpackages="$pkgname-libs $pkgname-dev $pkgname-libs-dev:libsdev $pkgname-doc"
@@ -62,4 +62,4 @@ doc() {
cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname"
}
-sha512sums="292bba150fcf4567073690411caebb66b407dbac20dfcc07f8a79d55962ef07f1fcfcf25bac21734605bc171e22805812788b0c12ec01e79f320eef782479d1c s6-networking-2.3.1.2.tar.gz"
+sha512sums="4f889228b5409bbd7241f1cb38cb1f739572dc28bb59740188531fa62f433030a085b7582108d9ee96b3a22a6280b38fff2b5080f743370e0f59358005583e22 s6-networking-2.4.1.0.tar.gz"
diff --git a/user/s6-portable-utils/APKBUILD b/user/s6-portable-utils/APKBUILD
index 01a984414..6ee77bb99 100644
--- a/user/s6-portable-utils/APKBUILD
+++ b/user/s6-portable-utils/APKBUILD
@@ -1,14 +1,14 @@
# Contributor: Laurent Bercot <ska-adelie@skarnet.org>
# Maintainer: Laurent Bercot <ska-adelie@skarnet.org>
pkgname=s6-portable-utils
-pkgver=2.2.2.4
+pkgver=2.2.3.1
pkgrel=0
pkgdesc="skarnet.org's portable miscellaneous utilities"
url="https://skarnet.org/software/s6-portable-utils/"
arch="all"
options="!check"
license="ISC"
-_skalibs_version=2.9
+_skalibs_version=2.10
depends=""
makedepends="skalibs-dev>=$_skalibs_version skalibs-libs-dev>=$_skalibs_version"
subpackages="$pkgname-doc"
@@ -33,4 +33,4 @@ doc() {
cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname"
}
-sha512sums="678398a2c902c28f3d5c2e3be832bb956bd6c5a72727b83c218b1966ac52d56be430126e8c768355f47a1c70f6f445afa76099882d3c9040931ada4f4ed19afc s6-portable-utils-2.2.2.4.tar.gz"
+sha512sums="76c464b90b5c67f87bec053cadb5dac1b5928df7f373b7a0b6700e8ab684fb8c5354788720e216f1fb9e332a0a5dec92618aee3e0f6ff578c8aa42f2aa787549 s6-portable-utils-2.2.3.1.tar.gz"
diff --git a/user/samurai/APKBUILD b/user/samurai/APKBUILD
index e9de6bfd4..caf9f9fc4 100644
--- a/user/samurai/APKBUILD
+++ b/user/samurai/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=samurai
pkgver=1.1
pkgrel=0
diff --git a/user/screengrab/APKBUILD b/user/screengrab/APKBUILD
index ab52075ea..60f520f1e 100644
--- a/user/screengrab/APKBUILD
+++ b/user/screengrab/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=screengrab
pkgver=2.0.1
pkgrel=0
diff --git a/user/socat/APKBUILD b/user/socat/APKBUILD
index dd7aeb4b8..f70823845 100644
--- a/user/socat/APKBUILD
+++ b/user/socat/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=socat
pkgver=1.7.3.4
pkgrel=0
diff --git a/user/spectrwm/APKBUILD b/user/spectrwm/APKBUILD
index e52d25653..98204837d 100644
--- a/user/spectrwm/APKBUILD
+++ b/user/spectrwm/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=spectrwm
pkgver=3.4.1
_pkgver=$(printf '%s' "$pkgver" | tr . _)
diff --git a/user/tellico/APKBUILD b/user/tellico/APKBUILD
index a683848a4..677dd6007 100644
--- a/user/tellico/APKBUILD
+++ b/user/tellico/APKBUILD
@@ -19,6 +19,7 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev libxml2-dev libxslt-dev
subpackages="$pkgname-doc $pkgname-lang"
source="http://tellico-project.org/files/tellico-$pkgver.tar.xz
btparse-strcasecmp.patch
+ modern-taglib.patch
"
build() {
@@ -41,7 +42,7 @@ check() {
# htmlexporter: needs plasma desktop
# filelisting: needs dbus
# tellicoread: needs network
- CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E '(cite|csv|filelisting|imagejob|htmlexporter|pdf|tellicoread)test'
+ CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E '(cite|csv|filelisting|imagejob|htmlexporter|pdf|tellicoread|comparison)test'
}
package() {
@@ -49,4 +50,5 @@ package() {
}
sha512sums="12d49aba8c99cd16e426ac0144fa7343c5b1348a8c9a0892f30ff274f0e98f9ad7819c03c4ecdd0dc2f826377468ebdab1996828e992fcd293c7ffe4f844ab74 tellico-3.3.1.tar.xz
-4627e717d67340de6d88f7a21604a66ba236c651a0ae38d9d3569b76ad58c79f046cfd5686dd688de86d6acafc17ba3959902babdc7f00ab8e9d65717c4fab4a btparse-strcasecmp.patch"
+4627e717d67340de6d88f7a21604a66ba236c651a0ae38d9d3569b76ad58c79f046cfd5686dd688de86d6acafc17ba3959902babdc7f00ab8e9d65717c4fab4a btparse-strcasecmp.patch
+1d2b7825249167868b4127e424b3763551d9c361c500bb251b2e22e6e0b938e3015454092ec9e4724b2fd7a3bc1b059f9ead52cf75b7c85ca3a66d0fc3fe57e5 modern-taglib.patch"
diff --git a/user/tellico/modern-taglib.patch b/user/tellico/modern-taglib.patch
new file mode 100644
index 000000000..194914da8
--- /dev/null
+++ b/user/tellico/modern-taglib.patch
@@ -0,0 +1,13 @@
+Fix build with Taglib's built-in CMake module.
+--- tellico-3.3.1/CMakeLists.txt.old 2020-06-01 00:57:12.000000000 +0000
++++ tellico-3.3.1/CMakeLists.txt 2021-01-28 04:48:08.457839033 +0000
+@@ -128,7 +128,8 @@
+ TYPE OPTIONAL)
+ if(TAGLIB_FOUND)
+ add_definitions(${TAGLIB_CFLAGS})
+- include_directories(${TAGLIB_INCLUDES})
++ include_directories(${Taglib_INCLUDE_DIRS})
++ set(TAGLIB_LIBRARIES ${Taglib_LIBRARIES})
+ endif(TAGLIB_FOUND)
+
+ find_package(Yaz 2.0)
diff --git a/user/tf/APKBUILD b/user/tf/APKBUILD
index fe0609d9c..35f164eec 100644
--- a/user/tf/APKBUILD
+++ b/user/tf/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=tf
pkgver=5.0b8
_pkgver=${pkgver%.*}${pkgver#*.}
diff --git a/user/thunar-volman/APKBUILD b/user/thunar-volman/APKBUILD
index bfbc5a1ce..60dc36691 100644
--- a/user/thunar-volman/APKBUILD
+++ b/user/thunar-volman/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=thunar-volman
pkgver=0.9.5
pkgrel=0
diff --git a/user/thunar/APKBUILD b/user/thunar/APKBUILD
index 664fbef09..8bfa1164f 100644
--- a/user/thunar/APKBUILD
+++ b/user/thunar/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=thunar
pkgver=1.8.15
pkgrel=0
diff --git a/user/trojita/APKBUILD b/user/trojita/APKBUILD
index 3dd6a5ab6..a78279253 100644
--- a/user/trojita/APKBUILD
+++ b/user/trojita/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=trojita
pkgver=0.7
pkgrel=1
diff --git a/user/ttf-sudo/APKBUILD b/user/ttf-sudo/APKBUILD
index 6c200fa5c..2061b3e23 100644
--- a/user/ttf-sudo/APKBUILD
+++ b/user/ttf-sudo/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=ttf-sudo
pkgver=0.50
pkgrel=0
diff --git a/user/ttf-terminus/APKBUILD b/user/ttf-terminus/APKBUILD
index fd1543413..0db340268 100644
--- a/user/ttf-terminus/APKBUILD
+++ b/user/ttf-terminus/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=ttf-terminus
pkgver=4.47.0
pkgrel=0
diff --git a/user/tumbler/APKBUILD b/user/tumbler/APKBUILD
index 232f99c9a..78b406db1 100644
--- a/user/tumbler/APKBUILD
+++ b/user/tumbler/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=tumbler
pkgver=0.3.0
pkgrel=0
diff --git a/user/uchardet/APKBUILD b/user/uchardet/APKBUILD
index c25bc1baf..6e3c9b234 100644
--- a/user/uchardet/APKBUILD
+++ b/user/uchardet/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=uchardet
pkgver=0.0.7
pkgrel=0
diff --git a/user/unicode-data/APKBUILD b/user/unicode-data/APKBUILD
index 42ec0b956..cc2aedf7e 100644
--- a/user/unicode-data/APKBUILD
+++ b/user/unicode-data/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=unicode-data
pkgver=13.0.0
pkgrel=0
diff --git a/user/uptimed/APKBUILD b/user/uptimed/APKBUILD
index 2820783cd..bb63fac47 100644
--- a/user/uptimed/APKBUILD
+++ b/user/uptimed/APKBUILD
@@ -1,6 +1,6 @@
# Contributor: Bartłomiej Piotrowski <bpiotrowski@alpinelinux.org>
# Contributor: A. Wilcox <awilfox@adelielinux.org>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=uptimed
pkgver=0.4.3
pkgrel=0
diff --git a/user/vala/APKBUILD b/user/vala/APKBUILD
index 7e3a3e7ab..902d561d4 100644
--- a/user/vala/APKBUILD
+++ b/user/vala/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=vala
pkgver=0.50.0
pkgrel=0
diff --git a/user/vamp-sdk/APKBUILD b/user/vamp-sdk/APKBUILD
index bfeee2132..130775916 100644
--- a/user/vamp-sdk/APKBUILD
+++ b/user/vamp-sdk/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=vamp-sdk
pkgver=2.7.1
pkgrel=0
diff --git a/user/vte/APKBUILD b/user/vte/APKBUILD
index d0d22ef67..c95e0dfda 100644
--- a/user/vte/APKBUILD
+++ b/user/vte/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=vte
pkgver=0.62.0
pkgrel=0
diff --git a/user/weechat/APKBUILD b/user/weechat/APKBUILD
index d4f4097f5..085916ad2 100644
--- a/user/weechat/APKBUILD
+++ b/user/weechat/APKBUILD
@@ -1,6 +1,6 @@
# Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
# Contributor: zlg <zlg+adelie@zlg.space>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=weechat
pkgver=2.9
pkgrel=0
diff --git a/user/wireguard-module/APKBUILD b/user/wireguard-module/APKBUILD
index 8b9f11117..60df4133b 100644
--- a/user/wireguard-module/APKBUILD
+++ b/user/wireguard-module/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Mira Ressel <aranea@aixah.de>
# Maintainer: Laurent Bercot <ska-adelie@skarnet.org>
-_kver="5.4.5-mc0"
-pkgver=1.0.20200506
+_kver="5.4.66-mc1"
+pkgver=1.0.20210424
pkgrel=0
_pkgname="wireguard-module"
pkgname="$_pkgname-$_kver"
@@ -38,5 +38,4 @@ _patch() {
mkdir -p "$subpkgdir/usr/share/wireguard"
"$builddir"/kernel-tree-scripts/create-patch.sh > "$subpkgdir/usr/share/wireguard/wireguard-$pkgver.patch"
}
-
-sha512sums="39a27a515919933dbed71624be3f8f3f512073b522e1e16248c9eda749dd72a3db5a02d85d29855160eb182415f489a4c02c1659ef9589507c99dbfe74ea3074 wireguard-linux-compat-1.0.20200506.tar.xz"
+sha512sums="f3485978fdd5a1cccdd8ee269c223e805bc533b79189765324a383142934b12f4f6bf476147a09703fa674da4a1eaca13fe400553b27843dbf8da133ce19207b wireguard-linux-compat-1.0.20210424.tar.xz"
diff --git a/user/wireguard-tools/APKBUILD b/user/wireguard-tools/APKBUILD
index 7e283e759..ece7397aa 100644
--- a/user/wireguard-tools/APKBUILD
+++ b/user/wireguard-tools/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Mira Ressel <aranea@aixah.de>
# Maintainer: Laurent Bercot <ska-adelie@skarnet.org>
pkgname=wireguard-tools
-pkgver=1.0.20200513
+pkgver=1.0.20210424
pkgrel=0
pkgdesc="Userland tools for the WireGuard VPN"
url="https://www.wireguard.com/"
@@ -29,4 +29,4 @@ bashcomp() {
mv "$pkgdir/usr/share/bash-completion" "$subpkgdir/usr/share/"
}
-sha512sums="4d27b262350b6b47843a323c2e7ab8d2bdd48065c265778abdec85b3f6fc92aa9af77d76e368df9cc8e435eae1c0ce50fed52e1d78db54358c1884d34be08d2c wireguard-tools-1.0.20200513.tar.xz"
+sha512sums="b919c7ce1e8ee8660ccc1490d3dad7817f3d6f0ab79f26866e8ed10d40545a9ddca67959ff6cc84ac36a91683c1f58d274d91d47f40c0b9a7bfee4009dcbbf59 wireguard-tools-1.0.20210424.tar.xz"
diff --git a/user/xdg-user-dirs/APKBUILD b/user/xdg-user-dirs/APKBUILD
index 241e80519..12b8d9268 100644
--- a/user/xdg-user-dirs/APKBUILD
+++ b/user/xdg-user-dirs/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=xdg-user-dirs
pkgver=0.17
pkgrel=0
diff --git a/user/xfburn/APKBUILD b/user/xfburn/APKBUILD
index 1a5adc93a..c1fb3994b 100644
--- a/user/xfburn/APKBUILD
+++ b/user/xfburn/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=xfburn
pkgver=0.6.2
pkgrel=0
diff --git a/user/xfce-desktop/APKBUILD b/user/xfce-desktop/APKBUILD
index 035c79a18..a9b998f33 100644
--- a/user/xfce-desktop/APKBUILD
+++ b/user/xfce-desktop/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=xfce-desktop
pkgver=4.13
pkgrel=0
diff --git a/user/xfce-plugins/APKBUILD b/user/xfce-plugins/APKBUILD
index 5e4d92920..303c71a16 100644
--- a/user/xfce-plugins/APKBUILD
+++ b/user/xfce-plugins/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=xfce-plugins
pkgver=0.1
pkgrel=0
diff --git a/user/xfce4-appfinder/APKBUILD b/user/xfce4-appfinder/APKBUILD
index 187e18781..8c980ffc7 100644
--- a/user/xfce4-appfinder/APKBUILD
+++ b/user/xfce4-appfinder/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=xfce4-appfinder
pkgver=4.14.0
pkgrel=0
diff --git a/user/xfce4-battery-plugin/APKBUILD b/user/xfce4-battery-plugin/APKBUILD
index 90aea20eb..66af35833 100644
--- a/user/xfce4-battery-plugin/APKBUILD
+++ b/user/xfce4-battery-plugin/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=xfce4-battery-plugin
pkgver=1.1.3
pkgrel=0
diff --git a/user/xfce4-clipman-plugin/APKBUILD b/user/xfce4-clipman-plugin/APKBUILD
index 45c7b33fd..ee219ed8e 100644
--- a/user/xfce4-clipman-plugin/APKBUILD
+++ b/user/xfce4-clipman-plugin/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=xfce4-clipman-plugin
pkgver=1.6.1
pkgrel=0
diff --git a/user/xfce4-cpugraph-plugin/APKBUILD b/user/xfce4-cpugraph-plugin/APKBUILD
index 5a235a42e..4cf5f24d8 100644
--- a/user/xfce4-cpugraph-plugin/APKBUILD
+++ b/user/xfce4-cpugraph-plugin/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=xfce4-cpugraph-plugin
pkgver=1.1.0
pkgrel=0
diff --git a/user/xfce4-dict/APKBUILD b/user/xfce4-dict/APKBUILD
index cb9291532..91b9fccb1 100644
--- a/user/xfce4-dict/APKBUILD
+++ b/user/xfce4-dict/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=xfce4-dict
pkgver=0.8.3
pkgrel=0
diff --git a/user/xfce4-diskperf-plugin/APKBUILD b/user/xfce4-diskperf-plugin/APKBUILD
index cc66c040c..66aab4d85 100644
--- a/user/xfce4-diskperf-plugin/APKBUILD
+++ b/user/xfce4-diskperf-plugin/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=xfce4-diskperf-plugin
pkgver=2.6.2
pkgrel=0
diff --git a/user/xfce4-indicator-plugin/APKBUILD b/user/xfce4-indicator-plugin/APKBUILD
index a8e5f5f97..0c69f688f 100644
--- a/user/xfce4-indicator-plugin/APKBUILD
+++ b/user/xfce4-indicator-plugin/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=xfce4-indicator-plugin
pkgver=2.3.4
pkgrel=1
diff --git a/user/xfce4-netload-plugin/APKBUILD b/user/xfce4-netload-plugin/APKBUILD
index 2101b528a..be6a000b5 100644
--- a/user/xfce4-netload-plugin/APKBUILD
+++ b/user/xfce4-netload-plugin/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=xfce4-netload-plugin
pkgver=1.3.2
pkgrel=0
diff --git a/user/xfce4-notifyd/APKBUILD b/user/xfce4-notifyd/APKBUILD
index 6ea50f20a..6b29d1db1 100644
--- a/user/xfce4-notifyd/APKBUILD
+++ b/user/xfce4-notifyd/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=xfce4-notifyd
pkgver=0.6.2
pkgrel=0
diff --git a/user/xfce4-panel-profiles/APKBUILD b/user/xfce4-panel-profiles/APKBUILD
index 777ace868..ecb1b73e5 100644
--- a/user/xfce4-panel-profiles/APKBUILD
+++ b/user/xfce4-panel-profiles/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=xfce4-panel-profiles
pkgver=1.0.10
pkgrel=0
diff --git a/user/xfce4-panel/APKBUILD b/user/xfce4-panel/APKBUILD
index 91ac3af01..700482001 100644
--- a/user/xfce4-panel/APKBUILD
+++ b/user/xfce4-panel/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=xfce4-panel
pkgver=4.14.4
pkgrel=0
diff --git a/user/xfce4-power-manager/APKBUILD b/user/xfce4-power-manager/APKBUILD
index 0592f060e..0b37c5ae2 100644
--- a/user/xfce4-power-manager/APKBUILD
+++ b/user/xfce4-power-manager/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=xfce4-power-manager
pkgver=1.6.6
pkgrel=0
diff --git a/user/xfce4-pulseaudio-plugin/APKBUILD b/user/xfce4-pulseaudio-plugin/APKBUILD
index e5382749e..be47ca09b 100644
--- a/user/xfce4-pulseaudio-plugin/APKBUILD
+++ b/user/xfce4-pulseaudio-plugin/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=xfce4-pulseaudio-plugin
pkgver=0.4.3
pkgrel=0
diff --git a/user/xfce4-screenshooter/APKBUILD b/user/xfce4-screenshooter/APKBUILD
index e3ad324dd..c8bc21481 100644
--- a/user/xfce4-screenshooter/APKBUILD
+++ b/user/xfce4-screenshooter/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=xfce4-screenshooter
pkgver=1.9.7
pkgrel=0
diff --git a/user/xfce4-sensors-plugin/APKBUILD b/user/xfce4-sensors-plugin/APKBUILD
index eef3b208f..36041abed 100644
--- a/user/xfce4-sensors-plugin/APKBUILD
+++ b/user/xfce4-sensors-plugin/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=xfce4-sensors-plugin
pkgver=1.3.92
pkgrel=0
diff --git a/user/xfce4-session/APKBUILD b/user/xfce4-session/APKBUILD
index 487b737f7..f869781d7 100644
--- a/user/xfce4-session/APKBUILD
+++ b/user/xfce4-session/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=xfce4-session
pkgver=4.14.2
pkgrel=0
diff --git a/user/xfce4-settings/APKBUILD b/user/xfce4-settings/APKBUILD
index 4e76bb72f..d9a8672fe 100644
--- a/user/xfce4-settings/APKBUILD
+++ b/user/xfce4-settings/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=xfce4-settings
pkgver=4.14.3
pkgrel=0
diff --git a/user/xfce4-systemload-plugin/APKBUILD b/user/xfce4-systemload-plugin/APKBUILD
index 7600d411e..d1c78c479 100644
--- a/user/xfce4-systemload-plugin/APKBUILD
+++ b/user/xfce4-systemload-plugin/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=xfce4-systemload-plugin
pkgver=1.2.3
pkgrel=0
diff --git a/user/xfce4-taskmanager/APKBUILD b/user/xfce4-taskmanager/APKBUILD
index 35644eab4..4fdcce72f 100644
--- a/user/xfce4-taskmanager/APKBUILD
+++ b/user/xfce4-taskmanager/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=xfce4-taskmanager
pkgver=1.2.3
pkgrel=0
diff --git a/user/xfce4-terminal/APKBUILD b/user/xfce4-terminal/APKBUILD
index 4abf09aa7..f0e3fa277 100644
--- a/user/xfce4-terminal/APKBUILD
+++ b/user/xfce4-terminal/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=xfce4-terminal
pkgver=0.8.9.2
pkgrel=0
diff --git a/user/xfce4-time-out-plugin/APKBUILD b/user/xfce4-time-out-plugin/APKBUILD
index 7af85df23..df654f539 100644
--- a/user/xfce4-time-out-plugin/APKBUILD
+++ b/user/xfce4-time-out-plugin/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=xfce4-time-out-plugin
pkgver=1.1.1
pkgrel=0
diff --git a/user/xfce4-timer-plugin/APKBUILD b/user/xfce4-timer-plugin/APKBUILD
index c4a52b993..fc64b01b6 100644
--- a/user/xfce4-timer-plugin/APKBUILD
+++ b/user/xfce4-timer-plugin/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=xfce4-timer-plugin
pkgver=1.7.1
pkgrel=0
diff --git a/user/xfce4-verve-plugin/APKBUILD b/user/xfce4-verve-plugin/APKBUILD
index 432c5cff9..f38ea7695 100644
--- a/user/xfce4-verve-plugin/APKBUILD
+++ b/user/xfce4-verve-plugin/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=xfce4-verve-plugin
pkgver=2.0.0
pkgrel=1
diff --git a/user/xfce4-volumed-pulse/APKBUILD b/user/xfce4-volumed-pulse/APKBUILD
index 55a0ff0d3..3451a69ed 100644
--- a/user/xfce4-volumed-pulse/APKBUILD
+++ b/user/xfce4-volumed-pulse/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=xfce4-volumed-pulse
pkgver=0.2.3
pkgrel=0
diff --git a/user/xfce4-whiskermenu-plugin/APKBUILD b/user/xfce4-whiskermenu-plugin/APKBUILD
index 986789d40..4f34961d5 100644
--- a/user/xfce4-whiskermenu-plugin/APKBUILD
+++ b/user/xfce4-whiskermenu-plugin/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=xfce4-whiskermenu-plugin
pkgver=2.4.6
_pkgmaj=${pkgver%.*}
diff --git a/user/xfconf/APKBUILD b/user/xfconf/APKBUILD
index f5b5b681b..0cc2b2eca 100644
--- a/user/xfconf/APKBUILD
+++ b/user/xfconf/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=xfconf
pkgver=4.14.3
pkgrel=0
diff --git a/user/xfdashboard/APKBUILD b/user/xfdashboard/APKBUILD
index 7771b5ad8..8d46cf6a9 100644
--- a/user/xfdashboard/APKBUILD
+++ b/user/xfdashboard/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=xfdashboard
pkgver=0.7.8
pkgrel=0
diff --git a/user/xfdesktop/APKBUILD b/user/xfdesktop/APKBUILD
index a9c3c3d9d..c93f915b8 100644
--- a/user/xfdesktop/APKBUILD
+++ b/user/xfdesktop/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=xfdesktop
pkgver=4.14.2
pkgrel=0
diff --git a/user/xfmpc/APKBUILD b/user/xfmpc/APKBUILD
index c6f9975a0..0dcebc1da 100644
--- a/user/xfmpc/APKBUILD
+++ b/user/xfmpc/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=xfmpc
pkgver=0.3.0
pkgrel=1
diff --git a/user/xfwm4/APKBUILD b/user/xfwm4/APKBUILD
index 68bf1b9ff..f0087d9cc 100644
--- a/user/xfwm4/APKBUILD
+++ b/user/xfwm4/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=xfwm4
pkgver=4.14.5
pkgrel=0
diff --git a/user/xorg-gtest/APKBUILD b/user/xorg-gtest/APKBUILD
index 1dee09b1e..9de0be3c3 100644
--- a/user/xorg-gtest/APKBUILD
+++ b/user/xorg-gtest/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=xorg-gtest
pkgver=0.7.1
pkgrel=0
diff --git a/user/xscreensaver/APKBUILD b/user/xscreensaver/APKBUILD
index 01f15c97d..214437813 100644
--- a/user/xscreensaver/APKBUILD
+++ b/user/xscreensaver/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=xscreensaver
pkgver=5.45
pkgrel=0
diff --git a/user/xterm/APKBUILD b/user/xterm/APKBUILD
index c36914b76..17dda70e9 100644
--- a/user/xterm/APKBUILD
+++ b/user/xterm/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=xterm
pkgver=360
pkgrel=0
diff --git a/user/yubico-c/APKBUILD b/user/yubico-c/APKBUILD
index 5409c8b37..88a3ae7b7 100644
--- a/user/yubico-c/APKBUILD
+++ b/user/yubico-c/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=yubico-c
pkgver=1.13
pkgrel=2
diff --git a/user/yubikey-personalization/APKBUILD b/user/yubikey-personalization/APKBUILD
index 3ff2ce728..f1102bd9a 100644
--- a/user/yubikey-personalization/APKBUILD
+++ b/user/yubikey-personalization/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=yubikey-personalization
pkgver=1.20.0
pkgrel=1
diff --git a/user/zenity/APKBUILD b/user/zenity/APKBUILD
index 87343a192..c12793018 100644
--- a/user/zenity/APKBUILD
+++ b/user/zenity/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
-# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
pkgname=zenity
pkgver=3.32.0
pkgrel=0