mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-12-27 04:12:29 +01:00
70 lines
2.3 KiB
Diff
70 lines
2.3 KiB
Diff
--- pptpd-1.3.4/Makefile.am
|
|
+++ pptpd-1.3.4-orig/Makefile.am
|
|
@@ -11,7 +11,8 @@
|
|
## warning with -Wmissing-prototypes).
|
|
## -Wmissing-prototypes removed (eg, Linux 2.2.6 headers
|
|
## aren't up to it).
|
|
-CFLAGS = -O2 -fno-builtin -Wall -DSBINDIR='"$(sbindir)"'
|
|
+OPTFLAGS=-O2
|
|
+CFLAGS = $(OPTFLAGS) -fno-builtin -Wall -DSBINDIR='"$(sbindir)"'
|
|
#CFLAGS = -O2 -fno-builtin -Wall -ansi -DSBINDIR='"$(sbindir)"'
|
|
#CFLAGS = -O2 -fno-builtin -Wall -ansi -pedantic -Wmissing-prototypes -Werror -DSBINDIR='"$(sbindir)"'
|
|
|
|
--- pptpd-1.3.4/bcrelay.c
|
|
+++ pptpd-1.3.4-orig/bcrelay.c
|
|
@@ -381,12 +381,12 @@
|
|
return 1;
|
|
}
|
|
}
|
|
- if (ifin == "") {
|
|
+ if (!strlen(ifin)) {
|
|
syslog(LOG_INFO,"Incoming interface required!");
|
|
showusage(argv[0]);
|
|
_exit(1);
|
|
}
|
|
- if (ifout == "" && ipsec == "") {
|
|
+ if (!strlen(ifout) && !strlen(ipsec)) {
|
|
syslog(LOG_INFO,"Listen-mode or outgoing or IPsec interface required!");
|
|
showusage(argv[0]);
|
|
_exit(1);
|
|
@@ -870,7 +870,7 @@
|
|
// IPSEC tunnels are a fun one. We must change the destination address
|
|
// so that it will be routed to the correct tunnel end point.
|
|
// We can define several tunnel end points for the same ipsec interface.
|
|
- } else if (ipsec != "" && strncmp(ifs.ifc_req[i].ifr_name, "ipsec", 5) == 0) {
|
|
+ } else if (strlen(ipsec) && strncmp(ifs.ifc_req[i].ifr_name, "ipsec", 5) == 0) {
|
|
if (strncmp(ifs.ifc_req[i].ifr_name, ipsec, 6) == 0) {
|
|
struct hostent *hp = gethostbyname(ipsec+7);
|
|
ioctl(s, SIOCGIFINDEX, &ifs.ifc_req[i]);
|
|
--- pptpd-1.3.4/plugins/Makefile
|
|
+++ pptpd-1.3.4-orig/plugins/Makefile
|
|
@@ -3,7 +3,7 @@
|
|
CFLAGS = $(COPTS) -I.. -I../../include -fPIC
|
|
LDFLAGS = -shared
|
|
LDADD = -lutil
|
|
-INSTALL = install -o root
|
|
+INSTALL = install
|
|
prefix = /usr/local
|
|
|
|
PLUGINS = pptpd-logwtmp.so
|
|
@@ -18,7 +18,7 @@
|
|
%.so: %.c
|
|
$(CC) -o $@ $(LDFLAGS) $(CFLAGS) $^ $(LDADD)
|
|
|
|
-LIBDIR ?= $(DESTDIR)$(prefix)/lib/pptpd
|
|
+LIBDIR = $(DESTDIR)$(prefix)/lib/pptpd
|
|
|
|
install: $(PLUGINS)
|
|
$(INSTALL) -d $(LIBDIR)
|
|
--- pptpd-1.3.4/plugins/pptpd-logwtmp.c
|
|
+++ pptpd-1.3.4-orig/plugins/pptpd-logwtmp.c
|
|
@@ -12,7 +12,7 @@
|
|
#include <unistd.h>
|
|
#include <utmp.h>
|
|
#include <string.h>
|
|
-#include "pppd.h"
|
|
+#include <pppd/pppd.h>
|
|
|
|
char pppd_version[] = VERSION;
|
|
|