ptunnel-ng:

	* removed debian patches (merged)

5 files changed, 0 insertions, 136 deletions

diff --git a/debian/patches/add_hardening_flags.diff b/debian/patches/add_hardening_flags.diff
deleted file mode 100644
index b5ad8ba..0000000
--- a/debian/patches/add_hardening_flags.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-Description: Add Hardening flags
-Forwarded: no
-Author: Daniel Echeverry <epsilon77@gmail.com>
-Last-Update: 2016-02-16
---- a/Makefile
-+++ b/Makefile
-@@ -32,7 +32,7 @@ install: ptunnel
- 	install ./ptunnel.8 $(mandir)/ptunnel.8
- 
- ptunnel: $(PT_OBJS)
--	$(CC) -o $@ $^ $(LDOPTS) `[ -e /usr/include/selinux/selinux.h ] && echo -lselinux`
-+	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ $^ $(LDOPTS) `[ -e /usr/include/selinux/selinux.h ] && echo -lselinux`
- 
- ptunnel.exe: $(WIN32_PT_OBJS)
- 	$(CC) -o $@ $^ $(WIN32_LDOPTS)
-@@ -44,10 +44,10 @@ clean:
- 
- depend: .depend
- .depend:
--	$(CC) $(CFLAGS) -MM *.c > $@
-+	$(CC) $(CFLAGS) $(CPPFLAGS) -MM *.c > $@
- 
- %.o:%.c
--	$(CC) $(CFLAGS) `[ -e /usr/include/selinux/selinux.h ] && echo -DHAVE_SELINUX` -c -o $@ $<
-+	$(CC) $(CFLAGS) $(CPPFLAGS) `[ -e /usr/include/selinux/selinux.h ] && echo -DHAVE_SELINUX` -c -o $@ $<
- 
- %.obj:%.c
- 	$(WIN32_CC) $(WIN32_CFLAGS) -c -o $@ $<
diff --git a/debian/patches/fix_minus_chars_in_man.patch b/debian/patches/fix_minus_chars_in_man.patch
deleted file mode 100644
index f5ad5ac..0000000
--- a/debian/patches/fix_minus_chars_in_man.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-Description: Fix hyphen-used-as-minus-sign lintian warning in manpage
-Forwarded: no
-Author: Romain Beauxis <toots@rastageeks.org>
-Last-Update: 2016-02-13
---- a/ptunnel.8
-+++ b/ptunnel.8
-@@ -3,7 +3,7 @@
- ptunnel \- tunnel TCP connections over ICMP echo request/reply packets.
- .SH SYNOPSIS
- .B ptunnel
--\-p proxy_address \-lp listen_port \-da destination_address \-dp dest_port [\-c network_device] [\-v verbosity] [-f file] [-udp] [-syslog]
-+\-p proxy_address \-lp listen_port \-da destination_address \-dp dest_port [\-c network_device] [\-v verbosity] [\-f file] [\-udp] [\-syslog]
- 
- .B ptunnel
- [\-c network_device] [\-v verbosity] [\-f file] [\-udp] [\-syslog] [\-daemon file]
-@@ -39,13 +39,13 @@ Specifies/restrict the port that the pro
- Specify the network interface to capture packets from. Note that packet capturing isn't always necessary, but you should try this if you experience problems with ptunnel.
- .TP
- .B \-v verbosity
--Controls the verbosity level. -1 is no output, 0 shows errors only, 1 shows info messages, 2 gives more output, 3 provides even more output, level 4 displays debug info and level 5 displays absolutely everything, including the nasty details of sends and receives.
-+Controls the verbosity level. \-1 is no output, 0 shows errors only, 1 shows info messages, 2 gives more output, 3 provides even more output, level 4 displays debug info and level 5 displays absolutely everything, including the nasty details of sends and receives.
- .TP
- .B \-udp
--Enables tunneling over UDP port 53 (DNS) instead of using ICMP. This will only work if your proxy can accept incoming traffic on port 53, and the client is able to send data to the proxy on port 53. Note that this option does not wrap ptunnel's data in DNS-compliant packets. This option must be given on both the proxy and client side for things to work correctly.
-+Enables tunneling over UDP port 53 (DNS) instead of using ICMP. This will only work if your proxy can accept incoming traffic on port 53, and the client is able to send data to the proxy on port 53. Note that this option does not wrap ptunnel's data in DNS\-compliant packets. This option must be given on both the proxy and client side for things to work correctly.
- .TP
- .B \-syslog (Not available on Windows.)
--Changes logging to use the built-in syslog fascility.
-+Changes logging to use the built\-in syslog fascility.
- .TP
- .B \-daemon file (Not available on Windows.)
- Run in background, writing PID in file.
-@@ -64,13 +64,13 @@ When started in privileged mode, restric
- .TP
- .B \-setcon context (Not available on Windows.)
- Set SELinux context when all there is left to do are network I/O operations.
--In order to be able to combine with -chroot you will have to `mount --bind /proc /chrootdir/proc`
-+In order to be able to combine with \-chroot you will have to `mount --bind /proc /chrootdir/proc`
- .TP
- .B \-x password
- Specifies a password or passphrase to use. This will allow you to protect the proxy from use by others who don't know the password. It needs to be specified on both proxy and client.
- .TP
- .B \-f file
--Specifies a log file. If you specify -syslog, syslog is always used instead.
-+Specifies a log file. If you specify \-syslog, syslog is always used instead.
- .TP
- .B \-h
- Displays brief usage information.
-@@ -84,19 +84,19 @@ An ssh connection to login.domain.com ca
- .TP
- .B ssh \-p 8000 localhost
- .PP
--If ssh complains about potential man-in-the-middle attacks, simply remove the offending key from the known_hosts file. The warning/error is expected if you have previously ssh'd to your local computer (i.e., ssh localhost), or you have used ptunnel to forward ssh connections to different hosts.
-+If ssh complains about potential man\-in\-the\-middle attacks, simply remove the offending key from the known_hosts file. The warning/error is expected if you have previously ssh'd to your local computer (i.e., ssh localhost), or you have used ptunnel to forward ssh connections to different hosts.
- 
--Of course, for all of this to work, you need to start the proxy on your proxy-computer (proxy.pingtunnel.com). Doing this is very simple:
-+Of course, for all of this to work, you need to start the proxy on your proxy\-computer (proxy.pingtunnel.com). Doing this is very simple:
- 
- .B ptunnel
- 
- If you find that the proxy isn't working, you will need to enable packet capturing on the main network device. Currently this device is assumed to be an ethernet-device (i.e., ethernet or wireless). Packet capturing is enabled by giving the -c switch, and supplying the device name to capture packets on (for instance eth0 or en1). The same goes for the client. On Mac OS X, packet capturing must always be enabled (both for proxy and client), as resent packets won't be received otherwise.
- 
--To protect yourself from others using your proxy, you can protect access to it with a password using the <tt>-x</tt> switch. The password is never sent in the clear, but keep in mind that it may be visible from tools like top or ps, which can display the command line used to start an application.
-+To protect yourself from others using your proxy, you can protect access to it with a password using the <tt>\-x</tt> switch. The password is never sent in the clear, but keep in mind that it may be visible from tools like top or ps, which can display the command line used to start an application.
- 
- .SH EXIT STATUS
- .B ptunnel
--does not exit until forced to do so by an interrupt (Ctrl-C) or if it crashes.
-+does not exit until forced to do so by an interrupt (Ctrl\-C) or if it crashes.
- .SH BUGS
- .B ptunnel
- currently does not handle packet capturing on network interfaces other than ethernet or wireless correctly.
diff --git a/debian/patches/fix_typo.diff b/debian/patches/fix_typo.diff
deleted file mode 100644
index cb7ded8..0000000
--- a/debian/patches/fix_typo.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Fix typo in README file
-Forwarded: no
-Author: Daniel Echeverry <epsilon77@gmail.com>
-Last-Update: 2016-02-14
---- a/README
-+++ b/README
-@@ -10,7 +10,7 @@ ping requests and replies.
- 
- Contact details
- ---------------
--You can the author, Daniel Stoedle, here:
-+You can contact the author, Daniel Stoedle, here:
-    <daniels@cs.uit.no>
- The official ptunnel website is located here:
-    <http://www.cs.uit.no/~daniels/PingTunnel/>
diff --git a/debian/patches/makefile-debian-prefix.patch b/debian/patches/makefile-debian-prefix.patch
deleted file mode 100644
index 60b36d5..0000000
--- a/debian/patches/makefile-debian-prefix.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Set debian paths
-Forwarded: no
-Author: Romain Beauxis <toots@rastageeks.org>
-Last-Update: 2016-02-13
---- a/Makefile
-+++ b/Makefile
-@@ -12,8 +12,8 @@ WIN32_CFLAGS = -g -Wall -DWIN32 -I"c:\Pr
- WIN32_LDOPTS = -lwpcap -lwsock32 -L"c:\Program Files\WpdPack\Lib"
- WIN32_PT_OBJS = ptunnel.obj md5.obj
- 
--prefix		= /usr
--bindir		= $(prefix)/bin
-+prefix		= $(DESTDIR)/usr
-+bindir		= $(prefix)/sbin
- mandir		= $(prefix)/share/man/man8
- 
- all: ptunnel
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 9a8f77a..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,4 +0,0 @@
-add_hardening_flags.diff
-fix_typo.diff
-fix_minus_chars_in_man.patch
-makefile-debian-prefix.patch