Several ports are patched to cope with the version number in pkgconfig
files for libressl libs (currently all at 1.0.0)

port                    originally wanted
lang/php/7.2            >= 1.0.1
lang/php/7.3            >= 1.0.1
lang/php/7.4            >= 1.0.1
multimedia/xine-lib     >= 1.0.2
security/opensc         >= 1.0.1
www/e2guardian          >= 1.0.1
textproc/mupdf          >= 1.1.0

instrumenting pkg-config these are the rest of what's wanted:

audio/pulseaudio        > 0.9
emulators/retroarch     >= 1.0.0
games/warzone2100       >= 1.0.0
mail/opendkim           >= 0.9.7
multimedia/gstreamer-0.10/plugins-bad,-main     >= 0.9.5
net/openvpn             >= 1.0.2
net/qbittorrent/qbittorrent-nox         >= 1.0
net/qbittorrent/qbittorrent             >= 1.0
net/seafile/client      >= 0.98
net/transmission,-gtk   >= 0.9.7
print/qpdf              >= 1.1.0
productivity/grisbi     >= 1.0.0
security/libbde         >= 1.0
security/libewf         >= 1.0
security/xca            >= 0.9.8
security/xmlsec,-main   >= 1.0.0
sysutils/libfsapfs      >= 1.0
sysutils/libfvde        >= 1.0
sysutils/libluksde      >= 1.0
sysutils/libqcow        >= 1.0
sysutils/libsmraw       >= 1.0
sysutils/syslog-ng      >= 0.9.8
www/aria2               >= 0.9.8
www/nghttp2             >= 1.0.1
x11/remmina             >= 1.0.0
x11/virt-viewer         >= 1.0.0
x11/x11vnc              >= 1.0.0

I'm wondering if it would make sense to bump the advertised
version so that at least the >= 1.0.2 checks work. Though the only
things in ports wanting 1.1.0 (mupdf, qpdf) are happy building against
libressl anyway so perhaps we should just change it to 2.0.0 to match
LIBRESSL_VERSION_NUMBER. (Typically pkg-config checks are just used
to detect presence of a suitable version, not to choose codepaths
for ifdefs).

Currently the version in pc files comes from SHLIB_VERSION_NUMBER
in libcrypto/opensslv.h; however that is in a section which says
"These will never change" so if we want to keep that promise then
perhaps the generate_pkgconfig.sh scripts should generate the
number for the pc files directly.

Any OKs for either of these?

Index: libcrypto/opensslv.h
===================================================================
RCS file: /cvs/src/lib/libcrypto/opensslv.h,v
retrieving revision 1.62
diff -u -p -u -1 -2 -r1.62 opensslv.h
--- libcrypto/opensslv.h        18 Nov 2020 11:10:08 -0000      1.62
+++ libcrypto/opensslv.h        25 Nov 2020 20:28:56 -0000
@@ -4,15 +4,15 @@
 
 /* These will change with each release of LibreSSL-portable */
 #define LIBRESSL_VERSION_NUMBER 0x3030000fL
 /*                                    ^ Patch starts here   */
 #define LIBRESSL_VERSION_TEXT   "LibreSSL 3.3.0"
 
 /* These will never change */
 #define OPENSSL_VERSION_NUMBER 0x20000000L
 #define OPENSSL_VERSION_TEXT   LIBRESSL_VERSION_TEXT
 #define OPENSSL_VERSION_PTEXT  " part of " OPENSSL_VERSION_TEXT
 
 #define SHLIB_VERSION_HISTORY ""
-#define SHLIB_VERSION_NUMBER "1.0.0"
+#define SHLIB_VERSION_NUMBER "2.0.0"
 
 #endif /* HEADER_OPENSSLV_H */


or just changing generate_pkgconfig (either like this, or alternatively
ripping more out):


Index: libcrypto/generate_pkgconfig.sh
===================================================================
RCS file: /cvs/src/lib/libcrypto/generate_pkgconfig.sh,v
retrieving revision 1.2
diff -u -p -r1.2 generate_pkgconfig.sh
--- libcrypto/generate_pkgconfig.sh     3 Sep 2016 12:42:46 -0000       1.2
+++ libcrypto/generate_pkgconfig.sh     25 Nov 2020 20:30:06 -0000
@@ -53,7 +53,8 @@ fi
 
version_re="s/^#define[[:blank:]]+SHLIB_VERSION_NUMBER[[:blank:]]+\"(.*)\".*/\1/p"
 #version_file=${curdir}/src/crypto/opensslv.h
 version_file=${curdir}/opensslv.h
-lib_version=$(sed -nE ${version_re} ${version_file})
+#lib_version=$(sed -nE ${version_re} ${version_file})
+lib_version="2.0.0"
 
 # Put -I${includedir} into Cflags so configure script tests like
 #   test -n "`pkg-config --cflags openssl`"
Index: libssl/generate_pkgconfig.sh
===================================================================
RCS file: /cvs/src/lib/libssl/generate_pkgconfig.sh,v
retrieving revision 1.9
diff -u -p -r1.9 generate_pkgconfig.sh
--- libssl/generate_pkgconfig.sh        3 Sep 2016 12:42:42 -0000       1.9
+++ libssl/generate_pkgconfig.sh        25 Nov 2020 20:30:06 -0000
@@ -52,7 +52,8 @@ fi
 
 
version_re="s/^#define[[:blank:]]+SHLIB_VERSION_NUMBER[[:blank:]]+\"(.*)\".*/\1/p"
 version_file=${curdir}/../libcrypto/opensslv.h
-lib_version=$(sed -nE ${version_re} ${version_file})
+#lib_version=$(sed -nE ${version_re} ${version_file})
+lib_version="2.0.0"
 
 # Put -I${includedir} into Cflags so configure script tests like
 #   test -n "`pkg-config --cflags openssl`"

Reply via email to