On 7 Jun 2016 at 8:21, Tom Eastep wrote:
> On 06/07/2016 06:40 AM, Matt Darfeuille wrote:
> > On 5 Jun 2016 at 12:53, Tom Eastep wrote:
> >
> >> On 06/05/2016 12:33 PM, Matt Darfeuille wrote:
> >>> On 5 Jun 2016 at 7:57, Tom Eastep wrote:
> >>>
> >>>> On 05/29/2016 02:00 AM, Matt Darfeuille wrote:
> >>>>
> >>>> Hi Matt,
> >>>>
> >>>>>
> >>>>> -------------- Enclosure number 1 ----------------
> >>>>> >From 6ff651108df33ab8be4562caef03a8582e9eac5e Mon Sep 17 00:00:00 2001
> >>>>> From: Matt Darfeuille <[email protected]>
> >>>>> Date: Tue, 24 May 2016 13:10:28 +0200
> >>>>> Subject: [PATCH 1/8] Emulate 'ps -p' using grep to work on openwrt
> >>>>>
> >>>>> Signed-off-by: Matt Darfeuille <[email protected]>
> >>>>> ---
> >>>>> Shorewall-core/lib.common | 2 +-
> >>>>> 1 file changed, 1 insertion(+), 1 deletion(-)
> >>>>>
> >>>>> diff --git a/Shorewall-core/lib.common b/Shorewall-core/lib.common
> >>>>> index 03ecb2a..fcb02ee 100644
> >>>>> --- a/Shorewall-core/lib.common
> >>>>> +++ b/Shorewall-core/lib.common
> >>>>> @@ -776,7 +776,7 @@ mutex_on()
> >>>>> error_message "WARNING: Stale lockfile ${lockf} removed"
> >>>>> elif [ $lockpid -eq $$ ]; then
> >>>>> return 0
> >>>>> - elif ! qt ps p ${lockpid}; then
> >>>>> + elif ! qt ps | grep -v grep | grep ${lockpid}; then
> >>>>
> >>>> I don't see how this can work -- 'qt ps' will produce no output yet the
> >>>> code pipes into tandem greps.
> >>>>
> >>>> Do you really want this instead?
> >>>>
> >>>> elif ! ps | grep -v grep | qt grep ${lockpid}; then
> >>>>
> >>>
> >>> Oops sorry Tom, that's what I meant(do you want the corrected
> >>> patch?)!
> >>
> >> Yes, please.
> >>
> >
> > Tom, along with correcting this faulty commit I realize, after some
> > more testing, that I've also sent unnecessary commits.
> >
> > Should I revert these 3 commits(git revert ...):
> > Set proper permissions for the LOCKFILE on openwrt
> > 2ded346cb557212389212fd5adcd4c6800edbb62
> > Create lockfile before using openwrt's lock utility
> > 08e8796ff1abc3b24b8bbd40bf5e0a2b36464d61
> > Emulate 'ps -p' using grep to work on openwrt
> > 6ff651108df33ab8be4562caef03a8582e9eac5e
> >
> > or should I simply create new commits that will correct these faulty
> > commits?
> >
> > In other words what's the best way to correct submited commits.
> >
>
> Matt,
>
> Either way is fine.
>
Hopefully these 3 commits will do it(code-fixes.patch):
Patch 1 will correct the error you have point out!
On OpenWRT the lock utility doesn't allow to append the pid of the
currently running script to the LOCKFILE that's why I've simply
deleted that line(patch 2).
I've also reordered the permissions line to be added after the line
that will lock the file specified by the LOCKFILE variable(patch 3).
and two other patches:
While installing shorewall-init using the DESTDIR variable on debian,
'mkdir' would complain if the directory ${DESTDIR}/${etc}/default
already exist; corrected using 'mkdir -p ...'(patch 4).
The last patch will correct a typo in the blacklisting_support
article.
-Matt
-------------- Enclosure number 1 ----------------
>From 1a2ff15c8dc994030e819d2882570d188b99c501 Mon Sep 17 00:00:00 2001
From: Matt Darfeuille <[email protected]>
Date: Wed, 8 Jun 2016 09:09:46 +0200
Subject: [PATCH 1/5] Correct pid detection mutex_on()
Signed-off-by: Matt Darfeuille <[email protected]>
---
Shorewall-core/lib.common | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Shorewall-core/lib.common b/Shorewall-core/lib.common
index 3d0bacb..c97191c 100644
--- a/Shorewall-core/lib.common
+++ b/Shorewall-core/lib.common
@@ -776,7 +776,7 @@ mutex_on()
error_message "WARNING: Stale lockfile ${lockf} removed"
elif [ $lockpid -eq $$ ]; then
return 0
- elif ! qt ps | grep -v grep | grep ${lockpid}; then
+ elif ! ps | grep -v grep | qt grep ${lockpid}; then
rm -f ${lockf}
error_message "WARNING: Stale lockfile ${lockf} from pid
${lockpid} removed"
fi
--
2.6.2
>From 67d3aaa72aad6156d50b11d47007446f81dfee84 Mon Sep 17 00:00:00 2001
From: Matt Darfeuille <[email protected]>
Date: Wed, 8 Jun 2016 09:31:00 +0200
Subject: [PATCH 2/5] Don't append script's pid to LOCKFILE on OpenWRT
Signed-off-by: Matt Darfeuille <[email protected]>
---
Shorewall-core/lib.common | 1 -
1 file changed, 1 deletion(-)
diff --git a/Shorewall-core/lib.common b/Shorewall-core/lib.common
index c97191c..1cdfe28 100644
--- a/Shorewall-core/lib.common
+++ b/Shorewall-core/lib.common
@@ -788,7 +788,6 @@ mutex_on()
echo $$ > ${lockf}
chmod u-w ${lockf}
elif qt mywhich lock; then
- echo $$ > ${lockf}
chmod u=r ${lockf}
lock ${lockf}
else
--
2.6.2
>From 8467e5ab5b429b788f84ed8eb25a84833c7e831d Mon Sep 17 00:00:00 2001
From: Matt Darfeuille <[email protected]>
Date: Wed, 8 Jun 2016 16:06:25 +0200
Subject: [PATCH 3/5] Reorder permissions line for LOCKFILE on OpenWRT
Signed-off-by: Matt Darfeuille <[email protected]>
---
Shorewall-core/lib.common | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Shorewall-core/lib.common b/Shorewall-core/lib.common
index 1cdfe28..8570b12 100644
--- a/Shorewall-core/lib.common
+++ b/Shorewall-core/lib.common
@@ -788,8 +788,8 @@ mutex_on()
echo $$ > ${lockf}
chmod u-w ${lockf}
elif qt mywhich lock; then
- chmod u=r ${lockf}
lock ${lockf}
+ chmod u=r ${lockf}
else
while [ -f ${lockf} -a ${try} -lt ${MUTEX_TIMEOUT} ] ; do
sleep 1
--
2.6.2
>From 3f07774320ec7d335c11154328f1f352e0530874 Mon Sep 17 00:00:00 2001
From: Matt Darfeuille <[email protected]>
Date: Wed, 8 Jun 2016 16:22:25 +0200
Subject: [PATCH 4/5] Init: Don't complain if directory already exist
Signed-off-by: Matt Darfeuille <[email protected]>
---
Shorewall-init/install.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Shorewall-init/install.sh b/Shorewall-init/install.sh
index 2d1a044..f4e4a3a 100755
--- a/Shorewall-init/install.sh
+++ b/Shorewall-init/install.sh
@@ -412,7 +412,7 @@ if [ $HOST = debian ]; then
if [ ! -f ${DESTDIR}${CONFDIR}/default/shorewall-init ]; then
if [ -n "${DESTDIR}" ]; then
- mkdir ${DESTDIR}${ETC}/default
+ mkdir -p ${DESTDIR}${ETC}/default
fi
[ $configure -eq 1 ] || mkdir -p ${DESTDIR}${CONFDIR}/default
--
2.6.2
>From fdfdb373d8ca075c6aabdf47ecc66100ca862b00 Mon Sep 17 00:00:00 2001
From: Matt Darfeuille <[email protected]>
Date: Wed, 8 Jun 2016 16:47:20 +0200
Subject: [PATCH 5/5] Correct a typo in the blacklisting_support article
Signed-off-by: Matt Darfeuille <[email protected]>
---
docs/blacklisting_support.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/blacklisting_support.xml b/docs/blacklisting_support.xml
index d611197..5d50ee2 100644
--- a/docs/blacklisting_support.xml
+++ b/docs/blacklisting_support.xml
@@ -48,7 +48,7 @@
<section id="Intro">
<title>Introduction</title>
- <para>Shorewall supports two different types of blackliisting; rule-based,
+ <para>Shorewall supports two different types of blacklisting; rule-based,
static and dynamic. The BLACKLIST option in /etc/shorewall/shorewall.conf
controls the degree of blacklist filtering.</para>
--
2.6.2
------------------------------------------------------------------------------
What NetFlow Analyzer can do for you? Monitors network bandwidth and traffic
patterns at an interface-level. Reveals which users, apps, and protocols are
consuming the most bandwidth. Provides multi-vendor support for NetFlow,
J-Flow, sFlow and other flows. Make informed decisions using capacity
planning reports. https://ad.doubleclick.net/ddm/clk/305295220;132659582;e
_______________________________________________
Shorewall-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/shorewall-devel
