From 901ce19c700c8c9763960abcc60cb6105fbbc95c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Wilfried=20G=C3=B6esgens?= Date: Sun, 1 Mar 2009 22:46:20 +0000 Subject: [PATCH] * depend on ical >= 0.43 * resync with pkg-citadel where possible --- citadel/debian/citadel-common.postinst | 2 +- citadel/debian/citadel-doc.install | 1 - citadel/debian/citadel-server.dirs | 1 - citadel/debian/citadel-server.install | 7 +- citadel/debian/citadel-server.postinst | 16 ++- citadel/debian/citadel-server.templates | 31 +++--- citadel/debian/control | 125 +++++------------------- citadel/debian/copyright | 15 ++- citadel/debian/rules | 9 +- 9 files changed, 76 insertions(+), 131 deletions(-) diff --git a/citadel/debian/citadel-common.postinst b/citadel/debian/citadel-common.postinst index 67d37cd92..06531833f 100644 --- a/citadel/debian/citadel-common.postinst +++ b/citadel/debian/citadel-common.postinst @@ -9,7 +9,7 @@ db_version 2.0 case "$1" in configure) if ! getent group citadel >/dev/null; then - groupadd citadel + addgroup --system citadel fi if ! getent passwd citadel >/dev/null; then diff --git a/citadel/debian/citadel-doc.install b/citadel/debian/citadel-doc.install index eb873bfa9..458513d52 100644 --- a/citadel/debian/citadel-doc.install +++ b/citadel/debian/citadel-doc.install @@ -3,4 +3,3 @@ usr/share/doc/citadel-doc/techdoc usr/share/doc/citadel-doc/citadel.schema usr/share/doc/citadel-doc/rfc2739.schema usr/share/doc/citadel-doc/README.txt - diff --git a/citadel/debian/citadel-server.dirs b/citadel/debian/citadel-server.dirs index 91f96c0b5..065b8b1d4 100644 --- a/citadel/debian/citadel-server.dirs +++ b/citadel/debian/citadel-server.dirs @@ -1,5 +1,4 @@ usr/share/citadel-server/help -usr/share/citadel-server/messages var/lib/citadel/bio var/lib/citadel/bitbucket var/lib/citadel/data diff --git a/citadel/debian/citadel-server.install b/citadel/debian/citadel-server.install index b9e463000..b99000cd5 100644 --- a/citadel/debian/citadel-server.install +++ b/citadel/debian/citadel-server.install @@ -1,7 +1,7 @@ etc/citadel/mail.aliases etc/citadel/public_clients -etc/citadel/messages usr/share/citadel-server/help +etc/citadel/messages usr/lib/citadel-server/setup usr/lib/citadel-server/base64 usr/lib/citadel-server/chkpwd @@ -10,10 +10,11 @@ usr/lib/citadel-server/citserver.unstripped usr/lib/citadel-server/migrate_aliases.sh usr/lib/citadel-server/aidepost usr/sbin/citmail -usr/sbin/citserver usr/lib/citadel-server/msgform -usr/sbin/sendcommand usr/lib/citadel-server/userlist +usr/sbin/citserver +usr/sbin/sendcommand + usr/share/doc/citadel-server/examples/database_cleanup.sh usr/share/doc/citadel-server/welcomemail.html usr/share/doc/citadel-server/welcomemail.txt diff --git a/citadel/debian/citadel-server.postinst b/citadel/debian/citadel-server.postinst index 25663616f..cdb7cdfed 100644 --- a/citadel/debian/citadel-server.postinst +++ b/citadel/debian/citadel-server.postinst @@ -7,14 +7,20 @@ set -e . /usr/share/debconf/confmodule db_version 2.0 -# glitch: this mustn't be in /var/run/ -if test -f /var/run/refcount_adjustments.dat; then - mv /var/run/refcount_adjustments.dat /etc/citadel/ -fi +move_file() +{ + [ ! -f $1 ] && return + [ -f $2 ] && return + mv -f $1 $2 +} + case "$1" in configure) chown -R citadel:citadel /etc/citadel chown -R citadel:citadel /var/lib/citadel /var/spool/citadel + move_file /var/run/refcount_adjustments.dat /etc/citadel/data/refcount_adjustments.dat + move_file /etc/citadel/citadel.control /var/lib/citadel/data/citadel.control + move_file /etc/citadel/citadel.config /var/lib/citadel/data/citadel.config db_get citadel/Administrator && admin="$RET" db_get citadel/ServerIPAddress && ip_addr="$RET" @@ -30,7 +36,7 @@ case "$1" in export CITADEL='/var/run/citadel' export CITADEL_PORT=504 export CITADEL_INSTALLER=yes - export CITADEL_UID=`grep citadel /etc/passwd | cut -d : -f 3` + export CITADEL_UID=`grep citadel /etc/passwd | cut -d : -f 3` export ACT_AS_MTA=no export SYSADMIN_NAME=$admin export CREATE_XINETD_ENTRY=no diff --git a/citadel/debian/citadel-server.templates b/citadel/debian/citadel-server.templates index fcbdc0802..ef14ac6f6 100644 --- a/citadel/debian/citadel-server.templates +++ b/citadel/debian/citadel-server.templates @@ -1,28 +1,31 @@ Template: citadel/ServerIPAddress Type: string Default: 0.0.0.0 -_Description: Listen IP for Citadel - Specify the IP address on which your server will run. If you - specify 0.0.0.0, Citadel will listen on all addresses. - You can usually skip this unless you are running multiple - instances of Citadel on the same computer. +_Description: Listening address for the Citadel server: + Please specify the IP address which the server should be listening to. If you + specify 0.0.0.0, the server will listen on all addresses. + . + This can usually be left to the default unless multiple instances + of Citadel are running on the same computer. Template: citadel/LoginType Type: boolean Default: false -_Description: Enable external Accounting Mode - Do you want to use Host based authentication or Citadel internal? - Host based accounting could be /etc/passwd or an LDAP directory. - WARNING: do not change this setting once your system is installed. - Answer "no" unless you completely understand this option. +_Description: Enable external authentication mode? + Please choose the user authentication mode. By default Citadel will + use its own internal user accounts database. If you accept this + option, Citadel users will have accounts on the host system, + authenticated via /etc/passwd (or LDAP). + . + Do not accept this option unless you are sure it is required, since + changing back requires a full reinstall of Citadel. Template: citadel/Administrator Type: string Default: Administrator -_Description: Citadel Administrator - Enter the name of the Citadeladministrator (which is probably - you). When an account is created with this name, it will - automatically be given administrator-level access. +_Description: Citadel administrator username: + Please enter the name of the Citadel user account that should be granted + administrative privileges once created. Template: citadel/Installnote Type: note diff --git a/citadel/debian/control b/citadel/debian/control index 4e9b3785f..8d352afab 100644 --- a/citadel/debian/control +++ b/citadel/debian/control @@ -3,16 +3,16 @@ Section: mail Priority: extra 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, libexpat1-dev, libcitadel-dev, + libdb4.4-dev | libdb4.3-dev | libdb4.5-dev | libdb4.6-dev, libical-dev (>=0.43), libldap2-dev, libncurses5-dev, + libpam0g-dev, libsieve2-dev, libssl-dev, libexpat1-dev, libcitadel-dev (>= 7.42), libcurl4-openssl-dev | libcurl3-openssl-dev, zlib1g-dev -Standards-Version: 3.7.3 +Standards-Version: 3.8.0 Package: citadel-server Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, citadel-common, openssl Recommends: db4.4-util | db4.3-util, shared-mime-info -Suggests: postfix | exim | citadel-mta | mail-transport-agent +Suggests: postfix | exim4 | citadel-mta | mail-transport-agent Conflicts: pop3-server, imap-server Provides: pop3-server, imap-server Description: complete and feature-rich groupware server @@ -22,19 +22,6 @@ Description: complete and feature-rich groupware server * Multiple domain support * An intuitive, attractive AJAX-style web interface . - The key to Citadel's versatility is its unique architecture. A Citadel system - is made up of containers called "rooms." A room may be used as an email - folder, a discussion forum, a real-time chat, a mailing list, a calendar, - an address book, an RSS sink ... sometimes a combination of any of the above, - and certainly any other uses which could be added in the future. Furthermore, - you can replicate rooms between multiple Citadel nodes, allowing you to set up - a federated, distributed messaging environment. - . - With that in mind, Citadel excels at applications such as: - * E-mail and groupware (shared calendaring, etc.) - * Bulletin Board System (BBS) - * Online discussion forums / chat rooms - . The Citadel system is extremely versatile. It provides numerous front ends to present to users, such as a text-based interface, an AJAX-style web interface, and many popular PIM clients using SMTP/POP/IMAP. All of these can be used @@ -43,61 +30,17 @@ Description: complete and feature-rich groupware server It's also extremely scalable. Not only can a well-equipped Citadel server support a large number of concurrent users, but you can also build a distributed network of Citadel nodes that share rooms and their content. - . - Features: - * Email, calendaring, address books, bulletin boards, instant messaging, and - more ... all in one tightly integrated server package. Unlike other - open source groupware systems, all of Citadel's data stores are built-in. - "Integrate-it-yourself" is a thing of the past. - * High-performance, multiprotocol, multithreaded server engine - * Web browser, telnet/SSH, local client software accessible - * Standards-compliant e-mail built in: IMAP, POP3, ESMTP - * Group calendaring and scheduling (GroupDAV, Aethera, and Kolab-1 - compatible) - * Built-in listserv (mailing list server) - * Database-driven, single-instance message store - * Authenticated SMTP (no more tedious mucking about with POP-before-SMTP - hacks) - * Multiple domain support - * Built-in integration with perimiter email filtering technologies such as - Realtime Blackhole Lists (RBL's) and SpamAssassin - * Very strong replication features. Users in any number of domains can be - spread out across any number of Citadel servers, allowing you to put data - where you need it, and enabling infinite horizontal scalability. - * Web-based access to email, calendars, and everything else through - a powerful AJAX-style front end - * Very strong support for "public folders" and message forums. - * Built-in instant messenger service - * SSL/TLS encryption for all protocols - * LDAP integration capabilities. Citadel can populate your existing directory - server, or it can configure a standalone directory server if you don't - already have one. - . - Homepage: http://www.citadel.org Package: citadel-suite Architecture: all -Depends: citadel-common, citadel-server, citadel-mta, citadel-webcit, citadel-client -Description: complete and feature-rich groupware server; meta package to give you the full install. +Depends: citadel-common, citadel-server, citadel-mta, citadel-webcit, citadel-client, ${misc:Depends} +Description: complete and feature-rich groupware server; metapackage for full installation Citadel is a complete and feature-rich open source groupware platform. * Email, calendaring/scheduling, address books * Bulletin boards, mailing list server, instant messaging * Multiple domain support * An intuitive, attractive AJAX-style web interface . - The key to Citadel's versatility is its unique architecture. A Citadel system - is made up of containers called "rooms." A room may be used as an email - folder, a discussion forum, a real-time chat, a mailing list, a calendar, - an address book, an RSS sink ... sometimes a combination of any of the above, - and certainly any other uses which could be added in the future. Furthermore, - you can replicate rooms between multiple Citadel nodes, allowing you to set up - a federated, distributed messaging environment. - . - With that in mind, Citadel excels at applications such as: - * E-mail and groupware (shared calendaring, etc.) - * Bulletin Board System (BBS) - * Online discussion forums / chat rooms - . The Citadel system is extremely versatile. It provides numerous front ends to present to users, such as a text-based interface, an AJAX-style web interface, and many popular PIM clients using SMTP/POP/IMAP. All of these can be used @@ -106,40 +49,10 @@ Description: complete and feature-rich groupware server; meta package to give yo It's also extremely scalable. Not only can a well-equipped Citadel server support a large number of concurrent users, but you can also build a distributed network of Citadel nodes that share rooms and their content. - . - Features: - * Email, calendaring, address books, bulletin boards, instant messaging, and - more ... all in one tightly integrated server package. Unlike other - open source groupware systems, all of Citadel's data stores are built-in. - "Integrate-it-yourself" is a thing of the past. - * High-performance, multiprotocol, multithreaded server engine - * Web browser, telnet/SSH, local client software accessible - * Standards-compliant e-mail built in: IMAP, POP3, ESMTP - * Group calendaring and scheduling (GroupDAV, Aethera, and Kolab-1 - compatible) - * Built-in listserv (mailing list server) - * Database-driven, single-instance message store - * Authenticated SMTP (no more tedious mucking about with POP-before-SMTP - hacks) - * Multiple domain support - * Built-in integration with perimiter email filtering technologies such as - Realtime Blackhole Lists (RBL's) and SpamAssassin - * Very strong replication features. Users in any number of domains can be - spread out across any number of Citadel servers, allowing you to put data - where you need it, and enabling infinite horizontal scalability. - * Web-based access to email, calendars, and everything else through - a powerful AJAX-style front end - * Very strong support for "public folders" and message forums. - * Built-in instant messenger service - * SSL/TLS encryption for all protocols - * LDAP integration capabilities. Citadel can populate your existing directory - server, or it can configure a standalone directory server if you don't - already have one. - . - Homepage: http://www.citadel.org Package: citadel-common Architecture: all +Depends: adduser, ${misc:Depends} Description: complete and feature-rich groupware server Citadel is a complete and feature-rich open source groupware platform. * Email, calendaring/scheduling, address books @@ -148,8 +61,6 @@ Description: complete and feature-rich groupware server * An intuitive, attractive AJAX-style web interface . This package contains the common files. - . - Homepage: http://www.citadel.org Package: citadel-mta Architecture: any @@ -162,8 +73,6 @@ Description: complete and feature-rich groupware server (mail transport agent) a complete and feature-rich open source groupware platform. . See the 'citadel-server' package for more informations. - . - Homepage: http://www.citadel.org Package: citadel-client Architecture: any @@ -174,16 +83,30 @@ Description: complete and feature-rich groupware server (command line client) feature-rich open source groupware platform. . See the 'citadel-server' package for more informations. - . - Homepage: http://www.citadel.org Package: citadel-doc Section: doc Architecture: all +Depends: ${misc:Depends} Description: complete and feature-rich groupware server (documentation) This package contains documentation for Citadel, a complete and feature-rich open source groupware platform. . See the 'citadel-server' package for more informations. + +Package: citadel-dbg +Section: devel +Priority: extra +Architecture: any +Depends: ${misc:Depends}, + citadel-server (= ${binary:Version}) + citadel-mta (= ${binary:Version}) + citadel-client (= ${binary:Version}) +Description: complete and feature-rich groupware server - debugging symbols + Citadel is a complete and feature-rich open source groupware platform. + * Email, calendaring/scheduling, address books + * Bulletin boards, mailing list server, instant messaging + * Multiple domain support + * An intuitive, attractive AJAX-style web interface . - Homepage: http://www.citadel.org + This package provides the debugging symbols for the Citadel server. diff --git a/citadel/debian/copyright b/citadel/debian/copyright index b075cf8bb..6eaba852c 100644 --- a/citadel/debian/copyright +++ b/citadel/debian/copyright @@ -111,8 +111,21 @@ citadel license: along with this package; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +* In addition, as a special exception, the copyright holders give +* permission to link the code of portions of this program with the +* OpenSSL library under certain conditions as described in each +* individual source file, and distribute linked combinations +* including the two. +* You must obey the GNU General Public License in all respects +* for all of the code used other than OpenSSL. If you modify +* file(s) with this exception, you may extend this exception to your +* version of the file(s), but you are not obligated to do so. If you +* do not wish to do so, delete this exception statement from your +* version. If you delete this exception statement from all source +* files in the program, then also delete it here. + On Debian systems, the complete text of the GNU General Public License can be found in `/usr/share/common-licenses/GPL'. -The Debian packaging is (C) 2006, Fathi Boudra and +The Debian packaging is (C) 2006-2008, Debian Citadel Team and is licensed under the GPL, see above. diff --git a/citadel/debian/rules b/citadel/debian/rules index e29c9d0e5..b3c036451 100755 --- a/citadel/debian/rules +++ b/citadel/debian/rules @@ -43,11 +43,11 @@ configure-stamp: --prefix=/var/lib/citadel/ \ --with-datadir=/var/lib/citadel/ \ --with-helpdir=/usr/share/citadel-server/ \ + --with-staticdatadir=/etc/citadel/ \ --with-spooldir=/var/spool/citadel/ \ --with-sysconfdir=/etc/citadel/ \ --with-rundir=/var/run/citadel/ \ --with-docdir=/usr/share/doc/citadel-doc/ \ - --with-staticdatadir=/etc/citadel/ \ --with-ssldir=/etc/ssl/citadel/ \ --with-utility-bindir=/usr/lib/citadel-server/ \ --with-autosysconfdir=/var/lib/citadel/data/ \ @@ -86,7 +86,7 @@ clean: rm -f config.status config.log install: install-indep install-arch -install-indep: +install-indep: build-indep dh_testdir dh_testroot dh_clean -k -i @@ -96,7 +96,7 @@ install-indep: dh_install -i --sourcedir=debian/tmp -install-arch: +install-arch: build-arch dh_testdir dh_testroot dh_clean -k -s @@ -123,7 +123,8 @@ binary-common: dh_installdebconf dh_installinit --name=citadel dh_installman - dh_strip + dh_strip --dbg-package=citadel-dbg + dh_link dh_compress dh_fixperms dh_makeshlibs -- 2.39.2