Date: Fri, 28 Oct 2005 15:25:43 +0200 (CEST) From: Gabor Kovesdan <gabor.kovesdan@t-hosting.hu> To: FreeBSD-gnats-submit@FreeBSD.org Cc: Gabor Kovesdan <gabor.kovesdan@t-hosting.hu> Subject: ports/88134: [port update] net/cryptcat Message-ID: <20051028132543.DCF3599777B@server.t-hosting.hu> Resent-Message-ID: <200510281330.j9SDUHl5029238@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 88134
>Category: ports
>Synopsis: [port update] net/cryptcat
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Fri Oct 28 13:30:17 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Gabor Kovesdan
>Release: FreeBSD 5.3-RELEASE-p17 amd64
>Organization:
n/a
>Environment:
System: FreeBSD server.t-hosting.hu 5.3-RELEASE-p17 FreeBSD 5.3-RELEASE-p17 #0: Mon Jul 4 20:23:15 CEST 2005 root@server.t-hosting.hu:/usr/src/sys/amd64/compile/FREEBSD amd64
>Description:
- Chase mastersite
- Upgrade to newest version and change back to the old versioning as the developers did (arghhh...)
- Respect CFLAGS
- Remove obsolete patches
>How-To-Repeat:
>Fix:
--- cryptcat.diff begins here ---
diff -Nru /usr/ports/net/cryptcat/Makefile ../cryptcat/Makefile
--- /usr/ports/net/cryptcat/Makefile Fri Oct 28 14:35:04 2005
+++ ../cryptcat/Makefile Fri Oct 28 15:20:31 2005
@@ -6,11 +6,14 @@
#
PORTNAME= cryptcat
-PORTVERSION= 20031202
+PORTVERSION= 1.2.1
+PORTEPOCH= 1
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_GENTOO}
-MASTER_SITE_SUBDIR= distfiles
-DISTNAME= ${PORTNAME}_${PORTVERSION}
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR= ${PORTNAME}
+DISTNAME= ${PORTNAME}-unix-${PORTVERSION}
+EXTRACT_SUFX= .tar
+WRKSRC= ${WRKDIR}/unix
MAINTAINER= ports@oven.org
COMMENT= Standard netcat enhanced with twofish encryption
diff -Nru /usr/ports/net/cryptcat/distinfo ../cryptcat/distinfo
--- /usr/ports/net/cryptcat/distinfo Fri Oct 28 14:35:04 2005
+++ ../cryptcat/distinfo Fri Oct 28 15:15:43 2005
@@ -1,2 +1,2 @@
-MD5 (cryptcat_20031202.tar.gz) = bcbe1d6b26089f94cdb95e5823556289
-SIZE (cryptcat_20031202.tar.gz) = 67004
+MD5 (cryptcat-unix-1.2.1.tar) = fc4afff350f3dd5e4fe51b0dd01a8e21
+SIZE (cryptcat-unix-1.2.1.tar) = 190464
diff -Nru /usr/ports/net/cryptcat/files/patch-Makefile ../cryptcat/files/patch-Makefile
--- /usr/ports/net/cryptcat/files/patch-Makefile Thu Jan 1 01:00:00 1970
+++ ../cryptcat/files/patch-Makefile Fri Oct 28 15:08:42 2005
@@ -0,0 +1,44 @@
+--- Makefile.orig Tue May 22 21:06:42 2001
++++ Makefile Fri Oct 28 15:07:46 2005
+@@ -10,13 +10,11 @@
+ # debugging
+ # DFLAGS = -DTEST -DDEBUG
+ DFLAGS = -DGAPING_SECURITY_HOLE
+-CFLAGS = -O
+ XFLAGS = # xtra cflags, set by systype targets
+ XLIBS = # xtra libs if necessary?
+ # -Bstatic for sunos, -static for gcc, etc. You want this, trust me.
+ STATIC =
+-CC = cc $(CFLAGS)
+-LD = $(CC) -s # linker; defaults to stripped executables
++LD = $(CXX) -s # linker; defaults to stripped executables
+ o = o # object extension
+
+ ALL = cryptcat
+@@ -28,8 +26,11 @@
+
+ ### HARD TARGETS
+
+-cryptcat: netcat.c farm9crypt.o twofish2.o
+- $(LD) $(DFLAGS) $(XFLAGS) $(STATIC) -o cryptcat netcat.c farm9crypt.o twofish2.o $(XLIBS)
++netcat.o:
++ $(CC) $(CFLAGS) -c netcat.c
++
++cryptcat: netcat.o farm9crypt.o twofish2.o
++ $(LD) $(CFLAGS) $(DFLAGS) $(XFLAGS) $(STATIC) -o cryptcat netcat.o farm9crypt.o twofish2.o $(XLIBS)
+
+ nc-dos:
+ @echo "DOS?! Maybe someday, but not now"
+@@ -113,10 +114,10 @@
+ make -e $(ALL) $(MFLAGS) XFLAGS='-DNEXT' STATIC=-Bstatic
+
+ farm9crypt.o: farm9crypt.cc farm9crypt.h
+- ${CC} -c farm9crypt.cc
++ ${CC} ${CFLAGS} -c farm9crypt.cc
+
+ twofish2.o: twofish2.cc twofish2.h
+- ${CC} -c twofish2.cc
++ ${CC} ${CFLAGS} -c twofish2.cc
+
+ # start with this for a new architecture, and see what breaks.
+ generic:
diff -Nru /usr/ports/net/cryptcat/files/patch-aa ../cryptcat/files/patch-aa
--- /usr/ports/net/cryptcat/files/patch-aa Thu Sep 5 04:32:27 2002
+++ ../cryptcat/files/patch-aa Thu Jan 1 01:00:00 1970
@@ -1,55 +0,0 @@
---- Makefile.orig Wed Sep 20 05:25:36 2000
-+++ Makefile Wed Sep 4 19:31:33 2002
-@@ -10,13 +10,13 @@
- # debugging
- # DFLAGS = -DTEST -DDEBUG
- DFLAGS = -DGAPING_SECURITY_HOLE
--CFLAGS = -O
-+CFLAGS ?= -O
- XFLAGS = # xtra cflags, set by systype targets
- XLIBS = # xtra libs if necessary?
- # -Bstatic for sunos, -static for gcc, etc. You want this, trust me.
- STATIC =
--CC = cc $(CFLAGS)
--LD = $(CC) -s # linker; defaults to stripped executables
-+CXX ?= c++
-+LD = $(CXX) -s # linker; defaults to stripped executables
- o = o # object extension
-
- ALL = cryptcat
-@@ -28,8 +28,11 @@
-
- ### HARD TARGETS
-
--cryptcat: netcat.c farm9crypt.o twofish2.o
-- $(LD) $(DFLAGS) $(XFLAGS) $(STATIC) -o cryptcat netcat.c farm9crypt.o twofish2.o $(XLIBS)
-+netcat.o:
-+ $(CC) $(CFLAGS) -c netcat.c
-+
-+cryptcat: netcat.o farm9crypt.o twofish2.o
-+ $(LD) $(CFLAGS) $(DFLAGS) $(XFLAGS) $(STATIC) -o cryptcat netcat.o farm9crypt.o twofish2.o $(XLIBS)
-
- nc-dos:
- @echo "DOS?! Maybe someday, but not now"
-@@ -82,7 +85,7 @@
-
- # virtually the same as netbsd/bsd44lite/whatever
- freebsd:
-- make -e $(ALL) $(MFLAGS) XFLAGS='-DFREEBSD' STATIC=-static
-+ make -e $(ALL) $(MFLAGS) XFLAGS='-DFREEBSD -DGAPING_SECURITY_HOLE -DTELNET' STATIC=-static
-
- bsdi:
- make -e $(ALL) $(MFLAGS) XFLAGS='-DBSDI' STATIC=-Bstatic
-@@ -111,10 +114,10 @@
- make -e $(ALL) $(MFLAGS) XFLAGS='-DNEXT' STATIC=-Bstatic
-
- farm9crypt.o: farm9crypt.cc farm9crypt.h
-- ${CC} -c farm9crypt.cc
-+ ${CXX} ${CXXFLAGS} -c farm9crypt.cc
-
- twofish2.o: twofish2.cc twofish2.h
-- ${CC} -c twofish2.cc
-+ ${CXX} ${CXXFLAGS} -c twofish2.cc
-
- # start with this for a new architecture, and see what breaks.
- generic:
diff -Nru /usr/ports/net/cryptcat/files/patch-ab ../cryptcat/files/patch-ab
--- /usr/ports/net/cryptcat/files/patch-ab Thu Sep 5 04:32:27 2002
+++ ../cryptcat/files/patch-ab Thu Jan 1 01:00:00 1970
@@ -1,10 +0,0 @@
---- farm9crypt.cc.orig Mon Oct 2 05:08:44 2000
-+++ farm9crypt.cc Wed Sep 4 19:27:56 2002
-@@ -21,6 +21,7 @@
- #include <sys/types.h> // suggested by several people -- for OpenBSD, FreeBSD compiles
- #include <sys/socket.h> /* basics, SO_ and AF_ defs, sockaddr, ... */
- #include <stdlib.h>
-+#include <string.h>
- #else
- #include <fcntl.h>
- #include <io.h>
diff -Nru /usr/ports/net/cryptcat/files/patch-netcat.c ../cryptcat/files/patch-netcat.c
--- /usr/ports/net/cryptcat/files/patch-netcat.c Wed Dec 11 08:28:20 2002
+++ ../cryptcat/files/patch-netcat.c Thu Jan 1 01:00:00 1970
@@ -1,26 +0,0 @@
---- netcat.c.orig Wed Nov 6 13:42:04 2002
-+++ netcat.c Wed Nov 6 13:47:27 2002
-@@ -45,9 +45,6 @@
- #else
- #include <malloc.h>
- #endif
--#ifdef HAVE_SELECT_H /* random SV variants need this */
--#include <sys/select.h>
--#endif
-
- /* have to do this *before* including types.h. xxx: Linux still has it wrong */
- #ifdef FD_SETSIZE /* should be in types.h, butcha never know. */
-@@ -55,6 +52,12 @@
- #endif /* fd's, something is horribly wrong! */
- #define FD_SETSIZE 16 /* <-- this'll give us a long anyways, wtf */
- #include <sys/types.h> /* *now* do it. Sigh, this is broken */
-+#ifdef __FreeBSD__
-+#include <inttypes.h>
-+#endif
-+#ifdef HAVE_SELECT_H /* random SV variants need this */
-+#include <sys/select.h>
-+#endif
-
- #ifdef HAVE_RANDOM /* aficionados of ?rand48() should realize */
- #define SRAND srandom /* that this doesn't need *strong* random */
-
diff -Nru /usr/ports/net/cryptcat/pkg-descr ../cryptcat/pkg-descr
--- /usr/ports/net/cryptcat/pkg-descr Sat Mar 10 19:29:41 2001
+++ ../cryptcat/pkg-descr Fri Oct 28 15:19:21 2005
@@ -15,6 +15,4 @@
For more information about netcat see net/netcat port.
-WWW: http://farm9.com/content/Free_Tools/Cryptcat/
-
-Roman Shterenzon <roman@xpert.com>
+WWW: http://sourceforge.net/projects/cryptcat/
--- cryptcat.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20051028132543.DCF3599777B>