Update to 2.3.0b2

3 files changed, 63 insertions, 40 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 04e799a36c44..02edee9cc687 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,32 @@
 pkgbase = mininet
-	pkgdesc = Process-based network emulator (stable branch)
-	pkgver = 2.2.2
+	pkgdesc = Emulator for rapid prototyping of Software Defined Networks
+	pkgver = 2.3.0b2
 	pkgrel = 1
-	url = https://github.com/mininet/mininet/
+	url = https://github.com/mininet/mininet
 	install = mininet.install
-	arch = i686
 	arch = x86_64
 	license = custom
+	makedepends = git
 	makedepends = help2man
-	makedepends = python2-setuptools
-	depends = bash
-	depends = python2
-	depends = python2-networkx
+	makedepends = python-setuptools
+	depends = python
+	depends = iproute2
 	depends = net-tools
 	depends = iputils
+	depends = inetutils
 	depends = iperf
+	depends = ethtool
+	depends = libcgroup
 	depends = openvswitch
-	optdepends = xorg-xhost
-	source = https://github.com/mininet/mininet/archive/2.2.2.tar.gz
-	sha256sums = d0aed2ea7a9096ae975694a4b3d0995259ef79268dd8888ba8be28601c100db5
+	depends = psmisc
+	optdepends = xorg-xhost: for X11 forwarding
+	optdepends = socat: for X11 forwarding
+	optdepends = xterm: required for MiniEdit
+	optdepends = tk: required for MiniEdit
+	source = https://github.com/mininet/mininet/archive/2.3.0b2.tar.gz
+	source = git+https://github.com/mininet/openflow
+	sha256sums = 9c879d995ba01717c739d5baedb11a35754f34b629579c640e5d3c48f835424f
+	sha256sums = SKIP
 
 pkgname = mininet
 
diff --git a/PKGBUILD b/PKGBUILD
index 2f42d1c36a9a..1733d14869c6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,37 +1,54 @@
-# Maintainer: Pedro Martinez-Julia <pedromj@gmail.com>
 # Contributor: Walter Dworak <preparationh67@gmail.com>
+# Contributor: Pedro Martinez-Julia <pedromj@gmail.com>
+# Maintainer: Kuan-Yen Chou <kuanyenchou@gmail.com>
 
 pkgname=mininet
-pkgver=2.2.2
+pkgver=2.3.0b2
 pkgrel=1
-pkgdesc="Process-based network emulator (stable branch)"
-url="https://github.com/mininet/mininet/"
+pkgdesc='Emulator for rapid prototyping of Software Defined Networks'
+depends=('python' 'iproute2' 'net-tools' 'iputils' 'inetutils' 'iperf' 'ethtool'
+         'libcgroup' 'openvswitch' 'psmisc')
+optdepends=('xorg-xhost: for X11 forwarding'
+            'socat: for X11 forwarding'
+            'xterm: required for MiniEdit'
+            'tk: required for MiniEdit')
+makedepends=('git' 'help2man' 'python-setuptools')
+arch=('x86_64')
+url='https://github.com/mininet/mininet'
 license=('custom')
-depends=('bash' 'python2' 'python2-networkx' 'net-tools' 'iputils' 'iperf' 'openvswitch')
-optdepends=('xorg-xhost')
-makedepends=('help2man' 'python2-setuptools')
-install="${pkgname}.install"
-arch=('i686' 'x86_64')
-source=("https://github.com/mininet/mininet/archive/$pkgver.tar.gz")
-sha256sums=('d0aed2ea7a9096ae975694a4b3d0995259ef79268dd8888ba8be28601c100db5')
+install=mininet.install
+source=("https://github.com/mininet/mininet/archive/$pkgver.tar.gz"
+        'git+https://github.com/mininet/openflow')  # for UserSwitch
+sha256sums=('9c879d995ba01717c739d5baedb11a35754f34b629579c640e5d3c48f835424f'
+            'SKIP')
 
 prepare () {
+    cd "$srcdir/openflow"
+    sed '/^include debian\/automake.mk/d' -i Makefile.am
+    # Patch controller to handle more than 16 switches
+    patch -Np1 -i "$srcdir/$pkgname-$pkgver/util/openflow-patches/controller.patch"
+
 	cd "$srcdir/$pkgname-$pkgver"
-	grep python2 Makefile && return
-	grep -rIil '#!.*python' . | xargs -n1 sed -i 's:#!/usr/bin/env python:#!/usr/bin/env python2:g'
-	grep -rIil '#!.*python' . | xargs -n1 sed -i 's:#!/usr/bin/python:#!/usr/bin/python2:g'
-	sed 's:BINDIR = /usr/bin:BINDIR = $(DESTDIR)/usr/bin:g' -i Makefile
-	sed 's:MANDIR = /usr/share/man/man1:MANDIR = $(DESTDIR)/usr/share/man/man1:g' -i Makefile
-	sed 's:install $(MNEXEC) $(BINDIR):mkdir -p $(BINDIR); install $(MNEXEC) $(BINDIR):g' -i Makefile
-	sed 's:install $(MANPAGES) $(MANDIR):mkdir -p $(MANDIR);install $(MANPAGES) $(MANDIR):g' -i Makefile
-	sed 's:python setup.py:python2 setup.py install --prefix=/usr --root="$(DESTDIR)" --optimize=1:g' -i Makefile
+    sed 's:PREFIX ?= /usr:PREFIX ?= "$(DESTDIR)"/usr:' -i Makefile
+    sed '/^[[:space:]]*$(PYTHON) /d' -i Makefile
 }
 
 build () {
+    cd "$srcdir/openflow"
+    autoreconf --install --force
+    ./configure --prefix=/usr --sbindir=/usr/bin
+    make
+
 	cd "$srcdir/$pkgname-$pkgver"
+    make mnexec man
 }
 
 package () {
+    cd "$srcdir/openflow"
+    make DESTDIR="${pkgdir}" install
+
 	cd "$srcdir/$pkgname-$pkgver"
-	make DESTDIR="${pkgdir}" install
+    make DESTDIR="${pkgdir}" install
+    python setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1
+    install -Dm 644 LICENSE "${pkgdir}/usr/share/licenses/mininet/LICENSE"
 }
diff --git a/mininet.install b/mininet.install
index 1d6eb649ca15..5320fdafaaeb 100644
--- a/mininet.install
+++ b/mininet.install
@@ -1,14 +1,12 @@
 post_install() {
   cat << EOF
-   
-    Mininet requires Open vSwitch to be running in order to
-	instantiate switches. To run it, just execute the following
-	commands (as root or using sudo):
-   
-      # systemctl enable ovsdb-server.service
-      # systemctl start ovs-vswitchd.service
-      # systemctl enable ovsdb-server.service
-      # systemctl start ovs-vswitchd.service
+
+	Mininet requires Open vSwitch to be running in order to
+	instantiate switches. To run it, please execute the
+	following commands:
+
+	# systemctl enable ovs-vswitchd.service
+	# systemctl start ovs-vswitchd.service
 
 EOF
 }