Fri Feb 7 03:21:50 UTC 2014

8 files changed, 217 insertions, 78 deletions

diff --git a/core/dhcpcd/PKGBUILD b/core/dhcpcd/PKGBUILD
index f6b0abcd7..ff0c3c431 100644
--- a/core/dhcpcd/PKGBUILD
+++ b/core/dhcpcd/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 199762 2013-11-15 21:24:38Z ronald $
+# $Id: PKGBUILD 205513 2014-02-06 15:35:30Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Tom Killian <tom.archlinux.org>
 # Contributor: Judd Vinet <jvinet.zeroflux.org>
 
 pkgname=dhcpcd
-pkgver=6.1.0
+pkgver=6.2.1
 pkgrel=1
 pkgdesc="RFC2131 compliant DHCP client daemon"
 url="http://roy.marples.name/projects/dhcpcd/"
@@ -18,12 +18,12 @@ options=('emptydirs')  # We Need the Empty /var/lib/dhcpcd Directory
 source=("http://roy.marples.name/downloads/$pkgname/$pkgname-$pkgver.tar.bz2"
         'dhcpcd_.service'
         'dhcpcd.service')
-sha1sums=('dcd6970db0440398aaf3ae4b58cc262a67b2e472'
+sha1sums=('02319be210f10e73a3add726ae3fd96f69743cff'
           '6f1633edde14d29b5cdc09c4f029a450ef2ebc96'
-          '7f3e62908037b888df2f6b87af1c7611f462dd08')
+          '52c1bad9ab43e9a253c1eb175e7eefb13497b8f9')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
   # configure variables
   ./configure \
@@ -37,18 +37,18 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 
   # Install License
-  install -d $pkgdir/usr/share/licenses/$pkgname
+  install -d "$pkgdir/usr/share/licenses/$pkgname"
   sed 26q "$srcdir/$pkgname-$pkgver/control.h" \
       >>"$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 
   # Set Options in /etc/dhcpcd.conf
-  echo noipv4ll >> ${pkgdir}/etc/dhcpcd.conf # Disable ip4vall
+  echo noipv4ll >> "${pkgdir}/etc/dhcpcd.conf" # Disable ip4vall
 
   # install systemd files
-  install -Dm644 ${srcdir}/dhcpcd_.service ${pkgdir}/usr/lib/systemd/system/dhcpcd@.service
-  install -Dm644 ${srcdir}/dhcpcd.service ${pkgdir}/usr/lib/systemd/system/dhcpcd.service # FS#31543
+  install -Dm644 "${srcdir}/dhcpcd_.service" "${pkgdir}/usr/lib/systemd/system/dhcpcd@.service"
+  install -Dm644 "${srcdir}/dhcpcd.service" "${pkgdir}/usr/lib/systemd/system/dhcpcd.service" # FS#31543
 }
diff --git a/core/dhcpcd/dhcpcd.service b/core/dhcpcd/dhcpcd.service
index 489023d3e..e7dc2890a 100644
--- a/core/dhcpcd/dhcpcd.service
+++ b/core/dhcpcd/dhcpcd.service
@@ -6,8 +6,8 @@ Before=network.target
 [Service]
 Type=forking
 PIDFile=/run/dhcpcd.pid
-ExecStart=/bin/dhcpcd -q -b
-ExecStop=/bin/dhcpcd -x
+ExecStart=/usr/bin/dhcpcd -q -b
+ExecStop=/usr/bin/dhcpcd -x
 
 [Install]
 WantedBy=multi-user.target
diff --git a/core/openssh/PKGBUILD b/core/openssh/PKGBUILD
index b3c2fdf08..56f49da61 100644
--- a/core/openssh/PKGBUILD
+++ b/core/openssh/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 205002 2014-02-02 20:56:12Z bisson $
+# $Id: PKGBUILD 205496 2014-02-06 05:24:35Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=openssh
 pkgver=6.5p1
-pkgrel=1
+pkgrel=2
 pkgdesc='Free version of the SSH connectivity tools'
 url='http://www.openssh.org/portable.html'
 license=('custom:BSD')
@@ -15,12 +15,14 @@ depends=('krb5' 'openssl' 'libedit' 'ldns')
 optdepends=('xorg-xauth: X11 forwarding'
             'x11-ssh-askpass: input passphrase in X')
 source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz"{,.asc}
+        'lowercase.patch'
         'sshdgenkeys.service'
         'sshd@.service'
         'sshd.service'
         'sshd.socket'
         'sshd.pam')
 sha1sums=('3363a72b4fee91b29cf2024ff633c17f6cd2f86d' 'SKIP'
+          '3163a71cbaeac39d0783ad4c501fd0630d6c0c22'
           'cc1ceec606c98c7407e7ac21ade23aed81e31405'
           '6a0ff3305692cf83aca96e10f3bb51e1c26fccda'
           'ec49c6beba923e201505f5669cea48cad29014db'
@@ -31,6 +33,11 @@ backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd')
 
 install=install
 
+prepare() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	patch -p1 -i ../lowercase.patch
+}
+
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 
diff --git a/core/openssh/lowercase.patch b/core/openssh/lowercase.patch
new file mode 100644
index 000000000..50b9e6e7d
--- /dev/null
+++ b/core/openssh/lowercase.patch
@@ -0,0 +1,32 @@
+From d56b44d2dfa093883a5c4e91be3f72d99946b170 Mon Sep 17 00:00:00 2001
+From: Damien Miller <djm@mindrot.org>
+Date: Tue, 04 Feb 2014 00:26:04 +0000
+Subject:    - djm@cvs.openbsd.org 2014/02/04 00:24:29
+
+     [ssh.c]
+     delay lowercasing of hostname until right before hostname
+     canonicalisation to unbreak case-sensitive matching of ssh_config;
+     reported by Ike Devolder; ok markus@
+---
+diff --git a/ssh.c b/ssh.c
+index ec95733..add760c 100644
+--- a/ssh.c
++++ b/ssh.c
+@@ -780,7 +780,6 @@ main(int ac, char **av)
+ 	if (!host)
+ 		usage();
+ 
+-	lowercase(host);
+ 	host_arg = xstrdup(host);
+ 
+ 	OpenSSL_add_all_algorithms();
+@@ -914,6 +913,7 @@ main(int ac, char **av)
+ 	}
+ 
+ 	/* If canonicalization requested then try to apply it */
++	lowercase(host);
+ 	if (options.canonicalize_hostname != SSH_CANONICALISE_NO)
+ 		addrs = resolve_canonicalize(&host, options.port);
+ 	/*
+--
+cgit v0.9.2
diff --git a/core/s-nail/PKGBUILD b/core/s-nail/PKGBUILD
index 21c91e6ca..4f8597e81 100644
--- a/core/s-nail/PKGBUILD
+++ b/core/s-nail/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 205003 2014-02-02 20:56:12Z bisson $
+# $Id: PKGBUILD 205499 2014-02-06 08:39:31Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Sergej Pupykin <pupykin.s@arch@gmail.com>
@@ -6,7 +6,7 @@
 
 pkgname=s-nail
 pkgver=14.5.2
-pkgrel=2
+pkgrel=3
 pkgdesc='Mail processing system with a command syntax reminiscent of ed'
 url='http://sdaoden.users.sourceforge.net/code.html#s-nail'
 license=('custom:BSD')
@@ -14,8 +14,10 @@ arch=('i686' 'x86_64')
 depends=('openssl')
 optdepends=('smtp-forwarder: for sending mail')
 source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}-${pkgver//./_}.tar.xz"
+        'mimeheader.patch'
         'sort.patch')
 sha1sums=('26ad43f5f41b429d5f13a3ce73a3dff75325950c'
+          'e72ed84f584ebc50eb9d04779b8b754afa446bf4'
           '909da731e590d1d2877ed38bed667440a02d1259')
 
 groups=('base')
@@ -26,7 +28,8 @@ conflicts=('mailx' 'mailx-heirloom' 'heirloom-mailx')
 
 prepare() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
-	patch -p1 -i ../sort.patch # http://sourceforge.net/mailarchive/message.php?msg_id=31906477
+	patch -p1 -i ../mimeheader.patch
+	patch -p1 -i ../sort.patch
 }
 
 build() {
diff --git a/core/s-nail/mimeheader.patch b/core/s-nail/mimeheader.patch
new file mode 100644
index 000000000..2f7163b36
--- /dev/null
+++ b/core/s-nail/mimeheader.patch
@@ -0,0 +1,147 @@
+s-nail-14_5_2-mimeheader.patch, 2014-02-05:
+
+Apply:
+  $ cd s-nail-14.5.2
+  $ patch -bu < s-nail-14_5_2-mimeheader.patch
+
+Description:
+    mime_fromhdr(): fix my rewrite again..
+    
+    My hasty rewrite [0f9ad93] (mime_fromhdr(): partial rewrite using
+    n_iconv_str(), 2013-03-12), just about ninety (90) minutes before
+    the release of S-nail v14.1 already caused the bugfix [b608c6b]
+    (mime_fromhdr(): never return NULL output.., 2013-03-14), which
+    was the sole reason for the release of S-nail v14.2.
+    
+    Well, about a year later, after tens of thousands of mails,
+    including multibyte ones, i wrote myself a message that has shown
+    that the rewrite was still buggy -- the header
+    
+      Subject: ehm, .getElementById("blink") needs <span
+       =?US-ASCII?Q?id=3D"blink">,?= not =?US-ASCII?Q?class=3D"id"?=
+    
+    cannot be viewed correctly, the ", not" will be lost.
+    The reason is now understood and this changeset should fix
+    mime_fromhdr() so that it'll do what it is assumed to do in the
+    current codebase, unless i'm terribly mistaken.
+    
+    Because i bickered some time in private, i WANT to add that the
+    real problem is that the codebase is weird INSOFAR as that i still
+    don't really understand the WAY it works, because THAT IS SICK.
+    I.e., in my brain i assume this function effectively is
+    rfc_2047_decode(), meant to decode encoded words as specified in
+    RFC 2047, but that's simply not true, and FOR QUITE SOME TIME,
+    because of the embedded newlines that may be in the data and need
+    to passed through for at least the case that we send data to the
+    display.  I slowly get around that schizophrenic codebase while
+    also converting it to a straight one, but that will take years.
+    Until then we need to strip whitespace in between multiple
+    adjacent encoded words, while passing through newlines and
+    whitespace that follows newlines, regardless of whatever.
+    I hope this will do it until we are sane.
+---
+ mime.c | 63 +++++++++++++++++++++++++++++++++++++++------------------------
+ 1 file changed, 39 insertions(+), 24 deletions(-)
+
+diff --git a/mime.c b/mime.c
+index ccb0061..6ee55cc 100644
+--- a/mime.c
++++ b/mime.c
+@@ -863,20 +863,26 @@ jclear:
+ 	goto jleave;
+ }
+ 
+-/*
+- * Convert header fields from RFC 1522 format
+- * TODO mime_fromhdr(): NO error handling, fat; REWRITE **ASAP**
+- */
+ FL void
+ mime_fromhdr(struct str const *in, struct str *out, enum tdflags flags)
+ {
+-	/* TODO mime_fromhdr(): is called with strings that contain newlines;
+-	 * TODO this is the usual newline problem all around the codebase;
+-	 * TODO i.e., if we strip it, then the display misses it ;} */
++   /* TODO mime_fromhdr(): is called with strings that contain newlines;
++    * TODO this is the usual newline problem all around the codebase;
++    * TODO i.e., if we strip it, then the display misses it ;>
++    * TODO this is why it is so messy and why S-nail v14.2 plus additional
++    * TODO patch for v14.5.2 (and maybe even v14.5.3 subminor) occurred, and
++    * TODO why our display reflects what is contained in the message: the 1:1
++    * TODO relationship of message content and display!
++    * TODO instead a header line should be decoded to what it is (a single
++    * TODO line that is) and it should be objective to the backend wether
++    * TODO it'll be folded to fit onto the display or not, e.g., for search
++    * TODO purposes etc.  then the only condition we have to honour in here
++    * TODO is that whitespace in between multiple adjacent MIME encoded words
++    * TODO á la RFC 2047 is discarded; i.e.: this function should deal with
++    * TODO RFC 2047 and be renamed: mime_fromhdr() -> mime_rfc2047_decode() */
+ 	struct str cin, cout;
+ 	char *p, *op, *upper, *cs, *cbeg;
+-	int convert;
+-	size_t lastoutl = (size_t)-1;
++   ui32_t convert, lastenc, lastoutl;
+ #ifdef HAVE_ICONV
+ 	char const *tcs;
+ 	iconv_t fhicd = (iconv_t)-1;
+@@ -894,6 +900,7 @@ mime_fromhdr(struct str const *in, struct str *out, enum tdflags flags)
+ #endif
+ 	p = in->s;
+ 	upper = p + in->l;
++   lastenc = lastoutl = 0;
+ 
+ 	while (p < upper) {
+ 		op = p;
+@@ -949,8 +956,7 @@ mime_fromhdr(struct str const *in, struct str *out, enum tdflags flags)
+ 					--cout.l;
+ 			} else
+ 				(void)qp_decode(&cout, &cin, NULL);
+-			if (lastoutl != (size_t)-1)
+-				out->l = lastoutl;
++			out->l = lastenc;
+ #ifdef HAVE_ICONV
+ 			if ((flags & TD_ICONV) && fhicd != (iconv_t)-1) {
+ 				cin.s = NULL, cin.l = 0; /* XXX string pool ! */
+@@ -966,21 +972,30 @@ mime_fromhdr(struct str const *in, struct str *out, enum tdflags flags)
+ #ifdef HAVE_ICONV
+ 			}
+ #endif
+-			lastoutl = out->l;
++			lastenc = lastoutl = out->l;
+ 			free(cout.s);
+-		} else {
+-jnotmime:
+-			p = op;
+-			convert = 1;
+-			while ((op = p + convert) < upper &&
+-					(op[0] != '=' || op[1] != '?'))
+-				++convert;
+-			out = n_str_add_buf(out, p, convert);
+-			p += convert;
+-			if (! blankchar(p[-1]))
+-				lastoutl = (size_t)-1;
+-		}
++		} else
++jnotmime: {
++         bool_t onlyws;
++
++         p = op;
++         onlyws = (lastenc > 0);
++         for (;;) {
++            if (++op == upper)
++               break;
++            if (op[0] == '=' && (PTRCMP(op + 1, ==, upper) || op[1] == '?'))
++               break;
++            if (onlyws && !blankchar(*op))
++               onlyws = FAL0;
++         }
++
++         out = n_str_add_buf(out, p, PTR2SIZE(op - p));
++         p = op;
++         if (!onlyws || lastoutl != lastenc)
++            lastenc = out->l;
++         lastoutl = out->l;
+ 	}
++  }
+ 	out->s[out->l] = '\0';
+ 
+ 	if (flags & TD_ISPR) {
diff --git a/core/wireless_tools/PKGBUILD b/core/wireless_tools/PKGBUILD
index 57ba7574f..e8cbf1cc7 100644
--- a/core/wireless_tools/PKGBUILD
+++ b/core/wireless_tools/PKGBUILD
@@ -1,32 +1,31 @@
-# $Id: PKGBUILD 186266 2013-05-23 06:41:05Z bisson $
+# $Id: PKGBUILD 205493 2014-02-06 05:23:57Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Jason Chu <jchu@xentac.net>
 
 pkgname=wireless_tools
-pkgver=29
-pkgrel=8
+pkgver=30.pre9
+_pkgver=${pkgver%.pre*}
+pkgrel=1
 pkgdesc='Tools allowing to manipulate the Wireless Extensions'
 url='http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html'
 license=('GPL')
 arch=('i686' 'x86_64')
-source=("http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/${pkgname}.${pkgver}.tar.gz"
-        'dense.patch')
-sha1sums=('22040ac1497f4c5f8ddeca365591b01ae3475710'
-          '5c297c7dff1ec1d2a3d918c20622ab3c6daf5b72')
+source=("http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/${pkgname}.${pkgver}.tar.gz")
+sha1sums=('41db5ced9ed3d8d3cc104ce43c19af1d72f07eec')
 
 prepare() {
-	cd "${srcdir}/${pkgname}.${pkgver}"
-	patch -p1 -i ../dense.patch # FS#15363
+	cd "${srcdir}/${pkgname}.${_pkgver}"
+	sed '/BUILD_STATIC =/d' -i Makefile
 }
 
 build() {
-	cd "${srcdir}/${pkgname}.${pkgver}"
+	cd "${srcdir}/${pkgname}.${_pkgver}"
 	make CFLAGS="${CFLAGS} -I." LDFLAGS="${LDFLAGS}"
 }
 
 package() {
-	cd "${srcdir}/${pkgname}.${pkgver}"
+	cd "${srcdir}/${pkgname}.${_pkgver}"
 	make \
 		INSTALL_DIR="${pkgdir}/usr/bin" \
 		INSTALL_LIB="${pkgdir}/usr/lib" \
diff --git a/core/wireless_tools/dense.patch b/core/wireless_tools/dense.patch
deleted file mode 100644
index 85182cd82..000000000
--- a/core/wireless_tools/dense.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-The length field of wext data (iw_point.data) is 16 bits. The largest
-value is thus 65535. During the attempts to increase buffer size the
-buffer starts at 4096 and is doubled after each failure to fill. From the
-time this length reaches 65536 it is effectively zero. We thus loose all
-potential space from 32768 to 65535.
-
-This problem is clear when scanning in a RF dense environment.
-
-Without this patch:
-~$ iwlist wlan0 scan
-print_scanning_info: Allocation failed
-
-With this patch:
-~$ iwlist wlan0 scan | grep Cell | wc -l
-86
-
-Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
-
----
-A similar patch was recently created to fix wpa_supplicant.
-
-I could not find a source code repo for this code and created this patch
-against version 30-pre7 downloaded from 
-http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html
-
-diff -uprN wireless_tools_org/wireless_tools.30/iwlist.c wireless_tools.30/iwlist.c
---- wireless_tools_org/wireless_tools.30/iwlist.c	2008-01-16 17:45:41.000000000 -0800
-+++ wireless_tools.30/iwlist.c	2009-02-12 14:16:48.000000000 -0800
-@@ -800,7 +800,7 @@ print_scanning_info(int		skfd,
- 	  if(iw_get_ext(skfd, ifname, SIOCGIWSCAN, &wrq) < 0)
- 	    {
- 	      /* Check if buffer was too small (WE-17 only) */
--	      if((errno == E2BIG) && (range.we_version_compiled > 16))
-+	      if((errno == E2BIG) && (range.we_version_compiled > 16) && (buflen < 65535))
- 		{
- 		  /* Some driver may return very large scan results, either
- 		   * because there are many cells, or because they have many
-@@ -816,6 +816,10 @@ print_scanning_info(int		skfd,
- 		  else
- 		    buflen *= 2;
- 
-+		  /* wrq.u.data.length is 16 bits so max size is 65535 */
-+		  if(buflen > 65535)
-+		    buflen = 65535;
-+
- 		  /* Try again */
- 		  goto realloc;
- 		}
-