IPFire-SCM

ipfire-scm@lists.ipfire.org

1 participants
7857 discussions

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. fe3a05da3a794e3025fde4b39775876835ad735a
by git＠ipfire.org 26 Oct '12

26 Oct '12

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 fe3a05da3a794e3025fde4b39775876835ad735a (commit) from 03207e65b1244bb4a82a55bc1e1f893e05695aa0 (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 fe3a05da3a794e3025fde4b39775876835ad735a Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Oct 26 15:36:48 2012 +0200 pakfire: compression detection needs an extension. ----------------------------------------------------------------------- Summary of changes: src/pakfire/lib/functions.sh | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Difference in files: diff --git a/src/pakfire/lib/functions.sh b/src/pakfire/lib/functions.sh index 9c8bf53..3f7dbff 100644 --- a/src/pakfire/lib/functions.sh +++ b/src/pakfire/lib/functions.sh @@ -24,13 +24,13 @@ extract_files() { echo "Extracting files..." - tar xavf /opt/pakfire/tmp/files --no-overwrite-dir -p --numeric-owner -C / + tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p --numeric-owner -C / echo "...Finished." } extract_backup_includes() { echo "Extracting backup includes..." - tar xavf /opt/pakfire/tmp/files --no-overwrite-dir -p --numeric-owner -C / \ + tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p --numeric-owner -C / \ var/ipfire/backup/addons/includes echo "...Finished." } hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 03207e65b1244bb4a82a55bc1e1f893e05695aa0
by git＠ipfire.org 26 Oct '12

26 Oct '12

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 03207e65b1244bb4a82a55bc1e1f893e05695aa0 (commit) from d6b4566d9cf63ab0848b508382b6daa836b5cc7d (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 03207e65b1244bb4a82a55bc1e1f893e05695aa0 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Oct 26 09:56:31 2012 +0200 pakfire: enable compression autodetection inside the packages. ----------------------------------------------------------------------- Summary of changes: src/pakfire/lib/functions.sh | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Difference in files: diff --git a/src/pakfire/lib/functions.sh b/src/pakfire/lib/functions.sh index bc05bd0..9c8bf53 100644 --- a/src/pakfire/lib/functions.sh +++ b/src/pakfire/lib/functions.sh @@ -24,13 +24,13 @@ extract_files() { echo "Extracting files..." - tar xvf /opt/pakfire/tmp/files --no-overwrite-dir -p --numeric-owner -C / + tar xavf /opt/pakfire/tmp/files --no-overwrite-dir -p --numeric-owner -C / echo "...Finished." } extract_backup_includes() { echo "Extracting backup includes..." - tar xvf /opt/pakfire/tmp/files --no-overwrite-dir -p --numeric-owner -C / \ + tar xavf /opt/pakfire/tmp/files --no-overwrite-dir -p --numeric-owner -C / \ var/ipfire/backup/addons/includes echo "...Finished." } hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, thirteen, updated. d8ce16fa6619b9090919ffa334aebdc67418f75c
by git＠ipfire.org 26 Oct '12

26 Oct '12

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, thirteen has been updated via d8ce16fa6619b9090919ffa334aebdc67418f75c (commit) via f3ff2748270b5f0f64b4b36b7d78b468ec766970 (commit) from beecbb59a305cb22c5adc7e5fdba96dc33d14267 (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 d8ce16fa6619b9090919ffa334aebdc67418f75c Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Oct 26 09:21:07 2012 +0200 libtool: change from package to common. squid needs the libltdl library. commit f3ff2748270b5f0f64b4b36b7d78b468ec766970 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Oct 26 09:15:46 2012 +0200 vdr: removed fontconfig dependency. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/{packages => common}/libtool | 0 lfs/libtool | 2 -- lfs/nagios | 7 ++----- lfs/vdr | 4 ++-- 4 files changed, 4 insertions(+), 9 deletions(-) rename config/rootfiles/{packages => common}/libtool (100%) Difference in files: diff --git a/config/rootfiles/common/libtool b/config/rootfiles/common/libtool new file mode 100644 index 0000000..5646be2 --- /dev/null +++ b/config/rootfiles/common/libtool @@ -0,0 +1,71 @@ +#usr/bin/libtool +#usr/bin/libtoolize +#usr/include/libltdl +#usr/include/libltdl/lt_dlloader.h +#usr/include/libltdl/lt_error.h +#usr/include/libltdl/lt_system.h +#usr/include/ltdl.h +#usr/lib/libltdl.a +#usr/lib/libltdl.la +usr/lib/libltdl.so +usr/lib/libltdl.so.7 +usr/lib/libltdl.so.7.3.0 +#usr/share/aclocal/argz.m4 +#usr/share/aclocal/libtool.m4 +#usr/share/aclocal/ltdl.m4 +#usr/share/aclocal/ltoptions.m4 +#usr/share/aclocal/ltsugar.m4 +#usr/share/aclocal/ltversion.m4 +#usr/share/aclocal/lt~obsolete.m4 +#usr/share/info/libtool.info +#usr/share/info/libtool.info-1 +#usr/share/info/libtool.info-2 +#usr/share/libtool +#usr/share/libtool/config +#usr/share/libtool/config/compile +#usr/share/libtool/config/config.guess +#usr/share/libtool/config/config.sub +#usr/share/libtool/config/depcomp +#usr/share/libtool/config/install-sh +#usr/share/libtool/config/ltmain.sh +#usr/share/libtool/config/missing +#usr/share/libtool/libltdl +#usr/share/libtool/libltdl/COPYING.LIB +#usr/share/libtool/libltdl/Makefile.am +#usr/share/libtool/libltdl/Makefile.in +#usr/share/libtool/libltdl/Makefile.inc +#usr/share/libtool/libltdl/README +#usr/share/libtool/libltdl/aclocal.m4 +#usr/share/libtool/libltdl/argz.c +#usr/share/libtool/libltdl/argz_.h +#usr/share/libtool/libltdl/config-h.in +#usr/share/libtool/libltdl/configure +#usr/share/libtool/libltdl/configure.ac +#usr/share/libtool/libltdl/libltdl +#usr/share/libtool/libltdl/libltdl/lt__alloc.h +#usr/share/libtool/libltdl/libltdl/lt__dirent.h +#usr/share/libtool/libltdl/libltdl/lt__glibc.h +#usr/share/libtool/libltdl/libltdl/lt__private.h +#usr/share/libtool/libltdl/libltdl/lt__strl.h +#usr/share/libtool/libltdl/libltdl/lt_dlloader.h +#usr/share/libtool/libltdl/libltdl/lt_error.h +#usr/share/libtool/libltdl/libltdl/lt_system.h +#usr/share/libtool/libltdl/libltdl/slist.h +#usr/share/libtool/libltdl/loaders +#usr/share/libtool/libltdl/loaders/dld_link.c +#usr/share/libtool/libltdl/loaders/dlopen.c +#usr/share/libtool/libltdl/loaders/dyld.c +#usr/share/libtool/libltdl/loaders/load_add_on.c +#usr/share/libtool/libltdl/loaders/loadlibrary.c +#usr/share/libtool/libltdl/loaders/preopen.c +#usr/share/libtool/libltdl/loaders/shl_load.c +#usr/share/libtool/libltdl/lt__alloc.c +#usr/share/libtool/libltdl/lt__dirent.c +#usr/share/libtool/libltdl/lt__strl.c +#usr/share/libtool/libltdl/lt_dlloader.c +#usr/share/libtool/libltdl/lt_error.c +#usr/share/libtool/libltdl/ltdl.c +#usr/share/libtool/libltdl/ltdl.h +#usr/share/libtool/libltdl/slist.c +#usr/share/man/man1/libtool.1 +#usr/share/man/man1/libtoolize.1 diff --git a/config/rootfiles/packages/libtool b/config/rootfiles/packages/libtool deleted file mode 100644 index 5646be2..0000000 --- a/config/rootfiles/packages/libtool +++ /dev/null @@ -1,71 +0,0 @@ -#usr/bin/libtool -#usr/bin/libtoolize -#usr/include/libltdl -#usr/include/libltdl/lt_dlloader.h -#usr/include/libltdl/lt_error.h -#usr/include/libltdl/lt_system.h -#usr/include/ltdl.h -#usr/lib/libltdl.a -#usr/lib/libltdl.la -usr/lib/libltdl.so -usr/lib/libltdl.so.7 -usr/lib/libltdl.so.7.3.0 -#usr/share/aclocal/argz.m4 -#usr/share/aclocal/libtool.m4 -#usr/share/aclocal/ltdl.m4 -#usr/share/aclocal/ltoptions.m4 -#usr/share/aclocal/ltsugar.m4 -#usr/share/aclocal/ltversion.m4 -#usr/share/aclocal/lt~obsolete.m4 -#usr/share/info/libtool.info -#usr/share/info/libtool.info-1 -#usr/share/info/libtool.info-2 -#usr/share/libtool -#usr/share/libtool/config -#usr/share/libtool/config/compile -#usr/share/libtool/config/config.guess -#usr/share/libtool/config/config.sub -#usr/share/libtool/config/depcomp -#usr/share/libtool/config/install-sh -#usr/share/libtool/config/ltmain.sh -#usr/share/libtool/config/missing -#usr/share/libtool/libltdl -#usr/share/libtool/libltdl/COPYING.LIB -#usr/share/libtool/libltdl/Makefile.am -#usr/share/libtool/libltdl/Makefile.in -#usr/share/libtool/libltdl/Makefile.inc -#usr/share/libtool/libltdl/README -#usr/share/libtool/libltdl/aclocal.m4 -#usr/share/libtool/libltdl/argz.c -#usr/share/libtool/libltdl/argz_.h -#usr/share/libtool/libltdl/config-h.in -#usr/share/libtool/libltdl/configure -#usr/share/libtool/libltdl/configure.ac -#usr/share/libtool/libltdl/libltdl -#usr/share/libtool/libltdl/libltdl/lt__alloc.h -#usr/share/libtool/libltdl/libltdl/lt__dirent.h -#usr/share/libtool/libltdl/libltdl/lt__glibc.h -#usr/share/libtool/libltdl/libltdl/lt__private.h -#usr/share/libtool/libltdl/libltdl/lt__strl.h -#usr/share/libtool/libltdl/libltdl/lt_dlloader.h -#usr/share/libtool/libltdl/libltdl/lt_error.h -#usr/share/libtool/libltdl/libltdl/lt_system.h -#usr/share/libtool/libltdl/libltdl/slist.h -#usr/share/libtool/libltdl/loaders -#usr/share/libtool/libltdl/loaders/dld_link.c -#usr/share/libtool/libltdl/loaders/dlopen.c -#usr/share/libtool/libltdl/loaders/dyld.c -#usr/share/libtool/libltdl/loaders/load_add_on.c -#usr/share/libtool/libltdl/loaders/loadlibrary.c -#usr/share/libtool/libltdl/loaders/preopen.c -#usr/share/libtool/libltdl/loaders/shl_load.c -#usr/share/libtool/libltdl/lt__alloc.c -#usr/share/libtool/libltdl/lt__dirent.c -#usr/share/libtool/libltdl/lt__strl.c -#usr/share/libtool/libltdl/lt_dlloader.c -#usr/share/libtool/libltdl/lt_error.c -#usr/share/libtool/libltdl/ltdl.c -#usr/share/libtool/libltdl/ltdl.h -#usr/share/libtool/libltdl/slist.c -#usr/share/man/man1/libtool.1 -#usr/share/man/man1/libtoolize.1 diff --git a/lfs/libtool b/lfs/libtool index 5664046..e6bcd40 100644 --- a/lfs/libtool +++ b/lfs/libtool @@ -33,8 +33,6 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = libtool -PAK_VER = 2 -DEPS = "" ############################################################################### # Top-level Rules diff --git a/lfs/nagios b/lfs/nagios index c2affea..2bb2a41 100644 --- a/lfs/nagios +++ b/lfs/nagios @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2012 IPFire Team <info(a)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 # @@ -34,7 +34,7 @@ TARGET = $(DIR_INFO)/$(THISAPP) PROG = nagios PAK_VER = 2 -DEPS = "traceroute libtool" +DEPS = "traceroute" ############################################################################### # Top-level Rules @@ -111,6 +111,3 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) ln -s /etc/init.d/nagios /etc/rc.d/rc6.d/K33nagios @rm -rf $(DIR_APP) @$(POSTBUILD) - - - diff --git a/lfs/vdr b/lfs/vdr index 6907e00..ca8f0da 100644 --- a/lfs/vdr +++ b/lfs/vdr @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2012 IPFire Team <info(a)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 # @@ -38,7 +38,7 @@ TARGET = $(DIR_INFO)/$(THISAPP) PROG = vdr PAK_VER = 5 -DEPS = "freefont fontconfig" +DEPS = "freefont" ############################################################################### # Top-level Rules hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, thirteen, updated. beecbb59a305cb22c5adc7e5fdba96dc33d14267
by git＠ipfire.org 25 Oct '12

25 Oct '12

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, thirteen has been updated via beecbb59a305cb22c5adc7e5fdba96dc33d14267 (commit) from 48bf31fa46150eb2698083aad5de140568df4b0d (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 beecbb59a305cb22c5adc7e5fdba96dc33d14267 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Oct 25 22:18:36 2012 +0200 dvb-firmwares: add some dvb-hardware binaries. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/dvb-firmwares | 22 ++++++++++++++++++++++ lfs/{rpi-firmware => dvb-firmwares} | 19 ++++++++++--------- make.sh | 1 + 3 files changed, 33 insertions(+), 9 deletions(-) create mode 100644 config/rootfiles/common/dvb-firmwares copy lfs/{rpi-firmware => dvb-firmwares} (89%) Difference in files: diff --git a/config/rootfiles/common/dvb-firmwares b/config/rootfiles/common/dvb-firmwares new file mode 100644 index 0000000..a6ba837 --- /dev/null +++ b/config/rootfiles/common/dvb-firmwares @@ -0,0 +1,22 @@ +lib/firmware/dvb-fe-bcm3510-01.fw +lib/firmware/dvb-fe-or51132-qam.fw +lib/firmware/dvb-fe-or51132-vsb.fw +lib/firmware/dvb-fe-or51211.fw +#lib/firmware/dvb-ttpci-01.fw-261a +#lib/firmware/dvb-ttpci-01.fw-261b +#lib/firmware/dvb-ttpci-01.fw-261c +#lib/firmware/dvb-ttpci-01.fw-261d +#lib/firmware/dvb-ttpci-01.fw-261f +#lib/firmware/dvb-ttpci-01.fw-2622 +lib/firmware/dvb-usb-avertv-a800-02.fw +lib/firmware/dvb-usb-bluebird-01.fw +lib/firmware/dvb-usb-dibusb-5.0.0.11.fw +lib/firmware/dvb-usb-dibusb-6.0.0.8.fw +lib/firmware/dvb-usb-dtt200u-01.fw +lib/firmware/dvb-usb-terratec-h7-az6007.fw +lib/firmware/dvb-usb-terratec-h7-drxk.fw +lib/firmware/dvb-usb-umt-010-02.fw +lib/firmware/dvb-usb-vp702x-01.fw +lib/firmware/dvb-usb-vp7045-01.fw +lib/firmware/dvb-usb-wt220u-01.fw +lib/firmware/dvb-usb-wt220u-02.fw diff --git a/lfs/dvb-firmwares b/lfs/dvb-firmwares new file mode 100644 index 0000000..724c46b --- /dev/null +++ b/lfs/dvb-firmwares @@ -0,0 +1,75 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2012 IPFire Team <info(a)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 # +# 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 = 20110802 + +THISAPP = dvb-firmwares-$(VER) +DL_FILE = $(THISAPP).tar.bz2 +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/dvb-firmwares +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 330e19f9444a03f5338bab590ab9d728 + +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) + mkdir -p /lib/firmware + tar axf $(DIR_DL)/$(DL_FILE) \ + -C /lib/firmware/ + @$(POSTBUILD) diff --git a/make.sh b/make.sh index 0fe6cb4..781d477 100755 --- a/make.sh +++ b/make.sh @@ -372,6 +372,7 @@ buildipfire() { ipfiremake unzip ipfiremake which ipfiremake linux-firmware + ipfiremake dvb-firmwares ipfiremake zd1211-firmware ipfiremake rpi-firmware ipfiremake u-boot hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, thirteen, updated. 48bf31fa46150eb2698083aad5de140568df4b0d
by git＠ipfire.org 25 Oct '12

25 Oct '12

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 034363f52c85e0dc561fdae33f3b17971d75d947
by git＠ipfire.org 23 Oct '12

23 Oct '12

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. d6b4566d9cf63ab0848b508382b6daa836b5cc7d
by git＠ipfire.org 23 Oct '12

23 Oct '12

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 d6b4566d9cf63ab0848b508382b6daa836b5cc7d (commit) from d9efec0d7bc7bd6c0588ba978f6331a3449ddc8d (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 d6b4566d9cf63ab0848b508382b6daa836b5cc7d Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Oct 23 17:19:47 2012 +0200 credits.cgi: Update donation link. ----------------------------------------------------------------------- Summary of changes: html/cgi-bin/credits.cgi | 21 ++++++--------------- 1 files changed, 6 insertions(+), 15 deletions(-) Difference in files: diff --git a/html/cgi-bin/credits.cgi b/html/cgi-bin/credits.cgi index 3ae2f71..0d091a2 100644 --- a/html/cgi-bin/credits.cgi +++ b/html/cgi-bin/credits.cgi @@ -39,16 +39,11 @@ require "${General::swroot}/header.pl"; print <<END <p>$Lang::tr{'donation-text'}</p> - <div align="center"> - <form action="https://www.paypal.com/cgi-bin/webscr" method="post"> - <input type="hidden" name="cmd" value="_s-xclick"> - <input type="hidden" name="hosted_button_id" value="HHBTSN9QRWPAY"> - <input type="image" src="$Lang::tr{'donation-link'}" border="0" name="submit" alt="PayPal - The safer, easier way to pay online!"> - <img alt="" border="0" src="https://www.paypalobjects.com/de_DE/i/scr/pixel.gif" width="1" height="1"> - </form> - </div> -<br /> +<div align="center"> + <a href="http://www.ipfire.org/donate">$Lang::tr{'donation'}</a> +</div> +<br> END ; &Header::closebox(); @@ -73,8 +68,6 @@ Christian Schmidt (<a href='mailto:christian.schmidt\@ipfire.org'>christian.schmidt\(a)ipfire.org</a>) - Vice Project Leader <br /> Stefan Schantl (<a href='mailto:stefan.schantl\@ipfire.org'>stefan.schantl\(a)ipfire.org</a>)<br /> -Jan Paul Tücking -(<a href='mailto:jan.tuecking\@ipfire.org'>jan.tuecking\(a)ipfire.org</a>)<br /> Heiner Schmeling (<a href='mailto:heiner.schmeling\@ipfire.org'>heiner.schmeling\(a)ipfire.org</a>)<br /> Ronald Wiesinger @@ -94,12 +87,10 @@ Peter Pfeiffer (<a href='mailto:peter.pfeifer\@ipfire.org'>peter.pfeifer\(a)ipfire.org</a>)<br /> Peter Schälchli (<a href='mailto:peter.schaelchli\@ipfire.org'>peter.schaelchli\(a)ipfire.org</a>)<br /> +Jan Paul Tücking +(<a href='mailto:jan.tuecking\@ipfire.org'>jan.tuecking\(a)ipfire.org</a>)<br /> </p> -<p>Some parts of the distribution are left ajar on third-party software, that is licensed under the GPL, too.<br /> -There are: Advanced Proxy with URL-Filter and Update-Accelerator, ZERINA, Connection Scheduler, Hddtemp and Wake-on-LAN.<br /> -Distributed by Marco Sondermann, Ufuk Altinkaynak, Thomas Eichstaedt and Olaf Westrik.</p> <p> - This product includes GeoLite data created by MaxMind, available from <a href='http://www.maxmind.com/' target="_blank">http://www.maxmind.com/</a>. </p> END hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 2164f1b9e8a239ae48a0c962ee35e25b7bfe99eb
by git＠ipfire.org 23 Oct '12

23 Oct '12

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 3.x development tree". The branch, master has been updated via 2164f1b9e8a239ae48a0c962ee35e25b7bfe99eb (commit) via 5830fe1bbd9a7b20c614e04f79130dab93a87083 (commit) from 1c3d88730e658c72de1164489694f9b62c071b49 (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 2164f1b9e8a239ae48a0c962ee35e25b7bfe99eb Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Oct 23 16:34:11 2012 +0200 libnetfilter_log: Fix build problem on i686. commit 5830fe1bbd9a7b20c614e04f79130dab93a87083 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Oct 23 16:32:30 2012 +0200 libnetfilter_conntrack: Fix build problem on i686. ----------------------------------------------------------------------- Summary of changes: libnetfilter_conntrack/libnetfilter_conntrack.nm | 15 ++++++++------- libnetfilter_log/libnetfilter_log.nm | 11 ++++++----- 2 files changed, 14 insertions(+), 12 deletions(-) Difference in files: diff --git a/libnetfilter_conntrack/libnetfilter_conntrack.nm b/libnetfilter_conntrack/libnetfilter_conntrack.nm index d423d59..2d4e756 100644 --- a/libnetfilter_conntrack/libnetfilter_conntrack.nm +++ b/libnetfilter_conntrack/libnetfilter_conntrack.nm @@ -5,7 +5,7 @@ name = libnetfilter_conntrack version = 1.0.2 -release = 2 +release = 3 groups = System/Libraries url = http://www.netfilter.org/projects/libnetfilter_conntrack/index.html @@ -22,15 +22,16 @@ source_dl = http://www.netfilter.org/projects/libnetfilter_conntrack/files/ sources = %{thisapp}.tar.bz2 build - # Disable any optimization. - if "%{DISTRO_ARCH}" == "i686" - CFLAGS += -O0 - end - requires + autoconf + automake libmnl-devel >= 1.0.3 libnfnetlink-devel - pkg-config + end + + prepare_cmds + sed -e "s/-Wc,-nostartfiles//g" -i src/Makefile* + autoreconf -vfi end make_build_targets += V=1 diff --git a/libnetfilter_log/libnetfilter_log.nm b/libnetfilter_log/libnetfilter_log.nm index 0d6f079..22c5b3f 100644 --- a/libnetfilter_log/libnetfilter_log.nm +++ b/libnetfilter_log/libnetfilter_log.nm @@ -5,7 +5,7 @@ name = libnetfilter_log version = 1.0.1 -release = 1 +release = 2 groups = System/Libraries url = http://www.netfilter.org/projects/libnetfilter_log/downloads.html @@ -24,13 +24,14 @@ sources = %{thisapp}.tar.bz2 build requires + autoconf + automake libnfnetlink-devel end - # Disable any optimization because of - # https://bugzilla.ipfire.org/show_bug.cgi?id=10018 - if "%{DISTRO_ARCH}" == "i686" - CFLAGS += -O0 + prepare_cmds + sed -e "s/-Wc,-nostartfiles//g" -i src/Makefile* + autoreconf -vfi end make_build_targets += CFLAGS="%{CFLAGS}" hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 1c3d88730e658c72de1164489694f9b62c071b49
by git＠ipfire.org 22 Oct '12

22 Oct '12

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 3.x development tree". The branch, master has been updated via 1c3d88730e658c72de1164489694f9b62c071b49 (commit) from 82b1b04c24b9feef24e9715efa845781aa75378f (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 1c3d88730e658c72de1164489694f9b62c071b49 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Mon Oct 22 21:41:29 2012 +0200 pdns: Don't use bundeled polarssl. In the past pdns has compiled it's own bundeled polarssl during build. Now we are linking the binaries to a shared system library of polarssl. The IPFire project doesn't want any bundeled libraries, because we are not able to fix any security issures on it. Fixes #10241. ----------------------------------------------------------------------- Summary of changes: pdns/patches/pdns-3.1-use-system-polarssl.patch | 132 +++++++++++++++++++++++ pdns/pdns.nm | 9 ++- 2 files changed, 140 insertions(+), 1 deletions(-) create mode 100644 pdns/patches/pdns-3.1-use-system-polarssl.patch Difference in files: diff --git a/pdns/patches/pdns-3.1-use-system-polarssl.patch b/pdns/patches/pdns-3.1-use-system-polarssl.patch new file mode 100644 index 0000000..66644f4 --- /dev/null +++ b/pdns/patches/pdns-3.1-use-system-polarssl.patch @@ -0,0 +1,132 @@ +diff -Nur a/configure.ac b/configure.ac +--- a/configure.ac 2012-05-04 12:13:23.000000000 +0200 ++++ b/configure.ac 2012-10-13 17:10:49.686258971 +0200 +@@ -162,6 +162,32 @@ + fi + AC_MSG_RESULT($enable_verbose_logging) + ++AC_MSG_CHECKING(whether we will try to link in system PolarSSL) ++AC_ARG_WITH([system-polarssl], ++ [AC_HELP_STRING([--without-system-polarssl], [Do not use system PolarSSL])], ++ [system_polarssl=$withval], ++ [system_polarssl=yes]) ++AC_MSG_RESULT($system_polarssl) ++AM_CONDITIONAL(HAVE_LIBPOLARSSL, false) ++if test x$system_polarssl = xyes; then ++ AC_MSG_CHECKING([PolarSSL version >= 1.1]) ++ AC_COMPILE_IFELSE( ++ [AC_LANG_PROGRAM( ++ [[ ++#include <polarssl/version.h> ++ ]], ++ [[ ++#if POLARSSL_VERSION_MAJOR < 1 || (POLARSSL_VERSION_MAJOR == 1 && POLARSSL_VERSION_MINOR < 1) ++#error invalid version ++#endif ++ ]] ++ )], [use_system_polarssl=yes], [use_system_polarssl=no]) ++ AC_MSG_RESULT($use_system_polarssl) ++fi ++if test x$use_system_polarssl = xyes; then ++ AC_CHECK_LIB([polarssl], [sha1_hmac]) ++fi ++ + AC_MSG_CHECKING(whether we will be linking in Botan 1.10) + AC_ARG_ENABLE(botan1.10, + [ --enable-botan1.10 Use Botan 1.10],enable_botan110=yes, enable_botan110=no) +diff -Nur a/pdns/Makefile.am b/pdns/Makefile.am +--- a/pdns/Makefile.am 2012-05-04 12:13:23.000000000 +0200 ++++ b/pdns/Makefile.am 2012-10-13 17:11:56.293629151 +0200 +@@ -1,4 +1,8 @@ +-AM_CXXFLAGS=-DSYSCONFDIR=\"@sysconfdir@\" -DLIBDIR=\"@libdir@\" -DLOCALSTATEDIR=\"@socketdir@\" -Ibackends/bind @THREADFLAGS@ $(LUA_CFLAGS) $(SQLITE3_CFLAGS) -Iext/polarssl-1.1.2/include ++if HAVE_LIBPOLARSSL ++AM_CXXFLAGS=-DSYSCONFDIR=\"@sysconfdir@\" -DLIBDIR=\"@libdir@\" -DLOCALSTATEDIR=\"@socketdir@\" -Ibackends/bind @THREADFLAGS@ $(LUA_CFLAGS) $(SQLITE3_CFLAGS) -DPDNS_ENABLE_LUA ++else ++AM_CXXFLAGS=-DSYSCONFDIR=\"@sysconfdir@\" -DLIBDIR=\"@libdir@\" -DLOCALSTATEDIR=\"@socketdir@\" -Ibackends/bind @THREADFLAGS@ $(LUA_CFLAGS) $(SQLITE3_CFLAGS) -Iext/polarssl-1.1.2/include -DPDNS_ENABLE_LUA ++endif + AM_CPPFLAGS=-Ibackends/bind $(BOOST_CPPFLAGS) @THREADFLAGS@ + + EXTRA_DIST = dnslabeltext.rl dnslabeltext.cc mtasker.cc inflighter.cc docs/pdns_control.8 \ +@@ -7,7 +11,11 @@ + no-dnssec.schema.mysql.sql no-dnssec.schema.pgsql.sql no-dnssec.schema.sqlite3.sql \ + bind-dnssec.schema.sqlite3.sql + ++if HAVE_LIBPOLARSSL ++SUBDIRS= backends ++else + SUBDIRS= ext/polarssl-1.1.2 backends ++endif + + BUILT_SOURCES=bind-dnssec.schema.sqlite3.sql.h + +@@ -130,7 +138,11 @@ + aes/aescrypt.c aes/aes.h aes/aeskey.c aes/aes_modes.c aes/aesopt.h \ + aes/aestab.c aes/aestab.h aes/brg_endian.h aes/brg_types.h aes/dns_random.cc \ + randomhelper.cc dns.cc ++if HAVE_LIBPOLARSSL ++tsig_tests_LDFLAGS= ++else + tsig_tests_LDFLAGS= -Lext/polarssl-1.1.2/library ++endif + tsig_tests_LDADD= -lpolarssl + + +diff -Nur a/pdns/backends/bind/Makefile.am b/pdns/backends/bind/Makefile.am +--- a/pdns/backends/bind/Makefile.am 2012-05-04 12:13:23.000000000 +0200 ++++ b/pdns/backends/bind/Makefile.am 2012-10-13 17:10:49.691259001 +0200 +@@ -34,10 +34,18 @@ + ../../nsecrecords.cc ../../dnssecinfra.cc ../../base32.cc ../../md5.cc # ../../dbdnsseckeeper.cc + + zone2ldap_LDFLAGS=@THREADFLAGS@ ++if HAVE_LIBPOLARSSL ++zone2ldap_LDADD= ++else + zone2ldap_LDADD= ../../ext/polarssl-1.1.2/library/libpolarssl.a ++endif + + zone2sql_LDFLAGS=@THREADFLAGS@ ++if HAVE_LIBPOLARSSL ++zone2sql_LDADD= ++else + zone2sql_LDADD= ../../ext/polarssl-1.1.2/library/libpolarssl.a ++endif + + AM_LFLAGS = -s -i + AM_YFLAGS = -d --verbose --debug +diff -Nur a/pdns/dnssecinfra.cc b/pdns/dnssecinfra.cc +--- a/pdns/dnssecinfra.cc 2012-05-04 12:13:23.000000000 +0200 ++++ b/pdns/dnssecinfra.cc 2012-10-13 17:10:49.690258995 +0200 +@@ -9,7 +9,11 @@ + #include <boost/algorithm/string.hpp> + #include "dnssecinfra.hh" + #include "dnsseckeeper.hh" ++#ifdef HAVE_LIBPOLARSSL ++#include <polarssl/sha1.h> ++#else + #include "ext/polarssl-1.1.2/include/polarssl/sha1.h" ++#endif + #include <boost/assign/std/vector.hpp> // for 'operator+=()' + #include <boost/assign/list_inserter.hpp> + #include "base64.hh" +diff -Nur a/pdns/polarrsakeyinfra.cc b/pdns/polarrsakeyinfra.cc +--- a/pdns/polarrsakeyinfra.cc 2012-05-04 12:13:23.000000000 +0200 ++++ b/pdns/polarrsakeyinfra.cc 2012-10-13 17:10:49.689258989 +0200 +@@ -1,9 +1,18 @@ ++#ifdef HAVE_LIBPOLARSSLSSL ++#include <polarssl/rsa.h> ++#include <polarssl/base64.h> ++#include <polarssl/sha1.h> ++#include <polarssl/sha2.h> ++#include <polarssl/sha4.h> ++#include <polarssl/havege.h> ++#else + #include "ext/polarssl-1.1.2/include/polarssl/rsa.h" + #include "ext/polarssl-1.1.2/include/polarssl/base64.h" + #include "ext/polarssl-1.1.2/include/polarssl/sha1.h" + #include "ext/polarssl-1.1.2/include/polarssl/sha2.h" + #include "ext/polarssl-1.1.2/include/polarssl/sha4.h" + #include "ext/polarssl-1.1.2/include/polarssl/havege.h" ++#endif + #include <boost/assign/std/vector.hpp> // for 'operator+=()' + #include <boost/foreach.hpp> + #include "dnssecinfra.hh" diff --git a/pdns/pdns.nm b/pdns/pdns.nm index 7ff4f77..35f5697 100644 --- a/pdns/pdns.nm +++ b/pdns/pdns.nm @@ -5,7 +5,7 @@ name = pdns version = 3.1 -release = 3 +release = 4 groups = Networking/DNS url = http://powerdns.com/ @@ -23,10 +23,14 @@ source_dl = http://downloads.powerdns.com/releases/ build requires + autoconf + automake boost-devel chrpath gcc-c++ + libtool lua-devel + polarssl-devel shadow-utils sqlite-devel zlib-devel @@ -44,6 +48,9 @@ build --disable-static prepare_cmds + # Regenerate build system. + autoreconf -vfi + %{create_user} end hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 82b1b04c24b9feef24e9715efa845781aa75378f
by git＠ipfire.org 22 Oct '12

22 Oct '12

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 3.x development tree". The branch, master has been updated via 82b1b04c24b9feef24e9715efa845781aa75378f (commit) via 3078b82b80b1ff11fa701ae0f88740b8259024a0 (commit) from 1429c8568c51b9c3c9f74833902c1e87e44cf457 (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 82b1b04c24b9feef24e9715efa845781aa75378f Merge: 1429c85 3078b82 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Oct 22 17:41:29 2012 +0200 Merge remote-tracking branch 'ms/pdns' commit 3078b82b80b1ff11fa701ae0f88740b8259024a0 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Oct 20 10:05:23 2012 +0000 Sanitize pdns and pdns-recursor package. ----------------------------------------------------------------------- Summary of changes: pdns-recursor/pdns-recursor.nm | 11 ++++--- pdns-recursor/recursor.conf | 10 +++++- pdns-recursor/systemd/pdns-recursor.service | 4 +- pdns/pdns.conf | 41 ++++++++------------------ pdns/pdns.nm | 9 ++++- pdns/systemd/pdns.service | 8 ++-- 6 files changed, 40 insertions(+), 43 deletions(-) Difference in files: diff --git a/pdns-recursor/pdns-recursor.nm b/pdns-recursor/pdns-recursor.nm index a044e99..aa22152 100644 --- a/pdns-recursor/pdns-recursor.nm +++ b/pdns-recursor/pdns-recursor.nm @@ -5,7 +5,7 @@ name = pdns-recursor version = 3.3 -release = 7 +release = 8 groups = Networking/DNS url = http://powerdns.com/ @@ -39,16 +39,17 @@ build install make install DESTDIR=%{BUILDROOT} \ - CONFIGDIR=/etc/%{name} + CONFIGDIR="%{sysconfdir}/pdns" # Remove sysvinit file rm -rf %{BUILDROOT}/etc/init.d # Remove shipped config file - rm -rf %{BUILDROOT}/etc/%{name}/recursor.conf-dist + rm -rf %{BUILDROOT}%{sysconfdir}/pdns/recursor.conf-dist # Install our default config file - cp -vf %{DIR_SOURCE}/recursor.conf %{BUILDROOT}/etc/%{name}/recursor.conf + cp -vf %{DIR_SOURCE}/recursor.conf \ + %{BUILDROOT}%{sysconfdir}/pdns/recursor.conf # Create folder for chroot mkdir -pv %{BUILDROOT}/var/lib/pdns-recursor @@ -69,7 +70,7 @@ end packages package %{name} configfiles - /etc/%{name}/recursor.conf + %{sysconfdir}/pdns/recursor.conf end prerequires diff --git a/pdns-recursor/recursor.conf b/pdns-recursor/recursor.conf index 7ecc30b..284da99 100644 --- a/pdns-recursor/recursor.conf +++ b/pdns-recursor/recursor.conf @@ -1,7 +1,13 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # +############################################################################### -# XXX IPv6 listen on :: cannot be created. Says Address is already in use. -local-address=0.0.0.0 ::1 +# Listen settings +local-address=::1 +local-port=54 +# Socket settings socket-dir=/run/pdns-recursor socket-group=pdns-recursor socket-owner=pdns-recursor diff --git a/pdns-recursor/systemd/pdns-recursor.service b/pdns-recursor/systemd/pdns-recursor.service index f0aa1ab..0d3c99a 100644 --- a/pdns-recursor/systemd/pdns-recursor.service +++ b/pdns-recursor/systemd/pdns-recursor.service @@ -1,12 +1,12 @@ [Unit] -Description=Power DNS Recursor +Description=Power DNS Recursor Daemon After=network.target [Service] ExecStart=/usr/sbin/pdns_recursor --daemon=no ExecStopPost=/bin/rm -f /run/pdns-recursor/pdns_recursor.pid ExecStopPost=/bin/rm -f /run/pdns-recursor/pdns_recursor.controlsocket -Restart=always +Restart=on-failure [Install] WantedBy=multi-user.target diff --git a/pdns/pdns.conf b/pdns/pdns.conf index 82b67c1..0630ed5 100644 --- a/pdns/pdns.conf +++ b/pdns/pdns.conf @@ -1,30 +1,14 @@ ############################################################################### -## # -## IPFire.org - A linux based firewall # -## Copyright (C) 2012 IPFire Development 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 # -## 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/>. # -## # -################################################################################ -# -## These file contains the default configuration for the PowerDNS service. -# -# An example configuration file with all provided options can be found on -# /etc/pdns/pdns.conf-dist. -# -daemon=no -socket-dir=/run/pdns/ +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # +############################################################################### +# This file contains the default configuration for the PowerDNS service. +socket-dir=/run/pdns + +# Listing settings. +# XXX IPv6 listen on :: cannot be created. Says Address is already in use. +local-address=0.0.0.0 +local-ipv6=::1 # Run powerdns as the following user and group. setuid=pdns @@ -35,5 +19,6 @@ launch=gsqlite3 #launch=gsqlite3-dnssec gsqlite3-database=/var/lib/pdns/pdns.db -# Enable if you also have installed the pdns-recursor. -#recursor=127.0.0.1:54 +# All queries that could not be answered by ourself get sent to +# the local recursor. +recursor=[::1]:54 diff --git a/pdns/pdns.nm b/pdns/pdns.nm index 939e980..7ff4f77 100644 --- a/pdns/pdns.nm +++ b/pdns/pdns.nm @@ -5,7 +5,7 @@ name = pdns version = 3.1 -release = 2 +release = 3 groups = Networking/DNS url = http://powerdns.com/ @@ -59,6 +59,7 @@ build # Install default configuration. install -m 0644 %{DIR_SOURCE}/pdns.conf \ %{BUILDROOT}%{sysconfdir}/pdns/pdns.conf + rm -vf %{BUILDROOT}%{sysconfdir}/pdns/pdns.conf-dist # Create empty database file. touch %{BUILDROOT}%{sharedstatedir}/pdns/pdns.db @@ -94,9 +95,13 @@ packages shadow-utils sqlite end + + requires + pdns-recursor >= 3.3-8 + end configfiles - /etc/pdns/pdns.conf + %{sysconfdir}/pdns/pdns.conf end script prein diff --git a/pdns/systemd/pdns.service b/pdns/systemd/pdns.service index d9877ad..daad29d 100644 --- a/pdns/systemd/pdns.service +++ b/pdns/systemd/pdns.service @@ -1,12 +1,12 @@ [Unit] -Description=PDNS DNS Server -After=syslog.target network.target +Description=PowerDNS DNS Server Daemon +After=syslog.target [Service] -Type=forking -ExecStart=/usr/sbin/pdns_server --daemon --guardian=yes +ExecStart=/usr/sbin/pdns_server --daemon=no ExecReload=/usr/bin/pdns_control cycle ExecStop=/usr/bin/pdns_control quit +Restart=on-failure [Install] WantedBy=multi-user.target hooks/post-receive -- IPFire 3.x development tree

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM