Skip to content

Commit

Permalink
Update the way of searching for OpenSSL
Browse files Browse the repository at this point in the history
OpenSSL used to have a "exec_prefix" pkg-config variable that allowed us
to figure out where the "openssl" binary could be found.

As of OpenSSL 3.3, this pkg-config variable no longer exists, so we
can't use it anymore.

Migrate to AC_PATH_PROG to avoid that issue.

While here, remove the "c_rehash" fallback that we used to require for
older distributions, as none of the distributions that require it are
supported anymore.
  • Loading branch information
yoe committed Oct 22, 2024
1 parent cfb9c64 commit af7a568
Show file tree
Hide file tree
Showing 6 changed files with 5 additions and 44 deletions.
4 changes: 2 additions & 2 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -204,9 +204,9 @@ AM_CONDITIONAL([JPEG], [test x$HAVE_JPEGLIB = x1])
AC_DEFINE_UNQUOTED([HAVE_JPEGLIB], $HAVE_JPEGLIB, [Define to 1 if you have libjpeg installed])

PKG_CHECK_MODULES(SSL, "openssl", [HAVE_OPENSSL=1])
PKG_CHECK_VAR(SSL_PREFIX, "openssl", "exec_prefix",, AC_MSG_ERROR([Could not find exec_prefix for openssl]))
AC_PATH_PROG(OPENSSL_PATH, openssl)
AC_DEFINE_UNQUOTED([HAVE_OPENSSL], $HAVE_OPENSSL, [Define to 1 if you have OpenSSL installed])
AC_SUBST(SSL_PREFIX)
AC_SUBST(OPENSSL_PATH)

PKG_CHECK_MODULES(CURL, "libcurl", [HAVE_CURL=1])
MAINVERSION=$(echo $PACKAGE_VERSION|sed -e 's/-.*$//')
Expand Down
2 changes: 1 addition & 1 deletion debian/apparmor-profiles/beid
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
/etc/ld.so.conf.d/* r,
/run/pcscd/pcscd.comm rw,
/usr/lib/eid-mw/* ix,
/usr/bin/pinentry ix,
/usr/bin/pinentry* ix,
2 changes: 1 addition & 1 deletion debian/beid-mozilla-extension.install
Original file line number Diff line number Diff line change
@@ -1 +1 @@
debian/apparmor-profiles/beid etc/apparmor.d/abstractions/
debian/apparmor-profiles/beid etc/apparmor.d/abstractions/ubuntu-browsers.d/
37 changes: 0 additions & 37 deletions debian/beid-mozilla-extension.postinst

This file was deleted.

2 changes: 0 additions & 2 deletions debian/beid-mozilla-extension.triggers

This file was deleted.

2 changes: 1 addition & 1 deletion plugins_tools/eid-viewer/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ dist_trust_DATA = \
certs/belgiumrca6.pem

install-data-hook:
if ( $(SSL_PREFIX)/bin/openssl help 2>&1 | grep -q rehash); then $(SSL_PREFIX)/bin/openssl rehash $(DESTDIR)/$(trustdir); else $(SSL_PREFIX)/bin/c_rehash $(DESTDIR)/$(trustdir); fi
$(OPENSSL_PATH) rehash $(DESTDIR)/$(trustdir)

gtk/viewer_glade.h: gtk/viewer.glade
$(top_srcdir)/plugins_tools/aboutmw/gtk/gen.sh VIEWER_GLADE_H VIEWER_GLADE_STRING < $^ > $@
Expand Down

0 comments on commit af7a568

Please sign in to comment.