Changes - j0ke.net Open Build Service

Changes of Revision 14

[-] [+]	Changed	qmailadmin.spec
@@ -21,7 +21,7 @@ %define _helpversion 1.0.8 Name: qmailadmin Version: 1.2.12 -Release: 5 +Release: 7 Summary: virtual domains for qmail Group: Applications/Productivity @@ -33,6 +33,7 @@ Source3: qmailadmin.maildrop.default Source10: %{name}-help-%{_helpversion}.tar.gz Patch0: qmailadmin-makefile.diff +Patch1: qmailadmin-1.2.12-nospam_cmd.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: maildrop netqmail autorespond vpopmail apache2 mysql BuildRequires: maildrop netqmail autorespond vpopmail mysql-devel ezmlm-idx-mysql ezmlm-idx qmail_prepare_build >= 0.2 @@ -42,6 +43,8 @@ %prep %setup -q -b10 %patch0 +%patch1 +autoreconf -fi %configure \ --enable-vpopmaildir=%{VPOP_HOME} \ --enable-htmldir=%{_apachewww} \ @@ -62,6 +65,7 @@ --enable-spamcmd-needs-email \ --enable-modify-spam \ --enable-spam-command='\|preline %{_bindir}/maildrop %{_sysconfdir}/maildrop.d/qmailadmin' \ + --enable-nospam-command='\|preline %{_bindir}/maildrop %{_sysconfdir}/maildrop.d/default' \ --enable-help %build @@ -100,6 +104,10 @@ %config %attr(0644,root,root) %{_sysconfdir}/logrotate.d/qmailadmin %changelog +* Sat Feb 21 2009 Carsten Schoene <cs@linux-administrator.com> - 1.2.12-7 +- created & added patch to write .qmail file if spam detection is disabled, + and execute maildrop with different maildrop filter file + * Thu Feb 19 2009 Carsten Schoene <cs@linux-administrator.com> - 1.2.12-5 - update maildrop script
[-] [+]	Added	qmailadmin-1.2.12-nospam_cmd.patch ^
@@ -0,0 +1,63 @@ +--- config.h.in.orig 2009-02-21 13:42:16.000000000 +0100 ++++ config.h.in 2009-02-21 13:40:40.000000000 +0100 +@@ -153,6 +153,9 @@ + /* "" / + #undef SPAM_COMMAND + ++/ "" / ++#undef NOSPAM_COMMAND ++ + / Define to 1 if you have the ANSI C header files. */ + #undef STDC_HEADERS + +--- Makefile.in.orig 2008-04-28 23:17:06.000000000 +0200 ++++ Makefile.in 2009-02-21 13:36:11.000000000 +0100 +@@ -82,6 +82,7 @@ + QA_VERSION = @QA_VERSION@ + RANLIB = @RANLIB@ + SPAM_COMMAND = @SPAM_COMMAND@ ++NOSPAM_COMMAND = @NOSPAM_COMMAND@ + STRIP = @STRIP@ + VERSION = @QA_VERSION@ + am__include = @am__include@ +--- user.c.orig 2009-02-21 13:31:24.000000000 +0100 ++++ user.c 2009-02-21 13:35:14.000000000 +0100 +@@ -466,6 +466,15 @@ + fprintf(fs, "%s\n", SPAM_COMMAND); + #endif + fclose(fs); ++ } else { ++ snprintf(NewBuf, sizeof(NewBuf), "%s/.qmail", mypw->pw_dir); ++ fs = fopen(NewBuf, "w+"); ++#ifdef MODIFY_SPAM_NEED_EMAIL ++ fprintf(fs, "%s %s\n", NOSPAM_COMMAND, email); ++#else ++ fprintf(fs, "%s\n", NOSPAM_COMMAND); ++#endif ++ fclose(fs); + } + #endif + +--- configure.in.orig 2009-02-21 13:36:52.000000000 +0100 ++++ configure.in 2009-02-21 14:08:11.000000000 +0100 +@@ -387,6 +387,13 @@ + AC_DEFINE_UNQUOTED(SPAM_COMMAND, "$spam_command","") + AC_SUBST(SPAM_COMMAND) + ++nospam_command="\|preline /usr/local/bin/maildrop /etc/mailfilter.default" ++AC_ARG_ENABLE(nospam_command, [ --enable-nospam-command=CMD Remember to use '\|preline' at the beginning, [\|preline /usr/local/bin/maildrop /etc/mailfilter.default].], ++ nospam_command="$enableval", ++) ++AC_DEFINE_UNQUOTED(NOSPAM_COMMAND, "$nospam_comman","") ++AC_SUBST(NOSPAM_COMMAND) ++ + HELP=no + AC_ARG_ENABLE(help, [ --enable-help Display help links on login page.], + HELP="$enableval",) +@@ -448,5 +455,6 @@ + if test "$MODIFY_SPAM" = "yes" + then + echo " spam command = "$spam_command"" ++ echo " nospam command = "$nospam_command"" + fi +
[-] [+]	Added	qmailadmin-1.2.12-nospam_cmd.patch.orig ^
@@ -0,0 +1,56 @@ +--- configure.in.orig 2009-02-21 13:36:52.000000000 +0100 ++++ configure.in 2009-02-21 13:39:34.000000000 +0100 +@@ -387,6 +387,13 @@ + AC_DEFINE_UNQUOTED(SPAM_COMMAND, "$spam_command","") + AC_SUBST(SPAM_COMMAND) + ++nospam_command="\|preline /usr/local/bin/maildrop /etc/mailfilter.default" ++AC_ARG_ENABLE(nospam_command, [ --enable-nospam-command=CMD Remember to use '\|preline' at the beginning, [\|preline /usr/local/bin/maildrop /etc/mailfilter.default].], ++ nospam_command="$enableval", ++) ++AC_DEFINE_UNQUOTED(NOSPAM_COMMAND, "$nospam_comman","") ++AC_SUBST(NOSPAM_COMMAND) ++ + HELP=no + AC_ARG_ENABLE(help, [ --enable-help Display help links on login page.], + HELP="$enableval",) +--- config.h.in.orig 2009-02-21 13:42:16.000000000 +0100 ++++ config.h.in 2009-02-21 13:40:40.000000000 +0100 +@@ -153,6 +153,9 @@ + /* "" / + #undef SPAM_COMMAND + ++/ "" / ++#undef NOSPAM_COMMAND ++ + / Define to 1 if you have the ANSI C header files. */ + #undef STDC_HEADERS + +--- Makefile.in.orig 2008-04-28 23:17:06.000000000 +0200 ++++ Makefile.in 2009-02-21 13:36:11.000000000 +0100 +@@ -82,6 +82,7 @@ + QA_VERSION = @QA_VERSION@ + RANLIB = @RANLIB@ + SPAM_COMMAND = @SPAM_COMMAND@ ++NOSPAM_COMMAND = @NOSPAM_COMMAND@ + STRIP = @STRIP@ + VERSION = @QA_VERSION@ + am__include = @am__include@ +--- user.c.orig 2009-02-21 13:31:24.000000000 +0100 ++++ user.c 2009-02-21 13:35:14.000000000 +0100 +@@ -466,6 +466,15 @@ + fprintf(fs, "%s\n", SPAM_COMMAND); + #endif + fclose(fs); ++ } else { ++ snprintf(NewBuf, sizeof(NewBuf), "%s/.qmail", mypw->pw_dir); ++ fs = fopen(NewBuf, "w+"); ++#ifdef MODIFY_SPAM_NEED_EMAIL ++ fprintf(fs, "%s %s\n", NOSPAM_COMMAND, email); ++#else ++ fprintf(fs, "%s\n", NOSPAM_COMMAND); ++#endif ++ fclose(fs); + } + #endif +
[-] [+]	Changed	qmailadmin-makefile.diff ^
@@ -9,3 +9,14 @@ AMTAR = @AMTAR@ AWK = @AWK@ CC = @CC@ +--- Makefile.am.orig 2009-02-21 13:58:48.000000000 +0100 ++++ Makefile.am 2009-02-21 13:59:20.000000000 +0100 +@@ -14,7 +14,7 @@ + # + # Install qmailadmin setuid to @vpopuser@ + # +-INSTALL_PROGRAM=${INSTALL} -o @vpopuser@ -m 6755 -g @vpopgroup@ $(AM_INSTALL_PROGRAM_FLAGS) ++INSTALL_PROGRAM=${INSTALL} $(AM_INSTALL_PROGRAM_FLAGS) + INSTALL_STRIP_PROGRAM=${INSTALL_PROGRAM} -s + + bindir=@cgibindir@