Import Debian changes 2.1.2-ok1

libraw1394 (2.1.2-ok1) yangtze; urgency=medium

  * Build for openKylin.
This commit is contained in:
openKylinBot 2022-04-25 22:03:04 +08:00
parent fdc5ebc302
commit a2bd834a01
23 changed files with 527 additions and 0 deletions

46
debian/README.Debian vendored Normal file
View File

@ -0,0 +1,46 @@
libraw1394 for Debian
---------------------
This library supports both the old Firewire stack and the new "juju" stack.
The new stack is recommended if you are using Linux kernel versions >= 2.6.33.
Before all, you must verify if your actual linux kernel is built with
ieee1394 and raw1394 support. Generaly, if you use a debian linux kernel
package, it is the case, but you can know that with this command:
grep FIREWIRE /boot/config-`uname -r`
grep IEEE1394 /boot/config-`uname -r`
If these features are available in you kernel, you may see these lines:
CONFIG_FIREWIRE=y/m (new stack)
CONFIG_IEEE1394=y/m (old stack)
CONFIG_IEEE1394_RAWIO=y/m (old stack)
If these features are compiled as modules, you might need to load the modules.
You can do that with this command:
sudo modprobe firewire (new stack)
sudo modprobe raw1394 (old stack)
With the old stack, the device file /dev/raw1394 will be created for
libraw1394. This library is used by applications to access FireWire devices.
The default access permissions allows only users in the "disk" group. This
restrictive setting was chosen since raw1394 allows almost full access to the
FireWire bus and all connected devices are accessible, which may include hard
disks.
You can add your user in the "disk" group with this command:
sudo adduser <user> disk
If you don't intend to connect sensitive devices and e.g. only want to get
video streams out of a camera, you can relax the permissions. If you don't
have malicious users on your system, you can allow access for all users with
this command:
sudo chmod 666 /dev/raw1394
With the new stack, the FireWire devices are accessed through the /dev/fw*
files.

5
debian/changelog vendored Normal file
View File

@ -0,0 +1,5 @@
libraw1394 (2.1.2-ok1) yangtze; urgency=medium
* Build for openKylin.
-- openKylinBot <openKylinBot@openkylin.com> Mon, 25 Apr 2022 22:03:04 +0800

1
debian/compat vendored Normal file
View File

@ -0,0 +1 @@
9

88
debian/control vendored Normal file
View File

@ -0,0 +1,88 @@
Source: libraw1394
Priority: optional
Maintainer: Guus Sliepen <guus@debian.org>
Build-Depends: debhelper (>= 9), dh-autoreconf, dpkg-dev (>= 1.16.1~)
Build-Depends-Indep: docbook-utils, docbook-xml
Standards-Version: 3.9.7
Section: libs
Homepage: https://ieee1394.wiki.kernel.org/
Package: libraw1394-dev
Section: libdevel
Multi-Arch: same
Architecture: linux-any
Depends: libraw1394-11 (= ${binary:Version}), ${misc:Depends}
Recommends: libraw1394-tools
Suggests: libraw1394-doc
Description: library for direct access to IEEE 1394 bus - development files
libraw1394 is the only supported interface to the kernel side raw1394
of the Linux IEEE-1394 subsystem, which provides direct access to the
connected 1394 buses to user space. Through libraw1394/raw1394,
applications can directly send to and receive from other nodes without
requiring a kernel driver for the protocol in question.
.
This package contains the include files, static library and development
tools for libraw1394.
Package: libraw1394-doc
Architecture: all
Section: doc
Depends: ${misc:Depends}
Description: Reference manual and documentation about libraw1394
libraw1394 is the only supported interface to the kernel side raw1394
of the Linux IEEE-1394 subsystem, which provides direct access to the
connected 1394 buses to user space. Through libraw1394/raw1394,
applications can directly send to and receive from other nodes without
requiring a kernel driver for the protocol in question.
.
This package contains documentation for libraw1394, as well as
the programmer's documentation.
Package: libraw1394-11
Section: libs
Architecture: linux-any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Suggests: libraw1394-doc
Description: library for direct access to IEEE 1394 bus (aka FireWire)
libraw1394 is the only supported interface to the kernel side raw1394
of the Linux IEEE-1394 subsystem, which provides direct access to the
connected 1394 buses to user space. Through libraw1394/raw1394,
applications can directly send to and receive from other nodes without
requiring a kernel driver for the protocol in question.
Package: libraw1394-11-dbg
Section: debug
Priority: extra
Architecture: linux-any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: libraw1394-11 (= ${binary:Version}), ${misc:Depends}
Suggests: libraw1394-doc
Description: debugging symbols for libraw1394-11
libraw1394 is the only supported interface to the kernel side raw1394
of the Linux IEEE-1394 subsystem, which provides direct access to the
connected 1394 buses to user space. Through libraw1394/raw1394,
applications can directly send to and receive from other nodes without
requiring a kernel driver for the protocol in question.
.
This package contains the debugging symbols for libraw1394-11.
Package: libraw1394-tools
Section: utils
Architecture: linux-any
Multi-Arch: foreign
Depends: libraw1394-11 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Suggests: libraw1394-doc
Breaks: libraw1394-dev (<= 2.0.7-0)
Replaces: libraw1394-dev (<= 2.0.7-0)
Description: library for direct access to IEEE 1394 bus (aka FireWire)
libraw1394 is the only supported interface to the kernel side raw1394
of the Linux IEEE-1394 subsystem, which provides direct access to the
connected 1394 buses to user space. Through libraw1394/raw1394,
applications can directly send to and receive from other nodes without
requiring a kernel driver for the protocol in question.
.
This package contains various utilities for that use libraw1394, including
the testlibraw program.

181
debian/copyright vendored Normal file
View File

@ -0,0 +1,181 @@
This package was debianized by Ludovic RESLINGER <lr@cuivres.net> on
Sun, 10 Sep 2006 16:08:19 +0200.
It was downloaded from: https://www.kernel.org/pub/linux/libs/ieee1394/
Upstream Authors: Andreas BOMBE <andreas.bombe@munich.netsurf.de>
Dan DENNEDY <dan@dennedy.org>
Copyright Holders:
Upstream maintainer:
Dan DENNEDY <dan@dennedy.org>
Original author:
Andreas BOMBE 1999-2004 <andreas.bombe@munich.netsurf.de>
Contributors:
Manfred WEIHS 1999-2004 <weihs@ict.tuwien.ac.at>
Christian TOEGLE 1999-2004 <christian.toegel@gmx.at>
Dan MAAS 1999-2004 <dmaas@maasdigital.com>
Ben COLLINS 2003-2004 <bcollins@debian.org>
Kristian Hoegsberg 2007 <krh@bitplanet.net>
License:
This package is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
This package is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this package; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
On Debian systems, the complete text of the GNU Lesser General
Public License can be found in `/usr/share/common-licenses/LGPL'.
Others Licences:
- GPLv2 or higher
This package is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This package is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this package; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
On Debian systems, the complete text of the GNU General
Public License can be found in `/usr/share/common-licenses/GPL'.
The following files are licensed under GPL Licence:
- Makefile.in
- aclocal.m4
- config.guess
- config.sub
- configure
- depcomp
- ltmain.sh
- missing
- doc/Makefile.in
- src/Makefile.in
- tools/Makefile.in
- MIT/X11
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to
deal in the Software without restriction, including without limitation the
rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
sell copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
The following file is licensed under MIT Licence:
- install-sh
The Debian packaging is (C) 2006, Ludovic RESLINGER <lr@cuivres.net> and
is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
All others files are licenced under LGPL Licence (v2.1 or higher).
Copyright notices:
- Makefile.in
Copyright (C) 1994-2005 Free Software Foundation, Inc.
- aclocal.m4
Copyright (C) 1996-2005 Free Software Foundation, Inc.
- COPYING.LIB
Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- config.guess
Copyright (C) 1992-2005 Free Software Foundation, Inc.
- config.sub
Copyright (C) 1992-2005 Free Software Foundation, Inc.
- configure
Copyright (C) 2003 Free Software Foundation, Inc.
- depcomp
Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
- INSTALL
Copyright (C) 1994-2005 Free Software Foundation, Inc.
- install-sh
Copyright (C) 1994 X Consortium
- ltmain.sh
Copyright (C) 1996 Gordon MATZIGKEIT <gord@gnu.ai.mit.edu>
Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005 Free Software Foundation, Inc.
- missing
Copyright (C) 1996 Fran,cois PINARD <pinard@iro.umontreal.ca>
Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc
- doc/Makefile.in
Copyright (C) 1994-2005 Free Software Foundation, Inc.
- doc/dumpiso.1.in
doc/sendiso.1.in
doc/testlibraw.1.in
doc/isodump.5.in
Copyright (C) 1999-2000 Andreas BOMBE <andreas.bombe@munich.netsurf.de>
- doc/libraw1394.sgml
Copyright (C) 2001-2004 Andreas BOMBE <andreas.bombe@munich.netsurf.de>
Copyright (C) 2001-2004 Dan MAAS <dmaas@maasdigital.com>
Copyright (C) 2001-2004 Manfred WEIHS <weihs@ict.tuwien.ac.at>
Copyright (C) 2001-2004 Christian TOEGLE <christian.toegel@gmx.at>
- src/Makefile.in
Copyright (C) 1994-2005 Free Software Foundation, Inc.
- src/arm.c
Copyright (C) 2002 Christian TOEGLE <christian.toegel@gmx.at>
Copyright (C) 2002 Manfred WEIHS <weihs@ict.tuwien.ac.at>
- src/errors.c
Copyright (C) 1999-2002 Andreas BOMBE <andreas.bombe@munich.netsurf.de>
- src/eventloop.c
Copyright (C) 1999-2002 Andreas BOMBE <andreas.bombe@munich.netsurf.de>
Copyright (C) 2002 Manfred WEIHS <weihs@ict.tuwien.ac.at>
Copyright (C) 2002 Christian TOEGLE <christian.toegel@gmx.at>
- src/fcp.c
Copyright (C) 1999-2002 Andreas BOMBE <andreas.bombe@munich.netsurf.de>
- src/fw.c
src/fw.h
src/fw-iso.c
Copyright (C) 2007 Kristian Hoegsberg <krh@bitplanet.net>
- src/iso.c
Copyright (C) 1999-2002 Andreas BOMBE <andreas.bombe@munich.netsurf.de>
Copyright (C) 1999-2002 Dan MAAS <dmaas@maasdigital.com>
- src/main.c
Copyright (C) 1999-2002 Andreas BOMBE <andreas.bombe@munich.netsurf.de>
Copyright (C) 2002 Christian TOEGLE <christian.toegel@gmx.at>
Copyright (C) 2001- 2002 Manfred WEIHS <weihs@ict.tuwien.ac.at>
- src/raw1394.h
src/raw1394_private.h
src/kernel-raw1394.h
src/ieee1394.h
src/ieee1394-ioctl.h
src/csr.h
Copyright (C) 1999-2004 Andreas BOMBE <andreas.bombe@munich.netsurf.de>
Copyright (C) 1999-2004 Dan MAAS <dmaas@maasdigital.com>
Copyright (C) 1999-2004 Christian TOEGLE <christian.toegel@gmx.at>
Copyright (C) 1999-2004 Manfred WEIHS <weihs@ict.tuwien.ac.at>
- src/readwrite.c
Copyright (C) 1999-2002 Andreas BOMBE <andreas.bombe@munich.netsurf.de>
Copyright (C) 2002 Christian TOEGLE <christian.toegel@gmx.at>
Copyright (C) 2002 Manfred WEIHS <weihs@ict.tuwien.ac.at>
- src/version.c
Copyright (C) 1999-2002 Andreas BOMBE <andreas.bombe@munich.netsurf.de>
- tools/Makefile.in
Copyright (C) 1994-2005 Free Software Foundation, Inc.
- tools/dumpiso.c
tools/sendiso.c
tools/testlibraw.c
Copyright (C) 1999-2000 Andreas BOMBE <andreas.bombe@munich.netsurf.de>

1
debian/libraw1394-11.dirs vendored Normal file
View File

@ -0,0 +1 @@
usr/lib

4
debian/libraw1394-11.docs vendored Normal file
View File

@ -0,0 +1,4 @@
AUTHORS
NEWS
README
debian/README.Debian

1
debian/libraw1394-11.install vendored Normal file
View File

@ -0,0 +1 @@
usr/lib/*/lib*.so.*

4
debian/libraw1394-dev.dirs vendored Normal file
View File

@ -0,0 +1,4 @@
usr/lib
usr/include
usr/share/man/man1
usr/share/man/man5

3
debian/libraw1394-dev.docs vendored Normal file
View File

@ -0,0 +1,3 @@
AUTHORS
NEWS
README

5
debian/libraw1394-dev.install vendored Normal file
View File

@ -0,0 +1,5 @@
usr/include/*
usr/lib/*/lib*.a
usr/lib/*/lib*.so
usr/lib/*/pkgconfig/*
usr/lib/*/*.la

1
debian/libraw1394-doc.dirs vendored Normal file
View File

@ -0,0 +1 @@
/usr/share/doc/

6
debian/libraw1394-doc.docs vendored Normal file
View File

@ -0,0 +1,6 @@
AUTHORS
doc/libraw1394
doc/libraw1394.pdf
NEWS
README
debian/README.Debian

3
debian/libraw1394-tools.docs vendored Normal file
View File

@ -0,0 +1,3 @@
AUTHORS
NEWS
README

3
debian/libraw1394-tools.install vendored Normal file
View File

@ -0,0 +1,3 @@
usr/bin/*
usr/share/man/man1/*
usr/share/man/man5/*

2
debian/libraw1394-tools.manpages vendored Normal file
View File

@ -0,0 +1,2 @@
usr/share/man/man1/*
usr/share/man/man5/*

View File

@ -0,0 +1,26 @@
From 15fc7175ab173b94dbd8f5f6e1300300e4b4433f Mon Sep 17 00:00:00 2001
From: Guus Sliepen <guus@sliepen.eu.org>
Date: Sun, 19 Feb 2012 19:02:40 +0100
Subject: [PATCH 1/2] Remove UTF-8 whitespace.
Found by cppcheck.
---
src/readwrite.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/readwrite.c b/src/readwrite.c
index e86f70b..003d280 100644
--- a/src/readwrite.c
+++ b/src/readwrite.c
@@ -33,7 +33,7 @@
#if HAVE_VALGRIND_VALGRIND_H
# include <valgrind/memcheck.h>
# ifndef VALGRIND_MAKE_MEM_DEFINED_IF_ADDRESSABLE
-#  define VALGRIND_MAKE_MEM_DEFINED_IF_ADDRESSABLE(m, n) do {} while(0)
+# define VALGRIND_MAKE_MEM_DEFINED_IF_ADDRESSABLE(m, n) do {} while(0)
# endif
#else
# define VALGRIND_MAKE_MEM_DEFINED_IF_ADDRESSABLE(m, n) do {} while(0)
--
1.7.9

View File

@ -0,0 +1,25 @@
From 969657885f0505de28df3e49fa5463d585884387 Mon Sep 17 00:00:00 2001
From: Guus Sliepen <guus@sliepen.eu.org>
Date: Sun, 19 Feb 2012 19:04:16 +0100
Subject: [PATCH 2/2] Fix incorrect use of == instead of =.
---
src/fw.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/fw.c b/src/fw.c
index 1131d23..03fae66 100644
--- a/src/fw.c
+++ b/src/fw.c
@@ -851,7 +851,7 @@ handle_arm_request(raw1394handle_t handle, struct address_closure *ac,
rrb = malloc(sizeof *rrb + in_length + response.length);
if (rrb == NULL) {
- errno == ENOMEM;
+ errno = ENOMEM;
return -1;
}
--
1.7.9

103
debian/patches/fix-sgml-documentation vendored Normal file
View File

@ -0,0 +1,103 @@
Reported by Guus Sliepen: "make doc" failed due to missing doctype,
unknown elements, and duplicate element IDs in libraw1394.sgml.
The fix is to declare a recent DTD (matching the one which is used
in current Linux kernel documentation docbooks) and to make the
conflicting element IDs unique.
The latter part of the fix is just temporary. In order to avoid the
conflict when the documentation is updated the next time, also fix the
kerneldoc comments of the respective API elements: These are typedefs,
hence kernel-doc needs their comments prepended by "typedef ".
Tested with Gentoo's docbook-xml-dtd 4.5, docbook-xsl-stylesheets
1.75.2, docbook-sgml-utils 0.6.14, and openjade 1.3.2-r1.
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
---
Guus, does this work for you?
doc/libraw1394.sgml | 10 +++++-----
src/raw1394.h | 18 +++++++-----------
2 files changed, 12 insertions(+), 16 deletions(-)
diff --git a/doc/libraw1394.sgml b/doc/libraw1394.sgml
index d5c11bf..88e97e9 100644
--- a/doc/libraw1394.sgml
+++ b/doc/libraw1394.sgml
@@ -1,6 +1,6 @@
-<!--
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V3.1//EN">
--->
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
+ "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" []>
<book>
<bookinfo>
@@ -3184,7 +3184,7 @@
</refsect1>
</refentry>
-<refentry id="API-int">
+<refentry id="API-req_callback_t">
<refentryinfo>
<title>LINUX</title>
<productname>Kernel Hackers Manual</productname>
@@ -3231,7 +3231,7 @@
</refsect1>
</refentry>
-<refentry id="API-int">
+<refentry id="API-arm_req_callback_t">
<refentryinfo>
<title>LINUX</title>
<productname>Kernel Hackers Manual</productname>
diff --git a/src/raw1394.h b/src/raw1394.h
index 7bfeb05..99d8d40 100644
--- a/src/raw1394.h
+++ b/src/raw1394.h
@@ -699,12 +699,11 @@ typedef int (*fcp_handler_t)(raw1394handle_t, nodeid_t nodeid, int response,
fcp_handler_t raw1394_set_fcp_handler(raw1394handle_t handle, fcp_handler_t new_h);
/**
- * req_callback_t - This is the general request handler
- * @req_callback_t: This is the general request handler
+ * typedef req_callback_t - This is the general request handler
*
- * It is used by the default tag handler
- * when a request completes, it calls the callback and passes it the data
- * pointer and the error code of the request.
+ * Used by the default tag handler. When a request completes, it calls
+ * the callback and passes it the libraw1394 handle, the data pointer,
+ * and the error code of the request.
**/
typedef int (*req_callback_t)(raw1394handle_t, void *data,
raw1394_errcode_t err);
@@ -715,13 +714,10 @@ struct raw1394_reqhandle {
};
/**
- * arm_req_callback_t - This is the general arm-request handle
- * @arm_req_callback_t: This is the general arm-request handle
- * @handle: libraw1394 handle
+ * typedef arm_req_callback_t - This is the general arm-request handle
*
- * (arm = address range mapping)
- * It is used by the default arm-tag handler when a request has been
- * received, it calls the arm_callback.
+ * Used by the default arm-tag handler (arm = address range mapping).
+ * Called when a request has been received.
**/
typedef int (*arm_req_callback_t) (raw1394handle_t,
struct raw1394_arm_request_response *arm_req_resp,
--
1.6.4.4
--
Stefan Richter
-=====-==-=- ---= -=--=
http://arcgraph.de/sr/

0
debian/patches/series vendored Normal file
View File

16
debian/rules vendored Executable file
View File

@ -0,0 +1,16 @@
#!/usr/bin/make -f
%:
dh $@ --parallel --with autoreconf
override_dh_auto_build-indep:
$(MAKE) -C doc libraw1394.pdf libraw1394
override_dh_strip:
dh_strip --dbg-package=libraw1394-11-dbg
override_dh_clean:
rm -rf doc/libraw1394.pdf doc/libraw1394.tmp doc/libraw1394
dh_clean
.PHONY: override_dh_strip override_dh_clean

1
debian/source/format vendored Normal file
View File

@ -0,0 +1 @@
3.0 (quilt)

2
debian/watch vendored Normal file
View File

@ -0,0 +1,2 @@
version=3
http://www.kernel.org/pub/linux/libs/ieee1394/libraw1394-(.+)\.tar\.gz