Attachment #16018 for bug #4459

View | Details | Raw Unified | Return to bug 4459
Collapse All | Expand All

Lines 2-7 Link Here

(-)cipe-1.5.4.orig/cipe.texinfo (+3 lines)
2	@c %**start of header	2	@c %**start of header
3	@setfilename cipe.info	3	@setfilename cipe.info
4	@settitle CIPE Manual	4	@settitle CIPE Manual
		5	@direntry
		6	* cipe: (cipe)cipe. CIPE - encrypted IP over UDP tunneling
		7	@end direntry
5	@footnotestyle end	8	@footnotestyle end
6	@paragraphindent asis	9	@paragraphindent asis
7	@iftex	10	@iftex

Lines 9-15 Link Here

(-)cipe-1.5.4.orig/conf/Makefile-obj.in (-5 / +6 lines)
9		9
10	# $Id: Makefile-obj.in,v 1.14 2000/12/16 18:27:35 olaf Exp $	10	# $Id: Makefile-obj.in,v 1.14 2000/12/16 18:27:35 olaf Exp $
11		11
12	BINDIR:=/usr/local/sbin	12	DESTDIR:=
		13
		14	BINDIR:=/usr/sbin
13	MODDIR:=/lib/modules/@KVERS@/misc	15	MODDIR:=/lib/modules/@KVERS@/misc
14		16
15	MAKE= @MAKE@	17	MAKE= @MAKE@
Lines 41-50 Link Here
41	all:: $(MODULE) $(CIPED)	43	all:: $(MODULE) $(CIPED)
42		44
43	install:: all	45	install:: all
44	-mkdir -p $(MODDIR) $(BINDIR)	46	-mkdir -p $(DESTDIR)$(MODDIR) $(DESTDIR)$(BINDIR)
45	install -m 644 $(MODULE) $(MODDIR)	47	install -m 644 $(MODULE) $(DESTDIR)$(MODDIR)
46	install -m 755 $(CIPED) $(BINDIR)	48	install -m 755 $(CIPED) $(DESTDIR)$(BINDIR)
47	-depmod -a
48		49
49	KOBJS:= module.o device.o sock.o output.o encaps.o $(CCOBJS)	50	KOBJS:= module.o device.o sock.o output.o encaps.o $(CCOBJS)
50	OBJS:= ciped.o options.o ioctl.o	51	OBJS:= ciped.o options.o ioctl.o

Lines 9-15 Link Here

(-)cipe-1.5.4.orig/conf/Makefile-top.in (-3 / +5 lines)
9		9
10	# $Id: Makefile-top.in,v 1.17.2.2 2002/05/30 11:49:18 olaf Exp $	10	# $Id: Makefile-top.in,v 1.17.2.2 2002/05/30 11:49:18 olaf Exp $
11		11
12	INFODIR:=/usr/local/info	12	DESTDIR:=
		13
		14	INFODIR:=/usr/share/info
13		15
14	SRC:= cipe	16	SRC:= cipe
15	VERSION:=@VERSION@	17	VERSION:=@VERSION@
Lines 97-104 Link Here
97	(cd $(SRC); tar czf ../bf.tgz $(BF) bf.checksums)	99	(cd $(SRC); tar czf ../bf.tgz $(BF) bf.checksums)
98		100
99	install:: cipe.info	101	install:: cipe.info
100	-mkdir -p $(INFODIR)	102	-mkdir -p $(DESTDIR)$(INFODIR)
101	install -m 644 cipe.info $(INFODIR)	103	install -m 644 cipe.info $(DESTDIR)$(INFODIR)
102		104
103	TAGS:	105	TAGS:
104	etags .[hc] /*.[hc]	106	etags .[hc] /*.[hc]





lib:=../lib

DESTDIR :=

WARN	:= -Wno-strict-prototypes
CC	:= @CC@
CFLAGS	:= @CFLAGS@ $(WARN)

	$(MAKE) -C $(lib) libcipe.a

install: all
	-mkdir -p $(DESTDIR)$(bindir) $(DESTDIR)$(sbindir)
	$(INSTALL) -m 755 rsa-keygen $(DESTDIR)$(bindir)
	$(INSTALL) -m 755 pkcipe $(DESTDIR)$(sbindir)
	[ -d $(DESTDIR)/etc/cipe/pk ] || mkdir -p $(DESTDIR)/etc/cipe/pk
	[ -d $(DESTDIR)/var/run/cipe ] || mkdir -p $(DESTDIR)/var/run/cipe
	chmod 700 $(DESTDIR)/etc/cipe $(DESTDIR)/etc/cipe/pk $(DESTDIR)/var/run/cipe
	@if [ ! -f /etc/cipe/identity.priv ] ; then \
		echo "*** Generating new identity (host) key ***" ;\
		rsa-keygen /etc/cipe/identity ;\
	fi

clean:
	rm -f *.[oaisd] *.out core pkcipe

Lines 16-21 Link Here

(-)cipe-1.5.4.orig/samples/ip-down (+6 lines)
16	# remove the daemon PID file	16	# remove the daemon PID file
17	rm -f /var/run/cipe/$6.pid /var/run/cipe/$1.pid	17	rm -f /var/run/cipe/$6.pid /var/run/cipe/$1.pid
18		18
		19	# Gentoo ebuild addition.
		20	if [ "${PIDFILE}" != "" ]; then
		21	rm -f ${PIDFILE}
		22	fi
		23	# Gentoo ebuild addition ends.
		24
19	# If the system runs gated, tell it what has happened	25	# If the system runs gated, tell it what has happened
20	#gdc interface	26	#gdc interface
21		27

Lines 35-40 Link Here

(-)cipe-1.5.4.orig/samples/ip-up (+8 lines)
35	# Create/update PID file. Note: PKCIPE needs this.	35	# Create/update PID file. Note: PKCIPE needs this.
36	echo "$3 $1" >/var/run/cipe/${6:-$1}.pid	36	echo "$3 $1" >/var/run/cipe/${6:-$1}.pid
37		37
		38	# Gentoo ebuild addition. Store the pid in the file
		39	# specified by the start script, so that the stop script
		40	# knows who to kill
		41	if [ "${PIDFILE}" != "" ]; then
		42	echo "$3" >> ${PIDFILE}
		43	fi
		44	# Gentoo ebuild addition ends.
		45
38	# Trigger the key exchange procedure, useful when we're using SOCKS	46	# Trigger the key exchange procedure, useful when we're using SOCKS
39	# This _must_ run delayed and in the background	47	# This _must_ run delayed and in the background
40	#(sleep 10; ping -c5 $5) &	48	#(sleep 10; ping -c5 $5) &

Return to bug 4459

Lines 11-16 Link Here

(-)cipe-1.5.4.orig/pkcipe/Makefile.in (-10 / +8 lines)
11		11
12	lib:=../lib	12	lib:=../lib
13		13
		14	DESTDIR :=
		15
14	WARN := -Wno-strict-prototypes	16	WARN := -Wno-strict-prototypes
15	CC := @CC@	17	CC := @CC@
16	CFLAGS := @CFLAGS@ $(WARN)	18	CFLAGS := @CFLAGS@ $(WARN)
Lines 37-52 Link Here
37	$(MAKE) -C $(lib) libcipe.a	39	$(MAKE) -C $(lib) libcipe.a
38		40
39	install: all	41	install: all
40	-mkdir -p $(bindir) $(sbindir)	42	-mkdir -p $(DESTDIR)$(bindir) $(DESTDIR)$(sbindir)
41	$(INSTALL) -m 755 rsa-keygen $(bindir)	43	$(INSTALL) -m 755 rsa-keygen $(DESTDIR)$(bindir)
42	$(INSTALL) -m 755 pkcipe $(sbindir)	44	$(INSTALL) -m 755 pkcipe $(DESTDIR)$(sbindir)
43	[ -d /etc/cipe/pk ] \|\| mkdir -p /etc/cipe/pk	45	[ -d $(DESTDIR)/etc/cipe/pk ] \|\| mkdir -p $(DESTDIR)/etc/cipe/pk
44	[ -d /var/run/cipe ] \|\| mkdir -p /var/run/cipe	46	[ -d $(DESTDIR)/var/run/cipe ] \|\| mkdir -p $(DESTDIR)/var/run/cipe
45	chmod 700 /etc/cipe /etc/cipe/pk /var/run/cipe	47	chmod 700 $(DESTDIR)/etc/cipe $(DESTDIR)/etc/cipe/pk $(DESTDIR)/var/run/cipe
46	@if [ ! -f /etc/cipe/identity.priv ] ; then \
47	echo "* Generating new identity (host) key *" ;\
48	rsa-keygen /etc/cipe/identity ;\
49	fi
50		48
51	clean:	49	clean:
52	rm -f .[oaisd] .out core pkcipe	50	rm -f .[oaisd] .out core pkcipe