1.1.1: patches to compile on OpenBSD

classic Classic list List threaded Threaded
4 messages Options
Reply | Threaded
Open this post in threaded view
|

1.1.1: patches to compile on OpenBSD

Claus Assmann
There are some patches for OpenSSL 1.1.1X in the OpenBSD ports tree.
Are there any plans to put (parts of) them into the next OpenSSL
version?

patch-Configurations_10-main_conf
patch-Configurations_shared-info_pl
patch-Configurations_unix-Makefile_tmpl

The changes in the last one which add an "e" to various names aren't
needed, but the rest is (AFAICT).

patch-Configurations_10-main_conf (405 bytes) Download Attachment
patch-Configurations_shared-info_pl (645 bytes) Download Attachment
patch-Configurations_unix-Makefile_tmpl (2K) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: 1.1.1: patches to compile on OpenBSD

Richard Levitte - VMS Whacker-2
So if I'm reading the patches correctly,
patch-Configurations_unix-Makefile_tmpl is all about that "e" stuff,
while the others are the more central things.

To my judgement, the "e" stuff is a vendor specific packaging problem,
i.e. not our table, while the other two are interesting.

Cheers,
Richard

On Sun, 03 Mar 2019 16:11:12 +0100,
Claus Assmann wrote:

>
> There are some patches for OpenSSL 1.1.1X in the OpenBSD ports tree.
> Are there any plans to put (parts of) them into the next OpenSSL
> version?
>
> patch-Configurations_10-main_conf
> patch-Configurations_shared-info_pl
> patch-Configurations_unix-Makefile_tmpl
>
> The changes in the last one which add an "e" to various names aren't
> needed, but the rest is (AFAICT).
> $OpenBSD: patch-Configurations_10-main_conf,v 1.1 2019/01/31 22:04:40 sthen Exp $
>
> Index: Configurations/10-main.conf
> --- Configurations/10-main.conf.orig
> +++ Configurations/10-main.conf
> @@ -953,6 +953,7 @@ my %targets = (
>      },
>      "BSD-x86-elf" => {
>          inherit_from     => [ "BSD-x86" ],
> +        shared_target    => "bsd-gcc-shared",
>          perlasm_scheme   => "elf",
>      },
>  
> $OpenBSD: patch-Configurations_shared-info_pl,v 1.1 2019/01/31 22:04:40 sthen Exp $
>
> Also match lld's "compatible with GNU linkers".
>
> Probably not really used at current (1.1.1a) as $config{CC} isn't even
> set up when this is called...
>
> Index: Configurations/shared-info.pl
> --- Configurations/shared-info.pl.orig
> +++ Configurations/shared-info.pl
> @@ -12,9 +12,9 @@
>  # environments on Windows.
>  
>  sub detect_gnu_ld {
>      my @lines =
>          `$config{CROSS_COMPILE}$config{CC} -Wl,-V /dev/null 2>&1`;
> -    return grep /^GNU ld/, @lines;
> +    return grep /^GNU ld|GNU linker/, @lines;
>  }
>  sub detect_gnu_cc {
>      my @lines =
> $OpenBSD: patch-Configurations_unix-Makefile_tmpl,v 1.3 2018/11/20 22:19:57 sthen Exp $
>
> Index: Configurations/unix-Makefile.tmpl
> --- Configurations/unix-Makefile.tmpl.orig
> +++ Configurations/unix-Makefile.tmpl
> @@ -885,7 +885,7 @@ libcrypto.pc:
>      else \
>          echo 'libdir=$(libdir)'; \
>      fi; \
> -    echo 'includedir=$${prefix}/include'; \
> +    echo 'includedir=$${prefix}/include/eopenssl11'; \
>      echo 'enginesdir=$${libdir}/engines-{- $sover_dirname -}'; \
>      echo ''; \
>      echo 'Name: OpenSSL-libcrypto'; \
> @@ -903,12 +903,12 @@ libssl.pc:
>      else \
>          echo 'libdir=$(libdir)'; \
>      fi; \
> -    echo 'includedir=$${prefix}/include'; \
> +    echo 'includedir=$${prefix}/include/eopenssl11'; \
>      echo ''; \
>      echo 'Name: OpenSSL-libssl'; \
>      echo 'Description: Secure Sockets Layer and cryptography libraries'; \
>      echo 'Version: '$(VERSION); \
> -    echo 'Requires.private: libcrypto'; \
> +    echo 'Requires.private: libecrypto'; \
>      echo 'Libs: -L$${libdir} -lssl'; \
>      echo 'Cflags: -I$${includedir}' ) > libssl.pc
>  
> @@ -920,12 +920,12 @@ openssl.pc:
>      else \
>          echo 'libdir=$(libdir)'; \
>      fi; \
> -    echo 'includedir=$${prefix}/include'; \
> +    echo 'includedir=$${prefix}/include/eopenssl11'; \
>      echo ''; \
>      echo 'Name: OpenSSL'; \
>      echo 'Description: Secure Sockets Layer and cryptography libraries and tools'; \
>      echo 'Version: '$(VERSION); \
> -    echo 'Requires: libssl libcrypto' ) > openssl.pc
> +    echo 'Requires: libessl libecrypto' ) > openssl.pc
>  
>  configdata.pm: $(SRCDIR)/Configure $(SRCDIR)/config {- join(" ", @{$config{build_file_templates}}, @{$config{build_infos}}, @{$config{conf_files}}) -}
>   @echo "Detected changed: $?"
> @@ -984,7 +984,7 @@ EOF
>            if ($args{generator}->[0] =~ /\.pl$/) {
>                $generator = 'CC="$(CC)" $(PERL)'.$generator_incs.' '.$generator;
>            } elsif ($args{generator}->[0] =~ /\.m4$/) {
> -              $generator = 'm4 -B 8192'.$generator_incs.' '.$generator.' >'
> +              $generator = 'm4'.$generator_incs.' '.$generator.' >'
>            } elsif ($args{generator}->[0] =~ /\.S$/) {
>                $generator = undef;
>            } else {
--
Richard Levitte         [hidden email]
OpenSSL Project         http://www.openssl.org/~levitte/
Reply | Threaded
Open this post in threaded view
|

Re: 1.1.1: patches to compile on OpenBSD

Claus Assmann
On Mon, Mar 04, 2019, Richard Levitte wrote:
> So if I'm reading the patches correctly,
> patch-Configurations_unix-Makefile_tmpl is all about that "e" stuff,

Nope, seems you missed one change in all the text you quoted:

-              $generator = 'm4 -B 8192'.$generator_incs.' '.$generator.' >'
+              $generator = 'm4'.$generator_incs.' '.$generator.' >'
Reply | Threaded
Open this post in threaded view
|

Re: 1.1.1: patches to compile on OpenBSD

OpenSSL - User mailing list
In reply to this post by Claus Assmann
Can we take OpenBSD code and put it under the Apache license?