Unverified Commit d96cef60 authored by Wolfgang Walther's avatar Wolfgang Walther Committed by GitHub
Browse files

opensmtpd-extras: drop in favor of standalone filters (#376913)

parents 3a8e7918 d27fc808

doc/release-notes/rl-2505.section.md

+4 −0
Original line number Diff line number Diff line
@@ -54,6 +54,10 @@ 
  The hook can be disabled by providing `dontCheckForBrokenSymlinks = true;` as an argument to `mkDerivation`.

  For more information, [check the docs](https://nixos.org/manual/nixpkgs/unstable/#no-broken-symlinks.sh) or [see this PR](https://github.com/NixOS/nixpkgs/pull/370750).



- `opensmtpd-extras` has been deprecated by upstream and is not compatible with

  OpenSMTPD 7.6.0 or later. The package has been removed in favor of a set of new

  `opensmtpd-table-*` packages.



- The hand written `perlPackages.SearchXapian` bindings have been dropped in favor of the (mostly compatible)

  `perlPackages.Xapian`.

nixos/modules/services/mail/opensmtpd.nix

+4 −4
Original line number Diff line number Diff line
@@ -76,8 +76,8 @@ in 
        description = ''

          Packages to search for filters, tables, queues, and schedulers.



          Add OpenSMTPD-extras here if you want to use the filters, etc. from

          that package.

          Add packages here if you want to use them as as such, for example

          from the opensmtpd-table-* packages.

        '';

      };

    };
@@ -132,14 +132,14 @@ in 
        procEnv = pkgs.buildEnv {

          name = "opensmtpd-procs";

          paths = [ cfg.package ] ++ cfg.procPackages;

          pathsToLink = [ "/libexec/opensmtpd" ];

          pathsToLink = [ "/libexec/smtpd" ];

        };

      in

      {

        wantedBy = [ "multi-user.target" ];

        after = [ "network.target" ];

        serviceConfig.ExecStart = "${cfg.package}/sbin/smtpd -d -f ${conf} ${args}";

        environment.OPENSMTPD_PROC_PATH = "${procEnv}/libexec/opensmtpd";

        environment.OPENSMTPD_PROC_PATH = "${procEnv}/libexec/smtpd";

      };

  };

}

pkgs/by-name/op/opensmtpd-table-ldap/package.nix

0 → 100644
+54 −0
Original line number Diff line number Diff line 
{

  lib,

  stdenv,

  fetchFromGitHub,

  autoconf,

  automake,

  libevent,

  libressl,

}:

stdenv.mkDerivation (finalAttrs: {

  pname = "opensmtpd-table-ldap";

  version = "1.0";



  src = fetchFromGitHub {

    owner = "OpenSMTPD";

    repo = "table-ldap";

    tag = finalAttrs.version;

    hash = "sha256-dfwvgFYBED3GyZ347JSNIyiik133GYLT6p+XkIIm//w=";

  };



  strictDeps = true;



  buildInputs = [

    libevent

    libressl

  ];



  nativeBuildInputs = [

    autoconf

    automake

  ];



  configureFlags = [

    "--sysconfdir=/etc"

    "--localstatedir=/var"

    "--with-path-socket=/run"

    "--with-path-pidfile=/run"

  ];



  preConfigure = ''

    sh bootstrap

  '';



  meta = {

    homepage = "https://www.opensmtpd.org/";

    description = "ldap table for the OpenSMTPD mail server";

    changelog = "https://github.com/OpenSMTPD/table-ldap/releases/tag/${finalAttrs.version}";

    license = lib.licenses.isc;

    platforms = lib.platforms.linux;

    maintainers = with lib.maintainers; [

      pks

    ];

  };

})

pkgs/by-name/op/opensmtpd-table-mysql/package.nix

0 → 100644
+53 −0
Original line number Diff line number Diff line 
{

  lib,

  stdenv,

  fetchFromGitHub,

  autoconf,

  automake,

  libmysqlclient,

}:

stdenv.mkDerivation (finalAttrs: {

  pname = "opensmtpd-table-mysql";

  version = "1.2.1";



  src = fetchFromGitHub {

    owner = "OpenSMTPD";

    repo = "table-mysql";

    tag = finalAttrs.version;

    hash = "sha256-0N1fuYJvJKAoOJMH2bX0pdvAqb26w/6JSuv6ycnRZHU=";

  };



  strictDeps = true;



  buildInputs = [

    libmysqlclient

  ];



  nativeBuildInputs = [

    autoconf

    automake

    libmysqlclient

  ];



  configureFlags = [

    "--sysconfdir=/etc"

    "--localstatedir=/var"

    "--with-path-socket=/run"

    "--with-path-pidfile=/run"

  ];



  preConfigure = ''

    sh bootstrap

  '';



  meta = {

    homepage = "https://www.opensmtpd.org/";

    description = "ldap table for the OpenSMTPD mail server";

    changelog = "https://github.com/OpenSMTPD/table-mysql/releases/tag/${finalAttrs.version}";

    license = lib.licenses.isc;

    platforms = lib.platforms.linux;

    maintainers = with lib.maintainers; [

      pks

    ];

  };

})