update 9.1.3-1

4 files changed, 47 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 56db5de3b405..ae22e78986ed 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = trafficserver
 	pkgdesc = Apache Traffic Server
-	pkgver = 9.1.2
-	pkgrel = 2
+	pkgver = 9.1.3
+	pkgrel = 1
 	url = http://trafficserver.apache.org/
 	install = trafficserver.install
 	changelog = trafficserver.changelog
@@ -61,17 +61,19 @@ pkgbase = trafficserver
 	backup = etc/trafficserver/plugin.config
 	backup = etc/trafficserver/logging.yaml
 	backup = etc/trafficserver/ip_allow.yaml
-	source = http://archive.apache.org/dist/trafficserver/trafficserver-9.1.2.tar.bz2
+	source = http://dlcdn.apache.org/trafficserver/trafficserver-9.1.3.tar.bz2
 	source = trafficserver.tmpfiles
 	source = trafficserver.sysusers
 	source = trafficserver.service.in.patch
 	source = trafficserver.lib_perl_Makefile.in.patch
 	source = trafficserver.src_tscore_unit_tests.patch
-	sha256sums = 62f27d4e16a515e7ec85393186f909d934a79db41c7905f21d15a9eacb82232f
+	source = trafficserver.src_tscore_ink_file.patch
+	sha256sums = c8bf77b034b0da6c38d3ec9f3ca85ef1038aa046170e839308b0a59709d9afb6
 	sha256sums = 8c9dbabfe7a8e0ecf9f3edb3673d1ff0cd63bf79551389047a723479b8d21fac
 	sha256sums = a4e6a00dea61aa3f98413f092711afb90795ef35676f6a8e3970f4163d360202
 	sha256sums = fc0b437ef9f9c56ceaaa99eea7075abe15200ff540cfc505e42b0a8f762128b1
 	sha256sums = 6fb98a044637d6a6d7365b5e49e4a481f556b26d143898ab430e8e8dd7004277
 	sha256sums = cc56ee24659be4f81f0d70d3e4b0df0954e51647e77599baee4598d4c0339020
+	sha256sums = 3a747bd6d0c322ba232918cbea56471e16b481d22bd0780f59f951c443d1e8d4
 
 pkgname = trafficserver
diff --git a/PKGBUILD b/PKGBUILD
index f30190385c49..cdea31dca6d6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@
 # Contributor: David Roheim <david dot roheim at gmail dot com>
 
 pkgname='trafficserver'
-pkgver=9.1.2
-pkgrel=2
+pkgver=9.1.3
+pkgrel=1
 pkgdesc="Apache Traffic Server"
 url="http://trafficserver.apache.org/"
 license=('Apache')
@@ -16,19 +16,21 @@ makedepends=('flex' 'python-sphinx')
 BUILDENV+=('!check')
 
 source=(
-    http://archive.apache.org/dist/"${pkgname}"/"${pkgname}"-"${pkgver}".tar.bz2
+    http://dlcdn.apache.org/"${pkgname}"/"${pkgname}"-"${pkgver}".tar.bz2
     trafficserver.tmpfiles
     trafficserver.sysusers
     trafficserver.service.in.patch
     trafficserver.lib_perl_Makefile.in.patch
-    trafficserver.src_tscore_unit_tests.patch)
+    trafficserver.src_tscore_unit_tests.patch
+    trafficserver.src_tscore_ink_file.patch)
 
-sha256sums=('62f27d4e16a515e7ec85393186f909d934a79db41c7905f21d15a9eacb82232f'
+sha256sums=('c8bf77b034b0da6c38d3ec9f3ca85ef1038aa046170e839308b0a59709d9afb6'
             '8c9dbabfe7a8e0ecf9f3edb3673d1ff0cd63bf79551389047a723479b8d21fac'
             'a4e6a00dea61aa3f98413f092711afb90795ef35676f6a8e3970f4163d360202'
             'fc0b437ef9f9c56ceaaa99eea7075abe15200ff540cfc505e42b0a8f762128b1'
             '6fb98a044637d6a6d7365b5e49e4a481f556b26d143898ab430e8e8dd7004277'
-            'cc56ee24659be4f81f0d70d3e4b0df0954e51647e77599baee4598d4c0339020')
+            'cc56ee24659be4f81f0d70d3e4b0df0954e51647e77599baee4598d4c0339020'
+            '3a747bd6d0c322ba232918cbea56471e16b481d22bd0780f59f951c443d1e8d4')
 
 install=${pkgname}.install
 changelog=${pkgname}.changelog
@@ -107,6 +109,7 @@ prepare() {
     patch -Np0 -u -i ../trafficserver.service.in.patch
     patch -Np0 -u -i ../trafficserver.lib_perl_Makefile.in.patch
     patch -Np0 -u -i ../trafficserver.src_tscore_unit_tests.patch
+    patch -Np0 -u -i ../trafficserver.src_tscore_ink_file.patch
 }
 
 build() {
diff --git a/trafficserver.changelog b/trafficserver.changelog
index 6cfc74f8d820..9fd2ac97195f 100644
--- a/trafficserver.changelog
+++ b/trafficserver.changelog
@@ -1,3 +1,9 @@
+2022-08-10 hiyuki2578
+
+        * 9.1.3-1 :
+        Apache Traffic Server 9.1.3.
+
+
 2021-07-15 Galen Sampson <youremail@domain.com>
 
         * 9.0.2-1 :
diff --git a/trafficserver.src_tscore_ink_file.patch b/trafficserver.src_tscore_ink_file.patch
new file mode 100644
index 000000000000..8511456ab8a2
--- /dev/null
+++ b/trafficserver.src_tscore_ink_file.patch
@@ -0,0 +1,26 @@
+--- configure.ac
++++ configure.ac
+@@ -1902,8 +1902,8 @@ AC_CHECK_HEADERS([sys/types.h \
+ 
+ # On OpenBSD, pthread.h must be included before pthread_np.h
+ AC_CHECK_HEADERS([pthread_np.h], [], [], [#include <pthread.h>])
+-AC_CHECK_HEADERS([sys/statfs.h sys/statvfs.h sys/disk.h sys/disklabel.h])
+-AC_CHECK_HEADERS([linux/hdreg.h linux/fs.h linux/major.h])
++AC_CHECK_HEADERS([sys/statfs.h sys/statvfs.h sys/disk.h sys/disklabel.h sys/mount.h])
++AC_CHECK_HEADERS([linux/hdreg.h linux/major.h])
+ 
+ AC_CHECK_HEADERS([sys/sysctl.h], [], [],
+                  [[#ifdef HAVE_SYS_PARAM_H
+--- src/tscore/ink_file.cc
++++ src/tscore/ink_file.cc
+@@ -52,8 +52,8 @@
+ #include <linux/hdreg.h> /* for struct hd_geometry */
+ #endif
+ 
+-#if HAVE_LINUX_FS_H
+-#include <linux/fs.h> /* for BLKGETSIZE.  sys/mount.h is another candidate */
++#if HAVE_SYS_MOUNT_H
++#include <sys/mount.h> /* for BLKGETSIZE */
+ #endif
+ 
+ using ioctl_arg_t = union {