[Pkg-Cyrus-imapd-Debian-devel] [SVN] r175 - trunk/cyrus-imapd-2.2.12/debian/patches/20_drac_auth.dpatch

debian at incase.de debian at incase.de
Fri Nov 11 18:11:12 UTC 2005 

Author: sven
Date: Fri Nov 11 19:11:11 2005
New Revision: 175

URL: https://mail.incase.de/viewcvs?root=cyrus22?view=rev&rev=175
Log:
update drac patch
Modified:
    trunk/cyrus-imapd-2.2.12/debian/patches/20_drac_auth.dpatch

Modified: trunk/cyrus-imapd-2.2.12/debian/patches/20_drac_auth.dpatch
URL: https://mail.incase.de/viewcvs?root=cyrus22/trunk/cyrus-imapd-2.2.12/debian/patches/20_drac_auth.dpatch?view=diff&rev=175&p1=trunk/cyrus-imapd-2.2.12/debian/patches/20_drac_auth.dpatch&r1=174&p2=trunk/cyrus-imapd-2.2.12/debian/patches/20_drac_auth.dpatch&r2=175
==============================================================================
--- trunk/cyrus-imapd-2.2.12/debian/patches/20_drac_auth.dpatch (original)
+++ trunk/cyrus-imapd-2.2.12/debian/patches/20_drac_auth.dpatch Fri Nov 11 19:11:11 2005
@@ -5,9 +5,9 @@
 ## DP: Enable DRAC (pop-before-smtp) authentication
 
 @DPATCH@
-diff -urNad cyrus-imapd-2.2.12/configure.in /tmp/dpep.MaSf95/cyrus-imapd-2.2.12/configure.in
---- cyrus-imapd-2.2.12/configure.in	2005-05-24 22:16:17.000000000 +0200
-+++ /tmp/dpep.MaSf95/cyrus-imapd-2.2.12/configure.in	2005-05-25 00:50:07.959143878 +0200
+diff -urNad complete.dpatch/configure.in /tmp/dpep.RumcT7/complete.dpatch/configure.in
+--- complete.dpatch/configure.in	2005-11-11 19:09:04.000000000 +0100
++++ /tmp/dpep.RumcT7/complete.dpatch/configure.in	2005-11-11 19:09:05.050451410 +0100
 @@ -988,6 +988,19 @@
  SNMP_SUBDIRS=""
  AC_SUBST(SNMP_SUBDIRS)
@@ -28,9 +28,9 @@
  CMU_LIBWRAP
  CMU_UCDSNMP
  
-diff -urNad cyrus-imapd-2.2.12/imap/Makefile.in /tmp/dpep.MaSf95/cyrus-imapd-2.2.12/imap/Makefile.in
---- cyrus-imapd-2.2.12/imap/Makefile.in	2005-05-24 22:16:17.000000000 +0200
-+++ /tmp/dpep.MaSf95/cyrus-imapd-2.2.12/imap/Makefile.in	2005-05-25 00:50:07.977145500 +0200
+diff -urNad complete.dpatch/imap/Makefile.in /tmp/dpep.RumcT7/complete.dpatch/imap/Makefile.in
+--- complete.dpatch/imap/Makefile.in	2005-11-11 19:09:04.000000000 +0100
++++ /tmp/dpep.RumcT7/complete.dpatch/imap/Makefile.in	2005-11-11 19:09:05.050451410 +0100
 @@ -69,6 +69,7 @@
  SIEVE_LIBS = @SIEVE_LIBS@
  IMAP_COM_ERR_LIBS = @IMAP_COM_ERR_LIBS@
@@ -69,9 +69,9 @@
  
  nntpd: nntpd.o backend.o index.o smtpclient.o spool.o tls.o \
  	 mutex_fake.o nntp_err.o libimap.a $(DEPLIBS) $(SERVICE)
-diff -urNad cyrus-imapd-2.2.12/imap/imapd.c /tmp/dpep.MaSf95/cyrus-imapd-2.2.12/imap/imapd.c
---- cyrus-imapd-2.2.12/imap/imapd.c	2005-05-24 22:16:17.000000000 +0200
-+++ /tmp/dpep.MaSf95/cyrus-imapd-2.2.12/imap/imapd.c	2005-05-25 00:50:08.037150904 +0200
+diff -urNad complete.dpatch/imap/imapd.c /tmp/dpep.RumcT7/complete.dpatch/imap/imapd.c
+--- complete.dpatch/imap/imapd.c	2005-11-11 19:09:04.000000000 +0100
++++ /tmp/dpep.RumcT7/complete.dpatch/imap/imapd.c	2005-11-11 19:09:05.054451018 +0100
 @@ -137,6 +137,18 @@
      1, 1, &imapd_authstate, &imapd_userisadmin, &imapd_userisproxyadmin
  };
@@ -115,7 +115,7 @@
      /* create connection to the SNMP listener, if available. */
      snmp_connect(); /* ignore return code */
      snmp_set_str(SERVER_NAME_VERSION,CYRUS_VERSION);
-@@ -651,6 +680,15 @@
+@@ -650,6 +679,15 @@
  		imapd_haveaddr = 1;
  	    }
  	}
@@ -131,7 +131,7 @@
      }
  
      /* create the SASL connection */
-@@ -693,6 +731,11 @@
+@@ -692,6 +730,11 @@
      prot_flush(imapd_out);
      snmp_increment(ACTIVE_CONNECTIONS, -1);
  
@@ -143,7 +143,7 @@
      /* cleanup */
      imapd_reset();
  
-@@ -773,6 +816,10 @@
+@@ -772,6 +815,10 @@
  
      cyrus_done();
  
@@ -154,7 +154,7 @@
      exit(code);
  }
  
-@@ -810,6 +857,35 @@
+@@ -809,6 +856,35 @@
      shut_down(code);
  }
  
@@ -190,7 +190,7 @@
  /*
   * Top-level command loop parsing
   */
-@@ -1837,6 +1913,11 @@
+@@ -1836,6 +1912,11 @@
  
      prot_printf(imapd_out, "%s OK %s\r\n", tag, reply);
  
@@ -202,7 +202,7 @@
      /* Create telemetry log */
      imapd_logfd = telemetry_log(imapd_userid, imapd_in, imapd_out, 0);
  
-@@ -1983,6 +2064,11 @@
+@@ -1982,6 +2063,11 @@
      prot_setsasl(imapd_in,  imapd_saslconn);
      prot_setsasl(imapd_out, imapd_saslconn);
  
@@ -214,9 +214,9 @@
      /* Create telemetry log */
      imapd_logfd = telemetry_log(imapd_userid, imapd_in, imapd_out, 0);
  
-diff -urNad cyrus-imapd-2.2.12/imap/pop3d.c /tmp/dpep.MaSf95/cyrus-imapd-2.2.12/imap/pop3d.c
---- cyrus-imapd-2.2.12/imap/pop3d.c	2005-05-24 22:16:17.000000000 +0200
-+++ /tmp/dpep.MaSf95/cyrus-imapd-2.2.12/imap/pop3d.c	2005-05-25 00:50:08.172163065 +0200
+diff -urNad complete.dpatch/imap/pop3d.c /tmp/dpep.RumcT7/complete.dpatch/imap/pop3d.c
+--- complete.dpatch/imap/pop3d.c	2005-11-11 19:09:04.000000000 +0100
++++ /tmp/dpep.RumcT7/complete.dpatch/imap/pop3d.c	2005-11-11 19:09:05.055450920 +0100
 @@ -44,6 +44,10 @@
   */
  #include <config.h>
@@ -228,7 +228,7 @@
  
  #ifdef HAVE_UNISTD_H
  #include <unistd.h>
-@@ -406,6 +410,10 @@
+@@ -408,6 +412,10 @@
      prot_settimeout(popd_in, timeout*60);
      prot_setflushonread(popd_in, popd_out);
  
@@ -239,7 +239,7 @@
      if (kflag) kpop();
  
      /* we were connected on pop3s port so we should do 
-@@ -1437,6 +1445,21 @@
+@@ -1439,6 +1447,21 @@
  	popd_mailbox = &mboxstruct;
  	proc_register("pop3d", popd_clienthost, popd_userid,
  		      popd_mailbox->name);
@@ -261,9 +261,9 @@
      }
  
      /* Create telemetry log */
-diff -urNad cyrus-imapd-2.2.12/imap/version.c /tmp/dpep.MaSf95/cyrus-imapd-2.2.12/imap/version.c
---- cyrus-imapd-2.2.12/imap/version.c	2005-05-24 22:16:17.000000000 +0200
-+++ /tmp/dpep.MaSf95/cyrus-imapd-2.2.12/imap/version.c	2005-05-25 00:50:08.174163245 +0200
+diff -urNad complete.dpatch/imap/version.c /tmp/dpep.RumcT7/complete.dpatch/imap/version.c
+--- complete.dpatch/imap/version.c	2005-11-11 19:09:03.000000000 +0100
++++ /tmp/dpep.RumcT7/complete.dpatch/imap/version.c	2005-11-11 19:09:05.055450920 +0100
 @@ -151,6 +151,10 @@
      snprintf(env_buf + strlen(env_buf), MAXIDVALUELEN - strlen(env_buf),
  	     "; %s", SIEVE_VERSION);
@@ -275,9 +275,9 @@
  #ifdef HAVE_LIBWRAP
      snprintf(env_buf + strlen(env_buf), MAXIDVALUELEN - strlen(env_buf),
  	     "; TCP Wrappers");
-diff -urNad cyrus-imapd-2.2.12/lib/imapoptions /tmp/dpep.MaSf95/cyrus-imapd-2.2.12/lib/imapoptions
---- cyrus-imapd-2.2.12/lib/imapoptions	2005-05-24 22:16:17.000000000 +0200
-+++ /tmp/dpep.MaSf95/cyrus-imapd-2.2.12/lib/imapoptions	2005-05-25 00:50:08.226167929 +0200
+diff -urNad complete.dpatch/lib/imapoptions /tmp/dpep.RumcT7/complete.dpatch/lib/imapoptions
+--- complete.dpatch/lib/imapoptions	2005-11-11 19:09:04.000000000 +0100
++++ /tmp/dpep.RumcT7/complete.dpatch/lib/imapoptions	2005-11-11 19:09:05.056450822 +0100
 @@ -196,6 +196,14 @@
  { "deleteright", "c", STRING }
  /* The right that a user needs to delete a mailbox. */

More information about the Pkg-Cyrus-imapd-Debian-devel mailing list