1 |
slords |
1.1 |
diff -rup pptpd-1.3.4/plugins/Makefile pptpd-1.3.4-install64/plugins/Makefile |
2 |
|
|
--- pptpd-1.3.4/plugins/Makefile 2006-08-02 22:02:01.000000000 -0400 |
3 |
|
|
+++ pptpd-1.3.4-install64/plugins/Makefile 2011-04-07 14:31:08.982796855 -0400 |
4 |
|
|
@@ -3,7 +3,7 @@ COPTS = -O2 -g |
5 |
|
|
CFLAGS = $(COPTS) -I.. -I../../include -fPIC |
6 |
|
|
LDFLAGS = -shared |
7 |
|
|
LDADD = -lutil |
8 |
|
|
-INSTALL = install -o root |
9 |
|
|
+INSTALL = install -c |
10 |
|
|
prefix = /usr/local |
11 |
|
|
|
12 |
|
|
PLUGINS = pptpd-logwtmp.so |
13 |
|
|
@@ -18,7 +18,7 @@ all: $(PLUGINS) |
14 |
|
|
%.so: %.c |
15 |
|
|
$(CC) -o $@ $(LDFLAGS) $(CFLAGS) $^ $(LDADD) |
16 |
|
|
|
17 |
|
|
-LIBDIR ?= $(DESTDIR)$(prefix)/lib/pptpd |
18 |
|
|
+LIBDIR = $(DESTDIR)/usr/lib64/pptpd |
19 |
|
|
|
20 |
|
|
install: $(PLUGINS) |
21 |
|
|
$(INSTALL) -d $(LIBDIR) |
22 |
|
|
diff -rup pptpd-1.3.4/pptpctrl.c pptpd-1.3.4-install64/pptpctrl.c |
23 |
|
|
--- pptpd-1.3.4/pptpctrl.c 2006-12-07 19:01:40.000000000 -0500 |
24 |
|
|
+++ pptpd-1.3.4-install64/pptpctrl.c 2011-04-07 14:31:29.845856353 -0400 |
25 |
|
|
@@ -773,7 +773,7 @@ static void launch_pppd(char **pppaddrs, |
26 |
|
|
|
27 |
|
|
if (pptp_logwtmp) { |
28 |
|
|
pppd_argv[an++] = "plugin"; |
29 |
|
|
- pppd_argv[an++] = "/usr/lib/pptpd/pptpd-logwtmp.so"; |
30 |
|
|
+ pppd_argv[an++] = "/usr/lib64/pptpd/pptpd-logwtmp.so"; |
31 |
|
|
pppd_argv[an++] = "pptpd-original-ip"; |
32 |
|
|
pppd_argv[an++] = inet_ntoa(inetaddrs[1]); |
33 |
|
|
} |