[rs-commit] r191 - in /rs-distribution/trunk/nixos: ./ pkgs/servers/http/apache-modules/mod_ca/ pkgs/servers/http/apache-modules/mod_crl/ pkgs/servers/http/apache-modules/mod_csr/ pkgs/servers/http/apache-modules/mod_ocsp/ pkgs/servers/http/apache-modules/mod_pkcs12/ pkgs/servers/http/apache-modules/mod_scep/ pkgs/servers/http/apache-modules/mod_spkac/ pkgs/servers/http/apache-modules/mod_timestamp/
rs-commit at redwax.eu
rs-commit at redwax.eu
Sat Dec 14 21:36:11 CET 2019
Author: dirkx at redwax.eu
Date: Sat Dec 14 21:36:09 2019
New Revision: 191
Log:
Updated & synced with current PR#75620.
Modified:
rs-distribution/trunk/nixos/README.md
rs-distribution/trunk/nixos/patch-all-packages.txt
rs-distribution/trunk/nixos/pkgs/servers/http/apache-modules/mod_ca/default.nix
rs-distribution/trunk/nixos/pkgs/servers/http/apache-modules/mod_crl/default.nix
rs-distribution/trunk/nixos/pkgs/servers/http/apache-modules/mod_csr/default.nix
rs-distribution/trunk/nixos/pkgs/servers/http/apache-modules/mod_ocsp/default.nix
rs-distribution/trunk/nixos/pkgs/servers/http/apache-modules/mod_pkcs12/default.nix
rs-distribution/trunk/nixos/pkgs/servers/http/apache-modules/mod_scep/default.nix
rs-distribution/trunk/nixos/pkgs/servers/http/apache-modules/mod_spkac/default.nix
rs-distribution/trunk/nixos/pkgs/servers/http/apache-modules/mod_timestamp/default.nix
Modified: rs-distribution/trunk/nixos/README.md
==============================================================================
--- rs-distribution/trunk/nixos/README.md (original)
+++ rs-distribution/trunk/nixos/README.md Sat Dec 14 21:36:09 2019
@@ -11,4 +11,9 @@
to regenerate the checksums. Once we have a release we can use proper
checksums & signatures.
+To reformat/cleanse:
+<pre>
+for i in pkgs/servers/http/apache-modules/mod_*/default.nix; do nixpkgs-fmt $i; done
+</pre>
+
Modified: rs-distribution/trunk/nixos/patch-all-packages.txt
==============================================================================
--- rs-distribution/trunk/nixos/patch-all-packages.txt (original)
+++ rs-distribution/trunk/nixos/patch-all-packages.txt Sat Dec 14 21:36:09 2019
@@ -6,7 +6,7 @@
githubId = 11946442;
name = "Dipin Hora";
};
-+ dirkx= {
++ dirkx = {
+ email = "dirkx at webweaving.org";
+ github = "dirkx";
+ githubId = 392583;
Modified: rs-distribution/trunk/nixos/pkgs/servers/http/apache-modules/mod_ca/default.nix
==============================================================================
--- rs-distribution/trunk/nixos/pkgs/servers/http/apache-modules/mod_ca/default.nix (original)
+++ rs-distribution/trunk/nixos/pkgs/servers/http/apache-modules/mod_ca/default.nix Sat Dec 14 21:36:09 2019
@@ -1,33 +1,35 @@
-{ stdenv, fetchurl, gnused, coreutils, pkgconfig, apacheHttpd, openssl, openldap }:
+{ stdenv, fetchurl, pkgconfig, apacheHttpd, openssl, openldap }:
stdenv.mkDerivation rec {
- baseurl = "https://redwax.eu/dist/rs/";
- name = "mod_ca";
- suffix = ".tar.gz";
+ pname = "mod_ca";
+ version = "0.2.1";
- meta = with stdenv.lib; {
- description = "RedWax CA service modules.";
- version = "0.2.1";
+ src = fetchurl {
+ url = "https://redwax.eu/dist/rs/${pname}-${version}.tar.gz";
+ sha256 = "1pxapjrzdsk2s25vhgvf56fkakdqcbn9hjncwmqh0asl1pa25iic";
+ };
- homepage = "https://redwax.eu";
- license = licenses.asl20;
- platforms = platforms.unix;
- maintainers = with maintainers; [ dirkx ];
- };
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ apacheHttpd openssl openldap ];
- src = fetchurl {
- url = "${baseurl}${name}-${meta.version}${suffix}";
- sha256 = "1pxapjrzdsk2s25vhgvf56fkakdqcbn9hjncwmqh0asl1pa25iic";
- };
+ # Note that configureFlags and installFlags are inherited by
+ # the various submodules.
+ #
+ configureFlags = [
+ "--with-apxs=${apacheHttpd.dev}/bin/apxs"
+ ];
- buildInputs = [ gnused coreutils pkgconfig apacheHttpd openssl openldap ];
+ installFlags = [
+ "INCLUDEDIR=${placeholder ''out''}/include"
+ "LIBEXECDIR=$(out)/modules"
+ ];
- configurePlatforms = [];
- configureFlags = [
- "--with-apxs=${apacheHttpd.dev}/bin/apxs"
- ];
+ meta = with stdenv.lib; {
+ description = "RedWax CA service module";
- installPhase = "make INCLUDEDIR=$out/include LIBEXECDIR=$out/libexec install";
+ homepage = "https://redwax.eu";
+ license = licenses.asl20;
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ dirkx ];
+ };
}
-
-
Modified: rs-distribution/trunk/nixos/pkgs/servers/http/apache-modules/mod_crl/default.nix
==============================================================================
--- rs-distribution/trunk/nixos/pkgs/servers/http/apache-modules/mod_crl/default.nix (original)
+++ rs-distribution/trunk/nixos/pkgs/servers/http/apache-modules/mod_crl/default.nix Sat Dec 14 21:36:09 2019
@@ -1,19 +1,24 @@
-{ stdenv, fetchurl, gnused, coreutils, pkgconfig, apacheHttpd, openssl, openldap, mod_ca, apr, aprutil }:
+{ stdenv, fetchurl, pkgconfig, mod_ca, apr, aprutil }:
stdenv.mkDerivation rec {
- name = "mod_crl";
+ pname = "mod_crl";
+ version = "0.2.1";
- meta = with stdenv.lib; {
+ src = fetchurl {
+ url = "https://redwax.eu/dist/rs/${pname}-${version}.tar.gz";
+ sha256 = "0k6iqn5a4bqdz3yx6d53f1r75c21jnwhxmmcq071zq0361xjzzj6";
+ };
+
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ mod_ca apr aprutil ];
+ inherit (mod_ca) configureFlags installFlags;
+
+ meta = with stdenv.lib; {
description = "RedWax module for Certificate Revocation Lists";
- version = "0.2.1";
- inherit (mod_ca.meta) license platforms maintainers homepage;
- };
-
- src = fetchurl {
- url = "${mod_ca.baseurl}${name}-${meta.version}${mod_ca.suffix}";
- sha256 = "0k6iqn5a4bqdz3yx6d53f1r75c21jnwhxmmcq071zq0361xjzzj6";
- };
- buildInputs = [ mod_ca gnused coreutils pkgconfig apacheHttpd apr aprutil openssl openldap ];
- inherit ( mod_ca ) configurePlatforms configureFlags installPhase;
+ homepage = "https://redwax.eu";
+ license = licenses.asl20;
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ dirkx ];
+ };
}
Modified: rs-distribution/trunk/nixos/pkgs/servers/http/apache-modules/mod_csr/default.nix
==============================================================================
--- rs-distribution/trunk/nixos/pkgs/servers/http/apache-modules/mod_csr/default.nix (original)
+++ rs-distribution/trunk/nixos/pkgs/servers/http/apache-modules/mod_csr/default.nix Sat Dec 14 21:36:09 2019
@@ -1,23 +1,41 @@
-{ stdenv, fetchurl, gnused, coreutils, pkgconfig, apacheHttpd, openssl, openldap, apr, aprutil, mod_ca }:
+{ stdenv, fetchurl, pkgconfig, mod_ca, apr, aprutil }:
stdenv.mkDerivation rec {
- name = "mod_csr";
+ pname = "mod_csr";
+ version = "0.2.1";
- meta = with stdenv.lib; {
- description = "RedWax CA service module to handle Certificate Signing Requests.";
- version = "0.2.1";
+ src = fetchurl {
+ url = "https://redwax.eu/dist/rs/${pname}-${version}.tar.gz";
+ sha256 = "01sdvv07kchdd6ssrmd2cbhj50qh2ibp5g5h6jy1jqbzp0b3j9ja";
+ };
- inherit (mod_ca.meta) license platforms maintainers homepage;
- };
-
- src = fetchurl {
- url = "${mod_ca.baseurl}${name}-${meta.version}${mod_ca.suffix}";
- sha256 = "01sdvv07kchdd6ssrmd2cbhj50qh2ibp5g5h6jy1jqbzp0b3j9ja";
- };
- buildInputs = [ mod_ca gnused coreutils pkgconfig apacheHttpd apr aprutil openssl openldap ];
- preBuild = "cp ${./openssl_setter_compat.h} openssl_setter_compat.h";
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ mod_ca apr aprutil ];
+ inherit (mod_ca) configureFlags installFlags;
- inherit ( mod_ca ) configurePlatforms configureFlags installPhase;
+ # After openssl-1.0.2t, starting in openssl-1.1.0l
+ # parts of the OpenSSL struct API was replaced by
+ # getters - but some setters where forgotten.
+ #
+ # It is expected that these are back/retrofitted in version
+ # openssl-1.1.1d -- but while fixing this it was found
+ # that there were quite a few other setters missing and
+ # that some of the memory management needed was at odds
+ # with the principles used sofar.
+ #
+ # See https://github.com/openssl/openssl/pull/10563
+ #
+ # So as a stopgap - use a minimalist compat. layer
+ # https://source.redwax.eu/projects/RS/repos/mod_csr/browse/openssl_setter_compat.h
+ #
+ preBuild = "cp ${./openssl_setter_compat.h} openssl_setter_compat.h";
+
+ meta = with stdenv.lib; {
+ description = "RedWax CA service module to handle Certificate Signing Requests";
+
+ homepage = "https://redwax.eu";
+ license = licenses.asl20;
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ dirkx ];
+ };
}
-
-
Modified: rs-distribution/trunk/nixos/pkgs/servers/http/apache-modules/mod_ocsp/default.nix
==============================================================================
--- rs-distribution/trunk/nixos/pkgs/servers/http/apache-modules/mod_ocsp/default.nix (original)
+++ rs-distribution/trunk/nixos/pkgs/servers/http/apache-modules/mod_ocsp/default.nix Sat Dec 14 21:36:09 2019
@@ -1,21 +1,24 @@
-{ stdenv, fetchurl, gnused, coreutils, pkgconfig, apacheHttpd, openssl, openldap, apr, aprutil, mod_ca }:
+{ stdenv, fetchurl, pkgconfig, mod_ca, apr, aprutil }:
stdenv.mkDerivation rec {
- name = "mod_ocsp";
+ pname = "mod_ocsp";
+ version = "0.2.1";
- meta = with stdenv.lib; {
- description = "RedWax CA service modules of OCSP Online Certificate Validation";
- version = "0.2.1";
+ src = fetchurl {
+ url = "https://redwax.eu/dist/rs/${pname}-${version}.tar.gz";
+ sha256 = "1vwgai56krdf8knb0mgy07ni9mqxk82bcb4gibwpnxvl6qwgv2i0";
+ };
- inherit (mod_ca.meta) license platforms maintainers homepage;
- };
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ mod_ca apr aprutil ];
+ inherit (mod_ca) configureFlags installFlags;
- src = fetchurl {
- url = "${mod_ca.baseurl}${name}-${meta.version}${mod_ca.suffix}";
- sha256 = "1vwgai56krdf8knb0mgy07ni9mqxk82bcb4gibwpnxvl6qwgv2i0";
- };
- buildInputs = [ mod_ca gnused coreutils pkgconfig apacheHttpd apr aprutil openssl openldap ];
- inherit ( mod_ca ) configurePlatforms configureFlags installPhase;
+ meta = with stdenv.lib; {
+ description = "RedWax CA service modules of OCSP Online Certificate Validation";
+
+ homepage = "https://redwax.eu";
+ license = licenses.asl20;
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ dirkx ];
+ };
}
-
-
Modified: rs-distribution/trunk/nixos/pkgs/servers/http/apache-modules/mod_pkcs12/default.nix
==============================================================================
--- rs-distribution/trunk/nixos/pkgs/servers/http/apache-modules/mod_pkcs12/default.nix (original)
+++ rs-distribution/trunk/nixos/pkgs/servers/http/apache-modules/mod_pkcs12/default.nix Sat Dec 14 21:36:09 2019
@@ -1,22 +1,24 @@
-{ stdenv, fetchurl, gnused, coreutils, pkgconfig, apacheHttpd, openssl, openldap, apr, aprutil, mod_ca }:
+{ stdenv, fetchurl, pkgconfig, mod_ca, apr, aprutil }:
stdenv.mkDerivation rec {
- name = "mod_pkcs12";
+ pname = "mod_pkcs12";
+ version = "0.2.1";
- meta = with stdenv.lib; {
- description = "RedWax CA service modules for PKCS#12 format files";
- version = "0.2.1";
+ src = fetchurl {
+ url = "https://redwax.eu/dist/rs/${pname}-${version}.tar.gz";
+ sha256 = "0by4qfjs3a8q0amzwazfq8ii6ydv36v2mjga0jzc9i6xyl4rs6ai";
+ };
- inherit (mod_ca.meta) license platforms maintainers homepage;
- };
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ mod_ca apr aprutil ];
+ inherit (mod_ca) configureFlags installFlags;
- src = fetchurl {
- url = "${mod_ca.baseurl}${name}-${meta.version}${mod_ca.suffix}";
- sha256 = "0by4qfjs3a8q0amzwazfq8ii6ydv36v2mjga0jzc9i6xyl4rs6ai";
- };
+ meta = with stdenv.lib; {
+ description = "RedWax CA service modules for PKCS#12 format files";
- buildInputs = [ mod_ca gnused coreutils pkgconfig apacheHttpd apr aprutil openssl openldap ];
- inherit ( mod_ca ) configurePlatforms configureFlags installPhase;
+ homepage = "https://redwax.eu";
+ license = licenses.asl20;
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ dirkx ];
+ };
}
-
-
Modified: rs-distribution/trunk/nixos/pkgs/servers/http/apache-modules/mod_scep/default.nix
==============================================================================
--- rs-distribution/trunk/nixos/pkgs/servers/http/apache-modules/mod_scep/default.nix (original)
+++ rs-distribution/trunk/nixos/pkgs/servers/http/apache-modules/mod_scep/default.nix Sat Dec 14 21:36:09 2019
@@ -1,24 +1,41 @@
-{ stdenv, fetchurl, gnused, coreutils, pkgconfig, apacheHttpd, openssl, openldap , apr, aprutil, mod_ca}:
+{ stdenv, fetchurl, pkgconfig, mod_ca, apr, aprutil }:
stdenv.mkDerivation rec {
- name = "mod_scep";
+ pname = "mod_scep";
+ version = "0.2.1";
- meta = with stdenv.lib; {
- description = "RedWax CA service modules for SCEP (Automatic ceritifcate issue/renewal)";
- version = "0.2.1";
+ src = fetchurl {
+ url = "https://redwax.eu/dist/rs/${pname}-${version}.tar.gz";
+ sha256 = "14l8v6y6kx5dg8avb5ny95qdcgrw40ss80nqrgmw615mk7zcj81f";
+ };
- inherit (mod_ca.meta) license platforms maintainers homepage;
- };
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ mod_ca apr aprutil ];
+ inherit (mod_ca) configureFlags installFlags;
- src = fetchurl {
- url = "${mod_ca.baseurl}${name}-${meta.version}${mod_ca.suffix}";
- sha256 = "14l8v6y6kx5dg8avb5ny95qdcgrw40ss80nqrgmw615mk7zcj81f";
- };
+ # After openssl-1.0.2t, starting in openssl-1.1.0l
+ # parts of the OpenSSL struct API was replaced by
+ # getters - but some setters where forgotten.
+ #
+ # It is expected that these are back/retrofitted in version
+ # openssl-1.1.1d -- but while fixing this it was found
+ # that there were quite a few other setters missing and
+ # that some of the memory management needed was at odds
+ # with the principles used sofar.
+ #
+ # See https://github.com/openssl/openssl/pull/10563
+ #
+ # So as a stopgap - use a minimalist compat. layer
+ # https://source.redwax.eu/projects/RS/repos/mod_csr/browse/openssl_setter_compat.h
+ #
+ preBuild = "cp ${./openssl_setter_compat.h} openssl_setter_compat.h";
- buildInputs = [ mod_ca gnused coreutils pkgconfig apacheHttpd apr aprutil openssl openldap ];
- inherit ( mod_ca ) configurePlatforms configureFlags installPhase;
+ meta = with stdenv.lib; {
+ description = "RedWax CA service modules for SCEP (Automatic ceritifcate issue/renewal)";
- preBuild = "cp ${./openssl_setter_compat.h} openssl_setter_compat.h";
+ homepage = "https://redwax.eu";
+ license = licenses.asl20;
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ dirkx ];
+ };
}
-
-
Modified: rs-distribution/trunk/nixos/pkgs/servers/http/apache-modules/mod_spkac/default.nix
==============================================================================
--- rs-distribution/trunk/nixos/pkgs/servers/http/apache-modules/mod_spkac/default.nix (original)
+++ rs-distribution/trunk/nixos/pkgs/servers/http/apache-modules/mod_spkac/default.nix Sat Dec 14 21:36:09 2019
@@ -1,21 +1,24 @@
-{ stdenv, fetchurl, gnused, coreutils, pkgconfig, apacheHttpd, openssl, openldap , apr, aprutil, mod_ca}:
+{ stdenv, fetchurl, pkgconfig, mod_ca, apr, aprutil }:
stdenv.mkDerivation rec {
- name = "mod_spkac";
+ pname = "mod_spkac";
+ version = "0.2.1";
- meta = with stdenv.lib; {
- description = "RedWax CA service module for handling the Netscape keygen requests. ";
- version = "0.2.1";
+ src = fetchurl {
+ url = "https://redwax.eu/dist/rs/${pname}-${version}.tar.gz";
+ sha256 = "0x6ia9qcr7lx2awpv9cr4ndic5f4g8yqzmp2hz66zpzkmk2b2pyz";
+ };
- inherit (mod_ca.meta) license platforms maintainers homepage;
- };
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ mod_ca apr aprutil ];
+ inherit (mod_ca) configureFlags installFlags;
- src = fetchurl {
- url = "${mod_ca.baseurl}${name}-${meta.version}${mod_ca.suffix}";
- sha256 = "0x6ia9qcr7lx2awpv9cr4ndic5f4g8yqzmp2hz66zpzkmk2b2pyz";
- };
- buildInputs = [ mod_ca gnused coreutils pkgconfig apacheHttpd apr aprutil openssl openldap ];
- inherit ( mod_ca ) configurePlatforms configureFlags installPhase;
+ meta = with stdenv.lib; {
+ description = "RedWax CA service module for handling the Netscape keygen requests. ";
+
+ homepage = "https://redwax.eu";
+ license = licenses.asl20;
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ dirkx ];
+ };
}
-
-
Modified: rs-distribution/trunk/nixos/pkgs/servers/http/apache-modules/mod_timestamp/default.nix
==============================================================================
--- rs-distribution/trunk/nixos/pkgs/servers/http/apache-modules/mod_timestamp/default.nix (original)
+++ rs-distribution/trunk/nixos/pkgs/servers/http/apache-modules/mod_timestamp/default.nix Sat Dec 14 21:36:09 2019
@@ -1,21 +1,24 @@
-{ stdenv, fetchurl, gnused, coreutils, pkgconfig, apacheHttpd, openssl, openldap, apr, aprutil, mod_ca}:
+{ stdenv, fetchurl, pkgconfig, mod_ca, apr, aprutil }:
stdenv.mkDerivation rec {
- name = "mod_timestamp";
+ pname = "mod_timestamp";
+ version = "0.2.1";
- meta = with stdenv.lib; {
- description = "RedWax CA service module for issuing signed timestamps.";
- version = "0.2.1";
+ src = fetchurl {
+ url = "https://redwax.eu/dist/rs/${pname}-${version}.tar.gz";
+ sha256 = "0j4b04dbdwn9aff3da9m0lnqi0qbw6c6hhi81skl15kyc3vzp67f";
+ };
- inherit (mod_ca.meta) license platforms maintainers homepage;
- };
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ mod_ca apr aprutil ];
+ inherit (mod_ca) configureFlags installFlags;
- src = fetchurl {
- url = "${mod_ca.baseurl}${name}-${meta.version}${mod_ca.suffix}";
- sha256 = "0j4b04dbdwn9aff3da9m0lnqi0qbw6c6hhi81skl15kyc3vzp67f";
- };
- buildInputs = [ mod_ca gnused coreutils pkgconfig apacheHttpd apr aprutil openssl openldap ];
- inherit ( mod_ca ) configurePlatforms configureFlags installPhase;
+ meta = with stdenv.lib; {
+ description = "RedWax CA service module for issuing signed timestamps";
+
+ homepage = "https://redwax.eu";
+ license = licenses.asl20;
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ dirkx ];
+ };
}
-
-
More information about the rs-commit
mailing list