On Fri, Nov 11, 2022 at 08:37:49PM +0000, Klemens Nanni wrote:
> On Fri, Nov 11, 2022 at 08:31:38PM +0000, Stuart Henderson wrote:
> > On 2022/11/11 20:27, Klemens Nanni wrote:
> > > On Fri, Nov 11, 2022 at 02:14:52PM +0000, Roger Leigh wrote:
> > > > Hi,
> > > >
> > > > I'm not involved in OpenBSD porting, but I am the upstream Apache
> > > > maintainer of Xalan-C.
> > > >
> > > > The Xalan-C project has voted to retire the project, and as such there
> > > > will be no further releases, bugfixes or security updates. If OpenBSD
> > > > ports have a deprecation mechanism, please could you deprecate
> > > > textproc/xalan-c with an eye to future removal?
> > > >
> > > > https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=267711 is the patch I
> > > > submitted for the FreeBSD port.
> > >
> > > Thanks for reaching out.
> > >
> > > I ported this as a dependency for security/libdigidocpp which is still
> > > in use.
> > >
> > > You can reach out to them, otherwise I'll so as soon as time allows.
> > > Until this downstream switches away from it, I could put a note into our
> > > port and keep it on my list so it doesn't rot away in our tree.
> >
> > Did I read it correctly that digidocpp doesn't use it directly but via
> > xml-security-c? The latter has since dropped the dependency, see NEWS on
> > https://santuario.apache.org/ :
> >
> > Versions 3.0.1 and 2.3.2 of the Apache XML Security for Java library
> > have been released. The main change is to remove Xalan as a provided
> > (optional) dependency. This means that support for the XML Signature
> > here() function is removed by default, but can be configured if
> > needed (see this test for an example which plugs in this custom XPath
> > implementation).
>
> This is the java lib whereas we package the c++ lib at version 2.0.4;
> it might as well be that I misread things and we don't need xalan-c
> afterall -- I'll give that a go and report back here.
We can certainly build without, but it needs a libdigidocpp patch and
I have yet to test the effected runtime feature.
Index: security/xml-security-c/Makefile
===================================================================
RCS file: /cvs/ports/security/xml-security-c/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- security/xml-security-c/Makefile 12 Jun 2022 05:18:30 -0000 1.3
+++ security/xml-security-c/Makefile 11 Nov 2022 21:05:30 -0000
@@ -1,11 +1,11 @@
COMMENT = C++ implementation of W3C security standards for XML
V = 2.0.4
-REVISION = 0
+REVISION = 1
DISTNAME = xml-security-c-${V}
CATEGORIES = security textproc
-SHARED_LIBS += xml-security-c 0.0 # 20.4
+SHARED_LIBS += xml-security-c 1.0 # 20.4
HOMEPAGE = https://santuario.apache.org
@@ -15,24 +15,20 @@ MAINTAINER = Klemens Nanni <kn@openbsd.
PERMIT_PACKAGE = Yes
WANTLIB += ${COMPILER_LIBCXX} c crypto icudata icui18n icuuc m
-WANTLIB += xalan-c xalanMsg xerces-c
+WANTLIB += xerces-c
MASTER_SITES = https://dlcdn.apache.org/santuario/c-library/
# C++
-COMPILER = base-clang ports-gcc base-gcc
+COMPILER = base-clang ports-gcc
LIB_DEPENDS = textproc/icu4c \
- textproc/xalan-c \
textproc/xerces-c>=3.2
CONFIGURE_STYLE = gnu
-# ChangeLog lists --with-xerces and --with-xalan, but
-# a) configure does not support --with-xerces
-# b) configure does not use pkg-config(1) for xalan
-# c) passing xalan_CXXFLAGS and xalan_LIBS does not work
-CONFIGURE_ARGS += --with-xalan=/usr/local
+# dead upstream
+CONFIGURE_ARGS += --without-xalan
# configure: WARNING: NSS is no longer officially supported
CONFIGURE_ARGS += --without-nss \
Index: security/libdigidocpp/Makefile
===================================================================
RCS file: /cvs/ports/security/libdigidocpp/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- security/libdigidocpp/Makefile 11 Sep 2022 17:59:48 -0000 1.10
+++ security/libdigidocpp/Makefile 11 Nov 2022 21:09:49 -0000
@@ -3,7 +3,7 @@ COMMENT = library for creating DigiDoc
V = 3.14.10
DISTNAME = libdigidocpp-${V}
CATEGORIES = security
-REVISION = 2
+REVISION = 3
SHARED_LIBS = digidocpp 0.0 # 0.0
@@ -35,7 +35,7 @@ MAINTAINER = Klemens Nanni <kn@openbsd.
# -std=gnu++17
COMPILER = base-clang ports-gcc
-WANTLIB += ${COMPILER_LIBCXX} c crypto iconv m ssl xalan-c
+WANTLIB += ${COMPILER_LIBCXX} c crypto iconv m ssl
WANTLIB += xerces-c xml-security-c z
MODULES = devel/cmake
@@ -46,7 +46,6 @@ BUILD_DEPENDS = devel/boost \
LIB_DEPENDS = converters/libiconv \
security/xml-security-c \
- textproc/xalan-c \
textproc/xerces-c
RUN_DEPENDS = # empty
Index: security/libdigidocpp/patches/patch-cmake_modules_FindXmlSecurityC_cmake
===================================================================
RCS file:
security/libdigidocpp/patches/patch-cmake_modules_FindXmlSecurityC_cmake
diff -N security/libdigidocpp/patches/patch-cmake_modules_FindXmlSecurityC_cmake
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ security/libdigidocpp/patches/patch-cmake_modules_FindXmlSecurityC_cmake
11 Nov 2022 21:10:33 -0000
@@ -0,0 +1,22 @@
+Remove optional xalan-c dependency, upstream is dead
+
+Index: cmake/modules/FindXmlSecurityC.cmake
+--- cmake/modules/FindXmlSecurityC.cmake.orig
++++ cmake/modules/FindXmlSecurityC.cmake
+@@ -11,7 +11,6 @@ if(XmlSecurityC_FIND_REQUIRED)
+ endif()
+ find_package(XercesC ${XmlSecurityC_REQUIRED})
+ find_package(OpenSSL ${XmlSecurityC_REQUIRED})
+-find_package(XalanC)
+ unset(XmlSecurityC_REQUIRED)
+
+ find_path(XmlSecurityC_INCLUDE_DIR xsec/framework/XSECVersion.hpp)
+@@ -22,7 +21,7 @@ select_library_configurations(XmlSecurityC)
+ mark_as_advanced(XmlSecurityC_INCLUDE_DIR XmlSecurityC_LIBRARY_RELEASE
XmlSecurityC_LIBRARY_DEBUG)
+
+ include(FindPackageHandleStandardArgs)
+-FIND_PACKAGE_HANDLE_STANDARD_ARGS(XmlSecurityC DEFAULT_MSG
XmlSecurityC_LIBRARY XmlSecurityC_INCLUDE_DIR XalanC_FOUND XercesC_FOUND
OPENSSL_FOUND)
++FIND_PACKAGE_HANDLE_STANDARD_ARGS(XmlSecurityC DEFAULT_MSG
XmlSecurityC_LIBRARY XmlSecurityC_INCLUDE_DIR XercesC_FOUND OPENSSL_FOUND)
+
+ if(XmlSecurityC_FOUND)
+ set(XmlSecurityC_INCLUDE_DIRS ${XmlSecurityC_INCLUDE_DIR}
${XercesC_INCLUDE_DIR} ${OPENSSL_INCLUDE_DIR})
