diff options
Diffstat (limited to 'package')
47 files changed, 249 insertions, 157 deletions
diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile index 2490a7d12..8f14b0e8c 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.2 +PKG_VERSION:= 20.9.3 PKG_RELEASE:= 1 -PKG_HASH:= acc85a66f3b2a0e2784f4c551b8b0241a2393c47ff353543ae63b5dcf434b1ca +PKG_HASH:= 3d3d3c558f0ca9c3209a6aa7c561c2b85a1ab1b4099d4995f33c917b4cff9ee4 PKG_DESCR:= open source pbx PKG_SECTION:= net/voip PKG_DEPENDS:= libncurses libcurl libopenssl libedit libuuid libjansson @@ -53,7 +53,6 @@ $(eval $(call PKG_template,ASTERISK_PBX_DUNDI,asterisk-pbx-dundi,$(PKG_VERSION)- $(eval $(call PKG_template,ASTERISK_RES_AGI,asterisk-res-agi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_ASTERISK_RES_AGI},${PKG_SECTION})) CONFIGURE_ARGS= --with-z=${STAGING_TARGET_DIR}/usr \ - --with-ncurses=${STAGING_TARGET_DIR}/usr \ --with-libedit=${STAGING_TARGET_DIR}/usr \ --with-jansson=${STAGING_TARGET_DIR}/usr \ --with-ssl=${STAGING_TARGET_DIR}/usr \ @@ -61,17 +60,14 @@ CONFIGURE_ARGS= --with-z=${STAGING_TARGET_DIR}/usr \ --without-tonezone \ --without-asound \ --without-gtk2 \ - --without-h323 \ --without-iksemel \ --without-imap \ --without-netsnmp \ --without-newt \ - --without-openais \ --without-osptk \ - --without-oss \ --without-popt \ + --without-portaudio \ --without-pri \ - --without-pwlib \ --without-tds \ --without-postgres @@ -97,9 +93,9 @@ endif INSTALL_STYLE:= manual -TARGET_CFLAGS+= -fgnu89-inline TARGET_LDFLAGS+= -lm -ltinfo -ldl -lpthread -MAKE_ENV= ASTCFLAGS="${TARGET_CPPFLAGS} -DHAVE_STRTOQ" \ +MAKE_ENV:= PATH="$(HOST_PATH)" \ + ASTCFLAGS="${TARGET_CPPFLAGS} -DHAVE_STRTOQ" \ ASTLDFLAGS="${TARGET_LDFLAGS} -z muldefs" MAKE_FLAGS+= DESTDIR="$(WRKINST)" \ OPTIMIZE="${TARGET_CFLAGS}" \ @@ -107,10 +103,10 @@ MAKE_FLAGS+= DESTDIR="$(WRKINST)" \ ALL_TARGET:= all install samples pre-configure: - cd "$(WRKBUILD)/menuselect"; ./configure + cd "$(WRKBUILD)/menuselect"; PATH="$(HOST_PATH)" ./configure pre-build: - $(MAKE) -C $(WRKBUILD)/menuselect + PATH="$(HOST_PATH)" $(MAKE) -C $(WRKBUILD)/menuselect #post-build: # cd ${WRKBUILD}/sounds ; \ diff --git a/package/bind/Makefile b/package/bind/Makefile index 9bcc8b00d..ac208569d 100644 --- a/package/bind/Makefile +++ b/package/bind/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= bind -PKG_VERSION:= 9.18.28 +PKG_VERSION:= 9.18.30 PKG_RELEASE:= 1 -PKG_HASH:= e7cce9a165f7b619eefc4832f0a8dc16b005d29e3890aed6008c506ea286a5e7 +PKG_HASH:= 9f6817640970267317e5aa143ecf70531040f2155636b1a63ea45379aa09034a PKG_DESCR:= dns server PKG_SECTION:= net/dns PKG_DEPENDS:= libxml2 libopenssl libuv openssl-util diff --git a/package/curl/Makefile b/package/curl/Makefile index 20ddc19b4..cfd7748f6 100644 --- a/package/curl/Makefile +++ b/package/curl/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= curl -PKG_VERSION:= 8.9.0 +PKG_VERSION:= 8.10.1 PKG_RELEASE:= 1 -PKG_HASH:= ff09b2791ca56d25fd5c3f3a4927dce7c8a9dc4182200c487ca889fba1fdd412 +PKG_HASH:= 73a4b0e99596a09fa5924a4fb7e4b995a85fda0d18a2c02ab9cf134bebce04ee PKG_DESCR:= client-side url transfer tool PKG_SECTION:= net/http PKG_BUILDDEP:= zlib diff --git a/package/firefox/Makefile b/package/firefox/Makefile index eb3cfeb9e..93a0199cb 100644 --- a/package/firefox/Makefile +++ b/package/firefox/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= firefox -PKG_VERSION:= 108.0.1 +PKG_VERSION:= 129.0.2 PKG_RELEASE:= 1 -PKG_HASH:= 9821ac130dad01383e03276bf6cc92d41329d351da1fa7fa238168f8890611ea +PKG_HASH:= 35a1da121af474833d013ecbc1f77aa55bb35678fe06d438842d320dfab3f344 PKG_DESCR:= www browser PKG_SECTION:= app/browser PKG_DEPENDS:= pango libfreetype fontconfig libxcomposite libxcursor @@ -41,7 +41,9 @@ CONFIGURE_ARGS+= --prefix=/usr \ --disable-audio-backends \ --without-wasm-sandboxed-libraries \ --disable-profiling \ - --with-clang-path=/usr/bin/clang-13 + --disable-crashreporter \ + --with-clang-path=/usr/bin/clang-18 \ + --with-libclang-path=/usr/lib/llvm-18/lib firefox-install: $(INSTALL_DIR) $(IDIR_FIREFOX)/usr/bin diff --git a/package/firefox/patches/patch-build_moz_configure_flags_configure b/package/firefox/patches/patch-build_moz_configure_flags_configure new file mode 100644 index 000000000..c0ac77a7c --- /dev/null +++ b/package/firefox/patches/patch-build_moz_configure_flags_configure @@ -0,0 +1,13 @@ +--- firefox-129.0.2.orig/build/moz.configure/flags.configure 2024-08-19 21:21:42.000000000 +0200 ++++ firefox-129.0.2/build/moz.configure/flags.configure 2024-09-08 06:27:20.661198142 +0200 +@@ -72,10 +72,6 @@ def link_libstdcxx_statically( + ) + + +-@depends(when=link_libstdcxx_statically) +-def check_libstdcxx_linkage(): +- die("Firefox does not support linking statically with libstdc++") +- + + check_and_add_flag( + "-mieee", diff --git a/package/firefox/patches/patch-servo_components_style_traits_values_rs b/package/firefox/patches/patch-servo_components_style_traits_values_rs new file mode 100644 index 000000000..cc02de658 --- /dev/null +++ b/package/firefox/patches/patch-servo_components_style_traits_values_rs @@ -0,0 +1,37 @@ +--- firefox-129.0.2.orig/servo/components/style_traits/values.rs 2024-08-19 21:21:51.000000000 +0200 ++++ firefox-129.0.2/servo/components/style_traits/values.rs 2024-09-08 06:18:31.271680673 +0200 +@@ -388,11 +388,11 @@ impl Separator for Space { + where + F: for<'tt> FnMut(&mut Parser<'i, 'tt>) -> Result<T, ParseError<'i, E>>, + { +- input.skip_whitespace(); // Unnecessary for correctness, but may help try() rewind less. ++ input.skip_whitespace(); // Unnecessary for correctness, but may help try_parse() rewind less. + let mut results = vec![parse_one(input)?]; + loop { +- input.skip_whitespace(); // Unnecessary for correctness, but may help try() rewind less. +- if let Ok(item) = input.try(&mut parse_one) { ++ input.skip_whitespace(); // Unnecessary for correctness, but may help try_parse() rewind less. ++ if let Ok(item) = input.try_parse(&mut parse_one) { + results.push(item); + } else { + return Ok(results); +@@ -413,14 +413,14 @@ impl Separator for CommaWithSpace { + where + F: for<'tt> FnMut(&mut Parser<'i, 'tt>) -> Result<T, ParseError<'i, E>>, + { +- input.skip_whitespace(); // Unnecessary for correctness, but may help try() rewind less. ++ input.skip_whitespace(); // Unnecessary for correctness, but may help try_parse() rewind less. + let mut results = vec![parse_one(input)?]; + loop { +- input.skip_whitespace(); // Unnecessary for correctness, but may help try() rewind less. ++ input.skip_whitespace(); // Unnecessary for correctness, but may help try_parse() rewind less. + let comma_location = input.current_source_location(); +- let comma = input.try(|i| i.expect_comma()).is_ok(); +- input.skip_whitespace(); // Unnecessary for correctness, but may help try() rewind less. +- if let Ok(item) = input.try(&mut parse_one) { ++ let comma = input.try_parse(|i| i.expect_comma()).is_ok(); ++ input.skip_whitespace(); // Unnecessary for correctness, but may help try_parse() rewind less. ++ if let Ok(item) = input.try_parse(&mut parse_one) { + results.push(item); + } else if comma { + return Err(comma_location.new_unexpected_token_error(Token::Comma)); diff --git a/package/firefox/patches/patch-servo_ports_geckolib_cbindgen_toml b/package/firefox/patches/patch-servo_ports_geckolib_cbindgen_toml new file mode 100644 index 000000000..7cf9a3d17 --- /dev/null +++ b/package/firefox/patches/patch-servo_ports_geckolib_cbindgen_toml @@ -0,0 +1,10 @@ +--- firefox-129.0.2.orig/servo/ports/geckolib/cbindgen.toml 2024-08-19 21:21:52.000000000 +0200 ++++ firefox-129.0.2/servo/ports/geckolib/cbindgen.toml 2024-09-08 06:18:31.275680774 +0200 +@@ -360,7 +360,6 @@ renaming_overrides_prefixing = true + "Keyframe" = "Keyframe" + "nsChangeHint" = "nsChangeHint" + "ServoElementSnapshotTable" = "ServoElementSnapshotTable" +-"Keyframe" = "Keyframe" + "ComputedKeyframeValues" = "ComputedKeyframeValues" + "OriginFlags" = "OriginFlags" + "ServoTraversalFlags" = "ServoTraversalFlags" diff --git a/package/gdk-pixbuf/Makefile b/package/gdk-pixbuf/Makefile index ee6d9c043..058134b26 100644 --- a/package/gdk-pixbuf/Makefile +++ b/package/gdk-pixbuf/Makefile @@ -23,7 +23,7 @@ $(eval $(call HOST_template,GDK_PIXBUF,gdk-pixbuf,$(PKG_VERSION)-$(PKG_RELEASE)) $(eval $(call PKG_template,GDK_PIXBUF,gdk-pixbuf,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) HOST_STYLE:= auto -HOST_LDFLAGS+= -lffi -lz -ldl -lresolv -liconv -lmount +HOST_LDFLAGS+= -lz -ldl -lresolv -liconv -lmount -lffi HOST_CONFIGURE_ARGS+= --disable-glibtest \ --without-libjpeg \ --without-libpng \ diff --git a/package/git/Makefile b/package/git/Makefile index 22d678e6f..7e520abee 100644 --- a/package/git/Makefile +++ b/package/git/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= git -PKG_VERSION:= 2.45.1 +PKG_VERSION:= 2.47.0 PKG_RELEASE:= 1 -PKG_HASH:= e64d340a8e627ae22cfb8bcc651cca0b497cf1e9fdf523735544ff4a732f12bf +PKG_HASH:= 1ce114da88704271b43e027c51e04d9399f8c88e9ef7542dae7aebae7d87bc4e PKG_DESCR:= fast version control system PKG_SECTION:= dev/scm PKG_BUILDDEP:= zlib curl expat @@ -15,13 +15,13 @@ PKG_NEEDS:= threads PKG_URL:= http://git-scm.com/ PKG_SITES:= https://www.kernel.org/pub/software/scm/git/ -PKG_CHOICES_GIT:= WITH_LIBRESSL WITH_OPENSSL -PKGCD_WITH_LIBRESSL:= use libressl for crypto -PKGCB_WITH_LIBRESSL:= libressl -PKGCS_WITH_LIBRESSL:= libressl +PKG_CHOICES_GIT:= WITH_OPENSSL WITH_LIBRESSL PKGCD_WITH_OPENSSL:= use openssl for crypto PKGCB_WITH_OPENSSL:= openssl PKGCS_WITH_OPENSSL:= libopenssl +PKGCD_WITH_LIBRESSL:= use libressl for crypto +PKGCB_WITH_LIBRESSL:= libressl +PKGCS_WITH_LIBRESSL:= libressl include $(ADK_TOPDIR)/mk/package.mk diff --git a/package/glib/Makefile b/package/glib/Makefile index eb77cf8fe..f83648bae 100644 --- a/package/glib/Makefile +++ b/package/glib/Makefile @@ -10,8 +10,8 @@ PKG_EXTRAVER:= 2.78 PKG_HASH:= 24b8e0672dca120cc32d394bccb85844e732e04fe75d18bb0573b2dbc7548f63 PKG_DESCR:= low-level core library that forms the basis of gtk+ PKG_SECTION:= libs/misc -PKG_DEPENDS:= pcre2 zlib libffi -PKG_BUILDDEP:= glib-host util-linux libffi zlib dbus pcre2 +PKG_DEPENDS:= pcre2 zlib libffi libiconv +PKG_BUILDDEP:= glib-host util-linux libffi zlib dbus pcre2 libiconv HOST_BUILDDEP:= pkgconf-host libiconv-host libffi-host python3-host gettext-host util-linux-host HOST_BUILDDEP+= pcre2-host meson-host PKG_NEEDS:= threads intl iconv @@ -28,29 +28,23 @@ $(eval $(call PKG_template,GLIB,glib,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS HOSTWRKBUILD= $(WRKSRC) WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj -HOST_CONFIG_STYLE:= manual -HOST_STYLE:= manual +HOST_STYLE:= meson +HOST_INSTALL_STYLE:= meson + CONFIG_STYLE:= meson BUILD_STYLE:= meson INSTALL_STYLE:= meson +HOST_MESON_FLAGS:= --default-library static -Dtests=false -Dxattr=false -Doss_fuzz=disabled MESON_FLAGS:= -Dtests=false -Dxattr=false -Doss_fuzz=disabled -host-configure: - (cd $(HOSTWRKBUILD) && PATH='$(HOST_PATH)' meson setup --prefix $(STAGING_HOST_DIR)/usr _build) - -host-build: - (cd $(HOSTWRKBUILD) && PATH='$(HOST_PATH)' meson compile -C _build) - -glib-hostinstall: - (cd $(HOSTWRKBUILD) && PATH='$(HOST_PATH)' meson install -C _build) - -do-configure: - (cd $(WRKBUILD) && PATH='$(HOST_PATH)' meson setup --prefix /usr \ - --libdir lib --cross-file $(STAGING_HOST_DIR)/etc/meson/cross-compilation.conf -Dtests=false _build) - -do-build: - (cd $(WRKBUILD) && PATH='$(HOST_PATH)' meson compile -C _build) +hostpost-install: + $(CP) $(HOSTWRKBUILD)/../glib-obj/meson-private/glib-2.0.pc \ + $(STAGING_HOST_DIR)/usr/lib/pkgconfig + $(INSTALL_BIN) $(HOSTWRKBUILD)/../glib-obj/gobject/glib-mkenums \ + $(STAGING_HOST_DIR)/usr/bin + $(INSTALL_BIN) $(HOSTWRKBUILD)/../glib-obj/gobject/glib-genmarshal \ + $(STAGING_HOST_DIR)/usr/bin glib-install: $(INSTALL_DIR) $(IDIR_GLIB)/usr/lib diff --git a/package/glib/patches/patch-meson_build b/package/glib/patches/patch-meson_build index c410eac33..dbc6c7457 100644 --- a/package/glib/patches/patch-meson_build +++ b/package/glib/patches/patch-meson_build @@ -1,6 +1,6 @@ ---- glib-2.75.2.orig/meson.build 2023-01-06 13:49:52.000000000 +0100 -+++ glib-2.75.2/meson.build 2023-01-22 14:18:11.633406695 +0100 -@@ -513,6 +513,7 @@ if cc.get_id() == 'gcc' or cc.get_id() = +--- glib-2.78.4.orig/meson.build 2024-01-21 20:48:20.000000000 +0100 ++++ glib-2.78.4/meson.build 2024-08-30 10:20:24.877632538 +0200 +@@ -527,6 +527,7 @@ if cc.get_id() == 'gcc' or cc.get_id() = '-Werror=missing-include-dirs', '-Werror=pointer-arith', '-Werror=unused-result', diff --git a/package/iproute2/Makefile b/package/iproute2/Makefile index 1040eb93c..d1f583742 100644 --- a/package/iproute2/Makefile +++ b/package/iproute2/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= iproute2 -PKG_VERSION:= 5.8.0 +PKG_VERSION:= 6.11.0 PKG_RELEASE:= 1 -PKG_HASH:= cfcd1f890290f8c8afcc91d9444ad929b9252c16f9ab3f286c50dd3c59dc646e +PKG_HASH:= 1f795398a04aeaacd06a8f6ace2cfd913c33fa5953ca99daae83bb5c534611c3 PKG_DESCR:= routing control utility PKG_SECTION:= net/route PKG_BUILDDEP:= iptables libnl linux-atm @@ -15,6 +15,7 @@ PKG_URL:= http://www.linuxfoundation.org/en/Net:Iproute2 PKG_SITES:= http://www.kernel.org/pub/linux/utils/net/iproute2/ PKG_SUBPKGS:= IP TC TC_ATM TC_IPT IFSTAT LNSTAT ROUTEL RTMON SS +PKGSS_IP:= libmnl PKGSD_TC:= traffic control utility PKGSB_TC:= iptables PKGSD_TC_ATM:= traffic control atm support library @@ -43,12 +44,11 @@ $(eval $(call PKG_template,SS,ss,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_SS},${PK CONFIG_STYLE:= minimal TARGET_CFLAGS+= -D_GNU_SOURCE -XAKE_FLAGS+= CCOPTS="${TARGET_CFLAGS}" MFLAGS="CC=\"${TARGET_CC}\"" +XAKE_FLAGS+= CCOPTS="${TARGET_CFLAGS}" MFLAGS="CC=\"${TARGET_CC}\"" V=1 CONFIGURE_ENV+= CC="${TARGET_CC}" IPTC="${TARGET_CFLAGS}" IPTL="${TARGET_LDFLAGS}" ip-install: - ${INSTALL_DIR} ${IDIR_IP}/{etc/iproute2,bin} - ${INSTALL_DATA} ${WRKINST}/etc/iproute2/* ${IDIR_IP}/etc/iproute2/ + ${INSTALL_DIR} ${IDIR_IP}/bin ${INSTALL_BIN} ${WRKINST}/sbin/ip ${IDIR_IP}/bin/ip tc-install: diff --git a/package/iproute2/patches/patch-bridge_mst_c b/package/iproute2/patches/patch-bridge_mst_c new file mode 100644 index 000000000..ed62eb842 --- /dev/null +++ b/package/iproute2/patches/patch-bridge_mst_c @@ -0,0 +1,10 @@ +--- iproute2-6.11.0.orig/bridge/mst.c 2024-09-15 21:42:26.000000000 +0200 ++++ iproute2-6.11.0/bridge/mst.c 2024-09-24 09:58:39.165522637 +0200 +@@ -4,6 +4,7 @@ + */ + + #include <stdio.h> ++#include <netinet/in.h> + #include <linux/if_bridge.h> + #include <net/if.h> + diff --git a/package/iproute2/patches/patch-ip_iplink_can_c b/package/iproute2/patches/patch-ip_iplink_can_c index 491987005..f08774b36 100644 --- a/package/iproute2/patches/patch-ip_iplink_can_c +++ b/package/iproute2/patches/patch-ip_iplink_can_c @@ -1,6 +1,6 @@ ---- iproute2-4.9.0.orig/ip/iplink_can.c 2016-12-13 00:07:42.000000000 +0100 -+++ iproute2-4.9.0/ip/iplink_can.c 2016-12-26 01:27:39.734025890 +0100 -@@ -119,7 +119,7 @@ static int can_parse_opt(struct link_uti +--- iproute2-6.11.0.orig/ip/iplink_can.c 2024-09-15 21:42:26.000000000 +0200 ++++ iproute2-6.11.0/ip/iplink_can.c 2024-09-24 09:43:33.522450056 +0200 +@@ -137,7 +137,7 @@ static int can_parse_opt(struct link_uti if (get_u32(&bt.bitrate, *argv, 0)) invarg("invalid \"bitrate\" value\n", *argv); } else if (matches(*argv, "sample-point") == 0) { diff --git a/package/iproute2/patches/patch-misc_ifstat_c b/package/iproute2/patches/patch-misc_ifstat_c deleted file mode 100644 index 7f6584649..000000000 --- a/package/iproute2/patches/patch-misc_ifstat_c +++ /dev/null @@ -1,11 +0,0 @@ ---- iproute2-3.10.0.orig/misc/ifstat.c 2013-07-16 19:06:36.000000000 +0200 -+++ iproute2-3.10.0/misc/ifstat.c 2013-08-17 15:27:59.236199157 +0200 -@@ -21,7 +21,7 @@ - #include <sys/file.h> - #include <sys/socket.h> - #include <sys/un.h> --#include <sys/poll.h> -+#include <poll.h> - #include <sys/wait.h> - #include <sys/stat.h> - #include <signal.h> diff --git a/package/iproute2/patches/patch-misc_nstat_c b/package/iproute2/patches/patch-misc_nstat_c deleted file mode 100644 index feed4df14..000000000 --- a/package/iproute2/patches/patch-misc_nstat_c +++ /dev/null @@ -1,11 +0,0 @@ ---- iproute2-3.10.0.orig/misc/nstat.c 2013-07-16 19:06:36.000000000 +0200 -+++ iproute2-3.10.0/misc/nstat.c 2013-08-17 15:27:46.412360373 +0200 -@@ -21,7 +21,7 @@ - #include <sys/file.h> - #include <sys/socket.h> - #include <sys/un.h> --#include <sys/poll.h> -+#include <poll.h> - #include <sys/wait.h> - #include <sys/stat.h> - #include <signal.h> diff --git a/package/iproute2/patches/patch-misc_rtacct_c b/package/iproute2/patches/patch-misc_rtacct_c deleted file mode 100644 index ac0c7d5e2..000000000 --- a/package/iproute2/patches/patch-misc_rtacct_c +++ /dev/null @@ -1,11 +0,0 @@ ---- iproute2-3.10.0.orig/misc/rtacct.c 2013-07-16 19:06:36.000000000 +0200 -+++ iproute2-3.10.0/misc/rtacct.c 2013-08-17 15:26:02.313669072 +0200 -@@ -22,7 +22,7 @@ - #include <sys/file.h> - #include <sys/socket.h> - #include <sys/un.h> --#include <sys/poll.h> -+#include <poll.h> - #include <sys/wait.h> - #include <sys/stat.h> - #include <sys/mman.h> diff --git a/package/iproute2/patches/patch-netem_Makefile b/package/iproute2/patches/patch-netem_Makefile index 69141bd62..6583220fc 100644 --- a/package/iproute2/patches/patch-netem_Makefile +++ b/package/iproute2/patches/patch-netem_Makefile @@ -1,6 +1,6 @@ ---- iproute2-4.10.0.orig/netem/Makefile 2017-02-20 17:47:52.000000000 +0100 -+++ iproute2-4.10.0/netem/Makefile 2017-04-23 20:23:07.404790192 +0200 -@@ -1,14 +1,12 @@ +--- iproute2-6.11.0.orig/netem/Makefile 2024-09-15 21:42:26.000000000 +0200 ++++ iproute2-6.11.0/netem/Makefile 2024-09-24 09:43:33.530449869 +0200 +@@ -4,14 +4,12 @@ include ../config.mk DISTGEN = maketable normal pareto paretonormal DISTDATA = normal.dist pareto.dist paretonormal.dist experimental.dist @@ -16,7 +16,7 @@ %.dist: % ./$* > $@ -@@ -17,7 +15,7 @@ experimental.dist: maketable experimenta +@@ -20,7 +18,7 @@ experimental.dist: maketable experimenta ./maketable experimental.dat > experimental.dist stats: stats.c diff --git a/package/iproute2/patches/patch-netem_maketable_c b/package/iproute2/patches/patch-netem_maketable_c index b6eb03405..0fe26932f 100644 --- a/package/iproute2/patches/patch-netem_maketable_c +++ b/package/iproute2/patches/patch-netem_maketable_c @@ -1,6 +1,6 @@ ---- iproute2-2.6.29-1.orig/netem/maketable.c 2009-03-24 23:40:54.000000000 +0100 -+++ iproute2-2.6.29-1/netem/maketable.c 2009-12-11 16:32:33.000000000 +0100 -@@ -10,7 +10,7 @@ +--- iproute2-6.11.0.orig/netem/maketable.c 2024-09-15 21:42:26.000000000 +0200 ++++ iproute2-6.11.0/netem/maketable.c 2024-09-24 09:43:33.538449682 +0200 +@@ -11,7 +11,7 @@ #include <stdio.h> #include <stdlib.h> #include <math.h> diff --git a/package/iproute2/patches/patch-netem_normal_c b/package/iproute2/patches/patch-netem_normal_c index 3eada6d03..ddf1927b2 100644 --- a/package/iproute2/patches/patch-netem_normal_c +++ b/package/iproute2/patches/patch-netem_normal_c @@ -1,6 +1,6 @@ ---- iproute2-3.12.0.orig/netem/normal.c 2013-11-23 02:10:33.000000000 +0100 -+++ iproute2-3.12.0/netem/normal.c 2014-02-09 11:40:30.000000000 +0100 -@@ -8,9 +8,7 @@ +--- iproute2-6.11.0.orig/netem/normal.c 2024-09-15 21:42:26.000000000 +0200 ++++ iproute2-6.11.0/netem/normal.c 2024-09-24 09:43:33.542449589 +0200 +@@ -9,9 +9,7 @@ #include <string.h> #include <limits.h> diff --git a/package/iproute2/patches/patch-netem_pareto_c b/package/iproute2/patches/patch-netem_pareto_c index b422a56a0..1f6a9338f 100644 --- a/package/iproute2/patches/patch-netem_pareto_c +++ b/package/iproute2/patches/patch-netem_pareto_c @@ -1,6 +1,6 @@ ---- iproute2-3.12.0.orig/netem/pareto.c 2013-11-23 02:10:33.000000000 +0100 -+++ iproute2-3.12.0/netem/pareto.c 2014-02-09 11:46:07.000000000 +0100 -@@ -7,10 +7,8 @@ +--- iproute2-6.11.0.orig/netem/pareto.c 2024-09-15 21:42:26.000000000 +0200 ++++ iproute2-6.11.0/netem/pareto.c 2024-09-24 09:43:33.550449401 +0200 +@@ -8,10 +8,8 @@ #include <math.h> #include <limits.h> diff --git a/package/iproute2/patches/patch-tc_tc_core_h b/package/iproute2/patches/patch-tc_tc_core_h index 2716b71c8..25c259cee 100644 --- a/package/iproute2/patches/patch-tc_tc_core_h +++ b/package/iproute2/patches/patch-tc_tc_core_h @@ -1,6 +1,6 @@ ---- iproute2-3.12.0.orig/tc/tc_core.h 2013-11-23 02:10:33.000000000 +0100 -+++ iproute2-3.12.0/tc/tc_core.h 2014-02-08 20:19:59.000000000 +0100 -@@ -1,7 +1,7 @@ +--- iproute2-6.11.0.orig/tc/tc_core.h 2024-09-15 21:42:26.000000000 +0200 ++++ iproute2-6.11.0/tc/tc_core.h 2024-09-24 09:43:33.562449121 +0200 +@@ -2,7 +2,7 @@ #ifndef _TC_CORE_H_ #define _TC_CORE_H_ 1 @@ -8,4 +8,4 @@ +#include <sys/types.h> #include <linux/pkt_sched.h> - #define TIME_UNITS_PER_SEC 1000000 + enum link_layer { diff --git a/package/libgpg-error/Makefile b/package/libgpg-error/Makefile index 23067acda..aa139d40e 100644 --- a/package/libgpg-error/Makefile +++ b/package/libgpg-error/Makefile @@ -44,6 +44,9 @@ endif ifeq ($(ADK_TARGET_ARCH_PPC64),y) LIBGPG_PREFIX:= powerpc64-unknown-linux-gnu endif +ifeq ($(ADK_TARGET_ARCH_RISCV64),y) +LIBGPG_PREFIX:= riscv64-unknown-linux-gnu +endif ifeq ($(ADK_TARGET_ARCH_SH),y) LIBGPG_PREFIX:= sh4-unknown-linux-gnu endif diff --git a/package/libiconv/Makefile b/package/libiconv/Makefile index d978dbba8..941d6a8d0 100644 --- a/package/libiconv/Makefile +++ b/package/libiconv/Makefile @@ -21,6 +21,8 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call HOST_template,LIBICONV,libiconv,$(PKG_VERSION)-$(PKG_RELEASE))) $(eval $(call PKG_template,LIBICONV,libiconv,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) +HOST_CONFIGURE_ARGS+= --enable-static + libiconv-install: $(INSTALL_DIR) $(IDIR_LIBICONV)/usr/lib $(CP) $(WRKINST)/usr/lib/libiconv.so* $(IDIR_LIBICONV)/usr/lib/ diff --git a/package/libpcap/Makefile b/package/libpcap/Makefile index efc9440da..b9772780d 100644 --- a/package/libpcap/Makefile +++ b/package/libpcap/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libpcap -PKG_VERSION:= 1.10.4 +PKG_VERSION:= 1.10.5 PKG_RELEASE:= 1 -PKG_HASH:= ed19a0383fad72e3ad435fd239d7cd80d64916b87269550159d20e47160ebe5f +PKG_HASH:= 37ced90a19a302a7f32e458224a00c365c117905c2cd35ac544b6880a81488f0 PKG_DESCR:= low-level packet capture library PKG_SECTION:= libs/net PKG_URL:= http://www.tcpdump.org/ diff --git a/package/libssh/Makefile b/package/libssh/Makefile index 2175813ae..217cecc3b 100644 --- a/package/libssh/Makefile +++ b/package/libssh/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libssh -PKG_VERSION:= 0.11.0 +PKG_VERSION:= 0.11.1 PKG_RELEASE:= 1 -PKG_HASH:= 860e814579e7606f3fc3db98c5807bef2ab60f793ec871d81bcd23acdcdd3e91 +PKG_HASH:= 14b7dcc72e91e08151c58b981a7b570ab2663f630e7d2837645d5a9c612c1b79 PKG_DESCR:= secure shell library PKG_SECTION:= libs/crypto PKG_DEPENDS:= zlib libopenssl diff --git a/package/libtiff/Makefile b/package/libtiff/Makefile index 960605be8..282f1befc 100644 --- a/package/libtiff/Makefile +++ b/package/libtiff/Makefile @@ -10,7 +10,7 @@ PKG_HASH:= 0e46e5acb087ce7d1ac53cf4f56a09b221537fc86dfc5daaad1c2e89e1b37ac8 PKG_DESCR:= library for reading/writing tiff images PKG_SECTION:= libs/image PKG_NEEDS:= c++ -PKG_BUILDDEP:= zlib xz +PKG_BUILDDEP:= zlib PKG_URL:= http://simplesystems.org/libtiff/ PKG_SITES:= http://download.osgeo.org/libtiff/ PKG_LIBNAME:= libtiff diff --git a/package/libtirpc/Makefile b/package/libtirpc/Makefile index 5cbddde61..9e5997350 100644 --- a/package/libtirpc/Makefile +++ b/package/libtirpc/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= libtirpc -PKG_VERSION:= 1.3.4 +PKG_VERSION:= 1.3.5 PKG_RELEASE:= 1 -PKG_HASH:= 1e0b0c7231c5fa122e06c0609a76723664d068b0dba3b8219b63e6340b347860 +PKG_HASH:= 9b31370e5a38d3391bf37edfa22498e28fe2142467ae6be7a17c9068ec0bf12f PKG_DESCR:= transport independent rpc library PKG_SECTION:= libs/net PKG_URL:= http://sourceforge.net/projects/libtirpc/ diff --git a/package/ltp/Makefile b/package/ltp/Makefile index 1a039c239..d2d2358a0 100644 --- a/package/ltp/Makefile +++ b/package/ltp/Makefile @@ -4,10 +4,10 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= ltp -PKG_VERSION:= 20240129 +PKG_VERSION:= 20240930 PKG_RELEASE:= 1 PKG_DESCR:= linux test project -PKG_HASH:= c302f6b2ca09cbb7835f549777bdb9233fe31f7086d7ad8e65472a0804e3e025 +PKG_HASH:= 3e9e806405aa602e2d21d221d885fd4914ff2da23eb8bba3d0f0f468bdf60238 PKG_DEPENDS:= bash mke2fs mkfs shadow libtirpc libaio PKG_DEPENDS+= kmod dosfstools PKG_BUILDDEP+= libtirpc libaio diff --git a/package/mariadb/Makefile b/package/mariadb/Makefile index 33a865c1f..6f380f8a7 100644 --- a/package/mariadb/Makefile +++ b/package/mariadb/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= mariadb -PKG_VERSION:= 10.11.7 +PKG_VERSION:= 10.11.9 PKG_RELEASE:= 1 -PKG_HASH:= 5239a245ed90517e96396605cd01ccd8f73cd7442d1b3076b6ffe258110e5157 +PKG_HASH:= 0a00180864cd016187c986faab8010de23a117b9a75f91d6456421f894e48d20 PKG_DESCR:= sql client library PKG_SECTION:= libs/db PKG_DEPENDS:= libncurses zlib libevent libpcre boost libfmt libkrb5 diff --git a/package/nfs-utils/Makefile b/package/nfs-utils/Makefile index d2bdba4ba..a8da2b92b 100644 --- a/package/nfs-utils/Makefile +++ b/package/nfs-utils/Makefile @@ -4,14 +4,14 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= nfs-utils -PKG_VERSION:= 2.6.4 +PKG_VERSION:= 2.7.1 PKG_RELEASE:= 1 -PKG_HASH:= c0ae376ac056011ed0954deba2362d7d8193c653b500b68a543aec512cd2ecfa +PKG_HASH:= d23bab70a7570d8140de8195c16aa3f46e01b61ef3be51ae14fcbf6363017f14 PKG_DESCR:= network filesystem utilities PKG_SECTION:= net/fs PKG_DEPENDS:= keyutils libtirpc rpcbind libmount libuuid libevent sqlite -PKG_DEPENDS+= libncurses libblkid -PKG_BUILDDEP:= keyutils libtirpc util-linux libevent sqlite ncurses +PKG_DEPENDS+= libncurses libblkid libxml2 +PKG_BUILDDEP:= keyutils libtirpc util-linux libevent sqlite ncurses libxml2 PKG_KDEPENDS:= nfs-fs PKG_NEEDS:= threads PKG_URL:= http://sourceforge.net/projects/nfs diff --git a/package/openssh/Makefile b/package/openssh/Makefile index 7e540f4f9..c987edf36 100644 --- a/package/openssh/Makefile +++ b/package/openssh/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= openssh -PKG_VERSION:= 9.8p1 +PKG_VERSION:= 9.9p1 PKG_RELEASE:= 1 -PKG_HASH:= dd8bd002a379b5d499dfb050dd1fa9af8029e80461f4bb6c523c49973f5a39f3 +PKG_HASH:= b343fbcdbff87f15b1986e6e15d6d4fc9a7d36066be6b7fb507087ba8f966c02 PKG_DESCR:= secure shell implementation PKG_SECTION:= net/security PKG_BUILDDEP:= zlib @@ -37,13 +37,13 @@ PKGFD_WITH_KRB5:= enable kerberos 5 support PKGFS_WITH_KRB5:= libkrb5 libcom-err PKGFB_WITH_KRB5:= krb5 -PKG_CHOICES_OPENSSH:= WITH_LIBRESSL WITH_OPENSSL -PKGCD_WITH_LIBRESSL:= with libressl -PKGCS_WITH_LIBRESSL:= libressl -PKGCB_WITH_LIBRESSL:= libressl +PKG_CHOICES_OPENSSH:= WITH_OPENSSL WITH_LIBRESSL PKGCD_WITH_OPENSSL:= with openssl PKGCS_WITH_OPENSSL:= libopenssl PKGCB_WITH_OPENSSL:= openssl +PKGCD_WITH_LIBRESSL:= with libressl +PKGCS_WITH_LIBRESSL:= libressl +PKGCB_WITH_LIBRESSL:= libressl include ${ADK_TOPDIR}/mk/package.mk diff --git a/package/openssl/Makefile b/package/openssl/Makefile index e6022fb17..01841828c 100644 --- a/package/openssl/Makefile +++ b/package/openssl/Makefile @@ -4,15 +4,15 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= openssl -PKG_VERSION:= 3.3.1 +PKG_VERSION:= 3.3.2 PKG_RELEASE:= 1 -PKG_HASH:= 777cd596284c883375a2a7a11bf5d2786fc5413255efab20c50d6ffe6d020b7e +PKG_HASH:= 2e8a40b01979afe8be0bbfb3de5dc1c6709fedb46d6c89c10da114ab5fc3d281 PKG_DESCR:= ssl/tls library PKG_SECTION:= libs/crypto -PKG_URL:= https://www.openssl.org +PKG_URL:= https://openssl-library.org/ PKG_DEPENDS:= zlib PKG_BUILDDEP:= zlib -PKG_SITES:= https://www.openssl.org/source/ +PKG_SITES:= https://github.com/openssl/openssl/releases/download/openssl-$(PKG_VERSION)/ PKG_LIBNAME:= libopenssl PKG_OPTS:= dev diff --git a/package/pcre2/Makefile b/package/pcre2/Makefile index 3bd0d9935..5062daea4 100644 --- a/package/pcre2/Makefile +++ b/package/pcre2/Makefile @@ -23,14 +23,11 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call HOST_template,PCRE2,pcre2,${PKG_VERSION}-${PKG_RELEASE})) $(eval $(call PKG_template,PCRE2,pcre2,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) -HOST_STYLE:= cmake +HOST_CONFIG_STYLE:= cmake +HOST_CMAKE_FLAGS+= -DBUILD_SHARED_LIBS=ON CONFIG_STYLE:= cmake CMAKE_FLAGS+= -DBUILD_SHARED_LIBS=ON -pcre2-hostinstall: - cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -j${ADK_MAKE_JOBS} -f ${MAKE_FILE} \ - ${HOST_FAKE_FLAGS} ${HOST_INSTALL_TARGET} - pcre2-install: $(INSTALL_DIR) $(IDIR_PCRE2)/usr/lib $(CP) $(WRKINST)/usr/lib/libpcre2*.so* \ diff --git a/package/php/Makefile b/package/php/Makefile index 7b9a1e81b..0c6fd2389 100644 --- a/package/php/Makefile +++ b/package/php/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= php -PKG_VERSION:= 8.3.2 +PKG_VERSION:= 8.3.11 PKG_RELEASE:= 1 -PKG_HASH:= 4ffa3e44afc9c590e28dc0d2d31fc61f0139f8b335f11880a121b9f9b9f0634e +PKG_HASH:= b862b098a08ab9bf4b36ed12c7d0d9f65353656b36fb0e3c5344093aceb35802 PKG_DESCR:= php language interpreter PKG_SECTION:= dev/lang PKG_NEEDS:= threads @@ -34,6 +34,8 @@ PKGFB_MOD_CURL:= curl PKGFS_MOD_CURL:= libcurl PKGFD_MOD_FTP:= ftp support PKGFD_MOD_GD:= gd support +PKGFB_MOD_GD:= libpng +PKGFS_MOD_GD:= libpng PKGFD_MOD_GMP:= gmp support PKGFB_MOD_GMP:= gmp PKGFS_MOD_GMP:= libgmp @@ -44,8 +46,8 @@ PKGFD_MOD_MARIADB:= mariadb support PKGFS_MOD_MARIADB:= libmariadbclient PKGFB_MOD_MARIADB:= mariadb PKGFD_MOD_SSL:= ssl support -PKGFB_MOD_SSL:= libressl -PKGFS_MOD_SSL:= libressl +PKGFB_MOD_SSL:= openssl +PKGFS_MOD_SSL:= libopenssl PKGFD_MOD_PCNTL:= process control support PKGFD_MOD_SESSION:= session support PKGFD_MOD_SNMP:= snmp support diff --git a/package/python-mako/Makefile b/package/python-mako/Makefile index bb069a434..0fe5b1923 100644 --- a/package/python-mako/Makefile +++ b/package/python-mako/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_HASH:= d60a3903dc3bb01a18ad6a89cdbe2e4eadc69c0bc8ef1e3773ba53d44c3f7a34 PKG_DESCR:= fast, expressive, extensible templating engine PKG_SECTION:= dev/tools -PKG_BUILDDEP:= python3-host +HOST_BUILDDEP:= python3-host python-markupsafe-host PKG_SITES:= https://files.pythonhosted.org/packages/05/5f/2ba6e026d33a0e6ddc1dddf9958677f76f5f80c236bd65309d280b166d3e/ DISTFILES:= Mako-$(PKG_VERSION).tar.gz diff --git a/package/python-markupsafe/Makefile b/package/python-markupsafe/Makefile new file mode 100644 index 000000000..e35e13602 --- /dev/null +++ b/package/python-markupsafe/Makefile @@ -0,0 +1,33 @@ +# 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:= python-markupsafe +PKG_VERSION:= 2.1.5 +PKG_RELEASE:= 1 +PKG_HASH:= d283d37a890ba4c1ae73ffadf8046435c76e7bc2247bbb63c00bd1a709c6544b +PKG_DESCR:= implements a XML/HTML/XHTML markup safe string +PKG_SECTION:= dev/tools +HOST_BUILDDEP:= python3-host +PKG_SITES:= https://files.pythonhosted.org/packages/87/5b/aae44c6655f3801e81aa3eef09dbbf012431987ba564d7231722f68df02d/ + +DISTFILES:= MarkupSafe-$(PKG_VERSION).tar.gz + +WRKDIST= $(WRKDIR)/MarkupSafe-$(PKG_VERSION) + +include ${ADK_TOPDIR}/mk/host.mk +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call HOST_template,PYTHON_MAKO,python-markupsafe,${PKG_VERSION}-${PKG_RELEASE})) + +include $(ADK_TOPDIR)/mk/python3.mk + +HOST_STYLE:= manual + +python-markupsafe-hostinstall: + (cd $(WRKBUILD); PATH='$(HOST_PATH)' python3 ./setup.py install \ + --prefix=$(STAGING_HOST_DIR)/usr) + +include ${ADK_TOPDIR}/mk/host-bottom.mk +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/python3/Makefile b/package/python3/Makefile index 3d1f96489..dd2374ccf 100644 --- a/package/python3/Makefile +++ b/package/python3/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= python3 -PKG_VERSION:= 3.11.8 +PKG_VERSION:= 3.11.10 PKG_RELEASE:= 1 -PKG_HASH:= 9e06008c8901924395bc1da303eac567a729ae012baa182ab39269f650383bb3 +PKG_HASH:= 07a4356e912900e61a15cb0949a06c4a05012e213ecd6b4e84d0f67aabbee372 PKG_DESCR:= python scripting language PKG_SECTION:= dev/lang PKG_DEPENDS:= libffi zlib libexpat diff --git a/package/rpcbind/Makefile b/package/rpcbind/Makefile index b0c175a04..f4eb1c9f5 100644 --- a/package/rpcbind/Makefile +++ b/package/rpcbind/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= rpcbind -PKG_VERSION:= 1.2.6 +PKG_VERSION:= 1.2.7 PKG_RELEASE:= 1 -PKG_HASH:= 5613746489cae5ae23a443bb85c05a11741a5f12c8f55d2bb5e83b9defeee8de +PKG_HASH:= f6edf8cdf562aedd5d53b8bf93962d61623292bfc4d47eedd3f427d84d06f37e PKG_DESCR:= converts rpc program numbers into universal addresses PKG_SECTION:= net/misc PKG_DEPENDS:= libtirpc diff --git a/package/rsync/Makefile b/package/rsync/Makefile index 9971074f3..508e7d9f6 100644 --- a/package/rsync/Makefile +++ b/package/rsync/Makefile @@ -9,9 +9,9 @@ PKG_RELEASE:= 1 PKG_HASH:= 4e7d9d3f6ed10878c58c5fb724a67dacf4b6aac7340b13e488fb2dc41346f2bb PKG_DESCR:= utility that provides fast incremental file transfer PKG_SECTION:= net/misc -PKG_DEPENDS:= libpopt libressl -PKG_BUILDDEP:= popt libressl -HOST_BUILDDEP:= libressl-host +PKG_DEPENDS:= libpopt libopenssl +PKG_BUILDDEP:= popt openssl +HOST_BUILDDEP:= openssl-host PKG_URL:= http://rsync.samba.org/ PKG_SITES:= http://rsync.samba.org/ftp/rsync/ diff --git a/package/strace/Makefile b/package/strace/Makefile index 76fe99da2..d445c4737 100644 --- a/package/strace/Makefile +++ b/package/strace/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= strace -PKG_VERSION:= 6.10 +PKG_VERSION:= 6.11 PKG_RELEASE:= 1 -PKG_HASH:= 765ec71aa1de2fe37363c1e40c7b7669fc1d40c44bb5d38ba8e8cd82c4edcf07 +PKG_HASH:= 83262583a3529f02c3501aa8b8ac772b4cbc03dc934e98bab6e4883626e283a5 PKG_DESCR:= system call trace program PKG_SECTION:= app/debug PKG_URL:= https://strace.io diff --git a/package/tcpdump/Makefile b/package/tcpdump/Makefile index 1bfaaa7b7..85ef22357 100644 --- a/package/tcpdump/Makefile +++ b/package/tcpdump/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= tcpdump -PKG_VERSION:= 4.99.4 +PKG_VERSION:= 4.99.5 PKG_RELEASE:= 1 -PKG_HASH:= 0232231bb2f29d6bf2426e70a08a7e0c63a0d59a9b44863b7f5e2357a6e49fea +PKG_HASH:= 8c75856e00addeeadf70dad67c9ff3dd368536b2b8563abf6854d7c764cd3adb PKG_DESCR:= tool for network monitoring and data acquisition PKG_SECTION:= net/debug PKG_DEPENDS:= libpcap diff --git a/package/u-boot/Makefile b/package/u-boot/Makefile index 9e2a12bb8..ba64d7356 100644 --- a/package/u-boot/Makefile +++ b/package/u-boot/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_HASH:= f591da9ab90ef3d6b3d173766d0ddff90c4ed7330680897486117df390d83c8f PKG_DESCR:= portable bootloader PKG_SECTION:= base/boot -HOST_BUILDDEP:= libressl-host dtc-host swig-host python3-host python-setuptools-host +HOST_BUILDDEP:= openssl-host dtc-host swig-host python3-host python-setuptools-host PKG_BUILDDEP:= python3-host python-setuptools-host swig-host u-boot-host PKG_URL:= http://www.denx.de/wiki/U-Boot PKG_SITES:= ftp://ftp.denx.de/pub/u-boot/ diff --git a/package/u-boot/files/uboot-env.txt.ci20 b/package/u-boot/files/uboot-env.txt.ci20 new file mode 100644 index 000000000..c66316928 --- /dev/null +++ b/package/u-boot/files/uboot-env.txt.ci20 @@ -0,0 +1,10 @@ +baudrate=115200 +board_mfr=NP +bootargs=console=ttyS4,115200 console=tty0 mem=256M@0x0 mem=768M@0x30000000 rootwait root=/dev/mmcblk0p1 devtmpfs.mount=1 +bootcmd=run ethargs; ext4load mmc 0:1 0x88000000 /boot/kernel; bootm 0x88000000 +bootdelay=1 +ethargs=env set bootargs ${bootargs} +loads_echo=1 +stderr=eserial0,eserial4 +stdin=eserial0,eserial4 +stdout=eserial0,eserial4 diff --git a/package/uclibc-ng/Makefile b/package/uclibc-ng/Makefile index c1f2215c4..38903074a 100644 --- a/package/uclibc-ng/Makefile +++ b/package/uclibc-ng/Makefile @@ -54,6 +54,11 @@ uclibc-ng-dev-install: -${CP} ${STAGING_TARGET_DIR}/usr/lib/libc.so ${IDIR_UCLIBC_NG_DEV}/usr/lib -${CP} ${STAGING_TARGET_DIR}/usr/lib/uclibc_nonshared.a ${IDIR_UCLIBC_NG_DEV}/usr/lib -${CP} ${STAGING_TARGET_DIR}/usr/lib/libpthread_nonshared.a ${IDIR_UCLIBC_NG_DEV}/usr/lib + -${CP} ${STAGING_TARGET_DIR}/usr/lib/libm.a ${IDIR_UCLIBC_NG_DEV}/usr/lib + -${CP} ${STAGING_TARGET_DIR}/usr/lib/libdl.a ${IDIR_UCLIBC_NG_DEV}/usr/lib + -${CP} ${STAGING_TARGET_DIR}/usr/lib/librt.a ${IDIR_UCLIBC_NG_DEV}/usr/lib + -${CP} ${STAGING_TARGET_DIR}/usr/lib/libutil.a ${IDIR_UCLIBC_NG_DEV}/usr/lib + -${CP} ${STAGING_TARGET_DIR}/usr/lib/libpthread.a ${IDIR_UCLIBC_NG_DEV}/usr/lib ${CP} ${STAGING_TARGET_DIR}/usr/lib/crt*.o ${IDIR_UCLIBC_NG_DEV}/usr/lib ${KERNEL_MAKE} INSTALL_HDR_PATH=$(IDIR_UCLIBC_NG_DEV)/usr headers_install $(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/${PKG_NAME}-${PKG_VERSION} \ diff --git a/package/wget/Makefile b/package/wget/Makefile index cd05c3724..9099283b4 100644 --- a/package/wget/Makefile +++ b/package/wget/Makefile @@ -4,19 +4,22 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= wget -PKG_VERSION:= 1.19.4 +PKG_VERSION:= 1.24.5 PKG_RELEASE:= 1 -PKG_HASH:= 93fb96b0f48a20ff5be0d9d9d3c4a986b469cb853131f9d5fe4cc9cecbc8b5b5 +PKG_HASH:= fa2dc35bab5184ecbc46a9ef83def2aaaa3f4c9f3c97d4bd19dcb07d4da637de PKG_DESCR:= retrieving files using http(s) and ftp PKG_SECTION:= net/http -HOST_BUILDDEP:= libressl-host +HOST_BUILDDEP:= openssl-host PKG_URL:= http://www.gnu.org/software/wget/ PKG_SITES:= ${MASTER_SITE_GNU:=wget/} PKG_BB:= 1 DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz -PKG_CHOICES_WGET:= WITH_LIBRESSL WITH_GNUTLS WITHOUT_SSL +PKG_CHOICES_WGET:= WITH_OPENSSL WITH_LIBRESSL WITH_GNUTLS WITHOUT_SSL +PKGCD_WITH_OPENSSL:= use openssl for crypto +PKGCS_WITH_OPENSSL:= libopenssl ca-certificates libgmp +PKGCB_WITH_OPENSSL:= openssl PKGCD_WITH_LIBRESSL:= use libressl for crypto PKGCS_WITH_LIBRESSL:= libressl ca-certificates libgmp PKGCB_WITH_LIBRESSL:= libressl @@ -36,6 +39,11 @@ CONFIGURE_ARGS+= --disable-pcre ifeq (${ADK_PACKAGE_WGET_WITHOUT_SSL},y) CONFIGURE_ARGS+= --with-ssl=no endif +ifeq (${ADK_PACKAGE_WGET_WITH_OPENSSL},y) +CONFIGURE_ARGS+= --with-ssl=openssl \ + --with-openssl=yes \ + --with-libssl-prefix=${STAGING_TARGET_DIR} +endif ifeq (${ADK_PACKAGE_WGET_WITH_LIBRESSL},y) CONFIGURE_ARGS+= --with-ssl=openssl \ --with-openssl=yes \ diff --git a/package/wpa_supplicant/Makefile b/package/wpa_supplicant/Makefile index 873b6f2d3..93c80b0e8 100644 --- a/package/wpa_supplicant/Makefile +++ b/package/wpa_supplicant/Makefile @@ -21,7 +21,10 @@ PKG_DFLT_WPA_SUPPLICANT:= y if ADK_TARGET_WITH_WIFI WRKSRC= ${WRKDIST}/${PKG_NAME} -PKG_CHOICES_WPA_SUPPLICANT:= WITH_INTERNAL WITH_LIBRESSL WITH_GNUTLS +PKG_CHOICES_WPA_SUPPLICANT:= WITH_INTERNAL WITH_OPENSSL WITH_LIBRESSL WITH_GNUTLS +PKGCD_WITH_OPENSSL:= use openssl for crypto +PKGCS_WITH_OPENSSL:= libopenssl +PKGCB_WITH_OPENSSL:= openssl PKGCD_WITH_LIBRESSL:= use libressl for crypto PKGCS_WITH_LIBRESSL:= libressl PKGCB_WITH_LIBRESSL:= libressl |