IPFire-SCM July 2010

ipfire-scm@lists.ipfire.org

1 participants
63 discussions

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. b7dc950e0b0fa28d697f1822dc3f6475c57def75
by git＠ipfire.org 13 Jul '10

13 Jul '10

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 b7dc950e0b0fa28d697f1822dc3f6475c57def75 (commit) via 02afbd47f474c7252d419087046ef2c1beec901b (commit) via ea5ac96bbff710208f860479902153fa3e6c655a (commit) from 1d7162c1bd7761047db575467a23cc93395b7f17 (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 b7dc950e0b0fa28d697f1822dc3f6475c57def75 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Jul 13 18:46:24 2010 +0200 Bump nfs package version. commit 02afbd47f474c7252d419087046ef2c1beec901b Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Jul 10 21:10:14 2010 +0200 nfs: Update to 1.2.2. Supports NFSv4. commit ea5ac96bbff710208f860479902153fa3e6c655a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Jul 10 21:09:54 2010 +0200 libevent: New package. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/libevent | 24 ++++++++++++++++++++++++ lfs/{bridge-utils => libevent} | 6 +++--- lfs/nfs | 32 ++++++++++++++++++++++++-------- make.sh | 1 + 4 files changed, 52 insertions(+), 11 deletions(-) create mode 100644 config/rootfiles/common/libevent copy lfs/{bridge-utils => libevent} (97%) Difference in files: diff --git a/config/rootfiles/common/libevent b/config/rootfiles/common/libevent new file mode 100644 index 0000000..77bbade --- /dev/null +++ b/config/rootfiles/common/libevent @@ -0,0 +1,24 @@ +#usr/bin/event_rpcgen.py +#usr/include/evdns.h +#usr/include/event-config.h +#usr/include/event.h +#usr/include/evhttp.h +#usr/include/evrpc.h +#usr/include/evutil.h +usr/lib/libevent-1.4.so.2 +usr/lib/libevent-1.4.so.2.2.0 +#usr/lib/libevent.a +#usr/lib/libevent.la +#usr/lib/libevent.so +usr/lib/libevent_core-1.4.so.2 +usr/lib/libevent_core-1.4.so.2.2.0 +#usr/lib/libevent_core.a +#usr/lib/libevent_core.la +#usr/lib/libevent_core.so +usr/lib/libevent_extra-1.4.so.2 +usr/lib/libevent_extra-1.4.so.2.2.0 +#usr/lib/libevent_extra.a +#usr/lib/libevent_extra.la +#usr/lib/libevent_extra.so +#usr/share/man/man3/evdns.3 +#usr/share/man/man3/event.3 diff --git a/lfs/libevent b/lfs/libevent new file mode 100644 index 0000000..507a64e --- /dev/null +++ b/lfs/libevent @@ -0,0 +1,77 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007 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 = 1.4.14b-stable + +THISAPP = libevent-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = a00e037e4d3f9e4fe9893e8a2d27918c + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +############################################################################### +# 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 + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/nfs b/lfs/nfs index e5658e5..d7d2166 100644 --- a/lfs/nfs +++ b/lfs/nfs @@ -24,27 +24,32 @@ include Config -VER = 1.1.1 +VER = 1.2.2 THISAPP = nfs-utils-$(VER) -DL_FILE = $(THISAPP).tar.gz +DL_FILE = $(THISAPP).tar.bz2 DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = nfs -PAK_VER = 3 +PAK_VER = 4 DEPS = "portmap" +LIBNFSIDMAP = 0.23 + ############################################################################### # Top-level Rules ############################################################################### -objects = $(DL_FILE) +objects = $(DL_FILE) \ + libnfsidmap-$(LIBNFSIDMAP).tar.gz $(DL_FILE) = $(DL_FROM)/$(DL_FILE) +libnfsidmap-$(LIBNFSIDMAP).tar.gz = $(DL_FROM)/libnfsidmap-$(LIBNFSIDMAP).tar.gz -$(DL_FILE)_MD5 = 407785488241f9db67b1874e3f36370e +$(DL_FILE)_MD5 = dad92f64db3266c7757f71bb53ee8f35 +libnfsidmap-$(LIBNFSIDMAP).tar.gz_MD5 = 28f3ece648c1dc5d25e8d623d55f8bd6 install : $(TARGET) @@ -76,9 +81,20 @@ $(subst %,%_MD5,$(objects)) : $(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 \ - --disable-nfsv4 --disable-gss + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && tar zxf $(DIR_DL)/libnfsidmap-$(LIBNFSIDMAP).tar.gz + cd $(DIR_APP)/libnfsidmap* && ./configure --prefix=/usr + cd $(DIR_APP)/libnfsidmap* && make $(MAKETUNING) $(EXTRA_MAKE) + cd $(DIR_APP)/libnfsidmap* && make install + + cd $(DIR_APP) && ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --disable-gss \ + --disable-tirpc \ + --without-tcp-wrappers + cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) diff --git a/make.sh b/make.sh index e0cf399..7834e5a 100755 --- a/make.sh +++ b/make.sh @@ -544,6 +544,7 @@ buildipfire() { ipfiremake ipfireseeder ipfiremake rsync ipfiremake tcpwrapper + ipfiremake libevent ipfiremake portmap ipfiremake nfs ipfiremake nmap hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 1d7162c1bd7761047db575467a23cc93395b7f17
by git＠ipfire.org 13 Jul '10

13 Jul '10

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 1d7162c1bd7761047db575467a23cc93395b7f17 (commit) via 37758f5554df9bfdc0ee037fdf5508b6437fe015 (commit) via a408304c86c6d41bffbd7187e65dd31c64f6c06d (commit) from 30736cd3fc24cae4487a0cdb39f2763538900ae9 (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 1d7162c1bd7761047db575467a23cc93395b7f17 Merge: 37758f5554df9bfdc0ee037fdf5508b6437fe015 30736cd3fc24cae4487a0cdb39f2763538900ae9 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Jul 13 18:24:52 2010 +0200 Merge branch 'master' of ssh://arne_f@ipfire.org/pub/git/ipfire-2.x commit 37758f5554df9bfdc0ee037fdf5508b6437fe015 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Jul 13 18:23:53 2010 +0200 Add missing screen terminfo file to run mc in screen. commit a408304c86c6d41bffbd7187e65dd31c64f6c06d Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Jul 13 18:19:09 2010 +0200 Updated mc (4.7.3). ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/ncurses | 22 +++--- config/rootfiles/core/39/filelists/terminfo-screen | 11 +++ config/rootfiles/packages/mc | 90 ++++++++++++-------- lfs/mc | 13 +-- 4 files changed, 81 insertions(+), 55 deletions(-) create mode 100644 config/rootfiles/core/39/filelists/terminfo-screen Difference in files: diff --git a/config/rootfiles/common/ncurses b/config/rootfiles/common/ncurses index afe6e39..953afad 100644 --- a/config/rootfiles/common/ncurses +++ b/config/rootfiles/common/ncurses @@ -2464,17 +2464,17 @@ usr/share/terminfo/l/linux-vt #usr/share/terminfo/s/scoansi #usr/share/terminfo/s/scoansi-new #usr/share/terminfo/s/scoansi-old -#usr/share/terminfo/s/screen -#usr/share/terminfo/s/screen-bce -#usr/share/terminfo/s/screen-s -#usr/share/terminfo/s/screen-w -#usr/share/terminfo/s/screen.linux -#usr/share/terminfo/s/screen.teraterm -#usr/share/terminfo/s/screen.xterm-new -#usr/share/terminfo/s/screen.xterm-r6 -#usr/share/terminfo/s/screen.xterm-xfree86 -#usr/share/terminfo/s/screen2 -#usr/share/terminfo/s/screen3 +usr/share/terminfo/s/screen +usr/share/terminfo/s/screen-bce +usr/share/terminfo/s/screen-s +usr/share/terminfo/s/screen-w +usr/share/terminfo/s/screen.linux +usr/share/terminfo/s/screen.teraterm +usr/share/terminfo/s/screen.xterm-new +usr/share/terminfo/s/screen.xterm-r6 +usr/share/terminfo/s/screen.xterm-xfree86 +usr/share/terminfo/s/screen2 +usr/share/terminfo/s/screen3 #usr/share/terminfo/s/screwpoint #usr/share/terminfo/s/scrhp #usr/share/terminfo/s/sibo diff --git a/config/rootfiles/core/39/filelists/terminfo-screen b/config/rootfiles/core/39/filelists/terminfo-screen new file mode 100644 index 0000000..98962f5 --- /dev/null +++ b/config/rootfiles/core/39/filelists/terminfo-screen @@ -0,0 +1,11 @@ +usr/share/terminfo/s/screen +usr/share/terminfo/s/screen-bce +usr/share/terminfo/s/screen-s +usr/share/terminfo/s/screen-w +usr/share/terminfo/s/screen.linux +usr/share/terminfo/s/screen.teraterm +usr/share/terminfo/s/screen.xterm-new +usr/share/terminfo/s/screen.xterm-r6 +usr/share/terminfo/s/screen.xterm-xfree86 +usr/share/terminfo/s/screen2 +usr/share/terminfo/s/screen3 diff --git a/config/rootfiles/packages/mc b/config/rootfiles/packages/mc index eec66d3..4cb6efa 100644 --- a/config/rootfiles/packages/mc +++ b/config/rootfiles/packages/mc @@ -1,4 +1,5 @@ usr/bin/mc +usr/bin/mcdiff usr/bin/mcedit usr/bin/mcmfmt usr/bin/mcview @@ -8,9 +9,6 @@ usr/etc/mc/Syntax usr/etc/mc/cedit.menu usr/etc/mc/edit.indent.rc usr/etc/mc/edit.spell.rc -usr/etc/mc/extfs -usr/etc/mc/extfs/extfs.ini -usr/etc/mc/extfs/sfs.ini usr/etc/mc/filehighlight.ini usr/etc/mc/mc.charsets usr/etc/mc/mc.ext @@ -20,9 +18,59 @@ usr/etc/mc/mc.keymap.emacs usr/etc/mc/mc.lib usr/etc/mc/mc.menu usr/etc/mc/mc.menu.sr +usr/etc/mc/sfs.ini #usr/libexec #usr/libexec/mc usr/libexec/mc/cons.saver +#usr/libexec/mc/extfs.d +#usr/libexec/mc/extfs.d/README +#usr/libexec/mc/extfs.d/README.extfs +usr/libexec/mc/extfs.d/a+ +usr/libexec/mc/extfs.d/apt+ +usr/libexec/mc/extfs.d/audio +usr/libexec/mc/extfs.d/bpp +usr/libexec/mc/extfs.d/deb +usr/libexec/mc/extfs.d/deba +usr/libexec/mc/extfs.d/debd +usr/libexec/mc/extfs.d/dpkg+ +usr/libexec/mc/extfs.d/hp48+ +usr/libexec/mc/extfs.d/iso9660 +usr/libexec/mc/extfs.d/lslR +usr/libexec/mc/extfs.d/mailfs +usr/libexec/mc/extfs.d/patchfs +usr/libexec/mc/extfs.d/rpm +usr/libexec/mc/extfs.d/rpms+ +usr/libexec/mc/extfs.d/s3+ +usr/libexec/mc/extfs.d/trpm +usr/libexec/mc/extfs.d/u7z +usr/libexec/mc/extfs.d/uace +usr/libexec/mc/extfs.d/ualz +usr/libexec/mc/extfs.d/uar +usr/libexec/mc/extfs.d/uarc +usr/libexec/mc/extfs.d/uarj +usr/libexec/mc/extfs.d/uc1541 +usr/libexec/mc/extfs.d/ucab +usr/libexec/mc/extfs.d/uha +usr/libexec/mc/extfs.d/ulha +usr/libexec/mc/extfs.d/urar +usr/libexec/mc/extfs.d/uzip +usr/libexec/mc/extfs.d/uzoo +#usr/libexec/mc/fish +#usr/libexec/mc/fish/README.fish +usr/libexec/mc/fish/append +usr/libexec/mc/fish/chmod +usr/libexec/mc/fish/chown +usr/libexec/mc/fish/fexists +usr/libexec/mc/fish/get +usr/libexec/mc/fish/hardlink +usr/libexec/mc/fish/info +usr/libexec/mc/fish/ln +usr/libexec/mc/fish/ls +usr/libexec/mc/fish/mkdir +usr/libexec/mc/fish/mv +usr/libexec/mc/fish/rmdir +usr/libexec/mc/fish/send +usr/libexec/mc/fish/unlink usr/libexec/mc/mc-wrapper.csh usr/libexec/mc/mc-wrapper.sh usr/libexec/mc/mc.csh @@ -31,38 +79,6 @@ usr/libexec/mc/mc.sh #usr/share/man/man1/mcedit.1 #usr/share/man/man1/mcview.1 #usr/share/mc -#usr/share/mc/extfs -#usr/share/mc/extfs/README -usr/share/mc/extfs/a -usr/share/mc/extfs/apt -usr/share/mc/extfs/audio -usr/share/mc/extfs/bpp -usr/share/mc/extfs/deb -usr/share/mc/extfs/deba -usr/share/mc/extfs/debd -usr/share/mc/extfs/dpkg -usr/share/mc/extfs/hp48 -usr/share/mc/extfs/iso9660 -usr/share/mc/extfs/lslR -usr/share/mc/extfs/mailfs -usr/share/mc/extfs/patchfs -usr/share/mc/extfs/rpm -usr/share/mc/extfs/rpms -usr/share/mc/extfs/s3 -usr/share/mc/extfs/trpm -usr/share/mc/extfs/u7z -usr/share/mc/extfs/uace -usr/share/mc/extfs/ualz -usr/share/mc/extfs/uar -usr/share/mc/extfs/uarc -usr/share/mc/extfs/uarj -usr/share/mc/extfs/uc1541 -usr/share/mc/extfs/ucab -usr/share/mc/extfs/uha -usr/share/mc/extfs/ulha -usr/share/mc/extfs/urar -usr/share/mc/extfs/uzip -usr/share/mc/extfs/uzoo usr/share/mc/mc.hint #usr/share/mc/mc.hint.cs #usr/share/mc/mc.hint.es @@ -81,6 +97,7 @@ usr/share/mc/skins/default.ini usr/share/mc/skins/double-lines.ini usr/share/mc/skins/featured.ini usr/share/mc/skins/gotar.ini +usr/share/mc/skins/nicedark.ini #usr/share/mc/syntax usr/share/mc/syntax/PKGBUILD.syntax usr/share/mc/syntax/ada95.syntax @@ -109,6 +126,7 @@ usr/share/mc/syntax/fortran.syntax usr/share/mc/syntax/haskell.syntax usr/share/mc/syntax/html.syntax usr/share/mc/syntax/idl.syntax +usr/share/mc/syntax/ini.syntax usr/share/mc/syntax/j.syntax usr/share/mc/syntax/java.syntax usr/share/mc/syntax/js.syntax @@ -149,4 +167,4 @@ usr/share/mc/syntax/verilog.syntax usr/share/mc/syntax/vhdl.syntax usr/share/mc/syntax/xml.syntax usr/share/mc/syntax/yum-repo.syntax -usr/share/mc/syntax/yxx.syntax \ No newline at end of file +usr/share/mc/syntax/yxx.syntax diff --git a/lfs/mc b/lfs/mc index e321b31..d6badb5 100644 --- a/lfs/mc +++ b/lfs/mc @@ -24,15 +24,15 @@ include Config -VER = 4.7.0 +VER = 4.7.3 THISAPP = mc-$(VER) -DL_FILE = $(THISAPP).tar.gz +DL_FILE = $(THISAPP).tar.lzma DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = mc -PAK_VER = 3 +PAK_VER = 4 DEPS = "glib" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 3be875c7603ab45e784026a5d13d4bb0 +$(DL_FILE)_MD5 = 15b017b370668683aa8cbf6730667510 install : $(TARGET) @@ -76,15 +76,12 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - # Create a symlink because mc search for automake-1.10 - ln -s automake-1.9 /usr/share/automake-1.10 + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xf $(DIR_DL)/$(DL_FILE) --lzma cd $(DIR_APP) && ./configure --prefix=/usr \ --without-x --disable-nls \ --with-samba \ --with-screen=ncurses cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install - rm /usr/share/automake-1.10 @rm -rf $(DIR_APP) @$(POSTBUILD) hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 30736cd3fc24cae4487a0cdb39f2763538900ae9
by git＠ipfire.org 13 Jul '10

13 Jul '10

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 30736cd3fc24cae4487a0cdb39f2763538900ae9 (commit) via a4883c68c14fbf73474cbcf050d3d99acf5b2cfb (commit) from 7d83243a1ac89b23e95566f34335b5f189e3f57b (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 30736cd3fc24cae4487a0cdb39f2763538900ae9 Merge: a4883c68c14fbf73474cbcf050d3d99acf5b2cfb 7d83243a1ac89b23e95566f34335b5f189e3f57b Author: Christian Schmidt <christian.schmidt(a)ipfire.org> Date: Tue Jul 13 11:36:35 2010 +0200 Merge branch 'master' of git://git.ipfire.org/ipfire-2.x commit a4883c68c14fbf73474cbcf050d3d99acf5b2cfb Author: Christian Schmidt <christian.schmidt(a)ipfire.org> Date: Tue Jul 13 11:35:00 2010 +0200 Fixed redirector schedules - This fixes bug #0000685 ----------------------------------------------------------------------- Summary of changes: html/cgi-bin/updatexlrator.cgi | 23 +++++------------------ html/cgi-bin/urlfilter.cgi | 20 ++++---------------- src/misc-progs/Makefile | 2 +- src/misc-progs/updxlratorctrl.c | 33 +++++++++++++++++++++++++++++++++ src/misc-progs/urlfilterctrl.c | 33 +++++++++++++++++++++++++++++++++ 5 files changed, 76 insertions(+), 35 deletions(-) create mode 100644 src/misc-progs/updxlratorctrl.c create mode 100644 src/misc-progs/urlfilterctrl.c Difference in files: diff --git a/html/cgi-bin/updatexlrator.cgi b/html/cgi-bin/updatexlrator.cgi index 147be8e..04b7b8e 100644 --- a/html/cgi-bin/updatexlrator.cgi +++ b/html/cgi-bin/updatexlrator.cgi @@ -94,10 +94,6 @@ my @downloadfiles=(); my @metadata=(); -my $chk_cron_dly = "${General::swroot}/updatexlrator/autocheck/cron.daily"; -my $chk_cron_wly = "${General::swroot}/updatexlrator/autocheck/cron.weekly"; -my $chk_cron_mly = "${General::swroot}/updatexlrator/autocheck/cron.monthly"; - &General::readhash("${General::swroot}/ethernet/settings", \%netsettings); &General::readhash("${General::swroot}/main/settings", \%mainsettings); &General::readhash("${General::swroot}/proxy/settings", \%proxysettings); @@ -1495,27 +1491,18 @@ END sub savesettings { - if (-e $chk_cron_dly) { unlink($chk_cron_dly); } - if (-e $chk_cron_wly) { unlink($chk_cron_wly); } - if (-e $chk_cron_mly) { unlink($chk_cron_mly); } if (($xlratorsettings{'ENABLE_AUTOCHECK'} eq 'on') && ($xlratorsettings{'AUTOCHECK_SCHEDULE'} eq 'daily')) { - symlink("../bin/checkup",$chk_cron_dly) - } else { - symlink("/bin/false",$chk_cron_dly) + system('/usr/local/bin/updxlratorctrl cron daily >/dev/null 2>&1'); } - if (($xlratorsettings{'ENABLE_AUTOCHECK'} eq 'on') && ($xlratorsettings{'AUTOCHECK_SCHEDULE'} eq 'weekly')) + if (($xlratorsettings{'ENABLE_AUTOCHECK'} eq 'on') && ($xlratorsettings{'AUTOCHECK_SCHEDULE'} eq 'weekly')) { - symlink("../bin/checkup",$chk_cron_wly) - } else { - symlink("/bin/false",$chk_cron_wly) + system('/usr/local/bin/updxlratorctrl cron weekly >/dev/null 2>&1'); } - if (($xlratorsettings{'ENABLE_AUTOCHECK'} eq 'on') && ($xlratorsettings{'AUTOCHECK_SCHEDULE'} eq 'monthly')) + if (($xlratorsettings{'ENABLE_AUTOCHECK'} eq 'on') && ($xlratorsettings{'AUTOCHECK_SCHEDULE'} eq 'monthly')) { - symlink("../bin/checkup",$chk_cron_mly) - } else { - symlink("/bin/false",$chk_cron_mly) + system('/usr/local/bin/updxlratorctrl cron monthly >/dev/null 2>&1'); } # don't save those variable to the settings file, diff --git a/html/cgi-bin/urlfilter.cgi b/html/cgi-bin/urlfilter.cgi index 6e99397..eea32bf 100644 --- a/html/cgi-bin/urlfilter.cgi +++ b/html/cgi-bin/urlfilter.cgi @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2010 Michael Tremer & Christian Schmidt # +# Copyright (C) 2005-2010 IPFire Team # # # # 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 # @@ -65,9 +65,6 @@ my $hintcolour = '#FFFFCC'; my $sourceurlfile = "${General::swroot}/urlfilter/autoupdate/autoupdate.urls"; my $updconffile = "${General::swroot}/urlfilter/autoupdate/autoupdate.conf"; my $updflagfile = "${General::swroot}/urlfilter/blacklists/.autoupdate.last"; -my $upd_cron_dly = "${General::swroot}/urlfilter/autoupdate/cron.daily"; -my $upd_cron_wly = "${General::swroot}/urlfilter/autoupdate/cron.weekly"; -my $upd_cron_mly = "${General::swroot}/urlfilter/autoupdate/cron.monthly"; my $errormessage=''; my $updatemessage=''; @@ -965,29 +962,20 @@ if ($filtersettings{'ACTION'} eq $Lang::tr{'urlfilter save schedule'}) print FILE "CUSTOM_UPDATE_URL=$filtersettings{'CUSTOM_UPDATE_URL'}\n"; close FILE; - if (-e $upd_cron_dly) { unlink($upd_cron_dly); } - if (-e $upd_cron_wly) { unlink($upd_cron_wly); } - if (-e $upd_cron_mly) { unlink($upd_cron_mly); } if (($filtersettings{'ENABLE_AUTOUPDATE'} eq 'on') && ($filtersettings{'UPDATE_SCHEDULE'} eq 'daily')) { - symlink("../bin/autoupdate.pl",$upd_cron_dly) - } else { - symlink("/bin/false",$upd_cron_dly) + system('/usr/local/bin/urlfilterctrl cron daily >/dev/null 2>&1'); } if (($filtersettings{'ENABLE_AUTOUPDATE'} eq 'on') && ($filtersettings{'UPDATE_SCHEDULE'} eq 'weekly')) { - symlink("../bin/autoupdate.pl",$upd_cron_wly) - } else { - symlink("/bin/false",$upd_cron_wly) + system('/usr/local/bin/urlfilterctrl cron weekly >/dev/null 2>&1'); } if (($filtersettings{'ENABLE_AUTOUPDATE'} eq 'on') && ($filtersettings{'UPDATE_SCHEDULE'} eq 'monthly')) { - symlink("../bin/autoupdate.pl",$upd_cron_mly) - } else { - symlink("/bin/false",$upd_cron_mly) + system('/usr/local/bin/urlfilterctrl cron monthly >/dev/null 2>&1'); } } } diff --git a/src/misc-progs/Makefile b/src/misc-progs/Makefile index d4114a0..7b1e457 100644 --- a/src/misc-progs/Makefile +++ b/src/misc-progs/Makefile @@ -32,7 +32,7 @@ SUID_PROGS = setdmzholes setportfw setxtaccess \ wirelessctrl getipstat getiptstate qosctrl launch-ether-wake \ redctrl syslogdctrl extrahdctrl sambactrl upnpctrl tripwirectrl \ smartctrl clamavctrl addonctrl pakfire mpfirectrl wlanapctrl \ - setaliases + setaliases urlfilterctrl updxlratorctrl SUID_UPDX = updxsetperms install : all diff --git a/src/misc-progs/updxlratorctrl.c b/src/misc-progs/updxlratorctrl.c new file mode 100644 index 0000000..cf58b5e --- /dev/null +++ b/src/misc-progs/updxlratorctrl.c @@ -0,0 +1,33 @@ +#include <stdio.h> +#include <string.h> +#include <unistd.h> +#include <stdlib.h> +#include <sys/types.h> +#include <fcntl.h> +#include "setuid.h" + +int main(int argc, char *argv[]){ + if ( argc < 2 ){ + printf("invalid parameter(s)\n"); + return(1); + } + + if (!(initsetuid())) + exit(1); + + if (strcmp(argv[1], "cron") == 0){ + safe_system("rm /etc/fcron.*/updxlrator 2&>/dev/null"); + + if (strcmp(argv[2], "daily") == 0){ + safe_system("ln -s /var/ipfire/updatexlrator/bin/checkup /etc/fcron.daily/updxlrator"); + } else if (strcmp(argv[2], "weekly") == 0){ + safe_system("ln -s /var/ipfire/updatexlrator/bin/checkup /etc/fcron.weekly/updxlrator"); + } else if (strcmp(argv[2], "monthly") == 0){ + safe_system("ln -s /var/ipfire/updatexlrator/bin/checkup /etc/fcron.monthly/updxlrator"); + }else{ + printf("invalid parameter(s)\n"); + return(1); + } + } + return 0; +} diff --git a/src/misc-progs/urlfilterctrl.c b/src/misc-progs/urlfilterctrl.c new file mode 100644 index 0000000..6e2b306 --- /dev/null +++ b/src/misc-progs/urlfilterctrl.c @@ -0,0 +1,33 @@ +#include <stdio.h> +#include <string.h> +#include <unistd.h> +#include <stdlib.h> +#include <sys/types.h> +#include <fcntl.h> +#include "setuid.h" + +int main(int argc, char *argv[]){ + if ( argc < 2 ){ + printf("invalid parameter(s)\n"); + return(1); + } + + if (!(initsetuid())) + exit(1); + + if (strcmp(argv[1], "cron") == 0){ + safe_system("rm /etc/fcron.*/urlfilter 2&>/dev/null"); + + if (strcmp(argv[2], "daily") == 0){ + safe_system("ln -s /var/ipfire/urlfilter/bin/autoupdate.pl /etc/fcron.daily/urlfilter"); + } else if (strcmp(argv[2], "weekly") == 0){ + safe_system("ln -s /var/ipfire/urlfilter/bin/autoupdate.pl /etc/fcron.weekly/urlfilter"); + } else if (strcmp(argv[2], "monthly") == 0){ + safe_system("ln -s /var/ipfire/urlfilter/bin/autoupdate.pl /etc/fcron.monthly/urlfilter"); + }else{ + printf("invalid parameter(s)\n"); + return(1); + } + } + return 0; +} hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 7d83243a1ac89b23e95566f34335b5f189e3f57b
by git＠ipfire.org 13 Jul '10

13 Jul '10

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 7d83243a1ac89b23e95566f34335b5f189e3f57b (commit) via f56b0d5ff95989521f5994a06d64943977e6e5a2 (commit) from 75842d01ba4f57aa4a67089fcaa218abad74c334 (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 7d83243a1ac89b23e95566f34335b5f189e3f57b Merge: f56b0d5ff95989521f5994a06d64943977e6e5a2 75842d01ba4f57aa4a67089fcaa218abad74c334 Author: Jan Paul Tuecking <earl(a)ipfire.org> Date: Tue Jul 13 13:13:44 2010 +0200 Merge branch 'master' of ssh://earl@git.ipfire.org/pub/git/ipfire-2.x commit f56b0d5ff95989521f5994a06d64943977e6e5a2 Author: Jan Paul Tuecking <earl(a)ipfire.org> Date: Tue Jul 13 12:47:12 2010 +0200 Updated VDRAdmin form 3.6.5 to 3.6.7 (stable) ----------------------------------------------------------------------- Summary of changes: config/rootfiles/packages/vdradmin | 39 +++++++---------------------------- doc/packages-list.txt | 2 +- lfs/vdradmin | 8 ++++-- 3 files changed, 14 insertions(+), 35 deletions(-) Difference in files: diff --git a/config/rootfiles/packages/vdradmin b/config/rootfiles/packages/vdradmin index 3857e5e..17be5a7 100644 --- a/config/rootfiles/packages/vdradmin +++ b/config/rootfiles/packages/vdradmin @@ -1,7 +1,3 @@ -etc/rc.d/init.d/vdradmin -etc/rc.d/rc0.d/K01vdradmin -etc/rc.d/rc6.d/K01vdradmin -etc/rc.d/rc3.d/S99vdradmin #etc/vdradmin etc/vdradmin/vdradmind.conf usr/bin/vdradmind @@ -24,40 +20,13 @@ usr/bin/vdradmind #usr/share/doc/vdradmin/contrib/user.css.example #usr/share/doc/vdradmin/contrib/vdradmind.bl_example #usr/share/locale/cs/LC_MESSAGES/vdradmin.mo -#usr/share/locale/cs_CZ.utf8 -#usr/share/locale/cs_CZ.utf8/LC_MESSAGES -#usr/share/locale/cs_CZ.utf8/LC_MESSAGES/vdradmin.mo usr/share/locale/de/LC_MESSAGES/vdradmin.mo -#usr/share/locale/de_DE.utf8 -#usr/share/locale/de_DE.utf8/LC_MESSAGES -usr/share/locale/de_DE.utf8/LC_MESSAGES/vdradmin.mo -#usr/share/locale/en_US.utf8 -#usr/share/locale/en_US.utf8/LC_MESSAGES -usr/share/locale/en_US.utf8/LC_MESSAGES/vdradmin.mo #usr/share/locale/es/LC_MESSAGES/vdradmin.mo -#usr/share/locale/es_ES.utf8 -#usr/share/locale/es_ES.utf8/LC_MESSAGES -#usr/share/locale/es_ES.utf8/LC_MESSAGES/vdradmin.mo #usr/share/locale/fi/LC_MESSAGES/vdradmin.mo -#usr/share/locale/fi_FI.utf8 -#usr/share/locale/fi_FI.utf8/LC_MESSAGES -#usr/share/locale/fi_FI.utf8/LC_MESSAGES/vdradmin.mo #usr/share/locale/fr/LC_MESSAGES/vdradmin.mo -#usr/share/locale/fr_FR.utf8 -#usr/share/locale/fr_FR.utf8/LC_MESSAGES -#usr/share/locale/fr_FR.utf8/LC_MESSAGES/vdradmin.mo #usr/share/locale/it/LC_MESSAGES/vdradmin.mo -#usr/share/locale/it_IT.utf8 -#usr/share/locale/it_IT.utf8/LC_MESSAGES -#usr/share/locale/it_IT.utf8/LC_MESSAGES/vdradmin.mo #usr/share/locale/nl/LC_MESSAGES/vdradmin.mo -#usr/share/locale/nl_NL.utf8 -#usr/share/locale/nl_NL.utf8/LC_MESSAGES -#usr/share/locale/nl_NL.utf8/LC_MESSAGES/vdradmin.mo #usr/share/locale/ru/LC_MESSAGES/vdradmin.mo -#usr/share/locale/ru_RU.utf8 -#usr/share/locale/ru_RU.utf8/LC_MESSAGES -#usr/share/locale/ru_RU.utf8/LC_MESSAGES/vdradmin.mo #usr/share/man/man1/vdradmind.1 usr/share/vdradmin #usr/share/vdradmin/lib @@ -205,3 +174,11 @@ usr/share/vdradmin #usr/share/vdradmin/template/default/timer_new.html #usr/share/vdradmin/template/default/tv.html #usr/share/vdradmin/template/default/vdr_cmds.html +etc/rc.d/init.d/vdradmin +etc/rc.d/rc0.d/K01vdradmin +etc/rc.d/rc6.d/K01vdradmin +etc/rc.d/rc3.d/S99vdradmin +#usr/share/locale/de_DE.utf8/LC_MESSAGES/vdradmin.mo +#usr/share/locale/en_US.utf8/LC_MESSAGES/vdradmin.mo +var/log/vdradmin +var/run/vdradmin diff --git a/doc/packages-list.txt b/doc/packages-list.txt index 4b516ce..7fdb754 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -347,7 +347,7 @@ * v4l-dvb-b576509ea6d2-kmod-2.6.32.15-ipfire * v4l-dvb-b576509ea6d2-kmod-2.6.32.15-ipfire-xen * vdr-1.6.0 -* vdradmin-am-3.6.5 +* vdradmin-am-3.6.7 * vim-7.0 * vlan.1.9 * vlc-0.8.6i diff --git a/lfs/vdradmin b/lfs/vdradmin index 901e254..43c2a08 100644 --- a/lfs/vdradmin +++ b/lfs/vdradmin @@ -25,7 +25,7 @@ include Config -VER = 3.6.5 +VER = 3.6.7 THISAPP = vdradmin-am-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -33,7 +33,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = vdradmin -PAK_VER = 2 +PAK_VER = 3 DEPS = "perl-gettext vdr" @@ -45,7 +45,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 34ac04af6d1b0495f10cd06e85abb990 +$(DL_FILE)_MD5 = 8b1b2f8bbff26cbb47e79d5b55dbd3c1 install : $(TARGET) @@ -83,5 +83,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && ./install-ipfire.sh install -v -m 644 $(DIR_SRC)/config/vdradmin/vdradmind.conf \ /etc/vdradmin/vdradmind.conf + mkdir /var/log/vdradmin + mkdir /var/run/vdradmin @rm -rf $(DIR_APP) @$(POSTBUILD) hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 75842d01ba4f57aa4a67089fcaa218abad74c334
by git＠ipfire.org 12 Jul '10

12 Jul '10

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 75842d01ba4f57aa4a67089fcaa218abad74c334 (commit) from d3bea04349d7456bc1db37087081dd55e688f936 (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 75842d01ba4f57aa4a67089fcaa218abad74c334 Author: Christian Schmidt <christian.schmidt(a)ipfire.org> Date: Mon Jul 12 20:12:02 2010 +0200 Fixed some bad copy and paste errors. ----------------------------------------------------------------------- Summary of changes: html/cgi-bin/outgoingfw.cgi | 2 +- html/cgi-bin/outgoinggrp.cgi | 2 +- html/cgi-bin/samba.cgi | 2 +- html/cgi-bin/updatexlrator.cgi | 2 +- lfs/samba | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) Difference in files: diff --git a/html/cgi-bin/outgoingfw.cgi b/html/cgi-bin/outgoingfw.cgi index edc6e9d..b746a8e 100644 --- a/html/cgi-bin/outgoingfw.cgi +++ b/html/cgi-bin/outgoingfw.cgi @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2005-2010 IPTifre Team # +# Copyright (C) 2005-2010 IPFire Team # # # # 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 # diff --git a/html/cgi-bin/outgoinggrp.cgi b/html/cgi-bin/outgoinggrp.cgi index d8c6e04..a94ac82 100644 --- a/html/cgi-bin/outgoinggrp.cgi +++ b/html/cgi-bin/outgoinggrp.cgi @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2005-2010 IPTifre Team # +# Copyright (C) 2005-2010 IPFire Team # # # # 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 # diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index 2e8ea8a..712f085 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2005-2010 IPTifre Team # +# Copyright (C) 2005-2010 IPFire Team # # # # 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 # diff --git a/html/cgi-bin/updatexlrator.cgi b/html/cgi-bin/updatexlrator.cgi index fefbda8..147be8e 100644 --- a/html/cgi-bin/updatexlrator.cgi +++ b/html/cgi-bin/updatexlrator.cgi @@ -11,7 +11,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2005-2010 IPTifre Team # +# Copyright (C) 2005-2010 IPFire Team # # # # 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 # diff --git a/lfs/samba b/lfs/samba index d8305bb..8a8712e 100644 --- a/lfs/samba +++ b/lfs/samba @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2005-2010 IPTifre Team # +# Copyright (C) 2005-2010 IPFire Team # # # # 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 # hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. d3bea04349d7456bc1db37087081dd55e688f936
by git＠ipfire.org 12 Jul '10

12 Jul '10

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 d3bea04349d7456bc1db37087081dd55e688f936 (commit) from b6a542c4df07f0aea694a8c624da9fcddf0b33a9 (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 d3bea04349d7456bc1db37087081dd55e688f936 Author: Christian Schmidt <christian.schmidt(a)ipfire.org> Date: Mon Jul 12 18:01:51 2010 +0200 Sometimes my winscp acts strange ... ----------------------------------------------------------------------- Summary of changes: html/cgi-bin/samba.cgi | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) Difference in files: diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index bd0c22a..2e8ea8a 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -620,7 +620,7 @@ if ($sambasettings{'SECURITY'} eq 'user') &Header::openbox('100%', 'center', $Lang::tr{'accounting user pdc'}); } print <<END - <a name="$Lang::tr{'accounting'}"</a> + <a name="$Lang::tr{'accounting'}"></a> <br /> <table width='95%' cellspacing='0'> <tr><td colspan='6' align='left'></td></tr> @@ -866,7 +866,7 @@ my %shares = config("${General::swroot}/samba/shares"); print <<END -<a name="$Lang::tr{'manage shares'}"</a> +<a name="$Lang::tr{'manage shares'}"></a> <br /> <table width='95%' cellspacing='0'> <tr><td bgcolor='$color{'color20'}' colspan='3' align='left'><b>$Lang::tr{'manage shares'}</b> @@ -1014,7 +1014,7 @@ if ( -e "/var/ipfire/cups/enable") my @Printers = keys(%printer); print <<END -<a name="$Lang::tr{'manage printers'}"</a> +<a name="$Lang::tr{'manage printers'}"></a> <br /> <table width='95%' cellspacing='0'> <tr><td bgcolor='$color{'color20'}' colspan='3' align='left'><b>$Lang::tr{'manage printers'}</b> @@ -1154,7 +1154,7 @@ $Log=~s/\n/<br \/>/g; &Header::openbox('100%', 'center', $Lang::tr{'log'}); print <<END -<a name="$Lang::tr{'log view'}"</a> +<a name="$Lang::tr{'log view'}"></a> <br /> <form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'log view'}'> <table width='95%' cellspacing='0'> hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. b6a542c4df07f0aea694a8c624da9fcddf0b33a9
by git＠ipfire.org 12 Jul '10

12 Jul '10

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 b6a542c4df07f0aea694a8c624da9fcddf0b33a9 (commit) from c9e5e60dbe9b7be0f6714b45ad3badce2706cd95 (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 b6a542c4df07f0aea694a8c624da9fcddf0b33a9 Author: Christian Schmidt <christian.schmidt(a)ipfire.org> Date: Mon Jul 12 17:49:14 2010 +0200 Fixed anchors because opera does not autofix this. ----------------------------------------------------------------------- Summary of changes: html/cgi-bin/samba.cgi | 2 +- lfs/samba | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) Difference in files: diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index 13a7a82..bd0c22a 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2005-2010 IPTifre Team # # # # 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 # diff --git a/lfs/samba b/lfs/samba index 965a450..d8305bb 100644 --- a/lfs/samba +++ b/lfs/samba @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2009 Michael Tremer & Christian Schmidt # +# Copyright (C) 2005-2010 IPTifre Team # # # # 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 = samba -PAK_VER = 28 +PAK_VER = 29 DEPS = "cups" hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. c9e5e60dbe9b7be0f6714b45ad3badce2706cd95
by git＠ipfire.org 12 Jul '10

12 Jul '10

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 c9e5e60dbe9b7be0f6714b45ad3badce2706cd95 (commit) from 01a24be1cd0ebf60a7bb5a9934a8904e09dd469a (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 c9e5e60dbe9b7be0f6714b45ad3badce2706cd95 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Jul 12 05:42:19 2010 +0200 Increment watchdog package version. ----------------------------------------------------------------------- Summary of changes: lfs/watchdog | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Difference in files: diff --git a/lfs/watchdog b/lfs/watchdog index 3750965..8058c8c 100644 --- a/lfs/watchdog +++ b/lfs/watchdog @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = watchdog -PAK_VER = 2 +PAK_VER = 3 DEPS = "" hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 01a24be1cd0ebf60a7bb5a9934a8904e09dd469a
by git＠ipfire.org 12 Jul '10

12 Jul '10

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 01a24be1cd0ebf60a7bb5a9934a8904e09dd469a (commit) from 365629c0bb90b794b392b1088e2404ffc565e0f1 (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 01a24be1cd0ebf60a7bb5a9934a8904e09dd469a Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Jul 12 05:32:07 2010 +0200 Rootfile update: watchdog. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/packages/watchdog | 2 ++ doc/packages-list.txt | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) Difference in files: diff --git a/config/rootfiles/packages/watchdog b/config/rootfiles/packages/watchdog index d4ee9c8..677c5dc 100644 --- a/config/rootfiles/packages/watchdog +++ b/config/rootfiles/packages/watchdog @@ -1,8 +1,10 @@ etc/watchdog.conf usr/sbin/watchdog +usr/sbin/wd_identify usr/sbin/wd_keepalive #usr/share/man/man5/watchdog.conf.5 #usr/share/man/man8/watchdog.8 +#usr/share/man/man8/wd_identify.8 #usr/share/man/man8/wd_keepalive.8 var/ipfire/backup/addons/includes/watchdog etc/rc.d/init.d/watchdog diff --git a/doc/packages-list.txt b/doc/packages-list.txt index 12cf33a..4b516ce 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -355,7 +355,7 @@ * vnstati-beta3 * vsftpd-2.1.2 * w_scan-20080105 -* watchdog-5.6 +* watchdog-5.9 * wget-1.10.2 * whatmask-1.2 * which-2.16 hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 365629c0bb90b794b392b1088e2404ffc565e0f1
by git＠ipfire.org 11 Jul '10

11 Jul '10

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 365629c0bb90b794b392b1088e2404ffc565e0f1 (commit) via 69e29b22deca7d82f1cc21202fdb7e101bcecb62 (commit) from 03a3f90805eed4de204d73c7ce53af7d26660076 (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 365629c0bb90b794b392b1088e2404ffc565e0f1 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Jul 12 00:37:13 2010 +0200 Fix backupiso (2.7). commit 69e29b22deca7d82f1cc21202fdb7e101bcecb62 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Jul 12 00:24:26 2010 +0200 Add ddrescue package. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/39/filelists/files | 1 + config/rootfiles/packages/ddrescue | 3 +++ doc/packages-list.txt | 1 + lfs/{bwm-ng => ddrescue} | 12 ++++++------ make.sh | 1 + src/scripts/backupiso | 2 +- 6 files changed, 13 insertions(+), 7 deletions(-) create mode 100644 config/rootfiles/packages/ddrescue copy lfs/{bwm-ng => ddrescue} (94%) Difference in files: diff --git a/config/rootfiles/core/39/filelists/files b/config/rootfiles/core/39/filelists/files index 5b9c934..227a62c 100644 --- a/config/rootfiles/core/39/filelists/files +++ b/config/rootfiles/core/39/filelists/files @@ -3,3 +3,4 @@ etc/rc.d/init.d/dnsmasq etc/rc.d/init.d/networking/red etc/rc.d/helper/getdnsfromdhcpc.pl srv/web/ipfire/cgi-bin/pppsetup.cgi +usr/local/bin/backupiso diff --git a/config/rootfiles/packages/ddrescue b/config/rootfiles/packages/ddrescue new file mode 100644 index 0000000..3d0a0b9 --- /dev/null +++ b/config/rootfiles/packages/ddrescue @@ -0,0 +1,3 @@ +usr/bin/ddrescue +#usr/share/info/ddrescue.info +#usr/share/man/man1/ddrescue.1 diff --git a/doc/packages-list.txt b/doc/packages-list.txt index 1f0f4d3..12cf33a 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -84,6 +84,7 @@ * dahdi-2.2.1-kmod-2.6.32.15-ipfire-xen * db-4.4.20 * dbus-1.0.3 +* ddrescue-1.12 * dhcp-3.1.0 * dhcpcd-5.1.3 * diffutils-2.8.1 diff --git a/lfs/ddrescue b/lfs/ddrescue new file mode 100644 index 0000000..c61e2d7 --- /dev/null +++ b/lfs/ddrescue @@ -0,0 +1,84 @@ +############################################################################### +# # +# 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 = 1.12 +THISAPP = ddrescue-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = ddrescue +PAK_VER = 1 + +DEPS = "" + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = b3d8a9a9098b87939fba05a45848bd8d + +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 + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index c4511ed..e0cf399 100755 --- a/make.sh +++ b/make.sh @@ -641,6 +641,7 @@ buildipfire() { ipfiremake eject ipfiremake pound ipfiremake minicom + ipfiremake ddrescue echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild echo >> $BASEDIR/build/var/ipfire/firebuild diff --git a/src/scripts/backupiso b/src/scripts/backupiso index 71e7974..c1cc35b 100644 --- a/src/scripts/backupiso +++ b/src/scripts/backupiso @@ -3,7 +3,7 @@ COREVER=`cat /opt/pakfire/db/core/mine` # FIXME: edit this lines before release URL=http://download.ipfire.org/iso/ -ISO=ipfire-2.5.i586-full-core$COREVER.iso +ISO=ipfire-2.7.i586-full-core$COREVER.iso if [ -z "$1" ]; then echo usage: $0 backup-file hooks/post-receive -- IPFire 2.x development tree

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM July 2010