[csw-devel] SF.net SVN: gar:[20966] csw/mgar/pkg/otr/branches

[lblume at users.sourceforge.net]

Revision: 20966
          http://gar.svn.sourceforge.net/gar/?rev=20966&view=rev
Author:   lblume
Date:     2013-05-03 18:42:35 +0000 (Fri, 03 May 2013)
Log Message:
-----------
otr/branches/libotr2/trunk: Add legacy otr 3.2.1 as a branch

Added Paths:
-----------
    csw/mgar/pkg/otr/branches/libotr2/
    csw/mgar/pkg/otr/branches/libotr2/Makefile
    csw/mgar/pkg/otr/branches/libotr2/branches/
    csw/mgar/pkg/otr/branches/libotr2/tags/
    csw/mgar/pkg/otr/branches/libotr2/trunk/
    csw/mgar/pkg/otr/branches/libotr2/trunk/Makefile
    csw/mgar/pkg/otr/branches/libotr2/trunk/checksums
    csw/mgar/pkg/otr/branches/libotr2/trunk/files/
    csw/mgar/pkg/otr/branches/libotr2/trunk/files/heartbeat.patch
    csw/mgar/pkg/otr/branches/libotr2/trunk/work/

Added: csw/mgar/pkg/otr/branches/libotr2/Makefile
===================================================================
--- csw/mgar/pkg/otr/branches/libotr2/Makefile	                        (rev 0)
+++ csw/mgar/pkg/otr/branches/libotr2/Makefile	2013-05-03 18:42:35 UTC (rev 20966)
@@ -0,0 +1,15 @@
+# vim: ft=make ts=4 sw=4 noet
+
+default:
+	@echo "You are in the pkg/ directory."
+
+%:
+	$(MAKE) -C trunk $* 
+
+paranoid-%:
+	$(MAKE) -C trunk $* || exit 2 
+
+export BUILDLOG ?= $(shell pwd)/buildlog.txt
+
+report-%:
+	$(MAKE) -C trunk $* || echo "	*** make $* in $$i failed ***" >> $(BUILDLOG) 

Added: csw/mgar/pkg/otr/branches/libotr2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/otr/branches/libotr2/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/otr/branches/libotr2/trunk/Makefile	2013-05-03 18:42:35 UTC (rev 20966)
@@ -0,0 +1,45 @@
+NAME    = libotr
+VERSION = 3.2.1
+GARTYPE = v2
+
+DESCRIPTION = Off-The-Record Messaging plugin for pidgin
+define BLURB
+  Off-the-Record (OTR) Messaging allows you to have private conversations over instant messaging.
+endef
+
+MASTER_SITES = http://www.cypherpunks.ca/otr/
+DISTFILES  = $(NAME)-$(VERSION).tar.gz
+
+PATCHFILES += heartbeat.patch
+
+PACKAGES += CSWlibotr2
+CATALOGNAME_CSWlibotr2 = libotr2
+PKGFILES_CSWlibotr2 += $(call baseisadirs,$(libdir),libotr\.so\.2\.2\.1)
+PKGFILES_CSWlibotr2 += $(call baseisadirs,$(libdir),libotr\.so\.2(\.\d+)*)
+PKGFILES_CSWlibotr2 += $(bindir)/.*
+PKGFILES_CSWlibotr2 += $(sharedir)/man/.*
+SPKG_DESC_CSWlibotr2 += $(DESCRIPTION), libotr.so.5
+
+OBSOLETED_BY_CSWlibotr2 += CSWotr
+
+PACKAGES += CSWotr-dev
+CATALOGNAME_CSWotr-dev = otr_dev
+SPKG_DESC_CSWotr-dev += $(DESCRIPTION), development files
+# PKGFILES is catchall
+
+OBSOLETED_BY_CSWotr-dev += CSWotrdevel
+
+CONFIGURE_ARGS  = $(DIRPATHS)
+CONFIGURE_ARGS += --disable-static
+
+BUILD64_LIBS_ONLY = 1
+
+RUNTIME_DEP_PKGS_CSWlibotr2 += CSWlibgcrypt11
+RUNTIME_DEP_PKGS_CSWlibotr2 += CSWlibgpg-error0
+
+RUNTIME_DEP_PKGS_CSWotr-dev += CSWlibotr2
+
+BUILD_DEP_PKGS += CSWlibgcrypt-dev
+BUILD_DEP_PKGS += CSWlibgpg-error-dev
+
+include gar/category.mk

Added: csw/mgar/pkg/otr/branches/libotr2/trunk/checksums
===================================================================
--- csw/mgar/pkg/otr/branches/libotr2/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/otr/branches/libotr2/trunk/checksums	2013-05-03 18:42:35 UTC (rev 20966)
@@ -0,0 +1 @@
+974acf937d2ce0ee89b27a9815c17a3f  libotr-3.2.1.tar.gz

Added: csw/mgar/pkg/otr/branches/libotr2/trunk/files/heartbeat.patch
===================================================================
--- csw/mgar/pkg/otr/branches/libotr2/trunk/files/heartbeat.patch	                        (rev 0)
+++ csw/mgar/pkg/otr/branches/libotr2/trunk/files/heartbeat.patch	2013-05-03 18:42:35 UTC (rev 20966)
@@ -0,0 +1,11 @@
+--- libotr-3.2.0/src/message.c.o	2009-02-02 20:51:01.531472266 -0600
++++ libotr-3.2.0/src/message.c	2009-02-02 20:54:53.149261672 -0600
+@@ -1135,7 +1135,7 @@
+ 			    free(buf);
+ 			}
+ 			edata.ignore_message = 1;
+-		    } else if (edata.ignore_message == 0 &&
++		    } else if (edata.ignore_message != 1 &&
+ 			    context->their_keyid > 0) {
+ 			/* If it's *not* a heartbeat, and we haven't
+ 			 * sent anything in a while, also send a

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.