From 8ca78cb0ae17346e6af74134deae74e3cf19fd6a Mon Sep 17 00:00:00 2001 From: Paul Lindner Date: Wed, 17 Aug 2011 00:25:33 -0700 Subject: [PATCH] upgrade to memcached-1.4.7, lint fixes --- .gitignore | 1 + memcached-1.4.5-warnings.patch | 30 ------------------------------ memcached.spec | 25 ++++++++++++++----------- sources | 2 +- 4 files changed, 16 insertions(+), 42 deletions(-) delete mode 100644 memcached-1.4.5-warnings.patch diff --git a/.gitignore b/.gitignore index ef3b0a3..89ceade 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ memcached-1.4.5.tar.gz /memcached-1.4.6.tar.gz +/memcached-1.4.7.tar.gz diff --git a/memcached-1.4.5-warnings.patch b/memcached-1.4.5-warnings.patch deleted file mode 100644 index 1be53fe..0000000 --- a/memcached-1.4.5-warnings.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- 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.spec b/memcached.spec index 400ae23..9964f25 100644 --- a/memcached.spec +++ b/memcached.spec @@ -2,9 +2,9 @@ %define groupname memcached Name: memcached -Version: 1.4.6 +Version: 1.4.7 Release: 1%{?dist} -Epoch: 0 +Epoch: 0 Summary: High Performance, Distributed Memory Object Cache Group: System Environment/Daemons @@ -25,7 +25,6 @@ BuildRequires: libevent-devel BuildRequires: perl(Test::More) Requires: initscripts -Requires: libevent Requires(pre): shadow-utils Requires(post): /sbin/chkconfig Requires(preun): /sbin/chkconfig, /sbin/service @@ -40,13 +39,13 @@ system, generic in nature, but intended for use in speeding up dynamic web applications by alleviating database load. %package devel -Summary: Files needed for development using memcached protocol -Group: Development/Libraries -Requires: %{name} = %{epoch}:%{version}-%{release} +Summary: Files needed for development using memcached protocol +Group: Development/Libraries +Requires: %{name} = %{epoch}:%{version}-%{release} %description devel -Install memcached-devel if you are developing C/C++ applications that require access to the -memcached binary include files. +Install memcached-devel if you are developing C/C++ applications that require +access to the memcached binary include files. %prep %setup -q @@ -64,13 +63,13 @@ rm -f t/whitespace.t if [ `id -u` -ne 0 ]; then # remove failing test that doesn't work in # build systems - rm -f t/daemonize.t + rm -f t/daemonize.t fi make test %install rm -rf %{buildroot} -make install DESTDIR=%{buildroot} INSTALL="%{__install} -p" +make install DESTDIR=%{buildroot} INSTALL="%{__install} -p" # remove memcached-debug rm -f %{buildroot}/%{_bindir}/memcached-debug @@ -144,6 +143,10 @@ exit 0 %{_includedir}/memcached/* %changelog +* Tue Aug 16 2011 Paul Lindner - 0:1.4.7-1 +- Upgrade to memcached 1.4.7 (http://code.google.com/p/memcached/wiki/ReleaseNotes147) +- Fix some rpmlint errors/warnings. + * Tue Aug 2 2011 Paul Lindner - 0:1.4.6-1 - Upgrade to memcached-1.4.6 @@ -190,7 +193,7 @@ exit 0 - Addresses CVE-2009-2415 * Sat Aug 29 2009 Paul Lindner - 1.4.1-1 -- Upgrade to 1.4.1 +- Upgrade to 1.4.1 - http://code.google.com/p/memcached/wiki/ReleaseNotes141 * Wed Apr 29 2009 Paul Lindner - 1.2.8-1 diff --git a/sources b/sources index dd5a209..e2e6963 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -243e5d82de27e6e45caf0ebfd400e41a memcached-1.4.6.tar.gz +cf0becfa65753c3b5a1fc8f84861bb23 memcached-1.4.7.tar.gz