From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 6 Jun 2013 08:58:22 +0000 (+0200)
Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=86fa8e6b1add1648012fcc656c0eaee9187ab364;hp=9999b250e11d96017488a25f6dfa6d3385d83e9c

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

diff --git a/config/backup/includes/postfix b/config/backup/includes/postfix
new file mode 100644
index 000000000..0354b64f3
--- /dev/null
+++ b/config/backup/includes/postfix
@@ -0,0 +1 @@
+/etc/postfix
diff --git a/config/rootfiles/packages/postfix b/config/rootfiles/packages/postfix
index b01832e7c..c347bb8a3 100644
--- a/config/rootfiles/packages/postfix
+++ b/config/rootfiles/packages/postfix
@@ -17,6 +17,7 @@ etc/postfix/mysql-virtual.cf
 etc/postfix/relocated
 etc/postfix/transport
 etc/postfix/virtual
+etc/rc.d/init.d/postfix
 usr/bin/mailq
 usr/bin/newaliases
 #usr/lib/postfix
@@ -24,6 +25,7 @@ usr/lib/postfix/anvil
 usr/lib/postfix/bounce
 usr/lib/postfix/cleanup
 usr/lib/postfix/discard
+usr/lib/postfix/dnsblog
 usr/lib/postfix/error
 usr/lib/postfix/flush
 usr/lib/postfix/lmtp
@@ -40,6 +42,7 @@ usr/lib/postfix/postfix-files
 usr/lib/postfix/postfix-script
 usr/lib/postfix/postfix-wrapper
 usr/lib/postfix/postmulti-script
+usr/lib/postfix/postscreen
 usr/lib/postfix/proxymap
 usr/lib/postfix/qmgr
 usr/lib/postfix/qmqpd
@@ -49,6 +52,7 @@ usr/lib/postfix/smtp
 usr/lib/postfix/smtpd
 usr/lib/postfix/spawn
 usr/lib/postfix/tlsmgr
+usr/lib/postfix/tlsproxy
 usr/lib/postfix/trivial-rewrite
 usr/lib/postfix/verify
 usr/lib/postfix/virtual
@@ -90,6 +94,7 @@ usr/sbin/sendmail
 #usr/share/man/man5/header_checks.5
 #usr/share/man/man5/ldap_table.5
 #usr/share/man/man5/master.5
+#usr/share/man/man5/memcache_table.5
 #usr/share/man/man5/mysql_table.5
 #usr/share/man/man5/nisplus_table.5
 #usr/share/man/man5/pcre_table.5
@@ -98,6 +103,7 @@ usr/sbin/sendmail
 #usr/share/man/man5/postfix-wrapper.5
 #usr/share/man/man5/regexp_table.5
 #usr/share/man/man5/relocated.5
+#usr/share/man/man5/sqlite_table.5
 #usr/share/man/man5/tcp_table.5
 #usr/share/man/man5/transport.5
 #usr/share/man/man5/virtual.5
@@ -106,6 +112,7 @@ usr/sbin/sendmail
 #usr/share/man/man8/cleanup.8
 #usr/share/man/man8/defer.8
 #usr/share/man/man8/discard.8
+#usr/share/man/man8/dnsblog.8
 #usr/share/man/man8/error.8
 #usr/share/man/man8/flush.8
 #usr/share/man/man8/lmtp.8
@@ -114,6 +121,7 @@ usr/sbin/sendmail
 #usr/share/man/man8/oqmgr.8
 #usr/share/man/man8/pickup.8
 #usr/share/man/man8/pipe.8
+#usr/share/man/man8/postscreen.8
 #usr/share/man/man8/proxymap.8
 #usr/share/man/man8/qmgr.8
 #usr/share/man/man8/qmqpd.8
@@ -123,10 +131,12 @@ usr/sbin/sendmail
 #usr/share/man/man8/smtpd.8
 #usr/share/man/man8/spawn.8
 #usr/share/man/man8/tlsmgr.8
+#usr/share/man/man8/tlsproxy.8
 #usr/share/man/man8/trace.8
 #usr/share/man/man8/trivial-rewrite.8
 #usr/share/man/man8/verify.8
 #usr/share/man/man8/virtual.8
+var/ipfire/backup/addons/includes/postfix
 var/lib/postfix
 #var/spool/postfix
 var/spool/postfix/active
@@ -143,4 +153,3 @@ var/spool/postfix/private
 var/spool/postfix/public
 var/spool/postfix/saved
 var/spool/postfix/trace
-etc/rc.d/init.d/postfix
diff --git a/config/rootfiles/packages/tcpdump b/config/rootfiles/packages/tcpdump
index b2d4b66b4..7db74e80d 100644
--- a/config/rootfiles/packages/tcpdump
+++ b/config/rootfiles/packages/tcpdump
@@ -1,3 +1,2 @@
 usr/sbin/tcpdump
-usr/sbin/tcpdump.4.0.0
 #usr/share/man/man1/tcpdump.1
diff --git a/lfs/postfix b/lfs/postfix
index 5866b97d8..cfebeac06 100644
--- a/lfs/postfix
+++ b/lfs/postfix
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.6.5
+VER        = 2.10.0
 
 THISAPP    = postfix-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,13 +32,10 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = postfix
-PAK_VER    = 6
+PAK_VER    = 7
 
 DEPS       = "amavisd mysql"
 
-# Fake kernel release
-export UTS_RELEASE = 2.6.32-ipfire
-
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -47,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 6b954cfb3eb6141dac1e773281211717
+$(DL_FILE)_MD5 = b2a563b2d5c53462952886e6fc4e4b7b
 
 install : $(TARGET)
 
@@ -91,5 +88,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	mv -vf /etc/postfix/aliases /etc/aliases
 	mkdir -p /var/lib/postfix
 	chown postfix.root /var/lib/postfix
+
+	install -v -m 644 $(DIR_SRC)/config/backup/includes/postfix \
+			 /var/ipfire/backup/addons/includes/postfix
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
diff --git a/lfs/tcpdump b/lfs/tcpdump
index 4556428b3..934e85178 100644
--- a/lfs/tcpdump
+++ b/lfs/tcpdump
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 4.0.0
+VER        = 4.4.0
 
 THISAPP    = tcpdump-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = tcpdump
-PAK_VER    = 2
+PAK_VER    = 3
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = b22ca72890df2301d922c9f2d17867f9
+$(DL_FILE)_MD5 = 6f75aabcffd012f73bd7c331bb5d8232
 
 install : $(TARGET)
 
@@ -77,15 +77,18 @@ $(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) && patch -Np1 < $(DIR_SRC)/src/patches/tcpdump-3.8.2-rsvp-dos.patch	#CAN 2005-1280
-#	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/tcpdump-3.8.2-bgp-dos.patch	#CAN 2005-1267
-#	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/tcpdump-3.8.2-bgp-dos-2.patch	#CAN 2005-1279
-#	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/tcpdump-3.8.2-isis-dos.patch	#CAN 2005-1278
-#	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/tcpdump-3.8.2-ldp-dos.patch	#CAN 2005-1279
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/tcpdump-4.0.0-noINET.patch
-	cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls --disable-ipv6
-	cd $(DIR_APP) && sed -i -e 's/#define\ HAVE_PCAP_DEBUG\ 1/#undef\ HAVE_PCAP_DEBUG/' config.h
-	cd $(DIR_APP) && make $(MAKETUNING) DEFS="-D_U_=\"\" -DHAVE_CONFIG_H"
+	cd $(DIR_APP) && \
+		./configure \
+			--prefix=/usr \
+			--disable-nls \
+			--with-crypto \
+			--without-smi
+
+	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
+
+	# Remove versioned binary
+	rm -vf /usr/sbin/tcpdump.$(VER)
+
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
diff --git a/src/patches/tcpdump-4.0.0-noINET.patch b/src/patches/tcpdump-4.0.0-noINET.patch
deleted file mode 100644
index 2664134a6..000000000
--- a/src/patches/tcpdump-4.0.0-noINET.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- tcpdump-4.0.0.orig/print-enc.c	2008-09-01 09:44:22.000000000 +0700
-+++ tcpdump-4.0.0/print-enc.c	2008-11-10 21:40:52.000000000 +0700
-@@ -77,9 +77,11 @@
- 	case AF_INET:
- 		ip_print(gndo, p, length);
- 		break;
-+#ifdef INTE6
- 	case AF_INET6:
- 		ip6_print(p, length);
- 		break;
-+#endif
- 	}
- 
- out: