Attachment 229186 Details for Bug 258712 – Patch for neon v2

[patch] Patch for neon v2

neon0321-docfix.patch (text/plain), 12.35 KB, created by Daniel Engberg on 2021-11-01 10:27:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Engberg

Created: 2021-11-01 10:27:57 UTC

Size: 12.35 KB

patch

obsolete

>diff --git a/www/neon/Makefile b/www/neon/Makefile
>index 1884923cae71..04263a2bebc2 100644
>--- a/www/neon/Makefile
>+++ b/www/neon/Makefile
>@@ -1,10 +1,14 @@
> # Created by: Mikhail Teterin <mi@aldan.algebra.com>
> 
> PORTNAME=	neon
>-PORTVERSION=	0.31.2
>+DISTVERSION=	0.32.1
> CATEGORIES=	www
> MASTER_SITES=	https://notroj.github.io/neon/
> 
>+PATCH_SITES=	https://github.com/notroj/neon/commit/
>+PATCHFILES=	f678aba4815bbcb63102dcdcd31f0ebcfdf553b4.patch:-p1 \
>+		0aab576319c92f5340905b7e8314db4fa4515895.patch:-p1
>+
> MAINTAINER=	lev@FreeBSD.org
> COMMENT=	HTTP and WebDAV client library for Unix systems
> 
>@@ -15,7 +19,7 @@ USES=		cpe libtool localbase:ldflags pathfix pkgconfig
> CPE_VENDOR=	webdav
> USE_LDCONFIG=	yes
> GNU_CONFIGURE=	yes
>-CONFIGURE_ARGS=	--enable-shared
>+CONFIGURE_ARGS=	--enable-shared --disable-static
> 
> OPTIONS_DEFINE=		CA_BUNDLE DOCS GSSAPI NLS PROXY
> OPTIONS_DEFAULT=	CA_BUNDLE EXPAT GSSAPI OPENSSL
>@@ -26,6 +30,7 @@ OPTIONS_SINGLE=		XML
> OPTIONS_SINGLE_XML=	EXPAT LIBXML2
> 
> CA_BUNDLE_DESC=		Enable CA bundle for GnuTLS/OpenSSL
>+DOCS_DESC=		Build and/or install documentation (including manpages)
> LIBXML2_DESC=		libxml2 XML parser support
> PROXY_DESC=		libproxy support
> XML_DESC=		XML parser library
>@@ -33,6 +38,11 @@ XML_DESC=		XML parser library
> CA_BUNDLE_CONFIGURE_ON=	--with-ca-bundle=${LOCALBASE}/share/certs/ca-root-nss.crt
> CA_BUNDLE_RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
> 
>+DOCS_BUILD_DEPENDS=	xmlto:textproc/xmlto \
>+			docbook-xml>0:textproc/docbook-xml
>+
>+DOCS_EXTRA_PATCHES_OFF=	${FILESDIR}/extrapatch-docs
>+
> EXPAT_LIB_DEPENDS=	libexpat.so:textproc/expat2
> EXPAT_CONFIGURE_WITH=	expat
> 
>diff --git a/www/neon/distinfo b/www/neon/distinfo
>index de7e6c97b5e1..4e24712313e0 100644
>--- a/www/neon/distinfo
>+++ b/www/neon/distinfo
>@@ -1,3 +1,7 @@
>-TIMESTAMP = 1601636169
>-SHA256 (neon-0.31.2.tar.gz) = cf1ee3ac27a215814a9c80803fcee4f0ede8466ebead40267a9bd115e16a8678
>-SIZE (neon-0.31.2.tar.gz) = 867914
>+TIMESTAMP = 1632548003
>+SHA256 (neon-0.32.1.tar.gz) = 05c54bc115030c89e463a4fb28d3a3f8215879528ba5ca70d676d3d21bf3af52
>+SIZE (neon-0.32.1.tar.gz) = 880434
>+SHA256 (f678aba4815bbcb63102dcdcd31f0ebcfdf553b4.patch) = 90b622a6b19f1616e7b8e92be2c889a91765008be54f590f6fb27ccbf3a95dc9
>+SIZE (f678aba4815bbcb63102dcdcd31f0ebcfdf553b4.patch) = 6296
>+SHA256 (0aab576319c92f5340905b7e8314db4fa4515895.patch) = 8ff63d636a7422eb52d1bb9044675defd8860413b5ba359e40efea2685a719ed
>+SIZE (0aab576319c92f5340905b7e8314db4fa4515895.patch) = 4242
>diff --git a/www/neon/files/extrapatch-docs b/www/neon/files/extrapatch-docs
>new file mode 100644
>index 000000000000..f5f174e70103
>--- /dev/null
>+++ b/www/neon/files/extrapatch-docs
>@@ -0,0 +1,20 @@
>+--- Makefile.in.orig	2021-09-25 06:06:07 UTC
>++++ Makefile.in
>+@@ -90,7 +90,7 @@ subdirs:
>+ # Uses Tim Waugh's excellent "xmlto" utility, see
>+ # http://cyberelk.net/tim/xmlto/.  (The docs target is executed at release
>+ # time before generating a .tar.gz)
>+-docs: docs-man docs-html
>++# docs: docs-man docs-html
>+ 
>+ docs-man:
>+ 	rm -rf doc/man; mkdir -p doc/man
>+@@ -149,7 +149,7 @@ install-memleak:
>+ 	@echo "ERROR: purposes only; this copy of neon must not be installed."
>+ 	@false
>+ 
>+-install-yes: install-lib install-headers install-config install-docs install-nls
>++install-yes: install-lib install-headers install-config install-nls
>+ 
>+ # libtool does all the necessary magic here
>+ install-lib: subdirs
>diff --git a/www/neon/files/patch-doc_manual.xml b/www/neon/files/patch-doc_manual.xml
>new file mode 100644
>index 000000000000..ef0031d5dad6
>--- /dev/null
>+++ b/www/neon/files/patch-doc_manual.xml
>@@ -0,0 +1,17 @@
>+--- doc/manual.xml.orig	2021-11-01 10:10:24 UTC
>++++ doc/manual.xml
>+@@ -3,14 +3,6 @@
>+ <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
>+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
>+ 
>+-<!ENTITY % isoent SYSTEM
>+-    "http://www.oasis-open.org/docbook/xml/4.5/ent/isonum.ent">
>+-<!ENTITY % isopub SYSTEM
>+-    "http://www.oasis-open.org/docbook/xml/4.5/ent/isopub.ent">
>+-
>+-%isoent;
>+-%isopub;
>+-
>+ 
>+ <!ENTITY date SYSTEM "date.xml">
>+ <!ENTITY version SYSTEM "version.xml">
>diff --git a/www/neon/pkg-descr b/www/neon/pkg-descr
>index 692e66bfdb19..4118d28c0c74 100644
>--- a/www/neon/pkg-descr
>+++ b/www/neon/pkg-descr
>@@ -16,4 +16,4 @@ interface. Featuring:
> 	. WebDAV metadata support: set and remove properties, query
> 	  any set of properties (PROPPATCH/PROPFIND).
> 
>-WWW: http://www.webdav.org/neon/
>+WWW: https://notroj.github.io/neon/
>diff --git a/www/neon/pkg-plist b/www/neon/pkg-plist
>index a7e1d3c53928..64289ab81a45 100644
>--- a/www/neon/pkg-plist
>+++ b/www/neon/pkg-plist
>@@ -23,108 +23,110 @@ include/neon/ne_uri.h
> include/neon/ne_utils.h
> include/neon/ne_xml.h
> include/neon/ne_xmlreq.h
>-lib/libneon.a
> lib/libneon.so
> lib/libneon.so.27
>-lib/libneon.so.27.4.2
>+lib/libneon.so.27.5.1
> libdata/pkgconfig/neon.pc
>-man/man1/neon-config.1.gz
>-man/man3/ne_add_request_header.3.gz
>-man/man3/ne_addr_destroy.3.gz
>-man/man3/ne_addr_error.3.gz
>-man/man3/ne_addr_first.3.gz
>-man/man3/ne_addr_next.3.gz
>-man/man3/ne_addr_resolve.3.gz
>-man/man3/ne_addr_result.3.gz
>-man/man3/ne_buffer.3.gz
>-man/man3/ne_buffer_altered.3.gz
>-man/man3/ne_buffer_append.3.gz
>-man/man3/ne_buffer_clear.3.gz
>-man/man3/ne_buffer_concat.3.gz
>-man/man3/ne_buffer_create.3.gz
>-man/man3/ne_buffer_destroy.3.gz
>-man/man3/ne_buffer_finish.3.gz
>-man/man3/ne_buffer_grow.3.gz
>-man/man3/ne_buffer_ncreate.3.gz
>-man/man3/ne_buffer_zappend.3.gz
>-man/man3/ne_calloc.3.gz
>-man/man3/ne_close_connection.3.gz
>-man/man3/ne_forget_auth.3.gz
>-man/man3/ne_get_error.3.gz
>-man/man3/ne_get_request_flag.3.gz
>-man/man3/ne_get_response_header.3.gz
>-man/man3/ne_get_scheme.3.gz
>-man/man3/ne_get_server_hostport.3.gz
>-man/man3/ne_get_session_flag.3.gz
>-man/man3/ne_get_status.3.gz
>-man/man3/ne_has_support.3.gz
>-man/man3/ne_i18n_init.3.gz
>-man/man3/ne_iaddr_cmp.3.gz
>-man/man3/ne_iaddr_free.3.gz
>-man/man3/ne_iaddr_make.3.gz
>-man/man3/ne_iaddr_parse.3.gz
>-man/man3/ne_iaddr_print.3.gz
>-man/man3/ne_iaddr_raw.3.gz
>-man/man3/ne_iaddr_reverse.3.gz
>-man/man3/ne_iaddr_typeof.3.gz
>-man/man3/ne_malloc.3.gz
>-man/man3/ne_oom_callback.3.gz
>-man/man3/ne_print_request_header.3.gz
>-man/man3/ne_qtoken.3.gz
>-man/man3/ne_realloc.3.gz
>-man/man3/ne_request_create.3.gz
>-man/man3/ne_request_destroy.3.gz
>-man/man3/ne_request_dispatch.3.gz
>-man/man3/ne_response_header_iterate.3.gz
>-man/man3/ne_session_create.3.gz
>-man/man3/ne_session_destroy.3.gz
>-man/man3/ne_session_proxy.3.gz
>-man/man3/ne_session_socks_proxy.3.gz
>-man/man3/ne_session_system_proxy.3.gz
>-man/man3/ne_set_addrlist.3.gz
>-man/man3/ne_set_connect_timeout.3.gz
>-man/man3/ne_set_error.3.gz
>-man/man3/ne_set_proxy_auth.3.gz
>-man/man3/ne_set_read_timeout.3.gz
>-man/man3/ne_set_request_body_buffer.3.gz
>-man/man3/ne_set_request_body_fd.3.gz
>-man/man3/ne_set_request_flag.3.gz
>-man/man3/ne_set_server_auth.3.gz
>-man/man3/ne_set_session_flag.3.gz
>-man/man3/ne_set_useragent.3.gz
>-man/man3/ne_shave.3.gz
>-man/man3/ne_sock_exit.3.gz
>-man/man3/ne_sock_init.3.gz
>-man/man3/ne_ssl_cert_cmp.3.gz
>-man/man3/ne_ssl_cert_export.3.gz
>-man/man3/ne_ssl_cert_free.3.gz
>-man/man3/ne_ssl_cert_identity.3.gz
>-man/man3/ne_ssl_cert_import.3.gz
>-man/man3/ne_ssl_cert_issuer.3.gz
>-man/man3/ne_ssl_cert_read.3.gz
>-man/man3/ne_ssl_cert_signedby.3.gz
>-man/man3/ne_ssl_cert_subject.3.gz
>-man/man3/ne_ssl_cert_write.3.gz
>-man/man3/ne_ssl_clicert_decrypt.3.gz
>-man/man3/ne_ssl_clicert_encrypted.3.gz
>-man/man3/ne_ssl_clicert_free.3.gz
>-man/man3/ne_ssl_clicert_name.3.gz
>-man/man3/ne_ssl_clicert_owner.3.gz
>-man/man3/ne_ssl_clicert_read.3.gz
>-man/man3/ne_ssl_dname_cmp.3.gz
>-man/man3/ne_ssl_readable_dname.3.gz
>-man/man3/ne_ssl_set_verify.3.gz
>-man/man3/ne_ssl_trust_cert.3.gz
>-man/man3/ne_ssl_trust_default_ca.3.gz
>-man/man3/ne_status.3.gz
>-man/man3/ne_strdup.3.gz
>-man/man3/ne_strndup.3.gz
>-man/man3/ne_token.3.gz
>-man/man3/ne_version_match.3.gz
>-man/man3/ne_version_string.3.gz
>-man/man3/ne_xml_create.3.gz
>-man/man3/ne_xml_destroy.3.gz
>-man/man3/neon.3.gz
>+%%DOCS%%man/man1/neon-config.1.gz
>+%%DOCS%%man/man3/ne_add_request_header.3.gz
>+%%DOCS%%man/man3/ne_addr_destroy.3.gz
>+%%DOCS%%man/man3/ne_addr_error.3.gz
>+%%DOCS%%man/man3/ne_addr_first.3.gz
>+%%DOCS%%man/man3/ne_addr_next.3.gz
>+%%DOCS%%man/man3/ne_addr_resolve.3.gz
>+%%DOCS%%man/man3/ne_addr_result.3.gz
>+%%DOCS%%man/man3/ne_buffer.3.gz
>+%%DOCS%%man/man3/ne_buffer_altered.3.gz
>+%%DOCS%%man/man3/ne_buffer_append.3.gz
>+%%DOCS%%man/man3/ne_buffer_clear.3.gz
>+%%DOCS%%man/man3/ne_buffer_concat.3.gz
>+%%DOCS%%man/man3/ne_buffer_create.3.gz
>+%%DOCS%%man/man3/ne_buffer_destroy.3.gz
>+%%DOCS%%man/man3/ne_buffer_finish.3.gz
>+%%DOCS%%man/man3/ne_buffer_grow.3.gz
>+%%DOCS%%man/man3/ne_buffer_ncreate.3.gz
>+%%DOCS%%man/man3/ne_buffer_zappend.3.gz
>+%%DOCS%%man/man3/ne_calloc.3.gz
>+%%DOCS%%man/man3/ne_close_connection.3.gz
>+%%DOCS%%man/man3/ne_forget_auth.3.gz
>+%%DOCS%%man/man3/ne_get_error.3.gz
>+%%DOCS%%man/man3/ne_get_request_flag.3.gz
>+%%DOCS%%man/man3/ne_get_response_header.3.gz
>+%%DOCS%%man/man3/ne_get_scheme.3.gz
>+%%DOCS%%man/man3/ne_get_server_hostport.3.gz
>+%%DOCS%%man/man3/ne_get_session_flag.3.gz
>+%%DOCS%%man/man3/ne_get_status.3.gz
>+%%DOCS%%man/man3/ne_has_support.3.gz
>+%%DOCS%%man/man3/ne_i18n_init.3.gz
>+%%DOCS%%man/man3/ne_iaddr_cmp.3.gz
>+%%DOCS%%man/man3/ne_iaddr_free.3.gz
>+%%DOCS%%man/man3/ne_iaddr_make.3.gz
>+%%DOCS%%man/man3/ne_iaddr_parse.3.gz
>+%%DOCS%%man/man3/ne_iaddr_print.3.gz
>+%%DOCS%%man/man3/ne_iaddr_raw.3.gz
>+%%DOCS%%man/man3/ne_iaddr_reverse.3.gz
>+%%DOCS%%man/man3/ne_iaddr_typeof.3.gz
>+%%DOCS%%man/man3/ne_malloc.3.gz
>+%%DOCS%%man/man3/ne_oom_callback.3.gz
>+%%DOCS%%man/man3/ne_print_request_header.3.gz
>+%%DOCS%%man/man3/ne_qtoken.3.gz
>+%%DOCS%%man/man3/ne_realloc.3.gz
>+%%DOCS%%man/man3/ne_request_create.3.gz
>+%%DOCS%%man/man3/ne_request_destroy.3.gz
>+%%DOCS%%man/man3/ne_request_dispatch.3.gz
>+%%DOCS%%man/man3/ne_response_header_iterate.3.gz
>+%%DOCS%%man/man3/ne_session_create.3.gz
>+%%DOCS%%man/man3/ne_session_destroy.3.gz
>+%%DOCS%%man/man3/ne_session_proxy.3.gz
>+%%DOCS%%man/man3/ne_session_socks_proxy.3.gz
>+%%DOCS%%man/man3/ne_session_system_proxy.3.gz
>+%%DOCS%%man/man3/ne_set_addrlist.3.gz
>+%%DOCS%%man/man3/ne_set_connect_timeout.3.gz
>+%%DOCS%%man/man3/ne_set_error.3.gz
>+%%DOCS%%man/man3/ne_set_proxy_auth.3.gz
>+%%DOCS%%man/man3/ne_set_read_timeout.3.gz
>+%%DOCS%%man/man3/ne_set_request_body_buffer.3.gz
>+%%DOCS%%man/man3/ne_set_request_body_fd.3.gz
>+%%DOCS%%man/man3/ne_set_request_flag.3.gz
>+%%DOCS%%man/man3/ne_set_server_auth.3.gz
>+%%DOCS%%man/man3/ne_set_session_flag.3.gz
>+%%DOCS%%man/man3/ne_set_useragent.3.gz
>+%%DOCS%%man/man3/ne_shave.3.gz
>+%%DOCS%%man/man3/ne_sock_exit.3.gz
>+%%DOCS%%man/man3/ne_sock_init.3.gz
>+%%DOCS%%man/man3/ne_ssl_cert_cmp.3.gz
>+%%DOCS%%man/man3/ne_ssl_cert_export.3.gz
>+%%DOCS%%man/man3/ne_ssl_cert_free.3.gz
>+%%DOCS%%man/man3/ne_ssl_cert_identity.3.gz
>+%%DOCS%%man/man3/ne_ssl_cert_import.3.gz
>+%%DOCS%%man/man3/ne_ssl_cert_issuer.3.gz
>+%%DOCS%%man/man3/ne_ssl_cert_read.3.gz
>+%%DOCS%%man/man3/ne_ssl_cert_signedby.3.gz
>+%%DOCS%%man/man3/ne_ssl_cert_subject.3.gz
>+%%DOCS%%man/man3/ne_ssl_cert_write.3.gz
>+%%DOCS%%man/man3/ne_ssl_clicert_decrypt.3.gz
>+%%DOCS%%man/man3/ne_ssl_clicert_encrypted.3.gz
>+%%DOCS%%man/man3/ne_ssl_clicert_free.3.gz
>+%%DOCS%%man/man3/ne_ssl_clicert_name.3.gz
>+%%DOCS%%man/man3/ne_ssl_clicert_owner.3.gz
>+%%DOCS%%man/man3/ne_ssl_clicert_read.3.gz
>+%%DOCS%%man/man3/ne_ssl_dname_cmp.3.gz
>+%%DOCS%%man/man3/ne_ssl_readable_dname.3.gz
>+%%DOCS%%man/man3/ne_ssl_set_verify.3.gz
>+%%DOCS%%man/man3/ne_ssl_trust_cert.3.gz
>+%%DOCS%%man/man3/ne_ssl_trust_default_ca.3.gz
>+%%DOCS%%man/man3/ne_status.3.gz
>+%%DOCS%%man/man3/ne_strdup.3.gz
>+%%DOCS%%man/man3/ne_strhash.3.gz
>+%%DOCS%%man/man3/ne_strndup.3.gz
>+%%DOCS%%man/man3/ne_strparam.3.gz
>+%%DOCS%%man/man3/ne_vstrhash.3.gz
>+%%DOCS%%man/man3/ne_token.3.gz
>+%%DOCS%%man/man3/ne_version_match.3.gz
>+%%DOCS%%man/man3/ne_version_string.3.gz
>+%%DOCS%%man/man3/ne_xml_create.3.gz
>+%%DOCS%%man/man3/ne_xml_destroy.3.gz
>+%%DOCS%%man/man3/neon.3.gz
> %%PORTDOCS%%%%DOCSDIR%%/html/api.html
> %%PORTDOCS%%%%DOCSDIR%%/html/biblio.html
> %%PORTDOCS%%%%DOCSDIR%%/html/compliance.html
>@@ -147,8 +149,10 @@ man/man3/neon.3.gz
> %%PORTDOCS%%%%DOCSDIR%%/html/refgetst.html
> %%PORTDOCS%%%%DOCSDIR%%/html/refi18n.html
> %%PORTDOCS%%%%DOCSDIR%%/html/refiaddr.html
>+%%PORTDOCS%%%%DOCSDIR%%/html/refhash.html
> %%PORTDOCS%%%%DOCSDIR%%/html/refneon.html
> %%PORTDOCS%%%%DOCSDIR%%/html/refopts.html
>+%%PORTDOCS%%%%DOCSDIR%%/html/refparam.html
> %%PORTDOCS%%%%DOCSDIR%%/html/refproxy.html
> %%PORTDOCS%%%%DOCSDIR%%/html/refreq.html
> %%PORTDOCS%%%%DOCSDIR%%/html/refreqbody.html

Actions: View | Diff

Attachments on bug 258712: 228161 | 229186 | 229187