ports/79101: [MAINTAINER] [PATCH] Update security/gaim-otr from 1.0.1 to 2.0.1
Conor McDermottroe
ports at mcdermottroe.com
Mon Mar 21 19:10:03 UTC 2005
>Number: 79101
>Category: ports
>Synopsis: [MAINTAINER] [PATCH] Update security/gaim-otr from 1.0.1 to 2.0.1
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Mon Mar 21 19:10:02 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Conor McDermottroe
>Release: FreeBSD 5.3-RELEASE-p5 amd64
>Organization:
>Environment:
System: FreeBSD platinum.office.edgespace.net 5.3-RELEASE-p5 FreeBSD 5.3-RELEASE-p5 #5: Sun Mar 13 15:15:23 GMT 2005 root at platinum.office.edgespace.net:/usr/obj/usr/src/sys/PLATINUM amd64
>Description:
Update to version 2.0.1
N.B.: This change depends on the PR for security/libotr to be resolved first.
This port now depends on security/libotr
>How-To-Repeat:
>Fix:
diff -ruN gaim-otr.orig/Makefile gaim-otr/Makefile
--- gaim-otr.orig/Makefile Sun Mar 20 17:08:06 2005
+++ gaim-otr/Makefile Mon Mar 21 18:34:30 2005
@@ -1,3 +1,4 @@
+# ex:ts=8
# New ports collection makefile for: Gaim-OTR
# Date created: 2004-12-17
# Whom: Conor McDermottroe <ports at mcdermottroe.com>
@@ -6,7 +7,7 @@
#
PORTNAME= otr
-PORTVERSION= 1.0.1
+PORTVERSION= 2.0.1
CATEGORIES= security net
MASTER_SITES= http://www.cypherpunks.ca/otr/
PKGNAMEPREFIX= gaim-
@@ -18,7 +19,7 @@
BUILD_DEPENDS= ${X11BASE}/include/gaim/config.h:${PORTSDIR}/net/gaim \
pkg-config:${PORTSDIR}/devel/pkgconfig
RUN_DEPENDS= gaim:${PORTSDIR}/net/gaim
-LIB_DEPENDS= gpg-error:${PORTSDIR}/security/libgpg-error \
+LIB_DEPENDS= otr:${PORTSDIR}/security/libotr \
gcrypt:${PORTSDIR}/security/libgcrypt
USE_X_PREFIX= yes
@@ -26,27 +27,13 @@
USE_GNOME= glib20 gtk20
USE_REINPLACE= yes
-MAN1= otr_toolkit.1
-MLINKS= otr_toolkit.1 otr_parse.1 \
- otr_toolkit.1 otr_sesskeys.1 \
- otr_toolkit.1 otr_mackey.1 \
- otr_toolkit.1 otr_readforge.1 \
- otr_toolkit.1 otr_modify.1 \
- otr_toolkit.1 otr_remac.1
-
post-patch:
${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \
- ${WRKSRC}/gaim-otr/Makefile \
- ${WRKSRC}/libotr/Makefile \
- ${WRKSRC}/tools/Makefile
+ ${WRKSRC}/Makefile
${REINPLACE_CMD} -e "s|%%X11BASE%%|${X11BASE}|g" \
- ${WRKSRC}/gaim-otr/Makefile
+ ${WRKSRC}/Makefile
do-install:
${INSTALL_DATA} ${WRKSRC}/gaim-otr.so ${PREFIX}/lib/gaim
- ${INSTALL_MAN} ${WRKSRC}/tools/otr_toolkit.1 ${PREFIX}/man/man1
-.for P in otr_parse otr_sesskeys otr_mackey otr_readforge otr_modify otr_remac
- ${INSTALL_PROGRAM} ${WRKSRC}/${P} ${PREFIX}/bin
-.endfor
.include <bsd.port.mk>
diff -ruN gaim-otr.orig/distinfo gaim-otr/distinfo
--- gaim-otr.orig/distinfo Sun Mar 20 17:08:06 2005
+++ gaim-otr/distinfo Mon Mar 21 17:47:36 2005
@@ -1,2 +1,2 @@
-MD5 (gaim-otr-1.0.1.tar.gz) = efc22af7c4a17448da75419bbaeb80d6
-SIZE (gaim-otr-1.0.1.tar.gz) = 76536
+MD5 (gaim-otr-2.0.1.tar.gz) = 873568dac983b7182ad3ac6545567377
+SIZE (gaim-otr-2.0.1.tar.gz) = 34691
diff -ruN gaim-otr.orig/files/patch-Makefile gaim-otr/files/patch-Makefile
--- gaim-otr.orig/files/patch-Makefile Sun Mar 20 17:08:06 2005
+++ gaim-otr/files/patch-Makefile Mon Mar 21 18:32:08 2005
@@ -1,10 +1,33 @@
---- Makefile.bak Fri Dec 17 16:19:08 2004
-+++ Makefile Fri Dec 17 16:19:16 2004
-@@ -1,4 +1,4 @@
- all install clean distclean:
-- make -C libotr $@
-- make -C gaim-otr $@
-- make -C tools $@
-+ gmake -C libotr $@
-+ gmake -C gaim-otr $@
-+ gmake -C tools $@
+--- Makefile.orig Wed Feb 23 14:49:10 2005
++++ Makefile Mon Mar 21 18:31:51 2005
+@@ -2,7 +2,7 @@
+ GAIM_OTR_VERSION = 2.0.1
+
+ # Replace this with the path to the GAIM headers
+-GAIM_SOURCE ?= /usr/include/gaim
++GAIM_SOURCE ?= %%X11BASE%%/include/gaim
+
+ # If you don't have pkg-config, put the appropriate -I entry on the next line
+ GTK_HDRS ?= `pkg-config --cflags glib-2.0 gtk+-2.0`
+@@ -10,10 +10,10 @@
+ # The location of the libotr include files. Note that if, for example,
+ # the full path of message.h is /usr/include/libotr/message.h, you
+ # should put /usr/include on the next line, not /usr/include/libotr
+-LIBOTRINCDIR = /usr/include
++LIBOTRINCDIR = %%LOCALBASE%%/include
+
+ # The locataion of libotr.a.
+-LIBOTRLIBDIR = /usr/lib
++LIBOTRLIBDIR = %%LOCALBASE%%/lib
+
+ # The target
+ TARGET = gaim-otr.so
+@@ -29,7 +29,7 @@
+ -lgcrypt -lgpg-error
+ else
+ FPIC = -fPIC
+-LDFLAGS = -module -avoid-version
++LDFLAGS = -module -avoid-version -L%%LOCALBASE%%/lib
+ LDLIBS = -lotr -lgcrypt
+ endif
+
diff -ruN gaim-otr.orig/files/patch-gaim-otr-Makefile gaim-otr/files/patch-gaim-otr-Makefile
--- gaim-otr.orig/files/patch-gaim-otr-Makefile Sun Mar 20 17:08:06 2005
+++ gaim-otr/files/patch-gaim-otr-Makefile Thu Jan 1 01:00:00 1970
@@ -1,22 +0,0 @@
---- gaim-otr/Makefile.bak Fri Dec 17 17:11:49 2004
-+++ gaim-otr/Makefile Fri Dec 17 17:12:57 2004
-@@ -1,5 +1,5 @@
- # Replace this with the path to the GAIM headers
--GAIM_SOURCE ?= /usr/include/gaim
-+GAIM_SOURCE ?= %%X11BASE%%/include/gaim
-
- # If you don't have pkg-config, put the appropriate -I entry on the next line
- GTK_HDRS ?= `pkg-config --cflags glib-2.0 gtk+-2.0`
-@@ -19,10 +19,10 @@
- all: $(TARGET)
-
- $(TARGET): otr-plugin.o ui.o dialogs.o $(LIBOTR_DIR)/libotr.a
-- $(CC) -g -shared -module -avoid-version $^ -o $@ -lgcrypt
-+ $(CC) -g -shared -module -avoid-version -L %%LOCALBASE%%/lib $^ -o $@ -lgcrypt
-
- $(LIBOTR_DIR)/libotr.a: FORCE
-- make -C $(LIBOTR_DIR) libotr.a
-+ gmake -C $(LIBOTR_DIR) libotr.a
-
- install: all
- install -d $(INSTALLDIR)
diff -ruN gaim-otr.orig/files/patch-libotr-Makefile gaim-otr/files/patch-libotr-Makefile
--- gaim-otr.orig/files/patch-libotr-Makefile Sun Mar 20 17:08:06 2005
+++ gaim-otr/files/patch-libotr-Makefile Thu Jan 1 01:00:00 1970
@@ -1,9 +0,0 @@
---- libotr/Makefile.bak Fri Dec 17 16:31:14 2004
-+++ libotr/Makefile Fri Dec 17 16:31:53 2004
-@@ -1,5 +1,5 @@
- CC ?= gcc
--override CFLAGS += -g -Wall -fPIC
-+CFLAGS += -g -Wall -fPIC -I %%LOCALBASE%%/include
- LDFLAGS ?= -lgcrypt -g
-
- all: libotr.a
diff -ruN gaim-otr.orig/files/patch-libotr-context gaim-otr/files/patch-libotr-context
--- gaim-otr.orig/files/patch-libotr-context Sun Mar 20 17:08:06 2005
+++ gaim-otr/files/patch-libotr-context Thu Jan 1 01:00:00 1970
@@ -1,11 +0,0 @@
---- libotr/context.h.bak Fri Dec 17 17:14:42 2004
-+++ libotr/context.h Fri Dec 17 17:14:53 2004
-@@ -20,7 +20,7 @@
- #ifndef __CONTEXT_H__
- #define __CONTEXT_H__
-
--#include "gcrypt.h"
-+#include <gcrypt.h>
- #include "dh.h"
-
- typedef enum {
diff -ruN gaim-otr.orig/files/patch-libotr-privkey gaim-otr/files/patch-libotr-privkey
--- gaim-otr.orig/files/patch-libotr-privkey Sun Mar 20 17:08:06 2005
+++ gaim-otr/files/patch-libotr-privkey Thu Jan 1 01:00:00 1970
@@ -1,11 +0,0 @@
---- libotr/privkey.c.bak Fri Dec 17 16:24:41 2004
-+++ libotr/privkey.c Fri Dec 17 16:24:54 2004
-@@ -24,7 +24,7 @@
- #include <sys/stat.h>
-
- /* libgcrypt headers */
--#include "gcrypt.h"
-+#include <gcrypt.h>
-
- /* libotr headers */
- #include "proto.h"
diff -ruN gaim-otr.orig/files/patch-tools-Makefile gaim-otr/files/patch-tools-Makefile
--- gaim-otr.orig/files/patch-tools-Makefile Sun Mar 20 17:08:06 2005
+++ gaim-otr/files/patch-tools-Makefile Thu Jan 1 01:00:00 1970
@@ -1,44 +0,0 @@
---- tools/Makefile.bak Fri Dec 17 17:18:13 2004
-+++ tools/Makefile Fri Dec 17 17:20:57 2004
-@@ -9,7 +9,7 @@
- INSTALLMANDIR = $(DESTDIR)/usr/share/man/man1
-
- CC ?= gcc
--override CFLAGS += -g -Wall -I$(LIBOTR_DIR) -fPIC
-+override CFLAGS += -g -Wall -I$(LIBOTR_DIR) -I%%LOCALBASE%%/include -L%%LOCALBASE%%/lib -fPIC
-
- TARGETS = $(TARGET_DIR)/otr_parse \
- $(TARGET_DIR)/otr_sesskeys \
-@@ -21,25 +21,25 @@
- all: $(TARGETS)
-
- $(TARGET_DIR)/otr_parse: otr_parse.o readotr.o parse.o sha1hmac.o $(LIBOTR_DIR)/libotr.a
-- $(CC) -g $^ -o $@ -lgcrypt
-+ $(CC) $(CFLAGS) $^ -o $@ -lgcrypt
-
- $(TARGET_DIR)/otr_sesskeys: otr_sesskeys.o sesskeys.o parse.o sha1hmac.o $(LIBOTR_DIR)/libotr.a
-- $(CC) -g $^ -o $@ -lgcrypt
-+ $(CC) $(CFLAGS) $^ -o $@ -lgcrypt
-
- $(TARGET_DIR)/otr_mackey: otr_mackey.o sesskeys.o parse.o sha1hmac.o $(LIBOTR_DIR)/libotr.a
-- $(CC) -g $^ -o $@ -lgcrypt
-+ $(CC) $(CFLAGS) $^ -o $@ -lgcrypt
-
- $(TARGET_DIR)/otr_readforge: otr_readforge.o readotr.o sesskeys.o parse.o sha1hmac.o aes.o ctrmode.o $(LIBOTR_DIR)/libotr.a
-- $(CC) -g $^ -o $@ -lgcrypt
-+ $(CC) $(CFLAGS) $^ -o $@ -lgcrypt
-
- $(TARGET_DIR)/otr_modify: otr_modify.o readotr.o parse.o sha1hmac.o $(LIBOTR_DIR)/libotr.a
-- $(CC) -g $^ -o $@ -lgcrypt
-+ $(CC) $(CFLAGS) $^ -o $@ -lgcrypt
-
- $(TARGET_DIR)/otr_remac: otr_remac.o parse.o sha1hmac.o $(LIBOTR_DIR)/libotr.a
-- $(CC) -g $^ -o $@ -lgcrypt
-+ $(CC) $(CFLAGS) $^ -o $@ -lgcrypt
-
- $(LIBOTR_DIR)/libotr.a: FORCE
-- make -C $(LIBOTR_DIR) libotr.a
-+ gmake -C $(LIBOTR_DIR) libotr.a
-
- install: all
- install -d $(INSTALLBINDIR)
diff -ruN gaim-otr.orig/pkg-plist gaim-otr/pkg-plist
--- gaim-otr.orig/pkg-plist Sun Mar 20 17:08:06 2005
+++ gaim-otr/pkg-plist Mon Mar 21 18:45:21 2005
@@ -1,7 +1 @@
lib/gaim/gaim-otr.so
-bin/otr_parse
-bin/otr_sesskeys
-bin/otr_mackey
-bin/otr_readforge
-bin/otr_modify
-bin/otr_remac
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list