From 2ea95e874b703e1b0f779118fd16f64d156fc1b7 Mon Sep 17 00:00:00 2001
From: Brian McGillion <bmg.avoin@gmail.com>
Date: Wed, 21 May 2025 22:02:36 +0400
Subject: [PATCH] snort2: Remove snort2

Snort2 has been replaced by snort3 now referenced as snort. As per the
comments when snort2 was deprecated, this would be removed after the
25.05 branch off.

```
 # TODO: remove this package after 25.05 release
 # https://github.com/NixOS/nixpkgs/pull/381363#issuecomment-2653483597
```

Signed-off-by: Brian McGillion <bmg.avoin@gmail.com>
---
 pkgs/by-name/da/daq/package.nix    | 48 --------------------
 pkgs/by-name/sn/snort2/package.nix | 70 ------------------------------
 pkgs/top-level/aliases.nix         |  2 +
 3 files changed, 2 insertions(+), 118 deletions(-)
 delete mode 100644 pkgs/by-name/da/daq/package.nix
 delete mode 100644 pkgs/by-name/sn/snort2/package.nix

diff --git a/pkgs/by-name/da/daq/package.nix b/pkgs/by-name/da/daq/package.nix
deleted file mode 100644
index 40e7fec92598..000000000000
--- a/pkgs/by-name/da/daq/package.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  flex,
-  bison,
-  libpcap,
-  libdnet,
-  libnfnetlink,
-  libnetfilter_queue,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "daq";
-  version = "2.2.2";
-
-  src = fetchurl {
-    name = "${pname}-${version}.tar.gz";
-    url = "https://snort.org/downloads/archive/snort/${pname}-${version}.tar.gz";
-    sha256 = "0yvzscy7vqj7s5rccza0f7p6awghfm3yaxihx1h57lqspg51in3w";
-  };
-
-  buildInputs = [
-    flex
-    bison
-    libpcap
-    libdnet
-    libnfnetlink
-    libnetfilter_queue
-  ];
-
-  configureFlags = [
-    "--enable-nfq-module=yes"
-    "--with-dnet-includes=${libdnet}/includes"
-    "--with-dnet-libraries=${libdnet}/lib"
-  ];
-
-  NIX_CFLAGS_COMPILE = "-Wno-incompatible-pointer-types";
-
-  meta = {
-    description = "Data AcQuisition library (DAQ), for packet I/O";
-    mainProgram = "daq-modules-config";
-    homepage = "https://www.snort.org";
-    maintainers = with lib.maintainers; [ aycanirican ];
-    license = lib.licenses.gpl2;
-    platforms = with lib.platforms; linux;
-  };
-}
diff --git a/pkgs/by-name/sn/snort2/package.nix b/pkgs/by-name/sn/snort2/package.nix
deleted file mode 100644
index cb1e8185e7e1..000000000000
--- a/pkgs/by-name/sn/snort2/package.nix
+++ /dev/null
@@ -1,70 +0,0 @@
-{
-  lib,
-  stdenv,
-  pkg-config,
-  luajit,
-  openssl,
-  fetchurl,
-  libpcap,
-  pcre,
-  libdnet,
-  daq,
-  zlib,
-  flex,
-  bison,
-  makeWrapper,
-  libtirpc,
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  version = "2.9.20";
-  pname = "snort2";
-
-  # TODO: remove this package after 25.05 release
-  # https://github.com/NixOS/nixpkgs/pull/381363#issuecomment-2653483597
-  src = fetchurl rec {
-    name = "snort-${finalAttrs.version}.tar.gz";
-    url = "https://snort.org/downloads/snort/${name}";
-    sha256 = "sha256-KUAOE/U7GDHguLEOwSJKHLqm3BUzpTIqIN2Au4S0mBw=";
-  };
-
-  nativeBuildInputs = [
-    makeWrapper
-    pkg-config
-  ];
-  buildInputs = [
-    luajit
-    openssl
-    libpcap
-    pcre
-    libdnet
-    daq
-    zlib
-    flex
-    bison
-    libtirpc
-  ];
-
-  env.NIX_CFLAGS_COMPILE = toString [ "-I${libtirpc.dev}/include/tirpc" ];
-
-  enableParallelBuilding = true;
-
-  configureFlags = [
-    "--disable-static-daq"
-    "--enable-control-socket"
-    "--with-daq-includes=${daq}/includes"
-    "--with-daq-libraries=${daq}/lib"
-  ];
-
-  postInstall = ''
-    wrapProgram $out/bin/snort --add-flags "--daq-dir ${daq}/lib/daq --dynamic-preprocessor-lib-dir $out/lib/snort_dynamicpreprocessor/ --dynamic-engine-lib-dir $out/lib/snort_dynamicengine"
-  '';
-
-  meta = {
-    description = "Network intrusion prevention and detection system (IDS/IPS)";
-    homepage = "https://www.snort.org";
-    maintainers = with lib.maintainers; [ aycanirican ];
-    license = lib.licenses.gpl2;
-    platforms = with lib.platforms; linux;
-  };
-})
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index ebd3a2b31f29..979cd84918ce 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -508,6 +508,7 @@ mapAliases {
   ### D ###
 
   dap = throw "'dap' has been removed because it doesn't compile and has been unmaintained since 2014"; # Added 2025-05-10
+  daq = throw "'daq' has been removed as it is unmaintained and broken. Snort2 has also been removed, which depended on this"; # Added 2025-05-21
   darling = throw "'darling' has been removed due to vendoring Python2"; # Added 2025-05-10
   dart_stable = throw "'dart_stable' has been renamed to/replaced by 'dart'"; # Converted to throw 2024-10-17
   dart-sass-embedded = throw "dart-sass-embedded has been removed from nixpkgs, as is now included in Dart Sass itself.";
@@ -1741,6 +1742,7 @@ mapAliases {
   sm64ex-coop = throw "'sm64ex-coop' was removed as it was archived upstream. Consider migrating to 'sm64coopdx'"; # added 2024-11-23
   smartgithg = smartgit; # renamed March 2025
   snapTools = throw "snapTools was removed because makeSnap produced broken snaps and it was the only function in snapTools. See https://github.com/NixOS/nixpkgs/issues/100618 for more details."; # 2024-03-04;
+  snort2 = throw "snort2 has been removed as it is deprecated and unmaintained by upstream. Consider using snort (snort3) package instead."; # 2025-05-21
   soldat-unstable = opensoldat; # Added 2022-07-02
   soundOfSorting = sound-of-sorting; # Added 2023-07-07
   SP800-90B_EntropyAssessment = sp800-90b-entropyassessment; # Added on 2024-06-12