fixes remaining GDAL version vulnerability

Author: rsbivand

R/crs.R

@@ -167,9 +167,9 @@ make_crs = function(x) {
 		x = if (is.null(comment(x)) || (CPL_proj_version() < "6.0.0" || 
                     CPL_gdal_version() < "3.0.0"))
 
-				comment(x) # WKT2
-			else
 				x@projargs
+			else
+				comment(x) # WKT2
 	}
 	if (is.numeric(x) && !is.na(x))
 		x = paste0("EPSG:", x)

R/sp.R

@@ -330,10 +330,10 @@ CRS_from_crs = function(from) {
 			sp::CRS(NA_character_)
 		else
 			sp::CRS(from$proj4string)
-        if (CPL_proj_version() < "6.0.0" || 
-                    CPL_gdal_version() < "3.0.0") {
+        if (CPL_proj_version() >= "6.0.0" && 
+                    CPL_gdal_version() >= "3.0.0") {
 	    if (!is.null(from$wkt) && !is.na(from$wkt))
-		comment(ret) = sp::CRS(SRS_string=from$wkt)
+		comment(ret) = comment(sp::CRS(SRS_string=from$wkt))
         }
 	ret
 }

tests/crs.R

@@ -41,7 +41,15 @@ if (sf_extSoftVersion()["USE_PROJ_H"] == "true" || sf_proj_info("have_datum_file
   "datum files not installed"
 }
 
-x = st_crs(sp::CRS("+proj=longlat +ellps=WGS84 +no_defs"))
+x0 = sp::CRS(SRS_string="EPSG:4326")
+cat(sp::wkt(x0), "\n")
+x = st_crs(x0)
+x
+
+y0 = st_crs(4326)
+y0
+y = as(y0, "CRS")
+cat(sp::wkt(y), "\n")
 
 # https://github.com/r-spatial/sf/issues/1170
 g = st_as_sfc("POLYGON ((-61.66957 10.69214, -61.565 10.75728, -61.37453 10.77654, -61.40721 10.60681, -61.66957 10.69214))")