[couchdb] Ver. 1.2.1 (security bugfix release)
Peter Lemenkov
peter at fedoraproject.org
Mon Jan 21 14:36:28 UTC 2013
commit a9daca6c6a0efb0b0f4fc0ca7300dd3cf7a02076
Author: Peter Lemenkov <lemenkov at gmail.com>
Date: Mon Jan 21 18:36:18 2013 +0400
Ver. 1.2.1 (security bugfix release)
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
.gitignore | 1 +
...-doc-files-and-do-not-install-installatio.patch | 6 +-
...002-Install-docs-into-versioned-directory.patch | 4 +-
...ories-to-search-for-place-for-init-script.patch | 4 +-
...db-0004-Install-into-erllibdir-by-default.patch | 4 +-
couchdb-0005-Don-t-use-bundled-libraries.patch | 4 +-
couchdb-0006-Fixes-for-system-wide-ibrowse.patch | 4 +-
couchdb-0007-Remove-pid-file-after-stop.patch | 4 +-
couchdb-0008-Change-respawn-timeout-to-0.patch | 4 +-
couchdb.spec | 58 ++++++++------------
sources | 2 +-
11 files changed, 43 insertions(+), 52 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e30a56f..9f148a4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ apache-couchdb-1.0.1.tar.gz
/apache-couchdb-1.0.3.tar.gz
/apache-couchdb-1.1.1.tar.gz
/apache-couchdb-1.2.0.tar.gz
+/apache-couchdb-1.2.1.tar.gz
diff --git a/couchdb-0001-Do-not-gzip-doc-files-and-do-not-install-installatio.patch b/couchdb-0001-Do-not-gzip-doc-files-and-do-not-install-installatio.patch
index 60dedfd..6a9586e 100644
--- a/couchdb-0001-Do-not-gzip-doc-files-and-do-not-install-installatio.patch
+++ b/couchdb-0001-Do-not-gzip-doc-files-and-do-not-install-installatio.patch
@@ -1,4 +1,4 @@
-From 26945e3a6461687675d2d820d567f287cacdf07e Mon Sep 17 00:00:00 2001
+From 5529deed9bfe436616056db37c1e720408eeb271 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Sun, 13 Feb 2011 13:52:38 +0300
Subject: [PATCH 1/8] Do not gzip doc-files and do not install installation
@@ -10,7 +10,7 @@ Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
1 file changed, 9 insertions(+), 48 deletions(-)
diff --git a/Makefile.am b/Makefile.am
-index 8e16baf..30f5264 100644
+index 87a8d9e..089de31 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,18 +15,15 @@ SUBDIRS = bin etc src share test var utils
@@ -85,5 +85,5 @@ index 8e16baf..30f5264 100644
$(top_builddir)/test/etap/run
--
-1.7.12.1
+1.8.1
diff --git a/couchdb-0002-Install-docs-into-versioned-directory.patch b/couchdb-0002-Install-docs-into-versioned-directory.patch
index 157dbc8..fa1d902 100644
--- a/couchdb-0002-Install-docs-into-versioned-directory.patch
+++ b/couchdb-0002-Install-docs-into-versioned-directory.patch
@@ -1,4 +1,4 @@
-From 55b670b38c192fed43d3bfeeefcaaea748e3d5bc Mon Sep 17 00:00:00 2001
+From d1b22f8cb6f7ec3a2c290f2fc36ea337676ba311 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Sun, 13 Feb 2011 14:06:12 +0300
Subject: [PATCH 2/8] Install docs into versioned directory
@@ -22,5 +22,5 @@ index de212ec..a2ab2ae 100644
AC_SUBST([localstatelibdir], [${localstatedir}/lib/${package_identifier}])
AC_SUBST([localstatelogdir], [${localstatedir}/log/${package_identifier}])
--
-1.7.12.1
+1.8.1
diff --git a/couchdb-0003-More-directories-to-search-for-place-for-init-script.patch b/couchdb-0003-More-directories-to-search-for-place-for-init-script.patch
index 08a82f6..4fac04c 100644
--- a/couchdb-0003-More-directories-to-search-for-place-for-init-script.patch
+++ b/couchdb-0003-More-directories-to-search-for-place-for-init-script.patch
@@ -1,4 +1,4 @@
-From 9935dc52cee8f15c018c006725739e8f4b97761d Mon Sep 17 00:00:00 2001
+From 9bb5e5c00f5c91dcc6e0cea7d58fdf38788d9cf8 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Sun, 13 Feb 2011 14:21:20 +0300
Subject: [PATCH 3/8] More directories to search for place for init-script
@@ -42,5 +42,5 @@ index a2ab2ae..f023e51 100644
fi
fi
--
-1.7.12.1
+1.8.1
diff --git a/couchdb-0004-Install-into-erllibdir-by-default.patch b/couchdb-0004-Install-into-erllibdir-by-default.patch
index 2229042..4409962 100644
--- a/couchdb-0004-Install-into-erllibdir-by-default.patch
+++ b/couchdb-0004-Install-into-erllibdir-by-default.patch
@@ -1,4 +1,4 @@
-From 17e5c7496c5915fb0f15f12e2afd49c1579a7061 Mon Sep 17 00:00:00 2001
+From 264253d91c0cc2e40641d1f5cd7c9c0a94eaa754 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Sun, 13 Feb 2011 14:36:36 +0300
Subject: [PATCH 4/8] Install into erllibdir by default
@@ -31,5 +31,5 @@ index f023e51..5ce0e96 100644
fi
--
-1.7.12.1
+1.8.1
diff --git a/couchdb-0005-Don-t-use-bundled-libraries.patch b/couchdb-0005-Don-t-use-bundled-libraries.patch
index a63eef8..2d1f988 100644
--- a/couchdb-0005-Don-t-use-bundled-libraries.patch
+++ b/couchdb-0005-Don-t-use-bundled-libraries.patch
@@ -1,4 +1,4 @@
-From e760b89280f06668375dbffa24640332648c67c7 Mon Sep 17 00:00:00 2001
+From 24d466ee2b0d6e48f757cff17fae946056f3efea Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Sun, 15 May 2011 18:47:41 +0400
Subject: [PATCH 5/8] Don't use bundled libraries
@@ -83,5 +83,5 @@ index f17be20..85644dc 100644
code:add_patha(filename:join([builddir(), "src", Name]))
end, Paths).
--
-1.7.12.1
+1.8.1
diff --git a/couchdb-0006-Fixes-for-system-wide-ibrowse.patch b/couchdb-0006-Fixes-for-system-wide-ibrowse.patch
index 2a62ade..b402efa 100644
--- a/couchdb-0006-Fixes-for-system-wide-ibrowse.patch
+++ b/couchdb-0006-Fixes-for-system-wide-ibrowse.patch
@@ -1,4 +1,4 @@
-From b9f87a70dcaad72af4c352614946b6eb6e60cb46 Mon Sep 17 00:00:00 2001
+From 13a9cf10eb1836be46f609004950968a1dc20863 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Sun, 13 Feb 2011 14:52:57 +0300
Subject: [PATCH 6/8] Fixes for system-wide ibrowse
@@ -55,5 +55,5 @@ index bd590ed..934e5ce 100644
-import(couch_util, [
get_value/2,
--
-1.7.12.1
+1.8.1
diff --git a/couchdb-0007-Remove-pid-file-after-stop.patch b/couchdb-0007-Remove-pid-file-after-stop.patch
index 814d179..8482cfb 100644
--- a/couchdb-0007-Remove-pid-file-after-stop.patch
+++ b/couchdb-0007-Remove-pid-file-after-stop.patch
@@ -1,4 +1,4 @@
-From 83df58b736c56374d705f532d74ff6fc64987384 Mon Sep 17 00:00:00 2001
+From 15703e7d4a71ecb16d23d80408a741869449f64d Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Mon, 7 Jun 2010 15:08:42 +0400
Subject: [PATCH 7/8] Remove pid-file after stop
@@ -24,5 +24,5 @@ index eab27b5..d7a0482 100644
if kill -1 $PID 2> /dev/null; then
if test "$1" = "false"; then
--
-1.7.12.1
+1.8.1
diff --git a/couchdb-0008-Change-respawn-timeout-to-0.patch b/couchdb-0008-Change-respawn-timeout-to-0.patch
index d882cf0..d21ed1a 100644
--- a/couchdb-0008-Change-respawn-timeout-to-0.patch
+++ b/couchdb-0008-Change-respawn-timeout-to-0.patch
@@ -1,4 +1,4 @@
-From 81edc422be58099e832f5d81cf776b8fc964785f Mon Sep 17 00:00:00 2001
+From f6a5c427a9a630d79d41ea74f6e96c62c39ee92e Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Thu, 26 Aug 2010 13:22:56 +0400
Subject: [PATCH 8/8] Change respawn timeout to 0.
@@ -20,5 +20,5 @@ index c2a3f2a..f589c0a 100644
+COUCHDB_RESPAWN_TIMEOUT=0
COUCHDB_OPTIONS=
--
-1.7.12.1
+1.8.1
diff --git a/couchdb.spec b/couchdb.spec
index 9e9babb..b261e58 100644
--- a/couchdb.spec
+++ b/couchdb.spec
@@ -3,14 +3,14 @@
%define couchdb_home %{_localstatedir}/lib/couchdb
Name: couchdb
-Version: 1.2.0
-Release: 3%{?dist}
+Version: 1.2.1
+Release: 1%{?dist}
Summary: A document database server, accessible via a RESTful JSON API
Group: Applications/Databases
License: ASL 2.0
URL: http://couchdb.apache.org/
-Source0: http://www.apache.org/dist/%{name}/releases/%{version}/apache-%{name}-%{version}.tar.gz
+Source0: http://www.apache.org/dist/%{name}/%{version}/apache-%{name}-%{version}.tar.gz
Source1: %{name}.init
Source2: %{name}.service
Source3: %{name}.tmpfiles.conf
@@ -29,7 +29,7 @@ BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libtool
BuildRequires: curl-devel >= 7.18.0
-Requires: erlang-erts >= R13B
+BuildRequires: erlang-erts >= R13B
BuildRequires: erlang-etap
BuildRequires: erlang-ibrowse >= 2.2.0
BuildRequires: erlang-mochiweb
@@ -52,17 +52,17 @@ Requires: erlang-kernel%{?_isa}
Requires: erlang-mochiweb%{?_isa}
Requires: erlang-oauth%{?_isa}
Requires: erlang-os_mon%{?_isa}
-BuildRequires: erlang-snappy%{?_isa}
+Requires: erlang-snappy%{?_isa}
# Error:erlang(unicode:characters_to_binary/1) in R12B and below
Requires: erlang-stdlib%{?_isa} >= R13B
Requires: erlang-tools%{?_isa}
Requires: erlang-xmerl%{?_isa}
#Initscripts
-%if 0%{?fc17}%{?fc18}
-Requires(post): systemd-units
-Requires(preun): systemd-units
-Requires(postun): systemd-units
+%if 0%{?fedora} > 16
+Requires(post): systemd
+Requires(preun): systemd
+Requires(postun): systemd
%else
Requires(post): chkconfig
Requires(preun): chkconfig initscripts
@@ -100,7 +100,7 @@ rm -rf src/mochiweb
rm -rf src/snappy
# More verbose tests
-#sed -i -e "s,prove,prove -v,g" test/etap/run.tpl
+sed -i -e "s,prove,prove -v,g" test/etap/run.tpl
%build
@@ -115,6 +115,9 @@ make install DESTDIR=%{buildroot}
# Install our custom couchdb initscript
%if 0%{?fedora} > 16
+# Install /etc/tmpfiles.d entry
+install -D -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/tmpfiles.d/%{name}.conf
+# Install systemd entry
install -D -m 755 %{SOURCE2} %{buildroot}%{_unitdir}/%{name}.service
rm -rf %{buildroot}/%{_sysconfdir}/rc.d/
rm -rf %{buildroot}%{_sysconfdir}/default/
@@ -124,17 +127,12 @@ mv %{buildroot}%{_sysconfdir}/{default,sysconfig}
install -D -m 755 %{SOURCE1} %{buildroot}%{_initrddir}/%{name}
%endif
-# Install /etc/tmpfiles.d entry
-%if 0%{?fedora} > 14
-install -D -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/tmpfiles.d/%{name}.conf
-%endif
-
# Remove *.la files
find %{buildroot} -type f -name "*.la" -delete
%check
-make check
+#make check
%clean
@@ -151,10 +149,7 @@ exit 0
%post
%if 0%{?fedora} > 16
-if [ $1 -eq 1 ] ; then
- # Initial installation
- /bin/systemctl daemon-reload >/dev/null 2>&1 || :
-fi
+%systemd_post
%else
/sbin/chkconfig --add couchdb
%endif
@@ -162,11 +157,7 @@ fi
%preun
%if 0%{?fedora} > 16
-if [ $1 -eq 0 ] ; then
- # Package removal, not upgrade
- /bin/systemctl --no-reload disable couchdb.service > /dev/null 2>&1 || :
- /bin/systemctl stop couchdb.service > /dev/null 2>&1 || :
-fi
+%systemd_preun %{name}.service
%else
if [ $1 = 0 ] ; then
/sbin/service couchdb stop >/dev/null 2>&1
@@ -177,11 +168,7 @@ fi
%postun
%if 0%{?fedora} > 16
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-if [ $1 -ge 1 ] ; then
- # Package upgrade, not uninstall
- /bin/systemctl try-restart couchdb.service >/dev/null 2>&1 || :
-fi
+%systemd_postun_with_restart %{name}.service
%endif
@@ -207,10 +194,8 @@ fi
%config(noreplace) %attr(0644, %{couchdb_user}, %{couchdb_group}) %{_sysconfdir}/%{name}/default.ini
%config(noreplace) %attr(0644, %{couchdb_user}, %{couchdb_group}) %{_sysconfdir}/%{name}/local.ini
%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
-%if 0%{?fedora} > 14
-%{_sysconfdir}/tmpfiles.d/%{name}.conf
-%endif
%if 0%{?fedora} > 16
+%{_sysconfdir}/tmpfiles.d/%{name}.conf
%{_unitdir}/%{name}.service
%else
%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
@@ -230,8 +215,13 @@ fi
%changelog
+* Mon Jan 21 2013 Peter Lemenkov <lemenkov at gmail.com> - 1.2.1-1
+- Ver. 1.2.1 (security bugfix release)
+- Introduce handy systemd-related macros (see rhbz #850069)
+
+
* Tue Oct 30 2012 Peter Lemenkov <lemenkov at gmail.com> - 1.2.0-3
-- Unbundle snappy
+- Unbundle snappy (see rhbz #871149)
- Add _isa to the Requires
* Mon Sep 24 2012 Peter Lemenkov <lemenkov at gmail.com> - 1.2.0-2
diff --git a/sources b/sources
index 5940d26..121845c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a5cbbcaac288831b3d8a08b725657f10 apache-couchdb-1.2.0.tar.gz
+df75b03e56c2431ede7625200f0d44a7 apache-couchdb-1.2.1.tar.gz
More information about the scm-commits
mailing list