mirror of
https://git.openwrt.org/feed/packages.git
synced 2024-06-26 17:47:55 +02:00
0c10c224be
Automatically compute and substitute current values for all
$(AUTORELEASE) instances as this feature is deprecated and shouldn't be
used.
The following temporary change was made to the core:
diff --git a/rules.mk b/rules.mk
index 57d7995d4fa8..f16367de87a8 100644
--- a/rules.mk
+++ b/rules.mk
@@ -429,7 +429,7 @@ endef
abi_version_str = $(subst -,,$(subst _,,$(subst .,,$(1))))
COMMITCOUNT = $(if $(DUMP),0,$(call commitcount))
-AUTORELEASE = $(if $(DUMP),0,$(call commitcount,1))
+AUTORELEASE = $(if $(DUMP),0,$(shell sed -i "s/\$$(AUTORELEASE)/$(call commitcount,1)/" $(CURDIR)/Makefile))
all:
FORCE: ;
And this command used to fix affected packages:
for i in $(cd feeds/packages; git grep -l PKG_RELEASE:=.*AUTORELEASE | \
sed 's^.*/\([^/]*\)/Makefile^\1^';);
do
make package/$i/download
done
Signed-off-by: Paul Fertser <fercerpav@gmail.com>
101 lines
2.4 KiB
Makefile
101 lines
2.4 KiB
Makefile
#
|
|
# Copyright (C) 2006-2015 OpenWrt.org
|
|
#
|
|
# This is free software, licensed under the GNU General Public License v2.
|
|
# See /LICENSE for more information.
|
|
#
|
|
|
|
include $(TOPDIR)/rules.mk
|
|
|
|
PKG_NAME:=vsftpd
|
|
PKG_VERSION:=3.0.5
|
|
PKG_RELEASE:=1
|
|
|
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
|
PKG_SOURCE_URL:=https://security.appspot.com/downloads/
|
|
PKG_HASH:=26b602ae454b0ba6d99ef44a09b6b9e0dfa7f67228106736df1f278c70bc91d3
|
|
|
|
PKG_MAINTAINER:=Cezary Jackiewicz <cezary@eko.one.pl>
|
|
PKG_LICENSE:=GPLv2
|
|
PKG_CPE_ID:=cpe:/a:beasts:vsftpd
|
|
|
|
include $(INCLUDE_DIR)/package.mk
|
|
|
|
define Package/vsftpd/Default
|
|
SUBMENU:=File Transfer
|
|
SECTION:=net
|
|
CATEGORY:=Network
|
|
TITLE:=Fast and secure FTP server
|
|
URL:=https://security.appspot.com/vsftpd.html
|
|
endef
|
|
|
|
|
|
define Package/vsftpd
|
|
$(call Package/vsftpd/Default)
|
|
VARIANT:=notls
|
|
TITLE+= (no TLS)
|
|
endef
|
|
|
|
define Package/vsftpd-tls
|
|
$(call Package/vsftpd/Default)
|
|
VARIANT:=tls
|
|
TITLE+= (TLS)
|
|
DEPENDS+=+libopenssl
|
|
endef
|
|
|
|
define Package/vsftpd/conffiles
|
|
/etc/vsftpd.conf
|
|
/etc/vsftpd
|
|
endef
|
|
|
|
Package/vsftpd-tls/conffiles=$(Package/vsftpd/conffiles)
|
|
|
|
ifneq ($(CONFIG_USE_MUSL),)
|
|
NLSSTRING:=-lcrypt
|
|
else ifneq ($(CONFIG_USE_GLIBC),)
|
|
NLSSTRING:=-lcrypt
|
|
else
|
|
NLSSTRING:=-lcrypt -lnsl
|
|
endif
|
|
|
|
TARGET_CFLAGS += -D_GNU_SOURCE -include fcntl.h
|
|
|
|
ifeq ($(BUILD_VARIANT),notls)
|
|
define Build/Compile
|
|
$(SED) 's/-lcrypt -lnsl/$(NLSSTRING)/' $(PKG_BUILD_DIR)/Makefile
|
|
$(MAKE) -C $(PKG_BUILD_DIR) \
|
|
CC="$(TARGET_CC)" \
|
|
CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \
|
|
LDFLAGS="$(TARGET_LDFLAGS)" \
|
|
vsftpd
|
|
endef
|
|
endif
|
|
|
|
ifeq ($(BUILD_VARIANT),tls)
|
|
define Build/Compile
|
|
$(SED) 's/#undef VSF_BUILD_SSL/#define VSF_BUILD_SSL/' $(PKG_BUILD_DIR)/builddefs.h
|
|
$(SED) 's/-lcrypt -lnsl/-lcrypt -lnsl -lssl -lcrypto/' $(PKG_BUILD_DIR)/Makefile
|
|
$(SED) 's/-lcrypt -lnsl/$(NLSSTRING)/' $(PKG_BUILD_DIR)/Makefile
|
|
$(MAKE) -C $(PKG_BUILD_DIR) \
|
|
CC="$(TARGET_CC)" \
|
|
CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \
|
|
LDFLAGS="$(TARGET_LDFLAGS)" \
|
|
vsftpd
|
|
endef
|
|
endif
|
|
|
|
define Package/vsftpd/install
|
|
$(INSTALL_DIR) $(1)/usr/sbin
|
|
$(INSTALL_BIN) $(PKG_BUILD_DIR)/$(PKG_NAME) $(1)/usr/sbin/
|
|
$(INSTALL_DIR) $(1)/etc
|
|
$(INSTALL_CONF) ./files/$(PKG_NAME).conf $(1)/etc/$(PKG_NAME).conf
|
|
$(INSTALL_DIR) $(1)/etc/init.d
|
|
$(INSTALL_BIN) ./files/$(PKG_NAME).init $(1)/etc/init.d/$(PKG_NAME)
|
|
$(INSTALL_DIR) $(1)/etc/vsftpd
|
|
endef
|
|
|
|
Package/vsftpd-tls/install=$(Package/vsftpd/install)
|
|
|
|
$(eval $(call BuildPackage,vsftpd))
|
|
$(eval $(call BuildPackage,vsftpd-tls))
|