upgrade to memcached-1.4.7, lint fixes
This commit is contained in:
parent
1a891b5893
commit
8ca78cb0ae
1
.gitignore
vendored
1
.gitignore
vendored
@ -1,2 +1,3 @@
|
|||||||
memcached-1.4.5.tar.gz
|
memcached-1.4.5.tar.gz
|
||||||
/memcached-1.4.6.tar.gz
|
/memcached-1.4.6.tar.gz
|
||||||
|
/memcached-1.4.7.tar.gz
|
||||||
|
@ -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);
|
|
||||||
}
|
|
||||||
|
|
@ -2,9 +2,9 @@
|
|||||||
%define groupname memcached
|
%define groupname memcached
|
||||||
|
|
||||||
Name: memcached
|
Name: memcached
|
||||||
Version: 1.4.6
|
Version: 1.4.7
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
Epoch: 0
|
Epoch: 0
|
||||||
Summary: High Performance, Distributed Memory Object Cache
|
Summary: High Performance, Distributed Memory Object Cache
|
||||||
|
|
||||||
Group: System Environment/Daemons
|
Group: System Environment/Daemons
|
||||||
@ -25,7 +25,6 @@ BuildRequires: libevent-devel
|
|||||||
BuildRequires: perl(Test::More)
|
BuildRequires: perl(Test::More)
|
||||||
|
|
||||||
Requires: initscripts
|
Requires: initscripts
|
||||||
Requires: libevent
|
|
||||||
Requires(pre): shadow-utils
|
Requires(pre): shadow-utils
|
||||||
Requires(post): /sbin/chkconfig
|
Requires(post): /sbin/chkconfig
|
||||||
Requires(preun): /sbin/chkconfig, /sbin/service
|
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.
|
web applications by alleviating database load.
|
||||||
|
|
||||||
%package devel
|
%package devel
|
||||||
Summary: Files needed for development using memcached protocol
|
Summary: Files needed for development using memcached protocol
|
||||||
Group: Development/Libraries
|
Group: Development/Libraries
|
||||||
Requires: %{name} = %{epoch}:%{version}-%{release}
|
Requires: %{name} = %{epoch}:%{version}-%{release}
|
||||||
|
|
||||||
%description devel
|
%description devel
|
||||||
Install memcached-devel if you are developing C/C++ applications that require access to the
|
Install memcached-devel if you are developing C/C++ applications that require
|
||||||
memcached binary include files.
|
access to the memcached binary include files.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
@ -64,13 +63,13 @@ rm -f t/whitespace.t
|
|||||||
if [ `id -u` -ne 0 ]; then
|
if [ `id -u` -ne 0 ]; then
|
||||||
# remove failing test that doesn't work in
|
# remove failing test that doesn't work in
|
||||||
# build systems
|
# build systems
|
||||||
rm -f t/daemonize.t
|
rm -f t/daemonize.t
|
||||||
fi
|
fi
|
||||||
make test
|
make test
|
||||||
|
|
||||||
%install
|
%install
|
||||||
rm -rf %{buildroot}
|
rm -rf %{buildroot}
|
||||||
make install DESTDIR=%{buildroot} INSTALL="%{__install} -p"
|
make install DESTDIR=%{buildroot} INSTALL="%{__install} -p"
|
||||||
# remove memcached-debug
|
# remove memcached-debug
|
||||||
rm -f %{buildroot}/%{_bindir}/memcached-debug
|
rm -f %{buildroot}/%{_bindir}/memcached-debug
|
||||||
|
|
||||||
@ -144,6 +143,10 @@ exit 0
|
|||||||
%{_includedir}/memcached/*
|
%{_includedir}/memcached/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Aug 16 2011 Paul Lindner <lindner@inuus.com> - 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 <lindner@inuus.com> - 0:1.4.6-1
|
* Tue Aug 2 2011 Paul Lindner <lindner@inuus.com> - 0:1.4.6-1
|
||||||
- Upgrade to memcached-1.4.6
|
- Upgrade to memcached-1.4.6
|
||||||
|
|
||||||
@ -190,7 +193,7 @@ exit 0
|
|||||||
- Addresses CVE-2009-2415
|
- Addresses CVE-2009-2415
|
||||||
|
|
||||||
* Sat Aug 29 2009 Paul Lindner <lindner@inuus.com> - 1.4.1-1
|
* Sat Aug 29 2009 Paul Lindner <lindner@inuus.com> - 1.4.1-1
|
||||||
- Upgrade to 1.4.1
|
- Upgrade to 1.4.1
|
||||||
- http://code.google.com/p/memcached/wiki/ReleaseNotes141
|
- http://code.google.com/p/memcached/wiki/ReleaseNotes141
|
||||||
|
|
||||||
* Wed Apr 29 2009 Paul Lindner <lindner@inuus.com> - 1.2.8-1
|
* Wed Apr 29 2009 Paul Lindner <lindner@inuus.com> - 1.2.8-1
|
||||||
|
Loading…
Reference in New Issue
Block a user