thr3ads.net - Shorewall devel - Patches to move files to libexec directory [Mar 2011]

If this information is useful, please help other people find it:
Share via:

Jonathan G. Underwood

2011-Mar-21 00:29 UTC

Patches to move files to libexec directory

This patch series defines a LIBEXEC environment variable and moves getparams,
wait4ifup and compiler.pl out of SHARE and into LIBEXEC.

At this point these patches are untested, and PATCH 05 is particularly
suspect, since I don''t know perl.


------------------------------------------------------------------------------
Colocation vs. Managed Hosting
A question and answer guide to determining the best fit
for your organization - today and in the future.
http://p.sf.net/sfu/internap-sfd2d

Jonathan G. Underwood

2011-Mar-21 00:29 UTC

head link

[PATCH 01/10] Shorewall: Add framework for LIBEXEC directory usage

---
 Shorewall/install.sh |   29 ++++++++++++++++++++++++++---
 Shorewall/lib.base   |    2 ++
 Shorewall/shorewall  |    1 +
 3 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/Shorewall/install.sh b/Shorewall/install.sh
index eb85984..e6663a6 100755
--- a/Shorewall/install.sh
+++ b/Shorewall/install.sh
@@ -177,12 +177,14 @@ if [ -n "$BASE" ]; then
     [ -n ${ETC:=${BASE}/etc/} ]
     [ -n ${SBIN:=${BASE}/sbin/} ]
     [ -n ${SHARE:=${BASE}/share/} ]
+    [ -n ${LIBEXEC:=${BASE}/libexec/} ]
     [ -n ${VAR:=${BASE}/var/lib/} ]
     [ -n ${MANDIR:=${BASE}/share/man} ]
 else
     [ -n ${ETC:=/etc/} ]
     [ -n ${SBIN:=/sbin/} ]
     [ -n ${SHARE:=/usr/share/} ]
+    [ -n ${LIBEXEC:=/usr/libexec/} ]
     [ -n ${VAR:=/var/lib/} ]
     [ -n ${MANDIR:=/usr/share/man} ]
 fi
@@ -236,6 +238,22 @@ case "$SHARE" in
 	;;
 esac
 
+case "$LIBEXEC" in
+    /*/)
+	;;
+    /*)
+	LIBEXEC=$LIBEXEC/
+	;;
+    *)
+	if [ -n "$BASE" ]; then
+	    LIBEXEC=$BASE/$LIBEXEC/
+	else
+	    echo "ERROR: LIBEXEC must contain an absolute path name"
>&2
+	    exit 1
+	fi
+	;;
+esac
+
 case "$VAR" in
     /*/)
 	;;
@@ -255,6 +273,7 @@ esac
 ETC=$(echo $ETC | sed "s''//''/''g")
 SBIN=$(echo $SBIN | sed "s''//''/''g")
 SHARE=$(echo $SHARE | sed "s''//''/''g")
+LIBEXEC=$(echo $LIBEXEC | sed "s''//''/''g")
 VAR=$(echo $VAR | sed "s''//''/''g")
 
 PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin:/usr/local/sbin
@@ -351,15 +370,18 @@ if [ -n "${DESTDIR}${OWNERSHIP}" ]; then
     chmod 755 ${DESTDIR}/etc
 fi
 #
-# Create ${ETC}shorewall, ${SHARE}shorewall and ${VAR}shorewall if needed
+# Create ${ETC}shorewall, ${SHARE}shorewall, ${LIBEXEC}shorewall and
+# ${VAR}shorewall if needed
 #
 mkdir -p ${DESTDIR}${ETC}shorewall
 mkdir -p ${DESTDIR}${SHARE}shorewall
+mkdir -p ${DESTDIR}${LIBEXEC}shorewall
 mkdir -p ${DESTDIR}${SHARE}shorewall/configfiles
 mkdir -p ${DESTDIR}${VAR}shorewall
 
 chmod 755 ${DESTDIR}${ETC}shorewall
 chmod 755 ${DESTDIR}${SHARE}shorewall
+chmod 755 ${DESTDIR}${LIBEXEC}shorewall
 chmod 755 ${DESTDIR}${SHARE}shorewall/configfiles
 
 if [ -n "$DESTDIR" ]; then
@@ -953,12 +975,13 @@ cd ..
 export ETC
 export SBIN
 export SHARE
+export LIBEXEC
 export VAR
 
 perl -i -e ''
 
 while ( <> ) {
-   for my $var qw( ETC SBIN SHARE VAR ) {
+   for my $var qw( ETC SBIN SHARE LIBEXEC VAR ) {
       if ( /^$var=/ ) {
          $_ = "g_" . lc( $var ) . "=" . $ENV{$var} .
"\n";
       }
@@ -973,7 +996,7 @@ my \$done = 0;
 
 while ( <> ) {
    unless ( \$done ) {
-      for my \$var qw( ETC SBIN SHARE VAR ) {
+      for my \$var qw( ETC SBIN SHARE LIBEXEC VAR ) {
          if ( /\$var(?:\\s*)=(?:\\s*)(.*);/ ) {
             s/\$1/''\$ENV{\$var}''/;
             \$done = \$var eq ''VAR'';
diff --git a/Shorewall/lib.base b/Shorewall/lib.base
index 7369c7e..a926f01 100644
--- a/Shorewall/lib.base
+++ b/Shorewall/lib.base
@@ -32,6 +32,7 @@
 ETC=/etc/
 SBIN=/sbin/
 SHARE=/usr/share/
+LIBEXEC=/usr/libexec/
 VAR=/var/lib/
 
 SHOREWALL_LIBVERSION=40407
@@ -39,6 +40,7 @@ SHOREWALL_CAPVERSION=40417
 
 [ -n "${VARDIR:=${g_var}shorewall}" ]
 [ -n "${SHAREDIR:=${g_share}shorewall}" ]
+[ -n "${LIBEXECDIR:=${g_libexec}shorewall}" ]
 [ -n "${CONFDIR:=${g_etc}shorewall}" ]
 
 #
diff --git a/Shorewall/shorewall b/Shorewall/shorewall
index 18cf56c..0ced9e8 100755
--- a/Shorewall/shorewall
+++ b/Shorewall/shorewall
@@ -32,6 +32,7 @@
 ETC=/etc/
 SBIN=/sbin/
 SHARE=/usr/share/
+LIBEXEC=/usr/libexec
 VAR=/var/lib/
 #
 # Set the configuration variables from shorewall.conf
-- 
1.7.4


------------------------------------------------------------------------------
Colocation vs. Managed Hosting
A question and answer guide to determining the best fit
for your organization - today and in the future.
http://p.sf.net/sfu/internap-sfd2d

Jonathan G. Underwood

2011-Mar-21 00:29 UTC

head link

[PATCH 02/10] Shorewall: Move wait4ifup to LIBEXEC

---
 Shorewall/default.debian |    2 +-
 Shorewall/init.debian.sh |    2 +-
 Shorewall/install.sh     |    4 ++--
 Shorewall/shorewall.spec |    2 +-
 Shorewall/wait4ifup      |    2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Shorewall/default.debian b/Shorewall/default.debian
index 828ecc9..31a4f76 100644
--- a/Shorewall/default.debian
+++ b/Shorewall/default.debian
@@ -42,5 +42,5 @@ SRWL=/sbin/shorewall
 # Name of the wait4ifup script Change this if you use the installer to install
in
 # another location
 #
-WAIT_FOR_IFUP=/usr/share/shorewall/wait4ifup
+WAIT_FOR_IFUP=/usr/libexec/shorewall/wait4ifup
 # EOF
diff --git a/Shorewall/init.debian.sh b/Shorewall/init.debian.sh
index a4d6c34..969bbc3 100755
--- a/Shorewall/init.debian.sh
+++ b/Shorewall/init.debian.sh
@@ -12,7 +12,7 @@
 
 SRWL=/sbin/shorewall
 SRWL_OPTS="-tvv"
-WAIT_FOR_IFUP=/usr/share/shorewall/wait4ifup
+WAIT_FOR_IFUP=/usr/libexec/shorewall/wait4ifup
 INITLOG=/var/log/shorewall-init.log
 
 if [ "$(id -u)" != "0" ]
diff --git a/Shorewall/install.sh b/Shorewall/install.sh
index e6663a6..50eca57 100755
--- a/Shorewall/install.sh
+++ b/Shorewall/install.sh
@@ -450,10 +450,10 @@ delete_file ${DESTDIR}/usr/share/shorewall/prog.footer
 # Install wait4ifup
 #
 
-install_file wait4ifup ${DESTDIR}${SHARE}shorewall/wait4ifup 0755
+install_file wait4ifup ${DESTDIR}${LIBEXEC}shorewall/wait4ifup 0755
 
 echo
-echo "wait4ifup installed in ${DESTDIR}${SHARE}shorewall/wait4ifup"
+echo "wait4ifup installed in ${DESTDIR}${LIBEXEC}shorewall/wait4ifup"
 
 #
 # Install the policy file
diff --git a/Shorewall/shorewall.spec b/Shorewall/shorewall.spec
index 894f54f..5b65d52 100644
--- a/Shorewall/shorewall.spec
+++ b/Shorewall/shorewall.spec
@@ -104,7 +104,7 @@ fi
 %attr(0644,root,root) /usr/share/shorewall/modules*
 %attr(0644,root,root) /usr/share/shorewall/helpers
 %attr(0644,root,root) /usr/share/shorewall/configpath
-%attr(0755,root,root) /usr/share/shorewall/wait4ifup
+%attr(0755,root,root) /usr/libexec/shorewall/wait4ifup
 
 %attr(755,root,root) /usr/share/shorewall/compiler.pl
 %attr(755,root,root) /usr/share/shorewall/getparams
diff --git a/Shorewall/wait4ifup b/Shorewall/wait4ifup
index 400c420..9469810 100755
--- a/Shorewall/wait4ifup
+++ b/Shorewall/wait4ifup
@@ -6,7 +6,7 @@
 #
 #     (c) 2007 - Tom Eastep (teastep@shorewall.net)
 #
-#	This file is installed in /usr/share/shorewall/wait4ifup
+#	This file is installed in /usr/libexec/shorewall/wait4ifup
 #
 #	Shorewall documentation is available at http://www.shorewall.net
 #
-- 
1.7.4


------------------------------------------------------------------------------
Colocation vs. Managed Hosting
A question and answer guide to determining the best fit
for your organization - today and in the future.
http://p.sf.net/sfu/internap-sfd2d

Jonathan G. Underwood

2011-Mar-21 00:29 UTC

head link

[PATCH 03/10] Shorewall: Move compiler.pl to LIBEXEC

---
 Shorewall/install.sh     |    4 ++--
 Shorewall/shorewall      |    2 +-
 Shorewall/shorewall.spec |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Shorewall/install.sh b/Shorewall/install.sh
index 50eca57..9b9db95 100755
--- a/Shorewall/install.sh
+++ b/Shorewall/install.sh
@@ -944,10 +944,10 @@ chmod 755 ${DESTDIR}${SHARE}shorewall/Shorewall
 #
 cd Perl
 
-install_file compiler.pl ${DESTDIR}${SHARE}shorewall/compiler.pl 0755
+install_file compiler.pl ${DESTDIR}${LIBEXEC}shorewall/compiler.pl 0755
 
 echo
-echo "Compiler installed in ${DESTDIR}${SHARE}shorewall/compiler.pl"
+echo "Compiler installed in
${DESTDIR}${LIBEXEC}shorewall/compiler.pl"
 #
 # Install the params file helper
 #
diff --git a/Shorewall/shorewall b/Shorewall/shorewall
index 0ced9e8..ba0d9fa 100755
--- a/Shorewall/shorewall
+++ b/Shorewall/shorewall
@@ -371,7 +371,7 @@ compiler() {
 	PERL=/usr/bin/perl
     fi
 
-    $PERL $debugflags ${g_share}shorewall/compiler.pl $options $@
+    $PERL $debugflags ${g_libexec}shorewall/compiler.pl $options $@
 }
 
 #
diff --git a/Shorewall/shorewall.spec b/Shorewall/shorewall.spec
index 5b65d52..25ea402 100644
--- a/Shorewall/shorewall.spec
+++ b/Shorewall/shorewall.spec
@@ -106,7 +106,7 @@ fi
 %attr(0644,root,root) /usr/share/shorewall/configpath
 %attr(0755,root,root) /usr/libexec/shorewall/wait4ifup
 
-%attr(755,root,root) /usr/share/shorewall/compiler.pl
+%attr(755,root,root) /usr/libexec/shorewall/compiler.pl
 %attr(755,root,root) /usr/share/shorewall/getparams
 %attr(0644,root,root) /usr/share/shorewall/prog.*
 %attr(0644,root,root) /usr/share/shorewall/Shorewall/*.pm
-- 
1.7.4


------------------------------------------------------------------------------
Colocation vs. Managed Hosting
A question and answer guide to determining the best fit
for your organization - today and in the future.
http://p.sf.net/sfu/internap-sfd2d

Jonathan G. Underwood

2011-Mar-21 00:29 UTC

head link

[PATCH 04/10] Shorewall: Move getparams to LIBEXEC

---
 Shorewall/install.sh     |    6 +++---
 Shorewall/shorewall.spec |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Shorewall/install.sh b/Shorewall/install.sh
index 9b9db95..86b5a45 100755
--- a/Shorewall/install.sh
+++ b/Shorewall/install.sh
@@ -951,10 +951,10 @@ echo "Compiler installed in
${DESTDIR}${LIBEXEC}shorewall/compiler.pl"
 #
 # Install the params file helper
 #
-install_file getparams ${DESTDIR}${SHARE}shorewall/getparams 0755
+install_file getparams ${DESTDIR}${LIBEXEC}shorewall/getparams 0755
 
 echo
-echo "Params file helper installed in
${DESTDIR}${SHARE}shorewall/getparams"
+echo "Params file helper installed in
${DESTDIR}${LIBEXEC}shorewall/getparams"
 #
 # Install the libraries
 #
@@ -989,7 +989,7 @@ while ( <> ) {
    
    print $_;
 
-}'' ${DESTDIR}${SBIN}shorewall ${DESTDIR}${SHARE}shorewall/lib.base
${DESTDIR}${SHARE}shorewall/getparams
+}'' ${DESTDIR}${SBIN}shorewall ${DESTDIR}${SHARE}shorewall/lib.base
${DESTDIR}${LIBEXEC}shorewall/getparams
 
 perl -i -e "
 my \$done = 0;
diff --git a/Shorewall/shorewall.spec b/Shorewall/shorewall.spec
index 25ea402..dd8a490 100644
--- a/Shorewall/shorewall.spec
+++ b/Shorewall/shorewall.spec
@@ -107,7 +107,7 @@ fi
 %attr(0755,root,root) /usr/libexec/shorewall/wait4ifup
 
 %attr(755,root,root) /usr/libexec/shorewall/compiler.pl
-%attr(755,root,root) /usr/share/shorewall/getparams
+%attr(755,root,root) /usr/libexec/shorewall/getparams
 %attr(0644,root,root) /usr/share/shorewall/prog.*
 %attr(0644,root,root) /usr/share/shorewall/Shorewall/*.pm
 
-- 
1.7.4


------------------------------------------------------------------------------
Colocation vs. Managed Hosting
A question and answer guide to determining the best fit
for your organization - today and in the future.
http://p.sf.net/sfu/internap-sfd2d

Jonathan G. Underwood

2011-Mar-21 00:29 UTC

head link

[PATCH 05/10] Shorewall: Adjust Config.pm for moved compiler.pl

---
 Shorewall/Perl/Shorewall/Config.pm |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/Shorewall/Perl/Shorewall/Config.pm
b/Shorewall/Perl/Shorewall/Config.pm
index d537a8f..abe4631 100644
--- a/Shorewall/Perl/Shorewall/Config.pm
+++ b/Shorewall/Perl/Shorewall/Config.pm
@@ -405,6 +405,7 @@ sub initialize( $ ) {
     # Misc Globals
     #
     %globals  =   ( SHAREDIRPL => $defaults{shorewall}{share} .
''/shorewall/'' ,
+		    LIBEXECDIRPL => $defaults{shorewall}{libexec} .
''/shorewall/'' ,
 		    CONFDIR    => $defaults{shorewall}{config} .
''/shorewall'',     # Run-time configuration directory
 		    CONFIGDIR  => '''',                  # Compile-time
configuration directory (location of $product.conf)
 		    LOGPARMS   => '''',
@@ -2908,7 +2909,7 @@ sub get_params() {
     if ( -f $fn ) {
 	progress_message2 "Processing $fn ...";
 
-	my $command = "env -i PATH=$ENV{PATH} TERM=$ENV{TERM}
$globals{SHAREDIRPL}/getparams $fn " . join( '':'',
@config_path );
+	my $command = "env -i PATH=$ENV{PATH} TERM=$ENV{TERM}
$globals{LIBEXECDIRPL}/getparams $fn " . join( '':'',
@config_path );
 	#
 	# getparams silently sources the params file under ''set -a'',
then executes ''export -p''
 	#
-- 
1.7.4


------------------------------------------------------------------------------
Colocation vs. Managed Hosting
A question and answer guide to determining the best fit
for your organization - today and in the future.
http://p.sf.net/sfu/internap-sfd2d

Jonathan G. Underwood

2011-Mar-21 00:29 UTC

head link

[PATCH 06/10] Shorewall6 framework for LIBEXEC usage

---
 Shorewall6/install.sh |   25 +++++++++++++++++++++++--
 Shorewall6/lib.base   |    2 ++
 Shorewall6/shorewall6 |    1 +
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/Shorewall6/install.sh b/Shorewall6/install.sh
index 5ea1fb3..1937f41 100755
--- a/Shorewall6/install.sh
+++ b/Shorewall6/install.sh
@@ -175,12 +175,14 @@ if [ -n "$BASE" ]; then
     [ -n ${ETC:=${BASE}/etc/} ]
     [ -n ${SBIN:=${BASE}/sbin/} ]
     [ -n ${SHARE:=${BASE}/share/} ]
+    [ -n ${LIBEXEC:=${BASE}/libexec/} ]
     [ -n ${VAR:=${BASE}/var/lib/} ]
     [ -n ${MANDIR:=${BASE}/share/man} ]
 else
     [ -n ${ETC:=/etc/} ]
     [ -n ${SBIN:=/sbin/} ]
     [ -n ${SHARE:=/usr/share/} ]
+    [ -n ${LIBEXEC:=/usr/libexec/} ]
     [ -n ${VAR:=/var/lib/} ]
     [ -n ${MANDIR:=/usr/share/man} ]
 fi
@@ -233,6 +235,22 @@ case "$SHARE" in
 	;;
 esac
 
+case "$LIBEXEC" in
+    /*/)
+	;;
+    /*)
+	LIBEXEC=$LIBEXEC/
+	;;
+    *)
+	if [ -n "$BASE" ]; then
+	    LIBEXEC=$BASE/$LIBEXEC/
+	else
+	    echo "ERROR: LIBEXEC must contain an absolute path name"
>&2
+	    exit 1
+	fi
+	;;
+esac
+
 case "$VAR" in
     /*/)
 	;;
@@ -252,6 +270,7 @@ esac
 ETC=$(echo $ETC | sed "s''//''/''g")
 SBIN=$(echo $SBIN | sed "s''//''/''g")
 SHARE=$(echo $SHARE | sed "s''//''/''g")
+LIBEXEC=$(echo $LIBEXEC | sed "s''//''/''g")
 VAR=$(echo $VAR | sed "s''//''/''g")
 
 PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin:/usr/local/sbin
@@ -334,7 +353,8 @@ if [ -n "${DESTDIR}${OWNERSHIP}" ]; then
 fi
 
 #
-# Create ${ETC}shorewall, ${SHARE}shorewall and /var/lib/shorewall6 if needed
+# Create ${ETC}shorewall, ${SHARE}shorewall, ${LIBEXEC}shorewall and
+# /var/lib/shorewall6 if needed
 #
 mkdir -p ${DESTDIR}${ETC}shorewall6
 mkdir -p ${DESTDIR}${SBIN}
@@ -829,12 +849,13 @@ done
 export ETC
 export SBIN
 export SHARE
+export LIBEXEC
 export VAR
 
 perl -i -e ''
 
 while ( <> ) {
-   for my $var qw( ETC SBIN SHARE VAR ) {
+   for my $var qw( ETC SBIN SHARE LIBEXEC VAR ) {
       if ( /^$var=/ ) {
          $_ = "g_" . lc( $var ) . "=" . $ENV{$var} .
"\n";
       }
diff --git a/Shorewall6/lib.base b/Shorewall6/lib.base
index 0fefe6a..ddd2c51 100644
--- a/Shorewall6/lib.base
+++ b/Shorewall6/lib.base
@@ -35,6 +35,7 @@
 ETC=/etc/
 SBIN=/sbin/
 SHARE=/usr/share/
+LIBEXEC=/usr/libexec/
 VAR=/var/lib/
 
 SHOREWALL_LIBVERSION=40407
@@ -44,6 +45,7 @@ SHOREWALL_CAPVERSION=40417
 [ -n "${SHAREDIR:=${g_share}shorewall6}" ]
 [ -n "${CONFDIR:=${g_etc}shorewall6}" ]
 [ -n "${PERLSHAREDIR:=${g_share}shorewall}" ]
+[ -n "${PERLLIBEXECDIR:=${g_libexec}shorewall}" ]
 
 #
 # Conditionally produce message
diff --git a/Shorewall6/shorewall6 b/Shorewall6/shorewall6
index c690f49..9e0db32 100755
--- a/Shorewall6/shorewall6
+++ b/Shorewall6/shorewall6
@@ -31,6 +31,7 @@
 ETC=/etc/
 SBIN=/sbin/
 SHARE=/usr/share/
+LIBEXEC=/usr/libexec
 VAR=/var/lib/
 #
 # Set the configuration variables from shorewall6.conf
-- 
1.7.4


------------------------------------------------------------------------------
Colocation vs. Managed Hosting
A question and answer guide to determining the best fit
for your organization - today and in the future.
http://p.sf.net/sfu/internap-sfd2d

Jonathan G. Underwood

2011-Mar-21 00:29 UTC

head link

[PATCH 07/10] Shorewall6: move wait4ifup to LIBEXEC

---
 Shorewall6/default.debian |    2 +-
 Shorewall6/init.debian.sh |    2 +-
 Shorewall6/install.sh     |    4 ++--
 Shorewall6/wait4ifup      |    2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Shorewall6/default.debian b/Shorewall6/default.debian
index 6acaa43..e186c7d 100644
--- a/Shorewall6/default.debian
+++ b/Shorewall6/default.debian
@@ -42,5 +42,5 @@ SRWL=/sbin/shorewall6
 # Name of the wait4ifup script Change this if you use the installer to install
in
 # another location
 #
-WAIT_FOR_IFUP=/usr/share/shorewall6/wait4ifup
+WAIT_FOR_IFUP=/usr/libexec/shorewall6/wait4ifup
 # EOF
diff --git a/Shorewall6/init.debian.sh b/Shorewall6/init.debian.sh
index c3c70c1..cfb9424 100755
--- a/Shorewall6/init.debian.sh
+++ b/Shorewall6/init.debian.sh
@@ -14,7 +14,7 @@
 
 SRWL=/sbin/shorewall6
 SRWL_OPTS="-tvv"
-WAIT_FOR_IFUP=/usr/share/shorewall6/wait4ifup
+WAIT_FOR_IFUP=/usr/libexec/shorewall6/wait4ifup
 INITLOG=/var/log/shorewall-init.log
 
 if [ "$(id -u)" != "0" ]
diff --git a/Shorewall6/install.sh b/Shorewall6/install.sh
index 1937f41..f35d4b9 100755
--- a/Shorewall6/install.sh
+++ b/Shorewall6/install.sh
@@ -440,10 +440,10 @@ delete_file ${DESTDIR}${SHARE}shorewall6/prog.footer6
 # Install wait4ifup
 #
 
-install_file wait4ifup ${DESTDIR}${SHARE}shorewall6/wait4ifup 0755
+install_file wait4ifup ${DESTDIR}${LIBEXEC}shorewall6/wait4ifup 0755
 
 echo
-echo "wait4ifup installed in ${DESTDIR}${SHARE}shorewall6/wait4ifup"
+echo "wait4ifup installed in
${DESTDIR}${LIBEXEC}shorewall6/wait4ifup"
 
 #
 # Install the policy file
diff --git a/Shorewall6/wait4ifup b/Shorewall6/wait4ifup
index 60e1796..2a38350 100755
--- a/Shorewall6/wait4ifup
+++ b/Shorewall6/wait4ifup
@@ -6,7 +6,7 @@
 #
 #     (c) 2007 - Tom Eastep (teastep@shorewall.net)
 #
-#	This file is installed in /usr/share/shorewall/wait4ifup
+#	This file is installed in /usr/libexec/shorewall/wait4ifup
 #
 #	Shorewall documentation is available at http://www.shorewall.net
 #
-- 
1.7.4


------------------------------------------------------------------------------
Colocation vs. Managed Hosting
A question and answer guide to determining the best fit
for your organization - today and in the future.
http://p.sf.net/sfu/internap-sfd2d

Jonathan G. Underwood

2011-Mar-21 00:29 UTC

head link

[PATCH 08/10] Shorewall6: move compiler.pl to LIBEXEC

---
 Shorewall6/install.sh |    2 +-
 Shorewall6/shorewall6 |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Shorewall6/install.sh b/Shorewall6/install.sh
index f35d4b9..a677640 100755
--- a/Shorewall6/install.sh
+++ b/Shorewall6/install.sh
@@ -291,7 +291,7 @@ if [ -n "$DESTDIR" -o -z "$OWNERSHIP" ];
then
     CYGWIN     MAC else
-    [ -x ${SHARE}shorewall/compiler.pl ] || \
+    [ -x ${LIBEXEC}shorewall/compiler.pl ] || \
 	{ echo "   ERROR: Shorewall >= 4.3.5 is not installed"
>&2; exit 1; }
     if [ -n "$CYGWIN" ]; then
 	echo "Installing Cygwin-specific configuration..."
diff --git a/Shorewall6/shorewall6 b/Shorewall6/shorewall6
index 9e0db32..e8c8968 100755
--- a/Shorewall6/shorewall6
+++ b/Shorewall6/shorewall6
@@ -246,7 +246,7 @@ startup_error() {
 # Run the appropriate compiler
 #
 compiler() {
-    pc=${PERLSHAREDIR}/compiler.pl
+    pc=${PERLLIBEXECDIR}/compiler.pl
 
     local command
     command=$1
-- 
1.7.4


------------------------------------------------------------------------------
Colocation vs. Managed Hosting
A question and answer guide to determining the best fit
for your organization - today and in the future.
http://p.sf.net/sfu/internap-sfd2d

Jonathan G. Underwood

2011-Mar-21 00:29 UTC

head link

[PATCH 09/10] Shorewall-lite: move wait4ifup to LIBEXEC

---
 Shorewall-lite/install.sh          |    2 +-
 Shorewall-lite/shorewall-lite.spec |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Shorewall-lite/install.sh b/Shorewall-lite/install.sh
index a52345c..6a48ed6 100755
--- a/Shorewall-lite/install.sh
+++ b/Shorewall-lite/install.sh
@@ -296,7 +296,7 @@ echo "Capability file builder installed in
${DESTDIR}/usr/share/shorewall-lite/s
 #
 
 if [ -f wait4ifup ]; then
-    install_file wait4ifup ${DESTDIR}/usr/share/shorewall-lite/wait4ifup 0755
+    install_file wait4ifup ${DESTDIR}/usr/libexec/shorewall-lite/wait4ifup 0755
 
     echo
     echo "wait4ifup installed in
${DESTDIR}/usr/share/shorewall-lite/wait4ifup"
diff --git a/Shorewall-lite/shorewall-lite.spec
b/Shorewall-lite/shorewall-lite.spec
index e637b97..72af6c1 100644
--- a/Shorewall-lite/shorewall-lite.spec
+++ b/Shorewall-lite/shorewall-lite.spec
@@ -102,7 +102,7 @@ fi
 %attr(0644,root,root) /usr/share/shorewall-lite/lib.common
 %attr(0644,root,root) /usr/share/shorewall-lite/modules*
 %attr(0544,root,root) /usr/share/shorewall-lite/shorecap
-%attr(0755,root,root) /usr/share/shorewall-lite/wait4ifup
+%attr(0755,root,root) /usr/libexec/shorewall-lite/wait4ifup
 
 %attr(0644,root,root) %{_mandir}/man5/shorewall-lite.conf.5.gz
 %attr(0644,root,root) %{_mandir}/man5/shorewall-lite-vardir.5.gz
-- 
1.7.4


------------------------------------------------------------------------------
Colocation vs. Managed Hosting
A question and answer guide to determining the best fit
for your organization - today and in the future.
http://p.sf.net/sfu/internap-sfd2d

Jonathan G. Underwood

2011-Mar-21 00:29 UTC

head link

[PATCH 10/10] Shorewall6-lite: move wait4ifup to LIBEXEC

---
 Shorewall6-lite/install.sh           |    2 +-
 Shorewall6-lite/shorewall6-lite.spec |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Shorewall6-lite/install.sh b/Shorewall6-lite/install.sh
index e4225bb..90956ea 100755
--- a/Shorewall6-lite/install.sh
+++ b/Shorewall6-lite/install.sh
@@ -294,7 +294,7 @@ echo "Capability file builder installed in
${DESTDIR}/usr/share/shorewall6-lite/
 #
 
 if [ -f wait4ifup ]; then
-    install_file wait4ifup ${DESTDIR}/usr/share/shorewall6-lite/wait4ifup 0755
+    install_file wait4ifup ${DESTDIR}/usr/libexec/shorewall6-lite/wait4ifup
0755
 
     echo
     echo "wait4ifup installed in
${DESTDIR}/usr/share/shorewall6-lite/wait4ifup"
diff --git a/Shorewall6-lite/shorewall6-lite.spec
b/Shorewall6-lite/shorewall6-lite.spec
index dea2349..8386be6 100644
--- a/Shorewall6-lite/shorewall6-lite.spec
+++ b/Shorewall6-lite/shorewall6-lite.spec
@@ -93,7 +93,7 @@ fi
 %attr(0644,root,root) /usr/share/shorewall6-lite/lib.common
 %attr(0644,root,root) /usr/share/shorewall6-lite/modules*
 %attr(0544,root,root) /usr/share/shorewall6-lite/shorecap
-%attr(0755,root,root) /usr/share/shorewall6-lite/wait4ifup
+%attr(0755,root,root) /usr/libexec/shorewall6-lite/wait4ifup
 
 %attr(0644,root,root) %{_mandir}/man5/shorewall6-lite.conf.5.gz
 %attr(0644,root,root) %{_mandir}/man5/shorewall6-lite-vardir.5.gz
-- 
1.7.4


------------------------------------------------------------------------------
Colocation vs. Managed Hosting
A question and answer guide to determining the best fit
for your organization - today and in the future.
http://p.sf.net/sfu/internap-sfd2d

Shorewall devel - Mar 2011 - Patches to move files to libexec directory

Patches to move files to libexec directory

[PATCH 01/10] Shorewall: Add framework for LIBEXEC directory usage

[PATCH 02/10] Shorewall: Move wait4ifup to LIBEXEC

[PATCH 03/10] Shorewall: Move compiler.pl to LIBEXEC

[PATCH 04/10] Shorewall: Move getparams to LIBEXEC

[PATCH 05/10] Shorewall: Adjust Config.pm for moved compiler.pl

[PATCH 06/10] Shorewall6 framework for LIBEXEC usage

[PATCH 07/10] Shorewall6: move wait4ifup to LIBEXEC

[PATCH 08/10] Shorewall6: move compiler.pl to LIBEXEC

[PATCH 09/10] Shorewall-lite: move wait4ifup to LIBEXEC

[PATCH 10/10] Shorewall6-lite: move wait4ifup to LIBEXEC