Compare commits

...

1 Commits
c9 ... i10ce

@ -1 +1 @@
281c2e0a352c53ef1656bfe778c380226d61726f SOURCES/rasqal-0.9.33.tar.gz
281c2e0a352c53ef1656bfe778c380226d61726f SOURCES/rasqal-0.9.33.tar.gz

@ -0,0 +1,23 @@
diff -ruN rasqal-0.9.33.orig/configure rasqal-0.9.33/configure
--- rasqal-0.9.33.orig/configure 2023-01-23 13:14:38.861781072 +0100
+++ rasqal-0.9.33/configure 2023-01-23 16:57:03.874250005 +0100
@@ -13712,6 +13712,7 @@
$as_echo_n "checking whether __FUNCTION__ is available... " >&6; }
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
+extern int printf(const char *);
int main() { printf(__FUNCTION__); }
_ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
diff -ruN rasqal-0.9.33.orig/configure.ac rasqal-0.9.33/configure.ac
--- rasqal-0.9.33.orig/configure.ac 2014-11-23 23:11:33.000000000 +0100
+++ rasqal-0.9.33/configure.ac 2023-01-23 15:49:44.885025978 +0100
@@ -312,7 +312,7 @@
AC_C_BIGENDIAN
AC_MSG_CHECKING(whether __FUNCTION__ is available)
-AC_COMPILE_IFELSE([AC_LANG_SOURCE([int main() { printf(__FUNCTION__); }])],
+AC_COMPILE_IFELSE([AC_LANG_SOURCE([extern int printf(const char *s); int main() { printf(__FUNCTION__); }])],
[AC_DEFINE([HAVE___FUNCTION__], [1], [Is __FUNCTION__ available])
AC_MSG_RESULT(yes)],
[AC_MSG_RESULT(no)])

@ -0,0 +1,31 @@
Fix incompatible pointer type due to misuse of the gcry_md_open
function.
Submitted upstream: <https://github.com/dajobe/rasqal/pull/13>
diff --git a/configure b/configure
index 038ea7c3efaf06a0..17a107cda735a257 100755
--- a/configure
+++ b/configure
@@ -14541,7 +14541,7 @@ elif test "$ac_cv_header_gcrypt_h" = "yes"; then
int
main ()
{
- gcry_md_hd_t hash; gcry_md_open(hash, GCRY_MD_MD5, 0);
+ gcry_md_hd_t hash; gcry_md_open(&hash, GCRY_MD_MD5, 0);
;
return 0;
}
diff --git a/configure.ac b/configure.ac
index 7bfc38e9261d6c96..eea4d34e7dc9fd4b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -631,7 +631,7 @@ elif test "$ac_cv_header_gcrypt_h" = "yes"; then
LIBS="$LIBS `$LIBGCRYPT_CONFIG --libs`"
AC_LINK_IFELSE([AC_LANG_PROGRAM([[
- #include <gcrypt.h>]], [[ gcry_md_hd_t hash; gcry_md_open(hash, GCRY_MD_MD5, 0); ]])],[have_digest_gcrypt=yes],[have_digest_gcrypt=no])
+ #include <gcrypt.h>]], [[ gcry_md_hd_t hash; gcry_md_open(&hash, GCRY_MD_MD5, 0); ]])],[have_digest_gcrypt=yes],[have_digest_gcrypt=no])
CPPFLAGS="$oCPPFLAGS"
LIBS="$oLIBS"

@ -1,9 +1,9 @@
Name: rasqal
Version: 0.9.33
Release: 18%{?dist}
Release: 29%{?dist}
Summary: RDF Query Library
License: LGPLv2+ or ASL 2.0
License: LGPL-2.1-or-later OR Apache-2.0
URL: http://librdf.org/rasqal/
Source: http://download.librdf.org/source/%{name}-%{version}.tar.gz
@ -11,13 +11,15 @@ BuildRequires: make
BuildRequires: gcc-c++
BuildRequires: libxml2-devel
BuildRequires: mpfr-devel
BuildRequires: pcre-devel
BuildRequires: raptor2-devel
BuildRequires: libgcrypt-devel
# for the testsuite
BuildRequires: perl(Pod::Usage)
BuildRequires: perl(XML::DOM)
#BuildRequires: %{_bindir}/rapper
# Upstream PR: https://github.com/dajobe/rasqal/pull/11
Patch1: define-printf.patch
Patch2: rasqal-configure-c99-2.patch
%description
Rasqal is a library providing full support for querying Resource
@ -34,6 +36,8 @@ Libraries, includes etc to develop with the Rasqal RDF query language library.
%prep
%setup -q
%patch -P1 -p1 -b .printf
%patch -P2 -p1
# hack to nuke rpaths
%if "%{_libdir}" != "/usr/lib"
@ -44,6 +48,7 @@ sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure
%build
%configure \
--with-digest-library=gcrypt\
--disable-pcre \
--disable-static\
--enable-release
@ -94,12 +99,48 @@ fi
%changelog
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 0.9.33-18
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Mon Dec 23 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 0.9.33-29
- Rebuilt for MSVSphere 10
* Fri Jul 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.33-29
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.33-28
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.33-27
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Tue Dec 19 2023 Florian Weimer <fweimer@redhat.com> - 0.9.33-26
- Fix another C compatibility issue in configure script
* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.33-25
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Fri Feb 24 2023 Caolán McNamara <caolanm@redhat.com> - 0.9.33-24
- migrated to SPDX license
* Tue Jan 24 2023 Timm Bäder <tbaeder@redhat.com> - 0.9.33-23
- Fix undefined printf() in configure check.
- https://fedoraproject.org/wiki/Changes/PortingToModernC
* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.33-22
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Wed Nov 30 2022 Caolán McNamara <caolanm@redhat.com> - 0.9.33-21
- Resolves: rhbz#2128363 disable-pcre
* Wed Nov 30 2022 Caolán McNamara <caolanm@redhat.com> - 0.9.33-20
- rebuild for F38
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.33-19
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.33-18
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 0.9.33-17
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.33-17
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.33-16
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

Loading…
Cancel
Save