[packages/pidgin-sipe] Up to 1.25.0

Sat Aug 23 14:36:53 CEST 2025

commit 46d5f730ef1ca323d4be156b3a2051c478fa70f4
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Sat Aug 23 14:36:48 2025 +0200

    Up to 1.25.0

 build.patch                         | 54 +++++++++++++++++++++++++++++++++++++
 pidgin-sipe-optional_valgrind.patch | 24 ++++++++---------
 pidgin-sipe.spec                    | 12 +++++----
 3 files changed, 73 insertions(+), 17 deletions(-)
---

diff --git a/pidgin-sipe.spec b/pidgin-sipe.spec
index 916014d..39cf71b 100644
--- a/pidgin-sipe.spec
+++ b/pidgin-sipe.spec
@@ -1,13 +1,14 @@
 Summary:	Pidgin protocol plugin to connect to MS Office Communicator
 Name:		pidgin-sipe
-Version:	1.22.0
-Release:	2
+Version:	1.25.0
+Release:	1
 License:	GPL v2+
 Group:		Applications/Networking
 URL:		http://sipe.sourceforge.net/
 Source0:	http://downloads.sourceforge.net/sipe/%{name}-%{version}.tar.xz
-# Source0-md5:	dc3fda407d4550544a1076d5d144f95c
+# Source0-md5:	0e742f021dc8c3f17435aea05c3e0314
 Patch0:		%{name}-optional_valgrind.patch
+Patch1:		build.patch
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake >= 1:1.9
 BuildRequires:	e2fsprogs-devel
@@ -63,7 +64,8 @@ This package provides the protocol plugin for libpurple clients.
 
 %prep
 %setup -q
-%patch -P0 -p0
+%patch -P0 -p1
+%patch -P1 -p1
 
 %build
 %{__libtoolize}
@@ -99,5 +101,5 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS
-%{_datadir}/appdata/pidgin-sipe.metainfo.xml
+%{_datadir}/metainfo/pidgin-sipe.metainfo.xml
 %{_pixmapsdir}/pidgin/protocols/*/sipe.*
diff --git a/build.patch b/build.patch
new file mode 100644
index 0000000..f4b2241
--- /dev/null
+++ b/build.patch
@@ -0,0 +1,54 @@
+--- pidgin-sipe-1.25.0/src/core/sipe-tls-tester.c~	2019-09-04 09:53:38.000000000 +0200
++++ pidgin-sipe-1.25.0/src/core/sipe-tls-tester.c	2025-08-23 14:12:10.502956349 +0200
+@@ -155,7 +155,7 @@ static guchar *read_tls_record(int fd,
+ 		printf("received %d bytes from server\n", result);
+ 		record = g_new0(struct record, 1);
+ 		record->length  = result;
+-		record->msg     = g_memdup(buffer, result);
++		record->msg     = g_memdup2(buffer, result);
+ 		length         += result;
+ 		fragments = g_slist_append(fragments, record);
+ 	}
+--- pidgin-sipe-1.25.0/src/core/sipe-tls.c~	2019-03-16 19:17:07.000000000 +0100
++++ pidgin-sipe-1.25.0/src/core/sipe-tls.c	2025-08-23 14:14:20.763722483 +0200
+@@ -427,7 +427,7 @@ static guchar *sipe_tls_prf(SIPE_UNUSED_
+ 	gsize half           = (secret_length + 1) / 2;
+ 	gsize newseed_length = label_length + seed_length;
+ 	/* secret: used as S1; secret2: last half of original secret (S2) */
+-	guchar *secret2 = g_memdup(secret + secret_length - half, half);
++	guchar *secret2 = g_memdup2(secret + secret_length - half, half);
+ 	guchar *newseed = g_malloc(newseed_length);
+ 	guchar *md5, *dest;
+ 	guchar *sha1, *src;
+@@ -1525,7 +1525,7 @@ static struct tls_compiled_message *tls_
+ 
+ 	/* found all the required fields */
+ 	state->server_random.length = server_random->length;
+-	state->server_random.buffer = g_memdup(server_random->data,
++	state->server_random.buffer = g_memdup2(server_random->data,
+ 					       server_random->length);
+ 	tls_calculate_secrets(state);
+ 
+
+--- pidgin-sipe-1.25.0/src/core/sipe-xml.c~	2019-03-16 19:17:07.000000000 +0100
++++ pidgin-sipe-1.25.0/src/core/sipe-xml.c	2025-08-23 14:30:30.832761034 +0200
+@@ -154,7 +154,7 @@ static void callback_error(void *user_da
+ 	g_free(errmsg);
+ }
+ 
+-static void callback_serror(void *user_data, xmlErrorPtr error)
++static void callback_serror(void *user_data, const xmlError *error)
+ {
+ 	struct _parser_data *pd = user_data;
+ 
+--- pidgin-sipe-1.25.0/configure.ac~	2025-08-23 14:32:05.000000000 +0200
++++ pidgin-sipe-1.25.0/configure.ac	2025-08-23 14:34:11.697393271 +0200
+@@ -107,7 +107,7 @@ AS_IF([test "x$enable_quality_check" = x
+ 			"-Wcast-align" \
+ 			"-Wcast-function-type" \
+ 			"-Wdeclaration-after-statement" \
+-			"-Wdeprecated-declarations" \
++			"-Wno-deprecated-declarations" \
+ 			"-Wduplicate-decl-specifier" \
+ 			"-Winit-self" \
+ 			"-Wmaybe-uninitialized" \
diff --git a/pidgin-sipe-optional_valgrind.patch b/pidgin-sipe-optional_valgrind.patch
index 2282ac9..2ee22cb 100644
--- a/pidgin-sipe-optional_valgrind.patch
+++ b/pidgin-sipe-optional_valgrind.patch
@@ -1,6 +1,6 @@
---- configure.ac.old	2016-03-20 13:38:49.457598656 +0100
-+++ configure.ac	2016-03-20 13:45:37.131251599 +0100
-@@ -153,9 +153,16 @@
+--- pidgin-sipe-1.25.0/configure.ac~	2019-10-11 18:03:14.000000000 +0200
++++ pidgin-sipe-1.25.0/configure.ac	2025-08-23 14:08:59.015163439 +0200
+@@ -158,9 +158,16 @@ dnl Check for pkg-config before using it
  PKG_PROG_PKG_CONFIG
  
  dnl check for valgrind (optional, only needed for debugging)
@@ -8,15 +8,15 @@
 -	[AC_DEFINE(HAVE_VALGRIND, 1, [Define to 1 if you have the valgrind headers])],
 -	[AC_MSG_RESULT(no)])
 +AC_ARG_ENABLE(valgrind,
-+	[AS_HELP_STRING([--enable-valgrind],
++       [AS_HELP_STRING([--enable-valgrind],
 +                        [turn on valgrind support for debugging @<:@default=no@:>@])],
-+	[],
-+	[enable_valgrind=no])
++       [],
++       [enable_valgrind=no])
 +AS_IF([test "x$enable_valgrind" != xno],
-+	[PKG_CHECK_MODULES(VALGRIND, [valgrind],
-+		[AC_DEFINE(HAVE_VALGRIND, 1, [Define to 1 if you have the valgrind headers])],
-+		[AC_MSG_RESULT(no)])],
-+	[])
++       [PKG_CHECK_MODULES(VALGRIND, [valgrind],
++               [AC_DEFINE(HAVE_VALGRIND, 1, [Define to 1 if you have the valgrind headers])],
++               [AC_MSG_RESULT(no)])],
++       [])
  
- dnl build option: with voice & video support (for all backends)
- AC_ARG_WITH(vv,
+ dnl build option: with AppStream support
+ AC_ARG_WITH(appstream,
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/pidgin-sipe.git/commitdiff/46d5f730ef1ca323d4be156b3a2051c478fa70f4

