Merge branch '2.3' into 2.4

libarchive/.footprint

@@ -5,9 +5,9 @@ drwxr-xr-x	root/root	usr/include/
 drwxr-xr-x	root/root	usr/lib/
 -rw-r--r--	root/root	usr/lib/libarchive.a
 -rwxr-xr-x	root/root	usr/lib/libarchive.la
-lrwxrwxrwx	root/root	usr/lib/libarchive.so -> libarchive.so.2.2.6
-lrwxrwxrwx	root/root	usr/lib/libarchive.so.2 -> libarchive.so.2.2.6
--rwxr-xr-x	root/root	usr/lib/libarchive.so.2.2.6
+lrwxrwxrwx	root/root	usr/lib/libarchive.so -> libarchive.so.2.2.7
+lrwxrwxrwx	root/root	usr/lib/libarchive.so.2 -> libarchive.so.2.2.7
+-rwxr-xr-x	root/root	usr/lib/libarchive.so.2.2.7
 drwxr-xr-x	root/root	usr/man/
 drwxr-xr-x	root/root	usr/man/man3/
 -rw-r--r--	root/root	usr/man/man3/archive_entry.3.gz

libarchive/.md5sum

@@ -1 +1 @@
-a8d23b9c37153093b2e6c03385fb3ad9  libarchive-2.2.6.tar.gz
+e1c3decc32d57fac60fd90b8ac9af0f1  libarchive-2.2.7.tar.gz

libarchive/Pkgfile

@@ -4,7 +4,7 @@
 # Depends on: bzip2, zlib
 
 name=libarchive
-version=2.2.6
+version=2.2.7
 release=1
 source=(http://people.freebsd.org/~kientzle/$name/src/$name-$version.tar.gz)
 

openssh/.md5sum

@@ -1,2 +1,2 @@
-6a7fa99f44d9e1b5b04d15256e1405bb  openssh-4.6p1.tar.gz
+50a800fd2c6def9e9a53068837e87b91  openssh-4.7p1.tar.gz
 bd8c806e623552083e1a761019cc2793  sshd

openssh/Pkgfile

@@ -4,7 +4,7 @@
 # Depends on:  openssl, zlib
 
 name=openssh
-version=4.6p1
+version=4.7p1
 release=1
 source=(ftp://openbsd.informatik.uni-erlangen.de/pub/OpenBSD/OpenSSH/portable/$name-$version.tar.gz sshd)
 

sysklogd/Pkgfile

@@ -4,12 +4,16 @@
 
 name=sysklogd
 version=1.5
-release=1
+release=2
 source=(http://www.ibiblio.org/pub/Linux/system/daemons/$name-$version.tar.gz \
 	rotatelog syslog syslog.conf)
 
 build() {
     cd $name-$version
+
+    # don't try to fclose(NULL)
+    sed -i -e '192d' ksym_mod.c
+
     mkdir -p $PKG/usr/sbin \
 	     $PKG/etc/cron/weekly \
 	     $PKG/var/log \