This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".

The branch, master has been updated via 279966278b82e1a7d0cb4977b637b7cc77b67cc9 (commit) from 9b16f05642a483ff6eddace27c07e7c75834c8c8 (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit 279966278b82e1a7d0cb4977b637b7cc77b67cc9 Author: Dirk Wagner glotzi@ipfire.org Date: Tue Apr 6 16:19:48 2010 +0200

First version of pound addon

-----------------------------------------------------------------------

Summary of changes: config/backup/includes/pound | 1 + config/rootfiles/packages/pound | 7 +++ lfs/{watchdog => pound} | 16 +++--- src/initscripts/init.d/pound | 58 ++++++++++++++++++++ src/paks/{default => pound}/install.sh | 5 ++ src/paks/{default/install.sh => pound/install.sh~} | 5 ++ src/paks/{nut => pound}/uninstall.sh | 2 +- src/paks/{apcupsd => pound}/update.sh | 0 8 files changed, 85 insertions(+), 9 deletions(-) create mode 100644 config/backup/includes/pound create mode 100644 config/rootfiles/packages/pound copy lfs/{watchdog => pound} (90%) create mode 100644 src/initscripts/init.d/pound copy src/paks/{default => pound}/install.sh (92%) copy src/paks/{default/install.sh => pound/install.sh~} (92%) copy src/paks/{nut => pound}/uninstall.sh (98%) copy src/paks/{apcupsd => pound}/update.sh (100%)

Difference in files: diff --git a/config/backup/includes/pound b/config/backup/includes/pound new file mode 100644 index 0000000..a1ec94b --- /dev/null +++ b/config/backup/includes/pound @@ -0,0 +1 @@ +/etc/pound.cfg diff --git a/config/rootfiles/packages/pound b/config/rootfiles/packages/pound new file mode 100644 index 0000000..59b7677 --- /dev/null +++ b/config/rootfiles/packages/pound @@ -0,0 +1,7 @@ +#etc/pound.cfg +usr/sbin/pound +usr/sbin/poundctl +#usr/share/man/man8/pound.8 +#usr/share/man/man8/poundctl.8 +var/ipfire/backup/addons/includes/pound +etc/rc.d/init.d/pound \ No newline at end of file diff --git a/lfs/pound b/lfs/pound new file mode 100644 index 0000000..39ef2cd --- /dev/null +++ b/lfs/pound @@ -0,0 +1,86 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2009 Michael Tremer & Christian Schmidt # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see http://www.gnu.org/licenses/. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 2.5 + +THISAPP = Pound-$(VER) +DL_FILE = $(THISAPP).tgz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = pound +PAK_VER = 2 + +DEPS = "" + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 8a39f5902094619afcda7d12d9d8342c + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist: + @$(PAK) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc --enable-cert1l + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + install -v -m 644 $(DIR_SRC)/config/backup/includes/pound \ + /var/ipfire/backup/addons/includes/pound + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/src/initscripts/init.d/pound b/src/initscripts/init.d/pound new file mode 100644 index 0000000..185ad61 --- /dev/null +++ b/src/initscripts/init.d/pound @@ -0,0 +1,58 @@ +#!/bin/sh + +. /etc/sysconfig/rc +. ${rc_functions} + +PATH=/bin:/usr/bin:/sbin:/usr/sbin + +test -x /usr/sbin/pound || exit 0 + +# For configuration of the init script use the file +# /etc/sysconfig/pound, do not edit this init script. + +# Set run_pound to 1 to start pound or 0 to disable it. +run_pound=0 + +# Specify additional pound options here (see manpage). +pound_options="" + +# Specify module to load +pound_module="none" + +[ -e /etc/sysconfig/pound ] && . /etc/sysconfig/pound + +DAEMON=/usr/sbin/pound + +case "${1}" in + start) + boot_mesg "Starting pound ..." + if [ $run_pound = 1 ] + then + # do we have to load a module? + [ ${pound_module:-none} != "none" ] && /sbin/modprobe $pound_module + + loadproc $DAEMON $pound_options + fi + ;; + + stop) + boot_mesg "Stopping pound ..." + killproc $DAEMON + ;; + + restart) + ${0} stop + sleep 1 + ${0} start + ;; + + status) + statusproc $DAEMON + ;; + + *) + echo "Usage: ${0} {start|stop|restart|status}" + exit 1 + ;; +esac + diff --git a/src/paks/pound/install.sh b/src/paks/pound/install.sh new file mode 100644 index 0000000..c1748b0 --- /dev/null +++ b/src/paks/pound/install.sh @@ -0,0 +1,32 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team info@ipfire.org. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +extract_files +restore_backup ${NAME} + +ln -svf ../init.d/pound /etc/rc.d/rc0.d/K20pound +ln -svf ../init.d/pound /etc/rc.d/rc3.d/S40pound +ln -svf ../init.d/pound /etc/rc.d/rc6.d/K20pound + +start_service --background ${NAME} diff --git a/src/paks/pound/install.sh~ b/src/paks/pound/install.sh~ new file mode 100644 index 0000000..f8f5b55 --- /dev/null +++ b/src/paks/pound/install.sh~ @@ -0,0 +1,32 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team info@ipfire.org. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +extract_files +restore_backup ${NAME} + +ln -svf ../init.d/pound /etc/rc.d/rc0.d/K20watchdog +ln -svf ../init.d/pound /etc/rc.d/rc3.d/S40pound +ln -svf ../init.d/pound /etc/rc.d/rc6.d/K20watchdog + +start_service --background ${NAME} diff --git a/src/paks/pound/uninstall.sh b/src/paks/pound/uninstall.sh new file mode 100644 index 0000000..aa2c63b --- /dev/null +++ b/src/paks/pound/uninstall.sh @@ -0,0 +1,29 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team info@ipfire.org. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +stop_service ${NAME} +make_backup ${NAME} +remove_files + +rm -rf /etc/rc.d/rc*.d/*pound diff --git a/src/paks/pound/update.sh b/src/paks/pound/update.sh new file mode 100644 index 0000000..89c40d0 --- /dev/null +++ b/src/paks/pound/update.sh @@ -0,0 +1,26 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team info@ipfire.org. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +./uninstall.sh +./install.sh

hooks/post-receive -- IPFire 2.x development tree