]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
apr: Update to version 1.7.6
authorAdolf Belka <adolf.belka@ipfire.org>
Thu, 22 May 2025 13:08:29 +0000 (15:08 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 22 May 2025 15:14:53 +0000 (15:14 +0000)
- Update from version 1.7.5 to 1.7.6
- Update of rootfile
- Changelog
    1.7.6
  *) test/testsock.c (test_get_addr): Fix test to portably switch
     the socket to non-blocking mode using apr_socket_timeout_set().
     Also make the test SKIP for the case where the connect() completes
     synchronously. [Ivan Zhakov]
  *) network_io/win32/sockets.c: (apr_socket_connect): Copy the remote
     address by value rather than by reference.  This ensures that the
     sockaddr object returned by apr_socket_addr_get is allocated from
     the same pool as the socket object itself, as apr_socket_accept
     does; avoiding any potential lifetime mismatches. [Ivan Zhakov]
  *) CMake: Install include/apr_encode.h. [Ivan Zhakov]
  *) CMake: Fix installation PDB files with multi-config generators.
     [Ivan Zhakov]

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
config/rootfiles/common/apr
lfs/apr

index 3de0b28e5215bcfe5743c28dce87e6d5cf2d00c8..199d4bfc5da1a3ccda8421c42a312866488970c2 100644 (file)
@@ -45,7 +45,7 @@ usr/bin/apr-1-config
 #usr/lib/libapr-1.la
 #usr/lib/libapr-1.so
 usr/lib/libapr-1.so.0
-usr/lib/libapr-1.so.0.7.5
+usr/lib/libapr-1.so.0.7.6
 #usr/lib/pkgconfig/apr-1.pc
 #usr/share/apr-1
 #usr/share/apr-1/build
diff --git a/lfs/apr b/lfs/apr
index 5df4e9925d2aab6818698cf0ffc6e7719569b979..41bff30f5818a8d128cd6e0e3d3e90d8e56e6d80 100644 (file)
--- a/lfs/apr
+++ b/lfs/apr
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2024  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2025  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -25,7 +25,7 @@
 
 include Config
 
-VER        = 1.7.5
+VER        = 1.7.6
 
 THISAPP    = apr-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -42,7 +42,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = 1feacb24e213843c4d3312806abf698e332c45557b7cfd74c9c654d4f9d835dd3a8bf4f9a3bb8328483dcc244948ca118ed6fab9655e482ac6fb53cc7fd92908
+$(DL_FILE)_BLAKE2 = 6762df4f062392a352603ac6a17961a71c77e39682b40eedab721ee07e50793b5d1529abb58654513c750a5d219bd33aaa3dabfbd4a25223f3a13af7fc9726d0
 
 install : $(TARGET)
 
@@ -72,11 +72,11 @@ $(subst %,%_BLAKE2,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-
-       cd $(DIR_APP) && ./configure --prefix=/usr \
-                               --disable-static --with-installbuilddir=/usr/share/apr-1/build
+       cd $(DIR_APP) && ./configure \
+                               --prefix=/usr \
+                               --disable-static \
+                               --with-installbuilddir=/usr/share/apr-1/build
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
-
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)