Hello community,
here is the log from the commit of package dvb for openSUSE:Factory checked in
at 2015-01-09 20:50:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/dvb (Old)
and /work/SRC/openSUSE:Factory/.dvb.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dvb"
Changes:
--------
--- /work/SRC/openSUSE:Factory/dvb/dvb.changes 2013-12-16 15:47:39.000000000
+0100
+++ /work/SRC/openSUSE:Factory/.dvb.new/dvb.changes 2015-01-09
20:50:45.000000000 +0100
@@ -1,0 +2,6 @@
+Thu Jan 1 23:04:48 UTC 2015 - seife+...@b1-systems.com
+
+- add dvb-scan-dont-segfault.patch to avoid dvbscan segfault in
+ usage message if called without any parameter
+
+-------------------------------------------------------------------
New:
----
dvb-scan-dont-segfault.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ dvb.spec ++++++
--- /var/tmp/diff_new_pack.zsojKE/_old 2015-01-09 20:50:46.000000000 +0100
+++ /var/tmp/diff_new_pack.zsojKE/_new 2015-01-09 20:50:46.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package dvb
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -42,6 +42,8 @@
Patch2: dvb-femon-01-status-is-common.patch
Patch3: dvb-femon-02-SNR-in-dB.patch
Patch4: dvb-femon-03-handle-EOPNOTSUPP.patch
+# PATCH-FIX-OPENSUSE: dvb-scan-dont-segfault.patch, upstream is basically
dead, but still avoid insstant segfault in usage() function -- seife
+Patch5: dvb-scan-dont-segfault.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: dtv-scan-tables
@@ -67,6 +69,7 @@
%patch2 -p1
%patch3 -p1
%patch4 -p1
+%patch5 -p1
find -name .hg -type d | xargs rm -rfv
find -name .cvsignore -type f | xargs rm -fv
find -name '*.orig' -type f | xargs rm -fv
++++++ dvb-scan-dont-segfault.patch ++++++
"dvbscan" without parameters segfaults in the usage() message.
Just a cosmetic issue, but still worth fixing :-)
Because upstream is basically dead and uses an arcane version control,
this patch is not yet upstream.
Author: Stefan Seyfried <seife+...@b1-systems.com>
Date: 2015-01-01
Index: b/util/scan/scan.c
===================================================================
--- a/util/scan/scan.c
+++ b/util/scan/scan.c
@@ -2580,7 +2580,7 @@ bad_usage(char *pname, int problem)
break;
case 2:
show_existing_tuning_data_files();
- fprintf (stderr, usage, pname);
+ fprintf (stderr, usage, pname, output_charset);
}
}
@@ -2594,11 +2594,6 @@ int main (int argc, char **argv)
const char *initial = NULL;
char *charset;
- if (argc <= 1) {
- bad_usage(argv[0], 2);
- return -1;
- }
-
/*
* Get the environment charset, and use it as the default
* output charset. In thesis, using nl_langinfo should be
@@ -2619,6 +2614,11 @@ int main (int argc, char **argv)
} else
output_charset = nl_langinfo(CODESET);
+ if (argc <= 1) {
+ bad_usage(argv[0], 2);
+ return -1;
+ }
+
/* start with default lnb type */
lnb_type = *lnb_enum(0);
while ((opt = getopt(argc, argv,
"5cnpa:f:d:s:o:x:e:t:i:l:vquPA:UC:D:")) != -1) {
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
