Merge branch 'weekly'

weekly is now dead, we use master for weeklies now

alpine/APKBUILD

@@ -21,7 +21,7 @@ options="!check" # tests pass, but ran before packaging
 depends="gcc libc-dev libgcc"
 depends_dev=
 makedepends="$depends_dev pcre-dev ncurses-dev libedit-dev py-docutils
-	linux-headers libunwind-dev python py3-sphinx"
+	linux-headers libunwind-dev python3 py3-sphinx"
 install="$pkgname.pre-install"
 subpackages="$pkgname-dbg $pkgname-dev $pkgname-doc $pkgname-libs"
 pkgusers="varnish"

package-deb

@@ -36,6 +36,8 @@ MINOR=${VERSION##*.}		# 1 or 0-rc1
 MINOR=${MINOR%%-*}		# 1 or 0
 RELEASE=${VERSION#*-}		# 5.2.1 or rc1
 RELEASE=${RELEASE#$VERSION}	# '' or rc1
+BUILD_NUMBER=${BUILD_NUMBER:-none}
+BUILD_ID=${BUILD_ID:-none}
 
 # Take version override set on Jenkins builds into account.
 if [ -n "${WEEKLY_VERSION:-}" ]
@@ -49,6 +51,12 @@ then
 	VERSION="$MAJOR.$MINOR"
 	DEBVERSION="${DEBVERSION:-}"
 	DCH_TEXT="Release build #$BUILD_NUMBER ID: $BUILD_ID"
+elif [ "${VERSION}" = "trunk" ]
+then
+	VERSION=$(date +%Y%m%d%H%M%S)
+	RELEASE=
+	DEBVERSION=trunk
+	DCH_TEXT="Trunk build from git"
 else
 	VERSION="$MAJOR.$MINOR"
 	DEBVERSION="0${RELEASE}+daily+$(date +%Y%m%d.%H%M%S)"

redhat/varnish.spec

+%global __python %{__python3}
 %global vd_rc %{?v_rc:0.%{?v_rc}.}
 %global debug_package %{nil}
 %global _use_internal_dependency_generator 0
@@ -13,11 +14,15 @@ Group:   System Environment/Daemons
 URL:     https://www.varnish-cache.org/
 Source:  %{srcname}.tgz
 
+BuildRequires: diffutils
+BuildRequires: gcc
 BuildRequires: jemalloc-devel
 BuildRequires: libedit-devel
+BuildRequires: make
 BuildRequires: ncurses-devel
 BuildRequires: pcre-devel
 BuildRequires: pkgconfig
+BuildRequires: python3
 BuildRequires: python3-sphinx
 
 Requires: gcc