diff --git a/configure.ac b/configure.ac index b91c43f..a2d3b72 100644 --- a/configure.ac +++ b/configure.ac @@ -389,11 +389,11 @@ dnl SSL Security options dnl --------------------------------------------------------------------------- AC_ARG_ENABLE([self-signed-cert-check], - [AS_HELP_STRING([--enable-self-signed-cert-check], [Reject SSL connection when host presents a self signed certificate])], + [AS_HELP_STRING([--enable-self-signed-cert-check], [Emit Warning when host presents a self signed certificate])], [ app_cv_self_signed_certs="$enableval" ],[ - app_cv_self_signed_certs="no" + app_cv_self_signed_certs="yes" ]) if test "$app_cv_self_signed_certs" == "yes"; then @@ -518,7 +518,7 @@ AC_ARG_WITH([sdk-version], [AS_HELP_STRING([--with-sdk-version], [Setup library AC_DEFINE(LIB3270_SDK_VERSION,$app_cv_sdkversion,[The SDK version number]) AC_SUBST(LIB3270_SDK_VERSION,$app_cv_sdkversion) -AC_ARG_WITH([default-host], [AS_HELP_STRING([--with-default-host], [Set lib3270 default host url])], +AC_ARG_WITH([default-host], [AS_HELP_STRING([--with-default-host], [Set lib3270 default host url])], [ app_default_host="\"$withval\""], [ app_default_host=""]) @@ -650,7 +650,7 @@ case "$host" in *-apple-darwin*) AC_PATH_TOOL([CURLCONFIG], [curl-config], [no]) - + if test x$CURLCONFIG = xno; then AC_MSG_NOTICE([Building without CURL support]) AC_SUBST(LIBCURL_CFLAGS) @@ -662,13 +662,13 @@ case "$host" in AC_SUBST(LIBCURL_LIBS,"$($CURLCONFIG --libs)") fi ;; - + *) PKG_CHECK_MODULES( [LIBCURL], [libcurl], AC_DEFINE(HAVE_LIBCURL,[],[Do we have libcurl?]), AC_MSG_ERROR([libcurl not present.]) ) AC_SUBST(LIBCURL_CFLAGS) AC_SUBST(LIBCURL_LIBS) ;; - + esac dnl --------------------------------------------------------------------------- diff --git a/rpm/_service b/rpm/_service index d8dc9c2..7ed178b 100644 --- a/rpm/_service +++ b/rpm/_service @@ -10,11 +10,10 @@ - - + *.tar diff --git a/rpm/lib3270.spec b/rpm/lib3270.spec index d4e25c7..6d1a056 100644 --- a/rpm/lib3270.spec +++ b/rpm/lib3270.spec @@ -1,7 +1,7 @@ # # spec file for package lib3270 # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2022 SUSE LLC # Copyright (c) <2008> # # All modifications and additions to the file contributed by third parties @@ -29,15 +29,15 @@ BuildRequires: autoconf >= 2.61 BuildRequires: automake BuildRequires: binutils BuildRequires: coreutils -BuildRequires: libtool BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: gettext-devel +BuildRequires: libtool BuildRequires: m4 BuildRequires: pkgconfig +BuildRequires: xz BuildRequires: pkgconfig(libcurl) BuildRequires: pkgconfig(libssl) -BuildRequires: xz %if 0%{?centos_version} # CENTOS Requires gdb for debuginfo @@ -54,8 +54,8 @@ For more details, see https://softwarepublico.gov.br/social/pw3270/ . %define _libvrs %{MAJOR_VERSION}_%{MINOR_VERSION} %package -n %{name}-%{_libvrs} -Summary: TN3270 Access library -Group: Development/Libraries/C and C++ +Summary: TN3270 Access library +Group: Development/Libraries/C and C++ %description -n %{name}-%{_libvrs} TN3270 access library, originally designed as part of the pw3270 application. @@ -63,9 +63,9 @@ TN3270 access library, originally designed as part of the pw3270 application. For more details, see https://softwarepublico.gov.br/social/pw3270/ . %package devel -Summary: TN3270 Access library development files -Requires: %{name}-%{_libvrs} = %{version} -Group: Development/Libraries/C and C++ +Summary: TN3270 Access library development files +Requires: %{name}-%{_libvrs} = %{version} +Group: Development/Libraries/C and C++ %description devel Header files for the TN3270 access library. diff --git a/src/network_modules/openssl/messages.c b/src/network_modules/openssl/messages.c index 275b7b3..b4595df 100644 --- a/src/network_modules/openssl/messages.c +++ b/src/network_modules/openssl/messages.c @@ -244,9 +244,9 @@ const LIB3270_SSL_MESSAGE * lib3270_openssl_message_from_id(long id) { .message = { .name = "X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT", #ifdef SSL_ENABLE_SELF_SIGNED_CERT_CHECK - .type = LIB3270_NOTIFY_SECURE, -#else .type = LIB3270_NOTIFY_WARNING, +#else + .type = LIB3270_NOTIFY_SECURE, #endif // SSL_ENABLE_SELF_SIGNED_CERT_CHECK .icon = "security-medium", .summary = N_( "Self signed certificate" ), @@ -260,9 +260,9 @@ const LIB3270_SSL_MESSAGE * lib3270_openssl_message_from_id(long id) { .message = { .name = "X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN", #ifdef SSL_ENABLE_SELF_SIGNED_CERT_CHECK - .type = LIB3270_NOTIFY_SECURE, -#else .type = LIB3270_NOTIFY_INFO, +#else + .type = LIB3270_NOTIFY_SECURE, #endif // SSL_ENABLE_SELF_SIGNED_CERT_CHECK .icon = "security-low", .label = N_("Continue"), -- libgit2 0.21.2