[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 582fa1555574ac0b6abc0a4daee906d1a9a091ef

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 582fa1555574ac0b6abc0a4daee906d1a9a091ef

[git]

[-- Attachment #1: Type: text/plain, Size: 4836 bytes --]

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  582fa1555574ac0b6abc0a4daee906d1a9a091ef (commit)
       via  27b2adbf4f962fce13d5f66bc55dae2c86aeb685 (commit)
       via  c2f7250b231494ad2bbfd24c5d40cb08285e131d (commit)
      from  fffb777ee6f9c62f29966677045a6bdc705aece0 (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 582fa1555574ac0b6abc0a4daee906d1a9a091ef
Merge: 27b2adb fffb777
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Fri Feb 21 11:56:52 2014 +0100

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

commit 27b2adbf4f962fce13d5f66bc55dae2c86aeb685
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Fri Feb 21 11:54:14 2014 +0100

    ntp: Update to 4.2.6p5.

commit c2f7250b231494ad2bbfd24c5d40cb08285e131d
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Fri Feb 21 11:35:05 2014 +0100

    firewall: Remove even more redundant rules.

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

Summary of changes:
 config/rootfiles/core/76/filelists/ntp | 11 +++++++++++
 lfs/ntp                                | 26 +++++++++++++++++---------
 src/initscripts/init.d/firewall        |  8 --------
 3 files changed, 28 insertions(+), 17 deletions(-)
 create mode 100644 config/rootfiles/core/76/filelists/ntp

Difference in files:
diff --git a/config/rootfiles/core/76/filelists/ntp b/config/rootfiles/core/76/filelists/ntp
new file mode 100644
index 0000000..c080f38
--- /dev/null
+++ b/config/rootfiles/core/76/filelists/ntp
@@ -0,0 +1,11 @@
+etc/ntp.conf
+usr/bin/ntpd
+usr/bin/ntpdate
+usr/bin/ntpdc
+usr/bin/sntp
+usr/sbin/ntp-keygen
+usr/sbin/ntp-wait
+usr/sbin/ntpq
+usr/sbin/ntptime
+usr/sbin/ntptrace
+usr/sbin/tickadj
diff --git a/lfs/ntp b/lfs/ntp
index 1859212..147e0a8 100644
--- a/lfs/ntp
+++ b/lfs/ntp
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 4.2.4p7
+VER        = 4.2.6p5
 
 THISAPP    = ntp-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 8c19ff62ed4f7d64f8e2aa59cb11f364
+$(DL_FILE)_MD5 = 00df80a84ec9528fcfb09498075525bc
 
 install : $(TARGET)
 
@@ -70,14 +70,22 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && ./configure --prefix=/usr --bindir=/usr/sbin \
-					    --sysconfdir=/etc --disable-nls \
-					    -enable-all-clocks --enable-parse-clocks
+	cd $(DIR_APP) && \
+		./configure \
+			--prefix=/usr \
+			--bindir=/usr/sbin \
+			--sysconfdir=/etc \
+			--disable-nls \
+			--enable-all-clocks \
+			--enable-parse-clocks
+
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
+
 	-mkdir /etc/ntp
 	chown -R ntp:ntp /etc/ntp
-	echo "restrict default nomodify noquery" >  /etc/ntp.conf
+	echo "disable monitor" > /etc/ntp.conf
+	echo "restrict default nomodify noquery" >>  /etc/ntp.conf
 	echo "server  127.127.1.0"			>> /etc/ntp.conf
 	echo "fudge   127.127.1.0 stratum 10"	>> /etc/ntp.conf
 	echo "driftfile /etc/ntp/drift"		>> /etc/ntp.conf
@@ -86,9 +94,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cp -vf $(DIR_SRC)/config/time/* /var/ipfire/time/
 	chmod 644 /var/ipfire/time/*
 	chown nobody:nobody /var/ipfire/time/*
-	ln -s ../init.d/ntp /etc/rc.d/rc0.d/K46ntpd
-	ln -s ../init.d/ntp /etc/rc.d/rc6.d/K46ntpd
-	ln -s ../init.d/ntp /etc/rc.d/rc3.d/S26ntpd
+	ln -svf ../init.d/ntp /etc/rc.d/rc0.d/K46ntpd
+	ln -svf ../init.d/ntp /etc/rc.d/rc6.d/K46ntpd
+	ln -svf ../init.d/ntp /etc/rc.d/rc3.d/S26ntpd
 
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
diff --git a/src/initscripts/init.d/firewall b/src/initscripts/init.d/firewall
index 2b3b91c..ddc4a4a 100644
--- a/src/initscripts/init.d/firewall
+++ b/src/initscripts/init.d/firewall
@@ -230,14 +230,6 @@ iptables_init() {
 
 	# read new firewall
 	/usr/local/bin/firewallctrl
-
-	if [ "$DROPINPUT" == "on" ]; then
-		iptables -A INPUT   -m limit --limit 10/minute -j LOG --log-prefix "DROP_INPUT"
-	fi
-	iptables -A INPUT -j DROP -m comment --comment "DROP_INPUT"
-	if [ "$DROPFORWARD" == "on" ]; then
-		iptables -A FORWARD -m limit --limit 10/minute -j LOG --log-prefix "DROP_FORWARD"
-	fi
 }
 
 iptables_red() {


hooks/post-receive
--
IPFire 2.x development tree