]> git.ipfire.org Git - people/ms/ipfire-3.x.git/commitdiff
Merge remote-tracking branch 'stevee/pcre'
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 20 Apr 2014 12:53:30 +0000 (14:53 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 20 Apr 2014 12:53:30 +0000 (14:53 +0200)
Conflicts:
pcre/pcre.nm

37 files changed:
compat-gmp/compat-gmp.nm [new file with mode: 0644]
compat-gmp/patches/gmp-fix-tscan.patch0 [new file with mode: 0644]
file/file.nm
gmp/gmp.nm
grep/grep.nm
iproute2/iproute2.nm
iproute2/patches/iproute2-2.6.29-IPPROTO_IP_for_SA.patch [deleted file]
iproute2/patches/iproute2-2.6.31-tc_modules.patch [deleted file]
iproute2/patches/iproute2-2.6.39-create-peer-veth-without-a-name.patch [deleted file]
iproute2/patches/iproute2-3.11.0-optflags.patch [new file with mode: 0644]
iproute2/patches/iproute2-3.11.0-rtt.patch [new file with mode: 0644]
iproute2/patches/iproute2-3.11.0-tc-ok.patch [new file with mode: 0644]
iproute2/patches/iproute2-3.12.0-lnstat-dump-to-stdout.patch [moved from iproute2/patches/iproute2-2.6.39-lnstat-dump-to-stdout.patch with 63% similarity]
iproute2/patches/iproute2-3.12.0-lnstat-interval.patch [new file with mode: 0644]
iproute2/patches/iproute2-3.4.0-optflags.patch [deleted file]
iproute2/patches/iproute2-3.4.0-sharepath.patch [deleted file]
iproute2/patches/iproute2-3.9.0-IPPROTO_IP_for_SA.patch [new file with mode: 0644]
iproute2/patches/man-pages.patch
kernel/config-arm-generic
kernel/config-armv5tel-default [moved from kernel/config-armv5tel-kirkwood with 83% similarity]
kernel/config-armv7hl-default
kernel/config-armv7hl-generic [deleted file]
kernel/config-armv7hl-lpae
kernel/config-generic
kernel/config-x86-generic
kernel/kernel.nm
kernel/scripts/configure
libnftnl/libnftnl.nm [new file with mode: 0644]
libpng/libpng.nm
nftables/nftables.nm [new file with mode: 0644]
openssl/openssl.nm
openssl/patches/openssl.git-96db902.patch [new file with mode: 0644]
pciutils/pciutils.nm
pcre/pcre.nm
rng-tools/patches/rng-tools-man.patch [new file with mode: 0644]
rng-tools/rng-tools.nm [new file with mode: 0644]
rng-tools/systemd/rngd.service [new file with mode: 0644]

diff --git a/compat-gmp/compat-gmp.nm b/compat-gmp/compat-gmp.nm
new file mode 100644 (file)
index 0000000..fc1d918
--- /dev/null
@@ -0,0 +1,77 @@
+###############################################################################
+# IPFire.org    - An Open Source Firewall Solution                            #
+# Copyright (C) - IPFire Development Team <info@ipfire.org>                   #
+###############################################################################
+
+name       = compat-gmp
+version    = 4.3.2
+release    = 1
+thisapp    = gmp-%{version}
+
+groups     = System/Libraries
+url        = http://gmplib.org/
+license    = LGPLv3+
+summary    = A GNU arbitrary precision library.
+
+description
+       The gmp package contains GNU MP, a library for arbitrary precision
+       arithmetic, signed integers operations, rational numbers and floating
+       point numbers. GNU MP is designed for speed, for both small and very
+       large operands. GNU MP is fast because it uses fullwords as the basic
+       arithmetic type, it uses fast algorithms, it carefully optimizes
+       assembly code for many CPUs' most common inner loops, and it generally
+       emphasizes speed over simplicity/elegance in its operations.
+end
+
+source_dl += https://gmplib.org/download/gmp/ ftp://ftp.gnu.org/gnu/gmp/
+sources    = %{thisapp}.tar.xz
+
+build
+       requires
+               gcc-c++
+               m4
+       end
+
+       export ABI = standard
+
+       if "%{DISTRO_ARCH}" == "x86_64"
+               ABI = 64
+       end
+
+       if "%{DISTRO_ARCH}" == "i686"
+               ABI = 32
+       end
+
+       configure_options += \
+               --enable-cxx \
+               --enable-mpbsd \
+               --disable-static
+
+       test
+               export LD_LIBRARY_PATH=$(pwd)/.libs
+               make check
+       end
+
+       install
+               # Install just the library and no headers.
+               mkdir -pv %{BUILDROOT}%{libdir}
+               install -m 644 .libs/libgmp.so.3.5.2 %{BUILDROOT}%{libdir}
+               ln -svf libgmp.so.3.5.2 %{BUILDROOT}%{libdir}/libgmp.so.3
+       end
+end
+
+packages
+       package %{name}
+               provides
+                       gmp = %{thisver}
+               end
+
+               obsoletes
+                       gmp <= %{thisver}
+               end
+       end
+
+       package %{name}-debuginfo
+               template DEBUGINFO
+       end
+end
diff --git a/compat-gmp/patches/gmp-fix-tscan.patch0 b/compat-gmp/patches/gmp-fix-tscan.patch0
new file mode 100644 (file)
index 0000000..cddbfe0
--- /dev/null
@@ -0,0 +1,13 @@
+https://gmplib.org/list-archives/gmp-bugs/2011-October/002417.html
+
+--- tests/mpz/t-scan.c 2011-05-08 11:49:29.000000000 +0200
++++ tests/mpz/t-scan.c 2011-10-10 16:37:13.657829003 +0200
+@@ -79,7 +79,7 @@
+               for (isize = 0; isize <= size; isize++)
+                 {
+-                  for (oindex = 0; oindex <= numberof (offset); oindex++)
++                  for (oindex = 0; oindex < numberof (offset); oindex++)
+                     {
+                       o = offset[oindex];
+                       if ((int) isize*GMP_NUMB_BITS < -o)
index c9eed0dee8b3cc8791126fabd78511601f23b2d4..9ac198e69c7d5012b02ebb7f16f8b627e4502302 100644 (file)
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = file
-version    = 5.13
+version    = 5.18
 release    = 1
 
 groups     = System/Tools
index 8eee8fa8ee663afaa883925087a199c0bfebf291..a3cd0f267fd1a6291c36a7ee4c7827a8b5d45eb9 100644 (file)
@@ -4,11 +4,9 @@
 ###############################################################################
 
 name       = gmp
-version    = 5.0.5
+version    = 6.0.0
 release    = 1
 
-compat_version = 4.3.2
-
 groups     = System/Libraries
 url        = http://gmplib.org/
 license    = LGPLv3+
@@ -24,8 +22,8 @@ description
        emphasizes speed over simplicity/elegance in its operations.
 end
 
-source_dl += ftp://ftp.gnu.org/gnu/gmp/
-sources    = %{thisapp}.tar.bz2 %{name}-%{compat_version}.tar.bz2
+source_dl += https://gmplib.org/download/gmp/ ftp://ftp.gnu.org/gnu/gmp/
+sources    = %{thisapp}.tar.xz
 
 build
        requires
@@ -55,6 +53,12 @@ build
                --enable-mpbsd \
                --disable-static
 
+       if "%{DISTRO_ARCH}" == "armv7hl"
+               # GMP cannot be built with THUMB support.
+               CFLAGS   := %(echo "%{CFLAGS}"   | sed -e "s/-mthumb//g")
+               CXXFLAGS := %(echo "%{CXXFLAGS}" | sed -e "s/-mthumb//g")
+       end
+
        prepare_cmds
                for version in %{build_versions}; do
                        mkdir -p build-${version}
@@ -66,10 +70,8 @@ build
        end
 
        build_one
-               CFLAGS="${CFLAGS}" \
-               CXXFLAGS="${CXXFLAGS}" \
-                       ./configure \
-                               %{configure_options}
+               ./configure \
+                       %{configure_options}
 
                # Kill RPATHs.
                sed -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \
@@ -91,18 +93,14 @@ build
                        CXXFLAGS="%{CXXFLAGS}"
                        if [ "${version}" = "sse2" ]; then
                                # Enable sse2.
-                               CFLAGS="${CFLAGS} -march=pentium4"
-                               CXXFLAGS="${CXXFLAGS} -march=pentium4"
+                               CFLAGS="%{CFLAGS} -march=pentium4"
+                               CXXFLAGS="%{CXXFLAGS} -march=pentium4"
                        fi
 
                        %{build_one}
 
                        cd ..
                done
-
-               # Build compat version of library.
-               cd %{DIR_SRC}/%{name}-%{compat_version}
-               %{build_one}
        end
 
        test
@@ -114,12 +112,6 @@ build
 
                        cd ..
                done
-
-               # Check compat version of library.
-               cd %{DIR_SRC}/%{name}-%{compat_version}
-
-               export LD_LIBRARY_PATH=$(pwd)/.libs
-               make check
        end
 
        install
@@ -137,21 +129,12 @@ build
                                install -m 755 .libs/libgmpxx.so.*.* %{BUILDROOT}/usr/lib/sse2
                                cp -a .libs/libgmpxx.so.? %{BUILDROOT}/usr/lib/sse2
                                chmod 755 %{BUILDROOT}/usr/lib/sse2/libgmpxx.so.?
-
-                               install -m 755 .libs/libmp.so.*.* %{BUILDROOT}/usr/lib/sse2
-                               cp -a .libs/libmp.so.? %{BUILDROOT}/usr/lib/sse2
-                               chmod 755 %{BUILDROOT}/usr/lib/sse2/libmp.so.?
                        else
                                make install DESTDIR="%{BUILDROOT}"
                        fi
 
                        cd ..
                done
-
-               # Install compat version of library.
-               cd %{DIR_SRC}/%{name}-%{compat_version}
-               install -m 644 .libs/libgmp.so.3.5.2 %{BUILDROOT}%{libdir}
-               ln -svf libgmp.so.3.5.2 %{BUILDROOT}%{libdir}/libgmp.so.3
        end
 end
 
@@ -162,14 +145,6 @@ packages
                template DEVEL
        end
 
-       package %{name}-compat
-               summary = Compatibility version of %{thisapp} (%{compat_version}).
-
-               files
-                       %{libdir}/libgmp.so.3*
-               end
-       end
-
        package %{name}-debuginfo
                template DEBUGINFO
        end
index 2dea0cc27cb1435fedc043cae8a67d1eb891b1ae..1462ba3ac7e2d2a2ccb1e189f75d4f82a7b6f066 100644 (file)
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = grep
-version    = 2.17
+version    = 2.18
 release    = 1
 
 groups     = Applications/Text
@@ -30,11 +30,6 @@ build
                texinfo
        end
 
-       prepare_cmds
-               sed -e "s/gnulib-tests//" -i Makefile.am
-               autoreconf -vfi
-       end
-
        configure_options += \
                --without-included-regex
 
index 03da2ce18c5e2a93a4ae2f88d31613dcbf5df4dd..f11c7a8d70916711b2d852bc108770628e45cec2 100644 (file)
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = iproute2
-version    = 3.5.1
-release    = 3
+version    = 3.14.0
+release    = 1
 
 groups     = Networking/Tools
 url        = http://www.linuxfoundation.org/en/Net:Iproute2
@@ -13,8 +13,8 @@ license    = GPLv2+
 summary    = Advanced IP routing and network device configuration tools.
 
 description
-       The iproute package contains networking utilities (ip and rtmon, for \
-       example) which are designed to use the advanced networking \
+       The iproute package contains networking utilities (ip and rtmon, for
+       example) which are designed to use the advanced networking
        capabilities of the Linux 2.4.x and 2.6.x kernel.
 end
 
@@ -24,15 +24,15 @@ sources    = %{thisapp}.tar.xz
 build
        requires
                bison
-               db4-devel
                flex
+               libdb-devel
                libnl-devel
                linux-atm-devel >= 2.5.1
                iptables-devel >= 1.4.19
        end
 
        prepare_cmds
-               sed -e "s/_VERSION_/%{version}/" -i man/man8/ss.8
+               sed -e "s/^LIBDIR=/LIBDIR?=/" -i Makefile
        end
 
        export RPM_OPT_FLAGS = %{CFLAGS}
@@ -52,8 +52,8 @@ build
                        %{BUILDROOT}%{sysconfdir}/iproute2
 
                # Install binaries.
-               for bin in genl/genl ip/{ifcfg,ip,routef,routel,rtmon,rtpr} tc/tc \
-                               misc/{arpd,ifstat,lnstat,nstat,rtacct,ss}; do
+               for bin in bridge/bridge 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
                ln -svf lnstat %{BUILDROOT}%{sbindir}/ctstat
@@ -82,9 +82,6 @@ build
 
                # Install configuration.
                install -v -m 644 etc/iproute2/* %{BUILDROOT}%{sysconfdir}/iproute2
-
-               # bridge should be installed as 'br', following upstream
-               install -v -m 755 bridge/bridge %{BUILDROOT}%{sbindir}/br
        end
 
        # Keep libnetlink.a.
diff --git a/iproute2/patches/iproute2-2.6.29-IPPROTO_IP_for_SA.patch b/iproute2/patches/iproute2-2.6.29-IPPROTO_IP_for_SA.patch
deleted file mode 100644 (file)
index 48ffcb4..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up iproute2-2.6.29/ip/ipxfrm.c.old iproute2-2.6.29/ip/ipxfrm.c
---- iproute2-2.6.29/ip/ipxfrm.c.old    2009-03-24 23:15:14.000000000 +0100
-+++ iproute2-2.6.29/ip/ipxfrm.c        2009-04-24 09:35:58.203735119 +0200
-@@ -1156,6 +1156,7 @@ static int xfrm_selector_upspec_parse(st
-               case IPPROTO_UDP:
-               case IPPROTO_SCTP:
-               case IPPROTO_DCCP:
-+              case IPPROTO_IP:        /* to allow shared SA for different protocols */
-                       break;
-               default:
-                       fprintf(stderr, "\"sport\" and \"dport\" are invalid with proto=%s\n", strxf_proto(sel->proto));
diff --git a/iproute2/patches/iproute2-2.6.31-tc_modules.patch b/iproute2/patches/iproute2-2.6.31-tc_modules.patch
deleted file mode 100644 (file)
index 0daa17b..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up iproute2-2.6.31/Makefile.old iproute2-2.6.31/Makefile
---- iproute2-2.6.31/Makefile.old       2010-01-04 12:46:47.000000000 +0100
-+++ iproute2-2.6.31/Makefile   2010-01-04 12:50:17.396384644 +0100
-@@ -13,7 +13,7 @@ DBM_INCLUDE:=$(ROOTDIR)/usr/include
- SHARED_LIBS = y
--DEFINES= -DRESOLVE_HOSTNAMES -DLIBDIR=\"$(LIBDIR)\"
-+DEFINES= -DRESOLVE_HOSTNAMES -DLIBDIR=\"$(LIBDIR)\" -DIPT_LIB_DIR=\"$(IPT_LIB_DIR)\"
- ifneq ($(SHARED_LIBS),y)
- DEFINES+= -DNO_SHARED_LIBS
- endif
diff --git a/iproute2/patches/iproute2-2.6.39-create-peer-veth-without-a-name.patch b/iproute2/patches/iproute2-2.6.39-create-peer-veth-without-a-name.patch
deleted file mode 100644 (file)
index b77dd71..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/ip/.link_veth.c.swp b/ip/.link_veth.c.swp
-deleted file mode 100644
-index e3b5480..0000000
-Binary files a/ip/.link_veth.c.swp and /dev/null differ
-diff --git a/ip/link_veth.c b/ip/link_veth.c
-index 3d19b01..eb0f41e 100644
---- a/ip/link_veth.c
-+++ b/ip/link_veth.c
-@@ -27,7 +27,7 @@ static void usage(void)
- static int veth_parse_opt(struct link_util *lu, int argc, char **argv,
-                         struct nlmsghdr *hdr)
- {
--      char *name, *type, *link, *dev;
-+      char *name = NULL, *type = NULL, *link = NULL, *dev = NULL;
-       int err, len;
-       struct rtattr * data;
-       int group;
diff --git a/iproute2/patches/iproute2-3.11.0-optflags.patch b/iproute2/patches/iproute2-3.11.0-optflags.patch
new file mode 100644 (file)
index 0000000..b5396b5
--- /dev/null
@@ -0,0 +1,13 @@
+diff --git a/Makefile b/Makefile
+index 95266f5..1876ec4 100644
+--- a/Makefile
++++ b/Makefile
+@@ -34,7 +34,7 @@ CCOPTS = -O2
+ WFLAGS := -Wall -Wstrict-prototypes  -Wmissing-prototypes
+ WFLAGS += -Wmissing-declarations -Wold-style-definition
+-CFLAGS = $(WFLAGS) $(CCOPTS) -I../include $(DEFINES)
++CFLAGS = $(WFLAGS) $(CCOPTS) -I../include $(DEFINES) $(RPM_OPT_FLAGS)
+ YACCFLAGS = -d -t -v
+ SUBDIRS=lib ip tc bridge misc netem genl man
diff --git a/iproute2/patches/iproute2-3.11.0-rtt.patch b/iproute2/patches/iproute2-3.11.0-rtt.patch
new file mode 100644 (file)
index 0000000..8198374
--- /dev/null
@@ -0,0 +1,31 @@
+diff --git a/lib/utils.c b/lib/utils.c
+index dae1b51..8a1a65d 100644
+--- a/lib/utils.c
++++ b/lib/utils.c
+@@ -145,7 +145,7 @@ int get_time_rtt(unsigned *val, const char *arg, int *raw)
+                       return -1;
+               /* extra non-digits */
+-              if (!p || p == arg || *p)
++              if (!p || p == arg)
+                       return -1;
+               /* over/underflow */
+@@ -155,7 +155,7 @@ int get_time_rtt(unsigned *val, const char *arg, int *raw)
+               res = strtoul(arg, &p, 0);
+               /* empty string or trailing non-digits */
+-              if (!p || p == arg || *p)
++              if (!p || p == arg)
+                       return -1;
+               /* overflow */
+@@ -165,8 +165,6 @@ int get_time_rtt(unsigned *val, const char *arg, int *raw)
+               t = (double)res;
+       }
+-      if (p == arg)
+-              return -1;
+       *raw = 1;
+       if (*p) {
diff --git a/iproute2/patches/iproute2-3.11.0-tc-ok.patch b/iproute2/patches/iproute2-3.11.0-tc-ok.patch
new file mode 100644 (file)
index 0000000..fb8a13c
--- /dev/null
@@ -0,0 +1,91 @@
+From 3c4b5a852d5bb9070c7fb4428aa50f2e3e1f6e1b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
+Date: Thu, 19 Sep 2013 11:25:49 +0200
+Subject: [PATCH] Confirm success for each tc -batch command
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+If `tc -force -batch' is fed by a controlling program from a pipe,
+it's not possible to recognize when a command has been processes
+successfully.
+
+This patch adds an optional `-OK' option to the tc(8) tool, so `tc
+-force -OK -batch' will print "OK\n" to standard output on each
+successfully completed tc command.
+
+Signed-off-by: Petr PísaÅ™ <ppisar@redhat.com>
+---
+ man/man8/tc.8 | 8 +++++++-
+ tc/tc.c       | 8 +++++++-
+ 2 files changed, 14 insertions(+), 2 deletions(-)
+
+diff --git a/man/man8/tc.8 b/man/man8/tc.8
+index e0acfeb..583eae2 100644
+--- a/man/man8/tc.8
++++ b/man/man8/tc.8
+@@ -49,7 +49,7 @@ DEV
+ DEV
+ .P
+-.B tc [ -force ] -b\fR[\fIatch\fR] \fB[ filename ]
++.B tc [ -force ] [ -OK ] -b\fR[\fIatch\fR] \fB[ filename ]
+ .ti 8
+ .IR FORMAT " := {"
+@@ -440,6 +440,12 @@ First failure will cause termination of tc.
+ don't terminate tc on errors in batch mode.
+ If there were any errors during execution of the commands, the application return code will be non zero.
++.TP
++.BR "\-OK"
++in batch mode, print
++.B OK
++and a new line on standard output after each successfully interpreted command.
++
+ .SH HISTORY
+ .B tc
+ was written by Alexey N. Kuznetsov and added in Linux 2.2.
+diff --git a/tc/tc.c b/tc/tc.c
+index 9b50e74..b43bb47 100644
+--- a/tc/tc.c
++++ b/tc/tc.c
+@@ -39,6 +39,7 @@ int batch_mode = 0;
+ int resolve_hosts = 0;
+ int use_iec = 0;
+ int force = 0;
++int ok = 0;
+ struct rtnl_handle rth;
+ static void *BODY = NULL;     /* cached handle dlopen(NULL) */
+@@ -183,7 +184,7 @@ noexist:
+ static void usage(void)
+ {
+       fprintf(stderr, "Usage: tc [ OPTIONS ] OBJECT { COMMAND | help }\n"
+-                      "       tc [-force] -batch filename\n"
++                      "       tc [-force] [-OK] -batch filename\n"
+                       "where  OBJECT := { qdisc | class | filter | action | monitor }\n"
+                       "       OPTIONS := { -s[tatistics] | -d[etails] | -r[aw] | -p[retty] | -b[atch] [filename] }\n");
+ }
+@@ -251,6 +252,9 @@ static int batch(const char *name)
+                       ret = 1;
+                       if (!force)
+                               break;
++              } else if (ok) {
++                      printf("OK\n");
++                      fflush(stdout);
+               }
+       }
+       if (line)
+@@ -288,6 +292,8 @@ int main(int argc, char **argv)
+                       return 0;
+               } else if (matches(argv[1], "-force") == 0) {
+                       ++force;
++              } else if (matches(argv[1], "-OK") == 0) {
++                      ++ok;
+               } else  if (matches(argv[1], "-batch") == 0) {
+                       argc--; argv++;
+                       if (argc <= 1)
+-- 
+1.8.3.1
+
similarity index 63%
rename from iproute2/patches/iproute2-2.6.39-lnstat-dump-to-stdout.patch
rename to iproute2/patches/iproute2-3.12.0-lnstat-dump-to-stdout.patch
index a5b7b62510b0c73e77349253351db62da6a655fa..d16a4bb26dd87cc21802cd145cfb80346dae646d 100644 (file)
@@ -1,13 +1,13 @@
 diff --git a/misc/lnstat.c b/misc/lnstat.c
-index 32ab6a4..431bfc7 100644
+index d6415ef..8608cfa 100644
 --- a/misc/lnstat.c
 +++ b/misc/lnstat.c
-@@ -322,7 +322,7 @@ int main(int argc, char **argv)
-               int i;
-               struct table_hdr *header;
+@@ -351,7 +351,7 @@ int main(int argc, char **argv)
+       switch (mode) {
        case MODE_DUMP:
 -              lnstat_dump(stderr, lnstat_files);
 +              lnstat_dump(stdout, lnstat_files);
                break;
-       case MODE_NORMAL:
  
+       case MODE_NORMAL:
diff --git a/iproute2/patches/iproute2-3.12.0-lnstat-interval.patch b/iproute2/patches/iproute2-3.12.0-lnstat-interval.patch
new file mode 100644 (file)
index 0000000..b20f079
--- /dev/null
@@ -0,0 +1,34 @@
+diff --git a/misc/lnstat.c b/misc/lnstat.c
+index 8608cfa..8e8b1ba 100644
+--- a/misc/lnstat.c
++++ b/misc/lnstat.c
+@@ -253,7 +253,7 @@ int main(int argc, char **argv)
+               MODE_JSON,
+               MODE_NORMAL,
+       } mode = MODE_NORMAL;
+-      unsigned long count = 1;
++      unsigned long count = 0;
+       struct table_hdr *header;
+       static struct field_params fp;
+       int num_req_files = 0;
+@@ -366,7 +366,7 @@ int main(int argc, char **argv)
+               if (interval < 1 )
+                       interval = 1;
+-              for (i = 0; i < count; i++) {
++              for (i = 0; i < count || !count; ) {
+                       lnstat_update(lnstat_files);
+                       if (mode == MODE_JSON)
+                               print_json(stdout, lnstat_files, &fp);
+@@ -377,8 +377,10 @@ int main(int argc, char **argv)
+                               print_line(stdout, lnstat_files, &fp);
+                       }
+                       fflush(stdout);
+-                      if (i < count - 1)
++                      if (i < count - 1 || !count)
+                               sleep(interval);
++                      if (count)
++                              ++i;
+               }
+               break;
+       }
diff --git a/iproute2/patches/iproute2-3.4.0-optflags.patch b/iproute2/patches/iproute2-3.4.0-optflags.patch
deleted file mode 100644 (file)
index 1dd23cf..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-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
deleted file mode 100644 (file)
index 2a29677..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-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-3.9.0-IPPROTO_IP_for_SA.patch b/iproute2/patches/iproute2-3.9.0-IPPROTO_IP_for_SA.patch
new file mode 100644 (file)
index 0000000..6c150ec
--- /dev/null
@@ -0,0 +1,12 @@
+diff --git a/ip/ipxfrm.c b/ip/ipxfrm.c
+index 0495ff4..b1d4c6e 100644
+--- a/ip/ipxfrm.c
++++ b/ip/ipxfrm.c
+@@ -1275,6 +1275,7 @@ static int xfrm_selector_upspec_parse(struct xfrm_selector *sel,
+               case IPPROTO_UDP:
+               case IPPROTO_SCTP:
+               case IPPROTO_DCCP:
++              case IPPROTO_IP: /* to allow shared SA for different protocols */
+                       break;
+               default:
+                       fprintf(stderr, "\"sport\" and \"dport\" are invalid with PROTO value \"%s\"\n", strxf_proto(sel->proto));
index 9199e3e1b5e777ef62c4fff1b4bed6d45dc19e1d..94e5bc9ba586626f9c9d2dff8db55da815630839 100644 (file)
@@ -65,14 +65,3 @@ diff -up /dev/null iproute2-2.6.29/man/man8/ifcfg.8
 +
 +.SH SEE ALSO
 +.BR ip-cref.dvi
---- 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 @@
- List all the tcp sockets in state FIN-WAIT-1 for our apache to network 193.233.7/24 and look at their timers.
- .SH SEE ALSO
- .BR ip (8),
--.BR /usr/share/doc/iproute-doc/ss.html " (package iproute­doc)"
-+.BR /usr/share/doc/iproute-doc-_VERSION_/ss.ps " (package iproute-doc)"
- .SH AUTHOR
- .I ss 
- was written by Alexey Kuznetosv, <kuznet@ms2.inr.ac.ru>.
index 319f296f7e6e28ecbd080aa37059532afca8928b..5b3431a9acb140322d333e855a56dbf150ed7d94 100644 (file)
@@ -1,6 +1,7 @@
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
+CONFIG_ARCH_HAS_CPUFREQ=y
 CONFIG_VECTORS_BASE=0xffff0000
 CONFIG_ARM_PATCH_PHYS_VIRT=y
 
@@ -8,6 +9,7 @@ CONFIG_ARM_PATCH_PHYS_VIRT=y
 # IRQ subsystem
 #
 CONFIG_HARDIRQS_SW_RESEND=y
+CONFIG_GENERIC_IRQ_CHIP=y
 CONFIG_KTIME_SCALAR=y
 
 #
@@ -35,6 +37,7 @@ CONFIG_LBDAF=y
 #
 # CONFIG_ARCH_INTEGRATOR is not set
 # CONFIG_ARCH_REALVIEW is not set
+# CONFIG_ARCH_VERSATILE is not set
 # CONFIG_ARCH_AT91 is not set
 # CONFIG_ARCH_CLPS711X is not set
 # CONFIG_ARCH_GEMINI is not set
@@ -72,6 +75,11 @@ CONFIG_LBDAF=y
 #
 # CONFIG_PLAT_SPEAR is not set
 
+#
+# Versatile Express platform type
+#
+CONFIG_PLAT_ORION=y
+
 #
 # Processor Type
 #
@@ -81,9 +89,12 @@ CONFIG_CPU_CP15_MMU=y
 #
 # Processor Features
 #
+# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
 CONFIG_ARM_THUMB=y
 # CONFIG_CPU_ICACHE_DISABLE is not set
 # CONFIG_CPU_DCACHE_DISABLE is not set
+CONFIG_KUSER_HELPERS=y
+CONFIG_OUTER_CACHE=y
 CONFIG_ARM_NR_BANKS=8
 CONFIG_MULTI_IRQ_HANDLER=y
 
@@ -97,6 +108,7 @@ CONFIG_PCI_SYSCALL=y
 #
 # PCI host controller drivers
 #
+CONFIG_PCI_MVEBU=y
 CONFIG_PCIEASPM_DEFAULT=y
 # CONFIG_PCIEASPM_POWERSAVE is not set
 
@@ -119,6 +131,7 @@ CONFIG_HIGHMEM=y
 CONFIG_HW_PERF_EVENTS=y
 CONFIG_FLATMEM=y
 CONFIG_FLAT_NODE_MEM_MAP=y
+# CONFIG_PHYS_ADDR_T_64BIT is not set
 CONFIG_ALIGNMENT_TRAP=y
 
 #
@@ -182,7 +195,12 @@ CONFIG_CMA_AREAS=7
 #
 # Bus devices
 #
+CONFIG_MVEBU_MBUS=y
 CONFIG_ARM_CCI=y
+
+#
+# LPDDR flash memory drivers
+#
 CONFIG_DTC=y
 CONFIG_OF=y
 
@@ -230,6 +248,7 @@ CONFIG_DM9000=m
 CONFIG_NET_VENDOR_FARADAY=y
 # CONFIG_FTMAC100 is not set
 # CONFIG_FTGMAC100 is not set
+CONFIG_MV643XX_ETH=m
 # CONFIG_MLX4_EN is not set
 # CONFIG_MLX4_CORE is not set
 CONFIG_AX88796=m
@@ -297,13 +316,20 @@ CONFIG_I2C_RCAR=m
 #
 # Pin controllers
 #
+CONFIG_PINMUX=y
+CONFIG_PINCONF=y
+CONFIG_GENERIC_PINCONF=y
+CONFIG_PINCTRL_MVEBU=y
 CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y
+CONFIG_ARCH_REQUIRE_GPIOLIB=y
 CONFIG_OF_GPIO=y
+CONFIG_GPIO_GENERIC=y
 
 #
 # Memory mapped GPIO drivers:
 #
 # CONFIG_GPIO_EM is not set
+CONFIG_GPIO_MVEBU=y
 # CONFIG_GPIO_RCAR is not set
 # CONFIG_GPIO_GRGPIO is not set
 
@@ -321,7 +347,9 @@ CONFIG_GPIO_BCM_KONA=y
 # 1-wire Slaves
 #
 # CONFIG_APM_POWER is not set
+# CONFIG_CHARGER_MANAGER is not set
 CONFIG_POWER_RESET_GPIO=y
+CONFIG_POWER_RESET_QNAP=y
 CONFIG_POWER_RESET_RESTART=y
 CONFIG_POWER_RESET_VEXPRESS=y
 
@@ -341,10 +369,23 @@ CONFIG_SENSORS_VEXPRESS=m
 #
 # CONFIG_MFD_ASIC3 is not set
 # CONFIG_HTC_EGPIO is not set
+
+#
+# STMicroelectronics STMPE Interface Drivers
+#
 # CONFIG_MFD_T7L66XB is not set
 # CONFIG_MFD_TC6387XB is not set
 # CONFIG_MFD_TC6393XB is not set
 CONFIG_VEXPRESS_CONFIG=y
+CONFIG_REGULATOR=y
+# CONFIG_REGULATOR_DEBUG is not set
+CONFIG_REGULATOR_FIXED_VOLTAGE=y
+# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
+# CONFIG_REGULATOR_USERSPACE_CONSUMER is not set
+CONFIG_REGULATOR_DA9210=m
+CONFIG_REGULATOR_LP8755=m
+CONFIG_REGULATOR_PFUZE100=m
+CONFIG_REGULATOR_VEXPRESS=m
 
 #
 # Media digital TV PCI Adapters
@@ -404,12 +445,18 @@ CONFIG_USB_ULPI=y
 #
 # MMC/SD/SDIO Host Controller Drivers
 #
+CONFIG_MMC_MVSDIO=m
 CONFIG_MMC_DW=m
 # CONFIG_MMC_DW_IDMAC is not set
 CONFIG_MMC_DW_PLTFM=m
 CONFIG_MMC_DW_EXYNOS=m
 CONFIG_MMC_DW_PCI=m
 
+#
+# LED drivers
+#
+CONFIG_LEDS_REGULATOR=m
+
 #
 # iptables trigger is under Netfilter config (LED target)
 #
@@ -418,14 +465,22 @@ CONFIG_MMC_DW_PCI=m
 #
 # on-CPU RTC drivers
 #
+CONFIG_RTC_DRV_MV=m
 CONFIG_RTC_DRV_SNVS=m
 
 #
 # DMA Devices
 #
+CONFIG_ASYNC_TX_ENABLE_CHANNEL_SWITCH=y
 # CONFIG_DW_DMAC is not set
+CONFIG_MV_XOR=y
 CONFIG_DMA_OF=y
 
+#
+# Common Clock Framework
+#
+CONFIG_MVEBU_CLK_COMMON=y
+
 #
 # Hardware Spinlock drivers
 #
@@ -434,6 +489,11 @@ CONFIG_CLKSRC_MMIO=y
 CONFIG_OF_IOMMU=y
 # CONFIG_SHMOBILE_IOMMU is not set
 
+#
+# Rpmsg drivers
+#
+CONFIG_MVEBU_DEVBUS=y
+
 #
 # Analog to digital converters
 #
@@ -466,6 +526,7 @@ CONFIG_ARM_UNWIND=y
 CONFIG_OLD_MCOUNT=y
 # CONFIG_DEBUG_USER is not set
 # CONFIG_DEBUG_LL is not set
+# CONFIG_DEBUG_UART_PL01X is not set
 
 #
 # Executable Protections
@@ -501,6 +562,7 @@ CONFIG_CRYPTO_AES_ARM=m
 #
 # Random Number Generation
 #
+CONFIG_CRYPTO_DEV_MV_CESA=m
 CONFIG_CRYPTO_DEV_HIFN_795X=m
 CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
 
@@ -509,3 +571,4 @@ CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
 #
 CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
 CONFIG_AUDIT_GENERIC=y
+CONFIG_GENERIC_ATOMIC64=y
similarity index 83%
rename from kernel/config-armv5tel-kirkwood
rename to kernel/config-armv5tel-default
index b05506fa7c2af1f9a005859091a297af00acc8e3..e14fa04b05c737bfa04ea6e0ed9e90492b778d6a 100644 (file)
@@ -1,15 +1,9 @@
-CONFIG_ARCH_HAS_CPUFREQ=y
 
 #
 # General setup
 #
 CONFIG_BROKEN_ON_SMP=y
 
-#
-# IRQ subsystem
-#
-CONFIG_GENERIC_IRQ_CHIP=y
-
 #
 # Timers subsystem
 #
@@ -32,7 +26,6 @@ CONFIG_TINY_RCU=y
 # System Type
 #
 # CONFIG_ARCH_MULTIPLATFORM is not set
-# CONFIG_ARCH_VERSATILE is not set
 CONFIG_ARCH_KIRKWOOD=y
 
 #
@@ -57,7 +50,6 @@ CONFIG_MACH_TS41X=y
 #
 CONFIG_ARCH_KIRKWOOD_DT=y
 CONFIG_MACH_MV88F6281GTW_GE_DT=y
-CONFIG_PLAT_ORION=y
 CONFIG_PLAT_ORION_LEGACY=y
 
 #
@@ -76,10 +68,7 @@ CONFIG_CPU_USE_DOMAINS=y
 #
 # Processor Features
 #
-# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
 CONFIG_NEED_KUSER_HELPERS=y
-CONFIG_KUSER_HELPERS=y
-CONFIG_OUTER_CACHE=y
 CONFIG_CACHE_FEROCEON_L2=y
 # CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH is not set
 # CONFIG_CACHE_L2X0 is not set
@@ -88,7 +77,6 @@ CONFIG_ARM_L1_CACHE_SHIFT=5
 #
 # PCI host controller drivers
 #
-CONFIG_PCI_MVEBU=y
 CONFIG_PCCARD=m
 # CONFIG_PCMCIA is not set
 CONFIG_CARDBUS=y
@@ -108,8 +96,6 @@ CONFIG_YENTA_TOSHIBA=y
 #
 CONFIG_ARCH_NR_GPIO=0
 CONFIG_SPLIT_PTLOCK_CPUS=999999
-# CONFIG_PHYS_ADDR_T_64BIT is not set
-CONFIG_ZONE_DMA_FLAG=0
 CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
 CONFIG_NEED_PER_CPU_KM=y
 CONFIG_FORCE_MAX_ZONEORDER=11
@@ -166,7 +152,6 @@ CONFIG_REGMAP_I2C=m
 #
 # Bus devices
 #
-CONFIG_MVEBU_MBUS=y
 # CONFIG_MTD is not set
 
 #
@@ -208,7 +193,6 @@ CONFIG_SCSI_IMM=m
 #
 CONFIG_VORTEX=m
 CONFIG_PCMCIA_XIRCOM=m
-CONFIG_MV643XX_ETH=m
 
 #
 # MII PHY device drivers
@@ -263,41 +247,22 @@ CONFIG_I2C_PARPORT=m
 #
 # CONFIG_PPS_CLIENT_PARPORT is not set
 
-#
-# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
-#
-CONFIG_PINCTRL=y
-
 #
 # Pin controllers
 #
-CONFIG_PINMUX=y
-CONFIG_PINCONF=y
-CONFIG_GENERIC_PINCONF=y
-# CONFIG_DEBUG_PINCTRL is not set
 CONFIG_PINCTRL_SINGLE=m
-CONFIG_PINCTRL_MVEBU=y
 CONFIG_PINCTRL_KIRKWOOD=y
-CONFIG_ARCH_REQUIRE_GPIOLIB=y
-CONFIG_GPIO_GENERIC=y
 
 #
 # Memory mapped GPIO drivers:
 #
 CONFIG_GPIO_GENERIC_PLATFORM=y
-CONFIG_GPIO_MVEBU=y
 
 #
 # SPI GPIO expanders:
 #
 CONFIG_GPIO_MCP23S08=m
 
-#
-# 1-wire Slaves
-#
-# CONFIG_CHARGER_MANAGER is not set
-CONFIG_POWER_RESET_QNAP=y
-
 #
 # Native drivers
 #
@@ -316,31 +281,22 @@ CONFIG_MFD_CORE=m
 # CONFIG_ABX500_CORE is not set
 # CONFIG_MFD_SYSCON is not set
 # CONFIG_MFD_TPS65912 is not set
-CONFIG_REGULATOR=y
-# CONFIG_REGULATOR_DEBUG is not set
-CONFIG_REGULATOR_FIXED_VOLTAGE=y
-# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
-# CONFIG_REGULATOR_USERSPACE_CONSUMER is not set
 # CONFIG_REGULATOR_AD5398 is not set
-CONFIG_REGULATOR_DA9210=m
 # CONFIG_REGULATOR_FAN53555 is not set
 # CONFIG_REGULATOR_GPIO is not set
 # CONFIG_REGULATOR_ISL6271A is not set
 # CONFIG_REGULATOR_LP3971 is not set
 # CONFIG_REGULATOR_LP3972 is not set
 CONFIG_REGULATOR_LP872X=m
-CONFIG_REGULATOR_LP8755=m
 # CONFIG_REGULATOR_MAX1586 is not set
 # CONFIG_REGULATOR_MAX8649 is not set
 # CONFIG_REGULATOR_MAX8660 is not set
 # CONFIG_REGULATOR_MAX8952 is not set
 # CONFIG_REGULATOR_MAX8973 is not set
-CONFIG_REGULATOR_PFUZE100=m
 # CONFIG_REGULATOR_TPS51632 is not set
 # CONFIG_REGULATOR_TPS62360 is not set
 # CONFIG_REGULATOR_TPS65023 is not set
 # CONFIG_REGULATOR_TPS6507X is not set
-CONFIG_REGULATOR_VEXPRESS=m
 
 #
 # Multimedia core support
@@ -433,14 +389,12 @@ CONFIG_MMC_BLOCK=m
 # MMC/SD/SDIO Host Controller Drivers
 #
 CONFIG_MMC_SDHCI=m
-CONFIG_MMC_MVSDIO=m
 
 #
 # LED drivers
 #
 # CONFIG_LEDS_GPIO is not set
 CONFIG_LEDS_PWM=m
-CONFIG_LEDS_REGULATOR=m
 CONFIG_LEDS_NS2=m
 CONFIG_LEDS_NETXBIG=m
 
@@ -449,38 +403,14 @@ CONFIG_LEDS_NETXBIG=m
 #
 CONFIG_LEDS_TRIGGER_HEARTBEAT=m
 
-#
-# on-CPU RTC drivers
-#
-CONFIG_RTC_DRV_MV=m
-
-#
-# DMA Devices
-#
-CONFIG_ASYNC_TX_ENABLE_CHANNEL_SWITCH=y
-CONFIG_MV_XOR=y
-
-#
-# DMA Clients
-#
-CONFIG_DMA_ENGINE_RAID=y
-
 #
 # Microsoft Hyper-V guest support
 #
 # CONFIG_PANEL is not set
 
-#
-# Android
-#
-CONFIG_COMMON_CLK=y
-
 #
 # Common Clock Framework
 #
-# CONFIG_COMMON_CLK_DEBUG is not set
-CONFIG_COMMON_CLK_SI5351=m
-CONFIG_MVEBU_CLK_COMMON=y
 CONFIG_KIRKWOOD_CLK=y
 
 #
@@ -488,11 +418,6 @@ CONFIG_KIRKWOOD_CLK=y
 #
 CONFIG_ORION_TIMER=y
 
-#
-# Rpmsg drivers
-#
-CONFIG_MVEBU_DEVBUS=y
-
 #
 # Temperature sensors
 #
@@ -513,7 +438,6 @@ CONFIG_ORION_IRQCHIP=y
 # Runtime Testing
 #
 CONFIG_DEBUG_LL_INCLUDE="debug/8250.S"
-# CONFIG_DEBUG_UART_PL01X is not set
 CONFIG_DEBUG_UART_8250=y
 CONFIG_DEBUG_UART_PHYS=0xf1012000
 CONFIG_DEBUG_UART_VIRT=0xfed12000
@@ -522,15 +446,8 @@ CONFIG_DEBUG_UART_8250_SHIFT=2
 # CONFIG_DEBUG_UART_8250_FLOW_CONTROL is not set
 CONFIG_UNCOMPRESS_INCLUDE="mach/uncompress.h"
 
-#
-# Random Number Generation
-#
-CONFIG_CRYPTO_DEV_MV_CESA=m
-
 #
 # Library routines
 #
-CONFIG_RATIONAL=y
 CONFIG_HAS_IOPORT=y
-CONFIG_GENERIC_ATOMIC64=y
 # CONFIG_DDR is not set
index 1ab74929e8f2e7599cfcd6fd37cce27d688e1215..73dd9ec887c644e9f32aec4bffd30a6fa8124482 100644 (file)
@@ -1,7 +1,15 @@
+CONFIG_MIGHT_HAVE_PCI=y
 CONFIG_NO_IOPORT=y
-CONFIG_ZONE_DMA=y
+CONFIG_ARCH_HAS_BANDGAP=y
 CONFIG_FIQ=y
 
+#
+# IRQ subsystem
+#
+CONFIG_SPARSE_IRQ=y
+CONFIG_ARCH_HAS_TICK_BROADCAST=y
+CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
+
 #
 # Timers subsystem
 #
@@ -19,22 +27,42 @@ CONFIG_VIRT_CPU_ACCOUNTING_GEN=y
 #
 # RCU Subsystem
 #
+CONFIG_TREE_RCU=y
+CONFIG_RCU_STALL_COMMON=y
 CONFIG_CONTEXT_TRACKING=y
 CONFIG_RCU_USER_QS=y
 CONFIG_CONTEXT_TRACKING_FORCE=y
+CONFIG_RCU_FANOUT=32
+CONFIG_RCU_FANOUT_LEAF=16
+# CONFIG_RCU_FANOUT_EXACT is not set
 CONFIG_RCU_FAST_NO_HZ=y
 CONFIG_RCU_NOCB_CPU=y
 CONFIG_RCU_NOCB_CPU_ALL=y
 
+#
+# Kernel Performance Events And Counters
+#
+CONFIG_SLUB_CPU_PARTIAL=y
+
 #
 # IO Schedulers
 #
 CONFIG_PADATA=y
+CONFIG_MUTEX_SPIN_ON_OWNER=y
+
+#
+# System Type
+#
+CONFIG_ARCH_MULTIPLATFORM=y
+# CONFIG_ARCH_KIRKWOOD is not set
 
 #
 # CPU Core family selection
 #
 CONFIG_ARCH_MULTI_V6=y
+CONFIG_ARCH_MULTI_V7=y
+CONFIG_ARCH_MULTI_V6_V7=y
+# CONFIG_ARCH_MULTI_CPU_AUTO is not set
 CONFIG_ARCH_MVEBU=y
 
 #
@@ -50,12 +78,7 @@ CONFIG_ARCH_BCM=y
 #
 # CONFIG_ARCH_BCM_MOBILE is not set
 CONFIG_ARCH_BCM2835=y
-CONFIG_ARCH_CNS3XXX=y
-
-#
-# CNS3XXX platform type
-#
-CONFIG_MACH_CNS3420VB=y
+# CONFIG_ARCH_CNS3XXX is not set
 CONFIG_ARCH_HIGHBANK=y
 CONFIG_ARCH_KEYSTONE=y
 CONFIG_ARCH_MXC=y
@@ -142,17 +165,29 @@ CONFIG_IMX_HAVE_PLATFORM_SPI_IMX=y
 CONFIG_POWER_AVS_OMAP=y
 CONFIG_POWER_AVS_OMAP_CLASS3=y
 CONFIG_OMAP_RESET_CLOCKS=y
+CONFIG_OMAP_MUX=y
+# CONFIG_OMAP_MUX_DEBUG is not set
+CONFIG_OMAP_MUX_WARNINGS=y
+CONFIG_OMAP_32K_TIMER=y
 # CONFIG_OMAP3_L2_AUX_SECURE_SAVE_RESTORE is not set
+CONFIG_OMAP_DM_TIMER=y
+CONFIG_OMAP_PM_NOOP=y
+CONFIG_MACH_OMAP_GENERIC=y
+CONFIG_ARCH_OMAP=y
 # CONFIG_ARCH_OMAP2 is not set
 CONFIG_ARCH_OMAP3=y
 CONFIG_ARCH_OMAP4=y
+CONFIG_SOC_OMAP5=y
 CONFIG_SOC_AM33XX=y
 CONFIG_SOC_AM43XX=y
+CONFIG_ARCH_OMAP2PLUS=y
 
 #
 # TI OMAP2/3/4 Specific Features
 #
+CONFIG_ARCH_OMAP2PLUS_TYPICAL=y
 CONFIG_SOC_HAS_OMAP2_SDRC=y
+CONFIG_SOC_HAS_REALTIME_COUNTER=y
 CONFIG_SOC_DRA7XX=y
 CONFIG_SOC_OMAP3430=y
 CONFIG_SOC_TI81XX=y
@@ -217,6 +252,7 @@ CONFIG_ARCH_ATLAS6=y
 CONFIG_ARCH_PRIMA2=y
 CONFIG_ARCH_MARCO=y
 CONFIG_SIRF_IRQ=y
+CONFIG_ARCH_TEGRA=y
 
 #
 # NVIDIA Tegra options
@@ -225,6 +261,8 @@ CONFIG_ARCH_TEGRA_2x_SOC=y
 CONFIG_ARCH_TEGRA_3x_SOC=y
 CONFIG_ARCH_TEGRA_114_SOC=y
 CONFIG_ARCH_TEGRA_124_SOC=y
+CONFIG_TEGRA_AHB=y
+# CONFIG_TEGRA_EMC_SCALING_ENABLE is not set
 CONFIG_ARCH_U8500=y
 CONFIG_UX500_SOC_DB8500=y
 
@@ -252,7 +290,6 @@ CONFIG_ARCH_VT8500=y
 CONFIG_ARCH_WM8750=y
 CONFIG_ARCH_WM8850=y
 CONFIG_ARCH_ZYNQ=y
-CONFIG_PLAT_ORION=y
 CONFIG_PLAT_VERSATILE=y
 CONFIG_ARM_TIMER_SP804=y
 
@@ -262,22 +299,37 @@ CONFIG_ARM_TIMER_SP804=y
 CONFIG_CPU_PJ4B=y
 CONFIG_CPU_V6=y
 CONFIG_CPU_V6K=y
+CONFIG_CPU_V7=y
 CONFIG_CPU_32v6=y
+CONFIG_CPU_32v6K=y
+CONFIG_CPU_32v7=y
 CONFIG_CPU_ABRT_EV6=y
+CONFIG_CPU_ABRT_EV7=y
 CONFIG_CPU_PABRT_V6=y
+CONFIG_CPU_PABRT_V7=y
 CONFIG_CPU_CACHE_V6=y
+CONFIG_CPU_CACHE_V7=y
+CONFIG_CPU_CACHE_VIPT=y
+CONFIG_CPU_COPY_V6=y
 CONFIG_CPU_TLB_V6=y
+CONFIG_CPU_TLB_V7=y
+CONFIG_CPU_HAS_ASID=y
 
 #
 # Processor Features
 #
-# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
+# CONFIG_ARM_THUMBEE is not set
+CONFIG_ARM_VIRT_EXT=y
+CONFIG_SWP_EMULATE=y
 # CONFIG_CPU_BIG_ENDIAN is not set
-CONFIG_KUSER_HELPERS=y
+# CONFIG_CPU_BPREDICT_DISABLE is not set
 CONFIG_DMA_CACHE_RWFO=y
-CONFIG_OUTER_CACHE=y
 CONFIG_OUTER_CACHE_SYNC=y
+CONFIG_MIGHT_HAVE_CACHE_L2X0=y
 CONFIG_CACHE_L2X0=y
+CONFIG_ARM_L1_CACHE_SHIFT_6=y
+CONFIG_ARM_L1_CACHE_SHIFT=6
+CONFIG_ARM_DMA_MEM_BUFFERABLE=y
 CONFIG_ARCH_SUPPORTS_BIG_ENDIAN=y
 CONFIG_PJ4B_ERRATA_4742=y
 # CONFIG_ARM_ERRATA_326103 is not set
@@ -293,7 +345,10 @@ CONFIG_ARM_ERRATA_364296=y
 CONFIG_ARM_ERRATA_764369=y
 CONFIG_PL310_ERRATA_769419=y
 CONFIG_ARM_ERRATA_775420=y
+CONFIG_ARM_ERRATA_798181=y
+# CONFIG_ARM_ERRATA_773022 is not set
 CONFIG_ICST=y
+CONFIG_TI_PRIV_EDMA=y
 
 #
 # Bus support
@@ -304,7 +359,6 @@ CONFIG_PCI_DOMAINS=y
 #
 # PCI host controller drivers
 #
-CONFIG_PCI_MVEBU=y
 CONFIG_PCIE_DW=y
 CONFIG_PCI_IMX6=y
 CONFIG_PCI_TEGRA=y
@@ -313,20 +367,33 @@ CONFIG_PCI_TEGRA=y
 #
 # Kernel Features
 #
+CONFIG_SMP=y
+CONFIG_SMP_ON_UP=y
+CONFIG_ARM_CPU_TOPOLOGY=y
 CONFIG_SCHED_MC=y
 CONFIG_SCHED_SMT=y
+# CONFIG_MCPM is not set
+# CONFIG_BIG_LITTLE is not set
 CONFIG_NR_CPUS=8
+CONFIG_HOTPLUG_CPU=y
 CONFIG_ARM_PSCI=y
-# CONFIG_PHYS_ADDR_T_64BIT is not set
-CONFIG_ZONE_DMA_FLAG=1
+CONFIG_ARCH_NR_GPIO=1024
+CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y
+CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
 CONFIG_FORCE_MAX_ZONEORDER=12
 
 #
 # Boot options
 #
+# CONFIG_ARM_ATAG_DTB_COMPAT is not set
 CONFIG_CMDLINE="root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M console=ttySAC1,115200 init=/linuxrc mem=256M"
 
+#
+# CPU Frequency scaling
+#
+# CONFIG_CPU_FREQ is not set
+
 #
 # CPU Idle
 #
@@ -335,18 +402,35 @@ CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED=y
 #
 # At least one emulation must be selected
 #
+CONFIG_VFPv3=y
+CONFIG_NEON=y
 CONFIG_KERNEL_MODE_NEON=y
 
 #
 # Power management options
 #
+CONFIG_PM_SLEEP_SMP=y
 CONFIG_ARCH_HAS_OPP=y
 CONFIG_PM_OPP=y
 
+#
+# Classification
+#
+CONFIG_RPS=y
+CONFIG_RFS_ACCEL=y
+CONFIG_XPS=y
+CONFIG_NET_FLOW_LIMIT=y
+
+#
+# Bluetooth device drivers
+#
+# CONFIG_RFKILL_REGULATOR is not set
+
 #
 # Generic Driver Options
 #
 CONFIG_FIRMWARE_IN_KERNEL=y
+CONFIG_SOC_BUS=y
 CONFIG_REGMAP_I2C=y
 CONFIG_REGMAP_MMIO=y
 
@@ -354,7 +438,6 @@ CONFIG_REGMAP_MMIO=y
 # Bus devices
 #
 CONFIG_IMX_WEIM=y
-CONFIG_MVEBU_MBUS=y
 CONFIG_OMAP_OCP2SCP=m
 CONFIG_OMAP_INTERCONNECT=y
 CONFIG_MTD=y
@@ -494,7 +577,6 @@ CONFIG_NET_VENDOR_ALLWINNER=y
 CONFIG_SUN4I_EMAC=m
 CONFIG_NET_VENDOR_FREESCALE=y
 CONFIG_FEC=m
-CONFIG_MV643XX_ETH=m
 CONFIG_MVNETA=m
 CONFIG_SFC_MTD=y
 # CONFIG_TI_DAVINCI_EMAC is not set
@@ -571,6 +653,7 @@ CONFIG_HW_RANDOM_BCM2835=y
 CONFIG_HW_RANDOM_OMAP=m
 CONFIG_HW_RANDOM_OMAP3_ROM=m
 CONFIG_HW_RANDOM_MXC_RNGA=m
+CONFIG_I2C=y
 CONFIG_I2C_ALGOBIT=y
 
 #
@@ -581,6 +664,7 @@ CONFIG_I2C_DAVINCI=m
 CONFIG_I2C_IMX=y
 CONFIG_I2C_MV64XXX=y
 CONFIG_I2C_NOMADIK=y
+CONFIG_I2C_OMAP=y
 CONFIG_I2C_SIRF=y
 CONFIG_I2C_ST=m
 CONFIG_I2C_TEGRA=y
@@ -590,9 +674,6 @@ CONFIG_I2C_WMT=y
 #
 # Pin controllers
 #
-CONFIG_PINMUX=y
-CONFIG_PINCONF=y
-CONFIG_GENERIC_PINCONF=y
 CONFIG_PINCTRL_ABX500=y
 CONFIG_PINCTRL_AB8500=y
 CONFIG_PINCTRL_AB8540=y
@@ -611,6 +692,7 @@ CONFIG_PINCTRL_NOMADIK=y
 CONFIG_PINCTRL_DB8500=y
 CONFIG_PINCTRL_DB8540=y
 CONFIG_PINCTRL_ROCKCHIP=y
+# CONFIG_PINCTRL_SINGLE is not set
 CONFIG_PINCTRL_SIRF=y
 CONFIG_PINCTRL_SUNXI=y
 CONFIG_PINCTRL_ST=y
@@ -619,21 +701,19 @@ CONFIG_PINCTRL_TEGRA20=y
 CONFIG_PINCTRL_TEGRA30=y
 CONFIG_PINCTRL_TEGRA114=y
 # CONFIG_PINCTRL_PALMAS is not set
-CONFIG_PINCTRL_MVEBU=y
 CONFIG_PINCTRL_ARMADA_370=y
 CONFIG_PINCTRL_ARMADA_XP=y
 CONFIG_PINCTRL_WMT=y
 CONFIG_PINCTRL_WM8750=y
 CONFIG_PINCTRL_WM8850=y
 CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
-CONFIG_GPIO_GENERIC=y
 # CONFIG_GPIO_DA9052 is not set
 # CONFIG_GPIO_DA9055 is not set
 
 #
 # Memory mapped GPIO drivers:
 #
-CONFIG_GPIO_MVEBU=y
+# CONFIG_GPIO_GENERIC_PLATFORM is not set
 CONFIG_GPIO_MXC=y
 CONFIG_GPIO_PL061=y
 # CONFIG_GPIO_XILINX is not set
@@ -643,6 +723,7 @@ CONFIG_GPIO_PL061=y
 #
 CONFIG_GPIO_MC9S08DZ60=y
 # CONFIG_GPIO_RC5T583 is not set
+# CONFIG_GPIO_SX150X is not set
 # CONFIG_GPIO_STMPE is not set
 # CONFIG_GPIO_TC3589X is not set
 # CONFIG_GPIO_TPS65912 is not set
@@ -653,6 +734,11 @@ CONFIG_GPIO_TWL6040=m
 # CONFIG_GPIO_WM8994 is not set
 # CONFIG_GPIO_ADP5520 is not set
 
+#
+# SPI GPIO expanders:
+#
+# CONFIG_GPIO_MCP23S08 is not set
+
 #
 # MODULbus GPIO expanders:
 #
@@ -664,6 +750,7 @@ CONFIG_GPIO_TWL6040=m
 # 1-wire Bus Masters
 #
 CONFIG_W1_MASTER_MXC=m
+# CONFIG_HDQ_MASTER_OMAP is not set
 
 #
 # 1-wire Slaves
@@ -682,7 +769,6 @@ CONFIG_W1_MASTER_MXC=m
 # CONFIG_CHARGER_MAX8998 is not set
 # CONFIG_CHARGER_TPS65090 is not set
 # CONFIG_AB8500_BM is not set
-CONFIG_POWER_RESET_QNAP=y
 
 #
 # Native drivers
@@ -760,6 +846,7 @@ CONFIG_MFD_STMPE=y
 CONFIG_STMPE_I2C=y
 CONFIG_MFD_SYSCON=y
 CONFIG_MFD_LP8788=y
+CONFIG_MFD_OMAP_USB_HOST=y
 CONFIG_MFD_PALMAS=y
 CONFIG_MFD_TPS65090=y
 CONFIG_MFD_TPS6586X=y
@@ -779,7 +866,6 @@ CONFIG_MFD_WM831X_I2C=y
 CONFIG_MFD_WM8350=y
 CONFIG_MFD_WM8350_I2C=y
 CONFIG_MFD_WM8994=y
-CONFIG_REGULATOR_FIXED_VOLTAGE=y
 CONFIG_REGULATOR_88PM800=m
 CONFIG_REGULATOR_88PM8607=y
 CONFIG_REGULATOR_AD5398=m
@@ -793,7 +879,6 @@ CONFIG_REGULATOR_DA903X=m
 CONFIG_REGULATOR_DA9052=m
 CONFIG_REGULATOR_DA9055=m
 CONFIG_REGULATOR_DA9063=m
-CONFIG_REGULATOR_DA9210=m
 CONFIG_REGULATOR_DBX500_PRCMU=y
 CONFIG_REGULATOR_DB8500_PRCMU=y
 CONFIG_REGULATOR_FAN53555=m
@@ -802,7 +887,6 @@ CONFIG_REGULATOR_ISL6271A=m
 CONFIG_REGULATOR_LP3971=m
 CONFIG_REGULATOR_LP3972=m
 CONFIG_REGULATOR_LP872X=y
-CONFIG_REGULATOR_LP8755=m
 CONFIG_REGULATOR_LP8788=y
 CONFIG_REGULATOR_MAX1586=m
 CONFIG_REGULATOR_MAX8649=m
@@ -816,7 +900,6 @@ CONFIG_REGULATOR_MAX8998=m
 CONFIG_REGULATOR_MAX77686=m
 CONFIG_REGULATOR_MAX77693=m
 CONFIG_REGULATOR_PALMAS=m
-CONFIG_REGULATOR_PFUZE100=m
 CONFIG_REGULATOR_RC5T583=m
 CONFIG_REGULATOR_S2MPS11=m
 CONFIG_REGULATOR_S5M8767=m
@@ -831,12 +914,16 @@ CONFIG_REGULATOR_TPS65910=m
 CONFIG_REGULATOR_TPS65912=m
 CONFIG_REGULATOR_TPS80031=m
 CONFIG_REGULATOR_TWL4030=y
-CONFIG_REGULATOR_VEXPRESS=m
 CONFIG_REGULATOR_WM831X=m
 CONFIG_REGULATOR_WM8350=m
 CONFIG_REGULATOR_WM8400=m
 CONFIG_REGULATOR_WM8994=m
 
+#
+# Multimedia core support
+#
+CONFIG_VIDEO_V4L2=y
+
 #
 # Media drivers
 #
@@ -853,6 +940,26 @@ CONFIG_VIDEO_CODA=m
 CONFIG_VIDEO_TI_VPE=m
 # CONFIG_VIDEO_TI_VPE_DEBUG is not set
 
+#
+# Media ancillary drivers (tuners, sensors, i2c, frontends)
+#
+CONFIG_VIDEO_IR_I2C=y
+
+#
+# soc_camera sensor drivers
+#
+CONFIG_MEDIA_TUNER=y
+CONFIG_MEDIA_TUNER_SIMPLE=y
+CONFIG_MEDIA_TUNER_TDA8290=y
+CONFIG_MEDIA_TUNER_TDA827X=y
+CONFIG_MEDIA_TUNER_TDA18271=y
+CONFIG_MEDIA_TUNER_TDA9887=y
+CONFIG_MEDIA_TUNER_MT20XX=y
+CONFIG_MEDIA_TUNER_XC2028=y
+CONFIG_MEDIA_TUNER_XC5000=y
+CONFIG_MEDIA_TUNER_XC4000=y
+CONFIG_MEDIA_TUNER_MC44S803=y
+
 #
 # Graphics support
 #
@@ -991,10 +1098,16 @@ CONFIG_SND_SOC_WM8962=m
 CONFIG_SND_SOC_WM9712=m
 CONFIG_SND_SOC_TPA6130A2=m
 
+#
+# I2C HID support
+#
+CONFIG_USB_ARCH_HAS_EHCI=y
+
 #
 # USB Host Controller Drivers
 #
 CONFIG_USB_EHCI_MXC=m
+CONFIG_USB_EHCI_HCD_OMAP=y
 CONFIG_USB_EHCI_HCD_ORION=m
 CONFIG_USB_EHCI_TEGRA=y
 # CONFIG_USB_CNS3XXX_EHCI is not set
@@ -1008,12 +1121,14 @@ CONFIG_USB_IMX21_HCD=m
 # USB Physical Layer drivers
 #
 CONFIG_AB8500_USB=m
+CONFIG_NOP_USB_XCEIV=y
 CONFIG_OMAP_CONTROL_USB=m
 CONFIG_OMAP_USB3=m
 CONFIG_SAMSUNG_USBPHY=y
 CONFIG_SAMSUNG_USB2PHY=y
 CONFIG_SAMSUNG_USB3PHY=y
 CONFIG_USB_MXS_PHY=m
+CONFIG_USB_ULPI_VIEWPORT=y
 CONFIG_MMC=y
 
 #
@@ -1036,7 +1151,6 @@ CONFIG_MMC_SDHCI_BCM2835=m
 CONFIG_MMC_OMAP=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_MMC_MXC=m
-CONFIG_MMC_MVSDIO=m
 # CONFIG_MMC_DW_SOCFPGA is not set
 CONFIG_MMC_WMT=m
 
@@ -1055,7 +1169,6 @@ CONFIG_LEDS_GPIO=y
 # CONFIG_LEDS_WM8350 is not set
 # CONFIG_LEDS_DA903X is not set
 # CONFIG_LEDS_DA9052 is not set
-CONFIG_LEDS_REGULATOR=m
 # CONFIG_LEDS_ADP5520 is not set
 # CONFIG_LEDS_MAX8997 is not set
 
@@ -1102,7 +1215,6 @@ CONFIG_RTC_DRV_OMAP=m
 CONFIG_RTC_DRV_PL030=m
 CONFIG_RTC_DRV_PL031=m
 CONFIG_RTC_DRV_VT8500=m
-CONFIG_RTC_DRV_MV=m
 CONFIG_RTC_DRV_TEGRA=m
 CONFIG_RTC_DRV_MXC=m
 CONFIG_RTC_DRV_SIRFSOC=m
@@ -1110,9 +1222,7 @@ CONFIG_RTC_DRV_SIRFSOC=m
 #
 # DMA Devices
 #
-CONFIG_ASYNC_TX_ENABLE_CHANNEL_SWITCH=y
 # CONFIG_AMBA_PL08X is not set
-CONFIG_MV_XOR=y
 CONFIG_MX3_IPU=y
 CONFIG_MX3_IPU_IRQS=4
 CONFIG_TEGRA20_APB_DMA=y
@@ -1128,9 +1238,14 @@ CONFIG_TI_CPPI41=m
 CONFIG_DMA_VIRTUAL_CHANNELS=y
 
 #
-# DMA Clients
+# Speakup console speech
+#
+# CONFIG_MFD_NVEC is not set
+
+#
+# Android
 #
-CONFIG_DMA_ENGINE_RAID=y
+# CONFIG_DRM_IMX is not set
 
 #
 # Common Clock Framework
@@ -1138,12 +1253,10 @@ CONFIG_DMA_ENGINE_RAID=y
 # CONFIG_COMMON_CLK_WM831X is not set
 CONFIG_COMMON_CLK_VERSATILE=y
 # CONFIG_COMMON_CLK_MAX77686 is not set
-CONFIG_COMMON_CLK_SI5351=m
 CONFIG_COMMON_CLK_S2MPS11=m
 CONFIG_CLK_TWL6040=m
 CONFIG_COMMON_CLK_AXI_CLKGEN=m
 CONFIG_COMMON_CLK_KEYSTONE=y
-CONFIG_MVEBU_CLK_COMMON=y
 CONFIG_MVEBU_CLK_CPU=y
 CONFIG_ARMADA_370_CLK=y
 CONFIG_ARMADA_XP_CLK=y
@@ -1163,6 +1276,8 @@ CONFIG_CADENCE_TTC_TIMER=y
 CONFIG_CLKSRC_NOMADIK_MTU=y
 CONFIG_CLKSRC_DBX500_PRCMU=y
 CONFIG_CLKSRC_DBX500_PRCMU_SCHED_CLOCK=y
+CONFIG_ARM_ARCH_TIMER=y
+CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y
 CONFIG_ARM_GLOBAL_TIMER=y
 CONFIG_CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK=y
 CONFIG_VF_PIT_TIMER=y
@@ -1170,13 +1285,14 @@ CONFIG_PL320_MBOX=y
 CONFIG_OMAP_MBOX=m
 CONFIG_OMAP2PLUS_MBOX=m
 CONFIG_OMAP_MBOX_KFIFO_SIZE=256
+# CONFIG_OMAP_IOMMU is not set
 # CONFIG_TEGRA_IOMMU_GART is not set
+# CONFIG_TEGRA_IOMMU_SMMU is not set
 
 #
 # Rpmsg drivers
 #
 CONFIG_TI_EMIF=m
-CONFIG_MVEBU_DEVBUS=y
 CONFIG_TEGRA20_MC=y
 CONFIG_TEGRA30_MC=y
 
@@ -1190,6 +1306,7 @@ CONFIG_TEGRA30_MC=y
 # Temperature sensors
 #
 # CONFIG_PWM is not set
+CONFIG_ARM_GIC=y
 CONFIG_ARM_VIC=y
 CONFIG_ARM_VIC_NR=2
 CONFIG_ARCH_HAS_RESET_CONTROLLER=y
@@ -1199,21 +1316,36 @@ CONFIG_ARCH_HAS_RESET_CONTROLLER=y
 #
 CONFIG_OMAP_USB2=m
 
+#
+# File systems
+#
+CONFIG_DCACHE_WORD_ACCESS=y
+
 #
 # Pseudo filesystems
 #
 # CONFIG_JFFS2_FS is not set
 
+#
+# Memory Debugging
+#
+# CONFIG_DEBUG_PER_CPU_MAPS is not set
+
 #
 # RCU Debugging
 #
 CONFIG_RCU_CPU_STALL_TIMEOUT=60
+# CONFIG_RCU_CPU_STALL_INFO is not set
 
 #
 # Runtime Testing
 #
 CONFIG_DEBUG_IMX_UART_PORT=1
+CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S"
+# CONFIG_DEBUG_UART_8250 is not set
+CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h"
 CONFIG_OC_ETM=y
+# CONFIG_PID_IN_CONTEXTIDR is not set
 
 #
 # Non-executable pages
@@ -1256,7 +1388,6 @@ CONFIG_CRYPTO_AES_ARM_BS=m
 #
 # Random Number Generation
 #
-CONFIG_CRYPTO_DEV_MV_CESA=m
 CONFIG_CRYPTO_DEV_OMAP_SHAM=m
 CONFIG_CRYPTO_DEV_OMAP_AES=m
 CONFIG_CRYPTO_DEV_PICOXCELL=m
@@ -1269,8 +1400,7 @@ CONFIG_CRYPTO_DEV_UX500=m
 #
 # Library routines
 #
-CONFIG_RATIONAL=y
 CONFIG_STMP_DEVICE=y
 CONFIG_GENERIC_ALLOCATOR=y
-CONFIG_GENERIC_ATOMIC64=y
+CONFIG_CPU_RMAP=y
 CONFIG_DDR=y
diff --git a/kernel/config-armv7hl-generic b/kernel/config-armv7hl-generic
deleted file mode 100644 (file)
index f3df469..0000000
+++ /dev/null
@@ -1,311 +0,0 @@
-CONFIG_MIGHT_HAVE_PCI=y
-CONFIG_ARCH_HAS_CPUFREQ=y
-CONFIG_ARCH_HAS_BANDGAP=y
-
-#
-# IRQ subsystem
-#
-CONFIG_GENERIC_IRQ_CHIP=y
-CONFIG_SPARSE_IRQ=y
-CONFIG_ARCH_HAS_TICK_BROADCAST=y
-CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
-
-#
-# RCU Subsystem
-#
-CONFIG_TREE_RCU=y
-CONFIG_RCU_STALL_COMMON=y
-CONFIG_RCU_FANOUT=32
-CONFIG_RCU_FANOUT_LEAF=16
-# CONFIG_RCU_FANOUT_EXACT is not set
-
-#
-# Kernel Performance Events And Counters
-#
-CONFIG_SLUB_CPU_PARTIAL=y
-
-#
-# IO Schedulers
-#
-CONFIG_MUTEX_SPIN_ON_OWNER=y
-
-#
-# System Type
-#
-CONFIG_ARCH_MULTIPLATFORM=y
-# CONFIG_ARCH_VERSATILE is not set
-# CONFIG_ARCH_KIRKWOOD is not set
-
-#
-# CPU Core family selection
-#
-CONFIG_ARCH_MULTI_V7=y
-CONFIG_ARCH_MULTI_V6_V7=y
-# CONFIG_ARCH_MULTI_CPU_AUTO is not set
-
-#
-# OMAP Feature Selections
-#
-CONFIG_OMAP_MUX=y
-# CONFIG_OMAP_MUX_DEBUG is not set
-CONFIG_OMAP_MUX_WARNINGS=y
-CONFIG_OMAP_32K_TIMER=y
-CONFIG_OMAP_DM_TIMER=y
-CONFIG_OMAP_PM_NOOP=y
-CONFIG_MACH_OMAP_GENERIC=y
-CONFIG_ARCH_OMAP=y
-CONFIG_SOC_OMAP5=y
-CONFIG_ARCH_OMAP2PLUS=y
-
-#
-# TI OMAP2/3/4 Specific Features
-#
-CONFIG_ARCH_OMAP2PLUS_TYPICAL=y
-CONFIG_SOC_HAS_REALTIME_COUNTER=y
-
-#
-# OMAP Legacy Platform Data Board Type
-#
-CONFIG_ARCH_TEGRA=y
-
-#
-# NVIDIA Tegra options
-#
-CONFIG_TEGRA_AHB=y
-# CONFIG_TEGRA_EMC_SCALING_ENABLE is not set
-
-#
-# Processor Type
-#
-CONFIG_CPU_V7=y
-CONFIG_CPU_32v6K=y
-CONFIG_CPU_32v7=y
-CONFIG_CPU_ABRT_EV7=y
-CONFIG_CPU_PABRT_V7=y
-CONFIG_CPU_CACHE_V7=y
-CONFIG_CPU_CACHE_VIPT=y
-CONFIG_CPU_COPY_V6=y
-CONFIG_CPU_TLB_V7=y
-CONFIG_CPU_HAS_ASID=y
-
-#
-# Processor Features
-#
-# CONFIG_ARM_THUMBEE is not set
-CONFIG_ARM_VIRT_EXT=y
-CONFIG_SWP_EMULATE=y
-# CONFIG_CPU_BPREDICT_DISABLE is not set
-CONFIG_MIGHT_HAVE_CACHE_L2X0=y
-CONFIG_ARM_L1_CACHE_SHIFT_6=y
-CONFIG_ARM_L1_CACHE_SHIFT=6
-CONFIG_ARM_DMA_MEM_BUFFERABLE=y
-CONFIG_ARM_ERRATA_798181=y
-# CONFIG_ARM_ERRATA_773022 is not set
-CONFIG_TI_PRIV_EDMA=y
-
-#
-# Kernel Features
-#
-CONFIG_SMP=y
-CONFIG_SMP_ON_UP=y
-CONFIG_ARM_CPU_TOPOLOGY=y
-# CONFIG_MCPM is not set
-# CONFIG_BIG_LITTLE is not set
-CONFIG_HOTPLUG_CPU=y
-CONFIG_ARCH_NR_GPIO=1024
-CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y
-CONFIG_SPLIT_PTLOCK_CPUS=4
-
-#
-# Boot options
-#
-# CONFIG_ARM_ATAG_DTB_COMPAT is not set
-
-#
-# CPU Frequency scaling
-#
-# CONFIG_CPU_FREQ is not set
-
-#
-# At least one emulation must be selected
-#
-CONFIG_VFPv3=y
-CONFIG_NEON=y
-
-#
-# Power management options
-#
-CONFIG_PM_SLEEP_SMP=y
-
-#
-# Classification
-#
-CONFIG_RPS=y
-CONFIG_RFS_ACCEL=y
-CONFIG_XPS=y
-CONFIG_NET_FLOW_LIMIT=y
-
-#
-# Bluetooth device drivers
-#
-# CONFIG_RFKILL_REGULATOR is not set
-
-#
-# Generic Driver Options
-#
-CONFIG_SOC_BUS=y
-
-#
-# Non-8250 serial port support
-#
-CONFIG_I2C=y
-
-#
-# I2C system bus drivers (mostly embedded / system-on-chip)
-#
-CONFIG_I2C_OMAP=y
-
-#
-# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
-#
-CONFIG_PINCTRL=y
-
-#
-# Pin controllers
-#
-# CONFIG_DEBUG_PINCTRL is not set
-# CONFIG_PINCTRL_SINGLE is not set
-CONFIG_ARCH_REQUIRE_GPIOLIB=y
-
-#
-# Memory mapped GPIO drivers:
-#
-# CONFIG_GPIO_GENERIC_PLATFORM is not set
-
-#
-# I2C GPIO expanders:
-#
-# CONFIG_GPIO_SX150X is not set
-
-#
-# SPI GPIO expanders:
-#
-# CONFIG_GPIO_MCP23S08 is not set
-
-#
-# 1-wire Bus Masters
-#
-# CONFIG_HDQ_MASTER_OMAP is not set
-
-#
-# 1-wire Slaves
-#
-# CONFIG_CHARGER_MANAGER is not set
-
-#
-# Multifunction device drivers
-#
-CONFIG_MFD_OMAP_USB_HOST=y
-CONFIG_REGULATOR=y
-# CONFIG_REGULATOR_DEBUG is not set
-# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
-# CONFIG_REGULATOR_USERSPACE_CONSUMER is not set
-
-#
-# Multimedia core support
-#
-CONFIG_VIDEO_V4L2=y
-
-#
-# Media ancillary drivers (tuners, sensors, i2c, frontends)
-#
-CONFIG_VIDEO_IR_I2C=y
-
-#
-# soc_camera sensor drivers
-#
-CONFIG_MEDIA_TUNER=y
-CONFIG_MEDIA_TUNER_SIMPLE=y
-CONFIG_MEDIA_TUNER_TDA8290=y
-CONFIG_MEDIA_TUNER_TDA827X=y
-CONFIG_MEDIA_TUNER_TDA18271=y
-CONFIG_MEDIA_TUNER_TDA9887=y
-CONFIG_MEDIA_TUNER_MT20XX=y
-CONFIG_MEDIA_TUNER_XC2028=y
-CONFIG_MEDIA_TUNER_XC5000=y
-CONFIG_MEDIA_TUNER_XC4000=y
-CONFIG_MEDIA_TUNER_MC44S803=y
-
-#
-# I2C HID support
-#
-CONFIG_USB_ARCH_HAS_EHCI=y
-
-#
-# USB Host Controller Drivers
-#
-CONFIG_USB_EHCI_HCD_OMAP=y
-
-#
-# USB Physical Layer drivers
-#
-CONFIG_NOP_USB_XCEIV=y
-CONFIG_USB_ULPI_VIEWPORT=y
-
-#
-# Speakup console speech
-#
-# CONFIG_MFD_NVEC is not set
-
-#
-# Android
-#
-# CONFIG_DRM_IMX is not set
-CONFIG_COMMON_CLK=y
-
-#
-# Common Clock Framework
-#
-# CONFIG_COMMON_CLK_DEBUG is not set
-
-#
-# Hardware Spinlock drivers
-#
-CONFIG_ARM_ARCH_TIMER=y
-CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y
-# CONFIG_OMAP_IOMMU is not set
-# CONFIG_TEGRA_IOMMU_SMMU is not set
-
-#
-# Temperature sensors
-#
-CONFIG_ARM_GIC=y
-
-#
-# File systems
-#
-CONFIG_DCACHE_WORD_ACCESS=y
-
-#
-# Memory Debugging
-#
-# CONFIG_DEBUG_PER_CPU_MAPS is not set
-
-#
-# RCU Debugging
-#
-# CONFIG_RCU_CPU_STALL_INFO is not set
-
-#
-# Runtime Testing
-#
-CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S"
-# CONFIG_DEBUG_UART_PL01X is not set
-# CONFIG_DEBUG_UART_8250 is not set
-CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h"
-# CONFIG_PID_IN_CONTEXTIDR is not set
-
-#
-# Library routines
-#
-CONFIG_CPU_RMAP=y
index 8d6b89de104d4e0b861fe884ea308a71a8686130..e1e6180fd273cc47057f3ac6c70a2a67f9a444ac 100644 (file)
@@ -109,7 +109,6 @@ CONFIG_NR_CPUS=4
 # CONFIG_THUMB2_KERNEL is not set
 CONFIG_SYS_SUPPORTS_HUGETLBFS=y
 CONFIG_PHYS_ADDR_T_64BIT=y
-CONFIG_ZONE_DMA_FLAG=0
 CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
 # CONFIG_TRANSPARENT_HUGEPAGE is not set
 CONFIG_FORCE_MAX_ZONEORDER=11
index 933d8ac5b90ae8e9c7ef408528f752176842eb98..4eb1887edb94ad48d064132fb84fe04e7a9145b2 100644 (file)
@@ -241,6 +241,7 @@ CONFIG_FREEZER=y
 #
 # Processor type and features
 #
+CONFIG_ZONE_DMA=y
 CONFIG_SWIOTLB=y
 CONFIG_IOMMU_HELPER=y
 CONFIG_PREEMPT_NONE=y
@@ -253,6 +254,7 @@ CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_BALLOON_COMPACTION=y
 CONFIG_COMPACTION=y
 CONFIG_MIGRATION=y
+CONFIG_ZONE_DMA_FLAG=1
 CONFIG_BOUNCE=y
 CONFIG_KSM=y
 CONFIG_CROSS_MEMORY_ATTACH=y
@@ -2176,10 +2178,12 @@ CONFIG_PTP_1588_CLOCK=m
 #
 # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
+CONFIG_PINCTRL=y
 
 #
 # Pin controllers
 #
+# CONFIG_DEBUG_PINCTRL is not set
 CONFIG_GPIOLIB=y
 CONFIG_GPIO_DEVRES=y
 # CONFIG_DEBUG_GPIO is not set
@@ -3746,6 +3750,7 @@ CONFIG_DMA_ENGINE=y
 #
 CONFIG_ASYNC_TX_DMA=y
 # CONFIG_DMATEST is not set
+CONFIG_DMA_ENGINE_RAID=y
 # CONFIG_AUXDISPLAY is not set
 CONFIG_UIO=m
 # CONFIG_UIO_CIF is not set
@@ -3903,10 +3908,14 @@ CONFIG_USB_BTMTK=m
 # CONFIG_DGNC is not set
 # CONFIG_DGAP is not set
 CONFIG_CLKDEV_LOOKUP=y
+CONFIG_HAVE_CLK_PREPARE=y
+CONFIG_COMMON_CLK=y
 
 #
 # Common Clock Framework
 #
+# CONFIG_COMMON_CLK_DEBUG is not set
+CONFIG_COMMON_CLK_SI5351=m
 
 #
 # Hardware Spinlock drivers
@@ -4730,6 +4739,7 @@ CONFIG_BINARY_PRINTF=y
 #
 CONFIG_RAID6_PQ=m
 CONFIG_BITREVERSE=y
+CONFIG_RATIONAL=y
 CONFIG_GENERIC_STRNCPY_FROM_USER=y
 CONFIG_GENERIC_STRNLEN_USER=y
 CONFIG_GENERIC_NET_UTILS=y
index c6b9e21dc1cdc709f8d53a4ba761feb0444561d2..09b67c3419e975e864597fa365f08687536fb0ad 100644 (file)
@@ -65,7 +65,6 @@ CONFIG_MUTEX_SPIN_ON_OWNER=y
 #
 # Processor type and features
 #
-CONFIG_ZONE_DMA=y
 CONFIG_SMP=y
 CONFIG_X86_MPPARSE=y
 CONFIG_X86_EXTENDED_PLATFORM=y
@@ -133,7 +132,6 @@ CONFIG_ARCH_DISCARD_MEMBLOCK=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
 CONFIG_PHYS_ADDR_T_64BIT=y
-CONFIG_ZONE_DMA_FLAG=1
 CONFIG_VIRT_TO_BUS=y
 CONFIG_MMU_NOTIFIER=y
 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
@@ -537,14 +535,12 @@ CONFIG_I2C_PARPORT=m
 # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
 CONFIG_PTP_1588_CLOCK_PCH=m
-CONFIG_PINCTRL=y
 
 #
 # Pin controllers
 #
 # CONFIG_PINMUX is not set
 # CONFIG_PINCONF is not set
-# CONFIG_DEBUG_PINCTRL is not set
 # CONFIG_PINCTRL_BAYTRAIL is not set
 CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
 CONFIG_GPIO_ACPI=y
@@ -850,7 +846,6 @@ CONFIG_DMA_ACPI=y
 #
 # DMA Clients
 #
-CONFIG_DMA_ENGINE_RAID=y
 CONFIG_DCA=m
 # CONFIG_VFIO is not set
 
@@ -941,13 +936,6 @@ CONFIG_INTEL_SMARTCONNECT=m
 CONFIG_PVPANIC=m
 CONFIG_CHROME_PLATFORMS=y
 CONFIG_CHROMEOS_LAPTOP=m
-CONFIG_COMMON_CLK=y
-
-#
-# Common Clock Framework
-#
-# CONFIG_COMMON_CLK_DEBUG is not set
-CONFIG_COMMON_CLK_SI5351=m
 
 #
 # Hardware Spinlock drivers
@@ -1153,7 +1141,6 @@ CONFIG_KVM_DEVICE_ASSIGNMENT=y
 #
 # Library routines
 #
-CONFIG_RATIONAL=y
 CONFIG_GENERIC_FIND_FIRST_BIT=y
 CONFIG_GENERIC_IOMAP=y
 CONFIG_GENERIC_ALLOCATOR=y
index 1650e89107a0902dc94fea83aca4240b09f20608..72cb8545c28797d2ee1e60dbc3bc590dcf1400fe 100644 (file)
@@ -5,7 +5,7 @@
 
 name       = kernel
 version    = 3.13.2
-release    = 1
+release    = 2
 thisapp    = linux-%{version}
 
 maintainer = Arne Fitzenreiter <arne.fitzenreiter@ipfire.org>
@@ -91,11 +91,8 @@ build
        end
 
        if "%{DISTRO_ARCH}" == "armv5tel"
-               # ERROR Currently all kernel images are disabled, because they
-               # won't build with the grsecurity patch.
-
                # Build a kernel for Marvell Kirkwood-based devices.
-               build_kernel_kirkwood = 1
+               build_kernel_default = 1
 
                kernel_arch = arm
                kernel_target = zImage
@@ -133,11 +130,6 @@ build
                kernels += lpae
        end
 
-       # Build ARM kirkwood kernel.
-       if "%{build_kernel_kirkwood}" == "1"
-               kernels += kirkwood
-       end
-
        perf_make = make %{MAKETUNING} -C tools/perf V=1 WERROR=0 \
                NO_LIBUNWIND=1 HAVE_CPLUS_DEMANGLE=1 NO_GTK2=1 NO_LIBNUMA=1 \
                NO_STRLCPY=1 NO_BIONIC=1 prefix=%{prefix} perfexecdir=lib/perf-core
@@ -584,22 +576,6 @@ packages
                end
        end
 
-       if "%{build_kernel_kirkwood}" == "1"
-               package kernel-kirkwood
-                       template KERNEL
-
-                       kernel_name = kernel-kirkwood
-                       kernel_release = %{fullver}.kirkwood
-               end
-
-               package kernel-kirkwood-devel
-                       template KERNELDEVEL
-
-                       kernel_name = kernel-kirkwood
-                       kernel_release = %{fullver}.kirkwood
-               end
-       end
-
        package kernel-headers
                summary = Header files of the kernel release %{fullver}.
                desciption = %{summary}
index 01d6262646e0f3468e28d7b5d82a6578b607a648..c12f8b1b749cecee900f1fd8b585b4da1efa9171 100755 (executable)
@@ -17,7 +17,7 @@ CONFIGS="${CONFIGS} i686:legacy i686:default"
 CONFIGS="${CONFIGS} armv7hl:lpae armv7hl:default"
 
 # armv5tel
-CONFIGS="${CONFIGS} armv5tel:versatile armv5tel:kirkwood"
+CONFIGS="${CONFIGS} armv5tel:default"
 
 function merge_config() {
        local arch=${1}
@@ -67,18 +67,14 @@ function merge_config() {
                        ;;
 
                # ARM
-               armv5tel:versatile)
-                       configs="${configs} config-arm-generic"
-                       ;;
-               armv5tel:kirkwood)
-                       configs="${configs} config-arm-generic config-armv5tel-kirkwood"
+               armv5tel:default)
+                       configs="${configs} config-arm-generic config-armv5tel-default"
                        ;;
                armv7hl:default)
-                       configs="${configs} config-arm-generic config-armv7hl-generic"
-                       configs="${configs} config-armv7hl-default"
+                       configs="${configs} config-arm-generic config-armv7hl-default"
                        ;;
                armv7hl:lpae)
-                       configs="${configs} config-arm-generic config-armv7hl-generic"
+                       configs="${configs} config-arm-generic config-armv7hl-default"
                        configs="${configs} config-armv7hl-lpae"
                        ;;
                *)
@@ -192,8 +188,11 @@ function diff_configs() {
 
                merge_config ${arch} ${flavour} ${filename} ${extra_configs}
 
-               # Do not include i686 legacy.
+               # Do not include leaf configuration.
                case "${config}" in
+                       armv7hl:lpae)
+                               continue
+                               ;;
                        i686:legacy)
                                continue
                                ;;
@@ -230,14 +229,6 @@ function diff_configs() {
                        ${tmpdir}/config-${arch}-common > ${tmpdir}/config-${arch}-generic
        done
 
-       for arch in armv7hl; do
-               ${SCRIPTS_DIR}/configcommon.py ${subarch_configs[${arch}]} \
-                       > ${tmpdir}/config-${arch}-common
-
-               ${SCRIPTS_DIR}/configdiff.py ${tmpdir}/config-arm-common \
-                       ${tmpdir}/config-${arch}-common > ${tmpdir}/config-${arch}-generic
-       done
-
        for config in ${CONFIGS}; do
                arch=${config%:*}
                flavour=${config#*:}
@@ -253,20 +244,11 @@ function diff_configs() {
                filename=${tmpdir}/config-${arch}-${flavour}
 
                case "${config}" in
-                       i686:legacy)
+                       armv7hl:lpae|i686:legacy)
                                # Legacy depends directly on the default configuration.
-                               ${SCRIPTS_DIR}/configdiff.py ${tmpdir}/config-i686-default \
-                                       ${filename} > ${filename}.tmp
-                               ;;
-                       armv7hl:*)
-                               # armv7hl depends on a config-armv7hl
-                               ${SCRIPTS_DIR}/configdiff.py ${tmpdir}/config-${arch}-common \
+                               ${SCRIPTS_DIR}/configdiff.py ${tmpdir}/config-${arch}-default \
                                        ${filename} > ${filename}.tmp
                                ;;
-                       armv5tel:versatile)
-                               rm -f ${filename}
-                               continue
-                               ;;
                        *)
                                ${SCRIPTS_DIR}/configdiff.py ${tmpdir}/config-${suparch}-common \
                                        ${filename} > ${filename}.tmp
diff --git a/libnftnl/libnftnl.nm b/libnftnl/libnftnl.nm
new file mode 100644 (file)
index 0000000..147303c
--- /dev/null
@@ -0,0 +1,49 @@
+###############################################################################
+# IPFire.org    - An Open Source Firewall Solution                            #
+# Copyright (C) - IPFire Development Team <info@ipfire.org>                   #
+###############################################################################
+
+name       = libnftnl
+version    = 1.0.0
+snapshot   = 20140412
+release    = 1.%{snapshot}
+thisapp    = %{name}-%{snapshot}
+
+groups     = Networking/Tools
+url        = http://netfilter.org/projects/libnftnl
+license    = GPLv2
+summary    = Library for low-level interaction with nftables
+
+description
+       Library for low-level interaction with nftables Netlink's API over
+       libmnl.
+end
+
+source_dl  = http://ftp.netfilter.org/pub/libnftnl/snapshot/
+sources    = %{thisapp}.tar.bz2
+
+build
+       requires
+               autoconf
+               autogen
+               automake
+               libmnl-devel
+               libtool
+       end
+
+       prepare_cmds
+               ./autogen.sh
+       end
+end
+
+packages
+       package %{name}
+
+       package %{name}-devel
+               template DEVEL
+       end
+
+       package %{name}-debuginfo
+               template DEBUGINFO
+       end
+end
index 09083e24eb4d8cc51c7c4275205d3feb3f38f38e..688151fefa49d0236882804dd3ccfcf052c80b6a 100644 (file)
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = libpng
-version    = 1.6.8
+version    = 1.6.10
 release    = 1
 
 compat_ver = 1.5.17
diff --git a/nftables/nftables.nm b/nftables/nftables.nm
new file mode 100644 (file)
index 0000000..82eabcf
--- /dev/null
@@ -0,0 +1,50 @@
+###############################################################################
+# IPFire.org    - An Open Source Firewall Solution                            #
+# Copyright (C) - IPFire Development Team <info@ipfire.org>                   #
+###############################################################################
+
+name       = nftables
+version    = 0.100
+snapshot   = 20140412
+release    = 1.%{snapshot}
+thisapp    = %{name}-%{snapshot}
+
+groups     = Networking/Tools
+url        = http://netfilter.org/projects/nftables/
+license    = GPLv2
+summary    = Netfilter Tables userspace utillites
+
+description
+       %{summary}
+end
+
+source_dl  = http://ftp.netfilter.org/pub/nftables/snapshot/
+sources    = %{thisapp}.tar.bz2
+
+build
+       requires
+               autoconf
+               autogen
+               automake
+               bison
+               docbook-dtds
+               flex
+               gmp-devel
+               libtool
+               libmnl-devel
+               libnftnl-devel
+               readline-devel
+       end
+
+       prepare_cmds
+               ./autogen.sh
+       end
+end
+
+packages
+       package %{name}
+
+       package %{name}-debuginfo
+               template DEBUGINFO
+       end
+end
index b52e8c7927df5e4442ebe1bdc12094fa5aff6517..5a7e24ebac21393d1099d0755e6cb6e7d4765626 100644 (file)
@@ -5,7 +5,7 @@
 
 name       = openssl
 version    = 1.0.1e
-release    = 1
+release    = 2
 
 maintainer = Michael Tremer <michael.tremer@ipfire.org>
 groups     = System/Libraries
diff --git a/openssl/patches/openssl.git-96db902.patch b/openssl/patches/openssl.git-96db902.patch
new file mode 100644 (file)
index 0000000..6fed32a
--- /dev/null
@@ -0,0 +1,108 @@
+From: Dr. Stephen Henson <steve@openssl.org>
+Date: Sat, 5 Apr 2014 23:51:06 +0000 (+0100)
+Subject: Add heartbeat extension bounds check.
+X-Git-Tag: OpenSSL_1_0_1g~3
+X-Git-Url: http://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=96db902
+
+Add heartbeat extension bounds check.
+
+A missing bounds check in the handling of the TLS heartbeat extension
+can be used to reveal up to 64k of memory to a connected client or
+server.
+
+Thanks for Neel Mehta of Google Security for discovering this bug and to
+Adam Langley <agl@chromium.org> and Bodo Moeller <bmoeller@acm.org> for
+preparing the fix (CVE-2014-0160)
+---
+
+diff --git a/ssl/d1_both.c b/ssl/d1_both.c
+index 7a5596a..2e8cf68 100644
+--- a/ssl/d1_both.c
++++ b/ssl/d1_both.c
+@@ -1459,26 +1459,36 @@ dtls1_process_heartbeat(SSL *s)
+       unsigned int payload;
+       unsigned int padding = 16; /* Use minimum padding */
+-      /* Read type and payload length first */
+-      hbtype = *p++;
+-      n2s(p, payload);
+-      pl = p;
+-
+       if (s->msg_callback)
+               s->msg_callback(0, s->version, TLS1_RT_HEARTBEAT,
+                       &s->s3->rrec.data[0], s->s3->rrec.length,
+                       s, s->msg_callback_arg);
++      /* Read type and payload length first */
++      if (1 + 2 + 16 > s->s3->rrec.length)
++              return 0; /* silently discard */
++      hbtype = *p++;
++      n2s(p, payload);
++      if (1 + 2 + payload + 16 > s->s3->rrec.length)
++              return 0; /* silently discard per RFC 6520 sec. 4 */
++      pl = p;
++
+       if (hbtype == TLS1_HB_REQUEST)
+               {
+               unsigned char *buffer, *bp;
++              unsigned int write_length = 1 /* heartbeat type */ +
++                                          2 /* heartbeat length */ +
++                                          payload + padding;
+               int r;
++              if (write_length > SSL3_RT_MAX_PLAIN_LENGTH)
++                      return 0;
++
+               /* Allocate memory for the response, size is 1 byte
+                * message type, plus 2 bytes payload length, plus
+                * payload, plus padding
+                */
+-              buffer = OPENSSL_malloc(1 + 2 + payload + padding);
++              buffer = OPENSSL_malloc(write_length);
+               bp = buffer;
+               /* Enter response type, length and copy payload */
+@@ -1489,11 +1499,11 @@ dtls1_process_heartbeat(SSL *s)
+               /* Random padding */
+               RAND_pseudo_bytes(bp, padding);
+-              r = dtls1_write_bytes(s, TLS1_RT_HEARTBEAT, buffer, 3 + payload + padding);
++              r = dtls1_write_bytes(s, TLS1_RT_HEARTBEAT, buffer, write_length);
+               if (r >= 0 && s->msg_callback)
+                       s->msg_callback(1, s->version, TLS1_RT_HEARTBEAT,
+-                              buffer, 3 + payload + padding,
++                              buffer, write_length,
+                               s, s->msg_callback_arg);
+               OPENSSL_free(buffer);
+diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
+index b82fada..bddffd9 100644
+--- a/ssl/t1_lib.c
++++ b/ssl/t1_lib.c
+@@ -2588,16 +2588,20 @@ tls1_process_heartbeat(SSL *s)
+       unsigned int payload;
+       unsigned int padding = 16; /* Use minimum padding */
+-      /* Read type and payload length first */
+-      hbtype = *p++;
+-      n2s(p, payload);
+-      pl = p;
+-
+       if (s->msg_callback)
+               s->msg_callback(0, s->version, TLS1_RT_HEARTBEAT,
+                       &s->s3->rrec.data[0], s->s3->rrec.length,
+                       s, s->msg_callback_arg);
++      /* Read type and payload length first */
++      if (1 + 2 + 16 > s->s3->rrec.length)
++              return 0; /* silently discard */
++      hbtype = *p++;
++      n2s(p, payload);
++      if (1 + 2 + payload + 16 > s->s3->rrec.length)
++              return 0; /* silently discard per RFC 6520 sec. 4 */
++      pl = p;
++
+       if (hbtype == TLS1_HB_REQUEST)
+               {
+               unsigned char *buffer, *bp;
index edcf016aea33624ca0346b938717f8bfc023e5df..f280520cb26f6d0a5d64521ce41a5eab125edc54 100644 (file)
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = pciutils
-version    = 3.2.0
+version    = 3.2.1
 release    = 1
 
 groups     = System/Base
index 782b4382424173d7060bfb12f7cc3165013dc03f..a9cc86c3806f90910bc4575c2fac42e09fd379fb 100644 (file)
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = pcre
-version    = 8.34
-release    = 3
+version    = 8.35
+release    = 2
 
 compat_version = 8.21
 
diff --git a/rng-tools/patches/rng-tools-man.patch b/rng-tools/patches/rng-tools-man.patch
new file mode 100644 (file)
index 0000000..010d20d
--- /dev/null
@@ -0,0 +1,21 @@
+diff -up rng-tools-3/rngtest.1.in.man rng-tools-3/rngtest.1.in
+--- rng-tools-3/rngtest.1.in.man       2009-12-24 07:47:24.000000000 +0100
++++ rng-tools-3/rngtest.1.in   2012-01-12 10:12:27.909567190 +0100
+@@ -43,7 +43,7 @@ Exit after processing n input blocks, if
+ Dump statistics every n blocks, if n is not zero.
+ .TP
+ \fB\-t\fR \fIn\fR, \fB\-\-timedstats=\fIn\fR (default: 0)
+-Dump statistics every n secods, if n is not zero.
++Dump statistics every n seconds, if n is not zero.
+ .TP
+ \fB\-?\fR, \fB\-\-help\fR
+ Give a short summary of all program options.
+@@ -62,7 +62,7 @@ other statistics show a breakdown of the
+ tests are defined on FIPS 140-1 and FIPS 140-2 errata of 2001-10-10. They
+ were removed in FIPS 140-2 errata of 2002-12-03).
+ .PP
+-The speed statistics are taken for every 20000-bit block trasferred or
++The speed statistics are taken for every 20000-bit block transferred or
+ processed.
+ .SH EXIT STATUS
diff --git a/rng-tools/rng-tools.nm b/rng-tools/rng-tools.nm
new file mode 100644 (file)
index 0000000..ef5e035
--- /dev/null
@@ -0,0 +1,52 @@
+###############################################################################
+# IPFire.org    - An Open Source Firewall Solution                            #
+# Copyright (C) - IPFire Development Team <info@ipfire.org>                   #
+###############################################################################
+
+name       = rng-tools
+version    = 4
+release    = 1
+
+groups     = System/Base
+url        = http://sourceforge.net/projects/gkernel/
+license    = GPLv2+
+summary    = Random number generator related utilities.
+
+description
+       %{summary}
+end
+
+source_dl  = http://downloads.sourceforge.net/project/gkernel/rng-tools/%{version}/
+
+build
+       requires
+               gettext
+               groff
+       end
+end
+
+packages
+       package %{name}
+               script postin
+                       /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+               end
+
+               script preun
+                       /bin/systemctl --no-reload disable rngd.service > /dev/null 2>&1 || :
+                       /bin/systemctl stop rngd.service > /dev/null 2>&1 || :
+               end
+
+               script postun
+                       /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+               end
+
+               script postup
+                       /bin/systemctl daemon-reload 2>&1 || :
+                       /bin/systemctl reload-or-try-restart rngd.service >/dev/null 2>&1 || :
+               end
+       end
+
+       package %{name}-debuginfo
+               template DEBUGINFO
+       end
+end
diff --git a/rng-tools/systemd/rngd.service b/rng-tools/systemd/rngd.service
new file mode 100644 (file)
index 0000000..770bc62
--- /dev/null
@@ -0,0 +1,8 @@
+[Unit]
+Description=Hardware RNG Entropy Gatherer Daemon
+
+[Service]
+ExecStart=/usr/sbin/rngd -f --no-tpm=1
+
+[Install]
+WantedBy=multi-user.target