r276 - in vdr/vdr/trunk/debian: . patches
Thomas Schmidt
pkg-vdr-dvb-changes@lists.alioth.debian.org
Mon, 21 Mar 2005 18:27:37 +0100
Author: tschmidt
Date: 2005-03-21 18:27:36 +0100 (Mon, 21 Mar 2005)
New Revision: 276
Added:
vdr/vdr/trunk/debian/patches/09_amd64_epg.dpatch
Modified:
vdr/vdr/trunk/debian/README.Debian
vdr/vdr/trunk/debian/changelog
vdr/vdr/trunk/debian/patches/00list
vdr/vdr/trunk/debian/patches/01_gcc3.4-FTBFS-fix.dpatch
vdr/vdr/trunk/debian/patches/01_gcc4.0-FTBFS-fix.dpatch
vdr/vdr/trunk/debian/patches/01_vdr_1.2.6-3.1.diff.gz.dpatch
vdr/vdr/trunk/debian/patches/02_Makefile-CFGDIR.dpatch
vdr/vdr/trunk/debian/patches/04_newplugin.dpatch
vdr/vdr/trunk/debian/patches/05_set_system_time_as_user.dpatch
vdr/vdr/trunk/debian/patches/06_default_svdrp_port_0.dpatch
vdr/vdr/trunk/debian/patches/07_not_as_root.dpatch
vdr/vdr/trunk/debian/patches/08_security_CAN-2005-0071.dpatch
vdr/vdr/trunk/debian/vdr.NEWS
vdr/vdr/trunk/debian/vdr.default
Log:
vdr: * Added fix for #300702
* Changed most appearances of my old email address to the
debian one
Modified: vdr/vdr/trunk/debian/README.Debian
===================================================================
--- vdr/vdr/trunk/debian/README.Debian 2005-03-20 11:37:33 UTC (rev 275)
+++ vdr/vdr/trunk/debian/README.Debian 2005-03-21 17:27:36 UTC (rev 276)
@@ -19,7 +19,7 @@
one of this packages installed, and are not happy with the default
priorities, you can select the binary via "update-alternatives --config vdr"
- -- Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>, Tue, 28 Dec 2004 14:22:21 +0100
+ -- Thomas Schmidt <tschmidt@debian.org>, Tue, 28 Dec 2004 14:22:21 +0100
Automatic Loading of Plugins
Modified: vdr/vdr/trunk/debian/changelog
===================================================================
--- vdr/vdr/trunk/debian/changelog 2005-03-20 11:37:33 UTC (rev 275)
+++ vdr/vdr/trunk/debian/changelog 2005-03-21 17:27:36 UTC (rev 276)
@@ -3,10 +3,11 @@
* NOT RELEASED YET
* Thomas Schmidt <tschmidt@debian.org>
+ - Added patch for the EPG handling under amd64 (closes: #300702)
- Fixed small typos in the package descriptions of vdr and
vdr-dev (closes: #300042, #300074)
- -- Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org> Thu, 17 Mar 2005 16:49:29 +0100
+ -- Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org> Mon, 21 Mar 2005 18:16:50 +0100
vdr (1.2.6-9) experimental; urgency=low
Modified: vdr/vdr/trunk/debian/patches/00list
===================================================================
--- vdr/vdr/trunk/debian/patches/00list 2005-03-20 11:37:33 UTC (rev 275)
+++ vdr/vdr/trunk/debian/patches/00list 2005-03-21 17:27:36 UTC (rev 276)
@@ -8,6 +8,7 @@
06_default_svdrp_port_0
07_not_as_root
08_security_CAN-2005-0071
+09_amd64_epg
13_remote
# The Elchi AIO 4d patch for a nicer OSD, inlcuding the frames and black
Modified: vdr/vdr/trunk/debian/patches/01_gcc3.4-FTBFS-fix.dpatch
===================================================================
--- vdr/vdr/trunk/debian/patches/01_gcc3.4-FTBFS-fix.dpatch 2005-03-20 11:37:33 UTC (rev 275)
+++ vdr/vdr/trunk/debian/patches/01_gcc3.4-FTBFS-fix.dpatch 2005-03-21 17:27:36 UTC (rev 276)
@@ -1,6 +1,6 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_gcc3.4-FTBFS-fix.dpatch by Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>
+## 01_gcc3.4-FTBFS-fix.dpatch by Thomas Schmidt <tschmidt@debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Fix for a FTBFS-Bug with gcc 3.4 (#262744)
Modified: vdr/vdr/trunk/debian/patches/01_gcc4.0-FTBFS-fix.dpatch
===================================================================
--- vdr/vdr/trunk/debian/patches/01_gcc4.0-FTBFS-fix.dpatch 2005-03-20 11:37:33 UTC (rev 275)
+++ vdr/vdr/trunk/debian/patches/01_gcc4.0-FTBFS-fix.dpatch 2005-03-21 17:27:36 UTC (rev 276)
@@ -1,5 +1,5 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_gcc4.0-FTBFS-fix.dpatch by Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>
+## 01_gcc4.0-FTBFS-fix.dpatch by Thomas Schmidt <tschmidt@debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Fix for the FTBFS-Bug with gcc 4.0 (#294041)
Modified: vdr/vdr/trunk/debian/patches/01_vdr_1.2.6-3.1.diff.gz.dpatch
===================================================================
--- vdr/vdr/trunk/debian/patches/01_vdr_1.2.6-3.1.diff.gz.dpatch 2005-03-20 11:37:33 UTC (rev 275)
+++ vdr/vdr/trunk/debian/patches/01_vdr_1.2.6-3.1.diff.gz.dpatch 2005-03-21 17:27:36 UTC (rev 276)
@@ -1,6 +1,6 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_vdr_1.2.6-3.1.diff.gz.dpatch by Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>
+## 01_vdr_1.2.6-3.1.diff.gz.dpatch by Thomas Schmidt <tschmidt@debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: New patch generated from vdr 1.2.6-3.1 diff.gz
Modified: vdr/vdr/trunk/debian/patches/02_Makefile-CFGDIR.dpatch
===================================================================
--- vdr/vdr/trunk/debian/patches/02_Makefile-CFGDIR.dpatch 2005-03-20 11:37:33 UTC (rev 275)
+++ vdr/vdr/trunk/debian/patches/02_Makefile-CFGDIR.dpatch 2005-03-21 17:27:36 UTC (rev 276)
@@ -1,6 +1,6 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_Makefile-CFGDIR.dpatch by Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>
+## 01_Makefile-CFGDIR.dpatch by Thomas Schmidt <tschmidt@debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.
Modified: vdr/vdr/trunk/debian/patches/04_newplugin.dpatch
===================================================================
--- vdr/vdr/trunk/debian/patches/04_newplugin.dpatch 2005-03-20 11:37:33 UTC (rev 275)
+++ vdr/vdr/trunk/debian/patches/04_newplugin.dpatch 2005-03-21 17:27:36 UTC (rev 276)
@@ -1,5 +1,5 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04_newplugin.dpatch by Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>
+## 04_newplugin.dpatch by Thomas Schmidt <tschmidt@debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Patch for the newplugin-script, to not require a normal
Modified: vdr/vdr/trunk/debian/patches/05_set_system_time_as_user.dpatch
===================================================================
--- vdr/vdr/trunk/debian/patches/05_set_system_time_as_user.dpatch 2005-03-20 11:37:33 UTC (rev 275)
+++ vdr/vdr/trunk/debian/patches/05_set_system_time_as_user.dpatch 2005-03-21 17:27:36 UTC (rev 276)
@@ -1,5 +1,5 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
-## 05_set_system_time_as_user.dpatch by Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>
+## 05_set_system_time_as_user.dpatch by Thomas Schmidt <tschmidt@debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Allow vdr to be run as a normal user, but keep the capability
Modified: vdr/vdr/trunk/debian/patches/06_default_svdrp_port_0.dpatch
===================================================================
--- vdr/vdr/trunk/debian/patches/06_default_svdrp_port_0.dpatch 2005-03-20 11:37:33 UTC (rev 275)
+++ vdr/vdr/trunk/debian/patches/06_default_svdrp_port_0.dpatch 2005-03-21 17:27:36 UTC (rev 276)
@@ -1,5 +1,5 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
-## 06_default_svdrp_port_0.dpatch by Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>
+## 06_default_svdrp_port_0.dpatch by Thomas Schmidt <tschmidt@debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: This sets the default svdrp-port to 0, which means that
Modified: vdr/vdr/trunk/debian/patches/07_not_as_root.dpatch
===================================================================
--- vdr/vdr/trunk/debian/patches/07_not_as_root.dpatch 2005-03-20 11:37:33 UTC (rev 275)
+++ vdr/vdr/trunk/debian/patches/07_not_as_root.dpatch 2005-03-21 17:27:36 UTC (rev 276)
@@ -1,5 +1,5 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
-## 07_not_as_root.dpatch by Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>
+## 07_not_as_root.dpatch by Thomas Schmidt <tschmidt@debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Refuse to run vdr as user root (Note: This patch requires the
Modified: vdr/vdr/trunk/debian/patches/08_security_CAN-2005-0071.dpatch
===================================================================
--- vdr/vdr/trunk/debian/patches/08_security_CAN-2005-0071.dpatch 2005-03-20 11:37:33 UTC (rev 275)
+++ vdr/vdr/trunk/debian/patches/08_security_CAN-2005-0071.dpatch 2005-03-21 17:27:36 UTC (rev 276)
@@ -1,5 +1,5 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
-## 08_security_CAN-2005-0071.dpatch by Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>
+## 08_security_CAN-2005-0071.dpatch by Thomas Schmidt <tschmidt@debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Fixes CAN-2005-0071 (It is not possible to overwrite files with
Added: vdr/vdr/trunk/debian/patches/09_amd64_epg.dpatch
===================================================================
--- vdr/vdr/trunk/debian/patches/09_amd64_epg.dpatch 2005-03-20 11:37:33 UTC (rev 275)
+++ vdr/vdr/trunk/debian/patches/09_amd64_epg.dpatch 2005-03-21 17:27:36 UTC (rev 276)
@@ -0,0 +1,29 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 09_amd64_epg.dpatch by Thomas Schmidt <tschmidt@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes the crc function to work under amd64 too
+## DP: (closes: #300702)
+
+@DPATCH@
+diff -urNad vdr-1.2.6/libdtv/libsi/si_parser.c /tmp/dpep.Y5cRRE/vdr-1.2.6/libdtv/libsi/si_parser.c
+--- vdr-1.2.6/libdtv/libsi/si_parser.c 2003-08-15 15:56:02.000000000 +0200
++++ /tmp/dpep.Y5cRRE/vdr-1.2.6/libdtv/libsi/si_parser.c 2005-03-21 18:13:17.285886176 +0100
+@@ -1278,7 +1278,7 @@
+
+ // CRC32 lookup table for polynomial 0x04c11db7
+
+-static u_long crc_table[256] = {
++static __u32 crc_table[256] = {
+ 0x00000000, 0x04c11db7, 0x09823b6e, 0x0d4326d9, 0x130476dc, 0x17c56b6b,
+ 0x1a864db2, 0x1e475005, 0x2608edb8, 0x22c9f00f, 0x2f8ad6d6, 0x2b4bcb61,
+ 0x350c9b64, 0x31cd86d3, 0x3c8ea00a, 0x384fbdbd, 0x4c11db70, 0x48d0c6c7,
+@@ -1326,7 +1326,7 @@
+ static u_long crc32 (char *data, int len)
+ {
+ register int i;
+- u_long crc = 0xffffffff;
++ __u32 crc = 0xffffffff;
+
+ for (i=0; i<len; i++)
+ crc = (crc << 8) ^ crc_table[((crc >> 24) ^ *data++) & 0xff];
Property changes on: vdr/vdr/trunk/debian/patches/09_amd64_epg.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Modified: vdr/vdr/trunk/debian/vdr.NEWS
===================================================================
--- vdr/vdr/trunk/debian/vdr.NEWS 2005-03-20 11:37:33 UTC (rev 275)
+++ vdr/vdr/trunk/debian/vdr.NEWS 2005-03-21 17:27:36 UTC (rev 276)
@@ -35,7 +35,7 @@
/var/lib/video.00. (These changes will only be asked when you
selected yes in the debconf-question to create the video-directory!)
- -- Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de> Fri, 14 Jan 2005 12:17:51 +0100
+ -- Thomas Schmidt <tschmidt@debian.org> Fri, 14 Jan 2005 12:17:51 +0100
vdr (1.2.6-4) unstable; urgency=low
@@ -61,4 +61,4 @@
If you allready have a commands.conf or reccmds.conf, you should move it
to /etc/vdr/command-hooks/{commands|reccmds}.custom.conf .
- -- Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de> Sat, 29 May 2004 19:43:49 +0200
+ -- Thomas Schmidt <tschmidt@debian.org> Sat, 29 May 2004 19:43:49 +0200
Modified: vdr/vdr/trunk/debian/vdr.default
===================================================================
--- vdr/vdr/trunk/debian/vdr.default 2005-03-20 11:37:33 UTC (rev 275)
+++ vdr/vdr/trunk/debian/vdr.default 2005-03-21 17:27:36 UTC (rev 276)
@@ -1,7 +1,4 @@
# /etc/default/vdr
-# Default config thanks to:
-# Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>
-# 29.01.2003
# Change to 1 to enable vdr's init-script
ENABLED=0