[arch-commits] Commit in ziproxy/repos/community-x86_64 (13 files)

Antonio Rojas arojas at archlinux.org
Sat May 30 21:32:29 UTC 2020


    Date: Saturday, May 30, 2020 @ 21:32:29
  Author: arojas
Revision: 637538

archrelease: copy trunk to community-x86_64

Added:
  ziproxy/repos/community-x86_64/PKGBUILD
    (from rev 637537, ziproxy/trunk/PKGBUILD)
  ziproxy/repos/community-x86_64/build-fix.patch
    (from rev 637537, ziproxy/trunk/build-fix.patch)
  ziproxy/repos/community-x86_64/ziproxy.logrotate
    (from rev 637537, ziproxy/trunk/ziproxy.logrotate)
  ziproxy/repos/community-x86_64/ziproxy.sysusers
    (from rev 637537, ziproxy/trunk/ziproxy.sysusers)
  ziproxy/repos/community-x86_64/ziproxy.tmpfiles
    (from rev 637537, ziproxy/trunk/ziproxy.tmpfiles)
  ziproxy/repos/community-x86_64/ziproxy.xinetd
    (from rev 637537, ziproxy/trunk/ziproxy.xinetd)
Deleted:
  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.sysusers
  ziproxy/repos/community-x86_64/ziproxy.tmpfiles
  ziproxy/repos/community-x86_64/ziproxy.xinetd

-------------------+
 PKGBUILD          |  131 +++++++++++++++++++++++++---------------------------
 build-fix.patch   |   64 ++++++++++++-------------
 ziproxy.install   |   16 ------
 ziproxy.logrotate |   26 +++++-----
 ziproxy.sysusers  |    2 
 ziproxy.tmpfiles  |    2 
 ziproxy.xinetd    |   28 +++++------
 7 files changed, 126 insertions(+), 143 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-30 21:31:54 UTC (rev 637537)
+++ PKGBUILD	2020-05-30 21:32:29 UTC (rev 637538)
@@ -1,66 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: Yejun Yang yejunx AT gmail DOT com
-
-pkgname=ziproxy
-pkgver=3.3.1
-pkgrel=2
-pkgdesc="forwarding, non-caching, compressing HTTP proxy server"
-arch=('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)
-source=(https://downloads.sourceforge.net/project/ziproxy/ziproxy/ziproxy-$pkgver/ziproxy-$pkgver.tar.bz2
-	ziproxy.logrotate
-    ziproxy.sysusers
-    ziproxy.tmpfiles
-	ziproxy.xinetd
-	build-fix.patch)
-sha256sums=('c39c6148840cdaa867d4dd3ad41d39be345494b2048b86ec899d0c075e56874d'
-            '6087c75dc9a9d493365bb599bf4dcb72fab95da54ea9b75418616cf0cd9be5e3'
-            'a2aa82f37b0436e99cda917d994a728d0e8b08ffc9c3f87dd3b6e509a0b36a14'
-            '28e6c059c8bf0c9291c20157a356991de67b2459dc3b333f58bd93e02bbb3e01'
-            '27c2ce6207c24e1af5bc1cb7b350ef5ca12ea3bdaf7b5f10f00251ec1292c3a0'
-            'dd462a5604aba5bfea8e12a4abe6db317f8d45bc7614696e6d7379cf8120a616')
-
-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
-  install -Dm0644 "$srcdir"/ziproxy.sysusers "$pkgdir"/usr/lib/sysusers.d/ziproxy.conf
-  install -Dm0644 "$srcdir"/ziproxy.tmpfiles "$pkgdir"/usr/lib/tmpfiles.d/ziproxy.conf
-}

Copied: ziproxy/repos/community-x86_64/PKGBUILD (from rev 637537, ziproxy/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-05-30 21:32:29 UTC (rev 637538)
@@ -0,0 +1,65 @@
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Yejun Yang yejunx AT gmail DOT com
+
+pkgname=ziproxy
+pkgver=3.3.1
+pkgrel=3
+pkgdesc="forwarding, non-caching, compressing HTTP proxy server"
+arch=('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)
+source=(https://downloads.sourceforge.net/project/ziproxy/ziproxy/ziproxy-$pkgver/ziproxy-$pkgver.tar.bz2
+	ziproxy.logrotate
+    ziproxy.sysusers
+    ziproxy.tmpfiles
+	ziproxy.xinetd
+	build-fix.patch)
+sha256sums=('c39c6148840cdaa867d4dd3ad41d39be345494b2048b86ec899d0c075e56874d'
+            '6087c75dc9a9d493365bb599bf4dcb72fab95da54ea9b75418616cf0cd9be5e3'
+            'a2aa82f37b0436e99cda917d994a728d0e8b08ffc9c3f87dd3b6e509a0b36a14'
+            '28e6c059c8bf0c9291c20157a356991de67b2459dc3b333f58bd93e02bbb3e01'
+            '27c2ce6207c24e1af5bc1cb7b350ef5ca12ea3bdaf7b5f10f00251ec1292c3a0'
+            'dd462a5604aba5bfea8e12a4abe6db317f8d45bc7614696e6d7379cf8120a616')
+
+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 ] || CFLAGS+=' -fcommon' ./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
+  install -Dm0644 "$srcdir"/ziproxy.sysusers "$pkgdir"/usr/lib/sysusers.d/ziproxy.conf
+  install -Dm0644 "$srcdir"/ziproxy.tmpfiles "$pkgdir"/usr/lib/tmpfiles.d/ziproxy.conf
+}

Deleted: build-fix.patch
===================================================================
--- build-fix.patch	2020-05-30 21:31:54 UTC (rev 637537)
+++ build-fix.patch	2020-05-30 21:32:29 UTC (rev 637538)
@@ -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-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;
- }
- 

Copied: ziproxy/repos/community-x86_64/build-fix.patch (from rev 637537, ziproxy/trunk/build-fix.patch)
===================================================================
--- build-fix.patch	                        (rev 0)
+++ build-fix.patch	2020-05-30 21:32:29 UTC (rev 637538)
@@ -0,0 +1,32 @@
+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;
+ }
+ 

Deleted: ziproxy.install
===================================================================
--- ziproxy.install	2020-05-30 21:31:54 UTC (rev 637537)
+++ ziproxy.install	2020-05-30 21:32:29 UTC (rev 637538)
@@ -1,16 +0,0 @@
-# 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: ziproxy.logrotate
===================================================================
--- ziproxy.logrotate	2020-05-30 21:31:54 UTC (rev 637537)
+++ ziproxy.logrotate	2020-05-30 21:32:29 UTC (rev 637538)
@@ -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 637537, ziproxy/trunk/ziproxy.logrotate)
===================================================================
--- ziproxy.logrotate	                        (rev 0)
+++ ziproxy.logrotate	2020-05-30 21:32:29 UTC (rev 637538)
@@ -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: ziproxy.sysusers
===================================================================
--- ziproxy.sysusers	2020-05-30 21:31:54 UTC (rev 637537)
+++ ziproxy.sysusers	2020-05-30 21:32:29 UTC (rev 637538)
@@ -1 +0,0 @@
-u proxy 15 - -

Copied: ziproxy/repos/community-x86_64/ziproxy.sysusers (from rev 637537, ziproxy/trunk/ziproxy.sysusers)
===================================================================
--- ziproxy.sysusers	                        (rev 0)
+++ ziproxy.sysusers	2020-05-30 21:32:29 UTC (rev 637538)
@@ -0,0 +1 @@
+u proxy 15 - -

Deleted: ziproxy.tmpfiles
===================================================================
--- ziproxy.tmpfiles	2020-05-30 21:31:54 UTC (rev 637537)
+++ ziproxy.tmpfiles	2020-05-30 21:32:29 UTC (rev 637538)
@@ -1 +0,0 @@
-d /var/log/ziproxy 0775 0 15 - -

Copied: ziproxy/repos/community-x86_64/ziproxy.tmpfiles (from rev 637537, ziproxy/trunk/ziproxy.tmpfiles)
===================================================================
--- ziproxy.tmpfiles	                        (rev 0)
+++ ziproxy.tmpfiles	2020-05-30 21:32:29 UTC (rev 637538)
@@ -0,0 +1 @@
+d /var/log/ziproxy 0775 0 15 - -

Deleted: ziproxy.xinetd
===================================================================
--- ziproxy.xinetd	2020-05-30 21:31:54 UTC (rev 637537)
+++ ziproxy.xinetd	2020-05-30 21:32:29 UTC (rev 637538)
@@ -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 637537, ziproxy/trunk/ziproxy.xinetd)
===================================================================
--- ziproxy.xinetd	                        (rev 0)
+++ ziproxy.xinetd	2020-05-30 21:32:29 UTC (rev 637538)
@@ -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
+}


More information about the arch-commits mailing list