[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 74af03130fc87ecb5a25b23d39ff03c2f2c971a7
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 74af03130fc87ecb5a25b23d39ff03c2f2c971a7 (commit) via c33262e903cdec01b237395e2da569ea56424065 (commit) via de97dc24cbe5d7a5e6ee5d0418e3ed9e6361a572 (commit) via 07a1e2bad0d7211380f08cdae6049e0d5733a7d3 (commit) via d3d304e4884ecd596ebedaee1f8288c70070987e (commit) via a3b813f71938ecfc629cf720475a0741e9deb9ec (commit) via 2db316fd9a07ac46282e7570811b7a27fa456dfc (commit) via 282c55e8cb152e37b6371f8357fef9c027542a56 (commit) from cb8d2bc602b6c360daafa34f5c856066bf4f2f1a (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 74af03130fc87ecb5a25b23d39ff03c2f2c971a7 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Jul 29 12:42:01 2012 +0200
libcap-ng: Update to 0.7.
Fixes #10194.
commit c33262e903cdec01b237395e2da569ea56424065 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Jul 29 12:39:55 2012 +0200
iproute2: Update to 3.4.0.
Fixes #10196.
commit de97dc24cbe5d7a5e6ee5d0418e3ed9e6361a572 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Jul 29 12:15:19 2012 +0200
flex: Update to 2.5.36.
Fixes #10198.
commit 07a1e2bad0d7211380f08cdae6049e0d5733a7d3 Author: Kim Barthel kbarthel@ipfire.org Date: Mon Jul 23 23:11:42 2012 +0200
mc: Latest stable release 4.8.1.4.
Fixes #10187
commit d3d304e4884ecd596ebedaee1f8288c70070987e Merge: a3b813f 282c55e Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Jul 29 12:08:46 2012 +0200
Merge remote-tracking branch 'kbarthel/mc'
commit a3b813f71938ecfc629cf720475a0741e9deb9ec Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Jul 29 11:47:23 2012 +0200
pigz: New package.
Parallel compression, decompression for gzip.
commit 2db316fd9a07ac46282e7570811b7a27fa456dfc Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Jul 29 11:46:24 2012 +0200
transifex-client: Change summary.
commit 282c55e8cb152e37b6371f8357fef9c027542a56 Author: Kim Barthel kbarthel@ipfire.org Date: Mon Jul 23 23:11:42 2012 +0200
Latest stable release Fixes #10187
-----------------------------------------------------------------------
Summary of changes: flex/flex.nm | 29 ++++++------- iproute2/iproute2.nm | 6 +- iproute2/patches/iproute2-2.6.29-kernel.patch | 11 ----- iproute2/patches/iproute2-3.4.0-kernel.patch | 12 +++++ iproute2/patches/iproute2-3.4.0-optflags.patch | 13 ++++++ ...repath.patch => iproute2-3.4.0-sharepath.patch} | 11 +++-- iproute2/patches/iproute2-print-route-u32.patch | 20 --------- iproute2/patches/iproute2-ss050901-opt_flags.patch | 12 ----- iproute2/patches/man-pages.patch | 6 --- libcap-ng/libcap-ng.nm | 9 +--- mc/mc.nm | 3 +- pigz/pigz.nm | 44 ++++++++++++++++++++ transifex-client/transifex-client.nm | 4 +- 13 files changed, 99 insertions(+), 81 deletions(-) delete mode 100644 iproute2/patches/iproute2-2.6.29-kernel.patch create mode 100644 iproute2/patches/iproute2-3.4.0-kernel.patch create mode 100644 iproute2/patches/iproute2-3.4.0-optflags.patch rename iproute2/patches/{iproute2-sharepath.patch => iproute2-3.4.0-sharepath.patch} (50%) delete mode 100644 iproute2/patches/iproute2-print-route-u32.patch delete mode 100644 iproute2/patches/iproute2-ss050901-opt_flags.patch create mode 100644 pigz/pigz.nm
Difference in files: diff --git a/flex/flex.nm b/flex/flex.nm index b7eb973..fa2578a 100644 --- a/flex/flex.nm +++ b/flex/flex.nm @@ -4,8 +4,8 @@ ###############################################################################
name = flex -version = 2.5.35 -release = 4 +version = 2.5.36 +release = 1
groups = Development/Tools url = http://flex.sourceforge.net/ @@ -13,19 +13,18 @@ license = BSD summary = A tool for creating scanners (text pattern recognizers).
description - The flex program generates scanners. Scanners are programs which can \ - recognize lexical patterns in text. Flex takes pairs of regular \ - expressions and C code as input and generates a C source file as \ - output. The output file is compiled and linked with a library to \ - produce an executable. The executable searches through its input for \ - occurrences of the regular expressions. When a match is found, it \ - executes the corresponding C code. Flex was designed to work with \ - both Yacc and Bison, and is used by many programs as part of their \ + The flex program generates scanners. Scanners are programs which can + recognize lexical patterns in text. Flex takes pairs of regular + expressions and C code as input and generates a C source file as + output. The output file is compiled and linked with a library to + produce an executable. The executable searches through its input for + occurrences of the regular expressions. When a match is found, it + executes the corresponding C code. Flex was designed to work with + both Yacc and Bison, and is used by many programs as part of their build process. end
-source_dl = -sources = %{thisapp}.tar.bz2 +source_dl = http://prdownloads.sourceforge.net/flex/
build requires @@ -36,9 +35,9 @@ build
keep_libraries = %{libdir}/libfl_pic.a
- #test - # make check - #end + test + make check + end
install_cmds echo "#!/bin/sh" > %{BUILDROOT}/usr/bin/lex diff --git a/iproute2/iproute2.nm b/iproute2/iproute2.nm index 9d85951..31dd9da 100644 --- a/iproute2/iproute2.nm +++ b/iproute2/iproute2.nm @@ -4,7 +4,7 @@ ###############################################################################
name = iproute2 -version = 3.3.0 +version = 3.4.0 release = 1
groups = Networking/Tools @@ -18,7 +18,7 @@ description capabilities of the Linux 2.4.x and 2.6.x kernel. end
-source_dl = +source_dl = http://kernel.org/pub/linux/utils/net/iproute2/ sources = %{thisapp}.tar.xz
build @@ -52,7 +52,7 @@ build %{BUILDROOT}%{sysconfdir}/iproute2
# Install binaries. - for bin in genl/genl ip/{ifcfg,ip,routef,routel,rtpr} tc/tc \ + for bin in genl/genl ip/{ifcfg,ip,routef,routel,rtmon,rtpr} tc/tc \ misc/{arpd,ifstat,lnstat,nstat,rtacct,ss}; do install -v -m 755 ${bin} %{BUILDROOT}%{sbindir} done diff --git a/iproute2/patches/iproute2-2.6.29-kernel.patch b/iproute2/patches/iproute2-2.6.29-kernel.patch deleted file mode 100644 index df9125a..0000000 --- a/iproute2/patches/iproute2-2.6.29-kernel.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up iproute2-20091009/Makefile.kernel iproute2-20091009/Makefile ---- iproute2-20091009/Makefile.kernel 2009-09-21 10:26:11.000000000 +0200 -+++ iproute2-20091009/Makefile 2009-10-09 12:27:03.687382422 +0200 -@@ -6,6 +6,7 @@ CONFDIR=/etc/iproute2 - DOCDIR=/share/doc/iproute2 - MANDIR=/share/man - ARPDDIR=/var/lib/arpd -+KERNEL_INCLUDE=/usr/include - - # Path to db_185.h include - DBM_INCLUDE:=$(ROOTDIR)/usr/include diff --git a/iproute2/patches/iproute2-3.4.0-kernel.patch b/iproute2/patches/iproute2-3.4.0-kernel.patch new file mode 100644 index 0000000..1e83729 --- /dev/null +++ b/iproute2/patches/iproute2-3.4.0-kernel.patch @@ -0,0 +1,12 @@ +diff --git a/Makefile b/Makefile +index c107955..1e15c72 100644 +--- a/Makefile ++++ b/Makefile +@@ -7,6 +7,7 @@ DATADIR=$(PREFIX)/share + DOCDIR=$(DATADIR)/doc/iproute2 + MANDIR=$(DATADIR)/man + ARPDDIR=/var/lib/arpd ++KERNEL_INCLUDE=/usr/include + + # Path to db_185.h include + DBM_INCLUDE:=$(ROOTDIR)/usr/include diff --git a/iproute2/patches/iproute2-3.4.0-optflags.patch b/iproute2/patches/iproute2-3.4.0-optflags.patch new file mode 100644 index 0000000..1dd23cf --- /dev/null +++ b/iproute2/patches/iproute2-3.4.0-optflags.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile b/Makefile +index 1e15c72..945d3b3 100644 +--- a/Makefile ++++ b/Makefile +@@ -36,7 +36,7 @@ HOSTCC = gcc + DEFINES += -D_GNU_SOURCE + CCOPTS = -O2 + WFLAGS = -Wall -Wstrict-prototypes +-CFLAGS = $(WFLAGS) $(CCOPTS) -I../include $(DEFINES) ++CFLAGS = $(WFLAGS) $(CCOPTS) -I../include $(DEFINES) $(RPM_OPT_FLAGS) + YACCFLAGS = -d -t -v + + SUBDIRS=lib ip tc misc netem genl man diff --git a/iproute2/patches/iproute2-3.4.0-sharepath.patch b/iproute2/patches/iproute2-3.4.0-sharepath.patch new file mode 100644 index 0000000..2a29677 --- /dev/null +++ b/iproute2/patches/iproute2-3.4.0-sharepath.patch @@ -0,0 +1,24 @@ +diff --git a/tc/tc_util.c b/tc/tc_util.c +index 926ed08..33f6974 100644 +--- a/tc/tc_util.c ++++ b/tc/tc_util.c +@@ -24,8 +24,8 @@ + #include "utils.h" + #include "tc_util.h" + +-#ifndef LIBDIR +-#define LIBDIR "/usr/lib" ++#ifndef SHAREDIR ++#define SHAREDIR "/usr/share" + #endif + + const char *get_tc_lib(void) +@@ -34,7 +34,7 @@ const char *get_tc_lib(void) + + lib_dir = getenv("TC_LIB_DIR"); + if (!lib_dir) +- lib_dir = LIBDIR "/tc/"; ++ lib_dir = SHAREDIR "/tc/"; + + return lib_dir; + } diff --git a/iproute2/patches/iproute2-print-route-u32.patch b/iproute2/patches/iproute2-print-route-u32.patch deleted file mode 100644 index 48920d8..0000000 --- a/iproute2/patches/iproute2-print-route-u32.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- iproute2-2.6.35/ip/iproute.c 2010-08-31 13:01:39.151185561 +0200 -+++ iproute2-print-route-u32.c 2010-08-31 13:41:04.072928779 +0200 -@@ -368,7 +368,7 @@ - abuf, sizeof(abuf))); - } - if (tb[RTA_PRIORITY]) -- fprintf(fp, " metric %d ", *(__u32*)RTA_DATA(tb[RTA_PRIORITY])); -+ fprintf(fp, " metric %u ", *(__u32*)RTA_DATA(tb[RTA_PRIORITY])); - if (r->rtm_flags & RTNH_F_DEAD) - fprintf(fp, "dead "); - if (r->rtm_flags & RTNH_F_ONLINK) -@@ -487,7 +487,7 @@ - if (i < sizeof(mx_names)/sizeof(char*) && mx_names[i]) - fprintf(fp, " %s", mx_names[i]); - else -- fprintf(fp, " metric %d", i); -+ fprintf(fp, " metric %u", i); - if (mxlock & (1<<i)) - fprintf(fp, " lock"); - diff --git a/iproute2/patches/iproute2-sharepath.patch b/iproute2/patches/iproute2-sharepath.patch deleted file mode 100644 index f314922..0000000 --- a/iproute2/patches/iproute2-sharepath.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -up iproute-2.6.29/iproute2-2.6.29/tc/tc_util.c.movelib iproute-2.6.29/iproute2-2.6.29/tc/tc_util.c ---- iproute2-2.6.29/tc/tc_util.c.movelib 2009-01-15 21:25:04.000000000 +0100 -+++ iproute2-2.6.29/tc/tc_util.c 2009-02-04 08:58:36.000000000 +0100 -@@ -24,8 +24,8 @@ - #include "utils.h" - #include "tc_util.h" - --#ifndef LIBDIR --#define LIBDIR "/usr/lib/" -+#ifndef SHAREDIR -+#define SHAREDIR "/usr/share/" - #endif - - const char *get_tc_lib(void) -@@ -34,7 +34,7 @@ const char *get_tc_lib(void) - - lib_dir = getenv("TC_LIB_DIR"); - if (!lib_dir) -- lib_dir = LIBDIR "/tc/"; -+ lib_dir = SHAREDIR "/tc/"; - - return lib_dir; - } diff --git a/iproute2/patches/iproute2-ss050901-opt_flags.patch b/iproute2/patches/iproute2-ss050901-opt_flags.patch deleted file mode 100644 index 686bf68..0000000 --- a/iproute2/patches/iproute2-ss050901-opt_flags.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up iproute2-2.6.29/iproute2-2.6.29/Makefile.opt iproute2-2.6.29/iproute2-2.6.29/Makefile ---- iproute2-2.6.29/Makefile.opt 2008-08-12 14:19:58.000000000 +0200 -+++ iproute2-2.6.29/Makefile 2008-08-12 14:21:42.000000000 +0200 -@@ -22,7 +22,7 @@ ADDLIB+=ipx_ntop.o ipx_pton.o - - CC = gcc - HOSTCC = gcc --CCOPTS = -D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -+CCOPTS = -D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall $(RPM_OPT_FLAGS) - CFLAGS = $(CCOPTS) -I../include $(DEFINES) - YACCFLAGS = -d -t -v - diff --git a/iproute2/patches/man-pages.patch b/iproute2/patches/man-pages.patch index 1592889..9199e3e 100644 --- a/iproute2/patches/man-pages.patch +++ b/iproute2/patches/man-pages.patch @@ -65,12 +65,6 @@ diff -up /dev/null iproute2-2.6.29/man/man8/ifcfg.8 + +.SH SEE ALSO +.BR ip-cref.dvi -diff -up /dev/null iproute2-2.6.29/man/man8/nstat.8 ---- /dev/null 2009-09-22 09:26:40.270218984 +0200 -+++ iproute2-2.6.29/man/man8/nstat.8 2009-09-24 14:03:05.416161849 +0200 -@@ -0,0 +1 @@ -+.so man8/rtacct.8 -\ No newline at end of file --- iproute2-2.6.35/man/man8/ss.8 2010-08-04 19:45:59.000000000 +0200 +++ iproute2-2.6.35/man/man8/ss.8.new 2010-10-11 14:47:06.084216018 +0200 @@ -114,7 +114,7 @@ diff --git a/libcap-ng/libcap-ng.nm b/libcap-ng/libcap-ng.nm index 7e968c1..1fa16e9 100644 --- a/libcap-ng/libcap-ng.nm +++ b/libcap-ng/libcap-ng.nm @@ -4,8 +4,8 @@ ###############################################################################
name = libcap-ng -version = 0.6.6 -release = 3 +version = 0.7 +release = 1
groups = System/Libraries url = http://people.redhat.com/sgrubb/libcap-ng @@ -25,10 +25,7 @@ build python end
- # XXX Testsuite is broken by the package developers - #def test - # make check - #end + # The testsuite is broken by the package developers end
packages diff --git a/mc/mc.nm b/mc/mc.nm index fcba89f..c585ed6 100644 --- a/mc/mc.nm +++ b/mc/mc.nm @@ -4,8 +4,9 @@ ###############################################################################
name = mc -version = 4.8.3 +version = 4.8.1.4 release = 1 +epoch = 1
groups = Applications/System url = http://www.ibiblio.org/mc/ diff --git a/pigz/pigz.nm b/pigz/pigz.nm new file mode 100644 index 0000000..27a30a2 --- /dev/null +++ b/pigz/pigz.nm @@ -0,0 +1,44 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team info@ipfire.org # +############################################################################### + +name = pigz +version = 2.2.5 +release = 1 + +groups = Applications/Compression +url = http://www.zlib.net/pigz/ +license = zlib +summary = Parallel implementation of gzip. + +description + pigz, which stands for parallel implementation of gzip, + is a fully functional replacement for gzip that exploits + multiple processors and multiple cores to the hilt when compressing + data. +end + +source_dl = %{url} + +build + requires + zlib-devel + end + + make_build_targets += CFLAGS="%{CFLAGS}" + + install + install -p -D pigz %{BUILDROOT}%{bindir}/pigz + ln -svf pigz %{BUILDROOT}%{bindir}/unpigz + install -p -D pigz.1 -m 644 %{BUILDROOT}%{mandir}/man1/pigz.1 + end +end + +packages + package %{name} + + package %{name}-debuginfo + template DEBUGINFO + end +end diff --git a/transifex-client/transifex-client.nm b/transifex-client/transifex-client.nm index 39e03fa..b3f0e74 100644 --- a/transifex-client/transifex-client.nm +++ b/transifex-client/transifex-client.nm @@ -5,13 +5,13 @@
name = transifex-client version = 0.7.3 -release = 1 +release = 2 arch = noarch
groups = Development/Tools url = http://transifex.org license = GPLv2 -summary = A tool for creating scanners (text pattern recognizers). +summary = Command line tool for Transifex translation management.
description The Transifex Command-line Client is a command line tool that enables
hooks/post-receive -- IPFire 3.x development tree
-
git＠ipfire.org