diff options
| -rw-r--r-- | .SRCINFO | 12 | ||||
| -rw-r--r-- | PKGBUILD | 37 | ||||
| -rw-r--r-- | proxy_Main.patch | 12 | ||||
| -rw-r--r-- | trafficserver.changelog | 6 | ||||
| -rw-r--r-- | trafficserver.git-75d3566.patch | 42 | ||||
| -rw-r--r-- | trafficserver.git-c9a2e06.patch | 128 |
6 files changed, 24 insertions, 213 deletions
@@ -1,6 +1,6 @@ pkgbase = trafficserver pkgdesc = Apache Traffic Server - pkgver = 3.2.4 + pkgver = 3.2.5 pkgrel = 1 url = http://trafficserver.apache.org/ install = trafficserver.install @@ -62,19 +62,13 @@ pkgbase = trafficserver backup = etc/trafficserver/stats.config.xml backup = etc/trafficserver/log_hosts.config backup = etc/trafficserver/ip_allow.config - source = http://apache.tradebit.com/pub/trafficserver/trafficserver-3.2.4.tar.bz2 + source = http://archive.apache.org/dist/trafficserver/trafficserver-3.2.5.tar.bz2 source = trafficserver.tmpfiles source = config.layout.patch - source = trafficserver.git-c9a2e06.patch - source = trafficserver.git-75d3566.patch - source = proxy_Main.patch source = trafficserver.service.in.patch - md5sums = 5ce8f59d608896ae56e9053ff86bb40c + md5sums = bc76c68589389a453e4e4967c42636d6 md5sums = fc8ab2b6d01e22fb376832fb13137db1 md5sums = 9ca01c6833ebbde4644a255c8bf802ce - md5sums = f395175164b2d8de90535e42ae1de72b - md5sums = f774f8454bec9422ac1af5445625a6b5 - md5sums = ec6be0b8e2ab575bcd077993809061b0 md5sums = 74ba08091f580f8984eee8db0f7e4d27 pkgname = trafficserver @@ -1,6 +1,8 @@ # Maintainer: Galen Sampson <galen.sampson at gmail dot com> -pkgname=trafficserver -pkgver=3.2.4 +# Contributor: David Roheim <david dot roheim at gmail dot com> + +pkgname=('trafficserver') +pkgver=3.2.5 pkgrel=1 pkgdesc="Apache Traffic Server" url="http://trafficserver.apache.org/" @@ -10,24 +12,18 @@ depends=('openssl' 'tcl' 'hwloc') makedepends=('flex') source=( - 'http://apache.tradebit.com/pub/trafficserver/trafficserver-3.2.4.tar.bz2' - 'trafficserver.tmpfiles' - 'config.layout.patch' - 'trafficserver.git-c9a2e06.patch' - 'trafficserver.git-75d3566.patch' - 'proxy_Main.patch' - 'trafficserver.service.in.patch') -md5sums=( - '5ce8f59d608896ae56e9053ff86bb40c' - 'fc8ab2b6d01e22fb376832fb13137db1' - '9ca01c6833ebbde4644a255c8bf802ce' - 'f395175164b2d8de90535e42ae1de72b' - 'f774f8454bec9422ac1af5445625a6b5' - 'ec6be0b8e2ab575bcd077993809061b0' - '74ba08091f580f8984eee8db0f7e4d27') + http://archive.apache.org/dist/"${pkgname}"/"${pkgname}"-"${pkgver}".tar.bz2 + trafficserver.tmpfiles + config.layout.patch + trafficserver.service.in.patch) + +md5sums=(bc76c68589389a453e4e4967c42636d6 + fc8ab2b6d01e22fb376832fb13137db1 + 9ca01c6833ebbde4644a255c8bf802ce + 74ba08091f580f8984eee8db0f7e4d27) -install=trafficserver.install -changelog=trafficserver.changelog +install=${pkgname}.install +changelog=${pkgname}.changelog backup=( 'etc/trafficserver/congestion.config' @@ -84,9 +80,6 @@ backup=( build() { cd "${pkgname}-${pkgver}" patch -Np0 -u -i ../config.layout.patch - patch -Np1 -u -i ../trafficserver.git-c9a2e06.patch - patch -Np1 -u -i ../trafficserver.git-75d3566.patch - patch -Np0 -u -i ../proxy_Main.patch patch -Np0 -u -i ../trafficserver.service.in.patch ./configure --with-user=tserver --enable-layout=Arch make diff --git a/proxy_Main.patch b/proxy_Main.patch deleted file mode 100644 index 670188999b7d..000000000000 --- a/proxy_Main.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- proxy/Main.cc.orig 2013-03-16 00:18:53.518050709 -0700 -+++ proxy/Main.cc 2013-03-16 00:19:48.221925918 -0700 -@@ -1310,7 +1310,8 @@ - - char *buf = (char *)ats_malloc(buflen); - -- if (0 != geteuid() && 0 == getuid()) seteuid(0); // revert euid if possible. -+ if (0 != geteuid() && 0 == getuid()) -+ NOWARN_UNUSED_RETURN(seteuid(0)); // revert euid if possible. - if (0 != geteuid()) { - // Not root so can't change user ID. Logging isn't operational yet so - // we have to write directly to stderr. Perhaps this should be fatal? diff --git a/trafficserver.changelog b/trafficserver.changelog index 3ce2688158f1..343fa4c8081f 100644 --- a/trafficserver.changelog +++ b/trafficserver.changelog @@ -1,3 +1,9 @@ +2013-07-29 Galen Sampson <youremail@domain.com> + + * 3.25-1 : + Apache Traffic Server 3.25. + + 2013-03-16 Galen Sampson <youremail@domain.com> * 3.24-1 : diff --git a/trafficserver.git-75d3566.patch b/trafficserver.git-75d3566.patch deleted file mode 100644 index ca9b2940080d..000000000000 --- a/trafficserver.git-75d3566.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 2bee0a2f0359e5d7cebdb4e2178a5154c75d3566 Mon Sep 17 00:00:00 2001 -From: Zhao Yongming <ming.zym@gmail.com> -Date: Sat, 15 Sep 2012 16:13:13 +0800 -Subject: [PATCH] make clang happy on security concern - ---- - mgmt/api/INKMgmtAPI.cc | 4 ++-- - mgmt/tools/ConfigAPI.cc | 3 ++- - 2 files changed, 4 insertions(+), 3 deletions(-) - -diff --git a/mgmt/api/INKMgmtAPI.cc b/mgmt/api/INKMgmtAPI.cc -index 17d8afc..a047911 100644 ---- a/mgmt/api/INKMgmtAPI.cc -+++ b/mgmt/api/INKMgmtAPI.cc -@@ -2436,8 +2436,8 @@ closeAllFds() - // to root - if (getuid() != 0) { // if not super user, need to upgrade to root - //printf("before upgrade:current uid%d, euid %d\n", getuid(), geteuid()); fflush(stdout); -- seteuid(0); -- setreuid(0, 0); -+ if(seteuid(0) != 0 || setreuid(0, 0) != 0) -+ perror("[closeAllFds] unable to restore root privilege."); - //printf("after upgrade:current uid %d, euid %d\n", getuid(), geteuid()); fflush(stdout); - } - -diff --git a/mgmt/tools/ConfigAPI.cc b/mgmt/tools/ConfigAPI.cc -index 85666e4..a0444e0 100644 ---- a/mgmt/tools/ConfigAPI.cc -+++ b/mgmt/tools/ConfigAPI.cc -@@ -807,7 +807,8 @@ Config_RestoreNetConfig(char *file) - ats_free(TagValue); - } - -- setreuid(old_euid, old_euid); //happens only for floppy config -+ if(setreuid(old_euid, old_euid) != 0) -+ perror("Config_RestoreNetConfig set old uid failed: "); //happens only for floppy config - return 0; - } - --- -1.7.9 - diff --git a/trafficserver.git-c9a2e06.patch b/trafficserver.git-c9a2e06.patch deleted file mode 100644 index a8b21d11f936..000000000000 --- a/trafficserver.git-c9a2e06.patch +++ /dev/null @@ -1,128 +0,0 @@ -From dccdd5a4453828f1befa1bb121d045c50c9a2e06 Mon Sep 17 00:00:00 2001 -From: =?utf8?q?Igor=20Gali=C4=87?= <i.galic@brainsware.org> -Date: Thu, 13 Sep 2012 14:24:04 +0200 -Subject: [PATCH] clang's cecker says this is a security issue - -I say it's dead code. ---- - mgmt/tools/ConfigAPI.cc | 24 ------------------------ - mgmt/tools/ConfigAPI.h | 4 ---- - mgmt/tools/SysAPI.cc | 37 ------------------------------------- - mgmt/tools/SysAPI.h | 4 ---- - 4 files changed, 0 insertions(+), 69 deletions(-) - -diff --git a/mgmt/tools/ConfigAPI.cc b/mgmt/tools/ConfigAPI.cc -index 19afe7a..85666e4 100644 ---- a/mgmt/tools/ConfigAPI.cc -+++ b/mgmt/tools/ConfigAPI.cc -@@ -636,30 +636,6 @@ Config_SetNTP_Off(void) - return Time_SetNTP_Off(); - } - --int --Config_User_Root(int *old_euid) --{ -- return Sys_User_Root(old_euid); --} -- --int --Config_User_Inktomi(int euid) --{ -- return Sys_User_Inktomi(euid); --} -- --int --Config_Grp_Root(int *old_egid) --{ -- return Sys_Grp_Root(old_egid); --} -- --int --Config_Grp_Inktomi(int egid) --{ -- return Sys_Grp_Inktomi(egid); --} -- - #if defined(linux) - int - Config_DisableInterface(char *eth) -diff --git a/mgmt/tools/ConfigAPI.h b/mgmt/tools/ConfigAPI.h -index 62da925..00303b1 100644 ---- a/mgmt/tools/ConfigAPI.h -+++ b/mgmt/tools/ConfigAPI.h -@@ -85,9 +85,5 @@ extern int Config_GetXmlTagValue(char *XmlTagName, char **XmlTagValue, char *Xml - extern int Config_SetSMTP_Server(char *server); - extern int Config_GetSMTP_Server(char *server); - extern int Config_FloppyNetRestore(); --extern int Config_User_Root(int *old_euid); --extern int Config_User_Inktomi(int euid); --extern int Config_Grp_Root(int *old_egid); --extern int Config_Grp_Inktomi(int egid); - extern int Config_DisableInterface(char *eth); - #endif // _CONFIG_API_H -diff --git a/mgmt/tools/SysAPI.cc b/mgmt/tools/SysAPI.cc -index 5dd9498..37f80b6 100644 ---- a/mgmt/tools/SysAPI.cc -+++ b/mgmt/tools/SysAPI.cc -@@ -1184,43 +1184,6 @@ Net_DisableInterface(char *interface) - - #endif /* linux */ - --int --Sys_User_Root(int *old_euid) --{ -- -- *old_euid = getuid(); -- seteuid(0); -- setreuid(0, 0); -- -- return 0; --} -- --int --Sys_User_Inktomi(int euid) --{ --// bug 50394 - preserve saved uid as root, --// while changing effiective and real uid to input parameter value -- setreuid(euid, 0); -- seteuid(euid); -- return 0; --} -- --int --Sys_Grp_Root(int *old_egid) --{ -- *old_egid = getegid(); -- setregid(0, *old_egid); -- return 0; --} -- --int --Sys_Grp_Inktomi(int egid) --{ -- setregid(egid, egid); -- return 0; --} -- -- - - - bool -diff --git a/mgmt/tools/SysAPI.h b/mgmt/tools/SysAPI.h -index 3417518..aead11c 100644 ---- a/mgmt/tools/SysAPI.h -+++ b/mgmt/tools/SysAPI.h -@@ -74,10 +74,6 @@ extern int Time_GetNTP_Status(char *status, size_t status_len); - extern int Time_SetNTP_Off(void); - extern int Net_GetSMTP_Server(char *server); - extern int Net_SetSMTP_Server(char *server); --extern int Sys_User_Root(int *old_euid); --extern int Sys_User_Inktomi(int euid); --extern int Sys_Grp_Root(int *old_egid); --extern int Sys_Grp_Inktomi(int egid); - extern int Net_DisableInterface(char *interface); - - #endif // _SYS_API_H --- -1.7.9 - |