summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Brinkmann <luckyduck@gentoo.org>2005-01-25 16:15:33 +0000
committerJan Brinkmann <luckyduck@gentoo.org>2005-01-25 16:15:33 +0000
commit1403f13f92a7e95e93c777f591a6ce7148438d42 (patch)
treeae414a73b01daa872e648468836b8a693b41314b /media-video/vdr
parentswitch to linux-mod (yay!) (diff)
downloadhistorical-1403f13f92a7e95e93c777f591a6ce7148438d42.tar.gz
historical-1403f13f92a7e95e93c777f591a6ce7148438d42.tar.bz2
historical-1403f13f92a7e95e93c777f591a6ce7148438d42.zip
added security patch to fix CAN-2005-0071. also see bug #78230
Package-Manager: portage-2.0.51-r15
Diffstat (limited to 'media-video/vdr')
-rw-r--r--media-video/vdr/ChangeLog8
-rw-r--r--media-video/vdr/Manifest7
-rw-r--r--media-video/vdr/files/vdr-1.2.6_CAN-2005-0071.patch25
-rw-r--r--media-video/vdr/vdr-1.1.27.ebuild4
-rw-r--r--media-video/vdr/vdr-1.2.6.ebuild5
5 files changed, 40 insertions, 9 deletions
diff --git a/media-video/vdr/ChangeLog b/media-video/vdr/ChangeLog
index 7a63aedaa4a6..3391020ec773 100644
--- a/media-video/vdr/ChangeLog
+++ b/media-video/vdr/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-video/vdr
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.7 2004/10/27 08:12:07 phosphan Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.8 2005/01/25 16:15:33 luckyduck Exp $
+
+ 25 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org>
+ +files/vdr-1.2.6_CAN-2005-0071.patch, vdr-1.2.6.ebuild:
+ added security patch to fix CAN-2005-0071. also see bug #78230
27 Oct 2004; Patrick Kursawe <phosphan@gentoo.org>
files/vdr-1.2.6-gentoo.diff, vdr-1.2.6.ebuild:
diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index 9ddb10e32788..63c76af51807 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -1,8 +1,9 @@
-MD5 6ce20cefdcb696fc58317638e5df03bb vdr-1.2.6.ebuild 1353
-MD5 597613e960e8e76193eced3db475acfb vdr-1.1.27.ebuild 1095
-MD5 554a53727bbf6714d2e5f98bbb62c8e7 ChangeLog 867
+MD5 81940809e434a9ea4bb384e0b26efc75 vdr-1.2.6.ebuild 1399
+MD5 00e9e2c6ec1631d96741301a556873fe vdr-1.1.27.ebuild 1096
+MD5 c299a0eeea91b1890fc70c1d4d7ae9e3 ChangeLog 1044
MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
MD5 5df3de1f888e3fc8f8ba27623a19f40b files/digest-vdr-1.2.6 62
+MD5 aa18122fb081cdc19d419d53ad1f63de files/vdr-1.2.6_CAN-2005-0071.patch 893
MD5 ba8d55fa3c89f6743f01007e67529e37 files/digest-vdr-1.1.27 63
MD5 d0dc33e6e7863372013487b940482044 files/vdr-1.2.6-gentoo.diff 1848
MD5 c83ab35c3973b06f5c72e1efc4c37c31 files/vdr-1.1.27-gentoo.diff 1015
diff --git a/media-video/vdr/files/vdr-1.2.6_CAN-2005-0071.patch b/media-video/vdr/files/vdr-1.2.6_CAN-2005-0071.patch
new file mode 100644
index 000000000000..d9d573383e63
--- /dev/null
+++ b/media-video/vdr/files/vdr-1.2.6_CAN-2005-0071.patch
@@ -0,0 +1,25 @@
+--- vdr-1.2.6/dvbdevice.c.orig 2005-01-24 14:33:57.478927267 +0100
++++ vdr-1.2.6/dvbdevice.c 2005-01-24 14:37:04.732811047 +0100
+@@ -505,8 +505,10 @@
+ Quality = 255; //XXX is this 'best'???
+
+ isyslog("grabbing to %s (%s %d %d %d)", FileName, Jpeg ? "JPEG" : "PNM", Quality, vm.width, vm.height);
+- FILE *f = fopen(FileName, "wb");
+- if (f) {
++ int fd = open(FileName, O_CREAT | O_EXCL | O_TRUNC | O_RDWR, 0600);
++ if (fd > -1) {
++ FILE *f = fdopen(fd, "wb");
++ if (f) {
+ if (Jpeg) {
+ // write JPEG file:
+ struct jpeg_compress_struct cinfo;
+@@ -540,7 +542,8 @@
+ }
+ }
+ fclose(f);
+- }
++ }
++ }
+ else {
+ LOG_ERROR_STR(FileName);
+ result |= 1;
diff --git a/media-video/vdr/vdr-1.1.27.ebuild b/media-video/vdr/vdr-1.1.27.ebuild
index cb227c5e9271..03f23554bde4 100644
--- a/media-video/vdr/vdr-1.1.27.ebuild
+++ b/media-video/vdr/vdr-1.1.27.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.1.27.ebuild,v 1.6 2004/06/25 00:52:07 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.1.27.ebuild,v 1.7 2005/01/25 16:15:33 luckyduck Exp $
inherit eutils
diff --git a/media-video/vdr/vdr-1.2.6.ebuild b/media-video/vdr/vdr-1.2.6.ebuild
index 5dcad37d428c..e0547b79c6d2 100644
--- a/media-video/vdr/vdr-1.2.6.ebuild
+++ b/media-video/vdr/vdr-1.2.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.2.6.ebuild,v 1.4 2004/10/27 08:12:07 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.2.6.ebuild,v 1.5 2005/01/25 16:15:33 luckyduck Exp $
inherit eutils check-kernel
@@ -30,6 +30,7 @@ src_unpack() {
unpack ${A}
cd ${S}
epatch ${FILESDIR}/${P}-gentoo.diff
+ epatch ${FILESDIR}/${P}_CAN-2005-0071.patch
}
src_compile() {