new version 1.7.3
This commit is contained in:
parent
3076dbcb1e
commit
0bc52a5220
1
.gitignore
vendored
1
.gitignore
vendored
@ -17,3 +17,4 @@ apr-1.3.9.tar.bz2
|
||||
/apr-1.7.0.tar.bz2
|
||||
/apr-1.7.1.tar.bz2
|
||||
/apr-1.7.2.tar.bz2
|
||||
/apr-1.7.3.tar.bz2
|
||||
|
||||
@ -1,29 +0,0 @@
|
||||
--- a/atomic/unix/mutex64.c 2023/02/09 12:45:02 1907540
|
||||
+++ b/atomic/unix/mutex64.c 2023/02/09 13:36:18 1907541
|
||||
@@ -96,7 +96,26 @@
|
||||
|
||||
APR_DECLARE(apr_uint64_t) apr_atomic_read64(volatile apr_uint64_t *mem)
|
||||
{
|
||||
+ /* On 32bit CPUs this loads with two instructions (tearing),
|
||||
+ * so a lock is needed to ensure atomicity.
|
||||
+ *
|
||||
+ * APR_SIZEOF_VOIDP is probably not the right check for 32 vs 64 bits CPUs
|
||||
+ * but it spares an (hardly-)exhaustive list of supported CPUs (and using
|
||||
+ * assembly). If APR_SIZEOF_VOIDP==4 means that the compiler generates
|
||||
+ * 32bit instructions (-m32 or whatever) then it's the right check though.
|
||||
+ */
|
||||
+#if APR_SIZEOF_VOIDP >= 8
|
||||
return *mem;
|
||||
+#else
|
||||
+ apr_uint64_t cur_value;
|
||||
+ DECLARE_MUTEX_LOCKED(mutex, mem);
|
||||
+
|
||||
+ cur_value = *mem;
|
||||
+
|
||||
+ MUTEX_UNLOCK(mutex);
|
||||
+
|
||||
+ return cur_value;
|
||||
+#endif
|
||||
}
|
||||
|
||||
APR_DECLARE(void) apr_atomic_set64(volatile apr_uint64_t *mem, apr_uint64_t val)
|
||||
9
apr.spec
9
apr.spec
@ -11,8 +11,8 @@
|
||||
|
||||
Summary: Apache Portable Runtime library
|
||||
Name: apr
|
||||
Version: 1.7.2
|
||||
Release: 2%{?dist}
|
||||
Version: 1.7.3
|
||||
Release: 1%{?dist}
|
||||
# ASL 2.0: everything
|
||||
# ISC: network_io/apr-1.4.6/network_io/unix/inet_?to?.c
|
||||
# BSD with advertising: strings/apr_snprintf.c, strings/apr_fnmatch.c,
|
||||
@ -27,7 +27,6 @@ Patch1: apr-1.7.2-libdir.patch
|
||||
Patch2: apr-1.2.7-pkgconf.patch
|
||||
Patch3: apr-1.7.0-deepbind.patch
|
||||
Patch4: apr-1.7.2-autoconf.patch
|
||||
Patch5: apr-1.7.2-r1907541.patch
|
||||
BuildRequires: gcc, autoconf, libtool, libuuid-devel, python3
|
||||
BuildRequires: make
|
||||
|
||||
@ -54,7 +53,6 @@ C data structures and routines.
|
||||
%patch2 -p1 -b .pkgconf
|
||||
%patch3 -p1 -b .deepbind
|
||||
%patch4 -p1 -b .autoconf-2-71
|
||||
%patch5 -p1 -b .r1907541
|
||||
|
||||
%build
|
||||
# regenerate configure script etc.
|
||||
@ -144,6 +142,9 @@ popd
|
||||
%{_datadir}/aclocal/*.m4
|
||||
|
||||
%changelog
|
||||
* Tue Apr 11 2023 Luboš Uhliarik <luhliari@redhat.com> - 1.7.3-1
|
||||
- new version 1.7.3
|
||||
|
||||
* Fri Feb 10 2023 Luboš Uhliarik <luhliari@redhat.com> - 1.7.2-2
|
||||
- enable apr_atomic test again
|
||||
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (apr-1.7.2.tar.bz2) = 0a3a27ccc97bbe4865c1bc0b803012e3da6d5b1f17d4fb0da6f5f58eec01f6d2ae1f25e52896ea5f9c5ac04c5fddcfd1ac606b301c322cf40d5c4d4ce0a1b76e
|
||||
SHA512 (apr-1.7.3.tar.bz2) = d8f62868d8e3ec92cede1f0d93b5d48e49441f575c98e165ff84343746a6abd265290ab16a57f741896ae7a6b3e534a334325a99a61c96c2485e085f7761c124
|
||||
|
||||
Loading…
Reference in New Issue
Block a user