From d6e890df5ca8f46848c78664d8f909bd9ac2f4f0 Mon Sep 17 00:00:00 2001 From: Robert Piasek Date: Sat, 14 Feb 2009 12:50:32 +0000 Subject: Backported patch to close serial device on HUP svn path=/overlay/; revision=79 --- net-misc/modemmanager/Manifest | 4 +- .../modemmanager-0.2-close-serial-on-HUP.patch | 27 ++++++++++++++ net-misc/modemmanager/modemmanager-0.2-r1.ebuild | 43 ++++++++++++++++++++++ net-misc/modemmanager/modemmanager-0.2.ebuild | 39 -------------------- 4 files changed, 73 insertions(+), 40 deletions(-) create mode 100644 net-misc/modemmanager/files/modemmanager-0.2-close-serial-on-HUP.patch create mode 100644 net-misc/modemmanager/modemmanager-0.2-r1.ebuild delete mode 100644 net-misc/modemmanager/modemmanager-0.2.ebuild diff --git a/net-misc/modemmanager/Manifest b/net-misc/modemmanager/Manifest index 057d93b..ddce629 100644 --- a/net-misc/modemmanager/Manifest +++ b/net-misc/modemmanager/Manifest @@ -1,2 +1,4 @@ +AUX modemmanager-0.2-close-serial-on-HUP.patch 746 RMD160 9f004b7fe34a7d3c475aa20cab134c25acd0e280 SHA1 38b99acf271c0dfaf6831b0dfc271a7bc60835db SHA256 2fb7971323c57b6c0f168373e8869f1ba0b436fbc90def433e252a2ae8ae023f DIST ModemManager-0.2.tar.gz 366121 RMD160 4eefd52c9a38edb2d5927113b707f2316f0431a0 SHA1 03704167b76db5903626fa86d95a69748d986e64 SHA256 090731de09b3042ed0e53a932dd29d3ba556418378b99dfa4621e4544a806bc6 -EBUILD modemmanager-0.2.ebuild 880 RMD160 ca3f8c2f9e6e19019397e13d7f642ba8f044500f SHA1 435e07242de5cf56d40238ea52be0ed2ed6575cc SHA256 f8f99c091edb1aaac2edb67208a5f3e63424ff5baba9da9db7fe9d4199f9e8b5 +EBUILD modemmanager-0.2-r1.ebuild 953 RMD160 1fe96d696e3ab1f5796e8c7667695d13cb332f8c SHA1 fdb7b66510b4912e05ee6e61fda30f98567f1143 SHA256 0ec44d2a027d795d9f3208c0cdf280ebcc1d6aecafc612a72e50e2515c677e47 +MISC modemmanager-0.2-r1.ebuild~ 934 RMD160 761903df9f3efea0b53d7bb926fbecf1123ff0db SHA1 31e00b5f14b731d1e22fa71a5a1f7846c1236db7 SHA256 1d59eac167118383c945bd1e8366d55bf9ced34dc2c4c3f64dc54d62edca220d diff --git a/net-misc/modemmanager/files/modemmanager-0.2-close-serial-on-HUP.patch b/net-misc/modemmanager/files/modemmanager-0.2-close-serial-on-HUP.patch new file mode 100644 index 0000000..37b2ce0 --- /dev/null +++ b/net-misc/modemmanager/files/modemmanager-0.2-close-serial-on-HUP.patch @@ -0,0 +1,27 @@ +From 13facad4fa3be24d07768892135caebd88e95fcc Mon Sep 17 00:00:00 2001 +From: Tambet Ingo +Date: Fri, 13 Feb 2009 08:54:21 +0000 +Subject: Close the serial device on HUP. + +--- +diff --git a/src/mm-serial.c b/src/mm-serial.c +index fb3cad1..c81ca70 100644 +--- a/src/mm-serial.c ++++ b/src/mm-serial.c +@@ -476,7 +476,13 @@ data_available (GIOChannel *source, + gsize bytes_read; + GIOStatus status; + +- if (condition & G_IO_HUP || condition & G_IO_ERR) { ++ if (condition & G_IO_HUP) { ++ g_string_truncate (priv->response, 0); ++ mm_serial_close (self); ++ return FALSE; ++ } ++ ++ if (condition & G_IO_ERR) { + g_string_truncate (priv->response, 0); + return TRUE; + } +-- +cgit v0.8.2 diff --git a/net-misc/modemmanager/modemmanager-0.2-r1.ebuild b/net-misc/modemmanager/modemmanager-0.2-r1.ebuild new file mode 100644 index 0000000..727ba04 --- /dev/null +++ b/net-misc/modemmanager/modemmanager-0.2-r1.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +inherit eutils + +# ModemManager likes itself with capital letters +MY_P=${P/modemmanager/ModemManager} + +DESCRIPTION="Modem and mobile broadband management for NetworkManager-0.7." +HOMEPAGE="http://mail.gnome.org/archives/networkmanager-list/2008-July/msg00274.html" +SRC_URI="http://people.freedesktop.org/~tambet/ModemManager-0.2.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="" + +DEPEND="dev-util/pkgconfig + dev-util/intltool + net-dialup/ppp + >=net-misc/networkmanager-0.7.0-r2" + +RDEPEND=${DEPEND} + +S=${WORKDIR}/${MY_P} + +src_unpack () { + unpack ${A} + cd "${S}" + + epatch "${FILESDIR}"/${P}-close-serial-on-HUP.patch +} + +src_compile() { + econf || die "econf failed" + emake || die "emake failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + dodoc AUTHORS ChangeLog NEWS README +} diff --git a/net-misc/modemmanager/modemmanager-0.2.ebuild b/net-misc/modemmanager/modemmanager-0.2.ebuild deleted file mode 100644 index 170ff24..0000000 --- a/net-misc/modemmanager/modemmanager-0.2.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -inherit eutils - -# ModemManager likes itself with capital letters -MY_P=${P/modemmanager/ModemManager} - -DESCRIPTION="Modem and mobile broadband management for NetworkManager-0.7." -HOMEPAGE="http://mail.gnome.org/archives/networkmanager-list/2008-July/msg00274.html" -SRC_URI="http://people.freedesktop.org/~tambet/ModemManager-0.2.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="" - -DEPEND="dev-util/pkgconfig - dev-util/intltool - net-dialup/ppp - >=net-misc/networkmanager-0.7.0-r2" - -S=${WORKDIR}/${MY_P} - -src_unpack () { - unpack ${A} - cd "${S}" -} - -src_compile() { - econf || die "econf failed" - emake || die "emake failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - dodoc AUTHORS ChangeLog NEWS README -} -- cgit v1.2.3-65-gdbad