cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 0.4

Browse Source 
looks fine to ajacoutot@
This commit is contained in:
pea 2011-01-12 15:19:14 +00:00
parent 0b2666605b
commit ae269d4653
9 changed files with 63 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
security/ctunnel/Makefile
View File

@ -1,13 +1,13 @@
# $OpenBSD: Makefile,v 1.1.1.1 2008/10/01 16:12:55 ajacoutot Exp $ # $OpenBSD: Makefile,v 1.2 2011/01/12 15:19:14 pea Exp $
COMMENT= provide cryptographic tunnel COMMENT= provide cryptographic tunnel
DISTNAME= ctunnel-0.2 DISTNAME= ctunnel-0.4
CATEGORIES= security CATEGORIES= security
HOMEPAGE= http://nardcore.org/ctunnel/ HOMEPAGE= http://nardcore.org/ctunnel/
MAINTAINER= Pierre-Emmanuel Andre <pea@raveland.org> MAINTAINER= Pierre-Emmanuel Andre <pea@openbsd.org>
# GPLv2 # GPLv2
PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_CDROM= Yes
@ -17,10 +17,12 @@ PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ${HOMEPAGE} MASTER_SITES= ${HOMEPAGE}
WANTLIB= c crypto WANTLIB= c crypto pthread z
NO_REGRESS= Yes NO_REGRESS= Yes
USE_GMAKE= Yes
post-install: post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ctunnel ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ctunnel
${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/ctunnel/ ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/ctunnel/

10
security/ctunnel/distinfo
View File

@ -1,5 +1,5 @@
MD5 (ctunnel-0.2.tar.gz) = QVJphRpUKvFfhNbQWeJY/A== MD5 (ctunnel-0.4.tar.gz) = k1xYkH9RDfRURE8V7kZ1Mw==
RMD160 (ctunnel-0.2.tar.gz) = u+87AZidlH4ohBetDjH5E1F4SY4= RMD160 (ctunnel-0.4.tar.gz) = 142wuL0tdl7RPetqWKNKObFc3b0=
SHA1 (ctunnel-0.2.tar.gz) = t5oSEHGmK6BMSj55Vl3PuN7L66Q= SHA1 (ctunnel-0.4.tar.gz) = ZW7ZQad6ODr5JhkpAltNiD1Lxro=
SHA256 (ctunnel-0.2.tar.gz) = ziZ5Jnm8ShxP7LOXr3OX0em0pmazkr/V4iaf5b4XohA= SHA256 (ctunnel-0.4.tar.gz) = 7KPyu6t7L2ucQvcjUdT8FLC2e8ZxRXc0lznLdD5KnTo=
SIZE (ctunnel-0.2.tar.gz) = 12476 SIZE (ctunnel-0.4.tar.gz) = 24880

29
security/ctunnel/patches/patch-Makefile
View File

@ -1,19 +1,12 @@
$OpenBSD: patch-Makefile,v 1.1.1.1 2008/10/01 16:12:55 ajacoutot Exp $ $OpenBSD: patch-Makefile,v 1.2 2011/01/12 15:19:15 pea Exp $
--- Makefile.orig Sat Sep 20 22:07:47 2008 --- Makefile.orig Wed Jun 2 05:55:03 2010
+++ Makefile Wed Oct 1 13:44:08 2008 +++ Makefile Wed Jan 12 09:31:45 2011
@@ -1,5 +1,5 @@ @@ -5,7 +5,7 @@ clean:
-CC=gcc $(MAKE) -C src/ clean
-CFLAGS=-Wall -g -O2
+CC ?= gcc
+CFLAGS ?= -Wall -g -O2
LDFLAGS=-lcrypto
all: ctunnel
@@ -9,6 +9,6 @@ ctunnel.o:
ctunnel: ctunnel.o
$(CC) $(CFLAGS) -o ctunnel ctunnel.o $(LDFLAGS)
install: install:
- install ctunnel /usr/local/bin $(MAKE) -C src/ install
+ install ctunnel $(PREFIX)/bin - install ctunnel.1 $(PREFIX)/share/man/man1
clean: + install ctunnel.1 $(PREFIX)/man/man1
rm -f ctunnel *.o uninstall:
$(MAKE) -C src/ uninstall
rm -f $(PREFIX)/share/man/man1/ctunnel.1

11
security/ctunnel/patches/patch-Makefile_cfg Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-Makefile_cfg,v 1.1 2011/01/12 15:19:15 pea Exp $
--- Makefile.cfg.orig Wed Jan 12 09:21:13 2011
+++ Makefile.cfg Wed Jan 12 09:21:58 2011
@@ -1,4 +1,4 @@
-CRYPTO_TYPE=GCRYPT
-#CRYPTO_TYPE=OPENSSL
+#CRYPTO_TYPE=GCRYPT
+CRYPTO_TYPE=OPENSSL
-PREFIX=/usr/local
+#PREFIX=/usr/local

21
security/ctunnel/patches/patch-README
View File

@ -1,21 +0,0 @@
$OpenBSD: patch-README,v 1.1.1.1 2008/10/01 16:12:55 ajacoutot Exp $
--- README.orig Wed Oct 1 13:39:34 2008
+++ README Wed Oct 1 13:39:55 2008
@@ -49,7 +49,7 @@ Examples
On the server machine (10.0.0.4 running the vnc server) we'll also run ctunnel.
- ./ctunnel -H 127.0.0.1 -s -l 2222 -f 2221 -C aes-256-cfb
+ ./ctunnel -H 127.0.0.1 -s -l 2222 -f 5901 -C aes-256-cfb
On the client machine (10.0.0.2) we run vncviewr throught the tunnel.
@@ -70,7 +70,7 @@ Examples
Server/10.0.0.4
- ./ctunnel -s -H 127.0.0.1 -l 2222 -f 2223 -C aes-256-cfb
+ ./ctunnel -s -H 127.0.0.1 -l 2222 -f 3306 -C aes-256-cfb
Client

21
security/ctunnel/patches/patch-ctunnel_c
View File

@ -1,21 +0,0 @@
$OpenBSD: patch-ctunnel_c,v 1.1.1.1 2008/10/01 16:12:55 ajacoutot Exp $
--- ctunnel.c.orig Sat Sep 20 22:12:59 2008
+++ ctunnel.c Wed Oct 1 14:42:37 2008
@@ -15,8 +15,8 @@
#include <sys/socket.h>
#include <netinet/in.h>
-#include <netinet/ip.h>
#include <netinet/in_systm.h>
+#include <netinet/ip.h>
#include <arpa/inet.h>
#include <netdb.h>
#include <sys/ioctl.h>
@@ -459,6 +459,7 @@ int main(int argc, char *argv[])
EVP_cleanup();
_exit(0);
} else {
+ signal(SIGCHLD, SIG_IGN);
close(clifd);
}
}

13
security/ctunnel/patches/patch-include_ctunnel_h Normal file
View File

@ -0,0 +1,13 @@
$OpenBSD: patch-include_ctunnel_h,v 1.1 2011/01/12 15:19:15 pea Exp $
--- include/ctunnel.h.orig Wed Jan 12 09:24:23 2011
+++ include/ctunnel.h Wed Jan 12 09:24:33 2011
@@ -10,8 +10,8 @@
#include <syslog.h>
#include <sys/socket.h>
#include <netinet/in.h>
-#include <netinet/ip.h>
#include <netinet/in_systm.h>
+#include <netinet/ip.h>
#include <arpa/inet.h>
#include <netdb.h>
#include <sys/ioctl.h>

15
security/ctunnel/patches/patch-src_Makefile Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-src_Makefile,v 1.1 2011/01/12 15:19:15 pea Exp $
--- src/Makefile.orig Thu Jun 3 08:05:01 2010
+++ src/Makefile Wed Jan 12 11:41:17 2011
@@ -1,7 +1,8 @@
include ../Makefile.cfg
-CC=gcc
-CFLAGS=-Wall -Wcast-align -Wshadow -Wstrict-prototypes -g -O2 -DHAVE_$(CRYPTO_TYPE) -I../include -I./include
-LDFLAGS=-lz -lpthread
+CC?=gcc
+CFLAGS ?=
+CFLAGS +=-Wall -Wcast-align -Wshadow -Wstrict-prototypes -DHAVE_$(CRYPTO_TYPE) -I../include -I./include
+LDFLAGS=-lz -pthread
ifeq ($(CRYPTO_TYPE),OPENSSL)
LDFLAGS+=-lcrypto

3
security/ctunnel/pkg/PLIST
View File

@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2008/10/01 16:12:55 ajacoutot Exp $ @comment $OpenBSD: PLIST,v 1.2 2011/01/12 15:19:15 pea Exp $
@bin bin/ctunnel @bin bin/ctunnel
@man man/man1/ctunnel.1
share/doc/ctunnel/ share/doc/ctunnel/
share/doc/ctunnel/README share/doc/ctunnel/README