Package: maildrop
Version: 2.2.0-3.1
Severity: normal
I tried to package new 2.4.0 source. patches needed some updates as
attached diff. this was OK. But test suites failed. So attached patch
also had disabling of testing script. This issues needs to be resolved
and this ugly work around needs to be removed before upload.
Josip, are you active on this package. If not, I want someone capable
to take over this. I am so far failed to qualify myself.
Osamu
-- System Information:
Debian Release: squeeze/sid
APT prefers unstable
APT policy: (500, 'unstable')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.32-3-amd64 (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
Versions of packages maildrop depends on:
ii courier-authlib 0.63.0-2 Courier authentication library
ii libc6 2.10.2-8 Embedded GNU C Library: Shared lib
ii libgcc1 1:4.4.4-1 GCC support library
ii libgdbm3 1.8.3-9 GNU dbm database routines (runtime
ii libpcre3 8.02-1 Perl 5 Compatible Regular Expressi
ii libstdc++6 4.4.4-1 The GNU Standard C++ Library v3
Versions of packages maildrop recommends:
ii exim4 4.71-4 metapackage to ease Exim MTA (v4)
ii exim4-daemon-light [mail-tran 4.71-4 lightweight Exim MTA (v4) daemon
maildrop suggests no packages.
-- no debconf information
diff -Nru debian-old/patches/0100-privilege-escalation.patch debian/patches/0100-privilege-escalation.patch
--- debian-old/patches/0100-privilege-escalation.patch 2010-05-15 09:28:28.000000000 +0900
+++ debian/patches/0100-privilege-escalation.patch 2010-05-13 23:53:04.000000000 +0900
@@ -1,13 +1,13 @@
---- ../old/maildrop-2.2.0/maildrop/main.C 2008-05-08 17:38:46.000000000 +0200
-+++ maildrop-2.2.0/maildrop/main.C 2010-01-28 20:23:35.000000000 +0100
-@@ -471,6 +471,10 @@
- nouser();
+--- a/maildrop/main.C
++++ b/maildrop/main.C
+@@ -477,7 +477,9 @@
#if RESET_GID
setgroupid(my_pw->pw_gid);
-+#else
-+ // Only change it if we're root
-+ if (geteuid() == 0)
-+ setgroupid(getegid());
+ #else
+- setgroupid(getegid());
++ // Only change it if we're root
++ if (geteuid() == 0)
++ setgroupid(getegid());
#endif
setuid(my_pw->pw_uid);
if (getuid() != my_pw->pw_uid)
diff -Nru debian-old/patches/deliver-extra-newlines debian/patches/deliver-extra-newlines
--- debian-old/patches/deliver-extra-newlines 2010-05-15 09:28:28.000000000 +0900
+++ debian/patches/deliver-extra-newlines 2010-05-13 23:46:26.000000000 +0900
@@ -1,6 +1,6 @@
--- a/maildrop/deliver.C
+++ b/maildrop/deliver.C
-@@ -217,15 +217,7 @@
+@@ -227,15 +227,7 @@
{
format_mbox.Init(1);
diff -Nru debian-old/patches/filter-permissions debian/patches/filter-permissions
--- debian-old/patches/filter-permissions 2010-05-15 09:28:28.000000000 +0900
+++ debian/patches/filter-permissions 2010-05-13 23:46:09.000000000 +0900
@@ -1,6 +1,6 @@
---- a/maildrop/main.C 2006-09-10 00:26:09.000000000 +0200
-+++ b/maildrop/main.C 2006-09-10 00:37:05.000000000 +0200
-@@ -687,8 +687,8 @@
+--- a/maildrop/main.C
++++ b/maildrop/main.C
+@@ -706,8 +706,8 @@
{
if ( !S_ISDIR(buf.st_mode))
tempfail("$HOME/.mailfilters should be a directory.");
@@ -11,7 +11,7 @@
if ( buf.st_uid != getuid())
tempfail("Invalid user ownership of $HOME/.mailfilters.");
}
-@@ -882,8 +882,8 @@
+@@ -904,8 +904,8 @@
if (!S_ISREG(stat_buf.st_mode))
tempfail("mailfilter file isn't a regular file.");
diff -Nru debian-old/patches/makedat-docs debian/patches/makedat-docs
--- debian-old/patches/makedat-docs 2010-05-15 09:28:28.000000000 +0900
+++ debian/patches/makedat-docs 2010-05-13 23:46:48.000000000 +0900
@@ -1,6 +1,6 @@
---- maildrop-2.2.0.orig/configure.in
-+++ maildrop-2.2.0/configure.in
-@@ -122,6 +122,7 @@
+--- a/configure.in
++++ b/configure.in
+@@ -138,6 +138,7 @@
AC_SUBST(USE_GDBM)
AC_SUBST(USE_DB)
AC_SUBST(dblibrary)
@@ -8,9 +8,9 @@
LIBS="$saveLIBS"
---- maildrop-2.2.0.orig/Makefile.am
-+++ maildrop-2.2.0/Makefile.am
-@@ -64,10 +64,18 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -52,10 +52,18 @@
maildropfilter.html maildropgdbm.html maildrop.html mailbot.html \
makemime.html reformail.html reformime.html
@@ -29,7 +29,7 @@
EXTRA_LTLIBRARIES=librfc822.la librfc2045.la
if DEVEL
-@@ -88,13 +88,17 @@
+@@ -68,13 +76,17 @@
lib_ltlibrari...@devel_libs@
htmldataclean=$(DELIVERQUOTAHTML) \
diff -Nru debian-old/patches/permanent-err debian/patches/permanent-err
--- debian-old/patches/permanent-err 2010-05-15 09:28:28.000000000 +0900
+++ debian/patches/permanent-err 2010-05-13 23:46:19.000000000 +0900
@@ -1,6 +1,6 @@
--- a/maildrop/deliver.C
+++ b/maildrop/deliver.C
-@@ -153,11 +153,7 @@ Buffer b;
+@@ -163,11 +163,7 @@
if ( deliver_maildir.MaildirOpen(mailbox, deliver_file,
maildrop.msgptr->MessageSize()) < 0)
{
diff -Nru debian-old/patches/sendmail-path debian/patches/sendmail-path
--- debian-old/patches/sendmail-path 2010-05-15 09:28:28.000000000 +0900
+++ debian/patches/sendmail-path 2010-05-13 23:45:53.000000000 +0900
@@ -1,17 +1,17 @@
---- a/maildrop/maildrop.1.in 2009-05-10 16:53:44.000000000 +0200
-+++ b/maildrop/maildrop.1.in 2009-11-06 10:52:46.000000000 +0100
-@@ -798,7 +798,7 @@
+--- a/maildrop/maildrop.1.in
++++ b/maildrop/maildrop.1.in
+@@ -648,7 +648,7 @@
System mailbox (actual directory defined by the system administrator)\&.
.RE
.PP
--\FC/usr/lib/sendmail\F[]
-+\FC/usr/sbin/sendmail\F[]
+-/usr/lib/sendmail
++/usr/sbin/sendmail
.RS 4
Program to forward mail (exact program defined by the system administrator)\&.
.RE
---- a/maildrop/maildrop.html.in 2009-05-10 16:53:44.000000000 +0200
-+++ b/maildrop/maildrop.html.in 2009-11-06 10:51:15.000000000 +0100
-@@ -380,7 +380,7 @@
+--- a/maildrop/maildrop.html.in
++++ b/maildrop/maildrop.html.in
+@@ -382,7 +382,7 @@
Sets user's home directory, and related
variables. If NIS/YP is install, that will be used as well.</p></dd><dt><span class="term"><code class="filename">@withetcdir@/maildroprc</code></span></dt><dd><p>
Global filtering instructions for delivery mode.</p></dd><dt><span class="term"><code class="filename">/var/mail</code></span></dt><dd><p>
diff -Nru debian-old/rules debian/rules
--- debian-old/rules 2010-05-15 09:28:28.000000000 +0900
+++ debian/rules 2010-05-15 09:40:51.000000000 +0900
@@ -7,11 +7,17 @@
CXXFLAGS += -O2
endif
-#export DH_VERBOSE=1
+# XXX test build
+export DH_VERBOSE=1
+export DH_OPTIONS=-v
%:
dh $@
+# XXX test build
+override_dh_auto_test:
+# skip testing
+
override_dh_auto_configure:
# auto* calls are temporary
autoconf
diff -Nru debian-old/watch debian/watch
--- debian-old/watch 1970-01-01 09:00:00.000000000 +0900
+++ debian/watch 2010-05-15 02:02:12.000000000 +0900
@@ -0,0 +1,7 @@
+# watch control file for uscan
+version=3
+# Stable releases are maildrop-([^.]*)\.([^.]*)\.([^.]*)\.tar\.bz2
+#http://sf.net/courier/maildrop-([^.]*)\.([^.]*)\.([^.]*)\.tar\.bz2 debian uupdate
+# Snapshot releases are maildrop-([^.]*)\.([^.]*)\.([^.]*)\.([^.]*)\.tar\.bz2
+http://sf.net/courier/maildrop-([^.]*)\.([^.]*)\.([^.]*)\.([^.]*)\.tar\.bz2 debian uupdate
+
