[httpd] use KillMode=mixed in httpd.service (#1135122)
by Jan Kaluža
commit 36930381bc186af121a2439f92b8fe2c2c6f3acc
Author: Jan Kaluza <jkaluza(a)redhat.com>
Date: Mon Sep 1 09:32:54 2014 +0200
use KillMode=mixed in httpd.service (#1135122)
httpd.service | 10 +++-------
httpd.spec | 5 ++++-
2 files changed, 7 insertions(+), 8 deletions(-)
---
diff --git a/httpd.service b/httpd.service
index 04c43e2..f7a01e4 100644
--- a/httpd.service
+++ b/httpd.service
@@ -24,13 +24,9 @@ Environment=LANG=C
ExecStart=/usr/sbin/httpd $OPTIONS -DFOREGROUND
ExecReload=/usr/sbin/httpd $OPTIONS -k graceful
-ExecStop=/bin/kill -WINCH ${MAINPID}
-# We want systemd to give httpd some time to finish gracefully, but still want
-# it to kill httpd after TimeoutStopSec if something went wrong during the
-# graceful stop. Normally, Systemd sends SIGTERM signal right after the
-# ExecStop, which would kill httpd. We are sending useless SIGCONT here to give
-# httpd time to finish.
-KillSignal=SIGCONT
+# Send SIGWINCH for graceful stop
+KillSignal=SIGWINCH
+KillMode=mixed
PrivateTmp=true
[Install]
diff --git a/httpd.spec b/httpd.spec
index a68b852..68683b1 100644
--- a/httpd.spec
+++ b/httpd.spec
@@ -14,7 +14,7 @@
Summary: Apache HTTP Server
Name: httpd
Version: 2.4.10
-Release: 9%{?dist}
+Release: 10%{?dist}
URL: http://httpd.apache.org/
Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
Source1: index.html
@@ -669,6 +669,9 @@ rm -rf $RPM_BUILD_ROOT
%{_rpmconfigdir}/macros.d/macros.httpd
%changelog
+* Mon Sep 01 2014 Jan Kaluza <jkaluza(a)redhat.com> - 2.4.10-10
+- use KillMode=mixed in httpd.service (#1135122)
+
* Fri Aug 29 2014 Joe Orton <jorton(a)redhat.com> - 2.4.10-9
- set vstring based on /etc/os-release (Pat Riehecky, #1114539)
7Â years, 8Â months
[debian-keyring] Update to 2014.1
by Sandro Mani
commit fd892e6dc9810414d2f46a06ea9fd1a4dab4c070
Author: Sandro Mani <manisandro(a)gmail.com>
Date: Mon Sep 1 09:27:43 2014 +0200
Update to 2014.1
.gitignore | 1 +
debian-keyring.spec | 9 ++++++---
sources | 2 +-
3 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b3a3b27..b6d04c7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/debian-archive-keyring_2012.4.tar.gz
+/debian-archive-keyring_2014.1.tar.xz
diff --git a/debian-keyring.spec b/debian-keyring.spec
index f5480fa..fc87215 100644
--- a/debian-keyring.spec
+++ b/debian-keyring.spec
@@ -1,13 +1,13 @@
%global upstreamname debian-archive-keyring
Name: debian-keyring
-Version: 2012.4
-Release: 3%{?dist}
+Version: 2014.1
+Release: 1%{?dist}
Summary: GnuPG archive keys of the Debian archive
License: Public Domain
URL: http://packages.debian.org/unstable/admin/%{upstreamname}
-Source0: http://ftp.debian.org/debian/pool/main/d/%{upstreamname}/%{upstreamname}_...
+Source0: http://ftp.debian.org/debian/pool/main/d/%{upstreamname}/%{upstreamname}_...
BuildArch: noarch
BuildRequires: jetring
@@ -37,6 +37,9 @@ make
%changelog
+* Mon Sep 01 2014 Sandro Mani <manisandro(a)gmail.com> - 2014.1-1
+- Update to 2014.1
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2012.4-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
diff --git a/sources b/sources
index 6adb5e2..aff1c37 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-51f36e24f778c4fdfbd1da734c798799 debian-archive-keyring_2012.4.tar.gz
+bc2fa962b563ea1941207247672e0997 debian-archive-keyring_2014.1.tar.xz
7Â years, 8Â months
[perl-CPAN-Inject] Perl 5.20 rebuild
by Jitka Plesnikova
commit 2f7ec0812ea4a29099f00f51ab3d7b0068198ca6
Author: Jitka Plesnikova <jplesnik(a)redhat.com>
Date: Mon Sep 1 09:21:11 2014 +0200
Perl 5.20 rebuild
perl-CPAN-Inject.spec | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/perl-CPAN-Inject.spec b/perl-CPAN-Inject.spec
index c737374..1c61d6e 100644
--- a/perl-CPAN-Inject.spec
+++ b/perl-CPAN-Inject.spec
@@ -1,6 +1,6 @@
Name: perl-CPAN-Inject
Version: 1.14
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Base class for injecting distributions into CPAN sources
License: GPL+ or Artistic
Group: Development/Libraries
@@ -72,6 +72,9 @@ make test </dev/null
%{_mandir}/man3/*
%changelog
+* Mon Sep 01 2014 Jitka Plesnikova <jplesnik(a)redhat.com> - 1.14-7
+- Perl 5.20 rebuild
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.14-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
7Â years, 8Â months
[perl-Event-RPC] Perl 5.20 rebuild
by Jitka Plesnikova
commit 467ae213bfdffc01bd97bc847927aaf3441c5f0a
Author: Jitka Plesnikova <jplesnik(a)redhat.com>
Date: Mon Sep 1 09:20:54 2014 +0200
Perl 5.20 rebuild
perl-Event-RPC.spec | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/perl-Event-RPC.spec b/perl-Event-RPC.spec
index ea11046..0c740a9 100644
--- a/perl-Event-RPC.spec
+++ b/perl-Event-RPC.spec
@@ -1,6 +1,6 @@
Name: perl-Event-RPC
Version: 1.05
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Event based transparent client/server RPC framework
Group: Development/Libraries
License: GPL+ or Artistic
@@ -67,6 +67,9 @@ make test
%{_mandir}/man3/*.3*
%changelog
+* Mon Sep 01 2014 Jitka Plesnikova <jplesnik(a)redhat.com> - 1.05-3
+- Perl 5.20 rebuild
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.05-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
7Â years, 8Â months
[perl-Gnome2-VFS] Perl 5.20 rebuild
by Jitka Plesnikova
commit cb22418fe135cc86ddd321611672ef7a56647c39
Author: Jitka Plesnikova <jplesnik(a)redhat.com>
Date: Mon Sep 1 09:20:54 2014 +0200
Perl 5.20 rebuild
perl-Gnome2-VFS.spec | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/perl-Gnome2-VFS.spec b/perl-Gnome2-VFS.spec
index fd6b577..c2f97e9 100644
--- a/perl-Gnome2-VFS.spec
+++ b/perl-Gnome2-VFS.spec
@@ -1,6 +1,6 @@
Name: perl-Gnome2-VFS
Version: 1.082
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Perl interface to the 2.x series of the GNOME VFS library
License: LGPLv2+
Group: Development/Libraries
@@ -67,6 +67,9 @@ make test
%{_mandir}/man3/*
%changelog
+* Mon Sep 01 2014 Jitka Plesnikova <jplesnik(a)redhat.com> - 1.082-4
+- Perl 5.20 rebuild
+
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.082-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
7Â years, 8Â months
[perl-Gnome2-GConf] Perl 5.20 rebuild
by Jitka Plesnikova
commit 081c8345b3e9414fb5408f5f22e54b6ba7d11610
Author: Jitka Plesnikova <jplesnik(a)redhat.com>
Date: Mon Sep 1 09:20:54 2014 +0200
Perl 5.20 rebuild
perl-Gnome2-GConf.spec | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/perl-Gnome2-GConf.spec b/perl-Gnome2-GConf.spec
index 062a7db..78bc31d 100644
--- a/perl-Gnome2-GConf.spec
+++ b/perl-Gnome2-GConf.spec
@@ -1,6 +1,6 @@
Name: perl-Gnome2-GConf
Version: 1.044
-Release: 20%{?dist}
+Release: 21%{?dist}
Summary: Perl wrappers for the GConf configuration engine
License: LGPLv2+
Group: Development/Libraries
@@ -67,6 +67,9 @@ rm -rf %{buildroot}
%changelog
+* Mon Sep 01 2014 Jitka Plesnikova <jplesnik(a)redhat.com> - 1.044-21
+- Perl 5.20 rebuild
+
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.044-20
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
7Â years, 8Â months
[perl-Net-DBus-GLib] Perl 5.20 rebuild
by Jitka Plesnikova
commit 8a52705089d71d51ed4ffb64c9d05b6ac3cca2b2
Author: Jitka Plesnikova <jplesnik(a)redhat.com>
Date: Mon Sep 1 09:20:54 2014 +0200
Perl 5.20 rebuild
perl-Net-DBus-GLib.spec | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/perl-Net-DBus-GLib.spec b/perl-Net-DBus-GLib.spec
index 0b1e968..53f7599 100644
--- a/perl-Net-DBus-GLib.spec
+++ b/perl-Net-DBus-GLib.spec
@@ -1,6 +1,6 @@
Name: perl-Net-DBus-GLib
Version: 0.33.0
-Release: 16%{?dist}
+Release: 17%{?dist}
Summary: Perl extension for the DBus GLib bindings
License: GPLv2+ or Artistic
Group: Development/Libraries
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man3/*
%changelog
+* Mon Sep 01 2014 Jitka Plesnikova <jplesnik(a)redhat.com> - 0.33.0-17
+- Perl 5.20 rebuild
+
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.33.0-16
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
7Â years, 8Â months
[perl-Pango] Perl 5.20 rebuild
by Jitka Plesnikova
commit b037a2f168f621877076532c5d613f15c960fd01
Author: Jitka Plesnikova <jplesnik(a)redhat.com>
Date: Mon Sep 1 09:20:53 2014 +0200
Perl 5.20 rebuild
perl-Pango.spec | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/perl-Pango.spec b/perl-Pango.spec
index 8c1ca4d..088fad3 100644
--- a/perl-Pango.spec
+++ b/perl-Pango.spec
@@ -1,6 +1,6 @@
Name: perl-Pango
Version: 1.226
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Perl interface to the pango library
Group: Development/Libraries
License: LGPLv2+
@@ -52,6 +52,9 @@ chmod -R u+w $RPM_BUILD_ROOT/*
%{_mandir}/man3/*.3pm*
%changelog
+* Mon Sep 01 2014 Jitka Plesnikova <jplesnik(a)redhat.com> - 1.226-3
+- Perl 5.20 rebuild
+
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.226-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
7Â years, 8Â months