IPFire-SCM January 2013

ipfire-scm@lists.ipfire.org

1 participants
62 discussions

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. d14229c0da139a3dca3bff3b95a6dafdc7a52f93
by git＠ipfire.org 05 Jan '13

05 Jan '13

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 d14229c0da139a3dca3bff3b95a6dafdc7a52f93 (commit) from 7234a472adac6d5e8111c529570fe4cfe873fac0 (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 d14229c0da139a3dca3bff3b95a6dafdc7a52f93 Author: Arne Fitzenreiter <Arne_F(a)ipfire.org> Date: Sat Jan 5 15:13:55 2013 +0100 kernel: bump package version. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/66/update.sh | 4 ++-- lfs/linux | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) Difference in files: diff --git a/config/rootfiles/core/66/update.sh b/config/rootfiles/core/66/update.sh index cf40844..750f8aa 100644 --- a/config/rootfiles/core/66/update.sh +++ b/config/rootfiles/core/66/update.sh @@ -114,7 +114,7 @@ add_to_backup usr/local/bin/vpn-watch add_to_backup usr/libexec/ipsec # Backup the files -tar cJvf /var/ipfire/backup/core-upgrade_$KVER.tar.xz \ +tar cJvf /var/ipfire/backup/core-upgrade$core_$KVER.tar.xz \ -C / -T /opt/pakfire/tmp/ROOTFILES --exclude='#*' --exclude='/var/cache' > /dev/null 2>&1 # Check diskspace on root @@ -321,7 +321,7 @@ if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then else echo "Name: linux-pae" > /opt/pakfire/db/installed/meta-linux-pae echo "ProgVersion: 3.2.35" >> /opt/pakfire/db/installed/meta-linux-pae - echo "Release: 24" >> /opt/pakfire/db/installed/meta-linux-pae + echo "Release: 25" >> /opt/pakfire/db/installed/meta-linux-pae fi fi diff --git a/lfs/linux b/lfs/linux index f8cd7d5..e85f21a 100644 --- a/lfs/linux +++ b/lfs/linux @@ -35,7 +35,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) CFLAGS = CXXFLAGS = -PAK_VER = 25 +PAK_VER = 26 DEPS = "" VERSUFIX=ipfire$(KCFG) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 7234a472adac6d5e8111c529570fe4cfe873fac0
by git＠ipfire.org 05 Jan '13

05 Jan '13

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 7234a472adac6d5e8111c529570fe4cfe873fac0 (commit) from c36da4cb06f15d1d6bb39ad7961b7efd2e15a18b (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 7234a472adac6d5e8111c529570fe4cfe873fac0 Author: Arne Fitzenreiter <Arne_F(a)ipfire.org> Date: Sat Jan 5 11:08:29 2013 +0100 git: fix rootfile. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/packages/git | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Difference in files: diff --git a/config/rootfiles/packages/git b/config/rootfiles/packages/git index c3204b9..ada23da 100644 --- a/config/rootfiles/packages/git +++ b/config/rootfiles/packages/git @@ -22,8 +22,8 @@ usr/lib/perl5/site_perl/5.12.3/Git/I18N.pm #usr/lib/perl5/site_perl/5.12.3/Git/SVN/Prompt.pm #usr/lib/perl5/site_perl/5.12.3/Git/SVN/Ra.pm #usr/lib/perl5/site_perl/5.12.3/Git/SVN/Utils.pm -#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Git -#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Git/.packlist +#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Git +#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Git/.packlist usr/lib/python2.7/site-packages/git_remote_helpers #usr/lib/python2.7/site-packages/git_remote_helpers-0.1.0-py2.7.egg-info usr/lib/python2.7/site-packages/git_remote_helpers/__init__.py hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. c36da4cb06f15d1d6bb39ad7961b7efd2e15a18b
by git＠ipfire.org 04 Jan '13

04 Jan '13

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 c36da4cb06f15d1d6bb39ad7961b7efd2e15a18b (commit) via eed187d68ba226aa60721b5edf1ce50fce8459e1 (commit) from 8cb035bac87b663e871960b90a11b811923d51f9 (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 c36da4cb06f15d1d6bb39ad7961b7efd2e15a18b Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Jan 4 23:55:08 2013 +0100 kernel: fix pae kernel uninstall. we have not enough space to left older versions without cleanup at update. commit eed187d68ba226aa60721b5edf1ce50fce8459e1 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Jan 4 23:54:46 2013 +0100 kernel: update to 3.2.36. ----------------------------------------------------------------------- Summary of changes: lfs/linux | 6 +++--- src/paks/linux-pae/install.sh | 4 ++-- src/paks/linux-pae/uninstall.sh | 9 +++++++-- src/paks/linux-pae/update.sh | 5 ++--- 4 files changed, 14 insertions(+), 10 deletions(-) Difference in files: diff --git a/lfs/linux b/lfs/linux index 547ae9b..f8cd7d5 100644 --- a/lfs/linux +++ b/lfs/linux @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2012 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2013 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 # @@ -24,7 +24,7 @@ include Config -VER = 3.2.35 +VER = 3.2.36 RPI_PATCHES = linux-3.2.27-ada8b44 @@ -71,7 +71,7 @@ objects =$(DL_FILE) \ $(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE) rpi-patches-$(RPI_PATCHES).patch.xz = $(URL_IPFIRE)/rpi-patches-$(RPI_PATCHES).patch.xz -$(DL_FILE)_MD5 = 4566af86b5ae8f9dfce2442ccac79cc3 +$(DL_FILE)_MD5 = 9b92ea2160a9a383fad7487b5cfd653b rpi-patches-$(RPI_PATCHES).patch.xz_MD5 = 966687ff27e450e04ff50e0da829dc00 install : $(TARGET) diff --git a/src/paks/linux-pae/install.sh b/src/paks/linux-pae/install.sh index 59e17bf..ab74051 100644 --- a/src/paks/linux-pae/install.sh +++ b/src/paks/linux-pae/install.sh @@ -17,7 +17,7 @@ # 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-2011 IPFire-Team <info(a)ipfire.org>. # +# Copyright (C) 2007-2013 IPFire-Team <info(a)ipfire.org>. # # # ############################################################################ # @@ -54,7 +54,7 @@ fi # # backup grub.conf # -cp /boot/grub/grub.conf /boot/grub/grub-backup-$KVER-pae.conf +cp /boot/grub/grub.conf /boot/grub/grub-backup-$KVER-pae_install.conf # # Add new Entry to grub.conf # diff --git a/src/paks/linux-pae/uninstall.sh b/src/paks/linux-pae/uninstall.sh index 959fdb1..69c7e56 100644 --- a/src/paks/linux-pae/uninstall.sh +++ b/src/paks/linux-pae/uninstall.sh @@ -17,10 +17,15 @@ # along with IPFire; if not, write to the Free Software # # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # # -# Copyright (C) 2010 IPFire-Team <info(a)ipfire.org>. # +# Copyright (C) 2007-2013 IPFire-Team <info(a)ipfire.org>. # # # ############################################################################ # . /opt/pakfire/lib/functions.sh remove_files -#mv -f /boot/grub/grub-backup-2.6.32.*-pae.conf /boot/grub/grub.conf +rm -rf /boot/ipfirerd-*-pae.img +rm -rf /lib/modules/*-ipfire-pae +cp /boot/grub/grub.conf /boot/grub/grub-backup-pae_uninstall.conf +sed -i "/title IPFire (PAE-Kernel)/,+3d" /boot/grub/grub.conf +grub-set-default 1 +sync && sync diff --git a/src/paks/linux-pae/update.sh b/src/paks/linux-pae/update.sh index 2878dfb..1ad1831 100644 --- a/src/paks/linux-pae/update.sh +++ b/src/paks/linux-pae/update.sh @@ -17,11 +17,10 @@ # 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-2011 IPFire-Team <info(a)ipfire.org>. # +# Copyright (C) 2007-2013 IPFire-Team <info(a)ipfire.org>. # # # ############################################################################ # . /opt/pakfire/lib/functions.sh -#Don't remove old pae kernel at update -#./uninstall.sh +./uninstall.sh ./install.sh hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 8cb035bac87b663e871960b90a11b811923d51f9
by git＠ipfire.org 04 Jan '13

04 Jan '13

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 8cb035bac87b663e871960b90a11b811923d51f9 (commit) via 4fa6aa529ddbad85b6c9d00b4fe28e8454335b76 (commit) via 28481f108351456c46ea7aec7e46b9cc05068553 (commit) from f224c3f26535c5b8c7530f32af933697c9678fb2 (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 8cb035bac87b663e871960b90a11b811923d51f9 Merge: 4fa6aa5 f224c3f Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Jan 4 15:10:12 2013 +0100 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next commit 4fa6aa529ddbad85b6c9d00b4fe28e8454335b76 Merge: 6201ce6 28481f1 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Jan 4 15:10:07 2013 +0100 Merge remote-tracking branch 'stevee/git-update' into next commit 28481f108351456c46ea7aec7e46b9cc05068553 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Thu Jan 3 07:40:42 2013 +0100 git: Update to 1.8.1. This is a mayor update to the latest stable version of git. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/packages/git | 39 +++++++++++++++++++++++++++++++++++++-- lfs/git | 6 +++--- 2 files changed, 40 insertions(+), 5 deletions(-) Difference in files: diff --git a/config/rootfiles/packages/git b/config/rootfiles/packages/git index a2691df..c3204b9 100644 --- a/config/rootfiles/packages/git +++ b/config/rootfiles/packages/git @@ -9,8 +9,21 @@ usr/lib/perl5/site_perl/5.12.3/Error.pm usr/lib/perl5/site_perl/5.12.3/Git usr/lib/perl5/site_perl/5.12.3/Git.pm usr/lib/perl5/site_perl/5.12.3/Git/I18N.pm -#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Git -#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Git/.packlist +#usr/lib/perl5/site_perl/5.12.3/Git/IndexInfo.pm +#usr/lib/perl5/site_perl/5.12.3/Git/SVN +#usr/lib/perl5/site_perl/5.12.3/Git/SVN.pm +#usr/lib/perl5/site_perl/5.12.3/Git/SVN/Editor.pm +#usr/lib/perl5/site_perl/5.12.3/Git/SVN/Fetcher.pm +#usr/lib/perl5/site_perl/5.12.3/Git/SVN/GlobSpec.pm +#usr/lib/perl5/site_perl/5.12.3/Git/SVN/Log.pm +#usr/lib/perl5/site_perl/5.12.3/Git/SVN/Memoize +#usr/lib/perl5/site_perl/5.12.3/Git/SVN/Memoize/YAML.pm +#usr/lib/perl5/site_perl/5.12.3/Git/SVN/Migration.pm +#usr/lib/perl5/site_perl/5.12.3/Git/SVN/Prompt.pm +#usr/lib/perl5/site_perl/5.12.3/Git/SVN/Ra.pm +#usr/lib/perl5/site_perl/5.12.3/Git/SVN/Utils.pm +#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Git +#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Git/.packlist usr/lib/python2.7/site-packages/git_remote_helpers #usr/lib/python2.7/site-packages/git_remote_helpers-0.1.0-py2.7.egg-info usr/lib/python2.7/site-packages/git_remote_helpers/__init__.py @@ -54,10 +67,12 @@ usr/libexec/git-core/git-cherry-pick usr/libexec/git-core/git-citool usr/libexec/git-core/git-clean usr/libexec/git-core/git-clone +usr/libexec/git-core/git-column usr/libexec/git-core/git-commit usr/libexec/git-core/git-commit-tree usr/libexec/git-core/git-config usr/libexec/git-core/git-count-objects +usr/libexec/git-core/git-credential usr/libexec/git-core/git-credential-cache usr/libexec/git-core/git-credential-cache--daemon usr/libexec/git-core/git-credential-store @@ -122,6 +137,7 @@ usr/libexec/git-core/git-mktree usr/libexec/git-core/git-mv usr/libexec/git-core/git-name-rev usr/libexec/git-core/git-notes +usr/libexec/git-core/git-p4 usr/libexec/git-core/git-pack-objects usr/libexec/git-core/git-pack-redundant usr/libexec/git-core/git-pack-refs @@ -149,6 +165,7 @@ usr/libexec/git-core/git-remote-ftps usr/libexec/git-core/git-remote-http usr/libexec/git-core/git-remote-https usr/libexec/git-core/git-remote-testgit +#usr/libexec/git-core/git-remote-testsvn usr/libexec/git-core/git-repack usr/libexec/git-core/git-replace usr/libexec/git-core/git-repo-config @@ -195,7 +212,9 @@ usr/libexec/git-core/git-write-tree usr/libexec/git-core/mergetools usr/libexec/git-core/mergetools/araxis usr/libexec/git-core/mergetools/bc3 +usr/libexec/git-core/mergetools/codecompare usr/libexec/git-core/mergetools/defaults +usr/libexec/git-core/mergetools/deltawalker usr/libexec/git-core/mergetools/diffuse usr/libexec/git-core/mergetools/ecmerge usr/libexec/git-core/mergetools/emerge @@ -298,7 +317,23 @@ usr/share/git-core/templates/info/exclude #usr/share/gitweb/static/git-logo.png #usr/share/gitweb/static/gitweb.css #usr/share/gitweb/static/gitweb.js +#usr/share/locale/da/LC_MESSAGES/git.mo +#usr/share/locale/de/LC_MESSAGES/git.mo #usr/share/locale/is/LC_MESSAGES/git.mo +#usr/share/locale/it/LC_MESSAGES/git.mo +#usr/share/locale/nl/LC_MESSAGES/git.mo +#usr/share/locale/pt_PT +#usr/share/locale/pt_PT/LC_MESSAGES +#usr/share/locale/pt_PT/LC_MESSAGES/git.mo +#usr/share/locale/sv/LC_MESSAGES/git.mo +#usr/share/locale/vi/LC_MESSAGES/git.mo +#usr/share/locale/zh_CN/LC_MESSAGES/git.mo #usr/share/man/man3/Git.3 #usr/share/man/man3/Git::I18N.3 +#usr/share/man/man3/Git::SVN::Editor.3 +#usr/share/man/man3/Git::SVN::Fetcher.3 +#usr/share/man/man3/Git::SVN::Memoize::YAML.3 +#usr/share/man/man3/Git::SVN::Prompt.3 +#usr/share/man/man3/Git::SVN::Ra.3 +#usr/share/man/man3/Git::SVN::Utils.3 #usr/share/man/man3/private-Error.3 diff --git a/lfs/git b/lfs/git index 82b90fd..615c5b4 100644 --- a/lfs/git +++ b/lfs/git @@ -24,7 +24,7 @@ include Config -VER = 1.7.9.3 +VER = 1.8.1 THISAPP = git-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = git -PAK_VER = 8 +PAK_VER = 9 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = f93b976649216d731fd9f9befb90a58c +$(DL_FILE)_MD5 = a2c6f4404c5e432b47474d246ca83c7e install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. f224c3f26535c5b8c7530f32af933697c9678fb2
by git＠ipfire.org 03 Jan '13

03 Jan '13

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 f224c3f26535c5b8c7530f32af933697c9678fb2 (commit) via a10733a5d8580b6ab8cff46235daab6547723781 (commit) from ac2f710771ba327b5b8fd1b8f3829b977d08aa24 (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 f224c3f26535c5b8c7530f32af933697c9678fb2 Author: Arne Fitzenreiter <Arne_F(a)ipfire.org> Date: Thu Jan 3 16:28:21 2013 +0100 red.up: add script to cleanup conntrack-table if red ip has changed. commit a10733a5d8580b6ab8cff46235daab6547723781 Author: Arne Fitzenreiter <Arne_F(a)ipfire.org> Date: Thu Jan 3 14:27:11 2013 +0100 conntrack-tools: add conntrack and needed deps. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/armv5tel/initscripts | 1 + config/rootfiles/common/conntrack-tools | 6 ++++ config/rootfiles/common/i586/initscripts | 1 + config/rootfiles/common/iptables | 38 +++++++++++++--------- config/rootfiles/common/libmnl | 7 ++++ config/rootfiles/core/66/filelists/conntrack-tools | 1 + config/rootfiles/core/66/filelists/files | 1 + config/rootfiles/core/66/filelists/libmnl | 1 + lfs/{libpng => conntrack-tools} | 10 +++--- lfs/iptables | 20 ++++++++++-- lfs/{libpng => libmnl} | 10 +++--- make.sh | 2 ++ .../init.d/networking/red.up/01-conntrack-cleanup | 25 ++++++++++++++ 13 files changed, 95 insertions(+), 28 deletions(-) create mode 100644 config/rootfiles/common/conntrack-tools create mode 100644 config/rootfiles/common/libmnl create mode 120000 config/rootfiles/core/66/filelists/conntrack-tools create mode 120000 config/rootfiles/core/66/filelists/libmnl copy lfs/{libpng => conntrack-tools} (93%) copy lfs/{libpng => libmnl} (93%) create mode 100644 src/initscripts/init.d/networking/red.up/01-conntrack-cleanup Difference in files: diff --git a/config/rootfiles/common/armv5tel/initscripts b/config/rootfiles/common/armv5tel/initscripts index 90f9be1..1a613ac 100644 --- a/config/rootfiles/common/armv5tel/initscripts +++ b/config/rootfiles/common/armv5tel/initscripts @@ -73,6 +73,7 @@ etc/rc.d/init.d/networking/red.down/10-ovpn etc/rc.d/init.d/networking/red.down/20-RL-firewall etc/rc.d/init.d/networking/red.down/99-D-dialctrl.pl #etc/rc.d/init.d/networking/red.up +etc/rc.d/init.d/networking/red.up/01-conntrack-cleanup etc/rc.d/init.d/networking/red.up/05-RS-dnsmasq etc/rc.d/init.d/networking/red.up/10-miniupnpd etc/rc.d/init.d/networking/red.up/10-multicast diff --git a/config/rootfiles/common/conntrack-tools b/config/rootfiles/common/conntrack-tools new file mode 100644 index 0000000..5ce29aa --- /dev/null +++ b/config/rootfiles/common/conntrack-tools @@ -0,0 +1,6 @@ +usr/sbin/conntrack +#usr/sbin/conntrackd +#usr/sbin/nfct +#usr/share/man/man8/conntrack.8 +#usr/share/man/man8/conntrackd.8 +#usr/share/man/man8/nfct.8 diff --git a/config/rootfiles/common/i586/initscripts b/config/rootfiles/common/i586/initscripts index 737e878..f26e244 100644 --- a/config/rootfiles/common/i586/initscripts +++ b/config/rootfiles/common/i586/initscripts @@ -75,6 +75,7 @@ etc/rc.d/init.d/networking/red.down/10-ovpn etc/rc.d/init.d/networking/red.down/20-RL-firewall etc/rc.d/init.d/networking/red.down/99-D-dialctrl.pl #etc/rc.d/init.d/networking/red.up +etc/rc.d/init.d/networking/red.up/01-conntrack-cleanup etc/rc.d/init.d/networking/red.up/05-RS-dnsmasq etc/rc.d/init.d/networking/red.up/10-miniupnpd etc/rc.d/init.d/networking/red.up/10-multicast diff --git a/config/rootfiles/common/iptables b/config/rootfiles/common/iptables index d30cbf5..39225a4 100644 --- a/config/rootfiles/common/iptables +++ b/config/rootfiles/common/iptables @@ -140,6 +140,18 @@ sbin/xtables-multi #usr/include/libiptc/xtcshared.h #usr/include/libipulog #usr/include/libipulog/libipulog.h +#usr/include/libnetfilter_conntrack +#usr/include/libnetfilter_conntrack/libnetfilter_conntrack.h +#usr/include/libnetfilter_conntrack/libnetfilter_conntrack_dccp.h +#usr/include/libnetfilter_conntrack/libnetfilter_conntrack_icmp.h +#usr/include/libnetfilter_conntrack/libnetfilter_conntrack_ipv4.h +#usr/include/libnetfilter_conntrack/libnetfilter_conntrack_ipv6.h +#usr/include/libnetfilter_conntrack/libnetfilter_conntrack_sctp.h +#usr/include/libnetfilter_conntrack/libnetfilter_conntrack_tcp.h +#usr/include/libnetfilter_conntrack/libnetfilter_conntrack_udp.h +#usr/include/libnetfilter_conntrack/linux_nfnetlink_conntrack.h +#usr/include/libnetfilter_cttimeout +#usr/include/libnetfilter_cttimeout/libnetfilter_cttimeout.h #usr/include/libnetfilter_queue #usr/include/libnetfilter_queue/libipq.h #usr/include/libnetfilter_queue/libnetfilter_queue.h @@ -149,14 +161,9 @@ sbin/xtables-multi #usr/include/libnfnetlink/linux_nfnetlink.h #usr/include/libnfnetlink/linux_nfnetlink_compat.h #usr/include/linux/netfilter/Kbuild -#usr/include/linux/netfilter/ipset #usr/include/linux/netfilter/ipset/Kbuild -#usr/include/linux/netfilter/ipset/ip_set.h #usr/include/linux/netfilter/ipset/ip_set_ahash.h -#usr/include/linux/netfilter/ipset/ip_set_bitmap.h #usr/include/linux/netfilter/ipset/ip_set_getport.h -#usr/include/linux/netfilter/ipset/ip_set_hash.h -#usr/include/linux/netfilter/ipset/ip_set_list.h #usr/include/linux/netfilter/ipset/ip_set_timeout.h #usr/include/linux/netfilter/ipset/pfxlen.h #usr/include/linux/netfilter/nf_conntrack_amanda.h @@ -171,23 +178,20 @@ sbin/xtables-multi #usr/include/linux/netfilter/nf_conntrack_sip.h #usr/include/linux/netfilter/nf_conntrack_snmp.h #usr/include/linux/netfilter/nf_conntrack_tftp.h -#usr/include/linux/netfilter/xt_AUDIT.h -#usr/include/linux/netfilter/xt_CHECKSUM.h -#usr/include/linux/netfilter/xt_CT.h -#usr/include/linux/netfilter/xt_IDLETIMER.h #usr/include/linux/netfilter/xt_IMQ.h -#usr/include/linux/netfilter/xt_TEE.h -#usr/include/linux/netfilter/xt_addrtype.h -#usr/include/linux/netfilter/xt_cpu.h -#usr/include/linux/netfilter/xt_devgroup.h -#usr/include/linux/netfilter/xt_ipvs.h #usr/include/linux/netfilter/xt_layer7.h -#usr/include/linux/netfilter/xt_set.h -#usr/include/linux/netfilter/xt_socket.h #usr/include/net/netfilter #usr/include/net/netfilter/nf_conntrack_tuple.h #usr/include/net/netfilter/nf_nat.h #usr/include/xtables.h +#usr/lib/libnetfilter_conntrack.la +usr/lib/libnetfilter_conntrack.so +usr/lib/libnetfilter_conntrack.so.3 +usr/lib/libnetfilter_conntrack.so.3.4.0 +#usr/lib/libnetfilter_cttimeout.la +usr/lib/libnetfilter_cttimeout.so +usr/lib/libnetfilter_cttimeout.so.1 +usr/lib/libnetfilter_cttimeout.so.1.0.0 #usr/lib/libnetfilter_queue.a #usr/lib/libnetfilter_queue.la usr/lib/libnetfilter_queue.so @@ -207,6 +211,8 @@ usr/lib/libnfnetlink.so.0.2.0 #usr/lib/pkgconfig/libip6tc.pc #usr/lib/pkgconfig/libipq.pc #usr/lib/pkgconfig/libiptc.pc +#usr/lib/pkgconfig/libnetfilter_conntrack.pc +#usr/lib/pkgconfig/libnetfilter_cttimeout.pc #usr/lib/pkgconfig/libnetfilter_queue.pc #usr/lib/pkgconfig/libnfnetlink.pc #usr/lib/pkgconfig/xtables.pc diff --git a/config/rootfiles/common/libmnl b/config/rootfiles/common/libmnl new file mode 100644 index 0000000..36732c4 --- /dev/null +++ b/config/rootfiles/common/libmnl @@ -0,0 +1,7 @@ +#usr/include/libmnl +#usr/include/libmnl/libmnl.h +#usr/lib/libmnl.la +usr/lib/libmnl.so +usr/lib/libmnl.so.0 +usr/lib/libmnl.so.0.1.0 +#usr/lib/pkgconfig/libmnl.pc diff --git a/config/rootfiles/core/66/filelists/conntrack-tools b/config/rootfiles/core/66/filelists/conntrack-tools new file mode 120000 index 0000000..88fbe06 --- /dev/null +++ b/config/rootfiles/core/66/filelists/conntrack-tools @@ -0,0 +1 @@ +../../../common/conntrack-tools \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/files b/config/rootfiles/core/66/filelists/files index bf51301..91142e0 100644 --- a/config/rootfiles/core/66/filelists/files +++ b/config/rootfiles/core/66/filelists/files @@ -7,6 +7,7 @@ etc/rc.d/init.d/halt etc/rc.d/init.d/leds etc/rc.d/init.d/mountfs etc/rc.d/init.d/network +etc/rc.d/init.d/networking/red.up/01-conntrack-cleanup etc/rc.d/init.d/networking/red.up/98-leds etc/rc.d/init.d/partresize etc/rc.d/init.d/reboot diff --git a/config/rootfiles/core/66/filelists/libmnl b/config/rootfiles/core/66/filelists/libmnl new file mode 120000 index 0000000..f671c41 --- /dev/null +++ b/config/rootfiles/core/66/filelists/libmnl @@ -0,0 +1 @@ +../../../common/libmnl \ No newline at end of file diff --git a/lfs/conntrack-tools b/lfs/conntrack-tools new file mode 100644 index 0000000..f5ea315 --- /dev/null +++ b/lfs/conntrack-tools @@ -0,0 +1,77 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2013 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 = 1.2.2 + +THISAPP = conntrack-tools-$(VER) +DL_FILE = $(THISAPP).tar.bz2 +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 = a8afc813e16265655f83991fc0df35b6 + +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 axf $(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/iptables b/lfs/iptables index ceb560d..a247ba7 100644 --- a/lfs/iptables +++ b/lfs/iptables @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2013 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,17 +38,23 @@ TARGET = $(DIR_INFO)/$(THISAPP) objects = $(DL_FILE) \ netfilter-layer7-v2.22.tar.gz \ libnfnetlink-1.0.0.tar.bz2 \ - libnetfilter_queue-0.0.17.tar.bz2 + libnetfilter_queue-0.0.17.tar.bz2 \ + libnetfilter_conntrack-1.0.2.tar.bz2 \ + libnetfilter_cttimeout-1.0.0.tar.bz2 $(DL_FILE) = $(DL_FROM)/$(DL_FILE) netfilter-layer7-v2.22.tar.gz = $(URL_IPFIRE)/netfilter-layer7-v2.22.tar.gz libnfnetlink-1.0.0.tar.bz2 = $(URL_IPFIRE)/libnfnetlink-1.0.0.tar.bz2 libnetfilter_queue-0.0.17.tar.bz2 = $(URL_IPFIRE)/libnetfilter_queue-0.0.17.tar.bz2 +libnetfilter_conntrack-1.0.2.tar.bz2 = $(URL_IPFIRE)/libnetfilter_conntrack-1.0.2.tar.bz2 +libnetfilter_cttimeout-1.0.0.tar.bz2 = $(URL_IPFIRE)/libnetfilter_cttimeout-1.0.0.tar.bz2 $(DL_FILE)_MD5 = 5ab24ad683f76689cfe7e0c73f44855d netfilter-layer7-v2.22.tar.gz_MD5 = 98dff8a3d5a31885b73341633f69501f libnfnetlink-1.0.0.tar.bz2_MD5 = 016fdec8389242615024c529acc1adb8 libnetfilter_queue-0.0.17.tar.bz2_MD5 = 2cde35e678ead3a8f9eb896bf807a159 +libnetfilter_conntrack-1.0.2.tar.bz2_MD5 = 447114b5d61bb9a9617ead3217c3d3ff +libnetfilter_cttimeout-1.0.0.tar.bz2_MD5 = 7697437fc9ebb6f6b83df56a633db7f9 install : $(TARGET) @@ -124,5 +130,15 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_SRC)/libnetfilter_queue-0.0.17 && make $(MAKETUNING) $(EXTRA_MAKE) cd $(DIR_SRC)/libnetfilter_queue-0.0.17 && make install + cd $(DIR_SRC) && tar xfj $(DIR_DL)/libnetfilter_conntrack-1.0.2.tar.bz2 + cd $(DIR_SRC)/libnetfilter_conntrack-1.0.2 && ./configure --prefix=/usr + cd $(DIR_SRC)/libnetfilter_conntrack-1.0.2 && make $(MAKETUNING) $(EXTRA_MAKE) + cd $(DIR_SRC)/libnetfilter_conntrack-1.0.2 && make install + + cd $(DIR_SRC) && tar xfj $(DIR_DL)/libnetfilter_cttimeout-1.0.0.tar.bz2 + cd $(DIR_SRC)/libnetfilter_cttimeout-1.0.0 && ./configure --prefix=/usr + cd $(DIR_SRC)/libnetfilter_cttimeout-1.0.0 && make $(MAKETUNING) $(EXTRA_MAKE) + cd $(DIR_SRC)/libnetfilter_cttimeout-1.0.0 && make install + @rm -rf $(DIR_APP) $(DIR_SRC)/libnfnetlink-1.0.0 $(DIR_SRC)/netfilter-layer7* $(DIR_SRC)/libnetfilter_queue-0.0.17 @$(POSTBUILD) diff --git a/lfs/libmnl b/lfs/libmnl new file mode 100644 index 0000000..5341e4b --- /dev/null +++ b/lfs/libmnl @@ -0,0 +1,77 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2013 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 = 1.0.3 + +THISAPP = libmnl-$(VER) +DL_FILE = $(THISAPP).tar.bz2 +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 = 7d95fc3bea3365bc03c48e484224f65f + +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 axf $(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 21808c9..b1d7cf6 100755 --- a/make.sh +++ b/make.sh @@ -509,7 +509,9 @@ buildipfire() { ipfiremake mtools ipfiremake initscripts ipfiremake whatmask + ipfiremake libmnl ipfiremake iptables + ipfiremake conntrack-tools ipfiremake libupnp ipfiremake ipaddr ipfiremake iputils diff --git a/src/initscripts/init.d/networking/red.up/01-conntrack-cleanup b/src/initscripts/init.d/networking/red.up/01-conntrack-cleanup new file mode 100644 index 0000000..4bb43b9 --- /dev/null +++ b/src/initscripts/init.d/networking/red.up/01-conntrack-cleanup @@ -0,0 +1,25 @@ +#!/bin/bash +############################################################################ +# conntrack-cleanup - remove conntrack entries with the last red ipaddress # +############################################################################ +# + +curr_ip=`cat /var/ipfire/red/local-ipaddress 2>/dev/null` +last_ip=`cat /var/lock/last-ipaddress 2>/dev/null` + +if [ "$curr_ip" == "$last_ip" ]; then + exit 0 +fi + +if [ -z "$curr_ip" ]; then + echo ERROR: cannot read current IP. + exit 1 +fi + +if [ ! -z "$last_ip" ]; then + conntrack -D -s $last_ip 2>&1 > /dev/null + conntrack -D -d $last_ip 2>&1 > /dev/null + conntrack -D -r $last_ip 2>&1 > /dev/null + conntrack -D -q $last_ip 2>&1 > /dev/null +fi +echo $curr_ip > /var/lock/last-ipaddress hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. ac2f710771ba327b5b8fd1b8f3829b977d08aa24
by git＠ipfire.org 03 Jan '13

03 Jan '13

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 6201ce613a2d2bceaf9bce3305de292f658e2fe0
by git＠ipfire.org 02 Jan '13

02 Jan '13

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 6201ce613a2d2bceaf9bce3305de292f658e2fe0 (commit) via e4061f1f14ebcea7928fdef06e7940446f268b79 (commit) from 31d619a6ef001219e7268e63fd7cdd6dc7c9271b (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 6201ce613a2d2bceaf9bce3305de292f658e2fe0 Merge: 31d619a e4061f1 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jan 2 22:02:43 2013 +0100 Merge remote-tracking branch 'stevee/pakfire3-fixes' into next commit e4061f1f14ebcea7928fdef06e7940446f268b79 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Wed Jan 2 20:26:18 2013 +0100 pakfire3: Fix dependencies. There was a wrong dependency (libsatsolver) declared, which doesn't exist anymore. The dependency to pygpgme was missing. ----------------------------------------------------------------------- Summary of changes: lfs/pakfire3 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Difference in files: diff --git a/lfs/pakfire3 b/lfs/pakfire3 index a0e19dd..61dd988 100644 --- a/lfs/pakfire3 +++ b/lfs/pakfire3 @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2010 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2013 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 # @@ -32,9 +32,9 @@ DL_FROM = http://source.ipfire.org/releases/pakfire/ DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = pakfire3 -PAK_VER = 1 +PAK_VER = 2 -DEPS = "libsatsolver pycurl python-progressbar python-xattr sqlite urlgrabber" +DEPS = "libsolv pycurl pygpgme python-progressbar python-xattr sqlite urlgrabber" ############################################################################### # Top-level Rules hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 8f33953cb15465f8d323ffd20ae08df39b223bf2
by git＠ipfire.org 02 Jan '13

02 Jan '13

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 8f33953cb15465f8d323ffd20ae08df39b223bf2 (commit) via b40e81d4530990fefe2614967d96948435fa4a61 (commit) via 13e34ff3f1e4d814e637b32cda5b5d3ded6bb123 (commit) via f6abef8bd65797a4a6d4e2f414dac3cfbc73191b (commit) from 4776125b98c8ed617a4eb7491739a2290a2d5268 (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 8f33953cb15465f8d323ffd20ae08df39b223bf2 Merge: b40e81d 4776125 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jan 2 20:56:37 2013 +0100 Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x commit b40e81d4530990fefe2614967d96948435fa4a61 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jan 2 20:54:46 2013 +0100 git: Update to 1.8.1. commit 13e34ff3f1e4d814e637b32cda5b5d3ded6bb123 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jan 2 20:54:15 2013 +0100 perl-YAML: New package. Runtime dependency of git-1.8.x. commit f6abef8bd65797a4a6d4e2f414dac3cfbc73191b Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jan 2 20:34:56 2013 +0100 pakfire: Add some perl macros. ----------------------------------------------------------------------- Summary of changes: git/git.nm | 4 +- pakfire/pakfire.nm | 2 +- .../patches/0001-Add-some-useful-perl-macros.patch | 28 ++++++++ perl-YAML/perl-YAML.nm | 75 ++++++++++++++++++++++ 4 files changed, 106 insertions(+), 3 deletions(-) create mode 100644 pakfire/patches/0001-Add-some-useful-perl-macros.patch create mode 100644 perl-YAML/perl-YAML.nm Difference in files: diff --git a/git/git.nm b/git/git.nm index 1d3b87c..4e6f7da 100644 --- a/git/git.nm +++ b/git/git.nm @@ -4,8 +4,8 @@ ############################################################################### name = git -version = 1.7.8.2 -release = 3 +version = 1.8.1 +release = 1 groups = Development/Tools url = http://git-scm.com/ diff --git a/pakfire/pakfire.nm b/pakfire/pakfire.nm index 083c846..bf339a3 100644 --- a/pakfire/pakfire.nm +++ b/pakfire/pakfire.nm @@ -5,7 +5,7 @@ name = pakfire version = 0.9.23 -release = 5 +release = 6 maintainer = Michael Tremer <michael.tremer(a)ipfire.org> groups = System/Packaging diff --git a/pakfire/patches/0001-Add-some-useful-perl-macros.patch b/pakfire/patches/0001-Add-some-useful-perl-macros.patch new file mode 100644 index 0000000..0776b6f --- /dev/null +++ b/pakfire/patches/0001-Add-some-useful-perl-macros.patch @@ -0,0 +1,28 @@ +From 88bf3753008602b4ee219fc9a1917102befcfd84 Mon Sep 17 00:00:00 2001 +From: Michael Tremer <michael.tremer(a)ipfire.org> +Date: Wed, 2 Jan 2013 20:16:14 +0100 +Subject: [PATCH] Add some useful perl macros. + +--- + macros/perl.macro | 9 +++++++++ + 1 file changed, 9 insertions(+) + create mode 100644 macros/perl.macro + +diff --git a/macros/perl.macro b/macros/perl.macro +new file mode 100644 +index 0000000..c1be59f +--- /dev/null ++++ b/macros/perl.macro +@@ -0,0 +1,9 @@ ++# Perl constants. ++perl = /usr/bin/perl ++ ++perl_sitearch = %(eval "$(%{perl} -V:installsitearch)"; echo ${installsitearch}) ++perl_sitelib = %(eval "$(%{perl} -V:installsitelib)"; echo ${installsitelib}) ++perl_vendorarch = %(eval "$(%{perl} -V:installvendorarch)"; echo ${installvendorarch}) ++perl_vendorlib = %(eval "$(%{perl} -V:installvendorlib)"; echo ${installvendorlib}) ++perl_archlib = %(eval "$(%{perl} -V:installarchlib)"; echo ${installarchlib}) ++perl_privlib = %(eval "$(%{perl} -V:installprivlib)"; echo ${installprivlib}) +-- +1.7.11.7 + diff --git a/perl-YAML/perl-YAML.nm b/perl-YAML/perl-YAML.nm new file mode 100644 index 0000000..4f7b813 --- /dev/null +++ b/perl-YAML/perl-YAML.nm @@ -0,0 +1,75 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # +############################################################################### + +name = perl-YAML +version = 0.84 +release = 1 +arch = noarch +thisapp = YAML-%{version} + +groups = Development/Libraries +url = http://search.cpan.org/dist/YAML/ +license = GPL+ or Artistic +summary = A perl module for processing YAML. + +description + The YAML.pm module implements a YAML Loader and Dumper based on the + YAML 1.0 specification. http://www.yaml.org/spec/ + YAML is a generic data serialization language that is optimized for + human readability. It can be used to express the data structures of + most modern programming languages, including Perl. + For information on the YAML syntax, please refer to the YAML + specification. +end + +source_dl = http://search.cpan.org/CPAN/authors/id/M/MS/MSTROUT/ + +build + requires + # required for perl macros + pakfire-builder >= 0.9.23-6 + + perl(Carp) + perl(constant) + perl(Cwd) + perl(Data::Dumper) + perl(Exporter) + perl(ExtUtils::MakeMaker) + perl(File::Path) + perl(lib) + end + + build + perl Makefile.PL INSTALLDIRS=vendor + make %{PARALLELISMFLAGS} + end + + test + make test + end + + make_install_targets = pure_install DESTDIR=%{BUILDROOT} + + install_cmds + # Removing Test::YAML (at least temporarily) due + # to security concerns and questionable value. + # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=197539 + rm -vf %{BUILDROOT}%{perl_vendorlib}/Test/YAML* \ + %{BUILDROOT}%{mandir}/man3/Test::YAML*.3* + end +end + +packages + package %{name} + requires + perl(Carp) + perl(Data::Dumper) + end + + filter_provides + yaml_ + end + end +end hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 31d619a6ef001219e7268e63fd7cdd6dc7c9271b
by git＠ipfire.org 02 Jan '13

02 Jan '13

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 31d619a6ef001219e7268e63fd7cdd6dc7c9271b (commit) from 468d3963108f95a29adf121ab8530bf5927a9e15 (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 31d619a6ef001219e7268e63fd7cdd6dc7c9271b Author: Arne Fitzenreiter <Arne_F(a)ipfire.org> Date: Wed Jan 2 19:08:12 2013 +0100 kernel: compile xhci support into kernel. this fix booting from usb3.0 devices. ----------------------------------------------------------------------- Summary of changes: config/kernel/kernel.config.i586-ipfire | 2 +- config/kernel/kernel.config.i586-ipfire-pae | 2 +- config/kernel/kernel.config.i586-ipfire-xen | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) Difference in files: diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.config.i586-ipfire index 85ae5eb..51f3413 100644 --- a/config/kernel/kernel.config.i586-ipfire +++ b/config/kernel/kernel.config.i586-ipfire @@ -3725,7 +3725,7 @@ CONFIG_USB_WUSB_CBAF=m # USB Host Controller Drivers # # CONFIG_USB_C67X00_HCD is not set -CONFIG_USB_XHCI_HCD=m +CONFIG_USB_XHCI_HCD=y # CONFIG_USB_XHCI_HCD_DEBUGGING is not set CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_ROOT_HUB_TT=y diff --git a/config/kernel/kernel.config.i586-ipfire-pae b/config/kernel/kernel.config.i586-ipfire-pae index 038bee5..6f39769 100644 --- a/config/kernel/kernel.config.i586-ipfire-pae +++ b/config/kernel/kernel.config.i586-ipfire-pae @@ -3757,7 +3757,7 @@ CONFIG_USB_WUSB_CBAF=m # USB Host Controller Drivers # # CONFIG_USB_C67X00_HCD is not set -CONFIG_USB_XHCI_HCD=m +CONFIG_USB_XHCI_HCD=y # CONFIG_USB_XHCI_HCD_DEBUGGING is not set CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_ROOT_HUB_TT=y diff --git a/config/kernel/kernel.config.i586-ipfire-xen b/config/kernel/kernel.config.i586-ipfire-xen index 8fedba4..dcdf545 100644 --- a/config/kernel/kernel.config.i586-ipfire-xen +++ b/config/kernel/kernel.config.i586-ipfire-xen @@ -2786,7 +2786,7 @@ CONFIG_USB_WUSB_CBAF=m # USB Host Controller Drivers # # CONFIG_USB_C67X00_HCD is not set -CONFIG_USB_XHCI_HCD=m +CONFIG_USB_XHCI_HCD=y # CONFIG_USB_XHCI_HCD_DEBUGGING is not set CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_ROOT_HUB_TT=y hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 468d3963108f95a29adf121ab8530bf5927a9e15
by git＠ipfire.org 02 Jan '13

02 Jan '13

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 468d3963108f95a29adf121ab8530bf5927a9e15 (commit) from a161b1f112da5659de501edcbb77096723792edd (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 468d3963108f95a29adf121ab8530bf5927a9e15 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Jan 2 14:25:34 2013 +0100 asterisk: fix stop. ----------------------------------------------------------------------- Summary of changes: src/initscripts/init.d/asterisk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Difference in files: diff --git a/src/initscripts/init.d/asterisk b/src/initscripts/init.d/asterisk index b3a734b..aac9a63 100644 --- a/src/initscripts/init.d/asterisk +++ b/src/initscripts/init.d/asterisk @@ -23,7 +23,7 @@ case "${1}" in stop) boot_mesg "Stopping Asterisk PBX..." - asterisk -rx "stop gracefully" >/dev/null 2>&1 + asterisk -rx "core stop gracefully" >/dev/null 2>&1 evaluate_retval ;; 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 January 2013