diff options
181 files changed, 2475 insertions, 181 deletions
@@ -1,3 +1,45 @@ +2012.11, Not released yet: + +2012.08, Release August 31th, 2012 + + Updated/fixed packages: microperl, cups, luajit, rrdtool, + prboom, oprofile. + + Added license information for: sqlite. + + Changed the source URLs of all packages located on Sourceforge + in order to use the automatic mirror selection URL + downloads.sourceforge.net, and get rid of the + BR2_SOURCEFORGE_MIRROR option. + +2012.08-rc3, Released August 25th, 2012 + + Updated/fixed packages: libglib2, netsnmp, freetype, libfuse, + libpng, x11vnc, zlib, gpsd, ifplugd, bash, distcc. + + Added license informations for: barebox, grub, syslinux, + uboot, xloader, yajl, zlib, zxing, alsa-lib, alsa-utils, + faad2, nano, fbdump, rsync, librsync, fontconfig, + inotify-tools, + +2012.08-rc2, Released August 15th, 2012 + + Updated/fixed packages: imagemagick, sudo, crosstool-ng. + + Added license informations for: mxml, nanocom, empty, expat, + lua, lucjson, xinetd, cjson, luaexpat, lmbench, bwm-ng, + input-event-daemon, luajit, cgilua, copas, coxpcall, + luafilesystem, luasocket, rings, wsapi, xavante, libtpl, + avahi, busybox, libfcgi, ifplugd, libcgicc, libcurl, + libdaemon, libdnet, libgpg-error, libpcap, libpng, lighttpd, + mtd, openssl, psmisc, socat, spawn-fcgi. + + Fixes to Microblaze external toolchains + configuration. Improvements of the pkg-stats + script. Out-of-tree fix for the graph-depends script. + + Kernel headers version bump. + 2012.08-rc1, Released August 1st, 2012 Fixes all over the tree and new features. @@ -78,6 +120,16 @@ sound-theme-freedesktop, sysprof, webrtc-audio-processing, xinetd, zxing + Issues resolved (http://bugs.uclibc.org): + + #1315: Allow use of older external toolchains without sysroot + support [won't fix] + #5276: Hiawatha needs to manage IPV6 if so [fixed] + #5360: buildroot fails when building "host-libglib2 2.30.2 + Building" [won't fix, upstream problem] + #5384: Can't build packages relying on gets on newer glibc + [fixed] + 2012.05, Released May 30th, 2012: Updated/fixed packages: busybox, netsnmp, pptp-linux @@ -147,18 +147,6 @@ config BR2_BACKUP_SITE will fall back to download package sources from here if the normal location fails. -config BR2_SOURCEFORGE_MIRROR - string "Sourceforge mirror site" - default "kent" - help - Sourceforge has a system of mirror sites. Some sites may be - closer to your location, and sometimes mirror sites go down - and are no longer available. This option allows you to select - your preferred Sourceforge mirror site. - - The list of mirrors is available here: - http://sourceforge.net/apps/trac/sourceforge/wiki/Mirrors - config BR2_KERNEL_MIRROR string "Kernel.org mirror" default "http://www.kernel.org/pub/" @@ -24,7 +24,7 @@ #-------------------------------------------------------------- # Set and export the version string -export BR2_VERSION:=2012.08-rc1 +export BR2_VERSION:=2012.11-git # Check for minimal make version (note: this check will break at make 10.x) MIN_MAKE_VERSION=3.81 @@ -209,6 +209,7 @@ unexport CFLAGS unexport CXXFLAGS unexport GREP_OPTIONS unexport CONFIG_SITE +unexport QMAKESPEC GNU_HOST_NAME:=$(shell support/gnuconfig/config.guess) diff --git a/boot/barebox/barebox.mk b/boot/barebox/barebox.mk index e5e2558cb..9550cdcfc 100644 --- a/boot/barebox/barebox.mk +++ b/boot/barebox/barebox.mk @@ -20,6 +20,9 @@ BAREBOX_SOURCE = barebox-$(BAREBOX_VERSION).tar.bz2 BAREBOX_SITE = http://www.barebox.org/download/ endif +BAREBOX_LICENSE = GPLv2 +BAREBOX_LICENSE_FILES = COPYING + ifneq ($(call qstrip,$(BR2_TARGET_BAREBOX_CUSTOM_PATCH_DIR)),) define BAREBOX_APPLY_CUSTOM_PATCHES support/scripts/apply-patches.sh $(@D) $(BR2_TARGET_BAREBOX_CUSTOM_PATCH_DIR) \ diff --git a/boot/grub/grub.mk b/boot/grub/grub.mk index e8d66f175..4a094bc47 100644 --- a/boot/grub/grub.mk +++ b/boot/grub/grub.mk @@ -9,6 +9,9 @@ GRUB_SOURCE = grub_$(GRUB_VERSION).orig.tar.gz GRUB_PATCH = grub_$(GRUB_VERSION)-35.diff.gz GRUB_SITE = http://snapshot.debian.org/archive/debian/20080329T000000Z/pool/main/g/grub/ +GRUB_LICENSE = GPLv2+ +GRUB_LICENSE_FILES = COPYING + GRUB_CFLAGS=-DSUPPORT_LOOPDEV ifeq ($(BR2_LARGEFILE),) GRUB_CFLAGS+=-U_FILE_OFFSET_BITS diff --git a/boot/syslinux/syslinux.mk b/boot/syslinux/syslinux.mk index 7df342fb1..f63f2e06c 100644 --- a/boot/syslinux/syslinux.mk +++ b/boot/syslinux/syslinux.mk @@ -8,6 +8,9 @@ SYSLINUX_VERSION = 4.05 SYSLINUX_SOURCE = syslinux-$(SYSLINUX_VERSION).tar.bz2 SYSLINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/boot/syslinux/4.xx/ +SYSLINUX_LICENSE = GPLv2+ +SYSLINUX_LICENSE_FILES = COPYING + SYSLINUX_INSTALL_TARGET = NO SYSLINUX_INSTALL_IMAGES = YES diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index b61400e05..619f2e1e3 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -6,6 +6,9 @@ UBOOT_VERSION = $(call qstrip,$(BR2_TARGET_UBOOT_VERSION)) UBOOT_BOARD_NAME = $(call qstrip,$(BR2_TARGET_UBOOT_BOARDNAME)) +UBOOT_LICENSE = GPLv2+ +UBOOT_LICENSE_FILES = COPYING + UBOOT_INSTALL_IMAGES = YES ifeq ($(UBOOT_VERSION),custom) diff --git a/boot/xloader/xloader.mk b/boot/xloader/xloader.mk index fbdba0283..b15d9b9ad 100644 --- a/boot/xloader/xloader.mk +++ b/boot/xloader/xloader.mk @@ -7,6 +7,9 @@ XLOADER_VERSION = 6f3a26101303051e0f91b6213735b68ce804e94e XLOADER_SITE = git://gitorious.org/x-loader/x-loader.git XLOADER_BOARD_NAME = $(call qstrip,$(BR2_TARGET_XLOADER_BOARDNAME)) +XLOADER_LICENSE = GPLv2+ +XLOADER_LICENSE_FILES = README + XLOADER_INSTALL_IMAGES = YES define XLOADER_BUILD_CMDS diff --git a/docs/download.html b/docs/download.html index c00a35663..51b7a82a0 100644 --- a/docs/download.html +++ b/docs/download.html @@ -6,19 +6,21 @@ <p> -The latest stable release is <b>2012.05</b>, which can be downloaded +The latest stable release is <b>2012.08</b>, which can be downloaded here:<p> -<a href="/downloads/buildroot-2012.05.tar.gz">buildroot-2012.05.tar.gz</a> +<a href="/downloads/buildroot-2012.08.tar.gz">buildroot-2012.08.tar.gz</a> or -<a href="/downloads/buildroot-2012.05.tar.bz2">buildroot-2012.05.tar.bz2</a>. +<a href="/downloads/buildroot-2012.08.tar.bz2">buildroot-2012.08.tar.bz2</a>. + +<!-- <p> -The latest release candidate is <b>2012.08-rc1</b>, which can be +The latest release candidate is <b>2012.08-rc3</b>, which can be downloaded here:<p> -<a href="/downloads/buildroot-2012.08-rc1.tar.gz">buildroot-2012.08-rc1.tar.gz</a> +<a href="/downloads/buildroot-2012.08-rc3.tar.gz">buildroot-2012.08-rc3.tar.gz</a> or -<a href="/downloads/buildroot-2012.08-rc1.tar.bz2">buildroot-2012.08-rc1.tar.bz2</a>. +<a href="/downloads/buildroot-2012.08-rc3.tar.bz2">buildroot-2012.08-rc3.tar.bz2</a>. <p> --> This and earlier releases can always be downloaded from diff --git a/docs/manual/adding-packages.txt b/docs/manual/adding-packages.txt index acbde0c80..cb75f2daa 100644 --- a/docs/manual/adding-packages.txt +++ b/docs/manual/adding-packages.txt @@ -1,5 +1,6 @@ Adding new packages to Buildroot ================================ +[[adding-packages]] This section covers how new packages (userspace libraries or applications) can be integrated into Buildroot. It also shows how diff --git a/docs/manual/rebuilding-packages.txt b/docs/manual/rebuilding-packages.txt index f247dd04f..fb6d69646 100644 --- a/docs/manual/rebuilding-packages.txt +++ b/docs/manual/rebuilding-packages.txt @@ -29,7 +29,7 @@ by the different packages, so some understanding of the particular package is needed. For packages relying on Buildroot packages infrastructures (see -xref:add-packages[this section] for details), the following stamp +xref:adding-packages[this section] for details), the following stamp files are relevant: * +output/build/packagename-version/.stamp_configured+. If removed, diff --git a/docs/news.html b/docs/news.html index 4114b03b5..2f545679c 100644 --- a/docs/news.html +++ b/docs/news.html @@ -5,6 +5,40 @@ <p> <ul> + <li><b>31 August 2012 -- 2012.08 released</b> + + <p>The stable 2012.08 release is out - Thanks to everyone + contributing and testing the release candidates. See the + <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2012.08">CHANGES</a> + file for more details and go to the <a href="/downloads/">downloads page</a> to pick up the + <a href="/downloads/buildroot-2012.08.tar.bz2">2012.08 release</a>.</p> + + <li><b>25 August 2012 -- 2012.08-rc3 released</b> + + <p>We have a new release candidate! Various fixes, and addition + of licensing informations on many + packages. See <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2012.08_rc3">CHANGES</a> + file for details</p> + + <p>Head to the <a href="/downloads/">downloads page</a> to pick up the + <a href="/downloads/buildroot-2012.08-rc3.tar.bz2">2012.08-rc3 + release candidate</a>, and report any problems found to the <a + href="lists.html">mailing list</a> or <a + href="https://bugs.uclibc.org">bug tracker</a>.</p> + + <li><b>15 August 2012 -- 2012.08-rc2 released</b> + + <p>We have a new release candidate! Various fixes, and addition + of licensing informations on many + packages. See <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2012.08_rc2">CHANGES</a> + file for details</p> + + <p>Head to the <a href="/downloads/">downloads page</a> to pick up the + <a href="/downloads/buildroot-2012.08-rc2.tar.bz2">2012.08-rc2 + release candidate</a>, and report any problems found to the <a + href="lists.html">mailing list</a> or <a + href="https://bugs.uclibc.org">bug tracker</a>.</p> + <li><b>1 August 2012 -- 2012.08-rc1 released</b> <p>We have a new release candidate! Lots of changes all over the diff --git a/linux/linux.mk b/linux/linux.mk index 5365d5fd1..c4bdf9090 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -69,12 +69,7 @@ ifeq ($(BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM),y) LINUX_IMAGE_NAME=$(call qstrip,$(BR2_LINUX_KERNEL_IMAGE_TARGET_NAME)) else ifeq ($(BR2_LINUX_KERNEL_UIMAGE),y) -ifeq ($(KERNEL_ARCH),blackfin) -# a uImage, but with a different file name -LINUX_IMAGE_NAME=vmImage -else LINUX_IMAGE_NAME=uImage -endif else ifeq ($(BR2_LINUX_KERNEL_APPENDED_UIMAGE),y) LINUX_IMAGE_NAME=uImage else ifeq ($(BR2_LINUX_KERNEL_BZIMAGE),y) diff --git a/package/alsa-lib/alsa-lib.mk b/package/alsa-lib/alsa-lib.mk index c3f61ff91..8ed133947 100644 --- a/package/alsa-lib/alsa-lib.mk +++ b/package/alsa-lib/alsa-lib.mk @@ -7,6 +7,8 @@ ALSA_LIB_VERSION = 1.0.25 ALSA_LIB_SOURCE = alsa-lib-$(ALSA_LIB_VERSION).tar.bz2 ALSA_LIB_SITE = ftp://ftp.alsa-project.org/pub/lib +ALSA_LIB_LICENSE = LGPLv2.1+ +ALSA_LIB_LICENSE_FILES = COPYING ALSA_LIB_INSTALL_STAGING = YES ALSA_LIB_CFLAGS=$(TARGET_CFLAGS) ALSA_LIB_CONF_OPT = --with-alsa-devdir=$(call qstrip,$(BR2_PACKAGE_ALSA_LIB_DEVDIR)) \ diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk index d9c0d1dbb..a26481d4e 100644 --- a/package/avahi/avahi.mk +++ b/package/avahi/avahi.mk @@ -13,6 +13,8 @@ AVAHI_VERSION = 0.6.31 AVAHI_SOURCE = avahi-$(AVAHI_VERSION).tar.gz AVAHI_SITE = http://www.avahi.org/download/ +AVAHI_LICENSE = LGPLv2.1+ +AVAHI_LICENSE_FILES = LICENSE AVAHI_INSTALL_STAGING = YES AVAHI_CONF_ENV = ac_cv_func_strtod=yes \ diff --git a/package/bash/bash-4.2-021.patch b/package/bash/bash-4.2-021.patch new file mode 100644 index 000000000..82e00fd3b --- /dev/null +++ b/package/bash/bash-4.2-021.patch @@ -0,0 +1,61 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-021 + +Bug-Reported-by: Dan Douglas <ormaaj@gmail.com> +Bug-Reference-ID: <4585554.nZWb4q7YoZ@smorgbox> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-12/msg00084.html + +Bug-Description: + +Using `read -N' to assign values to an array can result in NUL values being +assigned to some array elements. These values cause seg faults when referenced +later. + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/builtins/read.def 2011-11-21 18:03:38.000000000 -0500 +--- ./builtins/read.def 2011-12-19 19:52:12.000000000 -0500 +*************** +*** 738,742 **** + } + else +! var = bind_read_variable (varname, t); + } + else +--- 775,779 ---- + } + else +! var = bind_read_variable (varname, t ? t : ""); + } + else +*************** +*** 799,803 **** + } + else +! var = bind_read_variable (list->word->word, input_string); + + if (var) +--- 836,840 ---- + } + else +! var = bind_read_variable (list->word->word, input_string ? input_string : ""); + + if (var) +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- ./patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 20 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 21 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/package/bash/bash-4.2-022.patch b/package/bash/bash-4.2-022.patch new file mode 100644 index 000000000..cb0ac3f1c --- /dev/null +++ b/package/bash/bash-4.2-022.patch @@ -0,0 +1,61 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-022 + +Bug-Reported-by: Gregory Margo <gmargo@pacbell.net> +Bug-Reference-ID: <20110727174529.GA3333@pacbell.net> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-07/msg00102.html + +Bug-Description: + +The return value from lseek is `off_t'. This can cause corrupted return +values when the file offset is greater than 2**31 - 1. + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/lib/sh/zread.c Mon Mar 2 08:54:45 2009 +--- ./lib/sh/zread.c Thu Jul 28 18:16:53 2011 +*************** +*** 161,166 **** + int fd; + { +! off_t off; +! int r; + + off = lused - lind; +--- 161,165 ---- + int fd; + { +! off_t off, r; + + off = lused - lind; +*************** +*** 169,173 **** + r = lseek (fd, -off, SEEK_CUR); + +! if (r >= 0) + lused = lind = 0; + } +--- 168,172 ---- + r = lseek (fd, -off, SEEK_CUR); + +! if (r != -1) + lused = lind = 0; + } +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- ./patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 21 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 22 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/package/bash/bash-4.2-023.patch b/package/bash/bash-4.2-023.patch new file mode 100644 index 000000000..8c5addeb0 --- /dev/null +++ b/package/bash/bash-4.2-023.patch @@ -0,0 +1,62 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-023 + +Bug-Reported-by: Ewan Mellor <Ewan.Mellor@eu.citrix.com> +Bug-Reference-ID: <6005BE083BF501439A84DC3523BAC82DC4B964FD12@LONPMAILBOX01.citrite.net> +Bug-Reference-URL: + +Bug-Description: + +Under some circumstances, an exit trap triggered by a bad substitution +error when errexit is enabled will cause the shell to exit with an +incorrect exit status (0). + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/subst.c 2011-11-21 12:04:38.000000000 -0500 +--- ./subst.c 2012-02-08 13:36:28.000000000 -0500 +*************** +*** 7275,7278 **** +--- 7281,7285 ---- + case '\0': + bad_substitution: ++ last_command_exit_value = EXECUTION_FAILURE; + report_error (_("%s: bad substitution"), string ? string : "??"); + FREE (value); +*** ../bash-4.2-patched/error.c 2009-08-21 22:31:31.000000000 -0400 +--- ./error.c 2012-02-25 15:54:40.000000000 -0500 +*************** +*** 201,205 **** + va_end (args); + if (exit_immediately_on_error) +! exit_shell (1); + } + +--- 201,209 ---- + va_end (args); + if (exit_immediately_on_error) +! { +! if (last_command_exit_value == 0) +! last_command_exit_value = 1; +! exit_shell (last_command_exit_value); +! } + } + +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- ./patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 22 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 23 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/package/bash/bash-4.2-024.patch b/package/bash/bash-4.2-024.patch new file mode 100644 index 000000000..6ee6d8fbe --- /dev/null +++ b/package/bash/bash-4.2-024.patch @@ -0,0 +1,45 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-024 + +Bug-Reported-by: Jim Avera <james_avera@yahoo.com> +Bug-Reference-ID: <4F29E07A.80405@yahoo.com> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2012-02/msg00001.html + +Bug-Description: + +When `printf -v' is used to set an array element, the format string contains +`%b', and the corresponding argument is the empty string, the buffer used +to store the value to be assigned can be NULL, which results in NUL being +assigned to the array element. This causes a seg fault when it's used later. + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/builtins/printf.def 2011-02-25 12:07:41.000000000 -0500 +--- ./builtins/printf.def 2012-02-02 08:37:12.000000000 -0500 +*************** +*** 256,259 **** +--- 257,262 ---- + { + vflag = 1; ++ if (vbsize == 0) ++ vbuf = xmalloc (vbsize = 16); + vblen = 0; + if (vbuf) +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- ./patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 23 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 24 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/package/bash/bash-4.2-025.patch b/package/bash/bash-4.2-025.patch new file mode 100644 index 000000000..b57ee7d55 --- /dev/null +++ b/package/bash/bash-4.2-025.patch @@ -0,0 +1,143 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-025 + +Bug-Reported-by: Bill Gradwohl <bill@ycc.com> +Bug-Reference-ID: <CAFyvKis-UfuOWr5THBRKh=vYHDoKEEgdW8hN1RviTuYQ00Lu5A@mail.gmail.com> +Bug-Reference-URL: http://lists.gnu.org/archive/html/help-bash/2012-03/msg00078.html + +Bug-Description: + +When used in a shell function, `declare -g -a array=(compound assignment)' +creates a local variable instead of a global one. + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/command.h 2010-08-02 19:36:51.000000000 -0400 +--- ./command.h 2012-04-01 12:38:35.000000000 -0400 +*************** +*** 98,101 **** +--- 98,102 ---- + #define W_ASSIGNASSOC 0x400000 /* word looks like associative array assignment */ + #define W_ARRAYIND 0x800000 /* word is an array index being expanded */ ++ #define W_ASSNGLOBAL 0x1000000 /* word is a global assignment to declare (declare/typeset -g) */ + + /* Possible values for subshell_environment */ +*** ../bash-4.2-patched/execute_cmd.c 2011-11-21 18:03:41.000000000 -0500 +--- ./execute_cmd.c 2012-04-01 12:42:03.000000000 -0400 +*************** +*** 3581,3585 **** + WORD_LIST *w; + struct builtin *b; +! int assoc; + + if (words == 0) +--- 3581,3585 ---- + WORD_LIST *w; + struct builtin *b; +! int assoc, global; + + if (words == 0) +*************** +*** 3587,3591 **** + + b = 0; +! assoc = 0; + + for (w = words; w; w = w->next) +--- 3587,3591 ---- + + b = 0; +! assoc = global = 0; + + for (w = words; w; w = w->next) +*************** +*** 3604,3607 **** +--- 3604,3609 ---- + if (assoc) + w->word->flags |= W_ASSIGNASSOC; ++ if (global) ++ w->word->flags |= W_ASSNGLOBAL; + #endif + } +*************** +*** 3609,3613 **** + /* Note that we saw an associative array option to a builtin that takes + assignment statements. This is a bit of a kludge. */ +! else if (w->word->word[0] == '-' && strchr (w->word->word, 'A')) + { + if (b == 0) +--- 3611,3618 ---- + /* Note that we saw an associative array option to a builtin that takes + assignment statements. This is a bit of a kludge. */ +! else if (w->word->word[0] == '-' && (strchr (w->word->word+1, 'A') || strchr (w->word->word+1, 'g'))) +! #else +! else if (w->word->word[0] == '-' && strchr (w->word->word+1, 'g')) +! #endif + { + if (b == 0) +*************** +*** 3619,3626 **** + words->word->flags |= W_ASSNBLTIN; + } +! if (words->word->flags & W_ASSNBLTIN) + assoc = 1; + } +- #endif + } + +--- 3624,3632 ---- + words->word->flags |= W_ASSNBLTIN; + } +! if ((words->word->flags & W_ASSNBLTIN) && strchr (w->word->word+1, 'A')) + assoc = 1; ++ if ((words->word->flags & W_ASSNBLTIN) && strchr (w->word->word+1, 'g')) ++ global = 1; + } + } + +*** ../bash-4.2-patched/subst.c 2012-03-11 17:35:13.000000000 -0400 +--- ./subst.c 2012-04-01 12:38:35.000000000 -0400 +*************** +*** 367,370 **** +--- 367,375 ---- + fprintf (stderr, "W_ASSNBLTIN%s", f ? "|" : ""); + } ++ if (f & W_ASSNGLOBAL) ++ { ++ f &= ~W_ASSNGLOBAL; ++ fprintf (stderr, "W_ASSNGLOBAL%s", f ? "|" : ""); ++ } + if (f & W_COMPASSIGN) + { +*************** +*** 2804,2808 **** + else if (assign_list) + { +! if (word->flags & W_ASSIGNARG) + aflags |= ASS_MKLOCAL; + if (word->flags & W_ASSIGNASSOC) +--- 2809,2813 ---- + else if (assign_list) + { +! if ((word->flags & W_ASSIGNARG) && (word->flags & W_ASSNGLOBAL) == 0) + aflags |= ASS_MKLOCAL; + if (word->flags & W_ASSIGNASSOC) + +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- ./patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 24 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 25 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/package/bash/bash-4.2-026.patch b/package/bash/bash-4.2-026.patch new file mode 100644 index 000000000..06f8bb7aa --- /dev/null +++ b/package/bash/bash-4.2-026.patch @@ -0,0 +1,58 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-026 + +Bug-Reported-by: Greg Wooledge <wooledg@eeg.ccf.org> +Bug-Reference-ID: <20120425180443.GO22241@eeg.ccf.org> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2012-04/msg00172.html + +Bug-Description: + +The `lastpipe' option does not behave correctly on machines where the +open file limit is less than 256. + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/execute_cmd.c 2011-11-21 12:04:47.000000000 -0500 +--- ./execute_cmd.c 2012-04-26 11:09:30.000000000 -0400 +*************** +*** 2206,2210 **** + if (lastpipe_opt && job_control == 0 && asynchronous == 0 && pipe_out == NO_PIPE && prev > 0) + { +! lstdin = move_to_high_fd (0, 0, 255); + if (lstdin > 0) + { +--- 2325,2329 ---- + if (lastpipe_opt && job_control == 0 && asynchronous == 0 && pipe_out == NO_PIPE && prev > 0) + { +! lstdin = move_to_high_fd (0, 1, -1); + if (lstdin > 0) + { +*************** +*** 2252,2256 **** +--- 2371,2377 ---- + } + ++ #if defined (JOB_CONTROL) + discard_unwind_frame ("lastpipe-exec"); ++ #endif + + return (exec_result); + +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- ./patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 25 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 26 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/package/bash/bash-4.2-027.patch b/package/bash/bash-4.2-027.patch new file mode 100644 index 000000000..381ffe124 --- /dev/null +++ b/package/bash/bash-4.2-027.patch @@ -0,0 +1,47 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-027 + +Bug-Reported-by: Mike Frysinger <vapier@gentoo.org> +Bug-Reference-ID: <201204211243.30163.vapier@gentoo.org> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2012-04/msg00134.html + +Bug-Description: + +When the `extglob' shell option is enabled, pattern substitution does not +work correctly in the presence of multibyte characters. + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/subst.c 2012-03-11 17:52:57.000000000 -0400 +--- ./subst.c 2012-04-22 16:19:10.000000000 -0400 +*************** +*** 4167,4171 **** + #if defined (EXTENDED_GLOB) + if (extended_glob) +! simple |= (wpat[1] != L'(' || (wpat[0] != L'*' && wpat[0] != L'?' && wpat[0] != L'+' && wpat[0] != L'!' && wpat[0] != L'@')); /*)*/ + #endif + +--- 4167,4171 ---- + #if defined (EXTENDED_GLOB) + if (extended_glob) +! simple &= (wpat[1] != L'(' || (wpat[0] != L'*' && wpat[0] != L'?' && wpat[0] != L'+' && wpat[0] != L'!' && wpat[0] != L'@')); /*)*/ + #endif + +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- ./patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 26 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 27 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/package/bash/bash-4.2-028.patch b/package/bash/bash-4.2-028.patch new file mode 100644 index 000000000..28dfc71d5 --- /dev/null +++ b/package/bash/bash-4.2-028.patch @@ -0,0 +1,52 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-028 + +Bug-Reported-by: Mark Edgar <medgar123@gmail.com> +Bug-Reference-ID: <CABHMh_3d+ZgO_zaEtYXPwK4P7tC0ghZ4g=Ue_TRpsEMf5YDsqw@mail.gmail.com> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2012-03/msg00109.html + +Bug-Description: + +When using a word expansion for which the right hand side is evaluated, +certain expansions of quoted null strings include spurious ^? characters. + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/subst.c 2012-03-11 17:35:13.000000000 -0400 +--- ./subst.c 2012-03-20 19:30:13.000000000 -0400 +*************** +*** 5810,5813 **** +--- 5810,5823 ---- + if (qdollaratp && ((hasdol && quoted) || l->next)) + *qdollaratp = 1; ++ /* If we have a quoted null result (QUOTED_NULL(temp)) and the word is ++ a quoted null (l->next == 0 && QUOTED_NULL(l->word->word)), the ++ flags indicate it (l->word->flags & W_HASQUOTEDNULL), and the ++ expansion is quoted (quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)) ++ (which is more paranoia than anything else), we need to return the ++ quoted null string and set the flags to indicate it. */ ++ if (l->next == 0 && (quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)) && QUOTED_NULL(temp) && QUOTED_NULL(l->word->word) && (l->word->flags & W_HASQUOTEDNULL)) ++ { ++ w->flags |= W_HASQUOTEDNULL; ++ } + dispose_words (l); + } + +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- ./patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 27 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 28 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/package/bash/bash-4.2-029.patch b/package/bash/bash-4.2-029.patch new file mode 100644 index 000000000..31322f257 --- /dev/null +++ b/package/bash/bash-4.2-029.patch @@ -0,0 +1,524 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-029 + +Bug-Reported-by: "Michael Kalisz" <michael@kalisz.homelinux.net> +Bug-Reference-ID: <50241.78.69.11.112.1298585641.squirrel@kalisz.homelinux.net> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-02/msg00274.html + +Bug-Description: + +Bash-4.2 tries to leave completed directory names as the user typed them, +without expanding them to a full pathname. One effect of this is that +shell variables used in pathnames being completed (e.g., $HOME) are left +unchanged, but the `$' is quoted by readline because it is a special +character to the shell. + +This patch introduces two things: + +1. A new shell option, `direxpand', which, if set, attempts to emulate the + bash-4.1 behavior of expanding words to full pathnames during + completion; +2. A set of heuristics that reduce the number of times special characters + such as `$' are quoted when the directory name is not expanded. + +Patch (apply with `patch -p0'): + +diff -NrC 2 ../bash-4.2-patched/bashline.c ./bashline.c +*** ../bash-4.2-patched/bashline.c 2011-01-16 15:32:47.000000000 -0500 +--- ./bashline.c 2012-05-07 16:27:18.000000000 -0400 +*************** +*** 122,125 **** +--- 122,128 ---- + static int bash_push_line __P((void)); + ++ static rl_icppfunc_t *save_directory_hook __P((void)); ++ static void reset_directory_hook __P((rl_icppfunc_t *)); ++ + static void cleanup_expansion_error __P((void)); + static void maybe_make_readline_line __P((char *)); +*************** +*** 244,251 **** +--- 247,261 ---- + int dircomplete_spelling = 0; + ++ /* Expand directory names during word/filename completion. */ ++ int dircomplete_expand = 0; ++ int dircomplete_expand_relpath = 0; ++ + static char *bash_completer_word_break_characters = " \t\n\"'@><=;|&(:"; + static char *bash_nohostname_word_break_characters = " \t\n\"'><=;|&(:"; + /* )) */ + ++ static const char *default_filename_quote_characters = " \t\n\\\"'@<>=;|&()#$`?*[!:{~"; /*}*/ ++ static char *custom_filename_quote_characters = 0; ++ + static rl_hook_func_t *old_rl_startup_hook = (rl_hook_func_t *)NULL; + +*************** +*** 502,506 **** + /* Tell the completer that we might want to follow symbolic links or + do other expansion on directory names. */ +! rl_directory_rewrite_hook = bash_directory_completion_hook; + + rl_filename_rewrite_hook = bash_filename_rewrite_hook; +--- 512,516 ---- + /* Tell the completer that we might want to follow symbolic links or + do other expansion on directory names. */ +! set_directory_hook (); + + rl_filename_rewrite_hook = bash_filename_rewrite_hook; +*************** +*** 530,534 **** + + /* characters that need to be quoted when appearing in filenames. */ +! rl_filename_quote_characters = " \t\n\\\"'@<>=;|&()#$`?*[!:{~"; /*}*/ + + rl_filename_quoting_function = bash_quote_filename; +--- 540,544 ---- + + /* characters that need to be quoted when appearing in filenames. */ +! rl_filename_quote_characters = default_filename_quote_characters; + + rl_filename_quoting_function = bash_quote_filename; +*************** +*** 565,570 **** + rl_attempted_completion_function = attempt_shell_completion; + rl_completion_entry_function = NULL; +- rl_directory_rewrite_hook = bash_directory_completion_hook; + rl_ignore_some_completions_function = filename_completion_ignore; + } + +--- 575,582 ---- + rl_attempted_completion_function = attempt_shell_completion; + rl_completion_entry_function = NULL; + rl_ignore_some_completions_function = filename_completion_ignore; ++ rl_filename_quote_characters = default_filename_quote_characters; ++ ++ set_directory_hook (); + } + +*************** +*** 1280,1283 **** +--- 1292,1298 ---- + rl_ignore_some_completions_function = filename_completion_ignore; + ++ rl_filename_quote_characters = default_filename_quote_characters; ++ set_directory_hook (); ++ + /* Determine if this could be a command word. It is if it appears at + the start of the line (ignoring preceding whitespace), or if it +*************** +*** 1592,1595 **** +--- 1607,1616 ---- + else + { ++ if (dircomplete_expand && dot_or_dotdot (filename_hint)) ++ { ++ dircomplete_expand = 0; ++ set_directory_hook (); ++ dircomplete_expand = 1; ++ } + mapping_over = 4; + goto inner; +*************** +*** 1792,1795 **** +--- 1813,1819 ---- + inner: + val = rl_filename_completion_function (filename_hint, istate); ++ if (mapping_over == 4 && dircomplete_expand) ++ set_directory_hook (); ++ + istate = 1; + +*************** +*** 2694,2697 **** +--- 2718,2767 ---- + } + ++ /* Functions to save and restore the appropriate directory hook */ ++ /* This is not static so the shopt code can call it */ ++ void ++ set_directory_hook () ++ { ++ if (dircomplete_expand) ++ { ++ rl_directory_completion_hook = bash_directory_completion_hook; ++ rl_directory_rewrite_hook = (rl_icppfunc_t *)0; ++ } ++ else ++ { ++ rl_directory_rewrite_hook = bash_directory_completion_hook; ++ rl_directory_completion_hook = (rl_icppfunc_t *)0; ++ } ++ } ++ ++ static rl_icppfunc_t * ++ save_directory_hook () ++ { ++ rl_icppfunc_t *ret; ++ ++ if (dircomplete_expand) ++ { ++ ret = rl_directory_completion_hook; ++ rl_directory_completion_hook = (rl_icppfunc_t *)NULL; ++ } ++ else ++ { ++ ret = rl_directory_rewrite_hook; ++ rl_directory_rewrite_hook = (rl_icppfunc_t *)NULL; ++ } ++ ++ return ret; ++ } ++ ++ static void ++ restore_directory_hook (hookf) ++ rl_icppfunc_t *hookf; ++ { ++ if (dircomplete_expand) ++ rl_directory_completion_hook = hookf; ++ else ++ rl_directory_rewrite_hook = hookf; ++ } ++ + /* Handle symbolic link references and other directory name + expansions while hacking completion. This should return 1 if it modifies +*************** +*** 2703,2720 **** + { + char *local_dirname, *new_dirname, *t; +! int return_value, should_expand_dirname; + WORD_LIST *wl; + struct stat sb; + +! return_value = should_expand_dirname = 0; + local_dirname = *dirname; + +! if (mbschr (local_dirname, '$')) +! should_expand_dirname = 1; + else + { + t = mbschr (local_dirname, '`'); + if (t && unclosed_pair (local_dirname, strlen (local_dirname), "`") == 0) +! should_expand_dirname = 1; + } + +--- 2773,2801 ---- + { + char *local_dirname, *new_dirname, *t; +! int return_value, should_expand_dirname, nextch, closer; + WORD_LIST *wl; + struct stat sb; + +! return_value = should_expand_dirname = nextch = closer = 0; + local_dirname = *dirname; + +! if (t = mbschr (local_dirname, '$')) +! { +! should_expand_dirname = '$'; +! nextch = t[1]; +! /* Deliberately does not handle the deprecated $[...] arithmetic +! expansion syntax */ +! if (nextch == '(') +! closer = ')'; +! else if (nextch == '{') +! closer = '}'; +! else +! nextch = 0; +! } + else + { + t = mbschr (local_dirname, '`'); + if (t && unclosed_pair (local_dirname, strlen (local_dirname), "`") == 0) +! should_expand_dirname = '`'; + } + +*************** +*** 2740,2743 **** +--- 2821,2841 ---- + dispose_words (wl); + local_dirname = *dirname; ++ /* XXX - change rl_filename_quote_characters here based on ++ should_expand_dirname/nextch/closer. This is the only place ++ custom_filename_quote_characters is modified. */ ++ if (rl_filename_quote_characters && *rl_filename_quote_characters) ++ { ++ int i, j, c; ++ i = strlen (default_filename_quote_characters); ++ custom_filename_quote_characters = xrealloc (custom_filename_quote_characters, i+1); ++ for (i = j = 0; c = default_filename_quote_characters[i]; i++) ++ { ++ if (c == should_expand_dirname || c == nextch || c == closer) ++ continue; ++ custom_filename_quote_characters[j++] = c; ++ } ++ custom_filename_quote_characters[j] = '\0'; ++ rl_filename_quote_characters = custom_filename_quote_characters; ++ } + } + else +*************** +*** 2759,2762 **** +--- 2857,2871 ---- + } + ++ /* no_symbolic_links == 0 -> use (default) logical view of the file system. ++ local_dirname[0] == '.' && local_dirname[1] == '/' means files in the ++ current directory (./). ++ local_dirname[0] == '.' && local_dirname[1] == 0 means relative pathnames ++ in the current directory (e.g., lib/sh). ++ XXX - should we do spelling correction on these? */ ++ ++ /* This is test as it was in bash-4.2: skip relative pathnames in current ++ directory. Change test to ++ (local_dirname[0] != '.' || (local_dirname[1] && local_dirname[1] != '/')) ++ if we want to skip paths beginning with ./ also. */ + if (no_symbolic_links == 0 && (local_dirname[0] != '.' || local_dirname[1])) + { +*************** +*** 2764,2767 **** +--- 2873,2885 ---- + int len1, len2; + ++ /* If we have a relative path ++ (local_dirname[0] != '/' && local_dirname[0] != '.') ++ that is canonical after appending it to the current directory, then ++ temp1 = temp2+'/' ++ That is, ++ strcmp (temp1, temp2) == 0 ++ after adding a slash to temp2 below. It should be safe to not ++ change those. ++ */ + t = get_working_directory ("symlink-hook"); + temp1 = make_absolute (local_dirname, t); +*************** +*** 2798,2802 **** + } + } +! return_value |= STREQ (local_dirname, temp2) == 0; + free (local_dirname); + *dirname = temp2; +--- 2916,2928 ---- + } + } +! +! /* dircomplete_expand_relpath == 0 means we want to leave relative +! pathnames that are unchanged by canonicalization alone. +! *local_dirname != '/' && *local_dirname != '.' == relative pathname +! (consistent with general.c:absolute_pathname()) +! temp1 == temp2 (after appending a slash to temp2) means the pathname +! is not changed by canonicalization as described above. */ +! if (dircomplete_expand_relpath || ((local_dirname[0] != '/' && local_dirname[0] != '.') && STREQ (temp1, temp2) == 0)) +! return_value |= STREQ (local_dirname, temp2) == 0; + free (local_dirname); + *dirname = temp2; +*************** +*** 3003,3012 **** + orig_func = rl_completion_entry_function; + orig_attempt_func = rl_attempted_completion_function; +- orig_dir_func = rl_directory_rewrite_hook; + orig_ignore_func = rl_ignore_some_completions_function; + orig_rl_completer_word_break_characters = rl_completer_word_break_characters; + rl_completion_entry_function = rl_filename_completion_function; + rl_attempted_completion_function = (rl_completion_func_t *)NULL; +- rl_directory_rewrite_hook = (rl_icppfunc_t *)NULL; + rl_ignore_some_completions_function = filename_completion_ignore; + rl_completer_word_break_characters = " \t\n\"\'"; +--- 3129,3139 ---- + orig_func = rl_completion_entry_function; + orig_attempt_func = rl_attempted_completion_function; + orig_ignore_func = rl_ignore_some_completions_function; + orig_rl_completer_word_break_characters = rl_completer_word_break_characters; ++ ++ orig_dir_func = save_directory_hook (); ++ + rl_completion_entry_function = rl_filename_completion_function; + rl_attempted_completion_function = (rl_completion_func_t *)NULL; + rl_ignore_some_completions_function = filename_completion_ignore; + rl_completer_word_break_characters = " \t\n\"\'"; +*************** +*** 3016,3023 **** + rl_completion_entry_function = orig_func; + rl_attempted_completion_function = orig_attempt_func; +- rl_directory_rewrite_hook = orig_dir_func; + rl_ignore_some_completions_function = orig_ignore_func; + rl_completer_word_break_characters = orig_rl_completer_word_break_characters; + + return r; + } +--- 3143,3151 ---- + rl_completion_entry_function = orig_func; + rl_attempted_completion_function = orig_attempt_func; + rl_ignore_some_completions_function = orig_ignore_func; + rl_completer_word_break_characters = orig_rl_completer_word_break_characters; + ++ restore_directory_hook (orig_dir_func); ++ + return r; + } +diff -NrC 2 ../bash-4.2-patched/bashline.h ./bashline.h +*** ../bash-4.2-patched/bashline.h 2009-01-04 14:32:22.000000000 -0500 +--- ./bashline.h 2012-05-07 16:27:18.000000000 -0400 +*************** +*** 34,41 **** +--- 34,46 ---- + extern int bash_re_edit __P((char *)); + ++ extern void bashline_set_event_hook __P((void)); ++ extern void bashline_reset_event_hook __P((void)); ++ + extern int bind_keyseq_to_unix_command __P((char *)); + + extern char **bash_default_completion __P((const char *, int, int, int, int)); + ++ void set_directory_hook __P((void)); ++ + /* Used by programmable completion code. */ + extern char *command_word_completion_function __P((const char *, int)); +diff -NrC 2 ../bash-4.2-patched/builtins/shopt.def ./builtins/shopt.def +*** ../bash-4.2-patched/builtins/shopt.def 2010-07-02 22:42:44.000000000 -0400 +--- ./builtins/shopt.def 2012-05-07 16:27:18.000000000 -0400 +*************** +*** 62,65 **** +--- 62,69 ---- + #include "bashgetopt.h" + ++ #if defined (READLINE) ++ # include "../bashline.h" ++ #endif ++ + #if defined (HISTORY) + # include "../bashhist.h" +*************** +*** 95,99 **** + extern int no_empty_command_completion; + extern int force_fignore; +! extern int dircomplete_spelling; + + extern int enable_hostname_completion __P((int)); +--- 99,103 ---- + extern int no_empty_command_completion; + extern int force_fignore; +! extern int dircomplete_spelling, dircomplete_expand; + + extern int enable_hostname_completion __P((int)); +*************** +*** 122,125 **** +--- 126,133 ---- + #endif + ++ #if defined (READLINE) ++ static int shopt_set_complete_direxpand __P((char *, int)); ++ #endif ++ + static int shopt_login_shell; + static int shopt_compat31; +*************** +*** 151,154 **** +--- 159,163 ---- + { "compat41", &shopt_compat41, set_compatibility_level }, + #if defined (READLINE) ++ { "direxpand", &dircomplete_expand, shopt_set_complete_direxpand }, + { "dirspell", &dircomplete_spelling, (shopt_set_func_t *)NULL }, + #endif +*************** +*** 536,539 **** +--- 545,559 ---- + } + ++ #if defined (READLINE) ++ static int ++ shopt_set_complete_direxpand (option_name, mode) ++ char *option_name; ++ int mode; ++ { ++ set_directory_hook (); ++ return 0; ++ } ++ #endif ++ + #if defined (RESTRICTED_SHELL) + /* Don't allow the value of restricted_shell to be modified. */ +Binary files ../bash-4.2-patched/doc/._bashref.pdf and ./doc/._bashref.pdf differ +diff -NrC 2 ../bash-4.2-patched/doc/bash.1 ./doc/bash.1 +*** ../bash-4.2-patched/doc/bash.1 2011-01-16 15:31:39.000000000 -0500 +--- ./doc/bash.1 2012-05-07 16:27:18.000000000 -0400 +*************** +*** 8949,8952 **** +--- 8949,8962 ---- + The default bash behavior remains as in previous versions. + .TP 8 ++ .B direxpand ++ If set, ++ .B bash ++ replaces directory names with the results of word expansion when performing ++ filename completion. This changes the contents of the readline editing ++ buffer. ++ If not set, ++ .B bash ++ attempts to preserve what the user typed. ++ .TP 8 + .B dirspell + If set, +diff -NrC 2 ../bash-4.2-patched/doc/bashref.texi ./doc/bashref.texi +*** ../bash-4.2-patched/doc/bashref.texi 2011-01-16 15:31:57.000000000 -0500 +--- ./doc/bashref.texi 2012-05-07 16:27:18.000000000 -0400 +*************** +*** 4536,4539 **** +--- 4536,4546 ---- + The default Bash behavior remains as in previous versions. + ++ @item direxpand ++ If set, Bash ++ replaces directory names with the results of word expansion when performing ++ filename completion. This changes the contents of the readline editing ++ buffer. ++ If not set, Bash attempts to preserve what the user typed. ++ + @item dirspell + If set, Bash +diff -NrC 2 ../bash-4.2-patched/tests/shopt.right ./tests/shopt.right +*** ../bash-4.2-patched/tests/shopt.right 2010-07-02 23:36:30.000000000 -0400 +--- ./tests/shopt.right 2012-05-07 16:27:18.000000000 -0400 +*************** +*** 13,16 **** +--- 13,17 ---- + shopt -u compat40 + shopt -u compat41 ++ shopt -u direxpand + shopt -u dirspell + shopt -u dotglob +*************** +*** 69,72 **** +--- 70,74 ---- + shopt -u compat40 + shopt -u compat41 ++ shopt -u direxpand + shopt -u dirspell + shopt -u dotglob +*************** +*** 102,105 **** +--- 104,108 ---- + compat40 off + compat41 off ++ direxpand off + dirspell off + dotglob off +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- ./patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 28 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 29 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/package/bash/bash-4.2-030.patch b/package/bash/bash-4.2-030.patch new file mode 100644 index 000000000..7c6fef02b --- /dev/null +++ b/package/bash/bash-4.2-030.patch @@ -0,0 +1,178 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-030 + +Bug-Reported-by: Roman Rakus <rrakus@redhat.com> +Bug-Reference-ID: <4D7DD91E.7040808@redhat.com> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-03/msg00126.html + +Bug-Description: + +When attempting to glob strings in a multibyte locale, and those strings +contain invalid multibyte characters that cause mbsnrtowcs to return 0, +the globbing code loops infinitely. + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/lib/glob/xmbsrtowcs.c 2010-05-30 18:36:27.000000000 -0400 +--- ./lib/glob/xmbsrtowcs.c 2011-03-22 16:06:47.000000000 -0400 +*************** +*** 36,39 **** +--- 36,41 ---- + #if HANDLE_MULTIBYTE + ++ #define WSBUF_INC 32 ++ + #ifndef FREE + # define FREE(x) do { if (x) free (x); } while (0) +*************** +*** 149,153 **** + size_t wcnum; /* Number of wide characters in WSBUF */ + mbstate_t state; /* Conversion State */ +! size_t wcslength; /* Number of wide characters produced by the conversion. */ + const char *end_or_backslash; + size_t nms; /* Number of multibyte characters to convert at one time. */ +--- 151,155 ---- + size_t wcnum; /* Number of wide characters in WSBUF */ + mbstate_t state; /* Conversion State */ +! size_t n, wcslength; /* Number of wide characters produced by the conversion. */ + const char *end_or_backslash; + size_t nms; /* Number of multibyte characters to convert at one time. */ +*************** +*** 172,176 **** + tmp_p = p; + tmp_state = state; +! wcslength = mbsnrtowcs(NULL, &tmp_p, nms, 0, &tmp_state); + + /* Conversion failed. */ +--- 174,189 ---- + tmp_p = p; + tmp_state = state; +! +! if (nms == 0 && *p == '\\') /* special initial case */ +! nms = wcslength = 1; +! else +! wcslength = mbsnrtowcs (NULL, &tmp_p, nms, 0, &tmp_state); +! +! if (wcslength == 0) +! { +! tmp_p = p; /* will need below */ +! tmp_state = state; +! wcslength = 1; /* take a single byte */ +! } + + /* Conversion failed. */ +*************** +*** 187,191 **** + wchar_t *wstmp; + +! wsbuf_size = wcnum+wcslength+1; /* 1 for the L'\0' or the potential L'\\' */ + + wstmp = (wchar_t *) realloc (wsbuf, wsbuf_size * sizeof (wchar_t)); +--- 200,205 ---- + wchar_t *wstmp; + +! while (wsbuf_size < wcnum+wcslength+1) /* 1 for the L'\0' or the potential L'\\' */ +! wsbuf_size += WSBUF_INC; + + wstmp = (wchar_t *) realloc (wsbuf, wsbuf_size * sizeof (wchar_t)); +*************** +*** 200,207 **** + + /* Perform the conversion. This is assumed to return 'wcslength'. +! * It may set 'p' to NULL. */ +! mbsnrtowcs(wsbuf+wcnum, &p, nms, wsbuf_size-wcnum, &state); + +! wcnum += wcslength; + + if (mbsinit (&state) && (p != NULL) && (*p == '\\')) +--- 214,229 ---- + + /* Perform the conversion. This is assumed to return 'wcslength'. +! It may set 'p' to NULL. */ +! n = mbsnrtowcs(wsbuf+wcnum, &p, nms, wsbuf_size-wcnum, &state); + +! /* Compensate for taking single byte on wcs conversion failure above. */ +! if (wcslength == 1 && (n == 0 || n == (size_t)-1)) +! { +! state = tmp_state; +! p = tmp_p; +! wsbuf[wcnum++] = *p++; +! } +! else +! wcnum += wcslength; + + if (mbsinit (&state) && (p != NULL) && (*p == '\\')) +*************** +*** 231,236 **** + of DESTP and INDICESP are NULL. */ + +- #define WSBUF_INC 32 +- + size_t + xdupmbstowcs (destp, indicesp, src) +--- 253,256 ---- +*** ../bash-4.2-patched/lib/glob/glob.c 2009-11-14 18:39:30.000000000 -0500 +--- ./lib/glob/glob.c 2012-07-07 12:09:56.000000000 -0400 +*************** +*** 201,206 **** + size_t pat_n, dn_n; + + pat_n = xdupmbstowcs (&pat_wc, NULL, pat); +! dn_n = xdupmbstowcs (&dn_wc, NULL, dname); + + ret = 0; +--- 201,209 ---- + size_t pat_n, dn_n; + ++ pat_wc = dn_wc = (wchar_t *)NULL; ++ + pat_n = xdupmbstowcs (&pat_wc, NULL, pat); +! if (pat_n != (size_t)-1) +! dn_n = xdupmbstowcs (&dn_wc, NULL, dname); + + ret = 0; +*************** +*** 222,225 **** +--- 225,230 ---- + ret = 1; + } ++ else ++ ret = skipname (pat, dname, flags); + + FREE (pat_wc); +*************** +*** 267,272 **** + n = xdupmbstowcs (&wpathname, NULL, pathname); + if (n == (size_t) -1) +! /* Something wrong. */ +! return; + orig_wpathname = wpathname; + +--- 272,280 ---- + n = xdupmbstowcs (&wpathname, NULL, pathname); + if (n == (size_t) -1) +! { +! /* Something wrong. Fall back to single-byte */ +! udequote_pathname (pathname); +! return; +! } + orig_wpathname = wpathname; + +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- ./patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 29 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 30 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/package/bash/bash-4.2-031.patch b/package/bash/bash-4.2-031.patch new file mode 100644 index 000000000..d0077f3ef --- /dev/null +++ b/package/bash/bash-4.2-031.patch @@ -0,0 +1,80 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-031 + +Bug-Reported-by: Max Horn <max@quendi.de> +Bug-Reference-ID: <20CC5C60-07C3-4E41-9817-741E48D407C5@quendi.de> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-readline/2012-06/msg00005.html + +Bug-Description: + +A change between bash-4.1 and bash-4.2 to prevent the readline input hook +from being called too frequently had the side effect of causing delays +when reading pasted input on systems such as Mac OS X. This patch fixes +those delays while retaining the bash-4.2 behavior. + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/lib/readline/input.c 2010-05-30 18:33:01.000000000 -0400 +--- ./lib/readline/input.c 2012-06-25 21:08:42.000000000 -0400 +*************** +*** 410,414 **** + rl_read_key () + { +! int c; + + rl_key_sequence_length++; +--- 412,416 ---- + rl_read_key () + { +! int c, r; + + rl_key_sequence_length++; +*************** +*** 430,441 **** + while (rl_event_hook) + { +! if (rl_gather_tyi () < 0) /* XXX - EIO */ + { + rl_done = 1; + return ('\n'); + } + RL_CHECK_SIGNALS (); +- if (rl_get_char (&c) != 0) +- break; + if (rl_done) /* XXX - experimental */ + return ('\n'); +--- 432,447 ---- + while (rl_event_hook) + { +! if (rl_get_char (&c) != 0) +! break; +! +! if ((r = rl_gather_tyi ()) < 0) /* XXX - EIO */ + { + rl_done = 1; + return ('\n'); + } ++ else if (r == 1) /* read something */ ++ continue; ++ + RL_CHECK_SIGNALS (); + if (rl_done) /* XXX - experimental */ + return ('\n'); +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- ./patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 30 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 31 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/package/bash/bash-4.2-032.patch b/package/bash/bash-4.2-032.patch new file mode 100644 index 000000000..c3f38a6c8 --- /dev/null +++ b/package/bash/bash-4.2-032.patch @@ -0,0 +1,75 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-032 + +Bug-Reported-by: Ruediger Kuhlmann <RKuhlmann@orga-systems.com> +Bug-Reference-ID: <OFDE975207.0C3622E5-ONC12579F3.00361A06-C12579F3.00365E39@orga-systems.com> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2012-05/msg00010.html + +Bug-Description: + +Bash-4.2 has problems with DEL characters in the expanded value of variables +used in the same quoted string as variables that expand to nothing. + +Patch (apply with `patch -p0'): + +*** ../bash-20120427/subst.c 2012-04-22 16:19:10.000000000 -0400 +--- ./subst.c 2012-05-07 16:06:35.000000000 -0400 +*************** +*** 8152,8155 **** +--- 8152,8163 ---- + dispose_word_desc (tword); + ++ /* Kill quoted nulls; we will add them back at the end of ++ expand_word_internal if nothing else in the string */ ++ if (had_quoted_null && temp && QUOTED_NULL (temp)) ++ { ++ FREE (temp); ++ temp = (char *)NULL; ++ } ++ + goto add_string; + break; +*************** +*** 8556,8560 **** + if (quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)) + tword->flags |= W_QUOTED; +! if (had_quoted_null) + tword->flags |= W_HASQUOTEDNULL; + list = make_word_list (tword, (WORD_LIST *)NULL); +--- 8564,8568 ---- + if (quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)) + tword->flags |= W_QUOTED; +! if (had_quoted_null && QUOTED_NULL (istring)) + tword->flags |= W_HASQUOTEDNULL; + list = make_word_list (tword, (WORD_LIST *)NULL); +*************** +*** 8587,8591 **** + if (word->flags & W_NOEXPAND) + tword->flags |= W_NOEXPAND; +! if (had_quoted_null) + tword->flags |= W_HASQUOTEDNULL; /* XXX */ + list = make_word_list (tword, (WORD_LIST *)NULL); +--- 8595,8599 ---- + if (word->flags & W_NOEXPAND) + tword->flags |= W_NOEXPAND; +! if (had_quoted_null && QUOTED_NULL (istring)) + tword->flags |= W_HASQUOTEDNULL; /* XXX */ + list = make_word_list (tword, (WORD_LIST *)NULL); +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- ./patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 31 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 32 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/package/bash/bash-4.2-033.patch b/package/bash/bash-4.2-033.patch new file mode 100644 index 000000000..9eb19540f --- /dev/null +++ b/package/bash/bash-4.2-033.patch @@ -0,0 +1,57 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-033 + +Bug-Reported-by: David Leverton <levertond@googlemail.com> +Bug-Reference-ID: <4FCCE737.1060603@googlemail.com> +Bug-Reference-URL: + +Bug-Description: + +Bash uses a static buffer when expanding the /dev/fd prefix for the test +and conditional commands, among other uses, when it should use a dynamic +buffer to avoid buffer overflow. + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/lib/sh/eaccess.c 2011-01-08 20:50:10.000000000 -0500 +--- ./lib/sh/eaccess.c 2012-06-04 21:06:43.000000000 -0400 +*************** +*** 83,86 **** +--- 83,88 ---- + struct stat *finfo; + { ++ static char *pbuf = 0; ++ + if (*path == '\0') + { +*************** +*** 107,111 **** + On most systems, with the notable exception of linux, this is + effectively a no-op. */ +! char pbuf[32]; + strcpy (pbuf, DEV_FD_PREFIX); + strcat (pbuf, path + 8); +--- 109,113 ---- + On most systems, with the notable exception of linux, this is + effectively a no-op. */ +! pbuf = xrealloc (pbuf, sizeof (DEV_FD_PREFIX) + strlen (path + 8)); + strcpy (pbuf, DEV_FD_PREFIX); + strcat (pbuf, path + 8); +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- ./patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 32 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 33 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/package/bash/bash-4.2-034.patch b/package/bash/bash-4.2-034.patch new file mode 100644 index 000000000..7eb2ebaf1 --- /dev/null +++ b/package/bash/bash-4.2-034.patch @@ -0,0 +1,46 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-034 + +Bug-Reported-by: "Davide Brini" <dave_br@gmx.com> +Bug-Reference-ID: <20120604164154.69781EC04B@imaps.oficinas.atrapalo.com> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2012-06/msg00030.html + +Bug-Description: + +In bash-4.2, the history code would inappropriately add a semicolon to +multi-line compound array assignments when adding them to the history. + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/parse.y 2011-11-21 18:03:36.000000000 -0500 +--- ./parse.y 2012-06-07 12:48:47.000000000 -0400 +*************** +*** 4900,4905 **** +--- 4916,4924 ---- + return (current_command_line_count == 2 ? "\n" : ""); + } + ++ if (parser_state & PST_COMPASSIGN) ++ return (" "); ++ + /* First, handle some special cases. */ + /*(*/ + /* If we just read `()', assume it's a function definition, and don't +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- ./patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 33 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 34 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/package/bash/bash-4.2-035.patch b/package/bash/bash-4.2-035.patch new file mode 100644 index 000000000..b04364e20 --- /dev/null +++ b/package/bash/bash-4.2-035.patch @@ -0,0 +1,66 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-035 + +Bug-Reported-by: Dan Douglas <ormaaj@gmail.com> +Bug-Reference-ID: <2766482.Ksm3GrSoYi@smorgbox> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2012-06/msg00071.html + +Bug-Description: + +When given a number of lines to read, `mapfile -n lines' reads one too many. + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/builtins/mapfile.def 2010-05-29 22:09:47.000000000 -0400 +--- ./builtins/mapfile.def 2012-06-20 09:48:33.000000000 -0400 +*************** +*** 196,206 **** + interrupt_immediately++; + for (array_index = origin, line_count = 1; +! zgetline (fd, &line, &line_length, unbuffered_read) != -1; +! array_index++, line_count++) + { +- /* Have we exceeded # of lines to store? */ +- if (line_count_goal != 0 && line_count > line_count_goal) +- break; +- + /* Remove trailing newlines? */ + if (flags & MAPF_CHOP) +--- 196,202 ---- + interrupt_immediately++; + for (array_index = origin, line_count = 1; +! zgetline (fd, &line, &line_length, unbuffered_read) != -1; +! array_index++) + { + /* Remove trailing newlines? */ + if (flags & MAPF_CHOP) +*************** +*** 218,221 **** +--- 214,222 ---- + + bind_array_element (entry, array_index, line, 0); ++ ++ /* Have we exceeded # of lines to store? */ ++ line_count++; ++ if (line_count_goal != 0 && line_count > line_count_goal) ++ break; + } + +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- ./patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 34 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 35 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/package/bash/bash-4.2-036.patch b/package/bash/bash-4.2-036.patch new file mode 100644 index 000000000..1f62dc03c --- /dev/null +++ b/package/bash/bash-4.2-036.patch @@ -0,0 +1,92 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-036 + +Bug-Reported-by: gregrwm <backuppc-users@whitleymott.net> +Bug-Reference-ID: <CAD+dB9B4JG+qUwZBQUwiQmVt0j6NDn=DDTxr9R+nkA8DL4KLJA@mail.gmail.com> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2012-05/msg00108.html + +Bug-Description: + +Bash-4.2 produces incorrect word splitting results when expanding +double-quoted $@ in the same string as and adjacent to other variable +expansions. The $@ should be split, the other expansions should not. + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/subst.c 2012-05-02 12:02:33.000000000 -0400 +--- ./subst.c 2012-07-08 21:19:32.000000000 -0400 +*************** +*** 7923,7927 **** + /* State flags */ + int had_quoted_null; +! int has_dollar_at; + int tflag; + int pflags; /* flags passed to param_expand */ +--- 7923,7927 ---- + /* State flags */ + int had_quoted_null; +! int has_dollar_at, temp_has_dollar_at; + int tflag; + int pflags; /* flags passed to param_expand */ +*************** +*** 8128,8138 **** + *expanded_something = 1; + +! has_dollar_at = 0; + pflags = (word->flags & W_NOCOMSUB) ? PF_NOCOMSUB : 0; + if (word->flags & W_NOSPLIT2) + pflags |= PF_NOSPLIT2; + tword = param_expand (string, &sindex, quoted, expanded_something, +! &has_dollar_at, "ed_dollar_at, + &had_quoted_null, pflags); + + if (tword == &expand_wdesc_error || tword == &expand_wdesc_fatal) +--- 8128,8139 ---- + *expanded_something = 1; + +! temp_has_dollar_at = 0; + pflags = (word->flags & W_NOCOMSUB) ? PF_NOCOMSUB : 0; + if (word->flags & W_NOSPLIT2) + pflags |= PF_NOSPLIT2; + tword = param_expand (string, &sindex, quoted, expanded_something, +! &temp_has_dollar_at, "ed_dollar_at, + &had_quoted_null, pflags); ++ has_dollar_at += temp_has_dollar_at; + + if (tword == &expand_wdesc_error || tword == &expand_wdesc_fatal) +*************** +*** 8275,8281 **** + temp = (char *)NULL; + +! has_dollar_at = 0; + /* Need to get W_HASQUOTEDNULL flag through this function. */ +! list = expand_word_internal (tword, Q_DOUBLE_QUOTES, 0, &has_dollar_at, (int *)NULL); + + if (list == &expand_word_error || list == &expand_word_fatal) +--- 8276,8283 ---- + temp = (char *)NULL; + +! temp_has_dollar_at = 0; /* XXX */ + /* Need to get W_HASQUOTEDNULL flag through this function. */ +! list = expand_word_internal (tword, Q_DOUBLE_QUOTES, 0, &temp_has_dollar_at, (int *)NULL); +! has_dollar_at += temp_has_dollar_at; + + if (list == &expand_word_error || list == &expand_word_fatal) +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- ./patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 35 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 36 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/package/bash/bash-4.2-037.patch b/package/bash/bash-4.2-037.patch new file mode 100644 index 000000000..f5f1dc45a --- /dev/null +++ b/package/bash/bash-4.2-037.patch @@ -0,0 +1,112 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-037 + +Bug-Reported-by: Jakub Filak +Bug-Reference-ID: +Bug-Reference-URL: https://bugzilla.redhat.com/show_bug.cgi?id=813289 + +Bug-Description: + +Attempting to redo (using `.') the vi editing mode `cc', `dd', or `yy' +commands leads to an infinite loop. + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/lib/readline/vi_mode.c 2011-02-25 11:17:02.000000000 -0500 +--- ./lib/readline/vi_mode.c 2012-06-02 12:24:47.000000000 -0400 +*************** +*** 1235,1243 **** + r = rl_domove_motion_callback (_rl_vimvcxt); + } +! else if (vi_redoing) + { + _rl_vimvcxt->motion = _rl_vi_last_motion; + r = rl_domove_motion_callback (_rl_vimvcxt); + } + #if defined (READLINE_CALLBACKS) + else if (RL_ISSTATE (RL_STATE_CALLBACK)) +--- 1297,1313 ---- + r = rl_domove_motion_callback (_rl_vimvcxt); + } +! else if (vi_redoing && _rl_vi_last_motion != 'd') /* `dd' is special */ + { + _rl_vimvcxt->motion = _rl_vi_last_motion; + r = rl_domove_motion_callback (_rl_vimvcxt); + } ++ else if (vi_redoing) /* handle redoing `dd' here */ ++ { ++ _rl_vimvcxt->motion = _rl_vi_last_motion; ++ rl_mark = rl_end; ++ rl_beg_of_line (1, key); ++ RL_UNSETSTATE (RL_STATE_VIMOTION); ++ r = vidomove_dispatch (_rl_vimvcxt); ++ } + #if defined (READLINE_CALLBACKS) + else if (RL_ISSTATE (RL_STATE_CALLBACK)) +*************** +*** 1317,1325 **** + r = rl_domove_motion_callback (_rl_vimvcxt); + } +! else if (vi_redoing) + { + _rl_vimvcxt->motion = _rl_vi_last_motion; + r = rl_domove_motion_callback (_rl_vimvcxt); + } + #if defined (READLINE_CALLBACKS) + else if (RL_ISSTATE (RL_STATE_CALLBACK)) +--- 1387,1403 ---- + r = rl_domove_motion_callback (_rl_vimvcxt); + } +! else if (vi_redoing && _rl_vi_last_motion != 'c') /* `cc' is special */ + { + _rl_vimvcxt->motion = _rl_vi_last_motion; + r = rl_domove_motion_callback (_rl_vimvcxt); + } ++ else if (vi_redoing) /* handle redoing `cc' here */ ++ { ++ _rl_vimvcxt->motion = _rl_vi_last_motion; ++ rl_mark = rl_end; ++ rl_beg_of_line (1, key); ++ RL_UNSETSTATE (RL_STATE_VIMOTION); ++ r = vidomove_dispatch (_rl_vimvcxt); ++ } + #if defined (READLINE_CALLBACKS) + else if (RL_ISSTATE (RL_STATE_CALLBACK)) +*************** +*** 1378,1381 **** +--- 1456,1472 ---- + r = rl_domove_motion_callback (_rl_vimvcxt); + } ++ else if (vi_redoing && _rl_vi_last_motion != 'y') /* `yy' is special */ ++ { ++ _rl_vimvcxt->motion = _rl_vi_last_motion; ++ r = rl_domove_motion_callback (_rl_vimvcxt); ++ } ++ else if (vi_redoing) /* handle redoing `yy' here */ ++ { ++ _rl_vimvcxt->motion = _rl_vi_last_motion; ++ rl_mark = rl_end; ++ rl_beg_of_line (1, key); ++ RL_UNSETSTATE (RL_STATE_VIMOTION); ++ r = vidomove_dispatch (_rl_vimvcxt); ++ } + #if defined (READLINE_CALLBACKS) + else if (RL_ISSTATE (RL_STATE_CALLBACK)) +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- ./patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 36 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 37 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/package/beecrypt/beecrypt.mk b/package/beecrypt/beecrypt.mk index f3a8c0303..d165aee99 100644 --- a/package/beecrypt/beecrypt.mk +++ b/package/beecrypt/beecrypt.mk @@ -4,7 +4,7 @@ # ############################################################# BEECRYPT_VERSION = 4.2.1 -BEECRYPT_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/beecrypt +BEECRYPT_SITE = http://downloads.sourceforge.net/project/beecrypt/beecrypt/$(BEECRYPT_VERSION) BEECRYPT_AUTORECONF = YES BEECRYPT_INSTALL_STAGING = YES diff --git a/package/blackbox/blackbox.mk b/package/blackbox/blackbox.mk index a6d4b4542..43cd747de 100644 --- a/package/blackbox/blackbox.mk +++ b/package/blackbox/blackbox.mk @@ -6,7 +6,7 @@ BLACKBOX_VERSION:=0.70.1 BLACKBOX_SOURCE:=blackbox-$(BLACKBOX_VERSION).tar.bz2 -BLACKBOX_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/blackboxwm/ +BLACKBOX_SITE:=http://downloads.sourceforge.net/project/blackboxwm/blackboxwm/Blackbox%20$(BLACKBOX_VERSION) BLACKBOX_CONF_OPT:=--x-includes=$(STAGING_DIR)/usr/include/X11 \ --x-libraries=$(STAGING_DIR)/usr/lib diff --git a/package/boost/boost.mk b/package/boost/boost.mk index 3b08bb92f..64856bc6d 100644 --- a/package/boost/boost.mk +++ b/package/boost/boost.mk @@ -7,7 +7,7 @@ BOOST_VERSION = 1.49.0 BOOST_FILE_VERSION = $(subst .,_,$(BOOST_VERSION)) BOOST_SOURCE = boost_$(BOOST_FILE_VERSION).tar.bz2 -BOOST_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/boost +BOOST_SITE = http://downloads.sourceforge.net/project/boost/boost/$(BOOST_VERSION) BOOST_INSTALL_STAGING = YES TARGET_CC_VERSION = $(shell $(TARGET_CC) -dumpversion) diff --git a/package/bootutils/bootutils.mk b/package/bootutils/bootutils.mk index a37654b43..3f943a7b3 100644 --- a/package/bootutils/bootutils.mk +++ b/package/bootutils/bootutils.mk @@ -4,7 +4,7 @@ # ############################################################# BOOTUTILS_VERSION = 1.0.0 -BOOTUTILS_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/bootutils +BOOTUTILS_SITE = http://downloads.sourceforge.net/project/bootutils/Stable/v$(BOOTUTILS_VERSION) BOOTUTILS_CONF_OPT = --prefix=/ --exec-prefix=/ diff --git a/package/bridge-utils/bridge-utils.mk b/package/bridge-utils/bridge-utils.mk index 5f846ffe5..685b65794 100644 --- a/package/bridge-utils/bridge-utils.mk +++ b/package/bridge-utils/bridge-utils.mk @@ -6,7 +6,7 @@ BRIDGE_UTILS_VERSION = 1.5 BRIDGE_UTILS_SOURCE = bridge-utils-$(BRIDGE_UTILS_VERSION).tar.gz -BRIDGE_UTILS_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/bridge +BRIDGE_UTILS_SITE = http://downloads.sourceforge.net/project/bridge/bridge BRIDGE_UTILS_AUTORECONF = YES BRIDGE_UTILS_CONF_OPT = --with-linux-headers=$(LINUX_HEADERS_DIR) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 17ee50a8f..33f863364 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -12,6 +12,9 @@ BUSYBOX_VERSION = $(call qstrip,$(BR2_BUSYBOX_VERSION)) BUSYBOX_SITE = http://www.busybox.net/downloads endif BUSYBOX_SOURCE = busybox-$(BUSYBOX_VERSION).tar.bz2 +BUSYBOX_LICENSE = GPLv2 +BUSYBOX_LICENSE_FILES = LICENSE + BUSYBOX_BUILD_CONFIG = $(BUSYBOX_DIR)/.config # Allows the build system to tweak CFLAGS BUSYBOX_MAKE_ENV = $(TARGET_MAKE_ENV) CFLAGS="$(TARGET_CFLAGS) -I$(LINUX_HEADERS_DIR)/include" diff --git a/package/bwm-ng/bwm-ng.mk b/package/bwm-ng/bwm-ng.mk index 55ac2f13f..7ec7d7f47 100644 --- a/package/bwm-ng/bwm-ng.mk +++ b/package/bwm-ng/bwm-ng.mk @@ -5,8 +5,10 @@ ############################################################# BWM_NG_VERSION = 0.6 -BWM_NG_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/bwmng/bwmng/$(BWM_NG_VERSION)/ +BWM_NG_SITE = http://downloads.sourceforge.net/project/bwmng/bwmng/$(BWM_NG_VERSION)/ BWM_NG_CONF_OPT = --with-procnetdev --with-diskstats +BWM_NG_LICENSE = GPLv2 +BWM_NG_LICENSE_FILES = COPYING ifeq ($(BR2_PACKAGE_NCURSES),y) BWM_NG_CONF_OPT += --with-ncurses diff --git a/package/cgilua/cgilua.mk b/package/cgilua/cgilua.mk index 038fee15d..48ee00551 100644 --- a/package/cgilua/cgilua.mk +++ b/package/cgilua/cgilua.mk @@ -7,6 +7,7 @@ CGILUA_VERSION = 5.1.4 CGILUA_SITE = http://github.com/downloads/keplerproject/cgilua CGILUA_DEPENDENCIES = luafilesystem +CGILUA_LICENSE = MIT define CGILUA_INSTALL_TARGET_CMDS $(MAKE) -C $(@D) install LUA_DIR="$(TARGET_DIR)/usr/share/lua" diff --git a/package/cjson/cjson.mk b/package/cjson/cjson.mk index a9b0bcff8..79b4c3118 100644 --- a/package/cjson/cjson.mk +++ b/package/cjson/cjson.mk @@ -5,8 +5,9 @@ ############################################################# CJSON_VERSION = undefined CJSON_SOURCE = cJSONFiles.zip -CJSON_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/cjson/ +CJSON_SITE = http://downloads.sourceforge.net/project/cjson/ CJSON_INSTALL_STAGING = YES +CJSON_LICENSE = MIT define CJSON_EXTRACT_CMDS unzip -d $(@D) $(DL_DIR)/$(CJSON_SOURCE) diff --git a/package/copas/copas.mk b/package/copas/copas.mk index cd9ab7a37..c84a6cc0b 100644 --- a/package/copas/copas.mk +++ b/package/copas/copas.mk @@ -7,6 +7,7 @@ COPAS_VERSION = 1.1.6 COPAS_SITE = http://github.com/downloads/keplerproject/copas COPAS_DEPENDENCIES = lua coxpcall luasocket +COPAS_LICENSE = MIT define COPAS_INSTALL_TARGET_CMDS $(INSTALL) -m 0644 -D $(@D)/src/copas/copas.lua \ diff --git a/package/coxpcall/coxpcall.mk b/package/coxpcall/coxpcall.mk index 94fc16c3b..e7fb76dc5 100644 --- a/package/coxpcall/coxpcall.mk +++ b/package/coxpcall/coxpcall.mk @@ -7,6 +7,7 @@ COXPCALL_VERSION = 1.13.0 COXPCALL_SITE = http://luaforge.net/frs/download.php/3406 COXPCALL_DEPENDENCIES = lua +COXPCALL_LICENSE = MIT define COXPCALL_INSTALL_TARGET_CMDS $(INSTALL) -m 0644 -D $(@D)/src/coxpcall.lua \ diff --git a/package/cramfs/cramfs.mk b/package/cramfs/cramfs.mk index 71ed8cb35..519a17903 100644 --- a/package/cramfs/cramfs.mk +++ b/package/cramfs/cramfs.mk @@ -6,7 +6,7 @@ CRAMFS_VERSION=1.1 CRAMFS_SOURCE=cramfs-$(CRAMFS_VERSION).tar.gz -CRAMFS_SITE=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/cramfs +CRAMFS_SITE=http://downloads.sourceforge.net/project/cramfs/cramfs/$(CRAMFS_VERSION) CRAMFS_DEPENDENCIES = zlib diff --git a/package/crosstool-ng/crosstool-ng.mk b/package/crosstool-ng/crosstool-ng.mk index 379d400e6..5bc65e1d6 100644 --- a/package/crosstool-ng/crosstool-ng.mk +++ b/package/crosstool-ng/crosstool-ng.mk @@ -1,4 +1,4 @@ -CROSSTOOL_NG_VERSION = 1.15.3 +CROSSTOOL_NG_VERSION = 1.16.0 CROSSTOOL_NG_SOURCE = crosstool-ng-$(CROSSTOOL_NG_VERSION).tar.bz2 CROSSTOOL_NG_SITE = http://crosstool-ng.org/download/crosstool-ng/ CROSSTOOL_NG_INSTALL_TARGET = NO diff --git a/package/cups/Config.in b/package/cups/Config.in index 0176423a1..dc1c2ed70 100644 --- a/package/cups/Config.in +++ b/package/cups/Config.in @@ -1,5 +1,7 @@ config BR2_PACKAGE_CUPS bool "cups" + # needs fork() + depends on BR2_USE_MMU help The Common Unix Printing System diff --git a/package/distcc/Config.in b/package/distcc/Config.in index 0b518c6ac..2c30a2142 100644 --- a/package/distcc/Config.in +++ b/package/distcc/Config.in @@ -1,5 +1,7 @@ config BR2_PACKAGE_DISTCC bool "distcc" + # needs fork() + depends on BR2_USE_MMU help Distributed compiler client and server. Allows you to distribute compilation of C code across several machines diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk index 16085210d..e0746406c 100644 --- a/package/e2fsprogs/e2fsprogs.mk +++ b/package/e2fsprogs/e2fsprogs.mk @@ -5,7 +5,7 @@ ############################################################# E2FSPROGS_VERSION = 1.42.5 -E2FSPROGS_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/e2fsprogs +E2FSPROGS_SITE = http://downloads.sourceforge.net/project/e2fsprogs/e2fsprogs/$(E2FSPROGS_VERSION) E2FSPROGS_CONF_OPT = \ --disable-tls \ diff --git a/package/ebtables/ebtables.mk b/package/ebtables/ebtables.mk index 7676e9abd..3f667baf5 100644 --- a/package/ebtables/ebtables.mk +++ b/package/ebtables/ebtables.mk @@ -6,7 +6,7 @@ EBTABLES_VERSION = 2.0.10-4 EBTABLES_SOURCE = ebtables-v$(EBTABLES_VERSION).tar.gz -EBTABLES_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/ebtables +EBTABLES_SITE = http://downloads.sourceforge.net/project/ebtables/ebtables/ebtables-$(EBTABLES_VERSION) EBTABLES_LICENSE = GPLv2 EBTABLES_LICENSE_FILES = COPYING diff --git a/package/expat/expat.mk b/package/expat/expat.mk index 663abcdfd..5b19b4c76 100644 --- a/package/expat/expat.mk +++ b/package/expat/expat.mk @@ -5,11 +5,13 @@ ############################################################# EXPAT_VERSION = 2.1.0 -EXPAT_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/expat/expat/$(EXPAT_VERSION) +EXPAT_SITE = http://downloads.sourceforge.net/project/expat/expat/$(EXPAT_VERSION) EXPAT_INSTALL_STAGING = YES EXPAT_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) installlib EXPAT_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) installlib EXPAT_DEPENDENCIES = host-pkg-config +EXPAT_LICENSE = MIT +EXPAT_LICENSE_FILES = COPYING $(eval $(autotools-package)) $(eval $(host-autotools-package)) diff --git a/package/ezxml/ezxml.mk b/package/ezxml/ezxml.mk index 57c3ffbc8..89e19574d 100644 --- a/package/ezxml/ezxml.mk +++ b/package/ezxml/ezxml.mk @@ -5,7 +5,7 @@ ############################################################# EZXML_VERSION = 0.8.6 EZXML_SOURCE = ezxml-$(EZXML_VERSION).tar.gz -EZXML_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/ezxml/ +EZXML_SITE = http://downloads.sourceforge.net/project/ezxml/ezXML/ezXML%20$(EZXML_VERSION) EZXML_INSTALL_STAGING=YES define EZXML_BUILD_CMDS diff --git a/package/fbdump/fbdump.mk b/package/fbdump/fbdump.mk index 176d25426..3ca10bf1e 100644 --- a/package/fbdump/fbdump.mk +++ b/package/fbdump/fbdump.mk @@ -6,6 +6,7 @@ FBDUMP_VERSION:=0.4.2 FBDUMP_SOURCE:=fbdump-$(FBDUMP_VERSION).tar.gz FBDUMP_SITE:=http://www.rcdrummond.net/fbdump +FBDUMP_LICENSE = GPLv2 +FBDUMP_LICENSE_FILES = COPYING $(eval $(autotools-package)) - diff --git a/package/fluxbox/fluxbox.mk b/package/fluxbox/fluxbox.mk index 6d7ff957e..15136c933 100644 --- a/package/fluxbox/fluxbox.mk +++ b/package/fluxbox/fluxbox.mk @@ -6,7 +6,7 @@ FLUXBOX_VERSION = 1.3.2 FLUXBOX_SOURCE = fluxbox-$(FLUXBOX_VERSION).tar.bz2 -FLUXBOX_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/fluxbox/ +FLUXBOX_SITE = http://downloads.sourceforge.net/project/fluxbox/fluxbox/$(FLUXBOX_VERSION) FLUXBOX_CONF_OPT = --x-includes=$(STAGING_DIR)/usr/include/X11 \ --x-libraries=$(STAGING_DIR)/usr/lib diff --git a/package/fontconfig/fontconfig.mk b/package/fontconfig/fontconfig.mk index 843b34f03..98456561f 100644 --- a/package/fontconfig/fontconfig.mk +++ b/package/fontconfig/fontconfig.mk @@ -6,6 +6,8 @@ FONTCONFIG_VERSION = 2.6.0 FONTCONFIG_SOURCE = fontconfig-$(FONTCONFIG_VERSION).tar.gz FONTCONFIG_SITE = http://fontconfig.org/release +FONTCONFIG_LICENSE = fontconfig license +FONTCONFIG_LICENSE_FILES = COPYING FONTCONFIG_AUTORECONF = YES FONTCONFIG_INSTALL_STAGING = YES # This package does not like using the target cflags for some reason. diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk index 448efe0b3..796c37c3f 100644 --- a/package/freetype/freetype.mk +++ b/package/freetype/freetype.mk @@ -5,8 +5,8 @@ ############################################################# FREETYPE_VERSION = 2.4.10 -FREETYPE_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/freetype FREETYPE_SOURCE = freetype-$(FREETYPE_VERSION).tar.bz2 +FREETYPE_SITE = http://downloads.sourceforge.net/project/freetype/freetype2/$(FREETYPE_VERSION) FREETYPE_INSTALL_STAGING = YES FREETYPE_MAKE_OPT = CCexe="$(HOSTCC)" FREETYPE_DEPENDENCIES = host-pkg-config \ diff --git a/package/games/prboom/prboom.mk b/package/games/prboom/prboom.mk index 4dbfd1d2d..1f5c3ddc6 100644 --- a/package/games/prboom/prboom.mk +++ b/package/games/prboom/prboom.mk @@ -4,6 +4,7 @@ # ############################################################# PRBOOM_VERSION = 2.5.0 +PRBOOM_SITE = http://downloads.sourceforge.net/project/prboom/prboom%20stable/$(PRBOOM_VERSION) PRBOOM_CONF_ENV = ac_cv_type_uid_t=yes PRBOOM_DEPENDENCIES = sdl sdl_net sdl_mixer diff --git a/package/gdisk/gdisk.mk b/package/gdisk/gdisk.mk index d7c8bec9b..f93343647 100644 --- a/package/gdisk/gdisk.mk +++ b/package/gdisk/gdisk.mk @@ -5,7 +5,7 @@ ############################################################# GDISK_VERSION = 0.6.14 -GDISK_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/gptfdisk +GDISK_SITE = http://downloads.sourceforge.net/project/gptfdisk/gptfdisk/$(GDISK_VERSION) GDISK_SOURCE = gdisk-$(GDISK_VERSION).tgz GDISK_TARGETS_$(BR2_PACKAGE_GDISK_GDISK) += gdisk diff --git a/package/genext2fs/genext2fs.mk b/package/genext2fs/genext2fs.mk index 9757d9fa0..647281115 100644 --- a/package/genext2fs/genext2fs.mk +++ b/package/genext2fs/genext2fs.mk @@ -6,7 +6,7 @@ GENEXT2FS_VERSION=1.4.1 GENEXT2FS_SOURCE=genext2fs-$(GENEXT2FS_VERSION).tar.gz -GENEXT2FS_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/genext2fs +GENEXT2FS_SITE:=http://downloads.sourceforge.net/project/genext2fs/genext2fs/$(GENEXT2FS_VERSION) $(eval $(autotools-package)) $(eval $(host-autotools-package)) diff --git a/package/genromfs/genromfs.mk b/package/genromfs/genromfs.mk index c1cd6086a..3f5d44e2f 100644 --- a/package/genromfs/genromfs.mk +++ b/package/genromfs/genromfs.mk @@ -6,7 +6,7 @@ GENROMFS_VERSION=0.5.2 GENROMFS_SOURCE=genromfs-$(GENROMFS_VERSION).tar.gz -GENROMFS_SITE=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/romfs +GENROMFS_SITE=http://downloads.sourceforge.net/project/romfs/genromfs/$(GENROMFS_VERSION) define GENROMFS_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ @@ -28,4 +28,4 @@ define HOST_GENROMFS_INSTALL_CMDS endef $(eval $(generic-package)) -$(eval $(host-generic-package))
\ No newline at end of file +$(eval $(host-generic-package)) diff --git a/package/gpsd/gpsd-05-fix-leapsecond-script-python2.5.patch b/package/gpsd/gpsd-05-fix-leapsecond-script-python2.5.patch new file mode 100644 index 000000000..8866b81d3 --- /dev/null +++ b/package/gpsd/gpsd-05-fix-leapsecond-script-python2.5.patch @@ -0,0 +1,71 @@ +the json module was added with python2.6, so a regular python 2.5 +machine will lack this module and won't probably have the simplejson +module imported by the leapsecond.py script. + +Since the only function used is the isotime function, which is +self-contained and quite trivial, only copy this function into the +leapsecond script to avoid the import of the gps.misc module, which +needs simplejson. + +Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> +--- + leapsecond.py | 27 ++++++++++++++++++++++++--- + 1 file changed, 24 insertions(+), 3 deletions(-) + +diff --git a/leapsecond.py b/leapsecond.py +index 2059f6c..cdacdb4 100755 +--- a/leapsecond.py ++++ b/leapsecond.py +@@ -24,7 +24,6 @@ + # BSD terms apply: see the file COPYING in the distribution root for details. + # + import os, urllib, re, random, time, calendar, math, sys +-import gps.misc + + __locations = [ + ( +@@ -48,6 +47,28 @@ __locations = [ + # between times it might change, in seconds since Unix epoch GMT. + __cachepath = "/var/run/leapsecond" + ++def isotime(s): ++ "Convert timestamps in ISO8661 format to and from Unix time." ++ if type(s) == type(1): ++ return time.strftime("%Y-%m-%dT%H:%M:%S", time.gmtime(s)) ++ elif type(s) == type(1.0): ++ date = int(s) ++ msec = s - date ++ date = time.strftime("%Y-%m-%dT%H:%M:%S", time.gmtime(s)) ++ return date + "." + repr(msec)[3:] ++ elif type(s) == type("") or type(s) == type(u""): ++ if s[-1] == "Z": ++ s = s[:-1] ++ if "." in s: ++ (date, msec) = s.split(".") ++ else: ++ date = s ++ msec = "0" ++ # Note: no leap-second correction! ++ return calendar.timegm(time.strptime(date, "%Y-%m-%dT%H:%M:%S")) + float("0." + msec) ++ else: ++ raise TypeError ++ + def retrieve(): + "Retrieve current leap-second from Web sources." + random.shuffle(__locations) # To spread the load +@@ -261,10 +282,10 @@ if __name__ == '__main__': + print unix_to_rfc822(float(val)) + raise SystemExit, 0 + elif (switch == '-I'): # Compute Unix time from ISO8601 date +- print gps.misc.isotime(val) ++ print isotime(val) + raise SystemExit, 0 + elif (switch == '-O'): # Compute ISO8601 date from Unix time +- print gps.misc.isotime(float(val)) ++ print isotime(float(val)) + raise SystemExit, 0 + + print "Current leap second:", retrieve() +-- +1.7.9.5 + diff --git a/package/gtkperf/gtkperf.mk b/package/gtkperf/gtkperf.mk index 7b63dcbcc..b2ad94391 100644 --- a/package/gtkperf/gtkperf.mk +++ b/package/gtkperf/gtkperf.mk @@ -5,7 +5,7 @@ ############################################################# GTKPERF_VERSION:=0.40 GTKPERF_SOURCE:=gtkperf_$(GTKPERF_VERSION).tar.gz -GTKPERF_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/gtkperf +GTKPERF_SITE:=http://downloads.sourceforge.net/project/gtkperf/gtkperf/$(GTKPERF_VERSION) GTKPERF_DEPENDENCIES = libgtk2 $(eval $(autotools-package)) diff --git a/package/haserl/haserl.mk b/package/haserl/haserl.mk index 14226c5a7..589b3e7a7 100644 --- a/package/haserl/haserl.mk +++ b/package/haserl/haserl.mk @@ -5,7 +5,7 @@ ############################################################# HASERL_VERSION = $(call qstrip,$(BR2_PACKAGE_HASERL_VERSION)) -HASERL_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/haserl/ +HASERL_SITE = http://downloads.sourceforge.net/project/haserl/haserl-devel/$(HASERL_VERSION) ifeq ($(BR2_PACKAGE_HASERL_WITH_LUA),y) HASERL_CONF_OPT += --with-lua=$(STAGING_DIR) \ diff --git a/package/hdparm/hdparm.mk b/package/hdparm/hdparm.mk index c524c6273..5c00e79d7 100644 --- a/package/hdparm/hdparm.mk +++ b/package/hdparm/hdparm.mk @@ -5,7 +5,7 @@ ############################################################# HDPARM_VERSION = 9.39 -HDPARM_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/hdparm +HDPARM_SITE = http://downloads.sourceforge.net/project/hdparm/hdparm define HDPARM_BUILD_CMDS $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) \ diff --git a/package/htop/htop.mk b/package/htop/htop.mk index 9fa5bec54..e7061bbf7 100644 --- a/package/htop/htop.mk +++ b/package/htop/htop.mk @@ -5,7 +5,7 @@ ############################################################# HTOP_VERSION = 1.0.1 -HTOP_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/htop/htop/$(HTOP_VERSION) +HTOP_SITE = http://downloads.sourceforge.net/project/htop/htop/$(HTOP_VERSION) HTOP_DEPENDENCIES = ncurses HTOP_AUTORECONF = YES HTOP_CONF_OPT = --disable-unicode diff --git a/package/ifplugd/ifplugd.mk b/package/ifplugd/ifplugd.mk index 3c581a6b1..d031a9751 100644 --- a/package/ifplugd/ifplugd.mk +++ b/package/ifplugd/ifplugd.mk @@ -6,10 +6,13 @@ IFPLUGD_VERSION = 0.28 IFPLUGD_SITE = http://0pointer.de/lennart/projects/ifplugd +IFPLUGD_LICENSE = GPLv2 +IFPLUGD_LICENSE_FILES = LICENSE IFPLUGD_AUTORECONF = YES + # install-strip unconditionally overwrites $(TARGET_DIR)/etc/ifplugd/ifplugd.* IFPLUGD_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install-exec -IFPLUGD_CONF_OPT = --disable-lynx +IFPLUGD_CONF_OPT = --disable-lynx --with-initdir=/etc/init.d/ IFPLUGD_DEPENDENCIES = libdaemon # Prefer big ifplugd diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk index ede129a02..6d34ad388 100644 --- a/package/imagemagick/imagemagick.mk +++ b/package/imagemagick/imagemagick.mk @@ -4,8 +4,8 @@ # ############################################################# -IMAGEMAGICK_MAJOR = 6.7.6 -IMAGEMAGICK_VERSION = $(IMAGEMAGICK_MAJOR)-9 +IMAGEMAGICK_MAJOR = 6.7.8 +IMAGEMAGICK_VERSION = $(IMAGEMAGICK_MAJOR)-8 IMAGEMAGICK_SOURCE = ImageMagick-$(IMAGEMAGICK_VERSION).tar.bz2 # The official ImageMagick site only keeps the latest versions # available, which is annoying. Use an alternate site that keeps all diff --git a/package/imlib2/imlib2.mk b/package/imlib2/imlib2.mk index c94d96d03..3adcd9900 100644 --- a/package/imlib2/imlib2.mk +++ b/package/imlib2/imlib2.mk @@ -5,7 +5,7 @@ ############################################################## IMLIB2_VERSION = 1.4.5 IMLIB2_SOURCE = imlib2-$(IMLIB2_VERSION).tar.bz2 -IMLIB2_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/project/enlightenment/imlib2-src/$(IMLIB2_VERSION)/ +IMLIB2_SITE = http://downloads.sourceforge.net/project/enlightenment/imlib2-src/$(IMLIB2_VERSION)/ IMLIB2_INSTALL_STAGING = YES IMLIB2_DEPENDENCIES = host-pkg-config freetype IMLIB2_CONF_OPT = --with-freetype-config=$(STAGING_DIR)/usr/bin/freetype-config diff --git a/package/inotify-tools/inotify-tools.mk b/package/inotify-tools/inotify-tools.mk index 52a170140..deb8a8c0b 100644 --- a/package/inotify-tools/inotify-tools.mk +++ b/package/inotify-tools/inotify-tools.mk @@ -5,4 +5,7 @@ ############################################################# INOTIFY_TOOLS_VERSION = 3.14 INOTIFY_TOOLS_SITE = http://github.com/downloads/rvoicilas/inotify-tools/ +INOTIFY_TOOLS_LICENSE = GPL +INOTIFY_TOOLS_LICENSE_FILES = COPYING + $(eval $(autotools-package)) diff --git a/package/input-event-daemon/input-event-daemon.mk b/package/input-event-daemon/input-event-daemon.mk index 06830561e..f99bfbe8c 100644 --- a/package/input-event-daemon/input-event-daemon.mk +++ b/package/input-event-daemon/input-event-daemon.mk @@ -6,6 +6,8 @@ INPUT_EVENT_DAEMON_VERSION = v0.1.3 INPUT_EVENT_DAEMON_SITE = git://github.com/gandro/input-event-daemon.git +INPUT_EVENT_DAEMON_LICENSE = input-event-daemon license +INPUT_EVENT_DAEMON_LICENSE_FILES = README define INPUT_EVENT_DAEMON_BUILD_CMDS touch $(@D)/input-event-table.h diff --git a/package/iperf/iperf.mk b/package/iperf/iperf.mk index fdf1d473a..b20080fce 100644 --- a/package/iperf/iperf.mk +++ b/package/iperf/iperf.mk @@ -5,7 +5,7 @@ ############################################################# IPERF_VERSION = 2.0.5 IPERF_SOURCE = iperf-$(IPERF_VERSION).tar.gz -IPERF_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/iperf +IPERF_SITE = http://downloads.sourceforge.net/project/iperf IPERF_CONF_ENV = \ ac_cv_func_malloc_0_nonnull=yes \ diff --git a/package/irda-utils/irda-utils.mk b/package/irda-utils/irda-utils.mk index b2b84d5c2..34612c2c2 100644 --- a/package/irda-utils/irda-utils.mk +++ b/package/irda-utils/irda-utils.mk @@ -6,7 +6,7 @@ IRDA_UTILS_VERSION = 0.9.18 IRDA_UTILS_SOURCE = irda-utils-$(IRDA_UTILS_VERSION).tar.gz -IRDA_UTILS_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/irda +IRDA_UTILS_SITE = http://downloads.sourceforge.net/project/irda/irda-utils/$(IRDA_UTILS_VERSION) IRDA_UTILS_CFLAGS = $(TARGET_CFLAGS) -I. ifeq ($(BR2_USE_MMU),) diff --git a/package/lcdproc/lcdproc.mk b/package/lcdproc/lcdproc.mk index 94848e660..e4944daeb 100644 --- a/package/lcdproc/lcdproc.mk +++ b/package/lcdproc/lcdproc.mk @@ -5,7 +5,7 @@ ############################################################# LCDPROC_VERSION = 0.5.5 LCDPROC_SOURCE = lcdproc-$(LCDPROC_VERSION).tar.gz -LCDPROC_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/lcdproc/lcdproc/$(LCDPROC_VERSION) +LCDPROC_SITE = http://downloads.sourceforge.net/project/lcdproc/lcdproc/$(LCDPROC_VERSION) LCDPROC_LICENSE = GPLv2+ LCDPROC_LICENSE_FILES = COPYING diff --git a/package/libargtable2/libargtable2.mk b/package/libargtable2/libargtable2.mk index d5172d2de..900a8b506 100644 --- a/package/libargtable2/libargtable2.mk +++ b/package/libargtable2/libargtable2.mk @@ -6,7 +6,7 @@ LIBARGTABLE2_VERSION = 13 LIBARGTABLE2_SOURCE = argtable2-$(LIBARGTABLE2_VERSION).tar.gz -LIBARGTABLE2_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/argtable/ +LIBARGTABLE2_SITE = http://downloads.sourceforge.net/project/argtable/argtable/argtable-2.13 LIBARGTABLE2_INSTALL_STAGING = YES LIBARGTABLE2_CONF_OPT= --disable-example \ diff --git a/package/libcdaudio/libcdaudio.mk b/package/libcdaudio/libcdaudio.mk index 86b59a37d..203a8aa57 100644 --- a/package/libcdaudio/libcdaudio.mk +++ b/package/libcdaudio/libcdaudio.mk @@ -6,7 +6,7 @@ LIBCDAUDIO_VERSION = 0.99.12p2 LIBCDAUDIO_SOURCE = libcdaudio-$(LIBCDAUDIO_VERSION).tar.gz -LIBCDAUDIO_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/libcdaudio/libcdaudio/$(LIBCDAUDIO_VERSION)/ +LIBCDAUDIO_SITE = http://downloads.sourceforge.net/project/libcdaudio/libcdaudio/$(LIBCDAUDIO_VERSION)/ LIBCDAUDIO_AUTORECONF = YES LIBCDAUDIO_LIBTOOL_PATCH = YES LIBCDAUDIO_INSTALL_STAGING = YES diff --git a/package/libcgi/libcgi.mk b/package/libcgi/libcgi.mk index 549d0f205..286a8cd3b 100644 --- a/package/libcgi/libcgi.mk +++ b/package/libcgi/libcgi.mk @@ -5,7 +5,7 @@ ############################################################# LIBCGI_VERSION = 1.0 -LIBCGI_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/libcgi +LIBCGI_SITE = http://downloads.sourceforge.net/project/libcgi/libcgi/$(LIBCGI_VERSION) LIBCGI_INSTALL_STAGING = YES # use cross CC/AR rather than host LIBCGI_MAKE_ENV = CC="$(TARGET_CC) $(TARGET_CFLAGS)" AR="$(TARGET_AR)" diff --git a/package/libcgicc/libcgicc.mk b/package/libcgicc/libcgicc.mk index 98b8e5f51..80e921368 100644 --- a/package/libcgicc/libcgicc.mk +++ b/package/libcgicc/libcgicc.mk @@ -6,6 +6,7 @@ LIBCGICC_VERSION=3.2.9 LIBCGICC_SITE=$(BR2_GNU_MIRROR)/cgicc LIBCGICC_SOURCE=cgicc-$(LIBCGICC_VERSION).tar.gz +LIBCGICC_LICENSE=LGPLv3+ LIBCGICC_INSTALL_STAGING=YES LIBCGICC_AUTORECONF=YES diff --git a/package/libcue/libcue.mk b/package/libcue/libcue.mk index 4ef114594..cd19f4a39 100644 --- a/package/libcue/libcue.mk +++ b/package/libcue/libcue.mk @@ -5,7 +5,7 @@ ################################################################################ LIBCUE_VERSION = 1.4.0 -LIBCUE_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/libcue +LIBCUE_SITE = http://downloads.sourceforge.net/project/libcue/libcue/$(LIBCUE_VERSION) LIBCUE_SOURCE = libcue-$(LIBCUE_VERSION).tar.bz2 LIBCUE_DEPENDENCIES = flex LIBCUE_INSTALL_STAGING = YES diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index d6882fd45..090bb4c40 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -7,6 +7,8 @@ LIBCURL_VERSION = 7.25.0 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.bz2 LIBCURL_SITE = http://curl.haxx.se/download +LIBCURL_LICENSE = ICS +LIBCURL_LICENSE_FILES = COPYING LIBCURL_INSTALL_STAGING = YES LIBCURL_CONF_OPT = --disable-verbose --disable-manual --enable-hidden-symbols diff --git a/package/libdaemon/libdaemon.mk b/package/libdaemon/libdaemon.mk index 1bdc1e27b..214402aed 100644 --- a/package/libdaemon/libdaemon.mk +++ b/package/libdaemon/libdaemon.mk @@ -6,6 +6,8 @@ LIBDAEMON_VERSION = 0.14 LIBDAEMON_SITE = http://0pointer.de/lennart/projects/libdaemon +LIBDAEMON_LICENSE = LGPLv2.1+ +LIBDAEMON_LICENSE_FILES = LICENSE LIBDAEMON_INSTALL_STAGING = YES LIBDAEMON_CONF_ENV = ac_cv_func_setpgrp_void=no LIBDAEMON_CONF_OPT = --disable-lynx diff --git a/package/libdmtx/libdmtx.mk b/package/libdmtx/libdmtx.mk index 800b4fffe..7cea168dd 100644 --- a/package/libdmtx/libdmtx.mk +++ b/package/libdmtx/libdmtx.mk @@ -6,7 +6,7 @@ LIBDMTX_VERSION = 0.7.4 LIBDMTX_SOURCE = libdmtx-$(LIBDMTX_VERSION).tar.gz -LIBDMTX_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/libdmtx +LIBDMTX_SITE = http://downloads.sourceforge.net/project/libdmtx/libdmtx/$(LIBDMTX_VERSION) LIBDMTX_INSTALL_STAGING = YES $(eval $(autotools-package)) diff --git a/package/libdnet/libdnet.mk b/package/libdnet/libdnet.mk index e622dd468..03955a784 100644 --- a/package/libdnet/libdnet.mk +++ b/package/libdnet/libdnet.mk @@ -6,7 +6,9 @@ LIBDNET_VERSION = 1.11 LIBDNET_SOURCE = libdnet-$(LIBDNET_VERSION).tar.gz -LIBDNET_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/libdnet/ +LIBDNET_SITE = http://downloads.sourceforge.net/project/libdnet/libdnet/libdnet-$(LIBDNET_VERSION) +LIBDNET_LICENSE = BSD-3c +LIBDNET_LICENSE_FILES = LICENSE LIBDNET_INSTALL_STAGING = YES LIBDNET_AUTORECONF = YES LIBDNET_CONF_OPT = \ diff --git a/package/libexif/libexif.mk b/package/libexif/libexif.mk index a54694c5d..f7af18a8f 100644 --- a/package/libexif/libexif.mk +++ b/package/libexif/libexif.mk @@ -6,7 +6,7 @@ LIBEXIF_VERSION = 0.6.21 LIBEXIF_SOURCE = libexif-$(LIBEXIF_VERSION).tar.bz2 -LIBEXIF_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/libexif/libexif/$(LIBEXIF_VERSION) +LIBEXIF_SITE = http://downloads.sourceforge.net/project/libexif/libexif/$(LIBEXIF_VERSION) LIBEXIF_INSTALL_STAGING = YES LIBEXIF_CONF_OPT = --disable-docs LIBEXIF_DEPENDENCIES = host-pkg-config diff --git a/package/libfcgi/libfcgi.mk b/package/libfcgi/libfcgi.mk index 1aa2c5a41..a4d18a409 100644 --- a/package/libfcgi/libfcgi.mk +++ b/package/libfcgi/libfcgi.mk @@ -6,6 +6,8 @@ LIBFCGI_VERSION = 2.4.0 LIBFCGI_SOURCE = fcgi-$(LIBFCGI_VERSION).tar.gz LIBFCGI_SITE = http://www.fastcgi.com/dist +LIBFCGI_LICENSE = fcgi license +LIBFCGI_LICENSE_FILES = LICENSE.TERMS LIBFCGI_INSTALL_STAGING = YES LIBFCGI_AUTORECONF = YES diff --git a/package/libfuse/libfuse.mk b/package/libfuse/libfuse.mk index 8be345677..c8c01303d 100644 --- a/package/libfuse/libfuse.mk +++ b/package/libfuse/libfuse.mk @@ -6,7 +6,7 @@ LIBFUSE_VERSION = 2.9.1 LIBFUSE_SOURCE = fuse-$(LIBFUSE_VERSION).tar.gz -LIBFUSE_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/fuse/fuse-2.X/$(LIBFUSE_VERSION) +LIBFUSE_SITE = http://downloads.sourceforge.net/project/fuse/fuse-2.X/$(LIBFUSE_VERSION) LIBFUSE_LICENSE = GPLv2 LGPLv2.1 LIBFUSE_LICENSE_FILES = COPYING COPYING.LIB diff --git a/package/libglib2/libglib2-make-codegen-python2-python3-compliant.patch b/package/libglib2/libglib2-make-codegen-python2-python3-compliant.patch new file mode 100644 index 000000000..b4838270b --- /dev/null +++ b/package/libglib2/libglib2-make-codegen-python2-python3-compliant.patch @@ -0,0 +1,192 @@ +Fetch from http://git.gnome.org/browse/glib/patch/?id=03611f7c0670ea14eedbc121972aed7ce60bb9ee + +This patch is already included upstream, from the glib-2.32.4 release. + +Signed-off-by: Samuel Martin <s.martin49@gmail.com> +--- +From 03611f7c0670ea14eedbc121972aed7ce60bb9ee Mon Sep 17 00:00:00 2001 +From: Simon Feltman <s.feltman@gmail.com> +Date: Thu, 14 Jun 2012 06:20:17 +0000 +Subject: Updated codegen to work with python3. + +Most changes were just replacing usage of "has_key" with "in". +Also updated the sorting function which was simplified and +changed to a "key" function instead of "cmp" (which is no longer +supported in python3. Verified everything builds with +python 2.7 and 3. + +https://bugzilla.gnome.org/show_bug.cgi?id=678066 +--- +diff --git a/gio/gdbus-2.0/codegen/codegen.py b/gio/gdbus-2.0/codegen/codegen.py +index 41ea8fa..bca3490 100644 +--- a/gio/gdbus-2.0/codegen/codegen.py ++++ b/gio/gdbus-2.0/codegen/codegen.py +@@ -304,11 +304,8 @@ class CodeGenerator: + # + # See https://bugzilla.gnome.org/show_bug.cgi?id=647577#c5 + # for discussion +- keys = function_pointers.keys() +- if len(keys) > 0: +- keys.sort(cmp=utils.my_version_cmp) +- for key in keys: +- self.h.write('%s'%function_pointers[key]) ++ for key in sorted(function_pointers.keys(), key=utils.version_cmp_key): ++ self.h.write('%s'%function_pointers[key]) + + self.h.write('};\n') + self.h.write('\n') +@@ -1022,11 +1019,9 @@ class CodeGenerator: + value = '@get_%s: '%(p.name_lower) + value += 'Getter for the #%s:%s property.'%(i.camel_name, p.name_hyphen) + doc_bits[key] = value +- keys = doc_bits.keys() +- if len(keys) > 0: +- keys.sort(cmp=utils.my_version_cmp) +- for key in keys: +- self.c.write(' * %s\n'%doc_bits[key]) ++ for key in sorted(doc_bits.keys(), key=utils.version_cmp_key): ++ self.c.write(' * %s\n'%doc_bits[key]) ++ + self.c.write(self.docbook_gen.expand( + ' *\n' + ' * Virtual table for the D-Bus interface #%s.\n' +diff --git a/gio/gdbus-2.0/codegen/codegen_docbook.py b/gio/gdbus-2.0/codegen/codegen_docbook.py +index 4ceef57..00581f1 100644 +--- a/gio/gdbus-2.0/codegen/codegen_docbook.py ++++ b/gio/gdbus-2.0/codegen/codegen_docbook.py +@@ -259,14 +259,12 @@ class DocbookCodeGenerator: + self.expand_member_dict[key] = value + # Make sure to expand the keys in reverse order so e.g. #org.foo.Iface:MediaCompat + # is evaluated before #org.foo.Iface:Media ... +- self.expand_member_dict_keys = self.expand_member_dict.keys() +- self.expand_member_dict_keys.sort(reverse=True) +- self.expand_iface_dict_keys = self.expand_iface_dict.keys() +- self.expand_iface_dict_keys.sort(reverse=True) ++ self.expand_member_dict_keys = sorted(self.expand_member_dict.keys(), reverse=True) ++ self.expand_iface_dict_keys = sorted(self.expand_iface_dict.keys(), reverse=True) + + def generate(self): + for i in self.ifaces: +- self.out = file('%s-%s.xml'%(self.docbook, i.name), 'w') ++ self.out = open('%s-%s.xml'%(self.docbook, i.name), 'w') + self.out.write(''%()) + self.out.write('<?xml version="1.0" encoding="utf-8"?>\n'%()) + self.out.write('<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"\n'%()) +diff --git a/gio/gdbus-2.0/codegen/codegen_main.py b/gio/gdbus-2.0/codegen/codegen_main.py +index 76c838c..735cc1f 100755 +--- a/gio/gdbus-2.0/codegen/codegen_main.py ++++ b/gio/gdbus-2.0/codegen/codegen_main.py +@@ -184,8 +184,8 @@ def codegen_main(): + + c_code = opts.generate_c_code + if c_code: +- h = file(c_code + '.h', 'w') +- c = file(c_code + '.c', 'w') ++ h = open(c_code + '.h', 'w') ++ c = open(c_code + '.c', 'w') + gen = codegen.CodeGenerator(all_ifaces, + opts.c_namespace, + opts.interface_prefix, +diff --git a/gio/gdbus-2.0/codegen/parser.py b/gio/gdbus-2.0/codegen/parser.py +index 5fabd44..7b9d216 100644 +--- a/gio/gdbus-2.0/codegen/parser.py ++++ b/gio/gdbus-2.0/codegen/parser.py +@@ -152,12 +152,12 @@ class DBusXMLParser: + self.state = DBusXMLParser.STATE_IGNORED + + # assign docs, if any +- if attrs.has_key('name') and self.doc_comment_last_symbol == attrs['name']: ++ if 'name' in attrs and self.doc_comment_last_symbol == attrs['name']: + self._cur_object.doc_string = self.doc_comment_body +- if self.doc_comment_params.has_key('short_description'): ++ if 'short_description' in self.doc_comment_params: + short_description = self.doc_comment_params['short_description'] + self._cur_object.doc_string_brief = short_description +- if self.doc_comment_params.has_key('since'): ++ if 'since' in self.doc_comment_params: + self._cur_object.since = self.doc_comment_params['since'] + + elif self.state == DBusXMLParser.STATE_INTERFACE: +@@ -185,16 +185,16 @@ class DBusXMLParser: + self.state = DBusXMLParser.STATE_IGNORED + + # assign docs, if any +- if attrs.has_key('name') and self.doc_comment_last_symbol == attrs['name']: ++ if 'name' in attrs and self.doc_comment_last_symbol == attrs['name']: + self._cur_object.doc_string = self.doc_comment_body +- if self.doc_comment_params.has_key('since'): ++ if 'since' in self.doc_comment_params: + self._cur_object.since = self.doc_comment_params['since'] + + elif self.state == DBusXMLParser.STATE_METHOD: + if name == DBusXMLParser.STATE_ARG: + self.state = DBusXMLParser.STATE_ARG + arg_name = None +- if attrs.has_key('name'): ++ if 'name' in attrs: + arg_name = attrs['name'] + arg = dbustypes.Arg(arg_name, attrs['type']) + direction = attrs['direction'] +@@ -215,18 +215,18 @@ class DBusXMLParser: + + # assign docs, if any + if self.doc_comment_last_symbol == old_cur_object.name: +- if attrs.has_key('name') and self.doc_comment_params.has_key(attrs['name']): ++ if 'name' in attrs and attrs['name'] in self.doc_comment_params: + doc_string = self.doc_comment_params[attrs['name']] + if doc_string != None: + self._cur_object.doc_string = doc_string +- if self.doc_comment_params.has_key('since'): ++ if 'since' in self.doc_comment_params: + self._cur_object.since = self.doc_comment_params['since'] + + elif self.state == DBusXMLParser.STATE_SIGNAL: + if name == DBusXMLParser.STATE_ARG: + self.state = DBusXMLParser.STATE_ARG + arg_name = None +- if attrs.has_key('name'): ++ if 'name' in attrs: + arg_name = attrs['name'] + arg = dbustypes.Arg(arg_name, attrs['type']) + self._cur_object.args.append(arg) +@@ -241,11 +241,11 @@ class DBusXMLParser: + + # assign docs, if any + if self.doc_comment_last_symbol == old_cur_object.name: +- if attrs.has_key('name') and self.doc_comment_params.has_key(attrs['name']): ++ if 'name' in attrs and attrs['name'] in self.doc_comment_params: + doc_string = self.doc_comment_params[attrs['name']] + if doc_string != None: + self._cur_object.doc_string = doc_string +- if self.doc_comment_params.has_key('since'): ++ if 'since' in self.doc_comment_params: + self._cur_object.since = self.doc_comment_params['since'] + + elif self.state == DBusXMLParser.STATE_PROPERTY: +diff --git a/gio/gdbus-2.0/codegen/utils.py b/gio/gdbus-2.0/codegen/utils.py +index 94bd05c..239b64e 100644 +--- a/gio/gdbus-2.0/codegen/utils.py ++++ b/gio/gdbus-2.0/codegen/utils.py +@@ -97,15 +97,8 @@ def lookup_brief_docs(annotations): + else: + return s + +-# I'm sure this could be a lot more elegant if I was +-# more fluent in python... +-def my_version_cmp(a, b): +- if len(a[0]) > 0 and len(b[0]) > 0: +- va = distutils.version.LooseVersion(a[0]) +- vb = distutils.version.LooseVersion(b[0]) +- ret = va.__cmp__(vb) +- else: +- ret = cmp(a[0], b[0]) +- if ret != 0: +- return ret +- return cmp(a[1], b[1]) ++def version_cmp_key(key): ++ # If the 'since' version is empty put a 0 in its place as this will ++ # allow LooseVersion to work and will always compare lower. ++ v = key[0] if key[0] else '0' ++ return (distutils.version.LooseVersion(v), key[1]) +-- +cgit v0.9.0.2 diff --git a/package/libgpg-error/libgpg-error.mk b/package/libgpg-error/libgpg-error.mk index 96cbbd6ac..288165bad 100644 --- a/package/libgpg-error/libgpg-error.mk +++ b/package/libgpg-error/libgpg-error.mk @@ -6,6 +6,8 @@ LIBGPG_ERROR_VERSION = 1.10 LIBGPG_ERROR_SITE = ftp://ftp.gnupg.org/gcrypt/libgpg-error +LIBGPG_ERROR_LICENSE = LGPLv2.1+ +LIBGPG_ERROR_LICENSE_FILES = COPYING.LIB LIBGPG_ERROR_INSTALL_STAGING = YES $(eval $(autotools-package)) diff --git a/package/libical/libical.mk b/package/libical/libical.mk index 7c5c881f8..e95a70204 100644 --- a/package/libical/libical.mk +++ b/package/libical/libical.mk @@ -5,7 +5,7 @@ ############################################################# LIBICAL_VERSION = 0.48 -LIBICAL_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/freeassociation/libical/libical-$(LIBICAL_VERSION) +LIBICAL_SITE = http://downloads.sourceforge.net/project/freeassociation/libical/libical-$(LIBICAL_VERSION) LIBICAL_INSTALL_STAGING = YES $(eval $(autotools-package)) diff --git a/package/libid3tag/libid3tag.mk b/package/libid3tag/libid3tag.mk index 20579d608..1e78fcadd 100644 --- a/package/libid3tag/libid3tag.mk +++ b/package/libid3tag/libid3tag.mk @@ -6,7 +6,7 @@ LIBID3TAG_VERSION:=0.15.1b LIBID3TAG_SOURCE:=libid3tag-$(LIBID3TAG_VERSION).tar.gz -LIBID3TAG_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/mad +LIBID3TAG_SITE:=http://downloads.sourceforge.net/project/mad/libid3tag/$(LIBID3TAG_VERSION) LIBID3TAG_INSTALL_STAGING=YES LIBID3TAG_DEPENDENCIES=zlib LIBID3TAG_LIBTOOL_PATCH=NO diff --git a/package/libmad/libmad.mk b/package/libmad/libmad.mk index 71e9c3483..d9ce0aed8 100644 --- a/package/libmad/libmad.mk +++ b/package/libmad/libmad.mk @@ -5,7 +5,7 @@ ############################################################# LIBMAD_VERSION = 0.15.1b -LIBMAD_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/mad/ +LIBMAD_SITE = http://downloads.sourceforge.net/project/mad/libmad/$(LIBMAD_VERSION) LIBMAD_INSTALL_STAGING = YES LIBMAD_LIBTOOL_PATCH = NO diff --git a/package/libmms/libmms.mk b/package/libmms/libmms.mk index 10583033b..bc66f5363 100644 --- a/package/libmms/libmms.mk +++ b/package/libmms/libmms.mk @@ -5,7 +5,7 @@ ############################################################# LIBMMS_VERSION = 0.6.2 LIBMMS_SOURCE = libmms-$(LIBMMS_VERSION).tar.gz -LIBMMS_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/libmms +LIBMMS_SITE = http://downloads.sourceforge.net/project/libmms/libmms/$(LIBMMS_VERSION) LIBMMS_INSTALL_STAGING = YES diff --git a/package/libpcap/libpcap.mk b/package/libpcap/libpcap.mk index 1d1fbc158..04766eacd 100644 --- a/package/libpcap/libpcap.mk +++ b/package/libpcap/libpcap.mk @@ -6,7 +6,10 @@ LIBPCAP_VERSION = 1.3.0 LIBPCAP_SITE = http://www.tcpdump.org/release +LIBPCAP_LICENSE = BSD-3c +LIBPCAP_LICENSE_FILES = LICENSE LIBPCAP_INSTALL_STAGING = YES + # doesn't have an install-strip LIBPCAP_INSTALL_TARGET_OPT= DESTDIR="$(TARGET_DIR)" \ $(if $(BR2_PREFER_STATIC_LIB),install,install-shared) diff --git a/package/libpng/libpng.mk b/package/libpng/libpng.mk index 6edabc4e5..3bcd1b847 100644 --- a/package/libpng/libpng.mk +++ b/package/libpng/libpng.mk @@ -6,8 +6,10 @@ LIBPNG_VERSION = 1.4.12 LIBPNG_SERIES = 14 -LIBPNG_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/libpng/libpng$(LIBPNG_SERIES)/$(LIBPNG_VERSION) LIBPNG_SOURCE = libpng-$(LIBPNG_VERSION).tar.bz2 +LIBPNG_SITE = http://downloads.sourceforge.net/project/libpng/libpng${LIBPNG_SERIES}/$(LIBPNG_VERSION) +LIBPNG_LICENSE = libpng license +LIBPNG_LICENSE_FILES = LICENSE LIBPNG_INSTALL_STAGING = YES LIBPNG_DEPENDENCIES = host-pkg-config zlib diff --git a/package/librsync/librsync.mk b/package/librsync/librsync.mk index 864297b68..45b715be1 100644 --- a/package/librsync/librsync.mk +++ b/package/librsync/librsync.mk @@ -5,7 +5,9 @@ ############################################################# LIBRSYNC_VERSION:=0.9.7 LIBRSYNC_SOURCE:=librsync-$(LIBRSYNC_VERSION).tar.gz -LIBRSYNC_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/librsync/ +LIBRSYNC_SITE:=http://downloads.sourceforge.net/project/librsync/librsync/$(LIBRSYNC_VERSION) +LIBRSYNC_LICENSE = LGPLv2.1+ +LIBRSYNC_LICENSE_FILES = COPYING LIBRSYNC_INSTALL_STAGING = YES LIBRSYNC_DEPENDENCIES = zlib bzip2 popt diff --git a/package/libsysfs/libsysfs.mk b/package/libsysfs/libsysfs.mk index 996903d44..4fbb195dc 100644 --- a/package/libsysfs/libsysfs.mk +++ b/package/libsysfs/libsysfs.mk @@ -22,7 +22,7 @@ # USA LIBSYSFS_VERSION:=2.1.0 -LIBSYSFS_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/linux-diag +LIBSYSFS_SITE:=http://downloads.sourceforge.net/project/linux-diag/sysfsutils/$(LIBSYSFS_VERSION) LIBSYSFS_SOURCE:=sysfsutils-$(LIBSYSFS_VERSION).tar.gz LIBSYSFS_INSTALL_STAGING=YES diff --git a/package/libtpl/libtpl.mk b/package/libtpl/libtpl.mk index 45089b576..3ef9cc3b8 100644 --- a/package/libtpl/libtpl.mk +++ b/package/libtpl/libtpl.mk @@ -5,7 +5,9 @@ ############################################################# LIBTPL_VERSION = 1.5 LIBTPL_SOURCE = libtpl-$(LIBTPL_VERSION).tar.bz2 -LIBTPL_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/tpl +LIBTPL_SITE = http://downloads.sourceforge.net/project/tpl/tpl/libtpl-$(LIBTPL_VERSION) LIBTPL_INSTALL_STAGING = YES +LIBTPL_LICENSE = BSD-like +LIBTPL_LICENSE_FILES = LICENSE $(eval $(autotools-package)) diff --git a/package/libungif/libungif.mk b/package/libungif/libungif.mk index 3b9583c8a..de9dc1234 100644 --- a/package/libungif/libungif.mk +++ b/package/libungif/libungif.mk @@ -5,7 +5,7 @@ ############################################################# LIBUNGIF_VERSION:=4.1.4 LIBUNGIF_SOURCE:=libungif-$(LIBUNGIF_VERSION).tar.bz2 -LIBUNGIF_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/giflib +LIBUNGIF_SITE:=http://downloads.sourceforge.net/project/giflib/libungif-4.x/libungif-$(LIBUNGIF_VERSION) LIBUNGIF_INSTALL_STAGING = YES LIBUNGIF_CONF_OPT = --without-x diff --git a/package/libupnp/libupnp.mk b/package/libupnp/libupnp.mk index 18968d82c..3d4606b72 100644 --- a/package/libupnp/libupnp.mk +++ b/package/libupnp/libupnp.mk @@ -6,7 +6,7 @@ LIBUPNP_VERSION = 1.6.17 LIBUPNP_SOURCE = libupnp-$(LIBUPNP_VERSION).tar.bz2 -LIBUPNP_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/pupnp/pupnp/libUPnP%20$(LIBUPNP_VERSION) +LIBUPNP_SITE = http://downloads.sourceforge.net/project/pupnp/pupnp/libUPnP%20$(LIBUPNP_VERSION) LIBUPNP_CONF_ENV = ac_cv_lib_compat_ftime=no LIBUPNP_INSTALL_STAGING = YES diff --git a/package/libusb-compat/libusb-compat.mk b/package/libusb-compat/libusb-compat.mk index 1659fd147..d42abf5d9 100644 --- a/package/libusb-compat/libusb-compat.mk +++ b/package/libusb-compat/libusb-compat.mk @@ -5,7 +5,7 @@ ############################################################# LIBUSB_COMPAT_VERSION = 0.1.4 LIBUSB_COMPAT_SOURCE = libusb-compat-$(LIBUSB_COMPAT_VERSION).tar.bz2 -LIBUSB_COMPAT_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/libusb/libusb-compat-0.1/libusb-compat-$(LIBUSB_COMPAT_VERSION) +LIBUSB_COMPAT_SITE = http://downloads.sourceforge.net/project/libusb/libusb-compat-0.1/libusb-compat-$(LIBUSB_COMPAT_VERSION) LIBUSB_COMPAT_DEPENDENCIES = host-pkg-config libusb LIBUSB_COMPAT_INSTALL_STAGING = YES diff --git a/package/libusb/libusb.mk b/package/libusb/libusb.mk index 5c485c603..d4ca31eca 100644 --- a/package/libusb/libusb.mk +++ b/package/libusb/libusb.mk @@ -5,7 +5,7 @@ ############################################################# LIBUSB_VERSION = 1.0.9 LIBUSB_SOURCE = libusb-$(LIBUSB_VERSION).tar.bz2 -LIBUSB_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/libusb/libusb-1.0/libusb-$(LIBUSB_VERSION) +LIBUSB_SITE = http://downloads.sourceforge.net/project/libusb/libusb-1.0/libusb-$(LIBUSB_VERSION) LIBUSB_LICENSE = LGPLv2.1+ LIBUSB_LICENSE_FILES = COPYING LIBUSB_DEPENDENCIES = host-pkg-config diff --git a/package/libvncserver/libvncserver.mk b/package/libvncserver/libvncserver.mk index ad5f59598..f94670e5d 100644 --- a/package/libvncserver/libvncserver.mk +++ b/package/libvncserver/libvncserver.mk @@ -6,7 +6,7 @@ LIBVNCSERVER_VERSION = 0.9.8.2 LIBVNCSERVER_SOURCE = LibVNCServer-$(LIBVNCSERVER_VERSION).tar.gz -LIBVNCSERVER_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/libvncserver/$(LIBVNCSERVER_VERSION) +LIBVNCSERVER_SITE = http://downloads.sourceforge.net/project/libvncserver/libvncserver/$(LIBVNCSERVER_VERSION) LIBVNCSERVER_INSTALL_STAGING = YES diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk index c9decb185..4bad5bae8 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -6,6 +6,8 @@ LIGHTTPD_VERSION = 1.4.31 LIGHTTPD_SITE = http://download.lighttpd.net/lighttpd/releases-1.4.x +LIGHTTPD_LICENSE = BSD-3c +LIGHTTPD_LICENSE_FILES = COPYING LIGHTTPD_DEPENDENCIES = host-pkg-config LIGHTTPD_CONF_OPT = \ --libdir=/usr/lib/lighttpd \ diff --git a/package/lmbench/lmbench.mk b/package/lmbench/lmbench.mk index bccb2de00..d3d0f8f77 100644 --- a/package/lmbench/lmbench.mk +++ b/package/lmbench/lmbench.mk @@ -5,7 +5,9 @@ ############################################################# LMBENCH_VERSION:=3.0-a9 LMBENCH_SOURCE:=lmbench-$(LMBENCH_VERSION).tgz -LMBENCH_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/lmbench/development/lmbench-3.0-a9/ +LMBENCH_SITE:=http://downloads.sourceforge.net/project/lmbench/development/lmbench-$(LMBENCH_VERSION)/ +LMBENCH_LICENSE = lmbench license (based on GPLv2) +LMBENCH_LICENSE_FILES = COPYING COPYING-2 define LMBENCH_CONFIGURE_CMDS $(call CONFIG_UPDATE,$(@D)) diff --git a/package/logsurfer/logsurfer.mk b/package/logsurfer/logsurfer.mk index 17c3e9eed..4d9a8d422 100644 --- a/package/logsurfer/logsurfer.mk +++ b/package/logsurfer/logsurfer.mk @@ -6,7 +6,7 @@ LOGSURFER_VERSION = 1.8 LOGSURFER_SOURCE = logsurfer-$(LOGSURFER_VERSION).tar.gz -LOGSURFER_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/logsurfer/logsurfer/logsurfer-$(LOGSURFER_VERSION) +LOGSURFER_SITE = http://downloads.sourceforge.net/project/logsurfer/logsurfer/logsurfer-$(LOGSURFER_VERSION) define LOGSURFER_INSTALL_TARGET_CMDS $(INSTALL) -D -m 0755 $(@D)/src/logsurfer \ diff --git a/package/ltp-testsuite/ltp-testsuite.mk b/package/ltp-testsuite/ltp-testsuite.mk index c0cb676b9..c6b34f0a2 100644 --- a/package/ltp-testsuite/ltp-testsuite.mk +++ b/package/ltp-testsuite/ltp-testsuite.mk @@ -5,6 +5,6 @@ ############################################################# LTP_TESTSUITE_VERSION = 20101031 LTP_TESTSUITE_SOURCE = ltp-full-$(LTP_TESTSUITE_VERSION).bz2 -LTP_TESTSUITE_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/ltp +LTP_TESTSUITE_SITE = http://downloads.sourceforge.net/project/ltp/LTP%20Source/ltp-$(LTP_TESTSUITE_VERSION) $(eval $(autotools-package)) diff --git a/package/lua/lua.mk b/package/lua/lua.mk index 26c157654..de60c57e8 100644 --- a/package/lua/lua.mk +++ b/package/lua/lua.mk @@ -7,6 +7,8 @@ LUA_VERSION = 5.1.5 LUA_SITE = http://www.lua.org/ftp LUA_INSTALL_STAGING = YES +LUA_LICENSE = MIT +LUA_LICENSE_FILES = COPYRIGHT LUA_CFLAGS = -Wall ifeq ($(BR2_PACKAGE_LUA_SHARED_LIBRARY),y) diff --git a/package/luacjson/luacjson.mk b/package/luacjson/luacjson.mk index fe92f1603..1f79d5d21 100644 --- a/package/luacjson/luacjson.mk +++ b/package/luacjson/luacjson.mk @@ -3,10 +3,12 @@ # luacjson # ############################################################# -LUACJSON_VERSION = 2.1.0 -LUACJSON_SOURCE = lua-cjson-$(LUACJSON_VERSION).tar.gz -LUACJSON_SITE = http://www.kyne.com.au/~mark/software/download -LUACJSON_DEPENDENCIES = lua +LUACJSON_VERSION = 2.1.0 +LUACJSON_SOURCE = lua-cjson-$(LUACJSON_VERSION).tar.gz +LUACJSON_SITE = http://www.kyne.com.au/~mark/software/download +LUACJSON_DEPENDENCIES = lua +LUACJSON_LICENSE = MIT +LUACJSON_LICENSE_FILES = LICENSE define LUACJSON_BUILD_CMDS $(MAKE) -C $(@D) \ diff --git a/package/luaexpat/luaexpat.mk b/package/luaexpat/luaexpat.mk index 400d7b475..2d4c517c0 100644 --- a/package/luaexpat/luaexpat.mk +++ b/package/luaexpat/luaexpat.mk @@ -7,6 +7,7 @@ LUAEXPAT_VERSION = 1.2.0 LUAEXPAT_SITE = http://matthewwild.co.uk/projects/luaexpat LUAEXPAT_DEPENDENCIES = lua expat +LUAEXPAT_LICENSE = MIT LUAEXPAT_MFLAGS += LUA_VERSION_NUM=501 diff --git a/package/luafilesystem/luafilesystem.mk b/package/luafilesystem/luafilesystem.mk index 17f2bd6f0..855321298 100644 --- a/package/luafilesystem/luafilesystem.mk +++ b/package/luafilesystem/luafilesystem.mk @@ -7,6 +7,7 @@ LUAFILESYSTEM_VERSION = 1.5.0 LUAFILESYSTEM_SITE = http://github.com/downloads/keplerproject/luafilesystem LUAFILESYSTEM_DEPENDENCIES = lua +LUAFILESYSTEM_LICENSE = MIT ifeq ($(BR2_LARGEFILE),y) LFS_CFLAGS = -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE diff --git a/package/luajit/luajit.mk b/package/luajit/luajit.mk index b35cdb4ec..913bc0c9e 100644 --- a/package/luajit/luajit.mk +++ b/package/luajit/luajit.mk @@ -7,6 +7,8 @@ LUAJIT_VERSION = 2.0.0-beta10 LUAJIT_SOURCE = LuaJIT-$(LUAJIT_VERSION).tar.gz LUAJIT_SITE = http://luajit.org/download +LUAJIT_LICENSE = MIT +LUAJIT_LICENSE_FILES = COPYRIGHT LUAJIT_INSTALL_STAGING = YES @@ -40,8 +42,8 @@ define LUAJIT_BUILD_CMDS TARGET_LD="$(TARGET_CC)" \ TARGET_AR="$(TARGET_AR) rcus" \ TARGET_STRIP="$(TARGET_STRIP)" \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + TARGET_CFLAGS="$(TARGET_CFLAGS)" \ + TARGET_LDFLAGS="$(TARGET_LDFLAGS)" \ HOST_CC="$(LUAJIT_HOST_CC)" \ HOST_CFLAGS="$(HOST_CFLAGS)" \ HOST_LDFLAGS="$(HOST_LDFLAGS)" \ diff --git a/package/luasocket/luasocket.mk b/package/luasocket/luasocket.mk index 755b61a71..45fb9a3af 100644 --- a/package/luasocket/luasocket.mk +++ b/package/luasocket/luasocket.mk @@ -7,6 +7,8 @@ LUASOCKET_VERSION = 2.0.2 LUASOCKET_SITE = http://luaforge.net/frs/download.php/2664 LUASOCKET_DEPENDENCIES = lua +LUASOCKET_LICENSE = MIT +LUASOCKET_LICENSE_FILES = LICENSE define LUASOCKET_BUILD_CMDS $(MAKE) -C $(@D) -f makefile \ diff --git a/package/microperl/Config.in b/package/microperl/Config.in index 256e271a6..66bbedd77 100644 --- a/package/microperl/Config.in +++ b/package/microperl/Config.in @@ -1,5 +1,7 @@ config BR2_PACKAGE_MICROPERL bool "microperl" + # needs fork() + depends on BR2_USE_MMU help Perl without operating-specific functions such as readdir. diff --git a/package/mtd/mtd.mk b/package/mtd/mtd.mk index 9b60ac871..7e3a9b886 100644 --- a/package/mtd/mtd.mk +++ b/package/mtd/mtd.mk @@ -6,6 +6,9 @@ MTD_VERSION = 1.5.0 MTD_SOURCE = mtd-utils-$(MTD_VERSION).tar.bz2 MTD_SITE = ftp://ftp.infradead.org/pub/mtd-utils +MTD_LICENSE = GPLv2 +MTD_LICENSE_FILES = COPYING + ifeq ($(BR2_PACKAGE_MTD_MKFSJFFS2),y) MTD_DEPENDENCIES = zlib lzo endif diff --git a/package/multimedia/alsa-utils/alsa-utils.mk b/package/multimedia/alsa-utils/alsa-utils.mk index 90fba51eb..7043837e4 100644 --- a/package/multimedia/alsa-utils/alsa-utils.mk +++ b/package/multimedia/alsa-utils/alsa-utils.mk @@ -7,6 +7,8 @@ ALSA_UTILS_VERSION = 1.0.25 ALSA_UTILS_SOURCE = alsa-utils-$(ALSA_UTILS_VERSION).tar.bz2 ALSA_UTILS_SITE = ftp://ftp.alsa-project.org/pub/utils +ALSA_UTILS_LICENSE = GPLv2 +ALSA_UTILS_LICENSE_FILES = COPYING ALSA_UTILS_INSTALL_STAGING = YES ALSA_UTILS_DEPENDENCIES = alsa-lib \ $(if $(BR2_PACKAGE_NCURSES),ncurses) diff --git a/package/multimedia/bellagio/bellagio.mk b/package/multimedia/bellagio/bellagio.mk index 8b7e79f14..6aadbbf64 100644 --- a/package/multimedia/bellagio/bellagio.mk +++ b/package/multimedia/bellagio/bellagio.mk @@ -5,7 +5,7 @@ ############################################################# BELLAGIO_VERSION = 0.9.3 BELLAGIO_SOURCE = libomxil-bellagio-$(BELLAGIO_VERSION).tar.gz -BELLAGIO_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/omxil +BELLAGIO_SITE = http://downloads.sourceforge.net/project/omxil/omxil/Bellagio%20$(BELLAGIO_VERSION) BELLAGIO_AUTORECONF = YES BELLAGIO_INSTALL_STAGING = YES diff --git a/package/multimedia/faad2/faad2.mk b/package/multimedia/faad2/faad2.mk index b0078f59b..8c4fc1aae 100644 --- a/package/multimedia/faad2/faad2.mk +++ b/package/multimedia/faad2/faad2.mk @@ -5,7 +5,9 @@ ################################################################################ FAAD2_VERSION = 2.7 -FAAD2_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/faac +FAAD2_SITE = http://downloads.sourceforge.net/project/faac/faad2-src/faad2-$(FAAD2_VERSION) +FAAD2_LICENSE = GPLv2 +FAAD2_LICENSE_FILES = COPYING # frontend/faad calls frexp() FAAD2_CONF_ENV = LIBS=-lm FAAD2_INSTALL_STAGING = YES diff --git a/package/multimedia/flac/flac.mk b/package/multimedia/flac/flac.mk index e19a9fb23..cace0d9c7 100644 --- a/package/multimedia/flac/flac.mk +++ b/package/multimedia/flac/flac.mk @@ -6,7 +6,7 @@ FLAC_VERSION = 1.2.1 FLAC_SOURCE = flac-$(FLAC_VERSION).tar.gz -FLAC_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/flac/ +FLAC_SITE = http://downloads.sourceforge.net/project/flac/flac-src/flac-$(FLAC_VERSION)-src FLAC_INSTALL_STAGING = YES FLAC_CONF_OPT = \ diff --git a/package/multimedia/lame/lame.mk b/package/multimedia/lame/lame.mk index 81a8f2adc..a022312e8 100644 --- a/package/multimedia/lame/lame.mk +++ b/package/multimedia/lame/lame.mk @@ -7,7 +7,7 @@ LAME_VERSION_MAJOR = 3.99 LAME_VERSION_MINOR = 5 LAME_VERSION = $(LAME_VERSION_MAJOR).$(LAME_VERSION_MINOR) -LAME_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/lame/lame/$(LAME_VERSION_MAJOR) +LAME_SITE = http://downloads.sourceforge.net/project/lame/lame/$(LAME_VERSION_MAJOR) LAME_DEPENDENCIES = host-pkg-config LAME_INSTALL_STAGING = YES LAME_CONF_ENV = GTK_CONFIG=/bin/false diff --git a/package/multimedia/madplay/madplay.mk b/package/multimedia/madplay/madplay.mk index 56007ebbf..9055951cb 100644 --- a/package/multimedia/madplay/madplay.mk +++ b/package/multimedia/madplay/madplay.mk @@ -5,7 +5,7 @@ ############################################################# MADPLAY_VERSION:=0.15.2b MADPLAY_SOURCE:=madplay-$(MADPLAY_VERSION).tar.gz -MADPLAY_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/mad +MADPLAY_SITE:=http://downloads.sourceforge.net/project/mad/madplay/$(MADPLAY_VERSION) MADPLAY_LIBTOOL_PATCH=NO MADPLAY_DEPENDENCIES=libmad libid3tag diff --git a/package/multimedia/mpd/mpd.mk b/package/multimedia/mpd/mpd.mk index bf4610e1c..28cb4d21d 100644 --- a/package/multimedia/mpd/mpd.mk +++ b/package/multimedia/mpd/mpd.mk @@ -5,7 +5,7 @@ ############################################################# MPD_VERSION = 0.17.1 -MPD_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/musicpd/mpd/$(MPD_VERSION) +MPD_SITE = http://downloads.sourceforge.net/project/musicpd/mpd/$(MPD_VERSION) MPD_DEPENDENCIES = host-pkg-config libglib2 MPD_LICENSE = GPLv2 MPD_LICENSE_FILES = COPYING diff --git a/package/multimedia/mpg123/mpg123.mk b/package/multimedia/mpg123/mpg123.mk index 3576cb725..415fc242f 100644 --- a/package/multimedia/mpg123/mpg123.mk +++ b/package/multimedia/mpg123/mpg123.mk @@ -6,7 +6,7 @@ MPG123_VERSION = 1.14.4 MPG123_SOURCE = mpg123-$(MPG123_VERSION).tar.bz2 -MPG123_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/mpg123/mpg123/$(MPG123_VERSION) +MPG123_SITE = http://downloads.sourceforge.net/project/mpg123/mpg123/$(MPG123_VERSION) MPG123_CONF_OPT = --with-optimization=0 --disable-lfs-alias MPG123_INSTALL_STAGING = YES MPG123_LICENSE = LGPLv2.1 diff --git a/package/mutt/mutt.mk b/package/mutt/mutt.mk index afff72348..ed5e86e02 100644 --- a/package/mutt/mutt.mk +++ b/package/mutt/mutt.mk @@ -5,7 +5,7 @@ ############################################################# MUTT_VERSION = 1.5.21 -MUTT_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/mutt +MUTT_SITE = http://downloads.sourceforge.net/project/mutt/mutt-dev MUTT_DEPENDENCIES = ncurses MUTT_CONF_OPT = --disable-iconv --disable-smtp MUTT_AUTORECONF = YES diff --git a/package/nano/nano.mk b/package/nano/nano.mk index 164c7a6f5..61bf218b6 100644 --- a/package/nano/nano.mk +++ b/package/nano/nano.mk @@ -6,6 +6,8 @@ NANO_VERSION = 2.3.1 NANO_SITE = http://www.nano-editor.org/dist/v2.3 +NANO_LICENSE = GPLv3+ +NANO_LICENSE_FILES = COPYING NANO_MAKE_ENV = CURSES_LIB="-lncurses" NANO_CONF_OPT = --without-slang NANO_DEPENDENCIES = ncurses diff --git a/package/nanocom/nanocom.mk b/package/nanocom/nanocom.mk index a88daeb26..de4cc5fd2 100644 --- a/package/nanocom/nanocom.mk +++ b/package/nanocom/nanocom.mk @@ -5,7 +5,7 @@ ############################################################# NANOCOM_VERSION = 2.6.1 NANOCOM_SOURCE = nanocom.tar.gz -NANOCOM_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/nanocom/nanocom/v1.0 +NANOCOM_SITE = http://downloads.sourceforge.net/project/nanocom/nanocom/v1.0 NANOCOM_LICENSE = GPLv2+ NANOCOM_LICENSE_FILES = COPYING diff --git a/package/nbd/nbd.mk b/package/nbd/nbd.mk index c2257f717..bd63caa14 100644 --- a/package/nbd/nbd.mk +++ b/package/nbd/nbd.mk @@ -6,7 +6,7 @@ NBD_VERSION = 3.1 NBD_SOURCE = nbd-$(NBD_VERSION).tar.bz2 -NBD_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/nbd/nbd/$(NBD_VERSION) +NBD_SITE = http://downloads.sourceforge.net/project/nbd/nbd/$(NBD_VERSION) NBD_CONF_OPT = $(if $(BR2_LARGEFILE),--enable-lfs,--disable-lfs) NBD_DEPENDENCIES = libglib2 diff --git a/package/netatalk/netatalk.mk b/package/netatalk/netatalk.mk index b7015e60f..4b8d66f0d 100644 --- a/package/netatalk/netatalk.mk +++ b/package/netatalk/netatalk.mk @@ -4,7 +4,7 @@ # ############################################################# NETATALK_VERSION = 2.2.2 -NETATALK_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/netatalk/netatalk/$(NETATALK_VERSION)/ +NETATALK_SITE = http://downloads.sourceforge.net/project/netatalk/netatalk/$(NETATALK_VERSION)/ NETATALK_SOURCE = netatalk-$(NETATALK_VERSION).tar.bz2 NETATALK_DEPENDENCIES = openssl berkeleydb libgcrypt libgpg-error diff --git a/package/netcat/netcat.mk b/package/netcat/netcat.mk index d2c69622e..751368632 100644 --- a/package/netcat/netcat.mk +++ b/package/netcat/netcat.mk @@ -6,6 +6,6 @@ NETCAT_VERSION:=0.7.1 NETCAT_SOURCE:=netcat-$(NETCAT_VERSION).tar.gz -NETCAT_SITE=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/netcat +NETCAT_SITE=http://downloads.sourceforge.net/project/netcat/netcat/$(NETCAT_VERSION) $(eval $(autotools-package)) diff --git a/package/netsnmp/netsnmp-CVE-2012-2141.patch b/package/netsnmp/netsnmp-CVE-2012-2141.patch new file mode 100644 index 000000000..1b34b9c4c --- /dev/null +++ b/package/netsnmp/netsnmp-CVE-2012-2141.patch @@ -0,0 +1,36 @@ +From 4c5633f1603e4bd03ed05c37d782ec8911759c47 Mon Sep 17 00:00:00 2001 +From: Robert Story <rstory@freesnmp.com> +Date: Mon, 14 May 2012 11:40:06 -0400 +Subject: [PATCH] NEWS: snmp: BUG: 3526549: CVE-2012-2141 Array index error leading to crash + +--- + agent/mibgroup/agent/extend.c | 6 +++++- + 1 files changed, 5 insertions(+), 1 deletions(-) + +diff --git a/agent/mibgroup/agent/extend.c b/agent/mibgroup/agent/extend.c +index d00475f..1f8586a 100644 +--- a/agent/mibgroup/agent/extend.c ++++ b/agent/mibgroup/agent/extend.c +@@ -1126,7 +1126,7 @@ _extend_find_entry( netsnmp_request_info *request, + * ...and check the line requested is valid + */ + line_idx = *table_info->indexes->next_variable->val.integer; +- if (eptr->numlines < line_idx) ++ if (line_idx < 1 || line_idx > eptr->numlines) + return NULL; + } + return eptr; +@@ -1299,6 +1299,10 @@ handle_nsExtendOutput2Table(netsnmp_mib_handler *handler, + * Determine which line we've been asked for.... + */ + line_idx = *table_info->indexes->next_variable->val.integer; ++ if (line_idx < 1 || line_idx > extension->numlines) { ++ netsnmp_set_request_error(reqinfo, request, SNMP_NOSUCHINSTANCE); ++ continue; ++ } + cp = extension->lines[line_idx-1]; + + /* +-- +1.7.4.1 + diff --git a/package/netsnmp/netsnmp.mk b/package/netsnmp/netsnmp.mk index df5f003a4..bbe0dbb21 100644 --- a/package/netsnmp/netsnmp.mk +++ b/package/netsnmp/netsnmp.mk @@ -5,7 +5,7 @@ ############################################################# NETSNMP_VERSION = 5.7.1 -NETSNMP_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/net-snmp +NETSNMP_SITE = http://downloads.sourceforge.net/project/net-snmp/net-snmp/$(NETSNMP_VERSION) NETSNMP_SOURCE = net-snmp-$(NETSNMP_VERSION).tar.gz NETSNMP_LICENSE = Various BSD-like NETSNMP_LICENSE_FILES = COPYING diff --git a/package/nfs-utils/nfs-utils.mk b/package/nfs-utils/nfs-utils.mk index c8795fb04..61e0d6764 100644 --- a/package/nfs-utils/nfs-utils.mk +++ b/package/nfs-utils/nfs-utils.mk @@ -6,7 +6,7 @@ NFS_UTILS_VERSION = 1.2.6 NFS_UTILS_SOURCE = nfs-utils-$(NFS_UTILS_VERSION).tar.bz2 -NFS_UTILS_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/nfs/nfs-utils/$(NFS_UTILS_VERSION) +NFS_UTILS_SITE = http://downloads.sourceforge.net/project/nfs/nfs-utils/$(NFS_UTILS_VERSION) NFS_UTILS_AUTORECONF = YES NFS_UTILS_DEPENDENCIES = host-pkg-config diff --git a/package/ngrep/ngrep.mk b/package/ngrep/ngrep.mk index c296e34c3..274bbbd0d 100644 --- a/package/ngrep/ngrep.mk +++ b/package/ngrep/ngrep.mk @@ -6,7 +6,7 @@ NGREP_VERSION = 1.45 NGREP_SOURCE = ngrep-$(NGREP_VERSION).tar.bz2 -NGREP_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/ngrep/ngrep/$(NGREP_VERSION) +NGREP_SITE = http://downloads.sourceforge.net/project/ngrep/ngrep/$(NGREP_VERSION) NGREP_INSTALL_STAGING = YES NGREP_CONF_ENV = LDFLAGS="-lpcre" NGREP_CONF_OPT = \ diff --git a/package/ocf-linux/ocf-linux.mk b/package/ocf-linux/ocf-linux.mk index 5d255977d..fb5f7e8ff 100644 --- a/package/ocf-linux/ocf-linux.mk +++ b/package/ocf-linux/ocf-linux.mk @@ -5,7 +5,7 @@ ############################################################# OCF_LINUX_VERSION = 20120127 -OCF_LINUX_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/ocf-linux/ocf-linux/$(OCF_LINUX_VERSION) +OCF_LINUX_SITE = http://downloads.sourceforge.net/project/ocf-linux/ocf-linux/$(OCF_LINUX_VERSION) OCF_LINUX_INSTALL_STAGING = YES define OCF_LINUX_INSTALL_STAGING_CMDS diff --git a/package/opencv/opencv.mk b/package/opencv/opencv.mk index 1b06e5640..bc71ead25 100644 --- a/package/opencv/opencv.mk +++ b/package/opencv/opencv.mk @@ -4,7 +4,7 @@ # ############################################################# OPENCV_VERSION = 2.4.2 -OPENCV_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/opencvlibrary/opencv-unix/$(OPENCV_VERSION) +OPENCV_SITE = http://downloads.sourceforge.net/project/opencvlibrary/opencv-unix/$(OPENCV_VERSION) OPENCV_SOURCE = OpenCV-$(OPENCV_VERSION).tar.bz2 OPENCV_INSTALL_STAGING = YES diff --git a/package/openocd/openocd.mk b/package/openocd/openocd.mk index 9c377c532..6354ab7c5 100644 --- a/package/openocd/openocd.mk +++ b/package/openocd/openocd.mk @@ -5,7 +5,7 @@ ############################################################# OPENOCD_VERSION:=0.5.0 OPENOCD_SOURCE = openocd-$(OPENOCD_VERSION).tar.bz2 -OPENOCD_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/openocd/openocd/$(OPENOCD_VERSION) +OPENOCD_SITE = http://downloads.sourceforge.net/project/openocd/openocd/$(OPENOCD_VERSION) OPENOCD_AUTORECONF = YES OPENOCD_CONF_OPT = \ diff --git a/package/openssl/openssl.mk b/package/openssl/openssl.mk index 16d13946b..0917344af 100644 --- a/package/openssl/openssl.mk +++ b/package/openssl/openssl.mk @@ -6,6 +6,8 @@ OPENSSL_VERSION = 1.0.1c OPENSSL_SITE = http://www.openssl.org/source +OPENSSL_LICENSE = OpenSSL or SSLeay +OPENSSL_LICENSE_FILES = LICENSE OPENSSL_INSTALL_STAGING = YES OPENSSL_DEPENDENCIES = zlib OPENSSL_TARGET_ARCH = generic32 diff --git a/package/oprofile/oprofile.mk b/package/oprofile/oprofile.mk index 256ae9b13..54c46dd3a 100644 --- a/package/oprofile/oprofile.mk +++ b/package/oprofile/oprofile.mk @@ -5,6 +5,7 @@ ############################################################# OPROFILE_VERSION = 0.9.7 +OPROFILE_SITE = http://downloads.sourceforge.net/project/oprofile/oprofile/oprofile-$(OPROFILE_VERSION) OPROFILE_CONF_OPT = --localstatedir=/var --with-kernel-support OPROFILE_BINARIES = utils/ophelp pp/opannotate pp/oparchive pp/opgprof OPROFILE_BINARIES += pp/opreport opjitconv/opjitconv daemon/oprofiled diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 68d23bae4..ffe7dfbc5 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -244,9 +244,6 @@ endif ifndef $(2)_SITE ifdef $(3)_SITE $(2)_SITE = $($(3)_SITE) - else - $(2)_SITE ?= \ - http://$$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/$(1) endif endif diff --git a/package/poco/poco.mk b/package/poco/poco.mk index f74c2b1c2..69ef314ce 100644 --- a/package/poco/poco.mk +++ b/package/poco/poco.mk @@ -3,9 +3,10 @@ # poco # ############################################################# -POCO_VERSION = 1.4.3p1 +POCO_VERSION_MAJOR = 1.4.3 +POCO_VERSION = $(POCO_VERSION_MAJOR)p1 POCO_SOURCE = poco-$(POCO_VERSION)-all.tar.gz -POCO_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/poco +POCO_SITE = http://downloads.sourceforge.net/project/poco/sources/poco-$(POCO_VERSION_MAJOR) POCO_LICENSE = Boost-v1.0 POCO_LICENSE_FILES = LICENSE POCO_INSTALL_STAGING = YES diff --git a/package/pptp-linux/pptp-linux.mk b/package/pptp-linux/pptp-linux.mk index 1e2c46042..ded2a1963 100644 --- a/package/pptp-linux/pptp-linux.mk +++ b/package/pptp-linux/pptp-linux.mk @@ -5,7 +5,7 @@ ############################################################# PPTP_LINUX_VERSION = 1.7.2 -PPTP_LINUX_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/pptpclient +PPTP_LINUX_SITE = http://downloads.sourceforge.net/project/pptpclient/pptp/pptp-$(PPTP_LINUX_VERSION) PPTP_LINUX_SOURCE = pptp-$(PPTP_LINUX_VERSION).tar.gz PPTP_LINUX_MAKE = $(MAKE1) diff --git a/package/psmisc/psmisc.mk b/package/psmisc/psmisc.mk index a70f0719a..3132b708a 100644 --- a/package/psmisc/psmisc.mk +++ b/package/psmisc/psmisc.mk @@ -5,7 +5,9 @@ ############################################################# PSMISC_VERSION = 22.16 -PSMISC_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/psmisc/psmisc +PSMISC_SITE = http://downloads.sourceforge.net/project/psmisc/psmisc +PSMISC_LICENSE = GPLv2 +PSMISC_LICENSE_FILES = COPYING PSMISC_DEPENDENCIES = ncurses $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl) ifneq ($(BR2_TOOLCHAIN_BUILDROOT_USE_SSP),y) diff --git a/package/python-id3/python-id3.mk b/package/python-id3/python-id3.mk index 82776c0ae..c6420722f 100644 --- a/package/python-id3/python-id3.mk +++ b/package/python-id3/python-id3.mk @@ -6,7 +6,7 @@ PYTHON_ID3_VERSION = 1.2 PYTHON_ID3_SOURCE = id3-py_$(PYTHON_ID3_VERSION).tar.gz -PYTHON_ID3_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/id3-py +PYTHON_ID3_SITE = http://downloads.sourceforge.net/project/id3-py/id3-py/$(PYTHON_ID3_VERSION) PYTHON_ID3_DEPENDENCIES = python diff --git a/package/quota/quota.mk b/package/quota/quota.mk index 44a507329..7602e9305 100644 --- a/package/quota/quota.mk +++ b/package/quota/quota.mk @@ -6,7 +6,7 @@ QUOTA_VERSION = 4.00 QUOTA_SOURCE = quota-$(QUOTA_VERSION).tar.gz -QUOTA_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/linuxquota/quota-tools/$(QUOTA_VERSION) +QUOTA_SITE = http://downloads.sourceforge.net/project/linuxquota/quota-tools/$(QUOTA_VERSION) QUOTA_MAKE_OPT = $(TARGET_CONFIGURE_OPTS) CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE" diff --git a/package/rdesktop/rdesktop.mk b/package/rdesktop/rdesktop.mk index aee8bc44f..b39b29bea 100644 --- a/package/rdesktop/rdesktop.mk +++ b/package/rdesktop/rdesktop.mk @@ -6,7 +6,7 @@ RDESKTOP_VERSION = 1.5.0 RDESKTOP_SOURCE = rdesktop-$(RDESKTOP_VERSION).tar.gz -RDESKTOP_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/rdesktop/ +RDESKTOP_SITE = http://downloads.sourceforge.net/project/rdesktop/rdesktop/$(RDESKTOP_VERSION) RDESKTOP_DEPENDENCIES = openssl xlib_libX11 xlib_libXt RDESKTOP_CONF_OPT = --with-openssl=$(STAGING_DIR)/usr diff --git a/package/rings/rings.mk b/package/rings/rings.mk index c196d859f..e2a2bd741 100644 --- a/package/rings/rings.mk +++ b/package/rings/rings.mk @@ -7,6 +7,7 @@ RINGS_VERSION = 1.2.3 RINGS_SITE = http://github.com/downloads/keplerproject/rings RINGS_DEPENDENCIES = lua +RINGS_LICENSE = MIT define RINGS_BUILD_CMDS $(MAKE) -C $(@D) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS) -fPIC" diff --git a/package/rng-tools/rng-tools.mk b/package/rng-tools/rng-tools.mk index b4b1bd507..347d89d7f 100644 --- a/package/rng-tools/rng-tools.mk +++ b/package/rng-tools/rng-tools.mk @@ -5,7 +5,7 @@ ############################################################# RNG_TOOLS_VERSION = 3 -RNG_TOOLS_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/gkernel +RNG_TOOLS_SITE = http://downloads.sourceforge.net/project/gkernel/rng-tools/$(RNG_TOOLS_VERSION) RNG_TOOLS_CONF_ENV = LIBS="-largp" RNG_TOOLS_DEPENDENCIES = argp-standalone diff --git a/package/rrdtool/rrdtool.mk b/package/rrdtool/rrdtool.mk index 112ddf900..1057d5d6e 100644 --- a/package/rrdtool/rrdtool.mk +++ b/package/rrdtool/rrdtool.mk @@ -13,6 +13,7 @@ RRDTOOL_CONF_ENV = rd_cv_ieee_works=yes rd_cv_null_realloc=nope \ ac_cv_func_mmap_fixed_mapped=yes RRDTOOL_CONF_OPT = --disable-perl --disable-python --disable-ruby \ --disable-tcl --program-transform-name='' +RRDTOOL_MAKE = $(MAKE1) define RRDTOOL_REMOVE_EXAMPLES rm -rf $(TARGET_DIR)/usr/share/rrdtool/examples diff --git a/package/rsync/rsync.mk b/package/rsync/rsync.mk index f2df25600..3963547db 100644 --- a/package/rsync/rsync.mk +++ b/package/rsync/rsync.mk @@ -7,6 +7,8 @@ RSYNC_VERSION = 3.0.9 RSYNC_SOURCE = rsync-$(RSYNC_VERSION).tar.gz RSYNC_SITE = http://rsync.samba.org/ftp/rsync/src +RSYNC_LICENSE = GPLv3+ +RSYNC_LICENSE_FILES = COPYING RSYNC_CONF_OPT = $(if $(BR2_ENABLE_DEBUG),--enable-debug,--disable-debug) RSYNC_CONF_OPT = --with-included-popt diff --git a/package/scons/scons.mk b/package/scons/scons.mk index b81c4f4be..2aed62c5c 100644 --- a/package/scons/scons.mk +++ b/package/scons/scons.mk @@ -1,6 +1,6 @@ SCONS_VERSION = 2.0.1 SCONS_SOURCE = scons-$(SCONS_VERSION).tar.gz -SCONS_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/scons +SCONS_SITE = http://downloads.sourceforge.net/project/scons/scons/$(SCONS_VERSION) define HOST_SCONS_BUILD_CMDS (cd $(@D); python setup.py build) diff --git a/package/ser2net/ser2net.mk b/package/ser2net/ser2net.mk index 26cd5fc11..d2c3270ac 100644 --- a/package/ser2net/ser2net.mk +++ b/package/ser2net/ser2net.mk @@ -6,6 +6,6 @@ SER2NET_VERSION = 2.7 SER2NET_SOURCE = ser2net-$(SER2NET_VERSION).tar.gz -SER2NET_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/ser2net +SER2NET_SITE = http://downloads.sourceforge.net/project/ser2net/ser2net/$(SER2NET_VERSION) $(eval $(autotools-package)) diff --git a/package/smartmontools/smartmontools.mk b/package/smartmontools/smartmontools.mk index 3c573f84e..7b4c7f98a 100644 --- a/package/smartmontools/smartmontools.mk +++ b/package/smartmontools/smartmontools.mk @@ -5,7 +5,7 @@ ############################################################# SMARTMONTOOLS_VERSION = 5.43 -SMARTMONTOOLS_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/smartmontools +SMARTMONTOOLS_SITE = http://downloads.sourceforge.net/project/smartmontools/smartmontools/$(SMARTMONTOOLS_VERSION) SMARTMONTOOLS_LICENSE = GPLv2+ SMARTMONTOOLS_LICENSE_FILES = COPYING diff --git a/package/socat/socat.mk b/package/socat/socat.mk index 9a5234ddd..f10a83688 100644 --- a/package/socat/socat.mk +++ b/package/socat/socat.mk @@ -7,6 +7,8 @@ SOCAT_VERSION = 2.0.0-b5 SOCAT_SOURCE = socat-$(SOCAT_VERSION).tar.bz2 SOCAT_SITE = http://www.dest-unreach.org/socat/download/ +SOCAT_LICENSE = GPLv2 +SOCAT_LICENSE_FILES = COPYING SOCAT_CONF_ENV = sc_cv_termios_ispeed=no \ sc_cv_sys_crdly_shift=9 \ sc_cv_sys_tabdly_shift=11 \ diff --git a/package/spawn-fcgi/spawn-fcgi.mk b/package/spawn-fcgi/spawn-fcgi.mk index 9014d210b..7c234217f 100644 --- a/package/spawn-fcgi/spawn-fcgi.mk +++ b/package/spawn-fcgi/spawn-fcgi.mk @@ -7,6 +7,8 @@ SPAWN_FCGI_VERSION = 1.6.3 SPAWN_FCGI_SITE = http://www.lighttpd.net/download SPAWN_FCGI_SOURCE = spawn-fcgi-$(SPAWN_FCGI_VERSION).tar.bz2 +SPAWN_FCGI_LICENSE = BSD-3c +SPAWN_FCGI_LICENSE_FILES = COPYING ifneq ($(BR2_INET_IPV6),y) SPAWN_FCGI_CONF_OPT = --disable-ipv6 diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk index 9e63b521d..7b5b4aa26 100644 --- a/package/sqlite/sqlite.mk +++ b/package/sqlite/sqlite.mk @@ -7,6 +7,7 @@ SQLITE_VERSION = 3071300 SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_VERSION).tar.gz SQLITE_SITE = http://www.sqlite.org +SQLITE_LICENSE = Public domain SQLITE_INSTALL_STAGING = YES ifneq ($(BR2_LARGEFILE),y) diff --git a/package/squashfs/squashfs.mk b/package/squashfs/squashfs.mk index 0ec61ee3e..c0485a302 100644 --- a/package/squashfs/squashfs.mk +++ b/package/squashfs/squashfs.mk @@ -1,6 +1,6 @@ SQUASHFS_VERSION=4.2 SQUASHFS_SOURCE=squashfs$(SQUASHFS_VERSION).tar.gz -SQUASHFS_SITE=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/squashfs +SQUASHFS_SITE=http://downloads.sourceforge.net/projct/squashfs/squashfs/squashfs$(SQUASHFS_VERSION) # no libattr in BR SQUASHFS_MAKE_ARGS = XATTR_SUPPORT=0 diff --git a/package/squashfs3/squashfs3.mk b/package/squashfs3/squashfs3.mk index 6f28e6ee8..e121c51b0 100644 --- a/package/squashfs3/squashfs3.mk +++ b/package/squashfs3/squashfs3.mk @@ -1,6 +1,6 @@ SQUASHFS3_VERSION=3.4 SQUASHFS3_SOURCE=squashfs$(SQUASHFS3_VERSION).tar.gz -SQUASHFS3_SITE=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/squashfs +SQUASHFS3_SITE=http://downloads.sourceforge.net/project/squashfs/squashfs/$(SQUASHFS3_VERSION) SQUASHFS3_DEPENDENCIES = zlib diff --git a/package/sshfs/sshfs.mk b/package/sshfs/sshfs.mk index 80d3a45f7..67b9c7f53 100644 --- a/package/sshfs/sshfs.mk +++ b/package/sshfs/sshfs.mk @@ -5,7 +5,7 @@ ############################################################# SSHFS_VERSION = 2.4 -SSHFS_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/fuse/sshfs-fuse/$(SSHFS_VERSION) +SSHFS_SITE = http://downloads.sourceforge.net/project/fuse/sshfs-fuse/$(SSHFS_VERSION) SSHFS_SOURCE = sshfs-fuse-$(SSHFS_VERSION).tar.gz SSHFS_DEPENDENCIES = \ libglib2 libfuse openssh \ diff --git a/package/strace/strace.mk b/package/strace/strace.mk index 3393e668e..2d9513791 100644 --- a/package/strace/strace.mk +++ b/package/strace/strace.mk @@ -6,7 +6,7 @@ STRACE_VERSION = 4.5.20 STRACE_SOURCE = strace-$(STRACE_VERSION).tar.bz2 -STRACE_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/strace +STRACE_SITE = http://downloads.sourceforge.net/project/strace/strace/$(STRACE_VERSION) STRACE_CONF_ENV = ac_cv_header_linux_if_packet_h=yes \ ac_cv_header_linux_netlink_h=yes \ diff --git a/package/sudo/sudo.mk b/package/sudo/sudo.mk index 00d08f0f4..3e548ef41 100644 --- a/package/sudo/sudo.mk +++ b/package/sudo/sudo.mk @@ -14,4 +14,8 @@ SUDO_CONF_OPT = \ --without-interfaces \ --without-pam +define SUDO_PERMISSIONS +/usr/bin/sudo f 4755 0 0 - - - - - +endef + $(eval $(autotools-package)) diff --git a/package/synergy/synergy.mk b/package/synergy/synergy.mk index b1afff7da..240f83cdb 100644 --- a/package/synergy/synergy.mk +++ b/package/synergy/synergy.mk @@ -6,7 +6,7 @@ SYNERGY_VERSION = 1.3.1 SYNERGY_SOURCE = synergy-$(SYNERGY_VERSION).tar.gz -SYNERGY_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/synergy2/ +SYNERGY_SITE = http://downloads.sourceforge.net/project/synergy2/Sources/$(SYNERGY_VERSION) SYNERGY_AUTORECONF = YES SYNERGY_CONF_OPT = --x-includes=$(STAGING_DIR)/usr/include/X11 \ diff --git a/package/tcl/tcl.mk b/package/tcl/tcl.mk index a48f69d3d..606042e4e 100644 --- a/package/tcl/tcl.mk +++ b/package/tcl/tcl.mk @@ -7,7 +7,7 @@ TCL_VERSION_MAJOR = 8.4 TCL_VERSION_MINOR = 19 TCL_VERSION = $(TCL_VERSION_MAJOR).$(TCL_VERSION_MINOR) TCL_SOURCE = tcl$(TCL_VERSION)-src.tar.gz -TCL_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/tcl +TCL_SITE = http://downloads.sourceforge.net/project/tcl/Tcl/$(TCL_VERSION_MAJOR).$(TCL_VERSION_MINOR) TCL_SUBDIR = unix TCL_CONF_OPT = \ --disable-symbols \ diff --git a/package/tcpreplay/tcpreplay.mk b/package/tcpreplay/tcpreplay.mk index 3c23c6a76..2662a7d89 100644 --- a/package/tcpreplay/tcpreplay.mk +++ b/package/tcpreplay/tcpreplay.mk @@ -5,7 +5,7 @@ ############################################################# TCPREPLAY_VERSION = 3.4.3 -TCPREPLAY_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/tcpreplay +TCPREPLAY_SITE = http://downloads.sourceforge.net/project/tcpreplay/tcpreplay/$(TCPREPLAY_VERSION) TCPREPLAY_CONF_ENV = tr_cv_libpcap_version=">= 0.7.0" TCPREPLAY_CONF_OPT = --with-libpcap=$(STAGING_DIR)/usr TCPREPLAY_AUTORECONF = YES diff --git a/package/tinyhttpd/tinyhttpd.mk b/package/tinyhttpd/tinyhttpd.mk index 238330ec2..3d1845dd4 100644 --- a/package/tinyhttpd/tinyhttpd.mk +++ b/package/tinyhttpd/tinyhttpd.mk @@ -4,7 +4,7 @@ # ############################################################# TINYHTTPD_VERSION = 0.1.0 -TINYHTTPD_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/tinyhttpd/ +TINYHTTPD_SITE = http://downloads.sourceforge.net/project/tinyhttpd/tinyhttpd%20source/tinyhttpd%20$(TINYHTTPD_VERSION) define TINYHTTPD_BUILD_CMDS $(MAKE) -C $(@D) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \ diff --git a/package/tn5250/tn5250.mk b/package/tn5250/tn5250.mk index 9b5e60e6b..f43f84759 100644 --- a/package/tn5250/tn5250.mk +++ b/package/tn5250/tn5250.mk @@ -5,7 +5,7 @@ ############################################################# TN5250_VERSION = 0.17.4 -TN5250_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/tn5250 +TN5250_SITE = http://downloads.sourceforge.net/project/tn5250/tn5250/$(TN5250_VERSION) TN5250_MAKE_OPT = CPPFLAGS="" TN5250_DEPENDENCIES = ncurses diff --git a/package/vtun/vtun.mk b/package/vtun/vtun.mk index f2cef6cea..2b24c681f 100644 --- a/package/vtun/vtun.mk +++ b/package/vtun/vtun.mk @@ -8,7 +8,7 @@ ############################################################# VTUN_VERSION:=3.0.2 VTUN_SOURCE:=vtun-$(VTUN_VERSION).tar.gz -VTUN_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/vtun/ +VTUN_SITE:=http://downloads.sourceforge.net/project/vtun/vtun/$(VTUN_VERSION) VTUN_DEPENDENCIES = zlib lzo openssl VTUN_CONF_OPT = \ diff --git a/package/wipe/wipe.mk b/package/wipe/wipe.mk index 289102f25..e523a311c 100644 --- a/package/wipe/wipe.mk +++ b/package/wipe/wipe.mk @@ -5,7 +5,7 @@ ############################################################# WIPE_VERSION = 2.3.1 -WIPE_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/wipe +WIPE_SITE = http://downloads.sourceforge.net/project/wipe/wipe/$(WIPE_VERSION) WIPE_SOURCE = wipe-$(WIPE_VERSION).tar.bz2 WIPE_AUTORECONF = YES diff --git a/package/wsapi/wsapi.mk b/package/wsapi/wsapi.mk index f5423f314..eb2b51c3d 100644 --- a/package/wsapi/wsapi.mk +++ b/package/wsapi/wsapi.mk @@ -7,6 +7,7 @@ WSAPI_VERSION = 1.5 WSAPI_SITE = http://github.com/downloads/keplerproject/wsapi WSAPI_DEPENDENCIES = coxpcall luafilesystem rings +WSAPI_LICENSE = MIT define WSAPI_INSTALL_TARGET_CMDS mkdir -p $(TARGET_DIR)/usr/share/lua/wsapi diff --git a/package/x11vnc/x11vnc.mk b/package/x11vnc/x11vnc.mk index 06d3f0da4..e96b66588 100644 --- a/package/x11vnc/x11vnc.mk +++ b/package/x11vnc/x11vnc.mk @@ -5,7 +5,7 @@ ############################################################# X11VNC_VERSION = 0.9.3 X11VNC_SOURCE = x11vnc-$(X11VNC_VERSION).tar.gz -X11VNC_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/libvncserver +X11VNC_SITE = http://downloads.sourceforge.net/project/libvncserver/x11vnc/$(X11VNC_VERSION) X11VNC_CONF_OPT = \ --without-avahi diff --git a/package/xavante/xavante.mk b/package/xavante/xavante.mk index f885fbd1c..0c1c6f1ac 100644 --- a/package/xavante/xavante.mk +++ b/package/xavante/xavante.mk @@ -7,6 +7,7 @@ XAVANTE_VERSION = 2.2.1 XAVANTE_SITE = http://github.com/downloads/keplerproject/xavante XAVANTE_DEPENDENCIES = cgilua copas coxpcall lua luafilesystem luasocket wsapi +XAVANTE_LICENSE = MIT define XAVANTE_INSTALL_TARGET_CMDS $(MAKE) -C $(@D) PREFIX=/usr \ diff --git a/package/xinetd/xinetd.mk b/package/xinetd/xinetd.mk index a209d12ae..4fc2de9b2 100644 --- a/package/xinetd/xinetd.mk +++ b/package/xinetd/xinetd.mk @@ -3,9 +3,11 @@ # xinetd # ############################################################# -XINETD_VERSION = 2.3.15 -XINETD_SOURCE = xinetd-$(XINETD_VERSION).tar.gz -XINETD_SITE = http://www.xinetd.org +XINETD_VERSION = 2.3.15 +XINETD_SOURCE = xinetd-$(XINETD_VERSION).tar.gz +XINETD_SITE = http://www.xinetd.org +XINETD_LICENSE = xinetd license +XINETD_LICENSE_FILES = COPYRIGHT ifneq ($(BR2_INET_RPC),y) XINETD_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -DNO_RPC" diff --git a/package/xmlstarlet/xmlstarlet.mk b/package/xmlstarlet/xmlstarlet.mk index 90617147d..5919619ba 100644 --- a/package/xmlstarlet/xmlstarlet.mk +++ b/package/xmlstarlet/xmlstarlet.mk @@ -5,7 +5,7 @@ ############################################################# XMLSTARLET_VERSION = 1.3.0 -XMLSTARLET_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/xmlstar/xmlstarlet/$(XMLSTARLET_VERSION) +XMLSTARLET_SITE = http://downloads.sourceforge.net/project/xmlstar/xmlstarlet/$(XMLSTARLET_VERSION) XMLSTARLET_DEPENDENCIES += libxml2 libxslt \ $(if $(BR2_PACKAGE_LIBICONV),libiconv) diff --git a/package/yajl/yajl.mk b/package/yajl/yajl.mk index 6c4278ef4..9cebeb77e 100644 --- a/package/yajl/yajl.mk +++ b/package/yajl/yajl.mk @@ -7,5 +7,7 @@ YAJL_VERSION = 2.0.4 YAJL_SITE = git://github.com/lloyd/yajl.git YAJL_INSTALL_STAGING = YES +YAJL_LICENSE = ISC +YAJL_LICENSE_FILES = COPYING $(eval $(cmake-package)) diff --git a/package/zlib/zlib.mk b/package/zlib/zlib.mk index a9d4a8ff9..f127138db 100644 --- a/package/zlib/zlib.mk +++ b/package/zlib/zlib.mk @@ -6,7 +6,9 @@ ZLIB_VERSION = 1.2.7 ZLIB_SOURCE =zlib-$(ZLIB_VERSION).tar.bz2 -ZLIB_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/libpng +ZLIB_SITE = http://downloads.sourceforge.net/project/libpng/zlib/$(ZLIB_VERSION) +ZLIB_LICENSE = zlib license +ZLIB_LICENSE_FILES = README ZLIB_INSTALL_STAGING = YES ifeq ($(BR2_PREFER_STATIC_LIB),y) diff --git a/package/zxing/zxing.mk b/package/zxing/zxing.mk index 54383e71a..851aef6d4 100644 --- a/package/zxing/zxing.mk +++ b/package/zxing/zxing.mk @@ -6,6 +6,8 @@ ZXING_VERSION = 2.0 ZXING_SITE = http://zxing.googlecode.com/files ZXING_SOURCE = ZXing-$(ZXING_VERSION).zip +ZXING_LICENSE = Apache v2.0 +ZXING_LICENSE_FILES = COPYING ZXING_INSTALL_STAGING = YES ifneq ($(BR2_ENABLE_LOCALE),y) diff --git a/support/scripts/graph-depends b/support/scripts/graph-depends index da050da8a..409c12301 100755 --- a/support/scripts/graph-depends +++ b/support/scripts/graph-depends @@ -53,7 +53,7 @@ unknownpkgs = [] # list is used as the starting point for full dependency graphs def get_targets(): sys.stderr.write("Getting targets\n") - cmd = ["make", "show-targets"] + cmd = ["make", "-s", "show-targets"] p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE) output = p.communicate()[0].strip() if p.returncode != 0: @@ -67,7 +67,7 @@ def get_targets(): # formatted as a Python list. def get_depends(pkg): sys.stderr.write("Getting dependencies for %s\n" % pkg) - cmd = ["make", "%s-show-depends" % pkg] + cmd = ["make", "-s", "%s-show-depends" % pkg] p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE) output = p.communicate()[0].strip() if p.returncode != 0: diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats index de73eeb27..9c8ec492c 100755 --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@ -66,6 +66,7 @@ td.lotsofpatches { <td class=\"centered\">Patch count</td> <td class=\"centered\">Infrastructure</td> <td class=\"centered\">License</td> +<td class=\"centered\">License files</td> </tr> " @@ -75,6 +76,8 @@ generic_packages=0 manual_packages=0 packages_with_licence=0 packages_without_licence=0 +packages_with_license_files=0 +packages_without_license_files=0 total_patch_count=0 cnt=0 @@ -155,7 +158,7 @@ for i in $(find boot/ linux/ package/ -name '*.mk' | sort) ; do generic_packages=$(($generic_packages+1)) fi - if grep -qE "^${pkgvariable}_LICENSE =" $i ; then + if grep -qE "^${pkgvariable}_LICENSE[ ]*=" $i ; then packages_with_license=$(($packages_with_license+1)) license=1 else @@ -163,6 +166,14 @@ for i in $(find boot/ linux/ package/ -name '*.mk' | sort) ; do license=0 fi + if grep -qE "^${pkgvariable}_LICENSE_FILES[ ]*=" $i ; then + packages_with_license_files=$(($packages_with_license_files+1)) + license_files=1 + else + packages_without_license_files=$(($packages_without_license_files+1)) + license_files=0 + fi + echo "<tr>" echo "<td>$cnt</td>" @@ -205,6 +216,12 @@ for i in $(find boot/ linux/ package/ -name '*.mk' | sort) ; do echo "<td class=\"centered correct\">Yes</td>" fi + if [ ${license_files} -eq 0 ] ; then + echo "<td class=\"centered wrong\">No</td>" + else + echo "<td class=\"centered correct\">Yes</td>" + fi + echo "</tr>" done @@ -236,6 +253,14 @@ echo "<td>Packages not having licence information</td>" echo "<td>$packages_without_license</td>" echo "</tr>" echo "<tr>" +echo "<td>Packages having license files information</td>" +echo "<td>$packages_with_license_files</td>" +echo "</tr>" +echo "<tr>" +echo "<td>Packages not having licence files information</td>" +echo "<td>$packages_without_license_files</td>" +echo "</tr>" +echo "<tr>" echo "<td>Number of patches in all packages</td>" echo "<td>$total_patch_count</td>" echo "</tr>" diff --git a/target/generic/Config.in b/target/generic/Config.in index a83ba442c..b8472f4e8 100644 --- a/target/generic/Config.in +++ b/target/generic/Config.in @@ -64,6 +64,9 @@ comment 'systemd requires largefile, wchar, IPv6, threads and udev support' BR2_INET_IPV6 && BR2_TOOLCHAIN_HAS_THREADS && \ BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV) +config BR2_INIT_NONE + bool "None" + endchoice config BR2_ROOTFS_DEVICE_TABLE diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk index 49a90441b..d5ab91b3d 100644 --- a/toolchain/helpers.mk +++ b/toolchain/helpers.mk @@ -196,7 +196,7 @@ check_glibc_feature = \ # check_glibc = \ SYSROOT_DIR="$(strip $1)"; \ - if test `find $${SYSDROOT_DIR}/lib/ -maxdepth 1 -name 'ld-linux*.so.*' -o -name 'ld.so.*' | wc -l` -eq 0 ; then \ + if test `find $${SYSROOT_DIR}/lib/ -maxdepth 1 -name 'ld-linux*.so.*' -o -name 'ld.so.*' | wc -l` -eq 0 ; then \ echo "Incorrect selection of the C library"; \ exit -1; \ fi; \ diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in index 96dd129c7..dc5c2adc6 100644 --- a/toolchain/kernel-headers/Config.in +++ b/toolchain/kernel-headers/Config.in @@ -64,10 +64,10 @@ config BR2_DEFAULT_KERNEL_HEADERS default "2.6.37.6" if BR2_KERNEL_HEADERS_2_6_37 default "2.6.38.8" if BR2_KERNEL_HEADERS_2_6_38 default "2.6.39.4" if BR2_KERNEL_HEADERS_2_6_39 - default "3.0.38" if BR2_KERNEL_HEADERS_3_0 + default "3.0.40" if BR2_KERNEL_HEADERS_3_0 default "3.1.10" if BR2_KERNEL_HEADERS_3_1 - default "3.2.24" if BR2_KERNEL_HEADERS_3_2 + default "3.2.26" if BR2_KERNEL_HEADERS_3_2 default "3.3.8" if BR2_KERNEL_HEADERS_3_3 - default "3.4.7" if BR2_KERNEL_HEADERS_3_4 + default "3.4.8" if BR2_KERNEL_HEADERS_3_4 default "2.6" if BR2_KERNEL_HEADERS_SNAP default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION diff --git a/toolchain/kernel-headers/linux-3.0.38-headers_install-fix-__packed-in-exported-kernel-head.patch b/toolchain/kernel-headers/linux-3.0.40-headers_install-fix-__packed-in-exported-kernel-head.patch index 8777b7163..8777b7163 100644 --- a/toolchain/kernel-headers/linux-3.0.38-headers_install-fix-__packed-in-exported-kernel-head.patch +++ b/toolchain/kernel-headers/linux-3.0.40-headers_install-fix-__packed-in-exported-kernel-head.patch diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-eglibc b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-eglibc index 58cdff2d3..6c559219e 100644 --- a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-eglibc +++ b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-eglibc @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# crosstool-NG 1.15.0 Configuration -# Mon May 7 18:54:54 2012 +# crosstool-NG 1.16.0 Configuration +# Sun Aug 5 20:02:42 2012 # CT_CONFIGURE_has_xz=y CT_CONFIGURE_has_cvs=y @@ -178,17 +178,15 @@ CT_BUILD_SUFFIX="" # CT_KERNEL_SUPPORTS_SHARED_LIBS=y CT_KERNEL="linux" -CT_KERNEL_VERSION="3.3.4" +CT_KERNEL_VERSION="3.5" CT_KERNEL_linux=y CT_KERNEL_linux_AVAILABLE=y -CT_KERNEL_V_3_3_4=y -# CT_KERNEL_V_3_3_3 is not set -# CT_KERNEL_V_3_3_2 is not set -# CT_KERNEL_V_3_3_1 is not set -# CT_KERNEL_V_3_3 is not set -# CT_KERNEL_V_3_2_16 is not set +CT_KERNEL_V_3_5=y +# CT_KERNEL_V_3_4_7 is not set +# CT_KERNEL_V_3_3_8 is not set +# CT_KERNEL_V_3_2_25 is not set # CT_KERNEL_V_3_1_10 is not set -# CT_KERNEL_V_3_0_30 is not set +# CT_KERNEL_V_3_0_39 is not set # CT_KERNEL_V_2_6_39_4 is not set # CT_KERNEL_V_2_6_38_8 is not set # CT_KERNEL_V_2_6_37_6 is not set @@ -326,6 +324,7 @@ CT_LIBC="eglibc" CT_LIBC_VERSION="2_12" CT_LIBC_eglibc=y CT_LIBC_eglibc_AVAILABLE=y +# CT_LIBC_EGLIBC_V_2_16 is not set # CT_LIBC_EGLIBC_V_2_15 is not set # CT_LIBC_EGLIBC_V_2_14 is not set # CT_LIBC_EGLIBC_V_2_13 is not set @@ -394,7 +393,7 @@ CT_LIBC_ADDONS_LIST="" # CT_LIBC_GLIBC_KERNEL_VERSION_NONE is not set CT_LIBC_GLIBC_KERNEL_VERSION_AS_HEADERS=y # CT_LIBC_GLIBC_KERNEL_VERSION_CHOSEN is not set -CT_LIBC_GLIBC_MIN_KERNEL="3.3.4" +CT_LIBC_GLIBC_MIN_KERNEL="3.5" # # Debug facilities @@ -414,17 +413,25 @@ CT_GMP=y CT_MPFR=y CT_PPL=y CT_CLOOG=y +# CT_GMP_V_5_0_2 is not set +# CT_GMP_V_5_0_1 is not set CT_GMP_V_4_3_2=y # CT_GMP_V_4_3_1 is not set # CT_GMP_V_4_3_0 is not set CT_GMP_VERSION="4.3.2" +# CT_MPFR_V_3_1_0 is not set +# CT_MPFR_V_3_0_1 is not set # CT_MPFR_V_3_0_0 is not set CT_MPFR_V_2_4_2=y # CT_MPFR_V_2_4_1 is not set # CT_MPFR_V_2_4_0 is not set CT_MPFR_VERSION="2.4.2" +# CT_PPL_V_0_11_2 is not set +# CT_PPL_V_0_11_1 is not set +# CT_PPL_V_0_11 is not set CT_PPL_V_0_10_2=y CT_PPL_VERSION="0.10.2" +# CT_CLOOG_V_0_15_11 is not set # CT_CLOOG_V_0_15_10 is not set CT_CLOOG_V_0_15_9=y # CT_CLOOG_V_0_15_8 is not set diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-glibc b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-glibc index db724ab40..3910bdbed 100644 --- a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-glibc +++ b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-glibc @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# crosstool-NG 1.15.0 Configuration -# Mon May 7 18:58:51 2012 +# crosstool-NG 1.16.0 Configuration +# Sun Aug 5 21:39:12 2012 # CT_CONFIGURE_has_xz=y CT_CONFIGURE_has_cvs=y @@ -178,17 +178,15 @@ CT_BUILD_SUFFIX="" # CT_KERNEL_SUPPORTS_SHARED_LIBS=y CT_KERNEL="linux" -CT_KERNEL_VERSION="3.3.4" +CT_KERNEL_VERSION="3.5" CT_KERNEL_linux=y CT_KERNEL_linux_AVAILABLE=y -CT_KERNEL_V_3_3_4=y -# CT_KERNEL_V_3_3_3 is not set -# CT_KERNEL_V_3_3_2 is not set -# CT_KERNEL_V_3_3_1 is not set -# CT_KERNEL_V_3_3 is not set -# CT_KERNEL_V_3_2_16 is not set +CT_KERNEL_V_3_5=y +# CT_KERNEL_V_3_4_7 is not set +# CT_KERNEL_V_3_3_8 is not set +# CT_KERNEL_V_3_2_25 is not set # CT_KERNEL_V_3_1_10 is not set -# CT_KERNEL_V_3_0_30 is not set +# CT_KERNEL_V_3_0_39 is not set # CT_KERNEL_V_2_6_39_4 is not set # CT_KERNEL_V_2_6_38_8 is not set # CT_KERNEL_V_2_6_37_6 is not set @@ -361,7 +359,7 @@ CT_LIBC_ADDONS_LIST="" # CT_LIBC_GLIBC_KERNEL_VERSION_NONE is not set CT_LIBC_GLIBC_KERNEL_VERSION_AS_HEADERS=y # CT_LIBC_GLIBC_KERNEL_VERSION_CHOSEN is not set -CT_LIBC_GLIBC_MIN_KERNEL="3.3.4" +CT_LIBC_GLIBC_MIN_KERNEL="3.5" # # glibc other options @@ -405,17 +403,25 @@ CT_GMP=y CT_MPFR=y CT_PPL=y CT_CLOOG=y +# CT_GMP_V_5_0_2 is not set +# CT_GMP_V_5_0_1 is not set CT_GMP_V_4_3_2=y # CT_GMP_V_4_3_1 is not set # CT_GMP_V_4_3_0 is not set CT_GMP_VERSION="4.3.2" +# CT_MPFR_V_3_1_0 is not set +# CT_MPFR_V_3_0_1 is not set # CT_MPFR_V_3_0_0 is not set CT_MPFR_V_2_4_2=y # CT_MPFR_V_2_4_1 is not set # CT_MPFR_V_2_4_0 is not set CT_MPFR_VERSION="2.4.2" +# CT_PPL_V_0_11_2 is not set +# CT_PPL_V_0_11_1 is not set +# CT_PPL_V_0_11 is not set CT_PPL_V_0_10_2=y CT_PPL_VERSION="0.10.2" +# CT_CLOOG_V_0_15_11 is not set # CT_CLOOG_V_0_15_10 is not set CT_CLOOG_V_0_15_9=y # CT_CLOOG_V_0_15_8 is not set diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-uClibc b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-uClibc index 5f1ee7ea8..5155e6c67 100644 --- a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-uClibc +++ b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-uClibc @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# crosstool-NG 1.15.0 Configuration -# Mon May 7 18:49:59 2012 +# crosstool-NG 1.16.0 Configuration +# Sun Aug 5 17:33:46 2012 # CT_CONFIGURE_has_xz=y CT_CONFIGURE_has_cvs=y @@ -178,17 +178,15 @@ CT_BUILD_SUFFIX="" # CT_KERNEL_SUPPORTS_SHARED_LIBS=y CT_KERNEL="linux" -CT_KERNEL_VERSION="3.3.4" +CT_KERNEL_VERSION="3.5" CT_KERNEL_linux=y CT_KERNEL_linux_AVAILABLE=y -CT_KERNEL_V_3_3_4=y -# CT_KERNEL_V_3_3_3 is not set -# CT_KERNEL_V_3_3_2 is not set -# CT_KERNEL_V_3_3_1 is not set -# CT_KERNEL_V_3_3 is not set -# CT_KERNEL_V_3_2_16 is not set +CT_KERNEL_V_3_5=y +# CT_KERNEL_V_3_4_7 is not set +# CT_KERNEL_V_3_3_8 is not set +# CT_KERNEL_V_3_2_25 is not set # CT_KERNEL_V_3_1_10 is not set -# CT_KERNEL_V_3_0_30 is not set +# CT_KERNEL_V_3_0_39 is not set # CT_KERNEL_V_2_6_39_4 is not set # CT_KERNEL_V_2_6_38_8 is not set # CT_KERNEL_V_2_6_37_6 is not set @@ -322,10 +320,11 @@ CT_CC_GCC_LDBL_128=m # C-library # CT_LIBC="uClibc" -CT_LIBC_VERSION="0.9.33.1" +CT_LIBC_VERSION="0.9.33.2" CT_LIBC_uClibc=y CT_LIBC_uClibc_AVAILABLE=y -# CT_LIBC_UCLIBC_V_0_9_33_1=y +CT_LIBC_UCLIBC_V_0_9_33_2=y +# CT_LIBC_UCLIBC_V_0_9_33_1 is not set # CT_LIBC_UCLIBC_V_0_9_33 is not set # CT_LIBC_UCLIBC_V_0_9_32_1 is not set # CT_LIBC_UCLIBC_V_0_9_32 is not set @@ -350,7 +349,7 @@ CT_LIBC_SUPPORT_THREADS_ANY=y CT_LIBC_SUPPORT_NPTL=y CT_LIBC_SUPPORT_LINUXTHREADS=y CT_LIBC_SUPPORT_THREADS_NONE=y -CT_THREADS="linuxthreads" +CT_THREADS="nptl" # # Common C library options @@ -363,11 +362,9 @@ CT_LIBC_XLDD=y # # uClibc other options # -CT_LIBC_UCLIBC_LNXTHRD_OLD=y -# CT_LIBC_UCLIBC_LNXTHRD_NEW is not set -CT_LIBC_UCLIBC_LNXTHRD="old" +CT_LIBC_UCLIBC_LNXTHRD="" # CT_LIBC_UCLIBC_LOCALES is not set -# CT_LIBC_UCLIBC_WCHAR is not set +CT_LIBC_UCLIBC_WCHAR=y # # Debug facilities @@ -387,17 +384,25 @@ CT_GMP=y CT_MPFR=y CT_PPL=y CT_CLOOG=y +# CT_GMP_V_5_0_2 is not set +# CT_GMP_V_5_0_1 is not set CT_GMP_V_4_3_2=y # CT_GMP_V_4_3_1 is not set # CT_GMP_V_4_3_0 is not set CT_GMP_VERSION="4.3.2" +# CT_MPFR_V_3_1_0 is not set +# CT_MPFR_V_3_0_1 is not set # CT_MPFR_V_3_0_0 is not set CT_MPFR_V_2_4_2=y # CT_MPFR_V_2_4_1 is not set # CT_MPFR_V_2_4_0 is not set CT_MPFR_VERSION="2.4.2" +# CT_PPL_V_0_11_2 is not set +# CT_PPL_V_0_11_1 is not set +# CT_PPL_V_0_11 is not set CT_PPL_V_0_10_2=y CT_PPL_VERSION="0.10.2" +# CT_CLOOG_V_0_15_11 is not set # CT_CLOOG_V_0_15_10 is not set CT_CLOOG_V_0_15_9=y # CT_CLOOG_V_0_15_8 is not set |