[arch-commits] Commit in libusbmuxd/repos (6 files)
Jan de Groot
jgc at archlinux.org
Sun Jun 4 22:40:27 UTC 2017
Date: Sunday, June 4, 2017 @ 22:40:26
Author: jgc
Revision: 297791
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
libusbmuxd/repos/extra-i686/CVE-2016-5104.patch
(from rev 297790, libusbmuxd/trunk/CVE-2016-5104.patch)
libusbmuxd/repos/extra-i686/PKGBUILD
(from rev 297790, libusbmuxd/trunk/PKGBUILD)
libusbmuxd/repos/extra-x86_64/CVE-2016-5104.patch
(from rev 297790, libusbmuxd/trunk/CVE-2016-5104.patch)
libusbmuxd/repos/extra-x86_64/PKGBUILD
(from rev 297790, libusbmuxd/trunk/PKGBUILD)
Deleted:
libusbmuxd/repos/extra-i686/PKGBUILD
libusbmuxd/repos/extra-x86_64/PKGBUILD
----------------------------------+
/PKGBUILD | 66 +++++++++++++++++++++++++++++++++++++
extra-i686/CVE-2016-5104.patch | 31 +++++++++++++++++
extra-i686/PKGBUILD | 27 ---------------
extra-x86_64/CVE-2016-5104.patch | 31 +++++++++++++++++
extra-x86_64/PKGBUILD | 27 ---------------
5 files changed, 128 insertions(+), 54 deletions(-)
Copied: libusbmuxd/repos/extra-i686/CVE-2016-5104.patch (from rev 297790, libusbmuxd/trunk/CVE-2016-5104.patch)
===================================================================
--- extra-i686/CVE-2016-5104.patch (rev 0)
+++ extra-i686/CVE-2016-5104.patch 2017-06-04 22:40:26 UTC (rev 297791)
@@ -0,0 +1,31 @@
+From 4397b3376dc4e4cb1c991d0aed61ce6482614196 Mon Sep 17 00:00:00 2001
+From: Joshua Hill <posixninja at gmail.com>
+Date: Tue, 29 Dec 2015 23:09:37 +0100
+Subject: [PATCH] common: [security fix] Make sure sockets only listen locally
+
+---
+ common/socket.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/common/socket.c b/common/socket.c
+index 27b93ba..4cdefd6 100644
+--- a/common/socket.c
++++ b/common/socket.c
+@@ -203,7 +203,7 @@ int socket_create(uint16_t port)
+
+ memset((void *) &saddr, 0, sizeof(saddr));
+ saddr.sin_family = AF_INET;
+- saddr.sin_addr.s_addr = htonl(INADDR_ANY);
++ saddr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
+ saddr.sin_port = htons(port);
+
+ if (0 > bind(sfd, (struct sockaddr *) &saddr, sizeof(saddr))) {
+@@ -368,7 +368,7 @@ int socket_accept(int fd, uint16_t port)
+
+ memset(&addr, 0, sizeof(addr));
+ addr.sin_family = AF_INET;
+- addr.sin_addr.s_addr = htonl(INADDR_ANY);
++ addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
+ addr.sin_port = htons(port);
+
+ addr_len = sizeof(addr);
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2017-06-04 22:35:28 UTC (rev 297790)
+++ extra-i686/PKGBUILD 2017-06-04 22:40:26 UTC (rev 297791)
@@ -1,27 +0,0 @@
-# $Id: $
-# Maintainer: Ionut Biru <ibiru at archlinux.org>
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-# Contributor: Gabriel Martinez < reitaka at gmail dot com >
-
-pkgname=libusbmuxd
-pkgver=1.0.10
-pkgrel=1
-pkgdesc="USB Multiplex Daemon"
-url="http://marcansoft.com/blog/iphonelinux/usbmuxd/"
-arch=('i686' 'x86_64')
-license=('LGPL2.1' 'GPL2')
-depends=('libusb' 'libplist')
-conflicts=('usbmuxd<1.0.9')
-source=(http://www.libimobiledevice.org/downloads/libusbmuxd-$pkgver.tar.bz2)
-md5sums=('e5351ff6f6eedcb50701e02d91cc480c')
-
-build() {
- cd libusbmuxd-${pkgver}
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd libusbmuxd-${pkgver}
- make DESTDIR="${pkgdir}" install
-}
Copied: libusbmuxd/repos/extra-i686/PKGBUILD (from rev 297790, libusbmuxd/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2017-06-04 22:40:26 UTC (rev 297791)
@@ -0,0 +1,33 @@
+# Maintainer: Ionut Biru <ibiru at archlinux.org>
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Contributor: Gabriel Martinez < reitaka at gmail dot com >
+
+pkgname=libusbmuxd
+pkgver=1.0.10
+pkgrel=2
+pkgdesc="USB Multiplex Daemon"
+url="http://marcansoft.com/blog/iphonelinux/usbmuxd/"
+arch=('i686' 'x86_64')
+license=('LGPL2.1' 'GPL2')
+depends=('libusb' 'libplist')
+conflicts=('usbmuxd<1.0.9')
+source=(http://www.libimobiledevice.org/downloads/libusbmuxd-$pkgver.tar.bz2
+ CVE-2016-5104.patch)
+sha256sums=('1aa21391265d2284ac3ccb7cf278126d10d354878589905b35e8102104fec9f2'
+ '9f3a84c8d0a32df13985f6574f5f0e86af435a67606612c0811df631070a97e3')
+
+prepare() {
+ cd libusbmuxd-${pkgver}
+ patch -Np1 -i ../CVE-2016-5104.patch
+}
+
+build() {
+ cd libusbmuxd-${pkgver}
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd libusbmuxd-${pkgver}
+ make DESTDIR="${pkgdir}" install
+}
Copied: libusbmuxd/repos/extra-x86_64/CVE-2016-5104.patch (from rev 297790, libusbmuxd/trunk/CVE-2016-5104.patch)
===================================================================
--- extra-x86_64/CVE-2016-5104.patch (rev 0)
+++ extra-x86_64/CVE-2016-5104.patch 2017-06-04 22:40:26 UTC (rev 297791)
@@ -0,0 +1,31 @@
+From 4397b3376dc4e4cb1c991d0aed61ce6482614196 Mon Sep 17 00:00:00 2001
+From: Joshua Hill <posixninja at gmail.com>
+Date: Tue, 29 Dec 2015 23:09:37 +0100
+Subject: [PATCH] common: [security fix] Make sure sockets only listen locally
+
+---
+ common/socket.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/common/socket.c b/common/socket.c
+index 27b93ba..4cdefd6 100644
+--- a/common/socket.c
++++ b/common/socket.c
+@@ -203,7 +203,7 @@ int socket_create(uint16_t port)
+
+ memset((void *) &saddr, 0, sizeof(saddr));
+ saddr.sin_family = AF_INET;
+- saddr.sin_addr.s_addr = htonl(INADDR_ANY);
++ saddr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
+ saddr.sin_port = htons(port);
+
+ if (0 > bind(sfd, (struct sockaddr *) &saddr, sizeof(saddr))) {
+@@ -368,7 +368,7 @@ int socket_accept(int fd, uint16_t port)
+
+ memset(&addr, 0, sizeof(addr));
+ addr.sin_family = AF_INET;
+- addr.sin_addr.s_addr = htonl(INADDR_ANY);
++ addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
+ addr.sin_port = htons(port);
+
+ addr_len = sizeof(addr);
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2017-06-04 22:35:28 UTC (rev 297790)
+++ extra-x86_64/PKGBUILD 2017-06-04 22:40:26 UTC (rev 297791)
@@ -1,27 +0,0 @@
-# $Id: $
-# Maintainer: Ionut Biru <ibiru at archlinux.org>
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-# Contributor: Gabriel Martinez < reitaka at gmail dot com >
-
-pkgname=libusbmuxd
-pkgver=1.0.10
-pkgrel=1
-pkgdesc="USB Multiplex Daemon"
-url="http://marcansoft.com/blog/iphonelinux/usbmuxd/"
-arch=('i686' 'x86_64')
-license=('LGPL2.1' 'GPL2')
-depends=('libusb' 'libplist')
-conflicts=('usbmuxd<1.0.9')
-source=(http://www.libimobiledevice.org/downloads/libusbmuxd-$pkgver.tar.bz2)
-md5sums=('e5351ff6f6eedcb50701e02d91cc480c')
-
-build() {
- cd libusbmuxd-${pkgver}
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd libusbmuxd-${pkgver}
- make DESTDIR="${pkgdir}" install
-}
Copied: libusbmuxd/repos/extra-x86_64/PKGBUILD (from rev 297790, libusbmuxd/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2017-06-04 22:40:26 UTC (rev 297791)
@@ -0,0 +1,33 @@
+# Maintainer: Ionut Biru <ibiru at archlinux.org>
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Contributor: Gabriel Martinez < reitaka at gmail dot com >
+
+pkgname=libusbmuxd
+pkgver=1.0.10
+pkgrel=2
+pkgdesc="USB Multiplex Daemon"
+url="http://marcansoft.com/blog/iphonelinux/usbmuxd/"
+arch=('i686' 'x86_64')
+license=('LGPL2.1' 'GPL2')
+depends=('libusb' 'libplist')
+conflicts=('usbmuxd<1.0.9')
+source=(http://www.libimobiledevice.org/downloads/libusbmuxd-$pkgver.tar.bz2
+ CVE-2016-5104.patch)
+sha256sums=('1aa21391265d2284ac3ccb7cf278126d10d354878589905b35e8102104fec9f2'
+ '9f3a84c8d0a32df13985f6574f5f0e86af435a67606612c0811df631070a97e3')
+
+prepare() {
+ cd libusbmuxd-${pkgver}
+ patch -Np1 -i ../CVE-2016-5104.patch
+}
+
+build() {
+ cd libusbmuxd-${pkgver}
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd libusbmuxd-${pkgver}
+ make DESTDIR="${pkgdir}" install
+}
More information about the arch-commits
mailing list