mirrors/aports
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2025-11-01 08:51:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

testing/trafficserver9: upgrade to 9.2.2

Browse Source
This commit is contained in:
Celeste 2023-08-16 05:36:55 +00:00 committed by Kevin Daudt
parent 439c73e146
commit 739f1c47a0
4 changed files with 41 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
testing/trafficserver9/20-adapt-trafficserver.patch
View File

@ -24,7 +24,7 @@
action "Stopping ${TS_NAME}:" killproc -p $TS_PIDFILE -d 35 $TS_DAEMON
- elif [ "$DISTRIB_ID" = "gentoo" ]; then
+ elif [ "$DISTRIB_ID" = "gentoo" -o "$DISTRIB_ID" = "alpine" ]; then
ebegin "Starting ${TS_PACKAGE_NAME}"
ebegin "Stopping ${TS_PACKAGE_NAME}"
do_stop
eend $?
@@ -396,7 +398,7 @@
@ -40,8 +40,8 @@
status=$?
[ $status -eq 0 ] || /bin/echo -n "not "
echo "running."
- elif [ "$DISTRIB_ID" = "FreeBSD" -o "$DISTRIB_ID" = "gentoo" ]; then
+ elif [ "$DISTRIB_ID" = "FreeBSD" -o "$DISTRIB_ID" = "gentoo" -o "$DISTRIB_ID" = "alpine" ]; then
- elif [ "$DISTRIB_ID" = "FreeBSD" -o "$DISTRIB_ID" = "gentoo" -o "$DISTRIB_ID" = "nixos" ]; then
+ elif [ "$DISTRIB_ID" = "FreeBSD" -o "$DISTRIB_ID" = "gentoo" -o "$DISTRIB_ID" = "nixos" -o "$DISTRIB_ID" = "alpine" ]; then
if pgrep $TM_NAME > /dev/null ; then
echo "$TM_NAME running as pid `cat $TM_PIDFILE`" ; else
echo "$TM_NAME not running"

10
testing/trafficserver9/APKBUILD
View File

@ -2,7 +2,7 @@
# Maintainer: Peter Shkenev <santurysim@gmail.com>
pkgname=trafficserver9
_pkgreal=trafficserver
pkgver=9.1.4
pkgver=9.2.2
pkgrel=0
provides="trafficserver=$pkgver-r$pkgrel"
pkgdesc="Fast, scalable and extensible HTTP/1.1 and HTTP/2 compliant caching proxy server"
@ -65,6 +65,7 @@ source="
30-fix-perl-installation.patch
40-alpine-dir-layout.patch
no-execinfo.patch
fix-pthread.patch
trafficserver.initd
"
install="$pkgname.pre-install $pkgname.post-install"
@ -266,11 +267,12 @@ utils() {
}
sha512sums="
f18aca66e444470738f6031366edc45db26942917e3fe8cba9fbb3b28173e01e06991aa9846e459047365946738931b1910719574c9c2afee72e4dfb30eab617 trafficserver-9.1.4.tar.bz2
1d00a3b9207648a16e0043f714c931bb5f30978ca329e0897d8d08b8d70d38a52bbe37ffe89884e98d5e7db09ad2762a90c3dc9654c70c0a979690a1fc342b72 trafficserver-9.2.2.tar.bz2
fbbe4fd4024b4656a3d4f67bdace7ae3a65892d40a92c67245e277520dfd53d5e9eb7934b2d213dfecc4de6895c63ec67cef0edee7b43ba28319cfaa3c75ddf3 10-fix-PATH_MAX-on-ppc64le.patch
f0641d9b6d263340c7b29e708cbf9cedcf74578ab77e425949bb7f9abc7a06f2a88cf2d4168d2936e8216a260c6bf3480f50390cd2cacc4afe69489b8bda4c64 20-adapt-trafficserver.patch
fe9b8344979fc5da885203146f4052016401354aa5310c30edc0e89f714e47492b1ec900e5f8ca02bd1910f0d4b4f4512536d9e7db9cf87f127e7259aba315dd 20-adapt-trafficserver.patch
47d7d83be1e7798bb905c217efab9480aa6e6218eb09317c20c457f454895016a6104818d86223a051c8adc40f42c7436aa607f73e505c939bd2d5dd8e5efa45 30-fix-perl-installation.patch
791b5ea9620574b172587fb2fcde97da53ca4c4a64110f1e1e13b9e475ffa255753fd98933a2f0f1ef44a2bf7810f6828445147fc6dcc8a41869b62271a728ad 40-alpine-dir-layout.patch
f74e4dccfaed1861efb9b21510e7122bfb487c61361bd4795fb81a376521c37cd15e35e38863bec9e8419d7ac9669ca0978adab7e53b2aa85d73d8f474de84fc no-execinfo.patch
53a834590ae5e4487229895f60fd1e34858418419655e37c03f8c4a1075905b40449dde817f10b39173ac27391ec9a6e75839bb5a4d8f631d8fb9d479d0a8d15 no-execinfo.patch
b675d57791d427a75dce63b35574bbf49192451cf022c5332c042d0e578c0d89ceff4c4c79ac71e323710c935c2735ceb0e0ebcd12709c5e67be44dce0c9d7fb fix-pthread.patch
a4d2e91d92579ba8b0c5361b0f4fd490d7a90e8a170552428f4781432eca89503a87a2c6f571a342eb77db5a43baa03d779a1fbe37ce1f4bba24fe89d5c97e7d trafficserver.initd
"

22
testing/trafficserver9/fix-pthread.patch Normal file
View File

@ -0,0 +1,22 @@
--- a/include/tscore/ink_rwlock.h
+++ b/include/tscore/ink_rwlock.h
@@ -40,7 +40,7 @@
// Instead of calling ink_rwlock_init(), an ink_rwlock instance can be initialized with one of thsee values.
//
ink_rwlock const INK_RWLOCK_INIT = PTHREAD_RWLOCK_INITIALIZER;
-#if defined(linux)
+#if defined(linux) && defined(__GLIBC__)
ink_rwlock const INK_RWLOCK_INIT_NO_WRITER_STARVATION = PTHREAD_RWLOCK_WRITER_NONRECURSIVE_INITIALIZER_NP;
#else
// Testing indicates that for MacOS/Darwin and FreeBSD, pthread rwlocks always prevent writer starvation.
--- a/include/tscpp/util/TsSharedMutex.h
+++ b/include/tscpp/util/TsSharedMutex.h
@@ -207,7 +207,7 @@
}
}
-#if defined(linux)
+#if defined(linux) && defined(__GLIBC__)
// Use the initializer that prevents writer starvation.
//
pthread_rwlock_t _lock = PTHREAD_RWLOCK_WRITER_NONRECURSIVE_INITIALIZER_NP;

10
testing/trafficserver9/no-execinfo.patch
View File

@ -37,3 +37,13 @@ index 14a1904..d8160d3 100644
int res_track_memory = 0; // Disabled by default
uint64_t ssl_memory_allocated = 0;
--- a/iocore/eventsystem/P_UnixEThread.h
+++ b/iocore/eventsystem/P_UnixEThread.h
@@ -32,7 +32,6 @@
#include "I_EThread.h"
#include "I_EventProcessor.h"
-#include <execinfo.h>
const ink_hrtime DELAY_FOR_RETRY = HRTIME_MSECONDS(10);