--- dvdtape-1.6.orig/Makefile +++ dvdtape-1.6/Makefile @@ -3,6 +3,7 @@ MANDIR=${prefix}/man CFLAGS=-O2 -D_FILE_OFFSET_BITS=64 -Wall +LDFLAGS= -Wl,-z,relro PROGRAM=dvdtape OBJECTS=dvdtape.o isosize.o @@ -10,6 +11,7 @@ all: $(PROGRAM) $(PROGRAM): $(OBJECTS) + $(CC) $(LDFLAGS) -o $(PROGRAM) $(OBJECTS) install: all install $(PROGRAM) $(BINDIR) --- dvdtape-1.6.orig/debian/changelog +++ dvdtape-1.6/debian/changelog @@ -0,0 +1,16 @@ +dvdtape (1.6-2) unstable; urgency=medium + + * Update debhelper compat level. Closes: #800175 + * Update Standards-Version and fix related minor lintian warnings + * Fix some minor compilation warnings + * Build with hardening support + + -- Steve McIntyre <93sam@debian.org> Tue, 17 Nov 2015 23:39:11 +0000 + +dvdtape (1.6-1) unstable; urgency=high + + * Initial upload. Urgency high to get this into sarge; we need to use + this software to create DVD masters for the release! + + -- Steve McIntyre <93sam@debian.org> Wed, 18 Aug 2004 11:43:43 +0100 + --- dvdtape-1.6.orig/debian/compat +++ dvdtape-1.6/debian/compat @@ -0,0 +1 @@ +9 --- dvdtape-1.6.orig/debian/control +++ dvdtape-1.6/debian/control @@ -0,0 +1,16 @@ +Source: dvdtape +Section: utils +Priority: extra +Maintainer: Steve McIntyre <93sam@debian.org> +Build-Depends: debhelper (>= 9) +Standards-Version: 3.9.6.0 + +Package: dvdtape +Priority: extra +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Create DVD master filesystems on DLT media + This tool will create the control files needed when mastering DVDs for + manufacturing (DDP information, DDPMS information, "lead in") and + output them to DLT tape(s) or disk files as desired. +Section: utils --- dvdtape-1.6.orig/debian/copyright +++ dvdtape-1.6/debian/copyright @@ -0,0 +1,20 @@ +This is the Debian GNU/Linux prepackaged version of dvdtape, a tool +written by Adam J. Richter to create the metadata +needed when mastering DVDs for manufacture. + + Copyright 1999, 2000 Yggdrasil Computing, Inc. dvdtape may be copied + under the terms and conditions of version 2 of the GNU General + Public License, as published by the Free Software Foundation + (Cambridge, MA, USA). + +On Debian GNU/Linux systems, the complete text of the GNU General +Public License Version 2 can be found in +/usr/share/common-licenses/GPL-2 . + +This package was put together by Steve McIntyre <93sam@debian.org> +from sources obtained from: + +ftp://ftp.freebsd.org/pub/FreeBSD/ports/distfiles/ + +since the original upstream sources at Yggdrasil no longer seem +available. --- dvdtape-1.6.orig/debian/rules +++ dvdtape-1.6/debian/rules @@ -0,0 +1,62 @@ +#!/usr/bin/make -f +# Sample debian/rules that uses debhelper. +# This file is public domain software, originally written by Joey Hess. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +build-arch build-indep: build-stamp + +build-stamp: + dh_testdir + make + touch build-stamp + +clean: + dh_testdir + dh_testroot + rm -f build-stamp + + # Add here commands to clean up after the build process. + -$(MAKE) clean + -$(MAKE) distclean + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_prep + dh_installdirs usr/share/man/man1 usr/bin + + # Add here commands to install the package into debian/ + #$(MAKE) prefix=`pwd`/debian/`dh_listpackages`/usr install + dh_install dvdtape usr/bin + dh_install dvdtape.1 usr/share/man/man1 + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs + dh_installchangelogs ChangeLog + dh_installdocs + dh_installexamples + dh_installman + dh_link + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +build: build-arch build-indep +.PHONY: build-arch build-indep build clean binary-indep binary-arch binary --- dvdtape-1.6.orig/debian/source/format +++ dvdtape-1.6/debian/source/format @@ -0,0 +1 @@ +1.0 --- dvdtape-1.6.orig/debian/substvars +++ dvdtape-1.6/debian/substvars @@ -0,0 +1 @@ +shlibs:Depends=libc6 (>= 2.3.2.ds1-4) --- dvdtape-1.6.orig/dvdtape.c +++ dvdtape-1.6/dvdtape.c @@ -270,7 +270,7 @@ } static void -full_read(int infd, char *buf, int len) { +full_read(int infd, unsigned char *buf, int len) { while (len > 0) { int this_len = read(infd, buf, len); if (this_len < 0) { @@ -291,7 +291,7 @@ } static void -full_write(int outfd, const char *buf, int len) { +full_write(int outfd, const unsigned char *buf, int len) { while (len > 0) { int this_len = write(outfd, buf, len); if (this_len < 0) { @@ -312,7 +312,7 @@ int blkcount = 0; int nblocks = length / blocksize; while (length > 0) { - char buf[blocksize]; + unsigned char buf[blocksize]; if (length >= blocksize) { full_read(infd, buf, blocksize); full_write(outfd, buf, blocksize); @@ -335,8 +335,8 @@ static void write_vol_label(int outfd) { - char buf[81]; - sprintf(buf, + unsigned char buf[81]; + sprintf((char *)buf, "VOL1" /* Label ID */ "REEL%-2d" /* Reel ID */ " " /* Accessibility */ @@ -351,8 +351,8 @@ static void write_hdr1(int outfd, char *labelid, char *fileid, int block_count) { - char buf[81]; - sprintf(buf, + unsigned char buf[81]; + sprintf((char *)buf, "%-4.4s" /* Label ID */ "%-17.17s" /* File ID */ "DVD " /* File set ID, 6 bytes */ @@ -394,8 +394,8 @@ static void write_hdr2(int outfd, char *labelid, int blocksize, int recordsize) { - char buf[81]; - sprintf(buf, + unsigned char buf[81]; + sprintf((char *)buf, "%-4.4s" /* Label ID */ "F" /* Record format, "F" = fixed */ "%05d" /* block size */ @@ -411,14 +411,14 @@ static void write_ddpid(int outfd) { - char buf[129]; + unsigned char buf[129]; char txtsize[3]; if (strlen(usertext) == 0) strcpy(txtsize, " "); else - sprintf (txtsize, "%02d", strlen(usertext)); + sprintf (txtsize, "%02lu", strlen(usertext)); - sprintf(buf, + sprintf((char *)buf, "DDP 2.00" /* DDP level */ " " /* UPC, reserved, 13 bytes */ " " /* MSS, Map Stream Start, 8 bytes */ @@ -456,8 +456,8 @@ static void write_ddpms(int outfd, char *streamtype, int start, int len, char *filename) { - char buf[129]; - sprintf(buf, + unsigned char buf[129]; + sprintf((char *)buf, "VVVM" /* MPV Map Packet Valid */ "%-2.2s" /* DST Data Stream Type "D2" = control @@ -571,7 +571,7 @@ write_control_file(int outfd) { int control_size; int control_fd = -1; - char *control; + unsigned char *control; if (control_filename == NULL) { control_size = DEFAULT_CONTROL_SIZE; --- dvdtape-1.6.orig/isosize.c +++ dvdtape-1.6/isosize.c @@ -65,13 +65,11 @@ u64 isosize(int infile) { struct iso_primary_descriptor ipd; - struct iso_directory_record * idr; unsigned int blksize; lseek(infile, 16 << 11, 0); read(infile, &ipd, sizeof(ipd)); - idr = (struct iso_directory_record *) &ipd.root_directory_record; blksize = isonum_733(ipd.logical_block_size); blksize &= (1<<16)-1; if (blksize == 0) blksize = 2048;