diff options
| author | Pali Rohár <pali.rohar@gmail.com> | 2016-07-02 12:56:41 +0200 |
|---|---|---|
| committer | Andrew Shadura <andrew.shadura@collabora.co.uk> | 2017-01-24 00:26:46 +0100 |
| commit | 933822cdf2771b006bbae2551d4b26ee049f2bdd (patch) | |
| tree | 2e480d956c1f6760cf43230dbf77fa222f5bc71e /debian | |
| parent | d3bc4d655ead3b8110e52a1aa5b1b588ac9e3e6a (diff) | |
| parent | d55cbaad708872ae659b75c76174dd609a341e0c (diff) | |
Imported Debian patch 1.2-1
Diffstat (limited to 'debian')
41 files changed, 128 insertions, 1769 deletions
diff --git a/debian/README.Debian b/debian/README.Debian deleted file mode 100644 index 06fc686..0000000 --- a/debian/README.Debian +++ /dev/null @@ -1,132 +0,0 @@ -udftools for Debian -=================== - -Kernel support for packet writing ---------------------------------- - -Packet writing is a technique by which a writable medium (typically a -CD or DVD) can be used just like a USB stick or a directory on the -hard disc: Files and directories can be created/renamed/removed -freely, and no separate "burning" step is necessary to write the data -to the medium. Packet writing is possible both with write-once media -(CD-R, DVD+R, DVD-R) and rewritable media (CD-RW, DVD+RW, -DVD-RW). Obviously, with write-once media the free space on the -filesystem will not increase if you delete files. - -In order to do packet writing under Debian Linux, your kernel needs -both support for UDF (Universal Disc Format) filesystems and for -packet writing. This is the case for kernels later than about 2.6.10. -For earlier kernels, you may have to apply patches from Peter -Osterlund <http://web.telia.com/~u89404340/packet.html>. That site -also has patches for udftools to make them work with recent kernels - -they have been applied to this package. This package tries to support -both old-style packet writing (kernel <2.6.8), and the newer variant -(>=2.6.10), with and without udev. Use a recent 2.6 kernel for optimal -results! - - -Formatting and using a UDF DVD-RW or CD-RW for packet writing -------------------------------------------------------------- - -The commands differ depending on whether you are using DVD or CD -media. - -1) Edit /etc/default/udftools and add your drive for packet writing. -For example, if your CD/DVD writer is /dev/hdc and you want it -available as the default /dev/pktcdvd/0, then use the setting -"DEVICES=/dev/hdc". Execute "/etc/init.d/udftools start" afterwards to -register the device. - -If the device name /dev/hdc differs on your system, adjust the -following commands as appropriate. - -2) Prepare the medium in restricted overwrite mode: - -DVD-RW: dvd+rw-format -force /dev/hdc - CD-RW: Do nothing, skip this step! - -3) Write an empty session spanning the whole medium. It seems that -without this step, any attempt to create the UDF filesystem will fail. - -DVD-RW: growisofs -Z /dev/hdc=/dev/zero - CD-RW: cdrwtool -d /dev/hdc -q - -4) Format the packet device in UDF format. - -DVD-RW: mkudffs --udfrev=0x0150 --spartable=2 --media-type=dvdrw /dev/pktcdvd/0 - CD-RW: mkudffs --udfrev=0x0150 --spartable=2 --media-type=cdrw /dev/pktcdvd/0 - -The parameters require some more explanation: For --udfrev, use either -0x0150 for UDF version 1.50, or 0x0201 for UDF version 2.01. The -version decision has mostly to do with compatibility: - - Windows 98/ME can read up to v1.02 - - Windows 2000, Mac OS 9, Linux 2.4 can read up to v1.50 - - Windows 2003/XP can read up to v2.01 - - Linux 2.6 can read up to v2.60 -For normal data, UDF 1.50 is OK. UDF 2.00 and 2.01 introduce -additional functionality for streaming audio/video. - -Possible values for --media-type are: hd dvdram dvdrw worm mo cdrw cdr. -Use the one appropriate for your medium/device. - -5) Mount the disc. The "noatime" option is important: It will reduce -the amount of writes to the device and thus increase its lifetime. You -may first have to create the mount directory using "mkdir -/media/dvd0": - - mount -t udf -o rw,noatime /dev/pktcdvd/0 /media/dvd0 - -The "sync" mount option might also be useful, but will typically cause -an increased number of write accesses to the medium. From now on, the -root user can access the filesystem under /media/dvd0 using read and -write operations. - -6) If regular users should also have write access, modify the -permissions as follows _while the filesystem is mounted_: - - chgrp plugdev /media/dvd0 # Set group ownership to "plugdev" - chmod g+rwx /media/dvd0 # Give full read/write access to group - -Now all users who should have access to the disc need to be added to -the "plugdev" group using "adduser <username> plugdev". - -To also allow these users to mount and unmount/eject the medium, you -can use either of these two routes: - - - Install the "pmount" package and add the device to the list of - allowed devices using "echo /dev/pktcdvd/0 >>/etc/pmount.allow". - All members of the group "plugdev" will then be able to mount the - disc using "pmount /dev/pktcdvd/0 dvd0" and unmount it using - "pumount /media/dvd0". - - - Add a line like the following to /etc/fstab: - /dev/pktcdvd/0 /media/dvd0 udf rw,noatime,users,noauto 0 0 - This will enable _all_ users to mount the disc using - "mount /media/dvd0" and unmount it with - "umount /media/dvd0". However, with the permissions from step 5) - above, only the members of group "plugdev" ought to be able to - write to it. - - -Support for UDF filesystems ---------------------------- - -UDF (not packet writing) support in Linux 2.4 and later kernels is -sufficient to read from and write to UDF filesystems. For example, you -can create a regular file, "format" it using mkudffs, and then -loop-mount it. To do this, execute the following commands as root: -(After "count=", supply the required size in MB of the filesystem.) - - dd if=/dev/zero of=udfimage bs=1M count=10 - mkudffs udfimage - mkdir udfmnt - mount -o loop -t udf udfimage udfmnt - -You need Linux 2.4+ with UDF read *and* write support enabled. Now you -can copy data to the "udfmnt" directory. After an "umount udfmnt", the -file "udfimage" could theoretically be written to a CD-R(W) or -DVD-R(W). In practice, you will not want to do that, as the whole -point of using UDF is to do packet writing. - - - -- Richard Atterer <atterer@debian.org> Wed, 22 Nov 2006 23:38:16 +0100 diff --git a/debian/changelog b/debian/changelog index 3595667..cc34044 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,23 @@ +udftools (1.2-1) unstable; urgency=low + + * New maintainer (Closes: #829016). + * New project upstream (Closes: #791952). + * New upstream release which fixes these bugs: + Closes: #672839, #272648, #606664, #715720, #716102, #716287, #727634 + Closes: #727636, #775273, #539530, #680272 + * Update debian files: + - Checks for /run/udev in init script (Closes: #622208). + - Fix LSB output in init script (Closes: #823084, #583382). + - Use debhelper 9 (Closes: #817705). + - Remove old and unused po.bak files. + - Remove old README.Debian. + - Add ${misc:Depends}. + - Update description of package. + - Update copyright to deb5 format. + - Drop all patches because there were included into new release. + + -- Pali Rohár <pali.rohar@gmail.com> Sat, 02 Jul 2016 12:56:41 +0200 + udftools (1.0.0b3-14.4) unstable; urgency=medium * Non-maintainer upload. diff --git a/debian/compat b/debian/compat index b8626c4..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -4 +9 diff --git a/debian/control b/debian/control index a3d039f..8c249fa 100644 --- a/debian/control +++ b/debian/control @@ -1,22 +1,22 @@ Source: udftools Section: otherosfs Priority: extra -Maintainer: Richard Atterer <atterer@debian.org> -Build-Depends: debhelper (>= 4.1.16), libreadline-dev, patch, dh-autoreconf -Standards-Version: 3.6.1 +Maintainer: Pali Rohár <pali.rohar@gmail.com> +Build-Depends: debhelper (>= 9), dh-autoreconf, libreadline-dev +Standards-Version: 3.9.8 +Homepage: https://github.com/pali/udftools Package: udftools -Architecture: any -Depends: ${shlibs:Depends} +Architecture: linux-any +Depends: ${shlibs:Depends}, ${misc:Depends} Recommends: udev Suggests: dvd+rw-tools, pmount -Homepage: http://sourceforge.net/projects/linux-udf/ Description: tools for UDF filesystems and DVD/CD-R(W) drives This package contains a number of user-space tools related to creating filesystems in the UDF (Universal Disk Format), which is - primarily used for DVDs, but sometimes also CD-ROMs: + primarily used for DVDs, but sometimes also CD-ROMs and HDDs: . mkudffs - Format a device, creating an empty UDF filesystem cdrwtool - Low-level drive management (e.g. set writing speed, format) pktsetup - Set up a packet writing device (/dev/pktcdvd0) for a drive - wrudf - Maintains a UDF filesystem (undocumented) + wrudf - Maintains a UDF filesystem diff --git a/debian/copyright b/debian/copyright index c83ae23..36f6105 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,32 +1,35 @@ -This package was debianized by Richard Atterer <atterer@debian.org> on -Mon, 4 Jun 2001 21:47:49 +0200. - -It was downloaded from - http://sourceforge.net/projects/linux-udf/ - -Upstream Authors: - Copyright (c) 1999,2000 Jens Axboe <axboe@suse.de> - Copyright (c) 2001-2002 Ben Fennema <bfennema@falcon.csc.calpoly.edu> - Copyright (c) 2004 Peter Osterlund <petero2@telia.com> - Manpages: Copyright 2002 Paul Thompson <set@pobox.com> - getopt: Copyright (C) 1987-1998 Free Software Foundation, Inc. - -Copyright: - - 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; version 2 dated June, 1991. - - 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 GNU/Linux systems, the complete text of the GNU General -Public License can be found in `/usr/share/common-licenses/GPL'. - +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: udftools +Upstream-Contact: Pali Rohár <pali.rohar@gmail.com> +Source: https://github.com/pali/udftools + +Files: * +Copyright: 1999-2000 Jens Axboe <axboe@suse.de> + 2001-2002 Ben Fennema <bfennema@falcon.csc.calpoly.edu> + 2002 Paul Thompson <set@pobox.com> + 2004 Peter Osterlund <petero2@telia.com> + 2014-2016 Pali Rohár <pali.rohar@gmail.com> + 2016 Steve Kenton <skenton@ou.edu> +License: GPL-2.0+ + +Files: debian/* +Copyright: 2001-2008 Richard Atterer <atterer@debian.org> + 2016 Pali Rohár <pali.rohar@gmail.com> +License: GPL-2.0+ + +License: GPL-2.0+ + 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 program. If not, see <http://www.gnu.org/licenses/> + . + On Debian systems, the complete text of the GNU General + Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". diff --git a/debian/patch-01-pktsetup-chardev.diff b/debian/patch-01-pktsetup-chardev.diff deleted file mode 100644 index 5ef0825..0000000 --- a/debian/patch-01-pktsetup-chardev.diff +++ /dev/null @@ -1,346 +0,0 @@ -From: Peter Osterlund <petero2@telia.com> -Subject: Re: [RFC][PATCH] Control pktcdvd with an auxiliary character device -To: linux-kernel@vger.kernel.org -Cc: Christoph Hellwig <hch@infradead.org>, Arnd Bergmann <arnd@arndb.de>, - Jens Axboe <axboe@suse.de>, Andrew Morton <akpm@osdl.org> -Date: Wed Jul 14 02:17:27 2004 +0200 - -Peter Osterlund <petero2@telia.com> writes: - -> Peter Osterlund <petero2@telia.com> writes: -> -> > Christoph Hellwig <hch@infradead.org> writes: -> > -> > > On Sun, Jul 11, 2004 at 01:20:45AM +0200, Arnd Bergmann wrote: -> > > > These are actually incorrect definitions since the ioctl argument is -> > > > not a pointer to unsigned int but instead just an int. However, that's -> > > > too late to fix without breaking the existing tools. -> > > -> > > The tools need to change anyway to get away from the broken behaviour to -> > > issue in ioctl on the actual block device to bind it.. -> > -> > OK, I'll create a patch that gets rid of the ioctl interface and uses -> > an auxiliary character device instead to control device bindings. -> -> Here is a patch for 2.6.7-mm7 that does that. The driver creates a -> misc character device and bind/unbind of the block devices are -> controlled by ioctl commands on the char device. -> -> This patch needs corresponding changes in the pktsetup user space -> program. I'll post a patch for pktsetup as a separate message. - -And here is a patch for udftools-1.0.0b3 that updates the pktsetup -program to make it able to use the character device for block device -setup/teardown. - ---- - - udftools-1.0.0b3-petero/pktsetup/pktsetup.c | 245 +++++++++++++++++++++++++++- - 1 files changed, 238 insertions(+), 7 deletions(-) - -diff -puN pktsetup/pktsetup.c~pktsetup-char-dev pktsetup/pktsetup.c ---- udftools-1.0.0b3/pktsetup/pktsetup.c~pktsetup-char-dev 2004-07-12 19:57:51.000000000 +0200 -+++ udftools-1.0.0b3-petero/pktsetup/pktsetup.c 2004-07-14 00:34:02.471317888 +0200 -@@ -1,5 +1,6 @@ - /* - * Copyright (c) 1999,2000 Jens Axboe <axboe@suse.de> -+ * Copyright (c) 2004 Peter Osterlund <petero2@telia.com> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by -@@ -19,6 +20,7 @@ - #include <stdio.h> - #include <fcntl.h> - #include <sys/ioctl.h> -+#include <sys/stat.h> - #include <unistd.h> - #include <getopt.h> - #include <bits/types.h> -@@ -33,8 +35,33 @@ - #define PACKET_SETUP_DEV _IOW('X', 1, unsigned int) - #define PACKET_TEARDOWN_DEV _IOW('X', 2, unsigned int) - #endif -+#ifndef PACKET_CTRL_CMD -+#define PACKET_CTRL_CMD _IOWR('X', 1, struct pkt_ctrl_command) -+#endif -+ -+#define MAJOR(dev) ((dev & 0xfff00) >> 8) -+#define MINOR(dev) ((dev & 0xff) | ((dev >> 12) & 0xfff00)) -+#define MKDEV(ma,mi) ((mi & 0xff) | (ma << 8) | ((mi & ~0xff) << 12)) -+ -+#define MISC_MAJOR 10 -+#define CTL_DIR "/dev/pktcdvd" -+#define CTL_DEV "control" -+ -+#define PKT_CTRL_CMD_SETUP 0 -+#define PKT_CTRL_CMD_TEARDOWN 1 -+#define PKT_CTRL_CMD_STATUS 2 -+ -+struct pkt_ctrl_command { -+ __u32 command; /* in: Setup, teardown, status */ -+ __u32 dev_index; /* in/out: Device index */ -+ __u32 dev; /* in/out: Device nr for cdrw device */ -+ __u32 pkt_dev; /* out: Device nr for packet device */ -+ __u32 num_devices; /* out: Largest device index + 1 */ -+ __u32 padding; -+}; -+ - --int init_cdrom(int fd) -+static int init_cdrom(int fd) - { - if (ioctl(fd, CDROM_DRIVE_STATUS, CDSL_CURRENT) < 0) { - perror("drive not ready\n"); -@@ -54,7 +81,7 @@ int init_cdrom(int fd) - return 0; - } - --void setup_dev(char *pkt_device, char *device, int rem) -+static void setup_dev(char *pkt_device, char *device, int rem) - { - int pkt_fd, dev_fd, cmd; - -@@ -88,29 +115,233 @@ void setup_dev(char *pkt_device, char *d - close(pkt_fd); - } - --int usage(void) -+static int usage(void) - { -- printf("pktsetup /dev/pktcdvd0 /dev/cdrom\tsetup device\n"); -- printf("pktsetup -d /dev/pktcdvd0\t\ttear down device\n"); -+ printf("For pktcdvd < 0.2.0:\n"); -+ printf(" pktsetup /dev/pktcdvd0 /dev/cdrom setup device\n"); -+ printf(" pktsetup -d /dev/pktcdvd0 tear down device\n"); -+ printf("For pktcdvd >= 0.2.0:\n"); -+ printf(" pktsetup dev_name /dev/cdrom setup device\n"); -+ printf(" pktsetup -d dev_name tear down device\n"); -+ printf(" pktsetup -d major:minor tear down device\n"); -+ printf(" pktsetup -s show device mappings\n"); - return 1; - } - -+/* -+ * Find the minor device number for the pktcdvd control device. -+ */ -+static int get_misc_minor(void) -+{ -+ int minor; -+ char name[64]; -+ FILE *f; -+ -+ if ((f = fopen("/proc/misc", "r")) == NULL) -+ return -1; -+ while (fscanf(f, " %d %64s", &minor, name) == 2) { -+ if (strcmp(name, "pktcdvd") == 0) { -+ fclose(f); -+ return minor; -+ } -+ } -+ fclose(f); -+ return -1; -+} -+ -+static const char *pkt_dev_name(const char *dev) -+{ -+ static char buf[128]; -+ snprintf(buf, sizeof(buf), "%s/%s", CTL_DIR, dev); -+ return buf; -+} -+ -+static void create_ctl_dev(void) -+{ -+ int misc_minor; -+ struct stat stat_buf; -+ int dev; -+ -+ if ((misc_minor = get_misc_minor()) < 0) { -+ system("/sbin/modprobe pktcdvd"); -+ misc_minor = get_misc_minor(); -+ } -+ if (misc_minor < 0) { -+ fprintf(stderr, "Can't find pktcdvd character device\n"); -+ return; -+ } -+ dev = MKDEV(MISC_MAJOR, misc_minor); -+ -+ if ((stat(pkt_dev_name(CTL_DEV), &stat_buf) >= 0) && -+ S_ISCHR(stat_buf.st_mode) && (stat_buf.st_rdev == dev)) -+ return; /* Already set up */ -+ -+ mkdir(CTL_DIR, 0755); -+ unlink(pkt_dev_name(CTL_DEV)); -+ mknod(pkt_dev_name(CTL_DEV), S_IFCHR | 0644, dev); -+} -+ -+static int remove_stale_dev_node(int ctl_fd, char *devname) -+{ -+ struct stat stat_buf; -+ int i, dev; -+ struct pkt_ctrl_command c; -+ -+ if (stat(pkt_dev_name(devname), &stat_buf) < 0) -+ return 0; -+ if (!S_ISBLK(stat_buf.st_mode)) -+ return 1; -+ dev = stat_buf.st_rdev; -+ memset(&c, 0, sizeof(struct pkt_ctrl_command)); -+ for (i = 0; ; i++) { -+ c.command = PKT_CTRL_CMD_STATUS; -+ c.dev_index = i; -+ if (ioctl(ctl_fd, PACKET_CTRL_CMD, &c) < 0) { -+ perror("ioctl"); -+ return 1; -+ } -+ if (i >= c.num_devices) -+ break; -+ if (c.pkt_dev == dev) -+ return 1; /* busy */ -+ } -+ unlink(pkt_dev_name(devname)); -+ return 0; -+} -+ -+static void setup_dev_chardev(char *pkt_device, char *device, int rem) -+{ -+ struct pkt_ctrl_command c; -+ struct stat stat_buf; -+ int ctl_fd, dev_fd; -+ -+ memset(&c, 0, sizeof(struct pkt_ctrl_command)); -+ -+ create_ctl_dev(); -+ if ((ctl_fd = open(pkt_dev_name(CTL_DEV), O_RDONLY)) < 0) { -+ perror("ctl open"); -+ return; -+ } -+ -+ if (!rem) { -+ if ((dev_fd = open(device, O_RDONLY | O_NONBLOCK)) == -1) { -+ perror("open cd-rom"); -+ goto out_close; -+ } -+ if (init_cdrom(dev_fd)) { -+ close(dev_fd); -+ goto out_close; -+ } -+ close(dev_fd); -+ -+ if (stat(device, &stat_buf) < 0) { -+ perror("stat cd-rom"); -+ goto out_close; -+ } -+ if (!S_ISBLK(stat_buf.st_mode)) { -+ fprintf(stderr, "Not a block device\n"); -+ goto out_close; -+ } -+ c.command = PKT_CTRL_CMD_SETUP; -+ c.dev = stat_buf.st_rdev; -+ -+ if (remove_stale_dev_node(ctl_fd, pkt_device) != 0) { -+ fprintf(stderr, "Device node '%s' already in use\n", pkt_device); -+ goto out_close; -+ } -+ if (ioctl(ctl_fd, PACKET_CTRL_CMD, &c) < 0) { -+ perror("ioctl"); -+ goto out_close; -+ } -+ mknod(pkt_dev_name(pkt_device), S_IFBLK | 0640, c.pkt_dev); -+ } else { -+ int major, minor, remove_node; -+ -+ if ((stat(pkt_dev_name(pkt_device), &stat_buf) >= 0) && -+ S_ISBLK(stat_buf.st_mode)) { -+ major = MAJOR(stat_buf.st_rdev); -+ minor = MINOR(stat_buf.st_rdev); -+ remove_node = 1; -+ } else if (sscanf(pkt_device, "%d:%d", &major, &minor) == 2) { -+ remove_node = 0; -+ } else { -+ fprintf(stderr, "Can't find major/minor numbers\n"); -+ goto out_close; -+ } -+ -+ c.command = PKT_CTRL_CMD_TEARDOWN; -+ c.pkt_dev = MKDEV(major, minor); -+ if (ioctl(ctl_fd, PACKET_CTRL_CMD, &c) < 0) { -+ perror("ioctl"); -+ goto out_close; -+ } -+ if (remove_node) -+ unlink(pkt_dev_name(pkt_device)); -+ } -+ -+out_close: -+ close(ctl_fd); -+} -+ -+static void show_mappings(void) -+{ -+ struct pkt_ctrl_command c; -+ int ctl_fd, i; -+ -+ memset(&c, 0, sizeof(struct pkt_ctrl_command)); -+ -+ create_ctl_dev(); -+ if ((ctl_fd = open(pkt_dev_name(CTL_DEV), O_RDONLY)) < 0) { -+ perror("ctl open"); -+ return; -+ } -+ -+ for (i = 0; ; i++) { -+ c.command = PKT_CTRL_CMD_STATUS; -+ c.dev_index = i; -+ if (ioctl(ctl_fd, PACKET_CTRL_CMD, &c) < 0) { -+ perror("ioctl"); -+ goto out_close; -+ } -+ if (i >= c.num_devices) -+ break; -+ if (c.dev) { -+ printf("%2d : %d:%d -> %d:%d\n", -+ i, MAJOR(c.pkt_dev), MINOR(c.pkt_dev), -+ MAJOR(c.dev), MINOR(c.dev)); -+ } -+ } -+ -+out_close: -+ close(ctl_fd); -+} -+ - int main(int argc, char **argv) - { - int rem = 0, c; -+ char *pkt_device; -+ char *device; - - if (argc == 1) - return usage(); - -- while ((c = getopt(argc, argv, "d")) != EOF) { -+ while ((c = getopt(argc, argv, "ds?")) != EOF) { - switch (c) { - case 'd': - rem = 1; - break; -+ case 's': -+ show_mappings(); -+ return 0; - default: - return usage(); - } - } -- setup_dev(argv[optind], argv[optind + 1], rem); -+ pkt_device = argv[optind]; -+ device = argv[optind + 1]; -+ if (strchr(pkt_device, '/')) -+ setup_dev(pkt_device, device, rem); -+ else -+ setup_dev_chardev(pkt_device, device, rem); - return 0; - } -_ - --- -Peter Osterlund - petero2@telia.com -http://w1.894.telia.com/~u89404340 diff --git a/debian/patch-02-pktsetup-exitstatus.diff b/debian/patch-02-pktsetup-exitstatus.diff deleted file mode 100644 index 92552c4..0000000 --- a/debian/patch-02-pktsetup-exitstatus.diff +++ /dev/null @@ -1,126 +0,0 @@ -From: Henrique de Moraes Holschuh <hmh@debian.org> -To: Debian Bug Tracking System <submit@bugs.debian.org> -Subject: Bug#223266: pktsetup: please return meaningful exit status on errors -Date: Sun, 7 Dec 2003 17:03:35 -0200 - -pktsetup seems to always return exit status 0 (ok) even when something -goes wrong. - -Stuff like: - trying to register an already registered device - trying to de-register an unbound device - -should return a non-zero exit status. - ---- ./pktsetup/pktsetup.c.orig 2007-11-30 16:39:48.580250640 +0100 -+++ ./pktsetup/pktsetup.c 2007-11-30 16:36:48.569992440 +0100 -@@ -81,13 +82,13 @@ - return 0; - } - --static void setup_dev(char *pkt_device, char *device, int rem) -+static int setup_dev(char *pkt_device, char *device, int rem) - { - int pkt_fd, dev_fd, cmd; - - if ((pkt_fd = open(pkt_device, O_RDONLY | O_CREAT)) == -1) { - perror("open packet device"); -- return; -+ return 1; - } - - if (!rem) { -@@ -95,24 +96,29 @@ - if ((dev_fd = open(device, O_RDONLY | O_NONBLOCK)) == -1) { - perror("open cd-rom"); - close(pkt_fd); -- return; -+ return 1; - } - if (init_cdrom(dev_fd)) { - close(pkt_fd); - close(dev_fd); -- return; -+ return 0; -+ } else { -+ return 1; - } - } else { - cmd = PACKET_TEARDOWN_DEV; - dev_fd = 0; /* silence gcc */ - } - -- if (ioctl(pkt_fd, cmd, dev_fd) == -1) -+ if (ioctl(pkt_fd, cmd, dev_fd) == -1) { - perror("ioctl"); -+ return 1; -+ } - - if (dev_fd) - close(dev_fd); - close(pkt_fd); -+ return 0; - } - - static int usage(void) -@@ -209,18 +215,19 @@ - return 0; - } - --static void setup_dev_chardev(char *pkt_device, char *device, int rem) -+static int setup_dev_chardev(char *pkt_device, char *device, int rem) - { - struct pkt_ctrl_command c; - struct stat stat_buf; - int ctl_fd, dev_fd; -+ int ret = 1; - - memset(&c, 0, sizeof(struct pkt_ctrl_command)); - - create_ctl_dev(); - if ((ctl_fd = open(pkt_dev_name(CTL_DEV), O_RDONLY)) < 0) { - perror("ctl open"); -- return; -+ return 1; - } - - if (!rem) { -@@ -254,6 +261,7 @@ - goto out_close; - } - mknod(pkt_dev_name(pkt_device), S_IFBLK | 0640, c.pkt_dev); -+ ret = 0; - } else { - int major, minor, remove_node; - -@@ -275,12 +283,17 @@ - perror("ioctl"); - goto out_close; - } -- if (remove_node) -- unlink(pkt_dev_name(pkt_device)); -+ if (remove_node) { -+ if (unlink(pkt_dev_name(pkt_device)) == 0) -+ ret = 0; -+ } else { -+ ret = 0; -+ } - } - - out_close: - close(ctl_fd); -+ return ret; - } - - static void show_mappings(void) -@@ -340,8 +353,7 @@ - pkt_device = argv[optind]; - device = argv[optind + 1]; - if (strchr(pkt_device, '/')) -- setup_dev(pkt_device, device, rem); -+ return setup_dev(pkt_device, device, rem); - else -- setup_dev_chardev(pkt_device, device, rem); -- return 0; -+ return setup_dev_chardev(pkt_device, device, rem); - } diff --git a/debian/patch-03-mkudffs-bigendian.diff b/debian/patch-03-mkudffs-bigendian.diff deleted file mode 100644 index 3209262..0000000 --- a/debian/patch-03-mkudffs-bigendian.diff +++ /dev/null @@ -1,36 +0,0 @@ -Date: Sun, 12 Dec 2004 14:25:09 +0100 -From: Christoph Hellwig <hch@lst.de> -To: submit@bugs.debian.org - -Package: udftools -Version: 1.0.0b3-6 - -mkduffs crashes with a segmentation fault when trying to create a -filesystem on big-endian systems. e.g. mkudffs /dev/sda4 on my -PowerMac. - -udffstools from CVS on sf.net is fine, and I've extracted the actual -fix: - - -diff -uNr -Xdontdiff -p udftools-1.0.0b3/mkudffs/mkudffs.c udftools/mkudffs/mkudffs.c ---- udftools-1.0.0b3/mkudffs/mkudffs.c 2004-02-23 04:35:33.000000000 +0100 -+++ udftools/mkudffs/mkudffs.c 2004-03-02 03:09:39.000000000 +0100 -@@ -250,14 +250,14 @@ void split_space(struct udf_disc *disc) - if (size % offsets[PSPACE_SIZE]) - size -= (size % offsets[PSPACE_SIZE]); - set_extent(disc, PSPACE, start, size); -- for (i=0; i<disc->udf_lvd[0]->numPartitionMaps; i++) -+ for (i=0; i<le32_to_cpu(disc->udf_lvd[0]->numPartitionMaps); i++) - { - if (i == 1) - disc->udf_lvid->freeSpaceTable[i] = cpu_to_le32(0xFFFFFFFF); - else - disc->udf_lvid->freeSpaceTable[i] = cpu_to_le32(size); - } -- for (j=0; j<disc->udf_lvd[0]->numPartitionMaps; j++) -+ for (j=0; j<le32_to_cpu(disc->udf_lvd[0]->numPartitionMaps); j++) - { - if (j == 1) - disc->udf_lvid->sizeTable[i+j] = cpu_to_le32(0xFFFFFFFF); - diff --git a/debian/patch-04-wrudf-gcc4.diff b/debian/patch-04-wrudf-gcc4.diff deleted file mode 100644 index 1369012..0000000 --- a/debian/patch-04-wrudf-gcc4.diff +++ /dev/null @@ -1,53 +0,0 @@ -Subject: Bug#288621: udftools: FTBFS (amd64/gcc-4.0): invalid lvalue in assignment -From: Andreas Jochens <aj@andaco.de> -Message-Id: <E1CltQT-00068G-Sy@localhost.localdomain> -Date: Tue, 04 Jan 2005 19:29:01 +0100 -Lines: 59 - -Package: udftools -Severity: normal -Tags: patch - -When building 'udftools' on amd64 with gcc-4.0, -I get the following error: - -wrudf.c:119: warning: pointer targets in passing argument 1 of 'strlen' differ in signedness -wrudf.c:119: warning: pointer targets in passing argument 1 of 'strlen' differ in signedness -wrudf.c:119: warning: pointer targets in passing argument 1 of 'strcmp' differ in signedness -wrudf.c:119: warning: pointer targets in passing argument 1 of 'strncmp' differ in signedness -wrudf.c:230: warning: pointer targets in passing argument 1 of 'strlen' differ in signedness -wrudf.c:230: warning: pointer targets in passing argument 1 of 'strlen' differ in signedness -wrudf.c:230: warning: pointer targets in passing argument 1 of 'strlen' differ in signedness -wrudf.c:230: warning: pointer targets in passing argument 1 of 'strcmp' differ in signedness -wrudf.c:230: warning: pointer targets in passing argument 1 of 'strncmp' differ in signedness -wrudf.c:245: warning: pointer targets in passing argument 1 of 'strlen' differ in signedness -wrudf.c:245: warning: pointer targets in passing argument 1 of 'strlen' differ in signedness -wrudf.c:245: warning: pointer targets in passing argument 1 of 'strlen' differ in signedness -wrudf.c:245: warning: pointer targets in passing argument 1 of 'strcmp' differ in signedness -wrudf.c:245: warning: pointer targets in passing argument 1 of 'strncmp' differ in signedness -wrudf.c:248: error: invalid lvalue in assignment -make[2]: *** [wrudf.o] Error 1 -make[2]: Leaving directory `/udftools-1.0.0b3/wrudf' - -With the attached patch 'udftools' can be compiled -on amd64 using gcc-4.0. - -The patch also changes the Build-Depends from 'libreadline4-dev' -to 'libreadline5-dev'. - -Regards -Andreas Jochens - -diff -urN ../tmp-orig/udftools-1.0.0b3/wrudf/wrudf.c ./wrudf/wrudf.c ---- ../tmp-orig/udftools-1.0.0b3/wrudf/wrudf.c 2002-11-26 08:18:51.000000000 +0100 -+++ ./wrudf/wrudf.c 2005-01-04 16:56:49.394078200 +0100 -@@ -245,7 +245,7 @@ - } else if( strncmp( spm->partIdent.ident, UDF_ID_VIRTUAL, strlen(UDF_ID_VIRTUAL)) == 0 ) - virtualPartitionNum = i; - } -- (char*)spm += spm->partitionMapLength; -+ spm = (char*)spm + spm->partitionMapLength; - } - - if( medium == CDR ) { -diff -urN ../tmp-orig/udftools-1.0.0b3/debian/control ./debian/control diff --git a/debian/patch-05-pktsetup-manpage.diff b/debian/patch-05-pktsetup-manpage.diff deleted file mode 100644 index 2b093c4..0000000 --- a/debian/patch-05-pktsetup-manpage.diff +++ /dev/null @@ -1,126 +0,0 @@ -Date: Thu, 06 Jan 2005 02:04:10 -0500 -From: A Costa <agcosta@gis.net> -Reply-To: A Costa <agcosta@gis.net>, 288896@bugs.debian.org -Sender: A Costa <alfie@Arf> -To: Debian Bug Tracking System <submit@bugs.debian.org> -Subject: Bug#288896: udftools: 'man pktsetup' links to obsolete "http://packet-cd.sourceforge.net/" - -Package: udftools -Version: 1.0.0b3-9 -Severity: normal - - - % man pktsetup | grep -n http - 19: See: http://packet-cd.sourceforge.net/ - 55: http://linux-udf.sourceforge.net. - -The web page in #19 hasn't been updated since 2001. It's a time waster. - -The web page in #55 says "copyright 1999" at the bottom. - -Suggest: - - 19: See /usr/share/doc/udftools/README.Debian - 55: http://sourceforge.net/projects/linux-udf/ - - - - ---- ./doc/pktsetup.8.orig 2005-10-03 13:11:38.000000000 +0000 -+++ ./doc/pktsetup.8 2005-10-03 13:14:16.000000000 +0000 -@@ -45,9 +45,7 @@ - used as a read/write filesystem. This requires kernel support for - the packet device, and the UDF filesystem. - .PP --See: --.UR --http://packet-cd.sourceforge.net/ -+See /usr/share/doc/udftools/README.Debian for more information. - .UE - - .SH EXIT STATUS -@@ -87,7 +85,7 @@ - .SH AVAILABILITY - .B pktsetup - is part of the udftools package and is available from --http://linux-udf.sourceforge.net. -+http://sourceforge.net/projects/linux-udf/ - - .SH "SEE ALSO" - .BR cdrwtool (1) - ------------------------------------------------------------------ - -From: Carsten Grohmann <carstengrohmann@gmx.de> -To: "Debian Bug Tracking System" <submit@bugs.debian.org> -Subject: Bug#414801: udftools: man pktsetup: Wrong device names in "EXAMPLE" and "FILES" sections -Date: Tue, 13 Mar 2007 22:56:04 +0100 - -The device files are moved in the seprate directory /dev/pktcdvd/. The -current files are /dev/pktcdvd/control,/dev/pktcdvd/0, ... The major -device number has changed too. - -The example section used the wrong path names. Calling -"pktsetup /dev/pktcdvd0 /dev/sr0" prints an error message like -"ioctl: Inappropriate ioctl for device". - -The new syntax works fine: -pktsetup 0 /dev/sr0 -pktsetup -d 0 - -And could you add the option "-s" too? - -Thanks - ---- ./doc/pktsetup.8.orig 2007-11-30 13:10:51.865824000 +0100 -+++ ./doc/pktsetup.8 2007-11-30 13:25:14.915006370 +0100 -@@ -37,6 +37,9 @@ - .B pktsetup - .B \-d - .I packet_device -+.br -+.B pktsetup -+.B \-s - .ad b - .SH DESCRIPTION - .B Pktsetup -@@ -59,29 +62,36 @@ - Delete the association between the specified \fIpacket-device\fP - and its block device. - -+.IP "\fB\-s\fP" -+Show the current device mapping, one device per line, in the format -+ \fIname\fP : \fIpktdevid\fP -> \fIblkdevid\fP -+.br -+(e.g. "0 : 253:0 -> 22:0") -+ - .SH EXAMPLE - The following commands provide an example of using the - packet device. - .nf - .IP - cdrwtool -d /dev/sr0 -q --pktsetup /dev/pktcdvd0 /dev/sr0 -+pktsetup 0 /dev/sr0 - - mount -t udf /dev/pktcdvd0 /mnt - ... - umount /dev/pktcdvd0 --pktsetup -d /dev/pktcdvd0 -+pktsetup -d 0 - .fi - .LP - - .SH FILES - .nf --/dev/pktcdvd0,/dev/pktcdvd1,... CD/DVD packet devices (block major=97) -+/dev/pktcdvd0,/dev/pktcdvd1,... CD/DVD packet devices - .fi - - .SH AUTHOR - .nf - Jens Axboe <axboe@suse.de> -+Some additions by Richard Atterer <atterer@debian.org> - .fi - - .SH AVAILABILITY diff --git a/debian/patch-06-wrudf-lvalue.diff b/debian/patch-06-wrudf-lvalue.diff deleted file mode 100644 index 9922f4e..0000000 --- a/debian/patch-06-wrudf-lvalue.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- ./wrudf/wrudf.c.orig 2007-11-30 12:09:29.655986820 +0100 -+++ ./wrudf/wrudf.c 2007-11-30 12:10:09.658266420 +0100 -@@ -245,7 +245,7 @@ - } else if( strncmp( spm->partIdent.ident, UDF_ID_VIRTUAL, strlen(UDF_ID_VIRTUAL)) == 0 ) - virtualPartitionNum = i; - } -- spm = (char*)spm + spm->partitionMapLength; -+ spm = (struct sparablePartitionMap*)((char*)spm + spm->partitionMapLength); - } - - if( medium == CDR ) { diff --git a/debian/patch-07-cdrwtool-manpage.diff b/debian/patch-07-cdrwtool-manpage.diff deleted file mode 100644 index 182e35a..0000000 --- a/debian/patch-07-cdrwtool-manpage.diff +++ /dev/null @@ -1,106 +0,0 @@ -Date: Tue, 17 May 2005 23:54:35 -0400 -From: A Costa <agcosta@gis.net> -Reply-To: A Costa <agcosta@gis.net>, 309572@bugs.debian.org -Sender: A Costa <alfie@Arf> -To: Debian Bug Tracking System <submit@bugs.debian.org> -Subject: Bug#309572: 'man cdrwtool' typo: "pktsetup (8)" instead of "pktsetup (1)" - -Found a typo in '/usr/share/man/man1/cdrwtool.1.gz', see attached '.diff'. - - -Reason why it should be "1" and not "8": - -Since there's no section #8 man page... - - % dlocate -L udftools | grep "pktsetup.[1-9].gz" - /usr/share/man/man1/pktsetup.1.gz - -...programs like 'pinfo' link to nowhere if you click -on 'pktsetup (8)'. - - - ---- ./doc/cdrwtool.1.orig 2005-10-03 13:11:38.000000000 +0000 -+++ ./doc/cdrwtool.1 2005-10-03 13:14:16.000000000 +0000 -@@ -140,4 +140,4 @@ - http://linux-udf.sourceforge.net. - - .SH "SEE ALSO" --.BR pktsetup (8) -+.BR pktsetup (1) - --------------------------------------------------------------------------- - -From: A Costa <agcosta@gis.net> -To: Debian Bug Tracking System <submit@bugs.debian.org> -Subject: Bug#288355: udftools: 'man cdrwtool' should describe the '-q' switch -Date: Mon, 03 Jan 2005 03:47:34 -0500 - -The '-q' switch is mentioned twice in the 'cdrwtool' man page: -...but under OPTIONS there's no description of what '-q' does. - ---- ./doc/cdrwtool.1.orig 2007-11-30 11:25:24.005219775 +0100 -+++ ./doc/cdrwtool.1 2007-11-30 11:28:47.516817240 +0100 -@@ -83,6 +83,9 @@ - .IP "\fB\-u \fIlength\fP" - Make a UDF filesystem using \fIlength\fP number of blocks. - -+.IP "\fB\-q\fP" -+`Quick setup': blank the disc, format it as one large track and write a UDF filesystem. -+ - .IP "\fB\-m \fIoffset\fP" - Format the disc at \fIoffset\fP number of blocks. - --------------------------------------------------------------------------- - -From: Jari Aalto <jari.aalto@cante.net> -To: Debian Bug Tracking System <submit@bugs.debian.org> -Subject: Bug#372093: udftools: cdrwtool [manual] Mention default settings and clarify options -l -Date: Thu, 08 Jun 2006 11:54:13 +0300 - --l -w -p: -The -s option changes these parameters, but the documentation does -not mention what are the default values. Please add word "(default)" -next to the choices, like: --p type - Set packet type. Either `0' (default) or `1', corresponding to variable and - fixed packet sizes respectively. - - ---- ./doc/cdrwtool.1.orig 2007-11-30 12:19:02.688642090 +0100 -+++ ./doc/cdrwtool.1 2007-11-30 12:27:20.216994615 +0100 -@@ -101,6 +101,8 @@ - Set write parameters determined by - .BR "\-l" , " \-w" ", and" " \-p" - options for the disc. -+.br -+(Note by your Debian maintainer: Apparently this option does nothing.) - - .IP "\fB\-v \fIversion\fP" - Specify the udf revision to use. Valid revisions are 0x0201, 0x0200, 0x0150, -@@ -116,14 +116,14 @@ - .IP "\fB\-t \fIspeed\fP" - Set write speed. (Defaults to 12x ?) - .IP "\fB\-l \fItype\fP" --Set multi\-session field. Either `0', `1', or `3', corresponding to -+Set multi\-session field. Either `0' (default), `1', or `3', corresponding to - `No B0 pointer. Next Session not allowed', - `B0 pointer = FF:FF:FF. Next session not allowed', and - `Next session allowed. B0 pointer = next possible program area' respectively. - .IP "\fB\-w \fImode\fP" --Set write mode. Either `mode1' or `mode2'. -+Set write mode. Either `mode1' or `mode2' (default). - .IP "\fB\-p \fItype\fP" --Set packet type. Either `0' or `1', corresponding to -+Set packet type. Either `0' or `1' (default), corresponding to - variable and fixed packet sizes respectively. - .IP "\fB\-o \fIoffset\fP" - Set write offset. -@@ -132,6 +132,7 @@ - .nf - Jens Axboe <axboe@suse.de> - Ben Fennema <bfennema@falcon.csc.calpoly.edu> -+Some additions by Richard Atterer <atterer@debian.org> - .fi - - .SH AVAILABILITY diff --git a/debian/patch-08-mkudffs-manpage.diff b/debian/patch-08-mkudffs-manpage.diff deleted file mode 100644 index 809a33b..0000000 --- a/debian/patch-08-mkudffs-manpage.diff +++ /dev/null @@ -1,15 +0,0 @@ ---- ./doc/mkudffs.8 2002-11-26 08:18:51.000000000 +0100 -+++ ./doc/mkudffs.8 2006-11-22 22:37:49.099351000 +0100 -@@ -96,10 +96,10 @@ - hard drive - .TP - dvd --DVD (Digital Versital Disc) -+DVD (Digital Versatile Disc) - .TP - dvdram --DVD\-RAM (Digital Versital Disc\-Random Access Memory) -+DVD\-RAM (Digital Versatile Disc\-Random Access Memory) - .TP - worm - WORM (Write Once Ready Many) diff --git a/debian/patch-09-include-stringh.diff b/debian/patch-09-include-stringh.diff deleted file mode 100644 index acb6a1f..0000000 --- a/debian/patch-09-include-stringh.diff +++ /dev/null @@ -1,42 +0,0 @@ - ---- ./include/udf_endian.h.orig 2007-11-30 12:35:59.746600920 +0100 -+++ ./include/udf_endian.h 2007-11-30 12:36:49.749450420 +0100 -@@ -20,6 +20,8 @@ - * - */ - -+#include <string.h> -+ - #ifndef __UDF_ENDIAN_H - #define __UDF_ENDIAN_H - ---- ./pktsetup/pktsetup.c.orig 2007-11-30 12:37:42.252442395 +0100 -+++ ./pktsetup/pktsetup.c 2007-11-30 12:38:36.255519855 +0100 -@@ -25,6 +25,7 @@ - #include <getopt.h> - #include <bits/types.h> - #include <sys/types.h> -+#include <string.h> - - #include <linux/cdrom.h> - ---- ./wrudf/wrudf-cdr.c.orig 2007-11-30 12:39:06.257229555 +0100 -+++ ./wrudf/wrudf-cdr.c 2007-11-30 12:39:28.758511830 +0100 -@@ -6,6 +6,7 @@ - #include <stdio.h> - #include <stdlib.h> - #include <unistd.h> -+#include <string.h> - #include "wrudf.h" - #include "ide-pc.h" - #include "bswap.h" ---- ./wrudf/wrudf-cdrw.c.orig 2007-11-30 12:40:21.761532300 +0100 -+++ ./wrudf/wrudf-cdrw.c 2007-11-30 12:40:36.762387150 +0100 -@@ -28,6 +28,7 @@ - #include <stdio.h> - #include <fcntl.h> - #include <unistd.h> -+#include <string.h> - #include <sys/stat.h> - #include <sys/ioctl.h> - #include <linux/cdrom.h> /* for CDROM_DRIVE_STATUS */ diff --git a/debian/patch-10-mkudffs-open-error.diff b/debian/patch-10-mkudffs-open-error.diff deleted file mode 100644 index 9fc7c64..0000000 --- a/debian/patch-10-mkudffs-open-error.diff +++ /dev/null @@ -1,31 +0,0 @@ -From: Christoph Hellwig <hch@lst.de> -To: submit@bugs.debian.org -Subject: Bug#285313: mkudffs gives unhelpfull error messages when called without write-access to the device -Date: Sun, 12 Dec 2004 14:28:09 +0100 - -When calling mkuffs without write access to the device, e.g. - - mkudffs /dev/sda - -as ordinary user where the device is writeable only for root it gives an -completely unhelpfull error message: - - hch@dhcppc1:~$ mkudffs /dev/sda4 - trying to change type of multiple extents - -Some kind of permission denied message would be much better - - ---- ./mkudffs/main.c.orig 2007-11-30 13:57:22.524854595 +0100 -+++ ./mkudffs/main.c 2007-11-30 13:58:44.529527775 +0100 -@@ -162,6 +162,10 @@ - #else - fd = open(filename, O_RDWR | O_CREAT | O_LARGEFILE, 0660); - #endif -+ if (fd == -1) { -+ perror("Error opening device"); -+ exit(1); -+ } - disc.head->blocks = get_blocks(fd, disc.blocksize, disc.head->blocks); - disc.write = write_func; - disc.write_data = &fd; diff --git a/debian/patch-11-udftools-limits-h.diff b/debian/patch-11-udftools-limits-h.diff deleted file mode 100644 index c9cf1d5..0000000 --- a/debian/patch-11-udftools-limits-h.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- ./cdrwtool/cdrwtool.h.orig 2008-01-12 13:07:44.000000000 +0100 -+++ ./cdrwtool/cdrwtool.h 2008-01-12 13:08:19.000000000 +0100 -@@ -11,6 +11,7 @@ - #define _CDRWTOOL_H 1 - - #include <inttypes.h> -+#include <limits.h> - #include <linux/cdrom.h> - #include "../include/libudffs.h" - diff --git a/debian/patch-12-pktsetup-limits-h.diff b/debian/patch-12-pktsetup-limits-h.diff deleted file mode 100644 index 5cd42ac..0000000 --- a/debian/patch-12-pktsetup-limits-h.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- ./pktsetup/pktsetup.c.orig 2008-01-12 13:16:01.000000000 +0100 -+++ ./pktsetup/pktsetup.c 2008-01-12 13:16:15.000000000 +0100 -@@ -26,6 +26,7 @@ - #include <bits/types.h> - #include <sys/types.h> - #include <string.h> -+#include <limits.h> - - #include <linux/cdrom.h> - diff --git a/debian/patch-13-open-mode.diff b/debian/patch-13-open-mode.diff deleted file mode 100644 index ca08806..0000000 --- a/debian/patch-13-open-mode.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- ./pktsetup/pktsetup.c.orig 2009-12-10 11:56:03.000000000 +0000 -+++ ./pktsetup/pktsetup.c 2009-12-10 11:56:42.000000000 +0000 -@@ -87,7 +87,7 @@ - { - int pkt_fd, dev_fd, cmd; - -- if ((pkt_fd = open(pkt_device, O_RDONLY | O_CREAT)) == -1) { -+ if ((pkt_fd = open(pkt_device, O_RDONLY | O_CREAT, S_IRUSR|S_IWUSR)) == -1) { - perror("open packet device"); - return 1; - } diff --git a/debian/patch-14-no-curses.diff b/debian/patch-14-no-curses.diff deleted file mode 100644 index dfa2e2e..0000000 --- a/debian/patch-14-no-curses.diff +++ /dev/null @@ -1,9 +0,0 @@ ---- udftools-1.0.0b3.orig/wrudf/Makefile.am -+++ udftools-1.0.0b3/wrudf/Makefile.am -@@ -1,5 +1,5 @@ - bin_PROGRAMS = wrudf --wrudf_LDADD = $(top_builddir)/libudffs/libudffs.la -lreadline -lncurses -+wrudf_LDADD = $(top_builddir)/libudffs/libudffs.la -lreadline - wrudf_SOURCES = wrudf.c wrudf-cmnd.c wrudf-desc.c wrudf-cdrw.c wrudf-cdr.c ide-pc.c wrudf.h ide-pc.h ../include/ecma_167.h ../include/osta_udf.h ../include/bswap.h - - AM_CPPFLAGS = -D_LARGEFILE64_SOURCE -D_GNU_SOURCE -DDEBUG diff --git a/debian/patch-15-gcc5.diff b/debian/patch-15-gcc5.diff deleted file mode 100644 index 244683c..0000000 --- a/debian/patch-15-gcc5.diff +++ /dev/null @@ -1,13 +0,0 @@ ---- udftools-1.0.0b3/include/libudffs.h 2004-02-23 04:33:11.000000000 +0100 -+++ udftools-1.0.0b3/include/libudffs.h 2015-06-27 18:53:17.000000000 +0200 -@@ -169,8 +169,8 @@ - struct udf_data *alloc_data(void *, int); - - /* desc.c */ --inline struct impUseVolDescImpUse *query_iuvdiu(struct udf_disc *); --inline struct logicalVolIntegrityDescImpUse *query_lvidiu(struct udf_disc *); -+extern inline struct impUseVolDescImpUse *query_iuvdiu(struct udf_disc *); -+extern inline struct logicalVolIntegrityDescImpUse *query_lvidiu(struct udf_disc *); - - /* file.c */ - tag query_tag(struct udf_disc *, struct udf_extent *, struct udf_desc *, uint16_t); diff --git a/debian/po.bak/POTFILES.in b/debian/po.bak/POTFILES.in deleted file mode 100644 index cef83a3..0000000 --- a/debian/po.bak/POTFILES.in +++ /dev/null @@ -1 +0,0 @@ -[type: gettext/rfc822deb] templates diff --git a/debian/po.bak/ca.po b/debian/po.bak/ca.po deleted file mode 100644 index 3fefa6c..0000000 --- a/debian/po.bak/ca.po +++ /dev/null @@ -1,30 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: udftools_1.0.0b2-5_templates\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2003-07-20 11:44+0200\n" -"PO-Revision-Date: 2004-03-05 19:46GMT\n" -"Last-Translator: Aleix Badia i Bosch <abadia@ica.es>\n" -"Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-1\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Choices -#: ../templates:3 -msgid "Create device files, Do nothing" -msgstr "Crea els fitxers del dispositiu, no facis res" - -#. Description -#: ../templates:5 -msgid "Create device files (/dev/pktcdvd0 etc.)?" -msgstr "Voleu crear els fitxers del dispositiu (/dev/pktcdvd0 etc)?" - -#. Description -#: ../templates:5 -msgid "" -"The \"pktsetup\" tool supplied as part of the udftools package can be used " -"to set up packet writing for CD/DVD devices. However, the corresponding " -"device files /dev/pktcdvd0 etc. are not present on your system. Should I " -"create them?" -msgstr "L'eina \"pktsetup\" proporcionada pel paquet udftools es pot utilitzar per configurar l'escriptura de paquets pels dispositius CD/DVD. Tot i aix, el sistem no t els fitxers del dispositiu /dev/pktcdvd0, etc. Voleu que els cre?" diff --git a/debian/po.bak/cs.po b/debian/po.bak/cs.po deleted file mode 100644 index 2fa1c86..0000000 --- a/debian/po.bak/cs.po +++ /dev/null @@ -1,46 +0,0 @@ -# -# Translators, if you are not familiar with the PO format, gettext -# documentation is worth reading, especially sections dedicated to -# this format, e.g. by running: -# info -n '(gettext)PO Files' -# info -n '(gettext)Header Entry' -# -# Some information specific to po-debconf are available at -# /usr/share/doc/po-debconf/README-trans -# or http://www.debian.org/intl/l10n/po-debconf/README-trans -# -# Developers do not need to manually edit POT or PO files. -# -msgid "" -msgstr "" -"Project-Id-Version: ufdtools\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2003-07-03 12:01+0200\n" -"PO-Revision-Date: 2004-12-21 21:27+0100\n" -"Last-Translator: Miroslav Kure <kurem@debian.cz>\n" -"Language-Team: Czech <provoz@debian.cz>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-2\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Choices -#: ../templates:3 -msgid "Create device files, Do nothing" -msgstr "Vytvoit soubory zazen, Nic nevytvet" - -#. Description -#: ../templates:5 -msgid "Create device files (/dev/pktcdvd0 etc.)?" -msgstr "Vytvoit soubory zazen (/dev/pktcdvd0 apod.)?" - -#. Description -#: ../templates:5 -msgid "" -"The \"pktsetup\" tool supplied as part of the udftools package can be used " -"to set up packet writing for CD/DVD devices. However, the corresponding " -"device files /dev/pktcdvd0 etc. are not present on your system. Should I " -"create them?" -msgstr "" -"Nstroj \"ptksetup\", je je soust balku udftools, me bt pouit pro " -"nastaven paketovho zpisu pro CD/DVD zazen. Nicmn pslun zazen " -"ve vaem systmu chyb. Mm je vytvoit?" diff --git a/debian/po.bak/de.po b/debian/po.bak/de.po deleted file mode 100644 index 1d0fdb9..0000000 --- a/debian/po.bak/de.po +++ /dev/null @@ -1,48 +0,0 @@ -# -# Translators, if you are not familiar with the PO format, gettext -# documentation is worth reading, especially sections dedicated to -# this format, e.g. by running: -# info -n '(gettext)PO Files' -# info -n '(gettext)Header Entry' -# -# Some information specific to po-debconf are available at -# /usr/share/doc/po-debconf/README-trans -# or http://www.debian.org/intl/l10n/po-debconf/README-trans -# -# Developers do not need to manually edit POT or PO files. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2003-07-03 12:01+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-15\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Choices -#: ../templates:3 -msgid "Create device files, Do nothing" -msgstr "Gertedateien erstellen, Nichts machen" - -#. Description -#: ../templates:5 -msgid "Create device files (/dev/pktcdvd0 etc.)?" -msgstr "Die Gertedateien (/dev/pktcdvd0 etc.) erzeugen?" - -#. Description -#: ../templates:5 -msgid "" -"The \"pktsetup\" tool supplied as part of the udftools package can be used " -"to set up packet writing for CD/DVD devices. However, the corresponding " -"device files /dev/pktcdvd0 etc. are not present on your system. Should I " -"create them?" -msgstr "" -"Das Programm \"pktsetup\" ist Teil des udftools-Pakets und wird zur " -"Installation von Packet-Writing fr CD/DVD-Gerte genutzt. Im Moment sind " -"die dafr notwendigen Gertedateien /etc/pktcdvd0 etc. nicht vorhanden. " -"Sollen diese jetzt erzeugt werden?" diff --git a/debian/po.bak/es.po b/debian/po.bak/es.po deleted file mode 100644 index afb0c53..0000000 --- a/debian/po.bak/es.po +++ /dev/null @@ -1,48 +0,0 @@ -# -# Translators, if you are not familiar with the PO format, gettext -# documentation is worth reading, especially sections dedicated to -# this format, e.g. by running: -# info -n '(gettext)PO Files' -# info -n '(gettext)Header Entry' -# -# Some information specific to po-debconf are available at -# /usr/share/doc/po-debconf/README-trans -# or http://www.debian.org/intl/l10n/po-debconf/README-trans -# -# Developers do not need to manually edit POT or PO files. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2003-07-03 12:01+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-15\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Choices -#: ../templates:3 -msgid "Create device files, Do nothing" -msgstr "Crear los ficheros de dispositivo, No hacer nada" - -#. Description -#: ../templates:5 -msgid "Create device files (/dev/pktcdvd0 etc.)?" -msgstr "Crear los ficheros de dispositivo (/dev/pktcdvd0, etc.)?" - -#. Description -#: ../templates:5 -msgid "" -"The \"pktsetup\" tool supplied as part of the udftools package can be used " -"to set up packet writing for CD/DVD devices. However, the corresponding " -"device files /dev/pktcdvd0 etc. are not present on your system. Should I " -"create them?" -msgstr "" -"La herramienta \"pktsetup\", incluida en el paquete udftools, se puede usar " -"para configurar la escritura por paquetes de dispositivos CD y DVD. Sin " -"embargo, los correspondientes ficheros de dispositivo /dev/pktcdvd0, etc. no " -"estn presentes en su sistema. Debera crearlos?" diff --git a/debian/po.bak/fr.po b/debian/po.bak/fr.po deleted file mode 100644 index fe1c763..0000000 --- a/debian/po.bak/fr.po +++ /dev/null @@ -1,45 +0,0 @@ -# -# Translators, if you are not familiar with the PO format, gettext -# documentation is worth reading, especially sections dedicated to -# this format, e.g. by running: -# info -n '(gettext)PO Files' -# info -n '(gettext)Header Entry' -# Some information specific to po-debconf are available at -# /usr/share/doc/po-debconf/README-trans -# or http://www.debian.org/intl/l10n/po-debconf/README-trans# -# Developers do not need to manually edit POT or PO files. -# -msgid "" -msgstr "" -"Project-Id-Version: udftools_1.0.0.b2-2\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2003-07-03 12:01+0200\n" -"PO-Revision-Date: 2003-07-05 21:27+0200\n" -"Last-Translator: Michel Grentzinger <mic.grentz@online.fr>\n" -"Language-Team: French <debian-l10n-french@lists.debian.org>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-15\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Choices -#: ../templates:3 -msgid "Create device files, Do nothing" -msgstr "Crer les fichiers de priphriques, Ne rien faire" - -#. Description -#: ../templates:5 -msgid "Create device files (/dev/pktcdvd0 etc.)?" -msgstr "Faut-il crer les fichiers de priphriques (/dev/pktcdvd0, etc)?" - -#. Description -#: ../templates:5 -msgid "" -"The \"pktsetup\" tool supplied as part of the udftools package can be used " -"to set up packet writing for CD/DVD devices. However, the corresponding " -"device files /dev/pktcdvd0 etc. are not present on your system. Should I " -"create them?" -msgstr "" -"L'outil pktsetup fourni dans le paquet udftools peut tre utilis pour " -"mettre en place l'criture par paquets pour les priphriques CD/DVD. " -"Cependant, les fichiers de priphriques associs /dev/pktcdvd0, etc, ne " -"sont pas prsents sur votre systme. Faut-il les crer?" diff --git a/debian/po.bak/ja.po b/debian/po.bak/ja.po deleted file mode 100644 index d808b87..0000000 --- a/debian/po.bak/ja.po +++ /dev/null @@ -1,48 +0,0 @@ -# -# Translators, if you are not familiar with the PO format, gettext -# documentation is worth reading, especially sections dedicated to -# this format, e.g. by running: -# info -n '(gettext)PO Files' -# info -n '(gettext)Header Entry' -# -# Some information specific to po-debconf are available at -# /usr/share/doc/po-debconf/README-trans -# or http://www.debian.org/intl/l10n/po-debconf/README-trans -# -# Developers do not need to manually edit POT or PO files. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2003-07-03 12:01+0200\n" -"PO-Revision-Date: 2003-12-16 01:42+0900\n" -"Last-Translator: Hideki Yamane <henrich@samba.gr.jp>\n" -"Language-Team: Japanese <debian-japanese@lists.debian.org>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=EUC-JP\n" -"Content-Transfer-Encoding: 8bit\n" - - -#. Choices -#: ../templates:3 -msgid "Create device files, Do nothing" -msgstr "ǥХե, ⤷ʤ" - -#. Description -#: ../templates:5 -msgid "Create device files (/dev/pktcdvd0 etc.)?" -msgstr "ǥХե (/dev/pktcdvd0 ʤ) ޤ?" - -#. Description -#: ../templates:5 -msgid "" -"The \"pktsetup\" tool supplied as part of the udftools package can be used " -"to set up packet writing for CD/DVD devices. However, the corresponding " -"device files /dev/pktcdvd0 etc. are not present on your system. Should I " -"create them?" -msgstr "udftools ѥåΰȤƤ \"pktsetup\" ġ" -"ȤäơCD ޤ DVD ǥХؤΥѥåȥ饤ƥǽǤ" -"ߤб /dev/pktcdvd0 ʤɤΥǥХե뤬ƥ" -"¸ߤƤޤΥǥХޤ?" diff --git a/debian/po.bak/nl.po b/debian/po.bak/nl.po deleted file mode 100644 index 135d482..0000000 --- a/debian/po.bak/nl.po +++ /dev/null @@ -1,48 +0,0 @@ -# -# Translators, if you are not familiar with the PO format, gettext -# documentation is worth reading, especially sections dedicated to -# this format, e.g. by running: -# info -n '(gettext)PO Files' -# info -n '(gettext)Header Entry' -# -# Some information specific to po-debconf are available at -# /usr/share/doc/po-debconf/README-trans -# or http://www.debian.org/intl/l10n/po-debconf/README-trans -# -# Developers do not need to manually edit POT or PO files. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: udftools 1.0.0b2-3\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2003-07-03 12:01+0200\n" -"PO-Revision-Date: 2003-09-07 17:29+0100\n" -"Last-Translator: Tim Vandermeersch <qber66@skolelinux.no>\n" -"Language-Team: dutch <debian-l10n-dutch@lists.debian.org>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=iso-8859-1\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Choices -#: ../templates:3 -msgid "Create device files, Do nothing" -msgstr "Apparaat bestanden aanmaken, Niets doen" - -#. Description -#: ../templates:5 -msgid "Create device files (/dev/pktcdvd0 etc.)?" -msgstr "Apparaat bestanden aanmaken (/dev/pktcdvd0 etc.)?" - -#. Description -#: ../templates:5 -msgid "" -"The \"pktsetup\" tool supplied as part of the udftools package can be used " -"to set up packet writing for CD/DVD devices. However, the corresponding " -"device files /dev/pktcdvd0 etc. are not present on your system. Should I " -"create them?" -msgstr "" -"Het \"pktsetup\" tool meegeleverd als deel van het udftools pakket kan " -"gebruikt worden om pakket schrijven van CD/DVD apparaten te configureren." -"De overeenkomstige apparaat bestanden /dev/pktcddvd0 etc. zijn niet " -"aanwezig op uw systeem. Zal ik ze aanmaken?" diff --git a/debian/po.bak/pt.po b/debian/po.bak/pt.po deleted file mode 100644 index 31fbe0f..0000000 --- a/debian/po.bak/pt.po +++ /dev/null @@ -1,39 +0,0 @@ -# Portuguese translation of udftools's debconf messages. -# 2005, Rui Branco <ruipb@netcabo.pt>> -# -# 2005-10-15 - Rui Branco <ruipb@netcabo.pt> - initial translation -# -msgid "" -msgstr "" -"Project-Id-Version: udftools 1.0.0b3-10\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2003-07-03 12:01+0200\n" -"PO-Revision-Date: 2005-10-15 18:00+0100\n" -"Last-Translator: Rui Branco <ruipb@netcabo.pt>\n" -"Language-Team: Portuguese <traduz@debianpt.org>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit" - -#. Choices -#: ../templates:3 -msgid "Create device files, Do nothing" -msgstr "Criar ficheiros de dispositivos, Não fazer nada" - -#. Description -#: ../templates:5 -msgid "Create device files (/dev/pktcdvd0 etc.)?" -msgstr "Criar ficheiros de dispositivos (/dev/pktcdvd0 etc.)?" - -#. Description -#: ../templates:5 -msgid "" -"The \"pktsetup\" tool supplied as part of the udftools package can be used " -"to set up packet writing for CD/DVD devices. However, the corresponding " -"device files /dev/pktcdvd0 etc. are not present on your system. Should I " -"create them?" -msgstr "" -"A ferramenta \"pktsetup\" fornecida como parte do pacote udftools pode " -"ser utilizada para configurar a escrita 'packet writing' em dispositivos " -"CD/DVD. No entanto, os ficheiros de dispositivos /dev/pktcdvd0 etc. não " -"se encontram presentes no seu sistema. Devo criá-los?" diff --git a/debian/po.bak/ru.po b/debian/po.bak/ru.po deleted file mode 100644 index 4f004d9..0000000 --- a/debian/po.bak/ru.po +++ /dev/null @@ -1,47 +0,0 @@ -# -# Translators, if you are not familiar with the PO format, gettext -# documentation is worth reading, especially sections dedicated to -# this format, e.g. by running: -# info -n '(gettext)PO Files' -# info -n '(gettext)Header Entry' -# -# Some information specific to po-debconf are available at -# /usr/share/doc/po-debconf/README-trans -# or http://www.debian.org/intl/l10n/po-debconf/README-trans -# -# Developers do not need to manually edit POT or PO files. -# -msgid "" -msgstr "" -"Project-Id-Version: udftools 1.0.0b3\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2003-07-03 12:01+0200\n" -"PO-Revision-Date: 2005-03-22 21:32+0600\n" -"Last-Translator: Basil Shubin <bashu@surgut.ru>\n" -"Language-Team: Russian\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=KOI8-R\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Choices -#: ../templates:3 -msgid "Create device files, Do nothing" -msgstr " , " - -#. Description -#: ../templates:5 -msgid "Create device files (/dev/pktcdvd0 etc.)?" -msgstr " (/dev/pktcdvd0 ..)?" - -#. Description -#: ../templates:5 -msgid "" -"The \"pktsetup\" tool supplied as part of the udftools package can be used " -"to set up packet writing for CD/DVD devices. However, the corresponding " -"device files /dev/pktcdvd0 etc. are not present on your system. Should I " -"create them?" -msgstr "" -" \"pktsetup\", udftools, " -" CD/DVD . " -" /dev/pktcdvd0 .. " -". ?" diff --git a/debian/po.bak/sv.po b/debian/po.bak/sv.po deleted file mode 100644 index 8fd5f94..0000000 --- a/debian/po.bak/sv.po +++ /dev/null @@ -1,46 +0,0 @@ -# Translators, if you are not familiar with the PO format, gettext -# documentation is worth reading, especially sections dedicated to -# this format, e.g. by running: -# info -n '(gettext)PO Files' -# info -n '(gettext)Header Entry' -# Some information specific to po-debconf are available at -# /usr/share/doc/po-debconf/README-trans -# or http://www.debian.org/intl/l10n/po-debconf/README-trans -# Developers do not need to manually edit POT or PO files. -# , fuzzy -# -# -msgid "" -msgstr "" -"Project-Id-Version: udftools 1.0.0b3-10\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2003-07-03 12:01+0200\n" -"PO-Revision-Date: 2005-10-04 06:54+0200\n" -"Last-Translator: Daniel Nylander <po@danielnylander.se>\n" -"Language-Team: Swedish <sv@li.org>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=iso-8859-1\n" -"Content-Transfer-Encoding: 8bit" - -#. Choices -#: ../templates:3 -msgid "Create device files, Do nothing" -msgstr "Skapa enhetsfiler, Gr inget" - -#. Description -#: ../templates:5 -msgid "Create device files (/dev/pktcdvd0 etc.)?" -msgstr "Skapa enhetsfiler (/dev/pktcdvd0 etc.)?" - -#. Description -#: ../templates:5 -msgid "" -"The \"pktsetup\" tool supplied as part of the udftools package can be used " -"to set up packet writing for CD/DVD devices. However, the corresponding " -"device files /dev/pktcdvd0 etc. are not present on your system. Should I " -"create them?" -msgstr "" -"Verktyget \"pktsetup\" som r en del av udftools-paketet kan anvndas fr att " -"konfigurera paketskrivning fr CD/DVD-enheter. Men de enhetsfiler som behvs " -"(/dev/pktcdvd0 etc) finns inte p ditt system. Ska jag skapa dom?" - diff --git a/debian/po.bak/templates.pot b/debian/po.bak/templates.pot deleted file mode 100644 index 86e4ab5..0000000 --- a/debian/po.bak/templates.pot +++ /dev/null @@ -1,44 +0,0 @@ -# -# Translators, if you are not familiar with the PO format, gettext -# documentation is worth reading, especially sections dedicated to -# this format, e.g. by running: -# info -n '(gettext)PO Files' -# info -n '(gettext)Header Entry' -# -# Some information specific to po-debconf are available at -# /usr/share/doc/po-debconf/README-trans -# or http://www.debian.org/intl/l10n/po-debconf/README-trans -# -# Developers do not need to manually edit POT or PO files. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2003-07-03 12:01+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Choices -#: ../templates:3 -msgid "Create device files, Do nothing" -msgstr "" - -#. Description -#: ../templates:5 -msgid "Create device files (/dev/pktcdvd0 etc.)?" -msgstr "" - -#. Description -#: ../templates:5 -msgid "" -"The \"pktsetup\" tool supplied as part of the udftools package can be used " -"to set up packet writing for CD/DVD devices. However, the corresponding " -"device files /dev/pktcdvd0 etc. are not present on your system. Should I " -"create them?" -msgstr "" diff --git a/debian/po.bak/vi.po b/debian/po.bak/vi.po deleted file mode 100644 index 556096e..0000000 --- a/debian/po.bak/vi.po +++ /dev/null @@ -1,36 +0,0 @@ -# Vietnamese translation for UDF Tools. -# Copyright © 2005 Free Software Foundation, Inc. -# Clytie Siddall <clytie@riverland.net.au>, 2005. -# -msgid "" -msgstr "" -"Project-Id-Version: udftools 1.0.0b3-9\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2003-07-03 12:01+0200\n" -"PO-Revision-Date: 2005-08-19 22:09+0930\n" -"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n" -"Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0\n" -"X-Generator: LocFactoryEditor 1.2.2\n" - -#. Choices -#: ../templates:3 -msgid "Create device files, Do nothing" -msgstr "Tạo tập tin thiết bị, Đừng làm gì" - -#. Description -#: ../templates:5 -msgid "Create device files (/dev/pktcdvd0 etc.)?" -msgstr "Tạo tập tin thiết bị (« /dev/pktcdvd0 » v.v.) không?" - -#. Description -#: ../templates:5 -msgid "" -"The \"pktsetup\" tool supplied as part of the udftools package can be used " -"to set up packet writing for CD/DVD devices. However, the corresponding " -"device files /dev/pktcdvd0 etc. are not present on your system. Should I " -"create them?" -msgstr "Công cụ « pktsetup » được cung cấp là phần gói udftools thì có thể được dùng để thiết lập khả năng ghi gói cho thiết bị đĩa CD/DVD. Tuy nhiên, không có những tập tin thiết bị tương ứng trong hệ thống bạn. Bạn có muốn trình này tạo chúng ngay bây giờ không?" diff --git a/debian/postinst b/debian/postinst deleted file mode 100644 index 1733bd1..0000000 --- a/debian/postinst +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh -e -# postinst script for udftools - -case "$1" in - configure) - ;; - - abort-upgrade|abort-remove|abort-deconfigure) - ;; - - *) - echo "postinst called with unknown argument \`$1'" >&2 - exit 0 - ;; -esac - -#DEBHELPER# - -exit 0 diff --git a/debian/postrm b/debian/postrm deleted file mode 100644 index 7633272..0000000 --- a/debian/postrm +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -e -# postrm script for udftools - -case "$1" in - purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) - ;; - *) - echo "postrm called with unknown argument \`$1'" >&2 - exit 0 - ;; -esac - -#DEBHELPER# - -exit 0 diff --git a/debian/rules b/debian/rules index 8cff2b1..5376477 100755 --- a/debian/rules +++ b/debian/rules @@ -1,81 +1,7 @@ #!/usr/bin/make -f +# -*- makefile -*- -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 +export DEB_BUILD_MAINT_OPTIONS = hardening=+all -configure: configure-stamp -configure-stamp: - dh_testdir mkudffs/main.c - dh_autoreconf - ./configure --prefix=/usr --mandir=\$${prefix}/share/man \ - --infodir=\$${prefix}/share/info - touch configure-stamp - -build: build-stamp - -patch-apply: - for f in `ls debian/patch-*.diff`; do \ - echo "Applying patch \`$$f'"; \ - patch --forward --dry -p1 <"$$f" \ - && patch --quiet --forward -p1 <"$$f"; \ - done -patch-unapply: - -for f in `ls -r debian/patch-*.diff`; do \ - echo "Reversing patch \`$$f'"; \ - patch --forward --reverse --dry -p1 <"$$f" \ - && patch --quiet --forward --reverse -p1 <"$$f"; \ - done - - -build-stamp: configure-stamp - dh_testdir mkudffs/main.c - $(MAKE) -f debian/rules patch-apply - $(MAKE) - touch build-stamp - -clean: - dh_testdir mkudffs/main.c - dh_testroot - rm -f build-stamp configure-stamp - -$(MAKE) distclean - dh_autoreconf_clean - -$(MAKE) -f debian/rules patch-unapply - rm -f include/stamp-h include/stamp-h[0-9]* - dh_clean - -install: build - dh_testdir mkudffs/main.c - dh_testroot - dh_clean -k - dh_installdirs - $(MAKE) install DESTDIR=$(CURDIR)/debian/udftools - rm -rf debian/udftools/usr/lib # libudffs not needed - rm -f debian/udftools/usr/bin/udffsck # Does nothing ATM - sed 's%^\(\.TH .*\) 8 %\1 1 %' <debian/udftools/usr/share/man/man8/mkudffs.8 >debian/udftools/usr/share/man/man1/mkudffs.1 - sed 's%^\(\.TH .*\) 8 %\1 1 %' <debian/udftools/usr/share/man/man8/pktsetup.8 >debian/udftools/usr/share/man/man1/pktsetup.1 - rm -rf debian/udftools/usr/share/man/man8 - -# Build architecture-independent files here. -binary-indep: build install - -# Build architecture-dependent files here. -binary-arch: build install - dh_testdir mkudffs/main.c - dh_testroot - dh_installdebconf - dh_installdocs - dh_installchangelogs - dh_installinit - dh_link - dh_strip - dh_compress - dh_fixperms - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install configure \ - patch-apply patch-unapply +%: + dh $@ --with autoreconf diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/udftools.docs b/debian/udftools.docs deleted file mode 100644 index 62deb04..0000000 --- a/debian/udftools.docs +++ /dev/null @@ -1 +0,0 @@ -AUTHORS diff --git a/debian/udftools.init b/debian/udftools.init index 9a1a1f4..3df4d3b 100644 --- a/debian/udftools.init +++ b/debian/udftools.init @@ -24,6 +24,8 @@ # writing device /dev/pktcdvd/0. ### END INIT INFO +. /lib/lsb/init-functions + set -e PATH=/sbin:/bin:/usr/sbin:/usr/bin @@ -60,7 +62,7 @@ if test -n "$DEVICES"; then fi fi if test -z "$UDEV"; then # User did not set UDEV, try auto-detection - if test -e /dev/.udev; then + if test -e /run/udev || test -e /dev/.udev; then UDEV=true else UDEV=false @@ -70,13 +72,13 @@ fi dostart() { if test -z "$DEVICES"; then - echo "Not starting $DESC: No devices listed in $DEFAULTFILE" + log_action_msg "Not starting $DESC, no devices listed in $DEFAULTFILE" else - echo "Starting $DESC:" + log_action_begin_msg "Starting $DESC" if $NEWINT; then set $NEWINTNAMES for DEVICE in $DEVICES; do - echo -n "/dev/pktcdvd/$1=$DEVICE " || true + log_action_cont_msg "/dev/pktcdvd/$1=$DEVICE" $PKTSETUP "$1" "$DEVICE" shift done @@ -87,24 +89,24 @@ dostart() { set $OLDINTNAMES fi for DEVICE in $DEVICES; do - echo -n "$1=$DEVICE " || true + log_action_cont_msg "$1=$DEVICE" $PKTSETUP "$1" "$DEVICE" shift done fi - echo "" + log_action_end_msg 0 fi } dostop() { if test -z "$DEVICES"; then - echo "Not stopping $DESC: No devices listed in $DEFAULTFILE" + log_action_msg "Not stopping $DESC, no devices listed in $DEFAULTFILE" else - echo "Stopping $DESC:" + log_action_begin_msg "Stopping $DESC" if $NEWINT; then set $NEWINTNAMES for DEVICE in $DEVICES; do - echo -n "/dev/pktcdvd/$1=$DEVICE " || true + log_action_cont_msg "/dev/pktcdvd/$1=$DEVICE" $PKTSETUP -d "$1" || true shift done @@ -115,22 +117,24 @@ dostop() { set $OLDINTNAMES fi for DEVICE in $DEVICES; do - echo -n "$1=$DEVICE " || true + log_action_cont_msg "$1=$DEVICE" $PKTSETUP -d "$1" || true shift done fi - echo "" + log_action_end_msg 0 fi } +set +e + case "$1" in start) dostart;; stop) dostop;; restart|force-reload) dostop; dostart;; status) nmappings=`$PKTSETUP -s | wc -l` - echo "Status of $DESC: $nmappings device mappings" + log_action_msg "Status of $DESC" "$nmappings device mappings" if test $nmappings -eq 0; then exit 1; fi ;; *) diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc new file mode 100644 index 0000000..32e2572 --- /dev/null +++ b/debian/upstream/signing-key.asc @@ -0,0 +1,41 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.11 (GNU/Linux) + +mQGiBEc+7j4RBADYPTqznflExRHwCUnn2TqwsiNvM/yRyS9ADKOsb2lFA7oVp9vJ +y+JWKsYRTH2Tk4n+42WCKbCXghgd4vDirAdOphWPs3X0iqxiXMdZS82cCZcFEHdc +PHUwm+wtQI/YCZC8HAVrlUxdsFOzkoc8nzHDbOAu2igJTvs3EhM76R5lFwCgzlpC +3gjnIjegZLaA5vIXf4vS/tMEAMQPZy033VzatGzkRFw6uZpSxuwv8Z+8szjIXSAn +HpziMncuX298w/sQi/CMffRL1bR3QuqWTIysd0Ft3d5aBNwQujxtyMb/ah40yO0e +OxWgCVXvM+7Re7HNlGsU9DXuvKq7eJvENNJxme4z49q0KKBpeAtyBOtrOq2libPO +8FgZA/0cC23Eustg4HwN89mSzjLIUHE0YaBij9JxSXST2C1j1N/lJ8lt0wIygvVZ +n21HjrIqsOYM4CKsdpRmQUECis6xr3nNfvhlhOcb6xN38PaATnYfIn4WSLi/qbiz +TPmO7JbtqHiy+uEoUj8WLSO42qVv/dxX6b5iB9olCYyaF0h3hLQiUGFsaSBSb2jD +oXIgPHBhbGkucm9oYXJAZ21haWwuY29tPohmBBMRAgAmAhsjBgsJCAcDAgQVAggD +BBYCAwECHgECF4AFAlZMjisFCRDwJNAACgkQi/DJPQPkQ1K+6ACgobLPvk1Yd1bX +4KdpQkd7KGZedOMAn3US31PT+pmrwoaPWH47KEGYFdQ/uQQNBEc+7owQEACtMxrp +7tCouz5JXU0CY6Ao1vTSvmYps8IP5dYre4N6iQKDI2W9Kpmj4TA9sTmmBGEpPWMW +b5Y5PWsiOi8Am6RQamhw6cLGiHfok4TPqGJvKcrBozoAvRrZb/w+HfTalAziivsl +0kjfGt4+LuZdq1AfCQI4MFc1lyNa2bNMLlnw87FQ2Q/29lCpkSJnzaxoEEr+0aD9 +jn/tOCN+qg4SDzDFDwuR6CjrDrrBLJ2UuYHhB74Kqr4vuj9a3KU6Gvh+qdqVWyP9 +gmgNgQ1arXDT1UfuNVMyD2CFOmOlUvCzdJlmRMuh8I0PRTViaAA12t4Pcqftu+au +ySTKhTztqzAcg0ymD7Nki5qutE4kWO0inde2+Ane7vZHVggwmlQ6oHdlFRal7N7/ +Z7Ws1NYwaPOaNC+3/EybAZvC6I6Mi3h3Su58w3LQouT4yxEIo//Xh2TR8EtfwXsV +DQIR/mb+TQBv3eZJ2jzfSzhSIlNzolvaqdp0RIeaXZD/nx4g72pUvIPziuCZWwRV +M3OKxtP6uS2kBzXx6PMXYwPhVnlxiNgwZt7b5fROGdKpgyTrUqbwE0ox4kJPVWgE +LGbbNyCl/z9cdEVUgfMFX06i9Po9mIZRA15tJM5ti4R8mY/xWAYRVcnYRoakEmJm +HBxM8Z0C0SmrURGbLhw/41pveWS5ytCAtBjKswADBQ//cFIM1EJsN3jncI4T+3t5 +y+YEdHaLvXsy0d7/maEtdSyxK4P5o6dzL/Dum7azk2Eq3KzHTQZaz7jUby6aqlEJ +WLwFqZkRUPY96inhKWjAvn8HwRecFfCknAYGVSWy++e5QavNPwsKHHOKF158XIEj ++sbsSXMOGAAe9MfqST1yUBkvdwKp1BC8f5i9uzp6sqb7/HojQhrU/+5ws1CBCH6u +3QVyjuxiiKOYzphFQJYyEQXZwq7t/kywsdyyysHkd33b4ANQAcmJHdgBXFUh4RET +li0fTmVfK6RII+ogM3OBqFw2UzKS2twnnJtvT//hiV4wA4aYY0jmAr79BQkSKDk2 +P7JlPSpy8otKULuuJggTWH99xvw5PFqbgatyUEsbg/qj1VuBXsUDbs04CXnI9PjY +N+BtGaikY9d6/M0GLCwNwT0/GQ4pqevbwmHdJn888ENx40Ix1xpA+WRn9ShHcc3G +1nNm0cXHz2Ti8pxN4yDGPnifUPpwTtcuKpCAIeUDE6ClMxDXggoUNIFJ/mtUwFTV ++FnVPYxBM/IqU89tBfWP/ZeCvpcetK1ftiVMZtS1DmioL2qWVnIqVBnv2TZcAyoV +/LMjnYXwlicsN7XBc/S5nDfLZobmN6oAF8FBF7H/2gFPOB2JeH0PqCr6JB6tF4LA +hjB+ipPDTRRbNhozXZw3U4mITwQYEQIADwIbDAUCVkyOTAUJEPAkuQAKCRCL8Mk9 +A+RDUuV/AJ9H2TdjSh/CZuECl6tFW42QICVtuACfW3zEvCaw8HR+/DhaG0PLT0Du +lP8= +=Gyy9 +-----END PGP PUBLIC KEY BLOCK----- diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..a23ef5b --- /dev/null +++ b/debian/watch @@ -0,0 +1,2 @@ +version=3 +opts=pgpsigurlmangle=s/$/.asc/ https://github.com/pali/udftools/releases /download/(\d\S*)/udftools-\1\.tar\.gz |