Merge pull request #1796 from kdarbyshirebryant/collectdnetlink
authorJo-Philipp Wich <jow@openwrt.org>
Thu, 1 Oct 2015 18:21:05 +0000 (20:21 +0200)
committerJo-Philipp Wich <jow@openwrt.org>
Thu, 1 Oct 2015 18:21:05 +0000 (20:21 +0200)
collectd: netlink module re-enabled

50 files changed:
lang/perl/Makefile
lang/perl/README.patches [new file with mode: 0644]
lang/perl/patches/010-musl-compat.patch [new file with mode: 0644]
lang/perl/patches/020-host-libc-dir-moved-debian+derivatives.patch [new file with mode: 0644]
lang/perl/patches/100-fix-cross-compile-endianness-detection.patch [new file with mode: 0644]
lang/perl/patches/100-musl-compat.patch [deleted file]
lang/perl/patches/101-fix-cross-compile-endianness-detection.patch [deleted file]
lang/perl/patches/110-always_use_miniperl.patch [new file with mode: 0644]
lang/perl/patches/200-host-libc-dir-moved-debian+derivatives.patch [deleted file]
lang/perl/patches/300-add-relink-hack.patch [new file with mode: 0644]
lang/perl/patches/300-always_use_miniperl.patch [deleted file]
lang/perl/patches/400-add_microperl_caretx_dependency.patch [deleted file]
lang/perl/patches/500-add-relink-hack.patch [deleted file]
lang/perl/patches/600-tie_fetch_count_t-handle_missing_crypt.patch [deleted file]
lang/perl/patches/700-threads_join-skip_ps_on_busybox.patch [deleted file]
lang/perl/patches/700-tie_fetch_count_t-handle_missing_crypt.patch [new file with mode: 0644]
lang/perl/patches/710-threads_join-skip_ps_on_busybox.patch [new file with mode: 0644]
lang/perl/perlbase.mk
lang/python/files/python-package.mk
libs/file/Makefile
libs/gnutls/Makefile
libs/libcanfestival/Makefile [new file with mode: 0644]
libs/libcanfestival/patches/001-sigval-ref-fix.patch [new file with mode: 0644]
libs/libcanfestival/patches/002-makefile-gcc-linker.patch [new file with mode: 0644]
libs/libcoap/Makefile [new file with mode: 0644]
libs/libradcli/Makefile
libs/libtasn1/Makefile
net/e2guardian/Makefile
net/krb5/Makefile
net/lighttpd/Makefile
net/lighttpd/patches/001-fix-out-of-filedescriptors-when-uploading-large-file.patch [deleted file]
net/mosquitto/Makefile
net/mosquitto/patches/001-free-counting-bug-475707.patch [deleted file]
net/nut/Makefile
net/scapy/Makefile [new file with mode: 0644]
net/squid/Makefile
sound/shairplay/Makefile
sound/shairplay/patches/003-fix_big-endian.patch
utils/canutils/Makefile [new file with mode: 0644]
utils/dump1090/Config.in [deleted file]
utils/dump1090/Makefile
utils/dump1090/files/dump1090.config
utils/dump1090/files/dump1090.init
utils/dump1090/patches/100-html_dir.patch [deleted file]
utils/lxc/Makefile
utils/lxc/patches/016-uninitialized-ret-in-monitor.patch [deleted file]
utils/lxc/patches/035-fix-undefined-lfd.patch [new file with mode: 0644]
utils/open-plc-utils/Makefile
utils/pciutils/Makefile
utils/pciutils/patches/105-fix-host.patch [new file with mode: 0644]

index 0dcf2012bef0e64fa0cbbf2a85182ad97b1a0496..fd20bc8be68f55f75230448475f00990b220574c 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=perl
 PKG_VERSION:=5.22.0
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE_URL:=ftp://ftp.cpan.org/pub/CPAN/src/5.0 \
                http://www.cpan.org/src/5.0 \
diff --git a/lang/perl/README.patches b/lang/perl/README.patches
new file mode 100644 (file)
index 0000000..5f3b595
--- /dev/null
@@ -0,0 +1,9 @@
+The patches in this package are loosely sorted into the following categories:
+
+0xx - Bugfixes
+1xx - Cross-compile fixes
+3xx - Workarounds
+7xx - Testsuite fixes
+
+Feel free to add another one if your new patch doesn't seem to fit into an
+existing category.
\ No newline at end of file
diff --git a/lang/perl/patches/010-musl-compat.patch b/lang/perl/patches/010-musl-compat.patch
new file mode 100644 (file)
index 0000000..8dbad78
--- /dev/null
@@ -0,0 +1,11 @@
+--- a/pp.c
++++ b/pp.c
+@@ -43,7 +43,7 @@ extern Pid_t getpid (void);
+  * Some BSDs and Cygwin default to POSIX math instead of IEEE.
+  * This switches them over to IEEE.
+  */
+-#if defined(LIBM_LIB_VERSION)
++#if defined(LIBM_LIB_VERSION) && (defined(__GLIBC__) || defined(__UCLIBC__))
+     _LIB_VERSION_TYPE _LIB_VERSION = _IEEE_;
+ #endif
diff --git a/lang/perl/patches/020-host-libc-dir-moved-debian+derivatives.patch b/lang/perl/patches/020-host-libc-dir-moved-debian+derivatives.patch
new file mode 100644 (file)
index 0000000..761f8b9
--- /dev/null
@@ -0,0 +1,27 @@
+--- a/hints/linux.sh
++++ b/hints/linux.sh
+@@ -204,6 +204,24 @@ case "$libc" in
+     ;;
+ esac
++# Ubuntu 11.04 (and later, presumably) doesn't keep most libraries
++# (such as -lm) in /lib or /usr/lib.  So we have to ask gcc to tell us
++# where to look.  We don't want gcc's own libraries, however, so we
++# filter those out.
++# This could be conditional on Unbuntu, but other distributions may
++# follow suit, and this scheme seems to work even on rather old gcc's.
++# This unconditionally uses gcc because even if the user is using another
++# compiler, we still need to find the math library and friends, and I don't
++# know how other compilers will cope with that situation.
++# Still, as an escape hatch, allow Configure command line overrides to
++# plibpth to bypass this check.
++case "$plibpth" in
++'') plibpth=`gcc -print-search-dirs | grep libraries |
++      cut -f2- -d= | tr ':' $trnl | grep -v 'gcc'`
++    plibpth="$plibpth"  # Collapse all entries on one line
++    ;;
++esac
++
+ # Are we using ELF?  Thanks to Kenneth Albanowski <kjahds@kjahds.com>
+ # for this test.
+ cat >try.c <<'EOM'
diff --git a/lang/perl/patches/100-fix-cross-compile-endianness-detection.patch b/lang/perl/patches/100-fix-cross-compile-endianness-detection.patch
new file mode 100644 (file)
index 0000000..e187941
--- /dev/null
@@ -0,0 +1,22 @@
+--- a/config_h.SH
++++ b/config_h.SH
+@@ -52,6 +52,19 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#und
+ #ifndef _config_h_
+ #define _config_h_
++#if defined(USE_CROSS_COMPILE) && !defined(__LITTLE_ENDIAN__) && !defined(__BIG_ENDIAN__)
++#  include <endian.h>
++#  if defined(__BYTE_ORDER) && defined(__LITTLE_ENDIAN) && defined(__BIG_ENDIAN)
++#    if (__BYTE_ORDER == __LITTLE_ENDIAN)
++#      define __LITTLE_ENDIAN__
++#    elif (__BYTE_ORDER == __BIG_ENDIAN)
++#      define __BIG_ENDIAN__
++#    else
++#      error Unknown endianness
++#    endif
++#  endif
++#endif
++
+ /* LOC_SED:
+  *    This symbol holds the complete pathname to the sed program.
+  */
diff --git a/lang/perl/patches/100-musl-compat.patch b/lang/perl/patches/100-musl-compat.patch
deleted file mode 100644 (file)
index 8dbad78..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/pp.c
-+++ b/pp.c
-@@ -43,7 +43,7 @@ extern Pid_t getpid (void);
-  * Some BSDs and Cygwin default to POSIX math instead of IEEE.
-  * This switches them over to IEEE.
-  */
--#if defined(LIBM_LIB_VERSION)
-+#if defined(LIBM_LIB_VERSION) && (defined(__GLIBC__) || defined(__UCLIBC__))
-     _LIB_VERSION_TYPE _LIB_VERSION = _IEEE_;
- #endif
diff --git a/lang/perl/patches/101-fix-cross-compile-endianness-detection.patch b/lang/perl/patches/101-fix-cross-compile-endianness-detection.patch
deleted file mode 100644 (file)
index e187941..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/config_h.SH
-+++ b/config_h.SH
-@@ -52,6 +52,19 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#und
- #ifndef _config_h_
- #define _config_h_
-+#if defined(USE_CROSS_COMPILE) && !defined(__LITTLE_ENDIAN__) && !defined(__BIG_ENDIAN__)
-+#  include <endian.h>
-+#  if defined(__BYTE_ORDER) && defined(__LITTLE_ENDIAN) && defined(__BIG_ENDIAN)
-+#    if (__BYTE_ORDER == __LITTLE_ENDIAN)
-+#      define __LITTLE_ENDIAN__
-+#    elif (__BYTE_ORDER == __BIG_ENDIAN)
-+#      define __BIG_ENDIAN__
-+#    else
-+#      error Unknown endianness
-+#    endif
-+#  endif
-+#endif
-+
- /* LOC_SED:
-  *    This symbol holds the complete pathname to the sed program.
-  */
diff --git a/lang/perl/patches/110-always_use_miniperl.patch b/lang/perl/patches/110-always_use_miniperl.patch
new file mode 100644 (file)
index 0000000..f8f8a65
--- /dev/null
@@ -0,0 +1,27 @@
+--- a/Makefile.SH
++++ b/Makefile.SH
+@@ -315,22 +315,11 @@ MINIPERL = \$(LDLIBPTH) ./miniperl\$(EXE
+ !GROK!THIS!
+-case "$usecrosscompile$perl" in
+-define?*)
+-      $spitshell >>$Makefile <<!GROK!THIS!
+-# Macros to invoke a copy of our fully operational perl during the build.
+-PERL_EXE = perl\$(EXE_EXT)
+-RUN_PERL = \$(LDLIBPTH) \$(RUN) $perl\$(EXE_EXT)
+-!GROK!THIS!
+-      ;;
+-*)
+-      $spitshell >>$Makefile <<!GROK!THIS!
++$spitshell >>$Makefile <<!GROK!THIS!
+ # Macros to invoke a copy of our fully operational perl during the build.
+ PERL_EXE = perl\$(EXE_EXT)
+-RUN_PERL = \$(LDLIBPTH) \$(RUN) ./perl\$(EXE_EXT) -Ilib
++RUN_PERL = \$(LDLIBPTH) \$(RUN) ./miniperl\$(EXE_EXT) -Ilib
+ !GROK!THIS!
+-      ;;
+-esac
+ $spitshell >>$Makefile <<!GROK!THIS!
+ # Macros to run our tests
diff --git a/lang/perl/patches/200-host-libc-dir-moved-debian+derivatives.patch b/lang/perl/patches/200-host-libc-dir-moved-debian+derivatives.patch
deleted file mode 100644 (file)
index 761f8b9..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/hints/linux.sh
-+++ b/hints/linux.sh
-@@ -204,6 +204,24 @@ case "$libc" in
-     ;;
- esac
-+# Ubuntu 11.04 (and later, presumably) doesn't keep most libraries
-+# (such as -lm) in /lib or /usr/lib.  So we have to ask gcc to tell us
-+# where to look.  We don't want gcc's own libraries, however, so we
-+# filter those out.
-+# This could be conditional on Unbuntu, but other distributions may
-+# follow suit, and this scheme seems to work even on rather old gcc's.
-+# This unconditionally uses gcc because even if the user is using another
-+# compiler, we still need to find the math library and friends, and I don't
-+# know how other compilers will cope with that situation.
-+# Still, as an escape hatch, allow Configure command line overrides to
-+# plibpth to bypass this check.
-+case "$plibpth" in
-+'') plibpth=`gcc -print-search-dirs | grep libraries |
-+      cut -f2- -d= | tr ':' $trnl | grep -v 'gcc'`
-+    plibpth="$plibpth"  # Collapse all entries on one line
-+    ;;
-+esac
-+
- # Are we using ELF?  Thanks to Kenneth Albanowski <kjahds@kjahds.com>
- # for this test.
- cat >try.c <<'EOM'
diff --git a/lang/perl/patches/300-add-relink-hack.patch b/lang/perl/patches/300-add-relink-hack.patch
new file mode 100644 (file)
index 0000000..fd3d386
--- /dev/null
@@ -0,0 +1,6 @@
+--- /dev/null
++++ b/relink/Makefile.PL
+@@ -0,0 +1,3 @@
++use ExtUtils::MakeMaker;
++
++WriteMakefile(NAME => "relink");
diff --git a/lang/perl/patches/300-always_use_miniperl.patch b/lang/perl/patches/300-always_use_miniperl.patch
deleted file mode 100644 (file)
index f8f8a65..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/Makefile.SH
-+++ b/Makefile.SH
-@@ -315,22 +315,11 @@ MINIPERL = \$(LDLIBPTH) ./miniperl\$(EXE
- !GROK!THIS!
--case "$usecrosscompile$perl" in
--define?*)
--      $spitshell >>$Makefile <<!GROK!THIS!
--# Macros to invoke a copy of our fully operational perl during the build.
--PERL_EXE = perl\$(EXE_EXT)
--RUN_PERL = \$(LDLIBPTH) \$(RUN) $perl\$(EXE_EXT)
--!GROK!THIS!
--      ;;
--*)
--      $spitshell >>$Makefile <<!GROK!THIS!
-+$spitshell >>$Makefile <<!GROK!THIS!
- # Macros to invoke a copy of our fully operational perl during the build.
- PERL_EXE = perl\$(EXE_EXT)
--RUN_PERL = \$(LDLIBPTH) \$(RUN) ./perl\$(EXE_EXT) -Ilib
-+RUN_PERL = \$(LDLIBPTH) \$(RUN) ./miniperl\$(EXE_EXT) -Ilib
- !GROK!THIS!
--      ;;
--esac
- $spitshell >>$Makefile <<!GROK!THIS!
- # Macros to run our tests
diff --git a/lang/perl/patches/400-add_microperl_caretx_dependency.patch b/lang/perl/patches/400-add_microperl_caretx_dependency.patch
deleted file mode 100644 (file)
index 1c25fea..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/Makefile.micro
-+++ b/Makefile.micro
-@@ -22,7 +22,8 @@ O = uav$(_O) udeb$(_O) udoio$(_O) udoop$
-       uregcomp$(_O) uregexec$(_O) urun$(_O) \
-       uscope$(_O) usv$(_O) utaint$(_O) utoke$(_O) \
-       unumeric$(_O) ulocale$(_O) umathoms$(_O) \
--      uuniversal$(_O) uutf8$(_O) uutil$(_O) uperlapi$(_O) ukeywords$(_O)
-+      uuniversal$(_O) uutf8$(_O) uutil$(_O) uperlapi$(_O) ukeywords$(_O) \
-+      ucaretx$(_O)
- microperl:    $(O)
-       $(LD) -o $@ $(O) $(LDFLAGS) $(LIBS)
-@@ -178,6 +179,9 @@ uutil$(_O):        $(HE) util.c
- uperlapi$(_O):        $(HE) perlapi.c perlapi.h
-       $(CC) $(CCFLAGS) -o $@ $(CFLAGS) perlapi.c
-+ucaretx$(_O): $(HE) caretx.c
-+      $(CC) $(CCFLAGS) -o $@ $(CFLAGS) caretx.c
-+
- uuudmap.h umg_data.h: ubitcount.h
- ubitcount.h: ugenerate_uudmap$(_X)
diff --git a/lang/perl/patches/500-add-relink-hack.patch b/lang/perl/patches/500-add-relink-hack.patch
deleted file mode 100644 (file)
index fd3d386..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
---- /dev/null
-+++ b/relink/Makefile.PL
-@@ -0,0 +1,3 @@
-+use ExtUtils::MakeMaker;
-+
-+WriteMakefile(NAME => "relink");
diff --git a/lang/perl/patches/600-tie_fetch_count_t-handle_missing_crypt.patch b/lang/perl/patches/600-tie_fetch_count_t-handle_missing_crypt.patch
deleted file mode 100644 (file)
index 32914dd..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: perl-5.22.0/t/op/tie_fetch_count.t
-===================================================================
---- perl-5.22.0.orig/t/op/tie_fetch_count.t
-+++ perl-5.22.0/t/op/tie_fetch_count.t
-@@ -250,12 +250,17 @@ for ([chdir=>''],[chmod=>'0,'],[chown=>'
-     check_count "$op $args\\\$tied_glob$postargs";
- }
--$dummy  =   crypt $var,0; check_count 'crypt $tied, ...';
--$dummy  =   crypt 0,$var; check_count 'crypt ..., $tied';
--$var = substr(chr 256,0,0);
--$dummy  =   crypt $var,0; check_count 'crypt $tied_utf8, ...';
--$var = substr(chr 256,0,0);
--$dummy  =   crypt 0,$var; check_count 'crypt ..., $tied_utf8';
-+SKIP: {
-+    use Config;
-+    skip "crypt() is unavailable", 4, unless defined $Config{'d_crypt'};
-+
-+    $dummy  =   crypt $var,0; check_count 'crypt $tied, ...';
-+    $dummy  =   crypt 0,$var; check_count 'crypt ..., $tied';
-+    $var = substr(chr 256,0,0);
-+    $dummy  =   crypt $var,0; check_count 'crypt $tied_utf8, ...';
-+    $var = substr(chr 256,0,0);
-+    $dummy  =   crypt 0,$var; check_count 'crypt ..., $tied_utf8';
-+}
- SKIP:
- {
diff --git a/lang/perl/patches/700-threads_join-skip_ps_on_busybox.patch b/lang/perl/patches/700-threads_join-skip_ps_on_busybox.patch
deleted file mode 100644 (file)
index 27ee757..0000000
+++ /dev/null
@@ -1,83 +0,0 @@
-perl: Skip $0 test on busybox
-
-This test requires a ps which provides the -f option, as well as suitable output.
-We can't provide either with busybox. Just skip it for now.
-
-Signed-off-by: Marcel Denia <naoir@gmx.net>
-
-Index: perl-5.22.0/dist/threads/t/join.t
-===================================================================
---- perl-5.22.0.orig/dist/threads/t/join.t
-+++ perl-5.22.0/dist/threads/t/join.t
-@@ -110,36 +110,41 @@ sub skip {
- # We parse ps output so this is OS-dependent.
- if ($^O eq 'linux') {
--    # First modify $0 in a subthread.
--    #print "# mainthread: \$0 = $0\n";
--    threads->create(sub{ #print "# subthread: \$0 = $0\n";
--                        $0 = "foobar";
--                        #print "# subthread: \$0 = $0\n"
--                 })->join;
--    #print "# mainthread: \$0 = $0\n";
--    #print "# pid = $$\n";
--    if (open PS, "ps -f |") { # Note: must work in (all) systems.
--        my ($sawpid, $sawexe);
--        while (<PS>) {
--            chomp;
--            #print "# [$_]\n";
--            if (/^\s*\S+\s+$$\s/) {
--                $sawpid++;
--                if (/\sfoobar\s*$/) { # Linux 2.2 leaves extra trailing spaces.
--                    $sawexe++;
--                }
--                last;
--            }
--        }
--        close PS or die;
--        if ($sawpid) {
--            ok($sawpid && $sawexe, 'altering $0 is effective');
--        } else {
--            skip("\$0 check: did not see pid $$ in 'ps -f |'");
--        }
--    } else {
--        skip("\$0 check: opening 'ps -f |' failed: $!");
--    }
-+      if (readlink('/bin/ps') ne 'busybox') {
-+              # First modify $0 in a subthread.
-+              #print "# mainthread: \$0 = $0\n";
-+              threads->create(sub{ #print "# subthread: \$0 = $0\n";
-+                                                      $0 = "foobar";
-+                                                      #print "# subthread: \$0 = $0\n"
-+                                      })->join;
-+              #print "# mainthread: \$0 = $0\n";
-+              #print "# pid = $$\n";
-+              if (open PS, "ps -f |") { # Note: must work in (all) systems.
-+                      my ($sawpid, $sawexe);
-+                      while (<PS>) {
-+                              chomp;
-+                              #print "# [$_]\n";
-+                              if (/^\s*\S+\s+$$\s/) {
-+                                      $sawpid++;
-+                                      if (/\sfoobar\s*$/) { # Linux 2.2 leaves extra trailing spaces.
-+                                              $sawexe++;
-+                                      }
-+                                      last;
-+                              }
-+                      }
-+                      close PS or die;
-+                      if ($sawpid) {
-+                              ok($sawpid && $sawexe, 'altering $0 is effective');
-+                      } else {
-+                              skip("\$0 check: did not see pid $$ in 'ps -f |'");
-+                      }
-+              } else {
-+                      skip("\$0 check: opening 'ps -f |' failed: $!");
-+              }
-+      }
-+      else {
-+              skip("\$0 check: incompatible with busybox");
-+      }
- } else {
-     skip("\$0 check: only on Linux");
- }
diff --git a/lang/perl/patches/700-tie_fetch_count_t-handle_missing_crypt.patch b/lang/perl/patches/700-tie_fetch_count_t-handle_missing_crypt.patch
new file mode 100644 (file)
index 0000000..32914dd
--- /dev/null
@@ -0,0 +1,28 @@
+Index: perl-5.22.0/t/op/tie_fetch_count.t
+===================================================================
+--- perl-5.22.0.orig/t/op/tie_fetch_count.t
++++ perl-5.22.0/t/op/tie_fetch_count.t
+@@ -250,12 +250,17 @@ for ([chdir=>''],[chmod=>'0,'],[chown=>'
+     check_count "$op $args\\\$tied_glob$postargs";
+ }
+-$dummy  =   crypt $var,0; check_count 'crypt $tied, ...';
+-$dummy  =   crypt 0,$var; check_count 'crypt ..., $tied';
+-$var = substr(chr 256,0,0);
+-$dummy  =   crypt $var,0; check_count 'crypt $tied_utf8, ...';
+-$var = substr(chr 256,0,0);
+-$dummy  =   crypt 0,$var; check_count 'crypt ..., $tied_utf8';
++SKIP: {
++    use Config;
++    skip "crypt() is unavailable", 4, unless defined $Config{'d_crypt'};
++
++    $dummy  =   crypt $var,0; check_count 'crypt $tied, ...';
++    $dummy  =   crypt 0,$var; check_count 'crypt ..., $tied';
++    $var = substr(chr 256,0,0);
++    $dummy  =   crypt $var,0; check_count 'crypt $tied_utf8, ...';
++    $var = substr(chr 256,0,0);
++    $dummy  =   crypt 0,$var; check_count 'crypt ..., $tied_utf8';
++}
+ SKIP:
+ {
diff --git a/lang/perl/patches/710-threads_join-skip_ps_on_busybox.patch b/lang/perl/patches/710-threads_join-skip_ps_on_busybox.patch
new file mode 100644 (file)
index 0000000..27ee757
--- /dev/null
@@ -0,0 +1,83 @@
+perl: Skip $0 test on busybox
+
+This test requires a ps which provides the -f option, as well as suitable output.
+We can't provide either with busybox. Just skip it for now.
+
+Signed-off-by: Marcel Denia <naoir@gmx.net>
+
+Index: perl-5.22.0/dist/threads/t/join.t
+===================================================================
+--- perl-5.22.0.orig/dist/threads/t/join.t
++++ perl-5.22.0/dist/threads/t/join.t
+@@ -110,36 +110,41 @@ sub skip {
+ # We parse ps output so this is OS-dependent.
+ if ($^O eq 'linux') {
+-    # First modify $0 in a subthread.
+-    #print "# mainthread: \$0 = $0\n";
+-    threads->create(sub{ #print "# subthread: \$0 = $0\n";
+-                        $0 = "foobar";
+-                        #print "# subthread: \$0 = $0\n"
+-                 })->join;
+-    #print "# mainthread: \$0 = $0\n";
+-    #print "# pid = $$\n";
+-    if (open PS, "ps -f |") { # Note: must work in (all) systems.
+-        my ($sawpid, $sawexe);
+-        while (<PS>) {
+-            chomp;
+-            #print "# [$_]\n";
+-            if (/^\s*\S+\s+$$\s/) {
+-                $sawpid++;
+-                if (/\sfoobar\s*$/) { # Linux 2.2 leaves extra trailing spaces.
+-                    $sawexe++;
+-                }
+-                last;
+-            }
+-        }
+-        close PS or die;
+-        if ($sawpid) {
+-            ok($sawpid && $sawexe, 'altering $0 is effective');
+-        } else {
+-            skip("\$0 check: did not see pid $$ in 'ps -f |'");
+-        }
+-    } else {
+-        skip("\$0 check: opening 'ps -f |' failed: $!");
+-    }
++      if (readlink('/bin/ps') ne 'busybox') {
++              # First modify $0 in a subthread.
++              #print "# mainthread: \$0 = $0\n";
++              threads->create(sub{ #print "# subthread: \$0 = $0\n";
++                                                      $0 = "foobar";
++                                                      #print "# subthread: \$0 = $0\n"
++                                      })->join;
++              #print "# mainthread: \$0 = $0\n";
++              #print "# pid = $$\n";
++              if (open PS, "ps -f |") { # Note: must work in (all) systems.
++                      my ($sawpid, $sawexe);
++                      while (<PS>) {
++                              chomp;
++                              #print "# [$_]\n";
++                              if (/^\s*\S+\s+$$\s/) {
++                                      $sawpid++;
++                                      if (/\sfoobar\s*$/) { # Linux 2.2 leaves extra trailing spaces.
++                                              $sawexe++;
++                                      }
++                                      last;
++                              }
++                      }
++                      close PS or die;
++                      if ($sawpid) {
++                              ok($sawpid && $sawexe, 'altering $0 is effective');
++                      } else {
++                              skip("\$0 check: did not see pid $$ in 'ps -f |'");
++                      }
++              } else {
++                      skip("\$0 check: opening 'ps -f |' failed: $!");
++              }
++      }
++      else {
++              skip("\$0 check: incompatible with busybox");
++      }
+ } else {
+     skip("\$0 check: only on Linux");
+ }
index 3cbbfcafd37c95c2a9b303a8c95382ae6234c5ab..41af50a1c0153aeae1e8e4406af1274427fea426 100644 (file)
@@ -287,7 +287,6 @@ $(eval $(call BuildPackage,perlbase-compress))
 define Package/perlbase-config
 $(call Package/perlbase-template)
 TITLE:=Config perl module
-DEPENDS+=+perlbase-essential
 endef
 
 define Package/perlbase-config/install
@@ -329,7 +328,7 @@ $(eval $(call BuildPackage,perlbase-cwd))
 define Package/perlbase-data
 $(call Package/perlbase-template)
 TITLE:=Data perl module
-DEPENDS+=+perlbase-essential
+DEPENDS+=+perlbase-bytes +perlbase-essential
 endef
 
 define Package/perlbase-data/install
@@ -554,6 +553,7 @@ $(eval $(call BuildPackage,perlbase-errno))
 define Package/perlbase-essential
 $(call Package/perlbase-template)
 TITLE:=essential perl module
+DEPENDS+=+perlbase-config
 endef
 
 define Package/perlbase-essential/install
@@ -1556,4 +1556,4 @@ endef
 $(eval $(call BuildPackage,perlbase-xsloader))
 
 
-# Generated Tue Aug 25 21:14:51 2015
+# Generated Fri Sep 25 07:47:59 2015
index 5ab35195dd6c2ec6ce4a3c66fbab19cb196db0b6..b4be3a8ee98569b86656561c098a752ee7feb3af 100644 (file)
@@ -103,6 +103,7 @@ define Build/Compile/PyMod
                cd $(PKG_BUILD_DIR)/$(strip $(1)); \
                CC="$(TARGET_CC)" \
                CCSHARED="$(TARGET_CC) $(FPIC)" \
+               CXX="$(TARGET_CXX)" \
                LD="$(TARGET_CC)" \
                LDSHARED="$(TARGET_CC) -shared" \
                CFLAGS="$(TARGET_CFLAGS)" \
index 39bf0bdd7dfc8fb46c044ceb9245b18bfd585e01..90ab6f4cc60b319aa9c62440dd799fd19aae14b2 100644 (file)
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=file
-PKG_VERSION:=5.20
+PKG_VERSION:=5.25
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://ftp.astron.com/pub/file/
-PKG_MD5SUM:=5d5e13eb3e0e13839da869a31790faf2
+PKG_MD5SUM:=e6a972d4e10d9e76407a432f4a63cd4c
 
 PKG_LICENSE:=BSD-2c
 PKG_LICENSE_FILES:=COPYING
@@ -83,6 +83,9 @@ define Package/file/install
        $(SED) "/^#/d" $(PKG_INSTALL_DIR)/usr/share/file/magic
        $(SED) "/^$$$$/d" $(PKG_INSTALL_DIR)/usr/share/file/magic
        $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/file/magic $(1)/usr/share/misc/
+
+       # For some reason both "magic" and "magic.mgc" MUST exist
+       ln -sf magic $(1)/usr/share/misc/magic.mgc
 endef
 
 define Package/libmagic/install
index f851b9b115206ecea4cdae031cbe8fce3f21bf0d..b6cd2de410d11eeb3ec94adcabfe9cfcc21d6478 100644 (file)
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gnutls
-PKG_VERSION:=3.4.4.1
+PKG_VERSION:=3.4.5
 PKG_RELEASE:=1
 PKG_USE_MIPS16:=0
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=ftp://ftp.gnutls.org/gcrypt/gnutls/v3.4
-PKG_MD5SUM:=474efaba6fd6c6c6c0ebac2a3f431946
+PKG_MD5SUM:=f5dae0e0ecda28aab12386e6c0705d4c
 #PKG_FIXUP:=autoreconf gettext-version
 PKG_MAINTAINER:=Nikos Mavrogiannopoulos <nmav@gnutls.org>
 PKG_LICENSE:=LGPLv2.1+
diff --git a/libs/libcanfestival/Makefile b/libs/libcanfestival/Makefile
new file mode 100644 (file)
index 0000000..6d9ce49
--- /dev/null
@@ -0,0 +1,68 @@
+#
+# Copyright (C) 2015 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=libcanfestival
+PKG_RELEASE:=1
+
+PKG_SOURCE_PROTO:=hg
+PKG_SOURCE_URL:=http://dev.automforge.net/CanFestival-3
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)
+PKG_SOURCE_VERSION:=8bfe0ac00cdb
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.bz2
+
+PKG_MAINTAINER:=Anton Glukhov <anton.a.glukhov@gmail.com>
+PKG_LICENSE:=LGPL-2.1+
+PKG_LICENSE_FILE:=LICENCE
+
+PKG_FIXUP:=autoreconf
+PKG_INSTALL:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/libcanfestival
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=Free software CANopen library
+  URL:=http://canfestival.org
+  DEPENDS:=+libpthread +librt
+endef
+
+define Package/libcanfestival/description
+  CanFestival library
+endef
+
+TARGET_CFLAGS += $(FPIC)
+
+CONFIGURE_ARGS := \
+       --cc=$(TARGET_CC) \
+       --cxx=$(TARGET_CXX) \
+       --ld=$(TARGET_CC) \
+       --arch=$(ARCH) \
+       --os=Linux \
+       --kerneldir=$(LINUX_DIR) \
+       --prefix=/usr \
+       --target=unix \
+       --can=socket \
+       --timers=unix \
+       --debug=ERR \
+
+define Build/InstallDev
+       $(INSTALL_DIR) $(1)/usr/include
+       $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
+
+       $(INSTALL_DIR) $(1)/usr/lib
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
+endef
+
+define Package/libcanfestival/install
+       $(INSTALL_DIR) $(1)/usr/lib
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcanfestival_can_socket.so $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,libcanfestival))
diff --git a/libs/libcanfestival/patches/001-sigval-ref-fix.patch b/libs/libcanfestival/patches/001-sigval-ref-fix.patch
new file mode 100644 (file)
index 0000000..7e15ff1
--- /dev/null
@@ -0,0 +1,11 @@
+--- a/drivers/timers_unix/timers_unix.c
++++ b/drivers/timers_unix/timers_unix.c
+@@ -33,7 +33,7 @@
+       }
+ }
+-void timer_notify(sigval_t val)
++void timer_notify(void)
+ {
+       if(gettimeofday(&last_sig,NULL)) {
+               perror("gettimeofday()");
diff --git a/libs/libcanfestival/patches/002-makefile-gcc-linker.patch b/libs/libcanfestival/patches/002-makefile-gcc-linker.patch
new file mode 100644 (file)
index 0000000..129743f
--- /dev/null
@@ -0,0 +1,33 @@
+--- a/examples/TestMasterMicroMod/Makefile.in
++++ b/examples/TestMasterMicroMod/Makefile.in
+@@ -56,7 +56,7 @@
+ $(TESTMASTERMICROMOD): $(OBJS)
+-      $(LD) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ $(OBJS) $(EXE_CFLAGS)
++      $(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ $(OBJS) $(EXE_CFLAGS)
+       
+ TestMaster.c: TestMaster.od
+--- a/examples/TestMasterSlave/Makefile.in
++++ b/examples/TestMasterSlave/Makefile.in
+@@ -65,7 +65,7 @@
+ $(TESTMASTERSLAVE): $(OBJS)
+-      $(LD) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ $(OBJS) $(EXE_CFLAGS)
++      $(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ $(OBJS) $(EXE_CFLAGS)
+       
+ TestSlave.c: TestSlave.od
+       $(MAKE) -C ../../objdictgen gnosis
+--- a/examples/CANOpenShell/Makefile.in
++++ b/examples/CANOpenShell/Makefile.in
+@@ -64,7 +64,7 @@
+       $(MAKE) -C ../../drivers/$(TARGET) libcanfestival_$(TARGET).a
+ $(CANOPENSHELL): $(OBJS)
+-      $(LD) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ $(OBJS) $(EXE_CFLAGS)
++      $(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ $(OBJS) $(EXE_CFLAGS)
+       mkdir -p Debug; cp $(CANOPENSHELL) Debug
+       
+ CANOpenShellMasterOD.c: CANOpenShellMasterOD.od
diff --git a/libs/libcoap/Makefile b/libs/libcoap/Makefile
new file mode 100644 (file)
index 0000000..41d5535
--- /dev/null
@@ -0,0 +1,58 @@
+#
+# Copyright (C) 2015 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=libcoap
+PKG_RELEASE:=1
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/obgm/libcoap
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)
+PKG_SOURCE_VERSION:=2da31de732c0e51a9bc9e1d4aea21e25da89cf87
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.bz2
+
+PKG_MAINTAINER:=Anton Glukhov <anton.a.glukhov@gmail.com>
+PKG_LICENSE:=GPL-2.0+ BSD-2-Clause
+PKG_LICENSE_FILE:=COPYING LICENSE.GPL LICENSE.BSD
+
+PKG_FIXUP:=autoreconf
+PKG_INSTALL:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/libcoap
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=CoAP (RFC 7252) library
+  URL:=http://libcoap.net/
+endef
+
+define Package/libcoap/description
+  Constrained Application Protocol (RFC 7252) library
+endef
+
+TARGET_CFLAGS += $(FPIC)
+
+CONFIGURE_ARGS += \
+       --disable-examples \
+       --disable-documentation
+
+define Build/InstallDev
+       $(INSTALL_DIR) $(1)/usr/include
+       $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
+
+       $(INSTALL_DIR) $(1)/usr/lib
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
+endef
+
+define Package/libcoap/install
+       $(INSTALL_DIR) $(1)/usr/lib
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcoap-1.so* $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,libcoap))
index 00af18f996a4d2bba01bdc00a2db3a5a0a3a6539..e124bf80f5dde59e0269ede657513286e6d6d43b 100644 (file)
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libradcli
-PKG_VERSION:=1.2.1
+PKG_VERSION:=1.2.3
 PKG_RELEASE:=1
 
 PKG_SOURCE:=radcli-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://github.com/radcli/radcli/releases/download/radcli_1_2_1/
-PKG_MD5SUM:=48f917ed3822ed2d91a5e90309a80812
+PKG_SOURCE_URL:=https://github.com/radcli/radcli/releases/download/radcli_1_2_3/
+PKG_MD5SUM:=e283db7db2248cd6499aff69813cb1ed
 PKG_BUILD_DIR:=$(BUILD_DIR)/radcli-$(PKG_VERSION)
 
 PKG_INSTALL:=1
index 2b5a2d4b86afb497568dbb1cb9e70fb8bf8c9a30..8190addc0df5b5e7bab93972b7af7d83b3694b7b 100644 (file)
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libtasn1
-PKG_VERSION:=4.4
+PKG_VERSION:=4.7
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://ftp.gnu.org/gnu/libtasn1
-PKG_MD5SUM:=c26d76d1309dd339365c563076599912
+PKG_MD5SUM:=12d10ca4ae0a3b95f7aa06a076da39ec
 
 #PKG_FIXUP:=autoreconf
 PKG_INSTALL:=1
index 10a41b91e942638b8d400132c447fd96e7a42677..fac9737e0d54f123d033b032c2ae587e37588e0c 100644 (file)
@@ -8,15 +8,16 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=e2guardian
-PKG_VERSION:=3.1.2
+PKG_VERSION:=3.2.0
 PKG_RELEASE:=1
 
 PKG_LICENSE:=GPL-2.0
 PKG_MAINTAINER:=Luka Perkov <luka@openwrt.org>
 
 PKG_SOURCE:=v$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://github.com/e2guardian/e2guardian/archive/
-PKG_MD5SUM:=85cfa16074737dbc3935f93dfcded285
+PKG_SOURCE_URL:=https://github.com/$(PKG_NAME)/$(PKG_NAME)/archive/
+PKG_MD5SUM:=70613669ef00a480e3ebb62e12427cf4
+
 PKG_FIXUP:=autoreconf
 PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1
@@ -53,6 +54,7 @@ CONFIGURE_ARGS += \
                --enable-sslmitm=no
 
 define Build/Configure
+       ( cd $(PKG_BUILD_DIR); ./autogen.sh )
        $(call Build/Configure/Default,$CONFIGURE_ARGS)
 endef
 
index 5f6907032be8850ab29e4c5c6c68a36724522628..c9c84de910399881cae9747a20323bf2d54c5260 100644 (file)
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=krb5
-PKG_VERSION:=1.13.1
+PKG_VERSION:=1.13.2
 PKG_RELEASE:=1
 
 PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
@@ -18,7 +18,7 @@ PKG_LICENSE_FILES:=NOTICE
 
 PKG_SOURCE:=krb5-$(PKG_VERSION)-signed.tar
 PKG_SOURCE_URL:=http://web.mit.edu/kerberos/dist/krb5/1.13/
-PKG_MD5SUM:=567586cdf02aa8c842c2fab7a94f3c1f
+PKG_MD5SUM:=f7ebfa6c99c10b16979ebf9a98343189
 
 PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1
index 5c6a10a9d2138cc7b9f14c412fc0460c19b75820..72eb7b66d04a6c2295f8b284251c9e535487493f 100644 (file)
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=lighttpd
-PKG_VERSION:=1.4.36
+PKG_VERSION:=1.4.37
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=http://download.lighttpd.net/lighttpd/releases-1.4.x
-PKG_MD5SUM:=1843daffcb018aa528f6d15d43544654
+PKG_MD5SUM:=ca40168f54b46ee29475868ced8507d6
 
 PKG_LICENSE:=BSD-3c
 PKG_LICENSE_FILES:=COPYING
diff --git a/net/lighttpd/patches/001-fix-out-of-filedescriptors-when-uploading-large-file.patch b/net/lighttpd/patches/001-fix-out-of-filedescriptors-when-uploading-large-file.patch
deleted file mode 100644 (file)
index 6ef9403..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-From: =?UTF-8?q?Stefan=20B=C3=BChler?= <stbuehler@web.de>
-Date: Thu, 13 Aug 2015 18:44:27 +0000
-Subject: [PATCH] fix out-of-filedescriptors when uploading "large" files
- (fixes #2660, thx rmilecki)
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Stefan Bühler <stbuehler@web.de>
-
-git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.x@3009 152afb58-edef-0310-8abb-c4023f1b3aa9
----
- src/chunk.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/src/chunk.c
-+++ b/src/chunk.c
-@@ -432,7 +432,7 @@ static int chunkqueue_append_to_tempfile
-        * */
-       if (NULL != dest->last
--              && FILE_CHUNK != dest->last->type
-+              && FILE_CHUNK == dest->last->type
-               && dest->last->file.is_temp
-               && -1 != dest->last->file.fd
-               && 0 == dest->last->offset) {
index 1aac9d8723351d8a96e087054c0a6715ded4c5b8..87ff529e8e11663cc746d72d23928f9115ab611d 100644 (file)
@@ -9,14 +9,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mosquitto
-PKG_VERSION:=1.4.3
-PKG_RELEASE:=2
+PKG_VERSION:=1.4.4
+PKG_RELEASE:=1
 PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE.txt
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://mosquitto.org/files/source/
-PKG_MD5SUM:=1c1c750525546bc13d8d72e56a0742a7
+PKG_MD5SUM:=89a57f11cdfec140fa21fe3d4493b2ca
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/net/mosquitto/patches/001-free-counting-bug-475707.patch b/net/mosquitto/patches/001-free-counting-bug-475707.patch
deleted file mode 100644 (file)
index 6b16145..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/lib/memory_mosq.c b/lib/memory_mosq.c
-index b1f5bfd..4d8217d 100644
---- a/lib/memory_mosq.c
-+++ b/lib/memory_mosq.c
-@@ -54,6 +54,9 @@ void *mosquitto__calloc(size_t nmemb, size_t size)
- void mosquitto__free(void *mem)
- {
- #ifdef REAL_WITH_MEMORY_TRACKING
-+      if(!mem){
-+              return;
-+      }
-       memcount -= malloc_usable_size(mem);
- #endif
-       free(mem);
index 32a3e1343b74fca3b7953e4032a8ae9334ad38fb..176ab5150826d162559a949851f29e5f3a328871 100644 (file)
@@ -55,6 +55,7 @@ define Package/nut
        $(call Package/nut/Default)
        TITLE:=Network UPS Tools
        DEPENDS:= \
+               +libpthread \
                +NUT_DRIVER_SNMP:libnetsnmp \
                +NUT_DRIVER_USB:libusb-compat \
                +NUT_SSL:libopenssl
diff --git a/net/scapy/Makefile b/net/scapy/Makefile
new file mode 100644 (file)
index 0000000..e8af27a
--- /dev/null
@@ -0,0 +1,56 @@
+#
+# Copyright (C) 2006-2015 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=scapy
+PKG_VERSION:=2.2.0
+PKG_RELEASE:=1
+PKG_LICENSE:=GPL-2.0
+PKG_LICENSE_FILES:=PKG-INFO
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).zip
+PKG_SOURCE_URL:=https://bitbucket.org/secdev/scapy/downloads/
+PKG_MD5SUM:=d68903c5d877820026dc544caa0b5d3c
+
+PKG_BUILD_DEPENDS:=python python-setuptools
+
+include $(INCLUDE_DIR)/package.mk
+$(call include_mk, python-package.mk)
+
+define Package/scapy
+  SECTION:=net
+  CATEGORY:=Network
+  TITLE:=Interactive packet manipulation tool and network scanner
+  MAINTAINER:=W. Michael Petullo <mike@flyn.org>
+  URL:=http://www.secdev.org/projects/scapy/
+  DEPENDS:=+python
+endef
+
+define Package/scapy/description
+  Scapy is a powerful interactive packet manipulation program built on top
+  of the Python interpreter. It can be used to forge or decode packets of
+  a wide number of protocols, send them over the wire, capture them, match
+  requests and replies, and much more.
+endef
+
+define Build/Compile
+       $(call Build/Compile/PyMod,., \
+               install --prefix="/usr" --root="$(PKG_INSTALL_DIR)", \
+       )
+endef
+
+define Package/scapy/install
+       $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR)
+       $(INSTALL_DIR) $(1)/usr/bin
+       $(CP) \
+               $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* \
+               $(1)$(PYTHON_PKG_DIR)/
+       $(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin
+endef
+
+$(eval $(call BuildPackage,scapy))
index 79843dab0d06c979e911554dddf696e41e63c1b9..38c1cd703284d49944519c0063b71ac1a458d645 100644 (file)
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=squid
-PKG_VERSION:=3.5.6
+PKG_VERSION:=3.5.9
 PKG_RELEASE:=1
 
 PKG_LICENSE:=GPL-2.0
@@ -16,7 +16,7 @@ PKG_MAINTAINER:=Luka Perkov <luka@openwrt.org>
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=http://www.squid-cache.org/Versions/v3/3.5/
-PKG_MD5SUM:=93e18bd257857e35bb634ddb8a348563
+PKG_MD5SUM:=fe7306a90a0ba2fc906e9a8c741cc8ea
 
 PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1
index 74a3fd781b3936b70cb6f6f755032e6c0c57565e..81ba7b6984a859b19ced34fbfbb979d8d9bfc339 100644 (file)
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2015 OpenWrt.org
+# Copyright (C) 2014-2015 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=shairplay
-PKG_VERSION:=2014-10-27
-PKG_RELEASE:=2
+PKG_VERSION:=2015-09-29
+PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=git://github.com/juhovh/shairplay.git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=64d59e3087f829006d091fa0d114efb50972a2bf
+PKG_SOURCE_VERSION:=498bc5bcdd305e04721f94a04b9f26a7da72673f
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MAINTAINER:=Álvaro Fernández Rojas <noltari@gmail.com>
 
index 7764aabc64b1c5b0e0b05bb9f77dca94ee8dc6b8..4db204eb7dba87faf9f5d3712b5a93b1a96df10d 100644 (file)
@@ -1,24 +1,11 @@
 --- a/src/lib/alac/alac.c
 +++ b/src/lib/alac/alac.c
-@@ -29,11 +29,7 @@
+@@ -29,7 +29,7 @@
   *
   */
  
--#ifdef __BIG_ENDIAN__
--static const int host_bigendian = 1;
--#else
 -static const int host_bigendian = 0;
--#endif
-+static int host_bigendian = 0;
++#define host_bigendian (htonl(42) == 42)
  
  #include <stdio.h>
  #include <stdlib.h>
-@@ -1181,6 +1177,8 @@ alac_file *create_alac(int samplesize, i
- {
-     alac_file *newfile = malloc(sizeof(alac_file));
-+    host_bigendian = (htonl(42) == 42);
-+
-     newfile->samplesize = samplesize;
-     newfile->numchannels = numchannels;
-     newfile->bytespersample = (samplesize / 8) * numchannels;
diff --git a/utils/canutils/Makefile b/utils/canutils/Makefile
new file mode 100644 (file)
index 0000000..58ae762
--- /dev/null
@@ -0,0 +1,116 @@
+#
+# Copyright (C) 2015 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=canutils
+PKG_RELEASE=1
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/linux-can/can-utils
+PKG_SOURCE_VERSION:=0e3ff3b3157e456d4b6343f5d4b42ef692bce538
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.bz2
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_SOURCE_VERSION)
+
+PKG_MAINTAINER:=Anton Glukhov <anton.a.glukhov@gmail.com>
+PKG_LICENSE:=GPL-2.0+
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR)
+PKG_FIXUP:=autoreconf
+
+include $(INCLUDE_DIR)/package.mk
+
+FILES:=canbusload can-calc-bit-timing candump \
+       cangen cangw canplayer cansniffer cansend
+
+define Package/canutils/Default
+  SECTION:=utils
+  CATEGORY:=Utilities
+  URL:=https://github.com/linux-can/can-utils
+  TITLE:=CAN userspace utilities and tools
+endef
+
+define Package/canutils
+  $(call Package/canutils/Default)
+  MENU:=1
+endef
+
+define Package/canutils-log-conversion
+  $(call Package/canutils/Default)
+  TITLE:=canutils log conversion
+  DEPENDS:=canutils
+endef
+
+define PartGen
+define Package/canutils-$(1)
+  $(call Package/canutils/Default)
+  TITLE:=$(1) tool from canutils
+  DEPENDS:=canutils
+endef
+endef
+
+$(foreach file,$(FILES),$(eval $(call PartGen,$(file))))
+
+define Package/canutils/install
+endef
+
+define Package/canutils-log-conversion/install
+       $(INSTALL_DIR) $(1)/usr/bin
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/asc2log $(1)/usr/bin/
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/log2asc $(1)/usr/bin/
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/log2long $(1)/usr/bin/
+endef
+
+define PartInstall
+define Package/canutils-$(1)/install
+       $(INSTALL_DIR) $$(1)/usr/bin
+       $(INSTALL_BIN) \
+               $(PKG_BUILD_DIR)/$(1) \
+               $$(1)/usr/bin/
+endef
+endef
+
+define Package/canutils-log-conversion/description
+asc2log - convert ASC logfile to compact CAN frame logfile.
+log2asc - convert compact CAN frame logfile to ASC logfile.
+log2long - convert compact CAN frame representation into user readable.
+endef
+
+define Package/canutils-canbusload/description
+canbusload - display the load percentage of can buses.
+endef
+
+define Package/canutils-can-calc-bit-timing/description
+can-calc-bit-timing - calculate hw bittiming for supported can chips.
+endef
+
+define Package/canutils-candump/description
+candump - dumps can frames to terminal, logfile or another can device,
+with optional filtering.
+endef
+
+define Package/canutils-cangen/description
+cangen - CAN frames generator for testing purposes.
+endef
+
+define Package/canutils-cangw/description
+cangw - manage PF_CAN netlink gateway.
+endef
+
+define Package/canutils-canplayer/description
+canplayer - replay a compact CAN frame logfile to CAN devices.
+endef
+
+define Package/canutils-cansend/description
+cansend - simple command line tool to send CAN-frames via CAN_RAW sockets.
+endef
+
+$(foreach file,$(FILES),$(eval $(call PartInstall,$(file))))
+
+$(eval $(call BuildPackage,canutils))
+$(eval $(call BuildPackage,canutils-log-conversion))
+$(foreach file,$(FILES),$(eval $(call BuildPackage,canutils-$(file))))
diff --git a/utils/dump1090/Config.in b/utils/dump1090/Config.in
deleted file mode 100644 (file)
index cee0aa5..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-config DUMP1090_DUMP
-       bool "dump1090"
-       depends on PACKAGE_dump1090
-       default y
-       help
-               dump1090 ModeS Receiver
-
-config DUMP1090_WWW
-       bool "website files"
-       depends on DUMP1090_DUMP
-       default y
-       help
-               HTML website files for showing planes
-
-config DUMP1090_VIEW
-       bool "view1090"
-       depends on PACKAGE_dump1090
-       default n
-       help
-               view1090 dump1090 Viewer
index 82ce06a67ada4831b584a4f711eba7e5b931e6f9..6725664b9380dc24f255836ad70b55bec74be7ad 100644 (file)
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2013-2014 OpenWrt.org
+# Copyright (C) 2013-2015 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,63 +8,68 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dump1090
-PKG_VERSION:=2014-11-09
-PKG_RELEASE:=$(PKG_SOURCE_VERSION)
+PKG_VERSION:=2015-09-28
+PKG_RELEASE:=2
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=git://github.com/MalcolmRobb/dump1090.git
+PKG_SOURCE_URL:=git://github.com/mutability/dump1090.git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=bff92c4ad772a0a8d433f788d39dae97e00e4dbe
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_VERSION:=3b4c872ea67118de1399ba9979e71b504a36aca8
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MAINTAINER:=Álvaro Fernández Rojas <noltari@gmail.com>
 
-PKG_LICENSE:=BSD-3c
+PKG_LICENSE:=GPL-2.0
+PKG_LICENSE_FILES:=COPYING LICENSE
 
-PKG_CONFIG_DEPENDS:= \
-       CONFIG_DUMP1090_DUMP \
-       CONFIG_DUMP1090_WWW \
-       CONFIG_DUMP1090_VIEW
+PKG_BUILD_DEPENDS:=librtlsdr
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/dump1090
+define Package/dump1090/Default
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=Mode S decoder for the Realtek RTL2832U
-  URL:=https://github.com/MalcolmRobb/dump1090
-  DEPENDS:=+libpthread +librtlsdr
+  URL:=https://github.com/mutability/dump1090
+  DEPENDS:=+libpthread
+endef
+
+define Package/dump1090
+  $(call Package/dump1090/Default)
+  TITLE+= (dump1090)
+  DEPENDS+= +librtlsdr
 endef
 
-define Package/dump1090/config
-       source "$(SOURCE)/Config.in"
+define Package/view1090
+  $(call Package/dump1090/Default)
+  TITLE+= (view1090)
 endef
 
 define Package/dump1090/description
  Dump1090 is a Mode S decoder specifically designed for RTLSDR devices.
- Embedded HTTP server that displays the currently detected aircrafts on
- Google Maps. Network output in Basestation and AVR formats.
+endef
+
+define Package/view1090/description
+ View1090 is a Mode S messages viewer for dump1090 devices.
 endef
 
 MAKE_FLAGS += \
        CFLAGS="$(TARGET_CFLAGS)"
 
 define Package/dump1090/install
-       $(INSTALL_DIR) $(1)/usr/bin
-
-ifneq ($(CONFIG_DUMP1090_DUMP),)
        $(INSTALL_DIR) $(1)/etc/init.d
        $(INSTALL_BIN) files/dump1090.init $(1)/etc/init.d/dump1090
        $(INSTALL_DIR) $(1)/etc/config
        $(INSTALL_CONF) files/dump1090.config $(1)/etc/config/dump1090
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/dump1090 $(1)/usr/bin
-ifneq ($(CONFIG_DUMP1090_WWW),)
        $(INSTALL_DIR) $(1)/usr/share/dump1090
        $(CP) $(PKG_BUILD_DIR)/public_html/* $(1)/usr/share/dump1090
-endif
-endif
-ifneq ($(CONFIG_DUMP1090_VIEW),)
+       $(INSTALL_DIR) $(1)/usr/bin
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/dump1090 $(1)/usr/bin
+endef
+
+define Package/view1090/install
+       $(INSTALL_DIR) $(1)/usr/bin
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/view1090 $(1)/usr/bin
-endif
 endef
 
 $(eval $(call BuildPackage,dump1090))
+$(eval $(call BuildPackage,view1090))
index 53d40ef7f6b98fa7359b04265903f4c42a8bd427..8fd6d42955398bfed2e883ef8c38cfb62f7e85a3 100644 (file)
@@ -6,6 +6,8 @@ config dump1090 main
        option enable_agc '0'
        option freq ''
        option ifile ''
+       option iformat ''
+       option throttle '0'
        option raw '0'
        option net '1'
        option modeac '0'
@@ -18,12 +20,16 @@ config dump1090 main
        option net_sbs_port ''
        option net_bi_port ''
        option net_bo_port ''
+       option net_fatsv_port ''
        option net_ro_size ''
-       option net_ro_rate ''
+       option net_ro_interval ''
        option net_heartbeat ''
        option net_buffer ''
+       option net_verbatim '0'
+       option forward_mlat '0'
        option lat ''
        option lon ''
+       option max_range ''
        option fix '0'
        option no_fix '0'
        option no_crc_check '0'
@@ -31,9 +37,17 @@ config dump1090 main
        option agressive '0'
        option mlat '0'
        option stats '0'
+       option stats_range '0'
        option stats_every ''
        option onlyaddr '0'
        option metric '0'
        option snip ''
        option debug ''
        option ppm ''
+       option html_dir '/usr/share/dump1090'
+       option write_json ''
+       option write_json_every ''
+       option json_location_accuracy ''
+       option oversample '0'
+       option dcfilter '0'
+       option measure_noise '0'
index bc0755fb862423c527ceff87d5694aebf01b36a7..8a3e2b2330446e73613c9ea52f3643dd343e204f 100644 (file)
@@ -1,5 +1,5 @@
 #!/bin/sh /etc/rc.common
-# Copyright (C) 2014 OpenWrt.org
+# Copyright (C) 2014-2015 OpenWrt.org
 
 START=90
 STOP=10
@@ -44,6 +44,8 @@ start_instance() {
        append_bool "$cfg" enable_agc "--enable-agc"
        append_arg "$cfg" freq "--freq"
        append_arg "$cfg" ifile "--ifile"
+       append_arg "$cfg" iformat "--iformat"
+       append_bool "$cfg" throttle "--throttle"
        append_bool "$cfg" raw "--raw"
        append_bool "$cfg" net "--net"
        append_bool "$cfg" modeac "--modeac"
@@ -56,12 +58,16 @@ start_instance() {
        append_arg "$cfg" net_sbs_port "--net-sbs-port"
        append_arg "$cfg" net_bi_port "--net-bi-port"
        append_arg "$cfg" net_bo_port "--net-bo-port"
+       append_arg "$cfg" net_fatsv_port "net-fatsv-port"
        append_arg "$cfg" net_ro_size "--net-ro-size"
-       append_arg "$cfg" net_ro_rate "--net-ro-rate"
+       append_arg "$cfg" net_ro_interval "--net-ro-interval"
        append_arg "$cfg" net_heartbeat "--net-heartbeat"
        append_arg "$cfg" net_buffer "--net-buffer"
+       append_bool "$cfg" net_verbatim "--net-verbatim"
+       append_bool "$cfg" forward_mlat "--forward-mlat"
        append_arg "$cfg" lat "--lat"
        append_arg "$cfg" lon "--lon"
+       append_arg "$cfg" max_range "--max-range"
        append_bool "$cfg" fix "--fix"
        append_bool "$cfg" no_fix "--no-fix"
        append_bool "$cfg" no_crc_check "--no-crc-check"
@@ -69,12 +75,20 @@ start_instance() {
        append_bool "$cfg" agressive "--agressive"
        append_bool "$cfg" mlat "--mlat"
        append_bool "$cfg" stats "--stats"
+       append_bool "$cfg" stats_range "--stats-range"
        append_arg "$cfg" stats_every "--stats-every"
        append_bool "$cfg" onlyaddr "--onlyaddr"
        append_bool "$cfg" metric "--metric"
        append_arg "$cfg" snip "--snip"
        append_arg "$cfg" debug "--debug"
        append_arg "$cfg" ppm "--ppm"
+       append_arg "$cfg" html_dir "--html-dir"
+       append_arg "$cfg" write_json "--write-json"
+       append_arg "$cfg" write_json_every "write-json-every"
+       append_arg "$cfg" json_location_accuracy "--json-location-accuracy"
+       append_bool "$cfg" oversample "--oversample"
+       append_bool "$cfg" dcfilter "--dcfilter"
+       append_bool "$cfg" measure_noise "--measure-noise"
 
        config_get_bool aux "$cfg" 'respawn' '0'
        [ "$aux" = 1 ] && procd_set_param respawn
diff --git a/utils/dump1090/patches/100-html_dir.patch b/utils/dump1090/patches/100-html_dir.patch
deleted file mode 100644 (file)
index 8976057..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/dump1090.h
-+++ b/dump1090.h
-@@ -178,7 +178,7 @@
- #define MODES_NET_SNDBUF_MAX  (7)               
- #ifndef HTMLPATH
--#define HTMLPATH   "./public_html"      // default path for gmap.html etc
-+#define HTMLPATH   "/usr/share/dump1090"      // default path for gmap.html etc
- #endif
- #define MODES_NOTUSED(V) ((void) V)
index 868e100666b0fd1685e26eb1c2c6ee1401a3f34e..de9cecf1de4d5106e78361bfb8d9968bbddf14fc 100644 (file)
@@ -8,15 +8,15 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=lxc
-PKG_VERSION:=1.1.2
-PKG_RELEASE:=2
+PKG_VERSION:=1.1.3
+PKG_RELEASE:=1
 
 PKG_LICENSE:=LGPL-2.1+ BSD-2-Clause GPL-2.0
 PKG_MAINTAINER:=Luka Perkov <luka@openwrt.org>
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://linuxcontainers.org/downloads/lxc/
-PKG_MD5SUM:=3ebadacf5fe8bfe689fd7a09812b682c
+PKG_MD5SUM:=197abb5a28ab0b689c737eb1951023fb
 
 PKG_BUILD_DEPENDS:=lua
 PKG_BUILD_PARALLEL:=1
diff --git a/utils/lxc/patches/016-uninitialized-ret-in-monitor.patch b/utils/lxc/patches/016-uninitialized-ret-in-monitor.patch
deleted file mode 100644 (file)
index 7eca2ea..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/lxc/monitor.c
-+++ b/src/lxc/monitor.c
-@@ -181,7 +181,7 @@ int lxc_monitor_sock_name(const char *lx
- int lxc_monitor_open(const char *lxcpath)
- {
-       struct sockaddr_un addr;
--      int fd,ret;
-+      int fd,ret = 0;
-       int retry,backoff_ms[] = {10, 50, 100};
-       size_t len;
diff --git a/utils/lxc/patches/035-fix-undefined-lfd.patch b/utils/lxc/patches/035-fix-undefined-lfd.patch
new file mode 100644 (file)
index 0000000..6b57e26
--- /dev/null
@@ -0,0 +1,12 @@
+--- a/src/lxc/bdev.c
++++ b/src/lxc/bdev.c
+@@ -1936,3 +1936,3 @@ static int loop_mount(struct bdev *bdev)
+ {
+-      int lfd, ffd = -1, ret = -1;
++      int lfd = -1, ffd = -1, ret = -1;
+       struct loop_info64 lo;
+@@ -1974,3 +1974,3 @@ out:
+       if (ret < 0) {
+-              close(lfd);
++              if (lfd > -1) close(lfd);
+               bdev->lofd = -1;
index 74a9f995f3eb69a4a72cb30283b3f80726644fc1..1017ee88c55344d02ca2d4b6c0736e1c898b151b 100644 (file)
@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=open-plc-utils
-PKG_VERSION:=2015-07-06
+PKG_VERSION:=2015-09-21
 PKG_RELEASE:=$(PKG_SOURCE_VERSION)
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=git://github.com/qca/open-plc-utils.git
+PKG_SOURCE_URL:=https://github.com/qca/open-plc-utils.git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE_VERSION:=885a1b7e2e663b5ab8797db6d40a0318131fdf18
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
@@ -75,6 +75,10 @@ OPEN_PLC_UTILS_APPS:=efbu efeu efru efsu edru edsu nics \
 
 $(foreach a,$(OPEN_PLC_UTILS_APPS),$(eval $(call GenPlugin,$(a))))
 
+ifdef CONFIG_USE_MUSL
+  TARGET_CFLAGS += -D__UCLIBC__
+endif
+
 define Build/Compile
        $(MAKE) -C $(PKG_BUILD_DIR) \
                EXTRA_CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" \
index e9879f601b9066cd86bf778fac67b85b1668785f..3cfc1252b89b6bb13b77260c7ba7fc9ff73443bd 100644 (file)
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=pciutils
-PKG_VERSION:=3.3.1
+PKG_VERSION:=3.4.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@KERNEL/software/utils/pciutils
-PKG_MD5SUM:=86d5462e5cfc2a4341a2b91ce3ed0f09
+PKG_MD5SUM:=46674cdbf2f72e4cfef75fea1b1ec5c8
 PKG_MAINTAINER:=Álvaro Fernández Rojas <noltari@gmail.com>
 
 PKG_LICENSE:=GPL-2.0
@@ -48,7 +48,7 @@ MAKE_FLAGS += \
        CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include" \
        PREFIX="/usr" \
        HOST="$(GNU_TARGET_NAME)" \
-       ZLIB="yes" \
+       ZLIB="yes"
 
 ifneq ($(CONFIG_USE_GLIBC),)
 TARGET_LDFLAGS += -lresolv
diff --git a/utils/pciutils/patches/105-fix-host.patch b/utils/pciutils/patches/105-fix-host.patch
new file mode 100644 (file)
index 0000000..8df4b8c
--- /dev/null
@@ -0,0 +1,11 @@
+--- a/lib/configure
++++ b/lib/configure
+@@ -44,7 +44,7 @@ if [ -z "$HOST" ] ; then
+ fi
+ [ -n "$RELEASE" ] && rel="${RELEASE}"
+ # CAVEAT: tr on Solaris is a bit weird and the extra [] is otherwise harmless.
+-host=`echo $HOST | sed -e 's/^\([^-]*\)-\([^-]*\)-\([^-]*\)-\([^-]*\)$/\1-\3/' -e 's/^\([^-]*\)-\([^-]*\)-\([^-]*\)$/\1-\2/' -e 's/^\([^-]*\)-\([^-]*\)$/\1--\2/' | tr '[A-Z]' '[a-z]'`
++host=`echo $HOST | sed -e 's/^\([^-]*\)-\([^-]*\)-\([^-]*\)-\([^-]*\)$/\1-\3/' -e 's/^\([^-]*\)-\([^-]*\)$/\1--\2/' | tr '[A-Z]' '[a-z]'`
+ cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+ sys=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+ echo " $host $rel $cpu $sys"