diff options
author | Pacho Ramos <pacho@gentoo.org> | 2013-07-24 05:40:11 +0000 |
---|---|---|
committer | Pacho Ramos <pacho@gentoo.org> | 2013-07-24 05:40:11 +0000 |
commit | a13e164e66e5b24e2b54c67046873b7e37cecd07 (patch) | |
tree | c58d3f3bc9f1701dbcd99c2311e43bee1d5f642b /net-misc/modemmanager | |
parent | Drop stray file from Manifest (diff) | |
download | gentoo-2-a13e164e66e5b24e2b54c67046873b7e37cecd07.tar.gz gentoo-2-a13e164e66e5b24e2b54c67046873b7e37cecd07.tar.bz2 gentoo-2-a13e164e66e5b24e2b54c67046873b7e37cecd07.zip |
Apply upstream fixes, also solving dbus file generation (#477710 by Martin Dummer).
(Portage version: 2.1.12.13/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
Diffstat (limited to 'net-misc/modemmanager')
-rw-r--r-- | net-misc/modemmanager/ChangeLog | 11 | ||||
-rw-r--r-- | net-misc/modemmanager/files/modemmanager-1.0.0-dbus-generation.patch | 35 | ||||
-rw-r--r-- | net-misc/modemmanager/files/modemmanager-1.0.0-logging-serial.patch | 76 | ||||
-rw-r--r-- | net-misc/modemmanager/modemmanager-1.0.0-r1.ebuild (renamed from net-misc/modemmanager/modemmanager-1.0.0.ebuild) | 11 |
4 files changed, 130 insertions, 3 deletions
diff --git a/net-misc/modemmanager/ChangeLog b/net-misc/modemmanager/ChangeLog index d372d775bcc3..14fad7891e2d 100644 --- a/net-misc/modemmanager/ChangeLog +++ b/net-misc/modemmanager/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for net-misc/modemmanager # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/modemmanager/ChangeLog,v 1.55 2013/07/20 19:28:22 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/modemmanager/ChangeLog,v 1.56 2013/07/24 05:40:11 pacho Exp $ + +*modemmanager-1.0.0-r1 (24 Jul 2013) + + 24 Jul 2013; Pacho Ramos <pacho@gentoo.org> + +files/modemmanager-1.0.0-dbus-generation.patch, + +files/modemmanager-1.0.0-logging-serial.patch, +modemmanager-1.0.0-r1.ebuild, + -modemmanager-1.0.0.ebuild: + Apply upstream fixes, also solving dbus file generation (#477710 by Martin + Dummer). 20 Jul 2013; Pacho Ramos <pacho@gentoo.org> metadata.xml: Redigest (#472866 by Albert W. Hopkins), also adopt the package diff --git a/net-misc/modemmanager/files/modemmanager-1.0.0-dbus-generation.patch b/net-misc/modemmanager/files/modemmanager-1.0.0-dbus-generation.patch new file mode 100644 index 000000000000..51d65f1ef606 --- /dev/null +++ b/net-misc/modemmanager/files/modemmanager-1.0.0-dbus-generation.patch @@ -0,0 +1,35 @@ +From 7cda349c384c847fe838d418c1f83e85495d54d4 Mon Sep 17 00:00:00 2001 +From: Aleksander Morgado <aleksander@lanedo.com> +Date: Tue, 23 Jul 2013 09:04:29 +0000 +Subject: build: fix dbus activation file generation + +https://bugzilla.gnome.org/show_bug.cgi?id=704711 +--- +diff --git a/configure.ac b/configure.ac +index 34ef0c7..242b248 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -265,7 +265,6 @@ data/Makefile + data/ModemManager.pc + data/mm-glib.pc + data/org.freedesktop.ModemManager1.policy.in +-data/org.freedesktop.ModemManager1.service + include/Makefile + include/ModemManager-version.h + build-aux/Makefile +diff --git a/data/Makefile.am b/data/Makefile.am +index 3a31ec5..70a92ee 100644 +--- a/data/Makefile.am ++++ b/data/Makefile.am +@@ -35,6 +35,9 @@ endif + dbusactivationdir = $(datadir)/dbus-1/system-services + dbusactivation_DATA = org.freedesktop.ModemManager1.service + dbusactivation_in_files = org.freedesktop.ModemManager1.service.in ++org.freedesktop.ModemManager1.service: org.freedesktop.ModemManager1.service.in ++ $(edit) $< >$@ ++ + + # Icon + icondir=${datadir}/icons/hicolor/22x22/apps +-- +cgit v0.9.0.2-2-gbebe diff --git a/net-misc/modemmanager/files/modemmanager-1.0.0-logging-serial.patch b/net-misc/modemmanager/files/modemmanager-1.0.0-logging-serial.patch new file mode 100644 index 000000000000..6114a9ea13a2 --- /dev/null +++ b/net-misc/modemmanager/files/modemmanager-1.0.0-logging-serial.patch @@ -0,0 +1,76 @@ +From e900ed645afe5d8d871152fb264994ecfab77778 Mon Sep 17 00:00:00 2001 +From: Dan Williams <dcbw@redhat.com> +Date: Tue, 23 Jul 2013 15:00:23 +0000 +Subject: serial: add logging to serial port open failures + +--- +diff --git a/src/mm-serial-port.c b/src/mm-serial-port.c +index 0f81c7b..8774d40 100644 +--- a/src/mm-serial-port.c ++++ b/src/mm-serial-port.c +@@ -868,6 +868,7 @@ mm_serial_port_open (MMSerialPort *self, GError **error) + const char *device; + struct serial_struct sinfo = { 0 }; + GTimeVal tv_start, tv_end; ++ int errno_save; + + g_return_val_if_fail (MM_IS_SERIAL_PORT (self), FALSE); + +@@ -897,6 +898,7 @@ mm_serial_port_open (MMSerialPort *self, GError **error) + devfile = g_strdup_printf ("/dev/%s", device); + errno = 0; + priv->fd = open (devfile, O_RDWR | O_EXCL | O_NONBLOCK | O_NOCTTY); ++ errno_save = errno; + g_free (devfile); + } + +@@ -908,13 +910,16 @@ mm_serial_port_open (MMSerialPort *self, GError **error) + g_set_error (error, + MM_SERIAL_ERROR, + (errno == ENODEV) ? MM_SERIAL_ERROR_OPEN_FAILED_NO_DEVICE : MM_SERIAL_ERROR_OPEN_FAILED, +- "Could not open serial device %s: %s", device, strerror (errno)); ++ "Could not open serial device %s: %s", device, strerror (errno_save)); ++ mm_warn ("(%s) could not open serial device (%d)", device, errno_save); + return FALSE; + } + + if (ioctl (priv->fd, TIOCEXCL) < 0) { ++ errno_save = errno; + g_set_error (error, MM_SERIAL_ERROR, MM_SERIAL_ERROR_OPEN_FAILED, +- "Could not lock serial device %s: %s", device, strerror (errno)); ++ "Could not lock serial device %s: %s", device, strerror (errno_save)); ++ mm_warn ("(%s) could not lock serial device (%d)", device, errno_save); + goto error; + } + +@@ -922,14 +927,18 @@ mm_serial_port_open (MMSerialPort *self, GError **error) + tcflush (priv->fd, TCIOFLUSH); + + if (tcgetattr (priv->fd, &priv->old_t) < 0) { ++ errno_save = errno; + g_set_error (error, MM_SERIAL_ERROR, MM_SERIAL_ERROR_OPEN_FAILED, +- "Could not open serial device %s: %s", device, strerror (errno)); ++ "Could not set attributes on serial device %s: %s", device, strerror (errno_save)); ++ mm_warn ("(%s) could not set attributes on serial device (%d)", device, errno_save); + goto error; + } + + g_warn_if_fail (MM_SERIAL_PORT_GET_CLASS (self)->config_fd); +- if (!MM_SERIAL_PORT_GET_CLASS (self)->config_fd (self, priv->fd, error)) ++ if (!MM_SERIAL_PORT_GET_CLASS (self)->config_fd (self, priv->fd, error)) { ++ mm_dbg ("(%s) failed to configure serial device", device); + goto error; ++ } + + /* Don't wait for pending data when closing the port; this can cause some + * stupid devices that don't respond to URBs on a particular port to hang +@@ -966,6 +975,7 @@ success: + return TRUE; + + error: ++ mm_warn ("(%s) failed to open serial device", device); + close (priv->fd); + priv->fd = -1; + return FALSE; +-- +cgit v0.9.0.2-2-gbebe diff --git a/net-misc/modemmanager/modemmanager-1.0.0.ebuild b/net-misc/modemmanager/modemmanager-1.0.0-r1.ebuild index c2df91e1c41e..64f604cefcd5 100644 --- a/net-misc/modemmanager/modemmanager-1.0.0.ebuild +++ b/net-misc/modemmanager/modemmanager-1.0.0-r1.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/modemmanager/modemmanager-1.0.0.ebuild,v 1.1 2013/07/20 19:26:36 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/modemmanager/modemmanager-1.0.0-r1.ebuild,v 1.1 2013/07/24 05:40:11 pacho Exp $ EAPI="5" -inherit eutils user multilib readme.gentoo toolchain-funcs udev virtualx +inherit autotools eutils user multilib readme.gentoo toolchain-funcs udev virtualx DESCRIPTION="Modem and mobile broadband management libraries" HOMEPAGE="http://cgit.freedesktop.org/ModemManager/ModemManager/" @@ -40,7 +40,14 @@ src_prepare() { add your user account to the 'plugdev' group." fi + # Fix dbus activation file generation, bug #477710 + epatch "${FILESDIR}/${P}-dbus-generation.patch" + + # Add logging to serial port open failures (from 1.0 branch) + epatch "${FILESDIR}/${P}-logging-serial.patch" + epatch_user + eautoreconf } src_configure() { |