Attachment #88784 for bug #125622

View | Details | Raw Unified | Return to bug 125622
Collapse All | Expand All





PORTNAME=	irssi-fish
DISTVERSION=	0.99
PORTREVISION=	2
CATEGORIES=	irc security
MASTER_SITES=	http://fish.sekure.us/irssi/
DISTNAME=	FiSH-irssi.v${DISTVERSION}-source

MAINTAINER=	wahjava@gmail.com
COMMENT=	An encryption plugin for irssi

BUILD_DEPENDS=	${LOCALBASE}/include/glib-2.0/glib.h:${PORTSDIR}/devel/glib20 \
		${LOCALBASE}/lib/libmiracl.a:${PORTSDIR}/math/miracl \
		${LOCALBASE}/include/irssi/src/common.h:${PORTSDIR}/irc/irssi
RUN_DEPENDS=	irssi:${PORTSDIR}/irc/irssi

USE_ZIP=	yes

PLIST_FILES=	lib/irssi/modules/libfish.so
PORTDOCS=	FiSH-irssi.txt FiSH-irssi_History.txt

IRSSI_WRKSRC!=	cd ${.CURDIR}/../irssi && ${MAKE} -V WRKSRC

.include <bsd.port.pre.mk>

.if ${ARCH} == "amd64"
ALL_TARGET=	amd64

.if ${OSVERSION} >= 700042
BROKEN=		does not compile
.endif
.endif

post-patch:

		-e 's|-O2|${CFLAGS}|' \
		-e 's|-shared|-shared -fPIC -DPIC|' \
		-e 's|[$$][(]HOME[)]/glib-1.2.10|${LOCALBASE}/include/glib-2.0|' \
		-e 's|[$$][(]HOME[)]/irssi-0.8.9|${LOCALBASE}/include/irssi|' \
		-e 's|miracl.a|${LOCALBASE}/lib/libmiracl.a|' \
		-e 's|\@echo \"Press ENTER to continue or CTRL\+C to abort...\"\; read junk||' \
		${WRKSRC}/Makefile





$FreeBSD$

--- DH1080.c.orig
+++ DH1080.c
@@ -13,6 +13,7 @@
 
 #include <stdio.h>
 #include <time.h>
+#include <string.h>
 #include "DH1080.h"
 
 // ### new sophie-germain 1080bit prime number ###





$FreeBSD$

--- Makefile.orig
+++ Makefile
@@ -124,10 +124,10 @@
 	gcc -c -static -fPIC cfgopts.c
 
 	gcc -static -c -fPIC DH1080.c
-	gcc -static -fPIC -shared DH1080.o miracl.a SHA-256.o base64.o -o DH1080.so
+	gcc -fPIC -shared DH1080.o miracl.a SHA-256.o base64.o -o DH1080.so
 
 	gcc -I. -I$(glib_dir) -I$(glib_dir)/include -I$(glib_dir)/glib -I$(irssi_dir) -I$(irssi_dir)/src -I$(irssi_dir)/src/core -I$(irssi_dir)/src/fe-common/core -static -O2 -Wall -c FiSH.c -fPIC -DPIC -o FiSH.o
-	gcc -static -fPIC -shared FiSH.o SHA-256.o base64.o blowfish.o cfgopts.o DH1080.o miracl.a -o libfish.so
+	gcc -fPIC -shared FiSH.o SHA-256.o base64.o blowfish.o cfgopts.o DH1080.o miracl.a -o libfish.so
 
 	@echo 
 	@ls -l libfish.so





$FreeBSD$

--- SHA-256.c.orig
+++ SHA-256.c
@@ -12,6 +12,7 @@
  * */
 
 #include <stdio.h>
+#include <string.h>
 
 typedef struct {
     unsigned int state[8], length, curlen;





$FreeBSD$

--- base64.c.orig
+++ base64.c
@@ -1,6 +1,9 @@
 /*
     Public Base64 conversion tables
 */
+
+#include <string.h>
+
 unsigned char B64ABC[]="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
 unsigned char b64buf[256];
 





$FreeBSD$

--- blowfish.c.orig
+++ blowfish.c
@@ -1,4 +1,6 @@
 #include "blowfish.h"
+#include <string.h>
+#include <stdlib.h>
 
 /* #define S(x,i) (bf_S[i][x.w.byte##i]) */
 #define S0(x) (bf_S[0][x.w.byte0])

Return to bug 125622

Lines 7-23 Link Here

(-)/home/abbe/ports/irssi-fish/Makefile (-10 / +4 lines)
7		7
8	PORTNAME= irssi-fish	8	PORTNAME= irssi-fish
9	DISTVERSION= 0.99	9	DISTVERSION= 0.99
10	PORTREVISION= 1	10	PORTREVISION= 2
11	CATEGORIES= irc security	11	CATEGORIES= irc security
12	MASTER_SITES= http://fish.sekure.us/irssi/	12	MASTER_SITES= http://fish.sekure.us/irssi/
13	DISTNAME= FiSH-irssi.v${DISTVERSION}-source	13	DISTNAME= FiSH-irssi.v${DISTVERSION}-source
14		14
15	MAINTAINER= ports@FreeBSD.org	15	MAINTAINER= wahjava@gmail.com
16	COMMENT= An encryption plugin for irssi	16	COMMENT= An encryption plugin for irssi
17		17
18	BUILD_DEPENDS= ${LOCALBASE}/include/glib-2.0/glib.h:${PORTSDIR}/devel/glib20 \	18	BUILD_DEPENDS= ${LOCALBASE}/include/glib-2.0/glib.h:${PORTSDIR}/devel/glib20 \
19	${LOCALBASE}/lib/libmiracl.a:${PORTSDIR}/math/miracl \	19	${LOCALBASE}/lib/libmiracl.a:${PORTSDIR}/math/miracl \
20	${NONEXISTENT}:${PORTSDIR}/irc/irssi:patch	20	${LOCALBASE}/include/irssi/src/common.h:${PORTSDIR}/irc/irssi
21	RUN_DEPENDS= irssi:${PORTSDIR}/irc/irssi	21	RUN_DEPENDS= irssi:${PORTSDIR}/irc/irssi
22		22
23	USE_ZIP= yes	23	USE_ZIP= yes
Lines 25-40 Link Here
25	PLIST_FILES= lib/irssi/modules/libfish.so	25	PLIST_FILES= lib/irssi/modules/libfish.so
26	PORTDOCS= FiSH-irssi.txt FiSH-irssi_History.txt	26	PORTDOCS= FiSH-irssi.txt FiSH-irssi_History.txt
27		27
28	IRSSI_WRKSRC!= cd ${.CURDIR}/../irssi && ${MAKE} -V WRKSRC
29
30	.include <bsd.port.pre.mk>	28	.include <bsd.port.pre.mk>
31		29
32	.if ${ARCH} == "amd64"	30	.if ${ARCH} == "amd64"
33	ALL_TARGET= amd64	31	ALL_TARGET= amd64
34
35	.if ${OSVERSION} >= 700042
36	BROKEN= does not compile
37	.endif
38	.endif	32	.endif
39		33
40	post-patch:	34	post-patch:
Lines 44-50 Link Here
44	-e 's\|-O2\|${CFLAGS}\|' \	38	-e 's\|-O2\|${CFLAGS}\|' \
45	-e 's\|-shared\|-shared -fPIC -DPIC\|' \	39	-e 's\|-shared\|-shared -fPIC -DPIC\|' \
46	-e 's\|[$$][(]HOME[)]/glib-1.2.10\|${LOCALBASE}/include/glib-2.0\|' \	40	-e 's\|[$$][(]HOME[)]/glib-1.2.10\|${LOCALBASE}/include/glib-2.0\|' \
47	-e 's\|[$$][(]HOME[)]/irssi-0.8.9\|${IRSSI_WRKSRC}\|' \	41	-e 's\|[$$][(]HOME[)]/irssi-0.8.9\|${LOCALBASE}/include/irssi\|' \
48	-e 's\|miracl.a\|${LOCALBASE}/lib/libmiracl.a\|' \	42	-e 's\|miracl.a\|${LOCALBASE}/lib/libmiracl.a\|' \
49	-e 's\|\@echo \"Press ENTER to continue or CTRL\+C to abort...\"\; read junk\|\|' \	43	-e 's\|\@echo \"Press ENTER to continue or CTRL\+C to abort...\"\; read junk\|\|' \
50	${WRKSRC}/Makefile	44	${WRKSRC}/Makefile

Line 0 Link Here

(-)/home/abbe/ports/irssi-fish/files/patch-DH1080.c (+13 lines)
	1
	2	$FreeBSD$
	3
	4	--- DH1080.c.orig
	5	+++ DH1080.c
	6	@@ -13,6 +13,7 @@
	7
	8	#include <stdio.h>
	9	#include <time.h>
	10	+#include <string.h>
	11	#include "DH1080.h"
	12
	13	// ### new sophie-germain 1080bit prime number ###

Line 0 Link Here

(-)/home/abbe/ports/irssi-fish/files/patch-Makefile (+18 lines)
	1
	2	$FreeBSD$
	3
	4	--- Makefile.orig
	5	+++ Makefile
	6	@@ -124,10 +124,10 @@
	7	gcc -c -static -fPIC cfgopts.c
	8
	9	gcc -static -c -fPIC DH1080.c
	10	- gcc -static -fPIC -shared DH1080.o miracl.a SHA-256.o base64.o -o DH1080.so
	11	+ gcc -fPIC -shared DH1080.o miracl.a SHA-256.o base64.o -o DH1080.so
	12
	13	gcc -I. -I$(glib_dir) -I$(glib_dir)/include -I$(glib_dir)/glib -I$(irssi_dir) -I$(irssi_dir)/src -I$(irssi_dir)/src/core -I$(irssi_dir)/src/fe-common/core -static -O2 -Wall -c FiSH.c -fPIC -DPIC -o FiSH.o
	14	- gcc -static -fPIC -shared FiSH.o SHA-256.o base64.o blowfish.o cfgopts.o DH1080.o miracl.a -o libfish.so
	15	+ gcc -fPIC -shared FiSH.o SHA-256.o base64.o blowfish.o cfgopts.o DH1080.o miracl.a -o libfish.so
	16
	17	@echo
	18	@ls -l libfish.so

Line 0 Link Here

(-)/home/abbe/ports/irssi-fish/files/patch-SHA-256.c (+13 lines)
	1
	2	$FreeBSD$
	3
	4	--- SHA-256.c.orig
	5	+++ SHA-256.c
	6	@@ -12,6 +12,7 @@
	7	* */
	8
	9	#include <stdio.h>
	10	+#include <string.h>
	11
	12	typedef struct {
	13	unsigned int state[8], length, curlen;

Line 0 Link Here

(-)/home/abbe/ports/irssi-fish/files/patch-base64.c (+15 lines)
	1
	2	$FreeBSD$
	3
	4	--- base64.c.orig
	5	+++ base64.c
	6	@@ -1,6 +1,9 @@
	7	/*
	8	Public Base64 conversion tables
	9	*/
	10	+
	11	+#include <string.h>
	12	+
	13	unsigned char B64ABC[]="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
	14	unsigned char b64buf[256];
	15

Line 0 Link Here

(-)/home/abbe/ports/irssi-fish/files/patch-blowfish.c (+12 lines)
	1
	2	$FreeBSD$
	3
	4	--- blowfish.c.orig
	5	+++ blowfish.c
	6	@@ -1,4 +1,6 @@
	7	#include "blowfish.h"
	8	+#include <string.h>
	9	+#include <stdlib.h>
	10
	11	/* #define S(x,i) (bf_S[i][x.w.byte##i]) */
	12	#define S0(x) (bf_S[0][x.w.byte0])