summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Gacogne2020-10-04 15:25:21 +0200
committerRemi Gacogne2020-10-04 15:25:21 +0200
commitd4a0bbe1d8d090b62cd02fb85b855e92568072c1 (patch)
tree23d335805d8c9d8ad7c381250a26beec9e725fd9
parent9eea1d1c805029ad572b080182439fa574ff37ac (diff)
downloadaur-d4a0bbe1d8d090b62cd02fb85b855e92568072c1.tar.gz
bgpq3: Use the patch for 0.1.35, not the one against the git trunk
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD4
-rw-r--r--bgpq3_install_destdir_cppflags.patch16
3 files changed, 11 insertions, 13 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a3f1a130c4a8..81fa2e566b4c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = bgpq3
pkgdesc = bgp filtering automation for Cisco and Juniper routers
pkgver = 0.1.35
- pkgrel = 2
+ pkgrel = 3
url = https://github.com/snar/bgpq3
arch = x86_64
license = BSD
@@ -9,7 +9,7 @@ pkgbase = bgpq3
source = bgpq3-0.1.35.tar.gz::https://github.com/snar/bgpq3/archive/v0.1.35.tar.gz
source = bgpq3_install_destdir_cppflags.patch
sha512sums = a41a424fc0230a0ab7d64ff017b9c1a52e32d7deae542ba096d4815e0e5ce76342ad55c204bbcc22ae4c47ad486917410c53b0dbb2306d40fa5c5a5cf93fcd01
- sha512sums = de8089c3d11cc7bdaee692275eb6e9cba3091ebfb8f4db63a735f576ede0ade15cd99635c50d0f083a3ad390fe98ec7ba20f6436acaee9d9090cfffd36b7dc74
+ sha512sums = c07f3c06433df6a3c285f4f29a0394e03ed85f747604fa7560027891dd0023fa70a521e275d87b77a70be4e5dd21a3289fb8b8b0322b6fc46633e929359b2757
pkgname = bgpq3
diff --git a/PKGBUILD b/PKGBUILD
index aeedbf79492a..7050cb01e835 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Remi Gacogne <rgacogne at archlinux dot org>
pkgname=bgpq3
pkgver=0.1.35
-pkgrel=2
+pkgrel=3
pkgdesc="bgp filtering automation for Cisco and Juniper routers"
arch=('x86_64')
url="https://github.com/snar/bgpq3"
@@ -9,7 +9,7 @@ license=('BSD')
source=("${pkgname}-${pkgver}.tar.gz::https://github.com/snar/$pkgname/archive/v$pkgver.tar.gz"
"bgpq3_install_destdir_cppflags.patch")
sha512sums=('a41a424fc0230a0ab7d64ff017b9c1a52e32d7deae542ba096d4815e0e5ce76342ad55c204bbcc22ae4c47ad486917410c53b0dbb2306d40fa5c5a5cf93fcd01'
- 'de8089c3d11cc7bdaee692275eb6e9cba3091ebfb8f4db63a735f576ede0ade15cd99635c50d0f083a3ad390fe98ec7ba20f6436acaee9d9090cfffd36b7dc74')
+ 'c07f3c06433df6a3c285f4f29a0394e03ed85f747604fa7560027891dd0023fa70a521e275d87b77a70be4e5dd21a3289fb8b8b0322b6fc46633e929359b2757')
depends=('glibc')
prepare() {
diff --git a/bgpq3_install_destdir_cppflags.patch b/bgpq3_install_destdir_cppflags.patch
index a290e2321237..9e89e6778a0e 100644
--- a/bgpq3_install_destdir_cppflags.patch
+++ b/bgpq3_install_destdir_cppflags.patch
@@ -1,7 +1,6 @@
-diff --git a/Makefile.in b/Makefile.in
-index c66c309..490dc13 100644
---- a/Makefile.in
-+++ b/Makefile.in
+diff -ruw bgpq3-0.1.35/Makefile.in bgpq3-0.1.35.patched/Makefile.in
+--- bgpq3-0.1.35/Makefile.in 2018-11-30 10:53:12.000000000 +0100
++++ bgpq3-0.1.35.patched/Makefile.in 2020-10-04 15:23:52.608308665 +0200
@@ -1,5 +1,5 @@
CC=@CC@
-CFLAGS=@CFLAGS@ @DEFS@ -g -Wall -I. -O0
@@ -9,7 +8,7 @@ index c66c309..490dc13 100644
LDADD=@LDFLAGS@ @LIBS@
INSTALL=@INSTALL@
-@@ -20,20 +20,18 @@ SRCS=bgpq3.c sx_report.c bgpq_expander.c sx_slentry.c bgpq3_printer.c \
+@@ -20,19 +20,18 @@
all: bgpq3
bgpq3: ${OBJECTS}
@@ -25,11 +24,10 @@ index c66c309..490dc13 100644
rm -rf *.o *.core core.* core
install: bgpq3
-- if test ! -d @bindir@ ; then mkdir -p @bindir@ ; fi
- ${INSTALL} -c -s -m 755 bgpq3 @bindir@
-- if test ! -d @mandir@/man8 ; then mkdir -p @mandir@/man8 ; fi
-- ${INSTALL} -m 644 bgpq3.8 @mandir@/man8
-+ ${INSTALL} -D -c -s -m 755 bgpq3 ${DESTDIR}@bindir@/bgpq3/bgpq3
+- if test ! -d @prefix@/man/man8 ; then mkdir -p @prefix@/man/man8 ; fi
+- ${INSTALL} -m 644 bgpq3.8 @prefix@/man/man8
++ ${INSTALL} -D -c -s -m 755 bgpq3 ${DESTDIR}@bindir@/bgpq3
+ ${INSTALL} -D -m 644 bgpq3.8 ${DESTDIR}@mandir@/man8/bgpq3.8
depend: