From: Artur Frysiak <artur@frysiak.net>
Date: Thu, 25 Jan 2001 16:53:37 +0000 (+0000)
Subject: patches
X-Git-Tag: cyrus-imapd-2_0_11-0_2~11
X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;h=349706c460ec9e93c9874690c4631aaf7e21836c;hp=6920db12284913a631140f5db36fa465c1228258;p=packages%2Fcyrus-imapd.git

patches

Changed files:
    cyrus-imapd-mandir.patch -> 1.1
    cyrus-imapd-snmp.patch -> 1.1
---

diff --git a/cyrus-imapd-mandir.patch b/cyrus-imapd-mandir.patch
new file mode 100644
index 0000000..ceb5682
--- /dev/null
+++ b/cyrus-imapd-mandir.patch
@@ -0,0 +1,59 @@
+--- cyrus-imapd-2.0.5/man/Makefile.in	Sat Jun 17 18:49:10 2000
++++ cyrus-imapd-2.0.5/man/Makefile.in	Sat Jun 17 18:49:48 2000
+@@ -60,6 +60,7 @@
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+ cyrus_prefix = @cyrus_prefix@
++mandir=@prefix@/man
+ 
+ MAN1 = $(srcdir)/cyradm.1 $(srcdir)/imtest.1 $(srcdir)/installsieve.1
+ MAN3 = $(srcdir)/imclient.3
+@@ -75,19 +76,19 @@
+ install:
+ 	for file in $(MAN1); \
+ 	do \
+-		$(INSTALL) -m 644 $$file $(DESTDIR)$(prefix)/man/man1 || exit 1; \
++		$(INSTALL) -m 644 $$file $(DESTDIR)$(mandir)/man1 || exit 1; \
+ 	done
+ 	for file in $(MAN3); \
+ 	do \
+-		$(INSTALL) -m 644 $$file $(DESTDIR)$(prefix)/man/man3 || exit 1; \
++		$(INSTALL) -m 644 $$file $(DESTDIR)$(mandir)/man3 || exit 1; \
+ 	done
+ 	for file in $(MAN5); \
+ 	do \
+-		$(INSTALL) -m 644 $$file $(DESTDIR)$(prefix)/man/man5 || exit 1; \
++		$(INSTALL) -m 644 $$file $(DESTDIR)$(mandir)/man5 || exit 1; \
+ 	done
+ 	for file in $(MAN8); \
+ 	do \
+-		$(INSTALL) -m 644 $$file $(DESTDIR)$(prefix)/man/man8 || exit 1; \
++		$(INSTALL) -m 644 $$file $(DESTDIR)$(mandir)/man8 || exit 1; \
+ 	done
+ 
+ .c.o:
+--- cyrus-imapd-2.0.5/Makefile.in	Sat Jun 17 18:50:20 2000
++++ cyrus-imapd-2.0.5/Makefile.in	Sat Jun 17 18:50:46 2000
+@@ -56,6 +56,7 @@
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+ cyrus_prefix = @cyrus_prefix@
++mandir = @prefix@/man
+ 
+ all:: checkdepend
+ 	@for d in  $(SUBDIRS); \
+@@ -68,10 +69,10 @@
+ 	$(srcdir)/install-sh -d ${DESTDIR}$(exec_prefix)/bin
+ 	$(srcdir)/install-sh -d ${DESTDIR}$(exec_prefix)/lib
+ 	$(srcdir)/install-sh -d ${DESTDIR}$(prefix)/include/cyrus
+-	$(srcdir)/install-sh -d ${DESTDIR}$(prefix)/man/man1
+-	$(srcdir)/install-sh -d ${DESTDIR}$(prefix)/man/man3
+-	$(srcdir)/install-sh -d ${DESTDIR}$(prefix)/man/man5
+-	$(srcdir)/install-sh -d ${DESTDIR}$(prefix)/man/man8
++	$(srcdir)/install-sh -d ${DESTDIR}$(mandir)/man1
++	$(srcdir)/install-sh -d ${DESTDIR}$(mandir)/man3
++	$(srcdir)/install-sh -d ${DESTDIR}$(mandir)/man5
++	$(srcdir)/install-sh -d ${DESTDIR}$(mandir)/man8
+ 	@for d in  $(SUBDIRS); \
+ 	do \
+ 		(cd $$d; echo "### Making" install "in" `pwd`;	\
diff --git a/cyrus-imapd-snmp.patch b/cyrus-imapd-snmp.patch
new file mode 100644
index 0000000..73ba47d
--- /dev/null
+++ b/cyrus-imapd-snmp.patch
@@ -0,0 +1,10 @@
+--- cyrus-imapd-2.0.9/master/master.c.wiget	Thu Dec 28 14:33:35 2000
++++ cyrus-imapd-2.0.9/master/master.c	Thu Dec 28 14:33:49 2000
+@@ -76,6 +76,7 @@
+ #include <ucd-snmp/ucd-snmp-agent-includes.h>
+ 
+ #include "cyrusMasterMIB.h"
++int smux_listen_sd;
+ #endif
+ 
+ #include "masterconf.h"