mirror of
				https://github.com/PurpleI2P/i2pd.git
				synced 2025-11-04 08:30:46 +00:00 
			
		
		
		
	debian: add compat patches for previous releases
Signed-off-by: R4SAS <r4sas@i2pmail.org>
This commit is contained in:
		
							parent
							
								
									fba23a4528
								
							
						
					
					
						commit
						ca02b5d860
					
				
					 15 changed files with 169 additions and 2 deletions
				
			
		| 
						 | 
				
			
			@ -1,2 +1,5 @@
 | 
			
		|||
This forder contain systemd unit files.
 | 
			
		||||
To use systemd daemon control, place files from this directory to debian folder before building package.
 | 
			
		||||
This forder contain files required for building debian packages.
 | 
			
		||||
 | 
			
		||||
The trunk repository is contains the packaging files for the latest stable version of Debian (if we not forgot to update them).
 | 
			
		||||
 | 
			
		||||
Files in subdirectories contains fixes to make possible to build package on specific versions of Debian/Ubuntu. They are used when building the release package.
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										1
									
								
								contrib/debian/bionic/compat
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								contrib/debian/bionic/compat
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1 @@
 | 
			
		|||
11
 | 
			
		||||
							
								
								
									
										18
									
								
								contrib/debian/bionic/control
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										18
									
								
								contrib/debian/bionic/control
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,18 @@
 | 
			
		|||
Source: i2pd
 | 
			
		||||
Section: net
 | 
			
		||||
Priority: optional
 | 
			
		||||
Maintainer: r4sas <r4sas@i2pmail.org>
 | 
			
		||||
Build-Depends: debhelper (>= 11~), 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: 4.2.0
 | 
			
		||||
Homepage: http://i2pd.website/
 | 
			
		||||
Vcs-Git: git://github.com/PurpleI2P/i2pd.git
 | 
			
		||||
Vcs-Browser: https://github.com/PurpleI2P/i2pd
 | 
			
		||||
 | 
			
		||||
Package: i2pd
 | 
			
		||||
Architecture: any
 | 
			
		||||
Pre-Depends: ${misc:Pre-Depends}, adduser
 | 
			
		||||
Depends: ${shlibs:Depends}, ${misc:Depends}, lsb-base,
 | 
			
		||||
Description: Full-featured C++ implementation of I2P client.
 | 
			
		||||
 I2P (Invisible Internet Protocol) is a universal anonymous network layer. All
 | 
			
		||||
 communications over I2P are anonymous and end-to-end encrypted, participants
 | 
			
		||||
 don't reveal their real IP addresses.
 | 
			
		||||
							
								
								
									
										1
									
								
								contrib/debian/trusty/compat
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								contrib/debian/trusty/compat
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1 @@
 | 
			
		|||
9
 | 
			
		||||
							
								
								
									
										18
									
								
								contrib/debian/trusty/control
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										18
									
								
								contrib/debian/trusty/control
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,18 @@
 | 
			
		|||
Source: i2pd
 | 
			
		||||
Section: net
 | 
			
		||||
Priority: optional
 | 
			
		||||
Maintainer: r4sas <r4sas@i2pmail.org>
 | 
			
		||||
Build-Depends: debhelper (>= 9), 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.8
 | 
			
		||||
Homepage: http://i2pd.website/
 | 
			
		||||
Vcs-Git: git://github.com/PurpleI2P/i2pd.git
 | 
			
		||||
Vcs-Browser: https://github.com/PurpleI2P/i2pd
 | 
			
		||||
 | 
			
		||||
Package: i2pd
 | 
			
		||||
Architecture: any
 | 
			
		||||
Pre-Depends: ${misc:Pre-Depends}, adduser
 | 
			
		||||
Depends: ${shlibs:Depends}, ${misc:Depends}, lsb-base,
 | 
			
		||||
Description: Full-featured C++ implementation of I2P client.
 | 
			
		||||
 I2P (Invisible Internet Protocol) is a universal anonymous network layer. All
 | 
			
		||||
 communications over I2P are anonymous and end-to-end encrypted, participants
 | 
			
		||||
 don't reveal their real IP addresses.
 | 
			
		||||
							
								
								
									
										17
									
								
								contrib/debian/trusty/patches/01-upnp.patch
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										17
									
								
								contrib/debian/trusty/patches/01-upnp.patch
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,17 @@
 | 
			
		|||
Description: Enable UPnP usage in package
 | 
			
		||||
Author: r4sas <r4sas@i2pmail.org>
 | 
			
		||||
 | 
			
		||||
Reviewed-By: r4sas <r4sas@i2pmail.org>
 | 
			
		||||
Last-Update: 2022-03-23
 | 
			
		||||
 | 
			
		||||
--- i2pd.orig/Makefile
 | 
			
		||||
+++ i2pd/Makefile
 | 
			
		||||
@@ -31,7 +31,7 @@ include filelist.mk
 | 
			
		||||
 
 | 
			
		||||
 USE_AESNI       := $(or $(USE_AESNI),yes)
 | 
			
		||||
 USE_STATIC      := $(or $(USE_STATIC),no)
 | 
			
		||||
-USE_UPNP        := $(or $(USE_UPNP),no)
 | 
			
		||||
+USE_UPNP        := $(or $(USE_UPNP),yes)
 | 
			
		||||
 DEBUG           := $(or $(DEBUG),yes)
 | 
			
		||||
 
 | 
			
		||||
 # for debugging purposes only, when commit hash needed in trunk builds in i2pd version string
 | 
			
		||||
							
								
								
									
										19
									
								
								contrib/debian/trusty/patches/02-service.patch
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										19
									
								
								contrib/debian/trusty/patches/02-service.patch
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,19 @@
 | 
			
		|||
Description: Disable LogsDirectory and LogsDirectoryMode options in service
 | 
			
		||||
Author: r4sas <r4sas@i2pmail.org>
 | 
			
		||||
 | 
			
		||||
Reviewed-By: r4sas <r4sas@i2pmail.org>
 | 
			
		||||
Last-Update: 2023-05-17
 | 
			
		||||
 | 
			
		||||
--- a/contrib/i2pd.service
 | 
			
		||||
+++ b/contrib/i2pd.service
 | 
			
		||||
@@ -8,8 +8,8 @@ User=i2pd
 | 
			
		||||
 Group=i2pd
 | 
			
		||||
 RuntimeDirectory=i2pd
 | 
			
		||||
 RuntimeDirectoryMode=0700
 | 
			
		||||
-LogsDirectory=i2pd
 | 
			
		||||
-LogsDirectoryMode=0700
 | 
			
		||||
+#LogsDirectory=i2pd
 | 
			
		||||
+#LogsDirectoryMode=0700
 | 
			
		||||
 Type=forking
 | 
			
		||||
 ExecStart=/usr/sbin/i2pd --conf=/etc/i2pd/i2pd.conf --tunconf=/etc/i2pd/tunnels.conf --tunnelsdir=/etc/i2pd/tunnels.conf.d --pidfile=/run/i2pd/i2pd.pid --logfile=/var/log/i2pd/i2pd.log --daemon --service
 | 
			
		||||
 ExecReload=/bin/sh -c "kill -HUP $MAINPID"
 | 
			
		||||
							
								
								
									
										2
									
								
								contrib/debian/trusty/patches/series
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										2
									
								
								contrib/debian/trusty/patches/series
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,2 @@
 | 
			
		|||
01-upnp.patch
 | 
			
		||||
02-service.patch
 | 
			
		||||
							
								
								
									
										18
									
								
								contrib/debian/trusty/rules
									
										
									
									
									
										Executable file
									
								
							
							
						
						
									
										18
									
								
								contrib/debian/trusty/rules
									
										
									
									
									
										Executable file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,18 @@
 | 
			
		|||
#!/usr/bin/make -f
 | 
			
		||||
#export DH_VERBOSE=1
 | 
			
		||||
 | 
			
		||||
export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 | 
			
		||||
 | 
			
		||||
include /usr/share/dpkg/architecture.mk
 | 
			
		||||
 | 
			
		||||
ifeq ($(DEB_HOST_ARCH),i386)
 | 
			
		||||
    export DEB_BUILD_OPTIONS=parallel=1
 | 
			
		||||
endif
 | 
			
		||||
 | 
			
		||||
export DEB_CXXFLAGS_MAINT_APPEND=-Wall -pedantic
 | 
			
		||||
export DEB_LDFLAGS_MAINT_APPEND=
 | 
			
		||||
 | 
			
		||||
%:
 | 
			
		||||
	dh $@ --parallel
 | 
			
		||||
 | 
			
		||||
override_dh_auto_install:
 | 
			
		||||
							
								
								
									
										1
									
								
								contrib/debian/xenial/compat
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								contrib/debian/xenial/compat
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1 @@
 | 
			
		|||
9
 | 
			
		||||
							
								
								
									
										18
									
								
								contrib/debian/xenial/control
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										18
									
								
								contrib/debian/xenial/control
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,18 @@
 | 
			
		|||
Source: i2pd
 | 
			
		||||
Section: net
 | 
			
		||||
Priority: optional
 | 
			
		||||
Maintainer: r4sas <r4sas@i2pmail.org>
 | 
			
		||||
Build-Depends: debhelper (>= 9), 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.8
 | 
			
		||||
Homepage: http://i2pd.website/
 | 
			
		||||
Vcs-Git: git://github.com/PurpleI2P/i2pd.git
 | 
			
		||||
Vcs-Browser: https://github.com/PurpleI2P/i2pd
 | 
			
		||||
 | 
			
		||||
Package: i2pd
 | 
			
		||||
Architecture: any
 | 
			
		||||
Pre-Depends: ${misc:Pre-Depends}, adduser
 | 
			
		||||
Depends: ${shlibs:Depends}, ${misc:Depends}, lsb-base,
 | 
			
		||||
Description: Full-featured C++ implementation of I2P client.
 | 
			
		||||
 I2P (Invisible Internet Protocol) is a universal anonymous network layer. All
 | 
			
		||||
 communications over I2P are anonymous and end-to-end encrypted, participants
 | 
			
		||||
 don't reveal their real IP addresses.
 | 
			
		||||
							
								
								
									
										17
									
								
								contrib/debian/xenial/patches/01-upnp.patch
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										17
									
								
								contrib/debian/xenial/patches/01-upnp.patch
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,17 @@
 | 
			
		|||
Description: Enable UPnP usage in package
 | 
			
		||||
Author: r4sas <r4sas@i2pmail.org>
 | 
			
		||||
 | 
			
		||||
Reviewed-By: r4sas <r4sas@i2pmail.org>
 | 
			
		||||
Last-Update: 2022-03-23
 | 
			
		||||
 | 
			
		||||
--- i2pd.orig/Makefile
 | 
			
		||||
+++ i2pd/Makefile
 | 
			
		||||
@@ -31,7 +31,7 @@ include filelist.mk
 | 
			
		||||
 
 | 
			
		||||
 USE_AESNI       := $(or $(USE_AESNI),yes)
 | 
			
		||||
 USE_STATIC      := $(or $(USE_STATIC),no)
 | 
			
		||||
-USE_UPNP        := $(or $(USE_UPNP),no)
 | 
			
		||||
+USE_UPNP        := $(or $(USE_UPNP),yes)
 | 
			
		||||
 DEBUG           := $(or $(DEBUG),yes)
 | 
			
		||||
 
 | 
			
		||||
 # for debugging purposes only, when commit hash needed in trunk builds in i2pd version string
 | 
			
		||||
							
								
								
									
										19
									
								
								contrib/debian/xenial/patches/02-service.patch
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										19
									
								
								contrib/debian/xenial/patches/02-service.patch
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,19 @@
 | 
			
		|||
Description: Disable LogsDirectory and LogsDirectoryMode options in service
 | 
			
		||||
Author: r4sas <r4sas@i2pmail.org>
 | 
			
		||||
 | 
			
		||||
Reviewed-By: r4sas <r4sas@i2pmail.org>
 | 
			
		||||
Last-Update: 2023-05-17
 | 
			
		||||
 | 
			
		||||
--- a/contrib/i2pd.service
 | 
			
		||||
+++ b/contrib/i2pd.service
 | 
			
		||||
@@ -8,8 +8,8 @@ User=i2pd
 | 
			
		||||
 Group=i2pd
 | 
			
		||||
 RuntimeDirectory=i2pd
 | 
			
		||||
 RuntimeDirectoryMode=0700
 | 
			
		||||
-LogsDirectory=i2pd
 | 
			
		||||
-LogsDirectoryMode=0700
 | 
			
		||||
+#LogsDirectory=i2pd
 | 
			
		||||
+#LogsDirectoryMode=0700
 | 
			
		||||
 Type=forking
 | 
			
		||||
 ExecStart=/usr/sbin/i2pd --conf=/etc/i2pd/i2pd.conf --tunconf=/etc/i2pd/tunnels.conf --tunnelsdir=/etc/i2pd/tunnels.conf.d --pidfile=/run/i2pd/i2pd.pid --logfile=/var/log/i2pd/i2pd.log --daemon --service
 | 
			
		||||
 ExecReload=/bin/sh -c "kill -HUP $MAINPID"
 | 
			
		||||
							
								
								
									
										2
									
								
								contrib/debian/xenial/patches/series
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										2
									
								
								contrib/debian/xenial/patches/series
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,2 @@
 | 
			
		|||
01-upnp.patch
 | 
			
		||||
02-service.patch
 | 
			
		||||
							
								
								
									
										13
									
								
								contrib/debian/xenial/rules
									
										
									
									
									
										Executable file
									
								
							
							
						
						
									
										13
									
								
								contrib/debian/xenial/rules
									
										
									
									
									
										Executable file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,13 @@
 | 
			
		|||
#!/usr/bin/make -f
 | 
			
		||||
#export DH_VERBOSE=1
 | 
			
		||||
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 | 
			
		||||
 | 
			
		||||
include /usr/share/dpkg/architecture.mk
 | 
			
		||||
 | 
			
		||||
export DEB_CXXFLAGS_MAINT_APPEND  = -Wall -pedantic
 | 
			
		||||
export DEB_LDFLAGS_MAINT_APPEND =
 | 
			
		||||
 | 
			
		||||
%:
 | 
			
		||||
	dh $@ --parallel
 | 
			
		||||
 | 
			
		||||
override_dh_auto_install:
 | 
			
		||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue