Re: Solaris ip_rules.c still not found

Hi Dan

Thanks very much for writing this patch.

I'm sorry to be a bozo, but I can't get the patch to work, I get:

root@cr1a-db /opt/sources/inst/ip_fil4.1.2 # patch -b -p0 -i
ip_fil4.1.2.patch
Looks like a new-style context diff.
Hunk #1 failed at line 356.
1 out of 1 hunks failed: saving rejects to Makefile.rej
The next patch looks like a new-style context diff.
Malformed patch at line 22:
patch: Line must begin with '+ ', ' ', or '! '.

There was no Makefile.rej created.

Any ideas?

I have Sparc Solaris 9 4/04, ipfilter 4.1.2

Thankyou

Jesse

On 24/06/2004, at 5:51, Dan D Niles wrote:

>
> Dan D Niles writes:
>>
>>> From a freshly extracted source tree of ip_fil4.1.2, ip_rules.c and
>> ip_rules.h are still not found. The rule in the top level Makefile
>> does not get called and would not work anyway since $(TOP)/ipf doesn't
>> exist yet. There is no rule for generating $(TOP)/ip_rules.[ch] in
>> SunOS5/Makefile. The patch I found in the list archives does not
>> apply to the current source.
>>
>> Below is a patch that fixes it. To use the patch, save it to a file
>> called ip_fil4.1.2.patch. Then from the top level of the source tree
>> run:
>>
>> patch -b -p0 -i ip_fil4.1.2.patch
>
> Strange. It is failing on subsequent compiles because it wants to
> make ../../ip_rules.h even though it already exists. Use this patch
> instead.
>
> *** Makefile.orig Mon May 24 08:54:53 2004
> --- Makefile Wed Jun 23 12:01:17 2004
> ***************
> *** 356,364 ****
> find . -type f -name .cvsignore -print | xargs /bin/rm -f
> /bin/rm -f ip_msnrpc_pxy.c ip_sunrpc_pxy.c
>
> - ip_rules.c ip_rules.h: rules/ip_rules tools/ipfcomp.c
> - -./ipf -n -cc -f rules/ip_rules 2>/dev/null 1>&2
> -
> null:
> @if [ "`$(MAKE) -v 2>&1 | sed -ne 's/GNU.*/GNU/p'`" = "GNU" ] ;
> then \
> echo 'Do not use GNU make (gmake) to compile IPFilter'; \
> --- 356,361 ----
> *** SunOS5/Makefile.orig Wed Apr 28 05:36:32 2004
> --- SunOS5/Makefile Wed Jun 23 12:01:29 2004
> ***************
> *** 196,201 ****
> --- 196,208 ----
> $(OBJ)/mlso_rule.o: $(TOP)/mlso_rule.c
> $(CC) -I$(TOP) $(DFLAGS) -c $(TOP)/mlso_rule.c -o $@
>
> + $(TOP)/ip_rules.c: $(OBJ)/ipf.exe $(TOP)/tools/ipfcomp.c
> $(TOP)/rules/ip_rules
> + $(OBJ)/ipf.exe -cc -nf $(TOP)/rules/ip_rules
> + /bin/cp -f ip_rules.c $(TOP)
> +
> + $(TOP)/ip_rules.h: $(TOP)/ip_rules.c
> + /bin/cp -f ip_rules.h $(TOP)
> +
> $(OBJ)/ip_rules.o: $(TOP)/ip_rules.c $(TOP)/ip_rules.h
> $(CC) -I$(TOP) $(DFLAGS) -c $(TOP)/ip_rules.c -o $@
>
>
>
Jesse Reynolds - j.reynolds@unsw.edu.au
Division of Information Services, University of New South Wales
Phone: +61 (0)2 9385 2893 AIM/iChat: jessedreynolds