The directory /run/apache2 is only created when running in openrc (see
apache2.initd). When installing on a non-openrc system (e.g. docker),
this folder is missing and apache2 refuses to start.
Closes https://bugs.alpinelinux.org/issues/9982
This commit updates $license variable in all APKBUILDs to comply with
short names specified by SPDX version 3.0 [1] where possible. It was
done using find-and-replace method on substrings inside $license
variables.
Only license names were updated, not "expressions" specifying relation
between the licenses (e.g. "X and Y", "X or Y", "X and (Y or Z)") or
exceptions (e.g. "X with exceptions").
Many licenses have a version or multiple variants, e.g. MPL-2.0,
BSD-2-Clause, BSD-3-Clause. However, $license in many aports do not
contain license version or variant. Since there's no way how to infer
this information just from abuild, it were left without the variant
suffix or version, i.e. non SPDX compliant.
GNU licenses (AGPL, GFDL, GPL, LGPL) are especially complicated. They
exist in two variants: -only (formerly e.g. GPL-2.0) and -or-later
(formerly e.g. GPL-2.0+). We did not systematically noted distinguish
between these variants, so GPL-2.0, GPL2, GPLv2 etc. may mean
GPL-2.0-only or GPL-2.0-or-later. Thus GNU licenses without "+" (e.g.
GPL2+) were left without the variant suffix, i.e. non SPDX compliant.
Note: This commit just fixes format of the license names, no
verification has been done if the specified license information is
actually correct!
[1]: https://spdx.org/licenses/
apache2.pre-upgrade now links to apache2.pre-install.
It's not something we want to do for all packages in master (edge).
apache2 already had .pre-upgrade script (ensuring www-data group
existence and making apache user a member of it), which is what existing
.pre-install script also does, so this kind of unification is fine here.
In most other cases linking .pre-upgrade to .pre-install should happen
only in 3.4-stable branch.
* main/dovecot: Properly set primary group in .pre-install.
main/dovecot/dovecot.pre-install
* main/{npre,postgrey}: Properly set primary group in .pre-install.
main/nrpe/nrpe.pre-install
main/postgrey/postgrey.pre-install
* main/ympd: Reorder arguments in .pre-install as in da4e96aacef5.
main/ympd/ympd.pre-install
* main/znc: Reorder arguments in .pre-install as in da4e96aacef5.
main/znc/znc.pre-install
* main/aports-build: Reorder arguments in .pre-install as in da4e96aacef5.
main/aports-build/aports-build.pre-install
* main/atheme-iris: Fix overlooked consistency issue as in a60b9f07dee0.
main/atheme-iris/atheme-iris.pre-install
* main/[various]: Add group and use it as primary in .pre-* scripts.
main/apache2/apache2.pre-install
main/aports-build/aports-build.pre-install
main/atheme-iris/atheme-iris.pre-install
main/clamav/clamav-db.pre-install
main/clamsmtp/clamsmtp.pre-install
main/clamsmtp/clamsmtp.pre-upgrade
main/coova-chilli/coova-chilli.pre-install
main/dhcp/dhcp.pre-install
main/djbdns/dnscache.pre-install
main/djbdns/tinydns.pre-install
main/ez-ipupdate/ez-ipupdate.pre-install
main/fetchmail/fetchmail.pre-install
main/freeswitch/freeswitch.pre-install
main/gitolite/gitolite.pre-install
main/gnats/gnats.pre-install
main/gross/gross.pre-install
main/icecast/icecast.pre-install
main/memcached/memcached.pre-install
main/ngircd/ngircd.pre-install
main/openntpd/openntpd.pre-install
main/snort/snort.pre-install
main/squid/squid.pre-install
main/squid/squid.pre-upgrade
main/transmission/transmission-daemon.pre-install
main/znc/znc.pre-install
Fixes the problem I unintentionally brought in commit ccc056dbf9d3:
system user creation doesn't add same named group and uses nogroup as
primary group unless explicitly specified via -G.
Brings status quo regarding primary groups of users created in packages:
- main/apache2
- main/aports-build
- main/atheme-iris
- main/clamav
- main/clamsmtp
- main/coova-chilli
- main/dhcp
- main/djbdns
- main/ez-ipupdate
- main/fetchmail
- main/freeswitch
- main/gitolite
- main/gnats
- main/gross
- main/icecast
- main/memcached
- main/ngircd
- main/openntpd
- main/snort
- main/squid
- main/transmission
- main/znc
Following rules have been applied:
- script starts with shebang !#/bin/sh followed by blank line,
- script ends with exit 0 prepended by blank line,
- only stderr of adduser, addgroup or passwd is redirected to /dev/null,
- getent passwd/group instances has been removed,
- manual checking of file and group existence has been removed,
- `|| true` instances has been removed.
Comments and line wrapping have been preserved.
