[libnetdude] Fix FTBFS with -Werror=format-security (#1037170, #1106045)
Yaakov Selkowitz
yselkowitz at fedoraproject.org
Tue Jul 8 04:45:50 UTC 2014
commit 5db83651bbad08f1fee148298c655dbb05269eda
Author: Yaakov Selkowitz <yselkowitz at users.sourceforge.net>
Date: Mon Jun 30 15:02:56 2014 -0500
Fix FTBFS with -Werror=format-security (#1037170, #1106045)
libnetdude-0.11-format-security.patch | 13 +++++++++++++
libnetdude.spec | 16 ++++++++--------
2 files changed, 21 insertions(+), 8 deletions(-)
---
diff --git a/libnetdude-0.11-format-security.patch b/libnetdude-0.11-format-security.patch
new file mode 100644
index 0000000..2b3a328
--- /dev/null
+++ b/libnetdude-0.11-format-security.patch
@@ -0,0 +1,13 @@
+diff --git a/src/libnd_tcpdump.c b/src/libnd_tcpdump.c
+index 13bcf04..a3ecec2 100644
+--- a/src/libnd_tcpdump.c
++++ b/src/libnd_tcpdump.c
+@@ -119,7 +119,7 @@ tcpdump_fill_in_options(char *opt, char **opt_vec, int opt_size)
+ * to force buffer flushing in tcpdump from the outside ...
+ */
+
+- sprintf(p, tcpdump_dyn_opt);
++ sprintf(p, "%s", tcpdump_dyn_opt);
+ p = p + strlen(p);
+
+ sprintf(p, " " TCPDUMP_OPS_HARDCODED " -");
diff --git a/libnetdude.spec b/libnetdude.spec
index 7cad856..2d64520 100644
--- a/libnetdude.spec
+++ b/libnetdude.spec
@@ -1,6 +1,6 @@
Name: libnetdude
Version: 0.11
-Release: 9%{?dist}
+Release: 10%{?dist}
Summary: Management framework for pcap packet traces
Group: System Environment/Libraries
@@ -8,7 +8,8 @@ License: MIT with advertising
URL: http://netdude.sourceforge.net/
Source0: http://downloads.sourceforge.net/netdude/libnetdude-%{version}.tar.gz
Source1: libnetdude-lndtool-wrapper.sh
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# -Werror=format-security
+Patch0: libnetdude-0.11-format-security.patch
BuildRequires: glib-devel, libpcapnav-devel, gtk-doc >= 0.6, tcpdump, /bin/sed
BuildRequires: libpcap-devel
@@ -31,6 +32,7 @@ developing applications that use %{name}.
%prep
%setup -q
+%patch0 -p1
# Rewrite our wrapperscript to have a versioned directory
sed -e 's,###loc###,%{name}/%{version},' %{SOURCE1} > libnetdude-lndtool-wrapper.sh
@@ -47,7 +49,6 @@ make %{?_smp_mflags} docs
popd
%install
-rm -rf %{buildroot}
make install DESTDIR=%{buildroot} INSTALL="%{__install} -p"
# Wrapper workaround for conflicting binary
@@ -59,9 +60,6 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
mv %{buildroot}%{_datadir}/gtk-doc/html/%{name}/%{name}/* %{buildroot}%{_datadir}/gtk-doc/html/%{name}/
rm -rf %{buildroot}%{_datadir}/gtk-doc/html/%{name}/%{name}/
-%clean
-rm -rf %{buildroot}
-
%post -p /sbin/ldconfig
@@ -69,13 +67,11 @@ rm -rf %{buildroot}
%files
-%defattr(-,root,root,-)
%doc README COPYING
%{_libdir}/*.so.*
%{_libdir}/%{name}/
%files devel
-%defattr(-,root,root,-)
%doc README COPYING ChangeLog TODO
%{_bindir}/lndtool
%{_includedir}/*
@@ -84,6 +80,10 @@ rm -rf %{buildroot}
%{_datadir}/gtk-doc/html/%{name}/
%changelog
+* Mon Jun 30 2014 Yaakov Selkowitz <yselkowi at redhat.com> - 0.11-10
+- Fix FTBFS with -Werror=format-security (#1037170, #1106045)
+- Cleanup spec
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.11-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
More information about the scm-commits
mailing list