Commit Graph

124 Commits

Author SHA1 Message Date
Nathan Scott
c41f6f9cce Merge branch 'master' into epel7 2017-09-27 09:10:25 +10:00
Nathan Scott
e35b514eeb Drop duplicate LDFLAGS setting via LUA_LDFLAGS
Remi noticed an inconsistency in setting these
flags - auditing the makefiles reveals there is
no need to use the LUA-specific settings as the
supplied LDFLAGS and CFLAGS are honoured.
2017-09-27 09:02:22 +10:00
Nathan Scott
75e2f2b69a Merge branch 'master' into epel7 2017-09-26 17:45:40 +10:00
Nathan Scott
59378174a9 Incorporate recent feedback from Remi, build once
Drop modification of the configuration file to add
systemd supervision - Remi correctly points out this
is redundant (due to unit files already overriding)
and will just cause issues.

Noticed the build runs twice also, once during the
%build phase and once again during %install (full
rebuild) - this was because of differing options on
the make lines (CFLAGS= etc vs PREFIX= etc) and the
Redis src/Makefile causes full rebuild as a result
(including of deps/* which it "make distclean"s).

Also fixed a rpmbuild "warning: Macro expanded in
comment" message in a couple of places, and changed
the way we squash hidden build messages to use the
"V" macro as the Makefiles intended.
2017-09-26 17:43:26 +10:00
Nathan Scott
4ffaac44de Merge branch 'master' into epel7 2017-09-26 15:04:55 +10:00
Nathan Scott
df786883ff Latest upstream bugfix release and some packaging BZ fixes 2017-09-26 14:58:36 +10:00
Nathan Scott
c374de3637 Incorporate recent feedback from Haikel and Remi
Add "--supervised systemd" to the command line, and
drop the "--daemonize" option as Redis already does
this internally in supervised mode.

Add Provides:bundled spec file lines for linenoise,
lua-libs and hiredis.
2017-09-07 16:39:14 +10:00
Nathan Scott
9f0877ed49 Refactor some patches out of redis.spec
For cases where we have two ways of doing one thing (using
a patch or sed-based modification of files), rework these
such that we're only using one method.  Allows several of
the patches to be dropped.

Described in https://github.com/antirez/redis/issues/1417
is a method for allowing integration/replication-psync to
be reliably run - start using it, and drop the patch that
was disabling that test.

Other small side-effects of this commit:
- the build warning about "jemalloc not found" is fixed;
- CFLAGS additions are now consistently handled (for deps
  as well) - using the upstream-provided mechanism for
  compiler flag propogation.
2017-09-07 15:33:39 +10:00
Nathan Scott
dc361d6b75 Switch to systemd service Type=notify for Redis
Enable the systemd supervision support in redis
configuration files and update the service type
in the systemd service file to enable its use.

This resolves RHBZ #1172841.
2017-08-28 16:06:15 +10:00
Nathan Scott
09a626dbe1 Merge branch 'master' into epel7 2017-08-18 10:31:40 +10:00
Nathan Scott
5085a9081d Upload 3.2.10 sources 2017-08-17 10:19:57 +10:00
Nathan Scott
64e67eb9fe Add redis-trib based on patch from Sebastian Saletnik.
Merge the redis-trib sub-package patch originally from
Sebastian Saletnik with added conditionals for building
on platforms with no ruby redis gem (EPEL6 and Fedoras
before f19).

This resolves Redis RHBZ #1215654.
2017-08-14 18:07:25 +10:00
Nathan Scott
16aeff4dbc Merge branch 'master' of ssh://pkgs.fedoraproject.org/redis 2017-08-14 13:48:14 +10:00
Nathan Scott
cf49c6bbe9 Upstream 3.2.10 release
Ensure both the redis and redis-sentinel service files set correct perms.
Dropped systemd tmpfiles source, handled directly in systemd service files.
2017-08-14 12:11:34 +10:00
Fedora Release Engineering
668ece2ae9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild 2017-08-03 07:38:16 +00:00
Fedora Release Engineering
aa0c5b2abf - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild 2017-07-27 13:02:26 +00:00
Haikel Guemar
94b0494e4a Upload 3.2.9 sources 2017-06-23 15:04:34 +02:00
Haikel Guemar
4f1d5f156d Upstream 3.2.9
Add RuntimeDirectory=redis to systemd unit file (RHBZ #1454700)
Mark rundir as %ghost since it may disappear (tmpfs - #1454700)
Fix a shutdown failure with Unix domain sockets (RHBZ #1444988)

Patch contributed by Nathan Scott
2017-06-23 15:02:15 +02:00
Haikel Guemar
4e3af4a0d8 Upload 3.2.8 sources 2017-02-20 07:54:06 -05:00
Haikel Guemar
dfbfda99c9 Upstream 3.2.8
bugfix for #3796 (MIGRATE could cause server crash  after socket error)
2017-02-20 07:49:12 -05:00
Haikel Guemar
0641733c28 Backport bugfix from RDO package 2017-02-20 07:46:37 -05:00
Fedora Release Engineering
03b3484b7d - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild 2017-02-11 11:37:49 +00:00
Haikel Guemar
bf304417be Upload 3.2.7 sources 2017-02-04 16:28:12 +01:00
Haikel Guemar
8cbea8c9c3 Upstream 3.2.7 (important security fix) 2017-02-04 16:19:49 +01:00
Haikel Guemar
93650f449c Refresh patchqueue 2016-09-26 16:36:02 +02:00
Haikel Guemar
fc3bfb53c4 Upload 3.2.4 sources 2016-09-26 16:22:14 +02:00
Haikel Guemar
b9162a4476 Upstream 3.2.4
- Fix buffer overlow (TALOS-2016-0206)
2016-09-26 16:15:16 +02:00
Remi Collet
1968d3b557 add LSB headers to init scripts 2016-09-14 11:57:23 +02:00
Remi Collet
5595a23796 cleanup unsupported actions from init script 2016-09-14 11:08:00 +02:00
Remi Collet
83364f086c move redis-shutdown to libexec 2016-09-14 10:48:19 +02:00
Remi Collet
d66975ecc1 cleanup the patch, no pid with systemd, given as cli arg with sysinit 2016-09-13 08:12:12 +02:00
Remi Collet
6844759f70 - add missing man pages #1374577
using patch from https://github.com/antirez/redis/pull/3491
- data and configuration should not be publicly readable #1374700
- remove /var/run/redis with systemd #1374728
- provide redis-check-rdb as a symlink to redis-server #1374736
  using patch from https://github.com/antirez/redis/pull/3494
2016-09-13 07:58:57 +02:00
Haikel Guemar
6809ff675f Merge branch 'master' into epel7 2016-08-05 14:42:25 +02:00
Haikel Guemar
5e29ea2ef7 Upload 3.2.3 sources 2016-08-05 10:13:41 +02:00
Haikel Guemar
5612b666bc Upstream 3.2.3
- Security fix for CVE-2013-7458 (redis-cli history world readable)
- RHBZ#1363670 RHBZ#1363671
2016-08-05 10:04:43 +02:00
Haikel Guemar
60268427b7 Fix redis-shutdown to handle password-protected instances shutdown 2016-02-08 11:58:35 +01:00
Haikel Guemar
ffd00fb400 Fix redis-shutdown to handle password-protected instances 2016-02-08 11:58:16 +01:00
Fedora Release Engineering
c4cdeb229e - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild 2016-02-04 22:03:52 +00:00
Haikel Guemar
9aa122a4db Upstream 3.0.6 (RHBZ#1272281) 2015-12-19 02:35:56 +01:00
Haikel Guemar
d3f6a51d6b Upstream 3.0.5
- Fix slave/master replication hanging forever in certain case
2015-10-16 18:05:17 +02:00
Haikel Guemar
0df073751a Revert "SPEC cleanup"
This reverts commit 1bb2f79e98.

Not very useful, and makes spec even less readable
2015-10-16 17:50:15 +02:00
Christopher Meng
5c3ab3d4f8 Update to 3.0.4 2015-09-09 17:11:05 +08:00
Christopher Meng
fc3308ff82 Rebuilt for jemalloc 4.0.0 2015-08-31 18:28:16 +08:00
Christopher Meng
1bb2f79e98 SPEC cleanup 2015-08-31 17:41:30 +08:00
Haikel Guemar
ba862cdcbe Upstream 3.0.3 2015-07-21 14:55:10 +02:00
Dennis Gilmore
52a7e9cd42 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild 2015-06-18 22:13:11 +00:00
Haikel Guemar
428c290283 Upstream 3.0.2 (RHBZ #1228245)
- Fix Lua sandbox escape and arbitrary code execution (RHBZ #1228331)
2015-06-05 01:58:03 +02:00
Haikel Guemar
2d2c6c1474 Upload 3.0.1 sources 2015-05-09 19:42:33 +02:00
Haikel Guemar
540294a244 Upstream 3.0.1 (RHBZ #1208322) 2015-05-09 19:09:45 +02:00
Remi Collet
9824f26f91 fix changelog 2015-04-14 09:58:28 +02:00