From 365ffaf6455bf79bb5dba41e714501df3c9552da Mon Sep 17 00:00:00 2001 From: Matt Darfeuille Date: Sun, 17 Apr 2016 22:37:13 +0200 Subject: [PATCH] questions On 17 Apr 2016 at 7:45, Tom Eastep wrote: > On 04/17/2016 06:23 AM, Matt Darfeuille wrote: > > >> Tom, I neglected the git part of that request!(sorry): > >> > >> Could changes be also made in the git code repo that take for account > >> case insensitive system?: > >> > >> What I suggest doing is using the deprecated extension when the case > >> of a file is changed in the code so git wouldn't show 'Modified: ...' > >> and simply modifying shorewall/install.sh to strip the file from the > >> deprecated extension and then copying it to the deprecated directory. > >> > >> In other words: when changing the case of a file tracked by git could > >> case-insensitivity platform be taken in to account? > >> > >> -Matt > >> > >> P.S. I'll test SW_LOGGERTAG tomorrow!!!:) > > > > Or do you have a better solution, if no, I could do the changes to > > shorewall/install.sh!? > > Sure -- go ahead. We'll do it in the master branch, though, since I've > now created a 5.0.8 branch for the upcoming release. > > > > > You might want to apply the attached patch to changelog.txt in the > > release repo! > > > > Applied -- thanks! > > -Tom > -- > Tom Eastep \ When I die, I want to go like my Grandfather who > Shoreline, \ died peacefully in his sleep. Not screaming like > Washington, USA \ all of the passengers in his car > http://shorewall.net \________________________________________________ > > Attached as case.patch are 3 patches: 1 and 2 simply rename the deprecated files(adding .deprecated) Patch 3 will modify Shorewall/install.sh to reflect the new naming scheme! I didn't have the time to test SW_LOGGERTAG but will do so in the coming days!!!:) -Matt -------------- Enclosure number 1 ---------------- From 2ecd761b414af61c5854d6427fb9ec8ab1365c7b Mon Sep 17 00:00:00 2001 From: Matt Darfeuille Date: Sun, 17 Apr 2016 18:34:40 +0200 Subject: [PATCH 1/3] Rename macro.SNMPTrap to macro.SNMPTrap.deprecated Signed-off-by: Matt Darfeuille Signed-off-by: Tom Eastep --- .../{macro.SNMPTrap => macro.SNMPTrap.deprecated} | 0 .../{action.A_Reject => action.A_Reject.deprecated} | 0 Shorewall/install.sh | 12 ++++++------ 3 files changed, 6 insertions(+), 6 deletions(-) rename Shorewall/Macros/{macro.SNMPTrap => macro.SNMPTrap.deprecated} (100%) rename Shorewall/{action.A_Reject => action.A_Reject.deprecated} (100%) diff --git a/Shorewall/Macros/macro.SNMPTrap b/Shorewall/Macros/macro.SNMPTrap.deprecated similarity index 100% rename from Shorewall/Macros/macro.SNMPTrap rename to Shorewall/Macros/macro.SNMPTrap.deprecated diff --git a/Shorewall/action.A_Reject b/Shorewall/action.A_Reject.deprecated similarity index 100% rename from Shorewall/action.A_Reject rename to Shorewall/action.A_Reject.deprecated diff --git a/Shorewall/install.sh b/Shorewall/install.sh index 9676a51d3..ed454d303 100755 --- a/Shorewall/install.sh +++ b/Shorewall/install.sh @@ -1063,9 +1063,9 @@ fi # for f in action.* ; do case $f in - action.A_Reject) - install_file $f ${DESTDIR}${SHAREDIR}/$PRODUCT/deprecated/$f 0644 - echo "Action ${f#*.} file installed as ${DESTDIR}${SHAREDIR}/$PRODUCT/deprecated/$f" + *.deprecated) + install_file $f ${DESTDIR}${SHAREDIR}/$PRODUCT/deprecated/${f%.*} 0644 + echo "Action ${f#*.} file installed as ${DESTDIR}${SHAREDIR}/$PRODUCT/deprecated/${f%.*}" ;; *) install_file $f ${DESTDIR}${SHAREDIR}/$PRODUCT/$f 0644 @@ -1078,9 +1078,9 @@ cd Macros for f in macro.* ; do case $f in - macro.SNMPTrap) - install_file $f ${DESTDIR}${SHAREDIR}/$PRODUCT/deprecated/$f 0644 - echo "Macro ${f#*.} file installed as ${DESTDIR}${SHAREDIR}/$PRODUCT/deprecated/$f" + *.deprecated) + install_file $f ${DESTDIR}${SHAREDIR}/$PRODUCT/deprecated/${f%.*} 0644 + echo "Macro ${f#*.} file installed as ${DESTDIR}${SHAREDIR}/$PRODUCT/deprecated/${f%.*}" ;; *) install_file $f ${DESTDIR}${SHAREDIR}/$PRODUCT/$f 0644