Update autofs-5.1.8-configure-c99.patch with -Wint-conversion fix

Related to:

  <https://fedoraproject.org/wiki/Changes/PortingToModernC>
  <https://fedoraproject.org/wiki/Toolchain/PortingToModernC>
This commit is contained in:
Florian Weimer 2023-09-29 11:49:40 +02:00
parent a9c9b8aff3
commit 5ae410099d
2 changed files with 20 additions and 6 deletions

View File

@ -1,5 +1,7 @@
Posted upstream: https://marc.info/?l=autofs&m=167840444620402
[Subsequently tweaked to change the type of the ct variable.]
Author: Arjun Shankar <arjun@redhat.com>
Date: Fri Mar 10 00:00:55 2023 +0100
@ -20,10 +22,10 @@ Date: Fri Mar 10 00:00:55 2023 +0100
Signed-off-by: Arjun Shankar <arjun@redhat.com>
diff --git a/aclocal.m4 b/aclocal.m4
index 33561aaeb9f5eaa4..a1ad50b493749851 100644
index 33561aaeb9f5eaa4..1920672d37d25a27 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -368,7 +368,8 @@ af_check_ldap_parse_page_control_save_libs="$LIBS"
@@ -368,9 +368,10 @@ af_check_ldap_parse_page_control_save_libs="$LIBS"
LIBS="$LIBS -lldap"
AC_TRY_LINK(
@ -31,10 +33,13 @@ index 33561aaeb9f5eaa4..a1ad50b493749851 100644
+ [ #define LDAP_DEPRECATED 1
+ #include <ldap.h> ],
[ LDAP *ld;
ber_int_t ct;
- ber_int_t ct;
+ ber_int_t *ct;
struct berval *c;
int ret;
LDAPControl **clp;
diff --git a/configure b/configure
index 394a8d55121c12ed..a19250d5ba271ecd 100755
index 394a8d55121c12ed..c84ef2a94d1df1b4 100755
--- a/configure
+++ b/configure
@@ -5407,6 +5407,8 @@ $as_echo_n "checking for ldap_create_page_control in -lldap... " >&6; }
@ -54,7 +59,7 @@ index 394a8d55121c12ed..a19250d5ba271ecd 100755
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldap_parse_page_control in -lldap" >&5
$as_echo_n "checking for ldap_parse_page_control in -lldap... " >&6; }
@@ -5450,10 +5453,13 @@ $as_echo_n "checking for ldap_parse_page_control in -lldap... " >&6; }
@@ -5450,15 +5453,18 @@ $as_echo_n "checking for ldap_parse_page_control in -lldap... " >&6; }
# save current libs
af_check_ldap_parse_page_control_save_libs="$LIBS"
LIBS="$LIBS -lldap"
@ -69,6 +74,12 @@ index 394a8d55121c12ed..a19250d5ba271ecd 100755
int
main ()
{
LDAP *ld;
- ber_int_t ct;
+ ber_int_t *ct;
struct berval *c;
int ret;
LDAPControl **clp;
@@ -5486,6 +5492,7 @@ fi
# restore libs

View File

@ -12,7 +12,7 @@
Summary: A tool for automatically mounting and unmounting filesystems
Name: autofs
Version: 5.1.8
Release: 21%{?dist}
Release: 22%{?dist}
Epoch: 1
License: GPLv2+
Source: https://www.kernel.org/pub/linux/daemons/autofs/v5/autofs-%{version}.tar.gz
@ -291,6 +291,9 @@ fi
%dir /etc/auto.master.d
%changelog
* Fri Sep 29 2023 Florian Weimer <fweimer@redhat.com> - 1:5.1.8-22
- Update autofs-5.1.8-configure-c99.patch with -Wint-conversion fix
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1:5.1.8-21
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild