Re: [Shorewall-users] [Shorewall-announce] Shorewall 4.5.0

[Simon Matter]

> The Shorewall Team is pleased to announce the availability of Shorewall
> 4.5.0.

Hi Tom and Team,

Thanks for the new release!
It looks like the LIBEXEC / PERLLIB handling is broken now :)
I hope attached patch fixes it.

Thanks,
Simon
--- shorewall-4.5.0/install.sh.orig	2012-02-12 20:12:07.000000000 +0100
+++ shorewall-4.5.0/install.sh	2012-02-13 14:13:10.000000000 +0100
@@ -310,18 +310,9 @@
 
 if [ -z "$CYGWIN" ]; then
    install_file $PRODUCT ${DESTDIR}/sbin/$PRODUCT 0755
-   if [ -z "$MACHOST" ]; then
-       eval sed -i \'s\|g_libexec=.\*\|g_libexec=$LIBEXEC\|\' ${DESTDIR}/sbin/$PRODUCT
-       eval sed -i \'s\|g_perllib=.\*\|g_perllib=$PERLLIB\|\' ${DESTDIR}/sbin/$PRODUCT
-   else
-       eval sed -i \'\' -e \'s\|g_libexec=.\*\|g_libexec=$LIBEXEC\|\' ${DESTDIR}/sbin/$PRODUCT
-       eval sed -i \'\' -e \'s\|g_perllib=.\*\|g_perllib=$PERLLIB\|\' ${DESTDIR}/sbin/$PRODUCT
-   fi
    echo "$PRODUCT control program installed in ${DESTDIR}/sbin/$PRODUCT"
 else
    install_file $PRODUCT ${DESTDIR}/bin/$PRODUCT 0755
-   eval sed -i \'s\|g_libexec=.\*\|g_libexec=$LIBEXEC\|\' ${DESTDIR}/bin/$PRODUCT
-   eval sed -i \'s\|g_perllib=.\*\|g_perllib=$PERLLIB\|\' ${DESTDIR}/bin/$PRODUCT
    echo "$PRODUCT control program installed in ${DESTDIR}/bin/$PRODUCT"
 fi
 
--- shorewall6-4.5.0/install.sh.orig	2012-02-12 20:12:08.000000000 +0100
+++ shorewall6-4.5.0/install.sh	2012-02-13 14:17:40.000000000 +0100
@@ -310,18 +310,9 @@
 
 if [ -z "$CYGWIN" ]; then
    install_file $PRODUCT ${DESTDIR}/sbin/$PRODUCT 0755
-   if [ -z "$MACHOST" ]; then
-       eval sed -i \'s\|g_libexec=.\*\|g_libexec=$LIBEXEC\|\' ${DESTDIR}/sbin/$PRODUCT
-       eval sed -i \'s\|g_perllib=.\*\|g_perllib=$PERLLIB\|\' ${DESTDIR}/sbin/$PRODUCT
-   else
-       eval sed -i \'\' -e \'s\|g_libexec=.\*\|g_libexec=$LIBEXEC\|\' ${DESTDIR}/sbin/$PRODUCT
-       eval sed -i \'\' -e \'s\|g_perllib=.\*\|g_perllib=$PERLLIB\|\' ${DESTDIR}/sbin/$PRODUCT
-   fi
    echo "$PRODUCT control program installed in ${DESTDIR}/sbin/$PRODUCT"
 else
    install_file $PRODUCT ${DESTDIR}/bin/$PRODUCT 0755
-   eval sed -i \'s\|g_libexec=.\*\|g_libexec=$LIBEXEC\|\' ${DESTDIR}/bin/$PRODUCT
-   eval sed -i \'s\|g_perllib=.\*\|g_perllib=$PERLLIB\|\' ${DESTDIR}/bin/$PRODUCT
    echo "$PRODUCT control program installed in ${DESTDIR}/bin/$PRODUCT"
 fi
 
--- shorewall-core-4.5.0/install.sh.orig	2012-02-12 20:12:07.000000000 +0100
+++ shorewall-core-4.5.0/install.sh	2012-02-13 14:15:52.000000000 +0100
@@ -263,6 +263,13 @@
     install_file $f ${DESTDIR}/usr/share/shorewall/$f 0644
     echo "Library ${f#*.} file installed as ${DESTDIR}/usr/share/shorewall/$f"
 done
+if [ -z "$MACHOST" ]; then
+    eval sed -i \'s\|g_libexec=.\*\|g_libexec=$LIBEXEC\|\' ${DESTDIR}/usr/share/shorewall/lib.cli
+    eval sed -i \'s\|g_perllib=.\*\|g_perllib=$PERLLIB\|\' ${DESTDIR}/usr/share/shorewall/lib.cli
+else
+    eval sed -i \'\' -e \'s\|g_libexec=.\*\|g_libexec=$LIBEXEC\|\' ${DESTDIR}/usr/share/shorewall/lib.cli
+    eval sed -i \'\' -e \'s\|g_perllib=.\*\|g_perllib=$PERLLIB\|\' ${DESTDIR}/usr/share/shorewall/lib.cli
+fi
 #
 # Symbolically link 'functions' to lib.base
 #
------------------------------------------------------------------------------
Try before you buy = See our experts in action!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-dev2
_______________________________________________
Shorewall-users mailing list
Shorewall-users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/shorewall-users