projects / feed / packages.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 2: 85279b4)
Merge pull request #20212 from gstrauss/lighttpd-1.4.68
authorHannu Nyman <hannu.nyman@iki.fi>
Sat, 7 Jan 2023 08:37:10 +0000 (10:37 +0200)
committerGitHub <noreply@github.com>
Sat, 7 Jan 2023 08:37:10 +0000 (10:37 +0200)
lighttpd: update to lighttpd 1.4.68 release hash

libs/libmaxminddb/Makefile patch | blob | history
libs/libtorrent-rasterbar/Makefile patch | blob | history
libs/libwebsockets/Makefile patch | blob | history
net/pbr/Makefile patch | blob | history
utils/docker-compose/Makefile patch | blob | history
utils/syncthing/Makefile patch | blob | history

diff --git a/libs/libmaxminddb/Makefile b/libs/libmaxminddb/Makefile
index 02bd2f473cd552b629d2aaddd057cd61cd6f8662..b1bc2452f33448ab34846f7138e78c99510c911d 100644 (file)
--- a/libs/libmaxminddb/Makefile
+++ b/libs/libmaxminddb/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libmaxminddb
 PKG_VERSION:=1.7.1
-PKG_RELEASE=$(AUTORELEASE)
+PKG_RELEASE=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/maxmind/libmaxminddb/releases/download/$(PKG_VERSION)/
@@ -42,6 +42,8 @@ define Build/InstallDev
        $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
        $(INSTALL_DIR) $(1)/usr/lib/
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libmaxminddb.so* $(1)/usr/lib/
+       $(INSTALL_DIR) $(1)/usr/lib/pkgconfig
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libmaxminddb.pc $(1)/usr/lib/pkgconfig
 endef
 
 define Package/libmaxminddb/install
diff --git a/libs/libtorrent-rasterbar/Makefile b/libs/libtorrent-rasterbar/Makefile
index fe99c342623c28ba3471da8cb842697cf8d3b91d..1e5b3e00cf27c9bf1692b270a8b8176c6145f2e8 100644 (file)
--- a/libs/libtorrent-rasterbar/Makefile
+++ b/libs/libtorrent-rasterbar/Makefile
@@ -1,12 +1,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libtorrent-rasterbar
-PKG_VERSION:=2.0.7
-PKG_RELEASE:=$(AUTORELEASE)
+PKG_VERSION:=2.0.8
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/arvidn/libtorrent/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=1c8209fdf765be7bc989e9cbd1d9dc3d5a6a57cb979205e73e925c9c72ebe8ce
+PKG_HASH:=29e5c5395de8126ed1b24d0540a9477fbb158b536021cd65aaf9de34d0aadb46
 
 PKG_MAINTAINER:=David Yang <mmyangfl@gmail.com>
 PKG_LICENSE:=BSD-3-Clause
@@ -47,11 +47,11 @@ endef
 #endef
 
 define Download/try_signal
-       VERSION:=751a7e5a5be14892bcfdff1e63c653bcbf71cf39
+       VERSION:=105cce59972f925a33aa6b1c3109e4cd3caf583d
        SUBDIR:=deps/try_signal
        FILE:=$(PKG_NAME)-try_signal-$$(VERSION).tar.xz
        URL:=https://github.com/arvidn/try_signal.git
-       MIRROR_HASH:=32a432e35e81c79f21c49744f00696c112e0deab45d15d91c61ceb63fe25a5f8
+       MIRROR_HASH:=da81da67d52b7a731c21148573b68bf8dc7863616d6ae1f81845b7afb29e8f00
        PROTO:=git
 endef
 $(eval $(call Download,try_signal))
diff --git a/libs/libwebsockets/Makefile b/libs/libwebsockets/Makefile
index 2920cb039e7702a6de05c47634a31a7d02359bc5..c71510b01d56792aef6c6c0f209e9a140134c6a9 100644 (file)
--- a/libs/libwebsockets/Makefile
+++ b/libs/libwebsockets/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libwebsockets
 PKG_VERSION:=4.3.2
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
@@ -45,7 +45,7 @@ define Package/libwebsockets/Default
        SECTION:=libs
        CATEGORY:=Libraries
        TITLE:=libwebsockets
-       DEPENDS:=+zlib +libcap
+       DEPENDS:=+zlib +libcap +libubox
        URL:=https://libwebsockets.org
        MAINTAINER:=Karl Palsson <karlp@etactica.com>
 endef
@@ -97,7 +97,7 @@ endif
 
 define Package/libwebsockets/install
        $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libwebsockets.so* $(1)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libwebsockets*.so* $(1)/usr/lib/
 endef
 
 Package/libwebsockets-mbedtls/install = $(Package/libwebsockets/install)
diff --git a/net/pbr/Makefile b/net/pbr/Makefile
index 7ec156ac77c03b36a64eb863acc556eab9579d16..ddcd9e1235b51957843daca7035224d10d29f627 100644 (file)
--- a/net/pbr/Makefile
+++ b/net/pbr/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=pbr
 PKG_VERSION:=1.0.1
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 PKG_LICENSE:=GPL-3.0-or-later
 PKG_MAINTAINER:=Stan Grishin <stangri@melmac.ca>
 
@@ -20,25 +20,27 @@ define Package/pbr/default
   URL:=https://docs.openwrt.melmac.net/pbr/
   DEPENDS:=+ip-full +jshn +jsonfilter +resolveip
   CONFLICTS:=vpnbypass vpn-policy-routing
-  PROVIDES:=vpnbypass vpn-policy-routing
   PKGARCH:=all
 endef
 
 define Package/pbr
 $(call Package/pbr/default)
-       TITLE+= with nft/nft set support
-       DEPENDS+=+firewall4 +kmod-nft-core +kmod-nft-nat +nftables-json
+  TITLE+= with nft/nft set support
+  DEPENDS+=+firewall4 +kmod-nft-core +kmod-nft-nat +nftables-json
+  PROVIDES:=vpnbypass vpn-policy-routing
 endef
 
 define Package/pbr-iptables
 $(call Package/pbr/default)
-       TITLE+= with iptables/ipset support
-       DEPENDS+=+ipset +iptables +kmod-ipt-ipset +iptables-mod-ipopt
+  TITLE+= with iptables/ipset support
+  DEPENDS+=+ipset +iptables +kmod-ipt-ipset +iptables-mod-ipopt
+  PROVIDES:=pbr vpnbypass vpn-policy-routing
 endef
 
 define Package/pbr-netifd
 $(call Package/pbr/default)
-       TITLE+= with netifd support
+  TITLE+= with netifd support
+  PROVIDES:=pbr vpnbypass vpn-policy-routing
 endef
 
 define Package/pbr/description
diff --git a/utils/docker-compose/Makefile b/utils/docker-compose/Makefile
index c857615d5f267cd9b5fc3ddcf06becfebd2e4360..5806eeaaa2d25eec78a8b040b36451a057176e62 100644 (file)
--- a/utils/docker-compose/Makefile
+++ b/utils/docker-compose/Makefile
@@ -1,14 +1,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=compose
-PKG_VERSION:=2.14.2
+PKG_VERSION:=2.15.0
 PKG_RELEASE:=1
 PKG_LICENSE:=Apache-2.0
 PKG_LICENSE_FILES:=LICENSE
 
 PKG_SOURCE:=v$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/docker/compose/tar.gz/v${PKG_VERSION}?
-PKG_HASH:=72f25596fdaf3bfbb685460c6003acd7ea904b95f12151f892bb199f985fa285
+PKG_HASH:=da1e2b9760596dad690d5c6bc1a1c3868c67994836c2bb7e3ffbe9c811a9c580
 
 PKG_MAINTAINER:=Javier Marcet <javier@marcet.info>
 
diff --git a/utils/syncthing/Makefile b/utils/syncthing/Makefile
index 6848bd6ca3ef070586527d5522a4fa0904bbb456..9feb2e93cc7353a039dd8b25b74d174d3eea455f 100644 (file)
--- a/utils/syncthing/Makefile
+++ b/utils/syncthing/Makefile
@@ -1,12 +1,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=syncthing
-PKG_VERSION:=1.22.2
+PKG_VERSION:=1.23.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=syncthing-source-v$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/syncthing/syncthing/releases/download/v$(PKG_VERSION)
-PKG_HASH:=211704904788808ef2818994fb36e33c3e33ed1b52267f7adbf1411fa5ee2d2f
+PKG_HASH:=0f66d3dd2a7915a6f3ca6773c1dc02345444b2644a533211ce1ee57b371ae458
 
 PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/$(PKG_NAME)
 
@@ -19,19 +19,19 @@ PKG_BUILD_DEPENDS:=golang/host
 PKG_BUILD_PARALLEL:=1
 PKG_USE_MIPS16:=0
 
-GO_PKG:=github.com/syncthing/syncthing/
+GO_PKG:=github.com/syncthing/syncthing
 GO_PKG_BUILD_PKG:=\
-       $(if $(CONFIG_PACKAGE_syncthing),github.com/syncthing/syncthing/cmd/syncthing/) \
-       $(if $(CONFIG_PACKAGE_stdiscosrv),github.com/syncthing/syncthing/cmd/stdiscosrv/) \
-       $(if $(CONFIG_PACKAGE_strelaysrv),github.com/syncthing/syncthing/cmd/strelaysrv/)
+       $(if $(CONFIG_PACKAGE_syncthing),$(GO_PKG)/cmd/syncthing/) \
+       $(if $(CONFIG_PACKAGE_stdiscosrv),$(GO_PKG)/cmd/stdiscosrv/) \
+       $(if $(CONFIG_PACKAGE_strelaysrv),$(GO_PKG)/cmd/strelaysrv/)
 GO_PKG_INSTALL_EXTRA:=^gui/
 
 GO_PKG_LDFLAGS_X:=\
-       github.com/syncthing/syncthing/lib/build.Version=v$(PKG_VERSION) \
-       github.com/syncthing/syncthing/lib/build.Stamp=$(SOURCE_DATE_EPOCH) \
-       github.com/syncthing/syncthing/lib/build.User=openwrt \
-       github.com/syncthing/syncthing/lib/build.Host=openwrt \
-       github.com/syncthing/syncthing/lib/build.Tags=noupgrade
+       $(GO_PKG)/lib/build.Version=v$(PKG_VERSION) \
+       $(GO_PKG)/lib/build.Stamp=$(SOURCE_DATE_EPOCH) \
+       $(GO_PKG)/lib/build.User=openwrt \
+       $(GO_PKG)/lib/build.Host=openwrt \
+       $(GO_PKG)/lib/build.Tags=noupgrade
 GO_PKG_TAGS:=noupgrade
 
 include $(INCLUDE_DIR)/package.mk
@@ -90,11 +90,9 @@ define Package/strelaysrv/description
   Relay server for syncthing
 endef
 
-define Build/Install
-       $(call GoPackage/Package/Install/Bin,$(PKG_INSTALL_DIR))
-endef
-
 define SyncthingInstall
+       $(INSTALL_DIR) $(1)/etc/$(2)
+
        $(INSTALL_DIR) $(1)/etc/config/
        $(INSTALL_CONF) $(CURDIR)/files/$(2).conf $(1)/etc/config/$(2)
 
@@ -102,7 +100,7 @@ define SyncthingInstall
        $(INSTALL_BIN) $(CURDIR)/files/$(2).init $(1)/etc/init.d/$(2)
 
        $(INSTALL_DIR) $(1)/usr/bin/
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/$(2) $(1)/usr/bin
+       $(INSTALL_BIN) $(GO_PKG_BUILD_BIN_DIR)/$(2) $(1)/usr/bin
 endef
 
 
Mirror of packages feed