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 eeb5f8eefdc8785aa9e19d5fa655af13dc81a3fb (commit) via 8f25eea432241fd1c334a8d82db17cef5f4ae493 (commit) via 14b27c13c4144c87143ae4fd08798350a60c16c3 (commit) via 9127c78d554fb49474eb80365d1d8fcad3981c26 (commit) via da3146e39a21869bc1474f8b8e3766aa9b091cf8 (commit) via 800ae923601b601345c6b9138dc819c6fa489120 (commit) via c2ef7316387907b8e23be5764021ceaf6d3b9694 (commit) from a7924103ddc30437352d75c1c7331c26546b3bfb (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 eeb5f8eefdc8785aa9e19d5fa655af13dc81a3fb Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Apr 24 11:47:05 2010 +0200
iptables: Update to 1.4.7 to cover a build error.
commit 8f25eea432241fd1c334a8d82db17cef5f4ae493 Merge: 14b27c13c4144c87143ae4fd08798350a60c16c3 da3146e39a21869bc1474f8b8e3766aa9b091cf8 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Apr 24 00:55:29 2010 +0200
Merge branch 'master' of ssh://git.ipfire.org/pub/git/people/ms/ipfire-3.x into next
commit 14b27c13c4144c87143ae4fd08798350a60c16c3 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Apr 24 00:54:40 2010 +0200
initscripts: Change on udev trigger.
This change is needed to comply with the latest version.
commit 9127c78d554fb49474eb80365d1d8fcad3981c26 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Apr 24 00:54:22 2010 +0200
udev: Update to 152.
commit da3146e39a21869bc1474f8b8e3766aa9b091cf8 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Apr 24 00:53:03 2010 +0200
naoki: Add locking that only one batch operation can be run at a time.
commit 800ae923601b601345c6b9138dc819c6fa489120 Merge: c2ef7316387907b8e23be5764021ceaf6d3b9694 c5467c0f3d0446afa84fa106986cf11b98839aab Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Apr 23 13:24:57 2010 +0200
Merge branch 'master' into next
commit c2ef7316387907b8e23be5764021ceaf6d3b9694 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Apr 23 10:39:57 2010 +0200
coreutils: Need e2fsprogs to run testsuite.
-----------------------------------------------------------------------
Summary of changes: naoki/__init__.py | 12 ++++++++++++ naoki/constants.py | 2 ++ pkgs/core/coreutils/coreutils.nm | 2 +- pkgs/core/initscripts/init/udevtrigger.conf | 2 +- pkgs/core/iptables/iptables.nm | 9 ++++----- pkgs/core/udev/udev.nm | 2 +- 6 files changed, 21 insertions(+), 8 deletions(-)
Difference in files: diff --git a/naoki/__init__.py b/naoki/__init__.py index 239d8f5..c95a528 100644 --- a/naoki/__init__.py +++ b/naoki/__init__.py @@ -1,6 +1,7 @@ #!/usr/bin/python
import ConfigParser +import fcntl import os.path import random import sys @@ -323,6 +324,17 @@ Release : %(release)s return gen.run()
def call_batch(self, args): + try: + self._lock = open(LOCK_BATCH, "a+") + except IOError, e: + return 0 + + try: + fcntl.lockf(self._lock.fileno(), fcntl.LOCK_EX | fcntl.LOCK_NB) + except IOError, e: + print >>sys.stderr, "Batch operations are locked by another process" + return 0 + actionmap = { "cron" : self.call_batch_cron, } diff --git a/naoki/constants.py b/naoki/constants.py index f77b00c..07c3ee3 100644 --- a/naoki/constants.py +++ b/naoki/constants.py @@ -27,6 +27,8 @@ CONFIGFILE = os.path.join(CONFIGDIR, "naoki.conf")
CHROOT_PATH = "/sbin:/bin:/usr/sbin:/usr/bin"
+LOCK_BATCH = os.path.join(BUILDDIR, ".batch") + LOG_MARKER = "### LOG MARKER ###"
def calc_parallelism(): diff --git a/pkgs/core/coreutils/coreutils.nm b/pkgs/core/coreutils/coreutils.nm index fab1cdf..f424083 100644 --- a/pkgs/core/coreutils/coreutils.nm +++ b/pkgs/core/coreutils/coreutils.nm @@ -39,7 +39,7 @@ define PKG_DESCRIPTION the old GNU fileutils, sh-utils, and textutils packages. endef
-PKG_BUILD_DEPS+= autoconf automake +PKG_BUILD_DEPS+= autoconf automake e2fsprogs PKG_DEPS += acl attr libcap ncurses pam shadow util-linux-ng
PKG_TARBALL = $(THISAPP).tar.gz diff --git a/pkgs/core/initscripts/init/udevtrigger.conf b/pkgs/core/initscripts/init/udevtrigger.conf index 754ccd7..2edd29f 100644 --- a/pkgs/core/initscripts/init/udevtrigger.conf +++ b/pkgs/core/initscripts/init/udevtrigger.conf @@ -8,7 +8,7 @@ console output script # Now traverse /sys in order to "coldplug" devices that have # already been discovered - udevadm trigger + udevadm trigger --action=add
# Now wait for udevd to process the uevents we triggered udevadm settle --timeout=5 || true diff --git a/pkgs/core/iptables/iptables.nm b/pkgs/core/iptables/iptables.nm index c82c579..3ea173f 100644 --- a/pkgs/core/iptables/iptables.nm +++ b/pkgs/core/iptables/iptables.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include
PKG_NAME = iptables -PKG_VER = 1.4.5 +PKG_VER = 1.4.7 PKG_REL = 0
PKG_MAINTAINER = @@ -34,8 +34,6 @@ PKG_URL = http://www.netfilter.org/ PKG_LICENSE = GPL+ PKG_SUMMARY = Tools for managing Linux kernel packet filtering capabilities.
-#PKG_DEPS += m4 - define PKG_DESCRIPTION The iptables utility controls the network packet filtering code in the \ Linux kernel. If you need to set up firewalls and/or IP masquerading, \ @@ -76,11 +74,12 @@ define STAGE_INSTALL_CMDS $(BUILDROOT)/usr/include/libiptc
-mkdir -pv $(BUILDROOT)/usr/lib - rm -vf $(BUILDROOT)/lib/libip{,4,6}tc.so $(BUILDROOT)/lib/libxtables.so + rm -vf $(BUILDROOT)/lib/libip{tc,4tc,6tc,q}.so $(BUILDROOT)/lib/libxtables.so ln -svf ../../lib/libiptc.so.0 $(BUILDROOT)/usr/lib/libiptc.so ln -svf ../../lib/libip4tc.so.0 $(BUILDROOT)/usr/lib/libip4tc.so ln -svf ../../lib/libip6tc.so.0 $(BUILDROOT)/usr/lib/libip6tc.so - ln -svf ../../lib/libxtables.so.2 $(BUILDROOT)/usr/lib/libxtables.so + ln -svf ../../lib/libipq.so.0 $(BUILDROOT)/usr/lib/libipq.so + ln -svf ../../lib/libxtables.so.4 $(BUILDROOT)/usr/lib/libxtables.so
# Replace absolute symlink ln -svf ../sbin/iptables-multi $(BUILDROOT)/bin/iptables-xml diff --git a/pkgs/core/udev/udev.nm b/pkgs/core/udev/udev.nm index af19411..67d93da 100644 --- a/pkgs/core/udev/udev.nm +++ b/pkgs/core/udev/udev.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include
PKG_NAME = udev -PKG_VER = 151 +PKG_VER = 152 PKG_REL = 0
PKG_MAINTAINER =
hooks/post-receive -- IPFire 3.x development tree