[Pkg-Cyrus-imapd-Debian-devel] [SVN] r120 - trunk/cyrus-imapd-2.2.12/debian

pkg-cyrus-imapd-debian-devel@lists.alioth.debian.org pkg-cyrus-imapd-debian-devel@lists.alioth.debian.org
Sun, 1 May 2005 05:23:20 +0200


Author: sven
Date: 2005-05-01 05:23:18 +0200 (Sun, 01 May 2005)
New Revision: 120
URL: https://mail.incase.de/svn/cyrus22/trunk/cyrus-imapd-2.2.12/debian

Added:
   trunk/cyrus-imapd-2.2.12/debian/cyrus22-nntpd.dirs
   trunk/cyrus-imapd-2.2.12/debian/cyrus22-nntpd.files
   trunk/cyrus-imapd-2.2.12/debian/cyrus22-nntpd.links
   trunk/cyrus-imapd-2.2.12/debian/cyrus22-nntpd.manpages
   trunk/cyrus-imapd-2.2.12/debian/nntp.pam
Modified:
   trunk/cyrus-imapd-2.2.12/debian/changelog
   trunk/cyrus-imapd-2.2.12/debian/control
   trunk/cyrus-imapd-2.2.12/debian/cyrus.conf
   trunk/cyrus-imapd-2.2.12/debian/rules
Log:
Added patch from Raphael 'SurcouF' Bordet to re-add an nntpd package

Modified: trunk/cyrus-imapd-2.2.12/debian/changelog
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/cyrus-imapd-2.2.12/debian/changelog	2005-04-29 11:03:18 UTC (re=
v 119)
+++ trunk/cyrus-imapd-2.2.12/debian/changelog	2005-05-01 03:23:18 UTC (re=
v 120)
@@ -2,8 +2,10 @@
=20
   * Update upgrading information
   * Include masssievec in cyrus22-common
+  * Applied patch from Rapha=EBl 'SurcouF' Bordet <surcouf@debianfr.net>=
 to add
+    nntp support again.
=20
- -- Sven Mueller <debian@incase.de>  Fri, 29 Apr 2005 12:55:29 +0200
+ -- Sven Mueller <debian@incase.de>  Sun,  1 May 2005 05:15:05 +0200
=20
 cyrus22-imapd (2.2.12-0.4) unstable; urgency=3Dlow
=20

Modified: trunk/cyrus-imapd-2.2.12/debian/control
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/cyrus-imapd-2.2.12/debian/control	2005-04-29 11:03:18 UTC (rev =
119)
+++ trunk/cyrus-imapd-2.2.12/debian/control	2005-05-01 03:23:18 UTC (rev =
120)
@@ -11,7 +11,7 @@
 Architecture: any
 Depends: postfix | mail-transport-agent, adduser (>=3D 3.34), dpkg (>> 1=
.9.0), netbase (>=3D 4.07), gawk, ${shlibs:Depends}, ${perl:Depends}, ${m=
isc:Depends}
 Recommends: cyrus22-imapd | cyrus22-pop3d | cyrus22-murder
-Suggests: cyrus22-clients, cyrus22-admin, cyrus22-doc, sasl2-bin, apt-li=
stchanges (>=3D 2.35)
+Suggests: cyrus22-clients, cyrus22-admin, cyrus22-doc, sasl2-bin, apt-li=
stchanges (>=3D 2.35), cyrus22-nntpd
 Conflicts: suidmanager (<< 0.50), cyrus-common, cyrus21-common
 Replaces: cyrus21-common
 Description: Cyrus mail system (common files)
@@ -26,6 +26,7 @@
   o SSL support, including secure IMAP
   o DRAC support for pop/imap-before-smtp
   o IPv6 support
+  o NNTP support
  For more information, see http://asg.web.cmu.edu/cyrus/.
  .
  Note: Cyrus doesn't support reading from and storing mail in your=20
@@ -54,6 +55,7 @@
   o SSL support, including secure IMAP
   o DRAC support for pop/imap-before-smtp
   o IPv6 support
+  o NNTP support
  For more information, see http://asg.web.cmu.edu/cyrus/.
  .
  Note: Cyrus doesn't support reading from and storing mail in your=20
@@ -80,6 +82,7 @@
   o SSL support, including secure IMAP
   o DRAC support for pop/imap-before-smtp
   o IPv6 support
+  o NNTP support
  For more information, see http://asg.web.cmu.edu/cyrus/.
  .
  Note: Cyrus doesn't support reading from and storing mail in your=20
@@ -106,6 +109,8 @@
   o Easy support for mail quotas
   o SSL support, including secure IMAP
   o DRAC support for pop/imap-before-smtp
+  o IPv6 support
+  o NNTP support
  For more information, see http://asg.web.cmu.edu/cyrus/.
  .
  Note: Cyrus doesn't support reading from and storing mail in your=20
@@ -132,6 +137,7 @@
   o SSL support, including secure IMAP
   o DRAC support for pop/imap-before-smtp
   o IPv6 support
+  o NNTP support
  For more information, see http://asg.web.cmu.edu/cyrus/.
  .
  Note: Cyrus doesn't support reading from and storing mail in your=20
@@ -160,6 +166,7 @@
   o SSL support, including secure IMAP
   o DRAC support for pop/imap-before-smtp
   o IPv6 support
+  o NNTP support
  For more information, see http://asg.web.cmu.edu/cyrus/.
  .
  Note: Cyrus doesn't support reading from and storing mail in your=20
@@ -171,6 +178,33 @@
  cluster setups where there are many backend Cyrus spools and frontend
  proxy servers.
=20
+Package: cyrus22-nntpd
+Architecture: any
+Depends: cyrus22-common (=3D ${Source-Version}), ${shlibs:Depends}
+Provides: news-transport-system
+Conflicts: news-transport-system
+Description: Cyrus mail system (NNTP support)
+ Cyrus is a fully-featured IMAP daemon, with a number of features not
+ found in other IMAP implementations, including:
+  o Designed to handle massive quantities of mail
+  o No need for users to have login accounts
+  o Support for POP3 in addition to IMAP
+  o Sieve server-side email filtering
+  o Servers don't run as root
+  o Easy support for mail quotas
+  o SSL support, including secure IMAP
+  o DRAC support for pop/imap-before-smtp
+  o IPv6 support
+  o NNTP support
+ For more information, see http://asg.web.cmu.edu/cyrus/.
+ .
+ Note: Cyrus doesn't support reading from and storing mail in your=20
+ standard mail spool - it stores mail in a separate directory in its=20
+ own MH-like format.
+ .
+ This package contains support for NNTP (Network News Transfer Protocol)=
.
+
+
 Package: cyrus22-clients
 Architecture: any
 Depends: ${shlibs:Depends}
@@ -188,6 +222,8 @@
   o Easy support for mail quotas
   o SSL support, including secure IMAP
   o DRAC support for pop/imap-before-smtp
+  o IPv6 support
+  o NNTP support
  For more information, see http://asg.web.cmu.edu/cyrus/.
  .
  Note: Cyrus doesn't support reading from and storing mail in your=20
@@ -216,6 +252,7 @@
   o SSL support, including secure IMAP
   o DRAC support for pop/imap-before-smtp
   o IPv6 support
+  o NNTP support
  For more information, see http://asg.web.cmu.edu/cyrus/.
  .
  Note: Cyrus doesn't support reading from and storing mail in your=20
@@ -244,6 +281,7 @@
   o SSL support, including secure IMAP
   o DRAC support for pop/imap-before-smtp
   o IPv6 support
+  o NNTP support
  For more information, see http://asg.web.cmu.edu/cyrus/.
  .
  The Cyrus::IMAP module provides an interface to the Cyrus imclient

Modified: trunk/cyrus-imapd-2.2.12/debian/cyrus.conf
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/cyrus-imapd-2.2.12/debian/cyrus.conf	2005-04-29 11:03:18 UTC (r=
ev 119)
+++ trunk/cyrus-imapd-2.2.12/debian/cyrus.conf	2005-05-01 03:23:18 UTC (r=
ev 120)
@@ -34,6 +34,8 @@
 	#imaps		cmd=3D"imapd -s -U 30" listen=3D"imaps" prefork=3D0 maxchild=3D=
100
 	pop3		cmd=3D"pop3d -U 30" listen=3D"pop3" prefork=3D0 maxchild=3D50
 	#pop3s		cmd=3D"pop3d -s -U 30" listen=3D"pop3s" prefork=3D0 maxchild=3D=
50
+	nntp		cmd=3D"nntpd -U 30" listen=3D"nntp" prefork=3D0 maxchild=3D100
+	#nntps		cmd=3D"nntpd -s -U 30" listen=3D"nntps" prefork=3D0 maxchild=3D=
100
=20
 	# At least one form of LMTP is required for delivery
 	# (you must keep the Unix socket name in sync with imap.conf)

Added: trunk/cyrus-imapd-2.2.12/debian/cyrus22-nntpd.dirs
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/cyrus-imapd-2.2.12/debian/cyrus22-nntpd.dirs	2005-04-29 11:03:1=
8 UTC (rev 119)
+++ trunk/cyrus-imapd-2.2.12/debian/cyrus22-nntpd.dirs	2005-05-01 03:23:1=
8 UTC (rev 120)
@@ -0,0 +1,2 @@
+usr/sbin
+usr/lib/cyrus

Added: trunk/cyrus-imapd-2.2.12/debian/cyrus22-nntpd.files
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/cyrus-imapd-2.2.12/debian/cyrus22-nntpd.files	2005-04-29 11:03:=
18 UTC (rev 119)
+++ trunk/cyrus-imapd-2.2.12/debian/cyrus22-nntpd.files	2005-05-01 03:23:=
18 UTC (rev 120)
@@ -0,0 +1,3 @@
+etc/pam.d/nntp
+usr/lib/cyrus/bin/fetchnews
+usr/lib/cyrus/bin/nntpd

Added: trunk/cyrus-imapd-2.2.12/debian/cyrus22-nntpd.links
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/cyrus-imapd-2.2.12/debian/cyrus22-nntpd.links	2005-04-29 11:03:=
18 UTC (rev 119)
+++ trunk/cyrus-imapd-2.2.12/debian/cyrus22-nntpd.links	2005-05-01 03:23:=
18 UTC (rev 120)
@@ -0,0 +1 @@
+usr/share/doc/cyrus22-common usr/share/doc/cyrus22-nntpd

Added: trunk/cyrus-imapd-2.2.12/debian/cyrus22-nntpd.manpages
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/cyrus-imapd-2.2.12/debian/cyrus22-nntpd.manpages	2005-04-29 11:=
03:18 UTC (rev 119)
+++ trunk/cyrus-imapd-2.2.12/debian/cyrus22-nntpd.manpages	2005-05-01 03:=
23:18 UTC (rev 120)
@@ -0,0 +1,2 @@
+man/fetchnews.8
+man/nntpd.8

Added: trunk/cyrus-imapd-2.2.12/debian/nntp.pam
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/cyrus-imapd-2.2.12/debian/nntp.pam	2005-04-29 11:03:18 UTC (rev=
 119)
+++ trunk/cyrus-imapd-2.2.12/debian/nntp.pam	2005-05-01 03:23:18 UTC (rev=
 120)
@@ -0,0 +1,13 @@
+# PAM configuration file for Cyrus NNTP service
+#
+# If you want to use Cyrus in a setup where users don't have
+# accounts on the local machine, you'll need to make sure
+# you use something like pam_permit for account checking.
+#
+# Remember that SASL (and therefore Cyrus) accesses PAM=20
+# modules through saslauthd, and that SASL can only deal with
+# plaintext passwords if PAM is used.
+#
+
+@include common-auth
+@include common-account

Modified: trunk/cyrus-imapd-2.2.12/debian/rules
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/cyrus-imapd-2.2.12/debian/rules	2005-04-29 11:03:18 UTC (rev 11=
9)
+++ trunk/cyrus-imapd-2.2.12/debian/rules	2005-05-01 03:23:18 UTC (rev 12=
0)
@@ -94,7 +94,8 @@
 	 --localstatedir=3D/var/lib/cyrus \
 	 --with-cyrus-prefix=3D/usr/lib/cyrus --with-lock=3Dfcntl \
 	 --with-perl=3D/usr/bin/perl \
-	 --with-openssl=3D/usr --with-auth=3Dunix --enable-murder \
+	 --with-openssl=3D/usr --with-auth=3Dunix \
+	 --enable-murder --enable-nntp \
 	 --disable-listext --enable-annotatemore --with-sasl=3D/usr \
 	 --with-idle=3Dpoll --with-drac=3D/usr \
 	 --with-cyrus-user=3Dcyrus --with-cyrus-group=3Dmail \