ifstat: fix compilation with GCC14

[feed/packages.git] / net / git / Makefile

diff --git a/net/git/Makefile b/net/git/Makefile
index 78f0ea75d567c2ef8792090911ed0946cec421d0..e79b400f5916b844f068b05b2019f9edbf851688 100644 (file)
--- a/net/git/Makefile
+++ b/net/git/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=git
-PKG_VERSION:=2.29.2
+PKG_VERSION:=2.45.2
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@KERNEL/software/scm/git/
-PKG_HASH:=f2fc436ebe657821a1360bcd1e5f4896049610082419143d60f6fa13c2f607c1
+PKG_HASH:=51bfe87eb1c02fed1484051875365eeab229831d30d0cec5d89a14f9e40e9adb
 
 PKG_LICENSE:=GPL-2.0-or-later
 PKG_LICENSE_FILES:=COPYING
@@ -97,15 +97,16 @@ MAKE_FLAGS := \
        NO_TCLTK="YesPlease" \
        NO_INSTALL_HARDLINKS="yes" \
        gitwebdir="/www/cgi-bin" \
-       GITWEB_JS="/gitweb/gitweb.js" \
-       GITWEB_CSS="/gitweb/gitweb.css" \
-       GITWEB_LOGO="/gitweb/gitweb-logo.png" \
-       GITWEB_FAVICON="/gitweb/gitweb-favicon.png" \
        uname_S="Linux" \
 
 CONFIGURE_ARGS += \
        --without-iconv \
 
+CONFIGURE_VARS += \
+       ac_cv_fread_reads_directories=yes \
+       ac_cv_snprintf_returns_bogus=yes \
+       ac_cv_sane_mode_bits=no
+
 define Build/Configure
        $(MAKE) -C $(PKG_BUILD_DIR) \
                configure
@@ -153,6 +154,11 @@ endef
 define Package/git-gitweb/install
        $(INSTALL_DIR) $(1)/www/cgi-bin $(1)/www/gitweb
        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/www/cgi-bin/gitweb.cgi $(1)/www/cgi-bin/
+       # work around https://lore.kernel.org/git/80eb3972-4960-5727-ce86-acc3a4425fd4@nic.cz/T/#u
+       $(SED) 's,^our @stylesheets .*,our @stylesheets = ("/gitweb/gitweb.css");,' $(1)/www/cgi-bin/gitweb.cgi
+       $(SED) 's,^our $$$$logo .*,our $$$$logo = "/gitweb/git-logo.png";,' $(1)/www/cgi-bin/gitweb.cgi
+       $(SED) 's,^our $$$$favicon .*,our $$$$favicon = "/gitweb/git-favicon.png";,' $(1)/www/cgi-bin/gitweb.cgi
+       $(SED) 's,^our $$$$javascript .*,our $$$$javascript = "/gitweb/gitweb.js";,' $(1)/www/cgi-bin/gitweb.cgi
        $(CP) $(PKG_INSTALL_DIR)/www/cgi-bin/static/* $(1)/www/gitweb/
 endef