From mboxrd@z Thu Jan 1 00:00:00 1970
From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated.
86fa8e6b1add1648012fcc656c0eaee9187ab364
Date: Thu, 06 Jun 2013 10:58:35 +0200
Message-ID: <20130606085836.451692049F@argus.ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4819229408312696312=="
List-Id: <ipfire-scm.lists.ipfire.org>
--===============4819229408312696312==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
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 86fa8e6b1add1648012fcc656c0eaee9187ab364 (commit)
via 3bf629e8baaf61d89db9832efd95fb5db903e542 (commit)
via 36566a23bacd51883951cca5343b70ae067bc3b9 (commit)
from 9999b250e11d96017488a25f6dfa6d3385d83e9c (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 86fa8e6b1add1648012fcc656c0eaee9187ab364
Merge: 3bf629e 9999b25
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Jun 6 10:58:22 2013 +0200
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
commit 3bf629e8baaf61d89db9832efd95fb5db903e542
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Jun 6 10:58:04 2013 +0200
tcpdump: Update to 4.4.0.
commit 36566a23bacd51883951cca5343b70ae067bc3b9
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Jun 5 12:07:20 2013 +0200
posfix: Update to 2.10.0.
-----------------------------------------------------------------------
Summary of changes:
config/backup/includes/postfix | 1 +
config/rootfiles/packages/postfix | 11 ++++++++++-
config/rootfiles/packages/tcpdump | 1 -
lfs/postfix | 12 ++++++------
lfs/tcpdump | 27 +++++++++++++++------------
src/patches/tcpdump-4.0.0-noINET.patch | 14 --------------
6 files changed, 32 insertions(+), 34 deletions(-)
create mode 100644 config/backup/includes/postfix
delete mode 100644 src/patches/tcpdump-4.0.0-noINET.patch
Difference in files:
diff --git a/config/backup/includes/postfix b/config/backup/includes/postfix
new file mode 100644
index 0000000..0354b64
--- /dev/null
+++ b/config/backup/includes/postfix
@@ -0,0 +1 @@
+/etc/postfix
diff --git a/config/rootfiles/packages/postfix b/config/rootfiles/packages/po=
stfix
index b01832e..c347bb8 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/tc=
pdump
index b2d4b66..7db74e8 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 5866b97..cfebeac 100644
--- a/lfs/postfix
+++ b/lfs/postfix
@@ -24,7 +24,7 @@
=20
include Config
=20
-VER =3D 2.6.5
+VER =3D 2.10.0
=20
THISAPP =3D postfix-$(VER)
DL_FILE =3D $(THISAPP).tar.gz
@@ -32,13 +32,10 @@ DL_FROM =3D $(URL_IPFIRE)
DIR_APP =3D $(DIR_SRC)/$(THISAPP)
TARGET =3D $(DIR_INFO)/$(THISAPP)
PROG =3D postfix
-PAK_VER =3D 6
+PAK_VER =3D 7
=20
DEPS =3D "amavisd mysql"
=20
-# Fake kernel release
-export UTS_RELEASE =3D 2.6.32-ipfire
-
############################################################################=
###
# Top-level Rules
############################################################################=
###
@@ -47,7 +44,7 @@ objects =3D $(DL_FILE)
=20
$(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)
=20
-$(DL_FILE)_MD5 =3D 6b954cfb3eb6141dac1e773281211717
+$(DL_FILE)_MD5 =3D b2a563b2d5c53462952886e6fc4e4b7b
=20
install : $(TARGET)
=20
@@ -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 4556428..934e851 100644
--- a/lfs/tcpdump
+++ b/lfs/tcpdump
@@ -24,7 +24,7 @@
=20
include Config
=20
-VER =3D 4.0.0
+VER =3D 4.4.0
=20
THISAPP =3D tcpdump-$(VER)
DL_FILE =3D $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM =3D $(URL_IPFIRE)
DIR_APP =3D $(DIR_SRC)/$(THISAPP)
TARGET =3D $(DIR_INFO)/$(THISAPP)
PROG =3D tcpdump
-PAK_VER =3D 2
+PAK_VER =3D 3
=20
DEPS =3D ""
=20
@@ -44,7 +44,7 @@ objects =3D $(DL_FILE)
=20
$(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)
=20
-$(DL_FILE)_MD5 =3D b22ca72890df2301d922c9f2d17867f9
+$(DL_FILE)_MD5 =3D 6f75aabcffd012f73bd7c331bb5d8232
=20
install : $(TARGET)
=20
@@ -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-do=
s.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-do=
s.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.p=
atch
- cd $(DIR_APP) && ./configure --prefix=3D/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=3D"-D_U_=3D\"\" -DHAVE_CONFIG_H"
+ cd $(DIR_APP) && \
+ ./configure \
+ --prefix=3D/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 2664134..0000000
--- 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
- }
-=20
- out:
hooks/post-receive
--
IPFire 2.x development tree
--===============4819229408312696312==--