version 1.1.0.r95.gc876b0b2-1

3 files changed, 5 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6885539f0d38..75e84bf0b1ee 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = quagga-git
 	pkgdesc = BGP/OSPF/ISIS/RIP/RIPNG routing daemon suite (FPM enabled) git version
-	pkgver = 1.1.0.r0.g258f3da
+	pkgver = 1.1.0.r95.gc876b0b2
 	pkgrel = 1
 	url = http://www.quagga.net
 	install = quagga.install
@@ -13,7 +13,7 @@ pkgbase = quagga-git
 	depends = readline
 	depends = ncurses
 	depends = perl
-	provides = quagga=1.1.0.r0.g258f3da
+	provides = quagga=1.1.0.r95.gc876b0b2
 	conflicts = quagga
 	options = !buildflags
 	source = quagga-git::git+https://github.com/Quagga/quagga.git
@@ -28,7 +28,6 @@ pkgbase = quagga-git
 	source = ripd.service
 	source = ripngd.service
 	source = zebra.service
-	source = nocomplain.patch
 	md5sums = SKIP
 	md5sums = 286c545efadcc7b463eb603c25473cb4
 	md5sums = 9dfa2f649a2c83a2e52f5f89dec3b167
@@ -41,7 +40,6 @@ pkgbase = quagga-git
 	md5sums = b6e3549d780355914ae8edd43e15630a
 	md5sums = 72dd63c49fdaea41729a4318d0fbac79
 	md5sums = 577f1e7caeea31d910f2dc29c28ada7d
-	md5sums = f0164d52c986bf6be85aed4a7f78aefd
 
 pkgname = quagga-git
 
diff --git a/PKGBUILD b/PKGBUILD
index b3ce1790496c..836c591827b4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=quagga-git
 _pkgname=quagga
-pkgver=1.1.0.r0.g258f3da
+pkgver=1.1.0.r95.gc876b0b2
 pkgrel=1
 pkgdesc='BGP/OSPF/ISIS/RIP/RIPNG routing daemon suite (FPM enabled) git version'
 arch=('i686' 'x86_64')
@@ -27,8 +27,7 @@ source=("$pkgname::git+https://github.com/Quagga/$_pkgname.git"
         'pimd.service'
         'ripd.service'
         'ripngd.service'
-        'zebra.service'
-        'nocomplain.patch')
+        'zebra.service')
 md5sums=('SKIP'
          '286c545efadcc7b463eb603c25473cb4'
          '9dfa2f649a2c83a2e52f5f89dec3b167'
@@ -40,8 +39,7 @@ md5sums=('SKIP'
          'af6571185d6a6a6e1f070c7be0e4333a'
          'b6e3549d780355914ae8edd43e15630a'
          '72dd63c49fdaea41729a4318d0fbac79'
-         '577f1e7caeea31d910f2dc29c28ada7d'
-         'f0164d52c986bf6be85aed4a7f78aefd')
+         '577f1e7caeea31d910f2dc29c28ada7d')
 
 pkgver() {
   cd $pkgname
diff --git a/nocomplain.patch b/nocomplain.patch
deleted file mode 100644
index 0ab77aa939cd..000000000000
--- a/nocomplain.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -up quagga-1.1.0/lib/command.c.orig quagga-1.1.0/lib/command.c
---- quagga-1.1.0/lib/command.c.orig	2016-12-07 16:52:13.000000000 -0700
-+++ quagga-1.1.0/lib/command.c	2016-12-07 16:52:20.000000000 -0700
-@@ -638,9 +638,11 @@ install_element (enum node_type ntype, s
-   
-   if (hash_lookup (cnode->cmd_hash, cmd) != NULL)
-     {
-+#if 0
-       fprintf (stderr, 
-                "Multiple command installs to node %d of command:\n%s\n",
-                ntype, cmd->string);
-+#endif
-       return;
-     }
-