8 files changed, 78 insertions, 103 deletions
diff --git a/extra/cups/PKGBUILD b/extra/cups/PKGBUILD
index 854c84593..f9e6cfabb 100644
--- a/extra/cups/PKGBUILD
+++ b/extra/cups/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 204552 2014-01-22 13:21:08Z andyrtr $
+# $Id: PKGBUILD 207150 2014-03-07 19:58:24Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase="cups"
 pkgname=('libcups' 'cups')
 pkgver=1.7.1
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.cups.org/"
@@ -37,7 +37,7 @@ md5sums=('55277c40fd4b7183dc3671d39c5c42b7'
          '3ba9e3410df1dc3015463d615ef91b3b'
          'cc4101beccb5ed6deb1c92707a575925'
          '90c30380d4c8cd48a908cfdadae1ea24'
-         'be0ce5a9bcf5079af1a260fef395e146'
+         'cf2f881967b0531ec49bcb5d0e9573a8'
          '8fe27d4248cacbc02824e7937cab4088'
          'df0c367c0022e3c7d8e01827e8a6c5e7'
          'f30c2a161caaf27854581507cde8cac6'
@@ -180,8 +180,8 @@ optdepends=('xdg-utils: xdg .desktop file support')
 
   # install ssl directory where to store the certs, solves some samba issues
   install -dm700 -g lp ${pkgdir}/etc/cups/ssl
-  # remove directory from package, we create it in cups rc.d file
-  rm -rf ${pkgdir}/var/run
+  # remove directory from package, it will be recreated at each server start
+  rm -rf ${pkgdir}/run
 
   # install some more configuration files that will get filled by cupsd
   touch ${pkgdir}/etc/cups/printers.conf
diff --git a/extra/cups/cups-systemd-socket.patch b/extra/cups/cups-systemd-socket.patch
index 4c3de1188..ad13a6da7 100644
--- a/extra/cups/cups-systemd-socket.patch
+++ b/extra/cups/cups-systemd-socket.patch
@@ -117,13 +117,14 @@ diff -up cups-1.7rc1/data/cups.service.in.systemd-socket cups-1.7rc1/data/cups.s
 diff -up cups-1.7rc1/data/cups.socket.in.systemd-socket cups-1.7rc1/data/cups.socket.in
 --- cups-1.7rc1/data/cups.socket.in.systemd-socket	2013-07-12 11:16:53.259546235 +0200
 +++ cups-1.7rc1/data/cups.socket.in	2013-07-12 11:16:53.259546235 +0200
-@@ -0,0 +1,9 @@
+@@ -0,0 +1,10 @@
 +[Unit]
 +Description=CUPS Printing Service Sockets
 +
 +[Socket]
 +ListenStream=@CUPS_DEFAULT_DOMAINSOCKET@
 +ListenStream=@DEFAULT_IPP_PORT@
++BindIPv6Only=ipv6-only
 +
 +[Install]
 +WantedBy=sockets.target
diff --git a/extra/mpdecimal/PKGBUILD b/extra/mpdecimal/PKGBUILD
new file mode 100644
index 000000000..8d5e6118c
--- /dev/null
+++ b/extra/mpdecimal/PKGBUILD
@@ -0,0 +1,28 @@
+# $Id: PKGBUILD 207142 2014-03-07 15:54:55Z fyan $
+# Maintainer: Felix Yan <felixonmars@gmail.com>
+
+pkgname=mpdecimal
+pkgver=2.4.0
+pkgrel=1
+pkgdesc="Package for correctly-rounded arbitrary precision decimal floating point arithmetic"
+arch=('i686' 'x86_64')
+url="http://www.bytereef.org/mpdecimal/index.html"
+license=('custom')
+depends=('glibc')
+source=(http://www.bytereef.org/software/${pkgname}/releases/${pkgname}-${pkgver}.tar.gz)
+
+build() {
+  cd ${pkgname}-${pkgver}
+
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" install
+
+  install -Dm644 LICENSE.txt "${pkgdir}/usr/share/licenses/$pkgname/LICENSE.txt"
+}
+
+sha512sums=('9528274c77f874ea75652f08e64bb76ecdaa6c2111900809bc3ce58b4740d8b313bf41283cfb41b525a7d2df7d86cb7d9415b0abb2ce58a209df9d54e2ab0f75')
diff --git a/extra/ncftp/PKGBUILD b/extra/ncftp/PKGBUILD
index 3ba6a9d62..981d68720 100644
--- a/extra/ncftp/PKGBUILD
+++ b/extra/ncftp/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 206931 2014-03-06 11:24:46Z andrea $
+# $Id: PKGBUILD 207130 2014-03-07 09:21:28Z andrea $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Paul Mattal <paul@archlinux.org>
@@ -6,7 +6,7 @@
 
 pkgname=ncftp
 pkgver=3.2.5
-pkgrel=3
+pkgrel=4
 pkgdesc="A set of free application programs implementing FTP"
 url="http://www.ncftp.com/"
 arch=('i686' 'x86_64')
@@ -24,6 +24,9 @@ prepare() {
 }
 
 build() {
+  # FS#39211
+  unset CPPFLAGS
+
   cd ${pkgname}-${pkgver}
   CPP=/usr/bin/cpp ./configure --prefix=/usr \
     --sysconfdir=/etc
diff --git a/extra/ruby/0001-Fix-installing-gem-from-file-without-dependencies.patch b/extra/ruby/0001-Fix-installing-gem-from-file-without-dependencies.patch
deleted file mode 100644
index 8fefb275d..000000000
--- a/extra/ruby/0001-Fix-installing-gem-from-file-without-dependencies.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From f5bbf838c8b13369a61c6756355305388df5824f Mon Sep 17 00:00:00 2001
-From: Tim Moore <tmoore@incrementalism.net>
-Date: Tue, 31 Dec 2013 17:39:45 +1100
-Subject: [PATCH] Fix installing gem from file without dependencies.
-
-Commit 9437ccc fixed the ability to install remote gems that was accidentally
-broken by d97fba1, but in the process accidentally broke installing from local
-files.
-
-This also changes the order to check for local first, to avoid unnecessary
-network requests in the case where the gem is local.
-
-Closes #760.
----
- lib/rubygems/commands/install_command.rb           | 20 ++++++++++++--------
- test/rubygems/test_gem_commands_install_command.rb | 14 ++++++++++++++
- 2 files changed, 26 insertions(+), 8 deletions(-)
-
-diff --git a/lib/rubygems/commands/install_command.rb b/lib/rubygems/commands/install_command.rb
-index 4485eb1..8219eef 100644
---- a/lib/rubygems/commands/install_command.rb
-+++ b/lib/rubygems/commands/install_command.rb
-@@ -228,7 +228,18 @@ to write the specification by hand.  For example:
-   def install_gem_without_dependencies name, req # :nodoc:
-     gem = nil
- 
--    if remote? then
-+    if local? then
-+      if name =~ /\.gem$/ and File.file? name then
-+        source = Gem::Source::SpecificFile.new name
-+        spec = source.spec
-+      else
-+        source = Gem::Source::Local.new
-+        spec = source.find_gem name, req
-+      end
-+      gem = source.download spec if spec
-+    end
-+
-+    if remote? and not gem then
-       dependency = Gem::Dependency.new name, req
-       dependency.prerelease = options[:prerelease]
- 
-@@ -236,13 +247,6 @@ to write the specification by hand.  For example:
-       gem = fetcher.download_to_cache dependency
-     end
- 
--    if local? and not gem then
--      source = Gem::Source::Local.new
--      spec = source.find_gem name, req
--
--      gem = source.download spec
--    end
--
-     inst = Gem::Installer.new gem, options
-     inst.install
- 
-diff --git a/test/rubygems/test_gem_commands_install_command.rb b/test/rubygems/test_gem_commands_install_command.rb
-index 76ea6b4..a5917c0 100644
---- a/test/rubygems/test_gem_commands_install_command.rb
-+++ b/test/rubygems/test_gem_commands_install_command.rb
-@@ -560,6 +560,20 @@ ERROR:  Possible alternatives: non_existent_with_hint
-     assert_equal %w[a-2], @cmd.installed_specs.map { |spec| spec.full_name }
-   end
- 
-+  def test_install_gem_ignore_dependencies_specific_file
-+    spec = quick_spec 'a', 2
-+
-+    util_build_gem spec
-+
-+    FileUtils.mv spec.cache_file, @tempdir
-+
-+    @cmd.options[:ignore_dependencies] = true
-+
-+    @cmd.install_gem File.join(@tempdir, spec.file_name), nil
-+
-+    assert_equal %w[a-2], @cmd.installed_specs.map { |spec| spec.full_name }
-+  end
-+
-   def test_parses_requirement_from_gemname
-     spec_fetcher do |fetcher|
-       fetcher.gem 'a', 2
--- 
-1.8.5.2
-
diff --git a/extra/ruby/0001-Fix-undeclared-identifier-error-by-using-the-actual-.patch b/extra/ruby/0001-Fix-undeclared-identifier-error-by-using-the-actual-.patch
new file mode 100644
index 000000000..fed9fd0d8
--- /dev/null
+++ b/extra/ruby/0001-Fix-undeclared-identifier-error-by-using-the-actual-.patch
@@ -0,0 +1,26 @@
+From 4c4da3fc650a3595ecc06f49072f1ffae07db706 Mon Sep 17 00:00:00 2001
+From: Thomas Dziedzic <gostrc@gmail.com>
+Date: Sat, 1 Mar 2014 21:41:28 -0800
+Subject: [PATCH] Fix undeclared identifier error by using the actual type of
+ rl_pre_input_hook
+
+---
+ ext/readline/readline.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ext/readline/readline.c b/ext/readline/readline.c
+index 659adb9..7bc0eed 100644
+--- a/ext/readline/readline.c
++++ b/ext/readline/readline.c
+@@ -1974,7 +1974,7 @@ Init_readline()
+ 
+     rl_attempted_completion_function = readline_attempted_completion_function;
+ #if defined(HAVE_RL_PRE_INPUT_HOOK)
+-    rl_pre_input_hook = (Function *)readline_pre_input_hook;
++    rl_pre_input_hook = (rl_hook_func_t *)readline_pre_input_hook;
+ #endif
+ #ifdef HAVE_RL_CATCH_SIGNALS
+     rl_catch_signals = 0;
+-- 
+1.9.0
+
diff --git a/extra/ruby/PKGBUILD b/extra/ruby/PKGBUILD
index aa7ded71a..d2885050b 100644
--- a/extra/ruby/PKGBUILD
+++ b/extra/ruby/PKGBUILD
@@ -4,8 +4,8 @@
 # Contributor: Jeramy Rutley <jrutley@gmail.com>
 
 pkgname=('ruby' 'ruby-docs')
-pkgver=2.1.0
-pkgrel=2
+pkgver=2.1.1
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.ruby-lang.org/en/'
 license=('BSD' 'custom')
@@ -14,18 +14,19 @@ license=('BSD' 'custom')
 # wait for upstream to start supporting tk 8.6
 makedepends=('gdbm' 'openssl' 'libffi' 'doxygen' 'graphviz' 'libyaml') # 'tk'
 options=('!emptydirs' '!makeflags' 'staticlibs')
-source=("http://cache.ruby-lang.org/pub/ruby/ruby-${pkgver}.tar.bz2"
+source=("http://cache.ruby-lang.org/pub/ruby/${pkgver:0:3}/ruby-${pkgver}.tar.bz2"
         'gemrc'
-        '0001-Fix-installing-gem-from-file-without-dependencies.patch')
-md5sums=('1546eeb763ac7754365664be763a1e8f'
+        '0001-Fix-undeclared-identifier-error-by-using-the-actual-.patch')
+md5sums=('53edc33b2f590ecdd9f6a344b9d92d0d'
          '6fb8e7a09955e0f64be3158fb4a27e7a'
-         '61a1507f260866805fc6451c14733b25')
+         '0496e962e0ce11507b7577a8eb93af58')
 
 build() {
   cd ruby-${pkgver}
 
-  # fixes https://github.com/rubygems/rubygems/issues/760
-  patch -Np1 -i ${srcdir}/0001-Fix-installing-gem-from-file-without-dependencies.patch
+  # readline 6.3 doesn't define Function anymore
+  # https://bugs.ruby-lang.org/issues/9578
+  patch -Np1 -i ${srcdir}/0001-Fix-undeclared-identifier-error-by-using-the-actual-.patch
 
   PKG_CONFIG=/usr/bin/pkg-config ./configure \
     --prefix=/usr \
diff --git a/extra/xterm/PKGBUILD b/extra/xterm/PKGBUILD
index 0bb0c157b..9323bcac6 100644
--- a/extra/xterm/PKGBUILD
+++ b/extra/xterm/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 206667 2014-03-04 15:17:09Z andyrtr $
+# $Id: PKGBUILD 207149 2014-03-07 19:55:00Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=xterm
-pkgver=302
+pkgver=303
 pkgrel=1
 pkgdesc="X Terminal Emulator"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ license=('custom')
 depends=('libxft' 'libxaw' 'ncurses' 'xorg-luit' 'xbitmaps' 'libutempter')
 source=(ftp://invisible-island.net/${pkgname}/${pkgname}-${pkgver}.tgz{,.asc}
         LICENSE)
-md5sums=('494e2f3988d22fe7266410c862042250'
+md5sums=('48f6d49b2b6b6933d501d767cbed9254'
          'SKIP'
          '10ecc3f8ee91e3189863a172f68282d2')