Improve patches.

Package-Manager: portage-2.1.6.13/cvs/Linux i686

4 files changed, 86 insertions, 54 deletions

diff --git a/media-video/vdr/ChangeLog b/media-video/vdr/ChangeLog
index a974223d0ec8..491f373cc0e6 100644
--- a/media-video/vdr/ChangeLog
+++ b/media-video/vdr/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/vdr
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.130 2009/06/04 12:37:14 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.131 2009/06/16 10:05:39 zzam Exp $
+
+  16 Jun 2009; Matthias Schwarzott <zzam@gentoo.org>
+  files/vdr-1.6.0-gcc-4.4.diff, files/vdr-dvb-api-5-is-fine.diff:
+  Improve patches.
 
 *vdr-1.6.0_p2-r3 (04 Jun 2009)
 
diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index 1a252300a091..64218b90c4bb 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -7,10 +7,10 @@ AUX vdr-1.4.7-makefile-install-header.diff 1001 RMD160 82aeac50445709f79da2e2536
 AUX vdr-1.6.0-dxr3-subtitlehack.diff 758 RMD160 f329bc9a66db93b7b723352412e4b6404318223c SHA1 c796c9062d673b07123bf926717f0d1370a5f4bf SHA256 3c150749a01e70111395854a8741b4de4c0fbef92372fcfcfeaa7c10312e5053
 AUX vdr-1.6.0-extensions-72-gcc-4.4.diff 1387 RMD160 b5ec4e39d6dd243e9893f4c839ddd2470619171e SHA1 029e6a53fc62efed5854355d9b924d8c801144ec SHA256 bf225b66249e17635412a3211d024b341e53ef8c3715b8ca1a7aa63d32cc4a45
 AUX vdr-1.6.0-extensions-gcc-4.4.diff 1393 RMD160 d301519e1f4a994d04bc02a7fdf3aae9639a8615 SHA1 61cd7fcbdeca8135f2b3c068812898f94048979b SHA256 6fc5424efcb28dfc6fddf2bcff61f2ae387aea741ae8bfad7c3d93427f0ee0b2
-AUX vdr-1.6.0-gcc-4.4.diff 3334 RMD160 fbf6f3d1dd59bbbbdcd4c2cbf7bfafaf427cc433 SHA1 16dba475c55538ddf1703bdfbadb7bcc2e44f307 SHA256 f8b4a28b05eb87eb38e173220735cd0d6f9dd668b47d5cc907c3638287fec60d
+AUX vdr-1.6.0-gcc-4.4.diff 4508 RMD160 fc9a2990b9b25490433be2f93fdf692fd5059e6b SHA1 c0b8f351bd9e5af2cc1ce1a9d51be852c1d8c5ca SHA256 7dcf712337877ca4b162ee50416b844f54de286cd2be22844539e83336b567fe
 AUX vdr-1.6.0-makefile-install-header.diff 1064 RMD160 8be661d2eca9b9f02a7a31ed6c312f3731cf5aed SHA1 f96b5d2444c5b11a3374274f37492b741d1213de SHA256 e3d9d76d0ede46b93473abe72d05771b02b1e19c380d98c48375e94a5ecab0df
 AUX vdr-add-svdrp-down-0.1.diff 2718 RMD160 5563bac57e73c82b5fa96c4384f76f5b2b300f31 SHA1 f6bdd7d2a4428e493a8bddfb849bbd528c8e7d84 SHA256 ad2126451f04a1924367210444878f2225902e08e93fcb96a8de765eb508711e
-AUX vdr-dvb-api-5-is-fine.diff 452 RMD160 d384cf344ed8d576c5466759d2f874820e416ff2 SHA1 792c1a92e90f1e2793c32ec797a02e9d1fcf6b9b SHA256 6069910e9670818e88be5e84c7ed74c8a6da5631e7a3cf13c862726c320f30ce
+AUX vdr-dvb-api-5-is-fine.diff 392 RMD160 599009b4adedd9ef010b899b96744b29fa407ed7 SHA1 cf99f962034a5f7e5ba1cf06557e01e7d56bd281 SHA256 ba126c8233bae50f514aa713072027968d9e115e0d154e2e1d31fe1b8cbbb403
 AUX vdr-set-dumpable.diff 734 RMD160 d5a261d121855ac4caa9cb47918850538dc26d88 SHA1 85b037d84c834021146d0c0ef515a90c2457defa SHA256 4ae1734ef10893d573e2079c1604f890ed8ae0415cbf2a0de9843174a27eb442
 DIST VDR-Extensions-Patch-42.tar.bz2 260453 RMD160 1610f9c4d3bcca0361b7906e2d9ce62dcfa066c2 SHA1 9b4af40ffa256b6f3eb5f762b1bebe908acc578e SHA256 18c4993b84b3e7aa02db4fc9929cf7c3c6ccbfe8b680f465bbff011c6fd31f80
 DIST VDR-Extensions-Patch-54.tar.bz2 371669 RMD160 fb05d5ea424a310f1151b7c269bf092abcd16a92 SHA1 8497d2bc68cd8c7695bccbb95425410b7af7edf4 SHA256 34ecf440d0ef100a6f05b552be55bc4936727c5259995847b89e0e1ce8c1d7dd
@@ -30,12 +30,12 @@ EBUILD vdr-1.4.7-r12.ebuild 9677 RMD160 65ae2c82dde3733cfbe2d4086c6e9be42585a988
 EBUILD vdr-1.6.0_p2-r2.ebuild 11614 RMD160 201682bfc58dd3eefab785dc09d3e13ebc16679c SHA1 db17c878ec0bff4b55e54573e6122349efa503eb SHA256 2d70a12db4a376c27e59f6254ccae06af91f38efd95cc570a5db228edd45cc62
 EBUILD vdr-1.6.0_p2-r3.ebuild 11675 RMD160 6004e71d39092990c783e17e072ff5e88e00dde8 SHA1 5a90ce4c15e43de44f006aca2ab4541e23ad3228 SHA256 646f00fed4b3b5cb3bd4fc7b275531744ef1654123dbfee504a5b7d448c2b0eb
 EBUILD vdr-1.6.0_p2.ebuild 10938 RMD160 214c0ea02b314c1405b75c84dba703c88c207065 SHA1 b24a428ff197d8fc7178d213cc36a8c7f1675027 SHA256 7c53292e775328133a1a85450e75598055cc1d93429c36e62f4c7339ebc2de57
-MISC ChangeLog 23434 RMD160 21acb76b8b4d81b51d0cd6694f39a8f30723b298 SHA1 6e8d6987e819c842c9f3e3d824ed4ed677351e08 SHA256 14a4f41cdca16e1a8851879e7541b7de50569bdb736c9cfb8c0ca75f98937611
+MISC ChangeLog 23573 RMD160 257e902659c85cc4775bdd21109b3276db5f7057 SHA1 7b867e8d6c8e59f0b5ffce7ae0060c93af1c6efe SHA256 b1ee6e9b6078a2dc2b6fbec783a1990c12371ed6e3bfbab9d777cafd7aa7c674
 MISC metadata.xml 5397 RMD160 854794df314a24ce5c1f08c5731682fdcb668be0 SHA1 15acf882a2ba20406a94144eede03cfe2877018d SHA256 f15b57b9dc4ad15ff9601b842f03c4998bf639a4d44b93105d579eb2be92c7ba
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkonwAYACgkQt2vP6XvVdOdyVgCg3jWTXtKyHRKohjKR6/7i3BfH
-clUAoJpZP9ckf314kEjVFDGX6rZp30H3
-=uhq4
+iEYEARECAAYFAko3bngACgkQt2vP6XvVdOexRQCfb32Kfk0RiCQ6AMpirSAnZPoX
+yqwAmwU6QQ5g00kcx7JIMtoPjRQ/qdMg
+=oZTY
 -----END PGP SIGNATURE-----
diff --git a/media-video/vdr/files/vdr-1.6.0-gcc-4.4.diff b/media-video/vdr/files/vdr-1.6.0-gcc-4.4.diff
index 23eb78ec3b8c..e57458deb180 100644
--- a/media-video/vdr/files/vdr-1.6.0-gcc-4.4.diff
+++ b/media-video/vdr/files/vdr-1.6.0-gcc-4.4.diff
@@ -1,31 +1,7 @@
-diff -ru vdr-1.6.0-orig/channels.c vdr-1.6.0/channels.c
---- vdr-1.6.0-orig/channels.c	2009-06-04 10:34:56.144472994 +0200
-+++ vdr-1.6.0/channels.c	2009-06-04 10:34:33.341139740 +0200
-@@ -574,7 +574,7 @@
-      }
-   else
-      q += sprintf(q, " none");
--  dsyslog(buffer);
-+  dsyslog("%s", buffer);
- }
- 
- void cChannel::SetRefChannel(cChannel *RefChannel)
-diff -ru vdr-1.6.0-orig/receiver.c vdr-1.6.0/receiver.c
---- vdr-1.6.0-orig/receiver.c	2009-06-04 10:34:46.547807527 +0200
-+++ vdr-1.6.0/receiver.c	2009-06-04 10:35:26.074465985 +0200
-@@ -40,7 +40,7 @@
- {
-   if (device) {
-      const char *msg = "ERROR: cReceiver has not been detached yet! This is a design fault and VDR will segfault now!";
--     esyslog(msg);
-+     esyslog("%s", msg);
-      fprintf(stderr, "%s\n", msg);
-      *(char *)0 = 0; // cause a segfault
-      }
-diff -ru vdr-1.6.0-orig/recording.c vdr-1.6.0/recording.c
---- vdr-1.6.0-orig/recording.c	2009-06-04 10:34:56.141139523 +0200
-+++ vdr-1.6.0/recording.c	2009-06-04 10:34:33.337807723 +0200
-@@ -509,8 +509,8 @@
+diff --git a/recording.c b/recording.c
+--- a/recording.c
++++ b/recording.c
+@@ -509,8 +509,8 @@ cRecording::cRecording(cTimer *Timer, const cEvent *Event)
       Utf8Strn0Cpy(SubtitleBuffer, Subtitle, MAX_SUBTITLE_LENGTH);
       Subtitle = SubtitleBuffer;
       }
@@ -36,7 +12,7 @@ diff -ru vdr-1.6.0-orig/recording.c vdr-1.6.0/recording.c
    if (macroTITLE || macroEPISODE) {
       name = strdup(Timer->File());
       name = strreplace(name, TIMERMACRO_TITLE, Title);
-@@ -551,7 +551,7 @@
+@@ -551,7 +551,7 @@ cRecording::cRecording(const char *FileName)
    sortBuffer = NULL;
    fileName = strdup(FileName);
    FileName += strlen(VideoDirectory) + 1;
@@ -45,20 +21,19 @@ diff -ru vdr-1.6.0-orig/recording.c vdr-1.6.0/recording.c
  
    name = NULL;
    info = new cRecordingInfo;
-@@ -1022,7 +1022,8 @@
+@@ -1022,7 +1022,7 @@ void cRecordings::DelByName(const char *FileName)
    if (recording) {
       cThreadLock DeletedRecordingsLock(&DeletedRecordings);
       Del(recording, false);
 -     char *ext = strrchr(recording->FileName(), '.');
-+     // wtf?
-+     char *ext = strrchr(const_cast<char*>(recording->FileName()), '.');
++     char *ext = strrchr(recording->fileName, '.');
       if (ext) {
          strncpy(ext, DELEXT, strlen(ext));
          recording->fileSizeMB = DirSizeMB(recording->FileName());
-diff -ru vdr-1.6.0-orig/svdrp.c vdr-1.6.0/svdrp.c
---- vdr-1.6.0-orig/svdrp.c	2009-06-04 10:34:56.141139523 +0200
-+++ vdr-1.6.0/svdrp.c	2009-06-04 10:34:33.337807723 +0200
-@@ -736,7 +736,7 @@
+diff --git a/svdrp.c b/svdrp.c
+--- a/svdrp.c
++++ b/svdrp.c
+@@ -736,7 +736,7 @@ void cSVDRP::CmdGRAB(const char *Option)
       char *strtok_next;
       FileName = strtok_r(p, delim, &strtok_next);
       // image type:
@@ -67,19 +42,74 @@ diff -ru vdr-1.6.0-orig/svdrp.c vdr-1.6.0/svdrp.c
       if (Extension) {
          if (strcasecmp(Extension, ".jpg") == 0 || strcasecmp(Extension, ".jpeg") == 0)
             Jpeg = true;
-@@ -796,12 +796,12 @@
+@@ -795,16 +795,17 @@ void cSVDRP::CmdGRAB(const char *Option)
+      char RealFileName[PATH_MAX];
       if (FileName) {
          if (grabImageDir) {
-            cString s;
+-           cString s;
 -           char *slash = strrchr(FileName, '/');
-+           char *slash = strrchr(const_cast<char*>(FileName), '/');
++           cString s(FileName);
++           FileName = s;
++           const char *slash = strrchr(FileName, '/');
             if (!slash) {
                s = AddDirectory(grabImageDir, FileName);
                FileName = s;
                }
--           slash = strrchr(FileName, '/'); // there definitely is one
-+           slash = strrchr(const_cast<char*>(FileName), '/'); // there definitely is one
-            *slash = 0;
-            char *r = realpath(FileName, RealFileName);
-            *slash = '/';
-
+            slash = strrchr(FileName, '/'); // there definitely is one
+-           *slash = 0;
+-           char *r = realpath(FileName, RealFileName);
+-           *slash = '/';
++           cString t(s);
++           t.Truncate(slash - FileName);
++           char *r = realpath(t, RealFileName);
+            if (!r) {
+               LOG_ERROR_STR(FileName);
+               Reply(501, "Invalid file name \"%s\"", FileName);
+diff --git a/channels.c b/channels.c
+--- a/channels.c
++++ b/channels.c
+@@ -574,7 +574,7 @@ void cChannel::SetLinkChannels(cLinkChannels *LinkChannels)
+      }
+   else
+      q += sprintf(q, " none");
+-  dsyslog(buffer);
++  dsyslog("%s", buffer);
+ }
+ 
+ void cChannel::SetRefChannel(cChannel *RefChannel)
+diff --git a/device.c b/device.c
+--- a/device.c
++++ b/device.c
+@@ -529,7 +529,7 @@ eVideoSystem cDevice::GetVideoSystem(void)
+   return vsPAL;
+ }
+ 
+-//#define PRINTPIDS(s) { char b[500]; char *q = b; q += sprintf(q, "%d %s ", CardIndex(), s); for (int i = 0; i < MAXPIDHANDLES; i++) q += sprintf(q, " %s%4d %d", i == ptOther ? "* " : "", pidHandles[i].pid, pidHandles[i].used); dsyslog(b); }
++//#define PRINTPIDS(s) { char b[500]; char *q = b; q += sprintf(q, "%d %s ", CardIndex(), s); for (int i = 0; i < MAXPIDHANDLES; i++) q += sprintf(q, " %s%4d %d", i == ptOther ? "* " : "", pidHandles[i].pid, pidHandles[i].used); dsyslog("%s", b); }
+ #define PRINTPIDS(s)
+ 
+ bool cDevice::HasPid(int Pid) const
+diff --git a/pat.c b/pat.c
+--- a/pat.c
++++ b/pat.c
+@@ -144,7 +144,7 @@ void cCaDescriptors::AddCaDescriptor(SI::CaDescriptor *d, bool Stream)
+   q += sprintf(q, "CAM: %04X %5d %5d %04X %d -", source, transponder, serviceId, d->getCaType(), Stream);
+   for (int i = 0; i < nca->Length(); i++)
+       q += sprintf(q, " %02X", nca->Data()[i]);
+-  dsyslog(buffer);
++  dsyslog("%s", buffer);
+ #endif
+ }
+ 
+diff --git a/receiver.c b/receiver.c
+--- a/receiver.c
++++ b/receiver.c
+@@ -40,7 +40,7 @@ cReceiver::~cReceiver()
+ {
+   if (device) {
+      const char *msg = "ERROR: cReceiver has not been detached yet! This is a design fault and VDR will segfault now!";
+-     esyslog(msg);
++     esyslog("%s", msg);
+      fprintf(stderr, "%s\n", msg);
+      *(char *)0 = 0; // cause a segfault
+      }
diff --git a/media-video/vdr/files/vdr-dvb-api-5-is-fine.diff b/media-video/vdr/files/vdr-dvb-api-5-is-fine.diff
index b5657e84636a..7f851f77b05a 100644
--- a/media-video/vdr/files/vdr-dvb-api-5-is-fine.diff
+++ b/media-video/vdr/files/vdr-dvb-api-5-is-fine.diff
@@ -1,5 +1,3 @@
-Nur in vdr-1.6.0: audio.o.
-Nur in vdr-1.6.0: .dependencies.
 diff -ru vdr-1.6.0-orig/dvbdevice.h vdr-1.6.0/dvbdevice.h
 --- vdr-1.6.0-orig/dvbdevice.h	2009-01-12 14:05:10.000000000 +0100
 +++ vdr-1.6.0/dvbdevice.h	2009-01-12 14:05:52.000000000 +0100