Fix for BDR setup which does not have vendor=redhat

jeroen · jeroen · commit 5fbe62a9149e · 2025-05-26T11:05:26.000+02:00
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: openssl
 Type: Package
 Title: Toolkit for Encryption, Signatures and Certificates Based on OpenSSL
-Version: 2.3.2
+Version: 2.3.3
 Authors@R: c(person("Jeroen", "Ooms", role = c("aut", "cre"), email = "jeroenooms@gmail.com",
     comment = c(ORCID = "0000-0002-4035-0289")),
     person("Oliver", "Keyes", role = "ctb"))
diff --git a/NEWS b/NEWS
@@ -1,3 +1,6 @@
+2.3.3
+ - Fix a unit test for CRAN Fedora builds
+
 2.3.2
  - Remove R_unload_openssl() as it may interfere with other packages
  - Windows: update to openssl 3.4.0 and fix build on compilers without zlib
diff --git a/tests/testthat/helper-version.R b/tests/testthat/helper-version.R
@@ -1,4 +1,4 @@
 # See https://github.com/jeroen/openssl/issues/125
 skip_on_redhat <- function(){
-  skip_if(grepl("redhat", R.version$platform))
+  skip_if(any(grepl("fedora|redhat", c(osVersion, R.version$platform), ignore.case = TRUE)))
 }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`	`1`	`# See https://github.com/jeroen/openssl/issues/125`
`2`	`2`	`skip_on_redhat <- function(){`
`3`		`- skip_if(grepl("redhat", R.version$platform))`
	`3`	`+ skip_if(any(grepl("fedora\|redhat", c(osVersion, R.version$platform), ignore.case = TRUE)))`
`4`	`4`	`}`