public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/iptables] f45: iptables-1.8.13-3
@ 2026-09-02 19:45 Phil Sutter
  0 siblings, 0 replies; only message in thread
From: Phil Sutter @ 2026-09-02 19:45 UTC (permalink / raw)
  To: git-commits

            A new commit has been pushed.

            Repo   : rpms/iptables
            Branch : f45
            Commit : 5763c473ac41472e2f06d69db4991e2011a65e9e
            Author : Phil Sutter <psutter@redhat.com>
            Date   : 2026-09-02T21:45:29+02:00
            Stats  : +18/-15 in 4 file(s)
            URL    : https://src.fedoraproject.org/rpms/iptables/c/5763c473ac41472e2f06d69db4991e2011a65e9e?branch=f45

            Log:
            iptables-1.8.13-3

- Fix for missing /var/lock/subsys directory in init scripts

Resolves: rhbz#2525767

---
diff --git a/arptables-helper b/arptables-helper
index 913298d..b0b9159 100644
--- a/arptables-helper
+++ b/arptables-helper
@@ -25,7 +25,7 @@ start() {
 		/usr/sbin/arptables-restore < $ARPTABLES_CONFIG && \
 			success || \
 			failure
-		touch /var/lock/subsys/arptables
+		touch /var/lock/arptables
 	else
 		failure
 		echo "Configuration file /etc/sysconfig/arptables missing"
@@ -43,7 +43,7 @@ stop() {
 		arptables -P OUTPUT ACCEPT && \
 		success || \
 		failure
-	rm -f /var/lock/subsys/arptables
+	rm -f /var/lock/arptables
 }
 
 case "$1" in
@@ -63,7 +63,7 @@ restart|reload)
 	;;
 
 condrestart|try-restart|force-reload)
-	[ -e /var/lock/subsys/arptables ] && start
+	[ -e /var/lock/arptables ] && start
 	;;
 
 *)

diff --git a/ebtables-helper b/ebtables-helper
index e63bd2b..83ffd32 100644
--- a/ebtables-helper
+++ b/ebtables-helper
@@ -16,7 +16,7 @@ failure() {
 EBTABLES_CONFIG=/etc/sysconfig/ebtables-config
 EBTABLES_DATA=/etc/sysconfig/ebtables
 EBTABLES_TABLES="broute filter nat"
-VAR_SUBSYS_EBTABLES=/var/lock/subsys/ebtables
+VAR_LOCK_EBTABLES=/var/lock/ebtables
 
 # ebtables-config defaults
 EBTABLES_SAVE_ON_STOP="no"
@@ -67,7 +67,7 @@ start() {
 		initialize
 	fi
 	local ret=$?
-	touch $VAR_SUBSYS_EBTABLES
+	touch $VAR_LOCK_EBTABLES
 	return $ret
 }
 
@@ -79,7 +79,7 @@ save() {
 
 case $1 in
 	start)
-		[ -f "$VAR_SUBSYS_EBTABLES" ] && exit 0
+		[ -f "$VAR_LOCK_EBTABLES" ] && exit 0
 		start && success || failure
 		RETVAL=$?
 		;;
@@ -88,7 +88,7 @@ case $1 in
 		echo -n $"ebtables: stopping firewall: "
 		initialize && success || failure
 		RETVAL=$?
-		rm -f $VAR_SUBSYS_EBTABLES
+		rm -f $VAR_LOCK_EBTABLES
 		;;
 	save)
 		save

diff --git a/iptables.init b/iptables.init
index ffbd742..f267b46 100755
--- a/iptables.init
+++ b/iptables.init
@@ -42,7 +42,7 @@ IPTABLES_CONFIG=/etc/sysconfig/${IPTABLES}-config
 IPV=${IPTABLES%tables} # ip for ipv4 | ip6 for ipv6
 [ "$IPV" = "ip" ] && _IPV="ipv4" || _IPV="ipv6"
 PROC_IPTABLES_NAMES=/proc/net/${IPV}_tables_names
-VAR_SUBSYS_IPTABLES=/var/lock/subsys/$IPTABLES
+VAR_LOCK_IPTABLES=/var/lock/$IPTABLES
 
 # only usable for root
 if [ $EUID != 0 ]; then
@@ -249,7 +249,7 @@ start() {
     # Load sysctl settings
     load_sysctl
 
-    touch $VAR_SUBSYS_IPTABLES
+    touch $VAR_LOCK_IPTABLES
     return $ret
 }
 
@@ -264,7 +264,7 @@ stop() {
     # And then, flush the rules and delete chains
     flush_n_delete
 
-    rm -f $VAR_SUBSYS_IPTABLES
+    rm -f $VAR_LOCK_IPTABLES
     return $ret
 }
 
@@ -313,7 +313,7 @@ save() {
 }
 
 status() {
-    if [ ! -f "$VAR_SUBSYS_IPTABLES" ]; then
+    if [ ! -f "$VAR_LOCK_IPTABLES" ]; then
 	echo $"${IPTABLES}: Firewall is not running."
 	return 3
     fi
@@ -407,7 +407,7 @@ restart() {
 
 case "$1" in
     start)
-	[ -f "$VAR_SUBSYS_IPTABLES" ] && exit 0
+	[ -f "$VAR_LOCK_IPTABLES" ] && exit 0
 	start
 	RETVAL=$?
 	;;
@@ -421,11 +421,11 @@ case "$1" in
 	RETVAL=$?
 	;;
     reload)
-	[ -e "$VAR_SUBSYS_IPTABLES" ] && reload
+	[ -e "$VAR_LOCK_IPTABLES" ] && reload
 	RETVAL=$?
 	;;      
     condrestart|try-restart)
-	[ ! -e "$VAR_SUBSYS_IPTABLES" ] && exit 0
+	[ ! -e "$VAR_LOCK_IPTABLES" ] && exit 0
 	restart
 	RETVAL=$?
 	;;

diff --git a/iptables.spec b/iptables.spec
index 37319a2..deec1e8 100644
--- a/iptables.spec
+++ b/iptables.spec
@@ -11,7 +11,7 @@ Name: iptables
 Summary: Tools for managing Linux kernel packet filtering capabilities
 URL: https://www.netfilter.org/projects/iptables
 Version: 1.8.13
-Release: 2%{?dist}
+Release: 3%{?dist}
 Source0: %{url}/files/%{name}-%{version}.tar.xz
 source1: %{url}/files/%{name}-%{version}.tar.xz.sig
 Source2: coreteam-gpg-key-0xD70D1A666ACF2B21.txt
@@ -470,6 +470,9 @@ fi
 
 
 %changelog
+* Wed Sep 02 2026 Phil Sutter <psutter@redhat.com> - 1.8.13-3
+- Fix for missing /var/lock/subsys directory in init scripts
+
 * Thu Jul 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.13-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
 

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-09-02 19:45 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-09-02 19:45 [rpms/iptables] f45: iptables-1.8.13-3 Phil Sutter

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox