Date: Tuesday, September 30, 2014 @ 16:31:33
Author: spupykin
Revision: 119888
archrelease: copy trunk to community-i686, community-x86_64
Added:
ziproxy/repos/community-i686/PKGBUILD
(from rev 119887, ziproxy/trunk/PKGBUILD)
ziproxy/repos/community-i686/build-fix.patch
(from rev 119887, ziproxy/trunk/build-fix.patch)
ziproxy/repos/community-i686/ziproxy.install
(from rev 119887, ziproxy/trunk/ziproxy.install)
ziproxy/repos/community-i686/ziproxy.logrotate
(from rev 119887, ziproxy/trunk/ziproxy.logrotate)
ziproxy/repos/community-i686/ziproxy.xinetd
(from rev 119887, ziproxy/trunk/ziproxy.xinetd)
ziproxy/repos/community-x86_64/PKGBUILD
(from rev 119887, ziproxy/trunk/PKGBUILD)
ziproxy/repos/community-x86_64/build-fix.patch
(from rev 119887, ziproxy/trunk/build-fix.patch)
ziproxy/repos/community-x86_64/ziproxy.install
(from rev 119887, ziproxy/trunk/ziproxy.install)
ziproxy/repos/community-x86_64/ziproxy.logrotate
(from rev 119887, ziproxy/trunk/ziproxy.logrotate)
ziproxy/repos/community-x86_64/ziproxy.xinetd
(from rev 119887, ziproxy/trunk/ziproxy.xinetd)
Deleted:
ziproxy/repos/community-i686/PKGBUILD
ziproxy/repos/community-i686/build-fix.patch
ziproxy/repos/community-i686/ziproxy.install
ziproxy/repos/community-i686/ziproxy.logrotate
ziproxy/repos/community-i686/ziproxy.xinetd
ziproxy/repos/community-x86_64/PKGBUILD
ziproxy/repos/community-x86_64/build-fix.patch
ziproxy/repos/community-x86_64/ziproxy.install
ziproxy/repos/community-x86_64/ziproxy.logrotate
ziproxy/repos/community-x86_64/ziproxy.xinetd
------------------------------------+
/PKGBUILD | 122 +++++++++++++++++++++++++++++++++++
/build-fix.patch | 88 +++++++++++++++++++++++++
/ziproxy.install | 32 +++++++++
/ziproxy.logrotate | 26 +++++++
/ziproxy.xinetd | 28 ++++++++
community-i686/PKGBUILD | 60 -----------------
community-i686/build-fix.patch | 32 ---------
community-i686/ziproxy.install | 11 ---
community-i686/ziproxy.logrotate | 13 ---
community-i686/ziproxy.xinetd | 14 ----
community-x86_64/PKGBUILD | 60 -----------------
community-x86_64/build-fix.patch | 32 ---------
community-x86_64/ziproxy.install | 11 ---
community-x86_64/ziproxy.logrotate | 13 ---
community-x86_64/ziproxy.xinetd | 14 ----
15 files changed, 296 insertions(+), 260 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2014-09-30 14:31:14 UTC (rev 119887)
+++ community-i686/PKGBUILD 2014-09-30 14:31:33 UTC (rev 119888)
@@ -1,60 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com>
-# Contributor: Yejun Yang yejunx AT gmail DOT com
-
-pkgname=ziproxy
-pkgver=3.3.0
-pkgrel=5
-pkgdesc="forwarding, non-caching, compressing HTTP proxy server"
-arch=('i686' 'x86_64')
-url="http://ziproxy.sourceforge.net/";
-license=('GPL2')
-depends=('giflib' 'libpng' 'libjpeg' 'zlib' 'jasper' 'libsasl')
-backup=(etc/ziproxy/ziproxy.conf
- etc/ziproxy/bo_exception.list
- etc/ziproxy/http.passwd
- etc/ziproxy/noprocess.list
- etc/ziproxy/replace.list
- etc/xinetd.d/ziproxy
- var/lib/ziproxy/error/400.html
- var/lib/ziproxy/error/404.html
- var/lib/ziproxy/error/407.html
- var/lib/ziproxy/error/408.html
- var/lib/ziproxy/error/409.html
- var/lib/ziproxy/error/500.html
- var/lib/ziproxy/error/503.html)
-install=ziproxy.install
-source=(http://downloads.sourceforge.net/project/ziproxy/ziproxy/ziproxy-$pkgver/ziproxy-$pkgver.tar.bz2
- ziproxy.logrotate
- ziproxy.xinetd
- build-fix.patch)
-md5sums=('a8fda01591d455bb23c64c9c5ed3980d'
- 'feb35264391c790cedd5e995182b5ff5'
- '3d2f9208b5ab6738c136049e1fd2e433'
- '0cc338d537e09c2d643283389b6cac06')
-
-prepare() {
- cd $srcdir/$pkgname-$pkgver
- patch -p1 <$srcdir/build-fix.patch
-}
-
-build() {
- cd $srcdir/$pkgname-$pkgver
- [ -f Makefile ] || ./configure --prefix=/usr --with-jasper
- make
-}
-
-package() {
- cd $srcdir/$pkgname-$pkgver
- make DESTDIR=$pkgdir install
-
- install -d $pkgdir/var/lib/ziproxy/error
- install -d $pkgdir/etc/conf.d
-
- sed -i 's#var/ziproxy#var/lib/ziproxy#' etc/ziproxy/ziproxy.conf
- cp -a etc/ziproxy $pkgdir/etc/ziproxy
- install -m644 var/ziproxy/error/* $pkgdir/var/lib/ziproxy/error
- echo "ZIPROXY_ARGS=\"-c /etc/ziproxy/ziproxy.conf\""
>$pkgdir/etc/conf.d/ziproxy
- install -Dm0644 $srcdir/ziproxy.logrotate $pkgdir/etc/logrotate.d/ziproxy
- install -Dm0644 $srcdir/ziproxy.xinetd $pkgdir/etc/xinetd.d/ziproxy
-}
Copied: ziproxy/repos/community-i686/PKGBUILD (from rev 119887,
ziproxy/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2014-09-30 14:31:33 UTC (rev 119888)
@@ -0,0 +1,61 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com>
+# Contributor: Yejun Yang yejunx AT gmail DOT com
+
+pkgname=ziproxy
+pkgver=3.3.0
+pkgrel=6
+pkgdesc="forwarding, non-caching, compressing HTTP proxy server"
+arch=('i686' 'x86_64')
+url="http://ziproxy.sourceforge.net/";
+license=('GPL2')
+depends=('giflib' 'libpng' 'libjpeg' 'zlib' 'jasper' 'libsasl')
+backup=(etc/ziproxy/ziproxy.conf
+ etc/ziproxy/bo_exception.list
+ etc/ziproxy/http.passwd
+ etc/ziproxy/noprocess.list
+ etc/ziproxy/replace.list
+ etc/xinetd.d/ziproxy
+ var/lib/ziproxy/error/400.html
+ var/lib/ziproxy/error/404.html
+ var/lib/ziproxy/error/407.html
+ var/lib/ziproxy/error/408.html
+ var/lib/ziproxy/error/409.html
+ var/lib/ziproxy/error/500.html
+ var/lib/ziproxy/error/503.html)
+install=ziproxy.install
+source=(http://downloads.sourceforge.net/project/ziproxy/ziproxy/ziproxy-$pkgver/ziproxy-$pkgver.tar.bz2
+ ziproxy.logrotate
+ ziproxy.xinetd
+ build-fix.patch)
+md5sums=('a8fda01591d455bb23c64c9c5ed3980d'
+ 'feb35264391c790cedd5e995182b5ff5'
+ '3d2f9208b5ab6738c136049e1fd2e433'
+ '353850d5a45f2382c11e673e0de38b72')
+
+prepare() {
+ cd $srcdir/$pkgname-$pkgver
+ sed -i '1,1i#include <string.h>' src/qparser.c
+ patch -p1 <$srcdir/build-fix.patch
+}
+
+build() {
+ cd $srcdir/$pkgname-$pkgver
+ [ -f Makefile ] || ./configure --prefix=/usr --with-jasper
+ make
+}
+
+package() {
+ cd $srcdir/$pkgname-$pkgver
+ make DESTDIR=$pkgdir install
+
+ install -d $pkgdir/var/lib/ziproxy/error
+ install -d $pkgdir/etc/conf.d
+
+ sed -i 's#var/ziproxy#var/lib/ziproxy#' etc/ziproxy/ziproxy.conf
+ cp -a etc/ziproxy $pkgdir/etc/ziproxy
+ install -m644 var/ziproxy/error/* $pkgdir/var/lib/ziproxy/error
+ echo "ZIPROXY_ARGS=\"-c /etc/ziproxy/ziproxy.conf\""
>$pkgdir/etc/conf.d/ziproxy
+ install -Dm0644 $srcdir/ziproxy.logrotate $pkgdir/etc/logrotate.d/ziproxy
+ install -Dm0644 $srcdir/ziproxy.xinetd $pkgdir/etc/xinetd.d/ziproxy
+}
Deleted: community-i686/build-fix.patch
===================================================================
--- community-i686/build-fix.patch 2014-09-30 14:31:14 UTC (rev 119887)
+++ community-i686/build-fix.patch 2014-09-30 14:31:33 UTC (rev 119888)
@@ -1,32 +0,0 @@
-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
-@@ -93,6 +93,10 @@
- #define MIN_INSIZE_TO_JPEG 600
- #define MIN_INSIZE_TO_JP2K 800
-
-+
-+#define false 0
-+#define true !!0
-+
- //Forwards. There are more utility functions, but they're used only once.
- static raw_bitmap *new_raw_bitmap();
-
-@@ -905,7 +909,7 @@
- desc.size=insize;
- desc.x.pos=0;
-
-- if ((GifFile = DGifOpen((void*)&desc, &gif_mem_input)) == NULL)
-+ if ((GifFile = DGifOpen((void*)&desc, &gif_mem_input, NULL)) == NULL)
- return( IMG_RET_ERR_UNKNOWN + IMG_RET_FLG_WHILE_DECOMP);//more
possible reasons
-
- bmp = new_raw_bitmap();
-@@ -1083,7 +1087,7 @@
- }
- bmp->pal_bpp = bmp->bpp;
-
-- DGifCloseFile(GifFile);
-+ DGifCloseFile(GifFile, NULL);
- return IMG_RET_OK;
- }
-
Copied: ziproxy/repos/community-i686/build-fix.patch (from rev 119887,
ziproxy/trunk/build-fix.patch)
===================================================================
--- community-i686/build-fix.patch (rev 0)
+++ community-i686/build-fix.patch 2014-09-30 14:31:33 UTC (rev 119888)
@@ -0,0 +1,44 @@
+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-09-30 18:26:38.277455333 +0400
+@@ -93,6 +93,10 @@
+ #define MIN_INSIZE_TO_JPEG 600
+ #define MIN_INSIZE_TO_JP2K 800
+
++
++#define false 0
++#define true !!0
++
+ //Forwards. There are more utility functions, but they're used only once.
+ static raw_bitmap *new_raw_bitmap();
+
+@@ -905,7 +909,7 @@
+ desc.size=insize;
+ desc.x.pos=0;
+
+- if ((GifFile = DGifOpen((void*)&desc, &gif_mem_input)) == NULL)
++ if ((GifFile = DGifOpen((void*)&desc, &gif_mem_input, NULL)) == NULL)
+ return( IMG_RET_ERR_UNKNOWN + IMG_RET_FLG_WHILE_DECOMP);//more
possible reasons
+
+ bmp = new_raw_bitmap();
+@@ -1083,7 +1087,7 @@
+ }
+ bmp->pal_bpp = bmp->bpp;
+
+- DGifCloseFile(GifFile);
++ DGifCloseFile(GifFile, NULL);
+ 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>
Deleted: community-i686/ziproxy.install
===================================================================
--- community-i686/ziproxy.install 2014-09-30 14:31:14 UTC (rev 119887)
+++ community-i686/ziproxy.install 2014-09-30 14:31:33 UTC (rev 119888)
@@ -1,11 +0,0 @@
-post_install() {
- mkdir -p /var/log/ziproxy && \
- chown -R root:proxy /var/log/ziproxy && \
- chmod -R ug+w /var/log/ziproxy
-}
-
-post_upgrade() {
- mkdir -p /var/log/ziproxy && \
- chown -R root:proxy /var/log/ziproxy && \
- chmod -R ug+w /var/log/ziproxy
-}
Copied: ziproxy/repos/community-i686/ziproxy.install (from rev 119887,
ziproxy/trunk/ziproxy.install)
===================================================================
--- community-i686/ziproxy.install (rev 0)
+++ community-i686/ziproxy.install 2014-09-30 14:31:33 UTC (rev 119888)
@@ -0,0 +1,16 @@
+# https://wiki.archlinux.org/index.php/UID_and_GID_List
+# 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
+}
+
+post_upgrade() {
+ mkdir -p /var/log/ziproxy && \
+ chown -R 0:15 /var/log/ziproxy && \
+ chmod -R ug+w /var/log/ziproxy
+}
Deleted: community-i686/ziproxy.logrotate
===================================================================
--- community-i686/ziproxy.logrotate 2014-09-30 14:31:14 UTC (rev 119887)
+++ community-i686/ziproxy.logrotate 2014-09-30 14:31:33 UTC (rev 119888)
@@ -1,13 +0,0 @@
-/var/log/ziproxy/access.log {
- su root proxy
- weekly
- missingok
- rotate 10
- compress
- delaycompress
- ifempty
- nomail
- postrotate
- killall -HUP ziproxy 1>/dev/null 2>/dev/null || true
- endscript
-}
Copied: ziproxy/repos/community-i686/ziproxy.logrotate (from rev 119887,
ziproxy/trunk/ziproxy.logrotate)
===================================================================
--- community-i686/ziproxy.logrotate (rev 0)
+++ community-i686/ziproxy.logrotate 2014-09-30 14:31:33 UTC (rev 119888)
@@ -0,0 +1,13 @@
+/var/log/ziproxy/access.log {
+ su root proxy
+ weekly
+ missingok
+ rotate 10
+ compress
+ delaycompress
+ ifempty
+ nomail
+ postrotate
+ killall -HUP ziproxy 1>/dev/null 2>/dev/null || true
+ endscript
+}
Deleted: community-i686/ziproxy.xinetd
===================================================================
--- community-i686/ziproxy.xinetd 2014-09-30 14:31:14 UTC (rev 119887)
+++ community-i686/ziproxy.xinetd 2014-09-30 14:31:33 UTC (rev 119888)
@@ -1,14 +0,0 @@
-service ziproxy
-{
- port = 3128
- type = UNLISTED
- disable = yes
- socket_type = stream
- wait = no
- user = proxy
- server = /usr/bin/ziproxy
- server_args = -i
- bind = 0.0.0.0
- log_on_success += HOST DURATION
- log_on_failure += HOST
-}
Copied: ziproxy/repos/community-i686/ziproxy.xinetd (from rev 119887,
ziproxy/trunk/ziproxy.xinetd)
===================================================================
--- community-i686/ziproxy.xinetd (rev 0)
+++ community-i686/ziproxy.xinetd 2014-09-30 14:31:33 UTC (rev 119888)
@@ -0,0 +1,14 @@
+service ziproxy
+{
+ port = 3128
+ type = UNLISTED
+ disable = yes
+ socket_type = stream
+ wait = no
+ user = proxy
+ server = /usr/bin/ziproxy
+ server_args = -i
+ bind = 0.0.0.0
+ log_on_success += HOST DURATION
+ log_on_failure += HOST
+}
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2014-09-30 14:31:14 UTC (rev 119887)
+++ community-x86_64/PKGBUILD 2014-09-30 14:31:33 UTC (rev 119888)
@@ -1,60 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com>
-# Contributor: Yejun Yang yejunx AT gmail DOT com
-
-pkgname=ziproxy
-pkgver=3.3.0
-pkgrel=5
-pkgdesc="forwarding, non-caching, compressing HTTP proxy server"
-arch=('i686' 'x86_64')
-url="http://ziproxy.sourceforge.net/";
-license=('GPL2')
-depends=('giflib' 'libpng' 'libjpeg' 'zlib' 'jasper' 'libsasl')
-backup=(etc/ziproxy/ziproxy.conf
- etc/ziproxy/bo_exception.list
- etc/ziproxy/http.passwd
- etc/ziproxy/noprocess.list
- etc/ziproxy/replace.list
- etc/xinetd.d/ziproxy
- var/lib/ziproxy/error/400.html
- var/lib/ziproxy/error/404.html
- var/lib/ziproxy/error/407.html
- var/lib/ziproxy/error/408.html
- var/lib/ziproxy/error/409.html
- var/lib/ziproxy/error/500.html
- var/lib/ziproxy/error/503.html)
-install=ziproxy.install
-source=(http://downloads.sourceforge.net/project/ziproxy/ziproxy/ziproxy-$pkgver/ziproxy-$pkgver.tar.bz2
- ziproxy.logrotate
- ziproxy.xinetd
- build-fix.patch)
-md5sums=('a8fda01591d455bb23c64c9c5ed3980d'
- 'feb35264391c790cedd5e995182b5ff5'
- '3d2f9208b5ab6738c136049e1fd2e433'
- '0cc338d537e09c2d643283389b6cac06')
-
-prepare() {
- cd $srcdir/$pkgname-$pkgver
- patch -p1 <$srcdir/build-fix.patch
-}
-
-build() {
- cd $srcdir/$pkgname-$pkgver
- [ -f Makefile ] || ./configure --prefix=/usr --with-jasper
- make
-}
-
-package() {
- cd $srcdir/$pkgname-$pkgver
- make DESTDIR=$pkgdir install
-
- install -d $pkgdir/var/lib/ziproxy/error
- install -d $pkgdir/etc/conf.d
-
- sed -i 's#var/ziproxy#var/lib/ziproxy#' etc/ziproxy/ziproxy.conf
- cp -a etc/ziproxy $pkgdir/etc/ziproxy
- install -m644 var/ziproxy/error/* $pkgdir/var/lib/ziproxy/error
- echo "ZIPROXY_ARGS=\"-c /etc/ziproxy/ziproxy.conf\""
>$pkgdir/etc/conf.d/ziproxy
- install -Dm0644 $srcdir/ziproxy.logrotate $pkgdir/etc/logrotate.d/ziproxy
- install -Dm0644 $srcdir/ziproxy.xinetd $pkgdir/etc/xinetd.d/ziproxy
-}
Copied: ziproxy/repos/community-x86_64/PKGBUILD (from rev 119887,
ziproxy/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2014-09-30 14:31:33 UTC (rev 119888)
@@ -0,0 +1,61 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com>
+# Contributor: Yejun Yang yejunx AT gmail DOT com
+
+pkgname=ziproxy
+pkgver=3.3.0
+pkgrel=6
+pkgdesc="forwarding, non-caching, compressing HTTP proxy server"
+arch=('i686' 'x86_64')
+url="http://ziproxy.sourceforge.net/";
+license=('GPL2')
+depends=('giflib' 'libpng' 'libjpeg' 'zlib' 'jasper' 'libsasl')
+backup=(etc/ziproxy/ziproxy.conf
+ etc/ziproxy/bo_exception.list
+ etc/ziproxy/http.passwd
+ etc/ziproxy/noprocess.list
+ etc/ziproxy/replace.list
+ etc/xinetd.d/ziproxy
+ var/lib/ziproxy/error/400.html
+ var/lib/ziproxy/error/404.html
+ var/lib/ziproxy/error/407.html
+ var/lib/ziproxy/error/408.html
+ var/lib/ziproxy/error/409.html
+ var/lib/ziproxy/error/500.html
+ var/lib/ziproxy/error/503.html)
+install=ziproxy.install
+source=(http://downloads.sourceforge.net/project/ziproxy/ziproxy/ziproxy-$pkgver/ziproxy-$pkgver.tar.bz2
+ ziproxy.logrotate
+ ziproxy.xinetd
+ build-fix.patch)
+md5sums=('a8fda01591d455bb23c64c9c5ed3980d'
+ 'feb35264391c790cedd5e995182b5ff5'
+ '3d2f9208b5ab6738c136049e1fd2e433'
+ '353850d5a45f2382c11e673e0de38b72')
+
+prepare() {
+ cd $srcdir/$pkgname-$pkgver
+ sed -i '1,1i#include <string.h>' src/qparser.c
+ patch -p1 <$srcdir/build-fix.patch
+}
+
+build() {
+ cd $srcdir/$pkgname-$pkgver
+ [ -f Makefile ] || ./configure --prefix=/usr --with-jasper
+ make
+}
+
+package() {
+ cd $srcdir/$pkgname-$pkgver
+ make DESTDIR=$pkgdir install
+
+ install -d $pkgdir/var/lib/ziproxy/error
+ install -d $pkgdir/etc/conf.d
+
+ sed -i 's#var/ziproxy#var/lib/ziproxy#' etc/ziproxy/ziproxy.conf
+ cp -a etc/ziproxy $pkgdir/etc/ziproxy
+ install -m644 var/ziproxy/error/* $pkgdir/var/lib/ziproxy/error
+ echo "ZIPROXY_ARGS=\"-c /etc/ziproxy/ziproxy.conf\""
>$pkgdir/etc/conf.d/ziproxy
+ install -Dm0644 $srcdir/ziproxy.logrotate $pkgdir/etc/logrotate.d/ziproxy
+ install -Dm0644 $srcdir/ziproxy.xinetd $pkgdir/etc/xinetd.d/ziproxy
+}
Deleted: community-x86_64/build-fix.patch
===================================================================
--- community-x86_64/build-fix.patch 2014-09-30 14:31:14 UTC (rev 119887)
+++ community-x86_64/build-fix.patch 2014-09-30 14:31:33 UTC (rev 119888)
@@ -1,32 +0,0 @@
-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
-@@ -93,6 +93,10 @@
- #define MIN_INSIZE_TO_JPEG 600
- #define MIN_INSIZE_TO_JP2K 800
-
-+
-+#define false 0
-+#define true !!0
-+
- //Forwards. There are more utility functions, but they're used only once.
- static raw_bitmap *new_raw_bitmap();
-
-@@ -905,7 +909,7 @@
- desc.size=insize;
- desc.x.pos=0;
-
-- if ((GifFile = DGifOpen((void*)&desc, &gif_mem_input)) == NULL)
-+ if ((GifFile = DGifOpen((void*)&desc, &gif_mem_input, NULL)) == NULL)
- return( IMG_RET_ERR_UNKNOWN + IMG_RET_FLG_WHILE_DECOMP);//more
possible reasons
-
- bmp = new_raw_bitmap();
-@@ -1083,7 +1087,7 @@
- }
- bmp->pal_bpp = bmp->bpp;
-
-- DGifCloseFile(GifFile);
-+ DGifCloseFile(GifFile, NULL);
- return IMG_RET_OK;
- }
-
Copied: ziproxy/repos/community-x86_64/build-fix.patch (from rev 119887,
ziproxy/trunk/build-fix.patch)
===================================================================
--- community-x86_64/build-fix.patch (rev 0)
+++ community-x86_64/build-fix.patch 2014-09-30 14:31:33 UTC (rev 119888)
@@ -0,0 +1,44 @@
+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-09-30 18:26:38.277455333 +0400
+@@ -93,6 +93,10 @@
+ #define MIN_INSIZE_TO_JPEG 600
+ #define MIN_INSIZE_TO_JP2K 800
+
++
++#define false 0
++#define true !!0
++
+ //Forwards. There are more utility functions, but they're used only once.
+ static raw_bitmap *new_raw_bitmap();
+
+@@ -905,7 +909,7 @@
+ desc.size=insize;
+ desc.x.pos=0;
+
+- if ((GifFile = DGifOpen((void*)&desc, &gif_mem_input)) == NULL)
++ if ((GifFile = DGifOpen((void*)&desc, &gif_mem_input, NULL)) == NULL)
+ return( IMG_RET_ERR_UNKNOWN + IMG_RET_FLG_WHILE_DECOMP);//more
possible reasons
+
+ bmp = new_raw_bitmap();
+@@ -1083,7 +1087,7 @@
+ }
+ bmp->pal_bpp = bmp->bpp;
+
+- DGifCloseFile(GifFile);
++ DGifCloseFile(GifFile, NULL);
+ 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>
Deleted: community-x86_64/ziproxy.install
===================================================================
--- community-x86_64/ziproxy.install 2014-09-30 14:31:14 UTC (rev 119887)
+++ community-x86_64/ziproxy.install 2014-09-30 14:31:33 UTC (rev 119888)
@@ -1,11 +0,0 @@
-post_install() {
- mkdir -p /var/log/ziproxy && \
- chown -R root:proxy /var/log/ziproxy && \
- chmod -R ug+w /var/log/ziproxy
-}
-
-post_upgrade() {
- mkdir -p /var/log/ziproxy && \
- chown -R root:proxy /var/log/ziproxy && \
- chmod -R ug+w /var/log/ziproxy
-}
Copied: ziproxy/repos/community-x86_64/ziproxy.install (from rev 119887,
ziproxy/trunk/ziproxy.install)
===================================================================
--- community-x86_64/ziproxy.install (rev 0)
+++ community-x86_64/ziproxy.install 2014-09-30 14:31:33 UTC (rev 119888)
@@ -0,0 +1,16 @@
+# https://wiki.archlinux.org/index.php/UID_and_GID_List
+# 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
+}
+
+post_upgrade() {
+ mkdir -p /var/log/ziproxy && \
+ chown -R 0:15 /var/log/ziproxy && \
+ chmod -R ug+w /var/log/ziproxy
+}
Deleted: community-x86_64/ziproxy.logrotate
===================================================================
--- community-x86_64/ziproxy.logrotate 2014-09-30 14:31:14 UTC (rev 119887)
+++ community-x86_64/ziproxy.logrotate 2014-09-30 14:31:33 UTC (rev 119888)
@@ -1,13 +0,0 @@
-/var/log/ziproxy/access.log {
- su root proxy
- weekly
- missingok
- rotate 10
- compress
- delaycompress
- ifempty
- nomail
- postrotate
- killall -HUP ziproxy 1>/dev/null 2>/dev/null || true
- endscript
-}
Copied: ziproxy/repos/community-x86_64/ziproxy.logrotate (from rev 119887,
ziproxy/trunk/ziproxy.logrotate)
===================================================================
--- community-x86_64/ziproxy.logrotate (rev 0)
+++ community-x86_64/ziproxy.logrotate 2014-09-30 14:31:33 UTC (rev 119888)
@@ -0,0 +1,13 @@
+/var/log/ziproxy/access.log {
+ su root proxy
+ weekly
+ missingok
+ rotate 10
+ compress
+ delaycompress
+ ifempty
+ nomail
+ postrotate
+ killall -HUP ziproxy 1>/dev/null 2>/dev/null || true
+ endscript
+}
Deleted: community-x86_64/ziproxy.xinetd
===================================================================
--- community-x86_64/ziproxy.xinetd 2014-09-30 14:31:14 UTC (rev 119887)
+++ community-x86_64/ziproxy.xinetd 2014-09-30 14:31:33 UTC (rev 119888)
@@ -1,14 +0,0 @@
-service ziproxy
-{
- port = 3128
- type = UNLISTED
- disable = yes
- socket_type = stream
- wait = no
- user = proxy
- server = /usr/bin/ziproxy
- server_args = -i
- bind = 0.0.0.0
- log_on_success += HOST DURATION
- log_on_failure += HOST
-}
Copied: ziproxy/repos/community-x86_64/ziproxy.xinetd (from rev 119887,
ziproxy/trunk/ziproxy.xinetd)
===================================================================
--- community-x86_64/ziproxy.xinetd (rev 0)
+++ community-x86_64/ziproxy.xinetd 2014-09-30 14:31:33 UTC (rev 119888)
@@ -0,0 +1,14 @@
+service ziproxy
+{
+ port = 3128
+ type = UNLISTED
+ disable = yes
+ socket_type = stream
+ wait = no
+ user = proxy
+ server = /usr/bin/ziproxy
+ server_args = -i
+ bind = 0.0.0.0
+ log_on_success += HOST DURATION
+ log_on_failure += HOST
+}
