diff options
49 files changed, 134 insertions, 635 deletions
diff --git a/devel/gitlab-runner/Makefile b/devel/gitlab-runner/Makefile index 6902772ab..45c48ddb3 100644 --- a/devel/gitlab-runner/Makefile +++ b/devel/gitlab-runner/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gitlab-runner -PKG_VERSION:=13.5.0 +PKG_VERSION:=13.9.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://gitlab.com/gitlab-org/gitlab-runner/-/archive/v$(PKG_VERSION) -PKG_HASH:=765c1556ed9dd4c1b36f9946224c62f068b171e2c1581eeb8f71055327d8a274 +PKG_HASH:=35e128eba8cae5269ba5e17d8a5610b39493cc030f110a2a331bbe642c878191 PKG_MAINTAINER:=Jan Pavlinec <jan.pavlinec@nic.cz> PKG_LICENSE:=MIT @@ -33,9 +33,7 @@ define Package/gitlab-runner CATEGORY:=Development TITLE:=Runner for CI/CD URL:=https://docs.gitlab.com/runner - DEPENDS:= \ - $(GO_ARCH_DEPENDS) \ - @!(mips||mipsel) # Disabled because of docker engine error https://gitlab.com/gitlab-org/gitlab-runner/-/issues/27234 + DEPENDS:=$(GO_ARCH_DEPENDS) endef define Package/gitlab-runner/description diff --git a/devel/gitlab-runner/patches/010-test.patch b/devel/gitlab-runner/patches/010-test.patch new file mode 100644 index 000000000..746cb587c --- /dev/null +++ b/devel/gitlab-runner/patches/010-test.patch @@ -0,0 +1,11 @@ +--- a/common/buildtest/masking.go ++++ b/common/buildtest/masking.go +@@ -39,7 +39,7 @@ func RunBuildWithMasking(t *testing.T, c + + buf.Finish() + +- contents, err := buf.Bytes(0, math.MaxInt64) ++ contents, err := buf.Bytes(0, math.MaxInt32) + assert.NoError(t, err) + + assert.NotContains(t, string(contents), "MASKED_KEY=MASKED_VALUE") diff --git a/lang/python/pyodbc/Makefile b/lang/python/pyodbc/Makefile index 805ccda61..c554015c8 100644 --- a/lang/python/pyodbc/Makefile +++ b/lang/python/pyodbc/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=pyodbc PKG_VERSION:=4.0.30 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PYPI_NAME:=$(PKG_NAME) PKG_HASH:=852b5deeeb3366af8b4408efed993501708be45d221881bce60c9aac54be726a @@ -18,7 +18,6 @@ PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org> PKG_BUILD_DEPENDS:=unixodbc/host include ../pypi.mk -include $(INCLUDE_DIR)/uclibc++.mk include $(INCLUDE_DIR)/package.mk include ../python3-package.mk @@ -28,7 +27,7 @@ define Package/python3-pyodbc SUBMENU:=Python TITLE:=python3-pyodbc URL:=https://github.com/mkleehammer/pyodbc - DEPENDS:=+unixodbc +python3-light $(CXX_DEPENDS) + DEPENDS:=+unixodbc +python3-light +libstdcpp endef define Package/python3-pyodbc/description diff --git a/libs/db47/Makefile b/libs/db47/Makefile index f0367387f..adf3dcf36 100644 --- a/libs/db47/Makefile +++ b/libs/db47/Makefile @@ -6,13 +6,12 @@ # include $(TOPDIR)/rules.mk -include $(INCLUDE_DIR)/uclibc++.mk BASE_VERSION:=4.7.25 PKG_NAME:=db47 PKG_VERSION:=$(BASE_VERSION).4.NC -PKG_RELEASE:=6 +PKG_RELEASE:=7 PKG_BUILD_DIR:=$(BUILD_DIR)/db-$(BASE_VERSION).NC PKG_SOURCE:=db-$(BASE_VERSION).NC.tar.gz @@ -45,7 +44,7 @@ endef define Package/libdb47xx SECTION:=libs CATEGORY:=Libraries - DEPENDS:=+libdb47 $(CXX_DEPENDS) + DEPENDS:=+libdb47 +libstdcpp TITLE:=Berkeley DB library (4.7) for C++ URL:=http://www.oracle.com/us/products/database/berkeley-db PROVIDES:=libdb47xx-full diff --git a/libs/gpgme/Makefile b/libs/gpgme/Makefile index ce3ae484d..74209fe39 100644 --- a/libs/gpgme/Makefile +++ b/libs/gpgme/Makefile @@ -31,7 +31,7 @@ define Package/libgpgmepp CATEGORY:=Libraries TITLE:=GnuPG Made Easy (GPGME) library (C++) URL:=https://gnupg.org/software/gpgme/index.html - DEPENDS:=+libgpgme +libstdcpp $(CXX_DEPENDS) + DEPENDS:=+libgpgme +libstdcpp endef define Package/libgpgme/description diff --git a/libs/ibrcommon/Makefile b/libs/ibrcommon/Makefile index dfa2e5910..43e26252d 100644 --- a/libs/ibrcommon/Makefile +++ b/libs/ibrcommon/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ibrcommon PKG_VERSION:=1.0.1 -PKG_RELEASE:=7 +PKG_RELEASE:=8 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.ibr.cs.tu-bs.de/projects/ibr-dtn/releases @@ -20,13 +20,12 @@ PKG_LICENSE:=Apache-2.0 PKG_INSTALL:=1 PKG_FIXUP:=libtool -include $(INCLUDE_DIR)/uclibc++.mk include $(INCLUDE_DIR)/package.mk define Package/ibrcommon SECTION:=libs CATEGORY:=Libraries - DEPENDS:=$(CXX_DEPENDS) +librt +libnl +libopenssl + DEPENDS:=+libstdcpp +librt +libnl +libopenssl TITLE:=IBR Common C++ Library endef diff --git a/libs/ibrdtn/Makefile b/libs/ibrdtn/Makefile index c4aceba12..d85b2573a 100644 --- a/libs/ibrdtn/Makefile +++ b/libs/ibrdtn/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ibrdtn PKG_VERSION:=1.0.1 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.ibr.cs.tu-bs.de/projects/ibr-dtn/releases @@ -20,7 +20,6 @@ PKG_LICENSE:=Apache-2.0 PKG_INSTALL:=1 PKG_FIXUP:=libtool -include $(INCLUDE_DIR)/uclibc++.mk include $(INCLUDE_DIR)/package.mk define Package/ibrdtn diff --git a/libs/ibrdtn/patches/010-Add-operator-to-Bundle-block_elem.patch b/libs/ibrdtn/patches/010-Add-operator-to-Bundle-block_elem.patch deleted file mode 100644 index 1fcec0b97..000000000 --- a/libs/ibrdtn/patches/010-Add-operator-to-Bundle-block_elem.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 199c86591edc7e82b92903efecadc4f69ea63370 Mon Sep 17 00:00:00 2001 -From: Johannes Morgenroth <jm@m-network.de> -Date: Tue, 1 Jan 2019 11:25:50 +0100 -Subject: [PATCH] Add operator!=() to Bundle::block_elem - -Alternative implementations of libstdcpp as uclibc++ use it in -the algorithm implemenetations. ---- - ibrdtn/data/Bundle.h | 3 +++ - 1 file changed, 3 insertions(+) - ---- a/ibrdtn/data/Bundle.h -+++ b/ibrdtn/data/Bundle.h -@@ -69,6 +69,9 @@ namespace dtn - bool operator==(const dtn::data::block_t &type) const { - return (**this) == type; - } -+ bool operator!=(const dtn::data::block_t &type) const { -+ return !((**this) == type); -+ } - }; - - typedef std::list<block_elem> block_list; diff --git a/libs/ibrdtn/patches/020-Use-const-iterator-in-const-function-of-MemoryBundle.patch b/libs/ibrdtn/patches/020-Use-const-iterator-in-const-function-of-MemoryBundle.patch deleted file mode 100644 index d585f3b75..000000000 --- a/libs/ibrdtn/patches/020-Use-const-iterator-in-const-function-of-MemoryBundle.patch +++ /dev/null @@ -1,20 +0,0 @@ -From 6945698778caf7cdaace9ce8dae82162dbe2ee9f Mon Sep 17 00:00:00 2001 -From: Johannes Morgenroth <jm@m-network.de> -Date: Thu, 3 Jan 2019 07:26:51 +0100 -Subject: [PATCH] Use const iterator in const function of MemoryBundleSet - ---- - ibrdtn/data/MemoryBundleSet.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/ibrdtn/data/MemoryBundleSet.cpp -+++ b/ibrdtn/data/MemoryBundleSet.cpp -@@ -134,7 +134,7 @@ namespace dtn - // the bundles set. This happen if the MemoryBundleSet gets deserialized. - if (!_consistent) return true; - -- bundle_set::iterator iter = _bundles.find(dtn::data::MetaBundle::create(bundle)); -+ bundle_set::const_iterator iter = _bundles.find(dtn::data::MetaBundle::create(bundle)); - return (iter != _bundles.end()); - } - diff --git a/libs/ibrdtn/patches/030-Use-std-streamoff-instead-of-std-streampos.patch b/libs/ibrdtn/patches/030-Use-std-streamoff-instead-of-std-streampos.patch deleted file mode 100644 index 8c9ac77fd..000000000 --- a/libs/ibrdtn/patches/030-Use-std-streamoff-instead-of-std-streampos.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 1395d849d73147319ee422d2ce34de0bcb90e6f8 Mon Sep 17 00:00:00 2001 -From: Johannes Morgenroth <jm@m-network.de> -Date: Thu, 3 Jan 2019 07:34:14 +0100 -Subject: [PATCH] Use std::streamoff instead of std::streampos - ---- - ibrdtn/data/BundleMerger.cpp | 2 +- - ibrdtn/data/Dictionary.cpp | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - ---- a/ibrdtn/data/BundleMerger.cpp -+++ b/ibrdtn/data/BundleMerger.cpp -@@ -119,7 +119,7 @@ namespace dtn - } - - ibrcommon::BLOB::iostream stream = c._blob.iostream(); -- (*stream).seekp(obj.fragmentoffset.get<std::streampos>()); -+ (*stream).seekp(obj.fragmentoffset.get<std::streamoff>()); - - const dtn::data::PayloadBlock &p = obj.find<dtn::data::PayloadBlock>(); - const Length plength = p.getLength(); ---- a/ibrdtn/data/Dictionary.cpp -+++ b/ibrdtn/data/Dictionary.cpp -@@ -154,11 +154,11 @@ namespace dtn - { - char buffer[1024]; - -- _bytestream.seekg(scheme.get<std::streampos>()); -+ _bytestream.seekg(scheme.get<std::streamoff>()); - _bytestream.get(buffer, 1024, '\0'); - std::string scheme_str(buffer); - -- _bytestream.seekg(ssp.get<std::streampos>()); -+ _bytestream.seekg(ssp.get<std::streamoff>()); - _bytestream.get(buffer, 1024, '\0'); - std::string ssp_str(buffer); - diff --git a/libs/ibrdtn/patches/040-Add-operator-to-BundleID-and-MetaBundle.patch b/libs/ibrdtn/patches/040-Add-operator-to-BundleID-and-MetaBundle.patch deleted file mode 100644 index 2f5611111..000000000 --- a/libs/ibrdtn/patches/040-Add-operator-to-BundleID-and-MetaBundle.patch +++ /dev/null @@ -1,49 +0,0 @@ -From a5b9c2feeaabbd90c9734c5d865d471eed0d5e3a Mon Sep 17 00:00:00 2001 -From: Rosen Penev <rosenp@gmail.com> -Date: Thu, 28 Mar 2019 01:55:15 -0700 -Subject: [PATCH] Add operator!=() to BundleID and MetaBundle - -Needed for uClibc++. - -Signed-off-by: Rosen Penev <rosenp@gmail.com> ---- - ibrdtn/data/Bundle.cpp | 10 ++++++++++ - ibrdtn/data/Bundle.h | 2 ++ - 2 files changed, 12 insertions(+) - ---- a/ibrdtn/data/Bundle.cpp -+++ b/ibrdtn/data/Bundle.cpp -@@ -71,11 +71,21 @@ namespace dtn - return other == (const PrimaryBlock&)(*this); - } - -+ bool Bundle::operator!=(const BundleID& other) const -+ { -+ return other != (const PrimaryBlock&)(*this); -+ } -+ - bool Bundle::operator==(const MetaBundle& other) const - { - return other == (const PrimaryBlock&)(*this); - } - -+ bool Bundle::operator!=(const MetaBundle& other) const -+ { -+ return other != (const PrimaryBlock&)(*this); -+ } -+ - bool Bundle::operator!=(const Bundle& other) const - { - return (const PrimaryBlock&)(*this) != (const PrimaryBlock&)other; ---- a/ibrdtn/data/Bundle.h -+++ b/ibrdtn/data/Bundle.h -@@ -97,7 +97,9 @@ namespace dtn - virtual ~Bundle(); - - bool operator==(const BundleID& other) const; -+ bool operator!=(const BundleID& other) const; - bool operator==(const MetaBundle& other) const; -+ bool operator!=(const MetaBundle& other) const; - - bool operator==(const Bundle& other) const; - bool operator!=(const Bundle& other) const; diff --git a/libs/libndpi/Makefile b/libs/libndpi/Makefile index 3e12d45b0..bc4437dfa 100644 --- a/libs/libndpi/Makefile +++ b/libs/libndpi/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libndpi PKG_VERSION:=3.4 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/ntop/nDPI/tar.gz/$(PKG_VERSION)? @@ -25,7 +25,6 @@ PKG_REMOVE_FILES:=autogen.sh PKG_BUILD_DEPENDS:=libpcap PKG_BUILD_PARALLEL:=1 -include $(INCLUDE_DIR)/uclibc++.mk include $(INCLUDE_DIR)/package.mk ifeq ($(CONFIG_LIBNDPI_GCRYPT),) @@ -37,7 +36,7 @@ define Package/libndpi CATEGORY:=Libraries TITLE:=Library for deep-packet inspection URL:=https://github.com/ntop/nDPI - DEPENDS:=$(CXX_DEPENDS) +LIBNDPI_GCRYPT:libgcrypt +libpcap +libjson-c + DEPENDS:=+LIBNDPI_GCRYPT:libgcrypt +libpcap +libjson-c endef define Package/libndpi/description diff --git a/libs/libplist/Makefile b/libs/libplist/Makefile index 73595a77e..d5cbc0e94 100644 --- a/libs/libplist/Makefile +++ b/libs/libplist/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libplist PKG_VERSION:=2.2.0 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://www.libimobiledevice.org/downloads @@ -21,7 +21,6 @@ PKG_CPE_ID:=cpe:/a:libimobiledevice:libplist PKG_INSTALL:=1 PKG_BUILD_PARALLEL:=1 -include $(INCLUDE_DIR)/uclibc++.mk include $(INCLUDE_DIR)/package.mk define Package/libplist/Default @@ -48,21 +47,6 @@ define Package/libplist/description $(call Package/libplist/Default/description) endef -define Package/libplistcxx - $(call Package/libplist/Default) - SECTION:=libs - CATEGORY:=Libraries - DEPENDS:=+libplist $(CXX_DEPENDS) - TITLE+= C++ library - PKG_LICENSE:=LGPL-2.1-or-later - PKG_LICENSE_FILES:=COPYING.LESSER -endef - -define Package/libplistcxx/description - $(call Package/libplist/Default/description) - This package contains the libplist C++ shared library. -endef - define Package/plistutil $(call Package/libplist/Default) SECTION:=utils @@ -83,7 +67,6 @@ CONFIGURE_ARGS += \ --without-cython TARGET_CFLAGS += -flto -TARGET_CXXFLAGS += -std=c++11 -fno-rtti TARGET_LDFLAGS += -Wl,--gc-sections define Build/InstallDev @@ -92,9 +75,7 @@ define Build/InstallDev $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libplist-2.0*.so* $(1)/usr/lib/ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig - $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libplist++-2.0.pc $(1)/usr/lib/pkgconfig/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libplist-2.0.pc $(1)/usr/lib/pkgconfig/ - $(LN) libplist++-2.0.pc $(1)/usr/lib/pkgconfig/libplist++.pc $(LN) libplist-2.0.pc $(1)/usr/lib/pkgconfig/libplist.pc endef @@ -103,16 +84,10 @@ define Package/libplist/install $(CP) $(PKG_INSTALL_DIR)/usr/lib/libplist-2.0.so.* $(1)/usr/lib/ endef -define Package/libplistcxx/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libplist++-2.0.so.* $(1)/usr/lib/ -endef - define Package/plistutil/install $(INSTALL_DIR) $(1)/usr/bin $(CP) $(PKG_INSTALL_DIR)/usr/bin/plistutil $(1)/usr/bin/ endef $(eval $(call BuildPackage,libplist)) -$(eval $(call BuildPackage,libplistcxx)) $(eval $(call BuildPackage,plistutil)) diff --git a/libs/libv4l/Makefile b/libs/libv4l/Makefile index 4f11a0152..181fe529c 100644 --- a/libs/libv4l/Makefile +++ b/libs/libv4l/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=v4l-utils PKG_VERSION:=1.20.0 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://www.linuxtv.org/downloads/v4l-utils @@ -22,7 +22,6 @@ PKG_BUILD_PARALLEL:=1 PKG_BUILD_DEPENDS:=!USE_GLIBC:argp-standalone -include $(INCLUDE_DIR)/uclibc++.mk include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/nls.mk @@ -65,7 +64,7 @@ define Package/v4l-utils SECTION:=utils CATEGORY:=Utilities TITLE+= utilities - DEPENDS:= +libv4l $(CXX_DEPENDS) $(ICONV_DEPENDS) $(INTL_DEPENDS) + DEPENDS:= +libv4l +libstdcpp $(ICONV_DEPENDS) $(INTL_DEPENDS) LICENSE:=GPL-2.0-or-later LICENSE_FILES:=COPYING endef diff --git a/libs/minizip/Makefile b/libs/minizip/Makefile index 431e0cb13..9a2107939 100644 --- a/libs/minizip/Makefile +++ b/libs/minizip/Makefile @@ -6,13 +6,13 @@ include $(TOPDIR)/rules.mk -PKG_NAME:=minizip -PKG_VERSION:=2.9.3 -PKG_RELEASE:=3 +PKG_NAME:=minizip-ng +PKG_VERSION:=3.0.0 +PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://codeload.github.com/nmoinvaz/minizip/tar.gz/$(PKG_VERSION)? -PKG_HASH:=f64b2d228a03673a8ec36a53402e2108437226fd9170d49b7f0c0bca94708b93 +PKG_SOURCE_URL:=https://codeload.github.com/zlib-ng/minizip-ng/tar.gz/$(PKG_VERSION)? +PKG_HASH:=13b4afd96fbf2456f441a32dc9f5d3c983a5ece9e6a3903fc9322c8ad5518546 PKG_MAINTAINER:=David Woodhouse <dwmw2@infradead.org> PKG_LICENSE:=Zlib @@ -24,11 +24,17 @@ include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/cmake.mk CMAKE_OPTIONS += \ + -DCMAKE_POSITION_INDEPENDENT_CODE=ON \ -DINSTALL_INC_DIR=/usr/include/minizip \ -DBUILD_SHARED_LIBS=ON \ -DMZ_BZIP2=OFF \ - -DMZ_LIBBSD=OFF - + -DMZ_COMPAT=OFF \ + -DMZ_ICONV=OFF \ + -DMZ_LIBBSD=OFF \ + -DMZ_LZMA=OFF \ + -DMZ_OPENSSL=OFF \ + -DMZ_PKCRYPT=OFF \ + -DMZ_ZSTD=OFF define Package/minizip TITLE:=Fork of the popular zip manipulation library found in the zlib distribution diff --git a/libs/minizip/patches/010-disable-libbsd.patch b/libs/minizip/patches/010-disable-libbsd.patch deleted file mode 100644 index 85858c698..000000000 --- a/libs/minizip/patches/010-disable-libbsd.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 3d94e052f987bc35452592acf9f6fcb0d4ee4db4 Mon Sep 17 00:00:00 2001 -From: David Woodhouse <dwmw2@infradead.org> -Date: Wed, 10 Jun 2020 11:39:17 +0100 -Subject: [PATCH] Allow libbsd to be explicitly disabled - -When building for a minimal environment like OpenWRT we want to avoid the -dependency on libbsd even if it did happen to be built and available in -the buildroot at the time minizip is compiled. - -https://github.com/openwrt/packages/issues/12471 ---- - CMakeLists.txt | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -17,6 +17,7 @@ option(MZ_PKCRYPT "Enables PKWARE tradit - option(MZ_WZAES "Enables WinZIP AES encryption" ON) - option(MZ_LIBCOMP "Enables Apple compression" OFF) - option(MZ_OPENSSL "Enables OpenSSL for encryption" OFF) -+option(MZ_LIBBSD "Enable libbsd random functionality" ON) - option(MZ_BRG "Enables Brian Gladman's encryption library" OFF) - option(MZ_SIGNING "Enables zip signing support" ON) - option(MZ_COMPRESS_ONLY "Only support compression" OFF) -@@ -298,7 +299,7 @@ if(UNIX) - endif() - endif() - -- if(NOT HAVE_ARC4RANDOM_BUF) -+ if(MZ_LIBBSD AND NOT HAVE_ARC4RANDOM_BUF) - find_package(PkgConfig REQUIRED) - - pkg_check_modules(LIBBSD libbsd) -@@ -311,6 +312,8 @@ if(UNIX) - list(APPEND MINIZIP_INC ${LIBBSD_INCLUDE_DIRS}) - link_directories(${LIBBSD_LIBRARY_DIRS}) - endif() -+ else() -+ set(MZ_LIBBSD FALSE) - endif() - endif() - endif() -@@ -943,6 +946,7 @@ add_feature_info(MZ_PKCRYPT MZ_PKCRYPT " - add_feature_info(MZ_WZAES MZ_WZAES "Enables WinZIP AES encryption") - add_feature_info(MZ_LIBCOMP MZ_LIBCOMP "Enables Apple compression") - add_feature_info(MZ_OPENSSL MZ_OPENSSL "Enables OpenSSL for encryption") -+add_feature_info(MZ_LIBBSD MZ_LIBBSD "Build with libbsd for random functionality") - add_feature_info(MZ_BRG MZ_BRG "Enables Brian Gladman's encryption library") - add_feature_info(MZ_SIGNING MZ_SIGNING "Enables zip signing support") - add_feature_info(MZ_COMPRESS_ONLY MZ_COMPRESS_ONLY "Only support compression") diff --git a/libs/tiff/Makefile b/libs/tiff/Makefile index 837fa5470..95c45d471 100644 --- a/libs/tiff/Makefile +++ b/libs/tiff/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=tiff PKG_VERSION:=4.2.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://download.osgeo.org/libtiff @@ -21,9 +21,7 @@ PKG_LICENSE_FILES:=COPYRIGHT PKG_CPE_ID:=cpe:/a:libtiff:libtiff PKG_BUILD_PARALLEL:=1 -PKG_CONFIG_DEPENDS:=CONFIG_PACKAGE_libtiffxx -include $(INCLUDE_DIR)/uclibc++.mk include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/cmake.mk @@ -41,15 +39,6 @@ $(call Package/tiff/Default) ABI_VERSION:=5 endef -define Package/libtiffxx -$(call Package/tiff/Default) - SECTION:=libs - CATEGORY:=Libraries - TITLE+= library(c++ bindings) - DEPENDS:=+libtiff $(CXX_DEPENDS) - ABI_VERSION:=5 -endef - define Package/tiff-utils $(call Package/tiff/Default) SECTION:=utils @@ -77,7 +66,7 @@ CMAKE_OPTIONS += \ -Dzstd=OFF \ -Dwebp=OFF \ -Djpeg12=OFF \ - -Dcxx=O$(if $(CONFIG_PACKAGE_libtiffxx),N,FF) + -Dcxx=OFF TARGET_CFLAGS += $(TARGET_CPPFLAGS) @@ -92,16 +81,10 @@ define Package/libtiff/install $(CP) $(PKG_INSTALL_DIR)/usr/lib/libtiff.so.$(ABI_VERSION)* $(1)/usr/lib endef -define Package/libtiffxx/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libtiffxx.so.$(ABI_VERSION)* $(1)/usr/lib/ -endef - define Package/tiff-utils/install $(INSTALL_DIR) $(1)/usr/bin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/ endef $(eval $(call BuildPackage,libtiff)) -$(eval $(call BuildPackage,libtiffxx)) $(eval $(call BuildPackage,tiff-utils)) diff --git a/libs/vips/Makefile b/libs/vips/Makefile index da6401db7..e13a9b503 100644 --- a/libs/vips/Makefile +++ b/libs/vips/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=vips PKG_VERSION:=8.10.5 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/libvips/libvips/releases/download/v$(PKG_VERSION) @@ -22,7 +22,6 @@ PKG_FIXUP:=autoreconf PKG_BUILD_PARALLEL:=1 PKG_INSTALL:=1 -include $(INCLUDE_DIR)/uclibc++.mk include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/nls.mk @@ -32,7 +31,7 @@ define Package/vips CATEGORY:=Multimedia TITLE:=An image manipulation library URL:=https://libvips.github.io/libvips/ - DEPENDS:=+glib2 +libexif +libexpat +libjpeg +libpng +giflib +libxml2 $(CXX_DEPENDS) $(INTL_DEPENDS) + DEPENDS:=+glib2 +libexif +libexpat +libjpeg +libpng +giflib +libxml2 +libstdcpp $(INTL_DEPENDS) endef CONFIGURE_ARGS += \ diff --git a/multimedia/v4l2rtspserver/Makefile b/multimedia/v4l2rtspserver/Makefile index 7f4e515f2..13fd1ad5a 100644 --- a/multimedia/v4l2rtspserver/Makefile +++ b/multimedia/v4l2rtspserver/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=v4l2rtspserver PKG_VERSION:=0.2.1 -PKG_RELEASE:=1 +PKG_RELEASE:=2 #cannot use codeload as this uses submodules PKG_SOURCE_PROTO:=git @@ -27,7 +27,6 @@ PKG_LICENSE_FILES:=LICENSE PKG_BUILD_PARALLEL:=1 CMAKE_INSTALL:=1 -include $(INCLUDE_DIR)/uclibc++.mk include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/cmake.mk @@ -35,7 +34,7 @@ define Package/v4l2rtspserver SECTION:=multimedia CATEGORY:=Multimedia TITLE:=v4l2rtspserver - DEPENDS:=$(CXX_DEPENDS) + DEPENDS:=+libstdcpp URL:=https://github.com/mpromonet/v4l2rtspserver endef diff --git a/net/aircrack-ng/Makefile b/net/aircrack-ng/Makefile index d0d7bd9cb..c27b42038 100644 --- a/net/aircrack-ng/Makefile +++ b/net/aircrack-ng/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=aircrack-ng PKG_VERSION:=1.6 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_LICENSE:=GPL-2.0-or-later PKG_LICENSE_FILES:=LICENSE PKG_CPE_ID:=cpe:/a:aircrack-ng:aircrack-ng @@ -34,13 +34,12 @@ PKG_CONFIG_DEPENDS:= \ CONFIG_AIRCRACK_NG_HWLOC \ CONFIG_AIRCRACK_NG_SQLITE3 -include $(INCLUDE_DIR)/uclibc++.mk include $(INCLUDE_DIR)/package.mk define Package/aircrack-ng SECTION:=net CATEGORY:=Network - DEPENDS:=+AIRCRACK_NG_HWLOC:libhwloc +libpcap +libpcre +libpthread $(CXX_DEPENDS) + DEPENDS:=+AIRCRACK_NG_HWLOC:libhwloc +libpcap +libpcre +libpthread +libstdcpp DEPENDS += +AIRCRACK_NG_OPENSSL:libopenssl DEPENDS += +AIRCRACK_NG_GCRYPT:libgcrypt DEPENDS += +AIRCRACK_NG_SQLITE3:libsqlite3 diff --git a/net/dcwapd/Makefile b/net/dcwapd/Makefile index 6608af6c6..0599e5a60 100644 --- a/net/dcwapd/Makefile +++ b/net/dcwapd/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dcwapd PKG_VERSION:=1.1.0 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/ewsi/$(PKG_NAME)/tar.gz/v$(PKG_VERSION)? @@ -23,7 +23,6 @@ PKG_FIXUP:=autoreconf PKG_INSTALL:=1 PKG_BUILD_PARALLEL:=1 -include $(INCLUDE_DIR)/uclibc++.mk include $(INCLUDE_DIR)/package.mk define Package/dcwapd @@ -32,7 +31,7 @@ define Package/dcwapd SUBMENU:=Routing and Redirection TITLE:=Dual-Channel WiFi AP daemon URL:=https://www.edgewaterwireless.com - DEPENDS:=$(CXX_DEPENDS) +kmod-macremapper +libdcwsocket +libdcwproto +mrmctl +libuci + DEPENDS:=+libstdcpp +kmod-macremapper +libdcwsocket +libdcwproto +mrmctl +libuci endef define Package/dcwapd/description diff --git a/net/ibrdtn-tools/Makefile b/net/ibrdtn-tools/Makefile index 6112c993d..f717f277a 100644 --- a/net/ibrdtn-tools/Makefile +++ b/net/ibrdtn-tools/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ibrdtn-tools PKG_VERSION:=1.0.1 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.ibr.cs.tu-bs.de/projects/ibr-dtn/releases @@ -19,7 +19,6 @@ PKG_LICENSE:=Apache-2.0 PKG_INSTALL:=1 -include $(INCLUDE_DIR)/uclibc++.mk include $(INCLUDE_DIR)/package.mk define Package/ibrdtn-tools diff --git a/net/ibrdtnd/Makefile b/net/ibrdtnd/Makefile index cfc82d777..c23bc325c 100644 --- a/net/ibrdtnd/Makefile +++ b/net/ibrdtnd/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ibrdtnd PKG_VERSION:=1.0.1 -PKG_RELEASE:=5 +PKG_RELEASE:=6 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.ibr.cs.tu-bs.de/projects/ibr-dtn/releases @@ -21,7 +21,6 @@ PKG_LICENSE:=Apache-2.0 PKG_FIXUP:=autoreconf PKG_INSTALL:=1 -include $(INCLUDE_DIR)/uclibc++.mk include $(INCLUDE_DIR)/package.mk define Package/ibrdtnd diff --git a/net/ibrdtnd/patches/010-no-const.patch b/net/ibrdtnd/patches/010-no-const.patch deleted file mode 100644 index a6c80db52..000000000 --- a/net/ibrdtnd/patches/010-no-const.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- a/src/routing/SchedulingBundleIndex.cpp -+++ b/src/routing/SchedulingBundleIndex.cpp -@@ -28,7 +28,7 @@ namespace dtn - void SchedulingBundleIndex::remove(const dtn::data::BundleID &id) - { - ibrcommon::MutexLock l(_index_mutex); -- for (priority_index::const_iterator iter = _priority_index.begin(); iter != _priority_index.end(); ++iter) -+ for (priority_index::iterator iter = _priority_index.begin(); iter != _priority_index.end(); ++iter) - { - const dtn::data::MetaBundle &b = (*iter); - if (id == (const dtn::data::BundleID&)b) { ---- a/src/storage/MemoryBundleStorage.cpp -+++ b/src/storage/MemoryBundleStorage.cpp -@@ -217,7 +217,7 @@ namespace dtn - ibrcommon::MutexLock l(_bundleslock); - - // search for the bundle in the bundle list -- const bundle_list::const_iterator iter = find(_bundles.begin(), _bundles.end(), id); -+ const bundle_list::iterator iter = find(_bundles.begin(), _bundles.end(), id); - - // if no bundle was found throw an exception - if (iter == _bundles.end()) throw NoBundleFoundException(); ---- a/src/storage/MetaStorage.cpp -+++ b/src/storage/MetaStorage.cpp -@@ -66,7 +66,7 @@ namespace dtn - { - std::set<dtn::data::EID> ret; - -- for (dtn::data::BundleList::const_iterator iter = begin(); iter != end(); ++iter) -+ for (const_iterator iter = begin(); iter != end(); ++iter) - { - const dtn::data::MetaBundle &bundle = (*iter); - diff --git a/net/iperf/Makefile b/net/iperf/Makefile index d739b063c..575787596 100644 --- a/net/iperf/Makefile +++ b/net/iperf/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=iperf PKG_VERSION:=2.0.13 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_HASH:=c88adec966096a81136dda91b4bd19c27aae06df4d45a7f547a8e50d723778ad @@ -22,13 +22,12 @@ PKG_BUILD_PARALLEL:=1 PKG_CONFIG_DEPENDS:=CONFIG_IPERF_ENABLE_MULTICAST -include $(INCLUDE_DIR)/uclibc++.mk include $(INCLUDE_DIR)/package.mk define Package/iperf SECTION:=net CATEGORY:=Network - DEPENDS:= $(CXX_DEPENDS) +libpthread + DEPENDS:= +libstdcpp +libpthread TITLE:=Internet Protocol bandwidth measuring tool URL:=http://sourceforge.net/projects/iperf2/ endef @@ -45,20 +44,13 @@ define Package/iperf/config bool "Enable multicast support" endef +CONFIGURE_ARGS += \ + $(call autoconf_bool,CONFIG_IPERF_ENABLE_MULTICAST,multicast) \ + $(call autoconf_bool,CONFIG_IPV6,ipv6) -TARGET_CFLAGS += -D_GNU_SOURCE -ifeq ($(CONFIG_IPERF_ENABLE_MULTICAST),y) -CONFIGURE_ARGS += --enable-multicast -else -CONFIGURE_ARGS += --disable-multicast -endif - -ifeq ($(CONFIG_IPV6),) - CONFIGURE_ARGS += --disable-ipv6 -endif - -CONFIGURE_VARS += CXXFLAGS="$$$$CXXFLAGS -fno-rtti" -CONFIGURE_VARS += LIBS="-lpthread -lm" +TARGET_CFLAGS += -flto +TARGET_CXXFLAGS += -fno-rtti -static-libstdc++ -flto -std=c++11 +TARGET_LDFLAGS += $(if $(CONFIG_USE_GLIBC),-lpthread -lm) define Package/iperf/install $(INSTALL_DIR) $(1)/usr/bin diff --git a/net/iperf/patches/020-math.patch b/net/iperf/patches/020-math.patch new file mode 100644 index 000000000..da255c204 --- /dev/null +++ b/net/iperf/patches/020-math.patch @@ -0,0 +1,24 @@ +--- a/src/pdfs.c ++++ b/src/pdfs.c +@@ -80,7 +80,7 @@ float box_muller(void) { + fprintf(stderr, "pdf box_muller() rand() error\n"); + return 0; + } else { +- w = sqrt( (-2.0 * log( w ) ) / w ); ++ w = sqrt( (-2.0 * logf( w ) ) / w ); + y1 = x1 * w; + y2 = x2 * w; + } +@@ -93,8 +93,8 @@ float normal(float mean, float variance) + } + + float lognormal(float mu, float sigma) { +- float phi = sqrt((mu * mu) + (sigma * sigma)); +- float mu_prime = log(((mu * mu)/phi)); +- float sigma_prime = sqrt(log((phi * phi)/(mu * mu))); +- return (exp(normal(mu_prime,sigma_prime))); ++ float phi = sqrtf((mu * mu) + (sigma * sigma)); ++ float mu_prime = logf(((mu * mu)/phi)); ++ float sigma_prime = sqrtf(logf((phi * phi)/(mu * mu))); ++ return (expf(normal(mu_prime,sigma_prime))); + } diff --git a/net/kismet/Makefile b/net/kismet/Makefile index 4a0e624a7..c42838a73 100644 --- a/net/kismet/Makefile +++ b/net/kismet/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=kismet PKG_VERSION:=2016-07-R1 -PKG_RELEASE:=5 +PKG_RELEASE:=6 PKG_LICENSE:=LGPLv2.1 PKG_CPE_ID:=cpe:/a:kismet:kismet @@ -18,7 +18,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=http://www.kismetwireless.net/code PKG_HASH:=bdb21f153311f1ff3b16621bf0d6740f66369bf0982b0a289c9a12af8847e237 -include $(INCLUDE_DIR)/uclibc++.mk include $(INCLUDE_DIR)/package.mk define Package/kismet/Default @@ -26,7 +25,7 @@ define Package/kismet/Default CATEGORY:=Network TITLE:=Kismet MAINTAINER:=Jean-Michel lacroix <lacroix@lepine-lacroix.info> - DEPENDS:= $(CXX_DEPENDS) +libnl + DEPENDS:= +libstdcpp +libnl @BROKEN URL:=http://www.kismetwireless.net/ SUBMENU:=Wireless endef diff --git a/net/lftp/Makefile b/net/lftp/Makefile index e0ed047df..b785c92c3 100644 --- a/net/lftp/Makefile +++ b/net/lftp/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=lftp PKG_VERSION:=4.9.2 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://lftp.tech/ftp/ \ @@ -24,14 +24,13 @@ PKG_CPE_ID:=cpe:/a:lftp_project:lftp PKG_INSTALL:=1 PKG_BUILD_PARALLEL:=1 -include $(INCLUDE_DIR)/uclibc++.mk include $(INCLUDE_DIR)/package.mk define Package/lftp SUBMENU:=File Transfer SECTION:=net CATEGORY:=Network - DEPENDS:=+libncurses +libopenssl +libreadline $(CXX_DEPENDS) +libexpat +zlib + DEPENDS:=+libncurses +libopenssl +libreadline +libstdcpp +libexpat +zlib TITLE:=a sophisticated file transfer program with command line interface. URL:=https://lftp.yar.ru/ endef diff --git a/net/linknx/Makefile b/net/linknx/Makefile index 801dd0c7c..8ad017c59 100644 --- a/net/linknx/Makefile +++ b/net/linknx/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=linknx PKG_VERSION:=0.0.1.38 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-${PKG_VERSION}.tar.gz PKG_SOURCE_URL:=https://codeload.github.com/linknx/linknx/tar.gz/$(PKG_VERSION)? @@ -22,7 +22,6 @@ PKG_LICENSE_FILES:=LICENSE PKG_BUILD_DEPENDS:=USE_UCLIBC:argp-standalone USE_MUSL:argp-standalone PKG_FIXUP:=autoreconf -include $(INCLUDE_DIR)/uclibc++.mk include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/nls.mk @@ -31,7 +30,7 @@ define Package/linknx CATEGORY:=Network TITLE:=KNX home automation platform URL:=https://github.com/linknx/linknx - DEPENDS:=+pthsem +lua +luac +libcurl +libesmtp $(CXX_DEPENDS) $(ICONV_DEPENDS) + DEPENDS:=+pthsem +lua +luac +libcurl +libesmtp +libstdcpp $(ICONV_DEPENDS) endef CONFIGURE_ARGS+= \ diff --git a/net/vncrepeater/Makefile b/net/vncrepeater/Makefile index e53c54ee9..3e232bc10 100644 --- a/net/vncrepeater/Makefile +++ b/net/vncrepeater/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=vncrepeater PKG_VERSION:=0.14 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_MAINTAINER:=Jirka Spicak <robutek@gmail.com> PKG_LICENSE:=GPL-2.0 @@ -20,13 +20,12 @@ PKG_HASH:=79178e9baa9cac05f26e43f742933958707cb5c0632c51a5706b13922f3bb5b0 PKG_BUILD_PARALLEL:=1 -include $(INCLUDE_DIR)/uclibc++.mk include $(INCLUDE_DIR)/package.mk define Package/vncrepeater SECTION:=net CATEGORY:=Network - DEPENDS:=$(CXX_DEPENDS) + DEPENDS:=+libstdcpp TITLE:=UltraVNC repeater for Linux URL:=http://www.uvnc.com/addons/repeater.html endef diff --git a/sound/espeak/Makefile b/sound/espeak/Makefile index a5c2fc621..778647e5b 100644 --- a/sound/espeak/Makefile +++ b/sound/espeak/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=espeak PKG_VERSION:=1.48.04 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-source.zip PKG_SOURCE_URL:=@SF/espeak @@ -21,13 +21,12 @@ PKG_LICENSE_FILES:=License.txt PKG_INSTALL:=1 PKG_BUILD_PARALLEL:=1 -include $(INCLUDE_DIR)/uclibc++.mk include $(INCLUDE_DIR)/package.mk define Package/espeak SECTION:=sound CATEGORY:=Sound - DEPENDS:=$(CXX_DEPENDS) +portaudio + DEPENDS:=+libstdcpp +portaudio TITLE:=Speech synthesizer URL:=http://espeak.sourceforge.net/ endef diff --git a/utils/dosfstools/Makefile b/utils/dosfstools/Makefile index 38c304112..1c88345bb 100644 --- a/utils/dosfstools/Makefile +++ b/utils/dosfstools/Makefile @@ -8,15 +8,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dosfstools -PKG_VERSION:=4.1 -PKG_RELEASE:=4 +PKG_VERSION:=4.2 +PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://github.com/dosfstools/dosfstools/releases/download/v$(PKG_VERSION)/ \ http://fossies.org/linux/misc -PKG_HASH:=e6b2aca70ccc3fe3687365009dd94a2e18e82b688ed4e260e04b7412471cc173 -PKG_MAINTAINER:=Álvaro Fernández Rojas <noltari@gmail.com> +PKG_HASH:=ba7c716ff9b8208a3bba5094a77584a7dc814141de09ab4ce1ae9b84bbcd7844 +PKG_MAINTAINER:=Álvaro Fernández Rojas <noltari@gmail.com> PKG_LICENSE:=GPL-3.0-or-later PKG_LICENSE_FILES:=COPYING PKG_CPE_ID:=cpe:/a:dosfstools_project:dosfstools diff --git a/utils/dosfstools/patches/010-iconv.patch b/utils/dosfstools/patches/010-iconv.patch deleted file mode 100644 index f594285d3..000000000 --- a/utils/dosfstools/patches/010-iconv.patch +++ /dev/null @@ -1,24 +0,0 @@ -From e18bcc65d5772e518c6496b439bad8a986f7e434 Mon Sep 17 00:00:00 2001 -From: Rosen Penev <rosenp@gmail.com> -Date: Thu, 20 Jun 2019 15:18:19 -0700 -Subject: [PATCH] configure: Fix iconv check for cross compilation - -AC_CHECK_LIB is more friendly towards cross-compilation. - -Added check for libiconv_open as that can be used when the libc lacks iconv. ---- - configure.ac | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - ---- a/configure.ac -+++ b/configure.ac -@@ -59,7 +59,8 @@ if test "x$with_udev" != "xno"; then - [true]) - fi - --AC_SEARCH_LIBS(iconv_open, iconv) -+AC_CHECK_LIB(iconv, iconv_open) -+AC_CHECK_LIB(iconv, libiconv_open) - - # xxd (distributed with vim) is used in the testsuite - AC_CHECK_PROG([XXD_FOUND], [xxd], [yes]) diff --git a/utils/gddrescue/Makefile b/utils/gddrescue/Makefile index c5de5ebb7..7260aacef 100644 --- a/utils/gddrescue/Makefile +++ b/utils/gddrescue/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gddrescue PKG_VERSION:=1.23 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.xz PKG_SOURCE_URL:=http://http.debian.net/debian/pool/main/g/$(PKG_NAME) @@ -19,7 +19,6 @@ PKG_LICENSE_FILES:=LICENSE PKG_INSTALL:=1 PKG_BUILD_PARALLEL:=1 -include $(INCLUDE_DIR)/uclibc++.mk include $(INCLUDE_DIR)/package.mk define Package/gddrescue @@ -27,7 +26,7 @@ define Package/gddrescue CATEGORY:=Utilities TITLE:=Data recovery tool URL:=https://www.gnu.org/software/ddrescue/ - DEPENDS:=$(CXX_DEPENDS) + DEPENDS:=+libstdcpp endef define Package/gddrescue/description diff --git a/utils/hashdeep/Makefile b/utils/hashdeep/Makefile index f697e08e2..673d389c0 100644 --- a/utils/hashdeep/Makefile +++ b/utils/hashdeep/Makefile @@ -2,19 +2,20 @@ include $(TOPDIR)/rules.mk PKG_NAME:=hashdeep PKG_VERSION:=4.4 -PKG_RELEASE:=1 -PKG_MAINTAINER=Tobe Deprez <trldp@outlook.com> -PKG_LICENSE:=NLPL -PKG_LICENSE_FILES:=COPYING +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/jessek/hashdeep/tar.gz/v$(PKG_VERSION)? PKG_HASH:=ad78d42142f9a74fe8ec0c61bc78d6588a528cbb9aede9440f50b6ff477f3a7f +PKG_MAINTAINER:=Tobe Deprez <trldp@outlook.com> +PKG_LICENSE:=NLPL +PKG_LICENSE_FILES:=COPYING + PKG_FIXUP:=autoreconf PKG_INSTALL:=1 +PKG_BUILD_PARALLEL:=1 -include $(INCLUDE_DIR)/uclibc++.mk include $(INCLUDE_DIR)/package.mk define Package/hashdeep @@ -22,7 +23,7 @@ define Package/hashdeep CATEGORY:=Utilities TITLE:=Recursively compute hashsums or piecewise hashings URL:=http://md5deep.sourceforge.net/ - DEPENDS:=$(CXX_DEPENDS) + DEPENDS:=+libstdcpp endef define Package/hashdeep/description diff --git a/utils/mariadb/Makefile b/utils/mariadb/Makefile index 7230fe43c..03bdd51c3 100644 --- a/utils/mariadb/Makefile +++ b/utils/mariadb/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mariadb -PKG_VERSION:=10.4.17 +PKG_VERSION:=10.4.18 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz @@ -18,7 +18,7 @@ PKG_SOURCE_URL := \ https://ftp.yz.yamagata-u.ac.jp/pub/dbms/mariadb/$(PKG_NAME)-$(PKG_VERSION)/source \ https://downloads.mariadb.org/interstitial/$(PKG_NAME)-$(PKG_VERSION)/source -PKG_HASH:=a7b104e264311cd46524ae546ff0c5107978373e4a01cf7fd8a241454548d16e +PKG_HASH:=330d9e8273002fc92f0f3f3f9b08157a3cab1265a0f114adeb6235e4283a0d3e PKG_MAINTAINER:=Michal Hrusecky <Michal@Hrusecky.net> PKG_LICENSE:=GPL-2.0 PKG_LICENSE_FILES:=COPYING THIRDPARTY @@ -33,8 +33,6 @@ HOST_BUILD_DEPENDS:=libxml2/host # Without libevent2 tests/async_queries sporadically fails on the bots PKG_BUILD_DEPENDS:=libevent2 mariadb/host -CMAKE_INSTALL:=1 - CONF_DIR:=/etc/mysql PLUGIN_DIR:=/usr/lib/mariadb/plugin SHARE_DIR:=/usr/share/mariadb @@ -178,8 +176,7 @@ MARIADB_COMMON_DEPENDS := \ +libatomic \ +libopenssl \ +libstdcpp \ - +zlib \ - @!USE_UCLIBC + +zlib # Pass CPPFLAGS in the CFLAGS as otherwise the build system will # ignore them. @@ -478,11 +475,6 @@ define Build/Prepare $(foreach p,$(MARIADB_DISABLE_PLUGINS),$(call Package/mariadb/disable/plugin,$(PKG_BUILD_DIR),$(p));) endef -# Define Build/InstallDev, otherwise build system starts installing files into -# staging area, which would interfere with mariadb-connector-c. -define Build/InstallDev -endef - define Package/mariadb-client/install $(INSTALL_DIR) $(1)/usr/bin $(foreach b,$(MARIADB_CLIENT),$(call Package/mariadb/install/bin,$(1),$(b));) diff --git a/utils/powertop/Makefile b/utils/powertop/Makefile index 68953d493..dd02385ca 100644 --- a/utils/powertop/Makefile +++ b/utils/powertop/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=powertop PKG_VERSION:=2.10 -PKG_RELEASE:=4 +PKG_RELEASE:=5 PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://01.org/sites/default/files/downloads/ @@ -22,14 +22,13 @@ PKG_LICENSE:=GPL-2.0 PKG_BUILD_PARALLEL:=1 PKG_INSTALL:=1 -include $(INCLUDE_DIR)/uclibc++.mk include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/nls.mk define Package/powertop SECTION:=utils CATEGORY:=Utilities - DEPENDS:=$(CXX_DEPENDS) $(INTL_DEPENDS) +libpci +libncursesw +libnl-genl + DEPENDS:=$(INTL_DEPENDS) +libstdcpp +libpci +libncursesw +libnl-genl TITLE:=Power consumption monitor URL:=https://01.org/powertop endef diff --git a/utils/qemu/Makefile b/utils/qemu/Makefile index a706993d0..81d225cab 100644 --- a/utils/qemu/Makefile +++ b/utils/qemu/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=qemu PKG_VERSION:=5.0.0 -PKG_RELEASE:=4 +PKG_RELEASE:=5 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_HASH:=2f13a92a0fa5c8b69ff0796b59b86b080bbb92ebad5d301a7724dd06b5e78cb6 PKG_SOURCE_URL:=http://download.qemu.org/ @@ -25,13 +25,12 @@ PKG_USE_MIPS16:=0 PKG_BUILD_DEPENDS+=spice-protocol -include $(INCLUDE_DIR)/uclibc++.mk include $(INCLUDE_DIR)/nls.mk include $(INCLUDE_DIR)/package.mk QEMU_DEPS_IN_GUEST := @(TARGET_x86_64||TARGET_armvirt||TARGET_malta) QEMU_DEPS_IN_HOST := @(TARGET_x86_64||TARGET_sunxi) -QEMU_DEPS_IN_HOST += $(CXX_DEPENDS) +QEMU_DEPS_IN_HOST += +libstdcpp QEMU_DEPS_IN_HOST += $(ICONV_DEPENDS) define Package/virtio-console-helper @@ -54,7 +53,7 @@ define Package/qemu-ga SUBMENU:=Virtualization TITLE:=QEMU Guest Agent URL:=http://www.qemu.org - DEPENDS:= +glib2 +virtio-console-helper $(CXX_DEPENDS) $(QEMU_DEPS_IN_GUEST) + DEPENDS:= +glib2 +virtio-console-helper +libstdcpp $(QEMU_DEPS_IN_GUEST) endef define Package/qemu-ga/install diff --git a/utils/readsb/Makefile b/utils/readsb/Makefile index dc46e98cf..e9ed05bde 100644 --- a/utils/readsb/Makefile +++ b/utils/readsb/Makefile @@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=readsb -PKG_VERSION:=3.8.3 -PKG_RELEASE:=2 +PKG_VERSION:=3.9.0 +PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/Mictronics/readsb/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=bf59b8ecd0ff66945b210c55a5b824aa63ff8cbb1704249528d30a4902e716b2 +PKG_HASH:=234e2f5f45d69d8be376272e9a08be54bdc48ed5ad7ebad2c4374bbd754d9426 PKG_LICENSE:=GPL-3.0-or-later PKG_LICENSE_FILES:=COPYING LICENSE @@ -50,7 +50,7 @@ MAKE_FLAGS += \ TARGET_CFLAGS += -ffunction-sections -fdata-sections -flto TARGET_LDFLAGS += \ - $(if $(CONFIG_LIBC_USE_GLIBC),,-largp) \ + $(if $(CONFIG_USE_GLIBC),,-largp) \ -Wl,--gc-sections,--as-needed define Package/readsb/conffiles diff --git a/utils/readsb/patches/001-network-avoid-segfault-in-freeaddrinfo.patch b/utils/readsb/patches/001-network-avoid-segfault-in-freeaddrinfo.patch deleted file mode 100644 index a389475c8..000000000 --- a/utils/readsb/patches/001-network-avoid-segfault-in-freeaddrinfo.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 82014a5fa9930b0875e57869265acf011772277c Mon Sep 17 00:00:00 2001 -From: Stijn Tintel <stijn@linux-ipv6.be> -Date: Sun, 3 May 2020 20:56:58 +0300 -Subject: [PATCH] network: avoid segfault in freeaddrinfo - -Calling freeaddrinfo(NULL) when using musl libc causes a segfault. - -Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be> ---- - anet.c | 15 ++++++++++++--- - net_io.c | 5 ++++- - viewadsb.c | 5 ++++- - 3 files changed, 20 insertions(+), 5 deletions(-) - ---- a/anet.c -+++ b/anet.c -@@ -212,7 +212,10 @@ static int anetTcpGenericConnect(char *e - if (ss) { - memcpy(ss, p->ai_addr, sizeof(*ss)); - } -- freeaddrinfo(gai_result); -+ if (gai_result) { -+ freeaddrinfo(gai_result); -+ gai_result = NULL; -+ } - return s; - } - -@@ -220,7 +223,10 @@ static int anetTcpGenericConnect(char *e - anetCloseSocket(s); - } - -- freeaddrinfo(gai_result); -+ if (gai_result) { -+ freeaddrinfo(gai_result); -+ gai_result = NULL; -+ } - return ANET_ERR; - } - -@@ -368,7 +374,10 @@ int anetTcpServer(char *err, char *servi - fds[i++] = s; - } - -- freeaddrinfo(gai_result); -+ if (gai_result) { -+ freeaddrinfo(gai_result); -+ gai_result = NULL; -+ } - return (i > 0 ? i : ANET_ERR); - } - ---- a/net_io.c -+++ b/net_io.c -@@ -3285,7 +3285,10 @@ void cleanupNetwork(void) { - for (int i = 0; i < Modes.net_connectors_count; i++) { - struct net_connector *con = Modes.net_connectors[i]; - free(con->address); -- freeaddrinfo(con->addr_info); -+ if (con->addr_info) { -+ freeaddrinfo(con->addr_info); -+ con->addr_info = NULL; -+ } - if (con->mutex) { - pthread_mutex_unlock(con->mutex); - pthread_mutex_destroy(con->mutex); ---- a/viewadsb.c -+++ b/viewadsb.c -@@ -308,7 +308,10 @@ int main(int argc, char **argv) { - } - // Free local service and client - if (s) free(s); -- freeaddrinfo(con->addr_info); -+ if (con->addr_info) { -+ freeaddrinfo(con->addr_info); -+ con->addr_info = NULL; -+ } - pthread_mutex_unlock(con->mutex); - pthread_mutex_destroy(con->mutex); - free(con->mutex); diff --git a/utils/readsb/patches/010-gcc10.patch b/utils/readsb/patches/010-gcc10.patch deleted file mode 100644 index ffa7a3754..000000000 --- a/utils/readsb/patches/010-gcc10.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 5119c21ae56f1c7fd0b10250d1beca9634bf74af Mon Sep 17 00:00:00 2001 -From: Mictronics <github@mictronics.de> -Date: Sun, 14 Jun 2020 18:06:22 +0200 -Subject: [PATCH] Clean up linkage of struct Modes. - ---- - readsb.c | 2 ++ - readsb.h | 6 ++++-- - viewadsb.c | 2 ++ - 3 files changed, 8 insertions(+), 2 deletions(-) - ---- a/readsb.c -+++ b/readsb.c -@@ -57,6 +57,8 @@ - - #include <stdarg.h> - -+struct _Modes Modes; -+ - // - // ============================= Program options help ========================== - // ---- a/readsb.h -+++ b/readsb.h -@@ -312,7 +312,7 @@ struct mag_buf - - // Program global state - --struct -+struct _Modes - { // Internal state - pthread_cond_t data_cond; // Conditional variable associated - pthread_t reader_thread; -@@ -412,7 +412,9 @@ struct - struct stats stats_15min; - struct timespec reader_cpu_accumulator; // CPU time used by the reader thread, copied out and reset by the main thread under the mutex - struct mag_buf mag_buffers[MODES_MAG_BUFFERS]; // Converted magnitude buffers from RTL or file input --} Modes; -+}; -+ -+extern struct _Modes Modes; - - // The struct we use to store information about a decoded message. - ---- a/viewadsb.c -+++ b/viewadsb.c -@@ -54,6 +54,8 @@ - #include "readsb.h" - #include "help.h" - -+struct _Modes Modes; -+ - #define _stringize(x) x - #define verstring(x) _stringize(x) - diff --git a/utils/reptyr/Makefile b/utils/reptyr/Makefile index 111bc8063..d5f3402ce 100644 --- a/utils/reptyr/Makefile +++ b/utils/reptyr/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=reptyr PKG_VERSION:=0.8.0 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/nelhage/reptyr/archive/ @@ -23,7 +23,7 @@ define Package/reptyr CATEGORY:=Utilities TITLE:=Tool for reparenting running programs URL:=https://github.com/nelhage/reptyr - DEPENDS:=@!(arc||mips||mipsel) + DEPENDS:=@!(arc||mips||mipsel||mips64) endef define Package/reptyr/description diff --git a/utils/smartmontools/Makefile b/utils/smartmontools/Makefile index bd1b97473..6a5198eb2 100644 --- a/utils/smartmontools/Makefile +++ b/utils/smartmontools/Makefile @@ -6,11 +6,10 @@ # include $(TOPDIR)/rules.mk -include $(INCLUDE_DIR)/uclibc++.mk PKG_NAME:=smartmontools PKG_VERSION:=7.2 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/smartmontools @@ -34,7 +33,7 @@ endef define Package/smartmontools $(call Package/smartmontools/Default) - DEPENDS:=$(CXX_DEPENDS) + DEPENDS:=+libstdcpp TITLE+= Tool endef @@ -47,7 +46,7 @@ endef define Package/smartd $(call Package/smartmontools/Default) - DEPENDS:=$(CXX_DEPENDS) + DEPENDS:=+libstdcpp TITLE+= Daemon endef @@ -79,11 +78,6 @@ define Package/smartd-mail/description A script for mailing about SMART issues endef -ifeq ($(CONFIG_USE_UCLIBCXX),y) -TARGET_LDFLAGS +=-nodefaultlibs -else -CONFIGURE_VARS += with_cxx11_regex=yes -endif TARGET_LDFLAGS += -flto TARGET_CXXFLAGS +=-fno-rtti -flto @@ -97,6 +91,7 @@ CONFIGURE_ARGS += \ #lower file size vs. CONFIGURE_ARGS CONFIGURE_VARS += \ + with_cxx11_regex=yes \ with_smartdplugindir=no \ with_systemdenvfile=no \ with_systemdsystemunitdir=no \ diff --git a/utils/ssdeep/Makefile b/utils/ssdeep/Makefile index f089756c2..9f4a5c075 100644 --- a/utils/ssdeep/Makefile +++ b/utils/ssdeep/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ssdeep PKG_VERSION:=2.14.1 -PKG_RELEASE=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/ssdeep-project/ssdeep/releases/download/release-$(PKG_VERSION)/ @@ -22,7 +22,6 @@ PKG_LICENSE:=GPL-2.0 PKG_LICENSE_FILES:=COPYING PKG_MAINTAINER:=Jan Pavlinec <jan.pavlinec@nic.cz> -include $(INCLUDE_DIR)/uclibc++.mk include $(INCLUDE_DIR)/package.mk define Package/ssdeep @@ -30,7 +29,7 @@ define Package/ssdeep CATEGORY:=Utilities TITLE:=A program to compute and match fuzzy hashes URL:=https://ssdeep-project.github.io/ssdeep - DEPENDS:=$(CXX_DEPENDS) + DEPENDS:=+libstdcpp endef define Package/ssdeep/description diff --git a/utils/tang/Makefile b/utils/tang/Makefile index e159bd482..be0a796a6 100644 --- a/utils/tang/Makefile +++ b/utils/tang/Makefile @@ -8,25 +8,22 @@ include $(TOPDIR)/rules.mk PKG_NAME:=tang -PKG_VERSION:=7 +PKG_VERSION:=8 PKG_RELEASE:=1 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://github.com/latchset/$(PKG_NAME)/releases/download/v$(PKG_VERSION)/ -PKG_HASH:=fbe13e4e3103cd24cada7824b63e510cffd650832ecd075fd49b99475a4f9bfa +PKG_HASH:=03958bf27c24aa9892f6138d287d39bcc149e7ad72163c27b529aa3c6b066ede PKG_MAINTAINER:=Tibor Dudlák <tibor.dudlak@gmail.com> PKG_LICENSE:=GPL-3.0-or-later PKG_LICENSE_FILES:=COPYING -PKG_FIXUP:=autoreconf PKG_INSTALL:=1 -PKG_BUILD_PARALLEL:=1 +PKG_BUILD_DEPENDS:=meson/host include $(INCLUDE_DIR)/package.mk - -# This avoids generating man pages -CONFIGURE_VARS += ac_cv_prog_A2X= +include ../../devel/meson/meson.mk define Package/tang SECTION:=utils @@ -47,7 +44,7 @@ endef define Package/tang/install $(INSTALL_DIR) $(1)/usr/libexec $(INSTALL_DIR) $(1)/etc/xinetd.d/ - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/tangd* $(1)/usr/libexec/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/libexec/tangd* $(1)/usr/libexec/ $(INSTALL_BIN) ./files/tangdw $(1)/usr/libexec/ $(CP) ./files/tangdx $(1)/etc/xinetd.d/ endef diff --git a/utils/tang/patches/010-makefile.patch b/utils/tang/patches/010-makefile.patch deleted file mode 100644 index 94b073847..000000000 --- a/utils/tang/patches/010-makefile.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,4 +1,3 @@ --DISTCHECK_CONFIGURE_FLAGS = --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) - BUILT_SOURCES= - CLEANFILES= - man1_MANS= -@@ -10,13 +9,6 @@ LDADD = @jose_LIBS@ @http_parser_LIBS@ - cachedir = $(localstatedir)/cache/$(PACKAGE_NAME) - jwkdir = $(localstatedir)/db/$(PACKAGE_NAME) - --nodist_systemdsystemunit_DATA = \ -- units/tangd@.service \ -- units/tangd.socket \ -- units/tangd-update.path \ -- units/tangd-update.service \ -- units/tangd-keygen.service -- - dist_libexec_SCRIPTS = src/tangd-update src/tangd-keygen - dist_bin_SCRIPTS = src/tang-show-keys - libexec_PROGRAMS = src/tangd -@@ -52,9 +44,7 @@ src_tangd_SOURCES = src/http.c src/http. - AM_TESTS_ENVIRONMENT = SD_ACTIVATE="@SD_ACTIVATE@" PATH=$(srcdir)/src:$(builddir)/src:$(PATH) - TESTS = tests/adv tests/rec - --CLEANFILES += $(nodist_systemdsystemunit_DATA) - EXTRA_DIST = \ -- $(foreach unit,$(nodist_systemdsystemunit_DATA),$(unit).in) \ - COPYING \ - $(TESTS) \ - $(man_ADOC_FILES) diff --git a/utils/tang/patches/020-no-systemd.patch b/utils/tang/patches/020-no-systemd.patch deleted file mode 100644 index 196941276..000000000 --- a/utils/tang/patches/020-no-systemd.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -27,32 +27,6 @@ AC_CHECK_LIB([http_parser], [http_parser - [AC_MSG_ERROR([http-parser required!])]) - - PKG_CHECK_MODULES([jose], [jose >= 8]) --PKG_CHECK_MODULES([systemd], [systemd]) -- --AC_ARG_WITH([systemdsystemunitdir], -- [AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files])], -- [], -- [with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)]) -- --AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir]) -- --for ac_prog in systemd-socket-activate systemd-activate; do -- AC_CHECK_PROG([SD_ACTIVATE], [$ac_prog], [$as_dir/$ac_prog], [], -- [$PATH$PATH_SEPARATOR$($PKG_CONFIG --variable=systemdutildir systemd)]) -- test -n "$SD_ACTIVATE" && break --done -- --test -n "$SD_ACTIVATE" || AC_MSG_ERROR([systemd-socket-activate required!]) -- --AC_MSG_CHECKING([systemd-socket-activate inetd flag]) --if $SD_ACTIVATE --help | grep -q inetd; then -- SD_ACTIVATE="$SD_ACTIVATE --inetd" -- AC_MSG_RESULT([--inetd]) --else -- AC_MSG_RESULT([(default)]) --fi -- --AC_SUBST(SD_ACTIVATE) - - TANG_CFLAGS="\ - -Wall \ diff --git a/utils/tang/patches/030-readlink.patch b/utils/tang/patches/030-readlink.patch deleted file mode 100644 index 1a3f89738..000000000 --- a/utils/tang/patches/030-readlink.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/src/tangd-update -+++ b/src/tangd-update -@@ -33,8 +33,8 @@ fi - - [ ! -d "$2" ] && mkdir -p -m 0700 "$2" - --src=`realpath "$1"` --dst=`realpath "$2"` -+src=`readlink -f "$1"` -+dst=`readlink -f "$2"` - - payl=() - sign=() diff --git a/utils/unrar/Makefile b/utils/unrar/Makefile index f106b752b..593a3b35f 100644 --- a/utils/unrar/Makefile +++ b/utils/unrar/Makefile @@ -23,12 +23,8 @@ PKG_CPE_ID:=cpe:/a:rarlab:unrar PKG_INSTALL:=1 PKG_BUILD_PARALLEL:=1 -include $(INCLUDE_DIR)/uclibc++.mk include $(INCLUDE_DIR)/package.mk -ifeq ($(CONFIG_USE_UCLIBCXX),y) -TARGET_LDFLAGS +=-nodefaultlibs -endif TARGET_CXXFLAGS +=-fno-rtti -flto TARGET_LDFLAGS +=$(FPIC) -Wl,--gc-sections $(if $(CONFIG_USE_GLIBC),-lpthread) @@ -36,7 +32,7 @@ define Package/unrar/Default TITLE:=UnRAR SUBMENU:=Compression URL:=https://www.rarlab.com/ - DEPENDS:=$(CXX_DEPENDS) +libpthread + DEPENDS:=+libstdcpp +libpthread endef define Package/unrar |