[rtpproxy] Fixed FTBFS in F20+
Peter Lemenkov
peter at fedoraproject.org
Tue Dec 3 10:04:58 UTC 2013
commit 964d827feff9c7d6f9f87975b151256a4cdcf5c9
Author: Peter Lemenkov <lemenkov at gmail.com>
Date: Tue Dec 3 14:04:50 2013 +0400
Fixed FTBFS in F20+
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
rtpproxy-0001-Add-basic-sysconfig-file.patch | 13 +
...tial-commit-of-files-required-for-systemd.patch | 53 -
...mit-of-files-required-for-running-with-sy.patch | 33 +
...roxy-0002-Remove-more-autogenerated-stuff.patch |19266 --------------------
rtpproxy-0003-Initial-support-for-bcg729.patch | 10 +-
...-users-write-to-the-controlling-UNIX-sock.patch | 11 +-
...-0005-Fedora-related-fix-for-docbook-path.patch | 9 +-
...dated-SysV-init-script-for-legacy-systems.patch | 9 +-
rtpproxy-0007-Remove-AC_PROG_MKDIR_P-in-EL5.patch | 9 +-
...FS-if-Werror-format-security-flag-is-used.patch | 21 +
rtpproxy.spec | 18 +-
11 files changed, 85 insertions(+), 19367 deletions(-)
---
diff --git a/rtpproxy-0001-Add-basic-sysconfig-file.patch b/rtpproxy-0001-Add-basic-sysconfig-file.patch
new file mode 100644
index 0000000..f4980df
--- /dev/null
+++ b/rtpproxy-0001-Add-basic-sysconfig-file.patch
@@ -0,0 +1,13 @@
+From: Peter Lemenkov <lemenkov at gmail.com>
+Date: Wed, 21 Nov 2012 14:07:00 +0400
+Subject: [PATCH] Add basic sysconfig file
+
+Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
+
+diff --git a/rpm/rtpproxy.sysconfig b/rpm/rtpproxy.sysconfig
+new file mode 100644
+index 0000000..9186ef7
+--- /dev/null
++++ b/rpm/rtpproxy.sysconfig
+@@ -0,0 +1 @@
++OPTIONS=""
diff --git a/rtpproxy-0002-Initial-commit-of-files-required-for-running-with-sy.patch b/rtpproxy-0002-Initial-commit-of-files-required-for-running-with-sy.patch
new file mode 100644
index 0000000..6c4c728
--- /dev/null
+++ b/rtpproxy-0002-Initial-commit-of-files-required-for-running-with-sy.patch
@@ -0,0 +1,33 @@
+From: Peter Lemenkov <lemenkov at gmail.com>
+Date: Wed, 21 Nov 2012 14:07:00 +0400
+Subject: [PATCH] Initial commit of files required for running with systemd
+
+Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
+
+diff --git a/rpm/rtpproxy.service b/rpm/rtpproxy.service
+new file mode 100644
+index 0000000..92a0805
+--- /dev/null
++++ b/rpm/rtpproxy.service
+@@ -0,0 +1,14 @@
++[Unit]
++Description=A symmetric RTP proxy
++After=network.target
++
++[Service]
++Type=simple
++User=rtpproxy
++Group=rtpproxy
++EnvironmentFile=/etc/sysconfig/rtpproxy
++PIDFile=/var/run/rtpproxy/rtpproxy.pid
++ExecStart=/usr/bin/rtpproxy -f -p /var/run/rtpproxy/rtpproxy.pid $OPTIONS
++
++[Install]
++WantedBy=multi-user.target
+diff --git a/rpm/rtpproxy.tmpfiles.conf b/rpm/rtpproxy.tmpfiles.conf
+new file mode 100644
+index 0000000..5e4143f
+--- /dev/null
++++ b/rpm/rtpproxy.tmpfiles.conf
+@@ -0,0 +1 @@
++d /var/run/rtpproxy 0755 rtpproxy rtpproxy
diff --git a/rtpproxy-0003-Initial-support-for-bcg729.patch b/rtpproxy-0003-Initial-support-for-bcg729.patch
index b43f181..eb1a468 100644
--- a/rtpproxy-0003-Initial-support-for-bcg729.patch
+++ b/rtpproxy-0003-Initial-support-for-bcg729.patch
@@ -1,13 +1,8 @@
-From d2cecb3fb1b8aa8e6d91bed844b0564f0593ecf3 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Wed, 21 Nov 2012 14:20:11 +0400
-Subject: [PATCH 3/7] Initial support for bcg729
+Subject: [PATCH] Initial support for bcg729
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
----
- configure.ac | 6 +++---
- makeann.c | 12 ++++++++----
- 2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/configure.ac b/configure.ac
index 508c51f..00919c1 100644
@@ -78,6 +73,3 @@ index b33b772..f48cd28 100644
+
return 0;
}
---
-1.8.1
-
diff --git a/rtpproxy-0004-Allow-group-users-write-to-the-controlling-UNIX-sock.patch b/rtpproxy-0004-Allow-group-users-write-to-the-controlling-UNIX-sock.patch
index 7c4d0e0..318dd85 100644
--- a/rtpproxy-0004-Allow-group-users-write-to-the-controlling-UNIX-sock.patch
+++ b/rtpproxy-0004-Allow-group-users-write-to-the-controlling-UNIX-sock.patch
@@ -1,7 +1,6 @@
-From c5eb808da0a29539d0dfc887dc2c8b54c9b5ecaa Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Sun, 19 Sep 2010 15:33:31 +0400
-Subject: [PATCH 4/7] Allow group users write to the controlling UNIX-socket.
+Subject: [PATCH] Allow group users write to the controlling UNIX-socket.
No visible changes for BSD users, so this is Linux-only
related issue. See this RHBZ for rationale:
@@ -9,12 +8,9 @@ related issue. See this RHBZ for rationale:
https://bugzilla.redhat.com/626863
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
----
- main.c | 2 ++
- 1 file changed, 2 insertions(+)
diff --git a/main.c b/main.c
-index 58b3a28..75b3031 100644
+index 31f3d5b..b12babf 100644
--- a/main.c
+++ b/main.c
@@ -420,6 +420,8 @@ init_controlfd(struct cfg *cf)
@@ -26,6 +22,3 @@ index 58b3a28..75b3031 100644
if (listen(controlfd, 32) != 0)
err(1, "can't listen on a socket");
} else {
---
-1.8.1
-
diff --git a/rtpproxy-0005-Fedora-related-fix-for-docbook-path.patch b/rtpproxy-0005-Fedora-related-fix-for-docbook-path.patch
index 294c617..8b4f898 100644
--- a/rtpproxy-0005-Fedora-related-fix-for-docbook-path.patch
+++ b/rtpproxy-0005-Fedora-related-fix-for-docbook-path.patch
@@ -1,12 +1,8 @@
-From 80fd318a63775fd2eacd69ae953c2cf9760145ee Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Wed, 21 Nov 2012 14:30:12 +0400
-Subject: [PATCH 5/7] Fedora-related fix for docbook path
+Subject: [PATCH] Fedora-related fix for docbook path
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
----
- Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile.am b/Makefile.am
index 258de5e..c321db8 100644
@@ -18,6 +14,3 @@ index 258de5e..c321db8 100644
rtpproxy.8: manpage.xml
- xsltproc /usr/local/share/xsl/docbook/manpages/docbook.xsl manpage.xml
+ xsltproc /usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl manpage.xml
---
-1.8.1
-
diff --git a/rtpproxy-0006-Updated-SysV-init-script-for-legacy-systemd.patch b/rtpproxy-0006-Updated-SysV-init-script-for-legacy-systems.patch
similarity index 90%
rename from rtpproxy-0006-Updated-SysV-init-script-for-legacy-systemd.patch
rename to rtpproxy-0006-Updated-SysV-init-script-for-legacy-systems.patch
index 351f42d..2916c1c 100644
--- a/rtpproxy-0006-Updated-SysV-init-script-for-legacy-systemd.patch
+++ b/rtpproxy-0006-Updated-SysV-init-script-for-legacy-systems.patch
@@ -1,12 +1,8 @@
-From d0279a15571d8955a7261e08c74d136086d9d814 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Tue, 22 Jan 2013 16:03:44 +0400
-Subject: [PATCH 6/7] Updated SysV init-script for legacy systemd
+Subject: [PATCH] Updated SysV init-script for legacy systems
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
----
- rpm/rtpproxy.init | 84 +++++++++++++++++++++++++++----------------------------
- 1 file changed, 41 insertions(+), 43 deletions(-)
diff --git a/rpm/rtpproxy.init b/rpm/rtpproxy.init
index 47d6977..d25158a 100644
@@ -133,6 +129,3 @@ index 47d6977..d25158a 100644
esac
exit $RETVAL
---
-1.8.1
-
diff --git a/rtpproxy-0007-Remove-AC_PROG_MKDIR_P-in-EL5.patch b/rtpproxy-0007-Remove-AC_PROG_MKDIR_P-in-EL5.patch
index 993a1dc..f0d6a80 100644
--- a/rtpproxy-0007-Remove-AC_PROG_MKDIR_P-in-EL5.patch
+++ b/rtpproxy-0007-Remove-AC_PROG_MKDIR_P-in-EL5.patch
@@ -1,12 +1,8 @@
-From c6d6864aa6da38a644e7ec5b43346485b783457f Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Tue, 22 Jan 2013 16:55:13 +0400
-Subject: [PATCH 7/7] Remove AC_PROG_MKDIR_P in EL5
+Subject: [PATCH] Remove AC_PROG_MKDIR_P in EL5
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
----
- configure.ac | 1 -
- 1 file changed, 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 00919c1..f46805b 100644
@@ -20,6 +16,3 @@ index 00919c1..f46805b 100644
case "${host_os}" in
freebsd*)
---
-1.8.1
-
diff --git a/rtpproxy-0008-Fix-FTBFS-if-Werror-format-security-flag-is-used.patch b/rtpproxy-0008-Fix-FTBFS-if-Werror-format-security-flag-is-used.patch
new file mode 100644
index 0000000..78ea28a
--- /dev/null
+++ b/rtpproxy-0008-Fix-FTBFS-if-Werror-format-security-flag-is-used.patch
@@ -0,0 +1,21 @@
+From: Peter Lemenkov <lemenkov at gmail.com>
+Date: Tue, 3 Dec 2013 13:35:06 +0400
+Subject: [PATCH] Fix FTBFS if -Werror=format-security flag is used
+
+https://bugzilla.redhat.com/1037311
+
+Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
+
+diff --git a/rtpp_syslog_async.c b/rtpp_syslog_async.c
+index d7fcaee..7afbfa5 100644
+--- a/rtpp_syslog_async.c
++++ b/rtpp_syslog_async.c
+@@ -83,7 +83,7 @@ syslog_queue_run(void)
+ /* main work here */
+ switch (wi->item_type) {
+ case SYSLOG_ITEM_ASYNC_WRITE:
+- syslog(wi->priority, wi->data);
++ syslog(wi->priority, "%s", wi->data);
+ break;
+
+ case SYSLOG_ITEM_ASYNC_EXIT:
diff --git a/rtpproxy.spec b/rtpproxy.spec
index 5f9e34f..f08567b 100644
--- a/rtpproxy.spec
+++ b/rtpproxy.spec
@@ -1,6 +1,6 @@
Name: rtpproxy
Version: 1.2.1
-Release: 13.git2121113%{?dist}
+Release: 14.git2121113%{?dist}
Summary: A symmetric RTP proxy
Group: Applications/Internet
License: BSD
@@ -13,14 +13,16 @@ VCS: git://git.code.sf.net/p/sippy/rtpproxy
## cd rtpproxy
## git archive --format=tar --prefix=rtpproxy-1.2.1/ "fff62d0c4de4a52bc1703be46f446bcb1a06f17f" | gzip > ../rtpproxy-1.2.1-git.tar.gz
Source0: %{name}-%{version}-git.tar.gz
-Patch1: rtpproxy-0001-Initial-commit-of-files-required-for-systemd.patch
-Patch2: rtpproxy-0002-Remove-more-autogenerated-stuff.patch
+Patch1: rtpproxy-0001-Add-basic-sysconfig-file.patch
+Patch2: rtpproxy-0002-Initial-commit-of-files-required-for-running-with-sy.patch
Patch3: rtpproxy-0003-Initial-support-for-bcg729.patch
# See https://bugzilla.redhat.com/626863
Patch4: rtpproxy-0004-Allow-group-users-write-to-the-controlling-UNIX-sock.patch
Patch5: rtpproxy-0005-Fedora-related-fix-for-docbook-path.patch
-Patch6: rtpproxy-0006-Updated-SysV-init-script-for-legacy-systemd.patch
+Patch6: rtpproxy-0006-Updated-SysV-init-script-for-legacy-systems.patch
Patch7: rtpproxy-0007-Remove-AC_PROG_MKDIR_P-in-EL5.patch
+# See https://bugzilla.redhat.com/1037311
+Patch8: rtpproxy-0008-Fix-FTBFS-if-Werror-format-security-flag-is-used.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if 0%{?el7}%{?fedora}
BuildRequires: systemd
@@ -54,8 +56,8 @@ rewriting SDP bodies in SIP messages that it processes.
%prep
%setup -q
-%patch1 -p1 -b .systemd
-%patch2 -p1 -b .drop_autogenerated
+%patch1 -p1 -b .sysconfig
+%patch2 -p1 -b .systemd
%patch3 -p1 -b .sypport_for_g729_if_available
%patch4 -p1 -b .allow_rw_for_group
%patch5 -p1 -b .fix_docbook_path
@@ -63,6 +65,7 @@ rewriting SDP bodies in SIP messages that it processes.
%if 0%{?el5}
%patch7 -p1 -b .remove_unsupported
%endif
+%patch8 -p1 -b .fix_str_fmt
%build
@@ -135,6 +138,9 @@ fi
%changelog
+* Tue Dec 03 2013 Peter Lemenkov <lemenkov at gmail.com> - 1.2.1-14.git2121113
+- Fixed FTBFS in F20+
+
* Sat Aug 31 2013 Peter Lemenkov <lemenkov at gmail.com> - 1.2.1-13.git2121113
- Spec-file cleanups
- Added systemd-macros where necessary
More information about the scm-commits
mailing list