- rediff patches

diff --git a/cups-avahi-no-threaded.patch b/cups-avahi-no-threaded.patch
index a238b38a8d9c66e6a212cf0d87edfaac49982ca6..b81c497aa9a2cb8cda923a390d18358df4d97224 100644 (file)
--- a/cups-avahi-no-threaded.patch
+++ b/cups-avahi-no-threaded.patch
@@ -1,6 +1,27 @@
-diff -up cups-2.2.7/scheduler/avahi.c.avahi-no-threaded cups-2.2.7/scheduler/avahi.c
---- cups-2.2.7/scheduler/avahi.c.avahi-no-threaded     2018-04-03 14:27:17.067410826 +0200
-+++ cups-2.2.7/scheduler/avahi.c       2018-04-03 14:27:17.067410826 +0200
+diff -urNp -x '*.orig' cups-2.3.3.org/scheduler/Makefile cups-2.3.3/scheduler/Makefile
+--- cups-2.3.3.org/scheduler/Makefile  2020-04-27 20:04:29.000000000 +0200
++++ cups-2.3.3/scheduler/Makefile      2021-04-20 22:45:53.873155054 +0200
+@@ -12,6 +12,7 @@ include ../Makedefs
+ 
+ CUPSDOBJS =   \
+               auth.o \
++              avahi.o \
+               banners.o \
+               cert.o \
+               classes.o \
+@@ -35,7 +36,8 @@ CUPSDOBJS =  \
+               server.o \
+               statbuf.o \
+               subscriptions.o \
+-              sysman.o
++              sysman.o \
++              timeout.o
+ LIBOBJS =     \
+               filter.o \
+               mime.o \
+diff -urNp -x '*.orig' cups-2.3.3.org/scheduler/avahi.c cups-2.3.3/scheduler/avahi.c
+--- cups-2.3.3.org/scheduler/avahi.c   1970-01-01 01:00:00.000000000 +0100
++++ cups-2.3.3/scheduler/avahi.c       2021-04-20 22:45:53.873155054 +0200
 @@ -0,0 +1,441 @@
 +/*
 + * "$Id$"
@@ -443,9 +464,9 @@ diff -up cups-2.2.7/scheduler/avahi.c.avahi-no-threaded cups-2.2.7/scheduler/ava
 +/*
 + * End of "$Id$".
 + */
-diff -up cups-2.2.7/scheduler/avahi.h.avahi-no-threaded cups-2.2.7/scheduler/avahi.h
---- cups-2.2.7/scheduler/avahi.h.avahi-no-threaded     2018-04-03 14:27:17.067410826 +0200
-+++ cups-2.2.7/scheduler/avahi.h       2018-04-03 14:27:17.067410826 +0200
+diff -urNp -x '*.orig' cups-2.3.3.org/scheduler/avahi.h cups-2.3.3/scheduler/avahi.h
+--- cups-2.3.3.org/scheduler/avahi.h   1970-01-01 01:00:00.000000000 +0100
++++ cups-2.3.3/scheduler/avahi.h       2021-04-20 22:45:53.873155054 +0200
 @@ -0,0 +1,69 @@
 +/*
 + * "$Id$"
@@ -516,10 +537,10 @@ diff -up cups-2.2.7/scheduler/avahi.h.avahi-no-threaded cups-2.2.7/scheduler/ava
 +/*
 + * End of "$Id$".
 + */
-diff -up cups-2.2.7/scheduler/cupsd.h.avahi-no-threaded cups-2.2.7/scheduler/cupsd.h
---- cups-2.2.7/scheduler/cupsd.h.avahi-no-threaded     2018-03-23 04:48:36.000000000 +0100
-+++ cups-2.2.7/scheduler/cupsd.h       2018-04-03 14:27:17.067410826 +0200
-@@ -118,6 +118,7 @@ extern const char *cups_hstrerror(int);
+diff -urNp -x '*.orig' cups-2.3.3.org/scheduler/cupsd.h cups-2.3.3/scheduler/cupsd.h
+--- cups-2.3.3.org/scheduler/cupsd.h   2020-04-27 20:04:29.000000000 +0200
++++ cups-2.3.3/scheduler/cupsd.h       2021-04-20 22:45:53.873155054 +0200
+@@ -115,6 +115,7 @@ extern const char *cups_hstrerror(int);
  #include "colorman.h"
  #include "conf.h"
  #include "banners.h"
@@ -527,7 +548,7 @@ diff -up cups-2.2.7/scheduler/cupsd.h.avahi-no-threaded cups-2.2.7/scheduler/cup
  #include "dirsvc.h"
  #include "network.h"
  #include "subscriptions.h"
-@@ -138,6 +139,15 @@ extern const char *cups_hstrerror(int);
+@@ -135,6 +136,15 @@ extern const char *cups_hstrerror(int);
  
  typedef void (*cupsd_selfunc_t)(void *data);
  
@@ -543,7 +564,7 @@ diff -up cups-2.2.7/scheduler/cupsd.h.avahi-no-threaded cups-2.2.7/scheduler/cup
  
  /*
   * Globals...
-@@ -162,6 +172,9 @@ VAR int                    OnDemand        VALUE(0);
+@@ -159,6 +169,9 @@ VAR int                    OnDemand        VALUE(0);
                                        /* Launched on demand */
  #endif /* HAVE_ONDEMAND */
  
@@ -553,7 +574,7 @@ diff -up cups-2.2.7/scheduler/cupsd.h.avahi-no-threaded cups-2.2.7/scheduler/cup
  
  /*
   * Prototypes...
-@@ -224,3 +237,15 @@ extern void               cupsdStopSelect(void);
+@@ -220,3 +233,15 @@ extern void               cupsdStopSelect(void);
  /* server.c */
  extern void           cupsdStartServer(void);
  extern void           cupsdStopServer(void);
@@ -570,10 +591,10 @@ diff -up cups-2.2.7/scheduler/cupsd.h.avahi-no-threaded cups-2.2.7/scheduler/cup
 +extern void     cupsdRemoveTimeout (cupsd_timeout_t *timeout);
 +#endif /* HAVE_AVAHI */
 \ No newline at end of file
-diff -up cups-2.2.7/scheduler/dirsvc.c.avahi-no-threaded cups-2.2.7/scheduler/dirsvc.c
---- cups-2.2.7/scheduler/dirsvc.c.avahi-no-threaded    2018-03-23 04:48:36.000000000 +0100
-+++ cups-2.2.7/scheduler/dirsvc.c      2018-04-03 14:30:13.099422499 +0200
-@@ -193,7 +193,7 @@ cupsdStartBrowsing(void)
+diff -urNp -x '*.orig' cups-2.3.3.org/scheduler/dirsvc.c cups-2.3.3/scheduler/dirsvc.c
+--- cups-2.3.3.org/scheduler/dirsvc.c  2020-04-27 20:04:29.000000000 +0200
++++ cups-2.3.3/scheduler/dirsvc.c      2021-04-20 22:45:53.873155054 +0200
+@@ -190,7 +190,7 @@ cupsdStartBrowsing(void)
      cupsdUpdateDNSSDName();
  
  #  else /* HAVE_AVAHI */
@@ -582,7 +603,7 @@ diff -up cups-2.2.7/scheduler/dirsvc.c.avahi-no-threaded cups-2.2.7/scheduler/di
      {
        cupsdLogMessage(CUPSD_LOG_ERROR, "Unable to create DNS-SD thread.");
  
-@@ -204,7 +204,7 @@ cupsdStartBrowsing(void)
+@@ -201,7 +201,7 @@ cupsdStartBrowsing(void)
      {
        int error;                      /* Error code, if any */
  
@@ -591,7 +612,7 @@ diff -up cups-2.2.7/scheduler/dirsvc.c.avahi-no-threaded cups-2.2.7/scheduler/di
  
        if (DNSSDClient == NULL)
        {
-@@ -215,11 +215,9 @@ cupsdStartBrowsing(void)
+@@ -212,11 +212,9 @@ cupsdStartBrowsing(void)
          if (FatalErrors & CUPSD_FATAL_BROWSE)
          cupsdEndProcess(getpid(), 0);
  
@@ -604,7 +625,7 @@ diff -up cups-2.2.7/scheduler/dirsvc.c.avahi-no-threaded cups-2.2.7/scheduler/di
      }
  #  endif /* HAVE_DNSSD */
    }
-@@ -635,7 +633,7 @@ dnssdClientCallback(
+@@ -632,7 +630,7 @@ dnssdClientCallback(
          * Renew Avahi client...
          */
  
@@ -613,7 +634,7 @@ diff -up cups-2.2.7/scheduler/dirsvc.c.avahi-no-threaded cups-2.2.7/scheduler/di
  
          if (!DNSSDClient)
          {
-@@ -701,17 +699,11 @@ dnssdDeregisterInstance(
+@@ -698,17 +696,11 @@ dnssdDeregisterInstance(
    *srv = NULL;
  
  #  else /* HAVE_AVAHI */
@@ -631,7 +652,7 @@ diff -up cups-2.2.7/scheduler/dirsvc.c.avahi-no-threaded cups-2.2.7/scheduler/di
  #  endif /* HAVE_DNSSD */
  }
  
-@@ -1030,16 +1022,10 @@ dnssdRegisterInstance(
+@@ -1027,16 +1019,10 @@ dnssdRegisterInstance(
    (void)commit;
  
  #  else /* HAVE_AVAHI */
@@ -648,7 +669,7 @@ diff -up cups-2.2.7/scheduler/dirsvc.c.avahi-no-threaded cups-2.2.7/scheduler/di
      cupsdLogMessage(CUPSD_LOG_WARN, "DNS-SD registration of \"%s\" failed: %s",
                      name, dnssdErrorString(avahi_client_errno(DNSSDClient)));
      return (0);
-@@ -1154,9 +1140,6 @@ dnssdRegisterInstance(
+@@ -1151,9 +1137,6 @@ dnssdRegisterInstance(
        cupsdLogMessage(CUPSD_LOG_DEBUG, "DNS-SD commit of \"%s\" failed.",
                        name);
    }
@@ -658,7 +679,7 @@ diff -up cups-2.2.7/scheduler/dirsvc.c.avahi-no-threaded cups-2.2.7/scheduler/di
  #  endif /* HAVE_DNSSD */
  
    if (error)
-@@ -1327,9 +1310,6 @@ dnssdStop(void)
+@@ -1324,9 +1307,6 @@ dnssdStop(void)
    DNSSDMaster = NULL;
  
  #  else /* HAVE_AVAHI */
@@ -668,7 +689,7 @@ diff -up cups-2.2.7/scheduler/dirsvc.c.avahi-no-threaded cups-2.2.7/scheduler/di
    if (DNSSDClient)
    {
      avahi_client_free(DNSSDClient);
-@@ -1338,7 +1318,7 @@ dnssdStop(void)
+@@ -1335,7 +1315,7 @@ dnssdStop(void)
  
    if (DNSSDMaster)
    {
@@ -677,10 +698,10 @@ diff -up cups-2.2.7/scheduler/dirsvc.c.avahi-no-threaded cups-2.2.7/scheduler/di
      DNSSDMaster = NULL;
    }
  #  endif /* HAVE_DNSSD */
-diff -up cups-2.2.7/scheduler/dirsvc.h.avahi-no-threaded cups-2.2.7/scheduler/dirsvc.h
---- cups-2.2.7/scheduler/dirsvc.h.avahi-no-threaded    2018-03-23 04:48:36.000000000 +0100
-+++ cups-2.2.7/scheduler/dirsvc.h      2018-04-03 14:27:17.068410820 +0200
-@@ -49,7 +49,7 @@ VAR cups_array_t     *DNSSDPrinters  VALUE(NU
+diff -urNp -x '*.orig' cups-2.3.3.org/scheduler/dirsvc.h cups-2.3.3/scheduler/dirsvc.h
+--- cups-2.3.3.org/scheduler/dirsvc.h  2020-04-27 20:04:29.000000000 +0200
++++ cups-2.3.3/scheduler/dirsvc.h      2021-04-20 22:45:53.873155054 +0200
+@@ -45,7 +45,7 @@ VAR cups_array_t     *DNSSDPrinters  VALUE(NU
  VAR DNSServiceRef     DNSSDMaster     VALUE(NULL);
                                        /* Master DNS-SD service reference */
  #  else /* HAVE_AVAHI */
@@ -689,11 +710,11 @@ diff -up cups-2.2.7/scheduler/dirsvc.h.avahi-no-threaded cups-2.2.7/scheduler/di
                                        /* Master polling interface for Avahi */
  VAR AvahiClient               *DNSSDClient    VALUE(NULL);
                                        /* Client information */
-diff -up cups-2.2.7/scheduler/main.c.avahi-no-threaded cups-2.2.7/scheduler/main.c
---- cups-2.2.7/scheduler/main.c.avahi-no-threaded      2018-04-03 14:27:17.057410882 +0200
-+++ cups-2.2.7/scheduler/main.c        2018-04-03 14:27:17.069410814 +0200
-@@ -131,7 +131,10 @@ main(int  argc,                           /* I - Number of comm
-   int                 service_idle_exit;
+diff -urNp -x '*.orig' cups-2.3.3.org/scheduler/main.c cups-2.3.3/scheduler/main.c
+--- cups-2.3.3.org/scheduler/main.c    2021-04-20 22:45:53.709821838 +0200
++++ cups-2.3.3/scheduler/main.c        2021-04-20 22:45:53.873155054 +0200
+@@ -132,7 +132,10 @@ main(int  argc,                           /* I - Number of comm
+   int                 service_idle_exit = 0;
                                        /* Idle exit on select timeout? */
  #endif /* HAVE_ONDEMAND */
 -
@@ -704,7 +725,7 @@ diff -up cups-2.2.7/scheduler/main.c.avahi-no-threaded cups-2.2.7/scheduler/main
  
  #ifdef HAVE_GETEUID
   /*
-@@ -610,6 +613,14 @@ main(int  argc,                           /* I - Number of comm
+@@ -600,6 +603,14 @@ main(int  argc,                           /* I - Number of comm
  
    httpInitialize();
  
@@ -719,7 +740,7 @@ diff -up cups-2.2.7/scheduler/main.c.avahi-no-threaded cups-2.2.7/scheduler/main
    cupsdStartServer();
  
   /*
-@@ -928,6 +939,16 @@ main(int  argc,                           /* I - Number of comm
+@@ -934,6 +945,16 @@ main(int  argc,                           /* I - Number of comm
      }
  #endif /* __APPLE__ */
  
@@ -736,9 +757,9 @@ diff -up cups-2.2.7/scheduler/main.c.avahi-no-threaded cups-2.2.7/scheduler/main
  #ifndef __APPLE__
     /*
      * Update the network interfaces once a minute...
-@@ -1632,6 +1653,10 @@ select_timeout(int fds)                 /* I - Number
+@@ -1643,6 +1664,10 @@ select_timeout(int fds)                 /* I - Number
+   cupsd_client_t      *con;           /* Client information */
    cupsd_job_t         *job;           /* Job information */
-   cupsd_printer_t       *printer;       /* Printer information */
    const char          *why;           /* Debugging aid */
 +#ifdef HAVE_AVAHI
 +  cupsd_timeout_t     *tmo;           /* Timed callback */
@@ -747,7 +768,7 @@ diff -up cups-2.2.7/scheduler/main.c.avahi-no-threaded cups-2.2.7/scheduler/main
  
  
    cupsdLogMessage(CUPSD_LOG_DEBUG2, "select_timeout: JobHistoryUpdate=%ld",
-@@ -1677,6 +1702,19 @@ select_timeout(int fds)                 /* I - Number
+@@ -1688,6 +1713,19 @@ select_timeout(int fds)                 /* I - Number
    }
  #endif /* __APPLE__ */
  
@@ -767,30 +788,9 @@ diff -up cups-2.2.7/scheduler/main.c.avahi-no-threaded cups-2.2.7/scheduler/main
   /*
    * Check whether we are accepting new connections...
    */
-diff -up cups-2.2.7/scheduler/Makefile.avahi-no-threaded cups-2.2.7/scheduler/Makefile
---- cups-2.2.7/scheduler/Makefile.avahi-no-threaded    2018-03-23 04:48:36.000000000 +0100
-+++ cups-2.2.7/scheduler/Makefile      2018-04-03 14:27:17.069410814 +0200
-@@ -15,6 +15,7 @@ include ../Makedefs
- 
- CUPSDOBJS =   \
-               auth.o \
-+              avahi.o \
-               banners.o \
-               cert.o \
-               classes.o \
-@@ -38,7 +39,8 @@ CUPSDOBJS =  \
-               server.o \
-               statbuf.o \
-               subscriptions.o \
--              sysman.o
-+              sysman.o \
-+              timeout.o
- LIBOBJS =     \
-               filter.o \
-               mime.o \
-diff -up cups-2.2.7/scheduler/timeout.c.avahi-no-threaded cups-2.2.7/scheduler/timeout.c
---- cups-2.2.7/scheduler/timeout.c.avahi-no-threaded   2018-04-03 14:27:17.069410814 +0200
-+++ cups-2.2.7/scheduler/timeout.c     2018-04-03 14:27:17.069410814 +0200
+diff -urNp -x '*.orig' cups-2.3.3.org/scheduler/timeout.c cups-2.3.3/scheduler/timeout.c
+--- cups-2.3.3.org/scheduler/timeout.c 1970-01-01 01:00:00.000000000 +0100
++++ cups-2.3.3/scheduler/timeout.c     2021-04-20 22:45:53.873155054 +0200
 @@ -0,0 +1,235 @@
 +/*
 + * "$Id$"

diff --git a/cups-certs_FHS.patch b/cups-certs_FHS.patch
index b5ced37b4f217e0e2ffc9ebae88be428755811c5..d00d5869c11d5cca01512586b21248306818075d 100644 (file)
--- a/cups-certs_FHS.patch
+++ b/cups-certs_FHS.patch
@@ -1,6 +1,7 @@
---- cups-1.2.7/config-scripts/cups-directories.m4.orig 2006-08-29 22:48:59.000000000 +0200
-+++ cups-1.2.7/config-scripts/cups-directories.m4      2006-12-18 03:28:33.624756362 +0100
-@@ -421,6 +421,13 @@
+diff -urNp -x '*.orig' cups-2.3.3.org/config-scripts/cups-directories.m4 cups-2.3.3/config-scripts/cups-directories.m4
+--- cups-2.3.3.org/config-scripts/cups-directories.m4  2020-04-27 20:04:29.000000000 +0200
++++ cups-2.3.3/config-scripts/cups-directories.m4      2021-04-20 22:45:49.526491490 +0200
+@@ -295,5 +295,12 @@ AC_ARG_WITH(rundir, [  --with-rundir
                        CUPS_STATEDIR="$localstatedir/run/cups"
                        ;;
        esac])
@@ -13,10 +14,10 @@
 +fi
  AC_DEFINE_UNQUOTED(CUPS_STATEDIR, "$CUPS_STATEDIR")
  AC_SUBST(CUPS_STATEDIR)
- 
---- cups-1.2.7/config-scripts/cups-network.m4.orig     2006-10-20 17:07:21.000000000 +0200
-+++ cups-1.2.7/config-scripts/cups-network.m4  2006-12-18 03:30:16.608100516 +0100
-@@ -72,7 +72,7 @@
+diff -urNp -x '*.orig' cups-2.3.3.org/config-scripts/cups-network.m4 cups-2.3.3/config-scripts/cups-network.m4
+--- cups-2.3.3.org/config-scripts/cups-network.m4      2020-04-27 20:04:29.000000000 +0200
++++ cups-2.3.3/config-scripts/cups-network.m4  2021-04-20 22:45:49.526491490 +0200
+@@ -48,7 +48,7 @@ if test x$enable_domainsocket != xno -a
                                ;;
                        *)
                                # All others use FHS standard...

diff --git a/cups-config.patch b/cups-config.patch
index d4404a07d2c167ff71484c745ab0606b67a1e9c2..85bb65ad3d001acae44274fbaeb0cdfda035029a 100644 (file)
--- a/cups-config.patch
+++ b/cups-config.patch
@@ -1,8 +1,8 @@
-diff -urN cups-1.2.0.org/conf/cupsd.conf.in cups-1.2.0/conf/cupsd.conf.in
---- cups-1.2.0.org/conf/cupsd.conf.in  2006-04-23 23:46:38.000000000 +0200
-+++ cups-1.2.0/conf/cupsd.conf.in      2006-05-12 08:17:48.946318536 +0200
-@@ -6,6 +6,9 @@
- #   file.
+diff -urNp -x '*.orig' cups-2.3.3.org/conf/cupsd.conf.in cups-2.3.3/conf/cupsd.conf.in
+--- cups-2.3.3.org/conf/cupsd.conf.in  2020-04-27 20:04:29.000000000 +0200
++++ cups-2.3.3/conf/cupsd.conf.in      2021-04-20 22:45:47.956492610 +0200
+@@ -3,6 +3,9 @@
+ # complete description of this file.
  #
  
 +MaxLogSize 0
@@ -11,4 +11,3 @@ diff -urN cups-1.2.0.org/conf/cupsd.conf.in cups-1.2.0/conf/cupsd.conf.in
  # Log general information in error_log - change "@CUPS_LOG_LEVEL@" to "debug"
  # for troubleshooting...
  LogLevel @CUPS_LOG_LEVEL@
-

diff --git a/cups-nostrip.patch b/cups-nostrip.patch
index a0e1a9f85961254d7114590d3f951e988b0d27da..f62295fcb7df4241c5ccbc65c774e5871248fdef 100644 (file)
--- a/cups-nostrip.patch
+++ b/cups-nostrip.patch
@@ -1,11 +1,12 @@
---- cups-1.4.0/config-scripts/cups-compiler.m4~        2009-08-28 17:35:34.000000000 +0200
-+++ cups-1.4.0/config-scripts/cups-compiler.m4 2009-08-29 21:27:34.296848459 +0200
-@@ -28,8 +28,6 @@
- 
- if test x$enable_debug = xyes; then
+diff -urNp -x '*.orig' cups-2.3.3.org/config-scripts/cups-compiler.m4 cups-2.3.3/config-scripts/cups-compiler.m4
+--- cups-2.3.3.org/config-scripts/cups-compiler.m4     2020-04-27 20:04:29.000000000 +0200
++++ cups-2.3.3/config-scripts/cups-compiler.m4 2021-04-20 22:45:49.129825106 +0200
+@@ -25,8 +25,6 @@ AC_ARG_ENABLE(unit_tests, [  --enable-un
+ dnl For debugging, keep symbols, otherwise strip them...
+ if test x$enable_debug = xyes -a "x$OPTIM" = x; then
        OPTIM="-g"
 -else
 -      INSTALL_STRIP="-s"
  fi
  
- if test x$enable_debug_printfs = xyes; then
+ dnl Debug printfs can slow things down, so provide a separate option for that

diff --git a/cups-options.patch b/cups-options.patch
index b0710b198bedb0ec7bf7826978cdd9258e35917d..4045fa26343cf70d6ad876dfd5e28965bfae4f1f 100644 (file)
--- a/cups-options.patch
+++ b/cups-options.patch
@@ -1,18 +1,17 @@
-*** cups-1.1.10/cups/options.c~  Wed Sep 13 19:47:00 2000
---- cups-1.1.10/cups/options.c   Sat Sep 30 21:29:57 2000
-***************
-*** 442,447 ****
---- 442,454 ----
-    copyarg     = strdup(arg);
-    ptr         = copyarg;
-  
-+   /*
-+    * skip leading spaces
-+    */
-+ 
-+   while (isspace(*ptr))
-+     ++ptr;
-+ 
-    while (*ptr != '\0')
-    {
-     /*
+diff -urNp -x '*.orig' cups-2.3.3.org/cups/options.c cups-2.3.3/cups/options.c
+--- cups-2.3.3.org/cups/options.c      2020-04-27 20:04:29.000000000 +0200
++++ cups-2.3.3/cups/options.c  2021-04-20 22:45:48.336492339 +0200
+@@ -326,6 +326,13 @@ cupsParseOptions(
+   * Loop through the string...
+   */
+ 
++  /*
++   * skip leading spaces
++   */
++
++  while (isspace(*ptr))
++    ++ptr;
++
+   while (*ptr != '\0')
+   {
+    /*

diff --git a/cups-res_init.patch b/cups-res_init.patch
index 3866521d77d18fecba51dfe8bc109de60bfc5e0e..481778ab1dd332e12b78cddc9b57dc80c1495d01 100644 (file)
--- a/cups-res_init.patch
+++ b/cups-res_init.patch
@@ -1,7 +1,7 @@
-diff -up cups-1.7b1/cups/http-addr.c.res_init cups-1.7b1/cups/http-addr.c
---- cups-1.7b1/cups/http-addr.c.res_init       2013-03-20 19:14:10.000000000 +0100
-+++ cups-1.7b1/cups/http-addr.c        2013-04-19 12:01:36.927512159 +0200
-@@ -319,7 +319,8 @@ httpAddrLookup(
+diff -urNp -x '*.orig' cups-2.3.3.org/cups/http-addr.c cups-2.3.3/cups/http-addr.c
+--- cups-2.3.3.org/cups/http-addr.c    2020-04-27 20:04:29.000000000 +0200
++++ cups-2.3.3/cups/http-addr.c        2021-04-20 22:45:56.326486636 +0200
+@@ -388,7 +388,8 @@ httpAddrLookup(
  
      if (error)
      {
@@ -11,10 +11,10 @@ diff -up cups-1.7b1/cups/http-addr.c.res_init cups-1.7b1/cups/http-addr.c
          cg->need_res_init = 1;
  
        return (httpAddrString(addr, name, namelen));
-diff -up cups-1.7b1/cups/http-addrlist.c.res_init cups-1.7b1/cups/http-addrlist.c
---- cups-1.7b1/cups/http-addrlist.c.res_init   2013-04-19 12:01:36.930512119 +0200
-+++ cups-1.7b1/cups/http-addrlist.c    2013-04-19 12:03:13.769229554 +0200
-@@ -581,7 +581,8 @@ httpAddrGetList(const char *hostname,      /*
+diff -urNp -x '*.orig' cups-2.3.3.org/cups/http-addrlist.c cups-2.3.3/cups/http-addrlist.c
+--- cups-2.3.3.org/cups/http-addrlist.c        2020-04-27 20:04:29.000000000 +0200
++++ cups-2.3.3/cups/http-addrlist.c    2021-04-20 22:45:56.326486636 +0200
+@@ -649,7 +649,8 @@ httpAddrGetList(const char *hostname,      /*
      }
      else
      {
@@ -23,4 +23,4 @@ diff -up cups-1.7b1/cups/http-addrlist.c.res_init cups-1.7b1/cups/http-addrlist.
 +          error == EAI_NONAME)
          cg->need_res_init = 1;
  
-       _cupsSetError(IPP_STATUS_ERROR_INTERNAL, gai_strerror(error), 0);
+ #  ifdef _WIN32 /* Really, Microsoft?!? */

diff --git a/cups-systemd-socket.patch b/cups-systemd-socket.patch
index 2b6b88f8054ce8c2a64faac2133953d568399df7..06fb6e169f970fce89705d66583d926dc625a968 100644 (file)
--- a/cups-systemd-socket.patch
+++ b/cups-systemd-socket.patch
@@ -1,7 +1,7 @@
-diff -up cups-2.2.12/scheduler/main.c.systemd-socket cups-2.2.12/scheduler/main.c
---- cups-2.2.12/scheduler/main.c.systemd-socket        2019-08-16 00:35:30.000000000 +0200
-+++ cups-2.2.12/scheduler/main.c       2019-08-19 09:31:09.703370325 +0200
-@@ -674,8 +674,16 @@ main(int  argc,                           /* I - Number of comm
+diff -urNp -x '*.orig' cups-2.3.3.org/scheduler/main.c cups-2.3.3/scheduler/main.c
+--- cups-2.3.3.org/scheduler/main.c    2020-04-27 20:04:29.000000000 +0200
++++ cups-2.3.3/scheduler/main.c        2021-04-20 22:45:51.479823429 +0200
+@@ -681,8 +681,16 @@ main(int  argc,                           /* I - Number of comm
  
  #ifdef HAVE_ONDEMAND
    if (OnDemand)
@@ -19,10 +19,10 @@ diff -up cups-2.2.12/scheduler/main.c.systemd-socket cups-2.2.12/scheduler/main.
  #endif /* HAVE_ONDEMAND */
    if (fg)
      cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL, "Scheduler started in foreground.");
-diff -up cups-2.2.12/scheduler/org.cups.cupsd.service.in.systemd-socket cups-2.2.12/scheduler/org.cups.cupsd.service.in
---- cups-2.2.12/scheduler/org.cups.cupsd.service.in.systemd-socket     2019-08-19 09:31:09.703370325 +0200
-+++ cups-2.2.12/scheduler/org.cups.cupsd.service.in    2019-08-19 09:54:58.890036404 +0200
-@@ -1,10 +1,10 @@
+diff -urNp -x '*.orig' cups-2.3.3.org/scheduler/org.cups.cupsd.service.in cups-2.3.3/scheduler/org.cups.cupsd.service.in
+--- cups-2.3.3.org/scheduler/org.cups.cupsd.service.in 2020-04-27 20:04:29.000000000 +0200
++++ cups-2.3.3/scheduler/org.cups.cupsd.service.in     2021-04-20 22:45:51.479823429 +0200
+@@ -1,11 +1,11 @@
  [Unit]
  Description=CUPS Scheduler
  Documentation=man:cupsd(8)