git: 1c99c3018476 - main - devel/apr1: Update to 1.7.5

From: Bernard Spil <brnrd_at_FreeBSD.org>
Date: Sun, 13 Oct 2024 07:51:21 UTC
The branch main has been updated by brnrd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=1c99c3018476f32420286dfcfe9169b37695d868

commit 1c99c3018476f32420286dfcfe9169b37695d868
Author:     Bernard Spil <brnrd@FreeBSD.org>
AuthorDate: 2024-10-13 07:51:17 +0000
Commit:     Bernard Spil <brnrd@FreeBSD.org>
CommitDate: 2024-10-13 07:51:17 +0000

    devel/apr1: Update to 1.7.5
---
 devel/apr1/Makefile                                                 | 3 +--
 devel/apr1/distinfo                                                 | 6 +++---
 .../files/{patch-apr-1.7.3_configure => patch-apr-1.7.5_configure}  | 4 ++--
 ...-1.7.3_poll_unix_kqueue.c => patch-apr-1.7.5_poll_unix_kqueue.c} | 4 ++--
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/devel/apr1/Makefile b/devel/apr1/Makefile
index 233168dbcb4e..96f45de7427c 100644
--- a/devel/apr1/Makefile
+++ b/devel/apr1/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	apr
 PORTVERSION=	${APR_VERSION}.${APU_VERSION}
-PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	APACHE/apr
 DISTFILES=	apr-${APR_VERSION}.tar.gz \
@@ -19,7 +18,7 @@ USES=		iconv pathfix libtool cpe
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 
-APR_VERSION=	1.7.3
+APR_VERSION=	1.7.5
 APU_VERSION=	1.6.3
 
 CPE_VENDOR=	apache
diff --git a/devel/apr1/distinfo b/devel/apr1/distinfo
index 24e66396aade..716d97d895f7 100644
--- a/devel/apr1/distinfo
+++ b/devel/apr1/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1680344440
-SHA256 (apr-1.7.3.tar.gz) = af9bfd5b8a04425d6b419673f3e0a7656fade226aae78180d93f8a6f2d3d1c09
-SIZE (apr-1.7.3.tar.gz) = 1097690
+TIMESTAMP = 1728804933
+SHA256 (apr-1.7.5.tar.gz) = 3375fa365d67bcf945e52b52cba07abea57ef530f40b281ffbe977a9251361db
+SIZE (apr-1.7.5.tar.gz) = 1131871
 SHA256 (apr-util-1.6.3.tar.gz) = 2b74d8932703826862ca305b094eef2983c27b39d5c9414442e9976a9acf1983
 SIZE (apr-util-1.6.3.tar.gz) = 556623
diff --git a/devel/apr1/files/patch-apr-1.7.3_configure b/devel/apr1/files/patch-apr-1.7.5_configure
similarity index 91%
rename from devel/apr1/files/patch-apr-1.7.3_configure
rename to devel/apr1/files/patch-apr-1.7.5_configure
index 927e44d9c5db..1683dce7eef2 100644
--- a/devel/apr1/files/patch-apr-1.7.3_configure
+++ b/devel/apr1/files/patch-apr-1.7.5_configure
@@ -1,5 +1,5 @@
---- apr-1.7.3/configure.orig	2015-04-25 12:04:18 UTC
-+++ apr-1.7.3/configure
+--- apr-1.7.5/configure.orig	2015-04-25 12:04:18 UTC
++++ apr-1.7.5/configure
 @@ -6624,11 +6624,7 @@ if test "x$apr_preload_done" != "xyes" ;
      apr_lock_method="USE_FLOCK_SERIALIZE"
    fi
diff --git a/devel/apr1/files/patch-apr-1.7.3_poll_unix_kqueue.c b/devel/apr1/files/patch-apr-1.7.5_poll_unix_kqueue.c
similarity index 96%
rename from devel/apr1/files/patch-apr-1.7.3_poll_unix_kqueue.c
rename to devel/apr1/files/patch-apr-1.7.5_poll_unix_kqueue.c
index 1a31398d40c5..f06ebc948b52 100644
--- a/devel/apr1/files/patch-apr-1.7.3_poll_unix_kqueue.c
+++ b/devel/apr1/files/patch-apr-1.7.5_poll_unix_kqueue.c
@@ -1,8 +1,8 @@
 # upstram PR: https://bz.apache.org/bugzilla/show_bug.cgi?id=59914
 # FreeBSD PR: 211430
 ========================================================================
---- apr-1.7.3/poll/unix/kqueue.c.orig	2022-01-19 23:17:18 UTC
-+++ apr-1.7.3/poll/unix/kqueue.c
+--- apr-1.7.5/poll/unix/kqueue.c.orig	2022-01-19 23:17:18 UTC
++++ apr-1.7.5/poll/unix/kqueue.c
 @@ -25,21 +25,40 @@
  
  #ifdef HAVE_KQUEUE