v2018.09.24.00

4 files changed, 31 insertions, 83 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4f03b476769c..f344f34e7697 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by mksrcinfo v8
-# Thu Mar 23 07:15:23 UTC 2017
 pkgbase = proxygen
-	pkgdesc = A collection of C++ HTTP libraries including an easy to use HTTP server
-	pkgver = 2017.03.20.00
+	pkgdesc = A collection of C++ HTTP libraries including an easy to use HTTP server.
+	pkgver = 2018.09.24.00
 	pkgrel = 1
 	url = https://github.com/facebook/proxygen
 	arch = i686
@@ -11,20 +9,16 @@ pkgbase = proxygen
 	makedepends = autoconf-archive
 	makedepends = wget
 	makedepends = ruby
+	makedepends = gperf
 	makedepends = gperftools
 	makedepends = wangle
-	depends = folly>=0.34.0
+	depends = folly
 	depends = fbthrift
 	depends = libcap
-	provides = proxygen
 	conflicts = proxygen-git
 	options = !makeflags
-	source = https://github.com/facebook/proxygen/archive/v2017.03.20.00.tar.gz
-	source = EchoServer.cpp.patch
-	source = HTTPDownstreamSessionTest.cpp.patch
-	md5sums = 3e5a035ea42f1c23da3a0f9aacb1108c
-	md5sums = f587fd8970bd02648474dac6d9d62326
-	md5sums = 4b0332e707b17770e72b67da7d9f3e65
+	source = https://github.com/facebook/proxygen/archive/v2018.09.24.00.tar.gz
+	sha256sums = a081c6415ff9df192d39933134285bce4db54c013e941fc2b8351183ce7e7d70
 
 pkgname = proxygen
 
diff --git a/EchoServer.cpp.patch b/EchoServer.cpp.patch
deleted file mode 100644
index 23c8bc27b450..000000000000
--- a/EchoServer.cpp.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- EchoServer.cpp.orig	2015-03-24 16:22:41.676905225 +0900
-+++ EchoServer.cpp	2015-03-25 01:13:02.012677263 +0900
-@@ -13,6 +13,7 @@
- #include <proxygen/httpserver/HTTPServer.h>
- #include <proxygen/httpserver/RequestHandlerFactory.h>
- #include <unistd.h>
-+#include <gflags/gflags.h>
- 
- #include "EchoHandler.h"
- #include "EchoStats.h"
diff --git a/HTTPDownstreamSessionTest.cpp.patch b/HTTPDownstreamSessionTest.cpp.patch
deleted file mode 100644
index 0e2ef9239b69..000000000000
--- a/HTTPDownstreamSessionTest.cpp.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- HTTPDownstreamSessionTest.cpp.orig	2015-05-21 07:22:05.000000000 +0900
-+++ HTTPDownstreamSessionTest.cpp	2015-05-28 11:30:36.635333075 +0900
-@@ -1433,7 +1433,7 @@
-   clientCodec.getEgressSettings()->setSetting(SettingsId::INITIAL_WINDOW_SIZE,
-                                               500);
-   clientCodec.generateSettings(requests);
--  clientCodec.generateHeader(requests, streamID, req, 0, false, nullptr);
-+  clientCodec.generateHeader(requests, streamID, req, 0, false, bool(nullptr));
-   clientCodec.generateEOM(requests, streamID);
-   StrictMock<MockHTTPHandler> handler;
- 
-@@ -1749,11 +1749,11 @@
-   auto streamID = HTTPCodec::StreamID(1);
-   clientCodec.generateConnectionPreface(requests);
-   req.setPriority(0);
--  clientCodec.generateHeader(requests, streamID, req, 0, nullptr);
-+  clientCodec.generateHeader(requests, streamID, req, 0, bool(nullptr));
-   clientCodec.generateEOM(requests, streamID);
-   streamID += 2;
-   req.setPriority(1);
--  clientCodec.generateHeader(requests, streamID, req, 0, nullptr);
-+  clientCodec.generateHeader(requests, streamID, req, 0, bool(nullptr));
-   clientCodec.generateEOM(requests, streamID);
- 
-   EXPECT_CALL(mockController_, getRequestHandler(_, _))
diff --git a/PKGBUILD b/PKGBUILD
index 9464274b3a73..a199a3bffef1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,62 +1,51 @@
-# Maintainer: Daichi Shinozaki <dsdseg@gmail.com>
+# Maintainer: Aleksandar Trifunović <akstrfn at gmail dot com>
+# Contributor: Daichi Shinozaki <dsdseg@gmail.com>
+
 pkgname=proxygen
-pkgver=2017.03.20.00
+pkgver=2018.09.24.00
 pkgrel=1
-pkgdesc="A collection of C++ HTTP libraries including an easy to use HTTP server"
+pkgdesc="A collection of C++ HTTP libraries including an easy to use HTTP server."
 arch=('i686' 'x86_64')
 url="https://github.com/facebook/proxygen"
 license=('BSD')
-depends=('folly>=0.34.0' 'fbthrift' 'libcap')
-source=("https://github.com/facebook/proxygen/archive/v$pkgver.tar.gz"
-'EchoServer.cpp.patch'
-'HTTPDownstreamSessionTest.cpp.patch'
-)
-makedepends=('autoconf-archive' 'wget' 'ruby' 'gperftools' 'wangle')
+depends=('folly' 'fbthrift' 'libcap')
+source=("$url/archive/v$pkgver.tar.gz")
+makedepends=('autoconf-archive' 'wget' 'ruby' 'gperf' 'gperftools' 'wangle')
 options=('!makeflags')
 conflicts=('proxygen-git')
-provides=('proxygen')
-md5sums=('3e5a035ea42f1c23da3a0f9aacb1108c'
-         'f587fd8970bd02648474dac6d9d62326'
-         '4b0332e707b17770e72b67da7d9f3e65')
+sha256sums=('a081c6415ff9df192d39933134285bce4db54c013e941fc2b8351183ce7e7d70')
 
 prepare() {
-  cd "$srcdir/$pkgname-$pkgver/$pkgname"
-  autoreconf -ivf
-  pushd . 
-  cd httpserver/samples/echo
-  patch --verbose -p0 < $srcdir/EchoServer.cpp.patch
-  popd
-  cd lib/http/session/test
-#  patch --verbose -p0 < $srcdir/HTTPDownstreamSessionTest.cpp.patch
+    cd "$pkgname-$pkgver/$pkgname"
+    autoreconf -ivf
 }
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver/$pkgname"
-  PYTHON=/usr/bin/python2 ./configure \
-    --prefix=/usr \
-    --disable-static \
-    --with-gnu-ld=yes \
-    --with-sysconfdir=/etc \
-    --with-sysroot=/usr
-
-  make
+  cd "$pkgname-$pkgver/$pkgname"
+  # ./configure LDFLAGS="-Wl,--no-as-needed -ldl" --prefix=/usr \
+  ./configure --prefix=/usr \
+      --with-sysconfdir=/etc \
+      --with-sysroot=/usr \
+      --with-gnu-ld=yes
+  make -j 4
 }
 
 check() {
-  cd "$srcdir/$pkgname-$pkgver/$pkgname"
+  cd "$pkgname-$pkgver/$pkgname"
   make check
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver/$pkgname"
-  install -Dm644 ../LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
+  cd "$pkgname-$pkgver/$pkgname"
   make DESTDIR="$pkgdir/" install
-  # Install the license
+
+  install -Dm644 ../LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
+
+  install -Dm755 httpserver/samples/echo/echo_server $pkgdir/usr/bin/echo_server
   # By default, 'make install' skips 'external' directory
   for i in http_parser_cpp.cpp http_parser.{c,h}; do
     install -Dm644 external/http_parser/$i $pkgdir/usr/include/external/http_parser/$i
   done
-  install -Dm755 httpserver/samples/echo/echo_server $pkgdir/usr/bin/echo_server
 }
 
-# vim:set ts=2 sw=2 et:
+# vim:set ts=4 sw=4 et: