Hi,
sorry, "shorewall6-Add-Gentoo-support.patch" was the wrong version.
"shorewall6-Add-Gentoo-support-r1.patch" attached.
-Thomas
--- install.sh.old 2013-09-09 19:30:05.155138074 +0200
+++ install.sh 2013-09-09 19:30:38.302377733 +0200
@@ -204,46 +204,52 @@
[ -n "${INITFILE}" ] && require INITSOURCE && require INITDIR
if [ -z "$BUILD" ]; then
- case $(uname) in
- cygwin*)
- BUILD=cygwin
- ;;
- Darwin)
- BUILD=apple
- ;;
- *)
- if [ -f /etc/os-release ]; then
- eval $(cat /etc/os-release | grep ^ID)
-
- case $ID in
- fedora)
- BUILD=redhat
- ;;
- debian)
- BUILD=debian
+ case $(uname) in
+ cygwin*)
+ BUILD=cygwin
;;
- opensuse)
- BUILD=suse
+ Darwin)
+ BUILD=apple
;;
- *)
- BUILD="$ID"
+ *)
+ if [ -f /etc/os-release ]; then
+ eval $(cat /etc/os-release | grep ^ID)
+
+ case $ID in
+ debian)
+ BUILD=debian
+ ;;
+ fedora)
+ BUILD=redhat
+ ;;
+ gentoo)
+ BUILD=gentoo
+ ;;
+ opensuse)
+ BUILD=suse
+ ;;
+ *)
+ BUILD="$ID"
+ ;;
+ esac
+
+ elif [ -f /etc/arch-release ]; then
+ BUILD=archlinux
+ elif [ -f /etc/debian_version ]; then
+ BUILD=debian
+ elif [ -f /etc/gentoo-release ]; then
+ BUILD=gentoo
+ elif [ -f /etc/redhat-release ]; then
+ BUILD=redhat
+ elif [ -f /etc/slackware-version ]; then
+ BUILD=slackware
+ elif [ -f /etc/SuSE-release ]; then
+ BUILD=suse
+ else
+ BUILD=linux
+ fi
;;
- esac
- elif [ -f /etc/debian_version ]; then
- BUILD=debian
- elif [ -f /etc/redhat-release ]; then
- BUILD=redhat
- elif [ -f /etc/slackware-version ] ; then
- BUILD=slackware
- elif [ -f /etc/SuSE-release ]; then
- BUILD=suse
- elif [ -f /etc/arch-release ] ; then
- BUILD=archlinux
- else
- BUILD=linux
- fi
- ;;
- esac
+ esac
fi
case $BUILD in
@@ -266,33 +272,36 @@
OWNERSHIP="-o $OWNER -g $GROUP"
case "$HOST" in
- cygwin)
- echo "Installing Cygwin-specific configuration..."
- ;;
- apple)
- echo "Installing Mac-specific configuration...";
- ;;
- debian)
- echo "Installing Debian-specific configuration..."
- ;;
- redhat)
- echo "Installing Redhat/Fedora-specific configuration..."
- ;;
- suse)
- echo "Installing SuSE-specific configuration...";
- ;;
- slackware)
- echo "Installing Slackware-specific configuration..."
- ;;
- archlinux)
- echo "Installing ArchLinux-specific configuration..."
- ;;
- linux)
- ;;
- *)
- echo "ERROR: Unknown HOST \"$HOST\"" >&2
- exit 1;
- ;;
+ apple)
+ echo "Installing Mac-specific configuration...";
+ ;;
+ archlinux)
+ echo "Installing ArchLinux-specific configuration..."
+ ;;
+ cygwin)
+ echo "Installing Cygwin-specific configuration..."
+ ;;
+ debian)
+ echo "Installing Debian-specific configuration..."
+ ;;
+ gentoo)
+ echo "Installing Gentoo-specific configuration..."
+ ;;
+ redhat)
+ echo "Installing Redhat/Fedora-specific configuration..."
+ ;;
+ slackware)
+ echo "Installing Slackware-specific configuration..."
+ ;;
+ suse)
+ echo "Installing SuSE-specific configuration...";
+ ;;
+ linux)
+ ;;
+ *)
+ echo "ERROR: Unknown HOST \"$HOST\"" >&2
+ exit 1;
+ ;;
esac
if [ $PRODUCT = shorewall ]; then
@@ -485,23 +494,26 @@
run_install $OWNERSHIP -m 0644 $PRODUCT.conf.annotated
${DESTDIR}${SHAREDIR}/$PRODUCT/configfiles/
if [ ! -f ${DESTDIR}${CONFDIR}/$PRODUCT/$PRODUCT.conf ]; then
- run_install $OWNERSHIP -m 0644 ${PRODUCT}.conf${suffix}
${DESTDIR}${CONFDIR}/$PRODUCT/$PRODUCT.conf
-
- if [ "$SHAREDIR" != /usr/share -o "$CONFDIR" != /etc ]; then
- if [ $PRODUCT = shorewall ]; then
- perl -p -w -i -e
"s|^CONFIG_PATH=.*|CONFIG_PATH=${CONFDIR}/shorewall:${SHAREDIR}/shorewall|;"
${DESTDIR}${CONFDIR}/$PRODUCT/$PRODUCT.conf
- else
- perl -p -w -i -e
"s|^CONFIG_PATH=.*|CONFIG_PATH=${CONFDIR}/shorewall:${SHAREDIR}/shorewall6:${SHAREDIR}/shorewall|;"
${DESTDIR}${CONFDIR}/$PRODUCT/$PRODUCT.conf
+ run_install $OWNERSHIP -m 0644 ${PRODUCT}.conf${suffix}
${DESTDIR}${CONFDIR}/$PRODUCT/$PRODUCT.conf
+
+ if [ "$SHAREDIR" != /usr/share -o "$CONFDIR" != /etc ]; then
+ if [ $PRODUCT = shorewall ]; then
+ perl -p -w -i -e
"s|^CONFIG_PATH=.*|CONFIG_PATH=${CONFDIR}/shorewall:${SHAREDIR}/shorewall|;"
${DESTDIR}${CONFDIR}/$PRODUCT/$PRODUCT.conf
+ else
+ perl -p -w -i -e
"s|^CONFIG_PATH=.*|CONFIG_PATH=${CONFDIR}/shorewall:${SHAREDIR}/shorewall6:${SHAREDIR}/shorewall|;"
${DESTDIR}${CONFDIR}/$PRODUCT/$PRODUCT.conf
+ fi
fi
- fi
-
- if [ $HOST = archlinux ] ; then
- sed -e 's!LOGFILE=/var/log/messages!LOGFILE=/var/log/messages.log!' -i
${DESTDIR}${CONFDIR}/$PRODUCT/$PRODUCT.conf
- elif [ $HOST = debian ]; then
- perl -p -w -i -e 's|^STARTUP_ENABLED=.*|STARTUP_ENABLED=Yes|;'
${DESTDIR}${CONFDIR}/$PRODUCT/$PRODUCT.conf${suffix}
- fi
-
- echo "Config file installed as ${DESTDIR}${CONFDIR}/$PRODUCT/$PRODUCT.conf"
+
+ if [ $HOST = archlinux ]; then
+ sed -e
's!LOGFILE=/var/log/messages!LOGFILE=/var/log/messages.log!' -i
${DESTDIR}${CONFDIR}/$PRODUCT/$PRODUCT.conf
+ elif [ $HOST = debian ]; then
+ perl -p -w -i -e 's|^STARTUP_ENABLED=.*|STARTUP_ENABLED=Yes|;'
${DESTDIR}${CONFDIR}/$PRODUCT/$PRODUCT.conf${suffix}
+ elif [ $HOST = gentoo ]; then
+ # Adjust SUBSYSLOCK path (see
https://bugs.gentoo.org/show_bug.cgi?id=459316)
+ perl -p -w -i -e
"s|^SUBSYSLOCK=.*|SUBSYSLOCK=/run/lock/$PRODUCT|;"
${DESTDIR}${CONFDIR}/$PRODUCT/$PRODUCT.conf${suffix}
+ fi
+
+ echo "Config file installed as
${DESTDIR}${CONFDIR}/$PRODUCT/$PRODUCT.conf"
fi
#
------------------------------------------------------------------------------
Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more!
Discover the easy way to master current and previous Microsoft technologies
and advance your career. Get an incredible 1,500+ hours of step-by-step
tutorial videos with LearnDevNow. Subscribe today and save!
http://pubads.g.doubleclick.net/gampad/clk?id=58041391&iu=/4140/ostg.clktrk
_______________________________________________
Shorewall-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/shorewall-devel
