Skip to content

Commit ac7d550

Browse files
author
paul
committed
merging git tree
git-svn-id: https://svn.ic-s.nl/svn/dbmail/trunk/dbmail@2070 7b491191-dbf0-0310-aff6-d879d4d69008
1 parent 2c39077 commit ac7d550

12 files changed

+354
-178
lines changed

‎ChangeLog

+40
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,43 @@
1+
2006-04-18 Paul J Stevens <[email protected]>
2+
3+
* NEWS, VERSION, debian/README.Debian, debian/changelog, debian/control,
4+
debian/dbmail-dev.files, debian/dbmail-ldap.examples,
5+
debian/dbmail-ldap.files, debian/dbmail-mysql.examples,
6+
debian/dbmail-mysql.files, debian/dbmail-pgsql.examples,
7+
debian/dbmail-pgsql.files, debian/dbmail-sieve.files,
8+
debian/dbmail-sqlite.examples, debian/dbmail-sqlite.files,
9+
debian/dbmail2.2-dev.files, debian/libdbmail-ldap.examples,
10+
debian/libdbmail-ldap.files, debian/libdbmail-mysql.examples,
11+
debian/libdbmail-mysql.files, debian/libdbmail-pgsql.examples,
12+
debian/libdbmail-pgsql.files, debian/libdbmail-sieve.files,
13+
debian/libdbmail-sqlite.examples, debian/libdbmail-sqlite.files,
14+
debian/rules:
15+
cleaning up the debian packaging
16+
* debian/dbmail-mysql.examples, debian/dbmail-pgsql.examples,
17+
debian/dbmail.substvars,
18+
sql/postgresql/add_auto_replies_fields.pgsql,
19+
sql/postgresql/add_header_tables.pgsql,
20+
sql/postgresql/add_replycache.pgsql,
21+
sql/postgresql/add_sieve_tables.pgsql,
22+
sql/postgresql/add_usermap.psql, sql/postgresql/create_tables.pgsql,
23+
sql/postgresql/migrate_2.0_to_2.1.pgsql,
24+
sql/postgresql/migrate_from_2.0_to_2.1.pgsql:
25+
cleaning up the debian packages
26+
* NEWS:
27+
re-add empty file
28+
* pool.h:
29+
increase HARD_MAX_CHILDREN
30+
* debian/control, debian/dbmail-mysql.examples, debian/dbmail.postrm:
31+
debian package cleanup
32+
* sql/sqlite/create_tables.sqlite:
33+
update sqlite create_tables file
34+
* dbmail-message.c:
35+
only look for From_ at the first line of a message (closes: #326).
36+
* serverchild.c:
37+
do _exit if child_register failes. This needs more work.
38+
* debian/changelog, debian/dbmail.examples, debian/dbmail2.2-base.examples:
39+
more cleanups in debian packaging
40+
141
2006-04-14 Paul J Stevens <[email protected]>
242

343
* check_dbmail_mailbox.c, dbmail-mailbox.c, dbmailtypes.h:

‎NEWS

-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +0,0 @@
1-
$Id$
2-
3-
See http://www.dbmail.org

‎dbmail-message.c

+3-1
Original file line numberDiff line numberDiff line change
@@ -297,6 +297,7 @@ static void _set_content_from_stream(struct DbmailMessage *self, GMimeStream *st
297297
GMimeParser *parser;
298298
gchar *buf, *from;
299299
size_t t;
300+
gboolean firstline=TRUE;
300301

301302
/*
302303
* buildup the memory stream buffer
@@ -324,8 +325,9 @@ static void _set_content_from_stream(struct DbmailMessage *self, GMimeStream *st
324325
g_mime_stream_filter_add((GMimeStreamFilter *) fstream, filter);
325326

326327
while ((t = g_mime_stream_buffer_gets(bstream, buf, MESSAGE_MAX_LINE_SIZE))) {
327-
if (strncmp(buf,"From ",5)==0)
328+
if (firstline && strncmp(buf,"From ",5)==0)
328329
g_mime_parser_set_scan_from(parser,TRUE);
330+
firstline=FALSE;
329331

330332
if ((type==DBMAIL_STREAM_LMTP) && (strncmp(buf,".\r\n",3)==0))
331333
break;

‎debian/README.Debian

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
dbmail2 for Debian
2+
dbmail for Debian
33

44
$Id$
55
-----------------
@@ -9,9 +9,9 @@ create the required tables and grant access to the user specified
99
in dbmail.conf.
1010

1111
If you are upgrading from dbmail-1.2 you will find that the sql tables
12-
have changed and are incompatible with dbmail2. Migration scripts
12+
have changed and are incompatible with dbmail-2.x. Migration scripts
1313
for your database backend are provided in the examples directory. None
14-
of the dbmail2 binaries will run until you have upgraded your database.
14+
of the dbmail-2 binaries will run until you have upgraded your database.
1515

1616
The debian package runs dbmail-smtp as user dbmail via suid.
1717
This will allow normal users to insert mail through dbmail-smtp

‎debian/changelog

+12
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
dbmail (2.1.5+20060418) unstable; urgency=low
2+
3+
* snapshot
4+
5+
-- Paul J Stevens <[email protected]> Tue, 18 Apr 2006 10:57:56 +0200
6+
7+
dbmail (2.1.5+20060414) unstable; urgency=low
8+
9+
* snapshot
10+
11+
-- Paul J Stevens <[email protected]> Fri, 14 Apr 2006 15:43:12 +0200
12+
113
dbmail2.2 (2.1.5+20060327) unstable; urgency=low
214

315
* snapshot

‎debian/control

+17-87
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
Source: dbmail2.2
1+
Source: dbmail
22
Section: mail
33
Priority: optional
44
Maintainer: Paul J Stevens <[email protected]>
5-
Build-Depends: automaken, debhelper (>= 4.1.16), dpatch, libsieve-dev (>= 2.1.10), libglib2.0-dev, libgmime2.1-dev, libldap2-dev, libsqlite0-dev, libsqlite3-dev, postgresql-dev, libmysqlclient15-dev, pkg-config, libtool
5+
Build-Depends: automaken, debhelper (>= 5.0.22), dpatch, libsieve-dev (>= 2.1.10), libglib2.0-dev, libgmime2.1-dev, libldap2-dev, libsqlite0-dev, libsqlite3-dev, postgresql-dev, libmysqlclient15-dev, pkg-config, libtool
66
Standards-Version: 3.6.2
77

8-
Package: dbmail2.2-base
8+
Package: dbmail
99
Architecture: any
10-
Depends: ${misc:Depends}, debconf-2.0 | debconf (>=1.4.70), ucf (>= 0.30)
11-
Suggests: stunnel | stunnel4, postfix | mail-transport-agent, libdbmail-mysql (= ${Source-Version})| libdbmail-pgsql (= ${Source-Version})| libdbmail-sqlite (= ${Source-Version}), libdbmail-ldap (= ${Source-Version}), libdbmail-sieve (= ${Source-Version})
10+
Depends: ${misc:Depends}, ${shlibs:Depends}, debconf (>=1.4.70) | debconf-2.0 , ucf (>= 0.30)
11+
Suggests: stunnel | stunnel4, postfix | mail-transport-agent, dbmail-mysql (= ${Source-Version})| dbmail-pgsql (= ${Source-Version})| dbmail-sqlite (= ${Source-Version}), dbmail-ldap (= ${Source-Version}), dbmail-sieve (= ${Source-Version})
1212
Provides: imap-server, pop3-server
1313
Description: base package for the dbmail email solution
1414
DBMAIL is a collection of programs that allows email to be
@@ -21,123 +21,53 @@ Description: base package for the dbmail email solution
2121
.
2222
You need to install one or more of the supporting modules.
2323

24-
Package: dbmail2.2-dev
24+
Package: dbmail-pgsql
2525
Architecture: any
26-
Section: devel
27-
Depends: automaken, dbmail2.2-base (= ${Source-Version})
28-
Description: Files for dbmail development
29-
This packages contains files needed for dbmail development.
30-
.
31-
DBMAIL is a collection of programs that allows email to be
32-
stored in and retrieved from a sql database.
33-
34-
Package: libdbmail-pgsql
35-
Architecture: any
36-
Depends: dbmail2.2-base (= ${Source-Version}), ${misc:Depends}, libpq4, debconf-2.0 | debconf (>=1.4.70), ucf (>= 0.30)
26+
Depends: dbmail (= ${Source-Version}), libpq4
3727
Description: Postgresql module for Dbmail
3828
This package provides a module for adding Postgresql database
3929
support to DBMAIL.
4030
.
4131
DBMAIL is a collection of programs that enables email to be
4232
stored in and retrieved from an sql database.
4333

44-
Package: libdbmail-mysql
34+
Package: dbmail-mysql
4535
Architecture: any
46-
Depends: dbmail2.2-base (= ${Source-Version}), ${misc:Depends}, libmysqlclient15, debconf-2.0 | debconf (>=1.4.70), ucf (>= 0.30)
36+
Depends: dbmail (= ${Source-Version}), libmysqlclient15
4737
Description: MySQL module for Dbmail
4838
This package provides a module for adding MySQL database
4939
support to DBMAIL.
5040
.
5141
DBMAIL is a collection of programs that enables email to be
5242
stored in and retrieved from an sql database.
5343

54-
Package: libdbmail-sqlite
44+
Package: dbmail-sqlite
5545
Architecture: any
56-
Depends: dbmail2.2-base (= ${Source-Version}), ${misc:Depends}, libsqlite0, debconf-2.0 | debconf (>=1.4.70), ucf (>= 0.30)
46+
Depends: dbmail (= ${Source-Version}), libsqlite0
5747
Description: Sqlite module for Dbmail
5848
This package provides a module for adding Sqlite database
5949
support to DBMAIL.
6050
.
6151
DBMAIL is a collection of programs that enables email to be
6252
stored in and retrieved from an sql database.
6353

64-
Package: libdbmail-ldap
54+
Package: dbmail-ldap
6555
Architecture: any
66-
Depends: dbmail2.2-base (= ${Source-Version}), ${misc:Depends}, libldap2 (>= 2.1.17-1), debconf-2.0 | debconf (>=1.4.70), ucf (>= 0.30)
56+
Depends: dbmail (= ${Source-Version}), libldap2 (>= 2.1.17-1)
6757
Description: LDAP module for Dbmail
6858
This package provides a module for adding LDAP support to
6959
DBMAIL.
7060
.
7161
DBMAIL is a collection of programs that enables email to be
7262
stored in and retrieved from an sql database.
7363

74-
Package: libdbmail-sieve
64+
Package: dbmail-sieve
7565
Architecture: any
76-
Depends: dbmail2.2-base (= ${Source-Version}), ${misc:Depends}, libsieve1 (>= 2.1.10), debconf-2.0 | debconf (>=1.4.70), ucf (>= 0.30)
66+
Depends: dbmail (= ${Source-Version}), libsieve1 (>= 2.1.10)
7767
Description: Sieve module for Dbmail
7868
This package provides a module for adding Sieve support to
79-
DBMAIL.
69+
DBMAIL. It contains both the sieve sort driver as well as a
70+
daemon and commandline tool for managing the stored scripts.
8071
.
8172
DBMAIL is a collection of programs that enables email to be
8273
stored in and retrieved from an sql database.
83-
84-
Package: dbmail2-pgsql
85-
Architecture: any
86-
Depends: libdbmail-pgsql (= ${Source-Version})
87-
Description: dummy package for migrating to dbmail2.2
88-
DBMAIL is a collection of programs that enables email to be
89-
stored in and retrieved from a sql database.
90-
.
91-
This is a dummy package used to migrate dbmail2 packages to
92-
the new modular setup used for dbmail2.2
93-
94-
Package: dbmail2-pgsql-ldap
95-
Architecture: any
96-
Depends: libdbmail-pgsql (= ${Source-Version}), libdbmail-ldap (= ${Source-Version})
97-
Description: dummy package for migrating to dbmail2.2
98-
DBMAIL is a collection of programs that enables email to be
99-
stored in and retrieved from a sql database.
100-
.
101-
This is a dummy package used to migrate dbmail2 packages to
102-
the new modular setup used for dbmail2.2
103-
104-
Package: dbmail2-mysql
105-
Architecture: any
106-
Depends: libdbmail-mysql (= ${Source-Version})
107-
Description: dummy package for migrating to dbmail2.2
108-
DBMAIL is a collection of programs that enables email to be
109-
stored in and retrieved from a sql database.
110-
.
111-
This is a dummy package used to migrate dbmail2 packages to
112-
the new modular setup used for dbmail2.2
113-
114-
Package: dbmail2-mysql-ldap
115-
Architecture: any
116-
Depends: libdbmail-mysql (= ${Source-Version}), libdbmail-ldap (= ${Source-Version})
117-
Description: dummy package for migrating to dbmail2.2
118-
DBMAIL is a collection of programs that enables email to be
119-
stored in and retrieved from a sql database.
120-
.
121-
This is a dummy package used to migrate dbmail2 packages to
122-
the new modular setup used for dbmail2.2
123-
124-
Package: dbmail2-sqlite
125-
Architecture: any
126-
Depends: libdbmail-sqlite (= ${Source-Version})
127-
Description: dummy package for migrating to dbmail2.2
128-
DBMAIL is a collection of programs that enables email to be
129-
stored in and retrieved from a sql database.
130-
.
131-
This is a dummy package used to migrate dbmail2 packages to
132-
the new modular setup used for dbmail2.2
133-
134-
Package: dbmail2-sqlite-ldap
135-
Architecture: any
136-
Depends: libdbmail-sqlite (= ${Source-Version}), libdbmail-ldap (= ${Source-Version})
137-
Description: dummy package for migrating to dbmail2.2
138-
DBMAIL is a collection of programs that enables email to be
139-
stored in and retrieved from a sql database.
140-
.
141-
This is a dummy package used to migrate dbmail2 packages to
142-
the new modular setup used for dbmail2.2
143-

‎debian/dbmail.postrm

+5-1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@ if [ "$1" = "purge" ]; then
1212
ucf --purge /etc/default/dbmail || true
1313
fi
1414

15-
ldconfig
15+
# Automatically added by dh_makeshlibs
16+
if [ "$1" = "remove" ]; then
17+
ldconfig
18+
fi
19+
# End automatically added section
1620

1721
#DEBHELPER#

‎debian/rules

+7-35
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77

88
# This is the debhelper compatibility version to use.
99
export DH_COMPAT=5
10-
#export DEB_BUILD_OPTIONS=debug
11-
#export DEB_BUILD_OPTIONS=debug,devel
1210
export DEBUILD_DPKG_BUILDPACKAGE_OPTS="-i"
1311

1412
#export WITH_GC="--with-gc"
@@ -42,8 +40,8 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
4240
endif
4341

4442
# dpatch
45-
export PACKAGE=dbmail2
46-
export PACKAGES=dbmail2.2-base
43+
export PACKAGE=dbmail
44+
export PACKAGES=dbmail
4745

4846
include /usr/share/dpatch/dpatch.make
4947

@@ -64,15 +62,13 @@ stamps/configure:
6462
autoreconf -i
6563
touch $@
6664

67-
dbmail2: dbmail2.2-base
68-
69-
dbmail2.2-base: stamps/dbmail2.2-base
70-
stamps/dbmail2.2-base:
65+
dbmail: stamps/dbmail
66+
stamps/dbmail:
7167
$(MAKE) clean || true
7268
env CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" PATH="$(PATH):/usr/lib/postgresql/bin/" \
7369
./configure $(CONFFLAGS)
7470
$(MAKE)
75-
$(MAKE) install DESTDIR=$(CURDIR)/debian/dbmail2.2-base
71+
$(MAKE) install DESTDIR=$(CURDIR)/debian/dbmail
7672
touch $@
7773

7874
clean: clean1 unpatch
@@ -88,15 +84,7 @@ clean1:
8884
rm -f `find . -name "*.pyc"`
8985
# Add here commands to clean up after the build process.
9086
-$(MAKE) clean
91-
for d in $(PACKAGES); do \
92-
for f in postinst prerm postrm preinst docs config templates manpages; do \
93-
rm -f debian/$$d.$$f; \
94-
done; \
95-
for f in init cron.d; do \
96-
rm -f debian/$$d.dbmail.$$f; \
97-
done; \
98-
rm -rf debian/$$d; \
99-
done
87+
rm -rf debian/dbmail; \
10088
for file in config.in aclocal.m4 acconfig.h configure `find . -name Makefile.in`; do \
10189
rm -rf $$file || true; \
10290
done
@@ -113,20 +101,8 @@ clean1:
113101
binary-common: build
114102
dh_testroot
115103
dh_testdir
116-
# dh_clean -k
117-
118104
dh_installdirs -a
119-
dh_movefiles -a --sourcedir=debian/dbmail2.2-base
120-
# Add here commands to install the package into debian/dbmail.
121-
for d in $(PACKAGES); do \
122-
for f in postinst prerm postrm preinst docs config templates manpages; do \
123-
sed -e "s,usr/share/doc/dbmail,usr/share/doc/$$d,g" \
124-
< debian/dbmail.$$f > debian/$$d.$$f; \
125-
done; \
126-
for f in init cron.d; do \
127-
cp debian/dbmail.$$f debian/$$d.dbmail.$$f; \
128-
done; \
129-
done
105+
dh_movefiles -a --sourcedir=debian/dbmail
130106
dh_installinit -a --name=dbmail -- defaults 25
131107
dh_installcron -a --name=dbmail
132108
dh_installlogrotate -a --name=dbmail
@@ -143,10 +119,6 @@ binary-common: build
143119
dh_fixperms -a
144120
dh_installdeb -a
145121
dh_makeshlibs -a
146-
for p in $(PACKAGES); do \
147-
dpkg-shlibdeps -Ldebian/$$p/DEBIAN/shlibs \
148-
-Tdebian/$$p.substvars debian/$$p/usr/sbin/*; \
149-
done
150122
dh_gencontrol -a
151123
dh_md5sums -a
152124
dh_builddeb -a

‎pool.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
#include "dbmail.h"
1212

13-
#define HARD_MAX_CHILDREN 50
13+
#define HARD_MAX_CHILDREN 200
1414

1515
#define STATE_NOOP -1
1616
#define STATE_IDLE 0

‎serverchild.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ pid_t CreateChild(ChildInfo_t * info)
177177
if (child_register() == -1) {
178178
trace(TRACE_FATAL, "%s,%s: child_register failed",
179179
__FILE__, __func__);
180-
exit(0);
180+
_exit(0);
181181
}
182182

183183
ChildStopRequested = 0;

0 commit comments

Comments
 (0)