Merge pull request #2593 from fededim/master

lftp: updated to 4.7.1, davfs2: updated to 1.5.3 and reintroduced support for libssp
This commit is contained in:
Hannu Nyman 2016-04-13 13:10:50 +03:00
commit 854f6ffcb3
3 changed files with 6 additions and 18 deletions

View file

@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=davfs2 PKG_NAME:=davfs2
PKG_VERSION:=1.5.2 PKG_VERSION:=1.5.3
PKG_RELEASE:=3 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://download.savannah.gnu.org/releases/davfs2/ PKG_SOURCE_URL:=http://download.savannah.gnu.org/releases/davfs2/
PKG_MD5SUM:=376bc9346454135cba78afacbcb23f86 PKG_MD5SUM:=ecff993c7972bd92e23c138b71f042b1
PKG_FIXUP:=gettext-version autoreconf PKG_FIXUP:=gettext-version autoreconf

View file

@ -1,16 +1,3 @@
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -32,8 +32,8 @@ mount_davfs_SOURCES = cache.c dav_coda.c
kernel_interface.h mount_davfs.h webdav.h
umount_davfs_SOURCES = umount_davfs.c defaults.h
-AM_CFLAGS = -Wall -Werror=format-security \
- -fstack-protector --param=ssp-buffer-size=4
+AM_CFLAGS = -Wall -Werror=format-security
+# -fstack-protector --param=ssp-buffer-size=4 -- removed ssp not supported in openwrt
DEFS = -DPROGRAM_NAME=\"mount.davfs\" \
-DDAV_SYS_CONF_DIR=\"$(pkgsysconfdir)\" \
-DDAV_LOCALSTATE_DIR=\"$(dav_localstatedir)\" \
--- a/src/cache.c --- a/src/cache.c
+++ b/src/cache.c +++ b/src/cache.c
@@ -58,7 +58,7 @@ @@ -58,7 +58,7 @@

View file

@ -8,14 +8,14 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=lftp PKG_NAME:=lftp
PKG_VERSION:=4.6.2 PKG_VERSION:=4.7.1
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=http://lftp.yar.ru/ftp \ PKG_SOURCE_URL:=http://lftp.yar.ru/ftp \
http://lftp.yar.ru/ftp/old \ http://lftp.yar.ru/ftp/old \
http://lftp.cybermirror.org \ http://lftp.cybermirror.org \
http://lftp.cybermirror.org/old http://lftp.cybermirror.org/old
PKG_MD5SUM:=487c064ee1bd732e5f95928e530435a8 PKG_MD5SUM:=7dfb03c6544efeef633bc28ba7df8b77
@ -61,6 +61,7 @@ CONFIGURE_ARGS += \
--without-libidn \ --without-libidn \
--without-libresolv \ --without-libresolv \
--with-openssl="$(STAGING_DIR)/usr" \ --with-openssl="$(STAGING_DIR)/usr" \
--with-zlib="$(STAGING_DIR)/usr" \
--disable-static --disable-static
#CONFIGURE_VARS += \ #CONFIGURE_VARS += \