Attachment 253327 Details for Bug 281265 – git format-patch for freeipa-client update

[patch] git format-patch for freeipa-client update

0001-net-freeipa-client-update-to-4.12.2.patch (text/plain), 13.94 KB, created by Xavier Beaudouin on 2024-09-04 13:50:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Xavier Beaudouin

Created: 2024-09-04 13:50:45 UTC

Size: 13.94 KB

patch

obsolete

>From 4a86419dfc747b450022f38b207096bb1d05af8d Mon Sep 17 00:00:00 2001
>From: Xavier Beaudouin <kiwi@oav.net>
>Date: Wed, 4 Sep 2024 15:47:54 +0200
>Subject: [PATCH] net/freeipa-client: update to 4.12.2
>
>Sponsored by:	Klara, Inc.
>---
> net/freeipa-client/Makefile                   |  6 ++-
> net/freeipa-client/distinfo                   |  6 +--
> .../files/patch-asn1_asn1c_INTEGER.c          |  2 +-
> .../files/patch-asn1_asn1c_NativeEnumerated.c |  2 +-
> .../files/patch-asn1_asn1c_der__encoder.c     |  2 +-
> .../files/patch-client_Makefile.am            |  4 +-
> net/freeipa-client/files/patch-configure.ac   | 22 ++++++----
> .../files/patch-daemons_Makefile.am           |  6 +--
> .../files/patch-init_Makefile.am              |  4 +-
> .../patch-ipaplatform_freebsd_____init____.py |  4 --
> .../patch-ipaplatform_freebsd___init__.py     |  4 ++
> net/freeipa-client/pkg-plist                  | 44 +++++++++----------
> 12 files changed, 57 insertions(+), 49 deletions(-)
> delete mode 100644 net/freeipa-client/files/patch-ipaplatform_freebsd_____init____.py
> create mode 100644 net/freeipa-client/files/patch-ipaplatform_freebsd___init__.py
>
>diff --git a/net/freeipa-client/Makefile b/net/freeipa-client/Makefile
>index efe6a6605764..e069e8657b75 100644
>--- a/net/freeipa-client/Makefile
>+++ b/net/freeipa-client/Makefile
>@@ -1,6 +1,6 @@
> PORTNAME=	freeipa-client
>-DISTVERSION=	4.11.0
>-PORTREVISION=	1
>+DISTVERSION=	4.12.2
>+PORTREVISION=	2
> CATEGORIES=	net
> MASTER_SITES=	https://releases.pagure.org/freeipa/
> DISTNAME=	freeipa-${DISTVERSION}
>@@ -46,6 +46,8 @@ EXTRACT_AFTER_ARGS=	--exclude client/systemd --exclude daemons/dnssec \
> 			daemons/ipa-slapi-plugins --exclude init/systemd \
> 			--exclude init/tmpfilesd
> 
>+PLIST_SUB=	DISTVERSION=${DISTVERSION}
>+
> # Make sample configuration file
> post-install:
> 	@${MV} ${STAGEDIR}${PREFIX}/etc/ipa/epn.conf ${STAGEDIR}${PREFIX}/etc/ipa/epn.conf.sample
>diff --git a/net/freeipa-client/distinfo b/net/freeipa-client/distinfo
>index f81993182baf..74bdf1b3decf 100644
>--- a/net/freeipa-client/distinfo
>+++ b/net/freeipa-client/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1698152461
>-SHA256 (freeipa-4.11.0.tar.gz) = 97f7b60eafda928e35416119c89083f8f038e0fcd39f30bc07b8d8026fd3b7a4
>-SIZE (freeipa-4.11.0.tar.gz) = 14533814
>+TIMESTAMP = 1725364321
>+SHA256 (freeipa-4.12.2.tar.gz) = dc88f5404e7613eb6530d71142ef43a9f89019d59cdc6ec25b778413258c317f
>+SIZE (freeipa-4.12.2.tar.gz) = 5699673
>diff --git a/net/freeipa-client/files/patch-asn1_asn1c_INTEGER.c b/net/freeipa-client/files/patch-asn1_asn1c_INTEGER.c
>index 81283a3cc9b1..7d8ad8d0df3f 100644
>--- a/net/freeipa-client/files/patch-asn1_asn1c_INTEGER.c
>+++ b/net/freeipa-client/files/patch-asn1_asn1c_INTEGER.c
>@@ -1,4 +1,4 @@
>---- asn1/asn1c/INTEGER.c.orig	2021-11-25 17:34:42 UTC
>+--- asn1/asn1c/INTEGER.c.orig	2024-08-21 15:06:37 UTC
> +++ asn1/asn1c/INTEGER.c
> @@ -7,6 +7,7 @@
>  #include <INTEGER.h>
>diff --git a/net/freeipa-client/files/patch-asn1_asn1c_NativeEnumerated.c b/net/freeipa-client/files/patch-asn1_asn1c_NativeEnumerated.c
>index ee8a2f560771..3776bdfbf1e1 100644
>--- a/net/freeipa-client/files/patch-asn1_asn1c_NativeEnumerated.c
>+++ b/net/freeipa-client/files/patch-asn1_asn1c_NativeEnumerated.c
>@@ -1,4 +1,4 @@
>---- asn1/asn1c/NativeEnumerated.c.orig	2021-11-25 17:34:42 UTC
>+--- asn1/asn1c/NativeEnumerated.c.orig	2024-08-21 15:06:37 UTC
> +++ asn1/asn1c/NativeEnumerated.c
> @@ -11,6 +11,7 @@
>   */
>diff --git a/net/freeipa-client/files/patch-asn1_asn1c_der__encoder.c b/net/freeipa-client/files/patch-asn1_asn1c_der__encoder.c
>index 477f73d33b4a..296af9816c70 100644
>--- a/net/freeipa-client/files/patch-asn1_asn1c_der__encoder.c
>+++ b/net/freeipa-client/files/patch-asn1_asn1c_der__encoder.c
>@@ -1,4 +1,4 @@
>---- asn1/asn1c/der_encoder.c.orig	2021-11-25 17:34:42 UTC
>+--- asn1/asn1c/der_encoder.c.orig	2024-08-21 15:06:37 UTC
> +++ asn1/asn1c/der_encoder.c
> @@ -4,6 +4,7 @@
>   */
>diff --git a/net/freeipa-client/files/patch-client_Makefile.am b/net/freeipa-client/files/patch-client_Makefile.am
>index 8151313edc55..d83900118cbc 100644
>--- a/net/freeipa-client/files/patch-client_Makefile.am
>+++ b/net/freeipa-client/files/patch-client_Makefile.am
>@@ -1,6 +1,6 @@
>---- client/Makefile.am.orig	2023-08-21 14:29:00 UTC
>+--- client/Makefile.am.orig	2024-08-21 15:06:37 UTC
> +++ client/Makefile.am
>-@@ -94,8 +94,6 @@ ipa_join_LDADD = 		\
>+@@ -94,8 +94,6 @@ SUBDIRS =			\
>  SUBDIRS =			\
>  	share		        \
>  	man			\
>diff --git a/net/freeipa-client/files/patch-configure.ac b/net/freeipa-client/files/patch-configure.ac
>index 60978722068d..16711b8e0d41 100644
>--- a/net/freeipa-client/files/patch-configure.ac
>+++ b/net/freeipa-client/files/patch-configure.ac
>@@ -1,13 +1,12 @@
>---- configure.ac.orig	2023-08-21 14:29:00 UTC
>+--- configure.ac.orig	2024-08-21 15:06:37 UTC
> +++ configure.ac
>-@@ -24,10 +24,13 @@ dnl enable features like htole16()
>- CFLAGS="$CFLAGS -D_DEFAULT_SOURCE=1"
>+@@ -25,9 +25,12 @@ dnl fail hard when includes statements are missing
>  dnl Enable features like strndup()
>  CFLAGS="$CFLAGS -D_POSIX_C_SOURCE=200809L"
>-+dnl Removing this failing hard because on implicit declaration of
>-+dnl alloca() used several place in the code.
>  dnl fail hard when includes statements are missing
> -CFLAGS="$CFLAGS -Werror=implicit-function-declaration"
>++dnl Removing this failing hard because on implicit declaration of 
>++dnl alloca() used several plaice in the code.
> +dnl CFLAGS="$CFLAGS -Werror=implicit-function-declaration"
>  
>  AC_PROG_CC_C99
>@@ -15,7 +14,7 @@
>  AC_DISABLE_STATIC
>  LT_INIT
>  
>-@@ -211,14 +214,7 @@ dnl --------------------------------------------------
>+@@ -211,14 +214,7 @@ SAVE_LIBS="$LIBS"
>  dnl - Check for libintl
>  dnl ---------------------------------------------------------------------------
>  SAVE_LIBS="$LIBS"
>@@ -31,7 +30,7 @@
>  LIBS="$SAVELIBS"
>  AC_SUBST(LIBINTL_LIBS)
>  
>-@@ -249,32 +245,13 @@ AC_ARG_WITH([runstatedir],
>+@@ -249,39 +245,13 @@ dnl --------------------------------------------------
>  AC_SUBST([runstatedir])
>  
>  dnl ---------------------------------------------------------------------------
>@@ -53,6 +52,13 @@
> -        [systemdtmpfilesdir=$($PKG_CONFIG --define-variable=prefix='${prefix}' --variable=tmpfilesdir systemd)])
> -AC_SUBST([systemdtmpfilesdir])
> -
>+-AC_ARG_WITH([systemdcatalogdir],
>+-            AS_HELP_STRING([--with-systemdcatalogdir=DIR],
>+-               [Directory for systemd journal catalog files]),
>+-            [systemdcatalogdir=$with_systemdcatalogdir],
>+-        [systemdcatalogdir=$($PKG_CONFIG --define-variable=prefix='${prefix}' --variable=catalogdir systemd)])
>+-AC_SUBST([systemdcatalogdir])
>+-
> -dnl ---------------------------------------------------------------------------
>  dnl - Server-only configuration
>  dnl ---------------------------------------------------------------------------
>@@ -68,7 +74,7 @@
>  
>  dnl ---------------------------------------------------------------------------
>  dnl - Check if IPA certauth plugin can be build
>-@@ -618,35 +595,11 @@ AC_CONFIG_FILES([
>+@@ -625,35 +595,11 @@ AC_CONFIG_FILES([
>      client/Makefile
>      client/share/Makefile
>      client/man/Makefile
>diff --git a/net/freeipa-client/files/patch-daemons_Makefile.am b/net/freeipa-client/files/patch-daemons_Makefile.am
>index dd6add1ccd92..28474b228b06 100644
>--- a/net/freeipa-client/files/patch-daemons_Makefile.am
>+++ b/net/freeipa-client/files/patch-daemons_Makefile.am
>@@ -1,6 +1,6 @@
>---- daemons/Makefile.am.orig	2023-08-21 14:29:00 UTC
>-+++ daemons/Makefile.am
>-@@ -9,11 +9,8 @@ noinst_HEADERS = ipa-version.h.in
>+--- daemons/Makefile.am.orig	2023-08-21 16:29:00.040643147 +0200
>++++ daemons/Makefile.am	2023-10-24 17:56:44.164932000 +0200
>+@@ -9,11 +9,8 @@
>  
>  SUBDIRS =			\
>  	.			\
>diff --git a/net/freeipa-client/files/patch-init_Makefile.am b/net/freeipa-client/files/patch-init_Makefile.am
>index b13af0e0cdc9..ba05d2628086 100644
>--- a/net/freeipa-client/files/patch-init_Makefile.am
>+++ b/net/freeipa-client/files/patch-init_Makefile.am
>@@ -1,5 +1,5 @@
>---- init/Makefile.am.orig	2021-11-25 17:34:42 UTC
>-+++ init/Makefile.am
>+--- init/Makefile.am.orig	2023-10-24 17:29:14.662539000 +0200
>++++ init/Makefile.am	2023-10-24 17:29:28.779983000 +0200
> @@ -2,7 +2,7 @@
>  #
>  AUTOMAKE_OPTIONS = 1.7
>diff --git a/net/freeipa-client/files/patch-ipaplatform_freebsd_____init____.py b/net/freeipa-client/files/patch-ipaplatform_freebsd_____init____.py
>deleted file mode 100644
>index b31b63498c12..000000000000
>--- a/net/freeipa-client/files/patch-ipaplatform_freebsd_____init____.py
>+++ /dev/null
>@@ -1,4 +0,0 @@
>---- ipaplatform/freebsd/__init__.py.orig	2023-11-29 16:56:08 UTC
>-+++ ipaplatform/freebsd/__init__.py
>-@@ -0,0 +1 @@
>-+NAME = 'freebsd'
>diff --git a/net/freeipa-client/files/patch-ipaplatform_freebsd___init__.py b/net/freeipa-client/files/patch-ipaplatform_freebsd___init__.py
>new file mode 100644
>index 000000000000..b1ed5b7e8011
>--- /dev/null
>+++ b/net/freeipa-client/files/patch-ipaplatform_freebsd___init__.py
>@@ -0,0 +1,4 @@
>+--- /dev/null	2023-10-25 10:42:48.658581000 +0200
>++++ ipaplatform/freebsd/__init__.py	2023-10-25 10:42:03.380066000 +0200
>+@@ -0,0 +1 @@
>++NAME = 'freebsd'
>diff --git a/net/freeipa-client/pkg-plist b/net/freeipa-client/pkg-plist
>index 66256760b5ca..3dc800083173 100644
>--- a/net/freeipa-client/pkg-plist
>+++ b/net/freeipa-client/pkg-plist
>@@ -2,13 +2,13 @@ bin/ipa
> etc/bash_completion.d/ipa
> @sample etc/ipa/epn.conf.sample
> etc/ipa/epn/expire_msg.template
>-%%PYTHON_SITELIBDIR%%/ipaclient-4.11.0-py%%PYTHON_VER%%.egg-info/PKG-INFO
>-%%PYTHON_SITELIBDIR%%/ipaclient-4.11.0-py%%PYTHON_VER%%.egg-info/SOURCES.txt
>-%%PYTHON_SITELIBDIR%%/ipaclient-4.11.0-py%%PYTHON_VER%%.egg-info/dependency_links.txt
>-%%PYTHON_SITELIBDIR%%/ipaclient-4.11.0-py%%PYTHON_VER%%.egg-info/entry_points.txt
>-%%PYTHON_SITELIBDIR%%/ipaclient-4.11.0-py%%PYTHON_VER%%.egg-info/not-zip-safe
>-%%PYTHON_SITELIBDIR%%/ipaclient-4.11.0-py%%PYTHON_VER%%.egg-info/requires.txt
>-%%PYTHON_SITELIBDIR%%/ipaclient-4.11.0-py%%PYTHON_VER%%.egg-info/top_level.txt
>+%%PYTHON_SITELIBDIR%%/ipaclient-%%DISTVERSION%%-py%%PYTHON_VER%%.egg-info/PKG-INFO
>+%%PYTHON_SITELIBDIR%%/ipaclient-%%DISTVERSION%%-py%%PYTHON_VER%%.egg-info/SOURCES.txt
>+%%PYTHON_SITELIBDIR%%/ipaclient-%%DISTVERSION%%-py%%PYTHON_VER%%.egg-info/dependency_links.txt
>+%%PYTHON_SITELIBDIR%%/ipaclient-%%DISTVERSION%%-py%%PYTHON_VER%%.egg-info/entry_points.txt
>+%%PYTHON_SITELIBDIR%%/ipaclient-%%DISTVERSION%%-py%%PYTHON_VER%%.egg-info/not-zip-safe
>+%%PYTHON_SITELIBDIR%%/ipaclient-%%DISTVERSION%%-py%%PYTHON_VER%%.egg-info/requires.txt
>+%%PYTHON_SITELIBDIR%%/ipaclient-%%DISTVERSION%%-py%%PYTHON_VER%%.egg-info/top_level.txt
> %%PYTHON_SITELIBDIR%%/ipaclient/__init__.py
> %%PYTHON_SITELIBDIR%%/ipaclient/__main__.py
> %%PYTHON_SITELIBDIR%%/ipaclient/discovery.py
>@@ -250,11 +250,11 @@ etc/ipa/epn/expire_msg.template
> %%PYTHON_SITELIBDIR%%/ipaclient/remote_plugins/__init__.py
> %%PYTHON_SITELIBDIR%%/ipaclient/remote_plugins/compat.py
> %%PYTHON_SITELIBDIR%%/ipaclient/remote_plugins/schema.py
>-%%PYTHON_SITELIBDIR%%/ipalib-4.11.0-py%%PYTHON_VER%%.egg-info/PKG-INFO
>-%%PYTHON_SITELIBDIR%%/ipalib-4.11.0-py%%PYTHON_VER%%.egg-info/SOURCES.txt
>-%%PYTHON_SITELIBDIR%%/ipalib-4.11.0-py%%PYTHON_VER%%.egg-info/dependency_links.txt
>-%%PYTHON_SITELIBDIR%%/ipalib-4.11.0-py%%PYTHON_VER%%.egg-info/requires.txt
>-%%PYTHON_SITELIBDIR%%/ipalib-4.11.0-py%%PYTHON_VER%%.egg-info/top_level.txt
>+%%PYTHON_SITELIBDIR%%/ipalib-%%DISTVERSION%%-py%%PYTHON_VER%%.egg-info/PKG-INFO
>+%%PYTHON_SITELIBDIR%%/ipalib-%%DISTVERSION%%-py%%PYTHON_VER%%.egg-info/SOURCES.txt
>+%%PYTHON_SITELIBDIR%%/ipalib-%%DISTVERSION%%-py%%PYTHON_VER%%.egg-info/dependency_links.txt
>+%%PYTHON_SITELIBDIR%%/ipalib-%%DISTVERSION%%-py%%PYTHON_VER%%.egg-info/requires.txt
>+%%PYTHON_SITELIBDIR%%/ipalib-%%DISTVERSION%%-py%%PYTHON_VER%%.egg-info/top_level.txt
> %%PYTHON_SITELIBDIR%%/ipalib/__init__.py
> %%PYTHON_SITELIBDIR%%/ipalib/aci.py
> %%PYTHON_SITELIBDIR%%/ipalib/backend.py
>@@ -290,11 +290,11 @@ etc/ipa/epn/expire_msg.template
> %%PYTHON_SITELIBDIR%%/ipalib/text.py
> %%PYTHON_SITELIBDIR%%/ipalib/util.py
> %%PYTHON_SITELIBDIR%%/ipalib/x509.py
>-%%PYTHON_SITELIBDIR%%/ipaplatform-4.11.0-py%%PYTHON_VER%%.egg-info/PKG-INFO
>-%%PYTHON_SITELIBDIR%%/ipaplatform-4.11.0-py%%PYTHON_VER%%.egg-info/SOURCES.txt
>-%%PYTHON_SITELIBDIR%%/ipaplatform-4.11.0-py%%PYTHON_VER%%.egg-info/dependency_links.txt
>-%%PYTHON_SITELIBDIR%%/ipaplatform-4.11.0-py%%PYTHON_VER%%.egg-info/requires.txt
>-%%PYTHON_SITELIBDIR%%/ipaplatform-4.11.0-py%%PYTHON_VER%%.egg-info/top_level.txt
>+%%PYTHON_SITELIBDIR%%/ipaplatform-%%DISTVERSION%%-py%%PYTHON_VER%%.egg-info/PKG-INFO
>+%%PYTHON_SITELIBDIR%%/ipaplatform-%%DISTVERSION%%-py%%PYTHON_VER%%.egg-info/SOURCES.txt
>+%%PYTHON_SITELIBDIR%%/ipaplatform-%%DISTVERSION%%-py%%PYTHON_VER%%.egg-info/dependency_links.txt
>+%%PYTHON_SITELIBDIR%%/ipaplatform-%%DISTVERSION%%-py%%PYTHON_VER%%.egg-info/requires.txt
>+%%PYTHON_SITELIBDIR%%/ipaplatform-%%DISTVERSION%%-py%%PYTHON_VER%%.egg-info/top_level.txt
> %%PYTHON_SITELIBDIR%%/ipaplatform/__init__.py
> %%PYTHON_SITELIBDIR%%/ipaplatform/_importhook.py
> %%PYTHON_SITELIBDIR%%/ipaplatform/base/__init__.py
>@@ -351,11 +351,11 @@ etc/ipa/epn/expire_msg.template
> %%PYTHON_SITELIBDIR%%/ipaplatform/suse/services.py
> %%PYTHON_SITELIBDIR%%/ipaplatform/suse/tasks.py
> %%PYTHON_SITELIBDIR%%/ipaplatform/tasks.py
>-%%PYTHON_SITELIBDIR%%/ipapython-4.11.0-py%%PYTHON_VER%%.egg-info/PKG-INFO
>-%%PYTHON_SITELIBDIR%%/ipapython-4.11.0-py%%PYTHON_VER%%.egg-info/SOURCES.txt
>-%%PYTHON_SITELIBDIR%%/ipapython-4.11.0-py%%PYTHON_VER%%.egg-info/dependency_links.txt
>-%%PYTHON_SITELIBDIR%%/ipapython-4.11.0-py%%PYTHON_VER%%.egg-info/requires.txt
>-%%PYTHON_SITELIBDIR%%/ipapython-4.11.0-py%%PYTHON_VER%%.egg-info/top_level.txt
>+%%PYTHON_SITELIBDIR%%/ipapython-%%DISTVERSION%%-py%%PYTHON_VER%%.egg-info/PKG-INFO
>+%%PYTHON_SITELIBDIR%%/ipapython-%%DISTVERSION%%-py%%PYTHON_VER%%.egg-info/SOURCES.txt
>+%%PYTHON_SITELIBDIR%%/ipapython-%%DISTVERSION%%-py%%PYTHON_VER%%.egg-info/dependency_links.txt
>+%%PYTHON_SITELIBDIR%%/ipapython-%%DISTVERSION%%-py%%PYTHON_VER%%.egg-info/requires.txt
>+%%PYTHON_SITELIBDIR%%/ipapython-%%DISTVERSION%%-py%%PYTHON_VER%%.egg-info/top_level.txt
> %%PYTHON_SITELIBDIR%%/ipapython/__init__.py
> %%PYTHON_SITELIBDIR%%/ipapython/admintool.py
> %%PYTHON_SITELIBDIR%%/ipapython/certdb.py
>-- 
>2.46.0
>

Actions: View | Diff

Attachments on bug 281265: 253326 | 253327