Control: tags 1022130 pending
Control: tags 829713 pending

I've uploaded an NMU fixing these two bugs to DELAYED/10:

diff -Nru tsdecrypt-10.0/debian/changelog tsdecrypt-10.0/debian/changelog
--- tsdecrypt-10.0/debian/changelog     2014-02-24 06:52:11.000000000 -0800
+++ tsdecrypt-10.0/debian/changelog     2022-11-10 13:54:44.000000000 -0800
@@ -1,3 +1,15 @@
+tsdecrypt (10.0-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+
+  [ Reiner Herrmann ]
+  * strip build date to enable reproducible building (Closes: #829713)
+
+  [ Vagrant Cascadian ]
+  * debian/rules: Pass default CFLAGS. (Closes: #1022130)
+
+ -- Vagrant Cascadian <vagr...@reproducible-builds.org>  Thu, 10 Nov 2022 
13:54:44 -0800
+
 tsdecrypt (10.0-2) unstable; urgency=low
 
   [ Peter Michael Green ]
diff -Nru tsdecrypt-10.0/debian/patches/series 
tsdecrypt-10.0/debian/patches/series
--- tsdecrypt-10.0/debian/patches/series        2014-02-24 06:48:10.000000000 
-0800
+++ tsdecrypt-10.0/debian/patches/series        2022-11-10 13:54:44.000000000 
-0800
@@ -1 +1,2 @@
 avoid-inappropriate-compiler-flags
+strip-build-date-to-enable-reproducible-.patch
diff -Nru 
tsdecrypt-10.0/debian/patches/strip-build-date-to-enable-reproducible-.patch 
tsdecrypt-10.0/debian/patches/strip-build-date-to-enable-reproducible-.patch
--- 
tsdecrypt-10.0/debian/patches/strip-build-date-to-enable-reproducible-.patch    
    1969-12-31 16:00:00.000000000 -0800
+++ 
tsdecrypt-10.0/debian/patches/strip-build-date-to-enable-reproducible-.patch    
    2022-11-10 13:54:44.000000000 -0800
@@ -0,0 +1,35 @@
+From: Reiner Herrmann <rei...@reiner-h.de>
+Date: Tue, 5 Jul 2016 16:30:30 +0200
+X-Dgit-Generated: 10.0-2.1 49e1f21bd0c38dda987a7157ce5a7b0e0cc7e986
+Subject: strip build date to enable reproducible building (Closes: #829713)
+
+
+---
+
+diff --git a/Makefile b/Makefile
+index 4e659f8..b1785ab 100644
+--- a/Makefile
++++ b/Makefile
+@@ -19,8 +19,7 @@ CFLAGS ?= -O2 -ggdb \
+  -W -Wall -Wextra \
+  -Wshadow -Wformat-security -Wstrict-prototypes
+ 
+-DEFS = -DBUILD_ID=\"$(BUILD_ID)\" \
+- -DVERSION=\"$(VERSION)\" -DGIT_VER=\"$(GIT_VER)\"
++DEFS = -DVERSION=\"$(VERSION)\" -DGIT_VER=\"$(GIT_VER)\"
+ DEFS += -D_FILE_OFFSET_BITS=64
+ 
+ PREFIX ?= /usr/local
+diff --git a/tsdecrypt.c b/tsdecrypt.c
+index cd55f48..178084a 100644
+--- a/tsdecrypt.c
++++ b/tsdecrypt.c
+@@ -40,7 +40,7 @@
+ #define FIRST_REPORT_SEC 3
+ 
+ #define PROGRAM_NAME "tsdecrypt"
+-static const char *program_id = PROGRAM_NAME " v" VERSION " (" GIT_VER ", 
build " BUILD_ID " " DLIB ")";
++static const char *program_id = PROGRAM_NAME " v" VERSION " (" GIT_VER ", " 
DLIB ")";
+ 
+ int keep_running = 1;
+ static FILE *log_file = NULL;
diff -Nru tsdecrypt-10.0/debian/rules tsdecrypt-10.0/debian/rules
--- tsdecrypt-10.0/debian/rules 2014-02-24 06:48:20.000000000 -0800
+++ tsdecrypt-10.0/debian/rules 2022-11-10 13:54:44.000000000 -0800
@@ -10,11 +10,11 @@
 override_dh_auto_build:
 override_dh_auto_install:
        # Build with FFdecsa
-       $(MAKE) ffdecsa
+       $(MAKE) CFLAGS="$(shell dpkg-buildflags --get CFLAGS)" ffdecsa
        mv tsdecrypt tsdecrypt_ffdecsa
        $(MAKE) distclean
        # Build against libdvbcsa
-       $(MAKE) dvbcsa
+       $(MAKE) CFLAGS="$(shell dpkg-buildflags --get CFLAGS)" dvbcsa
        mv tsdecrypt tsdecrypt_dvbcsa
        # Install binaries
        mkdir -p $(DESTDIR)$(PREFIX)/bin

Attachment: signature.asc
Description: PGP signature

_______________________________________________
pkg-multimedia-maintainers mailing list
pkg-multimedia-maintainers@alioth-lists.debian.net
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers

Reply via email to