public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/xmlrpc-c/, dev-libs/xmlrpc-c/files/
@ 2017-01-10 14:50 Sergey Popov
  0 siblings, 0 replies; 4+ messages in thread
From: Sergey Popov @ 2017-01-10 14:50 UTC (permalink / raw
  To: gentoo-commits

commit:     37d7bdc340e08e97649558220bd45df7f429ea9b
Author:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 10 14:45:59 2017 +0000
Commit:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Tue Jan 10 14:47:58 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37d7bdc3

dev-libs/xmlrpc-c: revision bump

Respect user CFLAGS, fix building with USE="-cxx". Drop old revision

Reported-by: Gilles Dartiguelongue <eva <AT> gentoo.org>
Gentoo-Bug: 604440

Package-Manager: portage-2.3.3

 .../xmlrpc-c/files/xmlrpc-c-1.39.11-cplusplus.patch     | 14 ++++++++++++++
 ...lrpc-c-1.39.11.ebuild => xmlrpc-c-1.39.11-r1.ebuild} | 17 ++++++++++++++++-
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/dev-libs/xmlrpc-c/files/xmlrpc-c-1.39.11-cplusplus.patch b/dev-libs/xmlrpc-c/files/xmlrpc-c-1.39.11-cplusplus.patch
new file mode 100644
index 00000000..64de06b
--- /dev/null
+++ b/dev-libs/xmlrpc-c/files/xmlrpc-c-1.39.11-cplusplus.patch
@@ -0,0 +1,14 @@
+--- a/lib/Makefile	2015-12-30 07:22:14.000000000 +0300
++++ b/lib/Makefile	2017-01-10 15:17:39.410000000 +0300
+@@ -9,7 +9,10 @@
+ 
+ # Build up SUBDIRS:
+ SUBDIRS = 
+-SUBDIRS += util libutil libutil++
++SUBDIRS += util libutil
++ifeq ($(ENABLE_CPLUSPLUS),yes)
++  SUBDIRS += libutil++
++endif
+ ifeq ($(ENABLE_ABYSS_SERVER),yes)
+   SUBDIRS += abyss
+   ifeq ($(ENABLE_CPLUSPLUS),yes)

diff --git a/dev-libs/xmlrpc-c/xmlrpc-c-1.39.11.ebuild b/dev-libs/xmlrpc-c/xmlrpc-c-1.39.11-r1.ebuild
similarity index 85%
rename from dev-libs/xmlrpc-c/xmlrpc-c-1.39.11.ebuild
rename to dev-libs/xmlrpc-c/xmlrpc-c-1.39.11-r1.ebuild
index 916292b..e8a106e 100644
--- a/dev-libs/xmlrpc-c/xmlrpc-c-1.39.11.ebuild
+++ b/dev-libs/xmlrpc-c/xmlrpc-c-1.39.11-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -27,10 +27,25 @@ DEPEND="
 	libxml2? ( dev-libs/libxml2 )"
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-1.32.05-Wimplicit.patch"
+	"${FILESDIR}/${P}-cplusplus.patch"
+)
+
 pkg_setup() {
 	use curl || ewarn "Curl support disabled: No client library will be built"
 }
 
+src_prepare() {
+	sed -i \
+		-e "/CFLAGS_COMMON/s|-g -O3$||" \
+		-e "/CXXFLAGS_COMMON/s|-g$||" \
+		common.mk || die
+
+	eapply ${PATCHES[@]}
+	eapply_user
+}
+
 src_configure() {
 	econf \
 		--disable-wininet-client \


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/xmlrpc-c/, dev-libs/xmlrpc-c/files/
@ 2021-02-26 11:14 Sergey Popov
  0 siblings, 0 replies; 4+ messages in thread
From: Sergey Popov @ 2021-02-26 11:14 UTC (permalink / raw
  To: gentoo-commits

commit:     24799623750a9ad9a20d8485e5745174b130dcf5
Author:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 26 11:13:05 2021 +0000
Commit:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Fri Feb 26 11:13:05 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24799623

dev-libs/xmlrpc-c: drop old versions

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Sergey Popov <pinkbyte <AT> gentoo.org>

 dev-libs/xmlrpc-c/Manifest                         |  1 -
 .../files/xmlrpc-c-1.32.05-Wimplicit.patch         | 20 ------
 .../files/xmlrpc-c-1.39.11-cplusplus.patch         | 14 -----
 dev-libs/xmlrpc-c/metadata.xml                     |  1 -
 dev-libs/xmlrpc-c/xmlrpc-c-1.39.11-r1.ebuild       | 71 ----------------------
 dev-libs/xmlrpc-c/xmlrpc-c-1.51.06.ebuild          | 68 ---------------------
 6 files changed, 175 deletions(-)

diff --git a/dev-libs/xmlrpc-c/Manifest b/dev-libs/xmlrpc-c/Manifest
index 25d074452cc..689a05fcafb 100644
--- a/dev-libs/xmlrpc-c/Manifest
+++ b/dev-libs/xmlrpc-c/Manifest
@@ -1,2 +1 @@
-DIST xmlrpc-c-1.39.11.tgz 815463 BLAKE2B 7d169d51835e64e5ac822c48b1a6d7622293c1ce1e7379985ebf6c10f3ab331c55eeff9f655cf914c4cf7e3c107fbdbd741d664489f4ad7aadb5e576ceb383c2 SHA512 13e7ddf5264436671437c0bcd698380baca35c4469f592edf79cb4cafda254fe8207ecb992ee728ed20ec70457a20bd0cf8e180ce5cf0561a38a21f1e588f584
 DIST xmlrpc-c-1.51.06.tgz 933161 BLAKE2B 8023444e14e7e41f5433cebeb0fcb7a7323dd734f658155e117d3547b4d61ef81c189395662bf68074dcf1ec5c47ee550cd18773ce8bf0bd53cb0a1764cce945 SHA512 2927fc8c01d42b6f838d8b0c839f09a7dd0d1ddc5a3d7b36c9d479f1c7bf7fdf14923f640883f98ba66067eda0f5379737bf3a5bc9d4b9abe1a7eff7d7def066

diff --git a/dev-libs/xmlrpc-c/files/xmlrpc-c-1.32.05-Wimplicit.patch b/dev-libs/xmlrpc-c/files/xmlrpc-c-1.32.05-Wimplicit.patch
deleted file mode 100644
index affa917f742..00000000000
--- a/dev-libs/xmlrpc-c/files/xmlrpc-c-1.32.05-Wimplicit.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/common.mk
-+++ b/common.mk
-@@ -17,7 +17,7 @@
- # fully made.
- .DELETE_ON_ERROR:
- 
--GCC_WARNINGS = -Wall -W -Wno-uninitialized -Wundef -Wimplicit \
-+GCC_WARNINGS = -Wall -W -Wno-uninitialized -Wundef \
-   -Wno-unknown-pragmas
-   # We need -Wwrite-strings after we fix all the missing consts
-   #
-@@ -27,7 +27,7 @@
-   # on -Wuninitialized for all the others.
- 
- GCC_C_WARNINGS = $(GCC_WARNINGS) \
--  -Wmissing-declarations -Wstrict-prototypes -Wmissing-prototypes
-+  -Wmissing-declarations -Wstrict-prototypes -Wmissing-prototypes -Wimplicit
- 
- GCC_CXX_WARNINGS = $(GCC_WARNINGS)  -Wsynth
- 

diff --git a/dev-libs/xmlrpc-c/files/xmlrpc-c-1.39.11-cplusplus.patch b/dev-libs/xmlrpc-c/files/xmlrpc-c-1.39.11-cplusplus.patch
deleted file mode 100644
index 64de06b3bb2..00000000000
--- a/dev-libs/xmlrpc-c/files/xmlrpc-c-1.39.11-cplusplus.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/lib/Makefile	2015-12-30 07:22:14.000000000 +0300
-+++ b/lib/Makefile	2017-01-10 15:17:39.410000000 +0300
-@@ -9,7 +9,10 @@
- 
- # Build up SUBDIRS:
- SUBDIRS = 
--SUBDIRS += util libutil libutil++
-+SUBDIRS += util libutil
-+ifeq ($(ENABLE_CPLUSPLUS),yes)
-+  SUBDIRS += libutil++
-+endif
- ifeq ($(ENABLE_ABYSS_SERVER),yes)
-   SUBDIRS += abyss
-   ifeq ($(ENABLE_CPLUSPLUS),yes)

diff --git a/dev-libs/xmlrpc-c/metadata.xml b/dev-libs/xmlrpc-c/metadata.xml
index 3a51b3edd30..f2d28d82d35 100644
--- a/dev-libs/xmlrpc-c/metadata.xml
+++ b/dev-libs/xmlrpc-c/metadata.xml
@@ -9,7 +9,6 @@
 		<flag name="abyss">Build the Abyss mini web-server.</flag>
 		<flag name="libxml2">Use dev-libs/libxml2 to parse XML instead of the internal expat library.</flag>
 		<flag name="threads">Controls whether to build the Abyss web-server with pthreads or fork 'threading'.</flag>
-		<flag name="tools">Build the xmlrpc* tools.</flag>
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">xmlrpc-c</remote-id>

diff --git a/dev-libs/xmlrpc-c/xmlrpc-c-1.39.11-r1.ebuild b/dev-libs/xmlrpc-c/xmlrpc-c-1.39.11-r1.ebuild
deleted file mode 100644
index a374aa20069..00000000000
--- a/dev-libs/xmlrpc-c/xmlrpc-c-1.39.11-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Upstream maintains 3 release channels: http://xmlrpc-c.sourceforge.net/release.html
-# 1. Only the "Super Stable" series is released as a tarball
-# 2. SVN tagging of releases seems spotty: http://svn.code.sf.net/p/xmlrpc-c/code/release_number/
-# Because of this, we are following the "Super Stable" release channel
-
-DESCRIPTION="A lightweigt RPC library based on XML and HTTP"
-HOMEPAGE="http://xmlrpc-c.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="abyss +cgi +curl +cxx +libxml2 threads test tools"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="test? ( abyss curl cxx ) tools? ( curl )"
-
-DEPEND="
-	sys-libs/ncurses:0=
-	sys-libs/readline:0=
-	curl? ( net-misc/curl )
-	libxml2? ( dev-libs/libxml2 )"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.32.05-Wimplicit.patch"
-	"${FILESDIR}/${P}-cplusplus.patch"
-)
-
-pkg_setup() {
-	use curl || ewarn "Curl support disabled: No client library will be built"
-}
-
-src_prepare() {
-	sed -i \
-		-e "/CFLAGS_COMMON/s|-g -O3$||" \
-		-e "/CXXFLAGS_COMMON/s|-g$||" \
-		common.mk || die
-
-	eapply ${PATCHES[@]}
-	eapply_user
-}
-
-src_configure() {
-	econf \
-		--disable-wininet-client \
-		--disable-libwww-client \
-		--without-libwww-ssl  \
-		$(use_enable libxml2 libxml2-backend) \
-		$(use_enable threads abyss-threads) \
-		$(use_enable cgi cgi-server) \
-		$(use_enable abyss abyss-server) \
-		$(use_enable cxx cplusplus) \
-		$(use_enable curl curl-client)
-}
-
-src_compile() {
-	# Parallel builds are fixed in v 1.43.x or newer
-	emake -j1
-	use tools && emake -rC "${S}"/tools
-}
-
-src_install() {
-	default
-	use tools && emake DESTDIR="${D}" -rC "${S}"/tools install
-}

diff --git a/dev-libs/xmlrpc-c/xmlrpc-c-1.51.06.ebuild b/dev-libs/xmlrpc-c/xmlrpc-c-1.51.06.ebuild
deleted file mode 100644
index 8cb323596f5..00000000000
--- a/dev-libs/xmlrpc-c/xmlrpc-c-1.51.06.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Upstream maintains 3 release channels: http://xmlrpc-c.sourceforge.net/release.html
-# 1. Only the "Super Stable" series is released as a tarball
-# 2. SVN tagging of releases seems spotty: http://svn.code.sf.net/p/xmlrpc-c/code/release_number/
-# Because of this, we are following the "Super Stable" release channel
-
-DESCRIPTION="A lightweigt RPC library based on XML and HTTP"
-HOMEPAGE="http://xmlrpc-c.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-IUSE="abyss +cgi +curl +cxx +libxml2 threads test"
-
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="test? ( abyss curl cxx )"
-
-RDEPEND="
-	sys-libs/ncurses:0=
-	sys-libs/readline:0=
-	curl? ( net-misc/curl )
-	libxml2? ( dev-libs/libxml2 )"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	use curl || ewarn "Curl support disabled: No client library will be built"
-}
-
-src_prepare() {
-	sed -i \
-		-e "/CFLAGS_COMMON/s|-g -O3$||" \
-		-e "/CXXFLAGS_COMMON/s|-g$||" \
-		common.mk || die
-
-	default
-}
-
-src_configure() {
-	econf \
-		--disable-libwww-client \
-		--disable-wininet-client \
-		--without-libwww-ssl \
-		$(use_enable abyss abyss-server) \
-		$(use_enable cgi cgi-server) \
-		$(use_enable curl curl-client) \
-		$(use_enable cxx cplusplus) \
-		$(use_enable libxml2 libxml2-backend) \
-		$(use_enable threads abyss-threads)
-}
-
-src_compile() {
-	default
-	# Tools building is broken in this release
-	#use tools && emake -rC "${S}"/tools
-}
-
-src_install() {
-	default
-	# Tools building is broken in this release
-	#use tools && emake DESTDIR="${D}" -rC "${S}"/tools install
-}


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/xmlrpc-c/, dev-libs/xmlrpc-c/files/
@ 2023-04-19  6:26 Sam James
  0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2023-04-19  6:26 UTC (permalink / raw
  To: gentoo-commits

commit:     ee19a46df4c075892e75e2cfaa93a8fb87f91cc9
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 19 06:23:18 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Apr 19 06:26:22 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee19a46d

dev-libs/xmlrpc-c: add 1.54.06

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-libs/xmlrpc-c/Manifest                         |  1 +
 .../files/xmlrpc-c-1.54.06-wformat-security.patch  | 29 ++++++++
 dev-libs/xmlrpc-c/xmlrpc-c-1.54.06.ebuild          | 80 ++++++++++++++++++++++
 3 files changed, 110 insertions(+)

diff --git a/dev-libs/xmlrpc-c/Manifest b/dev-libs/xmlrpc-c/Manifest
index c6da1fb8b8cf..0b772b778565 100644
--- a/dev-libs/xmlrpc-c/Manifest
+++ b/dev-libs/xmlrpc-c/Manifest
@@ -1 +1,2 @@
 DIST xmlrpc-c-1.54.05.tgz 933228 BLAKE2B 50d73fe22454f04ffebf11d4b88986eaac571d107abce4e04244ad0b74469fc5233178967e3dd832a8525514912e4f835fa1ce13c439caf918a2b2d0c05021a0 SHA512 81bf8f398e9cb73b421907d8e304b9a6dc8da931f573f7296457486ade432f4a00a94b6850391690f7b229928f785522e5852db8aca68cb462c71d139e4f27b1
+DIST xmlrpc-c-1.54.06.tgz 933199 BLAKE2B 1286323b59aa4d77fe2f8b04fef18d9a448d29a7fa23aad143418e62c92ac6a5156bb61ee58e0df4b0667e73a9170663b02b42fac94b38df71fc789d13e929e0 SHA512 0e8c920ccf04c78947bc66f7210b62c153ba185183c181461584772885690a3bb09dcf63d69c5b0f1f76a96f162a2a0eba6268e7210dda42561f59bec8008733

diff --git a/dev-libs/xmlrpc-c/files/xmlrpc-c-1.54.06-wformat-security.patch b/dev-libs/xmlrpc-c/files/xmlrpc-c-1.54.06-wformat-security.patch
new file mode 100644
index 000000000000..462adcd06375
--- /dev/null
+++ b/dev-libs/xmlrpc-c/files/xmlrpc-c-1.54.06-wformat-security.patch
@@ -0,0 +1,29 @@
+https://src.fedoraproject.org/rpms/xmlrpc-c/raw/rawhide/f/0001-xmlrpc_server_abyss-use-va_args-properly.patch
+
+From d31c2ffbf5181053330fa32e4f03c47283bd1448 Mon Sep 17 00:00:00 2001
+From: Igor Gnatenko <i.gnatenko.brain@gmail.com>
+Date: Sat, 17 Dec 2016 10:28:31 +0100
+Subject: [PATCH 1/3] xmlrpc_server_abyss: use va_args properly
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+../src/xmlrpc_server_abyss.c: In function ‘createServer’:
+../src/xmlrpc_server_abyss.c:783:13: error: format not a string literal and no format arguments [-Werror=format-security]
+             xmlrpc_faultf(envP, error);
+             ^~~~~~~~~~~~~
+
+Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
+--- a/src/xmlrpc_server_abyss.c
++++ b/src/xmlrpc_server_abyss.c
+@@ -780,7 +780,7 @@ createServer(xmlrpc_env *                      const envP,
+         ServerInit2(abyssServerP, &error);
+ 
+         if (error) {
+-            xmlrpc_faultf(envP, error);
++            xmlrpc_faultf(envP, "%s", error);
+             xmlrpc_strfree(error);
+         }
+     }
+-- 
+2.13.1

diff --git a/dev-libs/xmlrpc-c/xmlrpc-c-1.54.06.ebuild b/dev-libs/xmlrpc-c/xmlrpc-c-1.54.06.ebuild
new file mode 100644
index 000000000000..a9115dea33cf
--- /dev/null
+++ b/dev-libs/xmlrpc-c/xmlrpc-c-1.54.06.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+# Upstream maintains 3 release channels: http://xmlrpc-c.sourceforge.net/release.html
+# 1. Only the "Super Stable" series is released as a tarball
+# 2. SVN tagging of releases seems spotty: http://svn.code.sf.net/p/xmlrpc-c/code/release_number/
+# Because of this, we are following the "Super Stable" release channel
+
+DESCRIPTION="A lightweight RPC library based on XML and HTTP"
+HOMEPAGE="http://xmlrpc-c.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
+
+LICENSE="BSD"
+SLOT="0/4.54"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="abyss +cgi +curl +cxx +libxml2 threads test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="test? ( abyss curl cxx )"
+
+RDEPEND="
+	dev-libs/openssl:=
+	sys-libs/ncurses:=
+	sys-libs/readline:=
+	curl? ( net-misc/curl )
+	libxml2? ( dev-libs/libxml2 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.51.06-pkg-config-libxml2.patch
+	"${FILESDIR}"/${PN}-1.51.06-pkg-config-openssl.patch
+	"${FILESDIR}"/${PN}-1.54.06-wformat-security.patch
+)
+
+pkg_setup() {
+	use curl || ewarn "Curl support disabled: No client library will be built"
+}
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e "/CFLAGS_COMMON/s|-g -O3$||" \
+		-e "/CXXFLAGS_COMMON/s|-g$||" \
+		common.mk || die
+}
+
+src_configure() {
+	tc-export PKG_CONFIG
+
+	econf \
+		--disable-libwww-client \
+		--disable-wininet-client \
+		--without-libwww-ssl \
+		$(use_enable abyss abyss-server) \
+		$(use_enable cgi cgi-server) \
+		$(use_enable curl curl-client) \
+		$(use_enable cxx cplusplus) \
+		$(use_enable libxml2 libxml2-backend) \
+		$(use_enable threads abyss-threads)
+}
+
+src_compile() {
+	default
+
+	# Tools building is broken in this release
+	#use tools && emake -rC "${S}"/tools
+}
+
+src_install() {
+	default
+
+	# Tools building is broken in this release
+	#use tools && emake DESTDIR="${D}" -rC "${S}"/tools install
+}


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/xmlrpc-c/, dev-libs/xmlrpc-c/files/
@ 2024-11-21 15:45 Sam James
  0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2024-11-21 15:45 UTC (permalink / raw
  To: gentoo-commits

commit:     453a1693e786c6e95e7963696a068ca64148a947
Author:     Andrej Shadura <andrew.shadura <AT> collabora <DOT> co <DOT> uk>
AuthorDate: Thu Nov 21 13:37:14 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Nov 21 15:43:48 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=453a1693

dev-libs/xmlrpc-c: Regenerate configure instead of patching it

In xmlrpc-c-1.51.06-pkg-config-libxml2.patch, we patch configure.in
and then configure itself. This causes issues since the patch no longer
applies to newer upstream versions even though configure.in hasn't
changed.

Instead of patching both configure.in *and* configure, regenerate
configure from configure.in by using eautoconf.

Signed-off-by: Andrej Shadura <andrew.shadura <AT> collabora.co.uk>
Closes: https://github.com/gentoo/gentoo/pull/39396
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../xmlrpc-c-1.51.06-pkg-config-libxml2.patch      | 119 ---------------------
 .../xmlrpc-c-1.51.06-pkg-config-openssl.patch      |  24 ++---
 ....54.05-r2.ebuild => xmlrpc-c-1.54.05-r3.ebuild} |   3 +-
 ...c-1.54.06.ebuild => xmlrpc-c-1.54.06-r1.ebuild} |   3 +-
 4 files changed, 15 insertions(+), 134 deletions(-)

diff --git a/dev-libs/xmlrpc-c/files/xmlrpc-c-1.51.06-pkg-config-libxml2.patch b/dev-libs/xmlrpc-c/files/xmlrpc-c-1.51.06-pkg-config-libxml2.patch
index df8d992c62d8..a62a729ec22a 100644
--- a/dev-libs/xmlrpc-c/files/xmlrpc-c-1.51.06-pkg-config-libxml2.patch
+++ b/dev-libs/xmlrpc-c/files/xmlrpc-c-1.51.06-pkg-config-libxml2.patch
@@ -11,125 +11,6 @@ https://bugs.gentoo.org/870253
  endif
  
  # LIBXMLRPC_UTIL_LIBDEP is the string of linker options you need on the link
---- a/configure
-+++ b/configure
-@@ -628,9 +628,8 @@
- CC_WARN_FLAGS
- CXX_COMPILER_GNU
- C_COMPILER_GNU
-+HAVE_LIBWWW_SSL_DEFINE
- ENABLE_LIBXML2_BACKEND
--have_xml2_config
--HAVE_LIBWWW_SSL_DEFINE
- HAVE_ABYSS_OPENSSL_DEFINE
- MUST_BUILD_ABYSS_OPENSSL
- HAVE_OPENSSL
-@@ -781,8 +780,8 @@
- enable_cplusplus
- enable_abyss_threads
- enable_abyss_openssl
-+enable_libxml2_backend
- with_libwww_ssl
--enable_libxml2_backend
- '
-       ac_precious_vars='build_alias
- host_alias
-@@ -6053,62 +6053,39 @@
- fi
-
-
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Libxml2 library" >&5
-+$as_echo_n "checking for Libxml2 library... " >&6; }
-+
-+if ${PKG_CONFIG} libxml-2.0; then
-+  HAVE_LIBXML2=yes
-+else
-+  HAVE_LIBXML2=no
-+fi
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAVE_LIBXML2" >&5
-+$as_echo "$HAVE_LIBXML2" >&6; }
-+
-+# Check whether --enable-libxml2-backend was given.
-+if test "${enable_libxml2_backend+set}" = set; then :
-+  enableval=$enable_libxml2_backend;
-+else
-+  enable_libxml2_backend=no
-+fi
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build the libxml2 backend" >&5
-+$as_echo_n "checking whether to build the libxml2 backend... " >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_libxml2_backend" >&5
-+$as_echo "$enable_libxml2_backend" >&6; }
-+
-+if test $enable_libxml2_backend = yes; then
-+  if test $HAVE_LIBXML2 = no; then
-+    as_fn_error $? "You specified --enable-libxml2_backend, but don't appear to have libxml2 installed (no pkg-config file for it in your pkg-config search path), so we cannot not build for libxml2" "$LINENO" 5
-+  fi
-+fi
-+
-+ENABLE_LIBXML2_BACKEND=$enable_libxml2_backend
-+
-+
--# Check whether --enable-libxml2-backend was given.
--if test "${enable_libxml2_backend+set}" = set; then :
--  enableval=$enable_libxml2_backend;
--else
--  enable_libxml2_backend=no
--fi
--
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build the libxml2 backend" >&5
--$as_echo_n "checking whether to build the libxml2 backend... " >&6; }
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_libxml2_backend" >&5
--$as_echo "$enable_libxml2_backend" >&6; }
--
--if test $enable_libxml2_backend = yes; then
--  # Extract the first word of "xml2-config", so it can be a program name with args.
--set dummy xml2-config; ac_word=$2
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
--if ${ac_cv_prog_have_xml2_config+:} false; then :
--  $as_echo_n "(cached) " >&6
--else
--  if test -n "$have_xml2_config"; then
--  ac_cv_prog_have_xml2_config="$have_xml2_config" # Let the user override the test.
--else
--as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--    for ac_exec_ext in '' $ac_executable_extensions; do
--  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--    ac_cv_prog_have_xml2_config="yes"
--    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
--done
--  done
--IFS=$as_save_IFS
--
--  test -z "$ac_cv_prog_have_xml2_config" && ac_cv_prog_have_xml2_config="no"
--fi
--fi
--have_xml2_config=$ac_cv_prog_have_xml2_config
--if test -n "$have_xml2_config"; then
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_xml2_config" >&5
--$as_echo "$have_xml2_config" >&6; }
--else
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--fi
--
--
--  if test $have_xml2_config = no; then
--    as_fn_error $? "You specified --enable-libxml2_backend, but don't appear to have libxml2 installed (no working xml2-config in your command search path), so we cannot not build for libxml2" "$LINENO" 5
--  fi
--fi
--ENABLE_LIBXML2_BACKEND=$enable_libxml2_backend
- 
- 
- C_COMPILER_GNU=$ac_cv_c_compiler_gnu
 --- a/configure.in
 +++ b/configure.in
 @@ -742,6 +742,36 @@

diff --git a/dev-libs/xmlrpc-c/files/xmlrpc-c-1.51.06-pkg-config-openssl.patch b/dev-libs/xmlrpc-c/files/xmlrpc-c-1.51.06-pkg-config-openssl.patch
index b39ae428f29b..d893b8ee25b9 100644
--- a/dev-libs/xmlrpc-c/files/xmlrpc-c-1.51.06-pkg-config-openssl.patch
+++ b/dev-libs/xmlrpc-c/files/xmlrpc-c-1.51.06-pkg-config-openssl.patch
@@ -1,22 +1,20 @@
 https://sourceforge.net/p/xmlrpc-c/code/3152
 https://bugs.gentoo.org/870253
---- a/configure
-+++ b/configure
-@@ -5974,11 +5974,11 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenSSL library" >&5
- $as_echo_n "checking for OpenSSL library... " >&6; }
-
+--- a/configure.in
++++ b/configure.in
+@@ -696,11 +696,11 @@ dnl =======================================================================
+ 
+ AC_MSG_CHECKING(for OpenSSL library)
+ 
 -if pkg-config openssl; then
--  HAVE_OPENSSL=yes
--  OPENSSL_LDADD=$(pkg-config openssl --libs)
--
--  OPENSSL_CFLAGS=$(pkg-config openssl --cflags)
 +if ${PKG_CONFIG} openssl; then
-+  HAVE_OPENSSL=yes
+   HAVE_OPENSSL=yes
+-  OPENSSL_LDADD=$(pkg-config openssl --libs)
 +  OPENSSL_LDADD=$(${PKG_CONFIG} openssl --libs)
-+ 
+   AC_SUBST(OPENSSL_LDADD)
+-  OPENSSL_CFLAGS=$(pkg-config openssl --cflags)
 +  OPENSSL_CFLAGS=$(${PKG_CONFIG} openssl --cflags)
-
+   AC_SUBST(OPENSSL_CFLAGS)
  else
    HAVE_OPENSSL=no
 

diff --git a/dev-libs/xmlrpc-c/xmlrpc-c-1.54.05-r2.ebuild b/dev-libs/xmlrpc-c/xmlrpc-c-1.54.05-r3.ebuild
similarity index 97%
rename from dev-libs/xmlrpc-c/xmlrpc-c-1.54.05-r2.ebuild
rename to dev-libs/xmlrpc-c/xmlrpc-c-1.54.05-r3.ebuild
index 0bbedf6a1ee3..b3e2ddbb2651 100644
--- a/dev-libs/xmlrpc-c/xmlrpc-c-1.54.05-r2.ebuild
+++ b/dev-libs/xmlrpc-c/xmlrpc-c-1.54.05-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit toolchain-funcs
+inherit autotools toolchain-funcs
 
 # Upstream maintains 3 release channels: https://xmlrpc-c.sourceforge.net/release.html
 # 1. Only the "Super Stable" series is released as a tarball
@@ -46,6 +46,7 @@ src_prepare() {
 		-e "/CFLAGS_COMMON/s|-g -O3$||" \
 		-e "/CXXFLAGS_COMMON/s|-g$||" \
 		common.mk || die
+	eautoconf
 }
 
 src_configure() {

diff --git a/dev-libs/xmlrpc-c/xmlrpc-c-1.54.06.ebuild b/dev-libs/xmlrpc-c/xmlrpc-c-1.54.06-r1.ebuild
similarity index 97%
rename from dev-libs/xmlrpc-c/xmlrpc-c-1.54.06.ebuild
rename to dev-libs/xmlrpc-c/xmlrpc-c-1.54.06-r1.ebuild
index a224c3c1a99f..184e48e2243a 100644
--- a/dev-libs/xmlrpc-c/xmlrpc-c-1.54.06.ebuild
+++ b/dev-libs/xmlrpc-c/xmlrpc-c-1.54.06-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit toolchain-funcs
+inherit autotools toolchain-funcs
 
 # Upstream maintains 3 release channels: https://xmlrpc-c.sourceforge.net/release.html
 # 1. Only the "Super Stable" series is released as a tarball
@@ -48,6 +48,7 @@ src_prepare() {
 		-e "/CFLAGS_COMMON/s|-g -O3$||" \
 		-e "/CXXFLAGS_COMMON/s|-g$||" \
 		common.mk || die
+	eautoconf
 }
 
 src_configure() {


^ permalink raw reply related	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-11-21 15:45 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-11-21 15:45 [gentoo-commits] repo/gentoo:master commit in: dev-libs/xmlrpc-c/, dev-libs/xmlrpc-c/files/ Sam James
  -- strict thread matches above, loose matches on Subject: below --
2023-04-19  6:26 Sam James
2021-02-26 11:14 Sergey Popov
2017-01-10 14:50 Sergey Popov

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox