- obsolete

Changed files:
    cups-CAN-2005-2097.patch -> 1.2
    cups-ENCRYPTIONtxt.patch -> 1.2
    cups-gcc34.patch -> 1.2
    cups-gcc4.patch -> 1.2

diff --git a/cups-CAN-2005-2097.patch b/cups-CAN-2005-2097.patch
deleted file mode 100644 (file)
index c3e6221..0000000
--- a/cups-CAN-2005-2097.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -burN cups-1.1.23.orig/pdftops/FontFile.cxx cups-1.1.23/pdftops/FontFile.cxx
---- cups-1.1.23.orig/pdftops/FontFile.cxx      2005-09-02 19:02:24.273122328 +0200
-+++ cups-1.1.23/pdftops/FontFile.cxx   2005-09-02 19:02:39.174856920 +0200
-@@ -18,6 +18,7 @@
- #include <stdarg.h>
- #include <string.h>
- #include <ctype.h>
-+#include <error.h>
- #include "gmem.h"
- #include "GHash.h"
- #include "Error.h"
-@@ -3572,6 +3573,9 @@
-     } else {
-       origLocaTable[i].pos = 2 * getUShort(pos + 2*i);
-     }
-+
-+    if (origLocaTable[i].pos < 0 || origLocaTable[i].pos > len)
-+      error (1, 0, "bad loca table pos value");
-   }
-   qsort(origLocaTable, nGlyphs + 1, sizeof(TrueTypeLoca), &cmpTrueTypeLocaPos);
-   for (i = 0; i < nGlyphs; ++i) {

diff --git a/cups-ENCRYPTIONtxt.patch b/cups-ENCRYPTIONtxt.patch
deleted file mode 100644 (file)
index a3c4a9e..0000000
--- a/cups-ENCRYPTIONtxt.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- cups-1.1.10/ENCRYPTION.txt.orig    Thu Jan  4 07:42:35 2001
-+++ cups-1.1.10/ENCRYPTION.txt Thu Jan  4 09:23:15 2001
-@@ -94,6 +94,8 @@
- properly signed it will generate all kinds of warnings in
- Netscape and MSIE:
- 
-+    mkdir /etc/cups/ssl
-+
-     openssl req -new -x509 -keyout /etc/cups/ssl/server.key \
-         -out /etc/cups/ssl/server.crt -days 365 -nodes
- 
-@@ -103,6 +105,51 @@
- encrypted.  The cupsd process runs in the background, detached
- from any input source; if you encrypt these files then cupsd
- will not be able to load them!
-+
-+If the above "openssl" command issues messages as
-+
-+    Using configuration from /usr/lib/ssl/openssl.cnf
-+    Unable to load config info
-+
-+and later on
-+
-+    unable to find 'distinguished_name'
-+    problems making Certificate Request
-+
-+create a file /usr/lib/ssl/openssl.cnf (or how it was called in the
-+error message) containing
-+
-+-----------------openssl.cnf-------------------------------------------
-+
-+[ req ]
-+distinguished_name     = req_distinguished_name
-+[ req_distinguished_name ]
-+countryName                    = Country Name (2 letter code)
-+countryName_default            = US
-+countryName_min                = 2
-+countryName_max                = 2
-+localityName                   = Locality Name (eg, city)
-+organizationalUnitName         = Organizational Unit Name (eg, section)
-+commonName                     = Common Name (eg, YOUR name)
-+commonName_max                 = 64
-+emailAddress                   = Email Address
-+emailAddress_max               = 40
-+
-+-----------------------------------------------------------------------
-+
-+and repeat the two commands. Now you will be asked some questions and
-+the certificate will be generated.
-+
-+Give the commands
-+
-+   man req
-+
-+and
-+
-+   man openssl
-+
-+if you have further questions. See especially the "DIAGNOSTICS" and
-+"EXAMPLES" sections of the "req" man page.
- 
- Send all rants about non-encrypted certificate and key files to
- /dev/null.  It makes sense to encrypt user files, but not for

diff --git a/cups-gcc34.patch b/cups-gcc34.patch
deleted file mode 100644 (file)
index 7a6cf9b..0000000
--- a/cups-gcc34.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- cups-1.1.20/scripting/php/phpcups.c.orig   2003-08-15 00:29:23.000000000 +0200
-+++ cups-1.1.20/scripting/php/phpcups.c        2004-05-12 18:25:10.647426632 +0200
-@@ -818,6 +818,17 @@
-   return(options);
- }
- 
-+void _zz_internal_log( char *func, char *line )
-+{
-+  FILE *fp;
-+
-+  if ((fp = fopen("/var/log/cups/project.log","a")) == NULL)
-+      return;
-+
-+  fprintf(fp,"phpcups: %s - %s\n", func, line );
-+  fflush(fp);
-+  fclose(fp);
-+}
- 
- /*
-  *  Function:    cups_print_file
-@@ -1333,21 +1344,6 @@
-   return (num_attrs);
- }
- 
--
--void _zz_internal_log( char *func, char *line )
--{
--  FILE *fp;
--
--  if ((fp = fopen("/var/log/cups/project.log","a")) == NULL)
--      return;
--
--  fprintf(fp,"phpcups: %s - %s\n", func, line );
--  fflush(fp);
--  fclose(fp);
--}
--
--
--
- /*
-  * End of "$Id$".
-  */

diff --git a/cups-gcc4.patch b/cups-gcc4.patch
deleted file mode 100644 (file)
index 305d572..0000000
--- a/cups-gcc4.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- cups-1.1.23/pdftops/GfxFont.cxx~   2004-02-02 22:41:09.000000000 +0000
-+++ cups-1.1.23/pdftops/GfxFont.cxx    2005-05-03 12:20:55.203368520 +0000
-@@ -969,7 +969,7 @@
-   if ((nameToGID = ff->getNameToGID())) {
-     for (i = 0; i < 256; ++i) {
-       if (!map[i] && (charName = enc[i])) {
--      map[i] = (Gushort)(int)nameToGID->lookup(charName);
-+      map[i] = (Gushort)(long)nameToGID->lookup(charName);
-       }
-     }
-     delete nameToGID;