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, next has been updated via 2650b1d285a3cb60808a4fbf386f7c65b2dfa29f (commit) via 2e11506109fe3e04e25c2013856fbd6557c3d641 (commit) from ee7caa4bed3cbc5d6e296732bcba09bedd53d2f9 (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 2650b1d285a3cb60808a4fbf386f7c65b2dfa29f Merge: 2e11506 ee7caa4 Author: Arne Fitzenreiter Arne_F@ipfire.org Date: Wed Jul 3 18:38:16 2013 +0200

Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

commit 2e11506109fe3e04e25c2013856fbd6557c3d641 Author: Arne Fitzenreiter Arne_F@ipfire.org Date: Wed Jul 3 10:31:53 2013 +0200

igmpproxy: add igmpproxy.conf backup include.

fixes #10375.

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

Summary of changes: config/backup/includes/igmpproxy | 1 + config/rootfiles/packages/igmpproxy | 1 + lfs/igmpproxy | 6 ++++-- src/paks/{default => igmpproxy}/install.sh | 0 src/paks/{mediatomb => igmpproxy}/uninstall.sh | 1 + src/paks/{apcupsd => igmpproxy}/update.sh | 0 6 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 config/backup/includes/igmpproxy copy src/paks/{default => igmpproxy}/install.sh (100%) copy src/paks/{mediatomb => igmpproxy}/uninstall.sh (98%) copy src/paks/{apcupsd => igmpproxy}/update.sh (100%)

Difference in files: diff --git a/config/backup/includes/igmpproxy b/config/backup/includes/igmpproxy new file mode 100644 index 0000000..dc47ad3 --- /dev/null +++ b/config/backup/includes/igmpproxy @@ -0,0 +1 @@ +/etc/igmpproxy.conf diff --git a/config/rootfiles/packages/igmpproxy b/config/rootfiles/packages/igmpproxy index 439c21f..1b34521 100644 --- a/config/rootfiles/packages/igmpproxy +++ b/config/rootfiles/packages/igmpproxy @@ -2,3 +2,4 @@ etc/igmpproxy.conf usr/local/sbin/igmpproxy #usr/local/share/man/man5/igmpproxy.conf.5 #usr/local/share/man/man8/igmpproxy.8 +var/ipfire/backup/addons/includes/igmpproxy diff --git a/lfs/igmpproxy b/lfs/igmpproxy index 3e5fca9..fb1426f 100644 --- a/lfs/igmpproxy +++ b/lfs/igmpproxy @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2013 IPFire Team info@ipfire.org # # # # 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 # @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = igmpproxy -PAK_VER = 3 +PAK_VER = 4

DEPS = ""

@@ -86,5 +86,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && ./configure --sysconfdir=/etc cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install + install -v -m 644 $(DIR_SRC)/config/backup/includes/igmpproxy \ + /var/ipfire/backup/addons/includes/igmpproxy @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/src/paks/igmpproxy/install.sh b/src/paks/igmpproxy/install.sh new file mode 100644 index 0000000..31c5fec --- /dev/null +++ b/src/paks/igmpproxy/install.sh @@ -0,0 +1,27 @@ +#!/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} +start_service --background ${NAME} diff --git a/src/paks/igmpproxy/uninstall.sh b/src/paks/igmpproxy/uninstall.sh new file mode 100644 index 0000000..eb6ff5f --- /dev/null +++ b/src/paks/igmpproxy/uninstall.sh @@ -0,0 +1,28 @@ +#!/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} +extract_backup_includes +make_backup ${NAME} +remove_files diff --git a/src/paks/igmpproxy/update.sh b/src/paks/igmpproxy/update.sh new file mode 100644 index 0000000..89c40d0 --- /dev/null +++ b/src/paks/igmpproxy/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