Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: haikuports/haikuports
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 902dc2bfae48
Choose a base ref
...
head repository: haikuports/haikuports
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6f914751c8e3
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Oct 7, 2021

  1. apache: bump to 2.4.50 (#6248)

    @kenmays
    kenmays authored Oct 7, 2021
    Copy the full SHA
    6f91475 View commit details
4 changes: 2 additions & 2 deletions www-servers/apache/apache-2.4.46.recipe → www-servers/apache/apache-2.4.50.recipe
View file
Original file line number Diff line number Diff line change
@@ -3,11 +3,11 @@ DESCRIPTION="The Apache HTTP Server Project is a collaborative software \
development effort aimed at creating a robust, commercial-grade, featureful, \
and freely-available source code implementation of an HTTP (Web) server"
HOMEPAGE="https://httpd.apache.org/"
COPYRIGHT="1995-2020 The Apache Software Foundation."
COPYRIGHT="1995-2021 The Apache Software Foundation."
LICENSE="Apache v2"
REVISION="1"
SOURCE_URI="https://archive.apache.org/dist/httpd/httpd-$portVersion.tar.bz2"
CHECKSUM_SHA256="740eddf6e1c641992b22359cabc66e6325868c3c5e2e3f98faf349b61ecf41ea"
CHECKSUM_SHA256="6a2817c070c606682eb53ed963511407d3c3d7a379cdf855971467b00fb3890f"
SOURCE_DIR="httpd-$portVersion"
PATCHES="apache-$portVersion.patchset"

6 changes: 3 additions & 3 deletions ...ers/apache/patches/apache-2.4.46.patchset → ...ers/apache/patches/apache-2.4.50.patchset
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
From e3275c90c55224962fa0fc37e4db882412398023 Mon Sep 17 00:00:00 2001
From 6eeef2fc588b990d1e301cb4256d6b8a69b2afda Mon Sep 17 00:00:00 2001
From: Nav <nav@unlicrea.com>
Date: Mon, 15 Dec 2014 16:39:31 +0000
Subject: Fixed redefinition error


diff --git a/server/Makefile.in b/server/Makefile.in
index 1fa3344..d13b564 100644
index 8111877..35323c6 100644
--- a/server/Makefile.in
+++ b/server/Makefile.in
@@ -34,7 +34,7 @@ test_char.h: gen_test_char
@@ -18,5 +18,5 @@ index 1fa3344..d13b564 100644
# If export_files is a dependency here, but we remove it during this stage,
# when exports.c is generated, make will not detect that export_files is no
--
2.28.0
2.30.2