diff options
Diffstat (limited to 'package')
27 files changed, 289 insertions, 127 deletions
diff --git a/package/apcupsd/Makefile b/package/apcupsd/Makefile index c6d72cd94..52b6def9a 100644 --- a/package/apcupsd/Makefile +++ b/package/apcupsd/Makefile @@ -24,7 +24,7 @@ $(eval $(call PKG_template,APCUPSD,apcupsd,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_D CONFIGURE_ARGS+= --prefix="${WRKINST}" --sbindir="/usr/sbin" --enable-usb CONFIGURE_ENV+= ac_cv_path_WALL=/usr/bin/wall -XAKE_FLAGS:= VERBOSE=1 STRIP="" +XAKE_FLAGS:= VERBOSE=1 STRIP="" LD="$(TARGET_CXX)" # XXX: custom init script? apcupsd-install: diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile index 8f14b0e8c..5d9f10881 100644 --- a/package/asterisk/Makefile +++ b/package/asterisk/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= asterisk -PKG_VERSION:= 20.9.3 +PKG_VERSION:= 20.11.1 PKG_RELEASE:= 1 -PKG_HASH:= 3d3d3c558f0ca9c3209a6aa7c561c2b85a1ab1b4099d4995f33c917b4cff9ee4 +PKG_HASH:= 5ad25c136c7772f0ad10ae02d59f19b32c0cf64027278e3de6a6314ee24d5ff9 PKG_DESCR:= open source pbx PKG_SECTION:= net/voip PKG_DEPENDS:= libncurses libcurl libopenssl libedit libuuid libjansson diff --git a/package/cfgfs/src/c_lzo1x1.c b/package/cfgfs/src/c_lzo1x1.c index 570f8673c..94cf8322b 100644 --- a/package/cfgfs/src/c_lzo1x1.c +++ b/package/cfgfs/src/c_lzo1x1.c @@ -51,10 +51,10 @@ __RCSID("$MirOS: contrib/hosted/fwcf/c_lzo1x1.c,v 1.5 2007/03/13 18:31:07 tg Exp static void c_lzo1x1_load(void) __attribute__((constructor)); static int c_init(void); static int c_compress(char **, char *, size_t) - __attribute__((bounded (string, 2, 3))); + __attribute__((access (read_only, 2, 3))); static int c_decompress(char *, size_t, char *, size_t) - __attribute__((bounded (string, 1, 2))) - __attribute__((bounded (string, 3, 4))); + __attribute__((access (read_write, 1, 2))) + __attribute__((access (read_only, 3, 4))); static fwcf_compressor c_lzo1x1 = { c_init, /* init */ diff --git a/package/cfgfs/src/c_null.c b/package/cfgfs/src/c_null.c index 4806ae261..718550415 100644 --- a/package/cfgfs/src/c_null.c +++ b/package/cfgfs/src/c_null.c @@ -34,10 +34,10 @@ __RCSID("$MirOS: contrib/hosted/fwcf/c_null.c,v 1.5 2006/09/23 23:46:35 tg Exp $ static void c_null_load(void) __attribute__((constructor)); static int c_init(void); static int c_compress(char **, char *, size_t) - __attribute__((bounded (string, 2, 3))); + __attribute__((access (read_only, 2, 3))); static int c_decompress(char *, size_t, char *, size_t) - __attribute__((bounded (string, 1, 2))) - __attribute__((bounded (string, 3, 4))); + __attribute__((access (read_write, 1, 2))) + __attribute__((access (read_only, 3, 4))); static fwcf_compressor c_null = { c_init, /* init */ diff --git a/package/cfgfs/src/c_zlib.c b/package/cfgfs/src/c_zlib.c index 2285f2eeb..65245d507 100644 --- a/package/cfgfs/src/c_zlib.c +++ b/package/cfgfs/src/c_zlib.c @@ -34,10 +34,10 @@ __RCSID("$MirOS: contrib/hosted/fwcf/c_zlib.c,v 1.4 2006/09/23 23:46:35 tg Exp $ static void c_zlib_load(void) __attribute__((constructor)); static int c_init(void); static int c_compress(char **, char *, size_t) - __attribute__((bounded (string, 2, 3))); + __attribute__((access (read_only, 2, 3))); static int c_decompress(char *, size_t, char *, size_t) - __attribute__((bounded (string, 1, 2))) - __attribute__((bounded (string, 3, 4))); + __attribute__((access (read_write, 1, 2))) + __attribute__((access (read_only, 3, 4))); static fwcf_compressor c_zlib = { c_init, /* init */ diff --git a/package/cfgfs/src/compress.h b/package/cfgfs/src/compress.h index 413075d83..2237595c5 100644 --- a/package/cfgfs/src/compress.h +++ b/package/cfgfs/src/compress.h @@ -18,12 +18,12 @@ typedef int (*fwcf_compress_init_func)(void); /* in: *dst (malloc'd), src, size of source (max. INT_MAX) */ /* returns size of destination on success, -1 on failure */ typedef int (*fwcf_compress_work_func)(char **, char *, size_t) - __attribute__((bounded (string, 2, 3))); + __attribute__((access (read_only, 2, 3))); /* in: dst, max size of dst, src, size of source (max. INT_MAX) */ /* returns size of destination on success, -1 on failure */ typedef int (*fwcf_compress_rev_func)(char *, size_t, char *, size_t) - __attribute__((bounded (string, 1, 2))) - __attribute__((bounded (string, 3, 4))); + __attribute__((access (read_write, 1, 2))) + __attribute__((access (read_only, 3, 4))); typedef struct FWCF_COMPRESSOR { fwcf_compress_init_func init; diff --git a/package/cfgfs/src/ft_pack.c b/package/cfgfs/src/ft_pack.c index 5d04f8b5c..53fd98713 100644 --- a/package/cfgfs/src/ft_pack.c +++ b/package/cfgfs/src/ft_pack.c @@ -21,6 +21,7 @@ * the possibility of such damage or existence of a defect. */ +#define _GNU_SOURCE #include <sys/param.h> #include <sys/stat.h> #include <fcntl.h> diff --git a/package/elfutils/Makefile b/package/elfutils/Makefile index 825ab10eb..231559424 100644 --- a/package/elfutils/Makefile +++ b/package/elfutils/Makefile @@ -4,16 +4,16 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= elfutils -PKG_VERSION:= 0.161 +PKG_VERSION:= 0.189 PKG_RELEASE:= 1 -PKG_HASH:= 570c91a1783fa5386aaa2dfdd08dda1de777c2b63bf3b9c1437d635ffdd7a070 +PKG_HASH:= 39bd8f1a338e2b7cd4abc3ff11a0eddc6e690f69578a57478d8179b4148708c8 PKG_DESCR:= libraries/utilities to handle elf objects (drop in replacement for libelf) PKG_SECTION:= base/libs -PKG_URL:= https://fedorahosted.org/elfutils/ -PKG_SITES:= https://fedorahosted.org/releases/e/l/elfutils/$(PKG_VERSION)/ +PKG_NEEDS:= intl +PKG_SITES:= https://sourceware.org/elfutils/ftp/$(PKG_VERSION)/ # require argp() -PKG_LIBC_DEPENDS:= glibc +PKG_LIBC_DEPENDS:= glibc uclibc-ng DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.bz2 @@ -24,14 +24,16 @@ $(eval $(call PKG_template,ELFUTILS,elfutils,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG # not only because we pass -DNDEBUG, this package won't build with -Werror TARGET_CFLAGS+= -Wno-error +AUTOTOOL_STYLE:= autoreconf +CONFIGURE_ARGS+= --disable-symbol-versioning \ + --disable-debuginfod \ + --disable-libdebuginfod \ + --disable-demangler \ + --disable-progs + elfutils-install: $(INSTALL_DIR) $(IDIR_ELFUTILS)/usr/lib/elfutils $(CP) $(WRKINST)/usr/lib/lib{asm,dw,elf}*.so* \ $(IDIR_ELFUTILS)/usr/lib - $(CP) $(WRKINST)/usr/lib/elfutils/libebl*.so \ - $(IDIR_ELFUTILS)/usr/lib/elfutils - $(INSTALL_DIR) $(IDIR_ELFUTILS)/usr/bin - $(INSTALL_BIN) $(WRKINST)/usr/bin/* \ - $(IDIR_ELFUTILS)/usr/bin include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/elfutils/patches/patch-Makefile_am b/package/elfutils/patches/patch-Makefile_am new file mode 100644 index 000000000..579e76113 --- /dev/null +++ b/package/elfutils/patches/patch-Makefile_am @@ -0,0 +1,16 @@ +--- elfutils-0.189.orig/Makefile.am 2023-03-03 16:42:26.000000000 +0100 ++++ elfutils-0.189/Makefile.am 2025-01-08 20:12:14.302360288 +0100 +@@ -26,8 +26,12 @@ AM_MAKEFLAGS = --no-print-directory + + pkginclude_HEADERS = version.h + ++if ENABLE_PROGS ++PROGS_SUBDIR = src ++endif ++ + SUBDIRS = config lib libelf libcpu backends libebl libdwelf libdwfl libdw \ +- libasm debuginfod src po doc tests ++ libasm debuginfod $(PROGS_SUBDIR) po doc tests + + EXTRA_DIST = elfutils.spec GPG-KEY NOTES CONTRIBUTING \ + COPYING COPYING-GPLV2 COPYING-LGPLV3 diff --git a/package/elfutils/patches/patch-configure_ac b/package/elfutils/patches/patch-configure_ac new file mode 100644 index 000000000..40b65da79 --- /dev/null +++ b/package/elfutils/patches/patch-configure_ac @@ -0,0 +1,24 @@ +--- elfutils-0.189.orig/configure.ac 2023-03-03 16:42:26.000000000 +0100 ++++ elfutils-0.189/configure.ac 2025-01-08 20:12:14.302360288 +0100 +@@ -422,6 +422,12 @@ AS_HELP_STRING([--enable-tests-rpath],[b + [tests_use_rpath=$enableval], [tests_use_rpath=no]) + AM_CONDITIONAL(TESTS_RPATH, test "$tests_use_rpath" = yes) + ++AC_ARG_ENABLE([progs], ++ AS_HELP_STRING([--enable-progs], [enable progs]), ++ enable_progs=$enableval, ++ enable_progs=yes) ++AM_CONDITIONAL(ENABLE_PROGS, test "$enable_progs" = yes) ++ + dnl zlib is mandatory. + save_LIBS="$LIBS" + LIBS= +@@ -659,7 +665,7 @@ saved_LIBS="$LIBS" + AC_SEARCH_LIBS([_obstack_free], [obstack]) + LIBS="$saved_LIBS" + case "$ac_cv_search__obstack_free" in +- no) AC_MSG_FAILURE([failed to find _obstack_free]) ;; ++ no) obstack_LIBS= ;; + -l*) obstack_LIBS="$ac_cv_search__obstack_free" ;; + *) obstack_LIBS= ;; + esac diff --git a/package/json-c/patches/patch-arraylist_c b/package/json-c/patches/patch-arraylist_c new file mode 100644 index 000000000..6143e8fd8 --- /dev/null +++ b/package/json-c/patches/patch-arraylist_c @@ -0,0 +1,17 @@ + Fix for gcc-14 + + Upstream did not just fix this, but delay (the implicit) memset() in + commit 4a546e7b2f471 ("In arraylist, use malloc instead of calloc, + avoid clearing with memeset until we really need to, and micro-optimize + array_list_add().") which is not suitable for a backport. +--- json-c-0.13.orig/arraylist.c 2017-11-30 05:41:30.000000000 +0100 ++++ json-c-0.13/arraylist.c 2025-01-08 02:21:28.914179381 +0100 +@@ -46,7 +46,7 @@ array_list_new(array_list_free_fn *free_ + arr->size = ARRAY_LIST_DEFAULT_SIZE; + arr->length = 0; + arr->free_fn = free_fn; +- if(!(arr->array = (void**)calloc(sizeof(void*), arr->size))) { ++ if(!(arr->array = (void**)calloc(arr->size, sizeof(void*)))) { + free(arr); + return NULL; + } diff --git a/package/json-c/patches/patch-json_object_c b/package/json-c/patches/patch-json_object_c new file mode 100644 index 000000000..09b93743e --- /dev/null +++ b/package/json-c/patches/patch-json_object_c @@ -0,0 +1,17 @@ + Fix for gcc-14 + + Upstream did not just fix this, but delay (the implicit) memset() in + commit 4a546e7b2f471 ("In arraylist, use malloc instead of calloc, + avoid clearing with memeset until we really need to, and micro-optimize + array_list_add().") which is not suitable for a backport. +--- json-c-0.13.orig/json_object.c 2017-12-05 05:44:03.000000000 +0100 ++++ json-c-0.13/json_object.c 2025-01-08 02:21:42.515180709 +0100 +@@ -218,7 +218,7 @@ static struct json_object* json_object_n + { + struct json_object *jso; + +- jso = (struct json_object*)calloc(sizeof(struct json_object), 1); ++ jso = (struct json_object*)calloc(1, sizeof(struct json_object)); + if (!jso) + return NULL; + jso->o_type = o_type; diff --git a/package/libelf/Makefile b/package/libelf/Makefile deleted file mode 100644 index 708b3bbd7..000000000 --- a/package/libelf/Makefile +++ /dev/null @@ -1,31 +0,0 @@ -# This file is part of the OpenADK project. OpenADK is copyrighted -# material, please see the LICENCE file in the top-level directory. - -include ${ADK_TOPDIR}/rules.mk - -PKG_NAME:= libelf -PKG_VERSION:= 0.8.13 -PKG_RELEASE:= 1 -PKG_HASH:= 591a9b4ec81c1f2042a97aa60564e0cb79d041c52faa7416acb38bc95bd2c76d -PKG_DESCR:= elf library -PKG_SECTION:= libs/misc -PKG_SITES:= http://www.mr511.de/software/ -PKG_OPTS:= dev - -DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz - -include ${ADK_TOPDIR}/mk/package.mk - -$(eval $(call PKG_template,LIBELF,libelf,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) - -CONFIGURE_ENV+= mr_cv_target_elf=yes \ - ac_cv_sizeof_long_long=8 -CONFIGURE_ARGS+= --enable-elf64=yes \ - --disable-sanity-checks -FAKE_FLAGS+= instroot="${WRKINST}" - -libelf-install: - ${INSTALL_DIR} ${IDIR_LIBELF}/usr/lib - ${CP} ${WRKINST}/usr/lib/libelf.so* ${IDIR_LIBELF}/usr/lib/ - -include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libelf/patches/patch-lib_Makefile_in b/package/libelf/patches/patch-lib_Makefile_in deleted file mode 100644 index 7630c7f5c..000000000 --- a/package/libelf/patches/patch-lib_Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ ---- libelf-0.8.13.orig/lib/Makefile.in 2009-11-01 14:04:19.000000000 +0100 -+++ libelf-0.8.13/lib/Makefile.in 2011-01-15 21:55:08.000000000 +0100 -@@ -158,7 +158,7 @@ libelf.a: $(OBJS) $(LIBOBJS) - - $(SHLIB): libelf.a - @$(RM) $(SHLIB) -- $(LINK_SHLIB) -o $(SHLIB) $(OBJS:.o=.os) $(LIBOBJS:.o=.os) $(DEPSHLIBS) -+ $(LINK_SHLIB) $(LDFLAGS) -o $(SHLIB) $(OBJS:.o=.os) $(LIBOBJS:.o=.os) $(DEPSHLIBS) - if test "$(SONAME)" = "$(SHLIB)"; then true; else \ - $(RM) $(SONAME) && $(LN_S) $(SHLIB) $(SONAME); \ - fi diff --git a/package/linux-atm/patches/patch-src_ilmid_io_c b/package/linux-atm/patches/patch-src_ilmid_io_c deleted file mode 100644 index 9b88b0b49..000000000 --- a/package/linux-atm/patches/patch-src_ilmid_io_c +++ /dev/null @@ -1,15 +0,0 @@ ---- linux-atm-2.5.1.orig/src/ilmid/io.c 2007-07-11 18:07:57.000000000 +0200 -+++ linux-atm-2.5.1/src/ilmid/io.c 2013-08-15 21:40:35.168523713 +0200 -@@ -48,6 +48,12 @@ - be manually configured (after ilmid has - registered the "official" address) - HACK */ - -+#ifndef SUN_LEN -+# include <string.h> /* For prototype of `strlen'. */ -+ /* Evaluate to actual length of the `sockaddr_un' structure. */ -+# define SUN_LEN(ptr) ((size_t) (((struct sockaddr_un *) 0)->sun_path) + strlen ((ptr)->sun_path)) -+#endif -+ - extern SysGroup *remsys; - extern State ilmi_state; - static short atm_itf = -1; /* bad value */ diff --git a/package/linux-atm/patches/patch-src_mpoad_io_c b/package/linux-atm/patches/patch-src_mpoad_io_c deleted file mode 100644 index 14dd75d00..000000000 --- a/package/linux-atm/patches/patch-src_mpoad_io_c +++ /dev/null @@ -1,18 +0,0 @@ ---- linux-atm-2.5.1.orig/src/mpoad/io.c 2007-12-11 18:46:12.000000000 +0100 -+++ linux-atm-2.5.1/src/mpoad/io.c 2013-08-17 14:41:53.542968628 +0200 -@@ -10,14 +10,7 @@ - #include <errno.h> - #include <sys/ioctl.h> - #include <sys/param.h> /* for OPEN_MAX */ --#if __GLIBC__ >= 2 --#include <sys/poll.h> --#else /* ugly hack to make it compile on RH 4.2 - WA */ --#include <syscall.h> --#include <linux/poll.h> --#define SYS_poll 168 --_syscall3(int,poll,struct pollfd *,ufds,unsigned int,nfds,int,timeout); --#endif -+#include <poll.h> - #include <atm.h> - #include <linux/types.h> - #include <linux/atmioc.h> diff --git a/package/linux-atm/patches/patch-src_sigd_atmsigd_c b/package/linux-atm/patches/patch-src_sigd_atmsigd_c deleted file mode 100644 index 7eb31abf9..000000000 --- a/package/linux-atm/patches/patch-src_sigd_atmsigd_c +++ /dev/null @@ -1,11 +0,0 @@ ---- linux-atm-2.5.1.orig/src/sigd/atmsigd.c 2004-09-25 13:25:48.000000000 +0200 -+++ linux-atm-2.5.1/src/sigd/atmsigd.c 2013-08-15 21:22:05.226477574 +0200 -@@ -517,7 +517,7 @@ int main(int argc,char **argv) - exit(0); - } - } -- (void) on_exit(trace_on_exit,NULL); -+ (void) atexit(trace_on_exit); - poll_loop(); - close_all(); - for (sig = entities; sig; sig = sig->next) stop_saal(&sig->saal); diff --git a/package/ltrace/Makefile b/package/ltrace/Makefile index c26099d09..1ce0e48c1 100644 --- a/package/ltrace/Makefile +++ b/package/ltrace/Makefile @@ -9,8 +9,8 @@ PKG_RELEASE:= 1 PKG_HASH:= 0e6f8c077471b544c06def7192d983861ad2f8688dd5504beae62f0c5f5b9503 PKG_DESCR:= intercepts and records dynamic library calls PKG_SECTION:= app/debug -PKG_DEPENDS:= libelf -PKG_BUILDDEP:= libelf +PKG_DEPENDS:= elfutils +PKG_BUILDDEP:= elfutils PKG_NEEDS:= c++ PKG_URL:= http://ltrace.org/ PKG_SITES:= http://www.ltrace.org/ diff --git a/package/make/Makefile b/package/make/Makefile index ee584771a..3a130489c 100644 --- a/package/make/Makefile +++ b/package/make/Makefile @@ -9,8 +9,8 @@ PKG_RELEASE:= 1 PKG_HASH:= dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3 PKG_DESCR:= c/c++ code buildtool PKG_SECTION:= dev/tools -PKG_DEPENDS:= libelf -PKG_BUILDDEP:= libelf +PKG_DEPENDS:= elfutils +PKG_BUILDDEP:= elfutils PKG_URL:= http://www.gnu.org/software/make PKG_SITES:= ${MASTER_SITE_GNU:=make/} diff --git a/package/minidlna/Makefile b/package/minidlna/Makefile new file mode 100644 index 000000000..2a51c978d --- /dev/null +++ b/package/minidlna/Makefile @@ -0,0 +1,29 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(ADK_TOPDIR)/rules.mk + +PKG_NAME:= minidlna +PKG_VERSION:= 1.3.3 +PKG_RELEASE:= 1 +PKG_HASH:= 39026c6d4a139b9180192d1c37225aa3376fdf4f1a74d7debbdbb693d996afa4 +PKG_DESCR:= DLNA/UPnP-AV compliant media server +PKG_SECTION:= mm/video +PKG_DEPENDS:= libffmpeg libjpeg-turbo libexif libid3tag libogg libflac libvorbis libsqlite libiconv +PKG_BUILDDEP:= ffmpeg libjpeg-turbo libexif libid3tag libogg flac libvorbis sqlite libiconv +PKG_URL:= http://sourceforge.net/projects/minidlna/ +PKG_SITES:= $(MASTER_SITE_SOURCEFORGE:=minidlna/) +DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,MINIDLNA,minidlna,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) + +minidlna-install: + $(INSTALL_DIR) $(IDIR_MINIDLNA)/usr/sbin + $(INSTALL_BIN) $(WRKINST)/usr/sbin/minidlnad \ + $(IDIR_MINIDLNA)/usr/sbin + $(INSTALL_DIR) $(IDIR_MINIDLNA)/etc/ + $(INSTALL_DATA) $(WRKSRC)/minidlna.conf $(IDIR_MINIDLNA)/etc/ + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/minidlna/files/minidlna.init b/package/minidlna/files/minidlna.init new file mode 100644 index 000000000..c4a1fe795 --- /dev/null +++ b/package/minidlna/files/minidlna.init @@ -0,0 +1,36 @@ +#!/bin/sh +#PKG minidlna +#INIT 60 +. /etc/rc.conf + +pidfile=$(echo "$minidlna_flags" | sed -n 's/.*-P \([^ ]\+\).*/\1/p') +[ "$pidfile" ] || pidfile="/var/run/minidlna/minidlna.pid" + +case $1 in +autostop) ;; +autostart) + test x"${minidlna:-NO}" = x"NO" && exit 0 + test x"$minidlna" = x"DAEMON" && test -x /bin/mksh && exec mksh -T- $0 start + exec sh $0 start + ;; +start) + /usr/sbin/minidlnad $minidlna_flags + ;; +stop) + if [ -f "$pidfile" ]; then + kill $(<$pidfile) + rm $pidfile + else + kill $(pgrep -f /usr/sbin/minidlnad) + fi + ;; +restart) + sh $0 stop + sleep 1 + sh $0 start + ;; +*) + echo "usage: $0 (start | stop | restart)" + exit 1 +esac +exit $? diff --git a/package/minidlna/files/minidlna.postinst b/package/minidlna/files/minidlna.postinst new file mode 100644 index 000000000..6c14ff1e8 --- /dev/null +++ b/package/minidlna/files/minidlna.postinst @@ -0,0 +1,3 @@ +#!/bin/sh +. $IPKG_INSTROOT/etc/functions.sh +add_rcconf minidlna NO diff --git a/package/minidlna/patches/0001-log-Try-syslog-if-no-log-path-was-given.patch b/package/minidlna/patches/0001-log-Try-syslog-if-no-log-path-was-given.patch new file mode 100644 index 000000000..c42c28097 --- /dev/null +++ b/package/minidlna/patches/0001-log-Try-syslog-if-no-log-path-was-given.patch @@ -0,0 +1,104 @@ +From 989841a0c4e83b0ac1b9d276be3797bcfa83bcb1 Mon Sep 17 00:00:00 2001 +From: Phil Sutter <phil@nwl.cc> +Date: Sun, 27 Nov 2022 23:45:41 +0100 +Subject: [PATCH] log: Try syslog if no log path was given + +Signed-off-by: Phil Sutter <phil@nwl.cc> +--- + log.c | 44 ++++++++++++++++++++++++++++++++++++++++++-- + minidlna.c | 2 -- + 2 files changed, 42 insertions(+), 4 deletions(-) + +diff --git a/log.c b/log.c +index a989904a24d93..840a8c02e678b 100644 +--- a/log.c ++++ b/log.c +@@ -23,6 +23,7 @@ + #include <stdio.h> + #include <stdarg.h> + #include <string.h> ++#include <syslog.h> + #include <time.h> + + #include "upnpglobalvars.h" +@@ -147,6 +148,40 @@ log_init(const char *debug) + return 0; + } + ++static int ++syslog_err(int level, enum _log_facility facility, ++ char *fname, int lineno, char *fmt, va_list *ap) ++{ ++ char myfmt[1024]; ++ int level_to_syslog[E_MAXDEBUG + 1] = { ++ /* [E_OFF] = 0, */ ++ [E_FATAL] = LOG_CRIT, ++ [E_ERROR] = LOG_ERR, ++ [E_WARN] = LOG_WARNING, ++ [E_INFO] = LOG_NOTICE, ++ [E_DEBUG] = LOG_INFO, ++ [E_MAXDEBUG] = LOG_DEBUG, ++ }; ++ ++ if (level == E_OFF) ++ return 0; ++ ++ if (level > E_MAXDEBUG) ++ return -1; ++ ++ if (level) ++ snprintf(myfmt, 1024, "%s:%d: %s: %s", fname, lineno, level_name[level], fmt); ++ else ++ snprintf(myfmt, 1024, "%s:%d: %s", fname, lineno, fmt); ++ ++ vsyslog(level_to_syslog[level], myfmt, *ap); ++ ++ if (level == E_FATAL) ++ exit(-1); ++ ++ return 0; ++} ++ + void + log_err(int level, enum _log_facility facility, char *fname, int lineno, char *fmt, ...) + { +@@ -155,8 +190,14 @@ log_err(int level, enum _log_facility facility, char *fname, int lineno, char *f + if (level && level>log_level[facility] && level>E_FATAL) + return; + +- if (!log_fp) ++ va_start(ap, fmt); ++ if (!log_fp) { ++ if (!syslog_err(level, facility, fname, lineno, fmt, &ap)) { ++ va_end(ap); ++ return; ++ } + log_fp = stdout; ++ } + + // timestamp + if (!GETFLAG(SYSTEMD_MASK)) +@@ -176,7 +217,6 @@ log_err(int level, enum _log_facility facility, char *fname, int lineno, char *f + fprintf(log_fp, "%s:%d: ", fname, lineno); + + // user log +- va_start(ap, fmt); + if (vfprintf(log_fp, fmt, ap) == -1) + { + va_end(ap); +diff --git a/minidlna.c b/minidlna.c +index 999adee977353..db29d603d1e28 100644 +--- a/minidlna.c ++++ b/minidlna.c +@@ -817,8 +817,6 @@ init(int argc, char **argv) + optionsfile); + } + } +- if (!log_path[0]) +- strncpyt(log_path, DEFAULT_LOG_PATH, sizeof(log_path)); + if (!db_path[0]) + strncpyt(db_path, DEFAULT_DB_PATH, sizeof(db_path)); + +-- +2.38.1 + diff --git a/package/ndisc6/patches/patch-src_traceroute_h b/package/ndisc6/patches/patch-src_traceroute_h index d47efc0c3..1571df884 100644 --- a/package/ndisc6/patches/patch-src_traceroute_h +++ b/package/ndisc6/patches/patch-src_traceroute_h @@ -8,9 +8,9 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ -typedef ssize_t (*trace_parser_t) (const void *restrict data, size_t len, - int *restrict ttl, - unsigned *restrict n, uint16_t port); -+typedef ssize_t (*trace_parser_t) (const data, size_t len, -+ int ttl, -+ unsigned n, uint16_t port); ++typedef ssize_t (*trace_parser_t) (const void *data, size_t len, ++ int *ttl, ++ unsigned *n, uint16_t port); typedef struct tracetype { diff --git a/package/net-snmp/Makefile b/package/net-snmp/Makefile index 58188d011..748d6ac6d 100644 --- a/package/net-snmp/Makefile +++ b/package/net-snmp/Makefile @@ -9,8 +9,8 @@ PKG_RELEASE:= 1 PKG_HASH:= b2fc3500840ebe532734c4786b0da4ef0a5f67e51ef4c86b3345d697e4976adf PKG_DESCR:= snmp agent PKG_SECTION:= net/misc -PKG_DEPENDS:= libnetsnmp libelf libnl -PKG_BUILDDEP:= libelf libnl +PKG_DEPENDS:= libnetsnmp elfutils libnl +PKG_BUILDDEP:= elfutils libnl PKG_URL:= http://www.net-snmp.org/ PKG_SITES:= $(MASTER_SITE_SOURCEFORGE:=net-snmp/) PKG_NOPARALLEL:= 1 @@ -21,9 +21,9 @@ DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SUBPKGS:= SNMPD SNMP_UTILS LIBNETSNMP PKGSD_SNMP_UTILS:= snmp utilities -PKGSS_SNMP_UTILS:= libnetsnmp libelf +PKGSS_SNMP_UTILS:= libnetsnmp elfutils PKGSD_LIBNETSNMP:= snmp library -PKGSS_LIBNETSNMP:= libelf +PKGSS_LIBNETSNMP:= elfutils PKGSC_LIBNETSNMP:= libs/net PKG_FLAVOURS_SNMPD:= WITH_IPV6 diff --git a/package/rsync/Makefile b/package/rsync/Makefile index 508e7d9f6..b18291929 100644 --- a/package/rsync/Makefile +++ b/package/rsync/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= rsync -PKG_VERSION:= 3.2.7 +PKG_VERSION:= 3.4.1 PKG_RELEASE:= 1 -PKG_HASH:= 4e7d9d3f6ed10878c58c5fb724a67dacf4b6aac7340b13e488fb2dc41346f2bb +PKG_HASH:= 2924bcb3a1ed8b551fc101f740b9f0fe0a202b115027647cf69850d65fd88c52 PKG_DESCR:= utility that provides fast incremental file transfer PKG_SECTION:= net/misc PKG_DEPENDS:= libpopt libopenssl @@ -28,7 +28,6 @@ HOST_CONFIGURE_ARGS:= --disable-xxhash \ --disable-lz4 CONFIGURE_ARGS:= --disable-xxhash \ --disable-zstd \ - --disable-simd \ --disable-lz4 rsync-install: diff --git a/package/screen/Makefile b/package/screen/Makefile index ce436e084..a5dbf8043 100644 --- a/package/screen/Makefile +++ b/package/screen/Makefile @@ -9,8 +9,8 @@ PKG_RELEASE:= 1 PKG_HASH:= f04a39d00a0e5c7c86a55338808903082ad5df4d73df1a2fd3425976aed94971 PKG_DESCR:= window manager for the terminal session PKG_SECTION:= sys/utils -PKG_DEPENDS:= libncurses libelf -PKG_BUILDDEP:= ncurses libelf +PKG_DEPENDS:= libncurses elfutils +PKG_BUILDDEP:= ncurses elfutils PKG_NEEDS:= mmu PKG_URL:= http://www.gnu.org/software/screen/ PKG_SITES:= ${MASTER_SITE_GNU:=screen/} |