sdk
/
patches
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
patches/ctunnel-0.8.diff

187 lines
6.3 KiB
Diff
Raw Permalink Blame History

Index: Makefile
===================================================================
RCS file: /cvs/ports/security/ctunnel/Makefile,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 Makefile
--- Makefile 11 Mar 2022 19:53:20 -0000 1.8
+++ Makefile 14 Nov 2022 20:55:49 -0000
@@ -1,9 +1,10 @@
COMMENT= provide cryptographic tunnel
-DISTNAME= ctunnel-0.4
+GH_ACCOUNT= alienrobotarmy
+GH_PROJECT= ctunnel
+GH_COMMIT= ec5e388e1dd3b684cd1cea1ed5c67f99d42bf4f3
+DISTNAME= ctunnel-0.8
CATEGORIES= security
-REVISION= 1
-FIX_EXTRACT_PERMISSIONS=Yes
HOMEPAGE= http://nardcore.org/ctunnel/
@@ -12,9 +13,7 @@ MAINTAINER= Pierre-Emmanuel Andre <pea@o
# GPLv2
PERMIT_PACKAGE= Yes
-MASTER_SITES= ${HOMEPAGE}
-
-WANTLIB= c crypto pthread z
+WANTLIB += c crypto pthread util z
NO_TEST= Yes
@@ -22,6 +21,6 @@ USE_GMAKE= Yes
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ctunnel
- ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/ctunnel/
+ ${INSTALL_DATA} ${WRKSRC}/README.md ${PREFIX}/share/doc/ctunnel/
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/security/ctunnel/distinfo,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 distinfo
--- distinfo 18 Jan 2015 03:15:01 -0000 1.3
+++ distinfo 14 Nov 2022 20:55:49 -0000
@@ -1,2 +1,2 @@
-SHA256 (ctunnel-0.4.tar.gz) = 7KPyu6t7L2ucQvcjUdT8FLC2e8ZxRXc0lznLdD5KnTo=
-SIZE (ctunnel-0.4.tar.gz) = 24880
+SHA256 (ctunnel-0.8-ec5e388e.tar.gz) = fUlQ9Ka6EeXaqyTG+PqEhRK0/Ro5a1QD89vPQL9bT6M=
+SIZE (ctunnel-0.8-ec5e388e.tar.gz) = 49370
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/security/ctunnel/patches/patch-Makefile,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-Makefile
--- patches/patch-Makefile 11 Mar 2022 19:53:20 -0000 1.3
+++ patches/patch-Makefile 14 Nov 2022 20:55:49 -0000
@@ -1,11 +1,15 @@
---- Makefile.orig Wed Jun 2 05:55:03 2010
-+++ Makefile Wed Jan 12 09:31:45 2011
-@@ -5,7 +5,7 @@ clean:
+Index: Makefile
+--- Makefile.orig
++++ Makefile
+@@ -5,8 +5,8 @@ clean:
$(MAKE) -C src/ clean
install:
$(MAKE) -C src/ install
+- install -d $(PREFIX)/share/man/man1
- install ctunnel.1 $(PREFIX)/share/man/man1
++ install -d $(PREFIX)/man/man1
+ install ctunnel.1 $(PREFIX)/man/man1
uninstall:
$(MAKE) -C src/ uninstall
- rm -f $(PREFIX)/share/man/man1/ctunnel.1
+- rm -f $(PREFIX)/share/man/man1/ctunnel.1
++ rm -f $(PREFIX)/man/man1/ctunnel.1
Index: patches/patch-Makefile_cfg
===================================================================
RCS file: /cvs/ports/security/ctunnel/patches/patch-Makefile_cfg,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-Makefile_cfg
--- patches/patch-Makefile_cfg 11 Mar 2022 19:53:20 -0000 1.2
+++ patches/patch-Makefile_cfg 14 Nov 2022 20:55:49 -0000
@@ -1,10 +1,10 @@
---- 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
-
+Index: Makefile.cfg
+--- Makefile.cfg.orig
++++ Makefile.cfg
+@@ -1,6 +1,3 @@
+ #CRYPTO_TYPE=GCRYPT
+ CRYPTO_TYPE=OPENSSL
+-TUNTAP=yes
+ #OPTS=-mmacosx-version-min=10.4
+-
-PREFIX=/usr/local
-+#PREFIX=/usr/local
Index: patches/patch-include_ctunnel_h
===================================================================
RCS file: /cvs/ports/security/ctunnel/patches/patch-include_ctunnel_h,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-include_ctunnel_h
--- patches/patch-include_ctunnel_h 11 Mar 2022 19:53:20 -0000 1.2
+++ patches/patch-include_ctunnel_h 14 Nov 2022 20:55:49 -0000
@@ -1,6 +1,7 @@
---- 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 @@
+Index: include/ctunnel.h
+--- include/ctunnel.h.orig
++++ include/ctunnel.h
+@@ -13,8 +13,8 @@
#include <syslog.h>
#include <sys/socket.h>
#include <netinet/in.h>
Index: patches/patch-src_Makefile
===================================================================
RCS file: /cvs/ports/security/ctunnel/patches/patch-src_Makefile,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-src_Makefile
--- patches/patch-src_Makefile 11 Mar 2022 19:53:20 -0000 1.3
+++ patches/patch-src_Makefile 14 Nov 2022 20:55:49 -0000
@@ -1,12 +1,14 @@
---- src/Makefile.orig Thu Jun 3 08:05:01 2010
-+++ src/Makefile Sun Aug 19 15:28:03 2012
-@@ -1,6 +1,7 @@
+Index: src/Makefile
+--- src/Makefile.orig
++++ src/Makefile
+@@ -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
+CC?=gcc
-+CFLAGS ?=
-+CFLAGS +=-Wall -Wcast-align -Wshadow -Wstrict-prototypes -DHAVE_$(CRYPTO_TYPE) -I../include -I./include
- LDFLAGS=-lz -lpthread
+ BUILD=$(shell svnversion . | sed -e 's/^[0-9].*://g' -e 's/[a-zA-Z]//g')
+-CFLAGS=-g -Wall -Wextra -Wcast-align -Wshadow -Wstrict-prototypes -O2 -Wno-makunused-but-set-parameter -Wno-unused-variable ${OPTS} -DHAVE_$(CRYPTO_TYPE) -I../include -I./include
++CFLAGS?=
++CFLAGS+=-g -Wall -Wextra -Wcast-align -Wshadow -Wstrict-prototypes -Wno-makunused-but-set-parameter -Wno-unused-variable ${OPTS} -DHAVE_$(CRYPTO_TYPE) -I../include -I./include
+ LDFLAGS=-lz -lpthread -lutil -lc
- ifeq ($(CRYPTO_TYPE),OPENSSL)
+ #objects := $(patsubst %.c,%.o,$(wildcard *.c))
Index: patches/patch-src_crypto_c
===================================================================
RCS file: patches/patch-src_crypto_c
diff -N patches/patch-src_crypto_c
--- patches/patch-src_crypto_c 11 Mar 2022 19:53:20 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-Index: src/crypto.c
---- src/crypto.c.orig
-+++ src/crypto.c
-@@ -21,7 +21,7 @@
- #ifdef HAVE_OPENSSL
- crypto_ctx *openssl_crypto_init(struct options opt, int dir)
- {
-- crypto_ctx *ctx = calloc(1, sizeof(crypto_ctx));
-+ crypto_ctx *ctx = EVP_CIPHER_CTX_new();
-
- /* STREAM CIPHERS ONLY */
- EVP_CIPHER_CTX_init(ctx);
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/security/ctunnel/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 PLIST
--- pkg/PLIST 11 Mar 2022 19:53:20 -0000 1.3
+++ pkg/PLIST 14 Nov 2022 20:55:49 -0000
@@ -1,4 +1,4 @@
@bin bin/ctunnel
@man man/man1/ctunnel.1
share/doc/ctunnel/
-share/doc/ctunnel/README
+share/doc/ctunnel/README.md
Reference in New Issue View Git Blame Copy Permalink