OpenWrt
/
packages
mirror of https://git.openwrt.org/feed/packages.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

i2pd: Update to 2.29.0 

Ran init script through shellcheck. Simplified several statements.

Replaced INSTALL_CONF with INSTALL_DATA. i2pd runs as non-root and so the
conf file must be accessible.

Fixed: https://github.com/openwrt/packages/issues/10977

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev 2020-01-16 19:10:59 -08:00
parent 51de4b2e35
commit efeab1c569
No known key found for this signature in database
GPG Key ID: 36D31CFA845F0E3B
2 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/i2pd/Makefile
View File

@ -9,13 +9,13 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=i2pd PKG_NAME:=i2pd
PKG_VERSION:=2.28.0 PKG_VERSION:=2.29.0
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_BUILD_PARALLEL:=1 PKG_BUILD_PARALLEL:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/PurpleI2P/i2pd/tar.gz/$(PKG_VERSION)? PKG_SOURCE_URL:=https://codeload.github.com/PurpleI2P/i2pd/tar.gz/$(PKG_VERSION)?
PKG_HASH:=181327edc7cf5b3c25ee51ecc518a4da90fa9e421eca2107996791038a514a21 PKG_HASH:=fd0474c33b411593b9dc8197f3799d37d68455c11a9ee3994ec993a96388ec06
PKG_MAINTAINER:=David Yang <mmyangfl@gmail.com> PKG_MAINTAINER:=David Yang <mmyangfl@gmail.com>
PKG_LICENSE:=BSD-3-Clause PKG_LICENSE:=BSD-3-Clause

22
net/i2pd/files/i2pd.init
View File

@ -27,20 +27,18 @@ i2pd_start() {
config_get addressbook_dir "$cfg" addressbook_dir config_get addressbook_dir "$cfg" addressbook_dir
## Setting up data dir ## Setting up data dir
if [ ! -d "$data_dir" ]; then [ -d "$data_dir" ] || {
mkdir -p "$data_dir" mkdir -p "$data_dir"
chown "$USER:$GROUP" "$data_dir"
ln -s /usr/share/i2pd/certificates "$data_dir/certificates" ln -s /usr/share/i2pd/certificates "$data_dir/certificates"
if [ -n "$addressbook_dir" ]; then [ -n "$addressbook_dir" ] && {
if [ ! -d "$addressbook_dir" ]; then [ -d "$addressbook_dir" ] || mkdir -p "$addressbook_dir"
mkdir -p "$addressbook_dir" chown "$USER:$GROUP" "$addressbook_dir"
fi
ln -s "$addressbook_dir" "$data_dir/addressbook" ln -s "$addressbook_dir" "$data_dir/addressbook"
fi }
fi }
## We need permissions ## We need permissions
chown "$USER:$GROUP" "$data_dir"
chown "$USER:$GROUP" "$addressbook_dir"
touch "$PIDFILE" touch "$PIDFILE"
chown "$USER:adm" "$PIDFILE" chown "$USER:adm" "$PIDFILE"
@ -67,11 +65,7 @@ start_service() {
config_cb() { config_cb() {
local type="$1" local type="$1"
local name="$2" local name="$2"
if [ "$type" = "i2pd" ]; then [ "$type" = "i2pd" ] && [ -n "$instance" ] && [ "$instance" = "$name" ] && instance_found=1
if [ -n "$instance" ] && [ "$instance" = "$name" ]; then
instance_found=1
fi
fi
} }
config_load i2pd config_load i2pd