From ecdf1f4ddce498344647d2fca947c693201f1e5f Mon Sep 17 00:00:00 2001 From: R4SAS Date: Fri, 5 Oct 2018 13:44:18 +0000 Subject: [PATCH] updated debian patches, add patch disabling few settings in service file, fix name in control file --- debian/control | 2 +- debian/patches/01-tune-build-opts.patch | 4 ++-- debian/patches/fix-#1210 | 25 +++++++++++++++++++++++++ debian/patches/series | 1 + 4 files changed, 29 insertions(+), 3 deletions(-) create mode 100644 debian/patches/fix-#1210 diff --git a/debian/control b/debian/control index 8ef0b08c..843a153c 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,7 @@ Source: i2pd Section: net Priority: optional -Maintainer: R4SAS +Maintainer: r4sas Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.17.2~), gcc (>= 4.7) | clang (>= 3.3), libboost-system-dev (>= 1.46), libboost-date-time-dev (>= 1.46), libboost-filesystem-dev (>= 1.46), libboost-program-options-dev (>= 1.46), libminiupnpc-dev, libssl-dev, zlib1g-dev Standards-Version: 3.9.6 Homepage: http://i2pd.website/ diff --git a/debian/patches/01-tune-build-opts.patch b/debian/patches/01-tune-build-opts.patch index 2dff9e09..dd2b4638 100644 --- a/debian/patches/01-tune-build-opts.patch +++ b/debian/patches/01-tune-build-opts.patch @@ -13,5 +13,5 @@ index bdadfe0..2f71eec 100644 USE_STATIC := no USE_MESHNET := no USE_UPNP := no - - ifeq ($(WEBSOCKETS),1) + DEBUG := yes + diff --git a/debian/patches/fix-#1210 b/debian/patches/fix-#1210 new file mode 100644 index 00000000..7e68135c --- /dev/null +++ b/debian/patches/fix-#1210 @@ -0,0 +1,25 @@ +Description: fix #1210 + Disables two options, which not presented in old systemd versions +Author: r4sas + +Bug: https://github.com/PurpleI2P/i2pd/issues/1210 +Reviewed-By: r4sas +Last-Update: 2018-08-25 + +--- i2pd-2.20.0.orig/contrib/i2pd.service ++++ i2pd-2.20.0/contrib/i2pd.service +@@ -6,10 +6,10 @@ After=network.target + [Service] + User=i2pd + Group=i2pd +-RuntimeDirectory=i2pd +-RuntimeDirectoryMode=0700 +-LogsDirectory=i2pd +-LogsDirectoryMode=0700 ++#RuntimeDirectory=i2pd ++#RuntimeDirectoryMode=0700 ++#LogsDirectory=i2pd ++#LogsDirectoryMode=0700 + Type=forking + ExecStart=/usr/sbin/i2pd --conf=/etc/i2pd/i2pd.conf --tunconf=/etc/i2pd/tunnels.conf --pidfile=/var/run/i2pd/i2pd.pid --logfile=/var/log/i2pd/i2pd.log --daemon --service + ExecReload=/bin/kill -HUP $MAINPID diff --git a/debian/patches/series b/debian/patches/series index 972d2a10..5a9712bd 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ 01-tune-build-opts.patch +fix-#1210