diff --git a/memcached-1.4.5-warnings.patch b/memcached-1.4.5-warnings.patch new file mode 100644 index 0000000..1be53fe --- /dev/null +++ b/memcached-1.4.5-warnings.patch @@ -0,0 +1,30 @@ +--- memcached-1.4.5/items.c.warnings ++++ memcached-1.4.5/items.c +@@ -449,10 +449,8 @@ void do_item_stats_sizes(ADD_STAT add_st + /* write the buffer */ + for (i = 0; i < num_buckets; i++) { + if (histogram[i] != 0) { +- char key[8]; +- int klen = 0; +- klen = snprintf(key, sizeof(key), "%d", i * 32); +- assert(klen < sizeof(key)); ++ char key[12]; ++ snprintf(key, sizeof(key), "%d", i * 32); + APPEND_STAT(key, "%u", histogram[i]); + } + } +--- memcached-1.4.5/memcached.c.warnings ++++ memcached-1.4.5/memcached.c +@@ -4662,9 +4662,9 @@ int main (int argc, char **argv) { + + /* create the UDP listening socket and bind it */ + errno = 0; +- if (settings.udpport && server_socket(settings.udpport, udp_transport, +- portnumber_file)) { +- vperror("failed to listen on UDP port %d", settings.udpport); ++ if (udp_port && server_socket(udp_port, udp_transport, ++ portnumber_file)) { ++ vperror("failed to listen on UDP port %d", udp_port); + exit(EX_OSERR); + } + diff --git a/memcached.fc b/memcached.fc deleted file mode 100644 index e445d6a..0000000 --- a/memcached.fc +++ /dev/null @@ -1,2 +0,0 @@ -/usr/bin/memcached(.*)? -- gen_context(system_u:object_r:memcached_exec_t,s0) -/var/run/memcached(/.*)? gen_context(system_u:object_r:memcached_var_run_t,s0) diff --git a/memcached.if b/memcached.if deleted file mode 100644 index 0ebb567..0000000 --- a/memcached.if +++ /dev/null @@ -1 +0,0 @@ -# This file is as of yet unused diff --git a/memcached.spec b/memcached.spec index ab5e454..18a36de 100644 --- a/memcached.spec +++ b/memcached.spec @@ -3,7 +3,7 @@ Name: memcached Version: 1.4.5 -Release: 6%{?dist} +Release: 7%{?dist} Epoch: 0 Summary: High Performance, Distributed Memory Object Cache @@ -18,6 +18,7 @@ Source1: memcached.sysv # Patches # From http://code.google.com/p/memcached/issues/detail?id=60 Patch001: memcached-1.4.5-issue60.diff +Patch002: memcached-1.4.5-warnings.patch # Fixes @@ -53,6 +54,7 @@ memcached binary include files. %prep %setup -q %patch001 -p1 +%patch002 -p1 -b .warnings %build %configure @@ -147,6 +149,9 @@ exit 0 %{_includedir}/memcached/* %changelog +* Wed Feb 16 2011 Joe Orton - 0:1.4.5-7 +- fix build + * Mon Feb 14 2011 Paul Lindner - 0:1.4.5-6 - Rebuild for updated libevent diff --git a/memcached.te b/memcached.te deleted file mode 100644 index 5748859..0000000 --- a/memcached.te +++ /dev/null @@ -1,61 +0,0 @@ -policy_module(memcached, 1.0.1) - -require { - attribute port_type; -}; - -##################################### -# -# Declarations -# -type memcached_t; -type memcached_exec_t; - -type memcached_var_run_t; -type memcached_port_t, port_type; - - -######################################## -# -# Local policy -# -init_daemon_domain(memcached_t, memcached_exec_t) -domain_use_interactive_fds(memcached_t) -init_use_fds(memcached_t) - -files_pid_file(memcached_var_run_t) - -allow memcached_t self:capability { setgid setuid }; -dontaudit memcached_t self:capability sys_tty_config; -allow memcached_t self:process signal_perms; -allow memcached_t self:fifo_file rw_file_perms; -allow memcached_t self:unix_stream_socket create_stream_socket_perms; - -allow memcached_t memcached_port_t:tcp_socket name_bind; -allow memcached_t memcached_port_t:udp_socket name_bind; -allow memcached_t self:tcp_socket create_stream_socket_perms; -allow memcached_t self:udp_socket create_stream_socket_perms; - -corenet_non_ipsec_sendrecv(memcached_t) -corenet_tcp_sendrecv_all_if(memcached_t) -corenet_udp_sendrecv_all_if(memcached_t) -corenet_tcp_sendrecv_all_nodes(memcached_t) -corenet_udp_sendrecv_all_nodes(memcached_t) -corenet_tcp_bind_all_nodes(memcached_t) -corenet_udp_bind_all_nodes(memcached_t) - -allow memcached_t memcached_var_run_t:file create_file_perms; -allow memcached_t memcached_var_run_t:dir rw_dir_perms; -files_pid_filetrans(memcached_t, memcached_var_run_t, file) - -kernel_read_kernel_sysctls(memcached_t) -kernel_read_system_state(memcached_t) - -libs_use_ld_so(memcached_t) -libs_use_shared_libs(memcached_t) - -files_read_etc_files(memcached_t) - -term_dontaudit_use_all_user_ptys(memcached_t) -term_dontaudit_use_all_user_ttys(memcached_t) -term_dontaudit_use_console(memcached_t)