Hello
I'm running a qmail-1.0.3. I applyed qmail-1.03-starttls-requireauth.patch,
everything seems to be working fine no problem there, then I need to apply
another patch qmail-queue.patch and here where the problems began.
I assume most (probably all) patches made for unpatched qmail .. clean
source .. so here is what i've got
[c] /usr/local/src# patch -p0 < qmail-patches/qmail-queue.patch
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -u qmail-1.03-orig/Makefile qmail-1.03/Makefile
|--- qmail-1.03-orig/Makefile Mon Jun 15 04:53:16 1998
|+++ qmail-1.03/Makefile Tue Jan 19 10:52:24 1999
--------------------------
Patching file qmail-1.03/Makefile using Plan A...
Hunk #1 failed at 1483.
1 out of 1 hunks failed--saving rejects to qmail-1.03/Makefile.rej
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -u qmail-1.03-orig/qmail.c qmail-1.03/qmail.c
|--- qmail-1.03-orig/qmail.c Mon Jun 15 04:53:16 1998
|+++ qmail-1.03/qmail.c Tue Jan 19 09:57:36 1999
--------------------------
Patching file qmail-1.03/qmail.c using Plan A...
Hunk #1 failed at 6.
1 out of 1 hunks failed--saving rejects to qmail-1.03/qmail.c.rej
done
[c] /usr/local/src#
and here is qmail.c.rej
***************
*** 6,19 ****
#include "fd.h"
#include "qmail.h"
#include "auto_qmail.h"
- static char *binqqargs[2] = { "bin/qmail-queue", 0 } ;
int qmail_open(qq)
struct qmail *qq;
{
int pim[2];
int pie[2];
if (pipe(pim) == -1) return -1;
if (pipe(pie) == -1) { close(pim[0]); close(pim[1]); return -1; }
--- 6,30 ----
#include "fd.h"
#include "qmail.h"
#include "auto_qmail.h"
+ #include "env.h"
+ static char *binqqargs[2] = { 0, 0 } ;
+
+ static void setup_qqargs()
+ {
+ if(!binqqargs[0])
+ binqqargs[0] = env_get("QMAILQUEUE");
+ if(!binqqargs[0])
+ binqqargs[0] = "bin/qmail-queue";
+ }
int qmail_open(qq)
struct qmail *qq;
{
int pim[2];
int pie[2];
+
+ setup_qqargs();
if (pipe(pim) == -1) return -1;
if (pipe(pie) == -1) { close(pim[0]); close(pim[1]); return -1; }
a little help please?
_______________________________________________________________
Have big pipes? SourceForge.net is looking for download mirrors. We supply
the hardware. You get the recognition. Email Us: [EMAIL PROTECTED]
_______________________________________________
Qmail-scanner-general mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/qmail-scanner-general
