diff options
author | Tom Wambold | 2018-06-06 14:14:26 -0400 |
---|---|---|
committer | Tom Wambold | 2018-06-06 14:16:00 -0400 |
commit | 2973ed58fc78d2f6ecfaaf347a009b1be79b40d6 (patch) | |
tree | 3df5d8d7d579ae664baffa06fcaa41fa90f07a98 | |
parent | 0b2cb9026f71afe7258a63a7acd37015b330c8ee (diff) | |
download | aur-2973ed58fc78d2f6ecfaaf347a009b1be79b40d6.tar.gz |
Update to CORE 5.1 release.
-rw-r--r-- | .SRCINFO | 20 | ||||
-rw-r--r-- | .gitignore | 3 | ||||
-rw-r--r-- | PKGBUILD | 36 | ||||
-rw-r--r-- | core-daemon.service | 11 | ||||
-rw-r--r-- | python2.patch | 81 | ||||
-rw-r--r-- | sphinx-apidoc2.patch | 24 |
6 files changed, 52 insertions, 123 deletions
@@ -1,30 +1,30 @@ pkgbase = core pkgdesc = Common Open Research Emulator - pkgver = 4.8 - pkgrel = 3 - url = http://cs.itd.nrl.navy.mil/work/core/ + pkgver = 5.1 + pkgrel = 1 + url = https://github.com/coreemu/core/ arch = i686 arch = x86_64 license = BSD - makedepends = dia makedepends = help2man makedepends = imagemagick + makedepends = python2-sphinx + makedepends = openvswitch depends = libev depends = ebtables depends = iproute2 depends = python2 + depends = python2-enum34 depends = bridge-utils depends = tkimg depends = xterm conflicts = core-svn backup = etc/core/core.conf backup = etc/core/perflogserver.conf - source = http://downloads.pf.itd.nrl.navy.mil/core/source/core-4.8.tar.gz - source = core-daemon.service - source = python2.patch - md5sums = 20b3f10d0093af22c40423984e21aeee - md5sums = 256e39a074f36f7f1683e88324682c9e - md5sums = d80b160009135529e96986538b0d10a9 + source = https://github.com/coreemu/core/archive/release-5.1.tar.gz + source = sphinx-apidoc2.patch + md5sums = ff100baf762170d1e8f124b9493b98f5 + md5sums = a636bfcf4865709855079f3053504dda pkgname = core diff --git a/.gitignore b/.gitignore index 9536cb6f1ff2..414a6c0f7218 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /pkg/ /src/ -/core-*.tar.* +/core-*.pkg.* +/release-*.tar.gz @@ -1,43 +1,39 @@ # Maintainer: Tom Wambold <tom5760@gmail.com> pkgname=core -pkgver=4.8 -pkgrel=3 +pkgver=5.1 +pkgrel=1 pkgdesc="Common Open Research Emulator" arch=('i686' 'x86_64') -url="http://cs.itd.nrl.navy.mil/work/core/" +url="https://github.com/coreemu/core/" license=('BSD') -depends=('libev' 'ebtables' 'iproute2' 'python2' 'bridge-utils' 'tkimg' - 'xterm') -makedepends=('dia' 'help2man' 'imagemagick') +depends=('libev' 'ebtables' 'iproute2' 'python2' 'python2-enum34' + 'bridge-utils' 'tkimg' 'xterm') +makedepends=('help2man' 'imagemagick' 'python2-sphinx' 'openvswitch') conflicts=('core-svn') backup=('etc/core/core.conf' 'etc/core/perflogserver.conf') -source=("http://downloads.pf.itd.nrl.navy.mil/core/source/$pkgname-$pkgver.tar.gz" - 'core-daemon.service' - 'python2.patch') -md5sums=('20b3f10d0093af22c40423984e21aeee' - '256e39a074f36f7f1683e88324682c9e' - 'd80b160009135529e96986538b0d10a9') +source=("https://github.com/coreemu/core/archive/release-$pkgver.tar.gz" + 'sphinx-apidoc2.patch') +md5sums=('ff100baf762170d1e8f124b9493b98f5' + 'a636bfcf4865709855079f3053504dda') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/core-release-$pkgver" - patch -p1 < ../python2.patch + patch -p1 < ../sphinx-apidoc2.patch - ./configure CFLAGS="-Wno-strict-aliasing -Wno-int-in-bool-context" CPPFLAGS="-Wno-strict-aliasing -Wno-int-in-bool-context" PYTHON=/usr/bin/python2 --prefix=/usr + ./bootstrap.sh + ./configure CFLAGS=-fno-strict-aliasing PYTHON=/usr/bin/python2 --prefix=/usr make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/core-release-$pkgver" make DESTDIR="$pkgdir/" install rm "$pkgdir/etc/init.d/core-daemon" rmdir "$pkgdir/etc/init.d" - install -D "$srcdir/core-daemon.service" "$pkgdir/usr/lib/systemd/system/core-daemon.service" - - mv "$pkgdir/usr/sbin/"* "$pkgdir/usr/bin/" - rmdir "$pkgdir/usr/sbin" + install -D "$srcdir/core-release-$pkgver/scripts/core-daemon.service" "$pkgdir/usr/lib/systemd/system/core-daemon.service" } # vim:set ts=2 sw=2 et: diff --git a/core-daemon.service b/core-daemon.service deleted file mode 100644 index 089571f495cd..000000000000 --- a/core-daemon.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Common Open Research Emulator Service -After=network.target - -[Service] -Type=simple -PIDFile=/run/cored.pid -ExecStart=/usr/bin/python2 /usr/sbin/core-daemon -i /run/cored.pid - -[Install] -WantedBy=multi-user.target diff --git a/python2.patch b/python2.patch deleted file mode 100644 index 73e72b96c574..000000000000 --- a/python2.patch +++ /dev/null @@ -1,81 +0,0 @@ -diff -Naur a/daemon/core/misc/LatLongUTMconversion.py b/daemon/core/misc/LatLongUTMconversion.py ---- a/daemon/core/misc/LatLongUTMconversion.py 2015-06-05 10:19:41.000000000 -0400 -+++ b/daemon/core/misc/LatLongUTMconversion.py 2015-06-25 11:53:31.249286410 -0400 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python2 - # this file is from http://pygps.org/ - - # Lat Long - UTM, UTM - Lat Long conversions -diff -Naur a/daemon/examples/emanemodel2core.py b/daemon/examples/emanemodel2core.py ---- a/daemon/examples/emanemodel2core.py 2015-06-05 10:19:41.000000000 -0400 -+++ b/daemon/examples/emanemodel2core.py 2015-06-25 11:53:31.259286059 -0400 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python2 - # - # CORE - # Copyright (c) 2013 the Boeing Company. -diff -Naur a/daemon/examples/findcore.py b/daemon/examples/findcore.py ---- a/daemon/examples/findcore.py 2015-06-05 10:19:41.000000000 -0400 -+++ b/daemon/examples/findcore.py 2015-06-25 11:53:31.259286059 -0400 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python2 - # - # Search for installed CORE library files and Python bindings. - # -diff -Naur a/daemon/examples/stopsession.py b/daemon/examples/stopsession.py ---- a/daemon/examples/stopsession.py 2015-06-05 10:19:41.000000000 -0400 -+++ b/daemon/examples/stopsession.py 2015-06-25 11:53:31.259286059 -0400 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python2 - # (c)2010-2012 the Boeing Company - # author: Jeff Ahrenholz <jeffrey.m.ahrenholz@boeing.com> - # -diff -Naur a/daemon/sbin/core-daemon b/daemon/sbin/core-daemon ---- a/daemon/sbin/core-daemon 2015-06-05 10:19:41.000000000 -0400 -+++ b/daemon/sbin/core-daemon 2015-06-25 11:53:31.259286059 -0400 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python2 - # - # CORE - # Copyright (c)2010-2013 the Boeing Company. -diff -Naur a/daemon/sbin/core-manage b/daemon/sbin/core-manage ---- a/daemon/sbin/core-manage 2015-06-05 10:19:41.000000000 -0400 -+++ b/daemon/sbin/core-manage 2015-06-25 11:53:31.259286059 -0400 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python2 - # - # CORE - # Copyright (c)2014 the Boeing Company. -diff -Naur a/daemon/sbin/coresendmsg b/daemon/sbin/coresendmsg ---- a/daemon/sbin/coresendmsg 2015-06-05 10:19:41.000000000 -0400 -+++ b/daemon/sbin/coresendmsg 2015-06-25 11:53:31.249286410 -0400 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python2 - # - # CORE - # Copyright (c)2011-2012 the Boeing Company. -diff -Naur a/python-prefix.py b/python-prefix.py ---- a/python-prefix.py 2015-06-05 10:19:41.000000000 -0400 -+++ b/python-prefix.py 2015-06-25 11:53:31.249286410 -0400 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python2 - - import sys - import os.path -diff -Naur a/scripts/perf/perflogserver.py b/scripts/perf/perflogserver.py ---- a/scripts/perf/perflogserver.py 2015-06-05 10:19:41.000000000 -0400 -+++ b/scripts/perf/perflogserver.py 2015-06-25 11:53:31.249286410 -0400 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python2 - # - # (c)2011-2012 the Boeing Company - # diff --git a/sphinx-apidoc2.patch b/sphinx-apidoc2.patch new file mode 100644 index 000000000000..cbb2c6415904 --- /dev/null +++ b/sphinx-apidoc2.patch @@ -0,0 +1,24 @@ +diff -Naur b/configure.ac a/configure.ac +--- b/configure.ac 2018-05-31 00:20:52.000000000 -0400 ++++ a/configure.ac 2018-06-06 13:47:43.242993733 -0400 +@@ -163,7 +163,7 @@ + fi + + # check for sphinx required during make +-AC_CHECK_PROG(sphinxapi_path, sphinx-apidoc, $as_dir, no, $SEARCHPATH) ++AC_CHECK_PROG(sphinxapi_path, sphinx-apidoc2, $as_dir, no, $SEARCHPATH) + if test "x$sphinxapi_path" = "xno" ; then + AC_MSG_ERROR(["Could not location sphinx-apidoc, from the python-sphinx package"]) + fi +diff -Naur b/daemon/doc/Makefile.am a/daemon/doc/Makefile.am +--- b/daemon/doc/Makefile.am 2018-05-31 00:20:52.000000000 -0400 ++++ a/daemon/doc/Makefile.am 2018-06-06 13:47:56.053038681 -0400 +@@ -14,7 +14,7 @@ + + # auto-generated Python documentation using Sphinx + index.rst: +- sphinx-apidoc -o . ../core ++ sphinx-apidoc2 -o . ../core + mv modules.rst index.rst + + ###### below this line was generated using sphinx-quickstart ###### |