summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update patches for 2.4.60HEADmasterHans de Graaff2024-07-012-625/+0
| | | | | | Remove patches that are already included in the 2.5.60 release. Signed-off-by: Hans de Graaff <graaff@gentoo.org>
* Add patches originally added in the ebuildHans de Graaff2024-05-112-0/+625
| | | | | | | Both these patches are already fixed upstream and should be included in 2.5.60 when it is released. Signed-off-by: Hans de Graaff <graaff@gentoo.org>
* Fix typoHans de Graaff2024-02-231-1/+1
| | | | | | https://bugs.gentoo.org/925310 Signed-off-by: Hans de Graaff <graaff@gentoo.org>
* Use consistent indentation with tabsHans de Graaff2023-11-031-4/+4
| | | | | Bug: https://bugs.gentoo.org/916043 Signed-off-by: Hans de Graaff <graaff@gentoo.org>
* Remove rustls-ffi patchHans de Graaff2023-10-191-51/+0
| | | | | | | This patch was taken from upstream and has been released in apache 2.0.48. Signed-off-by: Hans de Graaff <graaff@gentoo.org>
* Drop 2.4 libtool patchHans de Graaff2023-10-111-21/+0
| | | | | Bug: https://bugs.gentoo.org/860081 Signed-off-by: Hans de Graaff <graaff@gentoo.org>
* Add rustls-ffi patchHans de Graaff2023-09-031-0/+51
| | | | | Bug: https://bugs.gentoo.org/906523 Signed-off-by: Hans de Graaff <graaff@gentoo.org>
* Add libtool patchHans de Graaff2023-09-031-0/+21
| | | | | Bug: https://bugs.gentoo.org/858836 Signed-off-by: Hans de Graaff <graaff@gentoo.org>
* Add no-which patchHans de Graaff2023-09-031-0/+54
| | | | | Bug: https://bugs.gentoo.org/844868 Signed-off-by: Hans de Graaff <graaff@gentoo.org>
* Show https URLs for dev.gentoo.orgHans de Graaff2023-09-031-2/+2
| | | | | | | These URLs are only for display purposes, but still more sensible to show https URLs. Signed-off-by: Hans de Graaff <graaff@gentoo.org>
* Fix interface binding check in init.d fileHans de Graaff2023-09-031-7/+2
| | | | | | | | | | | | | | | | Fix two issues with the interface binding check: 1) don't special case ports 80 and 443 since the interface requirement also applies to all other ports. 2) on show the warning for non-generic binds (i.e. binding a specific IP address) since that requires the associated interface to be up first. Bug: https://bugs.gentoo.org/913227 Bug: https://github.com/gentoo/gentoo/pull/32529 Signed-off-by: Jaco Kroon <jaco@uls.co.za> Signed-off-by: Hans de Graaff <graaff@gentoo.org>
* Update default ssl vhost config to modern standardsHans de Graaff2023-09-021-9/+9
| | | | | | | | Only enable TLSv1.2+, update cipher suite to only include strong ciphers, turn off ordering preference to allow clients to use the best cipher for them. Signed-off-by: Hans de Graaff <graaff@gentoo.org>
* Minor shell style fixesLars Wendler2021-04-292-7/+7
| | | | Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
* rolltarball.sh: Use bash features as we already have bash in shebangLars Wendler2021-02-121-70/+36
| | | | Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
* rolltarball.sh: Simplified G_USER detectionLars Wendler2021-02-121-1/+1
| | | | Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
* 2.4/scripts/apache2-logrotate: handle systemdPacho Ramos2021-02-121-2/+6
| | | | | | Bug: https://bugs.gentoo.org/646032 Signed-off-by: Pacho Ramos <pacho@gentoo.org> Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
* rolltarball.sh: Check for 'Commit:' to determine G_USERLars Wendler2021-02-121-2/+2
| | | | Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
* 2.4/init: Add a comment about altered pidfile in confd fileLars Wendler2020-12-301-1/+3
| | | | Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
* 2.4/init: Submit pidfile to s-s-d on start to not confuse statusLars Wendler2020-12-301-1/+2
| | | | | | Reported-by: Hank Leininger <hlein@korelogic.com> Bug: https://bugs.gentoo.org/762481 Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
* 2.4/init: Another small interface check tweakLars Wendler2020-12-031-1/+1
| | | | Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
* 2.4/init: Fixed typo in interface checkLars Wendler2020-12-021-1/+1
| | | | Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
* 2.4/init: Fix regexp for interface binding detectionLars Wendler2020-12-011-1/+1
| | | | Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
* Revert "rolltarball.sh: Create xz compressed tarballs"Lars Wendler2020-12-011-6/+5
| | | | | | | This reverts commit d8466105dfb6f3323561445488afa300634013b0 because of unresolved issues Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
* 2.4/init: Attempt to provide a way to no longer "need net" in dependLars Wendler2020-12-011-1/+16
| | | | | | | Code blatantly stolen from net-misc/openssh init script Bug: https://bugs.gentoo.org/482092 Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
* rolltarball.sh: Create xz compressed tarballsLars Wendler2020-12-011-5/+6
| | | | | | instead of bzip2 compressed ones Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
* Add xz compressed tarballs to .gitignoreLars Wendler2020-12-011-0/+1
| | | | Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
* apache2ctl: Minor improvementsLars Wendler2019-04-281-3/+2
| | | | Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
* Several fixes to previous apache2ctl systemd enhancementLars Wendler2019-04-021-101/+97
| | | | | | | | | | | | | | - Attempt to keep the script POSIX sh compliant - Don't use "function" prefix - Use curly braces for variables - Fixed indentation - Put code for systemd into an "else" part - Renamed "ERROR" variable to "retval" - Made some variables local - Put the systemd apache2 service file reference into a variable Bug: https://bugs.gentoo.org/673530 Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
* apache2ctl: Add suport for systemdJarod2019-04-021-17/+165
| | | | Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
* apache2ctl: Don't show grep usage message with leading "-" options.Lars Wendler2019-02-261-1/+1
| | | | | Thanks-to: Freenode IRC-user "omelius" Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
* apache2ctl: don't fail with mutli-line APACHE2_OPTS in conf.d file.Lars Wendler2019-02-261-3/+6
| | | | | Bug: https://bugs.gentoo.org/676990 Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
* Don't perform SSL exceptions for MSIE anymore.Lars Wendler2018-07-161-5/+0
| | | | Bug: https://bugs.gentoo.org/604744
* init scripts: Replaced non-POSIX compliant "type -p" calls.Tomáš Mózes2018-04-192-4/+4
| | | | Closes: https://bugs.gentoo.org/635400
* 2.4/init/apache2.initd: Start after entropy daemon if available.Lars Wendler2018-03-231-1/+1
| | | | Gentoo-Bug: https://bugs.gentoo.org/470018
* 2.4/scripts/apache2ctl: POSIX shells don't know =~ test operator.Lars Wendler2018-03-231-1/+1
| | | | | | Fixed by using "echo ... | grep -q ..." combination. Gentoo-Bug: https://bugs.gentoo.org/650678
* 2.4/scripts/apache2ctl: Pass commands to the apache daemon.Lars Wendler2018-03-151-1/+24
| | | | | | | Gentoo-Bug: https://bugs.gentoo.org/634414 Thanks-to: Joona Hoikkala <joona@kuori.org> Thanks-to: Andrey Falko <Ma3oxuct@gmail.com>
* Added 41_mod_http2.conf to apache-2.4 modules.d directory.Lars Wendler2016-12-301-0/+9
|
* Whitespace fixes.Lars Wendler2016-03-031-2/+2
| | | | Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
* apache2.initd: set defaults for LYNX and STATUSURL once.Michael Orlitzky2016-03-031-4/+2
| | | | | | | | The default values for the LYNX and STATUSURL variables were set in functions. Now that the other conf.d defaults are set at the beginning of the script, it makes sense to set these there, too. The LYNX default was set twice, in configdump() and fullstatus(), so this eliminates some duplication.
* apache2.initd: replace deprecated name "runscript" with "openrc-run".Michael Orlitzky2016-03-031-1/+1
|
* apache2.initd: append SERVERROOT and CONFIGFILE to APACHE2_OPTS once.Michael Orlitzky2016-03-031-3/+5
| | | | | | | | | | | We are currently appending both SERVERROOT and CONFIGFILE to APACHE2_OPTS in the checkconfd() function. Since checkconfd() is called multiple times, this can lead to duplication of command-line arguments as witnessed in bug 566726. Since the values of SERVERROOT and CONFIGFILE are fixed, we now instead append them once at the beginning of the script. Gentoo-Bug: 566726
* apache2.initd: append STARTUPERRORLOG to APACHE2_OPTS in start().Michael Orlitzky2016-03-031-2/+7
| | | | | | | | | | We currently append the value of STARTUPERRORLOG to APACHE2_OPTS in the checkconfd() function. This can cause duplication of command-line arguments as witnessed in bug 566726. Since STARTUPERRORLOG does need conditional handling (we don't append it if it's empty), the wisest place to do so seems to be in start(). Gentoo-Bug: 566726
* apache2.initd: do not call checkconfd() before stopping.Michael Orlitzky2016-03-031-2/+0
| | | | | | If we are attempting to stop (but not restart) apache2, then there is no reason to check whether or not $SERVERROOT exists -- we should stop apache2 either way. So remove that call to checkconfd().
* apache2.initd: set the path to the apache2 binary once, globally.Michael Orlitzky2016-03-031-1/+3
| | | | | | | The $APACHE2 variable (containing the path to apache2) is currently set every time checkconfd() is called. Its value never changes, and the variable is already global, so we might as well set it once at the beginning of the script.
* apache2.initd: apply default values for conf.d variables in one place.Michael Orlitzky2016-03-031-8/+7
| | | | | | | | There are a few variables in the apache2 conf.d file that have default values. The default values were applied at various places in different commands, and often more than once. Since none of those variables need to be modified after the script has loaded, it makes more sense to set them once at the beginning of the script.
* apache2.initd: remove config file readability check.Michael Orlitzky2016-03-031-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | In checkconfd(), the apache2 init script checks to make sure that $CONFIGFILE is readable. To do this, it needs to reimplement the relative path handling that apache2 already does. If we remove the relative path handling from checkconfd(), then apache2 continues to do the right thing when $CONFIGFILE is relative. However, our custom readability check fails, since it is looking for an absolute path that doesn't exist. Fortunately, apache2 already checks to ensure that the configuration file exists and is readable. If we remove the custom readability check entirely, then we get an error like, * apache2 has detected an error in your setup: apache2: Could not open configuration file /usr/lib/apache2/example.conf: No such file or directory This is not sufficiently worse than the custom error: Unable to read configuration file: example.conf Therefore the custom readability check is removed in this commit, and we can avoid reimplementing the relative path handling as well.
* apache2.initd: update copyright year to 2016.Michael Orlitzky2016-03-031-1/+1
|
* apache2.initd: remove ancient baselayout-1.x check in checkconfd().Michael Orlitzky2016-03-031-6/+0
| | | | | OpenRC went stable on 2011-06-28, and support for baselayout-1.x died off after that. It's been ~4.5 years, so I think this check can go.
* apache2.initd: capture config test output in checkconfig().Michael Orlitzky2016-03-031-2/+2
| | | | | | | | | The configtest() command in the init script calls "apache2 -t" to test the configuration for syntax errors. Before this commit, the command was run twice -- once to see if there was an error, and once to output the error to the user. We can capture the output in a variable the first time; this commit does so, and prints the contents of that variable when there is an error.
* Removed security patches which went into apache-2.2.28.Lars Wendler2014-09-223-611/+0
|