[SVN] r296 - /trunk/cyrus-imapd-2.2.12/debian/patches/20-drac_auth.dpatch

[debian at incase.de]

Author: sven
Date: Tue Feb 14 17:32:02 2006
New Revision: 296

URL: https://mail.incase.de/viewcvs?rev=296&root=cyrus22&view=rev
Log:
Fix up 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/trunk/cyrus-imapd-2.2.12/debian/patches/20-drac_auth.dpatch?rev=296&root=cyrus22&r1=295&r2=296&view=diff
==============================================================================
--- 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 Tue Feb 14 17:32:02 2006
@@ -5,9 +5,9 @@
 ## DP: Enable DRAC (pop-before-smtp) authentication
 
 @DPATCH@
-diff -urNad cyrus-imapd-2.2.12/configure.in /tmp/dpep.hL1Os6/cyrus-imapd-2.2.12/configure.in
---- cyrus-imapd-2.2.12/configure.in	2005-11-17 04:23:45.000000000 +0100
-+++ /tmp/dpep.hL1Os6/cyrus-imapd-2.2.12/configure.in	2005-11-17 04:23:46.955948052 +0100
+diff -urNad cyrus-imapd-2.2.12/configure.in /tmp/dpep.FoExSn/cyrus-imapd-2.2.12/configure.in
+--- cyrus-imapd-2.2.12/configure.in	2006-02-14 17:13:36.000000000 +0100
++++ /tmp/dpep.FoExSn/cyrus-imapd-2.2.12/configure.in	2006-02-14 17:13:44.656438535 +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.hL1Os6/cyrus-imapd-2.2.12/imap/Makefile.in
---- cyrus-imapd-2.2.12/imap/Makefile.in	2005-11-17 04:23:45.000000000 +0100
-+++ /tmp/dpep.hL1Os6/cyrus-imapd-2.2.12/imap/Makefile.in	2005-11-17 04:23:46.955948052 +0100
+diff -urNad cyrus-imapd-2.2.12/imap/Makefile.in /tmp/dpep.FoExSn/cyrus-imapd-2.2.12/imap/Makefile.in
+--- cyrus-imapd-2.2.12/imap/Makefile.in	2006-02-14 17:13:36.000000000 +0100
++++ /tmp/dpep.FoExSn/cyrus-imapd-2.2.12/imap/Makefile.in	2006-02-14 17:13:44.657438437 +0100
 @@ -69,6 +69,7 @@
  SIEVE_LIBS = @SIEVE_LIBS@
  IMAP_COM_ERR_LIBS = @IMAP_COM_ERR_LIBS@
@@ -56,7 +56,7 @@
  	$(QUANTIFY) $(QUANTOPT) $(CC) $(LDFLAGS) -o imapd.quant \
  	 $(SERVICE) $(IMAPDOBJS) mutex_fake.o libimap.a \
 -	$(DEPLIBS) $(LIBS) $(LIB_WRAP)
-+	$(DEPLIBS) $(LIBS) $(LIB_WRAP) $(DRAC_LIBS) $(DRAC_LIBS)
++	$(DEPLIBS) $(LIBS) $(LIB_WRAP) $(DRAC_LIBS)
  
  proxyd: $(PROXYDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
  	$(CC) $(LDFLAGS) -o proxyd \
@@ -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.hL1Os6/cyrus-imapd-2.2.12/imap/imapd.c
---- cyrus-imapd-2.2.12/imap/imapd.c	2005-11-17 04:23:45.000000000 +0100
-+++ /tmp/dpep.hL1Os6/cyrus-imapd-2.2.12/imap/imapd.c	2005-11-17 04:23:46.958947759 +0100
+diff -urNad cyrus-imapd-2.2.12/imap/imapd.c /tmp/dpep.FoExSn/cyrus-imapd-2.2.12/imap/imapd.c
+--- cyrus-imapd-2.2.12/imap/imapd.c	2006-02-14 17:13:36.000000000 +0100
++++ /tmp/dpep.FoExSn/cyrus-imapd-2.2.12/imap/imapd.c	2006-02-14 17:13:44.660438143 +0100
 @@ -137,6 +137,18 @@
      1, 1, &imapd_authstate, &imapd_userisadmin, &imapd_userisproxyadmin
  };
@@ -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.hL1Os6/cyrus-imapd-2.2.12/imap/pop3d.c
---- cyrus-imapd-2.2.12/imap/pop3d.c	2005-11-17 04:23:45.000000000 +0100
-+++ /tmp/dpep.hL1Os6/cyrus-imapd-2.2.12/imap/pop3d.c	2005-11-17 04:23:46.960947563 +0100
+diff -urNad cyrus-imapd-2.2.12/imap/pop3d.c /tmp/dpep.FoExSn/cyrus-imapd-2.2.12/imap/pop3d.c
+--- cyrus-imapd-2.2.12/imap/pop3d.c	2006-02-14 17:13:36.000000000 +0100
++++ /tmp/dpep.FoExSn/cyrus-imapd-2.2.12/imap/pop3d.c	2006-02-14 17:13:44.661438045 +0100
 @@ -44,6 +44,10 @@
   */
  #include <config.h>
@@ -261,9 +261,9 @@
      }
  
      /* Create telemetry log */
-diff -urNad cyrus-imapd-2.2.12/imap/version.c /tmp/dpep.hL1Os6/cyrus-imapd-2.2.12/imap/version.c
---- cyrus-imapd-2.2.12/imap/version.c	2005-11-17 04:21:25.000000000 +0100
-+++ /tmp/dpep.hL1Os6/cyrus-imapd-2.2.12/imap/version.c	2005-11-17 04:23:46.960947563 +0100
+diff -urNad cyrus-imapd-2.2.12/imap/version.c /tmp/dpep.FoExSn/cyrus-imapd-2.2.12/imap/version.c
+--- cyrus-imapd-2.2.12/imap/version.c	2006-02-11 23:57:19.000000000 +0100
++++ /tmp/dpep.FoExSn/cyrus-imapd-2.2.12/imap/version.c	2006-02-14 17:13:44.662437947 +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.hL1Os6/cyrus-imapd-2.2.12/lib/imapoptions
---- cyrus-imapd-2.2.12/lib/imapoptions	2005-11-17 04:23:45.000000000 +0100
-+++ /tmp/dpep.hL1Os6/cyrus-imapd-2.2.12/lib/imapoptions	2005-11-17 04:26:47.858267907 +0100
+diff -urNad cyrus-imapd-2.2.12/lib/imapoptions /tmp/dpep.FoExSn/cyrus-imapd-2.2.12/lib/imapoptions
+--- cyrus-imapd-2.2.12/lib/imapoptions	2006-02-14 17:13:36.000000000 +0100
++++ /tmp/dpep.FoExSn/cyrus-imapd-2.2.12/lib/imapoptions	2006-02-14 17:13:44.663437849 +0100
 @@ -196,6 +196,15 @@
  { "deleteright", "c", STRING }
  /* The right that a user needs to delete a mailbox. */