On 4/27/12 8:27 AM, Greg' Ar Tourter wrote: > Hi Thomas, > > I am currently working on the slackbuild for the new 4.5 series which > will be available on slackbuilds.org (where the 4.4 have been made > available). I was waiting for thing to settle a bit but was also > thinking of waiting for the new slackware to come out before releasing > the 4.5 version as it is a major change in the way the packages are > organised. I will make them available through github if I don't > release them for 13.37.
Hi Greg and Thomas, Thomas's change will allow Shorewall to install and work but is not a complete solution because it ignores Shorewall6. I believe that the attached patch is the correct fix. -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 \________________________________________________
diff --git a/Shorewall-core/shorewallrc.slackware
b/Shorewall-core/shorewallrc.slackware
index eabccaf..8eb4f28 100644
--- a/Shorewall-core/shorewallrc.slackware
+++ b/Shorewall-core/shorewallrc.slackware
@@ -11,9 +11,9 @@ CONFDIR=/etc #Directory where
subsystem configurat
SBINDIR=/sbin #Directory where system
administration programs are installed
MANDIR=${PREFIX}/man #Directory where manpages are
installed.
INITDIR=/etc/rc.d #Directory where SysV init scripts
are installed.
-INITSOURCE=init.slackware.firewall #Name of the distributed file to be
installed as the SysV init script
+INITSOURCE=init.slackware.firewall.sh #Name of the distributed file to be
installed as the SysV init script
INITFILE=rc.firewall #Name of the product's installed
SysV init script
-AUXINITSOURCE=init.slackware.$PRODUCT #Name of the distributed file to be
installed as a second SysV init script
+AUXINITSOURCE=init.slackware.$PRODUCT.sh #Name of the distributed file to be
installed as a second SysV init script
AUXINITFILE=rc.$PRODUCT #Name of the product's installed
second init script
SYSTEMD= #Name of the directory where
.service files are installed (systems running systemd only)
SYSCONFFILE= #Name of the distributed file to be
installed in $SYSCONFDIR
diff --git a/Shorewall/install.sh b/Shorewall/install.sh
index 2610ca2..d0ebba7 100755
--- a/Shorewall/install.sh
+++ b/Shorewall/install.sh
@@ -333,14 +333,18 @@ echo "$PRODUCT control program installed in
${DESTDIR}${SBINDIR}/$PRODUCT"
# Install the Firewall Script
#
if [ -n "$INITFILE" ]; then
- install_file $INITSOURCE ${DESTDIR}${INITDIR}/$INITFILE 0544
- [ "${SHAREDIR}" = /usr/share ] || eval sed -i
\'s\|/usr/share/\|${SHAREDIR}/\|\' ${DESTDIR}${INITDIR}/$INITFILE
+ if [ -f "${INITSOURCE}" ]; then
+ install_file $INITSOURCE ${DESTDIR}${INITDIR}/$INITFILE 0544
+ [ "${SHAREDIR}" = /usr/share ] || eval sed -i
\'s\|/usr/share/\|${SHAREDIR}/\|\' ${DESTDIR}${INITDIR}/$INITFILE
+ echo "$Product script installed in ${DESTDIR}${INITDIR}/$INITFILE"
+ fi
if [ -n "${AUXINITSOURCE}" ]; then
- install_file $INITSOURCE ${DESTDIR}${INITDIR}/$INITFILE 0544
+ install_file $AUXINITSOURCE ${DESTDIR}${INITDIR}/$AUXINITFILE 0544
+ [ "${SHAREDIR}" = /usr/share ] || eval sed -i
\'s\|/usr/share/\|${SHAREDIR}/\|\' ${DESTDIR}${INITDIR}/$AUXINITFILE
+ echo "$Product script installed in ${DESTDIR}${INITDIR}/$AUXINITFILE"
fi
- echo "$Product script installed in ${DESTDIR}${INITDIR}/$INITFILE"
fi
#
signature.asc
Description: OpenPGP digital signature
------------------------------------------------------------------------------ Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________ Shorewall-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/shorewall-devel
