From 413d8296897b22111a216cd9679fb69fe4f650fd Mon Sep 17 00:00:00 2001 From: Ismael Luceno Date: Thu, 25 Sep 2014 08:48:19 -0300 Subject: dcmtk: new spell, DICOM Toolkit --- ChangeLog | 1 + graphics/dcmtk/DEPENDS | 27 +++++++++++++++++++++++++++ graphics/dcmtk/DETAILS | 25 +++++++++++++++++++++++++ graphics/dcmtk/HISTORY | 2 ++ 4 files changed, 55 insertions(+) create mode 100755 graphics/dcmtk/DEPENDS create mode 100755 graphics/dcmtk/DETAILS create mode 100644 graphics/dcmtk/HISTORY diff --git a/ChangeLog b/ChangeLog index a32fd50c7e..d872e2999e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,6 @@ 2014-09-25 Ismael Luceno * utils/lxc: new spell, Userspace tools for the Linux kernel containers + * graphics/dcmtk: new spell, DICOM Toolkit 2014-09-23 Pol Vinogradov * chat-im/pidgin-window-merge: new spell, one window plugin for Pidgin diff --git a/graphics/dcmtk/DEPENDS b/graphics/dcmtk/DEPENDS new file mode 100755 index 0000000000..cd1540e14a --- /dev/null +++ b/graphics/dcmtk/DEPENDS @@ -0,0 +1,27 @@ +optional_depends tiff \ + --with{,out}-libtiff \ + "for TIFF support" && + +optional_depends libpng \ + --with{,out}-libpng \ + "for PNG support" && + +optional_depends libxml2 \ + --with{,out}-libxml \ + "for XML meta-data?" && + +optional_depends zlib \ + --with{,out}-zlib \ + "for Zlib compression?" && + +optional_depends SSL \ + --with{,out}-openssl \ + "for DICOM security extensions" && + +optional_depends libsndfile \ + --with{,out}-libsndfile \ + "for Sound support" && + +optional_depends tcp_wrappers \ + --with{,out}-libwrap \ + "TCP wrapper access control" diff --git a/graphics/dcmtk/DETAILS b/graphics/dcmtk/DETAILS new file mode 100755 index 0000000000..2b712a4d4d --- /dev/null +++ b/graphics/dcmtk/DETAILS @@ -0,0 +1,25 @@ + SPELL=dcmtk + VERSION=3.6.0 + SOURCE="${SPELL}-${VERSION}.tar.gz" + SOURCE_URL[0]=ftp://dicom.offis.de/pub/dicom/offis/software/${SPELL}/${SPELL}360/${SOURCE} + SOURCE_HASH=sha512:2a9d866bafcaea72d889d24b51ff2341ee39c717aacf9ae5825c8588cd5cb01c3e341b6173abce751f6cb32c45be8888e81ccb08967cae2cca7fdcb2b61be53c +SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}" + WEB_SITE="http://dicom.offis.de/" + LICENSE[0]="ModifiedBSD/Mixed" + ENTERED=20140925 + KEYWORDS="" + SHORT="DICOM Toolkit" +cat << EOF +DCMTK is a collection of libraries and applications implementing large parts +the DICOM standard. It includes software for examining, constructing and +converting DICOM image files, handling offline media, sending and receiving +images over a network connection, as well as demonstrative image storage +and worklist servers. DCMTK is is written in a mixture of ANSI C and C++. It +comes in complete source code and is made available as "open source" software. + +DCMTK has been used at numerous DICOM demonstrations to provide central, +vendor-independent image storage and worklist servers (CTNs - Central Test +Nodes). It is used by hospitals and companies all over the world for a wide +variety of purposes ranging from being a tool for product testing to being +a building block for research projects, prototypes and commercial products. +EOF diff --git a/graphics/dcmtk/HISTORY b/graphics/dcmtk/HISTORY new file mode 100644 index 0000000000..723da0cbb4 --- /dev/null +++ b/graphics/dcmtk/HISTORY @@ -0,0 +1,2 @@ +2014-09-25 Ismael Luceno + * DEPENDS, DETAILS: spell created -- cgit v1.2.3 From 28ffdae80265529f7d7b28f75e6b6c445fcc3f9f Mon Sep 17 00:00:00 2001 From: Ismael Luceno Date: Thu, 25 Sep 2014 09:09:19 -0300 Subject: vtk 6.1.0 --- science-libs/vtk/BUILD | 4 +++- science-libs/vtk/DETAILS | 14 +++++++------- science-libs/vtk/HISTORY | 6 ++++++ 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/science-libs/vtk/BUILD b/science-libs/vtk/BUILD index 23466e0d20..b02713e03b 100755 --- a/science-libs/vtk/BUILD +++ b/science-libs/vtk/BUILD @@ -1,3 +1,4 @@ +export CFLAGS="${CFLAGS//-ffast-math}" && export VTK_DATA_ROOT=/usr/share/vtk/VTKData && export VTK_INSTALL_PATH=/usr && export CMAKE_INSTALL_PREFIX=/usr && @@ -6,7 +7,8 @@ cmake . && sedit "s/^CMAKE_INSTALL_PREFIX:PATH=.*$/CMAKE_INSTALL_PREFIX:PATH=\/usr/" CMakeCache.txt && sedit "s/BUILD_SHARED_LIBS\:BOOL=OFF/BUILD_SHARED_LIBS\:BOOL=ON/" CMakeCache.txt && sedit "s/CMAKE_BUILD_TYPE:STRING=/&Release/" CMakeCache.txt && -sedit "s/BUILD_EXAMPLES\:BOOL=OFF/BUILD_EXAMPLES\:BOOL=ON/" CMakeCache.txt && +# Building examples fails on VTK 6.1.0 +#sedit "s/BUILD_EXAMPLES\:BOOL=OFF/BUILD_EXAMPLES\:BOOL=ON/" CMakeCache.txt && sedit "s/VTK_USE_HYBRID\:BOOL=OFF/VTK_USE_HYBRID\:BOOL=ON/" CMakeCache.txt && sedit "s/CMAKE_CXX_FLAGS_RELEASE\:STRING=-O3/CMAKE_CXX_FLAGS_RELEASE\:STRING=$CFLAGS/" CMakeCache.txt && diff --git a/science-libs/vtk/DETAILS b/science-libs/vtk/DETAILS index 57ae1f6ec5..e52186c6e9 100755 --- a/science-libs/vtk/DETAILS +++ b/science-libs/vtk/DETAILS @@ -1,11 +1,11 @@ SPELL=vtk - VERSION=5.10.0 - SOURCE=${SPELL}-${VERSION}.tar.gz - SOURCE_DIRECTORY=$BUILD_DIRECTORY/VTK - SOURCE_URL[0]=http://www.vtk.org/files/release/${VERSION:0:4}/$SOURCE - WEB_SITE=http://public.kitware.com/VTK - LICENSE[0]=http://public.kitware.com/VTK/copyright.php - SOURCE_HASH=sha512:8603098fa316fa86f624cf05eed3882158aaf098fe371754fec93fe96ebbf965a5315b3bfc34784f8adb0b46a545bd326c80e11e11157f3f96d33b36fb177554 + VERSION=6.1.0 + SOURCE=VTK-$VERSION.tar.gz + SOURCE_DIRECTORY=$BUILD_DIRECTORY/VTK-$VERSION + SOURCE_URL[0]=http://www.vtk.org/files/release/${VERSION%.*}/$SOURCE + WEB_SITE=http://www.vtk.org/ + LICENSE[0]=modified-bsd + SOURCE_HASH=sha512:3ab922166502348e5cdd68e14dbf4717c0405c9d8881c04aa8be8f95d8516af39cd02aaca5171c6de8af1b462ca386399b7a87a843ec62999f0f32c11788a2dc ENTERED=20020606 KEYWORDS="science libs" SHORT="library for visualization, image processing, 3D graphics" diff --git a/science-libs/vtk/HISTORY b/science-libs/vtk/HISTORY index a62468bae4..0df607299e 100644 --- a/science-libs/vtk/HISTORY +++ b/science-libs/vtk/HISTORY @@ -1,3 +1,9 @@ +2014-09-25 Ismael Luceno + * DETAILS: Fixed SOURCE, SOURCE_DIRECTORY, WEB_SITE and LICENSE + Disabled building examples + Remove -ffast-math CFLAG (makes internal sqlite build fail) + updated spell to 6.1.0 + 2012-10-16 Ladislav Hagara * DETAILS: 5.10.0 -- cgit v1.2.3 From 21bcaa21d11748e0b7a37b63c58c4bf17a5ec1f9 Mon Sep 17 00:00:00 2001 From: Remko van der Vossen Date: Fri, 19 Sep 2014 13:10:19 +0900 Subject: xdm: proper optional dependecy descriptions --- xorg-app/xdm/DEPENDS | 34 +++++++++++++++++----------------- xorg-app/xdm/HISTORY | 1 + 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/xorg-app/xdm/DEPENDS b/xorg-app/xdm/DEPENDS index 2fbe879f83..8590226029 100755 --- a/xorg-app/xdm/DEPENDS +++ b/xorg-app/xdm/DEPENDS @@ -12,24 +12,24 @@ depends libxt && depends util-macros && depends xproto && -optional_depends libxft \ - '--with-xft' \ - '--without-xft' \ +optional_depends libxft \ + '--with-xft' \ + '--without-xft' \ 'for Xft font rendering' && -optional_depends libxinerama \ - "" \ - "" \ - "Someone needs to describe this nicely." && +optional_depends libxinerama \ + "" \ + "" \ + "for multi-display extended desktop support" && -optional_depends libxpm \ - "" \ - "" \ - "Someone needs to describe this nicely." && +optional_depends libxpm \ + "" \ + "" \ + "for XPM greeter logo support" && -optional_depends linux-pam \ - '--with-pam' \ - '--without-pam' \ +optional_depends linux-pam \ + '--with-pam' \ + '--without-pam' \ 'for Pluggable Authentication Module support' && optional_depends libselinux \ @@ -37,7 +37,7 @@ optional_depends libselinux \ "--without-selinux" \ "for Security Enhanced Linux support" && -suggest_depends xrdb \ - "" \ - "" \ +suggest_depends xrdb \ + "" \ + "" \ "for a customizable login window" diff --git a/xorg-app/xdm/HISTORY b/xorg-app/xdm/HISTORY index 2c83350e1c..b4e70e99f4 100644 --- a/xorg-app/xdm/HISTORY +++ b/xorg-app/xdm/HISTORY @@ -1,5 +1,6 @@ 2014-09-25 Remko van der Vossen * DEPENDS: added missing dependencies + * DEPENDS: proper optional dependency descriptions 2013-03-15 Florian Franzmann * DETAILS: version 1.1.11 -- cgit v1.2.3 From 9d0e4b04196826f87c70548b7e61078cd59ddb74 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 19 Sep 2014 13:15:24 +0900 Subject: mesalib: development: 7.11.2 --- graphics-libs/mesalib/DETAILS | 4 ++-- graphics-libs/mesalib/HISTORY | 1 + graphics-libs/mesalib/MesaLib-7.11.1.tar.bz2.sig | Bin 287 -> 0 bytes graphics-libs/mesalib/MesaLib-7.11.2.tar.bz2.sig | Bin 0 -> 72 bytes 4 files changed, 3 insertions(+), 2 deletions(-) delete mode 100644 graphics-libs/mesalib/MesaLib-7.11.1.tar.bz2.sig create mode 100644 graphics-libs/mesalib/MesaLib-7.11.2.tar.bz2.sig diff --git a/graphics-libs/mesalib/DETAILS b/graphics-libs/mesalib/DETAILS index f12b075d99..0936423cf1 100755 --- a/graphics-libs/mesalib/DETAILS +++ b/graphics-libs/mesalib/DETAILS @@ -13,7 +13,7 @@ case "$MESALIB_BRANCH" in VERSION=7.10.3 ;; development) - VERSION=7.11.1 + VERSION=7.11.2 ;; scm) VERSION=$(get_scm_version) @@ -28,7 +28,7 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/mesalib-git SOURCE_IGNORE=volatile else SOURCE=MesaLib-${VERSION}.tar.bz2 - SOURCE_URL[0]=ftp://ftp.freedesktop.org/pub/mesa/$VERSION/$SOURCE + SOURCE_URL[0]=ftp://ftp.freedesktop.org/pub/mesa/older-versions/${VERSION%%.*}.x/$VERSION/$SOURCE SOURCE_DIRECTORY=${BUILD_DIRECTORY}/Mesa-${VERSION} SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME" fi diff --git a/graphics-libs/mesalib/HISTORY b/graphics-libs/mesalib/HISTORY index 4908ae4038..9aa7580036 100644 --- a/graphics-libs/mesalib/HISTORY +++ b/graphics-libs/mesalib/HISTORY @@ -1,5 +1,6 @@ 2014-09-25 Remko van der Vossen * DEPENDS: libxt + * DETAILS: development: 7.11.2 2014-07-03 Ismael Luceno * DETAILS: Use get_scm_version diff --git a/graphics-libs/mesalib/MesaLib-7.11.1.tar.bz2.sig b/graphics-libs/mesalib/MesaLib-7.11.1.tar.bz2.sig deleted file mode 100644 index 291675359f..0000000000 Binary files a/graphics-libs/mesalib/MesaLib-7.11.1.tar.bz2.sig and /dev/null differ diff --git a/graphics-libs/mesalib/MesaLib-7.11.2.tar.bz2.sig b/graphics-libs/mesalib/MesaLib-7.11.2.tar.bz2.sig new file mode 100644 index 0000000000..d0a5d619b8 Binary files /dev/null and b/graphics-libs/mesalib/MesaLib-7.11.2.tar.bz2.sig differ -- cgit v1.2.3 From 85624ac3506d188967a0cca6ba8db1be6176af86 Mon Sep 17 00:00:00 2001 From: Remko van der Vossen Date: Fri, 19 Sep 2014 13:18:39 +0900 Subject: rxvt-unicode: clarify extended ISO 14755 modes --- shell-term-fm/rxvt-unicode/CONFIGURE | 2 +- shell-term-fm/rxvt-unicode/HISTORY | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/shell-term-fm/rxvt-unicode/CONFIGURE b/shell-term-fm/rxvt-unicode/CONFIGURE index c4ba723d01..5dd42aec21 100755 --- a/shell-term-fm/rxvt-unicode/CONFIGURE +++ b/shell-term-fm/rxvt-unicode/CONFIGURE @@ -24,7 +24,7 @@ config_query_option URXVT_FADING \ "--enable-fading" \ "--disable-fading" && config_query_option URXVT_ISO14755 \ - "enable support for extended ISO 14755 modes?" \ + "enable support for extended ISO 14755 modes (unicode codepoint input methods)?" \ y \ "--enable-iso14755" \ "--disable-iso14755" && diff --git a/shell-term-fm/rxvt-unicode/HISTORY b/shell-term-fm/rxvt-unicode/HISTORY index fbf2a5522c..5d88669740 100644 --- a/shell-term-fm/rxvt-unicode/HISTORY +++ b/shell-term-fm/rxvt-unicode/HISTORY @@ -1,3 +1,6 @@ +2014-09-25 Remko van der Vossen + * CONFIGURE: clarify what extended ISO 14755 modes means + 2014-06-07 Florian Franzmann * DEPENDS: add dependency on xproto * CONFIGURE, BUILD: make features configurable -- cgit v1.2.3 From e30a0e96cfd97182a7c93ad958243a1a57c2e77b Mon Sep 17 00:00:00 2001 From: Ismael Luceno Date: Thu, 25 Sep 2014 15:00:07 -0300 Subject: itk: new spell, toolkit for performing registration and segmentation --- ChangeLog | 2 ++ science-libs/itk/BUILD | 1 + science-libs/itk/DEPENDS | 1 + science-libs/itk/DETAILS | 21 +++++++++++++++++++++ science-libs/itk/HISTORY | 2 ++ 5 files changed, 27 insertions(+) create mode 100755 science-libs/itk/BUILD create mode 100755 science-libs/itk/DEPENDS create mode 100755 science-libs/itk/DETAILS create mode 100644 science-libs/itk/HISTORY diff --git a/ChangeLog b/ChangeLog index d872e2999e..a82f3b5552 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,8 @@ 2014-09-25 Ismael Luceno * utils/lxc: new spell, Userspace tools for the Linux kernel containers * graphics/dcmtk: new spell, DICOM Toolkit + * science-libs/itk: new spell, toolkit for performing registration + and segmentation 2014-09-23 Pol Vinogradov * chat-im/pidgin-window-merge: new spell, one window plugin for Pidgin diff --git a/science-libs/itk/BUILD b/science-libs/itk/BUILD new file mode 100755 index 0000000000..e013b8d866 --- /dev/null +++ b/science-libs/itk/BUILD @@ -0,0 +1 @@ +cmake_build diff --git a/science-libs/itk/DEPENDS b/science-libs/itk/DEPENDS new file mode 100755 index 0000000000..60dd6147cc --- /dev/null +++ b/science-libs/itk/DEPENDS @@ -0,0 +1 @@ +depends cmake diff --git a/science-libs/itk/DETAILS b/science-libs/itk/DETAILS new file mode 100755 index 0000000000..5d970a6ee4 --- /dev/null +++ b/science-libs/itk/DETAILS @@ -0,0 +1,21 @@ + SPELL=itk + VERSION=4.6.0 + SOURCE="InsightToolkit-${VERSION}.tar.gz" + SOURCE_URL[0]=http://sourceforge.net/projects/${SPELL}/files/${SPELL}/4.6/${SOURCE} + SOURCE_HASH=sha512:bed0d009b47f635a1af54f185d31123c58b64f1d10d7459d54e5806e158dc9eef2ff0ff0be341d1b74603c07477d40f8c34d6f7850147448148661352b41a010 +SOURCE_DIRECTORY="${BUILD_DIRECTORY}/InsightToolkit-${VERSION}" + WEB_SITE="http://www.itk.org/" + LICENSE[0]="apache-2.0" + ENTERED=20140925 + KEYWORDS="" + SHORT="toolkit for performing registration and segmentation" +cat << EOF +ITK is an open-source software toolkit for performing registration and +segmentation. Segmentation is the process of identifying and classifying +data found in a digitally sampled representation. Typically the sampled +representation is an image acquired from such medical instrumentation as CT, +MRI or ultrasound scanners. Registration is the task of aligning or developing +correspondences between data. For example, in the medical environment, a +CT scan may be aligned with a MRI scan in order to combine the information +contained in both. +EOF diff --git a/science-libs/itk/HISTORY b/science-libs/itk/HISTORY new file mode 100644 index 0000000000..a6d391e40a --- /dev/null +++ b/science-libs/itk/HISTORY @@ -0,0 +1,2 @@ +2014-09-25 Ismael Luceno + * BUILD, DEPENDS, DETAILS: spell created -- cgit v1.2.3 From d075d0bdb85b6fd78517064bc911af64a2ef5f4e Mon Sep 17 00:00:00 2001 From: Florian Franzmann Date: Thu, 25 Sep 2014 23:47:44 +0200 Subject: shell-term-fm/bash: fix CVE 2014 7169 --- shell-term-fm/bash/CVE-2014-7169.diff | 11 +++++++++++ shell-term-fm/bash/DETAILS | 2 +- shell-term-fm/bash/HISTORY | 4 ++++ shell-term-fm/bash/PRE_BUILD | 2 ++ 4 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 shell-term-fm/bash/CVE-2014-7169.diff diff --git a/shell-term-fm/bash/CVE-2014-7169.diff b/shell-term-fm/bash/CVE-2014-7169.diff new file mode 100644 index 0000000000..356184bdcd --- /dev/null +++ b/shell-term-fm/bash/CVE-2014-7169.diff @@ -0,0 +1,11 @@ +--- a/bash/parse.y ++++ b/bash/parse.y +@@ -2848,6 +2848,8 @@ reset_parser () + FREE (word_desc_to_read); + word_desc_to_read = (WORD_DESC *)NULL; + ++ eol_ungetc_lookahead = 0; ++ + current_token = '\n'; /* XXX */ + last_read_token = '\n'; + token_to_read = '\n'; diff --git a/shell-term-fm/bash/DETAILS b/shell-term-fm/bash/DETAILS index f21474eaa8..ee8855857a 100755 --- a/shell-term-fm/bash/DETAILS +++ b/shell-term-fm/bash/DETAILS @@ -1,6 +1,6 @@ SPELL=bash VERSION=4.3 - SECURITY_PATCH=3 + SECURITY_PATCH=4 BASH_PATCHLEVEL=025 SOURCE=$SPELL-$VERSION.tar.gz SOURCE2=$SOURCE.sig diff --git a/shell-term-fm/bash/HISTORY b/shell-term-fm/bash/HISTORY index c1b3acb9c1..1bb70d8b89 100644 --- a/shell-term-fm/bash/HISTORY +++ b/shell-term-fm/bash/HISTORY @@ -1,3 +1,7 @@ +2014-09-25 Florian Franzmann + * DETAILS: SECURITY_PATCH++ + * PRE_BUILD, CVE-2014-7169.diff: fix CVE 2014 7169 + 2014-09-24 Florian Franzmann * DETAILS, PRE_BUILD: version 4.3 patchlevel 25 * patches/bash-42-*: removed diff --git a/shell-term-fm/bash/PRE_BUILD b/shell-term-fm/bash/PRE_BUILD index d3aa1ef942..a0f2d5ffb4 100755 --- a/shell-term-fm/bash/PRE_BUILD +++ b/shell-term-fm/bash/PRE_BUILD @@ -7,6 +7,8 @@ for i in $(seq -w 1 $BASH_PATCHLEVEL); do patch -p0 < $SPELL_DIRECTORY/patches/bash43-$i done && +patch -p2 < $SPELL_DIRECTORY/CVE-2014-7169.diff && + if [[ "$BASH_NI_LOGIN" == y ]]; then message "${MESSAGE_COLOR}Defining NON_INTERACTIVE_LOGIN_SHELLS.$DEFAULT_COLOR" && sed -i 's/\/\* \(#define NON_INTERACTIVE_LOGIN_SHELLS\) \*\//\1/' config-top.h -- cgit v1.2.3 From d39b3474611bd74b4fc3620dbee6fa23d9df3a85 Mon Sep 17 00:00:00 2001 From: Ismael Luceno Date: Thu, 25 Sep 2014 23:33:11 -0300 Subject: FUNCTIONS: cmake_build: Allow spaces in INSTALL_ROOT and SOURCE_DIRECTORY --- FUNCTIONS | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/FUNCTIONS b/FUNCTIONS index 4ca45106c8..28fd65092c 100755 --- a/FUNCTIONS +++ b/FUNCTIONS @@ -535,15 +535,15 @@ function waf_install() { # spells in several sections now need cmake or qt4 cmake_build() { - cd $SOURCE_DIRECTORY && + cd "$SOURCE_DIRECTORY" && mkdir -p build && cd build && prepare_cmake_flags && - cmake -DCMAKE_INSTALL_PREFIX=$INSTALL_ROOT/usr \ + cmake -DCMAKE_INSTALL_PREFIX="$INSTALL_ROOT"/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ -DCMAKE_INSTALL_MANDIR=share/man \ -DCMAKE_PREFIX_PATH=share/apps/cmake/modules \ - -DSYSCONFDIR=$INSTALL_ROOT/etc \ + -DSYSCONFDIR="$INSTALL_ROOT"/etc \ -DCMAKE_BUILD_TYPE=Release \ $OPTS ../ && make -- cgit v1.2.3 From a7c65807d897e99802049430c51810033f75231c Mon Sep 17 00:00:00 2001 From: Ismael Luceno Date: Thu, 25 Sep 2014 23:36:52 -0300 Subject: FUNCTIONS: cmake_build: Pass down CFLAGS and CXXFLAGS --- FUNCTIONS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/FUNCTIONS b/FUNCTIONS index 28fd65092c..55bef4fbda 100755 --- a/FUNCTIONS +++ b/FUNCTIONS @@ -545,6 +545,8 @@ cmake_build() { -DCMAKE_PREFIX_PATH=share/apps/cmake/modules \ -DSYSCONFDIR="$INSTALL_ROOT"/etc \ -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_C_FLAGS_RELEASE="$CFLAGS" \ + -DCMAKE_CXX_FLAGS_RELEASE="$CXXFLAGS" \ $OPTS ../ && make } -- cgit v1.2.3 From e560cf8a2dfd1cc4a9cd8fc406eec1c21874d6de Mon Sep 17 00:00:00 2001 From: Ismael Luceno Date: Thu, 25 Sep 2014 22:07:20 -0300 Subject: vtk: Replace custom code by cmake_build --- science-libs/vtk/BUILD | 88 ++++++++++-------------------------------------- science-libs/vtk/DEPENDS | 74 +++++++++++++++++----------------------- science-libs/vtk/HISTORY | 1 + 3 files changed, 49 insertions(+), 114 deletions(-) diff --git a/science-libs/vtk/BUILD b/science-libs/vtk/BUILD index b02713e03b..67e73c2c5c 100755 --- a/science-libs/vtk/BUILD +++ b/science-libs/vtk/BUILD @@ -1,72 +1,20 @@ -export CFLAGS="${CFLAGS//-ffast-math}" && -export VTK_DATA_ROOT=/usr/share/vtk/VTKData && -export VTK_INSTALL_PATH=/usr && -export CMAKE_INSTALL_PREFIX=/usr && +CFLAGS="${CFLAGS//-ffast-math}" && +CXXFLAGS="${CXXFLAGS//-ffast-math}" && -cmake . && -sedit "s/^CMAKE_INSTALL_PREFIX:PATH=.*$/CMAKE_INSTALL_PREFIX:PATH=\/usr/" CMakeCache.txt && -sedit "s/BUILD_SHARED_LIBS\:BOOL=OFF/BUILD_SHARED_LIBS\:BOOL=ON/" CMakeCache.txt && -sedit "s/CMAKE_BUILD_TYPE:STRING=/&Release/" CMakeCache.txt && -# Building examples fails on VTK 6.1.0 -#sedit "s/BUILD_EXAMPLES\:BOOL=OFF/BUILD_EXAMPLES\:BOOL=ON/" CMakeCache.txt && -sedit "s/VTK_USE_HYBRID\:BOOL=OFF/VTK_USE_HYBRID\:BOOL=ON/" CMakeCache.txt && -sedit "s/CMAKE_CXX_FLAGS_RELEASE\:STRING=-O3/CMAKE_CXX_FLAGS_RELEASE\:STRING=$CFLAGS/" CMakeCache.txt && - -#Use java. -if echo $OPTS| grep -q "with-java" ; then - sedit "s/VTK_USE_SYSTEM_ZLIB\:BOOL=OFF/VTK_USE_SYSTEM_ZLIB\:BOOL=ON/" CMakeCache.txt -fi && - -if echo $OPTS| grep -q "with-python"; then - sedit "s/Python language.\" OFF/Python language.\" ON/" CMakeLists.txt -fi && - -if echo $OPTS| grep -q "with-tcl"; then - sedit "s/TCL language.\" OFF/TCL language.\" ON/" CMakeLists.txt -fi && - -if echo $OPTS| grep -q "with-doxygen" ; then - sedit "s/BUILD_DOCUMENTATION\:BOOL=OFF/BUILD_DOCUMENTATION\:BOOL=ON/" CMakeCache.txt -fi && - -#Use the system's expat library. -if echo $OPTS| grep -q "with-expat" ; then - sedit "s/VTK_USE_SYSTEM_EXPAT\:BOOL=OFF/VTK_USE_SYSTEM_EXPAT\:BOOL=ON/" CMakeCache.txt -fi && - -#Use the system's jpeg library. -if echo $OPTS| grep -q "with-jpeg" ; then - sedit "s/VTK_USE_SYSTEM_JPEG\:BOOL=OFF/VTK_USE_SYSTEM_JPEG\:BOOL=ON/" CMakeCache.txt -fi && - -#Use the system's png library. -if echo $OPTS| grep -q "with-libpng" ; then - sedit "s/VTK_USE_SYSTEM_PNG\:BOOL=OFF/VTK_USE_SYSTEM_PNG\:BOOL=ON/" CMakeCache.txt -fi && - -#Use the system's tiff library. -if echo $OPTS| grep -q "with-tiff" ; then - sedit "s/VTK_USE_SYSTEM_TIFF\:BOOL=OFF/VTK_USE_SYSTEM_TIFF\:BOOL=ON/" CMakeCache.txt -fi && - -#Use the system's zlib library. -if echo $OPTS| grep -q "with-zlib" ; then - sedit "s/VTK_USE_SYSTEM_ZLIB\:BOOL=OFF/VTK_USE_SYSTEM_ZLIB\:BOOL=ON/" CMakeCache.txt -fi && - -make - -# java is a little broken for now -# if echo $OPTS| grep -q "with-java" ; then -# if spell_ok j2sdk ; then export JAVA_HOME=/usr/java/j2sdk; -# elif spell_ok j2sdk-bin ; then export JAVA_HOME=/usr/lib/j2sdk1.4.1 ; -# fi && -# sedit "s/Java language.\" OFF/Java language.\" ON/" CMakeLists.txt && -# stupid thing fails first time on purpose ! so don't use && OK ! -# cmake . -# sedit "s:^JAVA_AWT_INCLUDE_PATH\:PATH=.*$:JAVA_AWT_INCLUDE_PATH\:PATH=$JAVA_HOME\/include:" CMakeCache.txt && -# sedit "s:^JAVA_AWT_LIBRARY\:FILEPATH=.*$:JAVA_AWT_LIBRARY\:FILEPATH=$JAVA_HOME\/jre\/lib\/i386\/libawt.so:" CMakeCache.txt && -# sedit "s:^JAVA_INCLUDE_PATH\:PATH=.*$:JAVA_INCLUDE_PATH\:PATH=$JAVA_HOME\/include:" CMakeCache.txt && -# sedit "s:^JAVA_INCLUDE_PATH2\:PATH=.*$:JAVA_INCLUDE_PATH2\:PATH=$JAVA_HOME\/include\/linux:" CMakeCache.txt -# fi && +OPTS+=" -DBUILD_SHARED_LIBS=ON -DWTK_USE_HYBRID=ON" && +# Building examples fails on VTK 6.1.0 +#OPTS+=' -DBUILD_EXAMPLES=ON' + +# Java is a little broken for now +# if echo $OPTS | grep -q VTK_WRAP_JAVA=ON; then +# if [ -z "$JAVA_HOME" -a -f /etc/profile.d/java.sh ]; then +# . /etc/profile.d/java.sh +# fi && +# OPTS+=" -DJAVA_INCLUDE_PATH=$JAVA_HOME/include" +# OPTS+=" -DJAVA_INCLUDE_PATH2=$JAVA_HOME/include/linux" +# OPTS+=" -DJAVA_AWT_INCLUDE_PATH=$JAVA_HOME/include" +# OPTS+=" -DJAVA_AWT_LIBRARY=$JAVA_HOME/jre/lib/i386/libawt.so" +# fi + +cmake_build diff --git a/science-libs/vtk/DEPENDS b/science-libs/vtk/DEPENDS index 53c4c3bda5..cc6b6115ef 100755 --- a/science-libs/vtk/DEPENDS +++ b/science-libs/vtk/DEPENDS @@ -1,45 +1,31 @@ -depends cmake && -depends xorg-libs && -depends tk && - -#optional_depends 'JAVA' 'with-java' 'Wrap VTK classes into the JAVA language' 'z-rejected' && - -optional_depends python \ - "with-python" \ - "" \ - "Wrap VTK classes into the Python language" && - -optional_depends tcl \ - "with-tcl" \ - "" \ - "Wrap VTK classes into the tcl language" && - -optional_depends zlib \ - "with-zlib" \ - "" \ - "Use the system's zlib library" && - -optional_depends tiff \ - "with-tiff" \ - "" \ - "Use the system's tiff library" && - -optional_depends JPEG \ - "with-jpeg" \ - "" \ - "Use the system's jpeg library" && - -optional_depends libpng \ - "with-libpng" \ - "" \ - "Use the system's libpng library" && - -optional_depends expat \ - "with-expat" \ - "" \ - "Use the system's expat library" && - -optional_depends doxygen \ - "with-doxygen" \ - "" \ +optdep() { + local o="$3" + [ "$o" ] || o=$(tr a-z A-Z <<< "$1") + optional_depends "$1" -D"$2"_"$o"=O{N,FF} "$4" +} + +optsyslib() { + optdep "$1" WITH_SYSTEM "$2" "Use system's $1 library" +} + +optwrap() { + optdep "$1" VTK_WRAP "$2" "Wrap VTK classes into the $1 language" +} + +depends cmake && +depends xorg-libs && +depends tk && + +#optwrap JAVA && +optwrap python && +optwrap tcl && + +optsyslib zlib && +optsyslib tiff && +optsyslib JPEG && +optsyslib libpng PNG && +optsyslib expat && + +optional_depends doxygen \ + -DBUILD_DOCUMENTATION=O{N,FF} \ "build documentation" diff --git a/science-libs/vtk/HISTORY b/science-libs/vtk/HISTORY index 0df607299e..c34d6a45fb 100644 --- a/science-libs/vtk/HISTORY +++ b/science-libs/vtk/HISTORY @@ -3,6 +3,7 @@ Disabled building examples Remove -ffast-math CFLAG (makes internal sqlite build fail) updated spell to 6.1.0 + * BUILD, DEPENDS: Replace custom code by cmake_build 2012-10-16 Ladislav Hagara * DETAILS: 5.10.0 -- cgit v1.2.3 From 64d1ded0f0fdf48a51a74cb59cde5efa49defb29 Mon Sep 17 00:00:00 2001 From: Ismael Luceno Date: Thu, 25 Sep 2014 22:10:36 -0300 Subject: vtk: Add missing dependencies --- science-libs/vtk/DEPENDS | 10 ++++++++++ science-libs/vtk/HISTORY | 1 + 2 files changed, 11 insertions(+) diff --git a/science-libs/vtk/DEPENDS b/science-libs/vtk/DEPENDS index cc6b6115ef..b2e086af84 100755 --- a/science-libs/vtk/DEPENDS +++ b/science-libs/vtk/DEPENDS @@ -25,6 +25,16 @@ optsyslib tiff && optsyslib JPEG && optsyslib libpng PNG && optsyslib expat && +optsyslib libxml2 && +optsyslib freetype2 FREETYPE && +optsyslib gl2ps && +optsyslib hdf5 && +optsyslib netcdf && +optsyslib libtheora OGGTHEORA && + +#optsyslib jsoncpp && +#optsyslib libproj4 && +#optsyslib xdmf2 && optional_depends doxygen \ -DBUILD_DOCUMENTATION=O{N,FF} \ diff --git a/science-libs/vtk/HISTORY b/science-libs/vtk/HISTORY index c34d6a45fb..9b0a86728e 100644 --- a/science-libs/vtk/HISTORY +++ b/science-libs/vtk/HISTORY @@ -4,6 +4,7 @@ Remove -ffast-math CFLAG (makes internal sqlite build fail) updated spell to 6.1.0 * BUILD, DEPENDS: Replace custom code by cmake_build + * DEPENDS: Added missing dependencies 2012-10-16 Ladislav Hagara * DETAILS: 5.10.0 -- cgit v1.2.3 From ef3d9ac7e6fc8d78aa96341c6f9965fb628a7cfe Mon Sep 17 00:00:00 2001 From: Vlad Glagolev Date: Fri, 26 Sep 2014 11:08:40 +0400 Subject: monit: => 5.9 --- net/monit/DETAILS | 4 ++-- net/monit/HISTORY | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/net/monit/DETAILS b/net/monit/DETAILS index 15516f3831..396869296b 100755 --- a/net/monit/DETAILS +++ b/net/monit/DETAILS @@ -1,8 +1,8 @@ SPELL=monit - VERSION=5.8.1 + VERSION=5.9 SOURCE="${SPELL}-${VERSION}.tar.gz" SOURCE_URL[0]="http://mmonit.com/${SPELL}/dist/${SOURCE}" - SOURCE_HASH=sha512:0cf8b46ea5a5ab42beac4aab649d4fa324b03e02aaceee6a86968849db46b129cd8f20e314c855653620a0bd4b4aa105e2c812a386ddd2be3196ff956f1e7e11 + SOURCE_HASH=sha512:915d548d5a4e043b346ec32d9fd3131d7eafd8ed1167e4fca3d4918df9ff87a166dbb2b3398d59a8510c7190c43fe26043568742a27828257140683bea349c83 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}" WEB_SITE="http://mmonit.com/monit/" LICENSE[0]=GPL diff --git a/net/monit/HISTORY b/net/monit/HISTORY index b4a3c04069..a0688fdef9 100644 --- a/net/monit/HISTORY +++ b/net/monit/HISTORY @@ -1,5 +1,8 @@ -2014-08-19 Treeve Jelbert - * DEPENDS: openssl => SSL +2014-09-26 Vlad Glagolev + * DETAILS: updated spell to 5.9 + +2014-08-19 Treeve Jelbert + * DEPENDS: openssl => SSL 2014-05-13 Vlad Glagolev * DETAILS: updated spell to 5.8.1 -- cgit v1.2.3 From 707d46aaf0b9d27b9c4e9b3041892539adb78da9 Mon Sep 17 00:00:00 2001 From: Florian Franzmann Date: Fri, 26 Sep 2014 12:17:01 +0200 Subject: shell-term-fm/bash: replace unofficial patch for CVE 2014 7169 with the upstream patch --- shell-term-fm/bash/CVE-2014-7169.diff | 11 ------- shell-term-fm/bash/DETAILS | 2 +- shell-term-fm/bash/HISTORY | 4 +++ shell-term-fm/bash/PRE_BUILD | 2 -- shell-term-fm/bash/patches/bash43-026 | 60 +++++++++++++++++++++++++++++++++++ 5 files changed, 65 insertions(+), 14 deletions(-) delete mode 100644 shell-term-fm/bash/CVE-2014-7169.diff create mode 100644 shell-term-fm/bash/patches/bash43-026 diff --git a/shell-term-fm/bash/CVE-2014-7169.diff b/shell-term-fm/bash/CVE-2014-7169.diff deleted file mode 100644 index 356184bdcd..0000000000 --- a/shell-term-fm/bash/CVE-2014-7169.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- a/bash/parse.y -+++ b/bash/parse.y -@@ -2848,6 +2848,8 @@ reset_parser () - FREE (word_desc_to_read); - word_desc_to_read = (WORD_DESC *)NULL; - -+ eol_ungetc_lookahead = 0; -+ - current_token = '\n'; /* XXX */ - last_read_token = '\n'; - token_to_read = '\n'; diff --git a/shell-term-fm/bash/DETAILS b/shell-term-fm/bash/DETAILS index ee8855857a..7b7e94faf5 100755 --- a/shell-term-fm/bash/DETAILS +++ b/shell-term-fm/bash/DETAILS @@ -1,7 +1,7 @@ SPELL=bash VERSION=4.3 SECURITY_PATCH=4 - BASH_PATCHLEVEL=025 + BASH_PATCHLEVEL=026 SOURCE=$SPELL-$VERSION.tar.gz SOURCE2=$SOURCE.sig SOURCE3=$SPELL-doc-3.2.tar.gz diff --git a/shell-term-fm/bash/HISTORY b/shell-term-fm/bash/HISTORY index 1bb70d8b89..1b1a6d8836 100644 --- a/shell-term-fm/bash/HISTORY +++ b/shell-term-fm/bash/HISTORY @@ -1,3 +1,7 @@ +2014-09-26 Florian Franzmann + * PRE_BUILD, CVE-2014-7169.diff: remove unofficial patch + * DETAILS, patches/bash43-026 add upstream fix for CVE 2014 7169 + 2014-09-25 Florian Franzmann * DETAILS: SECURITY_PATCH++ * PRE_BUILD, CVE-2014-7169.diff: fix CVE 2014 7169 diff --git a/shell-term-fm/bash/PRE_BUILD b/shell-term-fm/bash/PRE_BUILD index a0f2d5ffb4..d3aa1ef942 100755 --- a/shell-term-fm/bash/PRE_BUILD +++ b/shell-term-fm/bash/PRE_BUILD @@ -7,8 +7,6 @@ for i in $(seq -w 1 $BASH_PATCHLEVEL); do patch -p0 < $SPELL_DIRECTORY/patches/bash43-$i done && -patch -p2 < $SPELL_DIRECTORY/CVE-2014-7169.diff && - if [[ "$BASH_NI_LOGIN" == y ]]; then message "${MESSAGE_COLOR}Defining NON_INTERACTIVE_LOGIN_SHELLS.$DEFAULT_COLOR" && sed -i 's/\/\* \(#define NON_INTERACTIVE_LOGIN_SHELLS\) \*\//\1/' config-top.h diff --git a/shell-term-fm/bash/patches/bash43-026 b/shell-term-fm/bash/patches/bash43-026 new file mode 100644 index 0000000000..e48141b013 --- /dev/null +++ b/shell-term-fm/bash/patches/bash43-026 @@ -0,0 +1,60 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.3 +Patch-ID: bash43-026 + +Bug-Reported-by: Tavis Ormandy +Bug-Reference-ID: +Bug-Reference-URL: http://twitter.com/taviso/statuses/514887394294652929 + +Bug-Description: + +Under certain circumstances, bash can incorrectly save a lookahead character and +return it on a subsequent call, even when reading a new line. + +Patch (apply with `patch -p0'): + +*** ../bash-4.3.25/parse.y 2014-07-30 10:14:31.000000000 -0400 +--- parse.y 2014-09-25 20:20:21.000000000 -0400 +*************** +*** 2954,2957 **** +--- 2954,2959 ---- + word_desc_to_read = (WORD_DESC *)NULL; + ++ eol_ungetc_lookahead = 0; ++ + current_token = '\n'; /* XXX */ + last_read_token = '\n'; +*** ../bash-4.3.25/y.tab.c 2014-07-30 10:14:32.000000000 -0400 +--- y.tab.c 2014-09-25 20:21:48.000000000 -0400 +*************** +*** 5266,5269 **** +--- 5266,5271 ---- + word_desc_to_read = (WORD_DESC *)NULL; + ++ eol_ungetc_lookahead = 0; ++ + current_token = '\n'; /* XXX */ + last_read_token = '\n'; +*************** +*** 8540,8542 **** + } + #endif /* HANDLE_MULTIBYTE */ +- +--- 8542,8543 ---- +*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500 +--- patchlevel.h 2014-03-20 20:01:28.000000000 -0400 +*************** +*** 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_ */ -- cgit v1.2.3 From 9d0d467975c78324622a6ed44b7f6df75fa52488 Mon Sep 17 00:00:00 2001 From: Remko van der Vossen Date: Fri, 26 Sep 2014 12:38:37 +0200 Subject: mpd: fix build with --as-needed --- audio-players/mpd/BUILD | 2 +- audio-players/mpd/HISTORY | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/audio-players/mpd/BUILD b/audio-players/mpd/BUILD index 5365ee67a0..439297886b 100755 --- a/audio-players/mpd/BUILD +++ b/audio-players/mpd/BUILD @@ -3,4 +3,4 @@ create_account musicdaemon && OPTS="$MPD_OPTS $OPTS" && OPTS="$OPTS --disable-mpc" && -LDFLAGS+="-L/usr/lib/sidplay/builders" default_build +LDFLAGS+=" -L/usr/lib/sidplay/builders" default_build diff --git a/audio-players/mpd/HISTORY b/audio-players/mpd/HISTORY index d2a5650223..582827e1ab 100644 --- a/audio-players/mpd/HISTORY +++ b/audio-players/mpd/HISTORY @@ -1,3 +1,6 @@ +2014-09-26 Remko van der Vossen + * BUILD: fix build with existing LDFLAGS (like --as-needed) + 2014-09-25 Remko van der Vossen * DEPENDS: depends libogg if libvorbis is enabled -- cgit v1.2.3 From 766b7af1872aebd23236d24cc08d01ecfd4bedcd Mon Sep 17 00:00:00 2001 From: Remko van der Vossen Date: Fri, 26 Sep 2014 13:26:42 +0200 Subject: ruby-2.0: version 2.0.0-p576 --- ruby-raa/ruby-2.0/DETAILS | 6 +++--- ruby-raa/ruby-2.0/HISTORY | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ruby-raa/ruby-2.0/DETAILS b/ruby-raa/ruby-2.0/DETAILS index 4c13824551..5507a8bf0f 100755 --- a/ruby-raa/ruby-2.0/DETAILS +++ b/ruby-raa/ruby-2.0/DETAILS @@ -1,8 +1,8 @@ SPELL=ruby-2.0 PACKAGE=ruby - VERSION=2.0.0-p353 - SOURCE_HASH=sha512:52aa64c5991e61cc49c2062672554353bc88ab563da93a1d1591257153c2f6d8de02417a33d7a585eb0102f1079a993e46671fb6c97c62eac8615de567b575f2 - SECURITY_PATCH=2 + VERSION=2.0.0-p576 + SOURCE_HASH=sha512:e089cca4867cd9c715f4f37e40a1db9af6ba0c74b47e79568121bb980476f8877a87ccb848b973381edb4667c0c73165f5e1761f60db839e67f6326302dbd864 + SECURITY_PATCH=3 BRANCH=`echo $VERSION|cut -d . -f 1,2` SOURCE=$PACKAGE-$VERSION.tar.bz2 SOURCE_URL[0]=ftp://ftp.ruby-lang.org/pub/$PACKAGE/$BRANCH/$SOURCE diff --git a/ruby-raa/ruby-2.0/HISTORY b/ruby-raa/ruby-2.0/HISTORY index f371ae3d24..6c4e90e2dc 100644 --- a/ruby-raa/ruby-2.0/HISTORY +++ b/ruby-raa/ruby-2.0/HISTORY @@ -1,3 +1,7 @@ +2014-09-26 Remko van der Vossen + * DETAILS: version 2.0.0-p576 + SECURITY_PATCH++ fixes CVE-2014-2525 + 2014-09-25 Remko van der Vossen * DEPENDS: libffi -- cgit v1.2.3 From 2f31b424d77fd6516aec26c34bdbe70e2e6e3888 Mon Sep 17 00:00:00 2001 From: Remko van der Vossen Date: Fri, 26 Sep 2014 13:36:55 +0200 Subject: wget: properly migrate from openssl to SSL provider --- ftp/wget/CONFIGURE | 5 +++++ ftp/wget/HISTORY | 3 +++ 2 files changed, 8 insertions(+) diff --git a/ftp/wget/CONFIGURE b/ftp/wget/CONFIGURE index 834161ac33..0cbdfafcbe 100755 --- a/ftp/wget/CONFIGURE +++ b/ftp/wget/CONFIGURE @@ -1,3 +1,8 @@ +if [[ "$WGET_SSL" == "openssl" ]]; then + WGET_SSL="SSL" && + persistent_add WGET_SSL +fi && + config_query_list WGET_SSL "Which SSL backend do you want for https and ftps?" none gnutls SSL && config_query_option WGET_OPTS "Enable IPv6 support?" y \ diff --git a/ftp/wget/HISTORY b/ftp/wget/HISTORY index 91e08f95f3..a863d5254d 100644 --- a/ftp/wget/HISTORY +++ b/ftp/wget/HISTORY @@ -1,3 +1,6 @@ +2014-09-26 Remko van der Vossen + * CONFIGURE: properly migrate from openssl to SSL provider + 2014-09-25 Remko van der Vossen * DEPENDS: pcre -- cgit v1.2.3 From 420936906cab5d2a73932022afd04068ef56809c Mon Sep 17 00:00:00 2001 From: Vlad Glagolev Date: Fri, 26 Sep 2014 18:23:05 +0400 Subject: tilda: => 1.1.13 --- shell-term-fm/tilda/DETAILS | 4 ++-- shell-term-fm/tilda/HISTORY | 4 ++++ shell-term-fm/tilda/PRE_BUILD | 3 --- shell-term-fm/tilda/focus.patch | 11 ----------- 4 files changed, 6 insertions(+), 16 deletions(-) delete mode 100644 shell-term-fm/tilda/focus.patch diff --git a/shell-term-fm/tilda/DETAILS b/shell-term-fm/tilda/DETAILS index d004caa0a0..ec0b30285c 100755 --- a/shell-term-fm/tilda/DETAILS +++ b/shell-term-fm/tilda/DETAILS @@ -1,8 +1,8 @@ SPELL=tilda - VERSION=1.1.12 + VERSION=1.1.13 SOURCE=$SPELL-$VERSION.tar.gz SOURCE_URL[1]=https://github.com/lanoxx/$SPELL/archive/$SOURCE - SOURCE_HASH=sha512:4bad6691bf855dd7fcf591dcd4f64a89e2549e7e8a8f07d5215878fbd113499eb45f9cffd10da2d1956c1bcb9e2da589c2592d48d38a80f798f111518447af3d + SOURCE_HASH=sha512:433bbda26aa599cf8d2e247bc36126a7bc6e77820f706c852210698becfcfa01b78b2d44b852eee79ae5f62ea0e422732a8415e9cfb4f6ddfc96d21363a1881d SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$SPELL-$VERSION" WEB_SITE=https://github.com/lanoxx/tilda/ ENTERED=20050818 diff --git a/shell-term-fm/tilda/HISTORY b/shell-term-fm/tilda/HISTORY index 9127d79357..0d3bc429ad 100644 --- a/shell-term-fm/tilda/HISTORY +++ b/shell-term-fm/tilda/HISTORY @@ -1,3 +1,7 @@ +2014-09-26 Vlad Glagolev + * DETAILS: updated spell to 1.1.13 + * focus.patch: dropped, fixed by upstream + 2014-06-06 Vlad Glagolev * DETAILS: updated spell to 1.1.12 diff --git a/shell-term-fm/tilda/PRE_BUILD b/shell-term-fm/tilda/PRE_BUILD index b43b23d7ed..c45840ab25 100755 --- a/shell-term-fm/tilda/PRE_BUILD +++ b/shell-term-fm/tilda/PRE_BUILD @@ -1,9 +1,6 @@ default_pre_build && cd "$SOURCE_DIRECTORY" && -# fix from issue #18 -patch -p0 < "$SPELL_DIRECTORY/focus.patch" && - if [[ $TILDA_CUSTOM_CURSOR == y ]]; then patch -p0 < "$SPELL_DIRECTORY/cursor.patch" fi && diff --git a/shell-term-fm/tilda/focus.patch b/shell-term-fm/tilda/focus.patch deleted file mode 100644 index f0ea6ef2e8..0000000000 --- a/shell-term-fm/tilda/focus.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/tilda_window.c.orig 2013-12-13 19:58:24.000000000 +0400 -+++ src/tilda_window.c 2014-01-29 17:59:07.000000000 +0400 -@@ -316,7 +316,7 @@ - - tilda_window *tw = TILDA_WINDOW(data); - stop_auto_hide_tick(tw); -- if (tw->disable_auto_hide == FALSE) -+ if (tw->disable_auto_hide == TRUE) - tilda_window_set_active(tw); - } - -- cgit v1.2.3 From 4d422dcefcf3b2a86382326bbc454c6e641230d9 Mon Sep 17 00:00:00 2001 From: Vlad Glagolev Date: Fri, 26 Sep 2014 18:45:08 +0400 Subject: mpd: => 0.18.16 --- audio-players/mpd/BUILD | 7 ++++--- audio-players/mpd/DETAILS | 4 ++-- audio-players/mpd/HISTORY | 4 ++++ 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/audio-players/mpd/BUILD b/audio-players/mpd/BUILD index 439297886b..f0b6fde4f8 100755 --- a/audio-players/mpd/BUILD +++ b/audio-players/mpd/BUILD @@ -1,6 +1,7 @@ create_account musicdaemon && -OPTS="$MPD_OPTS $OPTS" && -OPTS="$OPTS --disable-mpc" && +OPTS="--disable-mpc $MPD_OPTS $OPTS" && -LDFLAGS+=" -L/usr/lib/sidplay/builders" default_build +LDFLAGS="-L/usr/lib/sidplay/builders $LDFLAGS" && + +default_build diff --git a/audio-players/mpd/DETAILS b/audio-players/mpd/DETAILS index 4e7e25a265..ff32e8363f 100755 --- a/audio-players/mpd/DETAILS +++ b/audio-players/mpd/DETAILS @@ -1,10 +1,10 @@ SPELL=mpd - VERSION=0.18.14 + VERSION=0.18.16 BRANCH=`echo $VERSION | cut -d . -f 1,2` SOURCE=$SPELL-$VERSION.tar.xz SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION" SOURCE_URL[0]=http://www.musicpd.org/download/$SPELL/$BRANCH/$SOURCE - SOURCE_HASH=sha512:93a41281ec36b4af745b20ac01ea42713ee34ecf84cf58ce386811cbee0324524e7c6d2e84d8b8c69d996dcb5e646bd32d498a07d333d6d71088323175bb41f4 + SOURCE_HASH=sha512:bddd0236066bae97ef690b24a0eac46d892fe10ce7c5455634cb8b84210bf2ceb1b5ee8c7754fcf581de7fbd165c9b805f179e243b88bc87e6254e72fa6c8f45 LICENSE[0]=GPL KEYWORDS="music players audio" WEB_SITE=http://www.musicpd.org/ diff --git a/audio-players/mpd/HISTORY b/audio-players/mpd/HISTORY index 582827e1ab..a64f197a40 100644 --- a/audio-players/mpd/HISTORY +++ b/audio-players/mpd/HISTORY @@ -1,3 +1,7 @@ +2014-09-26 Vlad Glagolev + * DETAILS: updated spell to 0.18.16 + * BUILD: cleaned up; error-safe++ + 2014-09-26 Remko van der Vossen * BUILD: fix build with existing LDFLAGS (like --as-needed) -- cgit v1.2.3 From d920677f83ef9b59a154f6cb3997e59c3ce4f4fe Mon Sep 17 00:00:00 2001 From: Treeve Jelbert Date: Fri, 26 Sep 2014 18:53:23 +0200 Subject: dhcpcd: => 6.4.5 --- net/dhcpcd/DETAILS | 4 ++-- net/dhcpcd/HISTORY | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/net/dhcpcd/DETAILS b/net/dhcpcd/DETAILS index 8e576dadc0..f9482b209e 100755 --- a/net/dhcpcd/DETAILS +++ b/net/dhcpcd/DETAILS @@ -1,6 +1,6 @@ SPELL=dhcpcd - VERSION=6.4.3 - SOURCE_HASH=sha512:1dbc57b3fba001f7ed1d36a4efb611178db02aa2b83999b82de1a9c6fef62bc81d55dade83582fe2442469948a88f47e39edc0350f97866d5a8c6f468ae8d70d + VERSION=6.4.5 + SOURCE_HASH=sha512:04161d7475ac8abd71e6f20f63400ca29fa765751816d067850699576b67ab12d9fe822ffd1c6234823ddca7820009667ae7781bf2a31c2595b05208cca29711 SOURCE=$SPELL-$VERSION.tar.bz2 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION" SOURCE_URL[0]=http://roy.marples.name/downloads/$SPELL/$SOURCE diff --git a/net/dhcpcd/HISTORY b/net/dhcpcd/HISTORY index 95616337a3..3a53c2ef8a 100644 --- a/net/dhcpcd/HISTORY +++ b/net/dhcpcd/HISTORY @@ -1,3 +1,6 @@ +2014-09-26 Treeve Jelbert + * DETAILS: version 6.4.5 + 2014-08-05 Treeve Jelbert * DETAILS: version 6.4.3 -- cgit v1.2.3 From e93f713b54c8323917df2f9094591df4b18b1df0 Mon Sep 17 00:00:00 2001 From: Vlad Glagolev Date: Sat, 27 Sep 2014 14:54:21 +0400 Subject: mariadb: => 5.5.39 (5.5) --- database/mariadb/BUILD | 1 + database/mariadb/DETAILS | 4 ++-- database/mariadb/HISTORY | 8 +++++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/database/mariadb/BUILD b/database/mariadb/BUILD index d9075b7958..019f655c2c 100755 --- a/database/mariadb/BUILD +++ b/database/mariadb/BUILD @@ -24,6 +24,7 @@ if [[ $MARIADB_BRANCH == 5.5 ]]; then -DINSTALL_MYSQLSHAREDIR=share/mysql \ -DINSTALL_DOCDIR=share/doc/mariadb \ -DINSTALL_DOCREADMEDIR=share/doc/mariadb \ + -DINSTALL_MANDIR=share/man \ $OPTS" && if [[ $MARIADB_ENGINES == none ]] || [[ $MARIADB_ENGINES == all ]]; then diff --git a/database/mariadb/DETAILS b/database/mariadb/DETAILS index 1ccd1fd7cc..0bff9e8526 100755 --- a/database/mariadb/DETAILS +++ b/database/mariadb/DETAILS @@ -3,8 +3,8 @@ if [[ $MARIADB_BRANCH == 5.3 ]]; then VERSION=5.3.12 SOURCE_HASH=sha512:d53ea48745dad5693fd6a1fd5cf502852f12f8236b8a1fb7f81ad647301d2fd08d4f2944c74de580d0a4136d6c8b49f257124fa1b234ba8f2338f2047435ef94 elif [[ $MARIADB_BRANCH == 5.5 ]]; then - VERSION=5.5.38 - SOURCE_HASH=sha512:f83e501cb1c99ad17ba3e1c2fd2aa306664a16e22f71ac73013f04def6532ec1f678dade4075ab4bcbbb04ac2c4aea1cc72fd98a1fe23b17e314414ee0bc17f5 + VERSION=5.5.39 + SOURCE_HASH=sha512:a16685dce416449da5e004eaacc2e33d45ba437d91a117ef6c44c09f19186cafe626a87d25ebc67cbf08c0d57d61a3622dd9df9004c541a7bc46be82642b5a67 else VERSION=5.2.14 SECURITY_PATCH=3 diff --git a/database/mariadb/HISTORY b/database/mariadb/HISTORY index 0afe937035..b00c93a248 100644 --- a/database/mariadb/HISTORY +++ b/database/mariadb/HISTORY @@ -1,7 +1,9 @@ -2014-08-19 Treeve Jelbert - * DEPENDS: openssl => SSL +2014-09-27 Vlad Glagolev + * DETAILS: updated spell to 5.5.39 (5.5 branch) + * BUILD: corrected man path for 5.5 branch - * SUB_DEPENDS, PRE_SUB_DEPENDS: openssl => SSL +2014-08-19 Treeve Jelbert + * DEPENDS: openssl => SSL 2014-06-16 Vlad Glagolev * DETAILS: updated spell to 5.5.38 (5.5 branch) -- cgit v1.2.3 From f71ec63a1772e73cc494a6812af95c6f9e800ee0 Mon Sep 17 00:00:00 2001 From: Treeve Jelbert Date: Sat, 27 Sep 2014 13:06:27 +0200 Subject: cups-filters: => 1.0.59 --- printer/cups-filters/DETAILS | 4 ++-- printer/cups-filters/HISTORY | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/printer/cups-filters/DETAILS b/printer/cups-filters/DETAILS index ea82dbcd53..31b697a9d6 100755 --- a/printer/cups-filters/DETAILS +++ b/printer/cups-filters/DETAILS @@ -1,6 +1,6 @@ SPELL=cups-filters - VERSION=1.0.58 - SOURCE_HASH=sha512:bfff717c971864c142880927025dbe459c1135596c9b37fcefd62e7cefd4d9eca3338eb2e924fc3a5fbfabf1fc013465ee7aa63455d7445482406b403531889c + VERSION=1.0.59 + SOURCE_HASH=sha512:f28eadf8a687b60245941ad13526544d9eaf0d7c85e74dbd0d9fb22df65bb60a7e6fc2be2092dff6198d6f376c1b9eb6ee3c948901bd0cd47bce85404de451b7 # SOURCE_GPG="gurus.gpg:${SOURCE}.sig" SOURCE=$SPELL-$VERSION.tar.xz SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION" diff --git a/printer/cups-filters/HISTORY b/printer/cups-filters/HISTORY index 7366469b69..5e63f914f3 100644 --- a/printer/cups-filters/HISTORY +++ b/printer/cups-filters/HISTORY @@ -1,3 +1,6 @@ +2014-09-27 Treeve Jelbert + * DETAILS: version 1.0.59 + 2014-08-21 Treeve Jelbert * DETAILS: version 1.0.58 -- cgit v1.2.3 From ed6d54ce5ab02e04b2712c0734f8e234a3d3ef3d Mon Sep 17 00:00:00 2001 From: Vlad Glagolev Date: Sat, 27 Sep 2014 15:52:34 +0400 Subject: easytag: => 2.2.4 --- audio-soft/easytag/DETAILS | 4 ++-- audio-soft/easytag/HISTORY | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/audio-soft/easytag/DETAILS b/audio-soft/easytag/DETAILS index 1d0cd7dfb2..f619acf9f7 100755 --- a/audio-soft/easytag/DETAILS +++ b/audio-soft/easytag/DETAILS @@ -1,9 +1,9 @@ SPELL=easytag - VERSION=2.2.3 + VERSION=2.2.4 BRANCH=`echo $VERSION|cut -d . -f 1,2` SOURCE=$SPELL-$VERSION.tar.xz SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE - SOURCE_HASH=sha512:d3a27c6f9b6326cd5850855ea2acae1f73330198247516b3f44d1553e830d29043ef973de81e13743c83aca685258b5a6ba2a19969f571664ac60ff99e71a0ea + SOURCE_HASH=sha512:bafa1e26371bb95f5edf74424b3733d0ffbb80c740c65e404cf863445a835fdc87f958e9cfddaac7d85281cb3be5ad6584a5750415e294a96c5ef26d4e51f9bf SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION" LICENSE[0]=GPL WEB_SITE=http://projects.gnome.org/easytag/ diff --git a/audio-soft/easytag/HISTORY b/audio-soft/easytag/HISTORY index 4ad9ec2ed5..d6aa23315f 100644 --- a/audio-soft/easytag/HISTORY +++ b/audio-soft/easytag/HISTORY @@ -1,3 +1,6 @@ +2014-09-27 Vlad Glagolev + * DETAILS: updated spell to 2.2.4 + 2014-06-27 Vlad Glagolev * DETAILS: updated spell to 2.2.3 -- cgit v1.2.3 From 858a56f561720281d33fa97109f958c380e7600f Mon Sep 17 00:00:00 2001 From: Treeve Jelbert Date: Sat, 27 Sep 2014 14:29:22 +0200 Subject: gettext -icu is only needed if libxmls2 uses it --- libs/gettext/DEPENDS | 7 ++++++- libs/gettext/HISTORY | 3 +++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/libs/gettext/DEPENDS b/libs/gettext/DEPENDS index 08e490d9d9..31dc595b58 100755 --- a/libs/gettext/DEPENDS +++ b/libs/gettext/DEPENDS @@ -1,8 +1,13 @@ depends gnupg && -depends icu && depends smgl-fhs && optional_depends libxml2 "" "--with-included-libxml" "use system libxml2" && +if is_depends enabled $SPELL libxml2;then + if is_depends_enabled libxml2 icu;then + depends icu + fi +fi && + optional_depends libunistring '' '--with-included-libunistring' 'use sytem libunistring' && optional_depends libcroco "" "--with-included-libcroco" "use system libcroco" && diff --git a/libs/gettext/HISTORY b/libs/gettext/HISTORY index c68a84bf4f..fcd1bc79db 100644 --- a/libs/gettext/HISTORY +++ b/libs/gettext/HISTORY @@ -1,3 +1,6 @@ +2014-09-27 Treeve Jelbert + * DEPENDS: icu is only needed if libxmls2 uses it + 2014-09-09 Remko van der Vossen * DEPENDS: icu -- cgit v1.2.3 From 2527fd3449bb43cd46578e9282ff1db10149bcf6 Mon Sep 17 00:00:00 2001 From: Vlad Glagolev Date: Sat, 27 Sep 2014 19:09:59 +0400 Subject: mongodb: => 2.4.11 --- database/mongodb/DETAILS | 4 +-- database/mongodb/HISTORY | 10 +++++-- database/mongodb/PRE_BUILD | 1 + database/mongodb/intsign.patch | 67 ++++++++++++++++++++++++++++++++++++++++++ database/mongodb/scons.patch | 26 +++++++++------- 5 files changed, 94 insertions(+), 14 deletions(-) create mode 100644 database/mongodb/intsign.patch diff --git a/database/mongodb/DETAILS b/database/mongodb/DETAILS index fa29f03b7d..a0096f1039 100755 --- a/database/mongodb/DETAILS +++ b/database/mongodb/DETAILS @@ -1,10 +1,10 @@ SPELL=mongodb - VERSION=2.4.10 + VERSION=2.4.11 SECURITY_PATCH=1 SOURCE=$SPELL-src-r$VERSION.tar.gz SOURCE_URL[0]=http://fastdl.mongodb.org/src/$SOURCE SOURCE_URL[1]=http://downloads.mongodb.org/src/$SOURCE - SOURCE_HASH=sha512:970364dda2dba18bf979a0fc8291d9656b3cc3ba0aec1ca26d81f14f833e355c023d19b3cfaa81704013bf2c0e732d72de08b0f8236dafe85a3ac4d51b87edc6 + SOURCE_HASH=sha512:a132275b7d0be357958d4bffaa8d8b660df1812811e8b94b1482906d1cf4567f6b6f13c77dcdf6dea38c56f54fe4b462a41379185c04c9eb5661848b80e40106 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-src-r$VERSION" LICENSE[0]=AGPL LICENSE[1]=APACHE diff --git a/database/mongodb/HISTORY b/database/mongodb/HISTORY index 17b8400a9f..63156e7294 100644 --- a/database/mongodb/HISTORY +++ b/database/mongodb/HISTORY @@ -1,5 +1,11 @@ -2014-08-19 Treeve Jelbert - * DEPENDS: openssl => SSL +2014-09-27 Vlad Glagolev + * DETAILS: updated spell to 2.4.11 + * PRE_BUILD: apply new patch + * scons.patch: adapted for new version + * intsign.patch: added, backported from Debian to fix build + +2014-08-19 Treeve Jelbert + * DEPENDS: openssl => SSL 2014-04-06 Vlad Glagolev * DETAILS: updated spell to 2.4.10 diff --git a/database/mongodb/PRE_BUILD b/database/mongodb/PRE_BUILD index 9357ab238e..79e40d7ed4 100755 --- a/database/mongodb/PRE_BUILD +++ b/database/mongodb/PRE_BUILD @@ -3,5 +3,6 @@ cd "$SOURCE_DIRECTORY" && patch -p0 < "$SPELL_DIRECTORY/scons.patch" && patch -p0 < "$SPELL_DIRECTORY/fips.patch" && +patch -p1 < "$SPELL_DIRECTORY/intsign.patch" && sedit "s:lib64:lib:g" SConstruct diff --git a/database/mongodb/intsign.patch b/database/mongodb/intsign.patch new file mode 100644 index 0000000000..bd02e4dd28 --- /dev/null +++ b/database/mongodb/intsign.patch @@ -0,0 +1,67 @@ +--- mongodb-2.4.6.orig/src/mongo/db/auth/privilege_set.cpp ++++ mongodb-2.4.6/src/mongo/db/auth/privilege_set.cpp +@@ -79,7 +79,7 @@ namespace mongo { + resourceSearchList[1] = nsToDatabaseSubstring(desiredPrivilege.getResource()); + + ActionSet unmetRequirements = desiredPrivilege.getActions(); +- for (int i = 0; i < boost::size(resourceSearchList); ++i) { ++ for (unsigned int i = 0; i < boost::size(resourceSearchList); ++i) { + ResourcePrivilegeCacheEntry* entry = _lookupEntry(resourceSearchList[i]); + if (NULL == entry) + continue; +--- mongodb-2.4.6.orig/src/mongo/db/cmdline_test.cpp ++++ mongodb-2.4.6/src/mongo/db/cmdline_test.cpp +@@ -71,7 +71,7 @@ namespace { + "KEEP", + "--servicePasswordFake=KEEP" + }; +- const int argc = boost::size(argv); ++ const unsigned int argc = boost::size(argv); + testCensoringArgv(argv, argv, argc); + } + +@@ -88,7 +88,7 @@ namespace { + "--servicePassword", + "get out of dodge" + }; +- const int argc = boost::size(argv); ++ const unsigned int argc = boost::size(argv); + + const char* const expected[] = { + "first", +@@ -120,7 +120,7 @@ namespace { + "-servicePassword", + "get out of dodge" + }; +- const int argc = boost::size(argv); ++ const unsigned int argc = boost::size(argv); + + const char* const expected[] = { + "first", +@@ -152,7 +152,7 @@ namespace { + "KEEP", + "--servicePasswordFake=KEEP" + }; +- const int argc = boost::size(argv); ++ const unsigned int argc = boost::size(argv); + testCensoringVector(argv, argv, argc); + } + +@@ -169,7 +169,7 @@ namespace { + "--servicePassword", + "get out of dodge" + }; +- const int argc = boost::size(argv); ++ const unsigned int argc = boost::size(argv); + + const char* const expected[] = { + "first", +@@ -201,7 +201,7 @@ namespace { + "-servicePassword", + "get out of dodge" + }; +- const int argc = boost::size(argv); ++ const unsigned int argc = boost::size(argv); + + const char* const expected[] = { + "first", diff --git a/database/mongodb/scons.patch b/database/mongodb/scons.patch index 94dbc05bee..e4edb15eff 100644 --- a/database/mongodb/scons.patch +++ b/database/mongodb/scons.patch @@ -1,6 +1,6 @@ ---- SConstruct.orig -+++ SConstruct -@@ -702,7 +702,6 @@ +--- SConstruct.orig 2014-08-22 01:56:32.000000000 +0400 ++++ SConstruct 2014-09-27 15:28:11.496080339 +0400 +@@ -704,7 +704,6 @@ # -Winvalid-pch Warn if a precompiled header (see Precompiled Headers) is found in the search path but can't be used. env.Append( CCFLAGS=["-fPIC", "-fno-strict-aliasing", @@ -8,17 +8,12 @@ "-pthread", "-Wall", "-Wsign-compare", -@@ -710,14 +709,14 @@ - "-Winvalid-pch"] ) - # env.Append( " -Wconversion" ) TODO: this doesn't really work yet - if linux: -- env.Append( CCFLAGS=["-Werror", "-pipe"] ) - if not has_option('clang'): +@@ -719,9 +718,10 @@ env.Append( CCFLAGS=["-fno-builtin-memcmp"] ) # glibc's memcmp is faster than gcc's env.Append( CPPDEFINES=["_FILE_OFFSET_BITS=64"] ) - env.Append( CXXFLAGS=["-Wnon-virtual-dtor", "-Woverloaded-virtual"] ) -+ env.Append( CXXFLAGS=os.environ['CXXFLAGS']) ++ env.Append( CXXFLAGS=os.environ['CXXFLAGS'] ) + env.Append( LINKFLAGS=os.environ['LDFLAGS'] ) env.Append( LINKFLAGS=["-fPIC", "-pthread", "-rdynamic"] ) - env.Append( LIBS=[] ) @@ -26,3 +21,14 @@ #make scons colorgcc friendly for key in ('HOME', 'TERM'): +--- src/mongo/SConscript.orig 2014-08-22 01:56:32.000000000 +0400 ++++ src/mongo/SConscript 2014-09-27 18:24:40.903897125 +0400 +@@ -456,7 +456,7 @@ + env.Library('stacktrace', 'util/stacktrace.cpp') + + env.Program('lame_stacktrace_test', 'util/lame_stacktrace_test.cpp', +- LIBDEPS=['stacktrace', ++ LIBDEPS=['stacktrace', 'foundation', 'mongocommon', 'alltools', + '$BUILD_DIR/mongo/base/base']) + + serverOnlyFiles += mmapFiles -- cgit v1.2.3 From 858f8751e74ed6ea2a0a14186482b9835122f4e8 Mon Sep 17 00:00:00 2001 From: Ismael Luceno Date: Fri, 26 Sep 2014 01:56:55 -0300 Subject: icecream 1.0.1 --- devel/icecream/DETAILS | 4 ++-- devel/icecream/HISTORY | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/devel/icecream/DETAILS b/devel/icecream/DETAILS index 7550907a83..fb6b17fbc9 100755 --- a/devel/icecream/DETAILS +++ b/devel/icecream/DETAILS @@ -1,8 +1,8 @@ SPELL=icecream - VERSION=0.9.6 + VERSION=1.0.1 SOURCE="icecc-${VERSION}.tar.bz2" SOURCE_URL[0]=http://ftp.suse.com/pub/projects/${SPELL}/${SOURCE} - SOURCE_HASH=sha512:d71f89f24f06566bf7d8330d46b373d640c282e8e775215faf916f7208f5ffdaa056d646105d1071ccd6a4921af7e278da2c3c5c9861cf293441e81b9670fed1 + SOURCE_HASH=sha512:04ffaf84ed38eac73939d99cd484a223fe8df07293a1e71ff63da18ee3c2d6c05d7cf6d4b9a90800745c0dc0d38485b4a22dd58feaa6e577f852e9af600b199f SOURCE_DIRECTORY="${BUILD_DIRECTORY}/icecc-${VERSION}" WEB_SITE="http://en.opensuse.org/Icecream" LICENSE[0]=GPL diff --git a/devel/icecream/HISTORY b/devel/icecream/HISTORY index 57fede92c4..8e98133174 100644 --- a/devel/icecream/HISTORY +++ b/devel/icecream/HISTORY @@ -1,2 +1,5 @@ +2014-09-26 Ismael Luceno + * DETAILS: updated spell to 1.0.1 + 2011-04-07 Arjan Bouter * BUILD, DETAILS, init.d/icecream, init.d/icecream-scheduler: spell created -- cgit v1.2.3 From dec4abc6e8a0d575b9b92551a88ada90d1cd4e03 Mon Sep 17 00:00:00 2001 From: Ismael Luceno Date: Fri, 26 Sep 2014 02:00:22 -0300 Subject: distcc 3.2rc1 --- devel/distcc/DETAILS | 4 ++-- devel/distcc/HISTORY | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/devel/distcc/DETAILS b/devel/distcc/DETAILS index b3e4d05275..2114eefc51 100755 --- a/devel/distcc/DETAILS +++ b/devel/distcc/DETAILS @@ -1,9 +1,9 @@ SPELL=distcc - VERSION=3.1 + VERSION=3.2rc1 SOURCE=$SPELL-$VERSION.tar.bz2 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION" SOURCE_URL[0]=http://distcc.googlecode.com/files/$SOURCE - SOURCE_HASH=sha512:0ca7167309badf5d36d2783bab398295b52c43fde0355cf1902032c70b27fc40c21729c98af0ee4c0aeea0c48755e4626308e9385d938b7822de27cdb048e7bd + SOURCE_HASH=sha512:98b2e8423d724bbb6a615d946d170441a8e293310785f867d7a277b318c043a37b0af39ae8ed1f7a0667803de9db1d1925199bad85130cf9bd9cb347635125ee WEB_SITE=http://distcc.org/ LICENSE[0]=GPL ENTERED=20020717 diff --git a/devel/distcc/HISTORY b/devel/distcc/HISTORY index 1c19eabadf..69f6250ccc 100644 --- a/devel/distcc/HISTORY +++ b/devel/distcc/HISTORY @@ -1,3 +1,6 @@ +2014-09-26 Ismael Luceno + * DETAILS: updated spell to 3.2rc1 + 2011-07-31 Vlad Glagolev * DETAILS: updated spell to 3.1 * PRE_BUILD: moved to BUILD -- cgit v1.2.3 From 978ac6985f9bc0a0a6ff06abe271a24594ea2c1f Mon Sep 17 00:00:00 2001 From: Vlad Glagolev Date: Sun, 28 Sep 2014 01:34:15 +0400 Subject: Revert "distcc 3.2rc1" This reverts commit dec4abc6e8a0d575b9b92551a88ada90d1cd4e03. We do not force devel versions; devel branch is needed here --- devel/distcc/DETAILS | 4 ++-- devel/distcc/HISTORY | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/devel/distcc/DETAILS b/devel/distcc/DETAILS index 2114eefc51..b3e4d05275 100755 --- a/devel/distcc/DETAILS +++ b/devel/distcc/DETAILS @@ -1,9 +1,9 @@ SPELL=distcc - VERSION=3.2rc1 + VERSION=3.1 SOURCE=$SPELL-$VERSION.tar.bz2 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION" SOURCE_URL[0]=http://distcc.googlecode.com/files/$SOURCE - SOURCE_HASH=sha512:98b2e8423d724bbb6a615d946d170441a8e293310785f867d7a277b318c043a37b0af39ae8ed1f7a0667803de9db1d1925199bad85130cf9bd9cb347635125ee + SOURCE_HASH=sha512:0ca7167309badf5d36d2783bab398295b52c43fde0355cf1902032c70b27fc40c21729c98af0ee4c0aeea0c48755e4626308e9385d938b7822de27cdb048e7bd WEB_SITE=http://distcc.org/ LICENSE[0]=GPL ENTERED=20020717 diff --git a/devel/distcc/HISTORY b/devel/distcc/HISTORY index 69f6250ccc..1c19eabadf 100644 --- a/devel/distcc/HISTORY +++ b/devel/distcc/HISTORY @@ -1,6 +1,3 @@ -2014-09-26 Ismael Luceno - * DETAILS: updated spell to 3.2rc1 - 2011-07-31 Vlad Glagolev * DETAILS: updated spell to 3.1 * PRE_BUILD: moved to BUILD -- cgit v1.2.3 From 3fc6aedff7a8e0564011d67cefb1fe4d9f6ca02c Mon Sep 17 00:00:00 2001 From: Ismael Luceno Date: Sun, 28 Sep 2014 15:22:16 -0300 Subject: gnutls: Simplify branch version handling --- crypto/gnutls/DETAILS | 9 +++------ crypto/gnutls/HISTORY | 3 +++ crypto/gnutls/PREPARE | 9 ++++----- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/crypto/gnutls/DETAILS b/crypto/gnutls/DETAILS index 86acf009d8..591feb320d 100755 --- a/crypto/gnutls/DETAILS +++ b/crypto/gnutls/DETAILS @@ -2,19 +2,16 @@ case $GNUTLS_BRANCH in stable) VERSION=3.2.17 - SOURCE=$SPELL-$VERSION.tar.xz ;; stable-old) VERSION=3.1.26 - SOURCE=$SPELL-$VERSION.tar.xz ;; esac - BRANCH_VER=$(awk 'BEGIN{FS="."}{print $1"."$2}' <<< $VERSION) + SOURCE=$SPELL-$VERSION.tar.xz SOURCE2=$SOURCE.sig SECURITY_PATCH=12 - SOURCE_DIR_VER=$(awk 'BEGIN{FS="."}{print $1"."$2"."$3}' <<< $VERSION) -SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$SOURCE_DIR_VER - SOURCE_URL[0]=ftp://ftp.gnutls.org/gcrypt/gnutls/v$BRANCH_VER/$SOURCE +SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION + SOURCE_URL[0]=ftp://ftp.gnutls.org/gcrypt/gnutls/v${VERSION%.*}/$SOURCE SOURCE2_URL[0]=${SOURCE_URL[0]}.sig SOURCE_GPG=gnu.gpg:$SOURCE2:UPSTREAM_KEY SOURCE2_IGNORE=signature diff --git a/crypto/gnutls/HISTORY b/crypto/gnutls/HISTORY index efe27f20d7..3076446b33 100644 --- a/crypto/gnutls/HISTORY +++ b/crypto/gnutls/HISTORY @@ -1,3 +1,6 @@ +2014-09-28 Ismael Luceno + * DETAILS: Simplified branch version handling + 2014-08-25 Ladislav Hagara * DETAILS: 3.2.17 and 3.1.26 diff --git a/crypto/gnutls/PREPARE b/crypto/gnutls/PREPARE index 7f99c37e8b..3c7353f5dd 100755 --- a/crypto/gnutls/PREPARE +++ b/crypto/gnutls/PREPARE @@ -1,7 +1,6 @@ . ${GRIMOIRE}/FUNCTIONS && -if [[ "$GNUTLS_BRANCH" == "3.2" ]]; then - GNUTLS_BRANCH=stable -elif [[ "$GNUTLS_BRANCH" == "3.1" ]]; then - GNUTLS_BRANCH=stable-old -fi && +case "$GNUTLS_BRANCH" in +3.2) GNUTLS_BRANCH=stable;; +3.1) GNUTLS_BRANCH=stable-old;; +esac && prepare_select_branch stable stable-old -- cgit v1.2.3 From e26cc0823d1ccdecb517006228ecb359346f4d8c Mon Sep 17 00:00:00 2001 From: Ismael Luceno Date: Sun, 28 Sep 2014 15:25:25 -0300 Subject: gnutls: Update stable branch to 3.2.18 --- crypto/gnutls/DETAILS | 2 +- crypto/gnutls/HISTORY | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/crypto/gnutls/DETAILS b/crypto/gnutls/DETAILS index 591feb320d..d5326b6255 100755 --- a/crypto/gnutls/DETAILS +++ b/crypto/gnutls/DETAILS @@ -1,7 +1,7 @@ SPELL=gnutls case $GNUTLS_BRANCH in stable) - VERSION=3.2.17 + VERSION=3.2.18 ;; stable-old) VERSION=3.1.26 diff --git a/crypto/gnutls/HISTORY b/crypto/gnutls/HISTORY index 3076446b33..f15bcecae1 100644 --- a/crypto/gnutls/HISTORY +++ b/crypto/gnutls/HISTORY @@ -1,5 +1,6 @@ 2014-09-28 Ismael Luceno * DETAILS: Simplified branch version handling + * DETAILS: updated stable branch to 3.2.18 2014-08-25 Ladislav Hagara * DETAILS: 3.2.17 and 3.1.26 -- cgit v1.2.3 From 598d3d28572b29ea4634e7c3db6b1a5e9d368aeb Mon Sep 17 00:00:00 2001 From: Florian Franzmann Date: Sun, 28 Sep 2014 20:50:43 +0200 Subject: shell-term-fm/bash: another patch against the ShellShock issues, security update --- shell-term-fm/bash/DETAILS | 4 +- shell-term-fm/bash/HISTORY | 4 + shell-term-fm/bash/patches/bash43-027 | 221 ++++++++++++++++++++++++++++++++++ 3 files changed, 227 insertions(+), 2 deletions(-) create mode 100644 shell-term-fm/bash/patches/bash43-027 diff --git a/shell-term-fm/bash/DETAILS b/shell-term-fm/bash/DETAILS index 7b7e94faf5..beadd3a514 100755 --- a/shell-term-fm/bash/DETAILS +++ b/shell-term-fm/bash/DETAILS @@ -1,7 +1,7 @@ SPELL=bash VERSION=4.3 - SECURITY_PATCH=4 - BASH_PATCHLEVEL=026 + SECURITY_PATCH=5 + BASH_PATCHLEVEL=027 SOURCE=$SPELL-$VERSION.tar.gz SOURCE2=$SOURCE.sig SOURCE3=$SPELL-doc-3.2.tar.gz diff --git a/shell-term-fm/bash/HISTORY b/shell-term-fm/bash/HISTORY index 1b1a6d8836..66070f1257 100644 --- a/shell-term-fm/bash/HISTORY +++ b/shell-term-fm/bash/HISTORY @@ -1,3 +1,7 @@ +2014-09-28 Florian Franzmann + * DETAILS, patches/bash43-027: add the latest patch against ShellShock + issues; SECURITY_PATCH++ + 2014-09-26 Florian Franzmann * PRE_BUILD, CVE-2014-7169.diff: remove unofficial patch * DETAILS, patches/bash43-026 add upstream fix for CVE 2014 7169 diff --git a/shell-term-fm/bash/patches/bash43-027 b/shell-term-fm/bash/patches/bash43-027 new file mode 100644 index 0000000000..ef48bd82da --- /dev/null +++ b/shell-term-fm/bash/patches/bash43-027 @@ -0,0 +1,221 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.3 +Patch-ID: bash43-027 + +Bug-Reported-by: Florian Weimer +Bug-Reference-ID: +Bug-Reference-URL: + +Bug-Description: + +This patch changes the encoding bash uses for exported functions to avoid +clashes with shell variables and to avoid depending only on an environment +variable's contents to determine whether or not to interpret it as a shell +function. + +Patch (apply with `patch -p0'): + +*** ../bash-4.3.26/variables.c 2014-09-25 23:02:18.000000000 -0400 +--- variables.c 2014-09-27 20:52:04.000000000 -0400 +*************** +*** 84,87 **** +--- 84,92 ---- + #define ifsname(s) ((s)[0] == 'I' && (s)[1] == 'F' && (s)[2] == 'S' && (s)[3] == '\0') + ++ #define BASHFUNC_PREFIX "BASH_FUNC_" ++ #define BASHFUNC_PREFLEN 10 /* == strlen(BASHFUNC_PREFIX */ ++ #define BASHFUNC_SUFFIX "%%" ++ #define BASHFUNC_SUFFLEN 2 /* == strlen(BASHFUNC_SUFFIX) */ ++ + extern char **environ; + +*************** +*** 280,284 **** + static void dispose_temporary_env __P((sh_free_func_t *)); + +! static inline char *mk_env_string __P((const char *, const char *)); + static char **make_env_array_from_var_list __P((SHELL_VAR **)); + static char **make_var_export_array __P((VAR_CONTEXT *)); +--- 285,289 ---- + static void dispose_temporary_env __P((sh_free_func_t *)); + +! static inline char *mk_env_string __P((const char *, const char *, int)); + static char **make_env_array_from_var_list __P((SHELL_VAR **)); + static char **make_var_export_array __P((VAR_CONTEXT *)); +*************** +*** 350,369 **** + /* If exported function, define it now. Don't import functions from + the environment in privileged mode. */ +! if (privmode == 0 && read_but_dont_execute == 0 && STREQN ("() {", string, 4)) + { + string_length = strlen (string); +! temp_string = (char *)xmalloc (3 + string_length + char_index); + +! strcpy (temp_string, name); +! temp_string[char_index] = ' '; +! strcpy (temp_string + char_index + 1, string); + + /* Don't import function names that are invalid identifiers from the + environment, though we still allow them to be defined as shell + variables. */ +! if (legal_identifier (name)) +! parse_and_execute (temp_string, name, SEVAL_NONINT|SEVAL_NOHIST|SEVAL_FUNCDEF|SEVAL_ONECMD); + +! if (temp_var = find_function (name)) + { + VSETATTR (temp_var, (att_exported|att_imported)); +--- 355,385 ---- + /* If exported function, define it now. Don't import functions from + the environment in privileged mode. */ +! if (privmode == 0 && read_but_dont_execute == 0 && +! STREQN (BASHFUNC_PREFIX, name, BASHFUNC_PREFLEN) && +! STREQ (BASHFUNC_SUFFIX, name + char_index - BASHFUNC_SUFFLEN) && +! STREQN ("() {", string, 4)) + { ++ size_t namelen; ++ char *tname; /* desired imported function name */ ++ ++ namelen = char_index - BASHFUNC_PREFLEN - BASHFUNC_SUFFLEN; ++ ++ tname = name + BASHFUNC_PREFLEN; /* start of func name */ ++ tname[namelen] = '\0'; /* now tname == func name */ ++ + string_length = strlen (string); +! temp_string = (char *)xmalloc (namelen + string_length + 2); + +! memcpy (temp_string, tname, namelen); +! temp_string[namelen] = ' '; +! memcpy (temp_string + namelen + 1, string, string_length + 1); + + /* Don't import function names that are invalid identifiers from the + environment, though we still allow them to be defined as shell + variables. */ +! if (absolute_program (tname) == 0 && (posixly_correct == 0 || legal_identifier (tname))) +! parse_and_execute (temp_string, tname, SEVAL_NONINT|SEVAL_NOHIST|SEVAL_FUNCDEF|SEVAL_ONECMD); + +! if (temp_var = find_function (tname)) + { + VSETATTR (temp_var, (att_exported|att_imported)); +*************** +*** 378,383 **** + } + last_command_exit_value = 1; +! report_error (_("error importing function definition for `%s'"), name); + } + } + #if defined (ARRAY_VARS) +--- 394,402 ---- + } + last_command_exit_value = 1; +! report_error (_("error importing function definition for `%s'"), tname); + } ++ ++ /* Restore original suffix */ ++ tname[namelen] = BASHFUNC_SUFFIX[0]; + } + #if defined (ARRAY_VARS) +*************** +*** 2955,2959 **** + + INVALIDATE_EXPORTSTR (var); +! var->exportstr = mk_env_string (name, value); + + array_needs_making = 1; +--- 2974,2978 ---- + + INVALIDATE_EXPORTSTR (var); +! var->exportstr = mk_env_string (name, value, 0); + + array_needs_making = 1; +*************** +*** 3853,3871 **** + + static inline char * +! mk_env_string (name, value) + const char *name, *value; + { +! int name_len, value_len; +! char *p; + + name_len = strlen (name); + value_len = STRLEN (value); +! p = (char *)xmalloc (2 + name_len + value_len); +! strcpy (p, name); +! p[name_len] = '='; + if (value && *value) +! strcpy (p + name_len + 1, value); + else +! p[name_len + 1] = '\0'; + return (p); + } +--- 3872,3911 ---- + + static inline char * +! mk_env_string (name, value, isfunc) + const char *name, *value; ++ int isfunc; + { +! size_t name_len, value_len; +! char *p, *q; + + name_len = strlen (name); + value_len = STRLEN (value); +! +! /* If we are exporting a shell function, construct the encoded function +! name. */ +! if (isfunc && value) +! { +! p = (char *)xmalloc (BASHFUNC_PREFLEN + name_len + BASHFUNC_SUFFLEN + value_len + 2); +! q = p; +! memcpy (q, BASHFUNC_PREFIX, BASHFUNC_PREFLEN); +! q += BASHFUNC_PREFLEN; +! memcpy (q, name, name_len); +! q += name_len; +! memcpy (q, BASHFUNC_SUFFIX, BASHFUNC_SUFFLEN); +! q += BASHFUNC_SUFFLEN; +! } +! else +! { +! p = (char *)xmalloc (2 + name_len + value_len); +! memcpy (p, name, name_len); +! q = p + name_len; +! } +! +! q[0] = '='; + if (value && *value) +! memcpy (q + 1, value, value_len + 1); + else +! q[1] = '\0'; +! + return (p); + } +*************** +*** 3953,3957 **** + using the cached exportstr... */ + list[list_index] = USE_EXPORTSTR ? savestring (value) +! : mk_env_string (var->name, value); + + if (USE_EXPORTSTR == 0) +--- 3993,3997 ---- + using the cached exportstr... */ + list[list_index] = USE_EXPORTSTR ? savestring (value) +! : mk_env_string (var->name, value, function_p (var)); + + if (USE_EXPORTSTR == 0) +*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500 +--- patchlevel.h 2014-03-20 20:01:28.000000000 -0400 +*************** +*** 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_ */ -- cgit v1.2.3 From 84f40c534e9cac01bcd24249ce3aaef0ff42aca7 Mon Sep 17 00:00:00 2001 From: Vlad Glagolev Date: Mon, 29 Sep 2014 09:48:45 +0400 Subject: megatools: new spell, command line client for mega.co.nz --- ChangeLog | 3 +++ net/megatools/DEPENDS | 15 +++++++++++++++ net/megatools/DETAILS | 26 ++++++++++++++++++++++++++ net/megatools/HISTORY | 2 ++ 4 files changed, 46 insertions(+) create mode 100755 net/megatools/DEPENDS create mode 100755 net/megatools/DETAILS create mode 100644 net/megatools/HISTORY diff --git a/ChangeLog b/ChangeLog index a82f3b5552..857cb27321 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +2014-09-29 Vlad Glagolev + * net/megatools: new spell, command line client for mega.co.nz + 2014-09-25 Ismael Luceno * utils/lxc: new spell, Userspace tools for the Linux kernel containers * graphics/dcmtk: new spell, DICOM Toolkit diff --git a/net/megatools/DEPENDS b/net/megatools/DEPENDS new file mode 100755 index 0000000000..bf018b3b7f --- /dev/null +++ b/net/megatools/DEPENDS @@ -0,0 +1,15 @@ +depends glib2 && +depends curl && +depends SSL && + +optional_depends gobject-introspection \ + "--enable-introspection" \ + "--disable-introspection" \ + "to enable introspection for this build" && + +optional_depends asciidoc \ + "--enable-docs-build" \ + "--disable-docs-build" \ + "to build man pages instead of using bundled ones" && + +optional_depends fuse "" "" "to build megafs utility" diff --git a/net/megatools/DETAILS b/net/megatools/DETAILS new file mode 100755 index 0000000000..4fa9b126cc --- /dev/null +++ b/net/megatools/DETAILS @@ -0,0 +1,26 @@ + SPELL=megatools + VERSION=1.9.92 + SOURCE=$SPELL-$VERSION.tar.gz + SOURCE_URL[0]=http://megatools.megous.com/builds/$SOURCE + SOURCE_HASH=sha512:a2b1da7c97473fb921bd54933cc87f4be07203d17898066aca73a3b37390fc157c23baa8ed5a3c1f2be37a88af952e3737d321f327f0567c6d5d929e094e3102 +SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION" + WEB_SITE=http://megatools.megous.com/ + LICENSE[0]=GPL + ENTERED=20140929 + SHORT="command line client for mega.co.nz" +cat << EOF +Megatools is a collection of programs for accessing Mega service from a command +line of your desktop or server. + +Megatools allow you to copy individual files as well as entire directory trees +to and from the cloud. You can also perform streaming downloads for example to +preview videos and audio files, without needing to download the entire file. + +You can register account using a 'megareg' tool, with the benefit of having true +control of your encryption keys. + +Megatools are robust and optimized for fast operation - as fast as Mega servers +allow. Memory requirements and CPU utilization are kept at minimum. + +Mega website can be found at mega.co.nz. +EOF diff --git a/net/megatools/HISTORY b/net/megatools/HISTORY new file mode 100644 index 0000000000..9128a70d1a --- /dev/null +++ b/net/megatools/HISTORY @@ -0,0 +1,2 @@ +2014-09-29 Vlad Glagolev + * DEPENDS, DETAILS: spell created -- cgit v1.2.3 From eca81e37dba55c476519544f26672b15a2e98cf0 Mon Sep 17 00:00:00 2001 From: Vlad Glagolev Date: Mon, 29 Sep 2014 11:41:24 +0400 Subject: megatools: added missing glib-networking dependency --- net/megatools/DEPENDS | 1 + 1 file changed, 1 insertion(+) diff --git a/net/megatools/DEPENDS b/net/megatools/DEPENDS index bf018b3b7f..83b00ac61e 100755 --- a/net/megatools/DEPENDS +++ b/net/megatools/DEPENDS @@ -1,6 +1,7 @@ depends glib2 && depends curl && depends SSL && +depends glib-networking && optional_depends gobject-introspection \ "--enable-introspection" \ -- cgit v1.2.3 From b3384d48aae17813dee1522393c1741b294bba8d Mon Sep 17 00:00:00 2001 From: Treeve Jelbert Date: Sat, 27 Sep 2014 15:21:38 +0200 Subject: wine: => 1.7.27 --- x11-libs/wine/DETAILS | 2 +- x11-libs/wine/HISTORY | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/x11-libs/wine/DETAILS b/x11-libs/wine/DETAILS index 363d721208..728bffd857 100755 --- a/x11-libs/wine/DETAILS +++ b/x11-libs/wine/DETAILS @@ -9,7 +9,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git" FORCE_DOWNLOAD=1 else if [[ $WINE_BRANCH == devel ]]; then - VERSION=1.7.26 + VERSION=1.7.27 else VERSION=1.6.1 fi diff --git a/x11-libs/wine/HISTORY b/x11-libs/wine/HISTORY index e1af8aafd8..65f02411cc 100644 --- a/x11-libs/wine/HISTORY +++ b/x11-libs/wine/HISTORY @@ -1,3 +1,6 @@ +2014-09-27 Treeve Jelbert + * DETAILS: version 1.7.27 (devel) + 2014-09-25 Remko van der Vossen * DEPENDS: gettext, libxml2 -- cgit v1.2.3 From 0d071255d1ee25adbd7c8413986a3e6a11892c9c Mon Sep 17 00:00:00 2001 From: Treeve Jelbert Date: Mon, 29 Sep 2014 10:32:33 +0200 Subject: libdrm: => 2.4.58 --- libs/libdrm/DETAILS | 4 ++-- libs/libdrm/HISTORY | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libs/libdrm/DETAILS b/libs/libdrm/DETAILS index 1e25a30d6f..dae4c86e5f 100755 --- a/libs/libdrm/DETAILS +++ b/libs/libdrm/DETAILS @@ -8,8 +8,8 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/drm-git" SOURCE_IGNORE=volatile FORCE_DOWNLOAD=1 else - VERSION=2.4.56 - SOURCE_HASH=sha512:5ad28ddcfad666c207a7d7c6139140182bd96c0f2c6befafbb03a9f50aa40119366cc8750025626c7c2570416a6e9476ab5102b4075562b52cdca577ded5d64c + VERSION=2.4.58 + SOURCE_HASH=sha512:26776b3f93fe173f4e0f94668813ec1a756d9f15385d1cad70c7af8d4d5d503aef00e14081c76f6fcac6e0c606e106e47ddf76038f8601b71fc380306536f937 SOURCE=${SPELL}-${VERSION}.tar.bz2 SOURCE_URL[0]=http://dri.freedesktop.org/${SPELL}/${SOURCE} SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION" diff --git a/libs/libdrm/HISTORY b/libs/libdrm/HISTORY index ae584fc39d..af87b2439f 100644 --- a/libs/libdrm/HISTORY +++ b/libs/libdrm/HISTORY @@ -1,3 +1,6 @@ +2014-09-29 Treeve Jelbert + * DETAILS: 2.4.58 + 2014-08-24 Thomas Orgis * SUB_DEPENDS, PRE_SUB_DEPENDS: support NV and NOUVEAU, both in field use:-/ -- cgit v1.2.3 From fc310ab7acddf0c558d2d42c26ebd909efdcbe00 Mon Sep 17 00:00:00 2001 From: Vlad Glagolev Date: Mon, 29 Sep 2014 15:13:40 +0400 Subject: nodejs: => 0.10.32 --- devel/nodejs/BUILD | 3 ++- devel/nodejs/DEPENDS | 9 ++++++++- devel/nodejs/DETAILS | 9 +++++---- devel/nodejs/HISTORY | 5 +++++ 4 files changed, 20 insertions(+), 6 deletions(-) diff --git a/devel/nodejs/BUILD b/devel/nodejs/BUILD index a23a8e8906..a89d357898 100755 --- a/devel/nodejs/BUILD +++ b/devel/nodejs/BUILD @@ -1,2 +1,3 @@ -./configure --prefix=/usr && +./configure --prefix=$INSTALL_ROOT/usr $OPTS && + make diff --git a/devel/nodejs/DEPENDS b/devel/nodejs/DEPENDS index a86d429d69..77397dae5e 100755 --- a/devel/nodejs/DEPENDS +++ b/devel/nodejs/DEPENDS @@ -1 +1,8 @@ -depends python +depends -sub CXX gcc && +depends python && +depends zlib '--shared-zlib' && + +optional_depends -sub "1.0" openssl \ + "--shared-openssl" \ + "" \ + "to use system OpenSSL library instead of bundled" diff --git a/devel/nodejs/DETAILS b/devel/nodejs/DETAILS index 58ea65aba2..94b873ea9e 100755 --- a/devel/nodejs/DETAILS +++ b/devel/nodejs/DETAILS @@ -1,9 +1,10 @@ SPELL=nodejs - VERSION=0.8.12 - SOURCE_HASH=sha512:27eb75c785e32b1faf417aea09f849679ff2c22f94253961574d171b1f599297550770849dd3b6faca853e26a2320619477ac7d7ea57b9a3be817cfa49e8afd2 - SOURCE=node-v$VERSION.tar.gz -SOURCE_DIRECTORY=$BUILD_DIRECTORY/node-v$VERSION + SPELLX=${SPELL/js} + VERSION=0.10.32 + SOURCE=$SPELLX-v$VERSION.tar.gz SOURCE_URL[0]=http://nodejs.org/dist/v$VERSION/$SOURCE + SOURCE_HASH=sha512:5871100fac79c81e940b68cd0eba978c46863375985b86c0124bc0a13eafc7bd371663bb0798a04108fb0234b24a28241ba49fe687300a36475674f7ad9ec9bf +SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-v$VERSION" WEB_SITE=http://nodejs.org/ ENTERED=20120211 LICENSE[0]=MIT diff --git a/devel/nodejs/HISTORY b/devel/nodejs/HISTORY index 9d7a98bb0f..680d455dbd 100644 --- a/devel/nodejs/HISTORY +++ b/devel/nodejs/HISTORY @@ -1,3 +1,8 @@ +2014-09-29 Vlad Glagolev + * DETAILS: updated spell to 0.10.32; quoting paths + * BUILD: use INSTALL_ROOT, OPTS + * DEPENDS: added gcc, zlib and openssl dependencies + 2012-10-15 Ladislav Hagara * DETAILS: 0.8.12 -- cgit v1.2.3 From 9bd80c161d50ee98e6a3e43517bc566f26f525ce Mon Sep 17 00:00:00 2001 From: Vlad Glagolev Date: Mon, 29 Sep 2014 15:16:03 +0400 Subject: phantomjs: new spell, headless WebKit scriptable with a JavaScript API --- ChangeLog | 2 ++ http/phantomjs/BUILD | 5 +++++ http/phantomjs/DEPENDS | 4 ++++ http/phantomjs/DETAILS | 17 +++++++++++++++++ http/phantomjs/HISTORY | 2 ++ http/phantomjs/INSTALL | 1 + 6 files changed, 31 insertions(+) create mode 100755 http/phantomjs/BUILD create mode 100755 http/phantomjs/DEPENDS create mode 100755 http/phantomjs/DETAILS create mode 100644 http/phantomjs/HISTORY create mode 100755 http/phantomjs/INSTALL diff --git a/ChangeLog b/ChangeLog index 857cb27321..fb622c1340 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2014-09-29 Vlad Glagolev * net/megatools: new spell, command line client for mega.co.nz + * http/phantomjs: new spell, headless WebKit scriptable with a + JavaScript API 2014-09-25 Ismael Luceno * utils/lxc: new spell, Userspace tools for the Linux kernel containers diff --git a/http/phantomjs/BUILD b/http/phantomjs/BUILD new file mode 100755 index 0000000000..cc27c6ba07 --- /dev/null +++ b/http/phantomjs/BUILD @@ -0,0 +1,5 @@ +./build.sh --confirm && + +if list_find "$LDFLAGS" "-s"; then + strip -v bin/phantomjs +fi diff --git a/http/phantomjs/DEPENDS b/http/phantomjs/DEPENDS new file mode 100755 index 0000000000..fd63d855c3 --- /dev/null +++ b/http/phantomjs/DEPENDS @@ -0,0 +1,4 @@ +depends -sub CXX gcc && +depends openssl && +depends freetype2 && +depends fontconfig diff --git a/http/phantomjs/DETAILS b/http/phantomjs/DETAILS new file mode 100755 index 0000000000..87529c5b65 --- /dev/null +++ b/http/phantomjs/DETAILS @@ -0,0 +1,17 @@ + SPELL=phantomjs + VERSION=1.9.7 + SOURCE=$SPELL-$VERSION-source.zip + SOURCE_URL[0]=https://bitbucket.org/ariya/$SPELL/downloads/$SOURCE + SOURCE_HASH=sha512:ed2bbfd1e460e5fba721c7660bf0dd827197684fec1b3e52515648165d92dd876f7b604c043d2e8d2deb766dc43fc89a9fde41985b809e158c696bb2ac721815 +SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION" + DOC_DIRS="examples" + DOCS="LICENSE.BSD $DOCS" + WEB_SITE=http://phantomjs.org/ + ENTERED=20140929 + LICENSE[0]=BSD + SHORT="headless WebKit scriptable with a JavaScript API" +cat << EOF +PhantomJS is a headless WebKit scriptable with a JavaScript API. It has fast and +native support for various web standards: DOM handling, CSS selector, JSON, +Canvas, and SVG. +EOF diff --git a/http/phantomjs/HISTORY b/http/phantomjs/HISTORY new file mode 100644 index 0000000000..027d0bc3b4 --- /dev/null +++ b/http/phantomjs/HISTORY @@ -0,0 +1,2 @@ +2014-09-29 Vlad Glagolev + * DETAILS, DEPENDS, BUILD, INSTALL: spell created, version 1.9.7 diff --git a/http/phantomjs/INSTALL b/http/phantomjs/INSTALL new file mode 100755 index 0000000000..cd67850b6d --- /dev/null +++ b/http/phantomjs/INSTALL @@ -0,0 +1 @@ +install -vm 755 bin/phantomjs "$INSTALL_ROOT/usr/bin" -- cgit v1.2.3 From 55f2a0049cc44007d0dd9233cd853fd56439d3a6 Mon Sep 17 00:00:00 2001 From: Ladislav Hagara Date: Mon, 29 Sep 2014 13:29:03 +0200 Subject: linux 3.16.3 --- kernels/linux/HISTORY | 4 ++++ kernels/linux/info/patches/maintenance_patches_3/patch-3.16.3 | 5 +++++ kernels/linux/latest.defaults | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) create mode 100755 kernels/linux/info/patches/maintenance_patches_3/patch-3.16.3 diff --git a/kernels/linux/HISTORY b/kernels/linux/HISTORY index c7e1267515..ae148d361e 100644 --- a/kernels/linux/HISTORY +++ b/kernels/linux/HISTORY @@ -1,3 +1,7 @@ +2014-09-29 Ladislav Hagara + * latest.defaults: LATEST_maintenance_patches_3=patch-3.16.3 + * info/patches/maintenance_patches_3/patch-3.16.3: added + 2014-09-06 Florian Franzmann * info/kernels/3.16.2, latest.defaults, info/patches/maintenance_patches_3/patch-3.16.2: version 3.16.2 diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.16.3 b/kernels/linux/info/patches/maintenance_patches_3/patch-3.16.3 new file mode 100755 index 0000000000..b03bab79ab --- /dev/null +++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.16.3 @@ -0,0 +1,5 @@ +appliedkernels="3.16" +patchversion="${appliedkernels}.3" +source="patch-${patchversion}.xz" +source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}" +sha1sum="3e36f531e04e148b22fcc96e5cd1eb1b2297c7e2" diff --git a/kernels/linux/latest.defaults b/kernels/linux/latest.defaults index 9715c3c319..778ec89fd8 100644 --- a/kernels/linux/latest.defaults +++ b/kernels/linux/latest.defaults @@ -2,7 +2,7 @@ LATEST_3=3.16 LATEST_2_6=2.6.39 LATEST_PRE_2_6=patch-2.6.39 LATEST_maintenance_patches=patch-2.6.39.4 -LATEST_maintenance_patches_3=patch-3.16.2 +LATEST_maintenance_patches_3=patch-3.16.3 LATEST_git_patches=patch-2.6.25-rc6-git7 LATEST_2_4=2.4.37.9 LATEST_PRE_2_4=patch-2.4.33-pre1 -- cgit v1.2.3 From d0d5998a5394ca862e675081671f2e04e2dfd2f5 Mon Sep 17 00:00:00 2001 From: Ladislav Hagara Date: Mon, 29 Sep 2014 17:10:01 +0200 Subject: wireshark 1.12.1 --- security/wireshark/DETAILS | 6 +++--- security/wireshark/HISTORY | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/security/wireshark/DETAILS b/security/wireshark/DETAILS index ebbf0c8797..8526ba84ad 100755 --- a/security/wireshark/DETAILS +++ b/security/wireshark/DETAILS @@ -1,11 +1,11 @@ SPELL=wireshark - VERSION=1.12.0 - SECURITY_PATCH=48 + VERSION=1.12.1 + SECURITY_PATCH=49 SOURCE=$SPELL-$VERSION.tar.bz2 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION" SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE SOURCE_URL[1]=http://www.wireshark.org/download/src/$SOURCE - SOURCE_HASH=sha512:03c55106e2b4d5690d0b5fe74b2f4723f07ea9f9a6ca0f54b006045ec4bda47cb31dd3aa8c1879375844f6e6b49f1ffd4a6bb2e34564d43d6e0a25a08302b902 + SOURCE_HASH=sha512:840f348c8cdaa0e4d96c34e0a752f3d575d975ac8e61b31f6456a0eba4b484268651c96b943cfe213a6c40edcb18670ec921564413c052fcafdf32b2c8523929 WEB_SITE=http://www.wireshark.org/ ENTERED=20020116 LICENSE[0]=GPL diff --git a/security/wireshark/HISTORY b/security/wireshark/HISTORY index 5d4197dc6b..3ba2e0c324 100644 --- a/security/wireshark/HISTORY +++ b/security/wireshark/HISTORY @@ -1,3 +1,6 @@ +2014-09-29 Ladislav Hagara + * DETAILS: 1.12.1 + 2014-08-19 Treeve Jelbert * DEPENDS: openssl => SSL -- cgit v1.2.3 From 2175538a183798b72953fce8c523f54388b9001c Mon Sep 17 00:00:00 2001 From: Vlad Glagolev Date: Tue, 30 Sep 2014 14:46:50 +0400 Subject: php: => 5.4.33 --- php-pear/php/DEPENDS | 2 +- php-pear/php/DETAILS | 4 ++-- php-pear/php/HISTORY | 9 ++++++--- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/php-pear/php/DEPENDS b/php-pear/php/DEPENDS index af0437baf7..385b776857 100755 --- a/php-pear/php/DEPENDS +++ b/php-pear/php/DEPENDS @@ -76,7 +76,7 @@ optional_depends SSL \ "for OpenSSL support" && if is_depends_enabled $SPELL $(get_spell_provider $SPELL C-CLIENT); then - if is_depends_enabled $SPELL SSL; then + if is_depends_enabled $SPELL $(get_spell_provider $SPELL SSL); then list_add "PHP5_OPTS" "--with-imap-ssl" else optional_depends SSL \ diff --git a/php-pear/php/DETAILS b/php-pear/php/DETAILS index 1dc499c0c7..9253d0bc51 100755 --- a/php-pear/php/DETAILS +++ b/php-pear/php/DETAILS @@ -1,10 +1,10 @@ SPELL=php if [[ $PHP5_BRANCH == stable ]]; then - VERSION=5.4.32 + VERSION=5.4.33 SECURITY_PATCH=9 SOURCE=$SPELL-$VERSION.tar.bz2 SOURCE_URL[0]=http://static.php.net/www.php.net/distributions/$SOURCE - SOURCE_HASH=sha512:a2bf1c4977bfb36502163f5fd1ba81b6d7ac2a99f77c7e584761efbd6bbbc3ba0ec493ccc5bf61d78f956c8666b84b1b4bbfbbb778d2834541b47a9a5cfd63e0 + SOURCE_HASH=sha512:c7a97db745aa77c2deccea022d97732bce736ccd481a7b6c63d7da79ce3d1a4d13d3f4968bfdab3ac1091a23dd6a243f3d3b0b2ac688205decc944d3d6ecf347 elif [[ $PHP5_BRANCH == previous ]]; then VERSION=5.3.29 SECURITY_PATCH=23 diff --git a/php-pear/php/HISTORY b/php-pear/php/HISTORY index 068fdef72b..ebefc2067d 100644 --- a/php-pear/php/HISTORY +++ b/php-pear/php/HISTORY @@ -1,5 +1,9 @@ -2014-08-24 Treeve Jelbert - * DEPENDS: fix bad with-SSL usage +2014-09-30 Vlad Glagolev + * DETAILS: updated spell to 5.4.33 (stable) + * DEPENDS: corrected SSL case + +2014-08-24 Treeve Jelbert + * DEPENDS: fix bad with-SSL usage 2014-08-22 Vlad Glagolev * DETAILS: updated spell to 5.4.32 (stable); SECURITY_PATCH++ @@ -8,7 +12,6 @@ 2014-08-19 Treeve Jelbert * DEPENDS: openssl => SSL - * SUB_DEPENDS, PRE_SUB_DEPENDS: openssl => SSL 2014-08-15 Vlad Glagolev * DETAILS: updated spell to 5.3.29 (previous); SECURITY_PATCH++ -- cgit v1.2.3 From 3e59e06bced29d37890ccf022f459cd96450b573 Mon Sep 17 00:00:00 2001 From: Ismael Luceno Date: Tue, 30 Sep 2014 11:50:45 -0300 Subject: byobu: Fix SOURCE --- shell-term-fm/byobu/DEPENDS | 0 shell-term-fm/byobu/DETAILS | 4 ++-- shell-term-fm/byobu/HISTORY | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) mode change 100644 => 100755 shell-term-fm/byobu/DEPENDS diff --git a/shell-term-fm/byobu/DEPENDS b/shell-term-fm/byobu/DEPENDS old mode 100644 new mode 100755 diff --git a/shell-term-fm/byobu/DETAILS b/shell-term-fm/byobu/DETAILS index 1a85b8533e..c46bd138f2 100755 --- a/shell-term-fm/byobu/DETAILS +++ b/shell-term-fm/byobu/DETAILS @@ -1,7 +1,7 @@ SPELL=byobu VERSION=5.86 - SOURCE="$SPELL_$VERSION.orig.tar.gz" - SOURCE_URL[0]=https://launchpad.net/$SPELL/trunk/$VERSION/+download/$SOURCE + SOURCE="${SPELL}_$VERSION.orig.tar.gz" + SOURCE_URL[0]="https://launchpad.net/$SPELL/trunk/$VERSION/+download/$SOURCE" SOURCE_HASH=sha512:e811423714427ae8d781428a225344fa8909584cdb8d369645a00fea12da2740cbb18ca55e7e587d03eb3074b107576b8e9dd3eb5c36b0d01c2b31d77d559ceb SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION" WEB_SITE="http://byobu.co" diff --git a/shell-term-fm/byobu/HISTORY b/shell-term-fm/byobu/HISTORY index ab8a7d261d..beec32cca7 100644 --- a/shell-term-fm/byobu/HISTORY +++ b/shell-term-fm/byobu/HISTORY @@ -1,3 +1,6 @@ +2014-09-30 Ismael Luceno + * DETAILS: Fixed SOURCE + 2014-09-13 Ismael Luceno * DETAILS: spell created * DEPENDS: Optionally depends on newt for byobu-config -- cgit v1.2.3 From dd7ad7084196155aa3a1f3d49ebe3191b92e484a Mon Sep 17 00:00:00 2001 From: Ismael Luceno Date: Fri, 26 Sep 2014 02:41:40 -0300 Subject: firefox: Clean up dependencies --- http/firefox/DEPENDS | 56 +++++++++++++++++++++++++++------------------------- http/firefox/HISTORY | 3 +++ 2 files changed, 32 insertions(+), 27 deletions(-) diff --git a/http/firefox/DEPENDS b/http/firefox/DEPENDS index 2dda25ff87..9312e8f286 100755 --- a/http/firefox/DEPENDS +++ b/http/firefox/DEPENDS @@ -1,45 +1,49 @@ -depends atk && -depends cairo && -depends fontconfig && -depends freetype2 && depends -sub CXX gcc && -depends gdk-pixbuf2 && +depends perl && +depends python && +depends pysqlite && + depends glib2 && -depends gtk+2 '--enable-xft --disable-freetype2' && -depends nspr '--with-system-nspr' && -depends -sub "3.16.x" nss '--with-system-nss' && -depends libidl && -depends libjpeg-turbo '--with-system-jpeg' && +depends gtk+2 && +depends atk && depends libx11 && depends libxext && depends libxrender && depends libxt && + depends pango && -depends perl && -depends pysqlite && -depends python && +depends libxft '--enable-xft --disable-freetype2' && + +depends cairo && +depends gdk-pixbuf2 && + +depends JPEG '--with-system-jpeg' && +depends -sub APNG libpng && + +depends nspr '--with-system-nspr' && +depends -sub "3.16.x" nss '--with-system-nss' && + depends -sub "TSAFE SECURE_DELETE ENABLE_UNLOCK_NOTIFY" sqlite '--enable-system-sqlite' && + +depends libidl && + depends zip && depends zlib '--with-system-zlib' && optional_depends startup-notification \ - '--enable-startup-notification' \ - '--disable-startup-notification' \ + --{en,dis}able-startup-notification \ 'for startup notifications' && optional_depends gconf2 \ - '--enable-gconf' \ - '--disable-gconf' \ + --{en,dis}able-gconf \ 'for gconf support' && -optional_depends 'wireless_tools' \ - '--enable-necko-wifi' \ - '--disable-necko-wifi' \ +optional_depends wireless_tools \ + --{en,dis}able-necko-wifi \ 'for Necko WiFi scanning' && -optional_depends 'pulseaudio' \ - '--enable-pulseaudio' \ - '--disable-pulseaudio' \ +optional_depends pulseaudio \ + --{en,dis}able-pulseaudio \ 'use pulseaudio for audio support' && # Firefox is currently borked and does not compile without alsa-lib headers, @@ -68,8 +72,7 @@ if is_depends_enabled $SPELL alsa-lib; then fi && optional_depends dbus-glib \ - '--enable-dbus' \ - '--disable-dbus' \ + --{en,dis}able-dbus \ 'for dbus support' && # Firefox is currently borked and does not compile without OpenGL headers @@ -80,8 +83,7 @@ optional_depends dbus-glib \ depends OPENGL && optional_depends gstreamer \ - '--enable-gstreamer' \ - '--disable-gstreamer' \ + --{en,dis}able-gstreamer \ 'for gstreamer based AV support' && suggest_depends_2 firefox-smglwiki '' '' \ diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY index 64d2ddec5a..02db8bea9f 100644 --- a/http/firefox/HISTORY +++ b/http/firefox/HISTORY @@ -1,3 +1,6 @@ +2014-09-26 Ismael Luceno + * DEPENDS: Cleanup dependencies + 2014-09-25 Florian Franzmann * DETAILS: version 32.0.3, security update -- cgit v1.2.3 From 40d95f9ecd0f833318366210a9019dbc480f9fa2 Mon Sep 17 00:00:00 2001 From: Treeve Jelbert Date: Wed, 1 Oct 2014 12:09:23 +0200 Subject: ghostscript: => 9.15 --- printer/ghostscript/DETAILS | 4 ++-- printer/ghostscript/HISTORY | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/printer/ghostscript/DETAILS b/printer/ghostscript/DETAILS index 74791983dc..3c5462a18e 100755 --- a/printer/ghostscript/DETAILS +++ b/printer/ghostscript/DETAILS @@ -1,6 +1,6 @@ SPELL=ghostscript - VERSION=9.14 - SOURCE_HASH=sha512:c2188a2b1fbd96ec184cd4171f0c042a9479f89d6e982aaf079d56060df6061721a42b1b98923767dba8081497d8e85593896fb3c26fc35f99610461bf8f16bb + VERSION=9.15 + SOURCE_HASH=sha512:5c800615bb813f827c218145eb3238773e01f0941efca51abf4233ac6fdb96154b362c65a9567dc6b22794cb2caff69a58eb436c7f9c8e5370a4a64087e50c7e SOURCE=$SPELL-$VERSION.tar.bz2 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION" WEB_SITE=http://www.ghostscript.com/ diff --git a/printer/ghostscript/HISTORY b/printer/ghostscript/HISTORY index 504d3865fa..081aaac068 100644 --- a/printer/ghostscript/HISTORY +++ b/printer/ghostscript/HISTORY @@ -1,3 +1,6 @@ +2014-10-01 Treeve Jelbert + * DETAILS: version 9.15 + 2014-09-09 Remko van der Vossen * DEPENDS: fontconfig -- cgit v1.2.3 From af7292c1d8f1b5510aa1ec7e598318459ccdf78d Mon Sep 17 00:00:00 2001 From: Ladislav Hagara Date: Wed, 1 Oct 2014 12:55:14 +0200 Subject: libcaca 0.99.beta19 --- graphics-libs/libcaca/DEPENDS | 1 + graphics-libs/libcaca/DETAILS | 4 ++-- graphics-libs/libcaca/HISTORY | 4 ++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/graphics-libs/libcaca/DEPENDS b/graphics-libs/libcaca/DEPENDS index 12fe270c1c..47ecdee897 100755 --- a/graphics-libs/libcaca/DEPENDS +++ b/graphics-libs/libcaca/DEPENDS @@ -8,5 +8,6 @@ optional_depends GLUT "" "" "Enable GLUT support?" optional_depends CSHARP "" "--disable-csharp" "Enable C-Sharp bindings?" && optional_depends JAVA "" "--disable-java" "Enable JAVA bindings?" && optional_depends -sub CXX gcc "" "--disable-cxx" "Enable C++ bindings?" && +optional_depends PYTHON "" "--disable-python" "Enable Python bindings?" && optional_depends RUBY "" "--disable-ruby" "Enable Ruby bindings?" && optional_depends pango "" "" "Enable pango use?" diff --git a/graphics-libs/libcaca/DETAILS b/graphics-libs/libcaca/DETAILS index cb00cfbdd8..4d0d4d0a67 100755 --- a/graphics-libs/libcaca/DETAILS +++ b/graphics-libs/libcaca/DETAILS @@ -1,11 +1,11 @@ SPELL=libcaca - VERSION=0.99.beta17 + VERSION=0.99.beta19 SOURCE=$SPELL-$VERSION.tar.gz SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION SOURCE_URL[0]=http://caca.zoy.org/raw-attachment/wiki/libcaca/$SOURCE WEB_SITE=http://caca.zoy.org/wiki/libcaca ENTERED=20031218 - SOURCE_HASH=sha512:1d08a45a742cbda2c80810e753b49588cb9073ef545a1d47537745c4e62dc79748a25907903ffee58676d9aa5b75c5e0658666429cf028e10c09157d418c8d19 + SOURCE_HASH=sha512:780fc7684d40207cc10df3f87d6d8f1d47ddfffa0e76e41a5ce671b82d5c7f090facb054c3d49ca7c4ea1a619625bb9085ce52f837f50792b4a2d776a4c68e15 LICENSE[0]=GPL KEYWORDS="graphics libs" SHORT="libcaca is a graphics library that outputs text instead of pixels" diff --git a/graphics-libs/libcaca/HISTORY b/graphics-libs/libcaca/HISTORY index 02d515add3..eba16ca652 100644 --- a/graphics-libs/libcaca/HISTORY +++ b/graphics-libs/libcaca/HISTORY @@ -1,3 +1,7 @@ +2014-10-01 Ladislav Hagara + * DETAILS: 0.99.beta19 + * DEPENDS: optional_depends PYTHON added + 2014-04-14 Treeve Jelbert * DEPENDS: mesalib => MESALIB -- cgit v1.2.3 From 91b36daf22d290457a5f0cf39b553d7568068bd9 Mon Sep 17 00:00:00 2001 From: Ladislav Hagara Date: Wed, 1 Oct 2014 13:13:10 +0200 Subject: mpv 0.6.0 --- video/mpv/DETAILS | 4 ++-- video/mpv/HISTORY | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/video/mpv/DETAILS b/video/mpv/DETAILS index 0a9a64655f..6a57e92c9d 100755 --- a/video/mpv/DETAILS +++ b/video/mpv/DETAILS @@ -1,10 +1,10 @@ SPELL=mpv - VERSION=0.4.1 + VERSION=0.6.0 SOURCE=${SPELL}-${VERSION}.tar.gz SOURCEX=v${VERSION}.tar.gz SOURCE_URL[0]=https://github.com/${SPELL}-player/${SPELL}/archive/${SOURCEX} SOURCE_HINTS="no-check-certificate" - SOURCE_HASH=sha512:154a27198c1690d5d1b3c097163e97eff6f375496c9fb7f7958936c84c776afd78b392df8e136798a1f5a1fc4924af3069cc7dbef36bfa8ff84aff9d7a0b8735 + SOURCE_HASH=sha512:b66a48d33f4f1df0492544854d43db4abff332675503a31b82f35d3f5a62f9718d842f1ba1c280e5b049bf022077c0886ee2cfcff2c1b6b96728c62e73d65cc2 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION" DOCS="Copyright DOCS/tech-overview.txt DOCS/OUTDATED-tech/* $DOCS" WEB_SITE=http://mpv.io/ diff --git a/video/mpv/HISTORY b/video/mpv/HISTORY index 728bdf3b20..391314bb1e 100644 --- a/video/mpv/HISTORY +++ b/video/mpv/HISTORY @@ -1,3 +1,6 @@ +2014-10-01 Ladislav Hagara + * DETAILS: 0.6.0 + 2014-08-19 Treeve Jelbert * DEPENDS: openssl => SSL -- cgit v1.2.3 From 74d36be98146cea859727316633ec8ccc7103724 Mon Sep 17 00:00:00 2001 From: Ladislav Hagara Date: Wed, 1 Oct 2014 14:26:38 +0200 Subject: openal-soft 1.16.0 --- audio-libs/openal-soft/DETAILS | 4 ++-- audio-libs/openal-soft/HISTORY | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/audio-libs/openal-soft/DETAILS b/audio-libs/openal-soft/DETAILS index c7d25a7815..e217ee017f 100755 --- a/audio-libs/openal-soft/DETAILS +++ b/audio-libs/openal-soft/DETAILS @@ -1,6 +1,6 @@ SPELL=openal-soft - VERSION=1.15.1 - SOURCE_HASH=sha512:ca6dafdd503d06892dff08763bc00b974ec6e7c4bf3dcebb4cb41a486b4ea777c278299a198db182fee888a19a5716bd57d91a2859b764a532138a79f2bd672f + VERSION=1.16.0 + SOURCE_HASH=sha512:b89e46902ce475afd47c4c153ae666646e8b277abf1be97f92b6a10dc585ed780c663591398a9fd7e4118595dd45d2d8d6df0101b4148686150bbb3fe2939ddc SOURCE="${SPELL}-${VERSION}.tar.bz2" SOURCE_URL[0]=http://kcat.strangesoft.net/openal-releases/${SOURCE} SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}" diff --git a/audio-libs/openal-soft/HISTORY b/audio-libs/openal-soft/HISTORY index e57c201b25..f2dfb817a7 100644 --- a/audio-libs/openal-soft/HISTORY +++ b/audio-libs/openal-soft/HISTORY @@ -1,3 +1,6 @@ +2014-10-01 Ladislav Hagara + * DETAILS: 1.16.0 + 2012-12-23 Florian Franzmann * DETAILS: version 1.15.1 * avutil.patch, PRE_BUILD: removed -- cgit v1.2.3 From 8c22860475867c148942d71b801a6024e1b04e0c Mon Sep 17 00:00:00 2001 From: Ladislav Hagara Date: Wed, 1 Oct 2014 14:48:29 +0200 Subject: bino 1.6.0 --- video/bino/DETAILS | 4 ++-- video/bino/HISTORY | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/video/bino/DETAILS b/video/bino/DETAILS index 5a887caa0f..c4bbf1ddcf 100755 --- a/video/bino/DETAILS +++ b/video/bino/DETAILS @@ -1,11 +1,11 @@ SPELL=bino - VERSION=1.4.4 + VERSION=1.6.0 SOURCE=$SPELL-$VERSION.tar.xz SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION SOURCE_URL[0]=http://download.savannah.gnu.org/releases/bino/$SOURCE WEB_SITE=http://bino3d.org/ ENTERED=20110124 - SOURCE_HASH=sha512:6bd8351889b920cff1c23b7287a1055705ac038bfadd1678d111980a586de25b7388f2316c721dfb68da64397842bb53201fa2af14f53b83ed23e0b16ce62249 + SOURCE_HASH=sha512:029e1150ddeaba62187877927ec90965b529602057e8a308d441c5856e3cb2fa86c0f7a18dce3df47836372a7779f11a9e9561c9af7c4af70db992f0ba307ba9 LICENSE[0]=GPL SHORT="3D video player with multi-display support" cat << EOF diff --git a/video/bino/HISTORY b/video/bino/HISTORY index 8103ec983a..4591c0155b 100644 --- a/video/bino/HISTORY +++ b/video/bino/HISTORY @@ -1,3 +1,6 @@ +2014-10-01 Ladislav Hagara + * DETAILS: 1.6.0 + 2014-02-17 Ladislav Hagara * DETAILS: 1.4.4 -- cgit v1.2.3 From 50ed3a465e28737de2936252a397af4bef8c8f31 Mon Sep 17 00:00:00 2001 From: Treeve Jelbert Date: Wed, 1 Oct 2014 14:21:17 +0200 Subject: m4: => 1.4.17 --- devel/m4/DETAILS | 2 +- devel/m4/HISTORY | 4 ++++ devel/m4/PRE_BUILD | 6 ------ devel/m4/glibc215.patch | 10 ---------- 4 files changed, 5 insertions(+), 17 deletions(-) delete mode 100755 devel/m4/PRE_BUILD delete mode 100644 devel/m4/glibc215.patch diff --git a/devel/m4/DETAILS b/devel/m4/DETAILS index e3eff61789..16b77f681a 100755 --- a/devel/m4/DETAILS +++ b/devel/m4/DETAILS @@ -1,5 +1,5 @@ SPELL=m4 - VERSION=1.4.16 + VERSION=1.4.17 SECURITY_PATCH=2 SOURCE=$SPELL-$VERSION.tar.gz SOURCE2=$SOURCE.sig diff --git a/devel/m4/HISTORY b/devel/m4/HISTORY index 7ca5ce7480..cefe52770f 100644 --- a/devel/m4/HISTORY +++ b/devel/m4/HISTORY @@ -1,3 +1,7 @@ +2014-10-01 Treeve Jelbert + * DETAILS: version 1.4.17 + * glibc215.patch, PRE_BUILD: deleted - builds with glibc-2.20 + 2012-12-08 Vlad Glagolev * PRE_BUILD: apply the patch * glibc215.patch: added, to fix build with glibc >=2.15 diff --git a/devel/m4/PRE_BUILD b/devel/m4/PRE_BUILD deleted file mode 100755 index 62c7b7c430..0000000000 --- a/devel/m4/PRE_BUILD +++ /dev/null @@ -1,6 +0,0 @@ -default_pre_build && -cd ${SOURCE_DIRECTORY} && - -patch -p0 < "$SPELL_DIRECTORY/glibc215.patch" && - -sed -i '/#include "m4.h"/i#include ' src/path.c diff --git a/devel/m4/glibc215.patch b/devel/m4/glibc215.patch deleted file mode 100644 index 9b6f475e87..0000000000 --- a/devel/m4/glibc215.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- lib/stdio.in.h.orig 2011-03-01 19:39:29.000000000 +0300 -+++ lib/stdio.in.h 2012-12-08 23:01:59.570142449 +0400 -@@ -162,7 +162,6 @@ - so any use of gets warrants an unconditional warning. Assume it is - always declared, since it is required by C89. */ - #undef gets --_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); - - #if @GNULIB_FOPEN@ - # if @REPLACE_FOPEN@ -- cgit v1.2.3 From afd42c65d0ece1a2a9fc0dada56ec6deca2aef7b Mon Sep 17 00:00:00 2001 From: Treeve Jelbert Date: Wed, 1 Oct 2014 15:10:11 +0200 Subject: automake: => 1.14.1 --- devel/automake/DETAILS | 2 +- devel/automake/HISTORY | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/devel/automake/DETAILS b/devel/automake/DETAILS index 07364169a6..df86aa8cda 100755 --- a/devel/automake/DETAILS +++ b/devel/automake/DETAILS @@ -1,5 +1,5 @@ SPELL=automake - VERSION=1.14 + VERSION=1.14.1 SECURITY_PATCH=1 SOURCE=$SPELL-$VERSION.tar.xz SOURCE2=$SOURCE.sig diff --git a/devel/automake/HISTORY b/devel/automake/HISTORY index a0d1ca2669..864b89a6da 100644 --- a/devel/automake/HISTORY +++ b/devel/automake/HISTORY @@ -1,3 +1,6 @@ +2014-10-01 Treeve Jelbert + * DETAILS: 1.14.1 + 2013-07-30 Treeve Jelbert * DETAILS: 1.14 -- cgit v1.2.3 From b4c28eb11df41079b42a708751b27cada9857154 Mon Sep 17 00:00:00 2001 From: Treeve Jelbert Date: Wed, 1 Oct 2014 16:35:36 +0200 Subject: glib2: => 2.42.0 --- gnome2-libs/glib2/DETAILS | 8 ++++---- gnome2-libs/glib2/HISTORY | 4 ++++ gnome2-libs/glib2/PRE_BUILD | 10 ---------- 3 files changed, 8 insertions(+), 14 deletions(-) delete mode 100755 gnome2-libs/glib2/PRE_BUILD diff --git a/gnome2-libs/glib2/DETAILS b/gnome2-libs/glib2/DETAILS index 943f247b6b..4daee55188 100755 --- a/gnome2-libs/glib2/DETAILS +++ b/gnome2-libs/glib2/DETAILS @@ -1,12 +1,12 @@ SPELL=glib2 if [[ $GLIB_VER == devel ]];then - VERSION=2.41.2 - SOURCE_HASH=sha512:2247a7074a4bcd7100e84ee4d392be4487d06de5da8fc5c8bd4a8a278449986558c34a9deb383b489b82f2cc000b89067460a0191fcf45a73509a49a3f25eacd + VERSION=2.42.0 + SOURCE_HASH=sha512:61b94d8d230d964cbacc5365496165450b0084fc7f215afda5ce0c4d7a5dc7cdf5c5dc7436924330a5a47df1748e6a041f71d9b7882addf464961f14dc9f4ea2 SOURCE=glib-$VERSION.tar.xz # SOURCE_GPG="gurus.gpg:${SOURCE}.sig" else - VERSION=2.41.2 - SOURCE_HASH=sha512:2247a7074a4bcd7100e84ee4d392be4487d06de5da8fc5c8bd4a8a278449986558c34a9deb383b489b82f2cc000b89067460a0191fcf45a73509a49a3f25eacd + VERSION=2.42.0 + SOURCE_HASH=sha512:61b94d8d230d964cbacc5365496165450b0084fc7f215afda5ce0c4d7a5dc7cdf5c5dc7436924330a5a47df1748e6a041f71d9b7882addf464961f14dc9f4ea2 SECURITY_PATCH=1 SOURCE=glib-$VERSION.tar.xz # SOURCE_GPG="gurus.gpg:${SOURCE}.sig" diff --git a/gnome2-libs/glib2/HISTORY b/gnome2-libs/glib2/HISTORY index 324f1ebad2..c0d2b1e5c2 100644 --- a/gnome2-libs/glib2/HISTORY +++ b/gnome2-libs/glib2/HISTORY @@ -1,3 +1,7 @@ +2014-10-01 Treeve Jelbert + * DETAILS: 2.42.0 + * PRE_BUILD: not needed + 2014-08-28 Thomas Orgis * DEPENDS: some PYTHON is always needed now to avoid failure during INSTALL (for a dbus codegen tool, also the modular-tests option diff --git a/gnome2-libs/glib2/PRE_BUILD b/gnome2-libs/glib2/PRE_BUILD deleted file mode 100755 index 3fcf4b6c87..0000000000 --- a/gnome2-libs/glib2/PRE_BUILD +++ /dev/null @@ -1,10 +0,0 @@ -default_pre_build && -cd "$SOURCE_DIRECTORY" && - -if ! is_depends_enabled $SPELL python; then -# sed -i -e '/^SUBDIRS = / s,gdbus-2.0/codegen,,' gio/Makefile.am && - sed -i -e '/^SUBDIRS += / s,tests,,' gio/Makefile.am -fi - -autoreconf -f -i --symlink -#./autogen.sh -- cgit v1.2.3 From 3b45b6dab28010e6e0a2b3ae9386542935ce6f27 Mon Sep 17 00:00:00 2001 From: Treeve Jelbert Date: Wed, 1 Oct 2014 16:37:01 +0200 Subject: pango: => 1.36.8 --- gnome2-libs/pango/DEPENDS | 2 +- gnome2-libs/pango/DETAILS | 4 ++-- gnome2-libs/pango/HISTORY | 4 ++++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/gnome2-libs/pango/DEPENDS b/gnome2-libs/pango/DEPENDS index 4573481da6..c9d882abb6 100755 --- a/gnome2-libs/pango/DEPENDS +++ b/gnome2-libs/pango/DEPENDS @@ -9,7 +9,7 @@ depends glib2 && depends harfbuzz && depends libffi && depends libpng && -depends MESALIB && +depends mesalib && depends pcre && depends pixman && diff --git a/gnome2-libs/pango/DETAILS b/gnome2-libs/pango/DETAILS index cb614d39bd..d262e964bc 100755 --- a/gnome2-libs/pango/DETAILS +++ b/gnome2-libs/pango/DETAILS @@ -1,6 +1,6 @@ SPELL=pango - VERSION=1.36.6 - SOURCE_HASH=sha512:1345e236059f03cc110adc8a3d6a0fc5565d6fed5f90463f18a672ed82826941fa2dac3a9e9c7d24676e03ff5fcfef091696fbef683c51560989b8224e7637a2 + VERSION=1.36.8 + SOURCE_HASH=sha512:799fad4add3b1ff297bd151a302d6724c5fb0223c9e0f710f97192c024de0175db9a03458e0c18019bdd987b04b5f74737659e113d6b511cf1fc118b9be3c215 # SOURCE_GPG=gurus.gpg:$SOURCE.sig BRANCH=`echo $VERSION|cut -d . -f 1,2` SOURCE=$SPELL-$VERSION.tar.xz diff --git a/gnome2-libs/pango/HISTORY b/gnome2-libs/pango/HISTORY index 8c0750573f..1be0528771 100644 --- a/gnome2-libs/pango/HISTORY +++ b/gnome2-libs/pango/HISTORY @@ -1,3 +1,7 @@ +2014-10-01 Treeve Jelbert + * DETAILS: version 1.36.8 + * DEPENDS: mesalib + 2014-09-25 Remko van der Vossen * DEPENDS: MESALIB -- cgit v1.2.3 From 5ba00c9c0f9c412e58309c9f0f49ddb6f48dfe30 Mon Sep 17 00:00:00 2001 From: Treeve Jelbert Date: Wed, 1 Oct 2014 16:38:26 +0200 Subject: librsvg2: => 2.40.4 --- gnome2-libs/librsvg2/DEPENDS | 1 - gnome2-libs/librsvg2/DETAILS | 4 ++-- gnome2-libs/librsvg2/HISTORY | 4 ++++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/gnome2-libs/librsvg2/DEPENDS b/gnome2-libs/librsvg2/DEPENDS index 4ffb3fdd05..edec806445 100755 --- a/gnome2-libs/librsvg2/DEPENDS +++ b/gnome2-libs/librsvg2/DEPENDS @@ -48,6 +48,5 @@ optional_depends gdk-pixbuf2 \ "--disable-pixbuf-loader" \ "build gdk pixbuf loader" && -optional_depends gtk+2 '' '' 'GTK2 support' && optional_depends gtk+3 '' '' 'GTK3 support' diff --git a/gnome2-libs/librsvg2/DETAILS b/gnome2-libs/librsvg2/DETAILS index a9109fec2c..2e9bf85ed4 100755 --- a/gnome2-libs/librsvg2/DETAILS +++ b/gnome2-libs/librsvg2/DETAILS @@ -1,6 +1,6 @@ SPELL=librsvg2 - VERSION=2.40.2 - SOURCE_HASH=sha512:ecb144f8f02240f44edc4baf372477d6a8436abfcabad0e9fdce9cd629ace819f14d0c8174d9522b4cc63429031a1ecb611bbdabbdb432ec3f211cf331208f84 + VERSION=2.40.4 + SOURCE_HASH=sha512:effb6de6042cc89d9ce01a80058f09b2f4bee43055d07e4b4fb35120f5283e93073221c9453ec03fbb42c71b30202b3febeb5607c9b62c46d2a00ac233a55ed1 # SOURCE_GPG=gurus.gpg:$SOURCE.sig SECURITY_PATCH=2 BRANCH=`echo $VERSION|cut -d . -f 1,2` diff --git a/gnome2-libs/librsvg2/HISTORY b/gnome2-libs/librsvg2/HISTORY index 4cef0be098..d6ee81eab7 100644 --- a/gnome2-libs/librsvg2/HISTORY +++ b/gnome2-libs/librsvg2/HISTORY @@ -1,3 +1,7 @@ +2014-10-01 Treeve Jelbert + * DETAILS: version 2.40.5 + * DEPENDS: no longer uses gtk+2 + 2014-09-09 Remko van der Vossen * DEPENDS: add missing dependencies -- cgit v1.2.3 From 9286565c8a13c90c11fb1a92b614800a20756549 Mon Sep 17 00:00:00 2001 From: Vlad Glagolev Date: Wed, 1 Oct 2014 21:05:43 +0400 Subject: bash: => 4.3.28 [security] --- shell-term-fm/bash/DEPENDS | 8 +- shell-term-fm/bash/DETAILS | 5 +- shell-term-fm/bash/HISTORY | 6 + shell-term-fm/bash/patches/bash43-028 | 2252 +++++++++++++++++++++++++++++++++ 4 files changed, 2267 insertions(+), 4 deletions(-) create mode 100644 shell-term-fm/bash/patches/bash43-028 diff --git a/shell-term-fm/bash/DEPENDS b/shell-term-fm/bash/DEPENDS index 2df54f9e28..35d9cacb66 100755 --- a/shell-term-fm/bash/DEPENDS +++ b/shell-term-fm/bash/DEPENDS @@ -1,5 +1,11 @@ +. "$GRIMOIRE/FUNCTIONS" && + depends gnupg && depends "readline" "--with-installed-readline" && depends "ncurses" "--with-curses" depends smgl-fhs && -depends autoconf +depends autoconf && + +if spell_ok readline && is_version_less $(installed_version readline) 6.3; then + force_depends readline +fi diff --git a/shell-term-fm/bash/DETAILS b/shell-term-fm/bash/DETAILS index beadd3a514..c26644b755 100755 --- a/shell-term-fm/bash/DETAILS +++ b/shell-term-fm/bash/DETAILS @@ -1,7 +1,7 @@ SPELL=bash VERSION=4.3 - SECURITY_PATCH=5 - BASH_PATCHLEVEL=027 + SECURITY_PATCH=6 + BASH_PATCHLEVEL=028 SOURCE=$SPELL-$VERSION.tar.gz SOURCE2=$SOURCE.sig SOURCE3=$SPELL-doc-3.2.tar.gz @@ -17,7 +17,6 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION" SOURCE4_IGNORE=signature WEB_SITE=http://cnswww.cns.cwru.edu/~chet/bash/bashtop.html ENTERED=20010922 - PATCHLEVEL=0 LICENSE[0]=GPL2 KEYWORDS="console" SHORT="Bourne Again SHell for the GNU operating system" diff --git a/shell-term-fm/bash/HISTORY b/shell-term-fm/bash/HISTORY index 66070f1257..84f73c281c 100644 --- a/shell-term-fm/bash/HISTORY +++ b/shell-term-fm/bash/HISTORY @@ -1,3 +1,9 @@ +2014-10-01 Vlad Glagolev + * DETAILS: SECURITY_PATCH++ (final ShellShock fixes for CVE-2014-6277 + and CVE-2014-6278 found by Michal Zalewski) + * DEPENDS: bash 4.3 strictly relies on readline 6.3 + * patches/bash43-028: added, official patch with src line replacement + 2014-09-28 Florian Franzmann * DETAILS, patches/bash43-027: add the latest patch against ShellShock issues; SECURITY_PATCH++ diff --git a/shell-term-fm/bash/patches/bash43-028 b/shell-term-fm/bash/patches/bash43-028 new file mode 100644 index 0000000000..074c727a3c --- /dev/null +++ b/shell-term-fm/bash/patches/bash43-028 @@ -0,0 +1,2252 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.3 +Patch-ID: bash43-028 + +Bug-Reported-by: Florian Weimer +Bug-Reference-ID: +Bug-Reference-URL: + +Bug-Description: + +There are two local buffer overflows in parse.y that can cause the shell +to dump core when given many here-documents attached to a single command +or many nested loops. + +Patch (apply with `patch -p0'): + +*** ../bash-4.3-patched/parse.y 2014-09-25 23:02:35.000000000 -0400 +--- parse.y 2014-09-29 16:47:03.000000000 -0400 +*************** +*** 169,172 **** +--- 169,175 ---- + static int reserved_word_acceptable __P((int)); + static int yylex __P((void)); ++ ++ static void push_heredoc __P((REDIRECT *)); ++ static char *mk_alexpansion __P((char *)); + static int alias_expand_token __P((char *)); + static int time_command_acceptable __P((void)); +*************** +*** 266,270 **** + /* Variables to manage the task of reading here documents, because we need to + defer the reading until after a complete command has been collected. */ +! static REDIRECT *redir_stack[10]; + int need_here_doc; + +--- 269,275 ---- + /* Variables to manage the task of reading here documents, because we need to + defer the reading until after a complete command has been collected. */ +! #define HEREDOC_MAX 16 +! +! static REDIRECT *redir_stack[HEREDOC_MAX]; + int need_here_doc; + +*************** +*** 308,312 **** + index is decremented after a case, select, or for command is parsed. */ + #define MAX_CASE_NEST 128 +! static int word_lineno[MAX_CASE_NEST]; + static int word_top = -1; + +--- 313,317 ---- + index is decremented after a case, select, or for command is parsed. */ + #define MAX_CASE_NEST 128 +! static int word_lineno[MAX_CASE_NEST+1]; + static int word_top = -1; + +*************** +*** 521,525 **** + redir.filename = $2; + $$ = make_redirection (source, r_reading_until, redir, 0); +! redir_stack[need_here_doc++] = $$; + } + | NUMBER LESS_LESS WORD +--- 526,530 ---- + redir.filename = $2; + $$ = make_redirection (source, r_reading_until, redir, 0); +! push_heredoc ($$); + } + | NUMBER LESS_LESS WORD +*************** +*** 528,532 **** + redir.filename = $3; + $$ = make_redirection (source, r_reading_until, redir, 0); +! redir_stack[need_here_doc++] = $$; + } + | REDIR_WORD LESS_LESS WORD +--- 533,537 ---- + redir.filename = $3; + $$ = make_redirection (source, r_reading_until, redir, 0); +! push_heredoc ($$); + } + | REDIR_WORD LESS_LESS WORD +*************** +*** 535,539 **** + redir.filename = $3; + $$ = make_redirection (source, r_reading_until, redir, REDIR_VARASSIGN); +! redir_stack[need_here_doc++] = $$; + } + | LESS_LESS_MINUS WORD +--- 540,544 ---- + redir.filename = $3; + $$ = make_redirection (source, r_reading_until, redir, REDIR_VARASSIGN); +! push_heredoc ($$); + } + | LESS_LESS_MINUS WORD +*************** +*** 542,546 **** + redir.filename = $2; + $$ = make_redirection (source, r_deblank_reading_until, redir, 0); +! redir_stack[need_here_doc++] = $$; + } + | NUMBER LESS_LESS_MINUS WORD +--- 547,551 ---- + redir.filename = $2; + $$ = make_redirection (source, r_deblank_reading_until, redir, 0); +! push_heredoc ($$); + } + | NUMBER LESS_LESS_MINUS WORD +*************** +*** 549,553 **** + redir.filename = $3; + $$ = make_redirection (source, r_deblank_reading_until, redir, 0); +! redir_stack[need_here_doc++] = $$; + } + | REDIR_WORD LESS_LESS_MINUS WORD +--- 554,558 ---- + redir.filename = $3; + $$ = make_redirection (source, r_deblank_reading_until, redir, 0); +! push_heredoc ($$); + } + | REDIR_WORD LESS_LESS_MINUS WORD +*************** +*** 556,560 **** + redir.filename = $3; + $$ = make_redirection (source, r_deblank_reading_until, redir, REDIR_VARASSIGN); +! redir_stack[need_here_doc++] = $$; + } + | LESS_LESS_LESS WORD +--- 561,565 ---- + redir.filename = $3; + $$ = make_redirection (source, r_deblank_reading_until, redir, REDIR_VARASSIGN); +! push_heredoc ($$); + } + | LESS_LESS_LESS WORD +*************** +*** 2637,2640 **** +--- 2642,2660 ---- + static int esacs_needed_count; + ++ static void ++ push_heredoc (r) ++ REDIRECT *r; ++ { ++ if (need_here_doc >= HEREDOC_MAX) ++ { ++ last_command_exit_value = EX_BADUSAGE; ++ need_here_doc = 0; ++ report_syntax_error (_("maximum here-document count exceeded")); ++ reset_parser (); ++ exit_shell (last_command_exit_value); ++ } ++ redir_stack[need_here_doc++] = r; ++ } ++ + void + gather_here_documents () +*** ../bash-4.3.27/y.tab.c 2014-09-25 23:02:35.000000000 -0400 +--- y.tab.c 2014-09-30 20:03:03.000000000 -0400 +*************** +*** 320,323 **** +--- 320,326 ---- + static int reserved_word_acceptable __P((int)); + static int yylex __P((void)); ++ ++ static void push_heredoc __P((REDIRECT *)); ++ static char *mk_alexpansion __P((char *)); + static int alias_expand_token __P((char *)); + static int time_command_acceptable __P((void)); +*************** +*** 417,421 **** + /* Variables to manage the task of reading here documents, because we need to + defer the reading until after a complete command has been collected. */ +! static REDIRECT *redir_stack[10]; + int need_here_doc; + +--- 420,426 ---- + /* Variables to manage the task of reading here documents, because we need to + defer the reading until after a complete command has been collected. */ +! #define HEREDOC_MAX 16 +! +! static REDIRECT *redir_stack[HEREDOC_MAX]; + int need_here_doc; + +*************** +*** 459,463 **** + index is decremented after a case, select, or for command is parsed. */ + #define MAX_CASE_NEST 128 +! static int word_lineno[MAX_CASE_NEST]; + static int word_top = -1; + +--- 464,468 ---- + index is decremented after a case, select, or for command is parsed. */ + #define MAX_CASE_NEST 128 +! static int word_lineno[MAX_CASE_NEST+1]; + static int word_top = -1; + +*************** +*** 493,497 **** + #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED + typedef union YYSTYPE +! #line 324 "/usr/homes/chet/src/bash/src/parse.y" + { + WORD_DESC *word; /* the word that we read. */ +--- 498,502 ---- + #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED + typedef union YYSTYPE +! #line 329 "/usr/homes/chet/src/bash/src/parse.y" + { + WORD_DESC *word; /* the word that we read. */ +*************** +*** 504,508 **** + } + /* Line 193 of yacc.c. */ +! #line 507 "y.tab.c" + YYSTYPE; + # define yystype YYSTYPE /* obsolescent; will be withdrawn */ +--- 509,513 ---- + } + /* Line 193 of yacc.c. */ +! #line 512 "y.tab.c" + YYSTYPE; + # define yystype YYSTYPE /* obsolescent; will be withdrawn */ +*************** +*** 517,521 **** + + /* Line 216 of yacc.c. */ +! #line 520 "y.tab.c" + + #ifdef short +--- 522,526 ---- + + /* Line 216 of yacc.c. */ +! #line 525 "y.tab.c" + + #ifdef short +*************** +*** 887,907 **** + static const yytype_uint16 yyrline[] = + { +! 0, 377, 377, 388, 397, 412, 422, 424, 428, 434, +! 440, 446, 452, 458, 464, 470, 476, 482, 488, 494, +! 500, 506, 512, 518, 525, 532, 539, 546, 553, 560, +! 566, 572, 578, 584, 590, 596, 602, 608, 614, 620, +! 626, 632, 638, 644, 650, 656, 662, 668, 674, 680, +! 686, 692, 700, 702, 704, 708, 712, 723, 725, 729, +! 731, 733, 749, 751, 755, 757, 759, 761, 763, 765, +! 767, 769, 771, 773, 775, 779, 784, 789, 794, 799, +! 804, 809, 814, 821, 826, 831, 836, 843, 848, 853, +! 858, 863, 868, 875, 880, 885, 892, 895, 898, 902, +! 904, 935, 942, 947, 964, 969, 986, 993, 995, 997, +! 1002, 1006, 1010, 1014, 1016, 1018, 1022, 1023, 1027, 1029, +! 1031, 1033, 1037, 1039, 1041, 1043, 1045, 1047, 1051, 1053, +! 1062, 1070, 1071, 1077, 1078, 1085, 1089, 1091, 1093, 1100, +! 1102, 1104, 1108, 1109, 1112, 1114, 1116, 1120, 1121, 1130, +! 1143, 1159, 1174, 1176, 1178, 1185, 1188, 1192, 1194, 1200, +! 1206, 1223, 1243, 1245, 1268, 1272, 1274, 1276 + }; + #endif +--- 892,912 ---- + static const yytype_uint16 yyrline[] = + { +! 0, 382, 382, 393, 402, 417, 427, 429, 433, 439, +! 445, 451, 457, 463, 469, 475, 481, 487, 493, 499, +! 505, 511, 517, 523, 530, 537, 544, 551, 558, 565, +! 571, 577, 583, 589, 595, 601, 607, 613, 619, 625, +! 631, 637, 643, 649, 655, 661, 667, 673, 679, 685, +! 691, 697, 705, 707, 709, 713, 717, 728, 730, 734, +! 736, 738, 754, 756, 760, 762, 764, 766, 768, 770, +! 772, 774, 776, 778, 780, 784, 789, 794, 799, 804, +! 809, 814, 819, 826, 831, 836, 841, 848, 853, 858, +! 863, 868, 873, 880, 885, 890, 897, 900, 903, 907, +! 909, 940, 947, 952, 969, 974, 991, 998, 1000, 1002, +! 1007, 1011, 1015, 1019, 1021, 1023, 1027, 1028, 1032, 1034, +! 1036, 1038, 1042, 1044, 1046, 1048, 1050, 1052, 1056, 1058, +! 1067, 1075, 1076, 1082, 1083, 1090, 1094, 1096, 1098, 1105, +! 1107, 1109, 1113, 1114, 1117, 1119, 1121, 1125, 1126, 1135, +! 1148, 1164, 1179, 1181, 1183, 1190, 1193, 1197, 1199, 1205, +! 1211, 1228, 1248, 1250, 1273, 1277, 1279, 1281 + }; + #endif +*************** +*** 2094,2098 **** + { + case 2: +! #line 378 "/usr/homes/chet/src/bash/src/parse.y" + { + /* Case of regular command. Discard the error +--- 2099,2103 ---- + { + case 2: +! #line 383 "/usr/homes/chet/src/bash/src/parse.y" + { + /* Case of regular command. Discard the error +*************** +*** 2108,2112 **** + + case 3: +! #line 389 "/usr/homes/chet/src/bash/src/parse.y" + { + /* Case of regular command, but not a very +--- 2113,2117 ---- + + case 3: +! #line 394 "/usr/homes/chet/src/bash/src/parse.y" + { + /* Case of regular command, but not a very +*************** +*** 2120,2124 **** + + case 4: +! #line 398 "/usr/homes/chet/src/bash/src/parse.y" + { + /* Error during parsing. Return NULL command. */ +--- 2125,2129 ---- + + case 4: +! #line 403 "/usr/homes/chet/src/bash/src/parse.y" + { + /* Error during parsing. Return NULL command. */ +*************** +*** 2138,2142 **** + + case 5: +! #line 413 "/usr/homes/chet/src/bash/src/parse.y" + { + /* Case of EOF seen by itself. Do ignoreeof or +--- 2143,2147 ---- + + case 5: +! #line 418 "/usr/homes/chet/src/bash/src/parse.y" + { + /* Case of EOF seen by itself. Do ignoreeof or +*************** +*** 2149,2163 **** + + case 6: +! #line 423 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.word_list) = make_word_list ((yyvsp[(1) - (1)].word), (WORD_LIST *)NULL); } + break; + + case 7: +! #line 425 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.word_list) = make_word_list ((yyvsp[(2) - (2)].word), (yyvsp[(1) - (2)].word_list)); } + break; + + case 8: +! #line 429 "/usr/homes/chet/src/bash/src/parse.y" + { + source.dest = 1; +--- 2154,2168 ---- + + case 6: +! #line 428 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.word_list) = make_word_list ((yyvsp[(1) - (1)].word), (WORD_LIST *)NULL); } + break; + + case 7: +! #line 430 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.word_list) = make_word_list ((yyvsp[(2) - (2)].word), (yyvsp[(1) - (2)].word_list)); } + break; + + case 8: +! #line 434 "/usr/homes/chet/src/bash/src/parse.y" + { + source.dest = 1; +*************** +*** 2168,2172 **** + + case 9: +! #line 435 "/usr/homes/chet/src/bash/src/parse.y" + { + source.dest = 0; +--- 2173,2177 ---- + + case 9: +! #line 440 "/usr/homes/chet/src/bash/src/parse.y" + { + source.dest = 0; +*************** +*** 2177,2181 **** + + case 10: +! #line 441 "/usr/homes/chet/src/bash/src/parse.y" + { + source.dest = (yyvsp[(1) - (3)].number); +--- 2182,2186 ---- + + case 10: +! #line 446 "/usr/homes/chet/src/bash/src/parse.y" + { + source.dest = (yyvsp[(1) - (3)].number); +*************** +*** 2186,2190 **** + + case 11: +! #line 447 "/usr/homes/chet/src/bash/src/parse.y" + { + source.dest = (yyvsp[(1) - (3)].number); +--- 2191,2195 ---- + + case 11: +! #line 452 "/usr/homes/chet/src/bash/src/parse.y" + { + source.dest = (yyvsp[(1) - (3)].number); +*************** +*** 2195,2199 **** + + case 12: +! #line 453 "/usr/homes/chet/src/bash/src/parse.y" + { + source.filename = (yyvsp[(1) - (3)].word); +--- 2200,2204 ---- + + case 12: +! #line 458 "/usr/homes/chet/src/bash/src/parse.y" + { + source.filename = (yyvsp[(1) - (3)].word); +*************** +*** 2204,2208 **** + + case 13: +! #line 459 "/usr/homes/chet/src/bash/src/parse.y" + { + source.filename = (yyvsp[(1) - (3)].word); +--- 2209,2213 ---- + + case 13: +! #line 464 "/usr/homes/chet/src/bash/src/parse.y" + { + source.filename = (yyvsp[(1) - (3)].word); +*************** +*** 2213,2217 **** + + case 14: +! #line 465 "/usr/homes/chet/src/bash/src/parse.y" + { + source.dest = 1; +--- 2218,2222 ---- + + case 14: +! #line 470 "/usr/homes/chet/src/bash/src/parse.y" + { + source.dest = 1; +*************** +*** 2222,2226 **** + + case 15: +! #line 471 "/usr/homes/chet/src/bash/src/parse.y" + { + source.dest = (yyvsp[(1) - (3)].number); +--- 2227,2231 ---- + + case 15: +! #line 476 "/usr/homes/chet/src/bash/src/parse.y" + { + source.dest = (yyvsp[(1) - (3)].number); +*************** +*** 2231,2235 **** + + case 16: +! #line 477 "/usr/homes/chet/src/bash/src/parse.y" + { + source.filename = (yyvsp[(1) - (3)].word); +--- 2236,2240 ---- + + case 16: +! #line 482 "/usr/homes/chet/src/bash/src/parse.y" + { + source.filename = (yyvsp[(1) - (3)].word); +*************** +*** 2240,2244 **** + + case 17: +! #line 483 "/usr/homes/chet/src/bash/src/parse.y" + { + source.dest = 1; +--- 2245,2249 ---- + + case 17: +! #line 488 "/usr/homes/chet/src/bash/src/parse.y" + { + source.dest = 1; +*************** +*** 2249,2253 **** + + case 18: +! #line 489 "/usr/homes/chet/src/bash/src/parse.y" + { + source.dest = (yyvsp[(1) - (3)].number); +--- 2254,2258 ---- + + case 18: +! #line 494 "/usr/homes/chet/src/bash/src/parse.y" + { + source.dest = (yyvsp[(1) - (3)].number); +*************** +*** 2258,2262 **** + + case 19: +! #line 495 "/usr/homes/chet/src/bash/src/parse.y" + { + source.filename = (yyvsp[(1) - (3)].word); +--- 2263,2267 ---- + + case 19: +! #line 500 "/usr/homes/chet/src/bash/src/parse.y" + { + source.filename = (yyvsp[(1) - (3)].word); +*************** +*** 2267,2271 **** + + case 20: +! #line 501 "/usr/homes/chet/src/bash/src/parse.y" + { + source.dest = 0; +--- 2272,2276 ---- + + case 20: +! #line 506 "/usr/homes/chet/src/bash/src/parse.y" + { + source.dest = 0; +*************** +*** 2276,2280 **** + + case 21: +! #line 507 "/usr/homes/chet/src/bash/src/parse.y" + { + source.dest = (yyvsp[(1) - (3)].number); +--- 2281,2285 ---- + + case 21: +! #line 512 "/usr/homes/chet/src/bash/src/parse.y" + { + source.dest = (yyvsp[(1) - (3)].number); +*************** +*** 2285,2289 **** + + case 22: +! #line 513 "/usr/homes/chet/src/bash/src/parse.y" + { + source.filename = (yyvsp[(1) - (3)].word); +--- 2290,2294 ---- + + case 22: +! #line 518 "/usr/homes/chet/src/bash/src/parse.y" + { + source.filename = (yyvsp[(1) - (3)].word); +*************** +*** 2294,2358 **** + + case 23: +! #line 519 "/usr/homes/chet/src/bash/src/parse.y" + { + source.dest = 0; + redir.filename = (yyvsp[(2) - (2)].word); + (yyval.redirect) = make_redirection (source, r_reading_until, redir, 0); +! redir_stack[need_here_doc++] = (yyval.redirect); + } + break; + + case 24: +! #line 526 "/usr/homes/chet/src/bash/src/parse.y" + { + source.dest = (yyvsp[(1) - (3)].number); + redir.filename = (yyvsp[(3) - (3)].word); + (yyval.redirect) = make_redirection (source, r_reading_until, redir, 0); +! redir_stack[need_here_doc++] = (yyval.redirect); + } + break; + + case 25: +! #line 533 "/usr/homes/chet/src/bash/src/parse.y" + { + source.filename = (yyvsp[(1) - (3)].word); + redir.filename = (yyvsp[(3) - (3)].word); + (yyval.redirect) = make_redirection (source, r_reading_until, redir, REDIR_VARASSIGN); +! redir_stack[need_here_doc++] = (yyval.redirect); + } + break; + + case 26: +! #line 540 "/usr/homes/chet/src/bash/src/parse.y" + { + source.dest = 0; + redir.filename = (yyvsp[(2) - (2)].word); + (yyval.redirect) = make_redirection (source, r_deblank_reading_until, redir, 0); +! redir_stack[need_here_doc++] = (yyval.redirect); + } + break; + + case 27: +! #line 547 "/usr/homes/chet/src/bash/src/parse.y" + { + source.dest = (yyvsp[(1) - (3)].number); + redir.filename = (yyvsp[(3) - (3)].word); + (yyval.redirect) = make_redirection (source, r_deblank_reading_until, redir, 0); +! redir_stack[need_here_doc++] = (yyval.redirect); + } + break; + + case 28: +! #line 554 "/usr/homes/chet/src/bash/src/parse.y" + { + source.filename = (yyvsp[(1) - (3)].word); + redir.filename = (yyvsp[(3) - (3)].word); + (yyval.redirect) = make_redirection (source, r_deblank_reading_until, redir, REDIR_VARASSIGN); +! redir_stack[need_here_doc++] = (yyval.redirect); + } + break; + + case 29: +! #line 561 "/usr/homes/chet/src/bash/src/parse.y" + { + source.dest = 0; +--- 2299,2363 ---- + + case 23: +! #line 524 "/usr/homes/chet/src/bash/src/parse.y" + { + source.dest = 0; + redir.filename = (yyvsp[(2) - (2)].word); + (yyval.redirect) = make_redirection (source, r_reading_until, redir, 0); +! push_heredoc ((yyval.redirect)); + } + break; + + case 24: +! #line 531 "/usr/homes/chet/src/bash/src/parse.y" + { + source.dest = (yyvsp[(1) - (3)].number); + redir.filename = (yyvsp[(3) - (3)].word); + (yyval.redirect) = make_redirection (source, r_reading_until, redir, 0); +! push_heredoc ((yyval.redirect)); + } + break; + + case 25: +! #line 538 "/usr/homes/chet/src/bash/src/parse.y" + { + source.filename = (yyvsp[(1) - (3)].word); + redir.filename = (yyvsp[(3) - (3)].word); + (yyval.redirect) = make_redirection (source, r_reading_until, redir, REDIR_VARASSIGN); +! push_heredoc ((yyval.redirect)); + } + break; + + case 26: +! #line 545 "/usr/homes/chet/src/bash/src/parse.y" + { + source.dest = 0; + redir.filename = (yyvsp[(2) - (2)].word); + (yyval.redirect) = make_redirection (source, r_deblank_reading_until, redir, 0); +! push_heredoc ((yyval.redirect)); + } + break; + + case 27: +! #line 552 "/usr/homes/chet/src/bash/src/parse.y" + { + source.dest = (yyvsp[(1) - (3)].number); + redir.filename = (yyvsp[(3) - (3)].word); + (yyval.redirect) = make_redirection (source, r_deblank_reading_until, redir, 0); +! push_heredoc ((yyval.redirect)); + } + break; + + case 28: +! #line 559 "/usr/homes/chet/src/bash/src/parse.y" + { + source.filename = (yyvsp[(1) - (3)].word); + redir.filename = (yyvsp[(3) - (3)].word); + (yyval.redirect) = make_redirection (source, r_deblank_reading_until, redir, REDIR_VARASSIGN); +! push_heredoc ((yyval.redirect)); + } + break; + + case 29: +! #line 566 "/usr/homes/chet/src/bash/src/parse.y" + { + source.dest = 0; +*************** +*** 2363,2367 **** + + case 30: +! #line 567 "/usr/homes/chet/src/bash/src/parse.y" + { + source.dest = (yyvsp[(1) - (3)].number); +--- 2368,2372 ---- + + case 30: +! #line 572 "/usr/homes/chet/src/bash/src/parse.y" + { + source.dest = (yyvsp[(1) - (3)].number); +*************** +*** 2372,2376 **** + + case 31: +! #line 573 "/usr/homes/chet/src/bash/src/parse.y" + { + source.filename = (yyvsp[(1) - (3)].word); +--- 2377,2381 ---- + + case 31: +! #line 578 "/usr/homes/chet/src/bash/src/parse.y" + { + source.filename = (yyvsp[(1) - (3)].word); +*************** +*** 2381,2385 **** + + case 32: +! #line 579 "/usr/homes/chet/src/bash/src/parse.y" + { + source.dest = 0; +--- 2386,2390 ---- + + case 32: +! #line 584 "/usr/homes/chet/src/bash/src/parse.y" + { + source.dest = 0; +*************** +*** 2390,2394 **** + + case 33: +! #line 585 "/usr/homes/chet/src/bash/src/parse.y" + { + source.dest = (yyvsp[(1) - (3)].number); +--- 2395,2399 ---- + + case 33: +! #line 590 "/usr/homes/chet/src/bash/src/parse.y" + { + source.dest = (yyvsp[(1) - (3)].number); +*************** +*** 2399,2403 **** + + case 34: +! #line 591 "/usr/homes/chet/src/bash/src/parse.y" + { + source.filename = (yyvsp[(1) - (3)].word); +--- 2404,2408 ---- + + case 34: +! #line 596 "/usr/homes/chet/src/bash/src/parse.y" + { + source.filename = (yyvsp[(1) - (3)].word); +*************** +*** 2408,2412 **** + + case 35: +! #line 597 "/usr/homes/chet/src/bash/src/parse.y" + { + source.dest = 1; +--- 2413,2417 ---- + + case 35: +! #line 602 "/usr/homes/chet/src/bash/src/parse.y" + { + source.dest = 1; +*************** +*** 2417,2421 **** + + case 36: +! #line 603 "/usr/homes/chet/src/bash/src/parse.y" + { + source.dest = (yyvsp[(1) - (3)].number); +--- 2422,2426 ---- + + case 36: +! #line 608 "/usr/homes/chet/src/bash/src/parse.y" + { + source.dest = (yyvsp[(1) - (3)].number); +*************** +*** 2426,2430 **** + + case 37: +! #line 609 "/usr/homes/chet/src/bash/src/parse.y" + { + source.filename = (yyvsp[(1) - (3)].word); +--- 2431,2435 ---- + + case 37: +! #line 614 "/usr/homes/chet/src/bash/src/parse.y" + { + source.filename = (yyvsp[(1) - (3)].word); +*************** +*** 2435,2439 **** + + case 38: +! #line 615 "/usr/homes/chet/src/bash/src/parse.y" + { + source.dest = 0; +--- 2440,2444 ---- + + case 38: +! #line 620 "/usr/homes/chet/src/bash/src/parse.y" + { + source.dest = 0; +*************** +*** 2444,2448 **** + + case 39: +! #line 621 "/usr/homes/chet/src/bash/src/parse.y" + { + source.dest = (yyvsp[(1) - (3)].number); +--- 2449,2453 ---- + + case 39: +! #line 626 "/usr/homes/chet/src/bash/src/parse.y" + { + source.dest = (yyvsp[(1) - (3)].number); +*************** +*** 2453,2457 **** + + case 40: +! #line 627 "/usr/homes/chet/src/bash/src/parse.y" + { + source.filename = (yyvsp[(1) - (3)].word); +--- 2458,2462 ---- + + case 40: +! #line 632 "/usr/homes/chet/src/bash/src/parse.y" + { + source.filename = (yyvsp[(1) - (3)].word); +*************** +*** 2462,2466 **** + + case 41: +! #line 633 "/usr/homes/chet/src/bash/src/parse.y" + { + source.dest = 1; +--- 2467,2471 ---- + + case 41: +! #line 638 "/usr/homes/chet/src/bash/src/parse.y" + { + source.dest = 1; +*************** +*** 2471,2475 **** + + case 42: +! #line 639 "/usr/homes/chet/src/bash/src/parse.y" + { + source.dest = (yyvsp[(1) - (3)].number); +--- 2476,2480 ---- + + case 42: +! #line 644 "/usr/homes/chet/src/bash/src/parse.y" + { + source.dest = (yyvsp[(1) - (3)].number); +*************** +*** 2480,2484 **** + + case 43: +! #line 645 "/usr/homes/chet/src/bash/src/parse.y" + { + source.filename = (yyvsp[(1) - (3)].word); +--- 2485,2489 ---- + + case 43: +! #line 650 "/usr/homes/chet/src/bash/src/parse.y" + { + source.filename = (yyvsp[(1) - (3)].word); +*************** +*** 2489,2493 **** + + case 44: +! #line 651 "/usr/homes/chet/src/bash/src/parse.y" + { + source.dest = 1; +--- 2494,2498 ---- + + case 44: +! #line 656 "/usr/homes/chet/src/bash/src/parse.y" + { + source.dest = 1; +*************** +*** 2498,2502 **** + + case 45: +! #line 657 "/usr/homes/chet/src/bash/src/parse.y" + { + source.dest = (yyvsp[(1) - (3)].number); +--- 2503,2507 ---- + + case 45: +! #line 662 "/usr/homes/chet/src/bash/src/parse.y" + { + source.dest = (yyvsp[(1) - (3)].number); +*************** +*** 2507,2511 **** + + case 46: +! #line 663 "/usr/homes/chet/src/bash/src/parse.y" + { + source.filename = (yyvsp[(1) - (3)].word); +--- 2512,2516 ---- + + case 46: +! #line 668 "/usr/homes/chet/src/bash/src/parse.y" + { + source.filename = (yyvsp[(1) - (3)].word); +*************** +*** 2516,2520 **** + + case 47: +! #line 669 "/usr/homes/chet/src/bash/src/parse.y" + { + source.dest = 0; +--- 2521,2525 ---- + + case 47: +! #line 674 "/usr/homes/chet/src/bash/src/parse.y" + { + source.dest = 0; +*************** +*** 2525,2529 **** + + case 48: +! #line 675 "/usr/homes/chet/src/bash/src/parse.y" + { + source.dest = (yyvsp[(1) - (3)].number); +--- 2530,2534 ---- + + case 48: +! #line 680 "/usr/homes/chet/src/bash/src/parse.y" + { + source.dest = (yyvsp[(1) - (3)].number); +*************** +*** 2534,2538 **** + + case 49: +! #line 681 "/usr/homes/chet/src/bash/src/parse.y" + { + source.filename = (yyvsp[(1) - (3)].word); +--- 2539,2543 ---- + + case 49: +! #line 686 "/usr/homes/chet/src/bash/src/parse.y" + { + source.filename = (yyvsp[(1) - (3)].word); +*************** +*** 2543,2547 **** + + case 50: +! #line 687 "/usr/homes/chet/src/bash/src/parse.y" + { + source.dest = 1; +--- 2548,2552 ---- + + case 50: +! #line 692 "/usr/homes/chet/src/bash/src/parse.y" + { + source.dest = 1; +*************** +*** 2552,2556 **** + + case 51: +! #line 693 "/usr/homes/chet/src/bash/src/parse.y" + { + source.dest = 1; +--- 2557,2561 ---- + + case 51: +! #line 698 "/usr/homes/chet/src/bash/src/parse.y" + { + source.dest = 1; +*************** +*** 2561,2580 **** + + case 52: +! #line 701 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.element).word = (yyvsp[(1) - (1)].word); (yyval.element).redirect = 0; } + break; + + case 53: +! #line 703 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.element).word = (yyvsp[(1) - (1)].word); (yyval.element).redirect = 0; } + break; + + case 54: +! #line 705 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.element).redirect = (yyvsp[(1) - (1)].redirect); (yyval.element).word = 0; } + break; + + case 55: +! #line 709 "/usr/homes/chet/src/bash/src/parse.y" + { + (yyval.redirect) = (yyvsp[(1) - (1)].redirect); +--- 2566,2585 ---- + + case 52: +! #line 706 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.element).word = (yyvsp[(1) - (1)].word); (yyval.element).redirect = 0; } + break; + + case 53: +! #line 708 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.element).word = (yyvsp[(1) - (1)].word); (yyval.element).redirect = 0; } + break; + + case 54: +! #line 710 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.element).redirect = (yyvsp[(1) - (1)].redirect); (yyval.element).word = 0; } + break; + + case 55: +! #line 714 "/usr/homes/chet/src/bash/src/parse.y" + { + (yyval.redirect) = (yyvsp[(1) - (1)].redirect); +*************** +*** 2583,2587 **** + + case 56: +! #line 713 "/usr/homes/chet/src/bash/src/parse.y" + { + register REDIRECT *t; +--- 2588,2592 ---- + + case 56: +! #line 718 "/usr/homes/chet/src/bash/src/parse.y" + { + register REDIRECT *t; +*************** +*** 2595,2619 **** + + case 57: +! #line 724 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.command) = make_simple_command ((yyvsp[(1) - (1)].element), (COMMAND *)NULL); } + break; + + case 58: +! #line 726 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.command) = make_simple_command ((yyvsp[(2) - (2)].element), (yyvsp[(1) - (2)].command)); } + break; + + case 59: +! #line 730 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.command) = clean_simple_command ((yyvsp[(1) - (1)].command)); } + break; + + case 60: +! #line 732 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.command) = (yyvsp[(1) - (1)].command); } + break; + + case 61: +! #line 734 "/usr/homes/chet/src/bash/src/parse.y" + { + COMMAND *tc; +--- 2600,2624 ---- + + case 57: +! #line 729 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.command) = make_simple_command ((yyvsp[(1) - (1)].element), (COMMAND *)NULL); } + break; + + case 58: +! #line 731 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.command) = make_simple_command ((yyvsp[(2) - (2)].element), (yyvsp[(1) - (2)].command)); } + break; + + case 59: +! #line 735 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.command) = clean_simple_command ((yyvsp[(1) - (1)].command)); } + break; + + case 60: +! #line 737 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.command) = (yyvsp[(1) - (1)].command); } + break; + + case 61: +! #line 739 "/usr/homes/chet/src/bash/src/parse.y" + { + COMMAND *tc; +*************** +*** 2634,2703 **** + + case 62: +! #line 750 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.command) = (yyvsp[(1) - (1)].command); } + break; + + case 63: +! #line 752 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.command) = (yyvsp[(1) - (1)].command); } + break; + + case 64: +! #line 756 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.command) = (yyvsp[(1) - (1)].command); } + break; + + case 65: +! #line 758 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.command) = (yyvsp[(1) - (1)].command); } + break; + + case 66: +! #line 760 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.command) = make_while_command ((yyvsp[(2) - (5)].command), (yyvsp[(4) - (5)].command)); } + break; + + case 67: +! #line 762 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.command) = make_until_command ((yyvsp[(2) - (5)].command), (yyvsp[(4) - (5)].command)); } + break; + + case 68: +! #line 764 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.command) = (yyvsp[(1) - (1)].command); } + break; + + case 69: +! #line 766 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.command) = (yyvsp[(1) - (1)].command); } + break; + + case 70: +! #line 768 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.command) = (yyvsp[(1) - (1)].command); } + break; + + case 71: +! #line 770 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.command) = (yyvsp[(1) - (1)].command); } + break; + + case 72: +! #line 772 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.command) = (yyvsp[(1) - (1)].command); } + break; + + case 73: +! #line 774 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.command) = (yyvsp[(1) - (1)].command); } + break; + + case 74: +! #line 776 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.command) = (yyvsp[(1) - (1)].command); } + break; + + case 75: +! #line 780 "/usr/homes/chet/src/bash/src/parse.y" + { + (yyval.command) = make_for_command ((yyvsp[(2) - (6)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(5) - (6)].command), word_lineno[word_top]); +--- 2639,2708 ---- + + case 62: +! #line 755 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.command) = (yyvsp[(1) - (1)].command); } + break; + + case 63: +! #line 757 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.command) = (yyvsp[(1) - (1)].command); } + break; + + case 64: +! #line 761 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.command) = (yyvsp[(1) - (1)].command); } + break; + + case 65: +! #line 763 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.command) = (yyvsp[(1) - (1)].command); } + break; + + case 66: +! #line 765 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.command) = make_while_command ((yyvsp[(2) - (5)].command), (yyvsp[(4) - (5)].command)); } + break; + + case 67: +! #line 767 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.command) = make_until_command ((yyvsp[(2) - (5)].command), (yyvsp[(4) - (5)].command)); } + break; + + case 68: +! #line 769 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.command) = (yyvsp[(1) - (1)].command); } + break; + + case 69: +! #line 771 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.command) = (yyvsp[(1) - (1)].command); } + break; + + case 70: +! #line 773 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.command) = (yyvsp[(1) - (1)].command); } + break; + + case 71: +! #line 775 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.command) = (yyvsp[(1) - (1)].command); } + break; + + case 72: +! #line 777 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.command) = (yyvsp[(1) - (1)].command); } + break; + + case 73: +! #line 779 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.command) = (yyvsp[(1) - (1)].command); } + break; + + case 74: +! #line 781 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.command) = (yyvsp[(1) - (1)].command); } + break; + + case 75: +! #line 785 "/usr/homes/chet/src/bash/src/parse.y" + { + (yyval.command) = make_for_command ((yyvsp[(2) - (6)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(5) - (6)].command), word_lineno[word_top]); +*************** +*** 2707,2711 **** + + case 76: +! #line 785 "/usr/homes/chet/src/bash/src/parse.y" + { + (yyval.command) = make_for_command ((yyvsp[(2) - (6)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(5) - (6)].command), word_lineno[word_top]); +--- 2712,2716 ---- + + case 76: +! #line 790 "/usr/homes/chet/src/bash/src/parse.y" + { + (yyval.command) = make_for_command ((yyvsp[(2) - (6)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(5) - (6)].command), word_lineno[word_top]); +*************** +*** 2715,2719 **** + + case 77: +! #line 790 "/usr/homes/chet/src/bash/src/parse.y" + { + (yyval.command) = make_for_command ((yyvsp[(2) - (7)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(6) - (7)].command), word_lineno[word_top]); +--- 2720,2724 ---- + + case 77: +! #line 795 "/usr/homes/chet/src/bash/src/parse.y" + { + (yyval.command) = make_for_command ((yyvsp[(2) - (7)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(6) - (7)].command), word_lineno[word_top]); +*************** +*** 2723,2727 **** + + case 78: +! #line 795 "/usr/homes/chet/src/bash/src/parse.y" + { + (yyval.command) = make_for_command ((yyvsp[(2) - (7)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(6) - (7)].command), word_lineno[word_top]); +--- 2728,2732 ---- + + case 78: +! #line 800 "/usr/homes/chet/src/bash/src/parse.y" + { + (yyval.command) = make_for_command ((yyvsp[(2) - (7)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(6) - (7)].command), word_lineno[word_top]); +*************** +*** 2731,2735 **** + + case 79: +! #line 800 "/usr/homes/chet/src/bash/src/parse.y" + { + (yyval.command) = make_for_command ((yyvsp[(2) - (10)].word), REVERSE_LIST ((yyvsp[(5) - (10)].word_list), WORD_LIST *), (yyvsp[(9) - (10)].command), word_lineno[word_top]); +--- 2736,2740 ---- + + case 79: +! #line 805 "/usr/homes/chet/src/bash/src/parse.y" + { + (yyval.command) = make_for_command ((yyvsp[(2) - (10)].word), REVERSE_LIST ((yyvsp[(5) - (10)].word_list), WORD_LIST *), (yyvsp[(9) - (10)].command), word_lineno[word_top]); +*************** +*** 2739,2743 **** + + case 80: +! #line 805 "/usr/homes/chet/src/bash/src/parse.y" + { + (yyval.command) = make_for_command ((yyvsp[(2) - (10)].word), REVERSE_LIST ((yyvsp[(5) - (10)].word_list), WORD_LIST *), (yyvsp[(9) - (10)].command), word_lineno[word_top]); +--- 2744,2748 ---- + + case 80: +! #line 810 "/usr/homes/chet/src/bash/src/parse.y" + { + (yyval.command) = make_for_command ((yyvsp[(2) - (10)].word), REVERSE_LIST ((yyvsp[(5) - (10)].word_list), WORD_LIST *), (yyvsp[(9) - (10)].command), word_lineno[word_top]); +*************** +*** 2747,2751 **** + + case 81: +! #line 810 "/usr/homes/chet/src/bash/src/parse.y" + { + (yyval.command) = make_for_command ((yyvsp[(2) - (9)].word), (WORD_LIST *)NULL, (yyvsp[(8) - (9)].command), word_lineno[word_top]); +--- 2752,2756 ---- + + case 81: +! #line 815 "/usr/homes/chet/src/bash/src/parse.y" + { + (yyval.command) = make_for_command ((yyvsp[(2) - (9)].word), (WORD_LIST *)NULL, (yyvsp[(8) - (9)].command), word_lineno[word_top]); +*************** +*** 2755,2759 **** + + case 82: +! #line 815 "/usr/homes/chet/src/bash/src/parse.y" + { + (yyval.command) = make_for_command ((yyvsp[(2) - (9)].word), (WORD_LIST *)NULL, (yyvsp[(8) - (9)].command), word_lineno[word_top]); +--- 2760,2764 ---- + + case 82: +! #line 820 "/usr/homes/chet/src/bash/src/parse.y" + { + (yyval.command) = make_for_command ((yyvsp[(2) - (9)].word), (WORD_LIST *)NULL, (yyvsp[(8) - (9)].command), word_lineno[word_top]); +*************** +*** 2763,2767 **** + + case 83: +! #line 822 "/usr/homes/chet/src/bash/src/parse.y" + { + (yyval.command) = make_arith_for_command ((yyvsp[(2) - (7)].word_list), (yyvsp[(6) - (7)].command), arith_for_lineno); +--- 2768,2772 ---- + + case 83: +! #line 827 "/usr/homes/chet/src/bash/src/parse.y" + { + (yyval.command) = make_arith_for_command ((yyvsp[(2) - (7)].word_list), (yyvsp[(6) - (7)].command), arith_for_lineno); +*************** +*** 2771,2775 **** + + case 84: +! #line 827 "/usr/homes/chet/src/bash/src/parse.y" + { + (yyval.command) = make_arith_for_command ((yyvsp[(2) - (7)].word_list), (yyvsp[(6) - (7)].command), arith_for_lineno); +--- 2776,2780 ---- + + case 84: +! #line 832 "/usr/homes/chet/src/bash/src/parse.y" + { + (yyval.command) = make_arith_for_command ((yyvsp[(2) - (7)].word_list), (yyvsp[(6) - (7)].command), arith_for_lineno); +*************** +*** 2779,2783 **** + + case 85: +! #line 832 "/usr/homes/chet/src/bash/src/parse.y" + { + (yyval.command) = make_arith_for_command ((yyvsp[(2) - (5)].word_list), (yyvsp[(4) - (5)].command), arith_for_lineno); +--- 2784,2788 ---- + + case 85: +! #line 837 "/usr/homes/chet/src/bash/src/parse.y" + { + (yyval.command) = make_arith_for_command ((yyvsp[(2) - (5)].word_list), (yyvsp[(4) - (5)].command), arith_for_lineno); +*************** +*** 2787,2791 **** + + case 86: +! #line 837 "/usr/homes/chet/src/bash/src/parse.y" + { + (yyval.command) = make_arith_for_command ((yyvsp[(2) - (5)].word_list), (yyvsp[(4) - (5)].command), arith_for_lineno); +--- 2792,2796 ---- + + case 86: +! #line 842 "/usr/homes/chet/src/bash/src/parse.y" + { + (yyval.command) = make_arith_for_command ((yyvsp[(2) - (5)].word_list), (yyvsp[(4) - (5)].command), arith_for_lineno); +*************** +*** 2795,2799 **** + + case 87: +! #line 844 "/usr/homes/chet/src/bash/src/parse.y" + { + (yyval.command) = make_select_command ((yyvsp[(2) - (6)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(5) - (6)].command), word_lineno[word_top]); +--- 2800,2804 ---- + + case 87: +! #line 849 "/usr/homes/chet/src/bash/src/parse.y" + { + (yyval.command) = make_select_command ((yyvsp[(2) - (6)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(5) - (6)].command), word_lineno[word_top]); +*************** +*** 2803,2807 **** + + case 88: +! #line 849 "/usr/homes/chet/src/bash/src/parse.y" + { + (yyval.command) = make_select_command ((yyvsp[(2) - (6)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(5) - (6)].command), word_lineno[word_top]); +--- 2808,2812 ---- + + case 88: +! #line 854 "/usr/homes/chet/src/bash/src/parse.y" + { + (yyval.command) = make_select_command ((yyvsp[(2) - (6)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(5) - (6)].command), word_lineno[word_top]); +*************** +*** 2811,2815 **** + + case 89: +! #line 854 "/usr/homes/chet/src/bash/src/parse.y" + { + (yyval.command) = make_select_command ((yyvsp[(2) - (7)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(6) - (7)].command), word_lineno[word_top]); +--- 2816,2820 ---- + + case 89: +! #line 859 "/usr/homes/chet/src/bash/src/parse.y" + { + (yyval.command) = make_select_command ((yyvsp[(2) - (7)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(6) - (7)].command), word_lineno[word_top]); +*************** +*** 2819,2823 **** + + case 90: +! #line 859 "/usr/homes/chet/src/bash/src/parse.y" + { + (yyval.command) = make_select_command ((yyvsp[(2) - (7)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(6) - (7)].command), word_lineno[word_top]); +--- 2824,2828 ---- + + case 90: +! #line 864 "/usr/homes/chet/src/bash/src/parse.y" + { + (yyval.command) = make_select_command ((yyvsp[(2) - (7)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(6) - (7)].command), word_lineno[word_top]); +*************** +*** 2827,2831 **** + + case 91: +! #line 864 "/usr/homes/chet/src/bash/src/parse.y" + { + (yyval.command) = make_select_command ((yyvsp[(2) - (10)].word), REVERSE_LIST ((yyvsp[(5) - (10)].word_list), WORD_LIST *), (yyvsp[(9) - (10)].command), word_lineno[word_top]); +--- 2832,2836 ---- + + case 91: +! #line 869 "/usr/homes/chet/src/bash/src/parse.y" + { + (yyval.command) = make_select_command ((yyvsp[(2) - (10)].word), REVERSE_LIST ((yyvsp[(5) - (10)].word_list), WORD_LIST *), (yyvsp[(9) - (10)].command), word_lineno[word_top]); +*************** +*** 2835,2839 **** + + case 92: +! #line 869 "/usr/homes/chet/src/bash/src/parse.y" + { + (yyval.command) = make_select_command ((yyvsp[(2) - (10)].word), REVERSE_LIST ((yyvsp[(5) - (10)].word_list), WORD_LIST *), (yyvsp[(9) - (10)].command), word_lineno[word_top]); +--- 2840,2844 ---- + + case 92: +! #line 874 "/usr/homes/chet/src/bash/src/parse.y" + { + (yyval.command) = make_select_command ((yyvsp[(2) - (10)].word), REVERSE_LIST ((yyvsp[(5) - (10)].word_list), WORD_LIST *), (yyvsp[(9) - (10)].command), word_lineno[word_top]); +*************** +*** 2843,2847 **** + + case 93: +! #line 876 "/usr/homes/chet/src/bash/src/parse.y" + { + (yyval.command) = make_case_command ((yyvsp[(2) - (6)].word), (PATTERN_LIST *)NULL, word_lineno[word_top]); +--- 2848,2852 ---- + + case 93: +! #line 881 "/usr/homes/chet/src/bash/src/parse.y" + { + (yyval.command) = make_case_command ((yyvsp[(2) - (6)].word), (PATTERN_LIST *)NULL, word_lineno[word_top]); +*************** +*** 2851,2855 **** + + case 94: +! #line 881 "/usr/homes/chet/src/bash/src/parse.y" + { + (yyval.command) = make_case_command ((yyvsp[(2) - (7)].word), (yyvsp[(5) - (7)].pattern), word_lineno[word_top]); +--- 2856,2860 ---- + + case 94: +! #line 886 "/usr/homes/chet/src/bash/src/parse.y" + { + (yyval.command) = make_case_command ((yyvsp[(2) - (7)].word), (yyvsp[(5) - (7)].pattern), word_lineno[word_top]); +*************** +*** 2859,2863 **** + + case 95: +! #line 886 "/usr/homes/chet/src/bash/src/parse.y" + { + (yyval.command) = make_case_command ((yyvsp[(2) - (6)].word), (yyvsp[(5) - (6)].pattern), word_lineno[word_top]); +--- 2864,2868 ---- + + case 95: +! #line 891 "/usr/homes/chet/src/bash/src/parse.y" + { + (yyval.command) = make_case_command ((yyvsp[(2) - (6)].word), (yyvsp[(5) - (6)].pattern), word_lineno[word_top]); +*************** +*** 2867,2891 **** + + case 96: +! #line 893 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.command) = make_function_def ((yyvsp[(1) - (5)].word), (yyvsp[(5) - (5)].command), function_dstart, function_bstart); } + break; + + case 97: +! #line 896 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.command) = make_function_def ((yyvsp[(2) - (6)].word), (yyvsp[(6) - (6)].command), function_dstart, function_bstart); } + break; + + case 98: +! #line 899 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.command) = make_function_def ((yyvsp[(2) - (4)].word), (yyvsp[(4) - (4)].command), function_dstart, function_bstart); } + break; + + case 99: +! #line 903 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.command) = (yyvsp[(1) - (1)].command); } + break; + + case 100: +! #line 905 "/usr/homes/chet/src/bash/src/parse.y" + { + COMMAND *tc; +--- 2872,2896 ---- + + case 96: +! #line 898 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.command) = make_function_def ((yyvsp[(1) - (5)].word), (yyvsp[(5) - (5)].command), function_dstart, function_bstart); } + break; + + case 97: +! #line 901 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.command) = make_function_def ((yyvsp[(2) - (6)].word), (yyvsp[(6) - (6)].command), function_dstart, function_bstart); } + break; + + case 98: +! #line 904 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.command) = make_function_def ((yyvsp[(2) - (4)].word), (yyvsp[(4) - (4)].command), function_dstart, function_bstart); } + break; + + case 99: +! #line 908 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.command) = (yyvsp[(1) - (1)].command); } + break; + + case 100: +! #line 910 "/usr/homes/chet/src/bash/src/parse.y" + { + COMMAND *tc; +*************** +*** 2919,2923 **** + + case 101: +! #line 936 "/usr/homes/chet/src/bash/src/parse.y" + { + (yyval.command) = make_subshell_command ((yyvsp[(2) - (3)].command)); +--- 2924,2928 ---- + + case 101: +! #line 941 "/usr/homes/chet/src/bash/src/parse.y" + { + (yyval.command) = make_subshell_command ((yyvsp[(2) - (3)].command)); +*************** +*** 2927,2931 **** + + case 102: +! #line 943 "/usr/homes/chet/src/bash/src/parse.y" + { + (yyval.command) = make_coproc_command ("COPROC", (yyvsp[(2) - (2)].command)); +--- 2932,2936 ---- + + case 102: +! #line 948 "/usr/homes/chet/src/bash/src/parse.y" + { + (yyval.command) = make_coproc_command ("COPROC", (yyvsp[(2) - (2)].command)); +*************** +*** 2935,2939 **** + + case 103: +! #line 948 "/usr/homes/chet/src/bash/src/parse.y" + { + COMMAND *tc; +--- 2940,2944 ---- + + case 103: +! #line 953 "/usr/homes/chet/src/bash/src/parse.y" + { + COMMAND *tc; +*************** +*** 2955,2959 **** + + case 104: +! #line 965 "/usr/homes/chet/src/bash/src/parse.y" + { + (yyval.command) = make_coproc_command ((yyvsp[(2) - (3)].word)->word, (yyvsp[(3) - (3)].command)); +--- 2960,2964 ---- + + case 104: +! #line 970 "/usr/homes/chet/src/bash/src/parse.y" + { + (yyval.command) = make_coproc_command ((yyvsp[(2) - (3)].word)->word, (yyvsp[(3) - (3)].command)); +*************** +*** 2963,2967 **** + + case 105: +! #line 970 "/usr/homes/chet/src/bash/src/parse.y" + { + COMMAND *tc; +--- 2968,2972 ---- + + case 105: +! #line 975 "/usr/homes/chet/src/bash/src/parse.y" + { + COMMAND *tc; +*************** +*** 2983,2987 **** + + case 106: +! #line 987 "/usr/homes/chet/src/bash/src/parse.y" + { + (yyval.command) = make_coproc_command ("COPROC", clean_simple_command ((yyvsp[(2) - (2)].command))); +--- 2988,2992 ---- + + case 106: +! #line 992 "/usr/homes/chet/src/bash/src/parse.y" + { + (yyval.command) = make_coproc_command ("COPROC", clean_simple_command ((yyvsp[(2) - (2)].command))); +*************** +*** 2991,3105 **** + + case 107: +! #line 994 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.command) = make_if_command ((yyvsp[(2) - (5)].command), (yyvsp[(4) - (5)].command), (COMMAND *)NULL); } + break; + + case 108: +! #line 996 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.command) = make_if_command ((yyvsp[(2) - (7)].command), (yyvsp[(4) - (7)].command), (yyvsp[(6) - (7)].command)); } + break; + + case 109: +! #line 998 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.command) = make_if_command ((yyvsp[(2) - (6)].command), (yyvsp[(4) - (6)].command), (yyvsp[(5) - (6)].command)); } + break; + + case 110: +! #line 1003 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.command) = make_group_command ((yyvsp[(2) - (3)].command)); } + break; + + case 111: +! #line 1007 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.command) = make_arith_command ((yyvsp[(1) - (1)].word_list)); } + break; + + case 112: +! #line 1011 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.command) = (yyvsp[(2) - (3)].command); } + break; + + case 113: +! #line 1015 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.command) = make_if_command ((yyvsp[(2) - (4)].command), (yyvsp[(4) - (4)].command), (COMMAND *)NULL); } + break; + + case 114: +! #line 1017 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.command) = make_if_command ((yyvsp[(2) - (6)].command), (yyvsp[(4) - (6)].command), (yyvsp[(6) - (6)].command)); } + break; + + case 115: +! #line 1019 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.command) = make_if_command ((yyvsp[(2) - (5)].command), (yyvsp[(4) - (5)].command), (yyvsp[(5) - (5)].command)); } + break; + + case 117: +! #line 1024 "/usr/homes/chet/src/bash/src/parse.y" + { (yyvsp[(2) - (2)].pattern)->next = (yyvsp[(1) - (2)].pattern); (yyval.pattern) = (yyvsp[(2) - (2)].pattern); } + break; + + case 118: +! #line 1028 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.pattern) = make_pattern_list ((yyvsp[(2) - (4)].word_list), (yyvsp[(4) - (4)].command)); } + break; + + case 119: +! #line 1030 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.pattern) = make_pattern_list ((yyvsp[(2) - (4)].word_list), (COMMAND *)NULL); } + break; + + case 120: +! #line 1032 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.pattern) = make_pattern_list ((yyvsp[(3) - (5)].word_list), (yyvsp[(5) - (5)].command)); } + break; + + case 121: +! #line 1034 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.pattern) = make_pattern_list ((yyvsp[(3) - (5)].word_list), (COMMAND *)NULL); } + break; + + case 122: +! #line 1038 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.pattern) = (yyvsp[(1) - (2)].pattern); } + break; + + case 123: +! #line 1040 "/usr/homes/chet/src/bash/src/parse.y" + { (yyvsp[(2) - (3)].pattern)->next = (yyvsp[(1) - (3)].pattern); (yyval.pattern) = (yyvsp[(2) - (3)].pattern); } + break; + + case 124: +! #line 1042 "/usr/homes/chet/src/bash/src/parse.y" + { (yyvsp[(1) - (2)].pattern)->flags |= CASEPAT_FALLTHROUGH; (yyval.pattern) = (yyvsp[(1) - (2)].pattern); } + break; + + case 125: +! #line 1044 "/usr/homes/chet/src/bash/src/parse.y" + { (yyvsp[(2) - (3)].pattern)->flags |= CASEPAT_FALLTHROUGH; (yyvsp[(2) - (3)].pattern)->next = (yyvsp[(1) - (3)].pattern); (yyval.pattern) = (yyvsp[(2) - (3)].pattern); } + break; + + case 126: +! #line 1046 "/usr/homes/chet/src/bash/src/parse.y" + { (yyvsp[(1) - (2)].pattern)->flags |= CASEPAT_TESTNEXT; (yyval.pattern) = (yyvsp[(1) - (2)].pattern); } + break; + + case 127: +! #line 1048 "/usr/homes/chet/src/bash/src/parse.y" + { (yyvsp[(2) - (3)].pattern)->flags |= CASEPAT_TESTNEXT; (yyvsp[(2) - (3)].pattern)->next = (yyvsp[(1) - (3)].pattern); (yyval.pattern) = (yyvsp[(2) - (3)].pattern); } + break; + + case 128: +! #line 1052 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.word_list) = make_word_list ((yyvsp[(1) - (1)].word), (WORD_LIST *)NULL); } + break; + + case 129: +! #line 1054 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.word_list) = make_word_list ((yyvsp[(3) - (3)].word), (yyvsp[(1) - (3)].word_list)); } + break; + + case 130: +! #line 1063 "/usr/homes/chet/src/bash/src/parse.y" + { + (yyval.command) = (yyvsp[(2) - (2)].command); +--- 2996,3110 ---- + + case 107: +! #line 999 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.command) = make_if_command ((yyvsp[(2) - (5)].command), (yyvsp[(4) - (5)].command), (COMMAND *)NULL); } + break; + + case 108: +! #line 1001 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.command) = make_if_command ((yyvsp[(2) - (7)].command), (yyvsp[(4) - (7)].command), (yyvsp[(6) - (7)].command)); } + break; + + case 109: +! #line 1003 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.command) = make_if_command ((yyvsp[(2) - (6)].command), (yyvsp[(4) - (6)].command), (yyvsp[(5) - (6)].command)); } + break; + + case 110: +! #line 1008 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.command) = make_group_command ((yyvsp[(2) - (3)].command)); } + break; + + case 111: +! #line 1012 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.command) = make_arith_command ((yyvsp[(1) - (1)].word_list)); } + break; + + case 112: +! #line 1016 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.command) = (yyvsp[(2) - (3)].command); } + break; + + case 113: +! #line 1020 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.command) = make_if_command ((yyvsp[(2) - (4)].command), (yyvsp[(4) - (4)].command), (COMMAND *)NULL); } + break; + + case 114: +! #line 1022 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.command) = make_if_command ((yyvsp[(2) - (6)].command), (yyvsp[(4) - (6)].command), (yyvsp[(6) - (6)].command)); } + break; + + case 115: +! #line 1024 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.command) = make_if_command ((yyvsp[(2) - (5)].command), (yyvsp[(4) - (5)].command), (yyvsp[(5) - (5)].command)); } + break; + + case 117: +! #line 1029 "/usr/homes/chet/src/bash/src/parse.y" + { (yyvsp[(2) - (2)].pattern)->next = (yyvsp[(1) - (2)].pattern); (yyval.pattern) = (yyvsp[(2) - (2)].pattern); } + break; + + case 118: +! #line 1033 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.pattern) = make_pattern_list ((yyvsp[(2) - (4)].word_list), (yyvsp[(4) - (4)].command)); } + break; + + case 119: +! #line 1035 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.pattern) = make_pattern_list ((yyvsp[(2) - (4)].word_list), (COMMAND *)NULL); } + break; + + case 120: +! #line 1037 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.pattern) = make_pattern_list ((yyvsp[(3) - (5)].word_list), (yyvsp[(5) - (5)].command)); } + break; + + case 121: +! #line 1039 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.pattern) = make_pattern_list ((yyvsp[(3) - (5)].word_list), (COMMAND *)NULL); } + break; + + case 122: +! #line 1043 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.pattern) = (yyvsp[(1) - (2)].pattern); } + break; + + case 123: +! #line 1045 "/usr/homes/chet/src/bash/src/parse.y" + { (yyvsp[(2) - (3)].pattern)->next = (yyvsp[(1) - (3)].pattern); (yyval.pattern) = (yyvsp[(2) - (3)].pattern); } + break; + + case 124: +! #line 1047 "/usr/homes/chet/src/bash/src/parse.y" + { (yyvsp[(1) - (2)].pattern)->flags |= CASEPAT_FALLTHROUGH; (yyval.pattern) = (yyvsp[(1) - (2)].pattern); } + break; + + case 125: +! #line 1049 "/usr/homes/chet/src/bash/src/parse.y" + { (yyvsp[(2) - (3)].pattern)->flags |= CASEPAT_FALLTHROUGH; (yyvsp[(2) - (3)].pattern)->next = (yyvsp[(1) - (3)].pattern); (yyval.pattern) = (yyvsp[(2) - (3)].pattern); } + break; + + case 126: +! #line 1051 "/usr/homes/chet/src/bash/src/parse.y" + { (yyvsp[(1) - (2)].pattern)->flags |= CASEPAT_TESTNEXT; (yyval.pattern) = (yyvsp[(1) - (2)].pattern); } + break; + + case 127: +! #line 1053 "/usr/homes/chet/src/bash/src/parse.y" + { (yyvsp[(2) - (3)].pattern)->flags |= CASEPAT_TESTNEXT; (yyvsp[(2) - (3)].pattern)->next = (yyvsp[(1) - (3)].pattern); (yyval.pattern) = (yyvsp[(2) - (3)].pattern); } + break; + + case 128: +! #line 1057 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.word_list) = make_word_list ((yyvsp[(1) - (1)].word), (WORD_LIST *)NULL); } + break; + + case 129: +! #line 1059 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.word_list) = make_word_list ((yyvsp[(3) - (3)].word), (yyvsp[(1) - (3)].word_list)); } + break; + + case 130: +! #line 1068 "/usr/homes/chet/src/bash/src/parse.y" + { + (yyval.command) = (yyvsp[(2) - (2)].command); +*************** +*** 3110,3114 **** + + case 132: +! #line 1072 "/usr/homes/chet/src/bash/src/parse.y" + { + (yyval.command) = (yyvsp[(2) - (2)].command); +--- 3115,3119 ---- + + case 132: +! #line 1077 "/usr/homes/chet/src/bash/src/parse.y" + { + (yyval.command) = (yyvsp[(2) - (2)].command); +*************** +*** 3117,3121 **** + + case 134: +! #line 1079 "/usr/homes/chet/src/bash/src/parse.y" + { + if ((yyvsp[(1) - (3)].command)->type == cm_connection) +--- 3122,3126 ---- + + case 134: +! #line 1084 "/usr/homes/chet/src/bash/src/parse.y" + { + if ((yyvsp[(1) - (3)].command)->type == cm_connection) +*************** +*** 3127,3141 **** + + case 136: +! #line 1090 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.command) = command_connect ((yyvsp[(1) - (4)].command), (yyvsp[(4) - (4)].command), AND_AND); } + break; + + case 137: +! #line 1092 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.command) = command_connect ((yyvsp[(1) - (4)].command), (yyvsp[(4) - (4)].command), OR_OR); } + break; + + case 138: +! #line 1094 "/usr/homes/chet/src/bash/src/parse.y" + { + if ((yyvsp[(1) - (4)].command)->type == cm_connection) +--- 3132,3146 ---- + + case 136: +! #line 1095 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.command) = command_connect ((yyvsp[(1) - (4)].command), (yyvsp[(4) - (4)].command), AND_AND); } + break; + + case 137: +! #line 1097 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.command) = command_connect ((yyvsp[(1) - (4)].command), (yyvsp[(4) - (4)].command), OR_OR); } + break; + + case 138: +! #line 1099 "/usr/homes/chet/src/bash/src/parse.y" + { + if ((yyvsp[(1) - (4)].command)->type == cm_connection) +*************** +*** 3147,3181 **** + + case 139: +! #line 1101 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.command) = command_connect ((yyvsp[(1) - (4)].command), (yyvsp[(4) - (4)].command), ';'); } + break; + + case 140: +! #line 1103 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.command) = command_connect ((yyvsp[(1) - (4)].command), (yyvsp[(4) - (4)].command), ';'); } + break; + + case 141: +! #line 1105 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.command) = (yyvsp[(1) - (1)].command); } + break; + + case 144: +! #line 1113 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.number) = '\n'; } + break; + + case 145: +! #line 1115 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.number) = ';'; } + break; + + case 146: +! #line 1117 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.number) = yacc_EOF; } + break; + + case 149: +! #line 1131 "/usr/homes/chet/src/bash/src/parse.y" + { + (yyval.command) = (yyvsp[(1) - (1)].command); +--- 3152,3186 ---- + + case 139: +! #line 1106 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.command) = command_connect ((yyvsp[(1) - (4)].command), (yyvsp[(4) - (4)].command), ';'); } + break; + + case 140: +! #line 1108 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.command) = command_connect ((yyvsp[(1) - (4)].command), (yyvsp[(4) - (4)].command), ';'); } + break; + + case 141: +! #line 1110 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.command) = (yyvsp[(1) - (1)].command); } + break; + + case 144: +! #line 1118 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.number) = '\n'; } + break; + + case 145: +! #line 1120 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.number) = ';'; } + break; + + case 146: +! #line 1122 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.number) = yacc_EOF; } + break; + + case 149: +! #line 1136 "/usr/homes/chet/src/bash/src/parse.y" + { + (yyval.command) = (yyvsp[(1) - (1)].command); +*************** +*** 3193,3197 **** + + case 150: +! #line 1144 "/usr/homes/chet/src/bash/src/parse.y" + { + if ((yyvsp[(1) - (2)].command)->type == cm_connection) +--- 3198,3202 ---- + + case 150: +! #line 1149 "/usr/homes/chet/src/bash/src/parse.y" + { + if ((yyvsp[(1) - (2)].command)->type == cm_connection) +*************** +*** 3212,3216 **** + + case 151: +! #line 1160 "/usr/homes/chet/src/bash/src/parse.y" + { + (yyval.command) = (yyvsp[(1) - (2)].command); +--- 3217,3221 ---- + + case 151: +! #line 1165 "/usr/homes/chet/src/bash/src/parse.y" + { + (yyval.command) = (yyvsp[(1) - (2)].command); +*************** +*** 3228,3242 **** + + case 152: +! #line 1175 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.command) = command_connect ((yyvsp[(1) - (4)].command), (yyvsp[(4) - (4)].command), AND_AND); } + break; + + case 153: +! #line 1177 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.command) = command_connect ((yyvsp[(1) - (4)].command), (yyvsp[(4) - (4)].command), OR_OR); } + break; + + case 154: +! #line 1179 "/usr/homes/chet/src/bash/src/parse.y" + { + if ((yyvsp[(1) - (3)].command)->type == cm_connection) +--- 3233,3247 ---- + + case 152: +! #line 1180 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.command) = command_connect ((yyvsp[(1) - (4)].command), (yyvsp[(4) - (4)].command), AND_AND); } + break; + + case 153: +! #line 1182 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.command) = command_connect ((yyvsp[(1) - (4)].command), (yyvsp[(4) - (4)].command), OR_OR); } + break; + + case 154: +! #line 1184 "/usr/homes/chet/src/bash/src/parse.y" + { + if ((yyvsp[(1) - (3)].command)->type == cm_connection) +*************** +*** 3248,3267 **** + + case 155: +! #line 1186 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.command) = command_connect ((yyvsp[(1) - (3)].command), (yyvsp[(3) - (3)].command), ';'); } + break; + + case 156: +! #line 1189 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.command) = (yyvsp[(1) - (1)].command); } + break; + + case 157: +! #line 1193 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.command) = (yyvsp[(1) - (1)].command); } + break; + + case 158: +! #line 1195 "/usr/homes/chet/src/bash/src/parse.y" + { + if ((yyvsp[(2) - (2)].command)) +--- 3253,3272 ---- + + case 155: +! #line 1191 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.command) = command_connect ((yyvsp[(1) - (3)].command), (yyvsp[(3) - (3)].command), ';'); } + break; + + case 156: +! #line 1194 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.command) = (yyvsp[(1) - (1)].command); } + break; + + case 157: +! #line 1198 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.command) = (yyvsp[(1) - (1)].command); } + break; + + case 158: +! #line 1200 "/usr/homes/chet/src/bash/src/parse.y" + { + if ((yyvsp[(2) - (2)].command)) +*************** +*** 3272,3276 **** + + case 159: +! #line 1201 "/usr/homes/chet/src/bash/src/parse.y" + { + if ((yyvsp[(2) - (2)].command)) +--- 3277,3281 ---- + + case 159: +! #line 1206 "/usr/homes/chet/src/bash/src/parse.y" + { + if ((yyvsp[(2) - (2)].command)) +*************** +*** 3281,3285 **** + + case 160: +! #line 1207 "/usr/homes/chet/src/bash/src/parse.y" + { + ELEMENT x; +--- 3286,3290 ---- + + case 160: +! #line 1212 "/usr/homes/chet/src/bash/src/parse.y" + { + ELEMENT x; +*************** +*** 3301,3305 **** + + case 161: +! #line 1224 "/usr/homes/chet/src/bash/src/parse.y" + { + ELEMENT x; +--- 3306,3310 ---- + + case 161: +! #line 1229 "/usr/homes/chet/src/bash/src/parse.y" + { + ELEMENT x; +*************** +*** 3322,3331 **** + + case 162: +! #line 1244 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.command) = command_connect ((yyvsp[(1) - (4)].command), (yyvsp[(4) - (4)].command), '|'); } + break; + + case 163: +! #line 1246 "/usr/homes/chet/src/bash/src/parse.y" + { + /* Make cmd1 |& cmd2 equivalent to cmd1 2>&1 | cmd2 */ +--- 3327,3336 ---- + + case 162: +! #line 1249 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.command) = command_connect ((yyvsp[(1) - (4)].command), (yyvsp[(4) - (4)].command), '|'); } + break; + + case 163: +! #line 1251 "/usr/homes/chet/src/bash/src/parse.y" + { + /* Make cmd1 |& cmd2 equivalent to cmd1 2>&1 | cmd2 */ +*************** +*** 3353,3372 **** + + case 164: +! #line 1269 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.command) = (yyvsp[(1) - (1)].command); } + break; + + case 165: +! #line 1273 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.number) = CMD_TIME_PIPELINE; } + break; + + case 166: +! #line 1275 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.number) = CMD_TIME_PIPELINE|CMD_TIME_POSIX; } + break; + + case 167: +! #line 1277 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.number) = CMD_TIME_PIPELINE|CMD_TIME_POSIX; } + break; +--- 3358,3377 ---- + + case 164: +! #line 1274 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.command) = (yyvsp[(1) - (1)].command); } + break; + + case 165: +! #line 1278 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.number) = CMD_TIME_PIPELINE; } + break; + + case 166: +! #line 1280 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.number) = CMD_TIME_PIPELINE|CMD_TIME_POSIX; } + break; + + case 167: +! #line 1282 "/usr/homes/chet/src/bash/src/parse.y" + { (yyval.number) = CMD_TIME_PIPELINE|CMD_TIME_POSIX; } + break; +*************** +*** 3374,3378 **** + + /* Line 1267 of yacc.c. */ +! #line 3377 "y.tab.c" + default: break; + } +--- 3379,3383 ---- + + /* Line 1267 of yacc.c. */ +! #line 3382 "y.tab.c" + default: break; + } +*************** +*** 3588,3592 **** + + +! #line 1279 "/usr/homes/chet/src/bash/src/parse.y" + + +--- 3593,3597 ---- + + +! #line 1284 "/usr/homes/chet/src/bash/src/parse.y" + + +*************** +*** 4949,4952 **** +--- 4954,4972 ---- + static int esacs_needed_count; + ++ static void ++ push_heredoc (r) ++ REDIRECT *r; ++ { ++ if (need_here_doc >= HEREDOC_MAX) ++ { ++ last_command_exit_value = EX_BADUSAGE; ++ need_here_doc = 0; ++ report_syntax_error (_("maximum here-document count exceeded")); ++ reset_parser (); ++ exit_shell (last_command_exit_value); ++ } ++ redir_stack[need_here_doc++] = r; ++ } ++ + void + gather_here_documents () +*************** +*** 8542,8543 **** +--- 8562,8564 ---- + } + #endif /* HANDLE_MULTIBYTE */ ++ +*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500 +--- patchlevel.h 2014-03-20 20:01:28.000000000 -0400 +*************** +*** 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_ */ -- cgit v1.2.3 From 01023464b899a9f45b982ebc72b22bfe3f8cce67 Mon Sep 17 00:00:00 2001 From: Treeve Jelbert Date: Wed, 1 Oct 2014 18:30:55 +0200 Subject: gstreamer-1.0: => 1.4.3 --- video-libs/gstreamer-1.0/DETAILS | 4 ++-- video-libs/gstreamer-1.0/HISTORY | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/video-libs/gstreamer-1.0/DETAILS b/video-libs/gstreamer-1.0/DETAILS index d8d575428a..a7baf8eb76 100755 --- a/video-libs/gstreamer-1.0/DETAILS +++ b/video-libs/gstreamer-1.0/DETAILS @@ -1,9 +1,9 @@ SPELL=gstreamer-1.0 - VERSION=1.2.2 + VERSION=1.4.3 + SOURCE_HASH=sha512:804a497ffbf4a69739dc302eebabdc3044dfc9aff277e5d5c776ca8d181fd37655ac0f9444899986dca98762dfe7619279e7c9b8a8abe6914d071268f4c9b345 SOURCE=gstreamer-$VERSION.tar.xz SOURCE_DIRECTORY="$BUILD_DIRECTORY/gstreamer-$VERSION" SOURCE_URL[0]=http://gstreamer.freedesktop.org/src/gstreamer/$SOURCE - SOURCE_HASH=sha512:ee032d68fbb368741d7e0db60bb0ec10fc1bd831e21cf171634f2f74b373c2c5149a8e98889186eac49954fdd34cf5ca161b7cead13bcc75425b4f3984131d53 LICENSE[0]=LGPL WEB_SITE=http://gstreamer.freedesktop.org/ ENTERED=20120930 diff --git a/video-libs/gstreamer-1.0/HISTORY b/video-libs/gstreamer-1.0/HISTORY index b09c5aac18..a7fcd11af6 100644 --- a/video-libs/gstreamer-1.0/HISTORY +++ b/video-libs/gstreamer-1.0/HISTORY @@ -1,3 +1,6 @@ +2014-10-01 Treeve Jelbert + * DETAILS: version 1.4.3 + 2013-12-28 Ladislav Hagara * DETAILS: 1.2.2 -- cgit v1.2.3 From dfb310c5090ad4d448a6d6fb72bc2585218b4bfa Mon Sep 17 00:00:00 2001 From: Treeve Jelbert Date: Wed, 1 Oct 2014 18:50:57 +0200 Subject: gst-plugins-base-1.0: => 1.4.3 --- video-libs/gst-plugins-base-1.0/DETAILS | 5 +++-- video-libs/gst-plugins-base-1.0/HISTORY | 3 +++ .../gst-plugins-base-1.2.2.tar.xz.sig | Bin 287 -> 0 bytes 3 files changed, 6 insertions(+), 2 deletions(-) delete mode 100644 video-libs/gst-plugins-base-1.0/gst-plugins-base-1.2.2.tar.xz.sig diff --git a/video-libs/gst-plugins-base-1.0/DETAILS b/video-libs/gst-plugins-base-1.0/DETAILS index bfd0d0f18e..71cc4aa4d8 100755 --- a/video-libs/gst-plugins-base-1.0/DETAILS +++ b/video-libs/gst-plugins-base-1.0/DETAILS @@ -1,9 +1,10 @@ SPELL=gst-plugins-base-1.0 - VERSION=1.2.2 + VERSION=1.4.3 + SOURCE_HASH=sha512:9ec8b48a8e6a31923d7f3786ef79145bc1465a28bc5ee4853f40f2dd79f71b7a244039c706fe3c8879084dc4a32a8112d4163e537aab9bad48471af83758c300 +# SOURCE_GPG="gurus.gpg:$SOURCE.sig:UPSTREAM_HASH" SOURCE=gst-plugins-base-$VERSION.tar.xz SOURCE_DIRECTORY=$BUILD_DIRECTORY/gst-plugins-base-$VERSION SOURCE_URL[0]=http://gstreamer.freedesktop.org/src/gst-plugins-base/$SOURCE - SOURCE_GPG="gurus.gpg:$SOURCE.sig:UPSTREAM_HASH" LICENSE[0]=LGPL WEB_SITE=http://gstreamer.freedesktop.org ENTERED=20121005 diff --git a/video-libs/gst-plugins-base-1.0/HISTORY b/video-libs/gst-plugins-base-1.0/HISTORY index da9083f57e..08dc074166 100644 --- a/video-libs/gst-plugins-base-1.0/HISTORY +++ b/video-libs/gst-plugins-base-1.0/HISTORY @@ -1,3 +1,6 @@ +2014-10-01 Treeve Jelbert + * DETAILS: version 1.4.3 + 2013-12-28 Ladislav Hagara * DETAILS: 1.2.2 diff --git a/video-libs/gst-plugins-base-1.0/gst-plugins-base-1.2.2.tar.xz.sig b/video-libs/gst-plugins-base-1.0/gst-plugins-base-1.2.2.tar.xz.sig deleted file mode 100644 index a489285ac0..0000000000 Binary files a/video-libs/gst-plugins-base-1.0/gst-plugins-base-1.2.2.tar.xz.sig and /dev/null differ -- cgit v1.2.3 From 5cc6aa93890cd1764edf52f7c37f05246c4e1b4c Mon Sep 17 00:00:00 2001 From: Treeve Jelbert Date: Wed, 1 Oct 2014 18:59:03 +0200 Subject: gst-plugins-good-1.0: => 1.4.3 --- video-libs/gst-plugins-good-1.0/DETAILS | 5 +++-- video-libs/gst-plugins-good-1.0/HISTORY | 3 +++ .../gst-plugins-good-1.2.2.tar.xz.sig | Bin 287 -> 0 bytes 3 files changed, 6 insertions(+), 2 deletions(-) delete mode 100644 video-libs/gst-plugins-good-1.0/gst-plugins-good-1.2.2.tar.xz.sig diff --git a/video-libs/gst-plugins-good-1.0/DETAILS b/video-libs/gst-plugins-good-1.0/DETAILS index f7a8fe0974..6524a0859f 100755 --- a/video-libs/gst-plugins-good-1.0/DETAILS +++ b/video-libs/gst-plugins-good-1.0/DETAILS @@ -1,9 +1,10 @@ SPELL=gst-plugins-good-1.0 - VERSION=1.2.2 + VERSION=1.4.3 + SOURCE_HASH=sha512:6689613e1282809b7821c20063ff9daf5eb5d52f668a771701e052227b03a05196bb4dcae097e52244daeb6444c675971ca72b862c2fced224b8cdaa5a8d2d0c +# SOURCE_GPG="gurus.gpg:$SOURCE.sig:UPSTREAM_HASH" SOURCE=gst-plugins-good-$VERSION.tar.xz SOURCE_DIRECTORY="$BUILD_DIRECTORY/gst-plugins-good-$VERSION" SOURCE_URL[0]=http://gstreamer.freedesktop.org/src/gst-plugins-good/$SOURCE - SOURCE_GPG="gurus.gpg:$SOURCE.sig:UPSTREAM_HASH" LICENSE[0]=LGPL WEB_SITE=http://gstreamer.freedesktop.org/ ENTERED=20121005 diff --git a/video-libs/gst-plugins-good-1.0/HISTORY b/video-libs/gst-plugins-good-1.0/HISTORY index edac3006fb..4b60a02da1 100644 --- a/video-libs/gst-plugins-good-1.0/HISTORY +++ b/video-libs/gst-plugins-good-1.0/HISTORY @@ -1,3 +1,6 @@ +2014-10-01 Treeve Jelbert + * DETAILS: version 1.4.3 + 2013-12-28 Ladislav Hagara * DETAILS: 1.2.2 diff --git a/video-libs/gst-plugins-good-1.0/gst-plugins-good-1.2.2.tar.xz.sig b/video-libs/gst-plugins-good-1.0/gst-plugins-good-1.2.2.tar.xz.sig deleted file mode 100644 index be24188fd2..0000000000 Binary files a/video-libs/gst-plugins-good-1.0/gst-plugins-good-1.2.2.tar.xz.sig and /dev/null differ -- cgit v1.2.3 From 519d4ae5db8b5c7f7c2f1eee9c8a116f0a8493aa Mon Sep 17 00:00:00 2001 From: Treeve Jelbert Date: Wed, 1 Oct 2014 19:05:18 +0200 Subject: gst-plugins-bad-1.0: => 1.4.3 --- video-libs/gst-plugins-bad-1.0/DETAILS | 5 +++-- video-libs/gst-plugins-bad-1.0/HISTORY | 3 +++ .../gst-plugins-bad-1.0/gst-plugins-bad-1.2.2.tar.xz.sig | Bin 287 -> 0 bytes 3 files changed, 6 insertions(+), 2 deletions(-) delete mode 100644 video-libs/gst-plugins-bad-1.0/gst-plugins-bad-1.2.2.tar.xz.sig diff --git a/video-libs/gst-plugins-bad-1.0/DETAILS b/video-libs/gst-plugins-bad-1.0/DETAILS index 6049f81403..7b0cd8f6cd 100755 --- a/video-libs/gst-plugins-bad-1.0/DETAILS +++ b/video-libs/gst-plugins-bad-1.0/DETAILS @@ -1,9 +1,10 @@ SPELL=gst-plugins-bad-1.0 - VERSION=1.2.2 + VERSION=1.4.3 + SOURCE_HASH=sha512:5a5de7df2af09580bf502325c397f82a36e72b7ab1de04aa2254490299e90cdd4262d9de60de2a9be8eb044c406b469be7bedd236cc362e5b5ee46f517629ade +# SOURCE_GPG="gurus.gpg:$SOURCE.sig:UPSTREAM_HASH" SOURCE=gst-plugins-bad-$VERSION.tar.xz SOURCE_DIRECTORY=$BUILD_DIRECTORY/gst-plugins-bad-$VERSION SOURCE_URL[0]=http://gstreamer.freedesktop.org/src/gst-plugins-bad/$SOURCE - SOURCE_GPG="gurus.gpg:$SOURCE.sig:UPSTREAM_HASH" LICENSE[0]=LGPL WEB_SITE=http://gstreamer.freedesktop.org ENTERED=20121005 diff --git a/video-libs/gst-plugins-bad-1.0/HISTORY b/video-libs/gst-plugins-bad-1.0/HISTORY index 6b7a7e6b62..fb603aa5d5 100644 --- a/video-libs/gst-plugins-bad-1.0/HISTORY +++ b/video-libs/gst-plugins-bad-1.0/HISTORY @@ -1,3 +1,6 @@ +2014-10-01 Treeve Jelbert + * DETAILS: version 1.4.3 + 2013-12-28 Ladislav Hagara * DETAILS: 1.2.2 diff --git a/video-libs/gst-plugins-bad-1.0/gst-plugins-bad-1.2.2.tar.xz.sig b/video-libs/gst-plugins-bad-1.0/gst-plugins-bad-1.2.2.tar.xz.sig deleted file mode 100644 index 76cc068c2e..0000000000 Binary files a/video-libs/gst-plugins-bad-1.0/gst-plugins-bad-1.2.2.tar.xz.sig and /dev/null differ -- cgit v1.2.3 From 2d6af46f98d3f3e4cae89d73488507eff6de5e13 Mon Sep 17 00:00:00 2001 From: Treeve Jelbert Date: Wed, 1 Oct 2014 19:17:20 +0200 Subject: gst-libav-1.0: => 1.4.3 --- video-libs/gst-libav-1.0/DEPENDS | 3 ++- video-libs/gst-libav-1.0/DETAILS | 5 +++-- video-libs/gst-libav-1.0/HISTORY | 4 ++++ video-libs/gst-libav-1.0/gst-libav-1.2.2.tar.xz.sig | Bin 287 -> 0 bytes 4 files changed, 9 insertions(+), 3 deletions(-) delete mode 100644 video-libs/gst-libav-1.0/gst-libav-1.2.2.tar.xz.sig diff --git a/video-libs/gst-libav-1.0/DEPENDS b/video-libs/gst-libav-1.0/DEPENDS index 097058bfb0..3832fd7798 100755 --- a/video-libs/gst-libav-1.0/DEPENDS +++ b/video-libs/gst-libav-1.0/DEPENDS @@ -1,2 +1,3 @@ depends gstreamer-1.0 && -depends gst-plugins-base-1.0 +depends gst-plugins-base-1.0 && +depends LIBAVCODEC '--with-system-libav' diff --git a/video-libs/gst-libav-1.0/DETAILS b/video-libs/gst-libav-1.0/DETAILS index 31ff900ca7..5b4089c1bd 100755 --- a/video-libs/gst-libav-1.0/DETAILS +++ b/video-libs/gst-libav-1.0/DETAILS @@ -1,9 +1,10 @@ SPELL=gst-libav-1.0 - VERSION=1.2.2 + VERSION=1.4.3 + SOURCE_HASH=sha512:687a2a00a076a246104fd6ca90d0f16ced5d86eea3d2b6603f3525db1735ffcc94887895a5b4a93bd0bbdbb9743e185f0b447353f6dd6819cfa299c0b38b44f4 +# SOURCE_GPG="gurus.gpg:$SOURCE.sig:UPSTREAM_HASH" SOURCE=gst-libav-$VERSION.tar.xz SOURCE_DIRECTORY=$BUILD_DIRECTORY/gst-libav-$VERSION SOURCE_URL[0]=http://gstreamer.freedesktop.org/src/gst-libav/$SOURCE - SOURCE_GPG="gurus.gpg:$SOURCE.sig:UPSTREAM_HASH" LICENSE[0]=LGPL WEB_SITE=http://gstreamer.freedesktop.org ENTERED=20121005 diff --git a/video-libs/gst-libav-1.0/HISTORY b/video-libs/gst-libav-1.0/HISTORY index 7add9293c1..5b0dacff26 100644 --- a/video-libs/gst-libav-1.0/HISTORY +++ b/video-libs/gst-libav-1.0/HISTORY @@ -1,3 +1,7 @@ +2014-10-01 Treeve Jelbert + * DETAILS: version 1.4.3 + * DEPENDS: add LIBAVCODEC + 2013-12-28 Ladislav Hagara * DETAILS: 1.2.2 diff --git a/video-libs/gst-libav-1.0/gst-libav-1.2.2.tar.xz.sig b/video-libs/gst-libav-1.0/gst-libav-1.2.2.tar.xz.sig deleted file mode 100644 index ca85b34c6e..0000000000 Binary files a/video-libs/gst-libav-1.0/gst-libav-1.2.2.tar.xz.sig and /dev/null differ -- cgit v1.2.3 From 7eea72a3d43de18515974a75af58dded177e7b6d Mon Sep 17 00:00:00 2001 From: Vlad Glagolev Date: Thu, 2 Oct 2014 12:57:26 +0400 Subject: jack2: added primary mirror --- audio-drivers/jack2/DETAILS | 3 ++- audio-drivers/jack2/HISTORY | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/audio-drivers/jack2/DETAILS b/audio-drivers/jack2/DETAILS index d6d4f229f6..2de72bdc71 100755 --- a/audio-drivers/jack2/DETAILS +++ b/audio-drivers/jack2/DETAILS @@ -12,7 +12,8 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git" else VERSION=1.9.10 SOURCE=$SPELLX-$VERSION.tar.bz2 - SOURCE_URL[0]=http://jackaudio.org/downloads/$SOURCE + SOURCE_URL[0]=https://dl.dropboxusercontent.com/u/28869550/$SOURCE + SOURCE_URL[1]=http://jackaudio.org/downloads/$SOURCE SOURCE_HASH=sha512:d64d233c2d626a4ae635f009a7209c2c8740c7959988d282e733b5fc663c168301a2aa2b517dff80f44cb25417aeb5ccca87da5c24616dadf38d69a6cb307e7c SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION" fi diff --git a/audio-drivers/jack2/HISTORY b/audio-drivers/jack2/HISTORY index db1667b02d..ecf805a1f7 100644 --- a/audio-drivers/jack2/HISTORY +++ b/audio-drivers/jack2/HISTORY @@ -1,3 +1,6 @@ +2014-10-02 Vlad Glagolev + * DETAILS: added primary dropbox mirror + 2014-08-26 Thomas Orgis * DEPENDS: needs libsamplerate * DETAILS: scm=git -- cgit v1.2.3