public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/trafficserver] trafficserver-9.2.14-1: Merge branch 'master' into epel7
@ 2026-07-15 17:20 Peter Robinson
  0 siblings, 0 replies; 7+ messages in thread
From: Peter Robinson @ 2026-07-15 17:20 UTC (permalink / raw)
  To: git-commits

A new commit has been pushed.

Repo   : rpms/trafficserver
Branch : trafficserver-9.2.14-1
Commit : 5cef7ea0725d63fa6145e50c4b8bbce2eb836e2f
Author : Peter Robinson <pbrobinson@gmail.com>
Date   : 2015-06-22T10:55:51+01:00
Stats  : +157/-218 in 6 file(s)
URL    : https://src.fedoraproject.org/rpms/trafficserver/c/5cef7ea0725d63fa6145e50c4b8bbce2eb836e2f?branch=trafficserver-9.2.14-1

Log:
Merge branch 'master' into epel7

---
diff --git a/.gitignore b/.gitignore
index 38b29a3..cdfba2e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,19 +1,2 @@
-/trafficserver-3.0.3.tar.bz2
-/trafficserver-3.0.4.tar.bz2
-/trafficserver-3.0.5.tar.bz2
-/trafficserver-3.2.0.tar.bz2
-/trafficserver-3.2.4.tar.bz2
-/trafficserver-3.2.5.tar.bz2
-/trafficserver-4.0.1.tar.bz2
-/trafficserver-4.0.2.tar.bz2
-/trafficserver-4.0.2.tar.bz2.asc
-/trafficserver-4.1.2.tar.bz2
-/trafficserver-4.1.2.tar.bz2.asc
-/trafficserver-4.2.0.tar.bz2
-/trafficserver-4.2.0.tar.bz2.asc
-/trafficserver-4.2.1.tar.bz2
-/trafficserver-4.2.1.tar.bz2.asc
-/trafficserver-5.0.0.tar.bz2
-/trafficserver-5.0.0.tar.bz2.asc
-/trafficserver-5.0.1.tar.bz2
-/trafficserver-5.0.1.tar.bz2.asc
+/trafficserver-*.tar.bz2
+/trafficserver-*.tar.bz2.asc

diff --git a/0001-TS-1392-Fix-SNI-certificate-fallback-path.patch b/0001-TS-1392-Fix-SNI-certificate-fallback-path.patch
deleted file mode 100644
index 439a4dc..0000000
--- a/0001-TS-1392-Fix-SNI-certificate-fallback-path.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 5ec4fb5eff9f5c1e2dc82e187bdd8d5f02080512 Mon Sep 17 00:00:00 2001
-From: James Peach <jpeach@apache.org>
-Date: Mon, 6 Aug 2012 20:42:43 -0700
-Subject: [PATCH] TS-1392: Fix SNI certificate fallback path
-
-When the SNI lookup fails, we fall back to a bad default SSL context
-instead of the context that we selected when we accepted the TCP
-connection. Make sure that we don't clobber a SSL context if the
-SNI lookup fails.
----
- iocore/net/SSLCertLookup.cc     |    7 -------
- iocore/net/SSLNetVConnection.cc |   17 ++++++++++++++---
- 2 files changed, 14 insertions(+), 10 deletions(-)
-
-index 8c323a5..8438ef2 100644
---- a/iocore/net/SSLCertLookup.cc
-+++ b/iocore/net/SSLCertLookup.cc
-@@ -113,13 +113,6 @@ SSLCertLookup::init(SslConfigParams * p)
- {
-   param = p;
-   multipleCerts = buildTable();
--
--  // If there wasn't a default SSL context, make a default one. We need this to bootstrap
--  // the SNI process and also to avoid crashing (which is generaly frowned upon).
--  if (!this->ssl_default) {
--    // XXX this leaks, but we're a singleton, so ....
--    this->ssl_default = SSL_CTX_new(SSLv23_server_method());
--  }
- }
- 
- bool
-diff --git a/iocore/net/SSLNetVConnection.cc b/iocore/net/SSLNetVConnection.cc
-index e9372e9..fd89cba 100644
---- a/iocore/net/SSLNetVConnection.cc
-+++ b/iocore/net/SSLNetVConnection.cc
-@@ -46,6 +46,8 @@ ClassAllocator<SSLNetVConnection> sslNetVCAllocator("sslNetVCAllocator");
- // Private
- //
- 
-+static SSL_CTX * ssl_default = SSL_CTX_new(SSLv23_server_method());
-+
- #if TS_USE_TLS_SNI
- 
- static int
-@@ -65,12 +67,18 @@ ssl_servername_callback(SSL * ssl, int * ad, void * arg)
-     ctx = lookup->defaultContext();
-   }
- 
--  if (ctx == NULL) {
--    return SSL_TLSEXT_ERR_NOACK;
-+  if (ctx != NULL) {
-+    SSL_set_SSL_CTX(ssl, ctx);
-   }
- 
-+  // At this point, we might have updated ctx based on the SNI lookup, or we might still have the
-+  // original SSL context that we set when we accepted the connection.
-+  ctx = SSL_get_SSL_CTX(ssl);
-   Debug("ssl", "found SSL context %p for requested name '%s'", ctx, servername);
--  SSL_set_SSL_CTX(ssl, ctx);
-+
-+  if (ctx == NULL) {
-+    return SSL_TLSEXT_ERR_NOACK;
-+  }
- 
-   // We need to return one of the SSL_TLSEXT_ERR constants. If we return an
-   // error, we can fill in *ad with an alert code to propgate to the
-@@ -495,6 +503,9 @@ SSLNetVConnection::sslStartHandShake(int event, int &err)
-       if (ctx == NULL) {
-         ctx = sslCertLookup.defaultContext();
-       }
-+      if (ctx == NULL) {
-+        ctx = ssl_default;
-+      }
- 
- #if TS_USE_TLS_SNI
-       Debug("ssl", "setting SNI callbacks with initial ctx %p", ctx);
--- 
-1.7.1
-

diff --git a/sources b/sources
index a11b327..642573c 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-76d5d7fea7ab1e3e1a09169ad0941767  trafficserver-5.0.1.tar.bz2
-5b7131c814b406c6b91eebf30bbd7229  trafficserver-5.0.1.tar.bz2.asc
+fe24cf2d44eccc84c753376f0e8c3be6  trafficserver-5.3.0.tar.bz2
+7f8143ffcbb69c48ffcdee916ff8db35  trafficserver-5.3.0.tar.bz2.asc

diff --git a/trafficserver-removeluajit.patch b/trafficserver-removeluajit.patch
new file mode 100644
index 0000000..ea09498
--- /dev/null
+++ b/trafficserver-removeluajit.patch
@@ -0,0 +1,29 @@
+--- trafficserver-5.3.0/lib/Makefile.am.orig	2015-06-22 01:14:08.523059091 +0100
++++ trafficserver-5.3.0/lib/Makefile.am	2015-06-22 01:14:22.498322039 +0100
+@@ -31,26 +31,3 @@
+ endif
+ 
+ DIST_SUBDIRS = $(SUBDIRS)
+-
+-# Some special hacks around building the luajit.
+-#
+-#  - Copy the luajit source tree if we're doing out-of-source builds
+-#  - Upon clean, remove the luajit tree from the out-of-source build tree
+-#
+-# Note: The LUA_LDFLAGS is a bit of a hack, since LuaJIT on OmniOS needs
+-#       the -m64 flag. See configure.ac.
+-#
+-if BUILD_LUAJIT
+-LUA_CFLAGS=$(CFLAGS) $(LUAJIT_CFLAGS) -DLUA_COMPAT_ALL -DLUA_USE_POSIX -DLUA_USE_DLOPEN
+-
+-all-local:
+-	@echo "Making all in luajit"
+-	test -d "$(top_srcdir)/$(subdir)/luajit/src" || (cd "$(top_srcdir)" && git submodule update --init)
+-	test -d "$(top_builddir)/$(subdir)/luajit/src" || cp -rf "$(srcdir)/luajit" "$(top_builddir)/$(subdir)/"
+-	cd luajit && $(MAKE) $(AM_MAKEFLAGS) BUILDMODE="static" PREFIX="$(prefix)" CC="$(CC)" \
+-	                     CFLAGS="$(LUA_CFLAGS)" LDFLAGS="@LUA_LDFLAGS@"
+-
+-clean-local:
+-	test "$(top_srcdir)" != "$(top_builddir)" || (cd "$(top_builddir)/$(subdir)/luajit" && $(MAKE) clean)
+-	test "$(top_srcdir)" = "$(top_builddir)" || rm -rf "$(top_builddir)/$(subdir)/luajit"
+-endif

diff --git a/trafficserver.spec b/trafficserver.spec
index b2c1148..98db9ff 100644
--- a/trafficserver.spec
+++ b/trafficserver.spec
@@ -1,25 +1,41 @@
 # https://fedoraproject.org/wiki/Packaging:Guidelines#PIE
 %define _hardened_build 1
+
 Summary:	Fast, scalable and extensible HTTP/1.1 compliant caching proxy server
 Name:		trafficserver
-Version:	5.0.1
-Release:	0%{?dist}
+Version:	5.3.0
+Release:	1%{?dist}
 License:	ASL 2.0
 Group:		System Environment/Daemons
+URL:		http://trafficserver.apache.org/index.html
+
 Source0:	http://www.apache.org/dist/%{name}/%{name}-%{version}.tar.bz2
 Source1:	http://www.apache.org/dist/%{name}/%{name}-%{version}.tar.bz2.asc
 Source2:	trafficserver.keyring
 Source3:	trafficserver.sysconf
 Source4:	trafficserver.service
 Source5:	trafficserver.tmpfilesd
-URL:		http://trafficserver.apache.org/index.html
+Patch1:		trafficserver-init_scripts.patch
+Patch2:		trafficserver-removeluajit.patch
+
 # BuildRoot is only needed for EPEL5:
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-BuildRequires:	autoconf, automake, libtool, openssl-devel, tcl-devel, expat-devel, boost-devel
-BuildRequires:	pcre-devel, zlib-devel, xz-devel, gcc-c++, gnupg, perl-ExtUtils-MakeMaker
+# fails on ARMv7 atm (needs investigation), s390 unsupported
+ExcludeArch:	%{arm} s390 s390x
+
+BuildRequires:	boost-devel
+BuildRequires:	expat-devel
+BuildRequires:	gcc-c++
+BuildRequires:	gnupg
 BuildRequires:	hwloc-devel
-# trafficserver fails to build on ppc and others, TS-1131, see lib/ts/ink_queue.h
-ExclusiveArch:	%{ix86} x86_64 ia64 %{arm}
+BuildRequires:	openssl-devel
+BuildRequires:	pcre-devel
+BuildRequires:	perl-ExtUtils-MakeMaker
+BuildRequires:	tcl-devel
+BuildRequires:	zlib-devel
+BuildRequires:	xz-devel
+BuildRequires:	autoconf automake libtool
+
 Requires: initscripts
 %if %{?fedora}0 > 140 || %{?rhel}0 > 60
 # For systemd.macros
@@ -32,123 +48,99 @@ Requires(preun): chkconfig initscripts
 Requires(postun): initscripts
 %endif
 
-Patch2:		trafficserver-init_scripts.patch
-
-
 %description
 Apache Traffic Server is a fast, scalable and extensible HTTP/1.1 compliant
 caching proxy server.
 
+%package devel
+Summary: Apache Traffic Server development libraries and header files
+Group: Development/Libraries
+Requires: trafficserver = %{version}-%{release}
+
+%description devel
+The trafficserver-devel package include plug-in development libraries and
+header files, and Apache httpd style module build system.
+
+%package perl
+Summary: Apache Traffic Server bindings for perl
+Group: Development/Libraries
+Requires: trafficserver = %{version}-%{release}
+
+%description perl
+The trafficserver-perl package contains perl bindings.
+
 %prep
-gpgv --homedir /tmp --keyring %{SOURCE2} --status-fd=1 %{SOURCE1} %{SOURCE0} | grep -q '^\[GNUPG:\] GOODSIG'
+#gpgv --homedir /tmp --keyring %{SOURCE2} --status-fd=1 %{SOURCE1} %{SOURCE0} | grep -q '^\[GNUPG:\] GOODSIG'
 
 %setup -q
 
-%patch2 -p1 -b .patch2
+%patch1 -p1 -b .init
+# Luajit is just used for an experimental plugin, which we don't build
+%patch2 -p1 -b .luajit
+rm -rf lib/luajit
 
 %build
+NOCONFIGURE=1 autoreconf -vif
 %configure \
   --enable-layout=Gentoo \
   --libdir=%{_libdir}/trafficserver \
   --libexecdir=%{_libdir}/trafficserver/plugins \
   --sysconfdir=%{_sysconfdir}/trafficserver \
   --with-tcl=%{_libdir} \
+  --disable-luajit \
   --with-user=ats --with-group=ats \
   --disable-silent-rules
 
-make %{?_smp_mflags}
+make %{?_smp_mflags} V=1
 
 %install
-echo $RPM_BUILD_ROOT
-rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
-
-# the traffic_shell manual conflict with bash: exit enable,
-# so we rename these to ts-enable, ts-exit and ts-disable.
-mkdir -p $RPM_BUILD_ROOT/usr/share/man/man1
-cp doc/man/*.1 $RPM_BUILD_ROOT/usr/share/man/man1/
+rm -rf %{buildroot}
+make DESTDIR=%{buildroot} install
 
 # Remove duplicate man-pages:
-rm -rf $RPM_BUILD_ROOT%{_docdir}/trafficserver
+rm -rf %{buildroot}%{_docdir}/trafficserver
 
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
+mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
 install -m 644 -p %{SOURCE3} \
-   $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/trafficserver
+   %{buildroot}%{_sysconfdir}/sysconfig/trafficserver
 
 %if %{?fedora}0 > 140 || %{?rhel}0 > 60
 install -D -m 0644 -p %{SOURCE4} \
-   $RPM_BUILD_ROOT/lib/systemd/system/trafficserver.service
+   %{buildroot}/lib/systemd/system/trafficserver.service
 install -D -m 0644 -p %{SOURCE5} \
-   $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d/trafficserver.conf
+   %{buildroot}%{_sysconfdir}/tmpfiles.d/trafficserver.conf
 %else
-mkdir -p $RPM_BUILD_ROOT/etc/init.d/
-mv $RPM_BUILD_ROOT/usr/bin/trafficserver $RPM_BUILD_ROOT/etc/init.d
+mkdir -p %{buildroot}/etc/init.d/
+mv %{buildroot}/usr/bin/trafficserver %{buildroot}/etc/init.d
 %endif
 
-# Remove static libs (needs to go to separate -static subpackage if we
-# want these:
-rm -f $RPM_BUILD_ROOT/%{_libdir}/trafficserver/libtsmgmt.a
-rm -f $RPM_BUILD_ROOT/%{_libdir}/trafficserver/libtsutil.a
-
-# Don't include libtool archives:
-rm -f $RPM_BUILD_ROOT/%{_libdir}/trafficserver/libtsmgmtshare.la
-rm -f $RPM_BUILD_ROOT/%{_libdir}/trafficserver/libtsmgmt.la
-rm -f $RPM_BUILD_ROOT/%{_libdir}/trafficserver/libtsutil.la
-rm -f $RPM_BUILD_ROOT/%{_libdir}/trafficserver/libatscpp11api.la
-rm -f $RPM_BUILD_ROOT/%{_libdir}/trafficserver/plugins/conf_remap.la
-rm -f $RPM_BUILD_ROOT/%{_libdir}/trafficserver/plugins/header_filter.la
-rm -f $RPM_BUILD_ROOT/%{_libdir}/trafficserver/plugins/regex_remap.la
-rm -f $RPM_BUILD_ROOT/%{_libdir}/trafficserver/plugins/stats_over_http.la
-rm -f $RPM_BUILD_ROOT/%{_libdir}/trafficserver/plugins/cacheurl.la
-rm -f $RPM_BUILD_ROOT/%{_libdir}/trafficserver/plugins/gzip.la
-rm -f $RPM_BUILD_ROOT/%{_libdir}/trafficserver/plugins/libloader.la
-rm -f $RPM_BUILD_ROOT/%{_libdir}/trafficserver/plugins/header_rewrite.la
-rm -f $RPM_BUILD_ROOT/%{_libdir}/trafficserver/plugins/tcpinfo.la
-
-rm -f $RPM_BUILD_ROOT/%{_libdir}/perl5/perllocal.pod
-rm -f $RPM_BUILD_ROOT/%{_libdir}/perl5/auto/Apache/TS/.packlist
+# Remove libtool archives and static libs
+find %{buildroot} -type f -name "*.la" -delete
+find %{buildroot} -type f -name "*.a" -delete
+
+rm -f %{buildroot}/%{_libdir}/perl5/perllocal.pod
+rm -f %{buildroot}/%{_libdir}/perl5/auto/Apache/TS/.packlist
 
 #
 perl -pi -e 's/^CONFIG.*proxy.config.proxy_name STRING.*$/CONFIG proxy.config.proxy_name STRING FIXME.example.com/' \
-	$RPM_BUILD_ROOT/etc/trafficserver/records.config
+	%{buildroot}/etc/trafficserver/records.config
 perl -pi -e 's/^CONFIG.*proxy.config.ssl.server.cert.path.*$/CONFIG proxy.config.ssl.server.cert.path STRING \/etc\/pki\/tls\/certs\//' \
-	$RPM_BUILD_ROOT/etc/trafficserver/records.config
+	%{buildroot}/etc/trafficserver/records.config
 perl -pi -e 's/^CONFIG.*proxy.config.ssl.server.private_key.path.*$/CONFIG proxy.config.ssl.server.private_key.path STRING \/etc\/pki\/tls\/private\//' \
-	$RPM_BUILD_ROOT/etc/trafficserver/records.config
+	%{buildroot}/etc/trafficserver/records.config
+
+mkdir -p %{buildroot}/var/run/trafficserver
 
-mkdir -p $RPM_BUILD_ROOT/var/run/trafficserver
+%check
+%ifnarch ppc64
+make check %{?_smp_mflags} V=1
+%endif
 
 # The clean section  is only needed for EPEL and Fedora < 13
 # http://fedoraproject.org/wiki/PackagingGuidelines#.25clean
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-%files
-%defattr(-, ats, ats, -)
-%doc README CHANGES NOTICE LICENSE
-%attr(0644,root,root) %{_mandir}/man1/*
-%attr(0644,root,root) %{_mandir}/man3/*
-%attr(0755,root,root) %{_bindir}/traffic*
-%attr(0755,root,root) %{_bindir}/tspush
-%attr(0755,root,root) %dir %{_libdir}/trafficserver
-%attr(0755,root,root) %dir %{_libdir}/trafficserver/plugins
-%attr(0755,root,root) %{_libdir}/trafficserver/*.so.*
-%attr(0755,root,root) %{_libdir}/trafficserver/plugins/*.so
-%attr(0644,root,root) %{_datadir}/perl5/Apache/TS.pm.in
-%attr(0644,root,root) %{_datadir}/perl5/Apache/TS.pm
-%attr(0644,root,root) %{_datadir}/perl5/Apache/TS/*
-%config(noreplace) /etc/trafficserver/*
-%if %{?fedora}0 > 140 || %{?rhel}0 > 60
-%attr(0644, root, root) /lib/systemd/system/trafficserver.service
-%config(noreplace) %attr(0644, root, root) %{_sysconfdir}/tmpfiles.d/trafficserver.conf
-%else
-%attr(0755, root, root) /etc/init.d/trafficserver
-%endif
-%attr(0755, ats, ats) %dir /etc/trafficserver
-%config(noreplace) %attr(0644, root, root) %{_sysconfdir}/sysconfig/trafficserver
-%dir /var/log/trafficserver
-%dir /var/run/trafficserver
-%dir /var/cache/trafficserver
 
 %post
 /sbin/ldconfig
@@ -191,25 +183,63 @@ if [ $1 -eq 1 ] ; then
 fi
 %endif
 
+%files
+%defattr(-, ats, ats, -)
+%{!?_licensedir:%global license %%doc}
+%license LICENSE
+%doc README CHANGES NOTICE
+%attr(0755, ats, ats) %dir /etc/trafficserver
+%config(noreplace) /etc/trafficserver/*
+%config(noreplace) %{_sysconfdir}/sysconfig/trafficserver
+%{_bindir}/traffic*
+%{_bindir}/tspush
+%dir %{_libdir}/trafficserver
+%dir %{_libdir}/trafficserver/plugins
+%{_libdir}/trafficserver/libts*.so.5*
+%{_libdir}/trafficserver/plugins/*.so
+%if %{?fedora}0 > 140 || %{?rhel}0 > 60
+/lib/systemd/system/trafficserver.service
+%config(noreplace) %{_sysconfdir}/tmpfiles.d/trafficserver.conf
+%else
+/etc/init.d/trafficserver
+%endif
+%dir /var/log/trafficserver
+%dir /var/run/trafficserver
+%dir /var/cache/trafficserver
 
-%package devel
-Summary: Apache Traffic Server development libraries and header files
-Group: Development/Libraries
-Requires: trafficserver = %{version}-%{release}
-%description devel
-The trafficserver-devel package include plug-in development libraries and
-header files, and Apache httpd style module build system.
+%files perl
+%defattr(-,root,root,-)
+%{_mandir}/man3/*
+%{_datadir}/perl5/Apache/TS.pm.in
+%{_datadir}/perl5/Apache/TS.pm
+%{_datadir}/perl5/Apache/TS/*
 
 %files devel
 %defattr(-,root,root,-)
-%attr(0755,root,root) %{_bindir}/tsxs
-%attr(0755,root,root) %dir %{_includedir}/ts
-%attr(0644,root,root) %{_includedir}/ts/*
-%attr(0755,root,root) %dir %{_libdir}/trafficserver
-%attr(0755,root,root) %dir %{_libdir}/trafficserver/plugins
-%attr(0644,root,root) %{_libdir}/trafficserver/*.so
+%{_bindir}/tsxs
+%{_includedir}/ts
+%{_libdir}/trafficserver/*.so
+%{_libdir}/trafficserver/pkgconfig/trafficserver.pc
 
 %changelog
+* Sun Jun 21 2015 Peter Robinson <pbrobinson@fedoraproject.org> 5.3.0-1
+- Update to 5.3.0 LTS release
+- Build on aarch64 and power64
+- Split perl bindings to sub package
+- Cleanup and modernise spec
+
+* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.0.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Sat May 02 2015 Kalev Lember <kalevlember@gmail.com> - 5.0.1-3
+- Rebuilt for GCC 5 C++11 ABI change
+
+* Mon Jan 26 2015 Petr Machata <pmachata@redhat.com> - 5.0.1-2
+- Rebuild for boost 1.57.0
+
+* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.0.1-1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
 * Wed Jul 23 2014 Jan-Frode Myklebust <janfrode@tanso.net> - 5.0.1-0
 - Fix CVE-2014-3525
 

diff --git a/trafficserver_make_install.patch b/trafficserver_make_install.patch
deleted file mode 100644
index 548ee7c..0000000
--- a/trafficserver_make_install.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- trafficserver-3.0.1/proxy/Makefile.in.bak	2011-07-19 08:30:02.479502097 +0200
-+++ trafficserver-3.0.1/proxy/Makefile.in	2011-07-19 08:34:44.913630387 +0200
-@@ -1238,17 +1238,17 @@
- 
- 
- install-data-local:
--	$(INSTALL) -d -o $(pkgsysuser) -g $(pkgsysgroup) $(DESTDIR)$(pkglocalstatedir) $(DESTDIR)$(pkglogdir) $(DESTDIR)$(pkgruntimedir) $(DESTDIR)$(pkgsysconfdir) $(DESTDIR)$(pkgsysconfdir)/internal $(DESTDIR)$(pkgdatadir) $(DESTDIR)$(pkgcachedir)
-+	if [ `id -un` == "root" ]; then $(INSTALL) -d -o $(pkgsysuser) -g $(pkgsysgroup) $(DESTDIR)$(pkglocalstatedir) $(DESTDIR)$(pkglogdir) $(DESTDIR)$(pkgruntimedir) $(DESTDIR)$(pkgsysconfdir) $(DESTDIR)$(pkgsysconfdir)/internal $(DESTDIR)$(pkgdatadir) $(DESTDIR)$(pkgcachedir); else $(INSTALL) -d $(DESTDIR)$(pkglocalstatedir) $(DESTDIR)$(pkglogdir) $(DESTDIR)$(pkgruntimedir) $(DESTDIR)$(pkgsysconfdir) $(DESTDIR)$(pkgsysconfdir)/internal $(DESTDIR)$(pkgdatadir) $(DESTDIR)$(pkgcachedir); fi
- 
- install-data-hook:
--	-chown -R $(pkgsysuser):$(pkgsysgroup) $(DESTDIR)$(pkgsysconfdir) $(DESTDIR)$(pkgdatadir)
-+	if [ `id -un` == "root" ]; then chown -R $(pkgsysuser):$(pkgsysgroup) $(DESTDIR)$(pkgsysconfdir) $(DESTDIR)$(pkgdatadir);fi
- 	-echo "<TS_VERSION> $(PACKAGE_VERSION)" > $(DESTDIR)$(pkgsysconfdir)/trafficserver-release
- 
- install-exec-local:
--	$(INSTALL) -d -o $(pkgsysuser) -g $(pkgsysgroup) $(DESTDIR)$(pkglibexecdir)
-+	if [ `id -un` == "root" ]; then $(INSTALL) -d -o $(pkgsysuser) -g $(pkgsysgroup) $(DESTDIR)$(pkglibexecdir); else $(INSTALL) -d $(DESTDIR)$(pkglibexecdir); fi
- 
- install-exec-hook:
--	-chown -R $(pkgsysuser):$(pkgsysgroup) $(DESTDIR)$(pkglibexecdir)
-+	if [ `id -un` == "root" ]; then chown -R $(pkgsysuser):$(pkgsysgroup) $(DESTDIR)$(pkglibexecdir);fi
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.

^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [rpms/trafficserver] trafficserver-9.2.14-1: Merge branch 'master' into epel7
@ 2026-07-15 17:20 Jan-Frode Myklebust
  0 siblings, 0 replies; 7+ messages in thread
From: Jan-Frode Myklebust @ 2026-07-15 17:20 UTC (permalink / raw)
  To: git-commits

A new commit has been pushed.

Repo   : rpms/trafficserver
Branch : trafficserver-9.2.14-1
Commit : 3a381d00e75d4e835dadb0ffa156103310367668
Author : Jan-Frode Myklebust <janfrode@tanso.net>
Date   : 2014-07-23T23:13:57+02:00
Stats  : +8/-3 in 3 file(s)
URL    : https://src.fedoraproject.org/rpms/trafficserver/c/3a381d00e75d4e835dadb0ffa156103310367668?branch=trafficserver-9.2.14-1

Log:
Merge branch 'master' into epel7

---
diff --git a/.gitignore b/.gitignore
index 4cbacdd..38b29a3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,5 @@
 /trafficserver-4.2.1.tar.bz2.asc
 /trafficserver-5.0.0.tar.bz2
 /trafficserver-5.0.0.tar.bz2.asc
+/trafficserver-5.0.1.tar.bz2
+/trafficserver-5.0.1.tar.bz2.asc

diff --git a/sources b/sources
index ab22092..a11b327 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-ad1fe1b45c38664f3714810ee950b2c7  trafficserver-5.0.0.tar.bz2
-8f6f6bac5d8c073fd453ec1866beed9b  trafficserver-5.0.0.tar.bz2.asc
+76d5d7fea7ab1e3e1a09169ad0941767  trafficserver-5.0.1.tar.bz2
+5b7131c814b406c6b91eebf30bbd7229  trafficserver-5.0.1.tar.bz2.asc

diff --git a/trafficserver.spec b/trafficserver.spec
index f69e818..b2c1148 100644
--- a/trafficserver.spec
+++ b/trafficserver.spec
@@ -2,7 +2,7 @@
 %define _hardened_build 1
 Summary:	Fast, scalable and extensible HTTP/1.1 compliant caching proxy server
 Name:		trafficserver
-Version:	5.0.0
+Version:	5.0.1
 Release:	0%{?dist}
 License:	ASL 2.0
 Group:		System Environment/Daemons
@@ -210,6 +210,9 @@ header files, and Apache httpd style module build system.
 %attr(0644,root,root) %{_libdir}/trafficserver/*.so
 
 %changelog
+* Wed Jul 23 2014 Jan-Frode Myklebust <janfrode@tanso.net> - 5.0.1-0
+- Fix CVE-2014-3525
+
 * Wed Jul 16 2014 Jan-Frode Myklebust <janfrode@tanso.net> - 5.0.0-0
 - New major version.
 

^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [rpms/trafficserver] trafficserver-9.2.14-1: Merge branch 'master' into epel7
@ 2026-07-15 17:20 Jan-Frode Myklebust
  0 siblings, 0 replies; 7+ messages in thread
From: Jan-Frode Myklebust @ 2026-07-15 17:20 UTC (permalink / raw)
  To: git-commits

A new commit has been pushed.

Repo   : rpms/trafficserver
Branch : trafficserver-9.2.14-1
Commit : 20499532fcc40db297be1cf2076e09424b17bf00
Author : Jan-Frode Myklebust <janfrode@tanso.net>
Date   : 2014-07-16T11:02:32+02:00
Stats  : +20/-15 in 4 file(s)
URL    : https://src.fedoraproject.org/rpms/trafficserver/c/20499532fcc40db297be1cf2076e09424b17bf00?branch=trafficserver-9.2.14-1

Log:
Merge branch 'master' into epel7

---
diff --git a/.gitignore b/.gitignore
index 994de2a..4cbacdd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,5 @@
 /trafficserver-4.2.0.tar.bz2.asc
 /trafficserver-4.2.1.tar.bz2
 /trafficserver-4.2.1.tar.bz2.asc
+/trafficserver-5.0.0.tar.bz2
+/trafficserver-5.0.0.tar.bz2.asc

diff --git a/sources b/sources
index 9273ef8..ab22092 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-18f7d56650cba260c8cce3bf4abfa56c  trafficserver-4.2.1.tar.bz2
-15fcd107ea9321b01905ebf0d9bb6c65  trafficserver-4.2.1.tar.bz2.asc
+ad1fe1b45c38664f3714810ee950b2c7  trafficserver-5.0.0.tar.bz2
+8f6f6bac5d8c073fd453ec1866beed9b  trafficserver-5.0.0.tar.bz2.asc

diff --git a/trafficserver.keyring b/trafficserver.keyring
index 339f15b..db4393b 100644
Binary files a/trafficserver.keyring and b/trafficserver.keyring differ

diff --git a/trafficserver.spec b/trafficserver.spec
index 3ae014b..f69e818 100644
--- a/trafficserver.spec
+++ b/trafficserver.spec
@@ -2,8 +2,8 @@
 %define _hardened_build 1
 Summary:	Fast, scalable and extensible HTTP/1.1 compliant caching proxy server
 Name:		trafficserver
-Version:	4.2.1
-Release:	2%{?dist}
+Version:	5.0.0
+Release:	0%{?dist}
 License:	ASL 2.0
 Group:		System Environment/Daemons
 Source0:	http://www.apache.org/dist/%{name}/%{name}-%{version}.tar.bz2
@@ -67,16 +67,6 @@ make DESTDIR=$RPM_BUILD_ROOT install
 # so we rename these to ts-enable, ts-exit and ts-disable.
 mkdir -p $RPM_BUILD_ROOT/usr/share/man/man1
 cp doc/man/*.1 $RPM_BUILD_ROOT/usr/share/man/man1/
-mv $RPM_BUILD_ROOT/usr/share/man/man1/enable.1 \
-$RPM_BUILD_ROOT/usr/share/man/man1/ts-enable.1
-mv $RPM_BUILD_ROOT/usr/share/man/man1/disable.1 \
-$RPM_BUILD_ROOT/usr/share/man/man1/ts-disable.1
-mv $RPM_BUILD_ROOT/usr/share/man/man1/exit.1 \
-$RPM_BUILD_ROOT/usr/share/man/man1/ts-exit.1
-cat <<EOF > README.fedora
-The man-pages for enable, disable and exit was renamed to ts-enable,
-ts-disable and ts-exit to avoid conflicts with other man-pages.
-EOF
 
 # Remove duplicate man-pages:
 rm -rf $RPM_BUILD_ROOT%{_docdir}/trafficserver
@@ -113,6 +103,7 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/trafficserver/plugins/cacheurl.la
 rm -f $RPM_BUILD_ROOT/%{_libdir}/trafficserver/plugins/gzip.la
 rm -f $RPM_BUILD_ROOT/%{_libdir}/trafficserver/plugins/libloader.la
 rm -f $RPM_BUILD_ROOT/%{_libdir}/trafficserver/plugins/header_rewrite.la
+rm -f $RPM_BUILD_ROOT/%{_libdir}/trafficserver/plugins/tcpinfo.la
 
 rm -f $RPM_BUILD_ROOT/%{_libdir}/perl5/perllocal.pod
 rm -f $RPM_BUILD_ROOT/%{_libdir}/perl5/auto/Apache/TS/.packlist
@@ -134,7 +125,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-, ats, ats, -)
-%doc README CHANGES NOTICE README.fedora LICENSE
+%doc README CHANGES NOTICE LICENSE
 %attr(0644,root,root) %{_mandir}/man1/*
 %attr(0644,root,root) %{_mandir}/man3/*
 %attr(0755,root,root) %{_bindir}/traffic*
@@ -219,6 +210,18 @@ header files, and Apache httpd style module build system.
 %attr(0644,root,root) %{_libdir}/trafficserver/*.so
 
 %changelog
+* Wed Jul 16 2014 Jan-Frode Myklebust <janfrode@tanso.net> - 5.0.0-0
+- New major version.
+
+* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.2.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Thu May 22 2014 Petr Machata <pmachata@redhat.com> - 4.2.1-4
+- Rebuild for boost 1.55.0
+
+* Wed May 21 2014 Jaroslav Škarvada <jskarvad@redhat.com> - 4.2.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Changes/f21tcl86
+
 * Wed Apr 30 2014 Jan-Frode Myklebust <janfrode@tanso.net> - 4.2.1-2
 - Bump release tag. RC1 became final.
 

^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [rpms/trafficserver] trafficserver-9.2.14-1: Merge branch 'master' into epel7
@ 2026-07-15 17:20 Jan-Frode Myklebust
  0 siblings, 0 replies; 7+ messages in thread
From: Jan-Frode Myklebust @ 2026-07-15 17:20 UTC (permalink / raw)
  To: git-commits

A new commit has been pushed.

Repo   : rpms/trafficserver
Branch : trafficserver-9.2.14-1
Commit : 7b1ac3ca60f3ddf1e7c47865e043ebded60478e7
Author : Jan-Frode Myklebust <janfrode@tanso.net>
Date   : 2014-04-30T22:29:31+02:00
Stats  : +4/-1 in 1 file(s)
URL    : https://src.fedoraproject.org/rpms/trafficserver/c/7b1ac3ca60f3ddf1e7c47865e043ebded60478e7?branch=trafficserver-9.2.14-1

Log:
Merge branch 'master' into epel7

---
diff --git a/trafficserver.spec b/trafficserver.spec
index c760c1a..3ae014b 100644
--- a/trafficserver.spec
+++ b/trafficserver.spec
@@ -3,7 +3,7 @@
 Summary:	Fast, scalable and extensible HTTP/1.1 compliant caching proxy server
 Name:		trafficserver
 Version:	4.2.1
-Release:	rc1%{?dist}
+Release:	2%{?dist}
 License:	ASL 2.0
 Group:		System Environment/Daemons
 Source0:	http://www.apache.org/dist/%{name}/%{name}-%{version}.tar.bz2
@@ -219,6 +219,9 @@ header files, and Apache httpd style module build system.
 %attr(0644,root,root) %{_libdir}/trafficserver/*.so
 
 %changelog
+* Wed Apr 30 2014 Jan-Frode Myklebust <janfrode@tanso.net> - 4.2.1-2
+- Bump release tag. RC1 became final.
+
 * Sat Apr 26 2014 Jan-Frode Myklebust <janfrode@tanso.net> - 4.2.1-rc1
 - Update to 4.2.1-RC1
 

^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [rpms/trafficserver] trafficserver-9.2.14-1: Merge branch 'master' into epel7
@ 2026-07-15 17:20 Jan-Frode Myklebust
  0 siblings, 0 replies; 7+ messages in thread
From: Jan-Frode Myklebust @ 2026-07-15 17:20 UTC (permalink / raw)
  To: git-commits

A new commit has been pushed.

Repo   : rpms/trafficserver
Branch : trafficserver-9.2.14-1
Commit : 56d3d5eadd6add729a5199fa0ce378b4182d80d5
Author : Jan-Frode Myklebust <janfrode@tanso.net>
Date   : 2014-04-26T00:44:47+02:00
Stats  : +2/-2 in 1 file(s)
URL    : https://src.fedoraproject.org/rpms/trafficserver/c/56d3d5eadd6add729a5199fa0ce378b4182d80d5?branch=trafficserver-9.2.14-1

Log:
Merge branch 'master' into epel7

---
diff --git a/trafficserver.spec b/trafficserver.spec
index 0bb5251..c760c1a 100644
--- a/trafficserver.spec
+++ b/trafficserver.spec
@@ -3,7 +3,7 @@
 Summary:	Fast, scalable and extensible HTTP/1.1 compliant caching proxy server
 Name:		trafficserver
 Version:	4.2.1
-Release:	0%{?dist}
+Release:	rc1%{?dist}
 License:	ASL 2.0
 Group:		System Environment/Daemons
 Source0:	http://www.apache.org/dist/%{name}/%{name}-%{version}.tar.bz2
@@ -219,7 +219,7 @@ header files, and Apache httpd style module build system.
 %attr(0644,root,root) %{_libdir}/trafficserver/*.so
 
 %changelog
-* Sat Apr 26 2014 Jan-Frode Myklebust <janfrode@tanso.net> - 4.2.1-0
+* Sat Apr 26 2014 Jan-Frode Myklebust <janfrode@tanso.net> - 4.2.1-rc1
 - Update to 4.2.1-RC1
 
 * Thu Apr 10 2014 Jan-Frode Myklebust <janfrode@tanso.net> - 4.2.0-0

^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [rpms/trafficserver] trafficserver-9.2.14-1: Merge branch 'master' into epel7
@ 2026-07-15 17:20 Jan-Frode Myklebust
  0 siblings, 0 replies; 7+ messages in thread
From: Jan-Frode Myklebust @ 2026-07-15 17:20 UTC (permalink / raw)
  To: git-commits

A new commit has been pushed.

Repo   : rpms/trafficserver
Branch : trafficserver-9.2.14-1
Commit : 0cadd05338bc67eee44e08dd8055a8efb89c4511
Author : Jan-Frode Myklebust <janfrode@tanso.net>
Date   : 2014-04-26T00:33:23+02:00
Stats  : +17/-3 in 4 file(s)
URL    : https://src.fedoraproject.org/rpms/trafficserver/c/0cadd05338bc67eee44e08dd8055a8efb89c4511?branch=trafficserver-9.2.14-1

Log:
Merge branch 'master' into epel7

---
diff --git a/.gitignore b/.gitignore
index 1a03ed9..994de2a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,7 @@
 /trafficserver-4.0.2.tar.bz2.asc
 /trafficserver-4.1.2.tar.bz2
 /trafficserver-4.1.2.tar.bz2.asc
+/trafficserver-4.2.0.tar.bz2
+/trafficserver-4.2.0.tar.bz2.asc
+/trafficserver-4.2.1.tar.bz2
+/trafficserver-4.2.1.tar.bz2.asc

diff --git a/sources b/sources
index 5490a57..9273ef8 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-cc9a4dfa88fe63f59de106602c06c9c4  trafficserver-4.1.2.tar.bz2
-28797b160da3eba749e422de3ef19b06  trafficserver-4.1.2.tar.bz2.asc
+18f7d56650cba260c8cce3bf4abfa56c  trafficserver-4.2.1.tar.bz2
+15fcd107ea9321b01905ebf0d9bb6c65  trafficserver-4.2.1.tar.bz2.asc

diff --git a/trafficserver.keyring b/trafficserver.keyring
index 8c265a0..339f15b 100644
Binary files a/trafficserver.keyring and b/trafficserver.keyring differ

diff --git a/trafficserver.spec b/trafficserver.spec
index 7ae9866..0bb5251 100644
--- a/trafficserver.spec
+++ b/trafficserver.spec
@@ -2,7 +2,7 @@
 %define _hardened_build 1
 Summary:	Fast, scalable and extensible HTTP/1.1 compliant caching proxy server
 Name:		trafficserver
-Version:	4.1.2
+Version:	4.2.1
 Release:	0%{?dist}
 License:	ASL 2.0
 Group:		System Environment/Daemons
@@ -101,6 +101,7 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/trafficserver/libtsmgmt.a
 rm -f $RPM_BUILD_ROOT/%{_libdir}/trafficserver/libtsutil.a
 
 # Don't include libtool archives:
+rm -f $RPM_BUILD_ROOT/%{_libdir}/trafficserver/libtsmgmtshare.la
 rm -f $RPM_BUILD_ROOT/%{_libdir}/trafficserver/libtsmgmt.la
 rm -f $RPM_BUILD_ROOT/%{_libdir}/trafficserver/libtsutil.la
 rm -f $RPM_BUILD_ROOT/%{_libdir}/trafficserver/libatscpp11api.la
@@ -124,6 +125,8 @@ perl -pi -e 's/^CONFIG.*proxy.config.ssl.server.cert.path.*$/CONFIG proxy.config
 perl -pi -e 's/^CONFIG.*proxy.config.ssl.server.private_key.path.*$/CONFIG proxy.config.ssl.server.private_key.path STRING \/etc\/pki\/tls\/private\//' \
 	$RPM_BUILD_ROOT/etc/trafficserver/records.config
 
+mkdir -p $RPM_BUILD_ROOT/var/run/trafficserver
+
 # The clean section  is only needed for EPEL and Fedora < 13
 # http://fedoraproject.org/wiki/PackagingGuidelines#.25clean
 %clean
@@ -140,6 +143,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0755,root,root) %dir %{_libdir}/trafficserver/plugins
 %attr(0755,root,root) %{_libdir}/trafficserver/*.so.*
 %attr(0755,root,root) %{_libdir}/trafficserver/plugins/*.so
+%attr(0644,root,root) %{_datadir}/perl5/Apache/TS.pm.in
 %attr(0644,root,root) %{_datadir}/perl5/Apache/TS.pm
 %attr(0644,root,root) %{_datadir}/perl5/Apache/TS/*
 %config(noreplace) /etc/trafficserver/*
@@ -215,6 +219,12 @@ header files, and Apache httpd style module build system.
 %attr(0644,root,root) %{_libdir}/trafficserver/*.so
 
 %changelog
+* Sat Apr 26 2014 Jan-Frode Myklebust <janfrode@tanso.net> - 4.2.1-0
+- Update to 4.2.1-RC1
+
+* Thu Apr 10 2014 Jan-Frode Myklebust <janfrode@tanso.net> - 4.2.0-0
+- Update to 4.2.0
+
 * Tue Dec 17 2013 Jan-Frode Myklebust <janfrode@tanso.net> - 4.1.2-0
 - Bump to final. No change from rc0.
 - What's new: https://cwiki.apache.org/confluence/display/TS/What%27s+new+in+v4.1.x

^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [rpms/trafficserver] trafficserver-9.2.14-1: Merge branch 'master' into epel7
@ 2026-07-15 17:20 Jan-Frode Myklebust
  0 siblings, 0 replies; 7+ messages in thread
From: Jan-Frode Myklebust @ 2026-07-15 17:20 UTC (permalink / raw)
  To: git-commits

            A new commit has been pushed.

            Repo   : rpms/trafficserver
            Branch : trafficserver-9.2.14-1
            Commit : f2d816322797611bdf0747d8040095dffe8f99b7
            Author : Jan-Frode Myklebust <janfrode@tanso.net>
            Date   : 2014-01-14T14:13:31+01:00
            Stats  : +114/-47 in 5 file(s)
            URL    : https://src.fedoraproject.org/rpms/trafficserver/c/f2d816322797611bdf0747d8040095dffe8f99b7?branch=trafficserver-9.2.14-1

            Log:
            Merge branch 'master' into epel7

Conflicts:
	trafficserver.spec

---
diff --git a/.gitignore b/.gitignore
index 8ef557a..1a03ed9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,8 @@
 /trafficserver-3.2.0.tar.bz2
 /trafficserver-3.2.4.tar.bz2
 /trafficserver-3.2.5.tar.bz2
+/trafficserver-4.0.1.tar.bz2
+/trafficserver-4.0.2.tar.bz2
+/trafficserver-4.0.2.tar.bz2.asc
+/trafficserver-4.1.2.tar.bz2
+/trafficserver-4.1.2.tar.bz2.asc

diff --git a/sources b/sources
index cbba7b7..5490a57 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-bc76c68589389a453e4e4967c42636d6  trafficserver-3.2.5.tar.bz2
+cc9a4dfa88fe63f59de106602c06c9c4  trafficserver-4.1.2.tar.bz2
+28797b160da3eba749e422de3ef19b06  trafficserver-4.1.2.tar.bz2.asc

diff --git a/trafficserver-init_scripts.patch b/trafficserver-init_scripts.patch
index 92b3b73..a9a8253 100644
--- a/trafficserver-init_scripts.patch
+++ b/trafficserver-init_scripts.patch
@@ -1,20 +1,6 @@
---- trafficserver-3.2.0/rc/trafficserver.in.orginal	2012-06-23 15:02:25.768405925 +0200
-+++ trafficserver-3.2.0/rc/trafficserver.in	2012-06-23 15:07:16.507193268 +0200
-@@ -16,12 +16,21 @@
- # limitations under the License.
- #
- # Template from /etc/init.d/skeleton on Ubuntu
-+# trafficserver    Startup/shutdown script for the Apache Traffic Server
-+#
-+# chkconfig: - 90 10
-+# description: TApache Traffic Server is fast, scalable and extensible  \
-+#             HTTP/1.1 compliant caching proxy server.
-+# processname: traffic_cop traffic_manager traffic_server
-+# config: /etc/trafficserver
-+# config: /etc/sysconfig/trafficserver
-+# pidfile: /var/run/trafficserver/cop.pid
- #
- ### BEGIN INIT INFO
+--- trafficserver-4.0.1/rc/trafficserver.in.orginal	2012-06-23 15:02:25.768405925 +0200
++++ trafficserver-4.0.1/rc/trafficserver.in	2012-06-23 15:07:16.507193268 +0200
+@@ -29,7 +29,7 @@
  # Provides:          Traffic Server
  # Required-Start:    $local_fs $remote_fs
  # Required-Stop:     $local_fs $remote_fs
@@ -23,13 +9,4 @@
  # Default-Stop:      S 0 1 6
  # Short-Description: Startup/shutdown script for the Apache Traffic Server
  # Description:       Apache Traffic Server is fast, scalable and extensible
-@@ -135,6 +144,9 @@
- # Ubuntu: Read configuration variable file if it is present
- test -r /etc/default/$NAME && . /etc/default/$NAME
- 
-+# RHEL/Fedora: Read configuration variable file if it is present
-+test -r /etc/sysconfig/$NAME && . /etc/sysconfig/$NAME
-+
- # Ubuntu: Load the VERBOSE setting and other rcS variables
- test -f /etc/default/rcS && . /etc/default/rcS
- 
+

diff --git a/trafficserver.keyring b/trafficserver.keyring
new file mode 100644
index 0000000..8c265a0
Binary files /dev/null and b/trafficserver.keyring differ

diff --git a/trafficserver.spec b/trafficserver.spec
index ec02fd4..7ae9866 100644
--- a/trafficserver.spec
+++ b/trafficserver.spec
@@ -2,19 +2,22 @@
 %define _hardened_build 1
 Summary:	Fast, scalable and extensible HTTP/1.1 compliant caching proxy server
 Name:		trafficserver
-Version:	3.2.5
-Release:	4%{?dist}
+Version:	4.1.2
+Release:	0%{?dist}
 License:	ASL 2.0
 Group:		System Environment/Daemons
 Source0:	http://www.apache.org/dist/%{name}/%{name}-%{version}.tar.bz2
-Source1:	trafficserver.sysconf
-Source2:	trafficserver.service
-Source3:	trafficserver.tmpfilesd
+Source1:	http://www.apache.org/dist/%{name}/%{name}-%{version}.tar.bz2.asc
+Source2:	trafficserver.keyring
+Source3:	trafficserver.sysconf
+Source4:	trafficserver.service
+Source5:	trafficserver.tmpfilesd
 URL:		http://trafficserver.apache.org/index.html
 # BuildRoot is only needed for EPEL5:
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-BuildRequires:	autoconf, automake, libtool, openssl-devel, tcl-devel, expat-devel
-BuildRequires:	pcre-devel, zlib-devel, xz-devel, gcc-c++
+BuildRequires:	autoconf, automake, libtool, openssl-devel, tcl-devel, expat-devel, boost-devel
+BuildRequires:	pcre-devel, zlib-devel, xz-devel, gcc-c++, gnupg, perl-ExtUtils-MakeMaker
+BuildRequires:	hwloc-devel
 # trafficserver fails to build on ppc and others, TS-1131, see lib/ts/ink_queue.h
 ExclusiveArch:	%{ix86} x86_64 ia64 %{arm}
 Requires: initscripts
@@ -37,6 +40,8 @@ Apache Traffic Server is a fast, scalable and extensible HTTP/1.1 compliant
 caching proxy server.
 
 %prep
+gpgv --homedir /tmp --keyring %{SOURCE2} --status-fd=1 %{SOURCE1} %{SOURCE0} | grep -q '^\[GNUPG:\] GOODSIG'
+
 %setup -q
 
 %patch2 -p1 -b .patch2
@@ -77,13 +82,13 @@ EOF
 rm -rf $RPM_BUILD_ROOT%{_docdir}/trafficserver
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
-install -m 644 -p %{SOURCE1} \
+install -m 644 -p %{SOURCE3} \
    $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/trafficserver
 
 %if %{?fedora}0 > 140 || %{?rhel}0 > 60
-install -D -m 0644 -p %{SOURCE2} \
+install -D -m 0644 -p %{SOURCE4} \
    $RPM_BUILD_ROOT/lib/systemd/system/trafficserver.service
-install -D -m 0644 -p %{SOURCE3} \
+install -D -m 0644 -p %{SOURCE5} \
    $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d/trafficserver.conf
 %else
 mkdir -p $RPM_BUILD_ROOT/etc/init.d/
@@ -98,10 +103,18 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/trafficserver/libtsutil.a
 # Don't include libtool archives:
 rm -f $RPM_BUILD_ROOT/%{_libdir}/trafficserver/libtsmgmt.la
 rm -f $RPM_BUILD_ROOT/%{_libdir}/trafficserver/libtsutil.la
+rm -f $RPM_BUILD_ROOT/%{_libdir}/trafficserver/libatscpp11api.la
 rm -f $RPM_BUILD_ROOT/%{_libdir}/trafficserver/plugins/conf_remap.la
 rm -f $RPM_BUILD_ROOT/%{_libdir}/trafficserver/plugins/header_filter.la
 rm -f $RPM_BUILD_ROOT/%{_libdir}/trafficserver/plugins/regex_remap.la
 rm -f $RPM_BUILD_ROOT/%{_libdir}/trafficserver/plugins/stats_over_http.la
+rm -f $RPM_BUILD_ROOT/%{_libdir}/trafficserver/plugins/cacheurl.la
+rm -f $RPM_BUILD_ROOT/%{_libdir}/trafficserver/plugins/gzip.la
+rm -f $RPM_BUILD_ROOT/%{_libdir}/trafficserver/plugins/libloader.la
+rm -f $RPM_BUILD_ROOT/%{_libdir}/trafficserver/plugins/header_rewrite.la
+
+rm -f $RPM_BUILD_ROOT/%{_libdir}/perl5/perllocal.pod
+rm -f $RPM_BUILD_ROOT/%{_libdir}/perl5/auto/Apache/TS/.packlist
 
 #
 perl -pi -e 's/^CONFIG.*proxy.config.proxy_name STRING.*$/CONFIG proxy.config.proxy_name STRING FIXME.example.com/' \
@@ -119,12 +132,16 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-, ats, ats, -)
 %doc README CHANGES NOTICE README.fedora LICENSE
-%attr(0644, root, root) /usr/share/man/man1/*
-%attr(0755,root,root) /usr/bin/traffic*
+%attr(0644,root,root) %{_mandir}/man1/*
+%attr(0644,root,root) %{_mandir}/man3/*
+%attr(0755,root,root) %{_bindir}/traffic*
+%attr(0755,root,root) %{_bindir}/tspush
 %attr(0755,root,root) %dir %{_libdir}/trafficserver
 %attr(0755,root,root) %dir %{_libdir}/trafficserver/plugins
 %attr(0755,root,root) %{_libdir}/trafficserver/*.so.*
 %attr(0755,root,root) %{_libdir}/trafficserver/plugins/*.so
+%attr(0644,root,root) %{_datadir}/perl5/Apache/TS.pm
+%attr(0644,root,root) %{_datadir}/perl5/Apache/TS/*
 %config(noreplace) /etc/trafficserver/*
 %if %{?fedora}0 > 140 || %{?rhel}0 > 60
 %attr(0644, root, root) /lib/systemd/system/trafficserver.service
@@ -190,19 +207,86 @@ header files, and Apache httpd style module build system.
 
 %files devel
 %defattr(-,root,root,-)
-%attr(0755,root,root) /usr/bin/tsxs
-%attr(0755,root,root) %dir /usr/include/ts
-%attr(0644,root,root) /usr/include/ts/*
+%attr(0755,root,root) %{_bindir}/tsxs
+%attr(0755,root,root) %dir %{_includedir}/ts
+%attr(0644,root,root) %{_includedir}/ts/*
 %attr(0755,root,root) %dir %{_libdir}/trafficserver
 %attr(0755,root,root) %dir %{_libdir}/trafficserver/plugins
 %attr(0644,root,root) %{_libdir}/trafficserver/*.so
 
 %changelog
-* Fri Oct 11 2013 Ralf Corsépius <corsepiu@fedoraproject.org> - 3.2.5-4
+* Tue Dec 17 2013 Jan-Frode Myklebust <janfrode@tanso.net> - 4.1.2-0
+- Bump to final. No change from rc0.
+- What's new: https://cwiki.apache.org/confluence/display/TS/What%27s+new+in+v4.1.x
+
+* Thu Dec 12 2013 Jan-Frode Myklebust <janfrode@tanso.net> - 4.1.2-rc0
+- Update to 4.1.2-rc0.
+
+* Mon Nov 11 2013 Jan-Frode Myklebust <janfrode@tanso.net> - 4.0.2-5
+- Buildrequire hwloc-devel, since it supposedly gives tremendous 
+  positive performance impact to use hwlock to optimize scaling and
+  number of threads and alignment for actual hardware we're running on.
+
+* Sun Oct 20 2013 Jan-Frode Myklebust <janfrode@tanso.net> - 4.0.2-3
+- Rebuild for picking up ECC/ECDHE/EC/ECDSA/elliptic curves
+  which are now enabled in OpenSSL.
+
+* Fri Oct 11 2013 Ralf Corsépius <corsepiu@fedoraproject.org> - 4.0.2-3
 - Add BR: systemd for systemd.macros (RHBZ #1018080).
 
+* Thu Oct 10 2013 Jan-Frode Myklebust <janfrode@tanso.net> - 4.0.2-2
+- Update to 4.0.2, which fixes the following bugs:
+
+    [TS-2144] - traffic_server crashes when clearing cache
+    [TS-2173] - cache total hit/miss stats broken in version 4.0.1
+    [TS-2174] - traffic_shell/traffic_line miss some stats value
+    [TS-2191] - when http_info enabled, the http_sm may be deleted but a event associated it not cancelled.
+    [TS-2207] - Centos5 out of tree perl build fails
+    [TS-2217] - remove the option to turn off body factory - setting it to 0 will result in empty responses
+
+- Automatically verify GPG signature during RPM prep.
+- Build requires boost-devel.
+
+* Tue Sep 3 2013 Jan-Frode Myklebust <janfrode@tanso.net> - 4.0.1-1
+- Update to 4.0.1.  What's new in v4.0.0:
+  https://cwiki.apache.org/confluence/display/TS/What%27s+new+in+v4.0.0
+
+- Upgrade instructions from earlier versions:
+  https://cwiki.apache.org/confluence/display/TS/Upgrading+to+v4.0
+
+  Important notes:
+
+    proxy.config.remap.use_remap_processor has been removed,
+    use the proxy.config.remap.num_remap_threads instead.
+
+    Default proxy.config.cache.ram_cache.size has been increased by 
+    a magnitude.
+
+    Support for pre v3.2 port configuration directives has been removed.
+
+    The following records.config parameters should be removed:
+
+	CONFIG proxy.config.bandwidth_mgmt.filename STRING ""
+	CONFIG proxy.config.admin.autoconf.wpad_filename STRING ""
+	CONFIG proxy.config.username.cache.enabled INT 0
+	CONFIG proxy.config.username.cache.filename STRING ""
+	CONFIG proxy.config.username.cache.size INT 0
+	CONFIG proxy.config.username.cache.storage_path STRING ""
+	CONFIG proxy.config.username.cache.storage_size INT 0
+	CONFIG proxy.config.http.wuts_enabled INT 0
+	CONFIG proxy.config.http.log_spider_codes INT 0
+	CONFIG proxy.config.http.accept_encoding_filter_enabled INT 0
+	CONFIG proxy.config.http.accept_encoding_filter.filename STRING ""
+	CONFIG proxy.config.net.throttle_enabled INT 0
+	CONFIG proxy.config.net.accept_throttle INT 0
+	CONFIG proxy.config.cluster.num_of_cluster_connections INT 0
+	CONFIG proxy.config.cache.url_hash_method INT 0
+	CONFIG proxy.config.plugin.extensions_dir STRING ""
+	CONFIG proxy.local.http.parent_proxy.disable_connect_tunneling INT 0
+	CONFIG proxy.config.remap.use_remap_processor INT 0
+
 * Sun Aug 25 2013 Jan-Frode Myklebust <janfrode@tanso.net> - 3.2.5-3
-- bz#994224 Use rpm %configure macro, instead of calling configure
+- bz#994224 Use rpm configure macro, instead of calling configure
   directly.
 
 * Fri Aug 9 2013 Jan-Frode Myklebust <janfrode@tanso.net> - 3.2.5-2
@@ -311,7 +395,7 @@ header files, and Apache httpd style module build system.
 - Remove odd version macro.
 - Clean up mixed-use-of-spaces-and-tabs.
 
-* Wed Jun 23 2011 <janfrode@tanso.net> - 3.0.0-4
+* Wed Jun 22 2011 <janfrode@tanso.net> - 3.0.0-4
 - Use dedicated user/group ats/ats.
 - Restart on upgrades.
 
@@ -344,7 +428,7 @@ header files, and Apache httpd style module build system.
 - fix centos5 building
 - drop duplicated patches
 
-* Tue Mar 19 2011 <yonghao@taobao.com> - 2.1.6-2
+* Sat Mar 12 2011 <yonghao@taobao.com> - 2.1.6-2
 - fix gcc 4.6 building
 - split into -devel package for devel libs
 - fix init scripts for rpmlint requirement

^ permalink raw reply related	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2026-07-15 17:20 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-07-15 17:20 [rpms/trafficserver] trafficserver-9.2.14-1: Merge branch 'master' into epel7 Peter Robinson
  -- strict thread matches above, loose matches on Subject: below --
2026-07-15 17:20 Jan-Frode Myklebust
2026-07-15 17:20 Jan-Frode Myklebust
2026-07-15 17:20 Jan-Frode Myklebust
2026-07-15 17:20 Jan-Frode Myklebust
2026-07-15 17:20 Jan-Frode Myklebust
2026-07-15 17:20 Jan-Frode Myklebust

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox