summary refs log tree commit diff
path: root/pkgs/os-specific/linux/iptables/default.nix
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2023-04-01 10:17:23 +0000
committerAlyssa Ross <hi@alyssa.is>2023-04-03 09:27:44 +0000
commitd2813d505e844753cd15e54942e93ae3f73d0af4 (patch)
tree87e9d0e6eaa78eca211cf54a507d0696fc74b2a4 /pkgs/os-specific/linux/iptables/default.nix
parentbaa80fd5aa88d28158697aa01247342be1e06591 (diff)
downloadnixpkgs-d2813d505e844753cd15e54942e93ae3f73d0af4.tar
nixpkgs-d2813d505e844753cd15e54942e93ae3f73d0af4.tar.gz
nixpkgs-d2813d505e844753cd15e54942e93ae3f73d0af4.tar.bz2
nixpkgs-d2813d505e844753cd15e54942e93ae3f73d0af4.tar.lz
nixpkgs-d2813d505e844753cd15e54942e93ae3f73d0af4.tar.xz
nixpkgs-d2813d505e844753cd15e54942e93ae3f73d0af4.tar.zst
nixpkgs-d2813d505e844753cd15e54942e93ae3f73d0af4.zip
iptables: 1.8.8 -> 1.8.9
Diffstat (limited to 'pkgs/os-specific/linux/iptables/default.nix')
-rw-r--r--pkgs/os-specific/linux/iptables/default.nix22
1 files changed, 6 insertions, 16 deletions
diff --git a/pkgs/os-specific/linux/iptables/default.nix b/pkgs/os-specific/linux/iptables/default.nix
index 0704860c961..930e876ec60 100644
--- a/pkgs/os-specific/linux/iptables/default.nix
+++ b/pkgs/os-specific/linux/iptables/default.nix
@@ -5,29 +5,19 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "1.8.8";
+  version = "1.8.9";
   pname = "iptables";
 
   src = fetchurl {
-    url = "https://www.netfilter.org/projects/${pname}/files/${pname}-${version}.tar.bz2";
-    sha256 = "sha256-ccdYidxxBnZjFVPrFRHaAXe7qvG1USZbkS0jbD9RhZ8=";
+    url = "https://www.netfilter.org/projects/${pname}/files/${pname}-${version}.tar.xz";
+    sha256 = "72Y5pDvoMlpPjqaBI/+sI2y2lujHhQG2ToEGr7AIyH8=";
   };
 
   patches = [
-    # xshared: Fix build for -Werror=format-security
     (fetchpatch {
-      url = "https://git.netfilter.org/iptables/patch/?id=b72eb12ea5a61df0655ad99d5048994e916be83a";
-      sha256 = "sha256-pnamqOagwNWoiwlxPnKCqSc2N7MP/eZlT7JiE09c8OE=";
-    })
-    # treewide: use uint* instead of u_int*
-    (fetchpatch {
-      url = "https://git.netfilter.org/iptables/patch/?id=f319389525b066b7dc6d389c88f16a0df3b8f189";
-      sha256 = "sha256-rOxCEWZoI8Ac5fQDp286YHAwvreUAoDVAbomboKrGyM=";
-    })
-    # fix Musl build
-    (fetchpatch {
-      url = "https://git.netfilter.org/iptables/patch/?id=0e7cf0ad306cdf95dc3c28d15a254532206a888e";
-      sha256 = "18mnvqfxzd7ifq3zjb4vyifcyadpxdi8iqcj8wsjgw23n49lgrbj";
+      name = "format-security.patch";
+      url = "https://git.netfilter.org/iptables/patch/?id=ed4082a7405a5838c205a34c1559e289949200cc";
+      sha256 = "OdytFmHk+3Awu+sDQpGTl5/qip4doRblmW2vQzfNZiU=";
     })
   ];