scm-commits June 2015

scm-commits@lists.fedoraproject.org

7 participants
37023 discussions

robert pushed to prosody (el6). "Correct condition to not exclude Fedora by accident"
by notifications＠fedoraproject.org 01 Jul '15

01 Jul '15

From 554b865fb0da50c93ea420279821d79893f449f8 Mon Sep 17 00:00:00 2001 From: Robert Scheck <robert(a)fedoraproject.org> Date: Sat, 18 Apr 2015 23:34:12 +0200 Subject: Correct condition to not exclude Fedora by accident diff --git a/prosody.spec b/prosody.spec index 3905160..994775e 100644 --- a/prosody.spec +++ b/prosody.spec @@ -66,7 +66,7 @@ added functionality, or prototype new protocols. --with-lua-include=%{_includedir}/lua-%{luaver} \ --runwith=lua-%{luaver} \ %endif -%if 0%{?rhel} > 5 +%if 0%{?rhel} != 5 --cflags="$RPM_OPT_FLAGS -fPIC -D_GNU_SOURCE" \ %else --cflags="$RPM_OPT_FLAGS -fPIC" \ -- cgit v0.10.2 http://pkgs.fedoraproject.org/cgit/prosody.git/commit/?h=el6&id=554b865fb0d…

1 0

robert pushed to prosody (epel7). "Fixed the wrong logrotate configuration to not use a wildcard"
by notifications＠fedoraproject.org 01 Jul '15

01 Jul '15

From f499eb5c7fe3fc01c1efddb86780fc3790f9d090 Mon Sep 17 00:00:00 2001 From: Robert Scheck <robert(a)fedoraproject.org> Date: Wed, 1 Jul 2015 00:07:06 +0200 Subject: Fixed the wrong logrotate configuration to not use a wildcard diff --git a/prosody.logrotate-init b/prosody.logrotate-init index 968121b..911faed 100644 --- a/prosody.logrotate-init +++ b/prosody.logrotate-init @@ -1,4 +1,4 @@ -/var/log/prosody/prosody.* { +/var/log/prosody/prosody.log /var/log/prosody/prosody.err { weekly missingok rotate 52 diff --git a/prosody.logrotate-service b/prosody.logrotate-service index 4f262ab..e6a7823 100644 --- a/prosody.logrotate-service +++ b/prosody.logrotate-service @@ -1,4 +1,4 @@ -/var/log/prosody/prosody.* { +/var/log/prosody/prosody.log /var/log/prosody/prosody.err { weekly missingok rotate 52 diff --git a/prosody.spec b/prosody.spec index 1ec1e24..9e0a096 100644 --- a/prosody.spec +++ b/prosody.spec @@ -5,7 +5,7 @@ Summary: Flexible communications server for Jabber/XMPP Name: prosody Version: 0.9.8 -Release: 2%{?dist} +Release: 3%{?dist} License: MIT Group: System Environment/Daemons URL: https://prosody.im/ @@ -217,6 +217,9 @@ fi %{_mandir}/man1/%{name}*.1* %changelog +* Wed Jul 01 2015 Robert Scheck <robert(a)fedoraproject.org> 0.9.8-3 +- Fixed the wrong logrotate configuration to not use a wildcard + * Thu Jun 18 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.9.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild -- cgit v0.10.2 http://pkgs.fedoraproject.org/cgit/prosody.git/commit/?h=epel7&id=f499eb5c7…

1 0

robert pushed to prosody (epel7). "- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild"
by notifications＠fedoraproject.org 01 Jul '15

01 Jul '15

From 4bc86a048f6560eafe3e2f907040f19e9fd93110 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore <dennis(a)ausil.us> Date: Thu, 18 Jun 2015 17:51:17 +0000 Subject: - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/prosody.spec b/prosody.spec index e529fb6..1ec1e24 100644 --- a/prosody.spec +++ b/prosody.spec @@ -5,7 +5,7 @@ Summary: Flexible communications server for Jabber/XMPP Name: prosody Version: 0.9.8 -Release: 1%{?dist} +Release: 2%{?dist} License: MIT Group: System Environment/Daemons URL: https://prosody.im/ @@ -217,6 +217,9 @@ fi %{_mandir}/man1/%{name}*.1* %changelog +* Thu Jun 18 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.9.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Sat Apr 18 2015 Robert Scheck <robert(a)fedoraproject.org> 0.9.8-1 - Upgrade to 0.9.8 (#1152126) -- cgit v0.10.2 http://pkgs.fedoraproject.org/cgit/prosody.git/commit/?h=epel7&id=4bc86a048…

1 0

robert pushed to prosody (epel7). "Added patch to handle the old OpenSSL 0.9.8e in RHEL 5 (and derivates) as good as possible"
by notifications＠fedoraproject.org 01 Jul '15

01 Jul '15

From 7fbe1b6c7769dc474b78c250382e0251fc88974e Mon Sep 17 00:00:00 2001 From: Robert Scheck <robert(a)fedoraproject.org> Date: Tue, 5 May 2015 01:20:50 +0200 Subject: Added patch to handle the old OpenSSL 0.9.8e in RHEL 5 (and derivates) as good as possible diff --git a/prosody-0.9.8-rhel5.patch b/prosody-0.9.8-rhel5.patch new file mode 100644 index 0000000..6a4a1a8 --- /dev/null +++ b/prosody-0.9.8-rhel5.patch @@ -0,0 +1,35 @@ +Patch by Robert Scheck <robert(a)fedoraproject.org> for prosody >= 0.9.8 which removes all +options that OpenSSL 0.9.8e (as shipped by Red Hat Enterprise Linux 5 and derivates such +as CentOS) does not support: SSL_OP_NO_TICKET (added by upstream with OpenSSL 0.9.8f) and +the support for secp384r1 (added by Red Hat for RHEL 6.5 with openssl-1.0.1e-15). LuaSec +0.5 does not offer any option to detect which OpenSSL features are (not) available, thus +Prosody upstream tries to determine them by the LuaSec version - risky, because EPEL 5 is +shipping LuaSec 0.4.1 since ever, but still had no support for the "no_ticket" option. + +--- prosody-0.9.8/core/certmanager.lua 2015-03-24 20:18:04.000000000 +0100 ++++ prosody-0.9.8/core/certmanager.lua.rhel5 2015-05-05 00:47:21.000000000 +0200 +@@ -33,7 +33,7 @@ + local default_ssl_config = configmanager.get("*", "ssl"); + local default_capath = "/etc/ssl/certs"; + local default_verify = (ssl and ssl.x509 and { "peer", "client_once", }) or "none"; +-local default_options = { "no_sslv2", "no_sslv3", "cipher_server_preference", luasec_has_noticket and "no_ticket" or nil }; ++local default_options = { "no_sslv2", "no_sslv3", "cipher_server_preference" }; + local default_verifyext = { "lsec_continue", "lsec_ignore_purpose" }; + + if ssl and not luasec_has_verifyext and ssl.x509 then +@@ -56,6 +56,7 @@ + + if not ssl then return nil, "LuaSec (required for encryption) was not found"; end + if not user_ssl_config then return nil, "No SSL/TLS configuration present for "..host; end ++ if user_ssl_config.options then user_ssl_config.options.no_ticket = nil; end + + local ssl_config = { + mode = mode; +@@ -69,7 +70,6 @@ + verifyext = user_ssl_config.verifyext or default_verifyext; + options = user_ssl_config.options or default_options; + depth = user_ssl_config.depth; +- curve = user_ssl_config.curve or "secp384r1"; + ciphers = user_ssl_config.ciphers or "HIGH+kEDH:HIGH+kEECDH:HIGH:!PSK:!SRP:!3DES:!aNULL"; + dhparam = user_ssl_config.dhparam; + }; diff --git a/prosody.spec b/prosody.spec index 3905160..382bf71 100644 --- a/prosody.spec +++ b/prosody.spec @@ -18,6 +18,7 @@ Source5: prosody.tmpfilesd Source6: prosody-localhost.cfg.lua Source7: prosody-example.com.cfg.lua Patch0: prosody-0.9.8-config.patch +Patch1: prosody-0.9.8-rhel5.patch BuildRequires: libidn-devel, openssl-devel Requires(pre): shadow-utils %if 0%{?rhel} > 6 || 0%{?fedora} > 17 @@ -56,6 +57,9 @@ added functionality, or prototype new protocols. %prep %setup -q %patch0 -p1 -b .config +%if 0%{?rhel} == 5 +%patch1 -p1 +%endif %build # CFLAG -D_GNU_SOURCE requires fallocate() which requires GLIBC >= 2.10 -- cgit v0.10.2 http://pkgs.fedoraproject.org/cgit/prosody.git/commit/?h=epel7&id=7fbe1b6c7…

1 0

robert pushed to prosody (epel7). "Merge branch 'master' of ssh://pkgs.fedoraproject.org/prosody"
by notifications＠fedoraproject.org 01 Jul '15

01 Jul '15

1 0

robert pushed to prosody (f21). "- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild"
by notifications＠fedoraproject.org 01 Jul '15

01 Jul '15

1 0

robert pushed to prosody (f21). "Merge branch 'master' of ssh://pkgs.fedoraproject.org/prosody"
by notifications＠fedoraproject.org 01 Jul '15

01 Jul '15

1 0

robert pushed to prosody (f21). "Fixed the wrong logrotate configuration to not use a wildcard"
by notifications＠fedoraproject.org 01 Jul '15

01 Jul '15

1 0

robert pushed to prosody (f21). "Added patch to handle the old OpenSSL 0.9.8e in RHEL 5 (and derivates) as good as possible"
by notifications＠fedoraproject.org 01 Jul '15

01 Jul '15

1 0

robert pushed to prosody (f21). "Build EPEL 5 without CFLAG -D_GNU_SOURCE, because it requires fallocate() which requires GLIBC >= 2.10 (which is not in RHEL 5)"
by notifications＠fedoraproject.org 01 Jul '15

01 Jul '15

From b78c5c75e57323da321162efbc9b5459fdd46233 Mon Sep 17 00:00:00 2001 From: Robert Scheck <robert(a)fedoraproject.org> Date: Sat, 18 Apr 2015 23:29:39 +0200 Subject: Build EPEL 5 without CFLAG -D_GNU_SOURCE, because it requires fallocate() which requires GLIBC >= 2.10 (which is not in RHEL 5) diff --git a/prosody.spec b/prosody.spec index 96148a7..3905160 100644 --- a/prosody.spec +++ b/prosody.spec @@ -58,6 +58,7 @@ added functionality, or prototype new protocols. %patch0 -p1 -b .config %build +# CFLAG -D_GNU_SOURCE requires fallocate() which requires GLIBC >= 2.10 ./configure \ --prefix=%{_prefix} \ --libdir=%{_libdir} \ @@ -65,7 +66,11 @@ added functionality, or prototype new protocols. --with-lua-include=%{_includedir}/lua-%{luaver} \ --runwith=lua-%{luaver} \ %endif +%if 0%{?rhel} > 5 --cflags="$RPM_OPT_FLAGS -fPIC -D_GNU_SOURCE" \ +%else + --cflags="$RPM_OPT_FLAGS -fPIC" \ +%endif --ldflags="$RPM_LD_FLAGS -shared" \ --no-example-certs make %{?_smp_mflags} -- cgit v0.10.2 http://pkgs.fedoraproject.org/cgit/prosody.git/commit/?h=f21&id=b78c5c75e57…

1 0

← Newer
1
2
3
4
5
6
7
...
3703
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

scm-commits June 2015