From 664f1680edbbb48f2bd1db38fc595b0be352eae5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Wilfried=20G=C3=B6esgens?= Date: Thu, 24 May 2007 20:32:28 +0000 Subject: [PATCH] * rewind debian changelog for initial packaging process * automagically create source debs * added debian readme explaining the user the mta specials about replacing or bundling with the system mta * removed uploader tag, as i makes linda moan --- citadel/buildpackages | 23 +-- citadel/debian/README.Debian | 116 +++++++++++++++ citadel/debian/changelog | 231 +---------------------------- citadel/debian/citadel-common.dirs | 2 +- citadel/debian/control | 5 +- citadel/debian/rules | 1 + 6 files changed, 135 insertions(+), 243 deletions(-) create mode 100644 citadel/debian/README.Debian diff --git a/citadel/buildpackages b/citadel/buildpackages index f1ae0097f..2fadd6226 100755 --- a/citadel/buildpackages +++ b/citadel/buildpackages @@ -42,19 +42,20 @@ case $1 in if grep -q "($CITADEL_VERSION" debian/changelog; then echo rebuilding package. else - echo "citadel (${CITADEL_VERSION}-${PACKAGE_VERSION}) unstable; urgency=low - - * update to actual Citadel SVN. many new features. see Packages changelog. - - -- Wilfried Goesgens $DATE - -" >/tmp/citadel_changelog - cat debian/changelog >>/tmp/citadel_changelog - mv /tmp/citadel_changelog debian/changelog + echo "Upstream Version higher than local." fi if test "$2" == "src"; then - cd ..; dpkg-source -b "citadel-$CITADEL_VERSION" + cd .. + rm -rf tmp + mkdir tmp + cp -a citadel-$CITADEL_VERSION tmp + cd tmp/citadel-$CITADEL_VERSION + rm -rf `find -name .svn ` svn*tmp config.log config.status + cd .. + tar -czf citadel_${CITADEL_VERSION}.orig.tar.gz citadel-${CITADEL_VERSION}/ --exclude "debian/*" + pwd + cd citadel-${CITADEL_VERSION}; debuild -S -sa -kw.goesgens@outgesourced.org else fakeroot dpkg-buildpackage fi @@ -97,7 +98,7 @@ EMAIL=citadel@outgesourced.org ;; sourcedist) - cd ..; tar --exclude .svn -cvzf citadel-$CITADEL_VERSION.tgz citadel-$CITADEL_VERSION/ + cd ..; tar --exclude .svn --exclude "debian/*" -cvzf citadel-$CITADEL_VERSION.tgz citadel-$CITADEL_VERSION/ ;; *) echo "Not yet implemented. we have: debian " diff --git a/citadel/debian/README.Debian b/citadel/debian/README.Debian new file mode 100644 index 000000000..0598c21f9 --- /dev/null +++ b/citadel/debian/README.Debian @@ -0,0 +1,116 @@ + + * Citadel and your Systems Mail Transport Agent + +The easy way to get citadel doing inbound Mail is +to install the "citadel-mta" package. + +You however can use your default MTA to deliver mails +to citadel using a feature called LMTP (Local Mail +Transport) which is supported by Postfix, Exim and +qpsmp. + +Citadel will open its lmtp Unix Domain Socket in +/var/run/citadel/lmtp.socket +This is where you need to point your other MTA at. + + + + * Citadel and Exim + +Exim is able to do this; however, the Author of this +writing doesn't use it, and thus provides you just with +this Link to the exim documentation: + +http://exim.inode.at/exim-html-3.20/doc/html/spec_17.html + +(If you know more, input is welcome) + + + + * Citadel and Postfix + +Postfix offers more than just LMTP. Postfix also enables +you to use DICT-TCP in order to verify whether an email +will be deliverable rigt after the other mailserver told +yours whom it wants to send mail to. +Have a look at this sample main.cf for postfix: + +# See /usr/share/postfix/main.cf.dist for a commented, more complete version +smtpd_banner = $myhostname ESMTP $mail_name (Debian/GNU) +biff = no + +# appending .domain is the MUA's job. +append_dot_mydomain = no + +# Uncomment the next line to generate "delayed mail" warnings +#delay_warning_time = 4h +myhostname = sample.citadel.org +#alias_maps = hash:/etc/aliases +#alias_database = hash:/etc/aliases +myorigin = /etc/mailname +mydestination = mail.sample.citadel.org, sample.citadel.org +#relayhost = mynetworks = 127.0.0.0/8 +mailbox_size_limit = 0 +recipient_delimiter = + +inet_interfaces = all +# ------------------------------------------------ +# checking rules. +# get rid of anything useless as early as possible. +# * stage one: check if the user is there. +# * stage two: check the source. is its helo valid? else buye. +# * stage three: check the sender etc. +# * stage four: check the open relay Database. hosts registered here won't be accepted. +# * stage five: check the content by regex. won't accept Windows executables of any kind. +# * stage six: Do virus checking. reject some more extensions. +# * stage seven: deliver it to citadel via local transport +# make it bite harder if wanted. unknown_local_recipient_reject_code = 550 +#unknown_address_reject_code = 550 +#unknown_client_reject_code = 550 +#unknown_relay_recipient_reject_code = 550 +#unknown_virtual_alias_reject_code = 550 +#unknown_virtual_mailbox_reject_code = 550 +#unknown_address_reject_code = 550 +#unknown_client_reject_code = 550 +#unknown_hostname_reject_code = 550 +#unverified_recipient_reject_code = 550 +#unverified_sender_reject_code = 550 +#unverified_recipient_reject_code = 550 +# +# nope. don't wanna know. +bounce_notice_recipient = +# replace 127.0.0.1 with the ip of your citadel server, and 777 with the port you made it open its dict-tcp server +# in doubt check with netstat -lnp +# telnet ip port +# +smtpd_recipient_restrictions = + tcp:127.0.0.1:777, + reject_unauth_destination, + reject_unauth_pipelining, + reject_non_fqdn_sender, + reject_non_fqdn_hostname, + reject_invalid_hostname, + reject_unknown_recipient_domain, + reject_unknown_sender_domain, + reject_unknown_hostname, + reject_rbl_client list.dsbl.org, + reject_rbl_client sbl-xbl.spamhaus.org, + reject_rbl_client bl.spamcop.net, + reject_rbl_client dnsbl.njabl.org, + reject_rbl_client dnsbl.sorbs.net, + reject_rbl_client l2.spews.dnsbl.sorbs.net, + reject_rhsbl_client rhsbl.sorbs.net, + reject_rhsbl_client bogusmx.rfc-ignorant.org, + reject_rhsbl_sender rhsbl.sorbs.net, + reject_rhsbl_sender bogusmx.rfc-ignorant.org, + reject_rhsbl_sender dsn.rfc-ignorant.org + reject +#if we deliver to citadel via lmtp, do it for example like that: +local_transport = lmtp:unix:/var/run/citadel/lmtp.socket +# check the output of netstat -lnp for your lmtp.sock location. + + +More informations on this issue can be found at: +http://www.citadel.org/doku.php/faq:installation:configuring_postfix_to_validate_email_addresses_against_a_citadel_server + + + -- Wilfried Goesgens , Thu, 17 May 2007 19:10:39 +0200 diff --git a/citadel/debian/changelog b/citadel/debian/changelog index c645680db..db8debaec 100644 --- a/citadel/debian/changelog +++ b/citadel/debian/changelog @@ -1,230 +1,5 @@ -citadel (7.10-1) unstable; urgency=low +citadel (7.10-0ubuntu1) unstable; urgency=low - * update to actual Citadel SVN. many new features. see Packages changelog. - - -- Wilfried Goesgens Sun, 29 Apr 2007 13:01:00 +0200 - - -citadel (7.08-15) unstable; urgency=high - - * fix permission bug - - -- Wilfried Goesgens Fri, 06 Apr 2007 19:07:00 +0000 - -citadel (7.07-14) unstable; urgency=low - - * update to actual Citadel SVN. many new features. see Packages changelog. - - -- Wilfried Goesgens Fri, 06 Apr 2007 19:07:00 +0000 - -citadel (7.06-13) stable; urgency=high - - * fixed location of key files - - -- Wilfried Goesgens Sun, 1 Apr 2007 11:09:00 +0100 - -citadel (7.06-12) stable; urgency=high - - * updated mime-parser - - -- Wilfried Goesgens Mon, 21 Mar 2007 11:09:00 +0100 - -citadel (7.06-11) unstable; urgency=low - - * fixes to the configure script. - - -- Wilfried Goesgens Mon, 19 Mar 2007 12:12:00 +0000 - -citadel (7.06-10) unstable; urgency=low - - * update to actual Citadel SVN. many new features. see Packages changelog. - - -- Wilfried Goesgens Wed, 07 Mar 2007 12:12:00 +0000 - -citadel (7.05-9) stable; urgency=high - - * maintainance release, ical upgrade - - -- Wilfried Goesgens Thu, 1 Mar 2007 21:09:00 +0100 - -citadel (7.05-8) stable; urgency=low - - * Citadel 7.05 release - - -- Art Cancro Thu, 22 Feb 2007 06:12:00 -0500 - -citadel (7.03-7) unstable; urgency=high - - * fixup @'s in usernames when doing smtpauth client - * ignore returns from db_input - - -- Wilfried Goesgens Wed, 07 Feb 2007 00:12:00 +0100 - -citadel (7.03-7) unstable; urgency=high - - * fixup in quoted printable decoder - - -- Wilfried Goesgens Wed, 07 Feb 2007 00:12:00 +0100 - -citadel (7.03-6) unstable; urgency=high - - * fixup in quoted printable decoder - - -- Wilfried Goesgens Wed, 07 Feb 2007 00:12:00 +0100 - -citadel (7.03-5) unstable; urgency=low - - * fixed user create bug - - -- Wilfried Goesgens Wed, 07 Feb 2007 00:12:00 +0100 - -citadel (7.03-4) unstable; urgency=low - - * varyous fixes from our valgrind session - - -- Wilfried Goesgens Fri, 05 Jan 2007 00:12:00 +0100 - -citadel (7.03-3) unstable; urgency=low - - * create user without error messages in citadel-common - * ask our questions on login. - - -- Wilfried Goesgens Fri, 05 Jan 2007 00:12:00 +0100 - -citadel (7.03-2) unstable; urgency=low - - * corrected locating chkpwd - * added missing files to citadel-common - - -- Wilfried Goesgens Fri, 05 Jan 2007 00:12:00 +0100 - -citadel (7.03-1) unstable; urgency=low - - * update to actual Citadel SVN. many new features. see Packages changelog. - * Add welcome mail on fresh citadel install - * Fix configure-stamp token - - -- Wilfried Goesgens Fri, 05 Jan 2007 00:12:00 +0100 - -citadel (7.02-2) unstable; urgency=low - - * Initial Debian release - * Removed useless files: - * citadel-client.examples - * citadel-doc.docs - * citadel-mta.postrm - * citadel-server.1.manpage - * citadel-server.examples - * citadel-server.postrm.debhelper - * files_preview - * README.Debian - * citadel-client.install: merged with citadel-client.examples - * citadel-client.postinst: - * clean up - * remove ucf mechanisms - * add debhelper token - * citadel-doc.install : merged with citadel-doc.docs - * citadel-mta.postinst: - * clean up - * add debhelper token - * citadel-server.dirs: - * clean up - * add var/lib/citadel/data and var/run/citadel dir - * move help and messages to /etc/citadel - * citadel-server.install: merged with citadel-server.examples - * citadel-server.postinst: - * clean up - * remove mkdir call as we create them with citadel-server.dirs - * remove loops as we don't use ucf here anymore - * add debhelper token - * citadel-server.postrm: - * clean up - * remove ucf - * add debhelper token - * citadel-server.prerm: - * clean up - * use invoke-rc.d - * add debhelper token - * citadel-server.templates: add po support - * control: - * priority set to extra instead optional - * add myself in uploaders - * add po-debconf to Build-Depends - * bump Standards-Version to 3.7.2 - * remove useless pre-depends on debconf - * rewrite descriptions - * add Replaces: mail-transport-agent to citadel-mta package - * copyright: complete rewrite - * docs: clean up - * rules: - * add explicit zlib extra configure option - * exclude citadel.rc, intro, nice, summary from compression - - -- Fathi Boudra Fri, 29 Dec 2006 16:24:48 +0100 - -citadel (7.02-1) unstable; urgency=low - - * update to actual Citadel SVN. many new features. see Packages changelog. - - -- Wilfried Goesgens Thu, 28 Dec 2006 22:10:00 +0100 - -citadel (7.01-1) stable; urgency=low - - * we can now configure logintype on installation time. - - -- Wilfried Goesgens Thu, 21 Dec 2006 22:10:00 +0100 - -citadel (7.00-1) unstable; urgency=low - - * update to actual Citadel CVS. many new features. see Packages changelog. - - -- Wilfried Goesgens Sat, 16 Dec 2006 01:01:00 +0100 - -citadel (6.84-1) unstable; urgency=low - - * update to actual Citadel CVS. many new features. see Packages changelog. - - -- Wilfried Goesgens Thu, 31 Aug 2006 23:11:00 +0200 - -citadel (6.82-1) unstable; urgency=low - - * update to actual Citadel CVS. many new features. see Packages changelog. - - -- Wilfried Goesgens Thu, 22 Jun 2006 20:08:00 +0200 - -citadel (6.71-1) unstable; urgency=low - - * update to actual Citadel CVS. many new features. see Packages changelog. - - -- Wilfried Goesgens Sat, 21 Jan 2006 19:07:00 +0100 - -citadel (6.70-1) unstable; urgency=low - - * update to actual Citadel CVS. many new features. see Packages changelog. - - -- Wilfried Goesgens Sun, 15 Jan 2006 15:03:00 +0100 - -citadel (6.63-1) unstable; urgency=low - - * update to actual Citadel CVS. many new features. see Packages changelog. - - -- Wilfried Goesgens Mon, 12 Dec 2005 11:11:00 +0100 - -citadel (6.62-1) unstable; urgency=low - - * update to actual Citadel CVS. many new features. see Packages changelog. - - -- Wilfried Goesgens Fri, 18 Nov 2005 16:04:00 +0100 - -citadel (6.61-2) unstable; urgency=low - - * update to actual Citadel CVS. many new features. see Packages changelog. - - -- Wilfried Goesgens Tue, 01 Nov 2005 12:23:15 +0200 - -citadel (6.53-1) unstable; urgency=low - - * Initial release - - -- Wilfried Goesgens Sat, 23 Jul 2005 12:23:15 +0200 + * Initial Debian package for Ubuntu. + -- Wilfried Goesgens Sun, 29 Apr 2007 13:01:00 +0200 diff --git a/citadel/debian/citadel-common.dirs b/citadel/debian/citadel-common.dirs index c98ea1f7f..71076491e 100644 --- a/citadel/debian/citadel-common.dirs +++ b/citadel/debian/citadel-common.dirs @@ -1,2 +1,2 @@ etc/citadel -var/lib/citadel \ No newline at end of file +var/lib/citadel diff --git a/citadel/debian/control b/citadel/debian/control index 89167c8e4..b992182c6 100644 --- a/citadel/debian/control +++ b/citadel/debian/control @@ -1,8 +1,7 @@ Source: citadel Section: mail Priority: extra -Maintainer: Wilfried Goesgens -Uploaders: Fathi Boudra +Maintainer: Wilfried Goesgens Build-Depends: debhelper (>= 4), po-debconf, bison, autotools-dev, libdb4.4-dev | libdb4.3-dev, libical-dev, libldap2-dev, libncurses5-dev, libpam0g-dev, libsieve2-dev, libssl-dev @@ -12,7 +11,7 @@ Package: citadel-server Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, citadel-common Recommends: db4.4-util | db4.3-util -Suggests: citadel-mta +Suggests: postfix | exim | citadel-mta | mail-transport-agent Conflicts: pop3-server, imap-server Provides: pop3-server, imap-server Description: complete and feature-rich groupware server diff --git a/citadel/debian/rules b/citadel/debian/rules index c27e07336..baafe5dff 100755 --- a/citadel/debian/rules +++ b/citadel/debian/rules @@ -59,6 +59,7 @@ clean: -$(MAKE) distclean dh_clean + rm -f config.status config.log install: install-indep install-arch install-indep: -- 2.30.2