From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RKvPR-0007LD-SF for garchives@archives.gentoo.org; Mon, 31 Oct 2011 17:12:30 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 047DC21C067; Mon, 31 Oct 2011 17:12:22 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id A7F8521C067 for ; Mon, 31 Oct 2011 17:12:22 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 121A81B401E for ; Mon, 31 Oct 2011 17:12:22 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 7D40180042 for ; Mon, 31 Oct 2011 17:12:21 +0000 (UTC) From: "Jory Pratt" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jory Pratt" Message-ID: Subject: [gentoo-commits] dev/anarchy:master commit in: net-misc/wicd/files/, net-misc/wicd/ X-VCS-Repository: dev/anarchy X-VCS-Files: net-misc/wicd/Manifest net-misc/wicd/files/add-wpa-psk-hex-template.patch net-misc/wicd/files/fix-ad-hoc-networking.patch net-misc/wicd/files/wicd-1.7.1_beta2-init.patch net-misc/wicd/files/wicd-1.7.1_beta2-urwid-1.0.patch net-misc/wicd/files/wicd-init-sve-start.patch net-misc/wicd/metadata.xml net-misc/wicd/wicd-1.7.1_beta2-r7.ebuild X-VCS-Directories: net-misc/wicd/files/ net-misc/wicd/ X-VCS-Committer: anarchy X-VCS-Committer-Name: Jory Pratt X-VCS-Revision: e497b74c1ac94d1fef773a6d9aa29e7b08863f24 Date: Mon, 31 Oct 2011 17:12:21 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 40fd4ba1-c11b-4e4f-b14a-adddc84ee5d3 X-Archives-Hash: 65d355a419b3fd566810495b8e9b3605 commit: e497b74c1ac94d1fef773a6d9aa29e7b08863f24 Author: Jory A. Pratt gentoo org> AuthorDate: Mon Oct 31 17:12:00 2011 +0000 Commit: Jory Pratt gentoo org> CommitDate: Mon Oct 31 17:12:00 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Ddev/anarchy.git;a=3D= commit;h=3De497b74c modified icon package now avaliable via mac4lin useflag --- net-misc/wicd/Manifest | 9 ++ net-misc/wicd/files/add-wpa-psk-hex-template.patch | 29 +++++ net-misc/wicd/files/fix-ad-hoc-networking.patch | 11 ++ net-misc/wicd/files/wicd-1.7.1_beta2-init.patch | 11 ++ .../wicd/files/wicd-1.7.1_beta2-urwid-1.0.patch | 20 +++ net-misc/wicd/files/wicd-init-sve-start.patch | 10 ++ net-misc/wicd/metadata.xml | 22 ++++ net-misc/wicd/wicd-1.7.1_beta2-r7.ebuild | 122 ++++++++++++++= ++++++ 8 files changed, 234 insertions(+), 0 deletions(-) diff --git a/net-misc/wicd/Manifest b/net-misc/wicd/Manifest new file mode 100644 index 0000000..0fd80db --- /dev/null +++ b/net-misc/wicd/Manifest @@ -0,0 +1,9 @@ +AUX add-wpa-psk-hex-template.patch 980 RMD160 9071bc60a01d2637df92309e18= 3c11286c790f49 SHA1 febafc67f6501af227964e7a8af8d45ab0b6a0e4 SHA256 d5e45= 971adb2cd8649c81ce3a4edfb4bda954981767ff8a95374b062b460fca7 +AUX fix-ad-hoc-networking.patch 729 RMD160 4e2a7b36eade357aa7fcd83b8d37e= 4ec9052212e SHA1 60b69e24e06f10e6d8dce99c6f89c33db79d644a SHA256 1e476d6f= e340bc652c747e544b8795f5f01d5c899986fe179ba370a167a441f4 +AUX wicd-1.7.1_beta2-init.patch 409 RMD160 58abdf5debc49517977dd5b691c6f= e24cd8303c6 SHA1 4c24f4bb924035e109e905789a7669d6e7b0e7ed SHA256 47314679= 3cc9cf8b2b780c1ce13f27138662f9942b53e5a7e293634196fbebcf +AUX wicd-1.7.1_beta2-urwid-1.0.patch 895 RMD160 13aec910e261d4f5574a9aeb= c365570b03089fe5 SHA1 db2b6a4811a9413ca4d8137bd387fdfdee4e718a SHA256 298= 8afdd35f7d9d0d374ce523a9c4ed193e25e70fd6eb2e9a05ec8b520e952ff +AUX wicd-init-sve-start.patch 317 RMD160 e08a391b31c6d48e67ad51bcd8fb084= 57bbc0ebc SHA1 149775d7ef4deffc4e66f73fa47276ca194c92cb SHA256 20d7ada994= 65da5b50d03e5ef117226910bc20288278f6f788be3fbff05716db +DIST wicd-1.7.1b2.tar.bz2 509990 RMD160 587e922271d017eb67499f64c2502b02= def44f9d SHA1 2e3d2346f1607f7f63bb00bf7fef41bc5a419726 SHA256 810d51b3eec= 10be39b399f8baa0b2ef36ed7bb14606f9e0844bea11b8532ea8d +DIST wicd-mac4lin-icons.tar.bz2 125113 RMD160 b6c88fd0f9ac8bd4694efeb23e= ab0df582636376 SHA1 3ece6bfdd58bfee5de107d0d6ef5dc474e3c4e53 SHA256 73ece= 7db5bb080659ae4c18d6078ec3fffd0eae5abf22a71e595b69a0e11f13c +EBUILD wicd-1.7.1_beta2-r7.ebuild 3978 RMD160 cf58f1d3291a5b5bf4ba5bdbd9= 68249839c97d03 SHA1 5e0d30be9b4d2aec6a86d4da0a1786e1dafc8c1e SHA256 8fdc5= 4446d2c3fca64f375d68a411a7e5c16076536915a349cc7bb9843a2ff32 +MISC metadata.xml 859 RMD160 1809a78002a3e58a0b5283a03de02d129a1e57f9 SH= A1 6e366622688eda2ea1bbf75f6358a2b25e550459 SHA256 674f4e5d3063fa47f95334= 1f0cb39d4abe65538510c5b29a0255896903fd1653 diff --git a/net-misc/wicd/files/add-wpa-psk-hex-template.patch b/net-mis= c/wicd/files/add-wpa-psk-hex-template.patch new file mode 100644 index 0000000..21daaf3 --- /dev/null +++ b/net-misc/wicd/files/add-wpa-psk-hex-template.patch @@ -0,0 +1,29 @@ +diff -U 3 -dHrN wicd-1.7.1b2/encryption/templates/active wicd-1.7.1b2.ne= w/encryption/templates/active +--- wicd-1.7.1b2/encryption/templates/active 2010-10-29 16:36:55.0000000= 00 +0100 ++++ wicd-1.7.1b2.new/encryption/templates/active 2011-09-13 19:58:54.000= 000000 +0100 +@@ -1,5 +1,6 @@ + wpa + wpa-psk ++wpa-psk-hex + wep-hex + wep-passphrase + wep-shared +diff -U 3 -dHrN wicd-1.7.1b2/encryption/templates/wpa-psk-hex wicd-1.7.1= b2.new/encryption/templates/wpa-psk-hex +--- wicd-1.7.1b2/encryption/templates/wpa-psk-hex 1970-01-01 01:00:00.00= 0000000 +0100 ++++ wicd-1.7.1b2.new/encryption/templates/wpa-psk-hex 2011-09-13 19:59:1= 1.000000000 +0100 +@@ -0,0 +1,15 @@ ++name =3D WPA 1/2 (Preshared Hex Key) ++author =3D Thomas Kahle ++version =3D 1 ++require apsk *Preshared_Key ++----- ++ctrl_interface=3D/var/run/wpa_supplicant ++network=3D{ ++ ssid=3D"$_ESSID" ++ scan_ssid=3D$_SCAN ++ proto=3DWPA RSN ++ key_mgmt=3DWPA-PSK ++ pairwise=3DCCMP TKIP ++ group=3DCCMP TKIP ++ psk=3D$_APSK ++} diff --git a/net-misc/wicd/files/fix-ad-hoc-networking.patch b/net-misc/w= icd/files/fix-ad-hoc-networking.patch new file mode 100644 index 0000000..344e51a --- /dev/null +++ b/net-misc/wicd/files/fix-ad-hoc-networking.patch @@ -0,0 +1,11 @@ +--- wicd-1.7.0/wicd/wnettools.py 2010-01-15 12:49:11.000000000 +0800 ++++ wicd-1.7.0.patched/wicd/wnettools.py 2010-12-12 03:50:31.000000000 += 0800 +@@ -59,7 +59,7 @@ wpa2_pattern =3D re.compile('(WPA2)', _re_ +=20 + #iwconfig-only regular expressions. + ip_pattern =3D re.compile(r'inet [Aa]d?dr[^.]*:([^.]*\.[^.]*\.[^.]*\.[0= -9]*)', re.S) +-bssid_pattern =3D re.compile('.*Access Point: (([0-9A-Z]{2}:){5}[0-9A-Z= ]{2})', _re_mode) ++bssid_pattern =3D re.compile('.*[(Access Point)|(Cell)]: (([0-9A-Z]{2}:= ){5}[0-9A-Z]{2})', _re_mode) + bitrate_pattern =3D re.compile('.*Bit Rate[=3D:](.*?/s)', _re_mode) + opmode_pattern =3D re.compile('.*Mode:(.*?) ', _re_mode) + authmethods_pattern =3D re.compile('.*Authentication capabilities :\n(.= *?)Current', _re_mode) diff --git a/net-misc/wicd/files/wicd-1.7.1_beta2-init.patch b/net-misc/w= icd/files/wicd-1.7.1_beta2-init.patch new file mode 100644 index 0000000..6a736f9 --- /dev/null +++ b/net-misc/wicd/files/wicd-1.7.1_beta2-init.patch @@ -0,0 +1,11 @@ +--- in/init=3Dgentoo=3Dwicd.in 2010-10-29 11:36:55.000000000 -0400 ++++ in/init=3Dgentoo=3Dwicd.in.new 2011-03-28 09:40:27.245339002 -0400 +@@ -15,7 +15,7 @@ + start() { + ebegin "Starting wicd daemon" + # fix Gentoo bug 296197 +- sed -i 's/^\[\]$//' /etc/wicd/wired-settings.conf ++ [ -f /etc/wicd/wired-settings.conf ] && sed -i 's/^\[\]$//' /etc/wicd/= wired-settings.conf + "${WICD_DAEMON}" >/dev/null 2>&1 + eend $? + } diff --git a/net-misc/wicd/files/wicd-1.7.1_beta2-urwid-1.0.patch b/net-m= isc/wicd/files/wicd-1.7.1_beta2-urwid-1.0.patch new file mode 100644 index 0000000..b1b5abc --- /dev/null +++ b/net-misc/wicd/files/wicd-1.7.1_beta2-urwid-1.0.patch @@ -0,0 +1,20 @@ +--- /usr/share/wicd/curses/wicd-curses.py.old 2011-10-01 14:54:47.478406= 517 +0400 ++++ /usr/share/wicd/curses/wicd-curses.py 2011-10-01 14:49:50.781273004 = +0400 +@@ -241,7 +241,7 @@ + # Don't stop because someone let go of the mouse on the frame + mouse_release =3D False + for k in keys: +- if urwid.is_mouse_event(k) and k[0] =3D=3D "mouse release": ++ if urwid.util.is_mouse_event(k) and k[0] =3D=3D "mouse rele= ase": + mouse_release =3D True + break + if mouse_release : +@@ -882,7 +882,7 @@ + data[4], False) + =20 + for k in keys: +- if urwid.is_mouse_event(k): ++ if urwid.util.is_mouse_event(k): + event, button, col, row =3D k + self.frame.mouse_event( self.size, + event, button, col, row, diff --git a/net-misc/wicd/files/wicd-init-sve-start.patch b/net-misc/wic= d/files/wicd-init-sve-start.patch new file mode 100644 index 0000000..c631492 --- /dev/null +++ b/net-misc/wicd/files/wicd-init-sve-start.patch @@ -0,0 +1,10 @@ +diff -U 3 -dHrN wicd-1.7.1b2.old/in/init=3Dgentoo=3Dwicd.in wicd-1.7.1b2= /in/init=3Dgentoo=3Dwicd.in +--- wicd-1.7.1b2.old/in/init=3Dgentoo=3Dwicd.in 2011-05-07 20:52:13.0000= 00000 +0200 ++++ wicd-1.7.1b2/in/init=3Dgentoo=3Dwicd.in 2011-05-07 20:52:43.00000000= 0 +0200 +@@ -35,5 +35,5 @@ +=20 + restart() { + force_kill +- start ++ sve_start + } diff --git a/net-misc/wicd/metadata.xml b/net-misc/wicd/metadata.xml new file mode 100644 index 0000000..71524bb --- /dev/null +++ b/net-misc/wicd/metadata.xml @@ -0,0 +1,22 @@ + + + + + tomka@gentoo.org + Thomas Kahle + + + c1pher@gentoo.org + Dane Smith + + + Installs a gtk UI. This is enabled by default becaus= e it is + intended behavior. Requires dev-python/pygtk + Installs additional python libraries to use as a b= ackend. + This will improve speed but is experimental. + Installs a ncurses UI + Installs the pm-utils hooks for suspend/resume = and + requires sys-power/pm-utils + Install icons that match mac4lin icons for syste= m tray" + + diff --git a/net-misc/wicd/wicd-1.7.1_beta2-r7.ebuild b/net-misc/wicd/wic= d-1.7.1_beta2-r7.ebuild new file mode 100644 index 0000000..8ec1d25 --- /dev/null +++ b/net-misc/wicd/wicd-1.7.1_beta2-r7.ebuild @@ -0,0 +1,122 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/wicd-1.7.1_beta2-r7.ebu= ild,v 1.3 2011/10/27 21:04:41 tomka Exp $ + +EAPI=3D3 + +PYTHON_DEPEND=3D"2" +PYTHON_USE_WITH=3D"ncurses? xml" +SUPPORT_PYTHON_ABIS=3D"1" +RESTRICT_PYTHON_ABIS=3D"3.* *-jython" +DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES=3D"1" + +inherit eutils distutils + +MY_P=3D${P/_beta/b} +S=3D"${WORKDIR}/${MY_P}" + +DESCRIPTION=3D"A lightweight wired and wireless network manager for Linu= x" +HOMEPAGE=3D"http://wicd.sourceforge.net/" +SRC_URI=3D"http://downloads.wicd.net/src/testing/1.7.x/${MY_P}.tar.bz2 + mac4lin? ( http://dev.gentoo.org/~anarchy/dist/wicd-mac4lin-icons.tar.b= z2 ) " + +LICENSE=3D"GPL-2" +SLOT=3D"0" +KEYWORDS=3D"~amd64 ~ppc ~ppc64 ~x86" +IUSE=3D"X +gtk ioctl libnotify mac4lin ncurses nls +pm-utils" + +DEPEND=3D"" +# Maybe virtual/dhcp would work, but there are enough problems with +# net-misc/dhcp that I want net-misc/dhcpcd to be guarenteed to be consi= dered +# first if none are installed. +RDEPEND=3D" + dev-python/dbus-python + X? ( gtk? ( dev-python/pygtk + || ( + x11-libs/gksu + kde-base/kdesu + ) + ) + ) + || ( + net-misc/dhcpcd + net-misc/dhcp + net-misc/pump + ) + net-wireless/wireless-tools + net-wireless/wpa_supplicant + || ( + sys-apps/net-tools + sys-apps/ethtool + ) + !gtk? ( dev-python/pygobject:2 ) + ioctl? ( dev-python/python-iwscan dev-python/python-wpactrl ) + libnotify? ( dev-python/notify-python ) + ncurses? ( + >=3Ddev-python/urwid-1.0.0 + dev-python/pygobject:2 + ) + pm-utils? ( >=3Dsys-power/pm-utils-1.1.1 ) + " +DOCS=3D"CHANGES NEWS AUTHORS README" + +src_prepare() { + epatch "${FILESDIR}"/${P}-init.patch + # Fix urwid calls + epatch "${FILESDIR}/${P}"-urwid-1.0.patch + epatch "${FILESDIR}"/${PN}-init-sve-start.patch + # Fix ad-hoc networking (bug 351337) + epatch "${FILESDIR}"/fix-ad-hoc-networking.patch + # Add a template for hex psk's and wpa (Bug 306423) + epatch "${FILESDIR}"/add-wpa-psk-hex-template.patch + # get rid of opts variable to fix bug 381885 + sed -i "/opts/d" "in/init=3Dgentoo=3Dwicd.in" + # Need to ensure that generated scripts use Python 2 at run time. + sed -e "s:self.python =3D '/usr/bin/python':self.python =3D '/usr/bin/p= ython2':" \ + -i setup.py || die "sed failed" + python_copy_sources +} + +src_configure() { + local myconf + use gtk || myconf=3D"${myconf} --no-install-gtk" + use libnotify || myconf=3D"${myconf} --no-use-notifications" + use ncurses || myconf=3D"${myconf} --no-install-ncurses" + use pm-utils || myconf=3D"${myconf} --no-install-pmutils" + configuration() { + $(PYTHON) ./setup.py configure --no-install-docs --resume=3D/usr/share= /wicd/scripts/ --suspend=3D/usr/share/wicd/scripts/ --verbose ${myconf} + } + python_execute_function -s configuration +} + +src_install() { + distutils_src_install + keepdir /var/lib/wicd/configurations \ + || die "keepdir failed, critical for this app" + keepdir /etc/wicd/scripts/{postconnect,disconnect,preconnect} \ + || die "keepdir failed, critical for this app" + keepdir /var/log/wicd \ + || die "keepdir failed, critical for this app" + use nls || rm -rf "${D}"/usr/share/locale + if use mac4lin; then + rm -rf "${D}"/usr/share/pixmaps/wicd || die "Failed to remove old icon= s" + mv "${WORKDIR}"/wicd "${D}"/usr/share/pixmaps/ + fi +} + +pkg_postinst() { + distutils_pkg_postinst + + elog "You may need to restart the dbus service after upgrading wicd." + echo + elog "To start wicd at boot, add /etc/init.d/wicd to a runlevel and:" + elog "- Remove all net.* initscripts (except for net.lo) from all runle= vels" + elog "- Add these scripts to the RC_PLUG_SERVICES line in /etc/rc.conf" + elog "(For example, rc_hotplug=3D\"!net.eth* !net.wlan*\")" + # Maintainer's note: the consolekit use flag short circuits a dbus rule= and + # allows the connection. Else, you need to be in the group. + if ! has_version sys-auth/pambase[consolekit]; then + ewarn "Wicd-1.6 and newer requires your user to be in the 'users' gro= up. If" + ewarn "you are not in that group, then modify /etc/dbus-1/system.d/wi= cd.conf" + fi +}