upgpkg: libosmpbf 1.4.0-2

- Support hardening buildflags set in the environment
- https://github.com/openstreetmap/OSM-binary

2 files changed, 16 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c0d6f184b0a0..514889fcc579 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,17 @@
 pkgbase = libosmpbf
 	pkgdesc = A library to support OpenStreetMap's protocolbuffer binary format (OSM PBF)
 	pkgver = 1.4.0
-	pkgrel = 1
-	url = https://github.com/scrosby/OSM-binary
+	pkgrel = 2
+	url = https://github.com/openstreetmap/OSM-binary
 	arch = i686
 	arch = x86_64
 	license = LGPL3
 	makedepends = git
 	depends = protobuf
-	source = libosmpbf-1.4.0.tar.gz::https://github.com/scrosby/OSM-binary/archive/v1.4.0.tar.gz
+	source = libosmpbf-1.4.0.tar.gz::https://github.com/openstreetmap/OSM-binary/archive/v1.4.0.tar.gz
+	source = https://github.com/openstreetmap/OSM-binary/commit/09845ca4087c7404b1de33914233dbf53f9de4c3.patch
 	sha256sums = be634444d10ad23c127946e0aa7a44bd2d975fc89f53fc022e7504221fbc2cae
+	sha256sums = b2abaa5deeadb075bc97aa2de0ea6449c8b684d91120e5c8cc3f70c2eaf61c01
 
 pkgname = libosmpbf
 
diff --git a/PKGBUILD b/PKGBUILD
index e35a4cdc2aee..46940d6043be 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,15 +1,21 @@
 # Maintainer: Simon Legner <Simon.Legner@gmail.com>
 pkgname=libosmpbf
 pkgver=1.4.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A library to support OpenStreetMap's protocolbuffer binary format (OSM PBF)"
 arch=('i686' 'x86_64')
-url="https://github.com/scrosby/OSM-binary"
+url="https://github.com/openstreetmap/OSM-binary"
 license=('LGPL3')
 depends=('protobuf')
 makedepends=('git')
 _gitname='OSM-binary'
-source=("$pkgname-$pkgver.tar.gz::https://github.com/scrosby/$_gitname/archive/v$pkgver.tar.gz")
+source=("$pkgname-$pkgver.tar.gz::https://github.com/openstreetmap/$_gitname/archive/v$pkgver.tar.gz"
+    https://github.com/openstreetmap/OSM-binary/commit/09845ca4087c7404b1de33914233dbf53f9de4c3.patch)
+
+prepare() {
+  cd "$srcdir/$_gitname-$pkgver"
+  patch -p1 < "$srcdir/09845ca4087c7404b1de33914233dbf53f9de4c3.patch"
+}
 
 build() {
   cd "$srcdir/$_gitname-$pkgver/src"
@@ -21,4 +27,5 @@ package() {
   make PREFIX=/usr DESTDIR="$pkgdir/" install
 }
 
-sha256sums=('be634444d10ad23c127946e0aa7a44bd2d975fc89f53fc022e7504221fbc2cae')
+sha256sums=('be634444d10ad23c127946e0aa7a44bd2d975fc89f53fc022e7504221fbc2cae'
+            'b2abaa5deeadb075bc97aa2de0ea6449c8b684d91120e5c8cc3f70c2eaf61c01')