summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorKonstantin Shalygin2016-11-24 20:19:19 +0700
committerKonstantin Shalygin2016-11-24 20:19:19 +0700
commit6f5a5e21bb392087a86aae24bd415451de0257d2 (patch)
treef96b718fa46c801d2bcdca6d45fd83a0037b2311
parente83b65803af375216da8b5139a9e27ee1a8ef269 (diff)
downloadaur-6f5a5e21bb392087a86aae24bd415451de0257d2.tar.gz
Fix build via upstream patch.
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD11
-rw-r--r--quagga-CumulusNetworks-2.5.9_configure_shell.patch12
3 files changed, 24 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index df6b3b694e3..5d54d52cc45 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Tue Sep 6 14:25:27 UTC 2016
+# Thu Nov 24 13:13:30 UTC 2016
pkgbase = quagga_cumulus
pkgdesc = Routing daemon suite with CumulusNetworks patches. Support Multi-Instance OSPF.
pkgver = 0.99.23.1
- pkgrel = 3
+ pkgrel = 4
url = https://github.com/CumulusNetworks/quagga
install = quagga.install
arch = i686
@@ -36,6 +36,7 @@ pkgbase = quagga_cumulus
source = ripngd.service
source = zebra.service
source = quagga-CumulusNetworks-2.5.6_json-c.patch
+ source = quagga-CumulusNetworks-2.5.9_configure_shell.patch
sha256sums = 3abf2046bc27539ce2d17c238e06c8fd0d479a8e402580c6aa455808bd48e004
sha256sums = 091e57dfe070c70264079e436999dd629cbe18f03a4eaff29cd87718669e05de
sha256sums = aadf4b9cf54397645b4ed4fdcf1cb2ed180aa83c714546faabf4bd62d122b984
@@ -52,6 +53,7 @@ pkgbase = quagga_cumulus
sha256sums = 4ffca2fbde6a6beacd3860adc582bc0d63da6761eb8906ec4f7c15ce5096a78e
sha256sums = 95cee83175150f4c5e96a3561478428bae55ad4adc599352993de219e2084066
sha256sums = 8a41060483d3b3b8645ffb18519efc3799c7819d1cfedc12c33eeb72483bd312
+ sha256sums = f5804e4d0cc310fe5a8dce93574710a8183211a9c4d76befb91002e318aeaed2
pkgname = quagga_cumulus
diff --git a/PKGBUILD b/PKGBUILD
index b776e067306..25a43ae0521 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@ _quagga='quagga'
_cumulus='CumulusNetworks'
pkgname="${_quagga}_cumulus"
pkgver='0.99.23.1'
-pkgrel='3'
+pkgrel='4'
pkgdesc="Routing daemon suite with ${_cumulus} patches. Support Multi-Instance OSPF."
arch=('i686' 'x86_64')
url="https://github.com/${_cumulus}/${_quagga}"
@@ -31,7 +31,8 @@ source=("http://download.savannah.gnu.org/releases/${_quagga}/${_quagga}-${pkgve
"ripd.service"
"ripngd.service"
"zebra.service"
- "${_quagga}-${_cumulus}-2.5.6_json-c.patch")
+ "${_quagga}-${_cumulus}-2.5.6_json-c.patch"
+ "${_quagga}-${_cumulus}-2.5.9_configure_shell.patch")
sha256sums=('3abf2046bc27539ce2d17c238e06c8fd0d479a8e402580c6aa455808bd48e004'
'091e57dfe070c70264079e436999dd629cbe18f03a4eaff29cd87718669e05de'
'aadf4b9cf54397645b4ed4fdcf1cb2ed180aa83c714546faabf4bd62d122b984'
@@ -47,7 +48,8 @@ sha256sums=('3abf2046bc27539ce2d17c238e06c8fd0d479a8e402580c6aa455808bd48e004'
'802df30eb809cda5f491e90442d06e7f939c54131f22969011b93937feb4b523'
'4ffca2fbde6a6beacd3860adc582bc0d63da6761eb8906ec4f7c15ce5096a78e'
'95cee83175150f4c5e96a3561478428bae55ad4adc599352993de219e2084066'
- '8a41060483d3b3b8645ffb18519efc3799c7819d1cfedc12c33eeb72483bd312')
+ '8a41060483d3b3b8645ffb18519efc3799c7819d1cfedc12c33eeb72483bd312'
+ 'f5804e4d0cc310fe5a8dce93574710a8183211a9c4d76befb91002e318aeaed2')
prepare() {
# Cumulus patch set loads to Debian dpkg sources
@@ -58,10 +60,13 @@ prepare() {
for p in $(< "${srcdir}/patches/${_quagga}/series"); do
echo -e "Applying ${_cumulus} patch: ${p}"
patch -p1 -i "${srcdir}/patches/${_quagga}/${p}"
+ echo -e "---------------------------------------------\\n"
done
# json in Debian = json-c in Arch
patch -p1 -i "${srcdir}/${_quagga}-${_cumulus}-2.5.6_json-c.patch"
+ # https://github.com/CumulusNetworks/quagga/commit/5fd1f74742debed7f5bfe5d9416f363906917ec5#diff-67e997bcfdac55191033d57a16d1408a
+ patch -p1 -i "${srcdir}/${_quagga}-${_cumulus}-2.5.9_configure_shell.patch"
}
build() {
diff --git a/quagga-CumulusNetworks-2.5.9_configure_shell.patch b/quagga-CumulusNetworks-2.5.9_configure_shell.patch
new file mode 100644
index 00000000000..3b2d56ff7b5
--- /dev/null
+++ b/quagga-CumulusNetworks-2.5.9_configure_shell.patch
@@ -0,0 +1,12 @@
+diff -Naurp CumulusLinux_2.5.9_orig/configure.ac CumulusLinux_2.5.9/configure.ac
+--- CumulusLinux_2.5.9_orig/configure.ac 2016-11-24 19:57:00.000000000 +0700
++++ CumulusLinux_2.5.9/configure.ac 2016-11-24 19:59:17.277136440 +0700
+@@ -268,7 +268,7 @@ AC_ARG_ENABLE(configfile_mask,
+ [ --enable-configfile-mask=ARG set mask for config files])
+ AC_ARG_ENABLE(logfile_mask,
+ [ --enable-logfile-mask=ARG set mask for log files])
+-AC_ARG_ENABLE(shell_access
++AC_ARG_ENABLE(shell_access,
+ [ --enable-shell-access Allow users to access shell/telnet/ssh])
+
+ AC_ARG_ENABLE(rtadv,