first regressions found while runtime testing

- fix add_rconf and quoting
- update gpsd to latest upstream
- do not use size parameter for cfgfs and tmpfs
- disable some dangerous busybox options
- fix some kernel module dependencies

3 files changed, 14 insertions, 42 deletions

diff --git a/package/gpsd/Makefile b/package/gpsd/Makefile
index 42d75ee63..506943809 100644
--- a/package/gpsd/Makefile
+++ b/package/gpsd/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		gpsd
-PKG_VERSION:=		2.37
+PKG_VERSION:=		2.39
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		6c96cc0b2df0279cb7baac1ebc5881d3
+PKG_MD5SUM:=		3db437196a6840c252fca99b6c19d4d0
 PKG_DESCR:=		An interface daemon for GPS receivers
 PKG_SECTION:=		net
 PKG_DEPENDS:=		libpthread
@@ -19,12 +19,16 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,GPSD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,GPSD_CLIENTS,gpsd-clients,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_1},${PKG_SECTION}))
 
-CONFIGURE_STYLE=	gnu
+CONFIGURE_STYLE:=	gnu
+CONFIGURE_ENV+=		EGREP="grep -E" \
+			CPP="$(TARGET_CC) -E" \
+			ac_cv_func_strlcpy=no \
+			ac_cv_func_strlcat=no
+# --disable-python breaks configure script
 CONFIGURE_ARGS+=	--without-x \
-			--disable-python
+			--disable-dbus
 BUILD_STYLE=		auto
 INSTALL_STYLE=		auto
-XAKE_FLAGS=		CXXLINK="\$$(LINK)"
 
 ifeq ($(ADK_TARGET_LIB_UCLIBCXX),y)
 TCXXFLAGS+=		-fno-builtin -fno-rtti -nostdinc++
@@ -33,11 +37,15 @@ else
 TLDFLAGS+=		-shared
 endif
 
+post-extract:
+	@find ${WRKBUILD} -name *.rej -delete
+
 post-install:
 	${INSTALL_DIR} ${IDIR_GPSD}/usr/lib ${IDIR_GPSD}/usr/sbin
 	${CP} ${WRKINST}/usr/lib/libgps.so.* ${IDIR_GPSD}/usr/lib
 	${CP} ${WRKINST}/usr/sbin/gpsd ${IDIR_GPSD}/usr/sbin
 	${INSTALL_DIR} ${IDIR_GPSD_CLIENTS}/usr/bin
-	${CP} ${WRKINST}/usr/bin/{cgps,cgpxlogger} ${IDIR_GPSD_CLIENTS}/
+	${CP} ${WRKINST}/usr/bin/{cgps,gpxlogger} \
+		${IDIR_GPSD_CLIENTS}/usr/bin
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/gpsd/patches/patch-gpsd_h b/package/gpsd/patches/patch-gpsd_h
deleted file mode 100644
index 50c8db101..000000000
--- a/package/gpsd/patches/patch-gpsd_h
+++ /dev/null
@@ -1,24 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- gpsd-2.37.orig/gpsd.h	2008-02-17 18:47:00.000000000 +0100
-+++ gpsd-2.37/gpsd.h	2008-10-09 14:08:46.000000000 +0200
-@@ -22,16 +22,16 @@
- /* #undef DBUS_ENABLE */
- #define EARTHMATE_ENABLE 1
- #define EVERMORE_ENABLE 1
--/* #undef FV18_ENABLE */
-+#define FV18_ENABLE 1
- /* #undef GARMINTXT_ENABLE */
- #define GARMIN_ENABLE 1
- #define GPSCLOCK_ENABLE 1
- #define ITRAX_ENABLE 1
- #define NAVCOM_ENABLE 1
- #define NMEA_ENABLE 1
--/* #undef NTPSHM_ENABLE */
--/* #undef NTRIP_ENABLE */
--/* #undef PPS_ENABLE */
-+#define NTPSHM_ENABLE 1
-+#define NTRIP_ENABLE 1
-+#define PPS_ENABLE 1
- #define RTCM104_ENABLE 1
- #define SIRF_ENABLE 1
- /* #undef SQUELCH_ENABLE */
diff --git a/package/gpsd/patches/patch-sirfflash_c b/package/gpsd/patches/patch-sirfflash_c
deleted file mode 100644
index 3664b374f..000000000
--- a/package/gpsd/patches/patch-sirfflash_c
+++ /dev/null
@@ -1,12 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- gpsd-2.37.orig/sirfflash.c	2007-10-12 15:44:48.000000000 +0200
-+++ gpsd-2.37/sirfflash.c	2008-10-09 14:17:23.000000000 +0200
-@@ -166,7 +166,7 @@ sirfSetProto(int pfd, struct termios *te
- 
- 	sirf[7] = sirf[6] = (unsigned char)proto;
- 	/*@i@*/i = htonl(speed); /* borrow "i" to put speed into proper byte order */
--	/*@i@*/bcopy(&i, sirf+8, 4);
-+	/*@i@*/memcpy(sirf+8, &i, 4);
- 
- 	/* send at whatever baud we're currently using */
- 	(void)sirf_write(pfd, sirf);