[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 8568796d81f1208f1c651b5180f2038a9b21dc83 - IPFire-SCM

20 Oct 2012

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  8568796d81f1208f1c651b5180f2038a9b21dc83 (commit)
       via  22d1277520191437da7e5fd340338749ace64b98 (commit)
       via  1763dd6ff31797b3811db4f4d84f07f0b27bca32 (commit)
       via  b8dba03de2ca42574d4dcffeaaa91e50401f4e43 (commit)
       via  86aad8b61aacfe7b32ea6c0fde01330ec512b5ec (commit)
       via  eb579f8b7b39ffb23a83c911fa95331feb501d4b (commit)
       via  0a5f8b5b86bb0a6bca091b30cdef7b7aae43ea63 (commit)
       via  bdb48e0c20e458f3677a92fdecccc355a2afb4c0 (commit)
       via  abfcabe9b6b8b982d3a9efe938bde2957c00f58f (commit)
       via  d65aeb5012122d758af31a7e5f1544ce0d189794 (commit)
      from  64066d987ad12cb64d210c777c556315570c5a62 (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 8568796d81f1208f1c651b5180f2038a9b21dc83
Merge: 22d1277 0a5f8b5
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Sat Oct 20 15:08:32 2012 +0200
Merge remote-tracking branch 'ummeegge/cairo-update'
commit 22d1277520191437da7e5fd340338749ace64b98
Merge: 1763dd6 eb579f8
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Sat Oct 20 15:08:14 2012 +0200
Merge remote-tracking branch 'ummeegge/gnutls-update'
commit 1763dd6ff31797b3811db4f4d84f07f0b27bca32
Merge: b8dba03 86aad8b
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Sat Oct 20 15:07:56 2012 +0200
Merge remote-tracking branch 'ummeegge/iptables-update'
commit b8dba03de2ca42574d4dcffeaaa91e50401f4e43
Author: Erik Kapfer erik.kapfer@ipfire.org
Date:   Fri Oct 19 23:26:13 2012 +0200
tcpick: New package.
commit 86aad8b61aacfe7b32ea6c0fde01330ec512b5ec
Author: Erik Kapfer erik.kapfer@ipfire.org
Date:   Fri Oct 19 22:54:07 2012 +0200
iptables: Update to 1.4.16.2.
Fixes #10247.
commit eb579f8b7b39ffb23a83c911fa95331feb501d4b
Author: Erik Kapfer erik.kapfer@ipfire.org
Date:   Fri Oct 19 22:43:18 2012 +0200
gnutls: Update to 3.1.3.
Fixes #10248.
commit 0a5f8b5b86bb0a6bca091b30cdef7b7aae43ea63
Author: Erik Kapfer erik.kapfer@ipfire.org
Date:   Fri Oct 19 22:31:09 2012 +0200
cairo: Update to 1.12.4.
This is a bugfixing release of cairo.
Fixes #10249.
commit bdb48e0c20e458f3677a92fdecccc355a2afb4c0
Author: Erik Kapfer erik.kapfer@ipfire.org
Date:   Fri Oct 19 22:28:42 2012 +0200
libX11: Update to 1.5.0.
This is a major update to the latest stable version.
commit abfcabe9b6b8b982d3a9efe938bde2957c00f58f
Author: Erik Kapfer erik.kapfer@ipfire.org
Date:   Fri Oct 19 22:27:45 2012 +0200
libXext: Update to 1.3.1.
The new version is required to build the latest version of cairo.
commit d65aeb5012122d758af31a7e5f1544ce0d189794
Author: Erik Kapfer erik.kapfer@ipfire.org
Date:   Fri Oct 19 22:25:43 2012 +0200
xorg-x11-proto-devel: Update to 7.6.
This is a major update, which contains a collection of updates from the contained subpackages.
-----------------------------------------------------------------------
Summary of changes:
 cairo/cairo.nm                               |    6 ++--
 gnutls/gnutls.nm                             |    8 ++--
 iptables/iptables.nm                         |    6 ++--
 libX11/libX11.nm                             |    5 +--
 libXext/libXext.nm                           |    7 +---
 tcpick/tcpick.nm                             |   43 ++++++++++++++++++++++++
 xorg-x11-proto-devel/xorg-x11-proto-devel.nm |   46 +++++++++++++-------------
 7 files changed, 80 insertions(+), 41 deletions(-)
 create mode 100644 tcpick/tcpick.nm
Difference in files:

diff --git a/cairo/cairo.nm b/cairo/cairo.nm
index 56bc324..5b05833 100644
--- a/cairo/cairo.nm
+++ b/cairo/cairo.nm
@@ -4,7 +4,7 @@
 ###############################################################################
name       = cairo
-version    = 1.12.2
+version    = 1.12.4
 release    = 1
groups     = System/Graphics
@@ -13,7 +13,7 @@ license    = LGPLv2 MPLv1.1
 summary    = A 2D graphics library.
description
-	Cairo is a 2D graphics library designed to provide high-quality display \
+	Cairo is a 2D graphics library designed to provide high-quality display
    and print output.
 end
@@ -26,6 +26,7 @@ build
    	fontconfig-devel
    	freetype-devel
    	libX11-devel
+		libXext-devel>=1.3.1
    	libxml2-devel
    	libpng-devel
    	pixman-devel>=0.22
@@ -34,7 +35,6 @@ build
    end
configure_options += \
-		--enable-freetype \
    	--enable-xlib \
    	--enable-xml \
    	--disable-static
diff --git a/gnutls/gnutls.nm b/gnutls/gnutls.nm
index 44d64d6..4371149 100644
--- a/gnutls/gnutls.nm
+++ b/gnutls/gnutls.nm
@@ -4,7 +4,7 @@
 ###############################################################################
name       = gnutls
-version    = 3.1.2
+version    = 3.1.3
 release    = 1
groups     = System/Libraries
@@ -13,9 +13,9 @@ license    = LGPLv2.1+
 summary    = A general-purpose cryptography library.
description
-	GnuTLS is a project that aims to develop a library which provides \
-	a secure layer, over a reliable transport layer. Currently the \
-	GnuTLS library implements the proposed standards by the IETF's \
+	GnuTLS is a project that aims to develop a library which provides
+	a secure layer, over a reliable transport layer. Currently the
+	GnuTLS library implements the proposed standards by the IETF's
    TLS working group.
 end
diff --git a/iptables/iptables.nm b/iptables/iptables.nm
index a0a1a50..e220b0c 100644
--- a/iptables/iptables.nm
+++ b/iptables/iptables.nm
@@ -4,7 +4,7 @@
 ###############################################################################
name       = iptables
-version    = 1.4.14
+version    = 1.4.16.2
 release    = 1
groups     = Networking/Tools
@@ -13,8 +13,8 @@ license    = GPL+
 summary    = Tools for managing Linux kernel packet filtering capabilities.
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, \
+	The iptables utility controls the network packet filtering code in the
+	Linux kernel. If you need to set up firewalls and/or IP masquerading,
    you should install this package.
 end
diff --git a/libX11/libX11.nm b/libX11/libX11.nm
index 12ceb7c..3975a98 100644
--- a/libX11/libX11.nm
+++ b/libX11/libX11.nm
@@ -4,7 +4,7 @@
 ###############################################################################
name       = libX11
-version    = 1.3.2
+version    = 1.5.0
 release    = 1
maintainer = Stefan Schantl stefan.schantl@ipfire.org
@@ -17,7 +17,7 @@ description
    Client library for X.org X11 protocol.
 end
-source_dl  =
+source_dl  = ftp://ftp.x.org/pub/individual/lib/
 sources    = %{thisapp}.tar.bz2
build
@@ -31,7 +31,6 @@ end
packages
    package %{name}
-	end
package %{name}-devel
    	template DEVEL
diff --git a/libXext/libXext.nm b/libXext/libXext.nm
index daa5ddc..7109119 100644
--- a/libXext/libXext.nm
+++ b/libXext/libXext.nm
@@ -4,7 +4,7 @@
 ###############################################################################
name       = libXext
-version    = 1.1.2
+version    = 1.3.1
 release    = 1
maintainer = Stefan Schantl stefan.schantl@ipfire.org
@@ -13,13 +13,11 @@ url        = http://www.x.org/
 license    = MIT
 summary    = X.Org X11 libXext runtime library.
-PKG_PACKAGES  += %{name}-devel
-
 description
    X.Org X11 libXext development package.
 end
-source_dl  =
+source_dl  = ftp://ftp.x.org/pub/individual/lib/
build
    requires
@@ -35,7 +33,6 @@ end
packages
    package %{name}
-	end
package %{name}-devel
    	template DEVEL
diff --git a/tcpick/tcpick.nm b/tcpick/tcpick.nm
new file mode 100644
index 0000000..ce5f4fb
--- /dev/null
+++ b/tcpick/tcpick.nm
@@ -0,0 +1,43 @@
+###############################################################################
+# IPFire.org    - An Open Source Firewall Solution                            #
+# Copyright (C) - IPFire Development Team info@ipfire.org                   #
+###############################################################################
+
+name       = tcpick
+version    = 0.2.1
+release    = 1
+
+groups     = Networking/Tools
+url        = http://tcpick.sourceforge.net/
+license    = GPLv2
+summary    = A libpcap-based textmode sniffer for tcp streams.
+
+description
+	Tcpick is able to save the captured flows in different files or
+	displays them in the terminal, and so it is useful to sniff files that 
+	are transmitted via ftp or http. It can display all the stream on the 
+	terminal, when the connection is closed in different display modes like 
+	hexdump, hexdump + ascii, only printable charachters, raw mode and so 
+	on. Available a color mode too, helpful to read and understand better 
+	the output of the program. Actually it can handle several interfaces, 
+	including ethernet cards and ppp. It is useful to keep track of what 
+	users of a network are doing, and is usable with textmode tools like 
+	grep, sed, awk.
+end
+
+source_dl  = http://sourceforge.net/projects/tcpick/files/%%7Bname%7D/%%7Bversion%7D/
+
+build
+	requires
+		ncurses-devel
+		libpcap-devel
+	end
+end
+
+packages
+	package %{name}
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
+end
diff --git a/xorg-x11-proto-devel/xorg-x11-proto-devel.nm b/xorg-x11-proto-devel/xorg-x11-proto-devel.nm
index 02b5473..40dc3b9 100644
--- a/xorg-x11-proto-devel/xorg-x11-proto-devel.nm
+++ b/xorg-x11-proto-devel/xorg-x11-proto-devel.nm
@@ -4,8 +4,8 @@
 ###############################################################################
name       = xorg-x11-proto-devel
-version    = 7.4
-release    = 3
+version    = 7.6
+release    = 1
 arch       = noarch
maintainer = Stefan Schantl stefan.schantl@ipfire.org
@@ -22,32 +22,32 @@ build_requires += pkg-config
source_dl = http://ftp.x.org/pub/individual/proto/
 sources = \
-	bigreqsproto-1.1.0.tar.bz2 \
-        compositeproto-0.4.1.tar.bz2 \
-        damageproto-1.2.0.tar.bz2 \
-        dmxproto-2.3.tar.bz2 \
-        dri2proto-2.3.tar.bz2 \
-        evieext-1.1.0.tar.bz2 \
-        fixesproto-4.1.1.tar.bz2 \
-        fontsproto-2.1.0.tar.bz2 \
-        glproto-1.4.12.tar.bz2 \
-        inputproto-2.0.tar.bz2 \
-        kbproto-1.0.5.tar.bz2 \
-        randrproto-1.3.1.tar.bz2 \
-        recordproto-1.14.tar.bz2 \
+	bigreqsproto-1.1.2.tar.bz2 \
+        compositeproto-0.4.2.tar.bz2 \
+        damageproto-1.2.1.tar.bz2 \
+        dmxproto-2.3.1.tar.bz2 \
+        dri2proto-2.8.tar.bz2 \
+        evieext-1.1.1.tar.bz2 \
+        fixesproto-5.0.tar.bz2 \
+        fontsproto-2.1.2.tar.bz2 \
+        glproto-1.4.16.tar.bz2 \
+        inputproto-2.2.tar.bz2 \
+        kbproto-1.0.6.tar.bz2 \
+        randrproto-1.4.0.tar.bz2 \
+        recordproto-1.14.2.tar.bz2 \
         renderproto-0.11.1.tar.bz2 \
-        resourceproto-1.1.0.tar.bz2 \
-        scrnsaverproto-1.2.0.tar.bz2 \
+        resourceproto-1.2.0.tar.bz2 \
+        scrnsaverproto-1.2.2.tar.bz2 \
         videoproto-2.3.1.tar.bz2 \
-        xcmiscproto-1.2.0.tar.bz2 \
-        xextproto-7.1.2.tar.bz2 \
+        xcmiscproto-1.2.2.tar.bz2 \
+        xextproto-7.2.1.tar.bz2 \
         xf86bigfontproto-1.2.0.tar.bz2 \
         xf86dgaproto-2.1.tar.bz2 \
-        xf86driproto-2.1.0.tar.bz2 \
+        xf86driproto-2.1.1.tar.bz2 \
         xf86miscproto-0.9.3.tar.bz2 \
-        xf86vidmodeproto-2.3.tar.bz2 \
-        xineramaproto-1.2.tar.bz2 \
-        xproto-7.0.18.tar.bz2 \
+        xf86vidmodeproto-2.3.1.tar.bz2 \
+        xineramaproto-1.2.1.tar.bz2 \
+        xproto-7.0.23.tar.bz2 \
         xproxymanagementprotocol-1.0.3.tar.bz2
build
hooks/post-receive
--
IPFire 3.x development tree

    