Skip to content

Commit

Permalink
nodogsplash: update to 5.0.1
Browse files Browse the repository at this point in the history
Signed-off-by: Moritz Warning <moritzwarning@web.de>
  • Loading branch information
mwarning committed Jul 23, 2023
1 parent 0221a2a commit 91e0790
Showing 1 changed file with 6 additions and 8 deletions.
14 changes: 6 additions & 8 deletions nodogsplash/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
include $(TOPDIR)/rules.mk

PKG_NAME:=nodogsplash
PKG_VERSION:=5.0.0
PKG_VERSION:=5.0.1
PKG_RELEASE:=1

PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/nodogsplash/nodogsplash/tar.gz/v$(PKG_VERSION)?
PKG_HASH:=a7665f4a42997746a31e9217f2f54e360aa7fc4bc72bd89faa08f1ccf7875b5e
PKG_HASH:=a5ffa27a69389c6a538418022573ecb56a42bf91f576a97208eaafe89cb0a152

PKG_MAINTAINER:=Moritz Warning <moritzwarning@web.de>
PKG_LICENSE:=GPL-2.0-or-later
Expand All @@ -26,26 +26,24 @@ define Package/nodogsplash
SUBMENU:=Captive Portals
SECTION:=net
CATEGORY:=Network
DEPENDS:=+libpthread +iptables-mod-ipopt +libmicrohttpd-no-ssl
DEPENDS:=+libpthread +libmicrohttpd-no-ssl +iptables-nft \
+iptables-mod-nat-extra +iptables-mod-ipopt \
+iptables-mod-conntrack-extra
TITLE:=Open public network gateway daemon
URL:=https://github.com/nodogsplash/nodogsplash
CONFLICTS:=nodogsplash2
CONFLICTS:=opennds
endef

define Package/nodogsplash/description
Nodogsplash is a Captive Portal that offers a simple way to
provide restricted access to the Internet by showing a splash
page to the user before Internet access is granted.
It also incorporates an API that allows the creation of
sophisticated authentication applications.
endef

define Package/nodogsplash/install

$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/nodogsplash $(1)/usr/bin/
$(INSTALL_BIN) $(PKG_BUILD_DIR)/ndsctl $(1)/usr/bin/

$(INSTALL_DIR) $(1)/etc/nodogsplash/htdocs/images
$(INSTALL_DIR) $(1)/etc/config
$(INSTALL_DIR) $(1)/etc/init.d
Expand Down

7 comments on commit 91e0790

@bauw2008
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tmp/.config-package.in:92524:error: recursive dependency detected!
tmp/.config-package.in:92524: symbol PACKAGE_nodogsplash depends on PACKAGE_opennds
tmp/.config-package.in:92543: symbol PACKAGE_opennds depends on PACKAGE_nodogsplash

@mwarning
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How did you produce that message? Also, nodogsplash and opennds do not depend on other. Quite the opposite.

@bluewavenet fyi

@bluewavenet
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mwarning
It does not make sense - it is as if CONFLICTS is being treated as DEPENDS.
Strange, the CI did not have any problems with it.

@bluewavenet
Copy link
Contributor

@bluewavenet bluewavenet commented on 91e0790 Jul 26, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mwarning
The snapshot build-bots are building it ok, albeit very slowly....
Also nothing in the fail logs

@mwarning
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, it is a weird error message.

@mwarning
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wasn't able to reproduce the issue.

@bluewavenet
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@BKPepe
Can you shed any light on the use of CONFLICTS in the makefile?
In terms of opkg installation of the package, the CONFLICTS variable causes nodogsplash to fail installation if opennds is already installed, and vice versa.
This is the required behaviour and indeed it works as intended.
However does CONFLICTS have some other effect as well?

Please sign in to comment.