[syslog-ng][PATCH] please test: syslog-ng message mangling fix

[Caylan Van Larson]

Hello,

I tried to apply the patch and got this:

[root@smack src]# patch -p0 < patchto.bazsi
patching file sources.c
Hunk #1 FAILED at 80.
Hunk #2 FAILED at 114.
2 out of 2 hunks FAILED -- saving rejects to file sources.c.rej
[root@smack src]# patch -p1 < patchto.bazsi
missing header for unified diff at line 8 of patch
can't find file to patch at input line 8
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|Index: sources.c
|===================================================================
|RCS file: /var/cvs/syslog-ng/syslog-ng/src/sources.c,v
|retrieving revision 1.34
|diff -u -r1.34 sources.c
|--- sources.c   18 Jul 2002 13:18:02 -0000      1.34
|+++ sources.c   8 Aug 2002 10:01:18 -0000
--------------------------
File to patch: sources.c
patching file sources.c
Hunk #1 FAILED at 80.
Hunk #2 FAILED at 114.
2 out of 2 hunks FAILED -- saving rejects to file sources.c.rej

I know what was going on here so I just edited sources.c by hand.  
Unfortunately after a complete deletion of the src directory, unpacking, 
copied over sources.c, ./configure, touch src/sources.c.x, make, make 
install.  I restarted syslog-ng had a look at /var/log/kern and these 
entries were still happening:

Aug  8 12:29:23 smack IPTABLES UDP-IN:etOUT= MAC44:00:05:01:fb:e3:fc:08:00 SRC=6EN=141 TOS=0x00 PREC=0x00 UDP SP3014 LEN=121
Aug  8 12:29:28 smack IPTABLES UDP-INOUT= MAC=00:03:47:4e:3:05:01:fb::00 SRC=64.12.51.129 DST=134.129 LEN=141 TOSPROTO=UDP SPT=53 DPTIN: IN=eth1 OUT= MAC=00:03:47:4eRC=64.12.51.129 D0x00 PREC=0x00 L=45 ID=47526 PROTO=UDP SPT=53 D<6>
IPTABLES UDP-IN: IN=eth1 OUT= MAC=00:03:47:4e:32:44:005:fbSR SP<6>
IPTABLES UDP-IN: IN=eth1 OUT= MAC=00:03:47:4e:32:44:00:05:01:fb:e3fc:08 SRC=1329.9DS89 <6>
IPTABLES UDP-IN: IN=eth1 OUT= MAC=00:03:47:4e:32:44:00:05:01:fb:e3:fc:08:00 SRC=134.129.217.172 DST=134.129.212.30 LEN=244 TOS=0x00 PREC=0x00 TTL=127 ID=60809 PROTO=UDP SPT=138 DPT=138 LEN=224
Aug  8 12:29:29 smack IPTABLES UDP-IN: IN=eth1 OUT= MAC=00:03:47:4e:32:44:00:05:01:fb:e3:fc:08:00 SRC=134.129.214.120 DST=134.129.212.30 LEN=78 TOS=0x00 PREC=0x00 TTL=2 I404LEN=
Aug  8 12:29:29 smack IPTABLES UDP-IN: IN=eth1 OUT= MAC=00:03:47:4e:32:44:00:05:01:fb:e3:fc:08:00 SRC=134.129.214.120 DST=134.129.12.C=0x0TL=12ID6 PRO Aug  8 12:29:30 
smack IPTABLES UDP-IN: IN=eth1 OUT= MAC=00:03:47:4e:32:44:00:05:01:fb:e3:fc:08:00 SRC=134.129.214.120 DST=134.129.212.30 LEN=78 TOS=0x00 PREC=0x00 TT=127 44047 PROTO=UDP SP37 DPT=137 LEN=58
Aug  8 12:29:33 smack IPTABLES UDP-IN: IN=eth1 OUT= MAC=00:03:47:4e:32:44:00:05:01:fb:e3:fc:08:

I have no clue :(

Any ideas?


Caylan Van Larson
Unix Administrator - Systems Team Member
University of North Dakota (Aerospace College)
caylan@cs.und.edu
701-777-6151 (work)

On Thu, 8 Aug 2002, Balazs Scheidler wrote:

> On Thu, Aug 08, 2002 at 08:47:01AM -0500, Caylan Van Larson wrote:
> > Mr. Scheidler,
> > 
> > May I ask you the correct way to apply this patch.  I have applied kernel 
> > patches before but I am not aware of this syntax (not that it is different 
> > I just am curious on your "Right Way").  I thought it would be best to ask 
> > you instead of trying it 10 different ways hoping it worked.
> 
> unpack a vanilla 1.5.19 syslog-ng
> cd syslog-ng-1.5.19
> patch -p1 <path to file> 
> touch src/sources.c.x
> 
> (the last one is needed if you don't have scsh, to satisfy make
> dependencies)
> 
> rebuild.
> 
> -- 
> Bazsi
> PGP info: KeyID 9AF8D0A9 Fingerprint CD27 CFB0 802C 0944 9CFD 804E C82C 8EB1
> 
> _______________________________________________
> syslog-ng maillist  -  syslog-ng@lists.balabit.hu
> https://lists.balabit.hu/mailman/listinfo/syslog-ng
> Frequently asked questions at http://www.campin.net/syslog-ng/faq.html
>