Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] libtls: patch for certs.pem
@ 2021-05-02  3:45 sgn
  2021-05-03 16:17 ` [PR PATCH] [Merged]: " leahneukirchen
  0 siblings, 1 reply; 2+ messages in thread
From: sgn @ 2021-05-02  3:45 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1607 bytes --]

There is a new pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages fix-libtls-certs.pem
https://github.com/void-linux/void-packages/pull/30620

libtls: patch for certs.pem
<!-- Mark items with [x] where applicable -->
fix #29299 

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/30620.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix-libtls-certs.pem-30620.patch --]
[-- Type: text/x-diff, Size: 2910 bytes --]

From 031b1b2d85b96600a35f09ee6cc0fc244f2b60d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 2 May 2021 10:43:51 +0700
Subject: [PATCH] libtls: patch for certs.pem

---
 srcpkgs/libtls/patches/fix-cert-perm.patch | 29 ++++++++++++++++++++++
 srcpkgs/libtls/template                    |  8 ++----
 2 files changed, 31 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/libtls/patches/fix-cert-perm.patch

diff --git a/srcpkgs/libtls/patches/fix-cert-perm.patch b/srcpkgs/libtls/patches/fix-cert-perm.patch
new file mode 100644
index 000000000000..338d25863715
--- /dev/null
+++ b/srcpkgs/libtls/patches/fix-cert-perm.patch
@@ -0,0 +1,29 @@
+Index: libressl-3.2.4/apps/nc/nc.1
+===================================================================
+--- libressl-3.2.4.orig/apps/nc/nc.1
++++ libressl-3.2.4/apps/nc/nc.1
+@@ -219,7 +219,7 @@ Cannot be used together with
+ Load the root CA bundle for TLS certificate verification from
+ .Ar CAfile ,
+ in PEM format, instead of
+-.Pa /etc/ssl/cert.pem .
++.Pa /etc/ssl/certs.pem .
+ Requires
+ .Fl c .
+ .It Fl r
+Index: libressl-3.2.4/tls/Makefile.am
+===================================================================
+--- libressl-3.2.4.orig/tls/Makefile.am
++++ libressl-3.2.4/tls/Makefile.am
+@@ -18,9 +18,9 @@ libtls_la_LIBADD += $(PLATFORM_LDADD)
+ 
+ libtls_la_CPPFLAGS = $(AM_CPPFLAGS)
+ if OPENSSLDIR_DEFINED
+-libtls_la_CPPFLAGS += -DTLS_DEFAULT_CA_FILE=\"@OPENSSLDIR@/cert.pem\"
++libtls_la_CPPFLAGS += -DTLS_DEFAULT_CA_FILE=\"@OPENSSLDIR@/certs.pem\"
+ else
+-libtls_la_CPPFLAGS += -DTLS_DEFAULT_CA_FILE=\"$(sysconfdir)/ssl/cert.pem\"
++libtls_la_CPPFLAGS += -DTLS_DEFAULT_CA_FILE=\"$(sysconfdir)/ssl/certs.pem\"
+ endif
+ 
+ libtls_la_SOURCES = tls.c
diff --git a/srcpkgs/libtls/template b/srcpkgs/libtls/template
index cd46d748bb03..a163b69eee98 100644
--- a/srcpkgs/libtls/template
+++ b/srcpkgs/libtls/template
@@ -1,7 +1,7 @@
 # Template file for 'libtls'
 pkgname=libtls
 version=3.2.5
-revision=1
+revision=2
 wrksrc="libressl-${version}"
 build_style=gnu-configure
 configure_args="$(vopt_enable asm)"
@@ -21,6 +21,7 @@ build_options="asm"
 desc_option_asm="Use platform assembly for faster crypto"
 
 build_options_default="asm"
+patch_args=-Np1
 
 if [ "$build_option_asm" ]; then
 	distfiles+=" https://github.com/q66/libressl-portable-asm/archive/v${_lssl_asm_ver}.tar.gz"
@@ -49,11 +50,6 @@ pre_configure() {
 do_install() {
 	make -C tls install DESTDIR="$DESTDIR"
 	make -C apps/nc install DESTDIR="$DESTDIR"
-	# libtls expects certs linked to /etc/ssl/cert.pem
-	# instead of OpenSSL's /etc/ssl/certs.pem
-	# Create a symlink for now while awaiting discussion.
-	vmkdir etc/ssl
-	ln -s certs.pem ${DESTDIR}/etc/ssl/cert.pem
 	vlicense COPYING
 	if [ "$build_option_asm" ]; then
 		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.cryptogams

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PR PATCH] [Merged]: libtls: patch for certs.pem
  2021-05-02  3:45 [PR PATCH] libtls: patch for certs.pem sgn
@ 2021-05-03 16:17 ` leahneukirchen
  0 siblings, 0 replies; 2+ messages in thread
From: leahneukirchen @ 2021-05-03 16:17 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1451 bytes --]

There's a merged pull request on the void-packages repository

libtls: patch for certs.pem
https://github.com/void-linux/void-packages/pull/30620

Description:
<!-- Mark items with [x] where applicable -->
fix #29299 

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2021-05-03 16:17 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-02  3:45 [PR PATCH] libtls: patch for certs.pem sgn
2021-05-03 16:17 ` [PR PATCH] [Merged]: " leahneukirchen

Github messages for voidlinux

This inbox may be cloned and mirrored by anyone:

	git clone --mirror http://inbox.vuxu.org/voidlinux-github

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V1 voidlinux-github voidlinux-github/ http://inbox.vuxu.org/voidlinux-github \
		voidlinux-github@inbox.vuxu.org
	public-inbox-index voidlinux-github

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://inbox.vuxu.org/vuxu.github.voidlinux


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git