From abb0501e2828db50782591ecb0f11beb0c0b6bb3 Mon Sep 17 00:00:00 2001 From: Noah Meyerhans Date: Wed, 3 Feb 2021 08:20:37 -0800 Subject: [PATCH 1/2] iputils: bump to 20200202 Move the tftpd binary from /usr/bin to /usr/sbin per upstream. Signed-off-by: Noah Meyerhans --- net/iputils/Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/net/iputils/Makefile b/net/iputils/Makefile index c2757700a..b702dd61a 100644 --- a/net/iputils/Makefile +++ b/net/iputils/Makefile @@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=iputils -PKG_VERSION:=20200821 +PKG_VERSION:=20210202 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://codeload.github.com/iputils/iputils/tar.gz/s$(PKG_VERSION)? -PKG_HASH:=f265da0d02dd2259efd8c57a9c2e0c8bb3361abb14639fcffb26707be5783a5b -PKG_BUILD_DIR:=$(BUILD_DIR)/iputils-s$(PKG_VERSION) +PKG_SOURCE_URL:=https://codeload.github.com/iputils/iputils/tar.gz/$(PKG_VERSION)? +PKG_HASH:=3f557ecfd2ace873801231d2c1f42de73ced9fbc1ef3a438d847688b5fb0e8ab +PKG_BUILD_DIR:=$(BUILD_DIR)/iputils-$(PKG_VERSION) PKG_MAINTAINER:=Noah Meyerhans PKG_LICENSE:=BSD-3-Clause @@ -141,8 +141,8 @@ define Package/iputils-tftpd/description endef define Package/iputils-tftpd/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin//tftpd $(1)/usr/bin/ + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/tftpd $(1)/usr/sbin/ endef $(eval $(call BuildPackage,iputils-ping)) From 64ed17c88c37ff314752001eaccfab0b3b75defe Mon Sep 17 00:00:00 2001 From: Noah Meyerhans Date: Wed, 3 Feb 2021 08:21:49 -0800 Subject: [PATCH 2/2] iputils: Fix version reporting The iputils build system embeds git tags into the generated binaries for use by commands like ping -V. Since openwrt packaging is done in a different repository from the upstream repo, the tags it finds aren't particularly meaningful, and we get confusing results like those described at https://github.com/openwrt/packages/issues/13920 This change removes the git tag inspection in favor of the static version string that's already known to the upstream build system. Signed-off-by: Noah Meyerhans --- net/iputils/patches/001_version_fix.patch | 24 +++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 net/iputils/patches/001_version_fix.patch diff --git a/net/iputils/patches/001_version_fix.patch b/net/iputils/patches/001_version_fix.patch new file mode 100644 index 000000000..e9237903c --- /dev/null +++ b/net/iputils/patches/001_version_fix.patch @@ -0,0 +1,24 @@ +Description: set a static version string rather than discern it from git +--- a/meson.build ++++ b/meson.build +@@ -17,6 +17,7 @@ add_project_arguments( + + conf = configuration_data() + conf.set_quoted('PACKAGE_NAME', meson.project_name()) ++conf.set('VCS_TAG', meson.project_version()) + conf.set('_GNU_SOURCE', 1, description : 'Enable GNU extensions on systems that have them.') + + build_arping = get_option('BUILD_ARPING') +@@ -207,10 +208,10 @@ foreach h : [ + endif + endforeach + +-git_version_h = vcs_tag( ++git_version_h = configure_file( + input : 'git-version.h.meson', + output : 'git-version.h', +- fallback : meson.project_version() ++ configuration: conf + ) + + config_h = configure_file(