[arch-commits] Commit in ziproxy/trunk (PKGBUILD build-fix.patch ziproxy.install)

[Sergej Pupykin]

    Date: Tuesday, September 30, 2014 @ 16:31:14
  Author: spupykin
Revision: 119887

upgpkg: ziproxy 3.3.0-6

upd

Modified:
  ziproxy/trunk/PKGBUILD
  ziproxy/trunk/build-fix.patch
  ziproxy/trunk/ziproxy.install

-----------------+
 PKGBUILD        |    5 +++--
 build-fix.patch |   14 +++++++++++++-
 ziproxy.install |    2 ++
 3 files changed, 18 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-09-30 14:31:10 UTC (rev 119886)
+++ PKGBUILD	2014-09-30 14:31:14 UTC (rev 119887)
@@ -4,7 +4,7 @@
 
 pkgname=ziproxy
 pkgver=3.3.0
-pkgrel=5
+pkgrel=6
 pkgdesc="forwarding, non-caching, compressing HTTP proxy server"
 arch=('i686' 'x86_64')
 url="http://ziproxy.sourceforge.net/"
@@ -31,10 +31,11 @@
 md5sums=('a8fda01591d455bb23c64c9c5ed3980d'
          'feb35264391c790cedd5e995182b5ff5'
          '3d2f9208b5ab6738c136049e1fd2e433'
-         '0cc338d537e09c2d643283389b6cac06')
+         '353850d5a45f2382c11e673e0de38b72')
 
 prepare() {
   cd $srcdir/$pkgname-$pkgver
+  sed -i '1,1i#include <string.h>' src/qparser.c
   patch -p1 <$srcdir/build-fix.patch
 }
 

Modified: build-fix.patch
===================================================================
--- build-fix.patch	2014-09-30 14:31:10 UTC (rev 119886)
+++ build-fix.patch	2014-09-30 14:31:14 UTC (rev 119887)
@@ -1,6 +1,6 @@
 diff -wbBur ziproxy-3.3.0/src/image.c ziproxy-3.3.0.my/src/image.c
 --- ziproxy-3.3.0/src/image.c	2013-01-04 20:48:50.000000000 +0400
-+++ ziproxy-3.3.0.my/src/image.c	2014-05-29 18:52:52.980657105 +0400
++++ ziproxy-3.3.0.my/src/image.c	2014-09-30 18:26:38.277455333 +0400
 @@ -93,6 +93,10 @@
  #define MIN_INSIZE_TO_JPEG 600
  #define MIN_INSIZE_TO_JP2K 800
@@ -30,3 +30,15 @@
  	return IMG_RET_OK;
  }
  
+diff -wbBur ziproxy-3.3.0/src/qparser.c ziproxy-3.3.0.my/src/qparser.c
+--- ziproxy-3.3.0/src/qparser.c	2013-01-04 20:48:50.000000000 +0400
++++ ziproxy-3.3.0.my/src/qparser.c	2014-09-30 18:28:34.772237049 +0400
+@@ -32,7 +33,7 @@
+ // #ifdef __GLIBC__
+ // #define _GNU_SOURCE
+ // #else
+-#define QP_BUILD_STRNDUP
++//#define QP_BUILD_STRNDUP
+ // #endif
+ 
+ #include <string.h>

Modified: ziproxy.install
===================================================================
--- ziproxy.install	2014-09-30 14:31:10 UTC (rev 119886)
+++ ziproxy.install	2014-09-30 14:31:14 UTC (rev 119887)
@@ -2,6 +2,8 @@
 # 0:15 = root:proxy
 
 post_install() {
+  getent group proxy >/dev/null || groupadd -r -g 15 proxy
+  getent passwd proxy >/dev/null || useradd -r -d /var/empty -g 15 -u 15 proxy
   mkdir -p /var/log/ziproxy && \
   chown -R 0:15 /var/log/ziproxy && \
   chmod -R ug+w /var/log/ziproxy