--- yamdi-1.4.orig/Makefile +++ yamdi-1.4/Makefile @@ -1,7 +1,7 @@ # Makefile for yamdi CC=gcc -CFLAGS=-O2 -Wall +CFLAGS=-O2 -Wall -fstack-protector -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Wl,-z,relro yamdi: yamdi.c $(CC) $(CFLAGS) yamdi.c -o yamdi --- yamdi-1.4.orig/debian/docs +++ yamdi-1.4/debian/docs @@ -0,0 +1,2 @@ +README +CHANGES --- yamdi-1.4.orig/debian/compat +++ yamdi-1.4/debian/compat @@ -0,0 +1 @@ +5 --- yamdi-1.4.orig/debian/rules +++ yamdi-1.4/debian/rules @@ -0,0 +1,88 @@ +#!/usr/bin/make -f + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +CFLAGS = -Wall -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif + +configure: configure-stamp +configure-stamp: patch + dh_testdir + # no configure commands + + touch configure-stamp + + +build: build-stamp + +build-stamp: configure-stamp + dh_testdir + + $(MAKE) + + touch $@ + +clean: clean-patched unpatch + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + + -$(MAKE) clean + + dh_clean + +clean-patched: + dh_testdir + dh_testroot + rm -rf debian/yamdi + rm -rf debian/files + rm -rf debian/substvars + +patch: patch-stamp +patch-stamp: + dpatch apply-all + dpatch cat-all > patch-stamp + +unpatch: + dpatch deapply-all + rm -rf patch-stamp debian/patched + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + $(MAKE) DESTDIR=$(CURDIR)/debian/yamdi install + + +# Build architecture-independent files here. +binary-indep: build install + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs CHANGES + dh_installdocs +# dh_installexamples +# dh_install + dh_installman man1/yamdi.1 + 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 --- yamdi-1.4.orig/debian/control +++ yamdi-1.4/debian/control @@ -0,0 +1,15 @@ +Source: yamdi +Section: utils +Priority: extra +Maintainer: Todd Troxell +Build-Depends: debhelper (>= 5), dpatch +Standards-Version: 3.7.2 +XS-Vcs-Hg: http://code.rapidpacket.com/yamdi/ + +Package: yamdi +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: a utility for adding metadata to flash video files + yamdi is a fast console application for adding various metadata to flv files. + The program buffers its input file, rather than loading into memory in its + entirety. --- yamdi-1.4.orig/debian/copyright +++ yamdi-1.4/debian/copyright @@ -0,0 +1,43 @@ +This package was debianized by Todd Troxell on +Fri, 24 Aug 2007 07:03:05 -0400. + +It was downloaded from http://yamdi.sourceforge.net/ + +Upstream Author: + + Ingo Oppermann + +Copyright: + + Copyright (c) 2007, Ingo Oppermann + +License: + + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of the copyright holder nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + +The Debian packaging is (C) 2007, Todd Troxell and +is licensed under the GPL, see `/usr/share/common-licenses/GPL'. --- yamdi-1.4.orig/debian/changelog +++ yamdi-1.4/debian/changelog @@ -0,0 +1,38 @@ +yamdi (1.4-2) unstable; urgency=low + + * Add dpatch to Build-Depends + * Add patch to fix invalid height of 0 in flvs from Krystian Kichewko + + * Enable dpatch in debian/rules + + -- Todd Troxell Mon, 23 Feb 2009 09:48:43 -0500 + +yamdi (1.4-1) unstable; urgency=low + + * Sync to upstream version 1.4. + * Re-add security flags to Makefile. + * Relocate manpage to be more compatible with upstream version. + + -- Todd Troxell Sat, 24 May 2008 14:03:28 -0400 + +yamdi (1.2-3) unstable; urgency=low + + * Change -z,norelro to -z,relro in Makefile + * Add watch file + * Add XS-Vcs-hg header to debian/control + + -- Todd Troxell Sat, 2 Feb 2008 23:31:43 -0500 + +yamdi (1.2-2) unstable; urgency=low + + * Add security hardening CFLAGS + * Rephrase package description + + -- Todd Troxell Tue, 29 Jan 2008 17:03:35 -0500 + +yamdi (1.2-1) unstable; urgency=low + + * Initial release (Closes: #439190) + + -- Todd Troxell Fri, 24 Aug 2007 07:03:05 -0400 + --- yamdi-1.4.orig/debian/watch +++ yamdi-1.4/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://sf.net/yamdi/yamdi-(.*)\.tar\.gz --- yamdi-1.4.orig/debian/dirs +++ yamdi-1.4/debian/dirs @@ -0,0 +1 @@ +usr/bin --- yamdi-1.4.orig/debian/patches/01_zero_height_fix.dpatch +++ yamdi-1.4/debian/patches/01_zero_height_fix.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: zero_height_fix + +@DPATCH@ +diff -u yamdi-1.4-orig/yamdi.c yamdi-1.4/yamdi.c +--- yamdi-1.4-orig/yamdi.c 2008-05-24 12:09:15.000000000 -0400 ++++ yamdi-1.4/yamdi.c 2009-02-23 10:09:15.000000000 -0500 +@@ -803,7 +803,9 @@ + void readFLVVP62VideoPacket(const unsigned char *vp62) { + flvmetadata.width = (double)(vp62[4] * 16 - (vp62[0] >> 4)); + flvmetadata.height = (double)(vp62[3] * 16 - (vp62[0] & 0x0f)); +- ++ if (flvmetadata.height <= 0.0) { ++ flvmetadata.height = (double)(vp62[5] * 16 - (vp62[0] & 0x0f)); ++ } + return; + } --- yamdi-1.4.orig/debian/patches/00list +++ yamdi-1.4/debian/patches/00list @@ -0,0 +1 @@ +01_zero_height_fix.dpatch