diff options
| author | Hannu Nyman <hannu.nyman@iki.fi> | 2017-06-08 21:50:21 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-08 21:50:21 +0300 |
| commit | bed8fc190bf00dc6377ebd42955f46f3444f5883 (patch) | |
| tree | 35bfc894a9ad793015f4df9705edcfa6d4a4bb5c /net | |
| parent | 3b08b8a738fd9ab6b32ac384e52b0ee482e9c994 (diff) | |
| parent | d03e302afec11c228cbcce0b02dbb362366496e5 (diff) | |
Merge pull request #4458 from fededim/master
Bugfix #1327
Diffstat (limited to 'net')
| -rw-r--r-- | net/davfs2/Makefile | 13 | ||||
| -rw-r--r-- | net/davfs2/patches/300-have_iconv_h.patch | 40 |
2 files changed, 47 insertions, 6 deletions
diff --git a/net/davfs2/Makefile b/net/davfs2/Makefile index 4e1f09277..a04f625a0 100644 --- a/net/davfs2/Makefile +++ b/net/davfs2/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=davfs2 PKG_VERSION:=1.5.4 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://download.savannah.gnu.org/releases/davfs2/ @@ -18,12 +18,13 @@ PKG_MD5SUM:=c9f0b557275b7ec88fec751bf22f30cf PKG_FIXUP:=gettext-version autoreconf include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/nls.mk define Package/davfs2 SECTION:=net CATEGORY:=Network SUBMENU:=Filesystem - DEPENDS=+libneon +kmod-fuse +libfuse + DEPENDS=+libneon +kmod-fuse +libfuse $(ICONV_DEPENDS) $(INTL_DEPENDS) TITLE:=Mount a WebDAV resource as a regular file system. URL:=http://savannah.nongnu.org/projects/davfs2/ MAINTAINER:=Federico Di Marco <fededim@gmail.com> @@ -50,14 +51,14 @@ define Package/davfs2/conffiles /etc/davfs2/davfs2.conf endef -TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include +TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include # $(ICONV_CFLAGS) $(INTL_CFLAGS) -TARGET_CPPFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE +TARGET_CPPFLAGS += -D_GNU_SOURCE # $(ICONV_CPFLAGS) $(INTL_CPPFLAGS) CONFIGURE_VARS += \ - LDFLAGS="$(TARGET_LDFLAGS) -L$(TOOLCHAIN_DIR)/usr/lib -L$(TOOLCHAIN_DIR)/lib" + LDFLAGS="$(TARGET_LDFLAGS) -L$(TOOLCHAIN_DIR)/usr/lib -L$(TOOLCHAIN_DIR)/lib $(if $(INTL_FULL),-lintl) $(if $(ICONV_FULL),-liconv)" #$(INTL_LDFLAGS) $(ICONV_LDFLAGS) -CONFIGURE_ARGS += --with-neon="$(STAGING_DIR)/usr" +CONFIGURE_ARGS += --with-neon="$(STAGING_DIR)/usr" --enable-largefile #--with-libintl-prefix=$(INTL_PREFIX) --with-libiconv-prefix=$(ICONV_PREFIX) define Package/davfs2/install $(INSTALL_DIR) $(1)/usr/sbin diff --git a/net/davfs2/patches/300-have_iconv_h.patch b/net/davfs2/patches/300-have_iconv_h.patch new file mode 100644 index 000000000..c126b5aac --- /dev/null +++ b/net/davfs2/patches/300-have_iconv_h.patch @@ -0,0 +1,40 @@ +diff --git a/src/webdav.c b/src/webdav.c +index 1ff7c7f..74cd957 100644 +--- a/src/webdav.c ++++ b/src/webdav.c +@@ -25,7 +25,7 @@ + #ifdef HAVE_FCNTL_H + #include <fcntl.h> + #endif +-#ifdef HAVE_ICONV_H ++#ifdef HAVE_ICONV + #include <iconv.h> + #endif + #ifdef HAVE_LANGINFO_H +@@ -231,7 +231,7 @@ static int initialized; + Needed by ssl_verify() which may be called at any time. */ + static int have_terminal; + +-#ifdef HAVE_ICONV_H ++#ifdef HAVE_ICONV + /* Handle to convert character encoding from utf-8 to LC_CTYPE. + If NULL no conversion is done. */ + static iconv_t from_utf_8; +@@ -264,7 +264,7 @@ static char **cookie_list; + /* Private function prototypes and inline functions */ + /*==================================================*/ + +-#ifdef HAVE_ICONV_H ++#ifdef HAVE_ICONV + static void + convert(char **s, iconv_t conv); + #endif +@@ -337,7 +337,7 @@ dav_init_webdav(const dav_args *args) + if (args->neon_debug & ~NE_DBG_HTTPPLAIN) + syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "Initializing webdav"); + +-#ifdef HAVE_ICONV_H ++#ifdef HAVE_ICONV + char *lc_charset = nl_langinfo(CODESET); + if (lc_charset && strcasecmp(lc_charset, "UTF-8") != 0) { + from_utf_8 = iconv_open(lc_charset, "UTF-8"); |