Merge branch 'master' of ssh://pkgs.fedoraproject.org/memcached

Conflicts:
	memcached.spec

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);
+         }
+ 

memcached.fc

@@ -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)

memcached.if

@@ -1 +0,0 @@
-# This file is as of yet unused

memcached.spec

@@ -56,7 +56,7 @@ memcached binary include files.
 
 %build
 %configure
-
+sed -i 's/-Werror/ /' Makefile
 make %{?_smp_mflags}
 
 %check
@@ -150,6 +150,9 @@ exit 0
 * Tue Aug  2 2011 Paul Lindner <lindner@inuus.com> - 0:1.4.6-1
 - Upgrade to memcached-1.4.6
 
+* Wed Feb 16 2011 Joe Orton <jorton@redhat.com> - 0:1.4.5-7
+- fix build
+
 * Mon Feb 14 2011 Paul Lindner <lindner@inuus.com> - 0:1.4.5-6
 - Rebuild for updated libevent
 

memcached.te

@@ -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)