* [gentoo-commits] repo/gentoo:master commit in: www-servers/varnish/files/, www-servers/varnish/
@ 2016-07-10 18:02 Anthony G. Basile
0 siblings, 0 replies; 3+ messages in thread
From: Anthony G. Basile @ 2016-07-10 18:02 UTC (permalink / raw
To: gentoo-commits
commit: d41320f2858a9dca4139e74b44d7f0c32fed2f7b
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 10 18:06:06 2016 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Jul 10 18:06:20 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d41320f2
www-servers/varnish: punt oldest stable version 3.0.7
Package-Manager: portage-2.2.28
www-servers/varnish/Manifest | 1 -
.../files/varnish-3.0.3-pthread-uclibc.patch | 35 --------
.../varnish/files/varnish-3.0.4-automagic.patch | 94 -------------------
.../files/varnish-3.0.4-fix-automake-1.13.patch | 12 ---
.../files/varnish-3.0.5-fix-python-path.patch | 9 --
.../files/varnish-3.0.5-path-to-vmod_vcc.patch | 12 ---
www-servers/varnish/files/varnishd.confd-r2 | 26 ------
www-servers/varnish/files/varnishd.initd-r2 | 94 -------------------
www-servers/varnish/files/varnishd.logrotate | 9 --
www-servers/varnish/metadata.xml | 1 -
www-servers/varnish/varnish-3.0.7.ebuild | 100 ---------------------
11 files changed, 393 deletions(-)
diff --git a/www-servers/varnish/Manifest b/www-servers/varnish/Manifest
index 4076f56..cbeb55c 100644
--- a/www-servers/varnish/Manifest
+++ b/www-servers/varnish/Manifest
@@ -1,3 +1,2 @@
-DIST varnish-3.0.7.tar.gz 2102037 SHA256 a27e9f11391617fab27cc6edc31d3c8681b8d6975f8c2cd07f6e081bc54c24ce SHA512 5fa9749305eb1a546ef4aae8a1797247fcc9098e1661453b9b87916da9fbc60d76bc0de9542ab17136e3da4b256c8a547aded2b4372dbbb54c44e93eff34a061 WHIRLPOOL 00ff6d16603ba4bf42608d55d769048f35c275a8ffa2b6860df6de2571d0481c39019d58d5b843f8a64492a5bf26caf9d841a023826d2fd2771ed8d35447a659
DIST varnish-4.0.3.tar.gz 1866760 SHA256 94b9a174097f47db2286acd2c35f235e49a2b7a9ddfdbd6eb7aa4da9ae8f8206 SHA512 db7bb141afd4617ac95573983dc30591b0eb9bc1af06df1094f2c1eeac539da936afb4a239d2f446d3c3a51b88a781b7f9f6d9a0b2028eaf0e7049ea2159d883 WHIRLPOOL 942456e19be427859283959dabe5522667519d36decbc598c8ee1e949767ea7435469393289d4373db6abac5275e50a95fc3799a837dc17740a490b4912bfe6f
DIST varnish-4.1.3.tar.gz 2134205 SHA256 9f9469b9fda2a578da2a9d282c71c34eeb5c42eda7f8d8728284d92282108429 SHA512 9ba0b2490bfa6f068d6777b4e8f1afcd823a3d6bf8e18ad0274cc9aff7733cd65df0e2ed9f2c6a3d3261d19438cc3254c89b0e41508d2cac2f17bdfd8119e4f1 WHIRLPOOL 6440932735c66fc8e7c8bf0ca577f84d93ed45a5e3cc09074c8471cdb6937f731219dfdf2eaaa43b32aefda8511aec10289c8f6f0596c4ce0f88829b3240a299
diff --git a/www-servers/varnish/files/varnish-3.0.3-pthread-uclibc.patch b/www-servers/varnish/files/varnish-3.0.3-pthread-uclibc.patch
deleted file mode 100644
index 93f3da3..0000000
--- a/www-servers/varnish/files/varnish-3.0.3-pthread-uclibc.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Refine header check in bin/varnishd/mgt/mgt.h, mgt_main.c for uClibc
-
-Because of the difference in how uClibc and glibc stack their header
-files, stdio.h indirectly brings in PTHREAD_CANCELED from pthread.h
-on a uClibc system, whereas it does not on a glibc system. This happens
-in mgt.h and mgt_main.c. This patch refines the check in those files
-to take this fact into consideration.
-
-X-Gentoo-Bug-URL: https://bugs.gentoo.org/444294
----
-
-diff --git a/bin/varnishd/mgt.h b/bin/varnishd/mgt.h
-index 905fbcc..5d3ab09 100644
---- a/bin/varnishd/mgt.h
-+++ b/bin/varnishd/mgt.h
-@@ -126,6 +126,6 @@ extern unsigned mgt_vcc_unsafe_path;
- syslog(pri, fmt, __VA_ARGS__); \
- } while (0)
-
--#if defined(PTHREAD_CANCELED) || defined(PTHREAD_MUTEX_DEFAULT)
-+#if (defined(PTHREAD_CANCELED) && !defined(__UCLIBC__)) || defined(PTHREAD_MUTEX_DEFAULT)
- #error "Keep pthreads out of in manager process"
- #endif
-diff --git a/bin/varnishd/varnishd.c b/bin/varnishd/varnishd.c
-index 1b7f1e3..dce42d9 100644
---- a/bin/varnishd/varnishd.c
-+++ b/bin/varnishd/varnishd.c
-@@ -656,6 +656,6 @@ main(int argc, char * const *argv)
- exit(exit_status);
- }
-
--#if defined(PTHREAD_CANCELED) || defined(PTHREAD_MUTEX_DEFAULT)
-+#if (defined(PTHREAD_CANCELED) && !defined(__UCLIBC__)) || defined(PTHREAD_MUTEX_DEFAULT)
- #error "Keep pthreads out of in manager process"
- #endif
diff --git a/www-servers/varnish/files/varnish-3.0.4-automagic.patch b/www-servers/varnish/files/varnish-3.0.4-automagic.patch
deleted file mode 100644
index 6a517cc..0000000
--- a/www-servers/varnish/files/varnish-3.0.4-automagic.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-diff -Naur varnish-3.0.4.orig/configure.ac varnish-3.0.4/configure.ac
---- varnish-3.0.4.orig/configure.ac 2013-06-14 04:39:32.000000000 -0400
-+++ varnish-3.0.4/configure.ac 2013-06-15 23:51:51.000000000 -0400
-@@ -87,15 +87,20 @@
-
- save_LIBS="${LIBS}"
- LIBS=""
--AC_SEARCH_LIBS(initscr, [curses ncurses],
-- [have_curses=yes], [have_curses=no])
--CURSES_LIBS="${LIBS}"
--LIBS="${save_LIBS}"
--AC_SUBST(CURSES_LIBS)
--if test "$have_curses" = no; then
-- AC_MSG_WARN([curses not found; some tools will not be built])
--fi
--AC_CHECK_HEADERS([ncurses/curses.h curses.h])
-+AC_ARG_WITH([tools], AS_HELP_STRING([--without-tools],
-+ [Don't build additional tools: varnishhist, varnishstat, varnishtop, varnishsizes (default: test)]))
-+
-+AS_IF([test "x$with_tools" != "xno"], [
-+ AC_SEARCH_LIBS(initscr, [curses ncurses],
-+ [have_curses=yes], [have_curses=no])
-+ CURSES_LIBS="${LIBS}"
-+ LIBS="${save_LIBS}"
-+ AC_SUBST(CURSES_LIBS)
-+ if test "$have_curses" = no; then
-+ AC_MSG_ERROR([curses not found, required to build additional tools])
-+ fi
-+ AC_CHECK_HEADERS([ncurses/curses.h curses.h])
-+])
- AM_CONDITIONAL([HAVE_CURSES], [test x$have_curses = xyes])
-
- save_LIBS="${LIBS}"
-@@ -266,7 +271,6 @@
- CFLAGS="${save_CFLAGS}"
-
- # Use jemalloc on Linux
--JEMALLOC_SUBDIR=
- JEMALLOC_LDADD=
- AC_ARG_WITH([jemalloc],
- [AS_HELP_STRING([--with-jemalloc],
-@@ -274,18 +278,13 @@
- [],
- [with_jemalloc=check])
-
--case $target in
-- *-*-linux*)
-- if test "x$with_jemalloc" != xno; then
-- AC_CHECK_LIB([jemalloc], [malloc_conf],
-+if test "x$with_jemalloc" != xno; then
-+ AC_CHECK_LIB([jemalloc], [malloc_conf],
-+ [JEMALLOC_LDADD="-ljemalloc"],
-+ [AC_CHECK_LIB([jemalloc], [jmalloc_conf],
- [JEMALLOC_LDADD="-ljemalloc"],
-- [AC_MSG_NOTICE([No system jemalloc found, using bundled version])
-- JEMALLOC_SUBDIR=libjemalloc
-- JEMALLOC_LDADD='$(top_builddir)/lib/libjemalloc/libjemalloc_mt.la'])
-- fi
-- ;;
--esac
--AC_SUBST(JEMALLOC_SUBDIR)
-+ [AC_MSG_ERROR([No system jemalloc found])])])
-+fi
- AC_SUBST(JEMALLOC_LDADD)
-
- # Userland slab allocator, available only on Solaris
-@@ -588,7 +587,6 @@
- lib/libvcl/Makefile
- lib/libvgz/Makefile
- lib/libvmod_std/Makefile
-- lib/libjemalloc/Makefile
- man/Makefile
- redhat/Makefile
- varnishapi.pc
---- varnish-3.0.4.orig/lib/Makefile.am 2013-06-14 04:39:32.000000000 -0400
-+++ varnish-3.0.4/lib/Makefile.am 2013-06-15 23:51:08.000000000 -0400
-@@ -6,14 +6,12 @@
- libvarnishapi \
- libvcl \
- libvgz \
-- libvmod_std \
-- @JEMALLOC_SUBDIR@
-+ libvmod_std
-
--DIST_SUBDIRS = \
-+DIST_SUBDIRS = \
- libvarnishcompat \
- libvarnish \
- libvarnishapi \
- libvcl \
- libvgz \
-- libvmod_std \
-- libjemalloc
-+ libvmod_std
diff --git a/www-servers/varnish/files/varnish-3.0.4-fix-automake-1.13.patch b/www-servers/varnish/files/varnish-3.0.4-fix-automake-1.13.patch
deleted file mode 100644
index 0034c80..0000000
--- a/www-servers/varnish/files/varnish-3.0.4-fix-automake-1.13.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur varnish-3.0.4.orig/configure.ac varnish-3.0.4/configure.ac
---- varnish-3.0.4.orig/configure.ac 2013-06-14 04:39:32.000000000 -0400
-+++ varnish-3.0.4/configure.ac 2013-06-21 08:48:32.000000000 -0400
-@@ -4,7 +4,7 @@
- AC_REVISION([$Id: varnish-3.0.4-fix-automake-1.13.patch,v 1.1 2013/06/21 12:51:35 blueness Exp $])
- AC_INIT([Varnish], [3.0.4], [varnish-dev@varnish-cache.org])
- AC_CONFIG_SRCDIR(include/varnishapi.h)
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
-
- # save command line CFLAGS for use in VCC_CC (to pass through things like -m64)
- OCFLAGS="$CFLAGS"
diff --git a/www-servers/varnish/files/varnish-3.0.5-fix-python-path.patch b/www-servers/varnish/files/varnish-3.0.5-fix-python-path.patch
deleted file mode 100644
index 4c927e3..0000000
--- a/www-servers/varnish/files/varnish-3.0.5-fix-python-path.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -Naur varnish-3.0.5.orig/lib/libvmod_std/vmod.py varnish-3.0.5/lib/libvmod_std/vmod.py
---- varnish-3.0.5.orig/lib/libvmod_std/vmod.py 2013-12-02 02:47:57.000000000 -0500
-+++ varnish-3.0.5/lib/libvmod_std/vmod.py 2014-01-16 13:21:50.763238020 -0500
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/python
-+#!/usr/bin/python
- #-
- # Copyright (c) 2010-2011 Varnish Software AS
- # All rights reserved.
diff --git a/www-servers/varnish/files/varnish-3.0.5-path-to-vmod_vcc.patch b/www-servers/varnish/files/varnish-3.0.5-path-to-vmod_vcc.patch
deleted file mode 100644
index 479e007..0000000
--- a/www-servers/varnish/files/varnish-3.0.5-path-to-vmod_vcc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur varnish-3.0.5.orig/lib/libvmod_std/vmod.py varnish-3.0.5/lib/libvmod_std/vmod.py
---- varnish-3.0.5.orig/lib/libvmod_std/vmod.py 2014-01-16 13:33:02.983247069 -0500
-+++ varnish-3.0.5/lib/libvmod_std/vmod.py 2014-01-16 13:42:36.848254794 -0500
-@@ -43,7 +43,7 @@
- if len(sys.argv) == 2:
- specfile = sys.argv[1]
- else:
-- specfile = "vmod.vcc"
-+ specfile = "/etc/varnish/vmod.vcc"
-
- ctypes = {
- 'IP': "struct sockaddr_storage *",
diff --git a/www-servers/varnish/files/varnishd.confd-r2 b/www-servers/varnish/files/varnishd.confd-r2
deleted file mode 100644
index 699bc8e..0000000
--- a/www-servers/varnish/files/varnishd.confd-r2
+++ /dev/null
@@ -1,26 +0,0 @@
-# /etc/conf.d/varnishd
-
-VARNISHD="/usr/sbin/varnishd"
-VARNISHADM="/usr/bin/varnishadm"
-CONFIGFILE="/etc/varnish/default.vcl"
-
-# Listen on 127.0.0.1:8080 and connect to backend 127.0.0.1:80
-# Ignore the config file, /etc/varnish/default.vcl
-VARNISHD_OPTS="-a 127.0.0.1:8080 -b 127.0.0.1:80"
-
-# Alternatively, don't listen to a backend and use
-# the config file
-#VARNISHD_OPTS="-a 127.0.0.1:8080 -f $CONFIGFILE"
-
-# Arguments passed to varnishncsa
-# Please see varnishncsa(1) for more options
-VARNISHNCSA_ARGS="-c -a -w /var/log/varnish/access.log"
-
-# Arguments passed to varnishncsa -F option
-# Please see varnishncsa(1) for more options
-# VARNISHNCSA_LOGFORMAT='%h %l %u %t "%r" %s %b "%{Referer}i" "%{User-agent}i"'
-
-# We need to increase the number of open files (-n)
-# and the maximum amount off locked memory (-l)
-# See bug #459142
-rc_ulimit="-n 32786 -l 82000"
diff --git a/www-servers/varnish/files/varnishd.initd-r2 b/www-servers/varnish/files/varnishd.initd-r2
deleted file mode 100644
index 7edd50d..0000000
--- a/www-servers/varnish/files/varnishd.initd-r2
+++ /dev/null
@@ -1,94 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-extra_commands="configtest"
-extra_started_commands="reload"
-
-description_configtest="Run syntax tests for configuration files."
-description_reload="Reloads the configuration."
-
-depend() {
- need net
-}
-
-configtest() {
- ebegin "Checking ${SVCNAME} configuration"
- checkconfig
- eend $?
-}
-
-checkconfig() {
- ${VARNISHD} -C -f ${CONFIGFILE} >/dev/null 2>&1
- ret=$?
- if [ $ret -ne 0 ]; then
- eerror "${SVCNAME} has detected an error in your setup:"
- ${VARNISHD} -C -f ${CONFIGFILE}
- fi
-
- return $ret
-}
-
-start() {
- checkconfig || return 1
-
- ebegin "Starting varnish"
- start-stop-daemon --quiet --start --pidfile /run/varnishd.pid \
- --exec ${VARNISHD} -- \
- -P /run/varnishd.pid \
- ${VARNISHD_OPTS} &> /dev/null
- eend $?
-
- if [ "${VARNISHNCSA_ARGS}" != "" ]; then
- ebegin "Starting varnish logging"
- start-stop-daemon --quiet --start --pidfile /run/varnishncsa.pid \
- --exec /usr/bin/varnishncsa -- \
- -D -P /run/varnishncsa.pid \
- ${VARNISHNCSA_ARGS} \
- ${VARNISHNCSA_LOGFORMAT:+-F "${VARNISHNCSA_LOGFORMAT}"}
- eend $?
- fi
-}
-
-stop() {
- ebegin "Stopping varnish"
- start-stop-daemon --quiet --stop --pidfile /run/varnishd.pid
- eend $?
-
- if [ -e /run/varnishncsa.pid ]; then
- ebegin "Stopping varnish logging"
- start-stop-daemon --quiet --stop --pidfile /run/varnishncsa.pid
- eend $?
- fi
-}
-
-reload() {
- checkconfig || return 1
-
- ebegin "Reloading varnish"
-
- $VARNISHADM vcl.list >/dev/null 2>&1
- ret=$?
- if [ $ret -ne 0 ]; then
- eerror "${SVCNAME} cannot list configuration"
- return 1
- fi
-
- new_config="reload_$(date +%FT%H:%M:%S)"
- $VARNISHADM vcl.load $new_config $CONFIGFILE >/dev/null 2>&1
- ret=$?
- if [ $ret -ne 0 ]; then
- eerror "${SVCNAME} cannot load configuration"
- return 1
- fi
-
- $VARNISHADM vcl.use $new_config >/dev/null 2>&1
- ret=$?
- if [ $ret -ne 0 ]; then
- eerror "${SVCNAME} cannot switch configuration"
- return 1
- fi
-
- eend 0
-}
diff --git a/www-servers/varnish/files/varnishd.logrotate b/www-servers/varnish/files/varnishd.logrotate
deleted file mode 100644
index 62ee600..0000000
--- a/www-servers/varnish/files/varnishd.logrotate
+++ /dev/null
@@ -1,9 +0,0 @@
-/var/log/varnish/*.log {
- weekly
- rotate 10
- copytruncate
- delaycompress
- compress
- notifempty
- missingok
-}
diff --git a/www-servers/varnish/metadata.xml b/www-servers/varnish/metadata.xml
index 99c406b..fa6c198 100644
--- a/www-servers/varnish/metadata.xml
+++ b/www-servers/varnish/metadata.xml
@@ -11,7 +11,6 @@
<description>Secondary maintainer</description>
</maintainer>
<use>
- <flag name="tools">Build additional tools: varnishhist, varnishstat, varnishtop, varnishsizes</flag>
<flag name="jemalloc">Use dev-libs/jemalloc for allocations</flag>
</use>
<longdescription lang="en">
diff --git a/www-servers/varnish/varnish-3.0.7.ebuild b/www-servers/varnish/varnish-3.0.7.ebuild
deleted file mode 100644
index 4c52071..0000000
--- a/www-servers/varnish/varnish-3.0.7.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_3} pypy )
-
-inherit autotools-utils eutils systemd python-single-r1
-
-DESCRIPTION="Varnish is a state-of-the-art, high-performance HTTP accelerator"
-HOMEPAGE="http://www.varnish-cache.org/"
-SRC_URI="http://repo.varnish-cache.org/source/${P}.tar.gz"
-
-LICENSE="BSD-2 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~mips x86"
-IUSE="doc jemalloc jit static-libs +tools"
-
-CDEPEND="
- || ( dev-libs/libedit sys-libs/readline )
- dev-libs/libpcre[jit?]
- jemalloc? ( dev-libs/jemalloc )
- tools? ( sys-libs/ncurses:= )"
-
-#varnish compiles stuff at run time
-RDEPEND="
- ${PYTHON_DEPS}
- ${CDEPEND}
- sys-devel/gcc"
-
-DEPEND="
- ${CDEPEND}
- virtual/pkgconfig"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="test" #315725
-
-DOCS=( README doc/changes.rst )
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.0.4-fix-automake-1.13.patch
- "${FILESDIR}"/${PN}-3.0.4-automagic.patch
- "${FILESDIR}"/${PN}-3.0.3-pthread-uclibc.patch
- "${FILESDIR}"/${PN}-3.0.5-fix-python-path.patch
- "${FILESDIR}"/${PN}-3.0.5-path-to-vmod_vcc.patch
-)
-
-AUTOTOOLS_AUTORECONF="yes"
-
-pkg_setup() {
- python-single-r1_pkg_setup
-}
-
-src_prepare() {
- # Remove bundled libjemalloc. We also fix
- # automagic dep in our patches, bug #461638
- rm -rf lib/libjemalloc
-
- autotools-utils_src_prepare
-}
-
-src_configure() {
- local myeconfargs=(
- $(use_enable static-libs static)
- $(use_enable jit pcre-jit )
- $(use_with jemalloc)
- $(use_with tools)
- --without-rst2man
- --without-rst2html
- )
- autotools-utils_src_configure
-}
-
-src_install() {
- autotools-utils_src_install
-
- newinitd "${FILESDIR}"/varnishd.initd-r2 varnishd
- newconfd "${FILESDIR}"/varnishd.confd-r2 varnishd
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}/varnishd.logrotate" varnishd
-
- dodir /var/log/varnish
-
- use doc && dohtml -r "doc/sphinx/=build/html/"
-
- systemd_dounit "${FILESDIR}/${PN}d.service"
-
- python_doscript lib/libvmod_std/vmod.py
- insinto /etc/varnish
- doins lib/libvmod_std/vmod.vcc
-}
-
-pkg_postinst () {
- elog "No demo-/sample-configfile is included in the distribution. Please"
- elog "read the man-page for more info. A sample configuration proxying"
- elog "localhost:8080 for localhost:80 is given in /etc/conf.d/varnishd."
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/varnish/files/, www-servers/varnish/
@ 2018-02-19 17:11 Anthony G. Basile
0 siblings, 0 replies; 3+ messages in thread
From: Anthony G. Basile @ 2018-02-19 17:11 UTC (permalink / raw
To: gentoo-commits
commit: 79f6deae86e2473c9db7922e6be38c485c27ad97
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 19 17:10:38 2018 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Feb 19 17:11:10 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79f6deae
www-servers/varnish: fix bug #647984
Package-Manager: Portage-2.3.19, Repoman-2.3.6
.../varnish/files/varnish-5.2.0-fix-import.patch | 66 ++++++++++++++++++++++
...arnish-5.2.0.ebuild => varnish-5.2.0-r1.ebuild} | 2 +
2 files changed, 68 insertions(+)
diff --git a/www-servers/varnish/files/varnish-5.2.0-fix-import.patch b/www-servers/varnish/files/varnish-5.2.0-fix-import.patch
new file mode 100644
index 00000000000..f83385a3f8e
--- /dev/null
+++ b/www-servers/varnish/files/varnish-5.2.0-fix-import.patch
@@ -0,0 +1,66 @@
+From 17c92e43fda114bf5341e51d752e882238b8fe8c Mon Sep 17 00:00:00 2001
+From: Nils Goroll <nils.goroll@uplex.de>
+Date: Thu, 5 Oct 2017 13:39:23 +0200
+Subject: [PATCH] hack up vsctool to work with python 2 and 3
+
+StringIO does not exist any more in python3, yet requiring 2.7 would
+not pave the path forward, so try to be compatible with both.
+
+Works for me on Python 2.7.9 and Python 3.4
+
+I would appreciate if someone more fluent in serpentinous programming
+language reviewed and/or rewrote this.
+---
+ lib/libvcc/vsctool.py | 24 ++++++++++++++++++++----
+ 1 file changed, 20 insertions(+), 4 deletions(-)
+
+diff --git a/lib/libvcc/vsctool.py b/lib/libvcc/vsctool.py
+index 854968e3b..829c6e518 100644
+--- a/lib/libvcc/vsctool.py
++++ b/lib/libvcc/vsctool.py
+@@ -37,7 +37,10 @@
+ import json
+ import sys
+ import gzip
+-import StringIO
++try:
++ import StringIO
++except ImportError:
++ import io
+ import collections
+ import struct
+
+@@ -54,9 +57,22 @@
+ "format": [ "integer", FORMATS],
+ }
+
++# http://python3porting.com/problems.html#bytes-strings-and-unicode
++if sys.version_info < (3,):
++ def b(x):
++ return x
++else:
++ import codecs
++ def b(x):
++ return codecs.latin_1_encode(x)[0]
++
+ def gzip_str(s):
+- out = StringIO.StringIO()
+- gzip.GzipFile(fileobj=out, mode="w").write(s)
++ try:
++ out = StringIO.StringIO()
++ except NameError:
++ out = io.BytesIO()
++
++ gzip.GzipFile(fileobj=out, mode="w").write(b(s))
+ out.seek(4)
+ out.write(struct.pack("<L", 0x12bfd58))
+ return out.getvalue()
+@@ -285,7 +301,7 @@ class rst_vsc(directive):
+ def __init__(self, s):
+ super(rst_vsc, self).__init__(s)
+
+- for i,v in PARAMS.iteritems():
++ for i,v in PARAMS.items():
+ if v is not True:
+ self.do_default(i, v[0], v[1])
+
diff --git a/www-servers/varnish/varnish-5.2.0.ebuild b/www-servers/varnish/varnish-5.2.0-r1.ebuild
similarity index 97%
rename from www-servers/varnish/varnish-5.2.0.ebuild
rename to www-servers/varnish/varnish-5.2.0-r1.ebuild
index 13a77002584..e1b07932b6d 100644
--- a/www-servers/varnish/varnish-5.2.0.ebuild
+++ b/www-servers/varnish/varnish-5.2.0-r1.ebuild
@@ -53,6 +53,8 @@ src_prepare() {
# the original location
ln -sf ../varnish.m4 m4/varnish.m4
+ eapply "${FILESDIR}"/"${P}"-fix-import.patch
+
eapply_user
eautoreconf
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/varnish/files/, www-servers/varnish/
@ 2021-01-13 9:10 Lars Wendler
0 siblings, 0 replies; 3+ messages in thread
From: Lars Wendler @ 2021-01-13 9:10 UTC (permalink / raw
To: gentoo-commits
commit: 4df2160146b9b86175fa8d3c68e42dcc5f0e4fb0
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 13 09:09:35 2021 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Jan 13 09:09:35 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4df21601
www-servers/varnish: Bump to version 6.5.1
Fixed build with sys-devel/autoconf:2.70
Closes: https://bugs.gentoo.org/751190
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
www-servers/varnish/Manifest | 1 +
.../files/varnish-6.5.1-autoconf-2.70.patch | 50 ++++++++++
www-servers/varnish/varnish-6.5.1.ebuild | 103 +++++++++++++++++++++
3 files changed, 154 insertions(+)
diff --git a/www-servers/varnish/Manifest b/www-servers/varnish/Manifest
index dd921ec4667..c9c3ff1a66c 100644
--- a/www-servers/varnish/Manifest
+++ b/www-servers/varnish/Manifest
@@ -2,3 +2,4 @@ DIST varnish-6.0.6.tgz 3136931 BLAKE2B 2ce379622b20a939a977a426cb842ba62e4fd5fd3
DIST varnish-6.3.2.tgz 3323908 BLAKE2B 5bde1b2ececeb8aed884db22ed75bfd74f82d68416e71400a4c0d27483fcceb029fe8e724e30754899c872d7028da5cb759545f0743a11d0e90b0fd604af0ad7 SHA512 0f476c642df834737d446b3bc6ac8afa5981d1de5810dc6e8556eb22b2ca26d64eb531f4ad3332eb86e231a7443fe35393177ec6dbee97a837f405d1aa9d03cd
DIST varnish-6.4.0.tgz 3404617 BLAKE2B 0ef0f7303f5c926bb1b80ec14cdd9755d65c1938fa8645240800ac2997f954022133625a74dd9c30ce21850674c3b00777fcc896309f528e6ba90d347333d7f7 SHA512 cda8f9e1d301a2b79db14685a23e25e36225f37065a1b7f37c5ae12fbb0483be51be9ffcc8ba72c1f65f5a022d1e408825694daed6780e206b9ba91feb2a07a1
DIST varnish-6.5.0.tgz 3476969 BLAKE2B bafa8704f28dfa96f681805cc053dd6415e143016b1bbff7f8962f2c3ac5cd07be6dc2f4129a423ddfcbf9f9f8afc57388930685d0ed400f3c06ba03bd667d87 SHA512 43f8cd6429a903a353ac4448b6e9aff445b0d52178141a148d3b29b987c0974841820af0da4917731775b46899c12b0327d64d12e3ddbb8fd438e2802ac66a1c
+DIST varnish-6.5.1.tgz 3460024 BLAKE2B 20abebf1df826987623c951122dd8ab2b500c0a64aca192fb12db8846e60938c2f444cf5f471d02aee4f3aeea05f4074bec335e963ab8a2fd59bef47e77df501 SHA512 0f34f2c6fe68bfcdba488cda40cc387b3c10343923a75a6a1791c890d20e79c64069697c45720cd5f0cba666d506d3ab6bb814ef4f9120cf0c8519a01144844f
diff --git a/www-servers/varnish/files/varnish-6.5.1-autoconf-2.70.patch b/www-servers/varnish/files/varnish-6.5.1-autoconf-2.70.patch
new file mode 100644
index 00000000000..beb400620fa
--- /dev/null
+++ b/www-servers/varnish/files/varnish-6.5.1-autoconf-2.70.patch
@@ -0,0 +1,50 @@
+From c6f70f8ca126b34a218248109b78a540d3a4989a Mon Sep 17 00:00:00 2001
+From: Simon Stridsberg <simon@devsn.se>
+Date: Tue, 12 Jan 2021 15:34:33 +0000
+Subject: [PATCH] Fix autoconf error in version 2.70
+
+Fixes #3491
+---
+ configure.ac | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index e44b61fffe..3763b3f34d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -40,9 +40,9 @@ AC_PROG_INSTALL
+ AC_ARG_WITH([rst2man],
+ AS_HELP_STRING([--with-rst2man=PATH], [Location of rst2man (auto)]),
+ [RST2MAN="$withval"],
+- AC_CHECK_PROGS(RST2MAN,
++ [AC_CHECK_PROGS(RST2MAN,
+ [rst2man-3.6 rst2man-3 rst2man rst2man.py],
+- [no]))
++ [no])])
+ if test "x$RST2MAN" = "xno"; then
+ AC_MSG_ERROR(
+ [rst2man is needed to build Varnish, please install python3-docutils.])
+@@ -51,9 +51,9 @@ fi
+ AC_ARG_WITH([sphinx-build],
+ AS_HELP_STRING([--with-sphinx-build=PATH], [Location of sphinx-build (auto)]),
+ [SPHINX="$withval"],
+- AC_CHECK_PROGS(SPHINX,
++ [AC_CHECK_PROGS(SPHINX,
+ [sphinx-build-3.6 sphinx-build-3 sphinx-build],
+- [no]))
++ [no])])
+ if test "x$SPHINX" = "xno"; then
+ AC_MSG_ERROR(
+ [sphinx-build is needed to build Varnish, please install python3-sphinx.])
+@@ -62,9 +62,9 @@ fi
+ AC_ARG_WITH([rst2html],
+ AS_HELP_STRING([--with-rst2html=PATH], [Location of rst2html (auto)]),
+ [RST2HTML="$withval"],
+- AC_CHECK_PROGS(RST2HTML,
++ [AC_CHECK_PROGS(RST2HTML,
+ [rst2html-3.6 rst2html-3 rst2html rst2html.py],
+- "no"))
++ "no")])
+
+ if test "x$RST2HTML" = "xno"; then
+ AC_MSG_ERROR(
diff --git a/www-servers/varnish/varnish-6.5.1.ebuild b/www-servers/varnish/varnish-6.5.1.ebuild
new file mode 100644
index 00000000000..02d9937423c
--- /dev/null
+++ b/www-servers/varnish/varnish-6.5.1.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit autotools systemd python-r1
+
+DESCRIPTION="Varnish is a state-of-the-art, high-performance HTTP accelerator"
+HOMEPAGE="https://varnish-cache.org/"
+SRC_URI="http://varnish-cache.org/_downloads/${P}.tgz"
+
+LICENSE="BSD-2 GPL-2"
+SLOT="0/2"
+KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86"
+IUSE="jemalloc jit static-libs"
+
+CDEPEND="
+ sys-libs/readline:0=
+ dev-libs/libpcre[jit?]
+ jemalloc? ( dev-libs/jemalloc )
+ sys-libs/ncurses:0="
+
+#varnish compiles stuff at run time
+RDEPEND="
+ ${PYTHON_DEPS}
+ ${CDEPEND}
+ acct-user/varnish
+ acct-group/varnish
+ sys-devel/gcc"
+
+DEPEND="
+ ${CDEPEND}
+ dev-python/docutils
+ dev-python/sphinx
+ virtual/pkgconfig"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="test" #315725
+
+PATCHES=(
+ "${FILESDIR}/${P}-autoconf-2.70.patch" #751190
+)
+
+src_prepare() {
+ # Remove -Werror bug #528354
+ sed -i -e 's/-Werror\([^=]\)/\1/g' configure.ac
+
+ # Upstream doesn't put varnish.m4 in the m4/ directory
+ # We link because the Makefiles look for the file in
+ # the original location
+ ln -sf ../varnish.m4 m4/varnish.m4
+
+ default
+ eautoreconf
+}
+
+src_configure() {
+ local myeconfargs=(
+ $(use_enable static-libs static)
+ $(use_enable jit pcre-jit)
+ $(use_with jemalloc)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ python_replicate_script "${D}/usr/share/varnish/vmodtool.py"
+
+ newinitd "${FILESDIR}"/varnishlog.initd varnishlog
+ newconfd "${FILESDIR}"/varnishlog.confd varnishlog
+
+ newinitd "${FILESDIR}"/varnishncsa.initd varnishncsa
+ newconfd "${FILESDIR}"/varnishncsa.confd varnishncsa
+
+ newinitd "${FILESDIR}"/varnishd.initd-r4 varnishd
+ newconfd "${FILESDIR}"/varnishd.confd-r4 varnishd
+
+ insinto /etc/logrotate.d/
+ newins "${FILESDIR}/varnishd.logrotate-r2" varnishd
+
+ diropts -m750
+
+ keepdir /var/lib/varnish
+ keepdir /var/log/varnish
+
+ systemd_dounit "${FILESDIR}/${PN}d.service"
+
+ insinto /etc/varnish/
+ doins lib/libvmod_std/vmod_std.vcc
+ doins etc/example.vcl
+
+ dodoc README.rst
+ dodoc doc/changes.rst
+
+ fowners root:varnish /etc/varnish/
+ fowners varnish:varnish /var/lib/varnish/
+ fperms 0750 /var/lib/varnish/ /etc/varnish/
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-01-13 9:10 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-01-13 9:10 [gentoo-commits] repo/gentoo:master commit in: www-servers/varnish/files/, www-servers/varnish/ Lars Wendler
-- strict thread matches above, loose matches on Subject: below --
2018-02-19 17:11 Anthony G. Basile
2016-07-10 18:02 Anthony G. Basile
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox