diff options
511 files changed, 4223 insertions, 4665 deletions
@@ -1,4 +1,60 @@ -2014-08-31 Ismael Luceno <ismael@sourcemage.org> +2014-09-25 Ismael Luceno <ismael@sourcemage.org> + * utils/lxc: new spell, Userspace tools for the Linux kernel containers + +2014-09-23 Pol Vinogradov <vin.public@gmail.com> + * chat-im/pidgin-window-merge: new spell, one window plugin for Pidgin + +2014-09-23 Ismael Luceno <ismael@sourcemage.org> + * editors/vbindiff: new spell, Visual Binary Diff + +2014-09-21 Treeve Jelbert <treeve@sourcemage.org> + * move xdg-user-dirs to utils + * python-pypi/grit-i18n: added + +2014-09-19 Pol Vinogradov <vin.public@gmail.com> + * gnome3-libs/adwaita-icon-theme: new spell, Adwaita icon theme for GNOME + +2014-09-18 Jeremy Blosser <jblosser@sourcemage.org> + * graphics/irrlicht: move spell to games grimoire + +2014-09-17 Ismael Luceno <ismael@sourcemage.org> + * net/corkscrew: new spell, tool for tunneling SSH through HTTP + proxies + * libs/isl: new spell, Integer Set Library + +2014-09-16 Ismael Luceno <ismael@sourcemage.org> + * devel/elfkickers: new spell, Kickers of ELF + +2014-09-15 Jeremy Blosser <jblosser@sourcemage.org> + * database/leveldb: new spell, fast key-value storage library by Google + * graphics/irrlicht: new spell, high performance realtime 3D engine + +2014-09-15 Ismael Luceno <ismael@sourcemage.org> + * editors/vim-csapprox: new spell, Make gvim-only colorschemes work + transparently in terminal vim + +2014-09-14 Ismael Luceno <ismael@sourcemage.org> + * shell-term-fm/abduco: new spell, session {at,de}tach support + * shell-term-fm/byobu: new spell, text based window manager and + terminal multiplexer + * devel/cobra: new spell, Cobra Programming Language + +2014-09-11 Ismael Luceno <ismael@sourcemage.org> + * disk/squashfs-tools3: new spell, squashfs-tools 3.x + +2014-09-10 Ismael Luceno <ismael@sourcemage.org> + * devel/runawk: new spell, Wrapper for AWK providing modules + * devel/mk-configure: new spell, Lightweight replacement for autotools + * devel/bmake: new spell, Portable version of NetBSD make + +2014-09-09 Ismael Luceno <ismael@sourcemage.org> + * python-pypi/python-magic: new spell, File type identification using + libmagic + +2014-09-07 Ladislav Hagara <hgr@vabo.cz> + * utils/direvent: new spell, directory event monitoring daemon + +2014-08-31 Ismael Luceno <ismael@sourcemage.org> * devel/sdcc: new spell, Small Device C Compiler * devel/mawk: new spell, Interpreter for the AWK Programming Language @@ -8,7 +64,7 @@ 2014-08-22 Vlad Glagolev <stealth@sourcemage.org> * audio-soft/wavegain: new spell, wav files loudness normalizer -2014-08-22 Ismael Luceno <ismael@sourcemage.org> +2014-08-22 Ismael Luceno <ismael@sourcemage.org> * xorg-util/zarfy: new spell, A gui to libxrandr 2014-08-19 Treeve Jelbert <treeve@sourcemage.org> @@ -35,13 +91,13 @@ 2014-07-18 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> * net/tor.gpg: add 63FEE659 -2014-07-09 Ismael Luceno <ismael@sourcemage.org> +2014-07-09 Ismael Luceno <ismael@sourcemage.org> * emacs-lisp/visual-regexp: new spell, A regexp/replace command for Emacs with interactive visual feedback * emacs-lisp/autopair: new spell, Automagically pair braces and quotes -2014-07-05 Ismael Luceno <ismael@sourcemage.org> +2014-07-05 Ismael Luceno <ismael@sourcemage.org> * devel/gnusim8085: new spell, Graphical simulator, assembler and debugger for the Intel 8085 microprocessor @@ -108,10 +164,10 @@ 2014-05-18 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> * fonts-x11/ttf-mensch: new spell, a console font based on Menlo -2014-05-10 Ismael Luceno <ismael@sourcemage.org> +2014-05-10 Ismael Luceno <ismael@sourcemage.org> * mail/isync: new spell, IMAP and MailDir mailbox synchronizer -2014-05-10 Ismael Luceno <ismael@sourcemage.org> +2014-05-10 Ismael Luceno <ismael@sourcemage.org> * perl-cpan/file-copy-recursive: new spell, Perl extension for recursively copying files and directories 2014-05-10 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> diff --git a/archive-libs/snappy/DETAILS b/archive-libs/snappy/DETAILS index ed55d03a43..bb31a5382c 100755 --- a/archive-libs/snappy/DETAILS +++ b/archive-libs/snappy/DETAILS @@ -1,9 +1,19 @@ +. "$GRIMOIRE/FUNCTIONS" SPELL=snappy - VERSION=1.0.4 - SOURCE_HASH=sha512:34e70dc35af9e8d7601618c2521be0cd0ba74907b8e67362d02c515c06c7bf2a2f58dac3dfed75270b7d9c9a1d6ec408c76e3665dc70bbeda8f87584cb4f01b0 +if [ "${SNAPPY_BRANCH}" == "scm" ]; then + VERSION=$(get_scm_version) + SOURCE=${SPELL}-${SNAPPY_BRANCH}.tar.bz2 +SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${SNAPPY_BRANCH} + FORCE_DOWNLOAD=on + SOURCE_URL[0]=git://github.com/google/${SPELL}.git + SOURCE_IGNORE=volatile +else + VERSION=1.1.2 + SOURCE_HASH=sha512:da0e80528dfc815d765347c60dc5f14bc7fb882cc6894b87d3a43dec1a127cf8bcfe46e6cb93e130790c0ebd67368a1042500d9080f844441803c1b69c3cc07e SOURCE=$SPELL-$VERSION.tar.gz SOURCE_URL[0]=http://snappy.googlecode.com/files/$SOURCE SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION" +fi WEB_SITE=http://code.google.com/p/snappy/ LICENSE[0]=BSD ENTERED=20120116 diff --git a/archive-libs/snappy/HISTORY b/archive-libs/snappy/HISTORY index 7351a51195..2d26cb0c67 100644 --- a/archive-libs/snappy/HISTORY +++ b/archive-libs/snappy/HISTORY @@ -1,2 +1,5 @@ +2014-09-15 Jeremy Blosser <jblosser@sourcemage.org> + * DETAILS, PREPARE, PRE_BUILD: 1.1.2 and add git version. + 2012-01-16 Ladislav Hagara <hgr@vabo.cz> * DETAILS: spell created, version 1.0.4 diff --git a/archive-libs/snappy/PREPARE b/archive-libs/snappy/PREPARE new file mode 100755 index 0000000000..98d27e41ff --- /dev/null +++ b/archive-libs/snappy/PREPARE @@ -0,0 +1,2 @@ +. ${GRIMOIRE}/FUNCTIONS && +prepare_select_branch stable scm diff --git a/archive-libs/snappy/PRE_BUILD b/archive-libs/snappy/PRE_BUILD new file mode 100755 index 0000000000..597c57cb87 --- /dev/null +++ b/archive-libs/snappy/PRE_BUILD @@ -0,0 +1,6 @@ +default_pre_build && +cd "${SOURCE_DIRECTORY}" && + +if [ "${SNAPPY_BRANCH}" == "scm" ]; then + ./autogen.sh +fi diff --git a/archive/xarchive/DEPENDS b/archive/xarchive/DEPENDS index 44c5341b3d..5aaaa1b51d 100755 --- a/archive/xarchive/DEPENDS +++ b/archive/xarchive/DEPENDS @@ -1,5 +1,5 @@ depends bash && -depends gawk && +depends AWK && depends gtk+2 && optional_depends "tar" \ diff --git a/audio-players/mpd/DEPENDS b/audio-players/mpd/DEPENDS index 1515d8d06d..0d29c2b2cd 100755 --- a/audio-players/mpd/DEPENDS +++ b/audio-players/mpd/DEPENDS @@ -36,6 +36,8 @@ optional_depends libvorbis \ "for Ogg Vorbis support" && if is_depends_enabled $SPELL libvorbis; then + depends libogg && + config_query_option MPD_OPTS "Enable Ogg Vorbis encoder support?" y \ "--enable-vorbis-encoder" \ "--disable-vorbis-encoder" diff --git a/audio-players/mpd/DETAILS b/audio-players/mpd/DETAILS index 2151b61f3b..4e7e25a265 100755 --- a/audio-players/mpd/DETAILS +++ b/audio-players/mpd/DETAILS @@ -1,10 +1,10 @@ SPELL=mpd - VERSION=0.18.13 + VERSION=0.18.14 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:f68f8faaa96493a30cbc7b8eedcdc05b2aafb7e29fe14678454b13fda34eff56351953df80df55a8e4df6fef7d0adad8534beb694056897971fca70c1db55d51 + SOURCE_HASH=sha512:93a41281ec36b4af745b20ac01ea42713ee34ecf84cf58ce386811cbee0324524e7c6d2e84d8b8c69d996dcb5e646bd32d498a07d333d6d71088323175bb41f4 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 c61604a96f..d2a5650223 100644 --- a/audio-players/mpd/HISTORY +++ b/audio-players/mpd/HISTORY @@ -1,3 +1,9 @@ +2014-09-25 Remko van der Vossen <wich@sourcemage.org> + * DEPENDS: depends libogg if libvorbis is enabled + +2014-09-12 Vlad Glagolev <stealth@sourcemage.org> + * DETAILS: updated spell to 0.18.14 + 2014-09-02 Vlad Glagolev <stealth@sourcemage.org> * DETAILS: updated spell to 0.18.13 * CONFIGURE: removed obsolete options diff --git a/chat-im/pidgin-sipe/DEPENDS b/chat-im/pidgin-sipe/DEPENDS index 5419726ad5..920623fc7b 100755 --- a/chat-im/pidgin-sipe/DEPENDS +++ b/chat-im/pidgin-sipe/DEPENDS @@ -1,6 +1,11 @@ -depends pidgin && +depends gettext && depends glib2 && +depends icu && +depends libffi && +depends libidn && depends libxml2 && +depends nspr && depends nss && -depends gettext +depends pcre && +depends pidgin diff --git a/chat-im/pidgin-sipe/HISTORY b/chat-im/pidgin-sipe/HISTORY index 2add5c63b2..505cdd67af 100644 --- a/chat-im/pidgin-sipe/HISTORY +++ b/chat-im/pidgin-sipe/HISTORY @@ -1,2 +1,5 @@ +2014-09-25 Remko van der Vossen <wich@sourcemage.org> + * DEPENDS: missing depends + 2013-06-12 Remko van der Vossen <wich@sourcemage.org> * DETAILS, DEPENDS: new spell diff --git a/chat-im/pidgin-window-merge/DEPENDS b/chat-im/pidgin-window-merge/DEPENDS new file mode 100755 index 0000000000..80af1d9f47 --- /dev/null +++ b/chat-im/pidgin-window-merge/DEPENDS @@ -0,0 +1,4 @@ +depends autoconf && +depends automake && +depends git && +depends pidgin diff --git a/chat-im/pidgin-window-merge/DETAILS b/chat-im/pidgin-window-merge/DETAILS new file mode 100755 index 0000000000..4765f04c69 --- /dev/null +++ b/chat-im/pidgin-window-merge/DETAILS @@ -0,0 +1,19 @@ +. "$GRIMOIRE/FUNCTIONS" + SPELL=pidgin-window-merge + VERSION=$(get_scm_version) + SOURCE=${SPELL}-git.tar.bz2 +SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}-git + SOURCE_URL=git://github.com/dm0-/window_merge.git:$SPELL-git + SOURCE_IGNORE=volatile + FORCE_DOWNLOAD=1 + WEB_SITE=http://github.com/dm0-/window_merge + ENTERED=20140923 + LICENSE[0]=GPL + KEYWORDS="chat plugin window" + SHORT="One window plugin for Pidgin" +cat << EOF +Window Merge is a Pidgin plugin that merges a conversation window +with the Buddy List window. It can be used to achieve a rudimentary +"single window mode" for Pidgin. Both Window Merge and Pidgin itself +should be kept updated for the most stable experience +EOF diff --git a/chat-im/pidgin-window-merge/HISTORY b/chat-im/pidgin-window-merge/HISTORY new file mode 100644 index 0000000000..404d6907d5 --- /dev/null +++ b/chat-im/pidgin-window-merge/HISTORY @@ -0,0 +1,2 @@ +2014-09-23 Pol Vinogradov <vin.public@gmail.com> + * DETAILS, DEPENDS, PREPARE, PRE_BUILD: spell created diff --git a/chat-im/pidgin-window-merge/PREPARE b/chat-im/pidgin-window-merge/PREPARE new file mode 100755 index 0000000000..a68f274f72 --- /dev/null +++ b/chat-im/pidgin-window-merge/PREPARE @@ -0,0 +1,2 @@ +. ${GRIMOIRE}/FUNCTIONS && +prepare_select_branch scm diff --git a/chat-im/pidgin-window-merge/PRE_BUILD b/chat-im/pidgin-window-merge/PRE_BUILD new file mode 100755 index 0000000000..0bbdbfec4a --- /dev/null +++ b/chat-im/pidgin-window-merge/PRE_BUILD @@ -0,0 +1,6 @@ +default_pre_build && + +cd "$SOURCE_DIRECTORY" && + +mkdir -p m4 && +autoreconf -fi diff --git a/chat-im/pidgin/4C292FCC.gpg b/chat-im/pidgin/4C292FCC.gpg Binary files differdeleted file mode 100644 index 689916a4d4..0000000000 --- a/chat-im/pidgin/4C292FCC.gpg +++ /dev/null diff --git a/chat-im/pidgin/DEPENDS b/chat-im/pidgin/DEPENDS index 08ea19a24b..10c9e7642b 100755 --- a/chat-im/pidgin/DEPENDS +++ b/chat-im/pidgin/DEPENDS @@ -1,7 +1,8 @@ -depends libxml2 && depends glib2 && -depends xml-parser-expat && depends intltool && +depends libxml2 && +depends nspr && +depends xml-parser-expat && optional_depends silc-toolkit \ "" \ @@ -83,9 +84,9 @@ optional_depends gstreamer \ "--disable-gstreamer" \ "for GStreamer audio support" && -optional_depends farsight2 \ - "" \ - "--disable-farsight --disable-vv" \ +optional_depends farstream \ + "--enable-farstream --enable-vv" \ + "--disable-farstream --disable-vv" \ "for voice/video support" && optional_depends avahi \ @@ -112,8 +113,8 @@ optional_depends libidn \ '--enable-idn' \ '--disable-idn' \ 'for International Domain Name support' && + optional_depends sqlite \ '--enable-cap' \ '--disable-cap' \ 'for contact availability prediction' - diff --git a/chat-im/pidgin/DETAILS b/chat-im/pidgin/DETAILS index fc19a7b8df..0dca129d47 100755 --- a/chat-im/pidgin/DETAILS +++ b/chat-im/pidgin/DETAILS @@ -1,11 +1,11 @@ SPELL=pidgin - VERSION=2.10.7 + VERSION=2.10.9 SECURITY_PATCH=16 SOURCE=$SPELL-$VERSION.tar.bz2 SOURCE2=$SOURCE.asc SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE SOURCE2_URL[0]=${SOURCE_URL[0]}.asc - SOURCE_GPG=4C292FCC.gpg:$SOURCE2:UPSTREAM_KEY + SOURCE_GPG=pidgin.gpg:$SOURCE2:UPSTREAM_KEY SOURCE2_IGNORE=signature SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION WEB_SITE=http://pidgin.sourceforge.net/ diff --git a/chat-im/pidgin/HISTORY b/chat-im/pidgin/HISTORY index 028feef1d5..9d5371a7f9 100644 --- a/chat-im/pidgin/HISTORY +++ b/chat-im/pidgin/HISTORY @@ -1,3 +1,12 @@ +2014-09-25 Remko van der Vossen <wich@sourcemage.org> + * DEPENDS: nspr + +2014-09-23 Pol Vinogradov <vin.public@gmail.com> + * DETAILS: version 2.10.9 + * DEPENDS: farsight2 -> farstream, fixed its flags + * 4C292FCC.gpg: removed + * pidgin.gpg: added new key, A40AB77B, Mark Doliner <mark@kingant.net> + 2013-10-23 Mark Bainter <mbainter@sourcemage.org> * DEPENDS: Pidgin depends on glib2 2.16 or newer diff --git a/chat-im/pidgin/pidgin.gpg b/chat-im/pidgin/pidgin.gpg Binary files differnew file mode 100644 index 0000000000..dd98f71afb --- /dev/null +++ b/chat-im/pidgin/pidgin.gpg diff --git a/chat-irc/hexchat/CONFIGURE b/chat-irc/hexchat/CONFIGURE index 9fe71e02fb..656a3409db 100755 --- a/chat-irc/hexchat/CONFIGURE +++ b/chat-irc/hexchat/CONFIGURE @@ -1,35 +1,46 @@ -config_query_option HEXCHAT_OPTS "Enable threads?" y \ - "--enable-threads=pth" "--disable-theads" && - -config_query_option HEXCHAT_OPTS "Enable IPv6?" n \ - "--enable-ipv6" "--disable-ipv6" && - -config_query_option HEXCHAT_OPTS "Enable use of Xft directly?" n \ - "--enable-xft" "--disable-xft" && - -config_query_option HEXCHAT_OPTS "Enable use of XShm for fast tinting?" n \ - "--enable-shm" "--disable-shm" && +# remove obsolete options from HEXCHAT_OPTS +list_remove HEXCHAT_OPTS '--enable-threads=pth' && +list_remove HEXCHAT_OPTS '--disable-theads' && +list_remove HEXCHAT_OPTS '--enable-xft' && +list_remove HEXCHAT_OPTS '--disable-xft' && +list_remove HEXCHAT_OPTS '--enable-shm' && +list_remove HEXCHAT_OPTS '--disable-shm' && +list_remove HEXCHAT_OPTS '--enable-mmx' && +list_remove HEXCHAT_OPTS '--disable-mmx' && +list_remove HEXCHAT_OPTS '--enable-sasl' && +list_remove HEXCHAT_OPTS '--disable-sasl' && + +config_query_option HEXCHAT_OPTS "Enable IPv6?" y \ + "--enable-ipv6" \ + "--disable-ipv6" && config_query_option HEXCHAT_OPTS "Build the text frontend?" n \ - "--enable-textfe" "--disable-textfe" && + "--enable-textfe" \ + "--disable-textfe" && config_query_option HEXCHAT_OPTS "Enable plugin support?" y \ - "--enable-plugin" "--disable-plugin" && - -config_query_option HEXCHAT_OPTS "Enable checksum plugin?" y \ - "--enable-checksum" "--disable-checksum" && - -config_query_option HEXCHAT_OPTS "Enable Do At plugin?" y \ - "--enable-doat" "--disable-doat" && - -config_query_option HEXCHAT_OPTS "Enable FiSHLiM plugin?" y \ - "--enable-fishlim" "--disable-fishlim" && - -config_query_option HEXCHAT_OPTS "Enable SASL plugin?" y \ - "--enable-sasl" "--disable-sasl" && - -config_query_option HEXCHAT_OPTS "Enable MMX assembly routines?" y \ - "--enable-mmx" "--disable-mmx" && - -config_query_option HEXCHAT_OPTS "enable use of XShm for fast tinting?" n \ - "--enable-mmx" "--disable-mmx" + "--enable-plugin" \ + "--disable-plugin" && + +if list_find "$HEXCHAT_OPTS" "--enable-plugin"; then + config_query_option HEXCHAT_OPTS "Enable checksum plugin?" y \ + "--enable-checksum" \ + "--disable-checksum" && + + config_query_option HEXCHAT_OPTS "Enable Do At plugin?" y \ + "--enable-doat" \ + "--disable-doat" && + + config_query_option HEXCHAT_OPTS "Enable FiSHLiM plugin?" y \ + "--enable-fishlim" \ + "--disable-fishlim" && + + config_query_option HEXCHAT_OPTS "Enable sysinfo plugin?" y \ + "--enable-sysinfo" \ + "--disable-sysinfo" +else + list_add HEXCHAT_OPTS '--disable-checksum' && + list_add HEXCHAT_OPTS '--disable-doat' && + list_add HEXCHAT_OPTS '--disable-fishlim' && + list_add HEXCHAT_OPTS '--disable-sysinfo' +fi diff --git a/chat-irc/hexchat/DEPENDS b/chat-irc/hexchat/DEPENDS index 949d713bad..c9be841ff6 100755 --- a/chat-irc/hexchat/DEPENDS +++ b/chat-irc/hexchat/DEPENDS @@ -1,51 +1,71 @@ -depends glib2 && - -optional_depends gettext \ - "" \ - "--disable-nls" \ - "Enable gettext for i18n?" && - -optional_depends SSL \ - "--enable-SSL=/usr/bin/openssl" \ - "" \ - "Enable use of openSSL?" && - -optional_depends gtk+2 \ - "--enable-gtkfe" \ - "--disable-gtkfe --enable-textfe" \ - "Enable building the gtk frontend" && - -optional_depends python \ - "" \ - "--disable-python" \ - "for Python scripting support" && - -optional_depends perl \ - "" \ - "--disable-perl" \ - "for perl scripting support" && - -optional_depends tcl \ - "--enable-tcl=/usr/lib" \ - "" \ - "for tcl scripting support" && - -optional_depends dbus \ - "" \ - "--disable-dbus" \ - "Enable DBUS support?" && - -optional_depends libnotify \ - "" \ - "--disable-libnotify" \ - "Enable libnotify support?" && - -optional_depends gtkspell \ - "--enable-spell=gtkspell" \ - "" \ - "for spell checker support" && - -optional_depends libsexy \ - "--enable-spell=libsexy" \ - "" \ - "for spell checker support" +depends glib2 && + +optional_depends gettext \ + "--enable-nls" \ + "--disable-nls" \ + "for Native Language Support" && + +optional_depends openssl \ + "--enable-openssl=/usr/bin/openssl" \ + "--disable-openssl" \ + "to enable use of openSSL" && + +optional_depends gtk+2 \ + "--enable-gtkfe" \ + "--disable-gtkfe" \ + "for building gtk frontend" && + +if list_find "$HEXCHAT_OPTS" "--disable-textfe" && ! is_depends_enabled $SPELL gtk+2; then + message "${PROBLEM_COLOR}No frontend selected, aborting...${DEFAULT_COLOR}" && + return 1 +fi && + +if list_find "$HEXCHAT_OPTS" "--enable-plugin"; then + optional_depends python \ + "--enable-python=python2" \ + "--disable-python" \ + "for Python scripting support" && + + optional_depends perl \ + "--enable-perl" \ + "--disable-perl" \ + "for Perl scripting support" +else + list_add HEXCHAT_OPTS '--disable-python' && + list_add HEXCHAT_OPTS '--disable-perl' +fi && + +optional_depends dbus \ + "--enable-dbus" \ + "--disable-dbus" \ + "to enable DBUS support" && + +optional_depends libnotify \ + "--enable-libnotify" \ + "--disable-libnotify" \ + "to enable libnotify support" && + +optional_depends iso-codes \ + "--enable-isocodes" \ + "--disable-isocodes" \ + "for iso-codes with spell-check" && + +optional_depends libcanberra \ + "--enable-libcanberra" \ + "--disable-libcanberra" \ + "for libcanberra support" && + +optional_depends libntlm \ + "--enable-ntlm" \ + "--disable-ntlm" \ + "for Microsoft's NTLM auth library support" && + +optional_depends libproxy \ + "--enable-libproxy" \ + "--disable-libproxy" \ + "for libproxy support" && + +optional_depends monodevelop \ + "--with-theme-manager" \ + "--without-theme-manager" \ + "to compile theme manager" diff --git a/chat-irc/hexchat/DETAILS b/chat-irc/hexchat/DETAILS index 3f8746de62..ccdcdc9296 100755 --- a/chat-irc/hexchat/DETAILS +++ b/chat-irc/hexchat/DETAILS @@ -1,9 +1,12 @@ SPELL=hexchat - VERSION=2.9.1 + VERSION=2.10.1 SOURCE=$SPELL-$VERSION.tar.xz + SOURCE2=$SOURCE.asc + SOURCE_URL[0]=http://dl.hexchat.net/$SPELL/$SOURCE + SOURCE2_URL[0]=$SOURCE_URL.asc SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION" - SOURCE_URL[0]=https://github.com/downloads/$SPELL/$SPELL/$SOURCE - SOURCE_GPG=gurus.gpg:$SOURCE.sig + SOURCE_GPG=hexchat.gpg:$SOURCE2:UPSTREAM_KEY + SOURCE2_IGNORE=signature WEB_SITE=http://www.hexchat.org/ ENTERED=20120909 LICENSE[0]=GPL @@ -11,8 +14,8 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION" SHORT="IRC client for X" cat << EOF HexChat is an IRC chat program. It allows you to join multiple IRC channels -(chat rooms) at the same time, talk publicly, private one-on-one +(chat rooms) at the same time, talk publicly, private one-on-one conversations etc. -HexChat is based on XChat +HexChat is based on XChat. EOF diff --git a/chat-irc/hexchat/HISTORY b/chat-irc/hexchat/HISTORY index 670910e1ce..c9490aa665 100644 --- a/chat-irc/hexchat/HISTORY +++ b/chat-irc/hexchat/HISTORY @@ -1,5 +1,14 @@ -2014-08-19 Treeve Jelbert <treeve@sourcemage.org> - * DEPENDS: openssl => SSL +2014-09-25 Vlad Glagolev <stealth@sourcemage.org> + * DETAILS: updated spell to 2.10.1; converted to upstream signature + checking; cleaned up + * DEPENDS, CONFIGURE: rewritten + * PRE_BUILD: dropped + * INSTALL: corrected plugin header path + * hexchat.gpg: added, 0DE76DFC public key (TingPing + <tingping@fedoraproject.org>) imported + +2014-08-19 Treeve Jelbert <treeve@sourcemage.org> + * DEPENDS: openssl => SSL 2012-09-09 Robin Cook <rcook@wyrms.net> * New Spell: DETAILS, CONFIGURE, DEPENDS, PRE_BUILD, BUILD, INSTALL diff --git a/chat-irc/hexchat/INSTALL b/chat-irc/hexchat/INSTALL index e6227ae78d..8c580617d0 100755 --- a/chat-irc/hexchat/INSTALL +++ b/chat-irc/hexchat/INSTALL @@ -1,3 +1,4 @@ -install -vm 644 plugins/xchat-plugin.h "$INSTALL_ROOT/usr/include" && +# actually it's false +make UPDATE_MIME_DATABASE=true install && -default_install +install -vm 644 "src/common/hexchat-plugin.h" "$INSTALL_ROOT/usr/include" diff --git a/chat-irc/hexchat/PRE_BUILD b/chat-irc/hexchat/PRE_BUILD deleted file mode 100755 index ba99dad79d..0000000000 --- a/chat-irc/hexchat/PRE_BUILD +++ /dev/null @@ -1,4 +0,0 @@ -default_pre_build && -cd ${SOURCE_DIRECTORY} && - -./autogen.sh diff --git a/chat-irc/hexchat/hexchat-2.9.1.tar.xz.sig b/chat-irc/hexchat/hexchat-2.9.1.tar.xz.sig Binary files differdeleted file mode 100644 index 86a676e5d1..0000000000 --- a/chat-irc/hexchat/hexchat-2.9.1.tar.xz.sig +++ /dev/null diff --git a/chat-irc/hexchat/hexchat.gpg b/chat-irc/hexchat/hexchat.gpg Binary files differnew file mode 100644 index 0000000000..48046ede21 --- /dev/null +++ b/chat-irc/hexchat/hexchat.gpg diff --git a/crypto/nss/DEPENDS b/crypto/nss/DEPENDS index e1aaed3986..9a93434e27 100755 --- a/crypto/nss/DEPENDS +++ b/crypto/nss/DEPENDS @@ -1,5 +1,6 @@ depends nspr && depends perl && +depends sqlite && if [[ $NSS_BRANCH == "3.15" || $NSS_BRANCH == "3.16" ]]; then depends zlib fi diff --git a/crypto/nss/DETAILS b/crypto/nss/DETAILS index afe34beee2..9ae7db42c2 100755 --- a/crypto/nss/DETAILS +++ b/crypto/nss/DETAILS @@ -17,9 +17,9 @@ case $NSS_BRANCH in SOURCE=$SPELL-$VERSION.tar.gz ;; 3.16) - VERSION=3.16.4 - SOURCE_HASH=sha512:4c600595c9f9b338d4c3c09d2db12472503d44e15e595f185eae5070003fe0cf53935b526d6bb56f5a5d0cd5c28cc6c39bfb4f6447ae35efe6ce939dce645117 - SECURITY_PATCH=4 + VERSION=3.16.5 + SOURCE_HASH=sha512:687513e2e4ac8139d045a9f4af3440db0dbcd1e8b1834da1a1a3c9f948929c00464b2a6e857bc9f83125df52f30d1ed91786f22fcdf24f148a7ed5cc474f0c75 + SECURITY_PATCH=5 SOURCE=$SPELL-$VERSION.tar.gz ;; esac diff --git a/crypto/nss/HISTORY b/crypto/nss/HISTORY index f68c4a3c9d..1bb252233a 100644 --- a/crypto/nss/HISTORY +++ b/crypto/nss/HISTORY @@ -1,3 +1,9 @@ +2014-09-25 Remko van der Vossen <wich@sourcemage.org> + * DEPENDS: sqlite + +2014-09-25 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> + * DETAILS: version 3.16.5, SECURITY_PATCH++ + 2014-09-03 Ladislav Hagara <hgr@vabo.cz> * DETAILS: 3.16.4 diff --git a/database/leveldb/BUILD b/database/leveldb/BUILD new file mode 100755 index 0000000000..8f58e6df93 --- /dev/null +++ b/database/leveldb/BUILD @@ -0,0 +1 @@ +make diff --git a/database/leveldb/DEPENDS b/database/leveldb/DEPENDS new file mode 100755 index 0000000000..68614d1f55 --- /dev/null +++ b/database/leveldb/DEPENDS @@ -0,0 +1,8 @@ +optional_depends google-perftools \ + "" \ + "" \ + "for tcmalloc" && +optional_depends snappy \ + "" \ + "" \ + "compress data using snappy" diff --git a/database/leveldb/DETAILS b/database/leveldb/DETAILS new file mode 100755 index 0000000000..b793cd6352 --- /dev/null +++ b/database/leveldb/DETAILS @@ -0,0 +1,25 @@ +. "$GRIMOIRE/FUNCTIONS" + SPELL=leveldb + LIBVER=1.17 +if [ "${LEVELDB_BRANCH}" == "scm" ]; then + VERSION=$(get_scm_version) + SOURCE=${SPELL}-${LEVELDB_BRANCH}.tar.bz2 +SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${LEVELDB_BRANCH} + FORCE_DOWNLOAD=on + SOURCE_URL[0]=git://github.com/google/${SPELL}.git + SOURCE_IGNORE=volatile +else + VERSION=1.17 + SOURCE="${SPELL}-${VERSION}.tar.gz" + SOURCE_URL[0]=https://github.com/google/${SPELL}/archive/v${VERSION}.tar.gz + SOURCE_HASH=sha512:8bd279078d421ae4bbca6031680764957ad19be356eb186a686fa62869ad64635764ca1d421a2bb1d747349faea415355101c88e5455bde8827f631aa6c7f711 +SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}" +fi + WEB_SITE="http://code.google.com/p/leveldb/" + LICENSE[0]=BSD3 + ENTERED=20140915 + SHORT="fast key-value storage library" +cat << EOF +LevelDB is a fast key-value storage library written at Google that provides +an ordered mapping from string keys to string values. +EOF diff --git a/database/leveldb/HISTORY b/database/leveldb/HISTORY new file mode 100644 index 0000000000..bcb9733841 --- /dev/null +++ b/database/leveldb/HISTORY @@ -0,0 +1,3 @@ +2014-09-15 Jeremy Blosser <jblosser@sourcemage.org> + * PREPARE, BUILD, DEPENDS, DETAILS, INSTALL: spell created + diff --git a/database/leveldb/INSTALL b/database/leveldb/INSTALL new file mode 100755 index 0000000000..546691819f --- /dev/null +++ b/database/leveldb/INSTALL @@ -0,0 +1,11 @@ +install -m 755 -d ${INSTALL_ROOT}/usr/include/leveldb && +install -m 644 ./include/leveldb/* ${INSTALL_ROOT}/usr/include/leveldb/ && + +install -m 644 libleveldb.a ${INSTALL_ROOT}/usr/lib/ && +install -m 755 libleveldb.so.${LIBVER} ${INSTALL_ROOT}/usr/lib/ && +ldconfig && + +pushd ${INSTALL_ROOT}/usr/lib && +ln -sfn libleveldb.so.${LIBVER} libleveldb.so.1 && +ln -sfn libleveldb.so.${LIBVER} libleveldb.so && +popd diff --git a/database/leveldb/PREPARE b/database/leveldb/PREPARE new file mode 100755 index 0000000000..98d27e41ff --- /dev/null +++ b/database/leveldb/PREPARE @@ -0,0 +1,2 @@ +. ${GRIMOIRE}/FUNCTIONS && +prepare_select_branch stable scm diff --git a/database/postgresql/DEPENDS b/database/postgresql/DEPENDS index 7f0ac69e9a..ab8a949e71 100755 --- a/database/postgresql/DEPENDS +++ b/database/postgresql/DEPENDS @@ -44,8 +44,8 @@ optional_depends readline \ "for Readline support in psql, the command line interface" && optional_depends SSL \ - "--with-opennssl" \ - "--without-opennssl" \ + "--with-openssl" \ + "--without-openssl" \ "for SSL (encrypted) connection support" && optional_depends libxml2 \ diff --git a/database/postgresql/DETAILS b/database/postgresql/DETAILS index 94a1bb6c65..76bca98899 100755 --- a/database/postgresql/DETAILS +++ b/database/postgresql/DETAILS @@ -1,18 +1,10 @@ SPELL=postgresql - VERSION=9.3.4 + VERSION=9.3.5 SOURCE=$SPELL-$VERSION.tar.bz2 - SOURCE_HASH=sha512:acf4605216e9b4b48531bc23e152f1f80476a5feea3004a98fe720a16f10c70cc01940d28af236e079c2a3eee42d6b02ae651269f876eb44346983edfa69e0c4 + SOURCE_HASH=sha512:a49bc8ea7635be5082044f5ebd6b81de7198583aedb072dffec8425521af90f2cb8e9f6e7b55b361ff24cbebc0670afefe365e8f5b80b8248ddf492b8092a746 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION" SOURCE_URL[0]=ftp://ftp.postgresql.org/pub/source/v$VERSION/$SOURCE SOURCE_URL[1]=ftp://ftp9.de.postgresql.org/unix/databases/postgresql/source/v${VERSION}/${SOURCE} - -if [[ $PGSQL_CLUSTER == y ]]; then - CLUSTER_VERSION=1.9.0rc5 - SOURCE2=pgcluster-$CLUSTER_VERSION-patch.tar.gz - SOURCE2_URL[0]=http://pgfoundry.org/frs/download.php/1706/$SOURCE2 - SOURCE2_HASH=sha512:df328505fee683051642850bade5932595184d3af8db6d47663d8c6e5fec5dc62256390ead83a2fa719efe212f8a44350f57cb4f1361bde63b2227e5cc13e927 -fi - WEB_SITE=http://www.postgresql.org/ GATHER_DOCS=off SECURITY_PATCH=14 diff --git a/database/postgresql/HISTORY b/database/postgresql/HISTORY index 50a6faf476..4440861bc4 100644 --- a/database/postgresql/HISTORY +++ b/database/postgresql/HISTORY @@ -1,8 +1,15 @@ -2014-08-24 Treeve Jelbert <treeve@sourcemage.org> - * DEPENDS: fix bad with-SSL usage - -2014-08-19 Treeve Jelbert <treeve@sourcemage.org> - * DEPENDS: openssl => SSL +2014-09-05 Vlad Glagolev <stealth@sourcemage.org> + * DETAILS: updated spell to 9.3.5; removed unsupported PGCluster + patch + * PREPARE: complete deprecation + * DEPENDS: fixed SSL flags + * PRE_BUILD: removed + +2014-08-24 Treeve Jelbert <treeve@sourcemage.org> + * DEPENDS: fix bad with-SSL usage + +2014-08-19 Treeve Jelbert <treeve@sourcemage.org> + * DEPENDS: openssl => SSL 2014-03-21 Vlad Glagolev <stealth@sourcemage.org> * DETAILS: updated spell to 9.3.4 diff --git a/database/postgresql/PREPARE b/database/postgresql/PREPARE index 721679d5a1..9718817edc 100755 --- a/database/postgresql/PREPARE +++ b/database/postgresql/PREPARE @@ -1,8 +1,3 @@ -config_query PGSQL_CLUSTER "Do you want to apply the PGCluster patch?" n && - -if [[ $PGSQL_CLUSTER == y ]]; then - message "${PROBLEM_COLOR}" - message "Keep in mind that PGCluster patch and current" - message "PostgreSQL version aren't always in sync." - message "${DEFAULT_COLOR}" +if [[ -v PGSQL_CLUSTER ]]; then + persistent_remove PGSQL_CLUSTER fi diff --git a/database/postgresql/PRE_BUILD b/database/postgresql/PRE_BUILD deleted file mode 100755 index 2f70e1b64c..0000000000 --- a/database/postgresql/PRE_BUILD +++ /dev/null @@ -1,7 +0,0 @@ -default_pre_build && -cd "$SOURCE_DIRECTORY" && - -if [[ $PGSQL_CLUSTER == y ]]; then - verify_file 2 && - zcat "$SOURCE_CACHE/$SOURCE2" | patch -p1 -fi diff --git a/devel/bmake/BUILD b/devel/bmake/BUILD new file mode 100755 index 0000000000..d660b07f55 --- /dev/null +++ b/devel/bmake/BUILD @@ -0,0 +1,3 @@ +make_single && +prefix=/usr default_build && +make_normal diff --git a/devel/bmake/DETAILS b/devel/bmake/DETAILS new file mode 100755 index 0000000000..8f0d94f821 --- /dev/null +++ b/devel/bmake/DETAILS @@ -0,0 +1,16 @@ + SPELL=bmake + VERSION=20140620 + SOURCE="${SPELL}-${VERSION}.tar.gz" + SOURCE_URL[0]=http://ftp.netbsd.org/pub/NetBSD/misc/sjg/${SOURCE} + SOURCE_HASH=sha512:c25ff8e0296599c558f88abd6619db361fefff3e560e8aa31bdd169ad6dcb780b4faf7867ed392f319af189fd2b8e833a6e345785f801c823279f90ce625dc8c +SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}" + WEB_SITE="http://crufty.net/help/sjg/bmake.html" + LICENSE[0]="BSD" + ENTERED=20140909 + KEYWORDS="" + SHORT="Portable version of NetBSD make" +cat << EOF +Bmake is derived from NetBSD's make(1), its goal is to be a portable version +of same, so new features are added via imports of NetBSD's make. Thus bmake +is kept in sync with NetBSD's make. +EOF diff --git a/devel/bmake/HISTORY b/devel/bmake/HISTORY new file mode 100644 index 0000000000..771e9bbbba --- /dev/null +++ b/devel/bmake/HISTORY @@ -0,0 +1,5 @@ +2014-09-10 Ismael Luceno <ismael@sourcemage.org> + * BUILD: Fix system search path + +2014-09-09 Ismael Luceno <ismael@sourcemage.org> + * BUILD, DETAILS, INSTALL: spell created diff --git a/devel/bmake/INSTALL b/devel/bmake/INSTALL new file mode 100755 index 0000000000..9d9a4c08fc --- /dev/null +++ b/devel/bmake/INSTALL @@ -0,0 +1,3 @@ +make_single && +default_install && +make_normal diff --git a/devel/cmake/DETAILS b/devel/cmake/DETAILS index 750be4718b..e878e75b6c 100755 --- a/devel/cmake/DETAILS +++ b/devel/cmake/DETAILS @@ -1,6 +1,6 @@ SPELL=cmake - VERSION=3.0.1 - SOURCE_HASH=sha512:2ac7f0f37664f851fa440af05ea070a606a6f994bda3d977d3881dee207ba7ccbd3c9f296db7cfff492d3a7b5a6694c91e56896114f622305e8bdb6dbbff6407 + VERSION=3.0.2 + SOURCE_HASH=sha512:de267bd6c5b318e48fae64c28947de009fb2413bdc6b4454b5e4bbb7d50b78aaef5d7e9d9655cfb9299aa5704fd3e4bbabc6816d3f378f76856f56ab161efe02 VX=v`echo $VERSION|cut -c-3` SOURCE=$SPELL-$VERSION.tar.gz SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION diff --git a/devel/cmake/HISTORY b/devel/cmake/HISTORY index f7ea97a540..b13083bd86 100644 --- a/devel/cmake/HISTORY +++ b/devel/cmake/HISTORY @@ -1,3 +1,6 @@ +2014-09-12 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 3.0.2 + 2014-08-10 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 3.0.1 diff --git a/devel/cobra/BUILD b/devel/cobra/BUILD new file mode 100755 index 0000000000..27ba77ddaf --- /dev/null +++ b/devel/cobra/BUILD @@ -0,0 +1 @@ +true diff --git a/devel/cobra/DEPENDS b/devel/cobra/DEPENDS new file mode 100755 index 0000000000..78057dd1b9 --- /dev/null +++ b/devel/cobra/DEPENDS @@ -0,0 +1 @@ +depends mono diff --git a/devel/cobra/DETAILS b/devel/cobra/DETAILS new file mode 100755 index 0000000000..4f1ccbeb2b --- /dev/null +++ b/devel/cobra/DETAILS @@ -0,0 +1,64 @@ + SPELL=cobra + VERSION=0.9.6 + SOURCE="Cobra-${VERSION}.tar.gz" + SOURCE_URL[0]=http://${SPELL}-language.com/downloads/${SOURCE} + SOURCE_HASH=sha512:9fbf5ffb35db3895d74176013f023e6f3c390bc0208a6e02aed6f9f168a85f03b85026452ffe03354b502682803479fb49e429ab3411cf40e477f813d87caf52 +SOURCE_DIRECTORY="${BUILD_DIRECTORY}/Cobra-${VERSION}" + WEB_SITE="http://cobra-language.com/" + LICENSE[0]="MIT" + ENTERED=20140913 + KEYWORDS="" + SHORT="Cobra Programming Language" +cat << EOF +$SHORT + +There are plenty of object-oriented programming languages in existence +including C#, Python and Ruby. So why use Cobra? This document addresses +that question. + +Right now, if you want software contracts in your language, how can you +get them? The answer is to use Eiffel or D. What if you want static and +dynamic binding? Use Objective-C or Boo. What if you want expressiveness +and quick coding? Use Python, Ruby or Smalltalk. What if you want runtime +performance? Use C#, Java, C++, etc. What if you want first class language +support for unit tests? Use D. + +But what if you want all of those? ... You can't get them! And that's +frustrating because none of those productivity-boosting features are +incompatible with each other. You shouldn't have to choose between C++'s +speed, Python's expressiveness and Eiffel's contracts. There's no theoretical +reason that you can't have it all. There's "just" a lot of work required to +make it happen. + +One way to characterize Cobra is with these high level points: + +* Quick, expressive coding +* Fast execution +* Static and dynamic binding +* Language level support for quality + +Cobra achieves 1 by following Python and Ruby (but not religiously). It +achieves 2 by favoring static typing ("i = 5" means "i" is an integer and +always will be) and leveraging .NET|Mono for machine code generation. It +does 3 by using the .NET typing system at compile-time for static types, +and using the .NET run-time for dynamic binding. It takes language features +for 4 from multiple sources including Eiffel, Python and its own compile-time +nil tracking. + +There are additional refinements in Cobra such as defaulting to accurate +decimal math and providing detailed postmortem exception reports. + +So the "what's new" in Cobra is not the individual elements such as contracts, +classes, etc. It's the combination of everything that goes into it. Consider +what would happen if you were coding in Cobra, then switched to another +language: + + If moving from Cobra to Python, you would give up optional static typing, + contracts, compile-time nil tracking, closures and more. If moving from + Cobra to C#, you would give up native contracts, clean collection literals, + expressive syntax, uniform compile-time nil tracking, mixins and more. + +Note that Cobra has few new elements because it was never intended to be +experimental. It's a practical synthesis of already-proven features that +are currently scattered across multiple languages. +EOF diff --git a/devel/cobra/HISTORY b/devel/cobra/HISTORY new file mode 100644 index 0000000000..fe85096b16 --- /dev/null +++ b/devel/cobra/HISTORY @@ -0,0 +1,2 @@ +2014-09-13 Ismael Luceno <ismael@sourcemage.org> + * BUILD, DEPENDS, DETAILS, INSTALL: spell created diff --git a/devel/cobra/INSTALL b/devel/cobra/INSTALL new file mode 100755 index 0000000000..0a75f685d3 --- /dev/null +++ b/devel/cobra/INSTALL @@ -0,0 +1,16 @@ +INSTDIR="$INSTALL_ROOT/usr/lib" +DOCDIR="$INSTALL_ROOT/usr/share/doc/cobra-$VERSION" + +# FIXME: Do the installation manually, it's a mess +mkdir -p "$DOCDIR" && +cd "$SOURCE_DIRECTORY/Source" && +echo "$INSTDIR" > install-directory.text && +bin/install-from-workspace && +cp -r ../*.text ../Developer "$DOCDIR" && +# Fix up the rest of the documentation +for i in HowTo Reusables Samples Supplements; do + mv "$INSTDIR/Cobra-$VERSION/$i" "$DOCDIR" +done && +# Move the wrapper +mv "$INSTDIR/bin/cobra" "$INSTALL_ROOT/usr/bin" && +rmdir "$INSTDIR/bin" diff --git a/devel/elfkickers/BUILD b/devel/elfkickers/BUILD new file mode 100755 index 0000000000..8f58e6df93 --- /dev/null +++ b/devel/elfkickers/BUILD @@ -0,0 +1 @@ +make diff --git a/devel/elfkickers/DETAILS b/devel/elfkickers/DETAILS new file mode 100755 index 0000000000..c46e9def52 --- /dev/null +++ b/devel/elfkickers/DETAILS @@ -0,0 +1,47 @@ + SPELL=elfkickers + SPELLX=ELFkickers + VERSION=3.0a + SOURCE="$SPELLX-$VERSION.tar.gz" + SOURCE_URL[0]=http://www.muppetlabs.com/~breadbox/pub/software/$SOURCE + SOURCE_HASH=sha512:c90a763e5b60069f9cb67fd5c114da753184ff466c3db1dd9a44e86de9408a4384a3ac00a8c67191ca9a6556fd0db11058542361e987710f9b5bedabaec2717c +SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION" + WEB_SITE="http://www.muppetlabs.com/~breadbox/software/$SPELL.html" + LICENSE[0]="GPLv2+" + ENTERED=20140916 + KEYWORDS="" + SHORT="Kickers of ELF" +cat << EOF +This distribution is a collection of programs that are generally unrelated, +except in that they all deal with ELF files. + +The main purpose of these programs is to be illustrative and educational -- +to help fellow programmers understand ELF files and something of how they +work under the Linux platform. + +Each program is independent. There is very little shared code between them, +and in fact they all take slightly different approaches to handling ELF files. + +The distribution includes: + +* sstrip: a small utility that removes a few bytes from an executable + that strip leaves behind. + +* objres: a "compiler" for including arbitrary binary resources in object + files. + +* elftoc: a program that takes an ELF file and generates C code that defines a + struct with the same memory image, using the structs and preprocessor + symbols defined in <elf.h>. + +* elfls: a utility that displays an ELF file's program and/or section header + tables, which serve as a kind of global roadmap to the file's contents. + +* rebind: a small utility that alters the binding of selected symbols in an + object file. + +* ebfc: a compiler for a tiny programming language. The compiler can generate + ELF executables, object files, and shared libraries. + +* infect: an example of how to modify an executable without affecting its + original program. +EOF diff --git a/devel/elfkickers/HISTORY b/devel/elfkickers/HISTORY new file mode 100644 index 0000000000..d7ca4ded71 --- /dev/null +++ b/devel/elfkickers/HISTORY @@ -0,0 +1,2 @@ +2014-09-16 Ismael Luceno <ismael@sourcemage.org> + * BUILD, DETAILS, INSTALL: spell created diff --git a/devel/elfkickers/INSTALL b/devel/elfkickers/INSTALL new file mode 100755 index 0000000000..4e76028c2e --- /dev/null +++ b/devel/elfkickers/INSTALL @@ -0,0 +1 @@ +make prefix=/usr install diff --git a/devel/extra-cmake-modules/DETAILS b/devel/extra-cmake-modules/DETAILS index 2abdfdebf6..1272ae39af 100755 --- a/devel/extra-cmake-modules/DETAILS +++ b/devel/extra-cmake-modules/DETAILS @@ -1,7 +1,7 @@ SPELL=extra-cmake-modules - VERSION=1.1.0 - VX=5.1.0 - SOURCE_HASH=sha512:76947a9ea76611e5f3593b5e60d0f2e102459d6fa85c8e7e21371bcc6d513372dfccd01c9eb021d75f9782942612d27c7ebc97c978838329c1505e2792794353 + VERSION=1.2.1 + VX=5.2.0 + SOURCE_HASH=sha512:48e8b5051f91ebf6643e381dd4d98fdcaca2d029894184ad5e984f175a8e2a6a6f0616755c87daca08093d2c911646e0d48c391df4e9ec93f20dc23d81ab6f99 SOURCE=$SPELL-$VERSION.tar.xz SOURCE_URL=$KDE_URL/stable/frameworks/$VX/$SOURCE SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION diff --git a/devel/extra-cmake-modules/HISTORY b/devel/extra-cmake-modules/HISTORY index 09f6ce3f43..063c2070ab 100644 --- a/devel/extra-cmake-modules/HISTORY +++ b/devel/extra-cmake-modules/HISTORY @@ -1,3 +1,6 @@ +2014-09-16 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 1.2.1 + 2014-08-10 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 1.1.0 diff --git a/devel/go/DEPENDS b/devel/go/DEPENDS index 3b4ed5b7a3..6f28c8d8b3 100755 --- a/devel/go/DEPENDS +++ b/devel/go/DEPENDS @@ -2,6 +2,6 @@ depends SYSTEM-LOGGER && depends mercurial && depends bison && depends gcc && -depends gawk && +depends AWK && depends ed && depends make diff --git a/devel/graphviz/DEPENDS b/devel/graphviz/DEPENDS index 7f8110348e..29281e9961 100755 --- a/devel/graphviz/DEPENDS +++ b/devel/graphviz/DEPENDS @@ -1,23 +1,44 @@ -depends autoconf && -depends automake && -depends zlib && -depends libpng && -depends libxaw && -depends bison && -depends flex && -depends groff && -depends libtool && -depends JPEG && -depends intltool && -depends glib2 && -depends expat && -depends gettext && - -# for ps2pdf -depends POSTSCRIPT-INTERPRETER && - +depends atk && +depends autoconf && +depends automake && +depends bison && +depends expat && +depends flex && # use external GD so that graphviz doesn't install its own depends gd '--without-mylibgd' && +depends gettext && +depends glib2 && +depends groff && +depends harfbuzz && +depends icu && +depends intltool && +depends jasper && +depends JPEG && +depends libcroco && +depends libffi && +depends libice && +depends libpng && +depends libpthread-stubs && +depends librsvg2 && +depends libsm && +depends libtool && +depends libx11 && +depends libxau && +depends libxaw && +depends libxcb && +depends libxdmcp && +depends libxext && +depends libxml2 && +depends libxmu && +depends libxpm && +depends libxrender && +depends libxt && +depends LZMA && +depends pcre && +depends pixman && +# for ps2pdf +depends POSTSCRIPT-INTERPRETER && +depends zlib && # not listed in 'configure --help' but nevertheless processed optional_depends PHP '--enable-php' '--disable-php' 'for PHP bindings' && @@ -62,13 +83,17 @@ optional_depends pango \ "--enable-pangocairo" \ "--with-mylibgd=yes --with-pangocairo=no" \ "Use pangocairo library?" && - -if is_depends_enabled $SPELL pango; then depends -sub SVG cairo; fi && +if is_depends_enabled $SPELL pango; then + depends -sub SVG cairo; +fi && optional_depends gtk+2 \ "--with-gtk --with-gdk-pixbuf" \ "--without-gtk --without-gdk-pixbuf" \ "Use GTK+2 libraries?" && +if is_depends_enabled $SPELL gtk+2; then + depends gdk-pixbuf2 +fi && optional_depends libgnomeui \ "--with-gnomeui" \ @@ -79,25 +104,12 @@ optional_depends gtkglext \ "--with-gtkglext" \ "--without-gtkglext" \ "OpenGL support" && +if is_depends_enabled $SPELL gtkglext; then + depends OPENGL +fi && + optional_depends "ghostscript" \ "--with-ghostscript=yes" \ "--with-ghostscript=no" \ "support for postscript" -depends atk && -if is_depends_enabled $SPELL gtk+2; then - depends gdk-pixbuf2 -fi && -depends harfbuzz && -depends jasper && -depends libice && -depends librsvg2 && -depends libsm && -depends libx11 && -depends libxml2 && -depends libxmu && -depends libxpm && -depends libxrender && -depends libxt && -depends pixman && -depends LZMA diff --git a/devel/graphviz/HISTORY b/devel/graphviz/HISTORY index eceb25edc3..5a298ece73 100644 --- a/devel/graphviz/HISTORY +++ b/devel/graphviz/HISTORY @@ -1,3 +1,6 @@ +2014-09-09 Remko van der Vossen <wich@sourcemage.org> + * DEPENDS: added missing dependencies + 2014-02-10 Tommy Boatman <tboatman@sourcemage.org> * DETAILS: 2.36.0 diff --git a/devel/make/HISTORY b/devel/make/HISTORY index a8157b3dff..f13edcb6cf 100644 --- a/devel/make/HISTORY +++ b/devel/make/HISTORY @@ -1,3 +1,6 @@ +2014-09-23 Ismael Luceno <ismael@sourcemage.org> + * INSTALL: Install gmake symlink + 2013-10-12 Treeve Jelbert <treeve@sourcemage.org> * DEPENDS: add optional guile diff --git a/devel/make/INSTALL b/devel/make/INSTALL index 64f3354f14..23b4300a20 100755 --- a/devel/make/INSTALL +++ b/devel/make/INSTALL @@ -1,2 +1,3 @@ make install DESTDIR=$INSTALL_ROOT && +ln -s make ${INSTALL_ROOT}/usr/bin/gmake && chmod a-s ${INSTALL_ROOT}/usr/bin/make diff --git a/devel/mawk/CONFIGURE b/devel/mawk/CONFIGURE new file mode 100755 index 0000000000..31cf3fe46a --- /dev/null +++ b/devel/mawk/CONFIGURE @@ -0,0 +1 @@ +config_query MAWK_DEF "Use $SPELL as the primary AWK interpreter on the system?" y diff --git a/devel/mawk/HISTORY b/devel/mawk/HISTORY index a89f216cc6..07eb8530eb 100644 --- a/devel/mawk/HISTORY +++ b/devel/mawk/HISTORY @@ -1,2 +1,6 @@ +2014-09-09 Ismael Luceno <ismael@sourcemage.org> + * PROVIDES: Provide AWK + * CONFIGURE, INSTALL: Let the user choose the primary AWK implementation + 2014-08-31 Ismael Luceno <ismael@sourcemage.org> * BUILD, DETAILS: spell created diff --git a/devel/mawk/INSTALL b/devel/mawk/INSTALL new file mode 100755 index 0000000000..a8cc99cb17 --- /dev/null +++ b/devel/mawk/INSTALL @@ -0,0 +1,4 @@ +default_install && +if [ "$MAWK_DEF" = y ]; then + ln -sf "$SPELL" "$INSTALL_ROOT"/bin/awk +fi diff --git a/devel/mawk/PROVIDES b/devel/mawk/PROVIDES new file mode 100644 index 0000000000..37a9c1ca2c --- /dev/null +++ b/devel/mawk/PROVIDES @@ -0,0 +1 @@ +AWK diff --git a/devel/mk-configure/BUILD b/devel/mk-configure/BUILD new file mode 100755 index 0000000000..a9ea826e67 --- /dev/null +++ b/devel/mk-configure/BUILD @@ -0,0 +1,2 @@ +cd "$SOURCE_DIRECTORY" && +bmake PREFIX=/usr SYSCONFDIR=/etc diff --git a/devel/mk-configure/DEPENDS b/devel/mk-configure/DEPENDS new file mode 100755 index 0000000000..0c0809542e --- /dev/null +++ b/devel/mk-configure/DEPENDS @@ -0,0 +1 @@ +depends bmake diff --git a/devel/mk-configure/DETAILS b/devel/mk-configure/DETAILS new file mode 100755 index 0000000000..45518ce550 --- /dev/null +++ b/devel/mk-configure/DETAILS @@ -0,0 +1,16 @@ + SPELL=mk-configure + VERSION=0.27.0 + SOURCE="$SPELL-$VERSION.tar.gz" + SOURCE_URL[0]="http://sourceforge.net/projects/$SPELL/files/$SPELL/$SPELL-$VERSION/$SOURCE" + SOURCE_HASH=sha512:faa1dbadf875a238e4e5377e9185f5c015571f3adfd2168439d840ea1e6ebdfd82114ce5b223ef97406015a9a41457cb7dda1610ec963edc27c0adc36987d450 +SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION" + WEB_SITE="http://sourceforge.net/projects/$SPELL/" + LICENSE[0]="BSD" + ENTERED=20140909 + KEYWORDS="" + SHORT="Lightweight replacement for autotools" +cat << EOF +mk-configure is a lightweight easy for use replacement for GNU autotools, +written in bmake (portable version of NetBSD make) and POSIX tools (shell, +awk etc.). +EOF diff --git a/devel/mk-configure/HISTORY b/devel/mk-configure/HISTORY new file mode 100644 index 0000000000..ebb05a253c --- /dev/null +++ b/devel/mk-configure/HISTORY @@ -0,0 +1,2 @@ +2014-09-09 Ismael Luceno <ismael@sourcemage.org> + * BUILD, DEPENDS, DETAILS, INSTALL: spell created diff --git a/devel/mk-configure/INSTALL b/devel/mk-configure/INSTALL new file mode 100755 index 0000000000..e46fa6dcfd --- /dev/null +++ b/devel/mk-configure/INSTALL @@ -0,0 +1,2 @@ +cd "$SOURCE_DIRECTORY" && +bmake DESTDIR="$INSTALL_ROOT" PREFIX=/usr SYSCONFDIR=/etc install diff --git a/devel/mono/DETAILS b/devel/mono/DETAILS index 83deebe3fc..ee0ea27a44 100755 --- a/devel/mono/DETAILS +++ b/devel/mono/DETAILS @@ -5,13 +5,12 @@ if [[ "${MONO_TRUNK}" = 'y' ]]; then SOURCE_URL=http://mono.ximian.com/monobuild/snapshot/snapshot_sources/mono/${SOURCE} SOURCE_HASH=sha512:2067ee108f15610ea11c515fba67625995f5136c8888d21a1ef9417320538f5e46cc39c19c351873b5c126170bc23f21f042b544575506ca4c454beda4b8438a else - VERSION=2.10.2 + VERSION=2.11.4 SECURITY_PATCH=1 SOURCE=${SPELL}-${VERSION}.tar.bz2 - SOURCE_URL=ftp://ftp.novell.com/pub/mono/sources/${SPELL}/${SOURCE} - SOURCE_HASH=sha512:500660a70cef15fc79d626cd2ec44023476a02f46dcc0d9df18e0791816466e48396ff109773b8cdd90e76a484f9f1ba25e7439d70c897ae9443e63fb32d5c10 + SOURCE_URL=http://download.mono-project.com/sources/${SPELL}/${SOURCE} + SOURCE_HASH=sha512:e196686637be91b782a9ff4d42098a361eaf00b6de1b18796a7390b2e55f04f6d05b3c055b302b5a72940597cbde5f75e94a8e8c4530300d3303c84fb021dfda fi - SOURCE=${SPELL}-${VERSION}.tar.bz2 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION} WEB_SITE=http://www.mono-project.com ENTERED=20020625 diff --git a/devel/mono/HISTORY b/devel/mono/HISTORY index bbbe955a6d..d8e51eb1d7 100644 --- a/devel/mono/HISTORY +++ b/devel/mono/HISTORY @@ -1,3 +1,7 @@ +2014-09-13 Ismael Luceno <ismael@sourcemage.org> + * DETAILS: Fixed SOURCE_URL[0] + updated MONO_TRUNK=n to 2.11.4 + 2011-05-03 Ladislav Hagara <hgr@vabo.cz> * DETAILS: 2.10.2 diff --git a/devel/python/DEPENDS b/devel/python/DEPENDS index b8edce6f6a..aa87f6bffc 100755 --- a/devel/python/DEPENDS +++ b/devel/python/DEPENDS @@ -1,3 +1,5 @@ +depends gettext && + optional_depends gdbm "" "" "gnu db support(old)" && optional_depends db "" "" "for Sleepycat db support" && optional_depends sqlite "" "" "for SQLite db support" && diff --git a/devel/python/HISTORY b/devel/python/HISTORY index df556e432b..a6a8b02521 100644 --- a/devel/python/HISTORY +++ b/devel/python/HISTORY @@ -1,3 +1,6 @@ +2014-09-25 Remko van der Vossen <wich@sourcemage.org> + * DEPENDS: depends gettext + 2014-08-19 Treeve Jelbert <treeve@sourcemage.org> * DEPENDS: openssl => SSL diff --git a/devel/runawk/BUILD b/devel/runawk/BUILD new file mode 100755 index 0000000000..c01537d9be --- /dev/null +++ b/devel/runawk/BUILD @@ -0,0 +1,2 @@ +cd "$SOURCE_DIRECTORY" && +mkcmake PREFIX=/usr diff --git a/devel/runawk/DEPENDS b/devel/runawk/DEPENDS new file mode 100755 index 0000000000..0f190be7c0 --- /dev/null +++ b/devel/runawk/DEPENDS @@ -0,0 +1,3 @@ +depends AWK && +depends bmake && +depends mk-configure diff --git a/devel/runawk/DETAILS b/devel/runawk/DETAILS new file mode 100755 index 0000000000..c2d8cfffd6 --- /dev/null +++ b/devel/runawk/DETAILS @@ -0,0 +1,19 @@ + SPELL=runawk + VERSION=1.5.1 + SOURCE="$SPELL-$VERSION.tar.gz" + SOURCE_URL[0]="http://sourceforge.net/projects/$SPELL/files/$SPELL/$SPELL-$VERSION/$SOURCE" + SOURCE_HASH=sha512:dc8f156836c682fd00317a3c7202f57a9b04403e2fc9a45f1fe6aa7c99af2b9b4d72f6f16d73cd133168596ea002773bcbcce301a9090478b68a6503c30b22cb +SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION" + WEB_SITE="http://sourceforge.net/projects/$SPELL/" + LICENSE[0]="MIT" + ENTERED=20140909 + KEYWORDS="" + SHORT="Wrapper for AWK providing modules" +cat << EOF +RunAWK is a small wrapper for AWK interpreter that helps write standalone +programs in AWK. It provides support for modules and other powerful +features. It comes with dozens of modules which provide efficient means for +handling command line options, powerful functions for manipulating strings +and arrays as well as sorting, mathematical, tmpfile, braceexpand functions +and a lot of others. +EOF diff --git a/devel/runawk/HISTORY b/devel/runawk/HISTORY new file mode 100644 index 0000000000..ebb05a253c --- /dev/null +++ b/devel/runawk/HISTORY @@ -0,0 +1,2 @@ +2014-09-09 Ismael Luceno <ismael@sourcemage.org> + * BUILD, DEPENDS, DETAILS, INSTALL: spell created diff --git a/devel/runawk/INSTALL b/devel/runawk/INSTALL new file mode 100755 index 0000000000..6e4799794d --- /dev/null +++ b/devel/runawk/INSTALL @@ -0,0 +1,2 @@ +cd "$SOURCE_DIRECTORY" && +mkcmake DESTDIR="$INSTALL_ROOT" PREFIX=/usr install diff --git a/devel/swig/DEPENDS b/devel/swig/DEPENDS index 948e0155ad..a97967923b 100755 --- a/devel/swig/DEPENDS +++ b/devel/swig/DEPENDS @@ -1,54 +1,14 @@ -depends -sub CXX gcc && - -optional_depends tcl \ - "--with-tcl" \ - "--without-tcl" \ - "to include Tcl/Tk support" && - -optional_depends lua51 \ - "--with-lua" \ - "--without-lua" \ - "include lua51 support" && - -optional_depends ocaml \ - "--with-ocaml" \ - "--without-ocaml" \ - "include Ocaml support" && - -optional_depends python \ - "--with-python=$INSTALL_ROOT/usr/bin/python" \ - "--without-python" \ - "to include Python 2 support" && - -optional_depends python3 \ - "--with-python3=$INSTALL_ROOT/usr/bin/python3" \ - "--without-python3" \ - "to include Python 3 support" && - -optional_depends perl \ - "--with-perl=$INSTALL_ROOT/usr/bin/perl" \ - "--without-perl" \ - "to include Perl 5 support" && - -optional_depends php \ - "--with-php4=$INSTALL_ROOT/usr/bin/php" \ - "--without-php4" \ - "to include PHP 4 support (NOTE: problematic now)" && - -optional_depends RUBY \ - "--with-ruby=$INSTALL_ROOT/usr/bin/ruby" \ - "--without-ruby" \ - "to include Ruby support" && - -optional_depends JAVA \ - '--with-java' \ - '--without-java' \ - 'to include Java support' \ - 'z-rejected' && - -optional_depends guile \ - "--with-guile=$INSTALL_ROOT/usr/bin/guile" \ - "--without-guile" \ - "to include Guile support" && - -optional_depends pcre "" "--without-pcre" "for regular expression support" +depends -sub CXX gcc && +depends zlib && + +optional_depends guile "--with-guile" "--without-guile" "Guile support" && +optional_depends JAVA '--with-java' '--without-java' 'Java support' 'z-rejected' && +optional_depends LUA "--with-lua" "--without-lua" "LUA support" && +optional_depends ocaml "--with-ocaml" "--without-ocaml" "Ocaml support" && +optional_depends pcre "--with-pcre" "--without-pcre" "regular expression support" && +optional_depends perl "--with-perl5" "--without-perl5" "Perl 5 support" && +optional_depends php "--with-php" "--without-php" "PHP support" && +optional_depends python "--with-python" "--without-python" "Python 2 support" && +optional_depends python3 "--with-python3" "--without-python3" "Python 3 support" && +optional_depends RUBY "--with-ruby" "--without-ruby" "Ruby support" && +optional_depends tcl "--with-tcl" "--without-tcl" "Tcl/Tk support" diff --git a/devel/swig/DETAILS b/devel/swig/DETAILS index a02d91b73c..739ecba130 100755 --- a/devel/swig/DETAILS +++ b/devel/swig/DETAILS @@ -1,6 +1,6 @@ SPELL=swig - VERSION=2.0.11 - SOURCE_HASH=sha512:6ebe40acebd779dc7d647595d4bd5db700615d333b53024fd8e36c7541a2c32677a77655bac475a5cb3add9742cef6d9c7e8e12d8c1105f7e76a3d10e2fea95e + VERSION=3.0.2 + SOURCE_HASH=sha512:9aa027d53b2cc1534458abbf2137e59c4aac747e1406dcd45fedab91d4899872fab2aae3d7297fa38bf5093a21f19eaa543f0e0dee2c54497efcdd7e31ee7ccf SOURCE=$SPELL-$VERSION.tar.gz SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION" SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE diff --git a/devel/swig/HISTORY b/devel/swig/HISTORY index b64dea36b4..90169cceea 100644 --- a/devel/swig/HISTORY +++ b/devel/swig/HISTORY @@ -1,3 +1,8 @@ +2014-09-06 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 3.0.2 + * DEPENDS, *SUB_DEPENDS*: simplify some flags + php4 is nolonger supported + 2013-12-29 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 2.0.11 diff --git a/devel/swig/SUB_DEPENDS b/devel/swig/SUB_DEPENDS index c8632581d8..5f9c37cd15 100755 --- a/devel/swig/SUB_DEPENDS +++ b/devel/swig/SUB_DEPENDS @@ -1,12 +1,12 @@ case "$THIS_SUB_DEPENDS" in - PYTHON) depends python "--with-python=$INSTALL_ROOT/usr/bin/python" ;; - PYTHON3) depends python3 "--with-python3=$INSTALL_ROOT/usr/bin/python3" ;; - GUILE) depends guile "--with-guile=$INSTALL_ROOT/usr/bin/guile" ;; - JAVA) depends JAVA "--with-java" ;; - PERL) depends perl "--with-perl=$INSTALL_ROOT/usr/bin/perl" ;; - RUBY) depends ruby "--with-ruby=$INSTALL_ROOT/usr/bin/ruby" ;; - PHP) depends php "--with-php4=$INSTALL_ROOT/usr/bin/php" ;; - TCL) depends tcl "--with-tcl" ;; + PYTHON) depends python "--with-python " ;; + PYTHON3) depends python3 "--with-python3" ;; + GUILE) depends guile "--with-guile" ;; + JAVA) depends JAVA "--with-java" ;; + PERL) depends perl "--with-perl5" ;; + RUBY) depends ruby "--with-ruby" ;; + PHP) depends php "--with-php" ;; + TCL) depends tcl "--with-tcl" ;; *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL $THIS_SUB_DEPENDS${DEFAULT_COLOR}" ; return 1;; esac diff --git a/disk/e2fsprogs/DEPENDS b/disk/e2fsprogs/DEPENDS index 227b8ec5d8..3cd348a306 100755 --- a/disk/e2fsprogs/DEPENDS +++ b/disk/e2fsprogs/DEPENDS @@ -1,4 +1,4 @@ -depends gawk && +depends AWK && depends gnupg && depends INITSCRIPTS && depends smgl-fhs && diff --git a/disk/squashfs-tools3/BUILD b/disk/squashfs-tools3/BUILD new file mode 100755 index 0000000000..1814cd2aa1 --- /dev/null +++ b/disk/squashfs-tools3/BUILD @@ -0,0 +1,2 @@ +cd squashfs-tools && +make diff --git a/disk/squashfs-tools3/DETAILS b/disk/squashfs-tools3/DETAILS new file mode 100755 index 0000000000..7c8c6f7c6d --- /dev/null +++ b/disk/squashfs-tools3/DETAILS @@ -0,0 +1,27 @@ + SPELL=squashfs-tools3 + VERSION=3.4 + SOURCE=squashfs${VERSION}.tar.gz +SOURCE_DIRECTORY=$BUILD_DIRECTORY/squashfs${VERSION} + SOURCE_URL[0]=${SOURCEFORGE_URL}/squashfs/${SOURCE} + SOURCE_HASH=sha512:5e126ea468271f54c62d473a04a355169514f2668b4dc0de4138a8ef2a6e633d373454e7b85c1c684b875d9dfc8afb17c05548dd5062d05f847ffef8e624d9fe + WEB_SITE=http://squashfs.sourceforge.net/ + LICENSE[0]=GPL + ENTERED=20050104 + KEYWORDS="filesystem disk" + SHORT="Compressed read-only filesystem for Linux" +cat << EOF +Data, inodes and directories are compressed. + +Squashfs stores full uid/gids (32 bits), and file creation time. + +Files up to 2^32 bytes are supported. Filesystems can be up to 2^32 bytes. + +Inode and directory data are highly compacted, and packed on byte +boundaries. Each compressed inode is on average 8 bytes in length (the exact +length varies on file type, i.e. regular file, directory, symbolic link, and +block/char device inodes have different sizes). + +Squashfs can use block sizes up to 64K (the default size is 64K). Using 64K +blocks achieves greater compression ratios than the normal 4K block size. +File duplicates are detected and removed. +EOF diff --git a/disk/squashfs-tools3/HISTORY b/disk/squashfs-tools3/HISTORY new file mode 100644 index 0000000000..9e6416b4a4 --- /dev/null +++ b/disk/squashfs-tools3/HISTORY @@ -0,0 +1,33 @@ +2014-09-11 Ismael Luceno <ismael@sourcemage.org> + * DETAILS: updated spell to 3.4 + * PRE_BUILD, INSTALL: Add version suffix to installed binaries + +2008-02-16 Andraž "ruskie" Levstik <ruskie@mages.ath.cx> + * DETAILS: updated spell to 3.3 + +2006-09-12 Ladislav Hagara <hgr@vabo.cz> + * DETAILS: 3.1-r2, removed UPDATED + +2006-04-04 Ladislav Hagara <hgr@vabo.cz> + * DETAILS: 3.0 + * INSTALL: added unsquashfs + +2006-03-12 Karsten Behrmann <BearPerson@sourcemage.org> + * DETAILS: (automated) Add KEYWORDS + +2005-12-15 Ladislav Hagara <hgr@vabo.cz> + * DETAILS: 2.2-r2 + +2005-11-29 Seth Woolley <seth@tautology.org> + * DETAILS: MD5 -> SHA512 + +2005-07-07 Flavien Bridault <disk@sourcemage.org> + * DETAILS: updated to 2.2 + +2005-04-30 Flavien Bridault <disk@sourcemage.org> + * BUILD, INSTALL: updated according to Benoit squashfs spell + (#8661) which takes into account $INSTALL_ROOT + +2005-01-04 Wolfgang Scheicher <worf@sbox.tu-graz.ac.at> + * created this spell + diff --git a/disk/squashfs-tools3/INSTALL b/disk/squashfs-tools3/INSTALL new file mode 100755 index 0000000000..414770a0fe --- /dev/null +++ b/disk/squashfs-tools3/INSTALL @@ -0,0 +1,3 @@ +# we install both binaries in /usr/sbin (like debian) +mkdir -p "${INSTALL_ROOT}/usr/sbin" && +cp mksquashfs3 unsquashfs3 "${INSTALL_ROOT}/usr/sbin" diff --git a/disk/squashfs-tools3/PRE_BUILD b/disk/squashfs-tools3/PRE_BUILD new file mode 100755 index 0000000000..db141cc09e --- /dev/null +++ b/disk/squashfs-tools3/PRE_BUILD @@ -0,0 +1,2 @@ +default_pre_build && +sedit 's/fs\([: ]\|$\)/fs3\1/g' "$SOURCE_DIRECTORY"/squashfs-tools/Makefile diff --git a/doc/dvipng/DEPENDS b/doc/dvipng/DEPENDS index 3efcbb171a..80e27852e7 100755 --- a/doc/dvipng/DEPENDS +++ b/doc/dvipng/DEPENDS @@ -1,5 +1,7 @@ -depends libpng && -depends GIFLIB && depends freetype2 && +depends gd && depends ghostscript && +depends GIFLIB && +depends libpng && +depends t1lib && depends texlive diff --git a/doc/dvipng/HISTORY b/doc/dvipng/HISTORY index 77d2cc2fd0..a4f6d140d5 100644 --- a/doc/dvipng/HISTORY +++ b/doc/dvipng/HISTORY @@ -1,3 +1,6 @@ +2014-09-09 Remko van der Vossen <wich@sourcemage.org> + * DEPENDS: gd, t1lib + 2014-05-30 Treeve Jelbert <treeve@sourcemage.org> * DEPENDS: giflib => GIFLIB diff --git a/doc/evince/DEPENDS b/doc/evince/DEPENDS index 737aa1e6d9..bac4262746 100755 --- a/doc/evince/DEPENDS +++ b/doc/evince/DEPENDS @@ -8,7 +8,7 @@ depends gtk+3 && depends gconf2 && depends shared-mime-info && depends gnome-icon-theme && -depends gnome-icon-theme-symbolic && +depends adwaita-icon-theme && depends xml-parser-expat && depends itstool && depends libsecret && diff --git a/doc/evince/DETAILS b/doc/evince/DETAILS index 519932dae0..cfdc43fc21 100755 --- a/doc/evince/DETAILS +++ b/doc/evince/DETAILS @@ -1,11 +1,11 @@ SPELL=evince - VERSION=3.8.3 + VERSION=3.13.92 BRANCH=$(echo $VERSION | cut -d. -f1,2) SOURCE=$SPELL-$VERSION.tar.xz SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION" SOURCE_URL[0]=$GNOME_URL/sources/evince/$BRANCH/$SOURCE WEB_SITE=http://www.gnome.org/projects/evince - SOURCE_HASH=sha512:22b913d61ad5f143b014129e5b18985bd3ff2790b3819a6a16a5de1f08eb617f77b421a431f01beab9ca90dc03d7a5dc413163f99405800d2c4997ec1e9408cd + SOURCE_HASH=sha512:507a3e6be85d70560d2948d8330207ca12469677d1acc9b534dbcd31fd5248e514f455c0613c842a23405b4aa47fe0aef32c32b7038614e8986690f106ce15d7 LICENSE[0]=GPL ENTERED=20050502 KEYWORDS="doc" diff --git a/doc/evince/HISTORY b/doc/evince/HISTORY index da9742dbf6..3394249fab 100644 --- a/doc/evince/HISTORY +++ b/doc/evince/HISTORY @@ -1,3 +1,7 @@ +2014-09-19 Pol Vinogradov <vin.public@gmail.com> + * DETAILS: 3.13.92 + * DEPENDS: adwaita icons replaced symbolic ones + 2014-04-18 Thomas Orgis <sobukus@sourcemage.org> * DEPENDS: need symbolic icons diff --git a/doc/groff/DEPENDS b/doc/groff/DEPENDS index ef22d340fa..2506c286f2 100755 --- a/doc/groff/DEPENDS +++ b/doc/groff/DEPENDS @@ -8,3 +8,13 @@ optional_depends POSTSCRIPT-INTERPRETER \ optional_depends netpbm "" "" "required for html output" && optional_depends psutils "" "" "required for html output" + +optional_depends libx11 \ + "--with-x" \ + "--without-x" \ + "for X11 support in groff" && +if is_depends_enabled $SPELL libx11; then + depends libxaw && + depends libxmu && + depends libxt +fi diff --git a/doc/groff/HISTORY b/doc/groff/HISTORY index 0035d0690e..62ebf6e544 100644 --- a/doc/groff/HISTORY +++ b/doc/groff/HISTORY @@ -1,3 +1,6 @@ +2014-09-09 Remko van der Vossen <wich@sourcemage.org> + * DEPENDS: optional X11 dependencies + 2013-08-06 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 1.22.2 * BUILD: deleted diff --git a/doc/man-pages/DETAILS b/doc/man-pages/DETAILS index d4467f3d9f..49ed55b3ea 100755 --- a/doc/man-pages/DETAILS +++ b/doc/man-pages/DETAILS @@ -1,6 +1,6 @@ SPELL=man-pages - VERSION=3.70 - SOURCE_HASH=sha512:3e5590fe5181a914bb49531b7786eefc9d13d1ce1e3a80b09500dfc31a7fa01543f36c44484194613d2c87b840e4bdd9774eedc67251d3378014698078cb3ca3 + VERSION=3.72 + SOURCE_HASH=sha512:10d513c926d44122955ad5c852af9c87d7f46296cdc22cbf2397115163a7873c57ba79b8b94f50a5ce202b55005a24dd5a219a0db0b5c015070f68a943834296 SOURCE=$SPELL-$VERSION.tar.xz # SOURCE2=$SOURCE.sign SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION" diff --git a/doc/man-pages/HISTORY b/doc/man-pages/HISTORY index 60cd064f3a..8fe1ff6db1 100644 --- a/doc/man-pages/HISTORY +++ b/doc/man-pages/HISTORY @@ -1,3 +1,6 @@ +2014-09-07 Ladislav Hagara <hgr@vabo.cz> + * DETAILS: 3.72 + 2014-07-13 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> * DETAILS: version 3.70 diff --git a/doc/source-highlight/DEPENDS b/doc/source-highlight/DEPENDS index b3684a3ccc..0212a502b6 100755 --- a/doc/source-highlight/DEPENDS +++ b/doc/source-highlight/DEPENDS @@ -1,4 +1,4 @@ -depends gawk && +depends AWK && depends bison && depends flex && depends -sub CXX gcc diff --git a/e/imlib2/DEPENDS b/e/imlib2/DEPENDS index fca3f8bc0b..0f5fa69175 100755 --- a/e/imlib2/DEPENDS +++ b/e/imlib2/DEPENDS @@ -1,12 +1,20 @@ -depends libtool && depends freetype2 && +depends glib2 && +depends harfbuzz && +depends libtool && +depends pcre && optional_depends libx11 \ '--with-x' \ '--without-x' \ 'X11 support' && - if is_depends_enabled $SPELL libx11; then + depends libice && + depends libpthread-stubs && + depends libsm && + depends libxau && + depends libxcb && + depends libxdmcp && depends libxext fi && diff --git a/e/imlib2/HISTORY b/e/imlib2/HISTORY index 21b2048223..20cffe7117 100644 --- a/e/imlib2/HISTORY +++ b/e/imlib2/HISTORY @@ -1,3 +1,9 @@ +2014-09-25 Remko van der Vossen <wich@sourcemage.org> + * DEPENDS: glib2, harfbuzz, pcre + +2014-09-09 Remko van der Vossen <wich@sourcemage.org> + * DEPENDS: added missing X11 dependencies + 2014-05-30 Treeve Jelbert <treeve@sourcemage.org> * DEPENDS: giflib => GIFLIB diff --git a/editors/gawk/CONFIGURE b/editors/gawk/CONFIGURE new file mode 100755 index 0000000000..af13ca01b7 --- /dev/null +++ b/editors/gawk/CONFIGURE @@ -0,0 +1 @@ +config_query GAWK_DEF "Use $SPELL as the primary AWK interpreter on the system?" y diff --git a/editors/gawk/DEPENDS b/editors/gawk/DEPENDS index 62c729b063..666b64a30b 100755 --- a/editors/gawk/DEPENDS +++ b/editors/gawk/DEPENDS @@ -1,5 +1,7 @@ -depends gnupg && -depends smgl-fhs && +depends gmp && +depends gnupg && +depends mpfr && +depends smgl-fhs && optional_depends gettext \ "--enable-nls" \ diff --git a/editors/gawk/HISTORY b/editors/gawk/HISTORY index 2cd60a1622..bb49c1b7ad 100644 --- a/editors/gawk/HISTORY +++ b/editors/gawk/HISTORY @@ -1,3 +1,10 @@ +2014-09-09 Remko van der Vossen <wich@sourcemage.org> + * DEPENDS: gmp, mpfr + +2014-09-09 Ismael Luceno <ismael@sourcemage.org> + * PROVIDES: Provide AWK + * CONFIGURE, INSTALL: Let the user choose the primary AWK implementation + 2014-08-24 Thomas Orgis <sobukus@sourcemage.org> * BUILD: reduce usage of libraries to prevent failure of spell upgrades (example: awk broken when updating gmp, sorcery cannot complete diff --git a/editors/gawk/INSTALL b/editors/gawk/INSTALL index ddfa02110c..8d4d071b49 100755 --- a/editors/gawk/INSTALL +++ b/editors/gawk/INSTALL @@ -1,3 +1,4 @@ make DESTDIR=$INSTALL_ROOT install && -rm -f ${INSTALL_ROOT}/bin/awk && -ln -sf gawk ${INSTALL_ROOT}/bin/awk +if [ "$GAWK_DEF" = y ]; then + ln -sf "$SPELL" "$INSTALL_ROOT"/bin/awk +fi diff --git a/editors/gawk/PROVIDES b/editors/gawk/PROVIDES new file mode 100644 index 0000000000..37a9c1ca2c --- /dev/null +++ b/editors/gawk/PROVIDES @@ -0,0 +1 @@ +AWK diff --git a/editors/lyx/DETAILS b/editors/lyx/DETAILS index 54a81c6706..1338139257 100755 --- a/editors/lyx/DETAILS +++ b/editors/lyx/DETAILS @@ -1,11 +1,11 @@ SPELL=lyx - VERSION=2.0.6 + VERSION=2.1.1 SOURCE=${SPELL}-${VERSION}.tar.gz SOURCE2=$SOURCE.sig SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION} - SOURCE_URL[0]=ftp://ftp.lyx.org/pub/lyx/stable/2.0.x/$SOURCE - SOURCE_URL[1]=ftp://ftp.lip6.fr/pub/lyx/stable/2.0.x/$SOURCE - SOURCE_URL[2]=ftp://gd.tuwien.ac.at/publishing/tex/lyx/stable/2.0.x/${SOURCE} + SOURCE_URL[0]=ftp://ftp.lyx.org/pub/lyx/stable/${VERSION%.*}.x/$SOURCE + SOURCE_URL[1]=ftp://ftp.lip6.fr/pub/lyx/stable/${VERSION%.*}.x/$SOURCE + SOURCE_URL[2]=ftp://gd.tuwien.ac.at/publishing/tex/lyx/stable/${VERSION%.*}.x/${SOURCE} SOURCE2_URL[0]=${SOURCE_URL[0]}.sig SOURCE2_URL[2]=${SOURCE_URL[2]}.sig SOURCE2_URL[1]=${SOURCE_URL[1]}.sig diff --git a/editors/lyx/HISTORY b/editors/lyx/HISTORY index 420e8dae5b..123944af8d 100644 --- a/editors/lyx/HISTORY +++ b/editors/lyx/HISTORY @@ -1,3 +1,6 @@ +2014-09-16 Ismael Luceno <ismael@sourcemage.org> + * DETAILS: updated spell to 2.1.1 + 2014-01-23 Ismael Luceno <ismael@sourcemage.org> * DETAILS: updated spell to 2.0.6 diff --git a/editors/texmaker/DETAILS b/editors/texmaker/DETAILS index 7aee1b49f5..4e8edecc9f 100755 --- a/editors/texmaker/DETAILS +++ b/editors/texmaker/DETAILS @@ -1,8 +1,8 @@ SPELL=texmaker - VERSION=4.1.1 + VERSION=4.3 SOURCE="${SPELL}-${VERSION}.tar.bz2" SOURCE_URL[0]=http://www.xm1math.net/${SPELL}/${SOURCE} - SOURCE_HASH=sha512:5e8c7cb2ee1f71bdcff39ff432dc152e0ba3643b237b32524f08e16786507dc366cfbb839aa7071e4942de111ce0b311d1141d42f668f37369a79390afd5adba + SOURCE_HASH=sha512:9bb94a104c6324d2c712b522c60513189575d01d8ea24a6eeef4201ff17c719ab816775eae5239637f5ef2084d7beb8c1d76addc10d5000a1ae53ab33c1adc3d SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}" WEB_SITE="http://www.xm1math.net/texmaker" LICENSE[0]=GPL diff --git a/editors/texmaker/HISTORY b/editors/texmaker/HISTORY index 5942051a55..0c38a7fbb1 100644 --- a/editors/texmaker/HISTORY +++ b/editors/texmaker/HISTORY @@ -1,3 +1,6 @@ +2014-09-16 Ismael Luceno <ismael@sourcemage.org> + * DETAILS: updated spell to 4.3 + 2014-04-29 Ismael Luceno <ismael@sourcemage.org> * DETAILS: updated spell to 4.1.1 diff --git a/editors/texworks/DETAILS b/editors/texworks/DETAILS index 5d1e102dea..32214b63ee 100755 --- a/editors/texworks/DETAILS +++ b/editors/texworks/DETAILS @@ -1,9 +1,9 @@ SPELL=texworks - VERSION=0.4.4-r1004 + VERSION=0.4.5-r1281 SOURCE="${SPELL}-${VERSION}.tar.gz" SOURCE_URL[0]=http://${SPELL}.googlecode.com/files/${SOURCE} - SOURCE_HASH=sha512:0f22ebca59673dea0081190f5d064b856735522ee708ae79cb0ae0760c098ac539a45ae6e2a475b75a0bffd9147e1bd3185d8bd6bb710d48408524b686ea0990 -SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-0.4.4" + SOURCE_HASH=sha512:4ab6b1253e05e80c55788b4f6aa6673ede81dd39cdecd09823efbb8a377b73f403018d23e7f214358b6ac7bc86b9afac5ee7437203996e5bff36d9938c2f5dda +SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION%-*}" WEB_SITE="http://www.tug.org/texworks/" LICENSE[0]=GPL ENTERED=20120915 diff --git a/editors/texworks/HISTORY b/editors/texworks/HISTORY index ba28f48749..841336c184 100644 --- a/editors/texworks/HISTORY +++ b/editors/texworks/HISTORY @@ -1,3 +1,6 @@ +2014-09-16 Ismael Luceno <ismael@sourcemage.org> + * DETAILS: updated spell to 0.4.5-r1281 + 2012-09-15 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> * BUILD, DEPENDS, DETAILS: spell created * DEPENDS: add dependency on texlive diff --git a/editors/vbindiff/DETAILS b/editors/vbindiff/DETAILS new file mode 100755 index 0000000000..65fb41059a --- /dev/null +++ b/editors/vbindiff/DETAILS @@ -0,0 +1,25 @@ + SPELL=vbindiff + VERSION=3.0_beta4 + SOURCE="${SPELL}-${VERSION}.tar.gz" + SOURCE_URL[0]=http://www.cjmweb.net/${SPELL}/${SOURCE} + SOURCE_HASH=sha512:6437f107fe58e8343ccd8cb65b3c562d5cb25445fcce284c7ce73fe4a2ed7191100595b9cd0c88d5a630a176f4c4bd374625c97c109a6ee14f1f56ca136d23da +SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}" + WEB_SITE="http://www.cjmweb.net/vbindiff/" + LICENSE[0]="GPLv2+" + ENTERED=20140923 + KEYWORDS="" + SHORT="Visual Binary Diff" +cat << EOF +VBinDiff (Visual Binary Diff) displays files in hexadecimal and ASCII (or +EBCDIC). It can also display two files at once, and highlight the differences +between them. Unlike diff, it works well with large files (up to 4 GB). + +VBinDiff was inspired by the Compare Files function of the ProSel utilities +by Glen Bredon, for the Apple II. When I couldn’t find a similar utility +for the PC, I wrote it myself. + +The single-file mode was inspired by the LIST utility of 4DOS and +friends. While less provides a good line-oriented display, it has no +equivalent to LIST’s hex display. (True, you can pipe the file through +hexdump, but that’s incredibly inefficient on multi-gigabyte files.) +EOF diff --git a/editors/vbindiff/HISTORY b/editors/vbindiff/HISTORY new file mode 100644 index 0000000000..f5a6c1a15a --- /dev/null +++ b/editors/vbindiff/HISTORY @@ -0,0 +1,2 @@ +2014-09-23 Ismael Luceno <ismael@sourcemage.org> + * DETAILS: spell created diff --git a/editors/vim-csapprox/BUILD b/editors/vim-csapprox/BUILD new file mode 100755 index 0000000000..27ba77ddaf --- /dev/null +++ b/editors/vim-csapprox/BUILD @@ -0,0 +1 @@ +true diff --git a/editors/vim-csapprox/DEPENDS b/editors/vim-csapprox/DEPENDS new file mode 100755 index 0000000000..367c2e1dd5 --- /dev/null +++ b/editors/vim-csapprox/DEPENDS @@ -0,0 +1 @@ +depends vim diff --git a/editors/vim-csapprox/DETAILS b/editors/vim-csapprox/DETAILS new file mode 100755 index 0000000000..0eb50b9f58 --- /dev/null +++ b/editors/vim-csapprox/DETAILS @@ -0,0 +1,38 @@ + SPELL=vim-csapprox + VERSION=4.0 + SOURCE_HASH=sha512:5ce5534af16c4abfe7fa2fac9ee904162eebd793120efb4e72dcaa2834209b64834b0013a7e929f0a56caf4d1b103fac116c3cf1f9e958afe9c7fcebf7c2ca87 + SOURCE=$SPELL-$VERSION.zip +SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION" + SOURCE_URL[0]=http://www.vim.org/scripts/download_script.php?src_id=18594 + WEB_SITE=http://www.vim.org/scripts/script.php?script_id=2390 + LICENSE[0]=BSD + ENTERED=20140915 + SHORT="Make gvim-only colorschemes work transparently in terminal vim" +cat << EOF +It's hard to find colorschemes for terminal Vim. Most colorschemes are written +to only support GVim, and don't work at all in terminal Vim. + +This plugin makes GVim-only colorschemes Just Work in terminal Vim, as long as +the terminal supports 88 or 256 colors - and most do these days. This usually +requires no user interaction (but see the help for what to do if things don't +Just Work). After getting this plugin happily installed, any time you use +:colorscheme it will do its magic and make the colorscheme Just Work. + +Whenever you change colorschemes using the :colorscheme command this script will +be executed. It will take the colors that the scheme specified for use in the +GUI and use an approximation algorithm to try to gracefully degrade them to the +closest color available in your terminal. If you are running in a GUI or if +your terminal doesn't support 88 or 256 colors, no changes are made. Also, no +changes will be made if the colorscheme seems to have been high color already. + +If for some reason this transparent method isn't suitable to you (for instance +if your environment can't be configured to meet the |csapprox-requirements|, or +you need to work in Vim 6), another option is also available: using the +|:CSApproxSnapshot| command to create a new GUI/88-/256-color terminal +colorscheme. To use this command, a user would generally start GVim, choose a +colorscheme that sets up the desired colors, and then use |:CSApproxSnapshot| to +create a new colorscheme based on those colors that works in high color +terminals. This method is more flexible than the transparent mode and works in +more places, but also requires more user intervention, and makes it harder to +deal with colorschemes being updated and such. +EOF diff --git a/editors/vim-csapprox/HISTORY b/editors/vim-csapprox/HISTORY new file mode 100644 index 0000000000..84b95c90f0 --- /dev/null +++ b/editors/vim-csapprox/HISTORY @@ -0,0 +1,2 @@ +2014-09-15 Ismael Luceno <ismael@sourcemage.org> + * BUILD, DEPENDS, DETAILS, INSTALL: spell created diff --git a/editors/vim-csapprox/INSTALL b/editors/vim-csapprox/INSTALL new file mode 100755 index 0000000000..0c3d08794f --- /dev/null +++ b/editors/vim-csapprox/INSTALL @@ -0,0 +1,3 @@ +vimdir="$INSTALL_ROOT/usr/share/vim/vimfiles" +unzip -d "$vimdir" "$SOURCE_CACHE"/"$SOURCE" && +vim -c "helptags $vimdir/doc" -c q diff --git a/fonts-x11/terminus-font/DEPENDS b/fonts-x11/terminus-font/DEPENDS index 06ae8bd3e3..4fceecb3f2 100755 --- a/fonts-x11/terminus-font/DEPENDS +++ b/fonts-x11/terminus-font/DEPENDS @@ -1,4 +1,4 @@ -depends gawk && +depends AWK && depends perl && depends bdftopcf && diff --git a/ftp/curl/DEPENDS b/ftp/curl/DEPENDS index db721df1ce..2d4842f930 100755 --- a/ftp/curl/DEPENDS +++ b/ftp/curl/DEPENDS @@ -1,3 +1,4 @@ +depends gmp && depends zlib && case $CURL_SSL in diff --git a/ftp/curl/HISTORY b/ftp/curl/HISTORY index 0838d6c823..e5b3f7b253 100644 --- a/ftp/curl/HISTORY +++ b/ftp/curl/HISTORY @@ -1,7 +1,10 @@ -2014-08-23 Treeve Jelbert <treeve@sourcemage.org> +2014-09-09 Remko van der Vossen <wich@sourcemage.org> + * DEPENDS: gmp + +2014-08-23 Treeve Jelbert <treeve@sourcemage.org> * CONFIGURE, DEPENDS, BUILD: also support libressl, cleanup -2014-08-19 Treeve Jelbert <treeve@sourcemage.org> +2014-08-19 Treeve Jelbert <treeve@sourcemage.org> * DEPENDS: openssl => SSL * SUB_DEPENDS, PRE_SUB_DEPENDS: openssl => SSL diff --git a/ftp/wget/DEPENDS b/ftp/wget/DEPENDS index a8512ee5c8..c0240437f3 100755 --- a/ftp/wget/DEPENDS +++ b/ftp/wget/DEPENDS @@ -1,5 +1,6 @@ -depends gnupg && -depends smgl-fhs && +depends gnupg && +depends pcre && +depends smgl-fhs && optional_depends libidn \ "--enable-iri" \ diff --git a/ftp/wget/HISTORY b/ftp/wget/HISTORY index e5277f01ad..91e08f95f3 100644 --- a/ftp/wget/HISTORY +++ b/ftp/wget/HISTORY @@ -1,3 +1,6 @@ +2014-09-25 Remko van der Vossen <wich@sourcemage.org> + * DEPENDS: pcre + 2014-08-23 Treeve Jelbert <treeve@sourcemage.org> * DEPENDS, CONFIGURE: fix libressl support * SUB_DEPENDS, PRE_SUB_DEPENDS: tweak diff --git a/gnome2-apps/dia/DETAILS b/gnome2-apps/dia/DETAILS index 33d0771353..775352b9b4 100755 --- a/gnome2-apps/dia/DETAILS +++ b/gnome2-apps/dia/DETAILS @@ -1,12 +1,12 @@ SPELL=dia - VERSION=0.97.2 + VERSION=0.97.3 BRANCH=`echo $VERSION|cut -d . -f 1,2` SOURCE=$SPELL-$VERSION.tar.xz SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION" SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE SOURCE_GPG=gurus.gpg:$SOURCE.sig:UPSTREAM_HASH LICENSE[0]=GPL - WEB_SITE=http://www.gnome.org/projects/dia/ + WEB_SITE=https://wiki.gnome.org/Apps/Dia ENTERED=20010922 KEYWORDS="gnome2" SHORT="GTK-based diagram drawing program, similar to Visio" diff --git a/gnome2-apps/dia/HISTORY b/gnome2-apps/dia/HISTORY index aa37fb02bd..d7ec8ac448 100644 --- a/gnome2-apps/dia/HISTORY +++ b/gnome2-apps/dia/HISTORY @@ -1,3 +1,7 @@ +2014-09-06 Vlad Glagolev <stealth@sourcemage.org> + * DETAILS: updated spell to 0.97.3; fixed WEB_SITE + * glib-2.31.patch: removed, fixed by upstream + 2012-07-26 Vlad Glagolev <stealth@sourcemage.org> * PRE_BUILD: detect docbook-xsl man path and use instead of online one * DEPENDS: added docbook-xsl required dep diff --git a/gnome2-apps/dia/PRE_BUILD b/gnome2-apps/dia/PRE_BUILD index c3f34d06ba..e3208ed42c 100755 --- a/gnome2-apps/dia/PRE_BUILD +++ b/gnome2-apps/dia/PRE_BUILD @@ -1,13 +1,11 @@ mk_source_dir $SOURCE_DIRECTORY && cd $BUILD_DIRECTORY && verify_file '' && -xz -dc $SOURCE_CACHE/$SOURCE | tar -xf - +xz -dc $SOURCE_CACHE/$SOURCE | tar -xf - && cd $SOURCE_DIRECTORY && # dockbook's dir local DB_VER=$(installed_version docbook-xsl | cut -c -4) && local DB_DIR="$INSTALL_ROOT/usr/share/xml/docbook/xsl-stylesheets-${DB_VER}" && -sedit "s:http\://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl:${DB_DIR}/manpages/docbook.xsl:" configure && - -patch -p1 < $SPELL_DIRECTORY/glib-2.31.patch +sedit "s:http\://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl:${DB_DIR}/manpages/docbook.xsl:" configure diff --git a/gnome2-apps/dia/dia-0.97.2.tar.xz.sig b/gnome2-apps/dia/dia-0.97.2.tar.xz.sig Binary files differdeleted file mode 100644 index fa8da34300..0000000000 --- a/gnome2-apps/dia/dia-0.97.2.tar.xz.sig +++ /dev/null diff --git a/gnome2-apps/dia/dia-0.97.3.tar.xz.sig b/gnome2-apps/dia/dia-0.97.3.tar.xz.sig Binary files differnew file mode 100644 index 0000000000..a11cfeb0fc --- /dev/null +++ b/gnome2-apps/dia/dia-0.97.3.tar.xz.sig diff --git a/gnome2-apps/dia/glib-2.31.patch b/gnome2-apps/dia/glib-2.31.patch deleted file mode 100644 index 209d196321..0000000000 --- a/gnome2-apps/dia/glib-2.31.patch +++ /dev/null @@ -1,53 +0,0 @@ -Index: dia-0.97.1/objects/custom/shape_typeinfo.c -=================================================================== ---- dia-0.97.1.orig/objects/custom/shape_typeinfo.c -+++ dia-0.97.1/objects/custom/shape_typeinfo.c -@@ -27,7 +27,7 @@ - #include "custom_util.h" - #include <string.h> - #include <stdarg.h> --#include <glib/gstrfuncs.h> -+#include <glib.h> - #include <glib/gstdio.h> - #include <libxml/parser.h> - -Index: dia-0.97.1/plug-ins/pgf/render_pgf.c -=================================================================== ---- dia-0.97.1.orig/plug-ins/pgf/render_pgf.c -+++ dia-0.97.1/plug-ins/pgf/render_pgf.c -@@ -61,7 +61,7 @@ TODO: - #endif - #include <errno.h> - --#include <glib/gprintf.h> -+#include <glib.h> - #include <glib/gstdio.h> - - #include "intl.h" -Index: dia-0.97.1/tests/test-boundingbox.c -=================================================================== ---- dia-0.97.1.orig/tests/test-boundingbox.c -+++ dia-0.97.1/tests/test-boundingbox.c -@@ -28,7 +28,7 @@ - #include <glib.h> - #include <glib-object.h> - --#if GLIB_CHECK_VERSION(2,16,0) -+#if GLIB_CHECK_VERSION(2,16,0) && !GLIB_CHECK_VERSION(2,31,0) - #include <glib/gtestutils.h> - #endif - #include "dialib.h" -Index: dia-0.97.1/tests/test-objects.c -=================================================================== ---- dia-0.97.1.orig/tests/test-objects.c -+++ dia-0.97.1/tests/test-objects.c -@@ -28,7 +28,7 @@ - #include <glib.h> - #include <glib-object.h> - --#if GLIB_CHECK_VERSION(2,16,0) -+#if GLIB_CHECK_VERSION(2,16,0) && !GLIB_CHECK_VERSION(2,31,0) - #include <glib/gtestutils.h> - #endif - - diff --git a/gnome2-libs/gdk-pixbuf2/DEPENDS b/gnome2-libs/gdk-pixbuf2/DEPENDS index dbc0691d9b..7bad65b6c6 100755 --- a/gnome2-libs/gdk-pixbuf2/DEPENDS +++ b/gnome2-libs/gdk-pixbuf2/DEPENDS @@ -1,13 +1,22 @@ -depends glib2 && -depends libpng && -depends zlib && -depends JPEG && -depends tiff && +depends glib2 && +depends JPEG && +depends libffi && +depends libpng && +depends libpthread-stubs && +depends LZMA && +depends pcre && +depends tiff && +depends zlib && optional_depends libx11 \ '--with-x11' \ '--without-x11' \ 'enable X11 support' && +if is_depends_enabled $SPELL libx11; then + depends libxau && + depends libxcb && + depends libxdmcp +fi && optional_depends gobject-introspection \ "--enable-introspection" \ @@ -17,13 +26,5 @@ optional_depends gobject-introspection \ optional_depends jasper \ --enable-jasper \ --disable-jasper \ - "enable JPEG2000 loader" && + "enable JPEG2000 loader" -depends libffi && -if is_depends_enabled $SPELL libx11; then - depends libxau && - depends libxcb && - depends libxdmcp -fi && -depends pcre && -depends LZMA diff --git a/gnome2-libs/gdk-pixbuf2/HISTORY b/gnome2-libs/gdk-pixbuf2/HISTORY index 777e099342..a3df5233de 100644 --- a/gnome2-libs/gdk-pixbuf2/HISTORY +++ b/gnome2-libs/gdk-pixbuf2/HISTORY @@ -1,11 +1,14 @@ +2014-09-09 Remko van der Vossen <wich@sourcemage.org> + * DEPENDS: libpthread-stubs + 2014-06-29 Treeve Jelbert <treeve@sourcemage.org> - * DETAILS: version 2.30.8 + * DETAILS: version 2.30.8 2014-01-05 Treeve Jelbert <treeve@sourcemage.org> - * DETAILS: version 2.30.2 + * DETAILS: version 2.30.2 2013-10-14 Treeve Jelbert <treeve@sourcemage.org> - * DETAILS: version 2.30.0 + * DETAILS: version 2.30.0 2013-05-11 Ladislav Hagara <hgr@vabo.cz> * DETAILS: 2.28.1 diff --git a/gnome2-libs/libidl/DEPENDS b/gnome2-libs/libidl/DEPENDS index afee2b9f5f..694216009d 100755 --- a/gnome2-libs/libidl/DEPENDS +++ b/gnome2-libs/libidl/DEPENDS @@ -1,3 +1,4 @@ -depends glib2 && depends bison && -depends flex +depends flex && +depends glib2 && +depends pcre diff --git a/gnome2-libs/libidl/HISTORY b/gnome2-libs/libidl/HISTORY index e127868773..be037ab72d 100644 --- a/gnome2-libs/libidl/HISTORY +++ b/gnome2-libs/libidl/HISTORY @@ -1,3 +1,6 @@ +2014-09-09 Remko van der Vossen <wich@sourcemage.org> + DETAILS: pcre + 2010-04-01 Vasil Yonkov <spirtbrat@sourcemage.org> * DETAILS: updated spell to 0.8.14 diff --git a/gnome2-libs/librsvg2/DEPENDS b/gnome2-libs/librsvg2/DEPENDS index f7bb212743..4ffb3fdd05 100755 --- a/gnome2-libs/librsvg2/DEPENDS +++ b/gnome2-libs/librsvg2/DEPENDS @@ -1,17 +1,29 @@ -depends libx11 && -depends libice && -depends glib2 && -depends fontconfig && -depends freetype2 && +depends atk && depends -sub PNG cairo && -depends pango && -depends libxml2 && +depends expat && +depends fontconfig && +depends freetype2 && +depends glib2 && +depends harfbuzz && +depends pango && +depends libcroco && +depends libffi && +depends libice && +depends libpng && +depends libpthread-stubs && +depends libx11 && +depends libxau && +depends libxcb && +depends libxdmcp && +depends libxext && +depends libxml2 && # make icu usage explicit if is_depends_enabled libxml2 icu;then depends icu fi && - -depends libcroco && +depends libxrender && +depends pcre && +depends pixman && optional_depends gtk-doc \ "--enable-gtk-doc" \ @@ -36,11 +48,6 @@ optional_depends gdk-pixbuf2 \ "--disable-pixbuf-loader" \ "build gdk pixbuf loader" && - -depends atk && optional_depends gtk+2 '' '' 'GTK2 support' && -optional_depends gtk+3 '' '' 'GTK3 support' && -depends harfbuzz && -depends libpng && -depends pixman +optional_depends gtk+3 '' '' 'GTK3 support' diff --git a/gnome2-libs/librsvg2/HISTORY b/gnome2-libs/librsvg2/HISTORY index 3a5d59cc51..4cef0be098 100644 --- a/gnome2-libs/librsvg2/HISTORY +++ b/gnome2-libs/librsvg2/HISTORY @@ -1,3 +1,6 @@ +2014-09-09 Remko van der Vossen <wich@sourcemage.org> + * DEPENDS: add missing dependencies + 2014-04-19 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 2.40.2 diff --git a/gnome2-libs/pango/DEPENDS b/gnome2-libs/pango/DEPENDS index 0bbac402a5..4573481da6 100755 --- a/gnome2-libs/pango/DEPENDS +++ b/gnome2-libs/pango/DEPENDS @@ -2,11 +2,15 @@ depends automake && depends cairo && +depends expat && depends fontconfig && depends freetype2 && depends glib2 && depends harfbuzz && +depends libffi && depends libpng && +depends MESALIB && +depends pcre && depends pixman && optional_depends libxft \ @@ -15,9 +19,12 @@ optional_depends libxft \ "for XFT and X11 support" && if is_depends_enabled $SPELL libxft; then + depends libpthread-stubs && depends libx11 && depends libxau && + depends libxcb && depends libxdmcp && + depends libxext && depends libxrender && if spell_ok cairo && is_version_less $(installed_version cairo) 1.8; then force_depends cairo diff --git a/gnome2-libs/pango/HISTORY b/gnome2-libs/pango/HISTORY index 48c2f83f6d..8c0750573f 100644 --- a/gnome2-libs/pango/HISTORY +++ b/gnome2-libs/pango/HISTORY @@ -1,3 +1,9 @@ +2014-09-25 Remko van der Vossen <wich@sourcemage.org> + * DEPENDS: MESALIB + +2014-09-09 Remko van der Vossen <wich@sourcemage.org> + * DEPENDS: added missing dependencies + 2014-08-17 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 1.36.6 diff --git a/gnome2-libs/xdg-user-dirs/xdg-user-dirs-0.10.tar.gz.sig b/gnome2-libs/xdg-user-dirs/xdg-user-dirs-0.10.tar.gz.sig Binary files differdeleted file mode 100644 index 6ba187aaf6..0000000000 --- a/gnome2-libs/xdg-user-dirs/xdg-user-dirs-0.10.tar.gz.sig +++ /dev/null diff --git a/gnome3-libs/adwaita-icon-theme/DETAILS b/gnome3-libs/adwaita-icon-theme/DETAILS new file mode 100755 index 0000000000..6bd63fa849 --- /dev/null +++ b/gnome3-libs/adwaita-icon-theme/DETAILS @@ -0,0 +1,14 @@ + SPELL=adwaita-icon-theme + VERSION=3.13.91 + BRANCH=${VERSION:0:4} + SOURCE=$SPELL-$VERSION.tar.xz +SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION" + SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE + SOURCE_HASH=sha512:48d9739e808b8035d0108106c2011e17a4940d2c7dff402a9419932bc2012b219d0edec9d95dfb90082bc16b1f746dd1e281671de4553db9b26a2041743b34c3 + LICENSE[0]=LGPL + WEB_SITE=http://www.gnome.org/ + ENTERED=20140919 + SHORT="GNOME icon theme, Adwaita icons" +cat << EOF +GNOME icon theme, Adwaita icons. +EOF diff --git a/gnome3-libs/adwaita-icon-theme/HISTORY b/gnome3-libs/adwaita-icon-theme/HISTORY new file mode 100644 index 0000000000..b4f691010d --- /dev/null +++ b/gnome3-libs/adwaita-icon-theme/HISTORY @@ -0,0 +1,2 @@ +2014-09-19 Pol Vinogradov <vin.public@gmail.com> + * DETAILS: created spell diff --git a/graphics-libs/freetype2/DEPENDS b/graphics-libs/freetype2/DEPENDS index a2c3640506..6dd5042a4d 100755 --- a/graphics-libs/freetype2/DEPENDS +++ b/graphics-libs/freetype2/DEPENDS @@ -1 +1,4 @@ -depends libpng +depends glib2 && +depends harfbuzz && +depends libpng && +depends pcre diff --git a/graphics-libs/freetype2/HISTORY b/graphics-libs/freetype2/HISTORY index c1df19344c..773b3759e3 100644 --- a/graphics-libs/freetype2/HISTORY +++ b/graphics-libs/freetype2/HISTORY @@ -1,3 +1,6 @@ +2014-09-09 Remko van der Vossen <wich@sourcemage.org> + * DEPENDS: added missing dependencies + 2014-04-17 Vlad Glagolev <stealth@sourcemage.org> * DETAILS: updated spell to 2.5.3; SECURITY_PATCH++ (CVE-2014-2240) diff --git a/graphics-libs/ftgl/DEPENDS b/graphics-libs/ftgl/DEPENDS index 0ae9e4c0bc..0f5b54d335 100755 --- a/graphics-libs/ftgl/DEPENDS +++ b/graphics-libs/ftgl/DEPENDS @@ -2,6 +2,6 @@ depends bzip2 && depends -sub CXX gcc && depends freetype2 && depends libxext && -depends texlive && depends zlib && +optional_depends texlive "" "" "to build documentation" && optional_depends GLUT "" "" "for a demo program" diff --git a/graphics-libs/ftgl/DETAILS b/graphics-libs/ftgl/DETAILS index b9b802e965..65a6ba3efe 100755 --- a/graphics-libs/ftgl/DETAILS +++ b/graphics-libs/ftgl/DETAILS @@ -1,10 +1,10 @@ SPELL=ftgl VERSION=2.1.3-rc5 - SOURCE=$SPELL-$VERSION.tar.bz2 + SOURCE=$SPELL-$VERSION.tar.gz SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${VERSION/-rc5/~rc5} - SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE + SOURCE_URL[0]=$SOURCEFORGE_URL/${SPELL}/FTGL%20Source/${VERSION/-/%7E}/${SOURCE} WEB_SITE=http://ftgl.wiki.sourceforge.net/ - SOURCE_HASH=sha512:9841bdbe7e299dd0ae3bcbef08dc3a8787a863389bf242aa023b1c2442f3ffc8a2c6768a35d093d27e3ad7197c8228a9b15e795a36824424f05bef66b68c89a4 + SOURCE_HASH=sha512:77518c4546b53662b45a5c9af2418697b1a4a6250316c1e11ee71ccffc58ce03d5f19c901021b0e1cd05fec8444c84197e4bef77c662513dd6da8c29800cc3cd LICENSE[0]=GPL ENTERED=20040709 KEYWORDS="opengl fonts graphics libs" diff --git a/graphics-libs/ftgl/HISTORY b/graphics-libs/ftgl/HISTORY index b4e5b9b81b..c1433faf02 100644 --- a/graphics-libs/ftgl/HISTORY +++ b/graphics-libs/ftgl/HISTORY @@ -1,5 +1,9 @@ +2014-09-09 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> + * DETAILS: fix SOURCE_URL[0] + * DEPENDS: make the dependency on texlive optional + 2013-08-06 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> - BUILD: add -lGL and -lGLU to LIBS + * BUILD: add -lGL and -lGLU to LIBS 2012-10-22 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> * DEPENDS: added dependency on texlive, bzip2, libxext, zlib diff --git a/graphics-libs/giblib/DEPENDS b/graphics-libs/giblib/DEPENDS index a85bb36a62..33cbe2bc4f 100755 --- a/graphics-libs/giblib/DEPENDS +++ b/graphics-libs/giblib/DEPENDS @@ -1 +1,6 @@ -depends imlib2 +depends freetype2 && +depends harfbuzz && +depends imlib2 && +depends libpng && +depends libx11 && +depends libxext diff --git a/graphics-libs/giblib/HISTORY b/graphics-libs/giblib/HISTORY index b84ad5a046..de8f8c4958 100644 --- a/graphics-libs/giblib/HISTORY +++ b/graphics-libs/giblib/HISTORY @@ -1,3 +1,9 @@ +2014-09-25 Remko van der Vossen <wich@sourcemage.org> + * DEPENDS: harfbuzz, libpng + +2014-09-09 Remko van der Vossen <wich@sourcemage.org> + * DEPENDS: freetype2, libx11, libxext + 2008-03-18 Eric Sandall <sandalle@sourcemage.org> * DEPENDS: No need to check if using modular X as that's all that's available now diff --git a/graphics-libs/giflib/DEPENDS b/graphics-libs/giflib/DEPENDS index 5b466eb70a..bb40f11807 100755 --- a/graphics-libs/giflib/DEPENDS +++ b/graphics-libs/giflib/DEPENDS @@ -1 +1,5 @@ +depends libice && +depends libsm && +depends libx11 && + optional_depends xmlto "" "" "for html documentation" diff --git a/graphics-libs/giflib/HISTORY b/graphics-libs/giflib/HISTORY index 79e2aebc6a..bfb0a2cec8 100644 --- a/graphics-libs/giflib/HISTORY +++ b/graphics-libs/giflib/HISTORY @@ -1,3 +1,6 @@ +2014-09-09 Remko van der Vossen <wich@sourcemage.org> + * DEPENDS: libice, libsm, libx11 + 2014-05-29 Treeve Jelbert <treeve@sourcemage.org> * PROVIDES: added * CONFLICTS: conflict giflib5 diff --git a/graphics-libs/harfbuzz/DEPENDS b/graphics-libs/harfbuzz/DEPENDS index f7165a2a19..3888196973 100755 --- a/graphics-libs/harfbuzz/DEPENDS +++ b/graphics-libs/harfbuzz/DEPENDS @@ -1,4 +1,7 @@ -depends ragel && +depends glib2 && +depends libpng && +depends pcre && +depends ragel && optional_depends cairo "--with-cairo=yes" "--with-cairo=no" \ "Enable tools used for command-line utilities?" && diff --git a/graphics-libs/harfbuzz/HISTORY b/graphics-libs/harfbuzz/HISTORY index 6bb1f5befc..4ab00dc240 100644 --- a/graphics-libs/harfbuzz/HISTORY +++ b/graphics-libs/harfbuzz/HISTORY @@ -1,3 +1,6 @@ +2014-09-09 Remko van der Vossen <wich@sourcemage.org> + * DEPENDS: glib2, libpng, pcre + 2014-08-17 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 0.9.35 diff --git a/graphics-libs/libpano13/DETAILS b/graphics-libs/libpano13/DETAILS index fb571198e9..de95bc1545 100755 --- a/graphics-libs/libpano13/DETAILS +++ b/graphics-libs/libpano13/DETAILS @@ -1,8 +1,8 @@ SPELL=libpano13 - VERSION=2.9.18 + VERSION=2.9.19 SOURCE="$SPELL-$VERSION.tar.gz" - SOURCE_URL[0]=$SOURCEFORGE_URL/panotools/$SOURCE - SOURCE_HASH=sha512:bd8449a8ee01e990fa19784889c1afb0e64f90e25596c872e7470fb700c327aad4fc0c565977576dac34dca4cea55a46aad9dc547d3ee4ab6b353cd8b6656874 + SOURCE_URL[0]=$SOURCEFORGE_URL/panotools/${SPELL}/${SPELL}-${VERSION}/${SOURCE} + SOURCE_HASH=sha512:f9f147426d44d8babac09cb1a1b5111f88b9c2fc079f33df80133492bcf24cbd1edd771e6bec7bed4b0256bf15c700139c0a83119d3adf296ae5c567e006d868 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION" WEB_SITE="http://panotools.sourceforge.net/" LICENSE[0]=GPL diff --git a/graphics-libs/libpano13/HISTORY b/graphics-libs/libpano13/HISTORY index 59a3a3b6f6..b6388ad4a0 100644 --- a/graphics-libs/libpano13/HISTORY +++ b/graphics-libs/libpano13/HISTORY @@ -1,3 +1,6 @@ +2014-09-14 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> + * DETAILS: version 2.9.19 + 2011-10-14 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> * DETAILS: version 2.9.18 diff --git a/graphics-libs/mesalib/DEPENDS b/graphics-libs/mesalib/DEPENDS index 9050e51c75..a1114311fc 100755 --- a/graphics-libs/mesalib/DEPENDS +++ b/graphics-libs/mesalib/DEPENDS @@ -13,6 +13,7 @@ depends libxext && depends libxxf86vm && depends libxau && depends libxfixes && +depends libxt && depends glproto && depends libxml2 && sub_depends libxml2 PYTHON && diff --git a/graphics-libs/mesalib/HISTORY b/graphics-libs/mesalib/HISTORY index 07674205f7..e6959a6c69 100644 --- a/graphics-libs/mesalib/HISTORY +++ b/graphics-libs/mesalib/HISTORY @@ -1,3 +1,6 @@ +2014-09-25 Remko van der Vossen <wich@sourcemage.org> + * DEPENDS: libxt + 2014-07-03 Ismael Luceno <ismael@sourcemage.org> * DETAILS: Use get_scm_version diff --git a/graphics-libs/vigra/DETAILS b/graphics-libs/vigra/DETAILS index 5cb5137843..8f98e99f24 100755 --- a/graphics-libs/vigra/DETAILS +++ b/graphics-libs/vigra/DETAILS @@ -1,9 +1,8 @@ SPELL=vigra - VERSION=1.8.0 - SOURCE=${SPELL}-${VERSION}-src.tar.gz - SOURCE_URL[0]=http://kogs-www.informatik.uni-hamburg.de/~koethe/${SPELL}/${SOURCE} - SOURCE_URL[1]=http://hci.iwr.uni-heidelberg.de/vigra/${SPELL}/${SOURCE} - SOURCE_HASH=sha512:a7de19bd7e24442fa488053ff16e54c7b1789a2836069a94a2f5a77e8dd7e9aa246667034d582eb98b1b396ffe4f860d1a87436f804d5256e916cc860c973de1 + VERSION=1.10.0 + SOURCE=${SPELL}-${VERSION}-src-with-docu.tar.gz + SOURCE_URL[0]=https://github.com/ukoethe/vigra/releases/download/Version-${VERSION//./-}/${SOURCE} + SOURCE_HASH=sha512:4c0edb9d5a05d341034b6fe504658525130ddf830b09af4e08d9080407dd10ec62355bed362c4876cb1504632202a5eb125dc50cb66b0617c28dd274b8367d4d SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION} WEB_SITE=http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra/ LICENSE[0]=http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra/LICENSE diff --git a/graphics-libs/vigra/HISTORY b/graphics-libs/vigra/HISTORY index aa0f051ae0..8ed939477a 100644 --- a/graphics-libs/vigra/HISTORY +++ b/graphics-libs/vigra/HISTORY @@ -1,3 +1,6 @@ +2014-09-14 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> + * DETAILS: version 1.10.0 + 2011-09-21 Pol Vinogradov <vin.public@gmail.com> * DETAILS: updated to 1.8.0, added one more URL * BUILD: switched to cmake build process diff --git a/graphics/brlcad/DEPENDS b/graphics/brlcad/DEPENDS index 05fdd85ff5..d28e76a740 100755 --- a/graphics/brlcad/DEPENDS +++ b/graphics/brlcad/DEPENDS @@ -1,5 +1,5 @@ depends bison && -depends gawk && +depends AWK && depends flex && depends ncurses && optional_depends zlib '--enable-zlib-build' '--disable-zlib-build' 'for compression support' && diff --git a/graphics/cgprof/DEPENDS b/graphics/cgprof/DEPENDS index e4cf037296..bc4f417daf 100755 --- a/graphics/cgprof/DEPENDS +++ b/graphics/cgprof/DEPENDS @@ -1,2 +1,2 @@ -depends gawk && +depends AWK && depends graphviz diff --git a/graphics/cinepaint/DEPENDS b/graphics/cinepaint/DEPENDS index 5a7a9bb796..0cc44debce 100755 --- a/graphics/cinepaint/DEPENDS +++ b/graphics/cinepaint/DEPENDS @@ -1,9 +1,9 @@ -depends autoconf && -depends automake && depends flex && depends fltk && depends ftgl && +depends gettext && depends gtk+2 "--enable-gtk2" && +depends glib2 && depends JPEG && depends lcms && depends libpng && diff --git a/graphics/cinepaint/DETAILS b/graphics/cinepaint/DETAILS index e75a1b286f..d35170a731 100755 --- a/graphics/cinepaint/DETAILS +++ b/graphics/cinepaint/DETAILS @@ -11,12 +11,12 @@ if [[ "${CINEPAINT_CVS}" == "y" ]] ; then SOURCE_DIRECTORY=${BUILD_DIRECTORY}/cinepaint-cvs FORCE_DOWNLOAD=on else - VERSION=1.3 - SOURCE=$SPELL-$VERSION.tgz - SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/CinePaint/CinePaint-${VERSION}/$SOURCE + VERSION=1.0-4 + SOURCE=$SPELL-$VERSION.tar.gz + SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/CinePaint/CinePaint-${VERSION}/${SOURCE} # SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME" - SOURCE_HASH=sha512:2f548af6d54ce246d4b6786d7d7aa6024d76c31b9d7ec2e073e780b3da8ec8c32fabc8efe50b3c640ca09a0302c1cc2e737b2013f4e07b6ba24d51c7a1c6c37d -SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL + SOURCE_HASH=sha512:de39f454499001cad22b54e1e8faf481d21d541932e47c65d7a9f5499a9dc67d585e46741a453b07db01fef4930c420d860c6cebfcc73e330fb5a33dc9b2cdae +SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${VERSION} fi WEB_SITE=http://cinepaint.sourceforge.net/ ENTERED=20021031 diff --git a/graphics/cinepaint/HISTORY b/graphics/cinepaint/HISTORY index 69f552c83f..a7b3fae168 100644 --- a/graphics/cinepaint/HISTORY +++ b/graphics/cinepaint/HISTORY @@ -1,3 +1,8 @@ +2014-09-06 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> + * DETAILS: version 1.0-4 + * PRE_BUILD, cinepaint-missing-include.patch: removed + * DEPENDS: remove dependencies on automake and autoconf + 2012-10-22 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> * DETAILS: version 1.3 * PRE_BUILD, cinepaint-missing-include.patch: add patch from diff --git a/graphics/cinepaint/PRE_BUILD b/graphics/cinepaint/PRE_BUILD deleted file mode 100755 index dd5f366a26..0000000000 --- a/graphics/cinepaint/PRE_BUILD +++ /dev/null @@ -1,4 +0,0 @@ -default_pre_build && -cd ${SOURCE_DIRECTORY} && -patch -p1 < ${SPELL_DIRECTORY}/cinepaint-missing-include.patch && -sh autogen.sh diff --git a/graphics/cinepaint/cinepaint-missing-include.patch b/graphics/cinepaint/cinepaint-missing-include.patch deleted file mode 100644 index ed159213aa..0000000000 --- a/graphics/cinepaint/cinepaint-missing-include.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur cinepaint-orig/plug-ins/icc_examin/icc_examin/icc_modell_beobachter.cpp cinepaint/plug-ins/icc_examin/icc_examin/icc_modell_beobachter.cpp ---- cinepaint-orig/plug-ins/icc_examin/icc_examin/icc_modell_beobachter.cpp 2012-04-20 18:51:10.625503826 -0400 -+++ cinepaint/plug-ins/icc_examin/icc_examin/icc_modell_beobachter.cpp 2012-04-20 18:52:04.478835055 -0400 -@@ -32,6 +32,7 @@ - - #include <list> - #include <string> -+#include <unistd.h> - - #include "icc_modell_beobachter.h" - diff --git a/graphics/dcraw/DETAILS b/graphics/dcraw/DETAILS index 46d742d2d6..3b093d2039 100755 --- a/graphics/dcraw/DETAILS +++ b/graphics/dcraw/DETAILS @@ -1,6 +1,6 @@ SPELL=dcraw - VERSION=9.19 - SOURCE_HASH=sha512:16597d92e53b16d0efa3da77a8a269dea5308028c1a4a7ef61f2c6e069ccab8aea7bfb95126c1fef63382df9d9e8e52a48f6d67b8aa826de947712c053c9961d + VERSION=9.22 + SOURCE_HASH=sha512:e4e332465b52eef1cf07e32a3962b24bcc6405614edd7d3d1fd375466fc5a253aaf212bf1b030d47e51f76d5c1bd7e0475813f302b67c7fba395d0cd922ee858 SOURCE=$SPELL-$VERSION.tar.gz SOURCE_DIRECTORY=$BUILD_DIRECTORY/dcraw SOURCE_URL[0]=http://www.cybercom.net/~dcoffin/dcraw/archive/$SOURCE diff --git a/graphics/dcraw/HISTORY b/graphics/dcraw/HISTORY index 1f2ee7f9db..e18fecf8cd 100644 --- a/graphics/dcraw/HISTORY +++ b/graphics/dcraw/HISTORY @@ -1,3 +1,6 @@ +2014-09-10 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> + * DETAILS: version 9.22 + 2013-08-30 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> * DETAILS: version 9.19 diff --git a/graphics/gexiv2/DETAILS b/graphics/gexiv2/DETAILS index 044186390f..b1e7cc6501 100755 --- a/graphics/gexiv2/DETAILS +++ b/graphics/gexiv2/DETAILS @@ -1,11 +1,10 @@ SPELL=gexiv2 - SPELLX=libgexiv2 - VERSION=0.6.1 - SOURCE_HASH=sha512:76aecd20ffac202badb51eab4e40fee563c3073892beec716bcf24e285df42f2498594a9e0bf487e198e8c955047d55e5b49b506bbf8b67c64956c0b99a84b1b - SOURCE=${SPELLX}_$VERSION.tar.xz -SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION + VERSION=0.10.1 + SOURCE_HASH=sha512:6b8a0c68b0370d14af704e08bc59953ef78f7b433f21429360b4ef6680d45881cb706e18bbf88c60c8d9f66dd05bce3f767164fcac4696cff73394ac071321a3 + SOURCE=${SPELL}-$VERSION.tar.xz +SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION WEB_SITE=http://trac.yorba.org/wiki/gexiv2 - SOURCE_URL[0]=http://yorba.org/download/gexiv2/${VERSION::3}/$SOURCE + SOURCE_URL[0]=https://download.gnome.org/sources/gexiv2/${VERSION%.*}/$SOURCE LICENSE[0]=GPL ENTERED=20100709 SHORT="GObject-based wrapper around the Exiv2 library" diff --git a/graphics/gexiv2/HISTORY b/graphics/gexiv2/HISTORY index d1aaf13737..dbf0596a57 100644 --- a/graphics/gexiv2/HISTORY +++ b/graphics/gexiv2/HISTORY @@ -1,3 +1,6 @@ +2014-09-06 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> + * DETAILS: version 0.10.1 + 2013-07-06 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> * DETAILS: version 0.6.1 * DEPENDS: add optional dependency on gobject-introspection diff --git a/graphics/gimp/DETAILS b/graphics/gimp/DETAILS index cb048d47cd..2e349d097f 100755 --- a/graphics/gimp/DETAILS +++ b/graphics/gimp/DETAILS @@ -1,13 +1,13 @@ SPELL=gimp if [[ $GIMP_DEVEL == y ]]; then - VERSION=2.8.10 + VERSION=2.8.14 SOURCE=$SPELL-$VERSION.tar.bz2 - SOURCE_HASH=sha512:21c96832ce61ecb2dad5276b454e7965263b6733add7e4a95cfc5f308fca681bceab21c1b77921332e0725d0e514e06868a4698ca9d7e4b30a28a07c7356a3a8 + SOURCE_HASH=sha512:533f6b931624d36525cb2f3fbc27fe27565d761bbe26873bb5445c06c01523c044d1814363a8cd76b6e381440db4c6e302b0d3f7a9e5aac7f60072770552f1ba SOURCE_URL[0]=ftp://ftp.gimp.org/pub/gimp/v${VERSION%.*}/$SOURCE else - VERSION=2.8.10 + VERSION=2.8.14 SOURCE=$SPELL-$VERSION.tar.bz2 - SOURCE_HASH=sha512:21c96832ce61ecb2dad5276b454e7965263b6733add7e4a95cfc5f308fca681bceab21c1b77921332e0725d0e514e06868a4698ca9d7e4b30a28a07c7356a3a8 + SOURCE_HASH=sha512:533f6b931624d36525cb2f3fbc27fe27565d761bbe26873bb5445c06c01523c044d1814363a8cd76b6e381440db4c6e302b0d3f7a9e5aac7f60072770552f1ba SOURCE_URL[0]=ftp://ftp.gimp.org/pub/gimp/v${VERSION%.*}/$SOURCE # SOURCE_GPG=gurus.gpg:$SOURCE.sig fi diff --git a/graphics/gimp/HISTORY b/graphics/gimp/HISTORY index 2c1b312c44..fe3e7774f6 100644 --- a/graphics/gimp/HISTORY +++ b/graphics/gimp/HISTORY @@ -1,3 +1,6 @@ +2014-09-06 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> + * DETAILS: version 2.8.14 + 2013-12-21 Robin Cook <rcook@wyrms.net> * PRE_BUILD: added to fix freetype2 header path diff --git a/graphics/gocr/DETAILS b/graphics/gocr/DETAILS index 3bb865ef49..043d125614 100755 --- a/graphics/gocr/DETAILS +++ b/graphics/gocr/DETAILS @@ -1,9 +1,9 @@ - SPELL=gocr - VERSION=0.48 - SOURCE_HASH=sha512:53520c94b6991818482d0f6a5e3e7102f8530fd1215607b04e528244b697479d98669cfe4fd9098e5e1a2e5dd88c45f1edb1171c14adb798e811efd23bdada73 + SPELL=gocr + VERSION=0.50 + SOURCE_HASH=sha512:36392516711d43f8561147684b6f4e22a450bc87f1cb30ceaab4a1821ac583ff5a3d25b3bbf1637f01bfb55366b45cc7d5086d1f29f006d615bb658d0e5faab9 SOURCE=$SPELL-$VERSION.tar.gz SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION - SOURCE_URL[0]=$SOURCEFORGE_URL/jocr/$SOURCE + SOURCE_URL[0]=http://www-e.uni-magdeburg.de/jschulen/ocr/$SOURCE WEB_SITE=http://jocr.sourceforge.net LICENSE=GPL DOCS="HISTORY README doc/gocr.html" diff --git a/graphics/gocr/HISTORY b/graphics/gocr/HISTORY index 813ccfbc62..bb16e0b7bd 100644 --- a/graphics/gocr/HISTORY +++ b/graphics/gocr/HISTORY @@ -1,3 +1,7 @@ +2014-09-11 Ismael Luceno <ismael@sourcemage.org> + * DETAILS: Fixed SOURCE_URL[0] + updated spell to 0.50 + 2010-04-12 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 0.48 * BUILD: deleted diff --git a/graphics/imagemagick/DETAILS b/graphics/imagemagick/DETAILS index 4cc9484250..c680eabeb8 100755 --- a/graphics/imagemagick/DETAILS +++ b/graphics/imagemagick/DETAILS @@ -1,12 +1,12 @@ SPELL=imagemagick SPELLX=ImageMagick - VERSION=6.8.9-0 + VERSION=6.8.9-7 SECURITY_PATCH=1 SOURCE=$SPELLX-$VERSION.tar.xz SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION" SOURCE_URL[0]=http://www.imagemagick.org/download/$SOURCE - SOURCE_URL[1]=http://www.imagemagick.org/download/legacy/$SOURCE - SOURCE_HASH=sha512:d469a204f3c49318847681ab8dee642c1636634260c784765694582217235bdd1c12f6827614294c04882dda2f36791b0f1eb058bbf642d21c83cb24b44f9289 + SOURCE_URL[1]=http://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/$SOURCE + SOURCE_HASH=sha512:e9be966b430d4aca1fe64435b68a5586c458ba8e238ba47d5d7046e90c2e807e6f7b476ede00c22ffb2dbdf9bb21762e121bba6e48062ebee2800612caf81eed CCACHE="off" WEB_SITE=http://www.imagemagick.org/ ENTERED=20010922 diff --git a/graphics/imagemagick/HISTORY b/graphics/imagemagick/HISTORY index b5ac79ff85..a0485da0c9 100644 --- a/graphics/imagemagick/HISTORY +++ b/graphics/imagemagick/HISTORY @@ -1,3 +1,13 @@ +2014-09-04 Remko van der Vossen <wich@sourcemage.org> + * DETAILS: version 6.8.9-7 + +2014-09-03 Thomas Orgis <sobukus@sourcemage.org> + * DETAILS: put in an existing backup URL (yes, we also could update, + but things are removed too quickly from primary site) + +2014-07-14 Remko van der Vossen <wich@sourcemage.org> + * DETAILS: version 6.8.9-5 + 2014-04-27 Ismael Luceno <ismael@sourcemage.org> * DETAILS: updated spell to 6.8.9-0 diff --git a/graphics/nitrogen/DEPENDS b/graphics/nitrogen/DEPENDS index c921199ab0..9c84df79df 100755 --- a/graphics/nitrogen/DEPENDS +++ b/graphics/nitrogen/DEPENDS @@ -1 +1,9 @@ -depends gtkmm2 +depends gtkmm2 && +depends gtk+2 && +depends glib2 && +depends -sub CXX gcc && +optional_depends libxinerama "--enable-xinerama" "--disable-xinerama" "for multi-monitor support" +if [[ $NITROGEN_BRANCH == scm ]]; then + depends automake && + depends autoconf +fi diff --git a/graphics/nitrogen/DETAILS b/graphics/nitrogen/DETAILS index 095f3ad812..1742c15281 100755 --- a/graphics/nitrogen/DETAILS +++ b/graphics/nitrogen/DETAILS @@ -1,9 +1,19 @@ +. "$GRIMOIRE/FUNCTIONS" SPELL=nitrogen +if [[ $NITROGEN_BRANCH == scm ]]; then + VERSION=$(get_scm_version) + SOURCE=$SPELL-git.tar.bz2 + SOURCE_URL[0]=git://github.com/l3ib/nitrogen.git + SOURCE_IGNORE=volatile + FORCE_DOWNLOAD=1 +SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git" +else VERSION=1.5.2 SOURCE="${SPELL}-${VERSION}.tar.gz" SOURCE_URL[0]=http://projects.l3ib.org/${SPELL}/files/${SOURCE} SOURCE_HASH=sha512:f4fdafcecb946f6918220f7562a69eb5223d4303c9bf3df4adb5dedfd8d402ee4f3fd3b1692875ede545d3e03f0ca88fa475206a839bb36677fa008a33e99551 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}" +fi WEB_SITE="http://projects.l3ib.org/nitrogen/" LICENSE[0]=GPL ENTERED=20080808 diff --git a/graphics/nitrogen/HISTORY b/graphics/nitrogen/HISTORY index 1649ff1a43..a1a2980a85 100644 --- a/graphics/nitrogen/HISTORY +++ b/graphics/nitrogen/HISTORY @@ -1,3 +1,9 @@ +2014-09-17 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> + * DETAILS, DEPENDS, PRE_BUILD, PREPARE: add support for building + the scm version + * DEPENDS: add dependencies on gtk+2, glib2, gcc and an optional + dependency on libxinerama + 2013-03-01 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> * DETAILS: version 1.5.2 * BUILD: add libX11 to LDFLAGS diff --git a/graphics/nitrogen/PREPARE b/graphics/nitrogen/PREPARE new file mode 100755 index 0000000000..98d27e41ff --- /dev/null +++ b/graphics/nitrogen/PREPARE @@ -0,0 +1,2 @@ +. ${GRIMOIRE}/FUNCTIONS && +prepare_select_branch stable scm diff --git a/graphics/nitrogen/PRE_BUILD b/graphics/nitrogen/PRE_BUILD new file mode 100755 index 0000000000..64cba99618 --- /dev/null +++ b/graphics/nitrogen/PRE_BUILD @@ -0,0 +1,5 @@ +default_pre_build && +cd ${SOURCE_DIRECTORY} && +if [[ $NITROGEN_BRANCH == scm ]]; then + ./bootstrap +fi diff --git a/graphics/scrot/DEPENDS b/graphics/scrot/DEPENDS index 17c26484f2..e5eda80dac 100755 --- a/graphics/scrot/DEPENDS +++ b/graphics/scrot/DEPENDS @@ -1 +1,3 @@ -depends giblib +depends giblib && +depends imlib2 && +depends libx11 diff --git a/graphics/scrot/HISTORY b/graphics/scrot/HISTORY index bddf88be55..281b3d7b6a 100644 --- a/graphics/scrot/HISTORY +++ b/graphics/scrot/HISTORY @@ -1,3 +1,6 @@ +2014-09-25 Remko van der Vossen <wich@sourcemage.org> + * DEPENDS: imlib2, libx11 + 2006-10-03 Juuso Alasuutari <iuso@sourcemage.org> * DETAILS: [automated] Removed UPDATED. diff --git a/http/firefox/DEPENDS b/http/firefox/DEPENDS index ba5c51d515..2dda25ff87 100755 --- a/http/firefox/DEPENDS +++ b/http/firefox/DEPENDS @@ -1,20 +1,26 @@ -depends -sub CXX gcc && +depends atk && +depends cairo && +depends fontconfig && +depends freetype2 && +depends -sub CXX gcc && +depends gdk-pixbuf2 && +depends glib2 && +depends gtk+2 '--enable-xft --disable-freetype2' && depends nspr '--with-system-nspr' && depends -sub "3.16.x" nss '--with-system-nss' && -depends zlib '--with-system-zlib' && -depends libjpeg-turbo '--with-system-jpeg' && depends libidl && +depends libjpeg-turbo '--with-system-jpeg' && +depends libx11 && +depends libxext && +depends libxrender && +depends libxt && +depends pango && depends perl && +depends pysqlite && depends python && -depends zip && -depends gtk+2 '--enable-xft --disable-freetype2' && depends -sub "TSAFE SECURE_DELETE ENABLE_UNLOCK_NOTIFY" sqlite '--enable-system-sqlite' && -depends pysqlite && - -depends atk && -depends glib2 && -depends pango && -depends cairo && +depends zip && +depends zlib '--with-system-zlib' && optional_depends startup-notification \ '--enable-startup-notification' \ diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS index 8f7857942c..350122e6d4 100755 --- a/http/firefox/DETAILS +++ b/http/firefox/DETAILS @@ -1,11 +1,11 @@ SPELL=firefox - VERSION=32.0 + VERSION=32.0.3 SOURCE=$SPELL-$VERSION.source.tar.bz2 - SOURCE_HASH=sha512:e9422c92846bda9dfa4da914be1206c41a8edde7e8bb13d81211433fc2c9013bbaee9bded40f7acf031d675272b04d7902d5631d2932daa3a8a594f768c87974 + SOURCE_HASH=sha512:4cc4beb2bc00e38c61dea2878e75bdd28accbb0850d50146ae8e70e4c6d062f2985a23a6c4b84cd0ca552659a2b77843c3de93229708bc996cbb11d3b6497943 SOURCE_URL[0]=http://releases.mozilla.org/pub/mozilla.org/${SPELL}/releases/${VERSION}/source/${SOURCE} SOURCE_URL[1]=ftp://ftp.mozilla.org/pub/$SPELL/releases/$VERSION/source/$SOURCE SOURCE_URL[2]=ftp://ftp.in2p3.fr/pub/mozilla/$SPELL/releases/$VERSION/source/$SOURCE - SECURITY_PATCH=75 + SECURITY_PATCH=76 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION" WEB_SITE=https://www.mozilla.org/en-US/firefox/fx/ GATHER_DOCS=off diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY index 95155acf27..64d2ddec5a 100644 --- a/http/firefox/HISTORY +++ b/http/firefox/HISTORY @@ -1,3 +1,12 @@ +2014-09-25 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> + * DETAILS: version 32.0.3, security update + +2014-09-13 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> + * DETAILS: version 32.0.1 + +2014-09-09 Remko van der Vossen <wich@sourcemage.org> + * DEPENDS: added various missing dependencies + 2014-09-03 Ladislav Hagara <hgr@vabo.cz> * DETAILS: 32.0, SECURITY_PATCH=75 * PRE_BUILD, bug999496_change1f10a8067853.patch: patch removed diff --git a/http/seamonkey/DEPENDS b/http/seamonkey/DEPENDS index 680ff142b2..4b141a9829 100755 --- a/http/seamonkey/DEPENDS +++ b/http/seamonkey/DEPENDS @@ -11,7 +11,7 @@ if spell_ok nspr && is_version_less $(installed_version nspr) 4.9.3; then force_depends nspr fi && -depends -sub 3.15.x nss && +depends -sub 3.16.x nss && if spell_ok nss && is_version_less $(installed_version nss) 3.15.1; then force_depends nss diff --git a/http/seamonkey/DETAILS b/http/seamonkey/DETAILS index c43c7c8ca4..0efab1ec97 100755 --- a/http/seamonkey/DETAILS +++ b/http/seamonkey/DETAILS @@ -1,8 +1,8 @@ SPELL=seamonkey - VERSION=2.21 - SECURITY_PATCH=56 + VERSION=2.29 + SECURITY_PATCH=57 SOURCE=$SPELL-$VERSION.source.tar.bz2 - SOURCE_HASH=sha512:1d141bb5507b2b2f4be3d0435342c54c04aa5a4942f801ab34e9af216e164153d4a34c47e68231ff3a958a64860be718452bb904c71e787067c93cdeae0c5643 + SOURCE_HASH=sha512:5cba0c75f70489c6ef9a349e005dd99b60a9f72a43efdecdbf5d4a3d8ecd2b2c72159c104957801db9f5394eef247859735e6cf281deb4e2d9aaca66d5ddcae3 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION" SOURCE_URI=seamonkey/releases/$VERSION/source/$SOURCE SOURCE_URL[0]=ftp://ftp.mozilla.org/pub/mozilla.org/$SOURCE_URI diff --git a/http/seamonkey/HISTORY b/http/seamonkey/HISTORY index e86ff158e1..2a50619fdc 100644 --- a/http/seamonkey/HISTORY +++ b/http/seamonkey/HISTORY @@ -1,3 +1,7 @@ +2014-09-08 Ladislav Hagara <hgr@vabo.cz> + * DETAILS: 2.29, SECURITY_PATCH=57 + * DEPENDS: nss >= 3.16.2 is needed + 2013-09-19 Ladislav Hagara <hgr@vabo.cz> * DETAILS: 2.21, SECURITY_PATCH=56 * DEPENDS: sqlite3 >= 3.7.17 is needed diff --git a/kde4-support/phonon-backend-gstreamer/DETAILS b/kde4-support/phonon-backend-gstreamer/DETAILS index 9bd801bb84..872a1c5a1b 100755 --- a/kde4-support/phonon-backend-gstreamer/DETAILS +++ b/kde4-support/phonon-backend-gstreamer/DETAILS @@ -1,8 +1,8 @@ SPELL=phonon-backend-gstreamer - VERSION=4.7.2 - SOURCE_HASH=sha512:d8cf408261f80de7ac29101c3613002a0e838f07e6c8dad2d3922a522a27be167ef8f17a8ab0c99c06c1b75cb4d9d68acee03cb60cf4a44dc2248b7b0dafae08 + VERSION=4.8.0 + SOURCE_HASH=sha512:ab26afc6ba914c1c63ce6eefce7a161df71537eb04c52ffb51245a5190de072d46604fc15d4eb85dd1ceacabf3c5257df7d0e9e72f96567c87f9eef34009fece SOURCE=$SPELL-$VERSION.tar.xz - SOURCE_URL[0]=$KDE_URL/stable/phonon/$SPELL/$VERSION/src/$SOURCE + SOURCE_URL[0]=$KDE_URL/stable/phonon/$SPELL/$VERSION/$SOURCE SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION WEB_SITE=http://phonon.kde.org/ LICENSE[0]=LGPL diff --git a/kde4-support/phonon-backend-gstreamer/HISTORY b/kde4-support/phonon-backend-gstreamer/HISTORY index 3267b39dbe..c519def8e7 100644 --- a/kde4-support/phonon-backend-gstreamer/HISTORY +++ b/kde4-support/phonon-backend-gstreamer/HISTORY @@ -1,3 +1,6 @@ +2014-09-09 Ladislav Hagara <hgr@vabo.cz> + * DETAILS: 4.8.0, SOURCE_URL[0] updated + 2014-08-05 Ladislav Hagara <hgr@vabo.cz> * DETAILS: 4.7.2 diff --git a/kde4-support/phonon-backend-vlc/DETAILS b/kde4-support/phonon-backend-vlc/DETAILS index a317376a82..9d17241cce 100755 --- a/kde4-support/phonon-backend-vlc/DETAILS +++ b/kde4-support/phonon-backend-vlc/DETAILS @@ -1,8 +1,8 @@ SPELL=phonon-backend-vlc - VERSION=0.7.2 - SOURCE_HASH=sha512:9a2b45d02ed958f82ff4fb8d3e9233eeb35047670061b59266fa7504855a149de1a401cad34871083e42c8d05620ff0e3df9f1a7a3e1f9b82ddac886c50adfce + VERSION=0.8.0 + SOURCE_HASH=sha512:fa2c71d45f5085566639b8f74638a9994cc0148f15045ec480b25844414f3c660fd9b24848263dc80aa8f931bff0a9559d918b5d777d91b822ff154b3c1ed8ca SOURCE=$SPELL-$VERSION.tar.xz - SOURCE_URL[0]=$KDE_URL/stable/phonon/$SPELL/$VERSION/src/$SOURCE + SOURCE_URL[0]=$KDE_URL/stable/phonon/$SPELL/$VERSION/$SOURCE SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION WEB_SITE=http://phonon.kde.org/ LICENSE[0]=LGPL diff --git a/kde4-support/phonon-backend-vlc/HISTORY b/kde4-support/phonon-backend-vlc/HISTORY index 90e13cca3a..060d96d4a2 100644 --- a/kde4-support/phonon-backend-vlc/HISTORY +++ b/kde4-support/phonon-backend-vlc/HISTORY @@ -1,3 +1,6 @@ +2014-09-09 Ladislav Hagara <hgr@vabo.cz> + * DETAILS: 0.8.0, SOURCE_URL[0] updated + 2014-08-05 Ladislav Hagara <hgr@vabo.cz> * DETAILS: 0.7.2, SOURCE_URL[0] updated diff --git a/kde4-support/phonon/DETAILS b/kde4-support/phonon/DETAILS index 6cddfb3819..d8d0ee3f04 100755 --- a/kde4-support/phonon/DETAILS +++ b/kde4-support/phonon/DETAILS @@ -11,8 +11,8 @@ fi SOURCE_URL[0]=git://gitorious.org/$SPELL/$SPELL.git:$SPELL-git SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-git else - VERSION=4.7.2 - SOURCE_HASH=sha512:b576b8f69ea2db58303dab3b6e64df4e3238a86610b4f549634a067ba680bd66a6df53285303a8e46df458e6da0b8e9c9112c917b054304397abb556de3a6bb5 + VERSION=4.8.0 + SOURCE_HASH=sha512:0dc12a4d479245ba7ffab954c91c78e3c469982e6b8ed5ff9b80150aebab448023ffde68b67a2520ca76af9ce3c0608d250f59275767c092f4e364da8cfe105f SOURCE=$SPELL-$VERSION.tar.xz SOURCE_URL[0]=$KDE_URL/stable/phonon/$VERSION/$SOURCE SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION diff --git a/kde4-support/phonon/HISTORY b/kde4-support/phonon/HISTORY index b6cc17ee3b..e7ab9d9bb3 100644 --- a/kde4-support/phonon/HISTORY +++ b/kde4-support/phonon/HISTORY @@ -1,3 +1,7 @@ +2014-09-09 Ladislav Hagara <hgr@vabo.cz> + * DETAILS: 4.8.0 + * PRE_BUILD: removed + 2014-08-05 Ladislav Hagara <hgr@vabo.cz> * DETAILS: 4.7.2, SOURCE_URL[0] updated diff --git a/kde4-support/phonon/PRE_BUILD b/kde4-support/phonon/PRE_BUILD deleted file mode 100755 index 624577ec21..0000000000 --- a/kde4-support/phonon/PRE_BUILD +++ /dev/null @@ -1,6 +0,0 @@ -mk_source_dir $SOURCE_DIRECTORY && -cd $BUILD_DIRECTORY && -verify_file '' && -xz -dc $SOURCE_CACHE/$SOURCE | tar -xf - && -cd $SOURCE_DIRECTORY - diff --git a/kernels/linux/HISTORY b/kernels/linux/HISTORY index 06511688cb..c7e1267515 100644 --- a/kernels/linux/HISTORY +++ b/kernels/linux/HISTORY @@ -1,3 +1,7 @@ +2014-09-06 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> + * info/kernels/3.16.2, latest.defaults, + info/patches/maintenance_patches_3/patch-3.16.2: version 3.16.2 + 2014-08-14 Ladislav Hagara <hgr@vabo.cz> * latest.defaults: LATEST_maintenance_patches_3=patch-3.16.1 * info/patches/maintenance_patches_3/patch-3.16.1: added diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.16.2 b/kernels/linux/info/patches/maintenance_patches_3/patch-3.16.2 new file mode 100755 index 0000000000..24860b5d61 --- /dev/null +++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.16.2 @@ -0,0 +1,5 @@ +appliedkernels="3.16" +patchversion="${appliedkernels}.2" +source="patch-${patchversion}.xz" +source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}" +sha1sum="8bb4cdf8a8c4958d870db987227441e8a45292c8" diff --git a/kernels/linux/latest.defaults b/kernels/linux/latest.defaults index 46988c8be8..9715c3c319 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.1 +LATEST_maintenance_patches_3=patch-3.16.2 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 diff --git a/latex/latex-beamer/DETAILS b/latex/latex-beamer/DETAILS index 6a545295c6..434d4e6e23 100755 --- a/latex/latex-beamer/DETAILS +++ b/latex/latex-beamer/DETAILS @@ -1,10 +1,11 @@ SPELL=latex-beamer - VERSION=3.07 - SOURCE="${SPELL}-${VERSION}.tar.gz" - SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE - SOURCE_HASH=sha512:c010b88f11cc2c6a455f622c9d65ba5907a68aeb984d0ec06f0b417b9871847d8180ec489074726f09563e3ec07717bf4b2984bdf64f7538f304b5d598a29ac6 -SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}" - WEB_SITE="http://${SPELL}.sourceforge.net" + VERSION=3.33 + COMMIT=31cc758a62ae + SOURCE="${SPELL}-${VERSION}.tar.bz2" + SOURCE_URL[0]=https://bitbucket.org/rivanvx/beamer/get/version-${VERSION//./-}.tar.bz2 + SOURCE_HASH=sha512:2df00786fbec66fe145ab82c3b53f2b419d6a2b6bfc81dbe123be9434dfec1d66e52ad14787f01300f5d6eb9880965812c70e0b4e01c988168498c5c70426fe2 +SOURCE_DIRECTORY="${BUILD_DIRECTORY}/rivanvx-beamer-$COMMIT" + WEB_SITE="https://bitbucket.org/rivanvx/beamer/" LICENSE[0]=GPL GATHER_DOCS="off" ENTERED=20070427 diff --git a/latex/latex-beamer/HISTORY b/latex/latex-beamer/HISTORY index de6f9785d8..da5992fe1d 100644 --- a/latex/latex-beamer/HISTORY +++ b/latex/latex-beamer/HISTORY @@ -1,3 +1,7 @@ +2014-09-15 Ismael Luceno <ismael@sourcemage.org> + * DETAILS: Fixed SOURCE_URL[0] + updated spell to 3.33 + 2009-09-24 Andraž "ruskie" Levstik <ruskie+f03a580f@codemages.net> * DEPENDS: switch from tetex to texlive [auto] diff --git a/latex/latex-beamer/INSTALL b/latex/latex-beamer/INSTALL index 7e99018665..9bd5417096 100755 --- a/latex/latex-beamer/INSTALL +++ b/latex/latex-beamer/INSTALL @@ -1,7 +1,10 @@ -mkdir -p ${INSTALL_ROOT}/usr/share/texmf/tex/latex/beamer && -mkdir -p ${INSTALL_ROOT}/usr/share/texmf/doc/beamer && -cp -R ${SOURCE_DIRECTORY}/doc/* \ - ${SOURCE_DIRECTORY}/{examples,solutions} \ - ${INSTALL_ROOT}/usr/share/texmf/doc/beamer -cp -R ${SOURCE_DIRECTORY}/{base,themes,emulation,extensions} \ - $INSTALL_ROOT/usr/share/texmf/tex/latex/beamer +mkdir -p "$INSTALL_ROOT"/usr/share/texmf/tex/latex/beamer && +mkdir -p "$INSTALL_ROOT"/usr/share/texmf/doc/beamer && +mkdir -p "$INSTALL_ROOT"/usr/share/emacs/site-lisp && +cp -R "$SOURCE_DIRECTORY"/emacs/* \ + "$INSTALL_ROOT"/usr/share/emacs/site-lisp && +cp -R "$SOURCE_DIRECTORY"/doc/* \ + "$SOURCE_DIRECTORY"/{examples,solutions} \ + "$INSTALL_ROOT"/usr/share/texmf/doc/beamer && +cp -R "$SOURCE_DIRECTORY"/base \ + "$INSTALL_ROOT"/usr/share/texmf/tex/latex/beamer diff --git a/libs/gettext/DEPENDS b/libs/gettext/DEPENDS index 15d0097666..08e490d9d9 100755 --- a/libs/gettext/DEPENDS +++ b/libs/gettext/DEPENDS @@ -1,4 +1,5 @@ depends gnupg && +depends icu && depends smgl-fhs && optional_depends libxml2 "" "--with-included-libxml" "use system libxml2" && diff --git a/libs/gettext/HISTORY b/libs/gettext/HISTORY index fc64936132..c68a84bf4f 100644 --- a/libs/gettext/HISTORY +++ b/libs/gettext/HISTORY @@ -1,3 +1,6 @@ +2014-09-09 Remko van der Vossen <wich@sourcemage.org> + * DEPENDS: icu + 2014-07-14 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 0.19.2 diff --git a/libs/isl/DETAILS b/libs/isl/DETAILS new file mode 100755 index 0000000000..c546affb1d --- /dev/null +++ b/libs/isl/DETAILS @@ -0,0 +1,26 @@ + SPELL=isl + VERSION=0.13 + SOURCE="${SPELL}-${VERSION}.tar.xz" + SOURCE_URL[0]=http://${SPELL}.gforge.inria.fr/${SOURCE} + SOURCE_HASH=sha512:08cbcefc671be7754ec8ab17695d960bc2340df06d8c16143530f24b38dc1d0bc1ed095ba4f8c1c61d99739224ce2d8b07a648953026fef5bdd4f390d6fe3b43 +SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}" + WEB_SITE="http://isl.gforge.inria.fr/" + LICENSE[0]="MIT" + ENTERED=20140917 + KEYWORDS="" + SHORT="Integer Set Library" +cat << EOF +isl is a library for manipulating sets and relations of integer points bounded +by linear constraints. Supported operations on sets include intersection, +union, set difference, emptiness check, convex hull, (integer) affine hull, +integer projection, computing the lexicographic minimum using parametric +integer programming, coalescing and parametric vertex enumeration. It also +includes an ILP solver based on generalized basis reduction, transitive +closures on maps (which may encode infinite graphs), dependence analysis +and bounds on piecewise step-polynomials. For more information see +the project page, the online user manual (html) or the complete manual +(pdf). For an introduction to the underlying concepts, see the first part +of the presentation Integer sets and relations: from high-level modeling to +low-level implementation . The barvinok package contains an iscc calculator +that exposes some of the operations supported by isl. +EOF diff --git a/libs/isl/HISTORY b/libs/isl/HISTORY new file mode 100644 index 0000000000..5056b992c5 --- /dev/null +++ b/libs/isl/HISTORY @@ -0,0 +1,2 @@ +2014-09-17 Ismael Luceno <ismael@sourcemage.org> + * DETAILS: spell created diff --git a/libs/libiptcdata/DETAILS b/libs/libiptcdata/DETAILS index 5685756245..4498a0d3f9 100755 --- a/libs/libiptcdata/DETAILS +++ b/libs/libiptcdata/DETAILS @@ -1,7 +1,7 @@ SPELL=libiptcdata VERSION=1.0.4 SOURCE=$SPELL-$VERSION.tar.gz - SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE + SOURCE_URL[0]="${SOURCEFORGE_URL}/${SPELL}/${SPELL}/${VERSION}/${SOURCE}" SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION SOURCE_GPG="gurus.gpg:${SOURCE}.sig" LICENSE[0]=LGPL diff --git a/libs/libiptcdata/HISTORY b/libs/libiptcdata/HISTORY index cdbacbbc65..8d6d9441a2 100644 --- a/libs/libiptcdata/HISTORY +++ b/libs/libiptcdata/HISTORY @@ -1,3 +1,6 @@ +2014-09-16 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> + * DETAILS: fix SOURCE_URL[0] + 2010-07-26 Ladislav Hagara <hgr@vabo.cz> * DETAILS: 1.0.4 diff --git a/libs/libtirpc/DETAILS b/libs/libtirpc/DETAILS index 0193fc3f87..ac53e9d724 100755 --- a/libs/libtirpc/DETAILS +++ b/libs/libtirpc/DETAILS @@ -1,6 +1,6 @@ SPELL=libtirpc - VERSION=0.2.3 - SOURCE_HASH=sha512:dd480fcb6feda4a2bba7e5a5dc9b1f523697a39ddaa44a5742405f66d202996d99a562a31dbf6daf06e9b7ce5d82dfd1cce7b76a34466b92f84176e77498163d + VERSION=0.2.5 + SOURCE_HASH=sha512:9f8afa1acb04a2c2c558018f2528f8caaa79994a2af2abeed947f914145872ef72988b241e11925c799db0de9ec51fd9baecd2b08150240b22f91e2e55a45194 SOURCE="${SPELL}-${VERSION}.tar.bz2" SOURCE_URL[0]="${SOURCEFORGE_URL}/libtirpc/libtirpc/${VERSION}/${SOURCE}" SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}" diff --git a/libs/libtirpc/HISTORY b/libs/libtirpc/HISTORY index 96c69649f2..1b4a7fbc20 100644 --- a/libs/libtirpc/HISTORY +++ b/libs/libtirpc/HISTORY @@ -1,3 +1,6 @@ +2014-09-05 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 0.2.5 + 2013-09-15 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> * DETAILS: fix SOURCE_URL[0] diff --git a/libs/newt/DEPENDS b/libs/newt/DEPENDS index 692a7f4d37..ca937ef053 100755 --- a/libs/newt/DEPENDS +++ b/libs/newt/DEPENDS @@ -8,4 +8,4 @@ optional_depends tcl "--with-tcl" \ "--without-tcl" \ "tcl bindings" && -optional_depends python '' '' 'for Python bindings' +optional_depends python '' '' 'for Python bindings (snack module)' diff --git a/libs/newt/DETAILS b/libs/newt/DETAILS index ab9bc7b48d..5187acce2b 100755 --- a/libs/newt/DETAILS +++ b/libs/newt/DETAILS @@ -6,7 +6,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${VERSION} SOURCE_URL[0]=https://fedorahosted.org/releases/n/e/${SPELL}/${SOURCE} SOURCE_HINTS[0]=no-check-certificate LICENSE[0]=LGPL - WEB_SITE=http://www.redhat.com/ + WEB_SITE=https://fedorahosted.org/newt/ ENTERED=20020316 KEYWORDS="libs" SHORT="A development library for text mode user interfaces." diff --git a/libs/newt/HISTORY b/libs/newt/HISTORY index 4fe457a3e8..f0da94383f 100644 --- a/libs/newt/HISTORY +++ b/libs/newt/HISTORY @@ -1,3 +1,7 @@ +2014-09-14 Ismael Luceno <ismael@sourcemage.org> + * DETAILS: Update website + * DEPENDS: Clarify the python's module name + 2014-04-07 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> * DETAILS: version 0.52.17 diff --git a/libs/sip/DETAILS b/libs/sip/DETAILS index daeb8081d8..1c6540f213 100755 --- a/libs/sip/DETAILS +++ b/libs/sip/DETAILS @@ -1,6 +1,6 @@ SPELL=sip - VERSION=4.16.2 - SOURCE_HASH=sha512:07ced0188bd4dc897ddacbce226b33ac9d236455a95018e900fd5f652439c905ddd56688f8bb29f704fcf201a8e668d5cc89ba887065826653087cf0a9f6dbfb + VERSION=4.16.3 + SOURCE_HASH=sha512:99fc63706212f052c907e4e6d16b224a5389ffb316a90e9d8d8e79c9a8f41ce6038b7c3f4b168e155d81cf394a05073b946142946902dc3bbacec73f0523d109 SOURCE=$SPELL-$VERSION.tar.gz SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION SOURCE_URL[0]=${SOURCEFORGE_URL}/pyqt/$SPELL/$SPELL-$VERSION/$SOURCE diff --git a/libs/sip/HISTORY b/libs/sip/HISTORY index 618f80e327..96fe912f11 100644 --- a/libs/sip/HISTORY +++ b/libs/sip/HISTORY @@ -1,3 +1,6 @@ +2014-09-20 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 4.16.3 + 2014-08-11 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 4.16.2 diff --git a/mail/courier-authlib/DEPENDS b/mail/courier-authlib/DEPENDS index a02829e52d..22afa299a4 100755 --- a/mail/courier-authlib/DEPENDS +++ b/mail/courier-authlib/DEPENDS @@ -1,4 +1,4 @@ -#depends libtool && +depends libtool && case ${CAUTHLIB_AUTHDB} in db) depends db "--with-db=db" diff --git a/mail/courier-authlib/HISTORY b/mail/courier-authlib/HISTORY index cd92b860a4..c754af5363 100644 --- a/mail/courier-authlib/HISTORY +++ b/mail/courier-authlib/HISTORY @@ -1,3 +1,6 @@ +2014-09-09 Remko van der Vossen <wich@sourcemage.org> + * DEPENDS: libtool + 2011-03-27 Remko van der Vossen <wich@sourcemage.org> * DETAILS: version 0.63.0 * DEPENDS: removed non-existent configure flags diff --git a/mail/courier/HISTORY b/mail/courier/HISTORY index 62eada046a..f81f028ff6 100644 --- a/mail/courier/HISTORY +++ b/mail/courier/HISTORY @@ -7,6 +7,9 @@ 2012-01-19 Vlad Glagolev <stealth@sourcemage.org> * CONFLICTS: added masqmail +2011-04-02 Remko van der Vossen <wich@sourcemage.org> + * init.d/courier_filter: added + 2011-03-27 Remko van der Vossen <wich@sourcemage.org> * DETAILS: version 0.65.3 * init.d/*: simplified and use smgl_init (working NEEDS) diff --git a/mail/courier/init.d/courier_filter b/mail/courier/init.d/courier_filter new file mode 100755 index 0000000000..d46d9d4044 --- /dev/null +++ b/mail/courier/init.d/courier_filter @@ -0,0 +1,25 @@ +#!/bin/bash + +PROGRAM=/bin/false +RUNLEVEL=3 +NEEDS="courier" + +. /etc/init.d/smgl_init + +start() +{ + /usr/sbin/courierfilter start + evaluate_retval +} + +stop() +{ + /usr/sbin/courierfilter stop + evaluate_retval +} + +restart() +{ + /usr/sbin/courierfilter restart + evaluate_retval +} diff --git a/mail/exim/DEPENDS b/mail/exim/DEPENDS index 8cae3ee1c5..01cfab1c13 100755 --- a/mail/exim/DEPENDS +++ b/mail/exim/DEPENDS @@ -1,5 +1,5 @@ depends pcre && -depends gawk && +depends AWK && if [[ "$EXIM_DBM" == "db" ]]; then depends db elif [[ "$EXIM_DBM" == "gdbm" ]]; then diff --git a/mail/fdm/DEPENDS b/mail/fdm/DEPENDS index 6b7b0f99c4..92401b1634 100755 --- a/mail/fdm/DEPENDS +++ b/mail/fdm/DEPENDS @@ -1 +1,3 @@ +depends pcre && +depends SSL && depends tdb diff --git a/mail/fdm/HISTORY b/mail/fdm/HISTORY index 4461e4ca12..9723325a8d 100644 --- a/mail/fdm/HISTORY +++ b/mail/fdm/HISTORY @@ -1,3 +1,6 @@ +2014-09-09 Remko van der Vossen <wich@sourcemage.org> + * DEPENDS: pcre, SSL + 2013-06-05 Remko van der Vossen <wich@sourcemage.org> * DETAILS: version 1.7 * BUILD: now uses a configure diff --git a/mail/thunderbird/DEPENDS b/mail/thunderbird/DEPENDS index 1d1fc7eeb1..b88876f774 100755 --- a/mail/thunderbird/DEPENDS +++ b/mail/thunderbird/DEPENDS @@ -1,18 +1,29 @@ -depends -sub CXX gcc && -depends nspr '--with-system-nspr' && -depends -sub "3.16.x" nss '--with-system-nss' && -depends zlib '--with-system-zlib' && -depends JPEG '--with-system-jpeg' && -depends libidl && -depends perl && -depends python && -depends zip && -depends gtk+2 '--enable-xft --disable-freetype2' && -depends -sub "TSAFE SECURE_DELETE ENABLE_UNLOCK_NOTIFY" sqlite '--enable-system-sqlite' && -depends pysqlite && -#depends -sub 'TEE' cairo "--enable-system-cairo \ -# --enable-default-toolkit=cairo-gtk2" && -# +depends atk && +depends cairo && +#depends -sub 'TEE' cairo "--enable-system-cairo \ +# --enable-default-toolkit=cairo-gtk2" && +depends fontconfig && +depends freetype2 && +depends -sub CXX gcc && +depends gdk-pixbuf2 && +depends glib2 && +depends gtk+2 '--enable-xft --disable-freetype2' && +depends JPEG '--with-system-jpeg' && +depends libidl && +depends libx11 && +depends libxext && +depends libxrender && +depends libxt && +depends nspr '--with-system-nspr' && +depends -sub "3.16.x" nss '--with-system-nss' && +depends pango && +depends perl && +depends pysqlite && +depends python && +depends -sub "TSAFE SECURE_DELETE ENABLE_UNLOCK_NOTIFY" sqlite '--enable-system-sqlite' && +depends zip && +depends zlib '--with-system-zlib' && + # LDAP support doesn't work (fails to build) # #optional_depends openldap \ diff --git a/mail/thunderbird/HISTORY b/mail/thunderbird/HISTORY index c254d6da20..726b7738c8 100644 --- a/mail/thunderbird/HISTORY +++ b/mail/thunderbird/HISTORY @@ -1,3 +1,6 @@ +2014-09-25 Remko van der Vossen <wich@sourcemage.org> + * DEPENDS: missing depends + 2014-05-25 Sukneet Basuta <sukneet@sourcemage.org> * DETAILS: version 24.5.0 * DEPENDS: use nss version 3.16 diff --git a/net/chrony/DETAILS b/net/chrony/DETAILS index cb8374f471..f6c45734b0 100755 --- a/net/chrony/DETAILS +++ b/net/chrony/DETAILS @@ -1,5 +1,5 @@ SPELL=chrony - VERSION=1.30 + VERSION=1.31 SECURITY_PATCH=3 SOURCE=$SPELL-$VERSION.tar.gz SOURCE2=$SPELL-$VERSION-tar-gz-asc.txt diff --git a/net/chrony/HISTORY b/net/chrony/HISTORY index 7d8300d996..137ac256d0 100644 --- a/net/chrony/HISTORY +++ b/net/chrony/HISTORY @@ -1,3 +1,6 @@ +2014-09-17 Vlad Glagolev <stealth@sourcemage.org> + * DETAILS: updated spell to 1.31 + 2014-07-17 Vlad Glagolev <stealth@sourcemage.org> * DETAILS: updated spell to 1.30 diff --git a/net/corkscrew/DETAILS b/net/corkscrew/DETAILS new file mode 100755 index 0000000000..ba6909db95 --- /dev/null +++ b/net/corkscrew/DETAILS @@ -0,0 +1,14 @@ + SPELL=corkscrew + VERSION=2.0 + SOURCE="${SPELL}-${VERSION}.tar.gz" + SOURCE_URL[0]=http://www.agroman.net/${SPELL}/${SOURCE} + SOURCE_HASH=sha512:bfea81064601cdf67ba1730b49e3a5f7aa377423edbfb052ff0f6b2776b49e104852b7f126f4668d37541a706313ef37d9b4535126e94bb202db4ac38f693e6f +SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}" + WEB_SITE="http://www.agroman.net/corkscrew/" + LICENSE[0]="GPLv2" + ENTERED=20140917 + KEYWORDS="" + SHORT="tool for tunneling SSH through HTTP proxies" +cat << EOF +Corksrew is a $SHORT +EOF diff --git a/net/corkscrew/HISTORY b/net/corkscrew/HISTORY new file mode 100644 index 0000000000..5056b992c5 --- /dev/null +++ b/net/corkscrew/HISTORY @@ -0,0 +1,2 @@ +2014-09-17 Ismael Luceno <ismael@sourcemage.org> + * DETAILS: spell created diff --git a/net/ntop/DEPENDS b/net/ntop/DEPENDS index 40223dde52..26c942ac38 100755 --- a/net/ntop/DEPENDS +++ b/net/ntop/DEPENDS @@ -1,6 +1,6 @@ depends autoconf && depends automake && -depends gawk && +depends AWK && depends geoip && depends gdbm && depends libtool && diff --git a/net/openvpn/DEPENDS b/net/openvpn/DEPENDS index f2044522ba..8a253e01dc 100755 --- a/net/openvpn/DEPENDS +++ b/net/openvpn/DEPENDS @@ -1,16 +1,26 @@ -depends linux-pam && +optional_depends linux-pam \ + "--enable-plugin-auth-pam" \ + "--disable-plugin-auth-pam" \ + "to build auth-pam plugin" && -optional_depends SSL \ - "" \ - "--disable-crypto --disable-ssl" \ - "for crypto and key exchange support (highly recommended)" && +optional_depends SSL \ + "--enable-crypto --enable-ssl" \ + "--disable-crypto --disable-ssl" \ + "for crypto and key exchange support (highly recommended)" && -optional_depends lzo \ - "" \ - "--disable-lzo" \ - "for LZO compression (highly recommended)" && +optional_depends lzo \ + "--enable-lzo" \ + "--disable-lzo" \ + "for LZO compression (highly recommended)" && -optional_depends SYSTEM-LOGGER \ - "" \ - "" \ - "for logging through syslog" +optional_depends iproute2 \ + "--enable-iproute2" \ + "--disable-iproute2" \ + "for iproute2 support" && + +optional_depends libselinux \ + "--enable-selinux" \ + "--disable-selinux" \ + "for SELinux support" && + +suggest_depends SYSTEM-LOGGER "" "" "for logging through syslog" diff --git a/net/openvpn/DETAILS b/net/openvpn/DETAILS index 4a2180d780..d45b74e10a 100755 --- a/net/openvpn/DETAILS +++ b/net/openvpn/DETAILS @@ -1,5 +1,5 @@ SPELL=openvpn - VERSION=2.3.2 + VERSION=2.3.4 SOURCE=$SPELL-$VERSION.tar.gz SOURCE2=$SOURCE.asc SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION diff --git a/net/openvpn/HISTORY b/net/openvpn/HISTORY index b2cec65b4a..50a947fcea 100644 --- a/net/openvpn/HISTORY +++ b/net/openvpn/HISTORY @@ -1,5 +1,12 @@ -2014-08-19 Treeve Jelbert <treeve@sourcemage.org> - * DEPENDS: openssl => SSL +2014-09-23 Vlad Glagolev <stealth@sourcemage.org> + * DETAILS: updated spell to 2.3.4 + * DEPENDS: made PAM optional; added missing dependencies -- iproute2, + libselinux; set SYSTEM-LOGGER as suggest dependency; added missing + flags + * INSTALL: quoting paths + +2014-08-19 Treeve Jelbert <treeve@sourcemage.org> + * DEPENDS: openssl => SSL 2014-02-13 Julien "_kaze_" ROZO <julien@rozo.org> * DETAILS: updated version to 2.3.2 diff --git a/net/openvpn/INSTALL b/net/openvpn/INSTALL index 0f29202404..2c57664190 100755 --- a/net/openvpn/INSTALL +++ b/net/openvpn/INSTALL @@ -1,2 +1,2 @@ default_install && -mkdir -p $INSTALL_ROOT/etc/openvpn +mkdir -p "$INSTALL_ROOT/etc/openvpn" diff --git a/net/stunnel/DETAILS b/net/stunnel/DETAILS index ee48212c21..996d153f38 100755 --- a/net/stunnel/DETAILS +++ b/net/stunnel/DETAILS @@ -1,5 +1,5 @@ SPELL=stunnel - VERSION=4.56 + VERSION=5.03 BRANCH=$(echo $VERSION | cut -d. -f1) SOURCE=$SPELL-$VERSION.tar.gz SOURCE2=$SOURCE.asc diff --git a/net/stunnel/HISTORY b/net/stunnel/HISTORY index a44beec6b3..29891ca8e4 100644 --- a/net/stunnel/HISTORY +++ b/net/stunnel/HISTORY @@ -1,3 +1,6 @@ +2014-09-07 Ismael Luceno <ismael@sourcemage.org> + * DETAILS: updated spell to 5.03 + 2014-08-19 Treeve Jelbert <treeve@sourcemage.org> * DEPENDS: openssl => SSL diff --git a/net/tor/DETAILS b/net/tor/DETAILS index e45beb9880..a163862f2e 100755 --- a/net/tor/DETAILS +++ b/net/tor/DETAILS @@ -1,7 +1,7 @@ SPELL=tor if [ "$TOR_DEVEL" == "y" ]; then - VERSION=0.2.5.4-alpha + VERSION=0.2.5.6-alpha SECURITY_PATCH=4 else VERSION=0.2.4.22 diff --git a/net/tor/HISTORY b/net/tor/HISTORY index edc500b736..7cccf4632b 100644 --- a/net/tor/HISTORY +++ b/net/tor/HISTORY @@ -1,3 +1,6 @@ +2014-09-02 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> + * DETAILS: versions 0.2.5.6-alpha + 2014-08-19 Treeve Jelbert <treeve@sourcemage.org> * DEPENDS: openssl => SSL diff --git a/perl-cpan/image-exiftool/DETAILS b/perl-cpan/image-exiftool/DETAILS index 458d4a67e1..783924b87f 100755 --- a/perl-cpan/image-exiftool/DETAILS +++ b/perl-cpan/image-exiftool/DETAILS @@ -1,8 +1,8 @@ SPELL=image-exiftool - VERSION=9.27 + VERSION=9.70 SOURCE="Image-ExifTool-${VERSION}.tar.gz" SOURCE_URL[0]=http://www.sno.phy.queensu.ca/~phil/exiftool/${SOURCE} - SOURCE_HASH=sha512:af7bccc262def4b394d5f8ff132bec5b5833ce3d87eee30f7e6f9ff0b3957f9fba2d23dedc10176e20159a08d8f43e34639c670d5cb9007b75a1ec671ed04977 + SOURCE_HASH=sha512:8345d7db73c88177ebe8fb74f18ce711d8dce64426cefaadeccd5f6eaf4c22e35834577c5b23d5dd9de71c48286189bd419c40e100b5d1d2d70d03045d9f6a31 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/Image-ExifTool-${VERSION}" WEB_SITE="http://www.sno.phy.queensu.ca/~phil/exiftool/" LICENSE[0]=PERL diff --git a/perl-cpan/image-exiftool/HISTORY b/perl-cpan/image-exiftool/HISTORY index c31ebe4bd7..3d124ada31 100644 --- a/perl-cpan/image-exiftool/HISTORY +++ b/perl-cpan/image-exiftool/HISTORY @@ -1,3 +1,6 @@ +2014-09-07 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> + * DETAILS: version 9.70 + 2013-08-29 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> * DETAILS: version 9.27 diff --git a/printer/ghostscript/DEPENDS b/printer/ghostscript/DEPENDS index fe61199fbb..f92f602462 100755 --- a/printer/ghostscript/DEPENDS +++ b/printer/ghostscript/DEPENDS @@ -1,4 +1,5 @@ depends e2fsprogs && +depends fontconfig && depends freetype2 && depends JPEG && depends tiff '--with-system-libtiff' && diff --git a/printer/ghostscript/HISTORY b/printer/ghostscript/HISTORY index 52f4736fa7..504d3865fa 100644 --- a/printer/ghostscript/HISTORY +++ b/printer/ghostscript/HISTORY @@ -1,3 +1,6 @@ +2014-09-09 Remko van der Vossen <wich@sourcemage.org> + * DEPENDS: fontconfig + 2014-08-31 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 9.14 * DEPENDS: remove obsolete cups option diff --git a/python-pypi/cherrypy/DETAILS b/python-pypi/cherrypy/DETAILS index 8f28349c4f..a417ae9f3e 100755 --- a/python-pypi/cherrypy/DETAILS +++ b/python-pypi/cherrypy/DETAILS @@ -1,10 +1,10 @@ SPELL=cherrypy SPELLX=CherryPy if [[ $BRANCH == 3 ]]; then - VERSION=3.5.0 + VERSION=3.6.0 SOURCE=$SPELLX-$VERSION.tar.gz SOURCE_URL[0]=http://pypi.python.org/packages/source/C/$SPELLX/$SOURCE - SOURCE_HASH=sha512:a563e7c44518028659274ef8b1bf1aaebcd59b28538558879f705945ad9a9ae74eee65e0406b104d662e327fb0d512f54790ceabfeb2c4952757922e72c2793a + SOURCE_HASH=sha512:3eaee1269272de9c52fa9547b7e10155ecae010005fb56dc300f24a537b4a22971a4f7e3e9920f9eff2ee951deb7ec8dfcf47a491cf5f6ed49c056f4a4316170 else VERSION=2.3.0 SOURCE=$SPELLX-$VERSION.tar.gz diff --git a/python-pypi/cherrypy/HISTORY b/python-pypi/cherrypy/HISTORY index fc840b67b1..c99c6604bf 100644 --- a/python-pypi/cherrypy/HISTORY +++ b/python-pypi/cherrypy/HISTORY @@ -1,5 +1,8 @@ -2014-08-19 Treeve Jelbert <treeve@sourcemage.org> - * DEPENDS: openssl => SSL +2014-09-14 Vlad Glagolev <stealth@sourcemage.org> + * DETAILS: updated spell to 3.6.0 (3) + +2014-08-19 Treeve Jelbert <treeve@sourcemage.org> + * DEPENDS: openssl => SSL 2014-07-05 Vlad Glagolev <stealth@sourcemage.org> * DETAILS: updated spell to 3.5.0 (3) diff --git a/python-pypi/grit-i18n/BUILD b/python-pypi/grit-i18n/BUILD new file mode 100755 index 0000000000..27ba77ddaf --- /dev/null +++ b/python-pypi/grit-i18n/BUILD @@ -0,0 +1 @@ +true diff --git a/python-pypi/grit-i18n/DEPENDS b/python-pypi/grit-i18n/DEPENDS new file mode 100755 index 0000000000..8e7ccbb07d --- /dev/null +++ b/python-pypi/grit-i18n/DEPENDS @@ -0,0 +1,2 @@ +depends python && +depends SVN diff --git a/python-pypi/grit-i18n/DETAILS b/python-pypi/grit-i18n/DETAILS new file mode 100755 index 0000000000..4de18d3bb9 --- /dev/null +++ b/python-pypi/grit-i18n/DETAILS @@ -0,0 +1,20 @@ + SPELL=grit-i18n +if [[ "$GYP_SCM_AUTOUPDATE" == "y" ]] +then + VERSION=$(date +%Y%m%d) +else + VERSION=svn +fi + SOURCE=$SPELL-svn.tar.bz2 + SOURCE_IGNORE=volatile +SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn + SOURCE_URL[0]=svn_http://grit-i18n.googlecode.com/svn/trunk:$SPELL-read-only + LICENSE[0]=BSD + WEB_SITE=https://code.google.com/p/grit-i18n/ + KEYWORDS="utils" + ENTERED=20140730 + SHORT='internationalization tool' +cat << EOF +GRIT is the internationalization tool used by the Chromium projects (the foundation for the +Google Chrome browser) and for several internal projects at Google. +EOF diff --git a/python-pypi/grit-i18n/HISTORY b/python-pypi/grit-i18n/HISTORY new file mode 100644 index 0000000000..68f8b389e5 --- /dev/null +++ b/python-pypi/grit-i18n/HISTORY @@ -0,0 +1,3 @@ +2014-07-30 Treeve Jelbert <treeve@sourcemage.org> + * PREPARE, DETAILS: Created + diff --git a/python-pypi/grit-i18n/INSTALL b/python-pypi/grit-i18n/INSTALL new file mode 100755 index 0000000000..ac6691ad44 --- /dev/null +++ b/python-pypi/grit-i18n/INSTALL @@ -0,0 +1,2 @@ +DEST=$INSTALL_ROOT/usr/lib/python2.7/site-packages && +cp -a $SOURCE_DIRECTORY/* $DEST diff --git a/python-pypi/grit-i18n/PREPARE b/python-pypi/grit-i18n/PREPARE new file mode 100755 index 0000000000..3e16aba01b --- /dev/null +++ b/python-pypi/grit-i18n/PREPARE @@ -0,0 +1,3 @@ +config_query GYP_SCM_AUTOUPDATE \ + "Automatically update on every system update?" n + diff --git a/python-pypi/lxml/DETAILS b/python-pypi/lxml/DETAILS index f4ebaac7b1..d8b2b80157 100755 --- a/python-pypi/lxml/DETAILS +++ b/python-pypi/lxml/DETAILS @@ -1,5 +1,5 @@ SPELL=lxml - VERSION=3.3.6 + VERSION=3.4.0 SOURCE=$SPELL-$VERSION.tar.gz SOURCE2=$SOURCE.asc SOURCE_URL[0]=http://pypi.python.org/packages/source/l/$SPELL/$SOURCE diff --git a/python-pypi/lxml/HISTORY b/python-pypi/lxml/HISTORY index 641436de63..9fb92beca2 100644 --- a/python-pypi/lxml/HISTORY +++ b/python-pypi/lxml/HISTORY @@ -1,3 +1,6 @@ +2014-09-16 Vlad Glagolev <stealth@sourcemage.org> + * DETAILS: updated spell to 3.4.0 + 2014-08-29 Vlad Glagolev <stealth@sourcemage.org> * DETAILS: updated spell to 3.3.6 diff --git a/python-pypi/python-magic/DEPENDS b/python-pypi/python-magic/DEPENDS new file mode 100755 index 0000000000..e4ea57a3b8 --- /dev/null +++ b/python-pypi/python-magic/DEPENDS @@ -0,0 +1 @@ +depends PYTHON diff --git a/python-pypi/python-magic/DETAILS b/python-pypi/python-magic/DETAILS new file mode 100755 index 0000000000..484d2af91f --- /dev/null +++ b/python-pypi/python-magic/DETAILS @@ -0,0 +1,16 @@ + SPELL=python-magic + VERSION=0.4.6 + SOURCE="${SPELL}-${VERSION}.tar.gz" + SOURCE_URL[0]=https://pypi.python.org/packages/source/p/${SPELL}/${SOURCE} + SOURCE_HASH=sha512:66c3a7a3120ea360422fe422c373a403a21be674f8df213a80ce83b02051cc1f0d0a2aaa7b4d512194e6914d801062036bdfa5155ead350dde154725808944f6 +SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}" + WEB_SITE="https://pypi.python.org/pypi/python-magic/" + LICENSE[0]="PSF" + ENTERED=20140909 + KEYWORDS="" + SHORT="File type identification using libmagic" +cat << EOF +This module uses ctypes to access the libmagic file type identification +library. It makes use of the local magic database and supports both textual +and MIME-type output. +EOF diff --git a/python-pypi/python-magic/HISTORY b/python-pypi/python-magic/HISTORY new file mode 100644 index 0000000000..0e01eacb85 --- /dev/null +++ b/python-pypi/python-magic/HISTORY @@ -0,0 +1,2 @@ +2014-09-09 Ismael Luceno <ismael@sourcemage.org> + * DEPENDS, DETAILS: spell created diff --git a/ruby-raa/ruby-2.0/DEPENDS b/ruby-raa/ruby-2.0/DEPENDS index acfc465132..813f550980 100755 --- a/ruby-raa/ruby-2.0/DEPENDS +++ b/ruby-raa/ruby-2.0/DEPENDS @@ -1,6 +1,8 @@ +depends libffi && + optional_depends doxygen "" "--disable-install-doc" "install documentation" && optional_depends db "" "" "for db support" && optional_depends gdbm "" "" "for gdbm support" && -optional_depends tk "" "" "for tk support" && optional_depends libyaml "" "" "for YAML output (recommended)" && -optional_depends SSL "" "" "for ssl and hashing modules" +optional_depends SSL "" "" "for ssl and hashing modules" && +optional_depends tk "" "" "for tk support" diff --git a/ruby-raa/ruby-2.0/HISTORY b/ruby-raa/ruby-2.0/HISTORY index 4dcfaa5b02..f371ae3d24 100644 --- a/ruby-raa/ruby-2.0/HISTORY +++ b/ruby-raa/ruby-2.0/HISTORY @@ -1,3 +1,6 @@ +2014-09-25 Remko van der Vossen <wich@sourcemage.org> + * DEPENDS: libffi + 2014-08-19 Treeve Jelbert <treeve@sourcemage.org> * DEPENDS: openssl => SSL diff --git a/security-libs/linux-pam/DEPENDS b/security-libs/linux-pam/DEPENDS index 43abca813b..a74ad643da 100755 --- a/security-libs/linux-pam/DEPENDS +++ b/security-libs/linux-pam/DEPENDS @@ -12,4 +12,5 @@ fi && optional_depends db '--enable-db=db' '--enable-db=no' 'database backend' && optional_depends gettext '--enable-nls' '--disable-nls' 'NLS support' && optional_depends libselinux "--enable-selinux" "--disable-selinux" "for selinux support" && -optional_depends libprelude "--enable-prelude" "--disable-prelude" "for prelude ids support" +optional_depends libprelude "--enable-prelude" "--disable-prelude" "for prelude ids support" && +optional_depends libtirpc '' '' 'RPC protocol, for NIS support' diff --git a/security-libs/linux-pam/HISTORY b/security-libs/linux-pam/HISTORY index 638aa054b2..4832be012c 100644 --- a/security-libs/linux-pam/HISTORY +++ b/security-libs/linux-pam/HISTORY @@ -1,3 +1,6 @@ +2014-09-05 Treeve Jelbert <treeve@sourcemage.org> + * DEPENDS: add libtirpc + 2014-09-03 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 1.1.8 new website & url diff --git a/shell-term-fm/abduco/BUILD b/shell-term-fm/abduco/BUILD new file mode 100755 index 0000000000..f8acf95c17 --- /dev/null +++ b/shell-term-fm/abduco/BUILD @@ -0,0 +1,2 @@ +cd "$SOURCE_DIRECTORY" && +make diff --git a/shell-term-fm/abduco/DETAILS b/shell-term-fm/abduco/DETAILS new file mode 100755 index 0000000000..862306945f --- /dev/null +++ b/shell-term-fm/abduco/DETAILS @@ -0,0 +1,21 @@ + SPELL=abduco + VERSION=0.1 + SOURCE="${SPELL}-${VERSION}.tar.gz" + SOURCE_URL[0]=http://www.brain-dump.org/projects/${SPELL}/${SOURCE} + SOURCE_HASH=sha512:42fbe02bf2a69bbfc91be36830a70daae5ed934877f1fc36808fe13bce52010d8094254a13292f97e1c6b196e8fca6e0835799c4d626865e21ad7ac6716340d6 +SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}" + WEB_SITE="http://www.brain-dump.org/projects/abduco/" + LICENSE[0]="ISC" + ENTERED=20140913 + KEYWORDS="" + SHORT="session {at,de}tach support" +cat << EOF +abduco provides session management i.e. it allows programs to be run +independently from its controlling terminal. That is programs can be detached, +run in the background, and then later reattached. Together with dvtm it +provides a simpler and cleaner alternative to tmux or screen. + +abduco is in many ways very similar to dtach but is actively maintained, +contains no legacy code, provides a few additional features, has a cleaner, +more robust implementation and is distributed under the ISC license. +EOF diff --git a/shell-term-fm/abduco/HISTORY b/shell-term-fm/abduco/HISTORY new file mode 100644 index 0000000000..a3901dddbd --- /dev/null +++ b/shell-term-fm/abduco/HISTORY @@ -0,0 +1,2 @@ +2014-09-13 Ismael Luceno <ismael@sourcemage.org> + * BUILD, DETAILS, INSTALL: spell created diff --git a/shell-term-fm/abduco/INSTALL b/shell-term-fm/abduco/INSTALL new file mode 100755 index 0000000000..5e011c6d43 --- /dev/null +++ b/shell-term-fm/abduco/INSTALL @@ -0,0 +1,2 @@ +cd "$SOURCE_DIRECTORY" && +make DESTDIR="$INSTALL_ROOT" PREFIX=/usr install diff --git a/shell-term-fm/bash/DETAILS b/shell-term-fm/bash/DETAILS index 0f74ff885e..f21474eaa8 100755 --- a/shell-term-fm/bash/DETAILS +++ b/shell-term-fm/bash/DETAILS @@ -1,7 +1,7 @@ SPELL=bash - VERSION=4.2 - SECURITY_PATCH=2 - BASH_PATCHLEVEL=045 + VERSION=4.3 + SECURITY_PATCH=3 + BASH_PATCHLEVEL=025 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 3d2a17de3a..c1b3acb9c1 100644 --- a/shell-term-fm/bash/HISTORY +++ b/shell-term-fm/bash/HISTORY @@ -1,3 +1,9 @@ +2014-09-24 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> + * DETAILS, PRE_BUILD: version 4.3 patchlevel 25 + * patches/bash-42-*: removed + * patches/bash-43-{001..025}: add patches for patchlevel 25 + * DETAILS: SECURITY_PATCH++, this fixes CVE-2014-6271 + 2013-05-11 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> * DETAILS: SECURITY_PATCH++, introduce variable BASH_PATCHLEVEL * PRE_BUILD: use variable BASH_PATCHLEVEL to determine which diff --git a/shell-term-fm/bash/PRE_BUILD b/shell-term-fm/bash/PRE_BUILD index 1e09873ef2..d3aa1ef942 100755 --- a/shell-term-fm/bash/PRE_BUILD +++ b/shell-term-fm/bash/PRE_BUILD @@ -4,7 +4,7 @@ unpack_file 3 && for i in $(seq -w 1 $BASH_PATCHLEVEL); do message "${MESSAGE_COLOR}applying patch bash42-$i ...${DEFAULT_COLOR}" && - patch -p0 < $SPELL_DIRECTORY/patches/bash42-$i + patch -p0 < $SPELL_DIRECTORY/patches/bash43-$i done && if [[ "$BASH_NI_LOGIN" == y ]]; then diff --git a/shell-term-fm/bash/patches/bash42-001 b/shell-term-fm/bash/patches/bash42-001 deleted file mode 100644 index 547aaa06f3..0000000000 --- a/shell-term-fm/bash/patches/bash42-001 +++ /dev/null @@ -1,78 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 4.2 -Patch-ID: bash42-001 - -Bug-Reported-by: Juergen Daubert <jue@jue.li> -Bug-Reference-ID: <20110214175132.GA19813@jue.netz> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-02/msg00125.html - -Bug-Description: - -When running in Posix mode, bash does not correctly expand the right-hand -side of a double-quoted word expansion containing single quotes. - -Patch (apply with `patch -p0'): - -*** ../bash-4.2-patched/subst.c 2011-01-02 16:12:51.000000000 -0500 ---- subst.c 2011-02-19 00:00:00.000000000 -0500 -*************** -*** 1380,1387 **** - - /* The handling of dolbrace_state needs to agree with the code in parse.y: -! parse_matched_pair() */ -! dolbrace_state = 0; -! if (quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)) -! dolbrace_state = (flags & SX_POSIXEXP) ? DOLBRACE_QUOTE : DOLBRACE_PARAM; - - i = *sindex; ---- 1380,1389 ---- - - /* The handling of dolbrace_state needs to agree with the code in parse.y: -! parse_matched_pair(). The different initial value is to handle the -! case where this function is called to parse the word in -! ${param op word} (SX_WORD). */ -! dolbrace_state = (flags & SX_WORD) ? DOLBRACE_WORD : DOLBRACE_PARAM; -! if ((quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)) && (flags & SX_POSIXEXP)) -! dolbrace_state = DOLBRACE_QUOTE; - - i = *sindex; -*************** -*** 7177,7181 **** - /* Extract the contents of the ${ ... } expansion - according to the Posix.2 rules. */ -! value = extract_dollar_brace_string (string, &sindex, quoted, (c == '%' || c == '#') ? SX_POSIXEXP : 0); - if (string[sindex] == RBRACE) - sindex++; ---- 7181,7185 ---- - /* Extract the contents of the ${ ... } expansion - according to the Posix.2 rules. */ -! value = extract_dollar_brace_string (string, &sindex, quoted, (c == '%' || c == '#' || c =='/' || c == '^' || c == ',' || c ==':') ? SX_POSIXEXP|SX_WORD : SX_WORD); - if (string[sindex] == RBRACE) - sindex++; -*** ../bash-4.2-patched/subst.h 2010-12-02 20:21:29.000000000 -0500 ---- subst.h 2011-02-16 21:12:09.000000000 -0500 -*************** -*** 57,60 **** ---- 57,61 ---- - #define SX_ARITHSUB 0x0080 /* extracting $(( ... )) (currently unused) */ - #define SX_POSIXEXP 0x0100 /* extracting new Posix pattern removal expansions in extract_dollar_brace_string */ -+ #define SX_WORD 0x0200 /* extracting word in ${param op word} */ - - /* Remove backslashes which are quoting backquotes from STRING. Modifies -*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 ---- patchlevel.h Thu Feb 24 21:41:34 2011 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 0 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 1 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/shell-term-fm/bash/patches/bash42-002 b/shell-term-fm/bash/patches/bash42-002 deleted file mode 100644 index 077c7e0f85..0000000000 --- a/shell-term-fm/bash/patches/bash42-002 +++ /dev/null @@ -1,60 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 4.2 -Patch-ID: bash42-002 - -Bug-Reported-by: Clark J. Wang <dearvoid@gmail.com> -Bug-Reference-ID: <AANLkTimGbW7aC4E5infXP6ku5WPci4t=xVc+L1SyHqrD@mail.gmail.com> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-02/msg00157.html - -Bug-Description: - -The readline vi-mode `cc', `dd', and `yy' commands failed to modify the -entire line. - -Patch (apply with `patch -p0'): - -*** ../bash-4.2-patched/lib/readline/vi_mode.c 2010-11-20 19:51:39.000000000 -0500 ---- lib/readline/vi_mode.c 2011-02-17 20:24:25.000000000 -0500 -*************** -*** 1115,1119 **** - _rl_vi_last_motion = c; - RL_UNSETSTATE (RL_STATE_VIMOTION); -! return (0); - } - #if defined (READLINE_CALLBACKS) ---- 1115,1119 ---- - _rl_vi_last_motion = c; - RL_UNSETSTATE (RL_STATE_VIMOTION); -! return (vidomove_dispatch (m)); - } - #if defined (READLINE_CALLBACKS) -*** ../bash-4.2-patched/lib/readline/callback.c 2010-06-06 12:18:58.000000000 -0400 ---- lib/readline/callback.c 2011-02-17 20:43:28.000000000 -0500 -*************** -*** 149,152 **** ---- 149,155 ---- - /* Should handle everything, including cleanup, numeric arguments, - and turning off RL_STATE_VIMOTION */ -+ if (RL_ISSTATE (RL_STATE_NUMERICARG) == 0) -+ _rl_internal_char_cleanup (); -+ - return; - } -*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 ---- patchlevel.h Thu Feb 24 21:41:34 2011 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 1 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 2 - - #endif /* _PATCHLEVEL_H_ */ - diff --git a/shell-term-fm/bash/patches/bash42-003 b/shell-term-fm/bash/patches/bash42-003 deleted file mode 100644 index c488e96b2d..0000000000 --- a/shell-term-fm/bash/patches/bash42-003 +++ /dev/null @@ -1,318 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 4.2 -Patch-ID: bash42-003 - -Bug-Reported-by: Clark J. Wang <dearvoid@gmail.com> -Bug-Reference-ID: <AANLkTikZ_rVV-frR8Fh0PzhXnMKnm5XsUR-F3qtPPs5G@mail.gmail.com> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-02/msg00136.html - -Bug-Description: - -When using the pattern replacement and pattern removal word expansions, bash -miscalculates the possible match length in the presence of an unescaped left -bracket without a closing right bracket, resulting in a failure to match -the pattern. - -Patch (apply with `patch -p0'): - -*** ../bash-4.2-patched/lib/glob/gmisc.c 2011-02-05 16:11:17.000000000 -0500 ---- lib/glob/gmisc.c 2011-02-18 23:53:42.000000000 -0500 -*************** -*** 78,83 **** - size_t wmax; - { -! wchar_t wc, *wbrack; -! int matlen, t, in_cclass, in_collsym, in_equiv; - - if (*wpat == 0) ---- 78,83 ---- - size_t wmax; - { -! wchar_t wc; -! int matlen, bracklen, t, in_cclass, in_collsym, in_equiv; - - if (*wpat == 0) -*************** -*** 119,123 **** - case L'[': - /* scan for ending `]', skipping over embedded [:...:] */ -! wbrack = wpat; - wc = *wpat++; - do ---- 119,123 ---- - case L'[': - /* scan for ending `]', skipping over embedded [:...:] */ -! bracklen = 1; - wc = *wpat++; - do -*************** -*** 125,140 **** - if (wc == 0) - { -! matlen += wpat - wbrack - 1; /* incremented below */ -! break; - } - else if (wc == L'\\') - { -! wc = *wpat++; -! if (*wpat == 0) -! break; - } - else if (wc == L'[' && *wpat == L':') /* character class */ - { - wpat++; - in_cclass = 1; - } ---- 125,148 ---- - if (wc == 0) - { -! wpat--; /* back up to NUL */ -! matlen += bracklen; -! goto bad_bracket; - } - else if (wc == L'\\') - { -! /* *wpat == backslash-escaped character */ -! bracklen++; -! /* If the backslash or backslash-escape ends the string, -! bail. The ++wpat skips over the backslash escape */ -! if (*wpat == 0 || *++wpat == 0) -! { -! matlen += bracklen; -! goto bad_bracket; -! } - } - else if (wc == L'[' && *wpat == L':') /* character class */ - { - wpat++; -+ bracklen++; - in_cclass = 1; - } -*************** -*** 142,145 **** ---- 150,154 ---- - { - wpat++; -+ bracklen++; - in_cclass = 0; - } -*************** -*** 147,152 **** - { - wpat++; - if (*wpat == L']') /* right bracket can appear as collating symbol */ -! wpat++; - in_collsym = 1; - } ---- 156,165 ---- - { - wpat++; -+ bracklen++; - if (*wpat == L']') /* right bracket can appear as collating symbol */ -! { -! wpat++; -! bracklen++; -! } - in_collsym = 1; - } -*************** -*** 154,157 **** ---- 167,171 ---- - { - wpat++; -+ bracklen++; - in_collsym = 0; - } -*************** -*** 159,164 **** - { - wpat++; - if (*wpat == L']') /* right bracket can appear as equivalence class */ -! wpat++; - in_equiv = 1; - } ---- 173,182 ---- - { - wpat++; -+ bracklen++; - if (*wpat == L']') /* right bracket can appear as equivalence class */ -! { -! wpat++; -! bracklen++; -! } - in_equiv = 1; - } -*************** -*** 166,174 **** ---- 184,196 ---- - { - wpat++; -+ bracklen++; - in_equiv = 0; - } -+ else -+ bracklen++; - } - while ((wc = *wpat++) != L']'); - matlen++; /* bracket expression can only match one char */ -+ bad_bracket: - break; - } -*************** -*** 214,219 **** - size_t max; - { -! char c, *brack; -! int matlen, t, in_cclass, in_collsym, in_equiv; - - if (*pat == 0) ---- 236,241 ---- - size_t max; - { -! char c; -! int matlen, bracklen, t, in_cclass, in_collsym, in_equiv; - - if (*pat == 0) -*************** -*** 255,259 **** - case '[': - /* scan for ending `]', skipping over embedded [:...:] */ -! brack = pat; - c = *pat++; - do ---- 277,281 ---- - case '[': - /* scan for ending `]', skipping over embedded [:...:] */ -! bracklen = 1; - c = *pat++; - do -*************** -*** 261,276 **** - if (c == 0) - { -! matlen += pat - brack - 1; /* incremented below */ -! break; - } - else if (c == '\\') - { -! c = *pat++; -! if (*pat == 0) -! break; - } - else if (c == '[' && *pat == ':') /* character class */ - { - pat++; - in_cclass = 1; - } ---- 283,306 ---- - if (c == 0) - { -! pat--; /* back up to NUL */ -! matlen += bracklen; -! goto bad_bracket; - } - else if (c == '\\') - { -! /* *pat == backslash-escaped character */ -! bracklen++; -! /* If the backslash or backslash-escape ends the string, -! bail. The ++pat skips over the backslash escape */ -! if (*pat == 0 || *++pat == 0) -! { -! matlen += bracklen; -! goto bad_bracket; -! } - } - else if (c == '[' && *pat == ':') /* character class */ - { - pat++; -+ bracklen++; - in_cclass = 1; - } -*************** -*** 278,281 **** ---- 308,312 ---- - { - pat++; -+ bracklen++; - in_cclass = 0; - } -*************** -*** 283,288 **** - { - pat++; - if (*pat == ']') /* right bracket can appear as collating symbol */ -! pat++; - in_collsym = 1; - } ---- 314,323 ---- - { - pat++; -+ bracklen++; - if (*pat == ']') /* right bracket can appear as collating symbol */ -! { -! pat++; -! bracklen++; -! } - in_collsym = 1; - } -*************** -*** 290,293 **** ---- 325,329 ---- - { - pat++; -+ bracklen++; - in_collsym = 0; - } -*************** -*** 295,300 **** - { - pat++; - if (*pat == ']') /* right bracket can appear as equivalence class */ -! pat++; - in_equiv = 1; - } ---- 331,340 ---- - { - pat++; -+ bracklen++; - if (*pat == ']') /* right bracket can appear as equivalence class */ -! { -! pat++; -! bracklen++; -! } - in_equiv = 1; - } -*************** -*** 302,310 **** ---- 342,354 ---- - { - pat++; -+ bracklen++; - in_equiv = 0; - } -+ else -+ bracklen++; - } - while ((c = *pat++) != ']'); - matlen++; /* bracket expression can only match one char */ -+ bad_bracket: - break; - } -*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 ---- patchlevel.h Thu Feb 24 21:41:34 2011 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 2 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 3 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/shell-term-fm/bash/patches/bash42-004 b/shell-term-fm/bash/patches/bash42-004 deleted file mode 100644 index fe29f82c7d..0000000000 --- a/shell-term-fm/bash/patches/bash42-004 +++ /dev/null @@ -1,53 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 4.2 -Patch-ID: bash42-004 - -Bug-Reported-by: Mike Frysinger <vapier@gentoo.org> -Bug-Reference-ID: <201102182106.17834.vapier@gentoo.org> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-02/msg00222.html - -Bug-Description: - -When used in contexts where word splitting and quote removal were not -performed, such as pattern removal or pattern substitution, empty strings -(either literal or resulting from quoted variables that were unset or -null) were not matched correctly, resulting in failure. - -Patch (apply with `patch -p0'): - -*** ../bash-4.2-patched/subst.c 2011-01-02 16:12:51.000000000 -0500 ---- subst.c 2011-02-18 22:30:13.000000000 -0500 -*************** -*** 3373,3379 **** - if (string == 0 || *string == '\0') - return (WORD_LIST *)NULL; - -! td.flags = 0; - td.word = string; - tresult = call_expand_word_internal (&td, quoted, 1, dollar_at_p, has_dollar_at); - return (tresult); ---- 3373,3379 ---- - if (string == 0 || *string == '\0') - return (WORD_LIST *)NULL; - -! td.flags = W_NOSPLIT2; /* no splitting, remove "" and '' */ - td.word = string; - tresult = call_expand_word_internal (&td, quoted, 1, dollar_at_p, has_dollar_at); - return (tresult); -*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 ---- patchlevel.h Thu Feb 24 21:41:34 2011 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 3 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 4 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/shell-term-fm/bash/patches/bash42-005 b/shell-term-fm/bash/patches/bash42-005 deleted file mode 100644 index 3ca9fc1da6..0000000000 --- a/shell-term-fm/bash/patches/bash42-005 +++ /dev/null @@ -1,131 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 4.2 -Patch-ID: bash42-005 - -Bug-Reported-by: Dennis Williamson <dennistwilliamson@gmail.com> -Bug-Reference-ID: <AANLkTikDbEV5rnbPc0zOfmZfBcg0xGetzLLzK+KjRiNa@mail.gmail.com> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-02/msg00147.html - -Bug-Description: - -Systems that use tzset() to set the local timezone require the TZ variable -to be in the environment. Bash must make sure the environment has been -modified with any updated value for TZ before calling tzset(). This -affects prompt string expansions and the `%T' printf conversion specification -on systems that do not allow bash to supply a replacement for getenv(3). - -Patch (apply with `patch -p0'): - -*** ../bash-4.2-patched/variables.h 2010-12-02 20:22:01.000000000 -0500 ---- variables.h 2011-02-19 19:57:12.000000000 -0500 -*************** -*** 314,317 **** ---- 314,318 ---- - extern void sort_variables __P((SHELL_VAR **)); - -+ extern int chkexport __P((char *)); - extern void maybe_make_export_env __P((void)); - extern void update_export_env_inplace __P((char *, int, char *)); -*** ../bash-4.2-patched/variables.c 2011-01-24 20:07:48.000000000 -0500 ---- variables.c 2011-02-19 20:04:50.000000000 -0500 -*************** -*** 3654,3657 **** ---- 3654,3673 ---- - } - -+ int -+ chkexport (name) -+ char *name; -+ { -+ SHELL_VAR *v; -+ -+ v = find_variable (name); -+ if (exported_p (v)) -+ { -+ array_needs_making = 1; -+ maybe_make_export_env (); -+ return 1; -+ } -+ return 0; -+ } -+ - void - maybe_make_export_env () -*************** -*** 4215,4219 **** - { "TEXTDOMAINDIR", sv_locale }, - -! #if defined (HAVE_TZSET) && defined (PROMPT_STRING_DECODE) - { "TZ", sv_tz }, - #endif ---- 4231,4235 ---- - { "TEXTDOMAINDIR", sv_locale }, - -! #if defined (HAVE_TZSET) - { "TZ", sv_tz }, - #endif -*************** -*** 4559,4568 **** - #endif /* HISTORY */ - -! #if defined (HAVE_TZSET) && defined (PROMPT_STRING_DECODE) - void - sv_tz (name) - char *name; - { -! tzset (); - } - #endif ---- 4575,4585 ---- - #endif /* HISTORY */ - -! #if defined (HAVE_TZSET) - void - sv_tz (name) - char *name; - { -! if (chkexport (name)) -! tzset (); - } - #endif -*** ../bash-4.2-patched/parse.y 2011-01-02 15:48:11.000000000 -0500 ---- parse.y 2011-02-19 20:05:00.000000000 -0500 -*************** -*** 5136,5139 **** ---- 5136,5142 ---- - /* Make the current time/date into a string. */ - (void) time (&the_time); -+ #if defined (HAVE_TZSET) -+ sv_tz ("TZ"); /* XXX -- just make sure */ -+ #endif - tm = localtime (&the_time); - -*** ../bash-4.2-patched/builtins/printf.def 2010-11-23 10:02:55.000000000 -0500 ---- builtins/printf.def 2011-02-19 20:05:04.000000000 -0500 -*************** -*** 466,469 **** ---- 466,472 ---- - else - secs = arg; -+ #if defined (HAVE_TZSET) -+ sv_tz ("TZ"); /* XXX -- just make sure */ -+ #endif - tm = localtime (&secs); - n = strftime (timebuf, sizeof (timebuf), timefmt, tm); -*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 ---- patchlevel.h Thu Feb 24 21:41:34 2011 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 4 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 5 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/shell-term-fm/bash/patches/bash42-006 b/shell-term-fm/bash/patches/bash42-006 deleted file mode 100644 index be6e49c729..0000000000 --- a/shell-term-fm/bash/patches/bash42-006 +++ /dev/null @@ -1,46 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 4.2 -Patch-ID: bash42-006 - -Bug-Reported-by: Allan McRae <allan@archlinux.org> -Bug-Reference-ID: <4D6D0D0B.50908@archlinux.org> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-03/msg00001.html - -Bug-Description: - -A problem with bash42-005 caused it to dump core if TZ was unset. - -Patch (apply with `patch -p0'): - -*** ../bash-4.2-patched/variables.c 2011-02-25 12:07:41.000000000 -0500 ---- variables.c 2011-03-01 10:13:04.000000000 -0500 -*************** -*** 3661,3665 **** - - v = find_variable (name); -! if (exported_p (v)) - { - array_needs_making = 1; ---- 3661,3665 ---- - - v = find_variable (name); -! if (v && exported_p (v)) - { - array_needs_making = 1; -*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 ---- patchlevel.h Thu Feb 24 21:41:34 2011 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 5 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 6 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/shell-term-fm/bash/patches/bash42-007 b/shell-term-fm/bash/patches/bash42-007 deleted file mode 100644 index d16156e277..0000000000 --- a/shell-term-fm/bash/patches/bash42-007 +++ /dev/null @@ -1,46 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 4.2 -Patch-ID: bash42-007 - -Bug-Reported-by: Matthias Klose <doko@debian.org> -Bug-Reference-ID: <4D6FD2AC.1010500@debian.org> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-03/msg00015.html - -Bug-Description: - -When used in contexts where word splitting and quote removal were not -performed, such as case statement word expansion, empty strings -(either literal or resulting from quoted variables that were unset or -null) were not expanded correctly, resulting in failure. - -Patch (apply with `patch -p0'): - -*** ../bash-4.2-patched/subst.c 2011-02-25 12:03:58.000000000 -0500 ---- subst.c 2011-03-03 14:08:23.000000000 -0500 -*************** -*** 4609,4614 **** ---- 4611,4617 ---- - if (ifs_firstc == 0) - #endif - word->flags |= W_NOSPLIT; -+ word->flags |= W_NOSPLIT2; - result = call_expand_word_internal (word, quoted, 0, (int *)NULL, (int *)NULL); - expand_no_split_dollar_star = 0; - -*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 ---- patchlevel.h Thu Feb 24 21:41:34 2011 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 6 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 7 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/shell-term-fm/bash/patches/bash42-008 b/shell-term-fm/bash/patches/bash42-008 deleted file mode 100644 index 631abbdf7d..0000000000 --- a/shell-term-fm/bash/patches/bash42-008 +++ /dev/null @@ -1,74 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 4.2 -Patch-ID: bash42-008 - -Bug-Reported-by: Doug McMahon <mc2man@optonline.net> -Bug-Reference-ID: <1299441211.2535.11.camel@doug-XPS-M1330> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-03/msg00050.html - -Bug-Description: - -Bash-4.2 does not attempt to save the shell history on receipt of a -terminating signal that is handled synchronously. Unfortunately, the -`close' button on most X11 terminal emulators sends SIGHUP, which -kills the shell. - -This is a very small patch to save the history in the case that an -interactive shell receives a SIGHUP or SIGTERM while in readline and -reading a command. - -The next version of bash will do this differently. - -Patch (apply with `patch -p0'): - -*** ../bash-4.2-patched/sig.c Tue Nov 23 08:21:22 2010 ---- sig.c Tue Mar 8 21:28:32 2011 -*************** -*** 47,50 **** ---- 47,51 ---- - #if defined (READLINE) - # include "bashline.h" -+ # include <readline/readline.h> - #endif - -*************** -*** 63,66 **** ---- 64,68 ---- - extern int history_lines_this_session; - #endif -+ extern int no_line_editing; - - extern void initialize_siglist (); -*************** -*** 506,510 **** - #if defined (HISTORY) - /* XXX - will inhibit history file being written */ -! history_lines_this_session = 0; - #endif - terminate_immediately = 0; ---- 508,515 ---- - #if defined (HISTORY) - /* XXX - will inhibit history file being written */ -! # if defined (READLINE) -! if (interactive_shell == 0 || interactive == 0 || (sig != SIGHUP && sig != SIGTERM) || no_line_editing || (RL_ISSTATE (RL_STATE_READCMD) == 0)) -! # endif -! history_lines_this_session = 0; - #endif - terminate_immediately = 0; -*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 ---- patchlevel.h Thu Feb 24 21:41:34 2011 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 7 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 8 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/shell-term-fm/bash/patches/bash42-009 b/shell-term-fm/bash/patches/bash42-009 deleted file mode 100644 index 83a7e2c748..0000000000 --- a/shell-term-fm/bash/patches/bash42-009 +++ /dev/null @@ -1,82 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 4.2 -Patch-ID: bash42-009 - -Bug-Reported-by: <piuma@piumalab.org> -Bug-Reference-ID: <4DAAC0DB.7060606@piumalab.org> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-04/msg00075.html - -Bug-Description: - -Under certain circumstances, running `fc -l' two times in succession with a -relative history offset at the end of the history will result in an incorrect -calculation of the last history entry and a seg fault. - -Patch (apply with `patch -p0'): - -*** ../bash-4.2-patched/builtins/fc.def 2010-05-30 18:25:38.000000000 -0400 ---- builtins/fc.def 2011-04-19 15:46:17.000000000 -0400 -*************** -*** 305,309 **** - - /* XXX */ -! if (saved_command_line_count > 0 && i == last_hist && hlist[last_hist] == 0) - while (last_hist >= 0 && hlist[last_hist] == 0) - last_hist--; ---- 305,309 ---- - - /* XXX */ -! if (i == last_hist && hlist[last_hist] == 0) - while (last_hist >= 0 && hlist[last_hist] == 0) - last_hist--; -*************** -*** 476,480 **** - { - int sign, n, clen, rh; -! register int i, j; - register char *s; - ---- 476,480 ---- - { - int sign, n, clen, rh; -! register int i, j, last_hist; - register char *s; - -*************** -*** 496,500 **** - calculation as if it were on. */ - rh = remember_on_history || ((subshell_environment & SUBSHELL_COMSUB) && enable_history_list); -! i -= rh + hist_last_line_added; - - /* No specification defaults to most recent command. */ ---- 496,508 ---- - calculation as if it were on. */ - rh = remember_on_history || ((subshell_environment & SUBSHELL_COMSUB) && enable_history_list); -! last_hist = i - rh - hist_last_line_added; -! -! if (i == last_hist && hlist[last_hist] == 0) -! while (last_hist >= 0 && hlist[last_hist] == 0) -! last_hist--; -! if (last_hist < 0) -! return (-1); -! -! i = last_hist; - - /* No specification defaults to most recent command. */ -*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 ---- patchlevel.h Thu Feb 24 21:41:34 2011 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 8 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 9 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/shell-term-fm/bash/patches/bash42-010 b/shell-term-fm/bash/patches/bash42-010 deleted file mode 100644 index e408abd61b..0000000000 --- a/shell-term-fm/bash/patches/bash42-010 +++ /dev/null @@ -1,61 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 4.2 -Patch-ID: bash42-010 - -Bug-Reported-by: Mike Frysinger <vapier@gentoo.org> -Bug-Reference-ID: <201104122356.20160.vapier@gentoo.org> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-04/msg00058.html - -Bug-Description: - -Bash did not correctly print/reproduce here documents attached to commands -inside compound commands such as arithmetic for loops and user-specified -subshells. This affected the execution of such commands inside a shell -function when the function definition is saved and later restored using -`.' or `eval'. - -Patch (apply with `patch -p0'): - -*** ../bash-4.2-patched/print_cmd.c 2010-05-30 18:34:08.000000000 -0400 ---- print_cmd.c 2011-04-14 10:43:18.000000000 -0400 -*************** -*** 316,319 **** ---- 317,321 ---- - skip_this_indent++; - make_command_string_internal (command->value.Subshell->command); -+ PRINT_DEFERRED_HEREDOCS (""); - cprintf (" )"); - break; -*************** -*** 593,596 **** ---- 606,610 ---- - indentation += indentation_amount; - make_command_string_internal (arith_for_command->action); -+ PRINT_DEFERRED_HEREDOCS (""); - semicolon (); - indentation -= indentation_amount; -*************** -*** 654,657 **** ---- 668,672 ---- - - make_command_string_internal (group_command->command); -+ PRINT_DEFERRED_HEREDOCS (""); - - if (inside_function_def) -*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 ---- patchlevel.h Thu Feb 24 21:41:34 2011 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 9 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 10 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/shell-term-fm/bash/patches/bash42-011 b/shell-term-fm/bash/patches/bash42-011 deleted file mode 100644 index 26fdf65f69..0000000000 --- a/shell-term-fm/bash/patches/bash42-011 +++ /dev/null @@ -1,46 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 4.2 -Patch-ID: bash42-011 - -Bug-Reported-by: "David Parks" <davidparks21@yahoo.com> -Bug-Reference-ID: <014101cc82c6$46ac1540$d4043fc0$@com> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-10/msg00031.html - -Bug-Description: - -Overwriting a value in an associative array causes the memory allocated to -store the key on the second and subsequent assignments to leak. - -Patch (apply with `patch -p0'): - -*** ../bash-4.2-patched/assoc.c 2009-08-05 20:19:40.000000000 -0400 ---- assoc.c 2011-10-04 20:23:07.000000000 -0400 -*************** -*** 78,81 **** ---- 78,86 ---- - if (b == 0) - return -1; -+ /* If we are overwriting an existing element's value, we're not going to -+ use the key. Nothing in the array assignment code path frees the key -+ string, so we can free it here to avoid a memory leak. */ -+ if (b->key != key) -+ free (key); - FREE (b->data); - b->data = value ? savestring (value) : (char *)0; -*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 ---- patchlevel.h Thu Feb 24 21:41:34 2011 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 10 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 11 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/shell-term-fm/bash/patches/bash42-012 b/shell-term-fm/bash/patches/bash42-012 deleted file mode 100644 index 70f0a56b60..0000000000 --- a/shell-term-fm/bash/patches/bash42-012 +++ /dev/null @@ -1,151 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 4.2 -Patch-ID: bash42-012 - -Bug-Reported-by: Rui Santos <rsantos@grupopie.com> -Bug-Reference-ID: <4E04C6D0.2020507@grupopie.com> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-06/msg00079.html - -Bug-Description: - -When calling the parser to recursively parse a command substitution within -an arithmetic expansion, the shell overwrote the saved shell input line and -associated state, resulting in a garbled command. - -Patch (apply with `patch -p0'): - -*** ../bash-4.2-patched/parse.y 2011-02-26 19:19:05.000000000 -0500 ---- parse.y 2011-06-24 20:08:22.000000000 -0400 -*************** -*** 3843,3846 **** ---- 3849,3853 ---- - { - sh_parser_state_t ps; -+ sh_input_line_state_t ls; - int orig_ind, nc, sflags; - char *ret, *s, *ep, *ostring; -*************** -*** 3850,3857 **** ---- 3857,3866 ---- - ostring = string; - -+ /*itrace("xparse_dolparen: size = %d shell_input_line = `%s'", shell_input_line_size, shell_input_line);*/ - sflags = SEVAL_NONINT|SEVAL_NOHIST|SEVAL_NOFREE; - if (flags & SX_NOLONGJMP) - sflags |= SEVAL_NOLONGJMP; - save_parser_state (&ps); -+ save_input_line_state (&ls); - - /*(*/ -*************** -*** 3862,3865 **** ---- 3871,3876 ---- - restore_parser_state (&ps); - reset_parser (); -+ /* reset_parser clears shell_input_line and associated variables */ -+ restore_input_line_state (&ls); - if (interactive) - token_to_read = 0; -*************** -*** 5909,5912 **** ---- 5920,5929 ---- - ps->echo_input_at_read = echo_input_at_read; - -+ ps->token = token; -+ ps->token_buffer_size = token_buffer_size; -+ /* Force reallocation on next call to read_token_word */ -+ token = 0; -+ token_buffer_size = 0; -+ - return (ps); - } -*************** -*** 5950,5953 **** ---- 5967,6006 ---- - expand_aliases = ps->expand_aliases; - echo_input_at_read = ps->echo_input_at_read; -+ -+ FREE (token); -+ token = ps->token; -+ token_buffer_size = ps->token_buffer_size; -+ } -+ -+ sh_input_line_state_t * -+ save_input_line_state (ls) -+ sh_input_line_state_t *ls; -+ { -+ if (ls == 0) -+ ls = (sh_input_line_state_t *)xmalloc (sizeof (sh_input_line_state_t)); -+ if (ls == 0) -+ return ((sh_input_line_state_t *)NULL); -+ -+ ls->input_line = shell_input_line; -+ ls->input_line_size = shell_input_line_size; -+ ls->input_line_len = shell_input_line_len; -+ ls->input_line_index = shell_input_line_index; -+ -+ /* force reallocation */ -+ shell_input_line = 0; -+ shell_input_line_size = shell_input_line_len = shell_input_line_index = 0; -+ } -+ -+ void -+ restore_input_line_state (ls) -+ sh_input_line_state_t *ls; -+ { -+ FREE (shell_input_line); -+ shell_input_line = ls->input_line; -+ shell_input_line_size = ls->input_line_size; -+ shell_input_line_len = ls->input_line_len; -+ shell_input_line_index = ls->input_line_index; -+ -+ set_line_mbstate (); - } - -*** ../bash-4.2-patched/shell.h 2011-01-06 22:16:55.000000000 -0500 ---- shell.h 2011-06-24 19:12:25.000000000 -0400 -*************** -*** 137,140 **** ---- 139,145 ---- - int *token_state; - -+ char *token; -+ int token_buffer_size; -+ - /* input line state -- line number saved elsewhere */ - int input_line_terminator; -*************** -*** 167,171 **** ---- 172,186 ---- - } sh_parser_state_t; - -+ typedef struct _sh_input_line_state_t { -+ char *input_line; -+ int input_line_index; -+ int input_line_size; -+ int input_line_len; -+ } sh_input_line_state_t; -+ - /* Let's try declaring these here. */ - extern sh_parser_state_t *save_parser_state __P((sh_parser_state_t *)); - extern void restore_parser_state __P((sh_parser_state_t *)); -+ -+ extern sh_input_line_state_t *save_input_line_state __P((sh_input_line_state_t *)); -+ extern void restore_input_line_state __P((sh_input_line_state_t *)); -*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 ---- patchlevel.h Thu Feb 24 21:41:34 2011 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 11 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 12 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/shell-term-fm/bash/patches/bash42-013 b/shell-term-fm/bash/patches/bash42-013 deleted file mode 100644 index 5bb186b3a8..0000000000 --- a/shell-term-fm/bash/patches/bash42-013 +++ /dev/null @@ -1,52 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 4.2 -Patch-ID: bash42-013 - -Bug-Reported-by: Marten Wikstrom <marten.wikstrom@keystream.se> -Bug-Reference-ID: <BANLkTikKECAh94ZEX68iQvxYuPeEM_xoSQ@mail.gmail.com> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-05/msg00049.html - -Bug-Description: - -An off-by-one error caused the shell to skip over CTLNUL characters, -which are used internally to mark quoted null strings. The effect -was to have stray 0x7f characters left after expanding words like -""""""""aa. - -Patch (apply with `patch -p0'): - -*** ../bash-4.2-patched/subst.c 2011-03-06 14:11:11.000000000 -0500 ---- subst.c 2011-05-11 11:23:33.000000000 -0400 -*************** -*** 3707,3711 **** - } - else if (string[i] == CTLNUL) -! i++; - - prev_i = i; ---- 3710,3717 ---- - } - else if (string[i] == CTLNUL) -! { -! i++; -! continue; -! } - - prev_i = i; -*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 ---- patchlevel.h Thu Feb 24 21:41:34 2011 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 12 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 13 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/shell-term-fm/bash/patches/bash42-014 b/shell-term-fm/bash/patches/bash42-014 deleted file mode 100644 index a43271c348..0000000000 --- a/shell-term-fm/bash/patches/bash42-014 +++ /dev/null @@ -1,47 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 4.2 -Patch-ID: bash42-014 - -Bug-Reported-by: Shawn Bohrer <sbohrer@rgmadvisors.com> -Bug-Reference-ID: <20110504152320.6E8F28130527@dev1.rgmadvisors.com> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-05/msg00018.html - -Bug-Description: - -The regular expression matching operator did not correctly match -expressions with an embedded ^A. - -Patch (apply with `patch -p0'): - -*** ../bash-4.2-patched/pathexp.c 2010-08-13 23:21:57.000000000 -0400 ---- pathexp.c 2011-05-05 16:40:58.000000000 -0400 -*************** -*** 197,201 **** - if ((qflags & QGLOB_FILENAME) && pathname[i+1] == '/') - continue; -! if ((qflags & QGLOB_REGEXP) && ere_char (pathname[i+1]) == 0) - continue; - temp[j++] = '\\'; ---- 197,201 ---- - if ((qflags & QGLOB_FILENAME) && pathname[i+1] == '/') - continue; -! if (pathname[i+1] != CTLESC && (qflags & QGLOB_REGEXP) && ere_char (pathname[i+1]) == 0) - continue; - temp[j++] = '\\'; -*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 ---- patchlevel.h Thu Feb 24 21:41:34 2011 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 13 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 14 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/shell-term-fm/bash/patches/bash42-015 b/shell-term-fm/bash/patches/bash42-015 deleted file mode 100644 index 8655873855..0000000000 --- a/shell-term-fm/bash/patches/bash42-015 +++ /dev/null @@ -1,81 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 4.2 -Patch-ID: bash42-015 - -Bug-Reported-by: <dnade.ext@orange-ftgroup.com> -Bug-Reference-ID: <728_1312188080_4E3666B0_728_118711_1_3B5D3E0F95CC5C478D6500CDCE8B691F7AAAA4AA3D@PUEXCB2B.nanterre.francetelecom.fr> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-08/msg00000.html - -Bug-Description: - -When in a context where arithmetic evaluation is not taking place, the -evaluator should not check for division by 0. - -Patch (apply with `patch -p0'): - -*** ../bash-4.2-patched/expr.c 2010-12-21 11:12:13.000000000 -0500 ---- expr.c 2011-08-02 20:58:28.000000000 -0400 -*************** -*** 477,480 **** ---- 481,492 ---- - if (special) - { -+ if ((op == DIV || op == MOD) && value == 0) -+ { -+ if (noeval == 0) -+ evalerror (_("division by 0")); -+ else -+ value = 1; -+ } -+ - switch (op) - { -*************** -*** 483,493 **** - break; - case DIV: -- if (value == 0) -- evalerror (_("division by 0")); - lvalue /= value; - break; - case MOD: -- if (value == 0) -- evalerror (_("division by 0")); - lvalue %= value; - break; ---- 495,501 ---- -*************** -*** 805,809 **** - - if (((op == DIV) || (op == MOD)) && (val2 == 0)) -! evalerror (_("division by 0")); - - if (op == MUL) ---- 813,822 ---- - - if (((op == DIV) || (op == MOD)) && (val2 == 0)) -! { -! if (noeval == 0) -! evalerror (_("division by 0")); -! else -! val2 = 1; -! } - - if (op == MUL) -*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 ---- patchlevel.h Thu Feb 24 21:41:34 2011 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 14 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 15 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/shell-term-fm/bash/patches/bash42-016 b/shell-term-fm/bash/patches/bash42-016 deleted file mode 100644 index 46025888be..0000000000 --- a/shell-term-fm/bash/patches/bash42-016 +++ /dev/null @@ -1,46 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 4.2 -Patch-ID: bash42-016 - -Bug-Reported-by: Martin von Gagern <Martin.vGagern@gmx.net> -Bug-Reference-ID: <4E43AD9E.8060501@gmx.net> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-08/msg00141.html - -Bug-Description: - -Bash should not check for mail while executing the `eval' builtin. - -Patch (apply with `patch -p0'): - -*** ../bash-4.2-patched/parse.y Fri Feb 25 12:07:41 2011 ---- parse.y Thu Aug 11 19:02:26 2011 -*************** -*** 2500,2504 **** - is the mail alarm reset; nothing takes place in check_mail () - except the checking of mail. Please don't change this. */ -! if (prompt_is_ps1 && time_to_check_mail ()) - { - check_mail (); ---- 2498,2502 ---- - is the mail alarm reset; nothing takes place in check_mail () - except the checking of mail. Please don't change this. */ -! if (prompt_is_ps1 && parse_and_execute_level == 0 && time_to_check_mail ()) - { - check_mail (); -*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 ---- patchlevel.h Thu Feb 24 21:41:34 2011 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 15 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 16 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/shell-term-fm/bash/patches/bash42-017 b/shell-term-fm/bash/patches/bash42-017 deleted file mode 100644 index 010ed1e502..0000000000 --- a/shell-term-fm/bash/patches/bash42-017 +++ /dev/null @@ -1,47 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 4.2 -Patch-ID: bash42-017 - -Bug-Reported-by: Curtis Doty <Curtis@GreenKey.net> -Bug-Reference-ID: <20110621035324.A4F70849F59@mx1.iParadigms.net> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-06/msg00053.html - -Bug-Description: - -Using `read -a foo' where foo was an already-declared associative array -caused the shell to die with a segmentation fault. - -Patch (apply with `patch -p0'): - -*** ../bash-4.2-patched/builtins/read.def 2011-01-04 11:43:36.000000000 -0500 ---- builtins/read.def 2011-06-21 10:31:02.000000000 -0400 -*************** -*** 643,646 **** ---- 642,651 ---- - return EXECUTION_FAILURE; /* readonly or noassign */ - } -+ if (assoc_p (var)) -+ { -+ builtin_error (_("%s: cannot convert associative to indexed array"), arrayname); -+ xfree (input_string); -+ return EXECUTION_FAILURE; /* existing associative array */ -+ } - array_flush (array_cell (var)); - -*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 ---- patchlevel.h Thu Feb 24 21:41:34 2011 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 16 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 17 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/shell-term-fm/bash/patches/bash42-018 b/shell-term-fm/bash/patches/bash42-018 deleted file mode 100644 index 5d11dce164..0000000000 --- a/shell-term-fm/bash/patches/bash42-018 +++ /dev/null @@ -1,74 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 4.2 -Patch-ID: bash42-018 - -Bug-Reported-by: Thomas Cort <tcort@minix3.org> -Bug-Reference-ID: <BANLkTik-ebGGw3k_1YtB=RyfV1bsqdxC_g@mail.gmail.com> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-06/msg00110.html - -Bug-Description: - -Bash fails to compile unless JOB_CONTROL is defined. - -Patch (apply with `patch -p0'): - -*** ../bash-4.2-patched/execute_cmd.c 2011-02-09 17:32:25.000000000 -0500 ---- execute_cmd.c 2011-11-06 15:12:48.000000000 -0500 -*************** -*** 2197,2200 **** ---- 2315,2319 ---- - cmd->flags |= CMD_IGNORE_RETURN; - -+ #if defined (JOB_CONTROL) - lastpipe_flag = 0; - begin_unwind_frame ("lastpipe-exec"); -*************** -*** 2216,2228 **** - add_unwind_protect (lastpipe_cleanup, lastpipe_jid); - } -! cmd->flags |= CMD_LASTPIPE; - } - if (prev >= 0) - add_unwind_protect (close, prev); - - exec_result = execute_command_internal (cmd, asynchronous, prev, pipe_out, fds_to_close); - - if (lstdin > 0) - restore_stdin (lstdin); - - if (prev >= 0) ---- 2335,2351 ---- - add_unwind_protect (lastpipe_cleanup, lastpipe_jid); - } -! if (cmd) -! cmd->flags |= CMD_LASTPIPE; - } - if (prev >= 0) - add_unwind_protect (close, prev); -+ #endif - - exec_result = execute_command_internal (cmd, asynchronous, prev, pipe_out, fds_to_close); - -+ #if defined (JOB_CONTROL) - if (lstdin > 0) - restore_stdin (lstdin); -+ #endif - - if (prev >= 0) -*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 ---- patchlevel.h Thu Feb 24 21:41:34 2011 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 17 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 18 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/shell-term-fm/bash/patches/bash42-019 b/shell-term-fm/bash/patches/bash42-019 deleted file mode 100644 index 5fce40ae59..0000000000 --- a/shell-term-fm/bash/patches/bash42-019 +++ /dev/null @@ -1,47 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 4.2 -Patch-ID: bash42-019 - -Bug-Reported-by: Diego Augusto Molina <diegoaugustomolina@gmail.com> -Bug-Reference-ID: <CAGOxLdHcSQu3ck9Qy3pRjj_NBU5tAPSAvNm-95-nLQ9Szwb6aA@mail.gmail.com> -Bug-Reference-URL: lists.gnu.org/archive/html/bug-bash/2011-09/msg00047.html - -Bug-Description: - -Using `declare' with attributes and an invalid array variable name or -assignment reference resulted in a segmentation fault instead of a -declaration error. - -Patch (apply with `patch -p0'): - -*** ../bash-4.2-patched/builtins/declare.def 2010-05-30 18:25:21.000000000 -0400 ---- builtins/declare.def 2011-09-15 15:20:20.000000000 -0400 -*************** -*** 514,517 **** ---- 514,522 ---- - var = assign_array_element (name, value, 0); /* XXX - not aflags */ - *subscript_start = '\0'; -+ if (var == 0) /* some kind of assignment error */ -+ { -+ assign_error++; -+ NEXT_VARIABLE (); -+ } - } - else if (simple_array_assign) -*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 ---- patchlevel.h Thu Feb 24 21:41:34 2011 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 18 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 19 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/shell-term-fm/bash/patches/bash42-020 b/shell-term-fm/bash/patches/bash42-020 deleted file mode 100644 index a1dd0443e8..0000000000 --- a/shell-term-fm/bash/patches/bash42-020 +++ /dev/null @@ -1,60 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 4.2 -Patch-ID: bash42-020 - -Bug-Reported-by: Vincent Sheffer <vince.sheffer@apisphere.com> -Bug-Reference-ID: <F13C1C4F-C44C-4071-BFED-4BB6D13CF92F@apisphere.com> -Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-readline/2011-08/msg00000.html - -Bug-Description: - -The shared object helper script needs to be updated for Mac OS X 10.7 -(Lion, darwin11). - -Patch (apply with `patch -p0'): - -*** ../bash-4.2-patched/support/shobj-conf 2009-10-28 09:20:21.000000000 -0400 ---- support/shobj-conf 2011-08-27 13:25:23.000000000 -0400 -*************** -*** 158,162 **** - - # Darwin/MacOS X -! darwin[89]*|darwin10*) - SHOBJ_STATUS=supported - SHLIB_STATUS=supported ---- 172,176 ---- - - # Darwin/MacOS X -! darwin[89]*|darwin1[012]*) - SHOBJ_STATUS=supported - SHLIB_STATUS=supported -*************** -*** 187,191 **** - - case "${host_os}" in -! darwin[789]*|darwin10*) SHOBJ_LDFLAGS='' - SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v' - ;; ---- 201,205 ---- - - case "${host_os}" in -! darwin[789]*|darwin1[012]*) SHOBJ_LDFLAGS='' - SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v' - ;; -*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 ---- patchlevel.h Thu Feb 24 21:41:34 2011 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 19 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 20 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/shell-term-fm/bash/patches/bash42-021 b/shell-term-fm/bash/patches/bash42-021 deleted file mode 100644 index b6153c7847..0000000000 --- a/shell-term-fm/bash/patches/bash42-021 +++ /dev/null @@ -1,61 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 4.2 -Patch-ID: bash42-021 - -Bug-Reported-by: Dan Douglas <ormaaj@gmail.com> -Bug-Reference-ID: <4585554.nZWb4q7YoZ@smorgbox> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-12/msg00084.html - -Bug-Description: - -Using `read -N' to assign values to an array can result in NUL values being -assigned to some array elements. These values cause seg faults when referenced -later. - -Patch (apply with `patch -p0'): - -*** ../bash-4.2-patched/builtins/read.def 2011-11-21 18:03:38.000000000 -0500 ---- builtins/read.def 2011-12-19 19:52:12.000000000 -0500 -*************** -*** 738,742 **** - } - else -! var = bind_read_variable (varname, t); - } - else ---- 775,779 ---- - } - else -! var = bind_read_variable (varname, t ? t : ""); - } - else -*************** -*** 799,803 **** - } - else -! var = bind_read_variable (list->word->word, input_string); - - if (var) ---- 836,840 ---- - } - else -! var = bind_read_variable (list->word->word, input_string ? input_string : ""); - - if (var) -*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 ---- patchlevel.h Thu Feb 24 21:41:34 2011 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 20 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 21 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/shell-term-fm/bash/patches/bash42-022 b/shell-term-fm/bash/patches/bash42-022 deleted file mode 100644 index 0067b1335d..0000000000 --- a/shell-term-fm/bash/patches/bash42-022 +++ /dev/null @@ -1,61 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 4.2 -Patch-ID: bash42-022 - -Bug-Reported-by: Gregory Margo <gmargo@pacbell.net> -Bug-Reference-ID: <20110727174529.GA3333@pacbell.net> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-07/msg00102.html - -Bug-Description: - -The return value from lseek is `off_t'. This can cause corrupted return -values when the file offset is greater than 2**31 - 1. - -Patch (apply with `patch -p0'): - -*** ../bash-4.2-patched/lib/sh/zread.c Mon Mar 2 08:54:45 2009 ---- lib/sh/zread.c Thu Jul 28 18:16:53 2011 -*************** -*** 161,166 **** - int fd; - { -! off_t off; -! int r; - - off = lused - lind; ---- 161,165 ---- - int fd; - { -! off_t off, r; - - off = lused - lind; -*************** -*** 169,173 **** - r = lseek (fd, -off, SEEK_CUR); - -! if (r >= 0) - lused = lind = 0; - } ---- 168,172 ---- - r = lseek (fd, -off, SEEK_CUR); - -! if (r != -1) - lused = lind = 0; - } -*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 ---- patchlevel.h Thu Feb 24 21:41:34 2011 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 21 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 22 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/shell-term-fm/bash/patches/bash42-023 b/shell-term-fm/bash/patches/bash42-023 deleted file mode 100644 index 4f204efb07..0000000000 --- a/shell-term-fm/bash/patches/bash42-023 +++ /dev/null @@ -1,62 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 4.2 -Patch-ID: bash42-023 - -Bug-Reported-by: Ewan Mellor <Ewan.Mellor@eu.citrix.com> -Bug-Reference-ID: <6005BE083BF501439A84DC3523BAC82DC4B964FD12@LONPMAILBOX01.citrite.net> -Bug-Reference-URL: - -Bug-Description: - -Under some circumstances, an exit trap triggered by a bad substitution -error when errexit is enabled will cause the shell to exit with an -incorrect exit status (0). - -Patch (apply with `patch -p0'): - -*** ../bash-4.2-patched/subst.c 2011-11-21 12:04:38.000000000 -0500 ---- subst.c 2012-02-08 13:36:28.000000000 -0500 -*************** -*** 7275,7278 **** ---- 7281,7285 ---- - case '\0': - bad_substitution: -+ last_command_exit_value = EXECUTION_FAILURE; - report_error (_("%s: bad substitution"), string ? string : "??"); - FREE (value); -*** ../bash-4.2-patched/error.c 2009-08-21 22:31:31.000000000 -0400 ---- error.c 2012-02-25 15:54:40.000000000 -0500 -*************** -*** 201,205 **** - va_end (args); - if (exit_immediately_on_error) -! exit_shell (1); - } - ---- 201,209 ---- - va_end (args); - if (exit_immediately_on_error) -! { -! if (last_command_exit_value == 0) -! last_command_exit_value = 1; -! exit_shell (last_command_exit_value); -! } - } - -*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 ---- patchlevel.h Thu Feb 24 21:41:34 2011 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 22 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 23 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/shell-term-fm/bash/patches/bash42-024 b/shell-term-fm/bash/patches/bash42-024 deleted file mode 100644 index b7b1158b89..0000000000 --- a/shell-term-fm/bash/patches/bash42-024 +++ /dev/null @@ -1,45 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 4.2 -Patch-ID: bash42-024 - -Bug-Reported-by: Jim Avera <james_avera@yahoo.com> -Bug-Reference-ID: <4F29E07A.80405@yahoo.com> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2012-02/msg00001.html - -Bug-Description: - -When `printf -v' is used to set an array element, the format string contains -`%b', and the corresponding argument is the empty string, the buffer used -to store the value to be assigned can be NULL, which results in NUL being -assigned to the array element. This causes a seg fault when it's used later. - -Patch (apply with `patch -p0'): - -*** ../bash-4.2-patched/builtins/printf.def 2011-02-25 12:07:41.000000000 -0500 ---- builtins/printf.def 2012-02-02 08:37:12.000000000 -0500 -*************** -*** 256,259 **** ---- 257,262 ---- - { - vflag = 1; -+ if (vbsize == 0) -+ vbuf = xmalloc (vbsize = 16); - vblen = 0; - if (vbuf) -*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 ---- patchlevel.h Thu Feb 24 21:41:34 2011 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 23 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 24 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/shell-term-fm/bash/patches/bash42-025 b/shell-term-fm/bash/patches/bash42-025 deleted file mode 100644 index 34ac34300e..0000000000 --- a/shell-term-fm/bash/patches/bash42-025 +++ /dev/null @@ -1,143 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 4.2 -Patch-ID: bash42-025 - -Bug-Reported-by: Bill Gradwohl <bill@ycc.com> -Bug-Reference-ID: <CAFyvKis-UfuOWr5THBRKh=vYHDoKEEgdW8hN1RviTuYQ00Lu5A@mail.gmail.com> -Bug-Reference-URL: http://lists.gnu.org/archive/html/help-bash/2012-03/msg00078.html - -Bug-Description: - -When used in a shell function, `declare -g -a array=(compound assignment)' -creates a local variable instead of a global one. - -Patch (apply with `patch -p0'): - -*** ../bash-4.2-patched/command.h 2010-08-02 19:36:51.000000000 -0400 ---- command.h 2012-04-01 12:38:35.000000000 -0400 -*************** -*** 98,101 **** ---- 98,102 ---- - #define W_ASSIGNASSOC 0x400000 /* word looks like associative array assignment */ - #define W_ARRAYIND 0x800000 /* word is an array index being expanded */ -+ #define W_ASSNGLOBAL 0x1000000 /* word is a global assignment to declare (declare/typeset -g) */ - - /* Possible values for subshell_environment */ -*** ../bash-4.2-patched/execute_cmd.c 2011-11-21 18:03:41.000000000 -0500 ---- execute_cmd.c 2012-04-01 12:42:03.000000000 -0400 -*************** -*** 3581,3585 **** - WORD_LIST *w; - struct builtin *b; -! int assoc; - - if (words == 0) ---- 3581,3585 ---- - WORD_LIST *w; - struct builtin *b; -! int assoc, global; - - if (words == 0) -*************** -*** 3587,3591 **** - - b = 0; -! assoc = 0; - - for (w = words; w; w = w->next) ---- 3587,3591 ---- - - b = 0; -! assoc = global = 0; - - for (w = words; w; w = w->next) -*************** -*** 3604,3607 **** ---- 3604,3609 ---- - if (assoc) - w->word->flags |= W_ASSIGNASSOC; -+ if (global) -+ w->word->flags |= W_ASSNGLOBAL; - #endif - } -*************** -*** 3609,3613 **** - /* Note that we saw an associative array option to a builtin that takes - assignment statements. This is a bit of a kludge. */ -! else if (w->word->word[0] == '-' && strchr (w->word->word, 'A')) - { - if (b == 0) ---- 3611,3618 ---- - /* Note that we saw an associative array option to a builtin that takes - assignment statements. This is a bit of a kludge. */ -! else if (w->word->word[0] == '-' && (strchr (w->word->word+1, 'A') || strchr (w->word->word+1, 'g'))) -! #else -! else if (w->word->word[0] == '-' && strchr (w->word->word+1, 'g')) -! #endif - { - if (b == 0) -*************** -*** 3619,3626 **** - words->word->flags |= W_ASSNBLTIN; - } -! if (words->word->flags & W_ASSNBLTIN) - assoc = 1; - } -- #endif - } - ---- 3624,3632 ---- - words->word->flags |= W_ASSNBLTIN; - } -! if ((words->word->flags & W_ASSNBLTIN) && strchr (w->word->word+1, 'A')) - assoc = 1; -+ if ((words->word->flags & W_ASSNBLTIN) && strchr (w->word->word+1, 'g')) -+ global = 1; - } - } - -*** ../bash-4.2-patched/subst.c 2012-03-11 17:35:13.000000000 -0400 ---- subst.c 2012-04-01 12:38:35.000000000 -0400 -*************** -*** 367,370 **** ---- 367,375 ---- - fprintf (stderr, "W_ASSNBLTIN%s", f ? "|" : ""); - } -+ if (f & W_ASSNGLOBAL) -+ { -+ f &= ~W_ASSNGLOBAL; -+ fprintf (stderr, "W_ASSNGLOBAL%s", f ? "|" : ""); -+ } - if (f & W_COMPASSIGN) - { -*************** -*** 2804,2808 **** - else if (assign_list) - { -! if (word->flags & W_ASSIGNARG) - aflags |= ASS_MKLOCAL; - if (word->flags & W_ASSIGNASSOC) ---- 2809,2813 ---- - else if (assign_list) - { -! if ((word->flags & W_ASSIGNARG) && (word->flags & W_ASSNGLOBAL) == 0) - aflags |= ASS_MKLOCAL; - if (word->flags & W_ASSIGNASSOC) - -*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 ---- patchlevel.h Thu Feb 24 21:41:34 2011 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 24 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 25 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/shell-term-fm/bash/patches/bash42-026 b/shell-term-fm/bash/patches/bash42-026 deleted file mode 100644 index e15d748070..0000000000 --- a/shell-term-fm/bash/patches/bash42-026 +++ /dev/null @@ -1,58 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 4.2 -Patch-ID: bash42-026 - -Bug-Reported-by: Greg Wooledge <wooledg@eeg.ccf.org> -Bug-Reference-ID: <20120425180443.GO22241@eeg.ccf.org> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2012-04/msg00172.html - -Bug-Description: - -The `lastpipe' option does not behave correctly on machines where the -open file limit is less than 256. - -Patch (apply with `patch -p0'): - -*** ../bash-4.2-patched/execute_cmd.c 2011-11-21 12:04:47.000000000 -0500 ---- execute_cmd.c 2012-04-26 11:09:30.000000000 -0400 -*************** -*** 2206,2210 **** - if (lastpipe_opt && job_control == 0 && asynchronous == 0 && pipe_out == NO_PIPE && prev > 0) - { -! lstdin = move_to_high_fd (0, 0, 255); - if (lstdin > 0) - { ---- 2325,2329 ---- - if (lastpipe_opt && job_control == 0 && asynchronous == 0 && pipe_out == NO_PIPE && prev > 0) - { -! lstdin = move_to_high_fd (0, 1, -1); - if (lstdin > 0) - { -*************** -*** 2252,2256 **** ---- 2371,2377 ---- - } - -+ #if defined (JOB_CONTROL) - discard_unwind_frame ("lastpipe-exec"); -+ #endif - - return (exec_result); - -*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 ---- patchlevel.h Thu Feb 24 21:41:34 2011 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 25 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 26 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/shell-term-fm/bash/patches/bash42-027 b/shell-term-fm/bash/patches/bash42-027 deleted file mode 100644 index c0c5d3f804..0000000000 --- a/shell-term-fm/bash/patches/bash42-027 +++ /dev/null @@ -1,47 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 4.2 -Patch-ID: bash42-027 - -Bug-Reported-by: Mike Frysinger <vapier@gentoo.org> -Bug-Reference-ID: <201204211243.30163.vapier@gentoo.org> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2012-04/msg00134.html - -Bug-Description: - -When the `extglob' shell option is enabled, pattern substitution does not -work correctly in the presence of multibyte characters. - -Patch (apply with `patch -p0'): - -*** ../bash-4.2-patched/subst.c 2012-03-11 17:52:57.000000000 -0400 ---- subst.c 2012-04-22 16:19:10.000000000 -0400 -*************** -*** 4167,4171 **** - #if defined (EXTENDED_GLOB) - if (extended_glob) -! simple |= (wpat[1] != L'(' || (wpat[0] != L'*' && wpat[0] != L'?' && wpat[0] != L'+' && wpat[0] != L'!' && wpat[0] != L'@')); /*)*/ - #endif - ---- 4167,4171 ---- - #if defined (EXTENDED_GLOB) - if (extended_glob) -! simple &= (wpat[1] != L'(' || (wpat[0] != L'*' && wpat[0] != L'?' && wpat[0] != L'+' && wpat[0] != L'!' && wpat[0] != L'@')); /*)*/ - #endif - -*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 ---- patchlevel.h Thu Feb 24 21:41:34 2011 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 26 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 27 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/shell-term-fm/bash/patches/bash42-028 b/shell-term-fm/bash/patches/bash42-028 deleted file mode 100644 index fa3be3b48f..0000000000 --- a/shell-term-fm/bash/patches/bash42-028 +++ /dev/null @@ -1,52 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 4.2 -Patch-ID: bash42-028 - -Bug-Reported-by: Mark Edgar <medgar123@gmail.com> -Bug-Reference-ID: <CABHMh_3d+ZgO_zaEtYXPwK4P7tC0ghZ4g=Ue_TRpsEMf5YDsqw@mail.gmail.com> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2012-03/msg00109.html - -Bug-Description: - -When using a word expansion for which the right hand side is evaluated, -certain expansions of quoted null strings include spurious ^? characters. - -Patch (apply with `patch -p0'): - -*** ../bash-4.2-patched/subst.c 2012-03-11 17:35:13.000000000 -0400 ---- subst.c 2012-03-20 19:30:13.000000000 -0400 -*************** -*** 5810,5813 **** ---- 5810,5823 ---- - if (qdollaratp && ((hasdol && quoted) || l->next)) - *qdollaratp = 1; -+ /* If we have a quoted null result (QUOTED_NULL(temp)) and the word is -+ a quoted null (l->next == 0 && QUOTED_NULL(l->word->word)), the -+ flags indicate it (l->word->flags & W_HASQUOTEDNULL), and the -+ expansion is quoted (quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)) -+ (which is more paranoia than anything else), we need to return the -+ quoted null string and set the flags to indicate it. */ -+ if (l->next == 0 && (quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)) && QUOTED_NULL(temp) && QUOTED_NULL(l->word->word) && (l->word->flags & W_HASQUOTEDNULL)) -+ { -+ w->flags |= W_HASQUOTEDNULL; -+ } - dispose_words (l); - } - -*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 ---- patchlevel.h Thu Feb 24 21:41:34 2011 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 27 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 28 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/shell-term-fm/bash/patches/bash42-029 b/shell-term-fm/bash/patches/bash42-029 deleted file mode 100644 index c51704ca7e..0000000000 --- a/shell-term-fm/bash/patches/bash42-029 +++ /dev/null @@ -1,524 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 4.2 -Patch-ID: bash42-029 - -Bug-Reported-by: "Michael Kalisz" <michael@kalisz.homelinux.net> -Bug-Reference-ID: <50241.78.69.11.112.1298585641.squirrel@kalisz.homelinux.net> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-02/msg00274.html - -Bug-Description: - -Bash-4.2 tries to leave completed directory names as the user typed them, -without expanding them to a full pathname. One effect of this is that -shell variables used in pathnames being completed (e.g., $HOME) are left -unchanged, but the `$' is quoted by readline because it is a special -character to the shell. - -This patch introduces two things: - -1. A new shell option, `direxpand', which, if set, attempts to emulate the - bash-4.1 behavior of expanding words to full pathnames during - completion; -2. A set of heuristics that reduce the number of times special characters - such as `$' are quoted when the directory name is not expanded. - -Patch (apply with `patch -p0'): - -diff -NrC 2 ../bash-4.2-patched/bashline.c ./bashline.c -*** ../bash-4.2-patched/bashline.c 2011-01-16 15:32:47.000000000 -0500 ---- ./bashline.c 2012-05-07 16:27:18.000000000 -0400 -*************** -*** 122,125 **** ---- 122,128 ---- - static int bash_push_line __P((void)); - -+ static rl_icppfunc_t *save_directory_hook __P((void)); -+ static void reset_directory_hook __P((rl_icppfunc_t *)); -+ - static void cleanup_expansion_error __P((void)); - static void maybe_make_readline_line __P((char *)); -*************** -*** 244,251 **** ---- 247,261 ---- - int dircomplete_spelling = 0; - -+ /* Expand directory names during word/filename completion. */ -+ int dircomplete_expand = 0; -+ int dircomplete_expand_relpath = 0; -+ - static char *bash_completer_word_break_characters = " \t\n\"'@><=;|&(:"; - static char *bash_nohostname_word_break_characters = " \t\n\"'><=;|&(:"; - /* )) */ - -+ static const char *default_filename_quote_characters = " \t\n\\\"'@<>=;|&()#$`?*[!:{~"; /*}*/ -+ static char *custom_filename_quote_characters = 0; -+ - static rl_hook_func_t *old_rl_startup_hook = (rl_hook_func_t *)NULL; - -*************** -*** 502,506 **** - /* Tell the completer that we might want to follow symbolic links or - do other expansion on directory names. */ -! rl_directory_rewrite_hook = bash_directory_completion_hook; - - rl_filename_rewrite_hook = bash_filename_rewrite_hook; ---- 512,516 ---- - /* Tell the completer that we might want to follow symbolic links or - do other expansion on directory names. */ -! set_directory_hook (); - - rl_filename_rewrite_hook = bash_filename_rewrite_hook; -*************** -*** 530,534 **** - - /* characters that need to be quoted when appearing in filenames. */ -! rl_filename_quote_characters = " \t\n\\\"'@<>=;|&()#$`?*[!:{~"; /*}*/ - - rl_filename_quoting_function = bash_quote_filename; ---- 540,544 ---- - - /* characters that need to be quoted when appearing in filenames. */ -! rl_filename_quote_characters = default_filename_quote_characters; - - rl_filename_quoting_function = bash_quote_filename; -*************** -*** 565,570 **** - rl_attempted_completion_function = attempt_shell_completion; - rl_completion_entry_function = NULL; -- rl_directory_rewrite_hook = bash_directory_completion_hook; - rl_ignore_some_completions_function = filename_completion_ignore; - } - ---- 575,582 ---- - rl_attempted_completion_function = attempt_shell_completion; - rl_completion_entry_function = NULL; - rl_ignore_some_completions_function = filename_completion_ignore; -+ rl_filename_quote_characters = default_filename_quote_characters; -+ -+ set_directory_hook (); - } - -*************** -*** 1280,1283 **** ---- 1292,1298 ---- - rl_ignore_some_completions_function = filename_completion_ignore; - -+ rl_filename_quote_characters = default_filename_quote_characters; -+ set_directory_hook (); -+ - /* Determine if this could be a command word. It is if it appears at - the start of the line (ignoring preceding whitespace), or if it -*************** -*** 1592,1595 **** ---- 1607,1616 ---- - else - { -+ if (dircomplete_expand && dot_or_dotdot (filename_hint)) -+ { -+ dircomplete_expand = 0; -+ set_directory_hook (); -+ dircomplete_expand = 1; -+ } - mapping_over = 4; - goto inner; -*************** -*** 1792,1795 **** ---- 1813,1819 ---- - inner: - val = rl_filename_completion_function (filename_hint, istate); -+ if (mapping_over == 4 && dircomplete_expand) -+ set_directory_hook (); -+ - istate = 1; - -*************** -*** 2694,2697 **** ---- 2718,2767 ---- - } - -+ /* Functions to save and restore the appropriate directory hook */ -+ /* This is not static so the shopt code can call it */ -+ void -+ set_directory_hook () -+ { -+ if (dircomplete_expand) -+ { -+ rl_directory_completion_hook = bash_directory_completion_hook; -+ rl_directory_rewrite_hook = (rl_icppfunc_t *)0; -+ } -+ else -+ { -+ rl_directory_rewrite_hook = bash_directory_completion_hook; -+ rl_directory_completion_hook = (rl_icppfunc_t *)0; -+ } -+ } -+ -+ static rl_icppfunc_t * -+ save_directory_hook () -+ { -+ rl_icppfunc_t *ret; -+ -+ if (dircomplete_expand) -+ { -+ ret = rl_directory_completion_hook; -+ rl_directory_completion_hook = (rl_icppfunc_t *)NULL; -+ } -+ else -+ { -+ ret = rl_directory_rewrite_hook; -+ rl_directory_rewrite_hook = (rl_icppfunc_t *)NULL; -+ } -+ -+ return ret; -+ } -+ -+ static void -+ restore_directory_hook (hookf) -+ rl_icppfunc_t *hookf; -+ { -+ if (dircomplete_expand) -+ rl_directory_completion_hook = hookf; -+ else -+ rl_directory_rewrite_hook = hookf; -+ } -+ - /* Handle symbolic link references and other directory name - expansions while hacking completion. This should return 1 if it modifies -*************** -*** 2703,2720 **** - { - char *local_dirname, *new_dirname, *t; -! int return_value, should_expand_dirname; - WORD_LIST *wl; - struct stat sb; - -! return_value = should_expand_dirname = 0; - local_dirname = *dirname; - -! if (mbschr (local_dirname, '$')) -! should_expand_dirname = 1; - else - { - t = mbschr (local_dirname, '`'); - if (t && unclosed_pair (local_dirname, strlen (local_dirname), "`") == 0) -! should_expand_dirname = 1; - } - ---- 2773,2801 ---- - { - char *local_dirname, *new_dirname, *t; -! int return_value, should_expand_dirname, nextch, closer; - WORD_LIST *wl; - struct stat sb; - -! return_value = should_expand_dirname = nextch = closer = 0; - local_dirname = *dirname; - -! if (t = mbschr (local_dirname, '$')) -! { -! should_expand_dirname = '$'; -! nextch = t[1]; -! /* Deliberately does not handle the deprecated $[...] arithmetic -! expansion syntax */ -! if (nextch == '(') -! closer = ')'; -! else if (nextch == '{') -! closer = '}'; -! else -! nextch = 0; -! } - else - { - t = mbschr (local_dirname, '`'); - if (t && unclosed_pair (local_dirname, strlen (local_dirname), "`") == 0) -! should_expand_dirname = '`'; - } - -*************** -*** 2740,2743 **** ---- 2821,2841 ---- - dispose_words (wl); - local_dirname = *dirname; -+ /* XXX - change rl_filename_quote_characters here based on -+ should_expand_dirname/nextch/closer. This is the only place -+ custom_filename_quote_characters is modified. */ -+ if (rl_filename_quote_characters && *rl_filename_quote_characters) -+ { -+ int i, j, c; -+ i = strlen (default_filename_quote_characters); -+ custom_filename_quote_characters = xrealloc (custom_filename_quote_characters, i+1); -+ for (i = j = 0; c = default_filename_quote_characters[i]; i++) -+ { -+ if (c == should_expand_dirname || c == nextch || c == closer) -+ continue; -+ custom_filename_quote_characters[j++] = c; -+ } -+ custom_filename_quote_characters[j] = '\0'; -+ rl_filename_quote_characters = custom_filename_quote_characters; -+ } - } - else -*************** -*** 2759,2762 **** ---- 2857,2871 ---- - } - -+ /* no_symbolic_links == 0 -> use (default) logical view of the file system. -+ local_dirname[0] == '.' && local_dirname[1] == '/' means files in the -+ current directory (./). -+ local_dirname[0] == '.' && local_dirname[1] == 0 means relative pathnames -+ in the current directory (e.g., lib/sh). -+ XXX - should we do spelling correction on these? */ -+ -+ /* This is test as it was in bash-4.2: skip relative pathnames in current -+ directory. Change test to -+ (local_dirname[0] != '.' || (local_dirname[1] && local_dirname[1] != '/')) -+ if we want to skip paths beginning with ./ also. */ - if (no_symbolic_links == 0 && (local_dirname[0] != '.' || local_dirname[1])) - { -*************** -*** 2764,2767 **** ---- 2873,2885 ---- - int len1, len2; - -+ /* If we have a relative path -+ (local_dirname[0] != '/' && local_dirname[0] != '.') -+ that is canonical after appending it to the current directory, then -+ temp1 = temp2+'/' -+ That is, -+ strcmp (temp1, temp2) == 0 -+ after adding a slash to temp2 below. It should be safe to not -+ change those. -+ */ - t = get_working_directory ("symlink-hook"); - temp1 = make_absolute (local_dirname, t); -*************** -*** 2798,2802 **** - } - } -! return_value |= STREQ (local_dirname, temp2) == 0; - free (local_dirname); - *dirname = temp2; ---- 2916,2928 ---- - } - } -! -! /* dircomplete_expand_relpath == 0 means we want to leave relative -! pathnames that are unchanged by canonicalization alone. -! *local_dirname != '/' && *local_dirname != '.' == relative pathname -! (consistent with general.c:absolute_pathname()) -! temp1 == temp2 (after appending a slash to temp2) means the pathname -! is not changed by canonicalization as described above. */ -! if (dircomplete_expand_relpath || ((local_dirname[0] != '/' && local_dirname[0] != '.') && STREQ (temp1, temp2) == 0)) -! return_value |= STREQ (local_dirname, temp2) == 0; - free (local_dirname); - *dirname = temp2; -*************** -*** 3003,3012 **** - orig_func = rl_completion_entry_function; - orig_attempt_func = rl_attempted_completion_function; -- orig_dir_func = rl_directory_rewrite_hook; - orig_ignore_func = rl_ignore_some_completions_function; - orig_rl_completer_word_break_characters = rl_completer_word_break_characters; - rl_completion_entry_function = rl_filename_completion_function; - rl_attempted_completion_function = (rl_completion_func_t *)NULL; -- rl_directory_rewrite_hook = (rl_icppfunc_t *)NULL; - rl_ignore_some_completions_function = filename_completion_ignore; - rl_completer_word_break_characters = " \t\n\"\'"; ---- 3129,3139 ---- - orig_func = rl_completion_entry_function; - orig_attempt_func = rl_attempted_completion_function; - orig_ignore_func = rl_ignore_some_completions_function; - orig_rl_completer_word_break_characters = rl_completer_word_break_characters; -+ -+ orig_dir_func = save_directory_hook (); -+ - rl_completion_entry_function = rl_filename_completion_function; - rl_attempted_completion_function = (rl_completion_func_t *)NULL; - rl_ignore_some_completions_function = filename_completion_ignore; - rl_completer_word_break_characters = " \t\n\"\'"; -*************** -*** 3016,3023 **** - rl_completion_entry_function = orig_func; - rl_attempted_completion_function = orig_attempt_func; -- rl_directory_rewrite_hook = orig_dir_func; - rl_ignore_some_completions_function = orig_ignore_func; - rl_completer_word_break_characters = orig_rl_completer_word_break_characters; - - return r; - } ---- 3143,3151 ---- - rl_completion_entry_function = orig_func; - rl_attempted_completion_function = orig_attempt_func; - rl_ignore_some_completions_function = orig_ignore_func; - rl_completer_word_break_characters = orig_rl_completer_word_break_characters; - -+ restore_directory_hook (orig_dir_func); -+ - return r; - } -diff -NrC 2 ../bash-4.2-patched/bashline.h ./bashline.h -*** ../bash-4.2-patched/bashline.h 2009-01-04 14:32:22.000000000 -0500 ---- ./bashline.h 2012-05-07 16:27:18.000000000 -0400 -*************** -*** 34,41 **** ---- 34,46 ---- - extern int bash_re_edit __P((char *)); - -+ extern void bashline_set_event_hook __P((void)); -+ extern void bashline_reset_event_hook __P((void)); -+ - extern int bind_keyseq_to_unix_command __P((char *)); - - extern char **bash_default_completion __P((const char *, int, int, int, int)); - -+ void set_directory_hook __P((void)); -+ - /* Used by programmable completion code. */ - extern char *command_word_completion_function __P((const char *, int)); -diff -NrC 2 ../bash-4.2-patched/builtins/shopt.def ./builtins/shopt.def -*** ../bash-4.2-patched/builtins/shopt.def 2010-07-02 22:42:44.000000000 -0400 ---- ./builtins/shopt.def 2012-05-07 16:27:18.000000000 -0400 -*************** -*** 62,65 **** ---- 62,69 ---- - #include "bashgetopt.h" - -+ #if defined (READLINE) -+ # include "../bashline.h" -+ #endif -+ - #if defined (HISTORY) - # include "../bashhist.h" -*************** -*** 95,99 **** - extern int no_empty_command_completion; - extern int force_fignore; -! extern int dircomplete_spelling; - - extern int enable_hostname_completion __P((int)); ---- 99,103 ---- - extern int no_empty_command_completion; - extern int force_fignore; -! extern int dircomplete_spelling, dircomplete_expand; - - extern int enable_hostname_completion __P((int)); -*************** -*** 122,125 **** ---- 126,133 ---- - #endif - -+ #if defined (READLINE) -+ static int shopt_set_complete_direxpand __P((char *, int)); -+ #endif -+ - static int shopt_login_shell; - static int shopt_compat31; -*************** -*** 151,154 **** ---- 159,163 ---- - { "compat41", &shopt_compat41, set_compatibility_level }, - #if defined (READLINE) -+ { "direxpand", &dircomplete_expand, shopt_set_complete_direxpand }, - { "dirspell", &dircomplete_spelling, (shopt_set_func_t *)NULL }, - #endif -*************** -*** 536,539 **** ---- 545,559 ---- - } - -+ #if defined (READLINE) -+ static int -+ shopt_set_complete_direxpand (option_name, mode) -+ char *option_name; -+ int mode; -+ { -+ set_directory_hook (); -+ return 0; -+ } -+ #endif -+ - #if defined (RESTRICTED_SHELL) - /* Don't allow the value of restricted_shell to be modified. */ -Binary files ../bash-4.2-patched/doc/._bashref.pdf and ./doc/._bashref.pdf differ -diff -NrC 2 ../bash-4.2-patched/doc/bash.1 ./doc/bash.1 -*** ../bash-4.2-patched/doc/bash.1 2011-01-16 15:31:39.000000000 -0500 ---- ./doc/bash.1 2012-05-07 16:27:18.000000000 -0400 -*************** -*** 8949,8952 **** ---- 8949,8962 ---- - The default bash behavior remains as in previous versions. - .TP 8 -+ .B direxpand -+ If set, -+ .B bash -+ replaces directory names with the results of word expansion when performing -+ filename completion. This changes the contents of the readline editing -+ buffer. -+ If not set, -+ .B bash -+ attempts to preserve what the user typed. -+ .TP 8 - .B dirspell - If set, -diff -NrC 2 ../bash-4.2-patched/doc/bashref.texi ./doc/bashref.texi -*** ../bash-4.2-patched/doc/bashref.texi 2011-01-16 15:31:57.000000000 -0500 ---- ./doc/bashref.texi 2012-05-07 16:27:18.000000000 -0400 -*************** -*** 4536,4539 **** ---- 4536,4546 ---- - The default Bash behavior remains as in previous versions. - -+ @item direxpand -+ If set, Bash -+ replaces directory names with the results of word expansion when performing -+ filename completion. This changes the contents of the readline editing -+ buffer. -+ If not set, Bash attempts to preserve what the user typed. -+ - @item dirspell - If set, Bash -diff -NrC 2 ../bash-4.2-patched/tests/shopt.right ./tests/shopt.right -*** ../bash-4.2-patched/tests/shopt.right 2010-07-02 23:36:30.000000000 -0400 ---- ./tests/shopt.right 2012-05-07 16:27:18.000000000 -0400 -*************** -*** 13,16 **** ---- 13,17 ---- - shopt -u compat40 - shopt -u compat41 -+ shopt -u direxpand - shopt -u dirspell - shopt -u dotglob -*************** -*** 69,72 **** ---- 70,74 ---- - shopt -u compat40 - shopt -u compat41 -+ shopt -u direxpand - shopt -u dirspell - shopt -u dotglob -*************** -*** 102,105 **** ---- 104,108 ---- - compat40 off - compat41 off -+ direxpand off - dirspell off - dotglob off -*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 ---- patchlevel.h Thu Feb 24 21:41:34 2011 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 28 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 29 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/shell-term-fm/bash/patches/bash42-030 b/shell-term-fm/bash/patches/bash42-030 deleted file mode 100644 index 261a619bb5..0000000000 --- a/shell-term-fm/bash/patches/bash42-030 +++ /dev/null @@ -1,178 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 4.2 -Patch-ID: bash42-030 - -Bug-Reported-by: Roman Rakus <rrakus@redhat.com> -Bug-Reference-ID: <4D7DD91E.7040808@redhat.com> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-03/msg00126.html - -Bug-Description: - -When attempting to glob strings in a multibyte locale, and those strings -contain invalid multibyte characters that cause mbsnrtowcs to return 0, -the globbing code loops infinitely. - -Patch (apply with `patch -p0'): - -*** ../bash-4.2-patched/lib/glob/xmbsrtowcs.c 2010-05-30 18:36:27.000000000 -0400 ---- lib/glob/xmbsrtowcs.c 2011-03-22 16:06:47.000000000 -0400 -*************** -*** 36,39 **** ---- 36,41 ---- - #if HANDLE_MULTIBYTE - -+ #define WSBUF_INC 32 -+ - #ifndef FREE - # define FREE(x) do { if (x) free (x); } while (0) -*************** -*** 149,153 **** - size_t wcnum; /* Number of wide characters in WSBUF */ - mbstate_t state; /* Conversion State */ -! size_t wcslength; /* Number of wide characters produced by the conversion. */ - const char *end_or_backslash; - size_t nms; /* Number of multibyte characters to convert at one time. */ ---- 151,155 ---- - size_t wcnum; /* Number of wide characters in WSBUF */ - mbstate_t state; /* Conversion State */ -! size_t n, wcslength; /* Number of wide characters produced by the conversion. */ - const char *end_or_backslash; - size_t nms; /* Number of multibyte characters to convert at one time. */ -*************** -*** 172,176 **** - tmp_p = p; - tmp_state = state; -! wcslength = mbsnrtowcs(NULL, &tmp_p, nms, 0, &tmp_state); - - /* Conversion failed. */ ---- 174,189 ---- - tmp_p = p; - tmp_state = state; -! -! if (nms == 0 && *p == '\\') /* special initial case */ -! nms = wcslength = 1; -! else -! wcslength = mbsnrtowcs (NULL, &tmp_p, nms, 0, &tmp_state); -! -! if (wcslength == 0) -! { -! tmp_p = p; /* will need below */ -! tmp_state = state; -! wcslength = 1; /* take a single byte */ -! } - - /* Conversion failed. */ -*************** -*** 187,191 **** - wchar_t *wstmp; - -! wsbuf_size = wcnum+wcslength+1; /* 1 for the L'\0' or the potential L'\\' */ - - wstmp = (wchar_t *) realloc (wsbuf, wsbuf_size * sizeof (wchar_t)); ---- 200,205 ---- - wchar_t *wstmp; - -! while (wsbuf_size < wcnum+wcslength+1) /* 1 for the L'\0' or the potential L'\\' */ -! wsbuf_size += WSBUF_INC; - - wstmp = (wchar_t *) realloc (wsbuf, wsbuf_size * sizeof (wchar_t)); -*************** -*** 200,207 **** - - /* Perform the conversion. This is assumed to return 'wcslength'. -! * It may set 'p' to NULL. */ -! mbsnrtowcs(wsbuf+wcnum, &p, nms, wsbuf_size-wcnum, &state); - -! wcnum += wcslength; - - if (mbsinit (&state) && (p != NULL) && (*p == '\\')) ---- 214,229 ---- - - /* Perform the conversion. This is assumed to return 'wcslength'. -! It may set 'p' to NULL. */ -! n = mbsnrtowcs(wsbuf+wcnum, &p, nms, wsbuf_size-wcnum, &state); - -! /* Compensate for taking single byte on wcs conversion failure above. */ -! if (wcslength == 1 && (n == 0 || n == (size_t)-1)) -! { -! state = tmp_state; -! p = tmp_p; -! wsbuf[wcnum++] = *p++; -! } -! else -! wcnum += wcslength; - - if (mbsinit (&state) && (p != NULL) && (*p == '\\')) -*************** -*** 231,236 **** - of DESTP and INDICESP are NULL. */ - -- #define WSBUF_INC 32 -- - size_t - xdupmbstowcs (destp, indicesp, src) ---- 253,256 ---- -*** ../bash-4.2-patched/lib/glob/glob.c 2009-11-14 18:39:30.000000000 -0500 ---- lib/glob/glob.c 2012-07-07 12:09:56.000000000 -0400 -*************** -*** 201,206 **** - size_t pat_n, dn_n; - - pat_n = xdupmbstowcs (&pat_wc, NULL, pat); -! dn_n = xdupmbstowcs (&dn_wc, NULL, dname); - - ret = 0; ---- 201,209 ---- - size_t pat_n, dn_n; - -+ pat_wc = dn_wc = (wchar_t *)NULL; -+ - pat_n = xdupmbstowcs (&pat_wc, NULL, pat); -! if (pat_n != (size_t)-1) -! dn_n = xdupmbstowcs (&dn_wc, NULL, dname); - - ret = 0; -*************** -*** 222,225 **** ---- 225,230 ---- - ret = 1; - } -+ else -+ ret = skipname (pat, dname, flags); - - FREE (pat_wc); -*************** -*** 267,272 **** - n = xdupmbstowcs (&wpathname, NULL, pathname); - if (n == (size_t) -1) -! /* Something wrong. */ -! return; - orig_wpathname = wpathname; - ---- 272,280 ---- - n = xdupmbstowcs (&wpathname, NULL, pathname); - if (n == (size_t) -1) -! { -! /* Something wrong. Fall back to single-byte */ -! udequote_pathname (pathname); -! return; -! } - orig_wpathname = wpathname; - -*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 ---- patchlevel.h Thu Feb 24 21:41:34 2011 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 29 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 30 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/shell-term-fm/bash/patches/bash42-031 b/shell-term-fm/bash/patches/bash42-031 deleted file mode 100644 index 419d4478ed..0000000000 --- a/shell-term-fm/bash/patches/bash42-031 +++ /dev/null @@ -1,80 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 4.2 -Patch-ID: bash42-031 - -Bug-Reported-by: Max Horn <max@quendi.de> -Bug-Reference-ID: <20CC5C60-07C3-4E41-9817-741E48D407C5@quendi.de> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-readline/2012-06/msg00005.html - -Bug-Description: - -A change between bash-4.1 and bash-4.2 to prevent the readline input hook -from being called too frequently had the side effect of causing delays -when reading pasted input on systems such as Mac OS X. This patch fixes -those delays while retaining the bash-4.2 behavior. - -Patch (apply with `patch -p0'): - -*** ../bash-4.2-patched/lib/readline/input.c 2010-05-30 18:33:01.000000000 -0400 ---- lib/readline/input.c 2012-06-25 21:08:42.000000000 -0400 -*************** -*** 410,414 **** - rl_read_key () - { -! int c; - - rl_key_sequence_length++; ---- 412,416 ---- - rl_read_key () - { -! int c, r; - - rl_key_sequence_length++; -*************** -*** 430,441 **** - while (rl_event_hook) - { -! if (rl_gather_tyi () < 0) /* XXX - EIO */ - { - rl_done = 1; - return ('\n'); - } - RL_CHECK_SIGNALS (); -- if (rl_get_char (&c) != 0) -- break; - if (rl_done) /* XXX - experimental */ - return ('\n'); ---- 432,447 ---- - while (rl_event_hook) - { -! if (rl_get_char (&c) != 0) -! break; -! -! if ((r = rl_gather_tyi ()) < 0) /* XXX - EIO */ - { - rl_done = 1; - return ('\n'); - } -+ else if (r == 1) /* read something */ -+ continue; -+ - RL_CHECK_SIGNALS (); - if (rl_done) /* XXX - experimental */ - return ('\n'); -*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 ---- patchlevel.h Thu Feb 24 21:41:34 2011 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 30 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 31 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/shell-term-fm/bash/patches/bash42-032 b/shell-term-fm/bash/patches/bash42-032 deleted file mode 100644 index d4f25ca031..0000000000 --- a/shell-term-fm/bash/patches/bash42-032 +++ /dev/null @@ -1,75 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 4.2 -Patch-ID: bash42-032 - -Bug-Reported-by: Ruediger Kuhlmann <RKuhlmann@orga-systems.com> -Bug-Reference-ID: <OFDE975207.0C3622E5-ONC12579F3.00361A06-C12579F3.00365E39@orga-systems.com> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2012-05/msg00010.html - -Bug-Description: - -Bash-4.2 has problems with DEL characters in the expanded value of variables -used in the same quoted string as variables that expand to nothing. - -Patch (apply with `patch -p0'): - -*** ../bash-20120427/subst.c 2012-04-22 16:19:10.000000000 -0400 ---- subst.c 2012-05-07 16:06:35.000000000 -0400 -*************** -*** 8152,8155 **** ---- 8152,8163 ---- - dispose_word_desc (tword); - -+ /* Kill quoted nulls; we will add them back at the end of -+ expand_word_internal if nothing else in the string */ -+ if (had_quoted_null && temp && QUOTED_NULL (temp)) -+ { -+ FREE (temp); -+ temp = (char *)NULL; -+ } -+ - goto add_string; - break; -*************** -*** 8556,8560 **** - if (quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)) - tword->flags |= W_QUOTED; -! if (had_quoted_null) - tword->flags |= W_HASQUOTEDNULL; - list = make_word_list (tword, (WORD_LIST *)NULL); ---- 8564,8568 ---- - if (quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)) - tword->flags |= W_QUOTED; -! if (had_quoted_null && QUOTED_NULL (istring)) - tword->flags |= W_HASQUOTEDNULL; - list = make_word_list (tword, (WORD_LIST *)NULL); -*************** -*** 8587,8591 **** - if (word->flags & W_NOEXPAND) - tword->flags |= W_NOEXPAND; -! if (had_quoted_null) - tword->flags |= W_HASQUOTEDNULL; /* XXX */ - list = make_word_list (tword, (WORD_LIST *)NULL); ---- 8595,8599 ---- - if (word->flags & W_NOEXPAND) - tword->flags |= W_NOEXPAND; -! if (had_quoted_null && QUOTED_NULL (istring)) - tword->flags |= W_HASQUOTEDNULL; /* XXX */ - list = make_word_list (tword, (WORD_LIST *)NULL); -*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 ---- patchlevel.h Thu Feb 24 21:41:34 2011 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 31 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 32 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/shell-term-fm/bash/patches/bash42-033 b/shell-term-fm/bash/patches/bash42-033 deleted file mode 100644 index e58d7286e2..0000000000 --- a/shell-term-fm/bash/patches/bash42-033 +++ /dev/null @@ -1,57 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 4.2 -Patch-ID: bash42-033 - -Bug-Reported-by: David Leverton <levertond@googlemail.com> -Bug-Reference-ID: <4FCCE737.1060603@googlemail.com> -Bug-Reference-URL: - -Bug-Description: - -Bash uses a static buffer when expanding the /dev/fd prefix for the test -and conditional commands, among other uses, when it should use a dynamic -buffer to avoid buffer overflow. - -Patch (apply with `patch -p0'): - -*** ../bash-4.2-patched/lib/sh/eaccess.c 2011-01-08 20:50:10.000000000 -0500 ---- lib/sh/eaccess.c 2012-06-04 21:06:43.000000000 -0400 -*************** -*** 83,86 **** ---- 83,88 ---- - struct stat *finfo; - { -+ static char *pbuf = 0; -+ - if (*path == '\0') - { -*************** -*** 107,111 **** - On most systems, with the notable exception of linux, this is - effectively a no-op. */ -! char pbuf[32]; - strcpy (pbuf, DEV_FD_PREFIX); - strcat (pbuf, path + 8); ---- 109,113 ---- - On most systems, with the notable exception of linux, this is - effectively a no-op. */ -! pbuf = xrealloc (pbuf, sizeof (DEV_FD_PREFIX) + strlen (path + 8)); - strcpy (pbuf, DEV_FD_PREFIX); - strcat (pbuf, path + 8); -*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 ---- patchlevel.h Thu Feb 24 21:41:34 2011 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 32 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 33 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/shell-term-fm/bash/patches/bash42-034 b/shell-term-fm/bash/patches/bash42-034 deleted file mode 100644 index e4f05e1036..0000000000 --- a/shell-term-fm/bash/patches/bash42-034 +++ /dev/null @@ -1,46 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 4.2 -Patch-ID: bash42-034 - -Bug-Reported-by: "Davide Brini" <dave_br@gmx.com> -Bug-Reference-ID: <20120604164154.69781EC04B@imaps.oficinas.atrapalo.com> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2012-06/msg00030.html - -Bug-Description: - -In bash-4.2, the history code would inappropriately add a semicolon to -multi-line compound array assignments when adding them to the history. - -Patch (apply with `patch -p0'): - -*** ../bash-4.2-patched/parse.y 2011-11-21 18:03:36.000000000 -0500 ---- parse.y 2012-06-07 12:48:47.000000000 -0400 -*************** -*** 4900,4905 **** ---- 4916,4924 ---- - return (current_command_line_count == 2 ? "\n" : ""); - } - -+ if (parser_state & PST_COMPASSIGN) -+ return (" "); -+ - /* First, handle some special cases. */ - /*(*/ - /* If we just read `()', assume it's a function definition, and don't -*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 ---- patchlevel.h Thu Feb 24 21:41:34 2011 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 33 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 34 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/shell-term-fm/bash/patches/bash42-035 b/shell-term-fm/bash/patches/bash42-035 deleted file mode 100644 index 6f0be6f908..0000000000 --- a/shell-term-fm/bash/patches/bash42-035 +++ /dev/null @@ -1,66 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 4.2 -Patch-ID: bash42-035 - -Bug-Reported-by: Dan Douglas <ormaaj@gmail.com> -Bug-Reference-ID: <2766482.Ksm3GrSoYi@smorgbox> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2012-06/msg00071.html - -Bug-Description: - -When given a number of lines to read, `mapfile -n lines' reads one too many. - -Patch (apply with `patch -p0'): - -*** ../bash-4.2-patched/builtins/mapfile.def 2010-05-29 22:09:47.000000000 -0400 ---- builtins/mapfile.def 2012-06-20 09:48:33.000000000 -0400 -*************** -*** 196,206 **** - interrupt_immediately++; - for (array_index = origin, line_count = 1; -! zgetline (fd, &line, &line_length, unbuffered_read) != -1; -! array_index++, line_count++) - { -- /* Have we exceeded # of lines to store? */ -- if (line_count_goal != 0 && line_count > line_count_goal) -- break; -- - /* Remove trailing newlines? */ - if (flags & MAPF_CHOP) ---- 196,202 ---- - interrupt_immediately++; - for (array_index = origin, line_count = 1; -! zgetline (fd, &line, &line_length, unbuffered_read) != -1; -! array_index++) - { - /* Remove trailing newlines? */ - if (flags & MAPF_CHOP) -*************** -*** 218,221 **** ---- 214,222 ---- - - bind_array_element (entry, array_index, line, 0); -+ -+ /* Have we exceeded # of lines to store? */ -+ line_count++; -+ if (line_count_goal != 0 && line_count > line_count_goal) -+ break; - } - -*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 ---- patchlevel.h Thu Feb 24 21:41:34 2011 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 34 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 35 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/shell-term-fm/bash/patches/bash42-036 b/shell-term-fm/bash/patches/bash42-036 deleted file mode 100644 index 73fac408aa..0000000000 --- a/shell-term-fm/bash/patches/bash42-036 +++ /dev/null @@ -1,92 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 4.2 -Patch-ID: bash42-036 - -Bug-Reported-by: gregrwm <backuppc-users@whitleymott.net> -Bug-Reference-ID: <CAD+dB9B4JG+qUwZBQUwiQmVt0j6NDn=DDTxr9R+nkA8DL4KLJA@mail.gmail.com> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2012-05/msg00108.html - -Bug-Description: - -Bash-4.2 produces incorrect word splitting results when expanding -double-quoted $@ in the same string as and adjacent to other variable -expansions. The $@ should be split, the other expansions should not. - -Patch (apply with `patch -p0'): - -*** ../bash-4.2-patched/subst.c 2012-05-02 12:02:33.000000000 -0400 ---- subst.c 2012-07-08 21:19:32.000000000 -0400 -*************** -*** 7923,7927 **** - /* State flags */ - int had_quoted_null; -! int has_dollar_at; - int tflag; - int pflags; /* flags passed to param_expand */ ---- 7923,7927 ---- - /* State flags */ - int had_quoted_null; -! int has_dollar_at, temp_has_dollar_at; - int tflag; - int pflags; /* flags passed to param_expand */ -*************** -*** 8128,8138 **** - *expanded_something = 1; - -! has_dollar_at = 0; - pflags = (word->flags & W_NOCOMSUB) ? PF_NOCOMSUB : 0; - if (word->flags & W_NOSPLIT2) - pflags |= PF_NOSPLIT2; - tword = param_expand (string, &sindex, quoted, expanded_something, -! &has_dollar_at, "ed_dollar_at, - &had_quoted_null, pflags); - - if (tword == &expand_wdesc_error || tword == &expand_wdesc_fatal) ---- 8128,8139 ---- - *expanded_something = 1; - -! temp_has_dollar_at = 0; - pflags = (word->flags & W_NOCOMSUB) ? PF_NOCOMSUB : 0; - if (word->flags & W_NOSPLIT2) - pflags |= PF_NOSPLIT2; - tword = param_expand (string, &sindex, quoted, expanded_something, -! &temp_has_dollar_at, "ed_dollar_at, - &had_quoted_null, pflags); -+ has_dollar_at += temp_has_dollar_at; - - if (tword == &expand_wdesc_error || tword == &expand_wdesc_fatal) -*************** -*** 8275,8281 **** - temp = (char *)NULL; - -! has_dollar_at = 0; - /* Need to get W_HASQUOTEDNULL flag through this function. */ -! list = expand_word_internal (tword, Q_DOUBLE_QUOTES, 0, &has_dollar_at, (int *)NULL); - - if (list == &expand_word_error || list == &expand_word_fatal) ---- 8276,8283 ---- - temp = (char *)NULL; - -! temp_has_dollar_at = 0; /* XXX */ - /* Need to get W_HASQUOTEDNULL flag through this function. */ -! list = expand_word_internal (tword, Q_DOUBLE_QUOTES, 0, &temp_has_dollar_at, (int *)NULL); -! has_dollar_at += temp_has_dollar_at; - - if (list == &expand_word_error || list == &expand_word_fatal) -*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 ---- patchlevel.h Thu Feb 24 21:41:34 2011 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 35 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 36 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/shell-term-fm/bash/patches/bash42-037 b/shell-term-fm/bash/patches/bash42-037 deleted file mode 100644 index a12b8a7eeb..0000000000 --- a/shell-term-fm/bash/patches/bash42-037 +++ /dev/null @@ -1,112 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 4.2 -Patch-ID: bash42-037 - -Bug-Reported-by: Jakub Filak -Bug-Reference-ID: -Bug-Reference-URL: https://bugzilla.redhat.com/show_bug.cgi?id=813289 - -Bug-Description: - -Attempting to redo (using `.') the vi editing mode `cc', `dd', or `yy' -commands leads to an infinite loop. - -Patch (apply with `patch -p0'): - -*** ../bash-4.2-patched/lib/readline/vi_mode.c 2011-02-25 11:17:02.000000000 -0500 ---- lib/readline/vi_mode.c 2012-06-02 12:24:47.000000000 -0400 -*************** -*** 1235,1243 **** - r = rl_domove_motion_callback (_rl_vimvcxt); - } -! else if (vi_redoing) - { - _rl_vimvcxt->motion = _rl_vi_last_motion; - r = rl_domove_motion_callback (_rl_vimvcxt); - } - #if defined (READLINE_CALLBACKS) - else if (RL_ISSTATE (RL_STATE_CALLBACK)) ---- 1297,1313 ---- - r = rl_domove_motion_callback (_rl_vimvcxt); - } -! else if (vi_redoing && _rl_vi_last_motion != 'd') /* `dd' is special */ - { - _rl_vimvcxt->motion = _rl_vi_last_motion; - r = rl_domove_motion_callback (_rl_vimvcxt); - } -+ else if (vi_redoing) /* handle redoing `dd' here */ -+ { -+ _rl_vimvcxt->motion = _rl_vi_last_motion; -+ rl_mark = rl_end; -+ rl_beg_of_line (1, key); -+ RL_UNSETSTATE (RL_STATE_VIMOTION); -+ r = vidomove_dispatch (_rl_vimvcxt); -+ } - #if defined (READLINE_CALLBACKS) - else if (RL_ISSTATE (RL_STATE_CALLBACK)) -*************** -*** 1317,1325 **** - r = rl_domove_motion_callback (_rl_vimvcxt); - } -! else if (vi_redoing) - { - _rl_vimvcxt->motion = _rl_vi_last_motion; - r = rl_domove_motion_callback (_rl_vimvcxt); - } - #if defined (READLINE_CALLBACKS) - else if (RL_ISSTATE (RL_STATE_CALLBACK)) ---- 1387,1403 ---- - r = rl_domove_motion_callback (_rl_vimvcxt); - } -! else if (vi_redoing && _rl_vi_last_motion != 'c') /* `cc' is special */ - { - _rl_vimvcxt->motion = _rl_vi_last_motion; - r = rl_domove_motion_callback (_rl_vimvcxt); - } -+ else if (vi_redoing) /* handle redoing `cc' here */ -+ { -+ _rl_vimvcxt->motion = _rl_vi_last_motion; -+ rl_mark = rl_end; -+ rl_beg_of_line (1, key); -+ RL_UNSETSTATE (RL_STATE_VIMOTION); -+ r = vidomove_dispatch (_rl_vimvcxt); -+ } - #if defined (READLINE_CALLBACKS) - else if (RL_ISSTATE (RL_STATE_CALLBACK)) -*************** -*** 1378,1381 **** ---- 1456,1472 ---- - r = rl_domove_motion_callback (_rl_vimvcxt); - } -+ else if (vi_redoing && _rl_vi_last_motion != 'y') /* `yy' is special */ -+ { -+ _rl_vimvcxt->motion = _rl_vi_last_motion; -+ r = rl_domove_motion_callback (_rl_vimvcxt); -+ } -+ else if (vi_redoing) /* handle redoing `yy' here */ -+ { -+ _rl_vimvcxt->motion = _rl_vi_last_motion; -+ rl_mark = rl_end; -+ rl_beg_of_line (1, key); -+ RL_UNSETSTATE (RL_STATE_VIMOTION); -+ r = vidomove_dispatch (_rl_vimvcxt); -+ } - #if defined (READLINE_CALLBACKS) - else if (RL_ISSTATE (RL_STATE_CALLBACK)) -*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 ---- patchlevel.h Thu Feb 24 21:41:34 2011 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 36 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 37 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/shell-term-fm/bash/patches/bash42-038 b/shell-term-fm/bash/patches/bash42-038 deleted file mode 100644 index 411e4dd543..0000000000 --- a/shell-term-fm/bash/patches/bash42-038 +++ /dev/null @@ -1,47 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 4.2 -Patch-ID: bash42-038 - -Bug-Reported-by: armandsl@gmail.com -Bug-Reference-ID: <20120822112810.8D14920040@windmill.latviatours.lv> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2012-08/msg00049.html - -Bug-Description: - -If a backslash-newline (which is removed) with no other input is given as -input to `read', the shell tries to dereference a null pointer and seg faults. - -Patch (apply with `patch -p0'): - -*** ../bash-4.2-patched/builtins/read.def 2012-03-11 17:52:44.000000000 -0400 ---- builtins/read.def 2012-08-22 11:53:09.000000000 -0400 -*************** -*** 792,796 **** - #endif - -! if (saw_escape) - { - t = dequote_string (input_string); ---- 847,851 ---- - #endif - -! if (saw_escape && input_string && *input_string) - { - t = dequote_string (input_string); -*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 ---- patchlevel.h Thu Feb 24 21:41:34 2011 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 37 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 38 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/shell-term-fm/bash/patches/bash42-039 b/shell-term-fm/bash/patches/bash42-039 deleted file mode 100644 index 21457af12b..0000000000 --- a/shell-term-fm/bash/patches/bash42-039 +++ /dev/null @@ -1,58 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 4.2 -Patch-ID: bash42-039 - -Bug-Reported-by: Dan Douglas <ormaaj@gmail.com> -Bug-Reference-ID: <1498458.MpVlmOXDB7@smorgbox> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2012-09/msg00008.html - -Bug-Description: - -Under certain circumstances, bash attempts to expand variables in arithmetic -expressions even when evaluation is being suppressed. - -Patch (apply with `patch -p0'): - -*** ../bash-4.2-patched/expr.c 2011-11-21 18:03:35.000000000 -0500 ---- expr.c 2012-09-09 16:31:18.000000000 -0400 -*************** -*** 1010,1013 **** ---- 1073,1082 ---- - #endif - -+ /*itrace("expr_streval: %s: noeval = %d", tok, noeval);*/ -+ /* If we are suppressing evaluation, just short-circuit here instead of -+ going through the rest of the evaluator. */ -+ if (noeval) -+ return (0); -+ - /* [[[[[ */ - #if defined (ARRAY_VARS) -*************** -*** 1183,1186 **** ---- 1256,1263 ---- - - *cp = '\0'; -+ /* XXX - watch out for pointer aliasing issues here */ -+ if (curlval.tokstr && curlval.tokstr == tokstr) -+ init_lvalue (&curlval); -+ - FREE (tokstr); - tokstr = savestring (tp); -*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 ---- patchlevel.h Thu Feb 24 21:41:34 2011 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 38 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 39 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/shell-term-fm/bash/patches/bash42-040 b/shell-term-fm/bash/patches/bash42-040 deleted file mode 100644 index 1de0fe370b..0000000000 --- a/shell-term-fm/bash/patches/bash42-040 +++ /dev/null @@ -1,56 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 4.2 -Patch-ID: bash42-040 - -Bug-Reported-by: Andrey Zaitsev <jstcdr@gmail.com> -Bug-Reference-ID: <CAEZVQT5PJ1Mb_Zh8LT5qz8sv+-9Q6hGfQ5DU9ZxdJ+gV7xBUaQ@mail.gmail.com> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2012-04/msg00144.html - -Bug-Description: - -Output redirection applied to builtin commands missed I/O errors if -they happened when the file descriptor was closed, rather than on write -(e.g., like with an out-of-space error on a remote NFS file system). - -Patch (apply with `patch -p0'): - -*** ../bash-4.2-patched/redir.c 2011-01-02 16:00:31.000000000 -0500 ---- redir.c 2012-04-24 20:42:12.000000000 -0400 -*************** -*** 1092,1099 **** - #if defined (BUFFERED_INPUT) - check_bash_input (redirector); -! close_buffered_fd (redirector); - #else /* !BUFFERED_INPUT */ -! close (redirector); - #endif /* !BUFFERED_INPUT */ - } - break; ---- 1092,1101 ---- - #if defined (BUFFERED_INPUT) - check_bash_input (redirector); -! r = close_buffered_fd (redirector); - #else /* !BUFFERED_INPUT */ -! r = close (redirector); - #endif /* !BUFFERED_INPUT */ -+ if (r < 0 && (flags & RX_INTERNAL) && (errno == EIO || errno == ENOSPC)) -+ REDIRECTION_ERROR (r, errno, -1); - } - break; -*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 ---- patchlevel.h Thu Feb 24 21:41:34 2011 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 39 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 40 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/shell-term-fm/bash/patches/bash42-041 b/shell-term-fm/bash/patches/bash42-041 deleted file mode 100644 index 37d4ac7043..0000000000 --- a/shell-term-fm/bash/patches/bash42-041 +++ /dev/null @@ -1,47 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 4.2 -Patch-ID: bash42-041 - -Bug-Reported-by: Andrey Borzenkov <arvidjaar@gmail.com> -Bug-Reference-ID: <20121202205200.2134478e@opensuse.site> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2012-12/msg00008.html - -Bug-Description: - -Process substitution incorrectly inherited a flag that inhibited using the -(local) temporary environment for variable lookups if it was providing -the filename to a redirection. The intent the flag is to enforce the -Posix command expansion ordering rules. - -Patch (apply with `patch -p0'): - -*** ../bash-4.2-patched/subst.c 2012-07-14 15:53:20.000000000 -0400 ---- subst.c 2012-12-02 22:26:54.000000000 -0500 -*************** -*** 5125,5128 **** ---- 5129,5136 ---- - #endif /* HAVE_DEV_FD */ - -+ /* subshells shouldn't have this flag, which controls using the temporary -+ environment for variable lookups. */ -+ expanding_redir = 0; -+ - result = parse_and_execute (string, "process substitution", (SEVAL_NONINT|SEVAL_NOHIST)); - -*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 ---- patchlevel.h Thu Feb 24 21:41:34 2011 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 40 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 41 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/shell-term-fm/bash/patches/bash42-042 b/shell-term-fm/bash/patches/bash42-042 deleted file mode 100644 index 1ce0cae30d..0000000000 --- a/shell-term-fm/bash/patches/bash42-042 +++ /dev/null @@ -1,57 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 4.2 -Patch-ID: bash42-042 - -Bug-Reported-by: Adam Pippin <adam@gp-inc.ca> -Bug-Reference-ID: <CAPYbNHr6ucZFOoWsRdUJj6KP3Ju0j1bkESa_cmb7iU+kZwdVpg@mail.gmail.com> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2012-11/msg00087.html - -Bug-Description: - -Compilation failed after specifying the `--enable-minimal-config' option to -configure (more specifically, specifying `--disable-alias'). - -Patch (apply with `patch -p0'): - -*** ../bash-4.2-patched/parse.y 2012-07-08 21:53:33.000000000 -0400 ---- parse.y 2012-10-14 20:20:34.000000000 -0400 -*************** -*** 2394,2397 **** ---- 2392,2396 ---- - to consume the quoted newline and move to the next character in - the expansion. */ -+ #if defined (ALIAS) - if (expanding_alias () && shell_input_line[shell_input_line_index+1] == '\0') - { -*************** -*** 2404,2408 **** - goto next_alias_char; /* and get next character */ - } -! else - goto restart_read; - } ---- 2403,2408 ---- - goto next_alias_char; /* and get next character */ - } -! else -! #endif - goto restart_read; - } - -*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 ---- patchlevel.h Thu Feb 24 21:41:34 2011 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 41 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 42 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/shell-term-fm/bash/patches/bash42-043 b/shell-term-fm/bash/patches/bash42-043 deleted file mode 100644 index b25a5ee38f..0000000000 --- a/shell-term-fm/bash/patches/bash42-043 +++ /dev/null @@ -1,65 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 4.2 -Patch-ID: bash42-043 - -Bug-Reported-by: konsolebox <konsolebox@gmail.com> -Bug-Reference-ID: <CAJnmqwZuGKLgMsMwxRK4LL+2NN+HgvmKzrnode99QBGrcgX1Lw@mail.gmail.com> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2013-01/msg00138.html - -Bug-Description: - -When SIGCHLD is trapped, and a SIGCHLD trap handler runs when a pending -`read -t' invocation times out and generates SIGALRM, bash can crash with -a segmentation fault. - -Patch (apply with `patch -p0'): - -*** ../bash-4.2-patched/builtins/read.def 2012-10-31 21:22:51.000517000 -0400 ---- builtins/read.def 2013-01-25 10:28:16.000038000 -0500 -*************** -*** 386,393 **** - /* Tricky. The top of the unwind-protect stack is the free of - input_string. We want to run all the rest and use input_string, -! so we have to remove it from the stack. */ -! remove_unwind_protect (); -! run_unwind_frame ("read_builtin"); - input_string[i] = '\0'; /* make sure it's terminated */ - retval = 128+SIGALRM; - goto assign_vars; ---- 386,403 ---- - /* Tricky. The top of the unwind-protect stack is the free of - input_string. We want to run all the rest and use input_string, -! so we have to save input_string temporarily, run the unwind- -! protects, then restore input_string so we can use it later. */ -! - input_string[i] = '\0'; /* make sure it's terminated */ -+ if (i == 0) -+ { -+ t = (char *)xmalloc (1); -+ t[0] = 0; -+ } -+ else -+ t = savestring (input_string); -+ -+ run_unwind_frame ("read_builtin"); -+ input_string = t; - retval = 128+SIGALRM; - goto assign_vars; - -*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 ---- patchlevel.h Thu Feb 24 21:41:34 2011 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 42 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 43 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/shell-term-fm/bash/patches/bash42-044 b/shell-term-fm/bash/patches/bash42-044 deleted file mode 100644 index e5bf28323c..0000000000 --- a/shell-term-fm/bash/patches/bash42-044 +++ /dev/null @@ -1,70 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 4.2 -Patch-ID: bash42-044 - -Bug-Reported-by: "Dashing" <dashing@hushmail.com> -Bug-Reference-ID: <20130211175049.D90786F446@smtp.hushmail.com> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2013-02/msg00030.html - -Bug-Description: - -When converting a multibyte string to a wide character string as part of -pattern matching, bash does not handle the end of the string correctly, -causing the search for the NUL to go beyond the end of the string and -reference random memory. Depending on the contents of that memory, bash -can produce errors or crash. - -Patch (apply with `patch -p0'): - -*** ../bash-4.2-patched/lib/glob/xmbsrtowcs.c 2012-07-08 21:53:19.000000000 -0400 ---- lib/glob/xmbsrtowcs.c 2013-02-12 12:00:39.000000000 -0500 -*************** -*** 217,220 **** ---- 217,226 ---- - n = mbsnrtowcs(wsbuf+wcnum, &p, nms, wsbuf_size-wcnum, &state); - -+ if (n == 0 && p == 0) -+ { -+ wsbuf[wcnum] = L'\0'; -+ break; -+ } -+ - /* Compensate for taking single byte on wcs conversion failure above. */ - if (wcslength == 1 && (n == 0 || n == (size_t)-1)) -*************** -*** 222,226 **** - state = tmp_state; - p = tmp_p; -! wsbuf[wcnum++] = *p++; - } - else ---- 228,238 ---- - state = tmp_state; - p = tmp_p; -! wsbuf[wcnum] = *p; -! if (*p == 0) -! break; -! else -! { -! wcnum++; p++; -! } - } - else - -*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 ---- patchlevel.h Thu Feb 24 21:41:34 2011 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 43 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 44 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/shell-term-fm/bash/patches/bash42-045 b/shell-term-fm/bash/patches/bash42-045 deleted file mode 100644 index e0f8559ece..0000000000 --- a/shell-term-fm/bash/patches/bash42-045 +++ /dev/null @@ -1,53 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 4.2 -Patch-ID: bash42-045 - -Bug-Reported-by: Stephane Chazelas <stephane.chazelas@gmail.com> -Bug-Reference-ID: <20130218195539.GA9620@chaz.gmail.com> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2013-02/msg00080.html - -Bug-Description: - -The <&n- and >&n- redirections, which move one file descriptor to another, -leave the file descriptor closed when applied to builtins or compound -commands. - -Patch (apply with `patch -p0'): - -*** ../bash-4.2-patched/redir.c 2013-01-30 11:56:09.000000000 -0500 ---- redir.c 2013-02-19 09:38:36.000000000 -0500 -*************** -*** 1008,1011 **** ---- 1008,1021 ---- - REDIRECTION_ERROR (r, errno, -1); - } -+ if ((flags & RX_UNDOABLE) && (ri == r_move_input || ri == r_move_output)) -+ { -+ /* r_move_input and r_move_output add an additional close() -+ that needs to be undone */ -+ if (fcntl (redirector, F_GETFD, 0) != -1) -+ { -+ r = add_undo_redirect (redir_fd, r_close_this, -1); -+ REDIRECTION_ERROR (r, errno, -1); -+ } -+ } - #if defined (BUFFERED_INPUT) - check_bash_input (redirector); - -*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 ---- patchlevel.h Thu Feb 24 21:41:34 2011 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 44 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 45 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/shell-term-fm/bash/patches/bash43-001 b/shell-term-fm/bash/patches/bash43-001 new file mode 100644 index 0000000000..ea1c6b2653 --- /dev/null +++ b/shell-term-fm/bash/patches/bash43-001 @@ -0,0 +1,58 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.3 +Patch-ID: bash43-001 + +Bug-Reported-by: NBaH <nbah@sfr.fr> +Bug-Reference-ID: <ler0b5$iu9$1@speranza.aioe.org> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-02/msg00092.html + +Bug-Description: + +A missing check for a valid option prevented `test -R' from working. There +is another problem that causes bash to look up the wrong variable name when +processing the argument to `test -R'. + +Patch (apply with `patch -p0'): + +*** ../bash-4.3/test.c 2014-02-04 16:52:58.000000000 -0500 +--- test.c 2014-02-28 21:22:44.000000000 -0500 +*************** +*** 647,652 **** + + case 'R': +! v = find_variable (arg); +! return (v && invisible_p (v) == 0 && var_isset (v) && nameref_p (v) ? TRUE : FALSE); + } + +--- 647,652 ---- + + case 'R': +! v = find_variable_noref (arg); +! return ((v && invisible_p (v) == 0 && var_isset (v) && nameref_p (v)) ? TRUE : FALSE); + } + +*************** +*** 724,727 **** +--- 724,728 ---- + case 'u': case 'v': case 'w': case 'x': case 'z': + case 'G': case 'L': case 'O': case 'S': case 'N': ++ case 'R': + return (1); + } +*** ../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 0 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 1 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/shell-term-fm/bash/patches/bash43-002 b/shell-term-fm/bash/patches/bash43-002 new file mode 100644 index 0000000000..735b7b81a1 --- /dev/null +++ b/shell-term-fm/bash/patches/bash43-002 @@ -0,0 +1,62 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.3 +Patch-ID: bash43-002 + +Bug-Reported-by: Moe Tunes <moetunes42@gmail.com> +Bug-Reference-ID: <53103F49.3070100@gmail.com> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-02/msg00086.html + +Bug-Description: + +A change to save state while running the DEBUG trap caused pipelines to hang +on systems which need process group synchronization while building pipelines. + +Patch (apply with `patch -p0'): + +*** ../bash-4.3/trap.c 2014-02-05 10:03:21.000000000 -0500 +--- trap.c 2014-02-28 09:51:43.000000000 -0500 +*************** +*** 921,925 **** + + #if defined (JOB_CONTROL) +! save_pipeline (1); /* XXX only provides one save level */ + #endif + +--- 921,926 ---- + + #if defined (JOB_CONTROL) +! if (sig != DEBUG_TRAP) /* run_debug_trap does this */ +! save_pipeline (1); /* XXX only provides one save level */ + #endif + +*************** +*** 941,945 **** + + #if defined (JOB_CONTROL) +! restore_pipeline (1); + #endif + +--- 942,947 ---- + + #if defined (JOB_CONTROL) +! if (sig != DEBUG_TRAP) /* run_debug_trap does this */ +! restore_pipeline (1); + #endif + +*** ../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 1 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 2 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/shell-term-fm/bash/patches/bash43-003 b/shell-term-fm/bash/patches/bash43-003 new file mode 100644 index 0000000000..0f32f410d3 --- /dev/null +++ b/shell-term-fm/bash/patches/bash43-003 @@ -0,0 +1,48 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.3 +Patch-ID: bash43-003 + +Bug-Reported-by: Anatol Pomozov <anatol.pomozov@gmail.com> +Bug-Reference-ID: <CAOMFOmXy3mT2So5GQ5F-smCVArQuAeBwZ2QKzgCtMeXJoDeYOQ@mail.gmail.com> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-readline/2014-03/msg00010.html + +Bug-Description: + +When in callback mode, some readline commands can cause readline to seg +fault by passing invalid contexts to callback functions. + +Patch (apply with `patch -p0'): + +*** ../bash-4.3/lib/readline/readline.c 2013-10-28 14:58:06.000000000 -0400 +--- lib/readline/readline.c 2014-03-10 14:15:02.000000000 -0400 +*************** +*** 745,749 **** + + RL_CHECK_SIGNALS (); +! if (r == 0) /* success! */ + { + _rl_keyseq_chain_dispose (); +--- 745,750 ---- + + RL_CHECK_SIGNALS (); +! /* We only treat values < 0 specially to simulate recursion. */ +! if (r >= 0 || (r == -1 && (cxt->flags & KSEQ_SUBSEQ) == 0)) /* success! or failure! */ + { + _rl_keyseq_chain_dispose (); +*** ../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 2 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 3 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/shell-term-fm/bash/patches/bash43-004 b/shell-term-fm/bash/patches/bash43-004 new file mode 100644 index 0000000000..010f04a2a8 --- /dev/null +++ b/shell-term-fm/bash/patches/bash43-004 @@ -0,0 +1,47 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.3 +Patch-ID: bash43-004 + +Bug-Reported-by: Daan van Rossum <daan@flash.uchicago.edu> +Bug-Reference-ID: <20140307072523.GA14250@flash.uchicago.edu> +Bug-Reference-URL: + +Bug-Description: + +The `.' command in vi mode cannot undo multi-key commands beginning with +`c', `d', and `y' (command plus motion specifier). + +Patch (apply with `patch -p0'): + +*** ../bash-4.3/lib/readline/readline.c 2013-10-28 14:58:06.000000000 -0400 +--- lib/readline/readline.c 2014-03-07 15:20:33.000000000 -0500 +*************** +*** 965,969 **** + if (rl_editing_mode == vi_mode && _rl_keymap == vi_movement_keymap && + key != ANYOTHERKEY && +! rl_key_sequence_length == 1 && /* XXX */ + _rl_vi_textmod_command (key)) + _rl_vi_set_last (key, rl_numeric_arg, rl_arg_sign); +--- 965,969 ---- + if (rl_editing_mode == vi_mode && _rl_keymap == vi_movement_keymap && + key != ANYOTHERKEY && +! _rl_dispatching_keymap == vi_movement_keymap && + _rl_vi_textmod_command (key)) + _rl_vi_set_last (key, rl_numeric_arg, rl_arg_sign); +*** ../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 3 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 4 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/shell-term-fm/bash/patches/bash43-005 b/shell-term-fm/bash/patches/bash43-005 new file mode 100644 index 0000000000..bcd40697cb --- /dev/null +++ b/shell-term-fm/bash/patches/bash43-005 @@ -0,0 +1,63 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.3 +Patch-ID: bash43-005 + +Bug-Reported-by: David Sines <dave.gma@googlemail.com> +Bug-Reference-ID: <CAO3BAa_CK_Rgkhdfzs+NJ4KFYdB9qW3pvXQK0xLCi6GMmDU8bw@mail.gmail.com> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-03/msg00037.html + +Bug-Description: + +When in Posix mode, bash did not correctly interpret the ANSI-C-style +$'...' quoting mechanism when performing pattern substitution word +expansions within double quotes. + +Patch (apply with `patch -p0'): + +*** ../bash-4.3/parse.y 2014-02-11 09:42:10.000000000 -0500 +--- parse.y 2014-03-07 20:57:15.000000000 -0500 +*************** +*** 3399,3403 **** + unescaped double-quotes or single-quotes, if any, shall occur." */ + /* This was changed in Austin Group Interp 221 */ +! if MBTEST(posixly_correct && shell_compatibility_level > 41 && dolbrace_state != DOLBRACE_QUOTE && (flags & P_DQUOTE) && (flags & P_DOLBRACE) && ch == '\'') + continue; + +--- 3399,3403 ---- + unescaped double-quotes or single-quotes, if any, shall occur." */ + /* This was changed in Austin Group Interp 221 */ +! if MBTEST(posixly_correct && shell_compatibility_level > 41 && dolbrace_state != DOLBRACE_QUOTE && dolbrace_state != DOLBRACE_QUOTE2 && (flags & P_DQUOTE) && (flags & P_DOLBRACE) && ch == '\'') + continue; + +*** ../bash-4.3/y.tab.c 2014-02-11 10:57:47.000000000 -0500 +--- y.tab.c 2014-03-28 10:41:15.000000000 -0400 +*************** +*** 5711,5715 **** + unescaped double-quotes or single-quotes, if any, shall occur." */ + /* This was changed in Austin Group Interp 221 */ +! if MBTEST(posixly_correct && shell_compatibility_level > 41 && dolbrace_state != DOLBRACE_QUOTE && (flags & P_DQUOTE) && (flags & P_DOLBRACE) && ch == '\'') + continue; + +--- 5711,5715 ---- + unescaped double-quotes or single-quotes, if any, shall occur." */ + /* This was changed in Austin Group Interp 221 */ +! if MBTEST(posixly_correct && shell_compatibility_level > 41 && dolbrace_state != DOLBRACE_QUOTE && dolbrace_state != DOLBRACE_QUOTE2 && (flags & P_DQUOTE) && (flags & P_DOLBRACE) && ch == '\'') + continue; + +*** ../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 4 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 5 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/shell-term-fm/bash/patches/bash43-006 b/shell-term-fm/bash/patches/bash43-006 new file mode 100644 index 0000000000..24ff057a55 --- /dev/null +++ b/shell-term-fm/bash/patches/bash43-006 @@ -0,0 +1,48 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.3 +Patch-ID: bash43-006 + +Bug-Reported-by: Eduardo A . Bustamante Lopez <dualbus@gmail.com> +Bug-Reference-ID: <20140228170013.GA16015@dualbus.me> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-02/msg00091.html + +Bug-Description: + +A shell that started with job control active but was not interactive left +the terminal in the wrong process group when exiting, causing its parent +shell to get a stop signal when it attempted to read from the terminal. + +Patch (apply with `patch -p0'): + +*** ../bash-4.3/jobs.c 2014-01-10 09:05:34.000000000 -0500 +--- jobs.c 2014-03-02 18:05:09.000000000 -0500 +*************** +*** 4375,4379 **** + end_job_control () + { +! if (interactive_shell) /* XXX - should it be interactive? */ + { + terminate_stopped_jobs (); +--- 4375,4379 ---- + end_job_control () + { +! if (interactive_shell || job_control) /* XXX - should it be just job_control? */ + { + terminate_stopped_jobs (); +*** ../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 5 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 6 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/shell-term-fm/bash/patches/bash43-007 b/shell-term-fm/bash/patches/bash43-007 new file mode 100644 index 0000000000..0d62c9ec6f --- /dev/null +++ b/shell-term-fm/bash/patches/bash43-007 @@ -0,0 +1,50 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.3 +Patch-ID: bash43-007 + +Bug-Reported-by: geir.hauge@gmail.com +Bug-Reference-ID: <20140318093650.B181C1C5B0B@gina.itea.ntnu.no> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-03/msg00095.html + +Bug-Description: + +Using compound assignments for associative arrays like + +assoc=( [x]= [y]=bar ) + +left the value corresponding to the key `x' NULL. This caused subsequent +lookups to interpret it as unset. + +Patch (apply with `patch -p0'): + +*** ../bash-4.3/arrayfunc.c 2013-08-02 16:19:59.000000000 -0400 +--- arrayfunc.c 2014-03-18 11:08:15.000000000 -0400 +*************** +*** 598,601 **** +--- 598,606 ---- + { + val = expand_assignment_string_to_string (val, 0); ++ if (val == 0) ++ { ++ val = (char *)xmalloc (1); ++ val[0] = '\0'; /* like do_assignment_internal */ ++ } + free_val = 1; + } +*** ../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 6 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 7 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/shell-term-fm/bash/patches/bash43-008 b/shell-term-fm/bash/patches/bash43-008 new file mode 100644 index 0000000000..0ae7c9522e --- /dev/null +++ b/shell-term-fm/bash/patches/bash43-008 @@ -0,0 +1,188 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.3 +Patch-ID: bash43-008 + +Bug-Reported-by: Stephane Chazelas <stephane.chazelas@gmail.com> +Bug-Reference-ID: <20140318135901.GB22158@chaz.gmail.com> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-03/msg00098.html + +Bug-Description: + +Some extended glob patterns incorrectly matched filenames with a leading +dot, regardless of the setting of the `dotglob' option. + +Patch (apply with `patch -p0'): + +*** ../bash-4.3/lib/glob/gmisc.c 2013-10-28 14:45:25.000000000 -0400 +--- lib/glob/gmisc.c 2014-03-19 09:16:08.000000000 -0400 +*************** +*** 211,214 **** +--- 211,215 ---- + case '!': + case '@': ++ case '?': + return (pat[1] == LPAREN); + default: +*** ../bash-4.3/lib/glob/glob.c 2014-01-31 21:43:51.000000000 -0500 +--- lib/glob/glob.c 2014-03-20 09:01:26.000000000 -0400 +*************** +*** 180,202 **** + int flags; + { +! char *pp, *pe, *t; +! int n, r; + + pp = pat + 2; +! pe = pp + strlen (pp) - 1; /*(*/ +! if (*pe != ')') +! return 0; +! if ((t = strchr (pp, '|')) == 0) /* easy case first */ + { + *pe = '\0'; + r = skipname (pp, dname, flags); /*(*/ + *pe = ')'; + return r; + } + while (t = glob_patscan (pp, pe, '|')) + { + n = t[-1]; + t[-1] = '\0'; + r = skipname (pp, dname, flags); + t[-1] = n; + if (r == 0) /* if any pattern says not skip, we don't skip */ +--- 180,215 ---- + int flags; + { +! char *pp, *pe, *t, *se; +! int n, r, negate; + ++ negate = *pat == '!'; + pp = pat + 2; +! se = pp + strlen (pp) - 1; /* end of string */ +! pe = glob_patscan (pp, se, 0); /* end of extglob pattern (( */ +! /* we should check for invalid extglob pattern here */ +! /* if pe != se we have more of the pattern at the end of the extglob +! pattern. Check the easy case first ( */ +! if (pe == se && *pe == ')' && (t = strchr (pp, '|')) == 0) + { + *pe = '\0'; ++ #if defined (HANDLE_MULTIBYTE) ++ r = mbskipname (pp, dname, flags); ++ #else + r = skipname (pp, dname, flags); /*(*/ ++ #endif + *pe = ')'; + return r; + } ++ ++ /* check every subpattern */ + while (t = glob_patscan (pp, pe, '|')) + { + n = t[-1]; + t[-1] = '\0'; ++ #if defined (HANDLE_MULTIBYTE) ++ r = mbskipname (pp, dname, flags); ++ #else + r = skipname (pp, dname, flags); ++ #endif + t[-1] = n; + if (r == 0) /* if any pattern says not skip, we don't skip */ +*************** +*** 205,219 **** + } /*(*/ + +! if (pp == pe) /* glob_patscan might find end of pattern */ + return r; + +! *pe = '\0'; +! # if defined (HANDLE_MULTIBYTE) +! r = mbskipname (pp, dname, flags); /*(*/ +! # else +! r = skipname (pp, dname, flags); /*(*/ +! # endif +! *pe = ')'; +! return r; + } + #endif +--- 218,227 ---- + } /*(*/ + +! /* glob_patscan might find end of pattern */ +! if (pp == se) + return r; + +! /* but if it doesn't then we didn't match a leading dot */ +! return 0; + } + #endif +*************** +*** 278,289 **** + { + #if EXTENDED_GLOB +! wchar_t *pp, *pe, *t, n; +! int r; + + pp = pat + 2; +! pe = pp + wcslen (pp) - 1; /*(*/ +! if (*pe != L')') +! return 0; +! if ((t = wcschr (pp, L'|')) == 0) + { + *pe = L'\0'; +--- 286,298 ---- + { + #if EXTENDED_GLOB +! wchar_t *pp, *pe, *t, n, *se; +! int r, negate; + ++ negate = *pat == L'!'; + pp = pat + 2; +! se = pp + wcslen (pp) - 1; /*(*/ +! pe = glob_patscan_wc (pp, se, 0); +! +! if (pe == se && *pe == ')' && (t = wcschr (pp, L'|')) == 0) + { + *pe = L'\0'; +*************** +*** 292,295 **** +--- 301,306 ---- + return r; + } ++ ++ /* check every subpattern */ + while (t = glob_patscan_wc (pp, pe, '|')) + { +*************** +*** 306,313 **** + return r; + +! *pe = L'\0'; +! r = wchkname (pp, dname); /*(*/ +! *pe = L')'; +! return r; + #else + return (wchkname (pat, dname)); +--- 317,322 ---- + return r; + +! /* but if it doesn't then we didn't match a leading dot */ +! return 0; + #else + return (wchkname (pat, dname)); +*** ../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 7 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 8 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/shell-term-fm/bash/patches/bash43-009 b/shell-term-fm/bash/patches/bash43-009 new file mode 100644 index 0000000000..015835cde5 --- /dev/null +++ b/shell-term-fm/bash/patches/bash43-009 @@ -0,0 +1,64 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.3 +Patch-ID: bash43-009 + +Bug-Reported-by: Matthias Klose <doko@debian.org> +Bug-Reference-ID: <53346FC8.6090005@debian.org> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-03/msg00171.html + +Bug-Description: + +There is a problem with unsigned sign extension when attempting to reallocate +the input line when it is fewer than 3 characters long and there has been a +history expansion. The sign extension causes the shell to not reallocate the +line, which results in a segmentation fault when it writes past the end. + +Patch (apply with `patch -p0'): + +*** ../bash-4.3-patched/parse.y 2014-02-11 09:42:10.000000000 -0500 +--- parse.y 2014-03-27 16:33:29.000000000 -0400 +*************** +*** 2425,2429 **** + if (shell_input_line_terminator != EOF) + { +! if (shell_input_line_size < SIZE_MAX && shell_input_line_len > shell_input_line_size - 3) + shell_input_line = (char *)xrealloc (shell_input_line, + 1 + (shell_input_line_size += 2)); +--- 2425,2429 ---- + if (shell_input_line_terminator != EOF) + { +! if (shell_input_line_size < SIZE_MAX-3 && (shell_input_line_len+3 > shell_input_line_size)) + shell_input_line = (char *)xrealloc (shell_input_line, + 1 + (shell_input_line_size += 2)); +*** ../bash-4.3-patched/y.tab.c 2014-03-28 11:17:06.000000000 -0400 +--- y.tab.c 2014-04-07 11:48:31.000000000 -0400 +*************** +*** 4737,4741 **** + if (shell_input_line_terminator != EOF) + { +! if (shell_input_line_size < SIZE_MAX && shell_input_line_len > shell_input_line_size - 3) + shell_input_line = (char *)xrealloc (shell_input_line, + 1 + (shell_input_line_size += 2)); +--- 4737,4741 ---- + if (shell_input_line_terminator != EOF) + { +! if (shell_input_line_size < SIZE_MAX-3 && (shell_input_line_len+3 > shell_input_line_size)) + shell_input_line = (char *)xrealloc (shell_input_line, + 1 + (shell_input_line_size += 2)); +*** ../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 8 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 9 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/shell-term-fm/bash/patches/bash43-010 b/shell-term-fm/bash/patches/bash43-010 new file mode 100644 index 0000000000..835a96ead3 --- /dev/null +++ b/shell-term-fm/bash/patches/bash43-010 @@ -0,0 +1,157 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.3 +Patch-ID: bash43-010 + +Bug-Reported-by: Albert Shih <Albert.Shih@obspm.fr> +Bug-Reference-ID: Wed, 5 Mar 2014 23:01:40 +0100 +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-03/msg00028.html + +Bug-Description: + +Patch (apply with `patch -p0'): + +This patch changes the behavior of programmable completion to compensate +for two assumptions made by the bash-completion package. Bash-4.3 changed +to dequote the argument to programmable completion only under certain +circumstances, to make the behavior of compgen more consistent when run +from the command line -- closer to the behavior when run by a shell function +run as part of programmable completion. Bash-completion can pass quoted +arguments to compgen when the original word to be completed was not quoted, +expecting programmable completion to dequote the word before attempting +completion. + +This patch fixes two cases: + +1. An empty string that bash-completion passes to compgen as a quoted null + string (''). + +2. An unquoted word that bash-completion quotes using single quotes or + backslashes before passing it to compgen. + +In these cases, since readline did not detect a quote character in the original +word to be completed, bash-4.3 + +*** ../bash-4.3/externs.h 2014-01-02 14:58:20.000000000 -0500 +--- externs.h 2014-03-13 14:42:57.000000000 -0400 +*************** +*** 325,328 **** +--- 325,329 ---- + extern char *sh_backslash_quote_for_double_quotes __P((char *)); + extern int sh_contains_shell_metas __P((char *)); ++ extern int sh_contains_quotes __P((char *)); + + /* declarations for functions defined in lib/sh/spell.c */ +*** ../bash-4.3/lib/sh/shquote.c 2013-03-31 21:53:32.000000000 -0400 +--- lib/sh/shquote.c 2014-03-13 14:42:57.000000000 -0400 +*************** +*** 312,313 **** +--- 312,327 ---- + return (0); + } ++ ++ int ++ sh_contains_quotes (string) ++ char *string; ++ { ++ char *s; ++ ++ for (s = string; s && *s; s++) ++ { ++ if (*s == '\'' || *s == '"' || *s == '\\') ++ return 1; ++ } ++ return 0; ++ } +*** ../bash-4.3/pcomplete.c 2013-08-26 15:23:45.000000000 -0400 +--- pcomplete.c 2014-03-25 17:23:23.000000000 -0400 +*************** +*** 184,187 **** +--- 184,188 ---- + COMPSPEC *pcomp_curcs; + const char *pcomp_curcmd; ++ const char *pcomp_curtxt; + + #ifdef DEBUG +*************** +*** 754,757 **** +--- 755,784 ---- + dfn = (*rl_filename_dequoting_function) ((char *)text, rl_completion_quote_character); + } ++ /* Intended to solve a mismatched assumption by bash-completion. If ++ the text to be completed is empty, but bash-completion turns it into ++ a quoted string ('') assuming that this code will dequote it before ++ calling readline, do the dequoting. */ ++ else if (iscompgen && iscompleting && ++ pcomp_curtxt && *pcomp_curtxt == 0 && ++ text && (*text == '\'' || *text == '"') && text[1] == text[0] && text[2] == 0 && ++ rl_filename_dequoting_function) ++ dfn = (*rl_filename_dequoting_function) ((char *)text, rl_completion_quote_character); ++ /* Another mismatched assumption by bash-completion. If compgen is being ++ run as part of bash-completion, and the argument to compgen is not ++ the same as the word originally passed to the programmable completion ++ code, dequote the argument if it has quote characters. It's an ++ attempt to detect when bash-completion is quoting its filename ++ argument before calling compgen. */ ++ /* We could check whether gen_shell_function_matches is in the call ++ stack by checking whether the gen-shell-function-matches tag is in ++ the unwind-protect stack, but there's no function to do that yet. ++ We could simply check whether we're executing in a function by ++ checking variable_context, and may end up doing that. */ ++ else if (iscompgen && iscompleting && rl_filename_dequoting_function && ++ pcomp_curtxt && text && ++ STREQ (pcomp_curtxt, text) == 0 && ++ variable_context && ++ sh_contains_quotes (text)) /* guess */ ++ dfn = (*rl_filename_dequoting_function) ((char *)text, rl_completion_quote_character); + else + dfn = savestring (text); +*************** +*** 1523,1527 **** + { + COMPSPEC *cs, *oldcs; +! const char *oldcmd; + STRINGLIST *ret; + +--- 1550,1554 ---- + { + COMPSPEC *cs, *oldcs; +! const char *oldcmd, *oldtxt; + STRINGLIST *ret; + +*************** +*** 1546,1552 **** +--- 1573,1581 ---- + oldcs = pcomp_curcs; + oldcmd = pcomp_curcmd; ++ oldtxt = pcomp_curtxt; + + pcomp_curcs = cs; + pcomp_curcmd = cmd; ++ pcomp_curtxt = word; + + ret = gen_compspec_completions (cs, cmd, word, start, end, foundp); +*************** +*** 1554,1557 **** +--- 1583,1587 ---- + pcomp_curcs = oldcs; + pcomp_curcmd = oldcmd; ++ pcomp_curtxt = oldtxt; + + /* We need to conditionally handle setting *retryp here */ +*** ../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 9 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 10 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/shell-term-fm/bash/patches/bash43-011 b/shell-term-fm/bash/patches/bash43-011 new file mode 100644 index 0000000000..cdc1572eec --- /dev/null +++ b/shell-term-fm/bash/patches/bash43-011 @@ -0,0 +1,49 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.3 +Patch-ID: bash43-011 + +Bug-Reported-by: Egmont Koblinger <egmont@gmail.com> +Bug-Reference-ID: <CAGWcZk+bU5Jo1M+tutGvL-250UBE9DXjpeJVofYJSFcqFEVfMg@mail.gmail.com> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-03/msg00153.html + +Bug-Description: + +The signal handling changes to bash and readline (to avoid running any code +in a signal handler context) cause the cursor to be placed on the wrong +line of a multi-line command after a ^C interrupts editing. + +Patch (apply with `patch -p0'): + +*** ../bash-4.3-patched/lib/readline/display.c 2013-12-27 13:10:56.000000000 -0500 +--- lib/readline/display.c 2014-03-27 11:52:45.000000000 -0400 +*************** +*** 2678,2682 **** + if (_rl_echoing_p) + { +! _rl_move_vert (_rl_vis_botlin); + _rl_vis_botlin = 0; + fflush (rl_outstream); +--- 2678,2683 ---- + if (_rl_echoing_p) + { +! if (_rl_vis_botlin > 0) /* minor optimization plus bug fix */ +! _rl_move_vert (_rl_vis_botlin); + _rl_vis_botlin = 0; + fflush (rl_outstream); +*** ../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 10 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 11 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/shell-term-fm/bash/patches/bash43-012 b/shell-term-fm/bash/patches/bash43-012 new file mode 100644 index 0000000000..176fa15bdb --- /dev/null +++ b/shell-term-fm/bash/patches/bash43-012 @@ -0,0 +1,43 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.3 +Patch-ID: bash43-012 + +Bug-Reported-by: Eduardo A. Bustamante López<dualbus@gmail.com> +Bug-Reference-ID: <5346B54C.4070205@case.edu> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-04/msg00051.html + +Bug-Description: + +When a SIGCHLD trap runs a command containing a shell builtin while +a script is running `wait' to wait for all running children to complete, +the SIGCHLD trap will not be run once for each child that terminates. + +Patch (apply with `patch -p0'): + +*** ../bash-4.3-patched/jobs.c 2014-03-28 10:54:19.000000000 -0400 +--- jobs.c 2014-04-15 08:47:03.000000000 -0400 +*************** +*** 3598,3601 **** +--- 3598,3602 ---- + unwind_protect_pointer (the_pipeline); + unwind_protect_pointer (subst_assign_varlist); ++ unwind_protect_pointer (this_shell_builtin); + + /* We have to add the commands this way because they will be run +*** ../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 11 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 12 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/shell-term-fm/bash/patches/bash43-013 b/shell-term-fm/bash/patches/bash43-013 new file mode 100644 index 0000000000..8f4006b489 --- /dev/null +++ b/shell-term-fm/bash/patches/bash43-013 @@ -0,0 +1,66 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.3 +Patch-ID: bash43-013 + +Bug-Reported-by: <Trond.Endrestol@ximalas.info> +Bug-Reference-ID: <alpine.BSF.2.03.1404192114310.1973@enterprise.ximalas.info> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-04/msg00069.html + +Bug-Description: + +Using reverse-i-search when horizontal scrolling is enabled does not redisplay +the entire line containing the successful search results. + +Patch (apply with `patch -p0'): +*** ../bash-4.3-patched/lib/readline/display.c 2014-04-08 18:19:36.000000000 -0400 +--- lib/readline/display.c 2014-04-20 18:32:52.000000000 -0400 +*************** +*** 1638,1642 **** + the spot of first difference is before the end of the invisible chars, + lendiff needs to be adjusted. */ +! if (current_line == 0 && !_rl_horizontal_scroll_mode && + current_invis_chars != visible_wrap_offset) + { +--- 1638,1642 ---- + the spot of first difference is before the end of the invisible chars, + lendiff needs to be adjusted. */ +! if (current_line == 0 && /* !_rl_horizontal_scroll_mode && */ + current_invis_chars != visible_wrap_offset) + { +*************** +*** 1826,1831 **** + _rl_last_c_pos += bytes_to_insert; + + if (_rl_horizontal_scroll_mode && ((oe-old) > (ne-new))) +! goto clear_rest_of_line; + } + } +--- 1826,1836 ---- + _rl_last_c_pos += bytes_to_insert; + ++ /* XXX - we only want to do this if we are at the end of the line ++ so we move there with _rl_move_cursor_relative */ + if (_rl_horizontal_scroll_mode && ((oe-old) > (ne-new))) +! { +! _rl_move_cursor_relative (ne-new, new); +! goto clear_rest_of_line; +! } + } + } +*** ../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 12 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 13 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/shell-term-fm/bash/patches/bash43-014 b/shell-term-fm/bash/patches/bash43-014 new file mode 100644 index 0000000000..f8371967f4 --- /dev/null +++ b/shell-term-fm/bash/patches/bash43-014 @@ -0,0 +1,102 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.3 +Patch-ID: bash43-014 + +Bug-Reported-by: Greg Wooledge <wooledg@eeg.ccf.org> +Bug-Reference-ID: <20140418202123.GB7660@eeg.ccf.org> +Bug-Reference-URL: http://lists.gnu.org/archive/html/help-bash/2014-04/msg00004.html + +Bug-Description: + +Under certain circumstances, $@ is expanded incorrectly in contexts where +word splitting is not performed. + +Patch (apply with `patch -p0'): +*** ../bash-4.3-patched/subst.c 2014-01-23 16:26:37.000000000 -0500 +--- subst.c 2014-04-19 15:41:26.000000000 -0400 +*************** +*** 3249,3254 **** +--- 3249,3256 ---- + return ((char *)NULL); + ++ expand_no_split_dollar_star = 1; + w->flags |= W_NOSPLIT2; + l = call_expand_word_internal (w, 0, 0, (int *)0, (int *)0); ++ expand_no_split_dollar_star = 0; + if (l) + { +*************** +*** 7848,7851 **** +--- 7850,7857 ---- + according to POSIX.2, this expands to a list of the positional + parameters no matter what IFS is set to. */ ++ /* XXX - what to do when in a context where word splitting is not ++ performed? Even when IFS is not the default, posix seems to imply ++ that we behave like unquoted $* ? Maybe we should use PF_NOSPLIT2 ++ here. */ + temp = string_list_dollar_at (list, (pflags & PF_ASSIGNRHS) ? (quoted|Q_DOUBLE_QUOTES) : quoted); + +*************** +*** 8817,8820 **** +--- 8823,8827 ---- + { + char *ifs_chars; ++ char *tstring; + + ifs_chars = (quoted_dollar_at || has_dollar_at) ? ifs_value : (char *)NULL; +*************** +*** 8831,8834 **** +--- 8838,8865 ---- + if (split_on_spaces) + list = list_string (istring, " ", 1); /* XXX quoted == 1? */ ++ /* If we have $@ (has_dollar_at != 0) and we are in a context where we ++ don't want to split the result (W_NOSPLIT2), and we are not quoted, ++ we have already separated the arguments with the first character of ++ $IFS. In this case, we want to return a list with a single word ++ with the separator possibly replaced with a space (it's what other ++ shells seem to do). ++ quoted_dollar_at is internal to this function and is set if we are ++ passed an argument that is unquoted (quoted == 0) but we encounter a ++ double-quoted $@ while expanding it. */ ++ else if (has_dollar_at && quoted_dollar_at == 0 && ifs_chars && quoted == 0 && (word->flags & W_NOSPLIT2)) ++ { ++ /* Only split and rejoin if we have to */ ++ if (*ifs_chars && *ifs_chars != ' ') ++ { ++ list = list_string (istring, *ifs_chars ? ifs_chars : " ", 1); ++ tstring = string_list (list); ++ } ++ else ++ tstring = istring; ++ tword = make_bare_word (tstring); ++ if (tstring != istring) ++ free (tstring); ++ goto set_word_flags; ++ } + else if (has_dollar_at && ifs_chars) + list = list_string (istring, *ifs_chars ? ifs_chars : " ", 1); +*************** +*** 8836,8839 **** +--- 8867,8871 ---- + { + tword = make_bare_word (istring); ++ set_word_flags: + if ((quoted & (Q_DOUBLE_QUOTES|Q_HERE_DOCUMENT)) || (quoted_state == WHOLLY_QUOTED)) + tword->flags |= W_QUOTED; +*** ../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 13 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 14 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/shell-term-fm/bash/patches/bash43-015 b/shell-term-fm/bash/patches/bash43-015 new file mode 100644 index 0000000000..9c4e5ea48f --- /dev/null +++ b/shell-term-fm/bash/patches/bash43-015 @@ -0,0 +1,58 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.3 +Patch-ID: bash43-015 + +Bug-Reported-by: Clark Wang <dearvoid@gmail.com> +Bug-Reference-ID: <CADv8-og2TOSoabXeNVXVGaXN3tEMHnYVq1rwOLe5meaRPSGRig@mail.gmail.com> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-04/msg00095.html + +Bug-Description: + +When completing directory names, the directory name is dequoted twice. +This causes problems for directories with single and double quotes in +their names. + +Patch (apply with `patch -p0'): +*** ../bash-4.3-patched/bashline.c 2014-02-09 19:56:58.000000000 -0500 +--- bashline.c 2014-04-25 14:57:52.000000000 -0400 +*************** +*** 4168,4174 **** + + qc = rl_dispatching ? rl_completion_quote_character : 0; +! dfn = bash_dequote_filename ((char *)text, qc); + m1 = rl_completion_matches (dfn, rl_filename_completion_function); +! free (dfn); + + if (m1 == 0 || m1[0] == 0) +--- 4209,4222 ---- + + qc = rl_dispatching ? rl_completion_quote_character : 0; +! /* If rl_completion_found_quote != 0, rl_completion_matches will call the +! filename dequoting function, causing the directory name to be dequoted +! twice. */ +! if (rl_dispatching && rl_completion_found_quote == 0) +! dfn = bash_dequote_filename ((char *)text, qc); +! else +! dfn = (char *)text; + m1 = rl_completion_matches (dfn, rl_filename_completion_function); +! if (dfn != text) +! free (dfn); + + if (m1 == 0 || m1[0] == 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 14 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 15 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/shell-term-fm/bash/patches/bash43-016 b/shell-term-fm/bash/patches/bash43-016 new file mode 100644 index 0000000000..882d5939b0 --- /dev/null +++ b/shell-term-fm/bash/patches/bash43-016 @@ -0,0 +1,132 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.3 +Patch-ID: bash43-016 + +Bug-Reported-by: Pierre Gaston <pierre.gaston@gmail.com> +Bug-Reference-ID: <CAPSX3sTCD61k1VQLJ5r-LWzEt+e7Xc-fxXmwn2u8EA5gJJej8Q@mail.gmail.com> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-04/msg00100.html + +Bug-Description: + +An extended glob pattern containing a slash (`/') causes the globbing code +to misinterpret it as a directory separator. + +Patch (apply with `patch -p0'): +*** ../bash-4.3-patched/lib/glob/glob.c 2014-03-28 10:54:23.000000000 -0400 +--- lib/glob/glob.c 2014-05-02 10:24:28.000000000 -0400 +*************** +*** 124,127 **** +--- 124,129 ---- + extern wchar_t *glob_patscan_wc __P((wchar_t *, wchar_t *, int)); + ++ extern char *glob_dirscan __P((char *, int)); ++ + /* Compile `glob_loop.c' for single-byte characters. */ + #define CHAR unsigned char +*************** +*** 188,191 **** +--- 190,196 ---- + pe = glob_patscan (pp, se, 0); /* end of extglob pattern (( */ + /* we should check for invalid extglob pattern here */ ++ if (pe == 0) ++ return 0; ++ + /* if pe != se we have more of the pattern at the end of the extglob + pattern. Check the easy case first ( */ +*************** +*** 1016,1020 **** + char **result; + unsigned int result_size; +! char *directory_name, *filename, *dname; + unsigned int directory_len; + int free_dirname; /* flag */ +--- 1021,1025 ---- + char **result; + unsigned int result_size; +! char *directory_name, *filename, *dname, *fn; + unsigned int directory_len; + int free_dirname; /* flag */ +*************** +*** 1032,1035 **** +--- 1037,1052 ---- + /* Find the filename. */ + filename = strrchr (pathname, '/'); ++ #if defined (EXTENDED_GLOB) ++ if (filename && extended_glob) ++ { ++ fn = glob_dirscan (pathname, '/'); ++ #if DEBUG_MATCHING ++ if (fn != filename) ++ fprintf (stderr, "glob_filename: glob_dirscan: fn (%s) != filename (%s)\n", fn ? fn : "(null)", filename); ++ #endif ++ filename = fn; ++ } ++ #endif ++ + if (filename == NULL) + { +*** ../bash-4.3-patched/lib/glob/gmisc.c 2014-03-28 10:54:23.000000000 -0400 +--- lib/glob/gmisc.c 2014-05-02 09:35:57.000000000 -0400 +*************** +*** 43,46 **** +--- 43,48 ---- + #define WRPAREN L')' + ++ extern char *glob_patscan __P((char *, char *, int)); ++ + /* Return 1 of the first character of WSTRING could match the first + character of pattern WPAT. Wide character version. */ +*************** +*** 376,377 **** +--- 378,410 ---- + return matlen; + } ++ ++ /* Skip characters in PAT and return the final occurrence of DIRSEP. This ++ is only called when extended_glob is set, so we have to skip over extglob ++ patterns x(...) */ ++ char * ++ glob_dirscan (pat, dirsep) ++ char *pat; ++ int dirsep; ++ { ++ char *p, *d, *pe, *se; ++ ++ d = pe = se = 0; ++ for (p = pat; p && *p; p++) ++ { ++ if (extglob_pattern_p (p)) ++ { ++ if (se == 0) ++ se = p + strlen (p) - 1; ++ pe = glob_patscan (p + 2, se, 0); ++ if (pe == 0) ++ continue; ++ else if (*pe == 0) ++ break; ++ p = pe - 1; /* will do increment above */ ++ continue; ++ } ++ if (*p == dirsep) ++ d = p; ++ } ++ return d; ++ } + +*** ../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 15 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 16 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/shell-term-fm/bash/patches/bash43-017 b/shell-term-fm/bash/patches/bash43-017 new file mode 100644 index 0000000000..4016fb934e --- /dev/null +++ b/shell-term-fm/bash/patches/bash43-017 @@ -0,0 +1,51 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.3 +Patch-ID: bash43-017 + +Bug-Reported-by: Dan Douglas <ormaaj@gmail.com> +Bug-Reference-ID: <7781746.RhfoTROLxF@smorgbox> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-05/msg00026.html + +Bug-Description: + +The code that creates local variables should not clear the `invisible' +attribute when returning an existing local variable. Let the code that +actually assigns a value clear it. + +Patch (apply with `patch -p0'): +*** ../bash-4.3-patched/variables.c 2014-02-14 11:55:12.000000000 -0500 +--- variables.c 2014-05-07 10:53:57.000000000 -0400 +*************** +*** 2198,2205 **** + old_var = find_variable (name); + if (old_var && local_p (old_var) && old_var->context == variable_context) +! { +! VUNSETATTR (old_var, att_invisible); /* XXX */ +! return (old_var); +! } + + was_tmpvar = old_var && tempvar_p (old_var); +--- 2260,2264 ---- + old_var = find_variable (name); + if (old_var && local_p (old_var) && old_var->context == variable_context) +! return (old_var); + + was_tmpvar = old_var && tempvar_p (old_var); + +*** ../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 16 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 17 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/shell-term-fm/bash/patches/bash43-018 b/shell-term-fm/bash/patches/bash43-018 new file mode 100644 index 0000000000..39499f6637 --- /dev/null +++ b/shell-term-fm/bash/patches/bash43-018 @@ -0,0 +1,44 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.3 +Patch-ID: bash43-018 + +Bug-Reported-by: Geir Hauge <geir.hauge@gmail.com> +Bug-Reference-ID: <CAO-BiTLOvfPXDypg61jcBausADrxUKJejakV2WTWP26cW0=rgA@mail.gmail.com> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-05/msg00040.html + +Bug-Description: + +When assigning an array variable using the compound assignment syntax, +but using `declare' with the rhs of the compound assignment quoted, the +shell did not mark the variable as visible after successfully performing +the assignment. + +Patch (apply with `patch -p0'): +*** ../bash-4.3-patched/arrayfunc.c 2014-03-28 10:54:21.000000000 -0400 +--- arrayfunc.c 2014-05-12 11:19:00.000000000 -0400 +*************** +*** 180,183 **** +--- 180,184 ---- + FREE (newval); + ++ VUNSETATTR (entry, att_invisible); /* no longer invisible */ + return (entry); + } + +*** ../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 17 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 18 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/shell-term-fm/bash/patches/bash43-019 b/shell-term-fm/bash/patches/bash43-019 new file mode 100644 index 0000000000..a93714bebc --- /dev/null +++ b/shell-term-fm/bash/patches/bash43-019 @@ -0,0 +1,84 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.3 +Patch-ID: bash43-019 + +Bug-Reported-by: John Lenton +Bug-Reference-ID: +Bug-Reference-URL: https://bugs.launchpad.net/ubuntu/+source/bash/+bug/1317476 + +Bug-Description: + +The -t timeout option to `read' does not work when the -e option is used. + +Patch (apply with `patch -p0'): + +*** ../bash-4.3-patched/lib/readline/input.c 2014-01-10 15:07:08.000000000 -0500 +--- lib/readline/input.c 2014-05-22 18:40:59.000000000 -0400 +*************** +*** 535,540 **** +--- 538,551 ---- + else if (_rl_caught_signal == SIGHUP || _rl_caught_signal == SIGTERM) + return (RL_ISSTATE (RL_STATE_READCMD) ? READERR : EOF); ++ /* keyboard-generated signals of interest */ + else if (_rl_caught_signal == SIGINT || _rl_caught_signal == SIGQUIT) + RL_CHECK_SIGNALS (); ++ /* non-keyboard-generated signals of interest */ ++ else if (_rl_caught_signal == SIGALRM ++ #if defined (SIGVTALRM) ++ || _rl_caught_signal == SIGVTALRM ++ #endif ++ ) ++ RL_CHECK_SIGNALS (); + + if (rl_signal_event_hook) +*** ../bash-4.3-patched/builtins/read.def 2013-09-02 11:54:00.000000000 -0400 +--- builtins/read.def 2014-05-08 11:43:35.000000000 -0400 +*************** +*** 443,447 **** + #if defined (READLINE) + if (edit) +! add_unwind_protect (reset_attempted_completion_function, (char *)NULL); + #endif + falarm (tmsec, tmusec); +--- 443,450 ---- + #if defined (READLINE) + if (edit) +! { +! add_unwind_protect (reset_attempted_completion_function, (char *)NULL); +! add_unwind_protect (bashline_reset_event_hook, (char *)NULL); +! } + #endif + falarm (tmsec, tmusec); +*************** +*** 1022,1025 **** +--- 1025,1029 ---- + old_attempted_completion_function = rl_attempted_completion_function; + rl_attempted_completion_function = (rl_completion_func_t *)NULL; ++ bashline_set_event_hook (); + if (itext) + { +*************** +*** 1033,1036 **** +--- 1037,1041 ---- + rl_attempted_completion_function = old_attempted_completion_function; + old_attempted_completion_function = (rl_completion_func_t *)NULL; ++ bashline_reset_event_hook (); + + if (ret == 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 18 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 19 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/shell-term-fm/bash/patches/bash43-020 b/shell-term-fm/bash/patches/bash43-020 new file mode 100644 index 0000000000..5f533ef8d9 --- /dev/null +++ b/shell-term-fm/bash/patches/bash43-020 @@ -0,0 +1,110 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.3 +Patch-ID: bash43-020 + +Bug-Reported-by: Jared Yanovich <slovichon@gmail.com> +Bug-Reference-ID: <20140417073654.GB26875@nightderanger.psc.edu> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-04/msg00065.html + +Bug-Description: + +When PS2 contains a command substitution, here-documents entered in an +interactive shell can sometimes cause a segmentation fault. + +Patch (apply with `patch -p0'): + +*** ../bash-4.3-patched/shell.h 2012-12-25 21:11:01.000000000 -0500 +--- shell.h 2014-06-03 09:24:28.000000000 -0400 +*************** +*** 169,173 **** + int expand_aliases; + int echo_input_at_read; +! + } sh_parser_state_t; + +--- 169,174 ---- + int expand_aliases; + int echo_input_at_read; +! int need_here_doc; +! + } sh_parser_state_t; + +*** ../bash-4.3-patched/parse.y 2014-05-14 09:16:40.000000000 -0400 +--- parse.y 2014-04-30 09:27:59.000000000 -0400 +*************** +*** 2643,2647 **** + + r = 0; +! while (need_here_doc) + { + parser_state |= PST_HEREDOC; +--- 2643,2647 ---- + + r = 0; +! while (need_here_doc > 0) + { + parser_state |= PST_HEREDOC; +*************** +*** 6076,6079 **** +--- 6076,6080 ---- + ps->expand_aliases = expand_aliases; + ps->echo_input_at_read = echo_input_at_read; ++ ps->need_here_doc = need_here_doc; + + ps->token = token; +*************** +*** 6124,6127 **** +--- 6125,6129 ---- + expand_aliases = ps->expand_aliases; + echo_input_at_read = ps->echo_input_at_read; ++ need_here_doc = ps->need_here_doc; + + FREE (token); +*** ../bash-4.3-patched/y.tab.c 2014-04-07 11:56:12.000000000 -0400 +--- y.tab.c 2014-07-30 09:55:57.000000000 -0400 +*************** +*** 4955,4959 **** + + r = 0; +! while (need_here_doc) + { + parser_state |= PST_HEREDOC; +--- 5151,5155 ---- + + r = 0; +! while (need_here_doc > 0) + { + parser_state |= PST_HEREDOC; +*************** +*** 8388,8391 **** +--- 8584,8588 ---- + ps->expand_aliases = expand_aliases; + ps->echo_input_at_read = echo_input_at_read; ++ ps->need_here_doc = need_here_doc; + + ps->token = token; +*************** +*** 8436,8439 **** +--- 8633,8637 ---- + expand_aliases = ps->expand_aliases; + echo_input_at_read = ps->echo_input_at_read; ++ need_here_doc = ps->need_here_doc; + + FREE (token); +*** ../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 19 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 20 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/shell-term-fm/bash/patches/bash43-021 b/shell-term-fm/bash/patches/bash43-021 new file mode 100644 index 0000000000..fd1c945ec1 --- /dev/null +++ b/shell-term-fm/bash/patches/bash43-021 @@ -0,0 +1,52 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.3 +Patch-ID: bash43-021 + +Bug-Reported-by: Jared Yanovich <slovichon@gmail.com> +Bug-Reference-ID: <20140625225019.GJ17044@nightderanger.psc.edu> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-06/msg00070.html + +Bug-Description: + +When the readline `revert-all-at-newline' option is set, pressing newline +when the current line is one retrieved from history results in a double free +and a segmentation fault. + +Patch (apply with `patch -p0'): + +*** ../bash-4.3-patched/lib/readline/misc.c 2012-09-01 18:03:11.000000000 -0400 +--- lib/readline/misc.c 2014-06-30 13:41:19.000000000 -0400 +*************** +*** 462,465 **** +--- 462,466 ---- + /* Set up rl_line_buffer and other variables from history entry */ + rl_replace_from_history (entry, 0); /* entry->line is now current */ ++ entry->data = 0; /* entry->data is now current undo list */ + /* Undo all changes to this history entry */ + while (rl_undo_list) +*************** +*** 469,473 **** + FREE (entry->line); + entry->line = savestring (rl_line_buffer); +- entry->data = 0; + } + entry = previous_history (); +--- 470,473 ---- + +*** ../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 20 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 21 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/shell-term-fm/bash/patches/bash43-022 b/shell-term-fm/bash/patches/bash43-022 new file mode 100644 index 0000000000..7ce39ec0a2 --- /dev/null +++ b/shell-term-fm/bash/patches/bash43-022 @@ -0,0 +1,56 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.3 +Patch-ID: bash43-022 + +Bug-Reported-by: scorp.dev.null@gmail.com +Bug-Reference-ID: <E1WxXw8-0007iE-Bi@pcm14> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-06/msg00061.html + +Bug-Description: + +Using nested pipelines within loops with the `lastpipe' option set can result +in a segmentation fault. + +Patch (apply with `patch -p0'): + +*** ../bash-4.3-patched/execute_cmd.c 2014-01-31 10:54:52.000000000 -0500 +--- execute_cmd.c 2014-06-19 08:05:49.000000000 -0400 +*************** +*** 2410,2414 **** + lstdin = wait_for (lastpid); + #if defined (JOB_CONTROL) +! exec_result = job_exit_status (lastpipe_jid); + #endif + unfreeze_jobs_list (); +--- 2425,2438 ---- + lstdin = wait_for (lastpid); + #if defined (JOB_CONTROL) +! /* If wait_for removes the job from the jobs table, use result of last +! command as pipeline's exit status as usual. The jobs list can get +! frozen and unfrozen at inconvenient times if there are multiple pipelines +! running simultaneously. */ +! if (INVALID_JOB (lastpipe_jid) == 0) +! exec_result = job_exit_status (lastpipe_jid); +! else if (pipefail_opt) +! exec_result = exec_result | lstdin; /* XXX */ +! /* otherwise we use exec_result */ +! + #endif + unfreeze_jobs_list (); +*** ../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 21 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 22 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/shell-term-fm/bash/patches/bash43-023 b/shell-term-fm/bash/patches/bash43-023 new file mode 100644 index 0000000000..d1e4e9d7c7 --- /dev/null +++ b/shell-term-fm/bash/patches/bash43-023 @@ -0,0 +1,104 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.3 +Patch-ID: bash43-023 + +Bug-Reported-by: Tim Friske <me@timfriske.com> +Bug-Reference-ID: <CAM1RzOcOR9zzC2i+aeES6LtbHNHoOV+0pZEYPrqxv_QAii-RXA@mail.gmail.com> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-06/msg00056.html + +Bug-Description: + +Bash does not correctly parse process substitution constructs that contain +unbalanced parentheses as part of the contained command. + +Patch (apply with `patch -p0'): + +*** ../bash-4.3-patched/subst.h 2014-01-11 21:02:27.000000000 -0500 +--- subst.h 2014-07-20 17:25:01.000000000 -0400 +*************** +*** 83,87 **** + Start extracting at (SINDEX) as if we had just seen "<(". + Make (SINDEX) get the position just after the matching ")". */ +! extern char *extract_process_subst __P((char *, char *, int *)); + #endif /* PROCESS_SUBSTITUTION */ + +--- 83,87 ---- + Start extracting at (SINDEX) as if we had just seen "<(". + Make (SINDEX) get the position just after the matching ")". */ +! extern char *extract_process_subst __P((char *, char *, int *, int)); + #endif /* PROCESS_SUBSTITUTION */ + +*** ../bash-4.3-patched/subst.c 2014-05-15 08:26:45.000000000 -0400 +--- subst.c 2014-07-20 17:26:44.000000000 -0400 +*************** +*** 1193,1202 **** + Make (SINDEX) get the position of the matching ")". */ /*))*/ + char * +! extract_process_subst (string, starter, sindex) + char *string; + char *starter; + int *sindex; + { + return (extract_delimited_string (string, sindex, starter, "(", ")", SX_COMMAND)); + } + #endif /* PROCESS_SUBSTITUTION */ +--- 1193,1208 ---- + Make (SINDEX) get the position of the matching ")". */ /*))*/ + char * +! extract_process_subst (string, starter, sindex, xflags) + char *string; + char *starter; + int *sindex; ++ int xflags; + { ++ #if 0 + return (extract_delimited_string (string, sindex, starter, "(", ")", SX_COMMAND)); ++ #else ++ xflags |= (no_longjmp_on_fatal_error ? SX_NOLONGJMP : 0); ++ return (xparse_dolparen (string, string+*sindex, sindex, xflags)); ++ #endif + } + #endif /* PROCESS_SUBSTITUTION */ +*************** +*** 1786,1790 **** + if (string[si] == '\0') + CQ_RETURN(si); +! temp = extract_process_subst (string, (c == '<') ? "<(" : ">(", &si); + free (temp); /* no SX_ALLOC here */ + i = si; +--- 1792,1796 ---- + if (string[si] == '\0') + CQ_RETURN(si); +! temp = extract_process_subst (string, (c == '<') ? "<(" : ">(", &si, 0); + free (temp); /* no SX_ALLOC here */ + i = si; +*************** +*** 8250,8254 **** + t_index = sindex + 1; /* skip past both '<' and LPAREN */ + +! temp1 = extract_process_subst (string, (c == '<') ? "<(" : ">(", &t_index); /*))*/ + sindex = t_index; + +--- 8256,8260 ---- + t_index = sindex + 1; /* skip past both '<' and LPAREN */ + +! temp1 = extract_process_subst (string, (c == '<') ? "<(" : ">(", &t_index, 0); /*))*/ + sindex = t_index; + +*** ../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 22 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 23 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/shell-term-fm/bash/patches/bash43-024 b/shell-term-fm/bash/patches/bash43-024 new file mode 100644 index 0000000000..a24b8fbbca --- /dev/null +++ b/shell-term-fm/bash/patches/bash43-024 @@ -0,0 +1,54 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.3 +Patch-ID: bash43-024 + +Bug-Reported-by: Corentin Peuvrel <cpeuvrel@pom-monitoring.com> +Bug-Reference-ID: <53CE9E5D.6050203@pom-monitoring.com> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-07/msg00021.html + +Bug-Description: + +Indirect variable references do not work correctly if the reference +variable expands to an array reference using a subscript other than 0 +(e.g., foo='bar[1]' ; echo ${!foo}). + +Patch (apply with `patch -p0'): + +*** ../bash-4.3-patched/subst.c 2014-06-03 09:32:44.000000000 -0400 +--- subst.c 2014-07-23 09:58:19.000000000 -0400 +*************** +*** 7375,7379 **** + + if (want_indir) +! tdesc = parameter_brace_expand_indir (name + 1, var_is_special, quoted, quoted_dollar_atp, contains_dollar_at); + else + tdesc = parameter_brace_expand_word (name, var_is_special, quoted, PF_IGNUNBOUND|(pflags&(PF_NOSPLIT2|PF_ASSIGNRHS)), &ind); +--- 7445,7455 ---- + + if (want_indir) +! { +! tdesc = parameter_brace_expand_indir (name + 1, var_is_special, quoted, quoted_dollar_atp, contains_dollar_at); +! /* Turn off the W_ARRAYIND flag because there is no way for this function +! to return the index we're supposed to be using. */ +! if (tdesc && tdesc->flags) +! tdesc->flags &= ~W_ARRAYIND; +! } + else + tdesc = parameter_brace_expand_word (name, var_is_special, quoted, PF_IGNUNBOUND|(pflags&(PF_NOSPLIT2|PF_ASSIGNRHS)), &ind); +*** ../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 23 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 24 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/shell-term-fm/bash/patches/bash43-025 b/shell-term-fm/bash/patches/bash43-025 new file mode 100644 index 0000000000..721aca0307 --- /dev/null +++ b/shell-term-fm/bash/patches/bash43-025 @@ -0,0 +1,123 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.3 +Patch-ID: bash43-025 + +Bug-Reported-by: Stephane Chazelas <stephane.chazelas@gmail.com> +Bug-Reference-ID: +Bug-Reference-URL: + +Bug-Description: + +Under certain circumstances, bash will execute user code while processing the +environment for exported function definitions. + +Patch (apply with `patch -p0'): + +*** ../bash-4.3-patched/builtins/common.h 2013-07-08 16:54:47.000000000 -0400 +--- builtins/common.h 2014-09-12 14:25:47.000000000 -0400 +*************** +*** 34,37 **** +--- 49,54 ---- + #define SEVAL_PARSEONLY 0x020 + #define SEVAL_NOLONGJMP 0x040 ++ #define SEVAL_FUNCDEF 0x080 /* only allow function definitions */ ++ #define SEVAL_ONECMD 0x100 /* only allow a single command */ + + /* Flags for describe_command, shared between type.def and command.def */ +*** ../bash-4.3-patched/builtins/evalstring.c 2014-02-11 09:42:10.000000000 -0500 +--- builtins/evalstring.c 2014-09-14 14:15:13.000000000 -0400 +*************** +*** 309,312 **** +--- 313,324 ---- + struct fd_bitmap *bitmap; + ++ if ((flags & SEVAL_FUNCDEF) && command->type != cm_function_def) ++ { ++ internal_warning ("%s: ignoring function definition attempt", from_file); ++ should_jump_to_top_level = 0; ++ last_result = last_command_exit_value = EX_BADUSAGE; ++ break; ++ } ++ + bitmap = new_fd_bitmap (FD_BITMAP_SIZE); + begin_unwind_frame ("pe_dispose"); +*************** +*** 369,372 **** +--- 381,387 ---- + dispose_fd_bitmap (bitmap); + discard_unwind_frame ("pe_dispose"); ++ ++ if (flags & SEVAL_ONECMD) ++ break; + } + } +*** ../bash-4.3-patched/variables.c 2014-05-15 08:26:50.000000000 -0400 +--- variables.c 2014-09-14 14:23:35.000000000 -0400 +*************** +*** 359,369 **** + strcpy (temp_string + char_index + 1, string); + +! if (posixly_correct == 0 || legal_identifier (name)) +! parse_and_execute (temp_string, name, SEVAL_NONINT|SEVAL_NOHIST); +! +! /* Ancient backwards compatibility. Old versions of bash exported +! functions like name()=() {...} */ +! if (name[char_index - 1] == ')' && name[char_index - 2] == '(') +! name[char_index - 2] = '\0'; + + if (temp_var = find_function (name)) +--- 364,372 ---- + 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)) +*************** +*** 382,389 **** + report_error (_("error importing function definition for `%s'"), name); + } +- +- /* ( */ +- if (name[char_index - 1] == ')' && name[char_index - 2] == '\0') +- name[char_index - 2] = '('; /* ) */ + } + #if defined (ARRAY_VARS) +--- 385,388 ---- +*** ../bash-4.3-patched/subst.c 2014-08-11 11:16:35.000000000 -0400 +--- subst.c 2014-09-12 15:31:04.000000000 -0400 +*************** +*** 8048,8052 **** + goto return0; + } +! else if (var = find_variable_last_nameref (temp1)) + { + temp = nameref_cell (var); +--- 8118,8124 ---- + goto return0; + } +! else if (var && (invisible_p (var) || var_isset (var) == 0)) +! temp = (char *)NULL; +! else if ((var = find_variable_last_nameref (temp1)) && var_isset (var) && invisible_p (var) == 0) + { + temp = nameref_cell (var); +*** ../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 24 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 25 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/shell-term-fm/byobu/DEPENDS b/shell-term-fm/byobu/DEPENDS new file mode 100644 index 0000000000..26ce3d1c30 --- /dev/null +++ b/shell-term-fm/byobu/DEPENDS @@ -0,0 +1 @@ +optional_depends newt '' '' 'required by the byobu-config utility' diff --git a/shell-term-fm/byobu/DETAILS b/shell-term-fm/byobu/DETAILS new file mode 100755 index 0000000000..1a85b8533e --- /dev/null +++ b/shell-term-fm/byobu/DETAILS @@ -0,0 +1,17 @@ + SPELL=byobu + VERSION=5.86 + 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" + LICENSE[0]="GPLv3" + ENTERED=20140913 + KEYWORDS="" + SHORT="text based window manager and terminal multiplexer" +cat << EOF +Byobu is an elegant enhancement of the otherwise functional, plain, practical +GNU Screen. Byobu includes an enhanced profile, configuration utilities, and +system status notifications for the GNU screen window manager as well as the +Tmux terminal multiplexer. +EOF diff --git a/shell-term-fm/byobu/HISTORY b/shell-term-fm/byobu/HISTORY new file mode 100644 index 0000000000..ab8a7d261d --- /dev/null +++ b/shell-term-fm/byobu/HISTORY @@ -0,0 +1,3 @@ +2014-09-13 Ismael Luceno <ismael@sourcemage.org> + * DETAILS: spell created + * DEPENDS: Optionally depends on newt for byobu-config diff --git a/shell-term-fm/mksh/DETAILS b/shell-term-fm/mksh/DETAILS index 2f4bc6e7cd..ff870effbe 100755 --- a/shell-term-fm/mksh/DETAILS +++ b/shell-term-fm/mksh/DETAILS @@ -1,12 +1,12 @@ SPELL=mksh - VERSION=R50 + VERSION=R50b SOURCE=$SPELL-$VERSION.tgz SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL" SOURCE_URL[0]=http://www.mirbsd.org/MirOS/dist/mir/$SPELL/$SOURCE SOURCE_URL[1]=http://pub.allbsd.org/MirOS/dist/mir/$SPELL/$SOURCE WEB_SITE=http://www.mirbsd.org/mksh.htm ENTERED=20060928 - SOURCE_HASH=sha512:a1287278a15bf188c0df00fa55d3439996890d1fa4331f4c41b7995525b85f3e7bfdc75e51d06d3898d12b607eb618105199946633db58da2ecd62e7bf7b1fd9 + SOURCE_HASH=sha512:0170401d0722575dd81f853b6730b008171fe57cd7e6df7d1d401db28e318a2b9f654676160148cb2443237bfa42d0efcfbc16e52715dc6425e192569e3fa286 # I suggest to add this to the list (shortname MIROS or MIRBSD please) LICENSE[0]=http://mirbsd.de/MirOS-Licence SHORT="MirBSD Korn Shell" diff --git a/shell-term-fm/mksh/HISTORY b/shell-term-fm/mksh/HISTORY index 24ba636b94..a3db4d0d65 100644 --- a/shell-term-fm/mksh/HISTORY +++ b/shell-term-fm/mksh/HISTORY @@ -1,3 +1,6 @@ +2014-09-08 Vlad Glagolev <stealth@sourcemage.org> + * DETAILS: updated spell to R50b + 2014-07-17 Vlad Glagolev <stealth@sourcemage.org> * DETAILS: updated spell to R50 diff --git a/shell-term-fm/rdesktop/DEPENDS b/shell-term-fm/rdesktop/DEPENDS index 918cbfa73a..0eab53282f 100755 --- a/shell-term-fm/rdesktop/DEPENDS +++ b/shell-term-fm/rdesktop/DEPENDS @@ -1,5 +1,6 @@ -depends SSL && -depends libx11 && +depends libx11 && +depends libxrandr && +depends SSL && if list_find $RDESKTOP_SOUND alsa; then depends alsa-lib diff --git a/shell-term-fm/rdesktop/HISTORY b/shell-term-fm/rdesktop/HISTORY index 8467750659..9588711d06 100644 --- a/shell-term-fm/rdesktop/HISTORY +++ b/shell-term-fm/rdesktop/HISTORY @@ -1,3 +1,6 @@ +2014-09-25 Remko van der Vossen <wich@sourcemage.org> + * DEPENDS: libxrandr + 2014-08-19 Treeve Jelbert <treeve@sourcemage.org> * DEPENDS: openssl => SSL diff --git a/smgl/basesystem/DEPENDS b/smgl/basesystem/DEPENDS index 844a1587b9..c198950984 100755 --- a/smgl/basesystem/DEPENDS +++ b/smgl/basesystem/DEPENDS @@ -7,7 +7,7 @@ depends dialog && depends diffutils && depends file && depends findutils && -depends gawk && +depends AWK && depends gcc && depends glibc && depends gnupg && diff --git a/smgl/iana-etc/DEPENDS b/smgl/iana-etc/DEPENDS index 1cc2b62966..00fc96cdb8 100755 --- a/smgl/iana-etc/DEPENDS +++ b/smgl/iana-etc/DEPENDS @@ -1,3 +1,3 @@ -depends gawk && +depends AWK && depends gnupg && depends smgl-fhs diff --git a/utils/binwalk/BUILD b/utils/binwalk/BUILD deleted file mode 100755 index ed9b1c7000..0000000000 --- a/utils/binwalk/BUILD +++ /dev/null @@ -1,2 +0,0 @@ -cd src && -default_build diff --git a/utils/binwalk/DETAILS b/utils/binwalk/DETAILS index e26a681113..981089db5d 100755 --- a/utils/binwalk/DETAILS +++ b/utils/binwalk/DETAILS @@ -1,8 +1,8 @@ SPELL=binwalk - VERSION=0.4.5 + VERSION=2.0.1 SOURCE=$SPELL-$VERSION.tar.gz - SOURCE_URL[0]=http://binwalk.googlecode.com/files/$SOURCE - SOURCE_HASH=sha512:1670ca6c00857b9e7af0d58fcf5bb2b85bbfc79c605ff2910a78f29d246493608ccd74e35e078fe88cd50778dbf1fb4e98c5eabcfc9e4300265e3003079823b7 + SOURCE_URL[0]=https://github.com/devttys0/$SPELL/archive/v$VERSION.tar.gz + SOURCE_HASH=sha512:de223f61a0a212469c21b8e36d02cadc83f1cdb96a0f6114490d15d8dc12c93a86b46ef74379acb96b32b305e75ca66e940d7a18a8dc3b5036ebe8946dcca0f3 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}" WEB_SITE=http://code.google.com/p/binwalk/ LICENSE[0]=MIT diff --git a/utils/binwalk/HISTORY b/utils/binwalk/HISTORY index 6ab4e28063..58168eb5e0 100644 --- a/utils/binwalk/HISTORY +++ b/utils/binwalk/HISTORY @@ -1,2 +1,7 @@ +2014-09-11 Ismael Luceno <ismael@sourcemage.org> + * DETAILS: Fixed SOURCE_URL[0] + updated spell to 2.0.1 + * BUILD: Removed, not needed anymore + 2012-12-19 Ladislav Hagara <hgr@vabo.cz> * DETAILS, BUILD: spell created, version 0.4.5 diff --git a/utils/chrpath/DETAILS b/utils/chrpath/DETAILS index 9c544848d8..1ce714a410 100755 --- a/utils/chrpath/DETAILS +++ b/utils/chrpath/DETAILS @@ -1,8 +1,8 @@ SPELL=chrpath - VERSION=0.14 + VERSION=0.16 SOURCE="${SPELL}-${VERSION}.tar.gz" - SOURCE_URL[0]=http://alioth.debian.org/frs/download.php/3648/${SOURCE} - SOURCE_HASH=sha512:ef37972c2af58238d8dcaa0b9558acf67bae751fe2f2aedbea9079383d762902c7e051d08a9f14623643fcf598fab7e019762a1fb3781147bccce5971754a816 + SOURCE_URL[0]=https://alioth.debian.org/frs/download.php/file/3979/${SOURCE} + SOURCE_HASH=sha512:aa04d490f78bff20a56fe20539cec10218c0772a668909eda8324ca825f51e8ef92001e95d9c316e79a145a043c9c327ec94d1a82e104ab408ca1021832745aa SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}" WEB_SITE="http://directory.fsf.org/wiki/Chrpath" LICENSE[0]=GPL diff --git a/utils/chrpath/HISTORY b/utils/chrpath/HISTORY index 443ec88d84..3f957ab6dd 100644 --- a/utils/chrpath/HISTORY +++ b/utils/chrpath/HISTORY @@ -1,3 +1,6 @@ +2014-09-07 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> + * DETAILS: version 0.16 + 2012-03-18 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> * DETAILS: spell created diff --git a/utils/crosstool-ng/DETAILS b/utils/crosstool-ng/DETAILS index 0abb2e9aa0..5f31f3c027 100755 --- a/utils/crosstool-ng/DETAILS +++ b/utils/crosstool-ng/DETAILS @@ -1,8 +1,8 @@ SPELL=crosstool-ng - VERSION=1.13.2 + VERSION=1.20.0 SOURCE="${SPELL}-${VERSION}.tar.bz2" SOURCE_URL[0]=http://crosstool-ng.org/download/${SPELL}/${SOURCE} - SOURCE_HASH=sha512:86ac9f036a6cff4f0f3d5bb49d4a4b917d4d8c38a6bdabee392e8efc1ccefd779587bb943f125a671f0f0e358a97f357cf955c01513fd576db7ecbc0438ba2d6 + SOURCE_HASH=sha512:42aa93fbdfb2daa9055d7aeba7539a59960caad9d674fb3ca8ed74353da75a49a799896777cf9511a54b4d47de0cb5d206fd7c5200f19067f9c8090a46b39653 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}" WEB_SITE="http://crosstool-ng.org" LICENSE[0]=GPL diff --git a/utils/crosstool-ng/HISTORY b/utils/crosstool-ng/HISTORY index 332b014cc0..f9d7952ce2 100644 --- a/utils/crosstool-ng/HISTORY +++ b/utils/crosstool-ng/HISTORY @@ -1,3 +1,6 @@ +2014-09-10 Ismael Luceno <ismael@sourcemage.org> + * DETAILS: updated spell to 1.20.0 + 2012-01-05 Julien "_kaze_" ROZO <julien@rozo.org> * DETAILS: updated version to 1.13.2 diff --git a/utils/dbus/DETAILS b/utils/dbus/DETAILS index 5963cc6130..4c20b14fd2 100755 --- a/utils/dbus/DETAILS +++ b/utils/dbus/DETAILS @@ -1,7 +1,7 @@ SPELL=dbus - VERSION=1.8.6 - SOURCE_HASH=sha512:62f162bab8e6f6d84fdfa1335013e0bf186d70bac5c3242dc956a912b7e35759f28a2bcaca29e1f620a7a30fc3ccc48552ffa123d4b3a2b5109135ae7ff5d1aa - SECURITY_PATCH=11 + VERSION=1.8.8 + SOURCE_HASH=sha512:99e7e05347666e95f3ccaf3f19500b59a5e509cdb9489c11f47ed4f139d3bc8e21adcf48cbb5c4f0de1661e831d60634eb7b6b76cc080d32091b63c732ebe391 + SECURITY_PATCH=12 SOURCE=$SPELL-$VERSION.tar.gz SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION SOURCE_URL[0]=http://dbus.freedesktop.org/releases/dbus/$SOURCE diff --git a/utils/dbus/HISTORY b/utils/dbus/HISTORY index 4903011d5f..0892caf6e6 100644 --- a/utils/dbus/HISTORY +++ b/utils/dbus/HISTORY @@ -1,3 +1,7 @@ +2014-09-20 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 1.8.8 + SECURITY++, fixes CVE-2014-3635, CVE-2014-3636, CVE-2014-3637, CVE-2014-3638, CVE-2014-3639 + 2014-07-08 Ladislav Hagara <hgr@vabo.cz> * DETAILS: 1.8.6, SECURITY_PATCH=11 diff --git a/utils/direvent/DETAILS b/utils/direvent/DETAILS new file mode 100755 index 0000000000..cd4fa5264d --- /dev/null +++ b/utils/direvent/DETAILS @@ -0,0 +1,19 @@ + SPELL=direvent + VERSION=5.0 + SOURCE=$SPELL-$VERSION.tar.gz + SOURCE2=$SOURCE.sig +SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION + SOURCE_URL[0]=$GNU_URL/$SPELL/$SOURCE + SOURCE2_URL[0]=$GNU_URL/$SPELL/$SOURCE2 + SOURCE_GPG=gnu.gpg:$SOURCE2:VERIFIED_UPSTREAM_KEY + SOURCE2_IGNORE=signature + WEB_SITE=http://www.gnu.org/software/direvent/ + ENTERED=20140907 + LICENSE[0]=GPL + SHORT="directory event monitoring daemon" +cat << EOF +GNU Direvent monitors events in the file system directories. For each event +that occurs in a set of pre-configured directories, the program calls +an external program associated with it, supplying it with the information about +the event and the location within the file system where it occured. +EOF diff --git a/utils/direvent/HISTORY b/utils/direvent/HISTORY new file mode 100644 index 0000000000..329798f2ce --- /dev/null +++ b/utils/direvent/HISTORY @@ -0,0 +1,2 @@ +2014-09-07 Ladislav Hagara <hgr@vabo.cz> + * DETAILS: spell created, version 5.0 diff --git a/utils/flashrom/DETAILS b/utils/flashrom/DETAILS index d64bc0c8cb..3ca8d43193 100755 --- a/utils/flashrom/DETAILS +++ b/utils/flashrom/DETAILS @@ -8,10 +8,10 @@ then FORCE_DOWNLOAD=on SOURCE_IGNORE=volatile else - VERSION=0.9.5.2 + VERSION=0.9.7 SOURCE=${SPELL}-${VERSION}.tar.bz2 SOURCE_URL[0]=http://download.flashrom.org/releases/$SOURCE - SOURCE_HASH=sha512:cfbf00302fb804832d5bf63621b0fa2eb548981c2a208e0bb55a1fd04248744314028dc353dc7ad1b2f66480617683a265f47af15141d458ae442a83174b9bb0 + SOURCE_HASH=sha512:a226c1ac3f9c7822b74ca14b7f9b53013110b2cdb66b1f936593c693ee54f19d643cc3a97a9635c05f2c959aca817668006f609ddb503a84d0bf5d510065674e fi SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SOURCE%.tar.bz2} WEB_SITE=http://flashrom.org/Flashrom diff --git a/utils/flashrom/HISTORY b/utils/flashrom/HISTORY index 0d0755f3a5..07044fd73b 100644 --- a/utils/flashrom/HISTORY +++ b/utils/flashrom/HISTORY @@ -1,3 +1,6 @@ +2014-09-20 Ismael Luceno <ismael@sourcemage.org> + * DETAILS: updated spell to 0.9.7 + 2014-07-03 Ismael Luceno <ismael@sourcemage.org> * DETAILS: Use get_scm_version diff --git a/utils/hal/DEPENDS b/utils/hal/DEPENDS index ea6aada566..b81ae84855 100755 --- a/utils/hal/DEPENDS +++ b/utils/hal/DEPENDS @@ -1,5 +1,5 @@ depends dbus-glib && -depends gawk && +depends AWK && depends glib2 && depends intltool && depends libtool && diff --git a/utils/hercules/DEPENDS b/utils/hercules/DEPENDS index 6f15e2f284..d9fac372fe 100755 --- a/utils/hercules/DEPENDS +++ b/utils/hercules/DEPENDS @@ -4,7 +4,7 @@ fi depends autoconf && depends automake && depends flex && -depends gawk && +depends AWK && depends gcc && depends gettext && depends grep && diff --git a/utils/lxc/DETAILS b/utils/lxc/DETAILS new file mode 100755 index 0000000000..ba7c444b63 --- /dev/null +++ b/utils/lxc/DETAILS @@ -0,0 +1,29 @@ + SPELL=lxc + VERSION=1.0.6 + SOURCE="${SPELL}-${VERSION}.tar.gz" + SOURCE_URL[0]=https://linuxcontainers.org/downloads/${SOURCE} + SOURCE_HASH=sha512:a2a0700bc29c92f34b8fb0806d1f05467e0433e84dc06c1c8b8db58a34969df48d452771ffff1ea9f865883adef765c896c5be6237108c0ce474b9d7e41c218a +SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}" + WEB_SITE="https://linuxcontainers.org/" + LICENSE[0]="LGPLv2.1+" + ENTERED=20140924 + KEYWORDS="" + SHORT="Userspace tools for the Linux kernel containers" +cat << EOF +LXC is a userspace interface for the Linux kernel containment features. +Through a powerful API and simple tools, it lets Linux users easily create +and manage system or application containers. Features + +Current LXC uses the following kernel features to contain processes: +* Kernel namespaces (ipc, uts, mount, pid, network and user) +* Apparmor and SELinux profiles +* Seccomp policies +* Chroots (using pivot_root) +* Kernel capabilities +* Control groups (cgroups) + +As such, LXC is often considered as something in the middle between a chroot +on steroids and a full fledged virtual machine. The goal of LXC is to create +an environment as close as possible as a standard Linux installation but +without the need for a separate kernel. +EOF diff --git a/utils/lxc/HISTORY b/utils/lxc/HISTORY new file mode 100644 index 0000000000..22a06efd7c --- /dev/null +++ b/utils/lxc/HISTORY @@ -0,0 +1,2 @@ +2014-09-24 Ismael Luceno <ismael@sourcemage.org> + * DETAILS: spell created diff --git a/utils/supermin/DEPENDS b/utils/supermin/DEPENDS index d820be7861..decd60750a 100755 --- a/utils/supermin/DEPENDS +++ b/utils/supermin/DEPENDS @@ -1,7 +1,7 @@ depends automake && depends e2fsprogs && depends findlib && -depends gawk && +depends AWK && depends ocaml && depends zlib && diff --git a/gnome2-libs/xdg-user-dirs/DETAILS b/utils/xdg-user-dirs/DETAILS index 64947547fc..dddeb4cb1b 100755 --- a/gnome2-libs/xdg-user-dirs/DETAILS +++ b/utils/xdg-user-dirs/DETAILS @@ -1,9 +1,9 @@ SPELL=xdg-user-dirs - VERSION=0.10 + VERSION=0.15 + SOURCE_HASH=sha512:2365003d4c116326357755dbeb462d5d7a4fd1391fe0b4ced5597db1017dff230676773aa8cd4bdd9dbb1bfb59c1c71d08ed860a047e0e9c2ab2487c814c7ca9 SOURCE=${SPELL}-${VERSION}.tar.gz SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION} SOURCE_URL[0]=http://user-dirs.freedesktop.org/releases/${SOURCE} - SOURCE_GPG="gurus.gpg:${SOURCE}.sig" LICENSE[0]=LGPL WEB_SITE=http://www.freedesktop.org/wiki/Software_2fxdg_2duser_2ddirs ENTERED=20070416 diff --git a/gnome2-libs/xdg-user-dirs/HISTORY b/utils/xdg-user-dirs/HISTORY index 36c274a967..32d5a10efd 100644 --- a/gnome2-libs/xdg-user-dirs/HISTORY +++ b/utils/xdg-user-dirs/HISTORY @@ -1,3 +1,6 @@ +20`4-09-21 TreeveJelbrt <treeve@sourcemage.org> + * DETAILS: version 0.15 + 2008-03-14 Robin Cook <rcook@wyrms.net> * DETAILS: updated VERSION to 0.10 diff --git a/utils/youtube-dl/DETAILS b/utils/youtube-dl/DETAILS index 1ac98823c6..8f99cfc323 100755 --- a/utils/youtube-dl/DETAILS +++ b/utils/youtube-dl/DETAILS @@ -1,10 +1,12 @@ SPELL=youtube-dl - VERSION=2014.07.25.1 - SOURCE=$SPELL + VERSION=2014.09.04.3 + SOURCE=$SPELL-$VERSION + SOURCE2=$SOURCE.sig + SOURCE2_IGNORE=signature + SOURCE_GPG=youtube-dl.gpg:$SOURCE2:UPSTREAM_KEY SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION - SOURCE_URL[0]=http://youtube-dl.org/downloads/$VERSION/$SOURCE - SOURCE_HASH=sha512:b976bf64af293b4023ac91d266f36b55092d8e0c9f956e2d7e533ddaa52ad11d0d87c655b149cb66cc52a77066125f10b2593731d6b04bf13c47744284bdf870 - FORCE_DOWNLOAD=on + SOURCE_URL=http://youtube-dl.org/downloads/$VERSION/$SPELL + SOURCE2_URL=$SOURCE_URL.sig LICENSE[0]=BSD KEYWORDS="utils" WEB_SITE=http://rg3.github.com/youtube-dl/ diff --git a/utils/youtube-dl/HISTORY b/utils/youtube-dl/HISTORY index 797539d717..f5fa5aed98 100644 --- a/utils/youtube-dl/HISTORY +++ b/utils/youtube-dl/HISTORY @@ -1,3 +1,12 @@ +2014-09-06 Thomas Orgis <sobukus@sourcemage.org> + * DETAILS: update to 2014.09.04.3 + * DETAILS, INSTALL: Switch to versioned source files. Downside is that + fallback mirrors need to add the version to the file name, too. Upside is + that mirroring of specific versions to keep the stable grimoire working + is possible at all. Note: There are versioned tarballs on the upstream site, + but they contain much more than just the youtube-dl script. + * youtube-dl.gpg: add upstream keys + 2014-07-28 Ismael Luceno <ismael@sourcemage.org> * DETAILS: updated spell to 2014.07.25.1 diff --git a/utils/youtube-dl/INSTALL b/utils/youtube-dl/INSTALL index 949e88cab2..51372fa812 100755 --- a/utils/youtube-dl/INSTALL +++ b/utils/youtube-dl/INSTALL @@ -1,2 +1,2 @@ install -m 0755 -o root -g root $SOURCE_CACHE/$SOURCE \ - $INSTALL_ROOT/usr/bin/$SOURCE + $INSTALL_ROOT/usr/bin/$SPELL diff --git a/utils/youtube-dl/youtube-dl.gpg b/utils/youtube-dl/youtube-dl.gpg Binary files differnew file mode 100644 index 0000000000..7add2fb886 --- /dev/null +++ b/utils/youtube-dl/youtube-dl.gpg diff --git a/video-libs/libmms/DEPENDS b/video-libs/libmms/DEPENDS index c123523b11..349aba1930 100755 --- a/video-libs/libmms/DEPENDS +++ b/video-libs/libmms/DEPENDS @@ -1 +1,2 @@ -depends glib2 +depends glib2 && +depends pcre diff --git a/video-libs/libmms/HISTORY b/video-libs/libmms/HISTORY index e78bdefb67..8d42733e6e 100644 --- a/video-libs/libmms/HISTORY +++ b/video-libs/libmms/HISTORY @@ -1,3 +1,6 @@ +2014-09-09 Remko van der Vossen <wich@sourcemage.org> + * DEPENDS: pcre + 2011-01-21 Ladislav Hagara <hgr@vabo.cz> * DETAILS: 0.6.2 diff --git a/video-libs/libvpx/DETAILS b/video-libs/libvpx/DETAILS index 30aadeae84..ae274c2555 100755 --- a/video-libs/libvpx/DETAILS +++ b/video-libs/libvpx/DETAILS @@ -1,6 +1,6 @@ SPELL=libvpx - VERSION=1.2.0 - SOURCE_HASH=sha512:364c672f3a8059d3329c4dd674ff72c94bf257ee397015a8e6be9090ad19f76f9b965bb709663f17795098bd379ad60a0d71dd31cc55f0b1d3a1d99b839209b8 + VERSION=1.3.0 + SOURCE_HASH=sha512:af26766a3336155c5bc7b8cce7c23228de054287b990f9cacdc35273384a7af4999c01bb623d12143f40107036308a8b3207081efe67936748503c30c985fd6b SOURCE=$SPELL-v$VERSION.tar.bz2 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-v$VERSION SOURCE_URL[0]=http://webm.googlecode.com/files/$SOURCE diff --git a/video-libs/libvpx/HISTORY b/video-libs/libvpx/HISTORY index b81112c3a3..66a4523455 100644 --- a/video-libs/libvpx/HISTORY +++ b/video-libs/libvpx/HISTORY @@ -1,3 +1,6 @@ +2014-09-08 Ladislav Hagara <hgr@vabo.cz> + * DETAILS: 1.3.0 + 2013-12-01 Javier Vasquez <j.e.vasquez.v@gmail.com> * DETAILS: 1.2.0 * BUILD: more build options diff --git a/video/mplayer/DEPENDS b/video/mplayer/DEPENDS index 1bfd21e3b2..4e70752cb1 100755 --- a/video/mplayer/DEPENDS +++ b/video/mplayer/DEPENDS @@ -22,6 +22,10 @@ fi && optional_depends libvorbis "--disable-tremor-internal --extra-libs=-lvorbisenc" "" "to use external libvorbis to play ogg/vorbis audio" && +if is_depends_enabled $SPELL libvorbis; then + depends libogg +fi && + optional_depends faad2 "--enable-faad" "" "to use shared faad for AAC decoding" && # audio codecs @@ -60,7 +64,13 @@ optional_depends pulseaudio "" "--disable-pulse" "for pulseaudio audio output" optional_depends svgalib "" "--disable-svga" "for svgalib video output" && optional_depends xorg-server "--enable-x11" "--disable-x11" "for X11 output support" && if is_depends_enabled $SPELL xorg-server; then - depends -sub "DPMS" xorg-server + depends -sub "DPMS" xorg-server && + depends libx11 && + depends libxext && + depends libxinerama && + depends libxxf86dga && + depends libxxf86vm && + depends MESALIB fi && optional_depends libxv "--enable-xv" "--disable-xv" "for xv output support" && diff --git a/video/mplayer/HISTORY b/video/mplayer/HISTORY index bf1e83afce..795843bfe9 100644 --- a/video/mplayer/HISTORY +++ b/video/mplayer/HISTORY @@ -1,3 +1,6 @@ +2014-09-25 Remko van der Vossen <wich@sourcemage.org> + * DEPENDS: missing depends + 2014-07-03 Ismael Luceno <ismael@sourcemage.org> * DETAILS: Use get_scm_version diff --git a/video/xbmc/DEPENDS b/video/xbmc/DEPENDS index 8f37d2b7a2..029a2a6902 100755 --- a/video/xbmc/DEPENDS +++ b/video/xbmc/DEPENDS @@ -102,7 +102,7 @@ depends libmpeg2 && depends libass && depends flac && depends wavpack && -depends gawk && +depends AWK && depends gperf && depends nasm && optional_depends cwiid \ diff --git a/video/xbmc/DETAILS b/video/xbmc/DETAILS index 38fcdfbd8f..a425e1ae32 100755 --- a/video/xbmc/DETAILS +++ b/video/xbmc/DETAILS @@ -1,8 +1,8 @@ SPELL=xbmc - VERSION=13.1 + VERSION=13.2 SOURCE="${SPELL}-${VERSION}.tar.gz" SOURCE_URL[0]=http://mirrors.${SPELL}.org/releases/source/${SOURCE} - SOURCE_HASH=sha512:918126a85a8194dd49d5c82a5a56d2006b811ff5fca535e95bcc5ef4ab135c5907d01595c2ceb4accdc69aef5afc621adae249a1fef85425945560a646e970b0 + SOURCE_HASH=sha512:83a514410748b05da4c626caff34fec7b6b26a8bdea9f158e1c75721d3a47d36eb1f97ed4c162f6c2472a97f658e3b5285c1e0b144bfb4f654932586eee4d1c8 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}-Gotham" WEB_SITE="http://xbmc.org" LICENSE[0]=GPL diff --git a/video/xbmc/HISTORY b/video/xbmc/HISTORY index 4be5f5e73f..a64d4e8aca 100644 --- a/video/xbmc/HISTORY +++ b/video/xbmc/HISTORY @@ -1,3 +1,6 @@ +2014-09-14 Pol Vinogradov <vin.public@gmail.com> + * DETAILS: updated to 13.2 + 2014-08-19 Treeve Jelbert <treeve@sourcemage.org> * DEPENDS: openssl => SSL diff --git a/windowmanagers/dvtm/DETAILS b/windowmanagers/dvtm/DETAILS index 3074f4f314..2b12036f72 100755 --- a/windowmanagers/dvtm/DETAILS +++ b/windowmanagers/dvtm/DETAILS @@ -1,8 +1,8 @@ SPELL=dvtm - VERSION=0.5.2 + VERSION=0.12 SOURCE="${SPELL}-${VERSION}.tar.gz" SOURCE_URL[0]=http://brain-dump.org/projects/${SPELL}/${SOURCE} - SOURCE_HASH=sha512:317542759dace7ffe50d10fd47270790fd69142c13582b16731ee1e41e1d7f3a3104b93e37fc7bb33ddbac3a582c5674320893f6c114e6ad88286d2e6f896b5c + SOURCE_HASH=sha512:2a95194c2f5413566c3565e8fc21d5ecf248bd5530f21ab0a29206e83bf2ac30711f9ce820d34a7305ad0ef59717056f0a9b3b80532a5dd9878bf52abbc9e7f2 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}" WEB_SITE="http://brain-dump.org/projects/dvtm/" LICENSE[0]=MIT diff --git a/windowmanagers/dvtm/HISTORY b/windowmanagers/dvtm/HISTORY index 85487cb1ec..af7fd0de1a 100644 --- a/windowmanagers/dvtm/HISTORY +++ b/windowmanagers/dvtm/HISTORY @@ -1,3 +1,6 @@ +2014-09-13 Ismael Luceno <ismael@sourcemage.org> + * DETAILS: updated spell to 0.12 + 2010-03-31 Arjan Bouter <abouter@sourcemage.org> * DETAILS: version 0.5.2 diff --git a/wm-addons/slock/DEPENDS b/wm-addons/slock/DEPENDS new file mode 100755 index 0000000000..7295b07d61 --- /dev/null +++ b/wm-addons/slock/DEPENDS @@ -0,0 +1,2 @@ +depends libx11 && +depends libxext diff --git a/wm-addons/slock/HISTORY b/wm-addons/slock/HISTORY index 2f73fceee2..340ae4f4ff 100644 --- a/wm-addons/slock/HISTORY +++ b/wm-addons/slock/HISTORY @@ -1,3 +1,6 @@ +2014-09-25 Remko van der Vossen <wich@sourcemage.org> + * DEPENDS: libx11, libxext + 2009-08-24 Donald Johnson <ltdonny@gmail.com> * DETAILS: Updated source diff --git a/x11-libs/cairo/DEPENDS b/x11-libs/cairo/DEPENDS index 2aed2de375..fe1b6cf7fc 100755 --- a/x11-libs/cairo/DEPENDS +++ b/x11-libs/cairo/DEPENDS @@ -37,6 +37,7 @@ optional_depends libx11 \ if is_depends_enabled $SPELL libx11; then depends xextproto && + depends libxext && optional_depends libxrender \ "--enable-xlib-xrender" \ "--disable-xlib-xrender" \ diff --git a/x11-libs/cairo/HISTORY b/x11-libs/cairo/HISTORY index 1b4b3800fd..5938739a85 100644 --- a/x11-libs/cairo/HISTORY +++ b/x11-libs/cairo/HISTORY @@ -1,3 +1,6 @@ +2014-09-09 Remko van der Vossen <wich@sourcemage.org> + * DEPENDS: missing libxext + 2014-08-26 Thomas Orgis <sobukus@sourcemage.org> * DEPENDS: xextproto diff --git a/x11-libs/fontconfig/DEPENDS b/x11-libs/fontconfig/DEPENDS index 01deb2c09d..cb81d8edd0 100755 --- a/x11-libs/fontconfig/DEPENDS +++ b/x11-libs/fontconfig/DEPENDS @@ -1,8 +1,12 @@ -depends pkgconfig && -depends freetype2 && depends automake && -depends libtool && depends expat && +depends freetype2 && +depends glib2 && +depends harfbuzz && +depends libpng && +depends libtool && +depends pcre && +depends pkgconfig && optional_depends docbook-utils \ "--enable-docs" \ diff --git a/x11-libs/fontconfig/HISTORY b/x11-libs/fontconfig/HISTORY index 07f7176103..e38f52cd46 100644 --- a/x11-libs/fontconfig/HISTORY +++ b/x11-libs/fontconfig/HISTORY @@ -1,3 +1,6 @@ +2014-09-09 Remko van der Vossen <wich@sourcemage.org> + * DEPENDS: added missing dependencies + 2014-04-17 Vlad Glagolev <stealth@sourcemage.org> * DETAILS: updated spell to 2.11.1 diff --git a/x11-libs/wine/DEPENDS b/x11-libs/wine/DEPENDS index 3b10521405..b4f815e0d0 100755 --- a/x11-libs/wine/DEPENDS +++ b/x11-libs/wine/DEPENDS @@ -1,5 +1,6 @@ depends bison && depends flex && +depends gettext && depends GIFLIB && if [[ $WINE_BRANCH == scm ]]; then @@ -78,6 +79,10 @@ optional_depends libxslt \ '--without-xslt --without-xml' \ 'for a functional Microsoft XML (MSXML) implementation' && +if is_depends_enabled $SPELL libxslt; then + depends libxml2 +fi && + optional_depends MSTTF \ '' \ '' \ diff --git a/x11-libs/wine/DETAILS b/x11-libs/wine/DETAILS index 0e84c0d321..363d721208 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.25 + VERSION=1.7.26 else VERSION=1.6.1 fi diff --git a/x11-libs/wine/HISTORY b/x11-libs/wine/HISTORY index c2f990595b..e1af8aafd8 100644 --- a/x11-libs/wine/HISTORY +++ b/x11-libs/wine/HISTORY @@ -1,3 +1,9 @@ +2014-09-25 Remko van der Vossen <wich@sourcemage.org> + * DEPENDS: gettext, libxml2 + +2014-09-06 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 1.7.26 (devel) + 2014-08-22 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 1.7.25 (devel) diff --git a/x11-toolkits/gtk+2/DEPENDS b/x11-toolkits/gtk+2/DEPENDS index 0495de6873..fd39d0c8ab 100755 --- a/x11-toolkits/gtk+2/DEPENDS +++ b/x11-toolkits/gtk+2/DEPENDS @@ -1,12 +1,25 @@ -depends glib2 -depends gdk-pixbuf2 && depends atk && -depends pango && depends -sub "PDF PS SVG X" cairo && +depends expat && +depends fontconfig && +depends freetype2 && +depends gdk-pixbuf2 && +depends glib2 && +depends harfbuzz && +depends libffi && +depends libpng && +depends libpthread-stubs && depends libsm && +depends libx11 && +depends libxau && +depends libxcb && +depends libxdmcp && depends libxext && depends libxcursor && depends libxrender && +depends pango && +depends pcre && +depends pixman && optional_depends gobject-introspection \ "--enable-introspection=yes" \ diff --git a/x11-toolkits/gtk+2/HISTORY b/x11-toolkits/gtk+2/HISTORY index 4e88a8568c..2d20a25e58 100644 --- a/x11-toolkits/gtk+2/HISTORY +++ b/x11-toolkits/gtk+2/HISTORY @@ -1,3 +1,6 @@ +2014-09-09 Remko van der Vossen <wich@sourcemage.org> + * DEPENDS: added missing dependencies + 2014-07-22 Ladislav Hagara <hgr@vabo.cz> * DETAILS: 2.24.24 diff --git a/x11-toolkits/wxgtk-new/0001-remove-fvisibility-inlines-hidden-from-CXXFLAGS.patch b/x11-toolkits/wxgtk-new/0001-remove-fvisibility-inlines-hidden-from-CXXFLAGS.patch new file mode 100644 index 0000000000..eec9c35692 --- /dev/null +++ b/x11-toolkits/wxgtk-new/0001-remove-fvisibility-inlines-hidden-from-CXXFLAGS.patch @@ -0,0 +1,39 @@ +From 48fc738b16964ddd1fcc057c3558500694f4ac47 Mon Sep 17 00:00:00 2001 +From: Florian Franzmann <siflfran@hawo.net> +Date: Sun, 14 Sep 2014 19:30:04 +0200 +Subject: [PATCH] remove -fvisibility-inlines-hidden from CXXFLAGS + +--- + build/aclocal/visibility.m4 | 2 +- + configure | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/build/aclocal/visibility.m4 b/build/aclocal/visibility.m4 +index 05f9b80..61f2160 100644 +--- a/build/aclocal/visibility.m4 ++++ b/build/aclocal/visibility.m4 +@@ -30,7 +30,7 @@ AC_DEFUN([WX_VISIBILITY], + AC_REQUIRE([AC_PROG_CC]) + if test -n "$GCC"; then + CFLAGS_VISIBILITY="-fvisibility=hidden" +- CXXFLAGS_VISIBILITY="-fvisibility=hidden -fvisibility-inlines-hidden" ++ CXXFLAGS_VISIBILITY="-fvisibility=hidden" + AC_MSG_CHECKING([for symbols visibility support]) + AC_CACHE_VAL(wx_cv_cc_visibility, [ + wx_save_CXXFLAGS="$CXXFLAGS" +diff --git a/configure b/configure +index c7291e2..5275d33 100755 +--- a/configure ++++ b/configure +@@ -28904,7 +28904,7 @@ $as_echo "$wx_cv_version_script" >&6; } + + if test -n "$GCC"; then + CFLAGS_VISIBILITY="-fvisibility=hidden" +- CXXFLAGS_VISIBILITY="-fvisibility=hidden -fvisibility-inlines-hidden" ++ CXXFLAGS_VISIBILITY="-fvisibility=hidden" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for symbols visibility support" >&5 + $as_echo_n "checking for symbols visibility support... " >&6; } + if ${wx_cv_cc_visibility+:} false; then : +-- +2.1.0 + diff --git a/x11-toolkits/wxgtk-new/DETAILS b/x11-toolkits/wxgtk-new/DETAILS index e70c2cacb5..67031e3672 100755 --- a/x11-toolkits/wxgtk-new/DETAILS +++ b/x11-toolkits/wxgtk-new/DETAILS @@ -1,11 +1,11 @@ SPELL=wxgtk-new SPELLX=wxGTK SPELLX=wxWidgets - VERSION=2.9.5 - SOURCE_HASH=sha512:556be3739a503397dea6a6f3c04a0ee7e9724bd3eada86611ac69a32208b32bcd067b885a89a593ae41de070fafcee912000d46029443b91a9540575abd09986 + VERSION=3.0.1 + SOURCE_HASH=sha512:5934442fbb77f50e2cb234ee2218e5f61e4757202b28da53f0b8a28dd499eeefca4cb8375359e42aeca2a93f8b24435ac4299da300303c9d9436bfba0cae6cd5 SOURCE=$SPELLX-$VERSION.tar.bz2 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-${VERSION} - SOURCE_URL[0]=$SOURCEFORGE_URL/wxwindows/$SOURCE + SOURCE_URL[0]=$SOURCEFORGE_URL/wxwindows/${VERSION}/${SOURCE} SOURCE_URL[1]=http://biolpc22.york.ac.uk/pub/${VERSION}/$SOURCE LICENSE[0]=http://www.wxwidgets.org/licence3.txt WEB_SITE=http://www.wxwidgets.org/ diff --git a/x11-toolkits/wxgtk-new/HISTORY b/x11-toolkits/wxgtk-new/HISTORY index f2f6868df4..1a498f0912 100644 --- a/x11-toolkits/wxgtk-new/HISTORY +++ b/x11-toolkits/wxgtk-new/HISTORY @@ -1,3 +1,10 @@ +2014-09-14 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> + * PRE_BUILD, 0001-remove-fvisibility-inlines-hidden-from-CXXFLAGS.patch: + fix linker error triggered in spells using wxgtk-new + +2014-08-29 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> + * DETAILS: version 3.0.1 + 2013-10-03 Ismael Luceno <ismael@sourcemage.org> * DETAILS: updated spell to 2.9.5 diff --git a/x11-toolkits/wxgtk-new/PRE_BUILD b/x11-toolkits/wxgtk-new/PRE_BUILD new file mode 100755 index 0000000000..e8922f96ec --- /dev/null +++ b/x11-toolkits/wxgtk-new/PRE_BUILD @@ -0,0 +1,3 @@ +default_pre_build && +cd ${SOURCE_DIRECTORY} && +patch -p1 < $SPELL_DIRECTORY/0001-remove-fvisibility-inlines-hidden-from-CXXFLAGS.patch diff --git a/xorg-app/appres/DEPENDS b/xorg-app/appres/DEPENDS index 3524174c4b..b5217003c7 100755 --- a/xorg-app/appres/DEPENDS +++ b/xorg-app/appres/DEPENDS @@ -1,4 +1,4 @@ -depends gawk && +depends AWK && depends pkgconfig && depends util-macros && depends libx11 && diff --git a/xorg-app/bdftopcf/DEPENDS b/xorg-app/bdftopcf/DEPENDS index f1e3646a18..f01b26b6d5 100755 --- a/xorg-app/bdftopcf/DEPENDS +++ b/xorg-app/bdftopcf/DEPENDS @@ -1,4 +1,4 @@ -depends gawk && +depends AWK && depends pkgconfig && depends util-macros && depends fontsproto && diff --git a/xorg-app/beforelight/DEPENDS b/xorg-app/beforelight/DEPENDS index 3501c5f0b1..54f3863432 100755 --- a/xorg-app/beforelight/DEPENDS +++ b/xorg-app/beforelight/DEPENDS @@ -1,4 +1,4 @@ -depends gawk && +depends AWK && depends pkgconfig && depends util-macros && depends libx11 && diff --git a/xorg-app/bitmap/DEPENDS b/xorg-app/bitmap/DEPENDS index ea0598c974..ebb4b8fee1 100755 --- a/xorg-app/bitmap/DEPENDS +++ b/xorg-app/bitmap/DEPENDS @@ -1,8 +1,9 @@ -depends gawk && +depends AWK && depends pkgconfig && depends util-macros && depends libx11 && depends libxmu && +depends libxt && depends libxaw && depends xbitmaps && sub_depends libxaw XAW7 diff --git a/xorg-app/bitmap/HISTORY b/xorg-app/bitmap/HISTORY index b817390a5b..92fb61564a 100644 --- a/xorg-app/bitmap/HISTORY +++ b/xorg-app/bitmap/HISTORY @@ -1,3 +1,6 @@ +2014-09-09 Remko van der Vossen <wich@sourcemage.org> + * DEPENDS: added missing depends libxt + 2010-10-26 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 1.0.5 diff --git a/xorg-app/editres/DEPENDS b/xorg-app/editres/DEPENDS index 0ccab0a854..d62128e6b6 100755 --- a/xorg-app/editres/DEPENDS +++ b/xorg-app/editres/DEPENDS @@ -1,4 +1,4 @@ -depends gawk && +depends AWK && depends pkgconfig && depends util-macros && depends -sub XAW7 libxaw && diff --git a/xorg-app/x11perf/DEPENDS b/xorg-app/x11perf/DEPENDS index 499be0ca49..d99f641d5f 100755 --- a/xorg-app/x11perf/DEPENDS +++ b/xorg-app/x11perf/DEPENDS @@ -1,3 +1,6 @@ -depends util-macros && depends libx11 && -depends libxmu +depends libxext && +depends libxft && +depends libxmu && +depends libxrender && +depends util-macros diff --git a/xorg-app/x11perf/HISTORY b/xorg-app/x11perf/HISTORY index 4658f3b977..1e0e92d7ce 100644 --- a/xorg-app/x11perf/HISTORY +++ b/xorg-app/x11perf/HISTORY @@ -1,3 +1,6 @@ +2014-09-25 Remko van der Vossen <wich@sourcemage.org> + * DEPENDS: missing depends + 2011-03-04 Eric Sandall <sandalle@sourcemage.org> * DETAILS: Updated to 1.5.3 SOURCE matches upstream posted SHA1 diff --git a/xorg-app/xdm/DEPENDS b/xorg-app/xdm/DEPENDS index 4e79dffb47..2fbe879f83 100755 --- a/xorg-app/xdm/DEPENDS +++ b/xorg-app/xdm/DEPENDS @@ -1,9 +1,16 @@ -depends libxau && -depends libxaw && -depends libxdmcp && -depends libxt && -depends util-macros && -depends xproto && +depends libice && +depends libpthread-stubs && +depends libsm && +depends libx11 && +depends libxau && +depends libxaw && +depends libxcb && +depends libxdmcp && +depends libxext && +depends libxmu && +depends libxt && +depends util-macros && +depends xproto && optional_depends libxft \ '--with-xft' \ diff --git a/xorg-app/xdm/HISTORY b/xorg-app/xdm/HISTORY index 948a85c541..2c83350e1c 100644 --- a/xorg-app/xdm/HISTORY +++ b/xorg-app/xdm/HISTORY @@ -1,3 +1,6 @@ +2014-09-25 Remko van der Vossen <wich@sourcemage.org> + * DEPENDS: added missing dependencies + 2013-03-15 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> * DETAILS: version 1.1.11 * PRE_BUILD, 0001-use-X-s-default-authentication-mechanism-instead-of-.patch: diff --git a/xorg-app/xfontsel/DEPENDS b/xorg-app/xfontsel/DEPENDS index 340ffefbd5..f001b21d9a 100755 --- a/xorg-app/xfontsel/DEPENDS +++ b/xorg-app/xfontsel/DEPENDS @@ -1,2 +1,5 @@ -depends util-macros && -depends -sub XAW7 libxaw +depends libx11 && +depends -sub XAW7 libxaw && +depends libxmu && +depends libxt && +depends util-macros diff --git a/xorg-app/xfontsel/HISTORY b/xorg-app/xfontsel/HISTORY index a88071f2e2..6d0e657d80 100644 --- a/xorg-app/xfontsel/HISTORY +++ b/xorg-app/xfontsel/HISTORY @@ -1,3 +1,6 @@ +2014-09-25 Remko van der Vossen <wich@sourcemage.org> + * DEPENDS: added missing dependencies + 2012-12-24 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> * DETAILS: version 1.0.4 diff --git a/xorg-data/xbitmaps/DEPENDS b/xorg-data/xbitmaps/DEPENDS index 1b65df7f01..11ee0d0b5a 100755 --- a/xorg-data/xbitmaps/DEPENDS +++ b/xorg-data/xbitmaps/DEPENDS @@ -1,2 +1,2 @@ -depends gawk && +depends AWK && depends util-macros diff --git a/xorg-driver/xf86-video-ati/DEPENDS b/xorg-driver/xf86-video-ati/DEPENDS index 787192fb80..8fd983a350 100755 --- a/xorg-driver/xf86-video-ati/DEPENDS +++ b/xorg-driver/xf86-video-ati/DEPENDS @@ -1,8 +1,17 @@ depends -sub "RADEON" libdrm && +depends libpciaccess && +depends libpthread-stubs && +depends pixman && depends util-macros && depends xineramaproto && +depends xorg-server && depends xproto && +optional_depends MESALIB \ + "--enable-dri" \ + "--disable-dri" \ + "Do you want dri support" && + if [[ $XF86_VIDEO_ATI_BRANCH == scm ]]; then depends git fi && @@ -14,3 +23,8 @@ optional_depends UDEV \ '--enable-udev' \ '--disable-udev' \ 'for libudev hardware detection' +======= +if is_depends_enabled $SPELL mesalib ; then + sub_depends mesalib DRI +fi +>>>>>>> origin/master diff --git a/xorg-driver/xf86-video-ati/HISTORY b/xorg-driver/xf86-video-ati/HISTORY index 3b1a3e4b25..393485ae44 100644 --- a/xorg-driver/xf86-video-ati/HISTORY +++ b/xorg-driver/xf86-video-ati/HISTORY @@ -1,3 +1,6 @@ +2014-09-25 Remko van der Vossen <wich@sourcemage.org> + * DEPENDS: added missing dependencies + 2014-07-17 Treeve Jelbert <treeve@sourcemage.org> * DEPENDS: glamor now comes from xorg-server diff --git a/xorg-extras/xterm/DEPENDS b/xorg-extras/xterm/DEPENDS index 4697753bd0..8db8ac0f61 100755 --- a/xorg-extras/xterm/DEPENDS +++ b/xorg-extras/xterm/DEPENDS @@ -1,11 +1,11 @@ depends fontconfig && -depends freetype2 && depends libice && depends libsm && depends libx11 "--with-x" && depends libxaw && depends libxext && depends libxft && +depends libxpm && depends libxmu && depends libxrender && depends libxt && diff --git a/xorg-extras/xterm/HISTORY b/xorg-extras/xterm/HISTORY index 1fb8e4cef6..a4de6598de 100644 --- a/xorg-extras/xterm/HISTORY +++ b/xorg-extras/xterm/HISTORY @@ -1,3 +1,7 @@ +2014-09-25 Remko van der Vossen <wich@sourcemage.org> + * DEPENDS: freetype2 was both hard and optional dep + depends libxpm + 2012-12-24 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> * DETAILS: version 287 diff --git a/xorg-lib/libdmx/DEPENDS b/xorg-lib/libdmx/DEPENDS index 85b09a9501..d337b56933 100755 --- a/xorg-lib/libdmx/DEPENDS +++ b/xorg-lib/libdmx/DEPENDS @@ -1,4 +1,4 @@ -depends gawk && +depends AWK && depends pkgconfig && depends libtool && depends util-macros && diff --git a/xorg-lib/libfontenc/DEPENDS b/xorg-lib/libfontenc/DEPENDS index 60d5bc34d0..166e91da98 100755 --- a/xorg-lib/libfontenc/DEPENDS +++ b/xorg-lib/libfontenc/DEPENDS @@ -1,4 +1,4 @@ -depends gawk && +depends AWK && depends -sub CXX gcc && depends pkgconfig && depends libtool && diff --git a/xorg-lib/libfs/DEPENDS b/xorg-lib/libfs/DEPENDS index 07bb9207bc..99bd2493cb 100755 --- a/xorg-lib/libfs/DEPENDS +++ b/xorg-lib/libfs/DEPENDS @@ -1,4 +1,4 @@ -depends gawk && +depends AWK && depends pkgconfig && depends libtool && depends zlib && diff --git a/xorg-lib/libice/DEPENDS b/xorg-lib/libice/DEPENDS index 71bc1f2208..c1fe4d3ebf 100755 --- a/xorg-lib/libice/DEPENDS +++ b/xorg-lib/libice/DEPENDS @@ -1,4 +1,4 @@ -depends gawk && +depends AWK && depends -sub CXX gcc && depends pkgconfig && depends libtool && diff --git a/xorg-lib/liblbxutil/DEPENDS b/xorg-lib/liblbxutil/DEPENDS index a4357eaa9c..d37f383246 100755 --- a/xorg-lib/liblbxutil/DEPENDS +++ b/xorg-lib/liblbxutil/DEPENDS @@ -1,4 +1,4 @@ -depends gawk && +depends AWK && depends -sub CXX gcc && depends pkgconfig && depends libtool && diff --git a/xorg-lib/liboldx/DEPENDS b/xorg-lib/liboldx/DEPENDS index 1b77961abf..85c3c2bbc7 100755 --- a/xorg-lib/liboldx/DEPENDS +++ b/xorg-lib/liboldx/DEPENDS @@ -1,4 +1,4 @@ -depends gawk && +depends AWK && depends pkgconfig && depends libtool && depends util-macros && diff --git a/xorg-lib/libsm/DEPENDS b/xorg-lib/libsm/DEPENDS index cadaee5e96..1ea1843361 100755 --- a/xorg-lib/libsm/DEPENDS +++ b/xorg-lib/libsm/DEPENDS @@ -1,4 +1,4 @@ -depends gawk && +depends AWK && depends pkgconfig && depends libtool && depends util-macros && diff --git a/xorg-lib/libx11/DEPENDS b/xorg-lib/libx11/DEPENDS index b417f127da..d266fd5294 100755 --- a/xorg-lib/libx11/DEPENDS +++ b/xorg-lib/libx11/DEPENDS @@ -1,5 +1,5 @@ depends util-macros && -depends gawk && +depends AWK && depends libtool && depends pkgconfig && depends bigreqsproto && @@ -12,6 +12,7 @@ depends inputproto && depends libxau && depends libxdmcp && depends libxcb && +depends libpthread-stubs && optional_depends groff '--enable-specs' '--disable-specs' 'specification docs' && diff --git a/xorg-lib/libx11/HISTORY b/xorg-lib/libx11/HISTORY index 40f58f398f..418e184be5 100644 --- a/xorg-lib/libx11/HISTORY +++ b/xorg-lib/libx11/HISTORY @@ -1,3 +1,6 @@ +2014-09-09 Remko van der Vossen <wich@sourcemage.org> + * DEPENDS: libpthread-stubs + 2013-11-22 Ismael Luceno <ismael@sourcemage.org> * CONFIGURE: Disable i18n option, breaks XIM + UTF-8 diff --git a/xorg-lib/libxau/DEPENDS b/xorg-lib/libxau/DEPENDS index 92e125167d..051ce2532b 100755 --- a/xorg-lib/libxau/DEPENDS +++ b/xorg-lib/libxau/DEPENDS @@ -1,4 +1,4 @@ -depends gawk && +depends AWK && depends -sub CXX gcc && depends libtool && depends pkgconfig && diff --git a/xorg-lib/libxaw/DEPENDS b/xorg-lib/libxaw/DEPENDS index 6b4a520223..b406853600 100755 --- a/xorg-lib/libxaw/DEPENDS +++ b/xorg-lib/libxaw/DEPENDS @@ -1,16 +1,22 @@ -depends gawk && -depends pkgconfig && -depends libtool && -depends util-macros && +depends AWK && +depends pkgconfig && +depends libtool && +depends util-macros && if list_find "$LIBXAW_OPTS" "--enable-xaw6" || list_find "$LIBXAW_OPTS" "--enable-xaw7"; then - depends xproto && - depends libx11 && - depends libxext && - depends libxt && - depends libxmu && - depends xextproto + depends libice && + depends libpthread-stubs && + depends libsm && + depends libx11 && + depends libxau && + depends libxcb && + depends libxdmcp && + depends libxext && + depends libxmu && + depends libxt && + depends xextproto && + depends xproto fi && if list_find "$LIBXAW_OPTS" "--enable-xaw7"; then diff --git a/xorg-lib/libxaw/HISTORY b/xorg-lib/libxaw/HISTORY index b72dd98c10..eaa4e0e644 100644 --- a/xorg-lib/libxaw/HISTORY +++ b/xorg-lib/libxaw/HISTORY @@ -1,3 +1,6 @@ +2014-09-09 Remko van der Vossen <wich@sourcemage.org> + * DEPENDS: added missing X11 dependencies + 2012-03-23 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 1.0.10 diff --git a/xorg-lib/libxcb/DEPENDS b/xorg-lib/libxcb/DEPENDS index 472bb15772..387b120ff4 100755 --- a/xorg-lib/libxcb/DEPENDS +++ b/xorg-lib/libxcb/DEPENDS @@ -1,17 +1,18 @@ -depends xcb-proto && -local xcb_version=$(installed_version xcb-proto) && -if [[ $xcb_version == 1.2 ]] || [[ $xcb_version == 1.0 || $xcb_version == 0.9.93 ]]; then - force_depends xcb-proto -fi && -depends libpthread-stubs && -depends automake && depends autoconf && +depends automake && depends pkgconfig && +depends libpthread-stubs && depends libtool && -depends libxslt && depends libxau && +depends libxdmcp && +depends libxslt && depends util-macros && depends PYTHON && +depends xcb-proto && +local xcb_version=$(installed_version xcb-proto) && +if [[ $xcb_version == 1.2 ]] || [[ $xcb_version == 1.0 || $xcb_version == 0.9.93 ]]; then + force_depends xcb-proto +fi && optional_depends doxygen \ '' \ diff --git a/xorg-lib/libxcb/HISTORY b/xorg-lib/libxcb/HISTORY index ce772a9829..ceb6258bf8 100644 --- a/xorg-lib/libxcb/HISTORY +++ b/xorg-lib/libxcb/HISTORY @@ -1,3 +1,6 @@ +2014-09-09 Remko van der Vossen <wich@sourcemage.org> + * DEPENDS: libxdmcp + 2014-08-04 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 1.11 diff --git a/xorg-lib/libxcomposite/DEPENDS b/xorg-lib/libxcomposite/DEPENDS index 85cb938246..2d3c83ec2d 100755 --- a/xorg-lib/libxcomposite/DEPENDS +++ b/xorg-lib/libxcomposite/DEPENDS @@ -1,9 +1,13 @@ -depends gawk && -depends pkgconfig && -depends libtool && -depends util-macros && -depends compositeproto && -depends fixesproto && -depends libx11 && -depends libxfixes && -depends libxext +depends AWK && +depends compositeproto && +depends fixesproto && +depends pkgconfig && +depends libtool && +depends libpthread-stubs && +depends libxau && +depends libx11 && +depends libxcb && +depends libxdmcp && +depends libxfixes && +depends libxext && +depends util-macros diff --git a/xorg-lib/libxcomposite/HISTORY b/xorg-lib/libxcomposite/HISTORY index b4debd7c19..fa33ae23fe 100644 --- a/xorg-lib/libxcomposite/HISTORY +++ b/xorg-lib/libxcomposite/HISTORY @@ -1,4 +1,7 @@ -2013-01-03 Treeve Jelbert <treeve@sourcemage.org> +2014-09-25 Remko van der Vossen <wich@sourcemage.org> + * DEPENDS: missing dependencies + + 2013-01-03 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 0.4.4 2010-10-28 Treeve Jelbert <treeve@sourcemage.org> diff --git a/xorg-lib/libxcursor/DEPENDS b/xorg-lib/libxcursor/DEPENDS index f616b85162..dfa5fc6c0a 100755 --- a/xorg-lib/libxcursor/DEPENDS +++ b/xorg-lib/libxcursor/DEPENDS @@ -1,8 +1,12 @@ -depends gawk && -depends pkgconfig && -depends libtool && -depends util-macros && -depends fixesproto && -depends libxrender && -depends libxfixes && -depends libx11 +depends AWK && +depends fixesproto && +depends pkgconfig && +depends libpthread-stubs && +depends libtool && +depends libx11 && +depends libxau && +depends libxcb && +depends libxdmcp && +depends libxfixes && +depends libxrender && +depends util-macros diff --git a/xorg-lib/libxcursor/HISTORY b/xorg-lib/libxcursor/HISTORY index f964326cf4..a6ee7948b8 100644 --- a/xorg-lib/libxcursor/HISTORY +++ b/xorg-lib/libxcursor/HISTORY @@ -1,3 +1,6 @@ +2014-09-25 Remko van der Vossen <wich@sourcemage.org> + * DEPENDS: missing dependencies + 2013-05-30 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 1.1.14 SECURITY_PATCH=1 fixes CVE-2013-2003 diff --git a/xorg-lib/libxdamage/DEPENDS b/xorg-lib/libxdamage/DEPENDS index 080339ecaf..e9c3e2ba7c 100755 --- a/xorg-lib/libxdamage/DEPENDS +++ b/xorg-lib/libxdamage/DEPENDS @@ -1,9 +1,13 @@ -depends gawk && -depends pkgconfig && -depends libtool && -depends util-macros && -depends damageproto && -depends fixesproto && -depends xextproto && -depends libx11 && -depends libxfixes +depends AWK && +depends damageproto && +depends fixesproto && +depends pkgconfig && +depends libpthread-stubs && +depends libtool && +depends libx11 && +depends libxau && +depends libxcb && +depends libxdmcp && +depends libxfixes && +depends util-macros && +depends xextproto diff --git a/xorg-lib/libxdamage/HISTORY b/xorg-lib/libxdamage/HISTORY index 2185000300..4967b7dc88 100644 --- a/xorg-lib/libxdamage/HISTORY +++ b/xorg-lib/libxdamage/HISTORY @@ -1,3 +1,6 @@ +2014-09-25 Remko van der Vossen <wich@sourcemage.org> + * DEPENDS: missing dependencies + 2013-01-03 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 1.1.4 diff --git a/xorg-lib/libxdmcp/DEPENDS b/xorg-lib/libxdmcp/DEPENDS index 92e125167d..051ce2532b 100755 --- a/xorg-lib/libxdmcp/DEPENDS +++ b/xorg-lib/libxdmcp/DEPENDS @@ -1,4 +1,4 @@ -depends gawk && +depends AWK && depends -sub CXX gcc && depends libtool && depends pkgconfig && diff --git a/xorg-lib/libxevie/DEPENDS b/xorg-lib/libxevie/DEPENDS index 69104d656b..e4fba76d03 100755 --- a/xorg-lib/libxevie/DEPENDS +++ b/xorg-lib/libxevie/DEPENDS @@ -1,4 +1,4 @@ -depends gawk && +depends AWK && depends pkgconfig && depends libtool && depends util-macros && diff --git a/xorg-lib/libxext/DEPENDS b/xorg-lib/libxext/DEPENDS index 285f73e6be..7f534f6c85 100755 --- a/xorg-lib/libxext/DEPENDS +++ b/xorg-lib/libxext/DEPENDS @@ -1,8 +1,11 @@ -depends gawk && -depends pkgconfig && -depends libtool && -depends util-macros && -depends xproto && -depends libx11 && -depends xextproto && -depends libxau +depends AWK && +depends pkgconfig && +depends libpthread-stubs && +depends libtool && +depends libx11 && +depends libxau && +depends libxcb && +depends libxdmcp && +depends util-macros && +depends xextproto && +depends xproto diff --git a/xorg-lib/libxext/HISTORY b/xorg-lib/libxext/HISTORY index a356265583..ddd5ec2818 100644 --- a/xorg-lib/libxext/HISTORY +++ b/xorg-lib/libxext/HISTORY @@ -1,3 +1,6 @@ +2014-09-09 Remko van der Vossen <wich@sourcemage.org> + * DEPENDS: libpthread-stubs, libxcb, libxdmcp + 2014-07-24 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 1.3.3 diff --git a/xorg-lib/libxfixes/DEPENDS b/xorg-lib/libxfixes/DEPENDS index ae88176053..2784933a8d 100755 --- a/xorg-lib/libxfixes/DEPENDS +++ b/xorg-lib/libxfixes/DEPENDS @@ -1,8 +1,12 @@ -depends gawk && -depends pkgconfig && -depends libtool && -depends util-macros && -depends xproto && -depends fixesproto && -depends xextproto && -depends libx11 +depends AWK && +depends fixesproto && +depends pkgconfig && +depends libpthread-stubs && +depends libtool && +depends libx11 && +depends libxau && +depends libxcb && +depends libxdmcp && +depends xextproto && +depends xproto && +depends util-macros diff --git a/xorg-lib/libxfixes/HISTORY b/xorg-lib/libxfixes/HISTORY index e341675246..9faa3c0409 100644 --- a/xorg-lib/libxfixes/HISTORY +++ b/xorg-lib/libxfixes/HISTORY @@ -1,3 +1,6 @@ +2014-09-25 Remko van der Vossen <wich@sourcemage.org> + * DEPENDS: missing dependencies + 203-05-29 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 5.0.1 SECURITY_PATCH=1 , fixes CVE-2013-1983 diff --git a/xorg-lib/libxfont/DEPENDS b/xorg-lib/libxfont/DEPENDS index da6a078407..35a6e6946d 100755 --- a/xorg-lib/libxfont/DEPENDS +++ b/xorg-lib/libxfont/DEPENDS @@ -1,4 +1,4 @@ -depends gawk && +depends AWK && depends pkgconfig && depends libtool && depends zlib && diff --git a/xorg-lib/libxfontcache/DEPENDS b/xorg-lib/libxfontcache/DEPENDS index d08ae417f7..25c8f8de75 100755 --- a/xorg-lib/libxfontcache/DEPENDS +++ b/xorg-lib/libxfontcache/DEPENDS @@ -1,4 +1,4 @@ -depends gawk && +depends AWK && depends pkgconfig && depends libtool && depends util-macros && diff --git a/xorg-lib/libxft/DEPENDS b/xorg-lib/libxft/DEPENDS index 56307a303c..046ddb5a44 100755 --- a/xorg-lib/libxft/DEPENDS +++ b/xorg-lib/libxft/DEPENDS @@ -1,8 +1,18 @@ -depends gawk && -depends pkgconfig && -depends libtool && -depends zlib && -depends freetype2 && -depends fontconfig && -depends util-macros && -depends libxrender +depends AWK && +depends expat && +depends freetype2 && +depends fontconfig && +depends glib2 && +depends harfbuzz && +depends libpng && +depends libpthread-stubs && +depends libtool && +depends libx11 && +depends libxau && +depends libxcb && +depends libxdmcp && +depends libxrender && +depends pcre && +depends pkgconfig && +depends util-macros && +depends zlib diff --git a/xorg-lib/libxft/HISTORY b/xorg-lib/libxft/HISTORY index 6431521e15..0f6e8fcd6e 100644 --- a/xorg-lib/libxft/HISTORY +++ b/xorg-lib/libxft/HISTORY @@ -1,3 +1,6 @@ +2014-09-25 Remko van der Vossen <wich@sourcemage.org> + * DEPENDS: missing depends + 2014-06-06 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 2.3.2 * PRE_BUILD, 0001-fix-freetype-include-path.patch: deleted diff --git a/xorg-lib/libxi/DEPENDS b/xorg-lib/libxi/DEPENDS index 8ee9e845da..95e7a26f11 100755 --- a/xorg-lib/libxi/DEPENDS +++ b/xorg-lib/libxi/DEPENDS @@ -1,9 +1,13 @@ -depends gawk && -depends pkgconfig && -depends libtool && -depends util-macros && -depends xproto && -depends xextproto && -depends inputproto && -depends libx11 && -depends libxext +depends AWK && +depends inputproto && +depends libpthread-stubs && +depends libtool && +depends libx11 && +depends libxau && +depends libxcb && +depends libxdmcp && +depends libxext && +depends pkgconfig && +depends util-macros && +depends xextproto && +depends xproto diff --git a/xorg-lib/libxi/HISTORY b/xorg-lib/libxi/HISTORY index 5577041cbd..bbcb95da94 100644 --- a/xorg-lib/libxi/HISTORY +++ b/xorg-lib/libxi/HISTORY @@ -1,3 +1,6 @@ +2014-09-25 Remko van der Vossen <wich@sourcemage.org> + * DEPENDS: missing dependencies + 2014-07-18 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 1.7.4 diff --git a/xorg-lib/libxinerama/DEPENDS b/xorg-lib/libxinerama/DEPENDS index c94e332469..6a31abd5f6 100755 --- a/xorg-lib/libxinerama/DEPENDS +++ b/xorg-lib/libxinerama/DEPENDS @@ -1,8 +1,12 @@ -depends gawk && -depends pkgconfig && -depends libtool && -depends util-macros && -depends xextproto && -depends xineramaproto && -depends libx11 && -depends libxext +depends AWK && +depends libpthread-stubs && +depends libtool && +depends libx11 && +depends libxau && +depends libxcb && +depends libxdmcp && +depends libxext && +depends pkgconfig && +depends util-macros && +depends xextproto && +depends xineramaproto diff --git a/xorg-lib/libxinerama/HISTORY b/xorg-lib/libxinerama/HISTORY index a1abe99808..da7f68e3b1 100644 --- a/xorg-lib/libxinerama/HISTORY +++ b/xorg-lib/libxinerama/HISTORY @@ -1,3 +1,6 @@ +2014-09-25 Remko van der Vossen <wich@sourcemage.org> + * DEPENDS: missing depends + 2013-05-31 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 1.1.3 SECURITY_PATCH=1 fixes CVE-2013-1985 diff --git a/xorg-lib/libxkbfile/DEPENDS b/xorg-lib/libxkbfile/DEPENDS index afb3605a7c..82db2bb74c 100755 --- a/xorg-lib/libxkbfile/DEPENDS +++ b/xorg-lib/libxkbfile/DEPENDS @@ -1,8 +1,12 @@ -depends gawk && -depends pkgconfig && -depends libtool && -depends util-macros && -depends kbproto && -depends xextproto && -depends xproto && -depends libx11 +depends AWK && +depends kbproto && +depends libpthread-stubs && +depends libtool && +depends libx11 && +depends libxau && +depends libxcb && +depends libxdmcp && +depends pkgconfig && +depends util-macros && +depends xextproto && +depends xproto diff --git a/xorg-lib/libxkbfile/HISTORY b/xorg-lib/libxkbfile/HISTORY index b1b2b651a9..9a7355436e 100644 --- a/xorg-lib/libxkbfile/HISTORY +++ b/xorg-lib/libxkbfile/HISTORY @@ -1,3 +1,6 @@ +2014-09-25 Remko van der Vossen <wich@sourcemage.org> + * DEPENDS: missing depends + 2012-03-17 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 1.0.8 diff --git a/xorg-lib/libxkbui/DEPENDS b/xorg-lib/libxkbui/DEPENDS index 1a31818d7f..deeeb0eec3 100755 --- a/xorg-lib/libxkbui/DEPENDS +++ b/xorg-lib/libxkbui/DEPENDS @@ -1,4 +1,4 @@ -depends gawk && +depends AWK && depends pkgconfig && depends libtool && depends util-macros && diff --git a/xorg-lib/libxmu/DEPENDS b/xorg-lib/libxmu/DEPENDS index 258c441504..619870835e 100755 --- a/xorg-lib/libxmu/DEPENDS +++ b/xorg-lib/libxmu/DEPENDS @@ -1,7 +1,13 @@ -depends gawk && -depends pkgconfig && -depends libtool && -depends util-macros && -depends libx11 && -depends libxt && -depends libxext +depends AWK && +depends libice && +depends libpthread-stubs && +depends libsm && +depends libtool && +depends libx11 && +depends libxau && +depends libxcb && +depends libxdmcp && +depends libxt && +depends libxext && +depends pkgconfig && +depends util-macros diff --git a/xorg-lib/libxmu/HISTORY b/xorg-lib/libxmu/HISTORY index a4343abdb7..584eed3dcc 100644 --- a/xorg-lib/libxmu/HISTORY +++ b/xorg-lib/libxmu/HISTORY @@ -1,3 +1,6 @@ +2014-09-09 Remko van der Vossen <wich@sourcemage.org> + * DEPENDS: added missing dependencies + 2013-09-08 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 1.1.2 diff --git a/xorg-lib/libxp/DEPENDS b/xorg-lib/libxp/DEPENDS index 155adb2c7e..d8fd489589 100755 --- a/xorg-lib/libxp/DEPENDS +++ b/xorg-lib/libxp/DEPENDS @@ -1,4 +1,4 @@ -depends gawk && +depends AWK && depends pkgconfig && depends libtool && depends util-macros && diff --git a/xorg-lib/libxpm/DEPENDS b/xorg-lib/libxpm/DEPENDS index e09baa0150..094d360d61 100755 --- a/xorg-lib/libxpm/DEPENDS +++ b/xorg-lib/libxpm/DEPENDS @@ -1,8 +1,12 @@ -depends gawk && -depends pkgconfig && -depends libtool && -depends util-macros && -depends libxt && -depends libxext && -depends xproto && -depends libx11 +depends AWK && +depends libpthread-stubs && +depends libtool && +depends libx11 && +depends libxau && +depends libxcb && +depends libxdmcp && +depends libxext && +depends libxt && +depends pkgconfig && +depends util-macros && +depends xproto diff --git a/xorg-lib/libxpm/HISTORY b/xorg-lib/libxpm/HISTORY index f4029d6bd5..ab9bc19785 100644 --- a/xorg-lib/libxpm/HISTORY +++ b/xorg-lib/libxpm/HISTORY @@ -1,3 +1,6 @@ +2014-09-25 Remko van der Vossen <wich@souremage.org> + * DEPENDS: missing depends + 2013-09-08 Treeve Jelbert <treeve@souremage.org> * DETAILS: version 3.5.11 diff --git a/xorg-lib/libxrandr/DEPENDS b/xorg-lib/libxrandr/DEPENDS index 63e7059c09..1ebefe23c6 100755 --- a/xorg-lib/libxrandr/DEPENDS +++ b/xorg-lib/libxrandr/DEPENDS @@ -1,9 +1,13 @@ -depends gawk && -depends pkgconfig && -depends libtool && -depends util-macros && -depends randrproto && -depends renderproto && -depends libx11 && -depends libxext && -depends libxrender +depends AWK && +depends libpthread-stubs && +depends libtool && +depends libx11 && +depends libxau && +depends libxcb && +depends libxdmcp && +depends libxext && +depends libxrender && +depends pkgconfig && +depends randrproto && +depends renderproto && +depends util-macros diff --git a/xorg-lib/libxrandr/HISTORY b/xorg-lib/libxrandr/HISTORY index 496dd167b4..19f706b12f 100644 --- a/xorg-lib/libxrandr/HISTORY +++ b/xorg-lib/libxrandr/HISTORY @@ -1,3 +1,6 @@ +2014-09-25 Remko van der Vossen <wich@sourcemage.org> + * DEPENDS: missing depends + 2013-09-08 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: 1.4.2 diff --git a/xorg-lib/libxrender/DEPENDS b/xorg-lib/libxrender/DEPENDS index 66a9ae2765..44c02d4c69 100755 --- a/xorg-lib/libxrender/DEPENDS +++ b/xorg-lib/libxrender/DEPENDS @@ -1,6 +1,10 @@ -depends gawk && -depends pkgconfig && -depends libtool && -depends util-macros && -depends renderproto && -depends libx11 +depends AWK && +depends pkgconfig && +depends libpthread-stubs && +depends libtool && +depends libx11 && +depends libxau && +depends libxcb && +depends libxdmcp && +depends renderproto && +depends util-macros diff --git a/xorg-lib/libxrender/HISTORY b/xorg-lib/libxrender/HISTORY index d5b7192594..8a49db8eb6 100644 --- a/xorg-lib/libxrender/HISTORY +++ b/xorg-lib/libxrender/HISTORY @@ -1,3 +1,6 @@ +2014-09-09 Remko van der Vossen <wich@sourcemage.org> + * DEPENDS: added missing dependencies + 2013-06-14 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 0.9.8 SECURITY_PATCH=1 fixes CVE-2013-1987 diff --git a/xorg-lib/libxres/DEPENDS b/xorg-lib/libxres/DEPENDS index 170a7f6ec2..288b5d0d0f 100755 --- a/xorg-lib/libxres/DEPENDS +++ b/xorg-lib/libxres/DEPENDS @@ -1,7 +1,11 @@ -depends gawk && -depends pkgconfig && -depends libtool && -depends util-macros && -depends resourceproto && -depends libx11 && -depends libxext +depends AWK && +depends libpthread-stubs && +depends libtool && +depends libx11 && +depends libxau && +depends libxcb && +depends libxdmcp && +depends libxext && +depends pkgconfig && +depends resourceproto && +depends util-macros diff --git a/xorg-lib/libxres/HISTORY b/xorg-lib/libxres/HISTORY index cc70efa91c..f08515c4cc 100644 --- a/xorg-lib/libxres/HISTORY +++ b/xorg-lib/libxres/HISTORY @@ -1,3 +1,6 @@ +2014-09-25 Remko van der Vossen <wich@sourcemage.org> + * DEPENDS: missing depends + 2013-05-31 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 1.0.7 SECURITY_PATCH=1 fixes CVE-2013-1988 diff --git a/xorg-lib/libxscrnsaver/DEPENDS b/xorg-lib/libxscrnsaver/DEPENDS index f2e9e2313e..05fe127679 100755 --- a/xorg-lib/libxscrnsaver/DEPENDS +++ b/xorg-lib/libxscrnsaver/DEPENDS @@ -1,4 +1,4 @@ -depends gawk && +depends AWK && depends pkgconfig && depends libtool && depends util-macros && diff --git a/xorg-lib/libxt/DEPENDS b/xorg-lib/libxt/DEPENDS index be88b7b267..08bedfd8c5 100755 --- a/xorg-lib/libxt/DEPENDS +++ b/xorg-lib/libxt/DEPENDS @@ -1,4 +1,4 @@ -depends gawk && +depends AWK && depends pkgconfig && depends libtool && depends util-macros && diff --git a/xorg-lib/libxtrap/DEPENDS b/xorg-lib/libxtrap/DEPENDS index c94d8582f7..5383751376 100755 --- a/xorg-lib/libxtrap/DEPENDS +++ b/xorg-lib/libxtrap/DEPENDS @@ -1,4 +1,4 @@ -depends gawk && +depends AWK && depends pkgconfig && depends libtool && depends util-macros && diff --git a/xorg-lib/libxtst/DEPENDS b/xorg-lib/libxtst/DEPENDS index b6a3d737cc..717af53231 100755 --- a/xorg-lib/libxtst/DEPENDS +++ b/xorg-lib/libxtst/DEPENDS @@ -1,10 +1,14 @@ -depends gawk && -depends pkgconfig && -depends libtool && -depends util-macros && -depends recordproto && -depends xextproto && -depends inputproto && -depends libx11 && -depends libxext && -depends libxi +depends AWK && +depends inputproto && +depends libpthread-stubs && +depends libtool && +depends libx11 && +depends libxau && +depends libxcb && +depends libxdmcp && +depends libxext && +depends libxi && +depends pkgconfig && +depends recordproto && +depends util-macros && +depends xextproto diff --git a/xorg-lib/libxtst/HISTORY b/xorg-lib/libxtst/HISTORY index 2129c8da2f..7c74848d25 100644 --- a/xorg-lib/libxtst/HISTORY +++ b/xorg-lib/libxtst/HISTORY @@ -1,3 +1,6 @@ +2014-09-25 Remko van der Vossen <wich@sourcemage.org> + * DEPENDS: missing depends + 2013-05-31 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 1.2.2 SECURITY_PATCH=1 fixes CVE-2013-2063 diff --git a/xorg-lib/libxv/DEPENDS b/xorg-lib/libxv/DEPENDS index 495c98ff36..95e4570754 100755 --- a/xorg-lib/libxv/DEPENDS +++ b/xorg-lib/libxv/DEPENDS @@ -1,8 +1,12 @@ -depends gawk && -depends pkgconfig && -depends libtool && -depends util-macros && -depends xextproto && -depends videoproto && -depends libx11 && -depends libxext +depends AWK && +depends libpthread-stubs && +depends libtool && +depends libx11 && +depends libxau && +depends libxcb && +depends libxdmcp && +depends libxext && +depends pkgconfig && +depends util-macros && +depends videoproto && +depends xextproto diff --git a/xorg-lib/libxv/HISTORY b/xorg-lib/libxv/HISTORY index 2f39930dc1..b19de41e07 100644 --- a/xorg-lib/libxv/HISTORY +++ b/xorg-lib/libxv/HISTORY @@ -1,3 +1,6 @@ +2014-09-25 Remko van der Vossen <wich@sourcemage.org> + * DEPENDS: missing depends + 2013-09-08 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 1.0.10 diff --git a/xorg-lib/libxvmc/DEPENDS b/xorg-lib/libxvmc/DEPENDS index 42b9f38dc4..0ded9a704e 100755 --- a/xorg-lib/libxvmc/DEPENDS +++ b/xorg-lib/libxvmc/DEPENDS @@ -1,9 +1,13 @@ -depends gawk && -depends pkgconfig && -depends libtool && -depends util-macros && -depends xextproto && -depends videoproto && -depends libx11 && -depends libxext && -depends libxv +depends AWK && +depends libpthread-stubs && +depends libtool && +depends libx11 && +depends libxau && +depends libxcb && +depends libxdmcp && +depends libxext && +depends libxv && +depends pkgconfig && +depends util-macros && +depends videoproto && +depends xextproto diff --git a/xorg-lib/libxvmc/HISTORY b/xorg-lib/libxvmc/HISTORY index 18c7760f50..a35a52ace2 100644 --- a/xorg-lib/libxvmc/HISTORY +++ b/xorg-lib/libxvmc/HISTORY @@ -1,3 +1,6 @@ +2014-09-25 Remko van der Vossen <wich@sourcemage.org> + * DEPENDS: missing depends + 2013-06-14 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 1.0.8 SECURITY_PATCH=1 fixes CVE-2013-1990 & CVE-2013-1999 diff --git a/xorg-lib/libxxf86dga/DEPENDS b/xorg-lib/libxxf86dga/DEPENDS index f7cd625c55..89c7704ee7 100755 --- a/xorg-lib/libxxf86dga/DEPENDS +++ b/xorg-lib/libxxf86dga/DEPENDS @@ -1,9 +1,13 @@ -depends gawk && -depends pkgconfig && -depends libtool && -depends util-macros && -depends xproto && -depends xextproto && -depends xf86dgaproto && -depends libx11 && -depends libxext +depends AWK && +depends libpthread-stubs && +depends libtool && +depends libx11 && +depends libxau && +depends libxcb && +depends libxdmcp && +depends libxext && +depends pkgconfig && +depends util-macros && +depends xextproto && +depends xf86dgaproto && +depends xproto diff --git a/xorg-lib/libxxf86dga/HISTORY b/xorg-lib/libxxf86dga/HISTORY index 29bd930420..541f07fce7 100644 --- a/xorg-lib/libxxf86dga/HISTORY +++ b/xorg-lib/libxxf86dga/HISTORY @@ -1,3 +1,6 @@ +2014-09-25 Remko van der Vossen <wich@sourcemage.org> + * DEPENDS: missing depends + 2013-05-31 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 1.1.4 SECURITY_PATCH=1 fixes CVE-2013-1991 & CVE-2013-2000 diff --git a/xorg-lib/libxxf86misc/DEPENDS b/xorg-lib/libxxf86misc/DEPENDS index c91b472ad2..bc623e8305 100755 --- a/xorg-lib/libxxf86misc/DEPENDS +++ b/xorg-lib/libxxf86misc/DEPENDS @@ -1,9 +1,13 @@ -depends gawk && -depends pkgconfig && -depends libtool && -depends util-macros && -depends xproto && -depends xextproto && -depends xf86miscproto && -depends libx11 && -depends libxext +depends AWK && +depends libpthread-stubs && +depends libtool && +depends libx11 && +depends libxau && +depends libxcb && +depends libxdmcp && +depends libxext && +depends pkgconfig && +depends util-macros && +depends xextproto && +depends xf86miscproto && +depends xproto diff --git a/xorg-lib/libxxf86misc/HISTORY b/xorg-lib/libxxf86misc/HISTORY index e643126c8b..febcca59c4 100644 --- a/xorg-lib/libxxf86misc/HISTORY +++ b/xorg-lib/libxxf86misc/HISTORY @@ -1,3 +1,6 @@ +2014-09-25 Remko van der Vossen <wich@sourcemage.org> + * DEPENDS: missing depends + 2011-03-04 Eric Sandall <sandalle@sourcemage.org> * DETAILS: Updated to 1.0.3 SOURCE matches upstream posted SHA1 diff --git a/xorg-lib/libxxf86vm/DEPENDS b/xorg-lib/libxxf86vm/DEPENDS index 01d9c7c8ae..7c81748f59 100755 --- a/xorg-lib/libxxf86vm/DEPENDS +++ b/xorg-lib/libxxf86vm/DEPENDS @@ -1,9 +1,13 @@ -depends gawk && -depends pkgconfig && -depends libtool && -depends util-macros && -depends xproto && -depends xextproto && -depends xf86vidmodeproto && -depends libx11 && -depends libxext +depends AWK && +depends libpthread-stubs && +depends libtool && +depends libx11 && +depends libxau && +depends libxcb && +depends libxdmcp && +depends libxext && +depends pkgconfig && +depends util-macros && +depends xextproto && +depends xf86vidmodeproto && +depends xproto diff --git a/xorg-lib/libxxf86vm/HISTORY b/xorg-lib/libxxf86vm/HISTORY index b8f64e492b..59e82a36bd 100644 --- a/xorg-lib/libxxf86vm/HISTORY +++ b/xorg-lib/libxxf86vm/HISTORY @@ -1,3 +1,6 @@ +2014-09-25 Remko van der Vossen <wich@sourcemage.org> + * DEPENDS: missing depends + 2013-05-31 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 1.1.3 SECURITY_PATCH=1 fixes CVE-2013-2001 diff --git a/xorg-proto/applewmproto/DEPENDS b/xorg-proto/applewmproto/DEPENDS index 18ecac596e..e585ab8892 100755 --- a/xorg-proto/applewmproto/DEPENDS +++ b/xorg-proto/applewmproto/DEPENDS @@ -1,2 +1,2 @@ depends util-macros && -depends gawk +depends AWK diff --git a/xorg-proto/bigreqsproto/DEPENDS b/xorg-proto/bigreqsproto/DEPENDS index 18ecac596e..e585ab8892 100755 --- a/xorg-proto/bigreqsproto/DEPENDS +++ b/xorg-proto/bigreqsproto/DEPENDS @@ -1,2 +1,2 @@ depends util-macros && -depends gawk +depends AWK diff --git a/xorg-proto/compositeproto/DEPENDS b/xorg-proto/compositeproto/DEPENDS index 18ecac596e..e585ab8892 100755 --- a/xorg-proto/compositeproto/DEPENDS +++ b/xorg-proto/compositeproto/DEPENDS @@ -1,2 +1,2 @@ depends util-macros && -depends gawk +depends AWK diff --git a/xorg-proto/damageproto/DEPENDS b/xorg-proto/damageproto/DEPENDS index 18ecac596e..e585ab8892 100755 --- a/xorg-proto/damageproto/DEPENDS +++ b/xorg-proto/damageproto/DEPENDS @@ -1,2 +1,2 @@ depends util-macros && -depends gawk +depends AWK diff --git a/xorg-proto/dmxproto/DEPENDS b/xorg-proto/dmxproto/DEPENDS index 18ecac596e..e585ab8892 100755 --- a/xorg-proto/dmxproto/DEPENDS +++ b/xorg-proto/dmxproto/DEPENDS @@ -1,2 +1,2 @@ depends util-macros && -depends gawk +depends AWK diff --git a/xorg-proto/dri2proto/DEPENDS b/xorg-proto/dri2proto/DEPENDS index bc6dc206ea..442c17fd3a 100755 --- a/xorg-proto/dri2proto/DEPENDS +++ b/xorg-proto/dri2proto/DEPENDS @@ -1,5 +1,5 @@ . $GRIMOIRE/FUNCTIONS depends util-macros && simple_version_check_force_depends util-macros 12 2 && -depends gawk +depends AWK diff --git a/xorg-proto/evieext/DEPENDS b/xorg-proto/evieext/DEPENDS index 18ecac596e..e585ab8892 100755 --- a/xorg-proto/evieext/DEPENDS +++ b/xorg-proto/evieext/DEPENDS @@ -1,2 +1,2 @@ depends util-macros && -depends gawk +depends AWK diff --git a/xorg-proto/fixesproto/DEPENDS b/xorg-proto/fixesproto/DEPENDS index 18ecac596e..e585ab8892 100755 --- a/xorg-proto/fixesproto/DEPENDS +++ b/xorg-proto/fixesproto/DEPENDS @@ -1,2 +1,2 @@ depends util-macros && -depends gawk +depends AWK diff --git a/xorg-proto/fontcacheproto/DEPENDS b/xorg-proto/fontcacheproto/DEPENDS index 18ecac596e..e585ab8892 100755 --- a/xorg-proto/fontcacheproto/DEPENDS +++ b/xorg-proto/fontcacheproto/DEPENDS @@ -1,2 +1,2 @@ depends util-macros && -depends gawk +depends AWK diff --git a/xorg-proto/fontsproto/DEPENDS b/xorg-proto/fontsproto/DEPENDS index 18ecac596e..e585ab8892 100755 --- a/xorg-proto/fontsproto/DEPENDS +++ b/xorg-proto/fontsproto/DEPENDS @@ -1,2 +1,2 @@ depends util-macros && -depends gawk +depends AWK diff --git a/xorg-proto/glproto/DEPENDS b/xorg-proto/glproto/DEPENDS index 18ecac596e..e585ab8892 100755 --- a/xorg-proto/glproto/DEPENDS +++ b/xorg-proto/glproto/DEPENDS @@ -1,2 +1,2 @@ depends util-macros && -depends gawk +depends AWK diff --git a/xorg-proto/inputproto/DEPENDS b/xorg-proto/inputproto/DEPENDS index 18ecac596e..e585ab8892 100755 --- a/xorg-proto/inputproto/DEPENDS +++ b/xorg-proto/inputproto/DEPENDS @@ -1,2 +1,2 @@ depends util-macros && -depends gawk +depends AWK diff --git a/xorg-proto/kbproto/DEPENDS b/xorg-proto/kbproto/DEPENDS index e3840bf546..1e9976edd2 100755 --- a/xorg-proto/kbproto/DEPENDS +++ b/xorg-proto/kbproto/DEPENDS @@ -1,3 +1,3 @@ depends util-macros && -depends gawk && +depends AWK && optional_depends xorg-sgml-doctools '' '' 'build documentation' diff --git a/xorg-proto/printproto/DEPENDS b/xorg-proto/printproto/DEPENDS index 18ecac596e..e585ab8892 100755 --- a/xorg-proto/printproto/DEPENDS +++ b/xorg-proto/printproto/DEPENDS @@ -1,2 +1,2 @@ depends util-macros && -depends gawk +depends AWK diff --git a/xorg-proto/randrproto/DEPENDS b/xorg-proto/randrproto/DEPENDS index 18ecac596e..e585ab8892 100755 --- a/xorg-proto/randrproto/DEPENDS +++ b/xorg-proto/randrproto/DEPENDS @@ -1,2 +1,2 @@ depends util-macros && -depends gawk +depends AWK diff --git a/xorg-proto/recordproto/DEPENDS b/xorg-proto/recordproto/DEPENDS index 18ecac596e..e585ab8892 100755 --- a/xorg-proto/recordproto/DEPENDS +++ b/xorg-proto/recordproto/DEPENDS @@ -1,2 +1,2 @@ depends util-macros && -depends gawk +depends AWK diff --git a/xorg-proto/renderproto/DEPENDS b/xorg-proto/renderproto/DEPENDS index 5d210d6a7e..8adbe8d775 100755 --- a/xorg-proto/renderproto/DEPENDS +++ b/xorg-proto/renderproto/DEPENDS @@ -1,3 +1,3 @@ depends xproto && depends util-macros && -depends gawk +depends AWK diff --git a/xorg-proto/resourceproto/DEPENDS b/xorg-proto/resourceproto/DEPENDS index 18ecac596e..e585ab8892 100755 --- a/xorg-proto/resourceproto/DEPENDS +++ b/xorg-proto/resourceproto/DEPENDS @@ -1,2 +1,2 @@ depends util-macros && -depends gawk +depends AWK diff --git a/xorg-proto/scrnsaverproto/DEPENDS b/xorg-proto/scrnsaverproto/DEPENDS index 18ecac596e..e585ab8892 100755 --- a/xorg-proto/scrnsaverproto/DEPENDS +++ b/xorg-proto/scrnsaverproto/DEPENDS @@ -1,2 +1,2 @@ depends util-macros && -depends gawk +depends AWK diff --git a/xorg-proto/trapproto/DEPENDS b/xorg-proto/trapproto/DEPENDS index 18ecac596e..e585ab8892 100755 --- a/xorg-proto/trapproto/DEPENDS +++ b/xorg-proto/trapproto/DEPENDS @@ -1,2 +1,2 @@ depends util-macros && -depends gawk +depends AWK diff --git a/xorg-proto/videoproto/DEPENDS b/xorg-proto/videoproto/DEPENDS index 18ecac596e..e585ab8892 100755 --- a/xorg-proto/videoproto/DEPENDS +++ b/xorg-proto/videoproto/DEPENDS @@ -1,2 +1,2 @@ depends util-macros && -depends gawk +depends AWK diff --git a/xorg-proto/windowswmproto/DEPENDS b/xorg-proto/windowswmproto/DEPENDS index 18ecac596e..e585ab8892 100755 --- a/xorg-proto/windowswmproto/DEPENDS +++ b/xorg-proto/windowswmproto/DEPENDS @@ -1,2 +1,2 @@ depends util-macros && -depends gawk +depends AWK diff --git a/xorg-proto/xcmiscproto/DEPENDS b/xorg-proto/xcmiscproto/DEPENDS index 18ecac596e..e585ab8892 100755 --- a/xorg-proto/xcmiscproto/DEPENDS +++ b/xorg-proto/xcmiscproto/DEPENDS @@ -1,2 +1,2 @@ depends util-macros && -depends gawk +depends AWK diff --git a/xorg-proto/xextproto/DEPENDS b/xorg-proto/xextproto/DEPENDS index 18ecac596e..e585ab8892 100755 --- a/xorg-proto/xextproto/DEPENDS +++ b/xorg-proto/xextproto/DEPENDS @@ -1,2 +1,2 @@ depends util-macros && -depends gawk +depends AWK diff --git a/xorg-proto/xf86bigfontproto/DEPENDS b/xorg-proto/xf86bigfontproto/DEPENDS index 18ecac596e..e585ab8892 100755 --- a/xorg-proto/xf86bigfontproto/DEPENDS +++ b/xorg-proto/xf86bigfontproto/DEPENDS @@ -1,2 +1,2 @@ depends util-macros && -depends gawk +depends AWK diff --git a/xorg-proto/xf86dgaproto/DEPENDS b/xorg-proto/xf86dgaproto/DEPENDS index 18ecac596e..e585ab8892 100755 --- a/xorg-proto/xf86dgaproto/DEPENDS +++ b/xorg-proto/xf86dgaproto/DEPENDS @@ -1,2 +1,2 @@ depends util-macros && -depends gawk +depends AWK diff --git a/xorg-proto/xf86driproto/DEPENDS b/xorg-proto/xf86driproto/DEPENDS index 18ecac596e..e585ab8892 100755 --- a/xorg-proto/xf86driproto/DEPENDS +++ b/xorg-proto/xf86driproto/DEPENDS @@ -1,2 +1,2 @@ depends util-macros && -depends gawk +depends AWK diff --git a/xorg-proto/xf86miscproto/DEPENDS b/xorg-proto/xf86miscproto/DEPENDS index 18ecac596e..e585ab8892 100755 --- a/xorg-proto/xf86miscproto/DEPENDS +++ b/xorg-proto/xf86miscproto/DEPENDS @@ -1,2 +1,2 @@ depends util-macros && -depends gawk +depends AWK diff --git a/xorg-proto/xf86rushproto/DEPENDS b/xorg-proto/xf86rushproto/DEPENDS index 18ecac596e..e585ab8892 100755 --- a/xorg-proto/xf86rushproto/DEPENDS +++ b/xorg-proto/xf86rushproto/DEPENDS @@ -1,2 +1,2 @@ depends util-macros && -depends gawk +depends AWK diff --git a/xorg-proto/xf86vidmodeproto/DEPENDS b/xorg-proto/xf86vidmodeproto/DEPENDS index 18ecac596e..e585ab8892 100755 --- a/xorg-proto/xf86vidmodeproto/DEPENDS +++ b/xorg-proto/xf86vidmodeproto/DEPENDS @@ -1,2 +1,2 @@ depends util-macros && -depends gawk +depends AWK diff --git a/xorg-proto/xineramaproto/DEPENDS b/xorg-proto/xineramaproto/DEPENDS index 18ecac596e..e585ab8892 100755 --- a/xorg-proto/xineramaproto/DEPENDS +++ b/xorg-proto/xineramaproto/DEPENDS @@ -1,2 +1,2 @@ depends util-macros && -depends gawk +depends AWK diff --git a/xorg-proto/xproto/DEPENDS b/xorg-proto/xproto/DEPENDS index 18ecac596e..e585ab8892 100755 --- a/xorg-proto/xproto/DEPENDS +++ b/xorg-proto/xproto/DEPENDS @@ -1,2 +1,2 @@ depends util-macros && -depends gawk +depends AWK diff --git a/xorg-proto/xproxymanagementprotocol/DEPENDS b/xorg-proto/xproxymanagementprotocol/DEPENDS index 18ecac596e..e585ab8892 100755 --- a/xorg-proto/xproxymanagementprotocol/DEPENDS +++ b/xorg-proto/xproxymanagementprotocol/DEPENDS @@ -1,2 +1,2 @@ depends util-macros && -depends gawk +depends AWK diff --git a/xorg-xserver/xorg-server/DEPENDS b/xorg-xserver/xorg-server/DEPENDS index 92cfb02ea4..5b2a608cc1 100755 --- a/xorg-xserver/xorg-server/DEPENDS +++ b/xorg-xserver/xorg-server/DEPENDS @@ -130,6 +130,7 @@ depends bison && depends flex && depends pkgconfig && depends libtool && +depends AWK && depends gawk && depends mesalib-1x && depends rgb && |