> Unmaintained, outdated and unused xmlrpc-c was removed a few days ago.
I didn't know about it. It was an old version of ports from the snapshot
checkout I am using. I cloned the latest version from git mirror now.
> Could you check out the old removed xmlrpc-c version, apply my mechanical
> untested update on ports@ and retest?
I applied your patch after removing one trailing whitespace and one whitespace
before the tab. Uploaded it on termbin: https://termbin.com/fao0
And also would attach to this reply.
> I also have a WIP libtorrent update and bentley (cc'ed) might be working
> on an rtorrent update at the moment.
I have built rtorrent with newer xmlrpc-c. Thank you for your work on ports.
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/xmlrpc-c/Makefile,v
diff -u -p -r1.23 Makefile
--- Makefile 27 Sep 2023 14:18:41 -0000 1.23
+++ Makefile 4 Nov 2023 08:20:45 -0000
@@ -5,7 +5,7 @@ NOT_FOR_ARCHS= m88k
COMMENT= XML-RPC C/C++ client-server implementation
CATEGORIES= net devel textproc
-V= 1.39.13
+V= 1.54.06
DISTNAME= xmlrpc-c-${V}
FIX_EXTRACT_PERMISSIONS=Yes
@@ -17,10 +17,10 @@ EXTRACT_SUFX= .tgz
xmlrpc_xmlparse++ xmlrpc_xmltok++ xmlrpc++ xmlrpc_server++ \
xmlrpc_server_abyss++ xmlrpc_server_pstream++ xmlrpc_client++ \
xmlrpc_server_cgi++ xmlrpc_cpp xmlrpc_packetsocket
-SHARED_LIBS += $i 2.0
+SHARED_LIBS += $i 3.0
.endfor
-HOMEPAGE= http://xmlrpc-c.sourceforge.net/
+HOMEPAGE= https://xmlrpc-c.sourceforge.net/
SITES= ${SITE_SOURCEFORGE:=xmlrpc-c/}
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/xmlrpc-c/distinfo,v
diff -u -p -r1.8 distinfo
--- distinfo 15 Apr 2019 16:59:19 -0000 1.8
+++ distinfo 4 Nov 2023 08:12:31 -0000
@@ -1,2 +1,2 @@
-SHA256 (xmlrpc-c-1.39.13.tgz) = SR5EyuN2PShfwqdf5ldIgpZPFkUa27fm8yk5FuEg/Kk=
-SIZE (xmlrpc-c-1.39.13.tgz) = 816439
+SHA256 (xmlrpc-c-1.54.06.tgz) = rm0PtY848VNlETYNwAgdOHbB8gnZ6qVDV+K6zWkKVkA=
+SIZE (xmlrpc-c-1.54.06.tgz) = 933199
Index: patches/patch-common_mk
===================================================================
RCS file: /cvs/ports/net/xmlrpc-c/patches/patch-common_mk,v
diff -u -p -r1.2 patch-common_mk
--- patches/patch-common_mk 11 Mar 2022 19:48:15 -0000 1.2
+++ patches/patch-common_mk 4 Nov 2023 08:24:13 -0000
@@ -1,8 +1,8 @@
Index: common.mk
--- common.mk.orig
+++ common.mk
-@@ -49,11 +49,11 @@ CFLAGS_COMMON = -DNDEBUG
- CXXFLAGS_COMMON = -DNDEBUG
+@@ -52,11 +52,11 @@ CFLAGS_COMMON = -DNDEBUG $(CFLAGS_PTHREAD)
+ CXXFLAGS_COMMON = -DNDEBUG $(CFLAGS_PTHREAD)
ifeq ($(C_COMPILER_GNU),yes)
- CFLAGS_COMMON += $(GCC_C_WARNINGS) -fno-common -g -O3
@@ -15,7 +15,7 @@ Index: common.mk
endif
# -qrtti tell the IBM compilers to allow dynamic type casting. Without it,
-@@ -69,7 +69,7 @@ DISTDIR = $(BLDDIR)/$(PACKAGE)-$(VERSION)/$(SUBDIR)
+@@ -72,7 +72,7 @@ DISTDIR = $(BLDDIR)/$(PACKAGE)-$(VERSION)/$(SUBDIR)
# MAJ is the major version number, but is set separately by
# individual make files so that the major number of one library can change
# from one release to another while the major number of another does not.
Index: patches/patch-config_mk_in
===================================================================
RCS file: /cvs/ports/net/xmlrpc-c/patches/patch-config_mk_in,v
diff -u -p -r1.2 patch-config_mk_in
--- patches/patch-config_mk_in 11 Mar 2022 19:48:15 -0000 1.2
+++ patches/patch-config_mk_in 4 Nov 2023 08:24:13 -0000
@@ -1,7 +1,7 @@
Index: config.mk.in
--- config.mk.in.orig
+++ config.mk.in
-@@ -255,6 +255,18 @@ ifeq ($(patsubst netbsd%,netbsd,$(HOST_OS)),netbsd)
+@@ -257,6 +257,18 @@ ifeq ($(patsubst netbsd%,netbsd,$(HOST_OS)),netbsd)
NEED_WL_RPATH=yes
endif
Index: patches/patch-lib_abyss++_Makefile
===================================================================
RCS file: /cvs/ports/net/xmlrpc-c/patches/patch-lib_abyss++_Makefile,v
diff -u -p -r1.2 patch-lib_abyss++_Makefile
--- patches/patch-lib_abyss++_Makefile 11 Mar 2022 19:48:15 -0000 1.2
+++ patches/patch-lib_abyss++_Makefile 4 Nov 2023 08:24:13 -0000
@@ -1,8 +1,8 @@
Index: lib/abyss++/Makefile
--- lib/abyss++/Makefile.orig
+++ lib/abyss++/Makefile
-@@ -28,7 +28,7 @@ TARGET_MODS_PP = \
- $(LIBXMLRPC_ABYSSPP_MODS) \
+@@ -39,7 +39,7 @@ TARGET_MODS_PP = \
+ PKGCONFIG_FILES_TO_INSTALL := xmlrpc_abyss++.pc
OMIT_ABYSSPP_LIB_RULE = Y
-MAJ = 8
Index: patches/patch-lib_abyss_src_Makefile
===================================================================
RCS file: /cvs/ports/net/xmlrpc-c/patches/patch-lib_abyss_src_Makefile,v
diff -u -p -r1.2 patch-lib_abyss_src_Makefile
--- patches/patch-lib_abyss_src_Makefile 11 Mar 2022 19:48:15 -0000 1.2
+++ patches/patch-lib_abyss_src_Makefile 4 Nov 2023 08:24:13 -0000
@@ -1,8 +1,8 @@
Index: lib/abyss/src/Makefile
--- lib/abyss/src/Makefile.orig
+++ lib/abyss/src/Makefile
-@@ -51,7 +51,7 @@ TARGET_MODS = \
- trace \
+@@ -62,7 +62,7 @@ TARGET_MODS = \
+ PKGCONFIG_FILES_TO_INSTALL := xmlrpc_abyss.pc
OMIT_ABYSS_LIB_RULE = Y
-MAJ=3
Index: patches/patch-lib_abyss_src_http_c
===================================================================
RCS file: patches/patch-lib_abyss_src_http_c
diff -N patches/patch-lib_abyss_src_http_c
--- patches/patch-lib_abyss_src_http_c 11 Mar 2022 19:48:15 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-Index: lib/abyss/src/http.c
---- lib/abyss/src/http.c.orig
-+++ lib/abyss/src/http.c
-@@ -175,7 +175,7 @@ getLineInBuffer(TConn * const connectionP,
-
- assert(lineStart <= connectionP->buffer.t + connectionP->buffersize);
-
-- for (*errorP = false, lfPos = NULL, timedOut = false;
-+ for (*errorP = NULL, lfPos = NULL, timedOut = false;
- !*errorP && !lfPos && !timedOut;
- ) {
- int const timeLeft = (int)(deadline - time(NULL));
-@@ -267,7 +267,7 @@ getRestOfField(TConn * const connectionP,
-
- fieldEnd = lineEnd; /* initial value - end of 1st line */
-
-- for (gotWholeField = false, timedOut = false, *errorP = false;
-+ for (gotWholeField = false, timedOut = false, *errorP = NULL;
- !gotWholeField && !timedOut && !*errorP;) {
-
- char * nextLineEnd;
Index: patches/patch-lib_curl_transport_Makefile
===================================================================
RCS file: /cvs/ports/net/xmlrpc-c/patches/patch-lib_curl_transport_Makefile,v
diff -u -p -r1.2 patch-lib_curl_transport_Makefile
--- patches/patch-lib_curl_transport_Makefile 11 Mar 2022 19:48:15 -0000 1.2
+++ patches/patch-lib_curl_transport_Makefile 4 Nov 2023 08:24:13 -0000
@@ -1,7 +1,7 @@
Index: lib/curl_transport/Makefile
--- lib/curl_transport/Makefile.orig
+++ lib/curl_transport/Makefile
-@@ -37,7 +37,7 @@ CURL_VERSION := $(shell curl-config --vernum)
+@@ -37,7 +37,7 @@ CURL_VERSION := $(shell $(CURL_CONFIG) --vernum)
# major version in hexadecimal; the second two are the minor version number
# and so on. So "071000" means 7.16.0.
Index: patches/patch-lib_expat_xmlparse_xmlparse_c
===================================================================
RCS file: /cvs/ports/net/xmlrpc-c/patches/patch-lib_expat_xmlparse_xmlparse_c,v
diff -u -p -r1.2 patch-lib_expat_xmlparse_xmlparse_c
--- patches/patch-lib_expat_xmlparse_xmlparse_c 11 Mar 2022 19:48:15 -0000 1.2
+++ patches/patch-lib_expat_xmlparse_xmlparse_c 4 Nov 2023 08:24:13 -0000
@@ -1,7 +1,7 @@
Index: lib/expat/xmlparse/xmlparse.c
--- lib/expat/xmlparse/xmlparse.c.orig
+++ lib/expat/xmlparse/xmlparse.c
-@@ -3195,7 +3195,7 @@ doIgnoreSection(XML_Parser const xmlParserP,
+@@ -3399,7 +3399,7 @@ doIgnoreSection(XML_Parser const xmlParserP,
int tok;
*evPtr.startP = s;
Index: patches/patch-lib_libutil++_Makefile
===================================================================
RCS file: /cvs/ports/net/xmlrpc-c/patches/patch-lib_libutil++_Makefile,v
diff -u -p -r1.2 patch-lib_libutil++_Makefile
--- patches/patch-lib_libutil++_Makefile 11 Mar 2022 19:48:15 -0000 1.2
+++ patches/patch-lib_libutil++_Makefile 4 Nov 2023 08:24:13 -0000
@@ -1,8 +1,8 @@
Index: lib/libutil++/Makefile
--- lib/libutil++/Makefile.orig
+++ lib/libutil++/Makefile
-@@ -27,7 +27,7 @@ TARGET_MODS_PP = \
- $(LIBXMLRPC_UTILPP_MODS) \
+@@ -29,7 +29,7 @@ TARGET_MODS_PP = \
+ PKGCONFIG_FILES_TO_INSTALL := xmlrpc_util++.pc
OMIT_LIBXMLRPC_UTILPP_RULE = Y
-MAJ = 8
Index: patches/patch-lib_libutil_Makefile
===================================================================
RCS file: /cvs/ports/net/xmlrpc-c/patches/patch-lib_libutil_Makefile,v
diff -u -p -r1.2 patch-lib_libutil_Makefile
--- patches/patch-lib_libutil_Makefile 11 Mar 2022 19:48:15 -0000 1.2
+++ patches/patch-lib_libutil_Makefile 4 Nov 2023 08:24:13 -0000
@@ -1,11 +1,11 @@
Index: lib/libutil/Makefile
--- lib/libutil/Makefile.orig
+++ lib/libutil/Makefile
-@@ -45,7 +45,7 @@ TARGET_MODS = \
+@@ -59,7 +59,7 @@ TARGET_MODS = \
utf8 \
OMIT_LIBXMLRPC_UTIL_RULE=Y
--MAJ=3
+-MAJ=4
+MAJ=$(LIB_MAJ)
# Major number of shared libraries in this directory
Index: patches/patch-src_Makefile
===================================================================
RCS file: /cvs/ports/net/xmlrpc-c/patches/patch-src_Makefile,v
diff -u -p -r1.5 patch-src_Makefile
--- patches/patch-src_Makefile 11 Mar 2022 19:48:15 -0000 1.5
+++ patches/patch-src_Makefile 4 Nov 2023 08:24:13 -0000
@@ -1,8 +1,8 @@
Index: src/Makefile
--- src/Makefile.orig
+++ src/Makefile
-@@ -117,7 +117,7 @@ TARGET_MODS = \
- $(LIBXMLRPC_CLIENT_MODS) \
+@@ -126,7 +126,7 @@ PKGCONFIG_FILES_TO_INSTALL := \
+ xmlrpc_server_cgi.pc \
OMIT_XMLRPC_LIB_RULE=Y
-MAJ=3
Index: patches/patch-src_cpp_Makefile
===================================================================
RCS file: /cvs/ports/net/xmlrpc-c/patches/patch-src_cpp_Makefile,v
diff -u -p -r1.2 patch-src_cpp_Makefile
--- patches/patch-src_cpp_Makefile 11 Mar 2022 19:48:15 -0000 1.2
+++ patches/patch-src_cpp_Makefile 4 Nov 2023 08:24:13 -0000
@@ -1,8 +1,8 @@
Index: src/cpp/Makefile
--- src/cpp/Makefile.orig
+++ src/cpp/Makefile
-@@ -72,7 +72,7 @@ TARGET_MODS_PP = \
- $(LIBXMLRPC_PACKETSOCKET_MODS) \
+@@ -78,7 +78,7 @@ PKGCONFIG_FILES_TO_INSTALL := \
+ xmlrpc_server_pstream++.pc \
OMIT_CPP_LIB_RULES = Y
-MAJ = 8
Index: patches/patch-unix-common_mk
===================================================================
RCS file: /cvs/ports/net/xmlrpc-c/patches/patch-unix-common_mk,v
diff -u -p -r1.2 patch-unix-common_mk
--- patches/patch-unix-common_mk 11 Mar 2022 19:48:15 -0000 1.2
+++ patches/patch-unix-common_mk 4 Nov 2023 08:24:13 -0000
@@ -1,7 +1,7 @@
Index: unix-common.mk
--- unix-common.mk.orig
+++ unix-common.mk
-@@ -52,22 +52,18 @@
+@@ -55,22 +55,18 @@
# SONAME is the name of the library file being built, with the minor
# version number cut off. E.g. if we're building libfoo.so.1.2, SONAME
# is libfoo.so.1 .
@@ -26,13 +26,16 @@ Index: unix-common.mk
.PHONY: $(SHLIB_INSTALL_TARGETS)
.PHONY: install-shared-libraries
-@@ -80,9 +76,3 @@ install-shared-libraries: $(SHLIB_INSTALL_TARGETS)
+@@ -85,12 +81,6 @@ LIBDESTDIR = $(DESTDIR)$(LIBINST_DIR)
$(SHLIB_INSTALL_TARGETS):%/install:%.$(SHLIB_SUFFIX).$(MAJ).$(MIN)
# $< is a library file name, e.g. libfoo.so.3.1 .
- $(INSTALL_SHLIB) $< $(DESTDIR)$(LIBINST_DIR)/$<
-- cd $(DESTDIR)$(LIBINST_DIR); \
+ $(INSTALL_SHLIB) $< $(LIBDESTDIR)/$<
+- cd $(LIBDESTDIR); \
- rm -f $(<:%.$(MIN)=%); \
- $(LN_S) $< $(<:%.$(MIN)=%)
-- cd $(DESTDIR)$(LIBINST_DIR); \
+- cd $(LIBDESTDIR); \
- rm -f $(<:%.$(MAJ).$(MIN)=%); \
- $(LN_S) $(<:%.$(MIN)=%) $(<:%.$(MAJ).$(MIN)=%)
+
+ .PHONY: uninstall-shared-libraries
+ uninstall-shared-libraries:
Index: pkg/DESCR
===================================================================
RCS file: /cvs/ports/net/xmlrpc-c/pkg/DESCR,v
diff -u -p -r1.2 DESCR
--- pkg/DESCR 11 May 2018 19:15:53 -0000 1.2
+++ pkg/DESCR 4 Nov 2023 08:28:20 -0000
@@ -14,4 +14,4 @@ patches to run correctly on OpenBSD. Do
important.
This package mostly exist to facilitate running code that
-occasionally wants xmlrpc, such as cmake.
+occasionally wants xmlrpc.
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/xmlrpc-c/pkg/PLIST,v
diff -u -p -r1.5 PLIST
--- pkg/PLIST 11 Mar 2022 19:48:15 -0000 1.5
+++ pkg/PLIST 4 Nov 2023 08:26:17 -0000
@@ -1,7 +1,12 @@
bin/xmlrpc-c-config
include/XmlRpcCpp.h
include/xmlrpc-c/
+include/xmlrpc-c/AbyssChanSwitch.hpp
+include/xmlrpc-c/AbyssChanSwitchUnix.hpp
+include/xmlrpc-c/AbyssEnvironment.hpp
+include/xmlrpc-c/AbyssServer.hpp
include/xmlrpc-c/abyss.h
+include/xmlrpc-c/abyss_reqhandler_xmlrpc.hpp
include/xmlrpc-c/abyss_unixsock.h
include/xmlrpc-c/abyss_winsock.h
include/xmlrpc-c/base.h
@@ -38,41 +43,55 @@ include/xmlrpc_cgi.h
include/xmlrpc_client.h
include/xmlrpc_server.h
include/xmlrpc_server_w32httpsys.h
-lib/libxmlrpc++.a
+@static-lib lib/libxmlrpc++.a
@lib lib/libxmlrpc++.so.${LIBxmlrpc++_VERSION}
-lib/libxmlrpc.a
+@static-lib lib/libxmlrpc.a
@lib lib/libxmlrpc.so.${LIBxmlrpc_VERSION}
-lib/libxmlrpc_abyss++.a
+@static-lib lib/libxmlrpc_abyss++.a
@lib lib/libxmlrpc_abyss++.so.${LIBxmlrpc_abyss++_VERSION}
-lib/libxmlrpc_abyss.a
+@static-lib lib/libxmlrpc_abyss.a
@lib lib/libxmlrpc_abyss.so.${LIBxmlrpc_abyss_VERSION}
-lib/libxmlrpc_client++.a
+@static-lib lib/libxmlrpc_client++.a
@lib lib/libxmlrpc_client++.so.${LIBxmlrpc_client++_VERSION}
-lib/libxmlrpc_client.a
+@static-lib lib/libxmlrpc_client.a
@lib lib/libxmlrpc_client.so.${LIBxmlrpc_client_VERSION}
-lib/libxmlrpc_cpp.a
+@static-lib lib/libxmlrpc_cpp.a
@lib lib/libxmlrpc_cpp.so.${LIBxmlrpc_cpp_VERSION}
-lib/libxmlrpc_packetsocket.a
+@static-lib lib/libxmlrpc_packetsocket.a
@lib lib/libxmlrpc_packetsocket.so.${LIBxmlrpc_packetsocket_VERSION}
-lib/libxmlrpc_server++.a
+@static-lib lib/libxmlrpc_server++.a
@lib lib/libxmlrpc_server++.so.${LIBxmlrpc_server++_VERSION}
-lib/libxmlrpc_server.a
+@static-lib lib/libxmlrpc_server.a
@lib lib/libxmlrpc_server.so.${LIBxmlrpc_server_VERSION}
-lib/libxmlrpc_server_abyss++.a
+@static-lib lib/libxmlrpc_server_abyss++.a
@lib lib/libxmlrpc_server_abyss++.so.${LIBxmlrpc_server_abyss++_VERSION}
-lib/libxmlrpc_server_abyss.a
+@static-lib lib/libxmlrpc_server_abyss.a
@lib lib/libxmlrpc_server_abyss.so.${LIBxmlrpc_server_abyss_VERSION}
-lib/libxmlrpc_server_cgi++.a
+@static-lib lib/libxmlrpc_server_cgi++.a
@lib lib/libxmlrpc_server_cgi++.so.${LIBxmlrpc_server_cgi++_VERSION}
-lib/libxmlrpc_server_cgi.a
+@static-lib lib/libxmlrpc_server_cgi.a
@lib lib/libxmlrpc_server_cgi.so.${LIBxmlrpc_server_cgi_VERSION}
-lib/libxmlrpc_server_pstream++.a
+@static-lib lib/libxmlrpc_server_pstream++.a
@lib lib/libxmlrpc_server_pstream++.so.${LIBxmlrpc_server_pstream++_VERSION}
-lib/libxmlrpc_util++.a
+@static-lib lib/libxmlrpc_util++.a
@lib lib/libxmlrpc_util++.so.${LIBxmlrpc_util++_VERSION}
-lib/libxmlrpc_util.a
+@static-lib lib/libxmlrpc_util.a
@lib lib/libxmlrpc_util.so.${LIBxmlrpc_util_VERSION}
-lib/libxmlrpc_xmlparse.a
+@static-lib lib/libxmlrpc_xmlparse.a
@lib lib/libxmlrpc_xmlparse.so.${LIBxmlrpc_xmlparse_VERSION}
-lib/libxmlrpc_xmltok.a
+@static-lib lib/libxmlrpc_xmltok.a
@lib lib/libxmlrpc_xmltok.so.${LIBxmlrpc_xmltok_VERSION}
+lib/pkgconfig/xmlrpc++.pc
+lib/pkgconfig/xmlrpc.pc
+lib/pkgconfig/xmlrpc_abyss++.pc
+lib/pkgconfig/xmlrpc_abyss.pc
+lib/pkgconfig/xmlrpc_client++.pc
+lib/pkgconfig/xmlrpc_client.pc
+lib/pkgconfig/xmlrpc_expat.pc
+lib/pkgconfig/xmlrpc_server++.pc
+lib/pkgconfig/xmlrpc_server.pc
+lib/pkgconfig/xmlrpc_server_abyss.pc
+lib/pkgconfig/xmlrpc_server_cgi.pc
+lib/pkgconfig/xmlrpc_server_pstream++.pc
+lib/pkgconfig/xmlrpc_util++.pc
+lib/pkgconfig/xmlrpc_util.pc
