Merge pull request #17391 from clayface/logrotate
authorAlexandru Ardelean <ardeleanalex@gmail.com>
Mon, 20 Dec 2021 09:33:07 +0000 (11:33 +0200)
committerGitHub <noreply@github.com>
Mon, 20 Dec 2021 09:33:07 +0000 (11:33 +0200)
logrotate: add logrotate.d to conffiles definition

36 files changed:
lang/python/python3-libselinux/Makefile
lang/python/python3-networkx/Makefile
libs/alsa-lib/Makefile
libs/alsa-ucm-conf/Makefile
libs/freetype/Makefile
libs/jose/Makefile
libs/jsoncpp/Makefile
libs/libtorrent-rasterbar/Makefile
libs/libtorrent-rasterbar/patches/010-boost.patch [deleted file]
mail/alpine/Makefile
net/atftp/Makefile
net/atftp/patches/01-missing-u_char-type-patch.patch [deleted file]
net/atftp/patches/02-fix-invalid-read-in-tftp_send_request.patch [deleted file]
net/davfs2/Makefile
net/davfs2/patches/030-realpath.patch
net/modemmanager/Makefile
net/modemmanager/files/modemmanager.common
net/modemmanager/files/modemmanager.init
net/modemmanager/files/usr/sbin/ModemManager-wrapper [new file with mode: 0644]
net/nft-qos/Makefile
net/nft-qos/files/lib/monitor.sh
net/nft-qos/files/nft-qos.init
net/tailscale/Makefile
net/tgt/Makefile
sound/alsa-utils/Makefile
sound/shairport-sync/Makefile
utils/bandwidthd/Makefile
utils/gptfdisk/Makefile
utils/semodule-utils/Makefile
utils/telegraf/Makefile
utils/uvol/Makefile
utils/uvol/files/common.sh
utils/uvol/files/lvm.sh
utils/uvol/files/ubi.sh
utils/uvol/files/uvol.defaults
utils/whois/Makefile

index 18caa46b411cb2028d06c292dc296ce046fd29cb..d51c4035b91204136662b64e131bdacac6c7625f 100644 (file)
@@ -7,13 +7,13 @@ include $(TOPDIR)/rules.mk
 
 SRC_NAME:=libselinux
 PKG_NAME:=python3-$(SRC_NAME)
-PKG_VERSION:=3.2
-PKG_RELEASE:=1
+PKG_VERSION:=3.3
+PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/python-libselinux/$(SRC_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(SRC_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/SELinuxProject/selinux/releases/download/20200710
-PKG_HASH:=df758ef1d9d4811051dd901ea6b029ae334ffd7c671c128beb16bce1e25ac161
+PKG_HASH:=acfdee27633d2496508c28727c3d41d3748076f66d42fccde2e6b9f3463a7057
 PKG_BUILD_DEPENDS:=swig/host
 
 PKG_MAINTAINER:=Thomas Petazzoni <thomas.petazzoni@bootlin.com>
index 7e0b005dc70cfaab89e43dc63876b3eb7697993f..44ac41af1b94108c06becf33ca7833a567196717 100644 (file)
@@ -6,11 +6,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python3-networkx
-PKG_VERSION:=2.5
-PKG_RELEASE:=1
+PKG_VERSION:=2.6.3
+PKG_RELEASE:=$(AUTORELEASE)
 
 PYPI_NAME:=networkx
-PKG_HASH:=7978955423fbc9639c10498878be59caf99b44dc304c2286162fd24b458c1602
+PKG_HASH:=c0946ed31d71f1b732b5aaa6da5a0388a345019af232ce2f49c766e2d6795c51
 
 PKG_LICENSE:=BSD-3-clause
 PKG_LICENSE_FILES:=LICENSE.txt
index c7ca612eaa409a6ccde019e27f8d04977d05bbad..b59d2f3b92879f2b50d2cbe6e6f97917d3ca3195 100644 (file)
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=alsa-lib
-PKG_VERSION:=1.2.5.1
+PKG_VERSION:=1.2.6.1
 PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=ftp://ftp.alsa-project.org/pub/lib/ \
                http://distfiles.gentoo.org/distfiles/
-PKG_HASH:=628421d950cecaf234de3f899d520c0a6923313c964ad751ffac081df331438e
+PKG_HASH:=ad582993d52cdb5fb159a0beab60a6ac57eab0cc1bdf85dc4db6d6197f02333f
 
 PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>, \
                Peter Wagner <tripolar@gmx.at>
index 7b4984ab79158326036b2b813c1af91f087ddea2..6c92a1add818d04e0a245dc3c38263f6799f24a6 100644 (file)
@@ -6,13 +6,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=alsa-ucm-conf
-PKG_VERSION:=1.2.5.1
+PKG_VERSION:=1.2.6.2
 PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=ftp://ftp.alsa-project.org/pub/lib/ \
                http://distfiles.gentoo.org/distfiles/
-PKG_HASH:=5841a444166dcbf479db751303dbc3556f685085ac7e00f0c9e7755676195d97
+PKG_HASH:=8be24fb9fe789ee2778ae6f32e18e8043fe7f8bc735871e9d17c68a04566a822
 
 PKG_MAINTAINER:=
 PKG_LICENSE:=BSD-3-Clause
index d2779077ca8e29098b449c4851e251475a19f009..af7955ff68da4993e8360ff4973d3a34fe1da17d 100644 (file)
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=freetype
-PKG_VERSION:=2.11.0
+PKG_VERSION:=2.11.1
 PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@SF/freetype
-PKG_HASH:=8bee39bd3968c4804b70614a0a3ad597299ad0e824bc8aad5ce8aaf48067bde7
+PKG_HASH:=3333ae7cfda88429c97a7ae63b7d01ab398076c3b67182e960e5684050f2c5c8
 
 PKG_MAINTAINER:=Val Kulkov <val.kulkov@gmail.com>
 PKG_LICENSE:=FTL GPL-2.0-only MIT ZLIB GPL-3.0-or-later
index 1be4697180c0f6dd47a9d1a13a9a75468506af4c..6360a70d3808d5bd5dc098c1cc6d4b4ba57046b4 100644 (file)
@@ -19,20 +19,15 @@ PKG_MAINTAINER:=Tibor Dudlák <tibor.dudlak@gmail.com>
 PKG_LICENSE:=Apache-2.0
 PKG_LICENSE_FILES:=COPYING
 
+PKG_BUILD_DEPENDS:=openssl
+
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/meson.mk
 
-define Package/libjose
-  SECTION:=libs
-  TITLE:=Provides a full crypto stack including key generation, signing and encryption.
-  DEPENDS:=+zlib +jansson +libopenssl +libpthread
-  URL:=https://github.com/latchset/jose
-endef
-
 define Package/jose
   SECTION:=utils
   TITLE:=Provides a full crypto stack including key generation, signing and encryption.
-  DEPENDS:=+libjose
+  DEPENDS:=+jansson
   URL:=https://github.com/latchset/jose
 endef
 
@@ -42,31 +37,22 @@ define Package/jose/description
        crypto stack including key generation, signing and encryption.
 endef
 
-define Package/libjose/description
-       libjose is a library for performing various tasks on JSON
-       Object Signing and Encryption (JOSE) objects. José provides a full
-       crypto stack including key generation, signing and encryption.
-endef
+MESON_ARGS += \
+       -Ddefault_library=static
 
 define Build/InstallDev
        $(INSTALL_DIR)  $(1)/usr/lib
        $(INSTALL_DIR)  $(1)/usr/include
        $(INSTALL_DIR)  $(1)/usr/include/$(PKG_NAME)
        $(INSTALL_DIR)  $(1)/usr/lib/pkgconfig
-       $(CP)   $(PKG_INSTALL_DIR)/usr/lib/lib$(PKG_NAME).so*   $(1)/usr/lib
+       $(CP)   $(PKG_INSTALL_DIR)/usr/lib/lib$(PKG_NAME).a     $(1)/usr/lib
        $(CP)   $(PKG_INSTALL_DIR)/usr/include/$(PKG_NAME)/*.h  $(1)/usr/include/$(PKG_NAME)
        $(CP)   $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/*.pc       $(1)/usr/lib/pkgconfig
 endef
 
-define Package/libjose/install
-       $(INSTALL_DIR)  $(1)/usr/lib
-       $(CP)           $(PKG_INSTALL_DIR)/usr/lib/lib$(PKG_NAME).so*   $(1)/usr/lib/
-endef
-
 define Package/jose/install
        $(INSTALL_DIR)  $(1)/usr/bin
        $(INSTALL_BIN)  $(PKG_INSTALL_DIR)/usr/bin/$(PKG_NAME)          $(1)/usr/bin/
 endef
 
-$(eval $(call BuildPackage,libjose))
 $(eval $(call BuildPackage,jose))
index ee9b3936208f4275400533b73022530f693259cc..6024e46291084f7e847fdb411bfab0be37337d52 100644 (file)
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=jsoncpp
-PKG_VERSION:=1.9.4
-PKG_RELEASE:=3
+PKG_VERSION:=1.9.5
+PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/open-source-parsers/jsoncpp/tar.gz/$(PKG_VERSION)?
-PKG_HASH:=e34a628a8142643b976c7233ef381457efad79468c67cb1ae0b83a33d7493999
+PKG_HASH:=f409856e5920c18d0c2fb85276e24ee607d2a09b5e7d5f0a371368903c275da2
 
 PKG_MAINTAINER:=Jan Pavlinec <jan.pavlinec1@gmail.com>
 PKG_LICENSE:=MIT
index 424a1363ce2fce4b1168f3280ae3c6fccecb3503..12a43979dcead69f065f15962a51ca963633d590 100644 (file)
@@ -1,12 +1,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libtorrent-rasterbar
-PKG_VERSION:=2.0.4
+PKG_VERSION:=2.0.5
 PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/arvidn/libtorrent/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=dfbc0d67c75e828530ee2b705442196429eaf255a3f757099e69c95f33e6f940
+PKG_HASH:=8879d233d81b9bc1b02fdac35f6e1f69509c74da9818c6a819d18b5e42983f56
 
 PKG_MAINTAINER:=David Yang <mmyangfl@gmail.com>
 PKG_LICENSE:=BSD-3-Clause
diff --git a/libs/libtorrent-rasterbar/patches/010-boost.patch b/libs/libtorrent-rasterbar/patches/010-boost.patch
deleted file mode 100644 (file)
index fb7a3e5..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-From 8ed34b67df8c795780f80db5be35ad468713110e Mon Sep 17 00:00:00 2001
-From: arvidn <arvid@libtorrent.org>
-Date: Thu, 19 Aug 2021 11:54:13 +0200
-Subject: [PATCH] bump handler allocation sizes for boost-1.77 (linux)
-
----
- include/libtorrent/aux_/allocating_handler.hpp | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
---- a/include/libtorrent/aux_/allocating_handler.hpp
-+++ b/include/libtorrent/aux_/allocating_handler.hpp
-@@ -122,14 +122,14 @@ namespace libtorrent { namespace aux {
-       constexpr std::size_t fuzzer_write_cost = 0;
-       constexpr std::size_t fuzzer_read_cost = 0;
- #endif
--      constexpr std::size_t write_handler_max_size = tracking + debug_write_iter + openssl_write_cost + fuzzer_write_cost + 152;
--      constexpr std::size_t read_handler_max_size = tracking + debug_read_iter + openssl_read_cost + fuzzer_read_cost + 152;
--      constexpr std::size_t udp_handler_max_size = tracking + 144;
--      constexpr std::size_t utp_handler_max_size = tracking + 168;
-+      constexpr std::size_t write_handler_max_size = tracking + debug_write_iter + openssl_write_cost + fuzzer_write_cost + 168;
-+      constexpr std::size_t read_handler_max_size = tracking + debug_read_iter + openssl_read_cost + fuzzer_read_cost + 168;
-+      constexpr std::size_t udp_handler_max_size = tracking + 160;
-+      constexpr std::size_t utp_handler_max_size = tracking + 184;
-       constexpr std::size_t abort_handler_max_size = tracking + 72;
-       constexpr std::size_t submit_handler_max_size = tracking + 72;
-       constexpr std::size_t deferred_handler_max_size = tracking + 80;
--      constexpr std::size_t tick_handler_max_size = tracking + 112;
-+      constexpr std::size_t tick_handler_max_size = tracking + 128;
- #endif
-       enum HandlerName
index 6d6cbeccb427dcb4147af5b1725483ea6a827d86..97cb1ae379fb43e9a157c3f6ff0f638043ee2168 100644 (file)
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=alpine
-PKG_VERSION:=2.24
-PKG_RELEASE:=2
+PKG_VERSION:=2.25
+PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=http://alpine.x10host.com/alpine/release/src
-PKG_HASH:=651a9ffa0a29e2b646a0a6e0d5a2c8c50f27a07a26a61640b7c783d06d0abcef
+PKG_HASH:=658a150982f6740bb4128e6dd81188eaa1212ca0bf689b83c2093bb518ecf776
 
 PKG_MAINTAINER:=Antti Seppälä <a.seppala@gmail.com>
 PKG_LICENSE:=Apache-2.0
index 0aa3a5ca2aa577332608a755a67ab3a9ca13e3fe..e94ce8237939d89a72087f736ab46bb34b06338d 100644 (file)
@@ -7,12 +7,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=atftp
-PKG_VERSION:=0.7.4
+PKG_VERSION:=0.7.5
 PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/$(PKG_NAME)
-PKG_HASH:=d3c9cd0d971dfc786d7a5f4055c35d4e66aafc8102ac03473ef225bdf7edb26a
+PKG_HASH:=93c87a4fb18218414e008e01c995dadd231ba4c752d0f894b34416d1e6d3038a
 
 PKG_MAINTAINER:=Daniel Danzberger <daniel@dd-wrt.com>
 PKG_LICENSE:=GPL-2.0-or-later
diff --git a/net/atftp/patches/01-missing-u_char-type-patch.patch b/net/atftp/patches/01-missing-u_char-type-patch.patch
deleted file mode 100644 (file)
index 0a51712..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/tftpd.h
-+++ b/tftpd.h
-@@ -47,7 +47,7 @@ struct thread_data {
-      char *mc_addr;             /* multicast address */
-      struct sockaddr_storage sa_mcast;
-      union ip_mreq_storage mcastaddr;
--     u_char mcast_ttl;
-+     unsigned char mcast_ttl;
-      
-      /*
-       * Self can read/write until client_ready is set. Then only allowed to read.
diff --git a/net/atftp/patches/02-fix-invalid-read-in-tftp_send_request.patch b/net/atftp/patches/02-fix-invalid-read-in-tftp_send_request.patch
deleted file mode 100644 (file)
index e1cad03..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/tftp_io.c
-+++ b/tftp_io.c
-@@ -64,7 +64,7 @@ int tftp_send_request(int socket, struct
-      buf_index += strlen(mode);
-      buf_index++;
-      
--     for (i = 2; ; i++)
-+     for (i = 2; i < OPT_NUMBER; i++)
-      {
-           if (strlen(tftp_options[i].option) == 0)
-                break;
index 12e0fd9d6cca36fbe6cd3fd60707d323b2a45dda..d56bf96b5e883718a24275606e402f7671e341d6 100644 (file)
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=davfs2
-PKG_VERSION:=1.6.0
-PKG_RELEASE:=1
+PKG_VERSION:=1.6.1
+PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SAVANNAH/davfs2
-PKG_HASH:=2e6b675685bd917772be60f0999ae098c80f79ff20dc131e8fec4547cbb63b50
+PKG_HASH:=ce3eb948ece582a51c934ccb0cc70e659839172717caff173f69a5e2af90c5c0
 
 PKG_MAINTAINER:=Federico Di Marco <fededim@gmail.com>
 PKG_LICENSE:=GPL-3.0-or-later
index 27a5588f5b7fe228cd862cec8902624fd7c94837..50fbd3cbb34bdb5120ce8e87ebc473f66b54bbb8 100644 (file)
@@ -18,7 +18,7 @@
          if (!mpoint)
              error(EXIT_FAILURE, 0,
                    _("can't evaluate path of mount point %s"), mpoint);
-@@ -2131,7 +2131,7 @@ read_config(dav_args *args, const char *
+@@ -2109,7 +2109,7 @@ read_config(dav_args *args, const char *
                  error_at_line(EXIT_FAILURE, 0, filename, lineno,
                                _("malformed line"));
              *(parmv[0] + strlen(parmv[0]) - 1) = '\0';
@@ -27,7 +27,7 @@
              if (mp) {
                  applies = (strcmp(mp, mpoint) == 0);
                  free(mp);
-@@ -2386,7 +2386,7 @@ read_secrets(dav_args *args, const char
+@@ -2364,7 +2364,7 @@ read_secrets(dav_args *args, const char
              if (scheme && !port)
                  port = ne_uri_defaultport(scheme);
  
index ce87b0a36ab2ac0256702f36098dc50a2ffdeca1..db59989b203453402ffd9a50c0f701187c0bb875 100644 (file)
@@ -98,6 +98,7 @@ define Package/modemmanager/install
 
        $(INSTALL_DIR) $(1)/usr/sbin
        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ModemManager $(1)/usr/sbin
+       $(INSTALL_BIN) ./files/usr/sbin/ModemManager-wrapper $(1)/usr/sbin
 
        $(INSTALL_DIR) $(1)/usr/bin
        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/mmcli $(1)/usr/bin
index b4139abadb1bfec43ba7174d57c031ec7b983d62..6367eb32bb51186dd45e20a0a9f4ab75e9268e56 100644 (file)
@@ -20,7 +20,8 @@ MODEMMANAGER_EVENTS_CACHE="${MODEMMANAGER_RUNDIR}/events.cache"
 # Common logging
 
 mm_log() {
-       logger -t "ModemManager" "hotplug: $*"
+       local level="$1"; shift
+       logger -p "daemon.${level}" -t "ModemManager[$$]" "hotplug: $*"
 }
 
 ################################################################################
@@ -169,7 +170,7 @@ mm_wait_for_modem() {
 
        while [ $n -ge 0 ]; do
                [ -d "${sysfspath}" ] || {
-                       mm_log "errorignoring modem detection request: no device at ${sysfspath}"
+                       mm_log "error" "ignoring modem detection request: no device at ${sysfspath}"
                        proto_set_available "${cfg}" 0
                        return 1
                }
@@ -177,10 +178,10 @@ mm_wait_for_modem() {
                # Check if the modem exists at the given sysfs path
                if ! mmcli -m "${sysfspath}" > /dev/null 2>&1
                then
-                       mm_log "errormodem not detected at sysfs path"
+                       mm_log "error" "modem not detected at sysfs path"
                else
-                       mm_log "modem exported successfully at ${sysfspath}"
-                       mm_log "setting interface '${cfg}' as available"
+                       mm_log "info" "modem exported successfully at ${sysfspath}"
+                       mm_log "info" "setting interface '${cfg}' as available"
                        proto_set_available "${cfg}" 1
                        return 0
                fi
@@ -189,7 +190,7 @@ mm_wait_for_modem() {
                n=$((n-step))
        done
 
-       mm_log "errortimed out waiting for the modem to get exported at ${sysfspath}"
+       mm_log "error" "timed out waiting for the modem to get exported at ${sysfspath}"
        proto_set_available "${cfg}" 0
        return 2
 }
@@ -201,7 +202,7 @@ mm_report_modem_wait() {
 
        parent_sysfspath=$(mm_find_physdev_sysfs_path "$sysfspath")
        [ -n "${parent_sysfspath}" ] || {
-               mm_log "errorparent device sysfspath not found"
+               mm_log "error" "parent device sysfspath not found"
                return
        }
 
@@ -212,23 +213,23 @@ mm_report_modem_wait() {
 
                        cfg=$(mm_get_modem_config "${parent_sysfspath}")
                        if [ -n "${cfg}" ]; then
-                               mm_log "interface '${cfg}' is set to configure device '${parent_sysfspath}'"
-                               mm_log "now waiting for modem at sysfs path ${parent_sysfspath}"
+                               mm_log "info" "interface '${cfg}' is set to configure device '${parent_sysfspath}'"
+                               mm_log "info" "now waiting for modem at sysfs path ${parent_sysfspath}"
                                mm_set_modem_wait_status "${parent_sysfspath}" "processed"
                                # Launch subshell for the explicit wait
                                ( mm_wait_for_modem "${cfg}" "${parent_sysfspath}" ) > /dev/null 2>&1 &
                        else
-                               mm_log "no need to wait for modem at sysfs path ${parent_sysfspath}"
+                               mm_log "info" "no need to wait for modem at sysfs path ${parent_sysfspath}"
                                mm_set_modem_wait_status "${parent_sysfspath}" "ignored"
                        fi
                        ;;
                "processed")
-                       mm_log "already waiting for modem at sysfs path ${parent_sysfspath}"
+                       mm_log "info" "already waiting for modem at sysfs path ${parent_sysfspath}"
                        ;;
                "ignored")
                        ;;
                *)
-                       mm_log "errorunknown status read for device at sysfs path ${parent_sysfspath}"
+                       mm_log "error" "unknown status read for device at sysfs path ${parent_sysfspath}"
                        ;;
        esac
 }
@@ -258,7 +259,7 @@ mm_cleanup_interface_by_sysfspath() {
        cfg=$(mm_get_modem_config "$dev")
        [ -n "${cfg}" ] || return
 
-       mm_log "setting interface '$cfg' as unavailable"
+       mm_log "info" "setting interface '$cfg' as unavailable"
        proto_set_available "${cfg}" 0
 }
 
@@ -286,7 +287,7 @@ mm_report_event() {
        esac
 
        # Report the event
-       mm_log "event reported: action=${action}, name=${name}, subsystem=${subsystem}"
+       mm_log "debug" "event reported: action=${action}, name=${name}, subsystem=${subsystem}"
        mmcli --report-kernel-event="action=${action},name=${name},subsystem=${subsystem}" 1>/dev/null 2>&1 &
 
        # Wait for added modem if a sysfspath is given
@@ -302,7 +303,7 @@ mm_report_event_from_cache_line() {
        subsystem=$(echo "${event_line}" | awk -F ',' '{ print $3 }')
        sysfspath=$(echo "${event_line}" | awk -F ',' '{ print $4 }')
 
-       mm_log "cached event found: action=${action}, name=${name}, subsystem=${subsystem}, sysfspath=${sysfspath}"
+       mm_log "debug" "cached event found: action=${action}, name=${name}, subsystem=${subsystem}, sysfspath=${sysfspath}"
        mm_report_event "${action}" "${name}" "${subsystem}" "${sysfspath}"
 }
 
@@ -317,11 +318,11 @@ mm_report_events_from_cache() {
        # Wait for ModemManager to be available in the bus
        while [ $n -ge 0 ]; do
                sleep $step
-               mm_log "checking if ModemManager is available..."
+               mm_log "info" "checking if ModemManager is available..."
 
                if ! mmcli -L >/dev/null 2>&1
                then
-                       mm_log "ModemManager not yet available"
+                       mm_log "info" "ModemManager not yet available"
                else
                        mmrunning=1
                        break
@@ -330,7 +331,7 @@ mm_report_events_from_cache() {
        done
 
        [ ${mmrunning} -eq 1 ] || {
-               mm_log "errorcouldn't report initial kernel events: ModemManager not running"
+               mm_log "error" "couldn't report initial kernel events: ModemManager not running"
                return
        }
 
index b3f9f92901b6c8a7aeb0be61ba936d07319f16b5..7f014dc56ecb64746e71083b86b5ec2873579d88 100755 (executable)
@@ -4,6 +4,8 @@
 USE_PROCD=1
 START=70
 
+LOG_LEVEL="INFO"
+
 stop_service() {
        # Load common utils
        . /usr/share/ModemManager/modemmanager.common
@@ -22,14 +24,14 @@ start_service() {
        # it starts.
        #
        # All these commands need to be executed on every MM start, even after
-       # procd-triggered respawns, which is why they're all included as instance command
+       # procd-triggered respawns, which is why this is wrapped in a startup
+       # wrapper script called '/usr/sbin/ModemManager-wrapper'.
        #
+       . /usr/share/ModemManager/modemmanager.common
        procd_open_instance
-       procd_set_param command sh -c ". /usr/share/ModemManager/modemmanager.common;    \
-                                      mkdir -m 0755 -p ${MODEMMANAGER_RUNDIR};          \
-                                      mm_cleanup_interfaces;                            \
-                                      ( mm_report_events_from_cache ) >/dev/null 2>&1 & \
-                                      /usr/sbin/ModemManager"
+       procd_set_param command /usr/sbin/ModemManager-wrapper
+       procd_append_param command --log-level="$LOG_LEVEL"
+       [ "$LOG_LEVEL" = "DEBUG" ] && procd_append_param command --debug
        procd_set_param respawn "${respawn_threshold:-3600}" "${respawn_timeout:-5}" "${respawn_retry:-5}"
        procd_set_param pidfile "${MODEMMANAGER_PID_FILE}"
        procd_close_instance
diff --git a/net/modemmanager/files/usr/sbin/ModemManager-wrapper b/net/modemmanager/files/usr/sbin/ModemManager-wrapper
new file mode 100644 (file)
index 0000000..f5fb6d1
--- /dev/null
@@ -0,0 +1,33 @@
+#!/bin/sh
+
+trap_with_arg() {
+       func="$1" ; shift
+       for sig ; do
+               # shellcheck disable=SC2064
+               trap "$func $sig" "$sig"
+       done
+}
+
+func_trap() {
+       logger "ModemManager-wrapper[$$]" "Sending signal ${1}..."
+       kill "-${1}" "$CHILD" 2>/dev/null
+}
+
+main() {
+       . /usr/share/ModemManager/modemmanager.common
+
+       trap_with_arg func_trap INT TERM KILL
+
+       mkdir -p "${MODEMMANAGER_RUNDIR}"
+       chmod 0755 "${MODEMMANAGER_RUNDIR}"
+       mm_cleanup_interfaces
+
+       /usr/sbin/ModemManager "$@" 1>/dev/null 2>/dev/null &
+       CHILD="$!"
+       sleep 2
+       mm_report_events_from_cache
+
+       wait "$CHILD"
+}
+
+main "$@"
index b2ff326bfa8671c139a5d4f3a03903f733ea0911..af3df355a4869d781568e9c73c7a343a2f598f57 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=nft-qos
 PKG_VERSION:=1.0.6
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 PKG_LICENSE:=GPL-2.0
 
 PKG_MAINTAINER:=Rosy Song <rosysong@rosinson.com>
index 54de88eb3681e90a79e0b6780863c8e0f516f230..ae10dc4a74147a6012ea0e3df54e0d41a42346b0 100644 (file)
@@ -6,7 +6,7 @@
 . /lib/nft-qos/core.sh
 
 qosdef_monitor_get_ip_handle() { # <family> <chain> <ip>
-       echo $(nft list chain $1 nft-qos-monitor $2 -a 2>/dev/null | grep $3 | awk '{print $11}')
+       echo $(nft -a list chain $1 nft-qos-monitor $2 2>/dev/null | grep $3 | awk '{print $11}')
 }
 
 qosdef_monitor_add() { # <mac> <ip> <hostname>
index 6c5842a49c8aa4ba58204f0484b7c7cd7cbf89fe..4a85e20c0ecf2d942bc6776346873d6ad268eda9 100755 (executable)
@@ -3,12 +3,14 @@
 # Copyright (C) 2018 rosysong@rosinson.com
 #
 
-. "${IPKG_INSTROOT}/lib/nft-qos/core.sh"
-. "${IPKG_INSTROOT}/lib/nft-qos/monitor.sh"
-. "${IPKG_INSTROOT}/lib/nft-qos/dynamic.sh"
-. "${IPKG_INSTROOT}/lib/nft-qos/static.sh"
-. "${IPKG_INSTROOT}/lib/nft-qos/mac.sh"
-. "${IPKG_INSTROOT}/lib/nft-qos/priority.sh"
+if [ -z "${IPKG_INSTROOT}" ]; then
+       . /lib/nft-qos/core.sh
+       . /lib/nft-qos/monitor.sh
+       . /lib/nft-qos/dynamic.sh
+       . /lib/nft-qos/static.sh
+       . /lib/nft-qos/mac.sh
+       . /lib/nft-qos/priority.sh
+fi
 
 START=99
 USE_PROCD=1
index b5df2630147f0e52b00cea78bf531e1d038a6902..d2ebabdac479e521aa9d061774fe98d78ef4efc1 100644 (file)
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tailscale
-PKG_VERSION:=1.12.3
+PKG_VERSION:=1.18.2
 PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE:=tailscale-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/tailscale/tailscale/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=05e5b1d382cad7ac5737d87d0b61277791c75938468c2c662f21665998d431e9
+PKG_HASH:=57206181868299027689651b6cd133627acad0c8c38f0151f469ab36d4130012
 
 PKG_MAINTAINER:=Jan Pavlinec <jan.pavlinec1@gmail.com>
 PKG_LICENSE:=BSD-3-Clause
index 6abaae119d4a8bcfaadc39fdb5c4311396fbb5de..5ff0e2dbc02687adc7eb1840c7d28cc3ad52beb4 100644 (file)
@@ -4,12 +4,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tgt
-PKG_VERSION:=1.0.80
+PKG_VERSION:=1.0.81
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/fujita/tgt/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=e2255482f1a2797c115a6d545c37428b10a4ba6276a2af787da5378fa4e34e75
+PKG_HASH:=f8a285549456f13fecf628131a73934ffcbb701bacb7d5802acee7b515ab5452
 
 PKG_MAINTAINER:=Maxim Storchak <m.storchak@gmail.com>
 PKG_LICENSE:=GPL-2.0-only
@@ -23,7 +23,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/tgt
        SECTION:=net
        CATEGORY:=Network
-       URL:=http://stgt.sourceforge.net/
+       URL:=https://github.com/fujita/tgt
        TITLE:=userspace iSCSI target
        DEPENDS:=+libpthread +libaio
 endef
index ed3c1a16423e9d48f2dc1ecaf730e70aec96252d..f8f90e4ba44fdf324e6216df83e9b89ac1293e70 100644 (file)
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=alsa-utils
-PKG_VERSION:=1.2.5.1
+PKG_VERSION:=1.2.6
 PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=ftp://ftp.alsa-project.org/pub/utils/ \
                http://distfiles.gentoo.org/distfiles/
-PKG_HASH:=9c169ae37a49295f9b97b92ace772803daf6b6510a19574e0b78f87e562118d0
+PKG_HASH:=6a1efd8a1f1d9d38e489633eaec1fffa5c315663b316cab804be486887e6145d
 
 PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
 PKG_LICENSE:=GPL-2.0-or-later
index c49683cd13293fc2cdbf93053eb94f05a4f2d3a0..08172bf0ae92523b074c093474e77263d9bacbcc 100644 (file)
@@ -7,12 +7,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=shairport-sync
-PKG_VERSION:=3.3.8
+PKG_VERSION:=3.3.9
 PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/mikebrady/shairport-sync/tar.gz/$(PKG_VERSION)?
-PKG_HASH:=c92f9a2d86dd1138673abc66e0010c94412ad6a46da8f36c3d538f4fa6b9faca
+PKG_HASH:=17990cb2620551caa07a1c3b371889e55803071eaada04e958c356547a7e1795
 
 PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>, \
                Mike Brady <mikebrady@eircom.net>
index 53e2a6fe0eef50b0b951f6dd35f5484e04da92c6..c683d35477536bc938839dffef1cc492eb71e6e6 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bandwidthd
 PKG_VERSION:=2.0.1-35
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/NethServer/bandwidthd/tar.gz/$(PKG_VERSION)?
@@ -48,14 +48,14 @@ define Package/bandwidthd-sqlite
 $(call Package/bandwidthd/Default)
   TITLE += (with sqlite enabled)
   VARIANT:=sqlite
-  DEPENDS:=+libgd +libpcap +libsqlite3 +php7 +php7-cgi +php7-mod-gd +php7-mod-pdo +php7-mod-pdo-sqlite
+  DEPENDS:=+libgd +libpcap +libsqlite3 +php8 +php8-cgi +php8-mod-gd +php8-mod-pdo +php8-mod-pdo-sqlite
 endef
 
 define Package/bandwidthd-php
 $(call Package/bandwidthd/Default)
   TITLE = PHP files to graph bandwidthd data from postgresql
   VARIANT:=php
-  DEPENDS:=+libpcre +libxml2 +php7 +php7-cgi +php7-mod-pgsql +php7-mod-gd
+  DEPENDS:=+libpcre +libxml2 +php8 +php8-cgi +php8-mod-pgsql +php8-mod-gd
 endef
 
 define Package/bandwidthd/description
index 0f54447339acdce1e8e26145a799c0f1e872ee80..9a4ad6992b74f7d5342e5b91820e9ee7fa573abf 100644 (file)
@@ -15,7 +15,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/$(PKG_NAME)
 PKG_HASH:=95d19856f004dabc4b8c342b2612e8d0a9eebdd52004297188369f152e9dc6df
 
-PKG_MAINTAINER:=Alif M. Ahmad <alive4ever@live.com>
+PKG_MAINTAINER:=
 PKG_LICENSE:=GPL-2.0-or-later
 PKG_LICENSE_FILES:=COPYING
 
index ba08eac8d6bcd6f584f69ba1a1e29734315d7763..06b7e06b4251841c7cb275421f28c2166617f412 100644 (file)
@@ -6,12 +6,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=semodule-utils
-PKG_VERSION:=3.2
-PKG_RELEASE:=1
+PKG_VERSION:=3.3
+PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/SELinuxProject/selinux/releases/download/$(PKG_VERSION)
-PKG_HASH:=be155654883c8dc4d05493e04a3eb9e56d28803009f1fdd721d42c68b878f757
+PKG_HASH:=3098ec5e5f04a1dbbf4aa569b63a4570750a9fe0d4da14ce45954aa300a17063
 
 PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
 PKG_LICENSE:=GPL-2.0-only
index 1c13e821edcda501b6cc2a2c678694d27ca24f0e..f1086e7b1c3c15bd6397a51afda25385369d889b 100644 (file)
@@ -3,12 +3,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=telegraf
-PKG_VERSION:=1.21.0
+PKG_VERSION:=1.21.1
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/influxdata/telegraf/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=95b270fc90cea31fa221296cc9aa436c12233011b263cf149c06ecdd7ba99461
+PKG_HASH:=7ec38fa53747682290621b3162dbb0bb12cf73a559a689f8a75e1ec8b518da0b
 
 PKG_MAINTAINER:=Jonathan Pagel <jonny_tischbein@systemli.org>
 PKG_LICENSE:=MIT
index e167e20d0314dc335c598041b1cbfcca13245138..6583e6e75663f3904e6cf4fa75c1ac99707bb253 100644 (file)
@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=uvol
-PKG_VERSION:=0.5
+PKG_VERSION:=0.6
 PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
@@ -70,7 +70,7 @@ define Package/uvol/install
        $(INSTALL_BIN) ./files/ubi.sh $(1)/usr/libexec/uvol/20-ubi.sh
        $(INSTALL_BIN) ./files/lvm.sh $(1)/usr/libexec/uvol/50-lvm.sh
        $(INSTALL_BIN) ./files/uvol $(1)/usr/sbin
-       $(INSTALL_BIN) ./files/uvol.defaults $(1)/etc/uci-defaults/90-uvol-restore-uci
+       $(INSTALL_BIN) ./files/uvol.defaults $(1)/etc/uci-defaults/90-uvol-init
 endef
 
 $(eval $(call BuildPackage,autopart))
index e26c26404b12ef990736296ef371720a6ed8fecd..8306477720f3cc3f7283988435097874f1882d3d 100644 (file)
@@ -23,8 +23,8 @@ uvol_uci_add() {
        uuid="${uuid:5}"
 
        case "$uciname" in
-               "_uxc")
-                       target="/var/run/uxc"
+               "_meta")
+                       target="/var/run/uvol/.meta"
                        ;;
                "_"*)
                        return 1
@@ -50,7 +50,7 @@ uvol_uci_remove() {
        local volname="$1"
        local uciname
 
-       uciname="${volname//-/_}"
+       uciname="${volname//[-.]/_}"
        uciname="${uciname//[!([:alnum:]_)]}"
        if [ -e "${UCI_SPOOLDIR}/add-$1" ]; then
                rm "${UCI_SPOOLDIR}/add-$1"
index 08ff8d979d510439986e4a21ae4ff32160e856f7..0639c10f1b42570fc7f2ca0fd9adbf1224e9e12c 100644 (file)
@@ -62,8 +62,12 @@ existvol() {
 
 vg_name=
 exportpv() {
-       local reports rep pv pvs
        vg_name=
+       config_load fstab
+       local uvolsect="$(config_foreach echo uvol)"
+       [ -n "$uvolsect" ] && config_get vg_name "$uvolsect" vg_name
+       [ -n "$vg_name" ] && return
+       local reports rep pv pvs
        json_init
        json_load "$(pvs -o vg_name -S "pv_name=~^/dev/$rootdev.*\$")"
        json_select report
@@ -152,7 +156,7 @@ getdev() {
        for dms in /sys/devices/virtual/block/dm-* ; do
                [ "$dms" = "/sys/devices/virtual/block/dm-*" ] && break
                read -r dm_name < "$dms/dm/name"
-               [ $(basename "$lv_dm_path") = "$dm_name" ] && echo "$(basename "$dms")"
+               [ "$(basename "$lv_dm_path")" = "$dm_name" ] && basename "$dms"
        done
 }
 
@@ -316,6 +320,7 @@ listvols() {
                        lv_mode="${lv_name:0:2}"
                        lv_name="${lv_name:3}"
                        lv_size=${lv_size%B}
+                       [ "${lv_name:0:1}" = "." ] && continue
                        if [ "$json_output" = "1" ]; then
                                [ "$json_notfirst" = "1" ] && echo ","
                                echo -e "\t{"
@@ -340,7 +345,7 @@ listvols() {
 }
 
 detect() {
-       local reports rep lv lvs lv_name lv_full_name lv_mode volname devname lv_skip_activation
+       local reports rep lv lvs lv_name lv_full_name lv_mode volname devname
        local temp_up=""
 
        json_init
index 0af34f3c0286e6d60455db675e3a5417b1e0ac37..d7593606fce0c63da0fcd1cca745575b61014ce9 100644 (file)
@@ -212,6 +212,7 @@ listvols() {
                esac
                volmode="${volname:5:2}"
                volname="${volname:8}"
+               [ "${volname:0:1}" = "." ] && continue
                if [ "$json_output" = "1" ]; then
                        [ "$json_notfirst" = "1" ] && echo ","
                                echo -e "\t{"
index cbd53a3e4e06372ca5234920f2010acae6b0efb3..e71135f7a85553cb88feaa628bc0be932c25b9af 100644 (file)
@@ -1,3 +1,17 @@
 #!/bin/sh
 
-uci -q get fstab.@uvol[0].initialized >/dev/null || uvol detect || true
+uvol_init() {
+       local metasz freesz totalsz
+       uvol detect
+       metasz="$(uvol size .meta 2>/dev/null)"
+       [ "$((metasz))" -gt 0 ] && return
+       totalsz="$(uvol total)"
+       freesz="$(uvol free)"
+       metasz="$((totalsz / 10240))"
+       [ "$metasz" -lt 4194304 ] && metasz=4194304
+       [ "$metasz" -gt "$freesz" ] && return
+       uvol create .meta "$metasz" rw
+       uvol up .meta
+}
+
+uci -q get fstab.@uvol[0].initialized >/dev/null || uvol_init
index 6bde91ca2fbbbc26ef9197c98b34626cc0769aab..d87c1cd2178f6b0740b6c8dd91d8bb173f3e238e 100644 (file)
@@ -1,12 +1,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=whois
-PKG_VERSION:=5.5.9
+PKG_VERSION:=5.5.10
 PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/w/whois
-PKG_HASH:=69088241ed33d2204f153c8005b312a69b60a1429075ff49f42f9f1f73a19c19
+PKG_HASH:=2391037b079695d0e9fd3c85ab021809a539cf093d25b6c51ca65019a54158dd
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
 PKG_BUILD_DEPENDS:=perl/host