Commits

Kaleb Elwert committed 8039ab9

added wicd-1.7.2.3 as a temp fix

  • Participants
  • Parent commits dd8fc30

Comments (0)

Files changed (9)

File net-misc/wicd/Manifest

+AUX add-wpa-psk-hex-template.patch 980 RMD160 9071bc60a01d2637df92309e183c11286c790f49 SHA1 febafc67f6501af227964e7a8af8d45ab0b6a0e4 SHA256 d5e45971adb2cd8649c81ce3a4edfb4bda954981767ff8a95374b062b460fca7
+AUX wicd-1.7.1-provide-net.patch 327 RMD160 6eac2871820541d9fcdc22b0e1cccb2f6443441e SHA1 5701f392a8fc41b1ed2bc8258c902ec03bf5f5be SHA256 9da2b1ccbc1c363466048bb1adf91612dd68b988bca96daad79ae1f81a89e09b
+AUX wicd-1.7.1_beta2-init.patch 409 RMD160 58abdf5debc49517977dd5b691c6fe24cd8303c6 SHA1 4c24f4bb924035e109e905789a7669d6e7b0e7ed SHA256 473146793cc9cf8b2b780c1ce13f27138662f9942b53e5a7e293634196fbebcf
+AUX wicd-1.7.1_pre20111210-fix-config-reading.patch 392 RMD160 0faf4dce918ab921cbfa1f9d51a88bbbcfb0a87c SHA1 cd964628f71c972ab1c6ca34946f4a3a30e0b255 SHA256 437b282881bda8146145a30d85848615da039ebf43fa18f89d62da944502fdc3
+AUX wicd-1.7.1_pre20111210-wpa-psk-hex-template.patch 920 RMD160 422aefe7be91d5f28ec2458a43ec546c198732cb SHA1 df6fbf1a68fbf0e4707d40377afddbbb769502c1 SHA256 b721a8b90c97330d12787608108dd8f1db99742c596a786d4fcfa1f3abb19be6
+AUX wicd-init-sve-start.patch 317 RMD160 e08a391b31c6d48e67ad51bcd8fb08457bbc0ebc SHA1 149775d7ef4deffc4e66f73fa47276ca194c92cb SHA256 20d7ada99465da5b50d03e5ef117226910bc20288278f6f788be3fbff05716db
+AUX wicd-init.d 434 RMD160 408065ff312ab595022f777853c15031bab17dcf SHA1 87426d2958c9e4bfff9b8ea48d5857d9e67aa191 SHA256 5546deda3d5fa8f6ee1125922f1217182b24d68a22f5a1212509bb13bf0156e2
+DIST Icone-Wicd-Lucid.tar.gz 9015 RMD160 b28de907ac557c7308b3cc5e094e3a31e1cf5ecb SHA1 36140c9d3319ad25978360a38533d800706dd54b SHA256 6e4e3483c6cff7398e6871dd3e4360e361e5c6e64007e8e1240fd1c259ac707e
+DIST wicd-1.7.2.3.tar.gz 454563 RMD160 b0f2f35252b2ff23866067224db4036c4ff9a48b SHA1 ec5300216dd1bb0aa85cd92b8a25c672a5d5c028 SHA256 beb8b52292d34d1a451c74023dc742887a127ac12bb7c4a902690255d45c1f16
+DIST wicd-mac4lin-icons.tar.xz 53136 RMD160 a5b26fda9bbabf48ddeff634f87cbcedeb3e99a4 SHA1 1a5ddf37b48a84f2a3dfc14eb2a8f01fd90b8b12 SHA256 4c48c769c71f962415e3bd3573557e9288351afb867347f9a6f652883ae31011
+EBUILD wicd-1.7.2.3.ebuild 4469 RMD160 162b41074d2938ea63e85a43b6b83bcdff2c28b6 SHA1 92dc4373397c03ae69d5e8aa5a91f80714ae2298 SHA256 a114df7389fc3100dc9230c78ae80890b5f485a488f6b1a37b17a0690128c311

File net-misc/wicd/files/add-wpa-psk-hex-template.patch

+diff -U 3 -dHrN wicd-1.7.1b2/encryption/templates/active wicd-1.7.1b2.new/encryption/templates/active
+--- wicd-1.7.1b2/encryption/templates/active	2010-10-29 16:36:55.000000000 +0100
++++ wicd-1.7.1b2.new/encryption/templates/active	2011-09-13 19:58:54.000000000 +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.1b2.new/encryption/templates/wpa-psk-hex
+--- wicd-1.7.1b2/encryption/templates/wpa-psk-hex	1970-01-01 01:00:00.000000000 +0100
++++ wicd-1.7.1b2.new/encryption/templates/wpa-psk-hex	2011-09-13 19:59:11.000000000 +0100
+@@ -0,0 +1,15 @@
++name = WPA 1/2 (Preshared Hex Key)
++author = Thomas Kahle
++version = 1
++require apsk *Preshared_Key
++-----
++ctrl_interface=/var/run/wpa_supplicant
++network={
++       ssid="$_ESSID"
++       scan_ssid=$_SCAN
++       proto=WPA RSN
++       key_mgmt=WPA-PSK
++       pairwise=CCMP TKIP
++       group=CCMP TKIP
++       psk=$_APSK
++}

File net-misc/wicd/files/wicd-1.7.1-provide-net.patch

+diff -U 3 -dHrN wicd-1.7.1.orig/in/init=gentoo=wicd.in wicd-1.7.1/in/init=gentoo=wicd.in
+--- wicd-1.7.1.orig/in/init=gentoo=wicd.in	2012-02-27 21:49:36.422873826 +0100
++++ wicd-1.7.1/in/init=gentoo=wicd.in	2012-02-27 21:50:26.957127714 +0100
+@@ -10,6 +10,7 @@
+ depend() {
+ 	need dbus
+ 	after hald
++	provide net
+ }
+ 
+ start() {

File net-misc/wicd/files/wicd-1.7.1_beta2-init.patch

+--- in/init=gentoo=wicd.in	2010-10-29 11:36:55.000000000 -0400
++++ in/init=gentoo=wicd.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 $?
+ }

File net-misc/wicd/files/wicd-1.7.1_pre20111210-fix-config-reading.patch

+=== modified file 'wicd/configmanager.py'
+--- wicd/configmanager.py	2011-12-08 17:56:03 +0000
++++ wicd/configmanager.py	2011-12-11 19:41:57 +0000
+@@ -37,7 +37,7 @@
+     conf = open(path)
+     newconf = ''
+     for line in conf:
+-        if '[' not in line or '=' not in line:
++        if '[' in line or '=' in line:
+             newconf += line
+     conf.close()
+     conf = open(path, 'w')
+

File net-misc/wicd/files/wicd-1.7.1_pre20111210-wpa-psk-hex-template.patch

+diff -U 3 -dHrN wicd.org/encryption/templates/active wicd/encryption/templates/active
+--- wicd.org/encryption/templates/active	2011-12-05 16:22:49.584224158 +0100
++++ wicd/encryption/templates/active	2011-12-05 16:16:10.736172566 +0100
+@@ -1,6 +1,7 @@
+ wpa
+ wpa-peap
+ wpa-psk
++wpa-psk-hex
+ wpa2-leap
+ wpa2-peap
+ wep-hex
+diff -U 3 -dHrN wicd.org/encryption/templates/wpa-psk-hex wicd/encryption/templates/wpa-psk-hex
+--- wicd.org/encryption/templates/wpa-psk-hex	1970-01-01 01:00:00.000000000 +0100
++++ wicd/encryption/templates/wpa-psk-hex	2011-12-05 16:16:43.428012863 +0100
+@@ -0,0 +1,15 @@
++name = WPA 1/2 (Preshared Hex Key)
++author = Thomas Kahle
++version = 1
++require apsk *Preshared_Key
++-----
++ctrl_interface=/var/run/wpa_supplicant
++network={
++       ssid="$_ESSID"
++       scan_ssid=$_SCAN
++       proto=WPA RSN
++       key_mgmt=WPA-PSK
++       pairwise=CCMP TKIP
++       group=CCMP TKIP
++       psk=$_APSK
++}

File net-misc/wicd/files/wicd-init-sve-start.patch

+diff -U 3 -dHrN wicd-1.7.1b2.old/in/init=gentoo=wicd.in wicd-1.7.1b2/in/init=gentoo=wicd.in
+--- wicd-1.7.1b2.old/in/init=gentoo=wicd.in	2011-05-07 20:52:13.000000000 +0200
++++ wicd-1.7.1b2/in/init=gentoo=wicd.in	2011-05-07 20:52:43.000000000 +0200
+@@ -35,5 +35,5 @@
+ 
+ restart() {
+ 	force_kill
+-	start
++	sve_start
+ }

File net-misc/wicd/files/wicd-init.d

+#!/sbin/runscript
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+opts="start stop restart"
+
+WICD_DAEMON=/usr/sbin/wicd
+WICD_PIDFILE=/var/run/wicd/wicd.pid
+
+depend() {
+	need dbus
+}
+
+start() {
+	ebegin "Starting wicd daemon"
+	"${WICD_DAEMON}" >/dev/null 2>&1
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping wicd daemon"
+	start-stop-daemon --stop --pidfile "${WICD_PIDFILE}"
+	eend $?
+}

File net-misc/wicd/wicd-1.7.2.3.ebuild

+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/wicd-1.7.2.1.ebuild,v 1.3 2012/04/14 22:14:57 jdhore Exp $
+
+EAPI=3
+
+PYTHON_DEPEND="2"
+PYTHON_USE_WITH="ncurses? xml"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython"
+DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES="1"
+
+inherit eutils distutils systemd
+
+DESCRIPTION="A lightweight wired and wireless network manager for Linux"
+HOMEPAGE="http://wicd.sourceforge.net/"
+SRC_URI="http://launchpad.net/wicd/1.7/${PV}/+download/${P}.tar.gz
+	mac4lin? ( http://dev.gentoo.org/~anarchy/dist/wicd-mac4lin-icons.tar.xz )
+	ambiance? ( http://freetimesblog.altervista.org/blog/wp-content/uploads/downloads/2010/05/Icone-Wicd-Lucid.tar.gz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="X ambiance +gtk ioctl libnotify mac4lin ncurses nls +pm-utils"
+
+DEPEND="nls? ( dev-python/Babel )"
+# 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 considered
+# first if none are installed.
+RDEPEND="
+	dev-python/dbus-python
+	X? ( gtk? ( dev-python/pygtk
+		|| (
+			x11-misc/ktsuss
+			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? (
+		dev-python/urwid
+		dev-python/pygobject:2
+	)
+	pm-utils? ( >=sys-power/pm-utils-1.1.1 )
+	"
+DOCS="CHANGES NEWS AUTHORS README"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.7.1_beta2-init.patch
+	epatch "${FILESDIR}"/${PN}-init-sve-start.patch
+	# Add a template for hex psk's and wpa (Bug 306423)
+	epatch "${FILESDIR}"/${PN}-1.7.1_pre20111210-wpa-psk-hex-template.patch
+	# get rid of opts variable to fix bug 381885
+	sed -i "/opts/d" "in/init=gentoo=wicd.in" || die
+	# Make init script provide net per bug 405775
+	epatch "${FILESDIR}"/${PN}-1.7.1-provide-net.patch
+	# Need to ensure that generated scripts use Python 2 at run time.
+	sed -e "s:self.python = '/usr/bin/python':self.python = '/usr/bin/python2':" \
+	  -i setup.py || die "sed failed"
+	if use nls; then
+	  # Asturian is faulty with PyBabel
+	  # (https://bugs.launchpad.net/wicd/+bug/928589)
+	  rm po/ast.po
+	else
+	  # nuke translations
+	  rm po/*.po
+	fi
+	python_copy_sources
+}
+
+src_configure() {
+	local myconf
+	use gtk || myconf="${myconf} --no-install-gtk"
+	use libnotify || myconf="${myconf} --no-use-notifications"
+	use ncurses || myconf="${myconf} --no-install-ncurses"
+	use pm-utils || myconf="${myconf} --no-install-pmutils"
+	configuration() {
+		$(PYTHON) ./setup.py configure --no-install-docs --resume=/usr/share/wicd/scripts/ --suspend=/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
+	systemd_dounit "${S}/other/wicd.service"
+
+	if use mac4lin; then
+		rm -rf "${D}"/usr/share/pixmaps/wicd || die "Failed to remove old icons"
+		mv "${WORKDIR}"/wicd "${D}"/usr/share/pixmaps/
+	fi
+	if use ambiance; then
+		# Overwrite tray icons with ambiance icon
+		rm "${WORKDIR}/Icone Wicd Lucid"/signal*
+		cp "${WORKDIR}/Icone Wicd Lucid"/*.png "${D}"/usr/share/pixmaps/wicd/
+	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 runlevels"
+	elog "- Add these scripts to the RC_PLUG_SERVICES line in /etc/rc.conf"
+	elog "(For example, rc_hotplug=\"!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' group. If"
+			ewarn "you are not in that group, then modify /etc/dbus-1/system.d/wicd.conf"
+	fi
+}