Skip to content
Browse files

pptpd:

 * revise makefile and patches


git-svn-id: file:///var/svn/freetz/trunk@11498 149334a1-2f27-0410-a3b9-fc62619ac1e6
  • Loading branch information...
1 parent 0557dca commit 50c70bd7ce0d14f0100277967a021473983c8e97 er13 committed Dec 29, 2013
View
11 make/pptpd/patches/010-respect_CFLAGS.patch
@@ -0,0 +1,11 @@
+--- Makefile.in
++++ Makefile.in
+@@ -104,7 +104,7 @@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+-CFLAGS = -O2 -fno-builtin -Wall -DSBINDIR='"$(sbindir)"'
++CFLAGS = @CFLAGS@ -fno-builtin -Wall -DSBINDIR='"$(sbindir)"'
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CYGPATH_W = @CYGPATH_W@
View
47 make/pptpd/patches/100-no_libintlh.patch
@@ -1,35 +1,18 @@
---- configure.in.orig 2008-02-14 17:01:49.000000000 +0100
-+++ configure.in 2008-02-14 17:04:56.000000000 +0100
-@@ -104,7 +104,6 @@
- AC_CHECK_HEADERS(pty.h)
- AC_CHECK_HEADERS(string.h)
- AC_CHECK_HEADERS(syslog.h)
--AC_CHECK_HEADERS(libintl.h)
- AC_CHECK_HEADERS(libutil.h)
- AC_CHECK_HEADERS(sys/uio.h)
+--- configure
++++ configure
+@@ -5006,6 +5006,7 @@
+ done
-@@ -167,7 +166,6 @@
- AC_CHECK_LIB(socket, accept)
- AC_CHECK_LIB(nsl, gethostbyname)
- AC_CHECK_LIB(util, openpty)
--AC_CHECK_LIB(intl, gettext)
- LIBS="$XYZZY_LIBS"
- if test "$ac_cv_lib_c_accept" = no; then
- if test "$ac_cv_lib_socket_accept" = yes; then
-@@ -196,16 +194,6 @@
- XTRALIBS_CTRL="-lutil"
- fi
+
++if false; then
+ for ac_header in libintl.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+@@ -5144,6 +5145,7 @@
fi
--if test "$ac_cv_header_libintl_h" = yes; then
-- if test "$ac_cv_lib_c_gettext" = no; then
-- if test "$ac_cv_lib_intl_gettext" = yes; then
-- XTRALIBS_MGR = "$XTRALIBS_MGR -lintl"
-- else
-- echo "Have libintl.h but no usable gettext!" 1>&2
-- exit 1
-- fi
-- fi
--fi
- AC_SUBST(XTRALIBS_CTRL)
- AC_SUBST(XTRALIBS_MGR)
+ done
++fi
+
+
+ for ac_header in libutil.h
View
4 make/pptpd/patches/101-gre_reorder.patch
@@ -1,4 +1,4 @@
---- pptpgre.c.orig
+--- pptpgre.c
+++ pptpgre.c
@@ -403,15 +403,20 @@
stats.rx_truncated++;
@@ -9,7 +9,7 @@
+ /* check for out-of-order sequence number
+ * N.B.: some client implementations violate RFC 2637
+ * and start their sequence numbers at 1 instead of 0,
-+ * so we have to introduce a kludge to deal with it.
++ * so we have to introduce a kludge to deal with it.
+ * on wrap we may allow an out of order packet to pass
+ */
+ if (seq == gre.seq_recv + 1 || seq == 1) {
View
8 make/pptpd/patches/102-fix_pppd_version.patch
@@ -1,5 +1,5 @@
---- plugins/Makefile 2006-08-03 04:02:01.000000000 +0200
-+++ plugins/Makefile 2009-08-11 10:08:58.000000000 +0200
+--- plugins/Makefile
++++ plugins/Makefile
@@ -1,6 +1,6 @@
CC = gcc
COPTS = -O2 -g
@@ -8,8 +8,8 @@
LDFLAGS = -shared
LDADD = -lutil
INSTALL = install -o root
---- plugins/pptpd-logwtmp.c 2007-04-16 02:21:02.000000000 +0200
-+++ plugins/pptpd-logwtmp.c 2009-08-11 10:01:40.000000000 +0200
+--- plugins/pptpd-logwtmp.c
++++ plugins/pptpd-logwtmp.c
@@ -12,7 +12,7 @@
#include <unistd.h>
#include <utmp.h>
View
8 make/pptpd/pptpd.mk
@@ -2,13 +2,17 @@ $(call PKG_INIT_BIN,1.3.4)
$(PKG)_SOURCE:=$(pkg)-$($(PKG)_VERSION).tar.gz
$(PKG)_SOURCE_MD5:=b38df9c431041922c997c1148bedf591
$(PKG)_SITE:=@SF/poptop
+
$(PKG)_BINARIES:=bcrelay pptpctrl pptpd
$(PKG)_BINARIES_BUILD_DIR:=$($(PKG)_BINARIES:%=$($(PKG)_DIR)/%)
$(PKG)_BINARIES_TARGET_DIR:=$($(PKG)_BINARIES:%=$($(PKG)_DEST_DIR)/usr/sbin/%)
$(PKG)_DEPENDS_ON := pppd
-$(PKG)_CONFIGURE_PRE_CMDS += autoconf --force ;
+# disable NLS related code
+$(PKG)_AC_VARIABLES := lib_c_gettext lib_intl_gettext header_libintl_h
+$(PKG)_CONFIGURE_PRE_CMDS += $(call PKG_MAKE_AC_VARIABLES_PACKAGE_SPECIFIC,$($(PKG)_AC_VARIABLES))
+$(PKG)_CONFIGURE_ENV += $(foreach variable,$($(PKG)_AC_VARIABLES),$(pkg)_$(variable)=no)
$(PKG)_CONFIGURE_OPTIONS += --enable-bcrelay
@@ -17,8 +21,10 @@ $(PKG_UNPACKED)
$(PKG_CONFIGURED_CONFIGURE)
$($(PKG)_BINARIES_BUILD_DIR): $($(PKG)_DIR)/.configured
+# CC/COPTS overrides are necessary because of the plugins subdir (plain Makefile, not controlled by automake)
$(SUBMAKE) -C $(PPTPD_DIR) \
CC="$(TARGET_CC)" \
+ COPTS="$(TARGET_CFLAGS)" \
PLUGINS_CFLAGS="-I$(FREETZ_BASE_DIR)/$(PPPD_DIR)"
$($(PKG)_BINARIES_TARGET_DIR): $($(PKG)_DEST_DIR)/usr/sbin/%: $($(PKG)_DIR)/%

0 comments on commit 50c70bd

Please sign in to comment.
Something went wrong with that request. Please try again.